From fedora-extras-commits at redhat.com Wed Mar 1 00:03:15 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:03:15 -0500 Subject: rpms/rekall/FC-3 rekall.spec,1.8,1.9 Message-ID: <200603010004.k21043ZG012458@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12373/FC-3 Modified Files: rekall.spec Log Message: Bump for FC-5 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rekall.spec 12 Jan 2006 06:17:01 -0000 1.8 +++ rekall.spec 1 Mar 2006 00:03:15 -0000 1.9 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -309,6 +309,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 +- bump for FC-5 + * Tue Jan 10 2006 Tom "spot" Callaway 2.4.0-1 - bump to 2.4.0 From fedora-extras-commits at redhat.com Wed Mar 1 00:03:34 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:03:34 -0500 Subject: rpms/rekall/FC-4 rekall.spec,1.8,1.9 Message-ID: <200603010004.k21046Z9012471@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12373/FC-4 Modified Files: rekall.spec Log Message: Bump for FC-5 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rekall.spec 12 Jan 2006 06:17:07 -0000 1.8 +++ rekall.spec 1 Mar 2006 00:03:34 -0000 1.9 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -309,6 +309,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 +- bump for FC-5 + * Tue Jan 10 2006 Tom "spot" Callaway 2.4.0-1 - bump to 2.4.0 From fedora-extras-commits at redhat.com Wed Mar 1 00:03:41 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:03:41 -0500 Subject: rpms/rekall/devel rekall.spec,1.8,1.9 Message-ID: <200603010004.k2104DN0012474@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12373/devel Modified Files: rekall.spec Log Message: Bump for FC-5 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rekall.spec 12 Jan 2006 06:17:13 -0000 1.8 +++ rekall.spec 1 Mar 2006 00:03:41 -0000 1.9 @@ -309,6 +309,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 +- bump for FC-5 + * Tue Jan 10 2006 Tom "spot" Callaway 2.4.0-1 - bump to 2.4.0 From fedora-extras-commits at redhat.com Wed Mar 1 00:04:53 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:04:53 -0500 Subject: rpms/rekall/devel rekall.spec,1.9,1.10 Message-ID: <200603010005.k2105PgJ012595@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12568/devel Modified Files: rekall.spec Log Message: typo Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rekall.spec 1 Mar 2006 00:03:41 -0000 1.9 +++ rekall.spec 1 Mar 2006 00:04:52 -0000 1.10 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ From fedora-extras-commits at redhat.com Wed Mar 1 00:14:39 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:14:39 -0500 Subject: rpms/R-gnomeGUI/FC-4 R-gnomeGUI.spec,1.5,1.6 Message-ID: <200603010015.k210FBc0012772@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-gnomeGUI/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12721/FC-4 Modified Files: R-gnomeGUI.spec Log Message: Bump for FC-5 Index: R-gnomeGUI.spec =================================================================== RCS file: /cvs/extras/rpms/R-gnomeGUI/FC-4/R-gnomeGUI.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- R-gnomeGUI.spec 9 May 2005 20:10:18 -0000 1.5 +++ R-gnomeGUI.spec 1 Mar 2006 00:14:39 -0000 1.6 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 2.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz License: GPL version 2 or later. URL: http://cran.r-project.org/contrib @@ -53,6 +53,9 @@ %{_libdir}/R/share/glade/*.glade %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.1.0-5 +- bump for FC-5 + * Mon May 9 2005 Tom "spot" Callaway 2.1.0-4 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Wed Mar 1 00:14:46 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:14:46 -0500 Subject: rpms/R-gnomeGUI/devel R-gnomeGUI.spec,1.5,1.6 Message-ID: <200603010015.k210FYut012775@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-gnomeGUI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12721/devel Modified Files: R-gnomeGUI.spec Log Message: Bump for FC-5 Index: R-gnomeGUI.spec =================================================================== RCS file: /cvs/extras/rpms/R-gnomeGUI/devel/R-gnomeGUI.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- R-gnomeGUI.spec 9 May 2005 20:10:18 -0000 1.5 +++ R-gnomeGUI.spec 1 Mar 2006 00:14:45 -0000 1.6 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 2.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz License: GPL version 2 or later. URL: http://cran.r-project.org/contrib @@ -53,6 +53,9 @@ %{_libdir}/R/share/glade/*.glade %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.1.0-5 +- bump for FC-5 + * Mon May 9 2005 Tom "spot" Callaway 2.1.0-4 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Wed Mar 1 00:14:32 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:14:32 -0500 Subject: rpms/R-gnomeGUI/FC-3 R-gnomeGUI.spec,1.3,1.4 Message-ID: <200603010015.k210FYLl012776@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-gnomeGUI/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12721/FC-3 Modified Files: R-gnomeGUI.spec Log Message: Bump for FC-5 Index: R-gnomeGUI.spec =================================================================== RCS file: /cvs/extras/rpms/R-gnomeGUI/FC-3/R-gnomeGUI.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- R-gnomeGUI.spec 9 May 2005 19:57:55 -0000 1.3 +++ R-gnomeGUI.spec 1 Mar 2006 00:14:31 -0000 1.4 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 2.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz License: GPL version 2 or later. URL: http://cran.r-project.org/contrib @@ -53,6 +53,9 @@ %{_libdir}/R/share/glade/*.glade %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.1.0-5 +- bump for FC-5 + * Mon May 9 2005 Tom "spot" Callaway 2.1.0-4 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Wed Mar 1 00:22:50 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:22:50 -0500 Subject: rpms/scalapack/FC-3 scalapack-1.7-64bitlibs.patch, 1.1, 1.2 scalapack-1.7-fedora3.patch, 1.1, 1.2 scalapack.spec, 1.8, 1.9 Message-ID: <200603010023.k210NNOk012891@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/FC-3 Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora3.patch scalapack.spec Log Message: Big rework of scalapack, now with shared libs scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalapack-1.7-64bitlibs.patch 15 May 2005 18:40:34 -0000 1.1 +++ scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:22:49 -0000 1.2 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-05-15 01:31:17.366972464 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-05-15 01:31:53.333504720 -0500 -@@ -29,13 +29,13 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 +@@ -29,7 +29,7 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,22 +9,3 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM - # - USEMPI = -DUsingMpiBlacs --SMPLIB = /usr/lib/libmpi.a -+SMPLIB = /usr/lib64/libmpi.a - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSLIB = $(BLACSdir)/libmpiblacs.a -@@ -94,9 +94,9 @@ - # The name of the libraries to be created/linked to - # - SCALAPACKLIB = $(home)/libscalapack.a --BLASLIB = /usr/lib/libblas.a -+BLASLIB = /usr/lib64/libblas.a - # --LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+LAMLIBS = /usr/lib64/liblam.a /usr/lib64/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi - - PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora3.patch: Index: scalapack-1.7-fedora3.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-fedora3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalapack-1.7-fedora3.patch 9 May 2005 03:40:40 -0000 1.1 +++ scalapack-1.7-fedora3.patch 1 Mar 2006 00:22:49 -0000 1.2 @@ -1,5 +1,5 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.orig 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-05-08 22:38:39.000000000 -0500 +--- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -24,10 +24,10 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = /usr/lib/libmpi.a -+BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a -+BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a -+BLACSLIB = $(BLACSdir)/libmpiblacs.a ++SMPLIB = -lmpi ++BLACSFINIT = -lmpiblacsF77init ++BLACSCINIT = -lmpiblacsCinit ++BLACSLIB = -lmpiblacs TESTINGdir = $(home)/TESTING # @@ -37,25 +37,44 @@ NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -+CCFLAGS = $(RPM_OPT_FLAGS) ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC ++CCFLAGS = $(RPM_OPT_FLAGS) -fPIC SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) -@@ -94,9 +94,12 @@ +@@ -94,9 +94,13 @@ # The name of the libraries to be created/linked to # SCALAPACKLIB = $(home)/libscalapack.a -BLASLIB = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a -+BLASLIB = /usr/lib/libblas.a ++SCALAPACKSLIB = -L$(home) -lscalapack ++BLASLIB = -lblas # -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi ++LAMLIBS = -llam -lmpi -llamf77mpi ++EXTRALIBS = -ldl -lpthread -lutil + -+PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) +--- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 +@@ -49,7 +49,7 @@ + all: lib + #all: lib exe + +-lib: toolslib pblaslib redistlib scalapacklib ++lib: toolslib pblaslib redistlib scalapacklib shared + + exe: pblasexe redistexe scalapackexe + +@@ -90,3 +90,6 @@ + ( cd $(SRCdir); $(MAKE) clean ) + ( cd $(TOOLSdir); $(MAKE) clean ) + ( cd $(REDISTdir)/SRC; $(MAKE) clean ) ++ ++shared: scalapacklib ++ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scalapack.spec 9 Jan 2006 20:51:25 -0000 1.8 +++ scalapack.spec 1 Mar 2006 00:22:49 -0000 1.9 @@ -1,14 +1,14 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 9%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html Source0: http://www.netlib.org/scalapack/scalapack.tgz -BuildRequires: lapack, blas, lam, blacs-devel -BuildRequires: gcc-g77 -Requires: lapack, blas, lam, blacs +BuildRequires: lapack-devel, blas-devel, lam, blacs-devel +BuildRequires: gcc-g77, glibc-devel +Requires: lapack, blas-devel, lam, blacs-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: scalapack-1.7-fedora3.patch Patch1: scalapack-1.7-64bitlibs.patch @@ -39,6 +39,14 @@ BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK routines resemble their LAPACK equivalents as much as possible. +%package devel +Summary: Development libraries for scalapack +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for scalapack. + %prep %setup -q -c -n %{name}-%{version} %patch0 -p1 @@ -60,8 +68,18 @@ cp -f INSTALL/scalapack_install.ps ../ cp -f README ../ cp -f libscalapack.a ${RPM_BUILD_ROOT}%{_libdir} +cp -f libscalapack.so* ${RPM_BUILD_ROOT}%{_libdir} cp -f TESTING/x* ${RPM_BUILD_ROOT}%{_bindir} +cd ${RPM_BUILD_ROOT}%{_libdir} +ln -fs libscalapack.so.1.0.0 libscalapack.so.1 +ln -s libscalapack.so.1.0.0 libscalapack.so +cd .. + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %clean rm -fr ${RPM_BUILD_ROOT} @@ -69,9 +87,22 @@ %defattr(-,root,root) %doc scalapack_install.ps README %{_bindir}/x* +%{_libdir}/libscalapack.so.* + +%files devel +%defattr(-,root,root) %{_libdir}/libscalapack.a +%{_libdir}/libscalapack.so %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 +- fix 64 bit builds +- enable shared libraries +- split package into base and devel + +* Tue Feb 14 2006 Tom "spot" Callaway 1.7-10 +- Incorporate Andrew Gormanly's fixes + * Mon Jan 9 2006 Tom "spot" Callaway 1.7-9 - fix BR @@ -81,7 +112,7 @@ * Sun May 15 2005 Tom "spot" Callaway 1.7-7 - 64 bit library fix -* Mon May 9 2005 Tom "spot" Callaway 1.7-5 +* Mon May 9 2005 Tom "spot" Callaway 1.7-6 - remove hardcoded dist tags * Sun May 8 2005 Tom "spot" Callaway 1.7-4 From fedora-extras-commits at redhat.com Wed Mar 1 00:22:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:22:57 -0500 Subject: rpms/scalapack/FC-4 scalapack-1.7-64bitlibs.patch, 1.1, 1.2 scalapack-1.7-fedora.patch, 1.1, 1.2 scalapack.spec, 1.10, 1.11 Message-ID: <200603010023.k210NTxq012899@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/FC-4 Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora.patch scalapack.spec Log Message: Big rework of scalapack, now with shared libs scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalapack-1.7-64bitlibs.patch 15 May 2005 18:40:34 -0000 1.1 +++ scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:22:56 -0000 1.2 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-05-15 01:31:17.366972464 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-05-15 01:31:53.333504720 -0500 -@@ -29,13 +29,13 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 +@@ -29,7 +29,7 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,22 +9,3 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM - # - USEMPI = -DUsingMpiBlacs --SMPLIB = /usr/lib/libmpi.a -+SMPLIB = /usr/lib64/libmpi.a - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSLIB = $(BLACSdir)/libmpiblacs.a -@@ -94,9 +94,9 @@ - # The name of the libraries to be created/linked to - # - SCALAPACKLIB = $(home)/libscalapack.a --BLASLIB = /usr/lib/libblas.a -+BLASLIB = /usr/lib64/libblas.a - # --LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+LAMLIBS = /usr/lib64/liblam.a /usr/lib64/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi - - PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-fedora.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalapack-1.7-fedora.patch 24 Apr 2005 17:46:32 -0000 1.1 +++ scalapack-1.7-fedora.patch 1 Mar 2006 00:22:56 -0000 1.2 @@ -1,5 +1,14 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-04-18 16:22:41.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-04-18 16:34:42.000000000 -0500 +--- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 +@@ -19,7 +19,7 @@ + # The complete path to the top level of ScaLAPACK directory, usually + # $(HOME)/SCALAPACK + # +-home = $(HOME)/SCALAPACK ++home = $(RPM_BUILD_DIR)/scalapack-1.7/SCALAPACK + # + # The platform identifier to suffix to the end of library names + # @@ -29,16 +29,16 @@ # and the directory where the BLACS libraries are # @@ -15,10 +24,10 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = /usr/lib/libmpi.a -+BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a -+BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a -+BLACSLIB = $(BLACSdir)/libmpiblacs.a ++SMPLIB = -lmpi ++BLACSFINIT = -lmpiblacsF77init ++BLACSCINIT = -lmpiblacsCinit ++BLACSLIB = -lmpiblacs TESTINGdir = $(home)/TESTING # @@ -33,44 +42,53 @@ NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -+CCFLAGS = $(RPM_OPT_FLAGS) ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC ++CCFLAGS = $(RPM_OPT_FLAGS) -fPIC SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) -@@ -94,7 +94,7 @@ +@@ -82,7 +82,7 @@ + # C preprocessor defs for compilation + # (-DNoChange, -DAdd_, -DUpCase, or -Df77IsF2C) + # +-CDEFS = -Df77IsF2C -DNO_IEEE $(USEMPI) ++CDEFS = -DAdd_ -DNO_IEEE $(USEMPI) + # + # The archiver and the flag(s) to use when building archive (library) + # Also the ranlib routine. If your system has no ranlib, set RANLIB = echo +@@ -94,9 +94,13 @@ # The name of the libraries to be created/linked to # SCALAPACKLIB = $(home)/libscalapack.a -BLASLIB = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a -+BLASLIB = /usr/lib/libblas.a - # - PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) - PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-04-18 16:59:45.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-04-18 16:59:59.000000000 -0500 -@@ -19,7 +19,7 @@ - # The complete path to the top level of ScaLAPACK directory, usually - # $(HOME)/SCALAPACK - # --home = $(HOME)/SCALAPACK -+home = $(RPM_BUILD_DIR)/scalapack-1.7/SCALAPACK - # - # The platform identifier to suffix to the end of library names - # ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-04-18 17:17:04.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-04-18 17:20:06.000000000 -0500 -@@ -96,7 +96,10 @@ - SCALAPACKLIB = $(home)/libscalapack.a - BLASLIB = /usr/lib/libblas.a ++SCALAPACKSLIB = -L$(home) -lscalapack ++BLASLIB = -lblas # -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi ++LAMLIBS = -llam -lmpi -llamf77mpi ++EXTRALIBS = -ldl -lpthread -lutil + -+PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) +--- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 +@@ -49,7 +49,7 @@ + all: lib + #all: lib exe + +-lib: toolslib pblaslib redistlib scalapacklib ++lib: toolslib pblaslib redistlib scalapacklib shared + + exe: pblasexe redistexe scalapackexe + +@@ -90,3 +90,6 @@ + ( cd $(SRCdir); $(MAKE) clean ) + ( cd $(TOOLSdir); $(MAKE) clean ) + ( cd $(REDISTdir)/SRC; $(MAKE) clean ) ++ ++shared: scalapacklib ++ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scalapack.spec 9 Jan 2006 20:51:30 -0000 1.10 +++ scalapack.spec 1 Mar 2006 00:22:56 -0000 1.11 @@ -1,14 +1,14 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 9%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html Source0: http://www.netlib.org/scalapack/scalapack.tgz BuildRequires: lapack-devel, blas-devel, lam, blacs-devel -BuildRequires: gcc-gfortran -Requires: lapack, blas, lam, blacs +BuildRequires: gcc-gfortran, glibc-devel +Requires: lapack, blas-devel, lam, blacs-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: scalapack-1.7-fedora.patch Patch1: scalapack-1.7-64bitlibs.patch @@ -39,6 +39,14 @@ BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK routines resemble their LAPACK equivalents as much as possible. +%package devel +Summary: Development libraries for scalapack +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for scalapack. + %prep %setup -q -c -n %{name}-%{version} %patch0 -p1 @@ -60,8 +68,18 @@ cp -f INSTALL/scalapack_install.ps ../ cp -f README ../ cp -f libscalapack.a ${RPM_BUILD_ROOT}%{_libdir} +cp -f libscalapack.so* ${RPM_BUILD_ROOT}%{_libdir} cp -f TESTING/x* ${RPM_BUILD_ROOT}%{_bindir} +cd ${RPM_BUILD_ROOT}%{_libdir} +ln -fs libscalapack.so.1.0.0 libscalapack.so.1 +ln -s libscalapack.so.1.0.0 libscalapack.so +cd .. + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %clean rm -fr ${RPM_BUILD_ROOT} @@ -69,9 +87,22 @@ %defattr(-,root,root) %doc scalapack_install.ps README %{_bindir}/x* +%{_libdir}/libscalapack.so.* + +%files devel +%defattr(-,root,root) %{_libdir}/libscalapack.a +%{_libdir}/libscalapack.so %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 +- fix 64 bit builds +- enable shared libraries +- split package into base and devel + +* Tue Feb 14 2006 Tom "spot" Callaway 1.7-10 +- Incorporate Andrew Gormanly's fixes + * Mon Jan 9 2006 Tom "spot" Callaway 1.7-9 - fix BR From fedora-extras-commits at redhat.com Wed Mar 1 00:23:03 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:23:03 -0500 Subject: rpms/scalapack/devel scalapack-1.7-64bitlibs.patch, 1.1, 1.2 scalapack-1.7-fedora.patch, 1.2, 1.3 scalapack.spec, 1.11, 1.12 Message-ID: <200603010023.k210NZWS012908@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/devel Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora.patch scalapack.spec Log Message: Big rework of scalapack, now with shared libs scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalapack-1.7-64bitlibs.patch 15 May 2005 18:40:34 -0000 1.1 +++ scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:23:02 -0000 1.2 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-05-15 01:31:17.366972464 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-05-15 01:31:53.333504720 -0500 -@@ -29,13 +29,13 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 +@@ -29,7 +29,7 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,22 +9,3 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM - # - USEMPI = -DUsingMpiBlacs --SMPLIB = /usr/lib/libmpi.a -+SMPLIB = /usr/lib64/libmpi.a - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSLIB = $(BLACSdir)/libmpiblacs.a -@@ -94,9 +94,9 @@ - # The name of the libraries to be created/linked to - # - SCALAPACKLIB = $(home)/libscalapack.a --BLASLIB = /usr/lib/libblas.a -+BLASLIB = /usr/lib64/libblas.a - # --LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+LAMLIBS = /usr/lib64/liblam.a /usr/lib64/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi - - PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-fedora.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-fedora.patch 14 Feb 2006 14:47:18 -0000 1.2 +++ scalapack-1.7-fedora.patch 1 Mar 2006 00:23:02 -0000 1.3 @@ -1,5 +1,5 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2001-08-09 03:59:50.000000000 +0100 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-10 13:05:56.000000000 +0000 +--- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -24,10 +24,10 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = /usr/lib/libmpi.a -+BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a -+BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a -+BLACSLIB = $(BLACSdir)/libmpiblacs.a ++SMPLIB = -lmpi ++BLACSFINIT = -lmpiblacsF77init ++BLACSCINIT = -lmpiblacsCinit ++BLACSLIB = -lmpiblacs TESTINGdir = $(home)/TESTING # @@ -42,8 +42,8 @@ NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -+CCFLAGS = $(RPM_OPT_FLAGS) ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC ++CCFLAGS = $(RPM_OPT_FLAGS) -fPIC SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) @@ -56,20 +56,39 @@ # # The archiver and the flag(s) to use when building archive (library) # Also the ranlib routine. If your system has no ranlib, set RANLIB = echo -@@ -94,9 +94,12 @@ +@@ -94,9 +94,13 @@ # The name of the libraries to be created/linked to # SCALAPACKLIB = $(home)/libscalapack.a -BLASLIB = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a -+BLASLIB = /usr/lib/libblas.a ++SCALAPACKSLIB = -L$(home) -lscalapack ++BLASLIB = -lblas # -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi -lutil ++LAMLIBS = -llam -lmpi -llamf77mpi ++EXTRALIBS = -ldl -lpthread -lutil + -+PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) +--- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 +@@ -49,7 +49,7 @@ + all: lib + #all: lib exe + +-lib: toolslib pblaslib redistlib scalapacklib ++lib: toolslib pblaslib redistlib scalapacklib shared + + exe: pblasexe redistexe scalapackexe + +@@ -90,3 +90,6 @@ + ( cd $(SRCdir); $(MAKE) clean ) + ( cd $(TOOLSdir); $(MAKE) clean ) + ( cd $(REDISTdir)/SRC; $(MAKE) clean ) ++ ++shared: scalapacklib ++ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scalapack.spec 14 Feb 2006 14:47:18 -0000 1.11 +++ scalapack.spec 1 Mar 2006 00:23:02 -0000 1.12 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 10%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -39,6 +39,14 @@ BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK routines resemble their LAPACK equivalents as much as possible. +%package devel +Summary: Development libraries for scalapack +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for scalapack. + %prep %setup -q -c -n %{name}-%{version} %patch0 -p1 @@ -60,8 +68,18 @@ cp -f INSTALL/scalapack_install.ps ../ cp -f README ../ cp -f libscalapack.a ${RPM_BUILD_ROOT}%{_libdir} +cp -f libscalapack.so* ${RPM_BUILD_ROOT}%{_libdir} cp -f TESTING/x* ${RPM_BUILD_ROOT}%{_bindir} +cd ${RPM_BUILD_ROOT}%{_libdir} +ln -fs libscalapack.so.1.0.0 libscalapack.so.1 +ln -s libscalapack.so.1.0.0 libscalapack.so +cd .. + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %clean rm -fr ${RPM_BUILD_ROOT} @@ -69,9 +87,19 @@ %defattr(-,root,root) %doc scalapack_install.ps README %{_bindir}/x* +%{_libdir}/libscalapack.so.* + +%files devel +%defattr(-,root,root) %{_libdir}/libscalapack.a +%{_libdir}/libscalapack.so %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 +- fix 64 bit builds +- enable shared libraries +- split package into base and devel + * Tue Feb 14 2006 Tom "spot" Callaway 1.7-10 - Incorporate Andrew Gormanly's fixes From fedora-extras-commits at redhat.com Wed Mar 1 00:35:44 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:35:44 -0500 Subject: rpms/rootsh/FC-3 rootsh.spec,1.1,1.2 Message-ID: <200603010036.k210aGod013222@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rootsh/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13173/FC-3 Modified Files: rootsh.spec Log Message: Bump for FC-6... gotcha! Index: rootsh.spec =================================================================== RCS file: /cvs/extras/rpms/rootsh/FC-3/rootsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rootsh.spec 8 Jan 2006 17:23:35 -0000 1.1 +++ rootsh.spec 1 Mar 2006 00:35:44 -0000 1.2 @@ -1,7 +1,7 @@ Name: rootsh Summary: Shell wrapper for auditing Version: 1.5.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: http://download.sourceforge.net/rootsh/%{name}-%{version}.tar.gz @@ -35,6 +35,9 @@ %{_mandir}/man1/rootsh.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.5.2-3 +- bump for FC-5 + * Sat Jan 7 2006 Tom "spot" Callaway 1.5.2-2 - forgot to include COPYING From fedora-extras-commits at redhat.com Wed Mar 1 00:35:50 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:35:50 -0500 Subject: rpms/rootsh/FC-4 rootsh.spec,1.1,1.2 Message-ID: <200603010036.k210aM2O013225@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rootsh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13173/FC-4 Modified Files: rootsh.spec Log Message: Bump for FC-6... gotcha! Index: rootsh.spec =================================================================== RCS file: /cvs/extras/rpms/rootsh/FC-4/rootsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rootsh.spec 8 Jan 2006 17:23:35 -0000 1.1 +++ rootsh.spec 1 Mar 2006 00:35:50 -0000 1.2 @@ -1,7 +1,7 @@ Name: rootsh Summary: Shell wrapper for auditing Version: 1.5.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: http://download.sourceforge.net/rootsh/%{name}-%{version}.tar.gz @@ -35,6 +35,9 @@ %{_mandir}/man1/rootsh.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.5.2-3 +- bump for FC-5 + * Sat Jan 7 2006 Tom "spot" Callaway 1.5.2-2 - forgot to include COPYING From fedora-extras-commits at redhat.com Wed Mar 1 00:35:56 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:35:56 -0500 Subject: rpms/rootsh/devel rootsh.spec,1.1,1.2 Message-ID: <200603010036.k210aSKh013228@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rootsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13173/devel Modified Files: rootsh.spec Log Message: Bump for FC-6... gotcha! Index: rootsh.spec =================================================================== RCS file: /cvs/extras/rpms/rootsh/devel/rootsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rootsh.spec 8 Jan 2006 17:23:35 -0000 1.1 +++ rootsh.spec 1 Mar 2006 00:35:56 -0000 1.2 @@ -1,7 +1,7 @@ Name: rootsh Summary: Shell wrapper for auditing Version: 1.5.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: http://download.sourceforge.net/rootsh/%{name}-%{version}.tar.gz @@ -35,6 +35,9 @@ %{_mandir}/man1/rootsh.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.5.2-3 +- bump for FC-5 + * Sat Jan 7 2006 Tom "spot" Callaway 1.5.2-2 - forgot to include COPYING From fedora-extras-commits at redhat.com Wed Mar 1 00:38:26 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:38:26 -0500 Subject: rpms/rocksndiamonds/FC-3 rocksndiamonds.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603010038.k210cwsp013410@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13234/FC-3 Modified Files: rocksndiamonds.spec sources Log Message: Bump to 3.1.2 Index: rocksndiamonds.spec =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/FC-3/rocksndiamonds.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rocksndiamonds.spec 23 Sep 2005 14:46:17 -0000 1.1 +++ rocksndiamonds.spec 1 Mar 2006 00:38:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: rocksndiamonds -Version: 3.1.1 -Release: 2%{?dist} +Version: 3.1.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games Summary: Underground digging game @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 3.1.2-1 +- bump to 3.1.2 + * Thu Sep 22 2005 Tom "spot" Callaway 3.1.1-2 - add missing BR: SDL_net-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Sep 2005 14:46:17 -0000 1.2 +++ sources 1 Mar 2006 00:38:25 -0000 1.3 @@ -1 +1 @@ -6a6e0397f043314e3df8ee85c03590b5 rocksndiamonds-3.1.1.tar.gz +489d1c1401ef1fe1bd218ba465b05594 rocksndiamonds-3.1.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 00:38:45 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:38:45 -0500 Subject: rpms/rocksndiamonds/FC-4 rocksndiamonds.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603010039.k210dHN9013418@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13234/FC-4 Modified Files: rocksndiamonds.spec sources Log Message: Bump to 3.1.2 Index: rocksndiamonds.spec =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/FC-4/rocksndiamonds.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rocksndiamonds.spec 23 Sep 2005 14:46:17 -0000 1.1 +++ rocksndiamonds.spec 1 Mar 2006 00:38:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: rocksndiamonds -Version: 3.1.1 -Release: 2%{?dist} +Version: 3.1.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games Summary: Underground digging game @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 3.1.2-1 +- bump to 3.1.2 + * Thu Sep 22 2005 Tom "spot" Callaway 3.1.1-2 - add missing BR: SDL_net-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Sep 2005 14:46:17 -0000 1.2 +++ sources 1 Mar 2006 00:38:45 -0000 1.3 @@ -1 +1 @@ -6a6e0397f043314e3df8ee85c03590b5 rocksndiamonds-3.1.1.tar.gz +489d1c1401ef1fe1bd218ba465b05594 rocksndiamonds-3.1.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 00:38:51 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:38:51 -0500 Subject: rpms/rocksndiamonds/devel .cvsignore, 1.2, 1.3 rocksndiamonds.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603010039.k210dN2l013424@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13234/devel Modified Files: .cvsignore rocksndiamonds.spec sources Log Message: Bump to 3.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Sep 2005 14:46:17 -0000 1.2 +++ .cvsignore 1 Mar 2006 00:38:51 -0000 1.3 @@ -1 +1,2 @@ rocksndiamonds-3.1.1.tar.gz +rocksndiamonds-3.1.2.tar.gz Index: rocksndiamonds.spec =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/devel/rocksndiamonds.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rocksndiamonds.spec 23 Sep 2005 14:46:17 -0000 1.1 +++ rocksndiamonds.spec 1 Mar 2006 00:38:51 -0000 1.2 @@ -1,6 +1,6 @@ Name: rocksndiamonds -Version: 3.1.1 -Release: 2%{?dist} +Version: 3.1.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games Summary: Underground digging game @@ -10,7 +10,7 @@ Source2: rocksndiamonds.png Patch0: rocksndiamonds-3.1.1-nosmpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel, xorg-x11-devel, desktop-file-utils +BuildRequires: SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel BuildRequires: SDL_image-devel, SDL_mixer-devel, SDL_net-devel %description @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 3.1.2-1 +- bump to 3.1.2 + * Thu Sep 22 2005 Tom "spot" Callaway 3.1.1-2 - add missing BR: SDL_net-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Sep 2005 14:46:17 -0000 1.2 +++ sources 1 Mar 2006 00:38:51 -0000 1.3 @@ -1 +1 @@ -6a6e0397f043314e3df8ee85c03590b5 rocksndiamonds-3.1.1.tar.gz +489d1c1401ef1fe1bd218ba465b05594 rocksndiamonds-3.1.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 00:41:48 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:41:48 -0500 Subject: rpms/udunits/FC-3 udunits.spec,1.7,1.8 Message-ID: <200603010042.k210gKGc013606@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/udunits/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13472/FC-3 Modified Files: udunits.spec Log Message: baby got bump! Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/FC-3/udunits.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- udunits.spec 9 Jul 2005 21:38:57 -0000 1.7 +++ udunits.spec 1 Mar 2006 00:41:48 -0000 1.8 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -105,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.12.4-10 +- bump for FC-5 + * Sat Jul 9 2005 Ed Hill 1.12.4-9 - use -fPIC for all arches and remove redundant man3f entry From fedora-extras-commits at redhat.com Wed Mar 1 00:41:54 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:41:54 -0500 Subject: rpms/udunits/FC-4 udunits.spec,1.7,1.8 Message-ID: <200603010042.k210gQYU013609@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/udunits/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13472/FC-4 Modified Files: udunits.spec Log Message: baby got bump! Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/FC-4/udunits.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- udunits.spec 9 Jul 2005 21:38:57 -0000 1.7 +++ udunits.spec 1 Mar 2006 00:41:53 -0000 1.8 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -105,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.12.4-10 +- bump for FC-5 + * Sat Jul 9 2005 Ed Hill 1.12.4-9 - use -fPIC for all arches and remove redundant man3f entry From fedora-extras-commits at redhat.com Wed Mar 1 00:41:59 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:41:59 -0500 Subject: rpms/udunits/devel udunits.spec,1.7,1.8 Message-ID: <200603010042.k210gWsd013612@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/udunits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13472/devel Modified Files: udunits.spec Log Message: baby got bump! Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/devel/udunits.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- udunits.spec 9 Jul 2005 21:39:03 -0000 1.7 +++ udunits.spec 1 Mar 2006 00:41:59 -0000 1.8 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -105,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.12.4-10 +- bump for FC-5 + * Sat Jul 9 2005 Ed Hill 1.12.4-9 - use -fPIC for all arches and remove redundant man3f entry From fedora-extras-commits at redhat.com Wed Mar 1 00:50:16 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:50:16 -0500 Subject: rpms/xbsql/FC-3 xbsql.spec,1.2,1.3 Message-ID: <200603010050.k210onMZ013861@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13802/FC-3 Modified Files: xbsql.spec Log Message: bump for eff sea fi Index: xbsql.spec =================================================================== RCS file: /cvs/extras/rpms/xbsql/FC-3/xbsql.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbsql.spec 18 Aug 2005 15:37:59 -0000 1.2 +++ xbsql.spec 1 Mar 2006 00:50:16 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbsql Summary: A SQL wrapper for xbase Version: 0.11 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Libraries License: LGPL URL: http://www.quaking.demon.co.uk/xbsql/ @@ -56,6 +56,9 @@ %{_libdir}/*.a %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.11-6 +- bump for FC-5 + * Thu Aug 18 2005 Tom "spot" Callaway 0.11-5 - fix 64 bit ncurses detection From fedora-extras-commits at redhat.com Wed Mar 1 00:50:22 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:50:22 -0500 Subject: rpms/xbsql/FC-4 xbsql.spec,1.2,1.3 Message-ID: <200603010050.k210osVm013864@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13802/FC-4 Modified Files: xbsql.spec Log Message: bump for eff sea fi Index: xbsql.spec =================================================================== RCS file: /cvs/extras/rpms/xbsql/FC-4/xbsql.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbsql.spec 18 Aug 2005 15:38:00 -0000 1.2 +++ xbsql.spec 1 Mar 2006 00:50:22 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbsql Summary: A SQL wrapper for xbase Version: 0.11 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Libraries License: LGPL URL: http://www.quaking.demon.co.uk/xbsql/ @@ -56,6 +56,9 @@ %{_libdir}/*.a %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.11-6 +- bump for FC-5 + * Thu Aug 18 2005 Tom "spot" Callaway 0.11-5 - fix 64 bit ncurses detection From fedora-extras-commits at redhat.com Wed Mar 1 00:50:28 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:50:28 -0500 Subject: rpms/xbsql/devel xbsql.spec,1.2,1.3 Message-ID: <200603010051.k210p0v3013867@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13802/devel Modified Files: xbsql.spec Log Message: bump for eff sea fi Index: xbsql.spec =================================================================== RCS file: /cvs/extras/rpms/xbsql/devel/xbsql.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbsql.spec 18 Aug 2005 15:38:00 -0000 1.2 +++ xbsql.spec 1 Mar 2006 00:50:28 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbsql Summary: A SQL wrapper for xbase Version: 0.11 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Libraries License: LGPL URL: http://www.quaking.demon.co.uk/xbsql/ @@ -56,6 +56,9 @@ %{_libdir}/*.a %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.11-6 +- bump for FC-5 + * Thu Aug 18 2005 Tom "spot" Callaway 0.11-5 - fix 64 bit ncurses detection From fedora-extras-commits at redhat.com Wed Mar 1 01:04:32 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 28 Feb 2006 20:04:32 -0500 Subject: rpms/libglademm24/devel .cvsignore, 1.4, 1.5 libglademm.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200603010105.k21156PH016011@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libglademm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15976 Modified Files: .cvsignore libglademm.spec sources Log Message: Update to version 2.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Sep 2005 07:22:58 -0000 1.4 +++ .cvsignore 1 Mar 2006 01:04:32 -0000 1.5 @@ -1 +1 @@ -libglademm-2.6.1.tar.bz2 +libglademm-2.6.2.tar.bz2 Index: libglademm.spec =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/libglademm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libglademm.spec 26 Nov 2005 10:54:59 -0000 1.8 +++ libglademm.spec 1 Mar 2006 01:04:32 -0000 1.9 @@ -1,6 +1,6 @@ Name: libglademm24 -Version: 2.6.1 -Release: 2 +Version: 2.6.2 +Release: 1 Summary: C++ wrapper for libglade @@ -78,6 +78,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Feb 28 2006 Denis Leroy - 2.6.2-1 +- Update to version 2.6.2 + * Fri Nov 25 2005 Denis Leroy - 2.6.1-2 - Disable static libraries Index: sources =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Sep 2005 07:22:58 -0000 1.4 +++ sources 1 Mar 2006 01:04:32 -0000 1.5 @@ -1 +1 @@ -0e9dd1e7b0e3170b56c50e5c4630fe95 libglademm-2.6.1.tar.bz2 +431a7d04514cabe26fcaedd7767b6a93 libglademm-2.6.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 01:11:31 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:11:31 -0500 Subject: rpms/wlassistant/devel wlassistant-0.5.5-rpath.patch, NONE, 1.1 sources, 1.2, 1.3 wlassistant.spec, 1.2, 1.3 Message-ID: <200603010111.k211BmES016253@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/wlassistant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16179/devel Modified Files: sources wlassistant.spec Added Files: wlassistant-0.5.5-rpath.patch Log Message: scons annoys me. bumping to 0.5.5 wlassistant-0.5.5-rpath.patch: --- NEW FILE wlassistant-0.5.5-rpath.patch --- --- wlassistant-0.5.5/bksys/kde.py.BAD 2006-02-28 19:00:25.000000000 -0600 +++ wlassistant-0.5.5/bksys/kde.py 2006-02-28 19:01:14.000000000 -0600 @@ -25,10 +25,7 @@ lenv.Append( CPPFLAGS = '-DQT_NO_TRANSLATION' ) if 'rpath' in _flags: ## Use this to set rpath - this may cause trouble if folders are moved (chrpath) - kdelibpaths=[] - if lenv['KDELIBPATH'] == lenv['KDELIB']: kdelibpaths = [lenv['KDELIB']] - else: kdelibpaths = [lenv['KDELIBPATH'], lenv['KDELIB']] - lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']]+kdelibpaths ) + lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']] ) if 'thread' in _flags: ## Uncomment the following if you need threading support lenv.KDEaddflags_cxx( ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] ) Index: sources =================================================================== RCS file: /cvs/extras/rpms/wlassistant/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Sep 2005 20:52:54 -0000 1.2 +++ sources 1 Mar 2006 01:11:30 -0000 1.3 @@ -1 +1 @@ -4836d595a27f34c24784cdf9c2a9d5a8 wlassistant-0.5.4a.tar.bz2 +1f30f1384b03662a9a0b75fa777f21d6 wlassistant-0.5.5.tar.bz2 Index: wlassistant.spec =================================================================== RCS file: /cvs/extras/rpms/wlassistant/devel/wlassistant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wlassistant.spec 17 Sep 2005 21:31:56 -0000 1.2 +++ wlassistant.spec 1 Mar 2006 01:11:30 -0000 1.3 @@ -1,6 +1,6 @@ Name: wlassistant -Version: 0.5.4a -Release: 3%{?dist} +Version: 0.5.5 +Release: 1%{?dist} License: GPL Group: Applications/System Summary: Wireless network management tool @@ -10,11 +10,12 @@ Source2: wlassistant.pamd Source3: wlassistant.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools +BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools, scons +BuildRequires: qt-devel Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: usermode, wireless-tools, net-tools, dhclient -Patch0: wlassistant-0.5.4a-rpath.patch +Patch0: wlassistant-0.5.5-rpath.patch %description Wireless Assistant (wlassistant) is a small application that allows you to @@ -32,7 +33,9 @@ %patch0 -p1 %build -%configure +PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` +sed -i "s|'-O2'|[$PARSED_OPT_FLAGS]|" bksys/generic.py +./configure make %{?_smp_mflags} %install @@ -71,7 +74,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README NEWS ChangeLog +%doc doc/AUTHORS doc/COPYING doc/README doc/NEWS doc/TODO ChangeLog %config(noreplace) %{_sysconfdir}/pam.d/wlassistant %config(noreplace) %{_sysconfdir}/security/console.apps/wlassistant %{_bindir}/wlassistant @@ -81,6 +84,9 @@ %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.5.5-1 +- bump to 0.5.5 + * Sat Sep 17 2005 Tom "spot" Callaway 0.5.4a-3 - use .desktop file as SOURCE3 rather than screwing around with dos2unix From fedora-extras-commits at redhat.com Wed Mar 1 01:11:18 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:11:18 -0500 Subject: rpms/wlassistant/FC-3 wlassistant-0.5.5-rpath.patch, NONE, 1.1 sources, 1.2, 1.3 wlassistant.spec, 1.2, 1.3 Message-ID: <200603010111.k211Bpx3016262@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/wlassistant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16179/FC-3 Modified Files: sources wlassistant.spec Added Files: wlassistant-0.5.5-rpath.patch Log Message: scons annoys me. bumping to 0.5.5 wlassistant-0.5.5-rpath.patch: --- NEW FILE wlassistant-0.5.5-rpath.patch --- --- wlassistant-0.5.5/bksys/kde.py.BAD 2006-02-28 19:00:25.000000000 -0600 +++ wlassistant-0.5.5/bksys/kde.py 2006-02-28 19:01:14.000000000 -0600 @@ -25,10 +25,7 @@ lenv.Append( CPPFLAGS = '-DQT_NO_TRANSLATION' ) if 'rpath' in _flags: ## Use this to set rpath - this may cause trouble if folders are moved (chrpath) - kdelibpaths=[] - if lenv['KDELIBPATH'] == lenv['KDELIB']: kdelibpaths = [lenv['KDELIB']] - else: kdelibpaths = [lenv['KDELIBPATH'], lenv['KDELIB']] - lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']]+kdelibpaths ) + lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']] ) if 'thread' in _flags: ## Uncomment the following if you need threading support lenv.KDEaddflags_cxx( ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] ) Index: sources =================================================================== RCS file: /cvs/extras/rpms/wlassistant/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Sep 2005 20:52:54 -0000 1.2 +++ sources 1 Mar 2006 01:11:18 -0000 1.3 @@ -1 +1 @@ -4836d595a27f34c24784cdf9c2a9d5a8 wlassistant-0.5.4a.tar.bz2 +1f30f1384b03662a9a0b75fa777f21d6 wlassistant-0.5.5.tar.bz2 Index: wlassistant.spec =================================================================== RCS file: /cvs/extras/rpms/wlassistant/FC-3/wlassistant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wlassistant.spec 17 Sep 2005 21:31:55 -0000 1.2 +++ wlassistant.spec 1 Mar 2006 01:11:18 -0000 1.3 @@ -1,6 +1,6 @@ Name: wlassistant -Version: 0.5.4a -Release: 3%{?dist} +Version: 0.5.5 +Release: 1%{?dist} License: GPL Group: Applications/System Summary: Wireless network management tool @@ -10,11 +10,12 @@ Source2: wlassistant.pamd Source3: wlassistant.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools +BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools, scons +BuildRequires: qt-devel Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: usermode, wireless-tools, net-tools, dhclient -Patch0: wlassistant-0.5.4a-rpath.patch +Patch0: wlassistant-0.5.5-rpath.patch %description Wireless Assistant (wlassistant) is a small application that allows you to @@ -32,7 +33,9 @@ %patch0 -p1 %build -%configure +PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` +sed -i "s|'-O2'|[$PARSED_OPT_FLAGS]|" bksys/generic.py +./configure make %{?_smp_mflags} %install @@ -71,7 +74,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README NEWS ChangeLog +%doc doc/AUTHORS doc/COPYING doc/README doc/NEWS doc/TODO ChangeLog %config(noreplace) %{_sysconfdir}/pam.d/wlassistant %config(noreplace) %{_sysconfdir}/security/console.apps/wlassistant %{_bindir}/wlassistant @@ -81,6 +84,9 @@ %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.5.5-1 +- bump to 0.5.5 + * Sat Sep 17 2005 Tom "spot" Callaway 0.5.4a-3 - use .desktop file as SOURCE3 rather than screwing around with dos2unix From fedora-extras-commits at redhat.com Wed Mar 1 01:11:25 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:11:25 -0500 Subject: rpms/wlassistant/FC-4 wlassistant-0.5.5-rpath.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wlassistant.spec, 1.2, 1.3 Message-ID: <200603010111.k211BvTA016272@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/wlassistant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16179/FC-4 Modified Files: .cvsignore sources wlassistant.spec Added Files: wlassistant-0.5.5-rpath.patch Log Message: scons annoys me. bumping to 0.5.5 wlassistant-0.5.5-rpath.patch: --- NEW FILE wlassistant-0.5.5-rpath.patch --- --- wlassistant-0.5.5/bksys/kde.py.BAD 2006-02-28 19:00:25.000000000 -0600 +++ wlassistant-0.5.5/bksys/kde.py 2006-02-28 19:01:14.000000000 -0600 @@ -25,10 +25,7 @@ lenv.Append( CPPFLAGS = '-DQT_NO_TRANSLATION' ) if 'rpath' in _flags: ## Use this to set rpath - this may cause trouble if folders are moved (chrpath) - kdelibpaths=[] - if lenv['KDELIBPATH'] == lenv['KDELIB']: kdelibpaths = [lenv['KDELIB']] - else: kdelibpaths = [lenv['KDELIBPATH'], lenv['KDELIB']] - lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']]+kdelibpaths ) + lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']] ) if 'thread' in _flags: ## Uncomment the following if you need threading support lenv.KDEaddflags_cxx( ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] ) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wlassistant/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Sep 2005 20:52:54 -0000 1.2 +++ .cvsignore 1 Mar 2006 01:11:24 -0000 1.3 @@ -1 +1,2 @@ wlassistant-0.5.4a.tar.bz2 +wlassistant-0.5.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wlassistant/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Sep 2005 20:52:54 -0000 1.2 +++ sources 1 Mar 2006 01:11:24 -0000 1.3 @@ -1 +1 @@ -4836d595a27f34c24784cdf9c2a9d5a8 wlassistant-0.5.4a.tar.bz2 +1f30f1384b03662a9a0b75fa777f21d6 wlassistant-0.5.5.tar.bz2 Index: wlassistant.spec =================================================================== RCS file: /cvs/extras/rpms/wlassistant/FC-4/wlassistant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wlassistant.spec 17 Sep 2005 21:31:55 -0000 1.2 +++ wlassistant.spec 1 Mar 2006 01:11:24 -0000 1.3 @@ -1,6 +1,6 @@ Name: wlassistant -Version: 0.5.4a -Release: 3%{?dist} +Version: 0.5.5 +Release: 1%{?dist} License: GPL Group: Applications/System Summary: Wireless network management tool @@ -10,11 +10,12 @@ Source2: wlassistant.pamd Source3: wlassistant.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools +BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools, scons +BuildRequires: qt-devel Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: usermode, wireless-tools, net-tools, dhclient -Patch0: wlassistant-0.5.4a-rpath.patch +Patch0: wlassistant-0.5.5-rpath.patch %description Wireless Assistant (wlassistant) is a small application that allows you to @@ -32,7 +33,9 @@ %patch0 -p1 %build -%configure +PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` +sed -i "s|'-O2'|[$PARSED_OPT_FLAGS]|" bksys/generic.py +./configure make %{?_smp_mflags} %install @@ -71,7 +74,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README NEWS ChangeLog +%doc doc/AUTHORS doc/COPYING doc/README doc/NEWS doc/TODO ChangeLog %config(noreplace) %{_sysconfdir}/pam.d/wlassistant %config(noreplace) %{_sysconfdir}/security/console.apps/wlassistant %{_bindir}/wlassistant @@ -81,6 +84,9 @@ %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.5.5-1 +- bump to 0.5.5 + * Sat Sep 17 2005 Tom "spot" Callaway 0.5.4a-3 - use .desktop file as SOURCE3 rather than screwing around with dos2unix From fedora-extras-commits at redhat.com Wed Mar 1 01:11:59 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 28 Feb 2006 20:11:59 -0500 Subject: rpms/libgnomecanvasmm26/devel libgnomecanvasmm.spec,1.8,1.9 Message-ID: <200603010112.k211CVn0016300@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomecanvasmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16278 Modified Files: libgnomecanvasmm.spec Log Message: Rebuild Index: libgnomecanvasmm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libgnomecanvasmm.spec 26 Nov 2005 10:57:22 -0000 1.8 +++ libgnomecanvasmm.spec 1 Mar 2006 01:11:59 -0000 1.9 @@ -1,6 +1,6 @@ Name: libgnomecanvasmm26 Version: 2.12.0 -Release: 2 +Release: 3 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -74,6 +74,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Feb 28 2006 Denis Leroy - 2.12.0-3 +- Rebuild + * Fri Nov 25 2005 Denis Leroy - 2.12.0-2 - Disabled static libraries From fedora-extras-commits at redhat.com Wed Mar 1 01:14:30 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:14:30 -0500 Subject: rpms/xbase/FC-3 xbase.spec,1.2,1.3 Message-ID: <200603010115.k211F29k016565@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16356/FC-3 Modified Files: xbase.spec Log Message: Bump for FC-5 Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/FC-3/xbase.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbase.spec 10 Jul 2005 13:49:13 -0000 1.2 +++ xbase.spec 1 Mar 2006 01:14:30 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ @@ -74,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.0.0-4 +- bump for FC-5 + * Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 - fix xbase-config --ld (bugzilla 162845) From fedora-extras-commits at redhat.com Wed Mar 1 01:14:36 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:14:36 -0500 Subject: rpms/xbase/FC-4 xbase.spec,1.2,1.3 Message-ID: <200603010115.k211F83A016575@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16356/FC-4 Modified Files: xbase.spec Log Message: Bump for FC-5 Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/FC-4/xbase.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbase.spec 10 Jul 2005 13:49:13 -0000 1.2 +++ xbase.spec 1 Mar 2006 01:14:36 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ @@ -74,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.0.0-4 +- bump for FC-5 + * Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 - fix xbase-config --ld (bugzilla 162845) From fedora-extras-commits at redhat.com Wed Mar 1 01:14:42 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:14:42 -0500 Subject: rpms/xbase/devel xbase.spec,1.2,1.3 Message-ID: <200603010115.k211FF9w016586@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16356/devel Modified Files: xbase.spec Log Message: Bump for FC-5 Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/devel/xbase.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbase.spec 10 Jul 2005 13:49:18 -0000 1.2 +++ xbase.spec 1 Mar 2006 01:14:42 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ @@ -74,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.0.0-4 +- bump for FC-5 + * Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 - fix xbase-config --ld (bugzilla 162845) From fedora-extras-commits at redhat.com Wed Mar 1 01:16:43 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 28 Feb 2006 20:16:43 -0500 Subject: rpms/libgnomemm26/devel .cvsignore, 1.5, 1.6 libgnomemm.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200603010117.k211HFZF016797@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomemm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16776 Modified Files: .cvsignore libgnomemm.spec sources Log Message: Update to 2.12.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 Nov 2005 11:01:21 -0000 1.5 +++ .cvsignore 1 Mar 2006 01:16:43 -0000 1.6 @@ -1 +1 @@ -libgnomemm-2.12.1.tar.bz2 +libgnomemm-2.12.2.tar.bz2 Index: libgnomemm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libgnomemm.spec 26 Nov 2005 11:01:21 -0000 1.9 +++ libgnomemm.spec 1 Mar 2006 01:16:43 -0000 1.10 @@ -1,5 +1,5 @@ Name: libgnomemm26 -Version: 2.12.1 +Version: 2.12.2 Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Feb 28 2006 Denis Leroy - 2.12.2-1 +- Update to 2.12.2 + * Fri Nov 25 2005 Denis Leroy - 2.12.1-1 - Update to 2.12.1 - Disabled static libraries Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Nov 2005 11:01:21 -0000 1.6 +++ sources 1 Mar 2006 01:16:43 -0000 1.7 @@ -1 +1 @@ -00882f5aba3f4c7c37c17497628d5eeb libgnomemm-2.12.1.tar.bz2 +c43421c77999f1c225ec5a39c6c64dff libgnomemm-2.12.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 01:18:03 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:18:03 -0500 Subject: rpms/xkeycaps/FC-3 xkeycaps.spec,1.4,1.5 Message-ID: <200603010118.k211IZeS016916@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xkeycaps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16851/FC-3 Modified Files: xkeycaps.spec Log Message: bump for fc5 Index: xkeycaps.spec =================================================================== RCS file: /cvs/extras/rpms/xkeycaps/FC-3/xkeycaps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xkeycaps.spec 17 Jan 2006 05:17:18 -0000 1.4 +++ xkeycaps.spec 1 Mar 2006 01:18:03 -0000 1.5 @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-ish Group: Applications/System Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z @@ -54,6 +54,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.46-4 +- bump for FC-5 + * Mon Jan 16 2006 Tom "spot" Callaway 2.46-3 - fix FC-3/FC-4 From fedora-extras-commits at redhat.com Wed Mar 1 01:18:09 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:18:09 -0500 Subject: rpms/xkeycaps/FC-4 xkeycaps.spec,1.4,1.5 Message-ID: <200603010118.k211If0O016919@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xkeycaps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16851/FC-4 Modified Files: xkeycaps.spec Log Message: bump for fc5 Index: xkeycaps.spec =================================================================== RCS file: /cvs/extras/rpms/xkeycaps/FC-4/xkeycaps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xkeycaps.spec 17 Jan 2006 05:17:24 -0000 1.4 +++ xkeycaps.spec 1 Mar 2006 01:18:09 -0000 1.5 @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-ish Group: Applications/System Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z @@ -54,6 +54,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.46-4 +- bump for FC-5 + * Mon Jan 16 2006 Tom "spot" Callaway 2.46-3 - fix FC-3/FC-4 From fedora-extras-commits at redhat.com Wed Mar 1 01:18:14 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:18:14 -0500 Subject: rpms/xkeycaps/devel xkeycaps.spec,1.2,1.3 Message-ID: <200603010118.k211Ilvn016922@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xkeycaps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16851/devel Modified Files: xkeycaps.spec Log Message: bump for fc5 Index: xkeycaps.spec =================================================================== RCS file: /cvs/extras/rpms/xkeycaps/devel/xkeycaps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xkeycaps.spec 17 Jan 2006 05:17:30 -0000 1.2 +++ xkeycaps.spec 1 Mar 2006 01:18:14 -0000 1.3 @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-ish Group: Applications/System Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z @@ -56,6 +56,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.46-4 +- bump for FC-5 + * Mon Jan 16 2006 Tom "spot" Callaway 2.46-3 - fix FC-3/FC-4 From fedora-extras-commits at redhat.com Wed Mar 1 01:27:29 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 28 Feb 2006 20:27:29 -0500 Subject: rpms/libgnomeuimm26/devel libgnomeuimm.spec,1.9,1.10 Message-ID: <200603010128.k211S2gi017133@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomeuimm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17116 Modified Files: libgnomeuimm.spec Log Message: Rebuild Index: libgnomeuimm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libgnomeuimm.spec 28 Nov 2005 00:15:35 -0000 1.9 +++ libgnomeuimm.spec 1 Mar 2006 01:27:29 -0000 1.10 @@ -1,6 +1,6 @@ Name: libgnomeuimm26 Version: 2.12.0 -Release: 2 +Release: 3 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -82,6 +82,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Feb 28 2006 Denis Leroy - 2.12.0-3 +- Rebuild + * Fri Nov 25 2005 Denis Leroy - 2.12.0-2 - Disabled static libraries From fedora-extras-commits at redhat.com Wed Mar 1 01:57:32 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 28 Feb 2006 20:57:32 -0500 Subject: rpms/inkscape/devel inkscape.spec,1.25,1.26 Message-ID: <200603010158.k211w5dW017366@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17349 Modified Files: inkscape.spec Log Message: Rebuild Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- inkscape.spec 17 Jan 2006 00:40:50 -0000 1.25 +++ inkscape.spec 1 Mar 2006 01:57:32 -0000 1.26 @@ -1,6 +1,6 @@ Name: inkscape Version: 0.43 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -106,6 +106,9 @@ %changelog +* Tue Feb 28 2006 Denis Leroy - 0.43-3 +- Rebuild + * Mon Jan 16 2006 Denis Leroy - 0.43-2 - Updated GC patch, bug 171791 From fedora-extras-commits at redhat.com Wed Mar 1 02:11:38 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 21:11:38 -0500 Subject: rpms/xsupplicant/FC-4 v19wireless.h, NONE, 1.1 sources, 1.5, 1.6 xsupplicant.spec, 1.14, 1.15 Message-ID: <200603010212.k212CBRF019321@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19280/FC-4 Modified Files: sources xsupplicant.spec Added Files: v19wireless.h Log Message: Bump xsupplicant to 1.2.3 on FC-4 and devel (FC-3 is too old now). --- NEW FILE v19wireless.h --- /* * This file define a set of standard wireless extensions * * Version : 19 18.3.05 * * Authors : Jean Tourrilhes - HPL - * Copyright (c) 1997-2005 Jean Tourrilhes, All Rights Reserved. */ #ifndef _LINUX_WIRELESS_H #define _LINUX_WIRELESS_H /************************** DOCUMENTATION **************************/ /* * Initial APIs (1996 -> onward) : * ----------------------------- * Basically, the wireless extensions are for now a set of standard ioctl * call + /proc/net/wireless * * The entry /proc/net/wireless give statistics and information on the * driver. * This is better than having each driver having its entry because * its centralised and we may remove the driver module safely. * * Ioctl are used to configure the driver and issue commands. This is * better than command line options of insmod because we may want to * change dynamically (while the driver is running) some parameters. * * The ioctl mechanimsm are copied from standard devices ioctl. * We have the list of command plus a structure descibing the * data exchanged... * Note that to add these ioctl, I was obliged to modify : * # net/core/dev.c (two place + add include) * # net/ipv4/af_inet.c (one place + add include) * * /proc/net/wireless is a copy of /proc/net/dev. * We have a structure for data passed from the driver to /proc/net/wireless * Too add this, I've modified : * # net/core/dev.c (two other places) * # include/linux/netdevice.h (one place) * # include/linux/proc_fs.h (one place) * * New driver API (2002 -> onward) : * ------------------------------- * This file is only concerned with the user space API and common definitions. * The new driver API is defined and documented in : * # include/net/iw_handler.h * * Note as well that /proc/net/wireless implementation has now moved in : * # net/core/wireless.c * * Wireless Events (2002 -> onward) : * -------------------------------- * Events are defined at the end of this file, and implemented in : * # net/core/wireless.c * * Other comments : * -------------- * Do not add here things that are redundant with other mechanisms * (drivers init, ifconfig, /proc/net/dev, ...) and with are not * wireless specific. * * These wireless extensions are not magic : each driver has to provide * support for them... * * IMPORTANT NOTE : As everything in the kernel, this is very much a * work in progress. Contact me if you have ideas of improvements... */ /***************************** INCLUDES *****************************/ #include /* for "caddr_t" et al */ #include /* for "struct sockaddr" et al */ #include /* for IFNAMSIZ and co... */ /***************************** VERSION *****************************/ /* * This constant is used to know the availability of the wireless * extensions and to know which version of wireless extensions it is * (there is some stuff that will be added in the future...) * I just plan to increment with each new version. */ #define WIRELESS_EXT 19 /* * Changes : * * V2 to V3 * -------- * Alan Cox start some incompatibles changes. I've integrated a bit more. * - Encryption renamed to Encode to avoid US regulation problems * - Frequency changed from float to struct to avoid problems on old 386 * * V3 to V4 * -------- * - Add sensitivity * * V4 to V5 * -------- * - Missing encoding definitions in range * - Access points stuff * * V5 to V6 * -------- * - 802.11 support (ESSID ioctls) * * V6 to V7 * -------- * - define IW_ESSID_MAX_SIZE and IW_MAX_AP * * V7 to V8 * -------- * - Changed my e-mail address * - More 802.11 support (nickname, rate, rts, frag) * - List index in frequencies * * V8 to V9 * -------- * - Support for 'mode of operation' (ad-hoc, managed...) * - Support for unicast and multicast power saving * - Change encoding to support larger tokens (>64 bits) * - Updated iw_params (disable, flags) and use it for NWID * - Extracted iw_point from iwreq for clarity * * V9 to V10 * --------- * - Add PM capability to range structure * - Add PM modifier : MAX/MIN/RELATIVE * - Add encoding option : IW_ENCODE_NOKEY * - Add TxPower ioctls (work like TxRate) * * V10 to V11 * ---------- * - Add WE version in range (help backward/forward compatibility) * - Add retry ioctls (work like PM) * * V11 to V12 * ---------- * - Add SIOCSIWSTATS to get /proc/net/wireless programatically * - Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space * - Add new statistics (frag, retry, beacon) * - Add average quality (for user space calibration) * * V12 to V13 * ---------- * - Document creation of new driver API. * - Extract union iwreq_data from struct iwreq (for new driver API). * - Rename SIOCSIWNAME as SIOCSIWCOMMIT * * V13 to V14 * ---------- * - Wireless Events support : define struct iw_event * - Define additional specific event numbers * - Add "addr" and "param" fields in union iwreq_data * - AP scanning stuff (SIOCSIWSCAN and friends) * * V14 to V15 * ---------- * - Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg * - Make struct iw_freq signed (both m & e), add explicit padding * - Add IWEVCUSTOM for driver specific event/scanning token * - Add IW_MAX_GET_SPY for driver returning a lot of addresses * - Add IW_TXPOW_RANGE for range of Tx Powers * - Add IWEVREGISTERED & IWEVEXPIRED events for Access Points * - Add IW_MODE_MONITOR for passive monitor * * V15 to V16 * ---------- * - Increase the number of bitrates in iw_range to 32 (for 802.11g) * - Increase the number of frequencies in iw_range to 32 (for 802.11b+a) * - Reshuffle struct iw_range for increases, add filler * - Increase IW_MAX_AP to 64 for driver returning a lot of addresses * - Remove IW_MAX_GET_SPY because conflict with enhanced spy support * - Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy" * - Add IW_ENCODE_TEMP and iw_range->encoding_login_index * * V16 to V17 * ---------- * - Add flags to frequency -> auto/fixed * - Document (struct iw_quality *)->updated, add new flags (INVALID) * - Wireless Event capability in struct iw_range * - Add support for relative TxPower (yick !) * * V17 to V18 (From Jouni Malinen ) * ---------- * - Add support for WPA/WPA2 * - Add extended encoding configuration (SIOCSIWENCODEEXT and * SIOCGIWENCODEEXT) * - Add SIOCSIWGENIE/SIOCGIWGENIE * - Add SIOCSIWMLME * - Add SIOCSIWPMKSA * - Add struct iw_range bit field for supported encoding capabilities * - Add optional scan request parameters for SIOCSIWSCAN * - Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA * related parameters (extensible up to 4096 parameter values) * - Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE, * IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND * * V18 to V19 * ---------- * - Remove (struct iw_point *)->pointer from events and streams * - Remove header includes to help user space * - Increase IW_ENCODING_TOKEN_MAX from 32 to 64 * - Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros * - Add explicit flag to tell stats are in dBm : IW_QUAL_DBM * - Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros */ /**************************** CONSTANTS ****************************/ /* -------------------------- IOCTL LIST -------------------------- */ /* Wireless Identification */ #define SIOCSIWCOMMIT 0x8B00 /* Commit pending changes to driver */ #define SIOCGIWNAME 0x8B01 /* get name == wireless protocol */ /* SIOCGIWNAME is used to verify the presence of Wireless Extensions. * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"... * Don't put the name of your driver there, it's useless. */ /* Basic operations */ #define SIOCSIWNWID 0x8B02 /* set network id (pre-802.11) */ #define SIOCGIWNWID 0x8B03 /* get network id (the cell) */ #define SIOCSIWFREQ 0x8B04 /* set channel/frequency (Hz) */ #define SIOCGIWFREQ 0x8B05 /* get channel/frequency (Hz) */ #define SIOCSIWMODE 0x8B06 /* set operation mode */ #define SIOCGIWMODE 0x8B07 /* get operation mode */ #define SIOCSIWSENS 0x8B08 /* set sensitivity (dBm) */ #define SIOCGIWSENS 0x8B09 /* get sensitivity (dBm) */ /* Informative stuff */ #define SIOCSIWRANGE 0x8B0A /* Unused */ #define SIOCGIWRANGE 0x8B0B /* Get range of parameters */ #define SIOCSIWPRIV 0x8B0C /* Unused */ #define SIOCGIWPRIV 0x8B0D /* get private ioctl interface info */ #define SIOCSIWSTATS 0x8B0E /* Unused */ #define SIOCGIWSTATS 0x8B0F /* Get /proc/net/wireless stats */ /* SIOCGIWSTATS is strictly used between user space and the kernel, and * is never passed to the driver (i.e. the driver will never see it). */ /* Spy support (statistics per MAC address - used for Mobile IP support) */ #define SIOCSIWSPY 0x8B10 /* set spy addresses */ #define SIOCGIWSPY 0x8B11 /* get spy info (quality of link) */ #define SIOCSIWTHRSPY 0x8B12 /* set spy threshold (spy event) */ #define SIOCGIWTHRSPY 0x8B13 /* get spy threshold */ /* Access Point manipulation */ #define SIOCSIWAP 0x8B14 /* set access point MAC addresses */ #define SIOCGIWAP 0x8B15 /* get access point MAC addresses */ #define SIOCGIWAPLIST 0x8B17 /* Deprecated in favor of scanning */ #define SIOCSIWSCAN 0x8B18 /* trigger scanning (list cells) */ #define SIOCGIWSCAN 0x8B19 /* get scanning results */ /* 802.11 specific support */ #define SIOCSIWESSID 0x8B1A /* set ESSID (network name) */ #define SIOCGIWESSID 0x8B1B /* get ESSID */ #define SIOCSIWNICKN 0x8B1C /* set node name/nickname */ #define SIOCGIWNICKN 0x8B1D /* get node name/nickname */ /* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit * within the 'iwreq' structure, so we need to use the 'data' member to * point to a string in user space, like it is done for RANGE... */ /* Other parameters useful in 802.11 and some other devices */ #define SIOCSIWRATE 0x8B20 /* set default bit rate (bps) */ #define SIOCGIWRATE 0x8B21 /* get default bit rate (bps) */ #define SIOCSIWRTS 0x8B22 /* set RTS/CTS threshold (bytes) */ #define SIOCGIWRTS 0x8B23 /* get RTS/CTS threshold (bytes) */ #define SIOCSIWFRAG 0x8B24 /* set fragmentation thr (bytes) */ #define SIOCGIWFRAG 0x8B25 /* get fragmentation thr (bytes) */ #define SIOCSIWTXPOW 0x8B26 /* set transmit power (dBm) */ #define SIOCGIWTXPOW 0x8B27 /* get transmit power (dBm) */ #define SIOCSIWRETRY 0x8B28 /* set retry limits and lifetime */ #define SIOCGIWRETRY 0x8B29 /* get retry limits and lifetime */ /* Encoding stuff (scrambling, hardware security, WEP...) */ #define SIOCSIWENCODE 0x8B2A /* set encoding token & mode */ #define SIOCGIWENCODE 0x8B2B /* get encoding token & mode */ /* Power saving stuff (power management, unicast and multicast) */ #define SIOCSIWPOWER 0x8B2C /* set Power Management settings */ #define SIOCGIWPOWER 0x8B2D /* get Power Management settings */ /* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM). * This ioctl uses struct iw_point and data buffer that includes IE id and len * fields. More than one IE may be included in the request. Setting the generic * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers * are required to report the used IE as a wireless event, e.g., when * associating with an AP. */ #define SIOCSIWGENIE 0x8B30 /* set generic IE */ #define SIOCGIWGENIE 0x8B31 /* get generic IE */ /* WPA : IEEE 802.11 MLME requests */ #define SIOCSIWMLME 0x8B16 /* request MLME operation; uses * struct iw_mlme */ /* WPA : Authentication mode parameters */ #define SIOCSIWAUTH 0x8B32 /* set authentication mode params */ #define SIOCGIWAUTH 0x8B33 /* get authentication mode params */ /* WPA : Extended version of encoding configuration */ #define SIOCSIWENCODEEXT 0x8B34 /* set encoding token & mode */ #define SIOCGIWENCODEEXT 0x8B35 /* get encoding token & mode */ /* WPA2 : PMKSA cache management */ #define SIOCSIWPMKSA 0x8B36 /* PMKSA cache operation */ /* -------------------- DEV PRIVATE IOCTL LIST -------------------- */ /* These 32 ioctl are wireless device private, for 16 commands. * Each driver is free to use them for whatever purpose it chooses, * however the driver *must* export the description of those ioctls * with SIOCGIWPRIV and *must* use arguments as defined below. * If you don't follow those rules, DaveM is going to hate you (reason : * it make mixed 32/64bit operation impossible). */ #define SIOCIWFIRSTPRIV 0x8BE0 #define SIOCIWLASTPRIV 0x8BFF /* Previously, we were using SIOCDEVPRIVATE, but we now have our * separate range because of collisions with other tools such as * 'mii-tool'. * We now have 32 commands, so a bit more space ;-). * Also, all 'odd' commands are only usable by root and don't return the * content of ifr/iwr to user (but you are not obliged to use the set/get * convention, just use every other two command). More details in iwpriv.c. * And I repeat : you are not forced to use them with iwpriv, but you * must be compliant with it. */ /* ------------------------- IOCTL STUFF ------------------------- */ /* The first and the last (range) */ #define SIOCIWFIRST 0x8B00 #define SIOCIWLAST SIOCIWLASTPRIV /* 0x8BFF */ #define IW_IOCTL_IDX(cmd) ((cmd) - SIOCIWFIRST) /* Even : get (world access), odd : set (root access) */ #define IW_IS_SET(cmd) (!((cmd) & 0x1)) #define IW_IS_GET(cmd) ((cmd) & 0x1) /* ----------------------- WIRELESS EVENTS ----------------------- */ /* Those are *NOT* ioctls, do not issue request on them !!! */ /* Most events use the same identifier as ioctl requests */ #define IWEVTXDROP 0x8C00 /* Packet dropped to excessive retry */ #define IWEVQUAL 0x8C01 /* Quality part of statistics (scan) */ #define IWEVCUSTOM 0x8C02 /* Driver specific ascii string */ #define IWEVREGISTERED 0x8C03 /* Discovered a new node (AP mode) */ #define IWEVEXPIRED 0x8C04 /* Expired a node (AP mode) */ #define IWEVGENIE 0x8C05 /* Generic IE (WPA, RSN, WMM, ..) * (scan results); This includes id and * length fields. One IWEVGENIE may * contain more than one IE. Scan * results may contain one or more * IWEVGENIE events. */ #define IWEVMICHAELMICFAILURE 0x8C06 /* Michael MIC failure * (struct iw_michaelmicfailure) */ #define IWEVASSOCREQIE 0x8C07 /* IEs used in (Re)Association Request. * The data includes id and length * fields and may contain more than one * IE. This event is required in * Managed mode if the driver * generates its own WPA/RSN IE. This * should be sent just before * IWEVREGISTERED event for the * association. */ #define IWEVASSOCRESPIE 0x8C08 /* IEs used in (Re)Association * Response. The data includes id and * length fields and may contain more * than one IE. This may be sent * between IWEVASSOCREQIE and * IWEVREGISTERED events for the * association. */ #define IWEVPMKIDCAND 0x8C09 /* PMKID candidate for RSN * pre-authentication * (struct iw_pmkid_cand) */ #define IWEVFIRST 0x8C00 #define IW_EVENT_IDX(cmd) ((cmd) - IWEVFIRST) /* ------------------------- PRIVATE INFO ------------------------- */ /* * The following is used with SIOCGIWPRIV. It allow a driver to define * the interface (name, type of data) for its private ioctl. * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV */ #define IW_PRIV_TYPE_MASK 0x7000 /* Type of arguments */ #define IW_PRIV_TYPE_NONE 0x0000 #define IW_PRIV_TYPE_BYTE 0x1000 /* Char as number */ #define IW_PRIV_TYPE_CHAR 0x2000 /* Char as character */ #define IW_PRIV_TYPE_INT 0x4000 /* 32 bits int */ #define IW_PRIV_TYPE_FLOAT 0x5000 /* struct iw_freq */ #define IW_PRIV_TYPE_ADDR 0x6000 /* struct sockaddr */ #define IW_PRIV_SIZE_FIXED 0x0800 /* Variable or fixed number of args */ #define IW_PRIV_SIZE_MASK 0x07FF /* Max number of those args */ /* * Note : if the number of args is fixed and the size < 16 octets, * instead of passing a pointer we will put args in the iwreq struct... */ /* ----------------------- OTHER CONSTANTS ----------------------- */ /* Maximum frequencies in the range struct */ #define IW_MAX_FREQUENCIES 32 /* Note : if you have something like 80 frequencies, * don't increase this constant and don't fill the frequency list. * The user will be able to set by channel anyway... */ /* Maximum bit rates in the range struct */ #define IW_MAX_BITRATES 32 /* Maximum tx powers in the range struct */ #define IW_MAX_TXPOWER 8 /* Note : if you more than 8 TXPowers, just set the max and min or * a few of them in the struct iw_range. */ /* Maximum of address that you may set with SPY */ #define IW_MAX_SPY 8 /* Maximum of address that you may get in the list of access points in range */ #define IW_MAX_AP 64 /* Maximum size of the ESSID and NICKN strings */ #define IW_ESSID_MAX_SIZE 32 /* Modes of operation */ #define IW_MODE_AUTO 0 /* Let the driver decides */ #define IW_MODE_ADHOC 1 /* Single cell network */ #define IW_MODE_INFRA 2 /* Multi cell network, roaming, ... */ #define IW_MODE_MASTER 3 /* Synchronisation master or Access Point */ #define IW_MODE_REPEAT 4 /* Wireless Repeater (forwarder) */ #define IW_MODE_SECOND 5 /* Secondary master/repeater (backup) */ #define IW_MODE_MONITOR 6 /* Passive monitor (listen only) */ /* Statistics flags (bitmask in updated) */ #define IW_QUAL_QUAL_UPDATED 0x01 /* Value was updated since last read */ #define IW_QUAL_LEVEL_UPDATED 0x02 #define IW_QUAL_NOISE_UPDATED 0x04 #define IW_QUAL_ALL_UPDATED 0x07 #define IW_QUAL_DBM 0x08 /* Level + Noise are dBm */ #define IW_QUAL_QUAL_INVALID 0x10 /* Driver doesn't provide value */ #define IW_QUAL_LEVEL_INVALID 0x20 #define IW_QUAL_NOISE_INVALID 0x40 #define IW_QUAL_ALL_INVALID 0x70 /* Frequency flags */ #define IW_FREQ_AUTO 0x00 /* Let the driver decides */ #define IW_FREQ_FIXED 0x01 /* Force a specific value */ /* Maximum number of size of encoding token available * they are listed in the range structure */ #define IW_MAX_ENCODING_SIZES 8 /* Maximum size of the encoding token in bytes */ #define IW_ENCODING_TOKEN_MAX 64 /* 512 bits (for now) */ /* Flags for encoding (along with the token) */ #define IW_ENCODE_INDEX 0x00FF /* Token index (if needed) */ #define IW_ENCODE_FLAGS 0xFF00 /* Flags defined below */ #define IW_ENCODE_MODE 0xF000 /* Modes defined below */ #define IW_ENCODE_DISABLED 0x8000 /* Encoding disabled */ #define IW_ENCODE_ENABLED 0x0000 /* Encoding enabled */ #define IW_ENCODE_RESTRICTED 0x4000 /* Refuse non-encoded packets */ #define IW_ENCODE_OPEN 0x2000 /* Accept non-encoded packets */ #define IW_ENCODE_NOKEY 0x0800 /* Key is write only, so not present */ #define IW_ENCODE_TEMP 0x0400 /* Temporary key */ /* Power management flags available (along with the value, if any) */ #define IW_POWER_ON 0x0000 /* No details... */ #define IW_POWER_TYPE 0xF000 /* Type of parameter */ #define IW_POWER_PERIOD 0x1000 /* Value is a period/duration of */ #define IW_POWER_TIMEOUT 0x2000 /* Value is a timeout (to go asleep) */ #define IW_POWER_MODE 0x0F00 /* Power Management mode */ #define IW_POWER_UNICAST_R 0x0100 /* Receive only unicast messages */ #define IW_POWER_MULTICAST_R 0x0200 /* Receive only multicast messages */ #define IW_POWER_ALL_R 0x0300 /* Receive all messages though PM */ #define IW_POWER_FORCE_S 0x0400 /* Force PM procedure for sending unicast */ #define IW_POWER_REPEATER 0x0800 /* Repeat broadcast messages in PM period */ #define IW_POWER_MODIFIER 0x000F /* Modify a parameter */ #define IW_POWER_MIN 0x0001 /* Value is a minimum */ #define IW_POWER_MAX 0x0002 /* Value is a maximum */ #define IW_POWER_RELATIVE 0x0004 /* Value is not in seconds/ms/us */ /* Transmit Power flags available */ #define IW_TXPOW_TYPE 0x00FF /* Type of value */ #define IW_TXPOW_DBM 0x0000 /* Value is in dBm */ #define IW_TXPOW_MWATT 0x0001 /* Value is in mW */ #define IW_TXPOW_RELATIVE 0x0002 /* Value is in arbitrary units */ #define IW_TXPOW_RANGE 0x1000 /* Range of value between min/max */ /* Retry limits and lifetime flags available */ #define IW_RETRY_ON 0x0000 /* No details... */ #define IW_RETRY_TYPE 0xF000 /* Type of parameter */ #define IW_RETRY_LIMIT 0x1000 /* Maximum number of retries*/ #define IW_RETRY_LIFETIME 0x2000 /* Maximum duration of retries in us */ #define IW_RETRY_MODIFIER 0x000F /* Modify a parameter */ #define IW_RETRY_MIN 0x0001 /* Value is a minimum */ #define IW_RETRY_MAX 0x0002 /* Value is a maximum */ #define IW_RETRY_RELATIVE 0x0004 /* Value is not in seconds/ms/us */ /* Scanning request flags */ #define IW_SCAN_DEFAULT 0x0000 /* Default scan of the driver */ #define IW_SCAN_ALL_ESSID 0x0001 /* Scan all ESSIDs */ #define IW_SCAN_THIS_ESSID 0x0002 /* Scan only this ESSID */ #define IW_SCAN_ALL_FREQ 0x0004 /* Scan all Frequencies */ #define IW_SCAN_THIS_FREQ 0x0008 /* Scan only this Frequency */ #define IW_SCAN_ALL_MODE 0x0010 /* Scan all Modes */ #define IW_SCAN_THIS_MODE 0x0020 /* Scan only this Mode */ #define IW_SCAN_ALL_RATE 0x0040 /* Scan all Bit-Rates */ #define IW_SCAN_THIS_RATE 0x0080 /* Scan only this Bit-Rate */ /* struct iw_scan_req scan_type */ #define IW_SCAN_TYPE_ACTIVE 0 #define IW_SCAN_TYPE_PASSIVE 1 /* Maximum size of returned data */ #define IW_SCAN_MAX_DATA 4096 /* In bytes */ /* Max number of char in custom event - use multiple of them if needed */ #define IW_CUSTOM_MAX 256 /* In bytes */ /* Generic information element */ #define IW_GENERIC_IE_MAX 1024 /* MLME requests (SIOCSIWMLME / struct iw_mlme) */ #define IW_MLME_DEAUTH 0 #define IW_MLME_DISASSOC 1 /* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */ #define IW_AUTH_INDEX 0x0FFF #define IW_AUTH_FLAGS 0xF000 /* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095) * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the * parameter that is being set/get to; value will be read/written to * struct iw_param value field) */ #define IW_AUTH_WPA_VERSION 0 #define IW_AUTH_CIPHER_PAIRWISE 1 #define IW_AUTH_CIPHER_GROUP 2 #define IW_AUTH_KEY_MGMT 3 #define IW_AUTH_TKIP_COUNTERMEASURES 4 #define IW_AUTH_DROP_UNENCRYPTED 5 #define IW_AUTH_80211_AUTH_ALG 6 #define IW_AUTH_WPA_ENABLED 7 #define IW_AUTH_RX_UNENCRYPTED_EAPOL 8 #define IW_AUTH_ROAMING_CONTROL 9 #define IW_AUTH_PRIVACY_INVOKED 10 /* IW_AUTH_WPA_VERSION values (bit field) */ #define IW_AUTH_WPA_VERSION_DISABLED 0x00000001 #define IW_AUTH_WPA_VERSION_WPA 0x00000002 #define IW_AUTH_WPA_VERSION_WPA2 0x00000004 /* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */ #define IW_AUTH_CIPHER_NONE 0x00000001 #define IW_AUTH_CIPHER_WEP40 0x00000002 #define IW_AUTH_CIPHER_TKIP 0x00000004 #define IW_AUTH_CIPHER_CCMP 0x00000008 #define IW_AUTH_CIPHER_WEP104 0x00000010 /* IW_AUTH_KEY_MGMT values (bit field) */ #define IW_AUTH_KEY_MGMT_802_1X 1 #define IW_AUTH_KEY_MGMT_PSK 2 /* IW_AUTH_80211_AUTH_ALG values (bit field) */ #define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001 #define IW_AUTH_ALG_SHARED_KEY 0x00000002 #define IW_AUTH_ALG_LEAP 0x00000004 /* IW_AUTH_ROAMING_CONTROL values */ #define IW_AUTH_ROAMING_ENABLE 0 /* driver/firmware based roaming */ #define IW_AUTH_ROAMING_DISABLE 1 /* user space program used for roaming * control */ /* SIOCSIWENCODEEXT definitions */ #define IW_ENCODE_SEQ_MAX_SIZE 8 /* struct iw_encode_ext ->alg */ #define IW_ENCODE_ALG_NONE 0 #define IW_ENCODE_ALG_WEP 1 #define IW_ENCODE_ALG_TKIP 2 #define IW_ENCODE_ALG_CCMP 3 /* struct iw_encode_ext ->ext_flags */ #define IW_ENCODE_EXT_TX_SEQ_VALID 0x00000001 #define IW_ENCODE_EXT_RX_SEQ_VALID 0x00000002 #define IW_ENCODE_EXT_GROUP_KEY 0x00000004 #define IW_ENCODE_EXT_SET_TX_KEY 0x00000008 /* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */ #define IW_MICFAILURE_KEY_ID 0x00000003 /* Key ID 0..3 */ #define IW_MICFAILURE_GROUP 0x00000004 #define IW_MICFAILURE_PAIRWISE 0x00000008 #define IW_MICFAILURE_STAKEY 0x00000010 #define IW_MICFAILURE_COUNT 0x00000060 /* 1 or 2 (0 = count not supported) */ /* Bit field values for enc_capa in struct iw_range */ #define IW_ENC_CAPA_WPA 0x00000001 #define IW_ENC_CAPA_WPA2 0x00000002 #define IW_ENC_CAPA_CIPHER_TKIP 0x00000004 #define IW_ENC_CAPA_CIPHER_CCMP 0x00000008 /* Event capability macros - in (struct iw_range *)->event_capa * Because we have more than 32 possible events, we use an array of * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */ #define IW_EVENT_CAPA_BASE(cmd) ((cmd >= SIOCIWFIRSTPRIV) ? \ (cmd - SIOCIWFIRSTPRIV + 0x60) : \ (cmd - SIOCSIWCOMMIT)) #define IW_EVENT_CAPA_INDEX(cmd) (IW_EVENT_CAPA_BASE(cmd) >> 5) #define IW_EVENT_CAPA_MASK(cmd) (1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F)) /* Event capability constants - event autogenerated by the kernel * This list is valid for most 802.11 devices, customise as needed... */ #define IW_EVENT_CAPA_K_0 (IW_EVENT_CAPA_MASK(0x8B04) | \ IW_EVENT_CAPA_MASK(0x8B06) | \ IW_EVENT_CAPA_MASK(0x8B1A)) #define IW_EVENT_CAPA_K_1 (IW_EVENT_CAPA_MASK(0x8B2A)) /* "Easy" macro to set events in iw_range (less efficient) */ #define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd)) #define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; } /****************************** TYPES ******************************/ /* --------------------------- SUBTYPES --------------------------- */ /* * Generic format for most parameters that fit in an int */ struct iw_param { __s32 value; /* The value of the parameter itself */ __u8 fixed; /* Hardware should not use auto select */ __u8 disabled; /* Disable the feature */ __u16 flags; /* Various specifc flags (if any) */ }; /* * For all data larger than 16 octets, we need to use a * pointer to memory allocated in user space. */ struct iw_point { void *pointer; /* Pointer to the data (in user space) */ __u16 length; /* number of fields or size in bytes */ __u16 flags; /* Optional params */ }; /* * A frequency * For numbers lower than 10^9, we encode the number in 'm' and * set 'e' to 0 * For number greater than 10^9, we divide it by the lowest power * of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')... * The power of 10 is in 'e', the result of the division is in 'm'. */ struct iw_freq { __s32 m; /* Mantissa */ __s16 e; /* Exponent */ __u8 i; /* List index (when in range struct) */ __u8 flags; /* Flags (fixed/auto) */ }; /* * Quality of the link */ struct iw_quality { __u8 qual; /* link quality (%retries, SNR, %missed beacons or better...) */ __u8 level; /* signal level (dBm) */ __u8 noise; /* noise level (dBm) */ __u8 updated; /* Flags to know if updated */ }; /* * Packet discarded in the wireless adapter due to * "wireless" specific problems... * Note : the list of counter and statistics in net_device_stats * is already pretty exhaustive, and you should use that first. * This is only additional stats... */ struct iw_discarded { __u32 nwid; /* Rx : Wrong nwid/essid */ __u32 code; /* Rx : Unable to code/decode (WEP) */ __u32 fragment; /* Rx : Can't perform MAC reassembly */ __u32 retries; /* Tx : Max MAC retries num reached */ __u32 misc; /* Others cases */ }; /* * Packet/Time period missed in the wireless adapter due to * "wireless" specific problems... */ struct iw_missed { __u32 beacon; /* Missed beacons/superframe */ }; /* * Quality range (for spy threshold) */ struct iw_thrspy { struct sockaddr addr; /* Source address (hw/mac) */ struct iw_quality qual; /* Quality of the link */ struct iw_quality low; /* Low threshold */ struct iw_quality high; /* High threshold */ }; /* * Optional data for scan request * * Note: these optional parameters are controlling parameters for the * scanning behavior, these do not apply to getting scan results * (SIOCGIWSCAN). Drivers are expected to keep a local BSS table and * provide a merged results with all BSSes even if the previous scan * request limited scanning to a subset, e.g., by specifying an SSID. * Especially, scan results are required to include an entry for the * current BSS if the driver is in Managed mode and associated with an AP. */ struct iw_scan_req { __u8 scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */ __u8 essid_len; __u8 num_channels; /* num entries in channel_list; * 0 = scan all allowed channels */ __u8 flags; /* reserved as padding; use zero, this may * be used in the future for adding flags * to request different scan behavior */ struct sockaddr bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or * individual address of a specific BSS */ /* * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using * the current ESSID. This allows scan requests for specific ESSID * without having to change the current ESSID and potentially breaking * the current association. */ __u8 essid[IW_ESSID_MAX_SIZE]; /* * Optional parameters for changing the default scanning behavior. * These are based on the MLME-SCAN.request from IEEE Std 802.11. * TU is 1.024 ms. If these are set to 0, driver is expected to use * reasonable default values. min_channel_time defines the time that * will be used to wait for the first reply on each channel. If no * replies are received, next channel will be scanned after this. If * replies are received, total time waited on the channel is defined by * max_channel_time. */ __u32 min_channel_time; /* in TU */ __u32 max_channel_time; /* in TU */ struct iw_freq channel_list[IW_MAX_FREQUENCIES]; }; /* ------------------------- WPA SUPPORT ------------------------- */ /* * Extended data structure for get/set encoding (this is used with * SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_* * flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and * only the data contents changes (key data -> this structure, including * key data). * * If the new key is the first group key, it will be set as the default * TX key. Otherwise, default TX key index is only changed if * IW_ENCODE_EXT_SET_TX_KEY flag is set. * * Key will be changed with SIOCSIWENCODEEXT in all cases except for * special "change TX key index" operation which is indicated by setting * key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY. * * tx_seq/rx_seq are only used when respective * IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal * TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start * TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally * used only by an Authenticator (AP or an IBSS station) to get the * current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and * RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for * debugging/testing. */ struct iw_encode_ext { __u32 ext_flags; /* IW_ENCODE_EXT_* */ __u8 tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ __u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ struct sockaddr addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast * (group) keys or unicast address for * individual keys */ __u16 alg; /* IW_ENCODE_ALG_* */ __u16 key_len; __u8 key[0]; }; /* SIOCSIWMLME data */ struct iw_mlme { __u16 cmd; /* IW_MLME_* */ __u16 reason_code; struct sockaddr addr; }; /* SIOCSIWPMKSA data */ #define IW_PMKSA_ADD 1 #define IW_PMKSA_REMOVE 2 #define IW_PMKSA_FLUSH 3 #define IW_PMKID_LEN 16 struct iw_pmksa { __u32 cmd; /* IW_PMKSA_* */ struct sockaddr bssid; __u8 pmkid[IW_PMKID_LEN]; }; /* IWEVMICHAELMICFAILURE data */ struct iw_michaelmicfailure { __u32 flags; struct sockaddr src_addr; __u8 tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ }; /* IWEVPMKIDCAND data */ #define IW_PMKID_CAND_PREAUTH 0x00000001 /* RNS pre-authentication enabled */ struct iw_pmkid_cand { __u32 flags; /* IW_PMKID_CAND_* */ __u32 index; /* the smaller the index, the higher the * priority */ struct sockaddr bssid; }; /* ------------------------ WIRELESS STATS ------------------------ */ /* * Wireless statistics (used for /proc/net/wireless) */ struct iw_statistics { __u16 status; /* Status * - device dependent for now */ struct iw_quality qual; /* Quality of the link * (instant/mean/max) */ struct iw_discarded discard; /* Packet discarded counts */ struct iw_missed miss; /* Packet missed counts */ }; /* ------------------------ IOCTL REQUEST ------------------------ */ /* * This structure defines the payload of an ioctl, and is used * below. * * Note that this structure should fit on the memory footprint * of iwreq (which is the same as ifreq), which mean a max size of * 16 octets = 128 bits. Warning, pointers might be 64 bits wide... * You should check this when increasing the structures defined * above in this file... */ union iwreq_data { /* Config - generic */ char name[IFNAMSIZ]; /* Name : used to verify the presence of wireless extensions. * Name of the protocol/provider... */ struct iw_point essid; /* Extended network name */ struct iw_param nwid; /* network id (or domain - the cell) */ struct iw_freq freq; /* frequency or channel : * 0-1000 = channel * > 1000 = frequency in Hz */ struct iw_param sens; /* signal level threshold */ struct iw_param bitrate; /* default bit rate */ struct iw_param txpower; /* default transmit power */ struct iw_param rts; /* RTS threshold threshold */ struct iw_param frag; /* Fragmentation threshold */ __u32 mode; /* Operation mode */ struct iw_param retry; /* Retry limits & lifetime */ struct iw_point encoding; /* Encoding stuff : tokens */ struct iw_param power; /* PM duration/timeout */ struct iw_quality qual; /* Quality part of statistics */ struct sockaddr ap_addr; /* Access point address */ struct sockaddr addr; /* Destination address (hw/mac) */ struct iw_param param; /* Other small parameters */ struct iw_point data; /* Other large parameters */ }; /* * The structure to exchange data for ioctl. * This structure is the same as 'struct ifreq', but (re)defined for * convenience... * Do I need to remind you about structure size (32 octets) ? */ struct iwreq { union { char ifrn_name[IFNAMSIZ]; /* if name, e.g. "eth0" */ } ifr_ifrn; /* Data part (defined just above) */ union iwreq_data u; }; /* -------------------------- IOCTL DATA -------------------------- */ /* * For those ioctl which want to exchange mode data that what could * fit in the above structure... */ /* * Range of parameters */ struct iw_range { /* Informative stuff (to choose between different interface) */ __u32 throughput; /* To give an idea... */ /* In theory this value should be the maximum benchmarked * TCP/IP throughput, because with most of these devices the * bit rate is meaningless (overhead an co) to estimate how * fast the connection will go and pick the fastest one. * I suggest people to play with Netperf or any benchmark... */ /* NWID (or domain id) */ __u32 min_nwid; /* Minimal NWID we are able to set */ __u32 max_nwid; /* Maximal NWID we are able to set */ /* Old Frequency (backward compat - moved lower ) */ __u16 old_num_channels; __u8 old_num_frequency; /* Wireless event capability bitmasks */ __u32 event_capa[6]; /* signal level threshold range */ __s32 sensitivity; /* Quality of link & SNR stuff */ /* Quality range (link, level, noise) * If the quality is absolute, it will be in the range [0 ; max_qual], * if the quality is dBm, it will be in the range [max_qual ; 0]. * Don't forget that we use 8 bit arithmetics... */ struct iw_quality max_qual; /* Quality of the link */ /* This should contain the average/typical values of the quality * indicator. This should be the threshold between a "good" and * a "bad" link (example : monitor going from green to orange). * Currently, user space apps like quality monitors don't have any * way to calibrate the measurement. With this, they can split * the range between 0 and max_qual in different quality level * (using a geometric subdivision centered on the average). * I expect that people doing the user space apps will feedback * us on which value we need to put in each driver... */ struct iw_quality avg_qual; /* Quality of the link */ /* Rates */ __u8 num_bitrates; /* Number of entries in the list */ __s32 bitrate[IW_MAX_BITRATES]; /* list, in bps */ /* RTS threshold */ __s32 min_rts; /* Minimal RTS threshold */ __s32 max_rts; /* Maximal RTS threshold */ /* Frag threshold */ __s32 min_frag; /* Minimal frag threshold */ __s32 max_frag; /* Maximal frag threshold */ /* Power Management duration & timeout */ __s32 min_pmp; /* Minimal PM period */ __s32 max_pmp; /* Maximal PM period */ __s32 min_pmt; /* Minimal PM timeout */ __s32 max_pmt; /* Maximal PM timeout */ __u16 pmp_flags; /* How to decode max/min PM period */ __u16 pmt_flags; /* How to decode max/min PM timeout */ __u16 pm_capa; /* What PM options are supported */ /* Encoder stuff */ __u16 encoding_size[IW_MAX_ENCODING_SIZES]; /* Different token sizes */ __u8 num_encoding_sizes; /* Number of entry in the list */ __u8 max_encoding_tokens; /* Max number of tokens */ /* For drivers that need a "login/passwd" form */ __u8 encoding_login_index; /* token index for login token */ /* Transmit power */ __u16 txpower_capa; /* What options are supported */ __u8 num_txpower; /* Number of entries in the list */ __s32 txpower[IW_MAX_TXPOWER]; /* list, in bps */ /* Wireless Extension version info */ __u8 we_version_compiled; /* Must be WIRELESS_EXT */ __u8 we_version_source; /* Last update of source */ /* Retry limits and lifetime */ __u16 retry_capa; /* What retry options are supported */ __u16 retry_flags; /* How to decode max/min retry limit */ __u16 r_time_flags; /* How to decode max/min retry life */ __s32 min_retry; /* Minimal number of retries */ __s32 max_retry; /* Maximal number of retries */ __s32 min_r_time; /* Minimal retry lifetime */ __s32 max_r_time; /* Maximal retry lifetime */ /* Frequency */ __u16 num_channels; /* Number of channels [0; num - 1] */ __u8 num_frequency; /* Number of entry in the list */ struct iw_freq freq[IW_MAX_FREQUENCIES]; /* list */ /* Note : this frequency list doesn't need to fit channel numbers, * because each entry contain its channel index */ __u32 enc_capa; /* IW_ENC_CAPA_* bit field */ }; /* * Private ioctl interface information */ struct iw_priv_args { __u32 cmd; /* Number of the ioctl to issue */ __u16 set_args; /* Type and number of args */ __u16 get_args; /* Type and number of args */ char name[IFNAMSIZ]; /* Name of the extension */ }; /* ----------------------- WIRELESS EVENTS ----------------------- */ /* * Wireless events are carried through the rtnetlink socket to user * space. They are encapsulated in the IFLA_WIRELESS field of * a RTM_NEWLINK message. */ /* * A Wireless Event. Contains basically the same data as the ioctl... */ struct iw_event { __u16 len; /* Real lenght of this stuff */ __u16 cmd; /* Wireless IOCTL */ union iwreq_data u; /* IOCTL fixed payload */ }; /* Size of the Event prefix (including padding and alignement junk) */ #define IW_EV_LCP_LEN (sizeof(struct iw_event) - sizeof(union iwreq_data)) /* Size of the various events */ #define IW_EV_CHAR_LEN (IW_EV_LCP_LEN + IFNAMSIZ) #define IW_EV_UINT_LEN (IW_EV_LCP_LEN + sizeof(__u32)) #define IW_EV_FREQ_LEN (IW_EV_LCP_LEN + sizeof(struct iw_freq)) #define IW_EV_PARAM_LEN (IW_EV_LCP_LEN + sizeof(struct iw_param)) #define IW_EV_ADDR_LEN (IW_EV_LCP_LEN + sizeof(struct sockaddr)) #define IW_EV_QUAL_LEN (IW_EV_LCP_LEN + sizeof(struct iw_quality)) /* iw_point events are special. First, the payload (extra data) come at * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second, * we omit the pointer, so start at an offset. */ #define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \ (char *) NULL) #define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - \ IW_EV_POINT_OFF) #endif /* _LINUX_WIRELESS_H */ Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Oct 2005 14:20:21 -0000 1.5 +++ sources 1 Mar 2006 02:11:38 -0000 1.6 @@ -1 +1 @@ -0e9aaf83a11f8eaff7c6564a53c25d8e xsupplicant-1.2.2.tar.gz +f583f13d5bb91f98dab106d3610a677f xsupplicant-1.2.3.tar.gz Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xsupplicant.spec 3 Jan 2006 14:52:38 -0000 1.14 +++ xsupplicant.spec 1 Mar 2006 02:11:38 -0000 1.15 @@ -1,17 +1,17 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 1.2.2 -Release: 7%{?dist} +Version: 1.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz +Source1: v19wireless.h BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex, openjade, lynx, jadetex BuildRequires: docbook-dtds, docbook-style-dsssl, wireless-tools Patch0: xsupplicant-1.2.1-docsfix.patch -Patch1: xsupplicant-1.2.2-compilefix.patch -Patch2: xsupplicant-1.2.2-buf.patch +Patch1: xsupplicant-1.2.3-fixincludes.patch %description This software allows a GNU/Linux or BSD workstation to authenticate with @@ -19,17 +19,30 @@ use is for computers with wireless LAN connections to complete a strong authentication before joining the network. +%package devel +Summary: Development files for xsupplicant +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development libraries and headers for xsupplicant. + %prep %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 + +# Fedora Core 4 and 5 ship with old headers, but V19 in the kernel +# So, we need to put the right headers in place. This is the simplest +# hack to solve this issue. +cp %{SOURCE1} src/ perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* %build %configure -make %{?_smp_mflags} +# _smp_mflags makes this app go BOOM +make cd doc ./builddocs.sh cd .. @@ -49,11 +62,24 @@ %config(noreplace) %{_sysconfdir}/xsupplicant.conf %{_bindir}/config-parser %{_bindir}/xsup_monitor +%{_bindir}/xsup_ntpwdhash %{_bindir}/xsup_set_pwd %{_bindir}/xsup_get_state %{_sbindir}/xsupplicant +%files devel +%defattr(-,root,root,-) +%{_includedir}/xsupconfcheck.h +%{_includedir}/xsupconfig.h +%{_includedir}/xsupconfwrite.h +%{_includedir}/xsupgui.h +%{_libdir}/libxsup*.a + %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-1 +- bump to 1.2.3 +- split package into main and devel + * Tue Jan 3 2006 Hans de Goede 1.2.2-7 - fix a possible bufferoverflow bz 170045 From fedora-extras-commits at redhat.com Wed Mar 1 02:11:46 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 21:11:46 -0500 Subject: rpms/xsupplicant/devel v19wireless.h, NONE, 1.1 xsupplicant-1.2.3-fixincludes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.5, 1.6 xsupplicant.spec, 1.15, 1.16 Message-ID: <200603010212.k212CJFv019326@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19280/devel Modified Files: .cvsignore sources xsupplicant.spec Added Files: v19wireless.h xsupplicant-1.2.3-fixincludes.patch Log Message: Bump xsupplicant to 1.2.3 on FC-4 and devel (FC-3 is too old now). --- NEW FILE v19wireless.h --- /* * This file define a set of standard wireless extensions * * Version : 19 18.3.05 * * Authors : Jean Tourrilhes - HPL - * Copyright (c) 1997-2005 Jean Tourrilhes, All Rights Reserved. */ #ifndef _LINUX_WIRELESS_H #define _LINUX_WIRELESS_H /************************** DOCUMENTATION **************************/ /* * Initial APIs (1996 -> onward) : * ----------------------------- * Basically, the wireless extensions are for now a set of standard ioctl * call + /proc/net/wireless * * The entry /proc/net/wireless give statistics and information on the * driver. * This is better than having each driver having its entry because * its centralised and we may remove the driver module safely. * * Ioctl are used to configure the driver and issue commands. This is * better than command line options of insmod because we may want to * change dynamically (while the driver is running) some parameters. * * The ioctl mechanimsm are copied from standard devices ioctl. * We have the list of command plus a structure descibing the * data exchanged... * Note that to add these ioctl, I was obliged to modify : * # net/core/dev.c (two place + add include) * # net/ipv4/af_inet.c (one place + add include) * * /proc/net/wireless is a copy of /proc/net/dev. * We have a structure for data passed from the driver to /proc/net/wireless * Too add this, I've modified : * # net/core/dev.c (two other places) * # include/linux/netdevice.h (one place) * # include/linux/proc_fs.h (one place) * * New driver API (2002 -> onward) : * ------------------------------- * This file is only concerned with the user space API and common definitions. * The new driver API is defined and documented in : * # include/net/iw_handler.h * * Note as well that /proc/net/wireless implementation has now moved in : * # net/core/wireless.c * * Wireless Events (2002 -> onward) : * -------------------------------- * Events are defined at the end of this file, and implemented in : * # net/core/wireless.c * * Other comments : * -------------- * Do not add here things that are redundant with other mechanisms * (drivers init, ifconfig, /proc/net/dev, ...) and with are not * wireless specific. * * These wireless extensions are not magic : each driver has to provide * support for them... * * IMPORTANT NOTE : As everything in the kernel, this is very much a * work in progress. Contact me if you have ideas of improvements... */ /***************************** INCLUDES *****************************/ #include /* for "caddr_t" et al */ #include /* for "struct sockaddr" et al */ #include /* for IFNAMSIZ and co... */ /***************************** VERSION *****************************/ /* * This constant is used to know the availability of the wireless * extensions and to know which version of wireless extensions it is * (there is some stuff that will be added in the future...) * I just plan to increment with each new version. */ #define WIRELESS_EXT 19 /* * Changes : * * V2 to V3 * -------- * Alan Cox start some incompatibles changes. I've integrated a bit more. * - Encryption renamed to Encode to avoid US regulation problems * - Frequency changed from float to struct to avoid problems on old 386 * * V3 to V4 * -------- * - Add sensitivity * * V4 to V5 * -------- * - Missing encoding definitions in range * - Access points stuff * * V5 to V6 * -------- * - 802.11 support (ESSID ioctls) * * V6 to V7 * -------- * - define IW_ESSID_MAX_SIZE and IW_MAX_AP * * V7 to V8 * -------- * - Changed my e-mail address * - More 802.11 support (nickname, rate, rts, frag) * - List index in frequencies * * V8 to V9 * -------- * - Support for 'mode of operation' (ad-hoc, managed...) * - Support for unicast and multicast power saving * - Change encoding to support larger tokens (>64 bits) * - Updated iw_params (disable, flags) and use it for NWID * - Extracted iw_point from iwreq for clarity * * V9 to V10 * --------- * - Add PM capability to range structure * - Add PM modifier : MAX/MIN/RELATIVE * - Add encoding option : IW_ENCODE_NOKEY * - Add TxPower ioctls (work like TxRate) * * V10 to V11 * ---------- * - Add WE version in range (help backward/forward compatibility) * - Add retry ioctls (work like PM) * * V11 to V12 * ---------- * - Add SIOCSIWSTATS to get /proc/net/wireless programatically * - Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space * - Add new statistics (frag, retry, beacon) * - Add average quality (for user space calibration) * * V12 to V13 * ---------- * - Document creation of new driver API. * - Extract union iwreq_data from struct iwreq (for new driver API). * - Rename SIOCSIWNAME as SIOCSIWCOMMIT * * V13 to V14 * ---------- * - Wireless Events support : define struct iw_event * - Define additional specific event numbers * - Add "addr" and "param" fields in union iwreq_data * - AP scanning stuff (SIOCSIWSCAN and friends) * * V14 to V15 * ---------- * - Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg * - Make struct iw_freq signed (both m & e), add explicit padding * - Add IWEVCUSTOM for driver specific event/scanning token * - Add IW_MAX_GET_SPY for driver returning a lot of addresses * - Add IW_TXPOW_RANGE for range of Tx Powers * - Add IWEVREGISTERED & IWEVEXPIRED events for Access Points * - Add IW_MODE_MONITOR for passive monitor * * V15 to V16 * ---------- * - Increase the number of bitrates in iw_range to 32 (for 802.11g) * - Increase the number of frequencies in iw_range to 32 (for 802.11b+a) * - Reshuffle struct iw_range for increases, add filler * - Increase IW_MAX_AP to 64 for driver returning a lot of addresses * - Remove IW_MAX_GET_SPY because conflict with enhanced spy support * - Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy" * - Add IW_ENCODE_TEMP and iw_range->encoding_login_index * * V16 to V17 * ---------- * - Add flags to frequency -> auto/fixed * - Document (struct iw_quality *)->updated, add new flags (INVALID) * - Wireless Event capability in struct iw_range * - Add support for relative TxPower (yick !) * * V17 to V18 (From Jouni Malinen ) * ---------- * - Add support for WPA/WPA2 * - Add extended encoding configuration (SIOCSIWENCODEEXT and * SIOCGIWENCODEEXT) * - Add SIOCSIWGENIE/SIOCGIWGENIE * - Add SIOCSIWMLME * - Add SIOCSIWPMKSA * - Add struct iw_range bit field for supported encoding capabilities * - Add optional scan request parameters for SIOCSIWSCAN * - Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA * related parameters (extensible up to 4096 parameter values) * - Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE, * IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND * * V18 to V19 * ---------- * - Remove (struct iw_point *)->pointer from events and streams * - Remove header includes to help user space * - Increase IW_ENCODING_TOKEN_MAX from 32 to 64 * - Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros * - Add explicit flag to tell stats are in dBm : IW_QUAL_DBM * - Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros */ /**************************** CONSTANTS ****************************/ /* -------------------------- IOCTL LIST -------------------------- */ /* Wireless Identification */ #define SIOCSIWCOMMIT 0x8B00 /* Commit pending changes to driver */ #define SIOCGIWNAME 0x8B01 /* get name == wireless protocol */ /* SIOCGIWNAME is used to verify the presence of Wireless Extensions. * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"... * Don't put the name of your driver there, it's useless. */ /* Basic operations */ #define SIOCSIWNWID 0x8B02 /* set network id (pre-802.11) */ #define SIOCGIWNWID 0x8B03 /* get network id (the cell) */ #define SIOCSIWFREQ 0x8B04 /* set channel/frequency (Hz) */ #define SIOCGIWFREQ 0x8B05 /* get channel/frequency (Hz) */ #define SIOCSIWMODE 0x8B06 /* set operation mode */ #define SIOCGIWMODE 0x8B07 /* get operation mode */ #define SIOCSIWSENS 0x8B08 /* set sensitivity (dBm) */ #define SIOCGIWSENS 0x8B09 /* get sensitivity (dBm) */ /* Informative stuff */ #define SIOCSIWRANGE 0x8B0A /* Unused */ #define SIOCGIWRANGE 0x8B0B /* Get range of parameters */ #define SIOCSIWPRIV 0x8B0C /* Unused */ #define SIOCGIWPRIV 0x8B0D /* get private ioctl interface info */ #define SIOCSIWSTATS 0x8B0E /* Unused */ #define SIOCGIWSTATS 0x8B0F /* Get /proc/net/wireless stats */ /* SIOCGIWSTATS is strictly used between user space and the kernel, and * is never passed to the driver (i.e. the driver will never see it). */ /* Spy support (statistics per MAC address - used for Mobile IP support) */ #define SIOCSIWSPY 0x8B10 /* set spy addresses */ #define SIOCGIWSPY 0x8B11 /* get spy info (quality of link) */ #define SIOCSIWTHRSPY 0x8B12 /* set spy threshold (spy event) */ #define SIOCGIWTHRSPY 0x8B13 /* get spy threshold */ /* Access Point manipulation */ #define SIOCSIWAP 0x8B14 /* set access point MAC addresses */ #define SIOCGIWAP 0x8B15 /* get access point MAC addresses */ #define SIOCGIWAPLIST 0x8B17 /* Deprecated in favor of scanning */ #define SIOCSIWSCAN 0x8B18 /* trigger scanning (list cells) */ #define SIOCGIWSCAN 0x8B19 /* get scanning results */ /* 802.11 specific support */ #define SIOCSIWESSID 0x8B1A /* set ESSID (network name) */ #define SIOCGIWESSID 0x8B1B /* get ESSID */ #define SIOCSIWNICKN 0x8B1C /* set node name/nickname */ #define SIOCGIWNICKN 0x8B1D /* get node name/nickname */ /* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit * within the 'iwreq' structure, so we need to use the 'data' member to * point to a string in user space, like it is done for RANGE... */ /* Other parameters useful in 802.11 and some other devices */ #define SIOCSIWRATE 0x8B20 /* set default bit rate (bps) */ #define SIOCGIWRATE 0x8B21 /* get default bit rate (bps) */ #define SIOCSIWRTS 0x8B22 /* set RTS/CTS threshold (bytes) */ #define SIOCGIWRTS 0x8B23 /* get RTS/CTS threshold (bytes) */ #define SIOCSIWFRAG 0x8B24 /* set fragmentation thr (bytes) */ #define SIOCGIWFRAG 0x8B25 /* get fragmentation thr (bytes) */ #define SIOCSIWTXPOW 0x8B26 /* set transmit power (dBm) */ #define SIOCGIWTXPOW 0x8B27 /* get transmit power (dBm) */ #define SIOCSIWRETRY 0x8B28 /* set retry limits and lifetime */ #define SIOCGIWRETRY 0x8B29 /* get retry limits and lifetime */ /* Encoding stuff (scrambling, hardware security, WEP...) */ #define SIOCSIWENCODE 0x8B2A /* set encoding token & mode */ #define SIOCGIWENCODE 0x8B2B /* get encoding token & mode */ /* Power saving stuff (power management, unicast and multicast) */ #define SIOCSIWPOWER 0x8B2C /* set Power Management settings */ #define SIOCGIWPOWER 0x8B2D /* get Power Management settings */ /* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM). * This ioctl uses struct iw_point and data buffer that includes IE id and len * fields. More than one IE may be included in the request. Setting the generic * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers * are required to report the used IE as a wireless event, e.g., when * associating with an AP. */ #define SIOCSIWGENIE 0x8B30 /* set generic IE */ #define SIOCGIWGENIE 0x8B31 /* get generic IE */ /* WPA : IEEE 802.11 MLME requests */ #define SIOCSIWMLME 0x8B16 /* request MLME operation; uses * struct iw_mlme */ /* WPA : Authentication mode parameters */ #define SIOCSIWAUTH 0x8B32 /* set authentication mode params */ #define SIOCGIWAUTH 0x8B33 /* get authentication mode params */ /* WPA : Extended version of encoding configuration */ #define SIOCSIWENCODEEXT 0x8B34 /* set encoding token & mode */ #define SIOCGIWENCODEEXT 0x8B35 /* get encoding token & mode */ /* WPA2 : PMKSA cache management */ #define SIOCSIWPMKSA 0x8B36 /* PMKSA cache operation */ /* -------------------- DEV PRIVATE IOCTL LIST -------------------- */ /* These 32 ioctl are wireless device private, for 16 commands. * Each driver is free to use them for whatever purpose it chooses, * however the driver *must* export the description of those ioctls * with SIOCGIWPRIV and *must* use arguments as defined below. * If you don't follow those rules, DaveM is going to hate you (reason : * it make mixed 32/64bit operation impossible). */ #define SIOCIWFIRSTPRIV 0x8BE0 #define SIOCIWLASTPRIV 0x8BFF /* Previously, we were using SIOCDEVPRIVATE, but we now have our * separate range because of collisions with other tools such as * 'mii-tool'. * We now have 32 commands, so a bit more space ;-). * Also, all 'odd' commands are only usable by root and don't return the * content of ifr/iwr to user (but you are not obliged to use the set/get * convention, just use every other two command). More details in iwpriv.c. * And I repeat : you are not forced to use them with iwpriv, but you * must be compliant with it. */ /* ------------------------- IOCTL STUFF ------------------------- */ /* The first and the last (range) */ #define SIOCIWFIRST 0x8B00 #define SIOCIWLAST SIOCIWLASTPRIV /* 0x8BFF */ #define IW_IOCTL_IDX(cmd) ((cmd) - SIOCIWFIRST) /* Even : get (world access), odd : set (root access) */ #define IW_IS_SET(cmd) (!((cmd) & 0x1)) #define IW_IS_GET(cmd) ((cmd) & 0x1) /* ----------------------- WIRELESS EVENTS ----------------------- */ /* Those are *NOT* ioctls, do not issue request on them !!! */ /* Most events use the same identifier as ioctl requests */ #define IWEVTXDROP 0x8C00 /* Packet dropped to excessive retry */ #define IWEVQUAL 0x8C01 /* Quality part of statistics (scan) */ #define IWEVCUSTOM 0x8C02 /* Driver specific ascii string */ #define IWEVREGISTERED 0x8C03 /* Discovered a new node (AP mode) */ #define IWEVEXPIRED 0x8C04 /* Expired a node (AP mode) */ #define IWEVGENIE 0x8C05 /* Generic IE (WPA, RSN, WMM, ..) * (scan results); This includes id and * length fields. One IWEVGENIE may * contain more than one IE. Scan * results may contain one or more * IWEVGENIE events. */ #define IWEVMICHAELMICFAILURE 0x8C06 /* Michael MIC failure * (struct iw_michaelmicfailure) */ #define IWEVASSOCREQIE 0x8C07 /* IEs used in (Re)Association Request. * The data includes id and length * fields and may contain more than one * IE. This event is required in * Managed mode if the driver * generates its own WPA/RSN IE. This * should be sent just before * IWEVREGISTERED event for the * association. */ #define IWEVASSOCRESPIE 0x8C08 /* IEs used in (Re)Association * Response. The data includes id and * length fields and may contain more * than one IE. This may be sent * between IWEVASSOCREQIE and * IWEVREGISTERED events for the * association. */ #define IWEVPMKIDCAND 0x8C09 /* PMKID candidate for RSN * pre-authentication * (struct iw_pmkid_cand) */ #define IWEVFIRST 0x8C00 #define IW_EVENT_IDX(cmd) ((cmd) - IWEVFIRST) /* ------------------------- PRIVATE INFO ------------------------- */ /* * The following is used with SIOCGIWPRIV. It allow a driver to define * the interface (name, type of data) for its private ioctl. * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV */ #define IW_PRIV_TYPE_MASK 0x7000 /* Type of arguments */ #define IW_PRIV_TYPE_NONE 0x0000 #define IW_PRIV_TYPE_BYTE 0x1000 /* Char as number */ #define IW_PRIV_TYPE_CHAR 0x2000 /* Char as character */ #define IW_PRIV_TYPE_INT 0x4000 /* 32 bits int */ #define IW_PRIV_TYPE_FLOAT 0x5000 /* struct iw_freq */ #define IW_PRIV_TYPE_ADDR 0x6000 /* struct sockaddr */ #define IW_PRIV_SIZE_FIXED 0x0800 /* Variable or fixed number of args */ #define IW_PRIV_SIZE_MASK 0x07FF /* Max number of those args */ /* * Note : if the number of args is fixed and the size < 16 octets, * instead of passing a pointer we will put args in the iwreq struct... */ /* ----------------------- OTHER CONSTANTS ----------------------- */ /* Maximum frequencies in the range struct */ #define IW_MAX_FREQUENCIES 32 /* Note : if you have something like 80 frequencies, * don't increase this constant and don't fill the frequency list. * The user will be able to set by channel anyway... */ /* Maximum bit rates in the range struct */ #define IW_MAX_BITRATES 32 /* Maximum tx powers in the range struct */ #define IW_MAX_TXPOWER 8 /* Note : if you more than 8 TXPowers, just set the max and min or * a few of them in the struct iw_range. */ /* Maximum of address that you may set with SPY */ #define IW_MAX_SPY 8 /* Maximum of address that you may get in the list of access points in range */ #define IW_MAX_AP 64 /* Maximum size of the ESSID and NICKN strings */ #define IW_ESSID_MAX_SIZE 32 /* Modes of operation */ #define IW_MODE_AUTO 0 /* Let the driver decides */ #define IW_MODE_ADHOC 1 /* Single cell network */ #define IW_MODE_INFRA 2 /* Multi cell network, roaming, ... */ #define IW_MODE_MASTER 3 /* Synchronisation master or Access Point */ #define IW_MODE_REPEAT 4 /* Wireless Repeater (forwarder) */ #define IW_MODE_SECOND 5 /* Secondary master/repeater (backup) */ #define IW_MODE_MONITOR 6 /* Passive monitor (listen only) */ /* Statistics flags (bitmask in updated) */ #define IW_QUAL_QUAL_UPDATED 0x01 /* Value was updated since last read */ #define IW_QUAL_LEVEL_UPDATED 0x02 #define IW_QUAL_NOISE_UPDATED 0x04 #define IW_QUAL_ALL_UPDATED 0x07 #define IW_QUAL_DBM 0x08 /* Level + Noise are dBm */ #define IW_QUAL_QUAL_INVALID 0x10 /* Driver doesn't provide value */ #define IW_QUAL_LEVEL_INVALID 0x20 #define IW_QUAL_NOISE_INVALID 0x40 #define IW_QUAL_ALL_INVALID 0x70 /* Frequency flags */ #define IW_FREQ_AUTO 0x00 /* Let the driver decides */ #define IW_FREQ_FIXED 0x01 /* Force a specific value */ /* Maximum number of size of encoding token available * they are listed in the range structure */ #define IW_MAX_ENCODING_SIZES 8 /* Maximum size of the encoding token in bytes */ #define IW_ENCODING_TOKEN_MAX 64 /* 512 bits (for now) */ /* Flags for encoding (along with the token) */ #define IW_ENCODE_INDEX 0x00FF /* Token index (if needed) */ #define IW_ENCODE_FLAGS 0xFF00 /* Flags defined below */ #define IW_ENCODE_MODE 0xF000 /* Modes defined below */ #define IW_ENCODE_DISABLED 0x8000 /* Encoding disabled */ #define IW_ENCODE_ENABLED 0x0000 /* Encoding enabled */ #define IW_ENCODE_RESTRICTED 0x4000 /* Refuse non-encoded packets */ #define IW_ENCODE_OPEN 0x2000 /* Accept non-encoded packets */ #define IW_ENCODE_NOKEY 0x0800 /* Key is write only, so not present */ #define IW_ENCODE_TEMP 0x0400 /* Temporary key */ /* Power management flags available (along with the value, if any) */ #define IW_POWER_ON 0x0000 /* No details... */ #define IW_POWER_TYPE 0xF000 /* Type of parameter */ #define IW_POWER_PERIOD 0x1000 /* Value is a period/duration of */ #define IW_POWER_TIMEOUT 0x2000 /* Value is a timeout (to go asleep) */ #define IW_POWER_MODE 0x0F00 /* Power Management mode */ #define IW_POWER_UNICAST_R 0x0100 /* Receive only unicast messages */ #define IW_POWER_MULTICAST_R 0x0200 /* Receive only multicast messages */ #define IW_POWER_ALL_R 0x0300 /* Receive all messages though PM */ #define IW_POWER_FORCE_S 0x0400 /* Force PM procedure for sending unicast */ #define IW_POWER_REPEATER 0x0800 /* Repeat broadcast messages in PM period */ #define IW_POWER_MODIFIER 0x000F /* Modify a parameter */ #define IW_POWER_MIN 0x0001 /* Value is a minimum */ #define IW_POWER_MAX 0x0002 /* Value is a maximum */ #define IW_POWER_RELATIVE 0x0004 /* Value is not in seconds/ms/us */ /* Transmit Power flags available */ #define IW_TXPOW_TYPE 0x00FF /* Type of value */ #define IW_TXPOW_DBM 0x0000 /* Value is in dBm */ #define IW_TXPOW_MWATT 0x0001 /* Value is in mW */ #define IW_TXPOW_RELATIVE 0x0002 /* Value is in arbitrary units */ #define IW_TXPOW_RANGE 0x1000 /* Range of value between min/max */ /* Retry limits and lifetime flags available */ #define IW_RETRY_ON 0x0000 /* No details... */ #define IW_RETRY_TYPE 0xF000 /* Type of parameter */ #define IW_RETRY_LIMIT 0x1000 /* Maximum number of retries*/ #define IW_RETRY_LIFETIME 0x2000 /* Maximum duration of retries in us */ #define IW_RETRY_MODIFIER 0x000F /* Modify a parameter */ #define IW_RETRY_MIN 0x0001 /* Value is a minimum */ #define IW_RETRY_MAX 0x0002 /* Value is a maximum */ #define IW_RETRY_RELATIVE 0x0004 /* Value is not in seconds/ms/us */ /* Scanning request flags */ #define IW_SCAN_DEFAULT 0x0000 /* Default scan of the driver */ #define IW_SCAN_ALL_ESSID 0x0001 /* Scan all ESSIDs */ #define IW_SCAN_THIS_ESSID 0x0002 /* Scan only this ESSID */ #define IW_SCAN_ALL_FREQ 0x0004 /* Scan all Frequencies */ #define IW_SCAN_THIS_FREQ 0x0008 /* Scan only this Frequency */ #define IW_SCAN_ALL_MODE 0x0010 /* Scan all Modes */ #define IW_SCAN_THIS_MODE 0x0020 /* Scan only this Mode */ #define IW_SCAN_ALL_RATE 0x0040 /* Scan all Bit-Rates */ #define IW_SCAN_THIS_RATE 0x0080 /* Scan only this Bit-Rate */ /* struct iw_scan_req scan_type */ #define IW_SCAN_TYPE_ACTIVE 0 #define IW_SCAN_TYPE_PASSIVE 1 /* Maximum size of returned data */ #define IW_SCAN_MAX_DATA 4096 /* In bytes */ /* Max number of char in custom event - use multiple of them if needed */ #define IW_CUSTOM_MAX 256 /* In bytes */ /* Generic information element */ #define IW_GENERIC_IE_MAX 1024 /* MLME requests (SIOCSIWMLME / struct iw_mlme) */ #define IW_MLME_DEAUTH 0 #define IW_MLME_DISASSOC 1 /* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */ #define IW_AUTH_INDEX 0x0FFF #define IW_AUTH_FLAGS 0xF000 /* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095) * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the * parameter that is being set/get to; value will be read/written to * struct iw_param value field) */ #define IW_AUTH_WPA_VERSION 0 #define IW_AUTH_CIPHER_PAIRWISE 1 #define IW_AUTH_CIPHER_GROUP 2 #define IW_AUTH_KEY_MGMT 3 #define IW_AUTH_TKIP_COUNTERMEASURES 4 #define IW_AUTH_DROP_UNENCRYPTED 5 #define IW_AUTH_80211_AUTH_ALG 6 #define IW_AUTH_WPA_ENABLED 7 #define IW_AUTH_RX_UNENCRYPTED_EAPOL 8 #define IW_AUTH_ROAMING_CONTROL 9 #define IW_AUTH_PRIVACY_INVOKED 10 /* IW_AUTH_WPA_VERSION values (bit field) */ #define IW_AUTH_WPA_VERSION_DISABLED 0x00000001 #define IW_AUTH_WPA_VERSION_WPA 0x00000002 #define IW_AUTH_WPA_VERSION_WPA2 0x00000004 /* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */ #define IW_AUTH_CIPHER_NONE 0x00000001 #define IW_AUTH_CIPHER_WEP40 0x00000002 #define IW_AUTH_CIPHER_TKIP 0x00000004 #define IW_AUTH_CIPHER_CCMP 0x00000008 #define IW_AUTH_CIPHER_WEP104 0x00000010 /* IW_AUTH_KEY_MGMT values (bit field) */ #define IW_AUTH_KEY_MGMT_802_1X 1 #define IW_AUTH_KEY_MGMT_PSK 2 /* IW_AUTH_80211_AUTH_ALG values (bit field) */ #define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001 #define IW_AUTH_ALG_SHARED_KEY 0x00000002 #define IW_AUTH_ALG_LEAP 0x00000004 /* IW_AUTH_ROAMING_CONTROL values */ #define IW_AUTH_ROAMING_ENABLE 0 /* driver/firmware based roaming */ #define IW_AUTH_ROAMING_DISABLE 1 /* user space program used for roaming * control */ /* SIOCSIWENCODEEXT definitions */ #define IW_ENCODE_SEQ_MAX_SIZE 8 /* struct iw_encode_ext ->alg */ #define IW_ENCODE_ALG_NONE 0 #define IW_ENCODE_ALG_WEP 1 #define IW_ENCODE_ALG_TKIP 2 #define IW_ENCODE_ALG_CCMP 3 /* struct iw_encode_ext ->ext_flags */ #define IW_ENCODE_EXT_TX_SEQ_VALID 0x00000001 #define IW_ENCODE_EXT_RX_SEQ_VALID 0x00000002 #define IW_ENCODE_EXT_GROUP_KEY 0x00000004 #define IW_ENCODE_EXT_SET_TX_KEY 0x00000008 /* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */ #define IW_MICFAILURE_KEY_ID 0x00000003 /* Key ID 0..3 */ #define IW_MICFAILURE_GROUP 0x00000004 #define IW_MICFAILURE_PAIRWISE 0x00000008 #define IW_MICFAILURE_STAKEY 0x00000010 #define IW_MICFAILURE_COUNT 0x00000060 /* 1 or 2 (0 = count not supported) */ /* Bit field values for enc_capa in struct iw_range */ #define IW_ENC_CAPA_WPA 0x00000001 #define IW_ENC_CAPA_WPA2 0x00000002 #define IW_ENC_CAPA_CIPHER_TKIP 0x00000004 #define IW_ENC_CAPA_CIPHER_CCMP 0x00000008 /* Event capability macros - in (struct iw_range *)->event_capa * Because we have more than 32 possible events, we use an array of * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */ #define IW_EVENT_CAPA_BASE(cmd) ((cmd >= SIOCIWFIRSTPRIV) ? \ (cmd - SIOCIWFIRSTPRIV + 0x60) : \ (cmd - SIOCSIWCOMMIT)) #define IW_EVENT_CAPA_INDEX(cmd) (IW_EVENT_CAPA_BASE(cmd) >> 5) #define IW_EVENT_CAPA_MASK(cmd) (1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F)) /* Event capability constants - event autogenerated by the kernel * This list is valid for most 802.11 devices, customise as needed... */ #define IW_EVENT_CAPA_K_0 (IW_EVENT_CAPA_MASK(0x8B04) | \ IW_EVENT_CAPA_MASK(0x8B06) | \ IW_EVENT_CAPA_MASK(0x8B1A)) #define IW_EVENT_CAPA_K_1 (IW_EVENT_CAPA_MASK(0x8B2A)) /* "Easy" macro to set events in iw_range (less efficient) */ #define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd)) #define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; } /****************************** TYPES ******************************/ /* --------------------------- SUBTYPES --------------------------- */ /* * Generic format for most parameters that fit in an int */ struct iw_param { __s32 value; /* The value of the parameter itself */ __u8 fixed; /* Hardware should not use auto select */ __u8 disabled; /* Disable the feature */ __u16 flags; /* Various specifc flags (if any) */ }; /* * For all data larger than 16 octets, we need to use a * pointer to memory allocated in user space. */ struct iw_point { void *pointer; /* Pointer to the data (in user space) */ __u16 length; /* number of fields or size in bytes */ __u16 flags; /* Optional params */ }; /* * A frequency * For numbers lower than 10^9, we encode the number in 'm' and * set 'e' to 0 * For number greater than 10^9, we divide it by the lowest power * of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')... * The power of 10 is in 'e', the result of the division is in 'm'. */ struct iw_freq { __s32 m; /* Mantissa */ __s16 e; /* Exponent */ __u8 i; /* List index (when in range struct) */ __u8 flags; /* Flags (fixed/auto) */ }; /* * Quality of the link */ struct iw_quality { __u8 qual; /* link quality (%retries, SNR, %missed beacons or better...) */ __u8 level; /* signal level (dBm) */ __u8 noise; /* noise level (dBm) */ __u8 updated; /* Flags to know if updated */ }; /* * Packet discarded in the wireless adapter due to * "wireless" specific problems... * Note : the list of counter and statistics in net_device_stats * is already pretty exhaustive, and you should use that first. * This is only additional stats... */ struct iw_discarded { __u32 nwid; /* Rx : Wrong nwid/essid */ __u32 code; /* Rx : Unable to code/decode (WEP) */ __u32 fragment; /* Rx : Can't perform MAC reassembly */ __u32 retries; /* Tx : Max MAC retries num reached */ __u32 misc; /* Others cases */ }; /* * Packet/Time period missed in the wireless adapter due to * "wireless" specific problems... */ struct iw_missed { __u32 beacon; /* Missed beacons/superframe */ }; /* * Quality range (for spy threshold) */ struct iw_thrspy { struct sockaddr addr; /* Source address (hw/mac) */ struct iw_quality qual; /* Quality of the link */ struct iw_quality low; /* Low threshold */ struct iw_quality high; /* High threshold */ }; /* * Optional data for scan request * * Note: these optional parameters are controlling parameters for the * scanning behavior, these do not apply to getting scan results * (SIOCGIWSCAN). Drivers are expected to keep a local BSS table and * provide a merged results with all BSSes even if the previous scan * request limited scanning to a subset, e.g., by specifying an SSID. * Especially, scan results are required to include an entry for the * current BSS if the driver is in Managed mode and associated with an AP. */ struct iw_scan_req { __u8 scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */ __u8 essid_len; __u8 num_channels; /* num entries in channel_list; * 0 = scan all allowed channels */ __u8 flags; /* reserved as padding; use zero, this may * be used in the future for adding flags * to request different scan behavior */ struct sockaddr bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or * individual address of a specific BSS */ /* * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using * the current ESSID. This allows scan requests for specific ESSID * without having to change the current ESSID and potentially breaking * the current association. */ __u8 essid[IW_ESSID_MAX_SIZE]; /* * Optional parameters for changing the default scanning behavior. * These are based on the MLME-SCAN.request from IEEE Std 802.11. * TU is 1.024 ms. If these are set to 0, driver is expected to use * reasonable default values. min_channel_time defines the time that * will be used to wait for the first reply on each channel. If no * replies are received, next channel will be scanned after this. If * replies are received, total time waited on the channel is defined by * max_channel_time. */ __u32 min_channel_time; /* in TU */ __u32 max_channel_time; /* in TU */ struct iw_freq channel_list[IW_MAX_FREQUENCIES]; }; /* ------------------------- WPA SUPPORT ------------------------- */ /* * Extended data structure for get/set encoding (this is used with * SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_* * flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and * only the data contents changes (key data -> this structure, including * key data). * * If the new key is the first group key, it will be set as the default * TX key. Otherwise, default TX key index is only changed if * IW_ENCODE_EXT_SET_TX_KEY flag is set. * * Key will be changed with SIOCSIWENCODEEXT in all cases except for * special "change TX key index" operation which is indicated by setting * key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY. * * tx_seq/rx_seq are only used when respective * IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal * TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start * TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally * used only by an Authenticator (AP or an IBSS station) to get the * current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and * RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for * debugging/testing. */ struct iw_encode_ext { __u32 ext_flags; /* IW_ENCODE_EXT_* */ __u8 tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ __u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ struct sockaddr addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast * (group) keys or unicast address for * individual keys */ __u16 alg; /* IW_ENCODE_ALG_* */ __u16 key_len; __u8 key[0]; }; /* SIOCSIWMLME data */ struct iw_mlme { __u16 cmd; /* IW_MLME_* */ __u16 reason_code; struct sockaddr addr; }; /* SIOCSIWPMKSA data */ #define IW_PMKSA_ADD 1 #define IW_PMKSA_REMOVE 2 #define IW_PMKSA_FLUSH 3 #define IW_PMKID_LEN 16 struct iw_pmksa { __u32 cmd; /* IW_PMKSA_* */ struct sockaddr bssid; __u8 pmkid[IW_PMKID_LEN]; }; /* IWEVMICHAELMICFAILURE data */ struct iw_michaelmicfailure { __u32 flags; struct sockaddr src_addr; __u8 tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ }; /* IWEVPMKIDCAND data */ #define IW_PMKID_CAND_PREAUTH 0x00000001 /* RNS pre-authentication enabled */ struct iw_pmkid_cand { __u32 flags; /* IW_PMKID_CAND_* */ __u32 index; /* the smaller the index, the higher the * priority */ struct sockaddr bssid; }; /* ------------------------ WIRELESS STATS ------------------------ */ /* * Wireless statistics (used for /proc/net/wireless) */ struct iw_statistics { __u16 status; /* Status * - device dependent for now */ struct iw_quality qual; /* Quality of the link * (instant/mean/max) */ struct iw_discarded discard; /* Packet discarded counts */ struct iw_missed miss; /* Packet missed counts */ }; /* ------------------------ IOCTL REQUEST ------------------------ */ /* * This structure defines the payload of an ioctl, and is used * below. * * Note that this structure should fit on the memory footprint * of iwreq (which is the same as ifreq), which mean a max size of * 16 octets = 128 bits. Warning, pointers might be 64 bits wide... * You should check this when increasing the structures defined * above in this file... */ union iwreq_data { /* Config - generic */ char name[IFNAMSIZ]; /* Name : used to verify the presence of wireless extensions. * Name of the protocol/provider... */ struct iw_point essid; /* Extended network name */ struct iw_param nwid; /* network id (or domain - the cell) */ struct iw_freq freq; /* frequency or channel : * 0-1000 = channel * > 1000 = frequency in Hz */ struct iw_param sens; /* signal level threshold */ struct iw_param bitrate; /* default bit rate */ struct iw_param txpower; /* default transmit power */ struct iw_param rts; /* RTS threshold threshold */ struct iw_param frag; /* Fragmentation threshold */ __u32 mode; /* Operation mode */ struct iw_param retry; /* Retry limits & lifetime */ struct iw_point encoding; /* Encoding stuff : tokens */ struct iw_param power; /* PM duration/timeout */ struct iw_quality qual; /* Quality part of statistics */ struct sockaddr ap_addr; /* Access point address */ struct sockaddr addr; /* Destination address (hw/mac) */ struct iw_param param; /* Other small parameters */ struct iw_point data; /* Other large parameters */ }; /* * The structure to exchange data for ioctl. * This structure is the same as 'struct ifreq', but (re)defined for * convenience... * Do I need to remind you about structure size (32 octets) ? */ struct iwreq { union { char ifrn_name[IFNAMSIZ]; /* if name, e.g. "eth0" */ } ifr_ifrn; /* Data part (defined just above) */ union iwreq_data u; }; /* -------------------------- IOCTL DATA -------------------------- */ /* * For those ioctl which want to exchange mode data that what could * fit in the above structure... */ /* * Range of parameters */ struct iw_range { /* Informative stuff (to choose between different interface) */ __u32 throughput; /* To give an idea... */ /* In theory this value should be the maximum benchmarked * TCP/IP throughput, because with most of these devices the * bit rate is meaningless (overhead an co) to estimate how * fast the connection will go and pick the fastest one. * I suggest people to play with Netperf or any benchmark... */ /* NWID (or domain id) */ __u32 min_nwid; /* Minimal NWID we are able to set */ __u32 max_nwid; /* Maximal NWID we are able to set */ /* Old Frequency (backward compat - moved lower ) */ __u16 old_num_channels; __u8 old_num_frequency; /* Wireless event capability bitmasks */ __u32 event_capa[6]; /* signal level threshold range */ __s32 sensitivity; /* Quality of link & SNR stuff */ /* Quality range (link, level, noise) * If the quality is absolute, it will be in the range [0 ; max_qual], * if the quality is dBm, it will be in the range [max_qual ; 0]. * Don't forget that we use 8 bit arithmetics... */ struct iw_quality max_qual; /* Quality of the link */ /* This should contain the average/typical values of the quality * indicator. This should be the threshold between a "good" and * a "bad" link (example : monitor going from green to orange). * Currently, user space apps like quality monitors don't have any * way to calibrate the measurement. With this, they can split * the range between 0 and max_qual in different quality level * (using a geometric subdivision centered on the average). * I expect that people doing the user space apps will feedback * us on which value we need to put in each driver... */ struct iw_quality avg_qual; /* Quality of the link */ /* Rates */ __u8 num_bitrates; /* Number of entries in the list */ __s32 bitrate[IW_MAX_BITRATES]; /* list, in bps */ /* RTS threshold */ __s32 min_rts; /* Minimal RTS threshold */ __s32 max_rts; /* Maximal RTS threshold */ /* Frag threshold */ __s32 min_frag; /* Minimal frag threshold */ __s32 max_frag; /* Maximal frag threshold */ /* Power Management duration & timeout */ __s32 min_pmp; /* Minimal PM period */ __s32 max_pmp; /* Maximal PM period */ __s32 min_pmt; /* Minimal PM timeout */ __s32 max_pmt; /* Maximal PM timeout */ __u16 pmp_flags; /* How to decode max/min PM period */ __u16 pmt_flags; /* How to decode max/min PM timeout */ __u16 pm_capa; /* What PM options are supported */ /* Encoder stuff */ __u16 encoding_size[IW_MAX_ENCODING_SIZES]; /* Different token sizes */ __u8 num_encoding_sizes; /* Number of entry in the list */ __u8 max_encoding_tokens; /* Max number of tokens */ /* For drivers that need a "login/passwd" form */ __u8 encoding_login_index; /* token index for login token */ /* Transmit power */ __u16 txpower_capa; /* What options are supported */ __u8 num_txpower; /* Number of entries in the list */ __s32 txpower[IW_MAX_TXPOWER]; /* list, in bps */ /* Wireless Extension version info */ __u8 we_version_compiled; /* Must be WIRELESS_EXT */ __u8 we_version_source; /* Last update of source */ /* Retry limits and lifetime */ __u16 retry_capa; /* What retry options are supported */ __u16 retry_flags; /* How to decode max/min retry limit */ __u16 r_time_flags; /* How to decode max/min retry life */ __s32 min_retry; /* Minimal number of retries */ __s32 max_retry; /* Maximal number of retries */ __s32 min_r_time; /* Minimal retry lifetime */ __s32 max_r_time; /* Maximal retry lifetime */ /* Frequency */ __u16 num_channels; /* Number of channels [0; num - 1] */ __u8 num_frequency; /* Number of entry in the list */ struct iw_freq freq[IW_MAX_FREQUENCIES]; /* list */ /* Note : this frequency list doesn't need to fit channel numbers, * because each entry contain its channel index */ __u32 enc_capa; /* IW_ENC_CAPA_* bit field */ }; /* * Private ioctl interface information */ struct iw_priv_args { __u32 cmd; /* Number of the ioctl to issue */ __u16 set_args; /* Type and number of args */ __u16 get_args; /* Type and number of args */ char name[IFNAMSIZ]; /* Name of the extension */ }; /* ----------------------- WIRELESS EVENTS ----------------------- */ /* * Wireless events are carried through the rtnetlink socket to user * space. They are encapsulated in the IFLA_WIRELESS field of * a RTM_NEWLINK message. */ /* * A Wireless Event. Contains basically the same data as the ioctl... */ struct iw_event { __u16 len; /* Real lenght of this stuff */ __u16 cmd; /* Wireless IOCTL */ union iwreq_data u; /* IOCTL fixed payload */ }; /* Size of the Event prefix (including padding and alignement junk) */ #define IW_EV_LCP_LEN (sizeof(struct iw_event) - sizeof(union iwreq_data)) /* Size of the various events */ #define IW_EV_CHAR_LEN (IW_EV_LCP_LEN + IFNAMSIZ) #define IW_EV_UINT_LEN (IW_EV_LCP_LEN + sizeof(__u32)) #define IW_EV_FREQ_LEN (IW_EV_LCP_LEN + sizeof(struct iw_freq)) #define IW_EV_PARAM_LEN (IW_EV_LCP_LEN + sizeof(struct iw_param)) #define IW_EV_ADDR_LEN (IW_EV_LCP_LEN + sizeof(struct sockaddr)) #define IW_EV_QUAL_LEN (IW_EV_LCP_LEN + sizeof(struct iw_quality)) /* iw_point events are special. First, the payload (extra data) come at * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second, * we omit the pointer, so start at an offset. */ #define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \ (char *) NULL) #define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - \ IW_EV_POINT_OFF) #endif /* _LINUX_WIRELESS_H */ xsupplicant-1.2.3-fixincludes.patch: --- NEW FILE xsupplicant-1.2.3-fixincludes.patch --- --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux_wext.c.BAD 2006-02-28 19:52:32.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux_wext.c 2006-02-28 19:52:40.000000000 -0600 @@ -91,7 +91,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux.c.BAD 2006-02-28 19:52:16.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux.c 2006-02-28 19:52:26.000000000 -0600 @@ -102,7 +102,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_atmel_driver.c.BAD 2006-02-28 19:51:18.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_atmel_driver.c 2006-02-28 19:51:32.000000000 -0600 @@ -74,7 +74,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux_rtnetlink.c.BAD 2006-02-28 19:52:54.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux_rtnetlink.c 2006-02-28 19:53:03.000000000 -0600 @@ -119,7 +119,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_madwifi_driver.c.BAD 2006-02-28 19:52:01.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_madwifi_driver.c 2006-02-28 19:52:08.000000000 -0600 @@ -81,7 +81,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am.BAD 2006-02-28 20:00:00.000000000 -0600 +++ xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am 2006-02-28 20:00:13.000000000 -0600 @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS=foreign no-dependencies -INCLUDES = -I ${top_srcdir}/src +INCLUDES = -I ${top_srcdir}/src -I ${top_srcdir}/lib/libxsupconfig include_HEADERS = xsupconfcheck.h lib_LIBRARIES = libxsupconfcheck.a libxsupconfcheck_a_SOURCES = xsupconfcheck.c Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Oct 2005 14:20:22 -0000 1.3 +++ .cvsignore 1 Mar 2006 02:11:46 -0000 1.4 @@ -1,2 +1,3 @@ xsupplicant-1.2.tar.gz xsupplicant-1.2.2.tar.gz +xsupplicant-1.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Oct 2005 14:20:22 -0000 1.5 +++ sources 1 Mar 2006 02:11:46 -0000 1.6 @@ -1 +1 @@ -0e9aaf83a11f8eaff7c6564a53c25d8e xsupplicant-1.2.2.tar.gz +f583f13d5bb91f98dab106d3610a677f xsupplicant-1.2.3.tar.gz Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xsupplicant.spec 3 Jan 2006 15:09:52 -0000 1.15 +++ xsupplicant.spec 1 Mar 2006 02:11:46 -0000 1.16 @@ -1,17 +1,17 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 1.2.2 -Release: 7%{?dist} +Version: 1.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz +Source1: v19wireless.h BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex, openjade, lynx, jadetex BuildRequires: docbook-dtds, docbook-style-dsssl, wireless-tools Patch0: xsupplicant-1.2.2-docsfix.patch -Patch1: xsupplicant-1.2.2-compilefix.patch -Patch2: xsupplicant-1.2.2-buf.patch +Patch1: xsupplicant-1.2.3-fixincludes.patch %description This software allows a GNU/Linux or BSD workstation to authenticate with @@ -19,17 +19,30 @@ use is for computers with wireless LAN connections to complete a strong authentication before joining the network. +%package devel +Summary: Development files for xsupplicant +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development libraries and headers for xsupplicant. + %prep %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 + +# Fedora Core 4 and 5 ship with old headers, but V19 in the kernel +# So, we need to put the right headers in place. This is the simplest +# hack to solve this issue. +cp %{SOURCE1} src/ perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* %build %configure -make %{?_smp_mflags} +# _smp_mflags makes this app go BOOM +make cd doc ./builddocs.sh cd .. @@ -49,11 +62,24 @@ %config(noreplace) %{_sysconfdir}/xsupplicant.conf %{_bindir}/config-parser %{_bindir}/xsup_monitor +%{_bindir}/xsup_ntpwdhash %{_bindir}/xsup_set_pwd %{_bindir}/xsup_get_state %{_sbindir}/xsupplicant +%files devel +%defattr(-,root,root,-) +%{_includedir}/xsupconfcheck.h +%{_includedir}/xsupconfig.h +%{_includedir}/xsupconfwrite.h +%{_includedir}/xsupgui.h +%{_libdir}/libxsup*.a + %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-1 +- bump to 1.2.3 +- split package into main and devel + * Tue Jan 3 2006 Hans de Goede 1.2.2-7 - fix a possible bufferoverflow bz 170045 From fedora-extras-commits at redhat.com Wed Mar 1 02:13:49 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 21:13:49 -0500 Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.3-fixincludes.patch,NONE,1.1 Message-ID: <200603010213.k212DpJE019418@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19405 Added Files: xsupplicant-1.2.3-fixincludes.patch Log Message: Whoops. xsupplicant-1.2.3-fixincludes.patch: --- NEW FILE xsupplicant-1.2.3-fixincludes.patch --- --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux_wext.c.BAD 2006-02-28 19:52:32.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux_wext.c 2006-02-28 19:52:40.000000000 -0600 @@ -91,7 +91,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux.c.BAD 2006-02-28 19:52:16.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux.c 2006-02-28 19:52:26.000000000 -0600 @@ -102,7 +102,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_atmel_driver.c.BAD 2006-02-28 19:51:18.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_atmel_driver.c 2006-02-28 19:51:32.000000000 -0600 @@ -74,7 +74,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux_rtnetlink.c.BAD 2006-02-28 19:52:54.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux_rtnetlink.c 2006-02-28 19:53:03.000000000 -0600 @@ -119,7 +119,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_madwifi_driver.c.BAD 2006-02-28 19:52:01.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_madwifi_driver.c 2006-02-28 19:52:08.000000000 -0600 @@ -81,7 +81,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am.BAD 2006-02-28 20:00:00.000000000 -0600 +++ xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am 2006-02-28 20:00:13.000000000 -0600 @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS=foreign no-dependencies -INCLUDES = -I ${top_srcdir}/src +INCLUDES = -I ${top_srcdir}/src -I ${top_srcdir}/lib/libxsupconfig include_HEADERS = xsupconfcheck.h lib_LIBRARIES = libxsupconfcheck.a libxsupconfcheck_a_SOURCES = xsupconfcheck.c From fedora-extras-commits at redhat.com Wed Mar 1 02:15:46 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 21:15:46 -0500 Subject: rpms/xsupplicant/FC-4 xsupplicant.spec,1.15,1.16 Message-ID: <200603010216.k212GJwY019493@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19461/FC-4 Modified Files: xsupplicant.spec Log Message: Bump spec because of my mistake. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xsupplicant.spec 1 Mar 2006 02:11:38 -0000 1.15 +++ xsupplicant.spec 1 Mar 2006 02:15:46 -0000 1.16 @@ -1,7 +1,7 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ @@ -76,6 +76,9 @@ %{_libdir}/libxsup*.a %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-2 +- whoops. missed a file. + * Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-1 - bump to 1.2.3 - split package into main and devel From fedora-extras-commits at redhat.com Wed Mar 1 02:16:06 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 21:16:06 -0500 Subject: rpms/xsupplicant/devel xsupplicant.spec,1.16,1.17 Message-ID: <200603010216.k212GcDh019496@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19461/devel Modified Files: xsupplicant.spec Log Message: Bump spec because of my mistake. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xsupplicant.spec 1 Mar 2006 02:11:46 -0000 1.16 +++ xsupplicant.spec 1 Mar 2006 02:16:06 -0000 1.17 @@ -1,7 +1,7 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ @@ -76,6 +76,9 @@ %{_libdir}/libxsup*.a %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-2 +- whoops. missed a file. + * Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-1 - bump to 1.2.3 - split package into main and devel From fedora-extras-commits at redhat.com Wed Mar 1 02:39:03 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 28 Feb 2006 21:39:03 -0500 Subject: rpms/sqlite2/devel - New directory Message-ID: <200603010239.k212d5Os019688@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/sqlite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19680/devel Log Message: Directory /cvs/extras/rpms/sqlite2/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 02:41:14 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 28 Feb 2006 21:41:14 -0500 Subject: rpms/sqlite2/devel Makefile,NONE,1.1 Message-ID: <200603010241.k212fGjs019772@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/sqlite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19762 Added Files: Makefile Log Message: Trying to reimport... ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' From fedora-extras-commits at redhat.com Wed Mar 1 02:46:26 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:46:26 -0500 Subject: rpms/jthread - New directory Message-ID: <200603010246.k212kS18019918@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19908/jthread Log Message: Directory /cvs/extras/rpms/jthread added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 02:46:31 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:46:31 -0500 Subject: rpms/jthread/devel - New directory Message-ID: <200603010246.k212kXTD019933@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19908/jthread/devel Log Message: Directory /cvs/extras/rpms/jthread/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 02:47:03 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:47:03 -0500 Subject: rpms/jthread Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603010247.k212l553019971@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19959 Added Files: Makefile import.log Log Message: Setup of module jthread --- NEW FILE Makefile --- # Top level Makefile for module jthread all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 1 02:47:08 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:47:08 -0500 Subject: rpms/jthread/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603010247.k212lA6H019991@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19959/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jthread --- NEW 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 Mar 1 02:48:24 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:48:24 -0500 Subject: rpms/jthread import.log,1.1,1.2 Message-ID: <200603010248.k212muZf020069@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20035 Modified Files: import.log Log Message: auto-import jthread-1.1.2-1 on branch devel from jthread-1.1.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/jthread/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Mar 2006 02:47:02 -0000 1.1 +++ import.log 1 Mar 2006 02:48:24 -0000 1.2 @@ -0,0 +1 @@ +jthread-1_1_2-1:HEAD:jthread-1.1.2-1.src.rpm:1141181290 From fedora-extras-commits at redhat.com Wed Mar 1 02:48:30 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:48:30 -0500 Subject: rpms/jthread/devel jthread.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603010249.k212n2TY020073@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20035/devel Modified Files: .cvsignore sources Added Files: jthread.spec Log Message: auto-import jthread-1.1.2-1 on branch devel from jthread-1.1.2-1.src.rpm --- NEW FILE jthread.spec --- Summary: JThread provides classes to make use of threads easy on different platforms Name: jthread Version: 1.1.2 Release: 1 License: MIT Group: System Environment/Libraries URL: http://research.edm.luc.ac.be/jori/jthread/jthread.html Source0: http://research.edm.luc.ac.be/jori/jthread/jthread-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /usr/bin/pdflatex %description JThread provides some classes to make use of threads easy on different platforms. The classes are actually rather simple wrappers around existing thread implementations. %package devel Summary: Development files for JThread Group: Development/Libraries Requires: jthread = %{version}-%{release} %description devel Development files for JThread %prep %setup -q %build %configure --disable-static make %{_smp_mflags} pushd doc pdflatex manual.tex pdflatex manual.tex popd %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install rm -f %{buildroot}%{_libdir}/libjthread.la %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog LICENSE.MIT README.TXT TODO %{_libdir}/libjthread-%{version}.so %files devel %defattr(-,root,root,-) %doc doc/manual.pdf doc/manual.tex %{_includedir}/jthread %{_libdir}/libjthread.so %changelog * Sat Jan 7 2006 Jeffrey C. Ollie - 1.1.2-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jthread/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2006 02:47:08 -0000 1.1 +++ .cvsignore 1 Mar 2006 02:48:30 -0000 1.2 @@ -0,0 +1 @@ +jthread-1.1.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jthread/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2006 02:47:08 -0000 1.1 +++ sources 1 Mar 2006 02:48:30 -0000 1.2 @@ -0,0 +1 @@ +bdbfcf50861abc7d2b60d8bf8fe0b6c6 jthread-1.1.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 02:50:18 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 28 Feb 2006 21:50:18 -0500 Subject: rpms/sqlite2/devel sources, NONE, 1.1 sqlite-2.8.15-arch-double-differences.patch, NONE, 1.1 sqlite-2.8.15-makefile.patch, NONE, 1.1 sqlite-2.8.15.rpath.patch, NONE, 1.1 sqlite-2.8.3.test.rh9.patch, NONE, 1.1 sqlite-64bit-fixes.patch, NONE, 1.1 sqlite2.spec, NONE, 1.1 Message-ID: <200603010250.k212oKLI020209@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/sqlite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20168/devel Added Files: sources sqlite-2.8.15-arch-double-differences.patch sqlite-2.8.15-makefile.patch sqlite-2.8.15.rpath.patch sqlite-2.8.3.test.rh9.patch sqlite-64bit-fixes.patch sqlite2.spec Log Message: auto-import sqlite2-2.8.16-3 on branch devel from sqlite2-2.8.16-3.src.rpm --- NEW FILE sources --- 9c79b461ff30240a6f9d70dd67f8faea sqlite-2.8.16.tar.gz sqlite-2.8.15-arch-double-differences.patch: --- NEW FILE sqlite-2.8.15-arch-double-differences.patch --- --- sqlite/test/format3.test.bak 2003-12-23 03:17:35.000000000 +0100 +++ sqlite/test/format3.test 2005-01-28 18:06:35.066538463 +0100 @@ -686,7 +686,7 @@ execsql {SELECT '0'==0.0} } {1} do_test format3-11.3 { - execsql {SELECT '123456789012345678901'=='123456789012345678900'} + execsql {SELECT '1234567890123456789012'=='1234567890123456789011'} } {1} do_test format3-11.4 { execsql { --- sqlite/test/misc1.test.bak 2003-08-05 15:13:39.000000000 +0200 +++ sqlite/test/misc1.test 2005-01-28 18:07:26.976971054 +0100 @@ -335,7 +335,7 @@ execsql {SELECT '0'==0.0} } {1} do_test misc1-12.3 { - execsql {SELECT '12345678901234567890'=='12345678901234567891'} + execsql {SELECT '1234567890123456789012'=='1234567890123456789011'} } {0} do_test misc1-12.4 { execsql { sqlite-2.8.15-makefile.patch: --- NEW FILE sqlite-2.8.15-makefile.patch --- diff -Nur sqlite-2.8.15-orig/Makefile.in sqlite-2.8.15/Makefile.in --- sqlite-2.8.15-orig/Makefile.in 2004-03-27 00:16:32.000000000 +0100 +++ sqlite-2.8.15/Makefile.in 2005-01-23 18:20:37.034194768 +0100 @@ -465,14 +465,16 @@ mv $(DOC) doc install: sqlite libsqlite.la sqlite.h - $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib - $(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib + $(INSTALL) -d $(DESTDIR)$(libdir) + $(LTINSTALL) libsqlite.la $(DESTDIR)$(libdir) + $(LTINSTALL) libtclsqlite.la $(DESTDIR)$(libdir)/sqlite-__VERSION__ $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin $(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin + $(LTINSTALL) tclsqlite $(DESTDIR)$(exec_prefix)/bin $(INSTALL) -d $(DESTDIR)$(prefix)/include $(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include - $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; - $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; + $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; + $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(libdir)/pkgconfig; clean: rm -f *.lo *.la *.o sqlite at TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.* sqlite-2.8.15.rpath.patch: --- NEW FILE sqlite-2.8.15.rpath.patch --- --- sqlite/Makefile.in.nos 2004-06-18 14:13:40.127066236 +0200 +++ sqlite/Makefile.in 2004-06-18 14:13:56.241098295 +0200 @@ -192,7 +192,7 @@ libtclsqlite.la: tclsqlite.lo libsqlite.la $(LTLINK) -o libtclsqlite.la tclsqlite.lo \ - libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \ + libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite-__VERSION__ \ -version-info "8:6:8" sqlite at TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite.la sqlite.h sqlite-2.8.3.test.rh9.patch: --- NEW FILE sqlite-2.8.3.test.rh9.patch --- diff -Naur sqlite-orig/test/tester.tcl sqlite/test/tester.tcl --- sqlite-orig/test/tester.tcl 2003-03-01 20:45:35.000000000 +0100 +++ sqlite/test/tester.tcl 2003-06-28 02:14:03.000000000 +0200 @@ -43,8 +43,10 @@ # Create a test database # catch {db close} -file delete -force test.db -file delete -force test.db-journal +#file delete -force test.db +#file delete -force test.db-journal +exec rm -fr test.db +exec rm -fr test.db-journal sqlite db ./test.db if {[info exists ::SETUP_SQL]} { db eval $::SETUP_SQL sqlite-64bit-fixes.patch: --- NEW FILE sqlite-64bit-fixes.patch --- --- sqlite/src/test3.c.64bit-fixes 2004-09-29 10:09:56.249551000 -0400 +++ sqlite/src/test3.c 2004-09-29 11:34:51.314336091 -0400 @@ -19,9 +19,11 @@ #include "pager.h" #include "btree.h" #include "tcl.h" +#include "test-util.h" #include #include + /* ** Interpret an SQLite error number */ @@ -98,7 +100,7 @@ static int btree_close( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeClose(pBt); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -125,7 +127,7 @@ static int btree_begin_transaction( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeBeginTrans(pBt); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -152,7 +154,7 @@ static int btree_rollback( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeRollback(pBt); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -179,7 +181,7 @@ static int btree_commit( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeCommit(pBt); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -207,7 +209,7 @@ static int btree_create_table( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeCreateTable(pBt, &iTable); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -237,7 +239,7 @@ static int btree_drop_table( " ID TABLENUM\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR; rc = sqliteBtreeDropTable(pBt, iTable); if( rc!=SQLITE_OK ){ @@ -266,7 +268,7 @@ static int btree_clear_table( " ID TABLENUM\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR; rc = sqliteBtreeClearTable(pBt, iTable); if( rc!=SQLITE_OK ){ @@ -296,7 +298,7 @@ static int btree_get_meta( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeGetMeta(pBt, aMeta); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -333,7 +335,7 @@ static int btree_update_meta( " ID METADATA...\" (METADATA is ", zBuf, " integers)", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); for(i=0; i #include @@ -104,7 +105,7 @@ static int pager_close( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_close(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -131,7 +132,7 @@ static int pager_rollback( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_rollback(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -158,7 +159,7 @@ static int pager_commit( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_commit(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -185,7 +186,7 @@ static int pager_ckpt_begin( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_ckpt_begin(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -212,7 +213,7 @@ static int pager_ckpt_rollback( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_ckpt_rollback(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -239,7 +240,7 @@ static int pager_ckpt_commit( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_ckpt_commit(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -266,7 +267,7 @@ static int pager_stats( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); a = sqlitepager_stats(pPager); for(i=0; i<9; i++){ static char *zName[] = { @@ -299,7 +300,7 @@ static int pager_pagecount( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); sprintf(zBuf,"%d",sqlitepager_pagecount(pPager)); Tcl_AppendResult(interp, zBuf, 0); return TCL_OK; @@ -326,7 +327,7 @@ static int page_get( " ID PGNO\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); if( Tcl_GetInt(interp, argv[2], &pgno) ) return TCL_ERROR; rc = sqlitepager_get(pPager, pgno, &pPage); if( rc!=SQLITE_OK ){ @@ -359,7 +360,7 @@ static int page_lookup( " ID PGNO\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); if( Tcl_GetInt(interp, argv[2], &pgno) ) return TCL_ERROR; pPage = sqlitepager_lookup(pPager, pgno); if( pPage ){ @@ -387,7 +388,7 @@ static int page_unref( " PAGE\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR; + pPage = sqliteTextToPtr(argv[1]); rc = sqlitepager_unref(pPage); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -414,7 +415,7 @@ static int page_read( " PAGE\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR; + pPage = sqliteTextToPtr(argv[1]); memcpy(zBuf, pPage, sizeof(zBuf)); Tcl_AppendResult(interp, zBuf, 0); return TCL_OK; @@ -438,7 +439,7 @@ static int page_number( " PAGE\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR; + pPage = sqliteTextToPtr(argv[1]); sprintf(zBuf, "%d", sqlitepager_pagenumber(pPage)); Tcl_AppendResult(interp, zBuf, 0); return TCL_OK; @@ -462,7 +463,7 @@ static int page_write( " PAGE DATA\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR; + pPage = sqliteTextToPtr(argv[1]); rc = sqlitepager_write(pPage); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); --- sqlite/src/test-util.c.64bit-fixes 2004-09-29 11:33:18.838681763 -0400 +++ sqlite/src/test-util.c 2004-09-29 11:35:32.332610359 -0400 @@ -0,0 +1,47 @@ +#include +#include +#include "test-util.h" + +/* +** Translate a single byte of Hex into an integer. +*/ +static int hexToInt(int h){ + if( h>='0' && h<='9' ){ + return h - '0'; + }else if( h>='a' && h<='f' ){ + return h - 'a' + 10; + }else if( h>='A' && h<='F' ){ + return h - 'A' + 10; + }else{ + return 0; + } +} + +#if defined(SQLITE_TEST) +/* +** Convert text generated by the "%p" conversion format back into +** a pointer. +*/ +void *sqliteTextToPtr(const char *z){ + void *p; + uint64_t v; + uint32_t v2; + if( z[0]=='0' && z[1]=='x' ){ + z += 2; + } + v = 0; + while( *z ){ + v = (v<<4) + hexToInt(*z); + z++; + } + if( sizeof(p)==sizeof(v) ){ + p = *(void**)&v; + }else{ + assert( sizeof(p)==sizeof(v2) ); + v2 = (uint32_t)v; + p = *(void**)&v2; + } + return p; +} +#endif + --- sqlite/src/test-util.h.64bit-fixes 2004-09-29 11:33:23.513624799 -0400 +++ sqlite/src/test-util.h 2004-09-29 11:34:35.012047569 -0400 @@ -0,0 +1,6 @@ +#ifndef TEST_UTIL_H +#define TEST_UTIL_H + +extern void *sqliteTextToPtr(const char *z); + +#endif /* TEST_UTIL_H */ --- sqlite/Makefile.in.64bit-fixes 2004-09-29 09:41:08.011929000 -0400 +++ sqlite/Makefile.in 2004-09-29 11:32:59.441768988 -0400 @@ -142,6 +142,7 @@ SRC = \ # Source code to the test files. # TESTSRC = \ + $(TOP)/src/test-util.c \ $(TOP)/src/btree.c \ $(TOP)/src/func.c \ $(TOP)/src/os.c \ --- NEW FILE sqlite2.spec --- Name: sqlite2 Version: 2.8.16 Release: 3%{?dist} Summary: Embeddable SQL engine in a C library Group: System Environment/Libraries License: Public Domain URL: http://www.sqlite.org/ Source0: http://www.sqlite.org/sqlite-%{version}.tar.gz Patch1: sqlite-2.8.15.rpath.patch Patch2: sqlite-2.8.15-makefile.patch Patch3: sqlite-2.8.3.test.rh9.patch Patch4: sqlite-64bit-fixes.patch Patch5: sqlite-2.8.15-arch-double-differences.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel readline-devel %{_includedir}/tcl.h Obsoletes: sqlite < 3 %description SQLite is a small, fast, embeddable SQL database engine that supports most of SQL92, including transactions with atomic commit and rollback, subqueries, compound queries, triggers, and views. A complete database is stored in a single cross-platform disk file. The native C/C++ API is simple and easy to use. Bindings for other languages are also available. %package devel Summary: Development files for SQLite Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Obsoletes: sqlite-devel < 3 %description devel SQLite is a small, fast, embeddable SQL database engine that supports most of SQL92, including transactions with atomic commit and rollback, subqueries, compound queries, triggers, and views. This package contains static library and header files for developing applications using sqlite. %package tcl Summary: Tcl bindings for sqlite Group: System Environment/Libraries Requires: tcl >= 8.3.3, %{name} = %{version}-%{release} Obsoletes: sqlite-tcl < 3 %description tcl SQLite is a small, fast, embeddable SQL database engine that supports most of SQL92, including transactions with atomic commit and rollback, subqueries, compound queries, triggers, and views. This package contains tcl bindings for sqlite. %prep %setup -q -n sqlite-%{version} %patch1 -p1 -b .rpath %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 sed -i.rpath 's!__VERSION__!%{version}!g' Makefile.in # Patch additional /usr/lib locations where we don't have $(libdir) # to substitute with. sed -i.lib 's!@exec_prefix@/lib!%{_libdir}!g' Makefile.in %build CFLAGS="$RPM_OPT_FLAGS -DNDEBUG=1" %configure --enable-utf8 --disable-static make make tclsqlite libtclsqlite.la doc #obs. make test doesn't like root make test %install rm -rf $RPM_BUILD_ROOT DIRECTORY=$RPM_BUILD_ROOT%{_libdir}/sqlite-%version install -d $DIRECTORY echo 'package ifneeded sqlite 2 [list load [file join $dir libtclsqlite.so]]' > $DIRECTORY/pkgIndex.tcl %makeinstall install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1/sqlite.1 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_bindir}/sql* %{_libdir}/libsql*.so.* %{_mandir}/man1/* %files devel %defattr(-,root,root,-) %doc README doc/* %{_libdir}/libsql*.so %{_includedir}/* %{_libdir}/pkgconfig/* %files tcl %defattr(-,root,root,-) %doc doc/tclsqlite.html %exclude %{_bindir}/tclsqlite %{_libdir}/sqlite-%version %changelog * Tue Feb 28 2006 Ignacio Vazquez-Abrams 2.8.16-3 - Rebuild for Fedora Extras 5 * Sat Nov 26 2005 Ignacio Vazquez-Abrams 2.8.16-2 - Disable static libs * Fri May 20 2005 Ignacio Vazquez-Abrams 2.8.16-1 - Name change to sqlite2 - Dropped Epoch - Added Obsoletes to all subpackages - Minor cosmetic changes * Wed Feb 16 2005 Michael Schwendt - 0:2.8.16-1 - Update to 2.8.16 bug-fix release + update patches. * Tue Feb 15 2005 Thorsten Leemhuis - 2.8.15-2 - add sqlite-64bit-fixes.patch and sqlite-2.8.15-arch-double-differences.patch fixes x86_64; Both were found in a mandrake srpm - remove exclusive arch ix86; hopefully this fixes ppc also * Sun Jan 23 2005 Michael Schwendt - 0:2.8.15-1 - Add exclusive arch ix86 for now (make test segfaults on x86_64). - Update makefile patch, $(exec_prefix)/lib -> $(libdir), and substitute additional /usr/lib locations in %%prep for multilib people to play with. * Sun Sep 26 2004 Adrian Reber - 0:2.8.15-0.fdr.1 - Update to 2.8.15 - Update patches * Fri Jun 19 2004 Nils O. Sel??sdal - 0:2.8.14-0.fdr.1 - Update to 2.8.14 - Update patches - --enable-releasemode - small spec file tweaks * Sat Dec 27 2003 Jean-Luc Fontaine - 0:2.8.6-0.fdr.6 - in tcl rpm, removed tclsqlite, moved shared library in own sqlite sub-directory add added pkgIndex.tcl file to make package dynamically loadable in a Tcl interpreter - in build requirements, work around tcl-devel and tk-devel packages non existence in RH 8.0 and 9 - in tcl rpm, added tcl package requirement - in tcl rpm, post ldconfig is not necessary * Wed Nov 12 2003 Nils O. Sel??sdal - 0:2.8.6-0.fdr.5 - BuildRequires tcl-devel - small .spec tweaks * Tue Oct 28 2003 Nils O. Sel??sdal - 0:2.8.6-0.fdr.4 - exclude libtclsqlite.a * Mon Oct 27 2003 Nils O. Sel??sdal - 0:2.8.6-0.fdr.3 - Fix readme -> README * Mon Oct 27 2003 Nils O. Sel??sdal - 0:2.8.6-0.fdr.2 - Better summary/description - Add patch for not using rpath - Add patch that builds tclsqlite (From Anvil's package) - Add patch that fixes the tests (From Anvil's package) - New tcl subpackage - Also make the tests during build - Build docs, and include them in -devel * Fri Oct 10 2003 Nils O. Sel??sdal - 0:2.8.6-0.fdr.1 - Initial RPM release. From fedora-extras-commits at redhat.com Wed Mar 1 02:50:12 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 28 Feb 2006 21:50:12 -0500 Subject: rpms/sqlite2 import.log,1.2,1.3 Message-ID: <200603010250.k212oict020218@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/sqlite2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20168 Modified Files: import.log Log Message: auto-import sqlite2-2.8.16-3 on branch devel from sqlite2-2.8.16-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/sqlite2/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 20 May 2005 14:57:31 -0000 1.2 +++ import.log 1 Mar 2006 02:50:12 -0000 1.3 @@ -1 +1,2 @@ sqlite2-2_8_16-1:HEAD:sqlite2-2.8.16-1.src.rpm:1116601057 +sqlite2-2_8_16-3:HEAD:sqlite2-2.8.16-3.src.rpm:1141181404 From fedora-extras-commits at redhat.com Wed Mar 1 03:46:33 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:46:33 -0500 Subject: rpms/libtomoe-gtk - New directory Message-ID: <200603010346.k213kZEc022367@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22359/libtomoe-gtk Log Message: Directory /cvs/extras/rpms/libtomoe-gtk added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 03:46:40 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:46:40 -0500 Subject: rpms/libtomoe-gtk/devel - New directory Message-ID: <200603010346.k213kgD2022382@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22359/libtomoe-gtk/devel Log Message: Directory /cvs/extras/rpms/libtomoe-gtk/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 03:47:09 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:47:09 -0500 Subject: rpms/libtomoe-gtk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603010347.k213lBvt022416@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22404 Added Files: Makefile import.log Log Message: Setup of module libtomoe-gtk --- NEW FILE Makefile --- # Top level Makefile for module libtomoe-gtk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 1 03:47:14 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:47:14 -0500 Subject: rpms/libtomoe-gtk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603010347.k213lGML022436@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22404/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libtomoe-gtk --- NEW 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 Mar 1 03:48:06 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:48:06 -0500 Subject: rpms/libtomoe-gtk import.log,1.1,1.2 Message-ID: <200603010348.k213mdcZ022504@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22470 Modified Files: import.log Log Message: auto-import libtomoe-gtk-0.1.0-5 on branch devel from libtomoe-gtk-0.1.0-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libtomoe-gtk/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Mar 2006 03:47:08 -0000 1.1 +++ import.log 1 Mar 2006 03:48:06 -0000 1.2 @@ -0,0 +1 @@ +libtomoe-gtk-0_1_0-5:HEAD:libtomoe-gtk-0.1.0-5.src.rpm:1141184876 From fedora-extras-commits at redhat.com Wed Mar 1 03:48:12 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:48:12 -0500 Subject: rpms/libtomoe-gtk/devel libtomoe-gtk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603010348.k213mj3X022508@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22470/devel Modified Files: .cvsignore sources Added Files: libtomoe-gtk.spec Log Message: auto-import libtomoe-gtk-0.1.0-5 on branch devel from libtomoe-gtk-0.1.0-5.src.rpm --- NEW FILE libtomoe-gtk.spec --- Name: libtomoe-gtk Version: 0.1.0 Release: 5%{?dist} Summary: Gtk library for tomoe Japanese handwritten input Group: System Environment/Libraries License: GPL URL: http://scim-imengine.sourceforge.jp/ Source0: http://dl.sourceforge.jp/tomoe/17171/libtomoe-gtk-0.1.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tomoe-devel, gtk2-devel %description Gtk library for tomoe Japanese handwritten input. This package is used by scim-tomoe, or uim-tomoe. %package devel Summary: Gtk library for tomoe Japanese handwritten input Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: gtk2-devel %description devel The libtomoe-devel package includes the header files for the libtomoe-gtk. Install this if you want to develop programs which will use libtomoe-gtk. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post devel -p /sbin/ldconfig %postun devel -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_libdir}/libtomoe-gtk.so.* %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/libtomoe-gtk.pc %{_libdir}/libtomoe-gtk.so %{_includedir}/tomoe/* %changelog * Tue Feb 28 2006 Ryo Dairiki - 0.1.0-5 - add "ldconfig" for the devel subpackage (Thanks, John Mahowald) * Fri Jan 27 2006 Ryo Dairiki - 0.1.0-4 - modify "ldconfig" in the "post" section (Thanks, John Mahowald) * Fri Dec 30 2005 Ryo Dairiki - 0.1.0-3 - a bit more cleanup * Fri Dec 23 2005 Ryo Dairiki - 0.1.0-2 - add gtk2-devel in the build requirements (Thanks, John Mahowald) * Wed Dec 3 2005 Ryo Dairiki - 0.1.0-1 - initial packaging for fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtomoe-gtk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2006 03:47:14 -0000 1.1 +++ .cvsignore 1 Mar 2006 03:48:12 -0000 1.2 @@ -0,0 +1 @@ +libtomoe-gtk-0.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtomoe-gtk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2006 03:47:14 -0000 1.1 +++ sources 1 Mar 2006 03:48:12 -0000 1.2 @@ -0,0 +1 @@ +e9b887189ee408902a0f85d9b1cde06f libtomoe-gtk-0.1.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 04:43:00 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 28 Feb 2006 23:43:00 -0500 Subject: rpms/xpilot-ng/devel xpilot-ng-sdl.desktop, 1.1, 1.2 xpilot-ng-x11.desktop, 1.1, 1.2 Message-ID: <200603010443.k214hWP7024825@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24806 Modified Files: xpilot-ng-sdl.desktop xpilot-ng-x11.desktop Log Message: Add missing semicolon. Index: xpilot-ng-sdl.desktop =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/xpilot-ng-sdl.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng-sdl.desktop 6 Feb 2006 17:30:58 -0000 1.1 +++ xpilot-ng-sdl.desktop 1 Mar 2006 04:42:59 -0000 1.2 @@ -7,5 +7,5 @@ Icon=xpilot-ng.png Terminal=false Type=Application -Categories=Application;Game +Categories=Application;Game; Version=4.7.2 Index: xpilot-ng-x11.desktop =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/xpilot-ng-x11.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng-x11.desktop 6 Feb 2006 17:30:58 -0000 1.1 +++ xpilot-ng-x11.desktop 1 Mar 2006 04:42:59 -0000 1.2 @@ -7,5 +7,5 @@ Icon=xpilot-ng.png Terminal=false Type=Application -Categories=Application;Game +Categories=Application;Game; Version=4.7.2 From fedora-extras-commits at redhat.com Wed Mar 1 04:43:54 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 28 Feb 2006 23:43:54 -0500 Subject: rpms/xpilot-ng/FC-4 xpilot-ng-sdl.desktop, 1.1, 1.2 xpilot-ng-x11.desktop, 1.1, 1.2 Message-ID: <200603010444.k214iRM3024850@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24831 Modified Files: xpilot-ng-sdl.desktop xpilot-ng-x11.desktop Log Message: Add missing semicolon. Index: xpilot-ng-sdl.desktop =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng-sdl.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng-sdl.desktop 6 Feb 2006 17:30:58 -0000 1.1 +++ xpilot-ng-sdl.desktop 1 Mar 2006 04:43:54 -0000 1.2 @@ -7,5 +7,5 @@ Icon=xpilot-ng.png Terminal=false Type=Application -Categories=Application;Game +Categories=Application;Game; Version=4.7.2 Index: xpilot-ng-x11.desktop =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng-x11.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng-x11.desktop 6 Feb 2006 17:30:58 -0000 1.1 +++ xpilot-ng-x11.desktop 1 Mar 2006 04:43:54 -0000 1.2 @@ -7,5 +7,5 @@ Icon=xpilot-ng.png Terminal=false Type=Application -Categories=Application;Game +Categories=Application;Game; Version=4.7.2 From fedora-extras-commits at redhat.com Wed Mar 1 04:46:10 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 28 Feb 2006 23:46:10 -0500 Subject: rpms/xpilot-ng/devel xpilot-ng-server.init, NONE, 1.1 xpilot-ng.logrotate, NONE, 1.1 xpilot-ng.sysconfig, NONE, 1.1 xpilot-ng.spec, 1.2, 1.3 Message-ID: <200603010446.k214kgfU024883@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24858 Modified Files: xpilot-ng.spec Added Files: xpilot-ng-server.init xpilot-ng.logrotate xpilot-ng.sysconfig Log Message: Add init startup script with associated support files (logrotate, sysconfig) Add RPM_OPT_FLAGS to compile line More readable spacing in changelog --- NEW FILE xpilot-ng-server.init --- #!/bin/sh # # xpilot-ng-server This shell script takes care of starting and stopping # the xpilot-ng game server. # # chkconfig: - 15 85 # description: The xpilot-ng server supports playing networked \ # multi-player games. # processname: xpilot-ng-server # config: /etc/sysconfig/xpilot-ng-server # pidfile: /var/run/xpilot-ng-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/xpilot-ng-server" prog=$(basename $exec) pidfile=/var/run/$prog.pid [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { echo -n $"Starting Xpilot 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 games $exec $XPILOTD_OPTIONS >>/var/log/xpilot.log 2>&1 & retval=$? if [ $retval -eq 0 ]; then success touch $lockfile pidofproc $prog > $pidfile else failure fi echo return $retval } stop() { echo -n $"Stopping Xpilot 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 xpilot-ng.logrotate --- /var/log/xpilotd.log { copytruncate notifempty missingok endscript } --- NEW FILE xpilot-ng.sysconfig --- # # xpilot-ng-server(6) options. Pick a custom port here if needed, for example. # # This option activates a public server. This will advertise your # xpilot server to the public xpilot metadirectory and keep xpilot # running continuosly. # The following two lines have the same effect: #XPILOTD_OPTIONS="-expand PublicSettings" #XPILOTD_OPTIONS="-idleRun -noQuit +reportToMetaServer" # Normally xpilot will look in /usr/share/xpilot-ng for the # configuration files. This is fine for user-initiated servers. # But for the system xpilot server we want to allow a different set # of defaults. XPILOTD_OPTIONS="-noQuit \ -defaultsFileName /etc/xpilot-ng/defaults.txt \ -passwordFileName /etc/xpilot-ng/password.txt" Index: xpilot-ng.spec =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/xpilot-ng.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xpilot-ng.spec 21 Feb 2006 20:17:24 -0000 1.2 +++ xpilot-ng.spec 1 Mar 2006 04:46:09 -0000 1.3 @@ -1,6 +1,6 @@ Name: xpilot-ng Version: 4.7.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -10,12 +10,19 @@ Source1: xpilot-ng.png Source2: xpilot-ng-x11.desktop Source3: xpilot-ng-sdl.desktop +Source4: xpilot-ng-server.init +Source5: xpilot-ng.sysconfig +Source6: xpilot-ng.logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel # The following BR are not needed for FC-4 BuildRequires: libXt-devel mesa-libGLU-devel libXxf86misc-devel +Requires(post): /sbin/chkconfig +Requires(post): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service %description A highly addictive, infinitely configurable multiplayer space @@ -43,7 +50,7 @@ %build -%configure +CFLAGS="$RPM_OPT_FLAGS" %configure make %{?_smp_mflags} @@ -64,6 +71,19 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +install -p -D -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initrddir}/%{name}-server + +install -p -D -m 644 %{SOURCE5} \ + $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}-server + +install -p -D -m 644 %{SOURCE6} \ + $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server + +# Copy certain configuration files to /etc so that they can be properly managed +# as config files. +install -p -D -m 644 lib/defaults.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/defaults.txt +install -p -D -m 600 lib/password.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/password.txt + %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -76,6 +96,20 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%post server +/sbin/chkconfig --add xpilot-ng-server + +%preun server +if [ "$1" = "0" ]; then + /sbin/service xpilot-ng-server stop > /dev/null 2>&1 + /sbin/chkconfig --del xpilot-ng-server +fi + +%postun server +if [ "$1" -ge "1" ]; then + /sbin/service xpilot-ng-server restart >/dev/null 2>&1 +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -99,6 +133,9 @@ %defattr(-,root,root,-) %{_bindir}/xpilot-ng-xp-mapedit %{_bindir}/xpilot-ng-server +%{_initrddir}/xpilot-ng-server +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server %dir %{_datadir}/%{name} %{_datadir}/%{name}/defaults.txt %{_datadir}/%{name}/password.txt @@ -106,6 +143,9 @@ %{_datadir}/%{name}/shipshapes.txt %{_datadir}/%{name}/mapconvert.py %{_datadir}/%{name}/maps +%dir %{_sysconfdir}/%{name} +%config(noreplace) %attr(0600,games,games) %{_sysconfdir}/%{name}/password.txt +%config(noreplace) %{_sysconfdir}/%{name}/defaults.txt %{_mandir}/man6/xpilot-ng-server.6.gz %{_mandir}/man6/xpilot-ng-xp-mapedit.6.gz %doc README COPYING @@ -114,17 +154,28 @@ %ghost %{_datadir}/%{name}/mapconvert.pyo %changelog +* Tue Feb 28 2006 Wart 4.7.2-6 +- Added sysconfig and initrd files for starting xpilot server at boot time +- Add copies of customizable configuration files to /etc/xpilot +- More readable spacing in changelog +- Add missing ; in desktop file +- Added RPM_OPT_FLAGS to compile line + * Thu Feb 16 2006 Wart 4.7.2-5 - Rebuild for FC-5 + * Mon Feb 6 2006 Wart 4.7.2-4 - Don't make duplicates of the doc files for the subpackage. - Use version macro is source path - Preserve timestamps when installing icons. + * Fri Feb 3 2006 Wart 4.7.2-3 - Add readme and license files to the server subpackage - Set default file attributes for the server subpackage + * Fri Feb 3 2006 Wart 4.7.2-2 - Allow both packages to 0wn datadir/xpilot-ng - Clean up non-utf8 man pages + * Thu Feb 2 2006 Wart 4.7.2-1 - Initial submission to Fedora Extras From fedora-extras-commits at redhat.com Wed Mar 1 04:51:17 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 28 Feb 2006 23:51:17 -0500 Subject: rpms/xpilot-ng/FC-4 xpilot-ng-server.init, NONE, 1.1 xpilot-ng.logrotate, NONE, 1.1 xpilot-ng.sysconfig, NONE, 1.1 xpilot-ng.spec, 1.2, 1.3 Message-ID: <200603010451.k214pn7B025009@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24977 Modified Files: xpilot-ng.spec Added Files: xpilot-ng-server.init xpilot-ng.logrotate xpilot-ng.sysconfig Log Message: Add init startup script with associated support files (logrotate, sysconfig) Add RPM_OPT_FLAGS to compile line More readable spacing in changelog --- NEW FILE xpilot-ng-server.init --- #!/bin/sh # # xpilot-ng-server This shell script takes care of starting and stopping # the xpilot-ng game server. # # chkconfig: - 15 85 # description: The xpilot-ng server supports playing networked \ # multi-player games. # processname: xpilot-ng-server # config: /etc/sysconfig/xpilot-ng-server # pidfile: /var/run/xpilot-ng-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/xpilot-ng-server" prog=$(basename $exec) pidfile=/var/run/$prog.pid [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { echo -n $"Starting Xpilot 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 games $exec $XPILOTD_OPTIONS >>/var/log/xpilot.log 2>&1 & retval=$? if [ $retval -eq 0 ]; then success touch $lockfile pidofproc $prog > $pidfile else failure fi echo return $retval } stop() { echo -n $"Stopping Xpilot 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 xpilot-ng.logrotate --- /var/log/xpilotd.log { copytruncate notifempty missingok } --- NEW FILE xpilot-ng.sysconfig --- # # xpilot-ng-server(6) options. Pick a custom port here if needed, for example. # # This option activates a public server. This will advertise your # xpilot server to the public xpilot metadirectory and keep xpilot # running continuosly. # The following two lines have the same effect: #XPILOTD_OPTIONS="-expand PublicSettings" #XPILOTD_OPTIONS="-idleRun -noQuit +reportToMetaServer" # Normally xpilot will look in /usr/share/xpilot-ng for the # configuration files. This is fine for user-initiated servers. # But for the system xpilot server we want to allow a different set # of defaults. XPILOTD_OPTIONS="-noQuit \ -defaultsFileName /etc/xpilot-ng/defaults.txt \ -passwordFileName /etc/xpilot-ng/password.txt" Index: xpilot-ng.spec =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xpilot-ng.spec 8 Feb 2006 02:19:35 -0000 1.2 +++ xpilot-ng.spec 1 Mar 2006 04:51:17 -0000 1.3 @@ -1,6 +1,6 @@ Name: xpilot-ng Version: 4.7.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -10,12 +10,19 @@ Source1: xpilot-ng.png Source2: xpilot-ng-x11.desktop Source3: xpilot-ng-sdl.desktop +Source4: xpilot-ng-server.init +Source5: xpilot-ng.sysconfig +Source6: xpilot-ng.logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel # The following BR are not needed for FC-4 #BuildRequires: libXt-devel mesa-libGLU-devel libXxf86misc-devel +Requires(post): /sbin/chkconfig +Requires(post): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service %description A highly addictive, infinitely configurable multiplayer space @@ -41,12 +48,10 @@ mv xpilot-ng-x11.man.new xpilot-ng-x11.man popd - %build -%configure +CFLAGS="$RPM_OPT_FLAGS" %configure make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -64,6 +69,19 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +install -p -D -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initrddir}/%{name}-server + +install -p -D -m 644 %{SOURCE5} \ + $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}-server + +install -p -D -m 644 %{SOURCE6} \ + $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server + +# Copy certain configuration files to /etc so that they can be properly managed +# as config files. +install -p -D -m 644 lib/defaults.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/defaults.txt +install -p -D -m 600 lib/password.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/password.txt + %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -76,6 +94,20 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%post server +/sbin/chkconfig --add xpilot-ng-server + +%preun server +if [ "$1" = "0" ]; then + /sbin/service xpilot-ng-server stop > /dev/null 2>&1 + /sbin/chkconfig --del xpilot-ng-server +fi + +%postun server +if [ "$1" -ge "1" ]; then + /sbin/service xpilot-ng-server restart >/dev/null 2>&1 +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -99,6 +131,9 @@ %defattr(-,root,root,-) %{_bindir}/xpilot-ng-xp-mapedit %{_bindir}/xpilot-ng-server +%{_initrddir}/xpilot-ng-server +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server %dir %{_datadir}/%{name} %{_datadir}/%{name}/defaults.txt %{_datadir}/%{name}/password.txt @@ -106,6 +141,9 @@ %{_datadir}/%{name}/shipshapes.txt %{_datadir}/%{name}/mapconvert.py %{_datadir}/%{name}/maps +%dir %{_sysconfdir}/%{name} +%config(noreplace) %attr(0600,games,games) %{_sysconfdir}/%{name}/password.txt +%config(noreplace) %{_sysconfdir}/%{name}/defaults.txt %{_mandir}/man6/xpilot-ng-server.6.gz %{_mandir}/man6/xpilot-ng-xp-mapedit.6.gz %doc README COPYING @@ -114,15 +152,25 @@ #%ghost %{_datadir}/%{name}/mapconvert.pyo %changelog +* Tue Feb 28 2006 Wart 4.7.2-5 +- Added sysconfig and initrd files for starting xpilot server at boot time +- Add copies of customizable configuration files to /etc/xpilot +- More readable spacing in changelog +- Add missing ; in desktop file +- Added RPM_OPT_FLAGS to compile line + * Mon Feb 6 2006 Wart 4.7.2-4 - Don't make duplicates of the doc files for the subpackage. - Use version macro is source path - Preserve timestamps when installing icons. + * Fri Feb 3 2006 Wart 4.7.2-3 - Add readme and license files to the server subpackage - Set default file attributes for the server subpackage + * Fri Feb 3 2006 Wart 4.7.2-2 - Allow both packages to 0wn datadir/xpilot-ng - Clean up non-utf8 man pages + * Thu Feb 2 2006 Wart 4.7.2-1 - Initial submission to Fedora Extras From fedora-extras-commits at redhat.com Wed Mar 1 05:29:56 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 00:29:56 -0500 Subject: rpms/scim-skk/FC-4 scim-skk.spec,1.9,1.10 Message-ID: <200603010530.k215US7f027123@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27095 Modified Files: scim-skk.spec Log Message: update fileslist since moduledir is now api-versioned Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim-skk.spec 25 Jan 2006 05:38:27 -0000 1.9 +++ scim-skk.spec 1 Mar 2006 05:29:56 -0000 1.10 @@ -1,6 +1,6 @@ Name: scim-skk Version: 0.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine module for skk Group: System Environment/Libraries @@ -29,7 +29,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la %find_lang %{name} @@ -41,15 +41,16 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog -%dir %{_libdir}/scim-1.0/IMEngine -%{_libdir}/scim-1.0/IMEngine/skk.so -%dir %{_libdir}/scim-1.0/SetupUI -%{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so +%{_libdir}/scim-1.0/*/IMEngine/skk.so +%{_libdir}/scim-1.0/*/SetupUI/skk-imengine-setup.so %{_datadir}/scim/icons/scim-skk.png %{_datadir}/scim/icons/scim-skk.png %changelog +* Wed Mar 1 2006 Ryo Diairki - 0.5.2-2 +- update filelist since moduledir is now api-versioned + * Wed Jan 25 2006 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 From fedora-extras-commits at redhat.com Wed Mar 1 05:30:42 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 00:30:42 -0500 Subject: rpms/scim-skk/FC-4 scim-skk.spec,1.10,1.11 Message-ID: <200603010531.k215VFKh027175@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27158 Modified Files: scim-skk.spec Log Message: update fileslist since moduledir is now api-versioned Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim-skk.spec 1 Mar 2006 05:29:56 -0000 1.10 +++ scim-skk.spec 1 Mar 2006 05:30:42 -0000 1.11 @@ -29,7 +29,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la %find_lang %{name} From fedora-extras-commits at redhat.com Wed Mar 1 05:33:48 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 00:33:48 -0500 Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.10,1.11 Message-ID: <200603010534.k215YMIc027299@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27277 Modified Files: scim-skk.spec Log Message: the same as FC4 Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim-skk.spec 25 Jan 2006 05:43:59 -0000 1.10 +++ scim-skk.spec 1 Mar 2006 05:33:48 -0000 1.11 @@ -1,6 +1,6 @@ Name: scim-skk Version: 0.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine module for skk Group: System Environment/Libraries @@ -32,7 +32,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la %find_lang %{name} @@ -44,15 +44,16 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog -%dir %{_libdir}/scim-1.0/IMEngine -%{_libdir}/scim-1.0/IMEngine/skk.so -%dir %{_libdir}/scim-1.0/SetupUI -%{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so +%{_libdir}/scim-1.0/*/IMEngine/skk.so +%{_libdir}/scim-1.0/*/SetupUI/skk-imengine-setup.so %{_datadir}/scim/icons/scim-skk.png %{_datadir}/scim/icons/scim-skk.png %changelog +* Wed Mar 1 2006 Ryo Diairki - 0.5.2-2 +- update filelist since moduledir is now api-versioned + * Wed Jan 25 2006 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 From fedora-extras-commits at redhat.com Wed Mar 1 05:51:29 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 00:51:29 -0500 Subject: rpms/scim-tomoe/FC-4 scim-tomoe-moduledir.patch, NONE, 1.1 scim-tomoe.spec, 1.2, 1.3 Message-ID: <200603010552.k215q1Qq027381@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27361 Modified Files: scim-tomoe.spec Added Files: scim-tomoe-moduledir.patch Log Message: scim-tomoe-moduledir.patch: --- NEW FILE scim-tomoe-moduledir.patch --- --- src/Makefile.am 2006-03-01 14:35:56.000000000 +0900 +++ src/Makefile.am.new 2006-03-01 14:36:07.000000000 +0900 @@ -12,7 +12,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ --- src/Makefile.in 2006-03-01 14:44:48.000000000 +0900 +++ src/Makefile.in.new 2006-03-01 14:45:30.000000000 +0900 @@ -257,7 +257,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ scim_tomoe.cpp \ Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/scim-tomoe.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-tomoe.spec 7 Oct 2005 09:53:41 -0000 1.2 +++ scim-tomoe.spec 1 Mar 2006 05:51:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-tomoe -Version: 0.1.0 -Release: 2%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -9,6 +9,8 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: scim-tomoe-moduledir.patch + Requires: scim BuildRequires: scim-devel, tomoe-devel @@ -18,6 +20,7 @@ %prep %setup -q +%patch0 -p0 %build @@ -29,7 +32,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/Helper/tomoe.la %find_lang %{name} @@ -40,12 +43,15 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog -%{_libdir}/scim-1.0 +%doc AUTHORS COPYING ChangeLog README +%{_libdir}/scim-1.0/*/Helper/tomoe.so %{_datadir}/scim/icons/scim-tomoe.png %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +- update to 0.2 + * Fri Oct 7 2005 Ryo Dairiki - 0.1-2 - add scim into the requirement From fedora-extras-commits at redhat.com Wed Mar 1 06:03:51 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:03:51 -0500 Subject: rpms/scim-tomoe/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200603010604.k2164NQQ029344@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29324 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Sep 2005 09:21:38 -0000 1.2 +++ .cvsignore 1 Mar 2006 06:03:51 -0000 1.3 @@ -1 +1 @@ -scim-tomoe-0.1.0.tar.gz +scim-tomoe-0.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Sep 2005 09:21:38 -0000 1.2 +++ sources 1 Mar 2006 06:03:51 -0000 1.3 @@ -1 +1 @@ -1c39c1e03069a4a6e15fcf5501cb981f scim-tomoe-0.1.0.tar.gz +55bc028af137ed5f99bab4ca042219cf scim-tomoe-0.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 06:07:21 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:07:21 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe-moduledir.patch, NONE, 1.1 scim-tomoe.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603010607.k2167ror029388@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356 Modified Files: scim-tomoe.spec sources Added Files: scim-tomoe-moduledir.patch Log Message: update to 0.2.0 scim-tomoe-moduledir.patch: --- NEW FILE scim-tomoe-moduledir.patch --- --- src/Makefile.am 2006-03-01 14:35:56.000000000 +0900 +++ src/Makefile.am.new 2006-03-01 14:36:07.000000000 +0900 @@ -12,7 +12,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ --- src/Makefile.in 2006-03-01 14:44:48.000000000 +0900 +++ src/Makefile.in.new 2006-03-01 14:45:30.000000000 +0900 @@ -257,7 +257,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ scim_tomoe.cpp \ Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-tomoe.spec 13 Feb 2006 06:42:32 -0000 1.3 +++ scim-tomoe.spec 1 Mar 2006 06:07:21 -0000 1.4 @@ -1,8 +1,8 @@ %define with_libstdc_preview 1 Name: scim-tomoe -Version: 0.1.0 -Release: 3%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -17,12 +17,15 @@ %endif Requires: scim +Patch0: scim-tomoe-moduledir.patch + %description Scim-tomoe allows Japanese handwritten input of characters using SCIM. %prep %setup -q +%patch0 -p0 %build @@ -62,6 +65,9 @@ %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +- update to 0.2 + * Mon Feb 13 2006 Jens Petersen - 0.1.0-3 - build conditionally with libstdc++so7 preview library (#166041) - add with_libstdc_preview switch and tweak libtool to link against it Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Sep 2005 09:21:38 -0000 1.2 +++ sources 1 Mar 2006 06:07:21 -0000 1.3 @@ -1 +1 @@ -1c39c1e03069a4a6e15fcf5501cb981f scim-tomoe-0.1.0.tar.gz +55bc028af137ed5f99bab4ca042219cf scim-tomoe-0.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 06:20:08 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:20:08 -0500 Subject: rpms/tomoe/devel tomoe.spec,1.2,1.3 Message-ID: <200603010620.k216KfZB029499@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29461 Modified Files: tomoe.spec Log Message: sync with libtomoe-gtk Index: tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/tomoe/devel/tomoe.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomoe.spec 9 Sep 2005 12:39:30 -0000 1.2 +++ tomoe.spec 1 Mar 2006 06:20:08 -0000 1.3 @@ -1,6 +1,6 @@ Name: tomoe Version: 0.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -63,6 +63,9 @@ %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2.1-4 +- sync with libtomoe-gtk + * Sat Sep 3 2005 Warren Togami - 0.2.1-3 - some spec cleanup From fedora-extras-commits at redhat.com Wed Mar 1 06:36:35 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:36:35 -0500 Subject: rpms/tomoe/FC-4 tomoe.spec,1.2,1.3 Message-ID: <200603010637.k216b8R3029682@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/tomoe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29665 Modified Files: tomoe.spec Log Message: Index: tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/tomoe/FC-4/tomoe.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomoe.spec 9 Sep 2005 12:39:29 -0000 1.2 +++ tomoe.spec 1 Mar 2006 06:36:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: tomoe Version: 0.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -63,6 +63,9 @@ %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2.1-4 +- sync with libtomoe-gtk + * Sat Sep 3 2005 Warren Togami - 0.2.1-3 - some spec cleanup From fedora-extras-commits at redhat.com Wed Mar 1 06:37:30 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:37:30 -0500 Subject: rpms/tomoe/FC-3 tomoe.spec,1.2,1.3 Message-ID: <200603010638.k216c2eD029705@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/tomoe/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29688 Modified Files: tomoe.spec Log Message: Index: tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/tomoe/FC-3/tomoe.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomoe.spec 9 Sep 2005 12:39:11 -0000 1.2 +++ tomoe.spec 1 Mar 2006 06:37:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: tomoe Version: 0.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -63,6 +63,9 @@ %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2.1-4 +- sync with libtomoe-gtk + * Sat Sep 3 2005 Warren Togami - 0.2.1-3 - some spec cleanup From fedora-extras-commits at redhat.com Wed Mar 1 06:39:02 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:39:02 -0500 Subject: rpms/scim-tomoe/FC-3 scim-tomoe.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200603010639.k216dZSn029734@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29715 Modified Files: scim-tomoe.spec sources Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-3/scim-tomoe.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-tomoe.spec 7 Oct 2005 09:14:51 -0000 1.2 +++ scim-tomoe.spec 1 Mar 2006 06:39:02 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-tomoe -Version: 0.1.0 -Release: 2%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -9,6 +9,8 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: scim-tomoe-moduledir.patch + Requires: scim BuildRequires: scim-devel, tomoe-devel @@ -18,6 +20,7 @@ %prep %setup -q +%patch0 -p0 %build @@ -29,7 +32,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/Helper/tomoe.la %find_lang %{name} @@ -40,12 +43,15 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog -%{_libdir}/scim-1.0 +%doc AUTHORS COPYING ChangeLog README +%{_libdir}/scim-1.0/*/Helper/tomoe.so %{_datadir}/scim/icons/scim-tomoe.png %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +- update to 0.2 + * Fri Oct 7 2005 Ryo Dairiki - 0.1-2 - add scim into the requirement Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Sep 2005 09:21:38 -0000 1.2 +++ sources 1 Mar 2006 06:39:02 -0000 1.3 @@ -1 +1 @@ -1c39c1e03069a4a6e15fcf5501cb981f scim-tomoe-0.1.0.tar.gz +55bc028af137ed5f99bab4ca042219cf scim-tomoe-0.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 06:57:28 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 1 Mar 2006 01:57:28 -0500 Subject: rpms/gcdmaster/devel gcdmaster-1.2.1-qualification.patch, NONE, 1.1 gcdmaster.spec, 1.1, 1.2 Message-ID: <200603010658.k216w0PK029820@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gcdmaster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29800 Modified Files: gcdmaster.spec Added Files: gcdmaster-1.2.1-qualification.patch Log Message: Added patch to fix g++4 compile problem gcdmaster-1.2.1-qualification.patch: --- NEW FILE gcdmaster-1.2.1-qualification.patch --- --- cdrdao-1.2.1.orig/xdao/ProgressDialog.h 2006-02-10 21:04:51.000000000 -0800 +++ cdrdao-1.2.1/xdao/ProgressDialog.h 2006-02-10 21:13:18.000000000 -0800 @@ -62,7 +62,7 @@ bool leadTimeFilled_; struct timeval time_; - bool ProgressDialog::time(); + bool time(); Gtk::Button *cancelButton_; Gtk::Button *closeButton_; Index: gcdmaster.spec =================================================================== RCS file: /cvs/extras/rpms/gcdmaster/devel/gcdmaster.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcdmaster.spec 18 Dec 2005 20:12:52 -0000 1.1 +++ gcdmaster.spec 1 Mar 2006 06:57:27 -0000 1.2 @@ -1,6 +1,6 @@ Name: gcdmaster Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Gnome2 Disk-At-Once (DAO) Audio CD writer Group: Applications/Multimedia @@ -8,6 +8,7 @@ URL: http://cdrdao.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2 +Patch0: gcdmaster-1.2.1-qualification.patch Requires: cdrdao BuildRequires: gtkmm24-devel BuildRequires: libgnomeuimm26-devel @@ -28,7 +29,7 @@ %prep %setup -q -n cdrdao-%{version} - +%patch0 -p1 -b .qualification %build %configure --with-scglib=sys %{!?_with_mp3: --without-mp3-support} @@ -81,6 +82,9 @@ %{_mandir}/man1/gcdmaster* %changelog +* Tue Feb 28 2006 Denis Leroy - 1.2.1-4 +- Added patch to fix g++4 compile problem + * Sat Dec 17 2005 Denis Leroy - 1.2.1-3 - Added user macro to enable mp3 support @@ -90,4 +94,3 @@ * Sat Nov 26 2005 Denis Leroy - 1.2.1-1 - Initial version - From fedora-extras-commits at redhat.com Wed Mar 1 07:33:31 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 02:33:31 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.4,1.5 Message-ID: <200603010734.k217Y3eN031865@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31843 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-tomoe.spec 1 Mar 2006 06:07:21 -0000 1.4 +++ scim-tomoe.spec 1 Mar 2006 07:33:31 -0000 1.5 @@ -2,7 +2,7 @@ Name: scim-tomoe Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -11,7 +11,7 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: scim-devel, tomoe-devel +BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk %if %{with_libstdc_preview} Buildrequires: libstdc++so7-devel %endif @@ -65,7 +65,7 @@ %changelog -* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +* Wed Mar 1 2006 Ryo Dairiki - 0.2-2 - update to 0.2 * Mon Feb 13 2006 Jens Petersen - 0.1.0-3 From fedora-extras-commits at redhat.com Wed Mar 1 07:35:16 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 02:35:16 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.5,1.6 Message-ID: <200603010735.k217ZmWL031921@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31900 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-tomoe.spec 1 Mar 2006 07:33:31 -0000 1.5 +++ scim-tomoe.spec 1 Mar 2006 07:35:16 -0000 1.6 @@ -11,7 +11,7 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk +BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk-devel %if %{with_libstdc_preview} Buildrequires: libstdc++so7-devel %endif From fedora-extras-commits at redhat.com Wed Mar 1 07:36:37 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 1 Mar 2006 02:36:37 -0500 Subject: rpms/abcde/devel .cvsignore, 1.8, 1.9 abcde.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <200603010737.k217b9iS032008@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/abcde/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31966 Modified Files: .cvsignore abcde.spec sources Log Message: * Wed Mar 1 2006 Ville Skytt?? - 2.3.99.5-1 - 2.3.99.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Dec 2005 16:12:39 -0000 1.8 +++ .cvsignore 1 Mar 2006 07:36:36 -0000 1.9 @@ -1 +1 @@ -abcde_2.3.99.2-1.tar.gz +abcde_2.3.99.5.orig.tar.gz Index: abcde.spec =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/abcde.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- abcde.spec 14 Dec 2005 16:12:39 -0000 1.9 +++ abcde.spec 1 Mar 2006 07:36:37 -0000 1.10 @@ -1,12 +1,12 @@ Name: abcde -Version: 2.3.99.2 +Version: 2.3.99.5 Release: 1%{?dist} Summary: A Better CD Encoder Group: Applications/Multimedia License: GPL or Artistic URL: http://www.hispalinux.es/~data/abcde.php -Source0: http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}-1.tar.gz +Source0: http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz Patch0: %{name}-2.1.19-inst.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,6 +29,7 @@ %patch0 -p1 sed -i -e 's/normalize-audio/normalize/g' abcde* sed -i -e 's/^#NOGAP$/#NOGAP=y/' abcde.conf +mv examples/cue2discid . %install @@ -36,6 +37,7 @@ %makeinstall \ etcdir=$RPM_BUILD_ROOT%{_sysconfdir} \ mandir=$RPM_BUILD_ROOT%{_mandir}/man1 +install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir} %clean @@ -44,15 +46,19 @@ %files %defattr(-,root,root,-) -%doc COPYING FAQ README TODO USEPIPES debian/changelog examples/ +%doc COPYING FAQ README TODO USEPIPES changelog examples/ %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/abcde %{_bindir}/cddb-tool +%{_bindir}/cue2discid %{_mandir}/man1/abcde.1* %{_mandir}/man1/cddb-tool.1* %changelog +* Wed Mar 1 2006 Ville Skytt?? - 2.3.99.5-1 +- 2.3.99.5. + * Wed Dec 14 2005 Ville Skytt?? - 2.3.99.2-1 - 2.3.99.2, config file fixes mostly applied upstream. Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Dec 2005 16:12:39 -0000 1.8 +++ sources 1 Mar 2006 07:36:37 -0000 1.9 @@ -1 +1 @@ -c76a00786096f89d6b0aa6c052410f67 abcde_2.3.99.2-1.tar.gz +d04f8d0f526f626e8d4741c3938a644e abcde_2.3.99.5.orig.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 07:36:53 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:36:53 -0500 Subject: owners owners.list,1.688,1.689 Message-ID: <200603010737.k217bP0U032011@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31983 Modified Files: owners.list Log Message: Added linux-libertine-fonts. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.688 retrieving revision 1.689 diff -u -r1.688 -r1.689 --- owners.list 28 Feb 2006 19:35:00 -0000 1.688 +++ owners.list 1 Mar 2006 07:36:52 -0000 1.689 @@ -624,6 +624,7 @@ Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org| 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|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 1 07:39:29 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 1 Mar 2006 02:39:29 -0500 Subject: rpms/xemacs/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xemacs-sitestart.el, 1.1, 1.2 xemacs.spec, 1.4, 1.5 Message-ID: <200603010740.k217e1dI032098@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32075 Modified Files: .cvsignore sources xemacs-sitestart.el xemacs.spec Log Message: * Wed Mar 1 2006 Ville Skytt?? - 21.4.19-1 - 21.4.19. - Don't set Info-directory-list in site-start.el to fix honoring INFOPATH from the environment (Geert Kloosterman). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Dec 2005 17:30:55 -0000 1.3 +++ .cvsignore 1 Mar 2006 07:39:29 -0000 1.4 @@ -1 +1 @@ -xemacs-21.4.18.tar.bz2 +xemacs-21.4.19.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Dec 2005 17:30:55 -0000 1.3 +++ sources 1 Mar 2006 07:39:29 -0000 1.4 @@ -1 +1 @@ -08c99ff915564a122a3a44df2264669c xemacs-21.4.18.tar.bz2 +0d2d255e2b362064959f329d522b137b xemacs-21.4.19.tar.bz2 Index: xemacs-sitestart.el =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/xemacs-sitestart.el,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xemacs-sitestart.el 1 Mar 2005 22:11:36 -0000 1.1 +++ xemacs-sitestart.el 1 Mar 2006 07:39:29 -0000 1.2 @@ -2,11 +2,6 @@ ;;; ;;; The "-no-site-file" option to xemacs prevents this file from being loaded. -;; fix default info path -(setq Info-directory-list '("/usr/share/info/" - "/usr/share/xemacs/xemacs-packages/info/" - "/usr/share/xemacs/mule-packages/info/")) - ;;; psgml catalog list (setq sgml-catalog-files (if (getenv "SGML_CATALOG_FILES") Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/xemacs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xemacs.spec 5 Dec 2005 17:30:55 -0000 1.4 +++ xemacs.spec 1 Mar 2006 07:39:29 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Different version of Emacs Name: xemacs -Version: 21.4.18 +Version: 21.4.19 Release: 1%{?dist} License: GPL Group: Applications/Editors @@ -113,6 +113,8 @@ %prep %setup -q +find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f + ## Lisp patches ## # make find-paths.el look in datadir %patch10 -p1 @@ -380,6 +382,11 @@ %changelog +* Wed Mar 1 2006 Ville Skytt?? - 21.4.19-1 +- 21.4.19. +- Don't set Info-directory-list in site-start.el to fix honoring INFOPATH + from the environment (Geert Kloosterman). + * Mon Dec 5 2005 Ville Skytt?? - 21.4.18-1 - 21.4.18, innerbuf and cursor patches applied upstream. - Move icon to icons/hicolor and to the main package. From fedora-extras-commits at redhat.com Wed Mar 1 07:42:05 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:42:05 -0500 Subject: rpms/linux-libertine-fonts - New directory Message-ID: <200603010742.k217g7Zu032200@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32192/linux-libertine-fonts Log Message: Directory /cvs/extras/rpms/linux-libertine-fonts added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 07:42:10 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:42:10 -0500 Subject: rpms/linux-libertine-fonts/devel - New directory Message-ID: <200603010742.k217gC8M032215@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32192/linux-libertine-fonts/devel Log Message: Directory /cvs/extras/rpms/linux-libertine-fonts/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 07:42:36 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:42:36 -0500 Subject: rpms/linux-libertine-fonts Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603010742.k217gcMI032249@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32237 Added Files: Makefile import.log Log Message: Setup of module linux-libertine-fonts --- NEW FILE Makefile --- # Top level Makefile for module linux-libertine-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 Wed Mar 1 07:42:42 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:42:42 -0500 Subject: rpms/linux-libertine-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603010742.k217giF9032269@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32237/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module linux-libertine-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 Wed Mar 1 07:45:36 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:45:36 -0500 Subject: rpms/linux-libertine-fonts import.log,1.1,1.2 Message-ID: <200603010746.k217k9p4032343@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32309 Modified Files: import.log Log Message: auto-import linux-libertine-fonts-2.0.4-2 on branch devel from linux-libertine-fonts-2.0.4-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/linux-libertine-fonts/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Mar 2006 07:42:36 -0000 1.1 +++ import.log 1 Mar 2006 07:45:36 -0000 1.2 @@ -0,0 +1 @@ +linux-libertine-fonts-2_0_4-2:HEAD:linux-libertine-fonts-2.0.4-2.src.rpm:1141199124 From fedora-extras-commits at redhat.com Wed Mar 1 07:45:42 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:45:42 -0500 Subject: rpms/linux-libertine-fonts/devel linux-libertine-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603010746.k217kFvO032347@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32309/devel Modified Files: .cvsignore sources Added Files: linux-libertine-fonts.spec Log Message: auto-import linux-libertine-fonts-2.0.4-2 on branch devel from linux-libertine-fonts-2.0.4-2.src.rpm --- NEW FILE linux-libertine-fonts.spec --- %define archivename LinLibertineSRC %define fontdir %{_datadir}/fonts/linux-libertine Name: linux-libertine-fonts Version: 2.0.4 Release: 2%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPL URL: http://linuxlibertine.sf.net Source: http://dl.sf.net/linuxlibertine/%{archivename}-%{version}-6.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: fontforge %description The Linux Libertine Open Fonts are a TrueType font family for practical use in documents. They were created to provide a free alternative to proprietary standard fonts. %prep %setup -q -n %{archivename} %build fontforge -script "-" *.sfd < 2.0.4-2 - Named back to linux-libertine-fonts * Wed Feb 13 2006 Frank Arnold 2.0.4-1 - Updated to 2.0.4 - Removed handling of fonts.cache-2 * Wed Feb 01 2006 Frank Arnold 2.0.1-3 - Nuked separate fontforge build script, now in %%build section * Tue Jan 31 2006 Frank Arnold 2.0.1-2 - Fixed the following issues addressed by Ignacio Vazquez-Abrams - Package renaming to font-linux-libertine - Generate fonts from sources - Sample sheets for each font in PDF format * Mon Jan 30 2006 Frank Arnold 2.0.1-1 - Initial RPM release - Spec derived from other font packages Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2006 07:42:42 -0000 1.1 +++ .cvsignore 1 Mar 2006 07:45:42 -0000 1.2 @@ -0,0 +1 @@ +LinLibertineSRC-2.0.4-6.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2006 07:42:42 -0000 1.1 +++ sources 1 Mar 2006 07:45:42 -0000 1.2 @@ -0,0 +1 @@ +d0fcc8c7b01f5b587592840a3f7564a0 LinLibertineSRC-2.0.4-6.tgz From fedora-extras-commits at redhat.com Wed Mar 1 08:01:13 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 03:01:13 -0500 Subject: rpms/centericq/FC-4 centericq-ncursesw.patch, NONE, 1.1 centericq.spec, 1.20, 1.21 Message-ID: <200603010801.k2181jjE001912@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32515/FC-4 Modified Files: centericq.spec Added Files: centericq-ncursesw.patch Log Message: - improve utf8 handling centericq-ncursesw.patch: --- NEW FILE centericq-ncursesw.patch --- --- centericq-4.21.0/configure.in.utf 2006-01-06 19:12:07.000000000 +0200 +++ centericq-4.21.0/configure.in 2006-01-06 19:14:05.000000000 +0200 @@ -109,8 +109,9 @@ LIBS="$LIBS $LIBICONV" AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(nsl, gethostbyname) -AC_CHECK_LIB(ncurses, initscr,, - [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))]) +AC_CHECK_LIB(ncursesw, initscr,, + [AC_CHECK_LIB(ncurses, initscr,, + [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))])]) AC_TRY_COMPILE([ #include Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-4/centericq.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- centericq.spec 3 Jan 2006 10:03:19 -0000 1.20 +++ centericq.spec 1 Mar 2006 08:01:13 -0000 1.21 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Text mode menu- and window-driven IM @@ -22,14 +22,17 @@ Patch6: centericq-4.21.0-kkstrtext.patch # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch +# improve utf8 handling +Patch200: centericq-ncursesw.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel BuildRequires: libidn-devel BuildRequires: curl-devel BuildRequires: ncurses-devel -BuildRequires: gettext +BuildRequires: gettext-devel BuildRequires: gpgme-devel +BuildRequires: automake %description Centericq is a text mode menu- and window-driven IM interface that supports the @@ -45,6 +48,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch200 -p1 +aclocal +autoconf +automake %build CFLAGS="$RPM_OPT_FLAGS" \ @@ -75,6 +82,10 @@ # we don't want that %exclude %{_includedir}/msn %changelog +* Wed Mar 01 2006 Andreas Bierfert +4.21.0-4 +- improve utf8 support + * Tue Jan 03 2006 Andreas Bierfert 4.21.0-3 - Fix more security related stuff From fedora-extras-commits at redhat.com Wed Mar 1 08:01:21 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 03:01:21 -0500 Subject: rpms/centericq/devel centericq-ncursesw.patch, NONE, 1.1 centericq.spec, 1.22, 1.23 Message-ID: <200603010801.k2181rEM001915@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32515/devel Modified Files: centericq.spec Added Files: centericq-ncursesw.patch Log Message: - improve utf8 handling centericq-ncursesw.patch: --- NEW FILE centericq-ncursesw.patch --- --- centericq-4.21.0/configure.in.utf 2006-01-06 19:12:07.000000000 +0200 +++ centericq-4.21.0/configure.in 2006-01-06 19:14:05.000000000 +0200 @@ -109,8 +109,9 @@ LIBS="$LIBS $LIBICONV" AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(nsl, gethostbyname) -AC_CHECK_LIB(ncurses, initscr,, - [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))]) +AC_CHECK_LIB(ncursesw, initscr,, + [AC_CHECK_LIB(ncurses, initscr,, + [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))])]) AC_TRY_COMPILE([ #include Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- centericq.spec 15 Feb 2006 08:33:53 -0000 1.22 +++ centericq.spec 1 Mar 2006 08:01:20 -0000 1.23 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Text mode menu- and window-driven IM @@ -22,15 +22,17 @@ Patch6: centericq-4.21.0-kkstrtext.patch # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch - +# improve utf8 handling +Patch200: centericq-ncursesw.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel BuildRequires: libidn-devel BuildRequires: curl-devel BuildRequires: ncurses-devel -BuildRequires: gettext +BuildRequires: gettext-devel BuildRequires: gpgme-devel +BuildRequires: automake %description Centericq is a text mode menu- and window-driven IM interface that supports the @@ -46,6 +48,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch200 -p1 +aclocal +autoconf +automake %build CFLAGS="$RPM_OPT_FLAGS" \ @@ -77,6 +83,10 @@ %exclude %{_includedir}/msn %changelog +* Wed Mar 01 2006 Andreas Bierfert +4.21.0-6 +- improve utf8 support + * Tue Feb 14 2006 Andreas Bierfert 4.21.0-5 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed Mar 1 08:01:07 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 03:01:07 -0500 Subject: rpms/centericq/FC-3 centericq-ncursesw.patch, NONE, 1.1 centericq.spec, 1.10, 1.11 Message-ID: <200603010802.k2182Ngk001918@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32515/FC-3 Modified Files: centericq.spec Added Files: centericq-ncursesw.patch Log Message: - improve utf8 handling centericq-ncursesw.patch: --- NEW FILE centericq-ncursesw.patch --- --- centericq-4.21.0/configure.in.utf 2006-01-06 19:12:07.000000000 +0200 +++ centericq-4.21.0/configure.in 2006-01-06 19:14:05.000000000 +0200 @@ -109,8 +109,9 @@ LIBS="$LIBS $LIBICONV" AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(nsl, gethostbyname) -AC_CHECK_LIB(ncurses, initscr,, - [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))]) +AC_CHECK_LIB(ncursesw, initscr,, + [AC_CHECK_LIB(ncurses, initscr,, + [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))])]) AC_TRY_COMPILE([ #include Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-3/centericq.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- centericq.spec 3 Jan 2006 10:02:58 -0000 1.10 +++ centericq.spec 1 Mar 2006 08:01:07 -0000 1.11 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Text mode menu- and window-driven IM @@ -22,14 +22,17 @@ Patch6: centericq-4.21.0-kkstrtext.patch # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch +# improve utf8 handling +Patch200: centericq-ncursesw.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel BuildRequires: libidn-devel BuildRequires: curl-devel BuildRequires: ncurses-devel -BuildRequires: gettext +BuildRequires: gettext-devel BuildRequires: gpgme-devel +BuildRequires: automake %description Centericq is a text mode menu- and window-driven IM interface that supports the @@ -45,6 +48,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch200 -p1 +aclocal +autoconf +automake %build CFLAGS="$RPM_OPT_FLAGS" \ @@ -75,6 +82,10 @@ # we don't want that %exclude %{_includedir}/msn %changelog +* Wed Mar 01 2006 Andreas Bierfert +4.21.0-4 +- improve utf8 support + * Tue Jan 03 2006 Andreas Bierfert 4.21.0-3 - Fix more security related stuff From fedora-extras-commits at redhat.com Wed Mar 1 08:02:54 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Wed, 1 Mar 2006 03:02:54 -0500 Subject: rpms/jogl/devel jogl.spec,1.14,1.15 Message-ID: <200603010803.k2183AsC001944@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1924 Modified Files: jogl.spec Log Message: Rebuild with new compiler Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jogl.spec 9 Feb 2006 18:47:53 -0000 1.14 +++ jogl.spec 1 Mar 2006 08:02:54 -0000 1.15 @@ -2,7 +2,7 @@ Name: jogl Version: 1.1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Java bindings for the OpenGL API Group: System Environment/Libraries @@ -107,6 +107,9 @@ %doc %{_javadocdir}/%{name} %changelog +* Wed Mar 1 2006 Anthony Green - 0:1.1.1-14 +- Rebuild again with another new compiler. + * Thu Feb 9 2006 Anthony Green - 0:1.1.1-13 - Rebuild with new 4.1 compiler (post ABI change). From fedora-extras-commits at redhat.com Wed Mar 1 08:13:33 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 1 Mar 2006 03:13:33 -0500 Subject: rpms/galeon/devel .cvsignore, 1.6, 1.7 galeon.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200603010814.k218E5U8002077@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2056 Modified Files: .cvsignore galeon.spec sources Log Message: Update to 2.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/galeon/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Nov 2005 22:39:01 -0000 1.6 +++ .cvsignore 1 Mar 2006 08:13:33 -0000 1.7 @@ -1 +1 @@ -galeon-2.0.0.tar.bz2 +galeon-2.0.1.tar.bz2 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- galeon.spec 5 Dec 2005 04:53:20 -0000 1.14 +++ galeon.spec 1 Mar 2006 08:13:33 -0000 1.15 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.0.1 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -113,6 +113,9 @@ %changelog +* Tue Feb 28 2006 Denis Leroy - 2.0.1-1 +- Update to 2.0.1 + * Sun Dec 4 2005 Denis Leroy - 2.0.0-2 - Fixed preun script, was removing schemas after update. - Removed galeon-config-tool. Now using well-known Fedora scriptlets. Index: sources =================================================================== RCS file: /cvs/extras/rpms/galeon/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Nov 2005 22:39:01 -0000 1.7 +++ sources 1 Mar 2006 08:13:33 -0000 1.8 @@ -1 +1 @@ -e1f1e46d40c9e2345c1ea5e9bc788244 galeon-2.0.0.tar.bz2 +34d6e3a6ee78f9e4d12736e5d81b462b galeon-2.0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 08:30:08 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 1 Mar 2006 03:30:08 -0500 Subject: rpms/graphviz/devel graphviz.spec,1.25,1.26 Message-ID: <200603010830.k218UecU002402@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2384 Modified Files: graphviz.spec Log Message: * Wed Mar 01 2006 Oliver Falk - 2.8-3 - Add libtool-ltdl, libtool-ltdl-devel - Fix fixes Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- graphviz.spec 24 Feb 2006 07:14:16 -0000 1.25 +++ graphviz.spec 1 Mar 2006 08:30:07 -0000 1.26 @@ -45,7 +45,7 @@ Summary: Graph Visualization Tools Name: graphviz Version: 2.8 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ @@ -59,9 +59,10 @@ BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2 BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 swig BuildRequires: tcl-devel tk-devel -%{?fc5:BuildRequires: fontconfig-devel libtool-ltdl-devel} +BuildRequires: libtool-ltdl-devel libtool-ltdl +%{?fc5:BuildRequires: fontconfig-devel} %{?fc5:BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel} -%{?fc4:BuildRequires: fontconfig-devel xorg-x11-devel libtool-ltdl-devel} +%{?fc4:BuildRequires: fontconfig-devel xorg-x11-devel} %{?fc3:BuildRequires: fontconfig-devel xorg-x11-devel} %description @@ -307,7 +308,7 @@ %setup -q %build -%configure +%configure --disable-static --with-mylibgd %__make %{?_smp_mflags} %install @@ -318,15 +319,11 @@ pkgconfigdir=%{_libdir}/pkgconfig \ install find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' -find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';' +#find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';' chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/* cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/doc __doc rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc -# There files are crated on x86_64 for what reason? I don't know... -rm -f %{_includedir}/ltdl.h -rm -f %{_libdir}/libltdl* - %clean rm -rf $RPM_BUILD_ROOT @@ -339,6 +336,10 @@ if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi %changelog +* Wed Mar 01 2006 Oliver Falk - 2.8-3 +- Add libtool-ltdl, libtool-ltdl-devel +- Fix fixes + * Fri Feb 24 2006 Oliver Falk - 2.8-2 - Fix unpackaged files on x86_64 From fedora-extras-commits at redhat.com Wed Mar 1 08:31:34 2006 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Wed, 1 Mar 2006 03:31:34 -0500 Subject: rpms/Sprog/FC-4 Sprog.spec,1.3,1.4 Message-ID: <200603010832.k218W6ke002465@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/Sprog/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2448 Modified Files: Sprog.spec Log Message: Removed perl(Imager) Index: Sprog.spec =================================================================== RCS file: /cvs/extras/rpms/Sprog/FC-4/Sprog.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Sprog.spec 26 Feb 2006 23:14:58 -0000 1.3 +++ Sprog.spec 1 Mar 2006 08:31:34 -0000 1.4 @@ -1,6 +1,6 @@ Name: Sprog Version: 0.14 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A graphical tool to build programs by plugging parts together Group: Applications/System @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: perl(Glib), perl(Gtk2), perl(Gnome2::Canvas), perl(Gtk2::GladeXML), perl(YAML) -BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template), perl(Imager) +BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template) BuildRequires: perl(Apache::LogRegex), perl(XML::LibXML), perl(Time::HiRes) BuildRequires: desktop-file-utils Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -86,6 +86,9 @@ %{_datadir}/applications/fedora-Sprog.desktop %changelog +* Wed Mar 01 2006 Gavin Henry - 0.14-10 +- Removed perl(Imager). + * Sun Feb 26 2006 Gavin Henry - 0.14-9 - Changes BuildRequires to perl(Time::HiRes) and perl(Imager). Added perl(main) work around. See Bugzilla 183099 From fedora-extras-commits at redhat.com Wed Mar 1 10:05:08 2006 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 1 Mar 2006 05:05:08 -0500 Subject: rpms/fpc/devel fpc.spec,1.7,1.8 Message-ID: <200603011005.k21A5eZe006940@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6923/devel Modified Files: fpc.spec Log Message: Rebuild for Fedora Extras 5 Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fpc.spec 21 Dec 2005 14:41:57 -0000 1.7 +++ fpc.spec 1 Mar 2006 10:05:07 -0000 1.8 @@ -1,6 +1,6 @@ Name: fpc Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Free Pascal Compiler Group: Development/Languages @@ -159,6 +159,9 @@ %{_datadir}/fpcsrc %changelog +* Wed Mar 1 2005 Joost van der Sluis 2.0.2-4 +- Rebuild for Fedora Extras 5 + * Tue Dec 20 2005 Joost van der Sluis 2.0.2-3 - Disabled smart-linking for ppc From fedora-extras-commits at redhat.com Wed Mar 1 10:07:29 2006 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 1 Mar 2006 05:07:29 -0500 Subject: rpms/fpc/devel fpc.spec,1.8,1.9 Message-ID: <200603011008.k21A8165006993@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6966 Modified Files: fpc.spec Log Message: Corrected changelog for rebuild Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fpc.spec 1 Mar 2006 10:05:07 -0000 1.8 +++ fpc.spec 1 Mar 2006 10:07:28 -0000 1.9 @@ -159,7 +159,7 @@ %{_datadir}/fpcsrc %changelog -* Wed Mar 1 2005 Joost van der Sluis 2.0.2-4 +* Wed Mar 1 2006 Joost van der Sluis 2.0.2-4 - Rebuild for Fedora Extras 5 * Tue Dec 20 2005 Joost van der Sluis 2.0.2-3 From fedora-extras-commits at redhat.com Wed Mar 1 10:54:43 2006 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Wed, 1 Mar 2006 05:54:43 -0500 Subject: rpms/Sprog/FC-4 Sprog.spec,1.4,1.5 Message-ID: <200603011055.k21AtFsh007177@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/Sprog/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7160 Modified Files: Sprog.spec Log Message: Added perl(Imager) again. Index: Sprog.spec =================================================================== RCS file: /cvs/extras/rpms/Sprog/FC-4/Sprog.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Sprog.spec 1 Mar 2006 08:31:34 -0000 1.4 +++ Sprog.spec 1 Mar 2006 10:54:42 -0000 1.5 @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: perl(Glib), perl(Gtk2), perl(Gnome2::Canvas), perl(Gtk2::GladeXML), perl(YAML) -BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template) +BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template), perl(Imager) BuildRequires: perl(Apache::LogRegex), perl(XML::LibXML), perl(Time::HiRes) BuildRequires: desktop-file-utils Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) From fedora-extras-commits at redhat.com Wed Mar 1 10:55:29 2006 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Wed, 1 Mar 2006 05:55:29 -0500 Subject: rpms/Sprog/devel Sprog.spec,1.5,1.6 Message-ID: <200603011056.k21Au2dR007204@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/Sprog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7183 Modified Files: Sprog.spec Log Message: Added perl(Imager) Index: Sprog.spec =================================================================== RCS file: /cvs/extras/rpms/Sprog/devel/Sprog.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Sprog.spec 27 Feb 2006 10:30:23 -0000 1.5 +++ Sprog.spec 1 Mar 2006 10:55:29 -0000 1.6 @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: perl(Glib), perl(Gtk2), perl(Gnome2::Canvas), perl(Gtk2::GladeXML), perl(YAML) -BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template) +BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template), perl(Imager) BuildRequires: perl(Apache::LogRegex), perl(XML::LibXML), perl(Time::HiRes) BuildRequires: desktop-file-utils Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) From fedora-extras-commits at redhat.com Wed Mar 1 10:56:05 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 1 Mar 2006 05:56:05 -0500 Subject: rpms/xmms/devel xmms-1.2.10-extra_libs.patch, NONE, 1.1 xmms.spec, 1.16, 1.17 Message-ID: <200603011056.k21AubL3007256@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7203 Modified Files: xmms.spec Added Files: xmms-1.2.10-extra_libs.patch Log Message: Clean xmms-config output (#182267). xmms-1.2.10-extra_libs.patch: --- NEW FILE xmms-1.2.10-extra_libs.patch --- --- xmms-1.2.10/xmms-config.in.extra_libs 2001-04-05 19:35:49.000000000 -0500 +++ xmms-1.2.10/xmms-config.in 2005-12-13 07:20:44.000000000 -0600 @@ -23,10 +23,10 @@ lib_dir="@libdir@" if ( (gtk-config --version) > /dev/null 2>&1) then - gtk_libs=`gtk-config --libs` + #gtk_libs=`gtk-config --libs` gtk_cflags=`gtk-config --cflags` else - gtk_libs="@GTK_LIBS@" + #gtk_libs="@GTK_LIBS@" gtk_cflags="@GTK_CFLAGS@" fi Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xmms.spec 13 Feb 2006 13:45:25 -0000 1.16 +++ xmms.spec 1 Mar 2006 10:56:05 -0000 1.17 @@ -1,7 +1,7 @@ Summary: The X MultiMedia System, a media player Name: xmms Version: 1.2.10 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -21,6 +21,7 @@ Patch10: xmms-alsa-backport.patch Patch11: xmms-1.2.10-gcc4.patch Patch12: xmms-1.2.10-crossfade-0.3.9.patch +Patch13: xmms-1.2.10-extra_libs.patch Requires: unzip # the desktop file and redhat-menus are redundant requires really @@ -29,8 +30,13 @@ BuildRequires: gtk+-devel, esound-devel, arts-devel, alsa-lib-devel BuildRequires: libogg-devel, libvorbis-devel, mikmod-devel -BuildRequires: libXt-devel, libSM-devel, libXxf86vm-devel, mesa-libGL-devel -BuildRequires: gettext-devel, zlib-devel +BuildRequires: gettext-devel, zlib-devel, libGL-devel +# Use monolithic X up to FC4, and modular X for FC5+ +%if 0%{?fedora} < 5 +BuildRequires: xorg-x11-devel +%else +BuildRequires: libXt-devel, libSM-devel, libXxf86vm-devel +%endif Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -79,6 +85,8 @@ %patch11 -p1 -b .gcc4 # Fix for crossfade >= 0.3.9 to work properly %patch12 -p1 -b .crossfade +# Remove extra libs from xmms-config output (was only needed for static linking) +%patch13 -p1 -b .extra_libs %build @@ -87,7 +95,8 @@ --enable-kanji \ --enable-texthack \ --enable-ipv6 \ - --with-pic + --with-pic \ + --disable-static # Hack around old libtool and x86_64 issue for i in `find . -name Makefile`; do cat $i | sed s/-lpthread//g > $i.tmp @@ -160,13 +169,18 @@ %defattr(-,root,root,0755) %{_bindir}/xmms-config %{_includedir}/xmms/ -%exclude %{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so %{_datadir}/aclocal/xmms.m4 %changelog +* Mon Feb 13 2006 Matthias Saou 1:1.2.10-21 +- Remove gtk libs from xmms-config output, as they are only really needed for + static linking, which we no longer support (#182267). +- Disable static in %%configure instead of excluding the built file. +- Add conditional modular X build requirements. + * Mon Feb 13 2006 Matthias Saou 1:1.2.10-20 - Spec file cleanup. - Include crossfade 0.3.9 patch. From fedora-extras-commits at redhat.com Wed Mar 1 10:56:10 2006 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Wed, 1 Mar 2006 05:56:10 -0500 Subject: rpms/Sprog/FC-4 Sprog.spec,1.5,1.6 Message-ID: <200603011056.k21AugKv007289@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/Sprog/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7223 Modified Files: Sprog.spec Log Message: Added perl(Imager) again. Index: Sprog.spec =================================================================== RCS file: /cvs/extras/rpms/Sprog/FC-4/Sprog.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Sprog.spec 1 Mar 2006 10:54:42 -0000 1.5 +++ Sprog.spec 1 Mar 2006 10:56:10 -0000 1.6 @@ -1,6 +1,6 @@ Name: Sprog Version: 0.14 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A graphical tool to build programs by plugging parts together Group: Applications/System @@ -86,6 +86,9 @@ %{_datadir}/applications/fedora-Sprog.desktop %changelog +* Wed Mar 01 2006 Gavin Henry - 0.14-11 +- Added perl(Imager)!! + * Wed Mar 01 2006 Gavin Henry - 0.14-10 - Removed perl(Imager). From fedora-extras-commits at redhat.com Wed Mar 1 10:57:55 2006 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Wed, 1 Mar 2006 05:57:55 -0500 Subject: rpms/Sprog/devel Sprog.spec,1.6,1.7 Message-ID: <200603011058.k21AwSao007375@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/Sprog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7311 Modified Files: Sprog.spec Log Message: Added perl(Imager) Index: Sprog.spec =================================================================== RCS file: /cvs/extras/rpms/Sprog/devel/Sprog.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Sprog.spec 1 Mar 2006 10:55:29 -0000 1.6 +++ Sprog.spec 1 Mar 2006 10:57:55 -0000 1.7 @@ -1,6 +1,6 @@ Name: Sprog Version: 0.14 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A graphical tool to build programs by plugging parts together Group: Applications/System @@ -78,6 +78,9 @@ %{_datadir}/applications/fedora-Sprog.desktop %changelog +* Wed Mar 01 2006 Gavin Henry - 0.14-11 +- Added perl(Imager) + * Sun Feb 26 2006 Gavin Henry - 0.14-10 - Removed perl(Imager) From fedora-extras-commits at redhat.com Wed Mar 1 12:16:34 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 1 Mar 2006 07:16:34 -0500 Subject: rpms/xmms/FC-4 xmms-1.2.10-crossfade-0.3.9.patch, NONE, 1.1 xmms-1.2.10-extra_libs.patch, NONE, 1.1 xmms.spec, 1.12, 1.13 Message-ID: <200603011217.k21CHERS011371@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11347 Modified Files: xmms.spec Added Files: xmms-1.2.10-crossfade-0.3.9.patch xmms-1.2.10-extra_libs.patch Log Message: Clean xmms-config output (#182267). xmms-1.2.10-crossfade-0.3.9.patch: --- NEW FILE xmms-1.2.10-crossfade-0.3.9.patch --- diff -ur xmms-1.2.10/xmms/input.c xmms-1.2.10.patched/xmms/input.c --- xmms-1.2.10/xmms/input.c 2003-08-08 19:10:44.000000000 +0200 +++ xmms-1.2.10.patched/xmms/input.c 2005-11-25 00:12:36.000000000 +0100 @@ -285,6 +285,14 @@ } } +gboolean input_stopped_for_restart = FALSE; /* crossfade */ +void input_stop_for_restart() /* crossfade */ +{ + input_stopped_for_restart = TRUE; + input_stop(); + input_stopped_for_restart = FALSE; +} + void input_stop(void) { if (ip_data->playing && get_current_input_plugin()) diff -ur xmms-1.2.10/xmms/input.h xmms-1.2.10.patched/xmms/input.h --- xmms-1.2.10/xmms/input.h 2000-02-16 22:05:57.000000000 +0100 +++ xmms-1.2.10.patched/xmms/input.h 2005-11-25 00:12:36.000000000 +0100 @@ -34,6 +34,7 @@ gboolean input_check_file(gchar * filename); void input_play(char *filename); void input_stop(void); +void input_stop_for_restart(void); void input_pause(void); int input_get_time(void); void input_set_eq(int on, float preamp, float *bands); diff -ur xmms-1.2.10/xmms/main.c xmms-1.2.10.patched/xmms/main.c --- xmms-1.2.10/xmms/main.c 2004-02-23 21:31:43.000000000 +0100 +++ xmms-1.2.10.patched/xmms/main.c 2005-11-25 00:12:36.000000000 +0100 @@ -881,8 +881,10 @@ mainwin_set_shade(!cfg.player_shaded); } +gboolean is_quitting = FALSE; /* crossfade */ void mainwin_quit_cb(void) { + is_quitting = TRUE; /* crossfade */ input_stop(); gtk_widget_hide(equalizerwin); gtk_widget_hide(playlistwin); @@ -1523,7 +1525,8 @@ int *pos; if (get_input_playing()) - input_stop(); + input_stop_for_restart(); + pos = gtk_clist_get_row_data(clist, GPOINTER_TO_INT(clist->selection->data)); playlist_set_position(*pos); playlist_play(); diff -ur xmms-1.2.10/xmms/playlist.c xmms-1.2.10.patched/xmms/playlist.c --- xmms-1.2.10/xmms/playlist.c 2004-02-23 21:31:43.000000000 +0100 +++ xmms-1.2.10.patched/xmms/playlist.c 2005-11-25 00:12:36.000000000 +0100 @@ -124,7 +124,7 @@ if (get_input_playing()) { PL_UNLOCK(); - input_stop(); + input_stop_for_restart(); PL_LOCK(); *restart_playing = TRUE; } @@ -570,7 +570,7 @@ } if (get_input_playing()) - input_stop(); + input_stop_for_restart(); vis_clear_data(mainwin_vis); vis_clear_data(playlistwin_vis); @@ -668,7 +668,7 @@ { /* We need to stop before changing playlist_position */ PL_UNLOCK(); - input_stop(); + input_stop_for_restart(); PL_LOCK(); restart_playing = TRUE; } @@ -723,7 +723,7 @@ { /* We need to stop before changing playlist_position */ PL_UNLOCK(); - input_stop(); + input_stop_for_restart(); PL_LOCK(); restart_playing = TRUE; } @@ -852,7 +852,7 @@ { /* We need to stop before changing playlist_position */ PL_UNLOCK(); - input_stop(); + input_stop_for_restart(); PL_LOCK(); restart_playing = TRUE; } xmms-1.2.10-extra_libs.patch: --- NEW FILE xmms-1.2.10-extra_libs.patch --- --- xmms-1.2.10/xmms-config.in.extra_libs 2001-04-05 19:35:49.000000000 -0500 +++ xmms-1.2.10/xmms-config.in 2005-12-13 07:20:44.000000000 -0600 @@ -23,10 +23,10 @@ lib_dir="@libdir@" if ( (gtk-config --version) > /dev/null 2>&1) then - gtk_libs=`gtk-config --libs` + #gtk_libs=`gtk-config --libs` gtk_cflags=`gtk-config --cflags` else - gtk_libs="@GTK_LIBS@" + #gtk_libs="@GTK_LIBS@" gtk_cflags="@GTK_CFLAGS@" fi Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/FC-4/xmms.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xmms.spec 28 Dec 2005 14:27:52 -0000 1.12 +++ xmms.spec 1 Mar 2006 12:16:33 -0000 1.13 @@ -1,7 +1,7 @@ Summary: The X MultiMedia System, a media player Name: xmms Version: 1.2.10 -Release: 19%{?dist} +Release: 21%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -20,18 +20,29 @@ Patch9: xmms-underquoted.patch Patch10: xmms-alsa-backport.patch Patch11: xmms-1.2.10-gcc4.patch +Patch12: xmms-1.2.10-crossfade-0.3.9.patch +Patch13: xmms-1.2.10-extra_libs.patch Requires: unzip # the desktop file and redhat-menus are redundant requires really Requires: /usr/share/desktop-menu-patches/redhat-audio-player.desktop Requires: redhat-menus >= 0.11 -BuildRequires: gtk+-devel esound-devel arts-devel alsa-lib-devel -BuildRequires: libvorbis-devel mikmod-devel -Requires(pre): desktop-file-utils >= 0.9 +BuildRequires: gtk+-devel, esound-devel, arts-devel, alsa-lib-devel +BuildRequires: libogg-devel, libvorbis-devel, mikmod-devel +BuildRequires: gettext-devel, zlib-devel, libGL-devel +# Use monolithic X up to FC4, and modular X for FC5+ +%if 0%{?fedora} < 5 +BuildRequires: xorg-x11-devel +%else +BuildRequires: libXt-devel, libSM-devel, libXxf86vm-devel +%endif +Requires(post): desktop-file-utils >= 0.9 +Requires(postun): desktop-file-utils >= 0.9 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Obsoletes: x11amp0.7-1-1 x11amp xmms-esd xmms-gl xmms-mikmod xmms-gnome +Obsoletes: xmms-esd xmms-gl xmms-mikmod xmms-gnome +# This is to avoid requiring all of arts, esound, alsa... %define _use_internal_dependency_generator 0 %define __find_requires %{SOURCE2} @@ -40,15 +51,15 @@ an interface similar to Winamp's. Xmms supports playlists and streaming content and has a configurable interface. + %package devel -Summary: Static libraries and header files for Xmms plug-in development. +Summary: Files required for XMMS plug-in development Group: Development/Libraries -Obsoletes: x11amp-devel -Requires: %{name} = %{epoch}:%{version} gtk+-devel +Requires: %{name} = %{epoch}:%{version}, gtk+-devel %description devel -The static libraries and header files needed for building plug-ins for -the Xmms multimedia player. +Files needed for building plug-ins for the X MultiMedia System. + %prep %setup -q @@ -72,52 +83,55 @@ %patch10 -p0 -b .alsa-backport # Fix compilation with gcc4 %patch11 -p1 -b .gcc4 +# Fix for crossfade >= 0.3.9 to work properly +%patch12 -p1 -b .crossfade +# Remove extra libs from xmms-config output (was only needed for static linking) +%patch13 -p1 -b .extra_libs + %build %configure \ - --disable-dependency-tracking \ - --enable-kanji \ - --enable-texthack \ - --enable-ipv6 \ - --with-pic + --disable-dependency-tracking \ + --enable-kanji \ + --enable-texthack \ + --enable-ipv6 \ + --with-pic \ + --disable-static +# Hack around old libtool and x86_64 issue for i in `find . -name Makefile`; do - cat $i | sed s/-lpthread//g > $i.tmp - mv $i.tmp $i + cat $i | sed s/-lpthread//g > $i.tmp + mv $i.tmp $i done -make +%{__make} %{?_smp_mflags} -gcc -fPIC $RPM_OPT_FLAGS -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \ - %{SOURCE5} -I. `gtk-config --cflags gtk` +# Compile the default mp3 "warning dialog" plugin +%{__cc} %{optflags} -fPIC -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \ + -I. `gtk-config --cflags gtk` %{SOURCE5} -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%install +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} +%find_lang %{name} -install -m 755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input +# Install default mp3 "warning dialog" plugin +%{__install} -m 0755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input/ -mkdir -pv %{buildroot}%{_datadir}/applications -(cd $RPM_BUILD_ROOT%{_datadir}/applications && ln -sf \ - %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop) +# Link to the desktop menu entry included in redhat-menus +%{__mkdir_p} %{buildroot}%{_datadir}/applications +%{__ln_s} %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop \ + %{buildroot}%{_datadir}/applications/ -mkdir -p %{buildroot}%{_datadir}/pixmaps/mini -install -m 644 xmms/xmms_logo.xpm %{buildroot}%{_datadir}/pixmaps/ -install -m 644 xmms/xmms_mini.xpm %{buildroot}%{_datadir}/pixmaps/mini/ -install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/ +# Install xmms.xpm, the Icon= from the menu entry +%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/xmms.xpm -# create empty skins directory to be included -mkdir -p %{buildroot}%{_datadir}/xmms/Skins +# Create empty Skins directory to be included +%{__mkdir_p} %{buildroot}%{_datadir}/xmms/Skins/ -# unpackaged files -rm -f %{buildroot}/%{_datadir}/xmms/*/lib*.{a,la} \ - %{buildroot}/%{_libdir}/libxmms.la \ - %{buildroot}/%{_libdir}/xmms/*/*.la \ - %{buildroot}/%{_mandir}/man1/gnomexmms* - -%find_lang %{name} %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} + %post /sbin/ldconfig @@ -127,32 +141,66 @@ /sbin/ldconfig update-desktop-database -q || : + %files -f %{name}.lang %defattr(-,root,root,0755) -%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README +%doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README %{_bindir}/xmms %{_bindir}/wmxmms -%{_libdir}/libxmms.so.1* -%{_libdir}/xmms/ -%{_datadir}/applications/* +%{_libdir}/libxmms.so.* +%dir %{_libdir}/xmms/ +%dir %{_libdir}/xmms/Effect/ +%dir %{_libdir}/xmms/General/ +%dir %{_libdir}/xmms/Input/ +%dir %{_libdir}/xmms/Output/ +%dir %{_libdir}/xmms/Visualization/ +%{_libdir}/xmms/Effect/*.so +%{_libdir}/xmms/General/*.so +%{_libdir}/xmms/Input/*.so +%{_libdir}/xmms/Output/*.so +%{_libdir}/xmms/Visualization/*.so +%exclude %{_libdir}/xmms/*/*.la +%{_datadir}/applications/*.desktop %{_datadir}/pixmaps/xmms.xpm -%{_datadir}/pixmaps/xmms_logo.xpm -%{_datadir}/pixmaps/mini/xmms_mini.xpm %{_datadir}/xmms/ -%{_mandir}/man1/[wx]* +%{_mandir}/man1/* %files devel %defattr(-,root,root,0755) %{_bindir}/xmms-config %{_includedir}/xmms/ -%{_libdir}/lib*.a -%{_libdir}/lib*.so +%exclude %{_libdir}/*.la +%{_libdir}/*.so %{_datadir}/aclocal/xmms.m4 + %changelog +* Mon Feb 13 2006 Matthias Saou 1:1.2.10-21 +- Remove gtk libs from xmms-config output, as they are only really needed for + static linking, which we no longer support (#182267). +- Disable static in %%configure instead of excluding the built file. +- Add conditional modular X build requirements. + +* Mon Feb 13 2006 Matthias Saou 1:1.2.10-20 +- Spec file cleanup. +- Include crossfade 0.3.9 patch. +- Remove very old x11amp obsoletes. +- Exclude static libraries, update devel summary and description for it. +- List all plugins directories in order to be aware of breakage if the + libtool problem ever happens again. +- Fix post/postun scriplets. +- Remove xmms_logo.xpm and xmms_mini.xpm, they should be unused. +- Add libXt-devel to fullfill the "checking for X..." configure check. +- Add gettext-devel to make more configure checks happy. + * Wed Dec 28 2005 Hans de Goede 1:1.2.10-19 - Remove -lpthread from all LDFLAGS as this confuses the old libtool used by xmms on x86_64 (FE-bug #175493) +- Add missing modular Xorg BuildReqs, this (re)enables session managment + support and the openGL plugins. + +* Tue Dec 20 2005 Matthias Saou 1:1.2.10-18.1 +- Update gcc4 patch to include fix for xmms.org bug #1730, fixes FC5 build. * Sat May 28 2005 Matthias Saou 1:1.2.10-18 - Build with explicit --with-pic to fix compilation of flac plugin on From fedora-extras-commits at redhat.com Wed Mar 1 12:48:12 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 07:48:12 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.6,1.7 Message-ID: <200603011248.k21Cmiov011506@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-tomoe.spec 1 Mar 2006 07:35:16 -0000 1.6 +++ scim-tomoe.spec 1 Mar 2006 12:48:11 -0000 1.7 @@ -60,7 +60,6 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_libdir}/scim-1.0/*/Helper/tomoe.so -%{_libdir}/scim-1.0/*/SetupUI/tomoe-setup.so %{_datadir}/scim/icons/scim-tomoe.png From fedora-extras-commits at redhat.com Wed Mar 1 12:57:32 2006 From: fedora-extras-commits at redhat.com (Christian Nolte (noltec)) Date: Wed, 1 Mar 2006 07:57:32 -0500 Subject: rpms/kbibtex/devel kbibtex.spec,1.1,1.2 Message-ID: <200603011258.k21Cw4PG011625@cvs-int.fedora.redhat.com> Author: noltec Update of /cvs/extras/rpms/kbibtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11608 Modified Files: kbibtex.spec Log Message: Rebuild for Fedora Extras 5 Index: kbibtex.spec =================================================================== RCS file: /cvs/extras/rpms/kbibtex/devel/kbibtex.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kbibtex.spec 12 Jan 2006 08:03:21 -0000 1.1 +++ kbibtex.spec 1 Mar 2006 12:57:32 -0000 1.2 @@ -1,6 +1,6 @@ Name: kbibtex Version: 0.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A BibTeX editor for KDE Group: Applications/Editors @@ -116,6 +116,9 @@ %{_datadir}/applications/fedora-kbibtex_part.desktop %changelog +* Wed Mar 01 2005 Christian Nolte - 0.1.3-4 +- Rebuild for Fedora Extras 5 + * Fri Dec 23 2005 Christian Nolte - 0.1.3-3 - Patch to resolve an error when this package is compiled with gcc 4.1.0 From fedora-extras-commits at redhat.com Wed Mar 1 12:59:06 2006 From: fedora-extras-commits at redhat.com (Christian Nolte (noltec)) Date: Wed, 1 Mar 2006 07:59:06 -0500 Subject: rpms/kbibtex/devel kbibtex.spec,1.2,1.3 Message-ID: <200603011259.k21Cxd16011668@cvs-int.fedora.redhat.com> Author: noltec Update of /cvs/extras/rpms/kbibtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11651 Modified Files: kbibtex.spec Log Message: Corrected wrong year in Changelog Index: kbibtex.spec =================================================================== RCS file: /cvs/extras/rpms/kbibtex/devel/kbibtex.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kbibtex.spec 1 Mar 2006 12:57:32 -0000 1.2 +++ kbibtex.spec 1 Mar 2006 12:59:06 -0000 1.3 @@ -116,7 +116,7 @@ %{_datadir}/applications/fedora-kbibtex_part.desktop %changelog -* Wed Mar 01 2005 Christian Nolte - 0.1.3-4 +* Wed Mar 01 2006 Christian Nolte - 0.1.3-4 - Rebuild for Fedora Extras 5 * Fri Dec 23 2005 Christian Nolte - 0.1.3-3 From fedora-extras-commits at redhat.com Wed Mar 1 14:05:42 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 09:05:42 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.7,1.8 Message-ID: <200603011406.k21E6Igb015834@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15816 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim-tomoe.spec 1 Mar 2006 12:48:11 -0000 1.7 +++ scim-tomoe.spec 1 Mar 2006 14:05:41 -0000 1.8 @@ -8,7 +8,7 @@ Group: System Environment/Libraries License: GPL URL: http://scim-imengine.sourceforge.jp/ -Source0: %{name}-%{version}.tar.gz +Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk-devel From fedora-extras-commits at redhat.com Wed Mar 1 14:41:15 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 09:41:15 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.8,1.9 Message-ID: <200603011441.k21Efmd4016032@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16014 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-tomoe.spec 1 Mar 2006 14:05:41 -0000 1.8 +++ scim-tomoe.spec 1 Mar 2006 14:41:15 -0000 1.9 @@ -2,7 +2,7 @@ Name: scim-tomoe Version: 0.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -64,7 +64,7 @@ %changelog -* Wed Mar 1 2006 Ryo Dairiki - 0.2-2 +* Wed Mar 1 2006 Ryo Dairiki - 0.2-3 - update to 0.2 * Mon Feb 13 2006 Jens Petersen - 0.1.0-3 From fedora-extras-commits at redhat.com Wed Mar 1 15:48:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:48:21 -0500 Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.11,1.12 Message-ID: <200603011548.k21FmsiG018521@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kipi-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18486 Modified Files: kipi-plugins.spec Log Message: - fc5: workaround gphoto2 bug (#183367) Index: kipi-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/kipi-plugins/devel/kipi-plugins.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kipi-plugins.spec 10 Feb 2006 14:40:46 -0000 1.11 +++ kipi-plugins.spec 1 Mar 2006 15:48:21 -0000 1.12 @@ -4,7 +4,7 @@ Name: kipi-plugins Summary: Plugins to use with Kipi Version: 0.1.0 -Release: 0.6.%{beta}%{?dist} +Release: 0.6.%{beta}%{?dist}.1 License: LGPL Group: Applications/Multimedia @@ -15,10 +15,14 @@ BuildRequires: gettext BuildRequires: libkipi-devel >= 0.1.2 BuildRequires: libkexif-devel >= 0.2.1 -BuildRequires: gphoto2-devel >= 2.0.0 BuildRequires: imlib2-devel >= 1.1.0 BuildRequires: kdelibs-devel >= 6:3.4 BuildRequires: libGL-devel +BuildRequires: gphoto2-devel +# Workaround gphoto2 dep bug (#183367) +%if "%{?fedora}" > "4" +BuildRequires: libtool-ltdl-devel +%endif ## (mostly) Essential Requires: ImageMagick @@ -135,6 +139,7 @@ * Fri Feb 10 2006 Rex Dieter 0.1.1-0.6.rc1 - BR: libGL-devel - fc5: gcc/glibc respin +- fc5: workaround gphoto2 bug (#183367) * Thu Nov 10 2005 Rex Dieter 0.1.1-0.5.rc1 - fix symlinks From fedora-extras-commits at redhat.com Wed Mar 1 15:52:51 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:52:51 -0500 Subject: rpms/uw-imap/devel uw-imap.spec,1.7,1.8 Message-ID: <200603011553.k21FrN68018591@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18574 Modified Files: uw-imap.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: uw-imap.spec =================================================================== RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- uw-imap.spec 10 Feb 2006 13:05:16 -0000 1.7 +++ uw-imap.spec 1 Mar 2006 15:52:51 -0000 1.8 @@ -6,7 +6,7 @@ Summary: UW Server daemons for IMAP and POP network mail protocols Name: uw-imap Version: 2004g -Release: 4%{?dist}.1 +Release: 4%{?dist}.2 License: University of Washington Free-Fork License Group: System Environment/Daemons @@ -271,7 +271,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 17 2005 Rex Dieter 2004g-4 From fedora-extras-commits at redhat.com Wed Mar 1 15:54:10 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:54:10 -0500 Subject: rpms/gc/devel gc.spec,1.16,1.17 Message-ID: <200603011554.k21Fsgec018652@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18635 Modified Files: gc.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gc.spec 10 Feb 2006 13:15:41 -0000 1.16 +++ gc.spec 1 Mar 2006 15:54:09 -0000 1.17 @@ -3,7 +3,7 @@ Name: gc Version: 6.6 -Release: 5%{?dist} +Release: 5%{?dist}.1 Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ @@ -101,6 +101,9 @@ %changelog +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + * Fri Feb 10 2006 Rex Dieter 6.6-5 - gcc(4.1) patch From fedora-extras-commits at redhat.com Wed Mar 1 15:55:08 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:55:08 -0500 Subject: rpms/xforms/devel xforms.spec,1.16,1.17 Message-ID: <200603011555.k21FtfKU018713@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/xforms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18696 Modified Files: xforms.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: xforms.spec =================================================================== RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xforms.spec 10 Feb 2006 13:07:28 -0000 1.16 +++ xforms.spec 1 Mar 2006 15:55:08 -0000 1.17 @@ -2,7 +2,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.0.90 -Release: 6%{?dist}.1 +Release: 6%{?dist}.2 License: LGPL Group: System Environment/Libraries @@ -95,7 +95,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Fri Jan 20 2006 Rex Dieter 1.0.90-6 From fedora-extras-commits at redhat.com Wed Mar 1 15:56:04 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:56:04 -0500 Subject: rpms/pinentry/devel pinentry.spec,1.9,1.10 Message-ID: <200603011556.k21FuapN018774@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/pinentry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18757 Modified Files: pinentry.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: pinentry.spec =================================================================== RCS file: /cvs/extras/rpms/pinentry/devel/pinentry.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pinentry.spec 10 Feb 2006 13:24:58 -0000 1.9 +++ pinentry.spec 1 Mar 2006 15:56:04 -0000 1.10 @@ -1,7 +1,7 @@ Name: pinentry Version: 0.7.2 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 Summary: Collection of simple PIN or passphrase entry dialogs Group: Applications/System @@ -149,7 +149,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Tue Oct 18 2005 Ville Skytt?? - 0.7.2-1 From fedora-extras-commits at redhat.com Wed Mar 1 15:57:05 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:57:05 -0500 Subject: rpms/openslp/devel openslp.spec,1.12,1.13 Message-ID: <200603011557.k21FvbYo018835@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/openslp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818 Modified Files: openslp.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: openslp.spec =================================================================== RCS file: /cvs/extras/rpms/openslp/devel/openslp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- openslp.spec 10 Feb 2006 13:30:19 -0000 1.12 +++ openslp.spec 1 Mar 2006 15:57:04 -0000 1.13 @@ -2,7 +2,7 @@ Summary: Open implementation of Service Location Protocol V2 Name: openslp Version: 1.2.1 -Release: 4%{?dist}.1 +Release: 4%{?dist}.2 Group: System Environment/Libraries License: BSD @@ -140,7 +140,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Dec 19 2005 Rex Dieter 1.2.1-4 From fedora-extras-commits at redhat.com Wed Mar 1 15:59:01 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:59:01 -0500 Subject: rpms/tidy/devel tidy.spec,1.16,1.17 Message-ID: <200603011559.k21FxXat018898@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/tidy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18879 Modified Files: tidy.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: tidy.spec =================================================================== RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tidy.spec 15 Feb 2006 15:26:54 -0000 1.16 +++ tidy.spec 1 Mar 2006 15:59:01 -0000 1.17 @@ -4,7 +4,7 @@ Name: tidy Summary: Utility to clean up and pretty print HTML/XHTML/XML Version: 0.99.0 -Release: 9.20051025%{?dist}.2 +Release: 9.20051025%{?dist}.3 Group: Applications/Text License: W3C Software License @@ -112,7 +112,7 @@ %changelog -* Wed Feb 15 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Fri Jan 20 2006 Rex Dieter 0.99.0-9.20051025 From fedora-extras-commits at redhat.com Wed Mar 1 16:00:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:00:06 -0500 Subject: rpms/libsigsegv/devel libsigsegv.spec,1.8,1.9 Message-ID: <200603011600.k21G0cO5018980@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libsigsegv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18963 Modified Files: libsigsegv.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: libsigsegv.spec =================================================================== RCS file: /cvs/extras/rpms/libsigsegv/devel/libsigsegv.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libsigsegv.spec 10 Feb 2006 13:33:04 -0000 1.8 +++ libsigsegv.spec 1 Mar 2006 16:00:06 -0000 1.9 @@ -2,7 +2,7 @@ Summary: Library for handling page faults in user mode Name: libsigsegv Version: 2.2 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 License: GPL URL: http://libsigsegv.sourceforge.net/ @@ -76,7 +76,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Oct 06 2005 Rex Dieter - 2.2-1 From fedora-extras-commits at redhat.com Wed Mar 1 16:01:04 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:01:04 -0500 Subject: rpms/libksba/devel libksba.spec,1.17,1.18 Message-ID: <200603011601.k21G1bZm020849@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20539 Modified Files: libksba.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: libksba.spec =================================================================== RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libksba.spec 10 Feb 2006 13:34:15 -0000 1.17 +++ libksba.spec 1 Mar 2006 16:01:04 -0000 1.18 @@ -1,7 +1,7 @@ Summary: X.509 library Name: libksba Version: 0.9.13 -Release: 2%{?dist}.1 +Release: 2%{?dist}.2 License: GPL Group: System Environment/Libraries URL: http://www.gnupg.org/ @@ -83,7 +83,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Wed Nov 30 2005 Rex Dieter 0.9.13-2 From fedora-extras-commits at redhat.com Wed Mar 1 16:02:10 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:02:10 -0500 Subject: rpms/kdocker/devel kdocker.spec,1.5,1.6 Message-ID: <200603011602.k21G2hMb020922@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdocker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20905 Modified Files: kdocker.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kdocker.spec =================================================================== RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kdocker.spec 10 Feb 2006 13:52:30 -0000 1.5 +++ kdocker.spec 1 Mar 2006 16:02:10 -0000 1.6 @@ -2,7 +2,7 @@ Name: kdocker Summary: Dock any application in the system tray Version: 1.3 -Release: 4%{?dist}.3 +Release: 4%{?dist}.4 Group: User Interface/Desktops License: GPL @@ -104,7 +104,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Sat Jan 21 2006 Rex Dieter 1.3-4 From fedora-extras-commits at redhat.com Wed Mar 1 16:18:05 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:18:05 -0500 Subject: rpms/libtunepimp/devel libtunepimp.spec,1.5,1.6 Message-ID: <200603011618.k21GIbpK021066@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libtunepimp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21049 Modified Files: libtunepimp.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: libtunepimp.spec =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libtunepimp.spec 10 Feb 2006 13:31:36 -0000 1.5 +++ libtunepimp.spec 1 Mar 2006 16:18:04 -0000 1.6 @@ -2,7 +2,7 @@ Summary: A library for creating MusicBrainz enabled tagging applications Name: libtunepimp Version: 0.4.0 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 # README.LGPL implies that it's not completely lgpl, yet. License: GPL Group: System Environment/Libraries @@ -95,7 +95,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Dec 19 2005 Rex Dieter 0.4.0-5 From fedora-extras-commits at redhat.com Wed Mar 1 16:20:55 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:20:55 -0500 Subject: rpms/kxdocker/devel kxdocker.spec,1.4,1.5 Message-ID: <200603011621.k21GLSqt021127@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kxdocker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21110 Modified Files: kxdocker.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kxdocker.spec =================================================================== RCS file: /cvs/extras/rpms/kxdocker/devel/kxdocker.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kxdocker.spec 10 Feb 2006 13:37:58 -0000 1.4 +++ kxdocker.spec 1 Mar 2006 16:20:55 -0000 1.5 @@ -2,7 +2,7 @@ Name: kxdocker Summary: A Mac OSX style docker Version: 0.39 -Release: 3%{?dist}.1 +Release: 3%{?dist}.2 License: GPL Group: User Interface/Desktops @@ -48,8 +48,9 @@ make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --vendor fedora \ --add-category X-Fedora \ --add-category Utility \ --add-category KDE \ @@ -97,13 +98,13 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{_bindir}/* +%{_datadir}/apps/kxdocker/ %{_datadir}/applications/*.desktop -%{_datadir}/apps/kxdocker -%{_datadir}/icons/hicolor/*/*/ +%{_datadir}/icons/hicolor/*/*/* %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 10 2005 Rex Dieter 0.39-3 From fedora-extras-commits at redhat.com Wed Mar 1 16:22:27 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:22:27 -0500 Subject: rpms/kiosktool/devel kiosktool.spec,1.5,1.6 Message-ID: <200603011622.k21GMxsZ021188@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kiosktool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21171 Modified Files: kiosktool.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kiosktool.spec =================================================================== RCS file: /cvs/extras/rpms/kiosktool/devel/kiosktool.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kiosktool.spec 10 Feb 2006 13:43:08 -0000 1.5 +++ kiosktool.spec 1 Mar 2006 16:22:27 -0000 1.6 @@ -2,7 +2,7 @@ Summary: KIOSK administration tool for KDE Name: kiosktool Version: 1.0 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 License: GPL Group: System Environment/Base @@ -45,8 +45,9 @@ make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ + --vendor fedora \ --add-category X-Fedora \ --add-category Application \ --delete-original \ @@ -84,16 +85,16 @@ %post -touch --no-create %{_datadir}/icons/crystalsvg ||: +touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||: %postun -touch --no-create %{_datadir}/icons/crystalsvg ||: +touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||: %files -f %{name}.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %doc ChangeLog COPYING README #attr(0511,root,root) %{_bindir}/kiosktool* %{_bindir}/kiosktool* @@ -105,7 +106,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 10 2005 Rex Dieter 1.0-5 From fedora-extras-commits at redhat.com Wed Mar 1 16:24:17 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:24:17 -0500 Subject: rpms/libassuan/devel libassuan.spec,1.12,1.13 Message-ID: <200603011624.k21GOn9e021256@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libassuan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21239 Modified Files: libassuan.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libassuan.spec 10 Feb 2006 13:35:50 -0000 1.12 +++ libassuan.spec 1 Mar 2006 16:24:17 -0000 1.13 @@ -2,7 +2,7 @@ Name: libassuan Summary: GnuPG IPC library Version: 0.6.10 -Release: 2%{?dist}.1 +Release: 2%{?dist}.2 License: LGPL Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz @@ -76,7 +76,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Jul 4 2005 Michael Schwendt - 0.6.10-2 From fedora-extras-commits at redhat.com Wed Mar 1 16:26:07 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:26:07 -0500 Subject: rpms/kasablanca/devel kasablanca.spec,1.13,1.14 Message-ID: <200603011626.k21GQevO021317@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kasablanca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21300 Modified Files: kasablanca.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kasablanca.spec =================================================================== RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kasablanca.spec 10 Feb 2006 13:54:44 -0000 1.13 +++ kasablanca.spec 1 Mar 2006 16:26:07 -0000 1.14 @@ -56,13 +56,14 @@ make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --delete-original --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --vendor fedora \ --add-category "X-Fedora" \ --add-category "Network" \ --add-category "Application" \ --add-category "KDE" \ + --delete-original \ $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop ## File lists @@ -115,7 +116,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Jan 19 2006 Rex Dieter 0.4.0.2-7 From fedora-extras-commits at redhat.com Wed Mar 1 16:27:16 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:27:16 -0500 Subject: rpms/kasablanca/devel kasablanca.spec,1.14,1.15 Message-ID: <200603011627.k21GRmML021380@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kasablanca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21358 Modified Files: kasablanca.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kasablanca.spec =================================================================== RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kasablanca.spec 1 Mar 2006 16:26:07 -0000 1.14 +++ kasablanca.spec 1 Mar 2006 16:27:16 -0000 1.15 @@ -2,7 +2,7 @@ Name: kasablanca Summary: Graphical FTP client Version: 0.4.0.2 -Release: 7%{?dist}.2 +Release: 7%{?dist}.3 License: GPL Url: http://kasablanca.berlios.de/ From fedora-extras-commits at redhat.com Wed Mar 1 16:30:23 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:30:23 -0500 Subject: rpms/jasper/devel jasper-1.701.0-GL.patch, 1.2, 1.3 jasper.spec, 1.10, 1.11 Message-ID: <200603011630.k21GUtVv021462@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/jasper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21436 Modified Files: jasper-1.701.0-GL.patch jasper.spec Log Message: * Wed Mar 1 2006 Rex Dieter 1.701.0-10 - support/use geojasper (optional, default no) - fc5: gcc/glibc respin jasper-1.701.0-GL.patch: Index: jasper-1.701.0-GL.patch =================================================================== RCS file: /cvs/extras/rpms/jasper/devel/jasper-1.701.0-GL.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jasper-1.701.0-GL.patch 31 Jan 2006 16:11:35 -0000 1.2 +++ jasper-1.701.0-GL.patch 1 Mar 2006 16:30:23 -0000 1.3 @@ -1,6 +1,6 @@ ---- jasper-1.701.0/configure.GL 2004-02-08 19:44:12.000000000 -0600 -+++ jasper-1.701.0/configure 2005-10-18 08:09:38.000000000 -0500 -@@ -9465,7 +9465,7 @@ +--- jasper-1.701.0.GEO/configure.GL 2006-02-20 20:01:30.000000000 -0600 ++++ jasper-1.701.0.GEO/configure 2006-02-24 07:40:46.000000000 -0600 +@@ -9464,7 +9464,7 @@ OPENGL_LIBS="" if test $ENABLE_OPENGL = yes; then if test $HAVE_OPENGL = no; then @@ -9,3 +9,14 @@ echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 if test "${ac_cv_lib_glut_glutInit+set}" = set; then +--- jasper-1.701.0.GEO/configure.ac.GL 2006-02-20 19:58:02.000000000 -0600 ++++ jasper-1.701.0.GEO/configure.ac 2006-02-24 07:40:38.000000000 -0600 +@@ -242,7 +242,7 @@ + OPENGL_LIBS="" + if test $ENABLE_OPENGL = yes; then + if test $HAVE_OPENGL = no; then +- TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS" ++ TMPLIBS="-lglut" + AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes; + OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS) + fi Index: jasper.spec =================================================================== RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jasper.spec 10 Feb 2006 13:56:56 -0000 1.10 +++ jasper.spec 1 Mar 2006 16:30:23 -0000 1.11 @@ -5,19 +5,30 @@ # koffice # netpbm +# define to use GeoJasper +#define geo 1 + Summary: Implementation of the JPEG-2000 standard, Part 1 Name: jasper Group: System Environment/Libraries Version: 1.701.0 -Release: 9%{?dist}.1 +Release: 10%{?dist} License: JasPer License Version 2.0 +%if "%{?geo:1}" == "1" +%define geojasper_ver 1.2.9 +URL: http://www.dimin.net/software/utils.html +Source: http://dimin.m6.net/software/utils/geojasper_src.zip +Provides: geojasper = %{geojasper_ver} +%else URL: http://www.ece.uvic.ca/~mdadams/jasper/ Source: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: jasper-1.701.0-GL.patch +BuildRequires: automake BuildRequires: libjpeg-devel BuildRequires: freeglut-devel # workaround: @@ -40,12 +51,22 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}%{?geo:.GEO} %patch1 -p1 -b .GL +%if "%{?geo:1}" == "1" +chmod +x configure configure.ac +libtoolize --force +aclocal +autoconf +autoheader +automake -a +%endif + %build + %configure \ --enable-shared \ --disable-static @@ -67,10 +88,6 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/%{_target_platform}* rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -# avoid conflict(s) with tomcat -# not needed anymore, see bz #176773 -# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool - %files %defattr(-,root,root) @@ -78,13 +95,13 @@ %{_bindir}/imgcmp %{_bindir}/jiv %{_bindir}/imginfo -%{_bindir}/jasper* +%{_bindir}/*jasper* %{_libdir}/lib*.so.* %files devel %defattr(-,root,root) %doc doc/* -%{_includedir}/* +%{_includedir}/jasper/ %{_libdir}/lib*.so @@ -98,6 +115,10 @@ %changelog +* Wed Mar 1 2006 Rex Dieter 1.701.0-10 +- support/use geojasper (optional, default no) +- fc5: gcc/glibc respin + * Fri Feb 10 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Wed Mar 1 16:35:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:35:06 -0500 Subject: rpms/kickpim/devel kickpim.spec,1.14,1.15 Message-ID: <200603011635.k21GZdpS021595@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kickpim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21577 Modified Files: kickpim.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kickpim.spec =================================================================== RCS file: /cvs/extras/rpms/kickpim/devel/kickpim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kickpim.spec 10 Feb 2006 13:50:59 -0000 1.14 +++ kickpim.spec 1 Mar 2006 16:35:06 -0000 1.15 @@ -2,7 +2,7 @@ Name: kickpim Summary: KDE kicker applet to access addressbook Version: 0.5.3 -Release: 9%{?dist}.2 +Release: 9%{?dist}.3 License: GPL Group: Applications/Productivity @@ -90,7 +90,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Fri Nov 04 2005 Rex Dieter 0.5.3-9 From fedora-extras-commits at redhat.com Wed Mar 1 16:36:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:36:24 -0500 Subject: rpms/gift-openft/devel gift-openft.spec,1.2,1.3 Message-ID: <200603011636.k21Gau7s021658@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gift-openft/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640 Modified Files: gift-openft.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: gift-openft.spec =================================================================== RCS file: /cvs/extras/rpms/gift-openft/devel/gift-openft.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gift-openft.spec 10 Feb 2006 14:04:16 -0000 1.2 +++ gift-openft.spec 1 Mar 2006 16:36:23 -0000 1.3 @@ -2,7 +2,7 @@ Summary: Openft plugin for giFT Name: gift-openft Version: 0.2.1.6 -Release: 2%{?dist}.1 +Release: 2%{?dist}.2 License: GPL Group: System Environment/Libraries @@ -50,7 +50,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Dec 19 2005 Rex Dieter Author: rdieter Update of /cvs/extras/rpms/kile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21705 Modified Files: kile.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- kile.spec 10 Feb 2006 13:46:21 -0000 1.23 +++ kile.spec 1 Mar 2006 16:37:43 -0000 1.24 @@ -2,7 +2,7 @@ Name: kile Summary: (La)TeX source editor and TeX shell Version: 1.8.1 -Release: 7%{?dist}.1 +Release: 7%{?dist}.2 License: GPL Group: Applications/Publishing @@ -125,7 +125,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 10 2005 Rex Dieter 1.8.3-7 From fedora-extras-commits at redhat.com Wed Mar 1 16:39:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:39:03 -0500 Subject: rpms/dxpc/devel dxpc.spec,1.9,1.10 Message-ID: <200603011639.k21GdZU6021795@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dxpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21777 Modified Files: dxpc.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: dxpc.spec =================================================================== RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dxpc.spec 10 Feb 2006 14:14:03 -0000 1.9 +++ dxpc.spec 1 Mar 2006 16:39:03 -0000 1.10 @@ -2,7 +2,7 @@ Summary: Differential X Protocol Compressor Name: dxpc Version: 3.8.2 -Release: 3%{?dist}.1 +Release: 3%{?dist}.2 License: BSD Group: User Interface/X @@ -54,7 +54,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Jan 30 2006 Rex Dieter 3.8.2-3 From fedora-extras-commits at redhat.com Wed Mar 1 16:40:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:40:36 -0500 Subject: rpms/gift/devel gift.spec,1.3,1.4 Message-ID: <200603011641.k21Gf8Nm021858@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gift/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21841 Modified Files: gift.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: gift.spec =================================================================== RCS file: /cvs/extras/rpms/gift/devel/gift.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gift.spec 10 Feb 2006 14:02:30 -0000 1.3 +++ gift.spec 1 Mar 2006 16:40:36 -0000 1.4 @@ -10,7 +10,7 @@ Name: gift Summary: Daemon for communicating with filesharing protocols Version: 0.11.8.1 -Release: 4%{?dist}.1 +Release: 4%{?dist}.2 License: GPL Group: System Environment/Daemons @@ -24,7 +24,7 @@ Source1: giftd.sh BuildRequires: libtool -%if "%{?fedora}" >= "4" +%if "%{?fedora}" > "3" BuildRequires: libtool-ltdl-devel %endif BuildRequires: libvorbis-devel @@ -101,7 +101,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Fri Jan 06 2006 Rex Dieter 0.11.8.1-4 From fedora-extras-commits at redhat.com Wed Mar 1 16:42:07 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:42:07 -0500 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.18,1.19 Message-ID: <200603011642.k21Ggegn021931@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21909 Modified Files: gtk-qt-engine.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gtk-qt-engine.spec 10 Feb 2006 13:58:16 -0000 1.18 +++ gtk-qt-engine.spec 1 Mar 2006 16:42:07 -0000 1.19 @@ -6,7 +6,7 @@ Name: gtk-qt-engine Group: User Interface/Desktops Version: 0.60 -Release: 7%{?dist}.1 +Release: 7%{?dist}.2 License: GPL URL: http://www.freedesktop.org/Software/gtk-qt @@ -109,7 +109,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Jan 23 2006 Rex Dieter 0.60-7 From fedora-extras-commits at redhat.com Wed Mar 1 16:43:57 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:43:57 -0500 Subject: rpms/apollon/devel apollon.spec,1.3,1.4 Message-ID: <200603011644.k21GiTtd022007@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/apollon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21989 Modified Files: apollon.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: apollon.spec =================================================================== RCS file: /cvs/extras/rpms/apollon/devel/apollon.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- apollon.spec 10 Feb 2006 14:24:02 -0000 1.3 +++ apollon.spec 1 Mar 2006 16:43:57 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Filesharing client Name: apollon Version: 1.0.1 -Release: 4%{?dist}.1 +Release: 4%{?dist}.2 License: GPL Group: Applications/Internet @@ -110,7 +110,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Jan 26 2006 Rex Dieter 1.0.1-4 From fedora-extras-commits at redhat.com Wed Mar 1 16:45:29 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:45:29 -0500 Subject: rpms/geomview/devel geomview.spec,1.7,1.8 Message-ID: <200603011646.k21Gk1RE022076@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/geomview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22059 Modified Files: geomview.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: geomview.spec =================================================================== RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- geomview.spec 10 Feb 2006 14:06:29 -0000 1.7 +++ geomview.spec 1 Mar 2006 16:45:28 -0000 1.8 @@ -9,7 +9,7 @@ Name: geomview Summary: Interactive 3D viewing program Version: 1.8.2 -Release: 0.2.cvs%{cvs}%{?dist}.2 +Release: 0.2.cvs%{cvs}%{?dist}.3 License: LGPL Url: http://www.geomview.org/ @@ -249,7 +249,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Tue Jan 03 2006 Rex Dieter 1.8.2-0.2.cvs20040221 From fedora-extras-commits at redhat.com Wed Mar 1 16:46:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:46:28 -0500 Subject: rpms/gpgme/devel gpgme.spec,1.13,1.14 Message-ID: <200603011647.k21Gl0Qe022137@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22120 Modified Files: gpgme.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gpgme.spec 10 Feb 2006 14:25:12 -0000 1.13 +++ gpgme.spec 1 Mar 2006 16:46:28 -0000 1.14 @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.0 -Release: 3%{?dist}.1 +Release: 3%{?dist}.2 License: LGPL Group: Applications/System @@ -99,7 +99,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Wed Nov 30 2005 Rex Dieter - 1.1.0-3 From fedora-extras-commits at redhat.com Wed Mar 1 16:49:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:49:03 -0500 Subject: rpms/kimdaba/devel kimdaba.spec,1.5,1.6 Message-ID: <200603011649.k21GnZaP022206@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kimdaba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183 Modified Files: kimdaba.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kimdaba.spec =================================================================== RCS file: /cvs/extras/rpms/kimdaba/devel/kimdaba.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kimdaba.spec 10 Feb 2006 13:45:23 -0000 1.5 +++ kimdaba.spec 1 Mar 2006 16:49:02 -0000 1.6 @@ -2,7 +2,7 @@ Summary: KDE Image Database Name: kimdaba Version: 2.1 -Release: 6%{?dist}.1 +Release: 6%{?dist}.2 License: GPL Group: Applications/Multimedia @@ -101,14 +101,14 @@ %defattr(-,root,root) %doc ChangeLog COPYING README TODO %{_bindir}/* +%{_datadir}/apps/kimdaba/ %{_datadir}/applications/*.desktop -%{_datadir}/apps/%{name} %{_datadir}/icons/hicolor/*/*/* %{_datadir}/mimelnk/*/*.desktop %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 10 2005 Rex Dieter 2.1-6 From fedora-extras-commits at redhat.com Wed Mar 1 17:04:56 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Wed, 1 Mar 2006 12:04:56 -0500 Subject: owners owners.list,1.689,1.690 Message-ID: <200603011705.k21H5SZ1024252@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24230 Modified Files: owners.list Log Message: ownership of xmms-cdread to fedora_AT_soeterbroek.com Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.689 retrieving revision 1.690 diff -u -r1.689 -r1.690 --- owners.list 1 Mar 2006 07:36:52 -0000 1.689 +++ owners.list 1 Mar 2006 17:04:55 -0000 1.690 @@ -1470,7 +1470,7 @@ 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-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|extras-orphan at fedoraproject.org|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-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 Wed Mar 1 17:07:38 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Wed, 1 Mar 2006 12:07:38 -0500 Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.7,1.8 Message-ID: <200603011708.k21H8BK5024328@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24297 Modified Files: xmms-cdread.spec Log Message: Rebuild for Fedora Extras 5 Index: xmms-cdread.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xmms-cdread.spec 22 May 2005 23:53:12 -0000 1.7 +++ xmms-cdread.spec 1 Mar 2006 17:07:38 -0000 1.8 @@ -4,7 +4,7 @@ Summary: Digital audio CD input plugin for XMMS Name: xmms-cdread Version: 0.14 -Release: 6.a +Release: 7 License: GPL Group: Applications/Multimedia @@ -54,6 +54,9 @@ %changelog +* Wed Mar 1 2006 Joost Soeterbroek - 0.14-7 +- Rebuild for Fedora Extras 5 + * Sun May 22 2005 Jeremy Katz - 0.14-6.a - rebuild on all arches From fedora-extras-commits at redhat.com Wed Mar 1 17:23:33 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Wed, 1 Mar 2006 12:23:33 -0500 Subject: rpms/tktable/devel tktable.spec,1.16,1.17 Message-ID: <200603011724.k21HO50T024597@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/tktable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24575 Modified Files: tktable.spec Log Message: fixed problem in configuration stage Index: tktable.spec =================================================================== RCS file: /cvs/extras/rpms/tktable/devel/tktable.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tktable.spec 28 Feb 2006 21:03:38 -0000 1.16 +++ tktable.spec 1 Mar 2006 17:23:33 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Table/matrix widget extension to Tcl/Tk Name: tktable Version: 2.9 -Release: 8%{?dist} +Release: 9%{?dist} License: BSD-like Group: Development/Libraries Source: http://download.sourceforge.net/tktable/Tktable2.9.tar.gz @@ -22,6 +22,10 @@ %setup -q -n Tktable%version %build +# fix problem with the tcl.m4 file that came with earlier versions +# of Tcl (quoting bug in the file that was not exposed until bash +# 3.1 was packaged with FC5) +sed -i -e "s,relid',relid," configure %configure --with-tcl=%_libdir --with-tk=%_libdir --x-libraries=%_libdir --x-includes=%_includedir/X11 make %{?_smp_mflags} @@ -45,6 +49,9 @@ %changelog +* Tue Mar 1 2006 Jean-Luc Fontaine 2.9-9 +- fixed problem in configuration stage + * Tue Feb 28 2006 Jean-Luc Fontaine 2.9-8 - specified X11 includes path in configuration From fedora-extras-commits at redhat.com Wed Mar 1 18:12:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 13:12:28 -0500 Subject: rpms/jasper/devel jasper-1.701.0-GL.patch, 1.3, 1.4 jasper.spec, 1.11, 1.12 Message-ID: <200603011813.k21IDQae026952@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/jasper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26928 Modified Files: jasper-1.701.0-GL.patch jasper.spec Log Message: * Wed Mar 1 2006 Rex Dieter 1.701.0-11 - fixup build issues introduced by geojasper integration jasper-1.701.0-GL.patch: Index: jasper-1.701.0-GL.patch =================================================================== RCS file: /cvs/extras/rpms/jasper/devel/jasper-1.701.0-GL.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jasper-1.701.0-GL.patch 1 Mar 2006 16:30:23 -0000 1.3 +++ jasper-1.701.0-GL.patch 1 Mar 2006 18:12:26 -0000 1.4 @@ -9,14 +9,3 @@ echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 if test "${ac_cv_lib_glut_glutInit+set}" = set; then ---- jasper-1.701.0.GEO/configure.ac.GL 2006-02-20 19:58:02.000000000 -0600 -+++ jasper-1.701.0.GEO/configure.ac 2006-02-24 07:40:38.000000000 -0600 -@@ -242,7 +242,7 @@ - OPENGL_LIBS="" - if test $ENABLE_OPENGL = yes; then - if test $HAVE_OPENGL = no; then -- TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS" -+ TMPLIBS="-lglut" - AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes; - OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS) - fi Index: jasper.spec =================================================================== RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jasper.spec 1 Mar 2006 16:30:23 -0000 1.11 +++ jasper.spec 1 Mar 2006 18:12:26 -0000 1.12 @@ -12,7 +12,7 @@ Name: jasper Group: System Environment/Libraries Version: 1.701.0 -Release: 10%{?dist} +Release: 11%{?dist} License: JasPer License Version 2.0 %if "%{?geo:1}" == "1" @@ -27,6 +27,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: jasper-1.701.0-GL.patch +# autoconf/automake bits of patch1 +Patch2: jasper-1.701.0-GL-ac.patch BuildRequires: automake BuildRequires: libjpeg-devel @@ -57,6 +59,7 @@ %if "%{?geo:1}" == "1" chmod +x configure configure.ac +%patch2 -p1 -b .GL-ac libtoolize --force aclocal autoconf @@ -115,6 +118,9 @@ %changelog +* Wed Mar 1 2006 Rex Dieter 1.701.0-11 +- fixup build issues introduced by geojasper integration + * Wed Mar 1 2006 Rex Dieter 1.701.0-10 - support/use geojasper (optional, default no) - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Wed Mar 1 18:16:10 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 13:16:10 -0500 Subject: rpms/jasper/devel jasper-1.701.0-GL-ac.patch, NONE, 1.1 jasper.spec, 1.12, 1.13 Message-ID: <200603011816.k21IGhR1027032@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/jasper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27007 Modified Files: jasper.spec Added Files: jasper-1.701.0-GL-ac.patch Log Message: add missing patch, Release++ jasper-1.701.0-GL-ac.patch: --- NEW FILE jasper-1.701.0-GL-ac.patch --- --- jasper-1.701.0.GEO/configure.ac.GL 2006-02-20 19:58:02.000000000 -0600 +++ jasper-1.701.0.GEO/configure.ac 2006-02-24 07:40:38.000000000 -0600 @@ -242,7 +242,7 @@ OPENGL_LIBS="" if test $ENABLE_OPENGL = yes; then if test $HAVE_OPENGL = no; then - TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS" + TMPLIBS="-lglut" AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes; OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS) fi Index: jasper.spec =================================================================== RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jasper.spec 1 Mar 2006 18:12:26 -0000 1.12 +++ jasper.spec 1 Mar 2006 18:16:10 -0000 1.13 @@ -12,7 +12,7 @@ Name: jasper Group: System Environment/Libraries Version: 1.701.0 -Release: 11%{?dist} +Release: 12%{?dist} License: JasPer License Version 2.0 %if "%{?geo:1}" == "1" @@ -118,7 +118,7 @@ %changelog -* Wed Mar 1 2006 Rex Dieter 1.701.0-11 +* Wed Mar 1 2006 Rex Dieter 1.701.0-12 - fixup build issues introduced by geojasper integration * Wed Mar 1 2006 Rex Dieter 1.701.0-10 From fedora-extras-commits at redhat.com Wed Mar 1 18:49:01 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 1 Mar 2006 13:49:01 -0500 Subject: rpms/galeon/FC-4 .cvsignore, 1.5, 1.6 galeon.spec, 1.19, 1.20 sources, 1.7, 1.8 Message-ID: <200603011849.k21InXkV027294@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27265 Modified Files: .cvsignore galeon.spec sources Log Message: Update to 2.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Nov 2005 22:43:13 -0000 1.5 +++ .cvsignore 1 Mar 2006 18:49:01 -0000 1.6 @@ -1 +1 @@ -galeon-2.0.0.tar.bz2 +galeon-2.0.1.tar.bz2 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- galeon.spec 28 Nov 2005 22:43:13 -0000 1.19 +++ galeon.spec 1 Mar 2006 18:49:01 -0000 1.20 @@ -1,6 +1,6 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon -Version: 2.0.0 +Version: 2.0.1 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -101,6 +101,9 @@ %changelog +* Wed Mar 1 2006 Denis Leroy - 2.0.1-1 +- Update to 2.0.1 + * Mon Nov 28 2005 Denis Leroy - 2.0.0-1 - Update to 2.0.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Nov 2005 22:43:13 -0000 1.7 +++ sources 1 Mar 2006 18:49:01 -0000 1.8 @@ -1 +1 @@ -e1f1e46d40c9e2345c1ea5e9bc788244 galeon-2.0.0.tar.bz2 +34d6e3a6ee78f9e4d12736e5d81b462b galeon-2.0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 19:21:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 14:21:03 -0500 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.19,1.20 Message-ID: <200603011921.k21JLZQp029535@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29518 Modified Files: gtk-qt-engine.spec Log Message: * Wed Mar 1 2006 Rex Dieter 0.60-8 - Unpackaged file %_libdir/menu -> %_prefix/lib/menu Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gtk-qt-engine.spec 1 Mar 2006 16:42:07 -0000 1.19 +++ gtk-qt-engine.spec 1 Mar 2006 19:21:02 -0000 1.20 @@ -6,7 +6,7 @@ Name: gtk-qt-engine Group: User Interface/Desktops Version: 0.60 -Release: 7%{?dist}.2 +Release: 8%{?dist} License: GPL URL: http://www.freedesktop.org/Software/gtk-qt @@ -90,8 +90,7 @@ %find_lang gtkqtengine || touch gtkqtengine.lang # Unpackaged files -rm -rf $RPM_BUILD_ROOT%{_libdir}/menu - +rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/menu %clean rm -rf $RPM_BUILD_ROOT @@ -109,6 +108,9 @@ %changelog +* Wed Mar 1 2006 Rex Dieter 0.60-8 +- Unpackaged file %%_libdir/menu -> %%_prefix/lib/menu + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Wed Mar 1 20:14:17 2006 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Wed, 1 Mar 2006 15:14:17 -0500 Subject: rpms/libesmtp/devel libesmtp.spec,1.5,1.6 Message-ID: <200603012014.k21KEoFI031668@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/libesmtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31647 Modified Files: libesmtp.spec Log Message: - rebuild for FE 5. Index: libesmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/libesmtp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libesmtp.spec 4 Dec 2005 12:45:56 -0000 1.5 +++ libesmtp.spec 1 Mar 2006 20:14:16 -0000 1.6 @@ -3,7 +3,7 @@ Summary: SMTP client library Name: libesmtp Version: 1.0.3r1 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2 @@ -87,6 +87,9 @@ %{_libdir}/libesmtp.a %changelog +* Wed Mar 1 2006 Pawel Salek - 1.0.3r1-8 +- Rebuild for Fedora Extras 5 + * Sun Dec 4 2005 Pawel Salek - 1.0.3r1-7 - Fix bug 173332 completely, including licence issues. From fedora-extras-commits at redhat.com Wed Mar 1 20:29:04 2006 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Wed, 1 Mar 2006 15:29:04 -0500 Subject: rpms/balsa/devel .cvsignore, 1.11, 1.12 balsa.spec, 1.14, 1.15 sources, 1.11, 1.12 Message-ID: <200603012029.k21KTblo031874@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/balsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31848 Modified Files: .cvsignore balsa.spec sources Log Message: - update to upstream version 2.3.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 29 Jan 2006 13:45:29 -0000 1.11 +++ .cvsignore 1 Mar 2006 20:29:04 -0000 1.12 @@ -1,2 +1,2 @@ +balsa-2.3.11.tar.bz2 gmime-2.1.17.tar.bz2 -balsa-2.3.10.tar.bz2 Index: balsa.spec =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- balsa.spec 29 Jan 2006 13:45:29 -0000 1.14 +++ balsa.spec 1 Mar 2006 20:29:04 -0000 1.15 @@ -1,8 +1,7 @@ -%define gmimever 2.1.17 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell Name: balsa -Version: 2.3.10 +Version: 2.3.11 Release: 1%{?dist} Summary: Mail Client @@ -10,13 +9,13 @@ License: GPL URL: http://balsa.gnome.org/ Source0: http://balsa.gnome.org/%{name}-%{version}.tar.bz2 -Source1: http://balsa.gnome.org/gmime-%{gmimever}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libesmtp >= 1.0.3 Requires: scrollkeeper BuildRequires: aspell-devel BuildRequires: desktop-file-utils +BuildRequires: gmime-devel BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel BuildRequires: gtkhtml2-devel @@ -39,13 +38,10 @@ and printing messages. %prep -%setup -q -D -a 1 +%setup -q %build -dir=`pwd`; cd gmime-%{gmimever} && ./configure --prefix=`pwd` --disable-gtk-doc --disable-shared && make install; cd $dir -export PKG_CONFIG_PATH="gmime-%{gmimever}:$PKG_CONFIG_PATH" - %configure %{config_opts} make %{?_smp_mflags} @@ -103,6 +99,9 @@ %changelog +* Wed Mar 1 2006 Pawel Salek - 2.3.11-1 +- update to upstream version 2.3.11. + * Sun Jan 29 2006 Pawel Salek - 2.3.10-1 - update to upstream 2.3.10 @@ -121,7 +120,7 @@ * Wed Oct 19 2005 Pawel Salek - 2.3.5 - update to upstream version 2.3.5 -* Tue Jul 5 2005 Pawel Salek - 2.3.4 +* Tue Jul 5 2005 Pawel Salek - 2.3.4 - update to upstream version 2.3.4 * Tue Jun 14 2005 Pawel Salek - 2.3.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 29 Jan 2006 13:45:29 -0000 1.11 +++ sources 1 Mar 2006 20:29:04 -0000 1.12 @@ -1,2 +1,2 @@ +a00f9d235b1ae9e7736fb0a0f4a38e82 balsa-2.3.11.tar.bz2 4be55ee55e4b3966bd51fadbf5fb323b gmime-2.1.17.tar.bz2 -55900922195886be867cd5060548ff7f balsa-2.3.10.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 22:00:32 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Wed, 1 Mar 2006 17:00:32 -0500 Subject: rpms/fetchlog/devel .cvsignore,1.5,1.6 sources,1.6,1.7 Message-ID: <200603012201.k21M14bg001944@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1910 Modified Files: .cvsignore sources Log Message: sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Feb 2006 20:28:11 -0000 1.5 +++ .cvsignore 1 Mar 2006 22:00:31 -0000 1.6 @@ -1 +1,2 @@ fetchlog-1.0.tar.gz +fetchlog-build.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Feb 2006 20:28:11 -0000 1.6 +++ sources 1 Mar 2006 22:00:31 -0000 1.7 @@ -1 +1,2 @@ e2ef0a076d1901c489c953fe48e1b2a9 fetchlog-1.0.tar.gz +99228569b122b994b1ab83148a3bd261 fetchlog-build.patch From fedora-extras-commits at redhat.com Wed Mar 1 22:25:44 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 1 Mar 2006 17:25:44 -0500 Subject: rpms/xpilot-ng/FC-4 xpilot-ng.logrotate,1.1,1.2 Message-ID: <200603012226.k21MQGH1003980@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3954 Modified Files: xpilot-ng.logrotate Log Message: Fix typo. Index: xpilot-ng.logrotate =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng.logrotate,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng.logrotate 1 Mar 2006 04:51:17 -0000 1.1 +++ xpilot-ng.logrotate 1 Mar 2006 22:25:43 -0000 1.2 @@ -1,4 +1,4 @@ -/var/log/xpilotd.log { +/var/log/xpilot.log { copytruncate notifempty missingok From fedora-extras-commits at redhat.com Wed Mar 1 23:15:07 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Mar 2006 18:15:07 -0500 Subject: rpms/rekall/FC-3 rekall.spec,1.9,1.10 Message-ID: <200603012315.k21NFgaF006019@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5970/FC-3 Modified Files: rekall.spec Log Message: Fix x86_64 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rekall.spec 1 Mar 2006 00:03:15 -0000 1.9 +++ rekall.spec 1 Mar 2006 23:15:06 -0000 1.10 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -108,6 +108,8 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -309,6 +311,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 +- fix x86_64 + * Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 - bump for FC-5 From fedora-extras-commits at redhat.com Wed Mar 1 23:15:13 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Mar 2006 18:15:13 -0500 Subject: rpms/rekall/FC-4 rekall.spec,1.9,1.10 Message-ID: <200603012315.k21NFjgc006022@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5970/FC-4 Modified Files: rekall.spec Log Message: Fix x86_64 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rekall.spec 1 Mar 2006 00:03:34 -0000 1.9 +++ rekall.spec 1 Mar 2006 23:15:13 -0000 1.10 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -108,6 +108,8 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -309,6 +311,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 +- fix x86_64 + * Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 - bump for FC-5 From fedora-extras-commits at redhat.com Wed Mar 1 23:15:19 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Mar 2006 18:15:19 -0500 Subject: rpms/rekall/devel rekall.spec,1.10,1.11 Message-ID: <200603012315.k21NFpKa006025@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5970/devel Modified Files: rekall.spec Log Message: Fix x86_64 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rekall.spec 1 Mar 2006 00:04:52 -0000 1.10 +++ rekall.spec 1 Mar 2006 23:15:19 -0000 1.11 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -108,6 +108,8 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -309,6 +311,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 +- fix x86_64 + * Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 - bump for FC-5 From fedora-extras-commits at redhat.com Wed Mar 1 23:19:33 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 1 Mar 2006 18:19:33 -0500 Subject: rpms/xpilot-ng/devel xpilot-ng.logrotate,1.1,1.2 Message-ID: <200603012320.k21NK5UA006192@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6088 Modified Files: xpilot-ng.logrotate Log Message: Fix typo in log file name Index: xpilot-ng.logrotate =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/xpilot-ng.logrotate,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng.logrotate 1 Mar 2006 04:46:09 -0000 1.1 +++ xpilot-ng.logrotate 1 Mar 2006 23:19:32 -0000 1.2 @@ -1,6 +1,5 @@ -/var/log/xpilotd.log { +/var/log/xpilot.log { copytruncate notifempty missingok - endscript } From fedora-extras-commits at redhat.com Wed Mar 1 23:21:19 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 1 Mar 2006 18:21:19 -0500 Subject: rpms/xpilot-ng/devel xpilot-ng.spec,1.3,1.4 Message-ID: <200603012321.k21NLpfh006215@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6198 Modified Files: xpilot-ng.spec Log Message: Create a special xpilot user to run the server daemon. Index: xpilot-ng.spec =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/xpilot-ng.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xpilot-ng.spec 1 Mar 2006 04:46:09 -0000 1.3 +++ xpilot-ng.spec 1 Mar 2006 23:21:18 -0000 1.4 @@ -1,6 +1,6 @@ Name: xpilot-ng Version: 4.7.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -23,6 +23,9 @@ Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service +Requires(postun): /sbin/service +Requires(pre): fedora-usermgmt +Requires(postun): fedora-usermgmt %description A highly addictive, infinitely configurable multiplayer space @@ -48,12 +51,10 @@ mv xpilot-ng-x11.man.new xpilot-ng-x11.man popd - %build CFLAGS="$RPM_OPT_FLAGS" %configure make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -96,6 +97,11 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%pre server +/usr/sbin/fedora-groupadd 25 -r xpilot &>/dev/null || : +/usr/sbin/fedora-useradd 25 -r -s /sbin/nologin -d /usr/share/xpilot-ng -M \ + -c 'XPilot Server' -g xpilot xpilot >/dev/null || : + %post server /sbin/chkconfig --add xpilot-ng-server @@ -109,6 +115,8 @@ if [ "$1" -ge "1" ]; then /sbin/service xpilot-ng-server restart >/dev/null 2>&1 fi +test "$1" != 0 || /usr/sbin/fedora-userdel xpilot &>/dev/null || : +test "$1" != 0 || /usr/sbin/fedora-groupdel xpilot &>/dev/null || : %clean rm -rf $RPM_BUILD_ROOT @@ -154,6 +162,10 @@ %ghost %{_datadir}/%{name}/mapconvert.pyo %changelog +* Wed Mar 1 2006 Wart 4.7.2-7 +- Create an xpilot user for running the server daemon +- Fix typo in logrotate configuration file. + * Tue Feb 28 2006 Wart 4.7.2-6 - Added sysconfig and initrd files for starting xpilot server at boot time - Add copies of customizable configuration files to /etc/xpilot From fedora-extras-commits at redhat.com Wed Mar 1 23:24:05 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 1 Mar 2006 18:24:05 -0500 Subject: rpms/xpilot-ng/FC-4 xpilot-ng-server.init, 1.1, 1.2 xpilot-ng.spec, 1.3, 1.4 Message-ID: <200603012324.k21NObre006274@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6255 Modified Files: xpilot-ng-server.init xpilot-ng.spec Log Message: Create a xpilot user for running the game server daemon. Index: xpilot-ng-server.init =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng-server.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng-server.init 1 Mar 2006 04:51:17 -0000 1.1 +++ xpilot-ng-server.init 1 Mar 2006 23:24:05 -0000 1.2 @@ -36,7 +36,7 @@ return 1 fi # This doesn't properly detect startup failures - daemon --user games $exec $XPILOTD_OPTIONS >>/var/log/xpilot.log 2>&1 & + daemon --user xpilot $exec $XPILOTD_OPTIONS >>/var/log/xpilot.log 2>&1 & retval=$? if [ $retval -eq 0 ]; then success Index: xpilot-ng.spec =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xpilot-ng.spec 1 Mar 2006 04:51:17 -0000 1.3 +++ xpilot-ng.spec 1 Mar 2006 23:24:05 -0000 1.4 @@ -1,6 +1,6 @@ Name: xpilot-ng Version: 4.7.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -23,6 +23,9 @@ Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service +Requires(postun): /sbin/service +Requires(pre): fedora-usermgmt +Requires(postun): fedora-usermgmt %description A highly addictive, infinitely configurable multiplayer space @@ -94,6 +97,11 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%pre server +/usr/sbin/fedora-groupadd 25 -r xpilot &>/dev/null || : +/usr/sbin/fedora-useradd 25 -r -s /sbin/nologin -d /usr/share/xpilot-ng -M \ + -c 'XPilot Server' -g xpilot xpilot >/dev/null || : + %post server /sbin/chkconfig --add xpilot-ng-server @@ -107,6 +115,8 @@ if [ "$1" -ge "1" ]; then /sbin/service xpilot-ng-server restart >/dev/null 2>&1 fi +test "$1" != 0 || /usr/sbin/fedora-userdel xpilot &>/dev/null || : +test "$1" != 0 || /usr/sbin/fedora-groupdel xpilot &>/dev/null || : %clean rm -rf $RPM_BUILD_ROOT @@ -152,6 +162,10 @@ #%ghost %{_datadir}/%{name}/mapconvert.pyo %changelog +* Wed Mar 1 2006 Wart 4.7.2-6 +- Create an xpilot user for running the server daemon +- Fix typo in logrotate configuration file. + * Tue Feb 28 2006 Wart 4.7.2-5 - Added sysconfig and initrd files for starting xpilot server at boot time - Add copies of customizable configuration files to /etc/xpilot From fedora-extras-commits at redhat.com Wed Mar 1 23:46:31 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Mar 2006 18:46:31 -0500 Subject: rpms/perl-Net-Patricia/FC-4 .cvsignore, 1.2, 1.3 perl-Net-Patricia.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603012347.k21Nl3jO006580@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/perl-Net-Patricia/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6559 Modified Files: .cvsignore perl-Net-Patricia.spec sources Log Message: Update to 1.014 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-Patricia/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Oct 2005 15:11:40 -0000 1.2 +++ .cvsignore 1 Mar 2006 23:46:31 -0000 1.3 @@ -1 +1 @@ -Net-Patricia-1.010.tar.gz +Net-Patricia-1.014.tar.gz Index: perl-Net-Patricia.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-Patricia/FC-4/perl-Net-Patricia.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-Patricia.spec 24 Oct 2005 15:11:40 -0000 1.1 +++ perl-Net-Patricia.spec 1 Mar 2006 23:46:31 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Net-Patricia -Version: 1.010 +Version: 1.014 Release: 1%{?dist} Summary: Patricia Trie perl module for fast IP address lookups License: GPL @@ -53,5 +53,8 @@ %{_mandir}/man3/* %changelog +* Wed Feb 1 2006 Orion Poplawski 1.014-1 +- Update to 1.014 + * Tue Oct 11 2005 Orion Poplawski 1.010-1 - Initial Fedora Extras release Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-Patricia/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Oct 2005 15:11:40 -0000 1.2 +++ sources 1 Mar 2006 23:46:31 -0000 1.3 @@ -1 +1 @@ -19f0c6944769daba64694ee3c72cf286 Net-Patricia-1.010.tar.gz +16ec73b5b514dbe4275e349fca236c49 Net-Patricia-1.014.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 23:50:05 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Mar 2006 18:50:05 -0500 Subject: rpms/python-basemap-data/FC-4 .cvsignore, 1.2, 1.3 python-basemap-data.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603012350.k21NobON006667@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-basemap-data/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6642 Modified Files: .cvsignore python-basemap-data.spec sources Log Message: Update to 0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-basemap-data/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Jan 2006 17:51:47 -0000 1.2 +++ .cvsignore 1 Mar 2006 23:50:05 -0000 1.3 @@ -1 +1 @@ -basemap-data-0.7.tar.gz +basemap-data-0.8.tar.gz Index: python-basemap-data.spec =================================================================== RCS file: /cvs/extras/rpms/python-basemap-data/FC-4/python-basemap-data.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-basemap-data.spec 5 Jan 2006 17:53:12 -0000 1.2 +++ python-basemap-data.spec 1 Mar 2006 23:50:05 -0000 1.3 @@ -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-data -Version: 0.7 +Version: 0.8 Release: 1 Summary: Data for python-basemap Group: Development/Libraries @@ -39,5 +39,8 @@ %changelog +* Wed Mar 1 2006 Orion Poplawski 0.8-1 +- Update to 0.8 + * Sun Nov 20 2005 Orion Poplawski 0.7-1 - Initial package for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-basemap-data/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Jan 2006 17:51:47 -0000 1.2 +++ sources 1 Mar 2006 23:50:05 -0000 1.3 @@ -1 +1 @@ -8f745d4575e996348e3b315859b354e0 basemap-data-0.7.tar.gz +b3cbcb405b70a1dfc2abbaf979fe1d89 basemap-data-0.8.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 23:51:35 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Mar 2006 18:51:35 -0500 Subject: rpms/python-basemap-data/FC-4 python-basemap-data.spec,1.3,1.4 Message-ID: <200603012352.k21Nq8QT006721@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-basemap-data/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6704 Modified Files: python-basemap-data.spec Log Message: Add dist tag Index: python-basemap-data.spec =================================================================== RCS file: /cvs/extras/rpms/python-basemap-data/FC-4/python-basemap-data.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-basemap-data.spec 1 Mar 2006 23:50:05 -0000 1.3 +++ python-basemap-data.spec 1 Mar 2006 23:51:35 -0000 1.4 @@ -2,7 +2,7 @@ Name: python-basemap-data Version: 0.8 -Release: 1 +Release: 1%{?dist} Summary: Data for python-basemap Group: Development/Libraries License: GPL From fedora-extras-commits at redhat.com Wed Mar 1 23:53:12 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Mar 2006 18:53:12 -0500 Subject: rpms/python-basemap-data/devel python-basemap-data.spec,1.3,1.4 Message-ID: <200603012353.k21NrlJJ006791@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-basemap-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6774 Modified Files: python-basemap-data.spec Log Message: Add dist tag Index: python-basemap-data.spec =================================================================== RCS file: /cvs/extras/rpms/python-basemap-data/devel/python-basemap-data.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-basemap-data.spec 28 Feb 2006 20:40:50 -0000 1.3 +++ python-basemap-data.spec 1 Mar 2006 23:53:12 -0000 1.4 @@ -2,7 +2,7 @@ Name: python-basemap-data Version: 0.8 -Release: 1 +Release: 1%{?dist} Summary: Data for python-basemap Group: Development/Libraries License: GPL From fedora-extras-commits at redhat.com Thu Mar 2 00:09:07 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 19:09:07 -0500 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.desktop, 1.1, 1.2 sylpheed-claws.spec, 1.26, 1.27 Message-ID: <200603020009.k2209ia6008762@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-serv8719/FC-4 Modified Files: sylpheed-claws.desktop sylpheed-claws.spec Log Message: - fix .desktop Index: sylpheed-claws.desktop =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sylpheed-claws.desktop 5 Mar 2005 07:08:21 -0000 1.1 +++ sylpheed-claws.desktop 2 Mar 2006 00:09:07 -0000 1.2 @@ -1,10 +1,9 @@ [Desktop Entry] Name=Sylpheed Claws -Name[ja]=Sylpheed Claws Comment=E-Mail client -Comment[ja]=?????????????????????? Exec=sylpheed-claws Icon=sylpheed-claws.png Terminal=false Type=Application +Encoding=UTF-8 Categories=Application;Network; Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sylpheed-claws.spec 3 Feb 2006 09:03:41 -0000 1.26 +++ sylpheed-claws.spec 2 Mar 2006 00:09:07 -0000 1.27 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL @@ -113,6 +113,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Thu Mar 02 2006 Andreas Bierfert +2.0.0-2 +- fix .desktop + * Fri Feb 03 2006 Andreas Bierfert 2.0.0-1 - version upgrade From fedora-extras-commits at redhat.com Thu Mar 2 00:09:15 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 19:09:15 -0500 Subject: rpms/sylpheed-claws/devel sylpheed-claws.desktop, 1.1, 1.2 sylpheed-claws.spec, 1.36, 1.37 Message-ID: <200603020009.k2209liM008767@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8719/devel Modified Files: sylpheed-claws.desktop sylpheed-claws.spec Log Message: - fix .desktop Index: sylpheed-claws.desktop =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sylpheed-claws.desktop 5 Mar 2005 07:08:21 -0000 1.1 +++ sylpheed-claws.desktop 2 Mar 2006 00:09:15 -0000 1.2 @@ -1,10 +1,9 @@ [Desktop Entry] Name=Sylpheed Claws -Name[ja]=Sylpheed Claws Comment=E-Mail client -Comment[ja]=?????????????????????? Exec=sylpheed-claws Icon=sylpheed-claws.png Terminal=false Type=Application +Encoding=UTF-8 Categories=Application;Network; Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sylpheed-claws.spec 16 Feb 2006 23:02:21 -0000 1.36 +++ sylpheed-claws.spec 2 Mar 2006 00:09:15 -0000 1.37 @@ -1,6 +1,6 @@ Name: sylpheed-claws Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL @@ -67,7 +67,7 @@ --vendor=fedora \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category=X-Fedora \ - %{SOURCE1} + %{SOURCE1} %{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome @@ -93,8 +93,7 @@ %{_libdir}/sylpheed-claws/plugins/*.so %exclude %{_libdir}/sylpheed-claws/plugins/*.a %{_datadir}/pixmaps/* -#%dir %{_datadir}/sylpheed-claws/ -#%{_datadir}/sylpheed-claws/* +%{_datadir}/sylpheed-claws %{_mandir}/man1/* %{_datadir}/applications/* #%{_datadir}/icons/* @@ -107,6 +106,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Thu Mar 02 2006 Andreas Bierfert +2.0.0-3 +- Fix .desktop + * Thu Feb 16 2006 Andreas Bierfert 2.0.0-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Thu Mar 2 00:31:38 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 19:31:38 -0500 Subject: rpms/fluxbox/devel fluxbox-gcc41.patch, NONE, 1.1 fluxbox.spec, 1.14, 1.15 Message-ID: <200603020032.k220WAaV008949@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fluxbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8907 Modified Files: fluxbox.spec Added Files: fluxbox-gcc41.patch Log Message: - write and add gcc41 patch fluxbox-gcc41.patch: --- NEW FILE fluxbox-gcc41.patch --- diff -uhr fluxbox-0.9.14.orig/src/ClockTool.cc fluxbox-0.9.14/src/ClockTool.cc --- fluxbox-0.9.14.orig/src/ClockTool.cc 2005-07-03 14:28:08.000000000 +0200 +++ fluxbox-0.9.14/src/ClockTool.cc 2006-03-02 01:14:45.000000000 +0100 @@ -50,7 +50,7 @@ class ClockMenuItem: public FbTk::MenuItem { public: - explicit ClockMenuItem::ClockMenuItem(ClockTool &tool): + explicit ClockMenuItem(ClockTool &tool): FbTk::MenuItem(""), m_tool(tool) { // determine 12/24 hour format _FB_USES_NLS; Only in fluxbox-0.9.14/src: defaults.cc diff -uhr fluxbox-0.9.14.orig/src/IconbarTool.cc fluxbox-0.9.14/src/IconbarTool.cc --- fluxbox-0.9.14.orig/src/IconbarTool.cc 2005-07-04 20:18:25.000000000 +0200 +++ fluxbox-0.9.14/src/IconbarTool.cc 2006-03-02 01:15:27.000000000 +0100 @@ -49,6 +49,8 @@ #include using namespace std; +namespace FbTk { + template<> void FbTk::Resource::setFromString(const char *strval) { if (strcasecmp(strval, "None") == 0) @@ -190,7 +192,7 @@ // default string return string("Icons"); } - +} // end namespace FbTk namespace { class ToolbarModeMenuItem : public FbTk::MenuItem { Only in fluxbox-0.9.14/src: .IconbarTool.cc.swp diff -uhr fluxbox-0.9.14.orig/src/MenuTheme.cc fluxbox-0.9.14/src/MenuTheme.cc --- fluxbox-0.9.14.orig/src/MenuTheme.cc 2005-01-24 19:57:02.000000000 +0100 +++ fluxbox-0.9.14/src/MenuTheme.cc 2006-03-02 01:11:36.000000000 +0100 @@ -26,6 +26,8 @@ #include using namespace std; +namespace FbTk { + template <> void FbTk::ThemeItem::load(const std::string *name, const std::string *altname) { } @@ -49,6 +51,7 @@ *(*this) = static_cast(places); } +} // end namespace FbTk MenuTheme::MenuTheme(int screen_num):FbTk::MenuTheme(screen_num), m_shapeplace(*this, "menu.roundCorners", "Menu.RoundCorners") { diff -uhr fluxbox-0.9.14.orig/src/Resources.cc fluxbox-0.9.14/src/Resources.cc --- fluxbox-0.9.14.orig/src/Resources.cc 2005-05-07 00:00:29.000000000 +0200 +++ fluxbox-0.9.14/src/Resources.cc 2006-03-02 01:12:54.000000000 +0100 @@ -37,6 +37,8 @@ //---- accessors for int, bool, and some enums with Resource ------ //----------------------------------------------------------------- +namespace FbTk { + template<> void FbTk::Resource:: setFromString(const char* strval) { @@ -250,3 +252,4 @@ sprintf(tmpstr, "%ld", m_value); return string(tmpstr); } +} // end namespace FbTk diff -uhr fluxbox-0.9.14.orig/src/ScreenResources.cc fluxbox-0.9.14/src/ScreenResources.cc --- fluxbox-0.9.14.orig/src/ScreenResources.cc 2005-07-26 19:34:45.000000000 +0200 +++ fluxbox-0.9.14/src/ScreenResources.cc 2006-03-02 01:08:37.000000000 +0100 @@ -29,6 +29,8 @@ #include using namespace std; +namespace FbTk { + template <> void FbTk::Resource::setDefaultValue() { *(*this) = BScreen::ROWSMARTPLACEMENT; @@ -357,4 +359,4 @@ else setDefaultValue(); } - +} // end namespace FbTk diff -uhr fluxbox-0.9.14.orig/src/Slit.cc fluxbox-0.9.14/src/Slit.cc --- fluxbox-0.9.14.orig/src/Slit.cc 2005-06-23 05:09:15.000000000 +0200 +++ fluxbox-0.9.14/src/Slit.cc 2006-03-02 01:09:46.000000000 +0100 @@ -80,6 +80,8 @@ #include using namespace std; +namespace FbTk { + template<> void FbTk::Resource::setFromString(const char *strval) { if (strcasecmp(strval, "TopLeft")==0) @@ -159,7 +161,7 @@ // default string return string("Vertical"); } - +} // end namespace FbTk namespace { class SlitClientMenuItem: public FbTk::MenuItem{ diff -uhr fluxbox-0.9.14.orig/src/Toolbar.cc fluxbox-0.9.14/src/Toolbar.cc --- fluxbox-0.9.14.orig/src/Toolbar.cc 2005-07-03 14:28:08.000000000 +0200 +++ fluxbox-0.9.14/src/Toolbar.cc 2006-03-02 01:14:05.000000000 +0100 @@ -73,6 +73,8 @@ using namespace std; +namespace FbTk { + template<> void FbTk::Resource:: setFromString(const char *strval) { @@ -148,7 +150,7 @@ //default string return string("BottomCenter"); } - +} // end namespace FbTk namespace { class SetToolbarPlacementCmd: public FbTk::Command { Only in fluxbox-0.9.14.orig/util: Makefile.in Index: fluxbox.spec =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fluxbox.spec 29 Nov 2005 15:56:10 -0000 1.14 +++ fluxbox.spec 2 Mar 2006 00:31:36 -0000 1.15 @@ -13,6 +13,7 @@ Source2: FluxBox Source3: fluxbox.desktop Source4: fluxbox-xdg-menu.py +Patch0: fluxbox-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot BuildRequires: imlib2-devel @@ -26,6 +27,7 @@ BuildRequires: libXpm-devel BuildRequires: libXrandr-devel BuildRequires: libXrender-devel +BuildRequires: fontconfig-devel Requires(post): python Requires: artwiz-aleczapka-fonts @@ -42,6 +44,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --enable-xft \ @@ -49,7 +52,9 @@ --enable-kde \ --enable-xinerama \ --enable-imlib2 \ - --enable-nls + --enable-nls \ + --x-includes=%{_includedir} \ + --x-libraries=%{_libdir} make %{?_smp_mflags} @@ -90,8 +95,11 @@ %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop %changelog -* Thu Nov 10 2005 Andreas Bierfert +* Thu Mar 02 2006 Andreas Bierfert 0.9.14-2 +- fix build on gcc41 + +* Thu Nov 10 2005 Andreas Bierfert - enable nls and imlib2 - require artwizaleczepka instead of providing it... - add menu script from Rudolf Kastel From fedora-extras-commits at redhat.com Thu Mar 2 00:35:09 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 19:35:09 -0500 Subject: rpms/fbdesk/devel fbdesk-gcc41.patch, NONE, 1.1 fbdesk.spec, 1.13, 1.14 Message-ID: <200603020035.k220ZgMs009102@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9075 Modified Files: fbdesk.spec Added Files: fbdesk-gcc41.patch Log Message: - write and add gcc41 patch fbdesk-gcc41.patch: --- NEW FILE fbdesk-gcc41.patch --- --- src/FbDesk.cc.orig 2006-03-02 01:24:43.000000000 +0100 +++ src/FbDesk.cc 2006-03-02 01:23:52.000000000 +0100 @@ -43,6 +43,8 @@ using namespace std; using namespace FbTk; +namespace FbTk { + template <> void Resource::setFromString(const char *str) { sscanf(str, "%d", &*(*this)); @@ -96,6 +98,7 @@ else *(*this) = FbDesk::Icon::TEXTPLACE_BOTTOM; } +} //end namespace FbTk namespace FbDesk { Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fbdesk.spec 2 Feb 2006 10:45:54 -0000 1.13 +++ fbdesk.spec 2 Mar 2006 00:35:09 -0000 1.14 @@ -8,6 +8,7 @@ License: MIT URL: http://fluxbox.sourceforge.net/fbdesk/ Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz +Patch0: fbdesk-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: freetype-devel BuildRequires: libpng-devel @@ -24,7 +25,7 @@ %prep %setup -q - +%patch0 %build %configure --x-includes=%{_includedir} --x-libraries=%{_libdir} @@ -49,8 +50,11 @@ %changelog -* Sun Jan 29 2006 Andreas Bierfert +* Thu Mar 02 2006 Andreas Bierfert 1.2.1-3 +- add gcc4.1 patch + +* Sun Jan 29 2006 Andreas Bierfert - modular X * Fri Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Thu Mar 2 01:19:46 2006 From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme)) Date: Wed, 1 Mar 2006 20:19:46 -0500 Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.19,1.20 Message-ID: <200603020120.k221KIsB011528@cvs-int.fedora.redhat.com> Author: meme Update of /cvs/extras/rpms/nethack-vultures/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11505 Modified Files: nethack-vultures.spec Log Message: Ready for FC5 Index: nethack-vultures.spec =================================================================== RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- nethack-vultures.spec 2 Feb 2006 17:30:37 -0000 1.19 +++ nethack-vultures.spec 2 Mar 2006 01:19:46 -0000 1.20 @@ -1,6 +1,6 @@ Name: nethack-vultures Version: 1.11.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NetHack - Vulture's Eye and Vulture's Claw Group: Amusements/Games @@ -164,6 +164,9 @@ %changelog +* Sun Mar 01 2006 Karen Pease - 1.11.2-5 +- Rebuilt for FC5 + * Sun Feb 02 2006 Frank Arnold - 1.11.2-4 - Got a working plague build by working around util-linux bug #176441. From fedora-extras-commits at redhat.com Thu Mar 2 01:20:46 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 20:20:46 -0500 Subject: rpms/scim-tomoe/FC-4 scim-tomoe.spec,1.3,1.4 Message-ID: <200603020121.k221LIKM011616@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11561 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/scim-tomoe.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-tomoe.spec 1 Mar 2006 05:51:29 -0000 1.3 +++ scim-tomoe.spec 2 Mar 2006 01:20:46 -0000 1.4 @@ -1,6 +1,6 @@ Name: scim-tomoe Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -12,7 +12,7 @@ Patch0: scim-tomoe-moduledir.patch Requires: scim -BuildRequires: scim-devel, tomoe-devel +BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk-devel %description Scim-tomoe allows Japanese handwritten input of characters using SCIM. @@ -49,7 +49,7 @@ %changelog -* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +* Wed Mar 1 2006 Ryo Dairiki - 0.2-2 - update to 0.2 * Fri Oct 7 2005 Ryo Dairiki - 0.1-2 From fedora-extras-commits at redhat.com Thu Mar 2 01:27:36 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 20:27:36 -0500 Subject: rpms/libtomoe-gtk/FC-4 .cvsignore, 1.2, 1.3 Makefile, 1.1, 1.2 branch, 1.1, 1.2 libtomoe-gtk.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603020128.k221S8Fq011804@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11779 Modified Files: .cvsignore Makefile branch libtomoe-gtk.spec sources Log Message: From fedora-extras-commits at redhat.com Thu Mar 2 01:34:01 2006 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Wed, 1 Mar 2006 20:34:01 -0500 Subject: rpms/frotz/devel frotz.spec,1.1,1.2 Message-ID: <200603020134.k221YXYJ011904@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/frotz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11887 Modified Files: frotz.spec Log Message: Rebuild for FC-5 Index: frotz.spec =================================================================== RCS file: /cvs/extras/rpms/frotz/devel/frotz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- frotz.spec 5 Aug 2005 05:41:58 -0000 1.1 +++ frotz.spec 2 Mar 2006 01:34:00 -0000 1.2 @@ -1,6 +1,6 @@ Name: frotz Version: 2.43 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Interpreter for Infocom and other Z-machine games Group: Amusements/Games @@ -57,6 +57,9 @@ %changelog +* Wed Mar 01 2006 Chris Grau 2.43-4 +- Rebuild for FC-5. + * Tue Jul 19 2005 Chris Grau 2.43-3 - Changed sed command to edit Makefile in place (Michael Schwendt). - Removed compression of the man page (Michael Schwendt). From fedora-extras-commits at redhat.com Thu Mar 2 01:41:25 2006 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Wed, 1 Mar 2006 20:41:25 -0500 Subject: rpms/ifm/devel ifm.spec,1.1,1.2 Message-ID: <200603020141.k221fvbG012002@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/ifm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11985 Modified Files: ifm.spec Log Message: Rebuild for FC-5 Index: ifm.spec =================================================================== RCS file: /cvs/extras/rpms/ifm/devel/ifm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ifm.spec 4 Oct 2005 21:17:50 -0000 1.1 +++ ifm.spec 2 Mar 2006 01:41:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: ifm Version: 5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interactive Fiction Mapper Group: Amusements/Games @@ -62,6 +62,9 @@ %changelog +* Wed Mar 01 2006 Chris Grau 5.1-3 +- Rebuild for FC-5. + * Mon Sep 26 2005 Chris Grau 5.1-2 - Added tk as a BR for the wish requirement in configure. - Fixed paths in man page to point to proper documentation. From fedora-extras-commits at redhat.com Thu Mar 2 01:51:26 2006 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Wed, 1 Mar 2006 20:51:26 -0500 Subject: rpms/perl-Time-Piece/devel perl-Time-Piece.spec,1.1,1.2 Message-ID: <200603020151.k221pxdk012228@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/perl-Time-Piece/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12170 Modified Files: perl-Time-Piece.spec Log Message: - Rebuild for FC-5. - Removed license texts that are not included in distribution. Index: perl-Time-Piece.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Time-Piece/devel/perl-Time-Piece.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Time-Piece.spec 24 Aug 2005 21:36:53 -0000 1.1 +++ perl-Time-Piece.spec 2 Mar 2006 01:51:26 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Time-Piece Version: 1.08 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Time objects from localtime and gmtime Group: Development/Libraries @@ -20,8 +20,6 @@ %prep %setup -q -n Time-Piece-%{version} -perldoc -t perlartistic > Artistic -perldoc -t perlgpl > COPYING %build @@ -48,13 +46,17 @@ %files %defattr(-,root,root,-) -%doc Artistic COPYING Changes README +%doc Changes README %{perl_vendorarch}/auto/Time/ %{perl_vendorarch}/Time/ %{_mandir}/man3/*.3* %changelog +* Wed Mar 01 2006 Chris Grau 1.08-3 +- Rebuild for FC-5. +- Removed license texts that are not included in distribution. + * Wed Aug 24 2005 Chris Grau 1.08-2 - Removed redundant perl BR. - Added license texts. From fedora-extras-commits at redhat.com Thu Mar 2 02:19:10 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 21:19:10 -0500 Subject: rpms/scim-tomoe/FC-4 scim-tomoe.spec,1.4,1.5 Message-ID: <200603020219.k222JCho014189@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14153 Modified Files: scim-tomoe.spec Log Message: update to 0.2.0 Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/scim-tomoe.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-tomoe.spec 2 Mar 2006 01:20:46 -0000 1.4 +++ scim-tomoe.spec 2 Mar 2006 02:19:08 -0000 1.5 @@ -1,6 +1,6 @@ Name: scim-tomoe Version: 0.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -49,7 +49,7 @@ %changelog -* Wed Mar 1 2006 Ryo Dairiki - 0.2-2 +* Wed Mar 1 2006 Ryo Dairiki - 0.2-3 - update to 0.2 * Fri Oct 7 2005 Ryo Dairiki - 0.1-2 From fedora-extras-commits at redhat.com Thu Mar 2 02:19:10 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 21:19:10 -0500 Subject: rpms/scim-tomoe/FC-3 scim-tomoe.spec,1.3,1.4 Message-ID: <200603020219.k222JCu6014190@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14154 Modified Files: scim-tomoe.spec Log Message: update to 0.2.0 Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-3/scim-tomoe.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-tomoe.spec 1 Mar 2006 06:39:02 -0000 1.3 +++ scim-tomoe.spec 2 Mar 2006 02:19:08 -0000 1.4 @@ -1,6 +1,6 @@ Name: scim-tomoe Version: 0.2.0 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -12,7 +12,7 @@ Patch0: scim-tomoe-moduledir.patch Requires: scim -BuildRequires: scim-devel, tomoe-devel +BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk-devel %description Scim-tomoe allows Japanese handwritten input of characters using SCIM. @@ -49,7 +49,7 @@ %changelog -* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +* Wed Mar 1 2006 Ryo Dairiki - 0.2-3 - update to 0.2 * Fri Oct 7 2005 Ryo Dairiki - 0.1-2 From fedora-extras-commits at redhat.com Thu Mar 2 02:24:39 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 21:24:39 -0500 Subject: rpms/scim-tomoe/FC-3 .cvsignore, 1.2, 1.3 Makefile, 1.1, 1.2 branch, 1.1, 1.2 scim-tomoe.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603020225.k222PBv5014347@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14321 Modified Files: .cvsignore Makefile branch scim-tomoe.spec sources Log Message: update to 0.2.0 From fedora-extras-commits at redhat.com Thu Mar 2 02:39:27 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 21:39:27 -0500 Subject: rpms/scim-tomoe/FC-3 scim-tomoe-moduledir.patch,NONE,1.1 Message-ID: <200603020239.k222dTpG014431@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14419 Added Files: scim-tomoe-moduledir.patch Log Message: scim-tomoe-moduledir.patch: --- NEW FILE scim-tomoe-moduledir.patch --- --- src/Makefile.am 2006-03-01 14:35:56.000000000 +0900 +++ src/Makefile.am.new 2006-03-01 14:36:07.000000000 +0900 @@ -12,7 +12,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ --- src/Makefile.in 2006-03-01 14:44:48.000000000 +0900 +++ src/Makefile.in.new 2006-03-01 14:45:30.000000000 +0900 @@ -257,7 +257,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ scim_tomoe.cpp \ From fedora-extras-commits at redhat.com Thu Mar 2 02:48:54 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 1 Mar 2006 21:48:54 -0500 Subject: rpms/gnugo/devel gnugo.spec,1.9,1.10 Message-ID: <200603020249.k222nQ6C014513@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/gnugo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14496 Modified Files: gnugo.spec Log Message: rebuild for FE5 Index: gnugo.spec =================================================================== RCS file: /cvs/extras/rpms/gnugo/devel/gnugo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnugo.spec 6 Apr 2005 22:11:38 -0000 1.9 +++ gnugo.spec 2 Mar 2006 02:48:54 -0000 1.10 @@ -1,6 +1,6 @@ Name: gnugo Version: 3.6 -Release: 3 +Release: 4%{?dist} Summary: Text based go program @@ -60,6 +60,10 @@ %changelog +* Wed Mar 1 2006 Chris Ricker 3.6-4 +- rebuild for FE 5 +- add dist tag + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Mar 2 02:54:51 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 1 Mar 2006 21:54:51 -0500 Subject: rpms/kakasi/devel kakasi.spec,1.2,1.3 Message-ID: <200603020255.k222tOrg014613@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kakasi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14596 Modified Files: kakasi.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 2.3.4-21 - rebuilt. Index: kakasi.spec =================================================================== RCS file: /cvs/extras/rpms/kakasi/devel/kakasi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kakasi.spec 30 May 2005 02:17:47 -0000 1.2 +++ kakasi.spec 2 Mar 2006 02:54:51 -0000 1.3 @@ -1,9 +1,9 @@ Name: kakasi Version: 2.3.4 -Release: 20 +Release: 21%{?dist} URL: http://kakasi.namazu.org/ License: GPL -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## re-compressed with bzip2 instead of gzip #Source: ftp://kakasi.namazu.org/pub/kakasi/%{name}-%{version}.tar.gz @@ -75,7 +75,8 @@ %files %defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING NEWS README README-ja +%doc AUTHORS ChangeLog COPYING NEWS README +%lang(ja) %doc README-ja %dir %{_datadir}/kakasi %{_bindir}/* %{_libdir}/libkakasi.so.* @@ -95,6 +96,9 @@ %changelog +* Thu Mar 2 2006 Akira TAGOH - 2.3.4-21 +- rebuilt. + * Mon May 30 2005 Akira TAGOH - 2.3.4-20 - import to Fedora Extras. From fedora-extras-commits at redhat.com Thu Mar 2 02:57:34 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 1 Mar 2006 21:57:34 -0500 Subject: rpms/cgoban/devel cgoban.spec,1.8,1.9 Message-ID: <200603020258.k222w6EV014767@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/cgoban/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14715 Modified Files: cgoban.spec Log Message: rebuild for FE5 Index: cgoban.spec =================================================================== RCS file: /cvs/extras/rpms/cgoban/devel/cgoban.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cgoban.spec 23 Jul 2005 16:11:25 -0000 1.8 +++ cgoban.spec 2 Mar 2006 02:57:34 -0000 1.9 @@ -1,6 +1,6 @@ Name: cgoban Version: 1.9.14 -Release: 5 +Release: 6%{?dist} Summary: X board for playing go @@ -12,7 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: xorg-x11-devel +BuildRequires: libICE-devel, libXmu-devel, libSM-devel, xorg-x11-proto-devel +BuildRequires: libXext-devel, libXaw-devel, libXt-devel %description CGoban (Complete Goban) is for Unix systems with X11. It has the ability @@ -57,6 +58,10 @@ %changelog +* Wed Mar 1 2006 Chris Ricker 1.9.14-6 +- Rebuild for FE5 +- add dist tag + * Sat Jun 25 2005 Colin Charles 1.9.14-5 - Fix download URL From fedora-extras-commits at redhat.com Thu Mar 2 05:31:46 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 00:31:46 -0500 Subject: rpms/mew/devel mew.spec,1.2,1.3 Message-ID: <200603020532.k225WIjT021019@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/mew/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21002 Modified Files: mew.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 4.2-2 - rebuilt. Index: mew.spec =================================================================== RCS file: /cvs/extras/rpms/mew/devel/mew.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mew.spec 30 May 2005 03:38:49 -0000 1.2 +++ mew.spec 2 Mar 2006 05:31:46 -0000 1.3 @@ -5,10 +5,10 @@ Name: mew Version: 4.2 -Release: 1 +Release: 2%{?dist} License: BSD-like URL: http://www.mew.org/ -BuildRoot: %{_tmppath}/%{name}-%{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildPrereq: emacs >= %{emacsver} BuildPrereq: xemacs >= %{xemacsver} BuildRequires: emacs >= %{emacsver} @@ -185,6 +185,9 @@ %changelog +* Thu Mar 2 2006 Akira TAGOH - 4.2-2 +- rebuilt. + * Mon May 30 2005 Akira TAGOH - 4.2-1 - Updates to 4.2. - import into Extras. From fedora-extras-commits at redhat.com Thu Mar 2 05:41:19 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 00:41:19 -0500 Subject: owners owners.list,1.690,1.691 Message-ID: <200603020541.k225fq7Q021157@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21138 Modified Files: owners.list Log Message: Taking ownership of neverball Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.690 retrieving revision 1.691 diff -u -r1.690 -r1.691 --- owners.list 1 Mar 2006 17:04:55 -0000 1.690 +++ owners.list 2 Mar 2006 05:41:19 -0000 1.691 @@ -714,7 +714,7 @@ Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.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|NetworkManager-vpnc|NetworkManager VPN integration for vpnc|davidz at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|neverball|Roll a ball through an obstacle course|nos at utelsystems.com|extras-qa at fedoraproject.org| +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|redhat at flyn.org|extras-qa at fedoraproject.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| From fedora-extras-commits at redhat.com Thu Mar 2 05:50:56 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:50:56 -0500 Subject: rpms/planet - New directory Message-ID: <200603020550.k225owmm021261@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253/planet Log Message: Directory /cvs/extras/rpms/planet added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 05:51:01 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:51:01 -0500 Subject: rpms/planet/devel - New directory Message-ID: <200603020551.k225p3dG021276@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253/planet/devel Log Message: Directory /cvs/extras/rpms/planet/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 05:51:32 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:51:32 -0500 Subject: rpms/planet Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603020551.k225pYxP021323@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21300 Added Files: Makefile import.log Log Message: Setup of module planet --- NEW FILE Makefile --- # Top level Makefile for module planet all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 2 05:51:37 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:51:37 -0500 Subject: rpms/planet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603020551.k225peI0021353@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21300/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module planet --- NEW 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 Mar 2 05:51:33 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 00:51:33 -0500 Subject: rpms/neverball/devel neverball.spec,1.9,1.10 Message-ID: <200603020552.k225q5pV021377@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/neverball/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21225 Modified Files: neverball.spec Log Message: Modular xorg fix for BuildRequires. Index: neverball.spec =================================================================== RCS file: /cvs/extras/rpms/neverball/devel/neverball.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- neverball.spec 23 May 2005 00:24:05 -0000 1.9 +++ neverball.spec 2 Mar 2006 05:51:33 -0000 1.10 @@ -1,6 +1,6 @@ Name: neverball Version: 1.4.0 -Release: 4 +Release: 5 Summary: Roll a ball through an obstacle course @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel, SDL_ttf-devel, SDL_mixer-devel BuildRequires: freetype-devel, desktop-file-utils, zlib-devel +BuildRequires: mesa-libGL-devel %description Tilt the floor to roll a ball through an obstacle course within the @@ -25,18 +26,21 @@ %prep %setup -q %patch0 +# Remove some execute bits to prevent rpmlint warnings in the debuginfo +# package. +find data putt share -type f -exec chmod a-x {} \; %build -make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`" +make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -p -D -m0755 neverball $RPM_BUILD_ROOT/%{_bindir}/neverball install -p -D -m0755 neverputt $RPM_BUILD_ROOT/%{_bindir}/neverputt -install -p -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/neverball/ +install -p -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/ install -p -D -m0644 icon/neverball.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverball.png install -p -D -m0644 icon/neverputt.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverputt.png -cp -ap data/* $RPM_BUILD_ROOT/%{_datadir}/neverball/ +cp -ap data/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/ desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ @@ -60,6 +64,10 @@ %{_datadir}/applications/* %changelog +* Mon Feb 27 2006 Wart - 1.4.0-5 +- Added BR: mesa-libGL-devel for modular xorg +- Added smp_mflags to compile line to speed up build on smp machines + * Sun May 22 2005 Jeremy Katz - 1.4.0-4 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Mar 2 05:52:53 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:52:53 -0500 Subject: rpms/planet import.log,1.1,1.2 Message-ID: <200603020553.k225rPUK021470@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21431 Modified Files: import.log Log Message: auto-import planet-1.0-0.5.20060218pre on branch devel from planet-1.0-0.5.20060218pre.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/planet/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Mar 2006 05:51:32 -0000 1.1 +++ import.log 2 Mar 2006 05:52:53 -0000 1.2 @@ -0,0 +1 @@ +planet-1_0-0_5_20060218pre:HEAD:planet-1.0-0.5.20060218pre.src.rpm:1141278756 From fedora-extras-commits at redhat.com Thu Mar 2 05:52:59 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:52:59 -0500 Subject: rpms/planet/devel planet-1.0-no-shebang.patch, NONE, 1.1 planet.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603020553.k225rVtC021474@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21431/devel Modified Files: .cvsignore sources Added Files: planet-1.0-no-shebang.patch planet.spec Log Message: auto-import planet-1.0-0.5.20060218pre on branch devel from planet-1.0-0.5.20060218pre.src.rpm planet-1.0-no-shebang.patch: --- NEW FILE planet-1.0-no-shebang.patch --- diff -pur planet-1.0~pre1.orig/planet/cache.py planet-1.0~pre1/planet/cache.py --- planet-1.0~pre1.orig/planet/cache.py 2005-11-15 09:35:07.000000000 +0000 +++ planet-1.0~pre1/planet/cache.py 2005-11-16 18:50:41.000000000 +0000 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: UTF-8 -*- """Item cache. Only in planet-1.0~pre1/planet: cache.py~ diff -pur planet-1.0~pre1.orig/planet/feedparser.py planet-1.0~pre1/planet/feedparser.py --- planet-1.0~pre1.orig/planet/feedparser.py 2005-11-15 09:35:11.000000000 +0000 +++ planet-1.0~pre1/planet/feedparser.py 2005-11-16 18:50:39.000000000 +0000 @@ -1,4 +1,3 @@ -#!/usr/bin/env python """Universal feed parser Handles RSS 0.9x, RSS 1.0, RSS 2.0, CDF, Atom feeds Only in planet-1.0~pre1/planet: feedparser.py~ diff -pur planet-1.0~pre1.orig/planet/__init__.py planet-1.0~pre1/planet/__init__.py --- planet-1.0~pre1.orig/planet/__init__.py 2005-11-15 09:35:13.000000000 +0000 +++ planet-1.0~pre1/planet/__init__.py 2005-11-16 18:50:36.000000000 +0000 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: UTF-8 -*- """Planet aggregator library. Only in planet-1.0~pre1/planet: __init__.py~ --- NEW FILE planet.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define tarname planet-1.0-20060218pre %define bazver planet--devel--1.0--patch-20 Name: planet Version: 1.0 Release: 0.5.20060218pre Summary: Flexible RDF/RSS/Atom feed aggregator Group: Applications/Internet License: Python Software Foundation License URL: http://www.planetplanet.org/ Source0: %{tarname}.tar.gz Patch1: planet-1.0-no-shebang.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description Planet is a flexible feed aggregator, this means that it downloads feeds and aggregates their content together into a single combined feed with the latest news first. It uses Mark Pilgrim's Ultra-liberal feed parser so can read from RDF, RSS and Atom feeds and Tomas Styblo's template library to output static files in unlimited formats based on a series of templates. %prep %setup -n %{bazver} %patch1 -p1 # Fix line endings. %{__sed} -i 's/\r//' LICENCE %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 # Remove .py from install scripts, e.g. planet.py -> planet. REGEXP='s:%{_bindir}/\(.*\).py:%{_bindir}/\1:' for i in $RPM_BUILD_ROOT%{_bindir}/*.py; do mv -v $i $(echo $i | sed -e $REGEXP) done %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS INSTALL LICENCE NEWS THANKS README examples %{_bindir}/* %dir %{python_sitelib}/planet %{python_sitelib}/planet/*.py %{python_sitelib}/planet/*.pyc %ghost %{python_sitelib}/planet/*.pyo %dir %{python_sitelib}/planet/compat_logging %{python_sitelib}/planet/compat_logging/*.py %{python_sitelib}/planet/compat_logging/*.pyc %ghost %{python_sitelib}/planet/compat_logging/*.pyo %changelog * Sat Feb 18 2006 Richard Dawe - 1.0-0.5.20060218pre - Update to planet--devel--1.0--patch-20. This is no different than the previous release. This is purely to use a known, source-controlled version. * Sun Feb 06 2006 Richard Dawe - 1.0-0.4.20060206pre - Update to the nearly-final 1.0 release on 20060206. * Fri Dec 09 2005 Richard Dawe - 1.0-0.3.20051115arch - Rename to planet from planetplanet. - Include INSTALL document. - Own planet Python sitelib subdirectories. * Wed Nov 16 2005 Richard Dawe - 1.0-0.2.20051115arch - Correct License tag. - Remove shebang lines from planet module code. - Bring spec in line with Fedora's Python spec template. * Wed Nov 16 2005 Richard Dawe - 1.0-0.1.20051115arch - Initial packaging. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/planet/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2006 05:51:37 -0000 1.1 +++ .cvsignore 2 Mar 2006 05:52:59 -0000 1.2 @@ -0,0 +1 @@ +planet-1.0-20060218pre.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/planet/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2006 05:51:37 -0000 1.1 +++ sources 2 Mar 2006 05:52:59 -0000 1.2 @@ -0,0 +1 @@ +c5b59fe0023554ce31d2f2e32559d6c5 planet-1.0-20060218pre.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 05:56:50 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:56:50 -0500 Subject: owners owners.list,1.691,1.692 Message-ID: <200603020557.k225vNYR021545@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21528/owners Modified Files: owners.list Log Message: Take ownership of planet Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.691 retrieving revision 1.692 diff -u -r1.691 -r1.692 --- owners.list 2 Mar 2006 05:41:19 -0000 1.691 +++ owners.list 2 Mar 2006 05:56:50 -0000 1.692 @@ -1068,6 +1068,7 @@ Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org| Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|plib|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 06:23:30 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 2 Mar 2006 01:23:30 -0500 Subject: rpms/mock/devel mock.spec,1.11,1.12 Message-ID: <200603020624.k226O2H4023543@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23526 Modified Files: mock.spec Log Message: checking in to rebuild Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mock.spec 24 Jan 2006 17:16:33 -0000 1.11 +++ mock.spec 2 Mar 2006 06:23:30 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -68,6 +68,9 @@ %changelog +* Thu Mar 2 2006 Seth Vidal - 0.4-6 +- iterate for gcc rebuild and fc5 final + * Tue Jan 24 2006 Dan Williams - 0.4-5 - Back out setpgrp patch, found a better way to do it in plague From fedora-extras-commits at redhat.com Thu Mar 2 06:39:24 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:39:24 -0500 Subject: rpms/heartbeat - New directory Message-ID: <200603020639.k226dQRe023659@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23651/heartbeat Log Message: Directory /cvs/extras/rpms/heartbeat added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 06:39:29 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:39:29 -0500 Subject: rpms/heartbeat/devel - New directory Message-ID: <200603020639.k226dVd9023674@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23651/heartbeat/devel Log Message: Directory /cvs/extras/rpms/heartbeat/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 06:39:52 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:39:52 -0500 Subject: rpms/heartbeat Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603020639.k226dsh7023708@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696 Added Files: Makefile import.log Log Message: Setup of module heartbeat --- NEW FILE Makefile --- # Top level Makefile for module heartbeat all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 2 06:39:58 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:39:58 -0500 Subject: rpms/heartbeat/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603020640.k226e07P023728@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module heartbeat --- NEW 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 Mar 2 06:41:33 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:41:33 -0500 Subject: rpms/heartbeat import.log,1.1,1.2 Message-ID: <200603020642.k226g6Te023839@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23791 Modified Files: import.log Log Message: auto-import heartbeat-2.0.3-9 on branch devel from heartbeat-2.0.3-9.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/heartbeat/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Mar 2006 06:39:52 -0000 1.1 +++ import.log 2 Mar 2006 06:41:33 -0000 1.2 @@ -0,0 +1 @@ +heartbeat-2_0_3-9:HEAD:heartbeat-2.0.3-9.src.rpm:1141281682 From fedora-extras-commits at redhat.com Thu Mar 2 06:41:39 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:41:39 -0500 Subject: rpms/heartbeat/devel heartbeat-2.0.3-fedora-ccmuser.patch, NONE, 1.1 heartbeat-2.0.3-fedora-chkconfig.patch, NONE, 1.1 heartbeat-2.0.3-fedora-pam.patch, NONE, 1.1 heartbeat.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603020642.k226gBlt023843@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23791/devel Modified Files: .cvsignore sources Added Files: heartbeat-2.0.3-fedora-ccmuser.patch heartbeat-2.0.3-fedora-chkconfig.patch heartbeat-2.0.3-fedora-pam.patch heartbeat.spec Log Message: auto-import heartbeat-2.0.3-9 on branch devel from heartbeat-2.0.3-9.src.rpm heartbeat-2.0.3-fedora-ccmuser.patch: --- NEW FILE heartbeat-2.0.3-fedora-ccmuser.patch --- diff -Nur heartbeat-2.0.3.orig/cts/CM_LinuxHAv2.py.in heartbeat-2.0.3/cts/CM_LinuxHAv2.py.in --- heartbeat-2.0.3.orig/cts/CM_LinuxHAv2.py.in 2006-02-08 22:58:57.000000000 +0100 +++ heartbeat-2.0.3/cts/CM_LinuxHAv2.py.in 2006-03-01 20:09:19.000000000 +0100 @@ -325,7 +325,7 @@ "root@" + (self["CIBfile"]%node)): raise ValueError("Can not scp file to %s "%node) - self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUID@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") + self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUSER@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") def prepare(self): '''Finish the Initialization process. Prepare to test...''' heartbeat-2.0.3-fedora-chkconfig.patch: --- NEW FILE heartbeat-2.0.3-fedora-chkconfig.patch --- diff -Nur heartbeat-2.0.3.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.3/heartbeat/init.d/heartbeat.in --- heartbeat-2.0.3.orig/heartbeat/init.d/heartbeat.in 2005-09-10 23:46:23.000000000 +0200 +++ heartbeat-2.0.3/heartbeat/init.d/heartbeat.in 2006-02-28 22:07:00.000000000 +0100 @@ -13,7 +13,7 @@ # We don't hate anyone, and like for everyone to use # our software, no matter what OS or distribution you're using. # -# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ +# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ # description: Startup script high-availability services. # processname: heartbeat # pidfile: @localstatedir@/run/heartbeat.pid @@ -51,18 +51,6 @@ RUNDIR=@localstatedir@/run if - [ -r /etc/SuSE-release ] -then - # rc.status is new since SuSE 7.0 - [ -r /etc/rc.status ] && . /etc/rc.status - [ -r /etc/rc.config ] && . /etc/rc.config - - # Determine the base and follow a runlevel link name. - base=${0##*/} - link=${base#*[SK][0-9][0-9]} - -fi -if [ -z "$rc_done" ] then rc_done="Done." @@ -391,12 +379,7 @@ StartHA RC=$? Echo - if - [ $RC -eq 0 ] - then - [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR - touch $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && touch /var/lock/subsys/heartbeat RunStartStop post-start $RC ;; @@ -413,11 +396,7 @@ StopHA RC=$? Echo - if - [ $RC -eq 0 ] - then - rm -f $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && rm -f /var/lock/subsys/heartbeat RunStartStop post-stop $RC StopLogd ;; diff -Nur heartbeat-2.0.3.orig/ldirectord/init.d/ldirectord heartbeat-2.0.3/ldirectord/init.d/ldirectord --- heartbeat-2.0.3.orig/ldirectord/init.d/ldirectord 2005-10-17 14:49:21.000000000 +0200 +++ heartbeat-2.0.3/ldirectord/init.d/ldirectord 2006-02-25 22:57:16.000000000 +0100 @@ -2,7 +2,7 @@ # # ldirectord Linux Director Daemon # -# chkconfig: 2345 92 40 +# chkconfig: - 92 40 # description: Start and stop ldirectord on non-heartbeat systems # Using the config file /etc/ha.d/ldirectord.cf # @@ -59,9 +59,11 @@ case "$1" in start) action "Starting ldirectord" $DAEMON start + touch /var/lock/subsys/ldirectord ;; stop) action "Stopping ldirectord" $DAEMON stop + rm -f /var/lock/subsys/ldirectord ;; restart) action "Restarting ldirectord" $DAEMON restart heartbeat-2.0.3-fedora-pam.patch: --- NEW FILE heartbeat-2.0.3-fedora-pam.patch --- diff -Nur heartbeat-2.0.3.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.3/mgmt/daemon/mgmtd.pam --- heartbeat-2.0.3.orig/mgmt/daemon/mgmtd.pam 2005-12-30 09:35:27.000000000 +0100 +++ heartbeat-2.0.3/mgmt/daemon/mgmtd.pam 2006-02-12 17:12:13.000000000 +0100 @@ -1,3 +1,8 @@ -auth required pam_unix.so -account required pam_unix.so - +#%PAM-1.0 +auth sufficient pam_rootok.so +auth sufficient pam_timestamp.so +auth required pam_stack.so service=system-auth +session required pam_permit.so +session optional pam_xauth.so +session optional pam_timestamp.so +account required pam_permit.so --- NEW FILE heartbeat.spec --- %define ENABLE_SNMP_SUBAGENT 0 %define ENABLE_MGMT 1 %define uid 24 %define gname haclient %define uname hacluster Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat Version: 2.0.3 Release: 9%{?dist} License: GPL/LGPL URL: http://linux-ha.org/ Group: System Environment/Daemons Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz Patch0: heartbeat-2.0.3-fedora-pam.patch Patch1: heartbeat-2.0.3-fedora-chkconfig.patch Patch2: heartbeat-2.0.3-fedora-ccmuser.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel BuildRequires: iputils BuildRequires: openssl-devel BuildRequires: libnet-devel BuildRequires: libtool-ltdl-devel #BuildRequires: fedora-usermgmt BuildRequires: net-snmp-devel BuildRequires: bzip2-devel %if %{ENABLE_MGMT} BuildRequires: gnutls-devel BuildRequires: pam-devel BuildRequires: python-devel BuildRequires: swig %endif Requires: stonith = %{version}-%{release} Requires: pils = %{version}-%{release} Requires: ldirectord = %{version}-%{release} Requires: pygtk2 >= 2.4 Requires(pre): fedora-usermgmt Requires(postun): fedora-usermgmt Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig %if %{ENABLE_MGMT} Requires: gettext %endif %description heartbeat is a basic high-availability subsystem for Linux-HA. It will run scripts at initialization, and when machines go up or down. This version will also perform IP address takeover using gratuitous ARPs. It supports "n-node" clusters with significant capabilities for managing resources and dependencies. In addition it continues to support the older release 1 style of 2-node clustering. It implements the following kinds of heartbeats: - Serial ports - UDP/IP multicast (ethernet, etc) - UDP/IP broadcast (ethernet, etc) - UDP/IP heartbeats - "ping" heartbeats (for routers, switches, etc.) (to be used for breaking ties in 2-node systems) %package -n ldirectord Summary: Monitor daemon for maintaining high availability resources Group: System Environment/Daemons Requires: ipvsadm Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig %description -n ldirectord ldirectord is a stand-alone daemon to monitor services of real for virtual services provided by The Linux Virtual Server (http://www.linuxvirtualserver.org/). It is simple to install and works with the heartbeat code (http://www.linux-ha.org/). %package -n stonith Requires: pils = %{version}-%{release} Summary: Provides an interface to Shoot The Other Node In The Head Group: System Environment/Daemons %description -n stonith The STONITH module (a.k.a. STOMITH) provides an extensible interface for remotely powering down a node in the cluster. The idea is quite simple: When the software running on one machine wants to make sure another machine in the cluster is not using a resource, pull the plug on the other machine. It's simple and reliable, albeit admittedly brutal. %package -n pils Summary: Provides a general plugin and interface loading library Group: System Environment/Daemons %description -n pils PILS is an generalized and portable open source Plugin and Interface Loading System. PILS was developed as part of the Open Cluster Framework reference implementation, and is designed to be directly usable by a wide variety of other applications. PILS manages both plugins (loadable objects), and the interfaces these plugins implement. PILS is designed to support any number of plugins implementing any number of interfaces. %package devel Summary: Heartbeat development package Group: System Environment/Daemons Requires: heartbeat = %{version}-%{release} %description devel Heartbeat development package %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %build # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness' CFLAGS=${RPM_OPT_FLAGS} \ %configure \ --disable-fatal-warnings \ --disable-static \ %if %{ENABLE_MGMT} --enable-mgmt %else --disable-mgmt %endif make %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install ( cd $RPM_BUILD_ROOT/etc/ha.d/resource.d ln -s /usr/sbin/ldirectord ldirectord ) # cleanup [ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man [ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} ';' sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crmtest/helper.sh chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/pymgmt.py %clean if [ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ]; then rm -rf $RPM_BUILD_ROOT fi rm -rf $RPM_BUILD_DIR/heartbeat-%{version} %pre /usr/sbin/fedora-groupadd %{uid} -r %{gname} &>/dev/null || : /usr/sbin/fedora-useradd %{uid} -r -s /sbin/nologin -d /var/lib/heartbeat/cores/hacluster -M \ -c 'heartbeat user' -g %{gname} %{uname} &>/dev/null || : %post /sbin/ldconfig /sbin/chkconfig --add heartbeat %preun /sbin/chkconfig --del heartbeat %postun /sbin/ldconfig test "$1" != 0 || /usr/sbin/fedora-userdel %{uname} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || : %post -n ldirectord /sbin/chkconfig --add ldirectord %preun -n ldirectord /sbin/chkconfig --del ldirectord %post -n stonith -p /sbin/ldconfig %postun -n stonith -p /sbin/ldconfig %files %doc %{_datadir}/doc/%{name}-%{version} %defattr(-,root,root) %dir %{_sysconfdir}/ha.d %{_sysconfdir}/ha.d/harc %config(noreplace) %{_sysconfdir}/ha.d/shellfuncs %{_sysconfdir}/ha.d/rc.d %config(noreplace) %{_sysconfdir}/ha.d/README.config %{_libdir}/heartbeat %{_libdir}/libapphb.so.* %{_libdir}/libccmclient.so.* %{_libdir}/libcib.so.* %{_libdir}/libclm.so.* %{_libdir}/libcrmcommon.so.* %{_libdir}/libhbclient.so.* %{_libdir}/liblrm.so.* %{_libdir}/libpengine.so.* %{_libdir}/libplumb.so.* %{_libdir}/libplumbgpl.so.* %{_libdir}/librecoverymgr.so.* %{_libdir}/libstonithd.so.* %{_prefix}/lib/ocf %{_sysconfdir}/ha.d/resource.d/ %exclude %{_sysconfdir}/ha.d/resource.d/ldirectord %{_sysconfdir}/init.d/heartbeat %config(noreplace) %{_sysconfdir}/logrotate.d/heartbeat %dir %{_var}/lib/heartbeat %dir %{_var}/lib/heartbeat/cores %dir %attr (0755, root, root) %{_var}/lib/heartbeat/cores/root %dir %attr (0755, nobody, nobody) %{_var}/lib/heartbeat/cores/nobody %dir %attr (0755, hacluster, haclient) %{_var}/lib/heartbeat/cores/hacluster %dir %{_var}/run/heartbeat %attr (0755, hacluster, haclient) %{_bindir}/cl_status %{_bindir}/cl_respawn %{_sbindir}/crmadmin %{_sbindir}/cibadmin %{_sbindir}/ccm_tool %{_sbindir}/crm_diff %{_sbindir}/crm_uuid %{_sbindir}/crm_mon %{_sbindir}/iso8601 %{_sbindir}/crm_master %{_sbindir}/crm_standby %{_sbindir}/crm_attribute %{_sbindir}/crm_resource %{_sbindir}/crm_verify %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm %dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm %{_mandir}/man1/cl_status.1* %{_mandir}/man1/ha_logger.1* %{_mandir}/man1/hb_standby.1* %{_mandir}/man1/hb_takeover.1* %{_mandir}/man1/hb_addnode.1* %{_mandir}/man1/hb_delnode.1* %{_mandir}/man8/heartbeat.8* %{_mandir}/man8/apphbd.8* %{_mandir}/man8/ha_logd.8* %if %{ENABLE_SNMP_SUBAGENT} /LINUX-HA-MIB.mib %endif %if %{ENABLE_MGMT} %{_libdir}/libhbmgmt.so.* %{_libdir}/libhbmgmtclient.so.* %{_libdir}/libhbmgmtcommon.so.* %{_libdir}/libhbmgmttls.so.* %config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd %{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo %endif %files -n ldirectord %doc doc/COPYING %doc doc/README %doc ldirectord/ldirectord.cf %defattr(-,root,root) %{_sysconfdir}/ha.d/conf %{_sbindir}/ldirectord %{_sbindir}/supervise-ldirectord-config %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord %{_sysconfdir}/init.d/ldirectord %{_sysconfdir}/ha.d/resource.d/ldirectord %{_mandir}/man8/ldirectord.8* %{_mandir}/man8/supervise-ldirectord-config.8* %files -n stonith %doc doc/COPYING %doc doc/README %defattr(-,root,root) %{_libdir}/*.so.* %{_libdir}/stonith/ %{_sbindir}/stonith %{_sbindir}/meatclient %{_mandir}/man8/stonith.8* %{_mandir}/man8/meatclient.8* %files -n pils %doc doc/COPYING %doc doc/README %defattr(-,root,root) %{_libdir}/pils/ %files devel %doc %{_datadir}/doc/%{name}-%{version} %defattr(-,root,root) %{_includedir}/heartbeat/ %{_includedir}/clplumbing/ %{_includedir}/saf/ %{_includedir}/ocf/ %{_includedir}/stonith/ %{_includedir}/pils/ %{_libdir}/*.so %changelog * Wed Mar 1 2006 Joost Soeterbroek - 2.0.3-9 - changed user creation - added patch2 heartbeat-2.0.3-fedora-ccmuser.patch * Wed Mar 1 2006 Joost Soeterbroek - 2.0.3-8 - specifically excluded ldirectord symlink from heartbeat package - removed user and group deletion in postun - renamed subpackages ldirectord, pils and stonith to lose prefix heartbeat by using -n * Tue Feb 28 2006 Joost Soeterbroek - 2.0.3-7 - fixed more rpmlint errors and warnings * Sat Feb 25 2006 Joost Soeterbroek - 2.0.3-6 - fixed number of rpmlint warnings and errors (still ignores some..) - generate 'predictable' uid and gid with fedora-usermgmt to use with configure flag -with-ccmuser-id and groupadd, useradd - added Buildreq's: libtool-ltdl-devel, fedora-usermgmt-setup net-snmp-devel, bzip2-devel - removed *.so duplication in heartbeat and heartbeat-devel - changed file sections * Fri Feb 24 2006 Joost Soeterbroek - 2.0.3-5 - useradd with fedora-usermgmt - added *.so file to -devel sub-package * Sat Feb 18 2006 Joost Soeterbroek - 2.0.3-4 - removed all perl requires; should be picked up by rpmbuild automagically - changed system user creation hacluster part to use baseid: (http://fedoraproject.org/wiki/Packaging/UserCreation) * Thu Feb 16 2006 Joost Soeterbroek - 2.0.3-3 - removed Requires: python and gnutls - changed _libdir/ocf -> _prefix/lib/ocf - reversed subpackages depend on basepackage - removed Req swig (kept BuildReq) - added Req pygtk2 * Wed Feb 15 2006 Joost Soeterbroek - 2.0.3-2 - fixes for various rpmlint errors and warnings - fixed setup -q - make subpackages depend on basepackage, not reverse - clean buildroot at beginning of install - replaced a number of hardcoded paths with RPM macros - Changed Group from Networking/Daemons to System Environment/Daemons - enable mgmt option * Sun Feb 12 2006 Joost Soeterbroek - 2.0.3-1 - rebuilt for Fedora Extras * Fri Feb 10 2006 Alan Robertson (see doc/AUTHORS file) + Version 2.0.3 - Bug fixes and significant new features. + Management Daemon/Library and GUI client + provide a management library for manamgement daemon and CIM provider + provide a management daemon and a basic GUI management tool + CIM enablement + CIM (Common Information Model) enablement - works with sblim-sfcb, OpenWBEM, and Pegasus CIMOMs - not yet compiled into our binary RPMs because of dependencies + CRM (Cluster Resource Manager) General + All shutdowns go via the PE/TE - preserves inter-resource ordering + Support for future changes to the CIB (depreciation of cib_fragment) + Overhaul of IPC and HA channel callback logic + Many improvments to the quality and quantity (reduced) of logging + CRMd + Timerless elections - when everyone has voted we're done + Use the replace notification from the CIB to re-update our copy with our view of our peers. + Reliably detect if the LRM connection is still active. + Elections + newer versions defer to older ones in DC elections (opposite of current behavior) + this means that only once the complete cluster has been upgraded will we start acting like the new version and accept new config options + it also means newer PE's and TE's (the most complex pieces) don't need "act like the old version" options and can rely on all slaves being at least as up-to-date as they are + people can run mixed clusters as long as they want (until they want the new PE features) + new DCs only update the version number in the CIB if they have a higher value + nodes that start and have a lower version than that stored in the CIB shut themselves down (the CRM part anyway) + this prevents an admin from introducing old nodes back into an upgraded cluster. It probably doesn't fully understand the config and may not support the actions the PE/TE requires. + CIB (Common Information Base daemon) + Make sure "query only" connections cant modify the CIB + Periodically dump some stats about what the CIB has been doing. + Verify there are no memory leaks + Performance enhancements + Prevent a single CIB client from blocking everyone else + Clients Can be notified of full CIB replacements + record_config_changes option in ha.cf for those worried about the amount of logging. Defaults to "on". + suppress_cib_writes CIB option replaced with in enable_config_writes ha.cf (enable_config_writes to be removed in 2.0.4) + Never write the status section to disk + Check permissions for the on-disk CIB at startup + Dont trash unreadable on-disk CIBs + Fix for updates made against the whole CIB (not just one section) + PEngine (Policy Engine) + Many improvements to the handling of resource groups + Support "anonymous" clones + Fix stonith ordering + Order DC shutdowns after everyone else's + Support short resource names (for group and clone resources) + The ordering and colocation of grouped resources is now optional + Support probing new nodes for active resources. + All "probe" actions are controlled by the PE. + No resource may be started until the probing is complete. + Do not probe for resources we know to be active on unprobed nodes + When looking for monitor ops, only mark it optional if it was already active on the node we're interested in. + Detect changes to class/type/provider/parameters and force a restart of the resource + New record_pengine_inputs option in ha.cf for those worried about the amount of logging. Defaults to "on". + Differentiate between config and processing errors + reduces the frequency that we need to log the complete CIB + Make notify for master/slave work + New CIB option: stop_orphan_actions (boolean) If a resource is no longer defined, we can optionally stop it + New CIB option: stop_orphan_actions (boolean) If a monitor op for a given interval is no longer defined, we can optionally stop it + Add support for time and phase-of-the-moon based constraints + Improved failure handling: avoiding false positives + Always create orphaned resources - so they show up in crm_mon + Do not require sequential clone numbers starting at 0 + TEngine (transition engine) + Detect old stonith ops + CLIs (Command Line interfaces) + Create a --one-shot option for crm_mon + Switch a number of CLI tools to use the new syncronous connections + Log errors to stderr where they will be seen and therefore useful + Support migration and un-migration of resources and resource groups + Create crm_verify for checking configuration validity + Simplify the passing of XML to cibadmin + Known open bugs worth mentioning: + 1075, 1080, 1081, 1084, 1085, 1064, 1069, 756, 984 + 1050, 1082, 1037, 1079 * Thu Sep 22 2005 Alan Robertson (see doc/AUTHORS file) + Version 2.0.2 - small bug fix only release + Fixed a bug in ping directive - it works again + Added a check to BasicSanityCheck to check ping and ping_group directives + fixed cl_status nodestatus to return 0 if a node has status "ping" + fixed a memory leak in the CRM's LRM interface code + fixed code which deterimines which version of the CRM becomes the DC when basic CIB schema versions differ. It now prefers the older version to be DC instead of the newer version. * Wed Sep 14 2005 Alan Robertson (see doc/AUTHORS file) + Version 2.0.1 - + Communication Layer + netstring encoding format is changed to be more efficient + add compression capability for big messages + Add man pages for hb_standby/hb_takeover + The assert triggered by 2.0.0 has been fixed + CIB can now contain XML comments and/or be in DOS format + Includes implementation of the ISO8601 date format + New CLI tools for changing cluster preferences, node attributes and node standby + Improved recovery and placement of group resources + Detection of failed nodes by the Policy Engine is fixed + New Policy Engine features http://www.linux-ha.org/ClusterResourceManager/DTD1.0/Annotated : sections 1.5.[8,9,10,12] + Constraints and instance attributes can now be active conditionally + Rules can now contain other rules + Date/Time based expressions are supported + Cloned resources can now optionally be notified before and after any of its peers are stopped or started. + The cluster can re-evaluate the configuration automatically after a defined interval of idleness + Removed a flow control message which was very annoying when operating in a mixed 1.x/2.x environment -- Known Bugs :-( -- - Bug 859 - FSA took too long to complete action - fully recovered from - Bug 882 - IPC channel not connected during shutdown - harmless - Bug 879 - Failed actions cause extra election - harmless Each of these occurs about once or twice in 5000 test iterations - This is probably > 10K failovers - rsc_location constraints cannot have rules that contain other rules (fixed in CVS after release) * Fri Jul 29 2005 Alan Robertson (see doc/AUTHORS file) + Version 2.0.0 - First stable release of the next generation of the Linux-HA project + Basic Characteristics described here: http://linux-ha.org/FactSheetv2 + Core infrastructure improvments: + Messaging (message acknowledging and flow control) + Logging (logging daemon) + Release 1.x style (2-node) clusters fully supported + Multi-node support (so far up to 16-node clusters tested) See http://linux-ha.org/GettingStartedV2 for more information + New components: + Cluster Information Base (replicated resource configuration) + Cluster Resource Manager (supporting 1->N nodes) + Modular Policy Engine (controlling resource placement) + Local Resource Manager (policy free, not cluster aware) + Stonith Daemon (stand-alone fencing subsytem) + Support for OCF and LSB resource agents + Support for composite resource types (groups, clones) + Support for a rich set of resource location and ordering constraints + Conversion tool for existing haresources + Resources monitored by request + Resource "maintenance" mode + Several failback, failure and "No Quorum" behaviours to choose from (global defaults and per action or resource) + Sample cluster state and configuration monitoring tools Known issues in 2.0.0: - Under some rare circumstances the cluster manager will time out while stabilizing a new cluster state. This appears to be otherwise harmless - the cluster is actually fine. http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=770 - Under some rare circumstances, a dev assert will be triggered in unpack.c. This results in the pengine getting restarted. This is annoying, but not a disaster. http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=797 * Tue May 23 2005 Alan Robertson (see doc/AUTHORS file) + Version 1.99.5 - Near-final beta of 2.0.0 release + many bug fixes - code looks very stable at this point -- well tested at this point on 4 and 8 node clusters. * Thu Apr 07 2005 Alan Robertson (see doc/AUTHORS file) + Version 1.99.4 - Near-final beta of 2.0.0 release + many bug fixes since 1.99.1 + new external STONITH model - fully supports scripting interface + tested through 12 node clusters successfully + No serious defects found in testing + Easier-to-understand locational constraints model + Many bug fixes of many kinds + Important bug fixes to OCF IPaddr resource agent + Resources are monitored only on request + See http://wiki.linux-ha.org/ClusterResourceManager/Setup for basic ideas about getting started. + Release 1 style (2-node) clusters still fully supported + Release 2 style clusters support 1-N node clusters (where N is probably something like 8-32) * Tue Mar 20 2005 Alan Robertson (see doc/AUTHORS file) + Version 1.99.3 - Near-final beta "technology preview" of 2.0.0 release + many bug fixes since 1.99.1 + tested through 12 node clusters with reasonable success + new STONITH API * Sun Feb 20 2005 Alan Robertson (see doc/AUTHORS file) + Version 1.99.2 - Near-final beta "technology preview" of 2.0.0 release + Many many many changes. Far too many to describe here. + See http://wiki.linux-ha.org/ClusterResourceManager/Setup for certain basic ideas about getting started. * Mon Oct 11 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.99.1 - *early* beta series - preparing for 2.0.0 + Andrew provided a number of fixes to the CRM and 2.0 features + Fixed a problem with retrying failed STONITH operations * Mon Oct 11 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.99.0 - *early* beta series - preparing for 2.0.0 + All STABLE changes noted below have been ported to this branch + Included in this release is a beta of the next generation of Heartbeat resource manager developed by Andrew Beekhof. http://linuxha.trick.ca/NewHeartbeatDesign is a good place to learn more about this effort. Please examine crm/README, crm/test/README and crm/crm-1.0.dtd for example usage and configuration. + Also included is the L(ocal) R(esource) M(anager) developed by IBM China which is an integral part of the NewHeartbeatDesign. + Known caveats: - STONITH as a whole has seen a code cleanup and should be tested carefully. - The external STONITH plug-in has undergone major surgery and probably doesn't work yet. - the new CRM is not perfectly stable with 3 nodes yet. + PLEASE see http://osdl.org/developer_bugzilla/enter_bug.cgi?product=Linux-HA and use it to report quirks and issues you find! * Sat Sep 18 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.2.3 (stable) + fixed a serious error which causes heartbeat to misbehave after about 10 months of continuous operation + Made our ARP packets more RFC compliant + Extended apcmastersnmp code to deal with new devices + fixed a bug concerning simultaneous stops of both machines causing one of them to not shut down. + added an option to suppress reporting on packet corruption + fixed it so that we don't create the FIFO by the RPM + made cl_status setgid so anyone can run it, and fixed exit codes + eliminated a serious memory leak associated with client code + packaged doc files which had been missed before + fixed many many small bugs and memory leaks detected by BEAM + added several new test cases + fixed longstanding bug in plugin unloading + fixed a shutdown hang problem + several fixes for Solaris, FreeBSD + Solaris packaging now included in base + fixed a bug related to the apache resource agent not handling quoted parameters + added use_apphbd parameter to have heartbeat register with apphbd instead of watchdog device when desired + changed apphbd to default its config file to /etc + added snmp subagent code + added hbaping communications plugin + added external STONITH plugin + ldirectord: fixed a bug where real servers that were are present in multiple virtual services will only be added to one virtual service. * Mon May 11 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.2.2 (stable) + Fixed several format string errors in communication plugins + Fixed a bug which kept us from diagnosing errors in non-aliased interfaces + Fixed a bug in ipaddr which caused an infinite loop when auto_failback on + Updated Debian things... + Added IPv6addr resource agent + Added ibmhmc STONITH plugin + Added cl_status command + Fixed a bug regarding restarts when auto_failback is on... + Fixed a couple of bugs in sha1 authentication method for very long keys + Fixed a bug in the portblock resource agent so that it no longer blocks ports on the loopback interface + Increased the time allowed for split brain test before it declares failure + Version 1.2.1 (stable) + Netstrings can now be used for our on-the-wire data format + Perl/SWIG bindings added for some heartbeat libraries + Significant improvements to SAF data checkpointing API + Implemented unbuffered ipcsocket code for SAF APIs + Many Solaris fixes -- except for ipfail, Solaris works + Significant library restructuring + Watchdog device NOWAYOUT is now overridded if defaulted + Watchdog device now kills machine instantly after deadtime instead of after one minute + Hostnames should now be treated case-independently... + Added new client status APIs - client_status() and cstatus_callback() + Fixed bug with auto_failback and quick full restarts + We now automatically reboot when resources fail to stop correctly... + We now check the status of the configured STONITH device hourly... + STONITH operations repeat after a 5 second delay, not immediately... + Added hb_takeover command - complement to hb_standby + Added documentation on how to use evlog/TCP to enable testing to take place without losing messages due to UDP message forwarding + Several new tests from Mi, Jun - split brain, bandwidth, failure detection time. + Fix to LVM resource from Harald Milz + Fixed FreeBSD authentication problems breaking ipfail + Fixed .so loading on Debian + Fixed false complaints about resource scripts (from Jens Schmalzing) + Fixed false stop failure from LinuxSCSI (from Jens Schmalzing ) * Thu Apr 15 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.3.0 - beta series + Netstrings can now be used for our on-the-wire data format + Perl/SWIG bindings added for some heartbeat libraries + Significant improvements to SAF data checkpointing API + Implemented unbuffered ipcsocket code for SAF APIs + Many Solaris fixes -- except for ipfail, Solaris works + Significant library restructuring + Watchdog device NOWAYOUT is now overridded if defaulted + Watchdog device now kills machine instantly after deadtime instead of after one minute + Hostnames should now be treated case-independently... + Added new client status APIs - client_status() and cstatus_callback() + Fixed bug with auto_failback and quick full restarts + We now automatically reboot when resources fail to stop correctly... + We now check the status of the configured STONITH device hourly... + STONITH operations repeat after a 5 second delay, not immediately... + Added hb_takeover command - complement to hb_standby + Added documentation on how to use evlog/TCP to enable testing to take place without losing messages due to UDP message forwarding + Several new tests from Mi, Jun - split brain, bandwidth, failure detection time. + Fix to LVM resource from Harald Milz * Tue Feb 16 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.2.0 + Replaced the nice_failback option with the auto_failback option. THIS OBSOLETES THE NICE_FAILBACK OPTION. READ THE DOCS FOR HOW TO UPGRADE SMOOTHLY. + Added a new feature to hb_standby which allows you to give up any specific category of resources: local, foreign, or all. The old behavior is "all" which is the default. This allows you to put a auto_failback no cluster into an active/active configuration on demand. + ipfail now works properly with auto_failback on (active/active) + ipfail now has "hysteresis" so that it doesn't respond immediately to a network failure, but waits a little while so that the damage can be properly assessed and extraneous takeovers avoided + Added new ping node timeout directive "deadping" + Made sure heartbeat preallocated stack and heap, and printed a message if we allocate heap once we're started up... + IPMILan STONITH plugin added to CVS + Added IPaddr2 resource script + Made the APC smart UPS ups code compatible with more UPSes + Added a (preliminary?) ordered messaging facility from Yi Zhu + Changed IPaddr's method of doing ARPs in background so that certain timing windows were closed. + Added OCF (wrapper) resource script + Allow respawn programs to take arguments + Added pinggroups (where any node being up is OK) + SIGNIFICANT amount of internal rearchitecture. + Many bug fixes. + Several documentation updates. * Tue Feb 10 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.1.5 + ipfail now has "hysteresis" so that it doesn't respond immediately to a network failure, but waits a little while so that the damage can be properly assessed and extraneous takeovers avoided + Several fixes to cl_poll() + More fixes to the IPC code - especially handling data reception after EOF + removed some unclean code from GSource for treating EOF conditions + Several bugs concerning hanging when shutting down early during startup + A few BasicSanityCheck bug fixes + CTS now allows a single machine to be able to monitor several clusters + Most former CTS options are now either unneeded or on the command line + Increased number of ARPs and how long they're being sent out + Fixed uncommon (authorization) memory leak + Some Solaris portability fixes. + Made init script handle standby correctly for new config files + Improved the fast failure detection test + Added some backwards compatibility for nice_failback and some default authentication directives + Corrected the 1.1.4 change log * Fri Jan 22 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.1.4 + ipfail now works properly with auto_failback on (active/active) + Changed the API to use sockets (IPC library) instead of FIFOs. + Added new apiauth directives to provide authorization information formerly provided by the FIFO permissions. + Added Intel's implementation of the SAF data checkpointing API and daemon + Added a cleanup suggested by Emily Ratliff. + IPMILan STONITH plugin added to CVS + Added IPaddr2 resource script + Various cleanups due to horms. + Fixed authentication to work on 64-bit platforms(!) + Fixed the cl_poll() code to handle corner cases better + Made heartbeat close watchdog device before re-execing itself + New CTS improvements from Mi, Jun + Various minor bug fixes. . Several shutdown bugs addressed . fixed sendarp to make a pid file, so we can shut it down when we shut everything else down in case it's still running. . Lots of minor bug fixes to IPC code . Lots of minor bug fixes to ipctest program . made BasicSanityCheck more tolerant of delays . Fixed IPC code to authenticate based on ints, not int*s. . Check properly for strnlen instead of strlen... . Several signed/unsigned fixes . A few uninitialized vars now are inited . Switched to compiling lex/yacc sources the automake way . Lots of minor CTS fixes... + ldirectord bug fixes: . When new real servers are added on initialisation or when the configuration file is reread they are marked with status of -1 (uninitialised) so they will be checked and inserted into the virtual service as required . All checks use the checkport if set, otherwise the port set for the individual real server. This was the case for http and connect checks, but others had variations on this theme. . When the configuration file is reread because it changed on disk and autoreload is set, check the real servers immediately rather than waiting for checkinterval to expire . Already running message sent to stderr instead of stdout . Support alternate server in real-server specific URL . Treat the same real server with different weights as a different real server. Fixes bug reported by Philip Hayward whereby the same real-server would always have the same weight, regardless of the ldirectord.cf * Fri Sep 26 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.1.3 + Bugfix for heartbeat starting resources twice concurrently if auto_failback was set to "legacy". + Bugfix for messages getting lost if messages were sent in quick succession. (Kurosawa Takahiro) + Bugfix for Filesystem resource checking for presence of filesystem support before loading the module. + BasicSanityCheck extended to cover more basic tests. + Bugfix for findif not working correctly for CIDR netmasks. + Minor bugfix for ldirectord recognizing new schedulers correctly and timeout settings are now being honoured. + Enhanced the message giving a better explanation of how to set up node names properly when current node not found in the ha.cf file + Send a message to the cluster whenever we have a node which doesn't need STONITHing - even though it's gone down. This fix needed by CCM, which is in turn needed by EVMS. + Enhanced the messages for missing ha.cf and missing haresources files explaining that sample config files are found in the documentation. + Fix for memory leak from Forrest Zhao + Added a (preliminary?) ordered messaging facility from Yi Zhu + FAQ updates + Added Xinetd resource script + Added OCF (wrapper) resource script + Allow respawn programs to take arguments + Added pinggroups (where any node being up is OK) + fixed ldirectord negotiatetimeout for HTTP + fixed a bug which caused -d flag to be ignored + failing resource scripts are now ERRORs not WARNings + now shuts down correctly when auto_failback == legacy * Mon Jul 13 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.1.2 + Replaced the nice_failback option with the auto_failback option. THIS OBSOLETES THE NICE_FAILBACK OPTION. READ THE DOCS FOR HOW TO UPGRADE SMOOTHLY. + Changed IPaddr to not do ARPs in background, and shortened time between ARPs. Also made these things tunable... + changed our comm ttys to not become our controlling TTYs + Enhanced the ServeRAID script to fix a critical bug by using a new feature + Added a new DirectoryMap to CVS - tells where everything is... + significantly enhanced the BasicSanityCheck script, and the tests it calls. + added a new option to use a replacement poll function for improved real-time performance. + added the ability to have a cluster node's name be different from it's uname -n + Moved where CTS gets installed to /usr/lib/heartbeat/cts + Big improvements to the CTS README from IBM test labs in Austin. + bug fixes to the WTI NPS power switch + new client API calls: return arbitrary configuration parameters return current resource status + Added a new clplumbing function: mssleep() + added new capabilities for supporting pseudo-resources + added new messages which come out after initial takeover is done (improves CTS results) + LOTS of documentation updates. + fixed a security vulnerability + fixed a bug where heartbeat would shut down while in the middle of processing resource movement requests. + changed compilation flags to eliminate similar future security issues + went to even-more-strict gcc flags + fixed several "reload" bugs. Now reload works ;-) + fixed STONITH bug when other node never heard from. + Minor bug fixes (cleaned up corrupted message) + Two different client API bugs fixed. + changed the configure script to test which warning flags are supported by the current gcc. + enhanced the API test program to test new capabilities... * Wed May 21 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.1.1 + Significant restructuring of the processes in heartbeat + Added a new feature to hb_standby which allows you to give up any specific category of resources: local, foreign, or all. The old behavior is "all" which is the default. This allows you to put a nice_failback cluster into an active/active configuration + Enhancements to the ServeRAID code to make it work with the new (supported) version of IPSSEND from the ServeRAID folks... + Added STONITH code for the Dell remote access controller + Fixed a major bug which kept it from taking over correctly after 246 days or so + Fixed a major bug where heartbeat didn't lock itself into memory properly + Added new ping node timeout directive "deadping" + Made sure heartbeat preallocated stack and heap, and printed a message if we allocate heap once we're started up... + Minor heartbeat API bug fixes + Minor documentation fixes + Minor fix to allow IP addresses with /32 masks... + Fixed a timing window for !nice_failback resource acquisition + Added several CCM bug fixes + Made the APC smart UPS ups code compatible with more UPSes + Fixed a bug in respawn + Enhanced internal checking for malloc errors... + Added IP alias search optimization from Sean Reifscheneider * Wed Mar 19 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.0.2: + Fixed comment errors in heartbeat init script to allow it to run on RH 8.0 + Changed apphbd to use poll(2) instead of sigtimedwait(2) + Put missing files into tarball + Documentation improvements for IPaddr and other things + Fixed an error in hb_standby which kept it from working if releasing resources takes more than 10 seconds + Added a fix to allow heartbeat to run on systems without writable disk (like routers booting from CD-ROM) + Added configuration file for apphbd + Added fix from Adam Li to keep recoverymgr stop looping at high priority + Added fix to ServeRAID resource to make it work with (new) supported hardware + Added Delay resource script + Added fix to Filesystem to allow it to support NFS mounts and allow user to specify mount options + Added fix to IPaddr to make tmp directory for restoring loopback device + Added fix to ipcsocket code to deal correctly with EAGAIN when sending message body * Mon Feb 17 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.0.1: + Fixed some compile errors on different platforms, and library versions + Disable ccm from running on 'ping' nodes + Put in Steve Snodgrass' fix to send_arp to make it work on non-primary interfaces. * Thu Feb 13 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.0.1 beta series 0.4.9g: + Changed default deadtime, warntime, and heartbeat interval + Auto* tool updates + VIP loopback fixes for IP address takeover + Various Solaris and FreeBSD fixes + added SNMP agent + Several CCM bug fixes + two new heartbeat API calls + various documentation fixes, including documentation for ipfail + Numerous minor cleanups. + Fixed a few bugs in the IPC code. + Fixed the (IPC) bug which caused apphbd to hang the whole machine. + Added a new IPC call (waitout) + Wrote a simple IPC test program. + Clarified several log messages. + Cleaned up the ucast communications plugin + Cleaned up for new C compilers + Fixed permissions bug in IPC which caused apphbd to not be usable by all + Added a new rtprio option to the heartbeat config file + updated apphbtest program + Changed ipfail to log things at same level heartbeat does * Sat Nov 30 2002 Alan Robertson (see doc/AUTHORS file) + Version 0.5 beta series (now renamed to 1.0.1 beta series). 0.4.9f: + Added pre-start, pre-stop, post-stop and pre-stop constructs in init script + various IPC fixes + Fix to STONITH behavior: STONITH unresponsive node right after we reboot + Fixed extreme latency in IPC code + various configure.in cleanups + Fixed memory leak in IPC socket code + Added streamlined mainloop/IPC integration code + Moved more heartbeat internal communication to IPC library + Added further support for ipfail + Added supplementary groups to the respawn-ed clients + Added standby to init script actions + Lots of minor CCM fixes + Split (most) resource management code into a separate file. + Fixes to accommodate different versions of libraries + Heartbeat API client headers fixup + Added new API calls + Simplified (and fixed) handling of local status. This would sometimes cause obscure failures on startup. + Added new IPsrcaddr resource script KNOWN BUGS: + apphbd goes into an infinite loop on some platforms * Wed Oct 9 2002 Alan Robertson (see doc/AUTHORS file) 0.4.9e: + Changed client code to keep write file descriptor open at all times (realtime improvement) + Added a "poll replacement" function based on sigtimedwait(2), which should be faster for those cases that can use it. + Added a hb_warntime() call to the application heartbeat API. + Changed all times in the configuration file to be in milliseconds if specified with "ms" at the end. (seconds is still the default). + Fixes to serious security issue due to Nathan Wallwork + Changed read/write child processes to run as nobody. + Fixed a bug where ping packets are printed incorrectly when debugging. + Changed heartbeat code to preallocate a some heap space. + CCM daemon API restructuring + Added ipc_channel_pair() function to the IPC library. + Changed everything to use longclock_t instead of clock_t + Fixed a bug concerning the ifwalk() call on ping nodes in the API + Made apphbd run at high priority and locked into memory + Made a library for setting priority up. + Made ucast comm module at least be configurable and loadable. + Fixed a startup/shutdown timing problem. 0.4.9d: + removed an "open" call for /proc/loadavg (improve realtime behavior) + changed API code to not 1-char reads from clients + Ignored certain error conditions from API clients + fixed an obscure error message about trying to retransmit a packet which we haven't sent yet. This happens after restarts. + made the PILS libraries available in a separate package + moved the stonith headers to stonith/... when installed + improved debugging for NV failure cases... + updated AUTHORS file and simplified the changelog authorship (look in AUTHORS for the real story) + Added Ram Pai's CCM membership code + Added the application heartbeat code + Added the Kevin Dwyer's ipfail client code to the distribution + Many fixes for various tool versions and OS combinations. + Fixed a few bugs related to clients disconnecting. + Fixed some bugs in the CTS test code. + Added BasicSanityCheck script to tell if built objects look good. + Added PATH-like capabilities to PILS + Changed STONITH to use the new plugin system. + *Significantly* improved STONITH usage message (from Lorn Kay) + Fixed some bugs related to restarting. + Made exit codes more LSB-compliant. + Fixed various things so that ping nodes don't break takeovers. 0.4.9c and before: + Cluster partitioning now handled correctly (really!) + Complete rearchitecture of plugin system + Complete restructure of build system to use automake and port things to AIX, FreeBSD and solaris. + Added Lclaudio's "standby" capability to put a node into standby mode on demand. + Added code to send out gratuitous ARP requests as well as gratuitous arp replies during IP address takeover. + Suppress stonith operations for nodes which went down gracefully. + Significantly improved real-time performance + Added new unicast heartbeat type. + Added code to make serial ports flush stale data on new connections. + The Famous CLK_TCK compile time fixes (really!) + Added a document which describes the heartbeat API + Changed the code which makes FIFOs to not try and make the FIFOs for named clients, and several other minor API client changes. + Fixed a fairly rare client API bug where it would shut down the client for no apparent reason. + Added stonith plugins for: apcmaster, apcmastersnmp switches, and ssh module (for test environments only) + Integrated support for the Baytech RPC-3 switch into baytech module + Fixes to APC UPS plugin + Got rid of "control_process: NULL message" message + Got rid of the "controlfifo2msg: cannot create message" message + Added -h option to give usage message for stonith command... + Wait for successful STONITH completion, and retry if its configured. + Sped up takeover code. + Several potential timing problems eliminated. + Cleaned up the shutdown (exit) code considerably. + Detect the death of our core child processes. + Changed where usage messages go depending on exit status from usage(). + Made some more functions static. + Real-time performance improvement changes + Updated the faqntips document + Added a feature to heartbeat.h so that log messages get checked as printf-style messages on GNU C compilers + Changed several log messages to have the right parameters (discovered as a result of the change above) + Numerous FreeBSD, Solaris and OpenBSD fixes. + Added backwards compatibility kludge for udp (versus bcast) + Queued messages to API clients instead of throwing them away. + Added code to send out messages when clients join, leave. + Added support for spawning and monitoring child clients. + Cleaned up error messages. + Added support for DB2, ServeRAID and WAS, LVM, and Apache (IBMhttp too), also ICP Vortex controller. + Added locking when creating new IP aliases. + Added a "unicast" media option. + Added a new SimulStart and standby test case. + Diddled init levels around... + Added an application-level heartbeat API. + Added several new "plumbing" subsystems (IPC, longclock_t, proctrack, etc.) + Added a new "contrib" directory. + Fixed serious (but trivial) bug in the process tracking code which caused it to exit heartbeat - this occured repeatably for STONITH operations. + Write a 'v' to the watchdog device to tell it not to reboot us when we close the device. + Various ldirectord fixes due to Horms + Minor patch from Lorn Kay to deal with loopback interfaces which might have been put in by LVS direct routing + Updated AUTHORS file and moved list of authors over * Fri Mar 16 2001 Alan Robertson + Version 0.4.9 + Split into 3 rpms - heartbeat, heartbeat-stonith heartbeat-ldirectord + Made media modules and authentication modules and stonith modules dynamically loadable. + Added Multicast media support + Added ping node/membership/link type for tiebreaking. This will be useful when implementing quorum on 2-node systems. (not yet compatible with nice_failback(?)) + Removed ppp support + Heartbeat client API support + Added STONITH API library + support for the Baytech RPC-3A power switch + support for the APCsmart UPS + support for the VACM cluster management tool + support for WTI RPS10 + support for Night/Ware RPC100S + support for "Meatware" (human intervention) module + support for "null" (testing only) module + Fixed startup timing bugs + Fixed shutdown sequence bugs: takeover occured before resources were released by other system + Fixed various logging bugs + Closed holes in protection against replay attacks + Added checks that complain if all resources aren't idle on startup. + IP address takeover fixes + Endian fixes + Removed the 8-alias limitation + Takeovers now occur faster (ARPs occur asynchronously) + Port number changes + Use our IANA port number (694) by default + Recognize our IANA port number ("ha-cluster") if it's in /etc/services + Moved several files, etc. from /var/run to /var/lib/heartbeat + Incorporated new ldirectord version + Added late heartbeat warning for late-arriving heartbeats + Added detection of and partial recovery from cluster partitions + Accept multiple arguments for resource scripts + Added Raid1 and Filesystem resource scripts + Added man pages + Added debian package support * Fri Jun 30 2000 Alan Robertson + Version 0.4.8 + Incorporated ldirectord version 1.9 (fixes memory leak) + Made the order of resource takeover more rational: Takeover is now left-to-right, and giveup is right-to-left + Changed the default port number to our official IANA port number (694) + Regularized more messages, eliminated some redundant ones. + Print the version of heartbeat when starting. + Print exhaustive version info when starting with debug on. + Hosts now have 3 statuses {down, up, active} active means that it knows that all its links are operational, and it's safe to send cluster messages + Significant revisions to nice_failback (mainly due to lclaudio) + More SuSE-compatibility. Thanks to Friedrich Lobenstock + Tidied up logging so it can be to files, to syslog or both (Horms) + Tidied up build process (Horms) + Updated ldirectord to produce and install a man page and be compatible with the fwmark options to The Linux Virtual Server (Horms) + Added log rotation for ldirectord and heartbeat using logrotate if it is installed + Added Audible Alarm resource by Kirk Lawson and myself (Horms) + Added init script for ldirectord so it can be run independently of heartbeat (Horms) + Added sample config file for ldirectord (Horms) + An empty /etc/ha.d/conf/ is now part of the rpm distribution as this is where ldirectord's configuration belongs (Horms) + Minor startup script tweaks. Hopefully, we should be able to make core files should we crash in the future. Thanks to Holger Kiehl for diagnosing the problem! + Fixed a bug which kept the "logfile" option from ever working. + Added a TestCluster test utility. Pretty primitive so far... + Fixed the serial locking code so that it unlocks when it shuts down. + Lock heartbeat into memory, and raise our priority + Minor, but important fix from lclaudio to init uninited variable. * Sat Dec 25 1999 Alan Robertson + Version 0.4.7 + Added the nice_failback feature. If the cluster is running when the primary starts it acts as a secondary. (Luis Claudio Goncalves) + Put in lots of code to make lost packet retransmission happen + Stopped trying to use the /proc/ha interface + Finished the error recovery in the heartbeat protocol (and got it to work) + Added test code for the heartbeat protocol + Raised the maximum length of a node name + Added Jacob Rief's ldirectord resource type + Added Stefan Salzer's fix for a 'grep' in IPaddr which wasn't specific enough and would sometimes get IPaddr confused on IP addresses that prefix-matched. + Added Lars Marowsky-Bree's suggestion to make the code almost completely robust with respect to jumping the clock backwards and forwards + Added code from Michael Moerz to keep findif from core dumping if /proc/route can't be read. * Mon Nov 22 1999 Alan Robertson + Version 0.4.6 + Fixed timing problem in "heartbeat restart" so it's reliable now + Made start/stop status compatible with SuSE expectations + Made resource status detection compatible with SuSE start/stop expectations + Fixed a bug relating to serial and ppp-udp authentication (it never worked) + added a little more substance to the error recovery for the HB protocol. + Fixed a bug for logging from shell scripts + Added a little logging for initial resource acquisition + Added #!/bin/sh to the front of shell scripts + Fixed Makefile, so that the build root wasn't compiled into pathnames + Turned on CTSRTS, enabling for flow control for serial ports. + Fixed a bug which kept it from working in non-English environments * Wed Oct 13 1999 Alan Robertson + Version 0.4.5 + Mijta Sarp added a new feature to authenticate heartbeat packets using a variety of strong authentication techniques + Changed resource acquisition and relinquishment to occur in heartbeat, instead of in the start/stop script. This means you don't *really* have to use the start/stop script if you don't want to. + Added -k option to gracefully shut down current heartbeat instance + Added -r option to cause currently running heartbeat to reread config files + Added -s option to report on operational status of "heartbeat" + Sped up resource acquisition on master restart. + Added validation of ipresources file at startup time. + Added code to allow the IPaddr takeover script to be given the interface to take over, instead of inferring it. This was requested by Lars Marowsky-Bree + Incorporated patch from Guenther Thomsen to implement locking for serial ports used for heartbeats + Incorporated patch from Guenther Thomsen to clean up logging. (you can now use syslog and/or file logs) + Improved FreeBSD compatibility. + Fixed a bug where the FIFO doesn't get created correctly. + Fixed a couple of uninitialized variables in heartbeat and /proc/ha code + Fixed longstanding crash bug related to getting a SIGALRM while in malloc or free. + Implemented new memory management scheme, including memory stats * Thu Sep 16 1999 Alan Robertson + Version 0.4.4 + Fixed a stupid error in handling CIDR addresses in IPaddr. + Updated the documentation with the latest from Rudy. * Wed Sep 15 1999 Alan Robertson + Version 0.4.3 + Changed startup scripts to create /dev/watchdog if needed + Turned off loading of /proc/ha module by default. + Incorporated bug fix from Thomas Hepper to IPaddr for PPP configurations + Put in a fix from Gregor Howey where Gregor found that I had stripped off the ::resourceid part of the string in ResourceManager resulting in some bad calls later on. + Made it compliant with the FHS (filesystem hierarchy standard) + Fixed IP address takeover so we can take over on non-eth0 interface + Fixed IP takeover code so we can specify netmasks and broadcast addrs, or default them at the user's option. + Added code to report on message buffer usage on SIGUSR[12] + Made SIGUSR1 increment debug level, and SIGUSR2 decrement it. + Incorporated Rudy's latest "Getting Started" document + Made it largely Debian-compliant. Thanks to Guenther Thomsen, Thomas Hepper, I??aki Fern??ndez Villanueva and others. + Made changes to work better with Red Hat 6.1, and SMP code. + Sometimes it seems that the Master Control Process dies :-( * Sat Aug 14 1999 Alan Robertson + Version 0.4.2 + Implemented simple resource groups + Implemented application notification for groups starting/stopping + Eliminated restriction on floating IPs only being associated with eth0 + Added a uniform resource model, with IP resources being only one kind. (Thanks to Lars Marowsky-Bree for a good suggestion) + Largely rewrote the IP address takeover code, making it clearer, fit into the uniform resource model, and removing some restrictions. + Preliminary "Getting Started" document by Rudy Pawul + Improved the /proc/ha code + Fixed memory leak associated with serial ports, and problem with return of control to the "master" node. (Thanks to Holger Kiehl for reporting them, and testing fixes!) * Tue Jul 6 1999 Alan Robertson + Version 0.4.1 + Fixed major memory leak in 0.4.0 (oops!) + Added code to eliminate duplicate packets and log lost ones + Tightened up PPP/UDP startup/shutdown code + Made PPP/UDP peacefully coexist with "normal" udp + Made logs more uniform and neater + Fixed several other minor bugs + Added very preliminary kernel code for monitoring and controlling heartbeat via /proc/ha. Very cool, but not really done yet. * Wed Jun 30 1999 Alan Robertson + Version 0.4.0 + Changed packet format from single line positional parameter style to a collection of {name,value} pairs. A vital change for the future. + Fixed some bugs with regard to forwarding data around rings + We now modify /etc/ppp/ip-up.local, so PPP-udp works out of the box (at least for Red Hat) + Includes the first version of Volker Wiegand's Hardware Installation Guide (it's pretty good for a first version!) * Wed Jun 09 1999 Alan Robertson + Version 0.3.2 + Added UDP/PPP bidirectional serial ring heartbeat (PPP ensures data integrity on the serial links) + fixed a stupid bug which caused shutdown to give unpredictable results + added timestamps to /var/log/ha-log messages + fixed a couple of other minor oversights. * Sun May 10 1999 Alan Robertson + Version 0.3.1 + Make ChangeLog file from RPM specfile + Made ipresources only install in the DOC directory as a sample * Sun May 09 1999 Alan Robertson + Version 0.3.0 + Added UDP broadcast heartbeat (courtesy of Tom Vogt) + Significantly restructured code making it easier to add heartbeat media + added new directives to config file: + udp interface-name + udpport port-number + baud serial-baud-rate + made manual daemon shutdown easier (only need to kill one) + moved the sample ha.cf file to the Doc directory * Sat Mar 27 1999 Alan Robertson + Version 0.2.0 + Make an RPM out of it + Integrated IP address takeover gotten from Horms + Added support to tickle a watchdog timer whenever our heart beats + Integrated enough basic code to allow a 2-node demo to occur + Integrated patches from Andrew Hildebrand to allow it to run under IRIX. - Known Bugs - Only supports 2-node clusters - Only supports a single IP interface per node in the cluster - Doesn't yet include Tom Vogt's ethernet heartbeat code - No documentation - Not very useful yet :-) ########################################################### Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/heartbeat/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2006 06:39:58 -0000 1.1 +++ .cvsignore 2 Mar 2006 06:41:39 -0000 1.2 @@ -0,0 +1 @@ +heartbeat-2.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/heartbeat/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2006 06:39:58 -0000 1.1 +++ sources 2 Mar 2006 06:41:39 -0000 1.2 @@ -0,0 +1 @@ +ef926928325e7f4c1aaa51b93dffdcf4 heartbeat-2.0.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 06:45:28 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:45:28 -0500 Subject: owners owners.list,1.692,1.693 Message-ID: <200603020646.k226k0xU023927@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23898/owners Modified Files: owners.list Log Message: added heartbeat - Heartbeat subsystem for High-Availability Linux, fedora_AT_soeterbroek.com Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.692 retrieving revision 1.693 diff -u -r1.692 -r1.693 --- owners.list 2 Mar 2006 05:56:50 -0000 1.692 +++ owners.list 2 Mar 2006 06:45:28 -0000 1.693 @@ -412,6 +412,7 @@ Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org| 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|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|heartbeat|Heartbeat subsystem for High-Availability Linux|fedora at soeterbroek.com|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| Fedora Extras|Hermes|HERMES pixel format conversion library|thomas at apestaart.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 06:45:58 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 2 Mar 2006 01:45:58 -0500 Subject: rpms/git-core/devel .cvsignore, 1.21, 1.22 git.spec, 1.9, 1.10 sources, 1.21, 1.22 Message-ID: <200603020646.k226kVVq023939@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23896 Modified Files: .cvsignore git.spec sources Log Message: Update git to 1.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 23 Feb 2006 02:28:48 -0000 1.21 +++ .cvsignore 2 Mar 2006 06:45:58 -0000 1.22 @@ -1 +1 @@ -git-1.2.3.tar.gz +git-1.2.4.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/git.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- git.spec 23 Feb 2006 02:28:48 -0000 1.9 +++ git.spec 2 Mar 2006 06:45:58 -0000 1.10 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Mar 1 2006 Chris Wright 1.2.4-1 +- git-1.2.4 + * Wed Feb 22 2006 Chris Wright 1.2.3-1 - git-1.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 23 Feb 2006 02:28:48 -0000 1.21 +++ sources 2 Mar 2006 06:45:58 -0000 1.22 @@ -1 +1 @@ -8d03a39d4e2dea1339204b2d3cc41716 git-1.2.3.tar.gz +04b24119a7e3a0a6e322cd9cfc9b08ad git-1.2.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 06:47:51 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 2 Mar 2006 01:47:51 -0500 Subject: rpms/git-core/FC-4 .cvsignore, 1.21, 1.22 git.spec, 1.9, 1.10 sources, 1.21, 1.22 Message-ID: <200603020648.k226mOOo024036@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24011 Modified Files: .cvsignore git.spec sources Log Message: Update git to 1.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 23 Feb 2006 02:30:18 -0000 1.21 +++ .cvsignore 2 Mar 2006 06:47:51 -0000 1.22 @@ -1 +1 @@ -git-1.2.3.tar.gz +git-1.2.4.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/git.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- git.spec 23 Feb 2006 02:30:18 -0000 1.9 +++ git.spec 2 Mar 2006 06:47:51 -0000 1.10 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Mar 1 2006 Chris Wright 1.2.4-1 +- git-1.2.4 + * Wed Feb 22 2006 Chris Wright 1.2.3-1 - git-1.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 23 Feb 2006 02:30:18 -0000 1.21 +++ sources 2 Mar 2006 06:47:51 -0000 1.22 @@ -1 +1 @@ -8d03a39d4e2dea1339204b2d3cc41716 git-1.2.3.tar.gz +04b24119a7e3a0a6e322cd9cfc9b08ad git-1.2.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 06:50:14 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 2 Mar 2006 01:50:14 -0500 Subject: rpms/git-core/FC-3 .cvsignore, 1.21, 1.22 git.spec, 1.9, 1.10 sources, 1.21, 1.22 Message-ID: <200603020650.k226okNw024154@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24130 Modified Files: .cvsignore git.spec sources Log Message: Update git to 1.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 23 Feb 2006 02:31:33 -0000 1.21 +++ .cvsignore 2 Mar 2006 06:50:14 -0000 1.22 @@ -1 +1 @@ -git-1.2.3.tar.gz +git-1.2.4.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/git.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- git.spec 23 Feb 2006 02:31:33 -0000 1.9 +++ git.spec 2 Mar 2006 06:50:14 -0000 1.10 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Mar 1 2006 Chris Wright 1.2.4-1 +- git-1.2.4 + * Wed Feb 22 2006 Chris Wright 1.2.3-1 - git-1.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 23 Feb 2006 02:31:33 -0000 1.21 +++ sources 2 Mar 2006 06:50:14 -0000 1.22 @@ -1 +1 @@ -8d03a39d4e2dea1339204b2d3cc41716 git-1.2.3.tar.gz +04b24119a7e3a0a6e322cd9cfc9b08ad git-1.2.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 06:56:42 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 01:56:42 -0500 Subject: rpms/namazu/devel .cvsignore, 1.2, 1.3 namazu-fixinutf8.patch, 1.1, 1.2 namazu.spec, 1.2, 1.3 sources, 1.2, 1.3 namazu-2.0.13-de.patch, 1.1, NONE Message-ID: <200603020657.k226vFpc024241@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24215 Modified Files: .cvsignore namazu-fixinutf8.patch namazu.spec sources Removed Files: namazu-2.0.13-de.patch Log Message: * Thu Mar 2 2006 Akira TAGOH - 2.0.15-1 - New upstream release. - namazu-2.0.13-de.patch: removed. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 May 2005 02:23:25 -0000 1.2 +++ .cvsignore 2 Mar 2006 06:56:42 -0000 1.3 @@ -1 +1,2 @@ namazu-2.0.14.tar.gz +namazu-2.0.15.tar.gz namazu-fixinutf8.patch: Index: namazu-fixinutf8.patch =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/namazu-fixinutf8.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- namazu-fixinutf8.patch 30 May 2005 02:23:25 -0000 1.1 +++ namazu-fixinutf8.patch 2 Mar 2006 06:56:42 -0000 1.2 @@ -1,6 +1,6 @@ -diff -uNr namazu-2.0.13/filter/Makefile.am utf8.namazu-2.0.13/filter/Makefile.am ---- namazu-2.0.13/filter/Makefile.am 2003-08-24 19:41:55.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/Makefile.am 2004-04-15 16:12:10.000000000 +0900 +diff -ruN namazu-2.0.15.orig/filter/Makefile.am namazu-2.0.15/filter/Makefile.am +--- namazu-2.0.15.orig/filter/Makefile.am 2004-09-18 14:03:02.000000000 +0900 ++++ namazu-2.0.15/filter/Makefile.am 2006-03-02 15:40:59.000000000 +0900 @@ -20,6 +20,8 @@ hnf.pl \ html.pl \ @@ -10,24 +10,10 @@ man.pl \ mhonarc.pl \ msword.pl \ -diff -uNr namazu-2.0.13/filter/Makefile.in utf8.namazu-2.0.13/filter/Makefile.in ---- namazu-2.0.13/filter/Makefile.in 2004-04-14 03:09:02.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/Makefile.in 2004-04-15 16:13:32.000000000 +0900 -@@ -167,7 +167,9 @@ - rtf.pl \ - apachecache.pl \ - macbinary.pl \ -- mp3.pl -+ mp3.pl \ -+ langspec.txt \ -+ langspec.txt.utf8 - - - EXTRA_DIST = $(filter_DATA) -diff -uNr namazu-2.0.13/filter/hnf.pl utf8.namazu-2.0.13/filter/hnf.pl ---- namazu-2.0.13/filter/hnf.pl 2001-11-29 18:31:43.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/hnf.pl 2004-04-15 16:12:10.000000000 +0900 -@@ -69,8 +69,10 @@ +diff -ruN namazu-2.0.15.orig/filter/hnf.pl namazu-2.0.15/filter/hnf.pl +--- namazu-2.0.15.orig/filter/hnf.pl 2005-06-06 15:13:35.000000000 +0900 ++++ namazu-2.0.15/filter/hnf.pl 2006-03-02 15:40:59.000000000 +0900 +@@ -72,8 +72,10 @@ my $mark = "# "; my $end = "--"; @@ -40,9 +26,9 @@ get_uri($cfile, $fields); hnf_filter($contref, $weighted_str, $fields, $headings, $cfile, -diff -uNr namazu-2.0.13/filter/langspec.txt utf8.namazu-2.0.13/filter/langspec.txt ---- namazu-2.0.13/filter/langspec.txt 1970-01-01 09:00:00.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/langspec.txt 2004-04-15 16:12:10.000000000 +0900 +diff -ruN namazu-2.0.15.orig/filter/langspec.txt namazu-2.0.15/filter/langspec.txt +--- namazu-2.0.15.orig/filter/langspec.txt 1970-01-01 09:00:00.000000000 +0900 ++++ namazu-2.0.15/filter/langspec.txt 2006-03-02 15:40:59.000000000 +0900 @@ -0,0 +1,8 @@ +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(??|??|\.|??|,|??|\@|??|??)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(????|??????????|????????????|??????????)(.{0,2})?\s*$) +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|????|??????|????))|(^.+(????????|reply\s*????|????|??????|??????????|??????????|????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>) @@ -52,9 +38,9 @@ +hnf.pl_filter_2: ?? +gfilter.pl_line_adjust_filter: (??|??)$ +wakati.pl_wakatize_japanese: (.+ )???? -diff -uNr namazu-2.0.13/filter/langspec.txt.utf8 utf8.namazu-2.0.13/filter/langspec.txt.utf8 ---- namazu-2.0.13/filter/langspec.txt.utf8 1970-01-01 09:00:00.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/langspec.txt.utf8 2004-04-15 16:12:10.000000000 +0900 +diff -ruN namazu-2.0.15.orig/filter/langspec.txt.utf8 namazu-2.0.15/filter/langspec.txt.utf8 +--- namazu-2.0.15.orig/filter/langspec.txt.utf8 1970-01-01 09:00:00.000000000 +0900 ++++ namazu-2.0.15/filter/langspec.txt.utf8 2006-03-02 15:40:59.000000000 +0900 @@ -0,0 +1,8 @@ +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(???|???|\.|???|,|???|\@|???|???)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(??????|???????????????|??????????????????|???????????????)(.{0,2})?\s*$) +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|??????|?????????|??????))|(^.+(????????????|reply\s*??????|??????|?????????|???????????????|???????????????|??????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>) @@ -64,10 +50,10 @@ +hnf.pl_filter_2: ??? +gfilter.pl_line_adjust_filter: (???|???)$ +wakati.pl_wakatize_japanese: (.+ )?????? -diff -uNr namazu-2.0.13/filter/mailnews.pl utf8.namazu-2.0.13/filter/mailnews.pl ---- namazu-2.0.13/filter/mailnews.pl 2004-03-21 00:48:30.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/mailnews.pl 2004-04-15 16:12:10.000000000 +0900 -@@ -182,13 +182,23 @@ +diff -ruN namazu-2.0.15.orig/filter/mailnews.pl namazu-2.0.15/filter/mailnews.pl +--- namazu-2.0.15.orig/filter/mailnews.pl 2006-01-29 22:26:44.000000000 +0900 ++++ namazu-2.0.15/filter/mailnews.pl 2006-03-02 15:46:33.000000000 +0900 +@@ -246,13 +246,23 @@ $$contref = ""; # Greeting at the beginning (first one or two lines) @@ -97,11 +83,11 @@ } # Isolate citation parts. -@@ -213,11 +223,22 @@ +@@ -277,11 +287,22 @@ # Process only first five paragrahs. # And don't handle the paragrah which has five or longer lines. # Hmm, this regex looks very hairly. -- if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:|????|??????|????))|(^.+(????????|reply\s*????|????|??????|??????????|??????????|????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)/im) { +- if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:|????|??????|????))|(^.+(????????|reply\s*????|????|??????|??????????|??????????|????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|<\S+\@[\w\-\.]+?\.\w+>/im) { - util::dprint("\n\n<<<<$line>>>>\n\n"); - $omake .= $line . "\n"; - $line = ""; @@ -109,13 +95,13 @@ + $regexp = util::read_langspec_char_from_file ("./langspec.txt", "mailnews.pl_mailnews_citation_filter_2"); + + if ($regexp eq "") { -+ if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:))|(^.+(wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)/im) { ++ if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:))|(^.+(wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|<\S+\@[\w\-\.]+?\.\w+>/im) { + util::dprint("\n\n<<<<$line>>>>\n\n"); + $omake .= $line . "\n"; + $line = ""; + next; + } -+ } else { ++ } else { + if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /$regexp/im) { + util::dprint("\n\n<<<<$line>>>>\n\n"); + $omake .= $line . "\n"; @@ -125,10 +111,10 @@ } $$contref .= $line. "\n\n"; $i++; -diff -uNr namazu-2.0.13/filter/man.pl utf8.namazu-2.0.13/filter/man.pl ---- namazu-2.0.13/filter/man.pl 2002-02-13 16:39:14.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/man.pl 2004-04-15 16:12:10.000000000 +0900 -@@ -140,17 +140,36 @@ +diff -ruN namazu-2.0.15.orig/filter/man.pl namazu-2.0.15/filter/man.pl +--- namazu-2.0.15.orig/filter/man.pl 2005-06-06 15:13:35.000000000 +0900 ++++ namazu-2.0.15/filter/man.pl 2006-03-02 15:40:59.000000000 +0900 +@@ -171,17 +171,36 @@ my $weight = $conf::Weight{'html'}->{'title'}; $$weighted_str .= "\x7f$weight\x7f$title\x7f/$weight\x7f\n"; @@ -174,10 +160,10 @@ } } -diff -uNr namazu-2.0.13/pl/gfilter.pl utf8.namazu-2.0.13/pl/gfilter.pl ---- namazu-2.0.13/pl/gfilter.pl 2004-01-31 03:28:19.000000000 +0900 -+++ utf8.namazu-2.0.13/pl/gfilter.pl 2004-04-15 16:12:10.000000000 +0900 -@@ -90,13 +90,14 @@ +diff -ruN namazu-2.0.15.orig/pl/gfilter.pl namazu-2.0.15/pl/gfilter.pl +--- namazu-2.0.15.orig/pl/gfilter.pl 2004-11-01 21:56:44.000000000 +0900 ++++ namazu-2.0.15/pl/gfilter.pl 2006-03-02 15:40:59.000000000 +0900 +@@ -92,13 +92,14 @@ return undef unless defined($$text); my @tmp = split(/\n/, $$text); @@ -193,10 +179,10 @@ $line =~ s/([a-z])-\n/$1/; # for hyphenation. } $$text = join('', @tmp); -diff -uNr namazu-2.0.13/pl/util.pl utf8.namazu-2.0.13/pl/util.pl ---- namazu-2.0.13/pl/util.pl 2004-03-19 00:54:09.000000000 +0900 -+++ utf8.namazu-2.0.13/pl/util.pl 2004-04-15 16:12:10.000000000 +0900 -@@ -331,4 +331,36 @@ +diff -ruN namazu-2.0.15.orig/pl/util.pl namazu-2.0.15/pl/util.pl +--- namazu-2.0.15.orig/pl/util.pl 2006-03-02 15:38:01.000000000 +0900 ++++ namazu-2.0.15/pl/util.pl 2006-03-02 15:40:59.000000000 +0900 +@@ -562,4 +562,36 @@ } } @@ -233,9 +219,9 @@ +} + 1; -diff -uNr namazu-2.0.13/pl/wakati.pl utf8.namazu-2.0.13/pl/wakati.pl ---- namazu-2.0.13/pl/wakati.pl 2004-03-04 16:25:57.000000000 +0900 -+++ utf8.namazu-2.0.13/pl/wakati.pl 2004-04-15 16:12:48.000000000 +0900 +diff -ruN namazu-2.0.15.orig/pl/wakati.pl namazu-2.0.15/pl/wakati.pl +--- namazu-2.0.15.orig/pl/wakati.pl 2006-01-23 18:18:24.000000000 +0900 ++++ namazu-2.0.15/pl/wakati.pl 2006-03-02 15:40:59.000000000 +0900 @@ -53,8 +53,10 @@ # Collect only noun words when -m option is specified. if ($var::Opt{'noun'}) { Index: namazu.spec =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/namazu.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- namazu.spec 30 May 2005 02:51:38 -0000 1.2 +++ namazu.spec 2 Mar 2006 06:56:42 -0000 1.3 @@ -6,14 +6,14 @@ Summary: Namazu is a full-text search engine Name: namazu -Version: 2.0.14 -Release: 3 +Version: 2.0.15 +Release: 1%{?dist} License: GPL Group: Applications/Text URL: http://www.namazu.org/ BuildRequires: perl >= 5.6.0, perl-NKF >= 1.70, perl-Text-Kakasi >= 1.00 BuildPreReq: perl-File-MMagic >= 1.12 -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl >= 5.6.0, perl-File-MMagic >= 1.12, perl-NKF >= 1.70 Requires: kakasi >= 2.3.0, perl-Text-Kakasi >= 1.00 @@ -24,7 +24,6 @@ Patch0: namazu-linguas.patch Patch1: namazu-2.0.6-newgettext3.patch Patch2: namazu-fixinutf8.patch -Patch3: namazu-2.0.13-de.patch Source1: filter-requires-namazu.sh %define __find_requires %{SOURCE1} @@ -60,7 +59,6 @@ %patch0 -p1 -b .linguas %patch1 -p1 -b .newgettext %patch2 -p1 -b .fixinutf8 -%patch3 -p1 -b .fixde %build %configure @@ -117,6 +115,8 @@ %{_bindir}/mailutime %{_bindir}/nmzgrep %{_bindir}/nmzmerge +%{_bindir}/nmzcat +%{_bindir}/nmzegrep %{_libdir}/*.so.* %{_mandir}/man1/* %{_datadir}/namazu/filter/* @@ -139,6 +139,10 @@ %changelog +* Thu Mar 2 2006 Akira TAGOH - 2.0.15-1 +- New upstream release. +- namazu-2.0.13-de.patch: removed. + * Mon May 30 2005 Akira TAGOH - 2.0.14-3 - rebuilt to import into Extras. Index: sources =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 May 2005 02:23:25 -0000 1.2 +++ sources 2 Mar 2006 06:56:42 -0000 1.3 @@ -1 +1 @@ -17d7253ec58241a95c0b80d469be63b2 namazu-2.0.14.tar.gz +8093ad48dfa5ec2d314881d6ff6d88a9 namazu-2.0.15.tar.gz --- namazu-2.0.13-de.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 07:30:38 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 02:30:38 -0500 Subject: rpms/namazu/devel namazu-fixinutf8.patch, 1.2, 1.3 namazu.spec, 1.3, 1.4 Message-ID: <200603020731.k227VBGd026224@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26202 Modified Files: namazu-fixinutf8.patch namazu.spec Log Message: namazu-fixinutf8.patch: Index: namazu-fixinutf8.patch =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/namazu-fixinutf8.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- namazu-fixinutf8.patch 2 Mar 2006 06:56:42 -0000 1.2 +++ namazu-fixinutf8.patch 2 Mar 2006 07:30:38 -0000 1.3 @@ -1,6 +1,6 @@ diff -ruN namazu-2.0.15.orig/filter/Makefile.am namazu-2.0.15/filter/Makefile.am --- namazu-2.0.15.orig/filter/Makefile.am 2004-09-18 14:03:02.000000000 +0900 -+++ namazu-2.0.15/filter/Makefile.am 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/filter/Makefile.am 2006-03-02 16:25:25.000000000 +0900 @@ -20,6 +20,8 @@ hnf.pl \ html.pl \ @@ -10,9 +10,21 @@ man.pl \ mhonarc.pl \ msword.pl \ +diff -ruN namazu-2.0.15.orig/filter/Makefile.in namazu-2.0.15/filter/Makefile.in +--- namazu-2.0.15.orig/filter/Makefile.in 2006-01-29 22:58:27.000000000 +0900 ++++ namazu-2.0.15/filter/Makefile.in 2006-03-02 16:25:55.000000000 +0900 +@@ -151,6 +151,8 @@ + hnf.pl \ + html.pl \ + mailnews.pl \ ++ langspec.txt \ ++ langspec.txt.utf8 \ + man.pl \ + mhonarc.pl \ + msword.pl \ diff -ruN namazu-2.0.15.orig/filter/hnf.pl namazu-2.0.15/filter/hnf.pl --- namazu-2.0.15.orig/filter/hnf.pl 2005-06-06 15:13:35.000000000 +0900 -+++ namazu-2.0.15/filter/hnf.pl 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/filter/hnf.pl 2006-03-02 16:25:25.000000000 +0900 @@ -72,8 +72,10 @@ my $mark = "# "; @@ -28,7 +40,7 @@ hnf_filter($contref, $weighted_str, $fields, $headings, $cfile, diff -ruN namazu-2.0.15.orig/filter/langspec.txt namazu-2.0.15/filter/langspec.txt --- namazu-2.0.15.orig/filter/langspec.txt 1970-01-01 09:00:00.000000000 +0900 -+++ namazu-2.0.15/filter/langspec.txt 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/filter/langspec.txt 2006-03-02 16:25:25.000000000 +0900 @@ -0,0 +1,8 @@ +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(??|??|\.|??|,|??|\@|??|??)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(????|??????????|????????????|??????????)(.{0,2})?\s*$) +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|????|??????|????))|(^.+(????????|reply\s*????|????|??????|??????????|??????????|????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>) @@ -40,7 +52,7 @@ +wakati.pl_wakatize_japanese: (.+ )???? diff -ruN namazu-2.0.15.orig/filter/langspec.txt.utf8 namazu-2.0.15/filter/langspec.txt.utf8 --- namazu-2.0.15.orig/filter/langspec.txt.utf8 1970-01-01 09:00:00.000000000 +0900 -+++ namazu-2.0.15/filter/langspec.txt.utf8 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/filter/langspec.txt.utf8 2006-03-02 16:25:25.000000000 +0900 @@ -0,0 +1,8 @@ +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(???|???|\.|???|,|???|\@|???|???)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(??????|???????????????|??????????????????|???????????????)(.{0,2})?\s*$) +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|??????|?????????|??????))|(^.+(????????????|reply\s*??????|??????|?????????|???????????????|???????????????|??????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>) @@ -52,7 +64,7 @@ +wakati.pl_wakatize_japanese: (.+ )?????? diff -ruN namazu-2.0.15.orig/filter/mailnews.pl namazu-2.0.15/filter/mailnews.pl --- namazu-2.0.15.orig/filter/mailnews.pl 2006-01-29 22:26:44.000000000 +0900 -+++ namazu-2.0.15/filter/mailnews.pl 2006-03-02 15:46:33.000000000 +0900 ++++ namazu-2.0.15/filter/mailnews.pl 2006-03-02 16:25:25.000000000 +0900 @@ -246,13 +246,23 @@ $$contref = ""; @@ -113,7 +125,7 @@ $i++; diff -ruN namazu-2.0.15.orig/filter/man.pl namazu-2.0.15/filter/man.pl --- namazu-2.0.15.orig/filter/man.pl 2005-06-06 15:13:35.000000000 +0900 -+++ namazu-2.0.15/filter/man.pl 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/filter/man.pl 2006-03-02 16:25:25.000000000 +0900 @@ -171,17 +171,36 @@ my $weight = $conf::Weight{'html'}->{'title'}; $$weighted_str .= "\x7f$weight\x7f$title\x7f/$weight\x7f\n"; @@ -162,7 +174,7 @@ diff -ruN namazu-2.0.15.orig/pl/gfilter.pl namazu-2.0.15/pl/gfilter.pl --- namazu-2.0.15.orig/pl/gfilter.pl 2004-11-01 21:56:44.000000000 +0900 -+++ namazu-2.0.15/pl/gfilter.pl 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/pl/gfilter.pl 2006-03-02 16:25:25.000000000 +0900 @@ -92,13 +92,14 @@ return undef unless defined($$text); @@ -180,8 +192,8 @@ } $$text = join('', @tmp); diff -ruN namazu-2.0.15.orig/pl/util.pl namazu-2.0.15/pl/util.pl ---- namazu-2.0.15.orig/pl/util.pl 2006-03-02 15:38:01.000000000 +0900 -+++ namazu-2.0.15/pl/util.pl 2006-03-02 15:40:59.000000000 +0900 +--- namazu-2.0.15.orig/pl/util.pl 2006-03-02 16:24:57.000000000 +0900 ++++ namazu-2.0.15/pl/util.pl 2006-03-02 16:25:25.000000000 +0900 @@ -562,4 +562,36 @@ } } @@ -221,7 +233,7 @@ 1; diff -ruN namazu-2.0.15.orig/pl/wakati.pl namazu-2.0.15/pl/wakati.pl --- namazu-2.0.15.orig/pl/wakati.pl 2006-01-23 18:18:24.000000000 +0900 -+++ namazu-2.0.15/pl/wakati.pl 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/pl/wakati.pl 2006-03-02 16:25:25.000000000 +0900 @@ -53,8 +53,10 @@ # Collect only noun words when -m option is specified. if ($var::Opt{'noun'}) { Index: namazu.spec =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/namazu.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- namazu.spec 2 Mar 2006 06:56:42 -0000 1.3 +++ namazu.spec 2 Mar 2006 07:30:38 -0000 1.4 @@ -7,7 +7,7 @@ Summary: Namazu is a full-text search engine Name: namazu Version: 2.0.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Text URL: http://www.namazu.org/ @@ -139,9 +139,10 @@ %changelog -* Thu Mar 2 2006 Akira TAGOH - 2.0.15-1 +* Thu Mar 2 2006 Akira TAGOH - 2.0.15-2 - New upstream release. - namazu-2.0.13-de.patch: removed. +- namazu-fixinutf8.patch: updated. * Mon May 30 2005 Akira TAGOH - 2.0.14-3 - rebuilt to import into Extras. From fedora-extras-commits at redhat.com Thu Mar 2 07:33:00 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 02:33:00 -0500 Subject: rpms/paps/devel paps.spec,1.5,1.6 Message-ID: <200603020733.k227XWjc026299@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26278 Modified Files: paps.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 0.6.3-2 - rebuilt. Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- paps.spec 11 Jan 2006 06:13:52 -0000 1.5 +++ paps.spec 2 Mar 2006 07:32:59 -0000 1.6 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -44,6 +44,9 @@ %changelog +* Thu Mar 2 2006 Akira TAGOH - 0.6.3-2 +- rebuilt. + * Wed Jan 11 2006 Akira TAGOH - 0.6.3-1 - New upstream release. - paps-0.6.2-fix-bufferoverflow.patch: removed. From fedora-extras-commits at redhat.com Thu Mar 2 07:38:23 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 02:38:23 -0500 Subject: rpms/perl-Text-Kakasi/devel perl-Text-Kakasi.spec,1.2,1.3 Message-ID: <200603020738.k227ctr3026403@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/perl-Text-Kakasi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26379 Modified Files: perl-Text-Kakasi.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 2.04-2 - rebuilt. Index: perl-Text-Kakasi.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Kakasi/devel/perl-Text-Kakasi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Text-Kakasi.spec 30 May 2005 02:48:16 -0000 1.2 +++ perl-Text-Kakasi.spec 2 Mar 2006 07:38:23 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Text-Kakasi Version: 2.04 -Release: 1 +Release: 2%{?dist} Summary: Kakasi library module for perl Group: Development/Libraries @@ -59,6 +59,9 @@ %changelog +* Thu Mar 2 2006 Akira TAGOH - 2.04-2 +- rebuilt. + * Mon May 30 2005 Akira TAGOH - 2.04-1 - Updates to 2.04. - import to Extras. From fedora-extras-commits at redhat.com Thu Mar 2 07:40:47 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 2 Mar 2006 02:40:47 -0500 Subject: rpms/scim-fcitx/devel scim-fcitx.spec,1.3,1.4 Message-ID: <200603020741.k227fJoC026486@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-fcitx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26460 Modified Files: scim-fcitx.spec Log Message: rebuild for FE5 Index: scim-fcitx.spec =================================================================== RCS file: /cvs/extras/rpms/scim-fcitx/devel/scim-fcitx.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-fcitx.spec 13 Feb 2006 05:53:43 -0000 1.3 +++ scim-fcitx.spec 2 Mar 2006 07:40:47 -0000 1.4 @@ -2,7 +2,7 @@ Name: scim-fcitx Version: 3.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: FCITX Input Method Engine for SCIM Group: System Environment/Libraries @@ -75,6 +75,9 @@ %changelog +* Thu Mar 2 2006 Jens Petersen - 3.1.1-4 +- rebuild for FE5 + * Mon Feb 13 2006 Jens Petersen - 3.1.1-3 - build conditionally with libstdc++so7 preview library (#166041) - add with_libstdc_preview switch and tweak libtool to link against it From fedora-extras-commits at redhat.com Thu Mar 2 07:46:14 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 02:46:14 -0500 Subject: rpms/w3m-el/devel w3m-el.spec,1.2,1.3 Message-ID: <200603020746.k227klJq026590@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/w3m-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26568 Modified Files: w3m-el.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 1.4.2-2 - rebuilt Index: w3m-el.spec =================================================================== RCS file: /cvs/extras/rpms/w3m-el/devel/w3m-el.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- w3m-el.spec 30 May 2005 10:52:45 -0000 1.2 +++ w3m-el.spec 2 Mar 2006 07:46:14 -0000 1.3 @@ -2,10 +2,10 @@ Name: w3m-el Version: 1.4.4 -Release: 1 +Release: 2%{?dist} License: BSD URL: http://emacs-w3m.namazu.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildPreReq: emacs BuildPreReq: xemacs >= %{xemacsver}, flim-xemacs BuildPreReq: flim @@ -60,7 +60,7 @@ %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d @@ -90,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT%{_infodir}/dir %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post common @@ -109,26 +109,32 @@ %files %defattr (-, root, root) -%doc COPYING ChangeLog ChangeLog.1 README README.ja +%doc COPYING ChangeLog ChangeLog.1 README +%lang(ja) %doc README.ja %dir %{_datadir}/emacs/site-lisp/w3m %{_datadir}/emacs/site-lisp/w3m/* %{_datadir}/emacs/site-lisp/site-start.d/w3m-init.el %files xemacs %defattr (-, root, root) -%doc COPYING ChangeLog ChangeLog.1 README README.ja +%doc COPYING ChangeLog ChangeLog.1 README +%lang(ja) %doc README.ja %dir %{_datadir}/xemacs/xemacs-packages/lisp/w3m %{_datadir}/xemacs/xemacs-packages/lisp/w3m/* %{_datadir}/xemacs/site-packages/lisp/site-start.d/w3m-init.el %files common %defattr (-, root, root) -%doc COPYING ChangeLog ChangeLog.1 README README.ja +%doc COPYING ChangeLog ChangeLog.1 README +%lang(ja) %doc README.ja %dir %{_datadir}/pixmaps/w3m-el %{_datadir}/pixmaps/w3m-el/* %{_infodir}/* %changelog +* Thu Mar 2 2006 Akira TAGOH - 1.4.2-2 +- rebuilt + * Mon May 9 2005 Akira TAGOH - 1.4.4-1 - Updates to 1.4.4. - import into Extras. From fedora-extras-commits at redhat.com Thu Mar 2 07:54:16 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 02:54:16 -0500 Subject: rpms/uim/devel uim.spec,1.25,1.26 Message-ID: <200603020754.k227snQq026687@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26670 Modified Files: uim.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 1.0.1-2 - rebuilt. Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- uim.spec 27 Dec 2005 04:50:32 -0000 1.25 +++ uim.spec 2 Mar 2006 07:54:16 -0000 1.26 @@ -4,7 +4,7 @@ Name: uim Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/BSD URL: http://uim.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -343,6 +343,9 @@ %{_datadir}/uim/m17nlib.scm %changelog +* Thu Mar 2 2006 Akira TAGOH - 1.0.1-2 +- rebuilt. + * Tue Dec 27 2005 Akira TAGOH - 1.0.1-1 - New upstream release. From fedora-extras-commits at redhat.com Thu Mar 2 07:58:18 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 2 Mar 2006 02:58:18 -0500 Subject: rpms/FreeWnn/devel FreeWnn.spec,1.2,1.3 Message-ID: <200603020758.k227woQv026759@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/FreeWnn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26736 Modified Files: FreeWnn.spec Log Message: rebuild for FE5 Index: FreeWnn.spec =================================================================== RCS file: /cvs/extras/rpms/FreeWnn/devel/FreeWnn.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FreeWnn.spec 13 Jun 2005 13:33:13 -0000 1.2 +++ FreeWnn.spec 2 Mar 2006 07:58:18 -0000 1.3 @@ -5,7 +5,7 @@ Summary: A Japanese character set conversion system. Name: FreeWnn Version: %{tarballversion}pl%{patchlevel} -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Group: Applications/System License: Distributable @@ -242,6 +242,12 @@ %attr(755,root,root) %{_libdir}/libwnn.so.0.0.0 %changelog +* Thu Mar 2 2006 Jens Petersen - 1:1.10pl020-7 +- rebuild for FE5 + +* Thu Jun 30 2005 Jens Petersen - 1:1.10pl020-6 +- import to Extras + * Fri Oct 29 2004 Jens Petersen - 1:1.10pl020-5 - before upgrading modify the wnn user and group (in the same way mailman does) rather than deleting and recreating them to really fix the upgrade failure From fedora-extras-commits at redhat.com Thu Mar 2 08:40:16 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 2 Mar 2006 03:40:16 -0500 Subject: rpms/ghc/devel ghc.spec,1.10,1.11 Message-ID: <200603020840.k228em96028825@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28779 Modified Files: ghc.spec Log Message: - buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024) - make ghc-doc require ghc (Michel Salim, #180449) Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ghc.spec 11 Oct 2005 03:05:07 -0000 1.10 +++ ghc.spec 2 Mar 2006 08:40:15 -0000 1.11 @@ -6,7 +6,7 @@ Name: ghc Version: 6.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -15,7 +15,7 @@ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, sed -Buildrequires: gmp-devel, readline-devel, xorg-x11-devel, freeglut-devel, openal-devel +Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel %if %{build_doc} # haddock generates libraries/ docs Buildrequires: libxslt, docbook-style-xsl, haddock @@ -65,6 +65,7 @@ %package doc Summary: Documentation for GHC Group: Development/Languages +Requires: %{name} %description doc Preformatted documentation for the Glorious Glasgow Haskell @@ -155,6 +156,10 @@ %endif %changelog +* Thu Mar 2 2006 Jens Petersen - 6.4.1-3 +- buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024) +- make ghc-doc require ghc (Michel Salim, #180449) + * Tue Oct 11 2005 Jens Petersen - 6.4.1-2 - turn on build_doc since haddock is now in Extras - no longer specify ghc version to build with (Ville Skytt??, #170176) From fedora-extras-commits at redhat.com Thu Mar 2 09:25:23 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 2 Mar 2006 04:25:23 -0500 Subject: rpms/darcs/devel .cvsignore, 1.4, 1.5 darcs.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200603020925.k229PtKh031488@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31457 Modified Files: .cvsignore darcs.spec sources Log Message: - update to 1.0.6 - darcs-createrepo is gone Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Dec 2005 02:17:18 -0000 1.4 +++ .cvsignore 2 Mar 2006 09:25:22 -0000 1.5 @@ -1 +1 @@ -darcs-1.0.5.tar.gz +darcs-1.0.6.tar.gz Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- darcs.spec 8 Dec 2005 05:34:21 -0000 1.7 +++ darcs.spec 2 Mar 2006 09:25:22 -0000 1.8 @@ -1,5 +1,5 @@ Name: darcs -Version: 1.0.5 +Version: 1.0.6 Release: 1%{?dist} Summary: David's advanced revision control system @@ -79,12 +79,15 @@ %files server %defattr(-,root,root,-) %{_localstatedir}/www/cgi-bin -%{_sbindir}/darcs-createrepo %{_sysconfdir}/darcs %{_datadir}/darcs %changelog +* Thu Mar 2 2006 Jens Petersen - 1.0.6-1 +- update to 1.0.6 + - darcs-createrepo is gone + * Thu Dec 8 2005 Jens Petersen - 1.0.5-1 - 1.0.5 bugfix release Index: sources =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Dec 2005 02:17:18 -0000 1.4 +++ sources 2 Mar 2006 09:25:22 -0000 1.5 @@ -1 +1 @@ -9a9a4f84ed5b6258f7ab321713adf20b darcs-1.0.5.tar.gz +8f3a1ee21b7bfbcca11bf4f9f0042cfd darcs-1.0.6.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 09:44:36 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 2 Mar 2006 04:44:36 -0500 Subject: rpms/xmms/devel xmms.spec,1.17,1.18 Message-ID: <200603020945.k229jA2d031594@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31575 Modified Files: xmms.spec Log Message: Workaround for FC5. Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xmms.spec 1 Mar 2006 10:56:05 -0000 1.17 +++ xmms.spec 2 Mar 2006 09:44:36 -0000 1.18 @@ -1,7 +1,7 @@ Summary: The X MultiMedia System, a media player Name: xmms Version: 1.2.10 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -128,6 +128,9 @@ # Create empty Skins directory to be included %{__mkdir_p} %{buildroot}%{_datadir}/xmms/Skins/ +# On FC5 x86_64, this gets created even though we pass --disable-static +%{__rm} -f %{buildroot}%{_libdir}/xmms/General/libsong_change.a + %clean %{__rm} -rf %{buildroot} @@ -175,6 +178,9 @@ %changelog +* Thu Mar 2 2006 Matthias Saou 1:1.2.10-22 +- Remove /usr/lib64/xmms/General/libsong_change.a (fix for FC5 x86_64...). + * Mon Feb 13 2006 Matthias Saou 1:1.2.10-21 - Remove gtk libs from xmms-config output, as they are only really needed for static linking, which we no longer support (#182267). From fedora-extras-commits at redhat.com Thu Mar 2 10:09:40 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Thu, 2 Mar 2006 05:09:40 -0500 Subject: rpms/yumex/devel .cvsignore, 1.15, 1.16 sources, 1.18, 1.19 yumex.spec, 1.19, 1.20 Message-ID: <200603021010.k22AAG5V001037@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1013 Modified Files: .cvsignore sources yumex.spec Log Message: Release 0.99.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 15 Feb 2006 16:56:41 -0000 1.15 +++ .cvsignore 2 Mar 2006 10:09:39 -0000 1.16 @@ -1 +1 @@ -yumex-0.99.9.tar.gz +yumex-0.99.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 15 Feb 2006 16:56:41 -0000 1.18 +++ sources 2 Mar 2006 10:09:39 -0000 1.19 @@ -1 +1 @@ -6042cccf70692e2b96ae76046d2c175c yumex-0.99.9.tar.gz +cad44f4f35d0df846a25cb56a08ecad5 yumex-0.99.11.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- yumex.spec 15 Feb 2006 16:56:41 -0000 1.19 +++ yumex.spec 2 Mar 2006 10:09:39 -0000 1.20 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.9 +Version: 0.99.11 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,10 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Tue Feb 28 2006 Tim Lauridsen - 0.99.11-1.0 +- Development Release 0.99.11-1.0 +* Tue Feb 15 2006 Tim Lauridsen - 0.99.10-1.0 +- Development Release 0.99.10-1.0 * Tue Feb 14 2006 Tim Lauridsen - 0.99.9-1.0 - Development Release 0.99.9-1.0 * Tue Feb 14 2006 Tim Lauridsen - 0.99.8-1.0 From fedora-extras-commits at redhat.com Thu Mar 2 10:42:29 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 2 Mar 2006 05:42:29 -0500 Subject: rpms/xmms/devel xmms.spec,1.18,1.19 Message-ID: <200603021043.k22Ah1FH001240@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1223 Modified Files: xmms.spec Log Message: Something strange with FC5 and static plugin libs it seems... Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xmms.spec 2 Mar 2006 09:44:36 -0000 1.18 +++ xmms.spec 2 Mar 2006 10:42:28 -0000 1.19 @@ -128,8 +128,8 @@ # Create empty Skins directory to be included %{__mkdir_p} %{buildroot}%{_datadir}/xmms/Skins/ -# On FC5 x86_64, this gets created even though we pass --disable-static -%{__rm} -f %{buildroot}%{_libdir}/xmms/General/libsong_change.a +# On FC5 x86_64, some get created even though we pass --disable-static +%{__rm} -f %{buildroot}%{_libdir}/xmms/*/*.a %clean From fedora-extras-commits at redhat.com Thu Mar 2 11:34:16 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 06:34:16 -0500 Subject: rpms/aide/FC-4 aide-0.10-no-static.patch, NONE, 1.1 aide.spec, 1.7, 1.8 Message-ID: <200603021134.k22BYmte003331@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/aide/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3305 Modified Files: aide.spec Added Files: aide-0.10-no-static.patch Log Message: sync with no-static change in devel, but only commit this to test-build this old version with devel flex aide-0.10-no-static.patch: --- NEW FILE aide-0.10-no-static.patch --- diff -Nur aide-0.10-orig/configure aide-0.10/configure --- aide-0.10-orig/configure 2003-11-28 16:14:08.000000000 +0100 +++ aide-0.10/configure 2006-03-02 12:30:37.000000000 +0100 @@ -1720,8 +1720,8 @@ esac fi -CFLAGS="$CFLAGS $LD_STATIC_FLAG" -CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG" +#CFLAGS="$CFLAGS $LD_STATIC_FLAG" +#CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG" @@ -3022,7 +3022,7 @@ done save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $LD_STATIC_FLAG" + #LDFLAGS="$LDFLAGS $LD_STATIC_FLAG" echo $ac_n "checking for gzdopen in -lz""... $ac_c" 1>&6 echo "configure:3028: checking for gzdopen in -lz" >&5 ac_lib_var=`echo z'_'gzdopen | sed 'y%./+-%__p_%'` @@ -3798,7 +3798,7 @@ s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g -s%@LD_STATIC_FLAG@%$LD_STATIC_FLAG%g +s%@LD_STATIC_FLAG@%%g s%@AIDE_USE_LOCALE@%$AIDE_USE_LOCALE%g s%@ACLLIB@%$ACLLIB%g s%@CRYPTLIB@%$CRYPTLIB%g Index: aide.spec =================================================================== RCS file: /cvs/extras/rpms/aide/FC-4/aide.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- aide.spec 6 Apr 2005 22:10:48 -0000 1.7 +++ aide.spec 2 Mar 2006 11:34:15 -0000 1.8 @@ -1,14 +1,17 @@ +%{?_with_static: %define nostatic 0} +%{!?_with_static: %define nostatic 1} + Summary: Intrusion detection environment Name: aide Version: 0.10 -Release: 2 - +Release: 3 URL: http://sourceforge.net/projects/aide License: GPL Group: Applications/System Source: http://download.sourceforge.net/aide/aide-0.10.tar.gz Source1: aide.conf Source2: README.quickstart +Patch0: aide-0.10-no-static.patch Patch1: aide-useless-includes.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Buildrequires: mhash-devel zlib-devel @@ -25,7 +28,9 @@ %prep %setup -q -n aide-0.10 - +%if 0%{nostatic} +%patch0 -p1 -b .no-static +%endif %patch1 -p1 %build @@ -75,6 +80,9 @@ %changelog +* Thu Mar 2 2006 Michael Schwendt - 0.10-3 +- disable static linking. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Mar 2 12:15:10 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 2 Mar 2006 07:15:10 -0500 Subject: fedora-security/audit fc4,1.163,1.164 fc5,1.71,1.72 Message-ID: <200603021215.k22CFAk3005534@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5510 Modified Files: fc4 fc5 Log Message: Updates from last couple of days emails Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- fc4 28 Feb 2006 09:29:30 -0000 1.163 +++ fc4 2 Mar 2006 12:14:58 -0000 1.164 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060227 -Up to date FC4 as of 20060227 +Up to date CVE as of CVE email 20060301 +Up to date FC4 as of 20060301 ** are items that need attention @@ -155,6 +155,7 @@ CVE-2005-3390 backport (php) [since FEDORA-2005-1062] CVE-2005-3389 backport (php) [since FEDORA-2005-1062] CVE-2005-3388 backport (php) [since FEDORA-2005-1062] +CVE-2005-3359 version (kernel, fixed 2.6.14) [since FEDORA-2005-1067] CVE-2005-3358 version (kernel, fixed 2.6.11) CVE-2005-3357 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052] CVE-2005-3356 backport (kernel) [since FEDORA-2006-077] @@ -1158,6 +1159,7 @@ CVE-2003-0963 version (lftp, fixed after 2.6.9) CVE-2003-0962 version (rsync, fixed 2.5.7) CVE-2003-0961 version (kernel, fixed 2.4.23) +CVE-2003-0959 version (kernel, fixed 2.4.21) CVE-2003-0956 version (kernel, fixed 2.4.22) CVE-2003-0935 version (netsnmp, fixed 5.0.9) CVE-2003-0927 version (ethereal, fixed 0.9.16) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- fc5 28 Feb 2006 09:29:30 -0000 1.71 +++ fc5 2 Mar 2006 12:14:58 -0000 1.72 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060227 +Up to date CVE as of CVE email 20060301 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -169,6 +169,7 @@ CVE-2005-3390 version (php, fixed 5.1.0) CVE-2005-3389 version (php, fixed 5.1.1) CVE-2005-3388 version (php, fixed 5.1.1) +CVE-2005-3359 version (kernel, fixed 2.6.14) CVE-2005-3358 version (kernel, fixed 2.6.11) CVE-2005-3357 backport (httpd, affects 2.2.0) CVE-2005-3356 backport (kernel) patch-2.6.16-rc3 @@ -1216,6 +1217,7 @@ CVE-2003-0963 version (lftp, fixed after 2.6.9) CVE-2003-0962 version (rsync, fixed 2.5.7) CVE-2003-0961 version (kernel, fixed 2.4.23) +CVE-2003-0959 version (kernel, fixed 2.4.21) CVE-2003-0956 version (kernel, fixed 2.4.22) CVE-2003-0935 version (netsnmp, fixed 5.0.9) CVE-2003-0927 version (ethereal, fixed 0.9.16) From fedora-extras-commits at redhat.com Thu Mar 2 12:22:20 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 07:22:20 -0500 Subject: rpms/aide import.log,1.7,1.8 Message-ID: <200603021222.k22CMqm5005716@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/aide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5659 Modified Files: import.log Log Message: auto-import aide-0.10-3 on branch devel from aide-0.10-3.src.rpm temporarily revert devel to FE4 aide for flex devel build test Index: import.log =================================================================== RCS file: /cvs/extras/rpms/aide/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 25 Feb 2006 21:45:25 -0000 1.7 +++ import.log 2 Mar 2006 12:22:19 -0000 1.8 @@ -4,3 +4,4 @@ aide-0_10-0_fdr_1_1:HEAD:aide-0.10-0.fdr.1.1.src.rpm:1099886473 aide-0_10-0_fdr_1_2:HEAD:aide-0.10-0.fdr.1.2.src.rpm:1099886479 aide-0_11-1:HEAD:aide-0.11-1.src.rpm:1140903967 +aide-0_10-3:HEAD:aide-0.10-3.src.rpm:1141302191 From fedora-extras-commits at redhat.com Thu Mar 2 12:22:26 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 07:22:26 -0500 Subject: rpms/aide/devel aide-0.10-no-static.patch, NONE, 1.1 aide-useless-includes.patch, 1.2, 1.3 .cvsignore, 1.5, 1.6 aide.spec, 1.9, 1.10 sources, 1.5, 1.6 aide-0.11-man-page.patch, 1.1, NONE aide-0.11-no-static.patch, 1.1, NONE Message-ID: <200603021222.k22CMwOP005726@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/aide/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5659/devel Modified Files: .cvsignore aide.spec sources Added Files: aide-0.10-no-static.patch aide-useless-includes.patch Removed Files: aide-0.11-man-page.patch aide-0.11-no-static.patch Log Message: auto-import aide-0.10-3 on branch devel from aide-0.10-3.src.rpm temporarily revert devel to FE4 aide for flex devel build test aide-0.10-no-static.patch: --- NEW FILE aide-0.10-no-static.patch --- diff -Nur aide-0.10-orig/configure aide-0.10/configure --- aide-0.10-orig/configure 2003-11-28 16:14:08.000000000 +0100 +++ aide-0.10/configure 2006-03-02 12:30:37.000000000 +0100 @@ -1720,8 +1720,8 @@ esac fi -CFLAGS="$CFLAGS $LD_STATIC_FLAG" -CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG" +#CFLAGS="$CFLAGS $LD_STATIC_FLAG" +#CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG" @@ -3022,7 +3022,7 @@ done save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $LD_STATIC_FLAG" + #LDFLAGS="$LDFLAGS $LD_STATIC_FLAG" echo $ac_n "checking for gzdopen in -lz""... $ac_c" 1>&6 echo "configure:3028: checking for gzdopen in -lz" >&5 ac_lib_var=`echo z'_'gzdopen | sed 'y%./+-%__p_%'` @@ -3798,7 +3798,7 @@ s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g -s%@LD_STATIC_FLAG@%$LD_STATIC_FLAG%g +s%@LD_STATIC_FLAG@%%g s%@AIDE_USE_LOCALE@%$AIDE_USE_LOCALE%g s%@ACLLIB@%$ACLLIB%g s%@CRYPTLIB@%$CRYPTLIB%g aide-useless-includes.patch: Index: aide-useless-includes.patch =================================================================== RCS file: aide-useless-includes.patch diff -N aide-useless-includes.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ aide-useless-includes.patch 2 Mar 2006 12:22:25 -0000 1.3 @@ -0,0 +1,11 @@ +--- aide-0.9/src/Makefile.in.orig 2002-06-06 11:08:32.000000000 +0200 ++++ aide-0.9/src/Makefile.in 2002-06-06 11:08:48.000000000 +0200 +@@ -98,7 +98,7 @@ + aide_SOURCES = conf_yacc.y conf_lex.l getopt.c getopt1.c gnu_regex.c error.c md.c db.c commandconf.c db_file.c db_disk.c db_lex.l db_sql.c gen_list.c list.c do_md.c base64.c symboltable.c compare_db.c be.c util.c aide.c + + +-INCLUDES = -I$(prefix)/include -I$(top_srcdir)/include ++INCLUDES = -I$(top_srcdir)/include + + LDADD = @CRYPTLIB@ @ACLLIB@ + Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aide/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 Feb 2006 12:55:39 -0000 1.5 +++ .cvsignore 2 Mar 2006 12:22:25 -0000 1.6 @@ -1,2 +1 @@ -aide-0.11.tar.gz -aide-0.11.tar.gz.asc +aide-0.10.tar.gz Index: aide.spec =================================================================== RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- aide.spec 26 Feb 2006 12:55:39 -0000 1.9 +++ aide.spec 2 Mar 2006 12:22:25 -0000 1.10 @@ -3,21 +3,23 @@ Summary: Intrusion detection environment Name: aide -Version: 0.11 -Release: 1 +Version: 0.10 +Release: 3 URL: http://sourceforge.net/projects/aide License: GPL Group: Applications/System -Source0: http://download.sourceforge.net/aide/aide-%{version}.tar.gz +Source: http://download.sourceforge.net/aide/aide-0.10.tar.gz Source1: aide.conf Source2: README.quickstart -Patch0: aide-0.11-no-static.patch -Patch1: aide-0.11-man-page.patch +Patch0: aide-0.10-no-static.patch +Patch1: aide-useless-includes.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Buildrequires: mhash-devel zlib-devel Buildrequires: flex bison -#Buildrequires: postgresql-devel libgcrypt-devel -#(needs --with-psql and -lgcrypt in src/Makefile.in) +# Red Hat bug #108655, bison requires m4 +Buildrequires: m4 +# Postgresql support doesn't build. +Buildconflicts: postgresql-devel %description AIDE (Advanced Intrusion Detection Environment) is a file integrity @@ -25,14 +27,17 @@ %prep -%setup -q +%setup -q -n aide-0.10 %if 0%{nostatic} %patch0 -p1 -b .no-static %endif -%patch1 -p1 -b .man-page - +%patch1 -p1 %build +# Apply RPM_OPT_FLAGS. +perl -pi -e 's/^CFLAGS="\$LD_STATIC_FLAG\"//' configure +perl -pi -e 's/^CPPFLAGS="\$LD_STATIC_FLAG\"//' configure + %configure --with-config_file=%{_sysconfdir}/aide.conf \ --with-zlib \ --with-mhash --enable-mhash @@ -54,7 +59,8 @@ mkdir -p -m0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/aide install -p %{SOURCE2} README.quickstart mkdir -p -m0755 $RPM_BUILD_ROOT%{_mandir}/ru/man{1,5} - +install -p -m0644 doc/aide.1.ru $RPM_BUILD_ROOT%{_mandir}/ru/man1/aide.1 +install -p -m0644 doc/aide.conf.5.ru $RPM_BUILD_ROOT%{_mandir}/ru/man5/aide.conf.5 %clean rm -rf $RPM_BUILD_ROOT @@ -62,23 +68,19 @@ %files %defattr(0644,root,root,0755) -%doc AUTHORS COPYING ChangeLog NEWS README doc/manual.html contrib/ +%doc AUTHORS COPYING ChangeLog NEWS README ./doc/manual.html %doc README.quickstart %attr(0700,root,root) %{_sbindir}/aide %{_mandir}/man1/* %{_mandir}/man5/* +%lang(ru) %{_mandir}/ru/man1/aide.1* +%lang(ru) %{_mandir}/ru/man5/aide.conf.5* %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/aide.conf %dir %attr(0700,root,root) %{_localstatedir}/lib/aide %changelog -* Sun Feb 26 2006 Michael Schwendt -- Fix wrong paths in manual page. - -* Sun Feb 19 2006 Michael Schwendt - 0.11-1 -- Update to 0.11 release. -- useless-includes patch merged upstream. -- old Russian man pages not available anymore. +* Thu Mar 2 2006 Michael Schwendt - 0.10-3 - disable static linking. * Fri Apr 7 2005 Michael Schwendt Index: sources =================================================================== RCS file: /cvs/extras/rpms/aide/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 26 Feb 2006 12:55:39 -0000 1.5 +++ sources 2 Mar 2006 12:22:25 -0000 1.6 @@ -1,2 +1 @@ -9a44e5386b0355ef57c60f627ff4d085 aide-0.11.tar.gz -866e2aa9f694c0822ddba3a5375c0f7c aide-0.11.tar.gz.asc +39eb7d21064cac7b409c45d038b86cd8 aide-0.10.tar.gz --- aide-0.11-man-page.patch DELETED --- --- aide-0.11-no-static.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 12:24:24 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 07:24:24 -0500 Subject: rpms/aide/devel aide.spec,1.10,1.11 Message-ID: <200603021224.k22COvAS005867@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/aide/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5839 Modified Files: aide.spec Log Message: Index: aide.spec =================================================================== RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- aide.spec 2 Mar 2006 12:22:25 -0000 1.10 +++ aide.spec 2 Mar 2006 12:24:24 -0000 1.11 @@ -4,7 +4,7 @@ Summary: Intrusion detection environment Name: aide Version: 0.10 -Release: 3 +Release: 3.fc5 URL: http://sourceforge.net/projects/aide License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Thu Mar 2 14:16:28 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 09:16:28 -0500 Subject: rpms/WindowMaker/devel WPrefs-uk.po, NONE, 1.1 WindowMaker-0.80.2-cvs-alt-textfield.patch, NONE, 1.1 WindowMaker-0.91.0-alt-adialog.patch, NONE, 1.1 WindowMaker-0.91.0-alt-clipnotext.patch, NONE, 1.1 WindowMaker-0.91.0-alt-dockhotkeys.patch, NONE, 1.1 WindowMaker-0.91.0-alt-focus.patch, NONE, 1.1 WindowMaker-0.91.0-alt-menutrans.patch, NONE, 1.1 WindowMaker-0.91.0-alt-mmx.patch, NONE, 1.1 WindowMaker-0.91.0-alt-restartscrpt.patch, NONE, 1.1 WindowMaker-0.91.0-alt-session.patch, NONE, 1.1 WindowMaker-0.91.0-alt-sowings.patch, NONE, 1.1 WindowMaker-0.91.0-alt-titlebar.patch, NONE, 1.1 WindowMaker-0.91.0-alt-vlaad-newbuttons.patch, NONE, 1.1 WindowMaker-0.91.0-alt-vlaad-trance.patch, NONE, 1.1 WindowMaker-0.91.0-hmepas-minimizeall.patch, NONE, 1.1 WindowMaker-0.91.0-hmepas-swmenu_rclick.patch, NONE, 1.1 WindowMaker-0.91.0-peter-appicon-bouncer2.patch, NONE, 1.1 WindowMaker-0.91.0-peter-mouse-placement.patch, NONE, 1.1 WindowMaker-0.91.0-peter-newappicon.patch, NONE, 1.1 WindowMaker-0.91.0-sga-moving-add.patch, NONE, 1.1 WindowMaker-0.91.0-sga-swpanel-customization.patch, NONE, 1.1 WindowMaker-0.91.0-wmcontrib-singleclick.patch, NONE, 1.1 WindowMaker-0.92.0-alt-newpo.patch, NONE, 1.1 WindowMaker-0.92.0-cvs20060123.patch, NONE, 1.1 WindowMaker-README.newbuttons, NONE, 1.1 WindowMaker-gcc41.patch, NONE, 1.1 WindowMaker-newbuttons.nextstyle.tiff, NONE, 1.1 WindowMaker-newbuttons.nextstyle.xpm, NONE, 1.1 WindowMaker-newbuttons.oldstyle.tiff, NONE, 1.1 WindowMaker-uk.po, NONE, 1.1 .cvsignore, 1.4, 1.5 WindowMaker.spec, 1.16, 1.17 sources, 1.4, 1.5 windowmaker-gcc4-x86_64.patch, 1.2, NONE Message-ID: <200603021417.k22EH0Cj010216@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/WindowMaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10102 Modified Files: .cvsignore WindowMaker.spec sources Added Files: WPrefs-uk.po WindowMaker-0.80.2-cvs-alt-textfield.patch WindowMaker-0.91.0-alt-adialog.patch WindowMaker-0.91.0-alt-clipnotext.patch WindowMaker-0.91.0-alt-dockhotkeys.patch WindowMaker-0.91.0-alt-focus.patch WindowMaker-0.91.0-alt-menutrans.patch WindowMaker-0.91.0-alt-mmx.patch WindowMaker-0.91.0-alt-restartscrpt.patch WindowMaker-0.91.0-alt-session.patch WindowMaker-0.91.0-alt-sowings.patch WindowMaker-0.91.0-alt-titlebar.patch WindowMaker-0.91.0-alt-vlaad-newbuttons.patch WindowMaker-0.91.0-alt-vlaad-trance.patch WindowMaker-0.91.0-hmepas-minimizeall.patch WindowMaker-0.91.0-hmepas-swmenu_rclick.patch WindowMaker-0.91.0-peter-appicon-bouncer2.patch WindowMaker-0.91.0-peter-mouse-placement.patch WindowMaker-0.91.0-peter-newappicon.patch WindowMaker-0.91.0-sga-moving-add.patch WindowMaker-0.91.0-sga-swpanel-customization.patch WindowMaker-0.91.0-wmcontrib-singleclick.patch WindowMaker-0.92.0-alt-newpo.patch WindowMaker-0.92.0-cvs20060123.patch WindowMaker-README.newbuttons WindowMaker-gcc41.patch WindowMaker-newbuttons.nextstyle.tiff WindowMaker-newbuttons.nextstyle.xpm WindowMaker-newbuttons.oldstyle.tiff WindowMaker-uk.po Removed Files: windowmaker-gcc4-x86_64.patch Log Message: - fix #181981 - go to new cvs snapshot (which includes qt fix) - add patches from altlinuxs rpm (suggested by Andrew Zabolotny) - get rid of static libs (finally) - tune configure - add uk translation - finally add extras source - fix stack-smash while reading workspace names --- NEW FILE WPrefs-uk.po --- msgid "" msgstr "" "Project-Id-Version: WPrefs.app 0.80.1\n" "POT-Creation-Date: 2002-02-18 10:15+0200\n" "PO-Revision-Date: 2004-09-06 21:42+4000\n" "Last-Translator: Victor Forsyuk \n" "Language-Team: KSI Linux Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-u\n" "Content-Transfer-Encoding: 8bit\n" "Date: 1999-05-31 19:29:53+0400\n" "From: Victor Forsyuk,,,\n" "Xgettext-Options: --default-domain=WPrefs --add-comments --keyword=_\n" "Files: ../../WPrefs.app/main.c ../../WPrefs.app/WPrefs.c " "../../WPrefs.app/Appearance.c ../../WPrefs.app/Configurations.c " "../../WPrefs.app/Expert.c ../../WPrefs.app/Focus.c ../../WPrefs.app/Icons.c " "../../WPrefs.app/KeyboardSettings.c ../../WPrefs.app/KeyboardShortcuts.c " "../../WPrefs.app/Menu.c ../../WPrefs.app/MenuPreferences.c " "../../WPrefs.app/MouseSettings.c ../../WPrefs.app/NoMenuAlert.c " "../../WPrefs.app/Paths.c ../../WPrefs.app/Preferences.c " "../../WPrefs.app/Text.c ../../WPrefs.app/TexturePanel.c " "../../WPrefs.app/Themes.c ../../WPrefs.app/WindowHandling.c " "../../WPrefs.app/Workspace.c ../../WPrefs.app/double.c " "../../WPrefs.app/editmenu.c ../../WPrefs.app/MenuGuru.c " "../../WPrefs.app/xmodifier.c\n" #: ../../WPrefs.app/Appearance.c:1131 msgid "Select File" msgstr "???????? ????" #: ../../WPrefs.app/Appearance.c:1533 msgid "Focused Window" msgstr "??????? ?????" #: ../../WPrefs.app/Appearance.c:1537 msgid "Unfocused Window" msgstr "????????? ?????" #: ../../WPrefs.app/Appearance.c:1541 msgid "Owner of Focused Window" msgstr "??????? ????????? ?????" #: ../../WPrefs.app/Appearance.c:1545 ../../WPrefs.app/Appearance.c:1862 msgid "Menu Title" msgstr "????? ????" #: ../../WPrefs.app/Appearance.c:1549 ../../WPrefs.app/Appearance.c:1551 msgid "Normal Item" msgstr "????. ?????" #: ../../WPrefs.app/Appearance.c:1555 msgid "Disabled Item" msgstr "???????????" #: ../../WPrefs.app/Appearance.c:1564 msgid "Highlighted" msgstr "???????????" #: ../../WPrefs.app/Appearance.c:1755 msgid "Texture" msgstr "????????" #: ../../WPrefs.app/Appearance.c:1763 msgid "Titlebar of Focused Window" msgstr "????????? ????????? ?????" #: ../../WPrefs.app/Appearance.c:1764 msgid "Titlebar of Unfocused Windows" msgstr "????????? ?????????? ?????" #: ../../WPrefs.app/Appearance.c:1765 msgid "Titlebar of Focused Window's Owner" msgstr "????????? ???????? ????????? ?????" #: ../../WPrefs.app/Appearance.c:1766 msgid "Window Resizebar" msgstr "?????? ????? ??????? ?????" #: ../../WPrefs.app/Appearance.c:1767 msgid "Titlebar of Menus" msgstr "????????? ????" #: ../../WPrefs.app/Appearance.c:1768 msgid "Menu Items" msgstr "?????? ????" #: ../../WPrefs.app/Appearance.c:1769 msgid "Icon Background" msgstr "??? ??????" #: ../../WPrefs.app/Appearance.c:1784 msgid "" "Double click in the texture you want to use\n" "for the selected item." msgstr "" "??????? ????????? ???? ?? ????????, ????? ??????\n" "??????????? ??? ????????? ????????." #: ../../WPrefs.app/Appearance.c:1798 msgid "New" msgstr "????" #: ../../WPrefs.app/Appearance.c:1802 msgid "Create a new texture." msgstr "????????? ????? ????????." #: ../../WPrefs.app/Appearance.c:1810 msgid "Extract..." msgstr "???????..." #: ../../WPrefs.app/Appearance.c:1814 msgid "Extract texture(s) from a theme or a style file." msgstr "????????? ???????(?) ? ???? ?? ?????????? ?????." #: ../../WPrefs.app/Appearance.c:1824 msgid "Edit" msgstr "???????" #: ../../WPrefs.app/Appearance.c:1827 msgid "Edit the highlighted texture." msgstr "??????????? ??????????? ????????." #: ../../WPrefs.app/Appearance.c:1835 ../../WPrefs.app/TexturePanel.c:1316 msgid "Delete" msgstr "????????" #: ../../WPrefs.app/Appearance.c:1839 msgid "Delete the highlighted texture." msgstr "????????? ??????????? ????????." #: ../../WPrefs.app/Appearance.c:1852 msgid "Color" msgstr "?????" #: ../../WPrefs.app/Appearance.c:1859 msgid "Focused Window Title" msgstr "????????? ????????? ?????" #: ../../WPrefs.app/Appearance.c:1860 msgid "Unfocused Window Title" msgstr "????????? ?????????? ?????" #: ../../WPrefs.app/Appearance.c:1861 msgid "Owner of Focused Window Title" msgstr "????????? ???????? ????????? ?????" #: ../../WPrefs.app/Appearance.c:1863 msgid "Menu Item Text" msgstr "????? ?????? ????" #: ../../WPrefs.app/Appearance.c:1864 msgid "Disabled Menu Item Text" msgstr "????? ???????????? ?????? ????" #: ../../WPrefs.app/Appearance.c:1865 msgid "Menu Highlight Color" msgstr "????? ????????? ?????? ????" #: ../../WPrefs.app/Appearance.c:1866 msgid "Highlighted Menu Text Color" msgstr "????? ?????? ???????????? ??????" #: ../../WPrefs.app/Appearance.c:1905 msgid "Background" msgstr "???" #: ../../WPrefs.app/Appearance.c:1917 ../../WPrefs.app/TexturePanel.c:1503 msgid "Browse..." msgstr "???????..." #: ../../WPrefs.app/Appearance.c:1930 msgid "Options" msgstr "?????:" #: ../../WPrefs.app/Appearance.c:1937 msgid "Menu Style" msgstr "????? ????" #: ../../WPrefs.app/Appearance.c:1965 ../../WPrefs.app/Configurations.c:242 #: ../../WPrefs.app/Configurations.c:254 ../../WPrefs.app/Focus.c:288 #: ../../WPrefs.app/Focus.c:299 ../../WPrefs.app/MenuPreferences.c:134 #: ../../WPrefs.app/MenuPreferences.c:145 #: ../../WPrefs.app/MenuPreferences.c:173 #: ../../WPrefs.app/MenuPreferences.c:188 ../../WPrefs.app/MouseSettings.c:560 #: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:558 #: ../../WPrefs.app/WPrefs.c:583 #, c-format msgid "could not load icon file %s" msgstr "?? ???????? ??????????? ???? ?????? %s" #: ../../WPrefs.app/Appearance.c:1979 msgid "Title Alignment" msgstr "?????????" #: ../../WPrefs.app/Appearance.c:1986 msgid "Left" msgstr "???????" #: ../../WPrefs.app/Appearance.c:1989 ../../WPrefs.app/TexturePanel.c:1517 [...1734 lines suppressed...] msgid "Opaque Move" msgstr "?????????? ????" #: ../../WPrefs.app/WindowHandling.c:322 msgid "" "Whether the window contents should be moved\n" "when dragging windows aroung or if only a\n" "frame should be displayed.\n" msgstr "" "?????????? ????? ????? ??? ??????????\n" "????? ?? ?????????? ?????? ?????.\n" #: ../../WPrefs.app/WindowHandling.c:361 msgid "When maximizing..." msgstr "??? ????????????..." #: ../../WPrefs.app/WindowHandling.c:366 msgid "...do not cover icons" msgstr "...?? ????????? ??????" #: ../../WPrefs.app/WindowHandling.c:372 msgid "...do not cover dock" msgstr "...?? ????????? ???" #: ../../WPrefs.app/WindowHandling.c:381 msgid "Edge Resistance" msgstr "???? ?????" #: ../../WPrefs.app/WindowHandling.c:383 msgid "" "Edge resistance will make windows `resist'\n" "being moved further for the defined threshold\n" "when moved against other windows or the edges\n" "of the screen." msgstr "" "?? ??????? `????' ????? ???????????\n" "?? ?????? ????? ??? ??????????? ??????\n" "????? ????? ?? ?? ???? ??????." #: ../../WPrefs.app/WindowHandling.c:402 msgid "Resist" msgstr "????" #: ../../WPrefs.app/WindowHandling.c:407 msgid "Attract" msgstr "??????" #: ../../WPrefs.app/WindowHandling.c:423 msgid "" "Open dialogs in same workspace\n" "as their owners" msgstr "" "?????????? ??????? ?? ?????? ???????? ????? ? ?? \"????????????\" ??????" #: ../../WPrefs.app/WindowHandling.c:450 msgid "Window Handling Preferences" msgstr "????????? ????????? ?????? ? ???????" #: ../../WPrefs.app/WindowHandling.c:452 msgid "" "Window handling options. Initial placement style\n" "edge resistance, opaque move etc." msgstr "" "????? ?????? ? ???????. ????? ??????????? ??????????,\n" "???? ?????, ?????????? ??????????? ? ???? ???????." #: ../../WPrefs.app/Workspace.c:176 msgid "Workspace Navigation" msgstr "????????? ?? ??????? ??????" #: ../../WPrefs.app/Workspace.c:183 msgid "" "wrap to the first workspace after the\n" "last workspace." msgstr "" "?????????? ?? ?????? ??????? ???? ???\n??????????? ?? ????????." #: ../../WPrefs.app/Workspace.c:205 msgid "switch workspaces while dragging windows." msgstr "?????????? ?????? ????? ??? ?????????????\n??? ???? ?????." #: ../../WPrefs.app/Workspace.c:227 msgid "automatically create new workspaces." msgstr "??????????? ?????????? ???? ?????? ?????." #: ../../WPrefs.app/Workspace.c:250 msgid "" "Position of workspace\n" "name display" msgstr "" "??????? ?????? ?????\n" "???????? ?????" #: ../../WPrefs.app/Workspace.c:269 msgid "Disable" msgstr "?? ??????????" #: ../../WPrefs.app/Workspace.c:271 msgid "Top" msgstr "??????" #: ../../WPrefs.app/Workspace.c:272 msgid "Bottom" msgstr "?????" #: ../../WPrefs.app/Workspace.c:273 msgid "Top/Left" msgstr "??????/???????" #: ../../WPrefs.app/Workspace.c:274 msgid "Top/Right" msgstr "??????/????????" #: ../../WPrefs.app/Workspace.c:275 msgid "Bottom/Left" msgstr "?????/???????" #: ../../WPrefs.app/Workspace.c:276 msgid "Bottom/Right" msgstr "????/?????????" #: ../../WPrefs.app/Workspace.c:284 msgid "Dock/Clip" msgstr "???/???????" #: ../../WPrefs.app/Workspace.c:303 msgid "" "Disable/enable the application Dock (the\n" "vertical icon bar in the side of the screen)." msgstr "" "??????????/????????? ??? ??? ???????\n" "(??????????? ?????? ?????? ????? ??????)." #: ../../WPrefs.app/Workspace.c:324 msgid "" "Disable/enable the Clip (that thing with\n" "a paper clip icon)." msgstr "" "??????????/????????? ??????? (????????? ? ???????\n" "??????? ??? ??????? ;)." #: ../../WPrefs.app/Workspace.c:364 msgid "Workspace Preferences" msgstr "????????? ????????? ??? ???????? ?????" #: ../../WPrefs.app/Workspace.c:366 msgid "" "Workspace navigation features.\n" "You can also enable/disable the Dock and Clip here." msgstr "" "????????? ?? ??????? ??????.\n" "??? ????? ????? ?????????/?????????? ??? ?? ???????." #: ../../WPrefs.app/imagebrowser.c:95 msgid "View" msgstr "" #: ../../WPrefs.app/main.c:59 #, c-format msgid "usage: %s [options]\n" msgstr "??????: %s [?????????]\n" #: ../../WPrefs.app/main.c:60 msgid "options:" msgstr "?????????:" #: ../../WPrefs.app/main.c:61 msgid " -display \tdisplay to be used" msgstr " -display \tX ??????? ??? ????????????" #: ../../WPrefs.app/main.c:62 msgid " --version\t\tprint version number and exit" msgstr " --version\t\t???????? ????? ?????? ?? ?????" #: ../../WPrefs.app/main.c:63 msgid " --help\t\tprint this message and exit" msgstr " --help\t\t???????? ?? ???????????? ?? ?????" #: ../../WPrefs.app/main.c:122 #, c-format msgid "too few arguments for %s" msgstr "????? ???? ?????????? ??? %s" #: ../../WPrefs.app/main.c:141 msgid "X server does not support locale" msgstr "X ?????? ?? ????????? locale" #: ../../WPrefs.app/main.c:144 msgid "cannot set locale modifiers" msgstr "?? ???????? ?????????? ???????????? ???????????" #: ../../WPrefs.app/main.c:150 #, c-format msgid "could not open display %s" msgstr "?? ???????? ???????? ??????? %s" #: ../../WPrefs.app/main.c:158 msgid "could not initialize application" msgstr "?? ???????? ?????????????? ????????" WindowMaker-0.80.2-cvs-alt-textfield.patch: --- NEW FILE WindowMaker-0.80.2-cvs-alt-textfield.patch --- --- WindowMaker-0.80.2/WINGs/WINGs/WINGs.h.textfield 2003-10-20 23:57:14 +0400 +++ WindowMaker-0.80.2/WINGs/WINGs/WINGs.h 2003-10-22 09:21:11 +0400 @@ -1154,6 +1154,8 @@ void WMSetTextFieldCursorPosition(WMTextField *tPtr, unsigned int position); +unsigned WMGetTextFieldCursorPosition(WMTextField *tPtr); + void WMSetTextFieldNextTextField(WMTextField *tPtr, WMTextField *next); void WMSetTextFieldPrevTextField(WMTextField *tPtr, WMTextField *prev); --- WindowMaker-0.80.2/WINGs/wtextfield.c.textfield 2003-10-20 23:57:14 +0400 +++ WindowMaker-0.80.2/WINGs/wtextfield.c 2003-10-22 09:20:31 +0400 @@ -617,6 +617,14 @@ } } +unsigned +WMGetTextFieldCursorPosition(WMTextField *tPtr) +{ + CHECK_CLASS(tPtr, WC_TextField); + + return tPtr->cursorPosition; +} + void WMSetTextFieldNextTextField(WMTextField *tPtr, WMTextField *next) WindowMaker-0.91.0-alt-adialog.patch: --- NEW FILE WindowMaker-0.91.0-alt-adialog.patch --- --- WindowMaker-0.91.0/src/misc.c.vns 2005-05-18 18:08:11 +0400 +++ WindowMaker-0.91.0/src/misc.c 2005-05-18 18:11:20 +0400 @@ -607,96 +607,59 @@ static char* -getuserinput(WScreen *scr, char *line, int *ptr) +parseuserinputpart(char *line, int *ptr, char *endchars) { - char *ret; - char *title; - char *prompt; - int j, state; - int begin = 0; -#define BUFSIZE 512 - char tbuffer[BUFSIZE], pbuffer[BUFSIZE]; - - - title = _("Program Arguments"); - prompt = _("Enter command arguments:"); - ret = NULL; - -#define _STARTING 0 -#define _TITLE 1 -#define _PROMPT 2 -#define _DONE 3 - - state = _STARTING; - j = 0; - for (; line[*ptr]!=0 && state!=_DONE; (*ptr)++) { - switch (state) { - case _STARTING: - if (line[*ptr]=='(') { - state = _TITLE; - begin = *ptr+1; - } else { - state = _DONE; - } - break; - - case _TITLE: - if (j <= 0 && line[*ptr]==',') { - - j = 0; - if (*ptr > begin) { - strncpy(tbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE)); - tbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0; - title = (char*)tbuffer; - } - begin = *ptr+1; - state = _PROMPT; - - } else if (j <= 0 && line[*ptr]==')') { - - if (*ptr > begin) { - strncpy(tbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE)); - tbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0; - title = (char*)tbuffer; - } - state = _DONE; - - } else if (line[*ptr]=='(') { - j++; - } else if (line[*ptr]==')') { - j--; - } - - break; + int depth = 0, begin; + char *value = NULL; + begin = ++*ptr; + + while(line[*ptr] != '\0') { + if(line[*ptr] == '(') { + ++depth; + } else if(depth > 0 && line[*ptr] == ')') { + --depth; + } else if(depth == 0 && strchr(endchars, line[*ptr]) != NULL) { + value = wmalloc(*ptr - begin + 1); + strncpy(value, line + begin, *ptr - begin); + value[*ptr - begin] = '\0'; + break; + } + ++*ptr; + } - case _PROMPT: - if (line[*ptr]==')' && j==0) { + return value; +} - if (*ptr-begin > 1) { - strncpy(pbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE)); - pbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0; - prompt = (char*)pbuffer; - } - state = _DONE; - } else if (line[*ptr]=='(') - j++; - else if (line[*ptr]==')') - j--; - break; - } - } - (*ptr)--; -#undef _STARTING -#undef _TITLE -#undef _PROMPT -#undef _DONE +static char* +getuserinput(WScreen *scr, char *line, int *ptr, Bool advanced) +{ + char *ret = NULL, *title = NULL, *prompt = NULL, *name = NULL; + int rv; - if (!wInputDialog(scr, title, prompt, &ret)) - return NULL; + if(line[*ptr] == '(') + title = parseuserinputpart(line, ptr, ",)"); + if(title != NULL && line[*ptr] == ',') + prompt = parseuserinputpart(line, ptr, ",)"); + if(prompt != NULL && line[*ptr] == ',') + name = parseuserinputpart(line, ptr, ")"); + + if(advanced) + rv = wAdvancedInputDialog(scr, + title ? gettext(title):_("Program Arguments"), + prompt ? gettext(prompt):_("Enter command arguments:"), + name, &ret); else - return ret; -} + rv = wInputDialog(scr, + title ? gettext(title):_("Program Arguments"), + prompt ? gettext(prompt):_("Enter command arguments:"), + &ret); + + if(title) wfree(title); + if(prompt) wfree(prompt); + if(name) wfree(name); + return rv ? ret : NULL; +} #define S_NORMAL 0 #define S_ESCAPE 1 @@ -814,8 +777,9 @@ break; case 'a': + case 'A': ptr++; - user_input = getuserinput(scr, cmdline, &ptr); + user_input = getuserinput(scr, cmdline, &ptr, cmdline[ptr-1] == 'A'); if (user_input) { slen = strlen(user_input); olen += slen; --- WindowMaker-0.91.0/src/dialog.c.vns 2005-05-18 18:08:11 +0400 +++ WindowMaker-0.91.0/src/dialog.c 2005-05-18 18:08:11 +0400 @@ -178,6 +178,328 @@ return result; } +typedef struct _WMInputPanelWithHistory +{ + WMInputPanel *panel; + WMArray *history; + int histpos; + char *prefix; + char *suffix; + char *rest; + WMArray *variants; + int varpos; +} WMInputPanelWithHistory; + +static char * +HistoryFileName(char *name) +{ + char *filename = NULL; + + filename = wstrdup(wusergnusteppath()); + filename = wstrappend(filename, "/.AppInfo/WindowMaker/History"); + if(name && strlen(name)) { + filename = wstrappend(filename, "."); + filename = wstrappend(filename, name); + } + return filename; +} + +static int +matchString(void *str1, void *str2) +{ + return (strcmp((char*)str1, (char*)str2)==0 ? 1 : 0); +} + +static WMArray * +LoadHistory(char *filename, int max) +{ + WMPropList *plhistory; + WMPropList *plitem; + WMArray *history; + int i, num; + + history = WMCreateArrayWithDestructor(1, wfree); + WMAddToArray(history, wstrdup("")); + + plhistory = WMReadPropListFromFile((char*)filename); + + if(plhistory && WMIsPLArray(plhistory)) { + num = WMGetPropListItemCount(plhistory); + if(num > max) num = max; + + for(i = 0; i < num; ++i) { + plitem = WMGetFromPLArray(plhistory, i); + if(WMIsPLString(plitem) && WMFindInArray(history, matchString, + WMGetFromPLString(plitem)) == WANotFound) + WMAddToArray(history, WMGetFromPLString(plitem)); + } + } + + return history; +} + +static void +SaveHistory(WMArray *history, char *filename) +{ + int i; + WMPropList *plhistory; + + plhistory = WMCreatePLArray(NULL); + + for(i = 0; i < WMGetArrayItemCount(history); ++i) + WMAddToPLArray(plhistory, + WMCreatePLString(WMGetFromArray(history, i))); + + WMWritePropListToFile(plhistory, (char*)filename, False); + WMReleasePropList(plhistory); +} + +static int +strmatch(const char *str1, const char *str2) +{ + return !strcmp(str1, str2); +} + +static int +pstrcmp(const char **str1, const char **str2) +{ + return strcmp(*str1, *str2); +} + +static void +ScanFiles(const char *dir, const char *prefix, unsigned acceptmask, + unsigned declinemask, WMArray *result) +{ + int prefixlen; + DIR *d; + struct dirent *de; + struct stat sb; + char *fullfilename, *suffix; + + prefixlen = strlen(prefix); + if((d = opendir(dir)) != NULL) { + while((de = readdir(d)) != NULL) { + if(strlen(de->d_name) > prefixlen && + !strncmp(prefix, de->d_name, prefixlen) && + strcmp(de->d_name, ".") != 0 && + strcmp(de->d_name, "..")) { + fullfilename = wstrconcat((char*)dir, "/"); + fullfilename = wstrappend(fullfilename, de->d_name); + + if(stat(fullfilename, &sb) == 0 && + (sb.st_mode & acceptmask) && + !(sb.st_mode & declinemask) && + WMFindInArray(result, (WMMatchDataProc*)strmatch, + de->d_name + prefixlen) == WANotFound) { + suffix = wstrdup(de->d_name + prefixlen); + WMAddToArray(result, suffix); + } + wfree(fullfilename); + } + } + closedir(d); + } +} + +static WMArray * +GenerateVariants(const char * complete) +{ + Bool firstWord = True; + WMArray *variants = NULL; + char *pos = NULL, *path = NULL, *tmp = NULL, *dir = NULL, *prefix = NULL; + + variants = WMCreateArrayWithDestructor(0, wfree); + + while(*complete == ' ') ++complete; + + if((pos = strrchr(complete, ' ')) != NULL) { + complete = pos + 1; + firstWord = False; + } + + if((pos = strrchr(complete, '/')) != NULL) { + tmp = wstrndup((char*)complete, pos - complete + 1); + if(*tmp == '~' && *(tmp+1) == '/' && getenv("HOME")) { + dir = wstrdup(getenv("HOME")); + dir = wstrappend(dir, tmp + 1); + wfree(tmp); + } else { + dir = tmp; + } + prefix = wstrdup(pos + 1); + ScanFiles(dir, prefix, (unsigned)-1, 0, variants); + wfree(dir); + wfree(prefix); + } else if(*complete == '~') { + WMAddToArray(variants, wstrdup("/")); + } else if(firstWord) { + path = getenv("PATH"); + while(path) { + pos = strchr(path, ':'); + if(pos) { + tmp = wstrndup(path, pos - path); + path = pos + 1; + } else if(*path != '\0') { + tmp = wstrdup(path); + path = NULL; + } else break; + ScanFiles(tmp, complete, + S_IXOTH | S_IXGRP | S_IXUSR, S_IFDIR, variants); + wfree(tmp); + } + } + + WMSortArray(variants, (WMCompareDataProc*)pstrcmp); + return variants; +} + +static void +handleHistoryKeyPress(XEvent *event, void *clientData) +{ + char *text; + unsigned pos; + WMInputPanelWithHistory *p = (WMInputPanelWithHistory*)clientData; + KeySym ksym; + + ksym = XLookupKeysym(&event->xkey, 0); + + switch(ksym) + { + case XK_Up: + if(p->histpos < WMGetArrayItemCount(p->history) - 1) { + if(p->histpos == 0) + wfree(WMReplaceInArray(p->history, + 0, WMGetTextFieldText(p->panel->text))); + p->histpos++; + WMSetTextFieldText(p->panel->text, + WMGetFromArray(p->history, p->histpos)); + } + break; + case XK_Down: + if(p->histpos > 0) { + p->histpos--; + WMSetTextFieldText(p->panel->text, + WMGetFromArray(p->history, p->histpos)); + } + break; + case XK_Tab: + if(!p->variants) { + text = WMGetTextFieldText(p->panel->text); + pos = WMGetTextFieldCursorPosition(p->panel->text); + p->prefix = wstrndup(text, pos); + p->suffix = wstrdup(text + pos); + wfree(text); + p->variants = GenerateVariants(p->prefix); + p->varpos = 0; + if(!p->variants) { + wfree(p->prefix); + wfree(p->suffix); + p->prefix = NULL; + p->suffix = NULL; + } + } + if(p->variants && p->prefix && p->suffix) { + p->varpos++; + if(p->varpos > WMGetArrayItemCount(p->variants)) + p->varpos = 0; + if(p->varpos > 0) + text = wstrconcat(p->prefix, + WMGetFromArray(p->variants, p->varpos - 1)); + else + text = wstrdup(p->prefix); + pos = strlen(text); + text = wstrappend(text, p->suffix); + WMSetTextFieldText(p->panel->text, text); + WMSetTextFieldCursorPosition(p->panel->text, pos); + wfree(text); + } + break; + } + if(ksym != XK_Tab) { + if(p->prefix) { + wfree(p->prefix); + p->prefix = NULL; + } + if(p->suffix) { + wfree(p->suffix); + p->suffix = NULL; + } + if(p->variants) { + WMFreeArray(p->variants); + p->variants = NULL; + } + } +} + +int +wAdvancedInputDialog(WScreen *scr, char *title, char *message, + char *name, char **text) +{ + WWindow *wwin; + Window parent; + char *result; + WMPoint center; + WMInputPanelWithHistory *p; + char *filename; + + filename = HistoryFileName(name); + p = wmalloc(sizeof(WMInputPanelWithHistory)); + p->panel = WMCreateInputPanel(scr->wmscreen, NULL, title, message, *text, + _("OK"), _("Cancel")); + p->history = LoadHistory(filename, wPreferences.history_lines); + p->histpos = 0; + p->prefix = NULL; + p->suffix = NULL; + p->rest = NULL; + p->variants = NULL; + p->varpos = 0; + WMCreateEventHandler(WMWidgetView(p->panel->text), KeyPressMask, + handleHistoryKeyPress, p); + + parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, 320, 160, 0, 0, 0); + XSelectInput(dpy, parent, KeyPressMask|KeyReleaseMask); + + XReparentWindow(dpy, WMWidgetXID(p->panel->win), parent, 0, 0); + + center = getCenter(scr, 320, 160); + wwin = wManageInternalWindow(scr, parent, None, NULL, center.x, center.y, + 320, 160); + + wwin->client_leader = WMWidgetXID(p->panel->win); + + WMMapWidget(p->panel->win); + + wWindowMap(wwin); + + WMRunModalLoop(WMWidgetScreen(p->panel->win), WMWidgetView(p->panel->win)); + + if (p->panel->result == WAPRDefault) { + result = WMGetTextFieldText(p->panel->text); + wfree(WMReplaceInArray(p->history, 0, wstrdup(result))); + SaveHistory(p->history, filename); + } + else + result = NULL; + + wUnmanageWindow(wwin, False, False); + + WMDestroyInputPanel(p->panel); + WMFreeArray(p->history); + wfree(p); + wfree(filename); + + XDestroyWindow(dpy, parent); + + if (result==NULL) + return False; + else { + if (*text) + wfree(*text); + *text = result; + + return True; + } +} int wInputDialog(WScreen *scr, char *title, char *message, char **text) --- WindowMaker-0.91.0/src/dialog.h.vns 2004-10-12 21:54:37 +0400 +++ WindowMaker-0.91.0/src/dialog.h 2005-05-18 18:11:54 +0400 @@ -33,6 +33,7 @@ int wMessageDialog(WScreen *scr, char *title, char *message, char *defBtn, char *altBtn, char *othBtn); +int wAdvancedInputDialog(WScreen *scr, char *title, char *message, char *name, char **text); int wInputDialog(WScreen *scr, char *title, char *message, char **text); int wExitDialog(WScreen *scr, char *title, char *message, char *defBtn, --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 18:08:11 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 18:08:11 +0400 @@ -894,6 +894,9 @@ }, {"SelectCursor", "(builtin, cross)", (void*)WCUR_SELECT, NULL, getCursor, setCursor + }, + {"DialogHistoryLines", "500", NULL, + &wPreferences.history_lines, getInt, NULL } }; --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 18:08:11 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 18:08:11 +0400 @@ -491,6 +491,7 @@ char single_click; int show_clip_title; + int history_lines; struct { unsigned int nodock:1; /* don't display the dock */ WindowMaker-0.91.0-alt-clipnotext.patch: --- NEW FILE WindowMaker-0.91.0-alt-clipnotext.patch --- --- WindowMaker-0.91.0/src/dock.c.vns 2005-05-18 16:29:46 +0400 +++ WindowMaker-0.91.0/src/dock.c 2005-05-18 16:31:23 +0400 @@ -1295,8 +1295,9 @@ tx = CLIP_BUTTON_SIZE*ICON_SIZE/64; - WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, tx, - ty, ws_name, length); + if(wPreferences.show_clip_title) + WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, tx, + ty, ws_name, length); /*WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, 4, 2, ws_name, length);*/ --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 16:29:46 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 16:29:46 +0400 @@ -633,6 +633,9 @@ {"ClipTitleFont", DEF_CLIP_TITLE_FONT, NULL, NULL, getFont, setClipTitleFont }, + {"ShowClipTitle", "YES", NULL, + &wPreferences.show_clip_title, getBool, NULL + }, {"LargeDisplayFont",DEF_WORKSPACE_NAME_FONT, NULL, NULL, getFont, setLargeDisplayFont }, --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 16:29:46 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 16:29:46 +0400 @@ -490,6 +490,8 @@ /* single click to lauch applications */ char single_click; + int show_clip_title; + struct { unsigned int nodock:1; /* don't display the dock */ unsigned int noclip:1; /* don't display the clip */ WindowMaker-0.91.0-alt-dockhotkeys.patch: --- NEW FILE WindowMaker-0.91.0-alt-dockhotkeys.patch --- --- WindowMaker-0.91.0/src/dock.c.vns 2005-05-18 11:49:00 +0400 +++ WindowMaker-0.91.0/src/dock.c 2005-05-18 12:01:06 +0400 @@ -96,6 +96,7 @@ #ifdef XDND /* XXX was OFFIX */ static WMPropList *dDropCommand=NULL; #endif +static WMPropList *dKeyboardShortcut=NULL; static WMPropList *dAutoLaunch, *dLock; static WMPropList *dName, *dForced, *dBuggyApplication, *dYes, *dNo; static WMPropList *dHost, *dDock, *dClip; @@ -151,6 +152,7 @@ #ifdef XDND dDropCommand = WMRetainPropList(WMCreatePLString("DropCommand")); #endif + dKeyboardShortcut = WMRetainPropList(WMCreatePLString("Shortcut")); dLock = WMRetainPropList(WMCreatePLString("Lock")); dAutoLaunch = WMRetainPropList(WMCreatePLString("AutoLaunch")); dName = WMRetainPropList(WMCreatePLString("Name")); @@ -1398,6 +1400,12 @@ WMReleasePropList(command); } + if (btn->keyboard_shortcut) { + command = WMCreatePLString(btn->keyboard_shortcut); + WMPutInPLDictionary(node, dKeyboardShortcut, command); + WMReleasePropList(command); + } + if (btn->client_machine && btn->remote_start) { host = WMCreatePLString(btn->client_machine); WMPutInPLDictionary(node, dHost, host); @@ -1613,6 +1621,12 @@ aicon->dnd_command = wstrdup(WMGetFromPLString(cmd)); #endif + cmd = WMGetFromPLDictionary(info, dKeyboardShortcut); + if (cmd) { + if(addDockShortcut(WMGetFromPLString(cmd), aicon)) + aicon->keyboard_shortcut = wstrdup(WMGetFromPLString(cmd)); + } + cmd = WMGetFromPLDictionary(info, dPasteCommand); if (cmd) aicon->paste_command = wstrdup(WMGetFromPLString(cmd)); @@ -1918,6 +1932,8 @@ if (type == WM_DOCK) dock->icon_count = 0; + dock->screen_ptr->flags.dock_changed_shortcuts = 0; + for (i=0; iicon_count >= dock->max_icons) { wwarning(_("there are too many icons stored in dock. Ignoring what doesn't fit")); @@ -1950,6 +1966,11 @@ } else if (dock->icon_count==0 && type==WM_DOCK) dock->icon_count++; } + if(dock->screen_ptr->flags.dock_changed_shortcuts) + { + rebindKeygrabs(dock->screen_ptr); + dock->screen_ptr->flags.dock_changed_shortcuts = 0; + } /* if the first icon is not defined, use the default */ if (dock->icon_array[0]==NULL) { @@ -4479,3 +4500,125 @@ return status; } +Bool +addDockShortcut(char *shortcutDefinition, WAppIcon *icon) +{ + int modifier = 0; + KeyCode keycode; + KeySym ksym; + char *k; + char buf[128], *b; + + strcpy(buf, shortcutDefinition); + b = (char*)buf; + + /* get modifiers */ + while((k = strchr(b, '+'))!=NULL) { + int mod; + + *k = 0; + mod = wXModifierFromKey(b); + if(mod < 0) { + wwarning(_("invalid key modifier \"%s\""), b); + return False; + } + modifier |= mod; + + b = k+1; + } + + /* get key */ + ksym = XStringToKeysym(b); + + if (ksym==NoSymbol) { + wwarning(_("invalid kbd shortcut specification \"%s\""), shortcutDefinition); + return False; + } + + keycode = XKeysymToKeycode(dpy, ksym); + if (keycode==0) { + wwarning(_("invalid key in shortcut \"%s\""), shortcutDefinition); + return False; + } + icon->modifier = modifier; + icon->keycode = keycode; + if(icon->dock && icon->dock->screen_ptr) + icon->dock->screen_ptr->flags.dock_changed_shortcuts = 1; + return True; +} + +static Bool +wDockPerformShortcut(WDock *dock, XEvent *event) +{ + int i; + int modifiers; + int done = 0; + + if(!dock) return done; + modifiers = event->xkey.state & ValidModMask; + for(i=(dock->type==WM_DOCK ? 0 : 1); imax_icons; i++) { + WAppIcon *btn = dock->icon_array[i]; + + if(!btn || btn->attracted) + continue; + + if(btn->keycode==event->xkey.keycode && (btn->modifier==modifiers)) { + launchDockedApplication(btn, False); + done = True; + break; + } + + } + return done; +} + +Bool +wDockAndClipPerformShortcut(WScreen *scr, XEvent *event) +{ + int done = 0; + int i; + if(!(done = wDockPerformShortcut(scr->dock, event))) { + for(i=0; i < scr->workspace_count; i++) { + if(done = wDockPerformShortcut(scr->workspaces[i]->clip, event)) break; + } + } + return done; +} + +static void +wDockBindShortcuts(Window window, WDock* dock) +{ + int i; + if(!dock) return; + for(i=(dock->type==WM_DOCK ? 0 : 1); imax_icons; i++) { + WAppIcon *btn = dock->icon_array[i]; + + if(!btn || btn->attracted) + continue; + + if(btn->keyboard_shortcut) + { + if(btn->keyboard_shortcut && btn->modifier!=AnyModifier) { + XGrabKey(dpy, btn->keycode, btn->modifier|LockMask, + window, True, GrabModeAsync, GrabModeAsync); +#ifdef NUMLOCK_HACK + wHackedGrabKey(btn->keycode, btn->modifier, + window, True, GrabModeAsync, GrabModeAsync); +#endif + } + XGrabKey(dpy, btn->keycode, btn->modifier, window, True, + GrabModeAsync, GrabModeAsync); + } + } +} + +void +wDockAndClipBindShortcuts(Window window, WScreen *scr) +{ + int i; + wDockBindShortcuts(window, scr->dock); + for(i=0; i < scr->workspace_count; i++ ) { + wDockBindShortcuts(window, scr->workspaces[i]->clip); + } +} + --- WindowMaker-0.91.0/src/appicon.c.vns 2005-05-18 11:49:00 +0400 +++ WindowMaker-0.91.0/src/appicon.c 2005-05-18 11:49:00 +0400 @@ -197,6 +197,8 @@ if (aicon->dnd_command) wfree(aicon->dnd_command); #endif + if (aicon->keyboard_shortcut) + wfree(aicon->keyboard_shortcut); if (aicon->wm_instance) wfree(aicon->wm_instance); if (aicon->wm_class) --- WindowMaker-0.91.0/src/appicon.h.vns 2004-10-14 21:31:49 +0400 +++ WindowMaker-0.91.0/src/appicon.h 2005-05-18 11:50:01 +0400 @@ -52,6 +52,10 @@ char *paste_command; /* command to run when something is pasted */ + char *keyboard_shortcut; /* keyboard shortcut to launch app */ + int modifier; + KeyCode keycode; + char *wm_class; char *wm_instance; pid_t pid; /* for apps launched from the dock */ --- WindowMaker-0.91.0/src/dockedapp.c.vns 2004-10-14 21:31:49 +0400 +++ WindowMaker-0.91.0/src/dockedapp.c 2005-05-18 11:56:22 +0400 @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -66,6 +67,10 @@ WMTextField *pasteCommandField; WMLabel *pasteCommandLabel; + WMFrame *keyboardShortcutFrame; + WMTextField *keyboardShortcutField; + WMButton *keyboardShortcutCaptureBtn; + WMFrame *iconFrame; WMTextField *iconField; WMButton *browseBtn; @@ -81,6 +86,7 @@ /* kluge */ unsigned int destroyed:1; unsigned int choosingIcon:1; + unsigned int capturing:1; } AppSettingsPanel; @@ -117,6 +123,43 @@ icon->paste_command = command; } +static char* +trimstr(char *str) +{ + char *p = str; + int i; + + while (isspace(*p)) p++; + p = wstrdup(p); + i = strlen(p); + while (isspace(p[i]) && i>0) { + p[i]=0; + i--; + } + + return p; +} + +static void +updateKeyboardShortcut(WAppIcon *icon, char *shortcut) +{ + char *str = NULL; + if(icon->keyboard_shortcut) + wfree(icon->keyboard_shortcut); + if(shortcut) { + str = trimstr(shortcut); + if(!strlen(str)) { + wfree(str); + str = NULL; + } + } + icon->keyboard_shortcut = str; + icon->modifier = 0; + icon->keycode = 0; + if(str) addDockShortcut(str, icon); + rebindKeygrabs(icon->dock->screen_ptr); +} + #ifdef XDND @@ -267,6 +310,8 @@ text = WMGetTextFieldText(panel->pasteCommandField); updatePasteCommand(panel->editedIcon, text); + text = WMGetTextFieldText(panel->keyboardShortcutField); + updateKeyboardShortcut(panel->editedIcon, text); panel->editedIcon->auto_launch = WMGetButtonSelected(panel->autoLaunchBtn); @@ -279,9 +324,83 @@ DestroyDockAppSettingsPanel(panel); } +static char* +captureShortcut(Display *dpy, AppSettingsPanel *panel) +{ + XEvent ev; + KeySym ksym, lksym, uksym; + char buffer[64]; + char *key = NULL; + + while (panel->capturing) { + XAllowEvents(dpy, AsyncKeyboard, CurrentTime); + WMNextEvent(dpy, &ev); + if (ev.type==KeyPress && ev.xkey.keycode!=0) { + ksym = XKeycodeToKeysym(dpy, ev.xkey.keycode, 0); + if (!IsModifierKey(ksym)) { + XConvertCase(ksym, &lksym, &uksym); + key=XKeysymToString(uksym); + panel->capturing = 0; + break; + } + } + WMHandleEvent(&ev); + } + if (!key) + return NULL; + + buffer[0] = 0; + if (ev.xkey.state & ControlMask) { + strcat(buffer, "Control+"); + } + if (ev.xkey.state & ShiftMask) { + strcat(buffer, "Shift+"); + } + if (ev.xkey.state & Mod1Mask) { + strcat(buffer, "Mod1+"); + } + if (ev.xkey.state & Mod2Mask) { + strcat(buffer, "Mod2+"); + } + if (ev.xkey.state & Mod3Mask) { + strcat(buffer, "Mod3+"); + } + if (ev.xkey.state & Mod4Mask) { + strcat(buffer, "Mod4+"); + } + if (ev.xkey.state & Mod5Mask) { + strcat(buffer, "Mod5+"); + } + strcat(buffer, key); + + return wstrdup(buffer); +} + +static void +captureClick(WMWidget *w, void *data) +{ + AppSettingsPanel *panel = (AppSettingsPanel*)data; + char *shortcut; + + if(!panel->capturing) { + panel->capturing = 1; + WMSetButtonText(w, _("Cancel")); + XGrabKeyboard(dpy, WMWidgetXID(panel->win), True, GrabModeAsync, + GrabModeAsync, CurrentTime); + shortcut = captureShortcut(dpy, panel); + if (shortcut) { + WMSetTextFieldText(panel->keyboardShortcutField, shortcut); + wfree(shortcut); + } + } + panel->capturing = 0; + WMSetButtonText(w, _("Capture")); + XUngrabKeyboard(dpy, CurrentTime); +} + #define PWIDTH 295 -#define PHEIGHT 430 +#define PHEIGHT 490 void @@ -396,6 +515,21 @@ #endif WMMapSubwidgets(panel->dndCommandFrame); + panel->keyboardShortcutFrame = WMCreateFrame(vbox); + WMSetFrameTitle(panel->keyboardShortcutFrame, _("Keyboard shortcut")); + WMAddBoxSubview(vbox, WMWidgetView(panel->keyboardShortcutFrame), False, True, + 50, 50, 10); + panel->keyboardShortcutField = WMCreateTextField(panel->keyboardShortcutFrame); + WMResizeWidget(panel->keyboardShortcutField, 176, 20); + WMMoveWidget(panel->keyboardShortcutField, 10, 20); + WMSetTextFieldText(panel->keyboardShortcutField, aicon->keyboard_shortcut); + panel->keyboardShortcutCaptureBtn = WMCreateCommandButton(panel->keyboardShortcutFrame); + WMSetButtonText(panel->keyboardShortcutCaptureBtn, _("Capture")); + WMResizeWidget(panel->keyboardShortcutCaptureBtn, 70, 24); + WMMoveWidget(panel->keyboardShortcutCaptureBtn, 195, 18); + WMSetButtonAction(panel->keyboardShortcutCaptureBtn, captureClick, panel); + WMMapSubwidgets(panel->keyboardShortcutFrame); + panel->iconFrame = WMCreateFrame(vbox); WMSetFrameTitle(panel->iconFrame, _("Icon Image")); WMAddBoxSubview(vbox, WMWidgetView(panel->iconFrame), False, True, --- WindowMaker-0.91.0/src/event.c.vns 2004-10-24 23:19:50 +0400 +++ WindowMaker-0.91.0/src/event.c 2005-05-18 11:57:21 +0400 @@ -1364,7 +1364,7 @@ } #endif #else - if (!wRootMenuPerformShortcut(event)) { + if (!wRootMenuPerformShortcut(event) && !wDockAndClipPerformShortcut(scr, event)) { #endif static int dontLoop = 0; --- WindowMaker-0.91.0/src/rootmenu.c.vns 2005-05-18 11:49:00 +0400 +++ WindowMaker-0.91.0/src/rootmenu.c 2005-05-18 11:49:00 +0400 @@ -466,7 +466,7 @@ } -static void +void rebindKeygrabs(WScreen *scr) { WWindow *wwin; --- WindowMaker-0.91.0/src/screen.h.vns 2004-10-23 03:58:59 +0400 +++ WindowMaker-0.91.0/src/screen.h 2005-05-18 11:58:11 +0400 @@ -307,6 +307,7 @@ unsigned int regenerate_icon_textures:1; unsigned int dnd_data_convertion_status:1; unsigned int root_menu_changed_shortcuts:1; + unsigned int dock_changed_shortcuts:1; unsigned int added_workspace_menu:1; unsigned int added_windows_menu:1; unsigned int startup2:1; /* startup phase 2 */ --- WindowMaker-0.91.0/src/window.c.vns 2005-05-18 11:49:00 +0400 +++ WindowMaker-0.91.0/src/window.c 2005-05-18 11:49:00 +0400 @@ -2820,6 +2820,7 @@ #ifndef LITE wRootMenuBindShortcuts(wwin->frame->core->window); + wDockAndClipBindShortcuts(wwin->frame->core->window, wwin->screen_ptr); #endif } WindowMaker-0.91.0-alt-focus.patch: --- NEW FILE WindowMaker-0.91.0-alt-focus.patch --- --- WindowMaker-0.91.0/src/actions.c.vns 2005-05-18 22:16:13 +0400 +++ WindowMaker-0.91.0/src/actions.c 2005-05-18 22:17:23 +0400 @@ -1251,6 +1251,9 @@ /* In case we were shaded and iconified, also unshade */ if (!netwm_hidden) wUnshadeWindow(wwin); + + if (wwin->flags.focused) + wSetFocusTo(wwin->screen_ptr, wwin); } WindowMaker-0.91.0-alt-menutrans.patch: --- NEW FILE WindowMaker-0.91.0-alt-menutrans.patch --- --- WindowMaker-0.91.0/src/rootmenu.c.vns 2005-05-18 14:12:23 +0400 +++ WindowMaker-0.91.0/src/rootmenu.c 2005-05-18 14:12:23 +0400 @@ -355,6 +355,17 @@ wShowLegalPanel(menu->frame->screen_ptr); } +/************ translate menu item on the fly *************/ +#define NOTRANSLATE_PREFIX "notranslate " +static char* +translateMenuTitle(char* title) +{ + if(!strncmp(NOTRANSLATE_PREFIX, title, strlen(NOTRANSLATE_PREFIX))) + return title + strlen(NOTRANSLATE_PREFIX); + if(wPreferences.translate_menu) + return dgettext("menu-messages", title); + return title; +} /********************************************************************/ @@ -1146,13 +1157,13 @@ /* start submenu */ - cascade = wMenuCreate(scr, title, False); + cascade = wMenuCreate(scr, translateMenuTitle(title), False); cascade->on_destroy = removeShortcutsForMenu; if (parseCascade(scr, cascade, file, file_name)==NULL) { wMenuDestroy(cascade, True); } else { wMenuEntrySetCascade(menu, - wMenuAddCallback(menu, title, NULL, NULL), + wMenuAddCallback(menu, translateMenuTitle(title), NULL, NULL), cascade); } } else if (strcasecmp(command, "END")==0) { @@ -1161,7 +1172,7 @@ } else { /* normal items */ - addMenuEntry(menu, title, shortcut[0] ? shortcut : NULL, command, + addMenuEntry(menu, translateMenuTitle(title), shortcut[0] ? shortcut : NULL, command, params[0] ? params : NULL, file_name); } } @@ -1534,7 +1545,7 @@ strcat(buffer, command); } - addMenuEntry(menu, data->name, NULL, "OPEN_MENU", buffer, path[data->index]); + addMenuEntry(menu, translateMenuTitle(data->name), NULL, "OPEN_MENU", buffer, path[data->index]); wfree(buffer); if (data->name) @@ -1582,7 +1593,7 @@ if (ptr && ptr!=data->name) *ptr = 0; } - addMenuEntry(menu, data->name, NULL, "SHEXEC", buffer, path[data->index]); + addMenuEntry(menu, translateMenuTitle(data->name), NULL, "SHEXEC", buffer, path[data->index]); wfree(buffer); if (data->name) @@ -1701,7 +1712,7 @@ } mtitle = WMGetFromPLString(elem); - menu = wMenuCreate(scr, mtitle, False); + menu = wMenuCreate(scr, translateMenuTitle(mtitle), False); menu->on_destroy = removeShortcutsForMenu; #ifdef GLOBAL_SUBMENU_FILE @@ -1738,7 +1749,7 @@ /* submenu */ submenu = configureMenu(scr, elem); if (submenu) { - mentry = wMenuAddCallback(menu, submenu->frame->title, NULL, + mentry = wMenuAddCallback(menu, translateMenuTitle(submenu->frame->title), NULL, NULL); wMenuEntrySetCascade(menu, mentry, submenu); } @@ -1761,7 +1772,7 @@ if (!title || !command) goto error; - addMenuEntry(menu, WMGetFromPLString(title), + addMenuEntry(menu, translateMenuTitle(WMGetFromPLString(title)), shortcut ? WMGetFromPLString(shortcut) : NULL, WMGetFromPLString(command), params ? WMGetFromPLString(params) : NULL, "WMRootMenu"); --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 14:12:23 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 14:12:23 +0400 @@ -556,6 +556,9 @@ {"SingleClickLaunch", "NO", NULL, &wPreferences.single_click, getBool, NULL }, + {"TranslateMenu", "YES", NULL, + &wPreferences.translate_menu, getBool, NULL + }, /* style options */ {"MenuStyle", "normal", seMenuStyles, &wPreferences.menu_style, getEnum, setMenuStyle --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 14:12:23 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 14:12:23 +0400 @@ -466,6 +466,8 @@ /* shading animation */ signed char shade_speed; + int translate_menu; + int edge_resistance; char attract; --- WindowMaker-0.91.0/src/workspace.c.vns 2004-10-26 07:17:12 +0400 +++ WindowMaker-0.91.0/src/workspace.c 2005-05-18 14:12:23 +0400 @@ -1349,7 +1349,10 @@ { WMenu *wsmenu; - wsmenu = wMenuCreate(scr, titled ? _("Workspaces") : NULL, False); + if(wPreferences.translate_menu) + wsmenu = wMenuCreate(scr, titled ? _("Workspaces") : NULL, False); + else + wsmenu = wMenuCreate(scr, titled ? "Workspaces" : NULL, False); if (!wsmenu) { wwarning(_("could not create Workspace menu")); return NULL; @@ -1358,8 +1361,17 @@ /* callback to be called when an entry is edited */ wsmenu->on_edit = onMenuEntryEdited; - wMenuAddCallback(wsmenu, _("New"), newWSCommand, NULL); - wMenuAddCallback(wsmenu, _("Destroy Last"), deleteWSCommand, NULL); + + if(wPreferences.translate_menu) + { + wMenuAddCallback(wsmenu, _("New"), newWSCommand, NULL); + wMenuAddCallback(wsmenu, _("Destroy Last"), deleteWSCommand, NULL); + } + else + { + wMenuAddCallback(wsmenu, "New", newWSCommand, NULL); + wMenuAddCallback(wsmenu, "Destroy Last", deleteWSCommand, NULL); + } return wsmenu; } --- WindowMaker-0.91.0/src/main.c.vns 2004-10-25 05:32:51 +0400 +++ WindowMaker-0.91.0/src/main.c 2005-05-18 14:14:26 +0400 @@ -791,11 +791,15 @@ if (!Locale || strcmp(Locale, "C")==0 || strcmp(Locale, "POSIX")==0) Locale = NULL; #ifdef I18N - if (getenv("NLSPATH")) + if (getenv("NLSPATH")) { bindtextdomain("WindowMaker", getenv("NLSPATH")); - else + bindtextdomain("menu-messages", getenv("NLSPATH")); + } else { bindtextdomain("WindowMaker", LOCALEDIR); + bindtextdomain("menu-messages", LOCALEDIR); + } bind_textdomain_codeset("WindowMaker", "UTF-8"); + bind_textdomain_codeset("menu-messages", "UTF-8"); textdomain("WindowMaker"); if (!XSupportsLocale()) { WindowMaker-0.91.0-alt-mmx.patch: --- NEW FILE WindowMaker-0.91.0-alt-mmx.patch --- --- WindowMaker-0.91.0/configure.ac.vns 2005-05-18 17:38:01 +0400 +++ WindowMaker-0.91.0/configure.ac 2005-05-18 17:47:55 +0400 @@ -190,7 +190,15 @@ # until we fix it, leave it disabled asm_support=no mmx_support=no -if test "$ac_cv_prog_gcc" = yes; then + +check_for_mmx_support=yes +AC_ARG_ENABLE(mmx, + [ --disable-mmx disable compilation of MMX inline assembly ], + [if test x$enableval != xyes; then + check_for_mmx_support=no + fi]) + +if test "$ac_cv_prog_gcc" = yes -a "$check_for_mmx_support" = yes; then # gcc-3.3 or newer complains about some of our stuff without this NOSTRICTALIASING="-fno-strict-aliasing" WindowMaker-0.91.0-alt-restartscrpt.patch: --- NEW FILE WindowMaker-0.91.0-alt-restartscrpt.patch --- --- WindowMaker-0.91.0/src/shutdown.c.vns 2005-05-18 12:49:09 +0400 +++ WindowMaker-0.91.0/src/shutdown.c 2005-05-18 12:50:35 +0400 @@ -123,6 +123,7 @@ RestoreDesktop(scr); } } + ExecExitScript(); break; } } WindowMaker-0.91.0-alt-session.patch: --- NEW FILE WindowMaker-0.91.0-alt-session.patch --- --- WindowMaker-0.91.0/src/session.c.vns 2005-05-18 12:44:44 +0400 +++ WindowMaker-0.91.0/src/session.c 2005-05-18 12:46:21 +0400 @@ -331,7 +331,8 @@ if ((wwin->transient_for==None || wwin->transient_for==wwin->screen_ptr->root_win) - && WMGetFirstInArray(wapp_list, (void*)appId)==WANotFound + && (WMGetFirstInArray(wapp_list, (void*)appId)==WANotFound + || WFLAGP(wwin, shared_appicon)) && !WFLAGP(wwin, dont_save_session)) { /* A entry for this application was not yet saved. Save one. */ if ((win_info = makeWindowState(wwin, wapp))!=NULL) { WindowMaker-0.91.0-alt-sowings.patch: --- NEW FILE WindowMaker-0.91.0-alt-sowings.patch --- --- WindowMaker-0.91.0/WINGs/Examples/Makefile.am.vns 2004-08-25 00:56:43 +0400 +++ WindowMaker-0.91.0/WINGs/Examples/Makefile.am 2005-05-18 17:04:02 +0400 @@ -6,23 +6,24 @@ noinst_PROGRAMS = connect server fontl puzzle colorpick -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ + $(top_builddir)/WINGs/libWUtil.la \ @XFTLIBS@ @INTLIBS@ -colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a +colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la -fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a +fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la -puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a +puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la -connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a +connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la -connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ +connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \ @NETLIBS@ @INTLIBS@ -server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a +server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la -server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ +server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \ @NETLIBS@ @INTLIBS@ --- WindowMaker-0.91.0/WINGs/Extras/Makefile.am.vns 2004-10-12 06:31:26 +0400 +++ WindowMaker-0.91.0/WINGs/Extras/Makefile.am 2005-05-18 17:04:02 +0400 @@ -10,13 +10,13 @@ include_HEADERS = wtableview.h wtabledelegates.h -lib_LIBRARIES = libExtraWINGs.a +lib_LTLIBRARIES = libExtraWINGs.la noinst_PROGRAMS = test EXTRA_DIST = -libExtraWINGs_a_SOURCES = \ +libExtraWINGs_la_SOURCES = \ wtableview.c \ wtabledelegates.c \ wtableview.h \ @@ -27,7 +27,8 @@ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \ -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ + $(top_builddir)/WINGs/libWUtil.la \ @XFTLIBS@ @INTLIBS@ test_LDADD = wtableview.o wtabledelegates.o $(LDADD) --- WindowMaker-0.91.0/WINGs/Tests/Makefile.am.vns 2004-04-07 03:55:21 +0400 +++ WindowMaker-0.91.0/WINGs/Tests/Makefile.am 2005-05-18 17:04:02 +0400 @@ -4,13 +4,14 @@ noinst_PROGRAMS = wtest wmquery wmfile testmywidget -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ + $(top_builddir)/WINGs/libWUtil.la \ @XFTLIBS@ @INTLIBS@ testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h -wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a +wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png --- WindowMaker-0.91.0/WINGs/Makefile.am.vns 2004-10-12 06:31:26 +0400 +++ WindowMaker-0.91.0/WINGs/Makefile.am 2005-05-18 17:08:21 +0400 @@ -6,14 +6,15 @@ -#libWINGs_la_LDFLAGS = -version-info 1:1:0 +libWINGs_la_LDFLAGS = -version-info 2:1:0 +libWUtil_la_LDFLAGS = -version-info 1:2:0 bin_SCRIPTS = get-wings-flags get-wutil-flags -lib_LIBRARIES = libWINGs.a libWUtil.a +lib_LTLIBRARIES = libWINGs.la libWUtil.la -LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@ +LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@ EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i \ @@ -21,32 +22,12 @@ # wbutton.c -libWINGs_a_SOURCES = \ - array.c \ - bagtree.c \ +libWINGs_la_SOURCES = \ configuration.c \ - connection.c \ - data.c \ dragcommon.c \ dragdestination.c \ dragsource.c \ - error.c \ - findfile.c \ - handlers.c \ - hashtable.c \ - host.c \ - international.c \ - memory.c \ - misc.c \ - notification.c \ - proplist.c \ selection.c \ - snprintf.c \ - string.c \ - tree.c \ - userdefaults.c \ - usleep.c \ - wapplication.c \ wappresource.c \ wballoon.c \ wbox.c \ @@ -82,8 +63,7 @@ wview.c \ wwindow.c - -libWUtil_a_SOURCES = \ +libWUtil_la_SOURCES = \ array.c \ bagtree.c \ connection.c \ --- WindowMaker-0.91.0/src/Makefile.am.vns 2005-05-18 17:04:02 +0400 +++ WindowMaker-0.91.0/src/Makefile.am 2005-05-18 17:04:02 +0400 @@ -117,7 +117,8 @@ wmaker_LDADD = \ - $(top_builddir)/WINGs/libWINGs.a\ + $(top_builddir)/WINGs/libWINGs.la\ + $(top_builddir)/WINGs/libWUtil.la\ $(top_builddir)/wrlib/libwraster.la\ @XFTLIBS@ \ @XLIBS@ \ --- WindowMaker-0.91.0/util/Makefile.am.vns 2004-10-24 01:27:48 +0400 +++ WindowMaker-0.91.0/util/Makefile.am 2005-05-18 17:08:49 +0400 @@ -16,44 +16,47 @@ liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@ -wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) +wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) -wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) +wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) wxcopy_LDADD = @XLFLAGS@ @XLIBS@ wxpaste_LDADD = @XLFLAGS@ @XLIBS@ -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) getstyle_SOURCES = getstyle.c fontconv.c setstyle_LDADD = \ - $(top_builddir)/WINGs/libWUtil.a \ + $(top_builddir)/WINGs/libWUtil.la \ @XLFLAGS@ @XLIBS@ $(liblist) setstyle_SOURCES = setstyle.c fontconv.c -convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) +convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) convertfonts_SOURCES = convertfonts.c fontconv.c -seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist) +seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist) -geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist) +geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist) wmagnify_LDADD = \ - $(top_builddir)/WINGs/libWINGs.a \ + $(top_builddir)/WINGs/libWINGs.la \ + $(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/wrlib/libwraster.la \ @XFTLIBS@ @INTLIBS@ @DLLIBS@ wmsetup_LDADD = \ - $(top_builddir)/WINGs/libWINGs.a \ + $(top_builddir)/WINGs/libWINGs.la \ + $(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/wrlib/libwraster.la \ @XFTLIBS@ @INTLIBS@ @DLLIBS@ wmsetbg_LDADD = \ - $(top_builddir)/WINGs/libWINGs.a \ + $(top_builddir)/WINGs/libWINGs.la \ + $(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/wrlib/libwraster.la \ @XLIBS@ @XFTLIBS@ @INTLIBS@ @DLLIBS@ --- WindowMaker-0.91.0/wmlib/Makefile.am.vns 2003-04-18 04:53:39 +0400 +++ WindowMaker-0.91.0/wmlib/Makefile.am 2005-05-18 17:04:02 +0400 @@ -1,13 +1,14 @@ AUTOMAKE_OPTIONS = no-dependencies -lib_LIBRARIES = libWMaker.a +libWMaker_la_LDFLAGS = -version-info 1:1:0 +lib_LTLIBRARIES = libWMaker.la include_HEADERS = WMaker.h INCLUDES = $(DFLAGS) @XCFLAGS@ -libWMaker_a_SOURCES = \ +libWMaker_la_SOURCES = \ menu.c \ app.c \ event.c \ --- WindowMaker-0.91.0/test/Makefile.am.vns 1999-10-03 01:16:11 +0400 +++ WindowMaker-0.91.0/test/Makefile.am 2005-05-18 17:04:02 +0400 @@ -8,7 +8,7 @@ wtest_SOURCES = wtest.c -wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@ +wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib --- WindowMaker-0.91.0/WPrefs.app/Makefile.am.vns 2005-05-18 17:04:02 +0400 +++ WindowMaker-0.91.0/WPrefs.app/Makefile.am 2005-05-18 17:04:02 +0400 @@ -48,10 +48,11 @@ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ -WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a +WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la WPrefs_LDADD = \ - $(top_builddir)/WINGs/libWINGs.a\ + $(top_builddir)/WINGs/libWINGs.la\ + $(top_builddir)/WINGs/libWUtil.la\ $(top_builddir)/wrlib/libwraster.la \ @XFTLIBS@ \ @INTLIBS@ --- WindowMaker-0.91.0/configure.ac.vns 2005-05-18 17:04:01 +0400 +++ WindowMaker-0.91.0/configure.ac 2005-05-18 17:04:02 +0400 @@ -969,7 +969,7 @@ WCFLAGS="$inc_search_path" WLFLAGS="$lib_search_path" -WLIBS="-lWINGs -lwraster $GFXLIBS $XFTLIBS $XLIBS -lm $NETLIBS $INTLIBS" +WLIBS="-lWINGs -lWUtil -lwraster $GFXLIBS $XFTLIBS $XLIBS -lm $NETLIBS $INTLIBS" usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" WindowMaker-0.91.0-alt-titlebar.patch: --- NEW FILE WindowMaker-0.91.0-alt-titlebar.patch --- --- WindowMaker-0.91.0/src/window.c.vns 2005-05-18 15:51:45 +0400 +++ WindowMaker-0.91.0/src/window.c 2005-05-18 15:55:55 +0400 @@ -1293,7 +1293,10 @@ wwin->frame = wFrameWindowCreate(scr, window_level, x, y, width, height, - &wPreferences.window_title_clearance, foo, + &wPreferences.window_title_clearance, + &wPreferences.window_title_min_height, + &wPreferences.window_title_max_height, + foo, scr->window_title_texture, scr->resizebar_texture, scr->window_title_color, @@ -1630,7 +1633,10 @@ wwin->frame = wFrameWindowCreate(scr, WMFloatingLevel, wwin->frame_x, wwin->frame_y, width, height, - &wPreferences.window_title_clearance, foo, + &wPreferences.window_title_clearance, + &wPreferences.window_title_min_height, + &wPreferences.window_title_max_height, + foo, scr->window_title_texture, scr->resizebar_texture, scr->window_title_color, --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 15:51:45 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 15:51:45 +0400 @@ -376,6 +376,8 @@ }; +#define NUM2STRING_(x) #x +#define NUM2STRING(x) NUM2STRING_(x) WDefaultEntry optionList[] = { /* dynamic options */ @@ -601,9 +603,21 @@ {"WindowTitleExtendSpace", DEF_WINDOW_TITLE_EXTEND_SPACE, NULL, &wPreferences.window_title_clearance, getInt, setClearance }, + {"WindowTitleMinHeight", "0", NULL, + &wPreferences.window_title_min_height, getInt, setClearance + }, + {"WindowTitleMaxHeight", NUM2STRING(INT_MAX), NULL, + &wPreferences.window_title_max_height, getInt, setClearance + }, {"MenuTitleExtendSpace", DEF_MENU_TITLE_EXTEND_SPACE, NULL, &wPreferences.menu_title_clearance, getInt, setClearance }, + {"MenuTitleMinHeight", "0", NULL, + &wPreferences.menu_title_min_height, getInt, setClearance + }, + {"MenuTitleMaxHeight", NUM2STRING(INT_MAX), NULL, + &wPreferences.menu_title_max_height, getInt, setClearance + }, {"MenuTextExtendSpace", DEF_MENU_TEXT_EXTEND_SPACE, NULL, &wPreferences.menu_text_clearance, getInt, setClearance }, --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 15:51:45 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 15:51:45 +0400 @@ -371,7 +371,11 @@ signed char title_justification; /* titlebar text alignment */ int window_title_clearance; + int window_title_min_height; + int window_title_max_height; int menu_title_clearance; + int menu_title_min_height; + int menu_title_max_height; int menu_text_clearance; char multi_byte_text; --- WindowMaker-0.91.0/src/framewin.c.vns 2005-05-18 15:51:45 +0400 +++ WindowMaker-0.91.0/src/framewin.c 2005-05-18 15:54:16 +0400 @@ -63,7 +63,8 @@ WFrameWindow* wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y, - int width, int height, int *clearance, int flags, + int width, int height, int *clearance, + int *title_min, int *title_max, int flags, WTexture **title_texture, WTexture **resize_texture, WMColor **color, WMFont **font) { @@ -80,6 +81,8 @@ fwin->resizebar_texture = resize_texture; fwin->title_color = color; fwin->title_clearance = clearance; + fwin->title_min_height = title_min; + fwin->title_max_height = title_max; fwin->font = font; #ifdef KEEP_XKB_LOCK_STATUS fwin->languagemode = XkbGroup1Index; @@ -130,7 +133,11 @@ height = fwin->core->height - fwin->top_width - fwin->bottom_width; if (flags & WFF_TITLEBAR) - theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + { + theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(theight > *fwin->title_max_height) theight = *fwin->title_max_height; + if(theight < *fwin->title_min_height) theight = *fwin->title_min_height; + } else theight = 0; @@ -490,6 +497,8 @@ int theight; theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(theight > *fwin->title_max_height) theight = *fwin->title_max_height; + if(theight < *fwin->title_min_height) theight = *fwin->title_min_height; x = 0; w = fwin->core->width + 1; @@ -1097,8 +1106,11 @@ break; } + y = *fwin->title_clearance + TITLEBAR_EXTEND_SPACE; h = WMFontHeight(*fwin->font); + if(y*2 + h > *fwin->title_max_height) y = (*fwin->title_max_height - h)/2; + if(y*2 + h < *fwin->title_min_height) y = (*fwin->title_min_height - h)/2; /* We use a w+2 buffer to have an extra pixel on the left and * another one on the right. This is because for some odd reason, --- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 15:51:45 +0400 +++ WindowMaker-0.91.0/src/menu.c 2005-05-18 15:51:45 +0400 @@ -180,7 +180,10 @@ menu->flags.titled = 1; } menu->frame = - wFrameWindowCreate(screen, tmp, 8, 2, 1, 1, &wPreferences.menu_title_clearance, flags, + wFrameWindowCreate(screen, tmp, 8, 2, 1, 1, &wPreferences.menu_title_clearance, + &wPreferences.menu_title_min_height, + &wPreferences.menu_title_max_height, + flags, screen->menu_title_texture, NULL, screen->menu_title_color, &screen->menu_title_font); --- WindowMaker-0.91.0/src/framewin.h.vns 2004-10-15 01:24:06 +0400 +++ WindowMaker-0.91.0/src/framewin.h 2005-05-18 15:56:27 +0400 @@ -59,6 +59,8 @@ short top_width; int *title_clearance; + int *title_min_height; + int *title_max_height; short bottom_width; short resizebar_corner_width; @@ -149,7 +151,8 @@ WFrameWindow* wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y, - int width, int height, int *clearance, int flags, + int width, int height, int *clearance, + int *title_min, int *title_max, int flags, union WTexture **title_texture, union WTexture **resize_texture, WMColor **color, WMFont **font); --- WindowMaker-0.91.0/src/moveres.c.vns 2004-10-24 23:36:09 +0400 +++ WindowMaker-0.91.0/src/moveres.c 2005-05-18 15:51:45 +0400 @@ -497,6 +497,8 @@ if (HAS_TITLEBAR(wwin) && !wwin->flags.shaded) { h = WMFontHeight(wwin->screen_ptr->title_font) + (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(h > wPreferences.window_title_max_height) h = wPreferences.window_title_max_height; + if(h < wPreferences.window_title_min_height) h = wPreferences.window_title_min_height; } if (HAS_RESIZEBAR(wwin) && !wwin->flags.shaded) { /* Can't use wwin-frame->bottom_width because, in some cases --- WindowMaker-0.91.0/src/placement.c.vns 2004-10-23 03:58:59 +0400 +++ WindowMaker-0.91.0/src/placement.c 2005-05-18 15:57:35 +0400 @@ -594,6 +594,9 @@ { WScreen *scr = wwin->screen_ptr; int h = WMFontHeight(scr->title_font) + (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(h > wPreferences.window_title_max_height) h = wPreferences.window_title_max_height; + if(h < wPreferences.window_title_min_height) h = wPreferences.window_title_min_height; + WArea usableArea = wGetUsableAreaForHead(scr, wGetHeadForPointerLocation(scr), NULL, True); WindowMaker-0.91.0-alt-vlaad-newbuttons.patch: --- NEW FILE WindowMaker-0.91.0-alt-vlaad-newbuttons.patch --- --- WindowMaker-0.91.0/src/screen.c.vns 2004-10-25 02:23:48 +0400 +++ WindowMaker-0.91.0/src/screen.c 2005-05-18 15:08:52 +0400 @@ -162,41 +162,73 @@ WPixmap *pix; /* create predefined pixmaps */ - pix = wPixmapCreateFromXPMData(scr, PRED_CLOSE_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_CLOSE_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_CLOSE_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_CLOSE] = pix; - pix = wPixmapCreateFromXPMData(scr, PRED_BROKEN_CLOSE_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_BROKEN_CLOSE_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_BROKEN_CLOSE_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_BROKENCLOSE] = pix; - pix = wPixmapCreateFromXPMData(scr, PRED_ICONIFY_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_ICONIFY_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_ICONIFY_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_ICONIFY] = pix; #ifdef XKB_BUTTON_HINT - pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP1_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP1_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP1_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_XKBGROUP1] = pix; - pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP2_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP2_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP2_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_XKBGROUP2] = pix; - pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP3_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP3_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP3_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_XKBGROUP3] = pix; - pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP4_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP4_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP4_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_XKBGROUP4] = pix; #endif - pix = wPixmapCreateFromXPMData(scr, PRED_KILL_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_KILL_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_KILL_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_KILL] = pix; --- WindowMaker-0.91.0/src/texture.c.vns 2004-10-12 21:47:39 +0400 +++ WindowMaker-0.91.0/src/texture.c 2005-05-18 15:05:55 +0400 @@ -707,20 +707,32 @@ segs[1].y1 = 1; segs[1].x2 = width - 2; segs[1].y2 = height - 2; - XDrawSegments(dpy, d, dim, segs, 2); + if (wPreferences.new_style == TS_NEXT) { + XDrawSegments(dpy, d, dark, segs, 2); + } else { + XDrawSegments(dpy, d, dim, segs, 2); + } segs[0].x1 = 0; segs[0].x2 = width - 1; segs[0].y2 = segs[0].y1 = height - 1; segs[1].x1 = segs[1].x2 = width - 1; segs[1].y1 = 0; segs[1].y2 = height - 1; - XDrawSegments(dpy, d, dark, segs, 2); + if (wPreferences.new_style == TS_NEXT) { + XDrawSegments(dpy, d, light, segs, 2); + } else { + XDrawSegments(dpy, d, dark, segs, 2); + } segs[0].x1 = segs[0].y1 = segs[0].y2 = 0; segs[0].x2 = width - 2; segs[1].x1 = segs[1].y1 = 0; segs[1].x2 = 0; segs[1].y2 = height - 2; - XDrawSegments(dpy, d, light, segs, 2); + if (wPreferences.new_style == TS_NEXT) { + XDrawSegments(dpy, d, dark, segs, 2); + } else { + XDrawSegments(dpy, d, light, segs, 2); + } if (relief==WREL_ICON) { segs[0].x1 = segs[0].y1 = segs[0].y2 = 1; segs[0].x2 = width - 2; --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 14:57:22 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 14:57:22 +0400 @@ -221,6 +221,11 @@ {NULL, 0, 0} }; +static WOptionEnumeration seTitlebarModes[] = { + {"new", TS_NEW, 0}, {"old", TS_OLD, 0}, + {"next", TS_NEXT, 0}, {NULL, 0, 0} +}; + static WOptionEnumeration seColormapModes[] = { {"Manual", WCM_CLICK, 0}, {"ClickToFocus", WCM_CLICK, 1}, {"Auto", WCM_POINTER, 0}, {"FocusFollowMouse", WCM_POINTER, 1}, @@ -356,8 +361,8 @@ {"FocusMode", "manual", seFocusModes, &wPreferences.focus_mode, getEnum, NULL }, /* have a problem when switching from manual to sloppy without restart */ - {"NewStyle", "NO", NULL, - &wPreferences.new_style, getBool, NULL + {"NewStyle", "new", seTitlebarModes, + &wPreferences.new_style, getEnum, NULL }, {"DisableDock", "NO", (void*) WM_DOCK, NULL, getBool, setIfDockPresent --- WindowMaker-0.91.0/src/extend_pixmaps.h.vns 2004-10-12 21:55:09 +0400 +++ WindowMaker-0.91.0/src/extend_pixmaps.h 2005-05-18 14:57:22 +0400 @@ -113,5 +113,79 @@ }; +static char *NEXT_XKBGROUP1_XPM[] = { +"10 10 6 1", +" c None", +". c #E0E0E0", +"+ c #7D7D7D", +"@ c #363636", +"# c #080808", +"$ c #BDBDBD", +".........+", +"..@@@@@@++", +"..@####+++", +"..#+$$$$++", +"..###+.$++", +"..#++..$++", +"..#$.$$$++", +"..#@@@@+++", +".$+#####@@", +"+++++++@@@"}; +static char *NEXT_XKBGROUP2_XPM[] = { +"10 10 6 1", +" c None", +". c #E0E0E0", +"+ c #7D7D7D", +"@ c #BDBDBD", +"# c #080808", +"$ c #363636", +".........+", +".@##@@$#++", +".#.+#+###+", +".#+######+", +".########+", +"..######++", +"..@####+++", +".@@@#$++++", +". at ++#$++$$", +"+++++++$$$"}; + +static char *NEXT_XKBGROUP3_XPM[] = { +"10 10 6 1", +" c None", +". c #E0E0E0", +"+ c #7D7D7D", +"@ c #BDBDBD", +"# c #080808", +"$ c #363636", +".........+", +"..@####.++", +".@######.+", +".#.+##.+#+", +".#++##++#+", +".########+", +".##@##@##+", +".+##@@##$+", +". at +####$$$", +"+++++++$$$"}; + +static char *NEXT_XKBGROUP4_XPM[] = { +"10 10 6 1", +" c None", +". c #E0E0E0", +"+ c #7D7D7D", +"@ c #BDBDBD", +"# c #080808", +"$ c #363636", +".........+", +"..@####.++", +".@#@@@@#.+", +".##$@@#$#+", +".#$$@@$$#+", +".#@@@@++#+", +".#+#++#.#+", +".+#+##$#$+", +". at +####$$$", +"+++++++$$$"}; --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 14:57:22 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 14:57:22 +0400 @@ -239,6 +239,10 @@ #define WD_BOTTOMLEFT 6 #define WD_BOTTOMRIGHT 7 +/* titlebar style */ +#define TS_NEW 0 +#define TS_OLD 1 +#define TS_NEXT 2 /* workspace border position */ #define WB_NONE 0 --- WindowMaker-0.91.0/src/framewin.c.vns 2004-10-15 02:55:15 +0400 +++ WindowMaker-0.91.0/src/framewin.c 2005-05-18 15:23:34 +0400 @@ -134,10 +134,12 @@ else theight = 0; - if (wPreferences.new_style) { - bsize = theight; + if (wPreferences.new_style == TS_NEW) { + bsize = theight; + } else if (wPreferences.new_style == TS_OLD) { + bsize = theight - 7; } else { - bsize = theight - 7; + bsize = theight - 8; } if (fwin->titlebar) { @@ -148,7 +150,7 @@ fwin->flags.need_texture_remake = 1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (fwin->left_button) { wCoreConfigure(fwin->left_button, 0, 0, bsize, bsize); } @@ -190,7 +192,7 @@ /* we had a titlebar, but now we don't need it anymore */ for (i=0; i < (fwin->flags.single_texture ? 1 : 3); i++) { FREE_PIXMAP(fwin->title_back[i]); - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { FREE_PIXMAP(fwin->lbutton_back[i]); FREE_PIXMAP(fwin->rbutton_back[i]); #ifdef XKB_BUTTON_HINT @@ -228,7 +230,7 @@ if (flags & WFF_LEFT_BUTTON) { fwin->flags.left_button = 1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { fwin->left_button = wCoreCreate(fwin->core, 0, 0, bsize, bsize); if (width < theight*4) { @@ -236,7 +238,7 @@ } else { XMapRaised(dpy, fwin->left_button->window); } - } else { + } else if (wPreferences.new_style == TS_OLD) { fwin->left_button = wCoreCreate(fwin->titlebar, 3, (theight-bsize)/2, bsize, bsize); @@ -249,13 +251,26 @@ } else { XMapRaised(dpy, fwin->left_button->window); } + } else { + fwin->left_button = + wCoreCreate(fwin->titlebar, 3, (theight-bsize)/2, + bsize, bsize); + + XSetWindowBackground(dpy, fwin->left_button->window, + scr->widget_texture->dark.pixel); + + if (width < theight*3) { + fwin->flags.lbutton_dont_fit = 1; + } else { + XMapRaised(dpy, fwin->left_button->window); + } } } #ifdef XKB_BUTTON_HINT if (flags & WFF_LANGUAGE_BUTTON) { fwin->flags.language_button = 1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { fwin->language_button = wCoreCreate(fwin->core, bsize, 0, bsize, bsize); @@ -283,17 +298,23 @@ if (flags & WFF_RIGHT_BUTTON) { fwin->flags.right_button = 1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { fwin->right_button = wCoreCreate(fwin->core, width-bsize+1, 0, bsize, bsize); - } else { + } else if (wPreferences.new_style == TS_OLD) { fwin->right_button = wCoreCreate(fwin->titlebar, width-bsize-3, (theight-bsize)/2, bsize, bsize); XSetWindowBackground(dpy, fwin->right_button->window, scr->widget_texture->normal.pixel); - } + } else { + fwin->right_button = + wCoreCreate(fwin->titlebar, width-bsize-3, + (theight-bsize)/2, bsize, bsize); + XSetWindowBackground(dpy, fwin->right_button->window, + scr->widget_texture->dark.pixel); + } if (width < theight*2) { fwin->flags.rbutton_dont_fit = 1; @@ -302,7 +323,7 @@ } } - if (wPreferences.new_style) + if (wPreferences.new_style == TS_NEW) updateTitlebar(fwin); XMapRaised(dpy, fwin->titlebar->window); @@ -436,7 +457,7 @@ for (i=0; i < (fwin->flags.single_texture ? 1 : 3); i++) { FREE_PIXMAP(fwin->title_back[i]); - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { FREE_PIXMAP(fwin->lbutton_back[i]); #ifdef XKB_BUTTON_HINT FREE_PIXMAP(fwin->languagebutton_back[i]); @@ -473,7 +494,7 @@ x = 0; w = fwin->core->width + 1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (fwin->flags.hide_left_button || !fwin->left_button || fwin->flags.lbutton_dont_fit) { x = 0; @@ -522,14 +543,14 @@ } #endif - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (!fwin->flags.hide_right_button && fwin->right_button && !fwin->flags.rbutton_dont_fit) { w -= fwin->right_button->width; } } - if (wPreferences.new_style || fwin->titlebar->width!=w) + if (wPreferences.new_style == TS_NEW || fwin->titlebar->width!=w) fwin->flags.need_texture_remake = 1; wCoreConfigure(fwin->titlebar, x, 0, w, theight); @@ -557,7 +578,7 @@ #endif if (fwin->titlebar) { - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { updateTitlebar(fwin); } else { #ifdef XKB_BUTTON_HINT @@ -606,7 +627,7 @@ if (fwin->titlebar) { - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { updateTitlebar(fwin); } else { XClearWindow(dpy, fwin->titlebar->window); @@ -648,7 +669,7 @@ return; } - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (left) { limg = RGetSubImage(img, 0, 0, bwidth, bheight); } else @@ -791,7 +812,7 @@ if (fwin->title_texture[i]->any.type!=WTEX_SOLID) { XSetWindowBackgroundPixmap(dpy, fwin->titlebar->window, fwin->title_back[i]); - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (fwin->left_button && fwin->lbutton_back[i]) XSetWindowBackgroundPixmap(dpy, fwin->left_button->window, fwin->lbutton_back[i]); @@ -810,7 +831,7 @@ } else { pixel = fwin->title_texture[i]->solid.normal.pixel; XSetWindowBackground(dpy, fwin->titlebar->window, pixel); - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (fwin->left_button) XSetWindowBackground(dpy, fwin->left_button->window, pixel); @@ -855,7 +876,7 @@ if (fwin->title_texture[state] && fwin->titlebar) { FREE_PIXMAP(fwin->title_back[state]); - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { FREE_PIXMAP(fwin->lbutton_back[state]); FREE_PIXMAP(fwin->rbutton_back[state]); #ifdef XKB_BUTTON_HINT @@ -895,7 +916,7 @@ #endif fwin->title_back[state] = pmap; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { fwin->lbutton_back[state] = lpmap; fwin->rbutton_back[state] = rpmap; #ifdef XKB_BUTTON_HINT @@ -1023,7 +1044,7 @@ int allButtons = 1; - if (!wPreferences.new_style) { + if (!wPreferences.new_style == TS_NEW) { if (fwin->left_button && !fwin->flags.hide_left_button && !fwin->flags.lbutton_dont_fit) lofs += fwin->left_button->width + 3; @@ -1128,7 +1149,7 @@ reconfigure(WFrameWindow *fwin, int x, int y, int width, int height, Bool dontMove) { - int k = (wPreferences.new_style ? 4 : 3); + int k = (wPreferences.new_style == TS_NEW ? 4 : 3); int resizedHorizontally = 0; if (dontMove) @@ -1203,7 +1224,7 @@ } } - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (fwin->right_button) XMoveWindow(dpy, fwin->right_button->window, width - fwin->right_button->width + 1, 0); @@ -1318,7 +1339,7 @@ width = fwin->titlebar->width - 6 - 6; } - if (!wPreferences.new_style) { + if (!wPreferences.new_style == TS_NEW) { if (fwin->left_button && !fwin->flags.hide_left_button && !fwin->flags.lbutton_dont_fit) width -= fwin->left_button->width + 3; @@ -1363,20 +1384,30 @@ } } XSetClipMask(dpy, copy_gc, None); - XSetForeground(dpy, copy_gc, scr->white_pixel); + if (wPreferences.new_style == TS_NEXT) { + XSetForeground(dpy, copy_gc, scr->black_pixel); + } else { + XSetForeground(dpy, copy_gc, scr->white_pixel); + } d=1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { XFillRectangle(dpy, button->window, copy_gc, 0, 0, button->width-1, button->height-1); XSetForeground(dpy, copy_gc, scr->black_pixel); XDrawRectangle(dpy, button->window, copy_gc, 0, 0, button->width-1, button->height-1); - } else { + } else if (wPreferences.new_style == TS_OLD) { XFillRectangle(dpy, button->window, copy_gc, 0, 0, button->width, button->height); XSetForeground(dpy, copy_gc, scr->black_pixel); XDrawRectangle(dpy, button->window, copy_gc, 0, 0, button->width, button->height); + } else { + XFillRectangle(dpy, button->window, copy_gc, 0, 0, + button->width-3, button->height-3); + XSetForeground(dpy, copy_gc, scr->black_pixel); + XDrawRectangle(dpy, button->window, copy_gc, 0, 0, + button->width-3, button->height-3); } } else { XClearWindow(dpy, button->window); @@ -1389,7 +1420,7 @@ } d=0; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (texture->any.type==WTEX_SOLID || pushed) { wDrawBevel(button->window, button->width, button->height, (WTexSolid*)texture, WREL_RAISED); @@ -1406,7 +1437,7 @@ x = (button->width - width)/2 + d; y = (button->height - image->height)/2 + d; XSetClipOrigin(dpy, copy_gc, x-left, y); - if (!wPreferences.new_style) { + if (!(wPreferences.new_style == TS_NEW)) { XSetForeground(dpy, copy_gc, scr->black_pixel); if (!pushed) { if (image->depth==1) @@ -1416,9 +1447,15 @@ XCopyArea(dpy, image->image, button->window, copy_gc, left, 0, width, image->height, x, y); } else { - XSetForeground(dpy, copy_gc, scr->dark_pixel); - XFillRectangle(dpy, button->window, copy_gc, 0, 0, - button->width, button->height); + if (wPreferences.new_style == TS_OLD) { + XSetForeground(dpy, copy_gc, scr->dark_pixel); + XFillRectangle(dpy, button->window, copy_gc, 0, 0, + button->width, button->height); + } else { + XSetForeground(dpy, copy_gc, scr->black_pixel); + XCopyArea(dpy, image->image, button->window, copy_gc, + left, 0, width, image->height, x, y); + } } } else { if (pushed) { --- WindowMaker-0.91.0/src/def_pixmaps.h.vns 2004-10-12 21:54:26 +0400 +++ WindowMaker-0.91.0/src/def_pixmaps.h 2005-05-18 14:57:22 +0400 @@ -97,6 +97,272 @@ ".........." }; +static char *NEXT_CLOSE_XPM[] = { +"10 10 69 1", +" c None", +". c #FBFBFB", +"+ c #F9F9F9", +"@ c #F7F7F7", +"# c #F4F4F4", +"$ c #F0F0F0", +"% c #EDEDED", +"& c #E8E8E8", +"* c #AFAFAF", +"= c #FCFCFC", +"- c #8B8B8B", +"; c #DEDEDE", +"> c #E0E0E0", +", c #C7C7C7", +"' c #999999", +") c #2B2B2B", +"! c #878787", +"~ c #F1F1F1", +"{ c #222222", +"] c #C2C2C2", +"^ c #EBEBEB", +"/ c #DCDCDC", +"( c #9F9F9F", +"_ c #363636", +": c #FEFEFE", +"< c #C1C1C1", +"[ c #232323", +"} c #CFCFCF", +"| c #282828", +"1 c #D5D5D5", +"2 c #FAFAFA", +"3 c #F6F6F6", +"4 c #D3D3D3", +"5 c #121212", +"6 c #BEBEBE", +"7 c #898989", +"8 c #838383", +"9 c #EEEEEE", +"0 c #E9E9E9", +"a c #CDCDCD", +"b c #080808", +"c c #131313", +"d c #A1A1A1", +"e c #7F7F7F", +"f c #808080", +"g c #D9D9D9", +"h c #8D8D8D", +"i c #1D1D1D", +"j c #C9C9C9", +"k c #B4B4B4", +"l c #191919", +"m c #6A6A6A", +"n c #6C6C6C", +"o c #7A7A7A", +"p c #B1B1B1", +"q c #202020", +"r c #BBBBBB", +"s c #D4D4D4", +"t c #151515", +"u c #515151", +"v c #747474", +"w c #3A3A3A", +"x c #CCCCCC", +"y c #B3B3B3", +"z c #939393", +"A c #A3A3A3", +"B c #919191", +"C c #858585", +"D c #7C7C7C", +"...+@#$%&*", +"=-;#%>,')!", +"=~{]^/(_!!", +"=:<[}*|1(!", +"2 at 345[>678", +"@90abc6def", +"#ghijklmno", +"~pqrgs(tuv", +"%wxx'-p8tn", +"yzAB7C8enD"}; + + +static char * NEXT_BROKEN_CLOSE_XPM[] = { +"10 10 8 1", +" c None", +". c #E0E0E0", +"+ c #7D7D7D", +"@ c #DBDBDB", +"# c #BDBDBD", +"$ c #080808", +"% c #363636", +"& c #D4D4D4", +".........+", +".+ at ...#+$+", +"..$#. at +%++", +"..###++&++", +"...&...#++", +"...&..#+++", +". at +##+%%%+", +".+$#@&+$%%", +".%##++++$%", +"++++++++%+"}; + +static char *NEXT_KILL_XPM[] = { +"10 10 64 1", +" c None", +". c #FBFBFB", +"+ c #FAFAFA", +"@ c #F7F7F7", +"# c #F5F5F5", +"$ c #F6F6F6", +"% c #EEEEEE", +"& c #B3B3B3", +"* c #FCFCFC", +"= c #8B8B8B", +"- c #E3E3E3", +"; c #F4F4F4", +"> c #ECECEC", +", c #EAEAEA", +"' c #BFBFBF", +") c #474747", +"! c #A5A5A5", +"~ c #EFEFEF", +"{ c #262626", +"] c #B6B6B6", +"^ c #B4B4B4", +"/ c #282828", +"( c #A3A3A3", +"_ c #FEFEFE", +": c #E0E0E0", +"< c #B8B8B8", +"[ c #C5C5C5", +"} c #DCDCDC", +"| c #D3D3D3", +"1 c #E4E4E4", +"2 c #B1B1B1", +"3 c #878787", +"4 c #D5D5D5", +"5 c #202020", +"6 c #222222", +"7 c #F1F1F1", +"8 c #959595", +"9 c #838383", +"0 c #DBDBDB", +"a c #252525", +"b c #E9E9E9", +"c c #F0F0F0", +"d c #999999", +"e c #808080", +"f c #9B9B9B", +"g c #C2C2C2", +"h c #7C7C7C", +"i c #7A7A7A", +"j c #232323", +"k c #CCCCCC", +"l c #C1C1C1", +"m c #181818", +"n c #404040", +"o c #747474", +"p c #E7E7E7", +"q c #303030", +"r c #C9C9C9", +"s c #ACACAC", +"t c #787878", +"u c #141414", +"v c #6C6C6C", +"w c #8F8F8F", +"x c #858585", +"y c #7F7F7F", +"...+@#$$%&", +"*=-+;>,')!", +"*~{];#^/((", +"*_:<[}|123", +"+ at +456;789", +"@~706abcde", +"#0fg#$3ehi", +"c=jk>%lmno", +"pqr}s(^tuv", +"2w!d=x9yvh"}; + +static char *NEXT_ICONIFY_XPM[] = { +"10 10 72 1", +" c None", +". c #FCFCFC", +"+ c #FAFAFA", +"@ c #F8F8F8", +"# c #F6F6F6", +"$ c #F2F2F2", +"% c #EFEFEF", +"& c #EAEAEA", +"* c #A6A6A6", +"= c #FEFEFE", +"- c #FDFDFD", +"; c #F9F9F9", +"> c #E2E2E2", +", c #CBCBCB", +"' c #AFAFAF", +") c #808080", +"! c #717171", +"~ c #FFFFFF", +"{ c #FBFBFB", +"] c #F1F1F1", +"^ c #E5E5E5", +"/ c #CCCCCC", +"( c #838383", +"_ c #A0A0A0", +": c #989898", +"< c #8B8B8B", +"[ c #7F7F7F", +"} c #E8E8E8", +"| c #ADADAD", +"1 c #181818", +"2 c #171717", +"3 c #161616", +"4 c #141414", +"5 c #0A0A0A", +"6 c #000000", +"7 c #A2A2A2", +"8 c #747474", +"9 c #6C6C6C", +"0 c #F0F0F0", +"a c #B9B9B9", +"b c #B7B7B7", +"c c #B1B1B1", +"d c #868686", +"e c #020202", +"f c #EDEDED", +"g c #939393", +"h c #676767", +"i c #696969", +"j c #8E8E8E", +"k c #787878", +"l c #757575", +"m c #777777", +"n c #767676", +"o c #EBEBEB", +"p c #525252", +"q c #626262", +"r c #F3F3F3", +"s c #E1E1E1", +"t c #B5B5B5", +"u c #5F5F5F", +"v c #424242", +"w c #5B5B5B", +"x c #9D9D9D", +"y c #969696", +"z c #E4E4E4", +"A c #444444", +"B c #2E2E2E", +"C c #A9A9A9", +"D c #7C7C7C", +"E c #797979", +"F c #5D5D5D", +"G c #646464", +"...+@#$%&*", +".=-;%>,')!", +"-~={]^/'(!", +"_'*:<[}|)!", +"123456%789", +"0abcdefghi", +"jklmneonpq", +"rs^>te}uvw", +"f_xy9ezABp", +"CDDEue7FpG"}; + #ifdef XKB_BUTTON_HINT #include "extend_pixmaps.h" #endif /* XKB_BUTTON_HINT */ --- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 14:57:22 +0400 +++ WindowMaker-0.91.0/src/menu.c 2005-05-18 14:57:22 +0400 @@ -672,7 +672,7 @@ twidth = WMWidthOfString(scr->menu_title_font, menu->frame->title, strlen(menu->frame->title)); theight = menu->frame->top_width; - twidth += theight + (wPreferences.new_style ? 16 : 8); + twidth += theight + (wPreferences.new_style == TS_NEW ? 16 : 8); } else { twidth = 0; theight = 0; --- WindowMaker-0.91.0/WPrefs.app/xpm/Makefile.am.vns 2005-05-18 14:57:22 +0400 +++ WindowMaker-0.91.0/WPrefs.app/xpm/Makefile.am 2005-05-18 14:57:22 +0400 @@ -28,6 +28,7 @@ msty2.xpm \ msty3.xpm \ newstyle.xpm \ + nextstyle.xpm \ nonopaque.xpm \ oldstyle.xpm \ opaque.xpm \ --- WindowMaker-0.91.0/WPrefs.app/xpm/oldstyle.xpm.vns 1999-05-01 21:44:44 +0400 +++ WindowMaker-0.91.0/WPrefs.app/xpm/oldstyle.xpm 2005-05-18 14:57:22 +0400 @@ -1,45 +1,51 @@ /* XPM */ -static char * image_name[] = { -"38 33 9 1", -" c #739C739C739C", -". c #000000000000", -"X c #210821082108", -"o c #294A294A294A", -"O c #FFFFFFFFFFFF", -"+ c #084208420842", -"@ c #A528A528A528", -"# c #529452945294", -"$ c #AD6AAD6AAD6A", -" .", -"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.", -"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.", -"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.", -"XXXXXXXXXXXXXXXXXXXoOOOOOOOOOOOOOOooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO at .#@@@@@@#.@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO at .#@@@@@@#.@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO#############ooo+", -"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+", -"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+", -"+++++++++++++++++++++++++++++++++++++.", -"......................................", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", -"##################################O$$.", -".................................$O$$.", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$."}; +static char * oldstyle_xpm[] = { +"37 33 15 1", +" c None", +". c #747474", +"+ c #757575", +"@ c #000000", +"# c #222222", +"$ c #262626", +"% c #282828", +"& c #FFFFFF", +"* c #080808", +"= c #A5A5A5", +"- c #535353", +"; c #060606", +"> c #070707", +", c #030303", +"' c #ABABAB", +"..................+++++++...........@", +"##################$$$$$$$%$%$$$$$$$$@", +"##################$$$$$$$$%%%%%%%%%%@", +"##################$$$$$$$%$%%%%%%%%%@", +"##################$&&&&&&&&&&&&&&%%%*", +"##################$&============-%%%*", +"##################$&=@-======-@=-%%%*", +"##################$&=- at -====- at -=-%%%*", +"##################$&==- at -==- at -==-%%%*", +"##################$&===- at --@-===-%%%*", +"##################$&====-@@-====-%%%*", +"##################$&====-@@-====-%%%*", +"##################$&===- at --@-===-%%%*", +"##################$&==- at -==- at -==-%%%*", +"##################$&=- at -====- at -=-%%%*", +"##################$&=@-======-@=-%%%*", +"##################$&============-%%%*", +"##################$&-------------%%%*", +"##################$$$$$$$$$%%%%%%%%%*", +"##################$$$$$$$%$%%%%%%%%%*", +";;;;;;;;;;;;;;;;;;>>>>>>>>>>>>>*****,", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"''''''''''''''''''''''''''''''''''''@", +"''''''''''''''''''''''''''''''''''''@", +"''''''''''''''''''''''''''''''''''''@", +"''''''''''''''''''''''''''''''''''''@", +"---------------------------------&''@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'&''@", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@"}; --- WindowMaker-0.91.0/WPrefs.app/tiff/Makefile.am.vns 2005-05-18 14:57:22 +0400 +++ WindowMaker-0.91.0/WPrefs.app/tiff/Makefile.am 2005-05-18 14:57:22 +0400 @@ -27,6 +27,7 @@ msty2.tiff \ msty3.tiff \ newstyle.tiff \ + nextstyle.tiff \ nonopaque.tiff \ oldstyle.tiff \ opaque.tiff \ --- WindowMaker-0.91.0/WPrefs.app/Configurations.c.vns 2004-10-23 07:03:35 +0400 +++ WindowMaker-0.91.0/WPrefs.app/Configurations.c 2005-05-18 15:26:38 +0400 @@ -42,6 +42,7 @@ WMFrame *titlF; WMButton *oldsB; WMButton *newsB; + WMButton *nextB; WMFrame *animF; WMButton *animB; @@ -68,6 +69,7 @@ #define OLDS_IMAGE "oldstyle" #define NEWS_IMAGE "newstyle" +#define NEXT_IMAGE "nextstyle" #define ANIM_IMAGE "animations" #define SUPERF_IMAGE "moreanim" @@ -86,16 +88,21 @@ static void showData(_Panel *panel) { + char *str; + WMPerformButtonClick(panel->icoB[GetSpeedForKey("IconSlideSpeed")]); WMPerformButtonClick(panel->shaB[GetSpeedForKey("ShadeSpeed")]); - if (GetBoolForKey("NewStyle")) { - WMPerformButtonClick(panel->newsB); + str = GetStringForKey("Newstyle"); + if (str && strcasecmp(str, "next") == 0) { + WMPerformButtonClick(panel->nextB); + } else if(str && strcasecmp(str, "old") == 0) { + WMPerformButtonClick(panel->oldsB); } else { - WMPerformButtonClick(panel->oldsB); + WMPerformButtonClick(panel->newsB); } - + WMSetButtonSelected(panel->animB, !GetBoolForKey("DisableAnimations")); WMSetButtonSelected(panel->supB, GetBoolForKey("Superfluous")); @@ -325,20 +332,34 @@ } panel->oldsB = WMCreateButton(panel->titlF, WBTOnOff); - WMResizeWidget(panel->oldsB, 74, 40); + WMResizeWidget(panel->oldsB, 37, 40); WMMoveWidget(panel->oldsB, 15, 60); WMSetButtonImagePosition(panel->oldsB, WIPImageOnly); path = LocateImage(OLDS_IMAGE); if (path) { - icon = WMCreatePixmapFromFile(scr, path); - if (icon) { - WMSetButtonImage(panel->oldsB, icon); - WMReleasePixmap(icon); - } - wfree(path); + icon = WMCreatePixmapFromFile(scr, path); + if (icon) { + WMSetButtonImage(panel->oldsB, icon); + WMReleasePixmap(icon); + } + } + + panel->nextB = WMCreateButton(panel->titlF, WBTOnOff); + WMResizeWidget(panel->nextB, 37, 40); + WMMoveWidget(panel->nextB, 52, 60); + WMSetButtonImagePosition(panel->nextB, WIPImageOnly); + path = LocateImage(NEXT_IMAGE); + if (path) { + icon = WMCreatePixmapFromFile(scr, path); + if (icon) { + WMSetButtonImage(panel->nextB, icon); + WMReleasePixmap(icon); + } + wfree(path); } WMGroupButtons(panel->newsB, panel->oldsB); + WMGroupButtons(panel->newsB, panel->nextB); WMMapSubwidgets(panel->titlF); @@ -495,7 +516,13 @@ } SetSpeedForKey(i, "ShadeSpeed"); - SetBoolForKey(WMGetButtonSelected(panel->newsB), "NewStyle"); + if (WMGetButtonSelected(panel->newsB)) { + SetStringForKey("new", "NewStyle"); + } else if (WMGetButtonSelected(panel->oldsB)) { + SetStringForKey("old", "NewStyle"); + } else { + SetStringForKey("next", "NewStyle"); + } SetBoolForKey(!WMGetButtonSelected(panel->animB), "DisableAnimations"); SetBoolForKey(WMGetButtonSelected(panel->supB), "Superfluous"); WindowMaker-0.91.0-alt-vlaad-trance.patch: --- NEW FILE WindowMaker-0.91.0-alt-vlaad-trance.patch --- --- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 14:44:22 +0400 +++ WindowMaker-0.91.0/src/menu.c 2005-05-18 14:44:23 +0400 @@ -93,6 +93,7 @@ static void menuCloseClick(WCoreWindow *sender, void *data, XEvent *event); static void updateTexture(WMenu *menu); +static void clipDimensionsToScreen(WMenu *menu, int *x, int *y, int *width, int *height); #ifndef LITE static int saveMenuRecurs(WMPropList *menus, WScreen *scr, WMenu *menu); @@ -498,6 +499,119 @@ static void +clipDimensionsToScreen(WMenu *menu, int *x, int *y, int *width, int *height) +{ + int sw, sh; + int fx, fy; + + sw = menu->menu->screen_ptr->scr_width; + sh = menu->menu->screen_ptr->scr_height; + + fx = *x + *width; + fy = *y + *height; + + /* CLAMP everything */ + if (*x > sw) { *x = sw; } else if (*x < 0) { *x = 0; } + if (*y > sh) { *y = sh; } else if (*y < 0) { *y = 0; } + if (fx > sw) { fx = sw; } else if (fx < 0) { fx = 0; } + if (fy > sh) { fy = sh; } else if (fy < 0) { fy = 0; } + + /* Make sure that height and width are positive */ + if (fx < *x) { *width = 0; } else { *width = fx - *x; } + if (fy < *y) { *height = 0; } else { *height = fy - *y; } +} + +static Pixmap +tranceMenu(WMenu *menu) +{ + WScreen *scr = menu->menu->screen_ptr; + + XImage *back, *front; + RImage *trance, *menu_image, *msnormal; + Pixmap original, result; + + int mw, mh, dx, dy; /* these correspond to the menu proper */ + int gx, gy, gw, gh; /* these correspond to what we grab from the root window */ + int tamount; + unsigned long red_mask, green_mask, blue_mask; + + unsigned int w, h, bar; + int foo; + Window baz; + + mw = gw = menu->menu->width; + mh = gh = menu->menu->height; + dx = gx = menu->frame_x + 1; + dy = gy = menu->frame_y + menu->frame->top_width + 1; + + tamount = wPreferences.trance_amount; + clipDimensionsToScreen(menu, &gx, &gy, &gw, &gh); + back = XGetImage(dpy, scr->root_win, gx, gy, gw, gh, + AllPlanes, ZPixmap); + if (!back) { + wwarning(_("error capturing \"back\" image"),RMessageForError(RErrorCode)); + return None; + } else { + red_mask = back->red_mask; + green_mask = back->green_mask; + blue_mask = back->blue_mask; + + trance = RCreateImageFromXImage(scr->rcontext, back, NULL); + XDestroyImage(back); + if (!trance) { + wwarning(_("error rendering \"trance\" image"), + RMessageForError(RErrorCode)); + return None; + } else { + /************************************************************/ + original = renderTexture(menu); + + XGetGeometry(dpy, original, &baz, &foo, + &foo, &w, &h, &bar, &bar); + front = XGetImage(dpy, original, 0, 0, w, h, + AllPlanes, ZPixmap); + if (!front) { + wwarning(_("error capturing \"front\" image"), + RMessageForError(RErrorCode)); + return None; + } + front->red_mask = red_mask; + front->green_mask = green_mask; + front->blue_mask = blue_mask; + + menu_image=RCreateImageFromXImage(scr->rcontext,front,NULL); + + XDestroyImage(front); + /************************************************************/ + if (original) { + FREE_PIXMAP(original); + } + if (!menu_image) { + wwarning(_("error rendering \"menu_image\""), + RMessageForError(RErrorCode)); + return None; + } else { + if (wPreferences.menu_style == MS_NORMAL) { + msnormal = RMakeTiledImage(menu_image, mw, mh); + RCombineAreaWithOpaqueness(trance, msnormal,0,0,gw,gh, + gx - dx,gy - dy,256*tamount/10); + RReleaseImage(menu_image); + RReleaseImage(msnormal); + } else { + RCombineAreaWithOpaqueness(trance, menu_image,0,0,gw,gh, + gx - dx,gy - dy,256*tamount/10); + RReleaseImage(menu_image); + } + RConvertImage(scr->rcontext, trance, + &result); + } + RReleaseImage(trance); + } + } + return result; +} + +static void updateTexture(WMenu *menu) { WScreen *scr = menu->menu->screen_ptr; @@ -507,7 +621,14 @@ if (!menu->flags.brother) { FREE_PIXMAP(menu->menu_texture_data); - menu->menu_texture_data = renderTexture(menu); + if (wPreferences.menu_trance) { + if((menu->menu_texture_data = tranceMenu(menu))==NULL) + { + menu->menu_texture_data = renderTexture(menu); + } + } else { + menu->menu_texture_data = renderTexture(menu); + } XSetWindowBackgroundPixmap(dpy, menu->menu->window, menu->menu_texture_data); @@ -1166,6 +1287,11 @@ XMoveWindow(dpy, menu->frame->core->window, x, y); menu->frame_x = x; menu->frame_y = y; + /* FIXME: needs an if */ + if (wPreferences.menu_trance) { + updateTexture(menu); + } + /* */ XMapWindow(dpy, menu->frame->core->window); wRaiseFrame(menu->frame->core); menu->flags.mapped = 1; @@ -1190,6 +1316,11 @@ menu->frame_y = menu->frame->screen_ptr->app_menu_y; XMoveWindow(dpy, menu->frame->core->window, menu->frame_x, menu->frame_y); } + /* FIXME: needs an if */ + if (wPreferences.menu_trance) { + updateTexture(menu); + } + /* */ XMapWindow(dpy, menu->frame->core->window); wRaiseFrame(menu->frame->core); menu->flags.mapped = 1; --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 14:44:23 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 14:44:23 +0400 @@ -339,6 +339,8 @@ char opaque_move; /* update window position during */ /* move */ + char menu_trance; /* whether menu should be translucent */ + int trance_amount; /* percentage of translucency */ char wrap_menus; /* wrap menus at edge of screen */ char scrollable_menus; /* let them be scrolled */ char align_menus; /* align menu with their parents */ --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 14:44:23 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 14:44:23 +0400 @@ -499,6 +499,12 @@ {"UseSaveUnders", "NO", NULL, &wPreferences.use_saveunders, getBool, NULL }, + {"MenuTrance", "NO", NULL, + &wPreferences.menu_trance, getBool, NULL + }, + {"TranceAmount", "30", NULL, + &wPreferences.trance_amount, getInt, NULL + }, {"OpaqueMove", "NO", NULL, &wPreferences.opaque_move, getBool, NULL }, --- WindowMaker-0.91.0/WPrefs.app/Appearance.c.vns 2005-05-18 14:44:23 +0400 +++ WindowMaker-0.91.0/WPrefs.app/Appearance.c 2005-05-18 14:51:21 +0400 @@ -82,6 +82,11 @@ WMFrame *taliF; WMButton *taliB[3]; + WMFrame *tranceF; + WMButton *tranceB; + WMSlider *tranceSl; + WMLabel *tranceL; + /* root bg */ WMFrame *bgF; @@ -1714,6 +1719,23 @@ } } +static void +tranceCallback(WMWidget *self, void *data) +{ + _Panel *panel = (_Panel*)data; + char buffer[5]; + int i; + + i = WMGetSliderValue(panel->tranceSl); + i = 10*(10-i); + + if (i == 0) { + WMSetLabelText(panel->tranceL, "OFF"); + } else { + sprintf(buffer, "%i%%", i); + WMSetLabelText(panel->tranceL, buffer); + } +} static void createPanel(Panel *p) @@ -2005,7 +2027,7 @@ panel->taliF = WMCreateFrame(panel->optF); - WMResizeWidget(panel->taliF, 110, 80); + WMResizeWidget(panel->taliF, 105, 80); WMMoveWidget(panel->taliF, 15, 100); WMSetFrameTitle(panel->taliF, _("Title Alignment")); @@ -2023,7 +2045,7 @@ WMSetButtonText(panel->taliB[i], _("Right")); break; } - WMResizeWidget(panel->taliB[i], 90, 18); + WMResizeWidget(panel->taliB[i], 85, 18); WMMoveWidget(panel->taliB[i], 10, 15 + 20*i); } WMGroupButtons(panel->taliB[0], panel->taliB[1]); @@ -2031,6 +2053,36 @@ WMMapSubwidgets(panel->taliF); + panel->tranceF = WMCreateFrame(panel->optF); + WMResizeWidget(panel->tranceF, 105,80); + WMMoveWidget(panel->tranceF, 125, 100); + WMSetFrameTitle(panel->tranceF,_("Transparency")); + + WMSetBalloonTextForView(_(" i love windowmaker\n" + " get some fresh sand-wich-es\n" + " heh\n" + " transparency\n" + " moo\n" + " :P\n"), WMWidgetView(panel->tranceF)); + + panel->tranceB = WMCreateSwitchButton(panel->tranceF); + WMSetButtonText(panel->tranceB, _("Menu")); + WMResizeWidget(panel->tranceB,85,18); + WMMoveWidget(panel->tranceB, 10, 15); + + panel->tranceSl = WMCreateSlider(panel->tranceF); + WMResizeWidget(panel->tranceSl, 70, 18); + WMMoveWidget(panel->tranceSl, 17, 15 + 20*2); + WMSetSliderMinValue(panel->tranceSl, 0); + WMSetSliderMaxValue(panel->tranceSl, 10); + WMSetSliderAction(panel->tranceSl, tranceCallback, panel); + + panel->tranceL = WMCreateLabel(panel->tranceF); + WMResizeWidget(panel->tranceL, 27, 18); + WMMoveWidget(panel->tranceL, 40, 35); + + WMMapSubwidgets(panel->tranceF); + WMMapSubwidgets(panel->optF); /**/ @@ -2089,6 +2141,7 @@ static void showData(_Panel *panel) { + int x; int i; char *str; @@ -2134,6 +2187,13 @@ WMSetButtonSelected(panel->mstyB[panel->menuStyle], True); WMSetButtonSelected(panel->taliB[panel->titleAlignment], True); + + + WMSetButtonSelected(panel->tranceB, GetBoolForKey("MenuTrance")); + + x = GetIntegerForKey("TranceAmount"); + WMSetSliderValue(panel->tranceSl, x); + tranceCallback(NULL, panel); } @@ -2185,6 +2245,9 @@ SetStringForKey("center", "TitleJustify"); break; } + + SetBoolForKey(WMGetButtonSelected(panel->tranceB), "MenuTrance"); + SetIntegerForKey(WMGetSliderValue(panel->tranceSl), "TranceAmount"); } WindowMaker-0.91.0-hmepas-minimizeall.patch: --- NEW FILE WindowMaker-0.91.0-hmepas-minimizeall.patch --- --- WindowMaker-0.91.0/src/event.c.vns 2005-05-18 21:40:15 +0400 +++ WindowMaker-0.91.0/src/event.c 2005-05-18 21:42:02 +0400 @@ -1410,6 +1410,10 @@ OpenWindowMenu(wwin, wwin->frame_x, wwin->frame_y+wwin->frame->top_width, True); break; + case WKBD_ALLMINIMIZE: + CloseWindowMenu(scr); + wHideAll(scr); + break; case WKBD_MINIATURIZE: if (ISMAPPED(wwin) && ISFOCUSED(wwin) && !WFLAGP(wwin, no_miniaturizable)) { --- WindowMaker-0.91.0/src/actions.c.vns 2005-05-18 21:40:15 +0400 +++ WindowMaker-0.91.0/src/actions.c 2005-05-18 21:40:16 +0400 @@ -1295,6 +1295,57 @@ +// ADDED BY HMEPAS +void wHideAll(WScreen *scr) +{ + WWindow *wwin; + WWindow **windows; + Window FocusedWin; + WMenu *menu; + unsigned int wcount = 0; + int FocusState; + int i; + + if (!scr) + return; + + menu = scr->switch_menu; + + windows = malloc( sizeof(WWindow *) ); + + if (menu != NULL) { + for(i=0;ientry_no;i++) { + windows[wcount] = (WWindow *) menu->entries[i]->clientdata; + wcount++; + windows = realloc(windows, sizeof(WWindow *) * (wcount+1) ); + } + } else { + wwin = scr->focused_window; + + while(wwin) { + windows[wcount] = wwin; + wcount++; + windows = realloc(windows, sizeof(WWindow *) * (wcount+1) ); + wwin = wwin->prev; + + } + } + + for(i=0;i < wcount; i++) { + wwin = windows[i]; + if (wwin->frame->workspace == scr->current_workspace + && !(wwin->flags.miniaturized||wwin->flags.hidden) + && !wwin->flags.internal_window + && !WFLAGP(wwin, no_miniaturizable) + ) + { + wwin->flags.skip_next_animation = 1; + wIconifyWindow(wwin); + } + } +} + + void wHideOtherApplications(WWindow *awin) { --- WindowMaker-0.91.0/src/actions.h.vns 2004-10-12 21:53:07 +0400 +++ WindowMaker-0.91.0/src/actions.h 2005-05-18 21:40:16 +0400 @@ -69,5 +69,8 @@ void wUnfullscreenWindow(WWindow *wwin); +// ADDED BY HMEPAS TO MINIMIZE ALL WINDOWS ON CURRENT WORKSPACE +void wHideAll(WScreen *src); + #endif --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 21:40:16 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 21:40:16 +0400 @@ -705,6 +705,9 @@ NULL, getKeybind, setKeyGrab }, #endif /* LITE */ + {"AllMinimizeKey", "None", (void*)WKBD_ALLMINIMIZE, + NULL, getKeybind, setKeyGrab + }, {"WindowMenuKey", "None", (void*)WKBD_WINDOWMENU, NULL, getKeybind, setKeyGrab }, --- WindowMaker-0.91.0/src/keybind.h.vns 2004-10-12 21:55:38 +0400 +++ WindowMaker-0.91.0/src/keybind.h 2005-05-18 21:43:50 +0400 @@ -77,12 +77,13 @@ #define WKBD_WINDOW10 44 #define WKBD_SWITCH_SCREEN 45 +#define WKBD_ALLMINIMIZE 46 #ifdef KEEP_XKB_LOCK_STATUS -# define WKBD_TOGGLE 46 -# define WKBD_TMP 47 +# define WKBD_TOGGLE 47 +# define WKBD_TMP 48 #else -# define WKBD_TMP 46 +# define WKBD_TMP 47 #endif #ifdef VIRTUAL_DESKTOP WindowMaker-0.91.0-hmepas-swmenu_rclick.patch: --- NEW FILE WindowMaker-0.91.0-hmepas-swmenu_rclick.patch --- --- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 21:46:03 +0400 +++ WindowMaker-0.91.0/src/menu.c 2005-05-18 21:46:03 +0400 @@ -2077,6 +2077,7 @@ static void menuMouseDown(WObjDescriptor *desc, XEvent *event) { + WWindow *wwin; // ADDED BY HMEPAS FOR sw_rclick XButtonEvent *bev = &event->xbutton; WMenu *menu = desc->parent; WMenu *smenu; @@ -2160,7 +2161,27 @@ } } else if (!delayed_select) { - selectEntry(menu, entry_no); + // ADDED BY HMEPAS + // FOR WindowMenu open by right click on + // switchmenu entry + if( menu == scr->switch_menu && event->xbutton.button == Button3 ) { + selectEntry(menu, entry_no); + OpenWindowMenu2( (WWindow*)entry->clientdata, + event->xbutton.x_root, + event->xbutton.y_root, False); + wwin = (WWindow*)entry->clientdata; + desc = &wwin->screen_ptr->window_menu->menu->descriptor; + event->xany.send_event = True; + (*desc->handle_mousedown)(desc, event); + + XUngrabPointer(dpy, CurrentTime); + selectEntry(menu, -1); + return; + } + else { + selectEntry(menu, entry_no); + } + // END OF HMEPAS PATCH } if (!wPreferences.wrap_menus && !wPreferences.scrollable_menus) { --- WindowMaker-0.91.0/src/funcs.h.vns 2004-10-14 22:03:28 +0400 +++ WindowMaker-0.91.0/src/funcs.h 2005-05-18 21:46:03 +0400 @@ -65,6 +65,13 @@ void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard); +// THIS IS NEED FOR MY SW_RIGHT CLICK PATCH +// (FOR MOVING WINDOW FROM ANOTHER WORKSPACE TO +// CURRENT) ON NATIVE FUNCTION MOVE TO CURRENT +// WORKSPACE IS DISABLED +// HMEPAS +void OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard); + void OpenMiniwindowMenu(WWindow *wwin, int x, int y); void OpenWorkspaceMenu(WScreen *scr, int x, int y); --- WindowMaker-0.91.0/src/winmenu.c.vns 2004-10-21 07:21:16 +0400 +++ WindowMaker-0.91.0/src/winmenu.c 2005-05-18 21:52:50 +0400 @@ -619,7 +619,6 @@ wMenuRealize(menu); } - void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard) { @@ -650,10 +649,46 @@ updateMenuForWindow(menu, wwin); x -= menu->frame->core->width/2; - if (x + menu->frame->core->width > wwin->frame_x+wwin->frame->core->width) - x = wwin->frame_x+wwin->frame->core->width - menu->frame->core->width; - if (x < wwin->frame_x) - x = wwin->frame_x; + if (!wwin->flags.internal_window) + wMenuMapAt(menu, x, y, keyboard); +} + +void +OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard) +{ + int i; + WMenu *menu; + WScreen *scr = wwin->screen_ptr; + + wwin->flags.menu_open_for_me = 1; + + if (!scr->window_menu) { + scr->window_menu = createWindowMenu(scr); + + /* hack to save some memory allocation/deallocation */ + wfree(scr->window_menu->entries[MC_MINIATURIZE]->text); + wfree(scr->window_menu->entries[MC_MAXIMIZE]->text); + wfree(scr->window_menu->entries[MC_SHADE]->text); + } else { + updateWorkspaceMenu(scr->workspace_submenu); + } + + menu = scr->window_menu; + if (menu->flags.mapped) { + wMenuUnmap(menu); + if (menu->entries[0]->clientdata==wwin) { + return; + } + } + + updateMenuForWindow(menu, wwin); + + for (i = 0; i < scr->workspace_submenu->entry_no; i++) { + scr->workspace_submenu->entries[i]->clientdata = wwin; + wMenuSetEnabled(scr->workspace_submenu, i, True); + } + + x -= menu->frame->core->width/2; if (!wwin->flags.internal_window) wMenuMapAt(menu, x, y, keyboard); WindowMaker-0.91.0-peter-appicon-bouncer2.patch: --- NEW FILE WindowMaker-0.91.0-peter-appicon-bouncer2.patch --- --- 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 @@ if (wapp->refcount>0) return; +#ifdef BOUNCE_APP + if (wapp->flags.bouncing) + { + /* event.c:handleDestroyNotify forced this destroy + and thereby overlooked the bounce callback */ + wapp->refcount = 1; + return; + } +#endif + scr = wapp->main_window_desc->screen_ptr; main_window = wapp->main_window; --- WindowMaker-0.91.0/src/application.h.vns 2005-05-19 12:42:35 +0400 +++ WindowMaker-0.91.0/src/application.h 2005-05-19 12:44:51 +0400 @@ -46,6 +46,9 @@ unsigned int skip_next_animation:1; unsigned int hidden:1; unsigned int emulated:1; +#ifdef BOUNCE_APP + unsigned int bouncing:1; +#endif } flags; } WApplication; @@ -58,6 +61,8 @@ void wApplicationExtractDirPackIcon(WScreen *scr,char *path, char *wm_instance, char *wm_class); +void wAppBounce(WApplication *); + #ifdef NEWAPPICON #define wApplicationActivate(wapp) do { \ --- WindowMaker-0.91.0/src/superfluous.c.vns 2004-10-12 21:46:38 +0400 +++ WindowMaker-0.91.0/src/superfluous.c 2005-05-19 12:42:35 +0400 @@ -41,6 +41,7 @@ #include "window.h" #include "icon.h" #include "appicon.h" +#include "xinerama.h" extern WPreferences wPreferences; @@ -810,3 +811,164 @@ #endif /* GHOST_WINDOW_MOVE */ +#ifdef BOUNCE_APP + +#define BOUNCE_HZ 25 +#define BOUNCE_DELAY (1000/BOUNCE_HZ) +#define BOUNCE_HEIGHT 24 +#define BOUNCE_LENGTH 0.3 +#define BOUNCE_DAMP 0.6 + +typedef struct AppBouncerData { + WApplication *wapp; + int count; + int pow; + int dir; + WMHandlerID *timer; +} AppBouncerData; + +static void +doAppBounce(void *arg) +{ + AppBouncerData *data = (AppBouncerData*)arg; + WAppIcon *aicon = data->wapp->app_icon; + +reinit: + if (aicon && data->wapp->refcount > 1) + { + const double ticks = BOUNCE_HZ*BOUNCE_LENGTH; + const double s = sqrt(BOUNCE_HEIGHT)/(ticks/2); + double h = BOUNCE_HEIGHT*pow(BOUNCE_DAMP, data->pow); + double sqrt_h = sqrt(h); + if (h > 3) + { + double offset, x = s * data->count - sqrt_h; + if (x > sqrt_h) + { + ++data->pow; + data->count = 0; + goto reinit; + } else ++data->count; + offset = h - x*x; + + switch(data->dir) + { + case 0: /* left, bounce to right */ + XMoveWindow(dpy, aicon->icon->core->window, + aicon->x_pos + (int)offset, aicon->y_pos); + break; + case 1: /* right, bounce to left */ + XMoveWindow(dpy, aicon->icon->core->window, + aicon->x_pos - (int)offset, aicon->y_pos); + break; + case 2: /* top, bounce down */ + XMoveWindow(dpy, aicon->icon->core->window, + aicon->x_pos, aicon->y_pos + (int)offset); + break; + case 3: /* bottom, bounce up */ + XMoveWindow(dpy, aicon->icon->core->window, + aicon->x_pos, aicon->y_pos - (int)offset); + break; + } + return; + } + XMoveWindow(dpy, aicon->icon->core->window, + aicon->x_pos, aicon->y_pos); + } + + data->wapp->flags.bouncing = 0; + WMDeleteTimerHandler(data->timer); + wApplicationDestroy(data->wapp); + free(data); +} + +static int +bounceDirection(WAppIcon *aicon) +{ + enum { left_e = 1, right_e = 2, top_e = 4, bottom_e = 8 }; + + WScreen *scr = aicon->icon->core->screen_ptr; + WMRect rr, sr; + int l,r,t,b, h,v; + int dir = 0; + + rr.pos.x = aicon->x_pos; + rr.pos.y = aicon->y_pos; + rr.size.width = rr.size.height = 64; + + sr = wGetRectForHead(scr, wGetHeadForRect(scr, rr)); + + l = rr.pos.x - sr.pos.x; + r = sr.pos.x + sr.size.width - rr.pos.x - rr.size.width; + t = rr.pos.y - sr.pos.y; + b = sr.pos.y + sr.size.height - rr.pos.y - rr.size.height; + + if (l < r) { + dir |= left_e; + h = l; + } else { + dir |= right_e; + h = r; + } + + if (t < b) { + dir |= top_e; + v = t; + } else { + dir |= bottom_e; + v = b; + } + + if (h < v) dir &= ~(top_e | bottom_e); + else dir &= ~(left_e | right_e); + + switch(dir) + { + case left_e: + dir = 0; + break; + + case right_e: + dir = 1; + break; + + case top_e: + dir = 2; + break; + + case bottom_e: + dir = 3; + break; + + default: + wwarning(_("impossible direction: %d\n"), dir); + dir = 3; + break; + } + + return dir; +} + +void +wAppBounce(WApplication * wapp) +{ + if (wapp->app_icon && !wapp->flags.bouncing) + { + ++wapp->refcount; + wapp->flags.bouncing = 1; + + AppBouncerData *data = + (AppBouncerData*)malloc(sizeof(AppBouncerData)); + data->wapp = wapp; + data->count = data->pow = 0; + data->dir = bounceDirection(wapp->app_icon); + data->timer = WMAddPersistentTimerHandler(BOUNCE_DELAY, doAppBounce, data); + } +} + +#else +void +wAppBounce(WApplication * wapp) +{ +} +#endif WindowMaker-0.91.0-peter-mouse-placement.patch: --- NEW FILE WindowMaker-0.91.0-peter-mouse-placement.patch --- --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-19 12:29:12 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-19 12:29:12 +0400 @@ -169,6 +169,8 @@ #define WPM_SMART 2 #define WPM_RANDOM 3 #define WPM_AUTO 4 +#define WPM_SMARTMOUSE 5 +#define WPM_MOUSE 6 /* text justification */ #define WTJ_CENTER 0 --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-19 12:29:12 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-19 12:29:12 +0400 @@ -238,6 +238,8 @@ {"Cascade", WPM_CASCADE, 0}, {"Random", WPM_RANDOM, 0}, {"Manual", WPM_MANUAL, 0}, + {"SmartMouse", WPM_SMARTMOUSE, 0}, + {"Mouse", WPM_MOUSE, 0}, {NULL, 0, 0} }; --- WindowMaker-0.91.0/src/placement.c.vns 2005-05-19 12:29:11 +0400 +++ WindowMaker-0.91.0/src/placement.c 2005-05-19 12:31:22 +0400 @@ -416,6 +416,127 @@ *y_ret = min_isect_y; } +static void +smartmousePlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, + unsigned int width, unsigned int height, + WArea usableArea) +{ + WScreen *scr = wwin->screen_ptr; + int test_x = 0, test_y = usableArea.y1; + int from_x, to_x, from_y, to_y; + int pointer_x, pointer_y; + double rad, min_rad = INT_MAX; + int sx; + int min_isect, min_isect_x, min_isect_y; + int sum_isect; + + if (wwin->frame) { + height += wwin->frame->top_width + wwin->frame->bottom_width; + } else { + if (HAS_TITLEBAR(wwin)) height += 18; + if (HAS_RESIZEBAR(wwin)) height += 8; + } + if (HAS_BORDER(wwin)) { + height += 2; + width += 2; + } + + sx = usableArea.x1; + + min_isect = INT_MAX; + min_isect_x = sx; + min_isect_y = test_y; + + { + Window win; + int tint; + unsigned int tuint; + + XQueryPointer(dpy, scr->root_win, &win, &win, + &pointer_x, &pointer_y, + &tint, &tint, &tuint); + } + +#define SQ(x) ((x)*(x)) +#define RAD() sqrt( SQ(test_x + width/2 - pointer_x) + \ + SQ(test_y + height/2 - pointer_y)) + + while (((test_y + height) < usableArea.y2)) { + test_x = sx; + while ((test_x + width) < usableArea.x2) { + sum_isect = calcSumOfCoveredAreas(wwin, test_x, test_y, + width, height); + rad = RAD(); + if ( sum_isect < min_isect || + (sum_isect == min_isect && rad < min_rad)) { + min_rad = rad; + min_isect = sum_isect; + min_isect_x = test_x; + min_isect_y = test_y; + } + + test_x += PLACETEST_HSTEP; + } + test_y += PLACETEST_VSTEP; + } + + from_x = min_isect_x - PLACETEST_HSTEP + 1; + from_x = WMAX(from_x, usableArea.x1); + to_x = min_isect_x + PLACETEST_HSTEP; + if (to_x + width > usableArea.x2) + to_x = usableArea.x2 - width; + + from_y = min_isect_y - PLACETEST_VSTEP + 1; + from_y = WMAX(from_y, usableArea.y1); + to_y = min_isect_y + PLACETEST_VSTEP; + if (to_y + height > usableArea.y2) + to_y = usableArea.y2 - height; + + for (test_x = from_x; test_x < to_x; test_x++) { + for (test_y = from_y; test_y < to_y; test_y++) { + sum_isect = calcSumOfCoveredAreas(wwin, test_x, test_y, + width, height); + rad = RAD(); + if ( sum_isect < min_isect || + (sum_isect == min_isect && rad < min_rad)) { + min_rad = rad; + min_isect = sum_isect; + min_isect_x = test_x; + min_isect_y = test_y; + } + } + } + + *x_ret = min_isect_x; + *y_ret = min_isect_y; +} + +static void +mousePlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, + unsigned int width, unsigned int height, WArea usableArea) +{ + WScreen *scr = wwin->screen_ptr; + int pointer_x, pointer_y; + + { + Window win; + int tint; + unsigned int tuint; + + XQueryPointer(dpy, scr->root_win, &win, &win, + &pointer_x, &pointer_y, + &tint, &tint, &tuint); + } + + *x_ret = pointer_x - width/2; + *y_ret = pointer_y - height/2; + + if ( *x_ret < usableArea.x1) *x_ret = usableArea.x1; + else if ( *x_ret + width > usableArea.x2) *x_ret = usableArea.x2 - width; + + if ( *y_ret < usableArea.y1) *y_ret = usableArea.y1; + else if ( *y_ret + height > usableArea.y2) *y_ret = usableArea.y2 - height; +} static Bool autoPlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, @@ -610,6 +731,14 @@ smartPlaceWindow(wwin, x_ret, y_ret, width, height, usableArea); break; + case WPM_SMARTMOUSE: + smartmousePlaceWindow(wwin, x_ret, y_ret, width, height, usableArea); + break; + + case WPM_MOUSE: + mousePlaceWindow(wwin, x_ret, y_ret, width, height, usableArea); + break; + case WPM_AUTO: if (autoPlaceWindow(wwin, x_ret, y_ret, width, height, 0, usableArea)) { --- WindowMaker-0.91.0/WPrefs.app/WindowHandling.c.vns 2004-10-13 00:19:34 +0400 +++ WindowMaker-0.91.0/WPrefs.app/WindowHandling.c 2005-05-19 12:32:39 +0400 @@ -77,7 +77,9 @@ "random", "manual", "cascade", - "smart" + "smart", + "smartmouse", + "mouse" }; @@ -137,6 +139,10 @@ return 3; else if (strcasecmp(str, "smart")==0) return 4; + else if (strcasecmp(str, "smartmouse")==0) + return 5; + else if (strcasecmp(str, "mouse")==0) + return 6; else wwarning(_("bad option value %s in WindowPlacement. Using default value"), str); @@ -252,6 +258,8 @@ WMAddPopUpButtonItem(panel->placP, _("Manual")); WMAddPopUpButtonItem(panel->placP, _("Cascade")); WMAddPopUpButtonItem(panel->placP, _("Smart")); + WMAddPopUpButtonItem(panel->placP, _("SmartMouse")); + WMAddPopUpButtonItem(panel->placP, _("Mouse")); panel->porigL = WMCreateLabel(panel->placF); WMResizeWidget(panel->porigL, 120, 32); WindowMaker-0.91.0-peter-newappicon.patch: --- NEW FILE WindowMaker-0.91.0-peter-newappicon.patch --- --- WindowMaker-0.91.0/wrlib/misc.c.vns 2004-10-12 22:21:39 +0400 +++ WindowMaker-0.91.0/wrlib/misc.c 2005-05-19 11:42:54 +0400 @@ -152,7 +152,7 @@ } } else { int bytes = image->width*image->height; - int alpha, nalpha, r, g, b; + int alpha, nalpha, r, g, b, s; alpha = color->alpha; r = color->red * alpha; @@ -160,17 +160,53 @@ b = color->blue * alpha; nalpha = 255 - alpha; - for (i=0; iformat == RRGBAFormat) { - d++; - } + s = (image->format == RRGBAFormat) ? 4 : 3; + + for (i=0; i 255) c=255; + return (unsigned char)c; +} + +void +RLightImage(RImage *image, RColor *color) +{ + unsigned char *d = image->data; + unsigned char *dd; + int alpha, r, g, b, s; + + s = (image->format == RRGBAFormat) ? 4 : 3; + dd = d + s*image->width*image->height; + + r = color->red; + g = color->green; + b = color->blue; + + alpha = color->alpha; + + if (r == 0 && g == 0 && b == 0) { + for (; drcontext, tile, &pixmap)) { wwarning(_("error rendering image:%s"), RMessageForError(RErrorCode)); @@ -597,6 +604,7 @@ } icon->highlighted = flag; + icon->force_paint = True; wIconPaint(icon); } @@ -766,7 +774,7 @@ if (icon->image) { icon->pixmap = makeIcon(scr, icon->image, icon->show_title, - icon->shadowed, icon->tile_type); + icon->shadowed, icon->tile_type, icon->highlighted); } else { /* make default icons */ @@ -794,9 +802,9 @@ image = wIconValidateIconSize(scr, image); scr->def_icon_pixmap = makeIcon(scr, image, False, False, - icon->tile_type); + icon->tile_type, icon->highlighted); scr->def_ticon_pixmap = makeIcon(scr, image, True, False, - icon->tile_type); + icon->tile_type, icon->highlighted); if (image) RReleaseImage(image); } --- WindowMaker-0.91.0/src/appicon.c.vns 2005-05-19 11:42:53 +0400 +++ WindowMaker-0.91.0/src/appicon.c 2005-05-19 11:42:54 +0400 @@ -222,7 +222,7 @@ -#ifdef NEWAPPICON +#if 0 static void drawCorner(WIcon *icon, WWindow *wwin, int active) { --- WindowMaker-0.91.0/src/application.c.vns 2005-05-19 11:42:53 +0400 +++ WindowMaker-0.91.0/src/application.c 2005-05-19 11:42:54 +0400 @@ -465,6 +465,9 @@ XDeleteContext(dpy, wapp->main_window, wAppWinContext); wAppMenuDestroy(wapp->menu); +#ifdef NEWAPPICON + wApplicationDeactivate(wapp); +#endif if (wapp->app_icon) { if (wapp->app_icon->docked && !wapp->app_icon->attracted) { wapp->app_icon->running = 0; --- WindowMaker-0.91.0/src/application.h.vns 2004-10-12 21:53:54 +0400 +++ WindowMaker-0.91.0/src/application.h 2005-05-19 11:47:21 +0400 @@ -60,15 +60,21 @@ #ifdef NEWAPPICON -# define wApplicationActivate(wapp) {\ - wapp->main_window_desc->flags.focused=1; \ - wAppIconPaint(wapp->app_icon);\ - } -#define wApplicationDeactivate(wapp) {\ - wapp->main_window_desc->flags.focused=0;\ - wAppIconPaint(wapp->app_icon);\ - } -#endif +#define wApplicationActivate(wapp) do { \ + if (wapp->app_icon) { \ + wIconSetHighlited(wapp->app_icon->icon, True); \ + wAppIconPaint(wapp->app_icon);\ + } \ + } while (0) + +#define wApplicationDeactivate(wapp) do { \ + if (wapp->app_icon) { \ + wIconSetHighlited(wapp->app_icon->icon, False); \ + wAppIconPaint(wapp->app_icon);\ + } \ + } while (0) + #endif +#endif WindowMaker-0.91.0-sga-moving-add.patch: --- NEW FILE WindowMaker-0.91.0-sga-moving-add.patch --- --- WindowMaker-0.91.0/src/event.c.vns 2005-05-18 22:00:15 +0400 +++ WindowMaker-0.91.0/src/event.c 2005-05-18 22:01:18 +0400 @@ -1405,6 +1405,21 @@ } break; #endif /* !LITE */ + case WKBD_MOVELEFTBOTTOM: + case WKBD_MOVEBOTTOM: + case WKBD_MOVERIGHTBOTTOM: + case WKBD_MOVELEFT: + case WKBD_MOVECENTER: + case WKBD_MOVERIGHT: + case WKBD_MOVELEFTTOP: + case WKBD_MOVETOP: + case WKBD_MOVERIGHTTOP: + if (ISMAPPED(wwin) && ISFOCUSED(wwin) && + (!WFLAGP(wwin, no_resizable) || !WFLAGP(wwin, no_movable))) { + CloseWindowMenu(scr); + wKeyboardMoveWindowAdditional(wwin, command); + } + break; case WKBD_WINDOWMENU: if (ISMAPPED(wwin) && ISFOCUSED(wwin)) OpenWindowMenu(wwin, wwin->frame_x, --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 22:00:15 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 22:00:15 +0400 @@ -705,6 +705,33 @@ NULL, getKeybind, setKeyGrab }, #endif /* LITE */ + {"MoveLeftBottomKey", "None", (void*)WKBD_MOVELEFTBOTTOM, + NULL, getKeybind, setKeyGrab + }, + {"MoveBottomKey", "None", (void*)WKBD_MOVEBOTTOM, + NULL, getKeybind, setKeyGrab + }, + {"MoveRightBottomKey", "None", (void*)WKBD_MOVERIGHTBOTTOM, + NULL, getKeybind, setKeyGrab + }, + {"MoveLeftKey", "None", (void*)WKBD_MOVELEFT, + NULL, getKeybind, setKeyGrab + }, + {"MoveCenterKey", "None", (void*)WKBD_MOVECENTER, + NULL, getKeybind, setKeyGrab + }, + {"MoveRightKey", "None", (void*)WKBD_MOVERIGHT, + NULL, getKeybind, setKeyGrab + }, + {"MoveLeftTopKey", "None", (void*)WKBD_MOVELEFTTOP, + NULL, getKeybind, setKeyGrab + }, + {"MoveTopKey", "None", (void*)WKBD_MOVETOP, + NULL, getKeybind, setKeyGrab + }, + {"MoveRightTopKey", "None", (void*)WKBD_MOVERIGHTTOP, + NULL, getKeybind, setKeyGrab + }, {"AllMinimizeKey", "None", (void*)WKBD_ALLMINIMIZE, NULL, getKeybind, setKeyGrab }, --- WindowMaker-0.91.0/src/keybind.h.vns 2005-05-18 22:00:15 +0400 +++ WindowMaker-0.91.0/src/keybind.h 2005-05-18 22:02:39 +0400 @@ -78,12 +78,21 @@ #define WKBD_SWITCH_SCREEN 45 #define WKBD_ALLMINIMIZE 46 +#define WKBD_MOVELEFTBOTTOM 47 +#define WKBD_MOVEBOTTOM 48 +#define WKBD_MOVERIGHTBOTTOM 49 +#define WKBD_MOVELEFT 50 +#define WKBD_MOVECENTER 51 +#define WKBD_MOVERIGHT 52 +#define WKBD_MOVELEFTTOP 53 +#define WKBD_MOVETOP 54 +#define WKBD_MOVERIGHTTOP 55 #ifdef KEEP_XKB_LOCK_STATUS -# define WKBD_TOGGLE 47 -# define WKBD_TMP 48 +# define WKBD_TOGGLE 56 +# define WKBD_TMP 57 #else -# define WKBD_TMP 47 +# define WKBD_TMP 56 #endif #ifdef VIRTUAL_DESKTOP --- WindowMaker-0.91.0/src/moveres.c.vns 2005-05-18 22:00:15 +0400 +++ WindowMaker-0.91.0/src/moveres.c 2005-05-18 22:03:33 +0400 @@ -44,6 +44,8 @@ #include "screen.h" #include "xinerama.h" +#include "keybind.h" + #include @@ -1415,10 +1417,15 @@ case XK_Escape: done=1; break; - case XK_Up: #ifdef XK_KP_Up case XK_KP_Up: #endif + case XK_8: + if (!ctrlmode){ + off_y=-src_y; + } + break; + case XK_Up: case XK_k: if (ctrlmode){ if (moment != UP) @@ -1429,10 +1436,15 @@ } else off_y-=kspeed; break; - case XK_Down: #ifdef XK_KP_Down case XK_KP_Down: #endif + case XK_2: + if (!ctrlmode){ + off_y=-src_y+scr_height-wh; + } + break; + case XK_Down: case XK_j: if (ctrlmode){ if (moment != DOWN) @@ -1442,10 +1454,15 @@ } else off_y+=kspeed; break; - case XK_Left: #ifdef XK_KP_Left case XK_KP_Left: #endif + case XK_4: + if (!ctrlmode){ + off_x=-src_x; + } + break; + case XK_Left: case XK_h: if (ctrlmode) { if (moment != LEFT) @@ -1456,10 +1473,15 @@ } else off_x-=kspeed; break; - case XK_Right: #ifdef XK_KP_Right case XK_KP_Right: #endif + case XK_6: + if (!ctrlmode){ + off_x=-src_x+scr_width-ww; + } + break; + case XK_Right: case XK_l: if (ctrlmode) { if (moment != RIGHT) @@ -1469,6 +1491,51 @@ } else off_x+=kspeed; break; +#ifdef XK_KP_Home + case XK_KP_Home: +#endif + case XK_7: + if (!ctrlmode){ + off_x=-src_x; + off_y=-src_y; + } + break; +#ifdef XK_KP_Prior + case XK_KP_Prior: +#endif + case XK_9: + if (!ctrlmode){ + off_y=-src_y; + off_x=-src_x+scr_width-ww; + } + break; +#ifdef XK_KP_Next + case XK_KP_Next: +#endif + case XK_3: + if (!ctrlmode){ + off_y=-src_y+scr_height-wh; + off_x=-src_x+scr_width-ww; + } + break; +#ifdef XK_KP_End + case XK_KP_End: +#endif + case XK_1: + if (!ctrlmode){ + off_y=-src_y+scr_height-wh; + off_x=-src_x; + } + break; +#ifdef XK_KP_Begin + case XK_KP_Begin: +#endif + case XK_5: + if (!ctrlmode){ + off_y=-src_y+(scr_height-wh)/2; + off_x=-src_x+(scr_width-ww)/2; + } + break; } ww=w;wh=h; @@ -2426,3 +2493,59 @@ } } +int +wKeyboardMoveWindowAdditional(WWindow *wwin, int command) +{ + WScreen *scr = wwin->screen_ptr; + int w = wwin->frame->core->width; + int h = wwin->frame->core->height; + int scr_width = wwin->screen_ptr->scr_width; + int scr_height = wwin->screen_ptr->scr_height; + int src_x = wwin->frame_x; + int src_y = wwin->frame_y; + int rc = scr_width - w; + int bc = scr_height - h; + int new_x = src_x; + int new_y = src_y; + + switch (command) { + case WKBD_MOVELEFTBOTTOM: + new_x = 0; + new_y = bc; + break; + case WKBD_MOVEBOTTOM: + new_y = bc; + break; + case WKBD_MOVERIGHTBOTTOM: + new_x = rc; + new_y = bc; + break; + case WKBD_MOVELEFT: + new_x = 0; + break; + case WKBD_MOVECENTER: + new_x = rc/2; + new_y = bc/2; + break; + case WKBD_MOVERIGHT: + new_x = rc; + break; + case WKBD_MOVELEFTTOP: + new_x = 0; + new_y = 0; + break; + case WKBD_MOVETOP: + new_y = 0; + break; + case WKBD_MOVERIGHTTOP: + new_x = rc; + new_y = 0; + } + + if (!scr->selected_windows) { + wWindowMove(wwin, new_x, new_y); + wWindowSynthConfigureNotify(wwin); + } + return 1; +} + WindowMaker-0.91.0-sga-swpanel-customization.patch: --- NEW FILE WindowMaker-0.91.0-sga-swpanel-customization.patch --- diff -Naur WindowMaker-0.91.0/src/cycling.c WindowMaker-0.91.0.me/src/cycling.c --- WindowMaker-0.91.0/src/cycling.c 2005-06-03 12:10:33 +0300 +++ WindowMaker-0.91.0.me/src/cycling.c 2005-06-03 12:06:40 +0300 @@ -107,6 +107,10 @@ scr->flags.doing_alt_tab = 1; swpanel = wInitSwitchPanel(scr, wwin, scr->current_workspace); + if (swpanel == NULL) { + newFocused = NULL; + goto exiting; + } oldFocused = wwin; if (swpanel) { @@ -237,6 +241,9 @@ break; } } + +exiting: + if (keymap) XFreeModifiermap(keymap); diff -Naur WindowMaker-0.91.0/src/defaults.c WindowMaker-0.91.0.me/src/defaults.c --- WindowMaker-0.91.0/src/defaults.c 2005-06-03 12:10:33 +0300 +++ WindowMaker-0.91.0.me/src/defaults.c 2005-06-03 12:09:09 +0300 @@ -419,6 +419,12 @@ {"CirculateRaise", "NO", NULL, &wPreferences.circ_raise, getBool, NULL }, + {"ShowMiniaturized","YES", NULL, + &wPreferences.show_miniaturized, getBool, NULL + }, + {"ShowHidden", "YES", NULL, + &wPreferences.show_hidden, getBool, NULL + }, {"Superfluous", "NO", NULL, &wPreferences.superfluous, getBool, NULL }, diff -Naur WindowMaker-0.91.0/src/switchpanel.c WindowMaker-0.91.0.me/src/switchpanel.c --- WindowMaker-0.91.0/src/switchpanel.c 2005-06-03 12:10:33 +0300 +++ WindowMaker-0.91.0.me/src/switchpanel.c 2005-06-03 12:12:39 +0300 @@ -409,7 +409,9 @@ for (wwin= curwin; wwin; wwin= wwin->prev) { if (((!fl && canReceiveFocus(wwin) > 0) || (fl && canReceiveFocus(wwin) < 0)) && (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window) && - (wwin->flags.mapped || include_unmapped)) { + (wwin->flags.mapped || include_unmapped) && + (wPreferences.show_miniaturized || !wwin->flags.miniaturized ) && + (wPreferences.show_hidden || !wwin->flags.hidden)) { WMAddToArray(windows, wwin); } } @@ -421,7 +423,9 @@ for (wwin= curwin; wwin && wwin != curwin; wwin= wwin->prev) { if (((!fl && canReceiveFocus(wwin) > 0) || (fl && canReceiveFocus(wwin) < 0)) && (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window) && - (wwin->flags.mapped || include_unmapped)) { + (wwin->flags.mapped || include_unmapped) && + (wPreferences.show_miniaturized || !wwin->flags.miniaturized ) && + (wPreferences.show_hidden || !wwin->flags.hidden)) { WMAddToArray(windows, wwin); } } diff -Naur WindowMaker-0.91.0/src/WindowMaker.h WindowMaker-0.91.0.me/src/WindowMaker.h --- WindowMaker-0.91.0/src/WindowMaker.h 2005-06-03 12:10:33 +0300 +++ WindowMaker-0.91.0.me/src/WindowMaker.h 2005-06-03 11:16:49 +0300 @@ -365,6 +365,8 @@ char windows_cycling; /* windoze cycling */ char circ_raise; /* raise window after Alt-tabbing */ + char show_miniaturized; /* show miniaturized windows in Alt-tabbing panel */ + char show_hidden; /* show hidden windows in Alt-tabbing panel */ char ignore_focus_click; WindowMaker-0.91.0-wmcontrib-singleclick.patch: --- NEW FILE WindowMaker-0.91.0-wmcontrib-singleclick.patch --- --- WindowMaker-0.91.0/src/appicon.c.sc 2004-10-14 21:31:49 +0400 +++ WindowMaker-0.91.0/src/appicon.c 2005-05-17 23:37:26 +0400 @@ -590,6 +590,7 @@ Bool movingSingle = False; int oldX = x; int oldY = y; + Bool hasMoved = False; if (aicon->editing || WCHECK_STATE(WSTATE_MODAL)) return; @@ -665,6 +666,7 @@ break; case MotionNotify: + hasMoved = True; if (!grabbed) { if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -802,6 +804,9 @@ if (wPreferences.auto_arrange_icons) wArrangeIcons(scr, True); + if (wPreferences.single_click && !hasMoved) + iconDblClick(desc, event); + done = 1; break; } --- WindowMaker-0.91.0/src/WindowMaker.h.sc 2004-10-25 05:48:39 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-17 23:37:26 +0400 @@ -475,6 +475,9 @@ RImage *swtileImage; RImage *swbackImage[9]; + /* single click to lauch applications */ + char single_click; + struct { unsigned int nodock:1; /* don't display the dock */ unsigned int noclip:1; /* don't display the clip */ --- WindowMaker-0.91.0/src/defaults.c.sc 2005-05-17 23:37:09 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-17 23:37:26 +0400 @@ -553,6 +553,9 @@ {"DisableBlinking", "NO", NULL, &wPreferences.dont_blink, getBool, NULL }, + {"SingleClickLaunch", "NO", NULL, + &wPreferences.single_click, getBool, NULL + }, /* style options */ {"MenuStyle", "normal", seMenuStyles, &wPreferences.menu_style, getEnum, setMenuStyle --- WindowMaker-0.91.0/src/dock.c.sc 2004-10-23 07:10:40 +0400 +++ WindowMaker-0.91.0/src/dock.c 2005-05-17 23:37:26 +0400 @@ -3758,7 +3758,7 @@ -static void +static Bool handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event) { WScreen *scr = dock->screen_ptr; @@ -3776,6 +3776,7 @@ Bool docked; int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */ int omnipresent = aicon->omnipresent; /* this must be cached!!! */ + Bool hasMoved = False; if (wPreferences.flags.noupdates) @@ -3828,6 +3829,7 @@ break; case MotionNotify: + hasMoved = True; if (!grabbed) { if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -3977,9 +3979,11 @@ #ifdef DEBUG puts("End icon move"); #endif - return; + return hasMoved; } } + + return False; /* never reached */ } @@ -4116,8 +4120,11 @@ handleClipChangeWorkspace(scr, event); else handleDockMove(dock, aicon, event); - } else - handleIconMove(dock, aicon, event); + } else { + Bool hasMoved = handleIconMove(dock, aicon, event); + if (wPreferences.single_click && !hasMoved) + iconDblClick(desc, event); + } } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP && aicon==scr->clip_icon) { --- WindowMaker-0.91.0/src/icon.c.sc 2005-05-17 23:37:09 +0400 +++ WindowMaker-0.91.0/src/icon.c 2005-05-17 23:37:26 +0400 @@ -891,6 +891,7 @@ int dx=event->xbutton.x, dy=event->xbutton.y; int grabbed=0; int clickButton=event->xbutton.button; + Bool hasMoved = False; if (WCHECK_STATE(WSTATE_MODAL)) return; @@ -942,6 +943,7 @@ break; case MotionNotify: + hasMoved = True; if (!grabbed) { if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -979,6 +981,8 @@ if (wPreferences.auto_arrange_icons) wArrangeIcons(wwin->screen_ptr, True); + if (wPreferences.single_click && !hasMoved) + miniwindowDblClick(desc, event); return; } --- WindowMaker-0.91.0/WPrefs.app/Expert.c.sc 2004-10-23 07:04:38 +0400 +++ WindowMaker-0.91.0/WPrefs.app/Expert.c 2005-05-17 23:37:26 +0400 @@ -54,6 +54,7 @@ WMSetButtonSelected(panel->swi[4], GetBoolForKey("DontConfirmKill")); WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking")); WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText")); + WMSetButtonSelected(panel->swi[7], GetBoolForKey("SingleClickLaunch")); } @@ -66,7 +67,7 @@ panel->box = WMCreateBox(panel->parent); WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2); - for (i=0; i<7; i++) { + for (i=0; i<8; i++) { panel->swi[i] = WMCreateSwitchButton(panel->box); WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25); WMMoveWidget(panel->swi[i], 20, 20+i*25); @@ -79,6 +80,7 @@ WMSetButtonText(panel->swi[4], _("Disable confirmation panel for the Kill command.")); WMSetButtonText(panel->swi[5], _("Disable selection animation for selected icons.")); WMSetButtonText(panel->swi[6], _("Smooth font edges (needs restart).")); + WMSetButtonText(panel->swi[7], _("Launch applications and restore windows with a single click.")); WMSetButtonEnabled(panel->swi[6], True); @@ -103,6 +105,7 @@ SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DontConfirmKill"); SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking"); SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText"); + SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "SingleClickLaunch"); } WindowMaker-0.92.0-alt-newpo.patch: --- NEW FILE WindowMaker-0.92.0-alt-newpo.patch --- --- WindowMaker-0.92.0/po/Makefile.am.vns 2004-10-27 01:03:42 +0400 +++ WindowMaker-0.92.0/po/Makefile.am 2005-09-06 08:55:14 +0400 @@ -7,7 +7,7 @@ # Please keep this sorted in alphabetic order! EXTRA_DIST = be.po bg.po bs.po ca.po cs.po da.po de.po el.po es.po et.po \ fi.po fr.po gl.po hr.po hu.po it.po ja.po ko.po ms.po nl.po no.po \ - pl.po pt.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po + pl.po pt.po ro.po ru.po sk.po sv.po tr.po uk.po zh_CN.po zh_TW.po POTFILES = \ $(top_builddir)/src/appicon.c \ --- WindowMaker-0.92.0/configure.ac.vns 2005-09-06 08:55:13 +0400 +++ WindowMaker-0.92.0/configure.ac 2005-09-06 08:57:02 +0400 @@ -289,8 +289,8 @@ dnl List of supported locales dnl ------------------------- -supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW" -supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW" +supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr uk zh_CN zh_TW" +supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk uk zh_CN zh_TW" supported_wings_locales="bg ca cs de fr sk" for lang in $LINGUAS; do WindowMaker-0.92.0-cvs20060123.patch: --- NEW FILE WindowMaker-0.92.0-cvs20060123.patch --- diff -uhrN WindowMaker-0.92.0/aclocal.m4 WindowMaker-CVS-20060123/aclocal.m4 --- WindowMaker-0.92.0/aclocal.m4 2005-06-19 05:22:57.000000000 +0200 +++ WindowMaker-CVS-20060123/aclocal.m4 2006-01-22 21:33:50.000000000 +0100 @@ -1217,8 +1217,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 47 AC_PROG_LIBTOOL -# Debian $Rev: 214 $ +# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -1328,7 +1327,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -1348,7 +1347,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -1368,6 +1367,7 @@ 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" @@ -1387,15 +1387,17 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +_LT_CC_BASENAME([$compiler]) + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -1436,11 +1438,56 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE + + # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -1513,15 +1560,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -1690,7 +1737,7 @@ # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*linux*) @@ -1741,6 +1788,22 @@ CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -1772,7 +1835,7 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -1782,8 +1845,10 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi @@ -1809,11 +1874,16 @@ LDFLAGS="$LDFLAGS $3" printf "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The compiler can only warn and ignore the option if not recognized + # The linker can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD [...25986 lines suppressed...] diff -uhrN WindowMaker-0.92.0/wrlib/tests/Makefile.in WindowMaker-CVS-20060123/wrlib/tests/Makefile.in --- WindowMaker-0.92.0/wrlib/tests/Makefile.in 2005-06-19 05:23:01.000000000 +0200 +++ WindowMaker-CVS-20060123/wrlib/tests/Makefile.in 2006-01-22 21:33:54.000000000 +0100 @@ -118,7 +118,7 @@ EXTRA_DIST = test.png tile.xpm ballot_box.xpm -INCLUDES = -I.. $(DFLAGS) @HEADER_SEARCH_PATH@ +INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@ LIBLIST = $(top_builddir)/wrlib/libwraster.la diff -uhrN WindowMaker-0.92.0/wrlib/x86_specific.c WindowMaker-CVS-20060123/wrlib/x86_specific.c --- WindowMaker-0.92.0/wrlib/x86_specific.c 2004-10-31 02:44:01.000000000 +0100 +++ WindowMaker-CVS-20060123/wrlib/x86_specific.c 2005-08-23 00:05:43.000000000 +0200 @@ -85,9 +85,9 @@ unsigned short *ximage, short *err, short *nerr, - short *rtable, - short *gtable, - short *btable, + unsigned short *rtable, + unsigned short *gtable, + unsigned short *btable, int dr, int dg, int db, @@ -98,15 +98,27 @@ int height, int line_offset) { - long long rrggbbaa; - long long pixel; + union { + long long rrggbbaa; + struct { + short int rr, gg, bb, aa; + } words; + } rrggbbaa; + + union { + long long pixel; + struct { + short int rr, gg, bb, aa; + } words; + } pixel; + short *tmp_err; short *tmp_nerr; int x; asm volatile ( - "pushal \n\t" + "pushl %%ebx \n\t" // pack dr, dg and db into mm6 "movl %7, %%eax \n\t" @@ -219,7 +231,7 @@ "movq %%mm0, %%mm1 \n\t" "pmullw %%mm5, %%mm1 \n\t" // mm1 = mm1*7 "psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16 - "paddw 8(%%ebx), %%mm1 \n\t" + "paddw 8(%%ebx), %%mm1 \n\t" "movq %%mm1, 8(%%ebx) \n\t" // err[x+1,y] = rer*7/16 @@ -228,7 +240,7 @@ "movq %%mm0, %%mm1 \n\t" "pmullw %%mm4, %%mm1 \n\t" // mm1 = mm1*5 "psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16 - "paddw -8(%%ebx), %%mm1 \n\t" + "paddw -8(%%ebx), %%mm1 \n\t" "movq %%mm1, -8(%%ebx) \n\t" // err[x-1,y+1] += rer*3/16 "movq %%mm0, %%mm1 \n\t" @@ -274,7 +286,7 @@ // because, punpcklbw is used (which reads 8 bytes) and the last // pixel is only 4 bytes. This is no problem because the image data // was allocated with extra 4 bytes when created. - "addl $4, %%esi \n\t" // image->data += 4 + "addl $4, %%esi \n\t" // image->data += 4 "decl %26 \n\t" // x-- @@ -290,7 +302,7 @@ ".Enda: \n\t" // THE END "emms \n\t" - "popal \n\t" + "popl %%ebx \n\t" : : "m" (image), // %0 @@ -309,17 +321,18 @@ "m" (width), // %13 "m" (height), // %14 "m" (line_offset), // %15 - "m" (rrggbbaa), // %16 (access to rr) - "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) - "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) - "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) - "m" (pixel), // %20 (access to pixel.r) - "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) - "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) - "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) + "m" (rrggbbaa.words.rr), // %16 (access to rr) + "m" (rrggbbaa.words.gg), // %17 (access to gg) + "m" (rrggbbaa.words.bb), // %18 (access to bb) + "m" (rrggbbaa.words.aa), // %19 (access to aa) + "m" (pixel.words.rr), // %20 (access to pixel.r) + "m" (pixel.words.gg), // %21 (access to pixel.g) + "m" (pixel.words.bb), // %22 (access to pixel.b) + "m" (pixel.words.aa), // %23 (access to pixel.a) "m" (tmp_err), // %24 "m" (tmp_nerr), // %25 "m" (x) // %26 + : "eax", "ecx", "edx", "esi", "edi" ); } @@ -342,8 +355,19 @@ int height, int line_offset) { - long long rrggbbaa; - long long pixel; + union { + long long rrggbbaa; + struct { + short int rr, gg, bb, aa; + } words; + } rrggbbaa; + + union { + long long pixel; + struct { + short int rr, gg, bb, aa; + } words; + } pixel; short *tmp_err; short *tmp_nerr; @@ -354,7 +378,7 @@ asm volatile ( - "pushal \n\t" + "pushl %%ebx \n\t" "movl %13, %%eax \n\t" // eax = width "movl %%eax, %%ebx \n\t" @@ -424,7 +448,7 @@ ".Endc: \n\t" // THE END "emms \n\t" - "popal \n\t" + "popl %%ebx \n\t" : : "m" (image), // %0 @@ -443,19 +467,20 @@ "m" (width), // %13 "m" (height), // %14 "m" (line_offset), // %15 - "m" (rrggbbaa), // %16 (access to rr) - "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) - "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) - "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) - "m" (pixel), // %20 (access to pixel.r) - "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) - "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) - "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) + "m" (rrggbbaa.words.rr), // %16 (access to rr) + "m" (rrggbbaa.words.gg), // %17 (access to gg) + "m" (rrggbbaa.words.bb), // %18 (access to bb) + "m" (rrggbbaa.words.aa), // %19 (access to aa) + "m" (pixel.words.rr), // %20 (access to pixel.r) + "m" (pixel.words.gg), // %21 (access to pixel.g) + "m" (pixel.words.bb), // %22 (access to pixel.b) + "m" (pixel.words.aa), // %23 (access to pixel.a) "m" (tmp_err), // %24 "m" (tmp_nerr), // %25 "m" (x), // %26 "m" (w1), // %27 "m" (w2) // %28 + : "eax", "ecx", "edx", "esi", "edi" ); } @@ -653,7 +678,7 @@ "movw $0xff, %%dx \n\t" // pixel.blu > 255 "jmp .OKBb \n" ".NEGBb: \n\t" - "xorw %%dx, %%dx \n" + "xorw %%dx, %%dx \n" ".OKBb: \n\t" //partial reg "leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.blu] --- NEW FILE WindowMaker-README.newbuttons --- INSTALLATIONS Heres what you do, real simple like. On your favorite console/term, Repeat after me: cp *.xpm to YourWM-0.80.0Source/WPrefs.app/xpm cp *.tiff to YourWM-0.80.0Source/WPrefs.app/tiff cd YouWM-0.80.0Source patch -p1 < Path/To/Patch/newbuttons.patch then ./configure make make install And Restart WindowMaker You should now have three buttons in WPrefs.App->Other Confiugrations->Titlebar Style CREDITS May 2, 2002 Originally the patch was written by TDF (The Dixie Flatline) on Efnet and given to ]d for the fun patch It can be found at ftp://ftp.windowmaker.org/pub/source/patches/unsupported/id/ Carlos Torres aka vlaad (vlaadbrain at operamail.com) modified it for WindowMaker 0.80.0 and Todd Goyen aka wettoad (wettoad at knighthoodofbuh.org) fixed it so that it didn't screw the other two titlebar styles Now you can have all three w00t! WindowMaker-gcc41.patch: --- NEW FILE WindowMaker-gcc41.patch --- --- src/wmspec.c.orig 2006-02-28 00:53:02.000000000 +0100 +++ src/wmspec.c 2006-03-02 14:59:07.000000000 +0100 @@ -827,19 +827,27 @@ updateWorkspaceNames(WScreen *scr) { char buf[1024], *pos; - unsigned int i, len, curr_size; - - pos = buf; + unsigned int i, len, curr_size; len = 0; + + pos = memset(buf,'\0',sizeof(buf)); + for(i = 0; i < scr->workspace_count; i++) { - curr_size = strlen(scr->workspaces[i]->name); - strcpy(pos, scr->workspaces[i]->name); - pos += (curr_size+1); + + curr_size = strlen(scr->workspaces[i]->name); + + if(len + curr_size + 1 > sizeof(buf)) { + break; + } + + strncpy(pos, scr->workspaces[i]->name,sizeof(buf) - len); + + pos += (curr_size+1); len += (curr_size+1); } XChangeProperty(dpy, scr->root_win, net_desktop_names, utf8_string, 8, - PropModeReplace, (unsigned char *)buf, len); + PropModeReplace, (unsigned char *)buf, strlen(buf)); } --- NEW FILE WindowMaker-newbuttons.nextstyle.xpm --- /* XPM */ static char * nextstyle_xpm[] = { "37 33 84 1", " c None", ". c #747474", "+ c #757575", "@ c #000000", "# c #222222", "$ c #262626", "% c #282828", "& c #080808", "* c #FFFFFF", "= c #FFFAFF", "- c #FFFFF6", "; c #F6F6F6", "> c #F6F2F6", ", c #EEEEEE", "' c #B4B6B4", ") c #8B8D94", "! c #DEE6E6", "~ c #E6E6EE", "{ c #CDD2CD", "] c #A4A1A4", "^ c #313431", "/ c #94918B", "( c #EEF6F6", "_ c #292829", ": c #C5CACD", "< c #E6E6E6", "[ c #A4A5AC", "} c #414039", "| c #948D8B", "1 c #8B8D8B", "2 c #292C29", "3 c #D5D6D5", "4 c #B4BAB4", "5 c #313029", "6 c #DEDADE", "7 c #A4A5A4", "8 c #8B898B", "9 c #F6FAFF", "0 c #F6FFFF", "a c #DEDEDE", "b c #181818", "c c #E6EAE6", "d c #C5C6C5", "e c #8B8983", "f c #EEF2F6", "g c #EEEEF6", "h c #101010", "i c #201818", "j c #838183", "k c #838983", "l c #949594", "m c #202420", "n c #CDCECD", "o c #BDBABD", "p c #202018", "q c #736D73", "r c #6A7573", "s c #83817B", "t c #B4B2B4", "u c #202829", "v c #C5C2C5", "w c #201C18", "x c #5A5552", "y c #7B757B", "z c #393C41", "A c #CDD2D5", "B c #D5D2D5", "C c #9CA1A4", "D c #BDBAB4", "E c #8B8583", "F c #6A6D6A", "G c #949994", "H c #A4AAAC", "I c #94999C", "J c #94958B", "K c #94898B", "L c #83818B", "M c #73756A", "N c #837D83", "O c #060606", "P c #070707", "Q c #030303", "R c #ABABAB", "S c #535353", "..................+++++++...........@", "##################$$$$$$$%$%$$$$$$$$@", "##################$$$$$$$$%%%%%%%%%%@", "###################################%@", "###################################%&", "####################@@@@@@@@@@@@*%%%&", "####################@=****-;>,'@*%%%&", "####################@*)!=;~{]^/@*%%%&", "####################@*(_:><[}|1@*%%%&", "####################@**:2345678@*%%%&", "####################@*90ab_cd/e@*%%%&", "####################@9fg3hid7jk@*%%%&", "####################@;almnopqrs@*%%%&", "####################@>tuva67wxy@*%%%&", "####################@,zABClDEbF@*%%%&", "####################@'GHIJKeLMN@*%%%&", "####################@@@@@@@@@@@@*%%%&", "####################*************%%%&", "##################$$$$$$$$$%%%%%%%%%&", "##################$$$$$$$%$%%%%%%%%%&", "OOOOOOOOOOOOOOOOOOPPPPPPPPPPPPP&&&&&Q", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", "SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS*RR@", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@R*RR@", "********************************R*RR@", "********************************R*RR@", "********************************R*RR@", "********************************R*RR@", "********************************R*RR@"}; --- NEW FILE WindowMaker-uk.po --- msgid "" msgstr "" "Project-Id-Version: WindowMaker 0.80.1\n" "POT-Creation-Date: 2002-02-15 15:50+0200\n" "PO-Revision-Date: 2005-09-06 08:56+0300\n" "Last-Translator: Victor Forsyuk \n" "Language-Team: KSI Linux Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-u\n" "Content-Transfer-Encoding: 8bit\n" #: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325 #: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1853 #: ../src/winspector.c:389 ../src/winspector.c:406 msgid "Error" msgstr "???????" #: ../src/appicon.c:427 msgid "Could not open specified icon file" msgstr "????????? ???????? ???????? ???? ??????" #: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282 #: ../src/dialog.c:729 ../src/dialog.c:1818 ../src/dock.c:526 #: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326 #: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273 #: ../src/rootmenu.c:1857 ../src/winspector.c:390 ../src/winspector.c:407 msgid "OK" msgstr "OK" #: ../src/appicon.c:456 ../src/dock.c:264 msgid "" " will be forcibly closed.\n" "Any unsaved changes will be lost.\n" "Please confirm." msgstr "" " ????????? ???????????.\n" "??? ??????????? ????? ?????? ????????.\n" "???? ?????, ???????????." # #: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:125 msgid "Kill Application" msgstr "????????? ??????????" #: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:127 msgid "Yes" msgstr "???" #: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:127 msgid "No" msgstr "??" #: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491 msgid "Unhide Here" msgstr "???????? ???" #: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179 #: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:465 msgid "Hide" msgstr "?????????" #: ../src/appicon.c:497 msgid "Set Icon..." msgstr "?????????? ??????..." #: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248 #: ../src/rootmenu.c:264 ../src/winmenu.c:520 msgid "Kill" msgstr "?????" #: ../src/appicon.c:519 ../src/dock.c:3501 msgid "Unhide" msgstr "????????" #: ../src/application.c:398 #, c-format msgid "recreating missing icon '%s'" msgstr "" #: ../src/defaults.c:922 ../src/defaults.c:1011 #, c-format msgid "Domain %s (%s) of global defaults database is corrupted!" msgstr "????? %s (%s) ? ?????????? ???? ???????? ???????????!" #: ../src/defaults.c:927 #, c-format msgid "could not load domain %s from global defaults database" msgstr "?? ??????? ??????????? ????? %s ? ?????????? ???? ????????" #: ../src/defaults.c:949 ../src/startup.c:884 ../src/startup.c:902 #: ../src/startup.c:908 #, c-format msgid "could not read domain \"%s\" from defaults database" msgstr "?? ??????? ????????? ????? \"%s\" ? ???? ????? ????????" #: ../src/defaults.c:995 ../src/defaults.c:1099 ../src/defaults.c:1140 #: ../src/defaults.c:1196 #, c-format msgid "Domain %s (%s) of defaults database is corrupted!" msgstr "????? %s (%s) ? ???? ????? ???????? ???????????!" #: ../src/defaults.c:1000 ../src/defaults.c:1119 ../src/defaults.c:1176 #: ../src/defaults.c:1205 ../src/menureader.c:397 #, c-format msgid "could not load domain %s from user defaults database" msgstr "?? ??????? ??????????? ????? \"%s\" ? ???? ???????? ???????????" #: ../src/defaults.c:1030 #, c-format msgid "could not load domain %s from global defaults database (%s)" msgstr "?? ??????? ??????????? ????? %s ? ?????????? ???? ???????? (%s)" #: ../src/defaults.c:1166 ../src/screen.c:458 #, c-format msgid "could not load logo image for panels: %s" msgstr "?? ??????? ??????????? ???????? ??? ???????: %s" #: ../src/defaults.c:1447 #, c-format msgid "wrong option value for key \"%s\". Should be one of %s" msgstr "??????????? ???????? ??? ????? \"%s\". ??? ???? ???? ? %s." #: ../src/defaults.c:1492 #, c-format msgid "can't convert \"%s\" to boolean for key \"%s\"" msgstr "?? ??????? ??????????? \"%s\" ? ????????? ???????? ??? ????? \"%s\"" #: ../src/defaults.c:1497 ../src/defaults.c:1529 ../src/defaults.c:1561 #: ../src/defaults.c:1574 ../src/defaults.c:1589 ../src/defaults.c:1603 #: ../src/defaults.c:1673 ../src/defaults.c:1685 ../src/defaults.c:2152 #: ../src/defaults.c:2169 ../src/defaults.c:2182 ../src/defaults.c:2214 #: ../src/defaults.c:2230 ../src/defaults.c:2261 ../src/defaults.c:2348 #: ../src/defaults.c:2734 ../src/defaults.c:2745 #, c-format msgid "using default \"%s\" instead" msgstr "?????????????? ???????? ?? ?????????? (%s)" #: ../src/defaults.c:1526 #, c-format msgid "can't convert \"%s\" to integer for key \"%s\"" msgstr "????????? ??????????? \"%s\" ? ???? ???????? ??? ????? \"%s\"" #: ../src/defaults.c:1556 ../src/defaults.c:1668 ../src/defaults.c:2147 #: ../src/defaults.c:2164 ../src/defaults.c:2209 ../src/defaults.c:2256 #: ../src/defaults.c:2729 ../src/wdefaults.c:571 ../src/wdefaults.c:607 #, c-format msgid "Wrong option format for key \"%s\". Should be %s." msgstr "???????????? ?????? ????????? ??? ????? \"%s\". ??? ???? %s." #: ../src/defaults.c:1569 #, c-format msgid "Incorrect number of elements in array for key \"%s\"." msgstr "?????????? ????????? ????????? ? ?????? ??? ????? \"%s\"." #: ../src/defaults.c:1584 #, c-format msgid "Wrong value for key \"%s\". Should be Coordinate." msgstr "??????????? ???????? ????????? ??? ????? \"%s\". ??? ???? Coordinate." #: ../src/defaults.c:1599 #, c-format msgid "can't convert array to integers for \"%s\"." msgstr "?? ??????? ??????????? ????? ? ???? ???????? ??? \"%s\"." #: ../src/defaults.c:1797 ../src/defaults.c:1829 ../src/defaults.c:1845 #: ../src/defaults.c:1874 ../src/defaults.c:1897 ../src/defaults.c:1950 #: ../src/defaults.c:1990 ../src/defaults.c:2028 ../src/defaults.c:2044 #, c-format msgid "\"%s\" is not a valid color name" msgstr "\"%s\" ?? ? ??????? ?????? ???????" #: ../src/defaults.c:1810 ../src/defaults.c:1862 msgid "bad number of arguments in gradient specification" msgstr "??????????? ????????? ?????????? ? ?????????? ?????????" #: ../src/defaults.c:1923 msgid "too few arguments in multicolor gradient specification" msgstr "????? ???? ?????????? ? ?????????? ??????????????? ?????????" #: ../src/defaults.c:2017 msgid "bad number of arguments in textured gradient specification" msgstr "??????????? ????????? ?????????? ? ?????????? ????????? ? ?????????" #: ../src/defaults.c:2060 #, c-format msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]" msgstr "" "??????????? ???????? ?????????? ??? t-????????? ? ????????? \"%s\"; ??? ???? " "[0..255]" #: ../src/defaults.c:2120 #, c-format msgid "could not initialize library %s" msgstr "?? ??????? ?????????????? ?????????? %s" #: ../src/defaults.c:2123 #, c-format msgid "could not find function %s::%s" msgstr "?? ??????? ?????? ??????? %s::%s" #: ../src/defaults.c:2130 #, c-format msgid "invalid texture type %s" msgstr "???????????? ??? ???????? (%s)" #: ../src/defaults.c:2177 #, c-format msgid "Error in texture specification for key \"%s\"" msgstr "??????? ? ?????????? ???????? ??? ????? \"%s\"" #: ../src/defaults.c:2226 msgid "Wrong type for workspace background. Should be a texture type." msgstr "" "???????????? ??? ??? ???? ???????? ?????; ??? ???? ???????? ???? " "\"????????\"." #: ../src/defaults.c:2274 #, c-format msgid "Wrong type for background of workspace %i. Should be a texture." msgstr "" "???????????? ??? ??? ???? ???????? ????? %i; ??? ???? ???????? ???? " "\"????????\"." #: ../src/defaults.c:2316 msgid "could not load any usable font!!!" msgstr "?? ??????? ??????????? ?????!!!" #: ../src/defaults.c:2343 #, c-format msgid "could not get color for key \"%s\"" msgstr "?? ??????? ????????? ????? ??? ????? \"%s\"" #: ../src/defaults.c:2401 ../src/rootmenu.c:526 #, c-format msgid "%s:invalid key modifier \"%s\"" msgstr "%s:???????????? ??????????? ??????? \"%s\"" # #: ../src/defaults.c:2413 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\"" msgstr "%s:??????????? ?????????? ?????????? ?????? \"%s\"" # #: ../src/defaults.c:2420 #, c-format msgid "%s:invalid key in shortcut \"%s\"" msgstr "%s:??????????? ??????? ? ?????????? \"%s\"" #: ../src/defaults.c:2445 #, c-format msgid "%s: modifier key %s is not valid" msgstr "%s: ??????????? %s ????????????" #: ../src/defaults.c:2477 #, c-format msgid "could not load image in option %s: %s" msgstr "?? ??????? ??????????? ?????????? ??? ????????? %s: %s" # #: ../src/defaults.c:2594 #, c-format msgid "failed to open bitmap file \"%s\"" msgstr "?? ??????? ???????? ????????? ???? \"%s\"" #: ../src/defaults.c:2597 #, c-format msgid "\"%s\" is not a valid bitmap file" msgstr "\"%s\" ?? ? ????????? ????????? ??????" #: ../src/defaults.c:2600 #, c-format msgid "out of memory reading bitmap file \"%s\"" msgstr "????????? ???'??? ??? ??? ??????? ?????????? ????? \"%s\"" #: ../src/defaults.c:2639 ../src/defaults.c:2672 msgid "bad number of arguments in cursor specification" msgstr "??????????? ????????? ?????????? ? ?????????? ???????" #: ../src/defaults.c:2655 #, c-format msgid "unknown builtin cursor name \"%s\"" msgstr "" #: ../src/defaults.c:2682 ../src/defaults.c:2694 #, c-format msgid "could not find cursor bitmap file \"%s\"" msgstr "?? ??????? ?????? ????????? ???? ??????? \"%s\"" #: ../src/defaults.c:2741 #, c-format msgid "Error in cursor specification for key \"%s\"" msgstr "??????? ? ?????????? ??????? ??? ????? \"%s\"" #: ../src/defaults.c:2826 msgid "could not render texture for icon background" msgstr "?? ??????? ??????????? ???????? ??? ???? ??????" # #: ../src/dialog.c:135 msgid "Save workspace state" msgstr "???????? ???? ???????? ?????" #: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558 #: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248 #: ../src/rootmenu.c:264 msgid "Cancel" msgstr "???????" # #: ../src/dialog.c:277 msgid "Could not open directory " msgstr "????????? ???????? ??????? " #: ../src/dialog.c:332 msgid "Could not load image file " msgstr "????????? ??????????? ???? ?????????? " #: ../src/dialog.c:663 msgid "Directories" msgstr "????????" #: ../src/dialog.c:672 msgid "Icons" msgstr "??????" #: ../src/dialog.c:705 msgid "Preview" msgstr "" # #: ../src/dialog.c:718 msgid "File Name:" msgstr "??'? ?????:" #: ../src/dialog.c:742 msgid "Choose File" msgstr "???????? ????" #: ../src/dialog.c:760 ../src/dialog.c:762 msgid "Icon Chooser" msgstr "????? ??????" #: ../src/dialog.c:1241 ../src/dialog.c:1351 #, c-format msgid "Version %s" msgstr "?????? %s" #: ../src/dialog.c:1348 msgid "Window Manager for X" msgstr "???????? ????? ??? X" #: ../src/dialog.c:1373 #, c-format msgid "Using visual 0x%x: %s %ibpp " msgstr "" #: ../src/dialog.c:1381 msgid "(32 thousand colors)\n" msgstr "(32 ?????? ????????)\n" #: ../src/dialog.c:1384 msgid "(64 thousand colors)\n" msgstr "(64 ?????? ????????)\n" #: ../src/dialog.c:1388 msgid "(16 million colors)\n" msgstr "(16 ????????? ????????)\n" #: ../src/dialog.c:1391 #, c-format msgid "(%d colors)\n" msgstr "(%d ????????)\n" #: ../src/dialog.c:1401 #, c-format msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n" msgstr "?????? ???????? ???'???: %i kB. ?????? ??????????? ???'???: %i kB.\n" #: ../src/dialog.c:1408 msgid "Supported image formats: " msgstr "????????????? ??????? ?????????: " #: ../src/dialog.c:1415 msgid "" "\n" "Additional support for: " msgstr "" "\n" "????????? ????????? ???: " #: ../src/dialog.c:1438 msgid " and " msgstr " ?? " #: ../src/dialog.c:1448 msgid "" "\n" "Sound disabled" msgstr "" "\n" "????????? ????? ????????" #: ../src/dialog.c:1450 msgid "" "\n" "Sound enabled" msgstr "" "\n" "????????? ????? ?????????" #: ../src/dialog.c:1476 msgid "Info" msgstr "??????????" #: ../src/dialog.c:1499 msgid "Merry Christmas!" msgstr "????????? ??????!" #: ../src/dialog.c:1569 msgid "" " Window Maker is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License as\n" "published by the Free Software Foundation; either version 2 of the\n" "License, or (at your option) any later version.\n" "\n" " Window Maker is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty\n" "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "See the GNU General Public License for more details.\n" "\n" " You should have received a copy of the GNU General Public\n" "License along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" "02111-1307, USA." msgstr "" " Window Maker ? ??????? ?????????? ?????????????; ?? ??????\n" "??????????????? ??/??? ???????????? ???? ? ????????????? ? ???????\n" "???????? GNU General Public License (GPL) ????????????? ????????????\n" "Free Software Foundation; ?????? 2 ???? ????????, ?? (?? ??? ?????)\n" "????-???? ????????? ??????.\n" "\n" " Window Maker ???????????????? ? ?????? ?? ??, ?? ??? ????\n" "????????, ??? ??? ????-???? ????????; ?????? ??? ??????? ????????\n" "??????????? ???????? ?? ??????????? ??? ??????? ????????????.\n" "???????? GNU General Public License ?? ?????????? ???????????.\n" "\n" " ?? ???? ???????? ????? GNU General Public License ????? ? ????\n" "?????????; ???? ?? - ???????? ?? Free Software Foundation, Inc.,\n" "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." #: ../src/dialog.c:1590 msgid "Legal" msgstr "??????? ??????????" #: ../src/dialog.c:1741 ../src/startup.c:394 msgid "cannot open connection for crashing dialog panel. Aborting." msgstr "" "?? ??????? ???????? ?'??????? ??? ?????? ?????????? ???????. ?????????? " "??????." #: ../src/dialog.c:1767 msgid "Fatal error" msgstr "???????? ???????" #: ../src/dialog.c:1778 #, c-format msgid "" "Window Maker received signal %i\n" "(%s)." msgstr "" "Window Maker: ???????? ?????? %i\n" "(%s)." #: ../src/dialog.c:1781 #, c-format msgid "Window Maker received signal %i." msgstr "Window Maker: ???????? ?????? %i." #: ../src/dialog.c:1790 msgid "" " This fatal error occured probably due to a bug. Please fill the included " "BUGFORM and report it to bugs at windowmaker.org." msgstr "" " ?? ???????? ???????, ???????, ? ??????????? ??????? ? ????????. ???? ?????, " "????????? ????? BUGFORM ? ????????? ?? ?? ??????? bugs at windowmaker.org." #: ../src/dialog.c:1799 msgid "What do you want to do now?" msgstr "?? ???????" #: ../src/dialog.c:1805 msgid "Select action" msgstr "???????? ???" #: ../src/dialog.c:1806 msgid "Abort and leave a core file" msgstr "????????? ??????, ????????? ???? core" #: ../src/dialog.c:1807 msgid "Restart Window Maker" msgstr "????????????? Window Maker" #: ../src/dialog.c:1808 msgid "Start alternate window manager" msgstr "????????? ?????????????? ???????? ?????" #: ../src/dialog.c:1986 msgid "" "Window Maker is part of the GNUstep project.\n" "The GNUstep project aims to create a free\n" "implementation of the OpenStep(tm) specification\n" "which is a object-oriented framework for\n" "creating advanced graphical, multi-platform\n" "applications. Additionally, a development and\n" "user desktop enviroment will be created on top\n" "of the framework. For more information about\n" "GNUstep, please visit: www.gnustep.org" msgstr "" "Window Maker - ?? ??????? ??????? GNUstep.\n" "?????? GNUstep ??? ?? ???? ???????? ??????\n" "?????????? ???????????? OpenStep(tm), ??? ?\n" "??'?????-???????????? ??????? ??? ?????????\n" "????????????? ????????? ?????????? ??? ?????????\n" "?????????? ???????. ?? ??? ?????? ???? ????????\n" "?????????? ???????? ?? ?????????? ???????? ?????\n" "???????????. ?? ??????????? ??????????? ????\n" "GNUstep, ???? ?????, ??????????: www.gnustep.org" #: ../src/dialog.c:2006 msgid "About GNUstep" msgstr "??? GNUstep" #: ../src/dock.c:213 #, c-format msgid "Type the name for workspace %i:" msgstr "??????? ??'? ??? %i-?? ???????? ?????:" # #: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409 msgid "Rename Workspace" msgstr "????????????? ????" #: ../src/dock.c:520 ../src/dock.c:528 msgid "Warning" msgstr "????????????" #: ../src/dock.c:521 msgid "" "Some icons cannot be made omnipresent. Please make sure that no other icon " "is docked in the same positions on the other workspaces and the Clip is not " "full in some workspace." msgstr "" "????? ?????? ????????? ??????? ?????????? ?? ???? ??????? ??????. " "??????????, ?? ?? ??? ?? ??????? ?? ????? ??????? ?????? ?? ??????????? ???? " "?????? ? ?? ? ??????? ? ????? ??? ????? ?????? ?? ???? ??????? ??????." #: ../src/dock.c:529 msgid "" "Icon cannot be made omnipresent. Please make sure that no other icon is " "docked in the same position on the other workspaces and the Clip is not full " "in some workspace." msgstr "" "?????? ????????? ??????? ?????????? ?? ???? ??????? ??????. ??????????, ?? " "?? ??? ?? ??????? ?? ????? ??????? ?????? ?? ??????????? ???? ?????? ? ?? ? " "??????? ? ????? ??? ????? ?????? ?? ???? ??????? ??????." #: ../src/dock.c:556 msgid "Workspace Clip" msgstr "??????? ???????? ?????" #: ../src/dock.c:557 msgid "All selected icons will be removed!" msgstr "??? ??????? ?????? ?????? ????????!" #: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445 msgid "Keep Icon" msgstr "?????????? ??????" # #: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278 msgid "Type the command used to launch the application" msgstr "??????? ???????, ?? ???????????????? ??? ??????? ????????" # #: ../src/dock.c:965 #, c-format msgid "could not launch application %s\n" msgstr "?? ??????? ????????? ???????? %s\n" #: ../src/dock.c:1020 msgid "could not create workspace submenu for Clip menu" msgstr "?? ??????? ???????? ??????? ??????? ????? ??? ???? ???????" #: ../src/dock.c:1078 msgid "could not create options submenu for Clip menu" msgstr "?? ??????? ???????? ??????? ?????????? ??? ???? ???????" #: ../src/dock.c:1082 ../src/dock.c:1130 msgid "Keep on Top" msgstr "?????? ?? ?????" #: ../src/dock.c:1088 msgid "Collapsed" msgstr "????????" #: ../src/dock.c:1094 msgid "Autocollapse" msgstr "????????????" #: ../src/dock.c:1100 msgid "Autoraise" msgstr "?????????????" #: ../src/dock.c:1106 msgid "Autoattract Icons" msgstr "????????????? ??????" #: ../src/dock.c:1136 msgid "Clip Options" msgstr "????????? ???????" #: ../src/dock.c:1146 msgid "Selected" msgstr "???????" #: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436 msgid "Select All Icons" msgstr "????? ???? ??????" #: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453 msgid "Move Icon To" msgstr "??????????? ?????? ??..." #: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464 msgid "Remove Icon" msgstr "???????? ??????" #: ../src/dock.c:1172 msgid "Attract Icons" msgstr "????????? ??????" #: ../src/dock.c:1175 msgid "Launch" msgstr "??????" #: ../src/dock.c:1183 msgid "Settings..." msgstr "?????????..." #: ../src/dock.c:1548 ../src/dock.c:1655 #, c-format msgid "bad value in docked icon state info %s" msgstr "????????? ???????? ? ????? ???????????? ?????? -- %s" #: ../src/dock.c:1663 #, c-format msgid "bad value in docked icon position %i,%i" msgstr "????????? ???????? ? ??????? ???????????? ?????? %i,%i" #: ../src/dock.c:1919 msgid "there are too many icons stored in dock. Ignoring what doesn't fit" msgstr "??????????? ????? ?????? ??????. ????? ?????? ?????????????" #. icon->forced_dock = 1; #: ../src/dock.c:2136 ../src/dock.c:2277 msgid "Dock Icon" msgstr "?????? ????" #: ../src/dock.c:3323 #, c-format msgid "Could not execute command \"%s\"" msgstr "????????? ???????? ??????? \"%s\"" #: ../src/dock.c:3415 msgid "Toggle Omnipresent" msgstr "??????????? ?? ???? ??????" #: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:418 #: ../src/winspector.c:1377 msgid "Omnipresent" msgstr "?? ???? ??????" #: ../src/dock.c:3434 msgid "Unselect All Icons" msgstr "?????? ?????? ???? ??????" #: ../src/dock.c:3443 msgid "Keep Icons" msgstr "?????????? ??????" #: ../src/dock.c:3451 msgid "Move Icons To" msgstr "??????????? ?????? ??..." #: ../src/dock.c:3462 msgid "Remove Icons" msgstr "???????? ??????" #: ../src/dock.c:3493 ../src/kwm.c:643 msgid "Bring Here" msgstr "???????? ????" #: ../src/dockedapp.c:149 #, c-format msgid "could not find icon %s, used in a docked application" msgstr "?? ??????? ?????? ?????? %s, ??????????? ? ?????????????? ????????" # #: ../src/dockedapp.c:229 #, c-format msgid "Could not open specified icon file: %s" msgstr "?? ??????? ???????? ???????? ???? ??????: %s" #: ../src/dockedapp.c:231 msgid "Ignore" msgstr "??????????" #: ../src/dockedapp.c:333 msgid "Start when Window Maker is started" msgstr "????????? ??? ??????? WindowMaker'?" #: ../src/dockedapp.c:340 msgid "Lock (prevent accidental removal)" msgstr "??????????? (??????????? ??????????? ?????????)" # #: ../src/dockedapp.c:344 msgid "Application path and arguments" msgstr "???? ?? ???????? ? ?????????" #: ../src/dockedapp.c:357 msgid "Command for middle-click launch" msgstr "??????? ??? ??????? ?? ???????? ?????? ????" #: ../src/dockedapp.c:371 #, c-format msgid "%s will be replaced with current selection" msgstr "%s ???? ???????? ?? ??????? ?????????" #: ../src/dockedapp.c:376 msgid "Command for files dropped with DND" msgstr "??????? ??? \"????????????\" ??????" #: ../src/dockedapp.c:390 #, c-format msgid "%d will be replaced with the file name" msgstr "%d ???? ???????? ?? ??'? ?????" #: ../src/dockedapp.c:394 msgid "DND support was not compiled in" msgstr "????????? ????????????? ????? ?? ???? ???????? ??? ??????????" #: ../src/dockedapp.c:399 msgid "Icon Image" msgstr "?????????? ??????" #: ../src/dockedapp.c:413 ../src/winspector.c:1515 msgid "Browse..." msgstr "???????..." # #: ../src/dockedapp.c:466 msgid "Docked Application Settings" msgstr "????????? ?????????????? ????????" #: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:456 #: ../src/texture.c:594 #, c-format msgid "could not render texture: %s" msgstr "?? ??????? ??????????? ????????: %s" #: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699 #: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724 #: ../src/icon.c:350 ../src/menu.c:485 #, c-format msgid "error rendering image:%s" msgstr "??????? ??? ?????????? ??????????:%s" #: ../src/framewin.c:777 #, c-format msgid "error rendering image: %s" msgstr "??????? ??? ?????????? ??????????: %s" #: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401 msgid "out of memory while updating GNOME hints" msgstr "????????? ???'??? ??? ????????? GNOME hints" #: ../src/icon.c:229 ../src/wdefaults.c:443 #, c-format msgid "error loading image file \"%s\"" msgstr "??????? ???????????? ????? ?????????? \"%s\"" # #: ../src/icon.c:491 ../src/icon.c:500 #, c-format msgid "could not create directory %s" msgstr "?? ??????? ???????? ??????? %s" #: ../src/icon.c:767 #, c-format msgid "could not find default icon \"%s\"" msgstr "?? ??????? ?????? ?????? ?? ?????????? \"%s\"" #: ../src/icon.c:773 #, c-format msgid "could not load default icon \"%s\":%s" msgstr "?? ??????? ??????????? ?????? ?? ?????????? \"%s\":%s" #. #. * Warning: If you make some change that affects the order of the #. * entries, you must update the command #defines in the top of #. * this file. #. #: ../src/kwm.c:633 ../src/winmenu.c:441 ../src/winmenu.c:583 msgid "Maximize" msgstr "?????????????" #: ../src/kwm.c:634 ../src/winmenu.c:578 msgid "Unmaximize" msgstr "???????????????" #: ../src/kwm.c:635 ../src/winmenu.c:449 ../src/winmenu.c:569 msgid "Miniaturize" msgstr "????????????" #: ../src/kwm.c:636 ../src/winmenu.c:564 msgid "Deminiaturize" msgstr "??????????????" #: ../src/kwm.c:638 msgid "Not Omnipresent" msgstr "?? ?? ???? ??????" #: ../src/kwm.c:639 msgid "Move" msgstr "???????????" #: ../src/kwm.c:640 msgid "Resize" msgstr "??????? ??????" #. #. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); #. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); #. #: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:513 msgid "Close" msgstr "???????" #: ../src/kwm.c:642 ../src/winmenu.c:497 msgid "Move To" msgstr "??????????? ??..." #: ../src/kwm.c:1096 msgid "%a(Run Command,Type the command to run:)" msgstr "%a(????????? ???????,??????? ???????:)" #: ../src/main.c:222 msgid "failed to restart Window Maker." msgstr "?? ??????? ????????????? Window Maker." #: ../src/main.c:225 #, c-format msgid "could not exec %s" msgstr "?? ??????? ???????? %s" #: ../src/main.c:271 msgid "Could not execute command: " msgstr "????????? ???????? ???????: " #: ../src/main.c:428 #, c-format msgid "%s aborted.\n" msgstr "%s ?????????.\n" #: ../src/main.c:439 #, c-format msgid "Usage: %s [options]\n" msgstr "??????: %s [?????????]\n" #: ../src/main.c:440 msgid "The Window Maker window manager for the X window system" msgstr "???????? ????? Window Maker ??? ???????? ??????? X Window" #: ../src/main.c:442 msgid " -display host:dpy\tdisplay to use" msgstr " -display ????:???????\t??????????????? ???????? ???????" #: ../src/main.c:444 msgid " --no-cpp \t\tdisable preprocessing of configuration files" msgstr " --no-cpp \t\t?????????? ????????? ??????? ?????? ????????????" #: ../src/main.c:446 msgid " --no-dock\t\tdo not open the application Dock" msgstr " --no-dock\t\t?? ?????????? ??? ???????" #: ../src/main.c:447 msgid " --no-clip\t\tdo not open the workspace Clip" msgstr " --no-clip\t\t?? ?????????? ???????" # #: ../src/main.c:448 msgid " --no-autolaunch\tdo not autolaunch applications" msgstr " --no-autolaunch\t?? ?????????? ?????????? ???????" #: ../src/main.c:449 msgid " --dont-restore\t\tdo not restore saved session" msgstr " --dont-restore\t\t?? ???????????? ????????? ??????" #: ../src/main.c:451 msgid " --locale locale\tlocale to use" msgstr " --locale locale\t??????????????? ?????? locale" #: ../src/main.c:453 msgid "" " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals" msgstr "" " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals" #: ../src/main.c:454 msgid " --visual-id visualid\tvisual id of visual to use" msgstr "" " --visual-id visualid\t??????????????? ???????? ?????????? ???? ????????????" #: ../src/main.c:455 msgid " --static\t\tdo not update or save configurations" msgstr " --static\t\t?? ????????? ????????? ?? ?????????? ????????????" #: ../src/main.c:456 msgid " --no-polling\t\tdo not periodically check for configuration updates" msgstr " --no-polling\t\t?? ?????? ??????????? ????????? ???? ????????????" #: ../src/main.c:458 msgid " --synchronous\t\tturn on synchronous display mode" msgstr " --synchronous\t\t???????? ?????????? ????? ??????" #: ../src/main.c:460 msgid " --version\t\tprint version and exit" msgstr " --version\t\t??????? ????? ?????? ?? ?????" #: ../src/main.c:461 msgid " --help\t\t\tshow this message" msgstr " --help\t\t\t??????? ??? ?????" #: ../src/main.c:474 #, c-format msgid "" "could not find user GNUstep directory (%s).\n" "Make sure you have installed Window Maker correctly and run wmaker.inst" msgstr "" "?? ??????? ?????? ??????? GNUstep ??????????? (%s).\n" "??????????, ?? WindowMaker ??????????? ????????? ? ????????? wmaker.inst" # #: ../src/main.c:479 #, c-format msgid "could not find user GNUstep directory (%s)." msgstr "?? ??????? ?????? ??????? GNUstep ??????????? (%s)." #: ../src/main.c:482 msgid "" "There was an error while creating GNUstep directory, please make sure you " "have installed Window Maker correctly and run wmaker.inst" msgstr "" "??????? ??? ????????? ???????? GNUstep, ??????????, ?? WindowMaker " "??????????? ????????? ? ????????? wmaker.inst" #: ../src/main.c:485 #, c-format msgid "%s directory created with default configuration." msgstr "??????? %s ???????? ? ????????????? ?? ??????????." #: ../src/main.c:505 ../src/main.c:510 #, c-format msgid "%s:could not execute initialization script" msgstr "%s:?? ??????? ???????? ???????? ?????????????" #: ../src/main.c:530 ../src/main.c:535 #, c-format msgid "%s:could not execute exit script" msgstr "%s:?? ??????? ???????? ???????? ?????????? ??????" #: ../src/main.c:663 ../src/main.c:671 ../src/main.c:679 ../src/main.c:699 #, c-format msgid "too few arguments for %s" msgstr "????? ???? ?????????? ??? %s" #: ../src/main.c:683 #, c-format msgid "bad value for visualid: \"%s\"" msgstr "????????? ???????? ??? visualid: \"%s\"" # #: ../src/main.c:707 #, c-format msgid "%s: invalid argument '%s'\n" msgstr "%s: ???????????? ???????? '%s'\n" #: ../src/main.c:708 #, c-format msgid "Try '%s --help' for more information\n" msgstr "????????? '%s --help' ??? ????????? ?????????? ??????????\n" #: ../src/main.c:736 msgid "X server does not support locale" msgstr "X ?????? ?? ????????? ???????????" #: ../src/main.c:740 msgid "cannot set locale modifiers" msgstr "?? ??????? ?????????? ????????? ???????????" #: ../src/main.c:756 #, c-format msgid "could not open display \"%s\"" msgstr "?? ??????? ???????? ??????? \"%s\"" # #: ../src/menu.c:1255 msgid "could not grab keyboard" msgstr "?? ??????? ???????? ??????????" #: ../src/menureader.c:264 ../src/rootmenu.c:733 #, c-format msgid "%s:could not stat menu" msgstr "%s:?? ??????? ???????? ????" #: ../src/menureader.c:341 ../src/menureader.c:380 #, c-format msgid "could not stat() menu file '%s'" msgstr "?? ??????? ???????? ???? ???? '%s'" #: ../src/menureader.c:416 #, c-format msgid "could not find menu file '%s' referenced in WMRootMenu" msgstr "?? ??????? ?????? ???? ???? '%s' ???????? ? WMRootMenu" #: ../src/menureader.c:423 #, c-format msgid "could not find any usable menu files. Please check '%s'" msgstr "?? ??????? ?????? ?????? ????. ???? ?????, ????????? '%s'" #: ../src/menureader.c:438 ../src/rootmenu.c:1667 #, c-format msgid "" "using default menu file \"%s\" as the menu referenced in WMRootMenu could " "not be found " msgstr "" "???????????????? ???? ?? ?????????? \"%s\", ???? ?? ????, ??????? ? ????? " "WMRootMenu, ?? ??????? ?????? " #: ../src/menureader.c:457 #, c-format msgid "" "invalid content in menu file '%s'.\n" "It should either be a property list menu or the path to the file, enclosed " "in \"." msgstr "" "?????????? ?????????? ? ????? ???? '%s'.\n" "?? ??? ???? ??? ???? ? ??????? property list, ??? ???? ?? ?????, ?????? " "? \"." #: ../src/misc.c:71 #, c-format msgid "could not define value for %s for cpp" msgstr "?? ??????? ????????? ???????? ??? %s ??? cpp" #: ../src/misc.c:101 #, c-format msgid "could not get password entry for UID %i" msgstr "?? ??????? ???????? ?????????? ??? ??????????? ??? UID %i" #: ../src/misc.c:126 #, c-format msgid "your machine is misconfigured. HOSTNAME is set to %s" msgstr "???? ??????? ?????? ??????????????. ?????? HOSTNAME ??????????? ? %s" #: ../src/misc.c:132 #, c-format msgid "your machine is misconfigured. HOST is set to %s" msgstr "???? ??????? ?????? ??????????????. ?????? HOST ??????????? ? %s" #: ../src/misc.c:630 msgid "Program Arguments" msgstr "????????? ????????" #: ../src/misc.c:631 msgid "Enter command arguments:" msgstr "??????? ????????? ???????:" #: ../src/misc.c:724 msgid "unable to get dropped data from DND drop" msgstr "?? ??????? ???????? ??? DND drop ??????????? ????" #: ../src/misc.c:732 msgid "error getting dropped data from DND drop" msgstr "??????? ??? ????????? ????? ??? DND drop" #: ../src/misc.c:738 msgid "out of memory while getting data from DND drop" msgstr "????????? ???'??? ??? ????????? ????? ??? DND drop" #: ../src/misc.c:783 ../src/misc.c:923 #, c-format msgid "out of memory during expansion of \"%s\"" msgstr "????????? ???'??? ??? ??? ?????????? \"%s\"" #: ../src/misc.c:837 msgid "out of memory during expansion of \"%w\"" msgstr "????????? ???'??? ??? ??? ?????????? \"%w\"" #: ../src/misc.c:855 msgid "out of memory during expansion of \"%W\"" msgstr "????????? ???'??? ??? ??? ?????????? \"%W\"" #: ../src/misc.c:871 msgid "out of memory during expansion of \"%a\"" msgstr "????????? ???'??? ??? ??? ?????????? \"%a\"" #: ../src/misc.c:902 #, c-format msgid "out of memory during expansion of \"%d\"" msgstr "????????? ???'??? ??? ??? ?????????? \"%d\"" #: ../src/misc.c:916 msgid "selection not available" msgstr "?????????? ?????????" #: ../src/misc.c:972 ../src/misc.c:978 #, c-format msgid "bad window name value in %s state info" msgstr "????????? ???????? ????? ????? ? ?????????? ??? ???? ??? %s" #: ../src/misc.c:1235 msgid "could not send message to background image helper" msgstr "?? ??????? ??????? ???????????? ???????? ???????? ??????????" #: ../src/pixmap.c:235 #, c-format msgid "could not load mask bitmap file \"%s\". Won't use mask" msgstr "" "?? ??????? ??????????? ????????? ???? ????? \"%s\". ????? ?? ???? ???????????." #: ../src/resources.c:44 #, c-format msgid "could not parse color \"%s\"" msgstr "?? ??????? ????????? ????? \"%s\"" #: ../src/resources.c:48 #, c-format msgid "could not allocate color \"%s\"" msgstr "?? ??????? ????????????? ????? \"%s\"" #: ../src/rootmenu.c:196 ../src/rootmenu.c:198 msgid "Exit" msgstr "?????" #: ../src/rootmenu.c:197 msgid "Exit window manager?" msgstr "????? ? ????????? ??????" #: ../src/rootmenu.c:245 msgid "Close X session" msgstr "????????? ????? ??????" #: ../src/rootmenu.c:246 msgid "" "Close Window System session?\n" "Kill might close applications with unsaved data." msgstr "" "??????? ????? ???????? ????????\n" "?? ???? ????????? ???????? ? ????????????? ??????." #: ../src/rootmenu.c:261 msgid "Kill X session" msgstr "???????? ?????????? ?????? ??????" #: ../src/rootmenu.c:262 msgid "" "Kill Window System session?\n" "(all applications will be closed)" msgstr "" "??????? ????? ???????? ????????\n" "(??? ???????? ?????? ?????????)" #: ../src/rootmenu.c:539 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" msgstr "%s:????????? ??????? ?????????? ?????? \"%s\" ??? ?????? %s" #: ../src/rootmenu.c:547 #, c-format msgid "%s:invalid key in shortcut \"%s\" for entry %s" msgstr "%s:????????? ??????? ? ?????????? \"%s\" ??? ?????? %s" #: ../src/rootmenu.c:600 #, c-format msgid "%s: unmatched '\"' in menu file" msgstr "%s: ??????? '\"' ? ????? ????" #: ../src/rootmenu.c:650 #, c-format msgid "%s: missing command" msgstr "%s: ???????? ???????" #: ../src/rootmenu.c:682 #, c-format msgid "invalid OPEN_MENU specification: %s" msgstr "????????? ???????????? OPEN_MENU: %s" #: ../src/rootmenu.c:741 #, c-format msgid "%s:could not stat menu:%s" msgstr "%s:?? ??????? ???????? ????:%s" #: ../src/rootmenu.c:759 #, c-format msgid "too many parameters in OPEN_MENU: %s" msgstr "????? ?????? ?????????? ? OPEN_MENU: %s" #: ../src/rootmenu.c:803 msgid "" "There are more than one WORKSPACE_MENU commands in the applications menu. " "Only one is allowed." msgstr "" "? ????????? ???? ??????? ?????? ?????? ??????? WORKSPACE_MENU. ????????? " "???? ????" #: ../src/rootmenu.c:837 msgid "" "There are more than one WINDOWS_MENU commands in the applications menu. Only " "one is allowed." msgstr "" "? ????????? ???? ??????? ?????? ?????? ??????? WINDOWS_MENU. ????????? " "???? ????" #: ../src/rootmenu.c:842 msgid "Window List" msgstr "?????? ?????" #: ../src/rootmenu.c:871 ../src/rootmenu.c:889 ../src/rootmenu.c:899 #, c-format msgid "%s:missing parameter for menu command \"%s\"" msgstr "%s:????????? ???????? ??? ??????? ???? \"%s\"" #: ../src/rootmenu.c:967 #, c-format msgid "%s:unknown command \"%s\" in menu config." msgstr "%s:???????? ??????? \"%s\" ? ???????????? ????" #: ../src/rootmenu.c:975 #, c-format msgid "%s:can't add shortcut for entry \"%s\"" msgstr "%s:?? ??????? ?????? ?????????? ?????? ??? ??????? \"%s\"" #: ../src/rootmenu.c:1112 #, c-format msgid "%s:maximal line size exceeded in menu config: %s" msgstr "%s:?????????? ???????????? ?????? ????? ? ???????????? ????: %s" #: ../src/rootmenu.c:1134 ../src/rootmenu.c:1227 ../src/rootmenu.c:1329 #, c-format msgid "%s:missing command in menu config: %s" msgstr "%s:???????? ??????? ? ???????????? ????: %s" #: ../src/rootmenu.c:1164 #, c-format msgid "%s:syntax error in menu file:END declaration missing" msgstr "%s:??????????? ??????? ? ????? ????: ???????? END" #: ../src/rootmenu.c:1193 ../src/rootmenu.c:1293 msgid "could not make arguments for menu file preprocessor" msgstr "?? ??????? ?????????? ????????? ??? ???????????? ????? ????" #: ../src/rootmenu.c:1200 ../src/rootmenu.c:1301 #, c-format msgid "%s:could not open/preprocess menu file" msgstr "%s:?? ??????? ????????/???????? ???? ????" #: ../src/rootmenu.c:1212 ../src/rootmenu.c:1314 #, c-format msgid "%s:could not open menu file" msgstr "%s:?? ??????? ???????? ???? ????" #: ../src/rootmenu.c:1239 #, c-format msgid "%s:invalid menu file. MENU command is missing" msgstr "%s:???? ???? ??????????. ???????? ??????? MENU" #: ../src/rootmenu.c:1248 msgid "error reading preprocessed menu data" msgstr "??????? ??????? ?????????? ????? ????" #: ../src/rootmenu.c:1341 #, c-format msgid "%s:no title given for the root menu" msgstr "%s: ?? ??????? ????????? ?????????? ????" #: ../src/rootmenu.c:1432 ../src/rootmenu.c:1505 ../src/rootmenu.c:1546 #, c-format msgid "out of memory while constructing directory menu %s" msgstr "????????? ???'??? ??? ???????? ???? ???????? %s" #: ../src/rootmenu.c:1442 #, c-format msgid "%s:could not stat file \"%s\" in menu directory" msgstr "%s:?? ??????????? ???? \"%s\" ? ???????? ????" #: ../src/rootmenu.c:1600 msgid "Commands" msgstr "???????" #: ../src/rootmenu.c:1603 msgid "Restart" msgstr "??????????" #: ../src/rootmenu.c:1604 msgid "Exit..." msgstr "?????..." #: ../src/rootmenu.c:1649 #, c-format msgid "could not find menu file \"%s\" referenced in WMRootMenu" msgstr "?? ??????? ?????? ???? ???? \"%s\", ???????? ? WMRootMenu" #: ../src/rootmenu.c:1656 #, c-format msgid "could not access menu \"%s\" referenced in WMRootMenu" msgstr "?? ??????? ????????? ???? \"%s\", ??????? ? WMRootMenu" #: ../src/rootmenu.c:1690 ../src/rootmenu.c:1766 #, c-format msgid "%s:format error in root menu configuration \"%s\"" msgstr "%s:??????? ??????? ? ???????????? ?????????? ???? \"%s\"" #: ../src/rootmenu.c:1854 msgid "" "The applications menu could not be loaded. Look at the console output for a " "detailed description of the errors." msgstr "" "?? ??????? ??????????? ???? ???????. ???????????? ?? ??????? ??????? ??????? " "????????? ???? ????????." #: ../src/screen.c:740 #, c-format msgid "could not initialize graphics library context: %s" msgstr "?? ??????? ?????????????? ???????? ??????????: %s" #: ../src/screen.c:771 msgid "could not do initialization of WINGs widget set" msgstr "?? ??????? ?????????????? ????? ???????? WINGs" #: ../src/screen.c:1137 #, c-format msgid "could not save session state in %s" msgstr "?? ??????? ???????? ???? ?????? ? %s" #: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:454 #, c-format msgid "can't convert \"%s\" to boolean" msgstr "?? ??????? ??????????? \"%s\" ? ????????? ????????" #: ../src/session.c:1023 msgid "out of memory while saving session state" msgstr "????????? ???'??? ??? ?????????? ????? ??????" #: ../src/session.c:1106 msgid "end of memory while saving session state" msgstr "????????? ???'??? ??? ?????????? ????? ??????" #. This is not fatal but can mean the session manager exited. #. * If the session manager exited normally we would get a #. * Die message, so this probably means an abnormal exit. #. * If the sm was the last client of session, then we'll die #. * anyway, otherwise we can continue doing our stuff. #. #: ../src/session.c:1244 msgid "connection to the session manager was lost" msgstr "???????? ?'??????? ? ?????????? ???????" #: ../src/stacking.c:79 msgid "could not get window list!!" msgstr "?? ??????? ???????? ?????? ?????!!" #: ../src/startup.c:202 #, c-format msgid "internal X error: %s\n" msgstr "????????? ??????? X ???????: %s\n" #: ../src/startup.c:260 #, c-format msgid "got signal %i (%s) - restarting\n" msgstr "???????? ?????? %i (%s) -- ??????????\n" #: ../src/startup.c:262 #, c-format msgid "got signal %i - restarting\n" msgstr "???????? ?????? %i - ??????????\n" #: ../src/startup.c:272 #, c-format msgid "got signal %i (%s) - rereading defaults\n" msgstr "???????? ?????? %i (%s) -- ????????????? ????????\n" #: ../src/startup.c:274 #, c-format msgid "got signal %i - rereading defaults\n" msgstr "???????? ?????? %i - ????????????? ????????\n" #: ../src/startup.c:284 #, c-format msgid "got signal %i (%s) - exiting...\n" msgstr "???????? ?????? %i (%s) -- ?????????? ??????...\n" #: ../src/startup.c:286 #, c-format msgid "got signal %i - exiting...\n" msgstr "???????? ?????? %i -- ?????????? ??????...\n" #: ../src/startup.c:329 #, c-format msgid "got signal %i (%s)\n" msgstr "???????? ?????? %i (%s)\n" #: ../src/startup.c:331 #, c-format msgid "got signal %i\n" msgstr "???????? ?????? %i\n" #: ../src/startup.c:342 msgid "" "crashed while trying to do some post-crash cleanup. Aborting immediatelly." msgstr "" "???????? ??????? ??? ??? ??????????? ????? ????. ??????? ?????????? ??????." #. we try to restart Window Maker #: ../src/startup.c:406 msgid "trying to restart Window Maker..." msgstr "?????? ????????????? Window Maker..." #: ../src/startup.c:411 msgid "trying to start alternate window manager..." msgstr "?????? ??????? ??????????????? ????????? ?????..." #: ../src/startup.c:417 msgid "failed to start alternate window manager. Aborting." msgstr "?? ??????? ????????? ?????????????? ???????? ?????. ??????????." #: ../src/startup.c:419 msgid "" "a fatal error has occured, probably due to a bug. Please fill the included " "BUGFORM and report it." msgstr "" "??????? ???????? ???????. ???????, ?? ????????? ??????? ? ????????. ???? " "?????, ????????? ????? BUGFORM ? ????????? ??????." #: ../src/startup.c:894 #, c-format msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" msgstr "?????? ?????? ??????????? ? %i, ?? ????? ????. ???????????????? 16.\n" #: ../src/startup.c:922 msgid "XKB is not supported. KbdModeLock is automatically disabled." msgstr "XKB ?? ?????????????. KbdModeLock ??????????? ??????????." #: ../src/startup.c:941 msgid "it seems that there is already a window manager running" msgstr "?????, ?? ??? ?????? ????? ???????? ?????" #: ../src/startup.c:947 #, c-format msgid "could not manage screen %i" msgstr "?? ???????? ???????? ??????? %i" #: ../src/startup.c:1015 msgid "could not manage any screen" msgstr "?? ???????? ???????? ?????? ???????" #: ../src/switchmenu.c:137 msgid "Windows" msgstr "?????" #: ../src/texture.c:329 ../src/texture.c:371 #, c-format msgid "image file \"%s\" used as texture could not be found." msgstr "???? ?????????? ???????? \"%s\" ?? ????????." #: ../src/texture.c:335 ../src/texture.c:377 #, c-format msgid "could not load texture pixmap \"%s\":%s" msgstr "?? ??????? ??????????? ???????? ?????????? ? ????????? \"%s\":%s" #: ../src/texture.c:437 #, c-format msgid "library \"%s\" cound not be opened." msgstr "?? ??????? ???????? ?????????? \"%s\"." #: ../src/texture.c:446 #, c-format msgid "function \"%s\" not found in library \"%s\"" msgstr "??????? \"%s\" ?? ???????? ? ?????????? \"%s\"" #: ../src/texture.c:453 msgid "function textures not supported on this system, sorry." msgstr "????????????? ???????? ?? ????????????? ???? ????????." #: ../src/texture.c:598 msgid "could not allocate image buffer" msgstr "?? ??????? ???????? ????? ??? ?????????? " #: ../src/wdefaults.c:437 #, c-format msgid "could not find icon file \"%s\"" msgstr "?? ??????? ?????? ???? ?????? \"%s\"" #: ../src/window.c:2934 ../src/window.c:3073 msgid "" "the NumLock, ScrollLock or similar key seems to be turned on.\n" "Turn it off or some mouse actions and keyboard shortcuts will not work." msgstr "" "?????, ?? NumLock, ScrollLock ?? ?????????? ??????? ?????????.\n" "??????????? ?? ??? ? ????? ???????? ????? ? ?????????? ?????? ?? ?????? " "?????????." #: ../src/winmenu.c:126 msgid "" "This will kill the application.\n" "Any unsaved changes will be lost.\n" "Please confirm." msgstr "" "?? ????????? ????????? ????????.\n" "??? ??????????? ????? ?????? ????????.\n" "???? ?????, ???????????." #: ../src/winmenu.c:272 ../src/winmenu.c:281 msgid "Set Shortcut" msgstr "?????????? ?????????? ??????" #: ../src/winmenu.c:359 ../src/winmenu.c:404 msgid "could not create submenu for window menu" msgstr "?? ??????? ???????? ??????? ??? ???? ?????" #: ../src/winmenu.c:408 msgid "Keep on top" msgstr "??????? ??? ???????" #: ../src/winmenu.c:413 msgid "Keep at bottom" msgstr "??????? ??? ???????" #: ../src/winmenu.c:457 ../src/winmenu.c:600 msgid "Shade" msgstr "???????? ? ??????" #: ../src/winmenu.c:473 msgid "Hide Others" msgstr "????????? ????" #: ../src/winmenu.c:481 msgid "Resize/Move" msgstr "??????? ??????/???????????" #: ../src/winmenu.c:489 msgid "Select" msgstr "???????" #: ../src/winmenu.c:502 msgid "Attributes..." msgstr "????????..." #: ../src/winmenu.c:504 msgid "Options" msgstr "?????" #: ../src/winmenu.c:595 msgid "Unshade" msgstr "??????? ?? ??????" #: ../src/winspector.c:387 #, c-format msgid "Could not find icon \"%s\" specified for this window" msgstr "????????? ?????? ?????? \"%s\", ??????? ??? ????? ?????" #: ../src/winspector.c:404 #, c-format msgid "Could not open specified icon \"%s\":%s" msgstr "????????? ???????? ???????? ???? ?????? \"%s\":%s" #: ../src/winspector.c:1123 #, c-format msgid "Inspecting %s.%s" msgstr "????????????? %s.%s" #: ../src/winspector.c:1149 msgid "Click in the window you wish to inspect." msgstr "????????? ?? ?????, ??? ?????? ???????????????." #: ../src/winspector.c:1188 msgid "" "The configuration will apply to all\n" "windows that have their WM_CLASS\n" "property set to the above selected\n" "name, when saved." msgstr "" "??? ?????????? ???????????? ???? ???????????\n" "?? ???? ?????, ? ???? WM_CLASS ??????????? ?\n" "??????? ????????." #: ../src/winspector.c:1217 msgid "Save" msgstr "????????" #: ../src/winspector.c:1225 msgid "Apply" msgstr "???????????" #: ../src/winspector.c:1231 msgid "Reload" msgstr "??????????" #: ../src/winspector.c:1240 ../src/winspector.c:1250 msgid "Window Specification" msgstr "???????????? ?????" #: ../src/winspector.c:1241 msgid "Window Attributes" msgstr "???????? ?????" #: ../src/winspector.c:1242 msgid "Advanced Options" msgstr "????????? ?????" #: ../src/winspector.c:1243 msgid "Icon and Initial Workspace" msgstr "?????? ? ?????????? ????" #: ../src/winspector.c:1244 msgid "Application Specific" msgstr "??????????? ????????" #: ../src/winspector.c:1258 msgid "Defaults for all windows" msgstr "????????? ??? ???? ?????" #: ../src/winspector.c:1312 msgid "Select window" msgstr "???????? ?????" #: ../src/winspector.c:1326 msgid "Attributes" msgstr "????????" #: ../src/winspector.c:1337 msgid "Disable titlebar" msgstr "???????? ????? ?????" #: ../src/winspector.c:1339 msgid "" "Remove the titlebar of this window.\n" "To access the window commands menu of a window\n" "without it's titlebar, press Control+Esc (or the\n" "equivalent shortcut, if you changed the default\n" "settings)." msgstr "" "???????? ?????? ????????? ????? ?????.\n" "??? ??????? ?? ???? ?????? ????? ??? ???????????\n" "???? ?????, ????????? Control+Esc (?? ????????????\n" "??????????, ???? ?? ??????? ????????? ??\n" "??????????)." #: ../src/winspector.c:1346 msgid "Disable resizebar" msgstr "???????? ?????? ????? ???????" #: ../src/winspector.c:1348 msgid "Remove the resizebar of this window." msgstr "???????? ?????? ????? ??????? ????? ?????." #: ../src/winspector.c:1351 msgid "Disable close button" msgstr "???????? ?????? ????????" #: ../src/winspector.c:1353 msgid "Remove the `close window' button of this window." msgstr "???????? ?????? ???????? ??? ????? ?????." #: ../src/winspector.c:1356 msgid "Disable miniaturize button" msgstr "???????? ?????? ???????????" #: ../src/winspector.c:1358 msgid "Remove the `miniaturize window' button of the window." msgstr "???????? ?????? ??????????? ??? ????? ?????." #: ../src/winspector.c:1361 msgid "Disable border" msgstr "???????? ?????? ?????" #: ../src/winspector.c:1363 msgid "Remove the 1 pixel black border around the window." msgstr "???????? 1-?????????? ?????? ?????? ??????? ?????." #: ../src/winspector.c:1366 msgid "Keep on top (floating)" msgstr "?????? ?????? (????????)" #: ../src/winspector.c:1368 msgid "" "Keep the window over other windows, not allowing\n" "them to cover it." msgstr "" "?????????? ????? ?????? ????? ?????, ?? ??????????\n" "?? ????????? ?? ?????." #: ../src/winspector.c:1372 msgid "Keep at bottom (sunken)" msgstr "?????? ????? (????????)" #: ../src/winspector.c:1374 msgid "Keep the window under all other windows." msgstr "?????????? ????? ???????? ?????? ?????????????? ???????." #: ../src/winspector.c:1379 msgid "Make window present in all workspaces." msgstr "??????? ????? ????????? ?? ???? ??????? ??????." #: ../src/winspector.c:1382 msgid "Start miniaturized" msgstr "?????? ?????????????" #: ../src/winspector.c:1384 msgid "" "Make the window be automatically miniaturized when it's\n" "first shown." msgstr "" "??????? ????? ??????????? ?????????????? ???\n" "??????????? ??????????." #: ../src/winspector.c:1388 msgid "Start maximized" msgstr "?????? ??????????????" #: ../src/winspector.c:1390 msgid "" "Make the window be automatically maximized when it's\n" "first shown." msgstr "" "??????? ????? ??????????? ??????????????? ???\n" "??????????? ??????????." #: ../src/winspector.c:1394 msgid "Full screen maximization" msgstr "????????????? ?? ???? ?????" #: ../src/winspector.c:1396 msgid "" "Make the window use the whole screen space when it's\n" "maximized. The titlebar and resizebar will be moved\n" "to outside the screen." msgstr "" "??????? ?? ????? ????????? ????? ??????? ?????? ???\n" "????????????. ?????? ????????? ? ????? ??????? ??????\n" "??????? ?? ???? ??????." #: ../src/winspector.c:1413 msgid "Advanced" msgstr "?????????" #: ../src/winspector.c:1430 msgid "Do not bind keyboard shortcuts" msgstr "?? ????'??????? ?????????? ??????" #: ../src/winspector.c:1432 msgid "" "Do not bind keyboard shortcuts from Window Maker\n" "when this window is focused. This will allow the\n" "window to receive all key combinations regardless\n" "of your shortcut configuration." msgstr "" "?? ????'??????? ?????????? ?????? Window Maker'?\n" "??? ????????? ??? ?????? ?????? ?????. ?? ?????????\n" "????? ?????????? ??? ?????????? ??????, ?????????\n" "??? ???????????? ?? ????'????." #: ../src/winspector.c:1438 msgid "Do not bind mouse clicks" msgstr "?? ????'??????? ?????????? ????" #: ../src/winspector.c:1440 msgid "" "Do not bind mouse actions, such as `Alt'+drag\n" "in the window (when alt is the modifier you haveconfigured)." msgstr "" "?? ????'??????? ??? ????, ???? ?? `Alt'+????????????\n" "? ????? (??? ????????????? ???????????? `Alt')." #: ../src/winspector.c:1445 msgid "Do not show in the window list" msgstr "?? ?????????? ????? ? ?????? ?????." #: ../src/winspector.c:1447 msgid "Do not list the window in the window list menu." msgstr "?? ?????????? ?? ????? ? ???? ?????? ?????." #: ../src/winspector.c:1450 msgid "Do not let it take focus" msgstr "?? ?????????? ????? ?????" #: ../src/winspector.c:1452 msgid "" "Do not let the window take keyboard focus when you\n" "click on it." msgstr "" "?? ?????? ????? ?????????? ????? ????? ? ??????????\n" "??? ?????????? ?? ????? ?????." #: ../src/winspector.c:1456 msgid "Keep inside screen" msgstr "?????? ????????? ??????" #: ../src/winspector.c:1458 msgid "" "Do not allow the window to move itself completely\n" "outside the screen. For bug compatibility.\n" msgstr "" "?? ????????? ????? ???????? ?????????????\n" "?? ???? ??????.\n" #: ../src/winspector.c:1462 msgid "Ignore 'Hide Others'" msgstr "?????????? '????????? ????'" #: ../src/winspector.c:1464 msgid "" "Do not hide the window when issuing the\n" "`HideOthers' command." msgstr "" "?? ??????????? ?? ????? ??? ?????????\n" "??????? `????????? ????'." #: ../src/winspector.c:1468 msgid "Ignore 'Save Session'" msgstr "?????????? '???????? ?????'" #: ../src/winspector.c:1470 msgid "" "Do not save the associated application in the\n" "session's state, so that it won't be restarted\n" "together with other applications when Window Maker\n" "starts." msgstr "" "?? ????????? ??????????? ???????? ?\n" "????? ??????, ??? ?? ???? ?? ????\n" "???????????? ????? ? ?????? ??????????\n" "??? ??????? Window Maker'?." # #: ../src/winspector.c:1476 msgid "Emulate application icon" msgstr "????????? ?????? ????????" #: ../src/winspector.c:1478 msgid "" "Make this window act as an application that provides\n" "enough information to Window Maker for a dockable\n" "application icon to be created." msgstr "" "??????? ?? ????? ??????? ???? ?? ????????, ??\n" "????? ????????? ?????????? Window Maker'? ???\n" "????????? ?????? ????????, ??? ?????????? ? ???." #: ../src/winspector.c:1484 msgid "Disable language button" msgstr "???????? ?????? ????" #: ../src/winspector.c:1486 msgid "Remove the `toggle language' button of the window." msgstr "???????? ?????? ??????????? ???? ?????????? ??? ?????." #: ../src/winspector.c:1503 msgid "Miniwindow Image" msgstr "?????????? ??????????" #: ../src/winspector.c:1530 msgid "Icon filename:" msgstr "??'? ????? ??????:" #: ../src/winspector.c:1543 msgid "Ignore client supplied icon" msgstr "?????????? ?????? ???????" #: ../src/winspector.c:1550 msgid "Initial Workspace" msgstr "?????????? ??????? ????" #: ../src/winspector.c:1552 msgid "The workspace to place the window when it'sfirst shown." msgstr "??????? ????, ???? ????????? ????? ??? ?????????? ???? ?????." #: ../src/winspector.c:1558 msgid "Nowhere in particular" msgstr "?? ?????????" #: ../src/winspector.c:1576 msgid "Application Attributes" msgstr "??????????? ?? ????????" #: ../src/winspector.c:1587 msgid "Start hidden" msgstr "????????? ??????????" #: ../src/winspector.c:1589 msgid "Automatically hide application when it's started." msgstr "??????????? ??????????? ???????? ??? ?? ???????." #: ../src/winspector.c:1592 msgid "No application icon" msgstr "?? ?????????? ??????" #: ../src/winspector.c:1594 msgid "" "Disable the application icon for the application.\n" "Note that you won't be able to dock it anymore,\n" "and any icons that are already docked will stop\n" "working correctly." msgstr "" "?????????? ?????? ???????? ??? ???? ????????.\n" "?????: ?? ?? ??????? ????? ????? ????????? ?? ? ???,\n" "? ??? ?? ??????, ?? ??? ? ????? ???????????, ?????????\n" "???????? ?????????." # #: ../src/winspector.c:1600 msgid "Shared application icon" msgstr "??????? ?????? ????????" #: ../src/winspector.c:1602 msgid "" "Use a single shared application icon for all of\n" "the instances of this application.\n" msgstr "" "??????????????? ????? ??????? ?????? ???????? ???\n" "???? ??????????? ???? ????????.\n" #: ../src/wmspec.c:277 msgid "out of memory while updating wm hints" msgstr "????????? ???'??? ??? ????????? wm hints" #: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:893 #, c-format msgid "Workspace %i" msgstr "??????? ???? %i" #: ../src/workspace.c:943 msgid "Workspaces" msgstr "?????? ?????" #: ../src/workspace.c:945 msgid "could not create Workspace menu" msgstr "?? ???????? ???????? ???? ??????? ??????" #: ../src/workspace.c:952 msgid "New" msgstr "????????" #: ../src/workspace.c:953 msgid "Destroy Last" msgstr "??????? ????????" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Aug 2005 01:29:26 -0000 1.4 +++ .cvsignore 2 Mar 2006 14:16:26 -0000 1.5 @@ -1 +1,2 @@ WindowMaker-0.92.0.tar.bz2 +WindowMaker-extra-0.1.tar.gz Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- WindowMaker.spec 16 Feb 2006 23:09:01 -0000 1.16 +++ WindowMaker.spec 2 Mar 2006 14:16:26 -0000 1.17 @@ -1,7 +1,7 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.92.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: User Interface/Desktops @@ -9,7 +9,45 @@ Source0: ftp://windowmaker.org/pub/source/release/WindowMaker-0.92.0.tar.bz2 Source1: WindowMaker.xsession Source2: WindowMaker.desktop -Patch0: windowmaker-gcc4-x86_64.patch +Source3: WindowMaker-uk.po +Source4: WPrefs-uk.po +Source5: WindowMaker-README.newbuttons +Source6: WindowMaker-newbuttons.nextstyle.tiff +Source7: WindowMaker-newbuttons.nextstyle.xpm +Source8: WindowMaker-newbuttons.oldstyle.tiff + +Source10: ftp://windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz + +# cvs snapshot +Patch0: WindowMaker-0.92.0-cvs20060123.patch +Patch1: WindowMaker-gcc41.patch + +#patches from altlinux +Patch101: WindowMaker-0.91.0-alt-sowings.patch +Patch102: WindowMaker-0.91.0-alt-session.patch +Patch103: WindowMaker-0.91.0-alt-restartscrpt.patch +Patch104: WindowMaker-0.91.0-alt-menutrans.patch +Patch105: WindowMaker-0.91.0-alt-titlebar.patch +Patch106: WindowMaker-0.91.0-alt-clipnotext.patch +Patch107: WindowMaker-0.91.0-alt-mmx.patch +Patch108: WindowMaker-0.80.2-cvs-alt-textfield.patch +Patch109: WindowMaker-0.91.0-alt-focus.patch + +#add new features as well (sound good) +Patch200: WindowMaker-0.91.0-wmcontrib-singleclick.patch +Patch201: WindowMaker-0.91.0-alt-dockhotkeys.patch +Patch202: WindowMaker-0.91.0-alt-vlaad-trance.patch +Patch203: WindowMaker-0.91.0-alt-vlaad-newbuttons.patch +Patch204: WindowMaker-0.91.0-alt-adialog.patch +Patch205: WindowMaker-0.91.0-hmepas-minimizeall.patch +Patch206: WindowMaker-0.91.0-hmepas-swmenu_rclick.patch +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 +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 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libpng-devel libjpeg-devel libungif-devel BuildRequires: libtiff-devel zlib-devel gettext-devel @@ -47,8 +85,41 @@ %prep -%setup -q -%patch0 +%setup -q -a10 + +%patch0 -p1 +%patch1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 +%patch105 -p1 +%patch106 -p1 +%patch107 -p1 +%patch108 -p1 +%patch109 -p1 +%patch200 -p1 +%patch201 -p1 +%patch202 -p1 +%patch203 -p1 +%patch204 -p1 +%patch205 -p1 +%patch206 -p1 +%patch207 -p1 +%patch208 -p1 +%patch209 -p1 +%patch210 -p1 +%patch211 -p1 +%patch212 -p1 -b .vns + +cp %{SOURCE3} po/uk.po +cp %{SOURCE4} WPrefs.app/po/uk.po +cp %{SOURCE5} README.newbuttons + +cp %{SOURCE6} WPrefs.app/tiff/nextstyle.tiff +cp %{SOURCE7} WPrefs.app/xpm/nextstyle.xpm +cp %{SOURCE8} WPrefs.app/tiff/oldstyle.tiff + ###### menu fix from Rudolf Kastel for i in WindowMaker/*menu* ; do echo $i @@ -58,17 +129,25 @@ sed -e 's/\/home\/mawa/$(HOME)/g' $i.old >$i done +autoreconf -sif + %build +# enable new features +CFLAGS="$RPM_OPT_FLAGS -DBOUNCE_APP -DNEWAPPICON -DVIRTUAL_DESKTOP" LINGUAS=`(cd po ; echo *.po|sed 's/zh_TW.Big5.po//g;s/.po//g')` GNUSTEP_LOCAL_ROOT='%{_libdir}/GNUstep' NLSDIR="%{_datadir}/locale" -export LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT +export CFLAGS LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT %configure --enable-gnome --enable-kde --enable-usermenu --enable-xinerama \ --enable-fast-install --enable-modelock --x-includes=%{_includedir} \ ---x-libraries=%{_libdir} - -make %{?_smp_mflags} - +--x-libraries=%{_libdir} --disable-mmx --disable-static --enable-shared +#smp_mflags are broken atm +make #%{?_smp_mflags} + +# do extras stuff +cd WindowMaker-extra-0.1 +%configure --x-libraries=%{_libdir} --x-includes=%{_includedir} +cd .. %install rm -rf $RPM_BUILD_ROOT @@ -76,13 +155,16 @@ %find_lang '\(WPrefs\|%{name}\|WINGs\)' -rm -f $RPM_BUILD_ROOT%{_libdir}/libwraster.la - install -D -m0755 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/X11/gdm/Sessions/WindowMaker install -D -m0644 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' + +# now install extras stuff +make -C WindowMaker-extra-0.1 install DESTDIR=$RPM_BUILD_ROOT + %clean rm -rf $RPM_BUILD_ROOT @@ -97,7 +179,7 @@ %{_datadir}/%{name} %{_datadir}/WINGs %{_libdir}/GNUstep -%{_libdir}/libwraster.so.* +%{_libdir}/*.so.* %{_mandir}/man1/*.1x* %{_mandir}/sk/man1/*.1x* %exclude %{_bindir}/get-*-flags @@ -110,12 +192,22 @@ %{_includedir}/WINGs %{_includedir}/WMaker.h %{_includedir}/wraster.h -%{_libdir}/lib*.a -%{_libdir}/libwraster.so +%{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %changelog +* Sun Feb 26 2006 Andreas Bierfert +0.92.0-7 +- fix #181981 +- go to new cvs snapshot (which includes qt fix) +- add patches from altlinuxs rpm (suggested by Andrew Zabolotny) +- get rid of static libs (finally) +- tune configure +- add uk translation +- finally add extras source +- fix stack-smash while reading workspace names + * Thu Feb 16 2006 Andreas Bierfert 0.92.0-6 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Aug 2005 01:29:26 -0000 1.4 +++ sources 2 Mar 2006 14:16:26 -0000 1.5 @@ -1 +1,2 @@ aaac5421b686ed2d3e6ab65229c98097 WindowMaker-0.92.0.tar.bz2 +07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz --- windowmaker-gcc4-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 14:40:02 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Mar 2006 09:40:02 -0500 Subject: rpms/gai/devel gai.spec,1.18,1.19 Message-ID: <200603021440.k22EeYx7010418@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gai/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10389 Modified Files: gai.spec Log Message: Update for FC5 rebuild Index: gai.spec =================================================================== RCS file: /cvs/extras/rpms/gai/devel/gai.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gai.spec 12 Feb 2006 21:29:05 -0000 1.18 +++ gai.spec 2 Mar 2006 14:40:02 -0000 1.19 @@ -1,6 +1,6 @@ Name: gai Version: 0.5.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Generic Applet Interface Group: User Interface/Desktops @@ -73,7 +73,10 @@ %{_libdir}/libgai.so %changelog -* Mon Jan 30 2006 Michel Salim - 0.5.10-5 +* Thu Mar 2 2006 Michel Salim - 0.5.10-6 +- Rebuild for Fedora Extras 5 + +* Mon Jan 30 2006 Michel Salim - 0.5.10-5 - regenerate configure to account for modular xorg's location change - BuildReq changes: removed implicit dependencies, added xorg-x11-proto-devel and mesa-libGLU-devel that are now no longer pulled in From fedora-extras-commits at redhat.com Thu Mar 2 14:48:08 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Mar 2006 09:48:08 -0500 Subject: rpms/quarry/devel quarry.spec,1.1,1.2 Message-ID: <200603021448.k22EmeOO010574@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/quarry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10556 Modified Files: quarry.spec Log Message: Update for Fedora Extras 5 rebuild Index: quarry.spec =================================================================== RCS file: /cvs/extras/rpms/quarry/devel/quarry.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- quarry.spec 17 Nov 2005 03:14:16 -0000 1.1 +++ quarry.spec 2 Mar 2006 14:48:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: quarry Version: 0.1.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A multi-purpose board game GUI Group: Amusements/Games @@ -70,7 +70,10 @@ %changelog -* Sun Nov 13 2005 Michel Salim - 0.1.16-1 +* Thu Mar 2 2006 Michel Salim - 0.1.16-2 +- Rebuild for Fedora Extras 5 + +* Sun Nov 13 2005 Michel Salim - 0.1.16-1 - New upstream version * Sun Sep 4 2005 Michel Salim - 0.1.15-5 From fedora-extras-commits at redhat.com Thu Mar 2 14:55:55 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Mar 2006 09:55:55 -0500 Subject: owners owners.list,1.693,1.694 Message-ID: <200603021456.k22EuRPj010658@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10641 Modified Files: owners.list Log Message: Transferring gnugo to michel.salim at gmail.com Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.693 retrieving revision 1.694 diff -u -r1.693 -r1.694 --- owners.list 2 Mar 2006 06:45:28 -0000 1.693 +++ owners.list 2 Mar 2006 14:55:55 -0000 1.694 @@ -351,7 +351,7 @@ Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org| -Fedora Extras|gnugo|Text based go program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gnugo|Text based go program|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gnumeric|A spreadsheet program for GNOME|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gnupg2|GNU utility for secure communication and data storage|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gobby|A free collaborative editor|lmacken at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 15:16:59 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Mar 2006 10:16:59 -0500 Subject: rpms/grhino/devel grhino.spec,1.3,1.4 Message-ID: <200603021517.k22FHYkx012716@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12699 Modified Files: grhino.spec Log Message: Update for FE5 rebuild Index: grhino.spec =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- grhino.spec 17 Nov 2005 03:27:43 -0000 1.3 +++ grhino.spec 2 Mar 2006 15:16:57 -0000 1.4 @@ -1,6 +1,6 @@ Name: grhino Version: 0.15.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Reversi game for GNOME, supporting the Go/Game Text Protocol Group: Amusements/Games @@ -85,6 +85,9 @@ %changelog +* Thu Mar 2 2006 Michel Salim - 0.15.0-5 +- Rebuild for Fedora Extras 5 + * Sun Nov 13 2005 Michel Salim - 0.15.0-4 - Reverted game name used in GTP protocol From fedora-extras-commits at redhat.com Thu Mar 2 15:47:51 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 10:47:51 -0500 Subject: rpms/abicheck/devel abicheck.spec,1.23,1.24 Message-ID: <200603021548.k22FmNKu013022@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12995 Modified Files: abicheck.spec Log Message: * Thu Mar 2 2006 Michael Schwendt - 1.2-10 - rebuilt for FC5 only to run the %check section Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- abicheck.spec 16 Aug 2005 22:05:50 -0000 1.23 +++ abicheck.spec 2 Mar 2006 15:47:51 -0000 1.24 @@ -3,7 +3,7 @@ Summary: ABI checking tool Name: abicheck Version: 1.2 -Release: 9 +Release: 10 License: LGPL Group: Applications/File URL: http://abicheck.sourceforge.net/ @@ -62,6 +62,9 @@ %changelog +* Thu Mar 2 2006 Michael Schwendt - 1.2-10 +- rebuilt for FC5 only to run the %%check section + * Tue Aug 16 2005 Michael Schwendt - 1.2-9 - Patch abicheck to run dynamic linker directly instead of using ldd and receiving its intermixed lines. From fedora-extras-commits at redhat.com Thu Mar 2 15:52:19 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 10:52:19 -0500 Subject: rpms/neverball/FC-4 neverball-rpath.patch, NONE, 1.1 neverball.spec, 1.9, 1.10 Message-ID: <200603021552.k22FqpLp013091@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/neverball/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066 Modified Files: neverball.spec Added Files: neverball-rpath.patch Log Message: Remove rpath from x86_64 binary (bz #173819) neverball-rpath.patch: --- NEW FILE neverball-rpath.patch --- --- Makefile 2004-09-08 13:31:40.000000000 -0700 +++ ../neverball-1.4.0.new/Makefile 2006-02-27 13:25:50.000000000 -0800 @@ -16,7 +16,7 @@ #CFLAGS= -Wall -pg -ansi $(shell sdl-config --cflags) SDL_LIBS= $(shell sdl-config --libs) -FT2_LIBS= $(shell freetype-config --libs) +FT2_LIBS= $(shell freetype-config --libs | sed 's|-Wl,--rpath -Wl,/usr/lib64 ||') MAPC_TARG= mapc BALL_TARG= neverball Index: neverball.spec =================================================================== RCS file: /cvs/extras/rpms/neverball/FC-4/neverball.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- neverball.spec 23 May 2005 00:24:05 -0000 1.9 +++ neverball.spec 2 Mar 2006 15:52:19 -0000 1.10 @@ -1,6 +1,6 @@ Name: neverball Version: 1.4.0 -Release: 4 +Release: 5 Summary: Roll a ball through an obstacle course @@ -9,6 +9,7 @@ URL: http://icculus.org/neverball/ Source0: http://icculus.org/neverball/neverball-%{version}.tar.gz Patch0: neverball-datadir.patch +Patch1: neverball-rpath.patch Source1: neverball.desktop Source2: neverputt.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,18 +26,22 @@ %prep %setup -q %patch0 +%patch1 +# Remove some execute bits to prevent rpmlint warnings in the debuginfo +# package. +find data putt share -type f -exec chmod a-x {} \; %build -make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`" +make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -p -D -m0755 neverball $RPM_BUILD_ROOT/%{_bindir}/neverball install -p -D -m0755 neverputt $RPM_BUILD_ROOT/%{_bindir}/neverputt -install -p -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/neverball/ +install -p -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/ install -p -D -m0644 icon/neverball.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverball.png install -p -D -m0644 icon/neverputt.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverputt.png -cp -ap data/* $RPM_BUILD_ROOT/%{_datadir}/neverball/ +cp -ap data/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/ desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ @@ -60,6 +65,10 @@ %{_datadir}/applications/* %changelog +* Mon Feb 27 2006 Wart - 1.4.0-5 +- Added smp_mflags to compile line to speed up build on smp machines +- Added patch to remove rpath on FC4 + * Sun May 22 2005 Jeremy Katz - 1.4.0-4 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Mar 2 15:55:00 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 10:55:00 -0500 Subject: rpms/neverball/FC-4 neverball.spec,1.10,1.11 Message-ID: <200603021555.k22FtWHi013144@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/neverball/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13127 Modified Files: neverball.spec Log Message: Added dist tag to release. Index: neverball.spec =================================================================== RCS file: /cvs/extras/rpms/neverball/FC-4/neverball.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- neverball.spec 2 Mar 2006 15:52:19 -0000 1.10 +++ neverball.spec 2 Mar 2006 15:55:00 -0000 1.11 @@ -1,6 +1,6 @@ Name: neverball Version: 1.4.0 -Release: 5 +Release: 5%{?dist} Summary: Roll a ball through an obstacle course @@ -65,9 +65,10 @@ %{_datadir}/applications/* %changelog -* Mon Feb 27 2006 Wart - 1.4.0-5 +* Thu Mar 2 2006 Wart - 1.4.0-5 - Added smp_mflags to compile line to speed up build on smp machines - Added patch to remove rpath on FC4 +- Added dist tag to release * Sun May 22 2005 Jeremy Katz - 1.4.0-4 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Mar 2 16:01:08 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 11:01:08 -0500 Subject: rpms/neverball/devel neverball.spec,1.10,1.11 Message-ID: <200603021601.k22G1eMb015034@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/neverball/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13201 Modified Files: neverball.spec Log Message: Add dist to release tag Index: neverball.spec =================================================================== RCS file: /cvs/extras/rpms/neverball/devel/neverball.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- neverball.spec 2 Mar 2006 05:51:33 -0000 1.10 +++ neverball.spec 2 Mar 2006 16:01:07 -0000 1.11 @@ -1,6 +1,6 @@ Name: neverball Version: 1.4.0 -Release: 5 +Release: 6%{?dist} Summary: Roll a ball through an obstacle course @@ -64,6 +64,9 @@ %{_datadir}/applications/* %changelog +* Thu Mar 2 2006 Wart - 1.4.0-6 +- Add dist tag now that spec files are different between releases + * Mon Feb 27 2006 Wart - 1.4.0-5 - Added BR: mesa-libGL-devel for modular xorg - Added smp_mflags to compile line to speed up build on smp machines From fedora-extras-commits at redhat.com Thu Mar 2 16:52:57 2006 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Thu, 2 Mar 2006 11:52:57 -0500 Subject: owners owners.list,1.694,1.695 Message-ID: <200603021653.k22GrT3e019498@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19293 Modified Files: owners.list Log Message: fix e-mail address Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.694 retrieving revision 1.695 diff -u -r1.694 -r1.695 --- owners.list 2 Mar 2006 14:55:55 -0000 1.694 +++ owners.list 2 Mar 2006 16:52:55 -0000 1.695 @@ -18,7 +18,7 @@ Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|acpitool|A command line ACPI client for Linux|pertusus at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|colin at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|aiksaurus|A thesaurus library|uwog at uwog.net|extras-qa at fedoraproject.org| @@ -269,7 +269,7 @@ 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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org| -Fedora Extras|gaim-guifications|Guifications plugin for GAIM|colin at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gaim-guifications|Guifications plugin for GAIM|byte at fedoraproject.org|extras-qa at fedoraproject.org| 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 xtdnet.nl|extras-qa at fedoraproject.org| Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org| @@ -647,7 +647,7 @@ 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| Fedora Extras|Maelstrom|A space combat game.|notting at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|MagicPoint|X based presentation software|colin at fedoraproject.org|extras-qa at fedoraproject.org|rms at 1407.org +Fedora Extras|MagicPoint|X based presentation software|byte at fedoraproject.org|extras-qa at fedoraproject.org|rms at 1407.org Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|makebootfat|Utility for creation bootable FAT disk|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|manedit|GUI editor for creating man pages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| @@ -1103,7 +1103,7 @@ Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|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| 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|colin at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|python-adns|Python interface for the GNU adns library|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-astng|Python Abstract Syntax Tree New Generation|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-basemap|Plots data on map projections (with continental and political boundaries)|orion at cora.nwra.com|extras-qa at fedoraproject.org| @@ -1270,7 +1270,7 @@ Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|stellarium|A photo-realistic nightsky renderer|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|straw|GNOME desktop news aggregator|colin at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|straw|GNOME desktop news aggregator|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org| Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|suck|Suck - download news from remote NNTP server|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 17:15:17 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Thu, 2 Mar 2006 12:15:17 -0500 Subject: fedora-release fedora-development.repo,1.1,1.2 Message-ID: <200603021715.k22HFHMN024175@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24150 Modified Files: fedora-development.repo Log Message: add link (#183603) Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-development.repo 15 Feb 2006 20:01:52 -0000 1.1 +++ fedora-development.repo 2 Mar 2006 17:15:07 -0000 1.2 @@ -15,7 +15,11 @@ # testing and troubleshooting for development packages in conjunction # with developing new releases. # -# Reproducible and reportable issues should be filed at http://bugzilla.redhat.com/ +# More information is available at http://fedoraproject.org/wiki/Testing +# +# Reproducible and reportable issues should be filed at +# http://bugzilla.redhat.com/. +# # Product: Fedora Core # Version: devel From fedora-extras-commits at redhat.com Thu Mar 2 17:18:43 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 12:18:43 -0500 Subject: rpms/libopensync-plugin-kdepim - New directory Message-ID: <200603021718.k22HIjSh024249@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24239/libopensync-plugin-kdepim Log Message: Directory /cvs/extras/rpms/libopensync-plugin-kdepim added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 17:18:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 12:18:49 -0500 Subject: rpms/libopensync-plugin-kdepim/devel - New directory Message-ID: <200603021718.k22HIpc4024266@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24239/libopensync-plugin-kdepim/devel Log Message: Directory /cvs/extras/rpms/libopensync-plugin-kdepim/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 17:20:04 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 12:20:04 -0500 Subject: rpms/libopensync-plugin-kdepim Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200603021720.k22HK6JK024320@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305 Added Files: Makefile import.log Log Message: Setup of module libopensync-plugin-kdepim --- NEW FILE Makefile --- # Top level Makefile for module libopensync-plugin-kdepim all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 2 17:20:22 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 12:20:22 -0500 Subject: rpms/libopensync-plugin-kdepim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603021720.k22HKOuh024349@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libopensync-plugin-kdepim --- NEW 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 Mar 2 17:26:44 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 12:26:44 -0500 Subject: rpms/abicheck/devel abicheck.spec,1.24,1.25 Message-ID: <200603021727.k22HRGid024398@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24379 Modified Files: abicheck.spec Log Message: changes in ppc Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- abicheck.spec 2 Mar 2006 15:47:51 -0000 1.24 +++ abicheck.spec 2 Mar 2006 17:26:43 -0000 1.25 @@ -47,7 +47,15 @@ %check -make test +cd test +make public1 private1 libc_a +file public1 private1 +LD_DEBUG=files,bindings ldd -r ./public1 > output.txt 2>&1 || : +cat output.txt +LD_DEBUG=files,bindings ldd -r ./private1 > output.txt 2>&1 || : +cat output.txt +make +#make test %clean From fedora-extras-commits at redhat.com Thu Mar 2 17:41:50 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 2 Mar 2006 12:41:50 -0500 Subject: rpms/phpldapadmin/devel .cvsignore, 1.4, 1.5 phpldapadmin.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603021742.k22HgM5k024589@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24564 Modified Files: .cvsignore phpldapadmin.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Nov 2005 16:36:04 -0000 1.4 +++ .cvsignore 2 Mar 2006 17:41:50 -0000 1.5 @@ -1 +1 @@ -phpldapadmin-0.9.7.2.tar.gz +phpldapadmin-0.9.8.1.tar.gz Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- phpldapadmin.spec 15 Feb 2006 12:24:37 -0000 1.8 +++ phpldapadmin.spec 2 Mar 2006 17:41:50 -0000 1.9 @@ -1,7 +1,7 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.7.2 -Release: 3 +Version: 0.9.8.1 +Release: 1%{?dist} Group: Applications/Internet License: GPL URL: http://phpldapadmin.sourceforge.net @@ -54,8 +54,11 @@ install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name} + pushd $RPM_BUILD_ROOT%{_datadir}/%{name} rm -rf doc/ INSTALL LICENSE +rm -rf tools/ +find locale -name "*.po" -print0 | xargs -0 rm -f popd @@ -67,11 +70,6 @@ ln -s ../../../..%{_sysconfdir}/%{name} \ $RPM_BUILD_ROOT%{_datadir}/%{name}/config -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php \ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -ln -s ../../../..%{_sysconfdir}/%{name}/template_config.php \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php - cat <%{name}.conf # # %{summary} @@ -110,12 +108,13 @@ %{_sysconfdir}/%{name}/*.example %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %{_datadir}/%{name} -%doc INSTALL LICENSE doc/CREDITS doc/ChangeLog doc/hooks.sgml +%doc INSTALL LICENSE %changelog -* Wed Feb 15 2006 Dmitry Butskoy - 0.9.7.2-3 -- rebuild for FC5 +* Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 +- upgrade to 0.9.8.1 +- remove unneeded tools dir *.po files in locale dir * Fri Nov 18 2005 Dmitry Butskoy - 0.9.7.2-2 - update upstream's tarball (was changed without version increment) Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Nov 2005 12:24:00 -0000 1.5 +++ sources 2 Mar 2006 17:41:50 -0000 1.6 @@ -1 +1 @@ -ac9923e37bbc232b9ca537cfd9282691 phpldapadmin-0.9.7.2.tar.gz +6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 17:43:05 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 2 Mar 2006 12:43:05 -0500 Subject: rpms/phpldapadmin/FC-4 phpldapadmin.spec,1.9,1.10 sources,1.4,1.5 Message-ID: <200603021743.k22Hhcgj024652@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24633 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/phpldapadmin.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- phpldapadmin.spec 23 Dec 2005 16:32:04 -0000 1.9 +++ phpldapadmin.spec 2 Mar 2006 17:43:05 -0000 1.10 @@ -1,7 +1,7 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.7.2 -Release: 2%{?dist} +Version: 0.9.8.1 +Release: 1%{?dist} Group: Applications/Internet License: GPL URL: http://phpldapadmin.sourceforge.net @@ -54,8 +54,11 @@ install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name} + pushd $RPM_BUILD_ROOT%{_datadir}/%{name} rm -rf doc/ INSTALL LICENSE +rm -rf tools/ +find locale -name "*.po" -print0 | xargs -0 rm -f popd @@ -67,11 +70,6 @@ ln -s ../../../..%{_sysconfdir}/%{name} \ $RPM_BUILD_ROOT%{_datadir}/%{name}/config -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php \ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -ln -s ../../../..%{_sysconfdir}/%{name}/template_config.php \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php - cat <%{name}.conf # # %{summary} @@ -110,10 +108,14 @@ %{_sysconfdir}/%{name}/*.example %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %{_datadir}/%{name} -%doc INSTALL LICENSE doc/CREDITS doc/ChangeLog doc/hooks.sgml +%doc INSTALL LICENSE %changelog +* Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 +- upgrade to 0.9.8.1 +- remove unneeded tools dir *.po files in locale dir + * Fri Nov 18 2005 Dmitry Butskoy - 0.9.7.2-2 - update upstream's tarball (was changed without version increment) - don't treat VERSION as doc file (#173513) Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Dec 2005 16:30:51 -0000 1.4 +++ sources 2 Mar 2006 17:43:05 -0000 1.5 @@ -1 +1 @@ -ac9923e37bbc232b9ca537cfd9282691 phpldapadmin-0.9.7.2.tar.gz +6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 17:44:40 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 2 Mar 2006 12:44:40 -0500 Subject: rpms/phpldapadmin/FC-3 phpldapadmin.spec,1.8,1.9 sources,1.4,1.5 Message-ID: <200603021745.k22HjCO6024679@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24658 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/phpldapadmin.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- phpldapadmin.spec 23 Dec 2005 16:34:03 -0000 1.8 +++ phpldapadmin.spec 2 Mar 2006 17:44:39 -0000 1.9 @@ -1,7 +1,7 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.7.2 -Release: 2%{?dist} +Version: 0.9.8.1 +Release: 1%{?dist} Group: Applications/Internet License: GPL URL: http://phpldapadmin.sourceforge.net @@ -54,8 +54,11 @@ install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name} + pushd $RPM_BUILD_ROOT%{_datadir}/%{name} rm -rf doc/ INSTALL LICENSE +rm -rf tools/ +find locale -name "*.po" -print0 | xargs -0 rm -f popd @@ -67,11 +70,6 @@ ln -s ../../../..%{_sysconfdir}/%{name} \ $RPM_BUILD_ROOT%{_datadir}/%{name}/config -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php \ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -ln -s ../../../..%{_sysconfdir}/%{name}/template_config.php \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php - cat <%{name}.conf # # %{summary} @@ -110,10 +108,14 @@ %{_sysconfdir}/%{name}/*.example %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %{_datadir}/%{name} -%doc INSTALL LICENSE doc/CREDITS doc/ChangeLog doc/hooks.sgml +%doc INSTALL LICENSE %changelog +* Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 +- upgrade to 0.9.8.1 +- remove unneeded tools dir *.po files in locale dir + * Fri Nov 18 2005 Dmitry Butskoy - 0.9.7.2-2 - update upstream's tarball (was changed without version increment) - don't treat VERSION as doc file (#173513) Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Dec 2005 16:34:03 -0000 1.4 +++ sources 2 Mar 2006 17:44:39 -0000 1.5 @@ -1 +1 @@ -ac9923e37bbc232b9ca537cfd9282691 phpldapadmin-0.9.7.2.tar.gz +6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 17:47:53 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 12:47:53 -0500 Subject: rpms/abicheck/devel abicheck.spec,1.25,1.26 Message-ID: <200603021748.k22HmPCS024702@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24685 Modified Files: abicheck.spec Log Message: Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- abicheck.spec 2 Mar 2006 17:26:43 -0000 1.25 +++ abicheck.spec 2 Mar 2006 17:47:52 -0000 1.26 @@ -50,9 +50,10 @@ cd test make public1 private1 libc_a file public1 private1 -LD_DEBUG=files,bindings ldd -r ./public1 > output.txt 2>&1 || : +ldd public1 private1 +LD_DEBUG=files,bindings LD_VERBOSE=yes LD_WARN=yes LD_BIND_NOW=yes LD_TRACE_LOADED_OBJECTS=1 /lib/ld-linux.so.2 -r ./public1 > output.txt 2>&1 || : cat output.txt -LD_DEBUG=files,bindings ldd -r ./private1 > output.txt 2>&1 || : +LD_DEBUG=files,bindings LD_VERBOSE=yes LD_WARN=yes LD_BIND_NOW=yes LD_TRACE_LOADED_OBJECTS=1 /lib/ld-linux.so.2 -r ./private1 > output.txt 2>&1 || : cat output.txt make #make test From fedora-extras-commits at redhat.com Thu Mar 2 18:12:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 13:12:34 -0500 Subject: rpms/abicheck/devel abicheck-1.2-ldlinux.patch, 1.1, 1.2 abicheck.spec, 1.26, 1.27 Message-ID: <200603021813.k22ID7RU026808@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26784 Modified Files: abicheck-1.2-ldlinux.patch abicheck.spec Log Message: update dynamic linker patch abicheck-1.2-ldlinux.patch: Index: abicheck-1.2-ldlinux.patch =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck-1.2-ldlinux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abicheck-1.2-ldlinux.patch 16 Aug 2005 20:51:30 -0000 1.1 +++ abicheck-1.2-ldlinux.patch 2 Mar 2006 18:12:33 -0000 1.2 @@ -30,7 +30,7 @@ + my $ldlinux = ''; + open(DLFIND,"ldd $file0 |") or die "open: ldd: $!"; + while () { -+ /ld-linux/ and /(\S+)/ and $ldlinux = $1; ++ /(ld(-linux)*.so.\d+)/ and /(\S+)/ and $ldlinux = $1; + } + close(DLFIND); + if ( $ldlinux =~ /^$/ ) { Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- abicheck.spec 2 Mar 2006 17:47:52 -0000 1.26 +++ abicheck.spec 2 Mar 2006 18:12:33 -0000 1.27 @@ -47,16 +47,7 @@ %check -cd test -make public1 private1 libc_a -file public1 private1 -ldd public1 private1 -LD_DEBUG=files,bindings LD_VERBOSE=yes LD_WARN=yes LD_BIND_NOW=yes LD_TRACE_LOADED_OBJECTS=1 /lib/ld-linux.so.2 -r ./public1 > output.txt 2>&1 || : -cat output.txt -LD_DEBUG=files,bindings LD_VERBOSE=yes LD_WARN=yes LD_BIND_NOW=yes LD_TRACE_LOADED_OBJECTS=1 /lib/ld-linux.so.2 -r ./private1 > output.txt 2>&1 || : -cat output.txt -make -#make test +make test %clean From fedora-extras-commits at redhat.com Thu Mar 2 18:34:27 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 2 Mar 2006 13:34:27 -0500 Subject: rpms/rekall/FC-3 rekall-2.4.0-lib64.patch, NONE, 1.1 rekall-2.4.0-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.10, 1.11 Message-ID: <200603021835.k22IZ0ML027135@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27064/FC-3 Modified Files: rekall-2.4.0-64bitfix.patch rekall.spec Added Files: rekall-2.4.0-lib64.patch Log Message: real x86_64 fix rekall-2.4.0-lib64.patch: --- NEW FILE rekall-2.4.0-lib64.patch --- --- rekall-2.4.0/scons/rkBuilder.py.BAD 2006-03-02 11:48:44.000000000 -0600 +++ rekall-2.4.0/scons/rkBuilder.py 2006-03-02 11:49:02.000000000 -0600 @@ -49,8 +49,8 @@ if rkConfig.mode in [ 'qt3' ] : instDir = rkConfig.prefix binDir = destDir + os.path.join (instDir, 'bin') - libDir = destDir + os.path.join (instDir, 'lib') - pluginDir = destDir + os.path.join (instDir, 'lib') + libDir = destDir + os.path.join (instDir, 'lib64') + pluginDir = destDir + os.path.join (instDir, 'lib64') appDir = destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName) docDir = destDir + os.path.join (instDir, 'share', 'doc', 'HTML', 'en') rekallServicesDir = os.path.join (appDir, 'services') rekall-2.4.0-64bitfix.patch: Index: rekall-2.4.0-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall-2.4.0-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.4.0-64bitfix.patch 12 Jan 2006 06:17:01 -0000 1.1 +++ rekall-2.4.0-64bitfix.patch 2 Mar 2006 18:34:27 -0000 1.2 @@ -107,3 +107,57 @@ tracePoints.remove (tp) ; delete tp ; disable () ; +--- rekall-2.4.0/libs/kbase/kb_object_full.cpp.BAD 2006-03-02 10:22:13.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_object_full.cpp 2006-03-02 10:22:26.000000000 -0600 +@@ -194,11 +194,11 @@ + } + + /* Not a special case, call the ::newNode with the */ +- /* specification. The (int) cast is is there because */ ++ /* specification. The (long) cast is is there because */ + /* ::newNode is a slot which the popup menu system */ + /* invokes, whence the arguement is really a NodeSpec */ + /* structure. */ +- newNode ((int)spec) ; ++ newNode ((long)spec) ; + return true ; + } + +--- rekall-2.4.0/libs/kbase/kb_tree.cpp.BAD 2006-03-02 10:46:41.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_tree.cpp 2006-03-02 10:46:54.000000000 -0600 +@@ -365,21 +365,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + tp->insertItem + ( TR("Query tree"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + tp->insertItem + ( TR("SQL tree" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + *dflt = &nodeSpecTable ; +--- rekall-2.4.0/libs/kbase/kb_stack.cpp.BAD 2006-03-02 11:10:53.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_stack.cpp 2006-03-02 11:10:57.000000000 -0600 +@@ -431,7 +431,7 @@ + this, + SLOT (setCurrentPage(int)), + 0, +- (int)p ++ (long)p + ) ; + + ) Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rekall.spec 1 Mar 2006 23:15:06 -0000 1.10 +++ rekall.spec 2 Mar 2006 18:34:27 -0000 1.11 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -10,10 +10,11 @@ Patch2: rekall-2.4.0-gcc4.patch Patch3: rekall-2.4.0-qtfix.patch Patch4: rekall-2.4.0-noldconfig.patch +Patch5: rekall-2.4.0-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, mysql-devel, postgresql-devel BuildRequires: kdelibs-devel, desktop-file-utils, libacl-devel -BuildRequires: scons +BuildRequires: scons, flex, bison Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: rekall-common = %{version}-%{release} @@ -101,6 +102,9 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%ifarch sparc64 alpha x86_64 ia64 +%patch5 -p1 +%endif rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig %build @@ -108,8 +112,11 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-mysql-libraries=%{_libdir}/mysql" >> scons/settings.qt3 echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-qt-includes=%{_libdir}/qt-3.3/include" >> scons/settings.qt3 +echo "with-qt-libraries=%{_libdir}/qt-3.3/lib" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -311,6 +318,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Thu Mar 2 2006 Tom "spot" Callaway 2.4.0-4 +- really fix 64bit arches + * Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 - fix x86_64 From fedora-extras-commits at redhat.com Thu Mar 2 18:34:34 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 2 Mar 2006 13:34:34 -0500 Subject: rpms/rekall/FC-4 rekall-2.4.0-lib64.patch, NONE, 1.1 rekall-2.4.0-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.10, 1.11 Message-ID: <200603021835.k22IZ6GU027139@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27064/FC-4 Modified Files: rekall-2.4.0-64bitfix.patch rekall.spec Added Files: rekall-2.4.0-lib64.patch Log Message: real x86_64 fix rekall-2.4.0-lib64.patch: --- NEW FILE rekall-2.4.0-lib64.patch --- --- rekall-2.4.0/scons/rkBuilder.py.BAD 2006-03-02 11:48:44.000000000 -0600 +++ rekall-2.4.0/scons/rkBuilder.py 2006-03-02 11:49:02.000000000 -0600 @@ -49,8 +49,8 @@ if rkConfig.mode in [ 'qt3' ] : instDir = rkConfig.prefix binDir = destDir + os.path.join (instDir, 'bin') - libDir = destDir + os.path.join (instDir, 'lib') - pluginDir = destDir + os.path.join (instDir, 'lib') + libDir = destDir + os.path.join (instDir, 'lib64') + pluginDir = destDir + os.path.join (instDir, 'lib64') appDir = destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName) docDir = destDir + os.path.join (instDir, 'share', 'doc', 'HTML', 'en') rekallServicesDir = os.path.join (appDir, 'services') rekall-2.4.0-64bitfix.patch: Index: rekall-2.4.0-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall-2.4.0-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.4.0-64bitfix.patch 12 Jan 2006 06:17:07 -0000 1.1 +++ rekall-2.4.0-64bitfix.patch 2 Mar 2006 18:34:33 -0000 1.2 @@ -107,3 +107,57 @@ tracePoints.remove (tp) ; delete tp ; disable () ; +--- rekall-2.4.0/libs/kbase/kb_object_full.cpp.BAD 2006-03-02 10:22:13.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_object_full.cpp 2006-03-02 10:22:26.000000000 -0600 +@@ -194,11 +194,11 @@ + } + + /* Not a special case, call the ::newNode with the */ +- /* specification. The (int) cast is is there because */ ++ /* specification. The (long) cast is is there because */ + /* ::newNode is a slot which the popup menu system */ + /* invokes, whence the arguement is really a NodeSpec */ + /* structure. */ +- newNode ((int)spec) ; ++ newNode ((long)spec) ; + return true ; + } + +--- rekall-2.4.0/libs/kbase/kb_tree.cpp.BAD 2006-03-02 10:46:41.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_tree.cpp 2006-03-02 10:46:54.000000000 -0600 +@@ -365,21 +365,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + tp->insertItem + ( TR("Query tree"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + tp->insertItem + ( TR("SQL tree" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + *dflt = &nodeSpecTable ; +--- rekall-2.4.0/libs/kbase/kb_stack.cpp.BAD 2006-03-02 11:10:53.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_stack.cpp 2006-03-02 11:10:57.000000000 -0600 +@@ -431,7 +431,7 @@ + this, + SLOT (setCurrentPage(int)), + 0, +- (int)p ++ (long)p + ) ; + + ) Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rekall.spec 1 Mar 2006 23:15:13 -0000 1.10 +++ rekall.spec 2 Mar 2006 18:34:33 -0000 1.11 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -10,10 +10,11 @@ Patch2: rekall-2.4.0-gcc4.patch Patch3: rekall-2.4.0-qtfix.patch Patch4: rekall-2.4.0-noldconfig.patch +Patch5: rekall-2.4.0-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, mysql-devel, postgresql-devel BuildRequires: kdelibs-devel, desktop-file-utils, libacl-devel -BuildRequires: scons +BuildRequires: scons, flex, bison Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: rekall-common = %{version}-%{release} @@ -101,6 +102,9 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%ifarch sparc64 alpha x86_64 ia64 +%patch5 -p1 +%endif rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig %build @@ -108,8 +112,11 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-mysql-libraries=%{_libdir}/mysql" >> scons/settings.qt3 echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-qt-includes=%{_libdir}/qt-3.3/include" >> scons/settings.qt3 +echo "with-qt-libraries=%{_libdir}/qt-3.3/lib" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -311,6 +318,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Thu Mar 2 2006 Tom "spot" Callaway 2.4.0-4 +- really fix 64bit arches + * Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 - fix x86_64 From fedora-extras-commits at redhat.com Thu Mar 2 18:34:39 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 2 Mar 2006 13:34:39 -0500 Subject: rpms/rekall/devel rekall-2.4.0-lib64.patch, NONE, 1.1 rekall-2.4.0-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.11, 1.12 Message-ID: <200603021835.k22IZCaD027143@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27064/devel Modified Files: rekall-2.4.0-64bitfix.patch rekall.spec Added Files: rekall-2.4.0-lib64.patch Log Message: real x86_64 fix rekall-2.4.0-lib64.patch: --- NEW FILE rekall-2.4.0-lib64.patch --- --- rekall-2.4.0/scons/rkBuilder.py.BAD 2006-03-02 11:48:44.000000000 -0600 +++ rekall-2.4.0/scons/rkBuilder.py 2006-03-02 11:49:02.000000000 -0600 @@ -49,8 +49,8 @@ if rkConfig.mode in [ 'qt3' ] : instDir = rkConfig.prefix binDir = destDir + os.path.join (instDir, 'bin') - libDir = destDir + os.path.join (instDir, 'lib') - pluginDir = destDir + os.path.join (instDir, 'lib') + libDir = destDir + os.path.join (instDir, 'lib64') + pluginDir = destDir + os.path.join (instDir, 'lib64') appDir = destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName) docDir = destDir + os.path.join (instDir, 'share', 'doc', 'HTML', 'en') rekallServicesDir = os.path.join (appDir, 'services') rekall-2.4.0-64bitfix.patch: Index: rekall-2.4.0-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.4.0-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.4.0-64bitfix.patch 12 Jan 2006 06:17:13 -0000 1.1 +++ rekall-2.4.0-64bitfix.patch 2 Mar 2006 18:34:39 -0000 1.2 @@ -107,3 +107,57 @@ tracePoints.remove (tp) ; delete tp ; disable () ; +--- rekall-2.4.0/libs/kbase/kb_object_full.cpp.BAD 2006-03-02 10:22:13.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_object_full.cpp 2006-03-02 10:22:26.000000000 -0600 +@@ -194,11 +194,11 @@ + } + + /* Not a special case, call the ::newNode with the */ +- /* specification. The (int) cast is is there because */ ++ /* specification. The (long) cast is is there because */ + /* ::newNode is a slot which the popup menu system */ + /* invokes, whence the arguement is really a NodeSpec */ + /* structure. */ +- newNode ((int)spec) ; ++ newNode ((long)spec) ; + return true ; + } + +--- rekall-2.4.0/libs/kbase/kb_tree.cpp.BAD 2006-03-02 10:46:41.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_tree.cpp 2006-03-02 10:46:54.000000000 -0600 +@@ -365,21 +365,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + tp->insertItem + ( TR("Query tree"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + tp->insertItem + ( TR("SQL tree" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + *dflt = &nodeSpecTable ; +--- rekall-2.4.0/libs/kbase/kb_stack.cpp.BAD 2006-03-02 11:10:53.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_stack.cpp 2006-03-02 11:10:57.000000000 -0600 +@@ -431,7 +431,7 @@ + this, + SLOT (setCurrentPage(int)), + 0, +- (int)p ++ (long)p + ) ; + + ) Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- rekall.spec 1 Mar 2006 23:15:19 -0000 1.11 +++ rekall.spec 2 Mar 2006 18:34:39 -0000 1.12 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -10,10 +10,11 @@ Patch2: rekall-2.4.0-gcc4.patch Patch3: rekall-2.4.0-qtfix.patch Patch4: rekall-2.4.0-noldconfig.patch +Patch5: rekall-2.4.0-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, mysql-devel, postgresql-devel BuildRequires: kdelibs-devel, desktop-file-utils, libacl-devel -BuildRequires: scons +BuildRequires: scons, flex, bison Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: rekall-common = %{version}-%{release} @@ -101,6 +102,9 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%ifarch sparc64 alpha x86_64 ia64 +%patch5 -p1 +%endif rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig %build @@ -108,8 +112,11 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-mysql-libraries=%{_libdir}/mysql" >> scons/settings.qt3 echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-qt-includes=%{_libdir}/qt-3.3/include" >> scons/settings.qt3 +echo "with-qt-libraries=%{_libdir}/qt-3.3/lib" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -311,6 +318,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Thu Mar 2 2006 Tom "spot" Callaway 2.4.0-4 +- really fix 64bit arches + * Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 - fix x86_64 From fedora-extras-commits at redhat.com Thu Mar 2 19:12:21 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 2 Mar 2006 14:12:21 -0500 Subject: owners owners.list,1.695,1.696 Message-ID: <200603021912.k22JCsn2029228@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29211 Modified Files: owners.list Log Message: Take ownership of wesnoth Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.695 retrieving revision 1.696 diff -u -r1.695 -r1.696 --- owners.list 2 Mar 2006 16:52:55 -0000 1.695 +++ owners.list 2 Mar 2006 19:12:21 -0000 1.696 @@ -1388,7 +1388,7 @@ Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|wavpack|A completely open audiocodec|lemenkov at newmail.ru|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|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net +Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org| Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 19:35:24 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 2 Mar 2006 14:35:24 -0500 Subject: rpms/perl-Test-WWW-Mechanize/devel perl-Test-WWW-Mechanize.spec, 1.2, 1.3 Message-ID: <200603021935.k22JZuJG029395@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29376 Modified Files: perl-Test-WWW-Mechanize.spec Log Message: Rebuild for FC5 (perl 5.8.8). Index: perl-Test-WWW-Mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel/perl-Test-WWW-Mechanize.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-WWW-Mechanize.spec 22 Nov 2005 14:00:41 -0000 1.2 +++ perl-Test-WWW-Mechanize.spec 2 Mar 2006 19:35:24 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Test-WWW-Mechanize Version: 1.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Testing-specific WWW::Mechanize subclass Group: Development/Libraries @@ -14,7 +14,7 @@ BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) BuildRequires: perl(URI::file), perl(WWW::Mechanize) BuildRequires: perl(Carp::Assert::More), perl(HTTP::Server::Simple) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Test::WWW::Mechanize is a subclass of WWW::Mechanize that incorporates @@ -54,6 +54,9 @@ %changelog +* Thu Mar 2 2006 Jose Pedro Oliveira - 1.08-2 +- Rebuild for FC5 (perl 5.8.8). + * Tue Nov 22 2005 Jose Pedro Oliveira - 1.08-1 - Update to 1.08. From fedora-extras-commits at redhat.com Thu Mar 2 19:52:43 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 14:52:43 -0500 Subject: owners owners.list,1.696,1.697 Message-ID: <200603021953.k22JrGId029597@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29559 Modified Files: owners.list Log Message: Orphaning dillo, gkterm, gktools, and whowatch per previous maintainers request. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.696 retrieving revision 1.697 diff -u -r1.696 -r1.697 --- owners.list 2 Mar 2006 19:12:21 -0000 1.696 +++ owners.list 2 Mar 2006 19:52:43 -0000 1.697 @@ -177,7 +177,7 @@ Fedora Extras|dietlibc|Small libc implementation|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|digikam|A digital camera accessing & photo management application|mgarski at post.pl|extras-qa at fedoraproject.org| Fedora Extras|digikamimageplugins|Plugins for Digikam|rdieter at math.unl.edu|extras-qa at fedoraproject.org| -Fedora Extras|dillo|Very small and fast GUI web browser|nos at utelsystems.com|extras-qa at fedoraproject.org| +Fedora Extras|dillo|Very small and fast GUI web browser|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|diradmin|User control management tool for LDAP directories|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org| @@ -315,7 +315,7 @@ Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|extras-orphan at fedoraproject.org|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|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org| +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|jspaleta at gmail.com|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| @@ -394,7 +394,7 @@ Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|gtkterm|Serial port terminal|nos at utelsystems.com|extras-qa at fedoraproject.org| +Fedora Extras|gtkterm|Serial port terminal|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|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| @@ -1389,7 +1389,7 @@ Fedora Extras|wavpack|A completely open audiocodec|lemenkov at newmail.ru|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|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| -Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org| +Fedora Extras|whowatch|Displays informations about the users currently logged in|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wine-docs|Documentation for wine|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 19:57:00 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 2 Mar 2006 14:57:00 -0500 Subject: rpms/perl-Module-CoreList/devel perl-Module-CoreList.spec,1.9,1.10 Message-ID: <200603021957.k22JvWXi029667@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-CoreList/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29650 Modified Files: perl-Module-CoreList.spec Log Message: Rebuild for FC5 (perl 5.8.8). Index: perl-Module-CoreList.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/perl-Module-CoreList.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Module-CoreList.spec 2 Feb 2006 14:55:56 -0000 1.9 +++ perl-Module-CoreList.spec 2 Mar 2006 19:57:00 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Module-CoreList Version: 2.04 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl core modules indexed by perl versions Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Thu Mar 2 2006 Jose Pedro Oliveira - 2.04-2 +- Rebuild for FC5 (perl 5.8.8). + * Thu Feb 2 2006 Jose Pedro Oliveira - 2.04-1 - Update to 2.04. From fedora-extras-commits at redhat.com Thu Mar 2 19:59:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 2 Mar 2006 14:59:52 -0500 Subject: rpms/swatch/devel swatch.spec,1.9,1.10 Message-ID: <200603022000.k22K0OLE029753@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/swatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29726 Modified Files: swatch.spec Log Message: Rebuild for FC5 (perl 5.8.8). Index: swatch.spec =================================================================== RCS file: /cvs/extras/rpms/swatch/devel/swatch.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- swatch.spec 5 Jan 2006 16:32:46 -0000 1.9 +++ swatch.spec 2 Mar 2006 19:59:52 -0000 1.10 @@ -1,6 +1,6 @@ Name: swatch Version: 3.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for actively monitoring log files Group: Applications/File @@ -14,7 +14,7 @@ BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Date::Calc), perl(Date::Format) BuildRequires: perl(File::Tail), perl(Time::HiRes) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The Simple WATCHer is an automated monitoring tool that is capable @@ -60,6 +60,9 @@ %changelog +* Thu Mar 2 2006 Jose Pedro Oliveira - 3.1.1-5 +- Rebuild for FC5 (perl 5.8.8). + * Thu Jan 5 2006 Jose Pedro Oliveira - 3.1.1-4 - Patch supplied by John Horne: doc updates and $0 handling (#160817). From fedora-extras-commits at redhat.com Thu Mar 2 20:27:46 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Thu, 2 Mar 2006 15:27:46 -0500 Subject: rpms/R-mAr/FC-4 R-mAr.spec,1.2,1.3 Message-ID: <200603022028.k22KSJ1V031885@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-mAr/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31865 Modified Files: R-mAr.spec Log Message: * Thu Mar 2 2006 Jos?? Matos - 1.1-4 - Disable building of debugging package. Index: R-mAr.spec =================================================================== RCS file: /cvs/extras/rpms/R-mAr/FC-4/R-mAr.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- R-mAr.spec 11 Oct 2005 16:56:53 -0000 1.2 +++ R-mAr.spec 2 Mar 2006 20:27:45 -0000 1.3 @@ -3,7 +3,7 @@ Summary: R module to evaluate functions for multivariate AutoRegressive analysis Name: R-%{packname} Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL version 2 or newer Group: Applications/Engineering Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz @@ -13,6 +13,8 @@ BuildRequires: R, tetex-latex BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define debug_package %{nil} + %description R package: An R add-on package for estimation of multivariate AR models through a @@ -51,11 +53,15 @@ %changelog -* Tue Oct 11 2005 Jose' Matos - 1.1-3 +* Thu Mar 2 2006 Jos?? Matos - 1.1-4 +- Disable building of debugging package. + +* Tue Oct 11 2005 Jos?? Matos - 1.1-3 - Remove html index generation as it is now automatic. * Thu Oct 6 2005 Jos?? Matos - 1.1-2 -- Add check section, add tetex-latex to BulidRequires, and remove docs as they are packaged already. +- Add check section, add tetex-latex to BulidRequires, and remove docs + as they are packaged already. * Sun Aug 21 2005 Jos?? Matos - 1.1-1 - Prepare for FE inclusion. From fedora-extras-commits at redhat.com Thu Mar 2 20:58:37 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 15:58:37 -0500 Subject: rpms/libopensync-plugin-kdepim import.log,1.1,1.2 Message-ID: <200603022059.k22Kx9UB032238@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32204 Modified Files: import.log Log Message: auto-import libopensync-plugin-kdepim-0.18-1 on branch devel from libopensync-plugin-kdepim-0.18-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Mar 2006 17:20:03 -0000 1.1 +++ import.log 2 Mar 2006 20:58:37 -0000 1.2 @@ -0,0 +1 @@ +libopensync-plugin-kdepim-0_18-1:HEAD:libopensync-plugin-kdepim-0.18-1.src.rpm:1141333108 From fedora-extras-commits at redhat.com Thu Mar 2 20:58:43 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 15:58:43 -0500 Subject: rpms/libopensync-plugin-kdepim/devel libopensync-plugin-kdepim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603022059.k22KxFiD032242@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32204/devel Modified Files: .cvsignore sources Added Files: libopensync-plugin-kdepim.spec Log Message: auto-import libopensync-plugin-kdepim-0.18-1 on branch devel from libopensync-plugin-kdepim-0.18-1.src.rpm --- NEW FILE libopensync-plugin-kdepim.spec --- Name: libopensync-plugin-kdepim Version: 0.18 Release: 1 Summary: KDE plugin for libopensync Group: System Environment/Libraries License: GPL URL: http://www.opensync.org # see http://www.opensync.org/wiki/download Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel BuildRequires: libstdc++-devel BuildRequires: kdepim-devel BuildRequires: kdelibs-devel %description %{summary} %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libopensync-devel %description devel The %{name}-devel package contains the files needed for development with %{name}. %prep %setup -q %build %configure --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{_libdir}/opensync/plugins/kdepim_lib.la rm $RPM_BUILD_ROOT/%{_libdir}/opensync/plugins/kdepim_sync.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README %{_libdir}/opensync/plugins/kdepim*.so %changelog * Fri Nov 25 2005 Andreas Bierfert 0.18-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2006 17:20:09 -0000 1.1 +++ .cvsignore 2 Mar 2006 20:58:42 -0000 1.2 @@ -0,0 +1 @@ +libopensync-plugin-kdepim-0.18.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2006 17:20:09 -0000 1.1 +++ sources 2 Mar 2006 20:58:42 -0000 1.2 @@ -0,0 +1 @@ +96c43911a0fbdaff4920bbc0f4cd3816 libopensync-plugin-kdepim-0.18.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 21:06:59 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Thu, 2 Mar 2006 16:06:59 -0500 Subject: rpms/R-mAr/devel R-mAr.spec,1.2,1.3 Message-ID: <200603022107.k22L7VJ7001733@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-mAr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1704 Modified Files: R-mAr.spec Log Message: * Thu Mar 2 2006 Jos?? Matos - 1.1-4 - Disable building of debugging package. Index: R-mAr.spec =================================================================== RCS file: /cvs/extras/rpms/R-mAr/devel/R-mAr.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- R-mAr.spec 11 Oct 2005 16:56:12 -0000 1.2 +++ R-mAr.spec 2 Mar 2006 21:06:58 -0000 1.3 @@ -3,7 +3,7 @@ Summary: R module to evaluate functions for multivariate AutoRegressive analysis Name: R-%{packname} Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL version 2 or newer Group: Applications/Engineering Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz @@ -13,6 +13,8 @@ BuildRequires: R, tetex-latex BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define debug_package %{nil} + %description R package: An R add-on package for estimation of multivariate AR models through a @@ -51,11 +53,15 @@ %changelog -* Tue Oct 11 2005 Jose' Matos - 1.1-3 +* Thu Mar 2 2006 Jos?? Matos - 1.1-4 +- Disable building of debugging package. + +* Tue Oct 11 2005 Jos?? Matos - 1.1-3 - Remove html index generation as it is now automatic. * Thu Oct 6 2005 Jos?? Matos - 1.1-2 -- Add check section, add tetex-latex to BulidRequires, and remove docs as they are packaged already. +- Add check section, add tetex-latex to BulidRequires, and remove docs + as they are packaged already. * Sun Aug 21 2005 Jos?? Matos - 1.1-1 - Prepare for FE inclusion. From fedora-extras-commits at redhat.com Thu Mar 2 21:12:27 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 2 Mar 2006 16:12:27 -0500 Subject: rpms/bash-completion/devel .cvsignore, 1.9, 1.10 bash-completion.spec, 1.15, 1.16 sources, 1.9, 1.10 bash-completion-20050721-bash31quoting.patch, 1.1, NONE bash-completion-20050721-cvs-stat.patch, 1.1, NONE bash-completion-20050721-mtr.patch, 1.1, NONE bash-completion.profile, 1.4, NONE Message-ID: <200603022113.k22LD7Rm001887@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1818 Modified Files: .cvsignore bash-completion.spec sources Removed Files: bash-completion-20050721-bash31quoting.patch bash-completion-20050721-cvs-stat.patch bash-completion-20050721-mtr.patch bash-completion.profile Log Message: * Thu Mar 2 2006 Ville Skytt?? - 20060301-1 - 20060301, patches and profile.d scriptlet applied/included upstream. - Convert docs to UTF-8. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 22 Jul 2005 06:51:53 -0000 1.9 +++ .cvsignore 2 Mar 2006 21:12:24 -0000 1.10 @@ -1 +1 @@ -bash-completion-20050721.tar.bz2 +bash-completion-20060301.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- bash-completion.spec 8 Feb 2006 16:55:38 -0000 1.15 +++ bash-completion.spec 2 Mar 2006 21:12:24 -0000 1.16 @@ -1,19 +1,15 @@ Name: bash-completion -Version: 20050721 -Release: 4%{?dist} +Version: 20060301 +Release: 1%{?dist} Summary: Programmable completion for Bash Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 -Source1: %{name}.profile Source2: %{name}-mock Source3: %{name}-repomanage Source4: %{name}-plague-client -Patch0: %{name}-20050721-cvs-stat.patch -Patch1: %{name}-20050721-bash31quoting.patch -Patch2: %{name}-20050721-mtr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,9 +22,7 @@ %prep %setup -q -n bash_completion -%patch0 -%patch1 -p1 -%patch2 +f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f install -pm 644 %{SOURCE2} contrib/mock install -pm 644 %{SOURCE3} contrib/plague-client install -pm 644 %{SOURCE3} contrib/repomanage @@ -41,8 +35,7 @@ rm -rf $RPM_BUILD_ROOT %{name}-ghosts.list install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -pm 644 bash_completion $RPM_BUILD_ROOT%{_sysconfdir} -install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/bash_completion.sh +install -pm 644 bash_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name} install -pm 644 contrib/* $RPM_BUILD_ROOT%{_datadir}/%{name} install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d @@ -81,7 +74,6 @@ %bashcomp_trigger ruby-ri ri %bashcomp_trigger sbcl %bashcomp_trigger snownews -%bashcomp_trigger subversion %bashcomp_trigger unace %bashcomp_trigger unixODBC isql %bashcomp_trigger unrar @@ -98,6 +90,10 @@ %changelog +* Thu Mar 2 2006 Ville Skytt?? - 20060301-1 +- 20060301, patches and profile.d scriptlet applied/included upstream. +- Convert docs to UTF-8. + * Wed Feb 8 2006 Ville Skytt?? - 20050721-4 - Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod). - Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Jul 2005 06:51:53 -0000 1.9 +++ sources 2 Mar 2006 21:12:24 -0000 1.10 @@ -1 +1 @@ -4de9f0dee0663f08b5e24f64490e642e bash-completion-20050721.tar.bz2 +ed95a89f57357a42b8e4eb95487bf9d0 bash-completion-20060301.tar.bz2 --- bash-completion-20050721-bash31quoting.patch DELETED --- --- bash-completion-20050721-cvs-stat.patch DELETED --- --- bash-completion-20050721-mtr.patch DELETED --- --- bash-completion.profile DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 21:15:59 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 2 Mar 2006 16:15:59 -0500 Subject: rpms/mediawiki/devel .cvsignore, 1.2, 1.3 mediawiki.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603022116.k22LGVWu001972@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/mediawiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1949 Modified Files: .cvsignore mediawiki.spec sources Log Message: * Thu Mar 02 2006 Roozbeh Pournader - 1.5.7-1 - Update to upstream 1.5.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Feb 2006 09:00:43 -0000 1.2 +++ .cvsignore 2 Mar 2006 21:15:59 -0000 1.3 @@ -1 +1 @@ -mediawiki-1.5.6.tar.gz +mediawiki-1.5.7.tar.gz Index: mediawiki.spec =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mediawiki.spec 13 Feb 2006 19:08:06 -0000 1.3 +++ mediawiki.spec 2 Mar 2006 21:15:59 -0000 1.4 @@ -1,8 +1,8 @@ %define wikidir %{_var}/www/mediawiki Name: mediawiki -Version: 1.5.6 -Release: 6%{?dist} +Version: 1.5.7 +Release: 1%{?dist} Summary: The PHP-based wiki software behind Wikipedia Group: Applications/Internet @@ -89,6 +89,9 @@ %changelog +* Thu Mar 02 2006 Roozbeh Pournader - 1.5.7-1 +- Update to upstream 1.5.7 + * Mon Feb 13 2006 Roozbeh Pournader - 1.5.6-6 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Feb 2006 09:00:43 -0000 1.2 +++ sources 2 Mar 2006 21:15:59 -0000 1.3 @@ -1 +1 @@ -adcb318d812af2d2637374a8aadc79c1 mediawiki-1.5.6.tar.gz +0a2347e2422006d8f75479b06c1963d8 mediawiki-1.5.7.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 21:29:22 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 2 Mar 2006 16:29:22 -0500 Subject: rpms/thinkpad-kmod-common/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 thinkpad-kmod-common.spec, 1.1, 1.2 Message-ID: <200603022129.k22LTuk9002356@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2294 Modified Files: .cvsignore sources thinkpad-kmod-common.spec Log Message: * Sat Feb 25 2006 Ville Skytt?? - 5.9-1 - 5.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jan 2006 22:14:12 -0000 1.2 +++ .cvsignore 2 Mar 2006 21:29:22 -0000 1.3 @@ -1 +1 @@ -thinkpad_5.8.tar.gz +thinkpad-5.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jan 2006 22:14:12 -0000 1.2 +++ sources 2 Mar 2006 21:29:22 -0000 1.3 @@ -1 +1 @@ -288ab19587bb3a8a4d6097448059b4c6 thinkpad_5.8.tar.gz +9cd4e86277bb7baeca97e93f57f49e87 thinkpad-5.9.tar.gz Index: thinkpad-kmod-common.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/thinkpad-kmod-common.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- thinkpad-kmod-common.spec 26 Jan 2006 22:14:12 -0000 1.1 +++ thinkpad-kmod-common.spec 2 Mar 2006 21:29:22 -0000 1.2 @@ -2,14 +2,14 @@ %define kmod_name thinkpad Name: %{kmod_name}-kmod-common -Version: 5.8 -Release: 5%{?dist} -Summary: Supplemental kernel modules for ThinkPad?? laptop computers +Version: 5.9 +Release: 1%{?dist} +Summary: Common files for supplemental ThinkPad?? kernel modules License: GPL Group: System Environment/Kernel URL: http://tpctl.sourceforge.net/ -Source0: http://download.sf.net/tpctl/%{kmod_name}_%{version}.tar.gz +Source0: http://download.sf.net/tpctl/%{kmod_name}-%{version}.tar.gz Source1: %{name}-console.perms Source2: %{name}.modules BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,6 +55,9 @@ %changelog +* Sat Feb 25 2006 Ville Skytt?? - 5.9-1 +- 5.9. + * Tue Dec 27 2005 Ville Skytt?? - 5.8-5 - Rename to thinkpad-kmod-common. From fedora-extras-commits at redhat.com Thu Mar 2 21:31:19 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 16:31:19 -0500 Subject: rpms/libopensync-plugin-kdepim/devel libopensync-plugin-kdepim.spec, 1.1, 1.2 Message-ID: <200603022131.k22LVpOM002676@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2394 Modified Files: libopensync-plugin-kdepim.spec Log Message: - add dist Index: libopensync-plugin-kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libopensync-plugin-kdepim.spec 2 Mar 2006 20:58:42 -0000 1.1 +++ libopensync-plugin-kdepim.spec 2 Mar 2006 21:31:18 -0000 1.2 @@ -1,6 +1,6 @@ Name: libopensync-plugin-kdepim Version: 0.18 -Release: 1 +Release: 1%{?dist} Summary: KDE plugin for libopensync Group: System Environment/Libraries @@ -56,5 +56,8 @@ %{_libdir}/opensync/plugins/kdepim*.so %changelog +* Thu Mar 02 2006 Andreas Bierfert +- add dist + * Fri Nov 25 2005 Andreas Bierfert 0.18-1 - initial version From fedora-extras-commits at redhat.com Thu Mar 2 21:29:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 16:29:34 -0500 Subject: rpms/gnome-telnet/devel gnome-telnet.spec,1.6,1.7 Message-ID: <200603022132.k22LWauB002787@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gnome-telnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gnome-telnet/devel Modified Files: gnome-telnet.spec Log Message: Build disabled. Package is without maintainer. Index: gnome-telnet.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-telnet/devel/gnome-telnet.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnome-telnet.spec 6 Apr 2005 22:11:38 -0000 1.6 +++ gnome-telnet.spec 2 Mar 2006 21:29:33 -0000 1.7 @@ -19,6 +19,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/tetex-armtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/tetex-armtex/devel Modified Files: tetex-armtex.spec Log Message: Build disabled. Package is without maintainer. Index: tetex-armtex.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-armtex/devel/tetex-armtex.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tetex-armtex.spec 6 Apr 2005 22:13:32 -0000 1.4 +++ tetex-armtex.spec 2 Mar 2006 21:32:06 -0000 1.5 @@ -31,6 +31,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/rpmproc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/rpmproc/devel Modified Files: rpmproc.spec Log Message: Build disabled. Package is without maintainer. Index: rpmproc.spec =================================================================== RCS file: /cvs/extras/rpms/rpmproc/devel/rpmproc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpmproc.spec 6 Apr 2005 22:13:31 -0000 1.4 +++ rpmproc.spec 2 Mar 2006 21:31:37 -0000 1.5 @@ -25,6 +25,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gonvert/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gonvert/devel Modified Files: gonvert.spec Log Message: Build disabled. Package is without maintainer. Index: gonvert.spec =================================================================== RCS file: /cvs/extras/rpms/gonvert/devel/gonvert.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gonvert.spec 6 Apr 2005 22:11:38 -0000 1.6 +++ gonvert.spec 2 Mar 2006 21:30:03 -0000 1.7 @@ -25,6 +25,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/freedroidrpg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/freedroidrpg/devel Modified Files: freedroidrpg.spec Log Message: Build disabled. Package is without maintainer. Index: freedroidrpg.spec =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- freedroidrpg.spec 22 Sep 2005 21:17:13 -0000 1.11 +++ freedroidrpg.spec 2 Mar 2006 21:29:04 -0000 1.12 @@ -26,6 +26,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/cvsup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/cvsup/devel Modified Files: cvsup.spec Log Message: Build disabled. Package is without maintainer. Index: cvsup.spec =================================================================== RCS file: /cvs/extras/rpms/cvsup/devel/cvsup.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cvsup.spec 23 Jan 2006 21:23:05 -0000 1.9 +++ cvsup.spec 2 Mar 2006 21:28:35 -0000 1.10 @@ -83,6 +83,13 @@ This package contains the cvsupd server program. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/screem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/screem/devel Modified Files: screem.spec Log Message: Build disabled. Package is without maintainer. Index: screem.spec =================================================================== RCS file: /cvs/extras/rpms/screem/devel/screem.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- screem.spec 7 Jul 2005 20:57:33 -0000 1.5 +++ screem.spec 2 Mar 2006 21:31:43 -0000 1.6 @@ -40,6 +40,13 @@ parsing, page templates and publishing of files are also supported. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/nget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/nget/devel Modified Files: nget.spec Log Message: Build disabled. Package is without maintainer. Index: nget.spec =================================================================== RCS file: /cvs/extras/rpms/nget/devel/nget.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nget.spec 22 May 2005 22:53:46 -0000 1.7 +++ nget.spec 2 Mar 2006 21:31:08 -0000 1.8 @@ -22,6 +22,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gtkglarea2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gtkglarea2/devel Modified Files: gtkglarea2.spec Log Message: Build disabled. Package is without maintainer. Index: gtkglarea2.spec =================================================================== RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gtkglarea2.spec 17 Feb 2006 21:33:55 -0000 1.12 +++ gtkglarea2.spec 2 Mar 2006 21:30:09 -0000 1.13 @@ -33,6 +33,13 @@ software development. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/tetex-font-tipa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/tetex-font-tipa/devel Modified Files: tetex-font-tipa.spec Log Message: Build disabled. Package is without maintainer. Index: tetex-font-tipa.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-font-tipa/devel/tetex-font-tipa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tetex-font-tipa.spec 12 Nov 2005 20:11:32 -0000 1.7 +++ tetex-font-tipa.spec 2 Mar 2006 21:32:12 -0000 1.8 @@ -35,6 +35,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/dillo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/dillo/devel Modified Files: dillo.spec Log Message: Build disabled. Package is without maintainer. Index: dillo.spec =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/dillo.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dillo.spec 6 Apr 2005 22:11:36 -0000 1.8 +++ dillo.spec 2 Mar 2006 21:28:41 -0000 1.9 @@ -27,6 +27,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/parchive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/parchive/devel Modified Files: parchive.spec Log Message: Build disabled. Package is without maintainer. Index: parchive.spec =================================================================== RCS file: /cvs/extras/rpms/parchive/devel/parchive.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- parchive.spec 23 May 2005 00:03:36 -0000 1.8 +++ parchive.spec 2 Mar 2006 21:31:14 -0000 1.9 @@ -17,6 +17,13 @@ recovery of any 'X' volumes for 'X' parity volumes present. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gtkterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gtkterm/devel Modified Files: gtkterm.spec Log Message: Build disabled. Package is without maintainer. Index: gtkterm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/gtkterm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gtkterm.spec 6 Apr 2005 22:12:00 -0000 1.6 +++ gtkterm.spec 2 Mar 2006 21:30:15 -0000 1.7 @@ -18,6 +18,13 @@ Similar to minicom or hyperterminal. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gurlchecker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gurlchecker/devel Modified Files: gurlchecker.spec Log Message: Build disabled. Package is without maintainer. Index: gurlchecker.spec =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gurlchecker.spec 25 May 2005 21:39:31 -0000 1.7 +++ gurlchecker.spec 2 Mar 2006 21:30:20 -0000 1.8 @@ -23,6 +23,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gkrellm-themes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gkrellm-themes/devel Modified Files: gkrellm-themes.spec Log Message: Build disabled. Package is without maintainer. Index: gkrellm-themes.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-themes/devel/gkrellm-themes.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gkrellm-themes.spec 17 Jan 2006 18:35:40 -0000 1.7 +++ gkrellm-themes.spec 2 Mar 2006 21:29:16 -0000 1.8 @@ -23,6 +23,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/arc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/arc/devel Modified Files: arc.spec Log Message: Build disabled. Package is without maintainer. Index: arc.spec =================================================================== RCS file: /cvs/extras/rpms/arc/devel/arc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- arc.spec 13 Oct 2005 19:10:30 -0000 1.12 +++ arc.spec 2 Mar 2006 21:28:17 -0000 1.13 @@ -15,6 +15,13 @@ but useful if you have old .arc files you need to unpack. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/tetex-lgrind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/tetex-lgrind/devel Modified Files: tetex-lgrind.spec Log Message: Build disabled. Package is without maintainer. Index: tetex-lgrind.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-lgrind/devel/tetex-lgrind.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- tetex-lgrind.spec 23 Aug 2005 13:21:32 -0000 1.13 +++ tetex-lgrind.spec 2 Mar 2006 21:32:18 -0000 1.14 @@ -34,6 +34,13 @@ MODEL, MatLab, and Russell. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/perl-Net-SCP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/perl-Net-SCP/devel Modified Files: perl-Net-SCP.spec Log Message: Build disabled. Package is without maintainer. Index: perl-Net-SCP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SCP/devel/perl-Net-SCP.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Net-SCP.spec 6 Apr 2005 22:13:07 -0000 1.6 +++ perl-Net-SCP.spec 2 Mar 2006 21:31:19 -0000 1.7 @@ -21,6 +21,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/manedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/manedit/devel Modified Files: manedit.spec Log Message: Build disabled. Package is without maintainer. Index: manedit.spec =================================================================== RCS file: /cvs/extras/rpms/manedit/devel/manedit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- manedit.spec 14 Apr 2005 13:29:12 -0000 1.11 +++ manedit.spec 2 Mar 2006 21:30:45 -0000 1.12 @@ -24,6 +24,13 @@ and requires the X Window Systems. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gnome-themes-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gnome-themes-extras/devel Modified Files: gnome-themes-extras.spec Log Message: Build disabled. Package is without maintainer. Index: gnome-themes-extras.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/gnome-themes-extras.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnome-themes-extras.spec 13 Apr 2005 21:50:00 -0000 1.11 +++ gnome-themes-extras.spec 2 Mar 2006 21:29:57 -0000 1.12 @@ -26,6 +26,13 @@ an extra set of themes that are not only functional, but also eye catching. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/cgoban/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/cgoban/devel Modified Files: cgoban.spec Log Message: Build disabled. Package is without maintainer. Index: cgoban.spec =================================================================== RCS file: /cvs/extras/rpms/cgoban/devel/cgoban.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cgoban.spec 2 Mar 2006 02:57:34 -0000 1.9 +++ cgoban.spec 2 Mar 2006 21:28:23 -0000 1.10 @@ -22,6 +22,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/sirius/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/sirius/devel Modified Files: sirius.spec Log Message: Build disabled. Package is without maintainer. Index: sirius.spec =================================================================== RCS file: /cvs/extras/rpms/sirius/devel/sirius.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sirius.spec 23 May 2005 00:12:04 -0000 1.9 +++ sirius.spec 2 Mar 2006 21:31:49 -0000 1.10 @@ -33,6 +33,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gdeskcal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gdeskcal/devel Modified Files: gdeskcal.spec Log Message: Build disabled. Package is without maintainer. Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gdeskcal.spec 6 Apr 2005 22:11:38 -0000 1.7 +++ gdeskcal.spec 2 Mar 2006 21:29:10 -0000 1.8 @@ -26,6 +26,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/cksfv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/cksfv/devel Modified Files: cksfv.spec Log Message: Build disabled. Package is without maintainer. Index: cksfv.spec =================================================================== RCS file: /cvs/extras/rpms/cksfv/devel/cksfv.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cksfv.spec 23 Jul 2005 17:12:03 -0000 1.8 +++ cksfv.spec 2 Mar 2006 21:28:29 -0000 1.9 @@ -16,6 +16,13 @@ checksums. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/tetex-arabtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/tetex-arabtex/devel Modified Files: tetex-arabtex.spec Log Message: Build disabled. Package is without maintainer. Index: tetex-arabtex.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-arabtex/devel/tetex-arabtex.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tetex-arabtex.spec 12 Nov 2005 20:23:12 -0000 1.6 +++ tetex-arabtex.spec 2 Mar 2006 21:32:00 -0000 1.7 @@ -33,6 +33,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/mknbi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/mknbi/devel Modified Files: mknbi.spec Log Message: Build disabled. Package is without maintainer. Index: mknbi.spec =================================================================== RCS file: /cvs/extras/rpms/mknbi/devel/mknbi.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mknbi.spec 4 May 2005 04:06:16 -0000 1.9 +++ mknbi.spec 2 Mar 2006 21:30:51 -0000 1.10 @@ -19,6 +19,13 @@ images, Linux kernels, FreeDOS and DOS bootable floppy images. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/monkey-bubble/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/monkey-bubble/devel Modified Files: monkey-bubble.spec Log Message: Build disabled. Package is without maintainer. Index: monkey-bubble.spec =================================================================== RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- monkey-bubble.spec 3 Mar 2005 23:01:24 -0000 1.2 +++ monkey-bubble.spec 2 Mar 2006 21:30:57 -0000 1.3 @@ -26,6 +26,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gktools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gktools/devel Modified Files: gktools.spec Log Message: Build disabled. Package is without maintainer. Index: gktools.spec =================================================================== RCS file: /cvs/extras/rpms/gktools/devel/gktools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gktools.spec 6 Apr 2005 22:11:38 -0000 1.5 +++ gktools.spec 2 Mar 2006 21:29:21 -0000 1.6 @@ -19,6 +19,13 @@ gktickets - GUI version of klist for listing and tracking kerberos tickets %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/elmo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/elmo/devel Modified Files: elmo.spec Log Message: Build disabled. Package is without maintainer. Index: elmo.spec =================================================================== RCS file: /cvs/extras/rpms/elmo/devel/elmo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- elmo.spec 13 Nov 2005 17:09:51 -0000 1.7 +++ elmo.spec 2 Mar 2006 21:28:58 -0000 1.8 @@ -20,6 +20,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/themes-backgrounds-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/themes-backgrounds-gnome/devel Modified Files: themes-backgrounds-gnome.spec Log Message: Build disabled. Package is without maintainer. Index: themes-backgrounds-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- themes-backgrounds-gnome.spec 14 Feb 2006 09:07:49 -0000 1.10 +++ themes-backgrounds-gnome.spec 2 Mar 2006 21:32:24 -0000 1.11 @@ -14,6 +14,13 @@ Assorted Backgrounds from art.gnome.org. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/perl-Net-SSH/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/perl-Net-SSH/devel Modified Files: perl-Net-SSH.spec Log Message: Build disabled. Package is without maintainer. Index: perl-Net-SSH.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SSH/devel/perl-Net-SSH.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Net-SSH.spec 6 Apr 2005 22:13:07 -0000 1.7 +++ perl-Net-SSH.spec 2 Mar 2006 21:31:25 -0000 1.8 @@ -25,6 +25,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/hping2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/hping2/devel Modified Files: hping2.spec Log Message: Build disabled. Package is without maintainer. Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/devel/hping2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hping2.spec 8 Feb 2006 14:47:29 -0000 1.8 +++ hping2.spec 2 Mar 2006 21:30:26 -0000 1.9 @@ -21,6 +21,13 @@ in order to transfer files under supported protocols. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/prozilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/prozilla/devel Modified Files: prozilla.spec Log Message: Build disabled. Package is without maintainer. Index: prozilla.spec =================================================================== RCS file: /cvs/extras/rpms/prozilla/devel/prozilla.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- prozilla.spec 20 Jan 2006 10:00:32 -0000 1.12 +++ prozilla.spec 2 Mar 2006 21:31:31 -0000 1.13 @@ -27,6 +27,13 @@ fastest ping times. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/libzvt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/libzvt/devel Modified Files: libzvt.spec Log Message: Build disabled. Package is without maintainer. Index: libzvt.spec =================================================================== RCS file: /cvs/extras/rpms/libzvt/devel/libzvt.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libzvt.spec 22 May 2005 23:54:31 -0000 1.7 +++ libzvt.spec 2 Mar 2006 21:30:32 -0000 1.8 @@ -40,6 +40,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gnome-password-generator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gnome-password-generator/devel Modified Files: gnome-password-generator.spec Log Message: Build disabled. Package is without maintainer. Index: gnome-password-generator.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-password-generator/devel/gnome-password-generator.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnome-password-generator.spec 6 Apr 2005 22:11:38 -0000 1.5 +++ gnome-password-generator.spec 2 Mar 2006 21:29:27 -0000 1.6 @@ -27,6 +27,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/whowatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/whowatch/devel Modified Files: whowatch.spec Log Message: Build disabled. Package is without maintainer. Index: whowatch.spec =================================================================== RCS file: /cvs/extras/rpms/whowatch/devel/whowatch.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- whowatch.spec 8 Apr 2005 06:44:32 -0000 1.8 +++ whowatch.spec 2 Mar 2006 21:32:29 -0000 1.9 @@ -22,6 +22,13 @@ selected process. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/tdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/tdl/devel Modified Files: tdl.spec Log Message: Build disabled. Package is without maintainer. Index: tdl.spec =================================================================== RCS file: /cvs/extras/rpms/tdl/devel/tdl.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tdl.spec 23 May 2005 00:15:08 -0000 1.9 +++ tdl.spec 2 Mar 2006 21:31:55 -0000 1.10 @@ -19,6 +19,13 @@ the command line, or enter an interactive mode which uses the readline library. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/netdiag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/netdiag/devel Modified Files: netdiag.spec Log Message: Build disabled. Package is without maintainer. Index: netdiag.spec =================================================================== RCS file: /cvs/extras/rpms/netdiag/devel/netdiag.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- netdiag.spec 26 May 2005 15:44:35 -0000 1.9 +++ netdiag.spec 2 Mar 2006 21:31:02 -0000 1.10 @@ -22,6 +22,13 @@ %prep +cat< Author: roozbeh Update of /cvs/extras/rpms/mediawiki/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2078 Modified Files: .cvsignore mediawiki.spec sources Log Message: * Thu Mar 02 2006 Roozbeh Pournader - 1.5.7-1 - Update to upstream 1.5.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Feb 2006 09:00:43 -0000 1.2 +++ .cvsignore 2 Mar 2006 21:33:16 -0000 1.3 @@ -1 +1 @@ -mediawiki-1.5.6.tar.gz +mediawiki-1.5.7.tar.gz Index: mediawiki.spec =================================================================== RCS file: /cvs/extras/rpms/mediawiki/FC-4/mediawiki.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mediawiki.spec 6 Feb 2006 17:31:08 -0000 1.2 +++ mediawiki.spec 2 Mar 2006 21:33:16 -0000 1.3 @@ -1,8 +1,8 @@ %define wikidir %{_var}/www/mediawiki Name: mediawiki -Version: 1.5.6 -Release: 5%{?dist} +Version: 1.5.7 +Release: 1%{?dist} Summary: The PHP-based wiki software behind Wikipedia Group: Applications/Internet @@ -89,6 +89,12 @@ %changelog +* Thu Mar 02 2006 Roozbeh Pournader - 1.5.7-1 +- Update to upstream 1.5.7 + +* Mon Feb 13 2006 Roozbeh Pournader - 1.5.6-6 +- Rebuild for Fedora Extras 5 + * Mon Feb 06 2006 Roozbeh Pournader - 1.5.6-5 - Put internal doc files in the right directory, renaming it back to docs (#180177) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Feb 2006 09:00:43 -0000 1.2 +++ sources 2 Mar 2006 21:33:16 -0000 1.3 @@ -1 +1 @@ -adcb318d812af2d2637374a8aadc79c1 mediawiki-1.5.6.tar.gz +0a2347e2422006d8f75479b06c1963d8 mediawiki-1.5.7.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 21:36:45 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Mar 2006 16:36:45 -0500 Subject: rpms/hdf5/FC-3 hdf5-1.6.5-h5diff_attr.patch, NONE, 1.1 hdf5-1.6.4-h5diff_attr.patch, 1.1, NONE Message-ID: <200603022136.k22LalX2002980@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2967 Added Files: hdf5-1.6.5-h5diff_attr.patch Removed Files: hdf5-1.6.4-h5diff_attr.patch Log Message: Update patch to fix h5diff_attr.c to 1.6.5 hdf5-1.6.5-h5diff_attr.patch: --- NEW FILE hdf5-1.6.5-h5diff_attr.patch --- --- hdf5-1.6.5/tools/lib/h5diff_attr.c.orig 2005-12-21 12:08:45.000000000 -0700 +++ hdf5-1.6.5/tools/lib/h5diff_attr.c 2005-12-21 12:11:17.000000000 -0700 @@ -61,8 +61,8 @@ int rank2; /* rank of dataset */ hsize_t dims1[H5S_MAX_RANK];/* dimensions of dataset */ hsize_t dims2[H5S_MAX_RANK];/* dimensions of dataset */ - char name1[255]; - char name2[255]; + char name1[255],np1[512]; + char name2[255],np2[512]; int n1, n2, i, j; int ret=0; hsize_t nfound; @@ -196,21 +196,21 @@ * array compare *------------------------------------------------------------------------- */ - sprintf(name1,"%s of <%s>",name1,path1); - sprintf(name2,"%s of <%s>",name2,path2); + snprintf(np1,sizeof(np1),"%s of <%s>",name1,path1); + snprintf(np2,sizeof(np2),"%s of <%s>",name2,path2); /* always print name */ if (options->m_verbose) { - printf( "Attribute: <%s> and <%s>\n",name1,name2); + printf( "Attribute: <%s> and <%s>\n",np1,np2); nfound = diff_array(buf1, buf2, nelmts1, rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -230,8 +230,8 @@ rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -239,15 +239,15 @@ options->m_quiet=0; if (nfound) { - printf( "Attribute: <%s> and <%s>\n",name1,name2); + printf( "Attribute: <%s> and <%s>\n",np1,np2); nfound = diff_array(buf1, buf2, nelmts1, rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -263,8 +263,8 @@ rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); --- hdf5-1.6.4-h5diff_attr.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 21:37:24 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 2 Mar 2006 16:37:24 -0500 Subject: rpms/thinkpad-kmod/devel thinkpad-kmod-5.9-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 thinkpad-kmod.spec, 1.2, 1.3 thinkpad-kmod-2615pm.patch, 1.1, NONE thinkpad-kmod-percpu.patch, 1.1, NONE Message-ID: <200603022137.k22LbvWY003036@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3007 Modified Files: .cvsignore sources thinkpad-kmod.spec Added Files: thinkpad-kmod-5.9-build.patch Removed Files: thinkpad-kmod-2615pm.patch thinkpad-kmod-percpu.patch Log Message: * Sat Feb 25 2006 Ville Skytt?? - 5.9-1 - 5.9. thinkpad-kmod-5.9-build.patch: --- NEW FILE thinkpad-kmod-5.9-build.patch --- --- thinkpad-5.9/2.6/drivers/Makefile~ 2005-12-22 14:23:16.000000000 +0200 +++ thinkpad-5.9/2.6/drivers/Makefile 2006-02-25 17:41:12.000000000 +0200 @@ -7,7 +7,7 @@ endif ifndef EXTRA_CFLAGS -EXTRA_CFLAGS := -Wall -Wcast-align -Wstrict-prototypes -O2 -DLINUX -I$(SUBDIRS)/../include +EXTRA_CFLAGS := -Wall -Wcast-align -Wstrict-prototypes -DLINUX -I$(SUBDIRS)/../include endif obj-m := thinkpad.o smapi.o superio.o rtcmosram.o @@ -28,10 +28,9 @@ install: if [ ! -d $(MODULESROOT)/thinkpad ]; then mkdir -p -m 755 $(MODULESROOT)/thinkpad ; fi - install -m 444 -o 0 -g 0 thinkpad.ko $(MODULESROOT)/thinkpad/thinkpad.ko - install -m 444 -o 0 -g 0 smapi.ko $(MODULESROOT)/thinkpad/smapi.ko - install -m 444 -o 0 -g 0 superio.ko $(MODULESROOT)/thinkpad/superio.ko - install -m 444 -o 0 -g 0 rtcmosram.ko $(MODULESROOT)/thinkpad/rtcmosram.ko - depmod -a + install -m 744 thinkpad.ko $(MODULESROOT)/thinkpad/thinkpad.ko + install -m 744 smapi.ko $(MODULESROOT)/thinkpad/smapi.ko + install -m 744 superio.ko $(MODULESROOT)/thinkpad/superio.ko + install -m 744 rtcmosram.ko $(MODULESROOT)/thinkpad/rtcmosram.ko .PHONY: default clean install Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jan 2006 22:21:45 -0000 1.2 +++ .cvsignore 2 Mar 2006 21:37:24 -0000 1.3 @@ -1 +1 @@ -thinkpad_5.8.tar.gz +thinkpad-5.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jan 2006 22:21:45 -0000 1.2 +++ sources 2 Mar 2006 21:37:24 -0000 1.3 @@ -1 +1 @@ -288ab19587bb3a8a4d6097448059b4c6 thinkpad_5.8.tar.gz +9cd4e86277bb7baeca97e93f57f49e87 thinkpad-5.9.tar.gz Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- thinkpad-kmod.spec 28 Jan 2006 12:51:08 -0000 1.2 +++ thinkpad-kmod.spec 2 Mar 2006 21:37:24 -0000 1.3 @@ -9,13 +9,12 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules -Version: 5.8 -Release: 10.%(echo %{kverrel} | tr - _) +Version: 5.9 +Release: 1.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ -Source0: http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz -Patch0: %{name}-percpu.patch -Patch1: %{name}-2615pm.patch +Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz +Patch0: %{name}-5.9-build.patch License: GPL Group: System Environment/Kernel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,12 +34,8 @@ #sleep 5 %setup -q -T -c -a 0 -cd %{kmod_name}-%{version} -%{__perl} -pi -e 's|-O2\s+||' 2.6/drivers/Makefile -sed -i 's|depmod -a|echo depmod -a disabled|' 2.6/drivers/Makefile %patch0 -p0 -%patch1 -p0 -cd .. +sed -i /enable_thinkpadpm/d %{kmod_name}-%{version}/2.6/drivers/thinkpad.c for kvariant in %{kvariants} ; do cp -a %{kmod_name}-%{version}* _kmod_build_$kvariant done @@ -59,7 +54,6 @@ make -C _kmod_build_$kvariant/2.6/drivers install \ MODULESROOT=$RPM_BUILD_ROOT/lib/modules/%{kverrel}$kvariant/extra done -chmod u+x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/* %clean @@ -67,6 +61,9 @@ %changelog +* Sat Feb 25 2006 Ville Skytt?? - 5.9-1 +- 5.9. + * Sat Jan 28 2006 Ville Skytt?? - 5.8-10 - Update kmodtool to 0.10.4, fixes support for non-UP FC kernels. --- thinkpad-kmod-2615pm.patch DELETED --- --- thinkpad-kmod-percpu.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 21:38:44 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Mar 2006 16:38:44 -0500 Subject: rpms/hdf5/FC-3 .cvsignore, 1.2, 1.3 hdf5.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603022139.k22LdGoa003148@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3063 Modified Files: .cvsignore hdf5.spec sources Log Message: Update to 1.6.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Jul 2005 20:20:17 -0000 1.2 +++ .cvsignore 2 Mar 2006 21:38:43 -0000 1.3 @@ -1 +1 @@ -hdf5-1.6.4.tar.gz +hdf5-1.6.5.tar.gz Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/hdf5.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf5.spec 5 Jul 2005 20:20:17 -0000 1.1 +++ hdf5.spec 2 Mar 2006 21:38:43 -0000 1.2 @@ -1,6 +1,6 @@ Name: hdf5 -Version: 1.6.4 -Release: 4%{?dist} +Version: 1.6.5 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -10,9 +10,9 @@ Patch1: hdf5-1.6.4-destdir.patch Patch2: hdf5-1.6.4-norpath.patch Patch3: hdf5-1.6.4-testh5repack.patch -Patch4: hdf5-1.6.4-h5diff_attr.patch +Patch4: hdf5-1.6.5-h5diff_attr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: krb5-devel, openssl-devel, zlib-devel +BuildRequires: krb5-devel, openssl-devel, zlib-devel, time %description HDF5 is a general purpose library and file format for storing scientific data. @@ -51,6 +51,8 @@ find doc/html -name '*.sh*' | xargs chmod +x %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir} rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings +# Don't instal h5perf until h5test.so.0 issues is sorted out +rm $RPM_BUILD_ROOT/%{_bindir}/h5perf %check make check @@ -68,15 +70,12 @@ %doc release_docs/HISTORY.txt doc/html %{_bindir}/gif2h5 %{_bindir}/h52gif -%{_bindir}/h5c++ -%{_bindir}/h5cc %{_bindir}/h5debug %{_bindir}/h5diff %{_bindir}/h5dump %{_bindir}/h5import %{_bindir}/h5jam %{_bindir}/h5ls -%{_bindir}/h5redeploy %{_bindir}/h5repack %{_bindir}/h5repart %{_bindir}/h5unjam @@ -84,13 +83,18 @@ %files devel %defattr(-,root,root,0755) -%{_docdir}/%{name}/examples/c++ -%{_docdir}/%{name}/examples/c +%{_bindir}/h5c++ +%{_bindir}/h5cc +%{_bindir}/h5redeploy +%{_docdir}/%{name}/examples/ %{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.so %changelog +* Thu Mar 02 2006 Orion Poplawski 1.6.5-1 +- Update to 1.6.5 + * Tue Jul 05 2005 Orion Poplawski 1.6.4-4 - Make example scripts executable Index: sources =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Jul 2005 20:20:17 -0000 1.2 +++ sources 2 Mar 2006 21:38:43 -0000 1.3 @@ -1 +1 @@ -a837391b633fc4c6681905d89047c032 hdf5-1.6.4.tar.gz +67187b3253b89f1f41756b7fd4396ecf hdf5-1.6.5.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 21:43:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 2 Mar 2006 16:43:45 -0500 Subject: rpms/thinkpad-kmod/devel thinkpad-kmod.spec,1.3,1.4 Message-ID: <200603022144.k22LiHlH003292@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3268 Modified Files: thinkpad-kmod.spec Log Message: * Thu Mar 2 2006 Ville Skytt?? - 5.9-2 - Hardcode kernel version and variants for a test build. Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- thinkpad-kmod.spec 2 Mar 2006 21:37:24 -0000 1.3 +++ thinkpad-kmod.spec 2 Mar 2006 21:43:44 -0000 1.4 @@ -3,6 +3,10 @@ %define kmodtool sh %{SOURCE10} # end stuff to be ... +# temporarily hardcoded: +%define kver 2.6.15-1.1996_FC5 +%define kvariants "" + %define kmod_name thinkpad %define kverrel %(%{kmodtool} verrel %{?kver} 2>/dev/null) %{!?kvariants: %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)} @@ -10,7 +14,7 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules Version: 5.9 -Release: 1.%(echo %{kverrel} | tr - _) +Release: 2.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz @@ -61,6 +65,9 @@ %changelog +* Thu Mar 2 2006 Ville Skytt?? - 5.9-2 +- Hardcode kernel version and variants for a test build. + * Sat Feb 25 2006 Ville Skytt?? - 5.9-1 - 5.9. From fedora-extras-commits at redhat.com Thu Mar 2 21:47:35 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 16:47:35 -0500 Subject: rpms/centericq/FC-3 centericq-4.20.0-ljtags.patch, NONE, 1.1 centericq-ljtypo.patch, NONE, 1.1 centericq-quitask.patch, NONE, 1.1 centericq.spec, 1.11, 1.12 Message-ID: <200603022148.k22Lm8Fu003466@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3387/FC-3 Modified Files: centericq.spec Added Files: centericq-4.20.0-ljtags.patch centericq-ljtypo.patch centericq-quitask.patch Log Message: - fix #183623: ask before quit - fix #183625, #183626: fixes lj hook centericq-4.20.0-ljtags.patch: --- NEW FILE centericq-4.20.0-ljtags.patch --- diff -ur centericq-4.20.0/src/hooks/ljhook.cc centericq-4.20.0.kad/src/hooks/ljhook.cc --- centericq-4.20.0/src/hooks/ljhook.cc 2005-01-07 03:27:04.000000000 +0200 +++ centericq-4.20.0.kad/src/hooks/ljhook.cc 2005-09-22 22:00:22.000000000 +0300 @@ -266,6 +266,7 @@ if(!m->field_empty("subject")) ev->addParam("subject", rusconv("ku", m->getfield("subject"))); if(!m->field_empty("mood")) ev->addParam("prop_current_mood", rusconv("ku", m->getfield("mood"))); if(!m->field_empty("music")) ev->addParam("prop_current_music", rusconv("ku", m->getfield("music"))); + if(!m->field_empty("taglist")) ev->addParam("prop_taglist", rusconv("ku", m->getfield("taglist"))); if(!m->field_empty("picture")) ev->addParam("prop_picture_keyword", m->getfield("picture")); if(!m->field_empty("preformatted")) ev->addParam("prop_opt_preformatted", "1"); diff -ur centericq-4.20.0/src/icqdialogs.cc centericq-4.20.0.kad/src/icqdialogs.cc --- centericq-4.20.0/src/icqdialogs.cc 2005-09-22 22:09:13.000000000 +0300 +++ centericq-4.20.0.kad/src/icqdialogs.cc 2005-09-22 22:08:32.000000000 +0300 @@ -1878,6 +1879,8 @@ svalues.push_back("usemask"); } + ev->setfield("taglist", ""); + textwindow w(0, 0, sizeDlg.width, sizeDlg.height, conf.getcolor(cp_dialog_frame), TW_CENTERED); w.set_title(conf.getcolor(cp_dialog_highlight), _(" LiveJournal posting: attributes ")); db.setwindow(&w, false); @@ -1915,6 +1915,7 @@ t.addleaff(i, 0, 21, _(" Music : %s "), ev->getfield("music").c_str()); t.addleaff(i, 0, 22, _(" Picture : %s "), ev->getfield("picture").empty() ? _("(default)") : ev->getfield("picture").c_str()); + t.addleaff(i, 0, 25, _(" Tags : %s "), ev->getfield("taglist").c_str()); i = t.addnode(_(" Options ")); t.addleaff(i, 0, 30, _(" Disable auto-formatting : %s "), stryesno(ev->getfield("preformatted") == "1")); @@ -1940,6 +1941,7 @@ case 21: LJP_STR("music", _("Currently playing: ")); break; case 22: LJP_LIST("picture", pictures, _("(default)")); break; case 23: LJP_STR("mood", _("Current mood: ")); break; + case 25: LJP_STR("taglist", _("Tags for the entry: ")); break; case 30: LJP_BOOL("preformatted"); break; case 31: LJP_BOOL("noemail"); break; case 32: LJP_BOOL("nocomments"); break; centericq-ljtypo.patch: --- NEW FILE centericq-ljtypo.patch --- --- centericq-4.20.0/src/accountmanager.cc.ljfriends 2005-01-27 01:52:46.000000000 +0200 +++ centericq-4.20.0/src/accountmanager.cc 2005-02-04 17:03:07.908358392 +0200 @@ -241,7 +241,7 @@ void accountmanager::exec() { case 11: a.additional["importfriends"] = - (a.additional["importfriends"] == "") ? "1" : "0"; + (a.additional["importfriends"] == "1") ? "0" : "1"; break; case 12: centericq-quitask.patch: --- NEW FILE centericq-quitask.patch --- --- centericq-4.21.0/src/icqconf.cc.askquit 2005-09-01 18:10:01.000000000 +0300 +++ centericq-4.21.0/src/icqconf.cc 2005-09-05 12:22:04.000000000 +0300 @@ -460,6 +460,7 @@ void icqconf::loadmainconfig() { if(param == "russian" || param == "convert") initmultiproto(cpconvert, buf, false); else if(param == "nobidi") setbidi(false); else if(param == "askaway") askaway = true; else + if(param == "askquit") askquit = true; else if(param == "logtimestamps") logtimestamps = true; else if(param == "logonline") logonline = true; else if(param == "fromcharset") fromcharset = buf; else @@ -548,6 +549,7 @@ void icqconf::save() { f << "tocharset\t" << tocharset << endl; if(!getbidi()) f << "nobidi" << endl; + if(getaskquit()) f << "askquit" << endl; if(logtimestamps) f << "logtimestamps" << endl; if(logonline) f << "logonline" << endl; @@ -895,6 +897,9 @@ void icqconf::getauto(int &away, int &na void icqconf::setquote(bool use) { quote = use; } +void icqconf::setaskquit(bool faskquit) { + askquit = faskquit; +} void icqconf::setsockshost(const string &nsockshost) { int pos; --- centericq-4.21.0/src/icqconf.h.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqconf.h 2005-09-05 12:24:28.000000000 +0300 @@ -137,6 +137,7 @@ class icqconf { bool hideoffline, quote, savepwd, antispam, mailcheck, makelog, fenoughdiskspace, askaway, bidi, logtimestamps, + askquit, logonline, emacs, proxyconnect, proxyssl, notitles, debug; bool startoffline; @@ -241,6 +242,9 @@ class icqconf { bool getchatmode(protocolname pname); void setchatmode(protocolname pname, bool fchatmode); + + bool getaskquit() const { return askquit; } + void setaskquit(bool faskquit); bool getentersends(protocolname pname); void setentersends(protocolname pname, bool fentersends); --- centericq-4.21.0/src/icqdialogs.cc.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqdialogs.cc 2005-09-05 13:11:16.000000000 +0300 @@ -1100,6 +1100,7 @@ bool icqface::updateconf(icqconf::regsou bool makelog = conf.getmakelog(); bool askaway = conf.getaskaway(); bool bidi = conf.getbidi(); + bool askquit = conf.getaskquit(); bool emacs = conf.getemacs(); bool proxyconnect = conf.getproxyconnect(); @@ -1183,6 +1184,7 @@ bool icqface::updateconf(icqconf::regsou t.addleaff(i, 0, 20, _( " Enable bidirectional languages support : %s "), stryesno(bidi)); #endif t.addleaff(i, 0, 23, _(" Enable emacs bindings in text editor : %s "), stryesno(emacs)); + t.addleaff(i, 0, 31, _(" Ask before quit : %s "), stryesno(askquit)); i = t.addnode(_(" Codepages conversion ")); @@ -1377,6 +1379,10 @@ bool icqface::updateconf(icqconf::regsou break; case 30: cm = (cm == icqconf::cmproto ? icqconf::cmstatus : icqconf::cmproto ); + break; + case 31: + askquit = !askquit; + break; } break; case 1: @@ -1403,6 +1409,7 @@ bool icqface::updateconf(icqconf::regsou } conf.setbidi(bidi); + conf.setaskquit(askquit); conf.setlogoptions(logtimestamps, logonline); if(ptp) conf.setpeertopeer(ptpmin, ptpmax); --- centericq-4.21.0/src/icqface.cc.askquit 2005-08-28 04:33:21.000000000 +0300 +++ centericq-4.21.0/src/icqface.cc 2005-09-05 12:22:04.000000000 +0300 @@ -3237,6 +3237,9 @@ int icqface::contactskeys(verticalmenu & break; case key_quit: + if (conf.getaskquit()) + if(face.ask("Really Quit?", ASK_YES | ASK_NO, ASK_NO) == ASK_NO) + break; face.extk = ACT_QUIT; break; Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-3/centericq.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- centericq.spec 1 Mar 2006 08:01:07 -0000 1.11 +++ centericq.spec 2 Mar 2006 21:47:35 -0000 1.12 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Text mode menu- and window-driven IM @@ -20,10 +20,20 @@ # and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml # and redhat bugzilla #176451 Patch6: centericq-4.21.0-kkstrtext.patch + +## feature fixes # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch +# Fix ljhook +Patch101: http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch +Patch102: centericq-ljtypo.patch + +## feature enh # improve utf8 handling Patch200: centericq-ncursesw.patch +# provided by Andy Shevchenko... will ask before quit +Patch201: centericq-quitask.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel @@ -48,7 +58,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch101 -p1 +%patch102 -p1 %patch200 -p1 +%patch201 -p1 aclocal autoconf automake @@ -82,6 +95,11 @@ # we don't want that %exclude %{_includedir}/msn %changelog +* Thu Mar 02 2006 Andreas Bierfert +4.21.0-5 +- fix #183623: ask before quit +- fix #183625, #183626: fixes lj hook + * Wed Mar 01 2006 Andreas Bierfert 4.21.0-4 - improve utf8 support From fedora-extras-commits at redhat.com Thu Mar 2 21:47:41 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 16:47:41 -0500 Subject: rpms/centericq/FC-4 centericq-4.20.0-ljtags.patch, NONE, 1.1 centericq-ljtypo.patch, NONE, 1.1 centericq-quitask.patch, NONE, 1.1 centericq.spec, 1.21, 1.22 Message-ID: <200603022148.k22LmEX2003471@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3387/FC-4 Modified Files: centericq.spec Added Files: centericq-4.20.0-ljtags.patch centericq-ljtypo.patch centericq-quitask.patch Log Message: - fix #183623: ask before quit - fix #183625, #183626: fixes lj hook centericq-4.20.0-ljtags.patch: --- NEW FILE centericq-4.20.0-ljtags.patch --- diff -ur centericq-4.20.0/src/hooks/ljhook.cc centericq-4.20.0.kad/src/hooks/ljhook.cc --- centericq-4.20.0/src/hooks/ljhook.cc 2005-01-07 03:27:04.000000000 +0200 +++ centericq-4.20.0.kad/src/hooks/ljhook.cc 2005-09-22 22:00:22.000000000 +0300 @@ -266,6 +266,7 @@ if(!m->field_empty("subject")) ev->addParam("subject", rusconv("ku", m->getfield("subject"))); if(!m->field_empty("mood")) ev->addParam("prop_current_mood", rusconv("ku", m->getfield("mood"))); if(!m->field_empty("music")) ev->addParam("prop_current_music", rusconv("ku", m->getfield("music"))); + if(!m->field_empty("taglist")) ev->addParam("prop_taglist", rusconv("ku", m->getfield("taglist"))); if(!m->field_empty("picture")) ev->addParam("prop_picture_keyword", m->getfield("picture")); if(!m->field_empty("preformatted")) ev->addParam("prop_opt_preformatted", "1"); diff -ur centericq-4.20.0/src/icqdialogs.cc centericq-4.20.0.kad/src/icqdialogs.cc --- centericq-4.20.0/src/icqdialogs.cc 2005-09-22 22:09:13.000000000 +0300 +++ centericq-4.20.0.kad/src/icqdialogs.cc 2005-09-22 22:08:32.000000000 +0300 @@ -1878,6 +1879,8 @@ svalues.push_back("usemask"); } + ev->setfield("taglist", ""); + textwindow w(0, 0, sizeDlg.width, sizeDlg.height, conf.getcolor(cp_dialog_frame), TW_CENTERED); w.set_title(conf.getcolor(cp_dialog_highlight), _(" LiveJournal posting: attributes ")); db.setwindow(&w, false); @@ -1915,6 +1915,7 @@ t.addleaff(i, 0, 21, _(" Music : %s "), ev->getfield("music").c_str()); t.addleaff(i, 0, 22, _(" Picture : %s "), ev->getfield("picture").empty() ? _("(default)") : ev->getfield("picture").c_str()); + t.addleaff(i, 0, 25, _(" Tags : %s "), ev->getfield("taglist").c_str()); i = t.addnode(_(" Options ")); t.addleaff(i, 0, 30, _(" Disable auto-formatting : %s "), stryesno(ev->getfield("preformatted") == "1")); @@ -1940,6 +1941,7 @@ case 21: LJP_STR("music", _("Currently playing: ")); break; case 22: LJP_LIST("picture", pictures, _("(default)")); break; case 23: LJP_STR("mood", _("Current mood: ")); break; + case 25: LJP_STR("taglist", _("Tags for the entry: ")); break; case 30: LJP_BOOL("preformatted"); break; case 31: LJP_BOOL("noemail"); break; case 32: LJP_BOOL("nocomments"); break; centericq-ljtypo.patch: --- NEW FILE centericq-ljtypo.patch --- --- centericq-4.20.0/src/accountmanager.cc.ljfriends 2005-01-27 01:52:46.000000000 +0200 +++ centericq-4.20.0/src/accountmanager.cc 2005-02-04 17:03:07.908358392 +0200 @@ -241,7 +241,7 @@ void accountmanager::exec() { case 11: a.additional["importfriends"] = - (a.additional["importfriends"] == "") ? "1" : "0"; + (a.additional["importfriends"] == "1") ? "0" : "1"; break; case 12: centericq-quitask.patch: --- NEW FILE centericq-quitask.patch --- --- centericq-4.21.0/src/icqconf.cc.askquit 2005-09-01 18:10:01.000000000 +0300 +++ centericq-4.21.0/src/icqconf.cc 2005-09-05 12:22:04.000000000 +0300 @@ -460,6 +460,7 @@ void icqconf::loadmainconfig() { if(param == "russian" || param == "convert") initmultiproto(cpconvert, buf, false); else if(param == "nobidi") setbidi(false); else if(param == "askaway") askaway = true; else + if(param == "askquit") askquit = true; else if(param == "logtimestamps") logtimestamps = true; else if(param == "logonline") logonline = true; else if(param == "fromcharset") fromcharset = buf; else @@ -548,6 +549,7 @@ void icqconf::save() { f << "tocharset\t" << tocharset << endl; if(!getbidi()) f << "nobidi" << endl; + if(getaskquit()) f << "askquit" << endl; if(logtimestamps) f << "logtimestamps" << endl; if(logonline) f << "logonline" << endl; @@ -895,6 +897,9 @@ void icqconf::getauto(int &away, int &na void icqconf::setquote(bool use) { quote = use; } +void icqconf::setaskquit(bool faskquit) { + askquit = faskquit; +} void icqconf::setsockshost(const string &nsockshost) { int pos; --- centericq-4.21.0/src/icqconf.h.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqconf.h 2005-09-05 12:24:28.000000000 +0300 @@ -137,6 +137,7 @@ class icqconf { bool hideoffline, quote, savepwd, antispam, mailcheck, makelog, fenoughdiskspace, askaway, bidi, logtimestamps, + askquit, logonline, emacs, proxyconnect, proxyssl, notitles, debug; bool startoffline; @@ -241,6 +242,9 @@ class icqconf { bool getchatmode(protocolname pname); void setchatmode(protocolname pname, bool fchatmode); + + bool getaskquit() const { return askquit; } + void setaskquit(bool faskquit); bool getentersends(protocolname pname); void setentersends(protocolname pname, bool fentersends); --- centericq-4.21.0/src/icqdialogs.cc.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqdialogs.cc 2005-09-05 13:11:16.000000000 +0300 @@ -1100,6 +1100,7 @@ bool icqface::updateconf(icqconf::regsou bool makelog = conf.getmakelog(); bool askaway = conf.getaskaway(); bool bidi = conf.getbidi(); + bool askquit = conf.getaskquit(); bool emacs = conf.getemacs(); bool proxyconnect = conf.getproxyconnect(); @@ -1183,6 +1184,7 @@ bool icqface::updateconf(icqconf::regsou t.addleaff(i, 0, 20, _( " Enable bidirectional languages support : %s "), stryesno(bidi)); #endif t.addleaff(i, 0, 23, _(" Enable emacs bindings in text editor : %s "), stryesno(emacs)); + t.addleaff(i, 0, 31, _(" Ask before quit : %s "), stryesno(askquit)); i = t.addnode(_(" Codepages conversion ")); @@ -1377,6 +1379,10 @@ bool icqface::updateconf(icqconf::regsou break; case 30: cm = (cm == icqconf::cmproto ? icqconf::cmstatus : icqconf::cmproto ); + break; + case 31: + askquit = !askquit; + break; } break; case 1: @@ -1403,6 +1409,7 @@ bool icqface::updateconf(icqconf::regsou } conf.setbidi(bidi); + conf.setaskquit(askquit); conf.setlogoptions(logtimestamps, logonline); if(ptp) conf.setpeertopeer(ptpmin, ptpmax); --- centericq-4.21.0/src/icqface.cc.askquit 2005-08-28 04:33:21.000000000 +0300 +++ centericq-4.21.0/src/icqface.cc 2005-09-05 12:22:04.000000000 +0300 @@ -3237,6 +3237,9 @@ int icqface::contactskeys(verticalmenu & break; case key_quit: + if (conf.getaskquit()) + if(face.ask("Really Quit?", ASK_YES | ASK_NO, ASK_NO) == ASK_NO) + break; face.extk = ACT_QUIT; break; Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-4/centericq.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- centericq.spec 1 Mar 2006 08:01:13 -0000 1.21 +++ centericq.spec 2 Mar 2006 21:47:41 -0000 1.22 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Text mode menu- and window-driven IM @@ -20,10 +20,20 @@ # and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml # and redhat bugzilla #176451 Patch6: centericq-4.21.0-kkstrtext.patch + +## feature fixes # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch +# Fix ljhook +Patch101: http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch +Patch102: centericq-ljtypo.patch + +## feature enh # improve utf8 handling Patch200: centericq-ncursesw.patch +# provided by Andy Shevchenko... will ask before quit +Patch201: centericq-quitask.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel @@ -48,7 +58,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch101 -p1 +%patch102 -p1 %patch200 -p1 +%patch201 -p1 aclocal autoconf automake @@ -82,6 +95,11 @@ # we don't want that %exclude %{_includedir}/msn %changelog +* Thu Mar 02 2006 Andreas Bierfert +4.21.0-5 +- fix #183623: ask before quit +- fix #183625, #183626: fixes lj hook + * Wed Mar 01 2006 Andreas Bierfert 4.21.0-4 - improve utf8 support From fedora-extras-commits at redhat.com Thu Mar 2 21:47:47 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 16:47:47 -0500 Subject: rpms/centericq/devel centericq-4.20.0-ljtags.patch, NONE, 1.1 centericq-quitask.patch, NONE, 1.1 centericq.spec, 1.23, 1.24 Message-ID: <200603022148.k22LmJIm003476@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3387/devel Modified Files: centericq.spec Added Files: centericq-4.20.0-ljtags.patch centericq-quitask.patch Log Message: - fix #183623: ask before quit - fix #183625, #183626: fixes lj hook centericq-4.20.0-ljtags.patch: --- NEW FILE centericq-4.20.0-ljtags.patch --- diff -ur centericq-4.20.0/src/hooks/ljhook.cc centericq-4.20.0.kad/src/hooks/ljhook.cc --- centericq-4.20.0/src/hooks/ljhook.cc 2005-01-07 03:27:04.000000000 +0200 +++ centericq-4.20.0.kad/src/hooks/ljhook.cc 2005-09-22 22:00:22.000000000 +0300 @@ -266,6 +266,7 @@ if(!m->field_empty("subject")) ev->addParam("subject", rusconv("ku", m->getfield("subject"))); if(!m->field_empty("mood")) ev->addParam("prop_current_mood", rusconv("ku", m->getfield("mood"))); if(!m->field_empty("music")) ev->addParam("prop_current_music", rusconv("ku", m->getfield("music"))); + if(!m->field_empty("taglist")) ev->addParam("prop_taglist", rusconv("ku", m->getfield("taglist"))); if(!m->field_empty("picture")) ev->addParam("prop_picture_keyword", m->getfield("picture")); if(!m->field_empty("preformatted")) ev->addParam("prop_opt_preformatted", "1"); diff -ur centericq-4.20.0/src/icqdialogs.cc centericq-4.20.0.kad/src/icqdialogs.cc --- centericq-4.20.0/src/icqdialogs.cc 2005-09-22 22:09:13.000000000 +0300 +++ centericq-4.20.0.kad/src/icqdialogs.cc 2005-09-22 22:08:32.000000000 +0300 @@ -1878,6 +1879,8 @@ svalues.push_back("usemask"); } + ev->setfield("taglist", ""); + textwindow w(0, 0, sizeDlg.width, sizeDlg.height, conf.getcolor(cp_dialog_frame), TW_CENTERED); w.set_title(conf.getcolor(cp_dialog_highlight), _(" LiveJournal posting: attributes ")); db.setwindow(&w, false); @@ -1915,6 +1915,7 @@ t.addleaff(i, 0, 21, _(" Music : %s "), ev->getfield("music").c_str()); t.addleaff(i, 0, 22, _(" Picture : %s "), ev->getfield("picture").empty() ? _("(default)") : ev->getfield("picture").c_str()); + t.addleaff(i, 0, 25, _(" Tags : %s "), ev->getfield("taglist").c_str()); i = t.addnode(_(" Options ")); t.addleaff(i, 0, 30, _(" Disable auto-formatting : %s "), stryesno(ev->getfield("preformatted") == "1")); @@ -1940,6 +1941,7 @@ case 21: LJP_STR("music", _("Currently playing: ")); break; case 22: LJP_LIST("picture", pictures, _("(default)")); break; case 23: LJP_STR("mood", _("Current mood: ")); break; + case 25: LJP_STR("taglist", _("Tags for the entry: ")); break; case 30: LJP_BOOL("preformatted"); break; case 31: LJP_BOOL("noemail"); break; case 32: LJP_BOOL("nocomments"); break; centericq-quitask.patch: --- NEW FILE centericq-quitask.patch --- --- centericq-4.21.0/src/icqconf.cc.askquit 2005-09-01 18:10:01.000000000 +0300 +++ centericq-4.21.0/src/icqconf.cc 2005-09-05 12:22:04.000000000 +0300 @@ -460,6 +460,7 @@ void icqconf::loadmainconfig() { if(param == "russian" || param == "convert") initmultiproto(cpconvert, buf, false); else if(param == "nobidi") setbidi(false); else if(param == "askaway") askaway = true; else + if(param == "askquit") askquit = true; else if(param == "logtimestamps") logtimestamps = true; else if(param == "logonline") logonline = true; else if(param == "fromcharset") fromcharset = buf; else @@ -548,6 +549,7 @@ void icqconf::save() { f << "tocharset\t" << tocharset << endl; if(!getbidi()) f << "nobidi" << endl; + if(getaskquit()) f << "askquit" << endl; if(logtimestamps) f << "logtimestamps" << endl; if(logonline) f << "logonline" << endl; @@ -895,6 +897,9 @@ void icqconf::getauto(int &away, int &na void icqconf::setquote(bool use) { quote = use; } +void icqconf::setaskquit(bool faskquit) { + askquit = faskquit; +} void icqconf::setsockshost(const string &nsockshost) { int pos; --- centericq-4.21.0/src/icqconf.h.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqconf.h 2005-09-05 12:24:28.000000000 +0300 @@ -137,6 +137,7 @@ class icqconf { bool hideoffline, quote, savepwd, antispam, mailcheck, makelog, fenoughdiskspace, askaway, bidi, logtimestamps, + askquit, logonline, emacs, proxyconnect, proxyssl, notitles, debug; bool startoffline; @@ -241,6 +242,9 @@ class icqconf { bool getchatmode(protocolname pname); void setchatmode(protocolname pname, bool fchatmode); + + bool getaskquit() const { return askquit; } + void setaskquit(bool faskquit); bool getentersends(protocolname pname); void setentersends(protocolname pname, bool fentersends); --- centericq-4.21.0/src/icqdialogs.cc.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqdialogs.cc 2005-09-05 13:11:16.000000000 +0300 @@ -1100,6 +1100,7 @@ bool icqface::updateconf(icqconf::regsou bool makelog = conf.getmakelog(); bool askaway = conf.getaskaway(); bool bidi = conf.getbidi(); + bool askquit = conf.getaskquit(); bool emacs = conf.getemacs(); bool proxyconnect = conf.getproxyconnect(); @@ -1183,6 +1184,7 @@ bool icqface::updateconf(icqconf::regsou t.addleaff(i, 0, 20, _( " Enable bidirectional languages support : %s "), stryesno(bidi)); #endif t.addleaff(i, 0, 23, _(" Enable emacs bindings in text editor : %s "), stryesno(emacs)); + t.addleaff(i, 0, 31, _(" Ask before quit : %s "), stryesno(askquit)); i = t.addnode(_(" Codepages conversion ")); @@ -1377,6 +1379,10 @@ bool icqface::updateconf(icqconf::regsou break; case 30: cm = (cm == icqconf::cmproto ? icqconf::cmstatus : icqconf::cmproto ); + break; + case 31: + askquit = !askquit; + break; } break; case 1: @@ -1403,6 +1409,7 @@ bool icqface::updateconf(icqconf::regsou } conf.setbidi(bidi); + conf.setaskquit(askquit); conf.setlogoptions(logtimestamps, logonline); if(ptp) conf.setpeertopeer(ptpmin, ptpmax); --- centericq-4.21.0/src/icqface.cc.askquit 2005-08-28 04:33:21.000000000 +0300 +++ centericq-4.21.0/src/icqface.cc 2005-09-05 12:22:04.000000000 +0300 @@ -3237,6 +3237,9 @@ int icqface::contactskeys(verticalmenu & break; case key_quit: + if (conf.getaskquit()) + if(face.ask("Really Quit?", ASK_YES | ASK_NO, ASK_NO) == ASK_NO) + break; face.extk = ACT_QUIT; break; Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- centericq.spec 1 Mar 2006 08:01:20 -0000 1.23 +++ centericq.spec 2 Mar 2006 21:47:47 -0000 1.24 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Text mode menu- and window-driven IM @@ -8,6 +8,7 @@ License: GPL URL: http://konst.org.ua/centericq/ Source0: http://konst.org.ua/download/centericq-4.21.0.tar.bz2 + Patch0: centericq-libyahoo.patch Patch1: centericq-kkconsui.patch Patch2: centericq-kkstrtext.patch @@ -20,10 +21,20 @@ # and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml # and redhat bugzilla #176451 Patch6: centericq-4.21.0-kkstrtext.patch + +## feature fixes # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch +# Fix ljhook +Patch101: http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch +Patch102: centericq-ljtypo.patch + +## feature enh # improve utf8 handling Patch200: centericq-ncursesw.patch +# provided by Andy Shevchenko... will ask before quit +Patch201: centericq-quitask.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel @@ -48,7 +59,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch101 -p1 +%patch102 -p1 %patch200 -p1 +%patch201 -p1 aclocal autoconf automake @@ -83,6 +97,11 @@ %exclude %{_includedir}/msn %changelog +* Thu Mar 02 2006 Andreas Bierfert +4.21.0-7 +- fix #183623: ask before quit +- fix #183625, #183626: fixes lj hook + * Wed Mar 01 2006 Andreas Bierfert 4.21.0-6 - improve utf8 support From fedora-extras-commits at redhat.com Thu Mar 2 21:55:56 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 16:55:56 -0500 Subject: rpms/centericq/devel centericq-ljtypo.patch,NONE,1.1 Message-ID: <200603022155.k22Ltw06003674@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3662 Added Files: centericq-ljtypo.patch Log Message: - forgot patch centericq-ljtypo.patch: --- NEW FILE centericq-ljtypo.patch --- --- centericq-4.20.0/src/accountmanager.cc.ljfriends 2005-01-27 01:52:46.000000000 +0200 +++ centericq-4.20.0/src/accountmanager.cc 2005-02-04 17:03:07.908358392 +0200 @@ -241,7 +241,7 @@ void accountmanager::exec() { case 11: a.additional["importfriends"] = - (a.additional["importfriends"] == "") ? "1" : "0"; + (a.additional["importfriends"] == "1") ? "0" : "1"; break; case 12: From fedora-extras-commits at redhat.com Thu Mar 2 22:17:12 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 17:17:12 -0500 Subject: rpms/hula/devel hula.spec,1.5,1.6 Message-ID: <200603022217.k22MHl7E005720@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/hula/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5679/hula/devel Modified Files: hula.spec Log Message: There is no binary of Hula in the repository. Not 3, not 4, not development. Has this thing ever been built? Index: hula.spec =================================================================== RCS file: /cvs/extras/rpms/hula/devel/hula.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hula.spec 22 Jul 2005 05:23:35 -0000 1.5 +++ hula.spec 2 Mar 2006 22:17:11 -0000 1.6 @@ -29,6 +29,13 @@ for hula. %prep +cat< Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5742 Modified Files: libopensync-plugin-kdepim.spec Added Files: libopensync-plugin-kdepim-gcc41.patch Log Message: - add gcc41 patch - disable smp flags libopensync-plugin-kdepim-gcc41.patch: --- NEW FILE libopensync-plugin-kdepim-gcc41.patch --- --- src/kcal.h.orig 2006-03-02 23:07:46.000000000 +0100 +++ src/kcal.h 2006-03-02 23:08:35.000000000 +0100 @@ -49,7 +49,7 @@ * operations */ bool __access(OSyncContext *ctx, OSyncChange *chg); - bool KCalDataSource::report_incidence(OSyncContext *ctx, KCal::Incidence *e, + bool report_incidence(OSyncContext *ctx, KCal::Incidence *e, const char *objtype, const char *objformat); public: KCalDataSource(OSyncMember *member, OSyncHashTable *hashtable); Index: libopensync-plugin-kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libopensync-plugin-kdepim.spec 2 Mar 2006 21:31:18 -0000 1.2 +++ libopensync-plugin-kdepim.spec 2 Mar 2006 22:21:15 -0000 1.3 @@ -1,6 +1,6 @@ Name: libopensync-plugin-kdepim Version: 0.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE plugin for libopensync Group: System Environment/Libraries @@ -8,6 +8,7 @@ URL: http://www.opensync.org # see http://www.opensync.org/wiki/download Source0: %{name}-%{version}.tar.gz +Patch0: libopensync-plugin-kdepim-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel @@ -30,11 +31,12 @@ %prep %setup -q - +%patch0 %build %configure --disable-rpath -make %{?_smp_mflags} +# smpflags sometimes screw up the build +make %install @@ -56,8 +58,10 @@ %{_libdir}/opensync/plugins/kdepim*.so %changelog -* Thu Mar 02 2006 Andreas Bierfert +* Thu Mar 02 2006 Andreas Bierfert 0.18-2 - add dist +- add gcc4.1 fixes +- get rid of smpflags * Fri Nov 25 2005 Andreas Bierfert 0.18-1 - initial version From fedora-extras-commits at redhat.com Thu Mar 2 22:43:54 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 17:43:54 -0500 Subject: owners owners.list,1.697,1.698 Message-ID: <200603022244.k22MiQxn006026@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6009 Modified Files: owners.list Log Message: - add libopensync-plugin-kdepim Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.697 retrieving revision 1.698 diff -u -r1.697 -r1.698 --- owners.list 2 Mar 2006 19:52:43 -0000 1.697 +++ owners.list 2 Mar 2006 22:43:53 -0000 1.698 @@ -580,6 +580,7 @@ Fedora Extras|libopensync-plugin-file|File plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-gpe|GPE plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-irmc|Irmc plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +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|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 22:57:20 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 17:57:20 -0500 Subject: rpms/WindowMaker/devel WindowMaker.spec, 1.17, 1.18 WindowMaker.xsession, 1.1, NONE Message-ID: <200603022257.k22Mvq4r006391@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/WindowMaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6254 Modified Files: WindowMaker.spec Removed Files: WindowMaker.xsession Log Message: - fix gdm detection Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- WindowMaker.spec 2 Mar 2006 14:16:26 -0000 1.17 +++ WindowMaker.spec 2 Mar 2006 22:57:20 -0000 1.18 @@ -1,13 +1,12 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.92.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: User Interface/Desktops URL: http://www.windowmaker.org/ Source0: ftp://windowmaker.org/pub/source/release/WindowMaker-0.92.0.tar.bz2 -Source1: WindowMaker.xsession Source2: WindowMaker.desktop Source3: WindowMaker-uk.po Source4: WPrefs-uk.po @@ -155,10 +154,8 @@ %find_lang '\(WPrefs\|%{name}\|WINGs\)' -install -D -m0755 %{SOURCE1} \ -%{buildroot}%{_sysconfdir}/X11/gdm/Sessions/WindowMaker -install -D -m0644 %{SOURCE2} \ -%{buildroot}%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop +install -D -m0644 -p %{SOURCE2} \ +%{buildroot}%{_datadir}/xsessions/WindowMaker.desktop find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' @@ -173,8 +170,7 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS FAQ* README* COPYING* %config %{_sysconfdir}/%{name} -%{_sysconfdir}/X11/gdm/Sessions/WindowMaker -%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop +%{_datadir}/xsessions/WindowMaker.desktop %{_bindir}/* %{_datadir}/%{name} %{_datadir}/WINGs @@ -197,6 +193,10 @@ %changelog +* Thu Mar 02 2006 Andreas Bierfert +0.92.0-8 +- fix gdm detection + * Sun Feb 26 2006 Andreas Bierfert 0.92.0-7 - fix #181981 --- WindowMaker.xsession DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 22:57:50 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 17:57:50 -0500 Subject: rpms/fluxbox/devel fluxbox-menu.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 fluxbox.spec, 1.15, 1.16 sources, 1.5, 1.6 FluxBox, 1.1, NONE Xclients.fluxbox, 1.3, NONE Message-ID: <200603022258.k22MwMp9006407@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fluxbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6358 Modified Files: .cvsignore fluxbox.spec sources Added Files: fluxbox-menu.patch Removed Files: FluxBox Xclients.fluxbox Log Message: - fix gdm detection - fix menu generation fluxbox-menu.patch: --- NEW FILE fluxbox-menu.patch --- --- util/startfluxbox.in.orig 2006-03-02 16:10:01.000000000 +0100 +++ util/startfluxbox.in 2006-03-02 16:11:29.000000000 +0100 @@ -76,6 +76,10 @@ # wmsmixer -w & # idesk & +if [ -x /usr/bin/fluxbox-xdg-menu.py ]; then + /usr/bin/fluxbox-generate_menu --with-icons & +fi + # And last but not least we start fluxbox. # Because it is the last app you have to run it with ''exec'' before it. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 17 Sep 2005 07:38:59 -0000 1.5 +++ .cvsignore 2 Mar 2006 22:57:50 -0000 1.6 @@ -1,2 +1 @@ fluxbox-0.9.14.tar.bz2 -artwiz-aleczapka.tar.bz2 Index: fluxbox.spec =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fluxbox.spec 2 Mar 2006 00:31:36 -0000 1.15 +++ fluxbox.spec 2 Mar 2006 22:57:50 -0000 1.16 @@ -1,6 +1,6 @@ Name: fluxbox Version: 0.9.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Window Manager based on Blackbox @@ -9,11 +9,10 @@ URL: http://fluxbox.sourceforge.net Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2 -Source1: Xclients.%{name} -Source2: FluxBox Source3: fluxbox.desktop Source4: fluxbox-xdg-menu.py Patch0: fluxbox-gcc41.patch +Patch1: fluxbox-menu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot BuildRequires: imlib2-devel @@ -29,7 +28,7 @@ BuildRequires: libXrender-devel BuildRequires: fontconfig-devel -Requires(post): python +Requires: pyxdg Requires: artwiz-aleczapka-fonts %description @@ -45,6 +44,7 @@ %prep %setup -q %patch0 -p1 +%patch1 %build %configure --enable-xft \ @@ -63,23 +63,11 @@ make install DESTDIR=$RPM_BUILD_ROOT -# make gdm users happy -mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/ -install -m 0755 -p %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/ - -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions -install -m 0755 -p %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions/ - # this is for Fedora Core -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions -install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/ - +mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/ +install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/ install -m 0755 -p %SOURCE4 $RPM_BUILD_ROOT%{_bindir}/fluxbox-xdg-menu -%post -# New menu-system -%{_bindir}/fluxbox-xdg-menu --with-icons - %clean rm -rf $RPM_BUILD_ROOT @@ -89,20 +77,23 @@ %{_bindir}/* %{_mandir}/man1/* %{_datadir}/%{name} -%{_datadir}/apps/switchdesk/Xclients.fluxbox - -%{_sysconfdir}/X11/gdm/Sessions/FluxBox -%{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop +%{_datadir}/xsessions/fluxbox.desktop %changelog * Thu Mar 02 2006 Andreas Bierfert +0.9.14-3 +- fix Requires +- patch startfluxbox to generate user menu +- fix gdm detection + +* Thu Mar 02 2006 Andreas Bierfert 0.9.14-2 - fix build on gcc41 * Thu Nov 10 2005 Andreas Bierfert - enable nls and imlib2 - require artwizaleczepka instead of providing it... -- add menu script from Rudolf Kastel +- add menu script from Rudolf Kastl * Thu Sep 15 2005 Andreas Bierfert 0.9.14-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 17 Sep 2005 07:38:59 -0000 1.5 +++ sources 2 Mar 2006 22:57:50 -0000 1.6 @@ -1,2 +1 @@ 7641aaea532841e103e9705bb5b98f62 fluxbox-0.9.14.tar.bz2 -3c7da9a10a84d517e6846b2031950380 artwiz-aleczapka.tar.bz2 --- FluxBox DELETED --- --- Xclients.fluxbox DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 23:26:12 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 18:26:12 -0500 Subject: rpms/wine-docs/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wine-docs.spec, 1.5, 1.6 Message-ID: <200603022326.k22NQih1008555@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8491/FC-3 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Feb 2006 22:43:18 -0000 1.5 +++ .cvsignore 2 Mar 2006 23:26:11 -0000 1.6 @@ -1 +1 @@ -wine-docs-0.9.8.tar.bz2 +wine-docs-0.9.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Feb 2006 22:43:18 -0000 1.5 +++ sources 2 Mar 2006 23:26:11 -0000 1.6 @@ -1 +1 @@ -13e916ae7df5e31a425eea89982792af wine-docs-0.9.8.tar.bz2 +dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wine-docs.spec 16 Feb 2006 22:43:18 -0000 1.5 +++ wine-docs.spec 2 Mar 2006 23:26:11 -0000 1.6 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.8.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 - version upgrade From fedora-extras-commits at redhat.com Thu Mar 2 23:26:18 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 18:26:18 -0500 Subject: rpms/wine-docs/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wine-docs.spec, 1.6, 1.7 Message-ID: <200603022326.k22NQpT3008560@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8491/FC-4 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Feb 2006 22:43:24 -0000 1.5 +++ .cvsignore 2 Mar 2006 23:26:17 -0000 1.6 @@ -1 +1 @@ -wine-docs-0.9.8.tar.bz2 +wine-docs-0.9.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Feb 2006 22:43:24 -0000 1.5 +++ sources 2 Mar 2006 23:26:17 -0000 1.6 @@ -1 +1 @@ -13e916ae7df5e31a425eea89982792af wine-docs-0.9.8.tar.bz2 +dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wine-docs.spec 16 Feb 2006 22:43:24 -0000 1.6 +++ wine-docs.spec 2 Mar 2006 23:26:17 -0000 1.7 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.8.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 - version upgrade From fedora-extras-commits at redhat.com Thu Mar 2 23:26:23 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 18:26:23 -0500 Subject: rpms/wine-docs/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wine-docs.spec, 1.5, 1.6 Message-ID: <200603022326.k22NQuVD008566@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8491/devel Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Feb 2006 22:43:29 -0000 1.5 +++ .cvsignore 2 Mar 2006 23:26:23 -0000 1.6 @@ -1 +1 @@ -wine-docs-0.9.8.tar.bz2 +wine-docs-0.9.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Feb 2006 22:43:29 -0000 1.5 +++ sources 2 Mar 2006 23:26:23 -0000 1.6 @@ -1 +1 @@ -13e916ae7df5e31a425eea89982792af wine-docs-0.9.8.tar.bz2 +dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wine-docs.spec 16 Feb 2006 22:43:29 -0000 1.5 +++ wine-docs.spec 2 Mar 2006 23:26:23 -0000 1.6 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.8.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 - version upgrade From fedora-extras-commits at redhat.com Fri Mar 3 00:18:33 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 2 Mar 2006 19:18:33 -0500 Subject: rpms/libdap/FC-4 .cvsignore, 1.2, 1.3 libdap.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603030019.k230JBka010794@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libdap/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730/FC-4 Modified Files: .cvsignore libdap.spec sources Log Message: new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Nov 2005 21:52:24 -0000 1.2 +++ .cvsignore 3 Mar 2006 00:18:32 -0000 1.3 @@ -1 +1 @@ -libdap-3.5.3.tar.gz +libdap-3.6.0.tar.gz Index: libdap.spec =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-4/libdap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libdap.spec 21 Nov 2005 22:01:19 -0000 1.2 +++ libdap.spec 3 Mar 2006 00:18:32 -0000 1.3 @@ -1,8 +1,8 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.5.3 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} #Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz @@ -74,6 +74,9 @@ %{_datadir}/aclocal/* %changelog +* Mon Feb 27 2006 James Gallagher - 3.6.0-1 +- new release + * Mon Nov 21 2005 Patrice Dumas - 3.5.3-2 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Nov 2005 21:52:24 -0000 1.2 +++ sources 3 Mar 2006 00:18:32 -0000 1.3 @@ -1 +1 @@ -62579a9814ccb39579796cdcc1560067 libdap-3.5.3.tar.gz +c2586c2f7225eb9af8d557b36c55c661 libdap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 00:18:40 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 2 Mar 2006 19:18:40 -0500 Subject: rpms/libdap/devel .cvsignore, 1.2, 1.3 libdap.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603030019.k230JCGf010800@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libdap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730/devel Modified Files: .cvsignore libdap.spec sources Log Message: new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libdap/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Nov 2005 21:52:24 -0000 1.2 +++ .cvsignore 3 Mar 2006 00:18:39 -0000 1.3 @@ -1 +1 @@ -libdap-3.5.3.tar.gz +libdap-3.6.0.tar.gz Index: libdap.spec =================================================================== RCS file: /cvs/extras/rpms/libdap/devel/libdap.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libdap.spec 22 Dec 2005 08:10:00 -0000 1.3 +++ libdap.spec 3 Mar 2006 00:18:39 -0000 1.4 @@ -1,8 +1,8 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.5.3 -Release: 3%{?dist} +Version: 3.6.0 +Release: 1%{?dist} #Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz @@ -74,8 +74,8 @@ %{_datadir}/aclocal/* %changelog -* Thu Dec 22 2005 Patrice Dumas - 3.5.3-3 -- rebuild +* Mon Feb 27 2006 James Gallagher - 3.6.0-1 +- new release * Mon Nov 21 2005 Patrice Dumas - 3.5.3-2 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libdap/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Nov 2005 21:52:24 -0000 1.2 +++ sources 3 Mar 2006 00:18:39 -0000 1.3 @@ -1 +1 @@ -62579a9814ccb39579796cdcc1560067 libdap-3.5.3.tar.gz +c2586c2f7225eb9af8d557b36c55c661 libdap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 00:18:11 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 2 Mar 2006 19:18:11 -0500 Subject: rpms/libdap/FC-3 .cvsignore, 1.2, 1.3 libdap.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603030019.k230JEEr010805@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libdap/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730/FC-3 Modified Files: .cvsignore libdap.spec sources Log Message: new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Nov 2005 21:52:24 -0000 1.2 +++ .cvsignore 3 Mar 2006 00:18:11 -0000 1.3 @@ -1 +1 @@ -libdap-3.5.3.tar.gz +libdap-3.6.0.tar.gz Index: libdap.spec =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-3/libdap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libdap.spec 21 Nov 2005 22:01:19 -0000 1.2 +++ libdap.spec 3 Mar 2006 00:18:11 -0000 1.3 @@ -1,8 +1,8 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.5.3 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} #Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz @@ -74,6 +74,9 @@ %{_datadir}/aclocal/* %changelog +* Mon Feb 27 2006 James Gallagher - 3.6.0-1 +- new release + * Mon Nov 21 2005 Patrice Dumas - 3.5.3-2 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Nov 2005 21:52:24 -0000 1.2 +++ sources 3 Mar 2006 00:18:11 -0000 1.3 @@ -1 +1 @@ -62579a9814ccb39579796cdcc1560067 libdap-3.5.3.tar.gz +c2586c2f7225eb9af8d557b36c55c661 libdap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 00:28:44 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 19:28:44 -0500 Subject: rpms/wine/devel .cvsignore, 1.9, 1.10 sources, 1.10, 1.11 wine.spec, 1.17, 1.18 Message-ID: <200603030029.k230THFD010909@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10877 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Feb 2006 22:38:34 -0000 1.9 +++ .cvsignore 3 Mar 2006 00:28:43 -0000 1.10 @@ -1,2 +1,2 @@ wine-fonts-20050524.tar.gz -wine-0.9.8-fe.tar.bz2 +wine-0.9.9-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 16 Feb 2006 22:38:34 -0000 1.10 +++ sources 3 Mar 2006 00:28:43 -0000 1.11 @@ -1,2 +1,2 @@ fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -8a3bc8c46a240a250cb2770147e37efb wine-0.9.8-fe.tar.bz2 +a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- wine.spec 21 Feb 2006 12:22:21 -0000 1.17 +++ wine.spec 3 Mar 2006 00:28:43 -0000 1.18 @@ -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.8 +Version: 0.9.9 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.8-fe.tar.bz2 +Source0: wine-0.9.9-fe.tar.bz2 Source1: wine.init Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora @@ -351,7 +351,7 @@ %{_libdir}/wine/atl.dll.so %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so -%{_libdir}/wine/avifile.dll.so +%{_libdir}/wine/avifile.dll16 %{_libdir}/wine/aviinfo.exe.so %{_libdir}/wine/aviplay.exe.so %{_libdir}/wine/cabinet.dll.so @@ -361,27 +361,27 @@ %{_libdir}/wine/comcat.dll.so %{_libdir}/wine/comctl32.dll.so %{_libdir}/wine/comdlg32.dll.so -%{_libdir}/wine/comm.drv.so +%{_libdir}/wine/comm.drv16 %{_libdir}/wine/commdlg.dll.so -%{_libdir}/wine/compobj.dll.so +%{_libdir}/wine/compobj.dll16 %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so %{_libdir}/wine/cryptdll.dll.so -%{_libdir}/wine/ctl3d.dll.so +%{_libdir}/wine/ctl3d.dll16 %{_libdir}/wine/ctl3d32.dll.so -%{_libdir}/wine/ctl3dv2.dll.so +%{_libdir}/wine/ctl3dv2.dll16 %{_libdir}/wine/d3dim.dll.so %{_libdir}/wine/d3drm.dll.so %{_libdir}/wine/d3dxof.dll.so %{_libdir}/wine/dbghelp.dll.so %{_libdir}/wine/dciman32.dll.so -%{_libdir}/wine/ddeml.dll.so +%{_libdir}/wine/ddeml.dll16 %{_libdir}/wine/ddraw.dll.so %{_libdir}/wine/devenum.dll.so %{_libdir}/wine/dinput.dll.so %{_libdir}/wine/dinput8.dll.so -%{_libdir}/wine/dispdib.dll.so -%{_libdir}/wine/display.drv.so +%{_libdir}/wine/dispdib.dll16 +%{_libdir}/wine/display.drv16 %{_libdir}/wine/dmband.dll.so %{_libdir}/wine/dmcompos.dll.so %{_libdir}/wine/dmime.dll.so @@ -399,7 +399,7 @@ %{_libdir}/wine/dswave.dll.so %{_libdir}/wine/dxdiagn.dll.so %{_libdir}/wine/eject.exe.so -%{_libdir}/wine/gdi.exe.so +%{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so @@ -409,16 +409,16 @@ %{_libdir}/wine/ifsmgr.vxd.so %{_libdir}/wine/imaadp32.acm.so %{_libdir}/wine/imagehlp.dll.so -%{_libdir}/wine/imm.dll.so +%{_libdir}/wine/imm.dll16 %{_libdir}/wine/imm32.dll.so %{_libdir}/wine/iphlpapi.dll.so %{_libdir}/wine/itss.dll.so %{_libdir}/wine/joystick.drv.so %{_libdir}/wine/kernel32.dll.so -%{_libdir}/wine/keyboard.drv.so -%{_libdir}/wine/krnl386.exe.so +%{_libdir}/wine/keyboard.drv16 +%{_libdir}/wine/krnl386.exe16 %{_libdir}/wine/lz32.dll.so -%{_libdir}/wine/lzexpand.dll.so +%{_libdir}/wine/lzexpand.dll16 %{_libdir}/wine/mapi32.dll.so %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so @@ -427,15 +427,16 @@ %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so -%{_libdir}/wine/mmsystem.dll.so +%{_libdir}/wine/mmsystem.dll16 %{_libdir}/wine/monodebg.vxd.so -%{_libdir}/wine/mouse.drv.so +%{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so -%{_libdir}/wine/msacm.dll.so +%{_libdir}/wine/msacm.dll16 %{_libdir}/wine/msacm.drv.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so +%{_libdir}/wine/msftedit.dll.so %{_libdir}/wine/msg711.acm.so %{_libdir}/wine/mshtml.dll.so %{_libdir}/wine/msi.dll.so @@ -449,7 +450,7 @@ %{_libdir}/wine/msvcrtd.dll.so %{_libdir}/wine/msvfw32.dll.so %{_libdir}/wine/msvidc32.dll.so -%{_libdir}/wine/msvideo.dll.so +%{_libdir}/wine/msvideo.dll16 %{_libdir}/wine/mswsock.dll.so %{_libdir}/wine/msxml3.dll.so %{_libdir}/wine/netapi32.dll.so @@ -458,26 +459,26 @@ %{_libdir}/wine/objsel.dll.so %{_libdir}/wine/odbc32.dll.so %{_libdir}/wine/odbccp32.dll.so -%{_libdir}/wine/ole2.dll.so -%{_libdir}/wine/ole2conv.dll.so -%{_libdir}/wine/ole2disp.dll.so -%{_libdir}/wine/ole2nls.dll.so -%{_libdir}/wine/ole2prox.dll.so -%{_libdir}/wine/ole2thk.dll.so +%{_libdir}/wine/ole2.dll16 +%{_libdir}/wine/ole2conv.dll16 +%{_libdir}/wine/ole2disp.dll16 +%{_libdir}/wine/ole2nls.dll16 +%{_libdir}/wine/ole2prox.dll16 +%{_libdir}/wine/ole2thk.dll16 %{_libdir}/wine/ole32.dll.so %{_libdir}/wine/oleacc.dll.so %{_libdir}/wine/oleaut32.dll.so -%{_libdir}/wine/olecli.dll.so +%{_libdir}/wine/olecli.dll16 %{_libdir}/wine/olecli32.dll.so %{_libdir}/wine/oledlg.dll.so %{_libdir}/wine/olepro32.dll.so -%{_libdir}/wine/olesvr.dll.so +%{_libdir}/wine/olesvr.dll16 %{_libdir}/wine/olesvr32.dll.so %{_libdir}/wine/powrprof.dll.so %{_libdir}/wine/psapi.dll.so %{_libdir}/wine/qcap.dll.so %{_libdir}/wine/quartz.dll.so -%{_libdir}/wine/rasapi16.dll.so +%{_libdir}/wine/rasapi16.dll16 %{_libdir}/wine/rasapi32.dll.so %{_libdir}/wine/riched20.dll.so %{_libdir}/wine/riched32.dll.so @@ -488,33 +489,33 @@ %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so %{_libdir}/wine/setupapi.dll.so -%{_libdir}/wine/setupx.dll.so +%{_libdir}/wine/setupx.dll16 %{_libdir}/wine/shdocvw.dll.so -%{_libdir}/wine/shell.dll.so +%{_libdir}/wine/shell.dll16 %{_libdir}/wine/shell32.dll.so %{_libdir}/wine/shfolder.dll.so %{_libdir}/wine/shlwapi.dll.so %{_libdir}/wine/snmpapi.dll.so -%{_libdir}/wine/sound.drv.so +%{_libdir}/wine/sound.drv16 %{_libdir}/wine/stdole2.tlb.so %{_libdir}/wine/stdole32.tlb.so %{_libdir}/wine/sti.dll.so -%{_libdir}/wine/storage.dll.so -%{_libdir}/wine/stress.dll.so -%{_libdir}/wine/system.drv.so +%{_libdir}/wine/storage.dll16 +%{_libdir}/wine/stress.dll16 +%{_libdir}/wine/system.drv16 %{_libdir}/wine/tapi32.dll.so -%{_libdir}/wine/toolhelp.dll.so -%{_libdir}/wine/typelib.dll.so +%{_libdir}/wine/toolhelp.dll16 +%{_libdir}/wine/typelib.dll16 %{_libdir}/wine/unicows.dll.so %{_libdir}/wine/url.dll.so %{_libdir}/wine/urlmon.dll.so -%{_libdir}/wine/user.exe.so +%{_libdir}/wine/user.exe16 %{_libdir}/wine/user32.dll.so %{_libdir}/wine/usp10.dll.so %{_libdir}/wine/uxtheme.dll.so %{_libdir}/wine/vdhcp.vxd.so %{_libdir}/wine/vdmdbg.dll.so -%{_libdir}/wine/ver.dll.so +%{_libdir}/wine/ver.dll16 %{_libdir}/wine/version.dll.so %{_libdir}/wine/vmm.vxd.so %{_libdir}/wine/vnbt.vxd.so @@ -522,28 +523,28 @@ %{_libdir}/wine/vtdapi.vxd.so %{_libdir}/wine/vwin32.vxd.so %{_libdir}/wine/w32skrnl.dll.so -%{_libdir}/wine/w32sys.dll.so -%{_libdir}/wine/win32s16.dll.so -%{_libdir}/wine/win87em.dll.so -%{_libdir}/wine/winaspi.dll.so -%{_libdir}/wine/windebug.dll.so +%{_libdir}/wine/w32sys.dll16 +%{_libdir}/wine/win32s16.dll16 +%{_libdir}/wine/win87em.dll16 +%{_libdir}/wine/winaspi.dll16 +%{_libdir}/wine/windebug.dll16 %{_libdir}/wine/wineaudioio.drv.so %{_libdir}/wine/winedos.dll.so %{_libdir}/wine/wineoss.drv.so %{_libdir}/wine/winex11.drv.so -%{_libdir}/wine/wing.dll.so +%{_libdir}/wine/wing.dll16 %{_libdir}/wine/wininet.dll.so %{_libdir}/wine/winmm.dll.so -%{_libdir}/wine/winnls.dll.so +%{_libdir}/wine/winnls.dll16 %{_libdir}/wine/winnls32.dll.so -%{_libdir}/wine/winsock.dll.so +%{_libdir}/wine/winsock.dll16 %{_libdir}/wine/winspool.drv.so -%{_libdir}/wine/wintab.dll.so +%{_libdir}/wine/wintab.dll16 %{_libdir}/wine/wintab32.dll.so %{_libdir}/wine/wintrust.dll.so %{_libdir}/wine/wnaspi32.dll.so %{_libdir}/wine/wow32.dll.so -%{_libdir}/wine/wprocs.dll.so +%{_libdir}/wine/wprocs.dll16 %{_libdir}/wine/ws2_32.dll.so %{_libdir}/wine/wsock32.dll.so %{_libdir}/wine/wtsapi32.dll.so @@ -593,7 +594,7 @@ %{_datadir}/fonts/wine/vgasyst.fon %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so -%{_libdir}/wine/wineps16.drv.so +%{_libdir}/wine/wineps16.drv16 %{_libdir}/wine/d3d8.dll.so %{_libdir}/wine/d3d9.dll.so %{_libdir}/wine/d3dx8.dll.so @@ -659,7 +660,7 @@ %files twain %defattr(-,root,root,-) -%{_libdir}/wine/twain.dll.so +%{_libdir}/wine/twain.dll16 %{_libdir}/wine/twain_32.dll.so %files capi @@ -695,6 +696,10 @@ %{_libdir}/wine/*.def %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 - version upgrade From fedora-extras-commits at redhat.com Fri Mar 3 00:41:13 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:41:13 -0500 Subject: rpms/libipoddevice - New directory Message-ID: <200603030041.k230fFSN011013@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/libipoddevice Log Message: Directory /cvs/extras/rpms/libipoddevice added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 00:41:19 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:41:19 -0500 Subject: rpms/libipoddevice/devel - New directory Message-ID: <200603030041.k230fLId011028@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/libipoddevice/devel Log Message: Directory /cvs/extras/rpms/libipoddevice/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 00:41:36 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:41:36 -0500 Subject: rpms/libipoddevice Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603030041.k230fcPZ011062@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11050 Added Files: Makefile import.log Log Message: Setup of module libipoddevice --- NEW FILE Makefile --- # Top level Makefile for module libipoddevice all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 3 00:41:42 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:41:42 -0500 Subject: rpms/libipoddevice/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603030041.k230fi8a011082@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11050/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libipoddevice --- NEW 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 Mar 3 00:42:21 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:42:21 -0500 Subject: rpms/libipoddevice import.log,1.1,1.2 Message-ID: <200603030042.k230grvE011150@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11116 Modified Files: import.log Log Message: auto-import libipoddevice-0.4.1-1 on branch devel from libipoddevice-0.4.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Mar 2006 00:41:36 -0000 1.1 +++ import.log 3 Mar 2006 00:42:21 -0000 1.2 @@ -0,0 +1 @@ +libipoddevice-0_4_1-1:HEAD:libipoddevice-0.4.1-1.src.rpm:1141346553 From fedora-extras-commits at redhat.com Fri Mar 3 00:42:27 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:42:27 -0500 Subject: rpms/libipoddevice/devel libipoddevice.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603030042.k230gx7Y011157@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11116/devel Modified Files: .cvsignore sources Added Files: libipoddevice.spec Log Message: auto-import libipoddevice-0.4.1-1 on branch devel from libipoddevice-0.4.1-1.src.rpm --- NEW FILE libipoddevice.spec --- %define libgtop_ver 2.12.0 %define hal_ver 0.5.2 Name: libipoddevice Version: 0.4.1 Release: 1 Summary: Device-specific layer for the Apple iPod Group: Development/Libraries License: LGPL URL: http://banshee-project.org/Subprojects/Libipoddevice Source0: http://banshee-project.org/files/banshee/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: hal-devel >= %{hal_ver} BuildRequires: libgtop2-devel >= %{libgtop_ver} BuildRequires: udev %description libipoddevice is a device-specific layer for the Apple iPod (http://www.apple.com/ipod). libipoddevice provides iPod-specific HAL event notification to applications, and along with objects representing an iPod, which gives the application access to properties and features of an iPod. %package devel Summary: Libraries and headers for using libipoddevice Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: hal-devel >= %{hal_ver} Requires: libgtop2-devel >= %{libgtop_ver} Requires: udev %description devel This package contains various headers for using libipoddevice %prep %setup -q %build %configure make %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT %makeinstall %clean %{__rm} -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %{_bindir}/ipod %{_libdir}/libipoddevice.so.* %files devel %{_libdir}/libipoddevice.so %{_libdir}/pkgconfig/ipoddevice.pc %{_includedir}/ipoddevice/ipod-device.h %{_includedir}/ipoddevice/ipod-device-event-listener.h %exclude %{_libdir}/libipoddevice.a %exclude %{_libdir}/libipoddevice.la %changelog * Tue Feb 21 2006 Christopher Aillon 0.4.1-1 - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2006 00:41:41 -0000 1.1 +++ .cvsignore 3 Mar 2006 00:42:27 -0000 1.2 @@ -0,0 +1 @@ +libipoddevice-0.4.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2006 00:41:41 -0000 1.1 +++ sources 3 Mar 2006 00:42:27 -0000 1.2 @@ -0,0 +1 @@ +000b3c7b82026bf052a16811ba34c515 libipoddevice-0.4.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 01:12:00 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Thu, 2 Mar 2006 20:12:00 -0500 Subject: rpms/l2tpd/devel sources,1.5,1.6 .cvsignore,1.3,1.4 Message-ID: <200603030112.k231CX9F013234@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/l2tpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13215 Modified Files: sources .cvsignore Log Message: update sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/l2tpd/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 21 Feb 2006 06:50:15 -0000 1.5 +++ sources 3 Mar 2006 01:12:00 -0000 1.6 @@ -1,17 +1,3 @@ +ce0b777c5301144bc03d205072a8ea43 l2tpd.init 36144b856b70d58bdb4ac4805cb71bb2 l2tpd-0.69.20051030.tar.gz -6ed1d2dc758627426015de8f87654a03 l2tpd-MSL2TP-StopCCN.patch -15cd18cdc1c1d8a033bc753f0f5e7009 l2tpd-async-sync.patch -a3dc0d257f31f2b8df3a282ddeaf31e7 l2tpd-moredebug.patch -af1572e8653e8f2570323712898c8730 l2tpd-solaris.patch -3c43857ad98b067de1b07ed01a7bdeec l2tpd-changelog.patch -5f40d5ef85560bf3c4a38f3ec1f70b45 l2tpd-move-pty-logic.patch -8d1be89b09d4786d087e2315ccc35d22 l2tpd-stopccn.patch -a39c275369a5696f1d8caf908553876d l2tpd-gcc4-fixes.patch -bc5c2580b888c9bf3fc7da95f486a9cc l2tpd-uaddr.patch -e7a83525c08b73fcf6121c76821281f8 l2tpd-log.patch -cef234d7fd79cfb1d48c946f22cfcb0e l2tpd-nodebug-default.patch -68fbfaf8556c8d5ef211d3481fd35e39 l2tpd-version.patch -64d7cbe5fd2c60b133f9b70f29a73674 l2tpd-log-strerr.patch -123ff5faaf6b71696f188f764f5695b4 l2tpd-patents.patch -6ad9954aea9b0ee5f2136fb93f2b1dca l2tpd-max-retries.patch -49b6937aa97e304a088562a235a52c3f l2tpd-socket.patch +fcf5f822027a8f0f855245d366020a66 l2tpd.conf Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/l2tpd/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Feb 2006 06:15:20 -0000 1.3 +++ .cvsignore 3 Mar 2006 01:12:00 -0000 1.4 @@ -1 +1,3 @@ -l2tpd-MSL2TP-StopCCN.patch +l2tpd.init +l2tpd-0.69.20051030.tar.gz +l2tpd.conf From fedora-extras-commits at redhat.com Fri Mar 3 01:21:19 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:21:19 -0500 Subject: rpms/perl-IO-All - New directory Message-ID: <200603030121.k231LLsL013338@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13330/perl-IO-All Log Message: Directory /cvs/extras/rpms/perl-IO-All added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 01:21:25 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:21:25 -0500 Subject: rpms/perl-IO-All/devel - New directory Message-ID: <200603030121.k231LRHt013353@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13330/perl-IO-All/devel Log Message: Directory /cvs/extras/rpms/perl-IO-All/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 01:21:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:21:42 -0500 Subject: rpms/perl-IO-All Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603030121.k231LiWb013387@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13375 Added Files: Makefile import.log Log Message: Setup of module perl-IO-All --- NEW FILE Makefile --- # Top level Makefile for module perl-IO-All all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 3 01:21:48 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:21:48 -0500 Subject: rpms/perl-IO-All/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603030121.k231LoXc013407@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13375/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-IO-All --- NEW 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 Mar 3 01:22:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:22:16 -0500 Subject: rpms/perl-IO-All import.log,1.1,1.2 Message-ID: <200603030122.k231MmMi013480@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13443 Modified Files: import.log Log Message: auto-import perl-IO-All-0.33-2 on branch devel from perl-IO-All-0.33-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Mar 2006 01:21:42 -0000 1.1 +++ import.log 3 Mar 2006 01:22:16 -0000 1.2 @@ -0,0 +1 @@ +perl-IO-All-0_33-2:HEAD:perl-IO-All-0.33-2.src.rpm:1141348929 From fedora-extras-commits at redhat.com Fri Mar 3 01:22:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:22:22 -0500 Subject: rpms/perl-IO-All/devel perl-IO-All.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603030122.k231MsFi013484@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13443/devel Modified Files: .cvsignore sources Added Files: perl-IO-All.spec Log Message: auto-import perl-IO-All-0.33-2 on branch devel from perl-IO-All-0.33-2.src.rpm --- NEW FILE perl-IO-All.spec --- Name: perl-IO-All Version: 0.33 Release: 2%{?dist} Summary: IO::All Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-All/ Source0: http://www.cpan.org/modules/by-module/IO/IO-All-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Spiffy) >= 0.21 Requires: perl(Spiffy) >= 0.21 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The IO::All object is a proxy for IO::File, IO::Dir, IO::Socket, IO::String, Tie::File, File::Spec, File::Path and File::ReadBackwards; as well as all the DBM and MLDBM modules. You can use most of the methods found in these classes and in IO::Handle (which they inherit from). IO::All adds dozens of other helpful idiomatic methods including file stat and manipulation functions. %prep %setup -q -n IO-All-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check %{?_with_check:make test} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.33-2 - Filter Requires: perl(mixin). - Turn off "make test" for now. - Drop explict BR: perl. * Wed Dec 28 2005 Steven Pritchard 0.33-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2006 01:21:48 -0000 1.1 +++ .cvsignore 3 Mar 2006 01:22:22 -0000 1.2 @@ -0,0 +1 @@ +IO-All-0.33.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2006 01:21:48 -0000 1.1 +++ sources 3 Mar 2006 01:22:22 -0000 1.2 @@ -0,0 +1 @@ +7e9e83dc8ec4404d79ee73af08f6421f IO-All-0.33.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 01:24:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:24:21 -0500 Subject: owners owners.list,1.698,1.699 Message-ID: <200603030124.k231Os06013551@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13533 Modified Files: owners.list Log Message: Add perl-IO-All. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.698 retrieving revision 1.699 diff -u -r1.698 -r1.699 --- owners.list 2 Mar 2006 22:43:53 -0000 1.698 +++ owners.list 3 Mar 2006 01:24:21 -0000 1.699 @@ -912,6 +912,7 @@ Fedora Extras|perl-Image-Size|Determine the size of images in several common formats in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Xbm|Load, create, manipulate and save xbm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Xpm|Load, create, manipulate and save xpm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-IO-All|IO::All Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 3 01:28:32 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:28:32 -0500 Subject: rpms/perl-Spoon - New directory Message-ID: <200603030128.k231SYi5013629@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13621/perl-Spoon Log Message: Directory /cvs/extras/rpms/perl-Spoon added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 01:28:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:28:39 -0500 Subject: rpms/perl-Spoon/devel - New directory Message-ID: <200603030128.k231Sf0d013644@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13621/perl-Spoon/devel Log Message: Directory /cvs/extras/rpms/perl-Spoon/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 01:29:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:29:27 -0500 Subject: rpms/perl-Spoon Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603030129.k231TTHv013679@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13666 Added Files: Makefile import.log Log Message: Setup of module perl-Spoon --- NEW FILE Makefile --- # Top level Makefile for module perl-Spoon all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 3 01:29:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:29:33 -0500 Subject: rpms/perl-Spoon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603030129.k231TZoT013697@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13666/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Spoon --- NEW 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 Mar 3 01:30:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:30:27 -0500 Subject: rpms/perl-Spoon import.log,1.1,1.2 Message-ID: <200603030130.k231UxHW013774@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13738 Modified Files: import.log Log Message: auto-import perl-Spoon-0.23-2 on branch devel from perl-Spoon-0.23-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Spoon/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Mar 2006 01:29:27 -0000 1.1 +++ import.log 3 Mar 2006 01:30:26 -0000 1.2 @@ -0,0 +1 @@ +perl-Spoon-0_23-2:HEAD:perl-Spoon-0.23-2.src.rpm:1141349418 From fedora-extras-commits at redhat.com Fri Mar 3 01:30:37 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:30:37 -0500 Subject: rpms/perl-Spoon/devel filter-provides.sh, NONE, 1.1 perl-Spoon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603030131.k231VAkw013778@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13738/devel Modified Files: .cvsignore sources Added Files: filter-provides.sh perl-Spoon.spec Log Message: auto-import perl-Spoon-0.23-2 on branch devel from perl-Spoon-0.23-2.src.rpm --- NEW FILE filter-provides.sh --- #!/bin/sh if [ -x /usr/lib/rpm/redhat/find-provides ]; then FINDREQ=/usr/lib/rpm/redhat/find-provides else FINDREQ=/usr/lib/rpm/find-provides fi $FINDREQ $* | grep -v 'perl(IO::All)' --- NEW FILE perl-Spoon.spec --- Name: perl-Spoon Version: 0.23 Release: 2%{?dist} Summary: Spoon Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Spoon/ Source0: http://www.cpan.org/modules/by-module/Spoon/Spoon-%{version}.tar.gz Source1: filter-provides.sh %define _use_internal_dependency_generator 0 %define __find_provides %{SOURCE1} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(IO::All) >= 0.32 BuildRequires: perl(Spiffy) >= 0.22 BuildRequires: perl(Template) >= 2.10 BuildRequires: perl(Test::Memory::Cycle) BuildRequires: perl(Time::HiRes) Requires: perl(IO::All) >= 0.32 Requires: perl(Spiffy) >= 0.22 Requires: perl(Template) >= 2.10 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Spoon is an Application Framework that is designed primarily for building Social Software web applications. The Kwiki wiki software is built on top of Spoon. %prep %setup -q -n Spoon-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.23-2 - Drop explicit BR: perl. * Wed Dec 28 2005 Steven Pritchard 0.23-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Spoon/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2006 01:29:33 -0000 1.1 +++ .cvsignore 3 Mar 2006 01:30:36 -0000 1.2 @@ -0,0 +1 @@ +Spoon-0.23.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Spoon/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2006 01:29:33 -0000 1.1 +++ sources 3 Mar 2006 01:30:36 -0000 1.2 @@ -0,0 +1 @@ +96acf017b3aa492e62afb1f826d3d9bd Spoon-0.23.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 02:06:15 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 21:06:15 -0500 Subject: rpms/perl-Spoon/devel filter-provides.sh, 1.1, 1.2 perl-Spoon.spec, 1.1, 1.2 Message-ID: <200603030206.k2326p3M015792@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15770 Modified Files: filter-provides.sh perl-Spoon.spec Log Message: Improve Summary. Fix Source0. Index: filter-provides.sh =================================================================== RCS file: /cvs/extras/rpms/perl-Spoon/devel/filter-provides.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- filter-provides.sh 3 Mar 2006 01:30:36 -0000 1.1 +++ filter-provides.sh 3 Mar 2006 02:06:05 -0000 1.2 @@ -1,9 +1,9 @@ #!/bin/sh if [ -x /usr/lib/rpm/redhat/find-provides ]; then - FINDREQ=/usr/lib/rpm/redhat/find-provides + FINDPROV=/usr/lib/rpm/redhat/find-provides else - FINDREQ=/usr/lib/rpm/find-provides + FINDPROV=/usr/lib/rpm/find-provides fi -$FINDREQ $* | grep -v 'perl(IO::All)' +$FINDPROV $* | grep -v 'perl(IO::All)' Index: perl-Spoon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Spoon/devel/perl-Spoon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Spoon.spec 3 Mar 2006 01:30:36 -0000 1.1 +++ perl-Spoon.spec 3 Mar 2006 02:06:05 -0000 1.2 @@ -1,11 +1,11 @@ Name: perl-Spoon Version: 0.23 -Release: 2%{?dist} -Summary: Spoon Perl module +Release: 3%{?dist} +Summary: Spiffy application framework License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Spoon/ -Source0: http://www.cpan.org/modules/by-module/Spoon/Spoon-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Spoon-%{version}.tar.gz Source1: filter-provides.sh %define _use_internal_dependency_generator 0 %define __find_provides %{SOURCE1} @@ -59,6 +59,10 @@ %{_mandir}/man3/* %changelog +* Thu Mar 02 2006 Steven Pritchard 0.23-3 +- Improve Summary. +- Fix Source0. + * Mon Feb 27 2006 Steven Pritchard 0.23-2 - Drop explicit BR: perl. From fedora-extras-commits at redhat.com Fri Mar 3 02:07:32 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 21:07:32 -0500 Subject: owners owners.list,1.699,1.700 Message-ID: <200603030208.k23284i0015879@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15843 Modified Files: owners.list Log Message: Add perl-Spoon. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.699 retrieving revision 1.700 diff -u -r1.699 -r1.700 --- owners.list 3 Mar 2006 01:24:21 -0000 1.699 +++ owners.list 3 Mar 2006 02:07:32 -0000 1.700 @@ -982,6 +982,7 @@ Fedora Extras|perl-SOAP-Lite|Provides the Simple Object Access Protocol (SOAP)|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spiffy|Framework for doing object oriented (OO) programming in Perl|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com 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 From fedora-extras-commits at redhat.com Fri Mar 3 05:50:27 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:50:27 -0500 Subject: rpms/ipod-sharp - New directory Message-ID: <200603030550.k235oTrD022051@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/ipod-sharp Log Message: Directory /cvs/extras/rpms/ipod-sharp added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 05:50:32 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:50:32 -0500 Subject: rpms/ipod-sharp/devel - New directory Message-ID: <200603030550.k235oYMb022066@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/ipod-sharp/devel Log Message: Directory /cvs/extras/rpms/ipod-sharp/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 05:50:49 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:50:49 -0500 Subject: rpms/ipod-sharp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603030550.k235op1n022100@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22088 Added Files: Makefile import.log Log Message: Setup of module ipod-sharp --- NEW FILE Makefile --- # Top level Makefile for module ipod-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 Fri Mar 3 05:50:55 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:50:55 -0500 Subject: rpms/ipod-sharp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603030550.k235ovmA022120@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22088/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ipod-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 Fri Mar 3 05:51:53 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:51:53 -0500 Subject: rpms/ipod-sharp import.log,1.1,1.2 Message-ID: <200603030552.k235qPqP022192@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22158 Modified Files: import.log Log Message: auto-import ipod-sharp-0.5.15-1 on branch devel from ipod-sharp-0.5.15-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ipod-sharp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Mar 2006 05:50:49 -0000 1.1 +++ import.log 3 Mar 2006 05:51:52 -0000 1.2 @@ -0,0 +1 @@ +ipod-sharp-0_5_15-1:HEAD:ipod-sharp-0.5.15-1.src.rpm:1141365124 From fedora-extras-commits at redhat.com Fri Mar 3 05:51:58 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:51:58 -0500 Subject: rpms/ipod-sharp/devel ipod-sharp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603030552.k235qVt1022196@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22158/devel Modified Files: .cvsignore sources Added Files: ipod-sharp.spec Log Message: auto-import ipod-sharp-0.5.15-1 on branch devel from ipod-sharp-0.5.15-1.src.rpm --- NEW FILE ipod-sharp.spec --- Name: ipod-sharp Version: 0.5.15 Release: 1 Summary: Support for high level features of Apple's iPod Group: Development/Libraries License: LGPL URL: http://banshee-project.org/Subprojects/Ipod-sharp Source0: http://banshee-project.org/files/ipod-sharp/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libipoddevice-devel BuildRequires: mono-devel BuildRequires: gtk-sharp2 %description ipod-sharp provies support for high level features of Apple's iPod, like support for audio content, including reading and writing of the iTunes/iPod database, and syncing music. ipod-sharp also provides a CIL wrapper for libipoddevice. %prep %setup -q %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure --disable-docs make %{?_smp_mflags} %install %{__rm} -rf ${RPM_BUILD_ROOT} export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} make install DESTDIR=${RPM_BUILD_ROOT} GACUTIL_FLAGS="/package ipod-sharp /gacdir %{_prefix}/lib /root ${RPM_BUILD_ROOT}%{_prefix}/lib" %clean %{__rm} -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/pkgconfig/ipod-sharp.pc %{_libdir}/pkgconfig/ipod-sharp-ui.pc %dir %{_libdir}/ipod-sharp %{_libdir}/ipod-sharp/ipod-sharp.dll %{_libdir}/ipod-sharp/ipod-sharp-ui.dll %changelog * Tue Feb 21 2006 Christopher Aillon 0.5.15-1 - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ipod-sharp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2006 05:50:55 -0000 1.1 +++ .cvsignore 3 Mar 2006 05:51:58 -0000 1.2 @@ -0,0 +1 @@ +ipod-sharp-0.5.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ipod-sharp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2006 05:50:55 -0000 1.1 +++ sources 3 Mar 2006 05:51:58 -0000 1.2 @@ -0,0 +1 @@ +734956f3505f776c6920d4ae687f4bee ipod-sharp-0.5.15.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 06:05:12 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 01:05:12 -0500 Subject: rpms/ipod-sharp/devel ipod-sharp.spec,1.1,1.2 Message-ID: <200603030605.k2365Tp0024140@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24123 Modified Files: ipod-sharp.spec Log Message: * Fri Mar 3 2006 Christopher Aillon 0.5.15-2 - Build on 64bit platforms Index: ipod-sharp.spec =================================================================== RCS file: /cvs/extras/rpms/ipod-sharp/devel/ipod-sharp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ipod-sharp.spec 3 Mar 2006 05:51:58 -0000 1.1 +++ ipod-sharp.spec 3 Mar 2006 06:05:11 -0000 1.2 @@ -1,6 +1,6 @@ Name: ipod-sharp Version: 0.5.15 -Release: 1 +Release: 2 Summary: Support for high level features of Apple's iPod Group: Development/Libraries @@ -40,10 +40,13 @@ %doc COPYING %{_libdir}/pkgconfig/ipod-sharp.pc %{_libdir}/pkgconfig/ipod-sharp-ui.pc -%dir %{_libdir}/ipod-sharp -%{_libdir}/ipod-sharp/ipod-sharp.dll -%{_libdir}/ipod-sharp/ipod-sharp-ui.dll +%dir %{_prefix}/lib/ipod-sharp +%{_prefix}/lib/ipod-sharp/ipod-sharp.dll +%{_prefix}/lib/ipod-sharp/ipod-sharp-ui.dll %changelog +* Fri Mar 3 2006 Christopher Aillon 0.5.15-2 +- Build on 64bit platforms + * Tue Feb 21 2006 Christopher Aillon 0.5.15-1 - Initial RPM From fedora-extras-commits at redhat.com Fri Mar 3 07:36:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Mar 2006 02:36:30 -0500 Subject: rpms/wine/devel wine.spec,1.18,1.19 Message-ID: <200603030737.k237b2Ju026308@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26291 Modified Files: wine.spec Log Message: - fix another dll Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- wine.spec 3 Mar 2006 00:28:43 -0000 1.18 +++ wine.spec 3 Mar 2006 07:36:29 -0000 1.19 @@ -362,7 +362,7 @@ %{_libdir}/wine/comctl32.dll.so %{_libdir}/wine/comdlg32.dll.so %{_libdir}/wine/comm.drv16 -%{_libdir}/wine/commdlg.dll.so +%{_libdir}/wine/commdlg.dll16 %{_libdir}/wine/compobj.dll16 %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so From fedora-extras-commits at redhat.com Fri Mar 3 08:05:05 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 03:05:05 -0500 Subject: rpms/libnc-dap/FC-3 .cvsignore, 1.2, 1.3 libnc-dap.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603030805.k2385btS028379@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libnc-dap/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28323/FC-3 Modified Files: .cvsignore libnc-dap.spec sources Log Message: * Tue Feb 28 2006 James Gallagher - 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Nov 2005 08:25:41 -0000 1.2 +++ .cvsignore 3 Mar 2006 08:05:05 -0000 1.3 @@ -1 +1 @@ -libnc-dap-3.5.2.tar.gz +libnc-dap-3.6.0.tar.gz Index: libnc-dap.spec =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-3/libnc-dap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnc-dap.spec 22 Nov 2005 08:30:20 -0000 1.2 +++ libnc-dap.spec 3 Mar 2006 08:05:05 -0000 1.3 @@ -1,7 +1,7 @@ Name: libnc-dap Summary: The NetCDF interface to DAP-2 from OPeNDAP -Version: 3.5.2 -Release: 5%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz URL: http://www.opendap.org/ @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL/BSD # Mandrake and Fedora -BuildRequires: libdap-devel >= 3.5.2 +BuildRequires: libdap-devel >= 3.6.0 %description The libnc-dap library is a call-for-call replacement for netcdf 3.5 (and @@ -26,8 +26,8 @@ Summary: Static libraries and header files from libnc-dap Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libdap-devel >= 3.5.2 -# +Requires: libdap-devel >= 3.6.0 + %description devel This package contains all the files needed to develop applications that will use libnc-dap. @@ -68,6 +68,9 @@ %changelog +* Tue Feb 28 2006 James Gallagher - 3.6.0-1 +- new release + * Mon Nov 21 2005 Patrice Dumas - 3.5.2-5 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Nov 2005 08:25:41 -0000 1.2 +++ sources 3 Mar 2006 08:05:05 -0000 1.3 @@ -1 +1 @@ -2ac95dc2e48303fe0ecfc48c08fa0d63 libnc-dap-3.5.2.tar.gz +95f3940476e0d3f019bd58ad7523a5dd libnc-dap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 08:05:19 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 03:05:19 -0500 Subject: rpms/libnc-dap/FC-4 .cvsignore, 1.2, 1.3 libnc-dap.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603030805.k2385rE3028384@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libnc-dap/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28323/FC-4 Modified Files: .cvsignore libnc-dap.spec sources Log Message: * Tue Feb 28 2006 James Gallagher - 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Nov 2005 08:25:41 -0000 1.2 +++ .cvsignore 3 Mar 2006 08:05:19 -0000 1.3 @@ -1 +1 @@ -libnc-dap-3.5.2.tar.gz +libnc-dap-3.6.0.tar.gz Index: libnc-dap.spec =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-4/libnc-dap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnc-dap.spec 22 Nov 2005 08:30:20 -0000 1.2 +++ libnc-dap.spec 3 Mar 2006 08:05:19 -0000 1.3 @@ -1,7 +1,7 @@ Name: libnc-dap Summary: The NetCDF interface to DAP-2 from OPeNDAP -Version: 3.5.2 -Release: 5%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz URL: http://www.opendap.org/ @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL/BSD # Mandrake and Fedora -BuildRequires: libdap-devel >= 3.5.2 +BuildRequires: libdap-devel >= 3.6.0 %description The libnc-dap library is a call-for-call replacement for netcdf 3.5 (and @@ -26,8 +26,8 @@ Summary: Static libraries and header files from libnc-dap Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libdap-devel >= 3.5.2 -# +Requires: libdap-devel >= 3.6.0 + %description devel This package contains all the files needed to develop applications that will use libnc-dap. @@ -68,6 +68,9 @@ %changelog +* Tue Feb 28 2006 James Gallagher - 3.6.0-1 +- new release + * Mon Nov 21 2005 Patrice Dumas - 3.5.2-5 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Nov 2005 08:25:41 -0000 1.2 +++ sources 3 Mar 2006 08:05:19 -0000 1.3 @@ -1 +1 @@ -2ac95dc2e48303fe0ecfc48c08fa0d63 libnc-dap-3.5.2.tar.gz +95f3940476e0d3f019bd58ad7523a5dd libnc-dap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 08:05:26 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 03:05:26 -0500 Subject: rpms/libnc-dap/devel .cvsignore, 1.2, 1.3 libnc-dap.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603030805.k2385wjH028389@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libnc-dap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28323/devel Modified Files: .cvsignore libnc-dap.spec sources Log Message: * Tue Feb 28 2006 James Gallagher - 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Nov 2005 08:25:41 -0000 1.2 +++ .cvsignore 3 Mar 2006 08:05:26 -0000 1.3 @@ -1 +1 @@ -libnc-dap-3.5.2.tar.gz +libnc-dap-3.6.0.tar.gz Index: libnc-dap.spec =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/devel/libnc-dap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnc-dap.spec 22 Nov 2005 08:30:20 -0000 1.2 +++ libnc-dap.spec 3 Mar 2006 08:05:26 -0000 1.3 @@ -1,7 +1,7 @@ Name: libnc-dap Summary: The NetCDF interface to DAP-2 from OPeNDAP -Version: 3.5.2 -Release: 5%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz URL: http://www.opendap.org/ @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL/BSD # Mandrake and Fedora -BuildRequires: libdap-devel >= 3.5.2 +BuildRequires: libdap-devel >= 3.6.0 %description The libnc-dap library is a call-for-call replacement for netcdf 3.5 (and @@ -26,8 +26,8 @@ Summary: Static libraries and header files from libnc-dap Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libdap-devel >= 3.5.2 -# +Requires: libdap-devel >= 3.6.0 + %description devel This package contains all the files needed to develop applications that will use libnc-dap. @@ -68,6 +68,9 @@ %changelog +* Tue Feb 28 2006 James Gallagher - 3.6.0-1 +- new release + * Mon Nov 21 2005 Patrice Dumas - 3.5.2-5 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Nov 2005 08:25:41 -0000 1.2 +++ sources 3 Mar 2006 08:05:26 -0000 1.3 @@ -1 +1 @@ -2ac95dc2e48303fe0ecfc48c08fa0d63 libnc-dap-3.5.2.tar.gz +95f3940476e0d3f019bd58ad7523a5dd libnc-dap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 08:21:14 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 03:21:14 -0500 Subject: rpms/libnc-dap/devel libnc-dap.spec,1.3,1.4 Message-ID: <200603030821.k238Lk7s028546@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libnc-dap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28529 Modified Files: libnc-dap.spec Log Message: bump release Index: libnc-dap.spec =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/devel/libnc-dap.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libnc-dap.spec 3 Mar 2006 08:05:26 -0000 1.3 +++ libnc-dap.spec 3 Mar 2006 08:21:13 -0000 1.4 @@ -1,7 +1,7 @@ Name: libnc-dap Summary: The NetCDF interface to DAP-2 from OPeNDAP Version: 3.6.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz URL: http://www.opendap.org/ @@ -68,7 +68,7 @@ %changelog -* Tue Feb 28 2006 James Gallagher - 3.6.0-1 +* Tue Feb 28 2006 James Gallagher - 3.6.0-1.1 - new release * Mon Nov 21 2005 Patrice Dumas - 3.5.2-5 From fedora-extras-commits at redhat.com Fri Mar 3 09:16:35 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Mar 2006 04:16:35 -0500 Subject: rpms/wine/FC-4 .cvsignore, 1.9, 1.10 sources, 1.10, 1.11 wine.spec, 1.14, 1.15 Message-ID: <200603030917.k239H8Tb031144@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31106/FC-4 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Feb 2006 22:38:28 -0000 1.9 +++ .cvsignore 3 Mar 2006 09:16:35 -0000 1.10 @@ -1,2 +1,2 @@ wine-fonts-20050524.tar.gz -wine-0.9.8-fe.tar.bz2 +wine-0.9.9-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 16 Feb 2006 22:38:28 -0000 1.10 +++ sources 3 Mar 2006 09:16:35 -0000 1.11 @@ -1,2 +1,2 @@ fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -8a3bc8c46a240a250cb2770147e37efb wine-0.9.8-fe.tar.bz2 +a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- wine.spec 21 Feb 2006 12:22:15 -0000 1.14 +++ wine.spec 3 Mar 2006 09:16:35 -0000 1.15 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.8-fe.tar.bz2 +Source0: wine-0.9.9-fe.tar.bz2 Source1: wine.init Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora @@ -338,7 +338,7 @@ %{_libdir}/wine/atl.dll.so %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so -%{_libdir}/wine/avifile.dll.so +%{_libdir}/wine/avifile.dll16 %{_libdir}/wine/aviinfo.exe.so %{_libdir}/wine/aviplay.exe.so %{_libdir}/wine/cabinet.dll.so @@ -348,27 +348,27 @@ %{_libdir}/wine/comcat.dll.so %{_libdir}/wine/comctl32.dll.so %{_libdir}/wine/comdlg32.dll.so -%{_libdir}/wine/comm.drv.so -%{_libdir}/wine/commdlg.dll.so -%{_libdir}/wine/compobj.dll.so +%{_libdir}/wine/comm.drv16 +%{_libdir}/wine/commdlg.dll16 +%{_libdir}/wine/compobj.dll16 %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so %{_libdir}/wine/cryptdll.dll.so -%{_libdir}/wine/ctl3d.dll.so +%{_libdir}/wine/ctl3d.dll16 %{_libdir}/wine/ctl3d32.dll.so -%{_libdir}/wine/ctl3dv2.dll.so +%{_libdir}/wine/ctl3dv2.dll16 %{_libdir}/wine/d3dim.dll.so %{_libdir}/wine/d3drm.dll.so %{_libdir}/wine/d3dxof.dll.so %{_libdir}/wine/dbghelp.dll.so %{_libdir}/wine/dciman32.dll.so -%{_libdir}/wine/ddeml.dll.so +%{_libdir}/wine/ddeml.dll16 %{_libdir}/wine/ddraw.dll.so %{_libdir}/wine/devenum.dll.so %{_libdir}/wine/dinput.dll.so %{_libdir}/wine/dinput8.dll.so -%{_libdir}/wine/dispdib.dll.so -%{_libdir}/wine/display.drv.so +%{_libdir}/wine/dispdib.dll16 +%{_libdir}/wine/display.drv16 %{_libdir}/wine/dmband.dll.so %{_libdir}/wine/dmcompos.dll.so %{_libdir}/wine/dmime.dll.so @@ -386,7 +386,7 @@ %{_libdir}/wine/dswave.dll.so %{_libdir}/wine/dxdiagn.dll.so %{_libdir}/wine/eject.exe.so -%{_libdir}/wine/gdi.exe.so +%{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so @@ -396,16 +396,16 @@ %{_libdir}/wine/ifsmgr.vxd.so %{_libdir}/wine/imaadp32.acm.so %{_libdir}/wine/imagehlp.dll.so -%{_libdir}/wine/imm.dll.so +%{_libdir}/wine/imm.dll16 %{_libdir}/wine/imm32.dll.so %{_libdir}/wine/iphlpapi.dll.so %{_libdir}/wine/itss.dll.so %{_libdir}/wine/joystick.drv.so %{_libdir}/wine/kernel32.dll.so -%{_libdir}/wine/keyboard.drv.so -%{_libdir}/wine/krnl386.exe.so +%{_libdir}/wine/keyboard.drv16 +%{_libdir}/wine/krnl386.exe16 %{_libdir}/wine/lz32.dll.so -%{_libdir}/wine/lzexpand.dll.so +%{_libdir}/wine/lzexpand.dll16 %{_libdir}/wine/mapi32.dll.so %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so @@ -414,15 +414,16 @@ %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so -%{_libdir}/wine/mmsystem.dll.so +%{_libdir}/wine/mmsystem.dll16 %{_libdir}/wine/monodebg.vxd.so -%{_libdir}/wine/mouse.drv.so +%{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so -%{_libdir}/wine/msacm.dll.so +%{_libdir}/wine/msacm.dll16 %{_libdir}/wine/msacm.drv.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so +%{_libdir}/wine/msftedit.dll.so %{_libdir}/wine/msg711.acm.so %{_libdir}/wine/mshtml.dll.so %{_libdir}/wine/msi.dll.so @@ -436,7 +437,7 @@ %{_libdir}/wine/msvcrtd.dll.so %{_libdir}/wine/msvfw32.dll.so %{_libdir}/wine/msvidc32.dll.so -%{_libdir}/wine/msvideo.dll.so +%{_libdir}/wine/msvideo.dll16 %{_libdir}/wine/mswsock.dll.so %{_libdir}/wine/msxml3.dll.so %{_libdir}/wine/netapi32.dll.so @@ -445,26 +446,26 @@ %{_libdir}/wine/objsel.dll.so %{_libdir}/wine/odbc32.dll.so %{_libdir}/wine/odbccp32.dll.so -%{_libdir}/wine/ole2.dll.so -%{_libdir}/wine/ole2conv.dll.so -%{_libdir}/wine/ole2disp.dll.so -%{_libdir}/wine/ole2nls.dll.so -%{_libdir}/wine/ole2prox.dll.so -%{_libdir}/wine/ole2thk.dll.so +%{_libdir}/wine/ole2.dll16 +%{_libdir}/wine/ole2conv.dll16 +%{_libdir}/wine/ole2disp.dll16 +%{_libdir}/wine/ole2nls.dll16 +%{_libdir}/wine/ole2prox.dll16 +%{_libdir}/wine/ole2thk.dll16 %{_libdir}/wine/ole32.dll.so %{_libdir}/wine/oleacc.dll.so %{_libdir}/wine/oleaut32.dll.so -%{_libdir}/wine/olecli.dll.so +%{_libdir}/wine/olecli.dll16 %{_libdir}/wine/olecli32.dll.so %{_libdir}/wine/oledlg.dll.so %{_libdir}/wine/olepro32.dll.so -%{_libdir}/wine/olesvr.dll.so +%{_libdir}/wine/olesvr.dll16 %{_libdir}/wine/olesvr32.dll.so %{_libdir}/wine/powrprof.dll.so %{_libdir}/wine/psapi.dll.so %{_libdir}/wine/qcap.dll.so %{_libdir}/wine/quartz.dll.so -%{_libdir}/wine/rasapi16.dll.so +%{_libdir}/wine/rasapi16.dll16 %{_libdir}/wine/rasapi32.dll.so %{_libdir}/wine/riched20.dll.so %{_libdir}/wine/riched32.dll.so @@ -475,33 +476,33 @@ %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so %{_libdir}/wine/setupapi.dll.so -%{_libdir}/wine/setupx.dll.so +%{_libdir}/wine/setupx.dll16 %{_libdir}/wine/shdocvw.dll.so -%{_libdir}/wine/shell.dll.so +%{_libdir}/wine/shell.dll16 %{_libdir}/wine/shell32.dll.so %{_libdir}/wine/shfolder.dll.so %{_libdir}/wine/shlwapi.dll.so %{_libdir}/wine/snmpapi.dll.so -%{_libdir}/wine/sound.drv.so +%{_libdir}/wine/sound.drv16 %{_libdir}/wine/stdole2.tlb.so %{_libdir}/wine/stdole32.tlb.so %{_libdir}/wine/sti.dll.so -%{_libdir}/wine/storage.dll.so -%{_libdir}/wine/stress.dll.so -%{_libdir}/wine/system.drv.so +%{_libdir}/wine/storage.dll16 +%{_libdir}/wine/stress.dll16 +%{_libdir}/wine/system.drv16 %{_libdir}/wine/tapi32.dll.so -%{_libdir}/wine/toolhelp.dll.so -%{_libdir}/wine/typelib.dll.so +%{_libdir}/wine/toolhelp.dll16 +%{_libdir}/wine/typelib.dll16 %{_libdir}/wine/unicows.dll.so %{_libdir}/wine/url.dll.so %{_libdir}/wine/urlmon.dll.so -%{_libdir}/wine/user.exe.so +%{_libdir}/wine/user.exe16 %{_libdir}/wine/user32.dll.so %{_libdir}/wine/usp10.dll.so %{_libdir}/wine/uxtheme.dll.so %{_libdir}/wine/vdhcp.vxd.so %{_libdir}/wine/vdmdbg.dll.so -%{_libdir}/wine/ver.dll.so +%{_libdir}/wine/ver.dll16 %{_libdir}/wine/version.dll.so %{_libdir}/wine/vmm.vxd.so %{_libdir}/wine/vnbt.vxd.so @@ -509,28 +510,28 @@ %{_libdir}/wine/vtdapi.vxd.so %{_libdir}/wine/vwin32.vxd.so %{_libdir}/wine/w32skrnl.dll.so -%{_libdir}/wine/w32sys.dll.so -%{_libdir}/wine/win32s16.dll.so -%{_libdir}/wine/win87em.dll.so -%{_libdir}/wine/winaspi.dll.so -%{_libdir}/wine/windebug.dll.so +%{_libdir}/wine/w32sys.dll16 +%{_libdir}/wine/win32s16.dll16 +%{_libdir}/wine/win87em.dll16 +%{_libdir}/wine/winaspi.dll16 +%{_libdir}/wine/windebug.dll16 %{_libdir}/wine/wineaudioio.drv.so %{_libdir}/wine/winedos.dll.so %{_libdir}/wine/wineoss.drv.so %{_libdir}/wine/winex11.drv.so -%{_libdir}/wine/wing.dll.so +%{_libdir}/wine/wing.dll16 %{_libdir}/wine/wininet.dll.so %{_libdir}/wine/winmm.dll.so -%{_libdir}/wine/winnls.dll.so +%{_libdir}/wine/winnls.dll16 %{_libdir}/wine/winnls32.dll.so -%{_libdir}/wine/winsock.dll.so +%{_libdir}/wine/winsock.dll16 %{_libdir}/wine/winspool.drv.so -%{_libdir}/wine/wintab.dll.so +%{_libdir}/wine/wintab.dll16 %{_libdir}/wine/wintab32.dll.so %{_libdir}/wine/wintrust.dll.so %{_libdir}/wine/wnaspi32.dll.so %{_libdir}/wine/wow32.dll.so -%{_libdir}/wine/wprocs.dll.so +%{_libdir}/wine/wprocs.dll16 %{_libdir}/wine/ws2_32.dll.so %{_libdir}/wine/wsock32.dll.so %{_libdir}/wine/wtsapi32.dll.so @@ -580,7 +581,7 @@ %{_datadir}/fonts/wine/vgasyst.fon %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so -%{_libdir}/wine/wineps16.drv.so +%{_libdir}/wine/wineps16.drv16 %{_libdir}/wine/d3d8.dll.so %{_libdir}/wine/d3d9.dll.so %{_libdir}/wine/d3dx8.dll.so @@ -646,7 +647,7 @@ %files twain %defattr(-,root,root,-) -%{_libdir}/wine/twain.dll.so +%{_libdir}/wine/twain.dll16 %{_libdir}/wine/twain_32.dll.so %files capi @@ -682,9 +683,13 @@ %{_libdir}/wine/*.def %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 -- Version upgrade +- version upgrade * Thu Feb 09 2006 Andreas Bierfert 0.9.7-3 From fedora-extras-commits at redhat.com Fri Mar 3 09:16:28 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Mar 2006 04:16:28 -0500 Subject: rpms/wine/FC-3 .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 wine.spec, 1.12, 1.13 Message-ID: <200603030917.k239HWde031149@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31106/FC-3 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 16 Feb 2006 22:38:22 -0000 1.8 +++ .cvsignore 3 Mar 2006 09:16:26 -0000 1.9 @@ -1,2 +1,2 @@ wine-fonts-20050524.tar.gz -wine-0.9.8-fe.tar.bz2 +wine-0.9.9-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Feb 2006 22:38:22 -0000 1.9 +++ sources 3 Mar 2006 09:16:26 -0000 1.10 @@ -1,2 +1,2 @@ fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -8a3bc8c46a240a250cb2770147e37efb wine-0.9.8-fe.tar.bz2 +a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- wine.spec 21 Feb 2006 12:22:09 -0000 1.12 +++ wine.spec 3 Mar 2006 09:16:26 -0000 1.13 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.8-fe.tar.bz2 +Source0: wine-0.9.9-fe.tar.bz2 Source1: wine.init Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora @@ -338,7 +338,7 @@ %{_libdir}/wine/atl.dll.so %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so -%{_libdir}/wine/avifile.dll.so +%{_libdir}/wine/avifile.dll16 %{_libdir}/wine/aviinfo.exe.so %{_libdir}/wine/aviplay.exe.so %{_libdir}/wine/cabinet.dll.so @@ -348,27 +348,27 @@ %{_libdir}/wine/comcat.dll.so %{_libdir}/wine/comctl32.dll.so %{_libdir}/wine/comdlg32.dll.so -%{_libdir}/wine/comm.drv.so -%{_libdir}/wine/commdlg.dll.so -%{_libdir}/wine/compobj.dll.so +%{_libdir}/wine/comm.drv16 +%{_libdir}/wine/commdlg.dll16 +%{_libdir}/wine/compobj.dll16 %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so %{_libdir}/wine/cryptdll.dll.so -%{_libdir}/wine/ctl3d.dll.so +%{_libdir}/wine/ctl3d.dll16 %{_libdir}/wine/ctl3d32.dll.so -%{_libdir}/wine/ctl3dv2.dll.so +%{_libdir}/wine/ctl3dv2.dll16 %{_libdir}/wine/d3dim.dll.so %{_libdir}/wine/d3drm.dll.so %{_libdir}/wine/d3dxof.dll.so %{_libdir}/wine/dbghelp.dll.so %{_libdir}/wine/dciman32.dll.so -%{_libdir}/wine/ddeml.dll.so +%{_libdir}/wine/ddeml.dll16 %{_libdir}/wine/ddraw.dll.so %{_libdir}/wine/devenum.dll.so %{_libdir}/wine/dinput.dll.so %{_libdir}/wine/dinput8.dll.so -%{_libdir}/wine/dispdib.dll.so -%{_libdir}/wine/display.drv.so +%{_libdir}/wine/dispdib.dll16 +%{_libdir}/wine/display.drv16 %{_libdir}/wine/dmband.dll.so %{_libdir}/wine/dmcompos.dll.so %{_libdir}/wine/dmime.dll.so @@ -386,7 +386,7 @@ %{_libdir}/wine/dswave.dll.so %{_libdir}/wine/dxdiagn.dll.so %{_libdir}/wine/eject.exe.so -%{_libdir}/wine/gdi.exe.so +%{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so @@ -396,16 +396,16 @@ %{_libdir}/wine/ifsmgr.vxd.so %{_libdir}/wine/imaadp32.acm.so %{_libdir}/wine/imagehlp.dll.so -%{_libdir}/wine/imm.dll.so +%{_libdir}/wine/imm.dll16 %{_libdir}/wine/imm32.dll.so %{_libdir}/wine/iphlpapi.dll.so %{_libdir}/wine/itss.dll.so %{_libdir}/wine/joystick.drv.so %{_libdir}/wine/kernel32.dll.so -%{_libdir}/wine/keyboard.drv.so -%{_libdir}/wine/krnl386.exe.so +%{_libdir}/wine/keyboard.drv16 +%{_libdir}/wine/krnl386.exe16 %{_libdir}/wine/lz32.dll.so -%{_libdir}/wine/lzexpand.dll.so +%{_libdir}/wine/lzexpand.dll16 %{_libdir}/wine/mapi32.dll.so %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so @@ -414,15 +414,16 @@ %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so -%{_libdir}/wine/mmsystem.dll.so +%{_libdir}/wine/mmsystem.dll16 %{_libdir}/wine/monodebg.vxd.so -%{_libdir}/wine/mouse.drv.so +%{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so -%{_libdir}/wine/msacm.dll.so +%{_libdir}/wine/msacm.dll16 %{_libdir}/wine/msacm.drv.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so +%{_libdir}/wine/msftedit.dll.so %{_libdir}/wine/msg711.acm.so %{_libdir}/wine/mshtml.dll.so %{_libdir}/wine/msi.dll.so @@ -436,7 +437,7 @@ %{_libdir}/wine/msvcrtd.dll.so %{_libdir}/wine/msvfw32.dll.so %{_libdir}/wine/msvidc32.dll.so -%{_libdir}/wine/msvideo.dll.so +%{_libdir}/wine/msvideo.dll16 %{_libdir}/wine/mswsock.dll.so %{_libdir}/wine/msxml3.dll.so %{_libdir}/wine/netapi32.dll.so @@ -445,26 +446,26 @@ %{_libdir}/wine/objsel.dll.so %{_libdir}/wine/odbc32.dll.so %{_libdir}/wine/odbccp32.dll.so -%{_libdir}/wine/ole2.dll.so -%{_libdir}/wine/ole2conv.dll.so -%{_libdir}/wine/ole2disp.dll.so -%{_libdir}/wine/ole2nls.dll.so -%{_libdir}/wine/ole2prox.dll.so -%{_libdir}/wine/ole2thk.dll.so +%{_libdir}/wine/ole2.dll16 +%{_libdir}/wine/ole2conv.dll16 +%{_libdir}/wine/ole2disp.dll16 +%{_libdir}/wine/ole2nls.dll16 +%{_libdir}/wine/ole2prox.dll16 +%{_libdir}/wine/ole2thk.dll16 %{_libdir}/wine/ole32.dll.so %{_libdir}/wine/oleacc.dll.so %{_libdir}/wine/oleaut32.dll.so -%{_libdir}/wine/olecli.dll.so +%{_libdir}/wine/olecli.dll16 %{_libdir}/wine/olecli32.dll.so %{_libdir}/wine/oledlg.dll.so %{_libdir}/wine/olepro32.dll.so -%{_libdir}/wine/olesvr.dll.so +%{_libdir}/wine/olesvr.dll16 %{_libdir}/wine/olesvr32.dll.so %{_libdir}/wine/powrprof.dll.so %{_libdir}/wine/psapi.dll.so %{_libdir}/wine/qcap.dll.so %{_libdir}/wine/quartz.dll.so -%{_libdir}/wine/rasapi16.dll.so +%{_libdir}/wine/rasapi16.dll16 %{_libdir}/wine/rasapi32.dll.so %{_libdir}/wine/riched20.dll.so %{_libdir}/wine/riched32.dll.so @@ -475,33 +476,33 @@ %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so %{_libdir}/wine/setupapi.dll.so -%{_libdir}/wine/setupx.dll.so +%{_libdir}/wine/setupx.dll16 %{_libdir}/wine/shdocvw.dll.so -%{_libdir}/wine/shell.dll.so +%{_libdir}/wine/shell.dll16 %{_libdir}/wine/shell32.dll.so %{_libdir}/wine/shfolder.dll.so %{_libdir}/wine/shlwapi.dll.so %{_libdir}/wine/snmpapi.dll.so -%{_libdir}/wine/sound.drv.so +%{_libdir}/wine/sound.drv16 %{_libdir}/wine/stdole2.tlb.so %{_libdir}/wine/stdole32.tlb.so %{_libdir}/wine/sti.dll.so -%{_libdir}/wine/storage.dll.so -%{_libdir}/wine/stress.dll.so -%{_libdir}/wine/system.drv.so +%{_libdir}/wine/storage.dll16 +%{_libdir}/wine/stress.dll16 +%{_libdir}/wine/system.drv16 %{_libdir}/wine/tapi32.dll.so -%{_libdir}/wine/toolhelp.dll.so -%{_libdir}/wine/typelib.dll.so +%{_libdir}/wine/toolhelp.dll16 +%{_libdir}/wine/typelib.dll16 %{_libdir}/wine/unicows.dll.so %{_libdir}/wine/url.dll.so %{_libdir}/wine/urlmon.dll.so -%{_libdir}/wine/user.exe.so +%{_libdir}/wine/user.exe16 %{_libdir}/wine/user32.dll.so %{_libdir}/wine/usp10.dll.so %{_libdir}/wine/uxtheme.dll.so %{_libdir}/wine/vdhcp.vxd.so %{_libdir}/wine/vdmdbg.dll.so -%{_libdir}/wine/ver.dll.so +%{_libdir}/wine/ver.dll16 %{_libdir}/wine/version.dll.so %{_libdir}/wine/vmm.vxd.so %{_libdir}/wine/vnbt.vxd.so @@ -509,28 +510,28 @@ %{_libdir}/wine/vtdapi.vxd.so %{_libdir}/wine/vwin32.vxd.so %{_libdir}/wine/w32skrnl.dll.so -%{_libdir}/wine/w32sys.dll.so -%{_libdir}/wine/win32s16.dll.so -%{_libdir}/wine/win87em.dll.so -%{_libdir}/wine/winaspi.dll.so -%{_libdir}/wine/windebug.dll.so +%{_libdir}/wine/w32sys.dll16 +%{_libdir}/wine/win32s16.dll16 +%{_libdir}/wine/win87em.dll16 +%{_libdir}/wine/winaspi.dll16 +%{_libdir}/wine/windebug.dll16 %{_libdir}/wine/wineaudioio.drv.so %{_libdir}/wine/winedos.dll.so %{_libdir}/wine/wineoss.drv.so %{_libdir}/wine/winex11.drv.so -%{_libdir}/wine/wing.dll.so +%{_libdir}/wine/wing.dll16 %{_libdir}/wine/wininet.dll.so %{_libdir}/wine/winmm.dll.so -%{_libdir}/wine/winnls.dll.so +%{_libdir}/wine/winnls.dll16 %{_libdir}/wine/winnls32.dll.so -%{_libdir}/wine/winsock.dll.so +%{_libdir}/wine/winsock.dll16 %{_libdir}/wine/winspool.drv.so -%{_libdir}/wine/wintab.dll.so +%{_libdir}/wine/wintab.dll16 %{_libdir}/wine/wintab32.dll.so %{_libdir}/wine/wintrust.dll.so %{_libdir}/wine/wnaspi32.dll.so %{_libdir}/wine/wow32.dll.so -%{_libdir}/wine/wprocs.dll.so +%{_libdir}/wine/wprocs.dll16 %{_libdir}/wine/ws2_32.dll.so %{_libdir}/wine/wsock32.dll.so %{_libdir}/wine/wtsapi32.dll.so @@ -580,7 +581,7 @@ %{_datadir}/fonts/wine/vgasyst.fon %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so -%{_libdir}/wine/wineps16.drv.so +%{_libdir}/wine/wineps16.drv16 %{_libdir}/wine/d3d8.dll.so %{_libdir}/wine/d3d9.dll.so %{_libdir}/wine/d3dx8.dll.so @@ -646,7 +647,7 @@ %files twain %defattr(-,root,root,-) -%{_libdir}/wine/twain.dll.so +%{_libdir}/wine/twain.dll16 %{_libdir}/wine/twain_32.dll.so %files capi @@ -682,9 +683,13 @@ %{_libdir}/wine/*.def %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 -- Version upgrade +- version upgrade * Thu Feb 09 2006 Andreas Bierfert 0.9.7-3 From fedora-extras-commits at redhat.com Fri Mar 3 11:26:01 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 3 Mar 2006 06:26:01 -0500 Subject: rpms/wine-docs/FC-4 wine-docs.spec,1.7,1.8 Message-ID: <200603031126.k23BQYVB002919@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2894 Modified Files: wine-docs.spec Log Message: examine ELinks error Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wine-docs.spec 2 Mar 2006 23:26:17 -0000 1.7 +++ wine-docs.spec 3 Mar 2006 11:26:00 -0000 1.8 @@ -22,6 +22,15 @@ %build ./configure + +cat< docbook2txt +#!/bin/sh +strace -f /usr/bin/docbook2txt \$* +ls -la +EOT +chmod +x docbook2txt +PATH=$(pwd):$PATH make + make From fedora-extras-commits at redhat.com Fri Mar 3 11:35:42 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 3 Mar 2006 06:35:42 -0500 Subject: rpms/wine-docs/FC-4 wine-docs.spec,1.8,1.9 Message-ID: <200603031136.k23BaEeo003003@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2986 Modified Files: wine-docs.spec Log Message: take out the debug code again Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- wine-docs.spec 3 Mar 2006 11:26:00 -0000 1.8 +++ wine-docs.spec 3 Mar 2006 11:35:42 -0000 1.9 @@ -22,15 +22,6 @@ %build ./configure - -cat< docbook2txt -#!/bin/sh -strace -f /usr/bin/docbook2txt \$* -ls -la -EOT -chmod +x docbook2txt -PATH=$(pwd):$PATH make - make From fedora-extras-commits at redhat.com Fri Mar 3 11:51:04 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 06:51:04 -0500 Subject: rpms/dap-server/devel .cvsignore, 1.2, 1.3 dap-server.spec, 1.7, 1.8 sources, 1.2, 1.3 dap-server-with_in_configure.patch, 1.1, NONE Message-ID: <200603031151.k23BpbJZ003140@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3115 Modified Files: .cvsignore dap-server.spec sources Removed Files: dap-server-with_in_configure.patch Log Message: * Fri Mar 3 2006 Patrice Dumas 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2006 22:54:58 -0000 1.2 +++ .cvsignore 3 Mar 2006 11:51:04 -0000 1.3 @@ -1 +1 @@ -dap-server-3.5.3.tar.gz +dap-server-3.6.0.tar.gz Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dap-server.spec 27 Feb 2006 00:54:24 -0000 1.7 +++ dap-server.spec 3 Mar 2006 11:51:04 -0000 1.8 @@ -6,18 +6,17 @@ Summary: Basic request handling for DAP servers Name: dap-server -Version: 3.5.3 -Release: 1%{?dist}.2 +Version: 3.6.0 +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ -Patch0: dap-server-with_in_configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver -Requires: perl +Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) %description This is base software for our workhorse server. Written using the DAP++ C++ @@ -35,7 +34,6 @@ Summary: A CGI interface for the DAP server Requires: %{name} = %{version}-%{release} Requires: dap-freeform_handler dap-netcdf_handler dap-hdf4_handler -Requires: perl Group: System Environment/Daemons %description cgi @@ -43,7 +41,6 @@ %prep %setup -q -%patch %build %configure --with-cgidir=%{dap_cgidir} @@ -95,6 +92,9 @@ %changelog +* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +- new release + * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 - Small fix for Perl provides Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2006 22:54:58 -0000 1.2 +++ sources 3 Mar 2006 11:51:04 -0000 1.3 @@ -1 +1 @@ -fca821446b18f36f883b85a049d34876 dap-server-3.5.3.tar.gz +4d4665e01b9cae25535094d02987a07e dap-server-3.6.0.tar.gz --- dap-server-with_in_configure.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 12:12:02 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:12:02 -0500 Subject: rpms/dap-server/devel dap-server.spec,1.8,1.9 Message-ID: <200603031212.k23CCYxn005082@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5065 Modified Files: dap-server.spec Log Message: minor update of description Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dap-server.spec 3 Mar 2006 11:51:04 -0000 1.8 +++ dap-server.spec 3 Mar 2006 12:12:01 -0000 1.9 @@ -4,10 +4,10 @@ %define __perl_provides %{nil} %define __perl_requires %{nil} -Summary: Basic request handling for DAP servers +Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz @@ -19,11 +19,12 @@ Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) %description -This is base software for our workhorse server. Written using the DAP++ C++ -library and Perl, this handles processing compressed files and arranging for -the correct server module to process the file. The base software also -provides support for the ASCII response and HTML data-request form. Use this -in combination with one or more of the format-specific handlers. +This is base software for the OPeNDAP (Open-source Project for a Network +Data Access Protocol). Written using the DAP++ C++ library and Perl, this +handles processing compressed files and arranging for the correct server +module to process the file. The base software also provides support for +the ASCII response and HTML data-request form. Use this in combination +with one or more of the format-specific handlers. This package contains all the executable and perl modules. The scripts and config files that should be installed in a cgi directory are in the @@ -92,7 +93,7 @@ %changelog -* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +* Fri Mar 3 2006 Patrice Dumas 3.6.0-1.1 - new release * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 From fedora-extras-commits at redhat.com Fri Mar 3 12:15:03 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 3 Mar 2006 07:15:03 -0500 Subject: rpms/wine-docs/FC-3 wine-docs.spec,1.6,1.7 Message-ID: <200603031215.k23CFaxT005155@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5131 Modified Files: wine-docs.spec Log Message: examine ELinks error for FC-4 on FC-3 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wine-docs.spec 2 Mar 2006 23:26:11 -0000 1.6 +++ wine-docs.spec 3 Mar 2006 12:15:03 -0000 1.7 @@ -22,6 +22,16 @@ %build ./configure + +cat< docbook2txt +#!/bin/sh +strace -f /usr/bin/docbook2txt \$* +ls -la +EOT +chmod +x docbook2txt +PATH=$(pwd):$PATH make +exit 1 + make From fedora-extras-commits at redhat.com Fri Mar 3 12:16:36 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 3 Mar 2006 07:16:36 -0500 Subject: rpms/wine-docs/FC-3 wine-docs.spec,1.7,1.8 Message-ID: <200603031217.k23CH8eo005218@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5191 Modified Files: wine-docs.spec Log Message: Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wine-docs.spec 3 Mar 2006 12:15:03 -0000 1.7 +++ wine-docs.spec 3 Mar 2006 12:16:36 -0000 1.8 @@ -1,6 +1,6 @@ Name: wine-docs Version: 0.9.9 -Release: 1%{?dist} +Release: 0.1%{?dist} Summary: Documentation for wine Group: Documentation From fedora-extras-commits at redhat.com Fri Mar 3 12:19:27 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:19:27 -0500 Subject: rpms/dap-server/devel dap-server.spec,1.9,1.10 Message-ID: <200603031219.k23CJxmP005327@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5305 Modified Files: dap-server.spec Log Message: add a missing word in the description Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dap-server.spec 3 Mar 2006 12:12:01 -0000 1.9 +++ dap-server.spec 3 Mar 2006 12:19:27 -0000 1.10 @@ -7,7 +7,7 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 1%{?dist}.1 +Release: 2%{?dist}.2 License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz @@ -20,10 +20,10 @@ %description This is base software for the OPeNDAP (Open-source Project for a Network -Data Access Protocol). Written using the DAP++ C++ library and Perl, this -handles processing compressed files and arranging for the correct server -module to process the file. The base software also provides support for -the ASCII response and HTML data-request form. Use this in combination +Data Access Protocol) server. Written using the DAP++ C++ library and Perl, +this handles processing compressed files and arranging for the correct +server module to process the file. The base software also provides support +for the ASCII response and HTML data-request form. Use this in combination with one or more of the format-specific handlers. This package contains all the executable and perl modules. The scripts @@ -93,7 +93,7 @@ %changelog -* Fri Mar 3 2006 Patrice Dumas 3.6.0-1.1 +* Fri Mar 3 2006 Patrice Dumas 3.6.0-1.2 - new release * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 From fedora-extras-commits at redhat.com Fri Mar 3 12:22:08 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:22:08 -0500 Subject: rpms/dap-server/FC-3 .cvsignore, 1.2, 1.3 dap-server.spec, 1.7, 1.8 sources, 1.2, 1.3 dap-server-with_in_configure.patch, 1.1, NONE Message-ID: <200603031222.k23CMeTf005381@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5339/FC-3 Modified Files: .cvsignore dap-server.spec sources Removed Files: dap-server-with_in_configure.patch Log Message: * Fri Mar 3 2006 Patrice Dumas 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2006 22:54:58 -0000 1.2 +++ .cvsignore 3 Mar 2006 12:22:08 -0000 1.3 @@ -1 +1 @@ -dap-server-3.5.3.tar.gz +dap-server-3.6.0.tar.gz Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-3/dap-server.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dap-server.spec 27 Feb 2006 00:54:12 -0000 1.7 +++ dap-server.spec 3 Mar 2006 12:22:08 -0000 1.8 @@ -4,27 +4,27 @@ %define __perl_provides %{nil} %define __perl_requires %{nil} -Summary: Basic request handling for DAP servers +Summary: Basic request handling for OPeNDAP servers Name: dap-server -Version: 3.5.3 -Release: 1%{?dist}.2 +Version: 3.6.0 +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ -Patch0: dap-server-with_in_configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver -Requires: perl +Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) %description -This is base software for our workhorse server. Written using the DAP++ C++ -library and Perl, this handles processing compressed files and arranging for -the correct server module to process the file. The base software also -provides support for the ASCII response and HTML data-request form. Use this -in combination with one or more of the format-specific handlers. +This is base software for the OPeNDAP (Open-source Project for a Network +Data Access Protocol) server. Written using the DAP++ C++ library and Perl, +this handles processing compressed files and arranging for the correct +server module to process the file. The base software also provides support +for the ASCII response and HTML data-request form. Use this in combination +with one or more of the format-specific handlers. This package contains all the executable and perl modules. The scripts and config files that should be installed in a cgi directory are in the @@ -35,7 +35,6 @@ Summary: A CGI interface for the DAP server Requires: %{name} = %{version}-%{release} Requires: dap-freeform_handler dap-netcdf_handler dap-hdf4_handler -Requires: perl Group: System Environment/Daemons %description cgi @@ -43,7 +42,6 @@ %prep %setup -q -%patch %build %configure --with-cgidir=%{dap_cgidir} @@ -95,6 +93,9 @@ %changelog +* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +- new release + * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 - Small fix for Perl provides Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2006 22:54:58 -0000 1.2 +++ sources 3 Mar 2006 12:22:08 -0000 1.3 @@ -1 +1 @@ -fca821446b18f36f883b85a049d34876 dap-server-3.5.3.tar.gz +4d4665e01b9cae25535094d02987a07e dap-server-3.6.0.tar.gz --- dap-server-with_in_configure.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 12:22:14 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:22:14 -0500 Subject: rpms/dap-server/FC-4 .cvsignore, 1.2, 1.3 dap-server.spec, 1.7, 1.8 sources, 1.2, 1.3 dap-server-with_in_configure.patch, 1.1, NONE Message-ID: <200603031222.k23CMkCx005386@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5339/FC-4 Modified Files: .cvsignore dap-server.spec sources Removed Files: dap-server-with_in_configure.patch Log Message: * Fri Mar 3 2006 Patrice Dumas 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2006 22:54:58 -0000 1.2 +++ .cvsignore 3 Mar 2006 12:22:14 -0000 1.3 @@ -1 +1 @@ -dap-server-3.5.3.tar.gz +dap-server-3.6.0.tar.gz Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-4/dap-server.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dap-server.spec 27 Feb 2006 00:54:18 -0000 1.7 +++ dap-server.spec 3 Mar 2006 12:22:14 -0000 1.8 @@ -4,27 +4,27 @@ %define __perl_provides %{nil} %define __perl_requires %{nil} -Summary: Basic request handling for DAP servers +Summary: Basic request handling for OPeNDAP servers Name: dap-server -Version: 3.5.3 -Release: 1%{?dist}.2 +Version: 3.6.0 +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ -Patch0: dap-server-with_in_configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver -Requires: perl +Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) %description -This is base software for our workhorse server. Written using the DAP++ C++ -library and Perl, this handles processing compressed files and arranging for -the correct server module to process the file. The base software also -provides support for the ASCII response and HTML data-request form. Use this -in combination with one or more of the format-specific handlers. +This is base software for the OPeNDAP (Open-source Project for a Network +Data Access Protocol) server. Written using the DAP++ C++ library and Perl, +this handles processing compressed files and arranging for the correct +server module to process the file. The base software also provides support +for the ASCII response and HTML data-request form. Use this in combination +with one or more of the format-specific handlers. This package contains all the executable and perl modules. The scripts and config files that should be installed in a cgi directory are in the @@ -35,7 +35,6 @@ Summary: A CGI interface for the DAP server Requires: %{name} = %{version}-%{release} Requires: dap-freeform_handler dap-netcdf_handler dap-hdf4_handler -Requires: perl Group: System Environment/Daemons %description cgi @@ -43,7 +42,6 @@ %prep %setup -q -%patch %build %configure --with-cgidir=%{dap_cgidir} @@ -95,6 +93,9 @@ %changelog +* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +- new release + * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 - Small fix for Perl provides Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2006 22:54:58 -0000 1.2 +++ sources 3 Mar 2006 12:22:14 -0000 1.3 @@ -1 +1 @@ -fca821446b18f36f883b85a049d34876 dap-server-3.5.3.tar.gz +4d4665e01b9cae25535094d02987a07e dap-server-3.6.0.tar.gz --- dap-server-with_in_configure.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 12:24:03 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:24:03 -0500 Subject: rpms/dap-server/devel dap-server.spec,1.10,1.11 Message-ID: <200603031224.k23COZqd005416@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5399 Modified Files: dap-server.spec Log Message: Correct error on release tag Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dap-server.spec 3 Mar 2006 12:19:27 -0000 1.10 +++ dap-server.spec 3 Mar 2006 12:24:02 -0000 1.11 @@ -7,7 +7,7 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 2%{?dist}.2 +Release: 1%{?dist}.2 License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 12:25:33 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:25:33 -0500 Subject: rpms/dap-server/FC-3 dap-server.spec,1.8,1.9 Message-ID: <200603031226.k23CQ5Yu005460@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5427/FC-3 Modified Files: dap-server.spec Log Message: correct error on release tag Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-3/dap-server.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dap-server.spec 3 Mar 2006 12:22:08 -0000 1.8 +++ dap-server.spec 3 Mar 2006 12:25:33 -0000 1.9 @@ -7,7 +7,7 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 2%{?dist} +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 12:25:39 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:25:39 -0500 Subject: rpms/dap-server/FC-4 dap-server.spec,1.8,1.9 Message-ID: <200603031226.k23CQBDS005463@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5427/FC-4 Modified Files: dap-server.spec Log Message: correct error on release tag Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-4/dap-server.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dap-server.spec 3 Mar 2006 12:22:14 -0000 1.8 +++ dap-server.spec 3 Mar 2006 12:25:39 -0000 1.9 @@ -7,7 +7,7 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 2%{?dist} +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 12:27:53 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 3 Mar 2006 07:27:53 -0500 Subject: rpms/wine-docs/FC-3 wine-docs.spec,1.8,1.9 Message-ID: <200603031228.k23CSQ5K005489@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5472 Modified Files: wine-docs.spec Log Message: Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- wine-docs.spec 3 Mar 2006 12:16:36 -0000 1.8 +++ wine-docs.spec 3 Mar 2006 12:27:53 -0000 1.9 @@ -1,6 +1,6 @@ Name: wine-docs Version: 0.9.9 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Documentation for wine Group: Documentation @@ -22,16 +22,6 @@ %build ./configure - -cat< docbook2txt -#!/bin/sh -strace -f /usr/bin/docbook2txt \$* -ls -la -EOT -chmod +x docbook2txt -PATH=$(pwd):$PATH make -exit 1 - make From fedora-extras-commits at redhat.com Fri Mar 3 12:34:20 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:34:20 -0500 Subject: rpms/dap-server/FC-3 dap-server.spec,1.9,1.10 Message-ID: <200603031234.k23CYqtl005632@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5585/FC-3 Modified Files: dap-server.spec Log Message: Bump release Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-3/dap-server.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dap-server.spec 3 Mar 2006 12:25:33 -0000 1.9 +++ dap-server.spec 3 Mar 2006 12:34:20 -0000 1.10 @@ -7,14 +7,14 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel >= 3.6.0 +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) @@ -93,7 +93,7 @@ %changelog -* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +* Fri Mar 3 2006 Patrice Dumas 3.6.0-2 - new release * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 From fedora-extras-commits at redhat.com Fri Mar 3 12:34:26 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:34:26 -0500 Subject: rpms/dap-server/FC-4 dap-server.spec,1.9,1.10 Message-ID: <200603031234.k23CYwY6005635@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5585/FC-4 Modified Files: dap-server.spec Log Message: Bump release Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-4/dap-server.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dap-server.spec 3 Mar 2006 12:25:39 -0000 1.9 +++ dap-server.spec 3 Mar 2006 12:34:26 -0000 1.10 @@ -7,14 +7,14 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel >= 3.6.0 +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) @@ -93,7 +93,7 @@ %changelog -* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +* Fri Mar 3 2006 Patrice Dumas 3.6.0-2 - new release * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 From fedora-extras-commits at redhat.com Fri Mar 3 12:34:32 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:34:32 -0500 Subject: rpms/dap-server/devel dap-server.spec,1.11,1.12 Message-ID: <200603031235.k23CZ4TI005638@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5585/devel Modified Files: dap-server.spec Log Message: Bump release Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dap-server.spec 3 Mar 2006 12:24:02 -0000 1.11 +++ dap-server.spec 3 Mar 2006 12:34:31 -0000 1.12 @@ -7,14 +7,14 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 1%{?dist}.2 +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel >= 3.6.0 +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) @@ -93,7 +93,7 @@ %changelog -* Fri Mar 3 2006 Patrice Dumas 3.6.0-1.2 +* Fri Mar 3 2006 Patrice Dumas 3.6.0-2 - new release * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 From fedora-extras-commits at redhat.com Fri Mar 3 12:59:19 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:59:19 -0500 Subject: rpms/dap-netcdf_handler/devel .cvsignore, 1.2, 1.3 dap-netcdf_handler.spec, 1.3, 1.4 sources, 1.2, 1.3 dap-netcdf_handler-add_lib64.diff, 1.1, NONE Message-ID: <200603031259.k23Cxp9c005923@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-netcdf_handler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5897 Modified Files: .cvsignore dap-netcdf_handler.spec sources Removed Files: dap-netcdf_handler-add_lib64.diff Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 - new release - remove upstreamed patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 10:17:25 -0000 1.2 +++ .cvsignore 3 Mar 2006 12:59:18 -0000 1.3 @@ -1 +1 @@ -netcdf_handler-3.5.2.tar.gz +netcdf_handler-3.6.0.tar.gz Index: dap-netcdf_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/dap-netcdf_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-netcdf_handler.spec 20 Feb 2006 11:50:00 -0000 1.3 +++ dap-netcdf_handler.spec 3 Mar 2006 12:59:18 -0000 1.4 @@ -1,15 +1,14 @@ Summary: NetCDF 3 data handler for the OPeNDAP Data server Name: dap-netcdf_handler -Version: 3.5.2 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/netcdf_handler-%{version}.tar.gz -Patch0: dap-netcdf_handler-add_lib64.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel netcdf-devel +BuildRequires: libdap-devel >= 3.6.0 netcdf-devel # Don't require dap-server as dap_nc_handler works without dap-server, # however dap_nc_handler should be of use only with dap-server in most cases. #Requires: dap-server @@ -17,11 +16,10 @@ %description This is the netcdf data handler for our data server. It reads netcdf 3 files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n netcdf_handler-%{version} -%patch0 %build %configure @@ -41,6 +39,10 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- new release +- remove upstreamed patch + * Mon Feb 20 2006 Patrice Dumas - 3.5.2-2 - add a patch for netcdf detection in lib64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 10:17:25 -0000 1.2 +++ sources 3 Mar 2006 12:59:18 -0000 1.3 @@ -1 +1 @@ -ee5f6832511339ad3348a673e4185968 netcdf_handler-3.5.2.tar.gz +1f5c2c485d058e2f3ae55d8ed956afd5 netcdf_handler-3.6.0.tar.gz --- dap-netcdf_handler-add_lib64.diff DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:00:38 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 3 Mar 2006 08:00:38 -0500 Subject: rpms/gpgme/devel .cvsignore, 1.5, 1.6 gpgme.spec, 1.14, 1.15 sources, 1.5, 1.6 gpgme-1.1.0-tests.patch, 1.1, NONE Message-ID: <200603031301.k23D1Bhi006830@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5948 Modified Files: .cvsignore gpgme.spec sources Removed Files: gpgme-1.1.0-tests.patch Log Message: * Fri Mar 3 2006 Rex Dieter 1.1.2-1 - 1.1.2 - drop upstreamed gpgme-1.1.0-tests.patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Oct 2005 15:23:57 -0000 1.5 +++ .cvsignore 3 Mar 2006 13:00:38 -0000 1.6 @@ -1,2 +1,2 @@ -gpgme-1.1.0.tar.bz2 -gpgme-1.1.0.tar.bz2.sig +gpgme-1.1.2.tar.bz2 +gpgme-1.1.2.tar.bz2.sig Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gpgme.spec 1 Mar 2006 16:46:28 -0000 1.14 +++ gpgme.spec 3 Mar 2006 13:00:38 -0000 1.15 @@ -1,8 +1,8 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API -Version: 1.1.0 -Release: 3%{?dist}.2 +Version: 1.1.2 +Release: 1%{?dist} License: LGPL Group: Applications/System @@ -11,8 +11,6 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: gpgme-1.1.0-tests.patch - BuildRequires: gnupg >= 1.2.2 BuildRequires: gnupg2 >= 1.9.6 BuildRequires: libgpg-error-devel >= 0.5 @@ -43,8 +41,6 @@ %prep %setup -q -%patch1 -p1 -b .tests - %build %configure \ @@ -99,6 +95,10 @@ %changelog +* Fri Mar 3 2006 Rex Dieter 1.1.2-1 +- 1.1.2 +- drop upstreamed gpgme-1.1.0-tests.patch + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Oct 2005 15:23:57 -0000 1.5 +++ sources 3 Mar 2006 13:00:38 -0000 1.6 @@ -1,2 +1,2 @@ -9d75ad0d604918bbf8e1ca5ed11ab195 gpgme-1.1.0.tar.bz2 -b0af886d384bacfee4af6fa835f27b5b gpgme-1.1.0.tar.bz2.sig +7c2333679035a5f37e99630a156a40ca gpgme-1.1.2.tar.bz2 +5b786d78d322ea0778eea5ae67c087b4 gpgme-1.1.2.tar.bz2.sig --- gpgme-1.1.0-tests.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:12:27 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Fri, 3 Mar 2006 08:12:27 -0500 Subject: rpms/cfengine/devel .cvsignore, 1.9, 1.10 cfengine.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200603031313.k23DD0DP007945@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7922 Modified Files: .cvsignore cfengine.spec sources Log Message: Update to upstream 2.1.19p1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 30 Dec 2005 13:11:50 -0000 1.9 +++ .cvsignore 3 Mar 2006 13:12:26 -0000 1.10 @@ -1,4 +1,4 @@ -cfengine-2.1.18.tar.gz +cfengine-2.1.19p1.tar.gz cfenvd cfexecd cfservd Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- cfengine.spec 17 Feb 2006 21:21:31 -0000 1.15 +++ cfengine.spec 3 Mar 2006 13:12:26 -0000 1.16 @@ -1,10 +1,10 @@ Summary: A systems administration tool for networks Name: cfengine -Version: 2.1.18 -Release: 2%{?dist} +Version: 2.1.19p1 +Release: 1%{?dist} License: GPL Group: Applications/System -Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz +Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd @@ -118,6 +118,9 @@ %changelog +* Thu Mar 2 2006 Jeff Sheltren - 2.1.19p1-1 +- Update to upstream 2.1.19p1 + * Fri Feb 17 2006 Jeff Sheltren - 2.1.18-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 30 Dec 2005 13:11:50 -0000 1.9 +++ sources 3 Mar 2006 13:12:26 -0000 1.10 @@ -1,4 +1,4 @@ -7703780f987facc537cf239b04d2b2e8 cfengine-2.1.18.tar.gz +0524e0bcbf947d021c78f8c37461c323 cfengine-2.1.19p1.tar.gz 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd From fedora-extras-commits at redhat.com Fri Mar 3 13:14:40 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Fri, 3 Mar 2006 08:14:40 -0500 Subject: rpms/cfengine/FC-4 .cvsignore, 1.9, 1.10 cfengine.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200603031315.k23DFCwa007988@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7965 Modified Files: .cvsignore cfengine.spec sources Log Message: Update to upstream 2.1.19p1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 30 Dec 2005 13:12:56 -0000 1.9 +++ .cvsignore 3 Mar 2006 13:14:40 -0000 1.10 @@ -1,4 +1,4 @@ -cfengine-2.1.18.tar.gz +cfengine-2.1.19p1.tar.gz cfenvd cfexecd cfservd Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/cfengine.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- cfengine.spec 30 Dec 2005 13:12:56 -0000 1.13 +++ cfengine.spec 3 Mar 2006 13:14:40 -0000 1.14 @@ -1,10 +1,10 @@ Summary: A systems administration tool for networks Name: cfengine -Version: 2.1.18 +Version: 2.1.19p1 Release: 1%{?dist} License: GPL Group: Applications/System -Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz +Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd @@ -118,6 +118,12 @@ %changelog +* Thu Mar 2 2006 Jeff Sheltren - 2.1.19p1-1 +- Update to upstream 2.1.19p1 + +* Fri Feb 17 2006 Jeff Sheltren - 2.1.18-2 +- Rebuild for Fedora Extras 5 + * Fri Dec 30 2005 Jeff Sheltren - 2.1.18-1 - Update to upstream 2.1.18 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 30 Dec 2005 13:12:56 -0000 1.9 +++ sources 3 Mar 2006 13:14:40 -0000 1.10 @@ -1,4 +1,4 @@ -7703780f987facc537cf239b04d2b2e8 cfengine-2.1.18.tar.gz +0524e0bcbf947d021c78f8c37461c323 cfengine-2.1.19p1.tar.gz 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd From fedora-extras-commits at redhat.com Fri Mar 3 13:16:15 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Fri, 3 Mar 2006 08:16:15 -0500 Subject: rpms/cfengine/FC-3 .cvsignore, 1.10, 1.11 cfengine.spec, 1.12, 1.13 sources, 1.10, 1.11 Message-ID: <200603031316.k23DGmZN008029@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8008 Modified Files: .cvsignore cfengine.spec sources Log Message: Update to upstream 2.1.19p1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 30 Dec 2005 13:13:38 -0000 1.10 +++ .cvsignore 3 Mar 2006 13:16:15 -0000 1.11 @@ -1,4 +1,4 @@ -cfengine-2.1.18.tar.gz +cfengine-2.1.19p1.tar.gz cfenvd cfexecd cfservd Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/cfengine.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cfengine.spec 30 Dec 2005 13:13:38 -0000 1.12 +++ cfengine.spec 3 Mar 2006 13:16:15 -0000 1.13 @@ -1,10 +1,10 @@ Summary: A systems administration tool for networks Name: cfengine -Version: 2.1.18 +Version: 2.1.19p1 Release: 1%{?dist} License: GPL Group: Applications/System -Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz +Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd @@ -118,6 +118,12 @@ %changelog +* Thu Mar 2 2006 Jeff Sheltren - 2.1.19p1-1 +- Update to upstream 2.1.19p1 + +* Fri Feb 17 2006 Jeff Sheltren - 2.1.18-2 +- Rebuild for Fedora Extras 5 + * Fri Dec 30 2005 Jeff Sheltren - 2.1.18-1 - Update to upstream 2.1.18 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 30 Dec 2005 13:13:38 -0000 1.10 +++ sources 3 Mar 2006 13:16:15 -0000 1.11 @@ -1,4 +1,4 @@ -7703780f987facc537cf239b04d2b2e8 cfengine-2.1.18.tar.gz +0524e0bcbf947d021c78f8c37461c323 cfengine-2.1.19p1.tar.gz 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd From fedora-extras-commits at redhat.com Fri Mar 3 13:18:56 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 3 Mar 2006 08:18:56 -0500 Subject: rpms/tla/devel tla.spec, 1.25, 1.26 tla-ppc32-fix-alignment.patch, 1.1, NONE Message-ID: <200603031319.k23DJSAK008213@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8148 Modified Files: tla.spec Removed Files: tla-ppc32-fix-alignment.patch Log Message: Revert patch. Real issue was a glibc bug Index: tla.spec =================================================================== RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- tla.spec 27 Feb 2006 14:49:11 -0000 1.25 +++ tla.spec 3 Mar 2006 13:18:56 -0000 1.26 @@ -1,6 +1,6 @@ Name: tla Version: 1.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNU arch revision control system Group: Development/Tools @@ -12,7 +12,6 @@ Patch0: %{name}-1.2pre0-posix.patch # Patch1 and Source2 from Debian's 1.3.3-3, the latter updated for 1.3.4. Patch1: %{name}-1.3.3-sysneon.patch -Patch2: %{name}-ppc32-fix-alignment.patch Source2: %{name}-generate-manpage.pl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,7 +39,6 @@ rm -rf src/libneon rm -rf src/expat %patch1 -p1 -%patch2 -p1 %build mkdir src/=build @@ -79,6 +77,9 @@ %{_mandir}/man1/tla.1* %changelog +* Fri Mar 3 2006 Josh Boyer - 1.3.4-3 +- Remove ppc alignment patch now that glibc is fixed + * Mon Feb 27 2006 Josh Boyer - 1.3.4-2 - Add patch to allow building on PPC for now --- tla-ppc32-fix-alignment.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:24:32 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:24:32 -0500 Subject: rpms/dap-hdf4_handler/devel .cvsignore, 1.2, 1.3 dap-hdf4_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603031325.k23DP430008333@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-serv8291 Modified Files: .cvsignore dap-hdf4_handler.spec sources Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 - Update to 3.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:19:07 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:24:31 -0000 1.3 @@ -1 +1 @@ -hdf4_handler-3.5.0.tar.gz +hdf4_handler-3.6.0.tar.gz Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-hdf4_handler.spec 20 Feb 2006 14:21:32 -0000 1.2 +++ dap-hdf4_handler.spec 3 Mar 2006 13:24:31 -0000 1.3 @@ -1,6 +1,6 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler -Version: 3.5.0 +Version: 3.6.0 Release: 1%{?dist} License: LGPL Group: System Environment/Daemons @@ -14,13 +14,13 @@ %description This is the hdf4 data handler for our data server. It reads HDF4 and HDF-EOS files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n hdf4_handler-%{version} %build -%configure --with-hdf4-libdir=%{_libdir}/hdf --with-hdf4-include=%{_includedir}/hdf +%configure make %{?_smp_mflags} %install @@ -37,5 +37,8 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:19:07 -0000 1.2 +++ sources 3 Mar 2006 13:24:31 -0000 1.3 @@ -1 +1 @@ -0b3d3ab80d85428a9a9f898dacc4d53e hdf4_handler-3.5.0.tar.gz +8aebe63dc38dfbc35f853807b37c070e hdf4_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 13:25:01 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:25:01 -0500 Subject: rpms/dap-freeform_handler/devel .cvsignore, 1.2, 1.3 dap-freeform_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603031325.k23DPXqW008382@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-serv8318 Modified Files: .cvsignore dap-freeform_handler.spec sources Log Message: update to 3.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:21:51 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:25:01 -0000 1.3 @@ -1 +1 @@ -freeform_handler-3.5.0.tar.gz +freeform_handler-3.6.0.tar.gz Index: dap-freeform_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/dap-freeform_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-freeform_handler.spec 20 Feb 2006 14:25:36 -0000 1.2 +++ dap-freeform_handler.spec 3 Mar 2006 13:25:01 -0000 1.3 @@ -1,6 +1,6 @@ Summary: FreeForm data handler for the OPeNDAP Data server Name: dap-freeform_handler -Version: 3.5.0 +Version: 3.6.0 Release: 1%{?dist} License: LGPL Group: System Environment/Daemons @@ -8,7 +8,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel +BuildRequires: libdap-devel >= 3.6.0 #Requires: dap-server %description @@ -36,5 +36,8 @@ %doc COPYING COPYRIGHT NEWS README %changelog +* Mon Feb 27 2006 James Gallagher 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:21:51 -0000 1.2 +++ sources 3 Mar 2006 13:25:01 -0000 1.3 @@ -1 +1 @@ -b2cf59473e879651135e88c14d1b5bb5 freeform_handler-3.5.0.tar.gz +a0d2754055df574f0683c7a6d7100c11 freeform_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 13:30:54 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 3 Mar 2006 08:30:54 -0500 Subject: rpms/lock-keys-applet/devel lock-keys-applet.spec, 1.13, 1.14 lock-keys-applet-1.0-autotools.patch, 1.1, NONE Message-ID: <200603031331.k23DVQ7Y008461@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/lock-keys-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8444 Modified Files: lock-keys-applet.spec Removed Files: lock-keys-applet-1.0-autotools.patch Log Message: Let's try this... Index: lock-keys-applet.spec =================================================================== RCS file: /cvs/extras/rpms/lock-keys-applet/devel/lock-keys-applet.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lock-keys-applet.spec 14 Feb 2006 22:53:50 -0000 1.13 +++ lock-keys-applet.spec 3 Mar 2006 13:30:53 -0000 1.14 @@ -7,7 +7,6 @@ License: GPL URL: http://mfcn.ilo.de/led_applet/ Source0: http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz -Patch: lock-keys-applet-1.0-autotools.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel gnome-panel-devel scrollkeeper libtool automake autoconf Requires(post): scrollkeeper @@ -22,10 +21,9 @@ %prep %setup -q -%patch -p 1 -b .autotools %build -%ifnarch %{ix86} +%ifarch x86_64 libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf %endif %configure --- lock-keys-applet-1.0-autotools.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:40:19 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:40:19 -0500 Subject: rpms/dap-netcdf_handler/FC-3 .cvsignore, 1.2, 1.3 dap-netcdf_handler.spec, 1.3, 1.4 sources, 1.2, 1.3 dap-netcdf_handler-add_lib64.diff, 1.1, NONE Message-ID: <200603031340.k23DeqRV008585@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-netcdf_handler/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540/FC-3 Modified Files: .cvsignore dap-netcdf_handler.spec sources Removed Files: dap-netcdf_handler-add_lib64.diff Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 - new release - remove upstreamed patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 10:17:25 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:40:19 -0000 1.3 @@ -1 +1 @@ -netcdf_handler-3.5.2.tar.gz +netcdf_handler-3.6.0.tar.gz Index: dap-netcdf_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-3/dap-netcdf_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-netcdf_handler.spec 20 Feb 2006 11:50:00 -0000 1.3 +++ dap-netcdf_handler.spec 3 Mar 2006 13:40:19 -0000 1.4 @@ -1,15 +1,14 @@ Summary: NetCDF 3 data handler for the OPeNDAP Data server Name: dap-netcdf_handler -Version: 3.5.2 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/netcdf_handler-%{version}.tar.gz -Patch0: dap-netcdf_handler-add_lib64.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel netcdf-devel +BuildRequires: libdap-devel >= 3.6.0 netcdf-devel # Don't require dap-server as dap_nc_handler works without dap-server, # however dap_nc_handler should be of use only with dap-server in most cases. #Requires: dap-server @@ -17,11 +16,10 @@ %description This is the netcdf data handler for our data server. It reads netcdf 3 files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n netcdf_handler-%{version} -%patch0 %build %configure @@ -41,6 +39,10 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- new release +- remove upstreamed patch + * Mon Feb 20 2006 Patrice Dumas - 3.5.2-2 - add a patch for netcdf detection in lib64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 10:17:25 -0000 1.2 +++ sources 3 Mar 2006 13:40:19 -0000 1.3 @@ -1 +1 @@ -ee5f6832511339ad3348a673e4185968 netcdf_handler-3.5.2.tar.gz +1f5c2c485d058e2f3ae55d8ed956afd5 netcdf_handler-3.6.0.tar.gz --- dap-netcdf_handler-add_lib64.diff DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:40:25 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:40:25 -0500 Subject: rpms/dap-netcdf_handler/FC-4 .cvsignore, 1.2, 1.3 dap-netcdf_handler.spec, 1.3, 1.4 sources, 1.2, 1.3 dap-netcdf_handler-add_lib64.diff, 1.1, NONE Message-ID: <200603031340.k23DevKd008590@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-netcdf_handler/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540/FC-4 Modified Files: .cvsignore dap-netcdf_handler.spec sources Removed Files: dap-netcdf_handler-add_lib64.diff Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 - new release - remove upstreamed patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 10:17:25 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:40:25 -0000 1.3 @@ -1 +1 @@ -netcdf_handler-3.5.2.tar.gz +netcdf_handler-3.6.0.tar.gz Index: dap-netcdf_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-4/dap-netcdf_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-netcdf_handler.spec 20 Feb 2006 11:50:00 -0000 1.3 +++ dap-netcdf_handler.spec 3 Mar 2006 13:40:25 -0000 1.4 @@ -1,15 +1,14 @@ Summary: NetCDF 3 data handler for the OPeNDAP Data server Name: dap-netcdf_handler -Version: 3.5.2 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/netcdf_handler-%{version}.tar.gz -Patch0: dap-netcdf_handler-add_lib64.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel netcdf-devel +BuildRequires: libdap-devel >= 3.6.0 netcdf-devel # Don't require dap-server as dap_nc_handler works without dap-server, # however dap_nc_handler should be of use only with dap-server in most cases. #Requires: dap-server @@ -17,11 +16,10 @@ %description This is the netcdf data handler for our data server. It reads netcdf 3 files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n netcdf_handler-%{version} -%patch0 %build %configure @@ -41,6 +39,10 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- new release +- remove upstreamed patch + * Mon Feb 20 2006 Patrice Dumas - 3.5.2-2 - add a patch for netcdf detection in lib64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 10:17:25 -0000 1.2 +++ sources 3 Mar 2006 13:40:25 -0000 1.3 @@ -1 +1 @@ -ee5f6832511339ad3348a673e4185968 netcdf_handler-3.5.2.tar.gz +1f5c2c485d058e2f3ae55d8ed956afd5 netcdf_handler-3.6.0.tar.gz --- dap-netcdf_handler-add_lib64.diff DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:47:37 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:47:37 -0500 Subject: rpms/dap-hdf4_handler/devel dap-hdf4_handler-gcc41.diff, NONE, 1.1 dap-hdf4_handler.spec, 1.3, 1.4 Message-ID: <200603031348.k23Dm9gK008640@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-serv8620 Modified Files: dap-hdf4_handler.spec Added Files: dap-hdf4_handler-gcc41.diff Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 - add patch for gcc 4.1 dap-hdf4_handler-gcc41.diff: --- NEW FILE dap-hdf4_handler-gcc41.diff --- diff -u --recursive hdf4_handler-3.6.0-orig/hdfclass/hcstream.h hdf4_handler-3.6.0/hdfclass/hcstream.h --- hdf4_handler-3.6.0-orig/hdfclass/hcstream.h 2005-10-13 11:23:29.000000000 +0200 +++ hdf4_handler-3.6.0/hdfclass/hcstream.h 2006-03-03 14:42:02.000000000 +0100 @@ -96,11 +96,11 @@ bool reduce_rank = false); void setslab(int *start, int *edge, int *stride, bool reduce_rank = false); void unsetslab(void) { _slab.set = _slab.reduce_rank = false; } - void hdfistream_sds::set_map_ce(const vector &a_ce) { + void set_map_ce(const vector &a_ce) { _map_ce_set = true; _map_ce_vec = a_ce; } - vector hdfistream_sds::get_map_ce() { + vector get_map_ce() { return _map_ce_vec; } bool is_map_ce_set() { Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-hdf4_handler.spec 3 Mar 2006 13:24:31 -0000 1.3 +++ dap-hdf4_handler.spec 3 Mar 2006 13:47:37 -0000 1.4 @@ -1,10 +1,11 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz +Patch: dap-hdf4_handler-gcc41.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,6 +19,7 @@ %prep %setup -q -n hdf4_handler-%{version} +%patch -p1 %build %configure @@ -37,6 +39,9 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 +- add patch for gcc 4.1 + * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 - Update to 3.6.0 From fedora-extras-commits at redhat.com Fri Mar 3 13:54:55 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:54:55 -0500 Subject: rpms/dap-freeform_handler/FC-3 .cvsignore, 1.2, 1.3 dap-freeform_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603031355.k23DtRPe008838@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-freeform_handler/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8798/FC-3 Modified Files: .cvsignore dap-freeform_handler.spec sources Log Message: Update to 3.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:21:51 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:54:55 -0000 1.3 @@ -1 +1 @@ -freeform_handler-3.5.0.tar.gz +freeform_handler-3.6.0.tar.gz Index: dap-freeform_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-3/dap-freeform_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-freeform_handler.spec 20 Feb 2006 14:25:36 -0000 1.2 +++ dap-freeform_handler.spec 3 Mar 2006 13:54:55 -0000 1.3 @@ -1,6 +1,6 @@ Summary: FreeForm data handler for the OPeNDAP Data server Name: dap-freeform_handler -Version: 3.5.0 +Version: 3.6.0 Release: 1%{?dist} License: LGPL Group: System Environment/Daemons @@ -8,7 +8,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel +BuildRequires: libdap-devel >= 3.6.0 #Requires: dap-server %description @@ -36,5 +36,8 @@ %doc COPYING COPYRIGHT NEWS README %changelog +* Mon Feb 27 2006 James Gallagher 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:21:51 -0000 1.2 +++ sources 3 Mar 2006 13:54:55 -0000 1.3 @@ -1 +1 @@ -b2cf59473e879651135e88c14d1b5bb5 freeform_handler-3.5.0.tar.gz +a0d2754055df574f0683c7a6d7100c11 freeform_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 13:55:01 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:55:01 -0500 Subject: rpms/dap-freeform_handler/FC-4 .cvsignore, 1.2, 1.3 dap-freeform_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603031355.k23DtXIW008843@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-freeform_handler/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8798/FC-4 Modified Files: .cvsignore dap-freeform_handler.spec sources Log Message: Update to 3.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:21:51 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:55:00 -0000 1.3 @@ -1 +1 @@ -freeform_handler-3.5.0.tar.gz +freeform_handler-3.6.0.tar.gz Index: dap-freeform_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-4/dap-freeform_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-freeform_handler.spec 20 Feb 2006 14:25:36 -0000 1.2 +++ dap-freeform_handler.spec 3 Mar 2006 13:55:00 -0000 1.3 @@ -1,6 +1,6 @@ Summary: FreeForm data handler for the OPeNDAP Data server Name: dap-freeform_handler -Version: 3.5.0 +Version: 3.6.0 Release: 1%{?dist} License: LGPL Group: System Environment/Daemons @@ -8,7 +8,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel +BuildRequires: libdap-devel >= 3.6.0 #Requires: dap-server %description @@ -36,5 +36,8 @@ %doc COPYING COPYRIGHT NEWS README %changelog +* Mon Feb 27 2006 James Gallagher 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:21:51 -0000 1.2 +++ sources 3 Mar 2006 13:55:00 -0000 1.3 @@ -1 +1 @@ -b2cf59473e879651135e88c14d1b5bb5 freeform_handler-3.5.0.tar.gz +a0d2754055df574f0683c7a6d7100c11 freeform_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 13:58:28 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:58:28 -0500 Subject: rpms/dap-hdf4_handler/devel dap-hdf4_handler-gcc41.diff, 1.1, 1.2 dap-hdf4_handler.spec, 1.4, 1.5 Message-ID: <200603031359.k23Dx0N5008957@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-serv8887 Modified Files: dap-hdf4_handler-gcc41.diff dap-hdf4_handler.spec Log Message: update gcc41 patch dap-hdf4_handler-gcc41.diff: Index: dap-hdf4_handler-gcc41.diff =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler-gcc41.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dap-hdf4_handler-gcc41.diff 3 Mar 2006 13:47:37 -0000 1.1 +++ dap-hdf4_handler-gcc41.diff 3 Mar 2006 13:58:28 -0000 1.2 @@ -15,3 +15,15 @@ return _map_ce_vec; } bool is_map_ce_set() { +diff -u --recursive hdf4_handler-3.6.0-orig/HDFGrid.h hdf4_handler-3.6.0/HDFGrid.h +--- hdf4_handler-3.6.0-orig/HDFGrid.h 2005-10-10 21:22:29.000000000 +0200 ++++ hdf4_handler-3.6.0/HDFGrid.h 2006-03-03 14:55:23.000000000 +0100 +@@ -58,7 +58,7 @@ + virtual ~HDFGrid(); + virtual BaseType *ptr_duplicate(); + virtual bool read(const string &dataset); +- virtual vector HDFGrid::get_map_constraints(); ++ virtual vector get_map_constraints(); + virtual bool read_tagref(const string &dataset, int32 tag, int32 ref, int &error); + }; + Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dap-hdf4_handler.spec 3 Mar 2006 13:47:37 -0000 1.4 +++ dap-hdf4_handler.spec 3 Mar 2006 13:58:28 -0000 1.5 @@ -1,7 +1,7 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler Version: 3.6.0 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz @@ -39,7 +39,7 @@ %doc README %changelog -* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2.1 - add patch for gcc 4.1 * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 From fedora-extras-commits at redhat.com Fri Mar 3 14:58:20 2006 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Fri, 3 Mar 2006 09:58:20 -0500 Subject: rpms/licq/devel licq.spec,1.5,1.6 Message-ID: <200603031458.k23Ewre9011626@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/licq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11603 Modified Files: licq.spec Log Message: use correct lib-path for plugins on x86-64 (#182733) Index: licq.spec =================================================================== RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- licq.spec 27 Feb 2006 14:17:13 -0000 1.5 +++ licq.spec 3 Mar 2006 14:58:20 -0000 1.6 @@ -1,6 +1,6 @@ Name: licq Version: 1.3.2 -Release: 5 +Release: 6 License: GPL Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2 URL: http://www.licq.org/ @@ -50,6 +50,8 @@ rm -rf `find . -name CVS` %build +export CFLAGS="$RPM_OPT_FLAGS" +sed -i s/lib/%{_lib}/ include/licq_constants.h %configure make cd plugins @@ -108,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la #remove licq.desktop installed by makefile -rm -f $RPM_BUILD_ROOT/%{_libdir}/share/applnk/Internet/licq.desktop +rm -rf $RPM_BUILD_ROOT/usr/share/applnk/Internet/licq.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -157,6 +159,9 @@ %doc plugins/osd*/{AUTHORS,TODO,README,changelog} %changelog +* Fri Mar 03 2006 Peter Vrabec 1.3.2-6 +- use correct lib-path for plugins on x86-64 (#182733) + * Mon Feb 27 2006 Peter Vrabec 1.3.2-5 - rebuild From fedora-extras-commits at redhat.com Fri Mar 3 15:07:53 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:07:53 -0500 Subject: rpms/l2tpd/devel l2tpd.spec,1.4,1.5 Message-ID: <200603031508.k23F8QOn013571@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/l2tpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13524 Modified Files: l2tpd.spec Log Message: bumped version Index: l2tpd.spec =================================================================== RCS file: /cvs/extras/rpms/l2tpd/devel/l2tpd.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- l2tpd.spec 21 Feb 2006 06:36:30 -0000 1.4 +++ l2tpd.spec 3 Mar 2006 15:07:53 -0000 1.5 @@ -3,7 +3,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: l2tpd Version: 0.69 -Release: 0.3.%{cvs}%{?dist} +Release: 0.4.%{cvs}%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Group: System Environment/Daemons @@ -127,6 +127,9 @@ %changelog +* Tue Mar 3 2006 Paul Wouters 0.69-0.4.20051030 +- Bumped version + * Tue Feb 21 2006 Paul Wouters 0.69-0.3.20051030 - Incorporated Jacco de Leeuw's fixes for Microsoft's Win98 l2tp client From fedora-extras-commits at redhat.com Fri Mar 3 15:33:11 2006 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Fri, 3 Mar 2006 10:33:11 -0500 Subject: rpms/licq/FC-4 licq.spec,1.4,1.5 Message-ID: <200603031533.k23FXhRG013781@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/licq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13737 Modified Files: licq.spec Log Message: use correct lib-path for plugins on x86-64 (#182733) Index: licq.spec =================================================================== RCS file: /cvs/extras/rpms/licq/FC-4/licq.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- licq.spec 16 Jan 2006 11:17:21 -0000 1.4 +++ licq.spec 3 Mar 2006 15:33:11 -0000 1.5 @@ -1,6 +1,6 @@ Name: licq Version: 1.3.2 -Release: 4 +Release: 5 License: GPL Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2 URL: http://www.licq.org/ @@ -50,6 +50,8 @@ rm -rf `find . -name CVS` %build +export CFLAGS="$RPM_OPT_FLAGS" +sed -i s/lib/%{_lib}/ include/licq_constants.h %configure make cd plugins @@ -99,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la #remove licq.desktop installed by makefile -rm -f $RPM_BUILD_ROOT/%{_libdir}/share/applnk/Internet/licq.desktop +rm -rf $RPM_BUILD_ROOT/usr/share/applnk/Internet/licq.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -148,6 +150,9 @@ %doc plugins/osd*/{AUTHORS,TODO,README,changelog} %changelog +* Fri Mar 03 2006 Peter Vrabec 1.3.2-5.FC4 +- use correct lib-path for plugins on x86-64 (#182733) + * Mon Jan 16 2006 Peter Vrabec 1.3.2-4 - compile on x86-64 From fedora-extras-commits at redhat.com Fri Mar 3 15:33:12 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:33:12 -0500 Subject: rpms/fetchlog/devel .cvsignore,1.6,1.7 sources,1.7,1.8 Message-ID: <200603031533.k23FXiA3013785@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13739 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Mar 2006 22:00:31 -0000 1.6 +++ .cvsignore 3 Mar 2006 15:33:12 -0000 1.7 @@ -1,2 +1 @@ fetchlog-1.0.tar.gz -fetchlog-build.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Mar 2006 22:00:31 -0000 1.7 +++ sources 3 Mar 2006 15:33:12 -0000 1.8 @@ -1,2 +1 @@ e2ef0a076d1901c489c953fe48e1b2a9 fetchlog-1.0.tar.gz -99228569b122b994b1ab83148a3bd261 fetchlog-build.patch From fedora-extras-commits at redhat.com Fri Mar 3 15:35:21 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:35:21 -0500 Subject: rpms/fetchlog/devel fetchlog.spec,1.3,1.4 Message-ID: <200603031535.k23FZruI013860@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13825 Modified Files: fetchlog.spec Log Message: * Mon Mar 3 2006 Paul Wouters 1.0-4 - Bump version for build system Index: fetchlog.spec =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/fetchlog.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fetchlog.spec 6 Feb 2006 23:36:19 -0000 1.3 +++ fetchlog.spec 3 Mar 2006 15:35:21 -0000 1.4 @@ -1,7 +1,7 @@ Summary: The fetchlog utility displays the last new messages of a logfile Name: fetchlog Version: 1.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Source: http://dl.sf.net/sourceforge/fetchlog/%{name}-%{version}.tar.gz @@ -42,6 +42,9 @@ %{_mandir}/*/* %changelog +* Mon Mar 3 2006 Paul Wouters 1.0-4 +- Bump version for build system + * Mon Feb 6 2006 Paul Wouters 1.0-3 - Bump version due to make tag error From fedora-extras-commits at redhat.com Fri Mar 3 15:35:22 2006 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Fri, 3 Mar 2006 10:35:22 -0500 Subject: rpms/licq/FC-4 licq.spec,1.5,1.6 Message-ID: <200603031535.k23FZs6x013863@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/licq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13821 Modified Files: licq.spec Log Message: fix release number Index: licq.spec =================================================================== RCS file: /cvs/extras/rpms/licq/FC-4/licq.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- licq.spec 3 Mar 2006 15:33:11 -0000 1.5 +++ licq.spec 3 Mar 2006 15:35:22 -0000 1.6 @@ -1,6 +1,6 @@ Name: licq Version: 1.3.2 -Release: 5 +Release: 5.FC4 License: GPL Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2 URL: http://www.licq.org/ From fedora-extras-commits at redhat.com Fri Mar 3 15:37:30 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:37:30 -0500 Subject: rpms/fetchlog/devel fetchlog-build.patch,NONE,1.1 Message-ID: <200603031537.k23FbWG6013929@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13917 Added Files: fetchlog-build.patch Log Message: honour RPM_OPT_FLAGS fetchlog-build.patch: --- NEW FILE fetchlog-build.patch --- --- Makefile~ 2004-03-26 21:47:58.000000000 +0200 +++ Makefile 2006-02-05 23:06:15.000000000 +0200 @@ -24,7 +24,7 @@ ### gcc CC=gcc -CFLAGS= -O -Wall -Wcast-qual -Wstrict-prototypes \ +CFLAGS= $(RPM_OPT_FLAGS) -Wall -Wcast-qual -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations -Winline -Wcast-align ### cc #CC=cc From fedora-extras-commits at redhat.com Fri Mar 3 15:38:51 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:38:51 -0500 Subject: rpms/fetchlog/devel fetchlog.spec,1.4,1.5 Message-ID: <200603031539.k23FdNTs013999@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13972 Modified Files: fetchlog.spec Log Message: changelog fix Index: fetchlog.spec =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/fetchlog.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fetchlog.spec 3 Mar 2006 15:35:21 -0000 1.4 +++ fetchlog.spec 3 Mar 2006 15:38:51 -0000 1.5 @@ -42,10 +42,10 @@ %{_mandir}/*/* %changelog -* Mon Mar 3 2006 Paul Wouters 1.0-4 +* Mon Mar 3 2006 Paul Wouters 1.0-5 - Bump version for build system -* Mon Feb 6 2006 Paul Wouters 1.0-3 +* Mon Feb 6 2006 Paul Wouters 1.0-4 - Bump version due to make tag error * Mon Feb 6 2006 Paul Wouters 1.0-3 From fedora-extras-commits at redhat.com Fri Mar 3 15:46:26 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:46:26 -0500 Subject: rpms/fetchlog/devel sources,1.8,1.9 Message-ID: <200603031546.k23FkwBL014054@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14037 Modified Files: sources Log Message: patch isnt found though it is in cvs. try it as 'source' Index: sources =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 3 Mar 2006 15:33:12 -0000 1.8 +++ sources 3 Mar 2006 15:46:25 -0000 1.9 @@ -1 +1,2 @@ e2ef0a076d1901c489c953fe48e1b2a9 fetchlog-1.0.tar.gz +99228569b122b994b1ab83148a3bd261 fetchlog-build.patch From fedora-extras-commits at redhat.com Fri Mar 3 16:46:05 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 11:46:05 -0500 Subject: rpms/fetchlog/devel fetchlog.spec,1.5,1.6 Message-ID: <200603031646.k23GkcoT016425@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16408 Modified Files: fetchlog.spec Log Message: bumped version Index: fetchlog.spec =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/fetchlog.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fetchlog.spec 3 Mar 2006 15:38:51 -0000 1.5 +++ fetchlog.spec 3 Mar 2006 16:46:05 -0000 1.6 @@ -1,7 +1,7 @@ Summary: The fetchlog utility displays the last new messages of a logfile Name: fetchlog Version: 1.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Source: http://dl.sf.net/sourceforge/fetchlog/%{name}-%{version}.tar.gz @@ -42,6 +42,9 @@ %{_mandir}/*/* %changelog +* Mon Mar 3 2006 Paul Wouters 1.0-6 +- Bump version again :( + * Mon Mar 3 2006 Paul Wouters 1.0-5 - Bump version for build system From fedora-extras-commits at redhat.com Fri Mar 3 16:49:09 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 11:49:09 -0500 Subject: rpms/fetchlog/devel .cvsignore,1.7,1.8 Message-ID: <200603031649.k23GngIT016523@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16504 Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Mar 2006 15:33:12 -0000 1.7 +++ .cvsignore 3 Mar 2006 16:49:09 -0000 1.8 @@ -1 +1,2 @@ fetchlog-1.0.tar.gz +fetchlog-build.patch From fedora-extras-commits at redhat.com Fri Mar 3 16:50:45 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 11:50:45 -0500 Subject: rpms/fetchlog/devel fetchlog.spec,1.6,1.7 Message-ID: <200603031651.k23GpHqT016585@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16568 Modified Files: fetchlog.spec Log Message: bump version Index: fetchlog.spec =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/fetchlog.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fetchlog.spec 3 Mar 2006 16:46:05 -0000 1.6 +++ fetchlog.spec 3 Mar 2006 16:50:45 -0000 1.7 @@ -1,7 +1,7 @@ Summary: The fetchlog utility displays the last new messages of a logfile Name: fetchlog Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Source: http://dl.sf.net/sourceforge/fetchlog/%{name}-%{version}.tar.gz @@ -42,6 +42,9 @@ %{_mandir}/*/* %changelog +* Mon Mar 3 2006 Paul Wouters 1.0-7 +- Bump version. this time cause of old .cvsignore + * Mon Mar 3 2006 Paul Wouters 1.0-6 - Bump version again :( From fedora-extras-commits at redhat.com Fri Mar 3 17:01:51 2006 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Fri, 3 Mar 2006 12:01:51 -0500 Subject: rpms/mercurial/FC-3 mercurial.spec,1.3,1.4 sources,1.4,1.5 Message-ID: <200603031702.k23H2OcS018529@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/extras/rpms/mercurial/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18496 Modified Files: mercurial.spec sources Log Message: build for FC3 Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/mercurial.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mercurial.spec 20 Sep 2005 21:36:43 -0000 1.3 +++ mercurial.spec 3 Mar 2006 17:01:50 -0000 1.4 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.7 +Version: 0.8 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -30,10 +30,16 @@ %files -f %{name}.files %defattr(-,root,root,-) -%doc README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt +%doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt %changelog +* Mon Jan 30 2006 Jeremy Katz - 0.8-1 +- update to 0.8 + +* Thu Sep 22 2005 Jeremy Katz +- add contributors to %%doc + * Tue Sep 20 2005 Jeremy Katz - 0.7 - update to 0.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Sep 2005 21:36:43 -0000 1.4 +++ sources 3 Mar 2006 17:01:50 -0000 1.5 @@ -1 +1 @@ -c024ca9ed3ef35af8c5618316b6ab00a mercurial-0.7.tar.gz +4d418e96dd232d804799fca3458ba2b6 mercurial-0.8.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 19:27:04 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 3 Mar 2006 14:27:04 -0500 Subject: rpms/lyx/devel .cvsignore, 1.7, 1.8 lyx.spec, 1.24, 1.25 sources, 1.8, 1.9 Message-ID: <200603031927.k23JRbk3024377@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24356 Modified Files: .cvsignore lyx.spec sources Log Message: * Fri Mar 03 2006 Rex Dieter 1.4.0-0.11.pre6 - 1.4.0pre6 - --disable-stdlib-debug --disable-assertions --disable-concept-checks - don't use --without-included-boost (for now) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 13 Feb 2006 16:15:28 -0000 1.7 +++ .cvsignore 3 Mar 2006 19:27:04 -0000 1.8 @@ -1 +1 @@ -lyx-1.4.0pre5.tar.bz2 +lyx-1.4.0pre6.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- lyx.spec 20 Feb 2006 13:25:20 -0000 1.24 +++ lyx.spec 3 Mar 2006 19:27:04 -0000 1.25 @@ -2,15 +2,15 @@ ## avoid on fc4/gcc-4.0.2, due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24389 ## (fixed in gcc-4.0.3) %if "%{?fedora}" != "4" -%define _without_included_boost --without-included-boost +#define _without_included_boost --without-included-boost %endif -%define beta pre5 +%define beta pre6 Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 0.10.%{beta}%{?dist} +Release: 0.11.%{beta}%{?dist} License: GPL Group: Applications/Publishing @@ -103,10 +103,8 @@ %patch1 -p1 -b .helpers %patch2 -p1 -b .boost -# possibly questionable patch, leave it for gcc-4.1 platform(s) only -%if "%{?fedora}" > "4" -%patch3 -p0 -b .gcc41 -%endif +# possibly questionable patch, leave out for now -- Rex +#patch3 -p0 -b .gcc41 # ./autogen.sh @@ -115,7 +113,7 @@ # QT unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include # drop -fexceptions from RPM_OPT_FLAGS (suggested by lyx devs) export CFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )" @@ -130,7 +128,8 @@ --enable-optimization="$RPM_OPT_FLAGS" \ --with-aiksaurus \ --with-aspell \ - --without-warnings --disable-debug --disable-dependency-tracking \ + --without-warnings --disable-dependency-tracking \ + --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ %{?_without_included_boost} # Intermediate cleanup @@ -170,21 +169,21 @@ %post update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: -cd %{_datadir}/lyx && ./configure +cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: %postun update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: -texhash >& /dev/null ||: +texhash > /dev/null 2>&1 ||: # Catch installed/uninstalled helpers %triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then -cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: fi %triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then -cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: fi @@ -217,6 +216,11 @@ %changelog +* Fri Mar 03 2006 Rex Dieter 1.4.0-0.11.pre6 +- 1.4.0pre6 +- --disable-stdlib-debug --disable-assertions --disable-concept-checks +- don't use --without-included-boost (for now) + * Mon Feb 20 2006 Rex Dieter 1.4.0-0.10.pre5 - gcc41 patch - document boost/gcc41 patches Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 13 Feb 2006 16:15:28 -0000 1.8 +++ sources 3 Mar 2006 19:27:04 -0000 1.9 @@ -1 +1 @@ -dd137748afafc7e79cd76056882d5f05 lyx-1.4.0pre5.tar.bz2 +bcc2e2b301a4e30e9bf7556afccae060 lyx-1.4.0pre6.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 3 21:26:42 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Fri, 3 Mar 2006 16:26:42 -0500 Subject: rpms/planet/devel planet.spec,1.1,1.2 Message-ID: <200603032127.k23LRFDK029188@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29168 Modified Files: planet.spec Log Message: Rebuild for FC-5. Index: planet.spec =================================================================== RCS file: /cvs/extras/rpms/planet/devel/planet.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- planet.spec 2 Mar 2006 05:52:59 -0000 1.1 +++ planet.spec 3 Mar 2006 21:26:40 -0000 1.2 @@ -5,7 +5,7 @@ Name: planet Version: 1.0 -Release: 0.5.20060218pre +Release: 0.6.20060218pre Summary: Flexible RDF/RSS/Atom feed aggregator Group: Applications/Internet @@ -71,6 +71,9 @@ %changelog +* Fri Mar 03 2006 Richard Dawe - 1.0-0.6.20060218pre +- Rebuild for FC-5. + * Sat Feb 18 2006 Richard Dawe - 1.0-0.5.20060218pre - Update to planet--devel--1.0--patch-20. This is no different than the previous release. This is purely to use a known, From fedora-extras-commits at redhat.com Fri Mar 3 21:31:28 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:31:28 -0500 Subject: rpms/qgit - New directory Message-ID: <200603032131.k23LVU4Y029321@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29313/qgit Log Message: Directory /cvs/extras/rpms/qgit added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 21:31:34 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:31:34 -0500 Subject: rpms/qgit/devel - New directory Message-ID: <200603032131.k23LVaAh029336@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29313/qgit/devel Log Message: Directory /cvs/extras/rpms/qgit/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 21:32:19 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:32:19 -0500 Subject: rpms/qgit Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603032132.k23LWLSE029370@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29358 Added Files: Makefile import.log Log Message: Setup of module qgit --- NEW FILE Makefile --- # Top level Makefile for module qgit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 3 21:32:26 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:32:26 -0500 Subject: rpms/qgit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603032132.k23LWSaD029390@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29358/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module qgit --- NEW 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 Mar 3 21:33:55 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:33:55 -0500 Subject: rpms/qgit import.log,1.1,1.2 Message-ID: <200603032134.k23LYR7V029464@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29429 Modified Files: import.log Log Message: auto-import qgit-1.1-1 on branch devel from qgit-1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qgit/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Mar 2006 21:32:19 -0000 1.1 +++ import.log 3 Mar 2006 21:33:55 -0000 1.2 @@ -0,0 +1 @@ +qgit-1_1-1:HEAD:qgit-1.1-1.src.rpm:1141421613 From fedora-extras-commits at redhat.com Fri Mar 3 21:34:01 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:34:01 -0500 Subject: rpms/qgit/devel qgit.desktop, NONE, 1.1 qgit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603032134.k23LYX0e029468@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29429/devel Modified Files: .cvsignore sources Added Files: qgit.desktop qgit.spec Log Message: auto-import qgit-1.1-1 on branch devel from qgit-1.1-1.src.rpm --- NEW FILE qgit.desktop --- [Desktop Entry] Encoding=UTF-8 Name=QGit GenericName=QGit Comment=git repository browser Exec=qgit StartupNotify=true Terminal=false Type=Application Categories=Application;Development;X-Fedora; Version=1.0 X-Desktop-File-Install-Version=0.4 --- NEW FILE qgit.spec --- Name: qgit Version: 1.1 Release: 1%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools License: GPL URL: http://digilander.libero.it/mcostalba/ Source0: http://dl.sourceforge.net/qgit/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, qt-devel Requires: git >= 1.2.0 %description With qgit you are able to browse revisions history, view patch content and changed files, graphically following different development branches. %prep %setup -q -n %{name}-%{version} %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %doc COPYING README ChangeLog %defattr(-,root,root,-) %{_bindir}/qgit %{_datadir}/applications/*.desktop %changelog * Sun Feb 19 2005 Dan Horak 1.1-1 - updated to upstream version 1.1 - fixed download URL for Source0 from sourceforge.net - requires git >= 1.2.0 * Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.3 - added docs * Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.2 - added desktop file * Wed Feb 8 2005 Dan Horak 1.1-0.1.rc3.1 - first version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2006 21:32:25 -0000 1.1 +++ .cvsignore 3 Mar 2006 21:34:00 -0000 1.2 @@ -0,0 +1 @@ +qgit-1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2006 21:32:25 -0000 1.1 +++ sources 3 Mar 2006 21:34:00 -0000 1.2 @@ -0,0 +1 @@ +add6add14f3dd0602a3607a0acd5e983 qgit-1.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 3 21:36:29 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:36:29 -0500 Subject: owners owners.list,1.700,1.701 Message-ID: <200603032137.k23Lb1xN029528@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29510 Modified Files: owners.list Log Message: - added qgit package Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.700 retrieving revision 1.701 diff -u -r1.700 -r1.701 --- owners.list 3 Mar 2006 02:07:32 -0000 1.700 +++ owners.list 3 Mar 2006 21:36:28 -0000 1.701 @@ -1163,6 +1163,7 @@ Fedora Extras|qca|Qt Cryptographic Architecture|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|qca-tls|Qt Cryptographic Architecture, TLS plugin|gauret at free.fr|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|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| Fedora Extras|qiv|Quick Image Viewer|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 3 21:39:44 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 3 Mar 2006 16:39:44 -0500 Subject: fedora-security/audit fc4,1.164,1.165 Message-ID: <200603032139.k23Ldi2i029558@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29540 Modified Files: fc4 Log Message: Note the squirrelmail update. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- fc4 2 Mar 2006 12:14:58 -0000 1.164 +++ fc4 3 Mar 2006 21:39:36 -0000 1.165 @@ -20,7 +20,7 @@ CVE-2006-0455 version (gnupg, fixed 1.4.2.1) [since FEDORA-2006-116] CVE-2006-0454 backport (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3 CVE-2006-0405 version (libtiff, 3.8.0 only) -CVE-2006-0377 VULNERABLE (squirrelmail) bz#182585 +CVE-2006-0377 version (squirrelmail, fixed 1.4.6) bz#182585 [since FEDORA-2006-133] CVE-2006-0369 ignore (mysql) this is not a security issue CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104] @@ -58,8 +58,8 @@ CVE-2006-0207 VULNERABLE (php) bz#178044 CVE-2006-0200 version (php, 5.1.0 5.1.1 only) CVE-2006-0197 ** xorg-x11 -CVE-2006-0195 VULNERABLE (squirrelmail) bz#182582 -CVE-2006-0188 VULNERABLE (squirrelmail) bz#182580 +CVE-2006-0195 version (squirrelmail, fixed 1.4.6) bz#182582 [since FEDORA-2006-133] +CVE-2006-0188 version (squirrelmail, fixed 1.4.6) bz#182580 [since FEDORA-2006-133] CVE-2006-0097 ignore (php) Windows only CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] linux-2.6-dm-crypt-zero-key-before-free.patch From fedora-extras-commits at redhat.com Fri Mar 3 22:24:34 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 17:24:34 -0500 Subject: rpms/dap-hdf4_handler/FC-3 dap-hdf4_handler-gcc41.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 dap-hdf4_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603032225.k23MP74a031630@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-hdf4_handler/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31582/FC-3 Modified Files: .cvsignore dap-hdf4_handler.spec sources Added Files: dap-hdf4_handler-gcc41.diff Log Message: - add patch for gcc 4.1 - Update to 3.6.0 dap-hdf4_handler-gcc41.diff: --- NEW FILE dap-hdf4_handler-gcc41.diff --- diff -u --recursive hdf4_handler-3.6.0-orig/hdfclass/hcstream.h hdf4_handler-3.6.0/hdfclass/hcstream.h --- hdf4_handler-3.6.0-orig/hdfclass/hcstream.h 2005-10-13 11:23:29.000000000 +0200 +++ hdf4_handler-3.6.0/hdfclass/hcstream.h 2006-03-03 14:42:02.000000000 +0100 @@ -96,11 +96,11 @@ bool reduce_rank = false); void setslab(int *start, int *edge, int *stride, bool reduce_rank = false); void unsetslab(void) { _slab.set = _slab.reduce_rank = false; } - void hdfistream_sds::set_map_ce(const vector &a_ce) { + void set_map_ce(const vector &a_ce) { _map_ce_set = true; _map_ce_vec = a_ce; } - vector hdfistream_sds::get_map_ce() { + vector get_map_ce() { return _map_ce_vec; } bool is_map_ce_set() { diff -u --recursive hdf4_handler-3.6.0-orig/HDFGrid.h hdf4_handler-3.6.0/HDFGrid.h --- hdf4_handler-3.6.0-orig/HDFGrid.h 2005-10-10 21:22:29.000000000 +0200 +++ hdf4_handler-3.6.0/HDFGrid.h 2006-03-03 14:55:23.000000000 +0100 @@ -58,7 +58,7 @@ virtual ~HDFGrid(); virtual BaseType *ptr_duplicate(); virtual bool read(const string &dataset); - virtual vector HDFGrid::get_map_constraints(); + virtual vector get_map_constraints(); virtual bool read_tagref(const string &dataset, int32 tag, int32 ref, int &error); }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:19:07 -0000 1.2 +++ .cvsignore 3 Mar 2006 22:24:34 -0000 1.3 @@ -1 +1 @@ -hdf4_handler-3.5.0.tar.gz +hdf4_handler-3.6.0.tar.gz Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-3/dap-hdf4_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-hdf4_handler.spec 20 Feb 2006 14:21:32 -0000 1.2 +++ dap-hdf4_handler.spec 3 Mar 2006 22:24:34 -0000 1.3 @@ -1,10 +1,11 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler -Version: 3.5.0 -Release: 1%{?dist} +Version: 3.6.0 +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz +Patch: dap-hdf4_handler-gcc41.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -14,13 +15,14 @@ %description This is the hdf4 data handler for our data server. It reads HDF4 and HDF-EOS files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n hdf4_handler-%{version} +%patch -p1 %build -%configure --with-hdf4-libdir=%{_libdir}/hdf --with-hdf4-include=%{_includedir}/hdf +%configure make %{?_smp_mflags} %install @@ -37,5 +39,11 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 +- add patch for gcc 4.1 + +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:19:07 -0000 1.2 +++ sources 3 Mar 2006 22:24:34 -0000 1.3 @@ -1 +1 @@ -0b3d3ab80d85428a9a9f898dacc4d53e hdf4_handler-3.5.0.tar.gz +8aebe63dc38dfbc35f853807b37c070e hdf4_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 22:24:40 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 17:24:40 -0500 Subject: rpms/dap-hdf4_handler/FC-4 dap-hdf4_handler-gcc41.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 dap-hdf4_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603032225.k23MPCj9031635@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-hdf4_handler/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31582/FC-4 Modified Files: .cvsignore dap-hdf4_handler.spec sources Added Files: dap-hdf4_handler-gcc41.diff Log Message: - add patch for gcc 4.1 - Update to 3.6.0 dap-hdf4_handler-gcc41.diff: --- NEW FILE dap-hdf4_handler-gcc41.diff --- diff -u --recursive hdf4_handler-3.6.0-orig/hdfclass/hcstream.h hdf4_handler-3.6.0/hdfclass/hcstream.h --- hdf4_handler-3.6.0-orig/hdfclass/hcstream.h 2005-10-13 11:23:29.000000000 +0200 +++ hdf4_handler-3.6.0/hdfclass/hcstream.h 2006-03-03 14:42:02.000000000 +0100 @@ -96,11 +96,11 @@ bool reduce_rank = false); void setslab(int *start, int *edge, int *stride, bool reduce_rank = false); void unsetslab(void) { _slab.set = _slab.reduce_rank = false; } - void hdfistream_sds::set_map_ce(const vector &a_ce) { + void set_map_ce(const vector &a_ce) { _map_ce_set = true; _map_ce_vec = a_ce; } - vector hdfistream_sds::get_map_ce() { + vector get_map_ce() { return _map_ce_vec; } bool is_map_ce_set() { diff -u --recursive hdf4_handler-3.6.0-orig/HDFGrid.h hdf4_handler-3.6.0/HDFGrid.h --- hdf4_handler-3.6.0-orig/HDFGrid.h 2005-10-10 21:22:29.000000000 +0200 +++ hdf4_handler-3.6.0/HDFGrid.h 2006-03-03 14:55:23.000000000 +0100 @@ -58,7 +58,7 @@ virtual ~HDFGrid(); virtual BaseType *ptr_duplicate(); virtual bool read(const string &dataset); - virtual vector HDFGrid::get_map_constraints(); + virtual vector get_map_constraints(); virtual bool read_tagref(const string &dataset, int32 tag, int32 ref, int &error); }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:19:07 -0000 1.2 +++ .cvsignore 3 Mar 2006 22:24:40 -0000 1.3 @@ -1 +1 @@ -hdf4_handler-3.5.0.tar.gz +hdf4_handler-3.6.0.tar.gz Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-4/dap-hdf4_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-hdf4_handler.spec 20 Feb 2006 14:21:32 -0000 1.2 +++ dap-hdf4_handler.spec 3 Mar 2006 22:24:40 -0000 1.3 @@ -1,10 +1,11 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler -Version: 3.5.0 -Release: 1%{?dist} +Version: 3.6.0 +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz +Patch: dap-hdf4_handler-gcc41.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -14,13 +15,14 @@ %description This is the hdf4 data handler for our data server. It reads HDF4 and HDF-EOS files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n hdf4_handler-%{version} +%patch -p1 %build -%configure --with-hdf4-libdir=%{_libdir}/hdf --with-hdf4-include=%{_includedir}/hdf +%configure make %{?_smp_mflags} %install @@ -37,5 +39,11 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 +- add patch for gcc 4.1 + +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:19:07 -0000 1.2 +++ sources 3 Mar 2006 22:24:40 -0000 1.3 @@ -1 +1 @@ -0b3d3ab80d85428a9a9f898dacc4d53e hdf4_handler-3.5.0.tar.gz +8aebe63dc38dfbc35f853807b37c070e hdf4_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 22:58:30 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 17:58:30 -0500 Subject: rpms/dap-hdf4_handler/devel dap-hdf4_handler.spec,1.5,1.6 Message-ID: <200603032259.k23Mx2ZZ031818@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-serv31801 Modified Files: dap-hdf4_handler.spec Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 - BuildRequires libdap-devel above 3.6.0 Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dap-hdf4_handler.spec 3 Mar 2006 13:58:28 -0000 1.5 +++ dap-hdf4_handler.spec 3 Mar 2006 22:58:30 -0000 1.6 @@ -1,7 +1,7 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler Version: 3.6.0 -Release: 2%{?dist}.1 +Release: 3%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz @@ -9,7 +9,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel hdf-devel +BuildRequires: libdap-devel >= 3.6.0 hdf-devel #Requires: dap-server %description @@ -39,7 +39,10 @@ %doc README %changelog -* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2.1 +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 +- BuildRequires libdap-devel above 3.6.0 + +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 - add patch for gcc 4.1 * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 From fedora-extras-commits at redhat.com Fri Mar 3 23:00:10 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 18:00:10 -0500 Subject: rpms/dap-hdf4_handler/FC-3 dap-hdf4_handler.spec,1.3,1.4 Message-ID: <200603032300.k23N0hMS031914@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-hdf4_handler/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31875/FC-3 Modified Files: dap-hdf4_handler.spec Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 - BuildRequires libdap-devel above 3.6.0 Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-3/dap-hdf4_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-hdf4_handler.spec 3 Mar 2006 22:24:34 -0000 1.3 +++ dap-hdf4_handler.spec 3 Mar 2006 23:00:10 -0000 1.4 @@ -1,7 +1,7 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler Version: 3.6.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz @@ -9,7 +9,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel hdf-devel +BuildRequires: libdap-devel >= 3.6.0 hdf-devel #Requires: dap-server %description @@ -39,6 +39,9 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 +- BuildRequires libdap-devel above 3.6.0 + * Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 - add patch for gcc 4.1 From fedora-extras-commits at redhat.com Fri Mar 3 23:00:16 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 18:00:16 -0500 Subject: rpms/dap-hdf4_handler/FC-4 dap-hdf4_handler.spec,1.3,1.4 Message-ID: <200603032300.k23N0mEX031917@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-hdf4_handler/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31875/FC-4 Modified Files: dap-hdf4_handler.spec Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 - BuildRequires libdap-devel above 3.6.0 Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-4/dap-hdf4_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-hdf4_handler.spec 3 Mar 2006 22:24:40 -0000 1.3 +++ dap-hdf4_handler.spec 3 Mar 2006 23:00:16 -0000 1.4 @@ -1,7 +1,7 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler Version: 3.6.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz @@ -9,7 +9,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel hdf-devel +BuildRequires: libdap-devel >= 3.6.0 hdf-devel #Requires: dap-server %description @@ -39,6 +39,9 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 +- BuildRequires libdap-devel above 3.6.0 + * Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 - add patch for gcc 4.1 From fedora-extras-commits at redhat.com Fri Mar 3 23:42:03 2006 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Fri, 3 Mar 2006 18:42:03 -0500 Subject: rpms/balsa/devel .cvsignore, 1.12, 1.13 balsa.spec, 1.15, 1.16 sources, 1.12, 1.13 Message-ID: <200603032342.k23NgZ9P001675@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/balsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1654 Modified Files: .cvsignore balsa.spec sources Log Message: -update to upstream version 2.3.12. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 1 Mar 2006 20:29:04 -0000 1.12 +++ .cvsignore 3 Mar 2006 23:42:03 -0000 1.13 @@ -1,2 +1,2 @@ -balsa-2.3.11.tar.bz2 +balsa-2.3.12.tar.bz2 gmime-2.1.17.tar.bz2 Index: balsa.spec =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- balsa.spec 1 Mar 2006 20:29:04 -0000 1.15 +++ balsa.spec 3 Mar 2006 23:42:03 -0000 1.16 @@ -1,7 +1,7 @@ %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell Name: balsa -Version: 2.3.11 +Version: 2.3.12 Release: 1%{?dist} Summary: Mail Client @@ -99,6 +99,9 @@ %changelog +* Sat Mar 4 2006 Pawel Salek - 2.3.12-1 +- update to upstream version 2.3.12. + * Wed Mar 1 2006 Pawel Salek - 2.3.11-1 - update to upstream version 2.3.11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 1 Mar 2006 20:29:04 -0000 1.12 +++ sources 3 Mar 2006 23:42:03 -0000 1.13 @@ -1,2 +1,2 @@ -a00f9d235b1ae9e7736fb0a0f4a38e82 balsa-2.3.11.tar.bz2 +3792d22cde7aceeae37108ed09477711 balsa-2.3.12.tar.bz2 4be55ee55e4b3966bd51fadbf5fb323b gmime-2.1.17.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 4 03:41:45 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 3 Mar 2006 22:41:45 -0500 Subject: owners owners.list,1.701,1.702 Message-ID: <200603040342.k243gIHE009927@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9907 Modified Files: owners.list Log Message: Add myself to gtkglarea2's CC-list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.701 retrieving revision 1.702 diff -u -r1.701 -r1.702 --- owners.list 3 Mar 2006 21:36:28 -0000 1.701 +++ owners.list 4 Mar 2006 03:41:45 -0000 1.702 @@ -385,7 +385,7 @@ Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtk+extra|A library of gtk+ widgets|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| -Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 4 04:59:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 3 Mar 2006 23:59:22 -0500 Subject: rpms/gc/devel gc-6.7-no-undefined.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gc.spec, 1.17, 1.18 sources, 1.6, 1.7 gc-6.6-gcc41.patch, 1.1, NONE gc-6.6-no-undefined.patch, 1.1, NONE Message-ID: <200603040459.k244xs7h011938@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11908 Modified Files: .cvsignore gc.spec sources Added Files: gc-6.7-no-undefined.patch Removed Files: gc-6.6-gcc41.patch gc-6.6-no-undefined.patch Log Message: * Fri Mar 03 2006 Rex Dieter 6.7-1 - 6.7 gc-6.7-no-undefined.patch: --- NEW FILE gc-6.7-no-undefined.patch --- --- gc6.7/Makefile.am.no-undefined 2006-02-18 18:50:37.000000000 -0600 +++ gc6.7/Makefile.am 2006-03-03 22:51:58.000000000 -0600 @@ -57,7 +57,7 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ @@ -65,8 +65,8 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S @@ -91,9 +91,9 @@ ## are included in the distribution # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) --- gc6.7/Makefile.in.no-undefined 2006-02-18 18:50:57.000000000 -0600 +++ gc6.7/Makefile.in 2006-03-03 22:54:41.000000000 -0600 @@ -340,15 +340,15 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined AM_CXXFLAGS = @GC_CFLAGS@ AM_CFLAGS = @GC_CFLAGS@ @CPLUSPLUS_FALSE at extra_checks = @@ -356,9 +356,9 @@ # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) all_objs = @addobjs@ $(libgc_la_OBJECTS) @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gc/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Sep 2005 19:29:11 -0000 1.6 +++ .cvsignore 4 Mar 2006 04:59:22 -0000 1.7 @@ -1 +1 @@ -gc6.6.tar.gz +gc6.7.tar.gz Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gc.spec 1 Mar 2006 15:54:09 -0000 1.17 +++ gc.spec 4 Mar 2006 04:59:22 -0000 1.18 @@ -1,9 +1,9 @@ Summary: C++ Garbage Collector Name: gc -Version: 6.6 +Version: 6.7 -Release: 5%{?dist}.1 +Release: 1%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ @@ -11,9 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) -Patch1: gc-6.6-no-undefined.patch -# gcc(4.1) patch -Patch2: gc-6.6-gcc41.patch +Patch1: gc-6.7-no-undefined.patch BuildRequires: libtool BuildRequires: automake @@ -38,7 +36,6 @@ %setup -q -n %{name}%{version} %patch1 -p1 -b .no-undefined -%patch2 -p1 -b .gcc41 cp -f %{_datadir}/aclocal/libtool.m4 . libtoolize --copy --force @@ -101,6 +98,9 @@ %changelog +* Fri Mar 03 2006 Rex Dieter 6.7-1 +- 6.7 + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/gc/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Sep 2005 19:29:11 -0000 1.6 +++ sources 4 Mar 2006 04:59:22 -0000 1.7 @@ -1 +1 @@ -c7c301e8fab8ce152c908b05bc8d452c gc6.6.tar.gz +be780413a0360306ad3b701e45fa8871 gc6.7.tar.gz --- gc-6.6-gcc41.patch DELETED --- --- gc-6.6-no-undefined.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 05:01:10 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 4 Mar 2006 00:01:10 -0500 Subject: rpms/gtkglarea2/devel gtkglarea2.spec,1.13,1.14 Message-ID: <200603040501.k2451hkK013835@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/gtkglarea2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13518 Modified Files: gtkglarea2.spec Log Message: * Sat Mar 04 2006 Ralf Cors??pius - 1.99.0-6 - Re-enable building. - disable static libs. - disable dep-tracking. - BR|R: libGL-devel, libGLU-devel. Index: gtkglarea2.spec =================================================================== RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gtkglarea2.spec 2 Mar 2006 21:30:09 -0000 1.13 +++ gtkglarea2.spec 4 Mar 2006 05:01:10 -0000 1.14 @@ -1,26 +1,26 @@ Summary: OpenGL GTK widget Name: gtkglarea2 Version: 1.99.0 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: System Environment/Libraries URL: ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea # ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/ Source0: ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig BuildRequires: gtk2-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel +BuildRequires: libGL-devel +BuildRequires: libGLU-devel %package devel Summary: Development package for gtkglarea2 Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: gtk2-devel -Requires: mesa-libGL-devel -Requires: mesa-libGLU-devel +Requires: libGL-devel +Requires: libGLU-devel %description GtkGLArea is a GTK widget that makes it easy to use OpenGL or Mesa @@ -33,17 +33,10 @@ software development. %prep -cat< - 1.99.0-6 +- Re-enable building. +- disable static libs. +- disable dep-tracking. +- BR|R: libGL-devel, libGLU-devel. + * Fri Feb 17 2006 Gerard Milmeister - 1.99.0-5 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sat Mar 4 05:12:08 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 4 Mar 2006 00:12:08 -0500 Subject: rpms/gc/FC-3 gc-6.7-no-undefined.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gc.spec, 1.12, 1.13 sources, 1.6, 1.7 gc-6.6-no-undefined.patch, 1.1, NONE Message-ID: <200603040512.k245Cej2013954@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13930 Modified Files: .cvsignore gc.spec sources Added Files: gc-6.7-no-undefined.patch Removed Files: gc-6.6-no-undefined.patch Log Message: * Fri Mar 03 2006 Rex Dieter 6.7-1 - 6.7 gc-6.7-no-undefined.patch: --- NEW FILE gc-6.7-no-undefined.patch --- --- gc6.7/Makefile.am.no-undefined 2006-02-18 18:50:37.000000000 -0600 +++ gc6.7/Makefile.am 2006-03-03 22:51:58.000000000 -0600 @@ -57,7 +57,7 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ @@ -65,8 +65,8 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S @@ -91,9 +91,9 @@ ## are included in the distribution # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) --- gc6.7/Makefile.in.no-undefined 2006-02-18 18:50:57.000000000 -0600 +++ gc6.7/Makefile.in 2006-03-03 22:54:41.000000000 -0600 @@ -340,15 +340,15 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined AM_CXXFLAGS = @GC_CFLAGS@ AM_CFLAGS = @GC_CFLAGS@ @CPLUSPLUS_FALSE at extra_checks = @@ -356,9 +356,9 @@ # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) all_objs = @addobjs@ $(libgc_la_OBJECTS) @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gc/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Sep 2005 18:45:11 -0000 1.6 +++ .cvsignore 4 Mar 2006 05:12:08 -0000 1.7 @@ -1 +1 @@ -gc6.6.tar.gz +gc6.7.tar.gz Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gc.spec 1 Dec 2005 15:10:03 -0000 1.12 +++ gc.spec 4 Mar 2006 05:12:08 -0000 1.13 @@ -1,9 +1,9 @@ Summary: C++ Garbage Collector Name: gc -Version: 6.6 +Version: 6.7 -Release: 4%{?dist} +Release: 1%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ @@ -11,7 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) -Patch1: gc-6.6-no-undefined.patch +Patch1: gc-6.7-no-undefined.patch + BuildRequires: libtool BuildRequires: automake @@ -97,6 +98,15 @@ %changelog +* Fri Mar 03 2006 Rex Dieter 6.7-1 +- 6.7 + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Fri Feb 10 2006 Rex Dieter 6.6-5 +- gcc(4.1) patch + * Thu Dec 01 2005 Rex Dieter 6.6-4 - Provides: libgc(-devel) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gc/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Sep 2005 18:45:12 -0000 1.6 +++ sources 4 Mar 2006 05:12:08 -0000 1.7 @@ -1 +1 @@ -c7c301e8fab8ce152c908b05bc8d452c gc6.6.tar.gz +be780413a0360306ad3b701e45fa8871 gc6.7.tar.gz --- gc-6.6-no-undefined.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 05:13:34 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 4 Mar 2006 00:13:34 -0500 Subject: rpms/gc/FC-4 gc-6.7-no-undefined.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gc.spec, 1.13, 1.14 sources, 1.6, 1.7 gc-6.6-no-undefined.patch, 1.1, NONE Message-ID: <200603040514.k245E77U014025@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14001 Modified Files: .cvsignore gc.spec sources Added Files: gc-6.7-no-undefined.patch Removed Files: gc-6.6-no-undefined.patch Log Message: * Fri Mar 03 2006 Rex Dieter 6.7-1 - 6.7 gc-6.7-no-undefined.patch: --- NEW FILE gc-6.7-no-undefined.patch --- --- gc6.7/Makefile.am.no-undefined 2006-02-18 18:50:37.000000000 -0600 +++ gc6.7/Makefile.am 2006-03-03 22:51:58.000000000 -0600 @@ -57,7 +57,7 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ @@ -65,8 +65,8 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S @@ -91,9 +91,9 @@ ## are included in the distribution # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) --- gc6.7/Makefile.in.no-undefined 2006-02-18 18:50:57.000000000 -0600 +++ gc6.7/Makefile.in 2006-03-03 22:54:41.000000000 -0600 @@ -340,15 +340,15 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined AM_CXXFLAGS = @GC_CFLAGS@ AM_CFLAGS = @GC_CFLAGS@ @CPLUSPLUS_FALSE at extra_checks = @@ -356,9 +356,9 @@ # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) all_objs = @addobjs@ $(libgc_la_OBJECTS) @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gc/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Sep 2005 18:45:12 -0000 1.6 +++ .cvsignore 4 Mar 2006 05:13:34 -0000 1.7 @@ -1 +1 @@ -gc6.6.tar.gz +gc6.7.tar.gz Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gc.spec 1 Dec 2005 15:10:29 -0000 1.13 +++ gc.spec 4 Mar 2006 05:13:34 -0000 1.14 @@ -1,9 +1,9 @@ Summary: C++ Garbage Collector Name: gc -Version: 6.6 +Version: 6.7 -Release: 4%{?dist} +Release: 1%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ @@ -11,7 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) -Patch1: gc-6.6-no-undefined.patch +Patch1: gc-6.7-no-undefined.patch + BuildRequires: libtool BuildRequires: automake @@ -97,6 +98,15 @@ %changelog +* Fri Mar 03 2006 Rex Dieter 6.7-1 +- 6.7 + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Fri Feb 10 2006 Rex Dieter 6.6-5 +- gcc(4.1) patch + * Thu Dec 01 2005 Rex Dieter 6.6-4 - Provides: libgc(-devel) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gc/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Sep 2005 18:45:12 -0000 1.6 +++ sources 4 Mar 2006 05:13:34 -0000 1.7 @@ -1 +1 @@ -c7c301e8fab8ce152c908b05bc8d452c gc6.6.tar.gz +be780413a0360306ad3b701e45fa8871 gc6.7.tar.gz --- gc-6.6-no-undefined.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 08:20:27 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Mar 2006 03:20:27 -0500 Subject: rpms/dillo/FC-3 .cvsignore, 1.4, 1.5 dillo.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603040820.k248KxKk020382@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dillo/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/FC-3 Modified Files: .cvsignore dillo.spec sources Log Message: - reenable build - add dist - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:54:15 -0000 1.4 +++ .cvsignore 4 Mar 2006 08:20:26 -0000 1.5 @@ -1 +1 @@ -dillo-0.8.4.tar.bz2 +dillo-0.8.5.tar.bz2 Index: dillo.spec =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-3/dillo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dillo.spec 9 Feb 2005 23:44:00 -0000 1.6 +++ dillo.spec 4 Mar 2006 08:20:26 -0000 1.7 @@ -1,38 +1,41 @@ Name: dillo -Version: 0.8.4 -Release: 2 -Epoch: 0 +Version: 0.8.5 +Release: 1%{?dist} + Summary: Very small and fast GUI web browser Group: Applications/Internet License: GPL URL: http://www.dillo.org/ -Source0: http://www.dillo.org/download/dillo-0.8.4.tar.bz2 +Source0: http://www.dillo.org/download/dillo-0.8.5.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png -Patch0: dillo-0.8.0-nodebug.patch +Patch0: dillo-0.8.0-nodebug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk+-devel +BuildRequires: gtk+-devel BuildRequires: zlib-devel BuildRequires: desktop-file-utils -BuildRequires: libpng-devel >= 0:1.2.0 -BuildRequires: libjpeg-devel = 0:6b -Requires: wget -Provides: webclient +BuildRequires: libpng-devel >= 1.2.0 +BuildRequires: libjpeg-devel = 6b +Requires: wget +Provides: webclient %description Dillo is a very small and fast web browser using GTK. Currently: no frames,https,javascript. + %prep %setup -q %patch0 + %build %configure --disable-dependency-tracking --enable-ipv6 make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT @@ -40,8 +43,8 @@ rm -f doc/Makefile* %{__install} -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications -desktop-file-install --vendor fedora \ - --add-category X-Fedora \ +desktop-file-install --vendor fedora \ + --add-category X-Fedora \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ %{SOURCE1} %{__install} -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/dillo.png @@ -51,10 +54,10 @@ rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog doc -%config(noreplace) %{_sysconfdir}/* +%config(noreplace) %{_sysconfdir}/* %{_bindir}/* %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/dillo.png @@ -62,6 +65,12 @@ %changelog +* Sat Mar 04 2006 Andreas Bierfert +0.8.5-1 +- reenable build +- version upgrade +- add dist + * Thu Feb 3 2005 Ville Skytt?? - 0:0.8.4-2 - Add icon, thanks to Robin Humble. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:54:15 -0000 1.4 +++ sources 4 Mar 2006 08:20:26 -0000 1.5 @@ -1 +1 @@ -ebf17d6cca1fccc8bc80acdf05e736a3 dillo-0.8.4.tar.bz2 +d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 4 08:20:33 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Mar 2006 03:20:33 -0500 Subject: rpms/dillo/FC-4 .cvsignore, 1.4, 1.5 dillo.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200603040821.k248L5jS020387@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dillo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/FC-4 Modified Files: .cvsignore dillo.spec sources Log Message: - reenable build - add dist - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:54:15 -0000 1.4 +++ .cvsignore 4 Mar 2006 08:20:33 -0000 1.5 @@ -1 +1 @@ -dillo-0.8.4.tar.bz2 +dillo-0.8.5.tar.bz2 Index: dillo.spec =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-4/dillo.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dillo.spec 6 Apr 2005 22:11:36 -0000 1.8 +++ dillo.spec 4 Mar 2006 08:20:33 -0000 1.9 @@ -1,13 +1,13 @@ Name: dillo -Version: 0.8.4 -Release: 3 +Version: 0.8.5 +Release: 1%{?dist} Summary: Very small and fast GUI web browser Group: Applications/Internet License: GPL URL: http://www.dillo.org/ -Source0: http://www.dillo.org/download/dillo-0.8.4.tar.bz2 +Source0: http://www.dillo.org/download/dillo-0.8.5.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png Patch0: dillo-0.8.0-nodebug.patch @@ -65,6 +65,12 @@ %changelog +* Sat Mar 04 2006 Andreas Bierfert +0.8.5-1 +- reenable build +- version upgrade +- add dist + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:54:15 -0000 1.4 +++ sources 4 Mar 2006 08:20:33 -0000 1.5 @@ -1 +1 @@ -ebf17d6cca1fccc8bc80acdf05e736a3 dillo-0.8.4.tar.bz2 +d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 4 08:20:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Mar 2006 03:20:39 -0500 Subject: rpms/dillo/devel .cvsignore, 1.4, 1.5 dillo.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200603040821.k248LBE8020392@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dillo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/devel Modified Files: .cvsignore dillo.spec sources Log Message: - reenable build - add dist - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:54:15 -0000 1.4 +++ .cvsignore 4 Mar 2006 08:20:39 -0000 1.5 @@ -1 +1 @@ -dillo-0.8.4.tar.bz2 +dillo-0.8.5.tar.bz2 Index: dillo.spec =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/dillo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dillo.spec 2 Mar 2006 21:28:41 -0000 1.9 +++ dillo.spec 4 Mar 2006 08:20:39 -0000 1.10 @@ -1,13 +1,13 @@ Name: dillo -Version: 0.8.4 -Release: 3 +Version: 0.8.5 +Release: 1%{?dist} Summary: Very small and fast GUI web browser Group: Applications/Internet License: GPL URL: http://www.dillo.org/ -Source0: http://www.dillo.org/download/dillo-0.8.4.tar.bz2 +Source0: http://www.dillo.org/download/dillo-0.8.5.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png Patch0: dillo-0.8.0-nodebug.patch @@ -27,13 +27,6 @@ %prep -cat< +0.8.5-1 +- reenable build +- version upgrade +- add dist + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:54:15 -0000 1.4 +++ sources 4 Mar 2006 08:20:39 -0000 1.5 @@ -1 +1 @@ -ebf17d6cca1fccc8bc80acdf05e736a3 dillo-0.8.4.tar.bz2 +d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 4 08:25:23 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Mar 2006 03:25:23 -0500 Subject: owners owners.list,1.702,1.703 Message-ID: <200603040825.k248Puhf020427@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20410 Modified Files: owners.list Log Message: - taking ownership of dillo Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.702 retrieving revision 1.703 diff -u -r1.702 -r1.703 --- owners.list 4 Mar 2006 03:41:45 -0000 1.702 +++ owners.list 4 Mar 2006 08:25:23 -0000 1.703 @@ -177,7 +177,7 @@ Fedora Extras|dietlibc|Small libc implementation|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|digikam|A digital camera accessing & photo management application|mgarski at post.pl|extras-qa at fedoraproject.org| Fedora Extras|digikamimageplugins|Plugins for Digikam|rdieter at math.unl.edu|extras-qa at fedoraproject.org| -Fedora Extras|dillo|Very small and fast GUI web browser|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|dillo|Very small and fast GUI web browser|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|diradmin|User control management tool for LDAP directories|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 4 08:31:00 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Mar 2006 03:31:00 -0500 Subject: rpms/perl-HTML-Template-Expr/FC-4 .cvsignore, 1.3, 1.4 perl-HTML-Template-Expr.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603040831.k248VXS9020484@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20445/FC-4 Modified Files: .cvsignore perl-HTML-Template-Expr.spec sources Log Message: * Sat Mar 4 2006 Ville Skytt?? - 0.06-1 - 0.06. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Dec 2005 15:24:06 -0000 1.3 +++ .cvsignore 4 Mar 2006 08:31:00 -0000 1.4 @@ -1 +1 @@ -HTML-Template-Expr-0.05.tar.gz +HTML-Template-Expr-0.06.tar.gz Index: perl-HTML-Template-Expr.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/perl-HTML-Template-Expr.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-HTML-Template-Expr.spec 22 Dec 2005 15:24:06 -0000 1.3 +++ perl-HTML-Template-Expr.spec 4 Mar 2006 08:31:00 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-HTML-Template-Expr -Version: 0.05 +Version: 0.06 Release: 1%{?dist} Summary: Expression support extension for HTML::Template @@ -56,6 +56,9 @@ %changelog +* Sat Mar 4 2006 Ville Skytt?? - 0.06-1 +- 0.06. + * Thu Dec 22 2005 Ville Skytt?? - 0.05-1 - 0.05. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Dec 2005 15:24:06 -0000 1.3 +++ sources 4 Mar 2006 08:31:00 -0000 1.4 @@ -1 +1 @@ -726e5bb49083cbf7d752767f7c3f29cf HTML-Template-Expr-0.05.tar.gz +1a7a6b908d00fc71567d9c57708a7633 HTML-Template-Expr-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Mar 4 08:31:06 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Mar 2006 03:31:06 -0500 Subject: rpms/perl-HTML-Template-Expr/devel .cvsignore, 1.3, 1.4 perl-HTML-Template-Expr.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603040831.k248VcT8020490@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20445/devel Modified Files: .cvsignore perl-HTML-Template-Expr.spec sources Log Message: * Sat Mar 4 2006 Ville Skytt?? - 0.06-1 - 0.06. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Dec 2005 15:24:12 -0000 1.3 +++ .cvsignore 4 Mar 2006 08:31:06 -0000 1.4 @@ -1 +1 @@ -HTML-Template-Expr-0.05.tar.gz +HTML-Template-Expr-0.06.tar.gz Index: perl-HTML-Template-Expr.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/perl-HTML-Template-Expr.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-HTML-Template-Expr.spec 22 Dec 2005 15:24:12 -0000 1.3 +++ perl-HTML-Template-Expr.spec 4 Mar 2006 08:31:06 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-HTML-Template-Expr -Version: 0.05 +Version: 0.06 Release: 1%{?dist} Summary: Expression support extension for HTML::Template @@ -56,6 +56,9 @@ %changelog +* Sat Mar 4 2006 Ville Skytt?? - 0.06-1 +- 0.06. + * Thu Dec 22 2005 Ville Skytt?? - 0.05-1 - 0.05. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Dec 2005 15:24:12 -0000 1.3 +++ sources 4 Mar 2006 08:31:06 -0000 1.4 @@ -1 +1 @@ -726e5bb49083cbf7d752767f7c3f29cf HTML-Template-Expr-0.05.tar.gz +1a7a6b908d00fc71567d9c57708a7633 HTML-Template-Expr-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Mar 4 11:07:40 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:07:40 -0500 Subject: rpms/lcov - New directory Message-ID: <200603041107.k24B7gkb027208@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27200/lcov Log Message: Directory /cvs/extras/rpms/lcov added to the repository From fedora-extras-commits at redhat.com Sat Mar 4 11:07:46 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:07:46 -0500 Subject: rpms/lcov/devel - New directory Message-ID: <200603041107.k24B7mk7027223@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27200/lcov/devel Log Message: Directory /cvs/extras/rpms/lcov/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 4 11:08:11 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:08:11 -0500 Subject: rpms/lcov Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603041108.k24B8Dk7027257@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27245 Added Files: Makefile import.log Log Message: Setup of module lcov --- NEW FILE Makefile --- # Top level Makefile for module lcov all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 4 11:08:17 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:08:17 -0500 Subject: rpms/lcov/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603041108.k24B8Vrn027274@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27245/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lcov --- NEW 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 Mar 4 11:09:27 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:09:27 -0500 Subject: rpms/lcov import.log,1.1,1.2 Message-ID: <200603041109.k24B9xfi027361@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27321 Modified Files: import.log Log Message: auto-import lcov-1.4-2.fc5 on branch devel from lcov-1.4-2.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lcov/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Mar 2006 11:08:10 -0000 1.1 +++ import.log 4 Mar 2006 11:09:26 -0000 1.2 @@ -0,0 +1 @@ +lcov-1_4-2_fc5:HEAD:lcov-1.4-2.fc5.src.rpm:1141470560 From fedora-extras-commits at redhat.com Sat Mar 4 11:09:49 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:09:49 -0500 Subject: rpms/lcov/devel lcov-1.4-gcda-suffix.patch, NONE, 1.1 lcov-1.4-lcovrc.patch, NONE, 1.1 lcov.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603041110.k24BALM8027365@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27321/devel Modified Files: .cvsignore sources Added Files: lcov-1.4-gcda-suffix.patch lcov-1.4-lcovrc.patch lcov.spec Log Message: auto-import lcov-1.4-2.fc5 on branch devel from lcov-1.4-2.fc5.src.rpm lcov-1.4-gcda-suffix.patch: --- NEW FILE lcov-1.4-gcda-suffix.patch --- --- lcov-1.4/bin/lcov.~1~ 2005-03-02 08:24:50.000000000 -0800 +++ lcov-1.4/bin/lcov 2006-02-15 10:24:41.000000000 -0800 @@ -331,8 +331,8 @@ get coverage data for a user space progr -c, --capture Capture coverage data -t, --test-name NAME Specify test name to be stored with data -o, --output-file FILENAME Write data to FILENAME instead of stdout - -d, --directory DIR Use .da files in DIR instead of kernel - -f, --follow Follow links when searching .da files + -d, --directory DIR Use .da/.gcda files in DIR instead of kernel + -f, --follow Follow links when searching .da/.gcda files -k, --kernel-directory KDIR Capture kernel coverage data only from KDIR -a, --add-tracefile FILE Add contents of tracefiles -e, --extract FILE PATTERN Extract files matching PATTERN from FILE @@ -399,17 +399,17 @@ sub userspace_reset() foreach $current_dir (@directory) { - info("Deleting all .da files in $current_dir and ". + info("Deleting all .da and .gcda files in $current_dir and ". "subdirectories\n"); if ($follow) { @file_list = - `find $current_dir -follow -name \\*.da -type f 2>/dev/null`; + `find $current_dir -follow \\( -name \\*.gcda -o -name \\*.da \\) -type f 2>/dev/null`; } else { @file_list = - `find $current_dir -name \\*.da -type f 2>/dev/null`; + `find $current_dir \\( -name \\*.gcda -o -name \\*.da \\) -type f 2>/dev/null`; } chomp(@file_list); foreach (@file_list) lcov-1.4-lcovrc.patch: --- NEW FILE lcov-1.4-lcovrc.patch --- --- lcov-1.4/lcovrc.~1~ 2005-03-02 08:24:47.000000000 -0800 +++ lcov-1.4/lcovrc 2006-02-13 19:09:02.000000000 -0800 @@ -22,13 +22,13 @@ genhtml_overview_width = 80 # difference in lines between the position a user selected from the overview # and the position the source code window is scrolled to (used by --frames # option of genhtml) -genhtml_nav_resolution = 4; +genhtml_nav_resolution = 4 # Clicking a line in the overview image should show the source code view at # a position a bit further up so that the requested line is not the first # line in the window. This number specifies that offset in lines (used by # --frames option of genhtml) -genhtml_nav_offset = 10; +genhtml_nav_offset = 10 # Do not remove unused test descriptions if non-zero (same as # --keep-descriptions option of genhtml) --- NEW FILE lcov.spec --- Name: lcov Version: 1.4 Release: 2%{?dist} Summary: LTP GCOV extension code coverage tool Group: Development/Tools License: GPL URL: http://ltp.sourceforge.net/coverage/lcov.php Source0: http://dl.sourceforge.net/ltp/lcov-%{version}.tar.gz Patch1: lcov-1.4-lcovrc.patch Patch2: lcov-1.4-gcda-suffix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: /usr/bin/gcov Requires: perl(GD::Image) %description LCOV is an extension of GCOV, a GNU tool which provides information about what parts of a program are actually executed (i.e. "covered") while running a particular test case. The extension consists of a set of PERL scripts which build on the textual GCOV output to implement HTML output and support for large projects. %prep %setup -q %patch1 -p1 %patch2 -p1 %install rm -rf $RPM_BUILD_ROOT make install PREFIX=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man5/* %config(noreplace) %attr(0644,root,root) /etc/lcovrc %changelog * Mon Feb 20 2006 Roland McGrath - 1.4-2 - Fix lcov -z to look for .gcda (GCC >= 3.4) suffix as well as .da (old GCC). - Remove empty %%build from spec. - Fix URL for source tarball. * Mon Feb 13 2006 Roland McGrath - 1.4-1 - Initial build, some spec bits snarfed from upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lcov/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2006 11:08:17 -0000 1.1 +++ .cvsignore 4 Mar 2006 11:09:48 -0000 1.2 @@ -0,0 +1 @@ +lcov-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lcov/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2006 11:08:17 -0000 1.1 +++ sources 4 Mar 2006 11:09:48 -0000 1.2 @@ -0,0 +1 @@ +9ae93c6619ee60a9e89bd2da0e49ae4a lcov-1.4.tar.gz From fedora-extras-commits at redhat.com Sat Mar 4 12:23:50 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 07:23:50 -0500 Subject: rpms/dejavu-fonts import.log,1.36,1.37 Message-ID: <200603041224.k24COMiW029538@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29503 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.3-2.fc5 on branch devel from dejavu-fonts-2.3-2.fc5.src.rpm register fontconfig aliases Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- import.log 20 Feb 2006 07:18:11 -0000 1.36 +++ import.log 4 Mar 2006 12:23:49 -0000 1.37 @@ -33,3 +33,4 @@ dejavu-fonts-2_2-6_fc5:HEAD:dejavu-fonts-2.2-6.fc5.src.rpm:1139868667 dejavu-fonts-2_2-4_fc4:FC-4:dejavu-fonts-2.2-4.fc4.src.rpm:1140271299 dejavu-fonts-2_3-1_fc5:HEAD:dejavu-fonts-2.3-1.fc5.src.rpm:1140419864 +dejavu-fonts-2_3-2_fc5:HEAD:dejavu-fonts-2.3-2.fc5.src.rpm:1141475016 From fedora-extras-commits at redhat.com Sat Mar 4 12:23:56 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 07:23:56 -0500 Subject: rpms/dejavu-fonts/devel dejavu-fonts-register.xsl, NONE, 1.1 dejavu-fonts.spec, 1.14, 1.15 Message-ID: <200603041224.k24COTGJ029542@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29503/devel Modified Files: dejavu-fonts.spec Added Files: dejavu-fonts-register.xsl Log Message: auto-import dejavu-fonts-2.3-2.fc5 on branch devel from dejavu-fonts-2.3-2.fc5.src.rpm register fontconfig aliases --- NEW FILE dejavu-fonts-register.xsl --- DejaVu Sans DejaVu Serif DejaVu Sans Mono DejaVu Serif DejaVu Serif DejaVu Sans DejaVu Sans DejaVu Sans Mono DejaVu Sans Mono DejaVu Sans DejaVu Serif DejaVu Sans Mono Bitstream Vera Sans Bitstream Vera Sans DejaVu Sans Bitstream Vera Serif Bitstream Vera Serif DejaVu Serif Bitstream Vera Sans Mono Bitstream Vera Sans Mono DejaVu Sans Mono Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dejavu-fonts.spec 20 Feb 2006 07:18:17 -0000 1.14 +++ dejavu-fonts.spec 4 Mar 2006 12:23:56 -0000 1.15 @@ -1,7 +1,8 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots %define archiveversion %{version}-1 -%define fontdir %{_datadir}/fonts/dejavu +%define fontdir %{_datadir}/fonts/%{name} +%define xsldir %{_datadir}/xml/%{name} # Let the perl Maintainer worry about Unicode.org data files (updates, licensing) %define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt @@ -9,30 +10,36 @@ Name: dejavu-fonts Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DejaVu Fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ Source: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz +Source1: dejavu-fonts-register.xsl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fontforge # The CPAN sources do not declare perl(Font::TTF) BuildRequires: perl-Font-TTF # Needed to compute unicode coverage BuildRequires: %{Blocks} %{UnicodeData} +# Needed for fontconfig alias registration +Requires: %{_bindir}/xsltproc, /bin/mktemp BuildArch: noarch Conflicts: fontconfig < 2.3.93 + %description The DejaVu fonts are a font family based on the Bitstream Vera Fonts release 1.10. Its purpose is to provide a wider range of characters (see Current status page for more information) while maintaining the original look and feel through the process of collaborative develop + %prep %setup -q -n %{archivename}-%{version} + %build ./generate.sh ./status.pl %{version} status.txt *.sfd > status.txt.new @@ -42,11 +49,13 @@ DejaVuSerif.sfd Serif \ DejaVuMonoSans.sfd "Sans Mono" > unicover.txt + %check # Current upstream files are full of "problems" # Do not panic if the output is long ./problems.pl -l 3 *.sfd + %install /bin/rm -rf %{buildroot} @@ -54,6 +63,11 @@ install -d -m 0755 %{buildroot}%{fontdir} install -m 0644 generated/*.ttf %{buildroot}%{fontdir} +#xsl +install -d -m 755 %{buildroot}%{xsldir} +install -p -m 644 %{SOURCE1} %{buildroot}%{xsldir}/register-%{name}.xsl + + %clean /bin/rm -rf %{buildroot} @@ -63,6 +77,7 @@ %{_bindir}/fc-cache %{_datadir}/fonts fi + %postun if [ "$1" = "0" ]; then if [ -x %{_bindir}/fc-cache ]; then @@ -71,6 +86,16 @@ fi +%triggerin -- fontconfig, %{_sysconfdir}/fonts/fonts.conf + +if [ -x %{_sysconfdir}/fonts/fonts.conf ] ; then + TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \ + %{_bindir}/xsltproc --novalid --output $TMPFILE \ + %{xsldir}/register-%{name}.xsl %{_sysconfdir}/fonts/fonts.conf && \ + /bin/cat $TMPFILE > %{_sysconfdir}/fonts/fonts.conf && /bin/rm $TMPFILE +fi + + %files %defattr(0644,root,root,0755) %doc *.txt AUTHORS BUGS LICENSE NEWS README @@ -78,7 +103,14 @@ %dir %{fontdir} %{fontdir}/*.ttf +%dir %{xsldir} +%{xsldir}/register-%{name}.xsl + + %changelog +* Sat Mar 04 2006 Nicolas Mailhot - 2.3-2 +- register dejavu in fontconfig aliases + * Mon Feb 20 2006 Nicolas Mailhot - 2.3-1 - 2.3 From fedora-extras-commits at redhat.com Sat Mar 4 13:26:42 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 4 Mar 2006 08:26:42 -0500 Subject: rpms/abe/devel abe.spec,1.8,1.9 Message-ID: <200603041327.k24DRENL031762@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31705/abe/devel Modified Files: abe.spec Log Message: Disable (and remove from repo) three more orphans which haven't been rebuilt by anyone yet. Index: abe.spec =================================================================== RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- abe.spec 12 Apr 2005 14:33:30 -0000 1.8 +++ abe.spec 4 Mar 2006 13:26:41 -0000 1.9 @@ -22,6 +22,13 @@ vaguely in the style of similar games for the Commodore+4. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gnofract4d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31705/gnofract4d/devel Modified Files: gnofract4d.spec Log Message: Disable (and remove from repo) three more orphans which haven't been rebuilt by anyone yet. Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/devel/gnofract4d.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnofract4d.spec 6 Apr 2005 22:11:38 -0000 1.6 +++ gnofract4d.spec 4 Mar 2006 13:26:48 -0000 1.7 @@ -24,6 +24,13 @@ the two sets and explore their inter-relationships. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/wbxml2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31705/wbxml2/devel Modified Files: wbxml2.spec Log Message: Disable (and remove from repo) three more orphans which haven't been rebuilt by anyone yet. Index: wbxml2.spec =================================================================== RCS file: /cvs/extras/rpms/wbxml2/devel/wbxml2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wbxml2.spec 22 May 2005 22:29:02 -0000 1.6 +++ wbxml2.spec 4 Mar 2006 13:26:54 -0000 1.7 @@ -37,6 +37,13 @@ %prep +cat< Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31860 Modified Files: import.log Log Message: auto-import zoo-2.10-7.fc5 on branch devel from zoo-2.10-7.fc5.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 26 Feb 2006 22:44:35 -0000 1.9 +++ import.log 4 Mar 2006 13:30:14 -0000 1.10 @@ -6,3 +6,4 @@ zoo-2_10-6_fc5:HEAD:zoo-2.10-6.fc5.src.rpm:1140993664 zoo-2_10-6_fc4:FC-4:zoo-2.10-6.fc4.src.rpm:1140993767 zoo-2_10-6_fc3:FC-3:zoo-2.10-6.fc3.src.rpm:1140993865 +zoo-2_10-7_fc5:HEAD:zoo-2.10-7.fc5.src.rpm:1141479004 From fedora-extras-commits at redhat.com Sat Mar 4 13:30:20 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 08:30:20 -0500 Subject: rpms/zoo/devel zoo-2.10-CAN-2005-2349.patch, NONE, 1.1 zoo-2.10-febz-183426.patch, NONE, 1.1 zoo-gcc.patch, NONE, 1.1 zoo-return.patch, NONE, 1.1 zoo-security_pathsize.patch, NONE, 1.1 zoo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zoo.spec, 1.9, 1.10 zoo-2.10-pathsize-security.patch, 1.1, NONE zoo-gcc4.patch, 1.1, NONE Message-ID: <200603041330.k24DUrla031917@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31860/devel Modified Files: .cvsignore sources zoo.spec Added Files: zoo-2.10-CAN-2005-2349.patch zoo-2.10-febz-183426.patch zoo-gcc.patch zoo-return.patch zoo-security_pathsize.patch zoo.patch Removed Files: zoo-2.10-pathsize-security.patch zoo-gcc4.patch Log Message: auto-import zoo-2.10-7.fc5 on branch devel from zoo-2.10-7.fc5.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix zoo-2.10-CAN-2005-2349.patch: --- NEW FILE zoo-2.10-CAN-2005-2349.patch --- --- portable.c +++ portable.c @@ -364,6 +364,31 @@ show_dir(direntry); } #endif + char *p; + /* take off '../' */ + while ((p = strstr( direntry->dirname, "../" )) != NULL) { + while (*(p+3) != '\0') { + *p = *(p + 3); + p++; + } + *p = *(p+3); /* move last null */ + //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname); + } + /* take off '/' */ + if ( direntry->dirname[0] == '/' ) { + p = direntry->dirname; + while (*p != '\0') { + *p = *(p + 1); + p++; + } + *p = *(p+1); /* move last null */ + //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname); + } + /* take off '..' */ + if(!strcmp(direntry->dirname, "..")) + direntry->dirname[0] = '\0'; + /* direntry->dirlen = strlen(direntry->dirname); */ + return (0); } zoo-2.10-febz-183426.patch: --- NEW FILE zoo-2.10-febz-183426.patch --- diff -uNr zoo/parse.c zoo.new/parse.c --- zoo/parse.c 1991-07-11 21:07:34.000000000 +0200 +++ zoo.new/parse.c 2006-03-04 14:17:50.000000000 +0100 @@ -39,7 +39,7 @@ char *namep; /* points to relevant part of tempname */ char *p; - strcpy (tempname, fname); + strncpy(tempname, fname, LFNAMESIZE); #ifdef DEBUG printf ("parse: supplied name is [%s].\n", tempname); zoo-gcc.patch: --- NEW FILE zoo-gcc.patch --- diff -uNr zoo.orig/makefile zoo/makefile --- zoo.orig/makefile 1992-07-27 06:01:40.000000000 +0200 +++ zoo/makefile 2002-11-25 16:41:06.000000000 +0100 @@ -21,7 +21,7 @@ CC = cc CFLAGS = MODEL = -EXTRA = -DBIG_MEM -DNDEBUG +EXTRA = -DBIG_MEM -DNDEBUG -DANSI_PROTO LINTFLAGS = -DLINT OPTIM = -O DESTDIR = /usr/local/bin diff -uNr zoo.orig/options.h zoo/options.h --- zoo.orig/options.h 1991-07-11 21:07:32.000000000 +0200 +++ zoo/options.h 2002-11-25 16:41:30.000000000 +0100 @@ -104,7 +104,7 @@ #define GETTZ #define FATTR #define T_SIGNAL int -#define VARARGS +#define STDARG #define NEED_MEMMOVE #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY zoo-return.patch: --- NEW FILE zoo-return.patch --- --- ar.h +++ ar.h @@ -116,7 +116,9 @@ void move_left(); #else # define MOVE_LEFT memmove +# ifndef ANSI_HDRS extern VOIDPTR memmove(); +# endif #endif #if 0 --- bsd.c +++ bsd.c @@ -104,4 +104,5 @@ seekpos = lseek(fd, 0L, SEEK_CUR); if (seekpos >= 0) return ftruncate(fd, seekpos); + return 0; } --- mstime.i +++ mstime.i @@ -12,6 +12,7 @@ Function mstime() converts time in seconds since January 1 of BASEYEAR to MS-DOS format date and time. */ +void mstime(longtime, date, time) long longtime; /* input: seconds since Jan 1, BASEYEAR */ int *date, *time; /* output: MS-DOS format date and time */ --- nixtime.i +++ nixtime.i @@ -36,6 +36,7 @@ (tm->tm_hour << 11); } + return 0; } /***************** --- options.h +++ options.h @@ -157,11 +157,13 @@ #define GETTZ #define FATTR #define T_SIGNAL void +#define STDARG /* #define VARARGS */ /* #define NEED_MEMMOVE */ #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY /* #define NEED_VPRINTF */ +#define BSD4_3 /* for I/O definitions */ #endif /* BSD4_4 */ /***********************************************************************/ zoo-security_pathsize.patch: --- NEW FILE zoo-security_pathsize.patch --- --- misc.c +++ misc.c @@ -135,11 +135,17 @@ char *fullpath (direntry) struct direntry *direntry; { - static char result[PATHSIZE]; + static char result[PATHSIZE+LFNAMESIZE+12]; /* Room for enough space.*/ combine (result, direntry->dirlen != 0 ? direntry->dirname : "", (direntry->namlen != 0) ? direntry->lfname : direntry->fname ); + + if (strlen (result) >= PATHSIZE) { + prterror ('f', "Combined dirname and filename too long!\n"); + *result = '\0'; + } + return (result); } zoo.patch: --- NEW FILE zoo.patch --- --- basename.c +++ basename.c @@ -18,7 +18,7 @@ /* This function strips device/directory information from a pathname and returns just the plain filename */ -void basename (pathname, fname) +void my_basename (pathname, fname) char *pathname; char fname[]; { --- makefile +++ makefile @@ -18,13 +18,13 @@ MAKE = make # needed for some systems e.g. older BSD -CC = cc +CC = gcc CFLAGS = MODEL = EXTRA = -DBIG_MEM -DNDEBUG LINTFLAGS = -DLINT OPTIM = -O -DESTDIR = /usr/local/bin +DESTDIR = /usr/bin #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ @@ -107,10 +107,10 @@ convex: $(MAKE) CFLAGS="-c $(OPTIM) -DBSD4_3 -DANSI_HDRS" $(TARGETS) -# Linux 0.96c, gcc 2.2.2 +# Linux 2.0.0, gcc 2.7.2 linux: $(MAKE) \ - CFLAGS="-c -O2 -DBSD4_3 -DANSI_HDRS -DLINUX" \ + CFLAGS="-c $(OPTIM) -DBSD4_4 -DANSI_HDRS -DLINUX" \ $(TARGETS) # linux as above, static linked --- options.h +++ options.h @@ -89,7 +89,7 @@ /***********************************************************************/ #ifdef BSD4_3 -#define NOSTRCHR /* not really needed for 4.3BSD */ +/* #define NOSTRCHR */ /* not really needed for 4.3BSD */ #define FILTER #define IO_MACROS #define EXISTS(f) (access(f, 00) == 0) --- various.h +++ various.h @@ -26,6 +26,7 @@ #ifdef ANSI_HDRS /* if not defined in stdio.h */ # include # include +# include #else FILE *fdopen PARMS ((int, char *)); FILE *fopen PARMS ((char *, char *)); --- zooadd.c +++ zooadd.c @@ -132,7 +132,7 @@ if (zoo_file == NOFILE) prterror ('f', could_not_open, zoo_path); -basename(zoo_path, zoo_fname); /* get basename of archive */ +my_basename(zoo_path, zoo_fname); /* get basename of archive */ rootname (zoo_path, zoo_bak); /* name without extension */ strcat (zoo_bak, BACKUP_EXT); /* name of backup of this archive */ @@ -222,7 +222,7 @@ break; } - basename (this_path, this_fname); /* get just filename for later */ + my_basename (this_path, this_fname); /* get just filename for later */ this_file = zooopen(this_path, Z_READ); if (this_file == NOFILE) { --- zoofns.h +++ zoofns.h @@ -85,7 +85,7 @@ void addfname PARMS ((char *, long, unsigned int, unsigned int, unsigned, unsigned)); void add_version PARMS ((char *, struct direntry *)); -void basename PARMS ((char *, char [])); +void my_basename PARMS ((char *, char [])); void break_off PARMS ((void)); void close_file PARMS ((ZOOFILE)); void comment PARMS ((char *, char *)); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zoo/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:41 -0000 1.2 +++ .cvsignore 4 Mar 2006 13:30:20 -0000 1.3 @@ -1,2 +1 @@ -zoo_2.10-9.diff.gz -zoo_2.10.orig.tar.gz +zoo.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zoo/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:41 -0000 1.2 +++ sources 4 Mar 2006 13:30:20 -0000 1.3 @@ -1,2 +1 @@ -2dca488e015f6d6079fb3b2106bcbc5e zoo_2.10-9.diff.gz -dca5f2cf71379a51ea1e66b25f1e0294 zoo_2.10.orig.tar.gz +9419da66d2de4c59b405d5c59845a828 zoo.tar.gz Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/devel/zoo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- zoo.spec 26 Feb 2006 22:41:20 -0000 1.9 +++ zoo.spec 4 Mar 2006 13:30:20 -0000 1.10 @@ -1,33 +1,45 @@ Name: zoo Version: 2.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving License: Distributable -Source: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10.orig.tar.gz -Patch0: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10-9.diff.gz -Patch1: zoo-2.10-tempfile.patch -Patch2: zoo-gcc4.patch -Patch3: zoo-2.10-pathsize-security.patch +# There is no zoo upstream anymore so let's not pretend we have an authoritative source +# This zoo.tar.gz archive was taken from opensuse +Source: zoo.tar.gz +Patch0: zoo.patch +Patch1: zoo-%{version}-tempfile.patch +Patch2: zoo-gcc.patch +Patch3: zoo-%{version}-CAN-2005-2349.patch +Patch4: zoo-return.patch +Patch5: zoo-security_pathsize.patch +Patch6: zoo-%{version}-febz-183426.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %description zoo is a file archiving utility for maintaining collections of files. It uses Lempel-Ziv compression to provide space savings in the range of 20 to 80 percent depending on the type of data. Written by Rahul Dhesi, and posted to the USENET newsgroup comp.sources.misc. + %prep -%setup -n zoo-2.10.orig -%patch0 -p1 -b .debian -%patch1 -p1 -b .tempfile +%setup -q -n %{name} +%patch0 +%patch1 -p1 %patch2 -p1 -b .gcc4 -%patch3 -p1 -b .pathsize +%patch3 -b .can +%patch4 +%patch5 -b .pathsize +%patch6 -p1 -b .febz183426 + %build make %{?_smp_mflags} OPTIM="%{optflags}" linux + %install rm -fr %{buildroot} install -d -m 0755 %{buildroot}%{_bindir} \ @@ -36,15 +48,24 @@ install -m 0755 fiz zoo %{buildroot}%{_bindir}/ install -m 0644 fiz.1 zoo.1 %{buildroot}%{_mandir}/man1/ + %clean rm -fr %{buildroot} + %files %defattr(0644, root, root, 0755) %doc %{_mandir}/man1/* %attr(0755,root,root) %{_bindir}/* + %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 +- rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice + cleanups +- drop our fix to CVE-2006-0855 for the OpenSuse one +- add bug #183109 fix + * Sun Feb 26 2006 Nicolas Mailhot - 2.10-6 - apply preliminary patch for bug #183109 (just to be sure) --- zoo-2.10-pathsize-security.patch DELETED --- --- zoo-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 13:38:42 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 08:38:42 -0500 Subject: rpms/zoo import.log,1.10,1.11 Message-ID: <200603041339.k24DdE0p032104@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32052 Modified Files: import.log Log Message: auto-import zoo-2.10-7.fc4 on branch FC-4 from zoo-2.10-7.fc4.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 4 Mar 2006 13:30:14 -0000 1.10 +++ import.log 4 Mar 2006 13:38:42 -0000 1.11 @@ -7,3 +7,4 @@ zoo-2_10-6_fc4:FC-4:zoo-2.10-6.fc4.src.rpm:1140993767 zoo-2_10-6_fc3:FC-3:zoo-2.10-6.fc3.src.rpm:1140993865 zoo-2_10-7_fc5:HEAD:zoo-2.10-7.fc5.src.rpm:1141479004 +zoo-2_10-7_fc4:FC-4:zoo-2.10-7.fc4.src.rpm:1141479512 From fedora-extras-commits at redhat.com Sat Mar 4 13:38:49 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 08:38:49 -0500 Subject: rpms/zoo/FC-4 zoo-2.10-CAN-2005-2349.patch, NONE, 1.1 zoo-2.10-febz-183426.patch, NONE, 1.1 zoo-gcc.patch, NONE, 1.1 zoo-return.patch, NONE, 1.1 zoo-security_pathsize.patch, NONE, 1.1 zoo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zoo.spec, 1.7, 1.8 zoo-2.10-pathsize-security.patch, 1.1, NONE zoo-gcc4.patch, 1.1, NONE Message-ID: <200603041339.k24DdL1j032109@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32052/FC-4 Modified Files: .cvsignore sources zoo.spec Added Files: zoo-2.10-CAN-2005-2349.patch zoo-2.10-febz-183426.patch zoo-gcc.patch zoo-return.patch zoo-security_pathsize.patch zoo.patch Removed Files: zoo-2.10-pathsize-security.patch zoo-gcc4.patch Log Message: auto-import zoo-2.10-7.fc4 on branch FC-4 from zoo-2.10-7.fc4.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix zoo-2.10-CAN-2005-2349.patch: --- NEW FILE zoo-2.10-CAN-2005-2349.patch --- --- portable.c +++ portable.c @@ -364,6 +364,31 @@ show_dir(direntry); } #endif + char *p; + /* take off '../' */ + while ((p = strstr( direntry->dirname, "../" )) != NULL) { + while (*(p+3) != '\0') { + *p = *(p + 3); + p++; + } + *p = *(p+3); /* move last null */ + //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname); + } + /* take off '/' */ + if ( direntry->dirname[0] == '/' ) { + p = direntry->dirname; + while (*p != '\0') { + *p = *(p + 1); + p++; + } + *p = *(p+1); /* move last null */ + //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname); + } + /* take off '..' */ + if(!strcmp(direntry->dirname, "..")) + direntry->dirname[0] = '\0'; + /* direntry->dirlen = strlen(direntry->dirname); */ + return (0); } zoo-2.10-febz-183426.patch: --- NEW FILE zoo-2.10-febz-183426.patch --- diff -uNr zoo/parse.c zoo.new/parse.c --- zoo/parse.c 1991-07-11 21:07:34.000000000 +0200 +++ zoo.new/parse.c 2006-03-04 14:17:50.000000000 +0100 @@ -39,7 +39,7 @@ char *namep; /* points to relevant part of tempname */ char *p; - strcpy (tempname, fname); + strncpy(tempname, fname, LFNAMESIZE); #ifdef DEBUG printf ("parse: supplied name is [%s].\n", tempname); zoo-gcc.patch: --- NEW FILE zoo-gcc.patch --- diff -uNr zoo.orig/makefile zoo/makefile --- zoo.orig/makefile 1992-07-27 06:01:40.000000000 +0200 +++ zoo/makefile 2002-11-25 16:41:06.000000000 +0100 @@ -21,7 +21,7 @@ CC = cc CFLAGS = MODEL = -EXTRA = -DBIG_MEM -DNDEBUG +EXTRA = -DBIG_MEM -DNDEBUG -DANSI_PROTO LINTFLAGS = -DLINT OPTIM = -O DESTDIR = /usr/local/bin diff -uNr zoo.orig/options.h zoo/options.h --- zoo.orig/options.h 1991-07-11 21:07:32.000000000 +0200 +++ zoo/options.h 2002-11-25 16:41:30.000000000 +0100 @@ -104,7 +104,7 @@ #define GETTZ #define FATTR #define T_SIGNAL int -#define VARARGS +#define STDARG #define NEED_MEMMOVE #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY zoo-return.patch: --- NEW FILE zoo-return.patch --- --- ar.h +++ ar.h @@ -116,7 +116,9 @@ void move_left(); #else # define MOVE_LEFT memmove +# ifndef ANSI_HDRS extern VOIDPTR memmove(); +# endif #endif #if 0 --- bsd.c +++ bsd.c @@ -104,4 +104,5 @@ seekpos = lseek(fd, 0L, SEEK_CUR); if (seekpos >= 0) return ftruncate(fd, seekpos); + return 0; } --- mstime.i +++ mstime.i @@ -12,6 +12,7 @@ Function mstime() converts time in seconds since January 1 of BASEYEAR to MS-DOS format date and time. */ +void mstime(longtime, date, time) long longtime; /* input: seconds since Jan 1, BASEYEAR */ int *date, *time; /* output: MS-DOS format date and time */ --- nixtime.i +++ nixtime.i @@ -36,6 +36,7 @@ (tm->tm_hour << 11); } + return 0; } /***************** --- options.h +++ options.h @@ -157,11 +157,13 @@ #define GETTZ #define FATTR #define T_SIGNAL void +#define STDARG /* #define VARARGS */ /* #define NEED_MEMMOVE */ #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY /* #define NEED_VPRINTF */ +#define BSD4_3 /* for I/O definitions */ #endif /* BSD4_4 */ /***********************************************************************/ zoo-security_pathsize.patch: --- NEW FILE zoo-security_pathsize.patch --- --- misc.c +++ misc.c @@ -135,11 +135,17 @@ char *fullpath (direntry) struct direntry *direntry; { - static char result[PATHSIZE]; + static char result[PATHSIZE+LFNAMESIZE+12]; /* Room for enough space.*/ combine (result, direntry->dirlen != 0 ? direntry->dirname : "", (direntry->namlen != 0) ? direntry->lfname : direntry->fname ); + + if (strlen (result) >= PATHSIZE) { + prterror ('f', "Combined dirname and filename too long!\n"); + *result = '\0'; + } + return (result); } zoo.patch: --- NEW FILE zoo.patch --- --- basename.c +++ basename.c @@ -18,7 +18,7 @@ /* This function strips device/directory information from a pathname and returns just the plain filename */ -void basename (pathname, fname) +void my_basename (pathname, fname) char *pathname; char fname[]; { --- makefile +++ makefile @@ -18,13 +18,13 @@ MAKE = make # needed for some systems e.g. older BSD -CC = cc +CC = gcc CFLAGS = MODEL = EXTRA = -DBIG_MEM -DNDEBUG LINTFLAGS = -DLINT OPTIM = -O -DESTDIR = /usr/local/bin +DESTDIR = /usr/bin #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ @@ -107,10 +107,10 @@ convex: $(MAKE) CFLAGS="-c $(OPTIM) -DBSD4_3 -DANSI_HDRS" $(TARGETS) -# Linux 0.96c, gcc 2.2.2 +# Linux 2.0.0, gcc 2.7.2 linux: $(MAKE) \ - CFLAGS="-c -O2 -DBSD4_3 -DANSI_HDRS -DLINUX" \ + CFLAGS="-c $(OPTIM) -DBSD4_4 -DANSI_HDRS -DLINUX" \ $(TARGETS) # linux as above, static linked --- options.h +++ options.h @@ -89,7 +89,7 @@ /***********************************************************************/ #ifdef BSD4_3 -#define NOSTRCHR /* not really needed for 4.3BSD */ +/* #define NOSTRCHR */ /* not really needed for 4.3BSD */ #define FILTER #define IO_MACROS #define EXISTS(f) (access(f, 00) == 0) --- various.h +++ various.h @@ -26,6 +26,7 @@ #ifdef ANSI_HDRS /* if not defined in stdio.h */ # include # include +# include #else FILE *fdopen PARMS ((int, char *)); FILE *fopen PARMS ((char *, char *)); --- zooadd.c +++ zooadd.c @@ -132,7 +132,7 @@ if (zoo_file == NOFILE) prterror ('f', could_not_open, zoo_path); -basename(zoo_path, zoo_fname); /* get basename of archive */ +my_basename(zoo_path, zoo_fname); /* get basename of archive */ rootname (zoo_path, zoo_bak); /* name without extension */ strcat (zoo_bak, BACKUP_EXT); /* name of backup of this archive */ @@ -222,7 +222,7 @@ break; } - basename (this_path, this_fname); /* get just filename for later */ + my_basename (this_path, this_fname); /* get just filename for later */ this_file = zooopen(this_path, Z_READ); if (this_file == NOFILE) { --- zoofns.h +++ zoofns.h @@ -85,7 +85,7 @@ void addfname PARMS ((char *, long, unsigned int, unsigned int, unsigned, unsigned)); void add_version PARMS ((char *, struct direntry *)); -void basename PARMS ((char *, char [])); +void my_basename PARMS ((char *, char [])); void break_off PARMS ((void)); void close_file PARMS ((ZOOFILE)); void comment PARMS ((char *, char *)); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:41 -0000 1.2 +++ .cvsignore 4 Mar 2006 13:38:48 -0000 1.3 @@ -1,2 +1 @@ -zoo_2.10-9.diff.gz -zoo_2.10.orig.tar.gz +zoo.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:41 -0000 1.2 +++ sources 4 Mar 2006 13:38:48 -0000 1.3 @@ -1,2 +1 @@ -2dca488e015f6d6079fb3b2106bcbc5e zoo_2.10-9.diff.gz -dca5f2cf71379a51ea1e66b25f1e0294 zoo_2.10.orig.tar.gz +9419da66d2de4c59b405d5c59845a828 zoo.tar.gz Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-4/zoo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- zoo.spec 26 Feb 2006 22:43:03 -0000 1.7 +++ zoo.spec 4 Mar 2006 13:38:48 -0000 1.8 @@ -1,33 +1,45 @@ Name: zoo Version: 2.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving License: Distributable -Source: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10.orig.tar.gz -Patch0: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10-9.diff.gz -Patch1: zoo-2.10-tempfile.patch -Patch2: zoo-gcc4.patch -Patch3: zoo-2.10-pathsize-security.patch +# There is no zoo upstream anymore so let's not pretend we have an authoritative source +# This zoo.tar.gz archive was taken from opensuse +Source: zoo.tar.gz +Patch0: zoo.patch +Patch1: zoo-%{version}-tempfile.patch +Patch2: zoo-gcc.patch +Patch3: zoo-%{version}-CAN-2005-2349.patch +Patch4: zoo-return.patch +Patch5: zoo-security_pathsize.patch +Patch6: zoo-%{version}-febz-183426.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %description zoo is a file archiving utility for maintaining collections of files. It uses Lempel-Ziv compression to provide space savings in the range of 20 to 80 percent depending on the type of data. Written by Rahul Dhesi, and posted to the USENET newsgroup comp.sources.misc. + %prep -%setup -n zoo-2.10.orig -%patch0 -p1 -b .debian -%patch1 -p1 -b .tempfile +%setup -q -n %{name} +%patch0 +%patch1 -p1 %patch2 -p1 -b .gcc4 -%patch3 -p1 -b .pathsize +%patch3 -b .can +%patch4 +%patch5 -b .pathsize +%patch6 -p1 -b .febz183426 + %build make %{?_smp_mflags} OPTIM="%{optflags}" linux + %install rm -fr %{buildroot} install -d -m 0755 %{buildroot}%{_bindir} \ @@ -36,15 +48,24 @@ install -m 0755 fiz zoo %{buildroot}%{_bindir}/ install -m 0644 fiz.1 zoo.1 %{buildroot}%{_mandir}/man1/ + %clean rm -fr %{buildroot} + %files %defattr(0644, root, root, 0755) %doc %{_mandir}/man1/* %attr(0755,root,root) %{_bindir}/* + %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 +- rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice + cleanups +- drop our fix to CVE-2006-0855 for the OpenSuse one +- add bug #183109 fix + * Sun Feb 26 2006 Nicolas Mailhot - 2.10-6 - apply preliminary patch for bug #183109 (just to be sure) --- zoo-2.10-pathsize-security.patch DELETED --- --- zoo-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 13:42:08 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 08:42:08 -0500 Subject: rpms/zoo import.log,1.11,1.12 Message-ID: <200603041342.k24DgeF0032287@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32233 Modified Files: import.log Log Message: auto-import zoo-2.10-7.fc3 on branch FC-3 from zoo-2.10-7.fc3.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 4 Mar 2006 13:38:42 -0000 1.11 +++ import.log 4 Mar 2006 13:42:08 -0000 1.12 @@ -8,3 +8,4 @@ zoo-2_10-6_fc3:FC-3:zoo-2.10-6.fc3.src.rpm:1140993865 zoo-2_10-7_fc5:HEAD:zoo-2.10-7.fc5.src.rpm:1141479004 zoo-2_10-7_fc4:FC-4:zoo-2.10-7.fc4.src.rpm:1141479512 +zoo-2_10-7_fc3:FC-3:zoo-2.10-7.fc3.src.rpm:1141479718 From fedora-extras-commits at redhat.com Sat Mar 4 13:42:14 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 08:42:14 -0500 Subject: rpms/zoo/FC-3 zoo-2.10-CAN-2005-2349.patch, NONE, 1.1 zoo-2.10-febz-183426.patch, NONE, 1.1 zoo-gcc.patch, NONE, 1.1 zoo-return.patch, NONE, 1.1 zoo-security_pathsize.patch, NONE, 1.1 zoo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zoo.spec, 1.5, 1.6 zoo-2.10-pathsize-security.patch, 1.1, NONE zoo-gcc4.patch, 1.1, NONE Message-ID: <200603041342.k24DgkLp032294@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32233/FC-3 Modified Files: .cvsignore sources zoo.spec Added Files: zoo-2.10-CAN-2005-2349.patch zoo-2.10-febz-183426.patch zoo-gcc.patch zoo-return.patch zoo-security_pathsize.patch zoo.patch Removed Files: zoo-2.10-pathsize-security.patch zoo-gcc4.patch Log Message: auto-import zoo-2.10-7.fc3 on branch FC-3 from zoo-2.10-7.fc3.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix zoo-2.10-CAN-2005-2349.patch: --- NEW FILE zoo-2.10-CAN-2005-2349.patch --- --- portable.c +++ portable.c @@ -364,6 +364,31 @@ show_dir(direntry); } #endif + char *p; + /* take off '../' */ + while ((p = strstr( direntry->dirname, "../" )) != NULL) { + while (*(p+3) != '\0') { + *p = *(p + 3); + p++; + } + *p = *(p+3); /* move last null */ + //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname); + } + /* take off '/' */ + if ( direntry->dirname[0] == '/' ) { + p = direntry->dirname; + while (*p != '\0') { + *p = *(p + 1); + p++; + } + *p = *(p+1); /* move last null */ + //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname); + } + /* take off '..' */ + if(!strcmp(direntry->dirname, "..")) + direntry->dirname[0] = '\0'; + /* direntry->dirlen = strlen(direntry->dirname); */ + return (0); } zoo-2.10-febz-183426.patch: --- NEW FILE zoo-2.10-febz-183426.patch --- diff -uNr zoo/parse.c zoo.new/parse.c --- zoo/parse.c 1991-07-11 21:07:34.000000000 +0200 +++ zoo.new/parse.c 2006-03-04 14:17:50.000000000 +0100 @@ -39,7 +39,7 @@ char *namep; /* points to relevant part of tempname */ char *p; - strcpy (tempname, fname); + strncpy(tempname, fname, LFNAMESIZE); #ifdef DEBUG printf ("parse: supplied name is [%s].\n", tempname); zoo-gcc.patch: --- NEW FILE zoo-gcc.patch --- diff -uNr zoo.orig/makefile zoo/makefile --- zoo.orig/makefile 1992-07-27 06:01:40.000000000 +0200 +++ zoo/makefile 2002-11-25 16:41:06.000000000 +0100 @@ -21,7 +21,7 @@ CC = cc CFLAGS = MODEL = -EXTRA = -DBIG_MEM -DNDEBUG +EXTRA = -DBIG_MEM -DNDEBUG -DANSI_PROTO LINTFLAGS = -DLINT OPTIM = -O DESTDIR = /usr/local/bin diff -uNr zoo.orig/options.h zoo/options.h --- zoo.orig/options.h 1991-07-11 21:07:32.000000000 +0200 +++ zoo/options.h 2002-11-25 16:41:30.000000000 +0100 @@ -104,7 +104,7 @@ #define GETTZ #define FATTR #define T_SIGNAL int -#define VARARGS +#define STDARG #define NEED_MEMMOVE #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY zoo-return.patch: --- NEW FILE zoo-return.patch --- --- ar.h +++ ar.h @@ -116,7 +116,9 @@ void move_left(); #else # define MOVE_LEFT memmove +# ifndef ANSI_HDRS extern VOIDPTR memmove(); +# endif #endif #if 0 --- bsd.c +++ bsd.c @@ -104,4 +104,5 @@ seekpos = lseek(fd, 0L, SEEK_CUR); if (seekpos >= 0) return ftruncate(fd, seekpos); + return 0; } --- mstime.i +++ mstime.i @@ -12,6 +12,7 @@ Function mstime() converts time in seconds since January 1 of BASEYEAR to MS-DOS format date and time. */ +void mstime(longtime, date, time) long longtime; /* input: seconds since Jan 1, BASEYEAR */ int *date, *time; /* output: MS-DOS format date and time */ --- nixtime.i +++ nixtime.i @@ -36,6 +36,7 @@ (tm->tm_hour << 11); } + return 0; } /***************** --- options.h +++ options.h @@ -157,11 +157,13 @@ #define GETTZ #define FATTR #define T_SIGNAL void +#define STDARG /* #define VARARGS */ /* #define NEED_MEMMOVE */ #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY /* #define NEED_VPRINTF */ +#define BSD4_3 /* for I/O definitions */ #endif /* BSD4_4 */ /***********************************************************************/ zoo-security_pathsize.patch: --- NEW FILE zoo-security_pathsize.patch --- --- misc.c +++ misc.c @@ -135,11 +135,17 @@ char *fullpath (direntry) struct direntry *direntry; { - static char result[PATHSIZE]; + static char result[PATHSIZE+LFNAMESIZE+12]; /* Room for enough space.*/ combine (result, direntry->dirlen != 0 ? direntry->dirname : "", (direntry->namlen != 0) ? direntry->lfname : direntry->fname ); + + if (strlen (result) >= PATHSIZE) { + prterror ('f', "Combined dirname and filename too long!\n"); + *result = '\0'; + } + return (result); } zoo.patch: --- NEW FILE zoo.patch --- --- basename.c +++ basename.c @@ -18,7 +18,7 @@ /* This function strips device/directory information from a pathname and returns just the plain filename */ -void basename (pathname, fname) +void my_basename (pathname, fname) char *pathname; char fname[]; { --- makefile +++ makefile @@ -18,13 +18,13 @@ MAKE = make # needed for some systems e.g. older BSD -CC = cc +CC = gcc CFLAGS = MODEL = EXTRA = -DBIG_MEM -DNDEBUG LINTFLAGS = -DLINT OPTIM = -O -DESTDIR = /usr/local/bin +DESTDIR = /usr/bin #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ @@ -107,10 +107,10 @@ convex: $(MAKE) CFLAGS="-c $(OPTIM) -DBSD4_3 -DANSI_HDRS" $(TARGETS) -# Linux 0.96c, gcc 2.2.2 +# Linux 2.0.0, gcc 2.7.2 linux: $(MAKE) \ - CFLAGS="-c -O2 -DBSD4_3 -DANSI_HDRS -DLINUX" \ + CFLAGS="-c $(OPTIM) -DBSD4_4 -DANSI_HDRS -DLINUX" \ $(TARGETS) # linux as above, static linked --- options.h +++ options.h @@ -89,7 +89,7 @@ /***********************************************************************/ #ifdef BSD4_3 -#define NOSTRCHR /* not really needed for 4.3BSD */ +/* #define NOSTRCHR */ /* not really needed for 4.3BSD */ #define FILTER #define IO_MACROS #define EXISTS(f) (access(f, 00) == 0) --- various.h +++ various.h @@ -26,6 +26,7 @@ #ifdef ANSI_HDRS /* if not defined in stdio.h */ # include # include +# include #else FILE *fdopen PARMS ((int, char *)); FILE *fopen PARMS ((char *, char *)); --- zooadd.c +++ zooadd.c @@ -132,7 +132,7 @@ if (zoo_file == NOFILE) prterror ('f', could_not_open, zoo_path); -basename(zoo_path, zoo_fname); /* get basename of archive */ +my_basename(zoo_path, zoo_fname); /* get basename of archive */ rootname (zoo_path, zoo_bak); /* name without extension */ strcat (zoo_bak, BACKUP_EXT); /* name of backup of this archive */ @@ -222,7 +222,7 @@ break; } - basename (this_path, this_fname); /* get just filename for later */ + my_basename (this_path, this_fname); /* get just filename for later */ this_file = zooopen(this_path, Z_READ); if (this_file == NOFILE) { --- zoofns.h +++ zoofns.h @@ -85,7 +85,7 @@ void addfname PARMS ((char *, long, unsigned int, unsigned int, unsigned, unsigned)); void add_version PARMS ((char *, struct direntry *)); -void basename PARMS ((char *, char [])); +void my_basename PARMS ((char *, char [])); void break_off PARMS ((void)); void close_file PARMS ((ZOOFILE)); void comment PARMS ((char *, char *)); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:41 -0000 1.2 +++ .cvsignore 4 Mar 2006 13:42:13 -0000 1.3 @@ -1,2 +1 @@ -zoo_2.10-9.diff.gz -zoo_2.10.orig.tar.gz +zoo.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:41 -0000 1.2 +++ sources 4 Mar 2006 13:42:13 -0000 1.3 @@ -1,2 +1 @@ -2dca488e015f6d6079fb3b2106bcbc5e zoo_2.10-9.diff.gz -dca5f2cf71379a51ea1e66b25f1e0294 zoo_2.10.orig.tar.gz +9419da66d2de4c59b405d5c59845a828 zoo.tar.gz Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-3/zoo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- zoo.spec 26 Feb 2006 22:44:41 -0000 1.5 +++ zoo.spec 4 Mar 2006 13:42:13 -0000 1.6 @@ -1,33 +1,45 @@ Name: zoo Version: 2.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving License: Distributable -Source: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10.orig.tar.gz -Patch0: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10-9.diff.gz -Patch1: zoo-2.10-tempfile.patch -Patch2: zoo-gcc4.patch -Patch3: zoo-2.10-pathsize-security.patch +# There is no zoo upstream anymore so let's not pretend we have an authoritative source +# This zoo.tar.gz archive was taken from opensuse +Source: zoo.tar.gz +Patch0: zoo.patch +Patch1: zoo-%{version}-tempfile.patch +Patch2: zoo-gcc.patch +Patch3: zoo-%{version}-CAN-2005-2349.patch +Patch4: zoo-return.patch +Patch5: zoo-security_pathsize.patch +Patch6: zoo-%{version}-febz-183426.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %description zoo is a file archiving utility for maintaining collections of files. It uses Lempel-Ziv compression to provide space savings in the range of 20 to 80 percent depending on the type of data. Written by Rahul Dhesi, and posted to the USENET newsgroup comp.sources.misc. + %prep -%setup -n zoo-2.10.orig -%patch0 -p1 -b .debian -%patch1 -p1 -b .tempfile +%setup -q -n %{name} +%patch0 +%patch1 -p1 %patch2 -p1 -b .gcc4 -%patch3 -p1 -b .pathsize +%patch3 -b .can +%patch4 +%patch5 -b .pathsize +%patch6 -p1 -b .febz183426 + %build make %{?_smp_mflags} OPTIM="%{optflags}" linux + %install rm -fr %{buildroot} install -d -m 0755 %{buildroot}%{_bindir} \ @@ -36,15 +48,24 @@ install -m 0755 fiz zoo %{buildroot}%{_bindir}/ install -m 0644 fiz.1 zoo.1 %{buildroot}%{_mandir}/man1/ + %clean rm -fr %{buildroot} + %files %defattr(0644, root, root, 0755) %doc %{_mandir}/man1/* %attr(0755,root,root) %{_bindir}/* + %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 +- rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice + cleanups +- drop our fix to CVE-2006-0855 for the OpenSuse one +- add bug #183109 fix + * Sun Feb 26 2006 Nicolas Mailhot - 2.10-6 - apply preliminary patch for bug #183109 (just to be sure) --- zoo-2.10-pathsize-security.patch DELETED --- --- zoo-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 14:16:13 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:16:13 -0500 Subject: rpms/zoo import.log,1.12,1.13 Message-ID: <200603041416.k24EGjQd001975@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1926 Modified Files: import.log Log Message: auto-import zoo-2.10-8.fc3 on branch FC-3 from zoo-2.10-8.fc3.src.rpm use FORTIFY_SOURCE Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 4 Mar 2006 13:42:08 -0000 1.12 +++ import.log 4 Mar 2006 14:16:12 -0000 1.13 @@ -9,3 +9,4 @@ zoo-2_10-7_fc5:HEAD:zoo-2.10-7.fc5.src.rpm:1141479004 zoo-2_10-7_fc4:FC-4:zoo-2.10-7.fc4.src.rpm:1141479512 zoo-2_10-7_fc3:FC-3:zoo-2.10-7.fc3.src.rpm:1141479718 +zoo-2_10-8_fc3:FC-3:zoo-2.10-8.fc3.src.rpm:1141481750 From fedora-extras-commits at redhat.com Sat Mar 4 14:16:19 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:16:19 -0500 Subject: rpms/zoo/FC-3 zoo.spec,1.6,1.7 Message-ID: <200603041416.k24EGp9q001987@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1926/FC-3 Modified Files: zoo.spec Log Message: auto-import zoo-2.10-8.fc3 on branch FC-3 from zoo-2.10-8.fc3.src.rpm use FORTIFY_SOURCE Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-3/zoo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- zoo.spec 4 Mar 2006 13:42:13 -0000 1.6 +++ zoo.spec 4 Mar 2006 14:16:19 -0000 1.7 @@ -1,6 +1,6 @@ Name: zoo Version: 2.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving @@ -37,7 +37,7 @@ %build -make %{?_smp_mflags} OPTIM="%{optflags}" linux +make %{?_smp_mflags} OPTIM="%{optflags} -D__FORTIFY_SOURCE=2" linux %install @@ -60,6 +60,9 @@ %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-8 +- force FORTIFY_SOURCE use one FC3 + * Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 - rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice cleanups From fedora-extras-commits at redhat.com Sat Mar 4 14:20:18 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:20:18 -0500 Subject: rpms/zoo import.log,1.13,1.14 Message-ID: <200603041420.k24EKpwr002096@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2064 Modified Files: import.log Log Message: auto-import zoo-2.10-8.fc5 on branch devel from zoo-2.10-8.fc5.src.rpm use -fstack-protector-all Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- import.log 4 Mar 2006 14:16:12 -0000 1.13 +++ import.log 4 Mar 2006 14:20:18 -0000 1.14 @@ -10,3 +10,4 @@ zoo-2_10-7_fc4:FC-4:zoo-2.10-7.fc4.src.rpm:1141479512 zoo-2_10-7_fc3:FC-3:zoo-2.10-7.fc3.src.rpm:1141479718 zoo-2_10-8_fc3:FC-3:zoo-2.10-8.fc3.src.rpm:1141481750 +zoo-2_10-8_fc5:HEAD:zoo-2.10-8.fc5.src.rpm:1141482007 From fedora-extras-commits at redhat.com Sat Mar 4 14:20:24 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:20:24 -0500 Subject: rpms/zoo/devel zoo.spec,1.10,1.11 Message-ID: <200603041420.k24EKuxS002099@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2064/devel Modified Files: zoo.spec Log Message: auto-import zoo-2.10-8.fc5 on branch devel from zoo-2.10-8.fc5.src.rpm use -fstack-protector-all Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/devel/zoo.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- zoo.spec 4 Mar 2006 13:30:20 -0000 1.10 +++ zoo.spec 4 Mar 2006 14:20:24 -0000 1.11 @@ -1,6 +1,6 @@ Name: zoo Version: 2.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving @@ -37,7 +37,7 @@ %build -make %{?_smp_mflags} OPTIM="%{optflags}" linux +make %{?_smp_mflags} OPTIM="-fstack-protector-all %{optflags}" linux %install @@ -60,6 +60,9 @@ %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-8 +- use -fstack-protector-all + * Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 - rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice cleanups From fedora-extras-commits at redhat.com Sat Mar 4 14:22:18 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:22:18 -0500 Subject: rpms/zoo import.log,1.14,1.15 Message-ID: <200603041422.k24EMor9002187@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2154 Modified Files: import.log Log Message: auto-import zoo-2.10-8.fc4 on branch FC-4 from zoo-2.10-8.fc4.src.rpm noop Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- import.log 4 Mar 2006 14:20:18 -0000 1.14 +++ import.log 4 Mar 2006 14:22:17 -0000 1.15 @@ -11,3 +11,4 @@ zoo-2_10-7_fc3:FC-3:zoo-2.10-7.fc3.src.rpm:1141479718 zoo-2_10-8_fc3:FC-3:zoo-2.10-8.fc3.src.rpm:1141481750 zoo-2_10-8_fc5:HEAD:zoo-2.10-8.fc5.src.rpm:1141482007 +zoo-2_10-8_fc4:FC-4:zoo-2.10-8.fc4.src.rpm:1141482127 From fedora-extras-commits at redhat.com Sat Mar 4 14:22:23 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:22:23 -0500 Subject: rpms/zoo/FC-4 zoo.spec,1.8,1.9 Message-ID: <200603041422.k24EMtWe002190@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2154/FC-4 Modified Files: zoo.spec Log Message: auto-import zoo-2.10-8.fc4 on branch FC-4 from zoo-2.10-8.fc4.src.rpm noop Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-4/zoo.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- zoo.spec 4 Mar 2006 13:38:48 -0000 1.8 +++ zoo.spec 4 Mar 2006 14:22:23 -0000 1.9 @@ -1,6 +1,6 @@ Name: zoo Version: 2.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving @@ -60,6 +60,9 @@ %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-8 +- bump release to follow FC-3 + * Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 - rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice cleanups From fedora-extras-commits at redhat.com Sat Mar 4 14:38:30 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Sat, 4 Mar 2006 09:38:30 -0500 Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.8,1.9 Message-ID: <200603041439.k24Ed3bv002328@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304 Modified Files: xmms-cdread.spec Log Message: added {%dist} after release and added libtool --finish Index: xmms-cdread.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xmms-cdread.spec 1 Mar 2006 17:07:38 -0000 1.8 +++ xmms-cdread.spec 4 Mar 2006 14:38:30 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Digital audio CD input plugin for XMMS Name: xmms-cdread Version: 0.14 -Release: 7 +Release: 8%{?dist} License: GPL Group: Applications/Multimedia @@ -35,12 +35,11 @@ perl -pi -e 's/^(CFLAGS.*)-O2(.*)/$1\$\(RPM_OPT_FLAGS\)$2/' Makefile make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - +libtool --finish $RPM_BUILD_ROOT/usr/lib64/xmms/Input %clean rm -rf $RPM_BUILD_ROOT @@ -54,6 +53,10 @@ %changelog +* Sat Mar 4 2006 Joost Soeterbroek - 0.14-8 +- added libtool --finish +- added dist after release + * Wed Mar 1 2006 Joost Soeterbroek - 0.14-7 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sat Mar 4 14:57:24 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Mar 2006 09:57:24 -0500 Subject: owners owners.list,1.703,1.704 Message-ID: <200603041457.k24EvuOe002436@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2419 Modified Files: owners.list Log Message: Taking gkrellm-themes. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.703 retrieving revision 1.704 diff -u -r1.703 -r1.704 --- owners.list 4 Mar 2006 08:25:23 -0000 1.703 +++ owners.list 4 Mar 2006 14:57:24 -0000 1.704 @@ -312,7 +312,7 @@ 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|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org| -Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|extras-orphan at fedoraproject.org|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|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 4 15:04:07 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Mar 2006 10:04:07 -0500 Subject: rpms/gkrellm-themes/devel gkrellm-themes.spec,1.8,1.9 Message-ID: <200603041504.k24F4dnF004319@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gkrellm-themes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4302 Modified Files: gkrellm-themes.spec Log Message: * Sat Mar 4 2006 Ville Skytt?? - 2.1.9-4 - Rebuild, cosmetic specfile improvements. Index: gkrellm-themes.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-themes/devel/gkrellm-themes.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gkrellm-themes.spec 2 Mar 2006 21:29:16 -0000 1.8 +++ gkrellm-themes.spec 4 Mar 2006 15:04:06 -0000 1.9 @@ -1,15 +1,16 @@ -Summary: Some themes for the GNU Krell Monitor Name: gkrellm-themes Version: 2.1.9 -Release: 3 +Release: 4 +Summary: Themes for the GNU Krell Monitor -License: GPL Group: Applications/System -Source: http://muhri.net/gkrellm/GKrellM-Skins.tar.gz +License: GPL URL: http://muhri.net/gkrellm/ +Source0: http://muhri.net/gkrellm/GKrellM-Skins.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: gkrellm >= 2.0.0 + BuildArch: noarch +Requires: gkrellm >= 2.0.0 %description GKrellM charts SMP CPU, load, Disk, and all active net interfaces @@ -23,13 +24,6 @@ %prep -cat< - 2.1.9-4 +- Rebuild, cosmetic specfile improvements. + * Tue Jan 17 2006 Ville Skytt?? - 2.1.9-3 - Switch to latest (2003-01-29) muhri.net tarball. - Remove more backup etc junk from installed files. From fedora-extras-commits at redhat.com Sat Mar 4 15:27:57 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 4 Mar 2006 10:27:57 -0500 Subject: rpms/gai-pal/devel gai-pal.spec,1.12,1.13 Message-ID: <200603041528.k24FSYo7004473@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gai-pal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4456 Modified Files: gai-pal.spec Log Message: Rebuild for FE 5 Index: gai-pal.spec =================================================================== RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gai-pal.spec 12 Feb 2006 21:38:32 -0000 1.12 +++ gai-pal.spec 4 Mar 2006 15:27:56 -0000 1.13 @@ -3,7 +3,7 @@ Summary: GAI Pal applet Name: gai-pal Version: 0.7 -Release: 8 +Release: 9 Source0: %{name}-%{version}.tar.bz2 Patch0: gai-pal-0.7-xosd-empty-msg.patch Patch1: gai-pal-0.7-typo.patch @@ -48,6 +48,9 @@ %{_datadir}/pixmaps/* %changelog +* Sat Mar 4 2006 Michel Salim - 0.7-9 +- Rebuild for Fedora Extras 5 + * Sun Feb 12 2006 Michel Salim - 0.7-8 - rebuild against new gtk2 and gtkglext From fedora-extras-commits at redhat.com Sat Mar 4 15:42:18 2006 From: fedora-extras-commits at redhat.com (Matthias Haase (endur)) Date: Sat, 4 Mar 2006 10:42:18 -0500 Subject: rpms/streamtuner/devel streamtuner.spec,1.5,1.6 Message-ID: <200603041542.k24FgpBX004588@cvs-int.fedora.redhat.com> Author: endur Update of /cvs/extras/rpms/streamtuner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4571 Modified Files: streamtuner.spec Log Message: Rebuild for Fedora Extras 5 Index: streamtuner.spec =================================================================== RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- streamtuner.spec 18 Jan 2006 12:33:51 -0000 1.5 +++ streamtuner.spec 4 Mar 2006 15:42:18 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A stream directory browser Name: streamtuner Version: 0.99.99 -Release: 11%{?dist} +Release: 12%{?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 +* Sat Mar 4 2006 Matthias Haase - 0.99.99-12 +- Rebuild for Fedora Extras 5 + * Wed Jan 18 2006 Matthias Haase - 0.99.99-11 - only a sync of the version number with the increased one from FC3 From fedora-extras-commits at redhat.com Sat Mar 4 16:20:15 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:20:15 -0500 Subject: rpms/banshee - New directory Message-ID: <200603041620.k24GKHBB006745@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6737/banshee Log Message: Directory /cvs/extras/rpms/banshee added to the repository From fedora-extras-commits at redhat.com Sat Mar 4 16:20:21 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:20:21 -0500 Subject: rpms/banshee/devel - New directory Message-ID: <200603041620.k24GKNEc006760@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6737/banshee/devel Log Message: Directory /cvs/extras/rpms/banshee/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 4 16:20:47 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:20:47 -0500 Subject: rpms/banshee Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603041620.k24GKnJI006794@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6782 Added Files: Makefile import.log Log Message: Setup of module banshee --- NEW FILE Makefile --- # Top level Makefile for module banshee all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 4 16:20:53 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:20:53 -0500 Subject: rpms/banshee/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603041620.k24GKtBK006814@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6782/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module banshee --- NEW 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 Mar 4 16:22:20 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:22:20 -0500 Subject: rpms/banshee import.log,1.1,1.2 Message-ID: <200603041622.k24GMqJj006913@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6879 Modified Files: import.log Log Message: auto-import banshee-0.10.6-1 on branch devel from banshee-0.10.6-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/banshee/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Mar 2006 16:20:47 -0000 1.1 +++ import.log 4 Mar 2006 16:22:20 -0000 1.2 @@ -0,0 +1 @@ +banshee-0_10_6-1:HEAD:banshee-0.10.6-1.src.rpm:1141489349 From fedora-extras-commits at redhat.com Sat Mar 4 16:22:26 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:22:26 -0500 Subject: rpms/banshee/devel banshee.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603041622.k24GMwpG006917@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6879/devel Modified Files: .cvsignore sources Added Files: banshee.spec Log Message: auto-import banshee-0.10.6-1 on branch devel from banshee-0.10.6-1.src.rpm --- NEW FILE banshee.spec --- Name: banshee Version: 0.10.6 Release: 1 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia License: MIT URL: http://banshee-project.org/ Source0: http://banshee-project.org/files/banshee/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ipod-sharp BuildRequires: avahi-sharp BuildRequires: libmusicbrainz-devel >= 2.1.1 BuildRequires: gtk-sharp2 BuildRequires: mono-devel >= 1.1.10 BuildRequires: mono-data BuildRequires: mono-data-sqlite BuildRequires: hal-devel BuildRequires: dbus-sharp >= 0.36.2 BuildRequires: sqlite-devel >= 3.3 BuildRequires: gstreamer-devel >= 0.10 BuildRequires: gstreamer-plugins-base-devel >= 0.10 BuildRequires: gnome-desktop-devel BuildRequires: nautilus-cd-burner-devel Requires(post): GConf2 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils %description Banshee allows you to import CDs, sync your music collection to an iPod, play music directly from an iPod, create playlists with songs from your library, and create audio and MP3 CDs from subsets of your library. %prep %setup -q %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure --disable-docs --with-gstreamer-0-10 make %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 %makeinstall desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ --add-only-show-in=GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/banshee.desktop %find_lang %name %clean %{__rm} -rf $RPM_BUILD_ROOT %post update-desktop-database %{_datadir}/applications export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` for schema in audioscrobbler.schemas banshee.schemas daap.schemas filesystemmonitor.schemas metadatasearch.schemas mmkeys.schemas; do gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$schema > /dev/null || : done 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 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 %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING %{_bindir}/banshee %{_libdir}/banshee %{_libdir}/pkgconfig/banshee.pc %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/* %{_datadir}/dbus-1/services/org.gnome.Banshee.service %{_sysconfdir}/gconf/schemas %exclude %{_libdir}/banshee/*.a %exclude %{_libdir}/banshee/*.la %changelog * Tue Feb 21 2006 Christopher Aillon 0.10.6-1 - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2006 16:20:53 -0000 1.1 +++ .cvsignore 4 Mar 2006 16:22:25 -0000 1.2 @@ -0,0 +1 @@ +banshee-0.10.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2006 16:20:53 -0000 1.1 +++ sources 4 Mar 2006 16:22:25 -0000 1.2 @@ -0,0 +1 @@ +398b69c1818568b9d7a39c5e036de84b banshee-0.10.6.tar.gz From fedora-extras-commits at redhat.com Sat Mar 4 16:44:38 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:44:38 -0500 Subject: rpms/banshee/devel banshee.spec,1.1,1.2 Message-ID: <200603041645.k24GjAQ6007073@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7054 Modified Files: banshee.spec Log Message: * Sat Mar 4 2006 Christopher Aillon 0.10.6-2 - Rebuild Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- banshee.spec 4 Mar 2006 16:22:25 -0000 1.1 +++ banshee.spec 4 Mar 2006 16:44:37 -0000 1.2 @@ -1,6 +1,6 @@ Name: banshee Version: 0.10.6 -Release: 1 +Release: 2 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -94,5 +94,8 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Sat Mar 4 2006 Christopher Aillon 0.10.6-2 +- Rebuild + * Tue Feb 21 2006 Christopher Aillon 0.10.6-1 - Initial RPM From fedora-extras-commits at redhat.com Sat Mar 4 16:49:00 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sat, 4 Mar 2006 11:49:00 -0500 Subject: owners owners.list,1.704,1.705 Message-ID: <200603041649.k24GnWtK007172@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7148 Modified Files: owners.list Log Message: updated hping2. took ownership Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.704 retrieving revision 1.705 diff -u -r1.704 -r1.705 --- owners.list 4 Mar 2006 14:57:24 -0000 1.704 +++ owners.list 4 Mar 2006 16:49:00 -0000 1.705 @@ -420,7 +420,7 @@ Fedora Extras|highlight|Universal source code to formatted text converter|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|hmmer|Profile HMM software for protein sequence analysis|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| Fedora Extras|hpic|Healpix manipulation binaries and library|matt at truch.net|extras-qa at fedoraproject.org| -Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|paul at xtdnet.nl|extras-qa at fedoraproject.org| Fedora Extras|hspell|A Hebrew spell checker|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| Fedora Extras|htb-util|Another tool to make your life easier with HTB|mihai at xcyb.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| From fedora-extras-commits at redhat.com Sat Mar 4 16:57:17 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:57:17 -0500 Subject: owners owners.list,1.705,1.706 Message-ID: <200603041657.k24Gvov6007246@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7229 Modified Files: owners.list Log Message: New packages: banshee ipod-sharp libipoddevice Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.705 retrieving revision 1.706 diff -u -r1.705 -r1.706 --- owners.list 4 Mar 2006 16:49:00 -0000 1.705 +++ owners.list 4 Mar 2006 16:57:17 -0000 1.706 @@ -61,6 +61,7 @@ Fedora Extras|azureus|A BitTorrent Client|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org| Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org| +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| @@ -452,6 +453,7 @@ Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| +Fedora Extras|ipod-sharp|Provides high-level feature support for Apple's iPod and binds libipoddevice|caillon at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ipxripd|IPX RIP/SAP daemon - routing for IPX networks|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|ircd-hybrid|Internet Relay Chat Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| @@ -560,6 +562,7 @@ 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|libifp|A general-purpose library-driver for iRiver's iFP portable audio players|ivazquez at ivazquez.net|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|libkexif|Allow Kipi plugins to extract EXIF information|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libkipi|Common plugin infrastructure for KDE image applications|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libksba|X.509 library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 4 17:05:51 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Sat, 4 Mar 2006 12:05:51 -0500 Subject: rpms/bin2iso/devel bin2iso.spec,1.7,1.8 Message-ID: <200603041706.k24H6PXa009115@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/bin2iso/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9098 Modified Files: bin2iso.spec Log Message: bin2iso/devel: release bump Index: bin2iso.spec =================================================================== RCS file: /cvs/extras/rpms/bin2iso/devel/bin2iso.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bin2iso.spec 6 Apr 2005 22:11:11 -0000 1.7 +++ bin2iso.spec 4 Mar 2006 17:05:50 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Convert ".bin" files into ISO or WAV Name: bin2iso Version: 1.9 -Release: 2.b +Release: 3.b%{dist} License: Distributable (Unknown) Group: Applications/File @@ -38,6 +38,9 @@ %changelog +* Sat Mar 4 2006 Dams - 1.9-3.b +- rebuilt for FC5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Sat Mar 4 19:34:50 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Mar 2006 14:34:50 -0500 Subject: owners owners.list,1.706,1.707 Message-ID: <200603041935.k24JZMxQ013569@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13552 Modified Files: owners.list Log Message: Taking ownership of abe Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.706 retrieving revision 1.707 diff -u -r1.706 -r1.707 --- owners.list 4 Mar 2006 16:57:17 -0000 1.706 +++ owners.list 4 Mar 2006 19:34:49 -0000 1.707 @@ -14,7 +14,7 @@ Fedora Extras|aalib|An ASCII art library|anvil at livna.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|abe|A scrolling, platform-jumping, ancient pyramid exploring game|extras-orphan at fedoraproject.org|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| Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|acpitool|A command line ACPI client for Linux|pertusus at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 4 19:55:24 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Mar 2006 14:55:24 -0500 Subject: rpms/abe/devel abe.spec,1.9,1.10 Message-ID: <200603041955.k24Jtu4a013674@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/abe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13655 Modified Files: abe.spec Log Message: Rebuild for FC5 Index: abe.spec =================================================================== RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- abe.spec 4 Mar 2006 13:26:41 -0000 1.9 +++ abe.spec 4 Mar 2006 19:55:24 -0000 1.10 @@ -1,6 +1,6 @@ Name: abe Version: 1.0 -Release: 5 +Release: 6%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -22,13 +22,6 @@ vaguely in the style of similar games for the Commodore+4. %prep -cat< 1.0-6 +- rebuild for FC5 + * Mon Apr 11 2005 Panu Matilainen 0:1.0-5 - fix build on gcc4 - patch to fix issues in #149362 From fedora-extras-commits at redhat.com Sat Mar 4 20:38:48 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 15:38:48 -0500 Subject: rpms/dejavu-fonts import.log,1.37,1.38 Message-ID: <200603042039.k24KdKXn015824@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15792 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.3-3.fc5 on branch devel from dejavu-fonts-2.3-3.fc5.src.rpm split fontconfig reg in separate package Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- import.log 4 Mar 2006 12:23:49 -0000 1.37 +++ import.log 4 Mar 2006 20:38:47 -0000 1.38 @@ -34,3 +34,4 @@ dejavu-fonts-2_2-4_fc4:FC-4:dejavu-fonts-2.2-4.fc4.src.rpm:1140271299 dejavu-fonts-2_3-1_fc5:HEAD:dejavu-fonts-2.3-1.fc5.src.rpm:1140419864 dejavu-fonts-2_3-2_fc5:HEAD:dejavu-fonts-2.3-2.fc5.src.rpm:1141475016 +dejavu-fonts-2_3-3_fc5:HEAD:dejavu-fonts-2.3-3.fc5.src.rpm:1141504717 From fedora-extras-commits at redhat.com Sat Mar 4 20:38:53 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 15:38:53 -0500 Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.15,1.16 Message-ID: <200603042039.k24KdQ6s015827@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15792/devel Modified Files: dejavu-fonts.spec Log Message: auto-import dejavu-fonts-2.3-3.fc5 on branch devel from dejavu-fonts-2.3-3.fc5.src.rpm split fontconfig reg in separate package Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- dejavu-fonts.spec 4 Mar 2006 12:23:56 -0000 1.15 +++ dejavu-fonts.spec 4 Mar 2006 20:38:53 -0000 1.16 @@ -10,7 +10,7 @@ Name: dejavu-fonts Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: DejaVu Fonts Group: User Interface/X License: Redistributable, with restrictions @@ -23,8 +23,6 @@ BuildRequires: perl-Font-TTF # Needed to compute unicode coverage BuildRequires: %{Blocks} %{UnicodeData} -# Needed for fontconfig alias registration -Requires: %{_bindir}/xsltproc, /bin/mktemp BuildArch: noarch Conflicts: fontconfig < 2.3.93 @@ -36,6 +34,18 @@ the process of collaborative develop +%package fontconfig +Group: User Interface/X +Summary: Files needed to register DejaVu fonts in fontconfig aliases +Requires: %{name} = %{version}-%{release} +# Needed for fontconfig alias registration +Requires: %{_bindir}/xsltproc, /bin/mktemp, %{_sysconfdir}/fonts/fonts.conf + + +%description fontconfig +This package will add DejaVu fonts to fontconfig aliases + + %prep %setup -q -n %{archivename}-%{version} @@ -86,7 +96,7 @@ fi -%triggerin -- fontconfig, %{_sysconfdir}/fonts/fonts.conf +%triggerin fontconfig -- fontconfig, %{_sysconfdir}/fonts/fonts.conf if [ -x %{_sysconfdir}/fonts/fonts.conf ] ; then TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \ @@ -103,11 +113,17 @@ %dir %{fontdir} %{fontdir}/*.ttf + +%files fontconfig +%defattr(0644,root,root,0755) %dir %{xsldir} %{xsldir}/register-%{name}.xsl %changelog +* Sat Mar 04 2006 Nicolas Mailhot - 2.3-3 +- split fontconfig registration in subpackage + * Sat Mar 04 2006 Nicolas Mailhot - 2.3-2 - register dejavu in fontconfig aliases From fedora-extras-commits at redhat.com Sat Mar 4 21:24:50 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Mar 2006 16:24:50 -0500 Subject: rpms/abe/devel .cvsignore, 1.2, 1.3 abe.spec, 1.10, 1.11 sources, 1.2, 1.3 abe-1.0-datapath.patch, 1.1, NONE abe-1.0-gcc4.patch, 1.1, NONE abe-1.0-misc-fixes.patch, 1.1, NONE abe-1.0-tmppath.patch, 1.1, NONE Message-ID: <200603042125.k24LPMRK018144@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/abe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18115 Modified Files: .cvsignore abe.spec sources Removed Files: abe-1.0-datapath.patch abe-1.0-gcc4.patch abe-1.0-misc-fixes.patch abe-1.0-tmppath.patch Log Message: Update to 1.1 which now includes the earlier 1.0 patches. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abe/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:01:10 -0000 1.2 +++ .cvsignore 4 Mar 2006 21:24:50 -0000 1.3 @@ -1 +1 @@ -abe-1_0.tar.gz +abe-1.1.tar.gz Index: abe.spec =================================================================== RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- abe.spec 4 Mar 2006 19:55:24 -0000 1.10 +++ abe.spec 4 Mar 2006 21:24:50 -0000 1.11 @@ -1,17 +1,13 @@ Name: abe -Version: 1.0 -Release: 6%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games License: GPL URL: http://abe.sourceforge.net/ -Source0: http://download.sourceforge.net/abe/abe-1_0.tar.gz +Source0: http://dl.sourceforge.net/abe/abe-1.1.tar.gz Source1: %{name}.png -Patch0: %{name}-%{version}-datapath.patch -Patch1: %{name}-%{version}-tmppath.patch -Patch2: %{name}-%{version}-gcc4.patch -Patch3: %{name}-%{version}-misc-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3 @@ -22,29 +18,22 @@ vaguely in the style of similar games for the Commodore+4. %prep -%setup -q -n %{name}-1_0 -# Abe assumes it runs from its build directory and thus assumes everything -# is writable there etc.. ugh: -# Hardcode /usr/share/abe/ paths -%patch0 -p1 -b .datapath -# Write temporary image files into home directory, not data directory -%patch1 -p1 -b .tmppath -%patch2 -p1 -b .gcc4 -%patch3 -p1 -b .miscfix +%setup -q %build -%configure +%configure --with-data-dir=%{_datadir}/%{name} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + +# make install does not copy the game data files. mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ -mkdir -p $RPM_BUILD_ROOT/%{_bindir} cp -p -r images maps sounds $RPM_BUILD_ROOT/%{_datadir}/%{name} install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ -install -p -m 755 %{name} $RPM_BUILD_ROOT/%{_bindir}/ cat << EOF > %{name}.desktop [Desktop Entry] @@ -74,6 +63,9 @@ %{_datadir}/pixmaps/* %changelog +* Sat Mar 4 2006 Wart 1.1-1 +- Update to 1.1 + * Sat Mar 4 2006 Wart 1.0-6 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abe/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:01:10 -0000 1.2 +++ sources 4 Mar 2006 21:24:50 -0000 1.3 @@ -1 +1 @@ -a7e44d5e605b2d32fffdf46f019f7119 abe-1_0.tar.gz +5537920e1746708e1a631d84d3500f5c abe-1.1.tar.gz --- abe-1.0-datapath.patch DELETED --- --- abe-1.0-gcc4.patch DELETED --- --- abe-1.0-misc-fixes.patch DELETED --- --- abe-1.0-tmppath.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 23:10:56 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Mar 2006 18:10:56 -0500 Subject: rpms/abe/FC-4 .cvsignore, 1.2, 1.3 abe.spec, 1.8, 1.9 sources, 1.2, 1.3 abe-1.0-datapath.patch, 1.1, NONE abe-1.0-gcc4.patch, 1.1, NONE abe-1.0-misc-fixes.patch, 1.1, NONE abe-1.0-tmppath.patch, 1.1, NONE Message-ID: <200603042311.k24NBSKC022460@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/abe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22439 Modified Files: .cvsignore abe.spec sources Removed Files: abe-1.0-datapath.patch abe-1.0-gcc4.patch abe-1.0-misc-fixes.patch abe-1.0-tmppath.patch Log Message: Update to 1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abe/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:01:10 -0000 1.2 +++ .cvsignore 4 Mar 2006 23:10:55 -0000 1.3 @@ -1 +1 @@ -abe-1_0.tar.gz +abe-1.1.tar.gz Index: abe.spec =================================================================== RCS file: /cvs/extras/rpms/abe/FC-4/abe.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- abe.spec 12 Apr 2005 14:33:30 -0000 1.8 +++ abe.spec 4 Mar 2006 23:10:55 -0000 1.9 @@ -1,17 +1,13 @@ Name: abe -Version: 1.0 -Release: 5 +Version: 1.1 +Release: 1%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games License: GPL URL: http://abe.sourceforge.net/ -Source0: http://download.sourceforge.net/abe/abe-1_0.tar.gz +Source0: http://dl.sourceforge.net/abe/abe-1.1.tar.gz Source1: %{name}.png -Patch0: %{name}-%{version}-datapath.patch -Patch1: %{name}-%{version}-tmppath.patch -Patch2: %{name}-%{version}-gcc4.patch -Patch3: %{name}-%{version}-misc-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3 @@ -22,29 +18,22 @@ vaguely in the style of similar games for the Commodore+4. %prep -%setup -q -n %{name}-1_0 -# Abe assumes it runs from its build directory and thus assumes everything -# is writable there etc.. ugh: -# Hardcode /usr/share/abe/ paths -%patch0 -p1 -b .datapath -# Write temporary image files into home directory, not data directory -%patch1 -p1 -b .tmppath -%patch2 -p1 -b .gcc4 -%patch3 -p1 -b .miscfix +%setup -q %build -%configure +%configure --with-data-dir=%{_datadir}/%{name} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + +# make install does not copy the game data files. mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ -mkdir -p $RPM_BUILD_ROOT/%{_bindir} cp -p -r images maps sounds $RPM_BUILD_ROOT/%{_datadir}/%{name} install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ -install -p -m 755 %{name} $RPM_BUILD_ROOT/%{_bindir}/ cat << EOF > %{name}.desktop [Desktop Entry] @@ -74,6 +63,9 @@ %{_datadir}/pixmaps/* %changelog +* Sat Mar 4 2006 Wart 1.1-1 +- Update to 1.1 + * Mon Apr 11 2005 Panu Matilainen 0:1.0-5 - fix build on gcc4 - patch to fix issues in #149362 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abe/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:01:10 -0000 1.2 +++ sources 4 Mar 2006 23:10:55 -0000 1.3 @@ -1 +1 @@ -a7e44d5e605b2d32fffdf46f019f7119 abe-1_0.tar.gz +5537920e1746708e1a631d84d3500f5c abe-1.1.tar.gz --- abe-1.0-datapath.patch DELETED --- --- abe-1.0-gcc4.patch DELETED --- --- abe-1.0-misc-fixes.patch DELETED --- --- abe-1.0-tmppath.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 5 01:38:03 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 4 Mar 2006 20:38:03 -0500 Subject: rpms/proj/devel proj.spec,1.6,1.7 Message-ID: <200603050138.k251cZgN027194@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27177 Modified Files: proj.spec Log Message: Rebuild for Fedora Extras 5 Index: proj.spec =================================================================== RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- proj.spec 8 Jul 2005 05:23:35 -0000 1.6 +++ proj.spec 5 Mar 2006 01:38:02 -0000 1.7 @@ -1,6 +1,6 @@ Name: proj Version: 4.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering @@ -93,6 +93,9 @@ %{_datadir}/%{name} %changelog +* Sat Mar 4 2006 Shawn McCann - 4.4.9-2 +- Rebuild for Fedora Extras 5 + * Thu Jul 7 2005 Shawn McCann - 4.4.9-1 - Updated to proj-4.4.9 and to fix bugzilla reports 150013 and 161726. Patch2 can be removed once this package is upgraded to the next release of the source. From fedora-extras-commits at redhat.com Sun Mar 5 01:43:41 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 4 Mar 2006 20:43:41 -0500 Subject: rpms/proj/devel proj.spec,1.7,1.8 Message-ID: <200603050144.k251iDOx027254@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27237 Modified Files: proj.spec Log Message: Rebuild for Fedora Extras 5 Index: proj.spec =================================================================== RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- proj.spec 5 Mar 2006 01:38:02 -0000 1.7 +++ proj.spec 5 Mar 2006 01:43:40 -0000 1.8 @@ -1,6 +1,6 @@ Name: proj Version: 4.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering @@ -93,6 +93,9 @@ %{_datadir}/%{name} %changelog +* Sat Mar 4 2006 Shawn McCann - 4.4.9-3 +- Rebuild for Fedora Extras 5 + * Sat Mar 4 2006 Shawn McCann - 4.4.9-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sun Mar 5 01:47:29 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 4 Mar 2006 20:47:29 -0500 Subject: rpms/geos/devel geos.spec,1.4,1.5 Message-ID: <200603050148.k251m1c8027322@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/geos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27303 Modified Files: geos.spec Log Message: Rebuild for Fedora Extras 5 Index: geos.spec =================================================================== RCS file: /cvs/extras/rpms/geos/devel/geos.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- geos.spec 14 Jan 2006 23:14:24 -0000 1.4 +++ geos.spec 5 Mar 2006 01:47:29 -0000 1.5 @@ -1,6 +1,6 @@ Name: geos Version: 2.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GEOS is a C++ port of the Java Topology Suite Group: Applications/Engineering @@ -73,6 +73,9 @@ %exclude %{_libdir}/*.la %changelog +* Sat Mar 4 2006 Shawn McCann - 2.2.1-4 +- Rebuild for Fedora Extras 5 + * Sat Jan 14 2006 Shawn McCann - 2.2.1-3 - Updated gcc4 patch From fedora-extras-commits at redhat.com Sun Mar 5 01:53:53 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 4 Mar 2006 20:53:53 -0500 Subject: rpms/shapelib/devel shapelib.spec,1.6,1.7 Message-ID: <200603050154.k251sPXO027408@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/shapelib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27385 Modified Files: shapelib.spec Log Message: Rebuild for Fedora Extras 5 Index: shapelib.spec =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- shapelib.spec 11 Apr 2005 18:47:07 -0000 1.6 +++ shapelib.spec 5 Mar 2006 01:53:52 -0000 1.7 @@ -2,7 +2,7 @@ Summary: API in "C" for Shapefile handling Name: shapelib Version: 1.2.10 -Release: 8 +Release: 9 URL: http://shapelib.maptools.org/ Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz Patch0: shapelib-%{version}.patch @@ -73,6 +73,9 @@ %exclude %{_libdir}/libshp.la %changelog +* Sat Mar 4 2006 Shawn McCann - 1.2.10-9 +- Rebuild for Fedora Extras 5 + * Mon Apr 11 2005 Michael Schwendt - 1.2.10-8 - Fix "invalid lvalue in assignment" for GCC4. From fedora-extras-commits at redhat.com Sun Mar 5 09:58:33 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Sun, 5 Mar 2006 04:58:33 -0500 Subject: rpms/xmms-cdread/devel xmms-cdread-x86_64.patch,NONE,1.1 Message-ID: <200603050958.k259wZGt014969@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14957 Added Files: xmms-cdread-x86_64.patch Log Message: x86_64 fixes xmms-cdread-x86_64.patch: --- NEW FILE xmms-cdread-x86_64.patch --- diff -rubN xmms-cdread-0.14a.orig/Makefile.am xmms-cdread-0.14a/Makefile.am --- xmms-cdread-0.14a.orig/Makefile.am 2001-07-13 04:02:06.000000000 -0400 +++ xmms-cdread-0.14a/Makefile.am 2006-03-04 11:08:51.000000000 -0500 @@ -2,10 +2,10 @@ libcdread_la_LDFLAGS = -module -avoid-version -nostdlib -CFLAGS = -O2 -W -Wall -Wno-unused -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ +AM_CFLAGS = -O2 -W -Wall -Wno-unused -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ CCLD = "gcc -nostdlib" libcdread_la_SOURCES = cdread.c cdread.h \ cdconf.c cddb.c fileinfo.c server.c playlist.c playlist.h \ filter.c cdromlinux.h cdrombsd.h cdromsolaris.h -EXTRA_DIST = cddb.howto +EXTRA_DIST = cddb.howto depcomp diff -rubN xmms-cdread-0.14a.orig/aclocal.m4 xmms-cdread-0.14a/aclocal.m4 --- xmms-cdread-0.14a.orig/aclocal.m4 2001-08-18 07:09:02.000000000 -0400 +++ xmms-cdread-0.14a/aclocal.m4 2006-03-04 11:11:26.000000000 -0500 @@ -1,950 +1,7637 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p4 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# 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. -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# Configure paths for GLIB +# Owen Taylor 97-11-3 -dnl Some handy functions +dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or +dnl gthread is specified in MODULES, pass to glib-config +dnl +AC_DEFUN([AM_PATH_GLIB], +[dnl +dnl Get the cflags and libraries from the glib-config script +dnl +AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], + glib_config_prefix="$withval", glib_config_prefix="") +AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], + glib_config_exec_prefix="$withval", glib_config_exec_prefix="") +AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], + , enable_glibtest=yes) -dnl Try a list of directories, set the first one found -dnl Usage: AC_CHECK_DIRS(DIRECTORY..., ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + if test x$glib_config_exec_prefix != x ; then + glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config + fi + fi + if test x$glib_config_prefix != x ; then + glib_config_args="$glib_config_args --prefix=$glib_config_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_prefix/bin/glib-config + fi + fi -AC_DEFUN(AC_CHECK_DIRS, -[ -for ac_dir in $1 -do -AC_MSG_CHECKING([for directory ${ac_dir}]) -if test -d ${ac_dir} -then + for module in . $4 + do + case "$module" in + gmodule) + glib_config_args="$glib_config_args gmodule" + ;; + gthread) + glib_config_args="$glib_config_args gthread" + ;; + esac + done + + AC_PATH_PROG(GLIB_CONFIG, glib-config, no) + min_glib_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes + else + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of glib-config to some extent +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.glibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If glib-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); + printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the glib-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); + printf("*** correct copy of glib-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then AC_MSG_RESULT(yes) [...40470 lines suppressed...] + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac + + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} + case $ac_dest in + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`(dirname "$mf") 2>/dev/null || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`(dirname "$file") 2>/dev/null || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p $dirpart/$fdir + else + as_dir=$dirpart/$fdir + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; }; } + + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done + ;; + esac +done +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF + +{ (exit 0); exit 0; } +_ACEOF chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_clean_files=$ac_clean_files_save + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi From fedora-extras-commits at redhat.com Sun Mar 5 09:58:55 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Sun, 5 Mar 2006 04:58:55 -0500 Subject: rpms/xmms-cdread/FC-4 xmms-cdread-x86_64.patch,NONE,1.1 Message-ID: <200603050958.k259wvZ2014993@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14981 Added Files: xmms-cdread-x86_64.patch Log Message: x86_64 fixes xmms-cdread-x86_64.patch: --- NEW FILE xmms-cdread-x86_64.patch --- diff -rubN xmms-cdread-0.14a.orig/Makefile.am xmms-cdread-0.14a/Makefile.am --- xmms-cdread-0.14a.orig/Makefile.am 2001-07-13 04:02:06.000000000 -0400 +++ xmms-cdread-0.14a/Makefile.am 2006-03-04 11:08:51.000000000 -0500 @@ -2,10 +2,10 @@ libcdread_la_LDFLAGS = -module -avoid-version -nostdlib -CFLAGS = -O2 -W -Wall -Wno-unused -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ +AM_CFLAGS = -O2 -W -Wall -Wno-unused -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ CCLD = "gcc -nostdlib" libcdread_la_SOURCES = cdread.c cdread.h \ cdconf.c cddb.c fileinfo.c server.c playlist.c playlist.h \ filter.c cdromlinux.h cdrombsd.h cdromsolaris.h -EXTRA_DIST = cddb.howto +EXTRA_DIST = cddb.howto depcomp diff -rubN xmms-cdread-0.14a.orig/aclocal.m4 xmms-cdread-0.14a/aclocal.m4 --- xmms-cdread-0.14a.orig/aclocal.m4 2001-08-18 07:09:02.000000000 -0400 +++ xmms-cdread-0.14a/aclocal.m4 2006-03-04 11:11:26.000000000 -0500 @@ -1,950 +1,7637 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p4 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# 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. -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# Configure paths for GLIB +# Owen Taylor 97-11-3 -dnl Some handy functions +dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or +dnl gthread is specified in MODULES, pass to glib-config +dnl +AC_DEFUN([AM_PATH_GLIB], +[dnl +dnl Get the cflags and libraries from the glib-config script +dnl +AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], + glib_config_prefix="$withval", glib_config_prefix="") +AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], + glib_config_exec_prefix="$withval", glib_config_exec_prefix="") +AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], + , enable_glibtest=yes) -dnl Try a list of directories, set the first one found -dnl Usage: AC_CHECK_DIRS(DIRECTORY..., ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + if test x$glib_config_exec_prefix != x ; then + glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config + fi + fi + if test x$glib_config_prefix != x ; then + glib_config_args="$glib_config_args --prefix=$glib_config_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_prefix/bin/glib-config + fi + fi -AC_DEFUN(AC_CHECK_DIRS, -[ -for ac_dir in $1 -do -AC_MSG_CHECKING([for directory ${ac_dir}]) -if test -d ${ac_dir} -then + for module in . $4 + do + case "$module" in + gmodule) + glib_config_args="$glib_config_args gmodule" + ;; + gthread) + glib_config_args="$glib_config_args gthread" + ;; + esac + done + + AC_PATH_PROG(GLIB_CONFIG, glib-config, no) + min_glib_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes + else + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of glib-config to some extent +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.glibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If glib-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); + printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the glib-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); + printf("*** correct copy of glib-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then AC_MSG_RESULT(yes) [...40470 lines suppressed...] + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac + + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} + case $ac_dest in + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`(dirname "$mf") 2>/dev/null || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`(dirname "$file") 2>/dev/null || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p $dirpart/$fdir + else + as_dir=$dirpart/$fdir + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; }; } + + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done + ;; + esac +done +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF + +{ (exit 0); exit 0; } +_ACEOF chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_clean_files=$ac_clean_files_save + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi From fedora-extras-commits at redhat.com Sun Mar 5 10:00:28 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Sun, 5 Mar 2006 05:00:28 -0500 Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.9,1.10 Message-ID: <200603051001.k25A10LG015031@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15014 Modified Files: xmms-cdread.spec Log Message: x86_64 fixes Index: xmms-cdread.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xmms-cdread.spec 4 Mar 2006 14:38:30 -0000 1.9 +++ xmms-cdread.spec 5 Mar 2006 10:00:28 -0000 1.10 @@ -1,21 +1,19 @@ %define xmmsdep %(rpm -q --qf "%%{epoch}:%%{version}" xmms-devel) %define xmmsinputdir %(xmms-config --input-plugin-dir) - Summary: Digital audio CD input plugin for XMMS Name: xmms-cdread Version: 0.14 -Release: 8%{?dist} - +Release: 9%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ Source: ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz Patch1: xmms-cdread-shuffle.patch +Patch2: xmms-cdread-x86_64.patch Requires: xmms = %xmmsdep BuildRequires: gtk+-devel glib-devel xmms-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - %description XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System with an interface similar to Winamp's. XMMS supports playlists and @@ -24,11 +22,10 @@ This is the input plugin needed to play audio CDs digitally, i.e. without a connecting cable between the CD drive and sound card. - %prep %setup -q -n %{name}-%{version}a -%patch1 -p1 -b .shuffle - +%patch1 -p1 +%patch2 -p1 %build %configure --libdir=%{xmmsinputdir} @@ -39,20 +36,20 @@ rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -libtool --finish $RPM_BUILD_ROOT/usr/lib64/xmms/Input %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README TODO %{xmmsinputdir}/libcdread.so %exclude %{xmmsinputdir}/libcdread.la - %changelog +* Sun Mar 5 2006 Joost Soeterbroek - 0.14-9 +- x86_64 fixes + * Sat Mar 4 2006 Joost Soeterbroek - 0.14-8 - added libtool --finish - added dist after release From fedora-extras-commits at redhat.com Sun Mar 5 10:01:12 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Sun, 5 Mar 2006 05:01:12 -0500 Subject: rpms/xmms-cdread/FC-4 xmms-cdread.spec,1.7,1.8 Message-ID: <200603051001.k25A1iJu016877@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15453 Modified Files: xmms-cdread.spec Log Message: x86_64 fixes Index: xmms-cdread.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-cdread/FC-4/xmms-cdread.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xmms-cdread.spec 22 May 2005 23:53:12 -0000 1.7 +++ xmms-cdread.spec 5 Mar 2006 10:01:11 -0000 1.8 @@ -1,21 +1,19 @@ %define xmmsdep %(rpm -q --qf "%%{epoch}:%%{version}" xmms-devel) %define xmmsinputdir %(xmms-config --input-plugin-dir) - Summary: Digital audio CD input plugin for XMMS Name: xmms-cdread Version: 0.14 -Release: 6.a - +Release: 9%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ Source: ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz Patch1: xmms-cdread-shuffle.patch +Patch2: xmms-cdread-x86_64.patch Requires: xmms = %xmmsdep BuildRequires: gtk+-devel glib-devel xmms-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - %description XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System with an interface similar to Winamp's. XMMS supports playlists and @@ -24,36 +22,41 @@ This is the input plugin needed to play audio CDs digitally, i.e. without a connecting cable between the CD drive and sound card. - %prep %setup -q -n %{name}-%{version}a -%patch1 -p1 -b .shuffle - +%patch1 -p1 +%patch2 -p1 %build %configure --libdir=%{xmmsinputdir} perl -pi -e 's/^(CFLAGS.*)-O2(.*)/$1\$\(RPM_OPT_FLAGS\)$2/' Makefile make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README TODO %{xmmsinputdir}/libcdread.so %exclude %{xmmsinputdir}/libcdread.la - %changelog +* Sun Mar 5 2006 Joost Soeterbroek - 0.14-9 +- x86_64 fixes + +* Sat Mar 4 2006 Joost Soeterbroek - 0.14-8 +- added libtool --finish +- added dist after release + +* Wed Mar 1 2006 Joost Soeterbroek - 0.14-7 +- Rebuild for Fedora Extras 5 + * Sun May 22 2005 Jeremy Katz - 0.14-6.a - rebuild on all arches From fedora-extras-commits at redhat.com Sun Mar 5 10:02:10 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Sun, 5 Mar 2006 05:02:10 -0500 Subject: rpms/cproto/devel cproto.spec,1.4,1.5 Message-ID: <200603051002.k25A2hLH016912@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/cproto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16883 Modified Files: cproto.spec Log Message: * Sun Mar 5 2006 Jindrich Novy 4.7e-1 - update to 4.7e Index: cproto.spec =================================================================== RCS file: /cvs/extras/rpms/cproto/devel/cproto.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cproto.spec 29 Nov 2005 22:41:14 -0000 1.4 +++ cproto.spec 5 Mar 2006 10:02:09 -0000 1.5 @@ -1,10 +1,10 @@ Summary: Generates function prototypes and variable declarations from C code Name: cproto -Version: 4.7d -Release: 2 +Version: 4.7e +Release: 1%{?dist} License: Public Domain Group: Development/Tools -Source: ftp://invisible-island.net/cproto/cproto-4_7d.tgz +Source: ftp://invisible-island.net/cproto/cproto-4_7e.tgz URL: http://invisible-island.net/ BuildRequires: byacc, flex BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,7 +19,7 @@ definitions as much as other prototype generators. %prep -%setup -q -n cproto-4_7d +%setup -q -n cproto-4_7e %build export CPP="/lib/cpp" @@ -43,6 +43,9 @@ %{_mandir}/man1/cproto.* %changelog +* Sun Mar 5 2006 Jindrich Novy 4.7e-1 +- update to 4.7e + * Tue Nov 29 2005 Jindrich Novy 4.7d-2 - fix source, rebuild From fedora-extras-commits at redhat.com Sun Mar 5 10:04:38 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Sun, 5 Mar 2006 05:04:38 -0500 Subject: rpms/cproto/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200603051005.k25A5Ewu017020@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/cproto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17000 Modified Files: .cvsignore sources Log Message: - upload the 4.7e source tarball Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cproto/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Nov 2005 12:45:23 -0000 1.3 +++ .cvsignore 5 Mar 2006 10:04:37 -0000 1.4 @@ -1 +1,2 @@ cproto-4_7d.tgz +cproto-4_7e.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/cproto/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Nov 2005 12:45:23 -0000 1.3 +++ sources 5 Mar 2006 10:04:37 -0000 1.4 @@ -1 +1 @@ -d8aa3698dcf762b9fee94c5b9f1c294d cproto-4_7d.tgz +fbbba31154ad42af9441d44fddd7e45f cproto-4_7e.tgz From fedora-extras-commits at redhat.com Sun Mar 5 10:09:13 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Sun, 5 Mar 2006 05:09:13 -0500 Subject: rpms/nedit/devel nedit.spec,1.5,1.6 Message-ID: <200603051009.k25A9jBm017106@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17086 Modified Files: nedit.spec Log Message: * Sun Mar 5 2006 Jindrich Novy 5.5-7 - rebuild Index: nedit.spec =================================================================== RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nedit.spec 16 Dec 2005 15:33:50 -0000 1.5 +++ nedit.spec 5 Mar 2006 10:09:07 -0000 1.6 @@ -5,7 +5,7 @@ Summary: A GUI text editor for systems with X and Motif. Name: nedit Version: 5.5 -Release: 6 +Release: 7%{?dist} Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2 Source1: nedit.desktop Source2: nedit-icon.png @@ -82,6 +82,9 @@ %endif %changelog +* Sun Mar 5 2006 Jindrich Novy 5.5-7 +- rebuild + * Thu Dec 16 2005 Jindrich Novy 5.5-6 - fix openmotif dependencies - build with modular X From fedora-extras-commits at redhat.com Sun Mar 5 11:15:37 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 5 Mar 2006 06:15:37 -0500 Subject: owners owners.list,1.707,1.708 Message-ID: <200603051116.k25BG9lB019499@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19482 Modified Files: owners.list Log Message: orphan htb-util, tripwire Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.707 retrieving revision 1.708 diff -u -r1.707 -r1.708 --- owners.list 4 Mar 2006 19:34:49 -0000 1.707 +++ owners.list 5 Mar 2006 11:15:36 -0000 1.708 @@ -423,7 +423,7 @@ Fedora Extras|hpic|Healpix manipulation binaries and library|matt at truch.net|extras-qa at fedoraproject.org| Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|paul at xtdnet.nl|extras-qa at fedoraproject.org| Fedora Extras|hspell|A Hebrew spell checker|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| -Fedora Extras|htb-util|Another tool to make your life easier with HTB|mihai at xcyb.org|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|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| @@ -1358,7 +1358,7 @@ Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.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|treecc|Tree Compiler Compiler|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| -Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|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|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 5 13:52:08 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 08:52:08 -0500 Subject: devel/directfb directfb.spec,1.9,1.10 Message-ID: <200603051352.k25DqelA024138@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/directfb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24121 Modified Files: directfb.spec Log Message: rebuild for FE5 Index: directfb.spec =================================================================== RCS file: /cvs/extras/devel/directfb/directfb.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- directfb.spec 25 Nov 2005 12:12:27 -0000 1.9 +++ directfb.spec 5 Mar 2006 13:52:07 -0000 1.10 @@ -1,6 +1,6 @@ Name: directfb Version: 0.9.24 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System Environment/Libraries @@ -107,6 +107,9 @@ %{_libdir}/libfusion.so %changelog +* Sun Mar 05 2006 Thomas Vander Stichele 0.9.24-5 +- rebuild for fedora extras 5 + * Fri Nov 25 2005 Hans de Goede 0.9.24-4 - Merge FC-4 and devel specfiles for easier maintainance and consistence. - Incorperate improvements suggested by Ville Skytt?? in bug 162358. From fedora-extras-commits at redhat.com Sun Mar 5 14:17:25 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:17:25 -0500 Subject: devel/flumotion .cvsignore, 1.3, 1.4 flumotion.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603051417.k25EHwMC026177@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/flumotion In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26151 Modified Files: .cvsignore flumotion.spec sources Log Message: update to 0.2.0; rebuild for FE5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/flumotion/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 May 2005 13:45:56 -0000 1.3 +++ .cvsignore 5 Mar 2006 14:17:25 -0000 1.4 @@ -1 +1 @@ -flumotion-0.1.8.tar.bz2 +flumotion-0.2.0.tar.bz2 Index: flumotion.spec =================================================================== RCS file: /cvs/extras/devel/flumotion/flumotion.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- flumotion.spec 20 May 2005 13:48:47 -0000 1.3 +++ flumotion.spec 5 Mar 2006 14:17:25 -0000 1.4 @@ -1,6 +1,11 @@ +%define gst_minver 0.10.1 +%define gstpb_minver 0.10.1 +%define gstpy_minver 0.10.0 +%define gstreamer gstreamer + Name: flumotion -Version: 0.1.8 -Release: 1 +Version: 0.2.0 +Release: 1%{?dist} Summary: Flumotion - the Fluendo Streaming Server Group: Applications/Internet @@ -10,23 +15,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python >= 2.3 -Requires: gstreamer >= 0.8.5 -Requires: gstreamer-python >= 0.8.0 +Requires: %{gstreamer} >= %{gst_minver} +Requires: %{gstreamer}-plugins-base >= %{gstpb_minver} +Requires: %{gstreamer}-python >= %{gstpy_minver} Requires: python-twisted >= 1.3.0 -Requires: pygtk2 >= 2.4.0 +Requires: pygtk2 >= 2.8.0 Requires: python-imaging # for make-dummy-cert to work Requires(post): openssl -BuildRequires: gstreamer-devel >= 0.8.5 -BuildRequires: gstreamer-python >= 0.8.0 +BuildRequires: %{gstreamer}-devel >= %{gst_minver} +BuildRequires: %{gstreamer}-python >= %{gstpy_minver} BuildRequires: python-twisted >= 1.3.0 BuildRequires: python-devel >= 2.3 -BuildRequires: pygtk2-devel >= 2.4.0 -BuildRequires: gtk2-devel - -BuildRequires: desktop-file-utils +BuildRequires: pygtk2-devel >= 2.8.0 +BuildRequires: gtk2-devel # docs BuildRequires: epydoc @@ -34,11 +38,13 @@ # sigh, libtool BuildRequires: gcc-c++ +BuildRequires: desktop-file-utils + # since we compile pytrayicon, we're no longer noarch -# BuildArch: noarch +# BuildArch: noarch %description -Fluendo Streaming Server. +Flumotion, the Fluendo Streaming Server. %prep %setup -q @@ -68,8 +74,8 @@ # install make-dummy-cert script install -d $RPM_BUILD_ROOT%{_datadir}/flumotion install -m 644 \ - doc/redhat/make-dummy-cert \ - $RPM_BUILD_ROOT%{_datadir}/flumotion + doc/redhat/make-dummy-cert \ + $RPM_BUILD_ROOT%{_datadir}/flumotion # install service files install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d @@ -87,6 +93,8 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/run/flumotion install -d $RPM_BUILD_ROOT%{_localstatedir}/cache/flumotion +%find_lang flumotion + %clean rm -rf $RPM_BUILD_ROOT @@ -115,6 +123,9 @@ localhost + %{_sysconfdir}/flumotion/workers/default.xml < + + + user test + + EOF @@ -164,7 +183,7 @@ # /sbin/service flumotion condrestart # fi -%files +%files -f flumotion.lang %defattr(-,root,root,-) %doc ChangeLog COPYING README AUTHORS %doc doc/reference/html @@ -172,22 +191,38 @@ %{_bindir}/flumotion-manager %{_bindir}/flumotion-worker %{_bindir}/flumotion-admin +%{_bindir}/flumotion-admin-text +%{_bindir}/flumotion-command %{_bindir}/flumotion-tester +%{_bindir}/flumotion-job +%{_bindir}/flumotion-inspect +%{_bindir}/flumotion-launch %{_sbindir}/flumotion + %{_libdir}/flumotion %{_libdir}/pkgconfig/flumotion.pc -%{_datadir}/flumotion + %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/* +%{_mandir}/man1/flumotion*.1* + +%{_datadir}/flumotion/glade +%{_datadir}/flumotion/image +%{_datadir}/flumotion/make-dummy-cert +%{_datadir}/flumotion/*.xsl %dir %attr(750,flumotion,root) %{_datadir}/flumotion/.flumotion + %attr(750,flumotion,root) %{_sysconfdir}/flumotion %attr(750,flumotion,root) %{_localstatedir}/run/flumotion %attr(750,flumotion,root) %{_localstatedir}/log/flumotion %attr(750,flumotion,root) %{_localstatedir}/cache/flumotion %{_sysconfdir}/rc.d/init.d/flumotion -%{_datadir}/applications/fedora-flumotion-admin.desktop %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.2.0-1 +- new upstream release + * Fri May 20 2005 Thomas Vander Stichele - 0.1.8-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/devel/flumotion/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 May 2005 13:45:56 -0000 1.3 +++ sources 5 Mar 2006 14:17:25 -0000 1.4 @@ -1 +1 @@ -33367676b24fe3af328ae6cfca8b63ec flumotion-0.1.8.tar.bz2 +f674eb7286fb0cef687c372a0da1ebd1 flumotion-0.2.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 5 14:20:14 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:20:14 -0500 Subject: devel/Hermes Hermes.spec,1.9,1.10 Message-ID: <200603051420.k25EKknt026204@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/Hermes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26187 Modified Files: Hermes.spec Log Message: rebuilt for FE5 Index: Hermes.spec =================================================================== RCS file: /cvs/extras/devel/Hermes/Hermes.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Hermes.spec 22 May 2005 23:45:23 -0000 1.9 +++ Hermes.spec 5 Mar 2006 14:20:13 -0000 1.10 @@ -1,6 +1,6 @@ Name: Hermes Version: 1.3.3 -Release: 8 +Release: 9%{?dist} Summary: Pixel format conversion library @@ -73,6 +73,10 @@ %{_libdir}/libHermes.so %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 1.3.3-9 +- rebuilt for FE5 + * Sun May 22 2005 Jeremy Katz - 1.3.3-8 - rebuild on all arches From fedora-extras-commits at redhat.com Sun Mar 5 14:22:08 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:22:08 -0500 Subject: devel/ladspa ladspa.spec,1.9,1.10 Message-ID: <200603051422.k25EMf6q026274@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/ladspa In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26251 Modified Files: ladspa.spec Log Message: rebuilt for FE5 Index: ladspa.spec =================================================================== RCS file: /cvs/extras/devel/ladspa/ladspa.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ladspa.spec 23 May 2005 00:25:50 -0000 1.9 +++ ladspa.spec 5 Mar 2006 14:22:08 -0000 1.10 @@ -1,6 +1,6 @@ Name: ladspa Version: 1.12 -Release: 5 +Release: 6%{?dist} Summary: LADSPA SDK, example plug-ins and tools @@ -90,6 +90,10 @@ %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 1.12-6 +- rebuilt for FE5 + * Sun May 22 2005 Jeremy Katz - 1.12-5 - rebuild on all arches From fedora-extras-commits at redhat.com Sun Mar 5 14:31:36 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:31:36 -0500 Subject: devel/libannodex .cvsignore, 1.3, 1.4 libannodex.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603051432.k25EW9As026437@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libannodex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26398 Modified Files: .cvsignore libannodex.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/libannodex/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Nov 2005 17:37:19 -0000 1.3 +++ .cvsignore 5 Mar 2006 14:31:36 -0000 1.4 @@ -1 +1 @@ -libannodex-0.7.2.tar.gz +libannodex-0.7.3.tar.gz Index: libannodex.spec =================================================================== RCS file: /cvs/extras/devel/libannodex/libannodex.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libannodex.spec 13 Nov 2005 17:37:19 -0000 1.2 +++ libannodex.spec 5 Mar 2006 14:31:36 -0000 1.3 @@ -1,5 +1,5 @@ Name: libannodex -Version: 0.7.2 +Version: 0.7.3 Release: 1%{?dist} Summary: Library for annotating and indexing networked media @@ -58,7 +58,7 @@ %clean rm -rf $RPM_BUILD_ROOT - + %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README @@ -90,6 +90,11 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-1 +- new upstream release +- rebuilt for FE5 + * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release Index: sources =================================================================== RCS file: /cvs/extras/devel/libannodex/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Nov 2005 17:37:19 -0000 1.3 +++ sources 5 Mar 2006 14:31:36 -0000 1.4 @@ -1 +1 @@ -63440e4cabdcb1d03878d4adc453fc72 libannodex-0.7.2.tar.gz +504cf036cf04512260006a986926177f libannodex-0.7.3.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 14:32:49 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:32:49 -0500 Subject: rpms/libannodex/FC-3 .cvsignore, 1.3, 1.4 libannodex.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603051433.k25EXMvb026645@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26479 Modified Files: .cvsignore libannodex.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Nov 2005 17:37:19 -0000 1.3 +++ .cvsignore 5 Mar 2006 14:32:49 -0000 1.4 @@ -1 +1 @@ -libannodex-0.7.2.tar.gz +libannodex-0.7.3.tar.gz Index: libannodex.spec =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-3/libannodex.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libannodex.spec 13 Nov 2005 17:37:19 -0000 1.2 +++ libannodex.spec 5 Mar 2006 14:32:49 -0000 1.3 @@ -1,5 +1,5 @@ Name: libannodex -Version: 0.7.2 +Version: 0.7.3 Release: 1%{?dist} Summary: Library for annotating and indexing networked media @@ -90,6 +90,9 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-1: new upstream release + * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Nov 2005 17:37:19 -0000 1.3 +++ sources 5 Mar 2006 14:32:49 -0000 1.4 @@ -1 +1 @@ -63440e4cabdcb1d03878d4adc453fc72 libannodex-0.7.2.tar.gz +504cf036cf04512260006a986926177f libannodex-0.7.3.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 14:35:07 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:35:07 -0500 Subject: rpms/libannodex/FC-4 .cvsignore, 1.3, 1.4 libannodex.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603051435.k25EZdb3027413@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27229 Modified Files: .cvsignore libannodex.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Nov 2005 17:37:19 -0000 1.3 +++ .cvsignore 5 Mar 2006 14:35:07 -0000 1.4 @@ -1 +1 @@ -libannodex-0.7.2.tar.gz +libannodex-0.7.3.tar.gz Index: libannodex.spec =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-4/libannodex.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libannodex.spec 13 Nov 2005 17:37:19 -0000 1.2 +++ libannodex.spec 5 Mar 2006 14:35:07 -0000 1.3 @@ -1,5 +1,5 @@ Name: libannodex -Version: 0.7.2 +Version: 0.7.3 Release: 1%{?dist} Summary: Library for annotating and indexing networked media @@ -90,6 +90,9 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-1: new upstream release + * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Nov 2005 17:37:19 -0000 1.3 +++ sources 5 Mar 2006 14:35:07 -0000 1.4 @@ -1 +1 @@ -63440e4cabdcb1d03878d4adc453fc72 libannodex-0.7.2.tar.gz +504cf036cf04512260006a986926177f libannodex-0.7.3.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 14:40:14 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:40:14 -0500 Subject: rpms/gstreamer08 - New directory Message-ID: <200603051440.k25EeGL4027568@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27560/gstreamer08 Log Message: Directory /cvs/extras/rpms/gstreamer08 added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 14:40:20 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:40:20 -0500 Subject: rpms/gstreamer08/devel - New directory Message-ID: <200603051440.k25EeMKR027583@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27560/gstreamer08/devel Log Message: Directory /cvs/extras/rpms/gstreamer08/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 14:40:33 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:40:33 -0500 Subject: rpms/gstreamer08 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603051440.k25EeZjN027617@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27605 Added Files: Makefile import.log Log Message: Setup of module gstreamer08 --- NEW FILE Makefile --- # Top level Makefile for module gstreamer08 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 5 14:40:38 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:40:38 -0500 Subject: rpms/gstreamer08/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603051440.k25Eeec3027637@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27605/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gstreamer08 --- NEW 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 Mar 5 14:41:33 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:41:33 -0500 Subject: rpms/gstreamer08 import.log,1.1,1.2 Message-ID: <200603051442.k25Eg69H027742@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27687 Modified Files: import.log Log Message: auto-import gstreamer08-0.8.12-3 on branch devel from gstreamer08-0.8.12-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gstreamer08/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Mar 2006 14:40:32 -0000 1.1 +++ import.log 5 Mar 2006 14:41:33 -0000 1.2 @@ -0,0 +1 @@ +gstreamer08-0_8_12-3:HEAD:gstreamer08-0.8.12-3.src.rpm:1141569689 From fedora-extras-commits at redhat.com Sun Mar 5 14:41:39 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:41:39 -0500 Subject: rpms/gstreamer08/devel gstreamer-0.7.5-nops.patch, NONE, 1.1 gstreamer-0.8.11-lib64.patch, NONE, 1.1 gstreamer-0.8.9-cast-fix.patch, NONE, 1.1 gstreamer08.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603051442.k25EgBfM027747@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27687/devel Modified Files: .cvsignore sources Added Files: gstreamer-0.7.5-nops.patch gstreamer-0.8.11-lib64.patch gstreamer-0.8.9-cast-fix.patch gstreamer08.spec Log Message: auto-import gstreamer08-0.8.12-3 on branch devel from gstreamer08-0.8.12-3.src.rpm gstreamer-0.7.5-nops.patch: --- NEW FILE gstreamer-0.7.5-nops.patch --- --- gstreamer-0.7.5/docs/manuals.mak.nops 2004-02-27 08:52:16.000000000 +0100 +++ gstreamer-0.7.5/docs/manuals.mak 2004-02-27 08:52:48.000000000 +0100 @@ -42,7 +42,7 @@ # can we generate PS ? if DOC_PS -PS_DAT = $(DOC).ps +PS_DAT = else #!DOC_PS PS_DAT = endif #DOC_PS @@ -50,7 +50,7 @@ # can we generate PDF ? if DOC_PDF -PDF_DAT = $(DOC).pdf +PDF_DAT = else #!DOC_PDF PDF_DAT = endif #DOC_PDF gstreamer-0.8.11-lib64.patch: --- NEW FILE gstreamer-0.8.11-lib64.patch --- Index: gstreamer/tools/Makefile.am =================================================================== --- gstreamer.orig/tools/Makefile.am +++ gstreamer/tools/Makefile.am @@ -2,9 +2,13 @@ if GST_DISABLE_REGISTRY GST_REGISTRY_SRC = GST_REGISTRY_SRC_V = +GST_REGISTRY_WRAPPER_SRC = +GST_REGISTRY_WRAPPER_SRC_V = else -GST_REGISTRY_SRC = gst-register -GST_REGISTRY_SRC_V = gst-register- at GST_MAJORMINOR@ +GST_REGISTRY_SRC = gst-register- at host_cpu@ +GST_REGISTRY_SRC_V = gst-register- at host_cpu@- at GST_MAJORMINOR@ +GST_REGISTRY_WRAPPER_SRC = gst-register +GST_REGISTRY_WRAPPER_SRC_V = gst-register- at GST_MAJORMINOR@ endif if GST_DISABLE_LOADSAVE @@ -34,18 +38,32 @@ GST_OTHER_SRC_V = \ ### so all of the programs we want to build bin_PROGRAMS = \ - $(GST_REGISTRY_SRC) $(GST_REGISTRY_SRC_V) \ $(GST_LOADSAVE_SRC) $(GST_LOADSAVE_SRC_V) \ $(GST_OTHER_SRC) $(GST_OTHER_SRC_V) -bin_SCRIPTS = gst-feedback- at GST_MAJORMINOR@ +bin_SCRIPTS = gst-feedback- at GST_MAJORMINOR@ \ + $(GST_REGISTRY_WRAPPER_SRC) $(GST_REGISTRY_WRAPPER_SRC_V) + +libexec_PROGRAMS = \ + $(GST_REGISTRY_SRC) $(GST_REGISTRY_SRC_V) noinst_HEADERS = tools.h # make sure each versioned tool has the right source file and flags if !GST_DISABLE_REGISTRY -gst_register_ at GST_MAJORMINOR@_SOURCES = gst-register.c -gst_register_ at GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) -gst_register_ at GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS) +edit = sed -e 's, at libexecdir\@,$(libexecdir),g' -e 's, at GST_MAJORMINOR\@, at GST_MAJORMINOR@,g' + +gst-register- at GST_MAJORMINOR@: Makefile $(srcdir)/gst-register.in + rm -f gst-register- at GST_MAJORMINOR@ gst-register- at GST_MAJORMINOR@.tmp + $(edit) $(srcdir)/gst-register.in >gst-register- at GST_MAJORMINOR@.tmp + mv gst-register- at GST_MAJORMINOR@.tmp gst-register- at GST_MAJORMINOR@ +gst-register: Makefile $(srcdir)/gst-register.in + rm -f gst-register gst-register.tmp + $(edit) $(srcdir)/gst-register.in >gst-register.tmp + mv gst-register.tmp gst-register +gst_register_ at host_cpu@_ at GST_MAJORMINOR@_SOURCES = gst-register.c +gst_register_ at host_cpu@_ at GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) +gst_register_ at host_cpu@_ at GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS) + endif if !GST_DISABLE_LOADSAVE gst_complete_ at GST_MAJORMINOR@_SOURCES = gst-complete.c @@ -80,7 +98,7 @@ gst-feedback- at GST_MAJORMINOR@: gst-feedb # make sure each unversioned tool comes from gst-run.c if !GST_DISABLE_REGISTRY -gst_register_SOURCES = gst-run.c +gst_register_ at host_cpu@_SOURCES = gst-run.c endif if !GST_DISABLE_LOADSAVE gst_complete_SOURCES = gst-run.c Index: gstreamer/tools/gst-register.in =================================================================== --- /dev/null +++ gstreamer/tools/gst-register.in @@ -0,0 +1,5 @@ +#!/bin/sh +set -e +for x in @libexecdir@/gst-register*@GST_MAJORMINOR@; do + $x +done Index: gstreamer/docs/gst/gstreamer-sections.txt =================================================================== --- gstreamer.orig/docs/gst/gstreamer-sections.txt +++ gstreamer/docs/gst/gstreamer-sections.txt @@ -1347,10 +1347,14 @@ gst_real_pad_get_type GstRegistry GLOBAL_REGISTRY_DIR GLOBAL_REGISTRY_FILE +GLOBAL_ARCH_REGISTRY_FILE GLOBAL_REGISTRY_FILE_TMP +GLOBAL_ARCH_REGISTRY_FILE_TMP LOCAL_REGISTRY_DIR LOCAL_REGISTRY_FILE +LOCAL_ARCH_REGISTRY_FILE LOCAL_REGISTRY_FILE_TMP +LOCAL_ARCH_REGISTRY_FILE_TMP REGISTRY_DIR_PERMS REGISTRY_TMPFILE_PERMS REGISTRY_FILE_PERMS Index: gstreamer/gst/Makefile.am =================================================================== --- gstreamer.orig/gst/Makefile.am +++ gstreamer/gst/Makefile.am @@ -141,6 +141,7 @@ DISTCLEANFILES = $(built_header_configur libgstreamer_ at GST_MAJORMINOR@_la_CFLAGS = \ -D_GNU_SOURCE \ + -DHOSTCPU=\"$(host_cpu)\" \ $(GST_LIB_CFLAGS) \ -DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\" libgstreamer_ at GST_MAJORMINOR@_la_LIBADD = \ Index: gstreamer/gst/gstregistry.h =================================================================== --- gstreamer.orig/gst/gstregistry.h +++ gstreamer/gst/gstregistry.h @@ -29,10 +29,14 @@ #define GLOBAL_REGISTRY_DIR GST_CACHE_DIR #define GLOBAL_REGISTRY_FILE GLOBAL_REGISTRY_DIR"/registry.xml" #define GLOBAL_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.registry.xml.tmp" +#define GLOBAL_ARCH_REGISTRY_FILE GLOBAL_REGISTRY_DIR"/registry-" HOSTCPU ".xml" +#define GLOBAL_ARCH_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.registry-" HOSTCPU ".xml.tmp" #define LOCAL_REGISTRY_DIR ".gstreamer-"GST_MAJORMINOR #define LOCAL_REGISTRY_FILE LOCAL_REGISTRY_DIR"/registry.xml" #define LOCAL_REGISTRY_FILE_TMP LOCAL_REGISTRY_DIR"/.registry.xml.tmp" +#define LOCAL_ARCH_REGISTRY_FILE LOCAL_REGISTRY_DIR"/registry-" HOSTCPU ".xml" +#define LOCAL_ARCH_REGISTRY_FILE_TMP LOCAL_REGISTRY_DIR"/.registry-" HOSTCPU ".xml.tmp" /* compatibility for pre-POSIX defines */ #ifdef S_IRUSR Index: gstreamer/gst/gst.c =================================================================== --- gstreamer.orig/gst/gst.c +++ gstreamer/gst/gst.c @@ -497,7 +497,7 @@ init_pre (void) const gchar *homedir; _global_registry = - gst_xml_registry_new ("global_registry", GLOBAL_REGISTRY_FILE); + gst_xml_registry_new ("global_registry", GLOBAL_ARCH_REGISTRY_FILE); #ifdef PLUGINS_USE_BUILDDIR /* location libgstelements.so */ @@ -517,7 +517,7 @@ init_pre (void) user_reg = g_strdup (g_getenv ("GST_REGISTRY")); } else { homedir = g_get_home_dir (); - user_reg = g_strjoin ("/", homedir, LOCAL_REGISTRY_FILE, NULL); + user_reg = g_build_filename (homedir, LOCAL_ARCH_REGISTRY_FILE, NULL); } _user_registry = gst_xml_registry_new ("user_registry", user_reg); gstreamer-0.8.9-cast-fix.patch: --- NEW FILE gstreamer-0.8.9-cast-fix.patch --- --- gstreamer-0.8.9/gst/cothreads.c.cast-fix 2005-03-03 14:55:10.000000000 -0500 +++ gstreamer-0.8.9/gst/cothreads.c 2005-03-03 14:56:53.000000000 -0500 @@ -651,10 +651,14 @@ makecontext (&ucp, cothread_stub, 0); setcontext (&ucp); #else - GST_ARCH_SETUP_STACK ((char *) cothread->sp); - GST_ARCH_SET_SP (cothread->sp); - /* start it */ - GST_ARCH_CALL (cothread_stub); + { + char *charp_sp; + charp_sp = (char *) cothread->sp; + GST_ARCH_SETUP_STACK (charp_sp); + GST_ARCH_SET_SP (cothread->sp); + /* start it */ + GST_ARCH_CALL (cothread_stub); + } #endif GST_CAT_DEBUG (GST_CAT_COTHREADS, "exit thread "); --- NEW FILE gstreamer08.spec --- %define gstreamer gstreamer08 %define majmin 0.8 %define _glib2 2.3.0 %define _libxml2 2.4.9 %define po_package gstreamer-%{majmin} %define DOCBOOK_DTD_PATH `xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.2//EN" | sed -e "s#file://##g"` Name: %{gstreamer} Version: 0.8.12 Release: 3 Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia License: LGPL URL: http://gstreamer.freedesktop.org/ Source: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.bz2 Patch0: gstreamer-0.8.11-lib64.patch # There was problems generating pdf and postscript: Patch1: gstreamer-0.7.5-nops.patch Patch2: gstreamer-0.8.9-cast-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= %_glib2 BuildRequires: libxml2-devel >= %_libxml2 BuildRequires: gtk-doc >= 1.1 BuildRequires: ghostscript BuildRequires: gettext-devel ### documentation requirements BuildRequires: xfig BuildRequires: python2 BuildRequires: netpbm-progs Requires: popt > 1.6 Requires(post): coreutils Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description GStreamer is a streaming-media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. Its plugin-based architecture means that new data types or processing capabilities can be added simply by installing new plugins. %package devel Summary: Libraries/include files for GStreamer streaming media framework Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: glib2-devel >= %_glib2 Requires: libxml2-devel >= %_libxml2 %description devel GStreamer is a streaming-media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. Its plugin-based architecture means that new data types or processing capabilities can be added simply by installing new plugins. This package contains the libraries and includes files necessary to develop applications and plugins for GStreamer. %prep %setup -q -n gstreamer-%{version} %patch0 -p1 -b .lib64 %patch1 -p1 -b .nops %patch2 -p1 -b .cast-fix # openjade doesn't support xml catalogs, so we have to patch in the right dtd reference find -name "*.xml" | xargs grep -l "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" | xargs perl -pi -e 's#http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd#/usr/share/sgml/docbook/xml-dtd-4.2-1.0-30/docbookx.dtd#g' # The nopdf patch touches automake makefile sources NOCONFIGURE=1 ./autogen.sh %build ## FIXME should re-enable the docs build when it works %configure --disable-plugin-builddir --disable-tests --disable-examples \ --with-cachedir=%{_localstatedir}/cache/gstreamer-%{majmin} \ --enable-docs-build --disable-docbook --disable-static \ --disable-rpath --enable-debug make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # Install doc temporarily in order to be included later by rpm make DESTDIR=${RPM_BUILD_ROOT} docdir=/installed-doc install mv ${RPM_BUILD_ROOT}/installed-doc $(pwd)/installed-doc mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majmin} rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majmin}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0 # remove tools, provided by the 0.10 version now for a in launch inspect register xmllaunch complete compprep feedback md5sum typefind xmlinspect do rm $RPM_BUILD_ROOT%{_bindir}/gst-$a done # can't wildcard, will remove the -0.8 versions rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-i386 || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-i686 || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-x86_64 || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-ppc || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-powerpc || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-powerpc64 || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-s390 || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-s390x || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-ia64 || true %find_lang %{po_package} %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig env DISPLAY= %{_bindir}/gst-register-%{majmin} 1>/dev/null 2>&1 %postun -p /sbin/ldconfig %files -f %{po_package}.lang %defattr(-, root, root) %doc AUTHORS COPYING README TODO ABOUT-NLS REQUIREMENTS DOCBUILDING %dir %{_libdir}/gstreamer-%{majmin} %dir %{_localstatedir}/cache/gstreamer-%{majmin} %{_libdir}/gstreamer-%{majmin}/*.so* %{_libdir}/*.so.* %{_bindir}/*-%{majmin} %{_libexecdir}/*-%{majmin} %{_mandir}/man1/*-%{majmin}.1.gz %files devel %defattr(-, root, root) %doc installed-doc/* %dir %{_includedir}/gstreamer-%{majmin} %{_includedir}/gstreamer-%{majmin}/* %{_libdir}/libgstreamer-%{majmin}.so %{_libdir}/libgstcontrol-%{majmin}.so %{_libdir}/pkgconfig/gstreamer*.pc %{_datadir}/aclocal/* %{_datadir}/gtk-doc/html/* %changelog * Sat Mar 4 2006 Brian Pepple - 0.8.12-3 - Fix rpath issues (Thanks to Michael Schwendt). * Thu Feb 23 2006 Brian Pepple - 0.8.12-2 - Use --disable-rpath & --disable-static. - Drop period in devel summary. * Thu Feb 16 2006 Brian Pepple - 0.8.12-1 - Use preferred buildroot. - Update to 0.8.12. - Drop requires for glib2 & libxml2, devel sonames pull these in. - Remove unnecessary BR (zlib-devel, docbook-style-xsl, docbook-utils, cvs, docbook-dtds, openjade, docbook-style-dsssl, transfig, autoconf, automake, bison, flex, popt). * Tue Jan 10 2006 Bill Nottingham 0.8.11-3 - requires(pre) coreutils, since we call env * Wed Jan 04 2006 Warren Togami 0.8.11-2 - explicitly list archs to remove for gst-register - attempt to workaround openjade problem * Fri Dec 16 2005 Thomas Vander Stichele 0.8.11-1 - Update to upstream 0.8.11 * Tue May 03 2005 John (J5) Palmieri 0.8.10-1 - Update to upstream 0.8.10 * Thu Mar 17 2005 Colin Walters 0.8.9-4 - Rebuild to make it through beehive * Wed Mar 03 2005 John (J5) Palmieri 0.8.9-3 - add gstreamer-0.8.9-cast-fix.patch which casts the variable before sending it into the macro - update openjade hack to refrence xml-dtd-4.2-1.0-26 * Wed Mar 03 2005 John (J5) Palmieri 0.8.9-2 - rebuild with gcc 4.0 * Wed Feb 9 2005 Matthias Clasen 0.8.9-1 - Update to 0.8.9 * Mon Jan 10 2005 Colin Walters 0.8.8-2 - Updated gstreamer-0.8.8-lib64.patch which does not rename tools such as gst-launch to e.g. gst-launch-i686. * Mon Jan 03 2005 Colin Walters 0.8.8-1 - Update to 0.8.8 - Remove upstreamed escape-uris patch - Readd redirection of register output to /dev/null * Tue Nov 09 2004 Colin Walters 0.8.7-6 - Add initial lib64 patch. * Tue Oct 26 2004 Colin Walters 0.8.7-5 - Do not override docdir (126860) - Remove datadir/gstreamer-%{majmin}/doc from files list * Wed Oct 20 2004 Colin Walters 0.8.7-4 - Add URI escaping patch from Ronald (136507) * Wed Oct 13 2004 Colin Walters 0.8.7-3 - Quote %%configure in changelog (135412) * Thu Oct 07 2004 Colin Walters 0.8.7-2 - BuildRequire gettext-devel * Wed Oct 6 2004 Alexander Larsson - 0.8.7-1 - update to 0.8.7 * Tue Oct 5 2004 Alexander Larsson - 0.8.6-1 - update to 0.8.6 - Put the real lib .so symlinks in the -devel package - Do not put .so plugins in the -devel package - Correct docbook dtd version reference * Tue Sep 28 2004 Colin Walters 0.8.5-2 - Move .so symlinks to -devel package * Tue Aug 16 2004 Colin Walters 0.8.5-1 - Update to 0.8.5 * Tue Jul 26 2004 Colin Walters 0.8.4-1 - Update to 0.8.4 * Tue Jul 20 2004 Colin Walters 0.8.3.3-1 - Update * Tue Jul 05 2004 Colin Walters 0.8.3-3 - Another rebuild to placate beehive! * Tue Jul 05 2004 Colin Walters 0.8.3-2 - Rebuild to placate beehive * Wed Jun 23 2004 Colin Walters 0.8.3-1 - Update to 0.8.3, now that I am convinced it is safe. - Remove backported cpufix patch. - "cvs remove" a bunch of obsoleted patches. * Mon Jun 21 2004 Colin Walters 0.8.1-5 - BuildRequire gettext-devel * Mon Jun 21 2004 Colin Walters 0.8.1-4 - BuildRequire ghostscript * Mon Jun 21 2004 Colin Walters 0.8.1-3 - Apply register-clobbering patch from upstream CVS. * Tue Jun 15 2004 Elliot Lee 0.8.1-2 - rebuilt * Mon Apr 15 2004 Colin Walters 0.8.1-1 - Update to 0.8.1 - Delete registry patches which have been upstreamed - COPYING.LIB is gone * Mon Apr 05 2004 Colin Walters 0.8.0-4 - I have discovered that it is helpful, when adding patches to a package, to actually add the "%patchN" lines. * Mon Mar 22 2004 Colin Walters 0.8.0-3 - Add BuildRequires on flex - Add patch to avoid calling opendir() on files * Mon Mar 22 2004 Colin Walters 0.8.0-2 - Add patch to avoid setting mtime on registry * Tue Mar 16 2004 Alex Larsson 0.8.0-1 - update to 0.8.0 * Wed Mar 10 2004 Alexander Larsson 0.7.6-1 - update to 0.7.6 * Thu Mar 4 2004 Jeremy Katz - 0.7.5-2 - fix plugin dir with respect to %%_lib * Tue Mar 02 2004 Elliot Lee - rebuilt * Tue Feb 24 2004 Alexander Larsson 0.7.5-1 - update to 0.7.5 - clean up specfile some - enable docs * Fri Feb 13 2004 Elliot Lee - rebuilt * Wed Feb 4 2004 Bill Nottingham 0.7.3-4 - fix %%post * Wed Jan 28 2004 Alexander Larsson 0.7.3-3 - add s390 patch * Tue Jan 27 2004 Jonathan Blandford 0.7.3-1 - new version * Thu Sep 11 2003 Alexander Larsson 0.6.3-1 - Update to 0.6.3 (gnome 2.4 final) * Tue Aug 19 2003 Alexander Larsson 0.6.2-6 - 0.6.2 * Wed Jun 04 2003 Elliot Lee - rebuilt * Mon Feb 17 2003 Elliot Lee 0.6.0-5 - ppc64 patch * Wed Feb 12 2003 Bill Nottingham 0.6.0-4 - fix group * Tue Feb 11 2003 Bill Nottingham 0.6.0-3 - prereq, not require, gstreamer-tools * Tue Feb 11 2003 Jonathan Blandford 0.6.0-2 - unset the DISPLAY when running gst-register * Mon Feb 3 2003 Jonathan Blandford 0.6.0-1 - yes it is needed. Readding * Sat Feb 01 2003 Florian La Roche - remove "tools" sub-rpm, this is not needed at all * Thu Jan 30 2003 Jonathan Blandford 0.5.2-7 - stopped using %%configure so we need to pass in all the args * Mon Jan 27 2003 Jonathan Blandford - remove -Werror explicitly as the configure macro isn't working. * Wed Jan 22 2003 Tim Powers - rebuilt * Thu Dec 19 2002 Elliot Lee 0.5.0-10 - Add patch1 to fix C++ plugins on ia64 * Wed Dec 18 2002 Jonathan Blandford - %post -p was wrong * Tue Dec 17 2002 Jonathan Blandford 0.5.0-7 - explicitly add %{_libdir}/libgstreamer-{majmin}.so - explicitly add %{_libdir}/libgstcontrol-{majmin}.so * Mon Dec 16 2002 Jonathan Blandford - bump release * Fri Dec 13 2002 Jonathan Blandford - move .so files out of -devel * Tue Dec 10 2002 Jonathan Blandford - new version 0.5.0 - require docbook-style-xsl - add gstreamer-tools package too - New patch to use the right docbook prefix. * Tue Dec 10 2002 Jonathan Blandford - downgrade to a release candidate. Should work better on other arches - build without Werror * Mon Dec 9 2002 Jonathan Blandford - update to new version. Remove ExcludeArch * Tue Dec 3 2002 Havoc Pennington - excludearch some arches * Mon Dec 2 2002 Havoc Pennington - import into CVS and build "officially" - use smp_mflags - temporarily disable docs build, doesn't seem to work * Thu Nov 7 2002 Jeremy Katz - 0.4.2 * Mon Sep 23 2002 Jeremy Katz - 0.4.1 * Sun Sep 22 2002 Jeremy Katz - minor cleanups * Sat Jun 22 2002 Thomas Vander Stichele - moved header location * Mon Jun 17 2002 Thomas Vander Stichele - added popt - removed .la * Fri Jun 07 2002 Thomas Vander Stichele - added release of gstreamer to req of gstreamer-devel - changed location of API docs to be in gtk-doc like other gtk-doc stuff - reordered SPEC file * Mon Apr 29 2002 Thomas Vander Stichele - moved html docs to gtk-doc standard directory * Tue Mar 5 2002 Thomas Vander Stichele - move version defines of glib2 and libxml2 to configure.ac - add BuildRequires for these two libs * Sun Mar 3 2002 Thomas Vander Stichele - put html docs in canonical place, avoiding %doc erasure - added devhelp support, current install of it is hackish * Sat Mar 2 2002 Christian Schaller - Added documentation to build * Mon Feb 11 2002 Thomas Vander Stichele - added libgstbasicscheduler - renamed libgst to libgstreamer * Fri Jan 04 2002 Christian Schaller - Added configdir parameter as it seems the configdir gets weird otherwise * Thu Jan 03 2002 Thomas Vander Stichele - split off gstreamer-editor from core - removed gstreamer-gnome-apps * Sat Dec 29 2001 Rodney Dawes - Cleaned up the spec file for the gstreamer core/plug-ins split - Improve spec file * Sat Dec 15 2001 Christian Schaller - Split of more plugins from the core and put them into their own modules - Includes colorspace, xfree and wav - Improved package Require lines - Added mp3encode (lame based) to the SPEC * Wed Dec 12 2001 Christian Schaller - Thomas merged mpeg plugins into one * Sat Dec 08 2001 Christian Schaller - More minor cleanups including some fixed descriptions from Andrew Mitchell * Fri Dec 07 2001 Christian Schaller - Added logging to the make statement * Wed Dec 05 2001 Christian Schaller - Updated in preparation for 0.3.0 release * Fri Jun 29 2001 Christian Schaller - Updated for 0.2.1 release - Split out the GUI packages into their own RPM - added new plugins (FLAC, festival, quicktime etc.) * Sat Jun 09 2001 Christian Schaller - Visualisation plugins bundled out togheter - Moved files sections up close to their respective descriptions * Sat Jun 02 2001 Christian Schaller - Split the package into separate RPMS, putting most plugins out by themselves. * Fri Jun 01 2001 Christian Schaller - Updated with change suggestions from Dennis Bjorklund * Tue Jan 09 2001 Erik Walthinsen - updated to build -devel package as well * Sun Jan 30 2000 Erik Walthinsen - first draft of spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gstreamer08/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2006 14:40:38 -0000 1.1 +++ .cvsignore 5 Mar 2006 14:41:39 -0000 1.2 @@ -0,0 +1 @@ +gstreamer-0.8.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gstreamer08/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2006 14:40:38 -0000 1.1 +++ sources 5 Mar 2006 14:41:39 -0000 1.2 @@ -0,0 +1 @@ +80f3c4957ab3e254cc90016f87ba5482 gstreamer-0.8.12.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 5 14:54:00 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:54:00 -0500 Subject: devel/libcmml .cvsignore, 1.2, 1.3 libcmml.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603051454.k25EsWLZ028024@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libcmml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27993 Modified Files: .cvsignore libcmml.spec sources Log Message: new release; rebuild for FE5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/libcmml/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jun 2005 18:15:19 -0000 1.2 +++ .cvsignore 5 Mar 2006 14:53:59 -0000 1.3 @@ -1 +1 @@ -libcmml-0.9.0.tar.gz +libcmml-0.9.1.tar.gz Index: libcmml.spec =================================================================== RCS file: /cvs/extras/devel/libcmml/libcmml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libcmml.spec 16 Jun 2005 19:06:23 -0000 1.2 +++ libcmml.spec 5 Mar 2006 14:53:59 -0000 1.3 @@ -1,6 +1,6 @@ Name: libcmml -Version: 0.9.0 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Library for handling Continuous Media Markup Language Group: System Environment/Libraries @@ -86,6 +86,10 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.1-1 +- new upstream release + * Thu Jun 16 2005 Thomas Vander Stichele - 0.9.0-2: suggestions from Ville Index: sources =================================================================== RCS file: /cvs/extras/devel/libcmml/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 18:15:19 -0000 1.2 +++ sources 5 Mar 2006 14:53:59 -0000 1.3 @@ -1 +1 @@ -1b994bf38ee4be6ad168047c3a8b2331 libcmml-0.9.0.tar.gz +f74413fd4f10b01cdce55752b1df2497 libcmml-0.9.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 15:04:00 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 10:04:00 -0500 Subject: rpms/gstreamer08/devel gstreamer08.spec,1.1,1.2 Message-ID: <200603051504.k25F4bNl030010@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29993 Modified Files: gstreamer08.spec Log Message: * Sun Mar 5 2006 Brian Pepple - 0.8.12-4 - Add dist tag. Index: gstreamer08.spec =================================================================== RCS file: /cvs/extras/rpms/gstreamer08/devel/gstreamer08.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gstreamer08.spec 5 Mar 2006 14:41:39 -0000 1.1 +++ gstreamer08.spec 5 Mar 2006 15:04:00 -0000 1.2 @@ -10,7 +10,7 @@ Name: %{gstreamer} Version: 0.8.12 -Release: 3 +Release: 4%{?dist} Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia @@ -150,6 +150,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Sun Mar 5 2006 Brian Pepple - 0.8.12-4 +- Add dist tag. + * Sat Mar 4 2006 Brian Pepple - 0.8.12-3 - Fix rpath issues (Thanks to Michael Schwendt). From fedora-extras-commits at redhat.com Sun Mar 5 15:07:45 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 10:07:45 -0500 Subject: owners owners.list,1.708,1.709 Message-ID: <200603051508.k25F8Sp6030103@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30086 Modified Files: owners.list Log Message: Add gstreamer08 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.708 retrieving revision 1.709 diff -u -r1.708 -r1.709 --- owners.list 5 Mar 2006 11:15:36 -0000 1.708 +++ owners.list 5 Mar 2006 15:07:39 -0000 1.709 @@ -381,6 +381,7 @@ Fedora Extras|grip|Front-end for CD rippers and Ogg Vorbis encoders|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gstreamer-python|Python bindings for GStreamer|thomas at apestaart.org|extras-qa at fedoraproject.org| +Fedora Extras|gstreamer08|GStreamer streaming media framework runtime|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gstreamer08-python|Python bindings for GStreamer 0.8|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 5 15:09:23 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:09:23 -0500 Subject: devel/libannodex libannodex.man.patch, NONE, 1.1 libannodex.spec, 1.3, 1.4 Message-ID: <200603051509.k25F9thC030143@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libannodex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30119 Modified Files: libannodex.spec Added Files: libannodex.man.patch Log Message: add patch libannodex.man.patch: --- NEW FILE libannodex.man.patch --- Index: configure.ac =================================================================== --- configure.ac (revision 2140) +++ configure.ac (working copy) @@ -38,8 +38,8 @@ fi # Check for docbook -AC_CHECK_PROG(HAVE_DOCBOOKTOMAN, docbook-to-man, true, false) -AM_CONDITIONAL(HAVE_DOCBOOKTOMAN,$HAVE_DOCBOOKTOMAN) +AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, false) +AM_CONDITIONAL(HAVE_DOCBOOKTOMAN, test "x$DOCBOOKTOMAN" != "xfalse") AC_CHECK_PROG(HAVE_DOCBOOK2HTML, docbook2html, true, false) AM_CONDITIONAL(HAVE_DOCBOOK2HTML,$HAVE_DOCBOOK2HTML) Index: doc/Makefile.am =================================================================== --- doc/Makefile.am (revision 2140) +++ doc/Makefile.am (working copy) @@ -64,7 +64,7 @@ if HAVE_DOCBOOKTOMAN %.1: %.1.sgml - docbook-to-man $< > $@ + $(DOCBOOKTOMAN) $< > $@ else %.1: %.1.sgml endif Index: libannodex.spec =================================================================== RCS file: /cvs/extras/devel/libannodex/libannodex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libannodex.spec 5 Mar 2006 14:31:36 -0000 1.3 +++ libannodex.spec 5 Mar 2006 15:09:22 -0000 1.4 @@ -1,12 +1,13 @@ Name: libannodex Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for annotating and indexing networked media Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/libannodex/download/%{name}-%{version}.tar.gz +Patch: libannodex.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -17,6 +18,11 @@ BuildRequires: libcmml-devel >= 0.8 BuildRequires: libsndfile-devel +# because of patch +BuildRequires: libtool +BuildRequires: autoconf +BuildRequires: automake + # libtool BuildRequires: gcc-c++ @@ -40,6 +46,12 @@ %prep %setup -q -n %{name}-%{version} +%patch + +aclocal -I m4 +libtoolize +autoconf +automake %build %configure @@ -91,6 +103,10 @@ %changelog * Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-2 +- added patch for man pages + +* Sun Mar 05 2006 Thomas Vander Stichele - 0.7.3-1 - new upstream release - rebuilt for FE5 From fedora-extras-commits at redhat.com Sun Mar 5 15:12:18 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:12:18 -0500 Subject: rpms/libcmml/FC-4 .cvsignore, 1.2, 1.3 libcmml.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603051512.k25FCq4G030225@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libcmml/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30199 Modified Files: .cvsignore libcmml.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jun 2005 18:15:19 -0000 1.2 +++ .cvsignore 5 Mar 2006 15:12:18 -0000 1.3 @@ -1 +1 @@ -libcmml-0.9.0.tar.gz +libcmml-0.9.1.tar.gz Index: libcmml.spec =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-4/libcmml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libcmml.spec 16 Jun 2005 19:06:23 -0000 1.2 +++ libcmml.spec 5 Mar 2006 15:12:18 -0000 1.3 @@ -1,6 +1,6 @@ Name: libcmml -Version: 0.9.0 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Library for handling Continuous Media Markup Language Group: System Environment/Libraries @@ -86,6 +86,10 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.1-1 +- new upstream release + * Thu Jun 16 2005 Thomas Vander Stichele - 0.9.0-2: suggestions from Ville Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 18:15:19 -0000 1.2 +++ sources 5 Mar 2006 15:12:18 -0000 1.3 @@ -1 +1 @@ -1b994bf38ee4be6ad168047c3a8b2331 libcmml-0.9.0.tar.gz +f74413fd4f10b01cdce55752b1df2497 libcmml-0.9.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 15:13:35 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:13:35 -0500 Subject: rpms/libcmml/FC-3 .cvsignore, 1.2, 1.3 libcmml.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603051514.k25FE7Oh030291@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libcmml/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30267 Modified Files: .cvsignore libcmml.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jun 2005 18:15:19 -0000 1.2 +++ .cvsignore 5 Mar 2006 15:13:34 -0000 1.3 @@ -1 +1 @@ -libcmml-0.9.0.tar.gz +libcmml-0.9.1.tar.gz Index: libcmml.spec =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-3/libcmml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libcmml.spec 16 Jun 2005 19:06:23 -0000 1.2 +++ libcmml.spec 5 Mar 2006 15:13:34 -0000 1.3 @@ -1,6 +1,6 @@ Name: libcmml -Version: 0.9.0 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Library for handling Continuous Media Markup Language Group: System Environment/Libraries @@ -86,6 +86,10 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.1-1 +- new upstream release + * Thu Jun 16 2005 Thomas Vander Stichele - 0.9.0-2: suggestions from Ville Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 18:15:19 -0000 1.2 +++ sources 5 Mar 2006 15:13:34 -0000 1.3 @@ -1 +1 @@ -1b994bf38ee4be6ad168047c3a8b2331 libcmml-0.9.0.tar.gz +f74413fd4f10b01cdce55752b1df2497 libcmml-0.9.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 15:24:48 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:24:48 -0500 Subject: devel/libannodex libannodex.spec,1.4,1.5 Message-ID: <200603051525.k25FPKtw030418@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libannodex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30400 Modified Files: libannodex.spec Log Message: add buildrequires Index: libannodex.spec =================================================================== RCS file: /cvs/extras/devel/libannodex/libannodex.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libannodex.spec 5 Mar 2006 15:09:22 -0000 1.4 +++ libannodex.spec 5 Mar 2006 15:24:48 -0000 1.5 @@ -1,6 +1,6 @@ Name: libannodex Version: 0.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for annotating and indexing networked media Group: System Environment/Libraries @@ -13,6 +13,7 @@ Requires(post): /sbin/ldconfig BuildRequires: doxygen +BuildRequires: docbook-utils BuildRequires: libogg-devel >= 1.0 BuildRequires: liboggz-devel >= 0.9.1 BuildRequires: libcmml-devel >= 0.8 @@ -103,6 +104,10 @@ %changelog * Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-3 +- added docbook-utils, needed for man page build + +* Sun Mar 05 2006 Thomas Vander Stichele - 0.7.3-2 - added patch for man pages From fedora-extras-commits at redhat.com Sun Mar 5 15:44:04 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:44:04 -0500 Subject: rpms/libannodex/FC-4 libannodex.man.patch, NONE, 1.1 libannodex.spec, 1.3, 1.4 Message-ID: <200603051544.k25Fia7m030529@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30489 Modified Files: libannodex.spec Added Files: libannodex.man.patch Log Message: new version libannodex.man.patch: --- NEW FILE libannodex.man.patch --- Index: configure.ac =================================================================== --- configure.ac (revision 2140) +++ configure.ac (working copy) @@ -38,8 +38,8 @@ fi # Check for docbook -AC_CHECK_PROG(HAVE_DOCBOOKTOMAN, docbook-to-man, true, false) -AM_CONDITIONAL(HAVE_DOCBOOKTOMAN,$HAVE_DOCBOOKTOMAN) +AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, false) +AM_CONDITIONAL(HAVE_DOCBOOKTOMAN, test "x$DOCBOOKTOMAN" != "xfalse") AC_CHECK_PROG(HAVE_DOCBOOK2HTML, docbook2html, true, false) AM_CONDITIONAL(HAVE_DOCBOOK2HTML,$HAVE_DOCBOOK2HTML) Index: doc/Makefile.am =================================================================== --- doc/Makefile.am (revision 2140) +++ doc/Makefile.am (working copy) @@ -64,7 +64,7 @@ if HAVE_DOCBOOKTOMAN %.1: %.1.sgml - docbook-to-man $< > $@ + $(DOCBOOKTOMAN) $< > $@ else %.1: %.1.sgml endif Index: libannodex.spec =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-4/libannodex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libannodex.spec 5 Mar 2006 14:35:07 -0000 1.3 +++ libannodex.spec 5 Mar 2006 15:44:03 -0000 1.4 @@ -1,22 +1,29 @@ Name: libannodex Version: 0.7.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Library for annotating and indexing networked media Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/libannodex/download/%{name}-%{version}.tar.gz +Patch: libannodex.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig BuildRequires: doxygen +BuildRequires: docbook-utils BuildRequires: libogg-devel >= 1.0 BuildRequires: liboggz-devel >= 0.9.1 BuildRequires: libcmml-devel >= 0.8 BuildRequires: libsndfile-devel +# because of patch +BuildRequires: libtool +BuildRequires: autoconf +BuildRequires: automake + # libtool BuildRequires: gcc-c++ @@ -40,6 +47,12 @@ %prep %setup -q -n %{name}-%{version} +%patch + +aclocal -I m4 +libtoolize +autoconf +automake %build %configure @@ -58,7 +71,7 @@ %clean rm -rf $RPM_BUILD_ROOT - + %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README @@ -91,7 +104,16 @@ %changelog * Sun Mar 05 2006 Thomas Vander Stichele -- 0.7.3-1: new upstream release +- 0.7.3-3 +- added docbook-utils, needed for man page build + +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-2 +- added patch for man pages + +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-1 +- new upstream release * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release From fedora-extras-commits at redhat.com Sun Mar 5 15:44:19 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:44:19 -0500 Subject: devel/libannodex libannodex.spec,1.5,1.6 Message-ID: <200603051544.k25FipWt030565@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libannodex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30512 Modified Files: libannodex.spec Log Message: removed a line, easier to keep in sync between versions Index: libannodex.spec =================================================================== RCS file: /cvs/extras/devel/libannodex/libannodex.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libannodex.spec 5 Mar 2006 15:24:48 -0000 1.5 +++ libannodex.spec 5 Mar 2006 15:44:19 -0000 1.6 @@ -114,7 +114,6 @@ * Sun Mar 05 2006 Thomas Vander Stichele - 0.7.3-1 - new upstream release -- rebuilt for FE5 * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release From fedora-extras-commits at redhat.com Sun Mar 5 15:45:30 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:45:30 -0500 Subject: rpms/libannodex/FC-3 libannodex.spec,1.3,1.4 Message-ID: <200603051546.k25Fk2gD030593@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30576 Modified Files: libannodex.spec Log Message: new version Index: libannodex.spec =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-3/libannodex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libannodex.spec 5 Mar 2006 14:32:49 -0000 1.3 +++ libannodex.spec 5 Mar 2006 15:45:30 -0000 1.4 @@ -1,22 +1,29 @@ Name: libannodex Version: 0.7.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Library for annotating and indexing networked media Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/libannodex/download/%{name}-%{version}.tar.gz +Patch: libannodex.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig BuildRequires: doxygen +BuildRequires: docbook-utils BuildRequires: libogg-devel >= 1.0 BuildRequires: liboggz-devel >= 0.9.1 BuildRequires: libcmml-devel >= 0.8 BuildRequires: libsndfile-devel +# because of patch +BuildRequires: libtool +BuildRequires: autoconf +BuildRequires: automake + # libtool BuildRequires: gcc-c++ @@ -40,6 +47,12 @@ %prep %setup -q -n %{name}-%{version} +%patch + +aclocal -I m4 +libtoolize +autoconf +automake %build %configure @@ -58,7 +71,7 @@ %clean rm -rf $RPM_BUILD_ROOT - + %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README @@ -91,7 +104,16 @@ %changelog * Sun Mar 05 2006 Thomas Vander Stichele -- 0.7.3-1: new upstream release +- 0.7.3-3 +- added docbook-utils, needed for man page build + +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-2 +- added patch for man pages + +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-1 +- new upstream release * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release From fedora-extras-commits at redhat.com Sun Mar 5 15:47:35 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:47:35 -0500 Subject: rpms/libannodex/FC-3 libannodex.man.patch,NONE,1.1 Message-ID: <200603051547.k25FlbeX030652@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30640 Added Files: libannodex.man.patch Log Message: add patch libannodex.man.patch: --- NEW FILE libannodex.man.patch --- Index: configure.ac =================================================================== --- configure.ac (revision 2140) +++ configure.ac (working copy) @@ -38,8 +38,8 @@ fi # Check for docbook -AC_CHECK_PROG(HAVE_DOCBOOKTOMAN, docbook-to-man, true, false) -AM_CONDITIONAL(HAVE_DOCBOOKTOMAN,$HAVE_DOCBOOKTOMAN) +AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, false) +AM_CONDITIONAL(HAVE_DOCBOOKTOMAN, test "x$DOCBOOKTOMAN" != "xfalse") AC_CHECK_PROG(HAVE_DOCBOOK2HTML, docbook2html, true, false) AM_CONDITIONAL(HAVE_DOCBOOK2HTML,$HAVE_DOCBOOK2HTML) Index: doc/Makefile.am =================================================================== --- doc/Makefile.am (revision 2140) +++ doc/Makefile.am (working copy) @@ -64,7 +64,7 @@ if HAVE_DOCBOOKTOMAN %.1: %.1.sgml - docbook-to-man $< > $@ + $(DOCBOOKTOMAN) $< > $@ else %.1: %.1.sgml endif From fedora-extras-commits at redhat.com Sun Mar 5 15:54:08 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:54:08 -0500 Subject: devel/liboggz .cvsignore, 1.4, 1.5 liboggz.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603051554.k25FsfSH030867@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/liboggz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30839 Modified Files: .cvsignore liboggz.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/liboggz/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Nov 2005 10:49:01 -0000 1.4 +++ .cvsignore 5 Mar 2006 15:54:08 -0000 1.5 @@ -1 +1 @@ -liboggz-0.9.3.tar.gz +liboggz-0.9.4.tar.gz Index: liboggz.spec =================================================================== RCS file: /cvs/extras/devel/liboggz/liboggz.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liboggz.spec 13 Nov 2005 10:52:45 -0000 1.5 +++ liboggz.spec 5 Mar 2006 15:54:08 -0000 1.6 @@ -7,18 +7,12 @@ License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz -Patch: liboggz.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel >= 1.0 BuildRequires: doxygen BuildRequires: docbook-utils -# because of patch -BuildRequires: libtool -BuildRequires: autoconf -BuildRequires: automake - # libtool BuildRequires: gcc-c++ @@ -44,12 +38,6 @@ %prep %setup -q -n %{name}-%{version} -%patch - -aclocal -I m4 -libtoolize -autoconf -automake %build %configure @@ -90,6 +78,11 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.4-1 +- new upstream release +- removed patch, was applied upstream + * Sat Nov 12 2005 Thomas Vander Stichele - 0.9.3-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/devel/liboggz/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Nov 2005 10:49:01 -0000 1.4 +++ sources 5 Mar 2006 15:54:08 -0000 1.5 @@ -1 +1 @@ -0e0475196418c63ac20cd6e7a91531e6 liboggz-0.9.3.tar.gz +e46b4e8161e16a41f8035363fb1603dd liboggz-0.9.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 15:55:24 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:55:24 -0500 Subject: rpms/libannodex/FC-3 libannodex.autotools.patch, 1.1, NONE libannodex.cmml.patch, 1.1, NONE Message-ID: <200603051555.k25FtQvE030895@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30886 Removed Files: libannodex.autotools.patch libannodex.cmml.patch Log Message: remove old patches --- libannodex.autotools.patch DELETED --- --- libannodex.cmml.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 5 15:56:11 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:56:11 -0500 Subject: rpms/libannodex/FC-4 libannodex.autotools.patch, 1.1, NONE libannodex.cmml.patch, 1.1, NONE Message-ID: <200603051556.k25FuD4M030923@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30914 Removed Files: libannodex.autotools.patch libannodex.cmml.patch Log Message: remove old patches --- libannodex.autotools.patch DELETED --- --- libannodex.cmml.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 5 15:59:22 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:59:22 -0500 Subject: devel/liboggz liboggz.spec,1.6,1.7 Message-ID: <200603051559.k25Fxsrh031001@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/liboggz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30979 Modified Files: liboggz.spec Log Message: new version Index: liboggz.spec =================================================================== RCS file: /cvs/extras/devel/liboggz/liboggz.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- liboggz.spec 5 Mar 2006 15:54:08 -0000 1.6 +++ liboggz.spec 5 Mar 2006 15:59:22 -0000 1.7 @@ -1,6 +1,6 @@ Name: liboggz -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.4 +Release: 1%{?dist} Summary: Simple programming interface for Ogg files and streams Group: System Environment/Libraries From fedora-extras-commits at redhat.com Sun Mar 5 16:00:57 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 11:00:57 -0500 Subject: rpms/liboggz/FC-4 .cvsignore, 1.4, 1.5 liboggz.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603051601.k25G1TTE000449@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/liboggz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31077 Modified Files: .cvsignore liboggz.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Nov 2005 10:49:01 -0000 1.4 +++ .cvsignore 5 Mar 2006 16:00:56 -0000 1.5 @@ -1 +1 @@ -liboggz-0.9.3.tar.gz +liboggz-0.9.4.tar.gz Index: liboggz.spec =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-4/liboggz.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liboggz.spec 13 Nov 2005 10:52:45 -0000 1.5 +++ liboggz.spec 5 Mar 2006 16:00:56 -0000 1.6 @@ -1,24 +1,18 @@ Name: liboggz -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.4 +Release: 1%{?dist} Summary: Simple programming interface for Ogg files and streams Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz -Patch: liboggz.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel >= 1.0 BuildRequires: doxygen BuildRequires: docbook-utils -# because of patch -BuildRequires: libtool -BuildRequires: autoconf -BuildRequires: automake - # libtool BuildRequires: gcc-c++ @@ -44,12 +38,6 @@ %prep %setup -q -n %{name}-%{version} -%patch - -aclocal -I m4 -libtoolize -autoconf -automake %build %configure @@ -90,6 +78,11 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.4-1 +- new upstream release +- removed patch, was applied upstream + * Sat Nov 12 2005 Thomas Vander Stichele - 0.9.3-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Nov 2005 10:49:01 -0000 1.4 +++ sources 5 Mar 2006 16:00:56 -0000 1.5 @@ -1 +1 @@ -0e0475196418c63ac20cd6e7a91531e6 liboggz-0.9.3.tar.gz +e46b4e8161e16a41f8035363fb1603dd liboggz-0.9.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 16:02:34 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 11:02:34 -0500 Subject: rpms/liboggz/FC-3 .cvsignore, 1.4, 1.5 liboggz.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603051603.k25G3BUm000524@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/liboggz/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv503 Modified Files: .cvsignore liboggz.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Nov 2005 10:49:01 -0000 1.4 +++ .cvsignore 5 Mar 2006 16:02:34 -0000 1.5 @@ -1 +1 @@ -liboggz-0.9.3.tar.gz +liboggz-0.9.4.tar.gz Index: liboggz.spec =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-3/liboggz.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liboggz.spec 13 Nov 2005 10:52:45 -0000 1.5 +++ liboggz.spec 5 Mar 2006 16:02:34 -0000 1.6 @@ -1,24 +1,18 @@ Name: liboggz -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.4 +Release: 1%{?dist} Summary: Simple programming interface for Ogg files and streams Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz -Patch: liboggz.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel >= 1.0 BuildRequires: doxygen BuildRequires: docbook-utils -# because of patch -BuildRequires: libtool -BuildRequires: autoconf -BuildRequires: automake - # libtool BuildRequires: gcc-c++ @@ -44,12 +38,6 @@ %prep %setup -q -n %{name}-%{version} -%patch - -aclocal -I m4 -libtoolize -autoconf -automake %build %configure @@ -90,6 +78,11 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.4-1 +- new upstream release +- removed patch, was applied upstream + * Sat Nov 12 2005 Thomas Vander Stichele - 0.9.3-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Nov 2005 10:49:01 -0000 1.4 +++ sources 5 Mar 2006 16:02:34 -0000 1.5 @@ -1 +1 @@ -0e0475196418c63ac20cd6e7a91531e6 liboggz-0.9.3.tar.gz +e46b4e8161e16a41f8035363fb1603dd liboggz-0.9.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 16:03:49 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 11:03:49 -0500 Subject: devel/mod_annodex mod_annodex.spec,1.1,1.2 Message-ID: <200603051604.k25G4NHJ000583@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/mod_annodex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv566 Modified Files: mod_annodex.spec Log Message: rebuild for FE5 Index: mod_annodex.spec =================================================================== RCS file: /cvs/extras/devel/mod_annodex/mod_annodex.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_annodex.spec 13 Jun 2005 18:42:46 -0000 1.1 +++ mod_annodex.spec 5 Mar 2006 16:03:48 -0000 1.2 @@ -1,6 +1,6 @@ Name: mod_annodex Version: 0.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache module for server-side support of annodex media Group: System Environment/Daemons @@ -71,6 +71,10 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.2.2-3 +- rebuild + * Mon Jun 13 2005 Thomas Vander Stichele - 0.2.2-2: rpmlint fixes From fedora-extras-commits at redhat.com Sun Mar 5 16:34:30 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 5 Mar 2006 11:34:30 -0500 Subject: rpms/regexxer/devel regexxer.spec,1.4,1.5 Message-ID: <200603051635.k25GZ2P7000780@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv763 Modified Files: regexxer.spec Log Message: 0.8-4: Fix #184001, #173869 and a typo Index: regexxer.spec =================================================================== RCS file: /cvs/extras/rpms/regexxer/devel/regexxer.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- regexxer.spec 15 Feb 2006 01:05:35 -0000 1.4 +++ regexxer.spec 5 Mar 2006 16:34:29 -0000 1.5 @@ -1,6 +1,6 @@ Name: regexxer Version: 0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A nifty GUI search/replace tool Group: Applications/Text @@ -26,6 +26,10 @@ %build +# Workaround for libglade bug (#184038) +%if "%{?fedora}" > "4" +CXXFLAGS="${RPM_OPT_FLAGS} -Wl,--export-dynamic" +%endif %configure make %{?_smp_mflags} @@ -53,7 +57,6 @@ export 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 @@ -61,7 +64,6 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : -killall -HUP gconfd-2 || : %preun @@ -69,7 +71,6 @@ export 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 @@ -84,7 +85,12 @@ %changelog -* Wed Feb 15 2006 Christoph Wickert - 0.8.3 +* Sun Mar 05 2006 Christoph Wickert - 0.8-4 +- Compile with "-Wl,--export-dynamic" on Core 5 (#184001). +- Don't kill gconfd in %pre, %post and %preun any longer (#173869). +- Fix typo in %changelog. + +* Wed Feb 15 2006 Christoph Wickert - 0.8-3 - Rebuild for Fedora Extras 5. * Wed Sep 23 2005 Christoph Wickert - 0.8-2 From fedora-extras-commits at redhat.com Sun Mar 5 16:53:39 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sun, 5 Mar 2006 11:53:39 -0500 Subject: rpms/shapelib/devel shapelib-1.2.10-Makefile.patch, NONE, 1.1 shapelib-1.2.10-Makefile2.patch, NONE, 1.1 shapelib.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200603051654.k25GsBFp000947@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/shapelib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv918 Modified Files: shapelib.spec sources Added Files: shapelib-1.2.10-Makefile.patch shapelib-1.2.10-Makefile2.patch Log Message: Updated with current cvs snapshot shapelib-1.2.10-Makefile.patch: --- NEW FILE shapelib-1.2.10-Makefile.patch --- --- shapelib-1.2.11-orig/Makefile 2006-01-07 13:06:27.000000000 -0800 +++ shapelib-1.2.11/Makefile 2006-03-04 19:58:22.000000000 -0800 @@ -1,11 +1,12 @@ - -#LINKOPT = /usr/local/lib/libdbmalloc.a -#LINKOPT = /usr/local/lib/cpl.a -CFLAGS = -g -#CFLAGS = -g -DUSE_CPL INSTALL = /usr/bin/install LD = /usr/bin/ld -#CC = g++ + +bindir = /usr/local/bin +libdir = /usr/local/lib +includedir = /usr/local/include + +CC = gcc +CFLAGS = -g default: all @@ -100,25 +101,25 @@ # The following is contributed by Jan-Oliver Wagner, and should allow for # creating shared libraries on most platforms with gcc, and libtool installed. -SHPLIB_VERSION=1.2.9 +SHPLIB_VERSION=1.2.11 LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry lib: - /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shpopen.c -o .libs/shpopen.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o >/dev/null 2>&1 + /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shpopen.c + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c -fPIC -DPIC shpopen.c -o .libs/shpopen.lo + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shpopen.c -o shpopen.o >/dev/null 2>&1 mv -f .libs/shpopen.lo shpopen.lo - /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c + /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shptree.c rm -f .libs/shptree.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shptree.c -o .libs/shptree.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o >/dev/null 2>&1 + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c -fPIC -DPIC shptree.c -o .libs/shptree.lo + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shptree.c -o shptree.o >/dev/null 2>&1 mv -f .libs/shptree.lo shptree.lo - /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c + /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c dbfopen.c rm -f .libs/dbfopen.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o >/dev/null 2>&1 + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c dbfopen.c -o dbfopen.o >/dev/null 2>&1 mv -f .libs/dbfopen.lo dbfopen.lo - /bin/sh ./libtool --mode=link gcc -g -O2 -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo + /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) $(LINKOPTS) -o libshp.la -rpath $(libdir) -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.* rm -fr .libs/libshp.lax mkdir .libs/libshp.lax @@ -133,15 +134,21 @@ lib_install: cp .libs/libshp.la .libs/libshp.lai - /bin/sh ./mkinstalldirs /usr/local/lib - /bin/sh ./libtool --mode=install $(INSTALL) -c libshp.la /usr/local/lib/libshp.la - $(INSTALL) -c .libs/libshp.so.$(LIBSHP_VERSION) /usr/local/lib/libshp.so.$(LIBSHP_VERSION) - (cd /usr/local/lib && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) - (cd /usr/local/lib && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) - chmod +x /usr/local/lib/libshp.so.$(LIBSHP_VERSION) - $(INSTALL) -c .libs/libshp.la /usr/local/lib/libshp.la - $(INSTALL) -c .libs/libshp.a /usr/local/lib/libshp.a - ranlib /usr/local/lib/libshp.a - chmod 644 /usr/local/lib/libshp.a - /bin/sh ./mkinstalldirs /usr/local/include/libshp - $(INSTALL) -c -m 644 shapefil.h /usr/local/include/libshp/shapefil.h + /bin/sh ./mkinstalldirs $(libdir) + /bin/sh ./libtool --mode=install $(INSTALL) -c libshp.la $(libdir)/libshp.la + $(INSTALL) -c .libs/libshp.so.$(LIBSHP_VERSION) $(libdir)/libshp.so.$(LIBSHP_VERSION) + (cd $(libdir) && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) + (cd $(libdir) && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) + chmod +x $(libdir)/libshp.so.$(LIBSHP_VERSION) + $(INSTALL) -c .libs/libshp.la $(libdir)/libshp.la + $(INSTALL) -c .libs/libshp.a $(libdir)/libshp.a + ranlib $(libdir)/libshp.a + chmod 644 $(libdir)/libshp.a + /bin/sh ./mkinstalldirs $(includedir)/libshp + $(INSTALL) -c -m 644 shapefil.h $(includedir)/libshp/shapefil.h + +bin_install: all + mkdir -p $(bindir) + install dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shptest $(bindir)/ + +install: bin_install lib_install shapelib-1.2.10-Makefile2.patch: --- NEW FILE shapelib-1.2.10-Makefile2.patch --- --- shapelib-1.2.11-orig/contrib/Makefile 2006-01-07 12:34:14.000000000 -0800 +++ shapelib-1.2.11/contrib/Makefile 2006-03-04 20:11:01.000000000 -0800 @@ -1,9 +1,10 @@ +bindir = /usr/local/bin #LINKOPT = /usr/local/lib/libdbmalloc.a #CFLAGS = -g # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN -ENDIAN = -D_LITTLE_ENDIAN +# ENDIAN = -D_LITTLE_ENDIAN CFLAGS = -g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 @@ -64,3 +65,7 @@ testproj: tests/shpproj.sh + +install: all + install dbfcat dbfinfo shpcat shpcentrd shpdata shpdxf shpfix shpinfo shpwkb shpproj \ + $(bindir) Index: shapelib.spec =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- shapelib.spec 5 Mar 2006 01:53:52 -0000 1.7 +++ shapelib.spec 5 Mar 2006 16:53:38 -0000 1.8 @@ -2,15 +2,14 @@ Summary: API in "C" for Shapefile handling Name: shapelib Version: 1.2.10 -Release: 9 +Release: 10.20060304cvs URL: http://shapelib.maptools.org/ Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz -Patch0: shapelib-%{version}.patch +Patch0: shapelib-1.2.10-Makefile.patch Patch1: shapelib-1.2.10-endian.patch -Patch2: shapelib-1.2.10-gcc4.patch +Patch2: shapelib-1.2.10-Makefile2.patch License: LGPL/MIT Group: Development/Libraries -Buildrequires: libtool BuildRequires: proj-devel >= 4.4.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,7 +31,7 @@ %setup -q -T -b 0 %patch -p1 -b .buildroot %patch1 -p1 -b .endian -%patch2 -p1 -b .gcc4 +%patch2 -p1 -b .buildroot %build make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib @@ -61,7 +60,7 @@ %{_bindir}/* %{_libdir}/*.so.* -%doc LICENSE.LGPL README README.tree dbf_api.html shapelib.html shp_api.html +%doc LICENSE.LGPL README README.tree web/*.html %doc contrib/doc/shpproj.txt stream1.sh stream1.out stream2.sh %doc stream2.out makeshape.sh stream3.out ChangeLog @@ -73,6 +72,9 @@ %exclude %{_libdir}/libshp.la %changelog +* Sat Mar 4 2006 Shawn McCann - 1.2.10-10.20060304cvs +- Upgraded to cvs snapshot taken on March 4, 2006 + * Sat Mar 4 2006 Shawn McCann - 1.2.10-9 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jan 2005 09:47:28 -0000 1.2 +++ sources 5 Mar 2006 16:53:38 -0000 1.3 @@ -1 +1 @@ -4d96bd926167193d27bf14d56e2d484e shapelib-1.2.10.tar.gz +1bec42cacea2792790530f6c5ec6664c shapelib-1.2.10.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 17:07:59 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 12:07:59 -0500 Subject: devel/libshout libshout.spec,1.8,1.9 Message-ID: <200603051708.k25H8WgH002891@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libshout In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2874 Modified Files: libshout.spec Log Message: rebuild for FE5 Index: libshout.spec =================================================================== RCS file: /cvs/extras/devel/libshout/libshout.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libshout.spec 22 May 2005 23:50:52 -0000 1.8 +++ libshout.spec 5 Mar 2006 17:07:59 -0000 1.9 @@ -1,7 +1,7 @@ Name: libshout Version: 1.0.9 -Release: 4 -Summary: icecast source streaming library. +Release: 5%{?dist} +Summary: icecast source streaming library Group: Libraries/Multimedia License: LGPL @@ -62,9 +62,11 @@ %dir %{_includedir}/shout/ %{_includedir}/shout/shout.h -# ----------------------------------------------------------------------------- - %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 1.0.9-5 +- rebuild + * Sun May 22 2005 Jeremy Katz - 1.0.9-4 - rebuild on all arches From fedora-extras-commits at redhat.com Sun Mar 5 17:09:36 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 12:09:36 -0500 Subject: devel/python-twisted python-twisted.spec,1.4,1.5 Message-ID: <200603051710.k25HA9tI002949@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/python-twisted In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2932 Modified Files: python-twisted.spec Log Message: rebuild for FE5 Index: python-twisted.spec =================================================================== RCS file: /cvs/extras/devel/python-twisted/python-twisted.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-twisted.spec 25 Jan 2006 15:58:08 -0000 1.4 +++ python-twisted.spec 5 Mar 2006 17:09:36 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Event-driven networking framework written in Python Name: python-twisted Version: 1.3.0 -Release: 4 +Release: 5%{?dist} License: LGPL Group: Applications/Internet From fedora-extras-commits at redhat.com Sun Mar 5 19:11:56 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:11:56 -0500 Subject: rpms/bakery - New directory Message-ID: <200603051911.k25JBw6s012417@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409/bakery Log Message: Directory /cvs/extras/rpms/bakery added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 19:12:18 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:12:18 -0500 Subject: rpms/bakery/devel - New directory Message-ID: <200603051912.k25JCKOR012432@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409/bakery/devel Log Message: Directory /cvs/extras/rpms/bakery/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 19:12:29 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:12:29 -0500 Subject: rpms/bakery Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603051912.k25JCVkG012466@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12454 Added Files: Makefile import.log Log Message: Setup of module bakery --- NEW FILE Makefile --- # Top level Makefile for module bakery all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 5 19:12:37 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:12:37 -0500 Subject: rpms/bakery/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603051912.k25JCdIf012484@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12454/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bakery --- NEW 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 Mar 5 19:13:08 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:13:08 -0500 Subject: rpms/bakery import.log,1.1,1.2 Message-ID: <200603051913.k25JDe76012555@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12521 Modified Files: import.log Log Message: auto-import bakery-2.3.17-1 on branch devel from bakery-2.3.17-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bakery/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Mar 2006 19:12:28 -0000 1.1 +++ import.log 5 Mar 2006 19:13:08 -0000 1.2 @@ -0,0 +1 @@ +bakery-2_3_17-1:HEAD:bakery-2.3.17-1.src.rpm:1141585984 From fedora-extras-commits at redhat.com Sun Mar 5 19:13:25 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:13:25 -0500 Subject: rpms/bakery/devel bakery.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603051913.k25JDvQN012559@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12521/devel Modified Files: .cvsignore sources Added Files: bakery.spec Log Message: auto-import bakery-2.3.17-1 on branch devel from bakery-2.3.17-1.src.rpm --- NEW FILE bakery.spec --- %define major_version 2.3 %define minor_version 17 %define api_version 2.4 Name: bakery Version: %{major_version}.%{minor_version} Release: 1%{?dist} Summary: C++ framework for creating GNOME applications using gtkmm Group: System Environment/Libraries License: LGPL URL: http://bakery.sourceforge.net/ Source0: http://ftp.gnome.org/pub/GNOME/sources/bakery/%{major_version}/bakery-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.6.0 BuildRequires: gconfmm26-devel >= 2.6.0 BuildRequires: libglademm24-devel >= 2.4.0 BuildRequires: libxml++-devel >= 2.8.0 BuildRequires: gnome-vfsmm26-devel >= 2.6.0 BuildRequires: doxygen graphviz gettext %description Bakery is a C++ Framework for creating GNOME applications using gtkmm. Bakery provides a Document/View architecture, but it doesn't force you to use the whole architecture. Bakery can use XML as a Document storage format, if you like. Bakery provides default functionality, which can be easily customized, makes it easy to start developing GNOME applications and gives your application structure. Bakery also contains a few utility classes. %package devel Summary: Headers for developing programs that will use %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: gtkmm24-devel Requires: gconfmm26-devel Requires: libglademm24-devel Requires: libxml++-devel Requires: gnome-vfsmm26-devel %description devel This package contains the header files needed for developing %{name} applications. %prep %setup -q %build %configure --disable-static --disable-dependency-tracking --enable-docs make %{?_smp_mflags} make -C docs/reference %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT docs-to-include %makeinstall find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %{__mkdir} docs-to-include %{__cp} docs/*.html docs-to-include/ %{__mkdir} docs-to-include/reference %{__cp} -r docs/reference/html docs-to-include/reference/ %{__rm} -f docs-to-include/reference/html/installdox %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/*.so.* %files devel %defattr(-, root, root, -) %doc docs-to-include/* %{_includedir}/bakery-%{api_version} %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %changelog * Sat Mar 4 2006 Denis Leroy - 2.3.17-1 - Update to 2.3.17 - Added gettext and graphviz BuildRequires * Wed Mar 1 2006 Denis Leroy - 2.3.15-3 - Removed deps to ldconfig * Mon Nov 28 2005 Denis Leroy - 2.3.15-1 - First version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bakery/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2006 19:12:36 -0000 1.1 +++ .cvsignore 5 Mar 2006 19:13:24 -0000 1.2 @@ -0,0 +1 @@ +bakery-2.3.17.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bakery/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2006 19:12:36 -0000 1.1 +++ sources 5 Mar 2006 19:13:24 -0000 1.2 @@ -0,0 +1 @@ +d1e78b0f520c125b21340ac73dc6aaab bakery-2.3.17.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 5 19:20:42 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 5 Mar 2006 14:20:42 -0500 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.16,1.17 Message-ID: <200603051921.k25JLEXY012681@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12664 Modified Files: xemacs-sumo.spec Log Message: * Fri Mar 3 2006 Ville Skytt?? - 20051208-2 - Drop JDE; the full source for jde.jar doesn't seem to be available and even the included parts won't build with gcj eg. due to use of com.sun.* things. Additionally it requires third party jars which are not currently available in Fedora Core or Extras. So let's not inflict a crippled version of JDE on anyone; JDE users can install the upstream jde package using XEmacs package tools. (#180941) Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xemacs-sumo.spec 14 Feb 2006 21:52:24 -0000 1.16 +++ xemacs-sumo.spec 5 Mar 2006 19:20:41 -0000 1.17 @@ -1,9 +1,10 @@ %define sumo 2005-12-08 %define pkgdir %{_datadir}/xemacs +%define xemacsb xemacs-nox -batch -vanilla Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 1 +Release: 2 Summary: XEmacs lisp packages Group: Applications/Editors @@ -20,7 +21,6 @@ Source15: Emacs.ad.ko_KR.UTF-8 Source16: Emacs.ad.zh_CN.UTF-8 Source17: Emacs.ad.zh_TW.UTF-8 -Source20: %{name}-jde-mktoc.pl Patch0: %{name}-20051208-hypb-posix.patch Patch1: %{name}-20051208-pydoc-path.patch Patch2: %{name}-20051208-latin-unity-kludge.patch @@ -30,8 +30,6 @@ Patch8: egg-wnn-host-unix-79826.patch Patch11: browse-url-htmlview-84262.patch Patch12: psgml-browsers-84262.patch -Patch13: jde-ug-rel-links.patch -Patch14: jde-ug-section-links-89499.patch Patch15: avoid-catch-error-65346.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -109,10 +107,6 @@ %patch11 -p0 # update psgml-html preview menu to modern browsers %patch12 -p0 -# fix relative links to elisp in user-guide html doc -%patch13 -p0 -# and section links in toc -%patch14 -p0 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el) %patch15 -p0 @@ -124,35 +118,29 @@ # remove game we shouldn't ship rm xemacs-packages/lisp/games/tetris.el* -# get rid of binary-only tli_rbl treeview applet + some cruft in jde docs -cd xemacs-packages/etc/jde/doc -for foo in jdebug jde ; do - %{__perl} %{SOURCE20} \ - html/$foo-ug/$foo-ug-toc.html tli_rbl/txt/$foo-ug-toc.txt \ - > html/$foo-ug/$foo-ug-toc.html.tmp - mv html/$foo-ug/$foo-ug-toc.html.tmp html/$foo-ug/$foo-ug-toc.html -done -rm -rf tli_rbl src -cd - - rm xemacs-packages/etc/xslt-process/java/{xslt.jar,xslt/*.class} +# not buildable from sources, all deps not met, see 2006-03-03 changelog entry +%{xemacsb} -l package-admin -eval \ + "(package-admin-delete-binary-package 'jde \"xemacs-packages\")" +rm -rf xemacs-packages/{etc,lisp}/jde -%build -export xemacs_batch="xemacs-nox -batch -vanilla" - -# mew is provided by mew-xemacs, and skk by ddskk-xemacs -$xemacs_batch -l package-admin -eval \ +# provided by mew-xemacs +%{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mew \"xemacs-packages\")" rmdir xemacs-packages/{etc,lisp,man}/mew -$xemacs_batch -l package-admin -eval \ + +# provided by ddskk-xemacs +%{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'skk \"mule-packages\")" rmdir mule-packages/{etc,lisp,man}/skk + +%build export EMACSPACKAGEPATH=`pwd` -$xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \ +%{xemacsb} -no-autoloads -eval "(setq make-backup-files nil)" \ -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* -$xemacs_batch -f batch-byte-recompile-directory \ +%{xemacsb} -f batch-byte-recompile-directory \ xemacs-packages/lisp mule-packages/lisp cd xemacs-packages/etc/xslt-process/java @@ -237,6 +225,14 @@ %changelog +* Fri Mar 3 2006 Ville Skytt?? - 20051208-2 +- Drop JDE; the full source for jde.jar doesn't seem to be available + and even the included parts won't build with gcj eg. due to use of + com.sun.* things. Additionally it requires third party jars which are + not currently available in Fedora Core or Extras. So let's not inflict + a crippled version of JDE on anyone; JDE users can install the upstream + jde package using XEmacs package tools. (#180941) + * Sun Feb 12 2006 Ville Skytt?? - Build xslt.jar ourselves (TrAX only), use TrAX by default in xslt-process. From fedora-extras-commits at redhat.com Sun Mar 5 19:23:31 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 5 Mar 2006 14:23:31 -0500 Subject: rpms/xemacs-sumo/devel jde-ug-rel-links.patch, 1.1, NONE jde-ug-section-links-89499.patch, 1.1, NONE xemacs-sumo-jde-mktoc.pl, 1.1, NONE Message-ID: <200603051923.k25JNX3S012733@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12724 Removed Files: jde-ug-rel-links.patch jde-ug-section-links-89499.patch xemacs-sumo-jde-mktoc.pl Log Message: Remove unused files. --- jde-ug-rel-links.patch DELETED --- --- jde-ug-section-links-89499.patch DELETED --- --- xemacs-sumo-jde-mktoc.pl DELETED --- From fedora-extras-commits at redhat.com Sun Mar 5 19:24:58 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:24:58 -0500 Subject: owners owners.list,1.709,1.710 Message-ID: <200603051925.k25JPURu012781@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12756 Modified Files: owners.list Log Message: Added bakery Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.709 retrieving revision 1.710 diff -u -r1.709 -r1.710 --- owners.list 5 Mar 2006 15:07:39 -0000 1.709 +++ owners.list 5 Mar 2006 19:24:58 -0000 1.710 @@ -59,6 +59,7 @@ Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|azureus|A BitTorrent Client|green at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|bakery|C++ framework for creating Gnome apps|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org| Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|banshee|Music tool to easily import, manage, and play selections from your iPod|caillon at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 5 19:29:38 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 5 Mar 2006 14:29:38 -0500 Subject: rpms/xemacs-sumo/FC-4 xemacs-sumo-20051208-trax.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xemacs-sumo.spec, 1.11, 1.12 jde-ug-rel-links.patch, 1.1, NONE jde-ug-section-links-89499.patch, 1.1, NONE Message-ID: <200603051930.k25JUAkL012900@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12874 Modified Files: .cvsignore sources xemacs-sumo.spec Added Files: xemacs-sumo-20051208-trax.patch Removed Files: jde-ug-rel-links.patch jde-ug-section-links-89499.patch Log Message: * Fri Mar 3 2006 Ville Skytt?? - 20051208-2 - Drop JDE; the full source for jde.jar doesn't seem to be available and even the included parts won't build with gcj eg. due to use of com.sun.* things. Additionally it requires third party jars which are not currently available in Fedora Core or Extras. So let's not inflict a crippled version of JDE on anyone; JDE users can install the upstream jde package using XEmacs package tools. (#180941) * Sun Feb 12 2006 Ville Skytt?? - Build xslt.jar ourselves (TrAX only), use TrAX by default in xslt-process. * Sat Feb 11 2006 Ville Skytt?? - Bundle upstream gnus package version 1.89 to fix #181011. - Get rid of tli_rbl binary only applet jar in jde's docs (first step of fixing #180941). xemacs-sumo-20051208-trax.patch: --- NEW FILE xemacs-sumo-20051208-trax.patch --- --- xemacs-packages/lisp/xslt-process/xslt-process.el~ 2001-05-01 08:41:45.000000000 +0300 +++ xemacs-packages/lisp/xslt-process/xslt-process.el 2006-02-12 23:57:32.000000000 +0200 @@ -49,3 +49,3 @@ -(defcustom xslt-process-default-processor (list 'Saxon) +(defcustom xslt-process-default-processor (list 'TrAX) "*The default XSLT processor to be applied to an XML document." Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 23 Dec 2005 21:22:18 -0000 1.7 +++ .cvsignore 5 Mar 2006 19:29:38 -0000 1.8 @@ -1,2 +1,3 @@ xemacs-mule-sumo-2005-12-08.tar.bz2 xemacs-sumo-2005-12-08.tar.bz2 +gnus-1.89-pkg.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 23 Dec 2005 21:22:18 -0000 1.7 +++ sources 5 Mar 2006 19:29:38 -0000 1.8 @@ -1,2 +1,3 @@ 553da38bc36b4365ab98e0565a0530b8 xemacs-mule-sumo-2005-12-08.tar.bz2 1927c40affd04ff7c10b979ef24548d0 xemacs-sumo-2005-12-08.tar.bz2 +e7707178416716eac643af29c437f619 gnus-1.89-pkg.tar.gz Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/xemacs-sumo.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xemacs-sumo.spec 23 Dec 2005 21:22:18 -0000 1.11 +++ xemacs-sumo.spec 5 Mar 2006 19:29:38 -0000 1.12 @@ -1,9 +1,10 @@ %define sumo 2005-12-08 %define pkgdir %{_datadir}/xemacs +%define xemacsb xemacs-nox -batch -vanilla Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 1 +Release: 2 Summary: XEmacs lisp packages Group: Applications/Editors @@ -11,6 +12,7 @@ URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo}.tar.bz2 Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo}.tar.bz2 +Source2: ftp://ftp.xemacs.org/packages/gnus-1.89-pkg.tar.gz Source10: Emacs.ad.ja_JP.eucJP Source11: Emacs.ad.ko_KR.eucKR Source12: Emacs.ad.zh_CN.GB2312 @@ -22,13 +24,12 @@ Patch0: %{name}-20051208-hypb-posix.patch Patch1: %{name}-20051208-pydoc-path.patch Patch2: %{name}-20051208-latin-unity-kludge.patch +Patch3: %{name}-20051208-trax.patch Patch6: auctex-texsite-jlatex-detect-69129.patch Patch7: auctex-texjp-platex.patch Patch8: egg-wnn-host-unix-79826.patch Patch11: browse-url-htmlview-84262.patch Patch12: psgml-browsers-84262.patch -Patch13: jde-ug-rel-links.patch -Patch14: jde-ug-section-links-89499.patch Patch15: avoid-catch-error-65346.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -37,6 +38,8 @@ BuildRequires: sed >= 3.95 BuildRequires: /sbin/install-info BuildRequires: %{__python} +BuildRequires: %{__perl} +BuildRequires: java-devel Requires: xemacs-common # Fake release in this provision in order to avoid self-obsoletion (for now). Provides: apel-xemacs = 10.6-6 @@ -81,6 +84,8 @@ %prep %setup -q -c -a1 +tar zxf %{SOURCE2} -C xemacs-packages + # get rid of csh dependency %patch0 -p0 rm xemacs-packages/lisp/hyperbole/file-newer @@ -90,6 +95,8 @@ mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes} # support write-region's kludge in latin-unity %patch2 -p0 +# use TrAX by default in xslt-process +%patch3 -p0 # fix jlatex autodetection %patch6 -p0 # use ptex rather jtex by default for Japanese @@ -100,10 +107,6 @@ %patch11 -p0 # update psgml-html preview menu to modern browsers %patch12 -p0 -# fix relative links to elisp in user-guide html doc -%patch13 -p0 -# and section links in toc -%patch14 -p0 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el) %patch15 -p0 @@ -115,24 +118,35 @@ # remove game we shouldn't ship rm xemacs-packages/lisp/games/tetris.el* +rm xemacs-packages/etc/xslt-process/java/{xslt.jar,xslt/*.class} -%build -export xemacs_batch="xemacs-nox -batch -vanilla" +# not buildable from sources, all deps not met, see 2006-03-03 changelog entry +%{xemacsb} -l package-admin -eval \ + "(package-admin-delete-binary-package 'jde \"xemacs-packages\")" +rm -rf xemacs-packages/{etc,lisp}/jde -# mew is provided by mew-xemacs, and skk by ddskk-xemacs -$xemacs_batch -l package-admin -eval \ +# provided by mew-xemacs +%{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mew \"xemacs-packages\")" rmdir xemacs-packages/{etc,lisp,man}/mew -$xemacs_batch -l package-admin -eval \ + +# provided by ddskk-xemacs +%{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'skk \"mule-packages\")" rmdir mule-packages/{etc,lisp,man}/skk + +%build export EMACSPACKAGEPATH=`pwd` -$xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \ +%{xemacsb} -no-autoloads -eval "(setq make-backup-files nil)" \ -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* -$xemacs_batch -f batch-byte-recompile-directory \ +%{xemacsb} -f batch-byte-recompile-directory \ xemacs-packages/lisp mule-packages/lisp +cd xemacs-packages/etc/xslt-process/java +javac xslt/TrAX.java && jar cvf xslt.jar xslt/*.class && rm xslt/*.class +cd - + %install rm -rf $RPM_BUILD_ROOT @@ -211,6 +225,22 @@ %changelog +* Fri Mar 3 2006 Ville Skytt?? - 20051208-2 +- Drop JDE; the full source for jde.jar doesn't seem to be available + and even the included parts won't build with gcj eg. due to use of + com.sun.* things. Additionally it requires third party jars which are + not currently available in Fedora Core or Extras. So let's not inflict + a crippled version of JDE on anyone; JDE users can install the upstream + jde package using XEmacs package tools. (#180941) + +* Sun Feb 12 2006 Ville Skytt?? +- Build xslt.jar ourselves (TrAX only), use TrAX by default in xslt-process. + +* Sat Feb 11 2006 Ville Skytt?? +- Bundle upstream gnus package version 1.89 to fix #181011. +- Get rid of tli_rbl binary only applet jar in jde's docs (first step + of fixing #180941). + * Sat Dec 17 2005 Ville Skytt?? - 20051208-1 - Patch to support write-region's kludge in latin-unity. --- jde-ug-rel-links.patch DELETED --- --- jde-ug-section-links-89499.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 5 19:39:38 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:39:38 -0500 Subject: rpms/opencv - New directory Message-ID: <200603051939.k25JdeDi013005@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12997/opencv Log Message: Directory /cvs/extras/rpms/opencv added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 19:39:44 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:39:44 -0500 Subject: rpms/opencv/devel - New directory Message-ID: <200603051939.k25JdkTd013020@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12997/opencv/devel Log Message: Directory /cvs/extras/rpms/opencv/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 19:40:01 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:40:01 -0500 Subject: rpms/opencv Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603051940.k25Je3El013055@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13042 Added Files: Makefile import.log Log Message: Setup of module opencv --- NEW FILE Makefile --- # Top level Makefile for module opencv all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 5 19:40:07 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:40:07 -0500 Subject: rpms/opencv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603051940.k25Je92S013077@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13042/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module opencv --- NEW 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 Mar 5 19:45:51 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:45:51 -0500 Subject: rpms/opencv import.log,1.1,1.2 Message-ID: <200603051946.k25JkObY013159@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13124 Modified Files: import.log Log Message: auto-import opencv-0.9.7-3 on branch devel from opencv-0.9.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/opencv/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Mar 2006 19:40:01 -0000 1.1 +++ import.log 5 Mar 2006 19:45:51 -0000 1.2 @@ -0,0 +1 @@ +opencv-0_9_7-3:HEAD:opencv-0.9.7-3.src.rpm:1141587944 From fedora-extras-commits at redhat.com Sun Mar 5 19:45:57 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:45:57 -0500 Subject: rpms/opencv/devel opencv-samples-Makefile, NONE, 1.1 opencv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603051946.k25JkTYU013163@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13124/devel Modified Files: .cvsignore sources Added Files: opencv-samples-Makefile opencv.spec Log Message: auto-import opencv-0.9.7-3 on branch devel from opencv-0.9.7-3.src.rpm --- NEW FILE opencv-samples-Makefile --- CFLAGS := `pkg-config --cflags opencv` $(CFLAGS) LDFLAGS := `pkg-config --libs opencv` $(LDFLAGS) all: $(patsubst %.c,%,$(wildcard *.c)) --- NEW FILE opencv.spec --- %define with_ffmpeg 0 Name: opencv Version: 0.9.7 Release: 3 Summary: Collection of algorithms for computer vision Group: Development/Libraries License: Intel Open Source License URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: swig >= 1.3.24, zlib-devel, pkgconfig BuildRequires: python-devel %if %{with_ffmpeg} BuildRequires: ffmpeg-devel >= 0.4.9 %endif %description OpenCV means Intel?? Open Source Computer Vision Library. It is a collection of C functions and a few C++ classes that implement some popular Image Processing and Computer Vision algorithms. %package devel Summary: Development files for using the OpenCV library Group: Development/Libraries Requires: opencv = %{version}-%{release} %description devel This package contains the OpenCV C/C++ library and header files, as well as documentation. It should be installed if you want to develop programs that will use the OpenCV library. %package python Summary: Python bindings for apps which use OpenCV Group: Development/Libraries Requires: opencv = %{version}-%{release} Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`) %description python This package contains Python bindings for the OpenCV library. %prep %setup -q %{__sed} -i 's/\r//' interfaces/swig/python/*.py \ samples/python/*.py %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \ interfaces/swig/python/__init__.py %build %configure --disable-static --enable-python --with-apps make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/opencv/*.la \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/build_all.sh \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.dsp \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.vcproj \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/facedetect.cmd \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gcc \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gen install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/Makefile %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post python -p /sbin/ldconfig %postun python -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING THANKS TODO %{_bindir}/opencv-* %{_libdir}/lib*.so.* %dir %{_datadir}/opencv %{_datadir}/opencv/haarcascades %{_datadir}/opencv/readme.txt %files devel %defattr(-,root,root,-) %{_includedir}/opencv %{_libdir}/lib*.so %{_libdir}/lib*.a %{_libdir}/pkgconfig/opencv.pc %doc %{_datadir}/opencv/doc %doc %{_datadir}/opencv/samples/c %files python %{_libdir}/python*/site-packages/opencv %doc %{_datadir}/opencv/samples/python %changelog * Sun Oct 16 2005 Simon Perreault - 0.9.7-3 - Removed useless sample compilation makefiles/project files and replaced them with one that works on Fedora Core. - Removed shellbang from Python modules. * Mon Oct 10 2005 Simon Perreault - 0.9.7-2 - Made FFMPEG dependency optional (needs to be disabled for inclusion in FE). * Mon Oct 10 2005 Simon Perreault - 0.9.7-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opencv/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2006 19:40:07 -0000 1.1 +++ .cvsignore 5 Mar 2006 19:45:57 -0000 1.2 @@ -0,0 +1 @@ +opencv-0.9.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/opencv/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2006 19:40:07 -0000 1.1 +++ sources 5 Mar 2006 19:45:57 -0000 1.2 @@ -0,0 +1 @@ +39cdccd05edd12294db2c238f48ff2ab opencv-0.9.7.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 19:50:49 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:50:49 -0500 Subject: owners owners.list,1.710,1.711 Message-ID: <200603051951.k25JpMNo013240@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13219 Modified Files: owners.list Log Message: Added opencv component. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.710 retrieving revision 1.711 diff -u -r1.710 -r1.711 --- owners.list 5 Mar 2006 19:24:58 -0000 1.710 +++ owners.list 5 Mar 2006 19:50:49 -0000 1.711 @@ -751,6 +751,7 @@ Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|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|opencv|Collection of algorithms for computer vision|nomis80 at nomis80.org|extras-qa at fedoraproject.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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 5 20:37:58 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 5 Mar 2006 15:37:58 -0500 Subject: rpms/kyum/FC-4 .cvsignore, 1.2, 1.3 kyum.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200603052038.k25KcUu2015396@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15366 Modified Files: .cvsignore kyum.spec sources Log Message: Bringing FC-4 in sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kyum/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jun 2005 16:37:40 -0000 1.2 +++ .cvsignore 5 Mar 2006 20:37:57 -0000 1.3 @@ -1 +1 @@ -kyum-0.7.1.tar.gz +kyum-0.7.5.tar.gz Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/FC-4/kyum.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kyum.spec 8 Jul 2005 18:29:51 -0000 1.4 +++ kyum.spec 5 Mar 2006 20:37:57 -0000 1.5 @@ -1,13 +1,13 @@ Name: kyum -Version: 0.7.1 +Version: 0.7.5 Release: 2%{?dist} Summary: Graphical User Frontend (GUI) for yum License: GPL Group: Applications/System -URL: http://kde-apps.org/content/show.php?content=22185 -Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz +URL: http://www.sourceforge.net/projects/kyum +Source: http://dl.sourceforge.net/sourceforge/kyum/%{name}-%{version}.tar.gz Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,7 +59,7 @@ %{_bindir}/* %dir %{_datadir}/apps/kyum %{_datadir}/apps/kyum/*/* -%{_datadir}/apps/kyum/kyum_sysinfo.py +%{_datadir}/apps/kyum/kyum_sysinfo.p* %{_datadir}/apps/kyum/kyumui.rc %{_datadir}/icons/*/*/apps/kyum.png %{_datadir}/applications/kde/fedora-kyum.desktop @@ -67,6 +67,30 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Sun Feb 12 2006 Jochen Schmitt 0.7.5-2 +- Rebuilt for FC5 + +* Mon Jul 25 2005 Jochen Schmitt 0.7.5-1 +- New upstream release + +* Thu Jul 21 2005 Jochen Schmitt 0.7.3-2 +- Upstream author has moved the project to sourceforge.net + +* Tue Jul 19 2005 Jochen Schmitt 0.7.3-1 +- New upstream release + +* Thu Jul 14 2005 Jochen Schmitt 0.7.2-3 +- Patch DlgInfo.h to generate proper Makefiles (calling of moc) + +* Wed Jul 13 2005 Jochen Schmitt 0.7.2-2 +- Patch for missing DlgInfo.moc + +* Wed Jul 13 2005 Jochen Schmitt 0.7.2-1 +- Update to new upstream release + +* Tue Jun 21 2005 Jochen Schmitt 0.7.1-3 +- Add precompiled python files into package + * Thu Jun 16 2005 Jochen Schmitt 0.7.1-2 - Add libfam.la workaround becouse buildsys contains broken gamin Index: sources =================================================================== RCS file: /cvs/extras/rpms/kyum/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jun 2005 16:37:40 -0000 1.2 +++ sources 5 Mar 2006 20:37:57 -0000 1.3 @@ -1 +1 @@ -2d12023542d55affa51d6312a761b70a kyum-0.7.1.tar.gz +b1ff5c4dfd14145535d344ef346bac74 kyum-0.7.5.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 23:09:10 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Sun, 5 Mar 2006 18:09:10 -0500 Subject: fedora-security/audit fc4,1.165,1.166 fc5,1.72,1.73 Message-ID: <200603052309.k25N9A6l021650@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21633 Modified Files: fc4 fc5 Log Message: Updates for kernel and other things Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- fc4 3 Mar 2006 21:39:36 -0000 1.165 +++ fc4 5 Mar 2006 23:08:54 -0000 1.166 @@ -1,26 +1,30 @@ -Up to date CVE as of CVE email 20060301 -Up to date FC4 as of 20060301 +Up to date CVE as of CVE email 20060304 +Up to date FC4 as of 20060304 ** are items that need attention CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) +CVE-2006-0741 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 version (postgresql, 8.1 only) CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107] CVE-2006-0591 version (postgresql, fixed 8.0.6) [since FEDORA-2005-021] CVE-2006-0576 VULNERABLE (oprofile) +CVE-2006-0555 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 +CVE-2006-0554 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0553 version (postgresql, 8.1 only) CVE-2006-0528 version (evolution, 2.3 and above) CVE-2006-0496 VULNERABLE (mozilla) CVE-2006-0496 VULNERABLE (firefox) CVE-2006-0482 ignore (kernel) sparc only CVE-2006-0481 version (libpng, 1.2.7 only) +CVE-2006-0457 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0455 version (gnupg, fixed 1.4.2.1) [since FEDORA-2006-116] CVE-2006-0454 backport (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3 CVE-2006-0405 version (libtiff, 3.8.0 only) -CVE-2006-0377 version (squirrelmail, fixed 1.4.6) bz#182585 [since FEDORA-2006-133] +CVE-2006-0377 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133] CVE-2006-0369 ignore (mysql) this is not a security issue CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104] @@ -58,15 +62,15 @@ CVE-2006-0207 VULNERABLE (php) bz#178044 CVE-2006-0200 version (php, 5.1.0 5.1.1 only) CVE-2006-0197 ** xorg-x11 -CVE-2006-0195 version (squirrelmail, fixed 1.4.6) bz#182582 [since FEDORA-2006-133] -CVE-2006-0188 version (squirrelmail, fixed 1.4.6) bz#182580 [since FEDORA-2006-133] +CVE-2006-0195 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133] +CVE-2006-0188 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133] CVE-2006-0097 ignore (php) Windows only CVE-2006-0096 ignore (kernel) minor and requires root -CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] linux-2.6-dm-crypt-zero-key-before-free.patch +CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] patch-2.6.15.5 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) -CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.2 -CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.2 -CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.2 +CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 +CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 +CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050 CVE-2005-4720 VULNERABLE (mozilla) CVE-2005-4720 VULNERABLE (firefox) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- fc5 2 Mar 2006 12:14:58 -0000 1.72 +++ fc5 5 Mar 2006 23:08:54 -0000 1.73 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060301 +Up to date CVE as of CVE email 20060304 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -72,7 +72,7 @@ CVE-2006-0207 version (php, fixed 5.1.2) CVE-2006-0200 version (php, fixed 5.1.2) CVE-2006-0197 ignore (xorg-x11) not an issue -CVE-2006-0195 version (php-pear, not 1.4.4) +CVE-2006-0195 version (squirrelmail, fixed 1.4.6) CVE-2006-0188 version (squirrelmail, fixed 1.4.6) CVE-2006-0144 version (php-pear, not 1.4.4) CVE-2006-0097 ignore (php) Windows only @@ -546,6 +546,7 @@ CVE-2005-0752 version (firefox, fixed 1.0.3) CVE-2005-0750 version (kernel, fixed 2.6.11.6) CVE-2005-0749 version (kernel, fixed 2.6.11.6) +CVE-2006-0741 VULNERABLE (kernel, fixed 2.6.15.5) CVE-2005-0739 version (ethereal, fixed after 0.10.9) CVE-2005-0736 version (kernel, fixed 2.6.11) CVE-2005-0718 version (squid, fixed 2.5.STABLE8) From fedora-extras-commits at redhat.com Sun Mar 5 23:23:11 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:23:11 -0500 Subject: owners owners.list,1.711,1.712 Message-ID: <200603052323.k25NNhEF021778@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21759/owners Modified Files: owners.list Log Message: Add webmin package Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.711 retrieving revision 1.712 diff -u -r1.711 -r1.712 --- owners.list 5 Mar 2006 19:50:49 -0000 1.711 +++ owners.list 5 Mar 2006 23:23:10 -0000 1.712 @@ -1397,6 +1397,7 @@ 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|wavpack|A completely open audiocodec|lemenkov at newmail.ru|extras-qa at fedoraproject.org| +Fedora Extras|webmin|A web-based administration interface for Unix systems.|jvdias at redhat.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|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|whowatch|Displays informations about the users currently logged in|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 5 23:25:25 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:25:25 -0500 Subject: rpms/webmin - New directory Message-ID: <200603052325.k25NPR7X021844@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21834/webmin Log Message: Directory /cvs/extras/rpms/webmin added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 23:25:31 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:25:31 -0500 Subject: rpms/webmin/devel - New directory Message-ID: <200603052325.k25NPXsw021860@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21834/webmin/devel Log Message: Directory /cvs/extras/rpms/webmin/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 23:25:54 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:25:54 -0500 Subject: rpms/webmin Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603052325.k25NPuuB021898@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21884 Added Files: Makefile import.log Log Message: Setup of module webmin --- NEW FILE Makefile --- # Top level Makefile for module webmin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 5 23:26:00 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:26:00 -0500 Subject: rpms/webmin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603052326.k25NQ2Tc021918@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21884/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module webmin --- NEW 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 Mar 5 23:35:54 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:35:54 -0500 Subject: rpms/webmin import.log,1.1,1.2 Message-ID: <200603052336.k25NaQiE022061@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22022 Modified Files: import.log Log Message: auto-import webmin-1.260-1.fe5 on branch devel from webmin-1.260-1.fe5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/webmin/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Mar 2006 23:25:54 -0000 1.1 +++ import.log 5 Mar 2006 23:35:54 -0000 1.2 @@ -0,0 +1 @@ +webmin-1_260-1_fe5:HEAD:webmin-1.260-1.fe5.src.rpm:1141601746 From fedora-extras-commits at redhat.com Sun Mar 5 23:36:00 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:36:00 -0500 Subject: rpms/webmin/devel run-setup.sh, NONE, 1.1 webmin-1.260-initscript.patch, NONE, 1.1 webmin-uninstall.sh, NONE, 1.1 webmin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603052336.k25NaWsl022065@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22022/devel Modified Files: .cvsignore sources Added Files: run-setup.sh webmin-1.260-initscript.patch webmin-uninstall.sh webmin.spec Log Message: auto-import webmin-1.260-1.fe5 on branch devel from webmin-1.260-1.fe5.src.rpm --- NEW FILE run-setup.sh --- #!/bin/sh perl </tmp/.webmin/$$.check </dev/null\` =~ /White\\s+Box\\s+Enterprise\\s+Linux\\s+release\\s+(\\S+)/i) { print "oscheck='Whitebox Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /Tao\\s+Linux\\s+release\\s+(\\S+)/i) { print "oscheck='Tao Linux'\\n"; } elsif (\`cat /etc/centos-release /etc/redhat-release 2>/dev/null\` =~ /CentOS\\s+release\\s+(\\S+)/i && \$1 < 4) { print "oscheck='CentOS Linux'\\n"; } elsif (\`cat /etc/centos-release /etc/redhat-release 2>/dev/null\` =~ /CentOS\\s+release\\s+(\\S+)/i && \$1 >= 4) { print "oscheck='CentOS Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /Scientific\\s+Linux.*\\s+release\\s+(\\S+)/i) { print "oscheck='Scientific Linux'\\n"; } elsif (\`cat /etc/redhtat-release 2>/dev/null\` =~ /Gralinux\\s+(ES|AS|WS)\\s+release\\s+(\\d+)/i) { print "oscheck='Gralinux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /(Advanced\\s+Server.*2\\.1)|(AS.*2\\.1)/i) { print "oscheck='Redhat Enterprise Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /ES.*2\\.1/) { print "oscheck='Redhat Enterprise Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /WS.*2\\.1/) { print "oscheck='Redhat Enterprise Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /(3\\.0AS)|(2\\.9\\.5AS)|(AS\\s+release\\s+3)/i) { print "oscheck='Redhat Enterprise Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /(ES|AS|WS)\\s+release\\s+(\\S+)/) { print "oscheck='Redhat Enterprise Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /Desktop\\s+release\\s+(\\S+)/i || \`cat /etc/redhat-release 2>/dev/null\` =~ /ES\\s+release\\s+(\\S+)/i) { print "oscheck='Redhat Linux Desktop'\\n"; } elsif (\`cat /etc/alphacore-release 2>/dev/null\` =~ /Alpha\\s*Core\\s+release\\s+(\\S+)\\s/i) { print "oscheck='AlphaCore Linux'\\n"; } elsif (\`cat /etc/redhat-release /etc/fedora-release 2>/dev/null\` =~ /X\\/OS.*release\\s(\\S+)\\s/i) { print "oscheck='X/OS Linux'\\n"; } elsif (\`cat /etc/release /etc/asianux-release 2>/dev/null\` =~ /Asianux\\s+release\\s+(\\S+)/i) { print "oscheck='Asianux'\\n"; } elsif (\`cat /etc/Haansoft-release 2>/dev/null\` =~ /Haansoft\\s+Linux\\s+OS\\s+release\\s+(\\S+)/i) { print "oscheck='Haansoft Linux'\\n"; } elsif (\`cat /etc/caos-release 2>/dev/null\` =~ /release\\s+(\\S+)/i) { print "oscheck='cAos Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /red.*hat.*release\\s+(\\S+)/i && \`cat /etc/redhat-release 2>/dev/null\` !~ /[eE]nterprise|AS|ES|WS|[aA]dvanced/) { print "oscheck='Redhat Linux'\\n"; } elsif (\`cat /etc/redhat-release /etc/fedora-release 2>/dev/null\` =~ /Fedora.*\\s([0-9\\.]+)\\s/i || \`cat /etc/redhat-release /etc/fedora-release 2>/dev/null\` =~ /Fedora.*\\sFC(\\S+)\\s/i) { print "oscheck='Redhat Linux'\\n"; } elsif (\`cat /tmp/wd/version 2>/dev/null\` =~ /2\\.1\\.0/) { print "oscheck='White Dwarf Linux'\\n"; } elsif (\`cat /etc/slackware-version 2>/dev/null\` =~ /([0-9\\.]+)/) { print "oscheck='Slackware Linux'\\n"; } elsif (\$etc_issue =~ /Xandros.*\\s2\\.0/i) { print "oscheck='Xandros Linux'\\n"; } elsif (\$etc_issue =~ /Xandros.*\\s3\\.0/i) { print "oscheck='Xandros Linux'\\n"; } elsif (\$etc_issue =~ /APLINUX.*1\\.3/i) { print "oscheck='APLINUX'\\n"; } elsif (\`cat /etc/bigblock-revision 2>/dev/null\` =~ /Version:\\s(1[0-9\\.-]+)\\s/i) { print "oscheck='BigBlock'\\n"; } elsif (\`cat /etc/bigblock-revision 2>/dev/null\` =~ /Version:\\s(2[0-9\\.-]+)\\s/i) { print "oscheck='BigBlock'\\n"; } elsif (\$etc_issue =~ /Debian.*\\s([0-9\\.]+)\\s/i) { print "oscheck='Debian Linux'\\n"; } elsif (\$etc_issue =~ /Debian.*\\stesting\\/unstable\\s/i) { print "oscheck='Debian Linux'\\n"; } elsif (\`cat /etc/SLOX-release 2>/dev/null\` =~ /VERSION\\s+=\\s+(\\S+)/i) { print "oscheck='SuSE OpenExchange Linux'\\n"; } elsif (\$etc_issue =~ /SuSE\\s+SLES-(\\S+)/i) { print "oscheck='SuSE SLES Linux'\\n"; } elsif (\`cat /etc/SuSE-release 2>/dev/null\` =~ /([0-9\\.]+)/ || \$etc_issue =~ /SuSE\\s+Linux\\s+(\\S+)\\s/i) { print "oscheck='SuSE Linux'\\n"; } elsif (\`cat /etc/UnitedLinux-release 2>/dev/null\` =~ /([0-9\\.]+)/) { print "oscheck='United Linux'\\n"; } elsif (\$etc_issue =~ /Corel\\s+LINUX\\s+(\\S+)/i) { print "oscheck='Corel Linux'\\n"; } elsif (\`cat /etc/turbolinux-release 2>/dev/null\` =~ /([0-9\\.]+)/i) { print "oscheck='TurboLinux'\\n"; } elsif (\$etc_issue =~ /Cobalt\\s+Linux\\s+release\\s+(\\S+)/i || \`cat /etc/cobalt-release 2>/dev/null\` =~ /([0-9\\.]+)/) { print "oscheck='Cobalt Linux'\\n"; } elsif (\`uname -r\` =~ /2.2.16/ && -r "/etc/cobalt-release") { print "oscheck='Cobalt Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+Corporate\\s+Server\\s+release\\s+1\\.0/i) { print "oscheck='Mandrake Linux Corporate Server'\\n"; } elsif (\`cat /etc/mandrake-release 2>/dev/null\` =~ /pclinuxos\\s+Linux\\s+release\\s+2005/i) { print "oscheck='pclinuxos Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+release\\s+5\\.3/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+release\\s+6\\.0/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+release\\s+6\\.1/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+release\\s+7\\.0/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+release\\s+7\\.1/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\`cat /etc/mandrake-release 2>/dev/null\` =~ /Mandrake.*?([0-9\\.]+)/i || \$etc_issue =~ /Mandrake\\s+release\\s+([0-9\\.]+)/i || \$etc_issue =~ /Mandrakelinux\\s+release\\s+([0-9\\.]+)/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*3\\.0/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*4\\.0/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*4\\.1/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*4\\.2/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*5\\.0/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*5\\.1/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*6\\.0/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*7\\.0/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*\\s8/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*\\s9/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*\\s10\\s/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Thiz.*Linux.*\\s5\\.0/i) { print "oscheck='ThizLinux Desktop'\\n"; } elsif (\$etc_issue =~ /Thiz.*Linux.*\\s6\\.0/i) { print "oscheck='ThizLinux Desktop'\\n"; } elsif (\$etc_issue =~ /Thiz.*Linux.*\\s6\\.2/i) { print "oscheck='ThizLinux Desktop'\\n"; } elsif (\$etc_issue =~ /Thiz.*Linux.*\\s7\\.0/i) { print "oscheck='ThizLinux Desktop'\\n"; } elsif (\$etc_issue =~ /Thiz.*\\s?Server.*\\s4\\.3/i) { print "oscheck='ThizServer'\\n"; } elsif (\$etc_issue =~ /Thiz.*\\s?Server.*\\s6\\.0/i) { print "oscheck='ThizServer'\\n"; } elsif (\$etc_issue =~ /Thiz.*\\s?Server.*\\s7\\.0/i) { print "oscheck='ThizServer'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2001.*January/i || \$etc_issue =~ /2001.*January/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2001.*February/i || \$etc_issue =~ /2001.*February/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2001.*May/i || \$etc_issue =~ /2001.*May/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2001.*June/i || \$etc_issue =~ /2001.*June/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2001.*August/i || \$etc_issue =~ /2001.*August/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2002.*February/i || \$etc_issue =~ /2002.*February/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2002.*March/i || \$etc_issue =~ /2002.*March/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2002.*May/i || \$etc_issue =~ /2002.*May/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2002.*July/i || \$etc_issue =~ /2002.*July/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2002.*Nov/i || \$etc_issue =~ /2002.*Nov/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/scilinux-relase 2>/dev/null\` =~ /2003.*Summer/i) { print "oscheck='SCI Linux'\\n"; } elsif (\`cat /etc/scilinux-relase 2>/dev/null\` =~ /2004.*Summer/i) { print "oscheck='SCI Linux'\\n"; } elsif (\`cat /etc/scilinux-relase 2>/dev/null\` =~ /2005.*Summer/i) { print "oscheck='SCI Linux'\\n"; } elsif (\$etc_issue =~ /LinuxPPC\\s+2000/i) { print "oscheck='LinuxPPC'\\n"; } elsif (\$etc_issue =~ /Trustix.*Enterprise.*([0-9\\.]+)/i) { print "oscheck='Trustix SE'\\n"; } elsif (\$etc_issue =~ /Trustix.*1\\.1/i) { print "oscheck='Trustix'\\n"; } elsif (\$etc_issue =~ /Trustix.*1\\.2/i) { print "oscheck='Trustix'\\n"; } elsif (\$etc_issue =~ /Trustix.*1\\.5/i) { print "oscheck='Trustix'\\n"; } elsif (\$etc_issue =~ /Trustix.*\\s([0-9\\.]+)/i) { print "oscheck='Trustix'\\n"; } elsif (\$etc_issue =~ /Tawie\\s+Server\\s+Linux.*([0-9\\.]+)/i) { print "oscheck='Tawie Server Linux'\\n"; } elsif (\$etc_issue =~ /tinysofa.*release\\s+1\\.0/i) { print "oscheck='TinySofa Linux'\\n"; } elsif (\`cat /etc/tinysofa-release 2>/dev/null\` =~ /classic.*release\\s+2\\.0/i) { print "oscheck='TinySofa Linux'\\n"; } elsif (\`cat /etc/tinysofa-release 2>/dev/null\` =~ /enterprise.*release\\s+2\\.0/i) { print "oscheck='TinySofa Linux'\\n"; } elsif (\$etc_issue =~ /Cendio\\s*LBS.*\\s3\\.1/i || \`cat /etc/lbs-release 2>/dev/null\` =~ /3\\.1/) { print "oscheck='Cendio LBS Linux'\\n"; } elsif (\$etc_issue =~ /Cendio\\s*LBS.*\\s3\\.2/i || \`cat /etc/lbs-release 2>/dev/null\` =~ /3\\.2/) { print "oscheck='Cendio LBS Linux'\\n"; } elsif (\$etc_issue =~ /Cendio\\s*LBS.*\\s3\\.3/i || \`cat /etc/lbs-release 2>/dev/null\` =~ /3\\.3/) { print "oscheck='Cendio LBS Linux'\\n"; } elsif (\$etc_issue =~ /Cendio\\s*LBS.*\\s4\\.0/i || \`cat /etc/lbs-release 2>/dev/null\` =~ /4\\.0/) { print "oscheck='Cendio LBS Linux'\\n"; } elsif (\$etc_issue =~ /Cendio\\s*LBS.*\\s4\\.1/i || \`cat /etc/lbs-release 2>/dev/null\` =~ /4\\.1/) { print "oscheck='Cendio LBS Linux'\\n"; } elsif (\`cat /etc/ute-release 2>/dev/null\` =~ /Ute\\s+Linux\\s+release\\s+1\\.0/i) { print "oscheck='Ute Linux'\\n"; } elsif (\$etc_issue =~ /Lanthan\\s+Linux\\s+release\\s+1\\.0/i || \`cat /etc/lanthan-release 2>/dev/null\` =~ /1\\.0/) { print "oscheck='Lanthan Linux'\\n"; } elsif (\$etc_issue =~ /Lanthan\\s+Linux\\s+release\\s+2\\.0/i || \`cat /etc/lanthan-release 2>/dev/null\` =~ /2\\.0/) { print "oscheck='Lanthan Linux'\\n"; } elsif (\$etc_issue =~ /Lanthan\\s+Linux\\s+release\\s+3\\.0/i || \`cat /etc/lanthan-release 2>/dev/null\` =~ /3\\.0/) { print "oscheck='Lanthan Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.0\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.0\\s+/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.1\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.1\\s+/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.2\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.2\\s+/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.3\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.3\\s+/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+3\\.0\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+3\\.0\\s+/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+4\\.0\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /\\s4\\.0\\s/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\`cat /etc/latinux-release 2>/dev/null\` =~ /Latinux\\s+8\\s/i) { print "oscheck='Corvus Latinux'\\n"; } elsif (\$etc_issue =~ /Immunix.*\\s([0-9\\.]+)/i || \`cat /etc/immunix-release 2>/dev/null\` =~ /([0-9\\.]+)/) { print "oscheck='Immunix Linux'\\n"; } elsif (-d "/usr/portage") { print "oscheck='Gentoo Linux'\\n"; } elsif (\`cat /etc/securelinux-release 2>/dev/null\` =~ /SecureLinux.*1\\.0/i) { print "oscheck='Secure Linux'\\n"; } elsif (\`cat /etc/openna-release 2>/dev/null\` =~ /release\\s+1\\.0\\s/i) { print "oscheck='OpenNA Linux'\\n"; } elsif (\`cat /etc/openna-release 2>/dev/null\` =~ /release\\s+2\\.0\\s/i) { print "oscheck='OpenNA Linux'\\n"; } elsif (-r "/etc/antitachyon-distribution" && \`uname -r\` =~ /2\\.4\\./) { print "oscheck='SoL Linux'\\n"; } elsif (-r "/etc/antitachyon-distribution" && \`uname -r\` =~ /2\\.6\\./) { print "oscheck='SoL Linux'\\n"; } elsif (\$etc_issue =~ /coherent\\s*technology.*\\s([0-9\\.]+)/i || \`cat /etc/coherent-release 2>/dev/null\` =~ /([0-9\\.]+)/ ) { print "oscheck='Coherent Technology Linux'\\n"; } elsif (\$etc_issue =~ /PS2\\s+Linux\\s+release\\s+1.0/i) { print "oscheck='Playstation Linux'\\n"; } elsif (\`cat /etc/startcom-release 2>/dev/null\` =~ /([0-9\\.]+)/) { print "oscheck='StartCom Linux'\\n"; } elsif (\`cat /etc/yoper-release 2>/dev/null\` =~ /Yoper\\s+Linux\\s+2.0/i) { print "oscheck='Yoper Linux'\\n"; } elsif (\`cat /etc/yoper-release 2>/dev/null\` =~ /Yoper\\s+Linux\\s+2.1/i) { print "oscheck='Yoper Linux'\\n"; } elsif (\`cat /etc/yoper-release 2>/dev/null\` =~ /Yoper\\s+Linux\\s+2.2/i) { print "oscheck='Yoper Linux'\\n"; } elsif (\`cat /etc/CxM-release 2>/dev/null\` =~ /8\\.1/ || \$etc_issue =~ /Caixa\\s+8\\.1\\s/i) { print "oscheck='Caixa Magica'\\n"; } elsif (\`cat /etc/CxM-release 2>/dev/null\` =~ /10\\.0/ || \$etc_issue =~ /Caixa\\s+10\\.0\\s/i) { print "oscheck='Caixa Magica'\\n"; } elsif (\$uname =~ /FreeBSD.*?\\s([0-9\\.]+)/i) { print "oscheck='FreeBSD'\\n"; } elsif (\$uname =~ /DragonFly.*?\\s1\\.0A/i) { print "oscheck='DragonFly BSD'\\n"; } elsif (\$uname =~ /DragonFly.*?\\s1\\.2A/i) { print "oscheck='DragonFly BSD'\\n"; } elsif (\$uname =~ /OpenBSD.*?\\s([0-9\\.]+)/i) { print "oscheck='OpenBSD'\\n"; } elsif (\$uname =~ /NetBSD.*1\\.5/i) { print "oscheck='NetBSD'\\n"; } elsif (\$uname =~ /NetBSD.*1\\.6/i) { print "oscheck='NetBSD'\\n"; } elsif (\$uname =~ /NetBSD.*2\\.0/i) { print "oscheck='NetBSD'\\n"; } elsif (\$uname =~ /NetBSD.*3\\.0/i) { print "oscheck='NetBSD'\\n"; } elsif (\$uname =~ /BSDI.*\\s([0-9\\.]+)/i) { print "oscheck='BSDI'\\n"; } elsif (\$uname =~ /HP-UX.*(1[01]\\.[0-9\\.]+)/) { print "oscheck='HP/UX'\\n"; } elsif (\$uname =~ /IRIX.*([0-9\\.]+)/i) { print "oscheck='SGI Irix'\\n"; } elsif (\$uname =~ /OSF1.*4\\.0/) { print "oscheck='DEC/Compaq OSF/1'\\n"; } elsif (\$uname =~ /OSF1.*V5.1/) { print "oscheck='DEC/Compaq OSF/1'\\n"; } elsif (\$uname =~ /AIX\\s+\\S+\\s+(\\d+)\\s+(\\d+)\\s+/i) { print "oscheck='IBM AIX'\\n"; } elsif (\$uname =~ /SCO_SV.*\\s5\\./i) { print "oscheck='SCO OpenServer'\\n"; } elsif (\$uname =~ /SCO_SV.*\\s6\\./i) { print "oscheck='SCO OpenServer'\\n"; } elsif (\`sw_vers 2>/dev/null\` =~ /ProductVersion:\\s+10\\.0/i) { print "oscheck='Mac OS X'\\n"; } elsif (\`sw_vers 2>/dev/null\` =~ /ProductVersion:\\s+10\\.1/i) { print "oscheck='Mac OS X'\\n"; } elsif (\`sw_vers 2>/dev/null\` =~ /ProductVersion:\\s+10\\.2/i) { print "oscheck='Mac OS X'\\n"; } elsif (\`sw_vers 2>/dev/null\` =~ /ProductVersion:\\s+10\\.3/i) { print "oscheck='Mac OS X'\\n"; } elsif (\`sw_vers 2>/dev/null\` =~ /ProductVersion:\\s+10\\.4/i) { print "oscheck='Mac OS X'\\n"; } elsif (\$uname =~ /Darwin.*\\s([0-9\\.]+)/) { print "oscheck='Darwin'\\n"; } elsif (\`cat /etc/SuSE-release 2>/dev/null\` =~ /Java Desktop System.*\\nVERSION = 1\\.0/i) { print "oscheck='Sun Java Desktop System'\\n"; } elsif (\`cat /etc/SuSE-release 2>/dev/null\` =~ /Java Desktop System.*\\nVERSION = 2\\.0/i) { print "oscheck='Sun Java Desktop System'\\n"; } elsif (\`cat /etc/SuSE-release 2>/dev/null\` =~ /Java Desktop System.*\\nVERSION = 3\\.0/i) { print "oscheck='Sun Java Desktop System'\\n"; } elsif (\$uname =~ /SunOS.*\\s5\\.9\\s/i && \`cat /etc/sun-release 2>/dev/null\` =~ /Sun\\s+Java\\s+Desktop/) { print "oscheck='Sun Java Desktop System'\\n"; } elsif (\`uname -r\` =~ /2\\.0\\./) { print "oscheck='Generic Linux'\\n"; } elsif (\`uname -r\` =~ /2\\.2\\./) { print "oscheck='Generic Linux'\\n"; } elsif (\`uname -r\` =~ /2\\.4\\./) { print "oscheck='Generic Linux'\\n"; } elsif (\`uname -r\` =~ /2\\.4\\./) { print "oscheck='Generic Linux'\\n"; } elsif (\`uname -r\` =~ /2\\.6\\./) { print "oscheck='Generic Linux'\\n"; } elsif (\`uname -r\` =~ /2\\.7\\./) { print "oscheck='Generic Linux'\\n"; } elsif ((-d "c:/windows" || -d "c:/winnt") && \`ver\` =~ /XP/) { print "oscheck='Windows'\\n"; } elsif ((-d "c:/windows" || -d "c:/winnt") && \`ver\` =~ /2000/) { print "oscheck='Windows'\\n"; } elsif ((-d "c:/windows" || -d "c:/winnt") && \`ver\` =~ /2003/) { print "oscheck='Windows'\\n"; } EOD . /tmp/.webmin/$$.check rm -f /tmp/.webmin/$$.check cd /usr/libexec/webmin config_dir=/etc/webmin var_dir=/var/webmin perl=/usr/bin/perl autoos=3 if [ "$WEBMIN_PORT" != "" ]; then port=$WEBMIN_PORT else port=10000 fi login=root if [ -r /etc/shadow ]; then #crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :` crypt=x else crypt=`grep "^root:" /etc/passwd | cut -f 2 -d :` fi host=`hostname` ssl=1 atboot=1 nochown=1 autothird=1 noperlpath=1 nouninstall=1 nostart=1 export config_dir var_dir perl autoos port login crypt host ssl nochown autothird noperlpath nouninstall nostart allow ./setup.sh >/tmp/.webmin/webmin-setup.out 2>&1 webmin-1.260-initscript.patch: --- NEW FILE webmin-1.260-initscript.patch --- --- webmin-1.260/webmin-init.initscript 2006-01-29 19:05:30.000000000 -0500 +++ webmin-1.260/webmin-init 2006-03-05 18:04:54.000000000 -0500 @@ -1,16 +1,16 @@ #!/bin/sh -# chkconfig: 235 99 10 +# chkconfig: - 99 10 # description: Start or stop the Webmin server # ### BEGIN INIT INFO # Provides: webmin # Required-Start: $network $syslog # Required-Stop: $network -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 # Description: Start or stop the Webmin server ### END INIT INFO +. /etc/rc.d/init.d/functions + start=/etc/webmin/start stop=/etc/webmin/stop lockfile=/var/lock/subsys/webmin @@ -20,18 +20,28 @@ case "$1" in 'start') + echo -n 'Starting the webmin daemon...' $start >/dev/null 2>&1 /dev/null 2>&1 + success; + else + failure; fi + echo ;; 'stop') - $stop + echo -n 'Stopping the webmin daemon...' + $stop >/dev/null 2>&1 RETVAL=$? if [ "$RETVAL" = "0" ]; then rm -f $lockfile + success; + else + failure; fi + echo ;; 'status') pidfile=`grep "^pidfile=" $confFile | sed -e 's/pidfile=//g'` @@ -42,16 +52,20 @@ pid=`cat $pidfile` kill -0 $pid >/dev/null 2>&1 if [ "$?" = "0" ]; then - echo "$name (pid $pid) is running" + echo -n "$name (pid $pid) is running" RETVAL=0 + success; else - echo "$name is stopped" + echo -n "$name is stopped" RETVAL=1 + failure; fi else - echo "$name is stopped" + echo -n "$name is stopped" RETVAL=1 + failure; fi + echo ;; 'restart') $stop && $start --- NEW FILE webmin-uninstall.sh --- #!/bin/sh printf "Are you sure you want to uninstall Webmin? (y/n) : " read answer printf "\n" if [ "\$answer" = "y" ]; then echo "Removing webmin RPM .." rpm -e --nodeps webmin echo "Done!" fi --- NEW FILE webmin.spec --- #%define BuildRoot /tmp/%{name}-%{version} %define __spec_install_post %{nil} Summary: A web-based administration interface for Unix systems. Name: webmin Version: 1.260 Release: 1.fe5 Provides: %{name}-%{version} PreReq: /bin/sh /usr/bin/perl Requires: /bin/sh /usr/bin/perl AutoReq: 0 License: Freeware Group: System/Tools URL: http://www.webmin.com/ Source: http://www.webmin.com/download/%{name}-%{version}.tar.gz Source1: run-setup.sh Source2: webmin-uninstall.sh Patch0: webmin-1.260-initscript.patch Vendor: Jamie Cameron BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description A web-based administration interface for Unix systems. Using Webmin you can configure DNS, DHCP, Samba, NFS, local/remote filesystems and more using your web browser. After installation, you can enable and start the webmin chkconfig(8) service and enter the URL http://localhost:10000/ into your browser and login as root with your root password. %prep %setup -q %patch0 -p1 %build (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - rm -f mount/freebsd-mounts* rm -f mount/openbsd-mounts* rm -f mount/macos-mounts* rm -f webmin-gentoo-init rm -rf format bsdexports hpuxexports sgiexports zones rbac chmod -R og-w . %install mkdir -p %{buildroot}/usr/libexec/webmin mkdir -p %{buildroot}/etc/sysconfig/daemons mkdir -p %{buildroot}/etc/rc.d/{rc0.d,rc1.d,rc2.d,rc3.d,rc5.d,rc6.d} mkdir -p %{buildroot}/etc/init.d mkdir -p %{buildroot}/etc/pam.d mkdir -p %{buildroot}/etc/webmin cp -rp * %{buildroot}/usr/libexec/webmin cp webmin-daemon %{buildroot}/etc/sysconfig/daemons/webmin cp webmin-init %{buildroot}/etc/init.d/webmin cp webmin-pam %{buildroot}/etc/pam.d/webmin echo rpm >%{buildroot}/usr/libexec/webmin/install-type cp -fp %SOURCE1 %{buildroot}/usr/libexec/webmin cp -fp %SOURCE2 %{buildroot}/usr/libexec/webmin %clean [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} %files %defattr(-,root,root) /usr/libexec/webmin /etc/init.d/webmin /etc/sysconfig/daemons /etc/webmin %config /etc/pam.d/webmin %pre # Save /etc/webmin in case the upgrade trashes it if [ "$1" -gt 1 ]; then rm -rf /etc/.webmin-backup cp -r /etc/webmin /etc/.webmin-backup fi :; %post if [ "$1" -eq 1 ]; then chkconfig --add webmin; fi if [ "$1" -ge 1 ]; then . /usr/libexec/webmin/run-setup.sh; fi if [ "$1" -gt 1 ]; then inetd=`grep "^inetd=" /etc/webmin/miniserv.conf 2>/dev/null | sed -e 's/inetd=//g'` # Upgrading the RPM, so stop the old webmin properly if [ "$inetd" != "1" ]; then if /etc/init.d/webmin status >/dev/null 2>&1; then /etc/init.d/webmin stop >/dev/null 2>&1 /dev/null 2>&1 /dev/null 2>&1 || :; grep root=/usr/libexec/webmin /etc/webmin/miniserv.conf >/dev/null 2>&1 if [ "$?" = 0 ]; then # RPM is being removed, and no new version of webmin # has taken it's place. Run uninstalls and stop the server echo "Running uninstall scripts .." (cd /usr/libexec/webmin ; WEBMIN_CONFIG=/etc/webmin WEBMIN_VAR=/var/webmin LANG= /usr/libexec/webmin/run-uninstalls.pl) /etc/init.d/webmin stop >/dev/null 2>&1 /dev/null 2>&1 /dev/null 2>&1 if [ "$?" = 0 ]; then # RPM is being removed, and no new version of webmin # has taken it's place. Delete the config files rm -rf /etc/webmin /var/webmin fi fi :; %triggerpostun -- webmin if [ ! -d /var/webmin -a "$1" = 2 ]; then echo Re-creating /var/webmin directory mkdir /var/webmin fi if [ ! -r /etc/webmin/miniserv.conf -a -d /etc/.webmin-backup -a "$1" = 2 ]; then echo Recovering /etc/webmin directory rm -rf /etc/.webmin-broken mv /etc/webmin /etc/.webmin-broken mv /etc/.webmin-backup /etc/webmin /etc/init.d/webmin stop >/dev/null 2>&1 /dev/null 2>&1 - 1.260-1.fe5 - imported into Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/webmin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2006 23:26:00 -0000 1.1 +++ .cvsignore 5 Mar 2006 23:35:59 -0000 1.2 @@ -0,0 +1 @@ +webmin-1.260.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/webmin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2006 23:26:00 -0000 1.1 +++ sources 5 Mar 2006 23:35:59 -0000 1.2 @@ -0,0 +1 @@ +c45fe387902405cb36a1a5c6a240ad0d webmin-1.260.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 23:53:58 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sun, 5 Mar 2006 18:53:58 -0500 Subject: rpms/mm - New directory Message-ID: <200603052354.k25Ns0s6022180@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22172/mm Log Message: Directory /cvs/extras/rpms/mm added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 23:54:03 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sun, 5 Mar 2006 18:54:03 -0500 Subject: rpms/mm/devel - New directory Message-ID: <200603052354.k25Ns5PK022196@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22172/mm/devel Log Message: Directory /cvs/extras/rpms/mm/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 00:13:53 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sun, 5 Mar 2006 19:13:53 -0500 Subject: rpms/mm/devel Makefile,NONE,1.1 sources,NONE,1.1 Message-ID: <200603060013.k260DtGs024218@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24207 Added Files: Makefile sources Log Message: fixup for initial checkin ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- 393b0891a889a4e9f9481d18d976366c mm-1.4.0.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 01:31:13 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sun, 5 Mar 2006 20:31:13 -0500 Subject: rpms/python-imaging/devel .cvsignore, 1.2, 1.3 python-imaging.spec, 1.6, 1.7 sources, 1.2, 1.3 python-imaging-build.patch, 1.1, NONE python-imaging-ft2.patch, 1.1, NONE python-imaging-giftrans.patch, 1.1, NONE python-imaging-no-rexec.patch, 1.1, NONE python-imaging-olefileio.patch, 1.1, NONE python-imaging-png.patch, 1.1, NONE Message-ID: <200603060131.k261Vjqx026316@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-imaging/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26295 Modified Files: .cvsignore python-imaging.spec sources Removed Files: python-imaging-build.patch python-imaging-ft2.patch python-imaging-giftrans.patch python-imaging-no-rexec.patch python-imaging-olefileio.patch python-imaging-png.patch Log Message: * Sun Mar 5 2006 Jos?? Matos - 1.1.5-1 - Update to 1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-imaging/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:15:21 -0000 1.2 +++ .cvsignore 6 Mar 2006 01:31:12 -0000 1.3 @@ -1 +1 @@ -Imaging-1.1.4.tar.gz +Imaging-1.1.5.tar.gz Index: python-imaging.spec =================================================================== RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-imaging.spec 23 May 2005 00:04:27 -0000 1.6 +++ python-imaging.spec 6 Mar 2006 01:31:12 -0000 1.7 @@ -4,24 +4,24 @@ Summary: Python's own image processing library Name: python-imaging -Version: 1.1.4 -Release: 9 +Version: 1.1.5 +Release: 1%{?dist} License: Distributable Group: Development/Languages -Source0: http://effbot.org/downloads/Imaging-1.1.4.tar.gz -Patch0: %{name}-ft2.patch -Patch1: %{name}-build.patch -Patch2: %{name}-no-xv.patch -Patch3: %{name}-olefileio.patch -Patch4: %{name}-png.patch -Patch5: %{name}-no-rexec.patch -Patch6: %{name}-giftrans.patch +Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz +Patch0: %{name}-no-xv.patch URL: http://www.pythonware.com/products/pil/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python-devel, libjpeg-devel, zlib-devel, XFree86-devel -BuildRequires: tkinter, %{_includedir}/tcl.h, %{_includedir}/tk.h +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel +BuildRequires: tkinter, tk-devel + Requires: python-abi = %{pyver} +Requires: libjpeg +Requires: zlib +Requires: freetype +Requires: tkinter %description Python Imaging Library @@ -37,7 +37,9 @@ %package devel Summary: Development files for python-imaging. Group: Development/Languages -Requires: %{name} = %{version}-%{release}, python-devel, %{py_incdir} +Requires: %{name} = %{version}-%{release}, python-devel +Requires: libjpeg-devel +Requires: zlib-devel %description devel Development files for python-imaging. @@ -46,25 +48,23 @@ %prep %setup -q -n Imaging-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +# fix the interpreter path for Scripts/*.py +cd Scripts +for scr in *.py +do + sed -e "s|/usr/local/bin/python|%{_bindir}/python|" $scr > tmp.py + mv tmp.py $scr + chmod 755 $scr +done %build -cd libImaging -%configure -make \ -%ifarch x86_64 - CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \ -%endif - %{?_smp_mflags} +# Is this still relevant? (It was used in 1.1.4) +#%ifarch x86_64 +# CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \ +#%endif -cd .. -%{__python} setup.py build +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install @@ -73,6 +73,9 @@ install -m 644 libImaging/*.h $RPM_BUILD_ROOT/%{py_incdir}/Imaging %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +# There is no need to ship the binaries since they are already packaged +# in %doc +rm -rf $RPM_BUILD_ROOT%{_bindir} %check || : PYTHONPATH=$(ls -1d build/lib.linux*) %{__python} selftest.py @@ -84,7 +87,7 @@ %files %defattr (-,root,root) -%doc README CHANGES-114 +%doc README CHANGES-115 %{python_sitearch}/PIL.pth %dir %{python_sitearch}/PIL %{python_sitearch}/PIL/*.so @@ -95,10 +98,13 @@ %files devel %defattr (0644,root,root,755) %{py_incdir}/Imaging -%doc Doc Scripts Images Sane +%doc Docs Scripts Images Sane %changelog +* Sun Mar 5 2006 Jos?? Matos - 1.1.5-1 +- Update to 1.1.5 + * Sun May 22 2005 Jeremy Katz - 1.1.4-9 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-imaging/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:15:21 -0000 1.2 +++ sources 6 Mar 2006 01:31:12 -0000 1.3 @@ -1 +1 @@ -d2c03c25a9a0128832137dd536da88da Imaging-1.1.4.tar.gz +a64512e39469213ced0d091b9eba76c0 Imaging-1.1.5.tar.gz --- python-imaging-build.patch DELETED --- --- python-imaging-ft2.patch DELETED --- --- python-imaging-giftrans.patch DELETED --- --- python-imaging-no-rexec.patch DELETED --- --- python-imaging-olefileio.patch DELETED --- --- python-imaging-png.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 01:49:15 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sun, 5 Mar 2006 20:49:15 -0500 Subject: rpms/python-imaging/FC-4 .cvsignore, 1.2, 1.3 python-imaging.spec, 1.6, 1.7 sources, 1.2, 1.3 python-imaging-build.patch, 1.1, NONE python-imaging-ft2.patch, 1.1, NONE python-imaging-giftrans.patch, 1.1, NONE python-imaging-no-rexec.patch, 1.1, NONE python-imaging-olefileio.patch, 1.1, NONE python-imaging-png.patch, 1.1, NONE Message-ID: <200603060149.k261nlXn026465@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-imaging/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444 Modified Files: .cvsignore python-imaging.spec sources Removed Files: python-imaging-build.patch python-imaging-ft2.patch python-imaging-giftrans.patch python-imaging-no-rexec.patch python-imaging-olefileio.patch python-imaging-png.patch Log Message: * Sun Mar 5 2006 Jos?? Matos - 1.1.5-1 - Update to 1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:15:21 -0000 1.2 +++ .cvsignore 6 Mar 2006 01:49:15 -0000 1.3 @@ -1 +1 @@ -Imaging-1.1.4.tar.gz +Imaging-1.1.5.tar.gz Index: python-imaging.spec =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-4/python-imaging.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-imaging.spec 23 May 2005 00:04:27 -0000 1.6 +++ python-imaging.spec 6 Mar 2006 01:49:15 -0000 1.7 @@ -4,24 +4,24 @@ Summary: Python's own image processing library Name: python-imaging -Version: 1.1.4 -Release: 9 +Version: 1.1.5 +Release: 1%{?dist} License: Distributable Group: Development/Languages -Source0: http://effbot.org/downloads/Imaging-1.1.4.tar.gz -Patch0: %{name}-ft2.patch -Patch1: %{name}-build.patch -Patch2: %{name}-no-xv.patch -Patch3: %{name}-olefileio.patch -Patch4: %{name}-png.patch -Patch5: %{name}-no-rexec.patch -Patch6: %{name}-giftrans.patch +Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz +Patch0: %{name}-no-xv.patch URL: http://www.pythonware.com/products/pil/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python-devel, libjpeg-devel, zlib-devel, XFree86-devel -BuildRequires: tkinter, %{_includedir}/tcl.h, %{_includedir}/tk.h +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel +BuildRequires: tkinter, tk-devel + Requires: python-abi = %{pyver} +Requires: libjpeg +Requires: zlib +Requires: freetype +Requires: tkinter %description Python Imaging Library @@ -37,7 +37,9 @@ %package devel Summary: Development files for python-imaging. Group: Development/Languages -Requires: %{name} = %{version}-%{release}, python-devel, %{py_incdir} +Requires: %{name} = %{version}-%{release}, python-devel +Requires: libjpeg-devel +Requires: zlib-devel %description devel Development files for python-imaging. @@ -46,25 +48,23 @@ %prep %setup -q -n Imaging-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +# fix the interpreter path for Scripts/*.py +cd Scripts +for scr in *.py +do + sed -e "s|/usr/local/bin/python|%{_bindir}/python|" $scr > tmp.py + mv tmp.py $scr + chmod 755 $scr +done %build -cd libImaging -%configure -make \ -%ifarch x86_64 - CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \ -%endif - %{?_smp_mflags} +# Is this still relevant? (It was used in 1.1.4) +#%ifarch x86_64 +# CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \ +#%endif -cd .. -%{__python} setup.py build +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install @@ -73,6 +73,9 @@ install -m 644 libImaging/*.h $RPM_BUILD_ROOT/%{py_incdir}/Imaging %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +# There is no need to ship the binaries since they are already packaged +# in %doc +rm -rf $RPM_BUILD_ROOT%{_bindir} %check || : PYTHONPATH=$(ls -1d build/lib.linux*) %{__python} selftest.py @@ -84,7 +87,7 @@ %files %defattr (-,root,root) -%doc README CHANGES-114 +%doc README CHANGES-115 %{python_sitearch}/PIL.pth %dir %{python_sitearch}/PIL %{python_sitearch}/PIL/*.so @@ -95,10 +98,13 @@ %files devel %defattr (0644,root,root,755) %{py_incdir}/Imaging -%doc Doc Scripts Images Sane +%doc Docs Scripts Images Sane %changelog +* Sun Mar 5 2006 Jos?? Matos - 1.1.5-1 +- Update to 1.1.5 + * Sun May 22 2005 Jeremy Katz - 1.1.4-9 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:15:21 -0000 1.2 +++ sources 6 Mar 2006 01:49:15 -0000 1.3 @@ -1 +1 @@ -d2c03c25a9a0128832137dd536da88da Imaging-1.1.4.tar.gz +a64512e39469213ced0d091b9eba76c0 Imaging-1.1.5.tar.gz --- python-imaging-build.patch DELETED --- --- python-imaging-ft2.patch DELETED --- --- python-imaging-giftrans.patch DELETED --- --- python-imaging-no-rexec.patch DELETED --- --- python-imaging-olefileio.patch DELETED --- --- python-imaging-png.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 03:38:39 2006 From: fedora-extras-commits at redhat.com (Callum Lerwick (seg)) Date: Sun, 5 Mar 2006 22:38:39 -0500 Subject: rpms/tinyfugue/FC-3 tinyfugue.spec,1.1,1.2 Message-ID: <200603060339.k263dBAl031004@cvs-int.fedora.redhat.com> Author: seg Update of /cvs/extras/rpms/tinyfugue/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30956/FC-3 Modified Files: tinyfugue.spec Log Message: * Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 - Added {?dist} to Release. Index: tinyfugue.spec =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/FC-3/tinyfugue.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyfugue.spec 28 Feb 2006 19:28:42 -0000 1.1 +++ tinyfugue.spec 6 Mar 2006 03:38:38 -0000 1.2 @@ -2,7 +2,7 @@ Name: tinyfugue Version: 5.0 -Release: 0.2.b7 +Release: 0.3.b7%{?dist} Summary: A MU* client Group: Applications/Internet @@ -44,6 +44,9 @@ %doc CHANGES COPYING CREDITS README %changelog +* Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 +- Added {?dist} to Release. + * Wed Feb 22 2006 Callum Lerwick - 5.0-0.2.b7 - Removed Epoch. From fedora-extras-commits at redhat.com Mon Mar 6 03:38:45 2006 From: fedora-extras-commits at redhat.com (Callum Lerwick (seg)) Date: Sun, 5 Mar 2006 22:38:45 -0500 Subject: rpms/tinyfugue/FC-4 tinyfugue.spec,1.1,1.2 Message-ID: <200603060339.k263dHwu031007@cvs-int.fedora.redhat.com> Author: seg Update of /cvs/extras/rpms/tinyfugue/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30956/FC-4 Modified Files: tinyfugue.spec Log Message: * Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 - Added {?dist} to Release. Index: tinyfugue.spec =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/FC-4/tinyfugue.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyfugue.spec 28 Feb 2006 19:28:42 -0000 1.1 +++ tinyfugue.spec 6 Mar 2006 03:38:45 -0000 1.2 @@ -2,7 +2,7 @@ Name: tinyfugue Version: 5.0 -Release: 0.2.b7 +Release: 0.3.b7%{?dist} Summary: A MU* client Group: Applications/Internet @@ -44,6 +44,9 @@ %doc CHANGES COPYING CREDITS README %changelog +* Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 +- Added {?dist} to Release. + * Wed Feb 22 2006 Callum Lerwick - 5.0-0.2.b7 - Removed Epoch. From fedora-extras-commits at redhat.com Mon Mar 6 03:38:51 2006 From: fedora-extras-commits at redhat.com (Callum Lerwick (seg)) Date: Sun, 5 Mar 2006 22:38:51 -0500 Subject: rpms/tinyfugue/devel tinyfugue.spec,1.1,1.2 Message-ID: <200603060339.k263dPia031011@cvs-int.fedora.redhat.com> Author: seg Update of /cvs/extras/rpms/tinyfugue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30956/devel Modified Files: tinyfugue.spec Log Message: * Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 - Added {?dist} to Release. Index: tinyfugue.spec =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/devel/tinyfugue.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyfugue.spec 28 Feb 2006 19:28:42 -0000 1.1 +++ tinyfugue.spec 6 Mar 2006 03:38:50 -0000 1.2 @@ -2,7 +2,7 @@ Name: tinyfugue Version: 5.0 -Release: 0.2.b7 +Release: 0.3.b7%{?dist} Summary: A MU* client Group: Applications/Internet @@ -44,6 +44,9 @@ %doc CHANGES COPYING CREDITS README %changelog +* Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 +- Added {?dist} to Release. + * Wed Feb 22 2006 Callum Lerwick - 5.0-0.2.b7 - Removed Epoch. From fedora-extras-commits at redhat.com Mon Mar 6 04:18:18 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sun, 5 Mar 2006 23:18:18 -0500 Subject: rpms/shapelib/devel shapelib-1.2.10-Makefile2.patch, 1.1, 1.2 shapelib.spec, 1.8, 1.9 Message-ID: <200603060418.k264Iod6000872@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/shapelib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv845 Modified Files: shapelib-1.2.10-Makefile2.patch shapelib.spec Log Message: Updated makefile bug that affected parallel builds shapelib-1.2.10-Makefile2.patch: Index: shapelib-1.2.10-Makefile2.patch =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/shapelib-1.2.10-Makefile2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- shapelib-1.2.10-Makefile2.patch 5 Mar 2006 16:53:38 -0000 1.1 +++ shapelib-1.2.10-Makefile2.patch 6 Mar 2006 04:18:17 -0000 1.2 @@ -1,5 +1,5 @@ --- shapelib-1.2.11-orig/contrib/Makefile 2006-01-07 12:34:14.000000000 -0800 -+++ shapelib-1.2.11/contrib/Makefile 2006-03-04 20:11:01.000000000 -0800 ++++ shapelib-1.2.11/contrib/Makefile 2006-03-05 20:09:06.000000000 -0800 @@ -1,9 +1,10 @@ +bindir = /usr/local/bin @@ -12,6 +12,15 @@ CFLAGS = -g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 +@@ -32,7 +33,7 @@ + shpdata: shpdata.c $(SHPGOBJ) + $(CC) $(CFLAGS) shpdata.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpdata + +-shpinfo: shpinfo.c $(SHPOBJ) ++shpinfo: shpinfo.c $(SHPGOBJ) + $(CC) $(CFLAGS) shpinfo.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpinfo + + shpfix: shpfix.c $(SHPOBJ) @@ -64,3 +65,7 @@ testproj: Index: shapelib.spec =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- shapelib.spec 5 Mar 2006 16:53:38 -0000 1.8 +++ shapelib.spec 6 Mar 2006 04:18:17 -0000 1.9 @@ -2,7 +2,7 @@ Summary: API in "C" for Shapefile handling Name: shapelib Version: 1.2.10 -Release: 10.20060304cvs +Release: 11.20060304cvs URL: http://shapelib.maptools.org/ Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz Patch0: shapelib-1.2.10-Makefile.patch @@ -72,6 +72,9 @@ %exclude %{_libdir}/libshp.la %changelog +* Sun Mar 5 2006 Shawn McCann - 1.2.10-11.20060304cvs +- Fixed a makefile bug that messed up parallel builds + * Sat Mar 4 2006 Shawn McCann - 1.2.10-10.20060304cvs - Upgraded to cvs snapshot taken on March 4, 2006 From fedora-extras-commits at redhat.com Mon Mar 6 07:10:01 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:10:01 -0500 Subject: rpms/worminator-data - New directory Message-ID: <200603060710.k267A54I007083@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7075/worminator-data Log Message: Directory /cvs/extras/rpms/worminator-data added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 07:10:08 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:10:08 -0500 Subject: rpms/worminator-data/devel - New directory Message-ID: <200603060710.k267AAFI007098@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7075/worminator-data/devel Log Message: Directory /cvs/extras/rpms/worminator-data/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 07:09:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:09:43 -0500 Subject: rpms/lacewing/devel lacewing.desktop,1.1,1.2 Message-ID: <200603060710.k267AFpk007107@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lacewing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7035 Modified Files: lacewing.desktop Log Message: Small .desktop file cleanups Index: lacewing.desktop =================================================================== RCS file: /cvs/extras/rpms/lacewing/devel/lacewing.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lacewing.desktop 30 Jan 2006 21:34:11 -0000 1.1 +++ lacewing.desktop 6 Mar 2006 07:09:42 -0000 1.2 @@ -6,7 +6,7 @@ Exec=lacewing Icon=lacewing.png Terminal=false +StartupNotify=false Type=Application -Categories=Game;ArcadeGame +Categories=Application;Game;ArcadeGame; Version=1.10 - From fedora-extras-commits at redhat.com Mon Mar 6 07:10:41 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:10:41 -0500 Subject: rpms/worminator-data Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603060710.k267Ahfj007135@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7123 Added Files: Makefile import.log Log Message: Setup of module worminator-data --- NEW FILE Makefile --- # Top level Makefile for module worminator-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 Mar 6 07:10:47 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:10:47 -0500 Subject: rpms/worminator-data/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603060710.k267AnIh007153@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7123/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module worminator-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 Mar 6 07:15:36 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:15:36 -0500 Subject: rpms/overgod/devel overgod.desktop,1.1,1.2 Message-ID: <200603060716.k267G9IR007253@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/overgod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7197 Modified Files: overgod.desktop Log Message: Small .desktop file cleanups Index: overgod.desktop =================================================================== RCS file: /cvs/extras/rpms/overgod/devel/overgod.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- overgod.desktop 31 Jan 2006 21:17:33 -0000 1.1 +++ overgod.desktop 6 Mar 2006 07:15:36 -0000 1.2 @@ -6,6 +6,7 @@ Exec=overgod Icon=overgod.png Terminal=false +StartupNotify=false Type=Application -Categories=Game;ArcadeGame +Categories=Application;Game;ArcadeGame; Version=1.0 From fedora-extras-commits at redhat.com Mon Mar 6 07:16:01 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:16:01 -0500 Subject: rpms/worminator-data import.log,1.1,1.2 Message-ID: <200603060716.k267GYPx007272@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7224 Modified Files: import.log Log Message: auto-import worminator-data-3.0R2.1-1 on branch devel from worminator-data-3.0R2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/worminator-data/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Mar 2006 07:10:41 -0000 1.1 +++ import.log 6 Mar 2006 07:16:01 -0000 1.2 @@ -0,0 +1 @@ +worminator-data-3_0R2_1-1:HEAD:worminator-data-3.0R2.1-1.src.rpm:1141630259 From fedora-extras-commits at redhat.com Mon Mar 6 07:16:08 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:16:08 -0500 Subject: rpms/worminator-data/devel license-change.txt, NONE, 1.1 license.txt, NONE, 1.1 worminator-data.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603060716.k267GeWj007288@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7224/devel Modified Files: .cvsignore sources Added Files: license-change.txt license.txt worminator-data.spec Log Message: auto-import worminator-data-3.0R2.1-1 on branch devel from worminator-data-3.0R2.1-1.src.rpm --- NEW FILE license-change.txt --- As described in license.txt the Worminator 3 license has changed as result of an email exchange, and the permission for this change has been given by David Layne and Keith Palmer in this exchange. This file contains all mails of this exchange seperated by lines containing nothing but "###". ### Message-ID: <43CE2CA2.7060303 at hhs.nl> Date: Wed, 18 Jan 2006 12:55:14 +0100 From: Hans de Goede User-Agent: Mail/News 1.5 (X11/20060103) MIME-Version: 1.0 To: keith at uglyslug.com Subject: Worminator Source (for a Linux port) Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Note: I'm sending this to you and not to any of the other worminator team members as all their emall addresses cause failures. Please forward to David Layne adn the rest of the team, and your own opinion also is valued ofcourse. --- Hi, I was looking for a project to fill my spare time and I ended up with the idea of porting some (allegro) games to Linux. I'm a crazy guy who likes porting and then testing and then coding again more then just playing (although I sometimes enjoy just playing) as such I've not yet targeted a specific game to port I just want to expand the collection of games available for Linux and enjoy myself at the same time. For more on me see: http://home.versatel.nl/jwrdegoede/ I'm most famous for xmame the Unix port of MAME I guess. Worminator sounds like an excellent candidate for my next project. It looks like (I only have Linux so I haven't tried it yet) a very fun game! As I understand it (this is a bit unclear on the homepage) Worminator3 is win32 only and thus probably no longer uses allegro or? Anyways if possible I would like todo a Linux port. I've tried to download the version 1 source but I had to register for that. Can you send me a copy of the version 1 source or preferably the version 3 one? And just as important as having access to the source, under what conditions (license) can I use it? I've burned myself working on less then 100% free software before and I would like to avoid that this time. For the definition of freesoftware see: www.gnu.org Any free license will do for me. For the artwork and sounds you could use a more artwork and sounds oriented license like the Creative Commons licenses. Thanks & Regards, Hans ### Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 44060711 for j.w.r.degoede at hhs.nl; Wed, 18 Jan 2006 15:47:00 +0100 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.41) id 1EzEaS-0004d1-1f for j.w.r.degoede at hhs.nl; Wed, 18 Jan 2006 15:47:00 +0100 Received: from [64.20.44.2] (port=33655 helo=vps.uglyslug.com) by koko.hhs.nl with esmtp (Exim 4.41) id 1EzEaR-0004cp-L7 for j.w.r.degoede at hhs.nl; Wed, 18 Jan 2006 15:46:59 +0100 Received: by vps.uglyslug.com (Postfix, from userid 0) id 7D1BD102DE49E; Wed, 18 Jan 2006 09:46:50 -0500 (EST) From: keith at uglyslug.com Subject: Re: Worminator Source (for a Linux port) To: Hans de Goede Cc: X-Originating-IP: 69.177.133.6 X-Mailer: Usermin 1.250 Message-Id: <1137595610.27424 at vps.uglyslug.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="bound1137595610" Date: Wed, 18 Jan 2006 09:46:50 -0500 (EST) X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 18012006 #161284, status: clean This is a multi-part message in MIME format. --bound1137595610 Content-Type: text/plain Content-Transfer-Encoding: 7bit Hey Hans de Goede, aight so I still have to speak to Dave and the two other guys but... personally, I think it would be *super* cool to have you do a Linux port. I don't think we specifically plastered a license on the game, but we made the source code available and I don't think it'll be any problem to have you work on a Linux port. I believe even the latest version of the game still uses Allegro, just we never tried to compile on Linux/don't know if there are any compatibility issues/never put any time into trying to compile on Linux, and that's why its Win32 only :-) I'm not sure if there's actually any specific Win32 code. In any case, I'll email Dave today and forward him this, he did the programming. You might not get a response right away, we're both very busy with the beginning of the semester and I'll be out-of-town for the next week... but if you don't hear from either one of us within a week, make sure to email me again, I think it'd be really great for you to do a Linux port! - Keith Hans de Goede wrote .. > Note: I'm sending this to you and not to any of the other worminator ### > Hans --bound1137595610-- ### The above mail had a full quote of the first mail which has been removed and the lines have been wrapped at 80 chars, both for readability. ### Message-ID: <43CE6883.1040507 at hhs.nl> Date: Wed, 18 Jan 2006 17:10:43 +0100 From: Hans de Goede User-Agent: Mail/News 1.5 (X11/20060103) MIME-Version: 1.0 To: keith at uglyslug.com Subject: Re: Worminator Source (for a Linux port) References: <1137595610.27424 at vps.uglyslug.com> In-Reply-To: <1137595610.27424 at vps.uglyslug.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit keith at uglyslug.com wrote: > Hey Hans de Goede, aight so I still have to speak to Dave and the two other guys but... personally, I think it would be *super* cool to have you do a >Linux port. I don't think we specifically plastered a license on the game, but we made the source code available and I don't think it'll be any >problem to have you work on a Linux port. > First of all I'm very happy to hear that you like the idea, but I really must insist on slapping a clear License (say GPL for example) on the sources. I plan on providing Linux binaries, but its _really_ a show stopper for me if I can't distribute the sources and allow others to freely redistribute both binaries and sources including modified versions. I realise this is a _lot_ to ask, and I can only hope you (the team) are willing to release the source under such a license. For the artwork (and levels) the story is quite different. A license allowing free redistribution of those is enough. I can fully agree if you don't want others to (re)distribute modified versions of your artwork (and levels). > I believe even the latest version of the game still uses Allegro, just we never tried to compile on Linux/don't know if there are any compatibility >issues/never put any time into trying to compile on Linux, and that's why its Win32 only :-) I'm not sure if there's actually any specific Win32 code. > If thats true that would be great I'm pretty sure it won't compile out of the box, but its a good start. Otherwise if its all directx for example I might take a shot too, but it will be much harder to port. > > In any case, I'll email Dave today and forward him this, he did the programming. You might not get a response right away, we're both very busy with the > beginning of the semester and I'll be out-of-town for the next week... but if you don't hear from either one of us within a week, make sure to email > me again, I think it'd be really great for you to do a Linux port! I understand that an answer may take some time, thanks for the quick respons sofar. Thanks & Regards, Hans ### Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 44128777 for j.w.r.degoede at hhs.nl; Fri, 20 Jan 2006 17:29:24 +0100 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.41) id 1Ezz8e-0006VF-M4 for j.w.r.degoede at hhs.nl; Fri, 20 Jan 2006 17:29:24 +0100 Received: from [64.20.44.2] (port=49613 helo=vps.uglyslug.com) by koko.hhs.nl with esmtp (Exim 4.41) id 1Ezz8e-0006V9-3G for j.w.r.degoede at hhs.nl; Fri, 20 Jan 2006 17:29:24 +0100 Received: by vps.uglyslug.com (Postfix, from userid 0) id 1BD61102DE49E; Fri, 20 Jan 2006 11:29:17 -0500 (EST) From: keith at UglySlug.com Subject: Re: Worminator Source (for a Linux port) To: Hans de Goede Cc: dml1001 at yahoo.com X-Originating-IP: 67.101.106.61 X-Mailer: Usermin 1.250 Message-Id: <1137774557.14913 at vps.uglyslug.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="bound1137774557" Date: Fri, 20 Jan 2006 11:29:17 -0500 (EST) X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 20012006 #161616, status: clean This is a multi-part message in MIME format. --bound1137774557 Content-Type: text/plain Content-Transfer-Encoding: 7bit Awesome, I see no problem with GPL for everything, it doesn't bother me if people change artwork and we've already made the source code available for download so why not GPL? Just need to run that by Dave (hey Dave! thoughts? GPL OK with you?) You should be hearing from Dave if you havn't already, he said it might take him a few days to get the source code cleaned up and ready for you. - Keith Hans de Goede wrote .. > keith at uglyslug.com wrote: > > Hey Hans de Goede, aight so I still have to speak to Dave and the two ### > Thanks & Regards, > > Hans --bound1137774557-- ### The above mail had a full quote of the mail, to which it replied, which has been removed and the lines have been wrapped at 80 chars, both for readability. ### Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 44141865 for j.w.r.degoede at hhs.nl; Sun, 22 Jan 2006 10:23:07 +0100 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.41) id 1F0bRD-0004n8-9R for j.w.r.degoede at hhs.nl; Sun, 22 Jan 2006 10:23:07 +0100 Received: from [68.142.199.87] (port=31396 helo=web81007.mail.mud.yahoo.com) by koko.hhs.nl with smtp (Exim 4.41) id 1F0bRB-0004n2-Hp for j.w.r.degoede at hhs.nl; Sun, 22 Jan 2006 10:23:06 +0100 Received: (qmail 78252 invoked by uid 60001); 22 Jan 2006 09:23:04 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=BB2dO5A36cMMbqFo3Sx8DpuAEFMpg3/pkItl4yHWU/YB46FHtKyS79RX+XDl8jYOJ4SxSwohaz3JFh8oWNZE58RHVouNjAZ9ZyBNsNsHDy+ZtIb4G/HDT7aVUZc2OgerjEmYKycMe7Cn/0p9zwIZZNSw+KIFzwPW7oJr9yE3/GY= ; Message-ID: <20060122092304.78250.qmail at web81007.mail.mud.yahoo.com> Received: from [69.37.40.157] by web81007.mail.mud.yahoo.com via HTTP; Sun, 22 Jan 2006 01:23:04 PST Date: Sun, 22 Jan 2006 01:23:04 -0800 (PST) From: David Layne Subject: Re: Fwd: Worminator Source (for a Linux port) To: j.w.r.degoede at hhs.nl, keith at uglyslug.com In-Reply-To: <1137595678.3039 at vps.uglyslug.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-555987958-1137921784=:56237" Content-Transfer-Encoding: 8bit X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 21012006 #161851, status: clean --0-555987958-1137921784=:56237 Content-Type: multipart/alternative; boundary="0-1522450946-1137921784=:56237" --0-1522450946-1137921784=:56237 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Dear Hans, I understand that you are interested in creating a Linux port of Worminator 3. I have attatched the source code for the latest build I have of the game to this e-mail. In order to test it, you need to download the data file and the maps from our website (I couldn't send everything because the attatchment would have been around 8 megs). Once you compile the executable, make sure that the wormdata.dat file is present as well as the maps folder. If not, the game will probabaly crash. You are free to port this to linux and release it if you like, the game is freeware and I don't mind it being publically available. Good luck with your project, I hope you can make sense of this source code. I wrote it ages ago now, and there are quite a few poorly done portions. If you need any help, let me know. The game is still Allegro based, this new version just uses Winallegro. There shouldnt be alot that you have to change to get it running under Linux (hopefully). Keep me posted as to your progress. Good luck. -David Layne Hans de Goede wrote .. > Note: I'm sending this to you and not to any of the other worminator > team members as all their emall addresses cause failures. ### The above mail had a full quote of the first mail and an attachment containing the source which both been removed and the lines have been wrapped at 80 chars, both for readability (and size). ### Message-ID: <43D3748D.1030400 at hhs.nl> Date: Sun, 22 Jan 2006 13:03:25 +0100 From: Hans de Goede User-Agent: Thunderbird 1.5 (X11/20060112) MIME-Version: 1.0 To: David Layne Subject: Re: Fwd: Worminator Source (for a Linux port) References: <20060122092304.78250.qmail at web81007.mail.mud.yahoo.com> In-Reply-To: <20060122092304.78250.qmail at web81007.mail.mud.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit David Layne wrote: > > Dear Hans, > > I understand that you are interested in creating a Linux port of > Worminator 3. I have attatched the source code for the latest build I > have of the game to this e-mail. In order to test it, you need to > download the data file and the maps from our website (I couldn't send > everything because the attatchment would have been around 8 megs). > Excellent, many thanks! > Once you compile the executable, make sure that the wormdata.dat file is > present as well as the maps folder. If not, the game will probabaly crash. > > You are free to port this to linux and release it if you like, the game > is freeware and I don't mind it being publically available. Making it publically available was the plan :) Could you ellaborate on the freeware part? I wonder did Keith forward my reply to him about the licensing? I'll include it below for reference. Anyways freeware is a bit of an ambigious term, software which is free to download, but comes without any source is often called freeware. Do you mean that the data files and the source are publicdomain, iow anyone can do with it what they want (including closed source commercial spinoffs) ? Public Domain would be fine with me, as that is a legally well defined term, a more restrictive but opensource License like GPL would be fine too. I'm sorry that I've keep nagging about the License part, but I've burned myself in the past by spending (lots of) freetime on projects without a proper license. > Good luck > with your project, I hope you can make sense of this source code. I > wrote it ages ago now, and there are quite a few poorly done portions. > If you need any help, let me know. The game is still Allegro based, > this new version just uses Winallegro. There shouldnt be alot that you > have to change to get it running under Linux (hopefully). > Good to hear that its all allegro, that should indeed make the port relativly easy. As for poorly done code I'm a computerscience teacher, I've seen my part of poorly done code. > Keep me posted as to your progress. Good luck. > I most certainly will, Thanks again, Hans -- the promised mail to Keith --- keith at uglyslug.com wrote: > Hey Hans de Goede, aight so I still have to speak to Dave and the two ### The above mail had a full quote of the mail to Keith about licensing which has been removed readability. The first alinea of the mail below is a reply to a technical??question which was asked in an omitted mail. This mail has been ommited because its not relevant to the license change. ### Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 44209367 for j.w.r.degoede at hhs.nl; Tue, 24 Jan 2006 14:16:12 +0100 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.41) id 1F1O1r-0006hE-80 for j.w.r.degoede at hhs.nl; Tue, 24 Jan 2006 14:16:12 +0100 Received: from [68.142.199.82] (port=44806 helo=web81002.mail.mud.yahoo.com) by koko.hhs.nl with smtp (Exim 4.41) id 1F1O1V-0006fX-Nu for j.w.r.degoede at hhs.nl; Tue, 24 Jan 2006 14:16:07 +0100 Received: (qmail 9246 invoked by uid 60001); 24 Jan 2006 13:15:48 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=o1EgPiH7GCNhWAem0DYFDJYGJVsRvMaCqa1ZJB/W/R/EoxmTjSYQyYj47QzyduHiHbyI+FkDLrPq5sAdw1XwOL5BpVQFAtagaf/9HrobvvZjSSBt8kXUCH74+hfOIaBIXiXM7szGBpRfUnhSoWvZveYIhQ0oGV1lTC8zV7FMsUk= ; Message-ID: <20060124131548.9244.qmail at web81002.mail.mud.yahoo.com> Received: from [69.37.40.157] by web81002.mail.mud.yahoo.com via HTTP; Tue, 24 Jan 2006 05:15:46 PST Date: Tue, 24 Jan 2006 05:15:46 -0800 (PST) From: David Layne Subject: Re: Fwd: Worminator Source (for a Linux port) To: Hans de Goede In-Reply-To: <43D5ECD5.6090704 at hhs.nl> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-1546335489-1138108546=:8366" Content-Transfer-Encoding: 8bit X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 24012006 #162313, status: clean --0-1546335489-1138108546=:8366 Content-Type: multipart/alternative; boundary="0-641554036-1138108546=:8366" --0-641554036-1138108546=:8366 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Good call, thats my fault. I forgot that my latest build had some graphical changes in the data file. I'm attatching the newest data file. Glad the project is going well. I will release a new version of worminator 3 soon with the new data file included. The life essence things were added to make the game a little easier, alot of the weaker enemies drop them now and they heal you when you collect them. BTW, feel free to GPL the code, I was planning on publically releasing it anyway but I kept holding back because I was planning on adding a few more things to it and I just never got around to it. Just leave me listed as the original author of the code and yourself as the developer of the linux port and everything should be fine. Hans de Goede wrote: Hi David & Keith, ### The above mail had a full quote of the omitted mail and an attachment containing wormdata.dat which both been removed and the lines have been wrapped at 80 chars, both for readability (and size). --- NEW FILE license.txt --- Worminator 3 License info ------------------------- The original Worminator 3 readme.txt contained the following license text: "Note: This game, Worminator 3, is Copyright 2003 by David Layne. All artwork in this game is original and is either Copyright 2003 by Keith Palmer or Copyright 2003 by Jeff Nielson. All graphical content in this game is completely original, and you do not have permission to use any artwork from this game without permission from a member of the Worminator Team. See the end of this document for contact information. The sound used in this game was obtained off sites on the Internet (mostly meanrabbit sound archive) and a sound effects CD that I own. I believe that none of these sounds are copyrighted. If they are, please contact me ASAP and I will remove any copyrighted content immediately. All music in this game was composed by Garret Thomson, who holds the copyright on them. All programming in this game was done by David Layne, and only the Allegro library samples were used as a base. Worminator 3 was compiled with MSVC 6.0. WARNING, Disclaimer: This software is provided 'as is' with no warranty of any kind. No member of the Worminator 3 Team may be held in any way responsible for any damage caused by this program. Use this software at your own risk. WARNING: You may not sell Worminator 3 or anything created specifically for use with Worminator 3, nor may you profit directly or indirectly in any way from Worminator 3 without written permission from David Layne (DML1001 at cox.net) and Keith Palmer (Superwormy at hotmail.com). In addition: Worminator 3 is not officially rated by any game rating system, but it is the judgment of the Worminator 3 Team members that this game, Worminator 3, should probably not be played by those under 13 or those opposed to graphic violence. Use your own discretion while playing, and please don't try to hold us responsible if you have a problem with the game. Just don't play it! That said, however, compared to most computer games available today, the violence in Worminator 3 is mild and should not pose a problem to most players. DO NOT separate this ReadMe.txt file from the Worminator 3 package, or alter this file in any way!" --- This license however no longer applies to worminator, the license has been changed to GPL for both the content (graphics, sounds, music) and the sources with permission of David Layne and Keith Palmer. See the file license-change.txt for a copy of the email exchange leading to the change and for the permession notices for this change from both David and Keith. Thus Worminator 3 content, source and binaries are free software; you can redistribute them and/or modify them 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. Version 2 of the GNU GPL is included at the end of this file. You can write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, to obtain a later version (if available). Notice that Worminator3 is still not rated in any game rating systems as describred in the old license text. This notice is just a warning and does not impose any restrictions on the recipients' exercise of the rights granted under the GNU General Public License. --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) 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 Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. , 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. --- NEW FILE worminator-data.spec --- Name: worminator-data Version: 3.0R2.1 Release: 1%{?dist} Summary: Data for worminator the game Group: Amusements/Games License: GPL URL: http://sourceforge.net/projects/worminator/ Source0: http://download.sourceforge.net/worminator/%{name}-%{version}.tar.gz Source1: license.txt Source2: license-change.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description Data for worminator the game where you play as The Worminator and fight your way through many levels of madness and mayhem. Worminator features nine unique weapons, visible character damage, full screen scrolling, sound and music, and much more! %prep #put the docs where %doc wants them install -p -m 0644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_DIR %build #empty / notthing to build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/games/worminator tar xzf %{SOURCE0} -C $RPM_BUILD_ROOT%{_datadir}/games/worminator rm $RPM_BUILD_ROOT%{_datadir}/games/worminator/ICON.ICO %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc license.txt license-change.txt %{_datadir}/games/worminator %changelog * Sat Mar 4 2006 Hans de Goede 3.0R2.1-1 - initial Fedora Extras package - loosely based on the SRPM from Cru: http://naturidentisch.de/packages/fc4/worminator/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/worminator-data/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Mar 2006 07:10:47 -0000 1.1 +++ .cvsignore 6 Mar 2006 07:16:07 -0000 1.2 @@ -0,0 +1 @@ +worminator-data-3.0R2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/worminator-data/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Mar 2006 07:10:47 -0000 1.1 +++ sources 6 Mar 2006 07:16:07 -0000 1.2 @@ -0,0 +1 @@ +3c7162423fa2971643c0562e3592a03f worminator-data-3.0R2.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 07:17:49 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:17:49 -0500 Subject: rpms/worminator - New directory Message-ID: <200603060717.k267HpMM007388@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7378/worminator Log Message: Directory /cvs/extras/rpms/worminator added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 07:17:55 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:17:55 -0500 Subject: rpms/worminator/devel - New directory Message-ID: <200603060717.k267Hvf2007406@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7378/worminator/devel Log Message: Directory /cvs/extras/rpms/worminator/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 07:18:13 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:18:13 -0500 Subject: rpms/worminator Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603060718.k267IFjK007475@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7462 Added Files: Makefile import.log Log Message: Setup of module worminator --- NEW FILE Makefile --- # Top level Makefile for module worminator all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 6 07:18:19 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:18:19 -0500 Subject: rpms/worminator/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603060718.k267ILkU007498@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7462/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module worminator --- NEW 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 Mar 6 07:19:03 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:19:03 -0500 Subject: rpms/worminator import.log,1.1,1.2 Message-ID: <200603060719.k267JZim007583@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7547 Modified Files: import.log Log Message: auto-import worminator-3.0R2.1-1 on branch devel from worminator-3.0R2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/worminator/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Mar 2006 07:18:13 -0000 1.1 +++ import.log 6 Mar 2006 07:19:03 -0000 1.2 @@ -0,0 +1 @@ +worminator-3_0R2_1-1:HEAD:worminator-3.0R2.1-1.src.rpm:1141630458 From fedora-extras-commits at redhat.com Mon Mar 6 07:19:09 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:19:09 -0500 Subject: rpms/worminator/devel worminator.desktop, NONE, 1.1 worminator.png, NONE, 1.1 worminator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603060719.k267JfN5007587@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7547/devel Modified Files: .cvsignore sources Added Files: worminator.desktop worminator.png worminator.spec Log Message: auto-import worminator-3.0R2.1-1 on branch devel from worminator-3.0R2.1-1.src.rpm --- NEW FILE worminator.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Worminator GenericName=A sidescrolling action-game Comment=A jump, run and shoot action-game Exec=worminator Icon=worminator.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; Version=3.0R2.1 --- NEW FILE worminator.spec --- Name: worminator Version: 3.0R2.1 Release: 1%{?dist} Summary: Sidescrolling platform and shoot'em up action-game Group: Amusements/Games License: GPL URL: http://sourceforge.net/projects/worminator/ Source0: http://download.sourceforge.net/worminator/worminator-%{version}.tar.gz Source1: worminator.png Source2: worminator.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel, desktop-file-utils Requires: worminator-data = 3.0R2.1 %description You play as The Worminator and fight your way through many levels of madness and mayhem. Worminator features nine unique weapons, visible character damage, full screen scrolling, sound and music, and much more! %prep %setup -q %{__sed} -i 's/\r//' ReadMe.txt %build gcc $RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations \ -Wno-char-subscripts -DDATADIR=\"%{_datadir}/games/%{name}/\" -o %{name} \ Worminator.c `allegro-config --libs` %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} %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.txt changes.unix license.txt license-change.txt %{_bindir}/%{name} %{_datadir}/applications/*-worminator.desktop %{_datadir}/icons/hicolor/32x32/apps/worminator.png %changelog * Sat Mar 4 2006 Hans de Goede 3.0R2.1-1 - initial Fedora Extras package - loosely based on the SRPM from Cru: http://naturidentisch.de/packages/fc4/worminator/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/worminator/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Mar 2006 07:18:19 -0000 1.1 +++ .cvsignore 6 Mar 2006 07:19:09 -0000 1.2 @@ -0,0 +1 @@ +worminator-3.0R2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/worminator/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Mar 2006 07:18:19 -0000 1.1 +++ sources 6 Mar 2006 07:19:09 -0000 1.2 @@ -0,0 +1 @@ +2231742c1233b49c7744c7008fbf06c1 worminator-3.0R2.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 07:23:21 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:23:21 -0500 Subject: owners owners.list,1.712,1.713 Message-ID: <200603060723.k267NscR007681@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7664/owners Modified Files: owners.list Log Message: add worminator and worminator-data Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.712 retrieving revision 1.713 diff -u -r1.712 -r1.713 --- owners.list 5 Mar 2006 23:23:10 -0000 1.712 +++ owners.list 6 Mar 2006 07:23:21 -0000 1.713 @@ -1411,6 +1411,8 @@ Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wmx|A really simple window manager for X|somlo at cmu.edu|extras-qa at fedoraproject.org| Fedora Extras|workrave|Recovery and prevention of RSI assistant|tmraz at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|worminator|Sidescrolling platform and shoot'em up action-game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|worminator-data|Data for worminator the game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|wp_tray|A wallpaper-changing applet for GNOME|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wv|MSWord 6/7/8/9 binary file format to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 6 09:12:46 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Mar 2006 04:12:46 -0500 Subject: rpms/mm/devel .cvsignore,NONE,1.1 mm.spec,NONE,1.1 Message-ID: <200603060912.k269CmCf012199@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12185 Added Files: .cvsignore mm.spec Log Message: Fixup for broken import --- NEW FILE .cvsignore --- mm-1.4.0.tar.gz --- NEW FILE mm.spec --- Summary: Shared memory allocation library Name: mm Version: 1.4.0 Release: 3%{?dist} License: BSD Group: System Environment/Libraries Source0: ftp://ftp.ossp.org/pkg/lib/mm/mm-%{version}.tar.gz URL: http://www.ossp.org/pkg/lib/mm/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description OSSP mm is a 2-layer abstraction library which simplifies the usage of shared memory between forked (and this way strongly related) processes under Unix platforms. On the first layer it hides all platform dependent implementation details (allocation and locking) when dealing with shared memory segments and on the second layer it provides a high-level malloc(3)-style API for a convenient and well known way to work with data structures inside those shared memory segments. %package devel Summary: Header files and libraries for %{name} development Group: Development/Libraries Requires: %{name} = %{version} %description devel The %{name}-devel package contains the header files and libraries needed to develop programs that use the %{name} library. %prep %setup -q %build %configure --enable-debug %{__make} %{?_smp_mflags} %install rm -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} find %{buildroot} -name "*.la" -exec rm -f {} \; find %{buildroot} -name "*.a" -exec rm -f {} \; # Fix permissions, so that find-debuginfo.sh picks up the libraries find %{buildroot} -name *.so.* -type f -exec chmod 755 {} \; %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc LICENSE THANKS README %{_libdir}/*.so.* %files devel %doc ChangeLog %defattr(-, root, root) %{_bindir}/mm-config %{_libdir}/*.so %{_includedir}/mm.h %{_mandir}/man1/mm-config.1* %{_mandir}/man3/mm.3* %changelog * Thu Mar 02 2006 Andreas Thienemann 1.4.0-3 - --enable-debug to finally fix the debuginfo package. * Tue Feb 21 2006 Andreas Thienemann 1.4.0-2 - Fix the debuginfo package. * Sat Sep 13 2005 Andreas Thienemann 1.4.0-1 - Initial spec. From fedora-extras-commits at redhat.com Mon Mar 6 09:16:26 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Mar 2006 04:16:26 -0500 Subject: owners owners.list,1.713,1.714 Message-ID: <200603060916.k269GxfN012246@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12229 Modified Files: owners.list Log Message: Added mm Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.713 retrieving revision 1.714 diff -u -r1.713 -r1.714 --- owners.list 6 Mar 2006 07:23:21 -0000 1.713 +++ owners.list 6 Mar 2006 09:16:26 -0000 1.714 @@ -676,6 +676,7 @@ 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|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| +Fedora Extras|mm|Shared memory allocation library|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org| Fedora Extras|MochiKit|A lightweight JavaScript library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 6 10:12:29 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Mon, 6 Mar 2006 05:12:29 -0500 Subject: owners owners.list,1.714,1.715 Message-ID: <200603061013.k26AD147014373@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14356 Modified Files: owners.list Log Message: Take ownership of python-imaging as reported in fedora-extras mailing list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.714 retrieving revision 1.715 diff -u -r1.714 -r1.715 --- owners.list 6 Mar 2006 09:16:26 -0000 1.714 +++ owners.list 6 Mar 2006 10:12:28 -0000 1.715 @@ -1135,7 +1135,7 @@ 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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|python-imaging|Python's own image processing library|jylitalo 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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-kid|A simple and pythonic XML template language|icon at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 6 11:15:37 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:15:37 -0500 Subject: rpms/libtasn1/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200603061116.k26BG9V1016406@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16382 Modified Files: .cvsignore sources Log Message: version 0.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:22 -0000 1.2 +++ .cvsignore 6 Mar 2006 11:15:36 -0000 1.3 @@ -1 +1,2 @@ -libtasn1-0.2.6.tar.gz +libtasn1-*.tar.gz +libtasn1-*.tar.gz.sig Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:49:22 -0000 1.2 +++ sources 6 Mar 2006 11:15:36 -0000 1.3 @@ -1 +1,2 @@ -2e9bdad5f6e4248927ec6da0a75a3428 libtasn1-0.2.6.tar.gz +e78a3fba867f6d956ead70d86815a2d7 libtasn1-0.3.0.tar.gz +0f8dc79aca78440e0c31dfef6ed5e571 libtasn1-0.3.0.tar.gz.sig From fedora-extras-commits at redhat.com Mon Mar 6 11:17:12 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:17:12 -0500 Subject: rpms/libtasn1/FC-4 libtasn1.spec,1.8,1.9 Message-ID: <200603061117.k26BHi2E016449@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16422 Modified Files: libtasn1.spec Log Message: - updated to 0.3.0 - removed unneeded curlies - created -devel subpackage Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/libtasn1.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libtasn1.spec 22 May 2005 23:57:05 -0000 1.8 +++ libtasn1.spec 6 Mar 2006 11:17:12 -0000 1.9 @@ -1,39 +1,61 @@ +## $Id$ + +%{!?release_func:%global release_func() %1%{?dist}} + Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.2.6 -Release: 3 +Version: 0.3.0 +Release: %release_func 1 License: LGPL Group: System Environment/Libraries URL: http://www.gnu.org/software/gnutls/download.html -Source0: ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Provides: %{name}-devel = %{version}-%{release} +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 +Provides: %name-devel = %version-%release BuildRequires: bison +%package devel +Summary: Files for development of applications which will use libtasn1 +Group: Development/Libraries +Requires: %name = %version-%release +Requires(pre): automake pkgconfig +Requires(postun): automake pkgconfig +Requires(post): /sbin/install-info +Requires(postun): /sbin/install-info + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org +%description devel +This is the ASN.1 library used in GNUTLS. More up to date information can +be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org + +This packages contains files for development of applications which +will use libtasn1. + %prep %setup -q %build -%configure -%{__make} %{?_smp_mflags} +%configure --disable-static +make %{?_smp_mflags} %install rm -rf "$RPM_BUILD_ROOT" -%{__make} DESTDIR="$RPM_BUILD_ROOT" install -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +make DESTDIR="$RPM_BUILD_ROOT" install + +rm -f $RPM_BUILD_ROOT{%_libdir/*.la,%_infodir/dir} %check -%{__make} check +%__make check %clean @@ -44,16 +66,38 @@ %postun -p /sbin/ldconfig +%post devel +/sbin/install-info --info-dir=%_infodir %_infodir/%name.info || : + +%preun devel +test "$1" != 0 || + /sbin/install-info --info-dir=%_infodir --delete %_infodir/%name.info || : + + %files %defattr(-,root,root,-) -%doc doc/TODO doc/*.ps +%doc doc/TODO doc/*.pdf %doc AUTHORS COPYING* ChangeLog NEWS README THANKS -%{_includedir}/* -%{_libdir}/*.a -%{_libdir}/*.so* +%_libdir/*.so.* + + +%files devel +%defattr(-,root,root,-) +%_bindir/*-config +%_libdir/*.so +%_libdir/pkgconfig/*.pc +%_includedir/* +%_datadir/aclocal/libtasn1.m4 +%_infodir/*.info.* +%_mandir/man3/*asn1* %changelog +* Mon Mar 6 2006 Enrico Scholz - 0.3.0-1 +- updated to 0.3.0 +- removed unneeded curlies +- created -devel subpackage + * Sun May 22 2005 Jeremy Katz - 0.2.6-3 - rebuild on all arches @@ -71,7 +115,3 @@ * Tue Jun 10 2003 Enrico Scholz 0:0.2.4-0.fdr.1 - Initial build. - -### Local Variables: -### compile-command: "cd .. && ./buildpkg libtasn1" -### End: From fedora-extras-commits at redhat.com Mon Mar 6 11:21:46 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:21:46 -0500 Subject: rpms/libtasn1/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200603061122.k26BMIYa016521@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16502 Modified Files: .cvsignore sources Log Message: version 0.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:22 -0000 1.2 +++ .cvsignore 6 Mar 2006 11:21:46 -0000 1.3 @@ -1 +1,2 @@ -libtasn1-0.2.6.tar.gz +libtasn1-*.tar.gz +libtasn1-*.tar.gz.sig Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:49:22 -0000 1.2 +++ sources 6 Mar 2006 11:21:46 -0000 1.3 @@ -1 +1,2 @@ -2e9bdad5f6e4248927ec6da0a75a3428 libtasn1-0.2.6.tar.gz +e78a3fba867f6d956ead70d86815a2d7 libtasn1-0.3.0.tar.gz +0f8dc79aca78440e0c31dfef6ed5e571 libtasn1-0.3.0.tar.gz.sig From fedora-extras-commits at redhat.com Mon Mar 6 11:22:49 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:22:49 -0500 Subject: rpms/libtasn1/devel libtasn1.spec,1.8,1.9 Message-ID: <200603061123.k26BNLa2016556@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16532 Modified Files: libtasn1.spec Log Message: - updated to 0.3.0 - removed unneeded curlies - created -devel subpackage Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libtasn1.spec 22 May 2005 23:57:05 -0000 1.8 +++ libtasn1.spec 6 Mar 2006 11:22:49 -0000 1.9 @@ -1,39 +1,60 @@ +## $Id$ + +%{!?release_func:%global release_func() %1%{?dist}} + Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.2.6 -Release: 3 +Version: 0.3.0 +Release: %release_func 1 License: LGPL Group: System Environment/Libraries URL: http://www.gnu.org/software/gnutls/download.html -Source0: ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Provides: %{name}-devel = %{version}-%{release} +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 +%package devel +Summary: Files for development of applications which will use libtasn1 +Group: Development/Libraries +Requires: %name = %version-%release +Requires(pre): automake pkgconfig +Requires(postun): automake pkgconfig +Requires(post): /sbin/install-info +Requires(postun): /sbin/install-info + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org +%description devel +This is the ASN.1 library used in GNUTLS. More up to date information can +be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org + +This packages contains files for development of applications which +will use libtasn1. + %prep %setup -q %build -%configure -%{__make} %{?_smp_mflags} +%configure --disable-static +make %{?_smp_mflags} %install rm -rf "$RPM_BUILD_ROOT" -%{__make} DESTDIR="$RPM_BUILD_ROOT" install -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +make DESTDIR="$RPM_BUILD_ROOT" install + +rm -f $RPM_BUILD_ROOT{%_libdir/*.la,%_infodir/dir} %check -%{__make} check +%__make check %clean @@ -44,16 +65,38 @@ %postun -p /sbin/ldconfig +%post devel +/sbin/install-info --info-dir=%_infodir %_infodir/%name.info || : + +%preun devel +test "$1" != 0 || + /sbin/install-info --info-dir=%_infodir --delete %_infodir/%name.info || : + + %files %defattr(-,root,root,-) -%doc doc/TODO doc/*.ps +%doc doc/TODO doc/*.pdf %doc AUTHORS COPYING* ChangeLog NEWS README THANKS -%{_includedir}/* -%{_libdir}/*.a -%{_libdir}/*.so* +%_libdir/*.so.* + + +%files devel +%defattr(-,root,root,-) +%_bindir/*-config +%_libdir/*.so +%_libdir/pkgconfig/*.pc +%_includedir/* +%_datadir/aclocal/libtasn1.m4 +%_infodir/*.info.* +%_mandir/man3/*asn1* %changelog +* Mon Mar 6 2006 Enrico Scholz - 0.3.0-1 +- updated to 0.3.0 +- removed unneeded curlies +- created -devel subpackage + * Sun May 22 2005 Jeremy Katz - 0.2.6-3 - rebuild on all arches @@ -71,7 +114,3 @@ * Tue Jun 10 2003 Enrico Scholz 0:0.2.4-0.fdr.1 - Initial build. - -### Local Variables: -### compile-command: "cd .. && ./buildpkg libtasn1" -### End: From fedora-extras-commits at redhat.com Mon Mar 6 11:23:59 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:23:59 -0500 Subject: rpms/libtasn1/FC-4 libtasn1.spec,1.9,1.10 Message-ID: <200603061124.k26BOWKp016589@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16571 Modified Files: libtasn1.spec Log Message: removed an old 'Provides: %name-devel' Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/libtasn1.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libtasn1.spec 6 Mar 2006 11:17:12 -0000 1.9 +++ libtasn1.spec 6 Mar 2006 11:23:58 -0000 1.10 @@ -13,7 +13,6 @@ 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 -Provides: %name-devel = %version-%release BuildRequires: bison From fedora-extras-commits at redhat.com Mon Mar 6 11:29:07 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:29:07 -0500 Subject: rpms/libtasn1/FC-4 libtasn1.spec,1.10,1.11 Message-ID: <200603061129.k26BTd2x016654@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16622/FC-4 Modified Files: libtasn1.spec Log Message: minor cleanups Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/libtasn1.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libtasn1.spec 6 Mar 2006 11:23:58 -0000 1.10 +++ libtasn1.spec 6 Mar 2006 11:29:06 -0000 1.11 @@ -25,6 +25,7 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org @@ -54,7 +55,7 @@ %check -%__make check +make check %clean From fedora-extras-commits at redhat.com Mon Mar 6 11:29:12 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:29:12 -0500 Subject: rpms/libtasn1/devel libtasn1.spec,1.9,1.10 Message-ID: <200603061129.k26BTjjM016657@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16622/devel Modified Files: libtasn1.spec Log Message: minor cleanups Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libtasn1.spec 6 Mar 2006 11:22:49 -0000 1.9 +++ libtasn1.spec 6 Mar 2006 11:29:12 -0000 1.10 @@ -25,6 +25,7 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org @@ -54,7 +55,7 @@ %check -%__make check +make check %clean From fedora-extras-commits at redhat.com Mon Mar 6 14:50:42 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Mon, 6 Mar 2006 09:50:42 -0500 Subject: rpms/ghdl/devel ghdl-svn40.patch,NONE,1.1 ghdl.spec,1.9,1.10 Message-ID: <200603061451.k26EpGA6022804@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22784 Modified Files: ghdl.spec Added Files: ghdl-svn40.patch Log Message: update to svn40, to fix a constraint crash ghdl-svn40.patch: --- NEW FILE ghdl-svn40.patch --- diff -urN ghdl-0.21/vhdl/evaluation.adb ghdl-0.22dev/vhdl/evaluation.adb --- ghdl-0.21/vhdl/evaluation.adb 2005-12-11 16:32:03.000000000 +0100 +++ ghdl-0.22dev/vhdl/evaluation.adb 2006-03-06 14:10:30.000000000 +0100 @@ -836,6 +836,28 @@ return Build_Simple_Aggregate (Res_List, Orig, Res_Type); end Eval_Concatenation; + function Eval_Array_Equality (Left, Right : Iir) return Boolean + is + L_List : Iir_List; + R_List : Iir_List; + N : Natural; + begin + -- FIXME: the simple aggregates are lost. + L_List := Get_Simple_Aggregate_List (Eval_String_Literal (Left)); + R_List := Get_Simple_Aggregate_List (Eval_String_Literal (Right)); + N := Get_Nbr_Elements (L_List); + if N /= Get_Nbr_Elements (R_List) then + return False; + end if; + for I in 0 .. N - 1 loop + -- FIXME: this is wrong: (eg: evaluated lit) + if Get_Nth_Element (L_List, I) /= Get_Nth_Element (R_List, I) then + return False; + end if; + end loop; + return True; + end Eval_Array_Equality; + -- ORIG is either a dyadic operator or a function call. function Eval_Dyadic_Operator (Orig : Iir; Left, Right : Iir) return Iir @@ -1073,34 +1095,10 @@ (Get_Fp_Value (Left) / Iir_Fp64 (Get_Value (Right)), Orig); when Iir_Predefined_Array_Equality => - declare - L_List : Iir_List; - R_List : Iir_List; - R : Boolean; - N : Natural; - begin - -- FIXME: the simple aggregates are lost. - L_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Left)); - R_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Right)); - N := Get_Nbr_Elements (L_List); - if N /= Get_Nbr_Elements (R_List) then - R := False; - else - R := True; - for I in 0 .. N - 1 loop - -- FIXME: this is wrong: (eg: evaluated lit) - if Get_Nth_Element (L_List, I) - /= Get_Nth_Element (R_List, I) - then - R := False; - exit; - end if; - end loop; - end if; - return Build_Boolean (R, Orig); - end; + return Build_Boolean (Eval_Array_Equality (Left, Right), Orig); + + when Iir_Predefined_Array_Inequality => + return Build_Boolean (not Eval_Array_Equality (Left, Right), Orig); when Iir_Predefined_Array_Sll | Iir_Predefined_Array_Srl @@ -1111,8 +1109,7 @@ return Eval_Shift_Operator (Eval_String_Literal (Left), Right, Orig, Func); - when Iir_Predefined_Array_Inequality - | Iir_Predefined_Array_Less + when Iir_Predefined_Array_Less | Iir_Predefined_Array_Less_Equal | Iir_Predefined_Array_Greater | Iir_Predefined_Array_Greater_Equal diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi --- ghdl-0.21/vhdl/ghdl.texi 2005-12-12 03:21:55.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdl.texi 2006-03-06 14:10:12.000000000 +0100 @@ -4,10 +4,14 @@ @settitle GHDL guide @c %**end of header + at direntry +* ghdl: (ghdl). VHDL compiler. + at end direntry + @titlepage @title GHDL guide @subtitle GHDL, a VHDL compiler - at subtitle For GHDL version 0.21 (Sokcho edition) + at subtitle For GHDL version 0.22 (Sokcho edition) @author Tristan Gingold @c The following two commands start the copyright page. @page diff -urN ghdl-0.21/vhdl/grt/config/linux.c ghdl-0.22dev/vhdl/grt/config/linux.c --- ghdl-0.21/vhdl/grt/config/linux.c 2005-12-12 03:29:26.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/linux.c 2006-03-06 14:10:20.000000000 +0100 @@ -189,7 +189,12 @@ #endif /* Context for the main stack. */ -static __thread struct stack_context main_stack_context; +#ifdef USE_THREADS +#define THREAD __thread +#else +#define THREAD +#endif +static THREAD struct stack_context main_stack_context; extern void grt_set_main_stack (struct stack_context *stack); diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c --- ghdl-0.21/vhdl/grt/config/win32.c 2005-12-12 03:39:16.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/win32.c 2006-03-06 14:10:20.000000000 +0100 @@ -1,5 +1,5 @@ -/* GRT stack implementation for Win32 - Copyright (C) 2004, 2005 Felix Bertram. +/* GRT stack implementation for Win32 using fibers. + Copyright (C) 2005 Tristan Gingold. GHDL 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 @@ -16,139 +16,74 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -//----------------------------------------------------------------------------- -// Project: GHDL - VHDL Simulator -// Description: Win32 port of stacks package -// Note: Tristan's original i386/Linux used assembly-code -// to manually switch stacks for performance reasons. -// History: 2004feb09, FB, created. -//----------------------------------------------------------------------------- #include -//#include -//#include -//#include - - -//#define INFO printf -#define INFO (void) - -// GHDL names an endless loop calling FUNC with ARG a 'stack' -// at a given time, only one stack may be 'executed' -typedef struct -{ HANDLE thread; // stack's thread - HANDLE mutex; // mutex to suspend/resume thread - void (*Func)(void*); // stack's FUNC - void* Arg; // ARG passed to FUNC -} Stack_Type_t, *Stack_Type; +#include -Stack_Type_t main_stack_context; -extern Stack_Type grt_stack_main_stack; +struct stack_type +{ + LPVOID fiber; // Win fiber. + void (*func)(void *); // Function + void *arg; // Function argument. +}; + +static struct stack_type main_stack_context; +extern void grt_set_main_stack (struct stack_type *stack); -//------------------------------------------------------------------------------ void grt_stack_init(void) -// Initialize the stacks package. -// This may adjust stack sizes. -// Must be called after grt.options.decode. -// => procedure Stack_Init; -{ INFO("grt_stack_init\n"); - INFO(" main_stack_context=0x%08x\n", &main_stack_context); - - // create event. reset event, as we are currently running - main_stack_context.mutex = CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - grt_stack_main_stack= &main_stack_context; -} - -//------------------------------------------------------------------------------ -static unsigned long __stdcall grt_stack_loop(void* pv_myStack) -{ - Stack_Type myStack= (Stack_Type)pv_myStack; - - INFO("grt_stack_loop\n"); - - INFO(" myStack=0x%08x\n", myStack); - - // block until event becomes set again. - // this happens when this stack is enabled for the first time - WaitForSingleObject(myStack->mutex, INFINITE); - - // run stack's function in endless loop - while(1) - { INFO(" call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg); - myStack->Func(myStack->Arg); - } - - // we never get here... - return 0; -} - -//------------------------------------------------------------------------------ -Stack_Type grt_stack_create(void* Func, void* Arg) -// Create a new stack, which on first execution will call FUNC with -// an argument ARG. -// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type; -{ Stack_Type newStack; - DWORD m_IDThread; // Thread's ID (dummy) - - INFO("grt_stack_create\n"); - INFO(" call 0x%08x with 0x%08x\n", Func, Arg); - - newStack= malloc(sizeof(Stack_Type_t)); - - // init function and argument - newStack->Func= Func; - newStack->Arg= Arg; - - // create event. reset event, so that thread will blocked in grt_stack_loop - newStack->mutex= CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - INFO(" newStack=0x%08x\n", newStack); - - // create thread, which executes grt_stack_loop - newStack->thread= CreateThread(NULL, // lpsa - 0, // cbStack - grt_stack_loop, // lpStartAddr - newStack, // lpvThreadParm - 0, // fdwCreate - &m_IDThread); // lpIDThread - - return newStack; -} - -//------------------------------------------------------------------------------ -void grt_stack_switch(Stack_Type To, Stack_Type From) -// Resume stack TO and save the current context to the stack pointed by -// CUR. -// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); -{ INFO("grt_stack_switch\n"); - INFO(" from 0x%08x to 0x%08x\n", From, To); - - // set 'To' event. this will make the other thread either - // - start for first time in grt_stack_loop - // - resume at WaitForSingleObject below - SetEvent(To->mutex); - - // block until 'From' event becomes set again - // as we are running, our event is reset and we block here - // when stacks are switched, with above SetEvent, we may proceed - WaitForSingleObject(From->mutex, INFINITE); -} - -//------------------------------------------------------------------------------ -void grt_stack_delete(Stack_Type Stack) -// Delete stack STACK, which must not be currently executed. -// => procedure Stack_Delete (Stack : Stack_Type); -{ INFO("grt_stack_delete\n"); +{ + main_stack_context.fiber = ConvertThreadToFiber (NULL); + if (main_stack_context.fiber == NULL) + { + fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n", + GetLastError ()); + abort (); + } + grt_set_main_stack (&main_stack_context); +} + +static VOID __stdcall +grt_stack_loop (void *v_stack) +{ + struct stack_type *stack = (struct stack_type *)v_stack; + while (1) + { + (*stack->func)(stack->arg); + } +} + +struct stack_type * +grt_stack_create (void (*func)(void *), void *arg) +{ + struct stack_type *res; + + res = malloc (sizeof (struct stack_type)); + if (res == NULL) + return NULL; + res->func = func; + res->arg = arg; + res->fiber = CreateFiber (0, &grt_stack_loop, res); + if (res->fiber == NULL) + { + free (res); + return NULL; + } + return res; +} + +void +grt_stack_switch (struct stack_type *to, struct stack_type *from) +{ + SwitchToFiber (to->fiber); +} + +void +grt_stack_delete (struct stack_type *stack) +{ + DeleteFiber (stack->fiber); + stack->fiber = NULL; } -//---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME void __gnat_raise_storage_error(void) { @@ -161,6 +96,3 @@ } #endif -//---------------------------------------------------------------------------- -// end of file - diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c --- ghdl-0.21/vhdl/grt/ghwlib.c 2005-12-07 06:29:04.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.c 2006-03-06 14:10:21.000000000 +0100 @@ -1214,16 +1214,31 @@ return 0; } +static const char * +ghw_get_lit (union ghw_type *type, int e) +{ + if (e >= type->en.nbr || e < 0) + return "??"; + else + return type->en.lits[e]; +} + +static void +ghw_disp_lit (union ghw_type *type, int e) +{ + printf ("%s (%d)", ghw_get_lit (type, e), e); +} + void ghw_disp_value (union ghw_val *val, union ghw_type *type) { switch (ghw_get_base_type (type)->kind) { case ghdl_rtik_type_b2: - printf ("%s (%d)", type->en.lits[val->b2], val->b2); + ghw_disp_lit (type, val->b2); break; case ghdl_rtik_type_e8: - printf ("%s (%d)", type->en.lits[val->e8], val->e8); + ghw_disp_lit (type, val->e8); break; case ghdl_rtik_type_i32: printf ("%d", val->i32); @@ -1582,10 +1597,14 @@ } void -ghw_disp_range (union ghw_range *rng) +ghw_disp_range (union ghw_type *type, union ghw_range *rng) { switch (rng->kind) { + case ghdl_rtik_type_e8: + printf ("%s %s %s", ghw_get_lit (type, rng->e8.left), + ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right)); + break; case ghdl_rtik_type_i32: case ghdl_rtik_type_p32: printf ("%d %s %d", @@ -1657,7 +1676,7 @@ printf ("subtype %s is ", s->name); ghw_disp_typename (h, s->base); printf (" range "); - ghw_disp_range (s->rng); + ghw_disp_range (s->base, s->rng); printf (";\n"); } break; @@ -1692,7 +1711,7 @@ { if (i != 0) printf (", "); - ghw_disp_range (a->rngs[i]); + ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]); } printf (");\n"); } diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h --- ghdl-0.21/vhdl/grt/ghwlib.h 2005-12-07 06:27:09.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.h 2006-03-06 14:10:21.000000000 +0100 @@ -390,7 +390,8 @@ const char *ghw_get_dir (int is_downto); -void ghw_disp_range (union ghw_range *rng); +/* Note: TYPE must be a base type (used only to display literals). */ +void ghw_disp_range (union ghw_type *type, union ghw_range *rng); void ghw_disp_type (struct ghw_handler *h, union ghw_type *t); diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb --- ghdl-0.21/vhdl/grt/grt-signals.adb 2005-11-18 03:13:36.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-signals.adb 2006-03-06 14:10:21.000000000 +0100 @@ -1095,15 +1095,6 @@ when others => Internal_Error ("ghdl_create_signal_attribute"); end case; --- Sig_Instance_Name := new Ghdl_Instance_Name_Type' --- (Kind => Ghdl_Name_Signal, --- Name => null, --- Parent => null, --- Brother => null, --- Sig_Mode => Mode, --- Sig_Kind => Kind_Signal_No, --- Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last), --- Sig_Type_Desc => Sig_Type); -- Note: bit and boolean are both mode_b2. Res := Create_Signal (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True), diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb --- ghdl-0.21/vhdl/grt/grt-waves.adb 2005-12-07 05:50:07.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-waves.adb 2006-03-06 14:10:21.000000000 +0100 @@ -785,6 +785,15 @@ Nbr_Scope_Signals : Natural := 0; Nbr_Dumped_Signals : Natural := 0; + -- This is only valid during write_hierarchy. + function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural + is + function To_Integer_Address is new Ada.Unchecked_Conversion + (Ghdl_Signal_Ptr, Integer_Address); + begin + return Natural (To_Integer_Address (Sig.Alink)); + end Get_Signal_Number; + procedure Write_Signal_Number (Val_Addr : Address; Val_Name : Vstring; Val_Type : Ghdl_Rti_Access) @@ -792,20 +801,28 @@ pragma Unreferenced (Val_Name); pragma Unreferenced (Val_Type); - function To_Integer_Address is new Ada.Unchecked_Conversion - (Ghdl_Signal_Ptr, Integer_Address); + Num : Natural; + function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion (Source => Integer_Address, Target => Ghdl_Signal_Ptr); Sig : Ghdl_Signal_Ptr; begin + -- Convert to signal. Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all); - if not Sig.Flags.Is_Dumped then - Sig.Flags.Is_Dumped := True; + + -- Get signal number. + Num := Get_Signal_Number (Sig); + + -- If the signal number is 0, then assign a valid signal number. + if Num = 0 then Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1; - Sig.Flink := To_Ghdl_Signal_Ptr + Sig.Alink := To_Ghdl_Signal_Ptr (Integer_Address (Nbr_Dumped_Signals)); + Num := Nbr_Dumped_Signals; end if; - Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink))); + + -- Do the real job: write the signal number. + Wave_Put_ULEB128 (Ghdl_E32 (Num)); end Write_Signal_Number; procedure Foreach_Scalar_Signal_Number is new @@ -1370,13 +1387,18 @@ Table_Initial => 32, Table_Increment => 100); + function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is + begin + return Dump_Table.Table (N); + end Get_Dump_Entry; + procedure Write_Hierarchy (Root : VhpiHandleT) is N : Natural; begin - -- Check Flink is 0. + -- Check Alink is 0. for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flink /= null then + if Sig_Table.Table (I).Alink /= null then Internal_Error ("wave.write_hierarchy"); end if; end loop; @@ -1393,15 +1415,20 @@ Wave_Put_Byte (0); Dump_Table.Set_Last (Nbr_Dumped_Signals); + for I in Dump_Table.First .. Dump_Table.Last loop + Dump_Table.Table (I) := null; + end loop; -- Save and clear. - N := 0; for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flags.Is_Dumped then - N := N + 1; + N := Get_Signal_Number (Sig_Table.Table (I)); + if N /= 0 then + if Dump_Table.Table (N) /= null then + Internal_Error ("wave.write_hierarchy(2)"); + end if; Dump_Table.Table (N) := Sig_Table.Table (I); + Sig_Table.Table (I).Alink := null; end if; - Sig_Table.Table (I).Flink := null; end loop; end Write_Hierarchy; diff -urN ghdl-0.21/vhdl/Makefile.in ghdl-0.22dev/vhdl/Makefile.in --- ghdl-0.21/vhdl/Makefile.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Makefile.in 2006-03-06 14:26:21.000000000 +0100 @@ -480,6 +480,7 @@ #GRT_USE_PTHREADS=y ifeq ($(GRT_USE_PTHREADS),y) + GRT_CFLAGS+=-DUSE_THREADS GRT_ADD_OBJS+=grt-cthreads.o GRT_EXTRA_LIB+=-lpthread endif @@ -527,7 +528,7 @@ $(CC) -c $(GRT_FLAGS) -o $@ $< linux.o: $(GRTSRCDIR)/config/linux.c - $(CC) -c $(GRT_FLAGS) -o $@ $< + $(CC) -c $(GRT_FLAGS) $(GRT_CFLAGS) -o $@ $< win32.o: $(GRTSRCDIR)/config/win32.c $(CC) -c $(GRT_FLAGS) -o $@ $< diff -urN ghdl-0.21/vhdl/parse.adb ghdl-0.22dev/vhdl/parse.adb --- ghdl-0.21/vhdl/parse.adb 2005-12-17 07:18:00.000000000 +0100 +++ ghdl-0.22dev/vhdl/parse.adb 2006-03-06 14:10:30.000000000 +0100 @@ -3540,7 +3540,7 @@ Set_Location (Res); Set_Expression (Res, Parse_Expression); - Expect (Tok_Select, "after expression"); + Expect (Tok_Select, "'select' expected after expression"); Scan.Scan; if Current_Token = Tok_Left_Paren then Target := Parse_Aggregate; @@ -3556,13 +3556,13 @@ Build_Init (Last); loop Wf_Chain := Parse_Waveform; - Expect (Tok_When, "after waveform"); + Expect (Tok_When, "'when' expected after waveform"); Scan.Scan; Assoc := Parse_Choices (Null_Iir); Set_Associated (Assoc, Wf_Chain); Append_Subchain (Last, Res, Assoc); exit when Current_Token = Tok_Semi_Colon; - Expect (Tok_Comma, "after choice"); + Expect (Tok_Comma, "',' (comma) expected after choice"); Scan.Scan; end loop; return Res; diff -urN ghdl-0.21/vhdl/sem_assocs.adb ghdl-0.22dev/vhdl/sem_assocs.adb --- ghdl-0.21/vhdl/sem_assocs.adb 2005-10-08 14:45:00.000000000 +0200 +++ ghdl-0.22dev/vhdl/sem_assocs.adb 2006-03-06 14:10:30.000000000 +0100 @@ -551,7 +551,7 @@ exit when Index_Type = Null_Iir; Chain := Get_Individual_Association_Chain (Assoc); Sem_Choices_Range - (Chain, Index_Type, True, Get_Location (Assoc), Low, High); + (Chain, Index_Type, False, Get_Location (Assoc), Low, High); Set_Individual_Association_Chain (Assoc, Chain); end loop; end Finish_Individual_Assoc_Array_Subtype; diff -urN ghdl-0.21/vhdl/sem_expr.adb ghdl-0.22dev/vhdl/sem_expr.adb --- ghdl-0.21/vhdl/sem_expr.adb 2005-12-17 07:13:37.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_expr.adb 2006-03-06 14:10:30.000000000 +0100 @@ -2278,6 +2278,7 @@ Lb := Low; Hb := High; end if; + -- Checks all values between POS and POS_MAX are handled. Pos := Eval_Pos (Lb); Pos_Max := Eval_Pos (Hb); if Pos > Pos_Max then diff -urN ghdl-0.21/vhdl/sem_names.adb ghdl-0.22dev/vhdl/sem_names.adb --- ghdl-0.21/vhdl/sem_names.adb 2005-12-11 14:50:31.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_names.adb 2006-03-06 14:10:30.000000000 +0100 @@ -1974,7 +1974,8 @@ Error_Msg_Sem ("function name is a procedure", Name); when Iir_Kind_Process_Statement - | Iir_Kind_Component_Declaration => + | Iir_Kind_Component_Declaration + | Iir_Kind_Type_Conversion => Error_Msg_Sem (Disp_Node (Prefix) & " cannot be indexed or sliced", Name); Res := Null_Iir; diff -urN ghdl-0.21/vhdl/translation.adb ghdl-0.22dev/vhdl/translation.adb --- ghdl-0.21/vhdl/translation.adb 2005-12-10 12:11:41.000000000 +0100 +++ ghdl-0.22dev/vhdl/translation.adb 2006-03-06 14:10:22.000000000 +0100 @@ -1797,15 +1797,13 @@ -- Check bounds length of L match bounds length of R. -- If L_TYPE (resp. R_TYPE) is not a thin array, then L_NODE - -- (resp. R_NODE) are not used (and may be o_lnode_null). + -- (resp. R_NODE) are not used (and may be Mnode_Null). -- If L_TYPE (resp. T_TYPE) is a fat array, then L_NODE (resp. R_NODE) - -- must be a variable pointing to the array. + -- must designate the array. procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir); -- Create a subtype range to be stored into the location pointed by @@ -8412,10 +8410,19 @@ return True; end Need_Range_Check; - procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) + procedure Check_Range_Low (Value : O_Dnode; Atype : Iir) is If_Blk : O_If_Block; begin + Open_Temp; + Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); + Chap6.Gen_Bound_Error (Null_Iir); + Finish_If_Stmt (If_Blk); + Close_Temp; + end Check_Range_Low; + + procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) is + begin if not Need_Range_Check (Expr, Atype) then return; end if; @@ -8428,20 +8435,14 @@ Chap6.Gen_Bound_Error (Expr); end if; else - Open_Temp; - Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); - Chap6.Gen_Bound_Error (Null_Iir); - Finish_If_Stmt (If_Blk); - Close_Temp; + Check_Range_Low (Value, Atype); end if; end Check_Range; procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir) is L_Tinfo, R_Tinfo : Type_Info_Acc; @@ -8491,10 +8492,10 @@ exit when Index = Null_Iir; Sub_Cond := New_Compare_Op (ON_Neq, - Chap6.Get_Array_Ptr_Bound_Length (L_Node, L_Type, - I + 1, L_Mode), - Chap6.Get_Array_Ptr_Bound_Length (R_Node, R_Type, - I + 1, R_Mode), + M2E (Range_To_Length + (Get_Array_Range (L_Node, L_Type, I + 1))), + M2E (Range_To_Length + (Get_Array_Range (R_Node, R_Type, I + 1))), Ghdl_Bool_Type); if I = 0 then Cond := Sub_Cond; @@ -10081,8 +10082,8 @@ New_Assign_Stmt (Get_Var (Alias_Info.Alias_Var), New_Value (M2Lp (Chap3.Get_Array_Base (Name_Node)))); - Chap3.Check_Array_Match (Decl_Type, O_Lnode_Null, Kind, - Name_Type, M2Lp (Name_Node), Kind, + Chap3.Check_Array_Match (Decl_Type, T2M (Decl_Type, Kind), + Name_Type, Name_Node, Decl); Close_Temp; when Type_Mode_Scalar => @@ -11691,6 +11692,16 @@ end; end if; + if Get_Kind (Formal_Type) in Iir_Kinds_Array_Type_Definition + then + -- Check length matches. + Stabilize (Formal_Node); + Stabilize (Actual_Node); + Chap3.Check_Array_Match (Formal_Type, Formal_Node, + Actual_Type, Actual_Node, + Assoc); + end if; + Data := (Actual_Node => Actual_Node, Actual_Type => Actual_Type, Mode => Mode, @@ -14420,8 +14431,8 @@ E := Create_Temp_Init (T_Info.Ortho_Ptr_Type (Mode_Value), Val); Chap3.Check_Array_Match - (Target_Type, M2Lp (T), Mode_Value, - Get_Type (Expr), New_Obj (E), Mode_Value, + (Target_Type, T, + Get_Type (Expr), Dp2M (E, T_Info, Mode_Value), Null_Iir); Chap3.Translate_Object_Copy (T, New_Obj_Value (E), Target_Type); @@ -15169,9 +15180,10 @@ begin E := Create_Temp_Init (Expr_Info.Ortho_Ptr_Type (Mode_Value), Expr); - Chap3.Check_Array_Match (Res_Type, O_Lnode_Null, Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, T2M (Res_Type, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); return New_Convert_Ov (New_Value (Chap3.Get_Array_Ptr_Base_Ptr (New_Obj (E), Expr_Type, Mode_Value)), @@ -15199,9 +15211,10 @@ Chap3.Get_Array_Bounds_Ptr (O_Lnode_Null, Expr_Type, Mode_Value)); -- Check array match. - Chap3.Check_Array_Match (Res_Type, New_Obj (Res), Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, Dv2M (Res, Res_Info, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); Close_Temp; return New_Address (New_Obj (Res), Res_Info.Ortho_Ptr_Type (Mode_Value)); @@ -22283,19 +22296,58 @@ function Translate_Val_Attribute (Attr : Iir) return O_Enode is - T : O_Dnode; - Prefix : Iir; - Ttype : O_Tnode; + Val : O_Enode; + Attr_Type : Iir; + Res_Var : O_Dnode; + Res_Type : O_Tnode; begin - Prefix := Get_Type (Attr); - Ttype := Get_Ortho_Type (Prefix, Mode_Value); - T := Create_Temp (Ttype); - New_Assign_Stmt - (New_Obj (T), - New_Convert_Ov (Chap7.Translate_Expression (Get_Parameter (Attr)), - Ttype)); - Chap3.Check_Range (T, Attr, Get_Type (Get_Prefix (Attr))); - return New_Obj_Value (T); + Attr_Type := Get_Type (Attr); + Res_Type := Get_Ortho_Type (Attr_Type, Mode_Value); + Res_Var := Create_Temp (Res_Type); + Val := Chap7.Translate_Expression (Get_Parameter (Attr)); + + case Get_Kind (Attr_Type) is + when Iir_Kind_Enumeration_Type_Definition + | Iir_Kind_Enumeration_Subtype_Definition => + -- For enumeration, always check the value is in the enum + -- range. + declare + Val_Type : O_Tnode; + Val_Var : O_Dnode; + If_Blk : O_If_Block; + begin + Val_Type := Get_Ortho_Type (Get_Type (Get_Parameter (Attr)), + Mode_Value); + Val_Var := Create_Temp_Init (Val_Type, Val); + Start_If_Stmt + (If_Blk, + New_Dyadic_Op + (ON_Or, + New_Compare_Op (ON_Lt, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, 0)), + Ghdl_Bool_Type), + New_Compare_Op (ON_Ge, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, + Integer_64 + (Get_Nbr_Elements + (Get_Enumeration_Literal_List + (Attr_Type))))), + Ghdl_Bool_Type))); + Chap6.Gen_Bound_Error (Attr); + Finish_If_Stmt (If_Blk); + Val := New_Obj_Value (Val_Var); + end; + when others => + null; + end case; + + New_Assign_Stmt (New_Obj (Res_Var), New_Convert_Ov (Val, Res_Type)); + Chap3.Check_Range (Res_Var, Attr, Get_Type (Get_Prefix (Attr))); + return New_Obj_Value (Res_Var); end Translate_Val_Attribute; function Translate_Pos_Attribute (Attr : Iir; Res_Type : Iir) diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads --- ghdl-0.21/vhdl/version.ads 2005-12-18 14:07:38.000000000 +0100 +++ ghdl-0.22dev/vhdl/version.ads 2006-03-06 14:10:30.000000000 +0100 @@ -1,4 +1,4 @@ package Version is Ghdl_Version : constant String := - "GHDL 0.21 (20051218) [Sokcho edition]"; + "GHDL 0.22dev (20051220) [Sokcho edition]"; end Version; Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ghdl.spec 16 Feb 2006 01:25:59 -0000 1.9 +++ ghdl.spec 6 Mar 2006 14:50:41 -0000 1.10 @@ -4,7 +4,7 @@ Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.39svn.0%{?dist} +Release: 0.40svn.0%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -14,7 +14,7 @@ # ./dist.sh sources Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2 -Patch0: ghdl-svn39.patch +Patch0: ghdl-svn40.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo Requires(post): /sbin/install-info @@ -215,6 +215,10 @@ %{_libexecdir}/gcc/ %changelog +* Mon Mar 6 2006 Thomas Sailer - 0.22-0.40svn.0 +- update to svn40, to fix an array bounds checking bug apparently + introduced in svn39 + * Thu Feb 16 2006 Thomas Sailer - 0.22-0.39svn.0 - update to svn39, to fix some constant bugs From fedora-extras-commits at redhat.com Mon Mar 6 14:58:33 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 09:58:33 -0500 Subject: rpms/zziplib/devel zziplib.spec,1.5,1.6 Message-ID: <200603061459.k26Ex5Zr022898@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/zziplib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22881 Modified Files: zziplib.spec Log Message: FC5 rebuild. Index: zziplib.spec =================================================================== RCS file: /cvs/extras/rpms/zziplib/devel/zziplib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- zziplib.spec 9 Feb 2006 19:27:48 -0000 1.5 +++ zziplib.spec 6 Mar 2006 14:58:32 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.45 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL/MPL Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -75,6 +75,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.13.45-2 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.13.45-1 - Update to 0.13.45. - Exclude static library. From fedora-extras-commits at redhat.com Mon Mar 6 15:01:17 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:01:17 -0500 Subject: rpms/yasm/devel yasm.spec,1.6,1.7 Message-ID: <200603061501.k26F1oXc024804@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23377 Modified Files: yasm.spec Log Message: FC5 rebuild. Index: yasm.spec =================================================================== RCS file: /cvs/extras/rpms/yasm/devel/yasm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- yasm.spec 9 Feb 2006 19:24:42 -0000 1.6 +++ yasm.spec 6 Mar 2006 15:01:17 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Complete rewrite of the NASM assembler Name: yasm Version: 0.4.0 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: Development/Languages URL: http://www.tortall.net/projects/yasm/ @@ -81,6 +81,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.4.0-6 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.4.0-5 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:04:42 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:04:42 -0500 Subject: rpms/viruskiller/devel viruskiller.spec,1.7,1.8 Message-ID: <200603061505.k26F5EZY024877@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/viruskiller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24860 Modified Files: viruskiller.spec Log Message: FC5 rebuild. Index: viruskiller.spec =================================================================== RCS file: /cvs/extras/rpms/viruskiller/devel/viruskiller.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- viruskiller.spec 9 Feb 2006 19:14:58 -0000 1.7 +++ viruskiller.spec 6 Mar 2006 15:04:42 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Frantic shooting game where viruses invade your computer Name: viruskiller Version: 0.9 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Amusements/Games URL: http://www.parallelrealities.co.uk/virusKiller.php @@ -74,6 +74,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.9-7 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.9-6 - Rebuild for new gcc/glibc. - Remove old desktop file conditionals. From fedora-extras-commits at redhat.com Mon Mar 6 15:05:59 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:05:59 -0500 Subject: rpms/udftools/devel udftools.spec,1.6,1.7 Message-ID: <200603061506.k26F6ViJ024940@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/udftools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24918 Modified Files: udftools.spec Log Message: FC5 rebuild. Index: udftools.spec =================================================================== RCS file: /cvs/extras/rpms/udftools/devel/udftools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- udftools.spec 9 Feb 2006 19:09:46 -0000 1.6 +++ udftools.spec 6 Mar 2006 15:05:59 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Linux UDF Filesystem userspace utilities Name: udftools Version: 1.0.0b3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Archiving URL: http://sourceforge.net/projects/linux-udf/ @@ -47,6 +47,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.0.0b3-5 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.0.0b3-4 - Rebuild for new gcc/glibc. - Exclude the static library... there isn't even a header file. From fedora-extras-commits at redhat.com Mon Mar 6 15:07:21 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:07:21 -0500 Subject: rpms/ucarp/devel ucarp.spec,1.6,1.7 Message-ID: <200603061507.k26F7rf1024996@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ucarp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24946 Modified Files: ucarp.spec Log Message: FC5 rebuild. Index: ucarp.spec =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/ucarp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ucarp.spec 9 Feb 2006 19:07:30 -0000 1.6 +++ ucarp.spec 6 Mar 2006 15:07:21 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Common Address Redundancy Protocol (CARP) for Unix Name: ucarp Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.ucarp.org/ @@ -96,6 +96,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.1-5 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.1-4 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:07:45 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:07:45 -0500 Subject: rpms/thttpd/devel thttpd.spec,1.9,1.10 Message-ID: <200603061508.k26F8HKY024999@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/thttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24958 Modified Files: thttpd.spec Log Message: FC5 rebuild. Index: thttpd.spec =================================================================== RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- thttpd.spec 9 Feb 2006 19:01:40 -0000 1.9 +++ thttpd.spec 6 Mar 2006 15:07:44 -0000 1.10 @@ -3,7 +3,7 @@ Summary: Tiny, turbo, throttleable lightweight http server Name: thttpd Version: 2.25b -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.acme.com/software/thttpd/ @@ -141,6 +141,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2.25b-10 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2.25b-9 - Rebuild for new gcc/glibc. - Remove prever stuff, 2.25b final has been around for while now. From fedora-extras-commits at redhat.com Mon Mar 6 15:09:38 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 10:09:38 -0500 Subject: rpms/liferea/devel .cvsignore, 1.22, 1.23 liferea.spec, 1.33, 1.34 sources, 1.23, 1.24 Message-ID: <200603061510.k26FABrQ025117@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25096 Modified Files: .cvsignore liferea.spec sources Log Message: * Mon Mar 6 2006 Brian Pepple - 1.0.7-2 - Update to 1.0.7. - Fix gconf scriptlets. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 25 Feb 2006 15:43:24 -0000 1.22 +++ .cvsignore 6 Mar 2006 15:09:38 -0000 1.23 @@ -1 +1 @@ -liferea-1.0.6.tar.gz +liferea-1.0.7.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- liferea.spec 25 Feb 2006 15:43:24 -0000 1.33 +++ liferea.spec 6 Mar 2006 15:09:38 -0000 1.34 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.6 +Version: 1.0.7 Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -23,7 +23,8 @@ BuildRequires: dbus-devel %endif -Requires(post): GConf2 +Requires(pre): GConf2 +Requires(post): GConf2 Requires(preun): GConf2 @@ -51,10 +52,11 @@ %install rm -rf ${RPM_BUILD_ROOT} -make DESTDIR=${RPM_BUILD_ROOT} install +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 +make install DESTDIR=${RPM_BUILD_ROOT} %find_lang %{name} -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ @@ -65,16 +67,26 @@ rm -rf ${RPM_BUILD_ROOT} +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : +fi + + %post -export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/liferea.schemas >/dev/null || : + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : %preun -export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) -gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/liferea.schemas >/dev/null || : +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : +fi %files -f %{name}.lang @@ -93,6 +105,10 @@ %changelog +* Mon Mar 6 2006 Brian Pepple - 1.0.7-2 +- Update to 1.0.7. +- Fix gconf scriptlets. + * Sat Feb 25 2006 Brian Pepple - 1.0.6-2 - Update to 1.0.6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 25 Feb 2006 15:43:24 -0000 1.23 +++ sources 6 Mar 2006 15:09:38 -0000 1.24 @@ -1 +1 @@ -e8200bdd9a6a33468687cc8fb144e809 liferea-1.0.6.tar.gz +d75b2621d2e926695e833eaa2aed68c2 liferea-1.0.7.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 15:11:25 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:11:25 -0500 Subject: rpms/starfighter/devel starfighter.spec,1.7,1.8 Message-ID: <200603061511.k26FBvid025185@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/starfighter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25125 Modified Files: starfighter.spec Log Message: FC5 rebuild. Index: starfighter.spec =================================================================== RCS file: /cvs/extras/rpms/starfighter/devel/starfighter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- starfighter.spec 9 Feb 2006 18:39:11 -0000 1.7 +++ starfighter.spec 6 Mar 2006 15:11:24 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Project: Starfighter, a space arcade game Name: starfighter Version: 1.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Amusements/Games URL: http://www.parallelrealities.co.uk/starfighter.php @@ -76,6 +76,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.1-7 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.1-6 - Rebuild for new gcc/glibc. - Clean up spec file a little (desktop file conditional). From fedora-extras-commits at redhat.com Mon Mar 6 15:12:36 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:12:36 -0500 Subject: rpms/SDL_gfx/devel SDL_gfx.spec,1.4,1.5 Message-ID: <200603061513.k26FD8M2025246@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25193 Modified Files: SDL_gfx.spec Log Message: FC5 rebuild. Index: SDL_gfx.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_gfx/devel/SDL_gfx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SDL_gfx.spec 9 Feb 2006 18:35:53 -0000 1.4 +++ SDL_gfx.spec 6 Mar 2006 15:12:35 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Graphic primitives, rotozoomer, framerate control and image filters Name: SDL_gfx Version: 2.0.13 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.ferzkopp.net/Software/SDL_gfx-2.0/ @@ -71,6 +71,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2.0.13-4 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2.0.13-3 - Rebuild for new gcc/glibc. - Update URLs. From fedora-extras-commits at redhat.com Mon Mar 6 15:13:39 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:13:39 -0500 Subject: rpms/proftpd/devel proftpd.spec,1.11,1.12 Message-ID: <200603061514.k26FEC7i025309@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25252 Modified Files: proftpd.spec Log Message: FC5 rebuild. Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- proftpd.spec 9 Feb 2006 18:30:16 -0000 1.11 +++ proftpd.spec 6 Mar 2006 15:13:37 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.3.0 -Release: 0.1.rc3%{?dist} +Release: 0.2.rc3%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ @@ -145,6 +145,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.3.0-0.2.rc3 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.3.0-0.1.rc3 - Update to 1.3.0rc3, which builds with the latest openssl. From fedora-extras-commits at redhat.com Mon Mar 6 15:16:01 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:16:01 -0500 Subject: rpms/powermanga/devel powermanga.spec,1.9,1.10 Message-ID: <200603061516.k26FGYwi025514@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/powermanga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25452 Modified Files: powermanga.spec Log Message: FC5 rebuild. Index: powermanga.spec =================================================================== RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- powermanga.spec 9 Feb 2006 18:25:23 -0000 1.9 +++ powermanga.spec 6 Mar 2006 15:16:01 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Arcade 2D shoot-them-up game Name: powermanga Version: 0.79 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Amusements/Games URL: http://linux.tlk.fr/games/Powermanga/ @@ -94,6 +94,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.79-8 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.79-7 - Rebuild for new gcc/glibc and modular X. From fedora-extras-commits at redhat.com Mon Mar 6 15:17:12 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:17:12 -0500 Subject: rpms/portaudio/devel portaudio.spec,1.7,1.8 Message-ID: <200603061517.k26FHiN4025580@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/portaudio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25525 Modified Files: portaudio.spec Log Message: FC5 rebuild. Index: portaudio.spec =================================================================== RCS file: /cvs/extras/rpms/portaudio/devel/portaudio.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- portaudio.spec 9 Feb 2006 18:13:58 -0000 1.7 +++ portaudio.spec 6 Mar 2006 15:17:12 -0000 1.8 @@ -3,7 +3,7 @@ Summary: Free, cross platform, open-source, audio I/O library Name: portaudio Version: 18.1 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD-like Group: System Environment/Libraries URL: http://www.portaudio.com/ @@ -49,6 +49,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 18.1-7 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 18.1-6 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:18:42 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:18:42 -0500 Subject: rpms/plib16/devel plib16.spec,1.7,1.8 Message-ID: <200603061519.k26FJEaK025971@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/plib16/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25613 Modified Files: plib16.spec Log Message: FC5 rebuild. Index: plib16.spec =================================================================== RCS file: /cvs/extras/rpms/plib16/devel/plib16.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- plib16.spec 9 Feb 2006 18:06:41 -0000 1.7 +++ plib16.spec 6 Mar 2006 15:18:35 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Set of portable libraries especially useful for games Name: plib16 Version: 1.6.0 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL Group: System Environment/Libraries URL: http://plib.sourceforge.net/ @@ -64,6 +64,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.6.0-5 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.6.0-4 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:19:49 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:19:49 -0500 Subject: rpms/plib/devel plib.spec,1.9,1.10 Message-ID: <200603061520.k26FKLoL026043@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/plib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25986 Modified Files: plib.spec Log Message: FC5 rebuild. Index: plib.spec =================================================================== RCS file: /cvs/extras/rpms/plib/devel/plib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plib.spec 9 Feb 2006 18:06:59 -0000 1.9 +++ plib.spec 6 Mar 2006 15:19:49 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Set of portable libraries especially useful for games Name: plib Version: 1.8.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries URL: http://plib.sourceforge.net/ @@ -66,6 +66,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.8.4-3 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.8.4-2 - Rebuild for new gcc/glibc and modular X. - Include gcc 4.1 patch to fix extra qualification errors. From fedora-extras-commits at redhat.com Mon Mar 6 15:20:37 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:20:37 -0500 Subject: rpms/p7zip/devel p7zip.spec,1.8,1.9 Message-ID: <200603061521.k26FL9Kq026105@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/p7zip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26049 Modified Files: p7zip.spec Log Message: FC5 rebuild. Index: p7zip.spec =================================================================== RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- p7zip.spec 9 Feb 2006 16:49:43 -0000 1.8 +++ p7zip.spec 6 Mar 2006 15:20:37 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.30 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ @@ -90,6 +90,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 4.30-3 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 4.30-2 - Rebuild for new gcc/glibc. - Include gcc 4.1 patch for extra qualification errors. From fedora-extras-commits at redhat.com Mon Mar 6 15:21:35 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:21:35 -0500 Subject: rpms/oidentd/devel oidentd.spec,1.9,1.10 Message-ID: <200603061522.k26FM7gs026171@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/oidentd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26111 Modified Files: oidentd.spec Log Message: FC5 rebuild. Index: oidentd.spec =================================================================== RCS file: /cvs/extras/rpms/oidentd/devel/oidentd.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- oidentd.spec 9 Feb 2006 16:15:45 -0000 1.9 +++ oidentd.spec 6 Mar 2006 15:21:35 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Implementation of the RFC1413 identification server Name: oidentd Version: 2.0.7 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: System Environment/Daemons URL: http://ojnk.sourceforge.net/ @@ -71,6 +71,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2.0.7-9 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2.0.7-8 - Remove obsolete identd.spoof and oidentd.users files (thanks to Apu). - Ghost new configuration files (oidentd.conf & oidentd_masq.conf), but From fedora-extras-commits at redhat.com Mon Mar 6 15:22:30 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:22:30 -0500 Subject: rpms/ncftp/devel ncftp.spec,1.6,1.7 Message-ID: <200603061523.k26FN2od026237@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ncftp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26177 Modified Files: ncftp.spec Log Message: FC5 rebuild. Index: ncftp.spec =================================================================== RCS file: /cvs/extras/rpms/ncftp/devel/ncftp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ncftp.spec 9 Feb 2006 16:05:03 -0000 1.6 +++ ncftp.spec 6 Mar 2006 15:22:30 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Improved console FTP client Name: ncftp Version: 3.1.9 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 License: Distributable Group: Applications/Internet @@ -71,6 +71,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2:3.1.9-3 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2:3.1.9-2 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:23:20 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:23:20 -0500 Subject: rpms/metakit/devel metakit.spec,1.12,1.13 Message-ID: <200603061523.k26FNrDk026306@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/metakit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26243 Modified Files: metakit.spec Log Message: FC5 rebuild. Index: metakit.spec =================================================================== RCS file: /cvs/extras/rpms/metakit/devel/metakit.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- metakit.spec 9 Feb 2006 15:59:26 -0000 1.12 +++ metakit.spec 6 Mar 2006 15:23:19 -0000 1.13 @@ -3,7 +3,7 @@ Summary: Embeddable database Name: metakit Version: 2.4.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.equi4.com/metakit/ @@ -81,6 +81,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2.4.9.5-2 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2.4.9.5-1 - Update to 2.4.9.5. - Remove no longer nostrip patch. From fedora-extras-commits at redhat.com Mon Mar 6 15:24:23 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:24:23 -0500 Subject: rpms/lmarbles/devel lmarbles.spec,1.9,1.10 Message-ID: <200603061524.k26FOviZ026377@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lmarbles/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26354 Modified Files: lmarbles.spec Log Message: FC5 rebuild. Index: lmarbles.spec =================================================================== RCS file: /cvs/extras/rpms/lmarbles/devel/lmarbles.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lmarbles.spec 9 Feb 2006 15:48:35 -0000 1.9 +++ lmarbles.spec 6 Mar 2006 15:24:23 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Atomix clone where you create figures out of marbles Name: lmarbles Version: 1.0.7 -Release: 4 +Release: 5 License: GPL Group: Amusements/Games URL: http://lgames.sourceforge.net/ @@ -78,6 +78,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.0.7-5 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.0.7-4 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:25:08 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:25:08 -0500 Subject: rpms/linux_logo/devel linux_logo.spec,1.10,1.11 Message-ID: <200603061525.k26FPeXq026441@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/linux_logo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26384 Modified Files: linux_logo.spec Log Message: FC5 rebuild. Index: linux_logo.spec =================================================================== RCS file: /cvs/extras/rpms/linux_logo/devel/linux_logo.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- linux_logo.spec 9 Feb 2006 15:43:01 -0000 1.10 +++ linux_logo.spec 6 Mar 2006 15:25:08 -0000 1.11 @@ -1,7 +1,7 @@ Summary: The linux logo - a colorful console penguin logo Name: linux_logo Version: 4.13 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.deater.net/weave/vmwprod/linux_logo/ @@ -52,6 +52,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 4.13-2 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 4.13-1 - Update to 4.13. From fedora-extras-commits at redhat.com Mon Mar 6 15:26:26 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:26:26 -0500 Subject: rpms/lighttpd/devel lighttpd.spec,1.21,1.22 Message-ID: <200603061526.k26FQwlG026520@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26454 Modified Files: lighttpd.spec Log Message: FC5 rebuild. Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- lighttpd.spec 8 Feb 2006 15:00:23 -0000 1.21 +++ lighttpd.spec 6 Mar 2006 15:26:26 -0000 1.22 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.10 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -173,6 +173,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.4.10-2 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.4.10-1 - Update to 1.4.10. - Remove now included fix. From fedora-extras-commits at redhat.com Mon Mar 6 15:27:15 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 10:27:15 -0500 Subject: rpms/pcsc-lite/devel pcsc-lite-1.3.0-rpath64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pcsc-lite.spec, 1.7, 1.8 sources, 1.2, 1.3 pcsc-lite-1.2.0-rpath64.patch, 1.1, NONE pcsc-lite-pcscd.init, 1.1, NONE pcsc-lite-update-reader.conf, 1.1, NONE Message-ID: <200603061527.k26FRlb6026556@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26529 Modified Files: .cvsignore pcsc-lite.spec sources Added Files: pcsc-lite-1.3.0-rpath64.patch Removed Files: pcsc-lite-1.2.0-rpath64.patch pcsc-lite-pcscd.init pcsc-lite-update-reader.conf Log Message: * Sun Mar 5 2006 Ville Skytt?? - 1.3.0-1 - 1.3.0, init script and reader.conf updater included upstream. - Split developer docs into a -doc subpackage, include API docs. - libmusclecard no longer included, split into separate package upstream. pcsc-lite-1.3.0-rpath64.patch: --- NEW FILE pcsc-lite-1.3.0-rpath64.patch --- --- pcsc-lite-1.3.0/configure~ 2006-03-03 15:48:59.000000000 +0200 +++ pcsc-lite-1.3.0/configure 2006-03-05 23:40:48.000000000 +0200 @@ -9103,7 +9103,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then @@ -9480,7 +9480,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 19:57:18 -0000 1.2 +++ .cvsignore 6 Mar 2006 15:27:11 -0000 1.3 @@ -1 +1 @@ -pcsc-lite-1.2.0.tar.gz +pcsc-lite-1.3.0.tar.gz Index: pcsc-lite.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pcsc-lite.spec 13 Feb 2006 22:16:44 -0000 1.7 +++ pcsc-lite.spec 6 Mar 2006 15:27:15 -0000 1.8 @@ -1,21 +1,19 @@ Name: pcsc-lite -Version: 1.2.0 -Release: 14%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: PC/SC Lite smart card framework and applications Group: System Environment/Daemons License: BSD -URL: http://www.linuxnet.com/middle.html -Source0: https://alioth.debian.org/download.php/419/%{name}-%{version}.tar.gz -Source1: %{name}-pcscd.init -Source2: %{name}-update-reader.conf +URL: http://pcsclite.alioth.debian.org/ +Source0: https://alioth.debian.org/download.php/1472/%{name}-%{version}.tar.gz Patch0: %{name}-docinst.patch -Patch1: %{name}-1.2.0-rpath64.patch +Patch1: %{name}-1.3.0-rpath64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{__perl} -BuildRequires: flex -BuildRequires: libusb-devel >= 0.1.6 +BuildRequires: libusb-devel >= 0.1.7 +BuildRequires: doxygen +BuildRequires: graphviz Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires: pcsc-ifd-handler @@ -33,7 +31,6 @@ Summary: PC/SC Lite libraries Group: System Environment/Libraries Provides: libpcsc-lite = %{version}-%{release} -Provides: libmusclecard = %{version}-%{release} %description libs PC/SC Lite libraries. @@ -44,28 +41,23 @@ Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig Provides: libpcsc-lite-devel = %{version}-%{release} -Provides: libmusclecard-devel = %{version}-%{release} %description devel PC/SC Lite development files. +%package doc +Summary: PC/SC Lite developer documentation +Group: Documentation + +%description doc +%{summary}. + %prep %setup -q %patch0 -p0 %patch1 -p1 -%{__perl} -pi -e 's|/etc/init\.d\b|%{_initrddir}|' doc/pcscd.8.in -%{__perl} -pe \ - 's|__LOCALSTATEDIR__|%{_localstatedir}|g ; - s|__SYSCONFDIR__|%{_sysconfdir}|g ; - s|__INITRDDIR__|%{_initrddir}|g ; - s|__SBINDIR__|%{_sbindir}|g' \ - %{SOURCE1} > pcscd.init -%{__perl} -pe \ - 's|__SYSCONFDIR__|%{_sysconfdir}| ; - s|__INITRDDIR__|%{_initrddir}| ; - s|__SBINDIR__|%{_sbindir}|' \ - %{SOURCE2} > update-reader.conf +sed -i -e 's/^\(HAVE_DOT\s*=\s*\)/\1 YES/' doc/doxygen.conf.in %build @@ -75,24 +67,26 @@ --enable-runpid=%{_localstatedir}/run/pcscd.pid \ --enable-confdir=%{_sysconfdir} \ --enable-ipcdir=%{_localstatedir}/run \ - --enable-muscledropdir=%{_libdir}/pcsc/services \ --enable-usbdropdir=%{_libdir}/pcsc/drivers make %{?_smp_mflags} +doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/{drivers,services} -install -Dpm 755 pcscd.init $RPM_BUILD_ROOT%{_initrddir}/pcscd -install -pm 644 src/ifdhandler.h $RPM_BUILD_ROOT%{_includedir}/ -install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d + +install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers + +install -Dpm 755 etc/pcscd.init $RPM_BUILD_ROOT%{_initrddir}/pcscd + cat < $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/README All *.conf files in this directory are merged into %{_sysconfdir}/reader.conf by %{_sbindir}/update-reader.conf. EOF -install -pm 755 update-reader.conf $RPM_BUILD_ROOT%{_sbindir}/ -rm $RPM_BUILD_ROOT{%{_bindir}/pcsc_demo,%{_libdir}/lib*.la} + +rm $RPM_BUILD_ROOT{%{_sysconfdir}/reader.conf.d/reader.conf,%{_libdir}/lib*.la} +touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf %clean @@ -118,32 +112,41 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog* COPYING DRIVERS HELP NEWS README SECURITY +%doc AUTHORS ChangeLog* COPYING DRIVERS HELP README SECURITY TODO %dir %{_sysconfdir}/reader.conf.d/ %{_sysconfdir}/reader.conf.d/README %ghost %config %{_sysconfdir}/reader.conf %{_initrddir}/pcscd -%{_bindir}/bundleTool %{_bindir}/formaticc -%{_bindir}/installifd +%{_sbindir}/installifd %{_sbindir}/pcscd %{_sbindir}/update-reader.conf %{_libdir}/pcsc/ -%{_mandir}/man[18]/*.[18]* +%{_mandir}/man1/formaticc.1* +%{_mandir}/man5/reader.conf.5* +%{_mandir}/man8/pcscd.8* %files libs %defattr(-,root,root,-) -%{_libdir}/lib*.so.* +%{_libdir}/libpcsclite.so.* %files devel %defattr(-,root,root,-) -%doc doc/*.pdf doc/example/pcsc_demo.c -%{_includedir}/*.h -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/lib*.pc +%{_includedir}/PCSC/ +%{_libdir}/libpcsclite.so +%{_libdir}/pkgconfig/libpcsclite.pc + +%files doc +%defattr(-,root,root,-) +%doc doc/api/ doc/*.pdf doc/example/pcsc_demo.c %changelog +* Sun Mar 5 2006 Ville Skytt?? - 1.3.0-1 +- 1.3.0, init script and reader.conf updater included upstream. +- Split developer docs into a -doc subpackage, include API docs. +- libmusclecard no longer included, split into separate package upstream. + * Mon Feb 13 2006 Ville Skytt?? - 1.2.0-14 - Avoid standard rpaths on multilib archs. - Fine tune dependencies. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 19:57:18 -0000 1.2 +++ sources 6 Mar 2006 15:27:15 -0000 1.3 @@ -1 +1 @@ -98456d274b2f4bfe74c5ab59070f8d50 pcsc-lite-1.2.0.tar.gz +ccbb595be0e1d47c9f9f449f183bea6c pcsc-lite-1.3.0.tar.gz --- pcsc-lite-1.2.0-rpath64.patch DELETED --- --- pcsc-lite-pcscd.init DELETED --- --- pcsc-lite-update-reader.conf DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 15:28:29 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:28:29 -0500 Subject: rpms/liboil/devel liboil.spec,1.14,1.15 Message-ID: <200603061529.k26FT17v026662@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26600 Modified Files: liboil.spec Log Message: FC5 rebuild. Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/liboil.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- liboil.spec 9 Feb 2006 15:41:08 -0000 1.14 +++ liboil.spec 6 Mar 2006 15:28:29 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil Version: 0.3.7 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ @@ -77,6 +77,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.3.7-3 +- FC5 rebuild (well, try at least since PPC fixes are required). + * Thu Feb 9 2006 Matthias Saou 0.3.7-2 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:29:19 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:29:19 -0500 Subject: rpms/libcaca/devel libcaca.spec,1.10,1.11 Message-ID: <200603061529.k26FTtgd026724@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/libcaca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26668 Modified Files: libcaca.spec Log Message: FC5 rebuild. Index: libcaca.spec =================================================================== RCS file: /cvs/extras/rpms/libcaca/devel/libcaca.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libcaca.spec 9 Feb 2006 15:37:04 -0000 1.10 +++ libcaca.spec 6 Mar 2006 15:29:18 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Library for Colour AsCii Art, text mode graphics Name: libcaca Version: 0.9 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPL Group: System Environment/Libraries URL: http://sam.zoy.org/projects/libcaca/ @@ -106,6 +106,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.9-10 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.9-9 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:30:26 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:30:26 -0500 Subject: rpms/kannel/devel kannel.spec,1.9,1.10 Message-ID: <200603061530.k26FUxs0026787@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/kannel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26732 Modified Files: kannel.spec Log Message: FC5 rebuild. Index: kannel.spec =================================================================== RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- kannel.spec 9 Feb 2006 15:28:02 -0000 1.9 +++ kannel.spec 6 Mar 2006 15:30:21 -0000 1.10 @@ -1,7 +1,7 @@ Summary: WAP and SMS gateway Name: kannel Version: 1.4.0 -Release: 7%{?dist} +Release: 8%{?dist} License: Kannel Group: System Environment/Daemons URL: http://www.kannel.org/ @@ -121,6 +121,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.4.0-8 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.4.0-7 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:31:18 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:31:18 -0500 Subject: rpms/js/devel js.spec,1.10,1.11 Message-ID: <200603061531.k26FVoMP026848@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/js/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26793 Modified Files: js.spec Log Message: FC5 rebuild. Index: js.spec =================================================================== RCS file: /cvs/extras/rpms/js/devel/js.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- js.spec 9 Feb 2006 15:25:02 -0000 1.10 +++ js.spec 6 Mar 2006 15:31:18 -0000 1.11 @@ -3,7 +3,7 @@ Summary: JavaScript interpreter and libraries Name: js Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?_without_readline:1} License: MPL/GPL/LGPL %else @@ -130,6 +130,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.5-4 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.5-3 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:33:08 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:33:08 -0500 Subject: rpms/hackedbox/devel hackedbox.spec,1.6,1.7 Message-ID: <200603061533.k26FXeXU026919@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/hackedbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26859 Modified Files: hackedbox.spec Log Message: FC5 rebuild. Index: hackedbox.spec =================================================================== RCS file: /cvs/extras/rpms/hackedbox/devel/hackedbox.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hackedbox.spec 9 Feb 2006 15:01:59 -0000 1.6 +++ hackedbox.spec 6 Mar 2006 15:33:07 -0000 1.7 @@ -4,7 +4,7 @@ Summary: The bastard son of Blackbox, a small and fast Window Manager Name: hackedbox Version: 0.8.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: User Interface/Desktops URL: http://scrudgeware.org/projects/Hackedbox @@ -80,6 +80,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.8.4-6 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.8.4-5 - Rebuild for new gcc/glibc and modular X. From fedora-extras-commits at redhat.com Mon Mar 6 15:34:11 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 6 Mar 2006 10:34:11 -0500 Subject: rpms/jthread/devel jthread.spec,1.1,1.2 Message-ID: <200603061534.k26FYhbC027000@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26963 Modified Files: jthread.spec Log Message: Add dist tag to release. Index: jthread.spec =================================================================== RCS file: /cvs/extras/rpms/jthread/devel/jthread.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jthread.spec 1 Mar 2006 02:48:30 -0000 1.1 +++ jthread.spec 6 Mar 2006 15:34:11 -0000 1.2 @@ -1,7 +1,7 @@ Summary: JThread provides classes to make use of threads easy on different platforms Name: jthread Version: 1.1.2 -Release: 1 +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://research.edm.luc.ac.be/jori/jthread/jthread.html @@ -60,6 +60,9 @@ %{_libdir}/libjthread.so %changelog +* Mon Mar 6 2006 Jeffrey C. Ollie - 1.1.2-2 +- Add dist tag to release. + * Sat Jan 7 2006 Jeffrey C. Ollie - 1.1.2-1 - Initial build. From fedora-extras-commits at redhat.com Mon Mar 6 15:34:35 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:34:35 -0500 Subject: rpms/gtweakui/devel gtweakui.spec,1.6,1.7 Message-ID: <200603061535.k26FZ7TQ027037@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gtweakui/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26983 Modified Files: gtweakui.spec Log Message: FC5 rebuild. Index: gtweakui.spec =================================================================== RCS file: /cvs/extras/rpms/gtweakui/devel/gtweakui.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gtweakui.spec 9 Feb 2006 11:38:35 -0000 1.6 +++ gtweakui.spec 6 Mar 2006 15:34:35 -0000 1.7 @@ -3,7 +3,7 @@ Summary: Extra configuration dialogs for GNOME Name: gtweakui Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: User Interface/Desktops URL: http://gtweakui.sourceforge.net/ @@ -87,7 +87,10 @@ %changelog -* Thu Feb 9 2006 Matthias Saou 0.4.0 +* Mon Mar 6 2006 Matthias Saou 0.4.0-2 +- FC5 rebuild. + +* Thu Feb 9 2006 Matthias Saou 0.4.0-1 - Update to 0.4.0 to sync with freshrpms. * Fri Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Mon Mar 6 15:36:43 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:36:43 -0500 Subject: rpms/gkrellm-freq/devel gkrellm-freq.spec,1.3,1.4 Message-ID: <200603061537.k26FbFwd027110@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27055 Modified Files: gkrellm-freq.spec Log Message: FC5 rebuild. Index: gkrellm-freq.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-freq/devel/gkrellm-freq.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gkrellm-freq.spec 8 Feb 2006 16:00:28 -0000 1.3 +++ gkrellm-freq.spec 6 Mar 2006 15:36:42 -0000 1.4 @@ -3,7 +3,7 @@ Summary: CPU frequency display plugin for GKrellM Name: gkrellm-freq Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.peakunix.net/gkfreq/ @@ -46,6 +46,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.0-2 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.0-1 - Update to 1.0. - Update the rmasm patch. From fedora-extras-commits at redhat.com Mon Mar 6 15:37:40 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:37:40 -0500 Subject: rpms/gkrellm-aclock/devel gkrellm-aclock.spec,1.3,1.4 Message-ID: <200603061538.k26FcCoE027176@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27121 Modified Files: gkrellm-aclock.spec Log Message: FC5 rebuild. Index: gkrellm-aclock.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-aclock/devel/gkrellm-aclock.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gkrellm-aclock.spec 8 Feb 2006 15:55:08 -0000 1.3 +++ gkrellm-aclock.spec 6 Mar 2006 15:37:39 -0000 1.4 @@ -3,7 +3,7 @@ Summary: Analog clock plugin for GKrellM Name: gkrellm-aclock Version: 0.3.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.geocities.com/m_muthukumar/gkrellaclock.html @@ -41,6 +41,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.3.3-4 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.3.3-3 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:38:50 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:38:50 -0500 Subject: rpms/giblib/devel giblib.spec,1.9,1.10 Message-ID: <200603061539.k26FdNpq027259@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/giblib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27182 Modified Files: giblib.spec Log Message: FC5 rebuild. Index: giblib.spec =================================================================== RCS file: /cvs/extras/rpms/giblib/devel/giblib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- giblib.spec 8 Feb 2006 15:53:01 -0000 1.9 +++ giblib.spec 6 Mar 2006 15:38:50 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Simple library and a wrapper for imlib2 Name: giblib Version: 1.2.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Libraries URL: http://linuxbrit.co.uk/giblib/ @@ -67,6 +67,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.2.4-6 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.2.4-5 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:39:09 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 10:39:09 -0500 Subject: rpms/ccid/devel .cvsignore, 1.2, 1.3 ccid.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200603061539.k26Fdnht027274@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ccid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27240 Modified Files: .cvsignore ccid.spec sources Log Message: * Mon Mar 6 2006 Ville Skytt?? - 1.0.0-1 - 1.0.0, license changed to LGPL. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ccid/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Feb 2005 20:09:05 -0000 1.2 +++ .cvsignore 6 Mar 2006 15:39:09 -0000 1.3 @@ -1 +1 @@ -ccid-0.4.1.tar.gz +ccid-1.0.0.tar.gz Index: ccid.spec =================================================================== RCS file: /cvs/extras/rpms/ccid/devel/ccid.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ccid.spec 15 Feb 2006 07:16:54 -0000 1.5 +++ ccid.spec 6 Mar 2006 15:39:09 -0000 1.6 @@ -1,20 +1,20 @@ +%define dropdir %(pkg-config libpcsclite --variable usbdropdir) + Name: ccid -Version: 0.4.1 -Release: 7%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries -License: GPL +License: LGPL URL: http://pcsclite.alioth.debian.org/ccid.html -Source0: https://alioth.debian.org/download.php/501/ccid-0.4.1.tar.gz +Source0: https://alioth.debian.org/download.php/1474/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: flex -BuildRequires: perl BuildRequires: libusb-devel >= 0.1.7 -BuildRequires: pcsc-lite-devel >= 1.2.0 +BuildRequires: pcsc-lite-devel >= 1.3.0 Requires: libusb >= 0.1.7 -Requires: pcsc-lite >= 1.2.0 +Requires: pcsc-lite >= 1.3.0 Provides: pcsc-ifd-handler %description @@ -29,9 +29,7 @@ %build -%configure --disable-dependency-tracking \ - --enable-usbdropdir=%{_libdir}/pcsc/drivers \ - --enable-ccidtwindir=%{_libdir}/pcsc/drivers/serial +%configure --disable-dependency-tracking --disable-static make %{?_smp_mflags} @@ -58,11 +56,14 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README GemPCTwin.reader.conf -%{_libdir}/pcsc/drivers/ifd-ccid.bundle/ -%{_libdir}/pcsc/drivers/serial/ +%{dropdir}/ifd-ccid.bundle/ +%{dropdir}/serial/ %changelog +* Mon Mar 6 2006 Ville Skytt?? - 1.0.0-1 +- 1.0.0, license changed to LGPL. + * Wed Feb 15 2006 Ville Skytt?? - 0.4.1-7 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/ccid/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Feb 2005 20:09:05 -0000 1.2 +++ sources 6 Mar 2006 15:39:09 -0000 1.3 @@ -1 +1 @@ -dbe00b32b018a96e7eecb832cf6d1adf ccid-0.4.1.tar.gz +cae1d55c3361d6202adfdbea9d4e94d7 ccid-1.0.0.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 15:39:49 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:39:49 -0500 Subject: rpms/gentoo/devel gentoo.spec,1.5,1.6 Message-ID: <200603061540.k26FeMf6027363@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gentoo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27266 Modified Files: gentoo.spec Log Message: FC5 rebuild. Index: gentoo.spec =================================================================== RCS file: /cvs/extras/rpms/gentoo/devel/gentoo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gentoo.spec 8 Feb 2006 15:51:08 -0000 1.5 +++ gentoo.spec 6 Mar 2006 15:39:49 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Graphical file management program in GTK+ for Linux Name: gentoo Version: 0.11.55 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/File URL: http://www.obsession.se/gentoo/ @@ -74,6 +74,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.11.55-3 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.11.55-2 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:40:49 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:40:49 -0500 Subject: rpms/gcombust/devel gcombust.spec,1.9,1.10 Message-ID: <200603061541.k26FfLSN027429@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gcombust/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27372 Modified Files: gcombust.spec Log Message: FC5 rebuild. Index: gcombust.spec =================================================================== RCS file: /cvs/extras/rpms/gcombust/devel/gcombust.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gcombust.spec 8 Feb 2006 15:48:27 -0000 1.9 +++ gcombust.spec 6 Mar 2006 15:40:49 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Powerful GTK+ front-end for mkisofs and cdrecord Name: gcombust Version: 0.1.55 -Release: 7 +Release: 8 Epoch: 1 License: GPL Group: Applications/Archiving @@ -51,6 +51,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1:0.1.55-8 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1:0.1.55-7 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:41:33 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:41:33 -0500 Subject: rpms/fillets-ng/devel fillets-ng.spec,1.5,1.6 Message-ID: <200603061542.k26Fg6St027498@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/fillets-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27435 Modified Files: fillets-ng.spec Log Message: FC5 rebuild. Index: fillets-ng.spec =================================================================== RCS file: /cvs/extras/rpms/fillets-ng/devel/fillets-ng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fillets-ng.spec 8 Feb 2006 15:46:13 -0000 1.5 +++ fillets-ng.spec 6 Mar 2006 15:41:33 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Fish Fillets Next Generation, a puzzle game with 70 levels Name: fillets-ng Version: 0.7.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://fillets.sourceforge.net/ @@ -66,6 +66,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.7.3-3 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.7.3-2 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:42:30 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:42:30 -0500 Subject: rpms/easytag/devel easytag.spec,1.11,1.12 Message-ID: <200603061543.k26Fh2XY027564@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/easytag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27504 Modified Files: easytag.spec Log Message: FC5 rebuild. Index: easytag.spec =================================================================== RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- easytag.spec 8 Feb 2006 15:33:53 -0000 1.11 +++ easytag.spec 6 Mar 2006 15:42:29 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Tag editor for mp3, ogg, flac and other music files Name: easytag Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://easytag.sourceforge.net/ @@ -45,6 +45,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.1-3 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.1-2 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:43:20 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 10:43:20 -0500 Subject: rpms/pcsc-perl/devel .cvsignore, 1.2, 1.3 pcsc-perl.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200603061543.k26FhqoG027649@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27576 Modified Files: .cvsignore pcsc-perl.spec sources Log Message: * Mon Mar 6 2006 Ville Skytt?? - 1.4.1-1 - 1.4.1. - Don't hardcode required pcsc-lite-libs version, use shared lib file instead. - Convert docs to UTF-8. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 20:15:46 -0000 1.2 +++ .cvsignore 6 Mar 2006 15:43:20 -0000 1.3 @@ -1 +1 @@ -pcsc-perl-1.3.1.tar.gz +pcsc-perl-1.4.1.tar.gz Index: pcsc-perl.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/pcsc-perl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pcsc-perl.spec 15 Feb 2006 07:09:32 -0000 1.7 +++ pcsc-perl.spec 6 Mar 2006 15:43:20 -0000 1.8 @@ -1,8 +1,9 @@ -%define pcscver 1.2.0 +%define pcscver 1.3.0 +%define pcsclib %{_libdir}/libpcsclite.so.1 Name: pcsc-perl -Version: 1.3.1 -Release: 8%{?dist} +Version: 1.4.1 +Release: 1%{?dist} Summary: Perl interface to the PC/SC smart card library Group: Development/Libraries @@ -12,8 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl -BuildRequires: pcsc-lite-devel = %{pcscver} -Requires: pcsc-lite-libs = %{pcscver} +BuildRequires: pcsc-lite-devel >= %{pcscver} +Requires: %{pcsclib} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Provides: perl-pcsc = %{version}-%{release} @@ -25,11 +26,11 @@ %prep %setup -q chmod 644 examples/* # avoid dependencies +f=README ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" \ - DEFINE=-Wall INC= +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" DEFINE=-Wall make %{?_smp_mflags} @@ -59,6 +60,11 @@ %changelog +* Mon Mar 6 2006 Ville Skytt?? - 1.4.1-1 +- 1.4.1. +- Don't hardcode required pcsc-lite-libs version, use shared lib file instead. +- Convert docs to UTF-8. + * Wed Feb 15 2006 Ville Skytt?? - 1.3.1-8 - Rebuild, cosmetics. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 20:15:46 -0000 1.2 +++ sources 6 Mar 2006 15:43:20 -0000 1.3 @@ -1 +1 @@ -4c1869b5b726f7ab5b1bda88b390c821 pcsc-perl-1.3.1.tar.gz +0a432f4fd6414aa3122b53a091b47064 pcsc-perl-1.4.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 15:43:21 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:43:21 -0500 Subject: rpms/advancecomp/devel advancecomp.spec,1.13,1.14 Message-ID: <200603061543.k26Fhrnn027652@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/advancecomp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27572 Modified Files: advancecomp.spec Log Message: FC5 rebuild. Index: advancecomp.spec =================================================================== RCS file: /cvs/extras/rpms/advancecomp/devel/advancecomp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- advancecomp.spec 8 Feb 2006 14:42:30 -0000 1.13 +++ advancecomp.spec 6 Mar 2006 15:43:21 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files Name: advancecomp Version: 1.15 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Emulators URL: http://advancemame.sourceforge.net/ @@ -42,6 +42,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.15-4 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.15-3 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:46:42 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:46:42 -0500 Subject: rpms/boa/devel boa.spec,1.8,1.9 Message-ID: <200603061547.k26FlEMb027753@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/boa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27698 Modified Files: boa.spec Log Message: FC5 rebuild. Index: boa.spec =================================================================== RCS file: /cvs/extras/rpms/boa/devel/boa.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- boa.spec 8 Feb 2006 14:54:44 -0000 1.8 +++ boa.spec 6 Mar 2006 15:46:42 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Single-tasking HTTP server Name: boa Version: 0.94.14 -Release: 0.3%{?rcver:.%{rcver}}%{?dist} +Release: 0.4%{?rcver:.%{rcver}}%{?dist} URL: http://www.boa.org/ License: GPL Group: System Environment/Daemons @@ -127,6 +127,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.94.14-0.4.rc21 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.94.14-0.3.rc21 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:47:33 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:47:33 -0500 Subject: rpms/camE/devel camE.spec,1.9,1.10 Message-ID: <200603061548.k26Fm5qF027814@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/camE/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27788 Modified Files: camE.spec Log Message: FC5 rebuild. Index: camE.spec =================================================================== RCS file: /cvs/extras/rpms/camE/devel/camE.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- camE.spec 8 Feb 2006 15:02:01 -0000 1.9 +++ camE.spec 6 Mar 2006 15:47:32 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Rewrite of the xawtv webcam app, which adds imlib2 support Name: camE Version: 1.9 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Daemons URL: http://linuxbrit.co.uk/camE/ @@ -39,6 +39,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.9-6 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.9-5 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:50:50 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 10:50:50 -0500 Subject: rpms/openct/devel openct.spec,1.8,1.9 Message-ID: <200603061551.k26FpNfg027878@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/openct/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27827 Modified Files: openct.spec Log Message: * Mon Mar 6 2006 Ville Skytt?? - 0.6.6-5 - Rebuild with new pcsc-lite. Index: openct.spec =================================================================== RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- openct.spec 15 Feb 2006 07:31:39 -0000 1.8 +++ openct.spec 6 Mar 2006 15:50:50 -0000 1.9 @@ -1,6 +1,8 @@ +%define dropdir %(pkg-config libpcsclite --variable=usbdropdir) + Name: openct Version: 0.6.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Middleware framework for smart card terminals Group: System Environment/Libraries @@ -14,7 +16,7 @@ Patch0: %{name}-0.6.6-rpath64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pcsc-lite-devel +BuildRequires: pcsc-lite-devel >= 1.3.0 BuildRequires: libusb-devel BuildRequires: libtool-ltdl-devel BuildRequires: sed @@ -64,7 +66,7 @@ %configure \ --disable-dependency-tracking \ --disable-static \ - --with-bundle-dir=%{_libdir}/pcsc/drivers + --with-bundle-dir=%{dropdir} make %{?_smp_mflags} @@ -76,7 +78,7 @@ %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules ln -sf %{_libdir}/openct-ifd.so \ - $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers/openct-ifd.bundle/Contents/*/ + $RPM_BUILD_ROOT%{dropdir}/openct-ifd.bundle/Contents/*/ install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct @@ -148,10 +150,13 @@ %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf %{_libdir}/openct-ifd.so -%{_libdir}/pcsc/drivers/openct-ifd.bundle/ +%{dropdir}/openct-ifd.bundle/ %changelog +* Mon Mar 6 2006 Ville Skytt?? - 0.6.6-5 +- Rebuild with new pcsc-lite. + * Wed Feb 15 2006 Ville Skytt?? - 0.6.6-4 - Avoid standard rpaths on lib64 archs. From fedora-extras-commits at redhat.com Mon Mar 6 15:51:09 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:51:09 -0500 Subject: rpms/djvulibre/devel .cvsignore, 1.5, 1.6 djvulibre.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200603061551.k26FpfDk027885@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27852 Modified Files: .cvsignore djvulibre.spec sources Log Message: FC5 rebuild. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Aug 2005 18:10:10 -0000 1.5 +++ .cvsignore 6 Mar 2006 15:51:09 -0000 1.6 @@ -1 +1 @@ -djvulibre-3.5.15.tar.gz +djvulibre-3.5.16.tar.gz Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- djvulibre.spec 4 Aug 2005 19:38:52 -0000 1.11 +++ djvulibre.spec 6 Mar 2006 15:51:09 -0000 1.12 @@ -1,7 +1,7 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.15 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ @@ -96,6 +96,9 @@ %changelog +* Mon Mar 6 2005 Matthias Saou 3.5.15-3 +- FC5 rebuild. + * Thu Aug 4 2005 Matthias Saou 3.5.15-2 - Include djvulibre-3.5.15-gcc401.patch to fix compilation with gcc 4.0.1. - Add hicolor-icon-theme build req for /usr/share/icons/hicolor/48x48/mimetypes Index: sources =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Aug 2005 18:10:10 -0000 1.5 +++ sources 6 Mar 2006 15:51:09 -0000 1.6 @@ -1 +1 @@ -4a4c5a36799e73bd93afc4fa5d69b315 djvulibre-3.5.15.tar.gz +5591c99a50aed1613a796a5aa4978fc0 djvulibre-3.5.16.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 15:52:16 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:52:16 -0500 Subject: rpms/php-pecl-mailparse/devel php-pecl-mailparse.spec,1.8,1.9 Message-ID: <200603061552.k26FqmAd027982@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-mailparse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938 Modified Files: php-pecl-mailparse.spec Log Message: FC5 rebuild. Index: php-pecl-mailparse.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-mailparse/devel/php-pecl-mailparse.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- php-pecl-mailparse.spec 9 Feb 2006 17:16:15 -0000 1.8 +++ php-pecl-mailparse.spec 6 Mar 2006 15:52:16 -0000 1.9 @@ -3,7 +3,7 @@ Summary: PECL package for parsing and working with email messages Name: php-pecl-mailparse Version: 2.1.1 -Release: 2%{?dist} +Release: 3%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/mailparse @@ -60,6 +60,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2.1.1-3 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2.1.1-2 - Rebuild for new gcc/glibc and FC5's PHP 5.1. From fedora-extras-commits at redhat.com Mon Mar 6 15:53:08 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:53:08 -0500 Subject: rpms/djvulibre/devel djvulibre.spec,1.12,1.13 Message-ID: <200603061553.k26FreH2028070@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28017 Modified Files: djvulibre.spec Log Message: Fix date typo. Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- djvulibre.spec 6 Mar 2006 15:51:09 -0000 1.12 +++ djvulibre.spec 6 Mar 2006 15:53:08 -0000 1.13 @@ -96,7 +96,7 @@ %changelog -* Mon Mar 6 2005 Matthias Saou 3.5.15-3 +* Mon Mar 6 2006 Matthias Saou 3.5.15-3 - FC5 rebuild. * Thu Aug 4 2005 Matthias Saou 3.5.15-2 From fedora-extras-commits at redhat.com Mon Mar 6 15:54:11 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:54:11 -0500 Subject: rpms/php-pecl-pdo/devel php-pecl-pdo.spec,1.3,1.4 Message-ID: <200603061554.k26FshBM028125@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-pdo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28078 Modified Files: php-pecl-pdo.spec Log Message: FC5 rebuild. Index: php-pecl-pdo.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-pdo/devel/php-pecl-pdo.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-pecl-pdo.spec 9 Feb 2006 17:22:03 -0000 1.3 +++ php-pecl-pdo.spec 6 Mar 2006 15:54:11 -0000 1.4 @@ -3,7 +3,7 @@ Summary: PECL package for PHP Data Objects Interface Name: php-pecl-pdo Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/PDO @@ -77,6 +77,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.0.2-2 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.0.2-1 - Update to 1.0.2. From fedora-extras-commits at redhat.com Mon Mar 6 15:55:50 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:55:50 -0500 Subject: rpms/php-pecl-pdo-sqlite/devel php-pecl-pdo-sqlite.spec,1.3,1.4 Message-ID: <200603061556.k26FuM4o028228@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-pdo-sqlite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28210 Modified Files: php-pecl-pdo-sqlite.spec Log Message: FC5 rebuild. Index: php-pecl-pdo-sqlite.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-pdo-sqlite/devel/php-pecl-pdo-sqlite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-pecl-pdo-sqlite.spec 2 Jun 2005 15:12:20 -0000 1.3 +++ php-pecl-pdo-sqlite.spec 6 Mar 2006 15:55:50 -0000 1.4 @@ -3,7 +3,7 @@ Summary: PECL package for PHP Data Objects Interface to SQLite v3 Name: php-pecl-pdo-sqlite Version: 0.3 -Release: 3%{?dist} +Release: 4%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/PDO_SQLITE @@ -56,6 +56,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.3-4 +- FC5 rebuild. + * Thu Jun 2 2005 Matthias Saou 0.3-3 - Rebuild. From fedora-extras-commits at redhat.com Mon Mar 6 16:03:01 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 11:03:01 -0500 Subject: rpms/opensc/devel opensc.spec,1.9,1.10 Message-ID: <200603061603.k26G3sA5030188@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30161 Modified Files: opensc.spec Log Message: * Mon Mar 6 2006 Ville Skytt?? - 0.10.1-3 - Rebuild. Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- opensc.spec 15 Feb 2006 20:57:35 -0000 1.9 +++ opensc.spec 6 Mar 2006 16:03:01 -0000 1.10 @@ -2,7 +2,7 @@ Name: opensc Version: 0.10.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries @@ -138,6 +138,9 @@ %changelog +* Mon Mar 6 2006 Ville Skytt?? - 0.10.1-3 +- Rebuild. + * Wed Feb 15 2006 Ville Skytt?? - 0.10.1-2 - Avoid standard rpaths on lib64 archs. From fedora-extras-commits at redhat.com Mon Mar 6 16:04:21 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 11:04:21 -0500 Subject: rpms/freeciv/devel .cvsignore, 1.10, 1.11 freeciv.spec, 1.20, 1.21 sources, 1.10, 1.11 Message-ID: <200603061604.k26G4rpw030215@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30194 Modified Files: .cvsignore freeciv.spec sources Log Message: * Mon Mar 6 2006 Brian Pepple - 2.0.8-2 - Update to 2.0.8. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Nov 2005 15:23:59 -0000 1.10 +++ .cvsignore 6 Mar 2006 16:04:20 -0000 1.11 @@ -1,2 +1,2 @@ -freeciv-2.0.7.tar.bz2 +freeciv-2.0.8.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- freeciv.spec 16 Feb 2006 14:40:40 -0000 1.20 +++ freeciv.spec 6 Mar 2006 16:04:20 -0000 1.21 @@ -1,6 +1,6 @@ Name: freeciv -Version: 2.0.7 -Release: 6%{?dist} +Version: 2.0.8 +Release: 2%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -42,7 +42,6 @@ %install rm -rf $RPM_BUILD_ROOT - %makeinstall desktop-file-install --vendor fedora --delete-original \ @@ -81,13 +80,16 @@ %doc doc/README.graphics doc/README.sound %{_bindir}/civserver %{_bindir}/civclient -%{_datadir}/%{name} +%{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}.xpm %{_datadir}/applications/fedora-*.desktop %{_mandir}/man6/civserver.6.gz %{_mandir}/man6/civclient.6.gz %changelog +* Mon Mar 6 2006 Brian Pepple - 2.0.8-2 +- Update to 2.0.8. + * Thu Feb 16 2006 Brian Pepple - 2.0.7-6 - Remove unnecessary BR (alsa-lib-devel & SDL-devel). Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Nov 2005 15:23:59 -0000 1.10 +++ sources 6 Mar 2006 16:04:20 -0000 1.11 @@ -1,2 +1,2 @@ -7a60ea8f39822036b86640532accc5ce freeciv-2.0.7.tar.bz2 +9ebd5899c2c78362e0e2c68791673a88 freeciv-2.0.8.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 16:08:32 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 11:08:32 -0500 Subject: rpms/pcsc-tools/devel pcsc-tools-1.4.1-atrmsg.patch, NONE, 1.1 pcsc-tools.spec, 1.2, 1.3 smartcard_list.txt, 1.2, 1.3 Message-ID: <200603061609.k26G95xK030304@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30281 Modified Files: pcsc-tools.spec smartcard_list.txt Added Files: pcsc-tools-1.4.1-atrmsg.patch Log Message: * Mon Mar 6 2006 Ville Skytt?? - 1.4.1-3 - Update smartcard_list.txt to 20060305. - Fix some ATR_analysis messages. pcsc-tools-1.4.1-atrmsg.patch: --- NEW FILE pcsc-tools-1.4.1-atrmsg.patch --- --- ATR_analysis~ 2006-03-06 00:40:15.000000000 +0200 +++ ATR_analysis 2006-03-06 01:17:49.000000000 +0200 @@ -249,3 +249,3 @@ { - print "Programming Param P: $PI Volts, I: $I milli-Amp?res"; + print "Programming param P: $PI volts, I: $I milliamperes"; } @@ -254,3 +254,3 @@ { - print "Programming param PI2 (PI1 sould be ignored): "; + print "Programming param PI2 (PI1 should be ignored): "; if (($value>49)||($value<251)) Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pcsc-tools.spec 18 Feb 2006 13:09:01 -0000 1.2 +++ pcsc-tools.spec 6 Mar 2006 16:08:32 -0000 1.3 @@ -1,6 +1,6 @@ Name: pcsc-tools Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools to be used with smart cards and PC/SC Group: Development/Tools @@ -9,6 +9,7 @@ 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 Source2: %{name}-gscriptor.desktop +Patch0: %{name}-1.4.1-atrmsg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -28,6 +29,7 @@ %prep %setup -q +%patch0 sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile sed -i -e 's|/usr/lib/pcsc\b|%{_datadir}/pcsc|' ATR_analysis* if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then @@ -70,6 +72,10 @@ %changelog +* Mon Mar 6 2006 Ville Skytt?? - 1.4.1-3 +- Update smartcard_list.txt to 20060305. +- Fix some ATR_analysis messages. + * Sat Feb 18 2006 Ville Skytt?? - 1.4.1-2 - Update smartcard_list.txt to 20060205. Index: smartcard_list.txt =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/smartcard_list.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- smartcard_list.txt 18 Feb 2006 13:09:01 -0000 1.2 +++ smartcard_list.txt 6 Mar 2006 16:08:32 -0000 1.3 @@ -192,6 +192,9 @@ 3B 29 00 80 72 A4 45 64 00 FF 00 10 MPCOS-3DES 8K (Gemplus) +3B 2A 00 80 65 A0 58 04 01 62 72 D6 43 + Gemplus GemCombiXplore MPCOS Pro + 3B 2A 00 80 65 A2 01 00 00 00 72 D6 41 MPCOS_EMV_1B @@ -338,6 +341,10 @@ 3B 6B 00 00 80 65 B0 83 01 03 74 83 00 90 00 Gemplus GemXpresso PRO 64 PK +3B 6B 00 00 80 65 B0 83 01 04 74 83 00 90 00 + Gemplus GXP3 64V2N + U.S. Department of Defense Common Access Card (DoD CAC) + 3B 6B .. FF 80 62 .. A2 56 46 69 6E 45 49 44 JCOP20 v2.x @@ -397,6 +404,9 @@ 3B 6F 00 00 80 31 E0 6B 04 06 03 04 40 55 55 55 55 55 55 Blue American Express Card +3B 6F 00 00 80 31 E0 6B 04 20 05 02 30 55 55 55 55 55 55 + Buypass card for Norsk Tipping (http://norsk-tipping.no) + 3B 6F 00 00 80 5A 08 03 03 00 00 00 24 22 0E E7 82 90 00 Navigo (contact mode) @@ -706,6 +716,9 @@ 3B BC 94 00 40 14 47 47 33 48 33 35 58 56 32 30 30 30 GSM SIM CARD 32K, Vodafone +3B BC 94 00 40 14 47 47 33 49 35 43 41 43 31 30 30 30 + Siemens SIM card + 3B BC 94 00 40 14 47 47 33 53 30 35 31 53 31 30 31 30 GSM SIM (Tele2, Estonia) From fedora-extras-commits at redhat.com Mon Mar 6 16:17:55 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Mon, 6 Mar 2006 11:17:55 -0500 Subject: rpms/ghdl/FC-4 ghdl-svn40.patch,NONE,1.1 ghdl.spec,1.7,1.8 Message-ID: <200603061618.k26GISqV030493@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30452 Modified Files: ghdl.spec Added Files: ghdl-svn40.patch Log Message: update to svn40 ghdl-svn40.patch: --- NEW FILE ghdl-svn40.patch --- diff -urN ghdl-0.21/vhdl/evaluation.adb ghdl-0.22dev/vhdl/evaluation.adb --- ghdl-0.21/vhdl/evaluation.adb 2005-12-11 16:32:03.000000000 +0100 +++ ghdl-0.22dev/vhdl/evaluation.adb 2006-03-06 14:10:30.000000000 +0100 @@ -836,6 +836,28 @@ return Build_Simple_Aggregate (Res_List, Orig, Res_Type); end Eval_Concatenation; + function Eval_Array_Equality (Left, Right : Iir) return Boolean + is + L_List : Iir_List; + R_List : Iir_List; + N : Natural; + begin + -- FIXME: the simple aggregates are lost. + L_List := Get_Simple_Aggregate_List (Eval_String_Literal (Left)); + R_List := Get_Simple_Aggregate_List (Eval_String_Literal (Right)); + N := Get_Nbr_Elements (L_List); + if N /= Get_Nbr_Elements (R_List) then + return False; + end if; + for I in 0 .. N - 1 loop + -- FIXME: this is wrong: (eg: evaluated lit) + if Get_Nth_Element (L_List, I) /= Get_Nth_Element (R_List, I) then + return False; + end if; + end loop; + return True; + end Eval_Array_Equality; + -- ORIG is either a dyadic operator or a function call. function Eval_Dyadic_Operator (Orig : Iir; Left, Right : Iir) return Iir @@ -1073,34 +1095,10 @@ (Get_Fp_Value (Left) / Iir_Fp64 (Get_Value (Right)), Orig); when Iir_Predefined_Array_Equality => - declare - L_List : Iir_List; - R_List : Iir_List; - R : Boolean; - N : Natural; - begin - -- FIXME: the simple aggregates are lost. - L_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Left)); - R_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Right)); - N := Get_Nbr_Elements (L_List); - if N /= Get_Nbr_Elements (R_List) then - R := False; - else - R := True; - for I in 0 .. N - 1 loop - -- FIXME: this is wrong: (eg: evaluated lit) - if Get_Nth_Element (L_List, I) - /= Get_Nth_Element (R_List, I) - then - R := False; - exit; - end if; - end loop; - end if; - return Build_Boolean (R, Orig); - end; + return Build_Boolean (Eval_Array_Equality (Left, Right), Orig); + + when Iir_Predefined_Array_Inequality => + return Build_Boolean (not Eval_Array_Equality (Left, Right), Orig); when Iir_Predefined_Array_Sll | Iir_Predefined_Array_Srl @@ -1111,8 +1109,7 @@ return Eval_Shift_Operator (Eval_String_Literal (Left), Right, Orig, Func); - when Iir_Predefined_Array_Inequality - | Iir_Predefined_Array_Less + when Iir_Predefined_Array_Less | Iir_Predefined_Array_Less_Equal | Iir_Predefined_Array_Greater | Iir_Predefined_Array_Greater_Equal diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi --- ghdl-0.21/vhdl/ghdl.texi 2005-12-12 03:21:55.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdl.texi 2006-03-06 14:10:12.000000000 +0100 @@ -4,10 +4,14 @@ @settitle GHDL guide @c %**end of header + at direntry +* ghdl: (ghdl). VHDL compiler. + at end direntry + @titlepage @title GHDL guide @subtitle GHDL, a VHDL compiler - at subtitle For GHDL version 0.21 (Sokcho edition) + at subtitle For GHDL version 0.22 (Sokcho edition) @author Tristan Gingold @c The following two commands start the copyright page. @page diff -urN ghdl-0.21/vhdl/grt/config/linux.c ghdl-0.22dev/vhdl/grt/config/linux.c --- ghdl-0.21/vhdl/grt/config/linux.c 2005-12-12 03:29:26.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/linux.c 2006-03-06 14:10:20.000000000 +0100 @@ -189,7 +189,12 @@ #endif /* Context for the main stack. */ -static __thread struct stack_context main_stack_context; +#ifdef USE_THREADS +#define THREAD __thread +#else +#define THREAD +#endif +static THREAD struct stack_context main_stack_context; extern void grt_set_main_stack (struct stack_context *stack); diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c --- ghdl-0.21/vhdl/grt/config/win32.c 2005-12-12 03:39:16.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/win32.c 2006-03-06 14:10:20.000000000 +0100 @@ -1,5 +1,5 @@ -/* GRT stack implementation for Win32 - Copyright (C) 2004, 2005 Felix Bertram. +/* GRT stack implementation for Win32 using fibers. + Copyright (C) 2005 Tristan Gingold. GHDL 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 @@ -16,139 +16,74 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -//----------------------------------------------------------------------------- -// Project: GHDL - VHDL Simulator -// Description: Win32 port of stacks package -// Note: Tristan's original i386/Linux used assembly-code -// to manually switch stacks for performance reasons. -// History: 2004feb09, FB, created. -//----------------------------------------------------------------------------- #include -//#include -//#include -//#include - - -//#define INFO printf -#define INFO (void) - -// GHDL names an endless loop calling FUNC with ARG a 'stack' -// at a given time, only one stack may be 'executed' -typedef struct -{ HANDLE thread; // stack's thread - HANDLE mutex; // mutex to suspend/resume thread - void (*Func)(void*); // stack's FUNC - void* Arg; // ARG passed to FUNC -} Stack_Type_t, *Stack_Type; +#include -Stack_Type_t main_stack_context; -extern Stack_Type grt_stack_main_stack; +struct stack_type +{ + LPVOID fiber; // Win fiber. + void (*func)(void *); // Function + void *arg; // Function argument. +}; + +static struct stack_type main_stack_context; +extern void grt_set_main_stack (struct stack_type *stack); -//------------------------------------------------------------------------------ void grt_stack_init(void) -// Initialize the stacks package. -// This may adjust stack sizes. -// Must be called after grt.options.decode. -// => procedure Stack_Init; -{ INFO("grt_stack_init\n"); - INFO(" main_stack_context=0x%08x\n", &main_stack_context); - - // create event. reset event, as we are currently running - main_stack_context.mutex = CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - grt_stack_main_stack= &main_stack_context; -} - -//------------------------------------------------------------------------------ -static unsigned long __stdcall grt_stack_loop(void* pv_myStack) -{ - Stack_Type myStack= (Stack_Type)pv_myStack; - - INFO("grt_stack_loop\n"); - - INFO(" myStack=0x%08x\n", myStack); - - // block until event becomes set again. - // this happens when this stack is enabled for the first time - WaitForSingleObject(myStack->mutex, INFINITE); - - // run stack's function in endless loop - while(1) - { INFO(" call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg); - myStack->Func(myStack->Arg); - } - - // we never get here... - return 0; -} - -//------------------------------------------------------------------------------ -Stack_Type grt_stack_create(void* Func, void* Arg) -// Create a new stack, which on first execution will call FUNC with -// an argument ARG. -// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type; -{ Stack_Type newStack; - DWORD m_IDThread; // Thread's ID (dummy) - - INFO("grt_stack_create\n"); - INFO(" call 0x%08x with 0x%08x\n", Func, Arg); - - newStack= malloc(sizeof(Stack_Type_t)); - - // init function and argument - newStack->Func= Func; - newStack->Arg= Arg; - - // create event. reset event, so that thread will blocked in grt_stack_loop - newStack->mutex= CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - INFO(" newStack=0x%08x\n", newStack); - - // create thread, which executes grt_stack_loop - newStack->thread= CreateThread(NULL, // lpsa - 0, // cbStack - grt_stack_loop, // lpStartAddr - newStack, // lpvThreadParm - 0, // fdwCreate - &m_IDThread); // lpIDThread - - return newStack; -} - -//------------------------------------------------------------------------------ -void grt_stack_switch(Stack_Type To, Stack_Type From) -// Resume stack TO and save the current context to the stack pointed by -// CUR. -// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); -{ INFO("grt_stack_switch\n"); - INFO(" from 0x%08x to 0x%08x\n", From, To); - - // set 'To' event. this will make the other thread either - // - start for first time in grt_stack_loop - // - resume at WaitForSingleObject below - SetEvent(To->mutex); - - // block until 'From' event becomes set again - // as we are running, our event is reset and we block here - // when stacks are switched, with above SetEvent, we may proceed - WaitForSingleObject(From->mutex, INFINITE); -} - -//------------------------------------------------------------------------------ -void grt_stack_delete(Stack_Type Stack) -// Delete stack STACK, which must not be currently executed. -// => procedure Stack_Delete (Stack : Stack_Type); -{ INFO("grt_stack_delete\n"); +{ + main_stack_context.fiber = ConvertThreadToFiber (NULL); + if (main_stack_context.fiber == NULL) + { + fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n", + GetLastError ()); + abort (); + } + grt_set_main_stack (&main_stack_context); +} + +static VOID __stdcall +grt_stack_loop (void *v_stack) +{ + struct stack_type *stack = (struct stack_type *)v_stack; + while (1) + { + (*stack->func)(stack->arg); + } +} + +struct stack_type * +grt_stack_create (void (*func)(void *), void *arg) +{ + struct stack_type *res; + + res = malloc (sizeof (struct stack_type)); + if (res == NULL) + return NULL; + res->func = func; + res->arg = arg; + res->fiber = CreateFiber (0, &grt_stack_loop, res); + if (res->fiber == NULL) + { + free (res); + return NULL; + } + return res; +} + +void +grt_stack_switch (struct stack_type *to, struct stack_type *from) +{ + SwitchToFiber (to->fiber); +} + +void +grt_stack_delete (struct stack_type *stack) +{ + DeleteFiber (stack->fiber); + stack->fiber = NULL; } -//---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME void __gnat_raise_storage_error(void) { @@ -161,6 +96,3 @@ } #endif -//---------------------------------------------------------------------------- -// end of file - diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c --- ghdl-0.21/vhdl/grt/ghwlib.c 2005-12-07 06:29:04.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.c 2006-03-06 14:10:21.000000000 +0100 @@ -1214,16 +1214,31 @@ return 0; } +static const char * +ghw_get_lit (union ghw_type *type, int e) +{ + if (e >= type->en.nbr || e < 0) + return "??"; + else + return type->en.lits[e]; +} + +static void +ghw_disp_lit (union ghw_type *type, int e) +{ + printf ("%s (%d)", ghw_get_lit (type, e), e); +} + void ghw_disp_value (union ghw_val *val, union ghw_type *type) { switch (ghw_get_base_type (type)->kind) { case ghdl_rtik_type_b2: - printf ("%s (%d)", type->en.lits[val->b2], val->b2); + ghw_disp_lit (type, val->b2); break; case ghdl_rtik_type_e8: - printf ("%s (%d)", type->en.lits[val->e8], val->e8); + ghw_disp_lit (type, val->e8); break; case ghdl_rtik_type_i32: printf ("%d", val->i32); @@ -1582,10 +1597,14 @@ } void -ghw_disp_range (union ghw_range *rng) +ghw_disp_range (union ghw_type *type, union ghw_range *rng) { switch (rng->kind) { + case ghdl_rtik_type_e8: + printf ("%s %s %s", ghw_get_lit (type, rng->e8.left), + ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right)); + break; case ghdl_rtik_type_i32: case ghdl_rtik_type_p32: printf ("%d %s %d", @@ -1657,7 +1676,7 @@ printf ("subtype %s is ", s->name); ghw_disp_typename (h, s->base); printf (" range "); - ghw_disp_range (s->rng); + ghw_disp_range (s->base, s->rng); printf (";\n"); } break; @@ -1692,7 +1711,7 @@ { if (i != 0) printf (", "); - ghw_disp_range (a->rngs[i]); + ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]); } printf (");\n"); } diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h --- ghdl-0.21/vhdl/grt/ghwlib.h 2005-12-07 06:27:09.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.h 2006-03-06 14:10:21.000000000 +0100 @@ -390,7 +390,8 @@ const char *ghw_get_dir (int is_downto); -void ghw_disp_range (union ghw_range *rng); +/* Note: TYPE must be a base type (used only to display literals). */ +void ghw_disp_range (union ghw_type *type, union ghw_range *rng); void ghw_disp_type (struct ghw_handler *h, union ghw_type *t); diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb --- ghdl-0.21/vhdl/grt/grt-signals.adb 2005-11-18 03:13:36.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-signals.adb 2006-03-06 14:10:21.000000000 +0100 @@ -1095,15 +1095,6 @@ when others => Internal_Error ("ghdl_create_signal_attribute"); end case; --- Sig_Instance_Name := new Ghdl_Instance_Name_Type' --- (Kind => Ghdl_Name_Signal, --- Name => null, --- Parent => null, --- Brother => null, --- Sig_Mode => Mode, --- Sig_Kind => Kind_Signal_No, --- Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last), --- Sig_Type_Desc => Sig_Type); -- Note: bit and boolean are both mode_b2. Res := Create_Signal (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True), diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb --- ghdl-0.21/vhdl/grt/grt-waves.adb 2005-12-07 05:50:07.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-waves.adb 2006-03-06 14:10:21.000000000 +0100 @@ -785,6 +785,15 @@ Nbr_Scope_Signals : Natural := 0; Nbr_Dumped_Signals : Natural := 0; + -- This is only valid during write_hierarchy. + function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural + is + function To_Integer_Address is new Ada.Unchecked_Conversion + (Ghdl_Signal_Ptr, Integer_Address); + begin + return Natural (To_Integer_Address (Sig.Alink)); + end Get_Signal_Number; + procedure Write_Signal_Number (Val_Addr : Address; Val_Name : Vstring; Val_Type : Ghdl_Rti_Access) @@ -792,20 +801,28 @@ pragma Unreferenced (Val_Name); pragma Unreferenced (Val_Type); - function To_Integer_Address is new Ada.Unchecked_Conversion - (Ghdl_Signal_Ptr, Integer_Address); + Num : Natural; + function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion (Source => Integer_Address, Target => Ghdl_Signal_Ptr); Sig : Ghdl_Signal_Ptr; begin + -- Convert to signal. Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all); - if not Sig.Flags.Is_Dumped then - Sig.Flags.Is_Dumped := True; + + -- Get signal number. + Num := Get_Signal_Number (Sig); + + -- If the signal number is 0, then assign a valid signal number. + if Num = 0 then Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1; - Sig.Flink := To_Ghdl_Signal_Ptr + Sig.Alink := To_Ghdl_Signal_Ptr (Integer_Address (Nbr_Dumped_Signals)); + Num := Nbr_Dumped_Signals; end if; - Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink))); + + -- Do the real job: write the signal number. + Wave_Put_ULEB128 (Ghdl_E32 (Num)); end Write_Signal_Number; procedure Foreach_Scalar_Signal_Number is new @@ -1370,13 +1387,18 @@ Table_Initial => 32, Table_Increment => 100); + function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is + begin + return Dump_Table.Table (N); + end Get_Dump_Entry; + procedure Write_Hierarchy (Root : VhpiHandleT) is N : Natural; begin - -- Check Flink is 0. + -- Check Alink is 0. for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flink /= null then + if Sig_Table.Table (I).Alink /= null then Internal_Error ("wave.write_hierarchy"); end if; end loop; @@ -1393,15 +1415,20 @@ Wave_Put_Byte (0); Dump_Table.Set_Last (Nbr_Dumped_Signals); + for I in Dump_Table.First .. Dump_Table.Last loop + Dump_Table.Table (I) := null; + end loop; -- Save and clear. - N := 0; for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flags.Is_Dumped then - N := N + 1; + N := Get_Signal_Number (Sig_Table.Table (I)); + if N /= 0 then + if Dump_Table.Table (N) /= null then + Internal_Error ("wave.write_hierarchy(2)"); + end if; Dump_Table.Table (N) := Sig_Table.Table (I); + Sig_Table.Table (I).Alink := null; end if; - Sig_Table.Table (I).Flink := null; end loop; end Write_Hierarchy; diff -urN ghdl-0.21/vhdl/Makefile.in ghdl-0.22dev/vhdl/Makefile.in --- ghdl-0.21/vhdl/Makefile.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Makefile.in 2006-03-06 14:26:21.000000000 +0100 @@ -480,6 +480,7 @@ #GRT_USE_PTHREADS=y ifeq ($(GRT_USE_PTHREADS),y) + GRT_CFLAGS+=-DUSE_THREADS GRT_ADD_OBJS+=grt-cthreads.o GRT_EXTRA_LIB+=-lpthread endif @@ -527,7 +528,7 @@ $(CC) -c $(GRT_FLAGS) -o $@ $< linux.o: $(GRTSRCDIR)/config/linux.c - $(CC) -c $(GRT_FLAGS) -o $@ $< + $(CC) -c $(GRT_FLAGS) $(GRT_CFLAGS) -o $@ $< win32.o: $(GRTSRCDIR)/config/win32.c $(CC) -c $(GRT_FLAGS) -o $@ $< diff -urN ghdl-0.21/vhdl/parse.adb ghdl-0.22dev/vhdl/parse.adb --- ghdl-0.21/vhdl/parse.adb 2005-12-17 07:18:00.000000000 +0100 +++ ghdl-0.22dev/vhdl/parse.adb 2006-03-06 14:10:30.000000000 +0100 @@ -3540,7 +3540,7 @@ Set_Location (Res); Set_Expression (Res, Parse_Expression); - Expect (Tok_Select, "after expression"); + Expect (Tok_Select, "'select' expected after expression"); Scan.Scan; if Current_Token = Tok_Left_Paren then Target := Parse_Aggregate; @@ -3556,13 +3556,13 @@ Build_Init (Last); loop Wf_Chain := Parse_Waveform; - Expect (Tok_When, "after waveform"); + Expect (Tok_When, "'when' expected after waveform"); Scan.Scan; Assoc := Parse_Choices (Null_Iir); Set_Associated (Assoc, Wf_Chain); Append_Subchain (Last, Res, Assoc); exit when Current_Token = Tok_Semi_Colon; - Expect (Tok_Comma, "after choice"); + Expect (Tok_Comma, "',' (comma) expected after choice"); Scan.Scan; end loop; return Res; diff -urN ghdl-0.21/vhdl/sem_assocs.adb ghdl-0.22dev/vhdl/sem_assocs.adb --- ghdl-0.21/vhdl/sem_assocs.adb 2005-10-08 14:45:00.000000000 +0200 +++ ghdl-0.22dev/vhdl/sem_assocs.adb 2006-03-06 14:10:30.000000000 +0100 @@ -551,7 +551,7 @@ exit when Index_Type = Null_Iir; Chain := Get_Individual_Association_Chain (Assoc); Sem_Choices_Range - (Chain, Index_Type, True, Get_Location (Assoc), Low, High); + (Chain, Index_Type, False, Get_Location (Assoc), Low, High); Set_Individual_Association_Chain (Assoc, Chain); end loop; end Finish_Individual_Assoc_Array_Subtype; diff -urN ghdl-0.21/vhdl/sem_expr.adb ghdl-0.22dev/vhdl/sem_expr.adb --- ghdl-0.21/vhdl/sem_expr.adb 2005-12-17 07:13:37.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_expr.adb 2006-03-06 14:10:30.000000000 +0100 @@ -2278,6 +2278,7 @@ Lb := Low; Hb := High; end if; + -- Checks all values between POS and POS_MAX are handled. Pos := Eval_Pos (Lb); Pos_Max := Eval_Pos (Hb); if Pos > Pos_Max then diff -urN ghdl-0.21/vhdl/sem_names.adb ghdl-0.22dev/vhdl/sem_names.adb --- ghdl-0.21/vhdl/sem_names.adb 2005-12-11 14:50:31.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_names.adb 2006-03-06 14:10:30.000000000 +0100 @@ -1974,7 +1974,8 @@ Error_Msg_Sem ("function name is a procedure", Name); when Iir_Kind_Process_Statement - | Iir_Kind_Component_Declaration => + | Iir_Kind_Component_Declaration + | Iir_Kind_Type_Conversion => Error_Msg_Sem (Disp_Node (Prefix) & " cannot be indexed or sliced", Name); Res := Null_Iir; diff -urN ghdl-0.21/vhdl/translation.adb ghdl-0.22dev/vhdl/translation.adb --- ghdl-0.21/vhdl/translation.adb 2005-12-10 12:11:41.000000000 +0100 +++ ghdl-0.22dev/vhdl/translation.adb 2006-03-06 14:10:22.000000000 +0100 @@ -1797,15 +1797,13 @@ -- Check bounds length of L match bounds length of R. -- If L_TYPE (resp. R_TYPE) is not a thin array, then L_NODE - -- (resp. R_NODE) are not used (and may be o_lnode_null). + -- (resp. R_NODE) are not used (and may be Mnode_Null). -- If L_TYPE (resp. T_TYPE) is a fat array, then L_NODE (resp. R_NODE) - -- must be a variable pointing to the array. + -- must designate the array. procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir); -- Create a subtype range to be stored into the location pointed by @@ -8412,10 +8410,19 @@ return True; end Need_Range_Check; - procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) + procedure Check_Range_Low (Value : O_Dnode; Atype : Iir) is If_Blk : O_If_Block; begin + Open_Temp; + Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); + Chap6.Gen_Bound_Error (Null_Iir); + Finish_If_Stmt (If_Blk); + Close_Temp; + end Check_Range_Low; + + procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) is + begin if not Need_Range_Check (Expr, Atype) then return; end if; @@ -8428,20 +8435,14 @@ Chap6.Gen_Bound_Error (Expr); end if; else - Open_Temp; - Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); - Chap6.Gen_Bound_Error (Null_Iir); - Finish_If_Stmt (If_Blk); - Close_Temp; + Check_Range_Low (Value, Atype); end if; end Check_Range; procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir) is L_Tinfo, R_Tinfo : Type_Info_Acc; @@ -8491,10 +8492,10 @@ exit when Index = Null_Iir; Sub_Cond := New_Compare_Op (ON_Neq, - Chap6.Get_Array_Ptr_Bound_Length (L_Node, L_Type, - I + 1, L_Mode), - Chap6.Get_Array_Ptr_Bound_Length (R_Node, R_Type, - I + 1, R_Mode), + M2E (Range_To_Length + (Get_Array_Range (L_Node, L_Type, I + 1))), + M2E (Range_To_Length + (Get_Array_Range (R_Node, R_Type, I + 1))), Ghdl_Bool_Type); if I = 0 then Cond := Sub_Cond; @@ -10081,8 +10082,8 @@ New_Assign_Stmt (Get_Var (Alias_Info.Alias_Var), New_Value (M2Lp (Chap3.Get_Array_Base (Name_Node)))); - Chap3.Check_Array_Match (Decl_Type, O_Lnode_Null, Kind, - Name_Type, M2Lp (Name_Node), Kind, + Chap3.Check_Array_Match (Decl_Type, T2M (Decl_Type, Kind), + Name_Type, Name_Node, Decl); Close_Temp; when Type_Mode_Scalar => @@ -11691,6 +11692,16 @@ end; end if; + if Get_Kind (Formal_Type) in Iir_Kinds_Array_Type_Definition + then + -- Check length matches. + Stabilize (Formal_Node); + Stabilize (Actual_Node); + Chap3.Check_Array_Match (Formal_Type, Formal_Node, + Actual_Type, Actual_Node, + Assoc); + end if; + Data := (Actual_Node => Actual_Node, Actual_Type => Actual_Type, Mode => Mode, @@ -14420,8 +14431,8 @@ E := Create_Temp_Init (T_Info.Ortho_Ptr_Type (Mode_Value), Val); Chap3.Check_Array_Match - (Target_Type, M2Lp (T), Mode_Value, - Get_Type (Expr), New_Obj (E), Mode_Value, + (Target_Type, T, + Get_Type (Expr), Dp2M (E, T_Info, Mode_Value), Null_Iir); Chap3.Translate_Object_Copy (T, New_Obj_Value (E), Target_Type); @@ -15169,9 +15180,10 @@ begin E := Create_Temp_Init (Expr_Info.Ortho_Ptr_Type (Mode_Value), Expr); - Chap3.Check_Array_Match (Res_Type, O_Lnode_Null, Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, T2M (Res_Type, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); return New_Convert_Ov (New_Value (Chap3.Get_Array_Ptr_Base_Ptr (New_Obj (E), Expr_Type, Mode_Value)), @@ -15199,9 +15211,10 @@ Chap3.Get_Array_Bounds_Ptr (O_Lnode_Null, Expr_Type, Mode_Value)); -- Check array match. - Chap3.Check_Array_Match (Res_Type, New_Obj (Res), Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, Dv2M (Res, Res_Info, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); Close_Temp; return New_Address (New_Obj (Res), Res_Info.Ortho_Ptr_Type (Mode_Value)); @@ -22283,19 +22296,58 @@ function Translate_Val_Attribute (Attr : Iir) return O_Enode is - T : O_Dnode; - Prefix : Iir; - Ttype : O_Tnode; + Val : O_Enode; + Attr_Type : Iir; + Res_Var : O_Dnode; + Res_Type : O_Tnode; begin - Prefix := Get_Type (Attr); - Ttype := Get_Ortho_Type (Prefix, Mode_Value); - T := Create_Temp (Ttype); - New_Assign_Stmt - (New_Obj (T), - New_Convert_Ov (Chap7.Translate_Expression (Get_Parameter (Attr)), - Ttype)); - Chap3.Check_Range (T, Attr, Get_Type (Get_Prefix (Attr))); - return New_Obj_Value (T); + Attr_Type := Get_Type (Attr); + Res_Type := Get_Ortho_Type (Attr_Type, Mode_Value); + Res_Var := Create_Temp (Res_Type); + Val := Chap7.Translate_Expression (Get_Parameter (Attr)); + + case Get_Kind (Attr_Type) is + when Iir_Kind_Enumeration_Type_Definition + | Iir_Kind_Enumeration_Subtype_Definition => + -- For enumeration, always check the value is in the enum + -- range. + declare + Val_Type : O_Tnode; + Val_Var : O_Dnode; + If_Blk : O_If_Block; + begin + Val_Type := Get_Ortho_Type (Get_Type (Get_Parameter (Attr)), + Mode_Value); + Val_Var := Create_Temp_Init (Val_Type, Val); + Start_If_Stmt + (If_Blk, + New_Dyadic_Op + (ON_Or, + New_Compare_Op (ON_Lt, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, 0)), + Ghdl_Bool_Type), + New_Compare_Op (ON_Ge, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, + Integer_64 + (Get_Nbr_Elements + (Get_Enumeration_Literal_List + (Attr_Type))))), + Ghdl_Bool_Type))); + Chap6.Gen_Bound_Error (Attr); + Finish_If_Stmt (If_Blk); + Val := New_Obj_Value (Val_Var); + end; + when others => + null; + end case; + + New_Assign_Stmt (New_Obj (Res_Var), New_Convert_Ov (Val, Res_Type)); + Chap3.Check_Range (Res_Var, Attr, Get_Type (Get_Prefix (Attr))); + return New_Obj_Value (Res_Var); end Translate_Val_Attribute; function Translate_Pos_Attribute (Attr : Iir; Res_Type : Iir) diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads --- ghdl-0.21/vhdl/version.ads 2005-12-18 14:07:38.000000000 +0100 +++ ghdl-0.22dev/vhdl/version.ads 2006-03-06 14:10:30.000000000 +0100 @@ -1,4 +1,4 @@ package Version is Ghdl_Version : constant String := - "GHDL 0.21 (20051218) [Sokcho edition]"; + "GHDL 0.22dev (20051220) [Sokcho edition]"; end Version; Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/FC-4/ghdl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ghdl.spec 16 Feb 2006 08:46:52 -0000 1.7 +++ ghdl.spec 6 Mar 2006 16:17:54 -0000 1.8 @@ -4,7 +4,7 @@ Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.39svn.0%{?dist} +Release: 0.40svn.0%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -14,7 +14,7 @@ # ./dist.sh sources Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2 -Patch0: ghdl-svn39.patch +Patch0: ghdl-svn40.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo Requires(post): /sbin/install-info @@ -215,6 +215,10 @@ %{_libexecdir}/gcc/ %changelog +* Mon Mar 6 2006 Thomas Sailer - 0.22-0.40svn.0 +- update to svn40, to fix an array bounds checking bug apparently + introduced in svn39 + * Thu Feb 16 2006 Thomas Sailer - 0.22-0.39svn.0 - update to svn39, to fix some constant bugs From fedora-extras-commits at redhat.com Mon Mar 6 16:23:01 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 11:23:01 -0500 Subject: rpms/powermanga/devel powermanga.spec,1.10,1.11 Message-ID: <200603061623.k26GNXg1030543@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/powermanga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30524 Modified Files: powermanga.spec Log Message: Default to modular X for non Fedora systems. Index: powermanga.spec =================================================================== RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- powermanga.spec 6 Mar 2006 15:16:01 -0000 1.10 +++ powermanga.spec 6 Mar 2006 16:23:01 -0000 1.11 @@ -10,9 +10,8 @@ Patch0: powermanga-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils -# Use monolithic X up to FC4, and modular X for FC5+ -%if 0%{?fedora} < 5 -%else +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libXxf86dga-devel, libXxf86vm-devel %endif From fedora-extras-commits at redhat.com Mon Mar 6 16:34:51 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 11:34:51 -0500 Subject: rpms/djvulibre/devel djvulibre-3.5.16-extraqualif.patch, NONE, 1.1 djvulibre.spec, 1.13, 1.14 Message-ID: <200603061635.k26GZRwT030602@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30580 Modified Files: djvulibre.spec Added Files: djvulibre-3.5.16-extraqualif.patch Log Message: Work in progress to build for FC5, but there are still some errors to fix. djvulibre-3.5.16-extraqualif.patch: --- NEW FILE djvulibre-3.5.16-extraqualif.patch --- diff -Naupr djvulibre-3.5.16.orig/libdjvu/ByteStream.h djvulibre-3.5.16/libdjvu/ByteStream.h --- djvulibre-3.5.16.orig/libdjvu/ByteStream.h 2003-11-07 23:08:20.000000000 +0100 +++ djvulibre-3.5.16/libdjvu/ByteStream.h 2006-01-30 11:22:17.000000000 +0100 @@ -242,7 +242,7 @@ public: and writes it to the specified stream. */ void formatmessage( const char *fmt, ... ); /** Looks up the message and writes it to the specified stream. */ - void ByteStream::writemessage( const char *message ); + void writemessage( const char *message ); /** Writes a one-byte integer to a ByteStream. */ void write8 (unsigned int card8); /** Writes a two-bytes integer to a ByteStream. diff -Naupr djvulibre-3.5.16.orig/libdjvu/GURL.h djvulibre-3.5.16/libdjvu/GURL.h --- djvulibre-3.5.16.orig/libdjvu/GURL.h 2003-11-07 23:08:21.000000000 +0100 +++ djvulibre-3.5.16/libdjvu/GURL.h 2006-01-30 11:18:17.000000000 +0100 @@ -278,10 +278,10 @@ public: //@} /// Returns TRUE if #gurl1# and #gurl2# are the same - bool GURL::operator==(const GURL & gurl2) const; + bool operator==(const GURL & gurl2) const; /// Returns TRUE if #gurl1# and #gurl2# are different - bool GURL::operator!=(const GURL & gurl2) const; + bool operator!=(const GURL & gurl2) const; /// Assignment operator GURL & operator=(const GURL & url); Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- djvulibre.spec 6 Mar 2006 15:53:08 -0000 1.13 +++ djvulibre.spec 6 Mar 2006 16:34:50 -0000 1.14 @@ -1,15 +1,21 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre -Version: 3.5.15 -Release: 3%{?dist} +Version: 3.5.16 +Release: 1%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz -Patch0: djvulibre-3.5.15-gcc401.patch +Patch0: djvulibre-3.5.16-extraqualif.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: xorg-x11-devel, qt-devel, libjpeg-devel, libtiff-devel +BuildRequires: qt-devel, libjpeg-devel, libtiff-devel BuildRequires: mozilla, redhat-menus, hicolor-icon-theme +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libXt-devel +%else +BuildRequires: xorg-x11-devel +%endif # Provide these here, they're so small, it's not worth splitting them out Provides: mozilla-djvulibre = %{version}-%{release} Provides: djvulibre-devel = %{version}-%{release} @@ -32,7 +38,7 @@ %prep %setup -%patch0 -p1 -b .gcc401 +%patch0 -p1 -b .extraqualif %build @@ -96,9 +102,15 @@ %changelog -* Mon Mar 6 2006 Matthias Saou 3.5.15-3 +* Mon Mar 6 2006 Matthias Saou 3.5.16-2 - FC5 rebuild. +* Mon Jan 30 2006 Matthias Saou 3.5.16-1 +- Update to 3.5.16. +- Add conditional to build with/without modular X depending on FC version. +- Remove no longer needed gcc4 patch. +- Add extra qualification patch. + * Thu Aug 4 2005 Matthias Saou 3.5.15-2 - Include djvulibre-3.5.15-gcc401.patch to fix compilation with gcc 4.0.1. - Add hicolor-icon-theme build req for /usr/share/icons/hicolor/48x48/mimetypes From fedora-extras-commits at redhat.com Mon Mar 6 16:40:53 2006 From: fedora-extras-commits at redhat.com (Alexander Larsson (alexl)) Date: Mon, 6 Mar 2006 11:40:53 -0500 Subject: rpms/sabayon/devel sabayon-2.12.3-xinit.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sabayon.spec, 1.18, 1.19 sources, 1.9, 1.10 Message-ID: <200603061641.k26GfQF4030683@cvs-int.fedora.redhat.com> Author: alexl Update of /cvs/extras/rpms/sabayon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30658 Modified Files: .cvsignore sabayon.spec sources Added Files: sabayon-2.12.3-xinit.patch Log Message: * Mon Mar 6 2006 Alexander Larsson - 2.12.3-1 - update to 2.12.3 - Fix Xnest dependency with modular X - Fix Xsession script being moved in FC5 - Remove sabayon.schema from doc, as it wasn't in this release sabayon-2.12.3-xinit.patch: --- NEW FILE sabayon-2.12.3-xinit.patch --- Index: configure.ac =================================================================== RCS file: /cvs/gnome/sabayon/configure.ac,v retrieving revision 1.65 diff -u -p -r1.65 configure.ac --- configure.ac 6 Mar 2006 08:24:40 -0000 1.65 +++ configure.ac 6 Mar 2006 16:28:36 -0000 @@ -108,7 +108,7 @@ if test "x$with_distro" = "x"; then else case $with_distro in redhat) - XSESSION="/etc/X11/xdm/Xsession" + AC_CHECK_FILE(/etc/X11/xinit/Xsession, XSESSION="/etc/X11/xinit/Xsession", XSESSION="/etc/X11/xdm/Xsession") SESSION_NAME="gnome" install_xinitrc_script="yes" XINITRC_SYSCONFDIR="X11/xinit/xinitrc.d" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 17 Nov 2005 13:27:33 -0000 1.9 +++ .cvsignore 6 Mar 2006 16:40:53 -0000 1.10 @@ -1,3 +1 @@ -sabayon-2.12.0.tar.gz -sabayon-2.12.1.tar.bz2 -sabayon-2.12.2.tar.bz2 +sabayon-2.12.3.tar.bz2 Index: sabayon.spec =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sabayon.spec 17 Nov 2005 14:25:40 -0000 1.18 +++ sabayon.spec 6 Mar 2006 16:40:53 -0000 1.19 @@ -13,8 +13,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_pytho\n_lib()")} Name: sabayon -Version: 2.12.2 -Release: 2 +Version: 2.12.3 +Release: 1 Summary: Tool to maintain user profiles in a GNOME desktop Group: Applications/System @@ -24,6 +24,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: sabayon-2.12.3-xinit.patch + Requires: python-abi = %{pyver} Requires: gamin-python Requires: libxml2-python @@ -38,6 +40,7 @@ BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: usermode +BuildRequires: xorg-x11-server-Xnest Requires(post): shadow-utils Requires(preun): shadow-utils @@ -54,7 +57,7 @@ Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: Xnest +Requires: xorg-x11-server-Xnest Requires: shadow-utils %description admin @@ -64,7 +67,13 @@ %prep %setup -q +%patch1 -p0 -b .xinit + + %build +#needed for patch 1 (xinit fix) +autoconf + %configure \ --enable-consolehelper=yes \ --with-prototype-user=%{name}-admin @@ -119,7 +128,8 @@ %files -f sabayon.lang %defattr(-, root, root, 755) -%doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES sabayon.schema +%doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES +# Wasn't in tarball for 2.12.3: sabayon.schema %config(noreplace) %{_sysconfdir}/gconf/2/local-defaults.path %config(noreplace) %{_sysconfdir}/gconf/2/local-mandatory.path @@ -176,6 +186,12 @@ %{python_sitelib}/%{name}/lockdown %changelog +* Mon Mar 6 2006 Alexander Larsson - 2.12.3-1 +- update to 2.12.3 +- Fix Xnest dependency with modular X +- Fix Xsession script being moved in FC5 +- Remove sabayon.schema from doc, as it wasn't in this release + * Thu Nov 17 2005 Alexander Larsson - 2.12.2-2 - Update to 2.12.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 17 Nov 2005 13:27:33 -0000 1.9 +++ sources 6 Mar 2006 16:40:53 -0000 1.10 @@ -1 +1 @@ -3d3e0a543a25b439023abd9abede6ac4 sabayon-2.12.2.tar.bz2 +259b56fecdba0cb5d2c93f2999d04900 sabayon-2.12.3.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 6 17:00:09 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:00:09 -0500 Subject: rpms/libupnp import.log,1.4,1.5 Message-ID: <200603061700.k26H0gjH030890@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30856 Modified Files: import.log Log Message: auto-import libupnp-1.3.1-1 on branch devel from libupnp-1.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libupnp/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 14 Feb 2006 21:53:22 -0000 1.4 +++ import.log 6 Mar 2006 17:00:09 -0000 1.5 @@ -1,3 +1,4 @@ libupnp-1_2_1a-4:HEAD:libupnp-1.2.1a-4.src.rpm:1137746395 libupnp-1_2_1a-5:HEAD:libupnp-1.2.1a-5.src.rpm:1139607771 libupnp-1_2_1a-6:HEAD:libupnp-1.2.1a-6.src.rpm:1139953991 +libupnp-1_3_1-1:HEAD:libupnp-1.3.1-1.src.rpm:1141664399 From fedora-extras-commits at redhat.com Mon Mar 6 17:00:15 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:00:15 -0500 Subject: rpms/libupnp/devel .cvsignore, 1.2, 1.3 libupnp.spec, 1.3, 1.4 sources, 1.2, 1.3 libupnp_dsm_320.patch, 1.1, NONE libupnp_ixml_FC4.patch, 1.1, NONE libupnp_performance.patch, 1.1, NONE Message-ID: <200603061700.k26H0lJe030895@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30856/devel Modified Files: .cvsignore libupnp.spec sources Removed Files: libupnp_dsm_320.patch libupnp_ixml_FC4.patch libupnp_performance.patch Log Message: auto-import libupnp-1.3.1-1 on branch devel from libupnp-1.3.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libupnp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jan 2006 08:40:11 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:00:15 -0000 1.3 @@ -1 +1 @@ -libupnp-1.2.1a.tar.gz +libupnp-1.3.1.tar.gz Index: libupnp.spec =================================================================== RCS file: /cvs/extras/rpms/libupnp/devel/libupnp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libupnp.spec 14 Feb 2006 21:53:28 -0000 1.3 +++ libupnp.spec 6 Mar 2006 17:00:15 -0000 1.4 @@ -1,14 +1,11 @@ -Version: 1.2.1a +Version: 1.3.1 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 6%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://upnp.sourceforge.net/ Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz -Patch0: libupnp_dsm_320.patch -Patch1: libupnp_ixml_FC4.patch -Patch2: libupnp_performance.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -28,61 +25,46 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 chmod 644 {LICENSE,README} -# Fix permissions for files in debuginfo package -find . -name '*.[ch]' | xargs chmod 644 - -# Fix libupnp.so symlink -sed -i -e 's#ln -s \$(PREFIX)/usr/lib/libupnp\.so#ln -s libupnp.so#' upnp/makefile - -# Remove -Os optflag and add RPM optflags in makefiles -# Install libraries in correct directories -find . -name '[Mm]akefile' | xargs sed -i \ - -e 's/^\([[:space:]]*CFLAGS .*\) -Os/\1/' \ - -e 's/^\([[:space:]]*DEBUG_FLAGS .*\) -Os/\1/' \ - -e 's/^[[:space:]]*CFLAGS .*/& $(RPM_OPT_FLAGS)/' \ - -e 's#/usr/lib\([/ ;]\)#%{_libdir}\1#g' \ - -e 's#/usr/lib$#%{_libdir}#g' - %build -make -C upnp STRIP="echo Not stripping" %{?_smp_mflags} +%configure +make %{?_smp_mflags} %install rm -rf %{buildroot} +%makeinstall -## Install libupnp.so and headers -make -C upnp PREFIX=%{buildroot} install - -## Install libixml.so and headers -make -C ixml PREFIX=%{buildroot} install -install -p ixml/inc/ixml.h %{buildroot}%{_includedir}/upnp - -## Install libthreadutil.so and headers -make -C threadutil PREFIX=%{buildroot} install - +rm %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc LICENSE README -%{_libdir}/libixml.so* -%{_libdir}/libthreadutil.so* -%{_libdir}/libupnp.so* +%doc LICENSE README NEWS +%{_libdir}/libixml.so.* +%{_libdir}/libthreadutil.so.* +%{_libdir}/libupnp.so.* %files devel %defattr(0644,root,root,0755) %{_includedir}/upnp/ +%{_libdir}/libixml.so +%{_libdir}/libthreadutil.so +%{_libdir}/libupnp.so +%{_libdir}/libixml.a +%{_libdir}/libthreadutil.a +%{_libdir}/libupnp.a +%{_libdir}/pkgconfig/libupnp.pc %clean rm -rf %{buildroot} %changelog +* Sun Mar 05 2006 Eric Tanguy - 1.3.1-1 +- Update to 1.3.1 + * Tue Feb 14 2006 Eric Tanguy - 1.2.1a-6 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libupnp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jan 2006 08:40:11 -0000 1.2 +++ sources 6 Mar 2006 17:00:15 -0000 1.3 @@ -1 +1 @@ -e72b3550bf064eedf080f16f09688891 libupnp-1.2.1a.tar.gz +6646be5e31e58188e8f47c6ce64faa4c libupnp-1.3.1.tar.gz --- libupnp_dsm_320.patch DELETED --- --- libupnp_ixml_FC4.patch DELETED --- --- libupnp_performance.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 17:03:14 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:03:14 -0500 Subject: rpms/libupnp import.log,1.5,1.6 Message-ID: <200603061703.k26H3kkS000402@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv348 Modified Files: import.log Log Message: auto-import libupnp-1.3.1-1 on branch FC-3 from libupnp-1.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libupnp/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 6 Mar 2006 17:00:09 -0000 1.5 +++ import.log 6 Mar 2006 17:03:14 -0000 1.6 @@ -2,3 +2,4 @@ libupnp-1_2_1a-5:HEAD:libupnp-1.2.1a-5.src.rpm:1139607771 libupnp-1_2_1a-6:HEAD:libupnp-1.2.1a-6.src.rpm:1139953991 libupnp-1_3_1-1:HEAD:libupnp-1.3.1-1.src.rpm:1141664399 +libupnp-1_3_1-1:FC-3:libupnp-1.3.1-1.src.rpm:1141664572 From fedora-extras-commits at redhat.com Mon Mar 6 17:03:21 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:03:21 -0500 Subject: rpms/libupnp/FC-3 .cvsignore, 1.2, 1.3 libupnp.spec, 1.1, 1.2 sources, 1.2, 1.3 libupnp_dsm_320.patch, 1.1, NONE libupnp_ixml_FC4.patch, 1.1, NONE libupnp_performance.patch, 1.1, NONE Message-ID: <200603061703.k26H3rr2000412@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv348/FC-3 Modified Files: .cvsignore libupnp.spec sources Removed Files: libupnp_dsm_320.patch libupnp_ixml_FC4.patch libupnp_performance.patch Log Message: auto-import libupnp-1.3.1-1 on branch FC-3 from libupnp-1.3.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jan 2006 08:40:11 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:03:20 -0000 1.3 @@ -1 +1 @@ -libupnp-1.2.1a.tar.gz +libupnp-1.3.1.tar.gz Index: libupnp.spec =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-3/libupnp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libupnp.spec 20 Jan 2006 08:40:11 -0000 1.1 +++ libupnp.spec 6 Mar 2006 17:03:20 -0000 1.2 @@ -1,14 +1,11 @@ -Version: 1.2.1a +Version: 1.3.1 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://upnp.sourceforge.net/ Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz -Patch0: libupnp_dsm_320.patch -Patch1: libupnp_ixml_FC4.patch -Patch2: libupnp_performance.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -28,61 +25,52 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 chmod 644 {LICENSE,README} -# Fix permissions for files in debuginfo package -find . -name '*.[ch]' | xargs chmod 644 - -# Fix libupnp.so symlink -sed -i -e 's#ln -s \$(PREFIX)/usr/lib/libupnp\.so#ln -s libupnp.so#' upnp/makefile - -# Remove -Os optflag and add RPM optflags in makefiles -# Install libraries in correct directories -find . -name '[Mm]akefile' | xargs sed -i \ - -e 's/^\([[:space:]]*CFLAGS .*\) -Os/\1/' \ - -e 's/^\([[:space:]]*DEBUG_FLAGS .*\) -Os/\1/' \ - -e 's/^[[:space:]]*CFLAGS .*/& $(RPM_OPT_FLAGS)/' \ - -e 's#/usr/lib\([/ ;]\)#%{_libdir}\1#g' \ - -e 's#/usr/lib$#%{_libdir}#g' - %build -make -C upnp STRIP="echo Not stripping" %{?_smp_mflags} +%configure +make %{?_smp_mflags} %install rm -rf %{buildroot} +%makeinstall -## Install libupnp.so and headers -make -C upnp PREFIX=%{buildroot} install - -## Install libixml.so and headers -make -C ixml PREFIX=%{buildroot} install -install -p ixml/inc/ixml.h %{buildroot}%{_includedir}/upnp - -## Install libthreadutil.so and headers -make -C threadutil PREFIX=%{buildroot} install - +rm %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc LICENSE README -%{_libdir}/libixml.so* -%{_libdir}/libthreadutil.so* -%{_libdir}/libupnp.so* +%doc LICENSE README NEWS +%{_libdir}/libixml.so.* +%{_libdir}/libthreadutil.so.* +%{_libdir}/libupnp.so.* %files devel %defattr(0644,root,root,0755) %{_includedir}/upnp/ +%{_libdir}/libixml.so +%{_libdir}/libthreadutil.so +%{_libdir}/libupnp.so +%{_libdir}/libixml.a +%{_libdir}/libthreadutil.a +%{_libdir}/libupnp.a +%{_libdir}/pkgconfig/libupnp.pc %clean rm -rf %{buildroot} %changelog +* Sun Mar 05 2006 Eric Tanguy - 1.3.1-1 +- Update to 1.3.1 + +* Tue Feb 14 2006 Eric Tanguy - 1.2.1a-6 +- Rebuild for FC5 + +* Fri Feb 10 2006 Eric Tanguy - 1.2.1a-5 +- Rebuild for FC5 + * Mon Jan 9 2006 Eric Tanguy 1.2.1a-4 - Include libupnp.so symlink in package to take care of non versioning of libupnp.so.1.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jan 2006 08:40:11 -0000 1.2 +++ sources 6 Mar 2006 17:03:21 -0000 1.3 @@ -1 +1 @@ -e72b3550bf064eedf080f16f09688891 libupnp-1.2.1a.tar.gz +6646be5e31e58188e8f47c6ce64faa4c libupnp-1.3.1.tar.gz --- libupnp_dsm_320.patch DELETED --- --- libupnp_ixml_FC4.patch DELETED --- --- libupnp_performance.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 17:03:39 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:03:39 -0500 Subject: rpms/viruskiller/devel viruskiller-1.0-makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 viruskiller.spec, 1.8, 1.9 viruskiller-0.9-makefile.patch, 1.1, NONE viruskiller-0.9-zzip.patch, 1.1, NONE Message-ID: <200603061704.k26H4CkM000447@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/viruskiller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv370 Modified Files: .cvsignore sources viruskiller.spec Added Files: viruskiller-1.0-makefile.patch Removed Files: viruskiller-0.9-makefile.patch viruskiller-0.9-zzip.patch Log Message: Update to 1.0-1. viruskiller-1.0-makefile.patch: --- NEW FILE viruskiller-1.0-makefile.patch --- diff -Naupr viruskiller-1.0.orig/makefile viruskiller-1.0/makefile --- viruskiller-1.0.orig/makefile 2005-05-21 19:03:45.000000000 +0200 +++ viruskiller-1.0/makefile 2006-03-06 17:47:30.000000000 +0100 @@ -7,18 +7,16 @@ VERSION = 1.0 RELEASE = 1 USEPAK = 1 -PREFIX=$(DESTDIR)/usr +PREFIX = $(DESTDIR)/usr BINDIR = $(PREFIX)/games/ -DATADIR = $(PREFIX)/share/games/parallelrealities/ -DOCDIR = $(PREFIX)/share/doc/$(PROG)-$(VERSION)-$(RELEASE)/ -ICONDIR = $(PREFIX)/share/icons/ -KDE = $(PREFIX)/share/applnk/Games/Arcade/ -GNOME = $(PREFIX)/share/gnome/apps/Games/ +DATADIR = $(PREFIX)/share/games/viruskiller/ +ICONDIR = $(PREFIX)/share/pixmaps/ +GNOME = $(PREFIX)/share/applications/ SAFEDIR = /tmp/ -CFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DSAFEDIR=\"$(SAFEDIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)manual.html\" -Wall +CFLAGS += $(OPTFLAGS) `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) +CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DSAFEDIR=\"$(SAFEDIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DATADIR)manual.html\" LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf OBJS += CAudio.o @@ -77,19 +75,10 @@ install: ./pak data gfx music sound $(PAKNAME) mkdir -p $(BINDIR) mkdir -p $(DATADIR) - mkdir -p $(DOCDIR) mkdir -p $(ICONDIR) - mkdir -p $(ICONDIR)mini - mkdir -p $(ICONDIR)large - mkdir -p $(KDE) mkdir -p $(GNOME) - strip $(PROG) - install -o root -g games -m 755 $(PROG) $(BINDIR)$(PROG) - install -o root -g games -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME) - cp $(DOCS) $(DOCDIR) + install -m 755 $(PROG) $(BINDIR)$(PROG) + install -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME) cp $(ICONS)$(PROG).png $(ICONDIR) - cp $(ICONS)$(PROG)-mini.png $(ICONDIR)mini/$(PROG).png - cp $(ICONS)$(PROG)-large.png $(ICONDIR)large/$(PROG).png - cp $(ICONS)$(PROG).desktop $(KDE) cp $(ICONS)$(PROG).desktop $(GNOME) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/viruskiller/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:51:06 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:03:39 -0000 1.3 @@ -1 +1 @@ -viruskiller-0.9-1.tar.gz +viruskiller-1.0-1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/viruskiller/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:51:06 -0000 1.2 +++ sources 6 Mar 2006 17:03:39 -0000 1.3 @@ -1 +1 @@ -5dd118cce987cf0cea027f5960bd53e1 viruskiller-0.9-1.tar.gz +de7c78b3abdb4ff488943d78a94f5bb1 viruskiller-1.0-1.tar.gz Index: viruskiller.spec =================================================================== RCS file: /cvs/extras/rpms/viruskiller/devel/viruskiller.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- viruskiller.spec 6 Mar 2006 15:04:42 -0000 1.8 +++ viruskiller.spec 6 Mar 2006 17:03:39 -0000 1.9 @@ -1,17 +1,16 @@ Summary: Frantic shooting game where viruses invade your computer Name: viruskiller -Version: 0.9 -Release: 7%{?dist} +Version: 1.0 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://www.parallelrealities.co.uk/virusKiller.php # No absolute URL since the home page tunnels it through a PHP script Source: viruskiller-%{version}-1.tar.gz -Patch0: viruskiller-0.9-makefile.patch -Patch1: viruskiller-0.9-zzip.patch +Patch0: viruskiller-1.0-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel -BuildRequires: zziplib-devel, desktop-file-utils +BuildRequires: zlib-devel, desktop-file-utils %description Your computer has been invaded! Dozens of little viruses are pouring in via @@ -26,7 +25,6 @@ %prep %setup %patch0 -p1 -b .makefile -%patch1 -p1 -b .zzip %build @@ -68,14 +66,17 @@ %defattr(-, root, root, 0755) %doc doc/* %{_prefix}/games/viruskiller -%{_prefix}/share/games/viruskiller +%{_prefix}/share/games/viruskiller/ %{_datadir}/pixmaps/viruskiller.png %{_datadir}/applications/*%{name}.desktop %changelog -* Mon Mar 6 2006 Matthias Saou 0.9-7 -- FC5 rebuild. +* Mon Mar 6 2006 Matthias Saou 1.0-1 +- Update to 1.0-1. +- Update makefile patch. +- Remove no longer needed zziplib patch. +- No longer build require zziplib-devel, but zlib-devel instead. * Thu Feb 9 2006 Matthias Saou 0.9-6 - Rebuild for new gcc/glibc. --- viruskiller-0.9-makefile.patch DELETED --- --- viruskiller-0.9-zzip.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 17:05:45 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:05:45 -0500 Subject: rpms/libupnp import.log,1.6,1.7 Message-ID: <200603061706.k26H6Hdn000591@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv541 Modified Files: import.log Log Message: auto-import libupnp-1.3.1-1 on branch FC-4 from libupnp-1.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libupnp/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 6 Mar 2006 17:03:14 -0000 1.6 +++ import.log 6 Mar 2006 17:05:45 -0000 1.7 @@ -3,3 +3,4 @@ libupnp-1_2_1a-6:HEAD:libupnp-1.2.1a-6.src.rpm:1139953991 libupnp-1_3_1-1:HEAD:libupnp-1.3.1-1.src.rpm:1141664399 libupnp-1_3_1-1:FC-3:libupnp-1.3.1-1.src.rpm:1141664572 +libupnp-1_3_1-1:FC-4:libupnp-1.3.1-1.src.rpm:1141664718 From fedora-extras-commits at redhat.com Mon Mar 6 17:05:53 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:05:53 -0500 Subject: rpms/libupnp/FC-4 .cvsignore, 1.2, 1.3 libupnp.spec, 1.1, 1.2 sources, 1.2, 1.3 libupnp_dsm_320.patch, 1.1, NONE libupnp_ixml_FC4.patch, 1.1, NONE libupnp_performance.patch, 1.1, NONE Message-ID: <200603061706.k26H6Pvd000599@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv541/FC-4 Modified Files: .cvsignore libupnp.spec sources Removed Files: libupnp_dsm_320.patch libupnp_ixml_FC4.patch libupnp_performance.patch Log Message: auto-import libupnp-1.3.1-1 on branch FC-4 from libupnp-1.3.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jan 2006 08:40:11 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:05:52 -0000 1.3 @@ -1 +1 @@ -libupnp-1.2.1a.tar.gz +libupnp-1.3.1.tar.gz Index: libupnp.spec =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-4/libupnp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libupnp.spec 20 Jan 2006 08:40:11 -0000 1.1 +++ libupnp.spec 6 Mar 2006 17:05:52 -0000 1.2 @@ -1,14 +1,11 @@ -Version: 1.2.1a +Version: 1.3.1 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://upnp.sourceforge.net/ Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz -Patch0: libupnp_dsm_320.patch -Patch1: libupnp_ixml_FC4.patch -Patch2: libupnp_performance.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -28,61 +25,52 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 chmod 644 {LICENSE,README} -# Fix permissions for files in debuginfo package -find . -name '*.[ch]' | xargs chmod 644 - -# Fix libupnp.so symlink -sed -i -e 's#ln -s \$(PREFIX)/usr/lib/libupnp\.so#ln -s libupnp.so#' upnp/makefile - -# Remove -Os optflag and add RPM optflags in makefiles -# Install libraries in correct directories -find . -name '[Mm]akefile' | xargs sed -i \ - -e 's/^\([[:space:]]*CFLAGS .*\) -Os/\1/' \ - -e 's/^\([[:space:]]*DEBUG_FLAGS .*\) -Os/\1/' \ - -e 's/^[[:space:]]*CFLAGS .*/& $(RPM_OPT_FLAGS)/' \ - -e 's#/usr/lib\([/ ;]\)#%{_libdir}\1#g' \ - -e 's#/usr/lib$#%{_libdir}#g' - %build -make -C upnp STRIP="echo Not stripping" %{?_smp_mflags} +%configure +make %{?_smp_mflags} %install rm -rf %{buildroot} +%makeinstall -## Install libupnp.so and headers -make -C upnp PREFIX=%{buildroot} install - -## Install libixml.so and headers -make -C ixml PREFIX=%{buildroot} install -install -p ixml/inc/ixml.h %{buildroot}%{_includedir}/upnp - -## Install libthreadutil.so and headers -make -C threadutil PREFIX=%{buildroot} install - +rm %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc LICENSE README -%{_libdir}/libixml.so* -%{_libdir}/libthreadutil.so* -%{_libdir}/libupnp.so* +%doc LICENSE README NEWS +%{_libdir}/libixml.so.* +%{_libdir}/libthreadutil.so.* +%{_libdir}/libupnp.so.* %files devel %defattr(0644,root,root,0755) %{_includedir}/upnp/ +%{_libdir}/libixml.so +%{_libdir}/libthreadutil.so +%{_libdir}/libupnp.so +%{_libdir}/libixml.a +%{_libdir}/libthreadutil.a +%{_libdir}/libupnp.a +%{_libdir}/pkgconfig/libupnp.pc %clean rm -rf %{buildroot} %changelog +* Sun Mar 05 2006 Eric Tanguy - 1.3.1-1 +- Update to 1.3.1 + +* Tue Feb 14 2006 Eric Tanguy - 1.2.1a-6 +- Rebuild for FC5 + +* Fri Feb 10 2006 Eric Tanguy - 1.2.1a-5 +- Rebuild for FC5 + * Mon Jan 9 2006 Eric Tanguy 1.2.1a-4 - Include libupnp.so symlink in package to take care of non versioning of libupnp.so.1.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jan 2006 08:40:11 -0000 1.2 +++ sources 6 Mar 2006 17:05:53 -0000 1.3 @@ -1 +1 @@ -e72b3550bf064eedf080f16f09688891 libupnp-1.2.1a.tar.gz +6646be5e31e58188e8f47c6ce64faa4c libupnp-1.3.1.tar.gz --- libupnp_dsm_320.patch DELETED --- --- libupnp_ixml_FC4.patch DELETED --- --- libupnp_performance.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 17:05:50 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:05:50 -0500 Subject: rpms/bbkeys/devel bbkeys.spec,1.10,1.11 Message-ID: <200603061706.k26H6MGS000594@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/bbkeys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv539 Modified Files: bbkeys.spec Log Message: FC5 rebuild. Index: bbkeys.spec =================================================================== RCS file: /cvs/extras/rpms/bbkeys/devel/bbkeys.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bbkeys.spec 8 Feb 2006 14:49:14 -0000 1.10 +++ bbkeys.spec 6 Mar 2006 17:05:50 -0000 1.11 @@ -8,11 +8,11 @@ Source: http://dl.sf.net/bbkeys/bbkeys-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: blackbox-devel -# Use monolithic X up to FC4, and modular X for FC5+ -%if 0%{?fedora} < 5 -BuildRequires: xorg-x11-devel -%else +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libX11-devel, libXext-devel +%else +BuildRequires: xorg-x11-devel %endif %description From fedora-extras-commits at redhat.com Mon Mar 6 17:07:09 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:07:09 -0500 Subject: rpms/blackbox/devel blackbox.spec,1.12,1.13 Message-ID: <200603061707.k26H7fNo000744@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/blackbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv674 Modified Files: blackbox.spec Log Message: FC5 rebuild. Index: blackbox.spec =================================================================== RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blackbox.spec 8 Feb 2006 14:52:02 -0000 1.12 +++ blackbox.spec 6 Mar 2006 17:07:09 -0000 1.13 @@ -9,11 +9,11 @@ Source1: blackbox.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gcc-c++, pkgconfig -# Use monolithic X up to FC4, and modular X for FC5+ -%if 0%{?fedora} < 5 -BuildRequires: xorg-x11-devel -%else +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libXt-devel, libXext-devel +%else +BuildRequires: xorg-x11-devel %endif %description From fedora-extras-commits at redhat.com Mon Mar 6 17:08:11 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:08:11 -0500 Subject: rpms/bbkeys/devel bbkeys.spec,1.11,1.12 Message-ID: <200603061708.k26H8icm000854@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/bbkeys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv758 Modified Files: bbkeys.spec Log Message: FC5 rebuild, oops. Index: bbkeys.spec =================================================================== RCS file: /cvs/extras/rpms/bbkeys/devel/bbkeys.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bbkeys.spec 6 Mar 2006 17:05:50 -0000 1.11 +++ bbkeys.spec 6 Mar 2006 17:08:11 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Completely configurable key-combo grabber for blackbox Name: bbkeys Version: 0.9.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: User Interface/Desktops URL: http://bbkeys.sourceforge.net/ @@ -54,6 +54,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.9.0-4 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.9.0-3 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 17:08:44 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:08:44 -0500 Subject: rpms/blackbox/devel blackbox.spec,1.13,1.14 Message-ID: <200603061709.k26H9G57000934@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/blackbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv850 Modified Files: blackbox.spec Log Message: FC5 rebuild, oops. Index: blackbox.spec =================================================================== RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- blackbox.spec 6 Mar 2006 17:07:09 -0000 1.13 +++ blackbox.spec 6 Mar 2006 17:08:43 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Very small and fast Window Manager Name: blackbox Version: 0.70.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: User Interface/Desktops URL: http://blackboxwm.sourceforge.net/ @@ -82,6 +82,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.70.1-4 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.70.1-3 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 17:12:01 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:12:01 -0500 Subject: rpms/csmash/devel csmash.spec,1.11,1.12 Message-ID: <200603061712.k26HCYaH001040@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/csmash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1021 Modified Files: csmash.spec Log Message: FC5 rebuild. Index: csmash.spec =================================================================== RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- csmash.spec 8 Feb 2006 15:05:40 -0000 1.11 +++ csmash.spec 6 Mar 2006 17:12:00 -0000 1.12 @@ -1,7 +1,7 @@ Summary: 3D tabletennis game Name: csmash Version: 0.6.6 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL Group: Amusements/Games URL: http://cannonsmash.sourceforge.net/ @@ -12,11 +12,11 @@ BuildRequires: gtk2-devel, libjpeg-devel, zlib-devel, gcc-c++ BuildRequires: SDL-devel >= 1.2.0, SDL_mixer-devel, SDL_image-devel BuildRequires: desktop-file-utils -# Use monolithic X up to FC4, and modular X for FC5+ -%if 0%{?fedora} < 5 -BuildRequires: xorg-x11-devel, Mesa-devel +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libX11-devel, libGL-devel, libGLU-devel %else -BuildRequires: libX11-devel, mesa-libGL-devel, mesa-libGLU-devel +BuildRequires: xorg-x11-devel, Mesa-devel %endif %description @@ -75,6 +75,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.6.6-12 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.6.6-11 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 17:13:08 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:13:08 -0500 Subject: rpms/ushare/devel ushare.spec,1.4,1.5 Message-ID: <200603061713.k26HDhRF001068@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1048 Modified Files: ushare.spec Log Message: Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/devel/ushare.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ushare.spec 19 Feb 2006 17:16:12 -0000 1.4 +++ ushare.spec 6 Mar 2006 17:13:08 -0000 1.5 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,9 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 +- Rebuild with libupnp-1.3.1 + * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Mon Mar 6 17:15:18 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:15:18 -0500 Subject: rpms/Gtk-Perl/devel Gtk-Perl.spec,1.4,1.5 Message-ID: <200603061715.k26HFoSJ001127@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1080 Modified Files: Gtk-Perl.spec Log Message: FC5 rebuild. Index: Gtk-Perl.spec =================================================================== RCS file: /cvs/extras/rpms/Gtk-Perl/devel/Gtk-Perl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Gtk-Perl.spec 8 Feb 2006 16:29:23 -0000 1.4 +++ Gtk-Perl.spec 6 Mar 2006 17:15:18 -0000 1.5 @@ -3,7 +3,7 @@ Summary: Perl extensions for GTK+ (the Gimp ToolKit) Name: Gtk-Perl Version: 0.7008 -Release: 39%{?dist} +Release: 40%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.gtkperl.org/ @@ -13,10 +13,11 @@ BuildRequires: gtk+-devel, gdk-pixbuf-devel, libglade-devel BuildRequires: gnome-libs-devel, gtkhtml-devel, gal-devel BuildRequires: perl(XML::Parser) -%if 0%{?fedora} < 5 -BuildRequires: Mesa-devel +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libXt-devel, libXpm-devel, libGL-devel %else -BuildRequires: mesa-libGL-devel, libXt-devel, libXpm-devel +BuildRequires: Mesa-devel %endif # Internal perl provides not caught by the find-provides @@ -100,6 +101,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.7008-40 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.7008-39 - Rebuild for new gcc/glibc. - Add conditional to build with/without modular X depending on FC version. From fedora-extras-commits at redhat.com Mon Mar 6 17:16:10 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:16:10 -0500 Subject: rpms/ushare/FC-3 ushare.spec,1.2,1.3 Message-ID: <200603061716.k26HGgLM001188@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1166 Modified Files: ushare.spec Log Message: Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-3/ushare.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ushare.spec 19 Feb 2006 17:18:07 -0000 1.2 +++ ushare.spec 6 Mar 2006 17:16:10 -0000 1.3 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,9 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 +- Rebuild with libupnp-1.3.1 + * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Mon Mar 6 17:17:05 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:17:05 -0500 Subject: rpms/ushare/FC-4 ushare.spec,1.2,1.3 Message-ID: <200603061717.k26HHdxb001232@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1194 Modified Files: ushare.spec Log Message: Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-4/ushare.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ushare.spec 19 Feb 2006 17:19:39 -0000 1.2 +++ ushare.spec 6 Mar 2006 17:17:04 -0000 1.3 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,9 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 +- Rebuild with libupnp-1.3.1 + * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Mon Mar 6 17:24:49 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:24:49 -0500 Subject: rpms/xvattr/devel xvattr.spec,1.8,1.9 Message-ID: <200603061725.k26HPLT3001333@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xvattr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1315 Modified Files: xvattr.spec Log Message: FC5 rebuild. Index: xvattr.spec =================================================================== RCS file: /cvs/extras/rpms/xvattr/devel/xvattr.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xvattr.spec 9 Feb 2006 19:20:25 -0000 1.8 +++ xvattr.spec 6 Mar 2006 17:24:49 -0000 1.9 @@ -1,20 +1,20 @@ Summary: Utility for getting and setting Xv attributes Name: xvattr Version: 1.3 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: User Interface/X URL: http://www.dtek.chalmers.se/groups/dvd/ Source: http://www.dtek.chalmers.se/groups/dvd/dist/xvattr-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk+-devel -%if "%{?fedora}" >= "5" +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libXt-devel, libXv-devel %else BuildRequires: xorg-x11-devel %endif - %description This program is used for getting and setting Xv attributes such as XV_BRIGHTNESS, XV_CONTRAST, XV_SATURATION, XV_HUE, XV_COLORKEY, ... @@ -46,6 +46,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.3-9 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.3-8 - Rebuild for new gcc/glibc and modular X. From fedora-extras-commits at redhat.com Mon Mar 6 17:26:29 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:26:29 -0500 Subject: rpms/synergy/devel synergy.spec,1.12,1.13 Message-ID: <200603061727.k26HR1VN001395@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1378 Modified Files: synergy.spec Log Message: FC5 rebuild. Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- synergy.spec 21 Dec 2005 10:51:24 -0000 1.12 +++ synergy.spec 6 Mar 2006 17:26:29 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Mouse and keyboard sharing utility Name: synergy Version: 1.2.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ @@ -9,7 +9,8 @@ Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gcc-c++, autoconf, automake -%if "%{fedora}" >= "5" +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel BuildRequires: libXinerama-devel %else @@ -54,6 +55,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.2.7-2 +- FC5 rebuild. + * Tue Dec 20 2005 Matthias Saou 1.2.7-1 - Update to 1.2.7. - Add automake build requirement (to get aclocal). From fedora-extras-commits at redhat.com Mon Mar 6 17:44:08 2006 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Mon, 6 Mar 2006 12:44:08 -0500 Subject: rpms/testdisk/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 testdisk.spec, 1.2, 1.3 Message-ID: <200603061744.k26HieHp001522@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1501 Modified Files: .cvsignore sources testdisk.spec Log Message: Update to latest version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2006 17:24:03 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:44:08 -0000 1.3 @@ -1 +1 @@ -testdisk-6.2.tar.bz2 +testdisk-6.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2006 17:24:03 -0000 1.2 +++ sources 6 Mar 2006 17:44:08 -0000 1.3 @@ -1 +1 @@ -9c103d130f56d3dd901246574a1df76b testdisk-6.2.tar.bz2 +e099bd9bb87d4da5712699bdea3da00f testdisk-6.3.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-3/testdisk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- testdisk.spec 23 Jan 2006 07:47:13 -0000 1.2 +++ testdisk.spec 6 Mar 2006 17:44:08 -0000 1.3 @@ -3,8 +3,8 @@ Summary(fr): Outil pour v?rifier et restorer des partitions Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ????? Name: testdisk -Version: 6.2 -Release: 3%{?dist} +Version: 6.3 +Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 @@ -57,7 +57,10 @@ %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* %changelog -* Mon Jan 23 2006 Christophe Group +* Mon Mar 6 2006 Christophe Grenier 6.3-1 +- Update to latest version + +* Mon Jan 23 2006 Christophe Grenier 6.2-3 - 6.2-3 - same spec for all arches hence add dist From fedora-extras-commits at redhat.com Mon Mar 6 17:47:53 2006 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Mon, 6 Mar 2006 12:47:53 -0500 Subject: rpms/testdisk/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 testdisk.spec, 1.2, 1.3 Message-ID: <200603061748.k26HmPhb001600@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1579 Modified Files: .cvsignore sources testdisk.spec Log Message: Update to 6.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2006 17:24:03 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:47:53 -0000 1.3 @@ -1 +1 @@ -testdisk-6.2.tar.bz2 +testdisk-6.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2006 17:24:03 -0000 1.2 +++ sources 6 Mar 2006 17:47:53 -0000 1.3 @@ -1 +1 @@ -9c103d130f56d3dd901246574a1df76b testdisk-6.2.tar.bz2 +e099bd9bb87d4da5712699bdea3da00f testdisk-6.3.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-4/testdisk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- testdisk.spec 23 Jan 2006 07:47:18 -0000 1.2 +++ testdisk.spec 6 Mar 2006 17:47:53 -0000 1.3 @@ -3,8 +3,8 @@ Summary(fr): Outil pour v?rifier et restorer des partitions Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ????? Name: testdisk -Version: 6.2 -Release: 3%{?dist} +Version: 6.3 +Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 @@ -57,7 +57,10 @@ %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* %changelog -* Mon Jan 23 2006 Christophe Group +* Mon Mar 6 2006 Christophe Grenier 6.3-1 +- Update to latest version + +* Mon Jan 23 2006 Christophe Grenier 6.2-3 - 6.2-3 - same spec for all arches hence add dist From fedora-extras-commits at redhat.com Mon Mar 6 17:51:59 2006 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Mon, 6 Mar 2006 12:51:59 -0500 Subject: rpms/testdisk/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 testdisk.spec, 1.3, 1.4 Message-ID: <200603061752.k26HqWIJ001680@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1659 Modified Files: .cvsignore sources testdisk.spec Log Message: Update to version 6.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2006 17:24:03 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:51:59 -0000 1.3 @@ -1 +1,2 @@ testdisk-6.2.tar.bz2 +testdisk-6.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2006 17:24:03 -0000 1.2 +++ sources 6 Mar 2006 17:51:59 -0000 1.3 @@ -1 +1,2 @@ 9c103d130f56d3dd901246574a1df76b testdisk-6.2.tar.bz2 +e099bd9bb87d4da5712699bdea3da00f testdisk-6.3.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- testdisk.spec 28 Feb 2006 17:42:05 -0000 1.3 +++ testdisk.spec 6 Mar 2006 17:51:59 -0000 1.4 @@ -3,8 +3,8 @@ Summary(fr): Outil pour v?rifier et restorer des partitions Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ????? Name: testdisk -Version: 6.2 -Release: 4%{?dist} +Version: 6.3 +Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 @@ -57,6 +57,9 @@ %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* %changelog +* Mon Mar 6 2006 Christophe Grenier 6.3-1 +- Update to latest version + * Tue Feb 28 2006 ChangeLog Grenier 6.2-4 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon Mar 6 18:13:55 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Mar 2006 13:13:55 -0500 Subject: rpms/gnupg2/devel gnupg2.spec,1.32,1.33 Message-ID: <200603061814.k26IES3c003695@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1754 Modified Files: gnupg2.spec Log Message: * Mon Mar 6 2006 Ville Skytt?? > 1.9.20-33 - Don't hardcode pcsc-lite lib name. cleanup %{kde_scriptdir} usage Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gnupg2.spec 16 Feb 2006 19:50:31 -0000 1.32 +++ gnupg2.spec 6 Mar 2006 18:13:55 -0000 1.33 @@ -1,22 +1,11 @@ -# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) -# Note: this is just the name of the default shared lib to load in scdaemon, -# it can use other implementations too (including non-pcsc ones). -%define pcsc_lib libpcsclite.so.0 - - # Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change -%if "%{?fedora}" > "4" %define kde_scriptdir %{_sysconfdir}/kde -%else -%define kde_scriptdir %{_prefix} -%define own_scriptdir 1 -%endif Summary: Utility for secure communication and data storage Name: gnupg2 Version: 1.9.20 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System @@ -57,6 +46,9 @@ BuildRequires: bzip2-devel Buildrequires: libusb-devel BuildRequires: docbook-utils +%if "%{?fedora}" > "3" +BuildRequires: pcsc-lite-libs +%endif Requires: pinentry >= 0.7.1 @@ -88,7 +80,16 @@ #sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure #endif -sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c +# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) +# Note: this is just the name of the default shared lib to load in scdaemon, +# it can use other implementations too (including non-pcsc ones). +%if "%{?fedora}" > "3" +%global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.?)) +%else +%define pcsclib libpcsclite.so.0 +%endif + +sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c %build @@ -100,7 +101,6 @@ make %{?_smp_mflags} - %check ||: ## Allows for better debugability (doesn't work, fixme) # echo "debug-allow-core-dumps" >> tests/gpgsm.conf @@ -154,13 +154,8 @@ %{_libdir}/gnupg/ %{_libexecdir}/* %{_infodir}/* -%if "%{?own_scriptdir}" == "1" -%{kde_scriptdir}/env/ -%{kde_scriptdir}/shutdown/ -%else %{kde_scriptdir}/env/*.sh %{kde_scriptdir}/shutdown/*.sh -%endif %clean @@ -168,8 +163,11 @@ %changelog +* Mon Mar 6 2006 Ville Skytt?? > 1.9.20-3 +- Don't hardcode pcsc-lite lib name. + * Thu Feb 16 2006 Rex Dieter 1.9.20-2 -- fc5+: use /etc/kde/(env|shutdown) for scripts (#175744) +- use /etc/kde/(env|shutdown) for scripts (#175744) * Fri Feb 10 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Mon Mar 6 18:22:46 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 6 Mar 2006 13:22:46 -0500 Subject: rpms/kyum/FC-4 kyum-0.7.5-su.patch, NONE, 1.1 kyum.sh, NONE, 1.1 kyum.spec, 1.5, 1.6 Message-ID: <200603061823.k26INIHX003800@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3777 Modified Files: kyum.spec Added Files: kyum-0.7.5-su.patch kyum.sh Log Message: Add su wrapper for kyum #182986 kyum-0.7.5-su.patch: --- NEW FILE kyum-0.7.5-su.patch --- --- kyum-0.7.5/src/kyum.desktop.org 2006-03-06 18:54:08.000000000 +0100 +++ kyum-0.7.5/src/kyum.desktop 2006-03-06 18:56:10.000000000 +0100 @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=KYum Name[xx]=xxKYumxx -Exec=kdesu kyum %i %m -caption "%c" +Exec=kyum %i %m -caption "%c" Icon=kyum Type=Application DocPath=kyum/kyum.html --- NEW FILE kyum.sh --- #!/bin/sh IFS=$"\t\n " /usr/bin/kdesu /usr/bin/kyum.bin "$@" Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/FC-4/kyum.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kyum.spec 5 Mar 2006 20:37:57 -0000 1.5 +++ kyum.spec 6 Mar 2006 18:22:46 -0000 1.6 @@ -1,6 +1,6 @@ Name: kyum Version: 0.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Graphical User Frontend (GUI) for yum @@ -8,7 +8,9 @@ Group: Applications/System URL: http://www.sourceforge.net/projects/kyum Source: http://dl.sourceforge.net/sourceforge/kyum/%{name}-%{version}.tar.gz +Source1: kyum.sh Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch +Patch2: kyum-0.7.5-su.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +30,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -41,6 +44,9 @@ %makeinstall +mv $RPM_BUILD_ROOT/%{_bindir}/kyum $RPM_BUILD_ROOT/%{_bindir}/kyum.bin +cp %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/kyum + # mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities desktop-file-install --delete-original \ --vendor fedora \ @@ -56,7 +62,7 @@ %files %defattr(-,root,root,-) -%{_bindir}/* +%attr(0755,root,root) %{_bindir}/* %dir %{_datadir}/apps/kyum %{_datadir}/apps/kyum/*/* %{_datadir}/apps/kyum/kyum_sysinfo.p* @@ -67,6 +73,9 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Mon Mar 06 2006 Jochen Schmitt 0.7.5-3 +- su wrapper for kyum #182986 + * Sun Feb 12 2006 Jochen Schmitt 0.7.5-2 - Rebuilt for FC5 From fedora-extras-commits at redhat.com Mon Mar 6 18:25:25 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 6 Mar 2006 13:25:25 -0500 Subject: rpms/kyum/devel kyum-0.7.5-su.patch, NONE, 1.1 kyum.sh, NONE, 1.1 kyum.spec, 1.9, 1.10 Message-ID: <200603061825.k26IPwks003876@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3854 Modified Files: kyum.spec Added Files: kyum-0.7.5-su.patch kyum.sh Log Message: Add su wrapper for kyum #182986 kyum-0.7.5-su.patch: --- NEW FILE kyum-0.7.5-su.patch --- --- kyum-0.7.5/src/kyum.desktop.org 2006-03-06 18:54:08.000000000 +0100 +++ kyum-0.7.5/src/kyum.desktop 2006-03-06 18:56:10.000000000 +0100 @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=KYum Name[xx]=xxKYumxx -Exec=kdesu kyum %i %m -caption "%c" +Exec=kyum %i %m -caption "%c" Icon=kyum Type=Application DocPath=kyum/kyum.html --- NEW FILE kyum.sh --- #!/bin/sh IFS=$"\t\n " /usr/bin/kdesu /usr/bin/kyum.bin "$@" Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- kyum.spec 12 Feb 2006 19:26:40 -0000 1.9 +++ kyum.spec 6 Mar 2006 18:25:25 -0000 1.10 @@ -1,6 +1,6 @@ Name: kyum Version: 0.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Graphical User Frontend (GUI) for yum @@ -8,7 +8,9 @@ Group: Applications/System URL: http://www.sourceforge.net/projects/kyum Source: http://dl.sourceforge.net/sourceforge/kyum/%{name}-%{version}.tar.gz +Source1: kyum.sh Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch +Patch2: kyum-0.7.5-su.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +30,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -41,6 +44,9 @@ %makeinstall +mv $RPM_BUILD_ROOT/%{_bindir}/kyum $RPM_BUILD_ROOT/%{_bindir}/kyum.bin +cp %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/kyum + # mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities desktop-file-install --delete-original \ --vendor fedora \ @@ -56,7 +62,7 @@ %files %defattr(-,root,root,-) -%{_bindir}/* +%attr(0755,root,root) %{_bindir}/* %dir %{_datadir}/apps/kyum %{_datadir}/apps/kyum/*/* %{_datadir}/apps/kyum/kyum_sysinfo.p* @@ -67,6 +73,9 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Mon Mar 06 2006 Jochen Schmitt 0.7.5-3 +- su wrapper for kyum #182986 + * Sun Feb 12 2006 Jochen Schmitt 0.7.5-2 - Rebuilt for FC5 From fedora-extras-commits at redhat.com Mon Mar 6 19:03:00 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:03:00 -0500 Subject: rpms/gstreamer08-plugins - New directory Message-ID: <200603061903.k26J32at005878@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5870/gstreamer08-plugins Log Message: Directory /cvs/extras/rpms/gstreamer08-plugins added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 19:03:07 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:03:07 -0500 Subject: rpms/gstreamer08-plugins/devel - New directory Message-ID: <200603061903.k26J39uM005893@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5870/gstreamer08-plugins/devel Log Message: Directory /cvs/extras/rpms/gstreamer08-plugins/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 19:03:34 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:03:34 -0500 Subject: rpms/gstreamer08-plugins Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603061903.k26J3avt005927@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5915 Added Files: Makefile import.log Log Message: Setup of module gstreamer08-plugins --- NEW FILE Makefile --- # Top level Makefile for module gstreamer08-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 Mon Mar 6 19:03:40 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:03:40 -0500 Subject: rpms/gstreamer08-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603061903.k26J3gBG005947@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5915/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gstreamer08-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 Mon Mar 6 19:05:42 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:05:42 -0500 Subject: rpms/gstreamer08-plugins import.log,1.1,1.2 Message-ID: <200603061906.k26J6Erk006066@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6017 Modified Files: import.log Log Message: auto-import gstreamer08-plugins-0.8.12-2 on branch devel from gstreamer08-plugins-0.8.12-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-plugins/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Mar 2006 19:03:33 -0000 1.1 +++ import.log 6 Mar 2006 19:05:42 -0000 1.2 @@ -0,0 +1 @@ +gstreamer08-plugins-0_8_12-2:HEAD:gstreamer08-plugins-0.8.12-2.src.rpm:1141671938 From fedora-extras-commits at redhat.com Mon Mar 6 19:05:52 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:05:52 -0500 Subject: rpms/gstreamer08-plugins/devel gst-fionread.m4, NONE, 1.1 gst-plugins-0.8.11-docbook-check.patch, NONE, 1.1 gstreamer-plugins-0.8.7-alsa.patch, NONE, 1.1 gstreamer08-plugins.spec, NONE, 1.1 patch-tarball.sh, NONE, 1.1 removed-sources.txt, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603061906.k26J6dX0006075@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6017/devel Modified Files: .cvsignore sources Added Files: gst-fionread.m4 gst-plugins-0.8.11-docbook-check.patch gstreamer-plugins-0.8.7-alsa.patch gstreamer08-plugins.spec patch-tarball.sh removed-sources.txt Log Message: auto-import gstreamer08-plugins-0.8.12-2 on branch devel from gstreamer08-plugins-0.8.12-2.src.rpm --- NEW FILE gst-fionread.m4 --- AC_DEFUN([GST_CHECK_FIONREAD], [ AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h) AC_CACHE_VAL(GST_FIONREAD_IN_SYS_IOCTL, [ AC_TRY_COMPILE([ #include #include ], [ int x = FIONREAD; if ( x ) return 0; ], GST_FIONREAD_IN_SYS_IOCTL="yes",GST_FIONREAD_IN_SYS_IOCTL="no") ]) AC_MSG_RESULT($GST_FIONREAD_IN_SYS_IOCTL) if test "$GST_FIONREAD_IN_SYS_IOCTL" = "yes"; then AC_DEFINE([HAVE_FIONREAD_IN_SYS_IOCTL], 1, [FIONREAD ioctl found in sys/ioclt.h]) else AC_MSG_CHECKING(for FIONREAD in sys/filio.h) AC_CACHE_VAL(GST_FIONREAD_IN_SYS_FILIO, [ AC_TRY_COMPILE([ #include #include ], [ int x = FIONREAD; if ( x ) return 0; ], GST_FIONREAD_IN_SYS_FILIO="yes",GST_FIONREAD_IN_SYS_FILIO="no") ]) AC_MSG_RESULT($GST_FIONREAD_IN_SYS_FILIO) if test "$GST_FIONREAD_IN_SYS_FILIO" = "yes"; then AC_DEFINE([HAVE_FIONREAD_IN_SYS_FILIO], 1, [FIONREAD ioctl found in sys/filio.h]) fi fi ]) gst-plugins-0.8.11-docbook-check.patch: --- NEW FILE gst-plugins-0.8.11-docbook-check.patch --- --- gst-plugins-0.8.11.bak/configure.ac.bak 2005-09-09 18:10:31.000000000 -0400 +++ gst-plugins-0.8.11.bak/configure.ac 2005-09-09 18:11:33.000000000 -0400 @@ -186,7 +186,7 @@ AC_HELP_STRING([--with-pkg-config-path],[colon-separated list of pkg-config(1) dirs]), [export PKG_CONFIG_PATH=${withval}]) -GST_DOC() +GST_DOCBOOK_CHECK() dnl check architecture GST_ARCH() gstreamer-plugins-0.8.7-alsa.patch: --- NEW FILE gstreamer-plugins-0.8.7-alsa.patch --- --- gst-plugins-0.8.7/configure.ac~ 2005-01-05 13:17:49.000000000 -0500 +++ gst-plugins-0.8.7/configure.ac 2005-01-05 13:21:25.144796197 -0500 @@ -116,6 +116,10 @@ DEFAULT_AUDIOSRC="osxaudiosrc" DEFAULT_VIDEOSINK="osxvideosink" ;; + *-redhat-linux-gnu ) + DEFAULT_AUDIOSINK="alsasink" + DEFAULT_AUDIOSRC="alsasrc" + ;; esac AC_SUBST(DEFAULT_AUDIOSINK) --- NEW FILE gstreamer08-plugins.spec --- %define gstreamer gstreamer08 %define majmin 0.8 %define _gst 0.8.12 %define po_package gst-plugins-%{majmin} Name: %{gstreamer}-plugins Version: 0.8.12 Release: 2%{?dist} Summary: GStreamer Streaming media framework plug-ins Group: Applications/Multimedia License: LGPL URL: http://gstreamer.freedesktop.org/ Source: http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-%{version}.tar.bz2 Source2: patch-tarball.sh Source3: removed-sources.txt Source4: gst-fionread.m4 Patch1: gstreamer-plugins-0.8.7-alsa.patch Patch2: gst-plugins-0.8.11-docbook-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: %{gstreamer}-devel >= %_gst # translations BuildRequires: gettext # plug-in build dependencies BuildRequires: arts-devel BuildRequires: cdparanoia-devel >= alpha9.7 BuildRequires: gnome-vfs2-devel >= 2.1.3 BuildRequires: libpng-devel BuildRequires: libmng-devel BuildRequires: SDL-devel >= 1.2.0 BuildRequires: libtheora-devel >= 1.0alpha3-3 BuildRequires: libavc1394-devel >= 0.4.1-5 BuildRequires: speex-devel BuildRequires: flac-devel >= 1.1.2 BuildRequires: libmusicbrainz-devel BuildRequires: libXdamage-devel BuildRequires: libXv-devel BuildRequires: libGLU-devel BuildRequires: libGL-devel #BuildRequires: cairo-devel %ifnarch s390 s390x BuildRequires: libdv-devel %endif Requires: %{name} >= %_gst Requires(post): /sbin/ldconfig Requires(post): /usr/bin/gst-register-%{majmin} Requires(pre): /usr/bin/gconftool-2 Requires(post): /usr/bin/gconftool-2 Requires(postun): /usr/bin/gconftool-2 Requires(preun): /usr/bin/gconftool-2 Requires(postun): /sbin/ldconfig Requires(postun): /usr/bin/gst-register-%{majmin} # FIXME: is it necessary to Requires: these packages ? If so, why no others ? # => Not needed, as soname deps are present and min.versions, too. #Requires: cdparanoia-libs >= alpha9.7 #Requires: libmusicbrainz >= 2.1.1 %description GStreamer is a streaming media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. Its plugin-based architecture means that new data types or processing capabilities can be added simply by installing new plugins. %package devel Summary: Libraries/include files for GStreamer plug-ins Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{gstreamer}-devel >= %_gst Requires: GConf2-devel %description devel GStreamer is a streaming-media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. Its plugin-based architecture means that new data types or processing capabilities can be added simply by installing new plugins. This package contains the libraries and includes files necessary to develop applications and plugins for GStreamer. %prep %setup -q -n gst-plugins-%{version} %patch1 -p1 -b .alsa %patch2 -p1 -b .docbook-check mkdir gst-libs/ext/ffmpeg %build cp %{SOURCE4} m4/ libtoolize --force --copy aclocal -I m4 -I common/m4 automake autoconf %configure --disable-vorbistest \ --disable-ffmpeg \ --disable-faad \ --disable-sndfile \ --disable-mikmod \ --disable-spc \ --disable-cairo \ --enable-DEBUG --disable-tests --disable-examples make %{?_smp_mflags} cp %{SOURCE3} . %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make DESTDIR=${RPM_BUILD_ROOT} install unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majmin}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majmin}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang %{po_package} %clean rm -rf $RPM_BUILD_ROOT %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` SCHEMAS="gstreamer-%{majmin}.schemas" for S in $SCHEMAS; do /usr/bin/gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/$S >/dev/null || : done fi %post /sbin/ldconfig env DISPLAY= %{_bindir}/gst-register-%{majmin} >/dev/null 2>&1 export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` SCHEMAS="gstreamer-%{majmin}.schemas" for S in $SCHEMAS; do /usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null done %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` SCHEMAS="gstreamer-%{majmin}.schemas" for S in $SCHEMAS; do /usr/bin/gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/$S >/dev/null || : done fi %postun /sbin/ldconfig env DISPLAY= /usr/bin/gst-register-%{majmin} >/dev/null 2>&1 || true %files -f %{po_package}.lang %defattr(-, root, root) %doc AUTHORS COPYING README removed-sources.txt %{_sysconfdir}/gconf/schemas/gstreamer-%{majmin}.schemas %{_bindir}/* %{_libdir}/*so.* %ifarch %{ix86} ia64 ppc ppc64 x86_64 %{_libdir}/gstreamer-%{majmin}/libgst1394.* %endif %{_libdir}/gstreamer-%{majmin}/libgstac3parse.* %{_libdir}/gstreamer-%{majmin}/libgstadder.* %{_libdir}/gstreamer-%{majmin}/libgstalpha.* %{_libdir}/gstreamer-%{majmin}/libgstalaw.* %{_libdir}/gstreamer-%{majmin}/libgstalsa.* %{_libdir}/gstreamer-%{majmin}/libgstalphacolor.* %{_libdir}/gstreamer-%{majmin}/libgstapetag.* %{_libdir}/gstreamer-%{majmin}/libgstarts.* %{_libdir}/gstreamer-%{majmin}/libgstaudiorate.* %{_libdir}/gstreamer-%{majmin}/libgstartsdsink.* %{_libdir}/gstreamer-%{majmin}/libgstasf.* %{_libdir}/gstreamer-%{majmin}/libgstaudio.* %{_libdir}/gstreamer-%{majmin}/libgstaudioconvert.* %{_libdir}/gstreamer-%{majmin}/libgstaudiofile.* %{_libdir}/gstreamer-%{majmin}/libgstaudiofilter.* %{_libdir}/gstreamer-%{majmin}/libgstaudioscale.* %{_libdir}/gstreamer-%{majmin}/libgstauparse.* %{_libdir}/gstreamer-%{majmin}/libgstavi.* %{_libdir}/gstreamer-%{majmin}/libgstcdparanoia.* %{_libdir}/gstreamer-%{majmin}/libgstcdplayer.* %{_libdir}/gstreamer-%{majmin}/libgstcdxaparse.* %{_libdir}/gstreamer-%{majmin}/libgstchart.* %{_libdir}/gstreamer-%{majmin}/libgstcolorspace.* %{_libdir}/gstreamer-%{majmin}/libgstcutter.* %{_libdir}/gstreamer-%{majmin}/libgstdeinterlace.* %{_libdir}/gstreamer-%{majmin}/libgstdebug.* %{_libdir}/gstreamer-%{majmin}/libgstdecodebin.* %ifnarch s390 s390x %{_libdir}/gstreamer-%{majmin}/libgstdvdec.* %endif %{_libdir}/gstreamer-%{majmin}/libgstefence.* %{_libdir}/gstreamer-%{majmin}/libgsteffectv.* %{_libdir}/gstreamer-%{majmin}/libgstesd.* %{_libdir}/gstreamer-%{majmin}/libgstequalizer.* %{_libdir}/gstreamer-%{majmin}/libgstfestival.* %{_libdir}/gstreamer-%{majmin}/libgstfilter.* %{_libdir}/gstreamer-%{majmin}/libgstflac.* %{_libdir}/gstreamer-%{majmin}/libgstffmpegcolorspace.* %{_libdir}/gstreamer-%{majmin}/libgstflxdec.* %{_libdir}/gstreamer-%{majmin}/libgstgamma.* %{_libdir}/gstreamer-%{majmin}/libgstgdkpixbuf.* %{_libdir}/gstreamer-%{majmin}/libgstglimagesink.* %{_libdir}/gstreamer-%{majmin}/libgstgnomevfs.* %{_libdir}/gstreamer-%{majmin}/libgstgoom.* %{_libdir}/gstreamer-%{majmin}/libgstidct.* %{_libdir}/gstreamer-%{majmin}/libgstinterleave.* %{_libdir}/gstreamer-%{majmin}/libgstjpeg.* %{_libdir}/gstreamer-%{majmin}/libgstlevel.* %{_libdir}/gstreamer-%{majmin}/libgstmatroska.* %{_libdir}/gstreamer-%{majmin}/libgstmedian.* %{_libdir}/gstreamer-%{majmin}/libgstmng.* %{_libdir}/gstreamer-%{majmin}/libgstmodplug.* %{_libdir}/gstreamer-%{majmin}/libgstmonoscope.* %{_libdir}/gstreamer-%{majmin}/libgstmultifilesink.* %{_libdir}/gstreamer-%{majmin}/libgstmulaw.* %{_libdir}/gstreamer-%{majmin}/libgstmultipart.* %{_libdir}/gstreamer-%{majmin}/libgstnavigationtest.* %{_libdir}/gstreamer-%{majmin}/libgstogg.* %{_libdir}/gstreamer-%{majmin}/libgstossaudio.* %{_libdir}/gstreamer-%{majmin}/libgstoverlay.* %{_libdir}/gstreamer-%{majmin}/libgstpassthrough.* %{_libdir}/gstreamer-%{majmin}/libgstplayondemand.* %{_libdir}/gstreamer-%{majmin}/libgstplaybin.* %{_libdir}/gstreamer-%{majmin}/libgstpng.* %{_libdir}/gstreamer-%{majmin}/libgstqtdemux.* %{_libdir}/gstreamer-%{majmin}/libgstresample.* %{_libdir}/gstreamer-%{majmin}/libgstriff.* %{_libdir}/gstreamer-%{majmin}/libgstrmdemux.* %{_libdir}/gstreamer-%{majmin}/libgstrtjpeg.* %{_libdir}/gstreamer-%{majmin}/libgstrtp.* %{_libdir}/gstreamer-%{majmin}/libgstsdlvideosink.* %{_libdir}/gstreamer-%{majmin}/libgstsilence.* %{_libdir}/gstreamer-%{majmin}/libgstsinesrc.* %{_libdir}/gstreamer-%{majmin}/libgstsmooth.* %{_libdir}/gstreamer-%{majmin}/libgstsmoothwave.* %{_libdir}/gstreamer-%{majmin}/libgstsmpte.* %{_libdir}/gstreamer-%{majmin}/libgstsnapshot.* %{_libdir}/gstreamer-%{majmin}/libgstspectrum.* %{_libdir}/gstreamer-%{majmin}/libgstspeed.* %{_libdir}/gstreamer-%{majmin}/libgstspeex.* %{_libdir}/gstreamer-%{majmin}/libgststereo.* %{_libdir}/gstreamer-%{majmin}/libgstswitch.* %{_libdir}/gstreamer-%{majmin}/libgstsynaesthesia.* %{_libdir}/gstreamer-%{majmin}/libgsttta.* %{_libdir}/gstreamer-%{majmin}/libgsttagedit.* %{_libdir}/gstreamer-%{majmin}/libgsttcp.* %{_libdir}/gstreamer-%{majmin}/libgsttrm.* %{_libdir}/gstreamer-%{majmin}/libgsttextoverlay.* %{_libdir}/gstreamer-%{majmin}/libgsttheora.* %{_libdir}/gstreamer-%{majmin}/libgsttimeoverlay.* %{_libdir}/gstreamer-%{majmin}/libgsttypefindfunctions.* %{_libdir}/gstreamer-%{majmin}/libgstudp.* %{_libdir}/gstreamer-%{majmin}/libgstvbidec.* %{_libdir}/gstreamer-%{majmin}/libgstvcdsrc.* %{_libdir}/gstreamer-%{majmin}/libgstvideo.* %{_libdir}/gstreamer-%{majmin}/libgstvideo4linux.* %{_libdir}/gstreamer-%{majmin}/libgstvideo4linux2.* %{_libdir}/gstreamer-%{majmin}/libgstvideobalance.* %{_libdir}/gstreamer-%{majmin}/libgstvideocrop.* %{_libdir}/gstreamer-%{majmin}/libgstvideodrop.* %{_libdir}/gstreamer-%{majmin}/libgstvideofilter.* %{_libdir}/gstreamer-%{majmin}/libgstvideobox.* %{_libdir}/gstreamer-%{majmin}/libgstvideomixer.* %{_libdir}/gstreamer-%{majmin}/libgstvideorate.* %{_libdir}/gstreamer-%{majmin}/libgstvideoflip.* %{_libdir}/gstreamer-%{majmin}/libgstvideoscale.* %{_libdir}/gstreamer-%{majmin}/libgstvideotestsrc.* %{_libdir}/gstreamer-%{majmin}/libgstvolenv.* %{_libdir}/gstreamer-%{majmin}/libgstvolume.* %{_libdir}/gstreamer-%{majmin}/libgstvorbis.* %{_libdir}/gstreamer-%{majmin}/libgstwavenc.* %{_libdir}/gstreamer-%{majmin}/libgstwavparse.* %{_libdir}/gstreamer-%{majmin}/libgstximagesink.* %{_libdir}/gstreamer-%{majmin}/libgstxvimagesink.* %{_libdir}/gstreamer-%{majmin}/libgstxwindowlistener.* %{_libdir}/gstreamer-%{majmin}/libgsty4menc.* %{_libdir}/gstreamer-%{majmin}/libgstmixmatrix.* %{_libdir}/gstreamer-%{majmin}/libgstautodetect.* %{_libdir}/gstreamer-%{majmin}/libgstdvdlpcmdec.* %{_libdir}/gstreamer-%{majmin}/libgstgconfelements.* %{_libdir}/gstreamer-%{majmin}/libgstpuzzle.* %{_libdir}/gstreamer-%{majmin}/libgstrfbsrc.* %{_libdir}/gstreamer-%{majmin}/libgstsubparse.* #%{_libdir}/gstreamer-%{majmin}/libgstcairo.* %{_libdir}/gstreamer-%{majmin}/libgstfreeze.* %{_libdir}/gstreamer-%{majmin}/libgstvideo4linuxradio.* %{_libdir}/gstreamer-%{majmin}/libgstimagemixer.* %{_mandir}/man*/* %files devel %defattr(-, root, root) %{_includedir}/gstreamer-%{majmin}/gst/* %{_libdir}/pkgconfig/*.pc %{_libdir}/*so %changelog * Sun Mar 5 2006 Brian Pepple - 0.8.12-2 - Add dist tag. - Add patch-tarball.sh back. - Strip source tarball of code w/ legal issues. - Remove req. for cdparanoia-libs & libmusicbrainz. - Fix references to gstreamer-devel. - Fix GConf2 scriptlets. * Thu Feb 16 2006 Brian Pepple - 0.8.12-1 - Update to 0.8.12. - Drop source2 (patch-tarball.sh). - Remove unnecessary BR (glib2-devel, autoconf, automake, libtool, audiofile-devel, esound-devel, alsa-lib-devel, libvorbis-devel, GConf2-devel, libjpeg-devel, libogg-devel, libraw1394-devel). - Add full source. * Fri Jan 06 2006 John (J5) Palmieri - 0.8.11.3 - Obsolete the old gstreamer-plugins package * Sat Dec 17 2005 Thomas Vander Stichele - 0.8.11-2 - rebuilt using gstreamer08 as base package name for devel - properly do Requires(post) and Requires(postun) - decouple gstreamer and gstreamer-plugins version numbers, they are not linked - remove hermes completely * Fri Dec 09 2005 Jesse Keating - 0.8.11-1.1 - rebuilt * Tue Sep 09 2005 John (J5) Palmieri - 0.8.11-1 - Upgrade to upstream version 0.8.11 - add a patch which makes the right call in configure for checking for docbook * Tue Aug 18 2005 John (J5) Palmieri - 0.8.10-1 - Upgrade to upstream version 0.8.10 - removed backported soundjuicer patch as it is in this release * Thu Jun 30 2005 John (J5) Palmieri - 0.8.9-2 - Backport patch from cvs to fix soundjuicer - disable the cairo plugin as it uses the old API * Tue Jun 7 2005 John (J5) Palmieri - 0.8.9-1 - update to upstream 0.8.9 - disable spc support - Add requirement for cairo-devel - Add freeze, video4linuxradio, and wavpack plugins * Mon May 9 2005 John (J5) Palmieri - 0.8.8-6 - Added patch to fix segfault (Bug #156622) * Mon Apr 4 2005 Elliot Lee - 0.8.8-5 - Remove mikmod support * Wed Mar 30 2005 John (J5) Palmieri - 0.8.8-4 - s/GConf-devel/GConf2-devel * Tue Mar 29 2005 John (J5) Palmieri - 0.8.8-3 - Added Requires: GConf-devel to the devel package * Sun Mar 27 2005 John (J5) Palmieri - 0.8.8-2 - disabled building Hermes because it is not needed and doesn't compile with gcc4.0. If upstream fixes it we can reenable * Wed Mar 23 2005 John (J5) Palmieri - 0.8.8-1 - Update to upstream version 0.8.8 - Rebuild for libmusicbrainz 2.1.1 * Sun Feb 06 2005 Warren Togami - 0.8.7-3 - rebuild against new libraw1394 * Wed Jan 05 2005 Colin Walters - 0.8.7-2 - BR gtk2-devel (139151) * Wed Jan 05 2005 Colin Walters - 0.8.7-1 - New upstream version - Add new patch gstreamer-plugins-0.8.7-alsa.patch which obsoletes gstreamer-plugins-0.7.5-alsa.patch - Add in speex, tta, apetag plugins * Tue Dec 21 2004 Colin Walters - 0.8.6-1 - New upstream version - Remove obsoleted gstreamer-plugins-0.8.4-vorbis-seek-workaround.patch - BR latest libavc1394-devel - Add libgstequalizer.so * Wed Oct 27 2004 Colin Walters - 0.8.5-3 - Also remove mplex from sources * Thu Oct 14 2004 Colin Walters - 0.8.5-2 - Drop BR on xmms-devel, libghttp-devel - Add BR on libmng-devel * Wed Oct 06 2004 Colin Walters - 0.8.5-1 - Update to 0.8.5 - Add mngsink - Remove speex for now, configure check is buggy * Fri Sep 24 2004 Colin Walters - 0.8.4-2 - Add gstreamer-plugins-0.8.4-vorbis-seek-workaround.patch for 133411 * Mon Aug 31 2004 Colin Walters - 0.8.4-1 - Update to 0.8.4 - Add gstglimagesink * Mon Aug 07 2004 Colin Walters - 0.8.3-2 - Restore media-info, which was not shipped for some unknown reason (#129392) * Mon Aug 02 2004 Colin Walters - 0.8.3-1 - Update to 0.8.3 - Remove alsa fixes - Kill off lame plugin - Add alphacolor, decodebin, multifilesink, and playbin. * Wed Jul 28 2004 Colin Walters - 0.8.2-6 - Really restore ffmpegcolorspace - Reinstate checks for exact plugins installed, i was a bit shortsighted in removing it - BuildRequire libtheora-devel - Ensure we disable faad and sndfile even if they are installed * Tue Jul 27 2004 Colin Walters - 0.8.2-5 - Re-add ffmpegcolorspace, since it does not have patent issues - Restore smp_mflags * Fri Jul 16 2004 Colin Walters - 0.8.2-4 - Backported ALSA fixes from CVS HEAD * Tue Jul 05 2004 Colin Walters - 0.8.2-3 - Another rebuild to placate beehive! * Tue Jul 05 2004 Colin Walters - 0.8.2-2 - Rebuild to placate beehive * Wed Jun 23 2004 Colin Walters - 0.8.2-1 - Update to 0.8.2, fixes numerous bugs - Remove upstreamed memleaks patch * Sun Jun 20 2004 Jeremy Katz - 0.8.1-5 - rebuild to lose gtk+ 1.2 dependency * Wed Jun 15 2004 Colin Walters 0.8.1-4 - BuildRequire libghttp-devel * Tue Jun 15 2004 Elliot Lee - rebuilt * Wed May 19 2004 Colin Walters 0.8.1-3 - Don't lose if gst-register isn't installed * Fri May 07 2004 Colin Walters 0.8.1-2 - Apply patch to fix memleaks * Wed Apr 15 2004 Colin Walters 0.8.1-1 - Update to 0.8.1 * Wed Mar 31 2004 Colin Walters 0.8.0-3 - Second attempt at rebuild to pick up new libdv * Tue Mar 30 2004 Colin Walters 0.8.0-2 - Rebuild to pick up new libdv (hopefully). - Use one big glob to capture all plugins. No GStreamer plugin that's included directly in the tarball that I am aware of besides ffmpeg includes patented code directly, so this should be safe. * Tue Mar 16 2004 Alex Larsson 0.8.0-1 - update to 0.8.0 * Thu Mar 11 2004 Alex Larsson 0.7.6-2 - correct plugin names * Wed Mar 10 2004 Alex Larsson 0.7.6-1 - update to 0.7.6 * Tue Mar 02 2004 Elliot Lee - rebuilt * Mon Mar 1 2004 Alexander Larsson 0.7.5-2 - Make alsa default sink/source instead of oss. * Fri Feb 27 2004 Alexander Larsson 0.7.5-1 - update to 0.7.5 * Fri Feb 13 2004 Elliot Lee - rebuilt * Wed Jan 28 2004 Alexander Larsson 0.7.3-2 - Use versioned gst-register * Wed Jan 28 2004 Alexander Larsson 0.7.3-1 - update to 0.7.3 * Thu Nov 27 2003 Thomas Woerner 0.6.3-4 - added BuildRequires for libraw1394-devel * Wed Sep 17 2003 Bill Nottingham 0.6.3-3 - more cleanups * Fri Sep 12 2003 Nalin Dahyabhai 0.6.3-2 - build gstcolorspace against a static bundled libHermes, which might want to move into its own package at some point - explicitly list the plugins which are built in the files manifest so that we get errors if there are some which don't get built or get added between releases - disable qcam on amd64 -- configure disables it on non-i386 arches - limit 1394 support to amd64,ia64,ppc,ppc64,x86 * Thu Sep 11 2003 Alexander Larsson 0.6.3-1 - Update to 0.6.3 (gnome 2.4 final) - remove all mpeg plugins * Tue Aug 19 2003 Alexander Larsson 0.6.2-1 - 0.6.2 * Wed Jun 04 2003 Elliot Lee - rebuilt * Wed May 21 2003 Jeremy Katz 0.6.0-7 - use automake 1.6 * Mon Feb 17 2003 Florian La Roche - rebuild to get sane s390x requires * Tue Feb 11 2003 Jonathan Blandford 0.6.0-4 - unset the DISPLAY when running gst-register * Sat Feb 8 2003 Bill Nottingham 0.6.0-4 - move libgst*.so.X.X to main package; things require them (#80518, #83805) - gstreamer-plugins-devel requires gstreamer-devel (#82506) * Tue Feb 4 2003 Jonathan Blandford 0.6.0-3 - remove ffmpeg for now. It doesn't build -fPIC * Tue Feb 04 2003 Phil Knirsch 0.6.0-2 - Bump release and rebuild. * Thu Jan 30 2003 Jonathan Blandford - new version. Requires new gstreamer. * Wed Jan 22 2003 Tim Powers - rebuilt * Wed Jan 15 2003 Matt Wilson 0.5.0-18 - disable qcam on all non x86 and x86_64 platforms * Mon Dec 30 2002 Florian La Roche - fix spec file to better remove libgstmedia-info - exclude for mainframe * Thu Dec 19 2002 Elliot Lee 0.5.0-15 - Include ia64 - Add BuildRequires: autoconf automake * Wed Dec 18 2002 Jonathan Blandford - rebuild * Tue Dec 17 2002 Jonathan Blandford 0.5.0-12 - rebuild * Mon Dec 16 2002 Jonathan Blandford 0.5.0-10 - rebuild - disable tests * Mon Dec 16 2002 Tim Powers 0.5.0-9 - rebuild * Wed Dec 11 2002 Jonathan Blandford 0.5.0-7 - fix libdir for ia64. * Wed Dec 11 2002 Jonathan Blandford 0.5.0-3 - ExcludeArch: ia64. Random assembler errors that I have no hope of fixing - Add devel package * Wed Dec 11 2002 Jonathan Blandford 0.5.0-1 - 0.5.0 - apparently, festival-devel isn't needed. * Tue Dec 10 2002 Tim Powers 0.4.2-3 - rebuild to fix broken dep on libgstreamer-0.4.2.so.0 * Tue Dec 3 2002 Havoc Pennington - excludearch the arches that can't build gstreamer cothreads - well it isn't really SMP-safe - add patch for including pthread.h when required - prereq gconftool - fix typo that broke schema installation in post * Mon Dec 2 2002 Havoc Pennington - initial "official" import - munge tarball for legal cleanliness * Thu Nov 7 2002 Jeremy Katz - 0.4.2 * Mon Sep 23 2002 Jeremy Katz - 0.4.1 - install the gconf schema - use %%configure * Sun Sep 22 2002 Jeremy Katz - update to 0.4.0 - give explicit vorbis include path, don't run vorbis test * Sun Aug 11 2002 Jeremy Katz - collapse into one package to preserve some sanity * Wed Mar 13 2002 Thomas Vander Stichele - added more BuildRequires and Requires - rearranged some plugins - added changelog ;) --- NEW FILE patch-tarball.sh --- #! /bin/sh set -e if test $# -lt 1; then echo "usage: $0 gst-plugins-VERSION" 1>&2 exit 1 fi PKG="$1" DIRNAME=`mktemp -d deleteme-XXXXXX` cd $DIRNAME ORIGBALL=../$PKG.tar.bz2 DESTBALL=../$PKG.patched.tar.bz2 echo "Saving original file list" tar -tjf $ORIGBALL | sort > origfiles.txt echo "Extracting original tarball" tar -xjf $ORIGBALL MPEG_INFIXES="mpeg mpg mp3 mp2 mad" MPEG_PATHS="ext/mad ext/mpeg2dec ext/mplex ext/mpeg2enc gst/mpeg1sys gst/mpeg1videoparse gst/mpeg2sub gst/mpegaudio gst/mpegaudioparse gst/mpegstream ext/lame gst/dvdsubdec" for mod in $MPEG_PATHS; do echo rm -rf -- "$PKG/${mod}" rm -rf -- "$PKG/${mod}" sys=$(dirname "${mod}") submod=$(basename "${mod}") perl -pi -e "s/[a-zA-Z0-9]*$submod[a-zA-Z0-9]*//g" $PKG/$sys/Makefile.in perl -pi -e "s/[a-zA-Z0-9]*$submod[a-zA-Z0-9]*//g" $PKG/$sys/Makefile.am perl -pi -e "s#^$sys/[a-zA-Z0-9]*$submod[a-zA-Z0-9]*/Makefile##g" $PKG/configure.ac perl -pi -e "s# $submod # #g" $PKG/configure.ac done for I in ffmpeg ; do rm -rf $PKG/gst-libs/ext/$I done echo "Creating new tarball" tar -cjf $DESTBALL $PKG echo "Extracting new file list" tar -tjf $DESTBALL | sort > newfiles.txt diff -u origfiles.txt newfiles.txt > ../removed-sources.txt || true cd .. rm -rf $DIRNAME echo "$PKG.patched.tar.bz2 created, removed files in removed-sources.txt" exit 0 --- NEW FILE removed-sources.txt --- --- origfiles.txt 2006-03-05 15:40:39.000000000 -0500 +++ newfiles.txt 2006-03-05 15:41:00.000000000 -0500 @@ -325,12 +325,6 @@ gst-plugins-0.8.12/ext/ladspa/Makefile.in gst-plugins-0.8.12/ext/ladspa/search.c gst-plugins-0.8.12/ext/ladspa/utils.h -gst-plugins-0.8.12/ext/lame/ -gst-plugins-0.8.12/ext/lame/gstlame.c -gst-plugins-0.8.12/ext/lame/gstlame.h -gst-plugins-0.8.12/ext/lame/Makefile.am -gst-plugins-0.8.12/ext/lame/Makefile.in -gst-plugins-0.8.12/ext/lame/README gst-plugins-0.8.12/ext/lcs/ gst-plugins-0.8.12/ext/lcs/gstcolorspace.c gst-plugins-0.8.12/ext/lcs/Makefile.am @@ -372,13 +366,6 @@ gst-plugins-0.8.12/ext/libvisual/Makefile.am gst-plugins-0.8.12/ext/libvisual/Makefile.in gst-plugins-0.8.12/ext/libvisual/visual.c -gst-plugins-0.8.12/ext/mad/ -gst-plugins-0.8.12/ext/mad/gstid3demuxbin.c -gst-plugins-0.8.12/ext/mad/gstid3tag.c -gst-plugins-0.8.12/ext/mad/gstmad.c -gst-plugins-0.8.12/ext/mad/gstmad.h -gst-plugins-0.8.12/ext/mad/Makefile.am -gst-plugins-0.8.12/ext/mad/Makefile.in gst-plugins-0.8.12/ext/Makefile.am gst-plugins-0.8.12/ext/Makefile.in gst-plugins-0.8.12/ext/mikmod/ @@ -389,35 +376,6 @@ gst-plugins-0.8.12/ext/mikmod/Makefile.in gst-plugins-0.8.12/ext/mikmod/mikmod_reader.c gst-plugins-0.8.12/ext/mikmod/README -gst-plugins-0.8.12/ext/mpeg2dec/ -gst-plugins-0.8.12/ext/mpeg2dec/gstmpeg2dec.c -gst-plugins-0.8.12/ext/mpeg2dec/gstmpeg2dec.h -gst-plugins-0.8.12/ext/mpeg2dec/Makefile.am -gst-plugins-0.8.12/ext/mpeg2dec/Makefile.in -gst-plugins-0.8.12/ext/mpeg2enc/ -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2enc.cc -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2enc.hh -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoder.cc -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoder.hh -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoptions.cc -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoptions.hh -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encpicturereader.cc -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encpicturereader.hh -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encstreamwriter.cc -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encstreamwriter.hh -gst-plugins-0.8.12/ext/mpeg2enc/Makefile.am -gst-plugins-0.8.12/ext/mpeg2enc/Makefile.in -gst-plugins-0.8.12/ext/mplex/ -gst-plugins-0.8.12/ext/mplex/gstmplex.cc -gst-plugins-0.8.12/ext/mplex/gstmplex.hh -gst-plugins-0.8.12/ext/mplex/gstmplexibitstream.cc -gst-plugins-0.8.12/ext/mplex/gstmplexibitstream.hh -gst-plugins-0.8.12/ext/mplex/gstmplexjob.cc -gst-plugins-0.8.12/ext/mplex/gstmplexjob.hh -gst-plugins-0.8.12/ext/mplex/gstmplexoutputstream.cc -gst-plugins-0.8.12/ext/mplex/gstmplexoutputstream.hh -gst-plugins-0.8.12/ext/mplex/Makefile.am -gst-plugins-0.8.12/ext/mplex/Makefile.in gst-plugins-0.8.12/ext/musepack/ gst-plugins-0.8.12/ext/musepack/gstmusepackdec.c gst-plugins-0.8.12/ext/musepack/gstmusepackdec.h @@ -742,10 +700,6 @@ gst-plugins-0.8.12/gst/dvdlpcmdec/gstdvdlpcmdec.h gst-plugins-0.8.12/gst/dvdlpcmdec/Makefile.am gst-plugins-0.8.12/gst/dvdlpcmdec/Makefile.in -gst-plugins-0.8.12/gst/dvdsubdec/ -gst-plugins-0.8.12/gst/dvdsubdec/dvdsubdec.c -gst-plugins-0.8.12/gst/dvdsubdec/Makefile.am -gst-plugins-0.8.12/gst/dvdsubdec/Makefile.in gst-plugins-0.8.12/gst/effectv/ gst-plugins-0.8.12/gst/effectv/gstaging.c gst-plugins-0.8.12/gst/effectv/gstdice.c @@ -1097,72 +1051,6 @@ gst-plugins-0.8.12/gst/monoscope/monoscope.c gst-plugins-0.8.12/gst/monoscope/monoscope.h gst-plugins-0.8.12/gst/monoscope/README -gst-plugins-0.8.12/gst/mpeg1sys/ -gst-plugins-0.8.12/gst/mpeg1sys/buffer.c -gst-plugins-0.8.12/gst/mpeg1sys/buffer.h -gst-plugins-0.8.12/gst/mpeg1sys/gstmpeg1systemencode.c -gst-plugins-0.8.12/gst/mpeg1sys/gstmpeg1systemencode.h -gst-plugins-0.8.12/gst/mpeg1sys/main.h -gst-plugins-0.8.12/gst/mpeg1sys/Makefile.am -gst-plugins-0.8.12/gst/mpeg1sys/Makefile.in -gst-plugins-0.8.12/gst/mpeg1sys/systems.c -gst-plugins-0.8.12/gst/mpeg1videoparse/ -gst-plugins-0.8.12/gst/mpeg1videoparse/gstmp1videoparse.c -gst-plugins-0.8.12/gst/mpeg1videoparse/gstmp1videoparse.h -gst-plugins-0.8.12/gst/mpeg1videoparse/Makefile.am -gst-plugins-0.8.12/gst/mpeg1videoparse/Makefile.in -gst-plugins-0.8.12/gst/mpeg2sub/ -gst-plugins-0.8.12/gst/mpeg2sub/gstmpeg2subt.c -gst-plugins-0.8.12/gst/mpeg2sub/gstmpeg2subt.h -gst-plugins-0.8.12/gst/mpeg2sub/Makefile.am -gst-plugins-0.8.12/gst/mpeg2sub/Makefile.in -gst-plugins-0.8.12/gst/mpeg2sub/Notes.txt -gst-plugins-0.8.12/gst/mpegaudio/ -gst-plugins-0.8.12/gst/mpegaudio/common.c -gst-plugins-0.8.12/gst/mpegaudio/common.h -gst-plugins-0.8.12/gst/mpegaudio/encode.c -gst-plugins-0.8.12/gst/mpegaudio/encoder.h -gst-plugins-0.8.12/gst/mpegaudio/gstmpegaudio.c -gst-plugins-0.8.12/gst/mpegaudio/gstmpegaudio.h -gst-plugins-0.8.12/gst/mpegaudio/Makefile.am -gst-plugins-0.8.12/gst/mpegaudio/Makefile.in -gst-plugins-0.8.12/gst/mpegaudio/musicin.c -gst-plugins-0.8.12/gst/mpegaudio/musicin.h -gst-plugins-0.8.12/gst/mpegaudioparse/ -gst-plugins-0.8.12/gst/mpegaudioparse/gstmpegaudioparse.c -gst-plugins-0.8.12/gst/mpegaudioparse/gstmpegaudioparse.h -gst-plugins-0.8.12/gst/mpegaudioparse/Makefile.am -gst-plugins-0.8.12/gst/mpegaudioparse/Makefile.in -gst-plugins-0.8.12/gst/mpegaudio/psy.c -gst-plugins-0.8.12/gst/mpegaudio/putbits.c -gst-plugins-0.8.12/gst/mpegaudio/putbits.h -gst-plugins-0.8.12/gst/mpegaudio/README.crh -gst-plugins-0.8.12/gst/mpegaudio/subs.c -gst-plugins-0.8.12/gst/mpegaudio/table_absthr.h -gst-plugins-0.8.12/gst/mpegaudio/table_alloc.h -gst-plugins-0.8.12/gst/mpegaudio/table_cb.h -gst-plugins-0.8.12/gst/mpegaudio/table_enwindow.h -gst-plugins-0.8.12/gst/mpegaudio/tables.c -gst-plugins-0.8.12/gst/mpegaudio/table_th.h -gst-plugins-0.8.12/gst/mpegaudio/tonal.c -gst-plugins-0.8.12/gst/mpegstream/ -gst-plugins-0.8.12/gst/mpegstream/gstdvddemux.c -gst-plugins-0.8.12/gst/mpegstream/gstdvddemux.h -gst-plugins-0.8.12/gst/mpegstream/gstmpegclock.c -gst-plugins-0.8.12/gst/mpegstream/gstmpegclock.h -gst-plugins-0.8.12/gst/mpegstream/gstmpegdemux.c -gst-plugins-0.8.12/gst/mpegstream/gstmpegdemux.h -gst-plugins-0.8.12/gst/mpegstream/gstmpegpacketize.c -gst-plugins-0.8.12/gst/mpegstream/gstmpegpacketize.h -gst-plugins-0.8.12/gst/mpegstream/gstmpegparse.c -gst-plugins-0.8.12/gst/mpegstream/gstmpegparse.h -gst-plugins-0.8.12/gst/mpegstream/gstmpegstream.c -gst-plugins-0.8.12/gst/mpegstream/gstrfc2250enc.c -gst-plugins-0.8.12/gst/mpegstream/gstrfc2250enc.h -gst-plugins-0.8.12/gst/mpegstream/Makefile.am -gst-plugins-0.8.12/gst/mpegstream/Makefile.in -gst-plugins-0.8.12/gst/mpegstream/notes -gst-plugins-0.8.12/gst/mpegstream/README gst-plugins-0.8.12/gst/multifilesink/ gst-plugins-0.8.12/gst/multifilesink/gstmultifilesink.c gst-plugins-0.8.12/gst/multifilesink/gstmultifilesink.h Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-plugins/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Mar 2006 19:03:40 -0000 1.1 +++ .cvsignore 6 Mar 2006 19:05:52 -0000 1.2 @@ -0,0 +1 @@ +gst-plugins-0.8.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-plugins/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Mar 2006 19:03:40 -0000 1.1 +++ sources 6 Mar 2006 19:05:52 -0000 1.2 @@ -0,0 +1 @@ +023fecf32bdffea8e06e3ad903b88f9b gst-plugins-0.8.12.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 6 19:10:17 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:10:17 -0500 Subject: owners owners.list,1.715,1.716 Message-ID: <200603061910.k26JAnYM006145@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6128 Modified Files: owners.list Log Message: Add gstreamer08-plugins Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.715 retrieving revision 1.716 diff -u -r1.715 -r1.716 --- owners.list 6 Mar 2006 10:12:28 -0000 1.715 +++ owners.list 6 Mar 2006 19:10:16 -0000 1.716 @@ -383,6 +383,7 @@ Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gstreamer-python|Python bindings for GStreamer|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|gstreamer08|GStreamer streaming media framework runtime|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|gstreamer08-plugins|GStreamer streaming media framework plug-ins|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gstreamer08-python|Python bindings for GStreamer 0.8|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 6 19:33:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Mar 2006 14:33:52 -0500 Subject: rpms/gsview/devel gsview.desktop,1.2,1.3 gsview.spec,1.16,1.17 Message-ID: <200603061934.k26JYOYq006343@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6272 Modified Files: gsview.desktop gsview.spec Log Message: * Wed Mar 1 2006 Rex Dieter 4.7-6 - %(rpm -q --qf '%{VERSION}' ghostscript) -> %(gs --version) - follow fdo icon spec - restore epstool bits Index: gsview.desktop =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gsview.desktop 4 Dec 2004 12:25:30 -0000 1.2 +++ gsview.desktop 6 Mar 2006 19:33:51 -0000 1.3 @@ -1,11 +1,10 @@ -# $Id$ [Desktop Entry] Encoding=UTF-8 Name=GSview GenericName=PS/PDF Viewer Comment=EPS,PDF,PS Viewer Exec=gsview -Icon=gsview.png +Icon=gsview Terminal=false Type=Application MimeType=image/x-eps;application/postscript;application/pdf; Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gsview.spec 10 Feb 2006 13:59:32 -0000 1.16 +++ gsview.spec 6 Mar 2006 19:33:51 -0000 1.17 @@ -2,7 +2,7 @@ Summary: PostScript and PDF previewer Name: gsview Version: 4.7 -Release: 5%{?dist}.1 +Release: 6%{?dist} License: Aladdin Free Public License, Ghostgum Software Pty Ltd Group: Applications/Publishing @@ -10,7 +10,7 @@ URL: http://www.cs.wisc.edu/~ghost/gsview/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # ppc: FIXME. -ExcludeArch: ppc +# ExcludeArch: ppc Source1: gsview.desktop @@ -18,8 +18,8 @@ BuildRequires: desktop-file-utils BuildRequires: sed >= 4.0 BuildRequires: ghostscript-devel >= 7.07-15.3 -%define gs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' ghostscript-devel | cut -d. -f-2 )} -%define gs_ver1 %{expand:%%(echo %{gs_ver} | cut -d. -f1)} +%global gs_ver %(gs --version 2> /dev/null | cut -d. -f-2 ) +%global gs_ver1 %(echo %{gs_ver} | cut -d. -f1 ) %if "%{?gs_ver1}" == "7" # See http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00068.html Requires: ghostscript >= 7.07-15.3 @@ -87,23 +87,29 @@ GSVIEW_ETCPATH=$RPM_BUILD_ROOT%{_sysconfdir} # desktop/icon files -install -D -p -m644 binary/gsview48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gsview.png +install -D -p -m644 binary/gsview48.png\ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gsview.png -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --vendor fedora \ --add-category X-Fedora \ %{SOURCE1} ## Unpackaged files -# nuke depcrecated epstool, to be (hopefully) packaged separately... someday. -rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*} +# nuke deprecated epstool, when (hopefully) packaged separately... someday. +#rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*} %post -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +update-desktop-database -q %{_datadir}/applications > /dev/null 2>&1 || : %postun -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +update-desktop-database -q %{_datadir}/applications > /dev/null 2>&1 || : %files @@ -113,7 +119,7 @@ %config(noreplace) %{_sysconfdir}/gsview/printer.ini %{_mandir}/man*/* %{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/*.png +%{_datadir}/icons/hicolor/*/*/* %doc %{_docdir}/* @@ -122,6 +128,11 @@ %changelog +* Wed Mar 1 2006 Rex Dieter 4.7-6 +- %%(rpm -q --qf '%%{VERSION}' ghostscript) -> %%(gs --version) +- follow fdo icon spec +- restore epstool bits + * Fri Feb 10 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Mon Mar 6 20:00:45 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:00:45 -0500 Subject: rpms/zeroinstall-injector - New directory Message-ID: <200603062000.k26K0l9Y007338@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7324/zeroinstall-injector Log Message: Directory /cvs/extras/rpms/zeroinstall-injector added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 20:00:51 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:00:51 -0500 Subject: rpms/zeroinstall-injector/devel - New directory Message-ID: <200603062000.k26K0rVt007361@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7324/zeroinstall-injector/devel Log Message: Directory /cvs/extras/rpms/zeroinstall-injector/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 20:01:25 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:01:25 -0500 Subject: rpms/zeroinstall-injector Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603062001.k26K1RbC009239@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9226 Added Files: Makefile import.log Log Message: Setup of module zeroinstall-injector --- NEW FILE Makefile --- # Top level Makefile for module zeroinstall-injector all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 6 20:01:32 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:01:32 -0500 Subject: rpms/zeroinstall-injector/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603062001.k26K1YQn009262@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9226/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module zeroinstall-injector --- NEW 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 Mar 6 20:02:00 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 15:02:00 -0500 Subject: rpms/perl-Config-Tiny/FC-4 .cvsignore, 1.5, 1.6 perl-Config-Tiny.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603062002.k26K2a6V009376@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Config-Tiny/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9288/FC-4 Modified Files: .cvsignore perl-Config-Tiny.spec sources Log Message: Updated to 2.05. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Dec 2005 16:25:31 -0000 1.5 +++ .cvsignore 6 Mar 2006 20:02:00 -0000 1.6 @@ -1 +1 @@ -Config-Tiny-2.03.tar.gz +Config-Tiny-2.05.tar.gz Index: perl-Config-Tiny.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/perl-Config-Tiny.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Config-Tiny.spec 30 Dec 2005 16:25:31 -0000 1.9 +++ perl-Config-Tiny.spec 6 Mar 2006 20:02:00 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Config-Tiny -Version: 2.03 +Version: 2.05 Release: 1%{?dist} Summary: Perl module for reading and writing .ini style configuration files @@ -22,6 +22,7 @@ %prep %setup -q -n Config-Tiny-%{version} +chmod a-x Changes lib/Config/Tiny.pm %build @@ -53,6 +54,15 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 2.05-1 +- Updated to 2.05. + +* Sat Feb 18 2006 Jose Pedro Oliveira - 2.04-2 +- Rebuild for FC5 (perl 5.8.8). + +* Sat Jan 28 2006 Jose Pedro Oliveira - 2.04-1 +- Updated to 2.04. + * Fri Dec 30 2005 Jose Pedro Oliveira - 2.03-1 - Updated to 2.03. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Dec 2005 16:25:31 -0000 1.5 +++ sources 6 Mar 2006 20:02:00 -0000 1.6 @@ -1 +1 @@ -14b7c75fec38fd59fdf6390093946d7d Config-Tiny-2.03.tar.gz +bac7f9eda771593c869313859fe45ff7 Config-Tiny-2.05.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 20:02:07 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 15:02:07 -0500 Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.6, 1.7 perl-Config-Tiny.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200603062002.k26K2du5009385@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Config-Tiny/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9288/devel Modified Files: .cvsignore perl-Config-Tiny.spec sources Log Message: Updated to 2.05. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Jan 2006 00:29:14 -0000 1.6 +++ .cvsignore 6 Mar 2006 20:02:06 -0000 1.7 @@ -1 +1 @@ -Config-Tiny-2.04.tar.gz +Config-Tiny-2.05.tar.gz Index: perl-Config-Tiny.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Config-Tiny.spec 18 Feb 2006 16:18:52 -0000 1.11 +++ perl-Config-Tiny.spec 6 Mar 2006 20:02:06 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Config-Tiny -Version: 2.04 -Release: 2%{?dist} +Version: 2.05 +Release: 1%{?dist} Summary: Perl module for reading and writing .ini style configuration files Group: Development/Libraries @@ -22,6 +22,7 @@ %prep %setup -q -n Config-Tiny-%{version} +chmod a-x Changes lib/Config/Tiny.pm %build @@ -53,6 +54,9 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 2.05-1 +- Updated to 2.05. + * Sat Feb 18 2006 Jose Pedro Oliveira - 2.04-2 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Jan 2006 00:29:14 -0000 1.6 +++ sources 6 Mar 2006 20:02:06 -0000 1.7 @@ -1 +1 @@ -d14e3691a3fc357daa7ebe3af018c6b4 Config-Tiny-2.04.tar.gz +bac7f9eda771593c869313859fe45ff7 Config-Tiny-2.05.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 20:02:53 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:02:53 -0500 Subject: rpms/zeroinstall-injector/devel zeroinstall-injector-0.18.tar.gz.gpg, NONE, 1.1 zeroinstall-injector.spec, NONE, 1.1 Message-ID: <200603062002.k26K2tjk009420@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9394/devel Added Files: zeroinstall-injector-0.18.tar.gz.gpg zeroinstall-injector.spec Log Message: auto-import zeroinstall-injector-0.18-4 on branch devel from zeroinstall-injector-0.18-4.src.rpm --- NEW FILE zeroinstall-injector-0.18.tar.gz.gpg --- ?|??b%?c?N&?m?v&N&?m??m??m?8?~????????A?@?k!??Jx?k??????~?BB???8??`*~ h?9PA?/Y??m???u???*?????????O?U??m??????WA???=c????W?[}? ?8C?w?U?w?tb>??i??Or>???\????%?????~?? ???R?j? w??????q?j(???i?n8K??R_X??}?U/Vo9?????K601? s???`????k?\???? ?B?OL??c??f???b???);?Pzy?^@????/??5)f?V???)??lN?e????H????????E?????,H?@??????3r????*? /=???3b?U??s^????????jzq?0?? 7?g?FV?c????????+??$???VS???"??h?????u6?>???D??mXb?DG:w??Il???W?Y??????6:?(??&?b^[$DM??'??T??fc\?i?ve???O'4-8?lR??R:?????j"????????6_?U0J'?:?] ????`z???j?KT?? |o?h??=?og? ?ev! ?5??$??|f???D??%??F??2?-z??'????S???Q????V?(p?{ ???AhNRi?#??L~K??}>q??????G??# ^~? ?y??????  ?}?#>A????? dvfAS???2Q?]???z\k???????bmC?]??S????Z ??C??[g??GC?@ ?????\??o?`YmtXw?q?h??0???v?#T?>?;\? ,MR????M??.C????mw?? ??3/?4:??}??c}Z??(??2??/'}vg?d?1??i???????K(dkr?7??,?????3 .a???9s#??K?H??????z????7~W??P??????#?P?[????#>?k ??&/u?@k?.?????p?V??I?!0FGY?6?@p?q?HN??xvi??I0?P[??"?"d[?w??M?????P5??"j??N???F=???77??,????????n]?J???n/?????a??28????P????9e?A??-F"???dT? S??????|?{$M?!v A?????~[t?v???V0?????4??v????4/?M??f[??? v?????g????>???o???"???%llWI????o??m?>??[nl?\?? z??k+?Yy*??U????5??%;?(???7?LP???%????^?? #~? ME?? ???}?'E??x????2&?}??????z{?Qw?S??r??U? ?????*???T?? n??*?sh_??????y{qp?i?1?3??6??G:??rI?????????q?{??6i??#Ch?? ??r???k?-5?z????kC$??? ??& ??j??kYb?r??????~?S8??pse?b???TT%%?5dsT3?USg_?-p?W5??d???????O?,4.??G1??A{}???????]?zB?? 8 ??o? u;????F???Aj????&B?{??W??b?/@?????+C?fs?w???p? ???2V_??C?D???b`R?Aq?L?m?>?r??????>k?^T?5?4A=????1?O?!T?o???"????#d?.?l]???^`F??*O????~???? ??nCa??? n??????kv???6 ???R^?.]Y?j????{E?????t?? d?T?i??zQ?"jBj???5??V?6A??I?^??&?? h.???N?~v???Jh?UK#?(X2h?????"?d????9?g?m&? $?\?-??'W??7???c?(??q?$????Q?????L|`+H???c?2}??C?jA?i!???????????'bk?ay??o??*?? ????&???F????n????1??? ?s?D?`??y???"????P4?????bdB!?&g??s??*?l?`A)?Q????6?/Z-m??\A??,?i???!?O?d??=??????2?X??K????H?????F??A"?|??!???+????g?O??? ? (?????n??s_????v?aa?.G?/?(?+}?9??\?X?Ir??9?? ???????h?c=????R? n????- ???M?q???????? ????F?{??????o???????]??_?x??G-@?? p=????????0Z?yn?T?o?+gG??F?J?Qm??>w.???KWD?`??F?b???m??W(#??????????_?? T:??w???_??8???~???????>.?d@???????^?]????>?n?%???V]:eS??^?|" ?y??:\?S????xT????{?I???~-oS?Q#}Z?????&I??,?IVa?? &;?8w?]6C??0]|1.?'????+?N???????.'?t???[?vz,t ?X???7???@+?kQ?Q9W???"(??????NyP +H[?Q?'????Yp?%???????@7wA??[Q?m???wK?@G??y3?????z?9!4?0?_???-+b???+?+?*??-?E?k????Z?^._????????q?F??.i?3j|l??@T???d,=???h???="???z? ?Qfa??^"L~??=?.?q??.?*?????c???sN????????1??r???a?4????????f?G?!??l?t??h??SJ??9?/?pt?!?<9??n?Tg?w'?%? ? ??=?D2???!a/???]?w&???????I5?R????c?i?[6?????s???dvHl%? vv?Ft?)|???5s?E????A??5hb??)]?9z?EZ???/6?Sw??X?0a???D!/o??R5U?i???O?6r???"?`? ?x????R??????/?^?[w8? ???????!???=eT: ????,?a?p{??????? ??k-?(5????R?+?????Yh?;?????j?i?????f????+?????????????.??/I at s%3A?v?V?"????e?`?B??)Ka2 ???+??_??s'???dse0K#?1??NS|?X??M??Kv???=???b??g ?n????L G?{?????Qs????????-~?j7(???.??F????Hw?H???mM?H?2?;?!w????????Yzp?o???????r?? ?*??j?=\LMM-Mm>???v }???-?v?m???X????YG???B?ANIt????U??c????/???n??>o???? IKk? ??????e;8??"?\?H??Q? ??V?????AN$?+qd:???7K?a,??g??[?q>T??|?H?O??@?L ???]?G?? ?r???????d)": ??? ?=??????XX?yt???[?????`E?,?=??~?????????8?????[S???;?????????W?s? ???- ? ?;J^\?????l@"}s??h? ?????'65?c??T *{???H]?D??a? ?Np=M?????W?o{GG?c=_?G?:KkQ?c?}??? k????>??.???&?R?#?_???XWy9CVhj?D????BYRu??9???g?j??j????t?sGT? ?"?S,?PG?)???=/4?? zl??/*l? ?c8?W? ???i??1\?;?u"?;\?_?N??? {?mA(?q?a??_???Xr-S??F??K?=?9???Jm~h? ???u???3Z?1Q`/I ??jjG~?K?_??@?Y???^????4G???P`??^??>??yYRX??{??P?,????'???\????>???|????*?&??I? ????!?"$\m-??6KV?????U??Q?U???.,?l???9???)????zP????[+?????XBi?={n?{?{9>???K???P?^?#gN???&?????N3?69??,?????T~?f?}%qC??;?k???1v?'P?|???o??j??.?|???#/i?p??v ?U?T??VGb??^q6?t??????Wx??Z???ga? ?iM*K?]????T~????f(?*.?Vv?X?????F?~?` ??@?<(P)i??c???]Xb???&?T5 S????$? ??v?a?d?&\???._GON?v?? ;G`??d??S#PR-?H9?s/??~?9????o??[fE????? Z?????5U??[(???6l??,?O ???????a???)???r?Q?\l???G?A|? ????q?2*?"?,d????p????????H5??}?D?x??SZ???p???lZ?X?U[??<k?E??~???=Q>??????,a?R ;R'o????z??F??2???u^??^[??????X? ,??f?MV&n?|???fS"8-?Ug???????[C:I|#+eYj|`pgu??4J)F??Reh?0?1?? ???4?????g:PKe?o??z:?9>??Fj???){????q?5/??@??-?}?4?cz?,????gnuP???????G9w?-9??M?7???????K?\@????h??|WC?%??;z!????i?LV?s?\?e??T?7???.??W???RT????dVj?;iHk?\GZ??????????? ??yBe? ?o??I7?^??Et????d?4?Z?????W????B,kvY?k???Q?? Y?]*?h?B?m3>??F??O11?6??r!\??b?D\????]???5o??D???????????p???U??1U?bi2??????<5u??]U??o~?`"F??5u??{f??0?????T?N?"?k0?????k ?????4n?Nv^\?/?[??z ? z~?n?5p+N??y9?I??????g??????4;???? ?EL??q??~=d ?5t????@*? .JV&??????Y?E"? |?{?t?G?oU???M????Q??Q m?"y??yIl??????T??k D??Y?7??????? -??3?d?E?B9!?????????????hCG???????x we???_6????k????}?????T[?H?K%?????r?|W??m?????e?nV???L~t ?ZV??@.?%?????p^Y????????{?W??#*?4?m?b??+&??D ???:_j?Z?????t??o?%??`? d??=??X?]???4???;????Mk'?L??L|?X???u3I? d ?B?????*?????e??Z?2h6????\?o?b?E?h?q?5r?4?a???????Hln?&{???^??!??8?K?K?5J???CM?=? ?????~ ???????A!>??/?? ?[?w?-~?>$??xS??S??l???? u???X??? ???T?^?????HH? x/???6?a?4??????_???z??????v?j?~?Y?-/???19U?v`?b-v 'p3???Ya?{}$??????n????f??????? z?^??4?? ?????{= n?pM>'7=Z?h?}?*?V ??{?b???=f:?i5????????x4?N?qdO9xI?p?????y3pu=& ??/?M1??~,???mX0????(?C? 8O?Tn7X?a???D?x HL}??04~N?9??)Ear?B?o?3w????~9m??????????7??w???6??V?D?$????$?? ???? ???!??y?A??;???? ????F?D??[??r??1???????x??n?t???????y`?u $????&?Ro?2??????d&??6?}?????lj{>?k ?+"?:P?D??`|???fY??????Z??-??Fes??W2 *r???????k?z?>?n??d6j??z?&?????wZ??>???????? ???$r?a?;???`i?????RR??N??P??>? 0?#t?!?h?f? \???????^!?U?? ??P?mE????s???!??*??L?=m??Y!I-D-????? ??l H~???\g???ST?lk4?A???36?+?UD???]gr%E?????`?f???"?t???@????d??????u0( f??[f?s?l??????_#V?^??f???s???M?A?0??1?A??a????????n???,?6? J&?F??x85?tk????/??Y??qT?;?*??l? ?????5?x^O9?K}u??????3? 0YS??>?h?KRh?*u ?R??c??G?\?9??????C6?Jh???o??n,b?????:,d%?oB???^?(?? ???=?o??w?J!????=s5???D ???9 P+p[???IRG????? >???&?V?????l?$?_?fo*7????~?? c}???+8?N???i?????\uS??5?????&V??:Wb?:??b????-??????=z??#k??|?^??S3$??????????cJ?l?p???h(??iJI1?????Q??qS4?#?l3?c??dQ???M???Ay:??Z??;w@???????????#?Zp??.??? ??p?*? j??>oS L??W?^Vh?j???????\?Q?i??^??)p?h ?bH_&?Q?U?H?*?? Fx-/??R????.?????????W?z?1??tM3*??^????N???O?* ?=???`??d@1V?JF??Y$??r?`????g?x9'!?=?Y>??)???DK!??^?X? ??$?S/PF?)?d????m??iq????=4??????i??}'?~ "?)?m???A???a(?$H?9??2??;?????5??^y??#?Cq`?,?V?????`j?A????g?@9??N???S -,Y?*;??D????????(b??WGRy????q???m? s??9????G?5??????@??H????ol???? J?g??R'????Y?u8??@?=???ED??????nKp(???tBB???>?O??N???????/???\C??B? ?`?i?HAI????yLF?&??<|??nqs??D????t?L???(???M????? 9????9??????`????]???????@Z?N?Y%1???K?C?? Y?ip??p?????&???\xhjF?U??$TrTh+????????Cg??-? q?P????G??_?"?5a??l?? ???,Ho6?CE???????Yq?Z?}?n1d?'??P?S?%???????k>??$???w?7??;?n??s7*?.?l??/Z?x??k?s$ ?f???????E????? ????[?r??X?^+???Z9B*\?????|I?o{???78zt?1?)V%??N?5A?i>?^??w??Tfv?d~hv???!??z?1rk??$T0uWM??[w ?????Z?zV?q?R?z????|?????61?x??????????? X????$??mu?,?F?)n?}?lG ??.??r)?t?.???q.???*J?????@B?L??????L???5?(?T)?k/!??o?2&?y?+?|t?K+G????_Fv???^?u[?Z^?????,???r??0E{??4'?5J?q7???Y??l???V?????LQ??????????Wt?tH]?=?d{??{(q????????ZyqC??'S???Ii.=I?]???_l"???w+ Q%#?U???\?{w??????1??>?s??Y ??)jl???S??\??wv??{jC???w??I?^:C?_!? ?? 6??j???? %4?m?O??Kl?qvK ???>?NO????%U?I???v.?z???=???G"/ a? ?>? ?/?FT?F??D????J???=R???L????z8]?a?C ??Eo???c?#y?Q-????t?s??d?Zs??????????FK?I????8???]&?7Y{?].?B??0?? ??q????????????`???o?????(?E??a0??7?????n?sK?#??~?4??=2?d=???b\?eP???1T7?&??D??i????w )??????_?B???2?7(???,~ ?L???f??,\y??!v ?e?Z?q?? ?h?J????r?"]zu?[?W ???????BX?U?k????k???4???????3? ]%N?3G??u???}??????^G??~?? %??=?+^?p?P?p??J???\~$? ??>Z?d?r?I??G?-J?? ??[r?????M???O?q0 ?@??\m????X???&??w?u?h?????,6????j?? v?@????3.A?????&?)j?E???o'V??????C?^????G??????S????AZ?Wz?c??J?ai?&D(=?|p??!hw????Y/z??H ???!f?_??Y1?]?-?3????umk?????t????M??f?????7g???????)?J??????RQ????5?\????V?N??-???!?ad??_e?tiQ#?Y???8??????X?gg?/??d$?????????????Ru;?s???|????a_\m????-O?V????KU?2JK???????we?fegzH?S???? ????2????J???F?]?I????SY]?w?x?p ???o?????=?[a??vO???z{?K4??>????L7mp? ???????^??v???&6?{??K?y??/%;?????Q?}??o?I??????jh???m??iqr^??{1?=?hf???8A;??I???k???#=?~8?????!?ur???$???}?!??d?&?????8eCQ(^s??ml????l?V????"?W????????6????X?u?\J????v??<? ??zm?y?,~????l$^???b????K?? ??_???7???????=???w;??qW?S?K? U?~,? ??]S???\?^?l?W??5 am[o?+??:8'?}qC???5?????.??f??C???O 4S?n??D ?+????4D??!?*?@??n5?????7????K??)U?MOU?1??p?????T???'F(??#w?????????T+67?M2`?N????}??0???i?kD?Ze??$????'?????:S2?????N??@??????? ????p?g?????? m???R???Cq???Ps???^?y??i,??????u?.??q:~??N^C??=?{??Ms?=?d?2??Y??3?G{?)?z;????^/???U?3??;Q?Px[g ?N?yegh%????{ ????????Z?dZ?Q?????g?,@?ky?C????LC?N?[{U-?n_"*(?#7??j?s????&p??C??WUV???z?>R?"U???9?{??"!? ? %wS?,Ob??}?+??S(V"K~j??????RI?`c-?-[m??N@?M?7u??n??6=??)??V?? t? ? +???Qv+??xf?[T????&?[Z?@/?>>??/??$]??R??&?G?##?5??RR?R*?G????????8,?????9??!?????:(h???P ??$w??????T?'??????-|?;????? ??&?j0x?????z}??Y6??%VC??&J?zK?2;?? ?W??rc??b? v` qO??>L??[????gz?/?!??a?sM4{??O{"????'???????{S?Ar???'????LE/?|???r??'NZ~z`m?##cT_}Z?????B??=j???y??v0??#^*x? lK?(??Sq>C????????g??????_W)??o?t??2?a????'?I?i]???^s? wEb!???#?:?`%??n?.?7???%?,Ek??W??Gt??,????????$o????.?$Fn??@??I`?????I?j??@ =?'#???LM??L? ???(??4!??.??\/)}H^a`????`??yH;"?/?\???j??|?>b???????kXe??/?K?? ??2?F? ?M?_gU??q???6?????}?????L??g??d]? =????????????G?? d?v)??:$e????q?????B??n???(EI~????R~?????????%????1k?XJ E??~??L???' ?????US???? ?`rAJa?c???+???g#???D??9?*????????Ze.?H?:?W?~cJ??N?q?"g ???f?@??K??q???#???_?H??C?? c?(8??(? ??Fe???^?@?????C>o???*JRRZiK?????k ??NT??E?)%??,X??[f?9?J??f,?M~????"H0k???*6?u?1ke?????? 1Sb%??? g????-??W?;.r??????:??6[|?????? +mT\????^G_1?)?????D?m???F?F?????=I*'??<[???8?:?? ?5?~????? ??@ ???!V? }??,??!AT?????G ??Do?a???????hB?????Wr???0? ??I@Q?? ? ?i?]?Li!???E?? ty???ow?XF??? ?5?"??t??`???l??B?c?g?8????1?j??&W9???M6j2?:?Y???????)????b ? ?H:`r? ????"B???BC?<[?J5??????????????"d?????@-7?),??tMm?W4GCi?W????9?5z?B*??+??_?????=?6f)??_D?x?y???P!& ?'I_?I??SJ??g g?C??]?!?xc?e??? ??DA? k~ &? !?`+?z?)????????nr2wM?%:?JI,??{ot6]??g?#-;?A??|??G????^?;9????I?kh ??g-???Zg??,/?_??^????????5=???+=O;~0`??DxAO5$???$??????g?2???J_)?? ??<??1`Xz?R?u? ??e?]sz?????b`????#?C???H`J?}?S-?5B}^???K???????? ???????cmM#)??vF?1r`P=?o?(?AN??i???????Z?LV?#?)??0c=?'7G{???-??b%j?Nx??| 7YX????A?LCc?n????{?v?}? ???X?????6?????*??{?^???[5fV ??cN???3??????????[! ?2??6???, ?:^|mi8?z?????S????0?OB C?{?3??|??N\F\????qK]?0?V]V???M:+\????9??y??? ?3???\??X???q???x? ?l??8?k#????Vw?5?)???'?>??>???=!kK???s?y!??I??^:????um -?O???JY W?fP??P&?? ?????I???)?2^?X??O??}>a???k???Y*?.???????}j{?k`???.=???????????B?ci-XH?o??y ???a^??#om"?????(?4D?? ??'????N!??@d  $?\??\m?????????Z ??jX??U?W????R???b?#jmb {F????a}?@^hv?e)?? 1;=?n !? ?4 ?dVNc?N?k???&!?U?W?X"? ?u!?8???????z?????$%?????????D??A??$???$j?A?@?=???X???d$??_ z??f??a?l?&???/nx??_??f RY"????????w???????3 ???sX?[.r???????? Vf5+? ?unK??? /?E?/?3????zF????M'w??5??}_??V?A&??(?[?y??p??F???????mP"???"j?PU??8!?? 0h0?????7?p?>e?;????T??>h?^m?L?J~??*? ????^07???>??}y????H??????~^U!?`???:80??f????v8?YXD?)?l??Re??????*:-??????3[?_j??G??? ????@&=7E????[???E?w?????????????Zk?Z???P?? ?~>kvg?Q????9??*%?#;S???JH;]?s?? ????_????;j????D ????&?,Ml????o??] ?;%???i_?o?sC(?Zc?? J?? R?? ???6?r3??AMR????c- ???????TXw????k(?[?s1?}??&~??r ??K? D???o??j?J_F?,a????AU7????0??????_]B??+,do!??l&????b? $?vKi?'g?<"?z???3?????Sc5???k??z?>???sE??m?????E_?9? ??T ?q??z??0??!?????C??|,???#BL?????????Wcd?T?;?4?Lm?Th?~?zi??o???Y| CD????-?v??T*?? |[??rD?a????#??7.???y :1?aOZW???,??J????J?2/v7A"??f?u(?H????,) $p?{1??O+S??@p?1F??p,??]?a?O ???J???`? ???$??r?[-P%??k?;b???n??'??K0>H??HS?Y???"C????|?f?e)?`:P;??4???c??r???^Q$??w????? ??{???K|o,rj????t?6?.`??T?????T5??\??}?1~?kV}R???]??'????:?(}???????5l ???9?L??i? ? ???????o??^?6???f???17#???L?V???!b?????o(??i?d?|??&?,?V???>%f??H?W? Uz?F????A6J?????;^?3?B?E?c????z?5??????? ??A???KfN??W????~?1y?7?h?Pa0??`{?????????v???:?r?;???U???(??W0G?? ??~??5?"?5R??'??|???#l|????d????p?:Go:?0??????S?g?}?JY??????-????@hNS??m???1?Y??$"7?g?? ??Q???BL[?????%E??_ ?????cR????c???v?j?] ?? g]#N?? ???:Ad??Z?.??1F???????aJ??I?SOaw?V???H$???%$??? #??saw`???2+???o?K?KT?????C??dD?o?????x?W????? ???????????????Z ??????g??x??n????EC??Z?????:,??!?V??z?g?????z?z?w?.:?n???y??"????}-?S[??? ?????????7N??!q??9?????????\R??z?GQk?*+?kGm6??]:?6??????1,$??hH? ???kc??????]_kQ9?????oTpW?;s`?\f????????q-?hE0.??R?????/)4????&??GQ??e?k????mF?6??%?????b ?s?????*e???l?l ????v??4???9??__T[?#s?'??_??t??????z9*?j?????v??????^ ????{$?D??"??if}????;yW?w??x?N?+??? ??"y?`v??(???C?z?7??( ??? )?0???V[z??????E?P?"?EQrlO???09SWW?????@l???????????V??A:?x??wt??u????E?? ?(??q!?_?!??=e N%/k??]? ?`???j???d?y{??*/f? ???fRI???5????U?}B???"?bc????&mm?Cp}????????9?8N]C?t??????? $(??a?M???W/_?+?????_e^})Qim?6(??s? L=?\Y???Mp???Q???d?St3?`????y??+?????!\??F ???.C?y'n???????2 i??8????\??b y/?~?????{^e??LLB????v??/0???????????w??y*.7???m? 8??????$????j??:j~%?Y?X?n??6 ?O??{w?cb q???+?T?b??)/?Z'^?j????9???~?!e?V??(?/?u?h | 4?! ;GN?("??#???u?Bo??A????mhFm?q???L*??%?;?-g(?M?????????Z(??4?dBl??B?YO??5/W?9BG??R?{F?RN????M????V ? ????b??d}????T(;???M??l0?]??????s6;}gc?nez??s'X??x??`?1?????X??i6h????Sj4??T~OQ????S??0?Nf^{oP/?????????H?[?D\???1?FKi-?q??hi??D???:?/v??\???-?vxH??? ?U??????)??`????@?q`??3???UJ9dc?"?v??R<-? ?K?s?????'?;'??mF?`R??]?>?+M?U?`??Yd??J???k???`~D??c?yDi?W?? ?G????4????dn?A7?1??C?I9?;\?1 s???kI^??NX?@???[?Rs?&?>?? (?CHV?c? ?Rere/o??6*??|??+`D}?.~'????X?'????w!? ??+??? ?YA?u^?Y??"???d??-Q?Q??#??b?on ?h?????Y~????i??6???J??o?)z?JV`BASF???h y]-?>?o?4???1??????????>??l??a?5??Yw??_???????I?X ?T? ??q??W????Z?wA ??)??~-w?y?Z^???_'RJ??SV????'ZG?????LA?.x???r??T???Y???????8'^?q?/??m?o?j>??+???  q$k?"8H??B?????h?y????D???L]??o???;Z?=?????*?'t? U?OU0& ??uN??'1??4u ?C???Z??^&_.??????0j/Kl;??~????PQ3??-???e????%P ??????/L??V??K_l%?Q$???uv ???eO?? ????B?S?rY?`??g3]?k???@n?-T v $?7??,8?l??=G?????w--??H???W???;# ?[?E?J?@???1f?m?????dq??{??;?X??4]???i?)??yax??^!B??i?????OviEI~A:b4?????.??T??)?tp???k[K?????P?z??? ??? ?}?J"?kS?)??w?%*?D<?f??w????:F??????oo??JM? ; ?#? ?-?X??~z3?9f8??S?????k????7? ?????Pqg>??^(?N?[???(*???dD???\j????S??y,?? H-^C?I$???? ??mK????????XM?I'????y?d?|," e???p?X?i?/?l ?i^???Tl3??\>???W?p??]??$??@???u?uZn?+v?@?y??s??"d??????*>?Ys?Bn %`???9???l???]JXM? ????\???.?-?.M?x[P? B?7>???3??P?5?J?K????Y??????5^;;<{[r 2G???=???\???r??+`Ib?]? d!?;??-??_???????$/?5?Kn??????O??_??G?L?????|7e}?????5?e??g%?_???S?7?6??????l?1??????s??.??\C????????'????????;?lb9?{Q?H????z????`r F; 5!b\???&f`?Yc0????@0???<yO?0?Ztl????`B???w??0??]6?c?jk?? 1???? ??X??????kY??M:A?i?,?O????LHP7"??%?? }?f??M????m??L?H#gfX?:??g??????????%?|?" ??;???c?????.S,'?????z=V?????!?6?/???)_C?X??N??? o?? ?? ?T?k???L????*f)?ep????GK???aK??{??a????D1e??~l?W=`????1?.??@Pb??? ??B???8(q?Jw???`?F??? ??????C?????hr?g?q???????m9???,t?{c?h??u--g??m?&?xb??:h??6?? 6}\???2j?# Wx????DH???????E?e`???xy??"?i1???u??V??-D?l?Qv7??w?N??f;???Nw?K??2Lt??N(???1?su ?????z3f??? ????=;??Ti-??v??"?u???? ?????o?I??,?6?=??????.=?]M?Zd9??M?g?M?u??? f???i?K\4??=?Cwu?w;??O????o?b?K??p?,?Tb??? ???Fz*P???J?e??;???" _???_???{?br?L???y#?ew??Un?2????8??b?l,????]pY????@?????&q??'nisNn\7;?#>?4?c?????#?\? T???_?_?a?R??????I??9r?*?s0?'mJU[4???W?:?:s+???{o?P?Jh?e^??zB?w?t?`rV?E??=?f?0|?1??l?H?}MI?Bz??=??z7v?u?2AmM??D MT}?M>?@+PL????7?(??????h? ?k? ??????Q??PRp?\?[.E?V? ?B???ni? ?;x???V?????Np9?????Kx?J-????S??|??T^>}!&??L?4? ??r?yv??a?iH;&)????X???`OI????a K???i1?_?4z??,3??6Md??$5???J???uk???p???????]?WB??l??A??? M????2^?8Gw|???4?/??e?@c<h?H????B?~?Fk??k?$??I?~?lw??8??\D???????R{??%{7????7??(???????????i?a1?(A lf????;??r?Bf????????B?? k?#L(???2??2/nP&?t?????????t?}???i??P?Ue?_gF?6??????C?H/ ?9D?^a?k?d????K?hD&?mwB???6?e?]?p?%?}4-x???[??5??!?b?xFf%m5???+/>?P!?\??T???[ ~?OH??'???$?`?k.`x??pGK????@?(?jn)?4???????u_?,????????????,;??D???*?????l?P\?5?/?m???e]??* Z??3?@h?t?{???^g?H;b~??? ????C?~` ?D?n??p?oG????S????\q fs ?6???4Z?F????Y|?!:????7??`???????D??Jq?Lh???? D??????7kQz??:?9jZ?0?n?K|\~Xq|??d?{??b?tH?_?]o??,????8?????r?$8??V1?H7?????&???_-???v??:?E?????????????????_y??jR? [Se??R?|?D?H???~?+?w??,?f?q=??)E?ta?(??GN?vK?????O???OH#????W?S4???B&???I??????kh?q?[K??????? ?{???`??5j2;g????Y??\??$??N-s-?N???+'oHk? ?dv??|???5???n?A????m"|?Vlt??F1?auX??m?l?????l????)??G?>? ?%?F?x???,???(?/???{e?=Z!???? ???\??b?\k?~!?????@t??????B?????????U/??n?????? ?????$p?%C^9C????b ?????????=?1h?? ????????%?-?m??????????1u W? ???o'?Q??i?7??8?6b???n????e8w"?JVk?8??????R??`?8 ?8N???????E???h? ?i"? ??P??\??hC???Z?u>?%?0?????????1??R??tx??q)EC?c?=vUt??Jf*|*?}???1?gvM?*. ??E????? ?????Mx??{??1???????(???????Z? d????p^!??-?7?*.NN?2?gY;x????'??\??CGz?G<5f???A??\?Q`k???pdcz???F?}?0E??C>?N/n??B?>(??2?D?<`?K??? ??!2/}@?_T\S1????f!?m?&!?Od????J????KOb???H?,?H???,???O?,?9??]?j???????fjb?Sw%????6Q???*?~?????S\7|hFlv??P?H; i??E?_??? ?3L2?!????????M????????mC?/?w?e?? ?>"3??%??????,?????U?k??????%?[+?}?i?m??????0UI????CgG-??X?????X?TX???!??,1? ?3=*Z?h???2?l&?????XM???e??\?b??vR23???[k?Z???}7???????B?It?w2?Z???c???~?m:[6o?1  quW???????b??5? {??Og ?MZ9?P?^5Q?h??OE??????|Q87~l/?PE?s~b ?K* ?o?? ?w??????Y????{?????????/?VP????y????C?????K7?n?~SO??f???ANE??i[lE??k??c??;???3 '?A????????g??-2?8???f`???j`vi?S?zi????? ????'?Xw?0???B???S2g??5??E???8q??"??1c?J?v?u?V?5?????????sy??????????/???]???????M???d??I?6??;w??OB????z???????d1?f???-!.q?pxa?$Y5???C??"???aw?l???j?????????????7%??F<>?????O?X??F???Pq:??N???M?=???X?H?"V??j???D?d?F?T??8??5?}??5?SV\?2?????}r_)?"%rL??? ! ?:??V??T??&?0?Y????? )?7??????????{?(????w?????Tp??~??????|A?|P??"HS?? ?175E?ByW*?PDt?c6?1I??,????k~?k??n,?d???N/m?e???e???0 ?S*???X\?b??Y?L)K??80?=??@????3?O???R??&???8????,m3D??~?{?C??N7??r??z??8b??[?????????K??w???0v????/??,?{?7????h????7? ???3?y?$ ?#I?? H/P??E?7???sy???6??????y??t?C?c0?]~?SK/7De+?F?m&??4O?j#?n ?Q??S@@iK???Z?@Y?)??3?6W}"*?'????`V?G? 5?'[??C???j?????????*w??v???f?X9???X??6^8 ?/??LW9?:?I ???x??h???????P?!W????(o??M? ?)?=?q9ky?W?Sb[?7????w?P????????L?j>.@??iv?(??m??E#?H?X ?I???????R@?v!??g?o?q???,_?????l?s?Y??T??w)?????]U[?-U?BC????4?U??F?#??6???S??W?? ?????????0??I??????????? ????3????w?| ?uwG?g?M???\z???`?m?????/?{??n j#?6?????????????????,W?>)???|?YS??rP?/????: ??K??????:Y???????wHX????b????-???!?y??T?`J?6o???\???????i??Y????c.????f???o?~5?xsb??3?????]Ue??????L???????Ms????C`T?!/??MeT671U???~v~K?#?w?FWVS??:N??? ??????{Db?I?h??F\?o?v???? ;??-?R-?SSP??>2??W?n"? ?k#;?u?s???H????x2?P?e???M??r???????_?@??m(y g? ??.?Od????R??????q??t???? ?>??q??????M??q?r???.?2/??y???0????f???_2?D?????????6??IqDk(?U?=?z????? ????2?\???-h?n?????[??u4]D?9??{?.???a???[1???/)Bg0w?|m`???#m \?X0?M?6?Z?0???YJ??q?9??]*?~?T[?k??fG4BV??k?G?E????K?Q?~?????A.???6P{?(?L Z??U?????u?"????)?F?????C1?. x8?w`Yh? ?O????_L??Y???at?>???v?????????/?n?o??Rg?l??:???*??????1??\???q???sx????5??5? ?Et) ?6?z??d!?;a????\???hu!??>M???{??G>!d????#?????M?x?oxf??9????l???????&A~?????n~??V?^?c?!ul&QQ???6???n???O?Q=????????J??;+?>Z????????O?ag?3?B???L?3??kyK?+wq??U-;??.;?U??M?X??o??U?w???~R2wh1?"h??q?????@???U???i???3???g=N??B?r?A?%???1?O1?A???? ?r3o?#?dU t?>??[?r!@?Iu???R???)?w???|^???k?,???%?t?rpo?b???/?IG?^&]?\??????9???????*????a??nC?X}?I??~&????>??[,?_Z?9???V ? k?;?[????4????J????????9b?${??N??-R?? ;??WPh2???}?+??)??V?????b.????7?????Q??c?f?q??p??? >??G?`???h;5[??\?~%fj-?,?c5??q}?}??????????f?ms??#??;???< '??a`?m?????|?cf=b????av}????3?????vvhL?kA 8 ?6h?????/? ?4????X?+z?@t????Y?)?E??????j???x? ^?_????:???;?/=G?f?2????'(?p???c??W?I?1j???m???)?????](??A??G ?????!i??%??????G6?*B??y'????? ?^f???&?8????;{???A????Q=q ???Gx??????bw;?PP?+7????Y??? ???Fe7?=???]u?!?18^0 ? o????????u0F? ???D????????YF??&|Q?yA????C???.e%?6??|?3*?]?j?1????L*?3??hBi???; ?????|????v?7?b=N:??g?w??9??2En6?op'^????p"??x????]??_]?M_?Rw?.?????d??|????*??pQ??f?S?{6????q?D??1ZK?b ?Z;:???F????%?A3Tqm-?U E?NV???(?YE???v;??????.???????bR??Q?|?????-K?"?Ar 8R???)B??b?b???H??W8R?????+?1\?:T?????i????k??}???lmB5??????9#??? K?{?B/?M:k??S??????|Sw,??)"?&|E?1?o]???p;??K?SMC%?"?????\?_^ak???^P?????U???M?|?A? i' ??????6??3{m@?:??42?N0CL???h?-??ar?"??dt??C?Iv??L<+k??? ?z: ?Z??B]?????9?????}???????F?.BX???"?4? ?F??\ZO}?` ???st????????b[??^9?E????3V???==?-??????"??????Y(?BN?l$???w|;[???????ZIK??#*p_?Jr?((???h?-^? Tu??????q??X??:?T??????3?|e3?B?4? k[?H(DPIxm"]A?\??'5^?o?6???/???e?N?/??ZDn??kt?T?T??$?????L??uf???=u? ?N`??B?N???k?R??7?? ?1???????$gf?=???$????.l/dqKW?^?Qc ?'??PA ?YD??k??C?= ??.?"???!???/UGHon???v?????i??????A}????l?d?x?? ??x???(r????M??????2???E8???-?0s;s????'H?(?* ? ` \?Y?]??6??>{???? ?q"?Z|??5|?m? ??????_#???i??L? Z??[t??q? ???1??L?za?nb[L3?!??R?%??G???P? ???? ???zmXa?0?v?K6V.X[8???????f??&?V???????~??s;?=?c+?????Xl??|??}???????r&m?j{vf?tZ???? ???~???????k?+???EP???z14,T?a??E?fe???K`?????),I~(???V?,]???,??"?? ?V?m?? ?}Xz(?XH????^??5k??1?zV?3??y?(?>??S?`7L[????????g???F???P???qZ?~???{????>??Q%???vWZ?D*g???RX??y??3?M5????g??? ???? a????@?????`?:??T1?r?"~"????#i:?t????/???m???????y??5a?v??be???v?[??ui?;b-g?1??&?<JMeb^?~?u??^?P?Y2?Ac?-?\?f{]9??Ef?W?????mv?Y?7? ;r????w??z-??r>???\??l??????????Wx??h????:>??w?+?g???t?<^??[????????~o?o??=? ?????^???v???w?8w????7? ?nR?>??e???}?'9?? X?? ??# ?"????kh?F ?????|??z??AB??';R?? J??_/??????l???{?i?\?????J?8?Ip?]v@?r??(?u?uq0??????7?V$$ad??@?F?h?-?$?5???? k?=?m??????Tp???}??Sko??????A??Y??HN*X???? ?FGOy`?dyS??8?e -?E????e?a???`?}40?T(???\bF???ua?R??M?&?(?x(?q?7W??????*? .u+hi?T???+?Q??]?L*?{?A?$y????P?1?sa?????? 7U?:(F ??[?????.????0au?N-??????? >? ?0#b1F?????jfI?v???6??&O??@,%????;??DT8?? 0?g????K7??????????a#Y???????N?mBH!?T??S????s??????c@?rxg?? By?? ?ia?x`O ?Q??s??@?O?ZG???Ry?P?C ?$??n`P?$??D??qK?Fb*???^?????5.????U4???????#1??l?=A]`y? ?X?? ??y??1-???U}?8???mi?? ?????:???c!4 ?????R!D?????A?$?JwN???QE?9 ??-"A c?FkP?Og?H`???NA?E??1?hq?bE??f? h??S1?g?V4}?????4???+??x?C?"4?B?? ??5?j`??>??????????6????)0?I??M?$%3b58?a??6???l2???-M8???????Vy???$?[?-?????b?)?t??lh??????W??I??B????&)]m?;?~|":_??nZ.f??mW???WG??/?`??9??h???a????k0???W??o????,??6???G?????????|5g"k??ML|???4x'??? ?B???D??? v?????[???ML??e?F,??H6???W?+u???????d?l ??%?S?41>,Kjf*?s0 ??O8?BS?@?1?} ??e-?L ;?*?A?X?? @???HJ9????J?C*\E??*? )1??????????r?%*Q??} 9?F??e|z`???5???A????\?2a????=y@??????0?`??=?l ?????|?'?aK???\?E=?n???h?;?=???? Kr=(#??q?$?Z&p(?0'1?:a?????P??F{}??s:?1?L$?u4L????0`?vEz??x??@ vRP???C?YT> $?;????Q??*?X?????1?J??c????5???J??l????=?d?  ?=`?MYDC:[&???o???h???:=?????1??LL??S?Z?Z?U`e? i?o!???8J????? ?J ???E%.l??{dV?^6??V??????d?{?????NIi?oLlMjWT0$R??!=i~?>??9?B?????????"8w?_??^a??!!???I`? ????z?9Tl??? mT?H??d??M?? ?i~G????m?B????????r?-??Z 2?\|?y??_??????????3S?04????A??Wy??f???M??_????M?A o?w??w CQ>??7?}?V??'D? ?b??O%@??\{???????:????h[?ZT?TI?????{?>?`^?*b?c???2??7?d???? de2M@? ??. ??O??3??"TO?????????????N?p??$???G??v?9*???$???:N??db??$??9?VuH?Q?e??o??????!??)?? ???> ?M%?#?? ja#(? ???_?&;?.,"?P????X??Q??c? ?x'???$ ?c??r?gH?M????huY?+QU??|???????A??Z???#? 5?}?>,I???W???????oL???????6i? I??/ jS???Bl9[G? ??o???57+?VE?3?.\??(???????0dXEa?h?Y??7I?B ??????#??G-?Y??.?1:??u?)??,?6?z'??@?@6/&?b?s??}]]+uaY?y??? ????n??????r,????o?????? B?g?&???@?????;t??????H?{9M?3??B-? ??{?@?PuX'??55+??uv??X?? --- NEW FILE zeroinstall-injector.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: zeroinstall-injector Version: 0.18 Release: 4%{?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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python gnupg Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: PyXML pygtk2 gnupg %description A running process is created by combining many different libraries (and other components). In the Zero Install world, we have all versions of each library available at all times. The problem then is how to choose which versions to use. The injector solves this problem by selecting components to meet a program's requirements, according to a policy you give it. The injector finds out which versions are available, and downloads and runs the ones you choose. %prep gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf - %setup -q -T -D %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 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/0* %dir %{python_sitelib}/zeroinstall/ %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/0launch-gui/0launch-gui %{python_sitelib}/zeroinstall/0launch-gui/README %{python_sitelib}/zeroinstall/0launch-gui/injector-gui.xml %{python_sitelib}/zeroinstall/*/*.py %{python_sitelib}/zeroinstall/*/*.pyc %{_mandir}/man1/0* %changelog * Sun Mar 5 2006 Michel Salim 0.18-4 - Removed left-behind pushd and popd * Sat Feb 25 2006 Michel Salim 0.18-3 - Add Python-related requirements, BuildReq on gnupg to decrypt upstream source * Sat Feb 18 2006 Michel Salim 0.18-2 - Use _mandir, discard CFLAGS and unused python_sitearch definition * Thu Feb 16 2006 Michel Salim 0.18-1 - Initial Fedora Extras release, based on upstream spec contributed by Juan Carlos Jimenez Garcia From fedora-extras-commits at redhat.com Mon Mar 6 20:02:46 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:02:46 -0500 Subject: rpms/zeroinstall-injector import.log,1.1,1.2 Message-ID: <200603062003.k26K3IUq009466@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9394 Modified Files: import.log Log Message: auto-import zeroinstall-injector-0.18-4 on branch devel from zeroinstall-injector-0.18-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Mar 2006 20:01:25 -0000 1.1 +++ import.log 6 Mar 2006 20:02:45 -0000 1.2 @@ -0,0 +1 @@ +zeroinstall-injector-0_18-4:HEAD:zeroinstall-injector-0.18-4.src.rpm:1141675357 From fedora-extras-commits at redhat.com Mon Mar 6 20:06:49 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:06:49 -0500 Subject: owners owners.list,1.716,1.717 Message-ID: <200603062007.k26K7MSj009586@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9562 Modified Files: owners.list Log Message: Added zeroinstall-injector Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.716 retrieving revision 1.717 diff -u -r1.716 -r1.717 --- owners.list 6 Mar 2006 19:10:16 -0000 1.716 +++ owners.list 6 Mar 2006 20:06:49 -0000 1.717 @@ -1511,6 +1511,7 @@ Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org| Fedora Extras|yum-utils|Utilities based around the yum package manager|skvidal at phy.duke.edu|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|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org| Fedora Extras|zoo|File archiving utility with compression|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 6 20:17:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 15:17:17 -0500 Subject: rpms/perl-Log-Log4perl/FC-4 .cvsignore, 1.2, 1.3 perl-Log-Log4perl.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603062017.k26KHqON009836@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-serv9692/FC-4 Modified Files: .cvsignore perl-Log-Log4perl.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Feb 2006 16:19:16 -0000 1.2 +++ .cvsignore 6 Mar 2006 20:17:16 -0000 1.3 @@ -1 +1 @@ -Log-Log4perl-1.03.tar.gz +Log-Log4perl-1.04.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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Log-Log4perl.spec 9 Feb 2006 16:38:09 -0000 1.2 +++ perl-Log-Log4perl.spec 6 Mar 2006 20:17:16 -0000 1.3 @@ -9,8 +9,8 @@ %{?_with_filerotate:%define log_dispatch_filerotate 1} Name: perl-Log-Log4perl -Version: 1.03 -Release: 2%{?dist} +Version: 1.04 +Release: 1%{?dist} Summary: Log4j implementation for Perl Group: Development/Libraries @@ -92,6 +92,12 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. + +* Mon Feb 27 2006 Jose Pedro Oliveira - 1.03-3 +- Rebuild for FC5 (perl 5.8.8). + * Thu Feb 9 2006 Jose Pedro Oliveira - 1.03-2 - Added a couple of comments as suggested by Paul Howarth (#176137). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Feb 2006 16:19:16 -0000 1.2 +++ sources 6 Mar 2006 20:17:16 -0000 1.3 @@ -1 +1 @@ -2b471ec7e844a2b603239c3808155b56 Log-Log4perl-1.03.tar.gz +5df5587f17e46be23cf50c9eee73046f Log-Log4perl-1.04.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 20:17:24 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 15:17:24 -0500 Subject: rpms/perl-Log-Log4perl/devel .cvsignore, 1.2, 1.3 perl-Log-Log4perl.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603062017.k26KHuds009845@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-serv9692/devel Modified Files: .cvsignore perl-Log-Log4perl.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Feb 2006 16:19:16 -0000 1.2 +++ .cvsignore 6 Mar 2006 20:17:23 -0000 1.3 @@ -1 +1 @@ -Log-Log4perl-1.03.tar.gz +Log-Log4perl-1.04.tar.gz Index: perl-Log-Log4perl.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Log-Log4perl.spec 27 Feb 2006 17:45:23 -0000 1.3 +++ perl-Log-Log4perl.spec 6 Mar 2006 20:17:23 -0000 1.4 @@ -9,8 +9,8 @@ %{?_with_filerotate:%define log_dispatch_filerotate 1} Name: perl-Log-Log4perl -Version: 1.03 -Release: 3%{?dist} +Version: 1.04 +Release: 1%{?dist} Summary: Log4j implementation for Perl Group: Development/Libraries @@ -92,6 +92,9 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. + * Mon Feb 27 2006 Jose Pedro Oliveira - 1.03-3 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Feb 2006 16:19:16 -0000 1.2 +++ sources 6 Mar 2006 20:17:23 -0000 1.3 @@ -1 +1 @@ -2b471ec7e844a2b603239c3808155b56 Log-Log4perl-1.03.tar.gz +5df5587f17e46be23cf50c9eee73046f Log-Log4perl-1.04.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 20:35:50 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Mar 2006 15:35:50 -0500 Subject: rpms/gnupg2/devel gnupg2.spec,1.33,1.34 Message-ID: <200603062036.k26KaNGD010163@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10146 Modified Files: gnupg2.spec Log Message: hush the libpcsc query Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- gnupg2.spec 6 Mar 2006 18:13:55 -0000 1.33 +++ gnupg2.spec 6 Mar 2006 20:35:49 -0000 1.34 @@ -84,7 +84,7 @@ # Note: this is just the name of the default shared lib to load in scdaemon, # it can use other implementations too (including non-pcsc ones). %if "%{?fedora}" > "3" -%global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.?)) +%global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null ) %else %define pcsclib libpcsclite.so.0 %endif From fedora-extras-commits at redhat.com Mon Mar 6 21:03:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:03:33 -0500 Subject: rpms/perl-HTTP-Proxy - New directory Message-ID: <200603062103.k26L3ZOi012339@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12331/perl-HTTP-Proxy Log Message: Directory /cvs/extras/rpms/perl-HTTP-Proxy added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 21:03:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:03:39 -0500 Subject: rpms/perl-HTTP-Proxy/devel - New directory Message-ID: <200603062103.k26L3fVF012354@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12331/perl-HTTP-Proxy/devel Log Message: Directory /cvs/extras/rpms/perl-HTTP-Proxy/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 21:04:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:04:01 -0500 Subject: rpms/perl-HTTP-Proxy Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603062104.k26L43MX012388@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376 Added Files: Makefile import.log Log Message: Setup of module perl-HTTP-Proxy --- NEW FILE Makefile --- # Top level Makefile for module perl-HTTP-Proxy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 6 21:04:08 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:04:08 -0500 Subject: rpms/perl-HTTP-Proxy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603062104.k26L4AGB012406@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTTP-Proxy --- NEW 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 Mar 6 21:05:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:05:17 -0500 Subject: rpms/perl-HTTP-Proxy import.log,1.1,1.2 Message-ID: <200603062105.k26L5npX012484@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447 Modified Files: import.log Log Message: auto-import perl-HTTP-Proxy-0.17-2 on branch devel from perl-HTTP-Proxy-0.17-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Mar 2006 21:04:01 -0000 1.1 +++ import.log 6 Mar 2006 21:05:17 -0000 1.2 @@ -0,0 +1 @@ +perl-HTTP-Proxy-0_17-2:HEAD:perl-HTTP-Proxy-0.17-2.src.rpm:1141679109 From fedora-extras-commits at redhat.com Mon Mar 6 21:05:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:05:39 -0500 Subject: rpms/perl-HTTP-Proxy/devel HTTP-Proxy-0.17-save.pm.patch, NONE, 1.1 perl-HTTP-Proxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603062106.k26L6Box012488@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447/devel Modified Files: .cvsignore sources Added Files: HTTP-Proxy-0.17-save.pm.patch perl-HTTP-Proxy.spec Log Message: auto-import perl-HTTP-Proxy-0.17-2 on branch devel from perl-HTTP-Proxy-0.17-2.src.rpm HTTP-Proxy-0.17-save.pm.patch: --- NEW FILE HTTP-Proxy-0.17-save.pm.patch --- diff -ruN HTTP-Proxy-0.17-orig/lib/HTTP/Proxy/BodyFilter/save.pm HTTP-Proxy-0.17/lib/HTTP/Proxy/BodyFilter/save.pm --- HTTP-Proxy-0.17-orig/lib/HTTP/Proxy/BodyFilter/save.pm 2005-09-28 22:26:09.000000000 +0100 +++ HTTP-Proxy-0.17/lib/HTTP/Proxy/BodyFilter/save.pm 2006-03-06 20:50:50.000000000 +0000 @@ -279,7 +279,7 @@ Returning C<""> or C will prevent the creation of the file. This lets a filter decide even more precisely what to save or not, even though this should be done in the match subroutine (see -HTTP::Proxy's C method). +HTTP::Proxy's C method). =back @@ -389,7 +389,7 @@ Thanks to Nicolas Chuche for telling me about C. -Thanks to Rafa?l Garcia-Suarez and David Rigaudiere for their help on +Thanks to Rafa??l Garcia-Suarez and David Rigaudiere for their help on irc while coding the nasty C method. C<;-)> Thanks to Howard Jones for the inspiration and initial patch for the --- NEW FILE perl-HTTP-Proxy.spec --- Name: perl-HTTP-Proxy Version: 0.17 Release: 2%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/HTTP-Proxy/ Source0: http://www.cpan.org/authors/id/B/BO/BOOK/HTTP-Proxy-%{version}.tar.gz Patch0: HTTP-Proxy-0.17-save.pm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod), perl(HTML::Parser) BuildRequires: perl(HTTP::Daemon), perl(LWP::UserAgent), perl(Crypt::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Its main use should be to record and/or modify web sessions, so as to help users create web robots, web testing suites, as well as proxy systems than can transparently alter the requests to and answers from an origin server. %prep %setup -q -n HTTP-Proxy-%{version} %patch0 -p1 %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README eg/ %{perl_vendorlib}/HTTP/ %{_mandir}/man3/*.3* %changelog * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-2 - save.pm patched and converted to utf8 (HTTP-Proxy-0.17-save.pm.patch). * Thu Dec 8 2005 Jose Pedro Oliveira - 0.17-1 - Update to 0.17. * Thu Sep 8 2005 Jose Pedro Oliveira - 0.16-1 - Update to 0.16. * Sun Jul 04 2004 Jose Pedro Oliveira - 0:0.13-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Mar 2006 21:04:08 -0000 1.1 +++ .cvsignore 6 Mar 2006 21:05:38 -0000 1.2 @@ -0,0 +1 @@ +HTTP-Proxy-0.17.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Mar 2006 21:04:08 -0000 1.1 +++ sources 6 Mar 2006 21:05:38 -0000 1.2 @@ -0,0 +1 @@ +5f8dee810951840408092c07faccfa1a HTTP-Proxy-0.17.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 21:09:07 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:09:07 -0500 Subject: owners owners.list,1.717,1.718 Message-ID: <200603062109.k26L9dOQ012602@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12585 Modified Files: owners.list Log Message: New package: perl-HTTP-Proxy (#179043). Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.717 retrieving revision 1.718 diff -u -r1.717 -r1.718 --- owners.list 6 Mar 2006 20:06:49 -0000 1.717 +++ owners.list 6 Mar 2006 21:09:07 -0000 1.718 @@ -910,6 +910,7 @@ Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|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-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-HTTP-Proxy|A pure Perl HTTP proxy|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Ima-DBI|Database connection caching and organization|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon Mar 6 22:05:45 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 6 Mar 2006 17:05:45 -0500 Subject: rpms/python-basemap/devel python-basemap.spec,1.5,1.6 Message-ID: <200603062206.k26M6IKc014952@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-basemap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14933 Modified Files: python-basemap.spec Log Message: Rebuild for updated shapelib Index: python-basemap.spec =================================================================== RCS file: /cvs/extras/rpms/python-basemap/devel/python-basemap.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-basemap.spec 28 Feb 2006 22:44:31 -0000 1.5 +++ python-basemap.spec 6 Mar 2006 22:05:44 -0000 1.6 @@ -2,7 +2,7 @@ Name: python-basemap Version: 0.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plots data on map projections (with continental and political boundaries) Group: Development/Libraries License: MIT and GPL @@ -59,6 +59,9 @@ %changelog +* Mon Mar 6 2006 Orion Poplawski 0.8.2-3 +- Rebuild for updated shapelib + * Tue Feb 28 2006 Orion Poplawski 0.8.2-2 - python-matplotlib now owns toolkits directoery From fedora-extras-commits at redhat.com Mon Mar 6 22:43:20 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Mon, 6 Mar 2006 17:43:20 -0500 Subject: rpms/banshee/devel banshee.spec,1.2,1.3 Message-ID: <200603062243.k26Mhro0015232@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15215 Modified Files: banshee.spec Log Message: * Mon Mar 6 2006 Christopher Aillon 0.10.6-3 - Don't build with smp_mflags, as parallel make causes the build to fail Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- banshee.spec 4 Mar 2006 16:44:37 -0000 1.2 +++ banshee.spec 6 Mar 2006 22:43:19 -0000 1.3 @@ -1,6 +1,6 @@ Name: banshee Version: 0.10.6 -Release: 2 +Release: 3 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -38,7 +38,7 @@ %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure --disable-docs --with-gstreamer-0-10 -make %{?_smp_mflags} +make %install %{__rm} -rf $RPM_BUILD_ROOT @@ -94,6 +94,9 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Mon Mar 6 2006 Christopher Aillon 0.10.6-3 +- Don't build with smp_mflags, as parallel make causes the build to fail + * Sat Mar 4 2006 Christopher Aillon 0.10.6-2 - Rebuild From fedora-extras-commits at redhat.com Mon Mar 6 22:58:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 17:58:02 -0500 Subject: rpms/perl-HTTP-Proxy/devel perl-HTTP-Proxy.spec,1.1,1.2 Message-ID: <200603062258.k26MwZUG015343@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15326 Modified Files: perl-HTTP-Proxy.spec Log Message: Added missing BR: perl(Test::Pod::Coverage). Index: perl-HTTP-Proxy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/perl-HTTP-Proxy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTTP-Proxy.spec 6 Mar 2006 21:05:38 -0000 1.1 +++ perl-HTTP-Proxy.spec 6 Mar 2006 22:58:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-HTTP-Proxy Version: 0.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: perl BuildRequires: perl(Module::Build) -BuildRequires: perl(Test::Pod), perl(HTML::Parser) +BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage), perl(HTML::Parser) BuildRequires: perl(HTTP::Daemon), perl(LWP::UserAgent), perl(Crypt::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -56,6 +56,9 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-3 +- Added missing BR: perl(Test::Pod::Coverage). + * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-2 - save.pm patched and converted to utf8 (HTTP-Proxy-0.17-save.pm.patch). From fedora-extras-commits at redhat.com Mon Mar 6 23:27:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 18:27:43 -0500 Subject: rpms/perl-HTTP-Proxy/FC-4 perl-HTTP-Proxy.spec,1.1,1.2 Message-ID: <200603062328.k26NSGgA017410@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17393 Modified Files: perl-HTTP-Proxy.spec Log Message: Sync with devel Index: perl-HTTP-Proxy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/perl-HTTP-Proxy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTTP-Proxy.spec 6 Mar 2006 21:05:38 -0000 1.1 +++ perl-HTTP-Proxy.spec 6 Mar 2006 23:27:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-HTTP-Proxy Version: 0.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: perl BuildRequires: perl(Module::Build) -BuildRequires: perl(Test::Pod), perl(HTML::Parser) +BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage), perl(HTML::Parser) BuildRequires: perl(HTTP::Daemon), perl(LWP::UserAgent), perl(Crypt::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -56,6 +56,9 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-3 +- Added missing BR: perl(Test::Pod::Coverage). + * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-2 - save.pm patched and converted to utf8 (HTTP-Proxy-0.17-save.pm.patch). From fedora-extras-commits at redhat.com Tue Mar 7 00:23:13 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 6 Mar 2006 19:23:13 -0500 Subject: rpms/hfsplusutils/devel hfsplusutils.spec,1.6,1.7 Message-ID: <200603070023.k270NjbQ019417@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/hfsplusutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19395 Modified Files: hfsplusutils.spec Log Message: rebuild Index: hfsplusutils.spec =================================================================== RCS file: /cvs/extras/rpms/hfsplusutils/devel/hfsplusutils.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hfsplusutils.spec 30 Apr 2005 11:58:16 -0000 1.6 +++ hfsplusutils.spec 7 Mar 2006 00:23:11 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Tools for reading Macintosh HFS+ volumes Name: hfsplusutils Version: 1.0.4 -Release: 5 +Release: 6 License: GPL Group: Applications/File @@ -68,6 +68,9 @@ %changelog +* Tue Mar 7 2006 David Woodhouse 1.0.4-6 +- Rebuild + * Sat Apr 30 2005 David Woodhouse 1.0.4-5 - Fix pointer abuse which GCC 4 doesn't like. Yes, the workaround is ugly as sin, but it is at least valid C. Apart from the bit From fedora-extras-commits at redhat.com Tue Mar 7 00:24:31 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 6 Mar 2006 19:24:31 -0500 Subject: rpms/exim/devel exim.spec,1.13,1.14 Message-ID: <200603070025.k270P4Pd019475@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19448 Modified Files: exim.spec Log Message: rebuild Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- exim.spec 29 Nov 2005 12:10:28 -0000 1.13 +++ exim.spec 7 Mar 2006 00:24:31 -0000 1.14 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -287,6 +287,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue Mar 7 2006 David Woodhouse 4.60-3 +- Rebuild + * Tue Nov 29 2005 David Woodhouse 4.60-2 - Require libXt-devel From fedora-extras-commits at redhat.com Tue Mar 7 00:51:46 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Mon, 6 Mar 2006 19:51:46 -0500 Subject: rpms/opencv/FC-4 opencv.spec,1.1,1.2 Message-ID: <200603070052.k270qIF9019685@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19645 Modified Files: opencv.spec Log Message: Bumping up release number Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opencv.spec 5 Mar 2006 19:45:57 -0000 1.1 +++ opencv.spec 7 Mar 2006 00:51:45 -0000 1.2 @@ -2,7 +2,7 @@ Name: opencv Version: 0.9.7 -Release: 3 +Release: 4 Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -111,6 +111,9 @@ %changelog +* Mon Mar 6 2005 Simon Perreault - 0.9.7-4 +- Rebuild + * Sun Oct 16 2005 Simon Perreault - 0.9.7-3 - Removed useless sample compilation makefiles/project files and replaced them with one that works on Fedora Core. From fedora-extras-commits at redhat.com Tue Mar 7 00:53:16 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 6 Mar 2006 19:53:16 -0500 Subject: fedora-release RPM-GPG-KEY-fedora-legacy, NONE, 1.1 fedora-legacy.repo, NONE, 1.1 Message-ID: <200603070053.k270rGKW019759@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19725 Added Files: RPM-GPG-KEY-fedora-legacy fedora-legacy.repo Log Message: add legacy stuff --- NEW FILE RPM-GPG-KEY-fedora-legacy --- -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.0.7 (GNU/Linux) mQGiBEALkQkRBACCBCp/a5rsqy2Q0NW/2OMkYtsb3k5M6dsQYoHDLiZK4VG1j+Bf 2zzp+HJiUnLFp/l7mROuRioU9/UHpEYFIVunBYXeZf84OxB+mruh9UZtYn3oVXtH oaMI7hIFirTZ5eEY7zrfvTbvZ2Sm5cE3F2G5sWVOfxhl5opinuWN4xtSwwCggooh LqarkF4KN6D8xoyjrhLaxiMD/Az7RE6oH0Vwl9dX7YmccymDEesT5Ql6Q5FvfkuZ F5ZaQwaBO2ko2hMMh2AdCxoYAZPjWqC5r6Wy9P8hMfh+A0S4zon2DE/r0d4vLEY2 HoptwtElq6gpltydx+/vXhZWkwCO//Kz9wXgZr496KtGXmEKYtdlVScBW6OvdyyD 18zeA/9RuY59C7uxxe6cu7amqjP52xx5rHGkdJD5E8o3rmjdsr9tJ3FcjtIV0DV2 BkfLIMnsp2gd972n7JBzlA9LJ+JTtMzvf9WdrErpRz1VeI1jHe4/hNGe3hd6xJIE rxj5FH+LwTj3vfErZdKsWOuudNkz1N4AwZr/k05gV3bi7j8RCLRIRmVkb3JhIExl Z2FjeSAoaHR0cDovL3d3dy5mZWRvcmFsZWdhY3kub3JnKSA8c2Vjbm90aWNlQGZl ZG9yYWxlZ2FjeS5vcmc+iFkEExECABkFAkALkQkECwcDAgMVAgMDFgIBAh4BAheA AAoJEBCMRRJzEAL686wAn3bA5dioMd0UDpUaES9TglLDpONbAJ467XWdHHwhxuHz oxWc3q7rWPBinLkCDQRAC5EuEAgAsPAVcrvrKB1A/hxoM61KEgaLB9GnGUOgoaV6 I58stO3sxaxj3bblrpIJjo02BA49xrtL8kpqjKveABThVC1yiSYfySmXKHlO09cv A+qj+QSxieRciFKc50F1+j8q5Hqcigxzwhr4sJt5IhAx6HIwar5uxNNBgE98JN42 GthUH39G+alRmzVd+3gQCLFroJSzHtFX7IlwHM33owAZwIVGlUhlBTHdbsvGf0xG mPYkI+JAUXpTTsnP7kR0/Ktm3zAHBEMw19eqQ5MSwVo28cA+jq2sLrL5DiE5quCd tB/RVnUUdbfN/o8sN6yxssNB6ZOB61l0K8bvm+9Qgstn/EQFSwADBggAmmFJueD1 iXehZsRtaH+qZw7z6Q6jUPxDTiuVPhLkUux3wOSWMOp6S+ZYliCaw32TBKgE2SwT NnvTJYsuGLf3ECxOxMmu2McDHYZM82zRV4PRBMKFfiOa67/x5lhZgEkqf9TO+wk5 M67GYbjZoyBaYEiE+eWD2cdema3n3zXzy+q2UEkHkzHx6ME9dRrgND3EW2hC9GJ6 7wY9h+BlUR6Am4o0/ZLZJ2QEvyVnlI3/zZo9L6h8waZKI4l16nuDr/O8z2UOYc/X OMwBJCVwvbB2Z/f91dhy2EVWJZyyZBCG/FMXXDchxKwJOOQgrVbxWGDIMSdyHLUL 2FuWnC/vdKc7wYhGBBgRAgAGBQJAC5EuAAoJEBCMRRJzEAL6wkcAnAlIrH0JuGjL T17HoheG/iUbj4Z4AJ9b/7OPGgNglwrLQJfihyPzManKYw== =wmoy -----END PGP PUBLIC KEY BLOCK----- --- NEW FILE fedora-legacy.repo --- [legacy-updates] name=Fedora Legacy $releasever - $basearch - Updates mirrorlist=http://fedora.redhat.com/download/mirrors/legacy-updates-released-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy [legacy-testing] name=Fedora Legacy $releasever - $basearch - Updates Testing mirrorlist=http://fedora.redhat.com/download/mirrors/legacy-updates-testing-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy From fedora-extras-commits at redhat.com Tue Mar 7 00:53:07 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Mon, 6 Mar 2006 19:53:07 -0500 Subject: rpms/opencv/FC-4 opencv.spec,1.2,1.3 Message-ID: <200603070053.k270rd7E019762@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19721 Modified Files: opencv.spec Log Message: We're now officially in 2006. Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- opencv.spec 7 Mar 2006 00:51:45 -0000 1.2 +++ opencv.spec 7 Mar 2006 00:53:07 -0000 1.3 @@ -111,7 +111,7 @@ %changelog -* Mon Mar 6 2005 Simon Perreault - 0.9.7-4 +* Mon Mar 6 2006 Simon Perreault - 0.9.7-4 - Rebuild * Sun Oct 16 2005 Simon Perreault - 0.9.7-3 From fedora-extras-commits at redhat.com Tue Mar 7 02:27:28 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 6 Mar 2006 21:27:28 -0500 Subject: rpms/moodss/devel .cvsignore, 1.7, 1.8 moodss.spec, 1.20, 1.21 sources, 1.8, 1.9 Message-ID: <200603070228.k272S0na023809@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23783 Modified Files: .cvsignore moodss.spec sources Log Message: 21.1 upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 Jan 2006 16:37:50 -0000 1.7 +++ .cvsignore 7 Mar 2006 02:27:24 -0000 1.8 @@ -1 +1,2 @@ moodss-21.0.tar.bz2 +moodss-21.1.tar.bz2 Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- moodss.spec 15 Feb 2006 19:41:09 -0000 1.20 +++ moodss.spec 7 Mar 2006 02:27:24 -0000 1.21 @@ -1,10 +1,10 @@ Name: moodss -Version: 21.0 -Release: 2%{?dist} +Version: 21.1 +Release: 1%{?dist} Summary: Powerful modular monitoring graphical application Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moodss-21.0.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moodss-21.1.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,8 @@ %changelog +* Mon Feb 27 2006 Jean-Luc Fontaine 21.1-1 +- 21.1 upstream release * Wed Feb 15 2006 Jean-Luc Fontaine 21.0-2 - rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/moodss/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Jan 2006 16:37:50 -0000 1.8 +++ sources 7 Mar 2006 02:27:24 -0000 1.9 @@ -1 +1,2 @@ 1366c31bfbda443103dcd7f53e10e3a8 moodss-21.0.tar.bz2 +f4563adcfe077b0c9716f7bf86ac94e0 moodss-21.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 02:37:09 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 6 Mar 2006 21:37:09 -0500 Subject: rpms/moomps/devel .cvsignore, 1.6, 1.7 moomps.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200603070237.k272bg5j023887@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23866 Modified Files: .cvsignore moomps.spec sources Log Message: - 5.5 upstream release - in post installation stage, fix moodss modules path - use fedora-useradd instead of useradd Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Jan 2006 16:35:23 -0000 1.6 +++ .cvsignore 7 Mar 2006 02:37:09 -0000 1.7 @@ -1 +1,2 @@ moomps-5.4.tar.bz2 +moomps-5.5.tar.bz2 Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- moomps.spec 15 Feb 2006 19:44:36 -0000 1.9 +++ moomps.spec 7 Mar 2006 02:37:09 -0000 1.10 @@ -1,19 +1,19 @@ Name: moomps -Version: 5.4 -Release: 2%{?dist} +Version: 5.5 +Release: 1%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moomps-5.4.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moomps-5.5.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): %_sbindir/useradd, %_sbindir/usermod +Requires(pre): fedora-usermgmt >= 0.8 Requires(preun): /sbin/chkconfig, /sbin/service Requires(post): /sbin/chkconfig Requires(postun): /sbin/service -Requires: moodss >= 21.0, tclx >= 8.3 +Requires: moodss >= 21.1, tclx >= 8.3 %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -38,8 +38,8 @@ %pre # if not present, add moomps user (even when upgrading): if ! %_sbindir/usermod -l moomps moomps 2>/dev/null; then - %_sbindir/useradd -r moomps -d /srv/moomps -c 'service companion to moodss'\ - -s '/sbin/nologin' + %_sbindir/fedora-useradd 23 -r -d /srv/moomps\ + -c 'service companion to moodss' -s '/sbin/nologin' moomps fi %preun @@ -50,6 +50,10 @@ fi %post +# fix moodss modules path (useful on x86_64 architecture): +sed\ + -e 's,lappend auto_path /usr/lib/moodss,lappend auto_path %_libdir/moodss,'\ + -i %_sbindir/moomps if [ $1 -eq 1 ]; then # installing chkconfig --add moomps fi @@ -77,6 +81,10 @@ %changelog +* Sun Feb 12 2006 Jean-Luc Fontaine 5.5-1 +- 5.5 upstream release +- in post installation stage, fix moodss modules path +- use fedora-useradd instead of useradd * Wed Feb 15 2006 Jean-Luc Fontaine 5.4-2 - rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Jan 2006 16:35:23 -0000 1.6 +++ sources 7 Mar 2006 02:37:09 -0000 1.7 @@ -1 +1,2 @@ 37045d89b50a78f5f6f445cc4d897c62 moomps-5.4.tar.bz2 +249a456d2db2dbc5ed95f31d926d063d moomps-5.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 02:40:37 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 6 Mar 2006 21:40:37 -0500 Subject: rpms/moomps/devel moomps.spec,1.10,1.11 Message-ID: <200603070241.k272f9lt023932@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23915 Modified Files: moomps.spec Log Message: log date was wrong. Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- moomps.spec 7 Mar 2006 02:37:09 -0000 1.10 +++ moomps.spec 7 Mar 2006 02:40:37 -0000 1.11 @@ -81,7 +81,7 @@ %changelog -* Sun Feb 12 2006 Jean-Luc Fontaine 5.5-1 +* Mon Mar 6 2006 Jean-Luc Fontaine 5.5-1 - 5.5 upstream release - in post installation stage, fix moodss modules path - use fedora-useradd instead of useradd From fedora-extras-commits at redhat.com Tue Mar 7 02:48:25 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 6 Mar 2006 21:48:25 -0500 Subject: rpms/moodss/FC-4 .cvsignore, 1.8, 1.9 moodss.spec, 1.19, 1.20 sources, 1.8, 1.9 Message-ID: <200603070248.k272mwBE024043@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24018 Modified Files: .cvsignore moodss.spec sources Log Message: 21.1 upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Jan 2006 17:37:12 -0000 1.8 +++ .cvsignore 7 Mar 2006 02:48:25 -0000 1.9 @@ -1 +1,2 @@ moodss-21.0.tar.bz2 +moodss-21.1.tar.bz2 Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/moodss.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- moodss.spec 22 Jan 2006 17:37:12 -0000 1.19 +++ moodss.spec 7 Mar 2006 02:48:25 -0000 1.20 @@ -1,10 +1,10 @@ Name: moodss -Version: 21.0 +Version: 21.1 Release: 1%{?dist} Summary: Powerful modular monitoring graphical application Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moodss-21.0.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moodss-21.1.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,8 @@ %changelog +* Mon Feb 27 2006 Jean-Luc Fontaine 21.1-1 +- 21.1 upstream release * Fri Nov 11 2005 Jean-Luc Fontaine 21.0-1 - 21.0 upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Jan 2006 17:37:12 -0000 1.8 +++ sources 7 Mar 2006 02:48:25 -0000 1.9 @@ -1 +1,2 @@ 1366c31bfbda443103dcd7f53e10e3a8 moodss-21.0.tar.bz2 +f4563adcfe077b0c9716f7bf86ac94e0 moodss-21.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 02:55:30 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 6 Mar 2006 21:55:30 -0500 Subject: rpms/moomps/FC-4 .cvsignore, 1.6, 1.7 moomps.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200603070256.k272u2ar024155@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24130 Modified Files: .cvsignore moomps.spec sources Log Message: - 5.5 upstream release - in post installation stage, fix moodss modules path - use fedora-useradd instead of useradd Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Jan 2006 17:39:36 -0000 1.6 +++ .cvsignore 7 Mar 2006 02:55:30 -0000 1.7 @@ -1 +1,2 @@ moomps-5.4.tar.bz2 +moomps-5.5.tar.bz2 Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/moomps.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- moomps.spec 22 Jan 2006 17:39:36 -0000 1.8 +++ moomps.spec 7 Mar 2006 02:55:30 -0000 1.9 @@ -1,19 +1,19 @@ Name: moomps -Version: 5.4 +Version: 5.5 Release: 1%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moomps-5.4.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moomps-5.5.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): %_sbindir/useradd, %_sbindir/usermod +Requires(pre): fedora-usermgmt >= 0.8 Requires(preun): /sbin/chkconfig, /sbin/service Requires(post): /sbin/chkconfig Requires(postun): /sbin/service -Requires: moodss >= 21.0, tclx >= 8.3 +Requires: moodss >= 21.1, tclx >= 8.3 %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -38,8 +38,8 @@ %pre # if not present, add moomps user (even when upgrading): if ! %_sbindir/usermod -l moomps moomps 2>/dev/null; then - %_sbindir/useradd -r moomps -d /srv/moomps -c 'service companion to moodss'\ - -s '/sbin/nologin' + %_sbindir/fedora-useradd 23 -r -d /srv/moomps\ + -c 'service companion to moodss' -s '/sbin/nologin' moomps fi %preun @@ -50,6 +50,10 @@ fi %post +# fix moodss modules path (useful on x86_64 architecture): +sed\ + -e 's,lappend auto_path /usr/lib/moodss,lappend auto_path %_libdir/moodss,'\ + -i %_sbindir/moomps if [ $1 -eq 1 ]; then # installing chkconfig --add moomps fi @@ -77,6 +81,13 @@ %changelog +* Mon Mar 6 2006 Jean-Luc Fontaine 5.5-1 +- 5.5 upstream release +- in post installation stage, fix moodss modules path +- use fedora-useradd instead of useradd + +* Wed Feb 15 2006 Jean-Luc Fontaine 5.4-2 +- rebuild for Fedora Extras 5 * Fri Nov 11 2005 Jean-Luc Fontaine 5.4-1 - 5.4 upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Jan 2006 17:39:36 -0000 1.6 +++ sources 7 Mar 2006 02:55:30 -0000 1.7 @@ -1 +1,2 @@ 37045d89b50a78f5f6f445cc4d897c62 moomps-5.4.tar.bz2 +249a456d2db2dbc5ed95f31d926d063d moomps-5.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 04:07:33 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Mon, 6 Mar 2006 23:07:33 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics-simple.patch, NONE, 1.1 opencv-0.9.7-intrinsics.patch, NONE, 1.1 opencv.spec, 1.3, 1.4 Message-ID: <200603070408.k274861t028247@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28212 Modified Files: opencv.spec Added Files: opencv-0.9.7-intrinsics-simple.patch opencv-0.9.7-intrinsics.patch Log Message: SSE2 support on x86_64. opencv-0.9.7-intrinsics-simple.patch: --- NEW FILE opencv-0.9.7-intrinsics-simple.patch --- diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h --- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-06 22:59:56.000000000 -0500 @@ -48,7 +48,7 @@ #include #include - #if defined WIN64 && defined EM64T && defined _MSC_VER + #if defined WIN64 && defined EM64T && defined _MSC_VER || defined __GNUC__ #include #endif opencv-0.9.7-intrinsics.patch: --- NEW FILE opencv-0.9.7-intrinsics.patch --- diff -urp opencv-0.9.7.orig/configure.in opencv-0.9.7/configure.in --- opencv-0.9.7.orig/configure.in 2006-03-06 22:10:57.000000000 -0500 +++ opencv-0.9.7/configure.in 2006-03-06 22:25:29.000000000 -0500 @@ -281,6 +281,11 @@ dnl # #AC_SUBST(CXXOPENMP) +dnl +dnl ****************** SSE2 Intrinsics ************************** +dnl +AC_CHECK_HEADERS([emmintrin.h]) + AC_SUBST(DEBUG) AC_CONFIG_FILES([Makefile diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h --- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:10:58.000000000 -0500 +++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-06 22:34:04.000000000 -0500 @@ -48,7 +48,8 @@ #include #include - #if defined WIN64 && defined EM64T && defined _MSC_VER + #if defined HAVE_EMMINTRIN_H \ + || defined WIN64 && defined EM64T && defined _MSC_VER #include #endif Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- opencv.spec 7 Mar 2006 00:53:07 -0000 1.3 +++ opencv.spec 7 Mar 2006 04:07:32 -0000 1.4 @@ -2,7 +2,7 @@ Name: opencv Version: 0.9.7 -Release: 4 +Release: 5%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -10,6 +10,7 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile +Patch0: opencv-0.9.7-intrinsics-simple.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel @@ -48,6 +49,7 @@ %prep %setup -q +%patch -p1 -b .intrinsics %{__sed} -i 's/\r//' interfaces/swig/python/*.py \ samples/python/*.py %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \ @@ -111,6 +113,9 @@ %changelog +* Mon Mar 6 2006 Simon Perreault - 0.9.7-5 +- SSE2 support on x86_64. + * Mon Mar 6 2006 Simon Perreault - 0.9.7-4 - Rebuild From fedora-extras-commits at redhat.com Tue Mar 7 06:27:04 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 7 Mar 2006 01:27:04 -0500 Subject: rpms/seahorse/devel seahorse.spec,1.17,1.18 Message-ID: <200603070627.k276RfYU032402@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32385 Modified Files: seahorse.spec Log Message: for bug 184124 Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- seahorse.spec 24 Feb 2006 04:02:12 -0000 1.17 +++ seahorse.spec 7 Mar 2006 06:27:03 -0000 1.18 @@ -1,6 +1,6 @@ Name: seahorse Version: 0.8 -Release: 3%{dist} +Release: 4%{dist} Summary: GNOME2 interface for gnupg Group: User Interface/Desktops License: GPL @@ -20,6 +20,7 @@ BuildRequires: scrollkeeper BuildRequires: nautilus-devel BuildRequires: libsoup-devel +BuildRequires: openldap-devel Requires(post): desktop-file-utils Requires(post): GConf2 Requires(post): scrollkeeper @@ -122,6 +123,9 @@ %changelog +* Tue Mar 7 2006 Seth Vidal +- added openldap-devel buildreq to hopefully close bug # 184124 + * Thu Feb 23 2006 Seth Vidal - Patch from John Thacker for rh bug #182694 From fedora-extras-commits at redhat.com Tue Mar 7 07:13:59 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 7 Mar 2006 02:13:59 -0500 Subject: rpms/qgit/FC-4 qgit.spec,1.1,1.2 Message-ID: <200603070714.k277EVcn002030@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2010 Modified Files: qgit.spec Log Message: - changed dependency from git to git-core - fixed year in the changelog Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-4/qgit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qgit.spec 3 Mar 2006 21:34:00 -0000 1.1 +++ qgit.spec 7 Mar 2006 07:13:52 -0000 1.2 @@ -1,6 +1,6 @@ Name: qgit Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, qt-devel -Requires: git >= 1.2.0 +Requires: git-core >= 1.2.0 %description With qgit you are able to browse revisions history, view patch content @@ -46,16 +46,19 @@ %changelog -* Sun Feb 19 2005 Dan Horak 1.1-1 +* Tue Mar 7 2006 Dan Horak 1.1-2 +- change requires from git to git-core only + +* Sun Feb 19 2006 Dan Horak 1.1-1 - updated to upstream version 1.1 - fixed download URL for Source0 from sourceforge.net - requires git >= 1.2.0 -* Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.3 +* Sat Feb 11 2006 Dan Horak 1.1-0.1.rc3.3 - added docs -* Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.2 +* Sat Feb 11 2006 Dan Horak 1.1-0.1.rc3.2 - added desktop file -* Wed Feb 8 2005 Dan Horak 1.1-0.1.rc3.1 +* Wed Feb 8 2006 Dan Horak 1.1-0.1.rc3.1 - first version From fedora-extras-commits at redhat.com Tue Mar 7 07:17:33 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 7 Mar 2006 02:17:33 -0500 Subject: rpms/qgit/devel qgit.spec,1.1,1.2 Message-ID: <200603070718.k277I5jD002129@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2102 Modified Files: qgit.spec Log Message: - changed dependency from git to git-core - fixed year in the changelog Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qgit.spec 3 Mar 2006 21:34:00 -0000 1.1 +++ qgit.spec 7 Mar 2006 07:17:33 -0000 1.2 @@ -1,6 +1,6 @@ Name: qgit Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, qt-devel -Requires: git >= 1.2.0 +Requires: git-core >= 1.2.0 %description With qgit you are able to browse revisions history, view patch content @@ -46,16 +46,19 @@ %changelog -* Sun Feb 19 2005 Dan Horak 1.1-1 +* Tue Mar 7 2006 Dan Horak 1.1-2 +- change requires from git to git-core only + +* Sun Feb 19 2006 Dan Horak 1.1-1 - updated to upstream version 1.1 - fixed download URL for Source0 from sourceforge.net - requires git >= 1.2.0 -* Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.3 +* Sat Feb 11 2006 Dan Horak 1.1-0.1.rc3.3 - added docs -* Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.2 +* Sat Feb 11 2006 Dan Horak 1.1-0.1.rc3.2 - added desktop file -* Wed Feb 8 2005 Dan Horak 1.1-0.1.rc3.1 +* Wed Feb 8 2006 Dan Horak 1.1-0.1.rc3.1 - first version From fedora-extras-commits at redhat.com Tue Mar 7 08:54:43 2006 From: fedora-extras-commits at redhat.com (Alexander Larsson (alexl)) Date: Tue, 7 Mar 2006 03:54:43 -0500 Subject: rpms/sabayon/devel sabayon.spec,1.19,1.20 Message-ID: <200603070855.k278tFdk004306@cvs-int.fedora.redhat.com> Author: alexl Update of /cvs/extras/rpms/sabayon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4289 Modified Files: sabayon.spec Log Message: * Tue Mar 7 2006 Alexander Larsson - 2.12.3-2 - Add libXt-devel buildreq Index: sabayon.spec =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sabayon.spec 6 Mar 2006 16:40:53 -0000 1.19 +++ sabayon.spec 7 Mar 2006 08:54:43 -0000 1.20 @@ -14,7 +14,7 @@ Name: sabayon Version: 2.12.3 -Release: 1 +Release: 2 Summary: Tool to maintain user profiles in a GNOME desktop Group: Applications/System @@ -37,6 +37,7 @@ BuildRequires: pygtk2-devel BuildRequires: gtk2-devel BuildRequires: libX11-devel +BuildRequires: libXt-devel BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: usermode @@ -186,6 +187,9 @@ %{python_sitelib}/%{name}/lockdown %changelog +* Tue Mar 7 2006 Alexander Larsson - 2.12.3-2 +- Add libXt-devel buildreq + * Mon Mar 6 2006 Alexander Larsson - 2.12.3-1 - update to 2.12.3 - Fix Xnest dependency with modular X From fedora-extras-commits at redhat.com Tue Mar 7 09:38:09 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 7 Mar 2006 04:38:09 -0500 Subject: rpms/Canna/devel Canna.spec,1.3,1.4 Message-ID: <200603070938.k279cgjg006892@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6868 Modified Files: Canna.spec Log Message: requires versioned imake. Index: Canna.spec =================================================================== RCS file: /cvs/extras/rpms/Canna/devel/Canna.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Canna.spec 25 Jan 2006 04:59:56 -0000 1.3 +++ Canna.spec 7 Mar 2006 09:38:09 -0000 1.4 @@ -41,7 +41,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Prereq: /sbin/chkconfig, /etc/services, /bin/grep, /bin/cp -BuildRequires: imake cpp gawk +BuildRequires: cpp gawk +BuildRequires: imake >= 1.0.1-3 Obsoletes: tamago %description From fedora-extras-commits at redhat.com Tue Mar 7 10:15:14 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 7 Mar 2006 05:15:14 -0500 Subject: fedora-security/audit fc4,1.166,1.167 fc5,1.73,1.74 Message-ID: <200603071015.k27AFE9j008913@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8889 Modified Files: fc4 fc5 Log Message: Note helixplayer/realplayer issues which are unconfirmed and believed to be not vulnerabilities Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- fc4 5 Mar 2006 23:08:54 -0000 1.166 +++ fc4 7 Mar 2006 10:15:00 -0000 1.167 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060304 -Up to date FC4 as of 20060304 +Up to date CVE as of CVE email 20060306 +Up to date FC4 as of 20060306 ** are items that need attention +CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) @@ -94,8 +95,8 @@ CVE-2005-4153 VULNERABLE (mailman) CVE-2005-4134 backport (mozilla) [since FEDORA-2006-075] CVE-2005-4134 backport (firefox) [since FEDORA-2006-076] -CVE-2005-4130 ** (HelixPlayer) no information available -CVE-2005-4126 ** (HelixPlayer) no information available +CVE-2005-4130 ignore (HelixPlayer) not verified +CVE-2005-4126 ignore (HelixPlayer) not verified CVE-2005-4077 backport (curl) [since FEDORA-2005-1137] CVE-2005-3964 VULNERABLE (openmotif) bz#174815 CVE-2005-3962 backport (perl) [since FEDORA-2005-1144] @@ -156,7 +157,7 @@ CVE-2005-3402 ignore (thunderbird) mozilla say by design CVE-2005-3392 ignore (php) safe mode isn't safe CVE-2005-3391 ignore (php) safe mode isn't safe -CVE-2005-3390 backport (php) [since FEDORA-2005-1062] +CVE-2005-3390 backport (php, fixed 5.1.2 at least) [since FEDORA-2005-1062] CVE-2005-3389 backport (php) [since FEDORA-2005-1062] CVE-2005-3388 backport (php) [since FEDORA-2005-1062] CVE-2005-3359 version (kernel, fixed 2.6.14) [since FEDORA-2005-1067] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- fc5 5 Mar 2006 23:08:54 -0000 1.73 +++ fc5 7 Mar 2006 10:15:00 -0000 1.74 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060304 +Up to date CVE as of CVE email 20060306 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -17,6 +17,7 @@ ** are items that need attention +CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) CVE-2006-0884 ** thunderbird CVE-2006-0836 VULNERABLE (thunderbird) @@ -105,8 +106,8 @@ CVE-2005-4153 backport (mailman) mailman-2.1.5-date_overflows.patch CVE-2005-4134 backport (mozilla) mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html -CVE-2005-4130 ** (HelixPlayer) no information yet available -CVE-2005-4126 ** (HelixPlayer) no information yet available +CVE-2005-4130 ignore (HelixPlayer) not verified +CVE-2005-4126 ignore (HelixPlayer) not verified CVE-2005-4077 version (curl, fixed 7.15.1) CVE-2005-3964 backport (openmotif) CVE-2005-3962 version (perl, fixed 5.8.8) From fedora-extras-commits at redhat.com Tue Mar 7 10:34:02 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 7 Mar 2006 05:34:02 -0500 Subject: rpms/proftpd/devel .cvsignore, 1.6, 1.7 proftpd.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200603071034.k27AYYaC009014@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8988 Modified Files: .cvsignore proftpd.spec sources Log Message: Update to 1.3.0rc4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Feb 2006 18:30:16 -0000 1.6 +++ .cvsignore 7 Mar 2006 10:34:01 -0000 1.7 @@ -1 +1 @@ -proftpd-1.3.0rc3.tar.bz2 +proftpd-1.3.0rc4.tar.bz2 Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- proftpd.spec 6 Mar 2006 15:13:37 -0000 1.12 +++ proftpd.spec 7 Mar 2006 10:34:01 -0000 1.13 @@ -1,11 +1,11 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.3.0 -Release: 0.2.rc3%{?dist} +Release: 0.2.rc4%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ -Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}rc3.tar.bz2 +Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}rc4.tar.bz2 Source1: proftpd.conf Source2: proftpd.init Source3: proftpd-xinetd @@ -42,7 +42,7 @@ %prep -%setup -n %{name}-%{version}rc3 +%setup -n %{name}-%{version}rc4 %build @@ -145,6 +145,9 @@ %changelog +* Tue Mar 7 2006 Matthias Saou 1.3.0-0.2.rc4 +- Update to 1.3.0rc4 (bugfix release). + * Mon Mar 6 2006 Matthias Saou 1.3.0-0.2.rc3 - FC5 rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Feb 2006 18:30:16 -0000 1.6 +++ sources 7 Mar 2006 10:34:01 -0000 1.7 @@ -1 +1 @@ -050c3e2caec0d930f8a331e7b3ec0931 proftpd-1.3.0rc3.tar.bz2 +175da3e672d9f441b852259c7baee21e proftpd-1.3.0rc4.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 13:03:57 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 7 Mar 2006 08:03:57 -0500 Subject: rpms/kinput2/devel kinput2.spec,1.3,1.4 Message-ID: <200603071304.k27D4UvR015119@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kinput2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15102 Modified Files: kinput2.spec Log Message: * Tue Mar 7 2006 Akira TAGOH - v3.1-27 - moved out from /usr/X11R6. (#170934) Index: kinput2.spec =================================================================== RCS file: /cvs/extras/rpms/kinput2/devel/kinput2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kinput2.spec 12 Jul 2005 00:53:31 -0000 1.3 +++ kinput2.spec 7 Mar 2006 13:03:56 -0000 1.4 @@ -25,10 +25,11 @@ Name: kinput2 Version: v3.1 -Release: 26%{?dist} +Release: 27%{?dist} License: Distributable -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: xorg-x11-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel +BuildRequires: imake >= 1.0.1-3 %if %{is_canna_used} BuildRequires: Canna-devel >= 3.7p1-6 %endif @@ -130,38 +131,30 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6 -if [ -d %{_prefix}/X11R6.1 ]; then - ln -sf $RPM_BUILD_ROOT%{_prefix}/X11R6 $RPM_BUILD_ROOT%{_prefix}/X11R6.1 -fi -if [ -d %{_prefix}/X11R6.3 ]; then - ln -sf $RPM_BUILD_ROOT%{_prefix}/X11R6 $RPM_BUILD_ROOT%{_prefix}/X11R6.3 -fi -mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/bin -mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1 +mkdir -p $RPM_BUILD_ROOT%{_bindir} %if %{build_with_wnn4} -install -c -m 0755 kinput2.wnn4 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -c -m 0755 kinput2.wnn4 $RPM_BUILD_ROOT%{_bindir} %endif %if %{build_with_wnn6} -install -c -m 0755 kinput2.wnn6 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -c -m 0755 kinput2.wnn6 $RPM_BUILD_ROOT%{_bindir} %endif %if %{build_with_canna} -install -c -m 0755 kinput2.canna $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -c -m 0755 kinput2.canna $RPM_BUILD_ROOT%{_bindir} %endif %if %{build_with_canna_wnn4} -install -c -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -c -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_bindir} %endif %if %{build_with_canna_wnn6} -install -c -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -c -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_bindir} %endif -mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults -install -c -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults/Kinput2 +mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults +install -c -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2 -mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/ccdef -install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/ccdef -install -c -m 0444 ccdef/rule.* $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/ccdef +mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/ccdef +install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT%{_libdir}/X11/ccdef +install -c -m 0444 ccdef/rule.* $RPM_BUILD_ROOT%{_libdir}/X11/ccdef make install.man DESTDIR=$RPM_BUILD_ROOT @@ -177,19 +170,19 @@ %post %if %([ '%{build_with_wnn4}' -eq '1' -a '%{build_with_wnn6}' -eq '0' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.wnn4 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.wnn4 %{_bindir}/kinput2 %endif %if %([ '%{build_with_wnn6}' -eq '1' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.wnn6 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.wnn6 %{_bindir}/kinput2 %endif %if %([ '%{build_with_canna}' -eq '1' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.canna %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna %{_bindir}/kinput2 %endif %if %([ '%{build_with_canna_wnn4}' -eq '1' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.canna-wnn4 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna-wnn4 %{_bindir}/kinput2 %endif %if %{build_with_canna_wnn6} -ln -sf kinput2.canna-wnn6 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna-wnn6 %{_bindir}/kinput2 %endif %if %{is_canna_used} %{inst_alternatives_canna} @@ -200,7 +193,7 @@ %preun if [ "$1" = 0 ]; then - rm -rf %{_prefix}/X11R6/bin/kinput2 + rm -rf %{_bindir}/kinput2 %if %{is_canna_used} %{uninst_alternatives_canna} %endif @@ -211,19 +204,19 @@ %triggerpostun -- kinput2-canna-wnn6 %if %([ '%{build_with_wnn4}' -eq '1' -a '%{build_with_wnn6}' -eq '0' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.wnn4 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.wnn4 %{_bindir}/kinput2 %endif %if %([ '%{build_with_wnn6}' -eq '1' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.wnn6 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.wnn6 %{_bindir}/kinput2 %endif %if %([ '%{build_with_canna}' -eq '1' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.canna %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna %{_bindir}/kinput2 %endif %if %([ '%{build_with_canna_wnn4}' -eq '1' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.canna-wnn4 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna-wnn4 %{_bindir}/kinput2 %endif %if %{build_with_canna_wnn6} -ln -sf kinput2.canna-wnn6 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna-wnn6 %{_bindir}/kinput2 %endif %if %{is_canna_used} %{inst_alternatives_canna} @@ -235,19 +228,22 @@ %files %defattr(-, root, root) %doc Copyright NEWS README doc -%config %{_prefix}/X11R6/lib/X11/app-defaults/Kinput2 +%config %{_datadir}/X11/app-defaults/Kinput2 %if %{is_wnn_used} -%{_prefix}/X11R6/lib/X11/ccdef +%{_libdir}/X11/ccdef %endif -%{_prefix}/X11R6/bin/kinput2* -%{_prefix}/X11R6/man/man1/kinput2.1x* +%{_bindir}/kinput2* +%{_mandir}/man1/kinput2.1x* %{_sysconfdir}/X11/xinit/xinput.d %changelog -* Tue Jul 12 2005 Akira TAGOH - v3.1-26.fc5 +* Tue Mar 7 2006 Akira TAGOH - v3.1-27 +- moved out from /usr/X11R6. (#170934) + +* Tue Jul 12 2005 Akira TAGOH - v3.1-26 - use proper xinput script for kinput2-wnn. -* Thu Jun 30 2005 Akira TAGOH - v3.1-25.fc5 +* Thu Jun 30 2005 Akira TAGOH - v3.1-25 - Import into Extras. * Tue Feb 8 2005 Akira TAGOH - v3.1-24 From fedora-extras-commits at redhat.com Tue Mar 7 13:22:54 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 7 Mar 2006 08:22:54 -0500 Subject: rpms/gtkwave/devel gtkwave.spec, 1.8, 1.9 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 Message-ID: <200603071323.k27DNR4U015316@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15283 Modified Files: gtkwave.spec sources .cvsignore Log Message: update to 1.3.86 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtkwave.spec 27 Feb 2006 14:28:02 -0000 1.8 +++ gtkwave.spec 7 Mar 2006 13:22:54 -0000 1.9 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.85 +Version: 1.3.86 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -80,6 +80,9 @@ %{_mandir}/man1/vztminer.1* %changelog +* Tue Mar 7 2006 Paul Howarth 1.3.86-1 +- update to 1.3.86 + * Mon Feb 27 2006 Paul Howarth 1.3.85-1 - update to 1.3.85 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 14:28:02 -0000 1.8 +++ sources 7 Mar 2006 13:22:54 -0000 1.9 @@ -1 +1 @@ -cbc84d9ea8a0bf56cc935bf96d279c71 gtkwave-1.3.85.tgz +8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 14:28:02 -0000 1.8 +++ .cvsignore 7 Mar 2006 13:22:54 -0000 1.9 @@ -1 +1 @@ -gtkwave-1.3.85.tgz +gtkwave-1.3.86.tgz From fedora-extras-commits at redhat.com Tue Mar 7 13:26:07 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 7 Mar 2006 08:26:07 -0500 Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.7, 1.8 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 Message-ID: <200603071326.k27DQeNU015426@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtkwave.spec 27 Feb 2006 14:33:14 -0000 1.7 +++ gtkwave.spec 7 Mar 2006 13:26:07 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.85 +Version: 1.3.86 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -80,6 +80,9 @@ %{_mandir}/man1/vztminer.1* %changelog +* Tue Mar 7 2006 Paul Howarth 1.3.86-1 +- update to 1.3.86 + * Mon Feb 27 2006 Paul Howarth 1.3.85-1 - update to 1.3.85 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 14:33:14 -0000 1.8 +++ sources 7 Mar 2006 13:26:07 -0000 1.9 @@ -1 +1 @@ -cbc84d9ea8a0bf56cc935bf96d279c71 gtkwave-1.3.85.tgz +8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 14:33:14 -0000 1.8 +++ .cvsignore 7 Mar 2006 13:26:07 -0000 1.9 @@ -1 +1 @@ -gtkwave-1.3.85.tgz +gtkwave-1.3.86.tgz From fedora-extras-commits at redhat.com Tue Mar 7 13:28:21 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 7 Mar 2006 08:28:21 -0500 Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.7, 1.8 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 Message-ID: <200603071328.k27DSrIt015528@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15507 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtkwave.spec 27 Feb 2006 14:35:40 -0000 1.7 +++ gtkwave.spec 7 Mar 2006 13:28:21 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.85 +Version: 1.3.86 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -80,6 +80,9 @@ %{_mandir}/man1/vztminer.1* %changelog +* Tue Mar 7 2006 Paul Howarth 1.3.86-1 +- update to 1.3.86 + * Mon Feb 27 2006 Paul Howarth 1.3.85-1 - update to 1.3.85 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 14:35:40 -0000 1.8 +++ sources 7 Mar 2006 13:28:21 -0000 1.9 @@ -1 +1 @@ -cbc84d9ea8a0bf56cc935bf96d279c71 gtkwave-1.3.85.tgz +8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 14:35:40 -0000 1.8 +++ .cvsignore 7 Mar 2006 13:28:21 -0000 1.9 @@ -1 +1 @@ -gtkwave-1.3.85.tgz +gtkwave-1.3.86.tgz From fedora-extras-commits at redhat.com Tue Mar 7 14:25:54 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 7 Mar 2006 09:25:54 -0500 Subject: rpms/gnomebaker/devel gnomebaker.spec,1.3,1.4 Message-ID: <200603071426.k27EQQGJ017794@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnomebaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17774 Modified Files: gnomebaker.spec Log Message: * Tue Mar 7 2006 Brian Pepple - 0.5.1-4 - Rebuild for FC5. - Add requires for gstreamer08-plugins. Index: gnomebaker.spec =================================================================== RCS file: /cvs/extras/rpms/gnomebaker/devel/gnomebaker.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnomebaker.spec 11 Feb 2006 15:04:27 -0000 1.3 +++ gnomebaker.spec 7 Mar 2006 14:25:53 -0000 1.4 @@ -1,6 +1,6 @@ Name: gnomebaker Version: 0.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Gnome CD/DVD burner Group: Applications/Multimedia @@ -20,6 +20,7 @@ Requires: cdrecord Requires: mkisofs Requires: cdda2wav +Requires: gstreamer08-plugins Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -76,6 +77,10 @@ %changelog +* Tue Mar 7 2006 Brian Pepple - 0.5.1-4 +- Rebuild for FC5. +- Add requires for gstreamer08-plugins. + * Sat Feb 11 2006 Brian Pepple - 0.5.1-3 - Rebuild. From fedora-extras-commits at redhat.com Tue Mar 7 14:44:49 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Tue, 7 Mar 2006 09:44:49 -0500 Subject: owners owners.list,1.718,1.719 Message-ID: <200603071445.k27EjLqb018075@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18056 Modified Files: owners.list Log Message: Remove swish-e and initng which are not yet approved. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.718 retrieving revision 1.719 diff -u -r1.718 -r1.719 --- owners.list 6 Mar 2006 21:09:07 -0000 1.718 +++ owners.list 7 Mar 2006 14:44:49 -0000 1.719 @@ -449,7 +449,6 @@ Fedora Extras|iiimf-le-simplehangul|Romanized Korean Hangul language engine for IIIMF|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| -Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org| Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org| @@ -1291,7 +1290,6 @@ 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|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|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| -Fedora Extras|swish-e|Simple Web Indexing System for Humans - Enhanced|bkyoung at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|syck|YAML for C, Python, and PHP|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Mar 7 16:11:19 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 11:11:19 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-pythondir.patch, NONE, 1.1 opencv.spec, 1.4, 1.5 Message-ID: <200603071611.k27GBpTX022170@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22150 Modified Files: opencv.spec Added Files: opencv-0.9.7-pythondir.patch Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-6 - Fixed Python bindings location on x86_64. opencv-0.9.7-pythondir.patch: --- NEW FILE opencv-0.9.7-pythondir.patch --- diff -urp opencv-0.9.7.orig/interfaces/swig/python/Makefile.am opencv-0.9.7/interfaces/swig/python/Makefile.am --- opencv-0.9.7.orig/interfaces/swig/python/Makefile.am 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/python/Makefile.am 2006-03-07 09:42:55.000000000 -0500 @@ -18,7 +18,7 @@ AM_CPPFLAGS = \ if BUILD_PYTHON_WRAPPERS - pkgpython_LTLIBRARIES = _cv.la _highgui.la + pkgpyexec_LTLIBRARIES = _cv.la _highgui.la pkgpython_PYTHON = \ __init__.py \ Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- opencv.spec 7 Mar 2006 04:07:32 -0000 1.4 +++ opencv.spec 7 Mar 2006 16:11:17 -0000 1.5 @@ -1,8 +1,11 @@ %define with_ffmpeg 0 +%define pythondir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') +%define pyexecdir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)') + Name: opencv Version: 0.9.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -10,7 +13,8 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile -Patch0: opencv-0.9.7-intrinsics-simple.patch +Patch0: opencv-0.9.7-intrinsics.patch +Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel @@ -41,7 +45,7 @@ Summary: Python bindings for apps which use OpenCV Group: Development/Libraries Requires: opencv = %{version}-%{release} -Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`) +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description python This package contains Python bindings for the OpenCV library. @@ -49,7 +53,8 @@ %prep %setup -q -%patch -p1 -b .intrinsics +%patch0 -p1 -b .intrinsics +%patch1 -p1 -b .pythondir %{__sed} -i 's/\r//' interfaces/swig/python/*.py \ samples/python/*.py %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \ @@ -57,15 +62,19 @@ %build -%configure --disable-static --enable-python --with-apps +%configure --enable-maintainer-mode --disable-static --enable-python --with-apps make %{?_smp_mflags} +%check +make check + + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ - $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/opencv/*.la \ + $RPM_BUILD_ROOT%{pyexecdir}/opencv/*.la \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/build_all.sh \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.dsp \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.vcproj \ @@ -108,11 +117,18 @@ %files python -%{_libdir}/python*/site-packages/opencv +%dir %{pythondir}/opencv +%{pythondir}/opencv/*.py +%{pythondir}/opencv/*.pyc +%ghost %{pythondir}/opencv/*.pyo +%{pyexecdir}/opencv %doc %{_datadir}/opencv/samples/python %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-6 +- Fixed Python bindings location on x86_64. + * Mon Mar 6 2006 Simon Perreault - 0.9.7-5 - SSE2 support on x86_64. From fedora-extras-commits at redhat.com Tue Mar 7 16:53:42 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 11:53:42 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.1, 1.2 opencv.spec, 1.5, 1.6 Message-ID: <200603071654.k27GsFdl022419@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22397 Modified Files: opencv-0.9.7-intrinsics.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-7 - Fixed intrinsics patch so that it works. opencv-0.9.7-intrinsics.patch: Index: opencv-0.9.7-intrinsics.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opencv-0.9.7-intrinsics.patch 7 Mar 2006 04:07:32 -0000 1.1 +++ opencv-0.9.7-intrinsics.patch 7 Mar 2006 16:53:42 -0000 1.2 @@ -1,6 +1,6 @@ diff -urp opencv-0.9.7.orig/configure.in opencv-0.9.7/configure.in ---- opencv-0.9.7.orig/configure.in 2006-03-06 22:10:57.000000000 -0500 -+++ opencv-0.9.7/configure.in 2006-03-06 22:25:29.000000000 -0500 +--- opencv-0.9.7.orig/configure.in 2005-07-25 08:26:34.000000000 -0400 ++++ opencv-0.9.7/configure.in 2006-03-07 11:37:37.287015530 -0500 @@ -281,6 +281,11 @@ dnl # #AC_SUBST(CXXOPENMP) @@ -13,9 +13,37 @@ AC_SUBST(DEBUG) AC_CONFIG_FILES([Makefile +diff -urp opencv-0.9.7.orig/cv/src/_cv.h opencv-0.9.7/cv/src/_cv.h +--- opencv-0.9.7.orig/cv/src/_cv.h 2005-06-10 06:09:22.000000000 -0400 ++++ opencv-0.9.7/cv/src/_cv.h 2006-03-07 11:40:07.946072812 -0500 +@@ -42,6 +42,10 @@ + #ifndef _CV_INTERNAL_H_ + #define _CV_INTERNAL_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #if defined _MSC_VER && _MSC_VER >= 1200 + /* disable warnings related to inline functions */ + #pragma warning( disable: 4711 4710 4514 ) +diff -urp opencv-0.9.7.orig/cvaux/src/_cvaux.h opencv-0.9.7/cvaux/src/_cvaux.h +--- opencv-0.9.7.orig/cvaux/src/_cvaux.h 2004-08-08 14:52:26.000000000 -0400 ++++ opencv-0.9.7/cvaux/src/_cvaux.h 2006-03-07 11:40:44.758355511 -0500 +@@ -41,6 +41,10 @@ + #ifndef __CVAUX_H__ + #define __CVAUX_H__ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #if _MSC_VER >= 1200 + #pragma warning( disable: 4710 4711 4514 ) /* function AAA selected for automatic inline expansion */ + #endif diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h ---- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:10:58.000000000 -0500 -+++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-06 22:34:04.000000000 -0500 +--- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2005-07-20 06:53:14.000000000 -0400 ++++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-07 11:37:37.288015510 -0500 @@ -48,7 +48,8 @@ #include #include @@ -26,3 +54,88 @@ #include #endif +diff -urp opencv-0.9.7.orig/cxcore/src/_cxcore.h opencv-0.9.7/cxcore/src/_cxcore.h +--- opencv-0.9.7.orig/cxcore/src/_cxcore.h 2005-06-10 06:46:49.000000000 -0400 ++++ opencv-0.9.7/cxcore/src/_cxcore.h 2006-03-07 11:39:18.422040124 -0500 +@@ -42,6 +42,10 @@ + #ifndef _CXCORE_INTERNAL_H_ + #define _CXCORE_INTERNAL_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #if defined _MSC_VER && _MSC_VER >= 1200 + /* disable warnings related to inline functions */ + #pragma warning( disable: 4711 4710 4514 ) +diff -urp opencv-0.9.7.orig/otherlibs/highgui/_highgui.h opencv-0.9.7/otherlibs/highgui/_highgui.h +--- opencv-0.9.7.orig/otherlibs/highgui/_highgui.h 2005-02-01 06:33:24.000000000 -0500 ++++ opencv-0.9.7/otherlibs/highgui/_highgui.h 2006-03-07 11:42:21.432472106 -0500 +@@ -42,6 +42,12 @@ + #ifndef __HIGHGUI_H_ + #define __HIGHGUI_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#elif defined WIN32 ++void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ); ++#endif ++ + #include + #include + #include +@@ -52,12 +58,6 @@ + #include "highgui.h" + #include "cxmisc.h" + +-#ifndef WIN32 +-#include "cvconfig.h" +-#else +-void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ); +-#endif +- + /* Errors */ + #define HG_OK 0 /* Don't bet on it! */ + #define HG_BADNAME -1 /* Bad window or file name */ +diff -urp opencv-0.9.7.orig/tests/cv/src/cvtest.h opencv-0.9.7/tests/cv/src/cvtest.h +--- opencv-0.9.7.orig/tests/cv/src/cvtest.h 2005-06-20 11:12:24.000000000 -0400 ++++ opencv-0.9.7/tests/cv/src/cvtest.h 2006-03-07 11:44:30.908949495 -0500 +@@ -42,6 +42,10 @@ + #ifndef _CVTEST_H_ + #define _CVTEST_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #ifdef WIN32 + #include + #endif +diff -urp opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h opencv-0.9.7/tests/cxcore/src/cxcoretest.h +--- opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h 2005-06-20 11:13:30.000000000 -0400 ++++ opencv-0.9.7/tests/cxcore/src/cxcoretest.h 2006-03-07 11:43:55.992629792 -0500 +@@ -42,6 +42,10 @@ + #ifndef _CXCORE_TEST_H_ + #define _CXCORE_TEST_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #if defined WIN32 || defined WIN64 + #include + #endif +diff -urp opencv-0.9.7.orig/tests/cxts/_cxts.h opencv-0.9.7/tests/cxts/_cxts.h +--- opencv-0.9.7.orig/tests/cxts/_cxts.h 2005-06-02 10:59:49.000000000 -0400 ++++ opencv-0.9.7/tests/cxts/_cxts.h 2006-03-07 11:43:03.487652756 -0500 +@@ -42,6 +42,10 @@ + #ifndef __CXTS_INTERNAL_H__ + #define __CXTS_INTERNAL_H__ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #if (defined WIN32 || defined WIN64) && (_MSC_VER >= 1200 || defined _ICL) + #pragma warning( disable: 4514 ) + #endif Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- opencv.spec 7 Mar 2006 16:11:17 -0000 1.5 +++ opencv.spec 7 Mar 2006 16:53:42 -0000 1.6 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -126,6 +126,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-7 +- Fixed intrinsics patch so that it works. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-6 - Fixed Python bindings location on x86_64. From fedora-extras-commits at redhat.com Tue Mar 7 17:09:57 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 12:09:57 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.2, 1.3 opencv.spec, 1.6, 1.7 Message-ID: <200603071710.k27HATRF024413@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24385 Modified Files: opencv-0.9.7-intrinsics.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-8 - Again fixed intrinsics patch so that Python modules build on x86_64. opencv-0.9.7-intrinsics.patch: Index: opencv-0.9.7-intrinsics.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- opencv-0.9.7-intrinsics.patch 7 Mar 2006 16:53:42 -0000 1.2 +++ opencv-0.9.7-intrinsics.patch 7 Mar 2006 17:09:57 -0000 1.3 @@ -1,6 +1,6 @@ diff -urp opencv-0.9.7.orig/configure.in opencv-0.9.7/configure.in ---- opencv-0.9.7.orig/configure.in 2005-07-25 08:26:34.000000000 -0400 -+++ opencv-0.9.7/configure.in 2006-03-07 11:37:37.287015530 -0500 +--- opencv-0.9.7.orig/configure.in 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/configure.in 2006-03-07 12:05:24.000000000 -0500 @@ -281,6 +281,11 @@ dnl # #AC_SUBST(CXXOPENMP) @@ -14,8 +14,8 @@ AC_CONFIG_FILES([Makefile diff -urp opencv-0.9.7.orig/cv/src/_cv.h opencv-0.9.7/cv/src/_cv.h ---- opencv-0.9.7.orig/cv/src/_cv.h 2005-06-10 06:09:22.000000000 -0400 -+++ opencv-0.9.7/cv/src/_cv.h 2006-03-07 11:40:07.946072812 -0500 +--- opencv-0.9.7.orig/cv/src/_cv.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/cv/src/_cv.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CV_INTERNAL_H_ #define _CV_INTERNAL_H_ @@ -28,8 +28,8 @@ /* disable warnings related to inline functions */ #pragma warning( disable: 4711 4710 4514 ) diff -urp opencv-0.9.7.orig/cvaux/src/_cvaux.h opencv-0.9.7/cvaux/src/_cvaux.h ---- opencv-0.9.7.orig/cvaux/src/_cvaux.h 2004-08-08 14:52:26.000000000 -0400 -+++ opencv-0.9.7/cvaux/src/_cvaux.h 2006-03-07 11:40:44.758355511 -0500 +--- opencv-0.9.7.orig/cvaux/src/_cvaux.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/cvaux/src/_cvaux.h 2006-03-07 12:05:24.000000000 -0500 @@ -41,6 +41,10 @@ #ifndef __CVAUX_H__ #define __CVAUX_H__ @@ -42,8 +42,8 @@ #pragma warning( disable: 4710 4711 4514 ) /* function AAA selected for automatic inline expansion */ #endif diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h ---- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2005-07-20 06:53:14.000000000 -0400 -+++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-07 11:37:37.288015510 -0500 +--- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-07 12:05:24.000000000 -0500 @@ -48,7 +48,8 @@ #include #include @@ -55,8 +55,8 @@ #endif diff -urp opencv-0.9.7.orig/cxcore/src/_cxcore.h opencv-0.9.7/cxcore/src/_cxcore.h ---- opencv-0.9.7.orig/cxcore/src/_cxcore.h 2005-06-10 06:46:49.000000000 -0400 -+++ opencv-0.9.7/cxcore/src/_cxcore.h 2006-03-07 11:39:18.422040124 -0500 +--- opencv-0.9.7.orig/cxcore/src/_cxcore.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/cxcore/src/_cxcore.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CXCORE_INTERNAL_H_ #define _CXCORE_INTERNAL_H_ @@ -68,9 +68,35 @@ #if defined _MSC_VER && _MSC_VER >= 1200 /* disable warnings related to inline functions */ #pragma warning( disable: 4711 4710 4514 ) +diff -urp opencv-0.9.7.orig/interfaces/swig/python/error.h opencv-0.9.7/interfaces/swig/python/error.h +--- opencv-0.9.7.orig/interfaces/swig/python/error.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/interfaces/swig/python/error.h 2006-03-07 12:06:40.000000000 -0500 +@@ -44,6 +44,9 @@ + // Mark Asbach + // Institute of Communications Engineering, RWTH Aachen University + ++#ifdef HAVE_CONFIG_H ++#include ++#endif + + #include "cxcore.h" + +diff -urp opencv-0.9.7.orig/interfaces/swig/python/pycvseq.h opencv-0.9.7/interfaces/swig/python/pycvseq.h +--- opencv-0.9.7.orig/interfaces/swig/python/pycvseq.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/interfaces/swig/python/pycvseq.h 2006-03-07 12:07:13.000000000 -0500 +@@ -39,6 +39,9 @@ + // + //M*/ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif + + #include "cxcore.h" + diff -urp opencv-0.9.7.orig/otherlibs/highgui/_highgui.h opencv-0.9.7/otherlibs/highgui/_highgui.h ---- opencv-0.9.7.orig/otherlibs/highgui/_highgui.h 2005-02-01 06:33:24.000000000 -0500 -+++ opencv-0.9.7/otherlibs/highgui/_highgui.h 2006-03-07 11:42:21.432472106 -0500 +--- opencv-0.9.7.orig/otherlibs/highgui/_highgui.h 2006-03-06 22:58:42.000000000 -0500 ++++ opencv-0.9.7/otherlibs/highgui/_highgui.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,12 @@ #ifndef __HIGHGUI_H_ #define __HIGHGUI_H_ @@ -98,8 +124,8 @@ #define HG_OK 0 /* Don't bet on it! */ #define HG_BADNAME -1 /* Bad window or file name */ diff -urp opencv-0.9.7.orig/tests/cv/src/cvtest.h opencv-0.9.7/tests/cv/src/cvtest.h ---- opencv-0.9.7.orig/tests/cv/src/cvtest.h 2005-06-20 11:12:24.000000000 -0400 -+++ opencv-0.9.7/tests/cv/src/cvtest.h 2006-03-07 11:44:30.908949495 -0500 +--- opencv-0.9.7.orig/tests/cv/src/cvtest.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/tests/cv/src/cvtest.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CVTEST_H_ #define _CVTEST_H_ @@ -112,8 +138,8 @@ #include #endif diff -urp opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h opencv-0.9.7/tests/cxcore/src/cxcoretest.h ---- opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h 2005-06-20 11:13:30.000000000 -0400 -+++ opencv-0.9.7/tests/cxcore/src/cxcoretest.h 2006-03-07 11:43:55.992629792 -0500 +--- opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/tests/cxcore/src/cxcoretest.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CXCORE_TEST_H_ #define _CXCORE_TEST_H_ @@ -126,8 +152,8 @@ #include #endif diff -urp opencv-0.9.7.orig/tests/cxts/_cxts.h opencv-0.9.7/tests/cxts/_cxts.h ---- opencv-0.9.7.orig/tests/cxts/_cxts.h 2005-06-02 10:59:49.000000000 -0400 -+++ opencv-0.9.7/tests/cxts/_cxts.h 2006-03-07 11:43:03.487652756 -0500 +--- opencv-0.9.7.orig/tests/cxts/_cxts.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/tests/cxts/_cxts.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef __CXTS_INTERNAL_H__ #define __CXTS_INTERNAL_H__ Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- opencv.spec 7 Mar 2006 16:53:42 -0000 1.6 +++ opencv.spec 7 Mar 2006 17:09:57 -0000 1.7 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -126,6 +126,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-8 +- Again fixed intrinsics patch so that Python modules build on x86_64. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-7 - Fixed intrinsics patch so that it works. From fedora-extras-commits at redhat.com Tue Mar 7 17:17:26 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:17:26 -0500 Subject: rpms/physfs/FC-3 physfs.spec,1.2,1.3 Message-ID: <200603071717.k27HHw9v024565@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24513/FC-3 Modified Files: physfs.spec Log Message: Resolve bugzilla 183705 Index: physfs.spec =================================================================== RCS file: /cvs/extras/rpms/physfs/FC-3/physfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- physfs.spec 28 Feb 2006 23:50:28 -0000 1.2 +++ physfs.spec 7 Mar 2006 17:17:26 -0000 1.3 @@ -1,6 +1,6 @@ Name: physfs Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries Summary: Library to provide abstract access to various archives @@ -50,6 +50,15 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 install -m0644 docs/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3 +# Handle man page conflicts (bz #183705) +mv $RPM_BUILD_ROOT%{_mandir}/man3/author.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-author.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/description.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-description.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/extension.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-extension.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/major.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-major.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/minor.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-minor.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/patch.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-patch.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/url.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-url.3 + %clean rm -rf $RPM_BUILD_ROOT @@ -72,6 +81,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1.0.1-4 +- resolve man page conflicts (bz #183705) + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.1-3 - bump for FC-5 From fedora-extras-commits at redhat.com Tue Mar 7 17:17:32 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:17:32 -0500 Subject: rpms/physfs/FC-4 physfs.spec,1.2,1.3 Message-ID: <200603071718.k27HI4Mx024568@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24513/FC-4 Modified Files: physfs.spec Log Message: Resolve bugzilla 183705 Index: physfs.spec =================================================================== RCS file: /cvs/extras/rpms/physfs/FC-4/physfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- physfs.spec 28 Feb 2006 23:50:33 -0000 1.2 +++ physfs.spec 7 Mar 2006 17:17:32 -0000 1.3 @@ -1,6 +1,6 @@ Name: physfs Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries Summary: Library to provide abstract access to various archives @@ -50,6 +50,15 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 install -m0644 docs/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3 +# Handle man page conflicts (bz #183705) +mv $RPM_BUILD_ROOT%{_mandir}/man3/author.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-author.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/description.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-description.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/extension.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-extension.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/major.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-major.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/minor.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-minor.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/patch.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-patch.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/url.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-url.3 + %clean rm -rf $RPM_BUILD_ROOT @@ -72,6 +81,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1.0.1-4 +- resolve man page conflicts (bz #183705) + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.1-3 - bump for FC-5 From fedora-extras-commits at redhat.com Tue Mar 7 17:17:38 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:17:38 -0500 Subject: rpms/physfs/devel physfs.spec,1.2,1.3 Message-ID: <200603071718.k27HIAx9024571@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24513/devel Modified Files: physfs.spec Log Message: Resolve bugzilla 183705 Index: physfs.spec =================================================================== RCS file: /cvs/extras/rpms/physfs/devel/physfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- physfs.spec 28 Feb 2006 23:50:39 -0000 1.2 +++ physfs.spec 7 Mar 2006 17:17:37 -0000 1.3 @@ -1,6 +1,6 @@ Name: physfs Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries Summary: Library to provide abstract access to various archives @@ -50,6 +50,15 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 install -m0644 docs/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3 +# Handle man page conflicts (bz #183705) +mv $RPM_BUILD_ROOT%{_mandir}/man3/author.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-author.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/description.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-description.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/extension.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-extension.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/major.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-major.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/minor.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-minor.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/patch.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-patch.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/url.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-url.3 + %clean rm -rf $RPM_BUILD_ROOT @@ -72,6 +81,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1.0.1-4 +- resolve man page conflicts (bz #183705) + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.1-3 - bump for FC-5 From fedora-extras-commits at redhat.com Tue Mar 7 17:25:40 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:25:40 -0500 Subject: rpms/logjam/FC-3 logjam-4.4.1-ru.po.asp.patch, NONE, 1.1 logjam.spec, 1.14, 1.15 Message-ID: <200603071726.k27HQCQ1024775@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24716/FC-3 Modified Files: logjam.spec Added Files: logjam-4.4.1-ru.po.asp.patch Log Message: Fix russian translations (bz 183619) logjam-4.4.1-ru.po.asp.patch: --- NEW FILE logjam-4.4.1-ru.po.asp.patch --- --- logjam-4.5.1/po/ru_RU.po.orig 2005-01-03 11:13:27.000000000 +0200 +++ logjam-4.5.1/po/ru_RU.po 2005-02-08 14:40:10.147249896 +0200 @@ -6,19 +7,21 @@ # http://www.livejournal.com/~mihun/ , 2002. # Grigory Bakunov , # http://www.livejournal.com/~bobuk/, 2003. -# Kir Kolyshkin , 2003-2004, # http://www.livejournal.com/~k001/ +# Kir Kolyshkin , 2003-2004,. +# Andy Shevchenko , 2005. msgid "" msgstr "" -"Project-Id-Version: LogJam 4.4.0\n" +"Project-Id-Version: ru_RU\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-24 09:12-0700\n" -"PO-Revision-Date: 2005-01-07 02:40+0400\n" -"Last-Translator: Kir Kolyshkin \n" -"Language-Team: Russian\n" +"PO-Revision-Date: 2005-10-25 13:04+0300\n" +"Last-Translator: Andy Shevchenko \n" +"Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10.2\n" #: ../data/logjam.desktop.in.h:1 ../src/docklet.c:67 ../src/init.c:190 msgid "LogJam" @@ -323,7 +324,7 @@ #: ../src/cmdline_data.h:22 msgid "Manage user list." -msgstr "" +msgstr "???????????????????? ?????????????? ??????????????????????????." #: ../src/cmdline_data.h:46 msgid "Reset checkfriends information." @@ -351,7 +352,7 @@ #: ../src/cmdline_data.h:218 msgid "Add a user to the user list." -msgstr "" +msgstr "???????????????? ???????????????????????? ?? ????????????." #: ../src/conf.c:88 msgid "new host name is invalid" @@ -788,7 +789,7 @@ #: ../src/getopt.c:741 ../src/getopt.c:914 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s: ?????????? `%c%s' ?????????????? ??????????????????\n" +msgstr "%s: ?????????? `%s' ?????????????? ??????????????????\n" #. --option #: ../src/getopt.c:770 @@ -1152,9 +1152,8 @@ msgstr "_????????????:" #: ../src/jamview.c:414 -#, fuzzy msgid "_Tags:" -msgstr "_????: " +msgstr "_????????:" #: ../src/jamview.c:466 msgid "_Preformatted" @@ -1213,9 +1212,8 @@ msgstr "???????????? ?????????????? XML-?????????? ????????????????: %s" #: ../src/journalstore_xml.c:751 -#, fuzzy msgid "No offline copy of this journal." -msgstr "???????????????????? ???????????????????? ?????????????? ???????????? ????????????????." +msgstr "?????? ?????????????????? ?????????? ???????????? ????????????????." #: ../src/link.c:113 msgid "Make Link" @@ -1554,9 +1552,8 @@ msgstr "/??????/_??????????????????????" #: ../src/menu.c:417 -#, fuzzy msgid "/View/_Tags" -msgstr "/??????/_????????????" +msgstr "/??????/_????????" #: ../src/menu.c:418 msgid "/View/M_usic" @@ -1927,7 +1924,7 @@ #: ../src/preview.c:188 msgid "Tags" -msgstr "" +msgstr "????????" #: ../src/preview.c:248 msgid "HTML Preview" @@ -2234,13 +2231,12 @@ #. this translation is not crucial #: ../src/thanks.h:11 msgid "patches" -msgstr "" +msgstr "????????????????" #. this translation is not crucial #: ../src/thanks.h:13 -#, fuzzy msgid "Japanese translation" -msgstr "?????????????? ???? ??????????????????" +msgstr "?????????????? ???? ????????????????" #. this translation is not crucial #: ../src/thanks.h:15 ../src/thanks.h:29 @@ -2299,9 +2295,8 @@ #. this translation is not crucial #: ../src/thanks.h:39 -#, fuzzy msgid "Debian package, undo" -msgstr "???????????? ?? Debian-??????????????" +msgstr "Debian-??????????, ??????????" #. this translation is not crucial #: ../src/thanks.h:41 @@ -2500,71 +2494,3 @@ msgid "Do not show again" msgstr "???? ???????????????????? ??????????" -#~ msgid "automake fixes, testing" -#~ msgstr "?????????????????????? automake, ????????????????????????" - -#~ msgid "music|None" -#~ msgstr "???? ????????????????????" - -#~ msgid "users|None" -#~ msgstr "??????????" - -#~ msgid "Unable to save to '%s': %s." -#~ msgstr "???????????????????? ?????????????????? ?? '%s': %s." - -#~ msgid "Radio buttons" -#~ msgstr "??????????-????????????" - -#~ msgid "Check boxes" -#~ msgstr "???????????? ????????????" - -#~ msgid "Drop-down menu" -#~ msgstr "???????????????????? ????????" - -#~ msgid "Text entry" -#~ msgstr "???????? ??????????" - -#~ msgid "Scale" -#~ msgstr "????????????" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "Possible answers:" -#~ msgstr "?????????????????? ????????????:" - -#~ msgid "<< Less" -#~ msgstr "<< ????????????" - -#~ msgid "More >>" -#~ msgstr "???????????? >>" - -#~ msgid "Add _question: " -#~ msgstr "???????????????? ????????????: " - -#~ msgid "Deletes this question from the poll." -#~ msgstr "?????????????? ???????? ???????????? ???? ??????????????????????." - -#~ msgid "Move up" -#~ msgstr "??????????" - -#~ msgid "Move this question up one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Move down" -#~ msgstr "????????" - -#~ msgid "Move this question down one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Poll _name (optional): " -#~ msgstr "???????????????? (??????????????????????????):" - -#~ msgid " Question #%d - %s " -#~ msgstr " ???????????? #%d - %s " - -#~ msgid "[Fill in at least the first possible answer.]" -#~ msgstr "[?????????????????? ???????? ???? ???????? ?????????????? ????????????.]" - -#~ msgid "[Fill in some question text.]" -#~ msgstr "[?????????????????? ?????????? ??????????????.]" Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- logjam.spec 28 Feb 2006 23:09:27 -0000 1.14 +++ logjam.spec 7 Mar 2006 17:25:40 -0000 1.15 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPL @@ -23,6 +23,7 @@ Patch4: logjam-4.4.1-fedora-desktop.patch Patch5: logjam-4.5-patch8-manfix.patch Patch6: logjam-4.5.2-gtkhtml38.patch +Patch7: logjam-4.4.1-ru.po.asp.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -46,6 +47,7 @@ %patch4 -p1 -b .desktop %patch5 -p1 -b .manfix %patch6 -p1 -b .gtkhtml38 +%patch7 -p1 -b .ru.po %build autoconf @@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1:4.5.3-2 +- update russian translations, bz 183619 + * Tue Feb 28 2006 Tom "spot" Callaway 1:4.5.3-1 - bump to 4.5.3 From fedora-extras-commits at redhat.com Tue Mar 7 17:25:52 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:25:52 -0500 Subject: rpms/logjam/devel logjam-4.4.1-ru.po.asp.patch, NONE, 1.1 logjam.spec, 1.23, 1.24 Message-ID: <200603071726.k27HQOXv024783@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24716/devel Modified Files: logjam.spec Added Files: logjam-4.4.1-ru.po.asp.patch Log Message: Fix russian translations (bz 183619) logjam-4.4.1-ru.po.asp.patch: --- NEW FILE logjam-4.4.1-ru.po.asp.patch --- --- logjam-4.5.1/po/ru_RU.po.orig 2005-01-03 11:13:27.000000000 +0200 +++ logjam-4.5.1/po/ru_RU.po 2005-02-08 14:40:10.147249896 +0200 @@ -6,19 +7,21 @@ # http://www.livejournal.com/~mihun/ , 2002. # Grigory Bakunov , # http://www.livejournal.com/~bobuk/, 2003. -# Kir Kolyshkin , 2003-2004, # http://www.livejournal.com/~k001/ +# Kir Kolyshkin , 2003-2004,. +# Andy Shevchenko , 2005. msgid "" msgstr "" -"Project-Id-Version: LogJam 4.4.0\n" +"Project-Id-Version: ru_RU\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-24 09:12-0700\n" -"PO-Revision-Date: 2005-01-07 02:40+0400\n" -"Last-Translator: Kir Kolyshkin \n" -"Language-Team: Russian\n" +"PO-Revision-Date: 2005-10-25 13:04+0300\n" +"Last-Translator: Andy Shevchenko \n" +"Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10.2\n" #: ../data/logjam.desktop.in.h:1 ../src/docklet.c:67 ../src/init.c:190 msgid "LogJam" @@ -323,7 +324,7 @@ #: ../src/cmdline_data.h:22 msgid "Manage user list." -msgstr "" +msgstr "???????????????????? ?????????????? ??????????????????????????." #: ../src/cmdline_data.h:46 msgid "Reset checkfriends information." @@ -351,7 +352,7 @@ #: ../src/cmdline_data.h:218 msgid "Add a user to the user list." -msgstr "" +msgstr "???????????????? ???????????????????????? ?? ????????????." #: ../src/conf.c:88 msgid "new host name is invalid" @@ -788,7 +789,7 @@ #: ../src/getopt.c:741 ../src/getopt.c:914 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s: ?????????? `%c%s' ?????????????? ??????????????????\n" +msgstr "%s: ?????????? `%s' ?????????????? ??????????????????\n" #. --option #: ../src/getopt.c:770 @@ -1152,9 +1152,8 @@ msgstr "_????????????:" #: ../src/jamview.c:414 -#, fuzzy msgid "_Tags:" -msgstr "_????: " +msgstr "_????????:" #: ../src/jamview.c:466 msgid "_Preformatted" @@ -1213,9 +1212,8 @@ msgstr "???????????? ?????????????? XML-?????????? ????????????????: %s" #: ../src/journalstore_xml.c:751 -#, fuzzy msgid "No offline copy of this journal." -msgstr "???????????????????? ???????????????????? ?????????????? ???????????? ????????????????." +msgstr "?????? ?????????????????? ?????????? ???????????? ????????????????." #: ../src/link.c:113 msgid "Make Link" @@ -1554,9 +1552,8 @@ msgstr "/??????/_??????????????????????" #: ../src/menu.c:417 -#, fuzzy msgid "/View/_Tags" -msgstr "/??????/_????????????" +msgstr "/??????/_????????" #: ../src/menu.c:418 msgid "/View/M_usic" @@ -1927,7 +1924,7 @@ #: ../src/preview.c:188 msgid "Tags" -msgstr "" +msgstr "????????" #: ../src/preview.c:248 msgid "HTML Preview" @@ -2234,13 +2231,12 @@ #. this translation is not crucial #: ../src/thanks.h:11 msgid "patches" -msgstr "" +msgstr "????????????????" #. this translation is not crucial #: ../src/thanks.h:13 -#, fuzzy msgid "Japanese translation" -msgstr "?????????????? ???? ??????????????????" +msgstr "?????????????? ???? ????????????????" #. this translation is not crucial #: ../src/thanks.h:15 ../src/thanks.h:29 @@ -2299,9 +2295,8 @@ #. this translation is not crucial #: ../src/thanks.h:39 -#, fuzzy msgid "Debian package, undo" -msgstr "???????????? ?? Debian-??????????????" +msgstr "Debian-??????????, ??????????" #. this translation is not crucial #: ../src/thanks.h:41 @@ -2500,71 +2494,3 @@ msgid "Do not show again" msgstr "???? ???????????????????? ??????????" -#~ msgid "automake fixes, testing" -#~ msgstr "?????????????????????? automake, ????????????????????????" - -#~ msgid "music|None" -#~ msgstr "???? ????????????????????" - -#~ msgid "users|None" -#~ msgstr "??????????" - -#~ msgid "Unable to save to '%s': %s." -#~ msgstr "???????????????????? ?????????????????? ?? '%s': %s." - -#~ msgid "Radio buttons" -#~ msgstr "??????????-????????????" - -#~ msgid "Check boxes" -#~ msgstr "???????????? ????????????" - -#~ msgid "Drop-down menu" -#~ msgstr "???????????????????? ????????" - -#~ msgid "Text entry" -#~ msgstr "???????? ??????????" - -#~ msgid "Scale" -#~ msgstr "????????????" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "Possible answers:" -#~ msgstr "?????????????????? ????????????:" - -#~ msgid "<< Less" -#~ msgstr "<< ????????????" - -#~ msgid "More >>" -#~ msgstr "???????????? >>" - -#~ msgid "Add _question: " -#~ msgstr "???????????????? ????????????: " - -#~ msgid "Deletes this question from the poll." -#~ msgstr "?????????????? ???????? ???????????? ???? ??????????????????????." - -#~ msgid "Move up" -#~ msgstr "??????????" - -#~ msgid "Move this question up one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Move down" -#~ msgstr "????????" - -#~ msgid "Move this question down one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Poll _name (optional): " -#~ msgstr "???????????????? (??????????????????????????):" - -#~ msgid " Question #%d - %s " -#~ msgstr " ???????????? #%d - %s " - -#~ msgid "[Fill in at least the first possible answer.]" -#~ msgstr "[?????????????????? ???????? ???? ???????? ?????????????? ????????????.]" - -#~ msgid "[Fill in some question text.]" -#~ msgstr "[?????????????????? ?????????? ??????????????.]" Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- logjam.spec 28 Feb 2006 23:09:51 -0000 1.23 +++ logjam.spec 7 Mar 2006 17:25:52 -0000 1.24 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPL @@ -23,6 +23,7 @@ Patch4: logjam-4.4.1-fedora-desktop.patch Patch5: logjam-4.5-patch8-manfix.patch Patch6: logjam-4.5.2-gtkhtml38.patch +Patch7: logjam-4.4.1-ru.po.asp.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -46,6 +47,7 @@ %patch4 -p1 -b .desktop %patch5 -p1 -b .manfix %patch6 -p1 -b .gtkhtml38 +%patch7 -p1 -b .ru.po %build autoconf @@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1:4.5.3-2 +- update russian translations, bz 183619 + * Tue Feb 28 2006 Tom "spot" Callaway 1:4.5.3-1 - bump to 4.5.3 From fedora-extras-commits at redhat.com Tue Mar 7 17:25:46 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:25:46 -0500 Subject: rpms/logjam/FC-4 logjam-4.4.1-ru.po.asp.patch, NONE, 1.1 logjam.spec, 1.23, 1.24 Message-ID: <200603071726.k27HQIE1024778@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24716/FC-4 Modified Files: logjam.spec Added Files: logjam-4.4.1-ru.po.asp.patch Log Message: Fix russian translations (bz 183619) logjam-4.4.1-ru.po.asp.patch: --- NEW FILE logjam-4.4.1-ru.po.asp.patch --- --- logjam-4.5.1/po/ru_RU.po.orig 2005-01-03 11:13:27.000000000 +0200 +++ logjam-4.5.1/po/ru_RU.po 2005-02-08 14:40:10.147249896 +0200 @@ -6,19 +7,21 @@ # http://www.livejournal.com/~mihun/ , 2002. # Grigory Bakunov , # http://www.livejournal.com/~bobuk/, 2003. -# Kir Kolyshkin , 2003-2004, # http://www.livejournal.com/~k001/ +# Kir Kolyshkin , 2003-2004,. +# Andy Shevchenko , 2005. msgid "" msgstr "" -"Project-Id-Version: LogJam 4.4.0\n" +"Project-Id-Version: ru_RU\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-24 09:12-0700\n" -"PO-Revision-Date: 2005-01-07 02:40+0400\n" -"Last-Translator: Kir Kolyshkin \n" -"Language-Team: Russian\n" +"PO-Revision-Date: 2005-10-25 13:04+0300\n" +"Last-Translator: Andy Shevchenko \n" +"Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10.2\n" #: ../data/logjam.desktop.in.h:1 ../src/docklet.c:67 ../src/init.c:190 msgid "LogJam" @@ -323,7 +324,7 @@ #: ../src/cmdline_data.h:22 msgid "Manage user list." -msgstr "" +msgstr "???????????????????? ?????????????? ??????????????????????????." #: ../src/cmdline_data.h:46 msgid "Reset checkfriends information." @@ -351,7 +352,7 @@ #: ../src/cmdline_data.h:218 msgid "Add a user to the user list." -msgstr "" +msgstr "???????????????? ???????????????????????? ?? ????????????." #: ../src/conf.c:88 msgid "new host name is invalid" @@ -788,7 +789,7 @@ #: ../src/getopt.c:741 ../src/getopt.c:914 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s: ?????????? `%c%s' ?????????????? ??????????????????\n" +msgstr "%s: ?????????? `%s' ?????????????? ??????????????????\n" #. --option #: ../src/getopt.c:770 @@ -1152,9 +1152,8 @@ msgstr "_????????????:" #: ../src/jamview.c:414 -#, fuzzy msgid "_Tags:" -msgstr "_????: " +msgstr "_????????:" #: ../src/jamview.c:466 msgid "_Preformatted" @@ -1213,9 +1212,8 @@ msgstr "???????????? ?????????????? XML-?????????? ????????????????: %s" #: ../src/journalstore_xml.c:751 -#, fuzzy msgid "No offline copy of this journal." -msgstr "???????????????????? ???????????????????? ?????????????? ???????????? ????????????????." +msgstr "?????? ?????????????????? ?????????? ???????????? ????????????????." #: ../src/link.c:113 msgid "Make Link" @@ -1554,9 +1552,8 @@ msgstr "/??????/_??????????????????????" #: ../src/menu.c:417 -#, fuzzy msgid "/View/_Tags" -msgstr "/??????/_????????????" +msgstr "/??????/_????????" #: ../src/menu.c:418 msgid "/View/M_usic" @@ -1927,7 +1924,7 @@ #: ../src/preview.c:188 msgid "Tags" -msgstr "" +msgstr "????????" #: ../src/preview.c:248 msgid "HTML Preview" @@ -2234,13 +2231,12 @@ #. this translation is not crucial #: ../src/thanks.h:11 msgid "patches" -msgstr "" +msgstr "????????????????" #. this translation is not crucial #: ../src/thanks.h:13 -#, fuzzy msgid "Japanese translation" -msgstr "?????????????? ???? ??????????????????" +msgstr "?????????????? ???? ????????????????" #. this translation is not crucial #: ../src/thanks.h:15 ../src/thanks.h:29 @@ -2299,9 +2295,8 @@ #. this translation is not crucial #: ../src/thanks.h:39 -#, fuzzy msgid "Debian package, undo" -msgstr "???????????? ?? Debian-??????????????" +msgstr "Debian-??????????, ??????????" #. this translation is not crucial #: ../src/thanks.h:41 @@ -2500,71 +2494,3 @@ msgid "Do not show again" msgstr "???? ???????????????????? ??????????" -#~ msgid "automake fixes, testing" -#~ msgstr "?????????????????????? automake, ????????????????????????" - -#~ msgid "music|None" -#~ msgstr "???? ????????????????????" - -#~ msgid "users|None" -#~ msgstr "??????????" - -#~ msgid "Unable to save to '%s': %s." -#~ msgstr "???????????????????? ?????????????????? ?? '%s': %s." - -#~ msgid "Radio buttons" -#~ msgstr "??????????-????????????" - -#~ msgid "Check boxes" -#~ msgstr "???????????? ????????????" - -#~ msgid "Drop-down menu" -#~ msgstr "???????????????????? ????????" - -#~ msgid "Text entry" -#~ msgstr "???????? ??????????" - -#~ msgid "Scale" -#~ msgstr "????????????" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "Possible answers:" -#~ msgstr "?????????????????? ????????????:" - -#~ msgid "<< Less" -#~ msgstr "<< ????????????" - -#~ msgid "More >>" -#~ msgstr "???????????? >>" - -#~ msgid "Add _question: " -#~ msgstr "???????????????? ????????????: " - -#~ msgid "Deletes this question from the poll." -#~ msgstr "?????????????? ???????? ???????????? ???? ??????????????????????." - -#~ msgid "Move up" -#~ msgstr "??????????" - -#~ msgid "Move this question up one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Move down" -#~ msgstr "????????" - -#~ msgid "Move this question down one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Poll _name (optional): " -#~ msgstr "???????????????? (??????????????????????????):" - -#~ msgid " Question #%d - %s " -#~ msgstr " ???????????? #%d - %s " - -#~ msgid "[Fill in at least the first possible answer.]" -#~ msgstr "[?????????????????? ???????? ???? ???????? ?????????????? ????????????.]" - -#~ msgid "[Fill in some question text.]" -#~ msgstr "[?????????????????? ?????????? ??????????????.]" Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- logjam.spec 28 Feb 2006 23:09:34 -0000 1.23 +++ logjam.spec 7 Mar 2006 17:25:45 -0000 1.24 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPL @@ -23,6 +23,7 @@ Patch4: logjam-4.4.1-fedora-desktop.patch Patch5: logjam-4.5-patch8-manfix.patch Patch6: logjam-4.5.2-gtkhtml38.patch +Patch7: logjam-4.4.1-ru.po.asp.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -46,6 +47,7 @@ %patch4 -p1 -b .desktop %patch5 -p1 -b .manfix %patch6 -p1 -b .gtkhtml38 +%patch7 -p1 -b .ru.po %build autoconf @@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1:4.5.3-2 +- update russian translations, bz 183619 + * Tue Feb 28 2006 Tom "spot" Callaway 1:4.5.3-1 - bump to 4.5.3 From fedora-extras-commits at redhat.com Tue Mar 7 17:38:59 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:38:59 -0500 Subject: rpms/CCfits - New directory Message-ID: <200603071739.k27Hd1YI025079@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25071/CCfits Log Message: Directory /cvs/extras/rpms/CCfits added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 17:39:05 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:39:05 -0500 Subject: rpms/CCfits/devel - New directory Message-ID: <200603071739.k27Hd7JO025094@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25071/CCfits/devel Log Message: Directory /cvs/extras/rpms/CCfits/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 17:39:22 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:39:22 -0500 Subject: rpms/CCfits Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603071739.k27HdOS0025128@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116 Added Files: Makefile import.log Log Message: Setup of module CCfits --- NEW FILE Makefile --- # Top level Makefile for module CCfits all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 7 17:39:27 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:39:27 -0500 Subject: rpms/CCfits/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603071739.k27HdUtW025150@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module CCfits --- NEW 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 Mar 7 17:40:18 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:40:18 -0500 Subject: rpms/CCfits import.log,1.1,1.2 Message-ID: <200603071740.k27Heoiw025238@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25198 Modified Files: import.log Log Message: auto-import CCfits-1.4-3.fc4 on branch devel from CCfits-1.4-3.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/CCfits/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Mar 2006 17:39:21 -0000 1.1 +++ import.log 7 Mar 2006 17:40:17 -0000 1.2 @@ -0,0 +1 @@ +CCfits-1_4-3_fc4:HEAD:CCfits-1.4-3.fc4.src.rpm:1141753210 From fedora-extras-commits at redhat.com Tue Mar 7 17:40:23 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:40:23 -0500 Subject: rpms/CCfits/devel CCfits-1.4-g++4.patch, NONE, 1.1 CCfits-1.4-removerpath.patch, NONE, 1.1 CCfits.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603071740.k27HeuV7025242@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25198/devel Modified Files: .cvsignore sources Added Files: CCfits-1.4-g++4.patch CCfits-1.4-removerpath.patch CCfits.spec Log Message: auto-import CCfits-1.4-3.fc4 on branch devel from CCfits-1.4-3.fc4.src.rpm CCfits-1.4-g++4.patch: --- NEW FILE CCfits-1.4-g++4.patch --- diff -ur CCfits.old/ExtHDUT.h CCfits/ExtHDUT.h --- CCfits.old/ExtHDUT.h 2006-02-16 11:36:03.000000000 +0100 +++ CCfits/ExtHDUT.h 2006-02-16 11:35:31.000000000 +0100 @@ -145,7 +145,8 @@ long firstElement(0); long dimSize(1); std::vector inputDimensions(naxis(),1); - size_t n(std::min(naxis(),first.size())); + size_t sNaxis = static_cast(naxis()); + size_t n(std::min(sNaxis,first.size())); std::copy(&first[0],&first[n],&inputDimensions[0]); for (long i = 0; i < naxis(); ++i) { diff -ur CCfits.old/PHDUT.h CCfits/PHDUT.h --- CCfits.old/PHDUT.h 2006-02-16 11:36:03.000000000 +0100 +++ CCfits/PHDUT.h 2006-02-16 11:35:31.000000000 +0100 @@ -141,7 +141,8 @@ long firstElement(0); long dimSize(1); std::vector inputDimensions(naxis(),1); - size_t n(std::min(naxis(),first.size())); + size_t sNaxis = static_cast(naxis()); + size_t n(std::min(sNaxis,first.size())); std::copy(&first[0],&first[n],&inputDimensions[0]); for (long i = 0; i < naxis(); ++i) { @@ -553,7 +554,7 @@ try { PrimaryHDU& image = dynamic_cast&>(*this); - image.writeImage(firstVertex,lastVertex,stride,data); + image.writeImage(firstVertex,lastVertex,data); } catch (std::bad_cast) { @@ -565,7 +566,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } else if (bitpix() == Idouble) @@ -575,7 +576,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } else if (bitpix() == Ibyte) { @@ -584,7 +585,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } else if (bitpix() == Ilong) { @@ -595,7 +596,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } else @@ -605,7 +606,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } } else if (bitpix() == Ishort) @@ -617,7 +618,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } else @@ -627,7 +628,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } } else CCfits-1.4-removerpath.patch: --- NEW FILE CCfits-1.4-removerpath.patch --- --- CCfits.old/Makefile.in 2006-02-20 21:05:34.000000000 +0100 +++ CCfits/Makefile.in 2006-02-20 21:08:28.000000000 +0100 @@ -157,8 +157,6 @@ SUBDIRS = vs.net -R_LIB_PATH = @RDFLAGS@ - MSVC_FILES = MSconfig.h EXTRA_DIST = config BUILD CHANGES $(MSVC_FILES) @@ -168,7 +166,6 @@ cookbook_SOURCES = cookbook.cxx cookbook_LDADD = libCCfits.la -cookbook_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH) INCLUDES = -I$(top_srcdir)/.. @@ -198,7 +195,6 @@ # This will tell shared library which STD C++ library to use without # needing the user to use LD_LIBRARY_PATH environment variable libCCfits_la_LIBADD = $(LIBSTDCPP) -libCCfits_la_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH) libCCfits_ladir = $(pkgincludedir) @@ -241,6 +237,7 @@ CONFIG_CLEAN_FILES = Doxyfile LTLIBRARIES = $(lib_LTLIBRARIES) +libCCfits_la_LDFLAGS = libCCfits_la_DEPENDENCIES = am_libCCfits_la_OBJECTS = AsciiTable.lo BinTable.lo Column.lo \ ColumnCreator.lo ColumnData.lo ColumnVectorData.lo ExtHDU.lo \ @@ -254,6 +251,7 @@ am_cookbook_OBJECTS = cookbook.$(OBJEXT) cookbook_OBJECTS = $(am_cookbook_OBJECTS) cookbook_DEPENDENCIES = libCCfits.la +cookbook_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/config/depcomp --- NEW FILE CCfits.spec --- Name: CCfits Version: 1.4 Release: 3%{?dist} Summary: A C++ interface for cfitsio Group: Development/Libraries License: BSD URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/CCfits-1.4.tar.gz Patch0: CCfits-1.4-g++4.patch Patch1: CCfits-1.4-removerpath.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cfitsio-devel BuildRequires: gcc-c++ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++. It is written in ANSI C++ and implemented using the C++ Standard Library with namespaces, exception handling, and member template functions. %package devel Summary: Headers for developing programs that will use %{name} Group: Development/Libraries Requires: cfitsio-devel Requires: %{name} = %{version}-%{release} %description devel These are the header files and libraries needed to develop a %{name} application. %package docs Summary: Documentation for %{name}, includes full API docs Group: Documentation %description docs This package contains the full API documentation for %{name}. %prep %setup -q -n CCfits %patch0 -p1 %patch1 -p1 # Remove perl files in html docs rm -rf %{_builddir}/%{name}/html/*.pl %build %configure --disable-static --with-cfitsio=%{_prefix} --with-cfitsio-include=%{_includedir}/cfitsio make %{?_smp_mflags} %install rm -fr %{buildroot} make install DESTDIR=%{buildroot} %clean rm -fr %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc License.txt %{_libdir}/*so.* %files devel %defattr(-,root,root) %doc CHANGES %exclude %{_bindir}/cookbook %{_libdir}/*.so %exclude %{_libdir}/*.la %{_includedir}/* %files docs %defattr(-,root,root,-) %doc html %changelog * Tue Mar 07 2006 Sergio Pascual 1.4-3 - Rebuilt with new upstream source. * Mon Mar 06 2006 Sergio Pascual 1.4-2 - Removed Source with license file License.txt. * Mon Feb 20 2006 Sergio Pascual 1.4-1 - Removed perl files in documentation. - Changed license type to BSD. - Main summary changed and trailing dots removed. - Removed -rpath in the shared library * Thu Feb 16 2006 Sergio Pascual 1.4-0 - Initial spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/CCfits/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2006 17:39:27 -0000 1.1 +++ .cvsignore 7 Mar 2006 17:40:23 -0000 1.2 @@ -0,0 +1 @@ +CCfits-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/CCfits/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2006 17:39:27 -0000 1.1 +++ sources 7 Mar 2006 17:40:23 -0000 1.2 @@ -0,0 +1 @@ +230edb39de6a1e3dc6e0adda65d0676d CCfits-1.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 7 17:44:36 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 12:44:36 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.3, 1.4 opencv.spec, 1.7, 1.8 Message-ID: <200603071745.k27Hj826025311@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25287 Modified Files: opencv-0.9.7-intrinsics.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-9 - Still more fixing of intrinsics patch for Python bindings on x86_64. opencv-0.9.7-intrinsics.patch: Index: opencv-0.9.7-intrinsics.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- opencv-0.9.7-intrinsics.patch 7 Mar 2006 17:09:57 -0000 1.3 +++ opencv-0.9.7-intrinsics.patch 7 Mar 2006 17:44:35 -0000 1.4 @@ -165,3 +165,31 @@ #if (defined WIN32 || defined WIN64) && (_MSC_VER >= 1200 || defined _ICL) #pragma warning( disable: 4514 ) #endif +diff -urp opencv-0.9.7.orig/interfaces/swig/general/cv.i opencv-0.9.7/interfaces/swig/general/cv.i +--- opencv-0.9.7.orig/interfaces/swig/general/cv.i 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/interfaces/swig/general/cv.i 2006-03-07 12:33:16.000000000 -0500 +@@ -49,6 +49,10 @@ + + + %{ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include "cv.h" + %} + +diff -urp opencv-0.9.7.orig/interfaces/swig/general/highgui.i opencv-0.9.7/interfaces/swig/general/highgui.i +--- opencv-0.9.7.orig/interfaces/swig/general/highgui.i 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/interfaces/swig/general/highgui.i 2006-03-07 12:33:46.000000000 -0500 +@@ -48,6 +48,10 @@ + %module(package="opencv") highgui + + %{ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include "highgui.h" + %} + Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- opencv.spec 7 Mar 2006 17:09:57 -0000 1.7 +++ opencv.spec 7 Mar 2006 17:44:35 -0000 1.8 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -126,6 +126,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-9 +- Still more fixing of intrinsics patch for Python bindings on x86_64. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-8 - Again fixed intrinsics patch so that Python modules build on x86_64. From fedora-extras-commits at redhat.com Tue Mar 7 17:46:39 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:46:39 -0500 Subject: owners owners.list,1.719,1.720 Message-ID: <200603071747.k27HlBCd025382@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25355 Modified Files: owners.list Log Message: Added CCfits, a C++ interface for cfitsio Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.719 retrieving revision 1.720 diff -u -r1.719 -r1.720 --- owners.list 7 Mar 2006 14:44:49 -0000 1.719 +++ owners.list 7 Mar 2006 17:46:38 -0000 1.720 @@ -103,6 +103,7 @@ Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|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|ville.skytta at iki.fi|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| From fedora-extras-commits at redhat.com Tue Mar 7 18:49:27 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 13:49:27 -0500 Subject: rpms/opencv/FC-4 opencv.spec,1.8,1.9 Message-ID: <200603071850.k27Io0w9027524@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27507 Modified Files: opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-10 - Using simple intrinsincs patch. Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- opencv.spec 7 Mar 2006 17:44:35 -0000 1.8 +++ opencv.spec 7 Mar 2006 18:49:27 -0000 1.9 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -13,7 +13,7 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile -Patch0: opencv-0.9.7-intrinsics.patch +Patch0: opencv-0.9.7-intrinsics-simple.patch Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -126,6 +126,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-10 +- Using simple intrinsincs patch. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-9 - Still more fixing of intrinsics patch for Python bindings on x86_64. From fedora-extras-commits at redhat.com Tue Mar 7 18:54:03 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 7 Mar 2006 13:54:03 -0500 Subject: rpms/ufsparse/devel sources,1.5,1.6 ufsparse.spec,1.11,1.12 Message-ID: <200603071854.k27IsZ3P027655@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ufsparse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27632 Modified Files: sources ufsparse.spec Log Message: New release, including two new libs. Index: sources =================================================================== RCS file: /cvs/extras/rpms/ufsparse/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Feb 2006 16:39:46 -0000 1.5 +++ sources 7 Mar 2006 18:54:03 -0000 1.6 @@ -1 +1 @@ -534abf5e6f6ab58dbeaf6154fc31ec61 UFsparse.tar.gz +15f2cc58c2d66fa2ac0286cdfcf7cc76 UFsparse.tar.gz Index: ufsparse.spec =================================================================== RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ufsparse.spec 15 Feb 2006 16:32:11 -0000 1.11 +++ ufsparse.spec 7 Mar 2006 18:54:03 -0000 1.12 @@ -1,12 +1,12 @@ Name: ufsparse -Version: 0.93 -Release: 2%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: University of Florida sparse matrix libraries Group: System Environment/Libraries License: Distributable -URL: http://www.cise.ufl.edu/research/sparse/UFsparse/ -Source0: http://www.cise.ufl.edu/research/sparse/UFsparse/Jan28_2006/UFsparse.tar.gz +URL: http://www.cise.ufl.edu/research/sparse/UFsparse +Source0: http://www.cise.ufl.edu/research/sparse/UFsparse/v%{version}/UFsparse.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: blas-devel @@ -20,7 +20,10 @@ COLAMD column approximate minimum degree ordering CCOLAMD constrained column approximate minimum degree ordering CHOLMOD sparse Cholesky factorization + CSparse a concise sparse matrix package + CXSparse CSparse extended: complex matrix, int and long int support KLU sparse LU factorization, primarily for circuit simulation + LDL a simple LDL' factorization UMFPACK sparse LU factorization UFconfig configuration file for all the above packages. @@ -139,6 +142,44 @@ ln -sf libcolamd.so.%{colamd_version} libcolamd.so popd +## Don't install CSparse as the header file name conflicts with +## CXSparse. CXSparse is a superset of CSparse, with the user needing +## to link against -lcxsparse rather than -lcsparse. This is an +## annoyance and not real issue. +%define csparse_version 1.2 +%define csparse_version_major 1 +pushd CSparse + pushd Source + make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libcsparse.a + gcc -shared -Wl,-soname,libcsparse.so.%{csparse_version_major} -o libcsparse.so.%{csparse_version} `ls *.o` + cp *.a *.so* ../../Lib +# cp cs.h ../../Include + popd + mkdir ../Doc/CSparse/ + cp README.txt License.txt lesser.txt ../Doc/CSparse +popd +pushd Lib + ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major} + ln -sf libcsparse.so.%{csparse_version} libcsparse.so +popd + +%define cxsparse_version 1.2 +%define cxsparse_version_major 1 +pushd CXSparse + pushd Source + make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libcxsparse.a + gcc -shared -Wl,-soname,libcxsparse.so.%{cxsparse_version_major} -o libcxsparse.so.%{cxsparse_version} `ls *.o` + cp *.a *.so* ../../Lib + cp cs.h ../../Include + popd + mkdir ../Doc/CXSparse/ + cp README.txt License.txt lesser.txt ../Doc/CXSparse +popd +pushd Lib + ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major} + ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so +popd + %define klu_version 0.7 %define klu_version_major 0 pushd KLU @@ -151,7 +192,6 @@ mkdir ../Doc/KLU/ cp README.txt Doc/lesser.txt ../Doc/KLU/ mkdir ../Devel/KLU/ - cp Doc/thesis.pdf Doc/README ../Devel/KLU/ popd pushd Lib ln -sf libklu.so.%{klu_version} libklu.so.%{klu_version_major} @@ -232,6 +272,10 @@ %{_libdir}/lib*.so %changelog +* Tue Mar 7 2006 Quentin Spencer 1.2-1 +- New release. +- Build newly added libraries CSparse and CXSparse. + * Wed Feb 15 2006 Quentin Spencer 0.93-2 - Rebuild for Fedora Extras 5. From fedora-extras-commits at redhat.com Tue Mar 7 19:05:32 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 14:05:32 -0500 Subject: rpms/lib765/devel lib765.spec,1.1,1.2 Message-ID: <200603071905.k27J5YvW029657@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29625/devel Modified Files: lib765.spec Log Message: auto-import lib765-0.3.3-4 on branch devel from lib765-0.3.3-4.src.rpm Index: lib765.spec =================================================================== RCS file: /cvs/extras/rpms/lib765/devel/lib765.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lib765.spec 13 Jan 2006 00:58:49 -0000 1.1 +++ lib765.spec 7 Mar 2006 19:05:31 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A library for emulating the uPD765a floppy controller Name: lib765 Version: 0.3.3 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.seasip.demon.co.uk/Unix/LibDsk/lib765-%{version}.tar.gz @@ -16,7 +16,7 @@ %package devel Summary: Development files for lib765. Group: Development/Libraries -Requires: libdsk-devel +Requires: libdsk-devel, lib765=%{version}-%{release} %description devel Development files for lib765. @@ -51,6 +51,9 @@ %exclude %{_libdir}/lib765.la %changelog +* Tue Mar 7 2006 Paul F. Johnson 0.3.3-4 +- Added Require for devel package + * Mon Nov 14 2005 Paul F. Johnson 0.3.3-3 - now uses %{?_smp_mflags} during the make process From fedora-extras-commits at redhat.com Tue Mar 7 19:05:24 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 14:05:24 -0500 Subject: rpms/lib765 import.log,1.2,1.3 Message-ID: <200603071906.k27J60Cn029661@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29625 Modified Files: import.log Log Message: auto-import lib765-0.3.3-4 on branch devel from lib765-0.3.3-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lib765/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 13 Jan 2006 00:58:43 -0000 1.2 +++ import.log 7 Mar 2006 19:05:23 -0000 1.3 @@ -1 +1,2 @@ lib765-0_3_3-3:HEAD:lib765-0.3.3-3.src.rpm:1137113910 +lib765-0_3_3-4:HEAD:lib765-0.3.3-4.src.rpm:1141758291 From fedora-extras-commits at redhat.com Tue Mar 7 19:06:04 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 14:06:04 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.4, 1.5 opencv.spec, 1.9, 1.10 Message-ID: <200603071906.k27J6alp029722@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29668 Modified Files: opencv-0.9.7-intrinsics.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-11 - Don't do "make check" because it doesn't run any tests anyway. - Back to main intrinsics patch. opencv-0.9.7-intrinsics.patch: Index: opencv-0.9.7-intrinsics.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- opencv-0.9.7-intrinsics.patch 7 Mar 2006 17:44:35 -0000 1.4 +++ opencv-0.9.7-intrinsics.patch 7 Mar 2006 19:06:04 -0000 1.5 @@ -123,48 +123,6 @@ /* Errors */ #define HG_OK 0 /* Don't bet on it! */ #define HG_BADNAME -1 /* Bad window or file name */ -diff -urp opencv-0.9.7.orig/tests/cv/src/cvtest.h opencv-0.9.7/tests/cv/src/cvtest.h ---- opencv-0.9.7.orig/tests/cv/src/cvtest.h 2006-03-06 22:58:41.000000000 -0500 -+++ opencv-0.9.7/tests/cv/src/cvtest.h 2006-03-07 12:05:24.000000000 -0500 -@@ -42,6 +42,10 @@ - #ifndef _CVTEST_H_ - #define _CVTEST_H_ - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #ifdef WIN32 - #include - #endif -diff -urp opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h opencv-0.9.7/tests/cxcore/src/cxcoretest.h ---- opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h 2006-03-06 22:58:41.000000000 -0500 -+++ opencv-0.9.7/tests/cxcore/src/cxcoretest.h 2006-03-07 12:05:24.000000000 -0500 -@@ -42,6 +42,10 @@ - #ifndef _CXCORE_TEST_H_ - #define _CXCORE_TEST_H_ - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #if defined WIN32 || defined WIN64 - #include - #endif -diff -urp opencv-0.9.7.orig/tests/cxts/_cxts.h opencv-0.9.7/tests/cxts/_cxts.h ---- opencv-0.9.7.orig/tests/cxts/_cxts.h 2006-03-06 22:58:41.000000000 -0500 -+++ opencv-0.9.7/tests/cxts/_cxts.h 2006-03-07 12:05:24.000000000 -0500 -@@ -42,6 +42,10 @@ - #ifndef __CXTS_INTERNAL_H__ - #define __CXTS_INTERNAL_H__ - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #if (defined WIN32 || defined WIN64) && (_MSC_VER >= 1200 || defined _ICL) - #pragma warning( disable: 4514 ) - #endif diff -urp opencv-0.9.7.orig/interfaces/swig/general/cv.i opencv-0.9.7/interfaces/swig/general/cv.i --- opencv-0.9.7.orig/interfaces/swig/general/cv.i 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/general/cv.i 2006-03-07 12:33:16.000000000 -0500 Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- opencv.spec 7 Mar 2006 18:49:27 -0000 1.9 +++ opencv.spec 7 Mar 2006 19:06:04 -0000 1.10 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -13,7 +13,7 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile -Patch0: opencv-0.9.7-intrinsics-simple.patch +Patch0: opencv-0.9.7-intrinsics.patch Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,10 +66,6 @@ make %{?_smp_mflags} -%check -make check - - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -126,6 +122,10 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-11 +- Don't do "make check" because it doesn't run any tests anyway. +- Back to main intrinsics patch. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-10 - Using simple intrinsincs patch. From fedora-extras-commits at redhat.com Tue Mar 7 19:45:00 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 14:45:00 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.5, 1.6 opencv.spec, 1.10, 1.11 Message-ID: <200603071945.k27JjXWn030036@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30012 Modified Files: opencv-0.9.7-intrinsics.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-12 - More intrinsics patch fixing. opencv-0.9.7-intrinsics.patch: Index: opencv-0.9.7-intrinsics.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- opencv-0.9.7-intrinsics.patch 7 Mar 2006 19:06:04 -0000 1.5 +++ opencv-0.9.7-intrinsics.patch 7 Mar 2006 19:44:59 -0000 1.6 @@ -151,3 +151,45 @@ #include "highgui.h" %} +diff -urp opencv-0.9.7.orig/apps/haartraining/src/_cvcommon.h opencv-0.9.7/apps/haartraining/src/_cvcommon.h +--- opencv-0.9.7.orig/apps/haartraining/src/_cvcommon.h 2006-03-07 14:23:05.000000000 -0500 ++++ opencv-0.9.7/apps/haartraining/src/_cvcommon.h 2006-03-07 14:34:25.000000000 -0500 +@@ -42,6 +42,10 @@ + #ifndef __CVCOMMON_H_ + #define __CVCOMMON_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include + #include + +diff -urp opencv-0.9.7.orig/apps/haartraining/src/_cvhaartraining.h opencv-0.9.7/apps/haartraining/src/_cvhaartraining.h +--- opencv-0.9.7.orig/apps/haartraining/src/_cvhaartraining.h 2006-03-07 14:23:05.000000000 -0500 ++++ opencv-0.9.7/apps/haartraining/src/_cvhaartraining.h 2006-03-07 14:33:31.000000000 -0500 +@@ -48,6 +48,10 @@ + #ifndef __CVHAARTRAINING_H_ + #define __CVHAARTRAINING_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include <_cvcommon.h> + #include + #include +diff -urp opencv-0.9.7.orig/apps/haartraining/src/performance.cpp opencv-0.9.7/apps/haartraining/src/performance.cpp +--- opencv-0.9.7.orig/apps/haartraining/src/performance.cpp 2006-03-07 14:23:05.000000000 -0500 ++++ opencv-0.9.7/apps/haartraining/src/performance.cpp 2006-03-07 14:35:41.000000000 -0500 +@@ -44,6 +44,10 @@ + * + * Measure performance of classifier + */ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include "cv.h" + #include + #include Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- opencv.spec 7 Mar 2006 19:06:04 -0000 1.10 +++ opencv.spec 7 Mar 2006 19:44:59 -0000 1.11 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -122,6 +122,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-12 +- More intrinsics patch fixing. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-11 - Don't do "make check" because it doesn't run any tests anyway. - Back to main intrinsics patch. From fedora-extras-commits at redhat.com Tue Mar 7 19:51:18 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 14:51:18 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics-simple.patch, 1.1, 1.2 opencv.spec, 1.11, 1.12 Message-ID: <200603071951.k27Jpoes030136@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30114 Modified Files: opencv-0.9.7-intrinsics-simple.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-13 - Changed intrinsics patch so that it matches upstream. opencv-0.9.7-intrinsics-simple.patch: Index: opencv-0.9.7-intrinsics-simple.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics-simple.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opencv-0.9.7-intrinsics-simple.patch 7 Mar 2006 04:07:32 -0000 1.1 +++ opencv-0.9.7-intrinsics-simple.patch 7 Mar 2006 19:51:18 -0000 1.2 @@ -6,7 +6,7 @@ #include - #if defined WIN64 && defined EM64T && defined _MSC_VER -+ #if defined WIN64 && defined EM64T && defined _MSC_VER || defined __GNUC__ ++ #if defined WIN64 && defined EM64T && defined _MSC_VER || defined __SSE2__ #include #endif Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- opencv.spec 7 Mar 2006 19:44:59 -0000 1.11 +++ opencv.spec 7 Mar 2006 19:51:18 -0000 1.12 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -13,7 +13,7 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile -Patch0: opencv-0.9.7-intrinsics.patch +Patch0: opencv-0.9.7-intrinsics-simple.patch Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -122,6 +122,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-13 +- Changed intrinsics patch so that it matches upstream. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-12 - More intrinsics patch fixing. From fedora-extras-commits at redhat.com Tue Mar 7 19:53:22 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 7 Mar 2006 14:53:22 -0500 Subject: rpms/python-matplotlib/devel .cvsignore, 1.8, 1.9 python-matplotlib.spec, 1.14, 1.15 sources, 1.8, 1.9 Message-ID: <200603071953.k27JrtdJ030203@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30180 Modified Files: .cvsignore python-matplotlib.spec sources Log Message: Update to 0.87.1 Add pycairo >= 1.0.2 requires (FC5+ only) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 28 Feb 2006 18:50:06 -0000 1.8 +++ .cvsignore 7 Mar 2006 19:53:22 -0000 1.9 @@ -1 +1 @@ -matplotlib-0.87.tar.gz +matplotlib-0.87.1.tar.gz Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- python-matplotlib.spec 28 Feb 2006 18:52:43 -0000 1.14 +++ python-matplotlib.spec 7 Mar 2006 19:53:22 -0000 1.15 @@ -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 +Version: 0.87.1 Release: 1%{?dist} Summary: Python plotting library @@ -16,6 +16,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 %description @@ -89,6 +90,10 @@ %{python_sitearch}/matplotlib/backends/_tkagg.so %changelog +* Tue Mar 7 2006 Orion Poplawski 0.87.1-1 +- Update to 0.87.1 +- Add pycairo >= 1.0.2 requires (FC5+ only) + * Fri Feb 24 2006 Orion Poplawski 0.87-1 - Update to 0.87 - Add BR numpy and python-numarray Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 28 Feb 2006 18:50:06 -0000 1.8 +++ sources 7 Mar 2006 19:53:22 -0000 1.9 @@ -1 +1 @@ -4ffff13865b37e8e39719d266419c976 matplotlib-0.87.tar.gz +bc605e5346128a0e2b9c5b0d602ecec8 matplotlib-0.87.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 7 19:57:34 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 7 Mar 2006 14:57:34 -0500 Subject: rpms/banshee/devel banshee-0.10.7-dll-path.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 banshee.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603071958.k27Jw63A030273@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30249 Modified Files: .cvsignore banshee.spec sources Added Files: banshee-0.10.7-dll-path.patch Log Message: * Tue Mar 7 2006 Christopher Aillon 0.10.7-1 - Update to 0.10.7 - Fix build on x86-64 banshee-0.10.7-dll-path.patch: --- NEW FILE banshee-0.10.7-dll-path.patch --- --- banshee-0.10.7/configure.dll-path 2006-03-07 14:40:54.000000000 -0500 +++ banshee-0.10.7/configure 2006-03-07 14:43:20.000000000 -0500 @@ -22663,7 +22663,7 @@ for asm in $required_assemblies; do echo "$as_me:$LINENO: checking for $asm.dll" >&5 echo $ECHO_N "checking for $asm.dll... $ECHO_C" >&6 - if test ! -e `$PKG_CONFIG --variable=libdir mono`/mono/1.0/$asm.dll; then + if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/1.0/$asm.dll; then { { echo "$as_me:$LINENO: error: missing required Mono DLL: $asm.dll" >&5 echo "$as_me: error: missing required Mono DLL: $asm.dll" >&2;} { (exit 1); exit 1; }; } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Mar 2006 16:22:25 -0000 1.2 +++ .cvsignore 7 Mar 2006 19:57:34 -0000 1.3 @@ -1 +1 @@ -banshee-0.10.6.tar.gz +banshee-0.10.7.tar.gz Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- banshee.spec 6 Mar 2006 22:43:19 -0000 1.3 +++ banshee.spec 7 Mar 2006 19:57:34 -0000 1.4 @@ -1,6 +1,6 @@ Name: banshee -Version: 0.10.6 -Release: 3 +Version: 0.10.7 +Release: 1 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -27,6 +27,8 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils +Patch1: banshee-0.10.7-dll-path.patch + %description Banshee allows you to import CDs, sync your music collection to an iPod, play music directly from an iPod, create playlists with songs from your @@ -34,6 +36,7 @@ %prep %setup -q +%patch1 -p1 -b .dll-path %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -94,6 +97,10 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Tue Mar 7 2006 Christopher Aillon 0.10.7-1 +- Update to 0.10.7 +- Fix build on x86-64 + * Mon Mar 6 2006 Christopher Aillon 0.10.6-3 - Don't build with smp_mflags, as parallel make causes the build to fail Index: sources =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Mar 2006 16:22:25 -0000 1.2 +++ sources 7 Mar 2006 19:57:34 -0000 1.3 @@ -1 +1 @@ -398b69c1818568b9d7a39c5e036de84b banshee-0.10.6.tar.gz +cae68ff23077f4ec37ab23b040c2470a banshee-0.10.7.tar.gz From fedora-extras-commits at redhat.com Tue Mar 7 20:10:44 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 7 Mar 2006 15:10:44 -0500 Subject: rpms/gparted/devel .cvsignore, 1.4, 1.5 gparted.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603072011.k27KBH1J032244@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gparted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32218 Modified Files: .cvsignore gparted.spec sources Log Message: * Mon Mar 07 2006 Deji Akingunola - 0.2.2-1 - New release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Jan 2006 16:37:15 -0000 1.4 +++ .cvsignore 7 Mar 2006 20:10:44 -0000 1.5 @@ -1 +1 @@ -gparted-0.2.tar.bz2 +gparted-0.2.2.tar.bz2 Index: gparted.spec =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gparted.spec 13 Feb 2006 20:58:09 -0000 1.5 +++ gparted.spec 7 Mar 2006 20:10:44 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Gnome Partition Editor Name: gparted -Version: 0.2 -Release: 2%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Group: Applications/System License: GPL URL: http://gparted.sourceforge.net @@ -77,6 +77,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Mon Mar 07 2006 Deji Akingunola - 0.2.2-1 +- New release + * Mon Feb 13 2006 Deji Akingunola - 0.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Jan 2006 16:37:15 -0000 1.4 +++ sources 7 Mar 2006 20:10:44 -0000 1.5 @@ -1 +1 @@ -250008cfbb87ef78298951bc999c6621 gparted-0.2.tar.bz2 +40419b1b10723055edfc6567a296fea0 gparted-0.2.2.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 20:19:30 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 7 Mar 2006 15:19:30 -0500 Subject: rpms/bigloo/devel bigloo.spec,1.4,1.5 Message-ID: <200603072020.k27KK2oa032396@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32379 Modified Files: bigloo.spec Log Message: Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/bigloo.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bigloo.spec 28 Feb 2006 18:58:07 -0000 1.4 +++ bigloo.spec 7 Mar 2006 20:19:29 -0000 1.5 @@ -2,7 +2,7 @@ Name: bigloo Version: 2.7a -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages @@ -65,7 +65,7 @@ %prep %setup -q -n %{name}%{version} # disable bmem for now -%patch0 -p1 +#%patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -90,7 +90,8 @@ %{!?_with_java: --jvm=no} \ --sharedbde=yes \ --sharedcompiler=yes \ - --coflags="$RPM_OPT_FLAGS" + --coflags="$RPM_OPT_FLAGS" \ + --cpicflags="-fPIC" perl -pi -e 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config From fedora-extras-commits at redhat.com Tue Mar 7 22:14:15 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:14:15 -0500 Subject: rpms/fuse-emulator - New directory Message-ID: <200603072214.k27MEFvX004271@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4264/fuse-emulator Log Message: Directory /cvs/extras/rpms/fuse-emulator added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 22:14:20 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:14:20 -0500 Subject: rpms/fuse-emulator/devel - New directory Message-ID: <200603072214.k27MENqD004287@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4264/fuse-emulator/devel Log Message: Directory /cvs/extras/rpms/fuse-emulator/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 22:14:46 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:14:46 -0500 Subject: rpms/fuse-emulator Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603072214.k27MEmtN004321@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4309 Added Files: Makefile import.log Log Message: Setup of module fuse-emulator --- NEW FILE Makefile --- # Top level Makefile for module fuse-emulator all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 7 22:14:52 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:14:52 -0500 Subject: rpms/fuse-emulator/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603072214.k27MEsgZ004341@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4309/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fuse-emulator --- NEW 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 Mar 7 22:16:46 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:16:46 -0500 Subject: rpms/fuse-emulator import.log,1.1,1.2 Message-ID: <200603072217.k27MHIf5004488@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4449 Modified Files: import.log Log Message: auto-import fuse-emulator-0.7.0-6 on branch devel from fuse-emulator-0.7.0-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse-emulator/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Mar 2006 22:14:46 -0000 1.1 +++ import.log 7 Mar 2006 22:16:46 -0000 1.2 @@ -0,0 +1 @@ +fuse-emulator-0_7_0-6:HEAD:fuse-emulator-0.7.0-6.src.rpm:1141769794 From fedora-extras-commits at redhat.com Tue Mar 7 22:16:52 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:16:52 -0500 Subject: rpms/fuse-emulator/devel README.z88sdk, NONE, 1.1 fuse-emulator.spec, NONE, 1.1 fuse-sound.patch, NONE, 1.1 fuse.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603072217.k27MHOIw004492@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4449/devel Modified Files: .cvsignore sources Added Files: README.z88sdk fuse-emulator.spec fuse-sound.patch fuse.png Log Message: auto-import fuse-emulator-0.7.0-6 on branch devel from fuse-emulator-0.7.0-6.src.rpm --- NEW FILE README.z88sdk --- HOW TO USE THE Z88SDK WITH FUSE ------------------------------- Using the Z88 SDK with fuse is a very simple operation. Grab a copy of the rpm, install and write your code, as you would, in C. Next, compile and target the ZX Spectrum zcc +zx .c -o .bin -lndos Assuming all is well, your code will be generated. THIS IS NOT AN EXECUTABLE! Load up Fuse. Click on File, move to "Open Binary Data". The usual filer window opens. Select the file you've just compiled and click "Open". The filer closes and you're presented with another window asking for a start address. You can enter any number from about 25000. For this explaination, I would use 32768. Click OK. Your .bin file is now in memory. To run the code, press the following keys T, ctrl + shift (the cursor turns to a white on black E), L 32768 return. On screen you will see the words RANDOMISE USR 32768 before you press return. When you press return, the code will be executed. That's about it! --- NEW FILE fuse-emulator.spec --- Summary: The Free UNIX Spectrum Emulator Name: fuse-emulator Version: 0.7.0 Release: 6%{?dist} License: GPL Group: Applications/Emulators Source: http://kent.dl.sourceforge.net/sourceforge/fuse-emulator/fuse-%{version}.tar.gz Source1: fuse.png Source2: README.z88sdk Patch: fuse-sound.patch URL: http://fuse-emulator.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libdsk-devel BuildRequires: lib765-devel BuildRequires: gtk2-devel BuildRequires: libxml2-devel BuildRequires: libpng-devel BuildRequires: libspectrum-devel BuildRequires: bison BuildRequires: flex # The SRPM created from this spec file deliberately does not include the # ROMS required to run the emulator. For the location of the ROMS, see # the ROMS readme file. %description Fuse is a spectrum emulator which emulates multiple models, including the 16K, 48K, 128K, +2, +2A, +3 and various clones. %prep rm -rf ${RPM_BUILD_ROOT} %setup -q -n fuse-%{version} %patch -p1 -b sound.c %build %configure make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/fuse mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps install -m0644 man/fuse.1 ${RPM_BUILD_ROOT}%{_mandir}/man1 install -c fuse ${RPM_BUILD_ROOT}%{_bindir}/fuse cp lib/*.z80 ${RPM_BUILD_ROOT}%{_datadir}/fuse/ cp lib/*.bmp ${RPM_BUILD_ROOT}%{_datadir}/fuse/ cp lib/*.scr ${RPM_BUILD_ROOT}%{_datadir}/fuse/ install -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png cp %{SOURCE2} README.z88sdk %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %{_mandir}/man1/fuse.1.gz %{_bindir}/fuse %{_datadir}/fuse/ %{_datadir}/pixmaps/%{name}.png %doc AUTHORS ChangeLog COPYING README THANKS ROMS README.z88sdk %changelog * Thu Feb 9 2006 Paul F. Johnson - 0.7.0-6 - Removed pre and post as they were empty - Fixed the "fuse-emulator" problem * Wed Oct 26 2005 Paul F. Johnson - 0.7.0-5 - Altered package name to fuse-emulator (macro) - Removed BR: zlib-devel and BR: glibc-devel and both Requires - Included comment regarding the SRPM not containing the ROMS - Added README.z88sdk file to the archive - Made the source of the tarball a valid one! - Removed a comma from after xml2-devel * Mon Oct 17 2005 Paul F. Johnson - 0.7.0-4 - Minor alteration to spec file (Build require=perl gone) - Addition of sound.c patch file * Fri Sep 02 2005 Paul F. Johnson - 0.7.0-3.fc - Removal of ROMS and addition to documentation of where to get ROMS * Mon Aug 29 2005 Paul F. Johnson - 0.7.0-2.fc - Fixes to both the source and spec for FC * Mon Feb 28 2005 Ian Chapman - 0.7.0-2.iss - Rebuild for newer version of lib765 (0.3.3) * Mon Jul 16 2004 Ian Chapman - 0.7.0-1.iss - Updated to version 0.7.0 - Updated for Fedora Core 2 - Added a graphic for the menu icon * Fri Dec 05 2003 Ian Chapman - 0.6.1.1-2 - Minor fixes to changelog - Improved use of macros - Removed most explicit library dependancies - Added menu icon * Sun Nov 30 2003 Ian Chapman - 0.6.1.1-1 - Initial Release fuse-sound.patch: --- NEW FILE fuse-sound.patch --- --- sound.c 2005-10-17 23:20:45.000000000 +0100 +++ fuse-0.7.0/sound.c 2005-08-20 23:46:32.000000000 +0100 @@ -58,8 +58,8 @@ int sound_stereo_ay_abc=0; /* (AY stereo) true for ABC stereo, else ACB */ int sound_stereo_ay_narrow=0; /* (AY stereo) true for narrow AY st. sep. */ -static int sound_stereo_ay=0; /* local copy of settings_current.stereo_ay */ -static int sound_stereo_beeper=0; /* and settings_current.stereo_beeper */ +int sound_stereo_ay=0; /* local copy of settings_current.stereo_ay */ +int sound_stereo_beeper=0; /* and settings_current.stereo_beeper */ /* assume all three tone channels together match the beeper volume (ish). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-emulator/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2006 22:14:52 -0000 1.1 +++ .cvsignore 7 Mar 2006 22:16:52 -0000 1.2 @@ -0,0 +1 @@ +fuse-0.7.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-emulator/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2006 22:14:52 -0000 1.1 +++ sources 7 Mar 2006 22:16:52 -0000 1.2 @@ -0,0 +1 @@ +ebb124e808e6467630efaae01fe03b64 fuse-0.7.0.tar.gz From fedora-extras-commits at redhat.com Tue Mar 7 23:51:51 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 7 Mar 2006 18:51:51 -0500 Subject: fedora-release fedora-release.spec,1.17,1.18 Message-ID: <200603072351.k27NppkX007224@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7206 Modified Files: fedora-release.spec Log Message: bump version, own /etc/pki/rpm-gpg (#164498) Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- fedora-release.spec 15 Feb 2006 19:04:31 -0000 1.17 +++ fedora-release.spec 7 Mar 2006 23:51:43 -0000 1.18 @@ -1,5 +1,5 @@ -%define release_version 4.92 -%define release_name Pre-FC5 +%define release_version 5 +%define release_name Bordeaux %define builtin_release_version Rawhide %define builtin_release_name Rawhide %define real_release_version %{?release_version}%{!?release_version:%{builtin_release_version}} @@ -99,4 +99,5 @@ /usr/share/firstboot/modules/eula.py* /usr/share/eula/eula.en_US %{_defaultdocdir}/HTML +%dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/* From fedora-extras-commits at redhat.com Tue Mar 7 23:56:51 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:56:51 -0500 Subject: rpms/oneko - New directory Message-ID: <200603072356.k27NurZQ007282@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7274/oneko Log Message: Directory /cvs/extras/rpms/oneko added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 23:56:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:56:57 -0500 Subject: rpms/oneko/devel - New directory Message-ID: <200603072356.k27Nuxj9007297@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7274/oneko/devel Log Message: Directory /cvs/extras/rpms/oneko/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 23:57:11 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:57:11 -0500 Subject: rpms/oneko Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603072357.k27NvD8j007331@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7319 Added Files: Makefile import.log Log Message: Setup of module oneko --- NEW FILE Makefile --- # Top level Makefile for module oneko all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 7 23:57:16 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:57:16 -0500 Subject: rpms/oneko/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603072357.k27NvJkr007351@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7319/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module oneko --- NEW 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 Mar 7 23:57:50 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:57:50 -0500 Subject: rpms/oneko import.log,1.1,1.2 Message-ID: <200603072358.k27NwNdW007486@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7400 Modified Files: import.log Log Message: auto-import oneko-1.2-3 on branch devel from oneko-1.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/oneko/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Mar 2006 23:57:11 -0000 1.1 +++ import.log 7 Mar 2006 23:57:50 -0000 1.2 @@ -0,0 +1 @@ +oneko-1_2-3:HEAD:oneko-1.2-3.src.rpm:1141775851 From fedora-extras-commits at redhat.com Tue Mar 7 23:57:56 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:57:56 -0500 Subject: rpms/oneko/devel oneko-1.2.sakura.5-nobsd.patch, NONE, 1.1 oneko.desktop, NONE, 1.1 oneko.png, NONE, 1.1 oneko.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603072358.k27NwS3K007490@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7400/devel Modified Files: .cvsignore sources Added Files: oneko-1.2.sakura.5-nobsd.patch oneko.desktop oneko.png oneko.spec Log Message: auto-import oneko-1.2-3 on branch devel from oneko-1.2-3.src.rpm oneko-1.2.sakura.5-nobsd.patch: --- NEW FILE oneko-1.2.sakura.5-nobsd.patch --- --- oneko-1.2.sakura.5.orig/cursors/cursor.include +++ oneko-1.2.sakura.5/cursors/cursor.include @@ -2,8 +2,6 @@ #include "mouse_cursor_mask.xbm" #include "bone_cursor.xbm" #include "bone_cursor_mask.xbm" -#include "bsd_cursor.xbm" -#include "bsd_cursor_mask.xbm" #include "card_cursor.xbm" #include "card_cursor_mask.xbm" #include "petal_cursor.xbm" --- oneko-1.2.sakura.5.orig/oneko.h +++ oneko-1.2.sakura.5/oneko.h @@ -36,7 +36,6 @@ #include "bitmaps/neko/neko.include" #include "bitmaps/tora/tora.include" #include "bitmaps/dog/dog.include" -#include "bitmaps/bsd/bsd.include" #include "bitmaps/sakura/sakura.include" #include "bitmaps/tomoyo/tomoyo.include" @@ -44,7 +43,6 @@ #include "bitmasks/neko/neko.mask.include" #include "bitmasks/dog/dog.mask.include" -#include "bitmasks/bsd/bsd.mask.include" #include "bitmasks/sakura/sakura.mask.include" #include "bitmasks/tomoyo/tomoyo.mask.include" --- oneko-1.2.sakura.5.orig/oneko.c +++ oneko-1.2.sakura.5/oneko.c @@ -33,7 +33,7 @@ int Synchronous = False; /* Types of animals */ -#define BITMAPTYPES 6 +#define BITMAPTYPES 5 typedef struct _AnimalDefaults { char *name; int speed, idle, bitmap_width, bitmap_height; @@ -51,8 +51,6 @@ mouse_cursor_width,mouse_cursor_height, mouse_cursor_x_hot,mouse_cursor_y_hot }, { "dog" , 10, 6, 32, 32, 125000L, 0, 0, bone_cursor_bits,bone_cursor_mask_bits, bone_cursor_width,bone_cursor_height, bone_cursor_x_hot,bone_cursor_y_hot }, - { "bsd_daemon" , 16, 6, 32, 32, 300000L, 22, 20, bsd_cursor_bits,bsd_cursor_mask_bits, - bsd_cursor_width,bsd_cursor_height, bsd_cursor_x_hot,bsd_cursor_y_hot }, { "sakura" , 13, 6, 32, 32, 125000L, 0, 0, card_cursor_bits,card_cursor_mask_bits, card_cursor_width,card_cursor_height, card_cursor_x_hot,card_cursor_y_hot }, { "tomoyo" , 10, 6, 32, 32, 125000L, 32, 32, petal_cursor_bits,petal_cursor_mask_bits, @@ -154,70 +152,70 @@ BitmapGCData BitmapGCDataTable[] = { - { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_bsd_bits, mati2_sakura_bits, mati2_tomoyo_bits, - &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_bsd_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits }, - { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_bsd_bits, jare2_sakura_bits, jare2_tomoyo_bits, - &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_bsd_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits }, - { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_bsd_bits, kaki1_sakura_bits, kaki1_tomoyo_bits, - &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_bsd_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits }, - { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_bsd_bits, kaki2_sakura_bits, kaki2_tomoyo_bits, - &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_bsd_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits }, - { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_bsd_bits, mati3_sakura_bits, mati3_tomoyo_bits, - &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_bsd_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits }, - { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_bsd_bits, sleep1_sakura_bits, sleep1_tomoyo_bits, - &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_bsd_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits }, - { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_bsd_bits, sleep2_sakura_bits, sleep2_tomoyo_bits, - &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_bsd_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits }, - { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, awake_bsd_bits, awake_sakura_bits, awake_tomoyo_bits, - &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_bsd_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits }, - { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, up1_bsd_bits, up1_sakura_bits, up1_tomoyo_bits, - &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_bsd_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits }, - { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, up2_bsd_bits, up2_sakura_bits, up2_tomoyo_bits, - &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_bsd_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits }, - { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, down1_bsd_bits, down1_sakura_bits, down1_tomoyo_bits, - &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_bsd_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits }, - { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, down2_bsd_bits, down2_sakura_bits, down2_tomoyo_bits, - &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_bsd_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits }, - { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, left1_bsd_bits, left1_sakura_bits, left1_tomoyo_bits, - &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_bsd_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits }, - { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, left2_bsd_bits, left2_sakura_bits, left2_tomoyo_bits, - &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_bsd_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits }, - { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, right1_bsd_bits, right1_sakura_bits, right1_tomoyo_bits, - &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_bsd_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits }, - { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, right2_bsd_bits, right2_sakura_bits, right2_tomoyo_bits, - &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_bsd_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits }, - { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_bsd_bits, upleft1_sakura_bits, upleft1_tomoyo_bits, - &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_bsd_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits }, - { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_bsd_bits, upleft2_sakura_bits, upleft2_tomoyo_bits, - &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_bsd_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits }, - { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_bsd_bits, upright1_sakura_bits, upright1_tomoyo_bits, - &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_bsd_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits }, - { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_bsd_bits, upright2_sakura_bits, upright2_tomoyo_bits, - &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_bsd_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits }, - { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_bsd_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits, - &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_bsd_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits }, - { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_bsd_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits, - &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_bsd_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits }, - { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_bsd_bits, dwright1_sakura_bits, dwright1_tomoyo_bits, - &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_bsd_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits }, - { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_bsd_bits, dwright2_sakura_bits, dwright2_tomoyo_bits, - &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_bsd_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits }, - { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_bsd_bits, utogi1_sakura_bits, utogi1_tomoyo_bits, - &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_bsd_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits }, - { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_bsd_bits, utogi2_sakura_bits, utogi2_tomoyo_bits, - &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_bsd_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits }, - { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_bsd_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits, - &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_bsd_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits }, - { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_bsd_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits, - &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_bsd_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits }, - { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_bsd_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits, - &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_bsd_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits }, - { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_bsd_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits, - &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_bsd_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits }, - { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_bsd_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits, - &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_bsd_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits }, - { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_bsd_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits, - &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_bsd_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits }, + { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_sakura_bits, mati2_tomoyo_bits, + &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits }, + { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_sakura_bits, jare2_tomoyo_bits, + &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits }, + { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_sakura_bits, kaki1_tomoyo_bits, + &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits }, + { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_sakura_bits, kaki2_tomoyo_bits, + &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits }, + { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_sakura_bits, mati3_tomoyo_bits, + &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits }, + { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_sakura_bits, sleep1_tomoyo_bits, + &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits }, + { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_sakura_bits, sleep2_tomoyo_bits, + &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits }, + { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, awake_sakura_bits, awake_tomoyo_bits, + &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits }, + { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, up1_sakura_bits, up1_tomoyo_bits, + &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits }, + { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, up2_sakura_bits, up2_tomoyo_bits, + &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits }, + { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, down1_sakura_bits, down1_tomoyo_bits, + &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits }, + { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, down2_sakura_bits, down2_tomoyo_bits, + &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits }, + { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, left1_sakura_bits, left1_tomoyo_bits, + &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits }, + { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, left2_sakura_bits, left2_tomoyo_bits, + &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits }, + { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, right1_sakura_bits, right1_tomoyo_bits, + &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits }, + { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, right2_sakura_bits, right2_tomoyo_bits, + &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits }, + { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_sakura_bits, upleft1_tomoyo_bits, + &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits }, + { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_sakura_bits, upleft2_tomoyo_bits, + &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits }, + { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_sakura_bits, upright1_tomoyo_bits, + &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits }, + { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_sakura_bits, upright2_tomoyo_bits, + &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits }, + { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits, + &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits }, + { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits, + &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits }, + { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_sakura_bits, dwright1_tomoyo_bits, + &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits }, + { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_sakura_bits, dwright2_tomoyo_bits, + &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits }, + { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_sakura_bits, utogi1_tomoyo_bits, + &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits }, + { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_sakura_bits, utogi2_tomoyo_bits, + &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits }, + { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits, + &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits }, + { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits, + &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits }, + { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits, + &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits }, + { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits, + &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits }, + { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits, + &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits }, + { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits, + &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits }, { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } }; @@ -1512,8 +1510,6 @@ } else { char *av = argv[ArgCounter] + 1; - if (strcmp(av, "bsd") == 0) - av = "bsd_daemon"; for (loop=0;loop 1.2-3 - remove includedir macro, not needed - rename japanese man page to not have .jp extension * Thu Jan 19 2006 Tom "spot" Callaway 1.2-2 - use _includedir macro - remove _i386_ hardcode - fix blatant typo in patch - rename docs to jp - use -p for install - remove xorg-x11-proto-devel, unnecessary * Wed Jan 18 2006 Tom "spot" Callaway 1.2-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oneko/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2006 23:57:16 -0000 1.1 +++ .cvsignore 7 Mar 2006 23:57:56 -0000 1.2 @@ -0,0 +1 @@ +oneko-1.2.sakura.5.noBSD.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/oneko/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2006 23:57:16 -0000 1.1 +++ sources 7 Mar 2006 23:57:56 -0000 1.2 @@ -0,0 +1 @@ +c183cc8963d32ded3d9dacd4514188ff oneko-1.2.sakura.5.noBSD.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 00:00:38 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 19:00:38 -0500 Subject: owners owners.list,1.720,1.721 Message-ID: <200603080001.k2801AOk008556@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7708 Modified Files: owners.list Log Message: Oneko. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.720 retrieving revision 1.721 diff -u -r1.720 -r1.721 --- owners.list 7 Mar 2006 17:46:38 -0000 1.720 +++ owners.list 8 Mar 2006 00:00:38 -0000 1.721 @@ -749,6 +749,7 @@ 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| Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|oneko|Cat chases the cursor|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|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| From fedora-extras-commits at redhat.com Wed Mar 8 00:02:15 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 19:02:15 -0500 Subject: rpms/oneko/FC-3 oneko.spec,1.1,1.2 Message-ID: <200603080002.k2802lEm009624@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9577/FC-3 Modified Files: oneko.spec Log Message: Fix pre-modular X issues (FC-3/4). Index: oneko.spec =================================================================== RCS file: /cvs/extras/rpms/oneko/FC-3/oneko.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- oneko.spec 7 Mar 2006 23:57:56 -0000 1.1 +++ oneko.spec 8 Mar 2006 00:02:14 -0000 1.2 @@ -12,7 +12,7 @@ URL: http://www.daidouji.com/oneko/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: oneko-1.2.sakura.5-nobsd.patch -BuildRequires: libX11-devel, imake, libXext-devel +BuildRequires: xorg-x11-devel BuildRequires: desktop-file-utils %description @@ -50,7 +50,7 @@ %files %defattr(-,root,root) %doc README.jp README-NEW README-SUPP.jp sample.resource -%{_bindir}/oneko +%{_exec_prefix}/X11R6/bin/oneko %{_datadir}/applications/fedora-oneko.desktop %{_datadir}/pixmaps/oneko.png %{_mandir}/ja/man1/* From fedora-extras-commits at redhat.com Wed Mar 8 00:02:26 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 19:02:26 -0500 Subject: rpms/oneko/FC-4 oneko.spec,1.1,1.2 Message-ID: <200603080003.k28035uc009627@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9577/FC-4 Modified Files: oneko.spec Log Message: Fix pre-modular X issues (FC-3/4). Index: oneko.spec =================================================================== RCS file: /cvs/extras/rpms/oneko/FC-4/oneko.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- oneko.spec 7 Mar 2006 23:57:56 -0000 1.1 +++ oneko.spec 8 Mar 2006 00:02:26 -0000 1.2 @@ -12,7 +12,7 @@ URL: http://www.daidouji.com/oneko/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: oneko-1.2.sakura.5-nobsd.patch -BuildRequires: libX11-devel, imake, libXext-devel +BuildRequires: xorg-x11-devel BuildRequires: desktop-file-utils %description @@ -50,7 +50,7 @@ %files %defattr(-,root,root) %doc README.jp README-NEW README-SUPP.jp sample.resource -%{_bindir}/oneko +%{_exec_prefix}/X11R6/bin/oneko %{_datadir}/applications/fedora-oneko.desktop %{_datadir}/pixmaps/oneko.png %{_mandir}/ja/man1/* From fedora-extras-commits at redhat.com Wed Mar 8 00:20:38 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:20:38 -0500 Subject: rpms/quadkonsole - New directory Message-ID: <200603080020.k280KeLF009850@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9842/quadkonsole Log Message: Directory /cvs/extras/rpms/quadkonsole added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 00:20:44 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:20:44 -0500 Subject: rpms/quadkonsole/devel - New directory Message-ID: <200603080020.k280KkU0009865@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9842/quadkonsole/devel Log Message: Directory /cvs/extras/rpms/quadkonsole/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 00:21:13 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:21:13 -0500 Subject: rpms/quadkonsole Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603080021.k280LF2k009899@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887 Added Files: Makefile import.log Log Message: Setup of module quadkonsole --- NEW FILE Makefile --- # Top level Makefile for module quadkonsole all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 00:21:22 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:21:22 -0500 Subject: rpms/quadkonsole/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603080021.k280LOKi009917@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module quadkonsole --- NEW 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 Mar 8 00:22:23 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:22:23 -0500 Subject: rpms/quadkonsole import.log,1.1,1.2 Message-ID: <200603080022.k280Mub8009989@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9955 Modified Files: import.log Log Message: auto-import quadkonsole-2.0.1-2 on branch devel from quadkonsole-2.0.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/quadkonsole/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 00:21:13 -0000 1.1 +++ import.log 8 Mar 2006 00:22:23 -0000 1.2 @@ -0,0 +1 @@ +quadkonsole-2_0_1-2:HEAD:quadkonsole-2.0.1-2.src.rpm:1141777336 From fedora-extras-commits at redhat.com Wed Mar 8 00:22:29 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:22:29 -0500 Subject: rpms/quadkonsole/devel quadkonsole.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603080023.k280N2os009993@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9955/devel Modified Files: .cvsignore sources Added Files: quadkonsole.spec Log Message: auto-import quadkonsole-2.0.1-2 on branch devel from quadkonsole-2.0.1-2.src.rpm --- NEW FILE quadkonsole.spec --- Name: quadkonsole Version: 2.0.1 Release: 2%{?dist} Summary: Embeds Konsole kparts in a grid layout Group: Applications/System License: GPL URL: http://nomis80.org/quadkonsole/ Source0: http://nomis80.org/quadkonsole/quadkonsole-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 3.2, desktop-file-utils %description QuadKonsole is a program which embeds 4 Konsoles (other numbers can be specified on the command-line). This way you save screen real estate, you don't have to worry about careful placement and the startup time is faster than starting up 4 separate Konsoles. %prep %setup -q %build %configure --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --delete-original \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/quadkonsole.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO %{_bindir}/quadkonsole %{_datadir}/applications/kde/fedora-quadkonsole.desktop %changelog * Tue Mar 7 2006 Simon Perreault - 2.0.1-2 - Reformatted description to make rpmlint happy. * Tue Mar 7 2006 Simon Perreault - 2.0.1-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quadkonsole/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 00:21:22 -0000 1.1 +++ .cvsignore 8 Mar 2006 00:22:29 -0000 1.2 @@ -0,0 +1 @@ +quadkonsole-2.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/quadkonsole/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 00:21:22 -0000 1.1 +++ sources 8 Mar 2006 00:22:29 -0000 1.2 @@ -0,0 +1 @@ +3334b7a3ad3e6f9b96f59a00ccedae91 quadkonsole-2.0.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 00:26:00 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:26:00 -0500 Subject: owners owners.list,1.721,1.722 Message-ID: <200603080026.k280QXAX010078@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10032 Modified Files: owners.list Log Message: Added quadkonsole component Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.721 retrieving revision 1.722 diff -u -r1.721 -r1.722 --- owners.list 8 Mar 2006 00:00:38 -0000 1.721 +++ owners.list 8 Mar 2006 00:26:00 -0000 1.722 @@ -1181,6 +1181,7 @@ 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|qtparted|Partition Magic clone written in C++ using the Qt toolkit|steve at silug.org|extras-qa at fedoraproject.org| +Fedora Extras|quadkonsole|Embeds Konsole kparts in a grid layout|nomis80 at nomis80.org|extras-qa at fedoraproject.org| Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|quarry|A multi-purpose board-game GUI|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|qucs|Circuit simulator|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 8 01:39:24 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 20:39:24 -0500 Subject: rpms/opencv/devel opencv-0.9.7-intrinsics-simple.patch, NONE, 1.1 opencv-0.9.7-intrinsics.patch, NONE, 1.1 opencv-0.9.7-pythondir.patch, NONE, 1.1 opencv.spec, 1.1, 1.2 Message-ID: <200603080139.k281dup1012536@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12507 Modified Files: opencv.spec Added Files: opencv-0.9.7-intrinsics-simple.patch opencv-0.9.7-intrinsics.patch opencv-0.9.7-pythondir.patch Log Message: Merging FC-4 stuff back into devel branch. opencv-0.9.7-intrinsics-simple.patch: --- NEW FILE opencv-0.9.7-intrinsics-simple.patch --- diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h --- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-06 22:59:56.000000000 -0500 @@ -48,7 +48,7 @@ #include #include - #if defined WIN64 && defined EM64T && defined _MSC_VER + #if defined WIN64 && defined EM64T && defined _MSC_VER || defined __SSE2__ #include #endif opencv-0.9.7-intrinsics.patch: --- NEW FILE opencv-0.9.7-intrinsics.patch --- diff -urp opencv-0.9.7.orig/configure.in opencv-0.9.7/configure.in --- opencv-0.9.7.orig/configure.in 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/configure.in 2006-03-07 12:05:24.000000000 -0500 @@ -281,6 +281,11 @@ dnl # #AC_SUBST(CXXOPENMP) +dnl +dnl ****************** SSE2 Intrinsics ************************** +dnl +AC_CHECK_HEADERS([emmintrin.h]) + AC_SUBST(DEBUG) AC_CONFIG_FILES([Makefile diff -urp opencv-0.9.7.orig/cv/src/_cv.h opencv-0.9.7/cv/src/_cv.h --- opencv-0.9.7.orig/cv/src/_cv.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cv/src/_cv.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CV_INTERNAL_H_ #define _CV_INTERNAL_H_ +#ifdef HAVE_CONFIG_H +#include +#endif + #if defined _MSC_VER && _MSC_VER >= 1200 /* disable warnings related to inline functions */ #pragma warning( disable: 4711 4710 4514 ) diff -urp opencv-0.9.7.orig/cvaux/src/_cvaux.h opencv-0.9.7/cvaux/src/_cvaux.h --- opencv-0.9.7.orig/cvaux/src/_cvaux.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cvaux/src/_cvaux.h 2006-03-07 12:05:24.000000000 -0500 @@ -41,6 +41,10 @@ #ifndef __CVAUX_H__ #define __CVAUX_H__ +#ifdef HAVE_CONFIG_H +#include +#endif + #if _MSC_VER >= 1200 #pragma warning( disable: 4710 4711 4514 ) /* function AAA selected for automatic inline expansion */ #endif diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h --- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-07 12:05:24.000000000 -0500 @@ -48,7 +48,8 @@ #include #include - #if defined WIN64 && defined EM64T && defined _MSC_VER + #if defined HAVE_EMMINTRIN_H \ + || defined WIN64 && defined EM64T && defined _MSC_VER #include #endif diff -urp opencv-0.9.7.orig/cxcore/src/_cxcore.h opencv-0.9.7/cxcore/src/_cxcore.h --- opencv-0.9.7.orig/cxcore/src/_cxcore.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cxcore/src/_cxcore.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CXCORE_INTERNAL_H_ #define _CXCORE_INTERNAL_H_ +#ifdef HAVE_CONFIG_H +#include +#endif + #if defined _MSC_VER && _MSC_VER >= 1200 /* disable warnings related to inline functions */ #pragma warning( disable: 4711 4710 4514 ) diff -urp opencv-0.9.7.orig/interfaces/swig/python/error.h opencv-0.9.7/interfaces/swig/python/error.h --- opencv-0.9.7.orig/interfaces/swig/python/error.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/python/error.h 2006-03-07 12:06:40.000000000 -0500 @@ -44,6 +44,9 @@ // Mark Asbach // Institute of Communications Engineering, RWTH Aachen University +#ifdef HAVE_CONFIG_H +#include +#endif #include "cxcore.h" diff -urp opencv-0.9.7.orig/interfaces/swig/python/pycvseq.h opencv-0.9.7/interfaces/swig/python/pycvseq.h --- opencv-0.9.7.orig/interfaces/swig/python/pycvseq.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/python/pycvseq.h 2006-03-07 12:07:13.000000000 -0500 @@ -39,6 +39,9 @@ // //M*/ +#ifdef HAVE_CONFIG_H +#include +#endif #include "cxcore.h" diff -urp opencv-0.9.7.orig/otherlibs/highgui/_highgui.h opencv-0.9.7/otherlibs/highgui/_highgui.h --- opencv-0.9.7.orig/otherlibs/highgui/_highgui.h 2006-03-06 22:58:42.000000000 -0500 +++ opencv-0.9.7/otherlibs/highgui/_highgui.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,12 @@ #ifndef __HIGHGUI_H_ #define __HIGHGUI_H_ +#ifdef HAVE_CONFIG_H +#include +#elif defined WIN32 +void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ); +#endif + #include #include #include @@ -52,12 +58,6 @@ #include "highgui.h" #include "cxmisc.h" -#ifndef WIN32 -#include "cvconfig.h" -#else -void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ); -#endif - /* Errors */ #define HG_OK 0 /* Don't bet on it! */ #define HG_BADNAME -1 /* Bad window or file name */ diff -urp opencv-0.9.7.orig/interfaces/swig/general/cv.i opencv-0.9.7/interfaces/swig/general/cv.i --- opencv-0.9.7.orig/interfaces/swig/general/cv.i 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/general/cv.i 2006-03-07 12:33:16.000000000 -0500 @@ -49,6 +49,10 @@ %{ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "cv.h" %} diff -urp opencv-0.9.7.orig/interfaces/swig/general/highgui.i opencv-0.9.7/interfaces/swig/general/highgui.i --- opencv-0.9.7.orig/interfaces/swig/general/highgui.i 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/general/highgui.i 2006-03-07 12:33:46.000000000 -0500 @@ -48,6 +48,10 @@ %module(package="opencv") highgui %{ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "highgui.h" %} diff -urp opencv-0.9.7.orig/apps/haartraining/src/_cvcommon.h opencv-0.9.7/apps/haartraining/src/_cvcommon.h --- opencv-0.9.7.orig/apps/haartraining/src/_cvcommon.h 2006-03-07 14:23:05.000000000 -0500 +++ opencv-0.9.7/apps/haartraining/src/_cvcommon.h 2006-03-07 14:34:25.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef __CVCOMMON_H_ #define __CVCOMMON_H_ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include diff -urp opencv-0.9.7.orig/apps/haartraining/src/_cvhaartraining.h opencv-0.9.7/apps/haartraining/src/_cvhaartraining.h --- opencv-0.9.7.orig/apps/haartraining/src/_cvhaartraining.h 2006-03-07 14:23:05.000000000 -0500 +++ opencv-0.9.7/apps/haartraining/src/_cvhaartraining.h 2006-03-07 14:33:31.000000000 -0500 @@ -48,6 +48,10 @@ #ifndef __CVHAARTRAINING_H_ #define __CVHAARTRAINING_H_ +#ifdef HAVE_CONFIG_H +#include +#endif + #include <_cvcommon.h> #include #include diff -urp opencv-0.9.7.orig/apps/haartraining/src/performance.cpp opencv-0.9.7/apps/haartraining/src/performance.cpp --- opencv-0.9.7.orig/apps/haartraining/src/performance.cpp 2006-03-07 14:23:05.000000000 -0500 +++ opencv-0.9.7/apps/haartraining/src/performance.cpp 2006-03-07 14:35:41.000000000 -0500 @@ -44,6 +44,10 @@ * * Measure performance of classifier */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "cv.h" #include #include opencv-0.9.7-pythondir.patch: --- NEW FILE opencv-0.9.7-pythondir.patch --- diff -urp opencv-0.9.7.orig/interfaces/swig/python/Makefile.am opencv-0.9.7/interfaces/swig/python/Makefile.am --- opencv-0.9.7.orig/interfaces/swig/python/Makefile.am 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/python/Makefile.am 2006-03-07 09:42:55.000000000 -0500 @@ -18,7 +18,7 @@ AM_CPPFLAGS = \ if BUILD_PYTHON_WRAPPERS - pkgpython_LTLIBRARIES = _cv.la _highgui.la + pkgpyexec_LTLIBRARIES = _cv.la _highgui.la pkgpython_PYTHON = \ __init__.py \ Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/devel/opencv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opencv.spec 5 Mar 2006 19:45:57 -0000 1.1 +++ opencv.spec 8 Mar 2006 01:39:23 -0000 1.2 @@ -1,8 +1,11 @@ %define with_ffmpeg 0 +%define pythondir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') +%define pyexecdir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)') + Name: opencv Version: 0.9.7 -Release: 3 +Release: 13%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -10,6 +13,8 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile +Patch0: opencv-0.9.7-intrinsics-simple.patch +Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel @@ -40,7 +45,7 @@ Summary: Python bindings for apps which use OpenCV Group: Development/Libraries Requires: opencv = %{version}-%{release} -Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`) +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description python This package contains Python bindings for the OpenCV library. @@ -48,6 +53,8 @@ %prep %setup -q +%patch0 -p1 -b .intrinsics +%patch1 -p1 -b .pythondir %{__sed} -i 's/\r//' interfaces/swig/python/*.py \ samples/python/*.py %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \ @@ -55,7 +62,7 @@ %build -%configure --disable-static --enable-python --with-apps +%configure --enable-maintainer-mode --disable-static --enable-python --with-apps make %{?_smp_mflags} @@ -63,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ - $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/opencv/*.la \ + $RPM_BUILD_ROOT%{pyexecdir}/opencv/*.la \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/build_all.sh \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.dsp \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.vcproj \ @@ -106,11 +113,46 @@ %files python -%{_libdir}/python*/site-packages/opencv +%dir %{pythondir}/opencv +%{pythondir}/opencv/*.py +%{pythondir}/opencv/*.pyc +%ghost %{pythondir}/opencv/*.pyo +%{pyexecdir}/opencv %doc %{_datadir}/opencv/samples/python %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-13 +- Changed intrinsics patch so that it matches upstream. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-12 +- More intrinsics patch fixing. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-11 +- Don't do "make check" because it doesn't run any tests anyway. +- Back to main intrinsics patch. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-10 +- Using simple intrinsincs patch. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-9 +- Still more fixing of intrinsics patch for Python bindings on x86_64. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-8 +- Again fixed intrinsics patch so that Python modules build on x86_64. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-7 +- Fixed intrinsics patch so that it works. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-6 +- Fixed Python bindings location on x86_64. + +* Mon Mar 6 2006 Simon Perreault - 0.9.7-5 +- SSE2 support on x86_64. + +* Mon Mar 6 2006 Simon Perreault - 0.9.7-4 +- Rebuild + * Sun Oct 16 2005 Simon Perreault - 0.9.7-3 - Removed useless sample compilation makefiles/project files and replaced them with one that works on Fedora Core. From fedora-extras-commits at redhat.com Wed Mar 8 03:08:57 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 7 Mar 2006 22:08:57 -0500 Subject: rpms/cpanspec/devel .cvsignore, 1.2, 1.3 cpanspec.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603080309.k2839UNN016754@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16733 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.60. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Feb 2006 22:18:10 -0000 1.2 +++ .cvsignore 8 Mar 2006 03:08:57 -0000 1.3 @@ -1 +1 @@ -cpanspec-1.59.tar.gz +cpanspec-1.60.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpanspec.spec 3 Feb 2006 22:18:10 -0000 1.1 +++ cpanspec.spec 8 Mar 2006 03:08:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: cpanspec -Version: 1.59 -Release: 2%{?dist} +Version: 1.60 +Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools @@ -36,9 +36,6 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - # No tests. #%check #./Build test @@ -48,11 +45,14 @@ %files %defattr(-,root,root,-) -%doc COPYING Artistic +%doc Artistic COPYING BUGS TODO %{_bindir}/* %{_mandir}/man1/* %changelog +* Tue Mar 07 2006 Steven Pritchard 1.60-1 +- Update to 1.60. + * Wed Feb 01 2006 Steven Pritchard 1.59-2 - URL/Source0 on SourceForge. - Use a more appropriate Group. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Feb 2006 22:18:10 -0000 1.2 +++ sources 8 Mar 2006 03:08:57 -0000 1.3 @@ -1 +1 @@ -3ed3cc74eeda4b7ad2d04534013c7672 cpanspec-1.59.tar.gz +ebfaf5da00b1a5096f1919451d9be9e6 cpanspec-1.60.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 03:11:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 7 Mar 2006 22:11:45 -0500 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.2, 1.3 cpanspec.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603080312.k283CHaR016862@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16821 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.60. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Feb 2006 22:18:10 -0000 1.2 +++ .cvsignore 8 Mar 2006 03:11:44 -0000 1.3 @@ -1 +1 @@ -cpanspec-1.59.tar.gz +cpanspec-1.60.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpanspec.spec 3 Feb 2006 22:18:10 -0000 1.1 +++ cpanspec.spec 8 Mar 2006 03:11:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: cpanspec -Version: 1.59 -Release: 2%{?dist} +Version: 1.60 +Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools @@ -36,9 +36,6 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - # No tests. #%check #./Build test @@ -48,11 +45,14 @@ %files %defattr(-,root,root,-) -%doc COPYING Artistic +%doc Artistic COPYING BUGS TODO %{_bindir}/* %{_mandir}/man1/* %changelog +* Tue Mar 07 2006 Steven Pritchard 1.60-1 +- Update to 1.60. + * Wed Feb 01 2006 Steven Pritchard 1.59-2 - URL/Source0 on SourceForge. - Use a more appropriate Group. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Feb 2006 22:18:10 -0000 1.2 +++ sources 8 Mar 2006 03:11:44 -0000 1.3 @@ -1 +1 @@ -3ed3cc74eeda4b7ad2d04534013c7672 cpanspec-1.59.tar.gz +ebfaf5da00b1a5096f1919451d9be9e6 cpanspec-1.60.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 04:48:47 2006 From: fedora-extras-commits at redhat.com (Leon Ho (llch)) Date: Tue, 7 Mar 2006 23:48:47 -0500 Subject: rpms/xcin/devel xcin.spec,1.5,1.6 Message-ID: <200603080449.k284nKSm019024@cvs-int.fedora.redhat.com> Author: llch Update of /cvs/extras/rpms/xcin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19007 Modified Files: xcin.spec Log Message: bump build for FE5 Index: xcin.spec =================================================================== RCS file: /cvs/extras/rpms/xcin/devel/xcin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xcin.spec 22 May 2005 23:02:22 -0000 1.5 +++ xcin.spec 8 Mar 2006 04:48:47 -0000 1.6 @@ -1,7 +1,7 @@ Summary: An X Input Method Server for Chinese. Name: xcin Version: 2.5.3.pre3 -Release: 27 +Release: 28 License: GPL Group: User Interface/X Source0: ftp://xcin.linux.org.tw/pub/xcin/xcin/%{name}-%{version}.tar.gz @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 08 2006 Leon Ho - 2.5.3.pre3-28 +- rebuilt for Fedora Extras 5 + * Sun May 22 2005 Jeremy Katz - 2.5.3.pre3-27 - rebuild on all arches From fedora-extras-commits at redhat.com Wed Mar 8 06:10:32 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 8 Mar 2006 01:10:32 -0500 Subject: rpms/namazu/devel filter-requires-namazu.sh, 1.1, 1.2 namazu.spec, 1.4, 1.5 Message-ID: <200603080611.k286B4fP023208@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23189 Modified Files: filter-requires-namazu.sh namazu.spec Log Message: * Wed Mar 8 2006 Akira TAGOH - 2.0.15-3 - filter-requires-namazu.sh: updated to fix much more self-dependencies. (#184149) Index: filter-requires-namazu.sh =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/filter-requires-namazu.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- filter-requires-namazu.sh 30 May 2005 02:23:25 -0000 1.1 +++ filter-requires-namazu.sh 8 Mar 2006 06:10:31 -0000 1.2 @@ -1,3 +1,3 @@ #!/bin/sh -/usr/lib/rpm/find-requires $* | grep -v 'perl(nmzidx.pl)' +/usr/lib/rpm/find-requires $* | egrep -v 'perl\((nmzidx.pl|conf.pl|document.pl|time.pl|util.pl|var.pl)\)' Index: namazu.spec =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/namazu.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- namazu.spec 2 Mar 2006 07:30:38 -0000 1.4 +++ namazu.spec 8 Mar 2006 06:10:31 -0000 1.5 @@ -7,7 +7,7 @@ Summary: Namazu is a full-text search engine Name: namazu Version: 2.0.15 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Text URL: http://www.namazu.org/ @@ -139,6 +139,9 @@ %changelog +* Wed Mar 8 2006 Akira TAGOH - 2.0.15-3 +- filter-requires-namazu.sh: updated to fix much more self-dependencies. (#184149) + * Thu Mar 2 2006 Akira TAGOH - 2.0.15-2 - New upstream release. - namazu-2.0.13-de.patch: removed. From fedora-extras-commits at redhat.com Wed Mar 8 10:26:03 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Wed, 8 Mar 2006 05:26:03 -0500 Subject: rpms/CCfits/devel CCfits.spec,1.1,1.2 Message-ID: <200603081026.k28AQahM032080@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32062 Modified Files: CCfits.spec Log Message: Removed explicit Buildrequires: gcc-c++ Index: CCfits.spec =================================================================== RCS file: /cvs/extras/rpms/CCfits/devel/CCfits.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CCfits.spec 7 Mar 2006 17:40:23 -0000 1.1 +++ CCfits.spec 8 Mar 2006 10:26:03 -0000 1.2 @@ -1,6 +1,6 @@ Name: CCfits Version: 1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A C++ interface for cfitsio Group: Development/Libraries @@ -12,7 +12,6 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cfitsio-devel -BuildRequires: gcc-c++ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -78,6 +77,8 @@ %doc html %changelog +* Wed Mar 08 2006 Sergio Pascual 1.4-4 +- Removed explicit Buildrequires gcc-c++ * Tue Mar 07 2006 Sergio Pascual 1.4-3 - Rebuilt with new upstream source. * Mon Mar 06 2006 Sergio Pascual 1.4-2 From fedora-extras-commits at redhat.com Wed Mar 8 10:49:02 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Wed, 8 Mar 2006 05:49:02 -0500 Subject: rpms/gstreamer-python/FC-4 .cvsignore, 1.4, 1.5 gstreamer-python.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200603081049.k28AnfCM032227@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/gstreamer-python/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32203 Modified Files: .cvsignore gstreamer-python.spec sources Log Message: update to 0.8.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 14 Jan 2006 13:59:42 -0000 1.4 +++ .cvsignore 8 Mar 2006 10:49:01 -0000 1.5 @@ -1 +1 @@ -gst-python-0.8.3.tar.bz2 +gst-python-0.8.4.tar.bz2 Index: gstreamer-python.spec =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/gstreamer-python.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gstreamer-python.spec 14 Jan 2006 13:59:42 -0000 1.9 +++ gstreamer-python.spec 8 Mar 2006 10:49:01 -0000 1.10 @@ -3,9 +3,9 @@ %define gstreamer gstreamer Name: %{gstreamer}-python -Version: 0.8.3 -Release: 1 -Summary: Python bindings for GStreamer. +Version: 0.8.4 +Release: 1%{?dist} +Summary: Python bindings for GStreamer Group: Development/Languages License: LGPL @@ -71,6 +71,10 @@ %{_libdir}/pkgconfig/gst-python-0.8.pc %changelog +* Wed Mar 08 2006 Thomas Vander Stichele +- 0.8.4-1 +- update to 0.8.4 version + * Sat Jan 14 2006 Thomas Vander Stichele - 0.8.3-1 - fix requires and buildrequires which were using an underscore - update to 0.8.3 version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 14 Jan 2006 13:59:42 -0000 1.4 +++ sources 8 Mar 2006 10:49:01 -0000 1.5 @@ -1 +1 @@ -f33f6b95d3911e7ad355199abea8d0ff gst-python-0.8.3.tar.bz2 +bbd06996c510543b169210f0219215f7 gst-python-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 8 12:13:33 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Wed, 8 Mar 2006 07:13:33 -0500 Subject: rpms/gstreamer08-python/devel .cvsignore, 1.2, 1.3 gstreamer08-python.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603081214.k28CE55U003846@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/gstreamer08-python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3825 Modified Files: .cvsignore gstreamer08-python.spec sources Log Message: new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-python/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2006 17:24:48 -0000 1.2 +++ .cvsignore 8 Mar 2006 12:13:20 -0000 1.3 @@ -1 +1 @@ -gst-python-0.8.3.tar.bz2 +gst-python-0.8.4.tar.bz2 Index: gstreamer08-python.spec =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-python/devel/gstreamer08-python.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gstreamer08-python.spec 22 Jan 2006 17:24:48 -0000 1.1 +++ gstreamer08-python.spec 8 Mar 2006 12:13:20 -0000 1.2 @@ -5,7 +5,7 @@ %define pygtk_minver 2.4.0 Name: %{gstreamer}-python -Version: 0.8.3 +Version: 0.8.4 Release: 1%{?dist} Summary: Python bindings for GStreamer @@ -71,6 +71,10 @@ %{_libdir}/pkgconfig/gst-python-0.8.pc %changelog +* Wed Mar 08 2006 Thomas Vander Stichele +- 0.8.4-1 +- new upstream release + * Sun Jan 22 2006 Thomas Vander Stichele - Renamed package to gstreamer08-python for rawhide before FC5 - Removed Requires: of -devel packages Index: sources =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-python/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2006 17:24:48 -0000 1.2 +++ sources 8 Mar 2006 12:13:20 -0000 1.3 @@ -1 +1 @@ -f33f6b95d3911e7ad355199abea8d0ff gst-python-0.8.3.tar.bz2 +bbd06996c510543b169210f0219215f7 gst-python-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 8 12:42:04 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Wed, 8 Mar 2006 07:42:04 -0500 Subject: rpms/opencv/devel opencv.spec,1.2,1.3 Message-ID: <200603081242.k28CgbJO004449@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4432 Modified Files: opencv.spec Log Message: * Wed Mar 8 2006 Simon Perreault - 0.9.7-14 - Added build dependency on Autotools. Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/devel/opencv.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- opencv.spec 8 Mar 2006 01:39:23 -0000 1.2 +++ opencv.spec 8 Mar 2006 12:42:04 -0000 1.3 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -17,6 +17,7 @@ Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf, automake BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: swig >= 1.3.24, zlib-devel, pkgconfig BuildRequires: python-devel @@ -122,6 +123,9 @@ %changelog +* Wed Mar 8 2006 Simon Perreault - 0.9.7-14 +- Added build dependency on Autotools. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-13 - Changed intrinsics patch so that it matches upstream. From fedora-extras-commits at redhat.com Wed Mar 8 13:02:46 2006 From: fedora-extras-commits at redhat.com (Neil Horman (nhorman)) Date: Wed, 8 Mar 2006 08:02:46 -0500 Subject: rpms/iozone/devel iozone.spec,1.2,1.3 Message-ID: <200603081303.k28D3Jjo006438@cvs-int.fedora.redhat.com> Author: nhorman Update of /cvs/extras/rpms/iozone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6420 Modified Files: iozone.spec Log Message: bumping release number Index: iozone.spec =================================================================== RCS file: /cvs/extras/rpms/iozone/devel/iozone.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- iozone.spec 31 May 2005 18:54:41 -0000 1.2 +++ iozone.spec 8 Mar 2006 13:02:46 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Filesystem benchmarking utility Name: iozone Version: 3 -Release: 1%{?dist} +Release: 2%{?dist} License: Freeware Group: Applications/Engineering URL: http://www.iozone.org From fedora-extras-commits at redhat.com Wed Mar 8 13:15:10 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Wed, 8 Mar 2006 08:15:10 -0500 Subject: rpms/opencv/devel opencv.spec,1.3,1.4 Message-ID: <200603081315.k28DFgnR006543@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6526 Modified Files: opencv.spec Log Message: * Wed Mar 8 2006 Simon Perreault - 0.9.7-15 - Force a re-run of Autotools by calling autoreconf. Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/devel/opencv.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- opencv.spec 8 Mar 2006 12:42:04 -0000 1.3 +++ opencv.spec 8 Mar 2006 13:15:09 -0000 1.4 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -60,10 +60,11 @@ samples/python/*.py %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \ interfaces/swig/python/__init__.py +autoreconf -vif %build -%configure --enable-maintainer-mode --disable-static --enable-python --with-apps +%configure --disable-static --enable-python --with-apps make %{?_smp_mflags} @@ -123,6 +124,9 @@ %changelog +* Wed Mar 8 2006 Simon Perreault - 0.9.7-15 +- Force a re-run of Autotools by calling autoreconf. + * Wed Mar 8 2006 Simon Perreault - 0.9.7-14 - Added build dependency on Autotools. From fedora-extras-commits at redhat.com Wed Mar 8 14:45:52 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 8 Mar 2006 09:45:52 -0500 Subject: fedora-security/audit fc4,1.167,1.168 fc5,1.74,1.75 Message-ID: <200603081445.k28EjqAR008857@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8837 Modified Files: fc4 fc5 Log Message: Note new thunderbird issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- fc4 7 Mar 2006 10:15:00 -0000 1.167 +++ fc4 8 Mar 2006 14:45:43 -0000 1.168 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- fc5 7 Mar 2006 10:15:00 -0000 1.74 +++ fc5 8 Mar 2006 14:45:43 -0000 1.75 @@ -17,6 +17,7 @@ ** are items that need attention +CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) CVE-2006-0884 ** thunderbird From fedora-extras-commits at redhat.com Wed Mar 8 15:17:57 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 8 Mar 2006 10:17:57 -0500 Subject: rpms/ufsparse/devel ufsparse.spec,1.12,1.13 Message-ID: <200603081518.k28FITqs011049@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ufsparse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11030 Modified Files: ufsparse.spec Log Message: Disable building CSparse--see comments in %build section. Index: ufsparse.spec =================================================================== RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ufsparse.spec 7 Mar 2006 18:54:03 -0000 1.12 +++ ufsparse.spec 8 Mar 2006 15:17:56 -0000 1.13 @@ -102,9 +102,13 @@ %define cholmod_version_major 1 ### CHOLMOD can also be compiled to use the METIS library, but it is not ### used here because its licensing terms exclude it from Fedora Extras. -### To compile with METIS, change the definition below to -### CHOLMOD_FLAGS="$RPM_OPT_FLAGS -I%{_includedir}/metis -fPIC" +### To compile with METIS, define enable_metis as 1 below. +%define enable_metis 0 +%if "%{?enable_metis}" == "1" +CHOLMOD_FLAGS="$RPM_OPT_FLAGS -I%{_includedir}/metis -fPIC" +%else CHOLMOD_FLAGS="$RPM_OPT_FLAGS -DNPARTITION -fPIC" +%endif pushd CHOLMOD pushd Lib make -f Makefile CFLAGS="$CHOLMOD_FLAGS" @@ -142,10 +146,12 @@ ln -sf libcolamd.so.%{colamd_version} libcolamd.so popd -## Don't install CSparse as the header file name conflicts with -## CXSparse. CXSparse is a superset of CSparse, with the user needing -## to link against -lcxsparse rather than -lcsparse. This is an -## annoyance and not real issue. +### CXSparse is a superset of CSparse, and the two share common header +### names, so it does not make sense to build both. CXSparse is built +### by default, but CSparse can be built instead by defining +### enable_csparse as 1 below. +%define enable_csparse 0 +%if "%{?enable_csparse}" == "1" %define csparse_version 1.2 %define csparse_version_major 1 pushd CSparse @@ -153,16 +159,17 @@ make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libcsparse.a gcc -shared -Wl,-soname,libcsparse.so.%{csparse_version_major} -o libcsparse.so.%{csparse_version} `ls *.o` cp *.a *.so* ../../Lib -# cp cs.h ../../Include + cp cs.h ../../Include popd mkdir ../Doc/CSparse/ - cp README.txt License.txt lesser.txt ../Doc/CSparse + cp README.txt License.txt lesser.txt ../Doc/CSparse popd pushd Lib ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major} ln -sf libcsparse.so.%{csparse_version} libcsparse.so popd +%else %define cxsparse_version 1.2 %define cxsparse_version_major 1 pushd CXSparse @@ -179,6 +186,7 @@ ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major} ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so popd +%endif %define klu_version 0.7 %define klu_version_major 0 @@ -274,7 +282,8 @@ %changelog * Tue Mar 7 2006 Quentin Spencer 1.2-1 - New release. -- Build newly added libraries CSparse and CXSparse. +- Build newly added library CXSparse (but not CSparse--see comments + in build section). * Wed Feb 15 2006 Quentin Spencer 0.93-2 - Rebuild for Fedora Extras 5. From fedora-extras-commits at redhat.com Wed Mar 8 15:24:40 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 8 Mar 2006 10:24:40 -0500 Subject: fedora-security/audit fc4,1.168,1.169 fc5,1.75,1.76 Message-ID: <200603081524.k28FOeGU011133@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11113 Modified Files: fc4 fc5 Log Message: Note two new PHP cve ids. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- fc4 8 Mar 2006 14:45:43 -0000 1.168 +++ fc4 8 Mar 2006 15:24:33 -0000 1.169 @@ -4,6 +4,8 @@ ** are items that need attention CVE-2006-1045 VULNERABLE (thunderbird) +CVE-2006-1015 ignore (php) safe mode isn't safe +CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- fc5 8 Mar 2006 14:45:43 -0000 1.75 +++ fc5 8 Mar 2006 15:24:33 -0000 1.76 @@ -18,6 +18,8 @@ ** are items that need attention CVE-2006-1045 VULNERABLE (thunderbird) +CVE-2006-1015 ignore (php) safe mode isn't safe +CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) CVE-2006-0884 ** thunderbird From fedora-extras-commits at redhat.com Wed Mar 8 16:19:30 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:19:30 -0500 Subject: rpms/ikvm - New directory Message-ID: <200603081619.k28GJXF0013340@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13332/ikvm Log Message: Directory /cvs/extras/rpms/ikvm added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 16:19:36 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:19:36 -0500 Subject: rpms/ikvm/devel - New directory Message-ID: <200603081619.k28GJdmN013355@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13332/ikvm/devel Log Message: Directory /cvs/extras/rpms/ikvm/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 16:20:16 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:20:16 -0500 Subject: rpms/ikvm Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603081620.k28GKIZW013389@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13377 Added Files: Makefile import.log Log Message: Setup of module ikvm --- NEW FILE Makefile --- # Top level Makefile for module ikvm all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 16:20:22 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:20:22 -0500 Subject: rpms/ikvm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603081620.k28GKOiJ013409@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13377/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ikvm --- NEW 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 Mar 8 16:22:16 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 11:22:16 -0500 Subject: rpms/kdesvn/devel .cvsignore, 1.6, 1.7 kdesvn.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200603081622.k28GMnLs013463@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kdesvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13438 Modified Files: .cvsignore kdesvn.spec sources Log Message: Update to 0.7.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Feb 2006 16:34:10 -0000 1.6 +++ .cvsignore 8 Mar 2006 16:22:16 -0000 1.7 @@ -1 +1 @@ -kdesvn-0.7.3.tar.gz +kdesvn-0.7.4.tar.gz Index: kdesvn.spec =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kdesvn.spec 13 Feb 2006 18:56:09 -0000 1.12 +++ kdesvn.spec 8 Mar 2006 16:22:16 -0000 1.13 @@ -1,6 +1,6 @@ Name: kdesvn -Version: 0.7.3 -Release: 2%{?dist} +Version: 0.7.4 +Release: 1%{?dist} Summary: A subversion client for KDE with KIO integration Group: Development/Tools @@ -97,6 +97,9 @@ %changelog +* Wed Mar 8 2006 - Orion Poplawski - 0.7.4-1 +- Update to 0.7.4 + * Mon Feb 13 2006 - Orion Poplawski - 0.7.3-2 - Rebuild for gcc/glibc changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 1 Feb 2006 16:34:10 -0000 1.6 +++ sources 8 Mar 2006 16:22:16 -0000 1.7 @@ -1 +1 @@ -db4e90a3776f9cd524e6cb432b566c73 kdesvn-0.7.3.tar.gz +d8d3860c55200b95e59fffeb2546531f kdesvn-0.7.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 16:23:11 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:23:11 -0500 Subject: rpms/ikvm import.log,1.1,1.2 Message-ID: <200603081623.k28GNidI013552@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13511 Modified Files: import.log Log Message: auto-import ikvm-0.22-4 on branch devel from ikvm-0.22-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ikvm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 16:20:16 -0000 1.1 +++ import.log 8 Mar 2006 16:23:11 -0000 1.2 @@ -0,0 +1 @@ +ikvm-0_22-4:HEAD:ikvm-0.22-4.src.rpm:1141834969 From fedora-extras-commits at redhat.com Wed Mar 8 16:23:17 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:23:17 -0500 Subject: rpms/ikvm/devel ikvm-scripts.patch, NONE, 1.1 ikvm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603081623.k28GNo5e013557@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13511/devel Modified Files: .cvsignore sources Added Files: ikvm-scripts.patch ikvm.spec Log Message: auto-import ikvm-0.22-4 on branch devel from ikvm-0.22-4.src.rpm ikvm-scripts.patch: --- NEW FILE ikvm-scripts.patch --- diff -ru ikvm-0.22.orig/scripts/ikvmc.in ikvm-0.22/scripts/ikvmc.in --- ikvm-0.22.orig/scripts/ikvmc.in 2005-12-15 22:29:34.000000000 -0500 +++ ikvm-0.22/scripts/ikvmc.in 2006-03-06 16:54:14.000000000 -0500 @@ -1,2 +1,2 @@ #!/bin/sh -exec @RUNTIME@ @prefix@/lib/ikvm/ikvmc.exe "$@" +exec @RUNTIME@ @libdir@/ikvm/ikvmc.exe "$@" diff -ru ikvm-0.22.orig/scripts/ikvm.in ikvm-0.22/scripts/ikvm.in --- ikvm-0.22.orig/scripts/ikvm.in 2005-12-15 22:29:34.000000000 -0500 +++ ikvm-0.22/scripts/ikvm.in 2006-03-06 16:54:22.000000000 -0500 @@ -1,2 +1,2 @@ #!/bin/sh -exec @RUNTIME@ @prefix@/lib/ikvm/ikvm.exe "$@" +exec @RUNTIME@ @libdir@/ikvm/ikvm.exe "$@" diff -ru ikvm-0.22.orig/scripts/ikvmstub.in ikvm-0.22/scripts/ikvmstub.in --- ikvm-0.22.orig/scripts/ikvmstub.in 2005-12-15 22:29:34.000000000 -0500 +++ ikvm-0.22/scripts/ikvmstub.in 2006-03-06 16:54:32.000000000 -0500 @@ -1,2 +1,2 @@ #!/bin/sh -exec @RUNTIME@ @prefix@/lib/ikvm/ikvmstub.exe "$@" +exec @RUNTIME@ @libdir@/ikvm/ikvmstub.exe "$@" --- NEW FILE ikvm.spec --- %define ikvmdir %{buildroot}%{_libdir}/ikvm Summary: An implementation of Java for Mono Name: ikvm Version: 0.22 Release: 4%{?dist} License: BSD Group: Development/Languages Source0: http://go-mono.com/sources/ikvm/ikvm-%{version}.tar.gz Patch0: ikvm-scripts.patch URL: http://www.ikvm.net/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-core, mono-devel, dos2unix %description This package provides IKVM.NET, an open source Java compatibility layer for Mono, which includes a Virtual Machine, a bytecode compiler, and various class libraries for Java, as well as tools for Java and Mono interoperability. %package devel Summary: IKVM pkgconfig file Group: Development/Languages Requires: %{name} = %{version}-%{release} %description devel This package contains the pkgconfig configuration file for IKVM. %prep rm -rf %{RPM_BUILD_ROOT} %setup -q %patch0 -p1 -b .patch0 %build %configure make dos2unix LICENSE %install %{__rm} -rf %{buildroot} %{__mkdir} -p %{buildroot}%{_libdir}/pkgconfig %{__mkdir} -p %{buildroot}%{_bindir} %{__mkdir} -p %{ikvmdir} %{__install} -c bin/ikvm.exe %{ikvmdir}/ikvm.exe %{__install} -c bin/ikvmc.exe %{ikvmdir}/ikvmc.exe %{__install} -c bin/ikvmstub.exe %{ikvmdir}/ikvmstub.ex %{__install} -c lib/IKVM.AWT.WinForms.dll %{ikvmdir}/IKVM.AWT.WinForms.dll %{__install} -c lib/IKVM.GNU.Classpath.dll %{ikvmdir}/IKVM.GNU.Classpath.dll %{__install} -c lib/IKVM.Runtime.dll %{ikvmdir}/IKVM.Runtime.dll %{__install} -c scripts/ikvmc %{buildroot}%{_bindir}/ikvmc %{__install} -c scripts/ikvm %{buildroot}%{_bindir}/ikvm %{__install} -c scripts/ikvmstub %{buildroot}%{_bindir}/ikvmstub %{__install} -c -m 644 ikvm.pc %{buildroot}%{_libdir}/pkgconfig/ikvm.pc %files %doc LICENSE COPYING %{_bindir}/* %{_libdir}/ikvm/ %files devel %{_libdir}/pkgconfig/ikvm.pc %clean %{__rm} -rf %{buildroot} %changelog * Mon Mar 6 2006 Michel Salim 0.22-4 - Fixed summary - Changed URL field - Make IKVM own libdir/ikvm/ - Convert LICENSE to Unix text format - Added COPYING to list of files - Fixed launch scripts so they are correct on x86_64 * Thu Jan 26 2006 Paul F. Johnson 0.22-3 - Fix to include IKVM.GNU.Classpath * Wed Jan 25 2006 Paul F. Johnson 0.22-2 - D'oh! Wrong package description! * Mon Jan 23 2006 Paul F. Johnson 0.22-1 - Initial import Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ikvm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 16:20:22 -0000 1.1 +++ .cvsignore 8 Mar 2006 16:23:17 -0000 1.2 @@ -0,0 +1 @@ +ikvm-0.22.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ikvm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 16:20:22 -0000 1.1 +++ sources 8 Mar 2006 16:23:17 -0000 1.2 @@ -0,0 +1 @@ +84124d4c71f0e992d865626d1d13cf1c ikvm-0.22.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 16:44:19 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 11:44:19 -0500 Subject: rpms/kdesvn/FC-4 .cvsignore, 1.5, 1.6 kdesvn.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603081644.k28Gipb9014155@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kdesvn/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14132 Modified Files: .cvsignore kdesvn.spec sources Log Message: Update to 0.7.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Feb 2006 17:06:19 -0000 1.5 +++ .cvsignore 8 Mar 2006 16:44:19 -0000 1.6 @@ -1 +1 @@ -kdesvn-0.7.3.tar.gz +kdesvn-0.7.4.tar.gz Index: kdesvn.spec =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kdesvn.spec 1 Feb 2006 17:06:19 -0000 1.7 +++ kdesvn.spec 8 Mar 2006 16:44:19 -0000 1.8 @@ -1,5 +1,5 @@ Name: kdesvn -Version: 0.7.3 +Version: 0.7.4 Release: 1%{?dist} Summary: A subversion client for KDE with KIO integration @@ -95,6 +95,9 @@ %changelog +* Wed Mar 8 2006 - Orion Poplawski - 0.7.4-1 +- New upstream version 0.7.4 + * Wed Feb 1 2006 - Orion Poplawski - 0.7.3-1 - New upstream version 0.7.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Feb 2006 17:06:19 -0000 1.5 +++ sources 8 Mar 2006 16:44:19 -0000 1.6 @@ -1 +1 @@ -db4e90a3776f9cd524e6cb432b566c73 kdesvn-0.7.3.tar.gz +d8d3860c55200b95e59fffeb2546531f kdesvn-0.7.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 16:58:02 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 11:58:02 -0500 Subject: rpms/scalapack/FC-3 scalapack-1.7-fedora3.patch, 1.2, 1.3 scalapack.spec, 1.9, 1.10 Message-ID: <200603081658.k28GwZmF014266@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14206/FC-3 Modified Files: scalapack-1.7-fedora3.patch scalapack.spec Log Message: Fix NOOPT to be -fPIC. scalapack-1.7-fedora3.patch: Index: scalapack-1.7-fedora3.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-fedora3.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-fedora3.patch 1 Mar 2006 00:22:49 -0000 1.2 +++ scalapack-1.7-fedora3.patch 8 Mar 2006 16:58:02 -0000 1.3 @@ -1,5 +1,5 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 +--- scalapack-1.7/SCALAPACK/SLmake.inc.fedora3 2006-03-08 10:51:28.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:55:27.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -31,14 +31,16 @@ TESTINGdir = $(home)/TESTING # -@@ -71,8 +71,8 @@ +@@ -70,9 +70,9 @@ + F77 = g77 #F77 = /usr/local/pgi/linux86/bin/pgf77 CC = gcc - NOOPT = +-NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC -+CCFLAGS = $(RPM_OPT_FLAGS) -fPIC ++NOOPT = -fPIC ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) ++CCFLAGS = $(RPM_OPT_FLAGS) $(NOOPT) SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) @@ -60,8 +62,8 @@ +PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) +RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) ---- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 +--- scalapack-1.7/SCALAPACK/Makefile.fedora3 2006-03-08 10:55:36.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:56:39.000000000 -0600 @@ -49,7 +49,7 @@ all: lib #all: lib exe Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scalapack.spec 1 Mar 2006 00:22:49 -0000 1.9 +++ scalapack.spec 8 Mar 2006 16:58:02 -0000 1.10 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -49,7 +49,7 @@ %prep %setup -q -c -n %{name}-%{version} -%patch0 -p1 +#%patch0 -p1 %ifarch x86_64 ppc64 sparc64 ia64 %patch1 -p1 %endif @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 +- set -fPIC as NOOPT + * Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 - fix 64 bit builds - enable shared libraries From fedora-extras-commits at redhat.com Wed Mar 8 16:58:08 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 11:58:08 -0500 Subject: rpms/scalapack/FC-4 scalapack-1.7-fedora.patch, 1.2, 1.3 scalapack.spec, 1.11, 1.12 Message-ID: <200603081658.k28GweEO014270@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14206/FC-4 Modified Files: scalapack-1.7-fedora.patch scalapack.spec Log Message: Fix NOOPT to be -fPIC. scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-fedora.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-fedora.patch 1 Mar 2006 00:22:56 -0000 1.2 +++ scalapack-1.7-fedora.patch 8 Mar 2006 16:58:08 -0000 1.3 @@ -1,5 +1,23 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 +--- scalapack-1.7/SCALAPACK/Makefile.fedora 2001-08-10 11:44:13.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:41:39.000000000 -0600 +@@ -49,7 +49,7 @@ + all: lib + #all: lib exe + +-lib: toolslib pblaslib redistlib scalapacklib ++lib: toolslib pblaslib redistlib scalapacklib shared + + exe: pblasexe redistexe scalapackexe + +@@ -90,3 +90,6 @@ + ( cd $(SRCdir); $(MAKE) clean ) + ( cd $(TOOLSdir); $(MAKE) clean ) + ( cd $(REDISTdir)/SRC; $(MAKE) clean ) ++ ++shared: scalapacklib ++ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) +--- scalapack-1.7/SCALAPACK/SLmake.inc.fedora 2001-08-08 21:59:50.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:42:41.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -39,10 +57,11 @@ +F77 = gfortran #F77 = /usr/local/pgi/linux86/bin/pgf77 CC = gcc - NOOPT = +-NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC ++NOOPT = -fPIC ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) +CCFLAGS = $(RPM_OPT_FLAGS) -fPIC SRCFLAG = F77LOADER = $(F77) @@ -74,21 +93,3 @@ +PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) +RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) ---- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 -@@ -49,7 +49,7 @@ - all: lib - #all: lib exe - --lib: toolslib pblaslib redistlib scalapacklib -+lib: toolslib pblaslib redistlib scalapacklib shared - - exe: pblasexe redistexe scalapackexe - -@@ -90,3 +90,6 @@ - ( cd $(SRCdir); $(MAKE) clean ) - ( cd $(TOOLSdir); $(MAKE) clean ) - ( cd $(REDISTdir)/SRC; $(MAKE) clean ) -+ -+shared: scalapacklib -+ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scalapack.spec 1 Mar 2006 00:22:56 -0000 1.11 +++ scalapack.spec 8 Mar 2006 16:58:08 -0000 1.12 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 +- set -fPIC as NOOPT + * Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 - fix 64 bit builds - enable shared libraries From fedora-extras-commits at redhat.com Wed Mar 8 16:58:14 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 11:58:14 -0500 Subject: rpms/scalapack/devel scalapack-1.7-fedora.patch, 1.3, 1.4 scalapack.spec, 1.12, 1.13 Message-ID: <200603081658.k28Gwklm014274@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14206/devel Modified Files: scalapack-1.7-fedora.patch scalapack.spec Log Message: Fix NOOPT to be -fPIC. scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-fedora.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scalapack-1.7-fedora.patch 1 Mar 2006 00:23:02 -0000 1.3 +++ scalapack-1.7-fedora.patch 8 Mar 2006 16:58:14 -0000 1.4 @@ -1,5 +1,23 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 +--- scalapack-1.7/SCALAPACK/Makefile.fedora 2001-08-10 11:44:13.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:41:39.000000000 -0600 +@@ -49,7 +49,7 @@ + all: lib + #all: lib exe + +-lib: toolslib pblaslib redistlib scalapacklib ++lib: toolslib pblaslib redistlib scalapacklib shared + + exe: pblasexe redistexe scalapackexe + +@@ -90,3 +90,6 @@ + ( cd $(SRCdir); $(MAKE) clean ) + ( cd $(TOOLSdir); $(MAKE) clean ) + ( cd $(REDISTdir)/SRC; $(MAKE) clean ) ++ ++shared: scalapacklib ++ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) +--- scalapack-1.7/SCALAPACK/SLmake.inc.fedora 2001-08-08 21:59:50.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:42:41.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -39,10 +57,11 @@ +F77 = gfortran #F77 = /usr/local/pgi/linux86/bin/pgf77 CC = gcc - NOOPT = +-NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC ++NOOPT = -fPIC ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) +CCFLAGS = $(RPM_OPT_FLAGS) -fPIC SRCFLAG = F77LOADER = $(F77) @@ -74,21 +93,3 @@ +PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) +RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) ---- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 -@@ -49,7 +49,7 @@ - all: lib - #all: lib exe - --lib: toolslib pblaslib redistlib scalapacklib -+lib: toolslib pblaslib redistlib scalapacklib shared - - exe: pblasexe redistexe scalapackexe - -@@ -90,3 +90,6 @@ - ( cd $(SRCdir); $(MAKE) clean ) - ( cd $(TOOLSdir); $(MAKE) clean ) - ( cd $(REDISTdir)/SRC; $(MAKE) clean ) -+ -+shared: scalapacklib -+ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scalapack.spec 1 Mar 2006 00:23:02 -0000 1.12 +++ scalapack.spec 8 Mar 2006 16:58:14 -0000 1.13 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 +- set -fPIC as NOOPT + * Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 - fix 64 bit builds - enable shared libraries From fedora-extras-commits at redhat.com Wed Mar 8 18:02:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 13:02:52 -0500 Subject: rpms/lyx/devel lyx.spec, 1.25, 1.26 lyx-1.4.0-boost.patch, 1.1, NONE lyx-1.4.0-gcc41.patch, 1.1, NONE lyx-crystal.png, 1.1, NONE Message-ID: <200603081803.k28I3OW8018324@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18267 Modified Files: lyx.spec Removed Files: lyx-1.4.0-boost.patch lyx-1.4.0-gcc41.patch lyx-crystal.png Log Message: * Wed Mar 08 2006 Rex Dieter 1.4.0-1 - 1.4.0(final) - drop boost bits Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- lyx.spec 3 Mar 2006 19:27:04 -0000 1.25 +++ lyx.spec 8 Mar 2006 18:02:51 -0000 1.26 @@ -1,29 +1,17 @@ -## avoid on fc4/gcc-4.0.2, due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24389 -## (fixed in gcc-4.0.3) -%if "%{?fedora}" != "4" -#define _without_included_boost --without-included-boost -%endif - -%define beta pre6 - Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 0.11.%{beta}%{?dist} +Release: 1%{?dist} License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ -Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 +#Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: lyx-1.4.0-helpers.patch -# http://bugzilla.lyx.org/show_bug.cgi?id=2297 -Patch2: lyx-1.4.0-boost.patch -# http://bugzilla.lyx.org/show_bug.cgi?id=2278 -# http://www.mail-archive.com/lyx-devel at lists.lyx.org/msg86593.html -Patch3: lyx-1.4.0-gcc41.patch # app-wrapper for various frontends Source10: lyx.sh @@ -48,7 +36,6 @@ BuildRequires: zlib-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts -%{?_without_included_boost:BuildRequires: boost-devel >= 1.33} # For texhash Requires(post): tetex-fonts @@ -102,11 +89,6 @@ %setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .helpers -%patch2 -p1 -b .boost -# possibly questionable patch, leave out for now -- Rex -#patch3 -p0 -b .gcc41 - -# ./autogen.sh %build @@ -178,12 +160,12 @@ # Catch installed/uninstalled helpers %triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then -cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: +cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi %triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then -cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: +cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi @@ -216,6 +198,14 @@ %changelog +* Wed Mar 08 2006 Rex Dieter 1.4.0-1 +- 1.4.0(final) +- drop boost bits + +* Tue Mar 07 2006 Rex Dieter 1.4.0-0.12.rc +- 1.4.0rc +- drop boost patch (for now) + * Fri Mar 03 2006 Rex Dieter 1.4.0-0.11.pre6 - 1.4.0pre6 - --disable-stdlib-debug --disable-assertions --disable-concept-checks --- lyx-1.4.0-boost.patch DELETED --- --- lyx-1.4.0-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 8 18:11:01 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 13:11:01 -0500 Subject: rpms/lyx/devel .cvsignore, 1.8, 1.9 lyx.spec, 1.26, 1.27 sources, 1.9, 1.10 Message-ID: <200603081811.k28IBYYU018455@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18432 Modified Files: .cvsignore lyx.spec sources Log Message: Release++, retag for missing Source's Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 3 Mar 2006 19:27:04 -0000 1.8 +++ .cvsignore 8 Mar 2006 18:10:59 -0000 1.9 @@ -1 +1 @@ -lyx-1.4.0pre6.tar.bz2 +lyx-1.4.0.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- lyx.spec 8 Mar 2006 18:02:51 -0000 1.26 +++ lyx.spec 8 Mar 2006 18:11:00 -0000 1.27 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Publishing @@ -198,7 +198,7 @@ %changelog -* Wed Mar 08 2006 Rex Dieter 1.4.0-1 +* Wed Mar 08 2006 Rex Dieter 1.4.0-2 - 1.4.0(final) - drop boost bits Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 3 Mar 2006 19:27:04 -0000 1.9 +++ sources 8 Mar 2006 18:11:00 -0000 1.10 @@ -1 +1 @@ -bcc2e2b301a4e30e9bf7556afccae060 lyx-1.4.0pre6.tar.bz2 +5ab37471339ff7dbc8f0c43282746cb0 lyx-1.4.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 8 18:20:51 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 8 Mar 2006 13:20:51 -0500 Subject: rpms/libtasn1/FC-4 libtasn1.spec,1.11,1.12 sources,1.3,1.4 Message-ID: <200603081821.k28ILOu7018622@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18587/FC-4 Modified Files: libtasn1.spec sources Log Message: updated to 0.3.1 Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/libtasn1.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libtasn1.spec 6 Mar 2006 11:29:06 -0000 1.11 +++ libtasn1.spec 8 Mar 2006 18:20:51 -0000 1.12 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.0 +Version: 0.3.1 Release: %release_func 1 License: LGPL @@ -93,6 +93,9 @@ %changelog +* Wed Mar 8 2006 Enrico Scholz - 0.3.1-1 +- updated to 0.3.1 + * Mon Mar 6 2006 Enrico Scholz - 0.3.0-1 - updated to 0.3.0 - removed unneeded curlies Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2006 11:15:36 -0000 1.3 +++ sources 8 Mar 2006 18:20:51 -0000 1.4 @@ -1,2 +1,2 @@ -e78a3fba867f6d956ead70d86815a2d7 libtasn1-0.3.0.tar.gz -0f8dc79aca78440e0c31dfef6ed5e571 libtasn1-0.3.0.tar.gz.sig +f56641ed0e1ee4d1903ba25ab046ed45 libtasn1-0.3.1.tar.gz +8097b205dd0fb3b351f8fd707dee903e libtasn1-0.3.1.tar.gz.sig From fedora-extras-commits at redhat.com Wed Mar 8 18:20:57 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 8 Mar 2006 13:20:57 -0500 Subject: rpms/libtasn1/devel libtasn1.spec,1.10,1.11 sources,1.3,1.4 Message-ID: <200603081821.k28ILUNU018626@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18587/devel Modified Files: libtasn1.spec sources Log Message: updated to 0.3.1 Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libtasn1.spec 6 Mar 2006 11:29:12 -0000 1.10 +++ libtasn1.spec 8 Mar 2006 18:20:57 -0000 1.11 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.0 +Version: 0.3.1 Release: %release_func 1 License: LGPL @@ -93,6 +93,9 @@ %changelog +* Wed Mar 8 2006 Enrico Scholz - 0.3.1-1 +- updated to 0.3.1 + * Mon Mar 6 2006 Enrico Scholz - 0.3.0-1 - updated to 0.3.0 - removed unneeded curlies Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2006 11:21:46 -0000 1.3 +++ sources 8 Mar 2006 18:20:57 -0000 1.4 @@ -1,2 +1,2 @@ -e78a3fba867f6d956ead70d86815a2d7 libtasn1-0.3.0.tar.gz -0f8dc79aca78440e0c31dfef6ed5e571 libtasn1-0.3.0.tar.gz.sig +f56641ed0e1ee4d1903ba25ab046ed45 libtasn1-0.3.1.tar.gz +8097b205dd0fb3b351f8fd707dee903e libtasn1-0.3.1.tar.gz.sig From fedora-extras-commits at redhat.com Wed Mar 8 18:37:12 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 8 Mar 2006 13:37:12 -0500 Subject: rpms/pcsc-tools/devel .cvsignore, 1.2, 1.3 pcsc-tools.spec, 1.3, 1.4 sources, 1.2, 1.3 pcsc-tools-1.4.1-atrmsg.patch, 1.1, NONE pcsc-tools-gscriptor.desktop, 1.1, NONE smartcard_list.txt, 1.3, NONE Message-ID: <200603081837.k28Ibil6018804@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18783 Modified Files: .cvsignore pcsc-tools.spec sources Removed Files: pcsc-tools-1.4.1-atrmsg.patch pcsc-tools-gscriptor.desktop smartcard_list.txt Log Message: * Wed Mar 8 2006 Ville Skytt?? - 1.4.2-1 - 1.4.2, desktop file, recent smartcard_list.txt, ATR_analysis message patch and smartcard_list.txt lookup path improvement included upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Dec 2005 20:45:49 -0000 1.2 +++ .cvsignore 8 Mar 2006 18:37:12 -0000 1.3 @@ -1 +1 @@ -pcsc-tools-1.4.1.tar.gz +pcsc-tools-1.4.2.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pcsc-tools.spec 6 Mar 2006 16:08:32 -0000 1.3 +++ pcsc-tools.spec 8 Mar 2006 18:37:12 -0000 1.4 @@ -1,15 +1,13 @@ Name: pcsc-tools -Version: 1.4.1 -Release: 3%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC Group: Development/Tools 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 -Source2: %{name}-gscriptor.desktop -Patch0: %{name}-1.4.1-atrmsg.patch +#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 @@ -29,14 +27,14 @@ %prep %setup -q -%patch0 sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile -sed -i -e 's|/usr/lib/pcsc\b|%{_datadir}/pcsc|' ATR_analysis* if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then -sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c + sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c fi -iconv -f iso-8859-1 -t utf-8 %{SOURCE1} > smartcard_list.txt -cp -p %{SOURCE2} gscriptor.desktop +# cp %{SOURCE1} . +for f in Changelog smartcard_list.txt ; do + iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f +done %build @@ -72,6 +70,10 @@ %changelog +* Wed Mar 8 2006 Ville Skytt?? - 1.4.2-1 +- 1.4.2, desktop file, recent smartcard_list.txt, ATR_analysis message + patch and smartcard_list.txt lookup path improvement included upstream. + * Mon Mar 6 2006 Ville Skytt?? - 1.4.1-3 - Update smartcard_list.txt to 20060305. - Fix some ATR_analysis messages. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Dec 2005 20:45:49 -0000 1.2 +++ sources 8 Mar 2006 18:37:12 -0000 1.3 @@ -1 +1 @@ -517cb2a5e6d3170f408cc7550223ed89 pcsc-tools-1.4.1.tar.gz +9cd68c933fafda78f844b114319a52b8 pcsc-tools-1.4.2.tar.gz --- pcsc-tools-1.4.1-atrmsg.patch DELETED --- --- pcsc-tools-gscriptor.desktop DELETED --- --- smartcard_list.txt DELETED --- From fedora-extras-commits at redhat.com Wed Mar 8 19:15:44 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 14:15:44 -0500 Subject: rpms/lyx/devel lyx.spec,1.27,1.28 Message-ID: <200603081916.k28JGLAs020936@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20918 Modified Files: lyx.spec Log Message: add mailing list reference for dropping -fexceptions drop last boost reference Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- lyx.spec 8 Mar 2006 18:11:00 -0000 1.27 +++ lyx.spec 8 Mar 2006 19:15:44 -0000 1.28 @@ -97,7 +97,8 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -# drop -fexceptions from RPM_OPT_FLAGS (suggested by lyx devs) +# drop -fexceptions from RPM_OPT_FLAGS, suggested by lyx devs: +# http://www.mail-archive.com/lyx-devel at lists.lyx.org/msg85794.html export CFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )" export CXXFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )" @@ -112,7 +113,6 @@ --with-aspell \ --without-warnings --disable-dependency-tracking \ --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ - %{?_without_included_boost} # Intermediate cleanup # (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking From fedora-extras-commits at redhat.com Wed Mar 8 19:18:40 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 14:18:40 -0500 Subject: rpms/pl/FC-3 .cvsignore,1.5,1.6 pl.spec,1.15,1.16 sources,1.5,1.6 Message-ID: <200603081919.k28JJCL9021045@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20988/FC-3 Modified Files: .cvsignore pl.spec sources Log Message: new version 5.6.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pl/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Jan 2006 19:35:07 -0000 1.5 +++ .cvsignore 8 Mar 2006 19:18:40 -0000 1.6 @@ -1,3 +1,3 @@ -pl-5.6.3.tar.gz HTMLmanual.tar.gz +pl-5.6.7.tar.gz userguide.html.tgz Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/FC-3/pl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- pl.spec 28 Jan 2006 19:35:07 -0000 1.15 +++ pl.spec 8 Mar 2006 19:18:40 -0000 1.16 @@ -1,5 +1,5 @@ Name: pl -Version: 5.6.3 +Version: 5.6.7 Release: 1%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -7,13 +7,15 @@ Group: Development/Languages License: LGPL URL: http://www.swi-prolog.org -Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz +Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.7.tar.gz Source1: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: pl-5.4.6-rpath.patch Patch1: pl-5.6.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libjpeg-devel, readline-devel, openssl-devel +BuildRequires: libjpeg-devel +BuildRequires: readline-devel +BuildRequires: openssl-devel BuildRequires: unixODBC-devel BuildRequires: xorg-x11-devel @@ -83,6 +85,9 @@ %changelog +* Wed Mar 8 2006 Gerard Milmeister - 5.6.7-1 +- new version 5.6.7 + * Sat Jan 28 2006 Gerard Milmeister - 5.6.3-1 - new version 5.6.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pl/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Jan 2006 19:35:07 -0000 1.5 +++ sources 8 Mar 2006 19:18:40 -0000 1.6 @@ -1,3 +1,3 @@ -6b83cbe448a6d2b0655a426d2e9cdcad pl-5.6.3.tar.gz -6ffc2ce035b0534f822757472d734237 HTMLmanual.tar.gz +f1691c99e00622145c00d50caf4aef08 HTMLmanual.tar.gz +63f8a2dd6a48333fb1f848f78c1c5409 pl-5.6.7.tar.gz 72feb8797f134c45be719133873cae1f userguide.html.tgz From fedora-extras-commits at redhat.com Wed Mar 8 19:18:46 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 14:18:46 -0500 Subject: rpms/pl/FC-4 .cvsignore,1.6,1.7 pl.spec,1.18,1.19 sources,1.6,1.7 Message-ID: <200603081919.k28JJIlX021051@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20988/FC-4 Modified Files: .cvsignore pl.spec sources Log Message: new version 5.6.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pl/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Jan 2006 19:35:13 -0000 1.6 +++ .cvsignore 8 Mar 2006 19:18:46 -0000 1.7 @@ -1,3 +1,3 @@ -pl-5.6.3.tar.gz HTMLmanual.tar.gz +pl-5.6.7.tar.gz userguide.html.tgz Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/FC-4/pl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- pl.spec 28 Jan 2006 19:35:13 -0000 1.18 +++ pl.spec 8 Mar 2006 19:18:46 -0000 1.19 @@ -1,5 +1,5 @@ Name: pl -Version: 5.6.3 +Version: 5.6.7 Release: 1%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -7,13 +7,15 @@ Group: Development/Languages License: LGPL URL: http://www.swi-prolog.org -Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz +Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.7.tar.gz Source1: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: pl-5.4.6-rpath.patch Patch1: pl-5.6.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libjpeg-devel, readline-devel, openssl-devel +BuildRequires: libjpeg-devel +BuildRequires: readline-devel +BuildRequires: openssl-devel BuildRequires: unixODBC-devel BuildRequires: xorg-x11-devel @@ -83,6 +85,9 @@ %changelog +* Wed Mar 8 2006 Gerard Milmeister - 5.6.7-1 +- new version 5.6.7 + * Sat Jan 28 2006 Gerard Milmeister - 5.6.3-1 - new version 5.6.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pl/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Jan 2006 19:35:13 -0000 1.6 +++ sources 8 Mar 2006 19:18:46 -0000 1.7 @@ -1,3 +1,3 @@ -6b83cbe448a6d2b0655a426d2e9cdcad pl-5.6.3.tar.gz -6ffc2ce035b0534f822757472d734237 HTMLmanual.tar.gz +f1691c99e00622145c00d50caf4aef08 HTMLmanual.tar.gz +63f8a2dd6a48333fb1f848f78c1c5409 pl-5.6.7.tar.gz 72feb8797f134c45be719133873cae1f userguide.html.tgz From fedora-extras-commits at redhat.com Wed Mar 8 19:18:52 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 14:18:52 -0500 Subject: rpms/pl/devel .cvsignore,1.6,1.7 pl.spec,1.22,1.23 sources,1.6,1.7 Message-ID: <200603081919.k28JJOeO021057@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20988/devel Modified Files: .cvsignore pl.spec sources Log Message: new version 5.6.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pl/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Jan 2006 19:35:19 -0000 1.6 +++ .cvsignore 8 Mar 2006 19:18:52 -0000 1.7 @@ -1,3 +1,3 @@ -pl-5.6.3.tar.gz HTMLmanual.tar.gz +pl-5.6.7.tar.gz userguide.html.tgz Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- pl.spec 17 Feb 2006 21:36:42 -0000 1.22 +++ pl.spec 8 Mar 2006 19:18:52 -0000 1.23 @@ -1,19 +1,21 @@ Name: pl -Version: 5.6.3 -Release: 2%{?dist} +Version: 5.6.7 +Release: 1%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler Group: Development/Languages License: LGPL URL: http://www.swi-prolog.org -Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz +Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.7.tar.gz Source1: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: pl-5.4.6-rpath.patch Patch1: pl-5.6.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libjpeg-devel, readline-devel, openssl-devel +BuildRequires: libjpeg-devel +BuildRequires: readline-devel +BuildRequires: openssl-devel BuildRequires: unixODBC-devel Buildrequires: freetype-devel BuildRequires: libICE-devel @@ -93,8 +95,8 @@ %changelog -* Fri Feb 17 2006 Gerard Milmeister - 5.6.3-2 -- Rebuild for Fedora Extras 5 +* Wed Mar 8 2006 Gerard Milmeister - 5.6.7-1 +- new version 5.6.7 * Sat Jan 28 2006 Gerard Milmeister - 5.6.3-1 - new version 5.6.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pl/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Jan 2006 19:35:19 -0000 1.6 +++ sources 8 Mar 2006 19:18:52 -0000 1.7 @@ -1,3 +1,3 @@ -6b83cbe448a6d2b0655a426d2e9cdcad pl-5.6.3.tar.gz -6ffc2ce035b0534f822757472d734237 HTMLmanual.tar.gz +f1691c99e00622145c00d50caf4aef08 HTMLmanual.tar.gz +63f8a2dd6a48333fb1f848f78c1c5409 pl-5.6.7.tar.gz 72feb8797f134c45be719133873cae1f userguide.html.tgz From fedora-extras-commits at redhat.com Wed Mar 8 19:27:30 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 8 Mar 2006 14:27:30 -0500 Subject: rpms/mantis/devel sources,1.6,1.7 mantis.spec,1.9,1.10 Message-ID: <200603081928.k28JS2ee021233@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mantis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21214 Modified Files: sources mantis.spec Log Message: updated to 1.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mantis/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Feb 2006 10:59:42 -0000 1.6 +++ sources 8 Mar 2006 19:27:29 -0000 1.7 @@ -1 +1 @@ -40909a3da82bc2c36a08c013b4463d6a mantis-1.0.0.tar.gz +ac9b8c7e1595bb281a2d5268eaf7fcea mantis-1.0.1.tar.gz Index: mantis.spec =================================================================== RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mantis.spec 18 Feb 2006 10:59:42 -0000 1.9 +++ mantis.spec 8 Mar 2006 19:27:30 -0000 1.10 @@ -8,7 +8,7 @@ Summary: Web-based bugtracking system Name: mantis -Version: 1.0.0 +Version: 1.0.1 Release: %release_func 1 License: GPL Group: Applications/Internet @@ -138,6 +138,9 @@ %changelog +* Wed Mar 8 2006 Enrico Scholz - 1.0.1-1 +- updated to 1.0.1 + * Sat Feb 18 2006 Enrico Scholz - 1.0.0-1 - updated to 1.0.0 From fedora-extras-commits at redhat.com Wed Mar 8 19:41:00 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 14:41:00 -0500 Subject: rpms/gcl/devel gcl-bash.patch,NONE,1.1 gcl.spec,1.15,1.16 Message-ID: <200603081941.k28JfWMi021343@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21323 Modified Files: gcl.spec Added Files: gcl-bash.patch Log Message: gcl-bash.patch: --- NEW FILE gcl-bash.patch --- --- gcl-2.6.7/configure.bash 2006-03-08 20:39:05.000000000 +0100 +++ gcl-2.6.7/configure 2006-03-08 20:39:39.000000000 +0100 @@ -1711,7 +1711,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` Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gcl.spec 17 Feb 2006 23:34:03 -0000 1.15 +++ gcl.spec 8 Mar 2006 19:40:59 -0000 1.16 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GNU Common Lisp Group: Development/Languages @@ -8,8 +8,12 @@ URL: http://www.gnu.org/software/gcl Source: ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.7.tar.gz Patch0: gcl-pers.patch +Patch1: gcl-bash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: readline-devel, tk-devel, tcl-devel, gmp-devel +BuildRequires: readline-devel +BuildRequires: tk-devel +BuildRequires: tcl-devel +BuildRequires: gmp-devel BuildRequires: tetex, texinfo Requires(post): /sbin/install-info Requires(postun): /sbin/install-info @@ -26,6 +30,7 @@ %prep %setup -q %patch0 -p1 +#%patch1 -p1 %build @@ -91,6 +96,9 @@ %changelog +* Wed Mar 8 2006 Gerard Milmeister - 2.6.7-7 +- Patch gcl-bash.patch for configure + * Sat Feb 18 2006 Gerard Milmeister - 2.6.7-6 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed Mar 8 19:45:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 14:45:52 -0500 Subject: rpms/lyx/devel .cvsignore, 1.9, 1.10 lyx.spec, 1.28, 1.29 sources, 1.10, 1.11 Message-ID: <200603081946.k28JkPpq021422@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21399 Modified Files: .cvsignore lyx.spec sources Log Message: * Wed Mar 08 2006 Rex Dieter 1.4.0-3 - include beamer.layout Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 8 Mar 2006 18:10:59 -0000 1.9 +++ .cvsignore 8 Mar 2006 19:45:52 -0000 1.10 @@ -1 +1,2 @@ lyx-1.4.0.tar.bz2 +beamer.layout Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- lyx.spec 8 Mar 2006 19:15:44 -0000 1.28 +++ lyx.spec 8 Mar 2006 19:45:52 -0000 1.29 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing @@ -15,10 +15,12 @@ # app-wrapper for various frontends Source10: lyx.sh - +# .desktop files Source20: lyx.desktop Source21: lyx-qt.desktop Source22: lyx-xforms.desktop +# misc +Source100: ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/beamer/lyx/layouts/beamer.layout # TODO: use helpers.sh script at runtime, instead of depending on # lyx's configure and %%triggers @@ -129,10 +131,13 @@ make install DESTDIR=$RPM_BUILD_ROOT ## Handle front-ends -install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx +install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx install -p -m0755 -D src/lyx-qt $RPM_BUILD_ROOT%{_bindir}/lyx-qt install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms +# misc/extras +install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/ + # Set up the lyx-specific class files where TeX can see them texmf=%{_datadir}/texmf mkdir -p $RPM_BUILD_ROOT${texmf}/tex/latex @@ -198,6 +203,9 @@ %changelog +* Wed Mar 08 2006 Rex Dieter 1.4.0-3 +- include beamer.layout + * Wed Mar 08 2006 Rex Dieter 1.4.0-2 - 1.4.0(final) - drop boost bits Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 8 Mar 2006 18:11:00 -0000 1.10 +++ sources 8 Mar 2006 19:45:52 -0000 1.11 @@ -1 +1,2 @@ 5ab37471339ff7dbc8f0c43282746cb0 lyx-1.4.0.tar.bz2 +c906271900a0627d3df2a38ad962a285 beamer.layout From fedora-extras-commits at redhat.com Wed Mar 8 19:53:24 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 14:53:24 -0500 Subject: rpms/gcl/devel gcl-bash.patch,1.1,1.2 gcl.spec,1.16,1.17 Message-ID: <200603081953.k28JrvPc021506@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21482 Modified Files: gcl-bash.patch gcl.spec Log Message: gcl-bash.patch: Index: gcl-bash.patch =================================================================== RCS file: /cvs/extras/rpms/gcl/devel/gcl-bash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcl-bash.patch 8 Mar 2006 19:40:59 -0000 1.1 +++ gcl-bash.patch 8 Mar 2006 19:53:24 -0000 1.2 @@ -1,5 +1,5 @@ ---- gcl-2.6.7/configure.bash 2006-03-08 20:39:05.000000000 +0100 -+++ gcl-2.6.7/configure 2006-03-08 20:39:39.000000000 +0100 +--- gcl-2.6.7/configure.bash 2006-03-08 20:50:04.000000000 +0100 ++++ gcl-2.6.7/configure 2006-03-08 20:52:25.000000000 +0100 @@ -1711,7 +1711,7 @@ # results, and the version is kept in special file). @@ -9,3 +9,12 @@ fi if test "`uname -s`" = "AIX" ; then system=AIX-`uname -v`.`uname -r` +@@ -2409,7 +2409,7 @@ + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . +- case "`(uname -sr) 2>/dev/null`" in ++ case "`uname -sr 2>/dev/null`" in + "SunOS 5"*) + echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 + echo "configure:2416: checking whether -R must be followed by a space" >&5 Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gcl.spec 8 Mar 2006 19:40:59 -0000 1.16 +++ gcl.spec 8 Mar 2006 19:53:24 -0000 1.17 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GNU Common Lisp Group: Development/Languages From fedora-extras-commits at redhat.com Wed Mar 8 20:01:23 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 15:01:23 -0500 Subject: rpms/srecord/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 srecord.spec, 1.2, 1.3 Message-ID: <200603082001.k28K1tsP023497@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23430/FC-3 Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.24. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Sep 2005 12:25:41 -0000 1.3 +++ .cvsignore 8 Mar 2006 20:01:23 -0000 1.4 @@ -1 +1 @@ -srecord-1.23.tar.gz +srecord-1.24.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Sep 2005 12:25:41 -0000 1.3 +++ sources 8 Mar 2006 20:01:23 -0000 1.4 @@ -1 +1 @@ -fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz +de498fade437769c83442ede94073fe1 srecord-1.24.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/srecord.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- srecord.spec 23 Sep 2005 12:25:41 -0000 1.2 +++ srecord.spec 8 Mar 2006 20:01:23 -0000 1.3 @@ -1,5 +1,5 @@ Name: srecord -Version: 1.23 +Version: 1.24 Release: 1%{?dist} Summary: Manipulate EPROM load files @@ -64,6 +64,12 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 1.24-1 +- Update to 1.24. + +* Wed Feb 15 2006 Jose Pedro Oliveira - 1.23-2 +- Rebuild. + * Fri Sep 23 2005 Jose Pedro Oliveira - 1.23-1 - Update to 1.23. From fedora-extras-commits at redhat.com Wed Mar 8 20:01:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 15:01:33 -0500 Subject: rpms/srecord/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 srecord.spec, 1.2, 1.3 Message-ID: <200603082002.k28K27c2023502@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23430/FC-4 Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.24. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Sep 2005 12:25:41 -0000 1.3 +++ .cvsignore 8 Mar 2006 20:01:32 -0000 1.4 @@ -1 +1 @@ -srecord-1.23.tar.gz +srecord-1.24.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Sep 2005 12:25:41 -0000 1.3 +++ sources 8 Mar 2006 20:01:33 -0000 1.4 @@ -1 +1 @@ -fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz +de498fade437769c83442ede94073fe1 srecord-1.24.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/srecord.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- srecord.spec 23 Sep 2005 12:25:41 -0000 1.2 +++ srecord.spec 8 Mar 2006 20:01:33 -0000 1.3 @@ -1,5 +1,5 @@ Name: srecord -Version: 1.23 +Version: 1.24 Release: 1%{?dist} Summary: Manipulate EPROM load files @@ -64,6 +64,12 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 1.24-1 +- Update to 1.24. + +* Wed Feb 15 2006 Jose Pedro Oliveira - 1.23-2 +- Rebuild. + * Fri Sep 23 2005 Jose Pedro Oliveira - 1.23-1 - Update to 1.23. From fedora-extras-commits at redhat.com Wed Mar 8 20:01:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 15:01:43 -0500 Subject: rpms/srecord/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 srecord.spec, 1.3, 1.4 Message-ID: <200603082002.k28K2F6Q023507@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23430/devel Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.24. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Sep 2005 12:25:47 -0000 1.3 +++ .cvsignore 8 Mar 2006 20:01:43 -0000 1.4 @@ -1 +1 @@ -srecord-1.23.tar.gz +srecord-1.24.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Sep 2005 12:25:47 -0000 1.3 +++ sources 8 Mar 2006 20:01:43 -0000 1.4 @@ -1 +1 @@ -fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz +de498fade437769c83442ede94073fe1 srecord-1.24.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/srecord.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- srecord.spec 15 Feb 2006 01:20:42 -0000 1.3 +++ srecord.spec 8 Mar 2006 20:01:43 -0000 1.4 @@ -1,6 +1,6 @@ Name: srecord -Version: 1.23 -Release: 2%{?dist} +Version: 1.24 +Release: 1%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools @@ -64,6 +64,9 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 1.24-1 +- Update to 1.24. + * Wed Feb 15 2006 Jose Pedro Oliveira - 1.23-2 - Rebuild. From fedora-extras-commits at redhat.com Wed Mar 8 20:22:44 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 8 Mar 2006 15:22:44 -0500 Subject: fedora-release fedora-release.spec,1.18,1.19 Message-ID: <200603082022.k28KMi4M023773@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23755 Modified Files: fedora-release.spec Log Message: add bits for about-fedora scrollkeeper stuff Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fedora-release.spec 7 Mar 2006 23:51:43 -0000 1.18 +++ fedora-release.spec 8 Mar 2006 20:22:36 -0000 1.19 @@ -34,6 +34,8 @@ cp README-en.txt $MAINDIR/README cp -af README-* $MAINDIR cp -af RELEASE-NOTES-* $MAINDIR +cp -r *.css figs stylesheet-images ../ +cp -r about ../ popd rm -f */*.eps make index.html @@ -68,6 +70,10 @@ install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d done +# about fedora stuff +mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release +install -m 644 release-notes/about-fedora.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release + %clean rm -rf $RPM_BUILD_ROOT @@ -84,6 +90,12 @@ mv -f /etc/issue.net.rpmnew /etc/issue.net fi +%post +[ -x /usr/sbin/scrollkeeper-update ] && /usr/sbin/scrollkeeper-update + +%postun +[ -x /usr/sbin/scrollkeeper-update ] && /usr/sbin/scrollkeeper-update + %files %defattr(-,root,root) %attr(0644,root,root) /etc/fedora-release @@ -94,6 +106,7 @@ %config(noreplace) /etc/yum.repos.d/* %doc R* stylesheet-images figs *.css %doc eula.txt GPL autorun-template +%doc about %config %attr(0644,root,root) /etc/issue %config %attr(0644,root,root) /etc/issue.net /usr/share/firstboot/modules/eula.py* @@ -101,3 +114,4 @@ %{_defaultdocdir}/HTML %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/* +%{_datadir}/omf/fedora-release From fedora-extras-commits at redhat.com Wed Mar 8 20:45:09 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 8 Mar 2006 15:45:09 -0500 Subject: fedora-release fedora-release.spec,1.19,1.20 Message-ID: <200603082045.k28Kj9Eg023871@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23853 Modified Files: fedora-release.spec Log Message: more about-fedora fun Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fedora-release.spec 8 Mar 2006 20:22:36 -0000 1.19 +++ fedora-release.spec 8 Mar 2006 20:45:02 -0000 1.20 @@ -73,6 +73,8 @@ # about fedora stuff mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release install -m 644 release-notes/about-fedora.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release +mkdir -p $RPM_BUILD_ROOT%{datadir}/gnome/help/about-fedora +cp -r release-notes/about/* $RPM_BUILD_ROOT%{datadir}/gnome/help/about-fedora %clean rm -rf $RPM_BUILD_ROOT @@ -115,3 +117,4 @@ %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/* %{_datadir}/omf/fedora-release +%{_datadir}/gnome/help/about-fedora From fedora-extras-commits at redhat.com Wed Mar 8 20:53:23 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 15:53:23 -0500 Subject: rpms/gcl/devel gcl.spec,1.17,1.18 Message-ID: <200603082053.k28Krtm8023902@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23885 Modified Files: gcl.spec Log Message: Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gcl.spec 8 Mar 2006 19:53:24 -0000 1.17 +++ gcl.spec 8 Mar 2006 20:53:23 -0000 1.18 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GNU Common Lisp Group: Development/Languages @@ -30,7 +30,7 @@ %prep %setup -q %patch0 -p1 -#%patch1 -p1 +%patch1 -p1 %build From fedora-extras-commits at redhat.com Wed Mar 8 21:08:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:08:16 -0500 Subject: rpms/multitail - New directory Message-ID: <200603082108.k28L8IEh025876@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25866/multitail Log Message: Directory /cvs/extras/rpms/multitail added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 21:08:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:08:22 -0500 Subject: rpms/multitail/devel - New directory Message-ID: <200603082108.k28L8O86025893@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25866/multitail/devel Log Message: Directory /cvs/extras/rpms/multitail/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 21:08:48 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:08:48 -0500 Subject: rpms/multitail Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603082108.k28L8o7h025927@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25915 Added Files: Makefile import.log Log Message: Setup of module multitail --- NEW FILE Makefile --- # Top level Makefile for module multitail all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 21:08:58 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:08:58 -0500 Subject: rpms/multitail/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603082109.k28L905d025947@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25915/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module multitail --- NEW 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 Mar 8 21:09:40 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:09:40 -0500 Subject: rpms/multitail import.log,1.1,1.2 Message-ID: <200603082110.k28LACrF026015@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25981 Modified Files: import.log Log Message: auto-import multitail-3.8.7-3 on branch devel from multitail-3.8.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/multitail/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 21:08:47 -0000 1.1 +++ import.log 8 Mar 2006 21:09:40 -0000 1.2 @@ -0,0 +1 @@ +multitail-3_8_7-3:HEAD:multitail-3.8.7-3.src.rpm:1141852165 From fedora-extras-commits at redhat.com Wed Mar 8 21:09:48 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:09:48 -0500 Subject: rpms/multitail/devel multitail.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603082110.k28LAKPu026019@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25981/devel Modified Files: .cvsignore sources Added Files: multitail.spec Log Message: auto-import multitail-3.8.7-3 on branch devel from multitail-3.8.7-3.src.rpm --- NEW FILE multitail.spec --- Name: multitail Version: 3.8.7 Release: 3%{?dist} Summary: View one or multiple files like tail but with multiple windows Group: Applications/Text License: GPL URL: http://www.vanheusden.com/multitail/ Source: http://www.vanheusden.com/multitail/multitail-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel %description MultiTail lets you view one or multiple files like the original tail program. The difference is that it creates multiple windows on your console (with ncurses). It can also monitor wildcards: if another file matching the wildcard has a more recent modification date, it will automatically switch to that file. That way you can, for example, monitor a complete directory of files. Merging of 2 or even more logfiles is possible. It can also use colors while displaying the logfiles (through regular expressions), for faster recognition of what is important and what not. Multitail can also filter lines (again with regular expressions) and has interactive menus for editing given regular expressions and deleting and adding windows. One can also have windows with the output of shell scripts and other software. When viewing the output of external software, MultiTail can mimic the functionality of tools like 'watch' and such. %prep %setup -q %{__sed} -i 's/\r//' *.html %build CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__install} -d -m0755 %{buildroot}%{_bindir} \ %{buildroot}%{_mandir}/man1/ \ %{buildroot}%{_sysconfdir} %{__make} install DESTDIR="%{buildroot}" %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc *.conf *.html Changes license.txt readme.txt %{_mandir}/man1/multitail.1* %config(noreplace) %{_sysconfdir}/multitail.conf %{_bindir}/multitail %changelog * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7-3 - Small changes as suggested in #182122. - Updated to release 3.8.7-3. * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7-2 - Small changes as suggested in #182122. - Updated to release 3.8.7-2. * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7-1 - Updated to release 3.8.7-1. * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7 - Updated to release 3.8.7. * Sat Feb 18 2006 Udo van den Heuvel - 3.8.6 - Imported Dries' SPEC file - Updated to release 3.8.6. * Mon Jan 30 2006 Dries Verachtert - 3.8.5-1 - 4025/dries - Updated to release 3.8.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 21:08:58 -0000 1.1 +++ .cvsignore 8 Mar 2006 21:09:47 -0000 1.2 @@ -0,0 +1 @@ +multitail-3.8.7.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 21:08:58 -0000 1.1 +++ sources 8 Mar 2006 21:09:47 -0000 1.2 @@ -0,0 +1 @@ +b216c9e0d598e3e048b2c6738a54ba08 multitail-3.8.7.tgz From fedora-extras-commits at redhat.com Wed Mar 8 21:14:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:14:22 -0500 Subject: owners owners.list,1.722,1.723 Message-ID: <200603082114.k28LEs9v026086@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26069 Modified Files: owners.list Log Message: New component: multitail (#182122). Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.722 retrieving revision 1.723 diff -u -r1.722 -r1.723 --- owners.list 8 Mar 2006 00:26:00 -0000 1.722 +++ owners.list 8 Mar 2006 21:14:22 -0000 1.723 @@ -695,6 +695,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|mpc|Command-line client for MPD|gauret at free.fr|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| Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com From fedora-extras-commits at redhat.com Wed Mar 8 21:21:46 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 8 Mar 2006 16:21:46 -0500 Subject: fedora-release fedora-release.spec,1.20,1.21 Message-ID: <200603082121.k28LLkU3026229@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26211 Modified Files: fedora-release.spec Log Message: more about fedora magic Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fedora-release.spec 8 Mar 2006 20:45:02 -0000 1.20 +++ fedora-release.spec 8 Mar 2006 21:21:38 -0000 1.21 @@ -20,6 +20,7 @@ BuildRoot: %{_tmppath}/fedora-release-root BuildArchitectures: noarch BuildRequires: xmlto +BuildRequires: desktop-file-utils %description Fedora Core release file @@ -73,8 +74,8 @@ # about fedora stuff mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release install -m 644 release-notes/about-fedora.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release -mkdir -p $RPM_BUILD_ROOT%{datadir}/gnome/help/about-fedora -cp -r release-notes/about/* $RPM_BUILD_ROOT%{datadir}/gnome/help/about-fedora +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +install -m 644 release-notes/about-fedora.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -93,10 +94,14 @@ fi %post -[ -x /usr/sbin/scrollkeeper-update ] && /usr/sbin/scrollkeeper-update +[ -x /usr/bin/scrollkeeper-update ] && /usr/bin/scrollkeeper-update +[ -x /usr/bin/update-desktop-database ] && /usr/bin/update-desktop-database +exit 0 %postun -[ -x /usr/sbin/scrollkeeper-update ] && /usr/sbin/scrollkeeper-update +[ -x /usr/bin/scrollkeeper-update ] && /usr/bin/scrollkeeper-update +[ -x /usr/bin/update-desktop-database ] && /usr/bin/update-desktop-database +exit 0 %files %defattr(-,root,root) @@ -117,4 +122,4 @@ %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/* %{_datadir}/omf/fedora-release -%{_datadir}/gnome/help/about-fedora +%{_datadir}/applications/*.desktop From fedora-extras-commits at redhat.com Wed Mar 8 21:25:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:25:15 -0500 Subject: rpms/perl-Image-Info/devel Image-Info-1.19-inc-Module-Install.pm.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 perl-Image-Info.spec, 1.9, 1.10 sources, 1.3, 1.4 Image-Info-1.16-XBM.pm.patch, 1.1, NONE Image-Info-1.16-XPM.pm.patch, 1.1, NONE Image-Info-1.16-string.t.patch, 1.1, NONE Message-ID: <200603082125.k28LPldq026298@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26267 Modified Files: .cvsignore perl-Image-Info.spec sources Added Files: Image-Info-1.19-inc-Module-Install.pm.patch Removed Files: Image-Info-1.16-XBM.pm.patch Image-Info-1.16-XPM.pm.patch Image-Info-1.16-string.t.patch Log Message: Update to 1.19. Dropped patches: Image-Info-1.16-string.t.patch (no longer needed) Image-Info-1.16-XBM.pm.patch (upstream) Image-Info-1.16-XPM.pm.patch (upstream) New patch: Image-Info-1.19-inc-Module-Install.pm.patch (Module::Install 0.58 is broken). Image-Info-1.19-inc-Module-Install.pm.patch: --- NEW FILE Image-Info-1.19-inc-Module-Install.pm.patch --- --- Image-Info-1.19-orig/inc/Module/Install.pm 2006-03-05 09:15:08.000000000 +0000 +++ Image-Info-1.19/inc/Module/Install.pm 2006-03-06 19:18:22.000000000 +0000 @@ -35,6 +35,8 @@ use File::Path (); use FindBin; + at inc::Module::Install::ISA = 'Module::Install'; + sub autoload { my $self = shift; my $who = $self->_caller; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Feb 2006 21:18:17 -0000 1.3 +++ .cvsignore 8 Mar 2006 21:25:14 -0000 1.4 @@ -1 +1 @@ -Image-Info-1.17.tar.gz +Image-Info-1.19.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Image-Info.spec 20 Feb 2006 21:32:43 -0000 1.9 +++ perl-Image-Info.spec 8 Mar 2006 21:25:14 -0000 1.10 @@ -1,21 +1,20 @@ %define rgbtxt %{_datadir}/X11/rgb.txt Name: perl-Image-Info -Version: 1.17 -Release: 2%{?dist} +Version: 1.19 +Release: 1%{?dist} Summary: Image meta information extraction module for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Image-Info/ Source0: http://www.cpan.org/authors/id/T/TE/TELS/image/Image-Info-%{version}.tar.gz -Patch0: Image-Info-1.16-string.t.patch -Patch1: Image-Info-1.16-XBM.pm.patch -Patch2: Image-Info-1.16-XPM.pm.patch +Patch0: Image-Info-1.19-inc-Module-Install.pm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl +BuildRequires: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: %{rgbtxt} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -28,8 +27,6 @@ %prep %setup -q -n Image-Info-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 chmod 644 Changes README exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -64,6 +61,16 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 1.19-1 +- Update to 1.19. +- Module::Install 0.58 is broken (Image-Info-1.19-inc-Module-Install.pm.patch). +- BR: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple). + +* Fri Mar 3 2006 Jose Pedro Oliveira - 1.18-1 +- Update to 1.18 (broken: cpan ticket #6558). +- Dropped patches Image-Info-1.16-X[BP]M.pm.patch (accepted upstream). +- Dropped patch Image-Info-1.16-string.t.patch (test has been rewritten). + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.17-2 - BR: perl(Test::Pod), perl(Test::Pod::Coverage). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Feb 2006 21:18:17 -0000 1.3 +++ sources 8 Mar 2006 21:25:14 -0000 1.4 @@ -1 +1 @@ -1b8e4f952ce7dfaa6464b9e385548a89 Image-Info-1.17.tar.gz +5a63a7071b62d2420f822b85efde3395 Image-Info-1.19.tar.gz --- Image-Info-1.16-XBM.pm.patch DELETED --- --- Image-Info-1.16-XPM.pm.patch DELETED --- --- Image-Info-1.16-string.t.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 8 21:29:53 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 8 Mar 2006 16:29:53 -0500 Subject: fedora-release eula.txt, 1.1.1.1, 1.2 fedora-release.spec, 1.21, 1.22 EULA, 1.1.1.1, NONE Message-ID: <200603082129.k28LTrC4026339@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26316 Modified Files: eula.txt fedora-release.spec Removed Files: EULA Log Message: get the eula right Index: eula.txt =================================================================== RCS file: /cvs/fedora/fedora-release/eula.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- eula.txt 5 Apr 2005 18:35:02 -0000 1.1.1.1 +++ eula.txt 8 Mar 2006 21:29:45 -0000 1.2 @@ -1,5 +1,5 @@ LICENSE AGREEMENT - FEDORA(TM) CORE 4 + FEDORA(TM) CORE 5 This agreement governs the download, installation or use of the Software (as defined below) and any updates to the Software, @@ -90,7 +90,7 @@ United Nations Convention on the International Sale of Goods shall not apply. -Copyright (C) 2003, 2004, 2005 Fedora Project. All rights reserved. "Red Hat" -and "Fedora" are trademarks of Red Hat, Inc. "Linux" is a registered -trademark of Linus Torvalds. All other trademarks are the property of -their respective owners. +Copyright (C) 2003, 2004, 2005, 2006 Fedora Project. All rights reserved. +"Red Hat" and "Fedora" are trademarks of Red Hat, Inc. "Linux" is a +registered trademark of Linus Torvalds. All other trademarks are the +property of their respective owners. Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fedora-release.spec 8 Mar 2006 21:21:38 -0000 1.21 +++ fedora-release.spec 8 Mar 2006 21:29:45 -0000 1.22 @@ -7,7 +7,7 @@ Summary: Fedora Core release file Name: fedora-release Version: %{real_release_version} -Release: 1 +Release: 2 License: GFDL Group: System Environment/Base Source: fedora-release-%{real_release_version}.tar.gz --- EULA DELETED --- From fedora-extras-commits at redhat.com Wed Mar 8 21:35:00 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 8 Mar 2006 16:35:00 -0500 Subject: rpms/bash-completion/FC-4 .cvsignore, 1.9, 1.10 bash-completion.spec, 1.12, 1.13 sources, 1.9, 1.10 bash-completion-20050721-bash31quoting.patch, 1.1, NONE bash-completion-20050721-cvs-stat.patch, 1.1, NONE bash-completion-20050721-mtr.patch, 1.1, NONE bash-completion.profile, 1.3, NONE Message-ID: <200603082135.k28LZWt9026479@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26458 Modified Files: .cvsignore bash-completion.spec sources Removed Files: bash-completion-20050721-bash31quoting.patch bash-completion-20050721-cvs-stat.patch bash-completion-20050721-mtr.patch bash-completion.profile Log Message: * Thu Mar 2 2006 Ville Skytt?? - 20060301-1 - 20060301, patches and profile.d scriptlet applied/included upstream. - Convert docs to UTF-8. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 22 Jul 2005 06:51:53 -0000 1.9 +++ .cvsignore 8 Mar 2006 21:34:56 -0000 1.10 @@ -1 +1 @@ -bash-completion-20050721.tar.bz2 +bash-completion-20060301.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bash-completion.spec 11 Feb 2006 09:57:44 -0000 1.12 +++ bash-completion.spec 8 Mar 2006 21:34:57 -0000 1.13 @@ -1,19 +1,15 @@ Name: bash-completion -Version: 20050721 -Release: 4%{?dist} +Version: 20060301 +Release: 1%{?dist} Summary: Programmable completion for Bash Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 -Source1: %{name}.profile Source2: %{name}-mock Source3: %{name}-repomanage Source4: %{name}-plague-client -Patch0: %{name}-20050721-cvs-stat.patch -Patch1: %{name}-20050721-bash31quoting.patch -Patch2: %{name}-20050721-mtr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,9 +22,7 @@ %prep %setup -q -n bash_completion -%patch0 -%patch1 -p1 -%patch2 +f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f install -pm 644 %{SOURCE2} contrib/mock install -pm 644 %{SOURCE3} contrib/plague-client install -pm 644 %{SOURCE3} contrib/repomanage @@ -41,8 +35,7 @@ rm -rf $RPM_BUILD_ROOT %{name}-ghosts.list install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -pm 644 bash_completion $RPM_BUILD_ROOT%{_sysconfdir} -install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/bash_completion.sh +install -pm 644 bash_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name} install -pm 644 contrib/* $RPM_BUILD_ROOT%{_datadir}/%{name} install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d @@ -81,7 +74,6 @@ %bashcomp_trigger ruby-ri ri %bashcomp_trigger sbcl %bashcomp_trigger snownews -%bashcomp_trigger subversion %bashcomp_trigger unace %bashcomp_trigger unixODBC isql %bashcomp_trigger unrar @@ -98,6 +90,10 @@ %changelog +* Thu Mar 2 2006 Ville Skytt?? - 20060301-1 +- 20060301, patches and profile.d scriptlet applied/included upstream. +- Convert docs to UTF-8. + * Wed Feb 8 2006 Ville Skytt?? - 20050721-4 - Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod). - Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Jul 2005 06:51:53 -0000 1.9 +++ sources 8 Mar 2006 21:34:57 -0000 1.10 @@ -1 +1 @@ -4de9f0dee0663f08b5e24f64490e642e bash-completion-20050721.tar.bz2 +ed95a89f57357a42b8e4eb95487bf9d0 bash-completion-20060301.tar.bz2 --- bash-completion-20050721-bash31quoting.patch DELETED --- --- bash-completion-20050721-cvs-stat.patch DELETED --- --- bash-completion-20050721-mtr.patch DELETED --- --- bash-completion.profile DELETED --- From fedora-extras-commits at redhat.com Wed Mar 8 22:12:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Mar 2006 17:12:12 -0500 Subject: rpms/allegro/devel allegro-4.2.0-fullscreen.patch, NONE, 1.1 allegro-4.2.0-fullscreen2.patch, NONE, 1.1 allegro-4.2.0-mprotect.patch, NONE, 1.1 allegro.spec, 1.25, 1.26 Message-ID: <200603082212.k28MCi8G028569@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28540 Modified Files: allegro.spec Added Files: allegro-4.2.0-fullscreen.patch allegro-4.2.0-fullscreen2.patch allegro-4.2.0-mprotect.patch Log Message: * Wed Mar 8 2006 Hans de Goede 4.2.0-9 - fix fullscreen <-> window switching bug (bz 183645) - fix asm stretch code on i386 with NX processors, thanks to openBSD. allegro-4.2.0-fullscreen.patch: --- NEW FILE allegro-4.2.0-fullscreen.patch --- diff -ur allegro-4.2.0.orig/include/allegro/platform/aintunix.h allegro-4.2.0/include/allegro/platform/aintunix.h --- allegro-4.2.0.orig/include/allegro/platform/aintunix.h 2005-09-04 18:00:07.000000000 +0200 +++ allegro-4.2.0/include/allegro/platform/aintunix.h 2006-03-02 14:50:17.000000000 +0100 @@ -88,7 +88,11 @@ AL_FUNC(void, _xwin_handle_input, (void)); AL_FUNC(void, _xwin_private_handle_input, (void)); - + AL_FUNC(int , _xwin_keyboard_init, (void)); + AL_FUNC(void, _xwin_keyboard_exit, (void)); + + AL_VAR(int, _xwin_keyboard_installed); + #ifndef ALLEGRO_MULTITHREADED AL_VAR(int, _xwin_missed_input); Only in allegro-4.2.0/include/allegro/platform: aintunix.h~ diff -ur allegro-4.2.0.orig/include/xalleg.h allegro-4.2.0/include/xalleg.h --- allegro-4.2.0.orig/include/xalleg.h 2004-12-02 02:02:31.000000000 +0100 +++ allegro-4.2.0/include/xalleg.h 2006-03-02 14:42:58.000000000 +0100 @@ -126,6 +126,7 @@ int num_modes; int mode_switched; int override_redirected; + int window_used; #endif char window_title[1024]; Only in allegro-4.2.0/include: xalleg.h~ diff -ur allegro-4.2.0.orig/src/x/xkeyboard.c allegro-4.2.0/src/x/xkeyboard.c --- allegro-4.2.0.orig/src/x/xkeyboard.c 2005-11-05 17:06:53.000000000 +0100 +++ allegro-4.2.0/src/x/xkeyboard.c 2006-03-02 14:50:19.000000000 +0100 @@ -34,12 +34,12 @@ #define PREFIX_W "al-xkey WARNING: " #define PREFIX_E "al-xkey ERROR: " +int _xwin_keyboard_installed = 0; #ifdef ALLEGRO_USE_XIM static XIM xim = NULL; static XIC xic = NULL; #endif static XModifierKeymap *xmodmap = NULL; -static int xkeyboard_installed = 0; static int used[KEY_MAX]; static int sym_per_key; static int min_keycode, max_keycode; @@ -365,7 +365,7 @@ void _xwin_keyboard_handler(XKeyEvent *event, int dga2_hack) { int keycode; - if (!xkeyboard_installed) + if (!_xwin_keyboard_installed) return; if (_xwin_keyboard_callback) @@ -646,7 +646,7 @@ { XKeyboardControl values; - if (!xkeyboard_installed) + if (!_xwin_keyboard_installed) return; XLOCK(); @@ -668,10 +668,10 @@ -/* x_keyboard_init +/* _xwin_keyboard_init * Initialise the X11 keyboard driver. */ -static int x_keyboard_init(void) +int _xwin_keyboard_init(void) { #ifdef ALLEGRO_USE_XIM XIMStyles *xim_styles; @@ -680,7 +680,7 @@ int i; #endif - if (xkeyboard_installed) + if (_xwin_keyboard_installed) return 0; main_pid = getpid(); @@ -745,21 +745,21 @@ XUNLOCK (); - xkeyboard_installed = 1; + _xwin_keyboard_installed = 1; return 0; } -/* x_keyboard_exit +/* _xwin_keyboard_exit * Shut down the X11 keyboard driver. */ -static void x_keyboard_exit(void) +void _xwin_keyboard_exit(void) { - if (!xkeyboard_installed) + if (!_xwin_keyboard_installed) return; - xkeyboard_installed = 0; + _xwin_keyboard_installed = 0; XLOCK (); @@ -799,8 +799,8 @@ "X11 keyboard", "X11 keyboard", FALSE, - x_keyboard_init, - x_keyboard_exit, + _xwin_keyboard_init, + _xwin_keyboard_exit, NULL, // AL_METHOD(void, poll, (void)); x_set_leds, NULL, // AL_METHOD(void, set_rate, (int delay, int rate)); Only in allegro-4.2.0/src/x: xkeyboard.c~ diff -ur allegro-4.2.0.orig/src/x/xwin.c allegro-4.2.0/src/x/xwin.c --- allegro-4.2.0.orig/src/x/xwin.c 2005-10-27 23:23:40.000000000 +0200 +++ allegro-4.2.0/src/x/xwin.c 2006-03-02 14:48:00.000000000 +0100 @@ -130,6 +130,7 @@ 0, /* num_modes */ 0, /* mode_switched */ 0, /* override_redirected */ + 0, /* window_used */ #endif XWIN_DEFAULT_WINDOW_TITLE, /* window_title */ @@ -322,20 +323,13 @@ } } - - -/* _xwin_hide_x_mouse: - * Create invisible X cursor +/* _xwin_free_cursor: + * Helper for freeing the cursor which is done in a number of different places. */ -static void _xwin_hide_x_mouse(void) +static void _xwin_free_cursor(void) { - unsigned long gcmask; - XGCValues gcvalues; - Pixmap pixmap; - - XUndefineCursor(_xwin.display, _xwin.window); - if (_xwin.cursor != None) { + XUndefineCursor(_xwin.display, _xwin.window); XFreeCursor(_xwin.display, _xwin.cursor); _xwin.cursor = None; } @@ -346,7 +340,19 @@ _xwin.xcursor_image = None; } #endif +} +/* _xwin_hide_x_mouse: + * Create invisible X cursor + */ +static void _xwin_hide_x_mouse(void) +{ + unsigned long gcmask; + XGCValues gcvalues; + Pixmap pixmap; + + _xwin_free_cursor(); + pixmap = XCreatePixmap(_xwin.display, _xwin.window, 1, 1, 1); if (pixmap != None) { GC temp_gc; @@ -462,20 +468,7 @@ static void _xwin_private_destroy_window(void) { _xwin_private_destroy_screen(); - - if (_xwin.cursor != None) { - XUndefineCursor(_xwin.display, _xwin.window); - XFreeCursor(_xwin.display, _xwin.cursor); - _xwin.cursor = None; - } - -#ifdef ALLEGRO_XWINDOWS_WITH_XCURSOR - if (_xwin.xcursor_image != None) { - XcursorImageDestroy(_xwin.xcursor_image); - _xwin.xcursor_image = None; - } -#endif - + _xwin_free_cursor(); _xwin.visual = 0; if (_xwin.gc != None) { @@ -673,10 +666,6 @@ static BITMAP *_xwin_private_create_screen(GFX_DRIVER *drv, int w, int h, int vw, int vh, int depth, int fullscreen) { -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE - XSetWindowAttributes setattr; -#endif - if (_xwin.window == None) { ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("No window")); return 0; @@ -715,11 +704,50 @@ #ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE /* If we are going fullscreen, disable window decorations. */ if (fullscreen) { + XSetWindowAttributes setattr; + + /* HACK HACK HACK + We need to destroy the window if it has already been used once, + since doing fullscreen with a window wich has been mapped already + has issues. see: http:// mail not archived yet */ + if (_xwin.window_used) { + /* remember if the keyboard was installed */ + int keyb_installed = _xwin_keyboard_installed; + + /* remember the cursor and set the cursor to None so that the + remembered cursor does not get freed. */ + Cursor cursor = _xwin.cursor; +#ifdef ALLEGRO_XWINDOWS_WITH_XCURSOR + XcursorImage *xcursor_image = _xwin.xcursor_image; + _xwin.xcursor_image = None; +#endif + _xwin.cursor = None; + + /* close keyboard & window, then recreate both */ + _xwin_keyboard_exit(); + _xwin_private_destroy_window(); + if ((*_xwin_window_creator)()) { + ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Could not create window")); + return 0; + } + if (keyb_installed) + /* has a return value but can't fail */ + _xwin_keyboard_init(); + + /* Free the new cursor and put the old one back */ + _xwin_free_cursor(); + _xwin.cursor = cursor; +#ifdef ALLEGRO_XWINDOWS_WITH_XCURSOR + _xwin.xcursor_image = xcursor_image; +#endif + XDefineCursor(_xwin.display, _xwin.window, _xwin.cursor); + } setattr.override_redirect = True; XChangeWindowAttributes(_xwin.display, _xwin.window, CWOverrideRedirect, &setattr); _xwin.override_redirected = 1; } + _xwin.window_used = 1; #endif /* Set window size and save dimensions. */ Only in allegro-4.2.0/src/x: xwin.c~ allegro-4.2.0-fullscreen2.patch: --- NEW FILE allegro-4.2.0-fullscreen2.patch --- --- allegro-4.2.0/include/xalleg.h.fullscreen 2004-12-02 02:02:31.000000000 +0100 +++ allegro-4.2.0/include/xalleg.h 2006-03-03 23:10:18.000000000 +0100 @@ -124,8 +124,8 @@ #ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE XF86VidModeModeInfo **modesinfo; int num_modes; - int mode_switched; - int override_redirected; + int mode_switched; /* only kept around and set for ABI compat */ + int override_redirected; /* no longer used, kept for ABI compat */ #endif char window_title[1024]; @@ -139,6 +139,18 @@ #endif void (*close_button_callback)(void); + + /* These are at the end of the struct to maintain abi compat with + allegro-4.2.0 (if and only if compiled with the same configuration). + Notice that IMHO apps really shouldnot be using _xwin, but we export it, + so its fair game. */ +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + XF86VidModeModeInfo *orig_modeinfo; +#endif + /* Seperate fullscreen and managed window id's, see + _xwin_private_create_window in src/x/xwin.c for more details. */ + Window fs_window; + Window wm_window; } _xwin; --- allegro-4.2.0/src/x/xwin.c.fullscreen 2005-10-27 23:23:40.000000000 +0200 +++ allegro-4.2.0/src/x/xwin.c 2006-03-03 23:52:22.000000000 +0100 @@ -142,7 +142,12 @@ NULL, /* mutex */ #endif - NULL /* window close hook */ + NULL, /* window close hook */ +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + 0, /* orig_modeinfo */ +#endif + None, /* fs_window */ + None /* wm_window */ }; void *allegro_icon = alex_xpm; @@ -199,7 +204,6 @@ static void _xwin_private_set_palette_range(AL_CONST PALETTE p, int from, int to); static void _xwin_private_set_window_defaults(void); static void _xwin_private_flush_buffers(void); -static void _xwin_private_resize_window(int w, int h); static void _xwin_private_process_event(XEvent *event); static void _xwin_private_set_warped_mouse_mode(int permanent); static void _xwin_private_redraw_window(int x, int y, int w, int h); @@ -261,7 +265,8 @@ static void _xwin_private_slow_palette_32(int sx, int sy, int sw, int sh); #ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE -static int _xvidmode_private_set_fullscreen(int w, int h); +static void _xvidmode_private_set_fullscreen(int w, int h, int *vidmode_width, + int *vidmode_height); static void _xvidmode_private_unset_fullscreen(void); #endif @@ -372,10 +377,31 @@ } } - +/* _xwin_wait_mapped: + * wait for a window to become mapped. (shamelessly borrowed from SDL) + */ +static void _xwin_wait_mapped(Window win) +{ + XEvent event; + do { + XMaskEvent(_xwin.display, StructureNotifyMask, &event); + } while ( (event.type != MapNotify) || (event.xmap.event != win) ); +} /* _xwin_create_window: - * Wrapper for XCreateWindow. + * We use 3 windows: + * -fs_window (for fullscreen) + * -wm_window (window managed) + * -window (the real window) + * 2 of which will be created here: wm_window and window. The fullscreen + * window gets (re)created when needed, because reusing it causes trouble see: + * http://sourceforge.net/tracker/index.php?func=detail&aid=1441740&group_id=5665&atid=105665 + * The real window uses wm_window as parent initially and will be reparened to + * the (freshly created) fullscreen window when requested and reparented + * back again in screen_destroy. + * + * Idea / concept of 3 windows borrowed from SDL. But somehow SDL manages + * to reuse the fullscreen window too. */ static int _xwin_private_create_window(void) { @@ -389,21 +415,23 @@ _mouse_on = FALSE; - /* Create window. */ + /* Create the managed window. */ + setattr.background_pixel = XBlackPixel(_xwin.display, _xwin.screen); setattr.border_pixel = XBlackPixel(_xwin.display, _xwin.screen); - setattr.event_mask = (KeyPressMask | KeyReleaseMask + setattr.event_mask = (KeyPressMask | KeyReleaseMask | StructureNotifyMask | EnterWindowMask | LeaveWindowMask | FocusChangeMask | ExposureMask | PropertyChangeMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask /*| MappingNotifyMask (SubstructureRedirectMask?)*/); - _xwin.window = XCreateWindow(_xwin.display, XDefaultRootWindow(_xwin.display), + _xwin.wm_window = XCreateWindow(_xwin.display, + XDefaultRootWindow(_xwin.display), 0, 0, 320, 200, 0, CopyFromParent, InputOutput, CopyFromParent, - CWBorderPixel | CWEventMask, &setattr); - + CWBackPixel | CWBorderPixel | CWEventMask, + &setattr); /* Get associated visual and window depth (bits per pixel). */ - XGetWindowAttributes(_xwin.display, _xwin.window, &getattr); + XGetWindowAttributes(_xwin.display, _xwin.wm_window, &getattr); _xwin.visual = getattr.visual; _xwin.window_depth = getattr.depth; @@ -411,15 +439,27 @@ if ((_xwin.visual->class == PseudoColor) || (_xwin.visual->class == GrayScale) || (_xwin.visual->class == DirectColor)) - _xwin.colormap = XCreateColormap(_xwin.display, _xwin.window, _xwin.visual, AllocAll); + _xwin.colormap = XCreateColormap(_xwin.display, _xwin.wm_window, _xwin.visual, AllocAll); else - _xwin.colormap = XCreateColormap(_xwin.display, _xwin.window, _xwin.visual, AllocNone); - XSetWindowColormap(_xwin.display, _xwin.window, _xwin.colormap); + _xwin.colormap = XCreateColormap(_xwin.display, _xwin.wm_window, _xwin.visual, AllocNone); + XSetWindowColormap(_xwin.display, _xwin.wm_window, _xwin.colormap); XInstallColormap(_xwin.display, _xwin.colormap); + + /* Create the real / drawing window (reuses setattr). */ + setattr.colormap = _xwin.colormap; + _xwin.window = XCreateWindow(_xwin.display, + _xwin.wm_window, + 0, 0, 320, 200, 0, + CopyFromParent, InputOutput, CopyFromParent, + CWBackPixel | CWBorderPixel | CWEventMask | + CWColormap, &setattr); + /* Map the real / drawing window it won't appear untill the parent does */ + XMapWindow(_xwin.display, _xwin.window); + /* Set WM_DELETE_WINDOW atom in WM_PROTOCOLS property (to get window_delete requests). */ wm_delete_window = XInternAtom (_xwin.display, "WM_DELETE_WINDOW", False); - XSetWMProtocols (_xwin.display, _xwin.window, &wm_delete_window, 1); + XSetWMProtocols (_xwin.display, _xwin.wm_window, &wm_delete_window, 1); /* Set default window parameters. */ (*_xwin_window_defaultor)(); @@ -494,6 +534,11 @@ XDestroyWindow(_xwin.display, _xwin.window); _xwin.window = None; } + + if (_xwin.wm_window != None) { + XDestroyWindow(_xwin.display, _xwin.wm_window); + _xwin.wm_window = None; + } } void _xwin_destroy_window(void) @@ -673,10 +718,6 @@ static BITMAP *_xwin_private_create_screen(GFX_DRIVER *drv, int w, int h, int vw, int vh, int depth, int fullscreen) { -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE - XSetWindowAttributes setattr; -#endif - if (_xwin.window == None) { ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("No window")); return 0; @@ -711,55 +752,48 @@ ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Unsupported color depth")); return 0; } - -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE - /* If we are going fullscreen, disable window decorations. */ - if (fullscreen) { - setattr.override_redirect = True; - XChangeWindowAttributes(_xwin.display, _xwin.window, - CWOverrideRedirect, &setattr); - _xwin.override_redirected = 1; - } -#endif - - /* Set window size and save dimensions. */ - _xwin_private_resize_window(w, h); + + /* Save dimensions. */ + _xwin.window_width = w; + _xwin.window_height = h; _xwin.screen_width = w; _xwin.screen_height = h; _xwin.screen_depth = depth; _xwin.virtual_width = vw; _xwin.virtual_height = vh; -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE - if (fullscreen) { - AL_CONST char *fc; - char tmp1[64], tmp2[128]; - int i; - - /* Switch video mode. */ - if (!_xvidmode_private_set_fullscreen(w, h)) { - ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Can not set video mode")); - return 0; - } + /* Resize the (real) window */ + XResizeWindow(_xwin.display, _xwin.window, w, h); - /* Hack: make the window fully visible and center cursor. */ - XMoveWindow(_xwin.display, _xwin.window, 0, 0); - XF86VidModeSetViewPort(_xwin.display, _xwin.screen, 0, 0); - - /* This chunk is disabled by default because of problems on KDE desktops. */ - fc = get_config_string(uconvert_ascii("graphics", tmp1), - uconvert_ascii("force_centering", tmp2), - NULL); - - if ((fc) && ((i = ugetc(fc)) != 0) && ((i == 'y') || (i == 'Y') || (i == '1'))) { - XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, 0, 0); - XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, w - 1, 0); - XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, 0, h - 1); - XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, w - 1, h - 1); - } + if (fullscreen) { + XSetWindowAttributes setattr; + /* local width and height vars used for fullscreen window size and for + storing the video_mode size which is then used to center the window */ + int fs_width = DisplayWidth(_xwin.display, _xwin.screen); + int fs_height = DisplayHeight(_xwin.display, _xwin.screen); - XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, w / 2, h / 2); - XSync(_xwin.display, False); + /* Create the fullscreen window */ + setattr.override_redirect = True; + setattr.background_pixel = XBlackPixel(_xwin.display, _xwin.screen); + setattr.border_pixel = XBlackPixel(_xwin.display, _xwin.screen); + setattr.event_mask = StructureNotifyMask; + setattr.colormap = _xwin.colormap; + _xwin.fs_window = XCreateWindow(_xwin.display, + XDefaultRootWindow(_xwin.display), + 0, 0, fs_width, fs_height, 0, + CopyFromParent, InputOutput, + CopyFromParent, CWOverrideRedirect | + CWBackPixel | CWColormap | CWBorderPixel | + CWEventMask, &setattr); + + /* Map the fullscreen window */ + XMapRaised(_xwin.display, _xwin.fs_window); + _xwin_wait_mapped(_xwin.fs_window); + /* Make sure we got to the top of the window stack */ + XRaiseWindow(_xwin.display, _xwin.fs_window); + + /* Reparent the real window */ + XReparentWindow(_xwin.display, _xwin.window, _xwin.fs_window, 0, 0); /* Grab the keyboard and mouse. */ if (XGrabKeyboard(_xwin.display, XDefaultRootWindow(_xwin.display), False, @@ -775,8 +809,45 @@ return 0; } _xwin.mouse_grabbed = 1; - } + +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + /* Try to switch video mode. This must be done after the pointer is + grabbed, because otherwise it can be outside the window negating the + XF86VidModeSetViewPort done in set_fullscreen. This makes the old + center the window hack unnescesarry. Notice that since the XF86VM + extension requests do not go through the regular X output buffer? We + need to make sure that all above requests are processed first. */ + XSync(_xwin.display, False); + _xvidmode_private_set_fullscreen(w, h, &fs_width, &fs_height); #endif + + /* Center the window (if nescesarry) */ + if ((fs_width != w) || (fs_height != h)) + XMoveWindow(_xwin.display, _xwin.window, (fs_width - w) / 2, + (fs_height - h) / 2); + + /* Last: center the cursor */ + XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, w / 2, h / 2); + } else { + XSizeHints *hints = XAllocSizeHints();; + + /* Resize managed window. */ + XResizeWindow(_xwin.display, _xwin.wm_window, w, h); + + /* Set size and position hints for Window Manager. */ + if (hints) { + hints->flags = PMinSize | PMaxSize | PBaseSize; + hints->min_width = hints->max_width = hints->base_width = w; + hints->min_height = hints->max_height = hints->base_height = h; + XSetWMNormalHints(_xwin.display, _xwin.wm_window, hints); + + XFree(hints); + } + + /* Map the window managed window */ + XMapWindow(_xwin.display, _xwin.wm_window); + _xwin_wait_mapped(_xwin.wm_window); + } /* Create XImage with the size of virtual screen. */ if (_xwin_private_create_ximage(vw, vh) != 0) { @@ -804,12 +875,6 @@ bmp = _xwin_private_create_screen(drv, w, h, vw, vh, depth, fullscreen); if (bmp == 0) { _xwin_private_destroy_screen(); - /* Work around a weird bug with some window managers (KWin, Window Maker). */ - if (fullscreen) { - bmp = _xwin_private_create_screen(drv, w, h, vw, vh, depth, fullscreen); - if (bmp == 0) - _xwin_private_destroy_screen(); - } } XUNLOCK(); return bmp; @@ -843,7 +908,6 @@ _xwin_private_destroy_ximage(); -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE if (_xwin.mouse_grabbed) { XUngrabPointer(_xwin.display, CurrentTime); _xwin.mouse_grabbed = 0; @@ -854,14 +918,8 @@ _xwin.keyboard_grabbed = 0; } +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE _xvidmode_private_unset_fullscreen(); - - if (_xwin.override_redirected) { - setattr.override_redirect = False; - XChangeWindowAttributes(_xwin.display, _xwin.window, - CWOverrideRedirect, &setattr); - _xwin.override_redirected = 0; - } #endif /* whack color-conversion blitter */ @@ -869,8 +927,16 @@ _release_colorconv_blitter(blitter_func); blitter_func = NULL; } - - XUnmapWindow (_xwin.display, _xwin.window); + + if (_xwin.fs_window != None) { + /* Reparent the real window! */ + XReparentWindow(_xwin.display, _xwin.window, _xwin.wm_window, 0, 0); + XUnmapWindow(_xwin.display, _xwin.fs_window); + XDestroyWindow(_xwin.display, _xwin.fs_window); + _xwin.fs_window = None; + } + else + XUnmapWindow (_xwin.display, _xwin.wm_window); (*_xwin_window_defaultor)(); } @@ -2139,31 +2205,31 @@ XpmAttributes attributes; #endif - if (_xwin.window == None) + if (_xwin.wm_window == None) return; /* Set window title. */ - XStoreName(_xwin.display, _xwin.window, _xwin.window_title); + XStoreName(_xwin.display, _xwin.wm_window, _xwin.window_title); /* Set hints. */ hint.res_name = _xwin.application_name; hint.res_class = _xwin.application_class; - XSetClassHint(_xwin.display, _xwin.window, &hint); + XSetClassHint(_xwin.display, _xwin.wm_window, &hint); wm_hints.flags = InputHint | StateHint | WindowGroupHint; wm_hints.input = True; wm_hints.initial_state = NormalState; - wm_hints.window_group = _xwin.window; + wm_hints.window_group = _xwin.wm_window; #ifdef ALLEGRO_XWINDOWS_WITH_XPM if (allegro_icon) { wm_hints.flags |= IconPixmapHint | IconMaskHint; attributes.valuemask = XpmReturnAllocPixels | XpmReturnExtensions; - XpmCreatePixmapFromData(_xwin.display,_xwin.window,allegro_icon,&wm_hints.icon_pixmap,&wm_hints.icon_mask, &attributes); + XpmCreatePixmapFromData(_xwin.display,_xwin.wm_window,allegro_icon,&wm_hints.icon_pixmap,&wm_hints.icon_mask, &attributes); } #endif - XSetWMHints(_xwin.display, _xwin.window, &wm_hints); + XSetWMHints(_xwin.display, _xwin.wm_window, &wm_hints); } @@ -2213,41 +2279,6 @@ } - -/* _xwin_resize_window: - * Wrapper for XResizeWindow. - */ -static void _xwin_private_resize_window(int w, int h) -{ - XSizeHints *hints; - - if (_xwin.window == None) - return; - - /* New window size. */ - _xwin.window_width = w; - _xwin.window_height = h; - - /* Resize window. */ - XUnmapWindow(_xwin.display, _xwin.window); - XResizeWindow(_xwin.display, _xwin.window, w, h); - XMapWindow(_xwin.display, _xwin.window); - - hints = XAllocSizeHints(); - if (hints == 0) - return; - - /* Set size and position hints for Window Manager. */ - hints->flags = PMinSize | PMaxSize | PBaseSize; - hints->min_width = hints->max_width = hints->base_width = w; - hints->min_height = hints->max_height = hints->base_height = h; - XSetWMNormalHints(_xwin.display, _xwin.window, hints); - - XFree(hints); -} - - - /* _xwin_process_event: * Process one event. */ @@ -2723,51 +2754,93 @@ * Support for XF86VidMode extension. */ #ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE +/* qsort comparison function for sorting the modes */ +static int cmpmodes(const void *va, const void *vb) +{ + const XF86VidModeModeInfo *a = *(const XF86VidModeModeInfo **)va; + const XF86VidModeModeInfo *b = *(const XF86VidModeModeInfo **)vb; + if ( a->hdisplay == b->hdisplay ) + return b->vdisplay - a->vdisplay; + else + return b->hdisplay - a->hdisplay; +} + /* _xvidmode_private_set_fullscreen: - * Attempt to switch video mode and make window fullscreen. + * Attempt to switch to a better matching video mode. + * Matching code for non exact match (smallest bigger res) rather shamelessly + * taken from SDL. */ -static int _xvidmode_private_set_fullscreen(int w, int h) +static void _xvidmode_private_set_fullscreen(int w, int h, int *vidmode_width, + int *vidmode_height) { int vid_event_base, vid_error_base; int vid_major_version, vid_minor_version; - XF86VidModeModeInfo *mode; int i; - + /* Test that display is local. */ - if (!_xwin_private_display_is_local()) { - ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("VidMode extension requires local display")); - return 0; - } + if (!_xwin_private_display_is_local()) + return; /* Test for presence of VidMode extension. */ if (!XF86VidModeQueryExtension(_xwin.display, &vid_event_base, &vid_error_base) - || !XF86VidModeQueryVersion(_xwin.display, &vid_major_version, &vid_minor_version)) { - ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("VidMode extension is not supported")); - return 0; - } + || !XF86VidModeQueryVersion(_xwin.display, &vid_major_version, &vid_minor_version)) + return; /* Get list of modelines. */ if (!XF86VidModeGetAllModeLines(_xwin.display, _xwin.screen, &_xwin.num_modes, &_xwin.modesinfo)) - return 0; - - /* Search for a matching video mode. */ - for (i = 0; i < _xwin.num_modes; i++) { - mode = _xwin.modesinfo[i]; - if ((mode->hdisplay == w) && (mode->vdisplay == h)) { - /* Switch video mode. */ - if (!XF86VidModeSwitchToMode(_xwin.display, _xwin.screen, mode)) - return 0; + return; - /* Lock mode switching. */ - XF86VidModeLockModeSwitch(_xwin.display, _xwin.screen, True); + /* Remember the mode to restore */ + _xwin.orig_modeinfo = _xwin.modesinfo[0]; - _xwin.mode_switched = 1; - return 1; - } + /* Search for an exact matching video mode. */ + for (i = 0; i < _xwin.num_modes; i++) { + if ((_xwin.modesinfo[i]->hdisplay == w) && + (_xwin.modesinfo[i]->vdisplay == h)) + break; } - return 0; + /* Search for a non exact match (smallest bigger res). */ + if (i == _xwin.num_modes) { + int best_width = 0, best_height = 0; + qsort(_xwin.modesinfo, _xwin.num_modes, sizeof(void *), cmpmodes); + for (i = _xwin.num_modes-1; i > 0; i--) { + if ( ! best_width ) { + if ( (_xwin.modesinfo[i]->hdisplay >= w) && + (_xwin.modesinfo[i]->vdisplay >= h) ) { + best_width = _xwin.modesinfo[i]->hdisplay; + best_height = _xwin.modesinfo[i]->vdisplay; + } + } else { + if ( (_xwin.modesinfo[i]->hdisplay != best_width) || + (_xwin.modesinfo[i]->vdisplay != best_height) ) { + i++; + break; + } + } + } + } + + /* Switch video mode. */ + if ((_xwin.modesinfo[i] == _xwin.orig_modeinfo) || + !XF86VidModeSwitchToMode(_xwin.display, _xwin.screen, + _xwin.modesinfo[i])) { + *vidmode_width = _xwin.orig_modeinfo->hdisplay; + *vidmode_height = _xwin.orig_modeinfo->vdisplay; + _xwin.orig_modeinfo = NULL; + } else { + *vidmode_width = _xwin.modesinfo[i]->hdisplay; + *vidmode_height = _xwin.modesinfo[i]->vdisplay; + /* only kept / set for compatibility with apps which check this */ + _xwin.mode_switched = 1; + } + + /* Lock mode switching. */ + XF86VidModeLockModeSwitch(_xwin.display, _xwin.screen, True); + + /* Set viewport. */ + XF86VidModeSetViewPort(_xwin.display, _xwin.screen, 0, 0); } @@ -2793,13 +2866,15 @@ static void _xvidmode_private_unset_fullscreen(void) { if (_xwin.num_modes > 0) { - if (_xwin.mode_switched) { - /* Unlock mode switching. */ - XF86VidModeLockModeSwitch(_xwin.display, _xwin.screen, False); + /* Unlock mode switching. */ + XF86VidModeLockModeSwitch(_xwin.display, _xwin.screen, False); + if (_xwin.orig_modeinfo) { /* Restore the original video mode. */ - XF86VidModeSwitchToMode(_xwin.display, _xwin.screen, _xwin.modesinfo[0]); - + XF86VidModeSwitchToMode(_xwin.display, _xwin.screen, + _xwin.orig_modeinfo); + _xwin.orig_modeinfo = 0; + /* only kept / set for compatibility with apps which check this */ _xwin.mode_switched = 0; } @@ -2809,36 +2884,35 @@ _xwin.modesinfo = 0; } } +#endif -/* _xvidmode_private_fetch_mode_list: +/* _xwin_private_fetch_mode_list: * Generates a list of valid video modes. */ -static GFX_MODE_LIST *_xvidmode_private_fetch_mode_list(void) +static GFX_MODE_LIST *_xwin_private_fetch_mode_list(void) { + int num_modes = 1, num_bpp = 0; + GFX_MODE_LIST *mode_list; + int i, j; +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + int has_vidmode = 0; int vid_event_base, vid_error_base; int vid_major_version, vid_minor_version; XF86VidModeModeInfo **modesinfo; - int num_modes, num_bpp; - GFX_MODE_LIST *mode_list; - int i, j; - - /* Test that display is local. */ - if (!_xwin_private_display_is_local()) - return 0; - - /* Test for presence of VidMode extension. */ - if (!XF86VidModeQueryExtension(_xwin.display, &vid_event_base, &vid_error_base) - || !XF86VidModeQueryVersion(_xwin.display, &vid_major_version, &vid_minor_version)) - return 0; - - /* Get list of modelines. */ - if (!XF86VidModeGetAllModeLines(_xwin.display, _xwin.screen, &num_modes, &modesinfo)) - return 0; + + /* Test that display is local. */ + if ( _xwin_private_display_is_local() && + /* Test for presence of VidMode extension. */ + XF86VidModeQueryExtension(_xwin.display, &vid_event_base, &vid_error_base) && + XF86VidModeQueryVersion(_xwin.display, &vid_major_version, &vid_minor_version) && + /* Get list of modelines. */ + XF86VidModeGetAllModeLines(_xwin.display, _xwin.screen, &num_modes, &modesinfo)) + has_vidmode = 1; +#endif /* Calculate the number of color depths we have to support. */ - num_bpp = 0; #ifdef ALLEGRO_COLOR8 num_bpp++; #endif @@ -2857,25 +2931,48 @@ /* Allocate space for mode list. */ mode_list = malloc(sizeof(GFX_MODE_LIST)); if (!mode_list) { - free_modelines(modesinfo, num_modes); +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + if (has_vidmode) + free_modelines(modesinfo, num_modes); +#endif return 0; } mode_list->mode = malloc(sizeof(GFX_MODE) * ((num_modes * num_bpp) + 1)); if (!mode_list->mode) { free(mode_list); - free_modelines(modesinfo, num_modes); +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + if (has_vidmode) + free_modelines(modesinfo, num_modes); +#endif return 0; } /* Fill in mode list. */ j = 0; for (i = 0; i < num_modes; i++) { -#define ADD_MODE(BPP) \ + +#define ADD_SCREEN_MODE(BPP) \ + mode_list->mode[j].width = DisplayWidth(_xwin.display, _xwin.screen); \ + mode_list->mode[j].height = DisplayHeight(_xwin.display, _xwin.screen); \ + mode_list->mode[j].bpp = BPP; \ + j++ +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE +#define ADD_VIDMODE_MODE(BPP) \ mode_list->mode[j].width = modesinfo[i]->hdisplay; \ mode_list->mode[j].height = modesinfo[i]->vdisplay; \ mode_list->mode[j].bpp = BPP; \ j++ +#define ADD_MODE(BPP) \ + if (has_vidmode) { \ + ADD_VIDMODE_MODE(BPP); \ + } else { \ + ADD_SCREEN_MODE(BPP); \ + } +#else +#define ADD_MODE(BPP) ADD_SCREEN_MODE(BPP) +#endif + #ifdef ALLEGRO_COLOR8 ADD_MODE(8); #endif @@ -2896,11 +2993,13 @@ mode_list->mode[j].bpp = 0; mode_list->num_modes = j; - free_modelines(modesinfo, num_modes); +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + if (has_vidmode) + free_modelines(modesinfo, num_modes); +#endif return mode_list; } -#endif @@ -2909,15 +3008,11 @@ */ GFX_MODE_LIST *_xwin_fetch_mode_list(void) { -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE GFX_MODE_LIST *list; XLOCK(); - list = _xvidmode_private_fetch_mode_list(); + list = _xwin_private_fetch_mode_list(); XUNLOCK(); return list; -#else - return 0; -#endif } --- allegro-4.2.0/src/x/xgfxdrv.c~ 2006-03-08 22:47:27.000000000 +0100 +++ allegro-4.2.0/src/x/xgfxdrv.c 2006-03-08 22:47:27.000000000 +0100 @@ -61,7 +61,6 @@ -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE static BITMAP *_xwin_fullscreen_gfxdrv_init(int w, int h, int vw, int vh, int color_depth); @@ -98,7 +97,6 @@ 0, FALSE }; -#endif @@ -109,9 +107,7 @@ { GFX_XDGA2, &gfx_xdga2, FALSE }, { GFX_XDGA2_SOFT, &gfx_xdga2_soft, FALSE }, #endif -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE { GFX_XWINDOWS_FULLSCREEN, &gfx_xwin_fullscreen, TRUE }, -#endif { GFX_XWINDOWS, &gfx_xwin, TRUE }, { 0, NULL, 0 } }; @@ -138,7 +134,6 @@ -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE /* _xwin_fullscreen_gfxdrv_init: * Creates screen bitmap (with video mode extension). */ @@ -146,4 +141,3 @@ { return _xwin_create_screen(&gfx_xwin_fullscreen, w, h, vw, vh, color_depth, TRUE); } -#endif allegro-4.2.0-mprotect.patch: --- NEW FILE allegro-4.2.0-mprotect.patch --- --- allegro-4.2.0/tools/grabber.c.mprotect 2005-09-04 18:00:18.000000000 +0200 +++ allegro-4.2.0/tools/grabber.c 2006-03-08 23:13:39.000000000 +0100 @@ -3121,6 +3121,7 @@ case OSTYPE_SUNOS: s = "SunOS/Solaris"; break; case OSTYPE_FREEBSD: s = "FreeBSD"; break; case OSTYPE_NETBSD: s = "NetBSD"; break; + case OSTYPE_OPENBSD: s = "OpenBSD"; break; case OSTYPE_IRIX: s = "IRIX"; break; case OSTYPE_DARWIN: s = "Darwin"; break; case OSTYPE_QNX: s = "QNX"; break; --- allegro-4.2.0/include/allegro/platform/alunixac.hin.mprotect 2005-10-30 21:23:33.000000000 +0100 +++ allegro-4.2.0/include/allegro/platform/alunixac.hin 2006-03-08 23:13:39.000000000 +0100 @@ -169,6 +169,9 @@ /* Define to 1 if you have the `mmap' function. */ #undef HAVE_MMAP +/* Define to 1 if you have the `mprotect' function. */ +#undef HAVE_MPROTECT + /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_NDIR_H --- allegro-4.2.0/include/allegro/system.h.mprotect 2005-03-15 21:32:43.000000000 +0100 +++ allegro-4.2.0/include/allegro/system.h 2006-03-08 23:13:39.000000000 +0100 @@ -53,6 +53,7 @@ #define OSTYPE_SUNOS AL_ID('S','U','N',' ') #define OSTYPE_FREEBSD AL_ID('F','B','S','D') #define OSTYPE_NETBSD AL_ID('N','B','S','D') +#define OSTYPE_OPENBSD AL_ID('O','B','S','D') #define OSTYPE_IRIX AL_ID('I','R','I','X') #define OSTYPE_DARWIN AL_ID('D','A','R','W') #define OSTYPE_QNX AL_ID('Q','N','X',' ') --- allegro-4.2.0/configure.mprotect 2005-11-06 10:54:00.000000000 +0100 +++ allegro-4.2.0/configure 2006-03-08 23:13:39.000000000 +0100 @@ -11225,7 +11225,7 @@ -for ac_func in mmap memcmp mkstemp stricmp strlwr strupr vprintf +for ac_func in mmap mprotect memcmp mkstemp stricmp strlwr strupr vprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 --- allegro-4.2.0/configure.in.mprotect 2005-08-07 23:50:49.000000000 +0200 +++ allegro-4.2.0/configure.in 2006-03-08 23:13:39.000000000 +0100 @@ -713,7 +713,7 @@ AC_STRUCT_TM AC_TYPE_SIGNAL -AC_CHECK_FUNCS(mmap memcmp mkstemp stricmp strlwr strupr vprintf) +AC_CHECK_FUNCS(mmap mprotect memcmp mkstemp stricmp strlwr strupr vprintf) dnl Tweak header files for library build CFLAGS="$CFLAGS -DALLEGRO_LIB_BUILD" --- allegro-4.2.0/src/unix/usystem.c.mprotect 2005-09-04 18:00:17.000000000 +0200 +++ allegro-4.2.0/src/unix/usystem.c 2006-03-08 23:13:39.000000000 +0100 @@ -196,6 +196,9 @@ else if (!strcmp(utsn.sysname, "NetBSD")) { os_type = OSTYPE_NETBSD; } + else if (!strcmp(utsn.sysname, "OpenBSD")) { + os_type = OSTYPE_OPENBSD; + } else if ((!strcmp(utsn.sysname, "IRIX")) || (!strcmp(utsn.sysname, "IRIX64"))) { os_type = OSTYPE_IRIX; --- allegro-4.2.0/src/unix/uesd.c.mprotect 2005-03-12 08:54:27.000000000 +0100 +++ allegro-4.2.0/src/unix/uesd.c 2006-03-08 23:13:39.000000000 +0100 @@ -27,6 +27,7 @@ #include #include +#include /* FD_ZERO() needs this */ #include #include --- allegro-4.2.0/src/i386/istretch.c.mprotect 2005-03-15 19:02:22.000000000 +0100 +++ allegro-4.2.0/src/i386/istretch.c 2006-03-08 23:14:52.000000000 +0100 @@ -30,6 +30,10 @@ #include "winalleg.h" /* For VirtualProtect */ #endif /* ifdef ALLEGRO_WINDOWS */ +#ifdef HAVE_MPROTECT + #include + #include +#endif /* helper macro for generating stretchers in each color depth */ @@ -435,7 +439,9 @@ #ifdef ALLEGRO_WINDOWS /* Play nice with Windows executable memory protection */ VirtualProtect(_scratch_mem, _scratch_mem_size, PAGE_EXECUTE_READWRITE, &old_protect); - #endif /* ifdef ALLEGRO_WINDOWS */ + #elif defined(HAVE_MPROTECT) + mprotect(_scratch_mem, _scratch_mem_size, PROT_EXEC|PROT_READ|PROT_WRITE); + #endif /* call the stretcher */ _do_stretch(source, dest, _scratch_mem, sx>>16, sy, syd, Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- allegro.spec 27 Feb 2006 09:58:51 -0000 1.25 +++ allegro.spec 8 Mar 2006 22:12:12 -0000 1.26 @@ -18,6 +18,8 @@ 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 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 @@ -128,6 +130,9 @@ %patch4 -p1 -z .digmid %patch5 -p1 -z .alsa-big-endian %patch6 -p1 -z .64bit +%patch7 -p1 -z .fullscreen +%patch8 -p1 -z .mprotect + %build %configure \ @@ -214,6 +219,10 @@ %changelog +* Wed Mar 8 2006 Hans de Goede 4.2.0-9 +- fix fullscreen <-> window switching bug (bz 183645) +- fix asm stretch code on i386 with NX processors, thanks to openBSD. + * Mon Feb 27 2006 Hans de Goede 4.2.0-8 - fix sound not working on PPC (bz 183112) - fix allegro not finding and loading plugins/modules on x86_64 (bz 183113) From fedora-extras-commits at redhat.com Wed Mar 8 22:15:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Mar 2006 17:15:12 -0500 Subject: rpms/allegro/devel allegro.spec,1.26,1.27 Message-ID: <200603082215.k28MFicY028657@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28633 Modified Files: allegro.spec Log Message: oops forgot to raise release Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- allegro.spec 8 Mar 2006 22:12:12 -0000 1.26 +++ allegro.spec 8 Mar 2006 22:15:11 -0000 1.27 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 8 +Release: 9 Summary: A game programming library Summary(es): Una libreria de programacion de juegos From fedora-extras-commits at redhat.com Wed Mar 8 22:18:33 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:18:33 -0500 Subject: rpms/ftnchek - New directory Message-ID: <200603082218.k28MIZUW028775@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28757/ftnchek Log Message: Directory /cvs/extras/rpms/ftnchek added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:18:39 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:18:39 -0500 Subject: rpms/ftnchek/devel - New directory Message-ID: <200603082218.k28MIfkG028856@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28757/ftnchek/devel Log Message: Directory /cvs/extras/rpms/ftnchek/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:19:00 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:19:00 -0500 Subject: rpms/ftnchek Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603082219.k28MJ29F028890@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28878 Added Files: Makefile import.log Log Message: Setup of module ftnchek --- NEW FILE Makefile --- # Top level Makefile for module ftnchek all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 22:19:06 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:19:06 -0500 Subject: rpms/ftnchek/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603082219.k28MJ8eJ028908@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28878/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ftnchek --- NEW 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 Mar 8 22:19:55 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:19:55 -0500 Subject: rpms/ftnchek import.log,1.1,1.2 Message-ID: <200603082220.k28MKRLA028989@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28952 Modified Files: import.log Log Message: auto-import ftnchek-3.3.1-3 on branch devel from ftnchek-3.3.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ftnchek/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 22:19:00 -0000 1.1 +++ import.log 8 Mar 2006 22:19:54 -0000 1.2 @@ -0,0 +1 @@ +ftnchek-3_3_1-3:HEAD:ftnchek-3.3.1-3.src.rpm:1141856387 From fedora-extras-commits at redhat.com Wed Mar 8 22:20:00 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:20:00 -0500 Subject: rpms/ftnchek/devel ftnchek-3.3.1-datadir.patch, NONE, 1.1 ftnchek.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603082220.k28MKXAN028993@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28952/devel Modified Files: .cvsignore sources Added Files: ftnchek-3.3.1-datadir.patch ftnchek.spec Log Message: auto-import ftnchek-3.3.1-3 on branch devel from ftnchek-3.3.1-3.src.rpm ftnchek-3.3.1-datadir.patch: --- NEW FILE ftnchek-3.3.1-datadir.patch --- --- ftnchek-3.3.1/dcl2inc.in.orig 1999-11-02 17:23:36.000000000 -0700 +++ ftnchek-3.3.1/dcl2inc.in 2006-03-07 14:45:33.000000000 -0700 @@ -24,5 +24,5 @@ # The following lines are edited by configure when it builds dcl2inc. prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@/ftnchek -exec @AWK@ -f ${libdir}/dcl2inc.awk "$@" +datadir=@datadir@/ftnchek +exec @AWK@ -f ${datadir}/dcl2inc.awk "$@" --- ftnchek-3.3.1/Makefile.in.orig 2006-03-07 14:45:46.000000000 -0700 +++ ftnchek-3.3.1/Makefile.in 2006-03-07 14:47:00.000000000 -0700 @@ -99,7 +99,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -datadir = @datadir@ +datadir = @datadir@/ftnchek mandir = @mandir@ manext = .1 sgimansubdir = @sgimansubdir@ @@ -496,9 +496,9 @@ $(CP) ftnchek$(EXE) $(bindir) -$(STRIP) $(bindir)/ftnchek$(EXE) $(CHMOD) 755 $(bindir)/ftnchek$(EXE) - -$(MKDIR) -p $(libdir) - $(CP) dcl2inc.awk $(libdir)/dcl2inc.awk - $(CHMOD) 644 $(libdir)/dcl2inc.awk + -$(MKDIR) -p $(datadir) + $(CP) dcl2inc.awk $(datadir)/dcl2inc.awk + $(CHMOD) 644 $(datadir)/dcl2inc.awk $(CP) dcl2inc$(CMD) $(bindir)/dcl2inc$(CMD) $(CHMOD) 755 $(bindir)/dcl2inc$(CMD) -$(RM) $(bindir)/fcl2vcg @@ -580,14 +580,14 @@ uninstall: -$(RM) $(bindir)/dcl2inc$(CMD) -$(RM) $(bindir)/ftnchek$(CMD) - -$(RM) $(libdir)/dcl2inc.awk + -$(RM) $(datadir)/dcl2inc.awk -$(RM) $(mandir)/cat1/dcl2inc$(manext) -$(RM) $(mandir)/cat1/ftnchek$(manext) -$(RM) $(mandir)/dcl2inc.z $(mandir)/ftnchek.z # SGI -$(RM) $(mandir)/man1/dcl2inc$(manext) -$(RM) $(mandir)/man1/ftnchek$(manext) -$(RM) $(lispdir)/ftnchek.el - -$(RMDIR) $(libdir) + -$(RMDIR) $(datadir) # WARNING: do NOT execute this target, unless you have nroff/troff or groff # to recreate the formatted documentation files. --- NEW FILE ftnchek.spec --- Name: ftnchek Version: 3.3.1 Release: 3 Summary: Static analyzer for Fortran 77 programs Group: Development/Tools License: MIT URL: http://www.dsm.fordham.edu/~ftnchek/ Source0: http://www.dsm.fordham.edu/~ftnchek/download/ftnchek-3.3.1.tar.gz Patch0: ftnchek-3.3.1-datadir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: groff, emacs %description ftnchek is a static analyzer for Fortran 77 programs. It is designed to detect certain errors in a Fortran program that a compiler usually does not. ftnchek is not primarily intended to detect syntax errors. Its purpose is to assist the user in finding semantic errors. Semantic errors are legal in the Fortran language but are wasteful or may cause incorrect operation. For example, variables which are never used may indicate some omission in the program; uninitialized variables contain garbage which may cause incorrect results to be calculated; and variables which are not declared may not have the intended type. ftnchek is intended to assist users in the debugging of their Fortran program. It is not intended to catch all syntax errors. This is the function of the compiler. Prior to using ftnchek, the user should verify that the program compiles correctly. %package emacs Summary: Emacs support for ftnchek Group: Development/Tools Requires: %{name} = %{version}-%{release} Requires: %{_datadir}/emacs/site-lisp %description emacs %{summary}. %prep %setup -q %patch -p1 -b .datadir #Stop configure from overriding CFLAGS sed -i -e 's/CFLAGS="-DUNIX.*"//' configure %build export CFLAGS="$RPM_OPT_FLAGS -DUNIX" %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp %makeinstall datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ lispdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE README FAQ PATCHES %{_bindir}/dcl2inc %{_bindir}/ftnchek %{_datadir}/ftnchek/ %{_mandir}/man1/dcl2inc.1* %{_mandir}/man1/ftnchek.1* %files emacs %{_datadir}/emacs/site-lisp/ftnchek.el %{_datadir}/emacs/site-lisp/ftnchek.elc %changelog * Wed Mar 08 2006 Orion Poplawki 3.3.1-3 - Own %{_datadir}/ftnchek/ - Add period to end of emacs package description * Wed Mar 08 2006 Orion Poplawki 3.3.1-2 - Add emacs sub-package for emacs support - Fix up CFLAGS to use RPM CFLAGS - Add FAQ and PATCHES to %doc * Tue Mar 07 2006 Orion Poplawki 3.3.1-1 - Initial Fedora Extras submission Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ftnchek/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 22:19:06 -0000 1.1 +++ .cvsignore 8 Mar 2006 22:20:00 -0000 1.2 @@ -0,0 +1 @@ +ftnchek-3.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ftnchek/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 22:19:06 -0000 1.1 +++ sources 8 Mar 2006 22:20:00 -0000 1.2 @@ -0,0 +1 @@ +e1f4ce51ea1a85e7b080ab5d23013f97 ftnchek-3.3.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 22:31:30 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:31:30 -0500 Subject: rpms/R-wavethresh - New directory Message-ID: <200603082231.k28MVWPL029208@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29200/R-wavethresh Log Message: Directory /cvs/extras/rpms/R-wavethresh added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:31:36 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:31:36 -0500 Subject: rpms/R-wavethresh/devel - New directory Message-ID: <200603082231.k28MVcKL029223@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29200/R-wavethresh/devel Log Message: Directory /cvs/extras/rpms/R-wavethresh/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:31:56 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:31:56 -0500 Subject: rpms/R-wavethresh Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603082231.k28MVwU6029257@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29245 Added Files: Makefile import.log Log Message: Setup of module R-wavethresh --- NEW FILE Makefile --- # Top level Makefile for module R-wavethresh all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 22:32:01 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:32:01 -0500 Subject: rpms/R-wavethresh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603082232.k28MW3GN029277@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29245/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module R-wavethresh --- NEW 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 Mar 8 22:32:37 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:32:37 -0500 Subject: rpms/R-wavethresh import.log,1.1,1.2 Message-ID: <200603082233.k28MXApn029375@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29330 Modified Files: import.log Log Message: auto-import R-wavethresh-2.2-2 on branch devel from R-wavethresh-2.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/R-wavethresh/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 22:31:55 -0000 1.1 +++ import.log 8 Mar 2006 22:32:37 -0000 1.2 @@ -0,0 +1 @@ +R-wavethresh-2_2-2:HEAD:R-wavethresh-2.2-2.src.rpm:1141857150 From fedora-extras-commits at redhat.com Wed Mar 8 22:32:44 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:32:44 -0500 Subject: rpms/R-wavethresh/devel R-wavethresh.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603082233.k28MXG27029379@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29330/devel Modified Files: .cvsignore sources Added Files: R-wavethresh.spec Log Message: auto-import R-wavethresh-2.2-2 on branch devel from R-wavethresh-2.2-2.src.rpm --- NEW FILE R-wavethresh.spec --- %define packrel 8 %define packname wavethresh Summary: R module, Software to perform wavelet statistics and transforms Name: R-%{packname} Version: 2.2 Release: 2%{?dist} License: GPL Group: Applications/Engineering Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz URL: http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: R >= 1.4 BuildRequires: R >= 1.4, tetex-latex %description Software to perform 1-d and 2-d wavelet statistics and transforms %prep %setup -q -n %{packname} %build %install %{__rm} -rf %{buildroot} cd ..; R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library %{__rm} -rf %{buildroot}%{_libdir}/R/library/R.css %check cd ..;%{_bindir}/R CMD check %{packname} %clean %{__rm} -rf %{buildroot} %post %{__cat} %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun %{__cat} %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %defattr(-, root, root, -) %{_libdir}/R/library/%{packname} %doc DESCRIPTION %changelog * Wed Mar 8 2006 Jose' Matos - 2.2-2 - Rename License to simply GPL, added DESCRIPTION to %%doc * Fri Mar 03 2006 Jos?? Matos 2.2-1 - Initial package creation Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/R-wavethresh/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 22:32:01 -0000 1.1 +++ .cvsignore 8 Mar 2006 22:32:43 -0000 1.2 @@ -0,0 +1 @@ +wavethresh_2.2-8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-wavethresh/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 22:32:01 -0000 1.1 +++ sources 8 Mar 2006 22:32:43 -0000 1.2 @@ -0,0 +1 @@ +13049af3067f3dbd1abd689996c8a7cb wavethresh_2.2-8.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 22:34:33 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:34:33 -0500 Subject: rpms/R-waveslim - New directory Message-ID: <200603082234.k28MYZ3o029467@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29459/R-waveslim Log Message: Directory /cvs/extras/rpms/R-waveslim added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:34:39 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:34:39 -0500 Subject: rpms/R-waveslim/devel - New directory Message-ID: <200603082234.k28MYfPr029482@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29459/R-waveslim/devel Log Message: Directory /cvs/extras/rpms/R-waveslim/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:34:58 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:34:58 -0500 Subject: rpms/R-waveslim Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603082235.k28MZ1uC029516@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29504 Added Files: Makefile import.log Log Message: Setup of module R-waveslim --- NEW FILE Makefile --- # Top level Makefile for module R-waveslim all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 22:35:04 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:35:04 -0500 Subject: rpms/R-waveslim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603082235.k28MZ6ow029536@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29504/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module R-waveslim --- NEW 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 Mar 8 22:35:51 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:35:51 -0500 Subject: rpms/R-waveslim import.log,1.1,1.2 Message-ID: <200603082236.k28MaNA6029604@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29570 Modified Files: import.log Log Message: auto-import R-waveslim-1.5-2 on branch devel from R-waveslim-1.5-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/R-waveslim/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 22:34:58 -0000 1.1 +++ import.log 8 Mar 2006 22:35:50 -0000 1.2 @@ -0,0 +1 @@ +R-waveslim-1_5-2:HEAD:R-waveslim-1.5-2.src.rpm:1141857343 From fedora-extras-commits at redhat.com Wed Mar 8 22:35:56 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:35:56 -0500 Subject: rpms/R-waveslim/devel R-waveslim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603082236.k28MaTXm029608@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29570/devel Modified Files: .cvsignore sources Added Files: R-waveslim.spec Log Message: auto-import R-waveslim-1.5-2 on branch devel from R-waveslim-1.5-2.src.rpm --- NEW FILE R-waveslim.spec --- %define packname waveslim Summary: R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing Name: R-%{packname} Version: 1.5 Release: 2%{?dist} License: GPL Group: Applications/Engineering Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz URL: http://www.image.ucar.edu/staff/whitcher/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: R >= 1.9.0 BuildRequires: R >= 1.9.0, tetex-latex, gcc-gfortran %description Basic wavelet routines for time series (1D), image (2D) and array (3D) analysis. The code provided here is based on wavelet methodology developed in Percival and Walden (2000); Gencay, Selcuk and Whitcher (2001); the dual-tree complex wavelet transform (CWT) from Kingsbury (1999, 2001) as implemented by Selesnick; and Hilbert wavelet pairs (Selesnick 2001, 2002). All figures in chapters 4-7 of GSW (2001) are reproducible using this package and R code available at the book website(s) below. %prep %setup -q -n %{packname} %build %install %{__rm} -rf %{buildroot} cd ..; R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library %{__rm} -rf %{buildroot}%{_libdir}/R/library/R.css %check cd ..;%{_bindir}/R CMD check %{packname} %clean %{__rm} -rf %{buildroot} %post %{__cat} %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun %{__cat} %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %defattr(-, root, root, -) %{_libdir}/R/library/%{packname} %doc DESCRIPTION %changelog * Wed Mar 08 2006 Jos?? Matos 1.5-2 - Rename License to GPL only, add gfortran as BR, add DESCRIPTION to %%doc * Fri Mar 03 2006 Jos?? Matos 1.5-1 - Initial package creation Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/R-waveslim/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 22:35:04 -0000 1.1 +++ .cvsignore 8 Mar 2006 22:35:56 -0000 1.2 @@ -0,0 +1 @@ +waveslim_1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-waveslim/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 22:35:04 -0000 1.1 +++ sources 8 Mar 2006 22:35:56 -0000 1.2 @@ -0,0 +1 @@ +be50b05225e14941232a00338d61e920 waveslim_1.5.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 22:43:40 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Wed, 8 Mar 2006 17:43:40 -0500 Subject: rpms/abiword/devel abiword.spec,1.31,1.32 Message-ID: <200603082244.k28MiCa3029672@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29649 Modified Files: abiword.spec Log Message: Disable the collaboration plugin; it doesn't belong in 2.4.x, and does not work at all Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- abiword.spec 16 Feb 2006 13:19:40 -0000 1.31 +++ abiword.spec 8 Mar 2006 22:43:40 -0000 1.32 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.2 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -65,7 +65,7 @@ cd ../abiword-plugins libtoolize --copy --force ./nextgen.sh -%configure --disable-gda --disable-pdf --with-abiword=../abi +%configure --disable-abicollab --disable-gda --disable-pdf --with-abiword=../abi # Remove libtool predep_objects and postdep_objects wonkiness so that # building without -nostdlib doesn't include them twice. Because we # already link with g++, weird stuff happens if you don't let the @@ -134,6 +134,9 @@ %{_datadir}/icons/*png %changelog +* Wed Mar 08 2006 Marc Maurer - 1:2.4.2-7.fc5 +- Disable the collaboration plugin; it is not working in 2.4.x + * Thu Feb 16 2006 Marc Maurer - 1:2.4.2-6.fc5 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed Mar 8 22:58:18 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:58:18 -0500 Subject: owners owners.list,1.723,1.724 Message-ID: <200603082258.k28MwolX029923@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29906 Modified Files: owners.list Log Message: Add ftnchek Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.723 retrieving revision 1.724 diff -u -r1.723 -r1.724 --- owners.list 8 Mar 2006 21:14:22 -0000 1.723 +++ owners.list 8 Mar 2006 22:58:17 -0000 1.724 @@ -265,6 +265,7 @@ Fedora Extras|freeze|freeze/melt/fcat compression utilities|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|frotz|Interpreter for Infocom and other Z-machine games|chris at chrisgrau.com|extras-qa at fedoraproject.org| Fedora Extras|fslint|FSlint - a utility to find and clean "lint" on a filesystem|P at draigBrady.com|extras-qa at fedoraproject.org| +Fedora Extras|ftnchek|Static analyzer for Fortran 77 programs|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|fuse|File System in Userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at newmail.ru|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 8 22:59:47 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:59:47 -0500 Subject: rpms/ftnchek/devel ftnchek.spec,1.1,1.2 Message-ID: <200603082300.k28N0JPE029984@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29959 Modified Files: ftnchek.spec Log Message: Add %{?dist} tag Index: ftnchek.spec =================================================================== RCS file: /cvs/extras/rpms/ftnchek/devel/ftnchek.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ftnchek.spec 8 Mar 2006 22:20:00 -0000 1.1 +++ ftnchek.spec 8 Mar 2006 22:59:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: ftnchek Version: 3.3.1 -Release: 3 +Release: 3%{?dist} Summary: Static analyzer for Fortran 77 programs Group: Development/Tools From fedora-extras-commits at redhat.com Wed Mar 8 23:47:42 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 18:47:42 -0500 Subject: owners owners.list,1.724,1.725 Message-ID: <200603082348.k28NmUrl032056@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32027 Modified Files: owners.list Log Message: Added R-waveslim and R-wavethresh Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.724 retrieving revision 1.725 diff -u -r1.724 -r1.725 --- owners.list 8 Mar 2006 22:58:17 -0000 1.724 +++ owners.list 8 Mar 2006 23:47:42 -0000 1.725 @@ -1218,6 +1218,8 @@ 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-mysql|A Ruby interface to MySQL|oliver.andrich at gmail.com|extras-qa at fedoraproject.org| +Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org| +Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|rxvt|Rxvt (ouR XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|rxvt-unicode|A unicode version of rxvt|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|rzip|A large-file compression program|i at stingr.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 9 00:14:34 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 19:14:34 -0500 Subject: rpms/scalapack/FC-3 scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora3.patch, 1.3, 1.4 scalapack.spec, 1.10, 1.11 Message-ID: <200603090015.k290F72b001566@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1497/FC-3 Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora3.patch scalapack.spec Log Message: lam in Fedora Core moved its libs into %{_libdir}/lam, so we need to hokey pokey accordingly. scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:22:49 -0000 1.2 +++ scalapack-1.7-64bitlibs.patch 9 Mar 2006 00:14:32 -0000 1.3 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 -@@ -29,7 +29,7 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.64bit 2006-03-08 18:06:37.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:07:19.000000000 -0600 +@@ -29,13 +29,13 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,3 +9,19 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM + # + USEMPI = -DUsingMpiBlacs +-SMPLIB = -L/usr/lib -lmpi ++SMPLIB = -L/usr/lib64 -lmpi + BLACSFINIT = -lmpiblacsF77init + BLACSCINIT = -lmpiblacsCinit + BLACSLIB = -lmpiblacs +@@ -97,7 +97,7 @@ + SCALAPACKSLIB = -L$(home) -lscalapack + BLASLIB = -lblas + # +-LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib64/lam -llam -lmpi -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil + PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) + PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora3.patch: Index: scalapack-1.7-fedora3.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-fedora3.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scalapack-1.7-fedora3.patch 8 Mar 2006 16:58:02 -0000 1.3 +++ scalapack-1.7-fedora3.patch 9 Mar 2006 00:14:32 -0000 1.4 @@ -1,5 +1,5 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.fedora3 2006-03-08 10:51:28.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:55:27.000000000 -0600 +--- scalapack-1.7/SCALAPACK/SLmake.inc.fedora3 2006-03-08 18:00:22.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:04:06.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -24,7 +24,7 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = -lmpi ++SMPLIB = -L/usr/lib -lmpi +BLACSFINIT = -lmpiblacsF77init +BLACSCINIT = -lmpiblacsCinit +BLACSLIB = -lmpiblacs @@ -44,7 +44,7 @@ SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) -@@ -94,9 +94,13 @@ +@@ -94,9 +94,12 @@ # The name of the libraries to be created/linked to # SCALAPACKLIB = $(home)/libscalapack.a @@ -55,15 +55,14 @@ -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi +EXTRALIBS = -ldl -lpthread -lutil -+ +PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) +PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) +RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) ---- scalapack-1.7/SCALAPACK/Makefile.fedora3 2006-03-08 10:55:36.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:56:39.000000000 -0600 +--- scalapack-1.7/SCALAPACK/Makefile.fedora3 2006-03-08 18:04:12.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 18:04:51.000000000 -0600 @@ -49,7 +49,7 @@ all: lib #all: lib exe Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scalapack.spec 8 Mar 2006 16:58:02 -0000 1.10 +++ scalapack.spec 9 Mar 2006 00:14:32 -0000 1.11 @@ -1,14 +1,14 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html Source0: http://www.netlib.org/scalapack/scalapack.tgz -BuildRequires: lapack-devel, blas-devel, lam, blacs-devel +BuildRequires: lapack, blas, lam, blacs-devel BuildRequires: gcc-g77, glibc-devel -Requires: lapack, blas-devel, lam, blacs-devel +Requires: lapack, blas, lam, blacs-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: scalapack-1.7-fedora3.patch Patch1: scalapack-1.7-64bitlibs.patch @@ -49,9 +49,9 @@ %prep %setup -q -c -n %{name}-%{version} -#%patch0 -p1 +%patch0 -p1 %ifarch x86_64 ppc64 sparc64 ia64 -%patch1 -p1 +%patch1 -p1 -b .64bit %endif %build @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-13 +- lam moved into _libdir/lam... need to fix patches + * Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 - set -fPIC as NOOPT From fedora-extras-commits at redhat.com Thu Mar 9 00:14:51 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 19:14:51 -0500 Subject: rpms/scalapack/FC-4 scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora.patch, 1.3, 1.4 scalapack.spec, 1.12, 1.13 Message-ID: <200603090015.k290FPm0001574@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1497/FC-4 Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora.patch scalapack.spec Log Message: lam in Fedora Core moved its libs into %{_libdir}/lam, so we need to hokey pokey accordingly. scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:22:56 -0000 1.2 +++ scalapack-1.7-64bitlibs.patch 9 Mar 2006 00:14:50 -0000 1.3 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 -@@ -29,7 +29,7 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.64bit 2006-03-08 18:10:40.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:11:04.000000000 -0600 +@@ -29,13 +29,13 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,3 +9,19 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM + # + USEMPI = -DUsingMpiBlacs +-SMPLIB = -L/usr/lib/lam -lmpi ++SMPLIB = -L/usr/lib64/lam -lmpi + BLACSFINIT = -lmpiblacsF77init + BLACSCINIT = -lmpiblacsCinit + BLACSLIB = -lmpiblacs +@@ -97,7 +97,7 @@ + SCALAPACKSLIB = -L$(home) -lscalapack + BLASLIB = -lblas + # +-LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib64/lam -llam -lmpi -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil + + PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-fedora.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scalapack-1.7-fedora.patch 8 Mar 2006 16:58:08 -0000 1.3 +++ scalapack-1.7-fedora.patch 9 Mar 2006 00:14:50 -0000 1.4 @@ -1,5 +1,5 @@ --- scalapack-1.7/SCALAPACK/Makefile.fedora 2001-08-10 11:44:13.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:41:39.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 18:08:21.000000000 -0600 @@ -49,7 +49,7 @@ all: lib #all: lib exe @@ -17,7 +17,7 @@ +shared: scalapacklib + ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) --- scalapack-1.7/SCALAPACK/SLmake.inc.fedora 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:42:41.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:09:05.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -42,7 +42,7 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = -lmpi ++SMPLIB = -L/usr/lib/lam -lmpi +BLACSFINIT = -lmpiblacsF77init +BLACSCINIT = -lmpiblacsCinit +BLACSLIB = -lmpiblacs @@ -62,7 +62,7 @@ -CCFLAGS = -O4 +NOOPT = -fPIC +F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -+CCFLAGS = $(RPM_OPT_FLAGS) -fPIC ++CCFLAGS = $(RPM_OPT_FLAGS) $(NOOPT) SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) @@ -86,7 +86,7 @@ -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi +EXTRALIBS = -ldl -lpthread -lutil + +PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scalapack.spec 8 Mar 2006 16:58:08 -0000 1.12 +++ scalapack.spec 9 Mar 2006 00:14:50 -0000 1.13 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-13 +- lam moved into _libdir/lam... need to fix patches + * Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 - set -fPIC as NOOPT From fedora-extras-commits at redhat.com Thu Mar 9 00:14:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 19:14:57 -0500 Subject: rpms/scalapack/devel scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora.patch, 1.4, 1.5 scalapack.spec, 1.13, 1.14 Message-ID: <200603090015.k290FU5Z001582@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1497/devel Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora.patch scalapack.spec Log Message: lam in Fedora Core moved its libs into %{_libdir}/lam, so we need to hokey pokey accordingly. scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:23:02 -0000 1.2 +++ scalapack-1.7-64bitlibs.patch 9 Mar 2006 00:14:57 -0000 1.3 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 -@@ -29,7 +29,7 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.64bit 2006-03-08 18:10:40.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:11:04.000000000 -0600 +@@ -29,13 +29,13 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,3 +9,19 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM + # + USEMPI = -DUsingMpiBlacs +-SMPLIB = -L/usr/lib/lam -lmpi ++SMPLIB = -L/usr/lib64/lam -lmpi + BLACSFINIT = -lmpiblacsF77init + BLACSCINIT = -lmpiblacsCinit + BLACSLIB = -lmpiblacs +@@ -97,7 +97,7 @@ + SCALAPACKSLIB = -L$(home) -lscalapack + BLASLIB = -lblas + # +-LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib64/lam -llam -lmpi -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil + + PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-fedora.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scalapack-1.7-fedora.patch 8 Mar 2006 16:58:14 -0000 1.4 +++ scalapack-1.7-fedora.patch 9 Mar 2006 00:14:57 -0000 1.5 @@ -1,5 +1,5 @@ --- scalapack-1.7/SCALAPACK/Makefile.fedora 2001-08-10 11:44:13.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:41:39.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 18:08:21.000000000 -0600 @@ -49,7 +49,7 @@ all: lib #all: lib exe @@ -17,7 +17,7 @@ +shared: scalapacklib + ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) --- scalapack-1.7/SCALAPACK/SLmake.inc.fedora 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:42:41.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:09:05.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -42,7 +42,7 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = -lmpi ++SMPLIB = -L/usr/lib/lam -lmpi +BLACSFINIT = -lmpiblacsF77init +BLACSCINIT = -lmpiblacsCinit +BLACSLIB = -lmpiblacs @@ -62,7 +62,7 @@ -CCFLAGS = -O4 +NOOPT = -fPIC +F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -+CCFLAGS = $(RPM_OPT_FLAGS) -fPIC ++CCFLAGS = $(RPM_OPT_FLAGS) $(NOOPT) SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) @@ -86,7 +86,7 @@ -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi +EXTRALIBS = -ldl -lpthread -lutil + +PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- scalapack.spec 8 Mar 2006 16:58:14 -0000 1.13 +++ scalapack.spec 9 Mar 2006 00:14:57 -0000 1.14 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-13 +- lam moved into _libdir/lam... need to fix patches + * Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 - set -fPIC as NOOPT From fedora-extras-commits at redhat.com Thu Mar 9 01:57:02 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:02 -0500 Subject: rpms/kdetoys - New directory Message-ID: <200603090157.k291v4TH004006@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3998/kdetoys Log Message: Directory /cvs/extras/rpms/kdetoys added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 01:57:08 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:08 -0500 Subject: rpms/kdetoys/devel - New directory Message-ID: <200603090157.k291vAOt004021@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3998/kdetoys/devel Log Message: Directory /cvs/extras/rpms/kdetoys/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 01:57:19 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:19 -0500 Subject: rpms/kdetoys Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603090157.k291vLeF004055@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4043 Added Files: Makefile import.log Log Message: Setup of module kdetoys --- NEW FILE Makefile --- # Top level Makefile for module kdetoys all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 9 01:57:25 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:25 -0500 Subject: rpms/kdetoys/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603090157.k291vRBH004073@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4043/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kdetoys --- NEW 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 Mar 9 01:57:47 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:47 -0500 Subject: rpms/kdetoys import.log,1.1,1.2 Message-ID: <200603090158.k291wJPM004141@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4107 Modified Files: import.log Log Message: auto-import kdetoys-3.5.1-3 on branch devel from kdetoys-3.5.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kdetoys/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Mar 2006 01:57:19 -0000 1.1 +++ import.log 9 Mar 2006 01:57:47 -0000 1.2 @@ -0,0 +1 @@ +kdetoys-3_5_1-3:HEAD:kdetoys-3.5.1-3.src.rpm:1141869464 From fedora-extras-commits at redhat.com Thu Mar 9 01:57:53 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:53 -0500 Subject: rpms/kdetoys/devel kdetoys.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603090158.k291wP54004147@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4107/devel Modified Files: .cvsignore sources Added Files: kdetoys.spec Log Message: auto-import kdetoys-3.5.1-3 on branch devel from kdetoys-3.5.1-3.src.rpm --- NEW FILE kdetoys.spec --- %define is_release 1 Summary: K Desktop Environment - Toys and Amusements Name: kdetoys Group: Amusements/Graphics Epoch: 7 Version: 3.5.1 Release: 3%{?dist} License: GPL Url: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdetoys-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:%{version} BuildRequires: gettext BuildRequires: desktop-file-utils ## Recommended, not (absolutely) required -- Rex #Requires(hint): kdebase >= 6:%{version} %if "%{is_release}" != "1" BuildRequires: automake %endif %description Includes: * amor: Amusing Misuse Of Resources put's comic figures above your windows * eyesapplet: a kicker applet similar to XEyes * fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them * kaphorism: displays aphorisms * kmoon: system tray applet showing the moon phase * kodo: mouse movement meter * kscore: kicker applet with a sports ticker * kteatime: system tray applet that makes sure your tea doesn't get too strong * ktux: Tux-in-a-Spaceship screen saver * kweather: kicker applet that will display the current weather outside * kworldwatch: application and kicker applet showing daylight area on the world globe NOTE: kicker applets and screen savers require kdebase to be installed, and user to be logged-in to KDE. %prep %if "%{?is_release}" != "0" %setup -q -n %{name}-%{version}%{?beta} %else %setup -q -n %{name} %endif %if "%{is_release}" != "1" make -f admin/Makefile.common cvs %endif %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --includedir=%{_includedir}/kde \ --disable-rpath \ --disable-gcc-hidden-visibility \ --enable-new-ldflags \ --disable-debug --disable-warnings \ --disable-dependancy-tracking --enable-final \ %{?debug: --enable-debug --enable-warnings --disable-final } make %{?_smp_mflags} %install rm -rf "$RPM_BUILD_ROOT" make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ --dir=$RPM_BUILD_ROOT%{_datadir}/applnk/System/ScreenSavers \ --delete-original \ --vendor="kde" \ --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/applnk/System/ScreenSavers/*.desktop desktop-file-install \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \ --vendor="" \ --add-category="X-Fedora" \ --add-category="Application" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop # replace absolute symlink with relative ln -nfs tips-en $RPM_BUILD_ROOT%{_datadir}/apps/amor/tips ## File lists # locale's %find_lang %{name} || touch %{name}.lang # 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 ] && ln -nsf ../common $i/common done popd fi done fi ## Unpackaged files # 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 #rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la %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 ||: %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/* %{_libdir}/libkdeinit_*.* %{_libdir}/kde3/* %{_datadir}/applications/kde/*.desktop %{_datadir}/applnk/System/ScreenSavers/*.desktop %{_datadir}/apps/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/service*/*.desktop %clean rm -rf $RPM_BUILD_ROOT %changelog * Mon Mar 06 2006 Rex Dieter 7:3.3.5-3 - %%doc AUTHORS COPYING README - BR: gettext - drop %%{?debug_package} reference - desktop-file-install --vendor="kde"/--add-category="Application", where needed - comment inclusion of .la files * Wed Feb 22 2006 Rex Dieter 7:3.5.1-2 - update %%description - %%post/%%postun: drop ldconfig, update-destkop-database - desktop-file-install --add-category="X-Fedora" * Sat Jan 21 2006 Rex Dieter 7:3.5.1-1 - kde-3.5.1 * Tue Dec 08 2005 Rex Dieter 7:3.5.0-1.2 - --enable-new-ldflags - --disable-gcc-hidden-visibility * Sat Mar 19 2005 Than Ngo 7:3.4.0-1 - 3.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2006 01:57:25 -0000 1.1 +++ .cvsignore 9 Mar 2006 01:57:53 -0000 1.2 @@ -0,0 +1 @@ +kdetoys-3.5.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdetoys/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2006 01:57:25 -0000 1.1 +++ sources 9 Mar 2006 01:57:53 -0000 1.2 @@ -0,0 +1 @@ +d98d4f30a8aa6d43b0af06421d4d6586 kdetoys-3.5.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 9 02:00:49 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 21:00:49 -0500 Subject: owners owners.list,1.725,1.726 Message-ID: <200603090201.k2921M7k006052@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4194 Modified Files: owners.list Log Message: kdetoys import Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.725 retrieving revision 1.726 diff -u -r1.725 -r1.726 --- owners.list 8 Mar 2006 23:47:42 -0000 1.725 +++ owners.list 9 Mar 2006 02:00:49 -0000 1.726 @@ -488,6 +488,7 @@ Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|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|kdesvn|A subversion client for KDE|orion at cora.nwra.com|extras-qa at fedoraproject.org| +Fedora Extras|kdetoys|K Desktop Environment - Toys and Amusements|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|keychain|Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 9 02:24:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 21:24:24 -0500 Subject: rpms/maxima/devel maxima.spec,1.17,1.18 Message-ID: <200603090224.k292Outk006191@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6174 Modified Files: maxima.spec Log Message: * Wed Mar 08 2006 Rex Dieter 5.9.2-11 - fc5: enable runtime-gcl - runtime-sbcl: Requires: sbcl = %{sbcl_version_used_to_build} Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- maxima.spec 27 Feb 2006 14:58:50 -0000 1.17 +++ maxima.spec 9 Mar 2006 02:24:24 -0000 1.18 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -21,10 +21,8 @@ %define _enable_clisp --enable-clisp # cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796 #define _enable_cmucl --enable-cmucl -%if "%{?fedora}" != "5" -# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026 +# gcl *was* not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026 %define _enable_gcl --enable-gcl -%endif %define _enable_sbcl --enable-sbcl %endif @@ -142,8 +140,13 @@ Summary: Maxima compiled with SBCL Group: Applications/Engineering BuildRequires: sbcl -#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)} -Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} +# maxima requires the *same* version it was built against +# this hack should work, even in mock (-: -- Rex +%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) +%if "%{?sbcl_ver}" >= "0.9" +%define sbcl_ver2 = %{sbcl_ver} +%endif +Requires: sbcl %{?sbcl_ver2} Requires: %{name} = %{version} Obsoletes: maxima-exec-sbcl < %{version}-%{release} Provides: %{name}-runtime = %{version} @@ -351,6 +354,10 @@ %changelog +* Wed Mar 08 2006 Rex Dieter 5.9.2-11 +- fc5: enable runtime-gcl +- runtime-sbcl: Requires: sbcl = %%{sbcl_version_used_to_build} + * Mon Feb 27 2006 Rex Dieter 5.9.2-10 - respin for sbcl-0.9.10 From fedora-extras-commits at redhat.com Thu Mar 9 09:48:49 2006 From: fedora-extras-commits at redhat.com (Alexander Larsson (alexl)) Date: Thu, 9 Mar 2006 04:48:49 -0500 Subject: rpms/sabayon/devel sabayon.spec,1.20,1.21 Message-ID: <200603090949.k299nLUk021177@cvs-int.fedora.redhat.com> Author: alexl Update of /cvs/extras/rpms/sabayon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21160 Modified Files: sabayon.spec Log Message: * Thu Mar 9 2006 Alexander Larsson - 2.12.3-3 - Add xorg-x11-xinit build-req so configure picks the right Xsession script Index: sabayon.spec =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sabayon.spec 7 Mar 2006 08:54:43 -0000 1.20 +++ sabayon.spec 9 Mar 2006 09:48:48 -0000 1.21 @@ -14,7 +14,7 @@ Name: sabayon Version: 2.12.3 -Release: 2 +Release: 3 Summary: Tool to maintain user profiles in a GNOME desktop Group: Applications/System @@ -42,6 +42,9 @@ BuildRequires: desktop-file-utils BuildRequires: usermode BuildRequires: xorg-x11-server-Xnest +# Needed to pick up the right Xsession file +BuildRequires: xorg-x11-xinit + Requires(post): shadow-utils Requires(preun): shadow-utils @@ -187,6 +190,10 @@ %{python_sitelib}/%{name}/lockdown %changelog +* Thu Mar 9 2006 Alexander Larsson - 2.12.3-3 +- Add xorg-x11-xinit build-req so configure picks the + right Xsession script + * Tue Mar 7 2006 Alexander Larsson - 2.12.3-2 - Add libXt-devel buildreq From fedora-extras-commits at redhat.com Thu Mar 9 10:33:04 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 9 Mar 2006 05:33:04 -0500 Subject: rpms/z88dk import.log,1.2,1.3 Message-ID: <200603091033.k29AXbCG023244@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/z88dk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23212 Modified Files: import.log Log Message: auto-import z88dk-1.6-8 on branch devel from z88dk-1.6-8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/z88dk/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 13 Jan 2006 00:19:16 -0000 1.2 +++ import.log 9 Mar 2006 10:33:04 -0000 1.3 @@ -1 +1,2 @@ z88dk-1_6-7:HEAD:z88dk-1.6-7.src.rpm:1137111538 +z88dk-1_6-8:HEAD:z88dk-1.6-8.src.rpm:1141900370 From fedora-extras-commits at redhat.com Thu Mar 9 10:33:10 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 9 Mar 2006 05:33:10 -0500 Subject: rpms/z88dk/devel z88dk.spec,1.1,1.2 Message-ID: <200603091033.k29AXgZu023247@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/z88dk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23212/devel Modified Files: z88dk.spec Log Message: auto-import z88dk-1.6-8 on branch devel from z88dk-1.6-8.src.rpm Index: z88dk.spec =================================================================== RCS file: /cvs/extras/rpms/z88dk/devel/z88dk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- z88dk.spec 13 Jan 2006 00:19:34 -0000 1.1 +++ z88dk.spec 9 Mar 2006 10:33:10 -0000 1.2 @@ -1,13 +1,14 @@ Summary: A Z80 cross compiler Name: z88dk Version: 1.6 -Release: 7%{?dist} +Release: 8%{?dist} License: Artistic Group: Development/Tools Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz Patch: z88make.patch URL: http://z88dk.sourceforge.net/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: x86_64 ia64 %description z88dk is a Z80 cross compiler capable of generating binary files for a variety @@ -34,7 +35,6 @@ export PATH=%{_builddir}/z88dk/bin:$PATH export CC=gcc export CFLAGS="%{optflags}" -ExcludeArch=x86_64 # Note: do not use %{?_smp_mflags} with make because the Makefiles don't support parallel builds %{__make} clean %{__make} -e @@ -71,6 +71,9 @@ %{_mandir}/man3z/ %changelog +* Thu Mar 9 2006 Paul F. Johnson - 1.6-8 +- Added ExcludeArch for ia64 + * Mon Oct 17 2005 Paul F. Johnson - 1.6-7 - Add ExcludeArch for x86_64 machines From fedora-extras-commits at redhat.com Thu Mar 9 10:57:43 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 9 Mar 2006 05:57:43 -0500 Subject: fedora-security/audit fc4,1.169,1.170 fc5,1.76,1.77 Message-ID: <200603091057.k29AvhX6023577@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23555 Modified Files: fc4 fc5 Log Message: Latest updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- fc4 8 Mar 2006 15:24:33 -0000 1.169 +++ fc4 9 Mar 2006 10:57:35 -0000 1.170 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060306 -Up to date FC4 as of 20060306 +Up to date CVE as of CVE email 20060308 +Up to date FC4 as of 20060308 ** are items that need attention +CVE-2006-1079 ignore (httpd) not a vulnerability +CVE-2006-1078 ignore (httpd) not a vulnerability CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe @@ -10,6 +12,7 @@ CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) +CVE-2006-0746 VULNERABLE (kpdf) bz#184308 CVE-2006-0741 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 version (postgresql, 8.1 only) @@ -128,6 +131,7 @@ CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006] CVE-2005-3632 version (netpbm) CVE-2005-3631 version (udev) +CVE-2005-3629 ** initscripts CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169] CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3628 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- fc5 8 Mar 2006 15:24:33 -0000 1.76 +++ fc5 9 Mar 2006 10:57:36 -0000 1.77 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060306 +Up to date CVE as of CVE email 20060308 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -17,6 +17,8 @@ ** are items that need attention +CVE-2006-1079 ignore (httpd) not a vulnerability +CVE-2006-1078 ignore (httpd) not a vulnerability CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe @@ -24,6 +26,7 @@ CVE-2006-0903 VULNERABLE (mysql) CVE-2006-0884 ** thunderbird CVE-2006-0836 VULNERABLE (thunderbird) +CVE-2006-0746 VULNERABLE (kpdf) CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 ignore (postgresql) we don't build --enable-cassert CVE-2006-0645 version (gnutls, fixed 1.2.10) @@ -138,6 +141,7 @@ CVE-2005-3651 version (ethereal, fixed 0.10.14) CVE-2005-3632 version (netpbm) CVE-2005-3631 version (udev) +CVE-2005-3629 ** initscripts CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3628 version (poppler, fixed 0.4.4) From fedora-extras-commits at redhat.com Thu Mar 9 12:04:50 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 9 Mar 2006 07:04:50 -0500 Subject: fedora-security/audit fc4,1.170,1.171 fc5,1.77,1.78 Message-ID: <200603091204.k29C4o3P027519@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27499 Modified Files: fc4 fc5 Log Message: Note a new mod_python cve id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- fc4 9 Mar 2006 10:57:35 -0000 1.170 +++ fc4 9 Mar 2006 12:04:35 -0000 1.171 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability CVE-2006-1045 VULNERABLE (thunderbird) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- fc5 9 Mar 2006 10:57:36 -0000 1.77 +++ fc5 9 Mar 2006 12:04:35 -0000 1.78 @@ -17,6 +17,7 @@ ** are items that need attention +CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability CVE-2006-1045 VULNERABLE (thunderbird) From fedora-extras-commits at redhat.com Thu Mar 9 13:33:14 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Thu, 9 Mar 2006 08:33:14 -0500 Subject: rpms/SIBsim4/devel .cvsignore, 1.3, 1.4 SIBsim4.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603091333.k29DXkEe029844@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/SIBsim4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29823 Modified Files: .cvsignore SIBsim4.spec sources Log Message: New upstream release 0.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Feb 2006 14:22:50 -0000 1.3 +++ .cvsignore 9 Mar 2006 13:33:13 -0000 1.4 @@ -1 +1 @@ -SIBsim4-0.10.tar.bz2 +SIBsim4-0.11.tar.bz2 Index: SIBsim4.spec =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/devel/SIBsim4.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SIBsim4.spec 21 Feb 2006 14:22:50 -0000 1.3 +++ SIBsim4.spec 9 Mar 2006 13:33:13 -0000 1.4 @@ -1,5 +1,5 @@ Name: SIBsim4 -Version: 0.10 +Version: 0.11 Release: 1%{?dist} Summary: Align expressed RNA sequences on a DNA template Group: Applications/Engineering @@ -43,6 +43,9 @@ %changelog +* Thu Mar 9 2006 Christian Iseli 0.11-1 +- Version 0.11. + * Tue Feb 21 2006 Christian Iseli 0.10-1 - Version 0.10. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Feb 2006 14:22:50 -0000 1.3 +++ sources 9 Mar 2006 13:33:13 -0000 1.4 @@ -1 +1 @@ -bcbd35af80c261d2bff584d7c536e909 SIBsim4-0.10.tar.bz2 +01461e9f397feabb030d4c326d7103ac SIBsim4-0.11.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 9 13:36:13 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Thu, 9 Mar 2006 08:36:13 -0500 Subject: rpms/SIBsim4/FC-4 .cvsignore, 1.3, 1.4 SIBsim4.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603091336.k29DajLT029940@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/SIBsim4/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29915 Modified Files: .cvsignore SIBsim4.spec sources Log Message: New upstream release 0.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Feb 2006 15:02:10 -0000 1.3 +++ .cvsignore 9 Mar 2006 13:36:13 -0000 1.4 @@ -1 +1 @@ -SIBsim4-0.10.tar.bz2 +SIBsim4-0.11.tar.bz2 Index: SIBsim4.spec =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-4/SIBsim4.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SIBsim4.spec 21 Feb 2006 15:02:10 -0000 1.2 +++ SIBsim4.spec 9 Mar 2006 13:36:13 -0000 1.3 @@ -1,5 +1,5 @@ Name: SIBsim4 -Version: 0.10 +Version: 0.11 Release: 1%{?dist} Summary: Align expressed RNA sequences on a DNA template Group: Applications/Engineering @@ -43,6 +43,9 @@ %changelog +* Thu Mar 9 2006 Christian Iseli 0.11-1 +- Version 0.11. + * Tue Feb 21 2006 Christian Iseli 0.10-1 - Version 0.10. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Feb 2006 15:02:10 -0000 1.3 +++ sources 9 Mar 2006 13:36:13 -0000 1.4 @@ -1 +1 @@ -bcbd35af80c261d2bff584d7c536e909 SIBsim4-0.10.tar.bz2 +01461e9f397feabb030d4c326d7103ac SIBsim4-0.11.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 9 14:51:44 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 09:51:44 -0500 Subject: rpms/R-RScaLAPACK/FC-3 R-RScaLAPACK-0.5.1-blacsfix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-configurefix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-gcc4.patch, NONE, 1.1 R-RScaLAPACK.spec, 1.11, 1.12 Message-ID: <200603091452.k29EqGja032347@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32271/FC-3 Modified Files: R-RScaLAPACK.spec Added Files: R-RScaLAPACK-0.5.1-blacsfix.patch R-RScaLAPACK-0.5.1-configurefix.patch R-RScaLAPACK-0.5.1-gcc4.patch Log Message: With scalapack finally working, we can get this thing going as well. R-RScaLAPACK-0.5.1-blacsfix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-blacsfix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c.BAD 2006-02-26 11:14:18.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c 2006-02-26 11:14:42.000000000 -0600 @@ -113,7 +113,7 @@ * the function is sla.gridExit, so exit. */ if (ipGridAndDims[8] == 0 && rel_flag == 1){ - F77_CALL(blacs_exit_)(&exitTemp); + F77_CALL(blacs_exit)(&exitTemp); printf ("Exiting BLACS ... rank = %d\n",iMyRank); return AsInt(1); } @@ -127,7 +127,7 @@ /* Uses BLACS call to perform MPI_Init */ int CR_InitializeEnv(int *ipMyRank, int *ipNumProcs) { - F77_CALL(blacs_pinfo_)(ipMyRank, ipNumProcs); + F77_CALL(blacs_pinfo)(ipMyRank, ipNumProcs); return 0; } @@ -534,7 +534,7 @@ D_Rprintf ((" Process 0 ... in cntrl statement ..after init \n")); - F77_CALL(blacs_get_)(&temp1, &temp2, &ictxt); + F77_CALL(blacs_get)(&temp1, &temp2, &ictxt); /* Calculate the value for WATOBD */ D_Rprintf ((" Process 0 ... in cntrl statement ..1 \n")); R-RScaLAPACK-0.5.1-configurefix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-configurefix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in.BAD 2006-02-26 10:06:00.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in 2006-02-26 10:16:03.000000000 -0600 @@ -135,7 +135,7 @@ AC_MSG_NOTICE(LAM-libmpi.a not found) MPI_LAM=no ]) - AC_CHECK_LIB(lamf77mpi, mpi_comm_create__,[ + AC_CHECK_LIB(lamf77mpi, mpi_comm_create_,[ LIBS="-llamf77mpi ${LIBS}" MPI_LAM=yes ],[ @@ -258,8 +258,8 @@ else AC_LANG_PUSH(Fortran 77) AC_CHECK_LIB(blas, ztrsm,[ - LIBS="-lf77blas ${LIBS}"], [ - AC_MSG_ERROR(libf77blas.a not found,-1) + LIBS="-lblas ${LIBS}"], [ + AC_MSG_ERROR(libblas.a not found,-1) ]) AC_LANG_POP(Fortran 77) fi @@ -297,16 +297,16 @@ AC_MSG_ERROR(libcblacsF77init.a not found,-1) fi else - AC_CHECK_LIB(blacs, Cblacs_gridexit,[], [ - AC_MSG_ERROR(libblacs.a not found,-1) + AC_CHECK_LIB(mpiblacs, Cblacs_gridexit,[], [ + AC_MSG_ERROR(libmpiblacs.a not found,-1) ]) - AC_CHECK_LIB(blacsCinit, Cblacs_pinfo,[],[ - AC_MSG_ERROR(libblacsCinit.a not found,-1) + AC_CHECK_LIB(mpiblacsCinit, Cblacs_pinfo,[],[ + AC_MSG_ERROR(libmpiblacsCinit.a not found,-1) ]) - AC_CHECK_LIB(blacsF77init, blacs_pinfo__,[],[ - AC_MSG_ERROR(libblacsF77init.a not found,-1) + AC_CHECK_LIB(mpiblacsF77init, blacs_pinfo_,[],[ + AC_MSG_ERROR(libmpiblacsF77init.a not found,-1) ]) fi R-RScaLAPACK-0.5.1-gcc4.patch: --- NEW FILE R-RScaLAPACK-0.5.1-gcc4.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.BAD 2006-02-25 10:23:29.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile 2006-02-25 10:23:41.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in.BAD 2006-02-26 11:12:04.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in 2006-02-26 11:12:13.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-3/R-RScaLAPACK.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- R-RScaLAPACK.spec 13 Jun 2005 04:17:33 -0000 1.11 +++ R-RScaLAPACK.spec 9 Mar 2006 14:51:43 -0000 1.12 @@ -1,24 +1,23 @@ %define packname RScaLAPACK +%define lamdir %{_libdir}/lam Name: R-%{packname} -Version: 0.4.0 -Release: 12%{?dist} +Version: 0.5.1 +Release: 2%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib Group: Applications/Engineering Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK -BuildRequires: R-devel, tetex-latex -BuildRequires: gcc-g77, lam, blacs, scalapack +BuildRequires: R-devel, tetex-latex, lapack +BuildRequires: gcc-gfortran, lam, blacs-devel, scalapack-devel, autoconf Requires: R, scalapack BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch +Patch1: R-RScaLAPACK-0.5.1-gcc4.patch Patch2: R-RScaLAPACK-0.4.0-lam-mpi-blacs64.patch -# -# Normally, this is bad form, but we need to do this. -# lam needs to be built with -fPIC for x86_64 to work. -# -ExcludeArch: x86_64 +Patch3: R-RScaLAPACK-0.5.1-configurefix.patch +Patch4: R-RScaLAPACK-0.5.1-blacsfix.patch %description R package: @@ -28,19 +27,25 @@ %prep %setup -T -c -a 0 -%ifarch x86_64 ppc64 sparc64 alpha ia64 +%ifarch x86_64 ppc64 sparc64 ia64 alpha %patch2 -p1 %else %patch0 -p1 %endif +%patch1 -p1 +%patch3 -p1 +%patch4 -p1 %build +cd RScaLAPACK +autoconf +cd .. cp %{packname}/DESCRIPTION . %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library -%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} +%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} # %{_bindir}/R CMD check %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css @@ -49,21 +54,25 @@ rm -rf $RPM_BUILD_ROOT %post -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %defattr(-,root,root,-) %doc DESCRIPTION -%{_libdir}/R/library/%{packname} +%{_libdir}/R/library/%{packname}/ %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 +- get this thing working again + +* Mon Jan 9 2006 Tom "spot" Callaway 0.5.1-1 +- bump to 0.5.1 + * Mon May 16 2005 Tom "spot" Callaway 0.4.0-9 -- test fails unless you are running it on a lam cluster, +- test fails unless you are running it on a lam cluster, so don't run it here * Sun May 15 2005 Tom "spot" Callaway 0.4.0-8 From fedora-extras-commits at redhat.com Thu Mar 9 14:51:50 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 09:51:50 -0500 Subject: rpms/R-RScaLAPACK/FC-4 R-RScaLAPACK-0.5.1-blacsfix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-configurefix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-gcc4.patch, NONE, 1.1 R-RScaLAPACK.spec, 1.11, 1.12 Message-ID: <200603091452.k29EqMVZ032350@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32271/FC-4 Modified Files: R-RScaLAPACK.spec Added Files: R-RScaLAPACK-0.5.1-blacsfix.patch R-RScaLAPACK-0.5.1-configurefix.patch R-RScaLAPACK-0.5.1-gcc4.patch Log Message: With scalapack finally working, we can get this thing going as well. R-RScaLAPACK-0.5.1-blacsfix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-blacsfix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c.BAD 2006-02-26 11:14:18.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c 2006-02-26 11:14:42.000000000 -0600 @@ -113,7 +113,7 @@ * the function is sla.gridExit, so exit. */ if (ipGridAndDims[8] == 0 && rel_flag == 1){ - F77_CALL(blacs_exit_)(&exitTemp); + F77_CALL(blacs_exit)(&exitTemp); printf ("Exiting BLACS ... rank = %d\n",iMyRank); return AsInt(1); } @@ -127,7 +127,7 @@ /* Uses BLACS call to perform MPI_Init */ int CR_InitializeEnv(int *ipMyRank, int *ipNumProcs) { - F77_CALL(blacs_pinfo_)(ipMyRank, ipNumProcs); + F77_CALL(blacs_pinfo)(ipMyRank, ipNumProcs); return 0; } @@ -534,7 +534,7 @@ D_Rprintf ((" Process 0 ... in cntrl statement ..after init \n")); - F77_CALL(blacs_get_)(&temp1, &temp2, &ictxt); + F77_CALL(blacs_get)(&temp1, &temp2, &ictxt); /* Calculate the value for WATOBD */ D_Rprintf ((" Process 0 ... in cntrl statement ..1 \n")); R-RScaLAPACK-0.5.1-configurefix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-configurefix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in.BAD 2006-02-26 10:06:00.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in 2006-02-26 10:16:03.000000000 -0600 @@ -135,7 +135,7 @@ AC_MSG_NOTICE(LAM-libmpi.a not found) MPI_LAM=no ]) - AC_CHECK_LIB(lamf77mpi, mpi_comm_create__,[ + AC_CHECK_LIB(lamf77mpi, mpi_comm_create_,[ LIBS="-llamf77mpi ${LIBS}" MPI_LAM=yes ],[ @@ -258,8 +258,8 @@ else AC_LANG_PUSH(Fortran 77) AC_CHECK_LIB(blas, ztrsm,[ - LIBS="-lf77blas ${LIBS}"], [ - AC_MSG_ERROR(libf77blas.a not found,-1) + LIBS="-lblas ${LIBS}"], [ + AC_MSG_ERROR(libblas.a not found,-1) ]) AC_LANG_POP(Fortran 77) fi @@ -297,16 +297,16 @@ AC_MSG_ERROR(libcblacsF77init.a not found,-1) fi else - AC_CHECK_LIB(blacs, Cblacs_gridexit,[], [ - AC_MSG_ERROR(libblacs.a not found,-1) + AC_CHECK_LIB(mpiblacs, Cblacs_gridexit,[], [ + AC_MSG_ERROR(libmpiblacs.a not found,-1) ]) - AC_CHECK_LIB(blacsCinit, Cblacs_pinfo,[],[ - AC_MSG_ERROR(libblacsCinit.a not found,-1) + AC_CHECK_LIB(mpiblacsCinit, Cblacs_pinfo,[],[ + AC_MSG_ERROR(libmpiblacsCinit.a not found,-1) ]) - AC_CHECK_LIB(blacsF77init, blacs_pinfo__,[],[ - AC_MSG_ERROR(libblacsF77init.a not found,-1) + AC_CHECK_LIB(mpiblacsF77init, blacs_pinfo_,[],[ + AC_MSG_ERROR(libmpiblacsF77init.a not found,-1) ]) fi R-RScaLAPACK-0.5.1-gcc4.patch: --- NEW FILE R-RScaLAPACK-0.5.1-gcc4.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.BAD 2006-02-25 10:23:29.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile 2006-02-25 10:23:41.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in.BAD 2006-02-26 11:12:04.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in 2006-02-26 11:12:13.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-4/R-RScaLAPACK.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- R-RScaLAPACK.spec 13 Jun 2005 04:17:34 -0000 1.11 +++ R-RScaLAPACK.spec 9 Mar 2006 14:51:50 -0000 1.12 @@ -1,25 +1,23 @@ %define packname RScaLAPACK +%define lamdir %{_libdir}/lam Name: R-%{packname} -Version: 0.4.0 -Release: 12%{?dist} +Version: 0.5.1 +Release: 2%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib Group: Applications/Engineering Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK -BuildRequires: R-devel, tetex-latex -BuildRequires: gcc-gfortran, lam, blacs, scalapack +BuildRequires: R-devel, tetex-latex, lapack-devel +BuildRequires: gcc-gfortran, lam, blacs-devel, scalapack-devel, autoconf Requires: R, scalapack BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch -Patch1: R-RScaLAPACK-0.4.0-gcc4.patch +Patch1: R-RScaLAPACK-0.5.1-gcc4.patch Patch2: R-RScaLAPACK-0.4.0-lam-mpi-blacs64.patch -# -# Normally, this is bad form, but we need to do this. -# lam needs to be built with -fPIC for x86_64 to work. -# -ExcludeArch: x86_64 +Patch3: R-RScaLAPACK-0.5.1-configurefix.patch +Patch4: R-RScaLAPACK-0.5.1-blacsfix.patch %description R package: @@ -35,14 +33,19 @@ %patch0 -p1 %endif %patch1 -p1 +%patch3 -p1 +%patch4 -p1 %build +cd RScaLAPACK +autoconf +cd .. cp %{packname}/DESCRIPTION . %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library -%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} +%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} # %{_bindir}/R CMD check %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css @@ -51,19 +54,23 @@ rm -rf $RPM_BUILD_ROOT %post -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %defattr(-,root,root,-) %doc DESCRIPTION -%{_libdir}/R/library/%{packname} +%{_libdir}/R/library/%{packname}/ %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 +- get this thing working again + +* Mon Jan 9 2006 Tom "spot" Callaway 0.5.1-1 +- bump to 0.5.1 + * Mon May 16 2005 Tom "spot" Callaway 0.4.0-9 - test fails unless you are running it on a lam cluster, so don't run it here From fedora-extras-commits at redhat.com Thu Mar 9 14:51:56 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 09:51:56 -0500 Subject: rpms/R-RScaLAPACK/devel R-RScaLAPACK-0.5.1-blacsfix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-configurefix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-gcc4.patch, NONE, 1.1 R-RScaLAPACK.spec, 1.11, 1.12 Message-ID: <200603091452.k29EqS6f032355@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32271/devel Modified Files: R-RScaLAPACK.spec Added Files: R-RScaLAPACK-0.5.1-blacsfix.patch R-RScaLAPACK-0.5.1-configurefix.patch R-RScaLAPACK-0.5.1-gcc4.patch Log Message: With scalapack finally working, we can get this thing going as well. R-RScaLAPACK-0.5.1-blacsfix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-blacsfix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c.BAD 2006-02-26 11:14:18.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c 2006-02-26 11:14:42.000000000 -0600 @@ -113,7 +113,7 @@ * the function is sla.gridExit, so exit. */ if (ipGridAndDims[8] == 0 && rel_flag == 1){ - F77_CALL(blacs_exit_)(&exitTemp); + F77_CALL(blacs_exit)(&exitTemp); printf ("Exiting BLACS ... rank = %d\n",iMyRank); return AsInt(1); } @@ -127,7 +127,7 @@ /* Uses BLACS call to perform MPI_Init */ int CR_InitializeEnv(int *ipMyRank, int *ipNumProcs) { - F77_CALL(blacs_pinfo_)(ipMyRank, ipNumProcs); + F77_CALL(blacs_pinfo)(ipMyRank, ipNumProcs); return 0; } @@ -534,7 +534,7 @@ D_Rprintf ((" Process 0 ... in cntrl statement ..after init \n")); - F77_CALL(blacs_get_)(&temp1, &temp2, &ictxt); + F77_CALL(blacs_get)(&temp1, &temp2, &ictxt); /* Calculate the value for WATOBD */ D_Rprintf ((" Process 0 ... in cntrl statement ..1 \n")); R-RScaLAPACK-0.5.1-configurefix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-configurefix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in.BAD 2006-02-26 10:06:00.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in 2006-02-26 10:16:03.000000000 -0600 @@ -135,7 +135,7 @@ AC_MSG_NOTICE(LAM-libmpi.a not found) MPI_LAM=no ]) - AC_CHECK_LIB(lamf77mpi, mpi_comm_create__,[ + AC_CHECK_LIB(lamf77mpi, mpi_comm_create_,[ LIBS="-llamf77mpi ${LIBS}" MPI_LAM=yes ],[ @@ -258,8 +258,8 @@ else AC_LANG_PUSH(Fortran 77) AC_CHECK_LIB(blas, ztrsm,[ - LIBS="-lf77blas ${LIBS}"], [ - AC_MSG_ERROR(libf77blas.a not found,-1) + LIBS="-lblas ${LIBS}"], [ + AC_MSG_ERROR(libblas.a not found,-1) ]) AC_LANG_POP(Fortran 77) fi @@ -297,16 +297,16 @@ AC_MSG_ERROR(libcblacsF77init.a not found,-1) fi else - AC_CHECK_LIB(blacs, Cblacs_gridexit,[], [ - AC_MSG_ERROR(libblacs.a not found,-1) + AC_CHECK_LIB(mpiblacs, Cblacs_gridexit,[], [ + AC_MSG_ERROR(libmpiblacs.a not found,-1) ]) - AC_CHECK_LIB(blacsCinit, Cblacs_pinfo,[],[ - AC_MSG_ERROR(libblacsCinit.a not found,-1) + AC_CHECK_LIB(mpiblacsCinit, Cblacs_pinfo,[],[ + AC_MSG_ERROR(libmpiblacsCinit.a not found,-1) ]) - AC_CHECK_LIB(blacsF77init, blacs_pinfo__,[],[ - AC_MSG_ERROR(libblacsF77init.a not found,-1) + AC_CHECK_LIB(mpiblacsF77init, blacs_pinfo_,[],[ + AC_MSG_ERROR(libmpiblacsF77init.a not found,-1) ]) fi R-RScaLAPACK-0.5.1-gcc4.patch: --- NEW FILE R-RScaLAPACK-0.5.1-gcc4.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.BAD 2006-02-25 10:23:29.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile 2006-02-25 10:23:41.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in.BAD 2006-02-26 11:12:04.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in 2006-02-26 11:12:13.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- R-RScaLAPACK.spec 13 Jun 2005 04:17:39 -0000 1.11 +++ R-RScaLAPACK.spec 9 Mar 2006 14:51:55 -0000 1.12 @@ -1,25 +1,23 @@ %define packname RScaLAPACK +%define lamdir %{_libdir}/lam Name: R-%{packname} -Version: 0.4.0 -Release: 12%{?dist} +Version: 0.5.1 +Release: 2%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib Group: Applications/Engineering Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK -BuildRequires: R-devel, tetex-latex -BuildRequires: gcc-gfortran, lam, blacs, scalapack +BuildRequires: R-devel, tetex-latex, lapack-devel +BuildRequires: gcc-gfortran, lam, blacs-devel, scalapack-devel, autoconf Requires: R, scalapack BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch -Patch1: R-RScaLAPACK-0.4.0-gcc4.patch +Patch1: R-RScaLAPACK-0.5.1-gcc4.patch Patch2: R-RScaLAPACK-0.4.0-lam-mpi-blacs64.patch -# -# Normally, this is bad form, but we need to do this. -# lam needs to be built with -fPIC for x86_64 to work. -# -ExcludeArch: x86_64 +Patch3: R-RScaLAPACK-0.5.1-configurefix.patch +Patch4: R-RScaLAPACK-0.5.1-blacsfix.patch %description R package: @@ -35,14 +33,19 @@ %patch0 -p1 %endif %patch1 -p1 +%patch3 -p1 +%patch4 -p1 %build +cd RScaLAPACK +autoconf +cd .. cp %{packname}/DESCRIPTION . %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library -%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} +%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} # %{_bindir}/R CMD check %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css @@ -51,19 +54,23 @@ rm -rf $RPM_BUILD_ROOT %post -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %defattr(-,root,root,-) %doc DESCRIPTION -%{_libdir}/R/library/%{packname} +%{_libdir}/R/library/%{packname}/ %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 +- get this thing working again + +* Mon Jan 9 2006 Tom "spot" Callaway 0.5.1-1 +- bump to 0.5.1 + * Mon May 16 2005 Tom "spot" Callaway 0.4.0-9 - test fails unless you are running it on a lam cluster, so don't run it here From fedora-extras-commits at redhat.com Thu Mar 9 15:06:32 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:06:32 -0500 Subject: rpms/perl-YAML-Parser-Syck - New directory Message-ID: <200603091506.k29F6YCA001870@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1862/perl-YAML-Parser-Syck Log Message: Directory /cvs/extras/rpms/perl-YAML-Parser-Syck added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 15:06:38 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:06:38 -0500 Subject: rpms/perl-YAML-Parser-Syck/devel - New directory Message-ID: <200603091506.k29F6el8001885@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1862/perl-YAML-Parser-Syck/devel Log Message: Directory /cvs/extras/rpms/perl-YAML-Parser-Syck/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 15:07:09 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:07:09 -0500 Subject: rpms/perl-YAML-Parser-Syck Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603091507.k29F7Bjd001924@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1911 Added Files: Makefile import.log Log Message: Setup of module perl-YAML-Parser-Syck --- NEW FILE Makefile --- # Top level Makefile for module perl-YAML-Parser-Syck all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 9 15:07:15 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:07:15 -0500 Subject: rpms/perl-YAML-Parser-Syck/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603091507.k29F7UZQ001954@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1911/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-YAML-Parser-Syck --- NEW 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 Mar 9 15:08:20 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:08:20 -0500 Subject: rpms/perl-YAML-Parser-Syck import.log,1.1,1.2 Message-ID: <200603091508.k29F8qsf002034@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000 Modified Files: import.log Log Message: auto-import perl-YAML-Parser-Syck-0.01-4 on branch devel from perl-YAML-Parser-Syck-0.01-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Mar 2006 15:07:09 -0000 1.1 +++ import.log 9 Mar 2006 15:08:20 -0000 1.2 @@ -0,0 +1 @@ +perl-YAML-Parser-Syck-0_01-4:HEAD:perl-YAML-Parser-Syck-0.01-4.src.rpm:1141916892 From fedora-extras-commits at redhat.com Thu Mar 9 15:08:43 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:08:43 -0500 Subject: rpms/perl-YAML-Parser-Syck/devel perl-YAML-Parser-Syck.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603091509.k29F9KK7002039@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000/devel Modified Files: .cvsignore sources Added Files: perl-YAML-Parser-Syck.spec Log Message: auto-import perl-YAML-Parser-Syck-0.01-4 on branch devel from perl-YAML-Parser-Syck-0.01-4.src.rpm --- NEW FILE perl-YAML-Parser-Syck.spec --- Name: perl-YAML-Parser-Syck Version: 0.01 Release: 4 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)) %description libsyck is a *gift* from a gifted Stiff named 'Why'. YAML::Parser::Syck is an XS module that binds libsyck to Perl. %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} %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/* %check %{__make} test %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Artistic COPYING Changes %{perl_vendorarch}/* %{_mandir}/man3/*.3* %changelog * Wed Sep 7 2005 Paul Howarth - 0.01-4 - Remove pkgname macro for clarity - Remove redundant BR: perl - More specific URL - License is same as perl (GPL or Artistic), not just Artistic - Add BR: syck-devel - Tidy summary - Remove redundant "|| :" from %%check - Use perl_vendorarch, not perl_vendorlib for arch-specific package - Unconditionally remove buildroot in %%clean - Simplify compiler optimization flags setup - Include license text - Include Changes - Use macros consistently * Thu May 19 2005 Oliver Falk - 0.01-3 - Absolute new specfile (fedora template) * Sun Apr 03 2005 Oliver Falk - 0.01-2.1 - Rebuild against syck 0.53 * Wed Mar 16 2005 Oliver Falk - 0.01-2 - BuildRequire syck - Speclean (a bit) changelog * Thu Jan 20 2005 Oliver Falk - 0.01-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2006 15:07:15 -0000 1.1 +++ .cvsignore 9 Mar 2006 15:08:43 -0000 1.2 @@ -0,0 +1 @@ +YAML-Parser-Syck-0.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2006 15:07:15 -0000 1.1 +++ sources 9 Mar 2006 15:08:43 -0000 1.2 @@ -0,0 +1 @@ +03e5e469259d959471468e9e84b8f918 YAML-Parser-Syck-0.01.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 15:09:53 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 9 Mar 2006 10:09:53 -0500 Subject: rpms/freeciv/FC-4 .cvsignore, 1.10, 1.11 freeciv.spec, 1.15, 1.16 sources, 1.10, 1.11 Message-ID: <200603091510.k29FAP6c002107@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2079 Modified Files: .cvsignore freeciv.spec sources Log Message: * Thu Mar 9 2006 Brian Pepple - 2.0.8-1 - Update to 2.0.8 (fixes #184507). - Remove unnecessary BR (alsa-lib-devel & SDL-devel). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Nov 2005 15:25:58 -0000 1.10 +++ .cvsignore 9 Mar 2006 15:09:53 -0000 1.11 @@ -1,2 +1,2 @@ -freeciv-2.0.7.tar.bz2 +freeciv-2.0.8.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- freeciv.spec 6 Nov 2005 15:25:58 -0000 1.15 +++ freeciv.spec 9 Mar 2006 15:09:53 -0000 1.16 @@ -1,6 +1,6 @@ Name: freeciv -Version: 2.0.7 -Release: 2%{?dist} +Version: 2.0.8 +Release: 1%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -18,10 +18,8 @@ BuildRequires: readline-devel BuildRequires: zlib-devel BuildRequires: bind-devel -BuildRequires: SDL-devel BuildRequires: SDL_mixer-devel BuildRequires: esound-devel -BuildRequires: alsa-lib-devel BuildRequires: ncurses-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -90,6 +88,10 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Thu Mar 9 2006 Brian Pepple - 2.0.8-1 +- Update to 2.0.8 (fixes #184507). +- Remove unnecessary BR (alsa-lib-devel & SDL-devel). + * Sun Nov 6 2005 Brian Pepple - 2.0.7-2 - Update to 2.0.7. - Modify desktop patch for upstream fixes. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Nov 2005 15:25:58 -0000 1.10 +++ sources 9 Mar 2006 15:09:53 -0000 1.11 @@ -1,2 +1,2 @@ -7a60ea8f39822036b86640532accc5ce freeciv-2.0.7.tar.bz2 +9ebd5899c2c78362e0e2c68791673a88 freeciv-2.0.8.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 15:13:02 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:13:02 -0500 Subject: rpms/perl-YAML-Parser-Syck/devel perl-YAML-Parser-Syck.spec, 1.1, 1.2 Message-ID: <200603091513.k29FDYlO002195@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2175 Modified Files: perl-YAML-Parser-Syck.spec Log Message: * Thu Mar 09 2006 Oliver Falk - 0.01-5 - Add dist-tag - Rebuild 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-YAML-Parser-Syck.spec 9 Mar 2006 15:08:43 -0000 1.1 +++ perl-YAML-Parser-Syck.spec 9 Mar 2006 15:13:01 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-YAML-Parser-Syck Version: 0.01 -Release: 4 +Release: 5%{?dist} Summary: Perl Wrapper for the YAML Parser Extension: libsyck Group: Development/Libraries @@ -8,7 +8,7 @@ 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 +BuildRequires: syck-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -46,6 +46,10 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 09 2006 Oliver Falk - 0.01-5 +- Add dist-tag +- Rebuild + * Wed Sep 7 2005 Paul Howarth - 0.01-4 - Remove pkgname macro for clarity - Remove redundant BR: perl From fedora-extras-commits at redhat.com Thu Mar 9 15:24:12 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 9 Mar 2006 10:24:12 -0500 Subject: rpms/freeciv/FC-3 freeciv-desktop.patch, 1.2, 1.3 .cvsignore, 1.5, 1.6 freeciv.spec, 1.5, 1.6 sources, 1.5, 1.6 freeciv_desktop.patch, 1.1, NONE Message-ID: <200603091524.k29FOiJ0002339@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2311 Modified Files: .cvsignore freeciv.spec sources Added Files: freeciv-desktop.patch Removed Files: freeciv_desktop.patch Log Message: * Thu Mar 9 2006 Brian Pepple - 2.0.8-1 - Add dist tag. - Update to 2.0.8 (fixes #184507). - Remove unnecessary BR (alsa-lib-devel & SDL-devel). - Use new stdsounds. freeciv-desktop.patch: Index: freeciv-desktop.patch =================================================================== RCS file: freeciv-desktop.patch diff -N freeciv-desktop.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ freeciv-desktop.patch 9 Mar 2006 15:24:12 -0000 1.3 @@ -0,0 +1,12 @@ +diff -ur freeciv-2.0.7.OLD/bootstrap/freeciv.desktop.in freeciv-2.0.7/bootstrap/freeciv.desktop.in +--- freeciv-2.0.7.OLD/bootstrap/freeciv.desktop.in 2005-10-13 13:38:05.000000000 -0400 ++++ freeciv-2.0.7/bootstrap/freeciv.desktop.in 2005-11-06 09:58:18.000000000 -0500 +@@ -14,7 +14,7 @@ + Comment[pl]=Gra strategiczna podobna do Cywilizacji(TM) + Comment[pt]=Jogo similar ao Civilization(TM) + Exec=civclient +-Icon=gnome-globe.png ++Icon=freeciv.xpm + StartupNotify=true + Terminal=false + Type=Application Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Apr 2005 02:12:51 -0000 1.5 +++ .cvsignore 9 Mar 2006 15:24:12 -0000 1.6 @@ -1,2 +1,2 @@ -freeciv-2.0.0.tar.bz2 -stdsounds2.tar.gz +freeciv-2.0.8.tar.bz2 +stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-3/freeciv.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- freeciv.spec 19 Apr 2005 03:12:41 -0000 1.5 +++ freeciv.spec 9 Mar 2006 15:24:12 -0000 1.6 @@ -1,16 +1,16 @@ Name: freeciv -Version: 2.0.0 -Release: 3.fc3 +Version: 2.0.8 +Release: 1%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games License: GPL URL: http://www.freeciv.org/index.php/Freeciv Source0: ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2 -Source1: http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz +Source1: ftp://ftp.freeciv.org/%{name}/contrib/sounds/sets/stdsounds3.tar.gz Source2: %{name}-server.desktop Source3: %{name}.xpm -Patch1: %{name}_desktop.patch +Patch1: %{name}-desktop.patch Patch2: %{name}-aifill.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,10 +18,8 @@ BuildRequires: readline-devel BuildRequires: zlib-devel BuildRequires: bind-devel -BuildRequires: SDL-devel BuildRequires: SDL_mixer-devel BuildRequires: esound-devel -BuildRequires: alsa-lib-devel BuildRequires: ncurses-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -35,12 +33,11 @@ %prep %setup -q -n %{name}-%{version} -%patch1 -p0 -b .desktop +%patch1 -p1 -b .desktop %patch2 -p0 -b .aifill %build -%configure --enable-debug=no \ - --enable-client=gtk2 +%configure --enable-client=gtk2 make %{?_smp_mflags} %install @@ -62,7 +59,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/civmanual # Add the sound files. -(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE1}; ) +tar xzf %{SOURCE1} +cp -p data/stdsounds.soundspec $RPM_BUILD_ROOT%{_datadir}/%{name} +mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds +cp -p data/stdsounds/*.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds %{__install} -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm @@ -82,11 +82,17 @@ %{_bindir}/civclient %{_datadir}/%{name} %{_datadir}/pixmaps/%{name}.xpm -%config %{_datadir}/applications/* +%{_datadir}/applications/fedora-*.desktop %{_mandir}/man6/civserver.6.gz %{_mandir}/man6/civclient.6.gz %changelog +* Thu Mar 9 2006 Brian Pepple - 2.0.8-1 +- Add dist tag. +- Update to 2.0.8 (fixes #184507). +- Remove unnecessary BR (alsa-lib-devel & SDL-devel). +- Use new stdsounds. + * Mon Apr 18 2005 Brian Pepple - 2.0.0-3.fc3 - Re-add patch to set aifill to 5 on new servers to get some opponents. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Apr 2005 02:12:51 -0000 1.5 +++ sources 9 Mar 2006 15:24:12 -0000 1.6 @@ -1,2 +1,2 @@ -fa7170026cc2aefdafd43b27a4bfaf80 freeciv-2.0.0.tar.bz2 -63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz +9ebd5899c2c78362e0e2c68791673a88 freeciv-2.0.8.tar.bz2 +77215914712f2f351092918f5e41e39e stdsounds3.tar.gz --- freeciv_desktop.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 9 16:15:38 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 11:15:38 -0500 Subject: rpms/lyx/devel lyx.spec,1.29,1.30 Message-ID: <200603091616.k29GGAhX004332@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4315 Modified Files: lyx.spec Log Message: * Thu Mar 09 2006 Rex Dieter 1.4.0-4 - fix stripping of -fexceptions from %optflags Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- lyx.spec 8 Mar 2006 19:45:52 -0000 1.29 +++ lyx.spec 9 Mar 2006 16:15:37 -0000 1.30 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing @@ -99,10 +99,10 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -# drop -fexceptions from RPM_OPT_FLAGS, suggested by lyx devs: +# drop -fexceptions from optflags, suggested by lyx devs: # http://www.mail-archive.com/lyx-devel at lists.lyx.org/msg85794.html -export CFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )" -export CXXFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )" +optflags="$(echo %optflags | sed -e 's|-fexceptions||' )" +%global optflags $optflags for frontend in qt xforms ; do @@ -110,7 +110,7 @@ --disable-rpath \ --enable-compression-support \ --with-frontend=$frontend \ - --enable-optimization="$RPM_OPT_FLAGS" \ + --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ --without-warnings --disable-dependency-tracking \ @@ -203,6 +203,9 @@ %changelog +* Thu Mar 09 2006 Rex Dieter 1.4.0-4 +- fix stripping of -fexceptions from %%optflags + * Wed Mar 08 2006 Rex Dieter 1.4.0-3 - include beamer.layout From fedora-extras-commits at redhat.com Thu Mar 9 16:50:08 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 9 Mar 2006 11:50:08 -0500 Subject: rpms/pcsc-tools/devel .cvsignore, 1.3, 1.4 pcsc-tools.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603091650.k29Goeti004613@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4585 Modified Files: .cvsignore pcsc-tools.spec sources Log Message: * Thu Mar 9 2006 Ville Skytt?? - 1.4.3-1 - 1.4.3. - Improve description. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Mar 2006 18:37:12 -0000 1.3 +++ .cvsignore 9 Mar 2006 16:50:07 -0000 1.4 @@ -1 +1 @@ -pcsc-tools-1.4.2.tar.gz +pcsc-tools-1.4.3.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pcsc-tools.spec 8 Mar 2006 18:37:12 -0000 1.4 +++ pcsc-tools.spec 9 Mar 2006 16:50:07 -0000 1.5 @@ -1,5 +1,5 @@ Name: pcsc-tools -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC @@ -15,14 +15,11 @@ Requires: pcsc-lite %description -The pcsc-tools package contains some tools useful for a PC/SC user. -The tools provided are: -* pcsc_scan(1) scans available smart card readers and print detected - events: card insertion with ATR, card removal; -* ATR_analysis(1) analyses a smart card ATR (Anwser To Reset) -* scriptor(1) Perl script to send commands to a smart card using a - batch file or stdin; -* gscriptor(1) the same idea as scriptor(1) but with Perl-Gtk GUI. +The pcsc-tools package contains some useful tools for a PC/SC user: +pcsc_scan regularly scans connected PC/SC smart card readers and +prints detected events, ATR_analysis analyzes smart card ATRs (Anwser +To Reset), scriptor sends commands to a smart card, and gscriptor does +that from a GTK user interface. %prep @@ -44,9 +41,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT%{_prefix} -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pcsc -mv $RPM_BUILD_ROOT%{_prefix}/pcsc/* $RPM_BUILD_ROOT%{_datadir}/pcsc -rmdir $RPM_BUILD_ROOT%{_prefix}/pcsc desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ @@ -70,6 +64,10 @@ %changelog +* Thu Mar 9 2006 Ville Skytt?? - 1.4.3-1 +- 1.4.3. +- Improve description. + * Wed Mar 8 2006 Ville Skytt?? - 1.4.2-1 - 1.4.2, desktop file, recent smartcard_list.txt, ATR_analysis message patch and smartcard_list.txt lookup path improvement included upstream. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Mar 2006 18:37:12 -0000 1.3 +++ sources 9 Mar 2006 16:50:07 -0000 1.4 @@ -1 +1 @@ -9cd68c933fafda78f844b114319a52b8 pcsc-tools-1.4.2.tar.gz +c21a0865983d0f3eb9841eb4d03e67f1 pcsc-tools-1.4.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 16:52:22 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 11:52:22 -0500 Subject: rpms/R-RScaLAPACK/FC-3 R-RScaLAPACK.spec,1.12,1.13 sources,1.2,1.3 Message-ID: <200603091652.k29Gqswq004714@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4662/FC-3 Modified Files: R-RScaLAPACK.spec sources Log Message: Upload the source before building. :P Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-3/R-RScaLAPACK.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- R-RScaLAPACK.spec 9 Mar 2006 14:51:43 -0000 1.12 +++ R-RScaLAPACK.spec 9 Mar 2006 16:52:22 -0000 1.13 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib @@ -65,6 +65,9 @@ %{_libdir}/R/library/%{packname}/ %changelog +* Thu Mar 9 2006 Tom "spot" Callaway 0.5.1-3 +- forgot to upload source + * Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 - get this thing working again Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Apr 2005 17:48:06 -0000 1.2 +++ sources 9 Mar 2006 16:52:22 -0000 1.3 @@ -1 +1 @@ -e086b79d25d1c5d1eba377b632609d67 RScaLAPACK_0.4.0.tar.gz +906d69b630dbd4a50960b2ce099d460f RScaLAPACK_0.5.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 16:52:28 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 11:52:28 -0500 Subject: rpms/R-RScaLAPACK/FC-4 R-RScaLAPACK.spec,1.12,1.13 sources,1.2,1.3 Message-ID: <200603091653.k29Gr0UH004718@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4662/FC-4 Modified Files: R-RScaLAPACK.spec sources Log Message: Upload the source before building. :P Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-4/R-RScaLAPACK.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- R-RScaLAPACK.spec 9 Mar 2006 14:51:50 -0000 1.12 +++ R-RScaLAPACK.spec 9 Mar 2006 16:52:27 -0000 1.13 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib @@ -65,6 +65,9 @@ %{_libdir}/R/library/%{packname}/ %changelog +* Thu Mar 9 2006 Tom "spot" Callaway 0.5.1-3 +- forgot to upload source + * Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 - get this thing working again Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Apr 2005 17:48:06 -0000 1.2 +++ sources 9 Mar 2006 16:52:27 -0000 1.3 @@ -1 +1 @@ -e086b79d25d1c5d1eba377b632609d67 RScaLAPACK_0.4.0.tar.gz +906d69b630dbd4a50960b2ce099d460f RScaLAPACK_0.5.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 16:52:36 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 11:52:36 -0500 Subject: rpms/R-RScaLAPACK/devel .cvsignore, 1.2, 1.3 R-RScaLAPACK.spec, 1.12, 1.13 sources, 1.2, 1.3 Message-ID: <200603091653.k29Gr9R8004723@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4662/devel Modified Files: .cvsignore R-RScaLAPACK.spec sources Log Message: Upload the source before building. :P Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Apr 2005 17:48:06 -0000 1.2 +++ .cvsignore 9 Mar 2006 16:52:36 -0000 1.3 @@ -1 +1,2 @@ RScaLAPACK_0.4.0.tar.gz +RScaLAPACK_0.5.1.tar.gz Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- R-RScaLAPACK.spec 9 Mar 2006 14:51:55 -0000 1.12 +++ R-RScaLAPACK.spec 9 Mar 2006 16:52:36 -0000 1.13 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib @@ -65,6 +65,9 @@ %{_libdir}/R/library/%{packname}/ %changelog +* Thu Mar 9 2006 Tom "spot" Callaway 0.5.1-3 +- forgot to upload source + * Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 - get this thing working again Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Apr 2005 17:48:06 -0000 1.2 +++ sources 9 Mar 2006 16:52:36 -0000 1.3 @@ -1 +1 @@ -e086b79d25d1c5d1eba377b632609d67 RScaLAPACK_0.4.0.tar.gz +906d69b630dbd4a50960b2ce099d460f RScaLAPACK_0.5.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 17:04:24 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 12:04:24 -0500 Subject: rpms/perl-GD/FC-4 .cvsignore, 1.8, 1.9 perl-GD.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200603091704.k29H4xQK006777@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6739/FC-4 Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.32. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Feb 2006 18:15:37 -0000 1.8 +++ .cvsignore 9 Mar 2006 17:04:24 -0000 1.9 @@ -1 +1 @@ -GD-2.31.tar.gz +GD-2.32.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/perl-GD.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-GD.spec 21 Feb 2006 18:15:37 -0000 1.10 +++ perl-GD.spec 9 Mar 2006 17:04:24 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-GD -Version: 2.31 +Version: 2.32 Release: 1%{?dist} Summary: Perl interface to the GD graphics library @@ -25,7 +25,7 @@ %prep %setup -q -n GD-%{version} %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \ - qd.pl bdf_scripts/bdf2gdfont.pl demos/{*.{pl,cgi},truetype_test} + qd.pl demos/{*.{pl,cgi},truetype_test} chmod 644 bdf_scripts/* demos/* chmod 755 qd.pl @@ -64,6 +64,9 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 2.32-1 +- Update to 2.32. + * Tue Feb 21 2006 Jose Pedro Oliveira - 2.31-1 - Update to 2.31. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Feb 2006 18:15:37 -0000 1.8 +++ sources 9 Mar 2006 17:04:24 -0000 1.9 @@ -1 +1 @@ -71e5050c45d2270984b271cbd9ec897b GD-2.31.tar.gz +84a79a60966b2de61dbf622342e3ee3d GD-2.32.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 17:04:31 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 12:04:31 -0500 Subject: rpms/perl-GD/devel .cvsignore, 1.8, 1.9 perl-GD.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200603091705.k29H53N0006782@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6739/devel Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.32. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Feb 2006 18:10:28 -0000 1.8 +++ .cvsignore 9 Mar 2006 17:04:30 -0000 1.9 @@ -1 +1 @@ -GD-2.31.tar.gz +GD-2.32.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-GD.spec 21 Feb 2006 18:10:28 -0000 1.13 +++ perl-GD.spec 9 Mar 2006 17:04:30 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-GD -Version: 2.31 +Version: 2.32 Release: 1%{?dist} Summary: Perl interface to the GD graphics library @@ -26,7 +26,7 @@ %prep %setup -q -n GD-%{version} %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \ - qd.pl bdf_scripts/bdf2gdfont.pl demos/{*.{pl,cgi},truetype_test} + qd.pl demos/{*.{pl,cgi},truetype_test} chmod 644 bdf_scripts/* demos/* chmod 755 qd.pl @@ -65,6 +65,9 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 2.32-1 +- Update to 2.32. + * Tue Feb 21 2006 Jose Pedro Oliveira - 2.31-1 - Update to 2.31. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Feb 2006 18:10:28 -0000 1.8 +++ sources 9 Mar 2006 17:04:30 -0000 1.9 @@ -1 +1 @@ -71e5050c45d2270984b271cbd9ec897b GD-2.31.tar.gz +84a79a60966b2de61dbf622342e3ee3d GD-2.32.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 17:42:54 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Thu, 9 Mar 2006 12:42:54 -0500 Subject: rpms/vpnc/devel vpnc-0.3.3-rekeying.patch, NONE, 1.1 generic-vpnc.conf, 1.1, 1.2 vpnc.spec, 1.11, 1.12 vpnc-0.3.3-disconnect.patch, 1.1, NONE Message-ID: <200603091743.k29HhQ0w007066@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7044 Modified Files: generic-vpnc.conf vpnc.spec Added Files: vpnc-0.3.3-rekeying.patch Removed Files: vpnc-0.3.3-disconnect.patch Log Message: * Thu Mar 9 2006 Tomas Mraz 0.3.3-7 - add basic rekeying support (the patch includes NAT keepalive support by Brian Downing) - dropped disconnect patch (solved differently) vpnc-0.3.3-rekeying.patch: --- NEW FILE vpnc-0.3.3-rekeying.patch --- --- vpnc-0.3.3/vpnc.c.rekeying 2006-03-09 18:33:04.000000000 +0100 +++ vpnc-0.3.3/vpnc.c 2006-03-09 18:33:40.000000000 +0100 @@ -60,15 +60,13 @@ static uint8_t r_packet[2048]; static ssize_t r_length; -extern void vpnc_doit(unsigned long tous_spi, +extern int vpnc_doit(unsigned long tous_spi, const unsigned char *tous_key, struct sockaddr_in *tous_dest, unsigned long tothem_spi, const unsigned char *tothem_key, struct sockaddr_in *tothem_dest, int tun_fd, int md_algo, int cry_algo, - uint8_t * kill_packet_p, size_t kill_packet_size_p, - struct sockaddr *kill_dest_p, uint16_t encap_mode, int isakmp_fd, const char *pidfile); @@ -332,6 +330,7 @@ time_t start = time(NULL); time_t end = 0; void *realtosend; + static uint32_t zero; pfd.fd = sockfd; pfd.events = POLLIN; @@ -365,8 +364,13 @@ if (pollresult != 0) { recvsize = recv_ignore_dup(recvbuf, recvbufsize); end = time(NULL); - if (recvsize != -1) - break; + if (recvsize != -1) { + if (encap_mode == IPSEC_ENCAP_TUNNEL || + memcmp(recvbuf, &zero, sizeof(zero)) == 0) + /* this hack drops ESP packets on NATed connections + during rekeying, but it shouldn't matter much */ + break; + } continue; } @@ -383,7 +387,7 @@ if (encap_mode != IPSEC_ENCAP_TUNNEL) { recvsize -= 4; /* 4 bytes non-esp marker */ - memcpy(recvbuf, recvbuf+4, recvsize); + memmove(recvbuf, recvbuf+4, recvsize); } /* Wait at least 2s for a response or 4 times the time it took @@ -1882,7 +1886,7 @@ return r; } -static void setup_link(struct sa_block *s) +static int setup_link(struct sa_block *s) { struct isakmp_payload *rp, *us, *ke = NULL, *them, *nonce_r = NULL; struct isakmp_packet *r; @@ -1893,6 +1897,8 @@ size_t p_size = 0; uint8_t nonce[20], *dh_public = NULL; int ipsec_cry_algo = 0, ipsec_hash_algo = 0, i; + static int rekey = 0; + static int tunnelfd = -1; DEBUG(2, printf("S7.1\n")); /* Set up the Diffie-Hellman stuff. */ @@ -1944,6 +1950,7 @@ memcpy(realiv_msgid, s->current_iv_msgid, 4); } +again: DEBUG(2, printf("S7.3\n")); reject = unpack_verify_phase2(s, r_packet, r_length, &r, nonce, sizeof(nonce)); @@ -1952,6 +1959,13 @@ && r->exchange_type == ISAKMP_EXCHANGE_INFORMATIONAL) { /* handle notifie responder-lifetime (ignore) */ /* (broken hash => ignore AUTHENTICATION_FAILED) */ + if (reject == 0 + && r->payload->next->type == ISAKMP_PAYLOAD_D && rekey) { + DEBUG(2, printf("ignoring delete old ESP SA notify\n")); + r_length = sendrecv(r_packet, sizeof(*r_packet), NULL, 0, 0); + goto again; + } + if (reject == 0 && r->payload->next->type != ISAKMP_PAYLOAD_N) reject = ISAKMP_N_INVALID_PAYLOAD_TYPE; @@ -2122,51 +2136,20 @@ nonce_r->u.nonce.data, nonce_r->u.nonce.length); DEBUG(2, printf("S7.7\n")); - /* Create the delete payload, now that we have all the information. */ - { - struct isakmp_payload *d_isakmp, *d_ipsec; - uint32_t del_msgid; - - gcry_randomize((uint8_t *) & del_msgid, sizeof(del_msgid), GCRY_WEAK_RANDOM); - d_isakmp = new_isakmp_payload(ISAKMP_PAYLOAD_D); - d_isakmp->u.d.doi = ISAKMP_DOI_IPSEC; - d_isakmp->u.d.protocol = ISAKMP_IPSEC_PROTO_ISAKMP; - d_isakmp->u.d.spi_length = 2 * ISAKMP_COOKIE_LENGTH; - d_isakmp->u.d.num_spi = 1; - d_isakmp->u.d.spi = xallocc(1 * sizeof(uint8_t *)); - d_isakmp->u.d.spi[0] = xallocc(2 * ISAKMP_COOKIE_LENGTH); - memcpy(d_isakmp->u.d.spi[0] + ISAKMP_COOKIE_LENGTH * 0, s->i_cookie, - ISAKMP_COOKIE_LENGTH); - memcpy(d_isakmp->u.d.spi[0] + ISAKMP_COOKIE_LENGTH * 1, s->r_cookie, - ISAKMP_COOKIE_LENGTH); - d_ipsec = new_isakmp_payload(ISAKMP_PAYLOAD_D); - d_ipsec->next = d_isakmp; - d_ipsec->u.d.doi = ISAKMP_DOI_IPSEC; - d_ipsec->u.d.protocol = ISAKMP_IPSEC_PROTO_IPSEC_ESP; - d_ipsec->u.d.spi_length = 4; - d_ipsec->u.d.num_spi = 2; - d_ipsec->u.d.spi = xallocc(2 * sizeof(uint8_t *)); - d_ipsec->u.d.spi[0] = xallocc(d_ipsec->u.d.spi_length); - memcpy(d_ipsec->u.d.spi[0], &s->tous_esp_spi, 4); - d_ipsec->u.d.spi[1] = xallocc(d_ipsec->u.d.spi_length); - memcpy(d_ipsec->u.d.spi[1], &s->tothem_esp_spi, 4); - phase2_authpacket(s, d_ipsec, ISAKMP_EXCHANGE_INFORMATIONAL, - del_msgid, &s->kill_packet, &s->kill_packet_size, - nonce, sizeof(nonce), nonce_r->u.nonce.data, nonce_r->u.nonce.length); - isakmp_crypt(s, s->kill_packet, s->kill_packet_size, 1); - } - DEBUG(2, printf("S7.8\n")); /* Set up the interface here so it's ready when our acknowledgement * arrives. */ - config_tunnel(); - DEBUG(2, printf("S7.9\n")); + if (!rekey) { + config_tunnel(); + } + + DEBUG(2, printf("S7.8\n")); { uint8_t *tous_keys, *tothem_keys; struct sockaddr_in tothem_dest, tous_dest; unsigned char *dh_shared_secret = NULL; - int tunnelfd = sockfd; - + uint16_t em = encap_mode; + if (dh_grp) { /* Determine the shared secret. */ dh_shared_secret = xallocc(dh_getlen(dh_grp)); @@ -2186,21 +2169,66 @@ nonce, sizeof(nonce), nonce_r->u.nonce.data, nonce_r->u.nonce.length); memcpy(&tous_dest, dest_addr, sizeof(tous_dest)); if (opt_udpencap && s->peer_udpencap_port) { - close(tunnelfd); - tunnelfd = make_socket(htons(opt_udpencapport)); + if (!rekey) { + tunnelfd = make_socket(htons(opt_udpencapport)); + } tous_dest.sin_port = htons(s->peer_udpencap_port); - encap_mode = IPSEC_ENCAP_UDP_TUNNEL; + em = IPSEC_ENCAP_UDP_TUNNEL; + } else if (em != IPSEC_ENCAP_TUNNEL) { + tunnelfd = sockfd; + } else { + if (!rekey) { + tunnelfd = socket(PF_INET, SOCK_RAW, IPPROTO_ESP); + if (tunnelfd == -1) { + error(1, errno, "socket(SOCK_RAW) failed"); + } + } } if (dh_grp) group_free(dh_grp); - DEBUG(2, printf("S7.10\n")); - vpnc_doit(s->tous_esp_spi, tous_keys, &tothem_dest, + DEBUG(2, printf("S7.9\n")); + reject = vpnc_doit(s->tous_esp_spi, tous_keys, &tothem_dest, s->tothem_esp_spi, tothem_keys, (struct sockaddr_in *)&tous_dest, - s->tun_fd, ipsec_hash_algo, ipsec_cry_algo, - s->kill_packet, s->kill_packet_size, dest_addr, - encap_mode, tunnelfd, + s->tun_fd, ipsec_hash_algo, ipsec_cry_algo, em, tunnelfd, config[CONFIG_PID_FILE]); + rekey = reject == 0; } + + DEBUG(2, printf("S7.10\n")); + /* Create and send the delete payload. */ + if (reject != 0) { + struct isakmp_payload *d_isakmp = NULL, *d_ipsec; + uint32_t del_msgid; + + gcry_create_nonce((uint8_t *) & del_msgid, sizeof(del_msgid)); + d_isakmp = new_isakmp_payload(ISAKMP_PAYLOAD_D); + d_isakmp->u.d.doi = ISAKMP_DOI_IPSEC; + d_isakmp->u.d.protocol = ISAKMP_IPSEC_PROTO_ISAKMP; + d_isakmp->u.d.spi_length = 2 * ISAKMP_COOKIE_LENGTH; + d_isakmp->u.d.num_spi = 1; + d_isakmp->u.d.spi = xallocc(1 * sizeof(uint8_t *)); + d_isakmp->u.d.spi[0] = xallocc(2 * ISAKMP_COOKIE_LENGTH); + memcpy(d_isakmp->u.d.spi[0] + ISAKMP_COOKIE_LENGTH * 0, s->i_cookie, + ISAKMP_COOKIE_LENGTH); + memcpy(d_isakmp->u.d.spi[0] + ISAKMP_COOKIE_LENGTH * 1, s->r_cookie, + ISAKMP_COOKIE_LENGTH); + + d_ipsec = new_isakmp_payload(ISAKMP_PAYLOAD_D); + d_ipsec->next = d_isakmp; + d_ipsec->u.d.doi = ISAKMP_DOI_IPSEC; + d_ipsec->u.d.protocol = ISAKMP_IPSEC_PROTO_IPSEC_ESP; + d_ipsec->u.d.spi_length = 4; + d_ipsec->u.d.num_spi = 2; + d_ipsec->u.d.spi = xallocc(2 * sizeof(uint8_t *)); + d_ipsec->u.d.spi[0] = xallocc(d_ipsec->u.d.spi_length); + memcpy(d_ipsec->u.d.spi[0], &s->tous_esp_spi, 4); + d_ipsec->u.d.spi[1] = xallocc(d_ipsec->u.d.spi_length); + memcpy(d_ipsec->u.d.spi[1], &s->tothem_esp_spi, 4); + sendrecv_phase2(s, d_ipsec, ISAKMP_EXCHANGE_INFORMATIONAL, + del_msgid, 1, NULL, NULL, + NULL, 0, NULL, 0); + } + return reject; } int main(int argc, char **argv) @@ -2239,7 +2267,9 @@ do_load_balance = do_phase_2_config(oursa); } while (do_load_balance); DEBUG(2, printf("S7\n")); - setup_link(oursa); + while(setup_link(oursa) == 0) { + DEBUG(2, printf("S7 Rekeying\n")); + } DEBUG(2, printf("S8\n")); setenv("reason", "disconnect", 1); system(config[CONFIG_SCRIPT]); --- vpnc-0.3.3/config.c.rekeying 2005-05-01 22:06:36.000000000 +0200 +++ vpnc-0.3.3/config.c 2006-03-09 18:33:04.000000000 +0100 @@ -56,6 +56,8 @@ int opt_1des; int opt_udpencap; uint16_t opt_udpencapport; +int opt_nat_keepalive; +int opt_rekey_interval; void hex_dump(const char *str, const void *data, ssize_t len) { @@ -113,6 +115,16 @@ return "10000"; } +static const char *config_def_nat_keepalive(void) +{ + return "0"; +} + +static const char *config_def_rekey_interval(void) +{ + return "0"; +} + static const char *config_def_app_version(void) { struct utsname uts; @@ -299,6 +311,20 @@ "disable use of NAT-T", NULL }, { + CONFIG_NAT_KEEPALIVE, 1, 1, + "--nat-keepalive", + "NAT-Keepalive packet interval ", + "", + "If non-zero, send out NAT-Keepalive packets at specified interval", + config_def_nat_keepalive + }, { + CONFIG_REKEY_INTERVAL, 1, 1, + "--rekey-interval", + "Rekeying interval ", + "", + "If non-zero, rekey the connection at specified interval", + config_def_rekey_interval + }, { CONFIG_NON_INTERACTIVE, 0, 1, "--non-inter", "Noninteractive", @@ -535,6 +561,8 @@ opt_1des = (config[CONFIG_ENABLE_1DES]) ? 1 : 0; opt_udpencap=(config[CONFIG_UDP_ENCAP]) ? 1 : 0; opt_udpencapport=atoi(config[CONFIG_UDP_ENCAP_PORT]); + opt_nat_keepalive=atoi(config[CONFIG_NAT_KEEPALIVE]); + opt_rekey_interval=atoi(config[CONFIG_REKEY_INTERVAL]); } if (opt_debug >= 99) { --- vpnc-0.3.3/tunip.c.rekeying 2005-05-05 12:25:00.000000000 +0200 +++ vpnc-0.3.3/tunip.c 2006-03-09 18:33:04.000000000 +0100 @@ -333,18 +333,14 @@ return 1; } -int encap_esp_new(struct encap_method *encap, unsigned char proto) +int encap_esp_new(struct encap_method *encap, int encap_fd) { #ifdef IP_HDRINCL int hincl = 1; #endif - encap->fd = socket(PF_INET, SOCK_RAW, proto); + encap->fd = encap_fd; - if (encap->fd == -1) { - perror("socket(SOCK_RAW)"); - return -1; - } #ifdef IP_HDRINCL if (setsockopt(encap->fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1) { @@ -766,15 +762,16 @@ } static uint8_t volatile do_kill; -static uint8_t *kill_packet; -static size_t kill_packet_size; -static struct sockaddr *kill_dest; -static void vpnc_main_loop(struct peer_desc *peer, struct encap_method *meth, int tun_fd, const char *pidfile) +#define VPNC_POLL_TIMEOUT 2000 + +static int vpnc_main_loop(struct peer_desc *peer, struct encap_method *meth, int tun_fd, const char *pidfile) { - int sock; struct pollfd pollfds[2]; + time_t keepalive, rekey, now; + int rv = 1; + keepalive = rekey = time(NULL); pollfds[0].fd = tun_fd; pollfds[0].events = POLLIN; pollfds[1].fd = encap_get_fd(meth); @@ -784,13 +781,26 @@ int presult; do { - presult = poll(pollfds, sizeof(pollfds) / sizeof(pollfds[0]), -1); + presult = poll(pollfds, sizeof(pollfds) / sizeof(pollfds[0]), VPNC_POLL_TIMEOUT); } while (presult == -1 && errno == EINTR && !do_kill); if (presult == -1) { syslog(LOG_ERR, "poll: %m"); continue; } + now = time(NULL); + if (opt_nat_keepalive && now-keepalive >= opt_nat_keepalive) { + const char *payload = "\xff"; + sendto(meth->fd, payload, 1, 0, + (struct sockaddr *)&peer->remote_sa->dest, + sizeof(peer->remote_sa->dest)); + } + + if (opt_rekey_interval && now-rekey >= opt_rekey_interval) { + rv = 0; + do_kill = 255; + } + if (pollfds[0].revents & POLLIN) { int pack; @@ -863,16 +873,13 @@ } } - sock = socket(AF_INET, SOCK_DGRAM, 0); - if (sock >= 0) { - sendto(sock, kill_packet, kill_packet_size, 0, - kill_dest, sizeof(struct sockaddr_in)); - close(sock); - } - tun_close(oursa->tun_fd, oursa->tun_name); - if (pidfile) - unlink(pidfile); /* ignore errors */ - syslog(LOG_NOTICE, "terminated"); + if (rv != 0) { + tun_close(oursa->tun_fd, oursa->tun_name); + if (pidfile) + unlink(pidfile); /* ignore errors */ + syslog(LOG_NOTICE, "terminated"); + } + return rv; } void killit(int signum) @@ -898,7 +905,7 @@ fclose(pf); } -void +int vpnc_doit(unsigned long tous_spi, const unsigned char *tous_key, struct sockaddr_in *tous_dest, @@ -906,9 +913,7 @@ const unsigned char *tothem_key, struct sockaddr_in *tothem_dest, int tun_fd, int md_algo, int cry_algo, - uint8_t * kill_packet_p, size_t kill_packet_size_p, - struct sockaddr *kill_dest_p, - uint16_t encap_mode, int udp_fd, + uint16_t encap_mode, int encap_fd, const char *pidfile) { struct encap_method meth; @@ -918,12 +923,13 @@ switch (encap_mode) { case IPSEC_ENCAP_TUNNEL: - if (encap_esp_new(&meth, IPPROTO_ESP) == -1) + if (encap_esp_new(&meth, encap_fd) == -1) exit(1); + opt_nat_keepalive = 0; break; case IPSEC_ENCAP_UDP_TUNNEL: case IPSEC_ENCAP_UDP_TUNNEL_OLD: - if (encap_udp_new(&meth, udp_fd) == -1) + if (encap_udp_new(&meth, encap_fd) == -1) exit(1); break; default: @@ -984,11 +990,6 @@ vpnpeer.local_sa = &tous_sa; vpnpeer.remote_sa = &tothem_sa; - do_kill = 0; - kill_packet = kill_packet_p; - kill_packet_size = kill_packet_size_p; - kill_dest = kill_dest_p; - signal(SIGHUP, killit); signal(SIGINT, killit); signal(SIGTERM, killit); @@ -1000,7 +1001,7 @@ chdir("/"); setsid(); - if (!opt_nd) { + if (do_kill == 0 && !opt_nd) { /* do_kill != 0 -> rekeying */ pid_t pid; if ((pid = fork()) < 0) { fprintf(stderr, "Warning, could not fork the child process!\n"); @@ -1019,5 +1020,7 @@ openlog("vpnc", LOG_PID, LOG_DAEMON); } - vpnc_main_loop(&vpnpeer, &meth, tun_fd, (!opt_nd) ? pidfile : NULL); + do_kill = 0; + + return vpnc_main_loop(&vpnpeer, &meth, tun_fd, (!opt_nd) ? pidfile : NULL); } --- vpnc-0.3.3/config.h.rekeying 2005-05-01 22:06:45.000000000 +0200 +++ vpnc-0.3.3/config.h 2006-03-09 18:33:04.000000000 +0100 @@ -44,6 +44,8 @@ CONFIG_UDP_ENCAP, CONFIG_UDP_ENCAP_PORT, CONFIG_DISABLE_NATT, + CONFIG_NAT_KEEPALIVE, + CONFIG_REKEY_INTERVAL, LAST_CONFIG }; @@ -60,6 +62,8 @@ extern int opt_1des; extern int opt_udpencap; extern uint16_t opt_udpencapport; +extern int opt_nat_keepalive; +extern int opt_rekey_interval; #define DEBUG(lvl, a) do {if (opt_debug >= (lvl)) {a;}} while (0) --- vpnc-0.3.3/vpnc.h.rekeying 2004-11-22 01:11:55.000000000 +0100 +++ vpnc-0.3.3/vpnc.h 2006-03-09 18:33:04.000000000 +0100 @@ -46,8 +46,6 @@ uint8_t *current_iv; uint8_t our_address[4], our_netmask[4]; uint32_t tous_esp_spi, tothem_esp_spi; - uint8_t *kill_packet; - size_t kill_packet_size; uint16_t peer_udpencap_port; int do_pfs; }; Index: generic-vpnc.conf =================================================================== RCS file: /cvs/extras/rpms/vpnc/devel/generic-vpnc.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- generic-vpnc.conf 20 Dec 2004 20:46:38 -0000 1.1 +++ generic-vpnc.conf 9 Mar 2006 17:42:53 -0000 1.2 @@ -1,5 +1,7 @@ #IPSec gateway my.vpn.gateway #IPSec ID my.ipsec.id #IPSec secret mysecret -# your username goes here +# your username goes here: #Xauth username +# if you want to test rekeying specify nonzero seconds here: +#Rekeying interval 0 Index: vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vpnc.spec 15 Feb 2006 17:58:56 -0000 1.11 +++ vpnc.spec 9 Mar 2006 17:42:53 -0000 1.12 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.3.3 -Release: 6 +Release: 7 Summary: IPSec VPN client compatible with Cisco equipment @@ -13,7 +13,8 @@ Patch1: vpnc-0.3.3-sbin-path.patch Patch2: vpnc-0.3.3-ip-output.patch Patch3: vpnc-0.3.3-no-srcport.patch -Patch4: vpnc-0.3.3-disconnect.patch +Patch4: vpnc-0.3.3-rekeying.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel > 1.1.90 @@ -31,7 +32,7 @@ %patch1 -p1 -b .sbin-path %patch2 -p1 -b .ip-output %patch3 -p1 -b .no-srcport -%patch4 -p1 -b .disconnect +%patch4 -p1 -b .rekeying %build make PREFIX=/usr @@ -64,6 +65,11 @@ %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup %changelog +* Thu Mar 9 2006 Tomas Mraz 0.3.3-7 +- add basic rekeying support (the patch includes NAT keepalive support + by Brian Downing) +- dropped disconnect patch (solved differently) + * Wed Feb 15 2006 Tomas Mraz 0.3.3-6 - rebuild with new gcc --- vpnc-0.3.3-disconnect.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 9 18:18:58 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 13:18:58 -0500 Subject: rpms/perl-pmtools/devel perl-pmtools.spec,1.4,1.5 Message-ID: <200603091819.k29IJUG0009189@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9172 Modified Files: perl-pmtools.spec Log Message: Rebuild for FC5 (perl 5.8.8). Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/devel/perl-pmtools.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-pmtools.spec 22 Dec 2005 19:29:52 -0000 1.4 +++ perl-pmtools.spec 9 Mar 2006 18:18:58 -0000 1.5 @@ -1,12 +1,12 @@ Name: perl-pmtools Version: 1.00 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries License: Artistic Url: http://language.perl.com/ -Source: http://history.perl.org/src/pmtools-1.00.tar.gz +Source: http://history.perl.org/src/pmtools-%{version}.tar.gz Patch1: pmtools-1.00-different-tarball.patch Patch2: pmtools-1.00-pmall.patch Patch3: pmtools-1.00-pmeth-pman2pmman.patch @@ -14,7 +14,7 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This is pmtools -- a suite of small programs to help manage modules. @@ -47,7 +47,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -65,6 +65,9 @@ %changelog +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.00-4 +- Rebuild for FC5 (perl 5.8.8). + * Thu Dec 22 2005 Jose Pedro Oliveira - 1.00-3 - Dist tag. From fedora-extras-commits at redhat.com Thu Mar 9 18:22:52 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 9 Mar 2006 13:22:52 -0500 Subject: rpms/banshee/devel banshee.spec,1.4,1.5 Message-ID: <200603091823.k29INOms009314@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9263 Modified Files: banshee.spec Log Message: * Thu Mar 9 2006 Christopher Aillon 0.10.7-2 - Add explicit Requires on libipoddevice (#184482) Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- banshee.spec 7 Mar 2006 19:57:34 -0000 1.4 +++ banshee.spec 9 Mar 2006 18:22:51 -0000 1.5 @@ -1,6 +1,6 @@ Name: banshee Version: 0.10.7 -Release: 1 +Release: 2 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -23,6 +23,8 @@ BuildRequires: gstreamer-plugins-base-devel >= 0.10 BuildRequires: gnome-desktop-devel BuildRequires: nautilus-cd-burner-devel + +Requires: libipoddevice Requires(post): GConf2 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -97,6 +99,9 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Thu Mar 9 2006 Christopher Aillon 0.10.7-2 +- Add explicit Requires on libipoddevice (#184482) + * Tue Mar 7 2006 Christopher Aillon 0.10.7-1 - Update to 0.10.7 - Fix build on x86-64 From fedora-extras-commits at redhat.com Thu Mar 9 18:24:35 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 13:24:35 -0500 Subject: rpms/perl-SNMP_Session/devel perl-SNMP_Session.spec,1.3,1.4 Message-ID: <200603091825.k29IP7ZL009385@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-SNMP_Session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9368 Modified Files: perl-SNMP_Session.spec Log Message: Rebuild for FC5 (perl 5.8.8). Index: perl-SNMP_Session.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/perl-SNMP_Session.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-SNMP_Session.spec 29 Dec 2005 01:51:22 -0000 1.3 +++ perl-SNMP_Session.spec 9 Mar 2006 18:24:35 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-SNMP_Session Version: 1.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SNMP support for Perl 5 Group: Development/Libraries @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Pure Perl SNMP v1 and SNMP v2 support for Perl 5. @@ -53,6 +53,9 @@ %changelog +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.08-2 +- Rebuild for FC5 (perl 5.8.8). + * Thu Dec 29 2005 Jose Pedro Oliveira - 1.08-1 - Update to 1.08. From fedora-extras-commits at redhat.com Thu Mar 9 18:34:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 13:34:01 -0500 Subject: rpms/pdfjam/devel pdfjam.spec,1.3,1.4 Message-ID: <200603091834.k29IYXvB009462@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/pdfjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9445 Modified Files: pdfjam.spec Log Message: Rebuild for FC5. Index: pdfjam.spec =================================================================== RCS file: /cvs/extras/rpms/pdfjam/devel/pdfjam.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pdfjam.spec 14 May 2005 01:54:16 -0000 1.3 +++ pdfjam.spec 9 Mar 2006 18:34:00 -0000 1.4 @@ -1,6 +1,6 @@ Name: pdfjam Version: 1.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utilities for join, rotate and align PDFs Group: Applications/Publishing @@ -58,6 +58,9 @@ %changelog +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.20-4 +- Rebuild for FC5. + * Sat May 14 2005 Jose Pedro Oliveira - 1.20-3 - Add dist tag. From fedora-extras-commits at redhat.com Thu Mar 9 19:09:08 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 9 Mar 2006 14:09:08 -0500 Subject: rpms/snort/devel .cvsignore, 1.3, 1.4 snort.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200603091909.k29J9fRS011555@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11532 Modified Files: .cvsignore snort.spec sources Log Message: update to 2.4.4 Fixes CVE-2006-0839 Security update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/snort/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Feb 2006 02:12:01 -0000 1.3 +++ .cvsignore 9 Mar 2006 19:09:07 -0000 1.4 @@ -1 +1 @@ -snort-2.4.3.tar.gz +snort-2.4.4.tar.gz Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- snort.spec 17 Feb 2006 02:06:16 -0000 1.5 +++ snort.spec 9 Mar 2006 19:09:08 -0000 1.6 @@ -1,6 +1,6 @@ Summary: Intrusion detection system Name: snort -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -112,6 +112,10 @@ Please see the documentation in %{_docdir}/%{name}-%{version} +There are no rules in this package the license they are released under forbids +us from repackaging them and redistributing them. + + %description plain+flexresp Snort compiled with flexresp support. Requires libnet rpm. @@ -148,14 +152,9 @@ %setup -q %patch0 -p1 -b .config -%build -#touch -r . * -#aclocal -#automake -#rm -rf building && mkdir -p building && cd building +%build -#export AM_CFLAGS="-g -O2" SNORT_BASE_CONFIG="--prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ --with-libpcap-includes=/usr/include/pcap" @@ -165,8 +164,6 @@ # plain { -#mkdir plain -#cd plain %configure $SNORT_BASE_CONFIG --with-mysql=no \ --with-postgresql=no \ --with-oracle=no \ @@ -174,8 +171,6 @@ make %{?_smp_mflags} mv src/snort snort-plain -# make distclean -#cd .. } # plain+flexresp @@ -187,7 +182,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp -# make distclean } # mysql+flexresp @@ -199,7 +193,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp -# make distclean } # mysql @@ -210,7 +203,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql -# make distclean } @@ -224,7 +216,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp -# make distclean } # postgresql @@ -235,7 +226,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql -# make distclean } # snmp @@ -249,7 +239,6 @@ make %{?_smp_mflags} mv src/snort snort-snmp -# make distclean } @@ -401,6 +390,10 @@ %changelog +* Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 +- Update to 2.4.4 +- Fixes CVE-2006-0839 + * Thu Feb 16 2006 Dennis Gilmore - 2.4.3-1 - Updated to 2.4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/snort/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Feb 2006 02:12:01 -0000 1.3 +++ sources 9 Mar 2006 19:09:08 -0000 1.4 @@ -1 +1 @@ -5c3c8c69f2459bbe0c1f2057966c88a7 snort-2.4.3.tar.gz +9dc9060d1f2e248663eceffadfc45e7e snort-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 19:11:25 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 9 Mar 2006 14:11:25 -0500 Subject: rpms/snort/FC-3 .cvsignore, 1.3, 1.4 snort.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603091911.k29JBvfN011632@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11607 Modified Files: .cvsignore snort.spec sources Log Message: Update to 2.4.4 Fixes CVE-2006-0839 Security update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/snort/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Feb 2006 02:18:37 -0000 1.3 +++ .cvsignore 9 Mar 2006 19:11:25 -0000 1.4 @@ -1 +1 @@ -snort-2.4.3.tar.gz +snort-2.4.4.tar.gz Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-3/snort.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- snort.spec 17 Feb 2006 02:18:37 -0000 1.4 +++ snort.spec 9 Mar 2006 19:11:25 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Intrusion detection system Name: snort -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -112,6 +112,10 @@ Please see the documentation in %{_docdir}/%{name}-%{version} +There are no rules in this package the license they are released under forbids +us from repackaging them and redistributing them. + + %description plain+flexresp Snort compiled with flexresp support. Requires libnet rpm. @@ -148,14 +152,9 @@ %setup -q %patch0 -p1 -b .config -%build -#touch -r . * -#aclocal -#automake -#rm -rf building && mkdir -p building && cd building +%build -#export AM_CFLAGS="-g -O2" SNORT_BASE_CONFIG="--prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ --with-libpcap-includes=/usr/include/pcap" @@ -165,8 +164,6 @@ # plain { -#mkdir plain -#cd plain %configure $SNORT_BASE_CONFIG --with-mysql=no \ --with-postgresql=no \ --with-oracle=no \ @@ -174,8 +171,6 @@ make %{?_smp_mflags} mv src/snort snort-plain -# make distclean -#cd .. } # plain+flexresp @@ -187,7 +182,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp -# make distclean } # mysql+flexresp @@ -199,7 +193,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp -# make distclean } # mysql @@ -210,7 +203,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql -# make distclean } @@ -224,7 +216,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp -# make distclean } # postgresql @@ -235,7 +226,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql -# make distclean } # snmp @@ -249,7 +239,6 @@ make %{?_smp_mflags} mv src/snort snort-snmp -# make distclean } @@ -401,6 +390,10 @@ %changelog +* Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 +- Update to 2.4.4 +- Fixes CVE-2006-0839 + * Thu Feb 16 2006 Dennis Gilmore - 2.4.3-1 - Updated to 2.4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/snort/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Feb 2006 02:18:37 -0000 1.3 +++ sources 9 Mar 2006 19:11:25 -0000 1.4 @@ -1 +1 @@ -5c3c8c69f2459bbe0c1f2057966c88a7 snort-2.4.3.tar.gz +9dc9060d1f2e248663eceffadfc45e7e snort-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 19:12:38 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 9 Mar 2006 14:12:38 -0500 Subject: rpms/snort/FC-4 .cvsignore, 1.3, 1.4 snort.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200603091913.k29JDAra011715@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11685 Modified Files: .cvsignore snort.spec sources Log Message: Update to 2.4.4 Fixes CVE-2006-0839 Security update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/snort/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Feb 2006 02:16:48 -0000 1.3 +++ .cvsignore 9 Mar 2006 19:12:38 -0000 1.4 @@ -1 +1 @@ -snort-2.4.3.tar.gz +snort-2.4.4.tar.gz Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-4/snort.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- snort.spec 17 Feb 2006 02:16:48 -0000 1.5 +++ snort.spec 9 Mar 2006 19:12:38 -0000 1.6 @@ -1,6 +1,6 @@ Summary: Intrusion detection system Name: snort -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -112,6 +112,10 @@ Please see the documentation in %{_docdir}/%{name}-%{version} +There are no rules in this package the license they are released under forbids +us from repackaging them and redistributing them. + + %description plain+flexresp Snort compiled with flexresp support. Requires libnet rpm. @@ -148,14 +152,9 @@ %setup -q %patch0 -p1 -b .config -%build -#touch -r . * -#aclocal -#automake -#rm -rf building && mkdir -p building && cd building +%build -#export AM_CFLAGS="-g -O2" SNORT_BASE_CONFIG="--prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ --with-libpcap-includes=/usr/include/pcap" @@ -165,8 +164,6 @@ # plain { -#mkdir plain -#cd plain %configure $SNORT_BASE_CONFIG --with-mysql=no \ --with-postgresql=no \ --with-oracle=no \ @@ -174,8 +171,6 @@ make %{?_smp_mflags} mv src/snort snort-plain -# make distclean -#cd .. } # plain+flexresp @@ -187,7 +182,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp -# make distclean } # mysql+flexresp @@ -199,7 +193,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp -# make distclean } # mysql @@ -210,7 +203,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql -# make distclean } @@ -224,7 +216,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp -# make distclean } # postgresql @@ -235,7 +226,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql -# make distclean } # snmp @@ -249,7 +239,6 @@ make %{?_smp_mflags} mv src/snort snort-snmp -# make distclean } @@ -401,6 +390,10 @@ %changelog +* Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 +- Update to 2.4.4 +- Fixes CVE-2006-0839 + * Thu Feb 16 2006 Dennis Gilmore - 2.4.3-1 - Updated to 2.4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/snort/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Feb 2006 02:16:48 -0000 1.3 +++ sources 9 Mar 2006 19:12:38 -0000 1.4 @@ -1 +1 @@ -5c3c8c69f2459bbe0c1f2057966c88a7 snort-2.4.3.tar.gz +9dc9060d1f2e248663eceffadfc45e7e snort-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 19:42:13 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:42:13 -0500 Subject: rpms/cmucl - New directory Message-ID: <200603091942.k29JgFqu012061@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12053/cmucl Log Message: Directory /cvs/extras/rpms/cmucl added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 19:42:19 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:42:19 -0500 Subject: rpms/cmucl/devel - New directory Message-ID: <200603091942.k29JgLZN012076@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12053/cmucl/devel Log Message: Directory /cvs/extras/rpms/cmucl/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 19:42:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:42:30 -0500 Subject: rpms/cmucl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603091942.k29JgW8Z012110@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12098 Added Files: Makefile import.log Log Message: Setup of module cmucl --- NEW FILE Makefile --- # Top level Makefile for module cmucl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 9 19:42:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:42:36 -0500 Subject: rpms/cmucl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603091942.k29JgcdS012133@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12098/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cmucl --- NEW 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 Mar 9 19:43:25 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:43:25 -0500 Subject: rpms/cmucl import.log,1.1,1.2 Message-ID: <200603091943.k29JhvJ2012255@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12213 Modified Files: import.log Log Message: auto-import cmucl-19c-3 on branch devel from cmucl-19c-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cmucl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Mar 2006 19:42:30 -0000 1.1 +++ import.log 9 Mar 2006 19:43:24 -0000 1.2 @@ -0,0 +1 @@ +cmucl-19c-3:HEAD:cmucl-19c-3.src.rpm:1141933401 From fedora-extras-commits at redhat.com Thu Mar 9 19:43:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:43:30 -0500 Subject: rpms/cmucl/devel cmucl-19c-motif-shared.patch, NONE, 1.1 cmucl-19c-optflags.patch, NONE, 1.1 cmucl-19c-x86-linux.tar.bz2.asc, NONE, 1.1 cmucl-src-19c.tar.bz2.asc, NONE, 1.1 cmucl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603091944.k29Ji3b1012259@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12213/devel Modified Files: .cvsignore sources Added Files: cmucl-19c-motif-shared.patch cmucl-19c-optflags.patch cmucl-19c-x86-linux.tar.bz2.asc cmucl-src-19c.tar.bz2.asc cmucl.spec Log Message: auto-import cmucl-19c-3 on branch devel from cmucl-19c-3.src.rpm cmucl-19c-motif-shared.patch: --- NEW FILE cmucl-19c-motif-shared.patch --- --- cmucl-19/src/motif/server/Config.x86.motif-shared 2004-04-26 07:07:36.000000000 -0500 +++ cmucl-19/src/motif/server/Config.x86 2004-08-04 12:59:32.209585248 -0500 @@ -1,6 +1,6 @@ -CFLAGS = -O2 -I/usr/X11R6/include -I. -I$(VPATH) +CFLAGS = -O2 $(RPM_OPT_FLAGS) -I/usr/X11R6/include -I. -I$(VPATH) LDFLAGS = -L/usr/X11R6/lib -LIBS = -static -lXm -dynamic -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread +LIBS = -lXm # This def assumes you are building in the same or parallel # tree to the CVS souce layout. Sites may need to customize # this path. cmucl-19c-optflags.patch: --- NEW FILE cmucl-19c-optflags.patch --- --- cmucl-19c/src/lisp/Config.linux_gencgc.optflags 2005-09-19 23:02:28.000000000 -0500 +++ cmucl-19c/src/lisp/Config.linux_gencgc 2005-10-21 07:20:49.000000000 -0500 @@ -21,7 +21,7 @@ RUNTIME = $(GENCGC) $(LINKAGE) # __NO_CTYPE so builds on glibc 2.3 will run on (some) older glibc's. CPPFLAGS = -D__NO_CTYPE -I. -I$(PATH1) -I- -I/usr/X11R6/include $(RUNTIME) -CFLAGS = -rdynamic -Wstrict-prototypes -Wall -g $(RUNTIME) +CFLAGS = -rdynamic -Wstrict-prototypes -Wall -g $(RUNTIME) $(RPM_OPT_FLAGS) ASFLAGS = -g -DGENCGC -DLINKAGE_TABLE NM = $(PATH1)/linux-nm UNDEFSYMPATTERN = -Xlinker -u -Xlinker & --- NEW FILE cmucl-19c-x86-linux.tar.bz2.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (GNU/Linux) iD8DBQBDfJXwJ5IjUmgZO7IRAk5HAKCjvV5A2aHv8bid3blfx0dDCLU5JQCdHXU4 VKW3qWwzUh8WvMhDDLOUwpw= =M+N3 -----END PGP SIGNATURE----- --- NEW FILE cmucl-src-19c.tar.bz2.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (SunOS) iD8DBQBDelYZJ5IjUmgZO7IRAjAPAJ9Ew+EDs40AdupM6vQKY12c4qonjgCffUsu LrTEUqp+fuCkQYsCUOdjTnY= =/60F -----END PGP SIGNATURE----- --- NEW FILE cmucl.spec --- Summary: CMU Common Lisp compiler Name: cmucl Version: 19c Release: 3%{?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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} ## ix86 section %ifarch %{ix86} %define cmucl_arch x86 #define bootstrap cmucl #define bootstrap_pkg 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 %define bootstrap_src -a 10 %else BuildRequires: %{?bootstrap_pkg} %endif %endif Patch1: cmucl-19c-motif-shared.patch Patch2: cmucl-19c-optflags.patch BuildRequires: sed >= 4.0 BuildRequires: openmotif-devel BuildRequires: time BuildRequires: bc %description CMUCL is a free, high performance implementation of the Common Lisp programming language which runs on most major Unix platforms. It mainly conforms to the ANSI Common Lisp standard. CMUCL provides a sophisticated native code compiler; a powerful foreign function interface; an implementation of CLOS, the Common Lisp Object System, which includes multimethods and a metaobject protocol; a source-level debugger and code profiler; and an Emacs-like editor implemented in Common Lisp. CMUCL is maintained by a team of volunteers collaborating over the Internet, and is mostly in the public domain. %package extras Summary: Extra tools and libraries for CMU Common Lisp Group: Development/Languages Requires: %{name} = %{version}-%{release} %description extras %{summary}. # Not used...yet %if 0 %package devel Summary: Development files for %{name} Group: Development/Languages Requires: %{name} = %{version}-%{release} %description devel %{summary}. %endif %prep %setup -q -c %{name}-%{version} %{?bootstrap_src} %patch1 -p1 -b .motif-shared %patch2 -p1 -b .optflags %build %if 1 ## Simple build method ./src/tools/build.sh \ -b %{_target_platform} \ -C "linux_gencgc %{cmucl_arch}" \ -v "%{version} Fedora Extras release %{release}" \ %{!?bootstrap:-o "bin/lisp -noinit -batch"} # make binary dist archives ./src/tools/make-dist.sh %{_target_platform}-4 %{version} %{cmucl_arch} linux %else ## OLD complicated build method (but needed sometimes, e.g. cross-compiling) # Create target buildroot ./src/tools/create-target.sh %{_target_platform} linux_gencgc %{cmucl_arch} # Use binary-dist lisp to create initial kernel.core ./src/tools/build-world.sh %{_target_platform} %{!?bootstrap:bin/lisp} # build native lisp binary ./src/tools/rebuild-lisp.sh %{_target_platform} # Generate lisp.core ./src/tools/load-world.sh %{_target_platform} "%{version} Fedora Extras release %{release}" # rebuild kernel.core using native lisp ./src/tools/build-world.sh %{_target_platform} %{_target_platform}/lisp/lisp # (Re)generate lisp.core ./src/tools/load-world.sh %{_target_platform} "%{version} Fedora Extras release %{release}" # Build auxilary stuff ./src/tools/build-utils.sh %{_target_platform} # make binary dist archives ./src/tools/make-dist.sh %{_target_platform} %{version} %{cmucl_arch} linux %endif %install rm -rf $RPM_BUILD_ROOT mkdir -p dist pushd dist # unarchive newly creating binary dist archives tar xvzf ../cmucl-%{version}-%{cmucl_arch}-linux.tar.gz tar xvzf ../cmucl-%{version}-%{cmucl_arch}-linux.extra.tar.gz mkdir -p $RPM_BUILD_ROOT%{_libdir}/cmucl/ cp -a bin $RPM_BUILD_ROOT%{_libdir}/cmucl/ cp -a lib/cmucl $RPM_BUILD_ROOT%{_libdir}/ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -p man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1/ popd ## Setup app-wrapper install -m755 -p -D $RPM_BUILD_ROOT%{_libdir}/cmucl/sample-wrapper $RPM_BUILD_ROOT%{_bindir}/cmucl # Fixup paths in wrapper sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=%{_libdir}/cmucl/lib|" $RPM_BUILD_ROOT%{_bindir}/cmucl sed -i -e "s|/<>|%{_libdir}/cmucl|" $RPM_BUILD_ROOT%{_bindir}/cmucl # ln -sf cmucl $RPM_BUILD_ROOT%{_bindir}/cmulisp # many apps (ie, maxima) expect to find the wrapper named 'lisp' too ln -sf cmucl $RPM_BUILD_ROOT%{_bindir}/lisp ## Unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/cmucl/sample-wrapper %files %defattr(-,root,root) %doc dist/doc/cmucl/README dist/doc/cmucl/release*.txt %{_bindir}/cmucl %{_bindir}/cmulisp %{_bindir}/lisp %dir %{_libdir}/cmucl %{_libdir}/cmucl/internals.inc %{_libdir}/cmucl/bin/ %dir %{_libdir}/cmucl/lib %{_libdir}/cmucl/lib/lisp.core %{_libdir}/cmucl/lib/load-foreign.csh %{_libdir}/cmucl/lib/config %{_libdir}/cmucl/lib/config.lisp %{_libdir}/cmucl/lib/generic-site.lisp %dir %{_libdir}/cmucl/lib/subsystems %{_libdir}/cmucl/lib/subsystems/gray-*-library.* %{_libdir}/cmucl/lib/subsystems/iodefs-library.* %{_libdir}/cmucl/lib/subsystems/simple-*-library.* %{_libdir}/cmucl/lisp.nm %{_libdir}/cmucl/lisp.map %{_libdir}/cmucl/internals.h %{_mandir}/man1/* %files extras %defattr(-,root,root) %{_libdir}/cmucl/lib/subsystems/clx-library.* %{_libdir}/cmucl/lib/subsystems/hemlock-library.* %{_libdir}/cmucl/lib/subsystems/clm-library.* %{_libdir}/cmucl/lib/XKeysymDB %{_libdir}/cmucl/lib/hemlock11.cursor %{_libdir}/cmucl/lib/hemlock11.mask %{_libdir}/cmucl/lib/spell-dictionary.bin %{_libdir}/cmucl/lib/mh-scan %{_libdir}/cmucl/lib/motifd ## Not sure what to include, if anything. ?? -- Rex #files devel #defattr(-,root,root) %clean rm -rf $RPM_BUILD_ROOT %changelog * Wed Mar 08 2006 Rex Dieter 19c-3 - License: +MIT - BR: bc, time * Fri Dec 02 2005 Rex Dieter 19c-2 - 19c (final) * Fri Oct 21 2005 Rex Dieter 19c-1.pre - cleanup shared-motif patch - use simpler build.sh script * Fri Oct 21 2005 Rex Dieter 19c-0.pre1 - 19c-pre1 - drop upstreamed gcc4 patch - drop unused setarch/personality bits * Fri Oct 07 2005 Rex Dieter 19b-5 - use known-to-be-good cmucl-19a for bootstrap (19b has issues) - drop personalility patch (not needed afterall) * Mon Sep 19 2005 Rex Dieter 19b-4 - move (re)exec/personality call runprog.c -> lisp.c (in main() ) - optflags patch - better gcc4 patch - use my_setarch.c instead of setarch * Tue Sep 13 2005 Rex Dieter 19b-3 - ADDR_NO_RANDOMIZE patch - gcc4 patch * Fri Aug 26 2005 Rex Dieter 19b-2 - use setarch - -extras subpkg * Thu Aug 16 2005 Rex Dieter 19b-1 - 19b release - cleanup for Fedora Extras * Thu Aug 26 2004 Rex Dieter 0:19-0.fdr.2.a - Fix Release: 19e -> 19a * Wed Aug 04 2004 Rex Dieter 0:19-0.fdr.1.a - cmucl-19a release - nix -extras subpkg, for now * Tue Mar 30 2004 Rex Dieter 0:18-0.fdr.2.e - remove extraneous macros - include URL's for all Source's. * Fri Oct 10 2003 Rex Dieter 0:18-0.fdr.1.e - first try. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cmucl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2006 19:42:36 -0000 1.1 +++ .cvsignore 9 Mar 2006 19:43:30 -0000 1.2 @@ -0,0 +1,2 @@ +cmucl-19c-x86-linux.tar.bz2 +cmucl-src-19c.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cmucl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2006 19:42:36 -0000 1.1 +++ sources 9 Mar 2006 19:43:30 -0000 1.2 @@ -0,0 +1,2 @@ +04bf7da2a49a309080bf504d0b1e8c28 cmucl-19c-x86-linux.tar.bz2 +c791f18c764e3c21970fecbbfb5b4524 cmucl-src-19c.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 9 19:50:34 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:50:34 -0500 Subject: rpms/nomadsync - New directory Message-ID: <200603091950.k29Joaes012394@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12386/nomadsync Log Message: Directory /cvs/extras/rpms/nomadsync added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 19:50:40 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:50:40 -0500 Subject: rpms/nomadsync/devel - New directory Message-ID: <200603091950.k29Jog3h012409@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12386/nomadsync/devel Log Message: Directory /cvs/extras/rpms/nomadsync/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 19:50:57 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:50:57 -0500 Subject: rpms/nomadsync Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603091950.k29JoxnW012443@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12431 Added Files: Makefile import.log Log Message: Setup of module nomadsync --- NEW FILE Makefile --- # Top level Makefile for module nomadsync all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 9 19:51:03 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:51:03 -0500 Subject: rpms/nomadsync/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603091951.k29Jp5Bs012463@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12431/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nomadsync --- NEW 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 Mar 9 19:52:56 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:52:56 -0500 Subject: rpms/nomadsync import.log,1.1,1.2 Message-ID: <200603091953.k29JrSnW012549@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12514 Modified Files: import.log Log Message: auto-import nomadsync-0.4.2-8 on branch devel from nomadsync-0.4.2-8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nomadsync/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Mar 2006 19:50:57 -0000 1.1 +++ import.log 9 Mar 2006 19:52:56 -0000 1.2 @@ -0,0 +1 @@ +nomadsync-0_4_2-8:HEAD:nomadsync-0.4.2-8.src.rpm:1141933968 From fedora-extras-commits at redhat.com Thu Mar 9 19:53:02 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:53:02 -0500 Subject: rpms/nomadsync/devel nomadsync.desktop, NONE, 1.1 nomadsync.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603091953.k29JrYtA012553@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12514/devel Modified Files: .cvsignore sources Added Files: nomadsync.desktop nomadsync.spec Log Message: auto-import nomadsync-0.4.2-8 on branch devel from nomadsync-0.4.2-8.src.rpm --- NEW FILE nomadsync.desktop --- [Desktop Entry] Name=Nomadsync Name[sv]=Nomadsync GenericName=Nomad/Zen Jukebox/Dell DJ Synchronization utility GenericName[sv]=Klient f??r Nomad/Zen/Dell DJ Jukebox synkronisering Comment=A tool for managing Creative Nomad/Zen Jukeboxes and Dell DJs Comment[sv]=Ett verktyg f??r att synkronisera Creative Nomad/Zen Jukebox:ar och Dell DJ-spelare Exec=nomadsync Terminal=false Type=Application Icon=nomadsync-logo.png Categories=Application;AudioVideo; Encoding=UTF-8 --- NEW FILE nomadsync.spec --- # SPEC file for nomadsync, primary target is the Fedora Extras # RPM repository. # # For testing a certain distribution, rely on macros that # you define in your ".rpmmacros" file. For example, for # test building a Fedora Extras package, define the following # two macros in .rpmmacros: # # %dist .fc5 # %fedora 5 # Name: nomadsync Version: 0.4.2 Release: 8%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils Requires(postun): desktop-file-utils BuildRequires: libusb-devel BuildRequires: libnjb-devel BuildRequires: id3lib-devel BuildRequires: gawk BuildRequires: desktop-file-utils # This will pull in the apropriate wxGTK version BuildRequires: %{_bindir}/wxgtk-2.4-config %description This package provides an application to synchronize music trees with Creative NOMAD Jukebox, Creative Zen and Dell DJ line of MP3 players. %prep %setup -q -n %{name} %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # Install that icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps install -p -m 644 doc/camelHead.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/nomadsync-logo.png # Add distro-specifics to .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} # Remove erroneous desktop file directory rm -rf $RPM_BUILD_ROOT/Utilities # Fixup permissions chmod 644 ChangeLog authors copying readme install # Fix end-of-line encoding %{__sed} -i 's?\r??' ChangeLog %{__sed} -i 's?\r??' readme %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database %{_datadir}/applications &> /dev/null %postun if [ "$1" = "0" ]; then update-desktop-database %{_datadir}/applications &> /dev/null fi %files %defattr(-, root, root, -) %{_bindir}/nomadsync %{_datadir}/pixmaps/nomadsync-logo.png %{_datadir}/applications/*.desktop %doc ChangeLog authors copying readme %changelog * Wed Mar 8 2006 Linus Walleij 0.4.2-8 - New sources, do not re-tar the file. * Tue Mar 7 2006 Linus Walleij 0.4.2-7 - Detect wxGTK 2.4.x in a smarter way. * Sun Jan 15 2006 Linus Walleij 0.4.2-6 - Making a compat choice for FC5 and beyond. * Mon Dec 19 2005 Linus Walleij 0.4.2-5 - Fixing in response to reviewers comments. * Sat Nov 16 2005 Linus Walleij 0.4.2-4 - Added a desktop file by way of Source1-parameter instead. * Sat Oct 15 2005 Linus Walleij 0.4.2-3 - Added a desktop file. * Fri Oct 14 2005 Linus Walleij 0.4.2-2 - Tweaks and fixes to dependencies. * Thu Oct 06 2005 Brent Norris 0.4.2-1 - First RPM'ed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2006 19:51:02 -0000 1.1 +++ .cvsignore 9 Mar 2006 19:53:02 -0000 1.2 @@ -0,0 +1 @@ +nomadsync-0.4.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2006 19:51:02 -0000 1.1 +++ sources 9 Mar 2006 19:53:02 -0000 1.2 @@ -0,0 +1 @@ +fd55927c54cd0737cdecb88e4bfbf0b7 nomadsync-0.4.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 19:59:28 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 14:59:28 -0500 Subject: rpms/perl-DBD-SQLite/devel perl-DBD-SQLite.spec,1.7,1.8 Message-ID: <200603092000.k29K01KU012635@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12616 Modified Files: perl-DBD-SQLite.spec Log Message: - DBD::SQLite fails to build with the current FC-5 sqlite version (3.3.3); see bugzilla entry #183530. Forcing package rebuild with the included version of sqlite (3.2.7). Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-DBD-SQLite.spec 18 Feb 2006 16:26:19 -0000 1.7 +++ perl-DBD-SQLite.spec 9 Mar 2006 19:59:28 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite Version: 1.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries @@ -33,7 +33,7 @@ %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor +CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor USE_LOCAL_SQLITE=1 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" @@ -63,6 +63,11 @@ %changelog +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.11-3 +- DBD::SQLite fails to build with the current FC-5 sqlite version (3.3.3); + see bugzilla entry #183530. + Forcing package rebuild with the included version of sqlite (3.2.7). + * Sat Feb 18 2006 Jose Pedro Oliveira - 1.11-2 - Rebuild for FC5 (perl 5.8.8). From fedora-extras-commits at redhat.com Thu Mar 9 20:12:34 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 15:12:34 -0500 Subject: owners owners.list,1.726,1.727 Message-ID: <200603092013.k29KD6wJ014630@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14613 Modified Files: owners.list Log Message: Added nomadsync. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.726 retrieving revision 1.727 diff -u -r1.726 -r1.727 --- owners.list 9 Mar 2006 02:00:49 -0000 1.726 +++ owners.list 9 Mar 2006 20:12:33 -0000 1.727 @@ -738,6 +738,7 @@ Fedora Extras|ngrep|Network layer grep tool|oliver at linux-kernel.at|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|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| Fedora Extras|notecase|A hierarchical note manager|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|notemeister|Notemeister is a small, simple note organizer made for the GNOME2 desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 9 20:21:28 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 9 Mar 2006 15:21:28 -0500 Subject: fedora-release fedora-core.repo, 1.1, 1.2 fedora-development.repo, 1.2, 1.3 fedora-extras-development.repo, 1.1, 1.2 fedora-extras.repo, 1.3, 1.4 fedora-updates.repo, 1.6, 1.7 Message-ID: <200603092021.k29KLSHM014734@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14699 Modified Files: fedora-core.repo fedora-development.repo fedora-extras-development.repo fedora-extras.repo fedora-updates.repo Log Message: enable the right repos Index: fedora-core.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-core.repo 15 Feb 2006 19:58:10 -0000 1.1 +++ fedora-core.repo 9 Mar 2006 20:21:21 -0000 1.2 @@ -2,7 +2,7 @@ name=Fedora Core $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os/ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-$releasever -enabled=0 +enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-development.repo 2 Mar 2006 17:15:07 -0000 1.2 +++ fedora-development.repo 9 Mar 2006 20:21:21 -0000 1.3 @@ -27,7 +27,7 @@ name=Fedora Core - Development #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide -enabled=1 +enabled=0 gpgcheck=0 [development-debuginfo] Index: fedora-extras-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-extras-development.repo 15 Feb 2006 20:01:52 -0000 1.1 +++ fedora-extras-development.repo 9 Mar 2006 20:21:21 -0000 1.2 @@ -2,7 +2,7 @@ name=Fedora Extras - Development Tree #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel -enabled=1 +enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-extras.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-extras.repo 15 Feb 2006 19:58:10 -0000 1.3 +++ fedora-extras.repo 9 Mar 2006 20:21:21 -0000 1.4 @@ -2,7 +2,7 @@ name=Fedora Extras $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-$releasever -enabled=0 +enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-updates.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fedora-updates.repo 15 Feb 2006 19:58:10 -0000 1.6 +++ fedora-updates.repo 9 Mar 2006 20:21:21 -0000 1.7 @@ -2,7 +2,7 @@ name=Fedora Core $releasever - $basearch - Updates #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/ mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc$releasever -enabled=0 +enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora From fedora-extras-commits at redhat.com Thu Mar 9 20:27:34 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 9 Mar 2006 15:27:34 -0500 Subject: rpms/qps/FC-4 .cvsignore,1.4,1.5 qps.spec,1.4,1.5 sources,1.4,1.5 Message-ID: <200603092028.k29KS67f014816@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14778/FC-4 Modified Files: .cvsignore qps.spec sources Log Message: Update to 1.9.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Feb 2006 19:55:18 -0000 1.4 +++ .cvsignore 9 Mar 2006 20:27:34 -0000 1.5 @@ -1 +1 @@ -qps-1.9.12.tar.gz +qps-1.9.13.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/qps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qps.spec 22 Feb 2006 19:55:18 -0000 1.4 +++ qps.spec 9 Mar 2006 20:27:34 -0000 1.5 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.12 +Version: 1.9.13 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3208/qps-1.9.12.tar.gz +Source0: http://kldp.net/frs/download.php/3228/qps-1.9.13.tar.gz Source1: qps.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %changelog +* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 +- Update to 1.9.13 + * Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 - Update to 1.9.12 - Add COPYING file Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Feb 2006 19:55:18 -0000 1.4 +++ sources 9 Mar 2006 20:27:34 -0000 1.5 @@ -1 +1 @@ -8a42863a1fa6de1d40f031f6787198f7 qps-1.9.12.tar.gz +4db5051d7880e3cf427b06319dd55676 qps-1.9.13.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 20:27:40 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 9 Mar 2006 15:27:40 -0500 Subject: rpms/qps/devel .cvsignore,1.5,1.6 qps.spec,1.5,1.6 sources,1.5,1.6 Message-ID: <200603092028.k29KSCUW014821@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14778/devel Modified Files: .cvsignore qps.spec sources Log Message: Update to 1.9.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Feb 2006 20:57:59 -0000 1.5 +++ .cvsignore 9 Mar 2006 20:27:40 -0000 1.6 @@ -1 +1 @@ -qps-1.9.12.tar.gz +qps-1.9.13.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qps.spec 22 Feb 2006 20:57:59 -0000 1.5 +++ qps.spec 9 Mar 2006 20:27:40 -0000 1.6 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.12 +Version: 1.9.13 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3208/qps-1.9.12.tar.gz +Source0: http://kldp.net/frs/download.php/3228/qps-1.9.13.tar.gz Source1: qps.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %changelog +* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 +- Update to 1.9.13 + * Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 - Update to 1.9.12 - Drop gcc41.patch (pushed upstream) Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Feb 2006 20:57:59 -0000 1.5 +++ sources 9 Mar 2006 20:27:40 -0000 1.6 @@ -1 +1 @@ -8a42863a1fa6de1d40f031f6787198f7 qps-1.9.12.tar.gz +4db5051d7880e3cf427b06319dd55676 qps-1.9.13.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 20:54:38 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 9 Mar 2006 15:54:38 -0500 Subject: fedora-release fedora-release.spec,1.22,1.23 Message-ID: <200603092054.k29KsctV015272@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15254 Modified Files: fedora-release.spec Log Message: no autorun this time around, only one eula, fix the repo config Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fedora-release.spec 8 Mar 2006 21:29:45 -0000 1.22 +++ fedora-release.spec 9 Mar 2006 20:54:31 -0000 1.23 @@ -7,7 +7,7 @@ Summary: Fedora Core release file Name: fedora-release Version: %{real_release_version} -Release: 2 +Release: 4 License: GFDL Group: System Environment/Base Source: fedora-release-%{real_release_version}.tar.gz @@ -112,7 +112,7 @@ %config(noreplace) /etc/sysconfig/rhn/sources %config(noreplace) /etc/yum.repos.d/* %doc R* stylesheet-images figs *.css -%doc eula.txt GPL autorun-template +%doc eula.txt GPL %doc about %config %attr(0644,root,root) /etc/issue %config %attr(0644,root,root) /etc/issue.net From fedora-extras-commits at redhat.com Thu Mar 9 20:58:46 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 15:58:46 -0500 Subject: rpms/cmucl/devel cmucl.spec,1.1,1.2 Message-ID: <200603092059.k29KxI7P015325@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15308 Modified Files: cmucl.spec Log Message: * Thu Mar 09 2006 Rex Dieter 19c-4 - move bootstrap source outside of %ifarch block Index: cmucl.spec =================================================================== RCS file: /cvs/extras/rpms/cmucl/devel/cmucl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cmucl.spec 9 Mar 2006 19:43:30 -0000 1.1 +++ cmucl.spec 9 Mar 2006 20:58:46 -0000 1.2 @@ -2,7 +2,7 @@ Summary: CMU Common Lisp compiler Name: cmucl Version: 19c -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain/MIT Group: Development/Languages @@ -13,13 +13,13 @@ ExclusiveArch: %{ix86} ## ix86 section +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 %ifarch %{ix86} %define cmucl_arch x86 #define bootstrap cmucl #define bootstrap_pkg 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 %define bootstrap_src -a 10 %else BuildRequires: %{?bootstrap_pkg} @@ -184,6 +184,9 @@ %changelog +* Thu Mar 09 2006 Rex Dieter 19c-4 +- move bootstrap source outside of %%ifarch block + * Wed Mar 08 2006 Rex Dieter 19c-3 - License: +MIT - BR: bc, time From fedora-extras-commits at redhat.com Thu Mar 9 21:00:53 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 16:00:53 -0500 Subject: owners owners.list,1.727,1.728 Message-ID: <200603092101.k29L1P0a017281@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15412 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.727 retrieving revision 1.728 diff -u -r1.727 -r1.728 --- owners.list 9 Mar 2006 20:12:33 -0000 1.727 +++ owners.list 9 Mar 2006 21:00:52 -0000 1.728 @@ -126,6 +126,7 @@ Fedora Extras|clearsilver|HTML template system|fedora at soeterbroek.com|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|cmucl|CMU Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at redhat.com|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|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 9 21:37:43 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 16:37:43 -0500 Subject: rpms/maxima/devel maxima.spec,1.18,1.19 Message-ID: <200603092138.k29LcFa0017460@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17443 Modified Files: maxima.spec Log Message: * Thu Mar 09 2006 Rex Dieter 5.9.2-12 - enable runtime-cmucl (%ix86 only, atm) Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- maxima.spec 9 Mar 2006 02:24:24 -0000 1.18 +++ maxima.spec 9 Mar 2006 21:37:42 -0000 1.19 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -17,10 +17,13 @@ %define _with_default_lisp --with-default-lisp=clisp +%ifarch %{ix86} +# cmucl review (done): http://bugzilla.redhat.com/bugzilla/166796 +%define _enable_cmucl --enable-cmucl +%endif + %ifarch %{ix86} x86_64 %define _enable_clisp --enable-clisp -# cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796 -#define _enable_cmucl --enable-cmucl # gcl *was* not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026 %define _enable_gcl --enable-gcl %define _enable_sbcl --enable-sbcl @@ -354,6 +357,9 @@ %changelog +* Thu Mar 09 2006 Rex Dieter 5.9.2-12 +- enable runtime-cmucl (%%ix86 only, atm) + * Wed Mar 08 2006 Rex Dieter 5.9.2-11 - fc5: enable runtime-gcl - runtime-sbcl: Requires: sbcl = %%{sbcl_version_used_to_build} From fedora-extras-commits at redhat.com Fri Mar 10 01:29:43 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 9 Mar 2006 20:29:43 -0500 Subject: rpms/lib765 import.log,1.3,1.4 Message-ID: <200603100130.k2A1UF3X026592@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26556 Modified Files: import.log Log Message: auto-import lib765-0.3.3-5 on branch devel from lib765-0.3.3-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lib765/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 7 Mar 2006 19:05:23 -0000 1.3 +++ import.log 10 Mar 2006 01:29:42 -0000 1.4 @@ -1,2 +1,3 @@ lib765-0_3_3-3:HEAD:lib765-0.3.3-3.src.rpm:1137113910 lib765-0_3_3-4:HEAD:lib765-0.3.3-4.src.rpm:1141758291 +lib765-0_3_3-5:HEAD:lib765-0.3.3-5.src.rpm:1141954170 From fedora-extras-commits at redhat.com Fri Mar 10 01:29:50 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 9 Mar 2006 20:29:50 -0500 Subject: rpms/lib765/devel lib765.spec,1.2,1.3 Message-ID: <200603100130.k2A1UM9K026595@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26556/devel Modified Files: lib765.spec Log Message: auto-import lib765-0.3.3-5 on branch devel from lib765-0.3.3-5.src.rpm Index: lib765.spec =================================================================== RCS file: /cvs/extras/rpms/lib765/devel/lib765.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lib765.spec 7 Mar 2006 19:05:31 -0000 1.2 +++ lib765.spec 10 Mar 2006 01:29:49 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A library for emulating the uPD765a floppy controller Name: lib765 Version: 0.3.3 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.seasip.demon.co.uk/Unix/LibDsk/lib765-%{version}.tar.gz @@ -16,7 +16,7 @@ %package devel Summary: Development files for lib765. Group: Development/Libraries -Requires: libdsk-devel, lib765=%{version}-%{release} +Requires: libdsk-devel, %{name}=%{version}-%{release} %description devel Development files for lib765. @@ -51,6 +51,9 @@ %exclude %{_libdir}/lib765.la %changelog +* Thu Mar 9 2006 Paul F. Johnson 0.3.3-5 +- Bug in the spec file means it didn't compile. + * Tue Mar 7 2006 Paul F. Johnson 0.3.3-4 - Added Require for devel package From fedora-extras-commits at redhat.com Fri Mar 10 03:50:18 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 9 Mar 2006 22:50:18 -0500 Subject: rpms/rssowl/devel rssowl.spec,1.4,1.5 Message-ID: <200603100350.k2A3ooPn031174@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/rssowl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31157 Modified Files: rssowl.spec Log Message: Revision 11. Rebuild with new compiler. Index: rssowl.spec =================================================================== RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rssowl.spec 7 Feb 2006 23:49:18 -0000 1.4 +++ rssowl.spec 10 Mar 2006 03:50:17 -0000 1.5 @@ -1,6 +1,6 @@ %define name rssowl %define version 1.2 -%define release 10%{?dist} +%define release 11%{?dist} %define jdk java Name: %name @@ -138,6 +138,9 @@ %{_libdir}/gcj/%{name} %changelog +* Thu Mar 9 2006 Anthony Green - 1.2-11 +- Rebuild with new compiler. + * Tue Feb 7 2006 Anthony Green - 1.2-10 - Fix swt jar reference in build-jar-repository. From fedora-extras-commits at redhat.com Fri Mar 10 04:51:09 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 9 Mar 2006 23:51:09 -0500 Subject: rpms/deskbar-applet/FC-4 .cvsignore, 1.2, 1.3 deskbar-applet.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200603100451.k2A4pftv000878@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv857 Modified Files: .cvsignore deskbar-applet.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Mar 2005 16:59:04 -0000 1.2 +++ .cvsignore 10 Mar 2006 04:51:08 -0000 1.3 @@ -1 +1 @@ -deskbar-applet-0.2.tar.gz +deskbar-applet-0.8.4.tar.gz Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/FC-4/deskbar-applet.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- deskbar-applet.spec 7 Apr 2005 00:12:03 -0000 1.5 +++ deskbar-applet.spec 10 Mar 2006 04:51:08 -0000 1.6 @@ -1,15 +1,17 @@ +%{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: deskbar-applet -Version: 0.2 -Release: 4 +Version: 0.8.4 +Release: 1%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet License: GPL URL: http://browserbookapp.sourceforge.net/deskbar.html -Source0: http://prdownloads.sourceforge.net/browserbookapp/deskbar-applet-0.2.tar.gz +Source0: http://dl.sourceforge.net/browserbookapp/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf -BuildArch: noarch +BuildRequires: gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel gnome-python2-applet +Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2 %description This applet looks like the current Gnome Mini-Commander, but it launches search @@ -28,22 +30,34 @@ %setup -q %build +%configure +make %{_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -install -D -m 0755 deskbar-applet.py $RPM_BUILD_ROOT%{_libexecdir}/deskbar-applet.py -install -D -m 0644 DeskbarApplet.server $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/DeskbarApplet.server +make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; +%{find_lang} %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang +%defattr(-,root,root,-) %defattr(-,root,root,-) -%doc CHANGELOG LICENCE README -%{_libexecdir}/deskbar-applet.py -%{_libdir}/bonobo/servers/DeskbarApplet.server +%doc AUTHORS ChangeLog COPYING README +%{_sysconfdir}/gconf/schemas/%{name}.schemas +%{_libdir}/%{name} +%{_libdir}/bonobo/servers/Deskbar_Applet.server +%{_libdir}/pkgconfig/%{name}.pc +%{python_sitelib}/deskbar +%{_datadir}/%{name} +%{_datadir}/pixmaps/%{name}.png %changelog +* Thu Mar 9 2006 Ignacio Vazquez-Abrams 0.8.4-1 +- Upstream update + * Thu Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Mar 2005 16:59:04 -0000 1.2 +++ sources 10 Mar 2006 04:51:08 -0000 1.3 @@ -1 +1 @@ -051558aa867073aa901dc1049ae0ae12 deskbar-applet-0.2.tar.gz +590ac908dd8890aef9492aabf0a0c78a deskbar-applet-0.8.4.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 07:52:10 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 02:52:10 -0500 Subject: rpms/m17n-db/devel README, NONE, 1.1 Makefile, 1.1, NONE m17n-db.spec, 1.2, NONE sources, 1.2, NONE Message-ID: <200603100752.k2A7qCoS007233@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-db/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7195 Added Files: README Removed Files: Makefile m17n-db.spec sources Log Message: m17n-db is now in Fedora Core. --- NEW FILE README --- m17n-db has moved to Fedora Core as of FC5. --- Makefile DELETED --- --- m17n-db.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 09:04:28 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 04:04:28 -0500 Subject: rpms/m17n-db/FC-4 bn-itrans-t-182227.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 m17n-db.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603100905.k2A951rd011566@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-db/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11541 Modified Files: .cvsignore m17n-db.spec sources Added Files: bn-itrans-t-182227.patch Log Message: sync with Core: - Bengali input maps fixes (runab) - map Probhat '*' key to an alternate sequence since glyph missing (#179821) - more itrans cleanup (#182227) - add icon for Tamil99 (aalam) * Thu Mar 2 2006 Jens Petersen - 1.3.3-1 - update to 1.3.3 bugfix release - fixes to Bengali, Hindi, and Punjabi maps (runab, aalam) - Tamil phonetic map now works - new Tamil99 Government Standard map (I Felix) * Tue Feb 14 2006 Jens Petersen - 1.3.2-2 - add Indian input maps ported from scim-tables - add Nepali subpackage * Fri Feb 10 2006 Jens Petersen - 1.3.2-1 - update to 1.3.2 bugfix release - do not include ja-anthy.mim input map * Thu Feb 2 2006 Jens Petersen - 1.3.1-1 - update to 1.3.1 release - add new icons to language subpackages - new common-cjk subpackage for CJK common files - new Swedish subpackage - exclude new pkgconfig file bn-itrans-t-182227.patch: --- NEW FILE bn-itrans-t-182227.patch --- --- m17n-db-1.3.3/bn-itrans.mim.1 2006-02-03 20:47:17.000000000 +0900 +++ m17n-db-1.3.3/bn-itrans.mim 2006-03-09 17:20:41.000000000 +0900 @@ -61,7 +61,7 @@ ("D" "??????") ("Dh" "??????") ("N" "??????") - ("t" "??????") + ("t" "???") ("th" "??????") ("d" "??????") ("dh" "??????") @@ -100,16 +100,10 @@ ("U" "???") ("RRi" "???") ("R^i" "???") - ("LLi" "???") ; not in ITRANS Bengali table - ("L^i" "???") ; not in ITRANS Bengali table ("e" "???") ("ai" "???") ("o" "???") ("au" "???") - ("RRI" "???") ; not in ITRANS Bengali table - ("R^I" "???") ; not in ITRANS Bengali table - ("LLI" "???") ; not in ITRANS Bengali table - ("L^I" "???") ; not in ITRANS Bengali table (".N" "???") (".n" "???") ("M" "???") ; not in ITRANS Bengali table @@ -126,10 +120,6 @@ ("7" "???") ("8" "???") ("9" "???") - ("#" "??????") ; not in ITRANS Bengali table - ("$" "??????") ; not in ITRANS Bengali table - ("^" "?????????") ; not in ITRANS Bengali table - ("*" "?????????") ; not in ITRANS Bengali table ("]" "???") ; not in ITRANS Bengali table ((S-\ ) "???") ; not in ITRANS Bengali table ((C-@) "???")) ; not in ITRANS Bengali table @@ -146,16 +136,10 @@ ("U" (delete @-) "???") ("RRi" (delete @-) "???") ("R^i" (delete @-) "???") - ("LLi" (delete @-) "???") ; not in ITRANS Bengali table - ("L^i" (delete @-) "???") ; not in ITRANS Bengali table ("e" (delete @-) "???") ("ai" (delete @-) "???") ("o" (delete @-) "???") - ("au" (delete @-) "???") - ("RRI" (delete @-) "???") ; not in ITRANS Bengali table - ("R^I" (delete @-) "???") ; not in ITRANS Bengali table - ("LLI" (delete @-) "???") ; not in ITRANS Bengali table - ("L^I" (delete @-) "???")) ; not in ITRANS Bengali table + ("au" (delete @-) "???")) (return ((Return))) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 04:22:07 -0000 1.2 +++ .cvsignore 10 Mar 2006 09:04:26 -0000 1.3 @@ -1 +1,2 @@ -m17n-db-1.2.0.tar.gz +m17n-db-1.3.3.tar.gz +m17n-db-indic-0.3.1.tar.gz Index: m17n-db.spec =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-4/m17n-db.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- m17n-db.spec 11 Nov 2005 04:39:17 -0000 1.2 +++ m17n-db.spec 10 Mar 2006 09:04:26 -0000 1.3 @@ -1,13 +1,15 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.2.0 +Version: 1.3.3 Release: 1%{?dist} Group: System Environment/Libraries License: LGPL URL: http://www.m17n.org/m17n-lib/index.html Source0: %{name}-%{version}.tar.gz +Source1: %{name}-indic-0.3.1.tar.gz BuildArch: noarch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: bn-itrans-t-182227.patch %description This package contains multilingualization (m17n) datafiles for m17n-lib @@ -23,6 +25,14 @@ m17n-db datafiles not needed for using the input maps. +%package common-cjk +Summary: m17n-db common files for CJK input +Group: System Environment/Libraries + +%description common-cjk +m17n-db common files for Chinese, Japanese and Korean input maps. + + %package amharic Summary: m17n-db input table for Amharic Group: System Environment/Libraries @@ -74,6 +84,7 @@ %package chinese Summary: m17n-db input table for Chinese Group: System Environment/Libraries +Requires: %{name}-common-cjk %description chinese m17n-db Chinese input map. @@ -186,6 +197,7 @@ %package korean Summary: m17n-db input table for Korean Group: System Environment/Libraries +Requires: %{name}-common-cjk %description korean m17n-db Korean input map. @@ -223,6 +235,14 @@ m17n-db Myanmar input map. +%package nepali +Summary: m17n-db input tables for Nepali +Group: System Environment/Libraries + +%description nepali +m17n-db Nepali input maps. + + %package oriya Summary: m17n-db input table for Oriya Group: System Environment/Libraries @@ -271,6 +291,14 @@ m17n-db Slovak input map. +%package swedish +Summary: m17n-db input table for Swedish +Group: System Environment/Libraries + +%description swedish +m17n-db Swedish input map. + + %package syriac Summary: m17n-db input table for Syriac Group: System Environment/Libraries @@ -320,8 +348,8 @@ %prep -%setup -q - +%setup -q -a1 +%patch1 -p1 -b .1 %build %configure @@ -332,9 +360,16 @@ rm -rf $RPM_BUILD_ROOT %makeinstall -# don't need ispell -rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim +# add new Indic maps +cp -p %{name}-indic/*.mim $RPM_BUILD_ROOT%{_datadir}/m17n +cp -p %{name}-indic/*.png $RPM_BUILD_ROOT%{_datadir}/m17n/icons + +# don't need ispell or anthy +rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png} +rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ja-anthy.mim,icons/ja-anthy.png} +# drop pkgconfig file for now +rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/m17n-db.pc %clean rm -rf $RPM_BUILD_ROOT @@ -347,6 +382,7 @@ %dir %{_datadir}/m17n %{_datadir}/m17n/mdb.dir %{_datadir}/m17n/*.tbl +%{_datadir}/m17n/command.mim %files datafiles %defattr(-,root,root) @@ -357,231 +393,319 @@ %{_datadir}/m17n/*.tab %{_datadir}/m17n/LOCALE.* +%files common-cjk +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/cjk-*.mim +%{_datadir}/m17n/variable.mim + %files amharic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/am-*.mim +%{_datadir}/m17n/icons/am-*.png %files arabic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ar-*.mim +%{_datadir}/m17n/icons/ar-*.png %files armenian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hy-*.mim +%{_datadir}/m17n/icons/hy-*.png %files assamese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/as-*.mim +%{_datadir}/m17n/icons/as-*.png %files bengali %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bn-*.mim +%{_datadir}/m17n/icons/bn-*.png %files bopomofo %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bopo-*.mim +%{_datadir}/m17n/icons/bopo-*.png %files chinese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/zh-*.mim +%{_datadir}/m17n/icons/zh-*.png %files croatian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hr-*.mim +%{_datadir}/m17n/icons/hr-*.png %files dhivehi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/dv-*.mim +%{_datadir}/m17n/icons/dv-*.png %files farsi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/fa-*.mim +%{_datadir}/m17n/icons/fa-*.png %files generic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/rfc1345.mim +%{_datadir}/m17n/icons/rfc1345.png %{_datadir}/m17n/unicode.mim +%{_datadir}/m17n/icons/unicode.png %files georgian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ka-*.mim +%{_datadir}/m17n/icons/ka-*.png %files greek %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/el-*.mim +%{_datadir}/m17n/icons/el-*.png %files gujarati %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/gu-*.mim +%{_datadir}/m17n/icons/gu-*.png %files hebrew %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/he-*.mim +%{_datadir}/m17n/icons/he-*.png %files hindi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hi-*.mim +%{_datadir}/m17n/icons/hi-*.png %files japanese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ja-*.mim +%{_datadir}/m17n/icons/ja-*.png %files kazakh %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/kk-*.mim +%{_datadir}/m17n/icons/kk-*.png %files khmer %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/km-*.mim +%{_datadir}/m17n/icons/km-*.png %files kannada %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/kn-*.mim +%{_datadir}/m17n/icons/kn-*.png %files korean %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ko-*.mim +%{_datadir}/m17n/icons/ko-*.png %files lao %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/lo-*.mim +%{_datadir}/m17n/icons/lo-*.png %files latin %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/latn-*.mim +%{_datadir}/m17n/icons/latn-*.png %files malayalam %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ml-*.mim +%{_datadir}/m17n/icons/ml-*.png %files myanmar %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/my-*.mim +%{_datadir}/m17n/icons/my-*.png + + +%files nepali +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/ne-*.mim +%{_datadir}/m17n/icons/ne-*.png %files oriya %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/or-*.mim +%{_datadir}/m17n/icons/or-*.png %files punjabi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/pa-*.mim +%{_datadir}/m17n/icons/pa-*.png %files russian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ru-*.mim +%{_datadir}/m17n/icons/ru-*.png %files serbian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/sr-*.mim +%{_datadir}/m17n/icons/sr-*.png %files sinhala %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/si-*.mim +%{_datadir}/m17n/icons/si-*.png %files slovak %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/sk-*.mim +%{_datadir}/m17n/icons/sk-*.png + + +%files swedish +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/sv-*.mim +%{_datadir}/m17n/icons/sv-*.png %files syriac %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/syrc-*.mim +%{_datadir}/m17n/icons/syrc-*.png %files tamil %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ta-*.mim +%{_datadir}/m17n/icons/ta-*.png %files telugu %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/te-*.mim +%{_datadir}/m17n/icons/te-*.png %files thai %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/th-*.mim +%{_datadir}/m17n/icons/th-*.png %files tibetan %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bo-*.mim +%{_datadir}/m17n/icons/bo-*.png %files vietnamese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/vi-*.mim +%{_datadir}/m17n/icons/vi-*.png %changelog +* Thu Mar 9 2006 Jens Petersen - 1.3.3-1.fc4 +- Bengali input maps fixes (runab) + - map Probhat '*' key to an alternate sequence since glyph missing (#179821) + - more itrans cleanup (#182227) +- add icon for Tamil99 (aalam) + +* Thu Mar 2 2006 Jens Petersen - 1.3.3-1 +- update to 1.3.3 bugfix release +- fixes to Bengali, Hindi, and Punjabi maps (runab, aalam) +- Tamil phonetic map now works +- new Tamil99 Government Standard map (I Felix) + +* Tue Feb 14 2006 Jens Petersen - 1.3.2-2 +- add Indian input maps ported from scim-tables +- add Nepali subpackage + +* Fri Feb 10 2006 Jens Petersen - 1.3.2-1 +- update to 1.3.2 bugfix release +- do not include ja-anthy.mim input map + +* Thu Feb 2 2006 Jens Petersen - 1.3.1-1 +- update to 1.3.1 release + - add new icons to language subpackages + - new common-cjk subpackage for CJK common files + - new Swedish subpackage + - exclude new pkgconfig file + +* Fri Dec 16 2005 Jens Petersen - 1.2.0-2 +- import to Fedora Core + * Wed Nov 9 2005 Jens Petersen - 1.2.0-1 - separate output datafiles to datafiles subpackage. @@ -591,5 +715,5 @@ * Sat Sep 24 2005 Jens Petersen - split .mim input tables into separate subpackages per language -* Sat Jan 15 2005 UTUMI Hirosi - 1.2.0-2.fdr.ut +* Sat Jan 15 2005 UTUMI Hirosi - modify spec for fedora Index: sources =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 04:22:07 -0000 1.2 +++ sources 10 Mar 2006 09:04:26 -0000 1.3 @@ -1 +1,2 @@ -de2a5ded6800a3744e8df0d665d1ffe5 m17n-db-1.2.0.tar.gz +a2aec22334c108565cc466d80a66292c m17n-db-1.3.3.tar.gz +2af3a9684965617273c5d9c2162acc4e m17n-db-indic-0.3.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 09:32:47 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 04:32:47 -0500 Subject: rpms/m17n-db/FC-3 bn-itrans-t-182227.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 m17n-db.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603100933.k2A9XK7J012051@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-db/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12001 Modified Files: .cvsignore m17n-db.spec sources Added Files: bn-itrans-t-182227.patch Log Message: sync with FC-4: - Bengali input maps fixes (runab) - map Probhat '*' key to an alternate sequence since glyph missing (#179821) - more itrans cleanup (#182227) - add icon for Tamil99 (aalam) * Thu Mar 2 2006 Jens Petersen - 1.3.3-1 - update to 1.3.3 bugfix release - fixes to Bengali, Hindi, and Punjabi maps (runab, aalam) - Tamil phonetic map now works - new Tamil99 Government Standard map (I Felix) * Tue Feb 14 2006 Jens Petersen - 1.3.2-2 - add Indian input maps ported from scim-tables - add Nepali subpackage * Fri Feb 10 2006 Jens Petersen - 1.3.2-1 - update to 1.3.2 bugfix release - do not include ja-anthy.mim input map * Thu Feb 2 2006 Jens Petersen - 1.3.1-1 - update to 1.3.1 release - add new icons to language subpackages - new common-cjk subpackage for CJK common files - new Swedish subpackage - exclude new pkgconfig file bn-itrans-t-182227.patch: --- NEW FILE bn-itrans-t-182227.patch --- --- m17n-db-1.3.3/bn-itrans.mim.1 2006-02-03 20:47:17.000000000 +0900 +++ m17n-db-1.3.3/bn-itrans.mim 2006-03-09 17:20:41.000000000 +0900 @@ -61,7 +61,7 @@ ("D" "??????") ("Dh" "??????") ("N" "??????") - ("t" "??????") + ("t" "???") ("th" "??????") ("d" "??????") ("dh" "??????") @@ -100,16 +100,10 @@ ("U" "???") ("RRi" "???") ("R^i" "???") - ("LLi" "???") ; not in ITRANS Bengali table - ("L^i" "???") ; not in ITRANS Bengali table ("e" "???") ("ai" "???") ("o" "???") ("au" "???") - ("RRI" "???") ; not in ITRANS Bengali table - ("R^I" "???") ; not in ITRANS Bengali table - ("LLI" "???") ; not in ITRANS Bengali table - ("L^I" "???") ; not in ITRANS Bengali table (".N" "???") (".n" "???") ("M" "???") ; not in ITRANS Bengali table @@ -126,10 +120,6 @@ ("7" "???") ("8" "???") ("9" "???") - ("#" "??????") ; not in ITRANS Bengali table - ("$" "??????") ; not in ITRANS Bengali table - ("^" "?????????") ; not in ITRANS Bengali table - ("*" "?????????") ; not in ITRANS Bengali table ("]" "???") ; not in ITRANS Bengali table ((S-\ ) "???") ; not in ITRANS Bengali table ((C-@) "???")) ; not in ITRANS Bengali table @@ -146,16 +136,10 @@ ("U" (delete @-) "???") ("RRi" (delete @-) "???") ("R^i" (delete @-) "???") - ("LLi" (delete @-) "???") ; not in ITRANS Bengali table - ("L^i" (delete @-) "???") ; not in ITRANS Bengali table ("e" (delete @-) "???") ("ai" (delete @-) "???") ("o" (delete @-) "???") - ("au" (delete @-) "???") - ("RRI" (delete @-) "???") ; not in ITRANS Bengali table - ("R^I" (delete @-) "???") ; not in ITRANS Bengali table - ("LLI" (delete @-) "???") ; not in ITRANS Bengali table - ("L^I" (delete @-) "???")) ; not in ITRANS Bengali table + ("au" (delete @-) "???")) (return ((Return))) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 04:22:07 -0000 1.2 +++ .cvsignore 10 Mar 2006 09:32:37 -0000 1.3 @@ -1 +1,2 @@ -m17n-db-1.2.0.tar.gz +m17n-db-1.3.3.tar.gz +m17n-db-indic-0.3.1.tar.gz Index: m17n-db.spec =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-3/m17n-db.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- m17n-db.spec 11 Nov 2005 04:39:17 -0000 1.2 +++ m17n-db.spec 10 Mar 2006 09:32:37 -0000 1.3 @@ -1,13 +1,15 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.2.0 +Version: 1.3.3 Release: 1%{?dist} Group: System Environment/Libraries License: LGPL URL: http://www.m17n.org/m17n-lib/index.html Source0: %{name}-%{version}.tar.gz +Source1: %{name}-indic-0.3.1.tar.gz BuildArch: noarch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: bn-itrans-t-182227.patch %description This package contains multilingualization (m17n) datafiles for m17n-lib @@ -23,6 +25,14 @@ m17n-db datafiles not needed for using the input maps. +%package common-cjk +Summary: m17n-db common files for CJK input +Group: System Environment/Libraries + +%description common-cjk +m17n-db common files for Chinese, Japanese and Korean input maps. + + %package amharic Summary: m17n-db input table for Amharic Group: System Environment/Libraries @@ -74,6 +84,7 @@ %package chinese Summary: m17n-db input table for Chinese Group: System Environment/Libraries +Requires: %{name}-common-cjk %description chinese m17n-db Chinese input map. @@ -186,6 +197,7 @@ %package korean Summary: m17n-db input table for Korean Group: System Environment/Libraries +Requires: %{name}-common-cjk %description korean m17n-db Korean input map. @@ -223,6 +235,14 @@ m17n-db Myanmar input map. +%package nepali +Summary: m17n-db input tables for Nepali +Group: System Environment/Libraries + +%description nepali +m17n-db Nepali input maps. + + %package oriya Summary: m17n-db input table for Oriya Group: System Environment/Libraries @@ -271,6 +291,14 @@ m17n-db Slovak input map. +%package swedish +Summary: m17n-db input table for Swedish +Group: System Environment/Libraries + +%description swedish +m17n-db Swedish input map. + + %package syriac Summary: m17n-db input table for Syriac Group: System Environment/Libraries @@ -320,8 +348,8 @@ %prep -%setup -q - +%setup -q -a1 +%patch1 -p1 -b .1 %build %configure @@ -332,9 +360,16 @@ rm -rf $RPM_BUILD_ROOT %makeinstall -# don't need ispell -rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim +# add new Indic maps +cp -p %{name}-indic/*.mim $RPM_BUILD_ROOT%{_datadir}/m17n +cp -p %{name}-indic/*.png $RPM_BUILD_ROOT%{_datadir}/m17n/icons + +# don't need ispell or anthy +rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png} +rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ja-anthy.mim,icons/ja-anthy.png} +# drop pkgconfig file for now +rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/m17n-db.pc %clean rm -rf $RPM_BUILD_ROOT @@ -347,6 +382,7 @@ %dir %{_datadir}/m17n %{_datadir}/m17n/mdb.dir %{_datadir}/m17n/*.tbl +%{_datadir}/m17n/command.mim %files datafiles %defattr(-,root,root) @@ -357,231 +393,319 @@ %{_datadir}/m17n/*.tab %{_datadir}/m17n/LOCALE.* +%files common-cjk +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/cjk-*.mim +%{_datadir}/m17n/variable.mim + %files amharic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/am-*.mim +%{_datadir}/m17n/icons/am-*.png %files arabic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ar-*.mim +%{_datadir}/m17n/icons/ar-*.png %files armenian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hy-*.mim +%{_datadir}/m17n/icons/hy-*.png %files assamese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/as-*.mim +%{_datadir}/m17n/icons/as-*.png %files bengali %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bn-*.mim +%{_datadir}/m17n/icons/bn-*.png %files bopomofo %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bopo-*.mim +%{_datadir}/m17n/icons/bopo-*.png %files chinese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/zh-*.mim +%{_datadir}/m17n/icons/zh-*.png %files croatian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hr-*.mim +%{_datadir}/m17n/icons/hr-*.png %files dhivehi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/dv-*.mim +%{_datadir}/m17n/icons/dv-*.png %files farsi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/fa-*.mim +%{_datadir}/m17n/icons/fa-*.png %files generic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/rfc1345.mim +%{_datadir}/m17n/icons/rfc1345.png %{_datadir}/m17n/unicode.mim +%{_datadir}/m17n/icons/unicode.png %files georgian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ka-*.mim +%{_datadir}/m17n/icons/ka-*.png %files greek %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/el-*.mim +%{_datadir}/m17n/icons/el-*.png %files gujarati %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/gu-*.mim +%{_datadir}/m17n/icons/gu-*.png %files hebrew %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/he-*.mim +%{_datadir}/m17n/icons/he-*.png %files hindi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hi-*.mim +%{_datadir}/m17n/icons/hi-*.png %files japanese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ja-*.mim +%{_datadir}/m17n/icons/ja-*.png %files kazakh %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/kk-*.mim +%{_datadir}/m17n/icons/kk-*.png %files khmer %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/km-*.mim +%{_datadir}/m17n/icons/km-*.png %files kannada %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/kn-*.mim +%{_datadir}/m17n/icons/kn-*.png %files korean %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ko-*.mim +%{_datadir}/m17n/icons/ko-*.png %files lao %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/lo-*.mim +%{_datadir}/m17n/icons/lo-*.png %files latin %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/latn-*.mim +%{_datadir}/m17n/icons/latn-*.png %files malayalam %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ml-*.mim +%{_datadir}/m17n/icons/ml-*.png %files myanmar %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/my-*.mim +%{_datadir}/m17n/icons/my-*.png + + +%files nepali +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/ne-*.mim +%{_datadir}/m17n/icons/ne-*.png %files oriya %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/or-*.mim +%{_datadir}/m17n/icons/or-*.png %files punjabi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/pa-*.mim +%{_datadir}/m17n/icons/pa-*.png %files russian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ru-*.mim +%{_datadir}/m17n/icons/ru-*.png %files serbian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/sr-*.mim +%{_datadir}/m17n/icons/sr-*.png %files sinhala %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/si-*.mim +%{_datadir}/m17n/icons/si-*.png %files slovak %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/sk-*.mim +%{_datadir}/m17n/icons/sk-*.png + + +%files swedish +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/sv-*.mim +%{_datadir}/m17n/icons/sv-*.png %files syriac %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/syrc-*.mim +%{_datadir}/m17n/icons/syrc-*.png %files tamil %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ta-*.mim +%{_datadir}/m17n/icons/ta-*.png %files telugu %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/te-*.mim +%{_datadir}/m17n/icons/te-*.png %files thai %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/th-*.mim +%{_datadir}/m17n/icons/th-*.png %files tibetan %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bo-*.mim +%{_datadir}/m17n/icons/bo-*.png %files vietnamese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/vi-*.mim +%{_datadir}/m17n/icons/vi-*.png %changelog +* Thu Mar 9 2006 Jens Petersen - 1.3.3-1.fc3 +- Bengali input maps fixes (runab) + - map Probhat '*' key to an alternate sequence since glyph missing (#179821) + - more itrans cleanup (#182227) +- add icon for Tamil99 (aalam) + +* Thu Mar 2 2006 Jens Petersen - 1.3.3-1 +- update to 1.3.3 bugfix release +- fixes to Bengali, Hindi, and Punjabi maps (runab, aalam) +- Tamil phonetic map now works +- new Tamil99 Government Standard map (I Felix) + +* Tue Feb 14 2006 Jens Petersen - 1.3.2-2 +- add Indian input maps ported from scim-tables +- add Nepali subpackage + +* Fri Feb 10 2006 Jens Petersen - 1.3.2-1 +- update to 1.3.2 bugfix release +- do not include ja-anthy.mim input map + +* Thu Feb 2 2006 Jens Petersen - 1.3.1-1 +- update to 1.3.1 release + - add new icons to language subpackages + - new common-cjk subpackage for CJK common files + - new Swedish subpackage + - exclude new pkgconfig file + +* Fri Dec 16 2005 Jens Petersen - 1.2.0-2 +- import to Fedora Core + * Wed Nov 9 2005 Jens Petersen - 1.2.0-1 - separate output datafiles to datafiles subpackage. @@ -591,5 +715,5 @@ * Sat Sep 24 2005 Jens Petersen - split .mim input tables into separate subpackages per language -* Sat Jan 15 2005 UTUMI Hirosi - 1.2.0-2.fdr.ut +* Sat Jan 15 2005 UTUMI Hirosi - modify spec for fedora Index: sources =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 04:22:07 -0000 1.2 +++ sources 10 Mar 2006 09:32:37 -0000 1.3 @@ -1 +1,2 @@ -de2a5ded6800a3744e8df0d665d1ffe5 m17n-db-1.2.0.tar.gz +a2aec22334c108565cc466d80a66292c m17n-db-1.3.3.tar.gz +2af3a9684965617273c5d9c2162acc4e m17n-db-indic-0.3.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 11:56:43 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 10 Mar 2006 06:56:43 -0500 Subject: rpms/convmv/devel .cvsignore, 1.2, 1.3 convmv.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200603101157.k2ABvFa7016430@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/convmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16407 Modified Files: .cvsignore convmv.spec sources Log Message: version 1.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Jan 2005 08:20:55 -0000 1.2 +++ .cvsignore 10 Mar 2006 11:56:42 -0000 1.3 @@ -1 +1 @@ -convmv-1.08.tar.gz +convmv-1.09.tar.gz Index: convmv.spec =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/convmv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- convmv.spec 6 Apr 2005 22:11:36 -0000 1.4 +++ convmv.spec 10 Mar 2006 11:56:42 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Convert filename encodings Name: convmv -Version: 1.08 -Release: 3 +Version: 1.09 +Release: 1 Group: Applications/System License: GPL @@ -37,6 +37,9 @@ %{_mandir}/man*/* %changelog +* Fri Mar 10 2006 Nils Philippsen +- version 1.09 + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Jan 2005 08:20:55 -0000 1.2 +++ sources 10 Mar 2006 11:56:42 -0000 1.3 @@ -1 +1 @@ -40707f82b1a9631fe715f68f94431d3a convmv-1.08.tar.gz +79e76800852866dedefc1aaf32ea69e9 convmv-1.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 12:37:05 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 10 Mar 2006 07:37:05 -0500 Subject: rpms/convmv/devel convmv.spec,1.5,1.6 Message-ID: <200603101237.k2ACbbuf018521@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/convmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18504 Modified Files: convmv.spec Log Message: use username in BuildRoot don't use PREFIX in %build Index: convmv.spec =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/convmv.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- convmv.spec 10 Mar 2006 11:56:42 -0000 1.5 +++ convmv.spec 10 Mar 2006 12:37:04 -0000 1.6 @@ -9,7 +9,7 @@ Source: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz BuildRequires: /usr/bin/md5sum BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This package contains the tool convmv with which you can convert the encodings @@ -20,7 +20,7 @@ %build md5sum -c MD5sums -make PREFIX=%{_prefix} +make make test %install From fedora-extras-commits at redhat.com Fri Mar 10 13:36:29 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 08:36:29 -0500 Subject: rpms/m17n-lib/devel README, NONE, 1.1 Makefile, 1.1, NONE m17n-lib-1.2.0-core-libs-only.patch, 1.1, NONE m17n-lib.spec, 1.2, NONE sources, 1.2, NONE Message-ID: <200603101336.k2ADaVQV021200@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-lib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21190 Added Files: README Removed Files: Makefile m17n-lib-1.2.0-core-libs-only.patch m17n-lib.spec sources Log Message: m17n-lib is now in Core. --- NEW FILE README --- m17n-lib has moved to Fedora Core as of FC5. --- Makefile DELETED --- --- m17n-lib-1.2.0-core-libs-only.patch DELETED --- --- m17n-lib.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 14:00:17 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 09:00:17 -0500 Subject: rpms/m17n-lib/FC-4 m17n-lib-nobuild-examples.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 m17n-lib.spec, 1.2, 1.3 sources, 1.2, 1.3 m17n-lib-1.2.0-core-libs-only.patch, 1.1, NONE Message-ID: <200603101400.k2AE0nd7021399@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-lib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21279 Modified Files: .cvsignore m17n-lib.spec sources Added Files: m17n-lib-nobuild-examples.patch Removed Files: m17n-lib-1.2.0-core-libs-only.patch Log Message: sync with Core: - update to 1.3.3 minor bugfix release * Fri Feb 10 2006 Jens Petersen - 1.3.2-1 - update to 1.3.2 bugfix release - m17n-lib-no-gui-headers.patch is now upstream * Thu Feb 2 2006 Jens Petersen - 1.3.1-1 - update to 1.3.1 release - rename use_otf and use_anthy macros to with_gui and with_examples - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch * Fri Dec 16 2005 Jens Petersen - 1.2.0-2 - buildrequire autoconf m17n-lib-nobuild-examples.patch: --- NEW FILE m17n-lib-nobuild-examples.patch --- --- m17n-lib-1.3.1/Makefile.am~ 2005-11-21 16:39:00.000000000 +0900 +++ m17n-lib-1.3.1/Makefile.am 2006-02-02 16:01:48.000000000 +0900 @@ -22,7 +22,7 @@ ## Process this file with Automake to create Makefile.in -SUBDIRS = src example +SUBDIRS = src bin_SCRIPTS = m17n-config Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 04:53:15 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:00:17 -0000 1.3 @@ -1 +1 @@ -m17n-lib-1.2.0.tar.gz +m17n-lib-1.3.3.tar.gz Index: m17n-lib.spec =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-4/m17n-lib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- m17n-lib.spec 15 Nov 2005 02:39:22 -0000 1.2 +++ m17n-lib.spec 10 Mar 2006 14:00:17 -0000 1.3 @@ -1,11 +1,11 @@ -# set to 1 to build with OpenType Font support -%define use_otf 0 -# set to 1 to build with anthy support -%define use_anthy 0 +# set to 1 to build with GUI and OpenType Font support +%define with_gui 0 +# set to 1 to build examples (including anthy support) +%define with_examples 0 Name: m17n-lib -Version: 1.2.0 -Release: 1%{?dist} +Version: 1.3.3 +Release: 0%{?dist} Summary: Multilingual text library Group: System Environment/Libraries @@ -15,16 +15,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: m17n-db -%if %{use_otf} +%if %{with_gui} BuildRequires: libxml2-devel, xorg-x11-devel BuildRequires: freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0 BuildRequires: libotf-devel >= %{libotf_version} +%else +BuildRequires: autoconf %endif -%if %{use_anthy} +%if %{with_examples} BuildRequires: anthy-devel %endif Requires: m17n-db -Patch1: m17n-lib-1.2.0-core-libs-only.patch +Patch2: m17n-lib-nobuild-examples.patch %description m17n-lib is a multilingual text library used primarily to allow @@ -42,14 +44,20 @@ %prep %setup -q -%if ! %{use_otf} -%patch1 -p1 -b .gui -autoreconf +%if ! %{with_examples} +%patch2 -p1 -b .examples %endif +# patch2 touches Makefile.am +autoreconf %build -%configure --disable-static +%configure --disable-static \ +%if ! %{with_gui} + --with-gui=no +%else + %{nil} +%endif make @@ -86,6 +94,22 @@ %changelog +* Thu Mar 2 2006 Jens Petersen - 1.3.3-0%{?dist} +- update to 1.3.3 minor bugfix release + +* Fri Feb 10 2006 Jens Petersen - 1.3.2-1 +- update to 1.3.2 bugfix release + - m17n-lib-no-gui-headers.patch is now upstream + +* Thu Feb 2 2006 Jens Petersen - 1.3.1-1 +- update to 1.3.1 release + - rename use_otf and use_anthy macros to with_gui and with_examples + - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch + with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch + +* Fri Dec 16 2005 Jens Petersen - 1.2.0-2 +- buildrequire autoconf + * Thu Nov 10 2005 Jens Petersen - 1.2.0-1 - do not build static lib and .la files (Warren Togami) Index: sources =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 04:53:15 -0000 1.2 +++ sources 10 Mar 2006 14:00:17 -0000 1.3 @@ -1 +1 @@ -215242775c67930e20597b2c7703acef m17n-lib-1.2.0.tar.gz +f07f9fb93506db439567f774290e4dd6 m17n-lib-1.3.3.tar.gz --- m17n-lib-1.2.0-core-libs-only.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 14:01:01 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Fri, 10 Mar 2006 09:01:01 -0500 Subject: rpms/rssowl/devel rssowl.script,1.3,1.4 rssowl.spec,1.5,1.6 Message-ID: <200603101401.k2AE1YTY023315@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/rssowl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21410 Modified Files: rssowl.script rssowl.spec Log Message: Revision 12. Fix script goof. Index: rssowl.script =================================================================== RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rssowl.script 7 Feb 2006 23:09:11 -0000 1.3 +++ rssowl.script 10 Mar 2006 14:01:01 -0000 1.4 @@ -5,9 +5,9 @@ # This makes the embedded browser work. if [ -z "$MOZILLA_FIVE_HOME" ]; then - XPCOM=$(ls -t /usr/lib64/mozilla-*/libxpcom.so|head -n1) + XPCOM=$(ls -t /usr/lib/mozilla-*/libxpcom.so|head -n1) export MOZILLA_FIVE_HOME=$(dirname $XPCOM) fi export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME -exec java -Djava.library.path=/usr/lib64/ -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.1.2.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.1.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.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.1.2.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.1.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rssowl.spec 10 Mar 2006 03:50:17 -0000 1.5 +++ rssowl.spec 10 Mar 2006 14:01:01 -0000 1.6 @@ -1,6 +1,6 @@ %define name rssowl %define version 1.2 -%define release 11%{?dist} +%define release 12%{?dist} %define jdk java Name: %name @@ -138,6 +138,9 @@ %{_libdir}/gcj/%{name} %changelog +* Fri Mar 10 2006 Anthony Green - 1.2-12 +- Fix script goof. + * Thu Mar 9 2006 Anthony Green - 1.2-11 - Rebuild with new compiler. From fedora-extras-commits at redhat.com Fri Mar 10 14:12:31 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 09:12:31 -0500 Subject: rpms/m17n-lib/FC-3 m17n-lib-nobuild-examples.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 m17n-lib.spec, 1.2, 1.3 sources, 1.2, 1.3 m17n-lib-1.2.0-core-libs-only.patch, 1.1, NONE Message-ID: <200603101413.k2AED3FX023458@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-lib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23430 Modified Files: .cvsignore m17n-lib.spec sources Added Files: m17n-lib-nobuild-examples.patch Removed Files: m17n-lib-1.2.0-core-libs-only.patch Log Message: sync with FC-4: - update to 1.3.3 minor bugfix release * Fri Feb 10 2006 Jens Petersen - 1.3.2-1 - update to 1.3.2 bugfix release - m17n-lib-no-gui-headers.patch is now upstream * Thu Feb 2 2006 Jens Petersen - 1.3.1-1 - update to 1.3.1 release - rename use_otf and use_anthy macros to with_gui and with_examples - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch * Fri Dec 16 2005 Jens Petersen - 1.2.0-2 - buildrequire autoconf m17n-lib-nobuild-examples.patch: --- NEW FILE m17n-lib-nobuild-examples.patch --- --- m17n-lib-1.3.1/Makefile.am~ 2005-11-21 16:39:00.000000000 +0900 +++ m17n-lib-1.3.1/Makefile.am 2006-02-02 16:01:48.000000000 +0900 @@ -22,7 +22,7 @@ ## Process this file with Automake to create Makefile.in -SUBDIRS = src example +SUBDIRS = src bin_SCRIPTS = m17n-config Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 04:53:15 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:12:29 -0000 1.3 @@ -1 +1 @@ -m17n-lib-1.2.0.tar.gz +m17n-lib-1.3.3.tar.gz Index: m17n-lib.spec =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-3/m17n-lib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- m17n-lib.spec 15 Nov 2005 02:41:48 -0000 1.2 +++ m17n-lib.spec 10 Mar 2006 14:12:29 -0000 1.3 @@ -1,11 +1,11 @@ -# set to 1 to build with OpenType Font support -%define use_otf 0 -# set to 1 to build with anthy support -%define use_anthy 0 +# set to 1 to build with GUI and OpenType Font support +%define with_gui 0 +# set to 1 to build examples (including anthy support) +%define with_examples 0 Name: m17n-lib -Version: 1.2.0 -Release: 1%{?dist} +Version: 1.3.3 +Release: 0%{?dist} Summary: Multilingual text library Group: System Environment/Libraries @@ -15,16 +15,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: m17n-db -%if %{use_otf} +%if %{with_gui} BuildRequires: libxml2-devel, xorg-x11-devel BuildRequires: freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0 BuildRequires: libotf-devel >= %{libotf_version} +%else +BuildRequires: autoconf %endif -%if %{use_anthy} +%if %{with_examples} BuildRequires: anthy-devel %endif Requires: m17n-db -Patch1: m17n-lib-1.2.0-core-libs-only.patch +Patch2: m17n-lib-nobuild-examples.patch %description m17n-lib is a multilingual text library used primarily to allow @@ -42,14 +44,20 @@ %prep %setup -q -%if ! %{use_otf} -%patch1 -p1 -b .gui -autoreconf +%if ! %{with_examples} +%patch2 -p1 -b .examples %endif +# patch2 touches Makefile.am +autoreconf %build -%configure --disable-static +%configure --disable-static \ +%if ! %{with_gui} + --with-gui=no +%else + %{nil} +%endif make @@ -86,6 +94,22 @@ %changelog +* Thu Mar 2 2006 Jens Petersen - 1.3.3-0%{?dist} +- update to 1.3.3 minor bugfix release + +* Fri Feb 10 2006 Jens Petersen - 1.3.2-1 +- update to 1.3.2 bugfix release + - m17n-lib-no-gui-headers.patch is now upstream + +* Thu Feb 2 2006 Jens Petersen - 1.3.1-1 +- update to 1.3.1 release + - rename use_otf and use_anthy macros to with_gui and with_examples + - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch + with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch + +* Fri Dec 16 2005 Jens Petersen - 1.2.0-2 +- buildrequire autoconf + * Thu Nov 10 2005 Jens Petersen - 1.2.0-1 - do not build static lib and .la files (Warren Togami) Index: sources =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 04:53:15 -0000 1.2 +++ sources 10 Mar 2006 14:12:29 -0000 1.3 @@ -1 +1 @@ -215242775c67930e20597b2c7703acef m17n-lib-1.2.0.tar.gz +f07f9fb93506db439567f774290e4dd6 m17n-lib-1.3.3.tar.gz --- m17n-lib-1.2.0-core-libs-only.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 14:15:32 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 10 Mar 2006 09:15:32 -0500 Subject: rpms/fish/devel fish-1.14.0-wutil.patch,NONE,1.1 fish.spec,1.5,1.6 Message-ID: <200603101416.k2AEG5Hn023603@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23553 Modified Files: fish.spec Added Files: fish-1.14.0-wutil.patch Log Message: * Fri Mar 10 2006 Oliver Falk - 1.14.0-2 - Fix buildreqs - Fix wutil.h fish-1.14.0-wutil.patch: --- NEW FILE fish-1.14.0-wutil.patch --- diff -Nur fish-1.14.0-orig/wutil.h fish-1.14.0/wutil.h --- fish-1.14.0-orig/wutil.h 2005-09-24 22:31:33.000000000 +0200 +++ fish-1.14.0/wutil.h 2006-03-10 11:19:08.000000000 +0100 @@ -11,6 +11,7 @@ #include #include #include +#include "config.h" /** Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fish.spec 28 Sep 2005 11:24:42 -0000 1.5 +++ fish.spec 10 Mar 2006 14:15:32 -0000 1.6 @@ -2,16 +2,18 @@ Name: fish Version: 1.14.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Shells URL: http://roo.no-ip.org/fish/ Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 +Patch0: fish-1.14.0-wutil.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen ncurses-devel xorg-x11-devel +BuildRequires: doxygen ncurses-devel +BuildRequires: libX11-devel libXt-devel libXext-devel %description fish is a shell geared towards interactive use. It's features are @@ -20,6 +22,8 @@ %prep %setup -q +%patch0 -p1 -b .wutil + %build @@ -69,6 +73,10 @@ %config %_sysconfdir/fish.d/completions/*.fish %changelog +* Fri Mar 10 2006 Oliver Falk - 1.14.0-2 +- Fix buildreqs +- Fix wutil.h + * Sat Sep 24 2005 Axel Liljencrantz 1.14.0-0 - 1.14.0 From fedora-extras-commits at redhat.com Fri Mar 10 14:16:51 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 09:16:51 -0500 Subject: rpms/scim-m17n/devel README, NONE, 1.1 Makefile, 1.1, NONE scim-m17n.spec, 1.1, NONE sources, 1.2, NONE Message-ID: <200603101416.k2AEGrTe023702@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-m17n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23660 Added Files: README Removed Files: Makefile scim-m17n.spec sources Log Message: scim-m17n is now in Core. --- NEW FILE README --- scim-m17n has moved to Fedora Core as of FC5. --- Makefile DELETED --- --- scim-m17n.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 14:21:12 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 10 Mar 2006 09:21:12 -0500 Subject: rpms/xfce4-xkb-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xfce4-xkb-plugin.spec, 1.3, 1.4 Message-ID: <200603101421.k2AELjj2023795@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23774 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Dec 2005 22:28:33 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:21:12 -0000 1.3 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.2.tar.gz +xfce4-xkb-plugin-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Dec 2005 22:28:33 -0000 1.2 +++ sources 10 Mar 2006 14:21:12 -0000 1.3 @@ -1 +1 @@ -b233819d685ab3b7f4a47c2da9fb6936 xfce4-xkb-plugin-0.3.2.tar.gz +a23baec787ee6666e15a3c243fc14ec4 xfce4-xkb-plugin-0.3.3.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xfce4-xkb-plugin.spec 16 Feb 2006 18:46:46 -0000 1.3 +++ xfce4-xkb-plugin.spec 10 Mar 2006 14:21:12 -0000 1.4 @@ -1,6 +1,6 @@ Name: xfce4-xkb-plugin -Version: 0.3.2 -Release: 6%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel Group: User Interface/Desktops @@ -43,6 +43,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 10 2006 Christoph Wickert - 0.3.3-1 +- Update to 0.3.3. + * Thu Feb 16 2006 Christoph Wickert - 0.3.2-6 - Rebuild for Fedora Extras 5. From fedora-extras-commits at redhat.com Fri Mar 10 14:30:07 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 09:30:07 -0500 Subject: rpms/scim-m17n/FC-4 .cvsignore, 1.2, 1.3 scim-m17n.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603101430.k2AEUdqL023908@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-m17n/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23885 Modified Files: .cvsignore scim-m17n.spec sources Log Message: sync with Core: - update to 0.2.0 release * Thu Feb 9 2006 Jens Petersen - 0.1.4-3 - specify filelist more precisely Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 09:58:07 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:30:07 -0000 1.3 @@ -1 +1 @@ -scim-m17n-0.1.4.tar.gz +scim-m17n-0.2.0.tar.gz Index: scim-m17n.spec =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-4/scim-m17n.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scim-m17n.spec 11 Nov 2005 09:58:07 -0000 1.1 +++ scim-m17n.spec 10 Mar 2006 14:30:07 -0000 1.2 @@ -1,5 +1,5 @@ Name: scim-m17n -Version: 0.1.4 +Version: 0.2.0 Release: 1%{?dist} Summary: SCIM IMEngine for m17n-lib @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: scim-devel m17n-lib-devel +Requires: scim %description scim-m17n provides a SCIM IMEngine for m17n-lib, which allows @@ -29,7 +30,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/IMEngine/m17n.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/IMEngine/m17n.la %clean @@ -39,11 +40,17 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README THANKS -%{_libdir}/scim-1.0 -%{_datadir}/scim +%{_libdir}/scim-1.0/*/IMEngine/m17n.so +%{_datadir}/scim/icons/* %changelog +* Sun Feb 12 2006 Jens Petersen - 0.2.0-1 +- update to 0.2.0 release + +* Thu Feb 9 2006 Jens Petersen - 0.1.4-3 +- specify filelist more precisely + * Wed Oct 5 2005 Jens Petersen - 0.1.4-1 - initial packaging for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 09:58:07 -0000 1.2 +++ sources 10 Mar 2006 14:30:07 -0000 1.3 @@ -1 +1 @@ -33fb5cc21a239a69a39118a2ca1cab7e scim-m17n-0.1.4.tar.gz +0756a310e0b8503c80de4e1f53a9524c scim-m17n-0.2.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 14:33:09 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 09:33:09 -0500 Subject: rpms/scim-m17n/FC-3 .cvsignore, 1.2, 1.3 scim-m17n.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603101433.k2AEXfr1023988@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-m17n/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23967 Modified Files: .cvsignore scim-m17n.spec sources Log Message: sync with FC-4: - update to 0.2.0 release * Thu Feb 9 2006 Jens Petersen - 0.1.4-3 - specify filelist more precisely Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 09:58:07 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:33:09 -0000 1.3 @@ -1 +1 @@ -scim-m17n-0.1.4.tar.gz +scim-m17n-0.2.0.tar.gz Index: scim-m17n.spec =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-3/scim-m17n.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scim-m17n.spec 11 Nov 2005 09:58:07 -0000 1.1 +++ scim-m17n.spec 10 Mar 2006 14:33:09 -0000 1.2 @@ -1,5 +1,5 @@ Name: scim-m17n -Version: 0.1.4 +Version: 0.2.0 Release: 1%{?dist} Summary: SCIM IMEngine for m17n-lib @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: scim-devel m17n-lib-devel +Requires: scim %description scim-m17n provides a SCIM IMEngine for m17n-lib, which allows @@ -29,7 +30,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/IMEngine/m17n.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/IMEngine/m17n.la %clean @@ -39,11 +40,17 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README THANKS -%{_libdir}/scim-1.0 -%{_datadir}/scim +%{_libdir}/scim-1.0/*/IMEngine/m17n.so +%{_datadir}/scim/icons/* %changelog +* Sun Feb 12 2006 Jens Petersen - 0.2.0-1 +- update to 0.2.0 release + +* Thu Feb 9 2006 Jens Petersen - 0.1.4-3 +- specify filelist more precisely + * Wed Oct 5 2005 Jens Petersen - 0.1.4-1 - initial packaging for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 09:58:07 -0000 1.2 +++ sources 10 Mar 2006 14:33:09 -0000 1.3 @@ -1 +1 @@ -33fb5cc21a239a69a39118a2ca1cab7e scim-m17n-0.1.4.tar.gz +0756a310e0b8503c80de4e1f53a9524c scim-m17n-0.2.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 14:54:07 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 10 Mar 2006 09:54:07 -0500 Subject: rpms/xfce4-xkb-plugin/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xfce4-xkb-plugin.spec, 1.1, 1.2 Message-ID: <200603101454.k2AEsd32024114@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24093 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Dec 2005 22:28:33 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:54:07 -0000 1.3 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.2.tar.gz +xfce4-xkb-plugin-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Dec 2005 22:28:33 -0000 1.2 +++ sources 10 Mar 2006 14:54:07 -0000 1.3 @@ -1 +1 @@ -b233819d685ab3b7f4a47c2da9fb6936 xfce4-xkb-plugin-0.3.2.tar.gz +a23baec787ee6666e15a3c243fc14ec4 xfce4-xkb-plugin-0.3.3.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/xfce4-xkb-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-xkb-plugin.spec 16 Dec 2005 22:28:33 -0000 1.1 +++ xfce4-xkb-plugin.spec 10 Mar 2006 14:54:07 -0000 1.2 @@ -1,6 +1,6 @@ Name: xfce4-xkb-plugin -Version: 0.3.2 -Release: 4%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel Group: User Interface/Desktops @@ -42,6 +42,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 10 2006 Christoph Wickert - 0.3.3-1 +- Update to 0.3.3. + * Thu Dec 01 2005 Christoph Wickert - 0.3.2-4 - Add libxfcegui4-devel BuildReqs. - Fix %defattr. From fedora-extras-commits at redhat.com Fri Mar 10 15:03:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 10 Mar 2006 10:03:03 -0500 Subject: rpms/cmucl/devel cmucl.spec,1.2,1.3 Message-ID: <200603101503.k2AF3ZFP026036@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26017 Modified Files: cmucl.spec Log Message: refer to bugzilla entry for bootstrap availability Index: cmucl.spec =================================================================== RCS file: /cvs/extras/rpms/cmucl/devel/cmucl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cmucl.spec 9 Mar 2006 20:58:46 -0000 1.2 +++ cmucl.spec 10 Mar 2006 15:03:03 -0000 1.3 @@ -10,6 +10,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# bootstrap available for %%ix86 only: http://bugzilla.redhat.com/bugzilla/185085 ExclusiveArch: %{ix86} ## ix86 section @@ -26,6 +27,15 @@ %endif %endif +## x86_64 section +#ifarch x86_64 +#endif + +## ppc +#ifarch ppc +#endif + + Patch1: cmucl-19c-motif-shared.patch Patch2: cmucl-19c-optflags.patch From fedora-extras-commits at redhat.com Fri Mar 10 15:19:53 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 10 Mar 2006 10:19:53 -0500 Subject: rpms/libshout/FC-4 libshout.autotools.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libshout.spec, 1.8, 1.9 sources, 1.2, 1.3 Message-ID: <200603101520.k2AFKQ2h026176@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26152 Modified Files: .cvsignore libshout.spec sources Added Files: libshout.autotools.patch Log Message: update to 2.2 libshout.autotools.patch: --- NEW FILE libshout.autotools.patch --- diff -Naur libshout-2.2/include/shout/Makefile.am libshout-2.2.patched/include/shout/Makefile.am --- libshout-2.2/include/shout/Makefile.am 2004-03-21 05:03:33.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.am 2006-03-10 14:09:58.000000000 +0100 @@ -2,5 +2,5 @@ AUTOMAKE_OPTIONS = foreign -includedir = $(prefix)/include/shout -nodist_include_HEADERS = shout.h +pkgincludedir = $(includedir)/shout +nodist_pkginclude_HEADERS = shout.h diff -Naur libshout-2.2/include/shout/Makefile.in libshout-2.2.patched/include/shout/Makefile.in --- libshout-2.2/include/shout/Makefile.in 2006-01-03 20:19:05.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.in 2006-03-10 14:14:56.000000000 +0100 @@ -61,7 +61,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(includedir)" nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(nodist_include_HEADERS) +HEADERS = $(nodist_pkginclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -197,7 +197,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -includedir = $(prefix)/include/shout +pkgincludedir = $(includedir)//shout infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ @@ -217,7 +217,7 @@ target = @target@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign -nodist_include_HEADERS = shout.h +nodist_pkginclude_HEADERS = shout.h all: all-am .SUFFIXES: @@ -262,22 +262,22 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -install-nodist_includeHEADERS: $(nodist_include_HEADERS) +install-nodist_includeHEADERS: $(nodist_pkginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ - $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ done uninstall-nodist_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(includedir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:46:31 -0000 1.2 +++ .cvsignore 10 Mar 2006 15:19:53 -0000 1.3 @@ -1 +1 @@ -libshout-1.0.9.tar.gz +libshout-2.2.tar.gz Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-4/libshout.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libshout.spec 22 May 2005 23:50:52 -0000 1.8 +++ libshout.spec 10 Mar 2006 15:19:53 -0000 1.9 @@ -1,18 +1,26 @@ Name: libshout -Version: 1.0.9 -Release: 4 -Summary: icecast source streaming library. +Version: 2.2 +Release: 1%{?dist} +Summary: icecast source streaming library -Group: Libraries/Multimedia +Group: System Environment/Libraries License: LGPL URL: http://www.icecast.org/ -Source: http://developer.icecast.org/libshout/releases/%{name}-%{version}.tar.gz -Patch: libshout-makefile.patch +Source: http://downloads.us.xiph.org/releases/libshout/libshout-%{version}.tar.gz +Patch: libshout.autotools.patch + +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: libtheora-devel +BuildRequires: speex-devel + +# so it generates and installs the .pc file +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -Libshout is a library for communicating with and sending data to an +ibshout is a library for communicating with and sending data to an icecast server. It handles the socket connection, the timing of the data, and prevents most bad data from getting to the icecast server. @@ -37,11 +45,12 @@ %install rm -rf $RPM_BUILD_ROOT -# docs install in $(prefix)/doc, we don't want that, so don't go into SUBDIRS -%makeinstall SUBDIRS= +%makeinstall find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +rm -rf $RPM_BUILD_ROOT%{_docdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -51,20 +60,25 @@ %files %defattr(-,root,root,-) -%doc AUTHORS CHANGES COPYING README +%doc COPYING NEWS README %{_libdir}/libshout.so.* %files devel %defattr(-,root,root,-) -%doc doc/*.html doc/style.css +%doc examples/*.c doc/*.xml doc/*.xsl %{_libdir}/libshout.a %{_libdir}/libshout.so +%{_libdir}/pkgconfig/shout.pc %dir %{_includedir}/shout/ %{_includedir}/shout/shout.h - -# ----------------------------------------------------------------------------- +%{_datadir}/aclocal/shout.m4 %changelog +* Fri Mar 10 2006 Thomas Vander Stichele +- 2.2-1 +- new (incompatible) version, but deps are updated +- various cleanups + * Sun May 22 2005 Jeremy Katz - 1.0.9-4 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:46:31 -0000 1.2 +++ sources 10 Mar 2006 15:19:53 -0000 1.3 @@ -1 +1 @@ -bbe598e28bbf2989a90d78ff33953ea2 libshout-1.0.9.tar.gz +d5b273a072785ee14a85ff76f66850aa libshout-2.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 15:48:41 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 10 Mar 2006 10:48:41 -0500 Subject: rpms/libshout/devel libshout.autotools.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libshout.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <200603101549.k2AFnDZu026340@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26315 Modified Files: .cvsignore libshout.spec sources Added Files: libshout.autotools.patch Log Message: new version libshout.autotools.patch: --- NEW FILE libshout.autotools.patch --- diff -Naur libshout-2.2/include/shout/Makefile.am libshout-2.2.patched/include/shout/Makefile.am --- libshout-2.2/include/shout/Makefile.am 2004-03-21 05:03:33.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.am 2006-03-10 14:09:58.000000000 +0100 @@ -2,5 +2,5 @@ AUTOMAKE_OPTIONS = foreign -includedir = $(prefix)/include/shout -nodist_include_HEADERS = shout.h +pkgincludedir = $(includedir)/shout +nodist_pkginclude_HEADERS = shout.h diff -Naur libshout-2.2/include/shout/Makefile.in libshout-2.2.patched/include/shout/Makefile.in --- libshout-2.2/include/shout/Makefile.in 2006-01-03 20:19:05.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.in 2006-03-10 14:14:56.000000000 +0100 @@ -61,7 +61,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(includedir)" nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(nodist_include_HEADERS) +HEADERS = $(nodist_pkginclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -197,7 +197,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -includedir = $(prefix)/include/shout +pkgincludedir = $(includedir)//shout infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ @@ -217,7 +217,7 @@ target = @target@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign -nodist_include_HEADERS = shout.h +nodist_pkginclude_HEADERS = shout.h all: all-am .SUFFIXES: @@ -262,22 +262,22 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -install-nodist_includeHEADERS: $(nodist_include_HEADERS) +install-nodist_includeHEADERS: $(nodist_pkginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ - $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ done uninstall-nodist_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(includedir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libshout/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:46:31 -0000 1.2 +++ .cvsignore 10 Mar 2006 15:48:41 -0000 1.3 @@ -1 +1 @@ -libshout-1.0.9.tar.gz +libshout-2.2.tar.gz Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/devel/libshout.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libshout.spec 5 Mar 2006 17:07:59 -0000 1.9 +++ libshout.spec 10 Mar 2006 15:48:41 -0000 1.10 @@ -1,18 +1,26 @@ Name: libshout -Version: 1.0.9 -Release: 5%{?dist} +Version: 2.2 +Release: 1%{?dist} Summary: icecast source streaming library -Group: Libraries/Multimedia +Group: System Environment/Libraries License: LGPL URL: http://www.icecast.org/ -Source: http://developer.icecast.org/libshout/releases/%{name}-%{version}.tar.gz -Patch: libshout-makefile.patch +Source: http://downloads.us.xiph.org/releases/libshout/libshout-%{version}.tar.gz +Patch: libshout.autotools.patch + +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: libtheora-devel +BuildRequires: speex-devel + +# so it generates and installs the .pc file +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -Libshout is a library for communicating with and sending data to an +ibshout is a library for communicating with and sending data to an icecast server. It handles the socket connection, the timing of the data, and prevents most bad data from getting to the icecast server. @@ -37,11 +45,12 @@ %install rm -rf $RPM_BUILD_ROOT -# docs install in $(prefix)/doc, we don't want that, so don't go into SUBDIRS -%makeinstall SUBDIRS= +%makeinstall find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +rm -rf $RPM_BUILD_ROOT%{_docdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -51,18 +60,25 @@ %files %defattr(-,root,root,-) -%doc AUTHORS CHANGES COPYING README +%doc COPYING NEWS README %{_libdir}/libshout.so.* %files devel %defattr(-,root,root,-) -%doc doc/*.html doc/style.css +%doc examples/*.c doc/*.xml doc/*.xsl %{_libdir}/libshout.a %{_libdir}/libshout.so +%{_libdir}/pkgconfig/shout.pc %dir %{_includedir}/shout/ %{_includedir}/shout/shout.h +%{_datadir}/aclocal/shout.m4 %changelog +* Fri Mar 10 2006 Thomas Vander Stichele +- 2.2-1 +- new (incompatible) version, but deps are updated +- various cleanups + * Sun Mar 05 2006 Thomas Vander Stichele - 1.0.9-5 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libshout/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:46:31 -0000 1.2 +++ sources 10 Mar 2006 15:48:41 -0000 1.3 @@ -1 +1 @@ -bbe598e28bbf2989a90d78ff33953ea2 libshout-1.0.9.tar.gz +d5b273a072785ee14a85ff76f66850aa libshout-2.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 15:50:29 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 10 Mar 2006 10:50:29 -0500 Subject: rpms/libshout/FC-4 libshout-makefile.patch,1.1,NONE Message-ID: <200603101550.k2AFoV2d026439@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26430 Removed Files: libshout-makefile.patch Log Message: remove old patch --- libshout-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 15:51:02 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 10 Mar 2006 10:51:02 -0500 Subject: rpms/libshout/devel libshout-makefile.patch,1.1,NONE Message-ID: <200603101551.k2AFp4R4026472@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26463 Removed Files: libshout-makefile.patch Log Message: remove old patch --- libshout-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 15:58:44 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:58:44 -0500 Subject: rpms/rogue - New directory Message-ID: <200603101558.k2AFwkHu026554@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26546/rogue Log Message: Directory /cvs/extras/rpms/rogue added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 15:58:50 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:58:50 -0500 Subject: rpms/rogue/devel - New directory Message-ID: <200603101558.k2AFwq04026569@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26546/rogue/devel Log Message: Directory /cvs/extras/rpms/rogue/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 15:59:02 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:59:02 -0500 Subject: rpms/rogue Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603101559.k2AFx4dA026603@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26591 Added Files: Makefile import.log Log Message: Setup of module rogue --- NEW FILE Makefile --- # Top level Makefile for module rogue all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 15:59:08 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:59:08 -0500 Subject: rpms/rogue/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603101559.k2AFxAsN026623@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26591/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rogue --- NEW 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 Mar 10 15:59:35 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:59:35 -0500 Subject: rpms/rogue import.log,1.1,1.2 Message-ID: <200603101600.k2AG07kJ026724@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26672 Modified Files: import.log Log Message: auto-import rogue-5.4.2-1 on branch devel from rogue-5.4.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rogue/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 15:59:02 -0000 1.1 +++ import.log 10 Mar 2006 15:59:34 -0000 1.2 @@ -0,0 +1 @@ +rogue-5_4_2-1:HEAD:rogue-5.4.2-1.src.rpm:1142006371 From fedora-extras-commits at redhat.com Fri Mar 10 15:59:40 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:59:40 -0500 Subject: rpms/rogue/devel rogue-includes.patch, NONE, 1.1 rogue-rpmopts.patch, NONE, 1.1 rogue.desktop, NONE, 1.1 rogue.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603101600.k2AG0Dre026728@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26672/devel Modified Files: .cvsignore sources Added Files: rogue-includes.patch rogue-rpmopts.patch rogue.desktop rogue.spec Log Message: auto-import rogue-5.4.2-1 on branch devel from rogue-5.4.2-1.src.rpm rogue-includes.patch: --- NEW FILE rogue-includes.patch --- --- rogue/extern.h 2006-01-30 08:35:18.000000000 -0800 +++ rogue.new/extern.h 2006-02-25 21:31:27.000000000 -0800 @@ -61,6 +61,7 @@ */ #include +#include void auto_save(int); int come_down(); rogue-rpmopts.patch: --- NEW FILE rogue-rpmopts.patch --- diff -Naur rogue/Makefile rogue.new/Makefile --- rogue/Makefile 2006-01-29 18:24:39.000000000 -0800 +++ rogue.new/Makefile 2006-02-25 21:19:41.000000000 -0800 @@ -38,7 +38,7 @@ CC = gcc ROPTS = -DALLSCORES -DSCOREFILE -COPTS = -O3 +COPTS := -O3 CFLAGS= $(COPTS) $(ROPTS) LIBS = -lcurses RM = rm -f --- NEW FILE rogue.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Rogue GenericName=Rogue Comment=The original curses-based adventure game Exec=rogue Icon= Terminal=true Type=Application Categories=Application;Game; Version=5.4.2 --- NEW FILE rogue.spec --- Name: rogue Version: 5.4.2 Release: 1%{?dist} Summary: The original graphical adventure game Group: Amusements/Games License: BSD URL: http://roguelike.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/roguelike/rogue5.4.2-src.tar.gz Source1: rogue.desktop Patch0: rogue-rpmopts.patch Patch1: rogue-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: %description The one, the only, the original graphical adventure game that spawned an entire genre. %prep %setup -q -c -n %{name}-%{version} %patch0 -p1 %patch1 -p1 %{__sed} -i 's/\r//' rogue54.html %{__sed} -i 's/\r//' readme54.html chmod a-x *.c *.h %build make COPTS="$RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -pD -m 0755 rogue54 $RPM_BUILD_ROOT/%{_bindir}/rogue install -pD rogue.6 $RPM_BUILD_ROOT/%{_mandir}/man6/rogue.6 mkdir -p $RPM_BUILD_ROOT/%{_var}/games/roguelike 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,-) %attr(2755,games,games) %{_bindir}/rogue %{_mandir}/man6/rogue.6.gz %{_datadir}/applications/fedora-%{name}.desktop %dir %attr(0775,games,games) %{_var}/games/roguelike %doc LICENSE.TXT rogue54.doc rogue54.html readme54.html %changelog * Sat Feb 25 2006 Wart 5.4.2-1 - Initial spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 15:59:08 -0000 1.1 +++ .cvsignore 10 Mar 2006 15:59:40 -0000 1.2 @@ -0,0 +1 @@ +rogue5.4.2-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 15:59:08 -0000 1.1 +++ sources 10 Mar 2006 15:59:40 -0000 1.2 @@ -0,0 +1 @@ +bd656cb017a579eba835a0ee445a0a32 rogue5.4.2-src.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 16:01:29 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 11:01:29 -0500 Subject: owners owners.list,1.728,1.729 Message-ID: <200603101602.k2AG23Ca028665@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28638 Modified Files: owners.list Log Message: Added rogue Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.728 retrieving revision 1.729 diff -u -r1.728 -r1.729 --- owners.list 9 Mar 2006 21:00:52 -0000 1.728 +++ owners.list 10 Mar 2006 16:01:28 -0000 1.729 @@ -1208,6 +1208,7 @@ Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org| 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| Fedora Extras|rootsh|Shell wrapper for auditing|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 10 16:34:05 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 10 Mar 2006 11:34:05 -0500 Subject: rpms/torcs/FC-4 torcs-1.2.4-extraqualif.patch, NONE, 1.1 torcs-1.2.4-freealutfix.patch, NONE, 1.1 torcs-1.2.4-track_cpp.patch, NONE, 1.1 torcs.spec, 1.10, 1.11 Message-ID: <200603101634.k2AGYbwS028869@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28818/FC-4 Modified Files: torcs.spec Added Files: torcs-1.2.4-extraqualif.patch torcs-1.2.4-freealutfix.patch torcs-1.2.4-track_cpp.patch Log Message: Fix #179614 and update spec to build with modular X. torcs-1.2.4-extraqualif.patch: --- NEW FILE torcs-1.2.4-extraqualif.patch --- diff -Naupr torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h --- torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h 2005-08-24 21:19:47.000000000 +0200 +++ torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h 2006-03-10 16:50:51.000000000 +0100 @@ -78,7 +78,7 @@ public: void update(tSituation *s, float Fps); - void cGrScreen::camDraw(tSituation *s); + void camDraw(tSituation *s); void updateCurrent(tSituation *s); torcs-1.2.4-freealutfix.patch: --- NEW FILE torcs-1.2.4-freealutfix.patch --- --- torcs-1.2.4/src/modules/graphic/ssggraph/Makefile.freealutfix 2006-02-01 10:46:38.000000000 -0500 +++ torcs-1.2.4/src/modules/graphic/ssggraph/Makefile 2006-02-01 10:46:56.000000000 -0500 @@ -24,7 +24,7 @@ MODULEDIR = modules/graphic -LIBS = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal +LIBS = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal -lalut SHIPDIR = config torcs-1.2.4-track_cpp.patch: --- NEW FILE torcs-1.2.4-track_cpp.patch --- --- src/tools/trackgen/track.orig.cpp 2005-08-24 14:19:48.000000000 -0500 +++ src/tools/trackgen/track.cpp 2005-10-04 02:15:55.000000000 -0500 @@ -392,7 +392,7 @@ trackvertices[3*nbvert] = x; \ trackvertices[3*nbvert+1] = y; \ trackvertices[3*nbvert+2] = z; \ - trackindices[nbvert] = nbvert++; \ + trackindices[nbvert] = nbvert+1; \ } \ } while (0) @@ -403,7 +403,7 @@ trackvertices[3*nbvert] = x; \ trackvertices[3*nbvert+1] = y; \ trackvertices[3*nbvert+2] = z; \ - trackindices[nbvert] = nbvert++; \ + trackindices[nbvert] = nbvert+1; \ printf("x=%f y=%f z=%f u=%f v=%f\n", \ (tdble)(x), (tdble)(y), (tdble)(z), \ (tdble)(t1), (tdble)(t2)); \ Index: torcs.spec =================================================================== RCS file: /cvs/extras/rpms/torcs/FC-4/torcs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- torcs.spec 9 Dec 2005 12:40:04 -0000 1.10 +++ torcs.spec 10 Mar 2006 16:34:05 -0000 1.11 @@ -3,7 +3,7 @@ Summary: The Open Racing Car Simulator Name: torcs Version: 1.2.4 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://torcs.org/ @@ -12,11 +12,20 @@ Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz 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: xorg-x11-devel, freeglut-devel, plib-devel >= 1.8.3 +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 +%else +BuildRequires: xorg-x11-devel +%endif %description TORCS is a 3D racing cars simulator using OpenGL. The goal is to have @@ -39,13 +48,21 @@ %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 -%configure -# Having %{?_smp_mflags} makes the build fail with 1.2.3 +# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4) +%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 %{__make} @@ -145,6 +162,19 @@ %changelog +* 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. +- Include track.cpp patch from Debian. +- Explicitly set X includes and libraries with modular X, since otherwise + configure checks fail badly (first libm, then all X libs...). +- Add missing modular X build requirements. +- Include patch to fix one extra qualifification error with gcc 4.1. + +* Wed Mar 1 2006 Matthias Saou 1.2.4-2 +- Add support for modular X on FC >= 5. +- Include patches to rebuild against new openal and freealut (#179614). + * Wed Oct 12 2005 Matthias Saou 1.2.4-1 - Update to 1.2.4. - Add torcs-data-tracks-road requirement directly to main torcs. From fedora-extras-commits at redhat.com Fri Mar 10 16:34:11 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 10 Mar 2006 11:34:11 -0500 Subject: rpms/torcs/devel torcs-1.2.4-extraqualif.patch, NONE, 1.1 torcs-1.2.4-freealutfix.patch, NONE, 1.1 torcs-1.2.4-track_cpp.patch, NONE, 1.1 torcs.spec, 1.11, 1.12 Message-ID: <200603101634.k2AGYhSB028872@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28818/devel Modified Files: torcs.spec Added Files: torcs-1.2.4-extraqualif.patch torcs-1.2.4-freealutfix.patch torcs-1.2.4-track_cpp.patch Log Message: Fix #179614 and update spec to build with modular X. torcs-1.2.4-extraqualif.patch: --- NEW FILE torcs-1.2.4-extraqualif.patch --- diff -Naupr torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h --- torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h 2005-08-24 21:19:47.000000000 +0200 +++ torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h 2006-03-10 16:50:51.000000000 +0100 @@ -78,7 +78,7 @@ public: void update(tSituation *s, float Fps); - void cGrScreen::camDraw(tSituation *s); + void camDraw(tSituation *s); void updateCurrent(tSituation *s); torcs-1.2.4-freealutfix.patch: --- NEW FILE torcs-1.2.4-freealutfix.patch --- --- torcs-1.2.4/src/modules/graphic/ssggraph/Makefile.freealutfix 2006-02-01 10:46:38.000000000 -0500 +++ torcs-1.2.4/src/modules/graphic/ssggraph/Makefile 2006-02-01 10:46:56.000000000 -0500 @@ -24,7 +24,7 @@ MODULEDIR = modules/graphic -LIBS = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal +LIBS = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal -lalut SHIPDIR = config torcs-1.2.4-track_cpp.patch: --- NEW FILE torcs-1.2.4-track_cpp.patch --- --- src/tools/trackgen/track.orig.cpp 2005-08-24 14:19:48.000000000 -0500 +++ src/tools/trackgen/track.cpp 2005-10-04 02:15:55.000000000 -0500 @@ -392,7 +392,7 @@ trackvertices[3*nbvert] = x; \ trackvertices[3*nbvert+1] = y; \ trackvertices[3*nbvert+2] = z; \ - trackindices[nbvert] = nbvert++; \ + trackindices[nbvert] = nbvert+1; \ } \ } while (0) @@ -403,7 +403,7 @@ trackvertices[3*nbvert] = x; \ trackvertices[3*nbvert+1] = y; \ trackvertices[3*nbvert+2] = z; \ - trackindices[nbvert] = nbvert++; \ + trackindices[nbvert] = nbvert+1; \ printf("x=%f y=%f z=%f u=%f v=%f\n", \ (tdble)(x), (tdble)(y), (tdble)(z), \ (tdble)(t1), (tdble)(t2)); \ Index: torcs.spec =================================================================== RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- torcs.spec 14 Oct 2005 08:30:08 -0000 1.11 +++ torcs.spec 10 Mar 2006 16:34:11 -0000 1.12 @@ -3,7 +3,7 @@ Summary: The Open Racing Car Simulator Name: torcs Version: 1.2.4 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://torcs.org/ @@ -12,11 +12,20 @@ Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz 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: xorg-x11-devel, freeglut-devel, plib-devel >= 1.8.3 +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 +%else +BuildRequires: xorg-x11-devel +%endif %description TORCS is a 3D racing cars simulator using OpenGL. The goal is to have @@ -39,13 +48,21 @@ %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 -%configure -# Having %{?_smp_mflags} makes the build fail with 1.2.3 +# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4) +%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 %{__make} @@ -145,6 +162,19 @@ %changelog +* 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. +- Include track.cpp patch from Debian. +- Explicitly set X includes and libraries with modular X, since otherwise + configure checks fail badly (first libm, then all X libs...). +- Add missing modular X build requirements. +- Include patch to fix one extra qualifification error with gcc 4.1. + +* Wed Mar 1 2006 Matthias Saou 1.2.4-2 +- Add support for modular X on FC >= 5. +- Include patches to rebuild against new openal and freealut (#179614). + * Wed Oct 12 2005 Matthias Saou 1.2.4-1 - Update to 1.2.4. - Add torcs-data-tracks-road requirement directly to main torcs. From fedora-extras-commits at redhat.com Fri Mar 10 18:46:01 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:46:01 -0500 Subject: rpms/perl-HTTP-BrowserDetect - New directory Message-ID: <200603101846.k2AIk35j000699@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv690/perl-HTTP-BrowserDetect Log Message: Directory /cvs/extras/rpms/perl-HTTP-BrowserDetect added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 18:46:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:46:06 -0500 Subject: rpms/perl-HTTP-BrowserDetect/devel - New directory Message-ID: <200603101846.k2AIk94F000718@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv690/perl-HTTP-BrowserDetect/devel Log Message: Directory /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 18:46:37 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:46:37 -0500 Subject: rpms/perl-HTTP-BrowserDetect Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603101846.k2AIkdQo000757@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv745 Added Files: Makefile import.log Log Message: Setup of module perl-HTTP-BrowserDetect --- NEW FILE Makefile --- # Top level Makefile for module perl-HTTP-BrowserDetect all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 18:46:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:46:43 -0500 Subject: rpms/perl-HTTP-BrowserDetect/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603101846.k2AIkjgR000777@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv745/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTTP-BrowserDetect --- NEW 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 Mar 10 18:47:14 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:47:14 -0500 Subject: owners owners.list,1.729,1.730 Message-ID: <200603101847.k2AIllL1000850@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv796 Modified Files: owners.list Log Message: Add perl-HTTP-BrowserDetect. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.729 retrieving revision 1.730 diff -u -r1.729 -r1.730 --- owners.list 10 Mar 2006 16:01:28 -0000 1.729 +++ owners.list 10 Mar 2006 18:47:14 -0000 1.730 @@ -916,6 +916,7 @@ Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|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-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-HTTP-BrowserDetect|HTTP::BrowserDetect Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Proxy|A pure Perl HTTP proxy|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 10 18:47:41 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:47:41 -0500 Subject: rpms/perl-HTTP-BrowserDetect import.log,1.1,1.2 Message-ID: <200603101848.k2AImDhd000868@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv831 Modified Files: import.log Log Message: auto-import perl-HTTP-BrowserDetect-0.98-1 on branch devel from perl-HTTP-BrowserDetect-0.98-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-BrowserDetect/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 18:46:36 -0000 1.1 +++ import.log 10 Mar 2006 18:47:40 -0000 1.2 @@ -0,0 +1 @@ +perl-HTTP-BrowserDetect-0_98-1:HEAD:perl-HTTP-BrowserDetect-0.98-1.src.rpm:1142016445 From fedora-extras-commits at redhat.com Fri Mar 10 18:47:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:47:47 -0500 Subject: rpms/perl-HTTP-BrowserDetect/devel perl-HTTP-BrowserDetect.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603101848.k2AImJYw000872@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv831/devel Modified Files: .cvsignore sources Added Files: perl-HTTP-BrowserDetect.spec Log Message: auto-import perl-HTTP-BrowserDetect-0.98-1 on branch devel from perl-HTTP-BrowserDetect-0.98-1.src.rpm --- NEW FILE perl-HTTP-BrowserDetect.spec --- Name: perl-HTTP-BrowserDetect Version: 0.98 Release: 1%{?dist} Summary: HTTP::BrowserDetect Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTTP-BrowserDetect/ Source0: http://www.cpan.org/modules/by-module/HTTP/HTTP-BrowserDetect-0.98.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Determines the Web browser, version, and platform from an HTTP user agent string. %prep %setup -q -n HTTP-BrowserDetect-%{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+rwX,go+rX,go-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 * Thu Aug 18 2005 Steven Pritchard 0.98-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 18:46:43 -0000 1.1 +++ .cvsignore 10 Mar 2006 18:47:46 -0000 1.2 @@ -0,0 +1 @@ +HTTP-BrowserDetect-0.98.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 18:46:43 -0000 1.1 +++ sources 10 Mar 2006 18:47:46 -0000 1.2 @@ -0,0 +1 @@ +ac6837e47e25a13e1c7b927f2c6d9adc HTTP-BrowserDetect-0.98.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 18:51:26 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 10 Mar 2006 13:51:26 -0500 Subject: rpms/lyx/FC-4 lyx-1.4.0-helpers.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 helpers.sh, 1.1, 1.2 lyx.spec, 1.16, 1.17 sources, 1.5, 1.6 lyx-1.3.7-helpers.patch, 1.1, NONE lyx-1.3.7-noxfonts.patch, 1.1, NONE lyx-crystal.png, 1.1, NONE Message-ID: <200603101851.k2AIpxT9000980@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv954 Modified Files: .cvsignore helpers.sh lyx.spec sources Added Files: lyx-1.4.0-helpers.patch Removed Files: lyx-1.3.7-helpers.patch lyx-1.3.7-noxfonts.patch lyx-crystal.png Log Message: sync w/devel branch (lyx-1.4.0) lyx-1.4.0-helpers.patch: --- NEW FILE lyx-1.4.0-helpers.patch --- --- lyx-1.4.0pre3/lib/configure.helpers 2005-12-24 03:57:10.000000000 -0600 +++ lyx-1.4.0pre3/lib/configure 2006-01-23 07:29:27.000000000 -0600 @@ -811,7 +811,7 @@ echo $ac_n "checking for a Postscript previewer""... $ac_c" echo "$ac_t""" PS_VIEWER= -for ac_prog in gsview32 gv "ghostview -swap" kghostview +for ac_prog in evince gsview32 gsview kghostview ggv gv "ghostview -swap" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 @@ -849,7 +849,7 @@ echo $ac_n "checking for a PDF previewer""... $ac_c" echo "$ac_t""" PDF_VIEWER= -for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview +for ac_prog in acrobat acrord32 acroread evince xpdf gsview32 gsview kpdf kghostview ggv gv ghostview do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 @@ -923,7 +923,7 @@ echo $ac_n "checking for a HTML previewer""... $ac_c" echo "$ac_t""" HTML_VIEWER= -for ac_prog in "mozilla file://\$\$p\$\$i" netscape +for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 --- lyx-1.4.0pre3/lib/configure.m4.helpers 2005-09-08 04:20:12.000000000 -0500 +++ lyx-1.4.0pre3/lib/configure.m4 2006-01-23 07:27:26.000000000 -0600 @@ -286,17 +286,17 @@ SEARCH_PROG([for a LaTeX -> OpenOffice.org converter],latex_to_sxw_command, "oolatex \$\$i" "oolatex.sh \$\$i") # Search something to preview postscript -SEARCH_PROG([for a Postscript previewer],PS_VIEWER,gsview32 gv "ghostview -swap" kghostview) +SEARCH_PROG([for a Postscript previewer],PS_VIEWER,evince gsview32 gsview kghostview ggv gv "ghostview -swap") EPS_VIEWER=$PS_VIEWER # Search for a program to preview pdf -SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview) +SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 acroread evince xpdf gsview32 gsview kpdf kghostview ggv gv ghostview) # Search something to preview dvi -SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi) +SEARCH_PROG([for a DVI previewer],DVI_VIEWER, kdvi xdvi windvi yap) # Search something to preview html -SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape) +SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "htmlview file://\$\$p\$\$i " "mozilla file://\$\$p\$\$i" netscape) # Search for a program to convert ps to pdf SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i") Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Jan 2006 17:51:39 -0000 1.3 +++ .cvsignore 10 Mar 2006 18:51:26 -0000 1.4 @@ -1 +1,2 @@ -lyx-1.3.7.tar.bz2 +lyx-1.4.0.tar.bz2 +beamer.layout Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- lyx.spec 20 Jan 2006 18:43:46 -0000 1.16 +++ lyx.spec 10 Mar 2006 18:51:26 -0000 1.17 @@ -1,29 +1,28 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Version: 1.3.7 -Release: 5%{?dist} +Version: 1.4.0 +Release: 4%{?dist} License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 +#Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: lyx-1.3.7-helpers.patch -Patch2: lyx-1.3.7-noxfonts.patch +Patch1: lyx-1.4.0-helpers.patch # app-wrapper for various frontends Source10: lyx.sh - +# .desktop files Source20: lyx.desktop Source21: lyx-qt.desktop Source22: lyx-xforms.desktop +# misc +Source100: ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/beamer/lyx/layouts/beamer.layout -# "borrow" kde's crystal icon for lyx -Source30: lyx-crystal.png - -# TODO: use this find_helpers.sh script at runtime, instead of depending on +# TODO: use helpers.sh script at runtime, instead of depending on # lyx's configure and %%triggers #Source100: helpers.sh @@ -31,14 +30,12 @@ BuildRequires: qt-devel # xforms frontend BuildRequires: xforms-devel -BuildRequires: libjpeg-devel -%if "%{?fedora}" > "4" -BuildRequires: libXpm-devel -%endif BuildRequires: desktop-file-utils +BuildRequires: python BuildRequires: aiksaurus-devel BuildRequires: aspell-devel +BuildRequires: zlib-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts @@ -91,60 +88,55 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .helpers -%patch2 -p1 -b .noxfonts - -# ./autogen.sh %build -unset LINGUAS ||: - # QT -test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include -%{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" } -%configure \ - --with-frontend=qt \ - --enable-optimization="$RPM_OPT_FLAGS" \ - --with-aiksaurus \ - --with-pspell \ - --without-warnings --disable-debug --disable-dependency-tracking +unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -make %{?_smp_mflags} -cp -a src/lyx lyx-qt +# drop -fexceptions from optflags, suggested by lyx devs: +# http://www.mail-archive.com/lyx-devel at lists.lyx.org/msg85794.html +optflags="$(echo %optflags | sed -e 's|-fexceptions||' )" +%global optflags $optflags -# Intermediate cleanup -# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking -make -C src/frontends clean +for frontend in qt xforms ; do -# XFORMS %configure \ - --with-frontend=xforms \ - --enable-optimization="$RPM_OPT_FLAGS" \ + --disable-rpath \ + --enable-compression-support \ + --with-frontend=$frontend \ + --enable-optimization="%{optflags}" \ --with-aiksaurus \ - --with-pspell \ - --without-warnings --disable-debug --disable-dependency-tracking + --with-aspell \ + --without-warnings --disable-dependency-tracking \ + --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ + +# Intermediate cleanup +# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking +make -C src/frontends clean make %{?_smp_mflags} -cp -a src/lyx lyx-xforms + +done %install rm -rf $RPM_BUILD_ROOT -unset LINGUAS ||: - make install DESTDIR=$RPM_BUILD_ROOT ## Handle front-ends -install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx -install -p -m0755 -D lyx-qt $RPM_BUILD_ROOT%{_bindir}/lyx-qt -install -p -m0755 -D lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms +install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx +install -p -m0755 -D src/lyx-qt $RPM_BUILD_ROOT%{_bindir}/lyx-qt +install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms +# misc/extras +install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/ # Set up the lyx-specific class files where TeX can see them texmf=%{_datadir}/texmf @@ -152,10 +144,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \ $RPM_BUILD_ROOT${texmf}/tex/latex/lyx -# KDE already has a nice builtin crystalsvg icon, -# but this is for gnome's benefit (gtk2 < 2.6) -install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png - mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -164,27 +152,25 @@ %find_lang %{name} || touch %{name}.lang -#touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr - %post -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : -texhash >& /dev/null ||: -cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: +texhash > /dev/null 2>&1 ||: +cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: %postun -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : -texhash >& /dev/null ||: +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: +texhash > /dev/null 2>&1 ||: # Catch installed/uninstalled helpers %triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then -cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi %triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then -cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi @@ -196,11 +182,9 @@ %defattr(-,root,root,-) %doc ANNOUNCE ChangeLog lib/CREDITS NEWS README %{_bindir}/lyx -%{_bindir}/noweb2lyx -%{_bindir}/reLyX -#{_datadir}/applications/*-lyx.desktop -%{_datadir}/pixmaps/* -%{_mandir}/man?/* +%{_bindir}/lyxclient +%{_bindir}/tex2lyx +%{_mandir}/man1/* %{_datadir}/lyx/ %{_datadir}/texmf/tex/latex/lyx/ %verify(not md5 size mtime) %{_datadir}/lyx/*.lst @@ -219,7 +203,48 @@ %changelog -* Fri Jan 20 2006 Rex Dieter 1.3.7-5 +* Thu Mar 09 2006 Rex Dieter 1.4.0-4 +- fix stripping of -fexceptions from %%optflags + +* Wed Mar 08 2006 Rex Dieter 1.4.0-3 +- include beamer.layout + +* Wed Mar 08 2006 Rex Dieter 1.4.0-2 +- 1.4.0(final) +- drop boost bits + +* Tue Mar 07 2006 Rex Dieter 1.4.0-0.12.rc +- 1.4.0rc +- drop boost patch (for now) + +* Fri Mar 03 2006 Rex Dieter 1.4.0-0.11.pre6 +- 1.4.0pre6 +- --disable-stdlib-debug --disable-assertions --disable-concept-checks +- don't use --without-included-boost (for now) + +* Mon Feb 20 2006 Rex Dieter 1.4.0-0.10.pre5 +- gcc41 patch +- document boost/gcc41 patches +- avoid --without-included-boost on fc4/gcc-4.0.2 (gcc bug) + +* Tue Feb 14 2006 Rex Dieter 1.4.0-0.9.pre5 +- updated boost patch +- drop -fexceptions from %%optflags + +* Mon Feb 13 2006 Rex Dieter 1.4.0-0.7.pre5 +- --without-included-boost +- BR: boost-devel + +* Mon Feb 13 2006 Rex Dieter 1.4.0-0.5.pre5 +- 1.4.0pre5 + +* Tue Jan 31 2006 Rex Dieter 1.4.0-0.2.pre4 +- 1.4.0pre4 + +* Fri Jan 20 2006 Rex Dieter 1.4.0-0.1.pre3 +- 1.4.0pre3 + +* Fri Jan 20 2006 Rex Dieter 1.3.7-4 - cleanup/fix snarfing of intermediate frontend builds. * Fri Jan 20 2006 Rex Dieter 1.3.7-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Jan 2006 17:51:39 -0000 1.5 +++ sources 10 Mar 2006 18:51:26 -0000 1.6 @@ -1 +1,2 @@ -cef9a2fca128c32ffa04c214d02cde04 lyx-1.3.7.tar.bz2 +5ab37471339ff7dbc8f0c43282746cb0 lyx-1.4.0.tar.bz2 +c906271900a0627d3df2a38ad962a285 beamer.layout --- lyx-1.3.7-helpers.patch DELETED --- --- lyx-1.3.7-noxfonts.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 19:11:11 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Fri, 10 Mar 2006 14:11:11 -0500 Subject: rpms/cfitsio/FC-4 cfitsio.spec,1.9,1.10 Message-ID: <200603101911.k2AJBhJe003681@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3645/FC-4 Modified Files: cfitsio.spec Log Message: Have build point to existant f95 rather than non-existant g95. Bugzilla Bug 185107 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-4/cfitsio.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cfitsio.spec 28 Feb 2006 20:33:53 -0000 1.9 +++ cfitsio.spec 10 Mar 2006 19:11:10 -0000 1.10 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -37,7 +37,7 @@ %patch -p1 %build -FC=g95 +FC=f95 export FC %configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name} make shared %{?_smp_mflags} @@ -69,6 +69,9 @@ %{_libdir}/libcfitsio.so %changelog +* Fri Mar 10 2006 Matthew Truch - 3.006-3 +- Point to f95 instead of g95 as per bugzilla bug 185107 + * Tue Feb 28 2006 Matthew Truch - 3.006-2 - Fix spelling typo in name of License.txt file. From fedora-extras-commits at redhat.com Fri Mar 10 19:11:19 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Fri, 10 Mar 2006 14:11:19 -0500 Subject: rpms/cfitsio/devel cfitsio.spec,1.10,1.11 Message-ID: <200603101911.k2AJBpRq003684@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3645/devel Modified Files: cfitsio.spec Log Message: Have build point to existant f95 rather than non-existant g95. Bugzilla Bug 185107 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cfitsio.spec 28 Feb 2006 20:33:59 -0000 1.10 +++ cfitsio.spec 10 Mar 2006 19:11:18 -0000 1.11 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -37,7 +37,7 @@ %patch -p1 %build -FC=g95 +FC=f95 export FC %configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name} make shared %{?_smp_mflags} @@ -69,6 +69,9 @@ %{_libdir}/libcfitsio.so %changelog +* Fri Mar 10 2006 Matthew Truch - 3.006-3 +- Point to f95 instead of g95 as per bugzilla bug 185107 + * Tue Feb 28 2006 Matthew Truch - 3.006-2 - Fix spelling typo in name of License.txt file. From fedora-extras-commits at redhat.com Fri Mar 10 19:15:08 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Fri, 10 Mar 2006 14:15:08 -0500 Subject: rpms/hpic/FC-4 hpic.spec,1.5,1.6 Message-ID: <200603101915.k2AJFe2Z003795@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/hpic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3742/FC-4 Modified Files: hpic.spec Log Message: Correct typo I made in changelog version number. No real changes; no new build. Index: hpic.spec =================================================================== RCS file: /cvs/extras/rpms/hpic/FC-4/hpic.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hpic.spec 28 Feb 2006 18:58:56 -0000 1.5 +++ hpic.spec 10 Mar 2006 19:15:08 -0000 1.6 @@ -66,7 +66,7 @@ %{_libdir}/libhpic.a %changelog -* Tue Feb 28 2006 Matthew Truch - 0.52-6 +* Tue Feb 28 2006 Matthew Truch - 0.52.2-1 - Update to 0.52.2 upstream bugfix release. * Tue Feb 28 2006 Matthew Truch - 0.52-6 From fedora-extras-commits at redhat.com Fri Mar 10 19:15:14 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Fri, 10 Mar 2006 14:15:14 -0500 Subject: rpms/hpic/devel hpic.spec,1.5,1.6 Message-ID: <200603101915.k2AJFld3003798@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/hpic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3742/devel Modified Files: hpic.spec Log Message: Correct typo I made in changelog version number. No real changes; no new build. Index: hpic.spec =================================================================== RCS file: /cvs/extras/rpms/hpic/devel/hpic.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hpic.spec 28 Feb 2006 18:59:02 -0000 1.5 +++ hpic.spec 10 Mar 2006 19:15:14 -0000 1.6 @@ -66,7 +66,7 @@ %{_libdir}/libhpic.a %changelog -* Tue Feb 28 2006 Matthew Truch - 0.52-6 +* Tue Feb 28 2006 Matthew Truch - 0.52.2-1 - Update to 0.52.2 upstream bugfix release. * Tue Feb 28 2006 Matthew Truch - 0.52-6 From fedora-extras-commits at redhat.com Fri Mar 10 19:15:02 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Fri, 10 Mar 2006 14:15:02 -0500 Subject: rpms/hpic/FC-3 hpic.spec,1.5,1.6 Message-ID: <200603101916.k2AJG4b6003801@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/hpic/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3742/FC-3 Modified Files: hpic.spec Log Message: Correct typo I made in changelog version number. No real changes; no new build. Index: hpic.spec =================================================================== RCS file: /cvs/extras/rpms/hpic/FC-3/hpic.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hpic.spec 28 Feb 2006 18:58:48 -0000 1.5 +++ hpic.spec 10 Mar 2006 19:14:43 -0000 1.6 @@ -66,7 +66,7 @@ %{_libdir}/libhpic.a %changelog -* Tue Feb 28 2006 Matthew Truch - 0.52-6 +* Tue Feb 28 2006 Matthew Truch - 0.52.2-1 - Update to 0.52.2 upstream bugfix release. * Tue Feb 28 2006 Matthew Truch - 0.52-6 From fedora-extras-commits at redhat.com Fri Mar 10 19:22:13 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:22:13 -0500 Subject: rpms/perl-HTTP-BrowserDetect/FC-4 perl-HTTP-BrowserDetect.spec, 1.1, 1.2 Message-ID: <200603101922.k2AJMkrQ003904@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3871/FC-4 Modified Files: perl-HTTP-BrowserDetect.spec Log Message: Improve Summary. Index: perl-HTTP-BrowserDetect.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-BrowserDetect/FC-4/perl-HTTP-BrowserDetect.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTTP-BrowserDetect.spec 10 Mar 2006 18:47:46 -0000 1.1 +++ perl-HTTP-BrowserDetect.spec 10 Mar 2006 19:22:13 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-HTTP-BrowserDetect Version: 0.98 -Release: 1%{?dist} -Summary: HTTP::BrowserDetect Perl module +Release: 2%{?dist} +Summary: Perl browser detection library License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTTP-BrowserDetect/ @@ -44,5 +44,8 @@ %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.98-2 +- Improve Summary. + * Thu Aug 18 2005 Steven Pritchard 0.98-1 - Specfile autogenerated. From fedora-extras-commits at redhat.com Fri Mar 10 19:22:19 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:22:19 -0500 Subject: rpms/perl-HTTP-BrowserDetect/devel perl-HTTP-BrowserDetect.spec, 1.1, 1.2 Message-ID: <200603101922.k2AJMpI1003908@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3871/devel Modified Files: perl-HTTP-BrowserDetect.spec Log Message: Improve Summary. Index: perl-HTTP-BrowserDetect.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel/perl-HTTP-BrowserDetect.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTTP-BrowserDetect.spec 10 Mar 2006 18:47:46 -0000 1.1 +++ perl-HTTP-BrowserDetect.spec 10 Mar 2006 19:22:19 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-HTTP-BrowserDetect Version: 0.98 -Release: 1%{?dist} -Summary: HTTP::BrowserDetect Perl module +Release: 2%{?dist} +Summary: Perl browser detection library License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTTP-BrowserDetect/ @@ -44,5 +44,8 @@ %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.98-2 +- Improve Summary. + * Thu Aug 18 2005 Steven Pritchard 0.98-1 - Specfile autogenerated. From fedora-extras-commits at redhat.com Fri Mar 10 19:36:33 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 10 Mar 2006 14:36:33 -0500 Subject: rpms/maxima/FC-4 maxima.spec,1.16,1.17 Message-ID: <200603101937.k2AJb64Q004233@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4212 Modified Files: maxima.spec Log Message: * Thu Mar 09 2006 Rex Dieter 5.9.2-12 - enable runtime-cmucl (%%ix86 only, atm) * Wed Mar 08 2006 Rex Dieter 5.9.2-11 - fc5: enable runtime-gcl - runtime-sbcl: Requires: sbcl = %%{sbcl_version_used_to_build} Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- maxima.spec 27 Feb 2006 15:34:04 -0000 1.16 +++ maxima.spec 10 Mar 2006 19:36:33 -0000 1.17 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 10%{?dist} +Release: 12%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -17,14 +17,15 @@ %define _with_default_lisp --with-default-lisp=clisp +%ifarch %{ix86} +# cmucl review (done): http://bugzilla.redhat.com/bugzilla/166796 +%define _enable_cmucl --enable-cmucl +%endif + %ifarch %{ix86} x86_64 %define _enable_clisp --enable-clisp -# cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796 -#define _enable_cmucl --enable-cmucl -%if "%{?fedora}" != "5" -# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026 +# gcl *was* not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026 %define _enable_gcl --enable-gcl -%endif %define _enable_sbcl --enable-sbcl %endif @@ -142,8 +143,13 @@ Summary: Maxima compiled with SBCL Group: Applications/Engineering BuildRequires: sbcl -#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)} -Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} +# maxima requires the *same* version it was built against +# this hack should work, even in mock (-: -- Rex +%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) +%if "%{?sbcl_ver}" >= "0.9" +%define sbcl_ver2 = %{sbcl_ver} +%endif +Requires: sbcl %{?sbcl_ver2} Requires: %{name} = %{version} Obsoletes: maxima-exec-sbcl < %{version}-%{release} Provides: %{name}-runtime = %{version} @@ -351,6 +357,13 @@ %changelog +* Thu Mar 09 2006 Rex Dieter 5.9.2-12 +- enable runtime-cmucl (%%ix86 only, atm) + +* Wed Mar 08 2006 Rex Dieter 5.9.2-11 +- fc5: enable runtime-gcl +- runtime-sbcl: Requires: sbcl = %%{sbcl_version_used_to_build} + * Mon Feb 27 2006 Rex Dieter 5.9.2-10 - respin for sbcl-0.9.10 From fedora-extras-commits at redhat.com Fri Mar 10 19:45:25 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:45:25 -0500 Subject: rpms/perl-Kwiki - New directory Message-ID: <200603101945.k2AJjRCP004350@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4341/perl-Kwiki Log Message: Directory /cvs/extras/rpms/perl-Kwiki added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 19:45:31 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:45:31 -0500 Subject: rpms/perl-Kwiki/devel - New directory Message-ID: <200603101945.k2AJjXeu004365@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4341/perl-Kwiki/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 19:45:51 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:45:51 -0500 Subject: rpms/perl-Kwiki Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603101945.k2AJjrbj004399@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4387 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 19:45:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:45:56 -0500 Subject: rpms/perl-Kwiki/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603101945.k2AJjwZe004419@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4387/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki --- NEW 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 Mar 10 19:46:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:46:28 -0500 Subject: rpms/perl-Kwiki import.log,1.1,1.2 Message-ID: <200603101947.k2AJl0h4004487@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4453 Modified Files: import.log Log Message: auto-import perl-Kwiki-0.38-2 on branch devel from perl-Kwiki-0.38-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 19:45:51 -0000 1.1 +++ import.log 10 Mar 2006 19:46:28 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-0_38-2:HEAD:perl-Kwiki-0.38-2.src.rpm:1142019980 From fedora-extras-commits at redhat.com Fri Mar 10 19:46:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:46:34 -0500 Subject: rpms/perl-Kwiki/devel perl-Kwiki.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603101947.k2AJl6I0004491@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4453/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki.spec Log Message: auto-import perl-Kwiki-0.38-2 on branch devel from perl-Kwiki-0.38-2.src.rpm --- NEW FILE perl-Kwiki.spec --- Name: perl-Kwiki Version: 0.38 Release: 2%{?dist} Summary: Kwiki Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Spoon) >= 0.22 Requires: perl(Spoon) >= 0.22 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description A Wiki is a website that allows its users to add pages, and edit any existing pages. It is one of the most popular forms of web collaboration. If you are new to wiki, visit http://c2.com/cgi/wiki?WelcomeVisitors which is possibly the oldest wiki, and has lots of information about how wikis work. Kwiki is a Perl wiki implementation based on the Spoon application architecture and using the Spiffy object orientation model. The major goals of Kwiki are that it be easy to install, maintain and extend. All the features of a Kwiki wiki come from plugin modules. The base installation comes with the bare minimum plugins to make a working Kwiki. To make a really nice Kwiki installation you need to install additional plugins. Which plugins you pick is entirely up to you. Another goal of Kwiki is that every installation will be unique. When there are hundreds of plugins available, this will hopefully be the case. %prep %setup -q -n Kwiki-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README kwiki COPYING Artistic %{perl_vendorlib}/* %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.32-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Wed Dec 28 2005 Steven Pritchard 0.38-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 19:45:56 -0000 1.1 +++ .cvsignore 10 Mar 2006 19:46:34 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-0.38.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 19:45:56 -0000 1.1 +++ sources 10 Mar 2006 19:46:34 -0000 1.2 @@ -0,0 +1 @@ +85508ce6bdadba28a0512d27c9e83841 Kwiki-0.38.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 20:04:26 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 10 Mar 2006 15:04:26 -0500 Subject: rpms/kdocker/FC-4 kdocker.spec,1.3,1.4 Message-ID: <200603102004.k2AK4wpN006612@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdocker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6594 Modified Files: kdocker.spec Log Message: * Fri Mar 10 2006 Rex Dieter 1.3-5 - build failure, useless -debuginfo (#180103) Index: kdocker.spec =================================================================== RCS file: /cvs/extras/rpms/kdocker/FC-4/kdocker.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kdocker.spec 22 Jan 2006 02:49:32 -0000 1.3 +++ kdocker.spec 10 Mar 2006 20:04:26 -0000 1.4 @@ -2,7 +2,7 @@ Name: kdocker Summary: Dock any application in the system tray Version: 1.3 -Release: 4%{?dist} +Release: 5%{?dist} Group: User Interface/Desktops License: GPL @@ -14,6 +14,10 @@ BuildRequires: desktop-file-utils BuildRequires: qt-devel >= 1:3.3 +%if "%{?fedora}" > "4" +BuildRequires: libXmu-devel +BuildRequires: libXpm-devel +%endif %description KDocker will help you dock any application in the system tray. This means you @@ -56,7 +60,10 @@ %install rm -rf $RPM_BUILD_ROOT +unset QTDIR || : ; . /etc/profile.d/qt.sh + qmake DESTDIR=$RPM_BUILD_ROOT +sed -i -e '/^\s*-\?strip /d' Makefile # naughty qmake make install @@ -87,7 +94,7 @@ %files -f %{name}.lang -%defattr(-, root, root) +%defattr(-,root,root,-) %doc AUTHORS BUGS COPYING CREDITS ChangeLog HACKING README TODO VERSION %{_bindir}/* %dir %{_datadir}/kdocker/ @@ -97,6 +104,12 @@ %changelog +* Fri Mar 10 2006 Rex Dieter 1.3-5 +- build failure, useless -debuginfo (#180103) + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + * Sat Jan 21 2006 Rex Dieter 1.3-4 - .desktop: fix path to app-icon (#178531) From fedora-extras-commits at redhat.com Fri Mar 10 20:06:04 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 10 Mar 2006 15:06:04 -0500 Subject: rpms/kdocker/devel kdocker.spec,1.6,1.7 Message-ID: <200603102006.k2AK6aaS006686@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdocker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6667 Modified Files: kdocker.spec Log Message: * Fri Mar 10 2006 Rex Dieter 1.3-5 - build failure, useless -debuginfo (#180103) Index: kdocker.spec =================================================================== RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kdocker.spec 1 Mar 2006 16:02:10 -0000 1.6 +++ kdocker.spec 10 Mar 2006 20:06:04 -0000 1.7 @@ -2,7 +2,7 @@ Name: kdocker Summary: Dock any application in the system tray Version: 1.3 -Release: 4%{?dist}.4 +Release: 5%{?dist} Group: User Interface/Desktops License: GPL @@ -94,7 +94,7 @@ %files -f %{name}.lang -%defattr(-, root, root) +%defattr(-,root,root,-) %doc AUTHORS BUGS COPYING CREDITS ChangeLog HACKING README TODO VERSION %{_bindir}/* %dir %{_datadir}/kdocker/ @@ -104,6 +104,9 @@ %changelog +* Fri Mar 10 2006 Rex Dieter 1.3-5 +- build failure, useless -debuginfo (#180103) + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Fri Mar 10 20:12:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 15:12:06 -0500 Subject: rpms/perl-Kwiki/devel perl-Kwiki-filter-requires.sh, NONE, 1.1 perl-Kwiki.spec, 1.1, 1.2 Message-ID: <200603102012.k2AKCdX5006786@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6768 Modified Files: perl-Kwiki.spec Added Files: perl-Kwiki-filter-requires.sh Log Message: Improve Summary. Fix up dependency filtering. --- NEW FILE perl-Kwiki-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki/devel/perl-Kwiki.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki.spec 10 Mar 2006 19:46:34 -0000 1.1 +++ perl-Kwiki.spec 10 Mar 2006 20:12:06 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Kwiki Version: 0.38 -Release: 2%{?dist} -Summary: Kwiki Perl module +Release: 3%{?dist} +Summary: Perl wiki implementation License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki/ @@ -12,6 +12,10 @@ Requires: perl(Spoon) >= 0.22 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source1: %{name}-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description A Wiki is a website that allows its users to add pages, and edit any existing pages. It is one of the most popular forms of web collaboration. @@ -33,11 +37,7 @@ %prep %setup -q -n Kwiki-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE1} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -61,7 +61,7 @@ make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) @@ -72,7 +72,11 @@ %{_mandir}/man3/* %changelog -* Mon Feb 27 2006 Steven Pritchard 0.32-2 +* Fri Mar 10 2006 Steven Pritchard 0.38-3 +- Improve Summary. +- Fix up dependency filtering. + +* Mon Feb 27 2006 Steven Pritchard 0.38-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Fri Mar 10 21:35:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 16:35:06 -0500 Subject: owners owners.list,1.730,1.731 Message-ID: <200603102135.k2ALZdVN009145@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9126 Modified Files: owners.list Log Message: Add perl-Kwiki. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.730 retrieving revision 1.731 diff -u -r1.730 -r1.731 --- owners.list 10 Mar 2006 18:47:14 -0000 1.730 +++ owners.list 10 Mar 2006 21:35:06 -0000 1.731 @@ -941,6 +941,7 @@ 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 Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki|Perl wiki implementation|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 10 21:46:37 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 10 Mar 2006 16:46:37 -0500 Subject: kadischi/lib functions.py,1.2,1.3 Message-ID: <200603102147.k2ALl7wB009189@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9170/kadischi/lib Modified Files: functions.py Log Message: Commit for bug #169812 and #178623 (functions.py) Index: functions.py =================================================================== RCS file: /cvs/devel/kadischi/lib/functions.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- functions.py 28 Aug 2005 10:20:17 -0000 1.2 +++ functions.py 10 Mar 2006 21:46:35 -0000 1.3 @@ -6,6 +6,10 @@ import rpm import urlgrabber.grabber as grabber +# Import isys for get_kernel_version() +sys.path.append("/usr/lib/anaconda") +import isys + def normalize_path (parts, rootpath = None): if rootpath == None: rootpath = '/' @@ -65,9 +69,21 @@ kernel_version = None clear_rpm_db_files (rootdir) ts = rpm.TransactionSet (rootdir) - for mi in ts.dbMatch ('name', 'kernel'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) - clear_rpm_db_files (rootdir) + while kernel_version == None: + if isys.smpAvailable() or isys.htavailable(): + for mi in ts.dbMatch ('name', 'kernel-xen-hypervisor'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'hypervisor' + clear_rpm_db_files (rootdir) + for mi in ts.dbMatch ('name', 'kernel-smp'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp' + clear_rpm_db_files (rootdir) + else: + for mi in ts.dbMatch ('name', 'kernel-xen-hypervisor'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'hypervisor' + clear_rpm_db_files (rootdir) + for mi in ts.dbMatch ('name', 'kernel'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + clear_rpm_db_files (rootdir) return kernel_version def clean_directory (dir, remove_when_done=True, keep_child_directories=False): @@ -116,4 +132,4 @@ flc_log ('Done.') else: flc_log ('You should clean temporary files.') - sys.exit (1) \ No newline at end of file + sys.exit (1) From fedora-extras-commits at redhat.com Fri Mar 10 22:07:14 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:07:14 -0500 Subject: rpms/perl-Mail-SPF-Query/devel .cvsignore, 1.2, 1.3 perl-Mail-SPF-Query.spec, 1.2, 1.3 sources, 1.2, 1.3 use-sys-hostname.patch, 1.1, 1.2 MSQ-fallback.patch, 1.1, NONE Message-ID: <200603102207.k2AM7mZu011234@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Mail-SPF-Query/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11198 Modified Files: .cvsignore perl-Mail-SPF-Query.spec sources use-sys-hostname.patch Removed Files: MSQ-fallback.patch Log Message: Update to 1.999.1. Drop MSQ-fallback.patch (upstream seems to have a similar fix). Update use-sys-hostname.patch. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Aug 2005 15:59:58 -0000 1.2 +++ .cvsignore 10 Mar 2006 22:07:14 -0000 1.3 @@ -1 +1 @@ -Mail-SPF-Query-1.997.tar.gz +Mail-SPF-Query-1.999.1.tar.gz Index: perl-Mail-SPF-Query.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/perl-Mail-SPF-Query.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Mail-SPF-Query.spec 6 Sep 2005 00:49:52 -0000 1.2 +++ perl-Mail-SPF-Query.spec 10 Mar 2006 22:07:14 -0000 1.3 @@ -1,13 +1,12 @@ Name: perl-Mail-SPF-Query -Version: 1.997 -Release: 5%{?dist} +Version: 1.999.1 +Release: 1%{?dist} Summary: Mail::SPF::Query Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-SPF-Query/ Source0: http://www.cpan.org/modules/by-module/Mail/Mail-SPF-Query-%{version}.tar.gz # From Paul Howarth -Patch0: MSQ-fallback.patch Patch1: use-sys-hostname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,9 +24,10 @@ %prep %setup -q -n Mail-SPF-Query-%{version} -%patch0 -p1 %patch1 -p1 +chmod -x examples/* bin/* + %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile @@ -48,6 +48,7 @@ # Don't include the spfd and spfquery scripts in _bindir. rm -f $RPM_BUILD_ROOT%{_bindir}/spfd $RPM_BUILD_ROOT%{_bindir}/spfquery +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1 # Does a lot of external DNS lookups. %check @@ -58,11 +59,16 @@ %files %defattr(-,root,root,-) -%doc Changes README sample spfd spfquery COPYING Artistic +%doc CHANGES README examples/ bin/ COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 1.999.1-1 +- Update to 1.999.1 +- Drop MSQ-fallback.patch (upstream seems to have a similar fix) +- Update use-sys-hostname.patch + * Mon Sep 05 2005 Steven Pritchard 1.997-5 - Spec cleanup - Include COPYING and Artistic Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Aug 2005 15:59:58 -0000 1.2 +++ sources 10 Mar 2006 22:07:14 -0000 1.3 @@ -1 +1 @@ -9e110d00520e0fe174c25c0734a8baf6 Mail-SPF-Query-1.997.tar.gz +6d62d024d1614fa1fa4f43bd39ee7bf0 Mail-SPF-Query-1.999.1.tar.gz use-sys-hostname.patch: Index: use-sys-hostname.patch =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/use-sys-hostname.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- use-sys-hostname.patch 4 Aug 2005 15:59:58 -0000 1.1 +++ use-sys-hostname.patch 10 Mar 2006 22:07:14 -0000 1.2 @@ -1,12 +1,20 @@ ---- Mail-SPF-Query-1.997.orig/Query.pm 2005-07-21 15:24:38.000000000 -0500 -+++ Mail-SPF-Query-1.997/Query.pm 2005-07-21 15:25:32.000000000 -0500 -@@ -325,8 +325,7 @@ +--- Mail-SPF-Query-1.999.1/lib/Mail/SPF/Query.pm.orig 2006-02-26 11:41:11.000000000 -0600 ++++ Mail-SPF-Query-1.999.1/lib/Mail/SPF/Query.pm 2006-03-10 15:56:05.000000000 -0600 +@@ -23,7 +23,7 @@ + our $VERSION = '1.999.1'; # fake version for EU::MM and CPAN + $VERSION = '1.999001'; # real numerical version + +-use Sys::Hostname::Long; ++use Sys::Hostname; + use Net::DNS qw(); # by default it exports mx, which we define. + use Net::CIDR::Lite; + use URI::Escape; +@@ -296,7 +296,7 @@ + $query->{ipv6} ? die "IPv6 not supported" : ""); if (not $query->{myhostname}) { - use Sys::Hostname; -- eval { require Sys::Hostname::Long }; -- $query->{myhostname} = $@ ? hostname() : Sys::Hostname::Long::hostname_long(); +- $query->{myhostname} = Sys::Hostname::Long::hostname_long(); + $query->{myhostname} = hostname(); } - $query->{myhostname} ||= "localhost"; + --- MSQ-fallback.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 22:32:57 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 10 Mar 2006 17:32:57 -0500 Subject: rpms/lib765 import.log,1.4,1.5 Message-ID: <200603102233.k2AMXTsB011427@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11395 Modified Files: import.log Log Message: auto-import lib765-0.3.3-6 on branch devel from lib765-0.3.3-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lib765/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 10 Mar 2006 01:29:42 -0000 1.4 +++ import.log 10 Mar 2006 22:32:56 -0000 1.5 @@ -1,3 +1,4 @@ lib765-0_3_3-3:HEAD:lib765-0.3.3-3.src.rpm:1137113910 lib765-0_3_3-4:HEAD:lib765-0.3.3-4.src.rpm:1141758291 lib765-0_3_3-5:HEAD:lib765-0.3.3-5.src.rpm:1141954170 +lib765-0_3_3-6:HEAD:lib765-0.3.3-6.src.rpm:1142029964 From fedora-extras-commits at redhat.com Fri Mar 10 22:33:02 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 10 Mar 2006 17:33:02 -0500 Subject: rpms/lib765/devel lib765.spec,1.3,1.4 Message-ID: <200603102233.k2AMXZq5011430@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11395/devel Modified Files: lib765.spec Log Message: auto-import lib765-0.3.3-6 on branch devel from lib765-0.3.3-6.src.rpm Index: lib765.spec =================================================================== RCS file: /cvs/extras/rpms/lib765/devel/lib765.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lib765.spec 10 Mar 2006 01:29:49 -0000 1.3 +++ lib765.spec 10 Mar 2006 22:33:02 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A library for emulating the uPD765a floppy controller Name: lib765 Version: 0.3.3 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.seasip.demon.co.uk/Unix/LibDsk/lib765-%{version}.tar.gz @@ -16,7 +16,7 @@ %package devel Summary: Development files for lib765. Group: Development/Libraries -Requires: libdsk-devel, %{name}=%{version}-%{release} +Requires: libdsk-devel, %{name} = %{version}-%{release} %description devel Development files for lib765. @@ -51,6 +51,9 @@ %exclude %{_libdir}/lib765.la %changelog +* Fri Mar 10 2006 Paul F. Johnson 0.3.3-6 +- Minor tweak to the spec file + * Thu Mar 9 2006 Paul F. Johnson 0.3.3-5 - Bug in the spec file means it didn't compile. From fedora-extras-commits at redhat.com Fri Mar 10 22:36:04 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:36:04 -0500 Subject: rpms/perl-IO-All/devel IO-All-filter-requires.sh, NONE, 1.1 perl-IO-All.spec, 1.1, 1.2 Message-ID: <200603102236.k2AMaaZ9011519@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11452 Modified Files: perl-IO-All.spec Added Files: IO-All-filter-requires.sh Log Message: Change dep filter. Various cleanups to match current cpanspec. --- NEW FILE IO-All-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-IO-All.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/perl-IO-All.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-IO-All.spec 3 Mar 2006 01:22:22 -0000 1.1 +++ perl-IO-All.spec 10 Mar 2006 22:36:04 -0000 1.2 @@ -1,17 +1,21 @@ Name: perl-IO-All Version: 0.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: IO::All Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-All/ -Source0: http://www.cpan.org/modules/by-module/IO/IO-All-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/IO-All-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Spiffy) >= 0.21 Requires: perl(Spiffy) >= 0.21 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: IO-All-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description The IO::All object is a proxy for IO::File, IO::Dir, IO::Socket, IO::String, Tie::File, File::Spec, File::Path and File::ReadBackwards; as @@ -23,11 +27,7 @@ %prep %setup -q -n IO-All-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -44,22 +44,23 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check %{?_with_check:make test} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.33-3 +- Change dep filter. +- Various cleanups to match current cpanspec. + * Mon Feb 27 2006 Steven Pritchard 0.33-2 - Filter Requires: perl(mixin). - Turn off "make test" for now. From fedora-extras-commits at redhat.com Fri Mar 10 22:47:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:47:24 -0500 Subject: rpms/perl-IO-All/FC-4 IO-All-filter-requires.sh, NONE, 1.1 perl-IO-All.spec, 1.1, 1.2 Message-ID: <200603102247.k2AMlumt011617@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11599 Modified Files: perl-IO-All.spec Added Files: IO-All-filter-requires.sh Log Message: Change dep filter. Various cleanups to match current cpanspec. --- NEW FILE IO-All-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-IO-All.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/FC-4/perl-IO-All.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-IO-All.spec 3 Mar 2006 01:22:22 -0000 1.1 +++ perl-IO-All.spec 10 Mar 2006 22:47:24 -0000 1.2 @@ -1,17 +1,21 @@ Name: perl-IO-All Version: 0.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: IO::All Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-All/ -Source0: http://www.cpan.org/modules/by-module/IO/IO-All-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/IO-All-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Spiffy) >= 0.21 Requires: perl(Spiffy) >= 0.21 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: IO-All-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description The IO::All object is a proxy for IO::File, IO::Dir, IO::Socket, IO::String, Tie::File, File::Spec, File::Path and File::ReadBackwards; as @@ -23,11 +27,7 @@ %prep %setup -q -n IO-All-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -44,22 +44,23 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check %{?_with_check:make test} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.33-3 +- Change dep filter. +- Various cleanups to match current cpanspec. + * Mon Feb 27 2006 Steven Pritchard 0.33-2 - Filter Requires: perl(mixin). - Turn off "make test" for now. From fedora-extras-commits at redhat.com Fri Mar 10 22:58:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:58:06 -0500 Subject: rpms/perl-Kwiki-ModPerl - New directory Message-ID: <200603102258.k2AMw8EQ011754@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11743/perl-Kwiki-ModPerl Log Message: Directory /cvs/extras/rpms/perl-Kwiki-ModPerl added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 22:58:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:58:12 -0500 Subject: rpms/perl-Kwiki-ModPerl/devel - New directory Message-ID: <200603102258.k2AMwEZx011779@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11743/perl-Kwiki-ModPerl/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-ModPerl/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 22:58:30 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:58:30 -0500 Subject: rpms/perl-Kwiki-ModPerl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102258.k2AMwW0p011822@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11810 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-ModPerl --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-ModPerl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 22:58:36 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:58:36 -0500 Subject: rpms/perl-Kwiki-ModPerl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102258.k2AMwcis011840@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11810/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-ModPerl --- NEW 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 Mar 10 22:58:13 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:58:13 -0500 Subject: owners owners.list,1.731,1.732 Message-ID: <200603102258.k2AMwjX8011853@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11757 Modified Files: owners.list Log Message: Add perl-Kwiki-ModPerl. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.731 retrieving revision 1.732 diff -u -r1.731 -r1.732 --- owners.list 10 Mar 2006 21:35:06 -0000 1.731 +++ owners.list 10 Mar 2006 22:58:13 -0000 1.732 @@ -942,6 +942,7 @@ 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 Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki|Perl wiki implementation|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-ModPerl|Kwiki::ModPerl Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 10 22:59:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:59:07 -0500 Subject: rpms/perl-Kwiki-ModPerl import.log,1.1,1.2 Message-ID: <200603102259.k2AMxdfd011918@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11884 Modified Files: import.log Log Message: auto-import perl-Kwiki-ModPerl-0.09-2 on branch devel from perl-Kwiki-ModPerl-0.09-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-ModPerl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 22:58:30 -0000 1.1 +++ import.log 10 Mar 2006 22:59:06 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-ModPerl-0_09-2:HEAD:perl-Kwiki-ModPerl-0.09-2.src.rpm:1142031539 From fedora-extras-commits at redhat.com Fri Mar 10 22:59:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:59:12 -0500 Subject: rpms/perl-Kwiki-ModPerl/devel perl-Kwiki-ModPerl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102259.k2AMxjuS011922@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11884/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-ModPerl.spec Log Message: auto-import perl-Kwiki-ModPerl-0.09-2 on branch devel from perl-Kwiki-ModPerl-0.09-2.src.rpm --- NEW FILE perl-Kwiki-ModPerl.spec --- Name: perl-Kwiki-ModPerl Version: 0.09 Release: 2%{?dist} Summary: Kwiki::ModPerl Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-ModPerl/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ModPerl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.32 BuildRequires: perl(mod_perl2) Requires: perl(Kwiki) >= 0.32 Requires: perl(mod_perl2) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki mod_perl plugin. %prep %setup -q -n Kwiki-ModPerl-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.09-2 - Drop explicit BR: perl. * Thu Dec 29 2005 Steven Pritchard 0.09-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-ModPerl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 22:58:35 -0000 1.1 +++ .cvsignore 10 Mar 2006 22:59:12 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-ModPerl-0.09.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-ModPerl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 22:58:35 -0000 1.1 +++ sources 10 Mar 2006 22:59:12 -0000 1.2 @@ -0,0 +1 @@ +f8508aab16b000a363aeab15823cca7a Kwiki-ModPerl-0.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:02:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:02:43 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs - New directory Message-ID: <200603102302.k2AN2jcv013962@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13949/perl-Kwiki-Archive-Rcs Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Archive-Rcs added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:02:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:02:50 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs/devel - New directory Message-ID: <200603102302.k2AN2q7T013981@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13949/perl-Kwiki-Archive-Rcs/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:03:19 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:03:19 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102303.k2AN3LRO014018@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14006 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Archive-Rcs --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Archive-Rcs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:03:31 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:03:31 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102303.k2AN3ber014034@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14006/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Archive-Rcs --- NEW 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 Mar 10 23:04:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:04:22 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs import.log,1.1,1.2 Message-ID: <200603102304.k2AN4sPp014106@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14072 Modified Files: import.log Log Message: auto-import perl-Kwiki-Archive-Rcs-0.15-3 on branch devel from perl-Kwiki-Archive-Rcs-0.15-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:03:19 -0000 1.1 +++ import.log 10 Mar 2006 23:04:21 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Archive-Rcs-0_15-3:HEAD:perl-Kwiki-Archive-Rcs-0.15-3.src.rpm:1142031855 From fedora-extras-commits at redhat.com Fri Mar 10 23:04:30 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:04:30 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs/devel perl-Kwiki-Archive-Rcs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102305.k2AN52tP014110@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14072/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Archive-Rcs.spec Log Message: auto-import perl-Kwiki-Archive-Rcs-0.15-3 on branch devel from perl-Kwiki-Archive-Rcs-0.15-3.src.rpm --- NEW FILE perl-Kwiki-Archive-Rcs.spec --- Name: perl-Kwiki-Archive-Rcs Version: 0.15 Release: 3%{?dist} Summary: Kwiki::Archive::Rcs Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Archive-Rcs/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Archive-Rcs-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.38 Requires: perl(Kwiki) >= 0.38 Requires: rcs Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki Page Archival Using RCS. %prep %setup -q -n Kwiki-Archive-Rcs-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.15-3 - Add explicit Requires: rcs. * Mon Feb 27 2006 Steven Pritchard 0.15-2 - Drop explicit BR: perl. * Thu Dec 29 2005 Steven Pritchard 0.15-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:03:31 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:04:30 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Archive-Rcs-0.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:03:31 -0000 1.1 +++ sources 10 Mar 2006 23:04:30 -0000 1.2 @@ -0,0 +1 @@ +02ac4c1104fcbea0779562501e45305c Kwiki-Archive-Rcs-0.15.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:13:51 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:13:51 -0500 Subject: rpms/perl-Kwiki-Revisions - New directory Message-ID: <200603102313.k2ANDrHS014253@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14245/perl-Kwiki-Revisions Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Revisions added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:13:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:13:56 -0500 Subject: rpms/perl-Kwiki-Revisions/devel - New directory Message-ID: <200603102313.k2ANDxnu014268@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14245/perl-Kwiki-Revisions/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Revisions/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:14:14 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:14:14 -0500 Subject: rpms/perl-Kwiki-Revisions Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102314.k2ANEG0M014305@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14293 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Revisions --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Revisions all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:14:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:14:22 -0500 Subject: rpms/perl-Kwiki-Revisions/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102314.k2ANEOVn014324@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14293/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Revisions --- NEW 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 Mar 10 23:14:41 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:14:41 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs/devel perl-Kwiki-Archive-Rcs.spec, 1.1, 1.2 Message-ID: <200603102315.k2ANFDOI014420@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14354 Modified Files: perl-Kwiki-Archive-Rcs.spec Log Message: Improve Summary. Index: perl-Kwiki-Archive-Rcs.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel/perl-Kwiki-Archive-Rcs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-Archive-Rcs.spec 10 Mar 2006 23:04:30 -0000 1.1 +++ perl-Kwiki-Archive-Rcs.spec 10 Mar 2006 23:14:41 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Kwiki-Archive-Rcs Version: 0.15 -Release: 3%{?dist} -Summary: Kwiki::Archive::Rcs Perl module +Release: 4%{?dist} +Summary: Kwiki Page Archival Using RCS License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Archive-Rcs/ @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.15-4 +- Improve Summary. + * Mon Feb 27 2006 Steven Pritchard 0.15-3 - Add explicit Requires: rcs. From fedora-extras-commits at redhat.com Fri Mar 10 23:15:01 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:15:01 -0500 Subject: rpms/perl-Kwiki-Revisions import.log,1.1,1.2 Message-ID: <200603102315.k2ANFXUu014423@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14386 Modified Files: import.log Log Message: auto-import perl-Kwiki-Revisions-0.15-2 on branch devel from perl-Kwiki-Revisions-0.15-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Revisions/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:14:14 -0000 1.1 +++ import.log 10 Mar 2006 23:15:01 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Revisions-0_15-2:HEAD:perl-Kwiki-Revisions-0.15-2.src.rpm:1142032484 From fedora-extras-commits at redhat.com Fri Mar 10 23:15:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:15:07 -0500 Subject: rpms/perl-Kwiki-Revisions/devel perl-Kwiki-Revisions.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102315.k2ANFeC8014427@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14386/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Revisions.spec Log Message: auto-import perl-Kwiki-Revisions-0.15-2 on branch devel from perl-Kwiki-Revisions-0.15-2.src.rpm --- NEW FILE perl-Kwiki-Revisions.spec --- Name: perl-Kwiki-Revisions Version: 0.15 Release: 2%{?dist} Summary: Kwiki::Revisions Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Revisions/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Revisions-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.38 Requires: perl(Kwiki) >= 0.38 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki Revisions plugin. %prep %setup -q -n Kwiki-Revisions-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.15-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.15-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Revisions/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:14:22 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:15:07 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Revisions-0.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Revisions/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:14:22 -0000 1.1 +++ sources 10 Mar 2006 23:15:07 -0000 1.2 @@ -0,0 +1 @@ +f78b7af532c19df58d351c8a718c08cf Kwiki-Revisions-0.15.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:23:11 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:23:11 -0500 Subject: rpms/perl-Kwiki-Revisions/devel Kwiki-Revisions-filter-requires.sh, NONE, 1.1 perl-Kwiki-Revisions.spec, 1.1, 1.2 Message-ID: <200603102323.k2ANNhpG014541@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14521 Modified Files: perl-Kwiki-Revisions.spec Added Files: Kwiki-Revisions-filter-requires.sh Log Message: Cleanup to match current cpanspec. --- NEW FILE Kwiki-Revisions-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-Revisions.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Revisions/devel/perl-Kwiki-Revisions.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-Revisions.spec 10 Mar 2006 23:15:07 -0000 1.1 +++ perl-Kwiki-Revisions.spec 10 Mar 2006 23:23:11 -0000 1.2 @@ -1,28 +1,28 @@ Name: perl-Kwiki-Revisions Version: 0.15 -Release: 2%{?dist} -Summary: Kwiki::Revisions Perl module +Release: 3%{?dist} +Summary: Kwiki Revisions plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Revisions/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Revisions-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-Revisions-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.38 Requires: perl(Kwiki) >= 0.38 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-Revisions-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki Revisions plugin. %prep %setup -q -n Kwiki-Revisions-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -39,22 +39,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.15-3 +- Cleanup to match current cpanspec. + * Mon Feb 27 2006 Steven Pritchard 0.15-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Fri Mar 10 23:24:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:24:50 -0500 Subject: rpms/perl-Kwiki-NewPage - New directory Message-ID: <200603102324.k2ANOqv4014641@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14633/perl-Kwiki-NewPage Log Message: Directory /cvs/extras/rpms/perl-Kwiki-NewPage added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:24:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:24:56 -0500 Subject: rpms/perl-Kwiki-NewPage/devel - New directory Message-ID: <200603102324.k2ANOw0F014660@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14633/perl-Kwiki-NewPage/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-NewPage/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:25:13 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:25:13 -0500 Subject: rpms/perl-Kwiki-NewPage Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102325.k2ANPF5i014699@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14683 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-NewPage --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-NewPage all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:25:19 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:25:19 -0500 Subject: rpms/perl-Kwiki-NewPage/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102325.k2ANPLrX014722@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14683/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-NewPage --- NEW 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 Mar 10 23:25:57 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:25:57 -0500 Subject: rpms/perl-Kwiki-RecentChanges - New directory Message-ID: <200603102325.k2ANPxxp014841@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14823/perl-Kwiki-RecentChanges Log Message: Directory /cvs/extras/rpms/perl-Kwiki-RecentChanges added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:26:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:26:03 -0500 Subject: rpms/perl-Kwiki-RecentChanges/devel - New directory Message-ID: <200603102326.k2ANQ5B2014862@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14823/perl-Kwiki-RecentChanges/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:26:20 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:26:20 -0500 Subject: rpms/perl-Kwiki-RecentChanges Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200603102326.k2ANQMTX014900@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14884 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-RecentChanges --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-RecentChanges all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:25:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:25:50 -0500 Subject: rpms/perl-Kwiki-NewPage import.log,1.1,1.2 Message-ID: <200603102326.k2ANQN8T014904@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14795 Modified Files: import.log Log Message: auto-import perl-Kwiki-NewPage-0.12-2 on branch devel from perl-Kwiki-NewPage-0.12-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-NewPage/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:25:13 -0000 1.1 +++ import.log 10 Mar 2006 23:25:50 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-NewPage-0_12-2:HEAD:perl-Kwiki-NewPage-0.12-2.src.rpm:1142033143 From fedora-extras-commits at redhat.com Fri Mar 10 23:26:26 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:26:26 -0500 Subject: rpms/perl-Kwiki-RecentChanges/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102326.k2ANQSBS014922@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14884/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-RecentChanges --- NEW 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 Mar 10 23:25:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:25:56 -0500 Subject: rpms/perl-Kwiki-NewPage/devel perl-Kwiki-NewPage.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102326.k2ANQTv4014926@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14795/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-NewPage.spec Log Message: auto-import perl-Kwiki-NewPage-0.12-2 on branch devel from perl-Kwiki-NewPage-0.12-2.src.rpm --- NEW FILE perl-Kwiki-NewPage.spec --- Name: perl-Kwiki-NewPage Version: 0.12 Release: 2%{?dist} Summary: Kwiki::NewPage Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-NewPage/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-NewPage-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.34 Requires: perl(Kwiki) >= 0.34 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki New Page plugin. %prep %setup -q -n Kwiki-NewPage-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.12-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.12-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-NewPage/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:25:18 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:25:56 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-NewPage-0.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-NewPage/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:25:18 -0000 1.1 +++ sources 10 Mar 2006 23:25:56 -0000 1.2 @@ -0,0 +1 @@ +14feb28dc087ea07dccad58f05842302 Kwiki-NewPage-0.12.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:27:01 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:27:01 -0500 Subject: rpms/perl-Kwiki-Search - New directory Message-ID: <200603102327.k2ANR3a5015070@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15044/perl-Kwiki-Search Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Search added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:27:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:27:07 -0500 Subject: rpms/perl-Kwiki-Search/devel - New directory Message-ID: <200603102327.k2ANR9x4015099@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15044/perl-Kwiki-Search/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Search/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:26:57 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:26:57 -0500 Subject: rpms/perl-Kwiki-RecentChanges import.log,1.1,1.2 Message-ID: <200603102327.k2ANRT3T015127@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15024 Modified Files: import.log Log Message: auto-import perl-Kwiki-RecentChanges-0.13-2 on branch devel from perl-Kwiki-RecentChanges-0.13-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:26:19 -0000 1.1 +++ import.log 10 Mar 2006 23:26:57 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-RecentChanges-0_13-2:HEAD:perl-Kwiki-RecentChanges-0.13-2.src.rpm:1142033209 From fedora-extras-commits at redhat.com Fri Mar 10 23:27:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:27:03 -0500 Subject: rpms/perl-Kwiki-RecentChanges/devel perl-Kwiki-RecentChanges.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102327.k2ANRZjs015146@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15024/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-RecentChanges.spec Log Message: auto-import perl-Kwiki-RecentChanges-0.13-2 on branch devel from perl-Kwiki-RecentChanges-0.13-2.src.rpm --- NEW FILE perl-Kwiki-RecentChanges.spec --- Name: perl-Kwiki-RecentChanges Version: 0.13 Release: 2%{?dist} Summary: Kwiki::RecentChanges Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-RecentChanges/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-RecentChanges-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki Recent Changes plugin. %prep %setup -q -n Kwiki-RecentChanges-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.13-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.13-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:26:26 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:27:03 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-RecentChanges-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:26:26 -0000 1.1 +++ sources 10 Mar 2006 23:27:03 -0000 1.2 @@ -0,0 +1 @@ +393c2a606b3574b775c2ce5b23fc7b8d Kwiki-RecentChanges-0.13.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:27:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:27:39 -0500 Subject: rpms/perl-Kwiki-Search Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102327.k2ANRf64015195@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15157 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Search --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Search all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:27:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:27:45 -0500 Subject: rpms/perl-Kwiki-Search/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102327.k2ANRlB9015217@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15157/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Search --- NEW 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 Mar 10 23:28:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:22 -0500 Subject: rpms/perl-Kwiki-UserPreferences - New directory Message-ID: <200603102328.k2ANSOMi015273@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262/perl-Kwiki-UserPreferences Log Message: Directory /cvs/extras/rpms/perl-Kwiki-UserPreferences added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:28:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:27 -0500 Subject: rpms/perl-Kwiki-UserPreferences/devel - New directory Message-ID: <200603102328.k2ANSVYD015294@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262/perl-Kwiki-UserPreferences/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:28:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:47 -0500 Subject: rpms/perl-Kwiki-UserPreferences Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200603102328.k2ANSn3V015368@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15350 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-UserPreferences --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-UserPreferences all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:28:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:53 -0500 Subject: rpms/perl-Kwiki-UserPreferences/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102328.k2ANStda015386@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15350/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-UserPreferences --- NEW 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 Mar 10 23:28:36 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:36 -0500 Subject: rpms/perl-Kwiki-Search import.log,1.1,1.2 Message-ID: <200603102329.k2ANTB6Q015401@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15309 Modified Files: import.log Log Message: auto-import perl-Kwiki-Search-0.12-2 on branch devel from perl-Kwiki-Search-0.12-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Search/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:27:39 -0000 1.1 +++ import.log 10 Mar 2006 23:28:36 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Search-0_12-2:HEAD:perl-Kwiki-Search-0.12-2.src.rpm:1142033305 From fedora-extras-commits at redhat.com Fri Mar 10 23:28:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:42 -0500 Subject: rpms/perl-Kwiki-Search/devel perl-Kwiki-Search.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102329.k2ANTE1R015405@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15309/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Search.spec Log Message: auto-import perl-Kwiki-Search-0.12-2 on branch devel from perl-Kwiki-Search-0.12-2.src.rpm --- NEW FILE perl-Kwiki-Search.spec --- Name: perl-Kwiki-Search Version: 0.12 Release: 2%{?dist} Summary: Kwiki::Search Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Search/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Search-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.34 Requires: perl(Kwiki) >= 0.34 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki Search plugin. %prep %setup -q -n Kwiki-Search-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.12-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.12-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Search/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:27:45 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:28:42 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Search-0.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Search/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:27:45 -0000 1.1 +++ sources 10 Mar 2006 23:28:42 -0000 1.2 @@ -0,0 +1 @@ +80350bc49752c514ba2df21ddd39a3fb Kwiki-Search-0.12.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:29:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:29:47 -0500 Subject: rpms/perl-Kwiki-UserPreferences import.log,1.1,1.2 Message-ID: <200603102330.k2ANUJHf015499@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15460 Modified Files: import.log Log Message: auto-import perl-Kwiki-UserPreferences-0.13-2 on branch devel from perl-Kwiki-UserPreferences-0.13-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserPreferences/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:28:46 -0000 1.1 +++ import.log 10 Mar 2006 23:29:47 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-UserPreferences-0_13-2:HEAD:perl-Kwiki-UserPreferences-0.13-2.src.rpm:1142033378 From fedora-extras-commits at redhat.com Fri Mar 10 23:29:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:29:53 -0500 Subject: rpms/perl-Kwiki-UserPreferences/devel perl-Kwiki-UserPreferences.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102330.k2ANUPur015503@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15460/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-UserPreferences.spec Log Message: auto-import perl-Kwiki-UserPreferences-0.13-2 on branch devel from perl-Kwiki-UserPreferences-0.13-2.src.rpm --- NEW FILE perl-Kwiki-UserPreferences.spec --- Name: perl-Kwiki-UserPreferences Version: 0.13 Release: 2%{?dist} Summary: Kwiki::UserPreferences Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-UserPreferences/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserPreferences-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki User Preferences plugin. %prep %setup -q -n Kwiki-UserPreferences-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.13-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.13-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:28:52 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:29:53 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-UserPreferences-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:28:52 -0000 1.1 +++ sources 10 Mar 2006 23:29:53 -0000 1.2 @@ -0,0 +1 @@ +8b75bffcb6cf4fa79a3f71612efa9339 Kwiki-UserPreferences-0.13.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:31:26 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:31:26 -0500 Subject: owners owners.list,1.732,1.733 Message-ID: <200603102331.k2ANVwrs015561@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15543 Modified Files: owners.list Log Message: Adding: perl-Kwiki-Archive-Rcs perl-Kwiki-NewPage perl-Kwiki-RecentChanges perl-Kwiki-Revisions perl-Kwiki-Search perl-Kwiki-UserPreferences Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.732 retrieving revision 1.733 diff -u -r1.732 -r1.733 --- owners.list 10 Mar 2006 22:58:13 -0000 1.732 +++ owners.list 10 Mar 2006 23:31:26 -0000 1.733 @@ -942,7 +942,13 @@ 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 Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki|Perl wiki implementation|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Archive-Rcs|Kwiki::Archive::Rcs Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-ModPerl|Kwiki::ModPerl Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-NewPage|Kwiki::NewPage Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-RecentChanges|Kwiki::RecentChanges Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Revisions|Kwiki::Revisions Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Search|Kwiki::Search Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-UserPreferences|Kwiki::UserPreferences Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 10 23:37:19 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:37:19 -0500 Subject: rpms/perl-Kwiki-UserName - New directory Message-ID: <200603102337.k2ANbLRa015674@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15666/perl-Kwiki-UserName Log Message: Directory /cvs/extras/rpms/perl-Kwiki-UserName added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:37:25 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:37:25 -0500 Subject: rpms/perl-Kwiki-UserName/devel - New directory Message-ID: <200603102337.k2ANbRYJ015689@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15666/perl-Kwiki-UserName/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-UserName/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:37:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:37:42 -0500 Subject: rpms/perl-Kwiki-UserName Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102337.k2ANbi6O015723@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15711 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-UserName --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-UserName all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:37:48 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:37:48 -0500 Subject: rpms/perl-Kwiki-UserName/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102337.k2ANboLg015743@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15711/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-UserName --- NEW 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 Mar 10 23:38:17 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:38:17 -0500 Subject: rpms/perl-Kwiki-UserName import.log,1.1,1.2 Message-ID: <200603102338.k2ANcnf1015814@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15780 Modified Files: import.log Log Message: auto-import perl-Kwiki-UserName-0.14-2 on branch devel from perl-Kwiki-UserName-0.14-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserName/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:37:42 -0000 1.1 +++ import.log 10 Mar 2006 23:38:16 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-UserName-0_14-2:HEAD:perl-Kwiki-UserName-0.14-2.src.rpm:1142033889 From fedora-extras-commits at redhat.com Fri Mar 10 23:38:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:38:22 -0500 Subject: rpms/perl-Kwiki-UserName/devel perl-Kwiki-UserName.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102338.k2ANctK3015818@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15780/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-UserName.spec Log Message: auto-import perl-Kwiki-UserName-0.14-2 on branch devel from perl-Kwiki-UserName-0.14-2.src.rpm --- NEW FILE perl-Kwiki-UserName.spec --- Name: perl-Kwiki-UserName Version: 0.14 Release: 2%{?dist} Summary: Kwiki::UserName Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-UserName/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserName-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 BuildRequires: perl(Kwiki::UserPreferences) >= 0.13 Requires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki::UserPreferences) >= 0.13 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki User Name plugin. %prep %setup -q -n Kwiki-UserName-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.14-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.14-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserName/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:37:48 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:38:22 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-UserName-0.14.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserName/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:37:48 -0000 1.1 +++ sources 10 Mar 2006 23:38:22 -0000 1.2 @@ -0,0 +1 @@ +a079e9735032183d9080e7da015c3bcf Kwiki-UserName-0.14.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:42:09 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:42:09 -0500 Subject: rpms/perl-Kwiki-Diff - New directory Message-ID: <200603102342.k2ANgBwa015938@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15930/perl-Kwiki-Diff Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Diff added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:42:15 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:42:15 -0500 Subject: rpms/perl-Kwiki-Diff/devel - New directory Message-ID: <200603102342.k2ANgHlp015953@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15930/perl-Kwiki-Diff/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Diff/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:42:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:42:33 -0500 Subject: rpms/perl-Kwiki-Diff Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102342.k2ANgZIi015987@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15975 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Diff --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Diff all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:42:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:42:39 -0500 Subject: rpms/perl-Kwiki-Diff/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102342.k2ANgfWJ016007@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15975/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Diff --- NEW 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 Mar 10 23:43:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:43:16 -0500 Subject: rpms/perl-Kwiki-Diff import.log,1.1,1.2 Message-ID: <200603102343.k2ANhm5B016079@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16042 Modified Files: import.log Log Message: auto-import perl-Kwiki-Diff-0.03-2 on branch devel from perl-Kwiki-Diff-0.03-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Diff/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:42:33 -0000 1.1 +++ import.log 10 Mar 2006 23:43:15 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Diff-0_03-2:HEAD:perl-Kwiki-Diff-0.03-2.src.rpm:1142034188 From fedora-extras-commits at redhat.com Fri Mar 10 23:43:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:43:21 -0500 Subject: rpms/perl-Kwiki-Diff/devel perl-Kwiki-Diff.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102343.k2ANhsPt016084@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16042/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Diff.spec Log Message: auto-import perl-Kwiki-Diff-0.03-2 on branch devel from perl-Kwiki-Diff-0.03-2.src.rpm --- NEW FILE perl-Kwiki-Diff.spec --- Name: perl-Kwiki-Diff Version: 0.03 Release: 2%{?dist} Summary: Kwiki::Diff Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Diff/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Diff-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Algorithm::Diff) >= 1.18 BuildRequires: perl(Kwiki) >= 0.34 BuildRequires: perl(Kwiki::Revisions) >= 0.12 BuildRequires: perl(Spiffy) >= 0.22 Requires: perl(Algorithm::Diff) >= 1.18 Requires: perl(Kwiki) >= 0.34 Requires: perl(Kwiki::Revisions) >= 0.12 Requires: perl(Spiffy) >= 0.22 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki Diff plugin. %prep %setup -q -n Kwiki-Diff-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check rm -f debug*.list make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 25 2006 Steven Pritchard 0.03-2 - Fix License tag. - Don't generate COPYING and Artistic so we can re-enable "make test". - Remove debug*.list so "make test" doesn't fail. * Thu Dec 29 2005 Steven Pritchard 0.03-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Diff/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:42:39 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:43:21 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Diff-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Diff/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:42:39 -0000 1.1 +++ sources 10 Mar 2006 23:43:21 -0000 1.2 @@ -0,0 +1 @@ +e77bc115dc5224fbade93c36bea9181b Kwiki-Diff-0.03.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:46:04 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:46:04 -0500 Subject: rpms/perl-Kwiki-NewPage/devel Kwiki-NewPage-filter-requires.sh, NONE, 1.1 perl-Kwiki-NewPage.spec, 1.1, 1.2 Message-ID: <200603102346.k2ANkblc016157@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16127 Modified Files: perl-Kwiki-NewPage.spec Added Files: Kwiki-NewPage-filter-requires.sh Log Message: Various cleanups. --- NEW FILE Kwiki-NewPage-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-NewPage.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-NewPage/devel/perl-Kwiki-NewPage.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-NewPage.spec 10 Mar 2006 23:25:56 -0000 1.1 +++ perl-Kwiki-NewPage.spec 10 Mar 2006 23:46:04 -0000 1.2 @@ -1,28 +1,28 @@ Name: perl-Kwiki-NewPage Version: 0.12 -Release: 2%{?dist} -Summary: Kwiki::NewPage Perl module +Release: 3%{?dist} +Summary: Kwiki New Page plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-NewPage/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-NewPage-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-NewPage-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.34 Requires: perl(Kwiki) >= 0.34 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-NewPage-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki New Page plugin. %prep %setup -q -n Kwiki-NewPage-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -39,22 +39,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.12-3 +- Various cleanups. + * Mon Feb 27 2006 Steven Pritchard 0.12-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Fri Mar 10 23:48:05 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:48:05 -0500 Subject: rpms/perl-Kwiki-Users-Remote - New directory Message-ID: <200603102348.k2ANm7w4016256@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16248/perl-Kwiki-Users-Remote Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Users-Remote added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:48:11 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:48:11 -0500 Subject: rpms/perl-Kwiki-Users-Remote/devel - New directory Message-ID: <200603102348.k2ANmDLA016273@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16248/perl-Kwiki-Users-Remote/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:48:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:48:28 -0500 Subject: rpms/perl-Kwiki-Users-Remote Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102348.k2ANmUKv016312@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16298 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Users-Remote --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Users-Remote all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:48:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:48:34 -0500 Subject: rpms/perl-Kwiki-Users-Remote/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102348.k2ANmaHb016335@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16298/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Users-Remote --- NEW 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 Mar 10 23:49:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:49:03 -0500 Subject: rpms/perl-Kwiki-Users-Remote import.log,1.1,1.2 Message-ID: <200603102349.k2ANnaqm016413@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16372 Modified Files: import.log Log Message: auto-import perl-Kwiki-Users-Remote-0.04-1 on branch devel from perl-Kwiki-Users-Remote-0.04-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Users-Remote/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:48:28 -0000 1.1 +++ import.log 10 Mar 2006 23:49:03 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Users-Remote-0_04-1:HEAD:perl-Kwiki-Users-Remote-0.04-1.src.rpm:1142034535 From fedora-extras-commits at redhat.com Fri Mar 10 23:49:09 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:49:09 -0500 Subject: rpms/perl-Kwiki-Users-Remote/devel perl-Kwiki-Users-Remote.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102349.k2ANngiq016417@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16372/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Users-Remote.spec Log Message: auto-import perl-Kwiki-Users-Remote-0.04-1 on branch devel from perl-Kwiki-Users-Remote-0.04-1.src.rpm --- NEW FILE perl-Kwiki-Users-Remote.spec --- Name: perl-Kwiki-Users-Remote Version: 0.04 Release: 1%{?dist} Summary: Kwiki::Users::Remote Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Users-Remote/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Users-Remote-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.32 BuildRequires: perl(Kwiki::UserName) >= 0.14 BuildRequires: perl(Kwiki::Users) Requires: perl(Kwiki) >= 0.32 Requires: perl(Kwiki::UserName) >= 0.14 Requires: perl(Kwiki::Users) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Automatically set Kwiki user name from HTTP authentication. %prep %setup -q -n Kwiki-Users-Remote-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check rm -f debug*.list make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.04-1 - Specfile autogenerated. - Drop auto-detected explicit BR: perl. - Improve description. - Remove debug*.list so "make test" works. - Filter out perl(mixin) dependency. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:48:34 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:49:09 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Users-Remote-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:48:34 -0000 1.1 +++ sources 10 Mar 2006 23:49:09 -0000 1.2 @@ -0,0 +1 @@ +fbddc866eed5d4c85583617df4a272a2 Kwiki-Users-Remote-0.04.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 00:10:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:10:47 -0500 Subject: rpms/perl-Kwiki-RecentChanges/devel Kwiki-RecentChanges-filter-requires.sh, NONE, 1.1 perl-Kwiki-RecentChanges.spec, 1.1, 1.2 Message-ID: <200603110011.k2B0BJrd018544@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18526 Modified Files: perl-Kwiki-RecentChanges.spec Added Files: Kwiki-RecentChanges-filter-requires.sh Log Message: Cleanup. --- NEW FILE Kwiki-RecentChanges-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-RecentChanges.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/perl-Kwiki-RecentChanges.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-RecentChanges.spec 10 Mar 2006 23:27:03 -0000 1.1 +++ perl-Kwiki-RecentChanges.spec 11 Mar 2006 00:10:45 -0000 1.2 @@ -1,28 +1,28 @@ Name: perl-Kwiki-RecentChanges Version: 0.13 -Release: 2%{?dist} -Summary: Kwiki::RecentChanges Perl module +Release: 3%{?dist} +Summary: Kwiki Recent Changes plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-RecentChanges/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-RecentChanges-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-RecentChanges-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-RecentChanges-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki Recent Changes plugin. %prep %setup -q -n Kwiki-RecentChanges-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -39,22 +39,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.13-3 +- Cleanup. + * Mon Feb 27 2006 Steven Pritchard 0.13-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Sat Mar 11 00:13:20 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:13:20 -0500 Subject: rpms/perl-Kwiki-Raw - New directory Message-ID: <200603110013.k2B0DMBf018648@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18640/perl-Kwiki-Raw Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Raw added to the repository From fedora-extras-commits at redhat.com Sat Mar 11 00:13:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:13:27 -0500 Subject: rpms/perl-Kwiki-Raw/devel - New directory Message-ID: <200603110013.k2B0DT1m018663@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18640/perl-Kwiki-Raw/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Raw/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 11 00:13:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:13:56 -0500 Subject: rpms/perl-Kwiki-Raw Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603110013.k2B0DwpN018698@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18686 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Raw --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Raw all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 11 00:14:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:14:03 -0500 Subject: rpms/perl-Kwiki-Raw/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603110014.k2B0E512018718@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18686/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Raw --- NEW 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 Mar 11 00:15:25 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:15:25 -0500 Subject: rpms/perl-Kwiki-Raw/devel filter-requires.sh, NONE, 1.1 perl-Kwiki-Raw.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603110015.k2B0FRmV018810@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18757/devel Modified Files: .cvsignore sources Added Files: filter-requires.sh perl-Kwiki-Raw.spec Log Message: auto-import perl-Kwiki-Raw-0.02-2 on branch devel from perl-Kwiki-Raw-0.02-2.src.rpm --- NEW FILE filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' --- NEW FILE perl-Kwiki-Raw.spec --- Name: perl-Kwiki-Raw Version: 0.02 Release: 2%{?dist} Summary: Provide an action to retrieve the raw wikitext of a page License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Raw/ Source0: http://www.cpan.org/authors/id/C/CD/CDENT/Kwiki/Kwiki-Raw-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Source1: filter-requires.sh %global real_perl_requires %{__perl_requires} %define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires %description Kwiki module that provides an action to retrieve the raw wikitext of a page. %prep %setup -q -n Kwiki-Raw-%{version} sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE1} > %{__perl_requires} chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Mar 07 2006 Steven Pritchard 0.02-2 - Don't write to Source1. * Tue Mar 07 2006 Steven Pritchard 0.02-1 - Specfile autogenerated. - Improve Summary and description. - Filter out perl(mixin) dependency. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Raw/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Mar 2006 00:14:02 -0000 1.1 +++ .cvsignore 11 Mar 2006 00:15:25 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Raw-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Raw/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Mar 2006 00:14:02 -0000 1.1 +++ sources 11 Mar 2006 00:15:25 -0000 1.2 @@ -0,0 +1 @@ +6fab8df1440b1bd1a87a983e860b6ef5 Kwiki-Raw-0.02.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 00:15:02 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:15:02 -0500 Subject: rpms/perl-Kwiki-Raw import.log,1.1,1.2 Message-ID: <200603110015.k2B0FYVB018819@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18757 Modified Files: import.log Log Message: auto-import perl-Kwiki-Raw-0.02-2 on branch devel from perl-Kwiki-Raw-0.02-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Raw/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Mar 2006 00:13:56 -0000 1.1 +++ import.log 11 Mar 2006 00:15:01 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Raw-0_02-2:HEAD:perl-Kwiki-Raw-0.02-2.src.rpm:1142036093 From fedora-extras-commits at redhat.com Sat Mar 11 00:15:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:15:24 -0500 Subject: rpms/perl-Kwiki-Search/devel Kwiki-Search-filter-requires.sh, NONE, 1.1 perl-Kwiki-Search.spec, 1.1, 1.2 Message-ID: <200603110015.k2B0FuSR018848@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774 Modified Files: perl-Kwiki-Search.spec Added Files: Kwiki-Search-filter-requires.sh Log Message: Cleanup. --- NEW FILE Kwiki-Search-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-Search.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Search/devel/perl-Kwiki-Search.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-Search.spec 10 Mar 2006 23:28:42 -0000 1.1 +++ perl-Kwiki-Search.spec 11 Mar 2006 00:15:23 -0000 1.2 @@ -1,28 +1,28 @@ Name: perl-Kwiki-Search Version: 0.12 -Release: 2%{?dist} -Summary: Kwiki::Search Perl module +Release: 3%{?dist} +Summary: Kwiki Search plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Search/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Search-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-Search-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.34 Requires: perl(Kwiki) >= 0.34 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-Search-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki Search plugin. %prep %setup -q -n Kwiki-Search-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -39,22 +39,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.12-3 +- Cleanup. + * Mon Feb 27 2006 Steven Pritchard 0.12-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Sat Mar 11 00:18:05 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:18:05 -0500 Subject: rpms/perl-Kwiki-Attachments - New directory Message-ID: <200603110018.k2B0I7tx018949@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/perl-Kwiki-Attachments Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Attachments added to the repository From fedora-extras-commits at redhat.com Sat Mar 11 00:18:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:18:12 -0500 Subject: rpms/perl-Kwiki-Attachments/devel - New directory Message-ID: <200603110018.k2B0IEvZ018964@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/perl-Kwiki-Attachments/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Attachments/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 11 00:18:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:18:43 -0500 Subject: rpms/perl-Kwiki-Attachments Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603110018.k2B0IjAx018998@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18986 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Attachments --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Attachments all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 11 00:18:55 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:18:55 -0500 Subject: rpms/perl-Kwiki-Attachments/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603110019.k2B0J0vq019018@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18986/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Attachments --- NEW 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 Mar 11 00:19:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:19:42 -0500 Subject: rpms/perl-Kwiki-Attachments import.log,1.1,1.2 Message-ID: <200603110020.k2B0KEdM019096@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19058 Modified Files: import.log Log Message: auto-import perl-Kwiki-Attachments-0.18-1 on branch devel from perl-Kwiki-Attachments-0.18-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Attachments/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Mar 2006 00:18:43 -0000 1.1 +++ import.log 11 Mar 2006 00:19:42 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Attachments-0_18-1:HEAD:perl-Kwiki-Attachments-0.18-1.src.rpm:1142036360 From fedora-extras-commits at redhat.com Sat Mar 11 00:19:49 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:19:49 -0500 Subject: rpms/perl-Kwiki-Attachments/devel perl-Kwiki-Attachments.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603110020.k2B0KL7o019100@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19058/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Attachments.spec Log Message: auto-import perl-Kwiki-Attachments-0.18-1 on branch devel from perl-Kwiki-Attachments-0.18-1.src.rpm --- NEW FILE perl-Kwiki-Attachments.spec --- Name: perl-Kwiki-Attachments Version: 0.18 Release: 1%{?dist} Summary: Kwiki::Attachments Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Attachments/ Source0: http://www.cpan.org/authors/id/S/SU/SUE/Kwiki-Attachments-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module gives a Kwiki wiki the ability to upload, store and manage file attachments on any page. Thumbnails will be created for supported file types if Imager or Image::Magick is installed. For more information, read the module POD. %prep %setup -q -n Kwiki-Attachments-%{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+rwX,go+rX,go-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 Mar 07 2006 Steven Pritchard 0.18-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Attachments/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Mar 2006 00:18:54 -0000 1.1 +++ .cvsignore 11 Mar 2006 00:19:48 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Attachments-0.18.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Attachments/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Mar 2006 00:18:54 -0000 1.1 +++ sources 11 Mar 2006 00:19:48 -0000 1.2 @@ -0,0 +1 @@ +6eccc9c91ad0e1be8c19794fff0d870a Kwiki-Attachments-0.18.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 00:20:35 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:20:35 -0500 Subject: rpms/perl-Kwiki-UserPreferences/devel Kwiki-UserPreferences-filter-requires.sh, NONE, 1.1 perl-Kwiki-UserPreferences.spec, 1.1, 1.2 Message-ID: <200603110021.k2B0L9Rq019153@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19110 Modified Files: perl-Kwiki-UserPreferences.spec Added Files: Kwiki-UserPreferences-filter-requires.sh Log Message: Cleanup. --- NEW FILE Kwiki-UserPreferences-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-UserPreferences.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel/perl-Kwiki-UserPreferences.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-UserPreferences.spec 10 Mar 2006 23:29:53 -0000 1.1 +++ perl-Kwiki-UserPreferences.spec 11 Mar 2006 00:20:35 -0000 1.2 @@ -1,28 +1,28 @@ Name: perl-Kwiki-UserPreferences Version: 0.13 -Release: 2%{?dist} -Summary: Kwiki::UserPreferences Perl module +Release: 3%{?dist} +Summary: Kwiki User Preferences plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-UserPreferences/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserPreferences-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-UserPreferences-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-UserPreferences-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki User Preferences plugin. %prep %setup -q -n Kwiki-UserPreferences-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -39,22 +39,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.13-3 +- Cleanup. + * Mon Feb 27 2006 Steven Pritchard 0.13-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Sat Mar 11 00:22:52 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:22:52 -0500 Subject: owners owners.list,1.733,1.734 Message-ID: <200603110023.k2B0NPXt019244@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19214 Modified Files: owners.list Log Message: Adding: perl-Kwiki-Attachments perl-Kwiki-Diff perl-Kwiki-Raw perl-Kwiki-UserName perl-Kwiki-Users-Remote Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.733 retrieving revision 1.734 diff -u -r1.733 -r1.734 --- owners.list 10 Mar 2006 23:31:26 -0000 1.733 +++ owners.list 11 Mar 2006 00:22:52 -0000 1.734 @@ -943,12 +943,17 @@ Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki|Perl wiki implementation|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-Archive-Rcs|Kwiki::Archive::Rcs Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Attachments|Kwiki::Attachments Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Diff|Kwiki::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-ModPerl|Kwiki::ModPerl Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-NewPage|Kwiki::NewPage Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Raw|Provide an action to retrieve the raw wikitext of a page|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-RecentChanges|Kwiki::RecentChanges Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-Revisions|Kwiki::Revisions Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-Search|Kwiki::Search Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-UserName|Kwiki::UserName Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-UserPreferences|Kwiki::UserPreferences Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Users-Remote|Kwiki::Users::Remote Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat Mar 11 00:28:04 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:28:04 -0500 Subject: rpms/perl-Kwiki-UserName/devel Kwiki-UserName-filter-requires.sh, NONE, 1.1 perl-Kwiki-UserName.spec, 1.1, 1.2 Message-ID: <200603110028.k2B0Saow019311@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19284 Modified Files: perl-Kwiki-UserName.spec Added Files: Kwiki-UserName-filter-requires.sh Log Message: Cleanup. --- NEW FILE Kwiki-UserName-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-UserName.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserName/devel/perl-Kwiki-UserName.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-UserName.spec 10 Mar 2006 23:38:22 -0000 1.1 +++ perl-Kwiki-UserName.spec 11 Mar 2006 00:27:59 -0000 1.2 @@ -1,11 +1,11 @@ Name: perl-Kwiki-UserName Version: 0.14 -Release: 2%{?dist} -Summary: Kwiki::UserName Perl module +Release: 3%{?dist} +Summary: Kwiki User Name plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-UserName/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserName-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-UserName-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 @@ -14,17 +14,17 @@ Requires: perl(Kwiki::UserPreferences) >= 0.13 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-UserName-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki User Name plugin. %prep %setup -q -n Kwiki-UserName-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -41,22 +41,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.14-3 +- Cleanup. + * Mon Feb 27 2006 Steven Pritchard 0.14-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Sat Mar 11 00:42:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:42:39 -0500 Subject: rpms/perl-Kwiki-Users-Remote/devel Kwiki-Users-Remote-filter-requires.sh, NONE, 1.1 perl-Kwiki-Users-Remote.spec, 1.1, 1.2 Message-ID: <200603110043.k2B0hB4r019552@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19534 Modified Files: perl-Kwiki-Users-Remote.spec Added Files: Kwiki-Users-Remote-filter-requires.sh Log Message: Cleanup. --- NEW FILE Kwiki-Users-Remote-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-Users-Remote.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel/perl-Kwiki-Users-Remote.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-Users-Remote.spec 10 Mar 2006 23:49:09 -0000 1.1 +++ perl-Kwiki-Users-Remote.spec 11 Mar 2006 00:42:39 -0000 1.2 @@ -1,11 +1,11 @@ Name: perl-Kwiki-Users-Remote Version: 0.04 -Release: 1%{?dist} -Summary: Kwiki::Users::Remote Perl module +Release: 2%{?dist} +Summary: Set Kwiki user name from HTTP authentication License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Users-Remote/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Users-Remote-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IA/IAN/Kwiki-Users-Remote-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.32 @@ -16,17 +16,17 @@ Requires: perl(Kwiki::Users) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-Users-Remote-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Automatically set Kwiki user name from HTTP authentication. %prep %setup -q -n Kwiki-Users-Remote-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -48,7 +48,7 @@ make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) @@ -57,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.04-2 +- Cleanup. + * Mon Feb 27 2006 Steven Pritchard 0.04-1 - Specfile autogenerated. - Drop auto-detected explicit BR: perl. From fedora-extras-commits at redhat.com Sat Mar 11 13:13:01 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sat, 11 Mar 2006 08:13:01 -0500 Subject: owners owners.list,1.734,1.735 Message-ID: <200603111313.k2BDDXQq014590@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14573 Modified Files: owners.list Log Message: Taking ownership of camstream package. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.734 retrieving revision 1.735 diff -u -r1.734 -r1.735 --- owners.list 11 Mar 2006 00:22:52 -0000 1.734 +++ owners.list 11 Mar 2006 13:12:59 -0000 1.735 @@ -99,7 +99,7 @@ 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|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|nomis80 at nomis80.org|extras-qa at fedoraproject.org| Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 11 15:06:21 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 11 Mar 2006 10:06:21 -0500 Subject: rpms/grads/devel grads.spec,1.7,1.8 Message-ID: <200603111506.k2BF6vvI018992@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/grads/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18963 Modified Files: grads.spec Log Message: * Sat Mar 11 2006 Patrice Dumas 1.9b4-9 - rebuild for newer libdap Index: grads.spec =================================================================== RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- grads.spec 17 Feb 2006 15:11:17 -0000 1.7 +++ grads.spec 11 Mar 2006 15:06:20 -0000 1.8 @@ -1,6 +1,6 @@ Name: grads Version: 1.9b4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tool for easy acces, manipulation, and visualization of data Group: Applications/Engineering @@ -104,6 +104,9 @@ %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary %changelog +* Sat Mar 11 2006 Patrice Dumas 1.9b4-9 +- rebuild for newer libdap + * Fri Feb 17 2006 Patrice Dumas 1.9b4-8 - enable hdf for ppc, now that it is there - use a wrapper include file to prepend sd_ to netcdf symbols for From fedora-extras-commits at redhat.com Sat Mar 11 17:52:57 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 11 Mar 2006 12:52:57 -0500 Subject: rpms/apachetop/devel apachetop.spec,1.10,1.11 Message-ID: <200603111753.k2BHrUFl023626@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/apachetop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23609 Modified Files: apachetop.spec Log Message: - remove hardcoded dependency on httpd Index: apachetop.spec =================================================================== RCS file: /cvs/extras/rpms/apachetop/devel/apachetop.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- apachetop.spec 21 Feb 2006 16:57:39 -0000 1.10 +++ apachetop.spec 11 Mar 2006 17:52:57 -0000 1.11 @@ -1,6 +1,6 @@ Name: apachetop Version: 0.12.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A top-like display of Apache logs Group: Applications/Internet @@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, m4, readline-devel -Requires: httpd %description ApacheTop watches a logfile generated by Apache (in standard common or @@ -46,6 +45,9 @@ %changelog +* Sat Mar 11 2006 Aurelien Bompard 0.12.5-4 +- remove hardcoded requirement on httpd (#184491) + * Tue Feb 21 2006 Aurelien Bompard 0.12.5-3 - rebuilt for FC5 From fedora-extras-commits at redhat.com Sat Mar 11 19:57:01 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 14:57:01 -0500 Subject: rpms/rkhunter/FC-1 .cvsignore, 1.3, 1.4 rkhunter.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603111957.k2BJvXbt027885@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27864 Modified Files: .cvsignore rkhunter.spec sources Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-1/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jan 2006 06:31:13 -0000 1.3 +++ .cvsignore 11 Mar 2006 19:57:00 -0000 1.4 @@ -1,2 +1,3 @@ -rkhunter-1.2.7.tar.gz +rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-1/rkhunter.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rkhunter.spec 5 Jan 2006 06:31:13 -0000 1.2 +++ rkhunter.spec 11 Mar 2006 19:57:00 -0000 1.3 @@ -1,23 +1,26 @@ +%define rkhVer 1.2.8 +%define rpmRel 1 + # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require # in order to function properly [perl(Digest::MD5) & perl(Digest::SHA1)]. AutoReqProv: no Name: rkhunter -Version: 1.2.7 -Release: 1 +Version: %{rkhVer} +Release: %{rpmRel}%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.2.8.tar.gz Source1: rkhunter-auto_scan.tar.gz -Source2: rkhunter-%{version}-%{release}.src.md5 -Patch0: rkhunter-1.2.7-install_dir-conf.patch +Source2: rkhunter-%{rkhVer}-%{rpmRel}.src.sha +Patch0: rkhunter-1.2.8-default_settings-conf.patch Patch1: rkhunter-1.1.8-showfiles.patch Patch2: rkhunter-1.1.9-shared_man_search.patch -Patch3: rkhunter-1.1.9-app_check_default.patch +Patch3: rkhunter-1.2.8-app_check_default.patch Patch4: rkhunter-1.2.7-datestamp.patch Patch5: rkhunter-1.2.7-append_log.patch Patch6: rkhunter-1.2.7-group_log.patch @@ -51,15 +54,15 @@ %prep # This optional check is for verification of original sources -# DURING the binary build process (md5 canary check) -[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \ - && %{__perl} -pi.orig -e ' - s|../SOURCES|%{_sourcedir}|g; - ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $? -%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \ - %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 +# DURING the binary build process (sha1 canary check) +#[ ! -e %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig ] \ +# && %{__perl} -pi.orig -e ' +# s|../SOURCES|%{_sourcedir}|g; +# ' %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#sha1sum --check %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha || exit $? +#%{__rm} -f %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#%{__mv} %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig \ +# %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha %setup -q -n %{name} %setup -q -D -T -a 1 -n %{name} @@ -148,8 +151,8 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb -cd .. -[ ! -d %{name} ] || %{__rm} -rf %{name} +#cd .. +#[ ! -d %{name} ] || %{__rm} -rf %{name} %post @@ -187,6 +190,13 @@ %changelog +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + * Mon Jun 11 2005 Greg Houlette - 1.2.7-1 - Added signature auto-updating to CRON scan (new script) - Removed BOOTSCAN pending rewrite to full SysV Init scan in background Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 06:31:13 -0000 1.3 +++ sources 11 Mar 2006 19:57:00 -0000 1.4 @@ -1,2 +1,2 @@ -288ba8a87352716384823c9ea1958fa7 rkhunter-1.2.7.tar.gz +41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 20:17:13 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 15:17:13 -0500 Subject: rpms/rkhunter/FC-1 rkhunter-1.2.8-1.src.sha, NONE, 1.1 rkhunter-1.2.8-app_check_default.patch, NONE, 1.1 rkhunter-1.2.8-default_settings-conf.patch, NONE, 1.1 rkhunter-1.1.9-app_check_default.patch, 1.1, NONE rkhunter-1.2.7-1.src.md5, 1.1, NONE rkhunter-1.2.7-install_dir-conf.patch, 1.1, NONE Message-ID: <200603112017.k2BKHFMM029900@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29880 Added Files: rkhunter-1.2.8-1.src.sha rkhunter-1.2.8-app_check_default.patch rkhunter-1.2.8-default_settings-conf.patch Removed Files: rkhunter-1.1.9-app_check_default.patch rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-install_dir-conf.patch Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf --- NEW FILE rkhunter-1.2.8-1.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch rkhunter-1.2.8-app_check_default.patch: --- NEW FILE rkhunter-1.2.8-app_check_default.patch --- --- files/rkhunter.orig 2006-02-14 05:35:20.000000000 -0500 +++ files/rkhunter 2006-03-05 14:20:37.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 # Patched software versions? USE_PATCHED_SOFTWARE=0 @@ -196,6 +196,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -5053,7 +5056,8 @@ echo $ECHOOPT "--report-mode* : Don't show uninteresting information for reports" echo $ECHOOPT "--report-warnings-only* : Show only warnings (lesser output than --report-mode," echo $ECHOOPT " more than --quiet)" - echo $ECHOOPT "--skip-application-check* : Don't run application version checks" +# echo $ECHOOPT "--skip-application-check* : Don't run application version checks" + echo $ECHOOPT "--run-application-check* : Run application version checks" echo $ECHOOPT "--skip-keypress (-sk)* : Don't wait after every test (non-interactive)" echo $ECHOOPT "--quick* : Perform quick scan (instead of full scan)" echo $ECHOOPT "--quiet* : Be quiet (only show warnings)" rkhunter-1.2.8-default_settings-conf.patch: --- NEW FILE rkhunter-1.2.8-default_settings-conf.patch --- --- files/rkhunter.conf.orig 2005-03-19 12:27:20.000000000 -0500 +++ files/rkhunter.conf 2006-03-06 06:17:26.000000000 -0500 @@ -3,6 +3,7 @@ # # All lines beginning with a dash (#) or empty lines, will be ignored. # +#INSTALLDIR=/usr/local # Links to files. Don't change if you don't need to. LATESTVERSION=/rkhunter_latest.dat @@ -37,11 +38,12 @@ # Allow hidden directory # One directory per line (use multiple ALLOWHIDDENDIR lines) # +#ALLOWHIDDENDIR=/dev/.udevdb #ALLOWHIDDENDIR=/etc/.java # Allow hidden file # One file per line (use multiple ALLOWHIDDENFILE lines) # -#ALLOWHIDDENFILE=/etc/.java +#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz # The End --- rkhunter-1.1.9-app_check_default.patch DELETED --- --- rkhunter-1.2.7-1.src.md5 DELETED --- --- rkhunter-1.2.7-install_dir-conf.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 11 20:23:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 11 Mar 2006 15:23:56 -0500 Subject: rpms/gramps/devel gramps.spec,1.18,1.19 Message-ID: <200603112024.k2BKOTwS029948@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29931 Modified Files: gramps.spec Log Message: * Sat Mar 11 2006 Brian Pepple - 2.0.10-3 - Remove Utility category from desktop file. - Update scriptlets. Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gramps.spec 28 Feb 2006 18:56:34 -0000 1.18 +++ gramps.spec 11 Mar 2006 20:23:56 -0000 1.19 @@ -1,6 +1,6 @@ Name: gramps Version: 2.0.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Genealogical Research and Analysis Management Programming System Group: Applications/Productivity @@ -31,12 +31,14 @@ Requires: rcs Requires: python-reportlab >= 1.20 Requires: graphviz -Requires(post): shared-mime-info -Requires(post): scrollkeeper -Requires(post): GConf2 -Requires(postun): shared-mime-info +Requires(pre): GConf2 +Requires(post): desktop-file-utils +Requires(post): scrollkeeper +Requires(post): GConf2 +Requires(preun): GConf2 +Requires(postun): desktop-file-utils Requires(postun): scrollkeeper -Requires(postun): GConf2 + %description gramps (Genealogical Research and Analysis Management Programming @@ -69,7 +71,6 @@ desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - --add-category Utility \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop @@ -77,21 +78,35 @@ rm -rf ${RPM_BUILD_ROOT} +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : +fi + + %post -GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ - gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : -scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : + + +%preun +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : +fi %postun scrollkeeper-update -q || : -if [ "$1" = "0" ]; then - update-desktop-database &> /dev/null ||: - update-mime-database %{_datadir}/mime &> /dev/null || : -fi +update-desktop-database &> /dev/null ||: +update-mime-database %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang @@ -111,6 +126,10 @@ %changelog +* Sat Mar 11 2006 Brian Pepple - 2.0.10-3 +- Remove Utility category from desktop file. +- Update scriptlets. + * Tue Feb 28 2006 Brian Pepple - 2.0.10-2 - Update to 2.0.10. From fedora-extras-commits at redhat.com Sat Mar 11 20:49:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 11 Mar 2006 15:49:03 -0500 Subject: rpms/cpanspec/devel .cvsignore, 1.3, 1.4 cpanspec.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603112049.k2BKnZ24030084@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30061 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.61. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Mar 2006 03:08:57 -0000 1.3 +++ .cvsignore 11 Mar 2006 20:49:03 -0000 1.4 @@ -1 +1 @@ -cpanspec-1.60.tar.gz +cpanspec-1.61.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cpanspec.spec 8 Mar 2006 03:08:57 -0000 1.2 +++ cpanspec.spec 11 Mar 2006 20:49:03 -0000 1.3 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.60 +Version: 1.61 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Sat Mar 11 2006 Steven Pritchard 1.61-1 +- Update to 1.61. + * Tue Mar 07 2006 Steven Pritchard 1.60-1 - Update to 1.60. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Mar 2006 03:08:57 -0000 1.3 +++ sources 11 Mar 2006 20:49:03 -0000 1.4 @@ -1 +1 @@ -ebfaf5da00b1a5096f1919451d9be9e6 cpanspec-1.60.tar.gz +69df0b4f1a1fe4efd469c212cd8cb983 cpanspec-1.61.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 20:51:42 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 15:51:42 -0500 Subject: rpms/rkhunter/FC-2 rkhunter-1.2.8-1.src.sha, NONE, 1.1 rkhunter-1.2.8-app_check_default.patch, NONE, 1.1 rkhunter-1.2.8-default_settings-conf.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 rkhunter.spec, 1.2, 1.3 sources, 1.3, 1.4 rkhunter-1.1.9-app_check_default.patch, 1.1, NONE rkhunter-1.2.7-1.src.md5, 1.1, NONE rkhunter-1.2.7-install_dir-conf.patch, 1.1, NONE Message-ID: <200603112052.k2BKqEqO030186@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30149 Modified Files: .cvsignore rkhunter.spec sources Added Files: rkhunter-1.2.8-1.src.sha rkhunter-1.2.8-app_check_default.patch rkhunter-1.2.8-default_settings-conf.patch Removed Files: rkhunter-1.1.9-app_check_default.patch rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-install_dir-conf.patch Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf --- NEW FILE rkhunter-1.2.8-1.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch rkhunter-1.2.8-app_check_default.patch: --- NEW FILE rkhunter-1.2.8-app_check_default.patch --- --- files/rkhunter.orig 2006-02-14 05:35:20.000000000 -0500 +++ files/rkhunter 2006-03-05 14:20:37.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 # Patched software versions? USE_PATCHED_SOFTWARE=0 @@ -196,6 +196,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -5053,7 +5056,8 @@ echo $ECHOOPT "--report-mode* : Don't show uninteresting information for reports" echo $ECHOOPT "--report-warnings-only* : Show only warnings (lesser output than --report-mode," echo $ECHOOPT " more than --quiet)" - echo $ECHOOPT "--skip-application-check* : Don't run application version checks" +# echo $ECHOOPT "--skip-application-check* : Don't run application version checks" + echo $ECHOOPT "--run-application-check* : Run application version checks" echo $ECHOOPT "--skip-keypress (-sk)* : Don't wait after every test (non-interactive)" echo $ECHOOPT "--quick* : Perform quick scan (instead of full scan)" echo $ECHOOPT "--quiet* : Be quiet (only show warnings)" rkhunter-1.2.8-default_settings-conf.patch: --- NEW FILE rkhunter-1.2.8-default_settings-conf.patch --- --- files/rkhunter.conf.orig 2005-03-19 12:27:20.000000000 -0500 +++ files/rkhunter.conf 2006-03-06 06:17:26.000000000 -0500 @@ -3,6 +3,7 @@ # # All lines beginning with a dash (#) or empty lines, will be ignored. # +#INSTALLDIR=/usr/local # Links to files. Don't change if you don't need to. LATESTVERSION=/rkhunter_latest.dat @@ -37,11 +38,12 @@ # Allow hidden directory # One directory per line (use multiple ALLOWHIDDENDIR lines) # +#ALLOWHIDDENDIR=/dev/.udevdb #ALLOWHIDDENDIR=/etc/.java # Allow hidden file # One file per line (use multiple ALLOWHIDDENFILE lines) # -#ALLOWHIDDENFILE=/etc/.java +#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz # The End Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jan 2006 07:06:50 -0000 1.3 +++ .cvsignore 11 Mar 2006 20:51:42 -0000 1.4 @@ -1,2 +1,3 @@ -rkhunter-1.2.7.tar.gz +rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-2/rkhunter.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rkhunter.spec 5 Jan 2006 07:06:50 -0000 1.2 +++ rkhunter.spec 11 Mar 2006 20:51:42 -0000 1.3 @@ -1,23 +1,26 @@ +%define rkhVer 1.2.8 +%define rpmRel 1 + # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require # in order to function properly [perl(Digest::MD5) & perl(Digest::SHA1)]. AutoReqProv: no Name: rkhunter -Version: 1.2.7 -Release: 1 +Version: %{rkhVer} +Release: %{rpmRel}%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.2.8.tar.gz Source1: rkhunter-auto_scan.tar.gz -Source2: rkhunter-%{version}-%{release}.src.md5 -Patch0: rkhunter-1.2.7-install_dir-conf.patch +Source2: rkhunter-%{rkhVer}-%{rpmRel}.src.sha +Patch0: rkhunter-1.2.8-default_settings-conf.patch Patch1: rkhunter-1.1.8-showfiles.patch Patch2: rkhunter-1.1.9-shared_man_search.patch -Patch3: rkhunter-1.1.9-app_check_default.patch +Patch3: rkhunter-1.2.8-app_check_default.patch Patch4: rkhunter-1.2.7-datestamp.patch Patch5: rkhunter-1.2.7-append_log.patch Patch6: rkhunter-1.2.7-group_log.patch @@ -51,15 +54,15 @@ %prep # This optional check is for verification of original sources -# DURING the binary build process (md5 canary check) -[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \ - && %{__perl} -pi.orig -e ' - s|../SOURCES|%{_sourcedir}|g; - ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $? -%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \ - %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 +# DURING the binary build process (sha1 canary check) +#[ ! -e %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig ] \ +# && %{__perl} -pi.orig -e ' +# s|../SOURCES|%{_sourcedir}|g; +# ' %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#sha1sum --check %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha || exit $? +#%{__rm} -f %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#%{__mv} %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig \ +# %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha %setup -q -n %{name} %setup -q -D -T -a 1 -n %{name} @@ -148,8 +151,8 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb -cd .. -[ ! -d %{name} ] || %{__rm} -rf %{name} +#cd .. +#[ ! -d %{name} ] || %{__rm} -rf %{name} %post @@ -187,6 +190,13 @@ %changelog +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + * Mon Jun 11 2005 Greg Houlette - 1.2.7-1 - Added signature auto-updating to CRON scan (new script) - Removed BOOTSCAN pending rewrite to full SysV Init scan in background Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 07:06:50 -0000 1.3 +++ sources 11 Mar 2006 20:51:42 -0000 1.4 @@ -1,2 +1,2 @@ -288ba8a87352716384823c9ea1958fa7 rkhunter-1.2.7.tar.gz +41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz --- rkhunter-1.1.9-app_check_default.patch DELETED --- --- rkhunter-1.2.7-1.src.md5 DELETED --- --- rkhunter-1.2.7-install_dir-conf.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 11 20:57:36 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 15:57:36 -0500 Subject: rpms/rkhunter/FC-3 rkhunter-1.2.8-1.src.sha, NONE, 1.1 rkhunter-1.2.8-app_check_default.patch, NONE, 1.1 rkhunter-1.2.8-default_settings-conf.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rkhunter.spec, 1.4, 1.5 sources, 1.4, 1.5 rkhunter-1.1.9-app_check_default.patch, 1.1, NONE rkhunter-1.2.7-1.src.md5, 1.1, NONE rkhunter-1.2.7-install_dir-conf.patch, 1.1, NONE Message-ID: <200603112058.k2BKw8Cv030275@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30247 Modified Files: .cvsignore rkhunter.spec sources Added Files: rkhunter-1.2.8-1.src.sha rkhunter-1.2.8-app_check_default.patch rkhunter-1.2.8-default_settings-conf.patch Removed Files: rkhunter-1.1.9-app_check_default.patch rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-install_dir-conf.patch Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf --- NEW FILE rkhunter-1.2.8-1.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch rkhunter-1.2.8-app_check_default.patch: --- NEW FILE rkhunter-1.2.8-app_check_default.patch --- --- files/rkhunter.orig 2006-02-14 05:35:20.000000000 -0500 +++ files/rkhunter 2006-03-05 14:20:37.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 # Patched software versions? USE_PATCHED_SOFTWARE=0 @@ -196,6 +196,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -5053,7 +5056,8 @@ echo $ECHOOPT "--report-mode* : Don't show uninteresting information for reports" echo $ECHOOPT "--report-warnings-only* : Show only warnings (lesser output than --report-mode," echo $ECHOOPT " more than --quiet)" - echo $ECHOOPT "--skip-application-check* : Don't run application version checks" +# echo $ECHOOPT "--skip-application-check* : Don't run application version checks" + echo $ECHOOPT "--run-application-check* : Run application version checks" echo $ECHOOPT "--skip-keypress (-sk)* : Don't wait after every test (non-interactive)" echo $ECHOOPT "--quick* : Perform quick scan (instead of full scan)" echo $ECHOOPT "--quiet* : Be quiet (only show warnings)" rkhunter-1.2.8-default_settings-conf.patch: --- NEW FILE rkhunter-1.2.8-default_settings-conf.patch --- --- files/rkhunter.conf.orig 2005-03-19 12:27:20.000000000 -0500 +++ files/rkhunter.conf 2006-03-06 06:17:26.000000000 -0500 @@ -3,6 +3,7 @@ # # All lines beginning with a dash (#) or empty lines, will be ignored. # +#INSTALLDIR=/usr/local # Links to files. Don't change if you don't need to. LATESTVERSION=/rkhunter_latest.dat @@ -37,11 +38,12 @@ # Allow hidden directory # One directory per line (use multiple ALLOWHIDDENDIR lines) # +#ALLOWHIDDENDIR=/dev/.udevdb #ALLOWHIDDENDIR=/etc/.java # Allow hidden file # One file per line (use multiple ALLOWHIDDENFILE lines) # -#ALLOWHIDDENFILE=/etc/.java +#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz # The End Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 07:19:11 -0000 1.4 +++ .cvsignore 11 Mar 2006 20:57:35 -0000 1.5 @@ -1,2 +1,3 @@ -rkhunter-1.2.7.tar.gz +rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-3/rkhunter.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rkhunter.spec 5 Jan 2006 07:19:11 -0000 1.4 +++ rkhunter.spec 11 Mar 2006 20:57:35 -0000 1.5 @@ -1,23 +1,26 @@ +%define rkhVer 1.2.8 +%define rpmRel 1 + # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require # in order to function properly [perl(Digest::MD5) & perl(Digest::SHA1)]. AutoReqProv: no Name: rkhunter -Version: 1.2.7 -Release: 1 +Version: %{rkhVer} +Release: %{rpmRel}%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.2.8.tar.gz Source1: rkhunter-auto_scan.tar.gz -Source2: rkhunter-%{version}-%{release}.src.md5 -Patch0: rkhunter-1.2.7-install_dir-conf.patch +Source2: rkhunter-%{rkhVer}-%{rpmRel}.src.sha +Patch0: rkhunter-1.2.8-default_settings-conf.patch Patch1: rkhunter-1.1.8-showfiles.patch Patch2: rkhunter-1.1.9-shared_man_search.patch -Patch3: rkhunter-1.1.9-app_check_default.patch +Patch3: rkhunter-1.2.8-app_check_default.patch Patch4: rkhunter-1.2.7-datestamp.patch Patch5: rkhunter-1.2.7-append_log.patch Patch6: rkhunter-1.2.7-group_log.patch @@ -51,15 +54,15 @@ %prep # This optional check is for verification of original sources -# DURING the binary build process (md5 canary check) -[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \ - && %{__perl} -pi.orig -e ' - s|../SOURCES|%{_sourcedir}|g; - ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $? -%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \ - %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 +# DURING the binary build process (sha1 canary check) +#[ ! -e %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig ] \ +# && %{__perl} -pi.orig -e ' +# s|../SOURCES|%{_sourcedir}|g; +# ' %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#sha1sum --check %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha || exit $? +#%{__rm} -f %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#%{__mv} %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig \ +# %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha %setup -q -n %{name} %setup -q -D -T -a 1 -n %{name} @@ -148,8 +151,8 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb -cd .. -[ ! -d %{name} ] || %{__rm} -rf %{name} +#cd .. +#[ ! -d %{name} ] || %{__rm} -rf %{name} %post @@ -187,6 +190,13 @@ %changelog +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + * Mon Jun 11 2005 Greg Houlette - 1.2.7-1 - Added signature auto-updating to CRON scan (new script) - Removed BOOTSCAN pending rewrite to full SysV Init scan in background Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 07:19:11 -0000 1.4 +++ sources 11 Mar 2006 20:57:35 -0000 1.5 @@ -1,2 +1,2 @@ -288ba8a87352716384823c9ea1958fa7 rkhunter-1.2.7.tar.gz +41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz --- rkhunter-1.1.9-app_check_default.patch DELETED --- --- rkhunter-1.2.7-1.src.md5 DELETED --- --- rkhunter-1.2.7-install_dir-conf.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 11 21:02:45 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 16:02:45 -0500 Subject: rpms/rkhunter/FC-4 rkhunter-1.2.8-1.src.sha, NONE, 1.1 rkhunter-1.2.8-app_check_default.patch, NONE, 1.1 rkhunter-1.2.8-default_settings-conf.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rkhunter.spec, 1.6, 1.7 sources, 1.4, 1.5 rkhunter-1.1.9-app_check_default.patch, 1.1, NONE rkhunter-1.2.7-1.src.md5, 1.1, NONE rkhunter-1.2.7-install_dir-conf.patch, 1.1, NONE Message-ID: <200603112103.k2BL3HEg032262@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32234 Modified Files: .cvsignore rkhunter.spec sources Added Files: rkhunter-1.2.8-1.src.sha rkhunter-1.2.8-app_check_default.patch rkhunter-1.2.8-default_settings-conf.patch Removed Files: rkhunter-1.1.9-app_check_default.patch rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-install_dir-conf.patch Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf --- NEW FILE rkhunter-1.2.8-1.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch rkhunter-1.2.8-app_check_default.patch: --- NEW FILE rkhunter-1.2.8-app_check_default.patch --- --- files/rkhunter.orig 2006-02-14 05:35:20.000000000 -0500 +++ files/rkhunter 2006-03-05 14:20:37.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 # Patched software versions? USE_PATCHED_SOFTWARE=0 @@ -196,6 +196,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -5053,7 +5056,8 @@ echo $ECHOOPT "--report-mode* : Don't show uninteresting information for reports" echo $ECHOOPT "--report-warnings-only* : Show only warnings (lesser output than --report-mode," echo $ECHOOPT " more than --quiet)" - echo $ECHOOPT "--skip-application-check* : Don't run application version checks" +# echo $ECHOOPT "--skip-application-check* : Don't run application version checks" + echo $ECHOOPT "--run-application-check* : Run application version checks" echo $ECHOOPT "--skip-keypress (-sk)* : Don't wait after every test (non-interactive)" echo $ECHOOPT "--quick* : Perform quick scan (instead of full scan)" echo $ECHOOPT "--quiet* : Be quiet (only show warnings)" rkhunter-1.2.8-default_settings-conf.patch: --- NEW FILE rkhunter-1.2.8-default_settings-conf.patch --- --- files/rkhunter.conf.orig 2005-03-19 12:27:20.000000000 -0500 +++ files/rkhunter.conf 2006-03-06 06:17:26.000000000 -0500 @@ -3,6 +3,7 @@ # # All lines beginning with a dash (#) or empty lines, will be ignored. # +#INSTALLDIR=/usr/local # Links to files. Don't change if you don't need to. LATESTVERSION=/rkhunter_latest.dat @@ -37,11 +38,12 @@ # Allow hidden directory # One directory per line (use multiple ALLOWHIDDENDIR lines) # +#ALLOWHIDDENDIR=/dev/.udevdb #ALLOWHIDDENDIR=/etc/.java # Allow hidden file # One file per line (use multiple ALLOWHIDDENFILE lines) # -#ALLOWHIDDENFILE=/etc/.java +#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz # The End Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 07:27:20 -0000 1.4 +++ .cvsignore 11 Mar 2006 21:02:45 -0000 1.5 @@ -1,2 +1,3 @@ -rkhunter-1.2.7.tar.gz +rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-4/rkhunter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rkhunter.spec 5 Jan 2006 07:27:20 -0000 1.6 +++ rkhunter.spec 11 Mar 2006 21:02:45 -0000 1.7 @@ -1,23 +1,26 @@ +%define rkhVer 1.2.8 +%define rpmRel 1 + # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require # in order to function properly [perl(Digest::MD5) & perl(Digest::SHA1)]. AutoReqProv: no Name: rkhunter -Version: 1.2.7 -Release: 1 +Version: %{rkhVer} +Release: %{rpmRel}%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.2.8.tar.gz Source1: rkhunter-auto_scan.tar.gz -Source2: rkhunter-%{version}-%{release}.src.md5 -Patch0: rkhunter-1.2.7-install_dir-conf.patch +Source2: rkhunter-%{rkhVer}-%{rpmRel}.src.sha +Patch0: rkhunter-1.2.8-default_settings-conf.patch Patch1: rkhunter-1.1.8-showfiles.patch Patch2: rkhunter-1.1.9-shared_man_search.patch -Patch3: rkhunter-1.1.9-app_check_default.patch +Patch3: rkhunter-1.2.8-app_check_default.patch Patch4: rkhunter-1.2.7-datestamp.patch Patch5: rkhunter-1.2.7-append_log.patch Patch6: rkhunter-1.2.7-group_log.patch @@ -51,15 +54,15 @@ %prep # This optional check is for verification of original sources -# DURING the binary build process (md5 canary check) -[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \ - && %{__perl} -pi.orig -e ' - s|../SOURCES|%{_sourcedir}|g; - ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $? -%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \ - %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 +# DURING the binary build process (sha1 canary check) +#[ ! -e %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig ] \ +# && %{__perl} -pi.orig -e ' +# s|../SOURCES|%{_sourcedir}|g; +# ' %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#sha1sum --check %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha || exit $? +#%{__rm} -f %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#%{__mv} %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig \ +# %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha %setup -q -n %{name} %setup -q -D -T -a 1 -n %{name} @@ -148,8 +151,8 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb -cd .. -[ ! -d %{name} ] || %{__rm} -rf %{name} +#cd .. +#[ ! -d %{name} ] || %{__rm} -rf %{name} %post @@ -187,6 +190,13 @@ %changelog +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + * Mon Jun 11 2005 Greg Houlette - 1.2.7-1 - Added signature auto-updating to CRON scan (new script) - Removed BOOTSCAN pending rewrite to full SysV Init scan in background Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 07:27:20 -0000 1.4 +++ sources 11 Mar 2006 21:02:45 -0000 1.5 @@ -1,2 +1,2 @@ -288ba8a87352716384823c9ea1958fa7 rkhunter-1.2.7.tar.gz +41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz --- rkhunter-1.1.9-app_check_default.patch DELETED --- --- rkhunter-1.2.7-1.src.md5 DELETED --- --- rkhunter-1.2.7-install_dir-conf.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 11 21:08:17 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 16:08:17 -0500 Subject: rpms/rkhunter/devel rkhunter-1.2.8-1.src.sha, NONE, 1.1 rkhunter-1.2.8-app_check_default.patch, NONE, 1.1 rkhunter-1.2.8-default_settings-conf.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rkhunter.spec, 1.6, 1.7 sources, 1.4, 1.5 rkhunter-1.1.9-app_check_default.patch, 1.1, NONE rkhunter-1.2.7-1.src.md5, 1.1, NONE rkhunter-1.2.7-install_dir-conf.patch, 1.1, NONE Message-ID: <200603112108.k2BL8qD6032437@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32401 Modified Files: .cvsignore rkhunter.spec sources Added Files: rkhunter-1.2.8-1.src.sha rkhunter-1.2.8-app_check_default.patch rkhunter-1.2.8-default_settings-conf.patch Removed Files: rkhunter-1.1.9-app_check_default.patch rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-install_dir-conf.patch Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf --- NEW FILE rkhunter-1.2.8-1.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch rkhunter-1.2.8-app_check_default.patch: --- NEW FILE rkhunter-1.2.8-app_check_default.patch --- --- files/rkhunter.orig 2006-02-14 05:35:20.000000000 -0500 +++ files/rkhunter 2006-03-05 14:20:37.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 # Patched software versions? USE_PATCHED_SOFTWARE=0 @@ -196,6 +196,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -5053,7 +5056,8 @@ echo $ECHOOPT "--report-mode* : Don't show uninteresting information for reports" echo $ECHOOPT "--report-warnings-only* : Show only warnings (lesser output than --report-mode," echo $ECHOOPT " more than --quiet)" - echo $ECHOOPT "--skip-application-check* : Don't run application version checks" +# echo $ECHOOPT "--skip-application-check* : Don't run application version checks" + echo $ECHOOPT "--run-application-check* : Run application version checks" echo $ECHOOPT "--skip-keypress (-sk)* : Don't wait after every test (non-interactive)" echo $ECHOOPT "--quick* : Perform quick scan (instead of full scan)" echo $ECHOOPT "--quiet* : Be quiet (only show warnings)" rkhunter-1.2.8-default_settings-conf.patch: --- NEW FILE rkhunter-1.2.8-default_settings-conf.patch --- --- files/rkhunter.conf.orig 2005-03-19 12:27:20.000000000 -0500 +++ files/rkhunter.conf 2006-03-06 06:17:26.000000000 -0500 @@ -3,6 +3,7 @@ # # All lines beginning with a dash (#) or empty lines, will be ignored. # +#INSTALLDIR=/usr/local # Links to files. Don't change if you don't need to. LATESTVERSION=/rkhunter_latest.dat @@ -37,11 +38,12 @@ # Allow hidden directory # One directory per line (use multiple ALLOWHIDDENDIR lines) # +#ALLOWHIDDENDIR=/dev/.udevdb #ALLOWHIDDENDIR=/etc/.java # Allow hidden file # One file per line (use multiple ALLOWHIDDENFILE lines) # -#ALLOWHIDDENFILE=/etc/.java +#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz # The End Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 07:36:18 -0000 1.4 +++ .cvsignore 11 Mar 2006 21:08:16 -0000 1.5 @@ -1,2 +1,3 @@ -rkhunter-1.2.7.tar.gz +rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rkhunter.spec 5 Jan 2006 07:36:18 -0000 1.6 +++ rkhunter.spec 11 Mar 2006 21:08:16 -0000 1.7 @@ -1,23 +1,26 @@ +%define rkhVer 1.2.8 +%define rpmRel 1 + # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require # in order to function properly [perl(Digest::MD5) & perl(Digest::SHA1)]. AutoReqProv: no Name: rkhunter -Version: 1.2.7 -Release: 1 +Version: %{rkhVer} +Release: %{rpmRel}%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.2.8.tar.gz Source1: rkhunter-auto_scan.tar.gz -Source2: rkhunter-%{version}-%{release}.src.md5 -Patch0: rkhunter-1.2.7-install_dir-conf.patch +Source2: rkhunter-%{rkhVer}-%{rpmRel}.src.sha +Patch0: rkhunter-1.2.8-default_settings-conf.patch Patch1: rkhunter-1.1.8-showfiles.patch Patch2: rkhunter-1.1.9-shared_man_search.patch -Patch3: rkhunter-1.1.9-app_check_default.patch +Patch3: rkhunter-1.2.8-app_check_default.patch Patch4: rkhunter-1.2.7-datestamp.patch Patch5: rkhunter-1.2.7-append_log.patch Patch6: rkhunter-1.2.7-group_log.patch @@ -51,15 +54,15 @@ %prep # This optional check is for verification of original sources -# DURING the binary build process (md5 canary check) -[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \ - && %{__perl} -pi.orig -e ' - s|../SOURCES|%{_sourcedir}|g; - ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $? -%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \ - %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 +# DURING the binary build process (sha1 canary check) +#[ ! -e %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig ] \ +# && %{__perl} -pi.orig -e ' +# s|../SOURCES|%{_sourcedir}|g; +# ' %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#sha1sum --check %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha || exit $? +#%{__rm} -f %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#%{__mv} %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig \ +# %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha %setup -q -n %{name} %setup -q -D -T -a 1 -n %{name} @@ -148,8 +151,8 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb -cd .. -[ ! -d %{name} ] || %{__rm} -rf %{name} +#cd .. +#[ ! -d %{name} ] || %{__rm} -rf %{name} %post @@ -187,6 +190,13 @@ %changelog +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + * Mon Jun 11 2005 Greg Houlette - 1.2.7-1 - Added signature auto-updating to CRON scan (new script) - Removed BOOTSCAN pending rewrite to full SysV Init scan in background Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 07:36:18 -0000 1.4 +++ sources 11 Mar 2006 21:08:16 -0000 1.5 @@ -1,2 +1,2 @@ -288ba8a87352716384823c9ea1958fa7 rkhunter-1.2.7.tar.gz +41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz --- rkhunter-1.1.9-app_check_default.patch DELETED --- --- rkhunter-1.2.7-1.src.md5 DELETED --- --- rkhunter-1.2.7-install_dir-conf.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 11 21:19:46 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 11 Mar 2006 16:19:46 -0500 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.3, 1.4 cpanspec.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603112120.k2BLKIKf032544@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32523 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.61. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Mar 2006 03:11:44 -0000 1.3 +++ .cvsignore 11 Mar 2006 21:19:46 -0000 1.4 @@ -1 +1 @@ -cpanspec-1.60.tar.gz +cpanspec-1.61.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cpanspec.spec 8 Mar 2006 03:11:44 -0000 1.2 +++ cpanspec.spec 11 Mar 2006 21:19:46 -0000 1.3 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.60 +Version: 1.61 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Sat Mar 11 2006 Steven Pritchard 1.61-1 +- Update to 1.61. + * Tue Mar 07 2006 Steven Pritchard 1.60-1 - Update to 1.60. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Mar 2006 03:11:44 -0000 1.3 +++ sources 11 Mar 2006 21:19:46 -0000 1.4 @@ -1 +1 @@ -ebfaf5da00b1a5096f1919451d9be9e6 cpanspec-1.60.tar.gz +69df0b4f1a1fe4efd469c212cd8cb983 cpanspec-1.61.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 21:51:19 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 11 Mar 2006 16:51:19 -0500 Subject: owners owners.list,1.735,1.736 Message-ID: <200603112151.k2BLpp2f032694@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32673 Modified Files: owners.list Log Message: taking ownership of freedroidrpg Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.735 retrieving revision 1.736 diff -u -r1.735 -r1.736 --- owners.list 11 Mar 2006 13:12:59 -0000 1.735 +++ owners.list 11 Mar 2006 21:51:18 -0000 1.736 @@ -258,7 +258,7 @@ Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|freealut|Implementation of OpenAL's ALUT standard|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|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|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|extras-orphan at fedoraproject.org|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 Sat Mar 11 21:53:37 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 11 Mar 2006 16:53:37 -0500 Subject: owners owners.list,1.736,1.737 Message-ID: <200603112154.k2BLs9Wd032735@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32715 Modified Files: owners.list Log Message: Oops! Editted wrong line last time. Let's try to take ownership of the right package this time. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.736 retrieving revision 1.737 diff -u -r1.736 -r1.737 --- owners.list 11 Mar 2006 21:51:18 -0000 1.736 +++ owners.list 11 Mar 2006 21:53:37 -0000 1.737 @@ -258,8 +258,8 @@ Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|freealut|Implementation of OpenAL's ALUT standard|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| -Fedora Extras|freedroid|Clone of the C64 Game Paradroid|wart at kobold.org|extras-qa at fedoraproject.org| -Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|extras-orphan 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|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| Fedora Extras|FreeWnn|Japanese input server|petersen at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 11 22:50:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 11 Mar 2006 17:50:35 -0500 Subject: rpms/allegro/devel allegro-4.2.0-mprotect.patch, 1.1, 1.2 allegro.spec, 1.27, 1.28 Message-ID: <200603112251.k2BMp7er002290@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2268 Modified Files: allegro-4.2.0-mprotect.patch allegro.spec Log Message: * Sat Mar 11 2006 Hans de Goede 4.2.0-10 - really fix asm stretch code on i386 with NX processors, on OpenBSD mprotects first argument does not need to be page-aligned, but on Linux it does. Note that for this to work you may also need to disable selinux (rh 185214) allegro-4.2.0-mprotect.patch: Index: allegro-4.2.0-mprotect.patch =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro-4.2.0-mprotect.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- allegro-4.2.0-mprotect.patch 8 Mar 2006 22:12:12 -0000 1.1 +++ allegro-4.2.0-mprotect.patch 11 Mar 2006 22:50:34 -0000 1.2 @@ -1,5 +1,5 @@ --- allegro-4.2.0/tools/grabber.c.mprotect 2005-09-04 18:00:18.000000000 +0200 -+++ allegro-4.2.0/tools/grabber.c 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/tools/grabber.c 2006-03-11 23:27:31.000000000 +0100 @@ -3121,6 +3121,7 @@ case OSTYPE_SUNOS: s = "SunOS/Solaris"; break; case OSTYPE_FREEBSD: s = "FreeBSD"; break; @@ -9,7 +9,7 @@ case OSTYPE_DARWIN: s = "Darwin"; break; case OSTYPE_QNX: s = "QNX"; break; --- allegro-4.2.0/include/allegro/platform/alunixac.hin.mprotect 2005-10-30 21:23:33.000000000 +0100 -+++ allegro-4.2.0/include/allegro/platform/alunixac.hin 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/include/allegro/platform/alunixac.hin 2006-03-11 23:27:31.000000000 +0100 @@ -169,6 +169,9 @@ /* Define to 1 if you have the `mmap' function. */ #undef HAVE_MMAP @@ -21,7 +21,7 @@ #undef HAVE_NDIR_H --- allegro-4.2.0/include/allegro/system.h.mprotect 2005-03-15 21:32:43.000000000 +0100 -+++ allegro-4.2.0/include/allegro/system.h 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/include/allegro/system.h 2006-03-11 23:27:31.000000000 +0100 @@ -53,6 +53,7 @@ #define OSTYPE_SUNOS AL_ID('S','U','N',' ') #define OSTYPE_FREEBSD AL_ID('F','B','S','D') @@ -31,7 +31,7 @@ #define OSTYPE_DARWIN AL_ID('D','A','R','W') #define OSTYPE_QNX AL_ID('Q','N','X',' ') --- allegro-4.2.0/configure.mprotect 2005-11-06 10:54:00.000000000 +0100 -+++ allegro-4.2.0/configure 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/configure 2006-03-11 23:27:31.000000000 +0100 @@ -11225,7 +11225,7 @@ @@ -42,7 +42,7 @@ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 --- allegro-4.2.0/configure.in.mprotect 2005-08-07 23:50:49.000000000 +0200 -+++ allegro-4.2.0/configure.in 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/configure.in 2006-03-11 23:27:31.000000000 +0100 @@ -713,7 +713,7 @@ AC_STRUCT_TM AC_TYPE_SIGNAL @@ -53,7 +53,7 @@ dnl Tweak header files for library build CFLAGS="$CFLAGS -DALLEGRO_LIB_BUILD" --- allegro-4.2.0/src/unix/usystem.c.mprotect 2005-09-04 18:00:17.000000000 +0200 -+++ allegro-4.2.0/src/unix/usystem.c 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/src/unix/usystem.c 2006-03-11 23:27:31.000000000 +0100 @@ -196,6 +196,9 @@ else if (!strcmp(utsn.sysname, "NetBSD")) { os_type = OSTYPE_NETBSD; @@ -65,7 +65,7 @@ || (!strcmp(utsn.sysname, "IRIX64"))) { os_type = OSTYPE_IRIX; --- allegro-4.2.0/src/unix/uesd.c.mprotect 2005-03-12 08:54:27.000000000 +0100 -+++ allegro-4.2.0/src/unix/uesd.c 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/src/unix/uesd.c 2006-03-11 23:27:31.000000000 +0100 @@ -27,6 +27,7 @@ #include @@ -75,25 +75,31 @@ #include --- allegro-4.2.0/src/i386/istretch.c.mprotect 2005-03-15 19:02:22.000000000 +0100 -+++ allegro-4.2.0/src/i386/istretch.c 2006-03-08 23:14:52.000000000 +0100 -@@ -30,6 +30,10 @@ ++++ allegro-4.2.0/src/i386/istretch.c 2006-03-11 23:31:44.000000000 +0100 +@@ -30,6 +30,11 @@ #include "winalleg.h" /* For VirtualProtect */ #endif /* ifdef ALLEGRO_WINDOWS */ +#ifdef HAVE_MPROTECT + #include + #include ++ #include +#endif /* helper macro for generating stretchers in each color depth */ -@@ -435,7 +439,9 @@ +@@ -435,7 +440,14 @@ #ifdef ALLEGRO_WINDOWS /* Play nice with Windows executable memory protection */ VirtualProtect(_scratch_mem, _scratch_mem_size, PAGE_EXECUTE_READWRITE, &old_protect); - #endif /* ifdef ALLEGRO_WINDOWS */ + #elif defined(HAVE_MPROTECT) -+ mprotect(_scratch_mem, _scratch_mem_size, PROT_EXEC|PROT_READ|PROT_WRITE); ++ { ++ char *p = (char *)((unsigned long)_scratch_mem & ~(PAGE_SIZE-1ul)); ++ if (mprotect(p, _scratch_mem_size + ((char *)_scratch_mem - p), ++ PROT_EXEC|PROT_READ|PROT_WRITE)) ++ perror("allegro-error: mprotect failed during stretched blit!"); ++ } + #endif /* call the stretcher */ Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- allegro.spec 8 Mar 2006 22:15:11 -0000 1.27 +++ allegro.spec 11 Mar 2006 22:50:34 -0000 1.28 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 9 +Release: 10 Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -219,6 +219,11 @@ %changelog +* Sat Mar 11 2006 Hans de Goede 4.2.0-10 +- really fix asm stretch code on i386 with NX processors, on OpenBSD mprotects + first argument does not need to be page-aligned, but on Linux it does. + Note that for this to work you may also need to disable selinux (rh 185214) + * Wed Mar 8 2006 Hans de Goede 4.2.0-9 - fix fullscreen <-> window switching bug (bz 183645) - fix asm stretch code on i386 with NX processors, thanks to openBSD. From fedora-extras-commits at redhat.com Sun Mar 12 02:14:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 11 Mar 2006 21:14:34 -0500 Subject: rpms/perl-Module-Build/devel .cvsignore, 1.8, 1.9 perl-Module-Build.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200603120215.k2C2F75k010828@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-serv10803 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.2612. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Jul 2005 05:36:18 -0000 1.8 +++ .cvsignore 12 Mar 2006 02:14:33 -0000 1.9 @@ -1 +1 @@ -Module-Build-0.2611.tar.gz +Module-Build-0.2612.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Module-Build.spec 6 Sep 2005 01:04:44 -0000 1.13 +++ perl-Module-Build.spec 12 Mar 2006 02:14:33 -0000 1.14 @@ -1,6 +1,6 @@ Name: perl-Module-Build -Version: 0.2611 -Release: 2%{?dist} +Version: 0.2612 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules Group: Development/Libraries License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Sat Mar 11 2006 Steven Pritchard - 0.2612-1 +- Update to 0.2612. + * Mon Sep 05 2005 Steven Pritchard - 0.2611-2 - Minor spec cleanup. - Add COPYING and Artistic. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Jul 2005 05:36:18 -0000 1.8 +++ sources 12 Mar 2006 02:14:33 -0000 1.9 @@ -1 +1 @@ -d0fa9a7917ed43d1c1f8b707e86b6061 Module-Build-0.2611.tar.gz +fa1504741e9c931f75e804953c1d5417 Module-Build-0.2612.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 05:44:43 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:44:43 -0500 Subject: extras-buildsys/server main.py,1.18,1.19 Message-ID: <200603120544.k2C5ihfJ017064@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16976/server Modified Files: main.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- main.py 15 Feb 2006 17:03:30 -0000 1.18 +++ main.py 12 Mar 2006 05:44:35 -0000 1.19 @@ -19,6 +19,8 @@ import sys import os import socket +import signal +import time from plague import AuthedXMLRPCServer from plague import HTTPServer from plague import daemonize @@ -59,7 +61,16 @@ ################################################################# -if __name__ == '__main__': +bm_server = None + +def exit_handler(signum, frame): + global bm_server + print "Received SIGTERM, quitting..." + bm_server.stop() + +def main(): + global bm_server + usage = "Usage: %s [-p ] [-l ] [-d] [-c ]" % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, @@ -135,7 +146,7 @@ bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, port)) except socket.error, e: if e[0] == 98: # Address already in use - print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, UI_PORT) + print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, port) os._exit(1) bm_server.register_instance(ui) @@ -157,20 +168,30 @@ DebugUtils.registerThreadName(dummy) del dummy + # Set up our termination handler + signal.signal(signal.SIGTERM, exit_handler) + print "Build Server accepting requests on %s:%d.\n" % (hostname, port) + + # Serve requests until we're told to stop try: bm_server.serve_forever() except KeyboardInterrupt: - # Make sure the BuildMaster thread shuts down - print "Shutting down..." - bm.stop() - srpm_server.stop() - tbs.stop() + bm_server.server_close() + + # Make sure the BuildMaster thread shuts down + print "Shutting down..." + bm.stop() + srpm_server.stop() + tbs.stop() if opts.pidfile: os.unlink(opts.pidfile) + time.sleep(2) print "Done." os._exit(0) +if __name__ == '__main__': + main() From fedora-extras-commits at redhat.com Sun Mar 12 05:44:21 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:44:21 -0500 Subject: extras-buildsys ChangeLog,1.171,1.172 Message-ID: <200603120544.k2C5ipBV017067@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16976 Modified Files: ChangeLog Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- ChangeLog 26 Feb 2006 16:51:28 -0000 1.171 +++ ChangeLog 12 Mar 2006 05:44:12 -0000 1.172 @@ -1,3 +1,24 @@ +2006-03-12 Dan Williams + + * builder/builder.py + - Add a SIGTERM handler for clean shutdown + - Clean up lifecycle management + + * common/HTTPServer.py + - Clean up lifecycle management of PlgHTTPServerManager objects + + * common/SSLCommon.py + - Clean up lifecycle management of PlgBaseServer objects + - Initialize correct parent object in PlgBaseSSLServer.__init__ + + * etc/plague-builder.init + etc/plague-server.init + - Cleanups + + * server/main.py + - Add a SIGTERM handler for clean shutdown + - Clean up lifecycle management + 2006-02-26 Dan Williams * client/client.py From fedora-extras-commits at redhat.com Sun Mar 12 05:44:26 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:44:26 -0500 Subject: extras-buildsys/builder builder.py,1.51,1.52 Message-ID: <200603120544.k2C5iuAe017070@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16976/builder Modified Files: builder.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- builder.py 19 Feb 2006 06:52:11 -0000 1.51 +++ builder.py 12 Mar 2006 05:44:19 -0000 1.52 @@ -29,6 +29,7 @@ import errno import exceptions import threading +import signal from plague import ArchUtils from plague import FileDownloader from plague import AuthedXMLRPCServer @@ -44,6 +45,10 @@ certs = {} build_arches = [] +def log(string): + sys.stdout.write(string) + sys.stdout.flush() + def get_hostname(cfg, bind_all): cfg_hostname = cfg.get_str("Network", "hostname") @@ -805,7 +810,16 @@ return max_jobs +bserver = None + +def exit_handler(signum, frame): + global bserver + log("Received SIGTERM, quitting...\n") + bserver.stop() + def main(): + global bserver + usage = "Usage: %s [-p ] [-l ] [-d] -c " % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, @@ -819,7 +833,7 @@ (opts, args) = parser.parse_args() if not opts.configfile: - print "Must specify a config file." + log("Must specify a config file.\n") sys.exit(1) # Load in the config @@ -834,18 +848,18 @@ build_arches = determine_build_arches(cfg) if not len(build_arches): - print "Cannot determine buildable arches for this builder. Exiting..." + log("Cannot determine buildable arches for this builder. Exiting...\n") sys.exit(1) cfg.load_target_configs(build_arches) if len(cfg.targets()) == 0: - print "No useable mock buildroots configured. Exiting..." + log("No useable mock buildroots configured. Exiting...\n") sys.exit(1) if opts.daemon: ret=daemonize.createDaemon() if ret: - print "Daemonizing failed!" + log("Daemonizing failed!\n") sys.exit(2) if opts.pidfile: @@ -861,7 +875,7 @@ work_dir = cfg.get_str("Directories", "builder_work_dir") if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): - print "%s does not exist or is not readable." % work_dir + log("%s does not exist or is not readable.\n" % work_dir) os._exit(1) # Start up the HTTP server thread which the build server @@ -880,44 +894,52 @@ pass os._exit(1) - print "Binding to address '%s' with arches: [%s]" % (hostname, string.join(build_arches, ",")) + log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ","))) xmlrpc_port = cfg.get_int("Network", "xmlrpc_port") try: if cfg.get_bool("SSL", "use_ssl") == True: - xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, certs) + bserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, certs) else: - xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) + bserver = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) except socket.error, e: if e[0] == 98: - print "Error: couldn't bind to address '%s:%s'. " \ - "Is the builder already running?" % (hostname, xmlrpc_port) + log("Error: couldn't bind to address '%s:%s'. " \ + "Is the builder already running?\n" % (hostname, xmlrpc_port)) os._exit(1) max_jobs = determine_max_jobs(cfg) bcs = XMLRPCBuilderServer(cfg, max_jobs) - xmlserver.register_instance(bcs) + bserver.register_instance(bcs) + + # Set up our termination handler + signal.signal(signal.SIGTERM, exit_handler) - last_time = time.time() try: - while True: - xmlserver.handle_request() + bserver.handle_request() except KeyboardInterrupt, e: - print "Shutting down..." - (building_jobs, free) = bcs.building_jobs() - for jobid in building_jobs.keys(): - bcs.die(jobid) - # wait for the jobs to clean up before quitting - while True: - (building_jobs, free) = bcs.building_jobs() - if len(building_jobs.keys()) == 0: - break - try: - print "Waiting for building jobs to stop" - time.sleep(1) - except KeyboardInterrupt: - break + bserver.server_close() + log("Shutting down...\n") http_server.stop() + + (building_jobs, free) = bcs.building_jobs() + for jobid in building_jobs.keys(): + bcs.die(jobid) + + # wait for the jobs to clean up before quitting + log("Waiting for running jobs to stop...") + while True: + (building_jobs, free) = bcs.building_jobs() + if len(building_jobs.keys()) == 0: + break + try: + log(".") + time.sleep(0.5) + except KeyboardInterrupt: + break + log(" done.\n"); + sys.stdout.flush() + time.sleep(2) os._exit(0) From fedora-extras-commits at redhat.com Sun Mar 12 05:44:32 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:44:32 -0500 Subject: extras-buildsys/common HTTPServer.py, 1.8, 1.9 SSLCommon.py, 1.12, 1.13 Message-ID: <200603120545.k2C5j2NH017076@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16976/common Modified Files: HTTPServer.py SSLCommon.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- HTTPServer.py 29 Nov 2005 06:41:46 -0000 1.8 +++ HTTPServer.py 12 Mar 2006 05:44:24 -0000 1.9 @@ -102,19 +102,17 @@ self._server = PlgHTTPSServer(addr, http_dir, certs) else: self._server = PlgHTTPServer(addr, http_dir) - self._stop = False self._stopped = False threading.Thread.__init__(self) self.setName("PlgHTTPServerManager: %s/%s" % (addr, http_dir)) def run(self): DebugUtils.registerThreadName(self) - while not self._stop: - self._server.handle_request() + self._server.serve_forever() self._stopped = True def stop(self): - self._stop = True + self._server.stop() t = time.time() while not self._stopped: if time.time() > t + 2: Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- SSLCommon.py 25 Nov 2005 04:45:07 -0000 1.12 +++ SSLCommon.py 12 Mar 2006 05:44:24 -0000 1.13 @@ -56,16 +56,17 @@ allow_reuse_address = 1 def __init__(self, server_addr, req_handler): + self._quit = False self.allow_reuse_address = 1 SocketServer.ThreadingTCPServer.__init__(self, server_addr, req_handler) + def stop(self): + self._quit = True + def serve_forever(self): - while True: - try: - self.handle_request() - except KeyboardInterrupt, e: - print "Shutting down..." - break + while not self._quit: + self.handle_request() + self.server_close() class PlgBaseSSLServer(PlgBaseServer): @@ -75,7 +76,7 @@ self._timeout = timeout self.ssl_ctx = CreateSSLContext(certs) - SocketServer.BaseServer.__init__(self, server_address, req_handler) + PlgBaseServer.__init__(self, server_address, req_handler) sock = socket.socket(self.address_family, self.socket_type) con = SSL.Connection(self.ssl_ctx, sock) From fedora-extras-commits at redhat.com Sun Mar 12 05:44:37 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:44:37 -0500 Subject: extras-buildsys/etc plague-builder.init, 1.9, 1.10 plague-server.init, 1.4, 1.5 Message-ID: <200603120545.k2C5j7eC017080@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16976/etc Modified Files: plague-builder.init plague-server.init Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plague-builder.init 16 Feb 2006 05:01:17 -0000 1.9 +++ plague-builder.init 12 Mar 2006 05:44:30 -0000 1.10 @@ -13,30 +13,34 @@ # Source function library. . /etc/init.d/functions -prog="plague-builder" +servicename="plague-builder" +processname="plague-builder" +pidfile=/var/run/plague-builder.pid +logfile=/var/log/plague-builder.log -if [ -f /etc/sysconfig/plague-builder ]; then -. /etc/sysconfig/plague-builder +if [ -f /etc/sysconfig/$servicename ]; then +. /etc/sysconfig/$servicename fi start() { - if [ ! -f /var/lock/subsys/plague-builder ]; then - echo -n $"Starting $prog: " - daemon plague-builder -c $CONFIG -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log - echo - touch /var/lock/subsys/plague-builder - return 0 + if [ ! -f /var/lock/subsys/$servicename ]; then + echo -n $"Starting $servicename: " + daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename fi } stop() { - if test "x`pidof -x plague-builder`" != x; then - echo -n $"Stopping $prog: " - killproc plague-builder + echo -n $"Stopping $servicename: " + killproc -p $pidfile $servicename + RETVAL=$? echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile fi - rm -f /var/lock/subsys/plague-builder - return 0 } restart() { @@ -45,25 +49,26 @@ } case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status plague-builder - ;; - restart) + start) + start + ;; + stop) + stop + ;; + status) + status -p $pidfile $processname + RETVAL=$? + ;; + restart) stop - start - ;; - condrestart) - [ -f /var/lock/subsys/plague-builder ] && restart || : - ;; - *) - echo "Usage: {start|stop|status|reload|restart[|probe]" - exit 1 - ;; + start + ;; + condrestart) + [ -f /var/lock/subsys/$servicename ] && restart || : + ;; + *) + echo "Usage: $0 {start|stop|status|reload|restart[|probe]" + exit 1 + ;; esac exit $? Index: plague-server.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plague-server.init 16 Feb 2006 05:01:17 -0000 1.4 +++ plague-server.init 12 Mar 2006 05:44:30 -0000 1.5 @@ -13,30 +13,34 @@ # Source function library. . /etc/init.d/functions -prog="plague-server" +servicename="plague-server" +processname="plague-server" +pidfile=/var/run/plague-server.pid +logfile=/var/log/plague-server.log -if [ -f /etc/sysconfig/plague-server ]; then -. /etc/sysconfig/plague-server +if [ -f /etc/sysconfig/$servicename ]; then +. /etc/sysconfig/$servicename fi start() { - if [ ! -f /var/lock/subsys/plague-server ]; then - echo -n $"Starting $prog: " - daemon plague-server -c $CONFIG -d -p /var/run/plague-server.pid -l /var/log/plague-server.log - echo - touch /var/lock/subsys/plague-server - return 0 + if [ ! -f /var/lock/subsys/$servicename ]; then + echo -n $"Starting $servicename: " + daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename fi } stop() { - if test "x`pidof -x plague-server`" != x; then - echo -n $"Stopping $prog: " - killproc plague-server + echo -n $"Stopping $servicename: " + killproc -p $pidfile $servicename + RETVAL=$? echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile fi - rm -f /var/lock/subsys/plague-server - return 0 } restart() { @@ -45,25 +49,26 @@ } case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status plague-server - ;; - restart) - stop - start - ;; - condrestart) - [ -f /var/lock/subsys/plague-server ] && restart || : - ;; - *) - echo "Usage: {start|stop|status|reload|restart[|probe]" - exit 1 - ;; + start) + start + ;; + stop) + stop + ;; + status) + status -p $pidfile $processname + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + [ -f /var/lock/subsys/$servicename ] && restart || : + ;; + *) + echo "Usage: $0 {start|stop|status|reload|restart[|probe]" + exit 1 + ;; esac exit $? From fedora-extras-commits at redhat.com Sun Mar 12 05:53:20 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:53:20 -0500 Subject: extras-buildsys/server main.py,1.14.2.3,1.14.2.4 Message-ID: <200603120553.k2C5rK9J017176@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091/server Modified Files: Tag: STABLE_0_4 main.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.14.2.3 retrieving revision 1.14.2.4 diff -u -r1.14.2.3 -r1.14.2.4 --- main.py 15 Feb 2006 17:14:50 -0000 1.14.2.3 +++ main.py 12 Mar 2006 05:53:13 -0000 1.14.2.4 @@ -19,6 +19,8 @@ import sys import os import socket +import signal +import time from plague import AuthedXMLRPCServer from plague import HTTPServer from plague import daemonize @@ -59,7 +61,16 @@ ################################################################# -if __name__ == '__main__': +bm_server = None + +def exit_handler(signum, frame): + global bm_server + print "Received SIGTERM, quitting..." + bm_server.stop() + +def main(): + global bm_server + usage = "Usage: %s [-p ] [-l ] [-d] [-c ]" % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, @@ -135,7 +146,7 @@ bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, port)) except socket.error, e: if e[0] == 98: # Address already in use - print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, UI_PORT) + print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, port) os._exit(1) bm_server.register_instance(ui) @@ -157,20 +168,30 @@ DebugUtils.registerThreadName(dummy) del dummy + # Set up our termination handler + signal.signal(signal.SIGTERM, exit_handler) + print "Build Server accepting requests on %s:%d.\n" % (hostname, port) + + # Serve requests until we're told to stop try: bm_server.serve_forever() except KeyboardInterrupt: - # Make sure the BuildMaster thread shuts down - print "Shutting down..." - bm.stop() - srpm_server.stop() - tbs.stop() + bm_server.server_close() + + # Make sure the BuildMaster thread shuts down + print "Shutting down..." + bm.stop() + srpm_server.stop() + tbs.stop() if opts.pidfile: os.unlink(opts.pidfile) + time.sleep(2) print "Done." os._exit(0) +if __name__ == '__main__': + main() From fedora-extras-commits at redhat.com Sun Mar 12 05:52:56 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:52:56 -0500 Subject: extras-buildsys ChangeLog,1.126.2.41,1.126.2.42 Message-ID: <200603120553.k2C5rQq8017179@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091 Modified Files: Tag: STABLE_0_4 ChangeLog Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.41 retrieving revision 1.126.2.42 diff -u -r1.126.2.41 -r1.126.2.42 --- ChangeLog 26 Feb 2006 16:52:12 -0000 1.126.2.41 +++ ChangeLog 12 Mar 2006 05:52:48 -0000 1.126.2.42 @@ -1,3 +1,24 @@ +2006-03-12 Dan Williams + + * builder/builder.py + - Add a SIGTERM handler for clean shutdown + - Clean up lifecycle management + + * common/HTTPServer.py + - Clean up lifecycle management of PlgHTTPServerManager objects + + * common/SSLCommon.py + - Clean up lifecycle management of PlgBaseServer objects + - Initialize correct parent object in PlgBaseSSLServer.__init__ + + * etc/plague-builder.init + etc/plague-server.init + - Cleanups + + * server/main.py + - Add a SIGTERM handler for clean shutdown + - Clean up lifecycle management + 2006-02-26 Dan Williams * client/client.py From fedora-extras-commits at redhat.com Sun Mar 12 05:53:01 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:53:01 -0500 Subject: extras-buildsys/builder builder.py,1.44.2.7,1.44.2.8 Message-ID: <200603120553.k2C5rVkY017182@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091/builder Modified Files: Tag: STABLE_0_4 builder.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.44.2.7 retrieving revision 1.44.2.8 diff -u -r1.44.2.7 -r1.44.2.8 --- builder.py 19 Feb 2006 06:57:21 -0000 1.44.2.7 +++ builder.py 12 Mar 2006 05:52:54 -0000 1.44.2.8 @@ -29,6 +29,7 @@ import errno import exceptions import threading +import signal from plague import ArchUtils from plague import FileDownloader from plague import AuthedXMLRPCServer @@ -44,6 +45,10 @@ certs = {} build_arches = [] +def log(string): + sys.stdout.write(string) + sys.stdout.flush() + def get_hostname(cfg, bind_all): cfg_hostname = cfg.get_str("Network", "hostname") @@ -805,7 +810,16 @@ return max_jobs +bserver = None + +def exit_handler(signum, frame): + global bserver + log("Received SIGTERM, quitting...\n") + bserver.stop() + def main(): + global bserver + usage = "Usage: %s [-p ] [-l ] [-d] -c " % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, @@ -819,7 +833,7 @@ (opts, args) = parser.parse_args() if not opts.configfile: - print "Must specify a config file." + log("Must specify a config file.\n") sys.exit(1) # Load in the config @@ -834,18 +848,18 @@ build_arches = determine_build_arches(cfg) if not len(build_arches): - print "Cannot determine buildable arches for this builder. Exiting..." + log("Cannot determine buildable arches for this builder. Exiting...\n") sys.exit(1) cfg.load_target_configs(build_arches) if len(cfg.targets()) == 0: - print "No useable mock buildroots configured. Exiting..." + log("No useable mock buildroots configured. Exiting...\n") sys.exit(1) if opts.daemon: ret=daemonize.createDaemon() if ret: - print "Daemonizing failed!" + log("Daemonizing failed!\n") sys.exit(2) if opts.pidfile: @@ -861,7 +875,7 @@ work_dir = cfg.get_str("Directories", "builder_work_dir") if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): - print "%s does not exist or is not readable." % work_dir + log("%s does not exist or is not readable.\n" % work_dir) os._exit(1) # Start up the HTTP server thread which the build server @@ -880,44 +894,52 @@ pass os._exit(1) - print "Binding to address '%s' with arches: [%s]" % (hostname, string.join(build_arches, ",")) + log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ","))) xmlrpc_port = cfg.get_int("Network", "xmlrpc_port") try: if cfg.get_bool("SSL", "use_ssl") == True: - xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, certs) + bserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, certs) else: - xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) + bserver = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) except socket.error, e: if e[0] == 98: - print "Error: couldn't bind to address '%s:%s'. " \ - "Is the builder already running?" % (hostname, xmlrpc_port) + log("Error: couldn't bind to address '%s:%s'. " \ + "Is the builder already running?\n" % (hostname, xmlrpc_port)) os._exit(1) max_jobs = determine_max_jobs(cfg) bcs = XMLRPCBuilderServer(cfg, max_jobs) - xmlserver.register_instance(bcs) + bserver.register_instance(bcs) + + # Set up our termination handler + signal.signal(signal.SIGTERM, exit_handler) - last_time = time.time() try: - while True: - xmlserver.handle_request() + bserver.handle_request() except KeyboardInterrupt, e: - print "Shutting down..." - (building_jobs, free) = bcs.building_jobs() - for jobid in building_jobs.keys(): - bcs.die(jobid) - # wait for the jobs to clean up before quitting - while True: - (building_jobs, free) = bcs.building_jobs() - if len(building_jobs.keys()) == 0: - break - try: - print "Waiting for building jobs to stop" - time.sleep(1) - except KeyboardInterrupt: - break + bserver.server_close() + log("Shutting down...\n") http_server.stop() + + (building_jobs, free) = bcs.building_jobs() + for jobid in building_jobs.keys(): + bcs.die(jobid) + + # wait for the jobs to clean up before quitting + log("Waiting for running jobs to stop...") + while True: + (building_jobs, free) = bcs.building_jobs() + if len(building_jobs.keys()) == 0: + break + try: + log(".") + time.sleep(0.5) + except KeyboardInterrupt: + break + log(" done.\n"); + sys.stdout.flush() + time.sleep(2) os._exit(0) From fedora-extras-commits at redhat.com Sun Mar 12 05:53:07 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:53:07 -0500 Subject: extras-buildsys/common HTTPServer.py, 1.6.2.2, 1.6.2.3 SSLCommon.py, 1.10.4.2, 1.10.4.3 Message-ID: <200603120553.k2C5rbRd017186@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091/common Modified Files: Tag: STABLE_0_4 HTTPServer.py SSLCommon.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- HTTPServer.py 29 Nov 2005 06:36:38 -0000 1.6.2.2 +++ HTTPServer.py 12 Mar 2006 05:52:59 -0000 1.6.2.3 @@ -102,19 +102,17 @@ self._server = PlgHTTPSServer(addr, http_dir, certs) else: self._server = PlgHTTPServer(addr, http_dir) - self._stop = False self._stopped = False threading.Thread.__init__(self) self.setName("PlgHTTPServerManager: %s/%s" % (addr, http_dir)) def run(self): DebugUtils.registerThreadName(self) - while not self._stop: - self._server.handle_request() + self._server.serve_forever() self._stopped = True def stop(self): - self._stop = True + self._server.stop() t = time.time() while not self._stopped: if time.time() > t + 2: Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.10.4.2 retrieving revision 1.10.4.3 diff -u -r1.10.4.2 -r1.10.4.3 --- SSLCommon.py 24 Nov 2005 22:32:02 -0000 1.10.4.2 +++ SSLCommon.py 12 Mar 2006 05:52:59 -0000 1.10.4.3 @@ -56,16 +56,17 @@ allow_reuse_address = 1 def __init__(self, server_addr, req_handler): + self._quit = False self.allow_reuse_address = 1 SocketServer.ThreadingTCPServer.__init__(self, server_addr, req_handler) + def stop(self): + self._quit = True + def serve_forever(self): - while True: - try: - self.handle_request() - except KeyboardInterrupt, e: - print "Shutting down..." - break + while not self._quit: + self.handle_request() + self.server_close() class PlgBaseSSLServer(PlgBaseServer): @@ -75,7 +76,7 @@ self._timeout = timeout self.ssl_ctx = CreateSSLContext(certs) - SocketServer.BaseServer.__init__(self, server_address, req_handler) + PlgBaseServer.__init__(self, server_address, req_handler) sock = socket.socket(self.address_family, self.socket_type) con = SSL.Connection(self.ssl_ctx, sock) From fedora-extras-commits at redhat.com Sun Mar 12 05:53:15 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:53:15 -0500 Subject: extras-buildsys/etc plague-builder.init, 1.7.2.2, 1.7.2.3 plague-server.init, 1.2.2.2, 1.2.2.3 Message-ID: <200603120553.k2C5rjmg017190@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091/etc Modified Files: Tag: STABLE_0_4 plague-builder.init plague-server.init Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -u -r1.7.2.2 -r1.7.2.3 --- plague-builder.init 16 Feb 2006 06:14:46 -0000 1.7.2.2 +++ plague-builder.init 12 Mar 2006 05:53:05 -0000 1.7.2.3 @@ -13,30 +13,34 @@ # Source function library. . /etc/init.d/functions -prog="plague-builder" +servicename="plague-builder" +processname="plague-builder" +pidfile=/var/run/plague-builder.pid +logfile=/var/log/plague-builder.log -if [ -f /etc/sysconfig/plague-builder ]; then -. /etc/sysconfig/plague-builder +if [ -f /etc/sysconfig/$servicename ]; then +. /etc/sysconfig/$servicename fi start() { - if [ ! -f /var/lock/subsys/plague-builder ]; then - echo -n $"Starting $prog: " - daemon plague-builder -c $CONFIG -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log - echo - touch /var/lock/subsys/plague-builder - return 0 + if [ ! -f /var/lock/subsys/$servicename ]; then + echo -n $"Starting $servicename: " + daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename fi } stop() { - if test "x`pidof -x plague-builder`" != x; then - echo -n $"Stopping $prog: " - killproc plague-builder + echo -n $"Stopping $servicename: " + killproc -p $pidfile $servicename + RETVAL=$? echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile fi - rm -f /var/lock/subsys/plague-builder - return 0 } restart() { @@ -45,25 +49,26 @@ } case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status plague-builder - ;; - restart) + start) + start + ;; + stop) + stop + ;; + status) + status -p $pidfile $processname + RETVAL=$? + ;; + restart) stop - start - ;; - condrestart) - [ -f /var/lock/subsys/plague-builder ] && restart || : - ;; - *) - echo "Usage: {start|stop|status|reload|restart[|probe]" - exit 1 - ;; + start + ;; + condrestart) + [ -f /var/lock/subsys/$servicename ] && restart || : + ;; + *) + echo "Usage: $0 {start|stop|status|reload|restart[|probe]" + exit 1 + ;; esac exit $? Index: plague-server.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- plague-server.init 16 Feb 2006 06:14:46 -0000 1.2.2.2 +++ plague-server.init 12 Mar 2006 05:53:05 -0000 1.2.2.3 @@ -13,30 +13,34 @@ # Source function library. . /etc/init.d/functions -prog="plague-server" +servicename="plague-server" +processname="plague-server" +pidfile=/var/run/plague-server.pid +logfile=/var/log/plague-server.log -if [ -f /etc/sysconfig/plague-server ]; then -. /etc/sysconfig/plague-server +if [ -f /etc/sysconfig/$servicename ]; then +. /etc/sysconfig/$servicename fi start() { - if [ ! -f /var/lock/subsys/plague-server ]; then - echo -n $"Starting $prog: " - daemon plague-server -c $CONFIG -d -p /var/run/plague-server.pid -l /var/log/plague-server.log - echo - touch /var/lock/subsys/plague-server - return 0 + if [ ! -f /var/lock/subsys/$servicename ]; then + echo -n $"Starting $servicename: " + daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename fi } stop() { - if test "x`pidof -x plague-server`" != x; then - echo -n $"Stopping $prog: " - killproc plague-server + echo -n $"Stopping $servicename: " + killproc -p $pidfile $servicename + RETVAL=$? echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile fi - rm -f /var/lock/subsys/plague-server - return 0 } restart() { @@ -45,25 +49,26 @@ } case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status plague-server - ;; - restart) - stop - start - ;; - condrestart) - [ -f /var/lock/subsys/plague-server ] && restart || : - ;; - *) - echo "Usage: {start|stop|status|reload|restart[|probe]" - exit 1 - ;; + start) + start + ;; + stop) + stop + ;; + status) + status -p $pidfile $processname + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + [ -f /var/lock/subsys/$servicename ] && restart || : + ;; + *) + echo "Usage: $0 {start|stop|status|reload|restart[|probe]" + exit 1 + ;; esac exit $? From fedora-extras-commits at redhat.com Sun Mar 12 09:42:54 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 12 Mar 2006 04:42:54 -0500 Subject: rpms/amaya/devel amaya.spec,1.23,1.24 Message-ID: <200603120943.k2C9hQgs029457@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amaya/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29440 Modified Files: amaya.spec Log Message: fix symlink (bug #184503) Index: amaya.spec =================================================================== RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- amaya.spec 22 Feb 2006 22:49:45 -0000 1.23 +++ amaya.spec 12 Mar 2006 09:42:53 -0000 1.24 @@ -1,6 +1,6 @@ Name: amaya Version: 9.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: W3C's browser/web authoring tool Group: Applications/Internet @@ -43,8 +43,8 @@ export CFLAGS="$RPM_OPT_FLAGS" ../configure --enable-bookmarks \ --prefix=%_libdir \ - --bindir=%_bindir \ - --exec_prefix=%_exec_prefix \ + --bindir=%_bindir \ + --exec_prefix=%_exec_prefix \ --libdir=%_libdir \ --with-gtk make @@ -64,7 +64,8 @@ # fix up symlinks pushd ${RPM_BUILD_ROOT}%{_bindir} >/dev/null rm -f amaya* -ln -s %{_libdir}/Amaya-*/gtk/bin/amaya amaya-gtk +amayadir=`ls -d ${RPM_BUILD_ROOT}%{_libdir}/Amaya-*` +ln -s %{_libdir}/`basename $amayadir`/gtk/bin/amaya amaya-gtk ln -s amaya-gtk amaya popd >/dev/null @@ -102,6 +103,9 @@ %{_datadir}/pixmaps/* %changelog +* Sun Mar 12 2006 Aurelien Bompard 9.1-12 +- fix symlink (bug #184503) + * Wed Feb 22 2006 Aurelien Bompard 9.1-11 - give up on x86_64 and excludearch it From fedora-extras-commits at redhat.com Sun Mar 12 11:44:30 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 12 Mar 2006 06:44:30 -0500 Subject: rpms/lrmi/devel .cvsignore, 1.3, 1.4 lrmi.spec, 1.7, 1.8 sources, 1.3, 1.4 lrmi-0.9-asm.patch, 1.1, NONE Message-ID: <200603121145.k2CBj3OD001252@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lrmi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1229 Modified Files: .cvsignore lrmi.spec sources Removed Files: lrmi-0.9-asm.patch Log Message: * Sun Mar 12 2006 Ville Skytt?? - 0.10-1 - 0.10, asm patch applied upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lrmi/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Nov 2005 17:57:01 -0000 1.3 +++ .cvsignore 12 Mar 2006 11:44:29 -0000 1.4 @@ -1 +1 @@ -lrmi-0.9.tar.gz +lrmi-0.10.tar.gz Index: lrmi.spec =================================================================== RCS file: /cvs/extras/rpms/lrmi/devel/lrmi.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lrmi.spec 4 Dec 2005 18:23:51 -0000 1.7 +++ lrmi.spec 12 Mar 2006 11:44:29 -0000 1.8 @@ -1,6 +1,6 @@ Name: lrmi -Version: 0.9 -Release: 2%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: Library for calling real mode BIOS routines Group: System Environment/Libraries @@ -8,7 +8,6 @@ URL: http://sourceforge.net/projects/lrmi/ Source0: http://download.sourceforge.net/lrmi/%{name}-%{version}.tar.gz Patch0: %{name}-0.9-build.patch -Patch1: %{name}-0.9-asm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} @@ -37,7 +36,6 @@ %prep %setup -q %patch0 -%patch1 %build @@ -77,6 +75,9 @@ %changelog +* Sun Mar 12 2006 Ville Skytt?? - 0.10-1 +- 0.10, asm patch applied upstream. + * Sun Dec 4 2005 Ville Skytt?? - 0.9-2 - Fix build with new binutils. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lrmi/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Nov 2005 17:57:01 -0000 1.3 +++ sources 12 Mar 2006 11:44:29 -0000 1.4 @@ -1 +1 @@ -00c2d0e4f4848100c04d8f88591cb943 lrmi-0.9.tar.gz +fc1d9495e8f4563fca471bb65f34a5da lrmi-0.10.tar.gz --- lrmi-0.9-asm.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 12 11:46:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 12 Mar 2006 06:46:19 -0500 Subject: rpms/xosd/devel xosd.spec,1.10,1.11 Message-ID: <200603121146.k2CBkpXN001318@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xosd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1301 Modified Files: xosd.spec Log Message: * Sun Mar 12 2006 Ville Skytt?? - 2.2.14-5 - Convert docs to UTF-8. Index: xosd.spec =================================================================== RCS file: /cvs/extras/rpms/xosd/devel/xosd.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xosd.spec 17 Nov 2005 16:54:03 -0000 1.10 +++ xosd.spec 12 Mar 2006 11:46:18 -0000 1.11 @@ -5,7 +5,7 @@ Name: xosd Version: 2.2.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -72,6 +72,9 @@ %setup -q %patch0 -p0 %patch1 -p1 +for f in ChangeLog man/xosd_{create,destroy,display,is_onscreen,set_bar_length}.3 ; do + iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f +done %build @@ -125,6 +128,9 @@ %changelog +* Sun Mar 12 2006 Ville Skytt?? - 2.2.14-5 +- Convert docs to UTF-8. + * Thu Nov 17 2005 Ville Skytt?? - 2.2.14-4 - Adapt to modular X packaging. - Don't ship static libraries by default. From fedora-extras-commits at redhat.com Sun Mar 12 11:54:40 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 12 Mar 2006 06:54:40 -0500 Subject: rpms/s3switch/devel s3switch.spec,1.7,1.8 Message-ID: <200603121155.k2CBtCDu001419@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/s3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1402 Modified Files: s3switch.spec Log Message: * Sun Mar 12 2006 Ville Skytt?? - 0.0-7.20020912 - Rebuild. Index: s3switch.spec =================================================================== RCS file: /cvs/extras/rpms/s3switch/devel/s3switch.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- s3switch.spec 6 Apr 2005 22:13:31 -0000 1.7 +++ s3switch.spec 12 Mar 2006 11:54:40 -0000 1.8 @@ -1,7 +1,6 @@ Name: s3switch Version: 0.0 -Release: 6.20020912 - +Release: 7.20020912%{?dist} Summary: Manage the output device on S3 Savage chips Group: Applications/System @@ -16,8 +15,8 @@ Patch3: %{name}-lrmi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: lrmi-devel ExclusiveArch: %{ix86} +BuildRequires: lrmi-devel Requires: %{_bindir}/consolehelper %description @@ -73,7 +72,10 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Sun Mar 12 2006 Ville Skytt?? - 0.0-7.20020912 +- Rebuild. + +* Fri Apr 7 2005 Michael Schwendt - 0.0-6.20020912 - rebuilt * Fri Jul 23 2004 Ville Skytt?? 0:0.0-0.fdr.5.20020912 From fedora-extras-commits at redhat.com Sun Mar 12 12:02:27 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 12 Mar 2006 07:02:27 -0500 Subject: rpms/tpb/devel tpb.spec,1.10,1.11 Message-ID: <200603121202.k2CC2xDP003422@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/tpb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3405 Modified Files: tpb.spec Log Message: * Sun Mar 12 2006 Ville Skytt?? - 0.6.4-3 - Rebuild. Index: tpb.spec =================================================================== RCS file: /cvs/extras/rpms/tpb/devel/tpb.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tpb.spec 19 Nov 2005 17:55:44 -0000 1.10 +++ tpb.spec 12 Mar 2006 12:02:26 -0000 1.11 @@ -1,6 +1,6 @@ Name: tpb Version: 0.6.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ThinkPad button support utility Group: System Environment/Base @@ -99,6 +99,9 @@ %changelog +* Sun Mar 12 2006 Ville Skytt?? - 0.6.4-3 +- Rebuild. + * Thu Nov 17 2005 Ville Skytt?? - 0.6.4-2 - Adapt to modular X packaging. From fedora-extras-commits at redhat.com Sun Mar 12 12:04:20 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 12 Mar 2006 07:04:20 -0500 Subject: rpms/ks3switch/devel ks3switch.spec,1.2,1.3 Message-ID: <200603121204.k2CC4tZt003491@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3473 Modified Files: ks3switch.spec Log Message: * Sun Mar 12 2006 Ville Skytt?? - 0.1-2 - Rebuild. Index: ks3switch.spec =================================================================== RCS file: /cvs/extras/rpms/ks3switch/devel/ks3switch.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ks3switch.spec 20 Sep 2005 20:41:20 -0000 1.2 +++ ks3switch.spec 12 Mar 2006 12:04:20 -0000 1.3 @@ -1,6 +1,6 @@ Name: ks3switch Version: 0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE utility for managing the output device on S3 Savage chips Group: Applications/System @@ -11,11 +11,11 @@ Patch1: %{name}-exec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# ExclusiveArch due to s3switch availability +ExclusiveArch: %{ix86} BuildRequires: kdelibs-devel BuildRequires: desktop-file-utils Requires: s3switch -# ExclusiveArch due to s3switch availability -ExclusiveArch: %{ix86} %description KS3switch is a KDE frontend to s3switch, the utility for managing the @@ -68,6 +68,9 @@ %changelog +* Sun Mar 12 2006 Ville Skytt?? - 0.1-2 +- Rebuild. + * Tue Sep 20 2005 Ville Skytt?? - 0.1-1 - Fix desktop entry categories (#165464). - Tidy up build dependencies. From fedora-extras-commits at redhat.com Sun Mar 12 13:24:11 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 12 Mar 2006 08:24:11 -0500 Subject: rpms/camstream/devel camstream.spec,1.10,1.11 Message-ID: <200603121324.k2CDOhV7006114@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/camstream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6097 Modified Files: camstream.spec Log Message: * Sat Mar 11 2006 Simon Perreault - 0.26.3-9 - Taking ownership of package. - Fixed build dependencies (#178654). Index: camstream.spec =================================================================== RCS file: /cvs/extras/rpms/camstream/devel/camstream.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- camstream.spec 26 Feb 2006 07:51:53 -0000 1.10 +++ camstream.spec 12 Mar 2006 13:24:10 -0000 1.11 @@ -1,6 +1,6 @@ Name: camstream Version: 0.26.3 -Release: 8 +Release: 9%{?dist} Summary: Set of programs to make use of your webcam @@ -14,8 +14,7 @@ Patch1: %{name}-%{version}-x86_64-asm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel, libjpeg-devel, libpng-devel, autoconf, XFree86-devel -BuildRequires: desktop-file-utils +BuildRequires: qt-devel, autoconf, desktop-file-utils ExclusiveArch: %{ix86} x86_64 %description @@ -26,13 +25,6 @@ %prep -cat< - 0.26.3-9 +- Taking ownership of package. +- Fixed build dependencies (#178654). + * Wed May 25 2005 Colin Charles - 0.26.3-8 - remove ppc (ExclusiveArch x86/x86_64), as there's x86 assembly in video_asm.S that would require porting (#158652) From fedora-extras-commits at redhat.com Sun Mar 12 13:29:50 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:29:50 -0500 Subject: rpms/ushare import.log,1.7,1.8 Message-ID: <200603121330.k2CDUMIl006238@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6202 Modified Files: import.log Log Message: auto-import ushare-0.9.7-1 on branch devel from ushare-0.9.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ushare/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 19 Feb 2006 17:19:33 -0000 1.7 +++ import.log 12 Mar 2006 13:29:50 -0000 1.8 @@ -4,3 +4,4 @@ ushare-0_9_6-1:HEAD:ushare-0.9.6-1.src.rpm:1140369356 ushare-0_9_6-1:FC-3:ushare-0.9.6-1.src.rpm:1140369459 ushare-0_9_6-1:FC-4:ushare-0.9.6-1.src.rpm:1140369564 +ushare-0_9_7-1:HEAD:ushare-0.9.7-1.src.rpm:1142170180 From fedora-extras-commits at redhat.com Sun Mar 12 13:29:56 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:29:56 -0500 Subject: rpms/ushare/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ushare.spec, 1.5, 1.6 Message-ID: <200603121330.k2CDUST5006243@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6202/devel Modified Files: .cvsignore sources ushare.spec Log Message: auto-import ushare-0.9.7-1 on branch devel from ushare-0.9.7-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ushare/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Feb 2006 17:16:12 -0000 1.3 +++ .cvsignore 12 Mar 2006 13:29:56 -0000 1.4 @@ -1 +1 @@ -ushare-0.9.6.tar.bz2 +ushare-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ushare/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2006 17:16:12 -0000 1.3 +++ sources 12 Mar 2006 13:29:56 -0000 1.4 @@ -1 +1 @@ -05312707a1fd241dfd44ad78508207eb ushare-0.9.6.tar.bz2 +e978c648f808cf1740b1583a78b922ff ushare-0.9.7.tar.bz2 Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/devel/ushare.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ushare.spec 6 Mar 2006 17:13:08 -0000 1.5 +++ ushare.spec 12 Mar 2006 13:29:56 -0000 1.6 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.6 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,8 +68,8 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog -* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 -- Rebuild with libupnp-1.3.1 +* Sun Mar 12 2006 Eric Tanguy - 0.9.7-1 +- Update to 0.9.7 * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Sun Mar 12 13:31:22 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:31:22 -0500 Subject: rpms/ushare import.log,1.8,1.9 Message-ID: <200603121331.k2CDVs6d006340@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6306 Modified Files: import.log Log Message: auto-import ushare-0.9.7-1 on branch FC-3 from ushare-0.9.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ushare/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 12 Mar 2006 13:29:50 -0000 1.8 +++ import.log 12 Mar 2006 13:31:22 -0000 1.9 @@ -5,3 +5,4 @@ ushare-0_9_6-1:FC-3:ushare-0.9.6-1.src.rpm:1140369459 ushare-0_9_6-1:FC-4:ushare-0.9.6-1.src.rpm:1140369564 ushare-0_9_7-1:HEAD:ushare-0.9.7-1.src.rpm:1142170180 +ushare-0_9_7-1:FC-3:ushare-0.9.7-1.src.rpm:1142170272 From fedora-extras-commits at redhat.com Sun Mar 12 13:31:28 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:31:28 -0500 Subject: rpms/ushare/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ushare.spec, 1.3, 1.4 Message-ID: <200603121332.k2CDW04Z006345@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6306/FC-3 Modified Files: .cvsignore sources ushare.spec Log Message: auto-import ushare-0.9.7-1 on branch FC-3 from ushare-0.9.7-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Feb 2006 17:18:07 -0000 1.3 +++ .cvsignore 12 Mar 2006 13:31:27 -0000 1.4 @@ -1 +1 @@ -ushare-0.9.6.tar.bz2 +ushare-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2006 17:18:07 -0000 1.3 +++ sources 12 Mar 2006 13:31:27 -0000 1.4 @@ -1 +1 @@ -05312707a1fd241dfd44ad78508207eb ushare-0.9.6.tar.bz2 +e978c648f808cf1740b1583a78b922ff ushare-0.9.7.tar.bz2 Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-3/ushare.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ushare.spec 6 Mar 2006 17:16:10 -0000 1.3 +++ ushare.spec 12 Mar 2006 13:31:27 -0000 1.4 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.6 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,8 +68,8 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog -* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 -- Rebuild with libupnp-1.3.1 +* Sun Mar 12 2006 Eric Tanguy - 0.9.7-1 +- Update to 0.9.7 * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Sun Mar 12 13:32:48 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:32:48 -0500 Subject: rpms/ushare import.log,1.9,1.10 Message-ID: <200603121333.k2CDXLeC006441@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6407 Modified Files: import.log Log Message: auto-import ushare-0.9.7-1 on branch FC-4 from ushare-0.9.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ushare/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 12 Mar 2006 13:31:22 -0000 1.9 +++ import.log 12 Mar 2006 13:32:48 -0000 1.10 @@ -6,3 +6,4 @@ ushare-0_9_6-1:FC-4:ushare-0.9.6-1.src.rpm:1140369564 ushare-0_9_7-1:HEAD:ushare-0.9.7-1.src.rpm:1142170180 ushare-0_9_7-1:FC-3:ushare-0.9.7-1.src.rpm:1142170272 +ushare-0_9_7-1:FC-4:ushare-0.9.7-1.src.rpm:1142170359 From fedora-extras-commits at redhat.com Sun Mar 12 13:32:54 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:32:54 -0500 Subject: rpms/ushare/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ushare.spec, 1.3, 1.4 Message-ID: <200603121333.k2CDXQdo006446@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6407/FC-4 Modified Files: .cvsignore sources ushare.spec Log Message: auto-import ushare-0.9.7-1 on branch FC-4 from ushare-0.9.7-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Feb 2006 17:19:39 -0000 1.3 +++ .cvsignore 12 Mar 2006 13:32:54 -0000 1.4 @@ -1 +1 @@ -ushare-0.9.6.tar.bz2 +ushare-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2006 17:19:39 -0000 1.3 +++ sources 12 Mar 2006 13:32:54 -0000 1.4 @@ -1 +1 @@ -05312707a1fd241dfd44ad78508207eb ushare-0.9.6.tar.bz2 +e978c648f808cf1740b1583a78b922ff ushare-0.9.7.tar.bz2 Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-4/ushare.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ushare.spec 6 Mar 2006 17:17:04 -0000 1.3 +++ ushare.spec 12 Mar 2006 13:32:54 -0000 1.4 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.6 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,8 +68,8 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog -* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 -- Rebuild with libupnp-1.3.1 +* Sun Mar 12 2006 Eric Tanguy - 0.9.7-1 +- Update to 0.9.7 * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Sun Mar 12 13:43:47 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 08:43:47 -0500 Subject: extras-buildsys/server BuildMaster.py, 1.37, 1.38 DBManager.py, 1.5, 1.6 UserInterface.py, 1.60, 1.61 Message-ID: <200603121343.k2CDhlFh006660@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6621/server Modified Files: BuildMaster.py DBManager.py UserInterface.py Log Message: 2006-03-12 Dan Williams * server/BuildMaster.py server/DBManager.py server/UserInterface.py - Prefix 'epoch', 'version', and 'release' database fields with 'rpm_', since MySQL 5 added 'release' as a reserved word. Bastards. Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- BuildMaster.py 29 Nov 2005 06:41:51 -0000 1.37 +++ BuildMaster.py 12 Mar 2006 13:43:40 -0000 1.38 @@ -239,7 +239,7 @@ def _write_job_status_to_db(self, uid, attrdict): sql = "status='%s'" % attrdict['status'] if attrdict.has_key('epoch') and attrdict.has_key('version') and attrdict.has_key('release'): - sql = sql + ", epoch='%s', version='%s', release='%s'" % (attrdict['epoch'], + sql = sql + ", rpm_epoch='%s', rpm_version='%s', rpm_release='%s'" % (attrdict['epoch'], attrdict['version'], attrdict['release']) if attrdict.has_key('result_msg'): import urllib Index: DBManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/DBManager.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DBManager.py 25 Nov 2005 22:10:18 -0000 1.5 +++ DBManager.py 12 Mar 2006 13:43:40 -0000 1.6 @@ -312,8 +312,11 @@ dbcx = self.dbcx() if not dbcx: os._exit(1) - self._ensure_tables(dbcx) + (success, msg) = self._ensure_tables(dbcx) del dbcx + if not success: + print msg + os._exit(1) def dbcx(self): try: @@ -321,7 +324,6 @@ except StandardError, e: dbcx = None print "DB Error: %s" % e - return dbcx def _ensure_tables(self, dbcx): @@ -348,16 +350,15 @@ 'endtime BIGINT, ' \ 'status VARCHAR(20), ' \ 'result VARCHAR(15), ' \ - 'epoch VARCHAR(4), ' \ - 'version VARCHAR(25), ' \ - 'release VARCHAR(25), ' \ + 'rpm_epoch VARCHAR(4), ' \ + 'rpm_version VARCHAR(25), ' \ + 'rpm_release VARCHAR(25), ' \ 'archlist VARCHAR(75), ' \ 'result_msg TEXT' \ ')' % uid_type) dbcx.commit() except StandardError, e: - print "Could not access the job database. Reason: '%s'. Exiting..." % e - os._exit(1) + return (False, "Could not access the job database. Reason: '%s'. Exiting..." % e) # Create the archjobs table try: @@ -378,8 +379,7 @@ ')') dbcx.commit() except StandardError, e: - print "Could not access the job database. Reason: '%s'. Exiting..." % e - os._exit(1) + return (False, "Could not access the job database. Reason: '%s'. Exiting..." % e) # Create the users table try: @@ -397,6 +397,8 @@ ')') dbcx.commit() except StandardError, e: - print "Could not access the user database. Reason: '%s'. Exiting..." % e - os._exit(1) + return (False, "Could not access the user database. Reason: '%s'. Exiting..." % e) + + return (True, "") + Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- UserInterface.py 28 Nov 2005 17:51:05 -0000 1.60 +++ UserInterface.py 12 Mar 2006 13:43:40 -0000 1.61 @@ -376,7 +376,7 @@ return (-1, "Error: Invalid job UID.", {}) sql = 'SELECT uid, username, package, source, target_distro, target_target, ' \ - 'target_repo, starttime, endtime, status, epoch, version, release, ' \ + 'target_repo, starttime, endtime, status, rpm_epoch, rpm_version, rpm_release, ' \ 'archlist, result_msg FROM jobs WHERE uid=%d' % uid # Run the query for the job @@ -402,10 +402,10 @@ jobrec['starttime'] = job['starttime'] jobrec['endtime'] = job['endtime'] jobrec['status'] = job['status'] - if job['epoch'] and job['version'] and job['release']: - jobrec['epoch'] = job['epoch'] - jobrec['version'] = job['version'] - jobrec['release'] = job['release'] + if job['rpm_epoch'] and job['rpm_version'] and job['rpm_release']: + jobrec['epoch'] = job['rpm_epoch'] + jobrec['version'] = job['rpm_version'] + jobrec['release'] = job['rpm_release'] base_url = self._cfg.get_str("UI", "log_url") target_str = "%s-%s-%s" % (jobrec['target_distro'], jobrec['target_target'], jobrec['target_repo']) log_url = PackageJob.make_job_log_url(base_url, target_str, From fedora-extras-commits at redhat.com Sun Mar 12 13:43:42 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 08:43:42 -0500 Subject: extras-buildsys ChangeLog,1.172,1.173 Message-ID: <200603121344.k2CDiDvk006663@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6621 Modified Files: ChangeLog Log Message: 2006-03-12 Dan Williams * server/BuildMaster.py server/DBManager.py server/UserInterface.py - Prefix 'epoch', 'version', and 'release' database fields with 'rpm_', since MySQL 5 added 'release' as a reserved word. Bastards. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- ChangeLog 12 Mar 2006 05:44:12 -0000 1.172 +++ ChangeLog 12 Mar 2006 13:43:34 -0000 1.173 @@ -1,5 +1,13 @@ 2006-03-12 Dan Williams + * server/BuildMaster.py + server/DBManager.py + server/UserInterface.py + - Prefix 'epoch', 'version', and 'release' database fields with + 'rpm_', since MySQL 5 added 'release' as a reserved word. Bastards. + +2006-03-12 Dan Williams + * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management From fedora-extras-commits at redhat.com Sun Mar 12 16:48:29 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 12 Mar 2006 11:48:29 -0500 Subject: rpms/mimetic/devel mimetic-0.9.0-noconfigh.patch, NONE, 1.1 sources, 1.2, 1.3 mimetic.spec, 1.2, 1.3 .cvsignore, 1.2, 1.3 mimetic-0.8.9-noconfigh.patch, 1.1, NONE Message-ID: <200603121649.k2CGn1V1012901@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12855/devel Modified Files: sources mimetic.spec .cvsignore Added Files: mimetic-0.9.0-noconfigh.patch Removed Files: mimetic-0.8.9-noconfigh.patch Log Message: - updated to 0.9.0 - rediffed/updated the .noconfigh patch mimetic-0.9.0-noconfigh.patch: --- NEW FILE mimetic-0.9.0-noconfigh.patch --- --- mimetic-0.9.0/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 +++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:24:10.000000000 +0100 @@ -23,14 +23,14 @@ #include #include #include -#ifdef HAVE_MMAP +#if 1 #include #endif namespace mimetic { -#if HAVE_MMAP == 1 +#if 1 == 1 typedef MMFile File; #else typedef StdFile File; --- mimetic-0.9.0/mimetic/rfc822/messageid.h.noconfigh 2005-03-25 12:20:31.000000000 +0100 +++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:25:18.000000000 +0100 @@ -18,10 +18,10 @@ #include #include #include -#if HAVE_STDINT_H +#if 1 #include #endif -#ifdef HAVE_INTTYPES_H +#if 1 #include #endif #include --- mimetic-0.9.0/mimetic/message.h.noconfigh 2005-03-07 16:35:08.000000000 +0100 +++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:24:10.000000000 +0100 @@ -21,7 +21,7 @@ #include #include #include -#ifdef HAVE_UNISTD_H +#if 1 #include #endif Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Dec 2005 22:09:50 -0000 1.2 +++ sources 12 Mar 2006 16:48:28 -0000 1.3 @@ -1 +1 @@ -fa3cb93e37684c71ac5afad02870302b mimetic-0.8.9.tar.gz +1c81a12a7acf28367ea6a10218924f8c mimetic-0.9.0.tar.gz Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/mimetic.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mimetic.spec 18 Feb 2006 11:03:11 -0000 1.2 +++ mimetic.spec 12 Mar 2006 16:48:28 -0000 1.3 @@ -3,15 +3,15 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: mimetic -Version: 0.8.9 -Release: %release_func 4 +Version: 0.9.0 +Release: %release_func 1 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries License: GPL URL: http://codesink.org/mimetic_mime_library.html Source0: http://codesink.org/download/%name-%version.tar.gz -Patch0: mimetic-0.8.9-noconfigh.patch +Patch0: mimetic-0.9.0-noconfigh.patch Patch1: mimetic-0.8.9-gcc41.patch BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) @@ -90,6 +90,10 @@ %changelog +* Sun Mar 12 2006 Enrico Scholz - 0.9.0-1 +- updated to 0.9.0 +- rediffed/updated the .noconfigh patch + * Sat Feb 18 2006 Enrico Scholz - 0.8.9-4 - rebuilt for FC5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Dec 2005 22:09:50 -0000 1.2 +++ .cvsignore 12 Mar 2006 16:48:28 -0000 1.3 @@ -1 +1 @@ -mimetic-0.8.9.tar.gz +mimetic-*.tar.gz --- mimetic-0.8.9-noconfigh.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 12 16:48:35 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 12 Mar 2006 11:48:35 -0500 Subject: rpms/mimetic/FC-4 mimetic-0.9.0-noconfigh.patch, NONE, 1.1 sources, 1.2, 1.3 mimetic.spec, 1.1, 1.2 .cvsignore, 1.2, 1.3 mimetic-0.8.9-noconfigh.patch, 1.1, NONE Message-ID: <200603121649.k2CGn8vj012906@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12855/FC-4 Modified Files: sources mimetic.spec .cvsignore Added Files: mimetic-0.9.0-noconfigh.patch Removed Files: mimetic-0.8.9-noconfigh.patch Log Message: - updated to 0.9.0 - rediffed/updated the .noconfigh patch mimetic-0.9.0-noconfigh.patch: --- NEW FILE mimetic-0.9.0-noconfigh.patch --- --- mimetic-0.9.0/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 +++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:24:10.000000000 +0100 @@ -23,14 +23,14 @@ #include #include #include -#ifdef HAVE_MMAP +#if 1 #include #endif namespace mimetic { -#if HAVE_MMAP == 1 +#if 1 == 1 typedef MMFile File; #else typedef StdFile File; --- mimetic-0.9.0/mimetic/rfc822/messageid.h.noconfigh 2005-03-25 12:20:31.000000000 +0100 +++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:25:18.000000000 +0100 @@ -18,10 +18,10 @@ #include #include #include -#if HAVE_STDINT_H +#if 1 #include #endif -#ifdef HAVE_INTTYPES_H +#if 1 #include #endif #include --- mimetic-0.9.0/mimetic/message.h.noconfigh 2005-03-07 16:35:08.000000000 +0100 +++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:24:10.000000000 +0100 @@ -21,7 +21,7 @@ #include #include #include -#ifdef HAVE_UNISTD_H +#if 1 #include #endif Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Dec 2005 22:09:50 -0000 1.2 +++ sources 12 Mar 2006 16:48:35 -0000 1.3 @@ -1 +1 @@ -fa3cb93e37684c71ac5afad02870302b mimetic-0.8.9.tar.gz +1c81a12a7acf28367ea6a10218924f8c mimetic-0.9.0.tar.gz Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-4/mimetic.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mimetic.spec 25 Dec 2005 22:09:50 -0000 1.1 +++ mimetic.spec 12 Mar 2006 16:48:35 -0000 1.2 @@ -3,15 +3,15 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: mimetic -Version: 0.8.9 -Release: %release_func 3 +Version: 0.9.0 +Release: %release_func 1 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries License: GPL URL: http://codesink.org/mimetic_mime_library.html Source0: http://codesink.org/download/%name-%version.tar.gz -Patch0: mimetic-0.8.9-noconfigh.patch +Patch0: mimetic-0.9.0-noconfigh.patch Patch1: mimetic-0.8.9-gcc41.patch BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) @@ -90,6 +90,10 @@ %changelog +* Sun Mar 12 2006 Enrico Scholz - 0.9.0-1 +- updated to 0.9.0 +- rediffed/updated the .noconfigh patch + * Sun Dec 25 2005 Enrico Scholz - 0.8.9-3 - fixed compilation with gcc41 - first Fedora Extras release (review #171624) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Dec 2005 22:09:50 -0000 1.2 +++ .cvsignore 12 Mar 2006 16:48:35 -0000 1.3 @@ -1 +1 @@ -mimetic-0.8.9.tar.gz +mimetic-*.tar.gz --- mimetic-0.8.9-noconfigh.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 12 16:52:40 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 11:52:40 -0500 Subject: rpms/thinkpad-kmod/devel thinkpad-kmod.spec,1.4,1.5 Message-ID: <200603121653.k2CGrCOC013020@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13002 Modified Files: thinkpad-kmod.spec Log Message: Bump hardcoded kernel version for test build Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- thinkpad-kmod.spec 2 Mar 2006 21:43:44 -0000 1.4 +++ thinkpad-kmod.spec 12 Mar 2006 16:52:39 -0000 1.5 @@ -4,7 +4,7 @@ # end stuff to be ... # temporarily hardcoded: -%define kver 2.6.15-1.1996_FC5 +%define kver 2.6.15-1.2041_FC5 %define kvariants "" %define kmod_name thinkpad From fedora-extras-commits at redhat.com Sun Mar 12 17:03:21 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 12 Mar 2006 12:03:21 -0500 Subject: rpms/mimetic/FC-4 mimetic.spec, 1.2, 1.3 mimetic-0.9.0-noconfigh.patch, 1.1, 1.2 Message-ID: <200603121703.k2CH3s5x015061@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15023/FC-4 Modified Files: mimetic.spec mimetic-0.9.0-noconfigh.patch Log Message: - fixed a missing case in the noconfigh patch Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-4/mimetic.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mimetic.spec 12 Mar 2006 16:48:35 -0000 1.2 +++ mimetic.spec 12 Mar 2006 17:03:21 -0000 1.3 @@ -4,7 +4,7 @@ Name: mimetic Version: 0.9.0 -Release: %release_func 1 +Release: %release_func 2 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries @@ -90,6 +90,9 @@ %changelog +* Sun Mar 12 2006 Enrico Scholz - 0.9.0-2 +- fixed a missing case in the noconfigh patch + * Sun Mar 12 2006 Enrico Scholz - 0.9.0-1 - updated to 0.9.0 - rediffed/updated the .noconfigh patch mimetic-0.9.0-noconfigh.patch: Index: mimetic-0.9.0-noconfigh.patch =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-4/mimetic-0.9.0-noconfigh.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mimetic-0.9.0-noconfigh.patch 12 Mar 2006 16:48:35 -0000 1.1 +++ mimetic-0.9.0-noconfigh.patch 12 Mar 2006 17:03:21 -0000 1.2 @@ -1,5 +1,5 @@ --- mimetic-0.9.0/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 -+++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:24:10.000000000 +0100 ++++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:56:02.000000000 +0100 @@ -23,14 +23,14 @@ #include #include @@ -17,8 +17,19 @@ typedef MMFile File; #else typedef StdFile File; +--- mimetic-0.9.0/mimetic/os/directory.h.noconfigh 2005-03-25 12:05:44.000000000 +0100 ++++ mimetic-0.9.0/mimetic/os/directory.h 2006-03-12 17:56:23.000000000 +0100 +@@ -3,7 +3,7 @@ + #include + #include + #include +-#ifdef HAVE_DIRENT_H ++#if 1 + #include + #endif + #include --- mimetic-0.9.0/mimetic/rfc822/messageid.h.noconfigh 2005-03-25 12:20:31.000000000 +0100 -+++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:25:18.000000000 +0100 ++++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:56:02.000000000 +0100 @@ -18,10 +18,10 @@ #include #include @@ -33,7 +44,7 @@ #endif #include --- mimetic-0.9.0/mimetic/message.h.noconfigh 2005-03-07 16:35:08.000000000 +0100 -+++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:24:10.000000000 +0100 ++++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:56:02.000000000 +0100 @@ -21,7 +21,7 @@ #include #include From fedora-extras-commits at redhat.com Sun Mar 12 17:03:13 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 12 Mar 2006 12:03:13 -0500 Subject: rpms/mimetic/devel mimetic.spec, 1.3, 1.4 mimetic-0.9.0-noconfigh.patch, 1.1, 1.2 Message-ID: <200603121704.k2CH4Lc2015068@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15023/devel Modified Files: mimetic.spec mimetic-0.9.0-noconfigh.patch Log Message: - fixed a missing case in the noconfigh patch Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/mimetic.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mimetic.spec 12 Mar 2006 16:48:28 -0000 1.3 +++ mimetic.spec 12 Mar 2006 17:03:13 -0000 1.4 @@ -4,7 +4,7 @@ Name: mimetic Version: 0.9.0 -Release: %release_func 1 +Release: %release_func 2 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries @@ -90,6 +90,9 @@ %changelog +* Sun Mar 12 2006 Enrico Scholz - 0.9.0-2 +- fixed a missing case in the noconfigh patch + * Sun Mar 12 2006 Enrico Scholz - 0.9.0-1 - updated to 0.9.0 - rediffed/updated the .noconfigh patch mimetic-0.9.0-noconfigh.patch: Index: mimetic-0.9.0-noconfigh.patch =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/mimetic-0.9.0-noconfigh.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mimetic-0.9.0-noconfigh.patch 12 Mar 2006 16:48:28 -0000 1.1 +++ mimetic-0.9.0-noconfigh.patch 12 Mar 2006 17:03:13 -0000 1.2 @@ -1,5 +1,5 @@ --- mimetic-0.9.0/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 -+++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:24:10.000000000 +0100 ++++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:56:02.000000000 +0100 @@ -23,14 +23,14 @@ #include #include @@ -17,8 +17,19 @@ typedef MMFile File; #else typedef StdFile File; +--- mimetic-0.9.0/mimetic/os/directory.h.noconfigh 2005-03-25 12:05:44.000000000 +0100 ++++ mimetic-0.9.0/mimetic/os/directory.h 2006-03-12 17:56:23.000000000 +0100 +@@ -3,7 +3,7 @@ + #include + #include + #include +-#ifdef HAVE_DIRENT_H ++#if 1 + #include + #endif + #include --- mimetic-0.9.0/mimetic/rfc822/messageid.h.noconfigh 2005-03-25 12:20:31.000000000 +0100 -+++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:25:18.000000000 +0100 ++++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:56:02.000000000 +0100 @@ -18,10 +18,10 @@ #include #include @@ -33,7 +44,7 @@ #endif #include --- mimetic-0.9.0/mimetic/message.h.noconfigh 2005-03-07 16:35:08.000000000 +0100 -+++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:24:10.000000000 +0100 ++++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:56:02.000000000 +0100 @@ -21,7 +21,7 @@ #include #include From fedora-extras-commits at redhat.com Sun Mar 12 17:34:07 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 12 Mar 2006 12:34:07 -0500 Subject: rpms/kst/devel kst.spec,1.3,1.4 Message-ID: <200603121734.k2CHYeUX015321@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/kst/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15304 Modified Files: kst.spec Log Message: Bump build so we pick up the new version of cfitsio. Index: kst.spec =================================================================== RCS file: /cvs/extras/rpms/kst/devel/kst.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kst.spec 26 Feb 2006 18:54:00 -0000 1.3 +++ kst.spec 12 Mar 2006 17:34:07 -0000 1.4 @@ -1,6 +1,6 @@ Name: kst Version: 1.2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A data viewing program for KDE Group: Applications/Engineering @@ -75,7 +75,7 @@ %build unset QTDIR || : ; . /etc/profile.d/qt.sh - +export KDEDIR=%{_prefix} %configure --disable-dependency-tracking --disable-static \ --disable-rpath \ --with-qt-libraries=$QTDIR/lib \ @@ -210,6 +210,10 @@ %{_datadir}/services/kst/kstdata_netcdf.desktop %changelog +* Sun Mar 12 2006 Matthew Truch - 1.2.0-10 +- Yet another tweak to configure options. +- Bump build so new cfitsio version is picked up. + * Sun Feb 26 2006 Matthew Truch - 1.2.0-9 - Improve qt lib and include configure options. From fedora-extras-commits at redhat.com Sun Mar 12 17:57:49 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 12 Mar 2006 12:57:49 -0500 Subject: rpms/kst/FC-4 kst.spec,1.3,1.4 Message-ID: <200603121758.k2CHwLiH015500@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/kst/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15481 Modified Files: kst.spec Log Message: Bump build revision to pick up new cfitsio version. Index: kst.spec =================================================================== RCS file: /cvs/extras/rpms/kst/FC-4/kst.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kst.spec 26 Feb 2006 17:51:06 -0000 1.3 +++ kst.spec 12 Mar 2006 17:57:48 -0000 1.4 @@ -1,6 +1,6 @@ Name: kst Version: 1.2.0 -Release: 8%{?dist} +Release: 10%{?dist} Summary: A data viewing program for KDE Group: Applications/Engineering @@ -75,11 +75,13 @@ %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include +export KDEDIR=%{_prefix} %configure --disable-dependency-tracking --disable-static \ --disable-rpath \ + --with-qt-libraries=$QTDIR/lib \ + --with-qt-includes=$QTDIR/include \ --with-extra-includes=%{_includedir}/cfitsio:%{_includedir}/netcdf-3 \ - --with-extra-libs=%{_libdir}/netcdf-3 --disable-debug + --with-extra-libs=%{_libdir}:%{_libdir}/netcdf-3 --disable-debug make %{?_smp_mflags} %install @@ -208,6 +210,13 @@ %{_datadir}/services/kst/kstdata_netcdf.desktop %changelog +* Sun Mar 12 2006 Matthew Truch - 1.2.0-10 +- Yet another tweak to configure options. +- Bump build so new cfitsio version is picked up. + +* Sun Feb 26 2006 Matthew Truch - 1.2.0-9 +- Improve qt lib and include configure options. + * Sun Feb 26 2006 Matthew Truch - 1.2.0-8 - Bump release due to build issue. From fedora-extras-commits at redhat.com Sun Mar 12 18:12:18 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:12:18 -0500 Subject: rpms/python-logilab-common/FC-4 .cvsignore, 1.5, 1.6 python-logilab-common.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603121812.k2CICpBN017567@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17525/FC-4 Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Version 0.14.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Jan 2006 16:53:34 -0000 1.5 +++ .cvsignore 12 Mar 2006 18:12:18 -0000 1.6 @@ -1 +1 @@ -common-0.13.0.tar.gz +common-0.14.1.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/python-logilab-common.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-logilab-common.spec 12 Jan 2006 16:53:34 -0000 1.4 +++ python-logilab-common.spec 12 Mar 2006 18:12:18 -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-logilab-common -Version: 0.13.0 +Version: 0.14.1 Release: 1%{?dist} Summary: Common libraries for Logilab projects @@ -55,6 +55,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-1 +- Version 0.14.1 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.13.0-1 - Version 0.13.0 - astng no longer part of the package Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jan 2006 16:53:34 -0000 1.5 +++ sources 12 Mar 2006 18:12:18 -0000 1.6 @@ -1 +1 @@ -9b6500c2a23660edfabe65bf73137a51 common-0.13.0.tar.gz +8c4172329e810a53245e8b3f568e6be7 common-0.14.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:12:25 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:12:25 -0500 Subject: rpms/python-logilab-common/devel .cvsignore, 1.5, 1.6 python-logilab-common.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603121812.k2CICvwn017572@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17525/devel Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Version 0.14.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Jan 2006 16:53:40 -0000 1.5 +++ .cvsignore 12 Mar 2006 18:12:25 -0000 1.6 @@ -1 +1 @@ -common-0.13.0.tar.gz +common-0.14.1.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/python-logilab-common.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-logilab-common.spec 12 Jan 2006 16:53:40 -0000 1.4 +++ python-logilab-common.spec 12 Mar 2006 18:12:25 -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-logilab-common -Version: 0.13.0 +Version: 0.14.1 Release: 1%{?dist} Summary: Common libraries for Logilab projects @@ -55,6 +55,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-1 +- Version 0.14.1 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.13.0-1 - Version 0.13.0 - astng no longer part of the package Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jan 2006 16:53:40 -0000 1.5 +++ sources 12 Mar 2006 18:12:25 -0000 1.6 @@ -1 +1 @@ -9b6500c2a23660edfabe65bf73137a51 common-0.13.0.tar.gz +8c4172329e810a53245e8b3f568e6be7 common-0.14.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:15:40 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:15:40 -0500 Subject: rpms/python-astng/devel .cvsignore, 1.4, 1.5 python-astng.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603121816.k2CIGErV017763@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-astng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17698/devel Modified Files: .cvsignore python-astng.spec sources Log Message: Version 0.15.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jan 2006 16:55:41 -0000 1.4 +++ .cvsignore 12 Mar 2006 18:15:40 -0000 1.5 @@ -1 +1 @@ -astng-0.14.0.tar.gz +astng-0.15.1.tar.gz Index: python-astng.spec =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/python-astng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-astng.spec 12 Jan 2006 16:55:41 -0000 1.5 +++ python-astng.spec 12 Mar 2006 18:15:40 -0000 1.6 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-astng -Version: 0.14.0 +Version: 0.15.1 Release: 1%{?dist} Summary: Python Abstract Syntax Tree New Generation @@ -53,6 +53,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.15.1-1 +- Version 0.15.1 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.14.0-1 - Version 0.14.0 - Drop the modname patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2006 16:55:41 -0000 1.4 +++ sources 12 Mar 2006 18:15:40 -0000 1.5 @@ -1 +1 @@ -29fa137d44eeed6a69e2e3feb07cff0a astng-0.14.0.tar.gz +2a7fb54c7059309759aa7f4d7d1f029d astng-0.15.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:15:25 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:15:25 -0500 Subject: rpms/python-astng/FC-4 .cvsignore, 1.4, 1.5 python-astng.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603121816.k2CIG9J9017758@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-astng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17698/FC-4 Modified Files: .cvsignore python-astng.spec sources Log Message: Version 0.15.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jan 2006 16:55:35 -0000 1.4 +++ .cvsignore 12 Mar 2006 18:15:25 -0000 1.5 @@ -1 +1 @@ -astng-0.14.0.tar.gz +astng-0.15.1.tar.gz Index: python-astng.spec =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/python-astng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-astng.spec 12 Jan 2006 16:55:35 -0000 1.5 +++ python-astng.spec 12 Mar 2006 18:15:25 -0000 1.6 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-astng -Version: 0.14.0 +Version: 0.15.1 Release: 1%{?dist} Summary: Python Abstract Syntax Tree New Generation @@ -53,6 +53,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.15.1-1 +- Version 0.15.1 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.14.0-1 - Version 0.14.0 - Drop the modname patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2006 16:55:35 -0000 1.4 +++ sources 12 Mar 2006 18:15:25 -0000 1.5 @@ -1 +1 @@ -29fa137d44eeed6a69e2e3feb07cff0a astng-0.14.0.tar.gz +2a7fb54c7059309759aa7f4d7d1f029d astng-0.15.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:18:21 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:18:21 -0500 Subject: rpms/pylint/FC-4 .cvsignore, 1.5, 1.6 pylint.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200603121818.k2CIIrgP017966@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/pylint/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17928/FC-4 Modified Files: .cvsignore pylint.spec sources Log Message: Version 0.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Jan 2006 16:52:29 -0000 1.5 +++ .cvsignore 12 Mar 2006 18:18:21 -0000 1.6 @@ -1 +1 @@ -pylint-0.9.0.tar.gz +pylint-0.10.0.tar.gz Index: pylint.spec =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/pylint.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pylint.spec 12 Jan 2006 16:52:29 -0000 1.5 +++ pylint.spec 12 Mar 2006 18:18:21 -0000 1.6 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pylint -Version: 0.9.0 +Version: 0.10.0 Release: 1%{?dist} Summary: Analyzes Python code looking for bugs and signs of poor quality @@ -84,6 +84,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.10.0-1 +- Version 0.10.0 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.9.0-1 - Version 0.9.0 - Add COPYING to docs Index: sources =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jan 2006 16:52:29 -0000 1.5 +++ sources 12 Mar 2006 18:18:21 -0000 1.6 @@ -1 +1 @@ -c7d69b110be9e64bb4f3f9b7dcbbf98c pylint-0.9.0.tar.gz +9c8dd130411eca6f16c3a5f531f44fa2 pylint-0.10.0.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:18:27 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:18:27 -0500 Subject: rpms/pylint/devel .cvsignore, 1.5, 1.6 pylint.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200603121818.k2CIIxRN017971@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/pylint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17928/devel Modified Files: .cvsignore pylint.spec sources Log Message: Version 0.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Jan 2006 16:52:35 -0000 1.5 +++ .cvsignore 12 Mar 2006 18:18:26 -0000 1.6 @@ -1 +1 @@ -pylint-0.9.0.tar.gz +pylint-0.10.0.tar.gz Index: pylint.spec =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/pylint.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pylint.spec 12 Jan 2006 16:52:35 -0000 1.5 +++ pylint.spec 12 Mar 2006 18:18:26 -0000 1.6 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pylint -Version: 0.9.0 +Version: 0.10.0 Release: 1%{?dist} Summary: Analyzes Python code looking for bugs and signs of poor quality @@ -84,6 +84,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.10.0-1 +- Version 0.10.0 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.9.0-1 - Version 0.9.0 - Add COPYING to docs Index: sources =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jan 2006 16:52:35 -0000 1.5 +++ sources 12 Mar 2006 18:18:26 -0000 1.6 @@ -1 +1 @@ -c7d69b110be9e64bb4f3f9b7dcbbf98c pylint-0.9.0.tar.gz +9c8dd130411eca6f16c3a5f531f44fa2 pylint-0.10.0.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:35:47 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:35:47 -0500 Subject: rpms/python-logilab-common/devel python-logilab-common.spec, 1.5, 1.6 Message-ID: <200603121836.k2CIaKSt018111@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18094 Modified Files: python-logilab-common.spec Log Message: Trying to work around a failure in devel build. Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/python-logilab-common.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-logilab-common.spec 12 Mar 2006 18:12:25 -0000 1.5 +++ python-logilab-common.spec 12 Mar 2006 18:35:47 -0000 1.6 @@ -2,7 +2,7 @@ Name: python-logilab-common Version: 0.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Common libraries for Logilab projects Group: Development/Libraries @@ -46,6 +46,8 @@ %dir %{_python_sitelib}/logilab/common %dir %{_python_sitelib}/logilab/common/ureports %{_python_sitelib}/logilab/*.py +%{_python_sitelib}/logilab/*.pyc +%ghost %{_python_sitelib}/logilab/*.pyo %{_python_sitelib}/logilab/common/*.py %{_python_sitelib}/logilab/common/*.pyc %ghost %{_python_sitelib}/logilab/common/*.pyo @@ -55,6 +57,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-2 +- Also handle __init__.pyc and __init__.pyo + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-1 - Version 0.14.1 From fedora-extras-commits at redhat.com Sun Mar 12 20:09:47 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 12 Mar 2006 15:09:47 -0500 Subject: rpms/highlight/devel .cvsignore, 1.4, 1.5 highlight-2.4-rpmoptflags.patch, 1.3, 1.4 highlight.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200603122010.k2CKAKsN022297@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22271 Modified Files: .cvsignore highlight-2.4-rpmoptflags.patch highlight.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Nov 2005 15:55:32 -0000 1.4 +++ .cvsignore 12 Mar 2006 20:09:47 -0000 1.5 @@ -1 +1 @@ -highlight-2.4.3.tar.gz +highlight-2.4.4.tar.gz highlight-2.4-rpmoptflags.patch: Index: highlight-2.4-rpmoptflags.patch =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight-2.4-rpmoptflags.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- highlight-2.4-rpmoptflags.patch 11 Oct 2005 17:16:37 -0000 1.3 +++ highlight-2.4-rpmoptflags.patch 12 Mar 2006 20:09:47 -0000 1.4 @@ -1,11 +1,11 @@ ---- highlight-2.4-2/highlight/makefile.rpx 2005-08-04 19:49:31.000000000 +0200 -+++ highlight-2.4-2/highlight/makefile 2005-10-10 18:22:14.000000000 +0200 +--- highlight-2.4.4/highlight/makefile.org 2006-03-12 21:02:07.000000000 +0100 ++++ highlight-2.4.4/highlight/makefile 2006-03-12 21:03:13.000000000 +0100 @@ -15,7 +15,7 @@ CXX=c++ --CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -+CFLAGS := ${RPM_OPT_FLAGS} -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DUSE_FN_MATCH - - LDFLAGS = -L/usr/lib -s +-CFLAGS := -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\" ++CFLAGS := ${RPM_OPT_FLAGS} -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\" + #CFLAGS := -Wall -DHL_DATA_DIR=\"${HL_DATA_DIR}\" + LDFLAGS = -s Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- highlight.spec 12 Feb 2006 19:21:35 -0000 1.10 +++ highlight.spec 12 Mar 2006 20:09:47 -0000 1.11 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.4.3 -Release: 2%{?dist} +Version: 2.4.4 +Release: 1%{?dist} Group: Development/Tools License: GPL @@ -49,6 +49,10 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 +- New upstream release +- Adapt rpmopt patch to new upstream release + * Sun Feb 12 2006 Jochen Schmitt 2.4.3-2 - Rebuilt for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Nov 2005 15:55:32 -0000 1.4 +++ sources 12 Mar 2006 20:09:47 -0000 1.5 @@ -1 +1 @@ -19b0437361f84467fff11bdbeba654a0 highlight-2.4.3.tar.gz +c2ea3c4a11a76379d73bd4bccd6c3228 highlight-2.4.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 20:14:32 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 12 Mar 2006 15:14:32 -0500 Subject: rpms/highlight/FC-4 .cvsignore, 1.2, 1.3 highlight-2.4-rpmoptflags.patch, 1.3, 1.4 highlight.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200603122015.k2CKF4DX022393@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22360 Modified Files: .cvsignore highlight-2.4-rpmoptflags.patch highlight.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Aug 2005 15:38:30 -0000 1.2 +++ .cvsignore 12 Mar 2006 20:14:31 -0000 1.3 @@ -1 +1 @@ -highlight-2.4-1.tar.bz2 +highlight-2.4.4.tar.gz highlight-2.4-rpmoptflags.patch: Index: highlight-2.4-rpmoptflags.patch =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/highlight-2.4-rpmoptflags.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- highlight-2.4-rpmoptflags.patch 11 Oct 2005 17:18:47 -0000 1.3 +++ highlight-2.4-rpmoptflags.patch 12 Mar 2006 20:14:31 -0000 1.4 @@ -1,11 +1,11 @@ ---- highlight-2.4-2/highlight/makefile.rpx 2005-08-04 19:49:31.000000000 +0200 -+++ highlight-2.4-2/highlight/makefile 2005-10-10 18:22:14.000000000 +0200 +--- highlight-2.4.4/highlight/makefile.org 2006-03-12 21:02:07.000000000 +0100 ++++ highlight-2.4.4/highlight/makefile 2006-03-12 21:03:13.000000000 +0100 @@ -15,7 +15,7 @@ CXX=c++ --CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -+CFLAGS := ${RPM_OPT_FLAGS} -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DUSE_FN_MATCH - - LDFLAGS = -L/usr/lib -s +-CFLAGS := -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\" ++CFLAGS := ${RPM_OPT_FLAGS} -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\" + #CFLAGS := -Wall -DHL_DATA_DIR=\"${HL_DATA_DIR}\" + LDFLAGS = -s Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/highlight.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- highlight.spec 1 Nov 2005 16:00:05 -0000 1.7 +++ highlight.spec 12 Mar 2006 20:14:31 -0000 1.8 @@ -1,6 +1,6 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} Group: Development/Tools @@ -49,6 +49,13 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 +- New upstream release +- Adapt rpmopt patch to new upstream release + +* Sun Feb 12 2006 Jochen Schmitt 2.4.3-2 +- Rebuilt for FC5 + * Tue Nov 1 2005 Jochen Schmitt 2.4.3-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Nov 2005 16:00:05 -0000 1.4 +++ sources 12 Mar 2006 20:14:31 -0000 1.5 @@ -1 +1 @@ -19b0437361f84467fff11bdbeba654a0 highlight-2.4.3.tar.gz +c2ea3c4a11a76379d73bd4bccd6c3228 highlight-2.4.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 20:35:40 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 12 Mar 2006 15:35:40 -0500 Subject: rpms/lucidlife/FC-4 lucidlife.spec,1.3,1.4 Message-ID: <200603122036.k2CKaCxd022556@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22521/FC-4 Modified Files: lucidlife.spec Log Message: Minor fix to ChangeLog entries: escape RPM macros. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/FC-4/lucidlife.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lucidlife.spec 26 Feb 2006 21:42:50 -0000 1.3 +++ lucidlife.spec 12 Mar 2006 20:35:40 -0000 1.4 @@ -59,13 +59,13 @@ %changelog * Sun Feb 26 2006 Peter Gordon - 0.9-3 -- Add {dist} tag to the release to fix CVS tagging issue. +- Add %%{?dist} tag to the release to fix CVS tagging issue. * Sun Feb 19 2006 Peter Gordon - 0.9-2 - Dropped Requires: on gtk2 and gnome-vfs2, as the -devel sonames will pull these in. - Fixed handling of .desktop file to conform to Fedora Extras guidelines. -- Changed %files section to use %{_datadir}/%{name} instead of hardcoding +- Changed %%files section to use %%{_datadir}/%%{name} instead of hardcoding "lucidlife" to help prevent file ownership problems - Thanks to Brian Pepple in BZ #177881 for these suggestions. From fedora-extras-commits at redhat.com Sun Mar 12 20:35:46 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 12 Mar 2006 15:35:46 -0500 Subject: rpms/lucidlife/devel lucidlife.spec,1.3,1.4 Message-ID: <200603122036.k2CKaJRe022559@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22521/devel Modified Files: lucidlife.spec Log Message: Minor fix to ChangeLog entries: escape RPM macros. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lucidlife.spec 26 Feb 2006 21:43:04 -0000 1.3 +++ lucidlife.spec 12 Mar 2006 20:35:46 -0000 1.4 @@ -59,13 +59,13 @@ %changelog * Sun Feb 26 2006 Peter Gordon - 0.9-3 -- Add {dist} tag to the release to fix CVS tagging issue. +- Add %%{?dist} tag to the release to fix CVS tagging issue. * Sun Feb 19 2006 Peter Gordon - 0.9-2 - Dropped Requires: on gtk2 and gnome-vfs2, as the -devel sonames will pull these in. - Fixed handling of .desktop file to conform to Fedora Extras guidelines. -- Changed %files section to use %{_datadir}/%{name} instead of hardcoding +- Changed %%files section to use %%{_datadir}/%%{name} instead of hardcoding "lucidlife" to help prevent file ownership problems - Thanks to Brian Pepple in BZ #177881 for these suggestions. From fedora-extras-commits at redhat.com Sun Mar 12 21:56:38 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Sun, 12 Mar 2006 16:56:38 -0500 Subject: rpms/nomadsync/devel nomadsync-libnjbloc.patch, NONE, 1.1 nomadsync.spec, 1.1, 1.2 Message-ID: <200603122157.k2CLvBkZ024809@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24789 Modified Files: nomadsync.spec Added Files: nomadsync-libnjbloc.patch Log Message: Bugfinding in the new spec nomadsync-libnjbloc.patch: --- NEW FILE nomadsync-libnjbloc.patch --- --- src/Makefile.in.orig 2006-03-12 22:32:56.000000000 +0100 +++ src/Makefile.in 2006-03-12 22:33:18.000000000 +0100 @@ -67,7 +67,7 @@ layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) \ mpg123.$(OBJEXT) nomadsync_OBJECTS = $(am_nomadsync_OBJECTS) -nomadsync_DEPENDENCIES = /usr/local/lib/libnjb.so +nomadsync_DEPENDENCIES = /usr/lib/libnjb.so DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -226,7 +226,7 @@ libmpg123/l2tables.h libmpg123/layer1.cpp libmpg123/layer2.cpp libmpg123/layer3.cpp \ libmpg123/mpg123.cpp libmpg123/mpg123.h -nomadsync_LDADD = /usr/local/lib/libnjb.so -lid3 +nomadsync_LDADD = /usr/lib/libnjb.so -lid3 AM_CXXFLAGS = `gtk-config --cflags` # this is where the desktop file will go Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/nomadsync.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nomadsync.spec 9 Mar 2006 19:53:02 -0000 1.1 +++ nomadsync.spec 12 Mar 2006 21:56:38 -0000 1.2 @@ -12,13 +12,14 @@ Name: nomadsync Version: 0.4.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch0: nomadsync-libnjbloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -38,9 +39,10 @@ %prep %setup -q -n %{name} +%patch0 -p0 %build -%configure +%configure --with-wx-config=%{_bindir}/wxgtk-2.4-config make %{?_smp_mflags} %install @@ -83,6 +85,9 @@ %doc ChangeLog authors copying readme %changelog +* Sun Mar 12 2006 Linus Walleij 0.4.2-9 +- Found a patchable bug during build tests. + * Wed Mar 8 2006 Linus Walleij 0.4.2-8 - New sources, do not re-tar the file. From fedora-extras-commits at redhat.com Sun Mar 12 22:07:33 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Sun, 12 Mar 2006 17:07:33 -0500 Subject: rpms/nomadsync/FC-4 nomadsync-libnjbloc.patch, NONE, 1.1 nomadsync.spec, 1.1, 1.2 Message-ID: <200603122208.k2CM86iZ026799@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26769 Modified Files: nomadsync.spec Added Files: nomadsync-libnjbloc.patch Log Message: Trying this in FC4 to see if it is a pure GCC4.1.0 bug nomadsync-libnjbloc.patch: --- NEW FILE nomadsync-libnjbloc.patch --- --- src/Makefile.in.orig 2006-03-12 22:32:56.000000000 +0100 +++ src/Makefile.in 2006-03-12 22:33:18.000000000 +0100 @@ -67,7 +67,7 @@ layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) \ mpg123.$(OBJEXT) nomadsync_OBJECTS = $(am_nomadsync_OBJECTS) -nomadsync_DEPENDENCIES = /usr/local/lib/libnjb.so +nomadsync_DEPENDENCIES = /usr/lib/libnjb.so DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -226,7 +226,7 @@ libmpg123/l2tables.h libmpg123/layer1.cpp libmpg123/layer2.cpp libmpg123/layer3.cpp \ libmpg123/mpg123.cpp libmpg123/mpg123.h -nomadsync_LDADD = /usr/local/lib/libnjb.so -lid3 +nomadsync_LDADD = /usr/lib/libnjb.so -lid3 AM_CXXFLAGS = `gtk-config --cflags` # this is where the desktop file will go Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/FC-4/nomadsync.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nomadsync.spec 9 Mar 2006 19:53:02 -0000 1.1 +++ nomadsync.spec 12 Mar 2006 22:07:33 -0000 1.2 @@ -12,13 +12,14 @@ Name: nomadsync Version: 0.4.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch0: nomadsync-libnjbloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -38,9 +39,10 @@ %prep %setup -q -n %{name} +%patch0 -p0 %build -%configure +%configure --with-wx-config=%{_bindir}/wxgtk-2.4-config make %{?_smp_mflags} %install @@ -83,6 +85,9 @@ %doc ChangeLog authors copying readme %changelog +* Sun Mar 12 2006 Linus Walleij 0.4.2-9 +- Found a patchable bug during build tests. + * Wed Mar 8 2006 Linus Walleij 0.4.2-8 - New sources, do not re-tar the file. From fedora-extras-commits at redhat.com Sun Mar 12 23:04:51 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 12 Mar 2006 18:04:51 -0500 Subject: kadischi/lib functions.py,1.3,1.4 Message-ID: <200603122305.k2CN5L7m028960@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28941/kadischi/lib Modified Files: functions.py Log Message: Revert to upstream kernel naming scheme for Xen kernel (functions.py) Index: functions.py =================================================================== RCS file: /cvs/devel/kadischi/lib/functions.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- functions.py 10 Mar 2006 21:46:35 -0000 1.3 +++ functions.py 12 Mar 2006 23:04:49 -0000 1.4 @@ -71,15 +71,15 @@ ts = rpm.TransactionSet (rootdir) while kernel_version == None: if isys.smpAvailable() or isys.htavailable(): - for mi in ts.dbMatch ('name', 'kernel-xen-hypervisor'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'hypervisor' + for mi in ts.dbMatch ('name', 'kernel-xen0'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' clear_rpm_db_files (rootdir) for mi in ts.dbMatch ('name', 'kernel-smp'): kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp' clear_rpm_db_files (rootdir) else: - for mi in ts.dbMatch ('name', 'kernel-xen-hypervisor'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'hypervisor' + for mi in ts.dbMatch ('name', 'kernel-xen0'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' clear_rpm_db_files (rootdir) for mi in ts.dbMatch ('name', 'kernel'): kernel_version = "%s-%s" % (mi['version'], mi['release']) From fedora-extras-commits at redhat.com Sun Mar 12 23:45:24 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 18:45:24 -0500 Subject: rpms/kover/devel kover.spec,1.10,1.11 Message-ID: <200603122345.k2CNjuKN029132@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/kover/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29115 Modified Files: kover.spec Log Message: * Sun Mar 12 2006 Adrian Reber - 2.9.6-5 - rebuilt Index: kover.spec =================================================================== RCS file: /cvs/extras/rpms/kover/devel/kover.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- kover.spec 12 Feb 2006 16:27:55 -0000 1.10 +++ kover.spec 12 Mar 2006 23:45:24 -0000 1.11 @@ -1,7 +1,7 @@ Name: kover Summary: WYSIWYG CD cover printer with CDDB support Version: 2.9.6 -Release: 4 +Release: 5 License: GPL Group: Applications/Publishing Source0 http://lisas.de/kover/kover-2.9.6.tar.gz @@ -58,6 +58,9 @@ %attr(755,root,root)%{_bindir}/cd-text %changelog +* Sun Mar 12 2006 Adrian Reber - 2.9.6-5 +- rebuilt + * Sun Feb 12 2006 Adrian Reber - 2.9.6-4 - rebuilt From fedora-extras-commits at redhat.com Mon Mar 13 00:19:37 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 19:19:37 -0500 Subject: rpms/libcdio/devel libcdio.spec,1.15,1.16 Message-ID: <200603130020.k2D0KApS031165@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31148 Modified Files: libcdio.spec Log Message: * Mon Sep 26 2005 Adrian Reber - 0.76-2 - Rebuilt Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libcdio.spec 26 Sep 2005 08:21:49 -0000 1.15 +++ libcdio.spec 13 Mar 2006 00:19:36 -0000 1.16 @@ -1,6 +1,6 @@ Name: libcdio Version: 0.76 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia @@ -107,6 +107,9 @@ %changelog +* Mon Sep 26 2005 Adrian Reber - 0.76-2 +- Rebuilt + * Mon Sep 26 2005 Adrian Reber - 0.76-1 - Updated to 0.76. - Included doxygen generated documentation into -devel From fedora-extras-commits at redhat.com Mon Mar 13 00:44:38 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 19:44:38 -0500 Subject: rpms/most/devel most.spec,1.10,1.11 Message-ID: <200603130045.k2D0jAOE031362@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31343 Modified Files: most.spec Log Message: * Sun Mar 12 2006 Adrian Reber - 4.10.2-3 - rebuilt Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/devel/most.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- most.spec 29 Nov 2005 12:56:04 -0000 1.10 +++ most.spec 13 Mar 2006 00:44:37 -0000 1.11 @@ -1,7 +1,7 @@ Summary: more, less, most Name: most Version: 4.10.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: ftp://space.mit.edu/pub/davis/most/ Group: Applications/Text @@ -43,6 +43,9 @@ %changelog +* Sun Mar 12 2006 Adrian Reber - 4.10.2-3 +- rebuilt + * Tue Nov 29 2005 Adrian Reber - 4.10.2-2 - rebuilt for new slang From fedora-extras-commits at redhat.com Mon Mar 13 00:52:21 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 19:52:21 -0500 Subject: rpms/ninja/devel ninja.spec,1.7,1.8 Message-ID: <200603130052.k2D0qrKP031439@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/ninja/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31422 Modified Files: ninja.spec Log Message: * Sun Mar 12 2006 Adrian Reber - 1.5.8.1-4 - rebuilt Index: ninja.spec =================================================================== RCS file: /cvs/extras/rpms/ninja/devel/ninja.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ninja.spec 1 Apr 2005 16:36:00 -0000 1.7 +++ ninja.spec 13 Mar 2006 00:52:21 -0000 1.8 @@ -1,13 +1,13 @@ Name: ninja Version: 1.5.8.1 -Release: 3 +Release: 4 License: GPL Summary: Text based Internet Relay Chat (IRC) client Group: Applications/Internet URL: http://ninja.qoop.org/ Source0: ftp://ninja.qoop.org/ninja/sources/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-doc.patch -Buildroot: %{_tmppath}/%{name}-%{version}-root +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel %description @@ -58,6 +58,9 @@ %doc README ChangeLog BUGS+TODO %changelog +* Sun Mar 12 2006 Adrian Reber - 1.5.8.1-4 +- rebuilt + * Fri Apr 1 2005 Michael Schwendt - 1.5.8.1-3 - Include ninja directory in datadir. From fedora-extras-commits at redhat.com Mon Mar 13 00:59:32 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 19:59:32 -0500 Subject: rpms/sopwith/devel sopwith.spec,1.6,1.7 Message-ID: <200603130100.k2D104iK031530@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/sopwith/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31486 Modified Files: sopwith.spec Log Message: * Sun Mar 12 2006 Adrian Reber - 1.7.1-3 - rebuilt Index: sopwith.spec =================================================================== RCS file: /cvs/extras/rpms/sopwith/devel/sopwith.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sopwith.spec 29 Mar 2005 20:24:50 -0000 1.6 +++ sopwith.spec 13 Mar 2006 00:59:32 -0000 1.7 @@ -1,6 +1,6 @@ Name: sopwith Version: 1.7.1 -Release: 2 +Release: 3 Summary: SDL port of the sopwith game Group: Amusements/Games @@ -70,6 +70,9 @@ %changelog +* Sun Mar 12 2006 Adrian Reber - 1.7.1-3 +- rebuilt + * Tue Mar 29 2005 Adrian Reber - 1.7.1-2 - added patch to fix gcc4 compiler error From fedora-extras-commits at redhat.com Mon Mar 13 01:39:39 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 20:39:39 -0500 Subject: rpms/source-highlight/devel .cvsignore, 1.7, 1.8 source-highlight.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200603130140.k2D1eC2e001097@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/source-highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1074 Modified Files: .cvsignore source-highlight.spec sources Log Message: * Sun Mar 12 2006 Adrian Reber - 2.3-1 - updated to 2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/source-highlight/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 17 Oct 2005 10:11:25 -0000 1.7 +++ .cvsignore 13 Mar 2006 01:39:39 -0000 1.8 @@ -1,2 +1,2 @@ -source-highlight-2.2.tar.gz -source-highlight-2.2.tar.gz.sig +source-highlight-2.3.tar.gz +source-highlight-2.3.tar.gz.sig Index: source-highlight.spec =================================================================== RCS file: /cvs/extras/rpms/source-highlight/devel/source-highlight.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- source-highlight.spec 17 Oct 2005 10:11:25 -0000 1.11 +++ source-highlight.spec 13 Mar 2006 01:39:39 -0000 1.12 @@ -1,11 +1,11 @@ Summary: Produces a document with syntax highlighting Name: source-highlight -Version: 2.2 +Version: 2.3 Release: 1%{?dist} Group: Development/Tools License: GPL -Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.2.tar.gz -Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.2.tar.gz.sig +Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.3.tar.gz +Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.3.tar.gz.sig URL: http://www.gnu.org/software/src-highlite/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison, flex, boost-devel @@ -60,6 +60,9 @@ %{_infodir}/source-highlight.info* %changelog +* Sun Mar 12 2006 Adrian Reber - 2.3-1 +- updated to 2.3 + * Mon Oct 17 2005 Adrian Reber - 2.2-1 - updated to 2.2 - added ctags BuildRequires and Requires Index: sources =================================================================== RCS file: /cvs/extras/rpms/source-highlight/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 Oct 2005 10:11:25 -0000 1.7 +++ sources 13 Mar 2006 01:39:39 -0000 1.8 @@ -1,2 +1,2 @@ -f9e86829095fbb32d233c4bb38fad3d5 source-highlight-2.2.tar.gz -3e42f2764d9faba3f432b9c78e869488 source-highlight-2.2.tar.gz.sig +321d7e5142aae85261054bc9f7cb8394 source-highlight-2.3.tar.gz +8f6a8ab3d2d306bfd785162eef396288 source-highlight-2.3.tar.gz.sig From fedora-extras-commits at redhat.com Mon Mar 13 02:22:14 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 12 Mar 2006 21:22:14 -0500 Subject: kadischi/livecd_generator livecd-mkinitrd.sh,1.2,1.3 Message-ID: <200603130222.k2D2MiG7003165@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3146/kadischi/livecd_generator Modified Files: livecd-mkinitrd.sh Log Message: Bring Kadischi initrd script up to speed with FC4 busybox-anaconda-1.01-3 (livecd-mkinitrd.sh) Index: livecd-mkinitrd.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- livecd-mkinitrd.sh 28 Aug 2005 10:20:17 -0000 1.2 +++ livecd-mkinitrd.sh 13 Mar 2006 02:22:12 -0000 1.3 @@ -173,7 +173,7 @@ dd if=/dev/zero of=$IMAGE bs=1k count=$IMAGESIZE 2> /dev/null || exit 1 -LODEV=$(echo findlodev | /sbin/nash --quiet) +LODEV=$(losetup -f) if [ -z "$LODEV" ]; then rm -rf $MNTIMAGE $MNTPOINT $IMAGE @@ -218,6 +218,7 @@ inst $rootdir/lib/ld-linux.so.2 "$MNTIMAGE/lib/ld-linux.so.2" inst $rootdir/lib/libselinux.so.1 "$MNTIMAGE/lib/libselinux.so.1" +inst $rootdir/lib/libsepol.so.1 "$MNTIMAGE/lib/libsepol.so.1" if [ -f $rootdir/lib/tls/libc.so.6 ]; then inst $rootdir/lib/tls/libc.so.6 "$MNTIMAGE/lib/libc.so.6" From fedora-extras-commits at redhat.com Mon Mar 13 03:37:49 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 22:37:49 -0500 Subject: rpms/tin/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tin.spec, 1.10, 1.11 Message-ID: <200603130338.k2D3cMZG005302@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/tin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5281 Modified Files: .cvsignore sources tin.spec Log Message: * Sun Mar 13 2006 Adrian Reber - 1.8.1-1 - updated to 1.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tin/devel/.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 13 Mar 2006 03:37:49 -0000 1.5 @@ -1 +1,2 @@ -tin-1.6.2.tar.bz2 +tin-1.8.1.tar.bz2 +tin-1.8.1.tar.bz2.sign Index: sources =================================================================== RCS file: /cvs/extras/rpms/tin/devel/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 13 Mar 2006 03:37:49 -0000 1.5 @@ -1 +1,2 @@ -3ab61ba7c7d3b7a3596ba199c570c4e4 tin-1.6.2.tar.bz2 +efeecdf72683213d9e705c28de87ea2e tin-1.8.1.tar.bz2 +4f7dd48ddd79d79203dc0094f692999f tin-1.8.1.tar.bz2.sign Index: tin.spec =================================================================== RCS file: /cvs/extras/rpms/tin/devel/tin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tin.spec 22 May 2005 23:43:22 -0000 1.10 +++ tin.spec 13 Mar 2006 03:37:49 -0000 1.11 @@ -1,12 +1,12 @@ Name: tin -Version: 1.6.2 -Release: 4 - +Version: 1.8.1 +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.1.tar.bz2 +Source1: ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2.sign BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel @@ -78,6 +78,7 @@ %{_bindir}/metamutt %{_bindir}/opt-case.pl %{_bindir}/w2r.pl +%{_bindir}/tinews.pl %{_mandir}/man1/* %{_mandir}/man5/* /usr/share/locale/*/*/* @@ -85,6 +86,9 @@ %changelog +* 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 From fedora-extras-commits at redhat.com Mon Mar 13 03:45:56 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 22:45:56 -0500 Subject: extras-buildsys/server Config.py,1.12,1.13 PackageJob.py,1.43,1.44 Message-ID: <200603130345.k2D3jukH005420@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5384/server Modified Files: Config.py PackageJob.py Log Message: 2006-03-12 Dan Williams Fix up kmod support. * server/Config.py - Fix splitting of arches for Additonal Package Arches - Use wildcard matching (*, ?, [...], [!...]) for package names in Additional Package Arches so we can support kmods easily * server/PackageJob.py - Add lots of comments in arch_handling() so people can tell what's going on Index: Config.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Config.py 1 Dec 2005 03:17:25 -0000 1.12 +++ Config.py 13 Mar 2006 03:45:48 -0000 1.13 @@ -15,6 +15,7 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import os +import fnmatch from ConfigParser import ConfigParser from plague import BaseConfig @@ -166,6 +167,7 @@ self._testing = self.get_bool("General", "testing") self._mock_configs = self._find_mock_configs() + self._addl_pkg_arches = self._get_addl_pkg_arches() def _find_mock_configs(self): mock_configs = {} @@ -215,7 +217,7 @@ def testing(self): return self._testing - def addl_pkg_arches(self): + def _get_addl_pkg_arches(self): if not self._config.has_section("Additional Package Arches"): return {} items = self._config.items("Additional Package Arches") @@ -224,12 +226,20 @@ if type(arches) != type("") or not len(arches): continue try: - l = opt.split() - except Exception: + l = arches.split() + except Exception, e: continue addl_arches[pkg] = l return addl_arches + def addl_arches_for_pkg(self, name): + # Match package name against Additional Package Arches + # entries, taking wildcards into account + for item in self._addl_pkg_arches.keys(): + if fnmatch.fnmatchcase(name, item): + return self._addl_pkg_arches[item] + return [] + def save_default_config(self, filename=None): self.add_section("General") self.set_option("General", "distro", "fedora") Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- PackageJob.py 26 Feb 2006 17:00:46 -0000 1.43 +++ PackageJob.py 13 Mar 2006 03:45:48 -0000 1.44 @@ -207,16 +207,15 @@ return self.uid def arch_handling(self, hdr): - addl_arches = [] - try: - addl_arches = self._target_cfg.addl_pkg_arches()[self.name] - except KeyError: - pass + # Grab additional allowed arches for this package, using + # wildcard matching if needed + addl_arches = self._target_cfg.addl_arches_for_pkg(self.name) + # Grab list of base arches (like i386, ppc, x86_64) that this + # buildsys supports. NOT subarch variants like i686, i586, ppc32, etc. base_arches = self._target_cfg.basearches() - opt_arches = self._target_cfg.optarches() - # Remove arches we don't support from addl_arches + # Remove arches the buildsys doesn't support from addl_arches for arch in addl_arches: # ArchUtils.sub_arches is only used to determine which arches to build on by default, # so that if we have an Additional Package Arches that specifies @@ -227,45 +226,63 @@ if master_addl_arch not in base_arches: addl_arches.remove(arch) + # Grab arches the SRPM does/does not want to build for. If the package + # does use one or more of these tags in the specfile, hdr[''] will + # return an empty list, and we'll use defaults instead ba = hdr['buildarchs'] exclusive = hdr['exclusivearch'] exclude = hdr['excludearch'] build_arches = {} + # If the SRPM is noarch, there's nothing left to do, since + # it can build on any architecture the builders support if ba == ['noarch']: build_arches['noarch'] = None return (build_arches, None, None) - # default to building all base arches the 'target' + # default to building all base arches the target # supports, and any additional arches from the # Additional Package Arches file whose "master" arch # is enabled for this target - pkg_arches = [] - allowed_arches = [] + pkg_arches = [] # Arches the package wants to build for + allowed_arches = [] # Arches the buildsys allows + + # Add all base architectures the buildsys supports for arch in base_arches: pkg_arches.append(arch) allowed_arches.append(arch) + + # Add additional per-package architectures from Additional + # Package Architectures configuration option for arch in addl_arches: pkg_arches.append(arch) allowed_arches.append(arch) - # Optional arches don't get built by default but are "allowed" + + # Allow building on any optional architectures the buildsystem + # supports, but don't build for them unless the package + # requests it + opt_arches = self._target_cfg.optarches() for arch in opt_arches: allowed_arches.append(arch) if ba: + # If the package specifies a set of arches with + # BuildArch, use those rather than the default set pkg_arches = ba - else: - if exclusive: - pkg_arches = exclusive + elif exclusive: + # If the package specifies a set of arches with + # ExclusiveArch, use those rather than the default set + pkg_arches = exclusive + # Filter out any arches the package explicitly excludes if exclude: for arch in exclude: if arch in pkg_arches: pkg_arches.remove(arch) - # we probably need to check the archs, and make sure they are what - # we can build for + # Filter the final list of arches the package will build on + # through the list of arches this buildsys allows for thisarch in pkg_arches: if thisarch in allowed_arches: build_arches[thisarch] = None From fedora-extras-commits at redhat.com Mon Mar 13 03:45:50 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 22:45:50 -0500 Subject: extras-buildsys ChangeLog,1.173,1.174 Message-ID: <200603130346.k2D3kLSX005423@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5384 Modified Files: ChangeLog Log Message: 2006-03-12 Dan Williams Fix up kmod support. * server/Config.py - Fix splitting of arches for Additonal Package Arches - Use wildcard matching (*, ?, [...], [!...]) for package names in Additional Package Arches so we can support kmods easily * server/PackageJob.py - Add lots of comments in arch_handling() so people can tell what's going on Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- ChangeLog 12 Mar 2006 13:43:34 -0000 1.173 +++ ChangeLog 13 Mar 2006 03:45:43 -0000 1.174 @@ -1,5 +1,18 @@ 2006-03-12 Dan Williams + Fix up kmod support. + + * server/Config.py + - Fix splitting of arches for Additonal Package Arches + - Use wildcard matching (*, ?, [...], [!...]) for package names in + Additional Package Arches so we can support kmods easily + + * server/PackageJob.py + - Add lots of comments in arch_handling() so people can tell what's + going on + +2006-03-12 Dan Williams + * server/BuildMaster.py server/DBManager.py server/UserInterface.py From fedora-extras-commits at redhat.com Mon Mar 13 04:16:42 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:16:42 -0500 Subject: extras-buildsys/server Config.py, 1.7.2.3, 1.7.2.4 PackageJob.py, 1.31.2.9, 1.31.2.10 Message-ID: <200603130416.k2D4Ggij007444@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7387/server Modified Files: Tag: STABLE_0_4 Config.py PackageJob.py Log Message: 2006-03-12 Dan Williams Fix up kmod support. * server/Config.py - Fix splitting of arches for Additonal Package Arches - Use wildcard matching (*, ?, [...], [!...]) for package names in Additional Package Arches so we can support kmods easily * server/PackageJob.py - Add lots of comments in arch_handling() so people can tell what's going on Index: Config.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -u -r1.7.2.3 -r1.7.2.4 --- Config.py 14 Nov 2005 19:14:25 -0000 1.7.2.3 +++ Config.py 13 Mar 2006 04:16:34 -0000 1.7.2.4 @@ -15,6 +15,7 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import os +import fnmatch from ConfigParser import ConfigParser from plague import BaseConfig @@ -163,6 +164,8 @@ self._repo = self.get_str("General", "repo") self._testing = self.get_bool("General", "testing") + self._addl_pkg_arches = self._get_addl_pkg_arches() + def parent_cfg(self): return self._parent_cfg @@ -192,7 +195,7 @@ def testing(self): return self._testing - def addl_pkg_arches(self): + def _get_addl_pkg_arches(self): if not self._config.has_section("Additional Package Arches"): return {} items = self._config.items("Additional Package Arches") @@ -201,12 +204,20 @@ if type(arches) != type("") or not len(arches): continue try: - l = opt.split() - except Exception: + l = arches.split() + except Exception, e: continue addl_arches[pkg] = l return addl_arches + def addl_arches_for_pkg(self, name): + # Match package name against Additional Package Arches + # entries, taking wildcards into account + for item in self._addl_pkg_arches.keys(): + if fnmatch.fnmatchcase(name, item): + return self._addl_pkg_arches[item] + return [] + def save_default_config(self, filename=None): self.add_section("General") self.set_option("General", "distro", "fedora") Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.31.2.9 retrieving revision 1.31.2.10 diff -u -r1.31.2.9 -r1.31.2.10 --- PackageJob.py 19 Feb 2006 04:44:05 -0000 1.31.2.9 +++ PackageJob.py 13 Mar 2006 04:16:34 -0000 1.31.2.10 @@ -183,16 +183,15 @@ return self.uid def arch_handling(self, hdr): - addl_arches = [] - try: - addl_arches = self._target_cfg.addl_pkg_arches()[self.name] - except KeyError: - pass + # Grab additional allowed arches for this package, using + # wildcard matching if needed + addl_arches = self._target_cfg.addl_arches_for_pkg(self.name) + # Grab list of base arches (like i386, ppc, x86_64) that this + # buildsys supports. NOT subarch variants like i686, i586, ppc32, etc. base_arches = self._target_cfg.get_list("Arches", "base_arches") - opt_arches = self._target_cfg.get_list("Arches", "optional_arches") - # Remove arches we don't support from addl_arches + # Remove arches the buildsys doesn't support from addl_arches for arch in addl_arches: # ArchUtils.sub_arches is only used to determine which arches to build on by default, # so that if we have an Additional Package Arches that specifies @@ -203,45 +202,63 @@ if master_addl_arch not in base_arches: addl_arches.remove(arch) + # Grab arches the SRPM does/does not want to build for. If the package + # does use one or more of these tags in the specfile, hdr[''] will + # return an empty list, and we'll use defaults instead ba = hdr['buildarchs'] exclusive = hdr['exclusivearch'] exclude = hdr['excludearch'] build_arches = {} + # If the SRPM is noarch, there's nothing left to do, since + # it can build on any architecture the builders support if ba == ['noarch']: build_arches['noarch'] = None return (build_arches, None, None) - # default to building all base arches the 'target' + # default to building all base arches the target # supports, and any additional arches from the # Additional Package Arches file whose "master" arch # is enabled for this target - pkg_arches = [] - allowed_arches = [] + pkg_arches = [] # Arches the package wants to build for + allowed_arches = [] # Arches the buildsys allows + + # Add all base architectures the buildsys supports for arch in base_arches: pkg_arches.append(arch) allowed_arches.append(arch) + + # Add additional per-package architectures from Additional + # Package Architectures configuration option for arch in addl_arches: pkg_arches.append(arch) allowed_arches.append(arch) - # Optional arches don't get built by default but are "allowed" + + # Allow building on any optional architectures the buildsystem + # supports, but don't build for them unless the package + # requests it + opt_arches = self._target_cfg.get_list("Arches", "optional_arches") for arch in opt_arches: allowed_arches.append(arch) if ba: + # If the package specifies a set of arches with + # BuildArch, use those rather than the default set pkg_arches = ba - else: - if exclusive: - pkg_arches = exclusive + elif exclusive: + # If the package specifies a set of arches with + # ExclusiveArch, use those rather than the default set + pkg_arches = exclusive + # Filter out any arches the package explicitly excludes if exclude: for arch in exclude: if arch in pkg_arches: pkg_arches.remove(arch) - # we probably need to check the archs, and make sure they are what - # we can build for + # Filter the final list of arches the package will build on + # through the list of arches this buildsys allows for thisarch in pkg_arches: if thisarch in allowed_arches: build_arches[thisarch] = None From fedora-extras-commits at redhat.com Mon Mar 13 04:16:36 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:16:36 -0500 Subject: extras-buildsys ChangeLog,1.126.2.42,1.126.2.43 Message-ID: <200603130417.k2D4H6gY007447@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7387 Modified Files: Tag: STABLE_0_4 ChangeLog Log Message: 2006-03-12 Dan Williams Fix up kmod support. * server/Config.py - Fix splitting of arches for Additonal Package Arches - Use wildcard matching (*, ?, [...], [!...]) for package names in Additional Package Arches so we can support kmods easily * server/PackageJob.py - Add lots of comments in arch_handling() so people can tell what's going on Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.42 retrieving revision 1.126.2.43 diff -u -r1.126.2.42 -r1.126.2.43 --- ChangeLog 12 Mar 2006 05:52:48 -0000 1.126.2.42 +++ ChangeLog 13 Mar 2006 04:16:26 -0000 1.126.2.43 @@ -1,5 +1,18 @@ 2006-03-12 Dan Williams + Fix up kmod support. + + * server/Config.py + - Fix splitting of arches for Additonal Package Arches + - Use wildcard matching (*, ?, [...], [!...]) for package names in + Additional Package Arches so we can support kmods easily + + * server/PackageJob.py + - Add lots of comments in arch_handling() so people can tell what's + going on + +2006-03-12 Dan Williams + * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management From fedora-extras-commits at redhat.com Mon Mar 13 04:30:15 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:30:15 -0500 Subject: extras-buildsys ChangeLog, 1.126.2.43, 1.126.2.44 plague.spec, 1.27.2.4, 1.27.2.5 Message-ID: <200603130430.k2D4UF7N007513@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7492 Modified Files: Tag: STABLE_0_4 ChangeLog plague.spec Log Message: 2006-03-12 Dan Williams * Release of 0.4.4 Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.43 retrieving revision 1.126.2.44 diff -u -r1.126.2.43 -r1.126.2.44 --- ChangeLog 13 Mar 2006 04:16:26 -0000 1.126.2.43 +++ ChangeLog 13 Mar 2006 04:30:08 -0000 1.126.2.44 @@ -1,5 +1,9 @@ 2006-03-12 Dan Williams + * Release of 0.4.4 + +2006-03-12 Dan Williams + Fix up kmod support. * server/Config.py Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.27.2.4 retrieving revision 1.27.2.5 diff -u -r1.27.2.4 -r1.27.2.5 --- plague.spec 28 Nov 2005 17:51:21 -0000 1.27.2.4 +++ plague.spec 13 Mar 2006 04:30:08 -0000 1.27.2.5 @@ -2,7 +2,7 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.3 +Version: 0.4.4 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -109,7 +109,6 @@ %files %defattr(-, root, root) -%doc README ChangeLog %{_bindir}/%{name}-server %dir %{_datadir}/%{name}/server %{_datadir}/%{name}/server/*.py* @@ -120,6 +119,7 @@ %files common %defattr(-, root, root) +%doc README ChangeLog /usr/lib/python?.?/site-packages/plague/*.py* %files builder @@ -144,6 +144,46 @@ %changelog +* Sun Mar 12 2006 Dan Williams 0.4.4-1 +- Update to 0.4.4 release + - Don't use pyOpenSSL's sendall() call, but simulate it to achieve + timeouts, better error handling, and more efficient CPU usage + - Fix up initscripts and lifecycle management + - Implement a TERM handler in server & builder for clean shutdown + - Ensure jobs don't hang around on builders if they get left there for + some reason (ie, server didn't unlock repo for the job) + - Make Additional Package Arches really work (kmod support) + +* Tue Jan 24 2006 Dan Williams 0.4.3-6 +- Increase build server builder thread sleep time to work around SSL issues +- Spawn mock in a new process group, and when killing jobs kill the entire + process group. Hopefully fix orphaned rpmbuild processes on job kill + +* Mon Jan 23 2006 Dan Williams 0.4.3-5 +- Restore builder connection timeout + +* Mon Jan 23 2006 Dan Williams 0.4.3-4 +- Revert SSL fixes from last build + +* Sun Jan 22 2006 Dan Williams 0.4.3-3 +- Don't traceback when killing jobs on builders +- Work around SSL hanging issues + +* Tue Nov 29 2005 Dan Williams 0.4.3-2 +- Move README and ChangeLog to -common package +- Traceback/debug functionality added in server, depends on + threadframe module from elsewhere. Disabled by default. + +* Thu Nov 24 2005 Dan Williams 0.4.3-1 +- Add socket timeouts for fileserver and xmlrpc bits + +* Fri Nov 18 2005 Dan Williams 0.4.2-7 +- Suspend builders on hard errors such as running out of disk space +- Retry downloads from server/builder 5 times, not 3 +- Log retried downloads on the server +- Add socket timeouts to downloads to work around hanging issues + when downloading from the builder (the downloading/done issue) + * Tue Nov 15 2005 Dan Williams 0.4.2-5 - Log kill requests on the server From fedora-extras-commits at redhat.com Mon Mar 13 04:36:22 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 12 Mar 2006 23:36:22 -0500 Subject: rpms/rogue/devel rogue.spec,1.1,1.2 Message-ID: <200603130436.k2D4as5E007601@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7575 Modified Files: rogue.spec Log Message: Added missing BR: Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rogue.spec 10 Mar 2006 15:59:40 -0000 1.1 +++ rogue.spec 13 Mar 2006 04:36:21 -0000 1.2 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -12,8 +12,8 @@ Patch1: rogue-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#BuildRequires: -#Requires: +BuildRequires: desktop-file-utils +BuildRequires: ncurses-devel %description The one, the only, the original graphical adventure game that spawned @@ -60,5 +60,8 @@ %changelog +* Sun Mar 12 2006 Wart 5.4.2-2 +- Added missing BR: ncurses-devel, desktop-file-utils + * Sat Feb 25 2006 Wart 5.4.2-1 - Initial spec file. From fedora-extras-commits at redhat.com Mon Mar 13 04:36:56 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:36:56 -0500 Subject: rpms/plague/devel .cvsignore, 1.9, 1.10 plague.spec, 1.25, 1.26 sources, 1.23, 1.24 Message-ID: <200603130437.k2D4bSij007624@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7600 Modified Files: .cvsignore plague.spec sources Log Message: * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve timeouts, better error handling, and more efficient CPU usage - Fix up initscripts and lifecycle management - Implement a TERM handler in server & builder for clean shutdown - Ensure jobs don't hang around on builders if they get left there for some reason (ie, server didn't unlock repo for the job) - Make Additional Package Arches really work (kmod support) - Own /usr/lib/python?.?/site-packages/plague (#rh172794#) - Require createrepo >= 4.3 (#rh170531#) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plague/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 24 Nov 2005 23:47:57 -0000 1.9 +++ .cvsignore 13 Mar 2006 04:36:56 -0000 1.10 @@ -6,3 +6,4 @@ plague-0.4.1.tar.bz2 plague-0.4.2.tar.bz2 plague-0.4.3.tar.bz2 +plague-0.4.4.tar.bz2 Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- plague.spec 16 Feb 2006 05:12:37 -0000 1.25 +++ plague.spec 13 Mar 2006 04:36:56 -0000 1.26 @@ -2,8 +2,8 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.3 -Release: 6%{?dist} +Version: 0.4.4 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 @@ -145,7 +145,15 @@ %changelog -* ------- +* Sun Mar 12 2006 Dan Williams 0.4.4-1 +- Update to 0.4.4 release + - Don't use pyOpenSSL's sendall() call, but simulate it to achieve + timeouts, better error handling, and more efficient CPU usage + - Fix up initscripts and lifecycle management + - Implement a TERM handler in server & builder for clean shutdown + - Ensure jobs don't hang around on builders if they get left there for + some reason (ie, server didn't unlock repo for the job) + - Make Additional Package Arches really work (kmod support) - Own /usr/lib/python?.?/site-packages/plague (#rh172794#) - Require createrepo >= 4.3 (#rh170531#) Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 24 Jan 2006 19:07:00 -0000 1.23 +++ sources 13 Mar 2006 04:36:56 -0000 1.24 @@ -1 +1 @@ -6282064ae35d13f6b72744400c8a49c0 plague-0.4.3.tar.bz2 +eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 04:40:05 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:40:05 -0500 Subject: rpms/plague/FC-4 plague.spec,1.22,1.23 sources,1.21,1.22 Message-ID: <200603130440.k2D4ecPw007744@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7723 Modified Files: plague.spec sources Log Message: * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve timeouts, better error handling, and more efficient CPU usage - Fix up initscripts and lifecycle management - Implement a TERM handler in server & builder for clean shutdown - Ensure jobs don't hang around on builders if they get left there for some reason (ie, server didn't unlock repo for the job) - Make Additional Package Arches really work (kmod support) - Own /usr/lib/python?.?/site-packages/plague (#rh172794#) - Require createrepo >= 4.3 (#rh170531#) Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- plague.spec 24 Jan 2006 19:07:39 -0000 1.22 +++ plague.spec 13 Mar 2006 04:40:05 -0000 1.23 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.3 -Release: 6%{?dist} +Version: 0.4.4 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo +Requires: python-sqlite, createrepo >= 4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -120,7 +120,8 @@ %files common %defattr(-, root, root) %doc README ChangeLog -/usr/lib/python?.?/site-packages/plague/*.py* +%dir /usr/lib/python?.?/site-packages/%{name} +/usr/lib/python?.?/site-packages/%{name}/*.py* %files builder %defattr(-, root, root) @@ -144,6 +145,18 @@ %changelog +* Sun Mar 12 2006 Dan Williams 0.4.4-1 +- Update to 0.4.4 release + - Don't use pyOpenSSL's sendall() call, but simulate it to achieve + timeouts, better error handling, and more efficient CPU usage + - Fix up initscripts and lifecycle management + - Implement a TERM handler in server & builder for clean shutdown + - Ensure jobs don't hang around on builders if they get left there for + some reason (ie, server didn't unlock repo for the job) + - Make Additional Package Arches really work (kmod support) +- Own /usr/lib/python?.?/site-packages/plague (#rh172794#) +- Require createrepo >= 4.3 (#rh170531#) + * Tue Jan 24 2006 Dan Williams 0.4.3-6 - Increase build server builder thread sleep time to work around SSL issues - Spawn mock in a new process group, and when killing jobs kill the entire Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/FC-4/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 24 Jan 2006 19:07:39 -0000 1.21 +++ sources 13 Mar 2006 04:40:05 -0000 1.22 @@ -1 +1 @@ -6282064ae35d13f6b72744400c8a49c0 plague-0.4.3.tar.bz2 +eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 04:42:55 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:42:55 -0500 Subject: rpms/plague/FC-3 plague.spec,1.22,1.23 sources,1.21,1.22 Message-ID: <200603130443.k2D4hR3G007835@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7802 Modified Files: plague.spec sources Log Message: * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve timeouts, better error handling, and more efficient CPU usage - Fix up initscripts and lifecycle management - Implement a TERM handler in server & builder for clean shutdown - Ensure jobs don't hang around on builders if they get left there for some reason (ie, server didn't unlock repo for the job) - Make Additional Package Arches really work (kmod support) - Own /usr/lib/python?.?/site-packages/plague (#rh172794#) - Require createrepo >= 4.3 (#rh170531#) Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- plague.spec 24 Jan 2006 19:08:26 -0000 1.22 +++ plague.spec 13 Mar 2006 04:42:55 -0000 1.23 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.3 -Release: 6%{?dist} +Version: 0.4.4 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo +Requires: python-sqlite, createrepo >= 4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -120,7 +120,8 @@ %files common %defattr(-, root, root) %doc README ChangeLog -/usr/lib/python?.?/site-packages/plague/*.py* +%dir /usr/lib/python?.?/site-packages/%{name} +/usr/lib/python?.?/site-packages/%{name}/*.py* %files builder %defattr(-, root, root) @@ -144,6 +145,18 @@ %changelog +* Sun Mar 12 2006 Dan Williams 0.4.4-1 +- Update to 0.4.4 release + - Don't use pyOpenSSL's sendall() call, but simulate it to achieve + timeouts, better error handling, and more efficient CPU usage + - Fix up initscripts and lifecycle management + - Implement a TERM handler in server & builder for clean shutdown + - Ensure jobs don't hang around on builders if they get left there for + some reason (ie, server didn't unlock repo for the job) + - Make Additional Package Arches really work (kmod support) +- Own /usr/lib/python?.?/site-packages/plague (#rh172794#) +- Require createrepo >= 4.3 (#rh170531#) + * Tue Jan 24 2006 Dan Williams 0.4.3-6 - Increase build server builder thread sleep time to work around SSL issues - Spawn mock in a new process group, and when killing jobs kill the entire Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/FC-3/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 24 Jan 2006 19:08:26 -0000 1.21 +++ sources 13 Mar 2006 04:42:55 -0000 1.22 @@ -1 +1 @@ -6282064ae35d13f6b72744400c8a49c0 plague-0.4.3.tar.bz2 +eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 04:54:55 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:54:55 -0500 Subject: rpms/python-cpio - New directory Message-ID: <200603130454.k2D4svUl007976@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7968/python-cpio Log Message: Directory /cvs/extras/rpms/python-cpio added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 04:55:01 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:55:01 -0500 Subject: rpms/python-cpio/devel - New directory Message-ID: <200603130455.k2D4t3rl007991@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7968/python-cpio/devel Log Message: Directory /cvs/extras/rpms/python-cpio/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 04:55:18 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:55:18 -0500 Subject: rpms/python-cpio Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603130455.k2D4tKoq008025@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8013 Added Files: Makefile import.log Log Message: Setup of module python-cpio --- NEW FILE Makefile --- # Top level Makefile for module python-cpio all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 13 04:55:23 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:55:23 -0500 Subject: rpms/python-cpio/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603130455.k2D4tPw2008045@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8013/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-cpio --- NEW 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 Mar 13 04:55:54 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:55:54 -0500 Subject: rpms/python-cpio import.log,1.1,1.2 Message-ID: <200603130456.k2D4uQNR008116@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8082 Modified Files: import.log Log Message: auto-import python-cpio-0.1-1 on branch devel from python-cpio-0.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-cpio/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Mar 2006 04:55:17 -0000 1.1 +++ import.log 13 Mar 2006 04:55:54 -0000 1.2 @@ -0,0 +1 @@ +python-cpio-0_1-1:HEAD:python-cpio-0.1-1.src.rpm:1142225747 From fedora-extras-commits at redhat.com Mon Mar 13 04:56:00 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:56:00 -0500 Subject: rpms/python-cpio/devel python-cpio.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603130456.k2D4uWav008120@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8082/devel Modified Files: .cvsignore sources Added Files: python-cpio.spec Log Message: auto-import python-cpio-0.1-1 on branch devel from python-cpio-0.1-1.src.rpm --- NEW FILE python-cpio.spec --- %{!?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-cpio Version: 0.1 Release: 1%{?dist} Summary: A Python module for accessing cpio archives Group: Development/Languages License: LGPL URL: http://developer.berlios.de/projects/python-cpio/ Source0: http://download.berlios.de/python-cpio/python-cpio-0.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description This is a Python module for accessing cpio archives. %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING.lib README TODO %{python_sitelib}/cpioarchive.py %{python_sitelib}/cpioarchive.py[co] %changelog * Tue Jan 3 2006 Ignacio Vazquez-Abrams 0.1-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-cpio/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Mar 2006 04:55:23 -0000 1.1 +++ .cvsignore 13 Mar 2006 04:56:00 -0000 1.2 @@ -0,0 +1 @@ +python-cpio-0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-cpio/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Mar 2006 04:55:23 -0000 1.1 +++ sources 13 Mar 2006 04:56:00 -0000 1.2 @@ -0,0 +1 @@ +277934c8aa149dfa2714d70a68fe363d python-cpio-0.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 05:49:42 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Mon, 13 Mar 2006 00:49:42 -0500 Subject: rpms/deskbar-applet/devel deskbar-applet-2.14.0-beagleexists.patch, NONE, 1.1 deskbar-applet-2.14.0-fedorabz.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 deskbar-applet.spec, 1.19, 1.20 sources, 1.9, 1.10 deskbar-applet-2.13.91-beagleexists.patch, 1.1, NONE deskbar-applet-2.13.91-fedorabz.patch, 1.1, NONE deskbar-applet-2.13.91-prctl.patch, 1.1, NONE Message-ID: <200603130550.k2D5oEiJ010243@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10216 Modified Files: .cvsignore deskbar-applet.spec sources Added Files: deskbar-applet-2.14.0-beagleexists.patch deskbar-applet-2.14.0-fedorabz.patch Removed Files: deskbar-applet-2.13.91-beagleexists.patch deskbar-applet-2.13.91-fedorabz.patch deskbar-applet-2.13.91-prctl.patch Log Message: Upstream update deskbar-applet-2.14.0-beagleexists.patch: --- NEW FILE deskbar-applet-2.14.0-beagleexists.patch --- --- deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py.fedora 2006-03-12 21:24:16.000000000 -0500 +++ deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py 2006-03-12 21:24:56.000000000 -0500 @@ -1,5 +1,6 @@ import os from os.path import exists, join +from glob import glob from gettext import gettext as _ import gobject @@ -9,7 +10,7 @@ #FIXME: better way to detect beagle ? def _check_requirements(): for dir in get_xdg_data_dirs(): - if exists(join(dir, "applications", "best.desktop")) or exists(join(dir, "applications", "beagle-search.desktop")): + if exists(join(dir, "applications", "best.desktop")) or glob(join(dir, "applications", "*beagle-search.desktop")): return (deskbar.Handler.HANDLER_IS_HAPPY, None, None) return (deskbar.Handler.HANDLER_IS_NOT_APPLICABLE, "Beagle does not seem to be installed, skipping", None) deskbar-applet-2.14.0-fedorabz.patch: --- NEW FILE deskbar-applet-2.14.0-fedorabz.patch --- --- deskbar-applet-2.14.0/deskbar/handlers/Makefile.in.fedorabz 2006-03-12 21:21:00.000000000 -0500 +++ deskbar-applet-2.14.0/deskbar/handlers/Makefile.in 2006-03-12 21:21:25.000000000 -0500 @@ -240,6 +240,7 @@ email_address.py epiphany.py files.py galago.py galeon.py \ gtkbookmarks.py google-live.py history.py mozilla.py \ programs.py pathprograms.py volumes.py web_address.py yahoo.py \ + fedorabz.py \ $(am__append_1) EXTRA_DIST = \ debug-async_handler.py \ --- deskbar-applet-2.14.0/data/art/Makefile.in.fedorabz 2006-03-12 21:20:07.000000000 -0500 +++ deskbar-applet-2.14.0/data/art/Makefile.in 2006-03-12 21:20:42.000000000 -0500 @@ -244,6 +244,7 @@ deskbar-applet-panel-v.png \ deskbar-applet-panel-h.png \ deskbar-applet-small.png \ + fedorabz.png \ folder-bookmark.png \ generic.png \ yahoo.png \ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 14 Feb 2006 05:00:09 -0000 1.9 +++ .cvsignore 13 Mar 2006 05:49:42 -0000 1.10 @@ -1 +1 @@ -deskbar-applet-2.13.91.tar.bz2 +deskbar-applet-2.14.0.tar.bz2 Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- deskbar-applet.spec 24 Feb 2006 12:07:06 -0000 1.19 +++ deskbar-applet.spec 13 Mar 2006 05:49:42 -0000 1.20 @@ -2,19 +2,18 @@ %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: deskbar-applet -Version: 2.13.91 -Release: 3%{?dist} +Version: 2.14.0 +Release: 1%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet License: GPL -URL: http://browserbookapp.sourceforge.net/deskbar.html -Source0: http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.13/%{name}-%{version}.tar.bz2 +URL: http://live.gnome.org/DeskbarApplet +Source0: http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.14/%{name}-%{version}.tar.bz2 Source1: fedorabz.py Source2: fedorabz.png -Patch0: deskbar-applet-2.13.91-fedorabz.patch -Patch1: deskbar-applet-2.13.91-prctl.patch -Patch2: deskbar-applet-2.13.91-beagleexists.patch +Patch0: deskbar-applet-2.14.0-fedorabz.patch +Patch2: deskbar-applet-2.14.0-beagleexists.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel gnome-python2-applet Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2 @@ -23,24 +22,19 @@ Requires(preun): GConf2 %description -This applet looks like the current Gnome Mini-Commander, but it launches search -queries instead of programs. - -Example search-engines include -+ Google -+ MSN -+ EBay -+ IMDB -+ Stock Quotes -+ Wikipedia -+ Local File Search (and eventually also Beagle) +The goal of DeskbarApplet is to provide an omnipresent versatile search +interface. By typing search terms into the deskbar entry in your panel you are +presented with the search results as you type. + +Seaches are handled by a series of plugins. DeskbarApplet provides a simple +interface to manage these plugins to provide you with the search results that +fit your needs. %prep %setup -q cp %{SOURCE1} deskbar/handlers cp %{SOURCE2} data/art %patch -p1 -b .fedorabz -%patch1 -p1 -b .prctl %patch2 -p1 -b .beagleexists %build @@ -90,6 +84,9 @@ %{_datadir}/pixmaps/%{name}.svg %changelog +* Sun Mar 12 2006 Ignacio Vazquez-Abrams 2.14.0-1 +- Upstream update + * Fri Feb 24 2006 Ignacio Vazquez-Abrams 2.13.91-3 - Added beagle fix (#182728) Index: sources =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 14 Feb 2006 05:00:09 -0000 1.9 +++ sources 13 Mar 2006 05:49:42 -0000 1.10 @@ -1 +1 @@ -693c3221d73e8a6fe59144249e6deb43 deskbar-applet-2.13.91.tar.bz2 +2c9910160c2814e6497c5d6b6887fa8e deskbar-applet-2.14.0.tar.bz2 --- deskbar-applet-2.13.91-beagleexists.patch DELETED --- --- deskbar-applet-2.13.91-fedorabz.patch DELETED --- --- deskbar-applet-2.13.91-prctl.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 13 07:36:37 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 13 Mar 2006 02:36:37 -0500 Subject: rpms/perl-XML-RSS/FC-4 .cvsignore, 1.2, 1.3 perl-XML-RSS.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603130737.k2D7b9O8014469@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-XML-RSS/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14431/FC-4 Modified Files: .cvsignore perl-XML-RSS.spec sources Log Message: * Mon Mar 13 2006 Ville Skytt?? - 1.10-1 - 1.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jan 2005 11:10:17 -0000 1.2 +++ .cvsignore 13 Mar 2006 07:36:36 -0000 1.3 @@ -1 +1 @@ -XML-RSS-1.05.tar.gz +XML-RSS-1.10.tar.gz Index: perl-XML-RSS.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/FC-4/perl-XML-RSS.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-XML-RSS.spec 6 Apr 2005 22:13:09 -0000 1.3 +++ perl-XML-RSS.spec 13 Mar 2006 07:36:36 -0000 1.4 @@ -1,19 +1,18 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-XML-RSS -Version: 1.05 -Release: 2 - +Version: 1.10 +Release: 1%{?dist} Summary: Perl module for managing RDF Site Summary (RSS) files Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/XML-RSS/ -Source0: http://www.cpan.org/authors/id/K/KE/KELLAN/XML-RSS-1.05.tar.gz +Source0: http://www.cpan.org/authors/id/A/AB/ABH/XML-RSS-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Test::Manifest), perl(XML::Parser) +BuildRequires: perl(Test::Manifest) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(XML::Parser) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -40,7 +39,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -51,12 +50,15 @@ %files %defattr(-,root,root,-) %doc Changes README TODO examples -%{perl_vendorlib}/XML -%{_mandir}/man3/*.3* +%{perl_vendorlib}/XML/ +%{_mandir}/man3/XML::RSS.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Mar 13 2006 Ville Skytt?? - 1.10-1 +- 1.10. + +* Fri Apr 7 2005 Michael Schwendt - 1.05-2 - rebuilt * Sat Aug 14 2004 Ville Skytt?? - 0:1.05-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jan 2005 11:10:17 -0000 1.2 +++ sources 13 Mar 2006 07:36:36 -0000 1.3 @@ -1 +1 @@ -3eaa65ec6316edec3194b6a2f384a65c XML-RSS-1.05.tar.gz +d5a55a2eeeb479681bc72d32ac87cf8f XML-RSS-1.10.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 07:36:43 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 13 Mar 2006 02:36:43 -0500 Subject: rpms/perl-XML-RSS/devel .cvsignore, 1.2, 1.3 perl-XML-RSS.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603130737.k2D7bF8H014474@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-XML-RSS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14431/devel Modified Files: .cvsignore perl-XML-RSS.spec sources Log Message: * Mon Mar 13 2006 Ville Skytt?? - 1.10-1 - 1.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jan 2005 11:10:17 -0000 1.2 +++ .cvsignore 13 Mar 2006 07:36:43 -0000 1.3 @@ -1 +1 @@ -XML-RSS-1.05.tar.gz +XML-RSS-1.10.tar.gz Index: perl-XML-RSS.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/perl-XML-RSS.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-XML-RSS.spec 6 Apr 2005 22:13:09 -0000 1.3 +++ perl-XML-RSS.spec 13 Mar 2006 07:36:43 -0000 1.4 @@ -1,19 +1,18 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-XML-RSS -Version: 1.05 -Release: 2 - +Version: 1.10 +Release: 1%{?dist} Summary: Perl module for managing RDF Site Summary (RSS) files Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/XML-RSS/ -Source0: http://www.cpan.org/authors/id/K/KE/KELLAN/XML-RSS-1.05.tar.gz +Source0: http://www.cpan.org/authors/id/A/AB/ABH/XML-RSS-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Test::Manifest), perl(XML::Parser) +BuildRequires: perl(Test::Manifest) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(XML::Parser) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -40,7 +39,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -51,12 +50,15 @@ %files %defattr(-,root,root,-) %doc Changes README TODO examples -%{perl_vendorlib}/XML -%{_mandir}/man3/*.3* +%{perl_vendorlib}/XML/ +%{_mandir}/man3/XML::RSS.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Mar 13 2006 Ville Skytt?? - 1.10-1 +- 1.10. + +* Fri Apr 7 2005 Michael Schwendt - 1.05-2 - rebuilt * Sat Aug 14 2004 Ville Skytt?? - 0:1.05-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jan 2005 11:10:17 -0000 1.2 +++ sources 13 Mar 2006 07:36:43 -0000 1.3 @@ -1 +1 @@ -3eaa65ec6316edec3194b6a2f384a65c XML-RSS-1.05.tar.gz +d5a55a2eeeb479681bc72d32ac87cf8f XML-RSS-1.10.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 08:21:04 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Mon, 13 Mar 2006 03:21:04 -0500 Subject: owners owners.list,1.737,1.738 Message-ID: <200603130821.k2D8Lacu016564@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16547 Modified Files: owners.list Log Message: python-cpio Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.737 retrieving revision 1.738 diff -u -r1.737 -r1.738 --- owners.list 11 Mar 2006 21:53:37 -0000 1.737 +++ owners.list 13 Mar 2006 08:21:03 -0000 1.738 @@ -1145,6 +1145,7 @@ Fedora Extras|python-cherrypy|A pythonic, object-oriented web development framework|gijs at gewis.nl|extras-qa at fedoraproject.org| Fedora Extras|python-cherrytemplate|An easy and powerful templating module for Python|gijs at gewis.nl|extras-qa at fedoraproject.org| Fedora Extras|python-clientform|Python module for client-side HTML forms|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| +Fedora Extras|python-cpio|A Python module for accessing cpio archives|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-crypto|A cryptography library for Python|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|python-dateutil|Powerful extensions to the standard datetime module|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|python-dialog|Python interface to the Unix dialog utility|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 13 08:47:10 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 03:47:10 -0500 Subject: rpms/gpsim/devel gpsim.spec,1.3,1.4 Message-ID: <200603130847.k2D8lgnN016694@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16675 Modified Files: gpsim.spec Log Message: Rebuild for FE5. Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gpsim.spec 6 Oct 2005 13:08:40 -0000 1.3 +++ gpsim.spec 13 Mar 2006 08:47:09 -0000 1.4 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.21.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -78,10 +78,13 @@ %{_includedir}/* %changelog -* Thu Oct 6 2005 Alain Portal 0.21.11-1 +* Mon Mar 13 2006 Alain Portal 0.21.11-2 + - Rebuild for FE5 + +* Thu Oct 6 2005 Alain Portal 0.21.11-1 - Remove useless Requires -* Wed Oct 5 2005 Alain Portal 0.21.11-1 +* Wed Oct 5 2005 Alain Portal 0.21.11-1 - New version - Improve download url @@ -104,7 +107,7 @@ * Mon Sep 12 2005 Alain Portal 0.21.4-1 - New version -* Mon Nov 8 2004 Alain Portal 0:0.21.2-0.fdr.2 +* Mon Nov 8 2004 Alain Portal 0:0.21.2-0.fdr.2 - Add BuildRequires flex, readline-devel * Wed Oct 27 2004 Alain Portal 0:0.21.2-0.fdr.1 From fedora-extras-commits at redhat.com Mon Mar 13 08:56:45 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 03:56:45 -0500 Subject: rpms/erlang/FC-4 .cvsignore, 1.4, 1.5 erlang.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603130857.k2D8vHQ7016821@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16765 Modified Files: .cvsignore erlang.spec sources Log Message: new version R10B-10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Dec 2005 00:34:58 -0000 1.4 +++ .cvsignore 13 Mar 2006 08:56:45 -0000 1.5 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-9.tar.gz -otp_doc_man_R10B-9.tar.gz -otp_src_R10B-9.tar.gz +otp_doc_html_R10B-10.tar.gz +otp_doc_man_R10B-10.tar.gz +otp_src_R10B-10.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- erlang.spec 29 Dec 2005 00:34:58 -0000 1.5 +++ erlang.spec 13 Mar 2006 08:56:45 -0000 1.6 @@ -1,14 +1,14 @@ Name: erlang Version: R10B -Release: 9.1%{?dist} +Release: 10.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-9.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-9.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-9.tar.gz +Source: http://www.erlang.org/download/otp_src_R10B-10.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R10B-10.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R10B-10.tar.gz Patch: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -36,7 +36,7 @@ %prep -%setup -q -n otp_src_R10B-9 +%setup -q -n otp_src_R10B-10 %patch -p1 %patch1 -p1 %patch2 -p1 @@ -94,6 +94,9 @@ %changelog +* Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 +- new version R10B-10 + * Thu Dec 29 2005 Gerard Milmeister - R10B-9.1 - New Version R10B-9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Dec 2005 00:34:58 -0000 1.4 +++ sources 13 Mar 2006 08:56:45 -0000 1.5 @@ -1,3 +1,3 @@ -108bc01be67aaa2edde9a0331ef9bc71 otp_doc_html_R10B-9.tar.gz -051cd9893b36313f20a420bc2491905c otp_doc_man_R10B-9.tar.gz -05791e9097f36202eb705df2a1db6500 otp_src_R10B-9.tar.gz +d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz +207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz +c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 08:58:34 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 03:58:34 -0500 Subject: rpms/gputils/devel gputils.spec,1.6,1.7 Message-ID: <200603130859.k2D8x7O9016891@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gputils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16871 Modified Files: gputils.spec Log Message: Rebuild for FE5 Index: gputils.spec =================================================================== RCS file: /cvs/extras/rpms/gputils/devel/gputils.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gputils.spec 12 Sep 2005 20:27:49 -0000 1.6 +++ gputils.spec 13 Mar 2006 08:58:34 -0000 1.7 @@ -1,6 +1,6 @@ Name: gputils Version: 0.13.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Development utilities for Microchip (TM) PIC (TM) microcontrollers Group: Development/Languages @@ -44,6 +44,9 @@ %{_mandir}/fr/man1/* %changelog +* Mon Mar 13 2006 Alain Portal 0.13.3-2 + - Rebuild for FE5 + * Mon Sep 12 2005 Alain Portal 0.13.3-1 - New version - Patch to update french man pages From fedora-extras-commits at redhat.com Mon Mar 13 09:03:47 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 04:03:47 -0500 Subject: rpms/gtk+extra/devel gtk+extra.spec,1.3,1.4 Message-ID: <200603130904.k2D94KPS019274@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gtk+extra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19233 Modified Files: gtk+extra.spec Log Message: Rebuild for FE5 Index: gtk+extra.spec =================================================================== RCS file: /cvs/extras/rpms/gtk+extra/devel/gtk+extra.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gtk+extra.spec 5 Oct 2005 13:11:43 -0000 1.3 +++ gtk+extra.spec 13 Mar 2006 09:03:47 -0000 1.4 @@ -1,6 +1,6 @@ Name: gtk+extra Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library of gtk+ widgets Summary(fr): Une biblioth??que de widgets gtk+ @@ -76,6 +76,9 @@ %changelog +* Mon Mar 13 2006 Alain Portal 2.1.1-2 + - Rebuild for FE5 + * Wed Oct 5 2005 Alain Portal 2.1.1-1 - New version - Revert to the official package. From fedora-extras-commits at redhat.com Mon Mar 13 09:04:21 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:04:21 -0500 Subject: rpms/multisync - New directory Message-ID: <200603130904.k2D94Nqt019284@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19273/multisync Log Message: Directory /cvs/extras/rpms/multisync added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 09:04:40 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:04:40 -0500 Subject: rpms/multisync/devel - New directory Message-ID: <200603130904.k2D94gH3019328@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19273/multisync/devel Log Message: Directory /cvs/extras/rpms/multisync/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 09:05:33 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:05:33 -0500 Subject: rpms/multisync Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603130905.k2D95beO019374@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19362 Added Files: Makefile import.log Log Message: Setup of module multisync --- NEW FILE Makefile --- # Top level Makefile for module multisync all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 13 09:05:45 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:05:45 -0500 Subject: rpms/multisync/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603130905.k2D95l6T019393@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19362/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module multisync --- NEW 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 Mar 13 09:11:41 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:11:41 -0500 Subject: rpms/multisync import.log,1.1,1.2 Message-ID: <200603130912.k2D9CD5e019871@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19610 Modified Files: import.log Log Message: auto-import multisync-0.90.18-4 on branch devel from multisync-0.90.18-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/multisync/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Mar 2006 09:05:33 -0000 1.1 +++ import.log 13 Mar 2006 09:11:40 -0000 1.2 @@ -0,0 +1 @@ +multisync-0_90_18-4:HEAD:multisync-0.90.18-4.src.rpm:1142240940 From fedora-extras-commits at redhat.com Mon Mar 13 09:11:47 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:11:47 -0500 Subject: rpms/multisync/devel multisync-gui-svn151.patch, NONE, 1.1 multisync-rpath.patch, NONE, 1.1 multisync-werror.patch, NONE, 1.1 multisync.desktop, NONE, 1.1 multisync.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603130912.k2D9CKRf019878@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19610/devel Modified Files: .cvsignore sources Added Files: multisync-gui-svn151.patch multisync-rpath.patch multisync-werror.patch multisync.desktop multisync.spec Log Message: auto-import multisync-0.90.18-4 on branch devel from multisync-0.90.18-4.src.rpm multisync-gui-svn151.patch: --- NEW FILE multisync-gui-svn151.patch --- diff -uhrN --exclude=.svn gui/aclocal.m4 /homes/awjb/cvs/multisync-gui/aclocal.m4 --- gui/aclocal.m4 2005-08-31 14:00:35.000000000 +0200 +++ /homes/awjb/cvs/multisync-gui/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,6970 +0,0 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# 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. - -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. - -# 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, 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. - -# serial 10 - -AC_PREREQ([2.54]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl - -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright 2002 Free Software Foundation, Inc. - -# 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, 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 - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.9])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright 2001, 2002 Free Software Foundation, Inc. - -# 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, 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. - -# serial 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ [...51598 lines suppressed...] - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi - touch $file - ;; - - tar) - shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 diff -uhrN --exclude=.svn gui/mkinstalldirs /homes/awjb/cvs/multisync-gui/mkinstalldirs --- gui/mkinstalldirs 2005-02-06 07:25:15.000000000 +0100 +++ /homes/awjb/cvs/multisync-gui/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100 @@ -1,111 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" 1>&2 - exit 0 - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -case $dirmode in - '') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi - ;; - *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi - ;; -esac - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# End: -# mkinstalldirs ends here Binary files gui/multisync0.90 and /homes/awjb/cvs/multisync-gui/multisync0.90 differ Binary files gui/pair.o and /homes/awjb/cvs/multisync-gui/pair.o differ diff -uhrN --exclude=.svn gui/plugins.c /homes/awjb/cvs/multisync-gui/plugins.c --- gui/plugins.c 2005-11-06 13:29:29.000000000 +0100 +++ /homes/awjb/cvs/multisync-gui/plugins.c 2006-03-01 09:09:20.000000000 +0100 @@ -32,5 +32,7 @@ #ifdef ENABLE_EVO msync_register_evo_sync(env); #endif +#ifdef ENABLE_SYNCE msync_register_synce_sync(env); +#endif } Binary files gui/plugins.o and /homes/awjb/cvs/multisync-gui/plugins.o differ diff -uhrN --exclude=.svn gui/stamp-h1 /homes/awjb/cvs/multisync-gui/stamp-h1 --- gui/stamp-h1 2005-08-31 14:03:12.000000000 +0200 +++ /homes/awjb/cvs/multisync-gui/stamp-h1 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -timestamp for config.h Binary files gui/support.o and /homes/awjb/cvs/multisync-gui/support.o differ multisync-rpath.patch: --- NEW FILE multisync-rpath.patch --- --- tools/Makefile.am.orig 2005-11-29 14:43:23.000000000 +0100 +++ tools/Makefile.am 2005-11-29 14:46:18.000000000 +0100 @@ -1,13 +1,13 @@ ## Process this file with automake to produce Makefile.in -AM_CFLAGS = -Wall -Werror -I$(top_srcdir) +AM_CFLAGS = -Wall -I$(top_srcdir) INCLUDES = @PACKAGE_CFLAGS@ bin_PROGRAMS = msynctool convcard msynctool_SOURCES = msynctool.c -msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) +msynctool_LDFLAGS = @PACKAGE_LIBS@ convcard_SOURCES = convcard.c -convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) \ No newline at end of file +convcard_LDFLAGS = @PACKAGE_LIBS@ multisync-werror.patch: --- NEW FILE multisync-werror.patch --- --- gui/Makefile.am.orig 2006-03-01 09:23:42.000000000 +0100 +++ gui/Makefile.am 2006-03-01 09:23:54.000000000 +0100 @@ -20,7 +20,7 @@ SYNCELIB = endif -AM_CFLAGS = -Wall -Werror -I$(top_srcdir) +AM_CFLAGS = -Wall -I$(top_srcdir) INCLUDES = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ --- gui/evolution2_sync/Makefile.am.orig 2006-03-01 09:33:32.000000000 +0100 +++ gui/evolution2_sync/Makefile.am 2006-03-01 09:33:43.000000000 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AM_CFLAGS = @XMLCFLAGS@ -Werror -Wall +AM_CFLAGS = @XMLCFLAGS@ -Wall INCLUDES = @PACKAGE_CFLAGS@ -I$(top_srcdir) --- gui/evolution_sync/Makefile.am.orig 2006-03-01 09:33:54.000000000 +0100 +++ gui/evolution_sync/Makefile.am 2006-03-01 09:34:03.000000000 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AM_CFLAGS = @XMLCFLAGS@ -Werror -Wall +AM_CFLAGS = @XMLCFLAGS@ -Wall INCLUDES = @PACKAGE_CFLAGS@ -I$(top_srcdir) --- gui/file-sync/Makefile.am.orig 2006-03-01 09:32:57.000000000 +0100 +++ gui/file-sync/Makefile.am 2006-03-01 09:33:09.000000000 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AM_CFLAGS = @XMLCFLAGS@ -Werror -Wall +AM_CFLAGS = @XMLCFLAGS@ -Wall INCLUDES = @PACKAGE_CFLAGS@ -I$(top_srcdir) -I$(srcdir) --- gui/synce_sync/Makefile.am.orig 2006-03-01 09:34:20.000000000 +0100 +++ gui/synce_sync/Makefile.am 2006-03-01 09:34:29.000000000 +0100 @@ -1,6 +1,6 @@ ## Process this synce with automake to produce Makesynce.in -AM_CFLAGS = @XMLCFLAGS@ -Werror -Wall +AM_CFLAGS = @XMLCFLAGS@ -Wall INCLUDES = @PACKAGE_CFLAGS@ -I$(top_srcdir) --- NEW FILE multisync.desktop --- [Desktop Entry] Name=multisync Comment=Calendar synchronization program Exec=multisync Terminal=false Type=Application Encoding=UTF-8 Categories=Application;System; --- NEW FILE multisync.spec --- Name: multisync Version: 0.90.18 Release: 4%{?dist} Summary: Calendar (and other PIM data) synchronization program Group: Applications/Communications License: GPL URL: http://www.opensync.org # see http://www.opensync.org/wiki/download Source0: %{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: multisync-rpath.patch # this is svn151 with a few fixes Patch1: multisync-gui-svn151.patch Patch2: multisync-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel BuildRequires: gnome-libs-devel BuildRequires: libgnomeui-devel BuildRequires: desktop-file-utils BuildRequires: libopensync-plugin-evolution2-devel BuildRequires: automake %description MultiSync is a program to synchronize calendars, addressbooks and other PIM data between programs on your computer and other computers, mobile devices, PDAs or cell phones. It is packaged with plugins for Ximian Evolution, IrMC mobile devices, Opie / Zaurus PDAs, SyncML, ldap and for backup. %package gui Summary: GUI interface for multisync Group: Applications/Communications Requires: %{name} = %{version}-%{release} %description gui Graphical User Interface for multisync %prep %setup -q %patch0 %patch1 %patch2 %build # both don't like smp flags so disable them for now NOCONFIGURE=true ./autogen.sh %configure --disable-static %{__make} # build gui cd gui autoreconf -sfi %configure --disable-static --disable-rpath # if we don't do a make clean here we only get a segfaulting binary %{__make} clean %{__make} %install rm -fr $RPM_BUILD_ROOT %makeinstall cd gui %makeinstall mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,} find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' 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 AUTHORS COPYING ChangeLog README %{_bindir}/convcard %{_bindir}/msynctool %files gui %defattr(-, root, root,-) %doc COPYING %{_bindir}/multisync %{_datadir}/applications/*desktop %changelog * Wed Mar 01 2006 Andreas Bierfert 0.90.18-4 - fix segfaulting binary - diff against svn151 - code a little bit for sanity * Fri Feb 17 2006 Andreas Bierfert 0.90.18-3 - Add missing desktop file - Add BR for evolution2 plugin so gui will detect this correctly * Sat Dec 31 2005 Andreas Bierfert 0.90.18-2 - add BR libgnomeui-devel - comment on missing smp flags * Tue Nov 29 2005 Andreas Bierfert 0.90.18-1 - user newer version from opensync project - split gui and cmd line tool * Thu Aug 11 2005 Andreas Bierfert 0.82-4 - remove devel package altogether - change Requires 0.82-3 - fedorarized - install plugins in a more compact way - add devel package * Tue Nov 23 2004 Che - initial rpm release - decided to not split it for sanity reasons. - thanks to streeter for the patches. (cheers to rh) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multisync/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Mar 2006 09:05:45 -0000 1.1 +++ .cvsignore 13 Mar 2006 09:11:47 -0000 1.2 @@ -0,0 +1 @@ +multisync-0.90.18.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/multisync/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Mar 2006 09:05:45 -0000 1.1 +++ sources 13 Mar 2006 09:11:47 -0000 1.2 @@ -0,0 +1 @@ +d55d8eaeecb825b87a25eeceaef92cb9 multisync-0.90.18.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 09:44:30 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 13 Mar 2006 04:44:30 -0500 Subject: rpms/nc6 - New directory Message-ID: <200603130944.k2D9iWbg020373@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nc6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20365/nc6 Log Message: Directory /cvs/extras/rpms/nc6 added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 09:44:36 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 13 Mar 2006 04:44:36 -0500 Subject: rpms/nc6/devel - New directory Message-ID: <200603130944.k2D9icDM020388@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nc6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20365/nc6/devel Log Message: Directory /cvs/extras/rpms/nc6/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 09:45:44 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 13 Mar 2006 04:45:44 -0500 Subject: rpms/nc6/devel Makefile,NONE,1.1 Message-ID: <200603130945.k2D9jkOq020435@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nc6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20408/nc6/devel Added Files: Makefile Log Message: fix interrupted new-module setup ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' From fedora-extras-commits at redhat.com Mon Mar 13 09:45:38 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 13 Mar 2006 04:45:38 -0500 Subject: rpms/nc6 Makefile,NONE,1.1 Message-ID: <200603130945.k2D9jeiD020419@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nc6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20408/nc6 Added Files: Makefile Log Message: fix interrupted new-module setup --- NEW FILE Makefile --- # Top level Makefile for module nc6 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Mar 13 09:46:52 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:46:52 -0500 Subject: owners owners.list,1.738,1.739 Message-ID: <200603130947.k2D9lPuv020492@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20475 Modified Files: owners.list Log Message: - add multisync Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.738 retrieving revision 1.739 diff -u -r1.738 -r1.739 --- owners.list 13 Mar 2006 08:21:03 -0000 1.738 +++ owners.list 13 Mar 2006 09:46:52 -0000 1.739 @@ -698,6 +698,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|mpc|Command-line client for MPD|gauret at free.fr|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| Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 13 10:00:51 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:00:51 -0500 Subject: rpms/gpsim/devel gpsim.spec,1.4,1.5 Message-ID: <200603131001.k2DA1NYa022537@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20666 Modified Files: gpsim.spec Log Message: Rebuild for FE5 Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gpsim.spec 13 Mar 2006 08:47:09 -0000 1.4 +++ gpsim.spec 13 Mar 2006 10:00:51 -0000 1.5 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.21.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -78,10 +78,10 @@ %{_includedir}/* %changelog -* Mon Mar 13 2006 Alain Portal 0.21.11-2 +* Mon Mar 13 2006 Alain Portal 0.21.11-3 - Rebuild for FE5 -* Thu Oct 6 2005 Alain Portal 0.21.11-1 +* Thu Oct 6 2005 Alain Portal 0.21.11-2 - Remove useless Requires * Wed Oct 5 2005 Alain Portal 0.21.11-1 From fedora-extras-commits at redhat.com Mon Mar 13 10:12:16 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:12:16 -0500 Subject: rpms/pikdev - New directory Message-ID: <200603131012.k2DACIrT022698@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22690/pikdev Log Message: Directory /cvs/extras/rpms/pikdev added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 10:12:23 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:12:23 -0500 Subject: rpms/pikdev/devel - New directory Message-ID: <200603131012.k2DACPhZ022713@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22690/pikdev/devel Log Message: Directory /cvs/extras/rpms/pikdev/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 10:12:55 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:12:55 -0500 Subject: rpms/pikdev Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603131012.k2DACvnG022747@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22735 Added Files: Makefile import.log Log Message: Setup of module pikdev --- NEW FILE Makefile --- # Top level Makefile for module pikdev all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 13 10:13:02 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:13:02 -0500 Subject: rpms/pikdev/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603131013.k2DAD4CI022765@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22735/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pikdev --- NEW 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 Mar 13 10:29:19 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:29:19 -0500 Subject: owners owners.list,1.739,1.740 Message-ID: <200603131029.k2DATp9Z022911@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22894/owners Modified Files: owners.list Log Message: Add pikdev module. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.739 retrieving revision 1.740 diff -u -r1.739 -r1.740 --- owners.list 13 Mar 2006 09:46:52 -0000 1.739 +++ owners.list 13 Mar 2006 10:29:19 -0000 1.740 @@ -1100,6 +1100,7 @@ Fedora Extras|php-pecl-sqlite|PECL package for accessing SQLite databases|matthias at rpmforge.net|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|physfs|Library to provide abstract access to various archives|tcallawa at redhat.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| Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 13 11:09:58 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Mon, 13 Mar 2006 06:09:58 -0500 Subject: rpms/nc6/devel nc6.spec,NONE,1.1 sources,NONE,1.1 Message-ID: <200603131110.k2DBA09U025020@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/nc6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25006/devel Added Files: nc6.spec sources Log Message: auto-import nc6-1.0-2 on branch devel from nc6-1.0-2.src.rpm --- NEW FILE nc6.spec --- Summary: Netcat with IPv6 Support Name: nc6 Version: 1.0 Release: 2%{?dist} Group: Applications/Internet URL: http://www.deepspace6.net/projects/netcat6.html License: GPL Source: ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description netcat6 is an IPv6-enabled clone of the original netcat utility. "Netcat is a simple Unix utility which reads and writes data across network connections. It is designed to be a reliable "back-end" tool that can be used directly or easily driven by other programs and scripts. At the same time, it is a feature-rich network debugging and exploration tool, since it can create almost any kind of connection you would need and has several interesting built-in capabilities. Netcat, or "nc" as the actual program is named, should have been supplied long ago as another one of those cryptic but standard Unix tools." %prep %setup -q %configure --prefix=%{_prefix} --mandir=%{_mandir} %build make COPTS="$RPM_OPT_FLAGS" DESTDIR="$RPM_BUILD_ROOT" %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_bindir}/%{name} %doc %{_mandir}/man1/nc6* %doc README AUTHORS COPYING NEWS TODO %changelog * Wed Mar 8 2006 Radek Vok??l 1.0-2 - clean RPM_BUILD_ROOT before install - group Application/Internet - fix BuildRoot * Tue Mar 7 2006 Radek Vok??l 1.0-1 - initial build for Fedora Extras --- NEW FILE sources --- 5074bc51989420a1f68716f93322030f nc6-1.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 11:11:45 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Mon, 13 Mar 2006 06:11:45 -0500 Subject: rpms/fish/devel fish-1.21.2-fallback.patch, NONE, 1.1 fish.spec, 1.6, 1.7 Message-ID: <200603131112.k2DBCH4X025093@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25073 Modified Files: fish.spec Added Files: fish-1.21.2-fallback.patch Log Message: * Update to 1.21.2 fish-1.21.2-fallback.patch: --- NEW FILE fish-1.21.2-fallback.patch --- diff -Nur fish-1.21.2-orig/fallback.h fish-1.21.2/fallback.h --- fish-1.21.2-orig/fallback.h 2006-03-09 13:01:19.000000000 +0100 +++ fish-1.21.2/fallback.h 2006-03-10 17:03:15.000000000 +0100 @@ -31,7 +31,7 @@ strings and decimal numbers, position (%n), field width and precision. */ -int fwprintf( FILE *f, const wchar_t *format, ... ); + /** @@ -41,7 +41,7 @@ strings and decimal numbers, position (%n), field width and precision. */ -int swprintf( wchar_t *str, size_t l, const wchar_t *format, ... ); + /** Print formated string. Some operating systems (Like NetBSD) do not @@ -50,7 +50,7 @@ strings and decimal numbers, position (%n), field width and precision. */ -int wprintf( const wchar_t *format, ... ); + /** Print formated string. Some operating systems (Like NetBSD) do not @@ -59,7 +59,7 @@ strings and decimal numbers, position (%n), field width and precision. */ -int vwprintf( const wchar_t *filter, va_list va ); + /** Print formated string. Some operating systems (Like NetBSD) do not @@ -68,7 +68,7 @@ strings and decimal numbers, position (%n), field width and precision. */ -int vfwprintf( FILE *f, const wchar_t *filter, va_list va ); + /** Print formated string. Some operating systems (Like NetBSD) do not @@ -77,31 +77,31 @@ strings and decimal numbers, position (%n), field width and precision. */ -int vswprintf( wchar_t *out, size_t n, const wchar_t *filter, va_list va ); + /** Fallback implementation of fgetwc */ -wint_t fgetwc(FILE *stream); + /** Fallback implementation of getwc */ -wint_t getwc(FILE *stream); + /** Fallback implementation of fputwc */ -wint_t fputwc(wchar_t wc, FILE *stream); + /** Fallback implementation of putwc */ -wint_t putwc(wchar_t wc, FILE *stream); + /** Fallback implementation of wcstok. Uses code borrowed from glibc. */ -wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **ptr); + /** @@ -115,15 +115,15 @@ real wcwidth. Therefore, the fallback wcwidth assumes any printing character takes up one column and anything else uses 0 columns. */ -int wcwidth( wchar_t c ); + /** Create a duplicate string. Wide string version of strdup. Will automatically exit if out of memory. */ -wchar_t *wcsdup(const wchar_t *in); -size_t wcslen(const wchar_t *in); + + /** Case insensitive string compare function. Wide string version of @@ -136,7 +136,7 @@ fish and guaranteed to be a sane, english word. Using wcscasecmp on a user-supplied string should be considered a bug. */ -int wcscasecmp( const wchar_t *a, const wchar_t *b ); + /** Case insensitive string compare function. Wide string version of @@ -149,7 +149,7 @@ fish and guaranteed to be a sane, english word. Using wcsncasecmp on a user-supplied string should be considered a bug. */ -int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count ); + /** Returns a newly allocated wide character string wich is a copy of @@ -173,9 +173,6 @@ to represent numbers higher than 9. Higher bases than 36 are not supported. */ -long wcstol(const wchar_t *nptr, - wchar_t **endptr, - int base); Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fish.spec 10 Mar 2006 14:15:32 -0000 1.6 +++ fish.spec 13 Mar 2006 11:11:44 -0000 1.7 @@ -1,15 +1,15 @@ Summary: A friendly interactive shell Name: fish -Version: 1.14.0 -Release: 2%{?dist} +Version: 1.21.2 +Release: 1%{?dist} License: GPL Group: System Environment/Shells URL: http://roo.no-ip.org/fish/ Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 -Patch0: fish-1.14.0-wutil.patch +Patch0: fish-1.21.2-fallback.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen ncurses-devel @@ -22,8 +22,7 @@ %prep %setup -q -%patch0 -p1 -b .wutil - +%patch0 -p1 -b .fallback %build @@ -34,6 +33,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR="$RPM_BUILD_ROOT" +%find_lang %{name}.\* + %clean rm -rf $RPM_BUILD_ROOT @@ -48,31 +49,38 @@ mv %_sysconfdir/fish.tmp %_sysconfdir/shells fi -%files +%files -f %{name}.\*.lang %defattr(-,root,root,-) %doc %_datadir/doc/%{name}-%{version} %_mandir/man1/fish.1* %_mandir/man1/xsel.1x* %_mandir/man1/mimedb.1* %_mandir/man1/set_color.1* -%_mandir/man1/tokenize.1* %_mandir/man1/count.1* +%_mandir/man1/fishd.1.* +%_mandir/man1/fish_pager.1.* %attr(0755,root,root) %_bindir/fish %attr(0755,root,root) %_bindir/fishd %attr(0755,root,root) %_bindir/fish_pager %attr(0755,root,root) %_bindir/xsel %attr(0755,root,root) %_bindir/set_color -%attr(0755,root,root) %_bindir/tokenize %attr(0755,root,root) %_bindir/mimedb %attr(0755,root,root) %_bindir/count +%dir %_datadir/fish/completions +%config %_datadir/fish/completions/*.fish +%dir %_datadir/fish/functions +%config %_datadir/fish/functions/*.fish +%_datadir/fish/fish %config %_sysconfdir/fish %config %_sysconfdir/fish_inputrc %dir %_sysconfdir/fish.d %config %_sysconfdir/fish.d/fish_*.fish -%dir %_sysconfdir/fish.d/completions -%config %_sysconfdir/fish.d/completions/*.fish %changelog +* Mon Mar 13 2006 Oliver Falk - 1.21.2-1 +- Update +- Applied patch provided by Michael Schwendt + * Fri Mar 10 2006 Oliver Falk - 1.14.0-2 - Fix buildreqs - Fix wutil.h From fedora-extras-commits at redhat.com Mon Mar 13 11:14:11 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Mon, 13 Mar 2006 06:14:11 -0500 Subject: owners owners.list,1.740,1.741 Message-ID: <200603131114.k2DBEis5025165@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25148 Modified Files: owners.list Log Message: nc6 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.740 retrieving revision 1.741 diff -u -r1.740 -r1.741 --- owners.list 13 Mar 2006 10:29:19 -0000 1.740 +++ owners.list 13 Mar 2006 11:14:10 -0000 1.741 @@ -714,6 +714,7 @@ Fedora Extras|nautilus-search-tool|A Nautilus extension to put "Search for Files" on the context menu of folders|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|nautilus-sendto|Nautilus context menu for sending files|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|nazghul|A computer role-playing game (CRPG) engine|tibbs at math.uh.edu|extras-qa at fedoraproject.org| +Fedora Extras|nc6|IPv6-enabled clone of the original netcat utility.|rvokal at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ncarg|A Fortran and C based software package for scientific visualization|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|ncftp|Improved console FTP client|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ncmpc|A curses client for the Music Player Daemon (MPD)|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 13 11:26:03 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Mon, 13 Mar 2006 06:26:03 -0500 Subject: rpms/nc6/devel Makefile,1.1,1.2 Message-ID: <200603131126.k2DBQZ0e025310@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/nc6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25293 Modified Files: Makefile Log Message: - fix broken makefile Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/nc6/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 13 Mar 2006 09:45:44 -0000 1.1 +++ Makefile 13 Mar 2006 11:26:03 -0000 1.2 @@ -1,6 +1,6 @@ # Makefile for source rpm: nc6 # $Id$ -NAME := wine-docs +NAME := nc6 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Mon Mar 13 11:28:24 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Mon, 13 Mar 2006 06:28:24 -0500 Subject: rpms/nc6/devel nc6.spec,1.1,1.2 Message-ID: <200603131128.k2DBSule025368@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/nc6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25351 Modified Files: nc6.spec Log Message: add dist and rebuilt Index: nc6.spec =================================================================== RCS file: /cvs/extras/rpms/nc6/devel/nc6.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nc6.spec 13 Mar 2006 11:09:56 -0000 1.1 +++ nc6.spec 13 Mar 2006 11:28:24 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Netcat with IPv6 Support Name: nc6 Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Internet URL: http://www.deepspace6.net/projects/netcat6.html License: GPL @@ -42,6 +42,9 @@ %doc README AUTHORS COPYING NEWS TODO %changelog +* Mon Mar 13 2006 Radek Vok??l 1.0-3 +- add ?dist and rebuilt in extras + * Wed Mar 8 2006 Radek Vok??l 1.0-2 - clean RPM_BUILD_ROOT before install - group Application/Internet From fedora-extras-commits at redhat.com Mon Mar 13 13:05:47 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 08:05:47 -0500 Subject: extras-buildsys/server main.py,1.19,1.20 Message-ID: <200603131305.k2DD5lAa029487@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29469/server Modified Files: main.py Log Message: Don't try stopping the traceback server if it's not enabled Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- main.py 12 Mar 2006 05:44:35 -0000 1.19 +++ main.py 13 Mar 2006 13:05:38 -0000 1.20 @@ -183,7 +183,8 @@ print "Shutting down..." bm.stop() srpm_server.stop() - tbs.stop() + if use_tbs: + tbs.stop() if opts.pidfile: os.unlink(opts.pidfile) From fedora-extras-commits at redhat.com Mon Mar 13 13:07:40 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 08:07:40 -0500 Subject: extras-buildsys/server main.py,1.14.2.4,1.14.2.5 Message-ID: <200603131307.k2DD7eji029521@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29503/server Modified Files: Tag: STABLE_0_4 main.py Log Message: Don't try stopping the traceback server if it's not enabled Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.14.2.4 retrieving revision 1.14.2.5 diff -u -r1.14.2.4 -r1.14.2.5 --- main.py 12 Mar 2006 05:53:13 -0000 1.14.2.4 +++ main.py 13 Mar 2006 13:07:31 -0000 1.14.2.5 @@ -183,7 +183,8 @@ print "Shutting down..." bm.stop() srpm_server.stop() - tbs.stop() + if use_tbs: + tbs.stop() if opts.pidfile: os.unlink(opts.pidfile) From fedora-extras-commits at redhat.com Mon Mar 13 13:27:15 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 13 Mar 2006 08:27:15 -0500 Subject: rpms/geomview/FC-4 geomview.desktop,1.2,1.3 geomview.spec,1.7,1.8 Message-ID: <200603131327.k2DDRlht029659@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/geomview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29640 Modified Files: geomview.desktop geomview.spec Log Message: * Mon Mar 13 2006 Rex Dieter 1.8.3-0.3.cvs20040221 - drop deprecated BR: libGL.so.1,libGLU.so.1 bits - ExcludeArch: x86_64 (#182625) - .desktop: MimeType: application/x-geomview Index: geomview.desktop =================================================================== RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geomview.desktop 3 Jan 2006 15:11:53 -0000 1.2 +++ geomview.desktop 13 Mar 2006 13:27:14 -0000 1.3 @@ -3,7 +3,7 @@ Comment=An interactive 3D viewing program Exec=geomview Icon=geomview -#MimeType=application/x-geomview +MimeType=application/x-geomview Type=Application Encoding=UTF-8 Categories=Application;Graphics;Scientific;Education;Math; Index: geomview.spec =================================================================== RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- geomview.spec 3 Jan 2006 19:51:43 -0000 1.7 +++ geomview.spec 13 Mar 2006 13:27:14 -0000 1.8 @@ -9,7 +9,7 @@ Name: geomview Summary: Interactive 3D viewing program Version: 1.8.2 -Release: 0.2.cvs%{cvs}%{?dist}.1 +Release: 0.3.cvs%{cvs}%{?dist} License: LGPL Url: http://www.geomview.org/ @@ -18,6 +18,8 @@ #Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.gz Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# http://bugzilla.redhat.com/bugzilla/182625 +ExcludeArch: x86_64 Obsoletes: %{name}-plugins < %{version}-%{release} Provides: %{name}-plugins = %{version}-%{release} @@ -41,11 +43,7 @@ BuildRequires: openmotif-devel BuildRequires: xforms-devel ## X/GL support -%if "%{?fedora}" > "3" BuildRequires: libGL-devel libGLU-devel -%else -BuildRequires: libGL.so.1 libGLU.so.1 -%endif Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -173,12 +171,11 @@ rm -rf $RPM_BUILD_ROOT -%POST +%post /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||: -for icon_theme in hicolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||: +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: %preun if [ $1 -eq 0 ] ;then @@ -186,10 +183,9 @@ fi %postun -for icon_theme in hicolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||: +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: %files @@ -249,6 +245,14 @@ %changelog +* Mon Mar 13 2006 Rex Dieter 1.8.3-0.3.cvs20040221 +- drop deprecated BR: libGL.so.1,libGLU.so.1 bits +- ExcludeArch: x86_64 (#182625) +- .desktop: MimeType: application/x-geomview + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + * Tue Jan 03 2006 Rex Dieter 1.8.2-0.2.cvs20040221 - rework Obsoletes/Provides: geomview-plugins From fedora-extras-commits at redhat.com Mon Mar 13 13:28:34 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 13 Mar 2006 08:28:34 -0500 Subject: fedora-security/audit fc5,1.78,1.79 Message-ID: <200603131328.k2DDSYL0029717@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29631 Modified Files: fc5 Log Message: Fill in the missing issues that needed work Check all FC5 VULNERABLEs; most are fixed in rawhide hence will be okay in FC5 when released; some others don't have fixes yet (especially the browser suite stuff) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- fc5 9 Mar 2006 12:04:35 -0000 1.78 +++ fc5 13 Mar 2006 13:28:27 -0000 1.79 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060308 +Up to date CVE as of CVE email 20060312 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -24,17 +24,20 @@ CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0975 version (flex) by inspection -CVE-2006-0903 VULNERABLE (mysql) -CVE-2006-0884 ** thunderbird +CVE-2006-0903 VULNERABLE (mysql) low/not upstream yet +CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) -CVE-2006-0746 VULNERABLE (kpdf) +CVE-2006-0746 version (kdegraphics, fixed 3.4) +CVE-2006-0742 VULNERABLE (kernel) [fixed rawhide 1.2045] +CVE-2006-0741 VULNERABLE (kernel, fixed 2.6.15.5) [fixed rawhide 1.2045] CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 ignore (postgresql) we don't build --enable-cassert 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-0557 VULNERABLE (kernel, fixed 2.6.15.6) [fixed rawhide 1.2045] CVE-2006-0553 version (postgresql, only 8.1, fixed 8.1.3) -CVE-2006-0528 VULNERABLE (evolution) bz#182416 +CVE-2006-0528 VULNERABLE (cairo) bz#182416 [fixed rawhide cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch] CVE-2006-0496 VULNERABLE (mozilla) not fixed upstream CVE-2006-0496 VULNERABLE (firefox) not fixed upstream CVE-2006-0482 ignore (kernel) sparc only @@ -48,7 +51,7 @@ CVE-2006-0301 backport (xpdf) xpdf-3.01pl2.patch CVE-2006-0301 version (poppler, fixed 0.4.5) CVE-2006-0301 backport (kdegraphics) post-3.5.1-kdegraphics-CVE-2006-0301.diff -CVE-2006-0300 VULNERABLE (tar) +CVE-2006-0300 VULNERABLE (tar) [fixed rawhide in tar-1.15.1-13] CVE-2006-0299 version (firefox, fixed 1.5.0.1) CVE-2006-0299 version (mozilla, 1.8 branch only) CVE-2006-0299 version (thunderbird, fixed 1.5) @@ -87,6 +90,7 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) patch-2.6.16-rc3 CVE-2006-0082 version (ImageMagick, not 6.2.5.4) +CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 CVE-2006-0035 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 @@ -95,8 +99,8 @@ CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS CVE-2005-4720 version (firefox, fixed 1.5) CVE-2005-4720 versoin (thunderbird, fixed 1.5) -CVE-2005-4685 VULNERABLE (mozilla) -CVE-2005-4685 VULNERABLE (firefox) +CVE-2005-4685 VULNERABLE (mozilla) not fixed upstream +CVE-2005-4685 VULNERABLE (firefox) not fixed upstream CVE-2005-4684 VULNERABLE (kdebase) not fixed upstream CVE-2005-4667 backport (unzip) CVE-2005-4639 version (kernel, fixed 2.6.15) @@ -142,7 +146,7 @@ CVE-2005-3651 version (ethereal, fixed 0.10.14) CVE-2005-3632 version (netpbm) CVE-2005-3631 version (udev) -CVE-2005-3629 ** initscripts +CVE-2005-3629 version (initscripts, fixed 8.29 at least) CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3628 version (poppler, fixed 0.4.4) @@ -555,7 +559,6 @@ CVE-2005-0752 version (firefox, fixed 1.0.3) CVE-2005-0750 version (kernel, fixed 2.6.11.6) CVE-2005-0749 version (kernel, fixed 2.6.11.6) -CVE-2006-0741 VULNERABLE (kernel, fixed 2.6.15.5) CVE-2005-0739 version (ethereal, fixed after 0.10.9) CVE-2005-0736 version (kernel, fixed 2.6.11) CVE-2005-0718 version (squid, fixed 2.5.STABLE8) @@ -724,7 +727,7 @@ CVE-2005-0069 backport (vim) vim-6.4-tmpfile.patch CVE-2005-0064 version (xpdf, fixed 3.0.1) CVE-2005-0064 version (tetex, fixed 3.0) -CVE-2005-0064 version (kpdf, not 3.4) +CVE-2005-0064 version (kdegraphics, not 3.4) CVE-2005-0064 backport (cups) cups-CAN-2005-0064.patch CVE-2005-0039 ignore (kernel) not a vulnerability: don't do this says the rfc CVE-2005-0034 version (bind, fixed after 9.3.0) @@ -961,7 +964,7 @@ CVE-2004-0832 version (squid, fixed 2.5.STABLE7) CVE-2004-0829 version (samba, fixed 2.2.11) CVE-2004-0827 version (ImageMagick, fixed 6.0.6.2) -CVE-2004-0826 ** NSS +CVE-2004-0826 verson (nss, fixed 3.9.2) CVE-2004-0823 version (openldap, fixed after 2.1.19) CVE-2004-0817 version (imlib, fixed 2.1.20 at least) CVE-2004-0816 version (kernel, fixed 2.6.8) From fedora-extras-commits at redhat.com Mon Mar 13 13:55:45 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 13 Mar 2006 08:55:45 -0500 Subject: rpms/lyx/FC-4 helpers.sh,1.2,1.3 Message-ID: <200603131356.k2DDuIGN029845@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29828 Modified Files: helpers.sh Log Message: * Thu Mar 09 2006 Rex Dieter 1.4.0-4 - fix stripping of -fexceptions from %optflags Index: helpers.sh =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/helpers.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- helpers.sh 10 Mar 2006 18:51:26 -0000 1.2 +++ helpers.sh 13 Mar 2006 13:55:45 -0000 1.3 @@ -1,5 +1,4 @@ #!/bin/bash -# $Id$ if [ -f /etc/lyx.conf ]; then source /etc/helpers.conf From fedora-extras-commits at redhat.com Mon Mar 13 15:17:57 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:17:57 -0500 Subject: extras-buildsys/builder builder.py,1.44.2.8,1.44.2.9 Message-ID: <200603131517.k2DFHvCb001711@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1654/builder Modified Files: Tag: STABLE_0_4 builder.py Log Message: 2006-03-13 Dan Williams * Release of 0.4.4.1 * builder/builder.py - (main): Fix usage of handle_request when serve_forever was intended Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.44.2.8 retrieving revision 1.44.2.9 diff -u -r1.44.2.8 -r1.44.2.9 --- builder.py 12 Mar 2006 05:52:54 -0000 1.44.2.8 +++ builder.py 13 Mar 2006 15:17:49 -0000 1.44.2.9 @@ -915,7 +915,7 @@ signal.signal(signal.SIGTERM, exit_handler) try: - bserver.handle_request() + bserver.serve_forever() except KeyboardInterrupt, e: bserver.server_close() From fedora-extras-commits at redhat.com Mon Mar 13 15:17:51 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:17:51 -0500 Subject: extras-buildsys ChangeLog, 1.126.2.44, 1.126.2.45 plague.spec, 1.27.2.5, 1.27.2.6 Message-ID: <200603131518.k2DFIL8N001715@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1654 Modified Files: Tag: STABLE_0_4 ChangeLog plague.spec Log Message: 2006-03-13 Dan Williams * Release of 0.4.4.1 * builder/builder.py - (main): Fix usage of handle_request when serve_forever was intended Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.44 retrieving revision 1.126.2.45 diff -u -r1.126.2.44 -r1.126.2.45 --- ChangeLog 13 Mar 2006 04:30:08 -0000 1.126.2.44 +++ ChangeLog 13 Mar 2006 15:17:43 -0000 1.126.2.45 @@ -1,3 +1,10 @@ +2006-03-13 Dan Williams + + * Release of 0.4.4.1 + + * builder/builder.py + - (main): Fix usage of handle_request when serve_forever was intended + 2006-03-12 Dan Williams * Release of 0.4.4 Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.27.2.5 retrieving revision 1.27.2.6 diff -u -r1.27.2.5 -r1.27.2.6 --- plague.spec 13 Mar 2006 04:30:08 -0000 1.27.2.5 +++ plague.spec 13 Mar 2006 15:17:43 -0000 1.27.2.6 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.4 +Version: 0.4.4.1 Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo +Requires: python-sqlite, createrepo >= 0.4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -120,7 +120,8 @@ %files common %defattr(-, root, root) %doc README ChangeLog -/usr/lib/python?.?/site-packages/plague/*.py* +%dir /usr/lib/python?.?/site-packages/%{name} +/usr/lib/python?.?/site-packages/%{name}/*.py* %files builder %defattr(-, root, root) @@ -144,6 +145,10 @@ %changelog +* Mon Mar 13 2006 Dan Williams 0.4.4.1-1 +- Update to 0.4.4.1 +- Fix createrepo dep to >= 0.4.3 (#rh170531) + * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve @@ -153,6 +158,8 @@ - Ensure jobs don't hang around on builders if they get left there for some reason (ie, server didn't unlock repo for the job) - Make Additional Package Arches really work (kmod support) +- Own /usr/lib/python?.?/site-packages/plague (#rh172794#) +- Require createrepo >= 4.3 (#rh170531#) * Tue Jan 24 2006 Dan Williams 0.4.3-6 - Increase build server builder thread sleep time to work around SSL issues From fedora-extras-commits at redhat.com Mon Mar 13 15:19:34 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:19:34 -0500 Subject: extras-buildsys/builder builder.py,1.52,1.53 Message-ID: <200603131519.k2DFJYwM001760@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1726/builder Modified Files: builder.py Log Message: 2006-03-13 Dan Williams * builder/builder.py - (main): Fix usage of handle_request when serve_forever was intended Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- builder.py 12 Mar 2006 05:44:19 -0000 1.52 +++ builder.py 13 Mar 2006 15:19:27 -0000 1.53 @@ -915,7 +915,7 @@ signal.signal(signal.SIGTERM, exit_handler) try: - bserver.handle_request() + bserver.serve_forever() except KeyboardInterrupt, e: bserver.server_close() From fedora-extras-commits at redhat.com Mon Mar 13 15:19:29 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:19:29 -0500 Subject: extras-buildsys ChangeLog,1.174,1.175 Message-ID: <200603131519.k2DFJxRM001763@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1726 Modified Files: ChangeLog Log Message: 2006-03-13 Dan Williams * builder/builder.py - (main): Fix usage of handle_request when serve_forever was intended Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- ChangeLog 13 Mar 2006 03:45:43 -0000 1.174 +++ ChangeLog 13 Mar 2006 15:19:21 -0000 1.175 @@ -1,3 +1,8 @@ +2006-03-13 Dan Williams + + * builder/builder.py + - (main): Fix usage of handle_request when serve_forever was intended + 2006-03-12 Dan Williams Fix up kmod support. From fedora-extras-commits at redhat.com Mon Mar 13 15:30:00 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:30:00 -0500 Subject: rpms/plague/devel .cvsignore, 1.10, 1.11 plague.spec, 1.26, 1.27 sources, 1.24, 1.25 Message-ID: <200603131530.k2DFUWT9001830@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1807 Modified Files: .cvsignore plague.spec sources Log Message: * Mon Mar 13 2006 Dan Williams 0.4.4.1-1 - Update to 0.4.4.1 - Fix createrepo dep to >= 0.4.3 (#rh170531) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plague/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Mar 2006 04:36:56 -0000 1.10 +++ .cvsignore 13 Mar 2006 15:30:00 -0000 1.11 @@ -7,3 +7,4 @@ plague-0.4.2.tar.bz2 plague-0.4.3.tar.bz2 plague-0.4.4.tar.bz2 +plague-0.4.4.1.tar.bz2 Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- plague.spec 13 Mar 2006 04:36:56 -0000 1.26 +++ plague.spec 13 Mar 2006 15:30:00 -0000 1.27 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.4 +Version: 0.4.4.1 Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo >= 4.3 +Requires: python-sqlite, createrepo >= 0.4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -145,6 +145,10 @@ %changelog +* Mon Mar 13 2006 Dan Williams 0.4.4.1-1 +- Update to 0.4.4.1 +- Fix createrepo dep to >= 0.4.3 (#rh170531) + * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 13 Mar 2006 04:36:56 -0000 1.24 +++ sources 13 Mar 2006 15:30:00 -0000 1.25 @@ -1 +1 @@ -eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 +0eb43e25cdd8d630759d010115101956 plague-0.4.4.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 15:35:57 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:35:57 -0500 Subject: rpms/plague/FC-4 plague.spec,1.23,1.24 sources,1.22,1.23 Message-ID: <200603131536.k2DFaT23001912@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1893 Modified Files: plague.spec sources Log Message: Update from devel branch Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- plague.spec 13 Mar 2006 04:40:05 -0000 1.23 +++ plague.spec 13 Mar 2006 15:35:57 -0000 1.24 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.4 +Version: 0.4.4.1 Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo >= 4.3 +Requires: python-sqlite, createrepo >= 0.4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -145,6 +145,10 @@ %changelog +* Mon Mar 13 2006 Dan Williams 0.4.4.1-1 +- Update to 0.4.4.1 +- Fix createrepo dep to >= 0.4.3 (#rh170531) + * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/FC-4/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 13 Mar 2006 04:40:05 -0000 1.22 +++ sources 13 Mar 2006 15:35:57 -0000 1.23 @@ -1 +1 @@ -eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 +0eb43e25cdd8d630759d010115101956 plague-0.4.4.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 15:38:13 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:38:13 -0500 Subject: rpms/plague/FC-3 plague.spec,1.23,1.24 sources,1.22,1.23 Message-ID: <200603131538.k2DFcjCj001980@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1961 Modified Files: plague.spec sources Log Message: Update from devel branch Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- plague.spec 13 Mar 2006 04:42:55 -0000 1.23 +++ plague.spec 13 Mar 2006 15:38:13 -0000 1.24 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.4 +Version: 0.4.4.1 Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo >= 4.3 +Requires: python-sqlite, createrepo >= 0.4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -145,6 +145,10 @@ %changelog +* Mon Mar 13 2006 Dan Williams 0.4.4.1-1 +- Update to 0.4.4.1 +- Fix createrepo dep to >= 0.4.3 (#rh170531) + * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/FC-3/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 13 Mar 2006 04:42:55 -0000 1.22 +++ sources 13 Mar 2006 15:38:13 -0000 1.23 @@ -1 +1 @@ -eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 +0eb43e25cdd8d630759d010115101956 plague-0.4.4.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 15:40:53 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 13 Mar 2006 10:40:53 -0500 Subject: rpms/yumex/devel .cvsignore, 1.16, 1.17 sources, 1.19, 1.20 yumex.spec, 1.20, 1.21 Message-ID: <200603131541.k2DFfPI1002103@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2079 Modified Files: .cvsignore sources yumex.spec Log Message: Release 0.99.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 2 Mar 2006 10:09:39 -0000 1.16 +++ .cvsignore 13 Mar 2006 15:40:53 -0000 1.17 @@ -1 +1 @@ -yumex-0.99.11.tar.gz +yumex-0.99.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 2 Mar 2006 10:09:39 -0000 1.19 +++ sources 13 Mar 2006 15:40:53 -0000 1.20 @@ -1 +1 @@ -cad44f4f35d0df846a25cb56a08ecad5 yumex-0.99.11.tar.gz +13564e96536b7e935ea5ee16eece3d3c yumex-0.99.12.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- yumex.spec 2 Mar 2006 10:09:39 -0000 1.20 +++ yumex.spec 13 Mar 2006 15:40:53 -0000 1.21 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.11 +Version: 0.99.12 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -24,7 +24,7 @@ %prep -%setup +%setup -q %build @@ -65,6 +65,9 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 +- Development Release 0.99.12-1.0 +- Added '-q' option to setup * Tue Feb 28 2006 Tim Lauridsen - 0.99.11-1.0 - Development Release 0.99.11-1.0 * Tue Feb 15 2006 Tim Lauridsen - 0.99.10-1.0 From fedora-extras-commits at redhat.com Mon Mar 13 15:58:42 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 10:58:42 -0500 Subject: rpms/erlang/FC-4 erlang.spec,1.6,1.7 Message-ID: <200603131559.k2DFxE0G002259@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225/FC-4 Modified Files: erlang.spec Log Message: new version Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- erlang.spec 13 Mar 2006 08:56:45 -0000 1.6 +++ erlang.spec 13 Mar 2006 15:58:42 -0000 1.7 @@ -14,9 +14,14 @@ Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel, openssl-devel, flex, unixODBC-devel -BuildRequires: tcl-devel, tk-devel + +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: unixODBC-devel +BuildRequires: tcl-devel +BuildRequires: tk-devel BuildRequires: java-1.4.2-gcj-compat-devel +BuildRequires: flex Requires: tk From fedora-extras-commits at redhat.com Mon Mar 13 15:58:48 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 10:58:48 -0500 Subject: rpms/erlang/devel .cvsignore, 1.4, 1.5 erlang.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200603131559.k2DFxKKb002264@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225/devel Modified Files: .cvsignore erlang.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2006 23:29:12 -0000 1.4 +++ .cvsignore 13 Mar 2006 15:58:48 -0000 1.5 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-9.tar.gz -otp_doc_man_R10B-9.tar.gz -otp_src_R10B-9.tar.gz +otp_doc_html_R10B-10.tar.gz +otp_doc_man_R10B-10.tar.gz +otp_src_R10B-10.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- erlang.spec 17 Feb 2006 23:32:19 -0000 1.9 +++ erlang.spec 13 Mar 2006 15:58:48 -0000 1.10 @@ -1,14 +1,14 @@ Name: erlang Version: R10B -Release: 9.2%{?dist} +Release: 10.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-9.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-9.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-9.tar.gz +Source: http://www.erlang.org/download/otp_src_R10B-10.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R10B-10.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R10B-10.tar.gz Patch: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -41,7 +41,7 @@ %prep -%setup -q -n otp_src_R10B-9 +%setup -q -n otp_src_R10B-10 %patch -p1 %patch1 -p1 %patch2 -p1 @@ -99,6 +99,9 @@ %changelog +* Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 +- new version R10B-10 + * Thu Dec 29 2005 Gerard Milmeister - R10B-9.1 - New Version R10B-9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2006 23:29:12 -0000 1.4 +++ sources 13 Mar 2006 15:58:48 -0000 1.5 @@ -1,3 +1,3 @@ -108bc01be67aaa2edde9a0331ef9bc71 otp_doc_html_R10B-9.tar.gz -051cd9893b36313f20a420bc2491905c otp_doc_man_R10B-9.tar.gz -05791e9097f36202eb705df2a1db6500 otp_src_R10B-9.tar.gz +d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz +207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz +c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 16:07:24 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 11:07:24 -0500 Subject: rpms/bigloo/FC-4 .cvsignore, 1.3, 1.4 bigloo.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603131607.k2DG7uJN004277@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4248 Modified Files: .cvsignore bigloo.spec sources Log Message: new version 2.8a Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Nov 2005 22:44:55 -0000 1.3 +++ .cvsignore 13 Mar 2006 16:07:23 -0000 1.4 @@ -1 +1 @@ -bigloo2.7a.tar.gz +bigloo2.8a-alpha13Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/bigloo.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bigloo.spec 28 Nov 2005 10:14:27 -0000 1.4 +++ bigloo.spec 13 Mar 2006 16:07:24 -0000 1.5 @@ -1,18 +1,23 @@ %define _with_java 1 Name: bigloo -Version: 2.7a -Release: 2%{?dist} +Version: 2.8a +Release: 1.20060313%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.7a.tar.gz +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha13Mar06.tar.gz Patch0: bigloo-bmem.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: emacs, emacs-el, xemacs, xemacs-el, /sbin/install-info -BuildRequires: zip, java-1.4.2-gcj-compat-devel +BuildRequires: emacs +BuildRequires: emacs-el +BuildRequires: xemacs +BuildRequires: xemacs-el +BuildRequires: /sbin/install-info +BuildRequires: zip +BuildRequires: java-1.4.2-gcj-compat-devel Requires: bigloo-libs = %{version}-%{release} Requires(post): /sbin/install-info Requires(postun): /sbin/install-info @@ -65,7 +70,7 @@ %prep %setup -q -n %{name}%{version} # disable bmem for now -%patch0 -p1 +# %patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -96,10 +101,13 @@ # _smp_mflags breaks the build env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make DESTDIR=%{inplace} install -env LD_LIBRARY_PATH=%{inplace}%{_libdir} \ +env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + PATH=`pwd`/bin:$PATH \ BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make compile-bee @@ -195,6 +203,9 @@ %changelog +* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1 +- new version 2.8a-20060313 + * Mon Nov 28 2005 Gerard Milmeister - 2.7a-2 - disable bmem, causes link problems Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Nov 2005 22:44:55 -0000 1.3 +++ sources 13 Mar 2006 16:07:24 -0000 1.4 @@ -1 +1 @@ -92606b9dc7444ff13c17cdda3f008824 bigloo2.7a.tar.gz +c545f654bfcc274a0eec5382ab00f58e bigloo2.8a-alpha13Mar06.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 16:18:42 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 11:18:42 -0500 Subject: rpms/erlang/devel erlang.spec,1.10,1.11 otp-glibc24.patch,1.2,1.3 Message-ID: <200603131619.k2DGJEW0004419@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4385 Modified Files: erlang.spec otp-glibc24.patch Log Message: Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- erlang.spec 13 Mar 2006 15:58:48 -0000 1.10 +++ erlang.spec 13 Mar 2006 16:18:42 -0000 1.11 @@ -1,6 +1,6 @@ Name: erlang Version: R10B -Release: 10.1%{?dist} +Release: 10.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -13,6 +13,7 @@ Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch +Patch4: otp-glibc24.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -46,6 +47,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build otp-glibc24.patch: Index: otp-glibc24.patch =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/otp-glibc24.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- otp-glibc24.patch 2 Nov 2005 21:28:29 -0000 1.2 +++ otp-glibc24.patch 13 Mar 2006 16:18:42 -0000 1.3 @@ -1,11 +1,11 @@ ---- otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c.glibc24 2005-09-06 22:01:13.000000000 +0200 -+++ otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c 2005-09-06 22:01:36.000000000 +0200 +--- otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c.glibc24 2006-03-13 17:16:39.000000000 +0100 ++++ otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c 2006-03-13 17:17:11.000000000 +0100 @@ -27,7 +27,7 @@ #include #include "hipe_signal.h" -#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3 -+#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) ++#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 4 /* See comment below for glibc 2.2. */ + #ifndef __USE_GNU #define __USE_GNU /* to un-hide RTLD_NEXT */ - #include From fedora-extras-commits at redhat.com Mon Mar 13 16:33:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 11:33:54 -0500 Subject: rpms/bigloo/devel .cvsignore, 1.3, 1.4 bigloo.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200603131634.k2DGYQn5004679@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4658 Modified Files: .cvsignore bigloo.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Nov 2005 23:18:00 -0000 1.3 +++ .cvsignore 13 Mar 2006 16:33:53 -0000 1.4 @@ -1 +1 @@ -bigloo2.7a.tar.gz +bigloo2.8a-alpha13Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/bigloo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bigloo.spec 7 Mar 2006 20:19:29 -0000 1.5 +++ bigloo.spec 13 Mar 2006 16:33:53 -0000 1.6 @@ -1,18 +1,23 @@ %define _with_java 1 Name: bigloo -Version: 2.7a -Release: 4%{?dist} +Version: 2.8a +Release: 1.20060313%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.7a.tar.gz +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha13Mar06.tar.gz Patch0: bigloo-bmem.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: emacs, emacs-el, xemacs, xemacs-el, /sbin/install-info -BuildRequires: zip, java-1.4.2-gcj-compat-devel +BuildRequires: emacs +BuildRequires: emacs-el +BuildRequires: xemacs +BuildRequires: xemacs-el +BuildRequires: /sbin/install-info +BuildRequires: zip +BuildRequires: java-1.4.2-gcj-compat-devel Requires: bigloo-libs = %{version}-%{release} Requires(post): /sbin/install-info Requires(postun): /sbin/install-info @@ -65,7 +70,7 @@ %prep %setup -q -n %{name}%{version} # disable bmem for now -#%patch0 -p1 +# %patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -90,17 +95,19 @@ %{!?_with_java: --jvm=no} \ --sharedbde=yes \ --sharedcompiler=yes \ - --coflags="$RPM_OPT_FLAGS" \ - --cpicflags="-fPIC" + --coflags="$RPM_OPT_FLAGS" perl -pi -e 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config # _smp_mflags breaks the build env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make DESTDIR=%{inplace} install -env LD_LIBRARY_PATH=%{inplace}%{_libdir} \ +env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + PATH=`pwd`/bin:$PATH \ BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make compile-bee @@ -196,8 +203,8 @@ %changelog -* Tue Feb 28 2006 Gerard Milmeister - 2.7a-3 -- Rebuild for Fedora Extras 5 +* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1 +- new version 2.8a-20060313 * Mon Nov 28 2005 Gerard Milmeister - 2.7a-2 - disable bmem, causes link problems Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Nov 2005 23:18:00 -0000 1.3 +++ sources 13 Mar 2006 16:33:53 -0000 1.4 @@ -1 +1 @@ -92606b9dc7444ff13c17cdda3f008824 bigloo2.7a.tar.gz +c545f654bfcc274a0eec5382ab00f58e bigloo2.8a-alpha13Mar06.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 16:54:45 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 13 Mar 2006 11:54:45 -0500 Subject: rpms/hdf5/devel hdf5-1.6.5-flags.patch,NONE,1.1 hdf5.spec,1.8,1.9 Message-ID: <200603131655.k2DGtHcb004881@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4855 Modified Files: hdf5.spec Added Files: hdf5-1.6.5-flags.patch Log Message: Add patch to avoid HDF setting the compiler flags hdf5-1.6.5-flags.patch: --- NEW FILE hdf5-1.6.5-flags.patch --- --- hdf5-1.6.5/config/linux-gnulibc1.orig 2005-10-28 14:15:27.000000000 -0600 +++ hdf5-1.6.5/config/linux-gnulibc1 2006-03-13 09:49:37.000000000 -0700 @@ -25,14 +25,5 @@ CC_BASENAME=gcc fi -# Figure out GNU C compiler flags -. $srcdir/config/gnu-flags - -# Figure out PGI C compiler flags -. $srcdir/config/pgi-flags - -# Figure out Intel C compiler flags -. $srcdir/config/intel-flags - # Check MPICH settings . $srcdir/config/mpich --- hdf5-1.6.5/fortran/config/linux-gnulibc1.orig 2006-03-13 09:39:23.000000000 -0700 +++ hdf5-1.6.5/fortran/config/linux-gnulibc1 2006-03-13 09:47:18.000000000 -0700 @@ -25,16 +25,6 @@ CC_BASENAME=gcc fi -# Figure out GNU C compiler flags -. $srcdir/config/gnu-flags - -# Figure out PGI C compiler flags -. $srcdir/config/pgi-flags - -# Figure out Intel C compiler flags -. $srcdir/config/intel-flags - - # The default Fortran 90 compiler if test "X-" = "X-$F9X"; then case $CC_BASENAME in Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hdf5.spec 13 Feb 2006 18:50:15 -0000 1.8 +++ hdf5.spec 13 Mar 2006 16:54:44 -0000 1.9 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -12,6 +12,7 @@ Patch3: hdf5-1.6.4-testh5repack.patch Patch4: hdf5-1.6.5-h5diff_attr.patch Patch5: hdf5-1.6.4-ppc.patch +Patch6: hdf5-1.6.5-flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time @@ -40,6 +41,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 -b .flags %build autoconf @@ -96,6 +98,9 @@ %{_libdir}/*.mod %changelog +* Mon Mar 13 2006 Orion Poplawski 1.6.5-4 +- Add patch to avoid HDF setting the compiler flags + * Mon Feb 13 2006 Orion Poplawski 1.6.5-3 - Rebuild for gcc/glibc changes From fedora-extras-commits at redhat.com Mon Mar 13 17:27:54 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 13 Mar 2006 12:27:54 -0500 Subject: rpms/apollon/devel apollon-1.0.1-firstrun.patch, NONE, 1.1 apollon.spec, 1.4, 1.5 Message-ID: <200603131728.k2DHSR7M007717@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/apollon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7697 Modified Files: apollon.spec Added Files: apollon-1.0.1-firstrun.patch Log Message: * Mon Mar 13 2006 Rex Dieter 1.0.1-5 - firstrun patch (#185258) apollon-1.0.1-firstrun.patch: --- NEW FILE apollon-1.0.1-firstrun.patch --- --- apollon-1.0.1/apollon/firstrun.ui.h.firstrun 2004-10-13 11:33:15.000000000 -0500 +++ apollon-1.0.1/apollon/firstrun.ui.h 2006-03-13 10:53:45.000000000 -0600 @@ -51,7 +51,7 @@ //where are the plugins installed? QDir installedPath ("/usr/share/giFT/giftd.conf.template"); - if (installedPath.exists()) { + if (QFile::exists(installedPath.path())) { installedPath = "/usr/share/giFT/"; } else { Index: apollon.spec =================================================================== RCS file: /cvs/extras/rpms/apollon/devel/apollon.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apollon.spec 1 Mar 2006 16:43:57 -0000 1.4 +++ apollon.spec 13 Mar 2006 17:27:54 -0000 1.5 @@ -2,7 +2,7 @@ Summary: Filesharing client Name: apollon Version: 1.0.1 -Release: 4%{?dist}.2 +Release: 5%{?dist} License: GPL Group: Applications/Internet @@ -13,13 +13,13 @@ # Fix Name/GenericName, append ; to Categories, # remove lines containing non UTF-8 chars ([de] entries) Patch1: apollon-1.0.1-dtfix.patch +# http://bugzilla.redhat.com/bugzilla/185258 +Patch2: apollon-1.0.1-firstrun.patch BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: gift-devel - -BuildRequires: qt-devel >= 1:3.3 -BuildRequires: kdelibs-devel >= 6:3.3 +BuildRequires: kdelibs-devel %description A filesharing client which uses giFT. @@ -29,12 +29,11 @@ %setup -q %patch1 -p1 -b .dtfix - +%patch2 -p1 -b .firstrun %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-rpath \ @@ -49,11 +48,10 @@ make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --delete-original --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category Application \ - --add-category X-Fedora \ +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ + --vendor="fedora" --delete-original \ + --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop ## File lists @@ -110,6 +108,9 @@ %changelog +* Mon Mar 13 2006 Rex Dieter 1.0.1-5 +- firstrun patch (#185258) + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Mon Mar 13 17:41:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 13 Mar 2006 12:41:30 -0500 Subject: rpms/apollon/FC-4 apollon-1.0.1-firstrun.patch, NONE, 1.1 apollon.spec, 1.1, 1.2 Message-ID: <200603131742.k2DHg2gI007820@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/apollon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7795 Modified Files: apollon.spec Added Files: apollon-1.0.1-firstrun.patch Log Message: * Mon Mar 13 2006 Rex Dieter 1.0.1-5 - firstrun patch (#185258) apollon-1.0.1-firstrun.patch: --- NEW FILE apollon-1.0.1-firstrun.patch --- --- apollon-1.0.1/apollon/firstrun.ui.h.firstrun 2004-10-13 11:33:15.000000000 -0500 +++ apollon-1.0.1/apollon/firstrun.ui.h 2006-03-13 10:53:45.000000000 -0600 @@ -51,7 +51,7 @@ //where are the plugins installed? QDir installedPath ("/usr/share/giFT/giftd.conf.template"); - if (installedPath.exists()) { + if (QFile::exists(installedPath.path())) { installedPath = "/usr/share/giFT/"; } else { Index: apollon.spec =================================================================== RCS file: /cvs/extras/rpms/apollon/FC-4/apollon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apollon.spec 20 Dec 2005 15:14:06 -0000 1.1 +++ apollon.spec 13 Mar 2006 17:41:30 -0000 1.2 @@ -2,7 +2,7 @@ Summary: Filesharing client Name: apollon Version: 1.0.1 -Release: 3%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet @@ -13,15 +13,13 @@ # Fix Name/GenericName, append ; to Categories, # remove lines containing non UTF-8 chars ([de] entries) Patch1: apollon-1.0.1-dtfix.patch +# http://bugzilla.redhat.com/bugzilla/185258 +Patch2: apollon-1.0.1-firstrun.patch BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: gift-devel - -BuildRequires: qt-devel >= 1:3.3 -BuildRequires: kdelibs-devel >= 6:3.3 -# Hack/woraround kdelibs-devel bug: https://bugzilla.redhat.com/bugzilla/170602 -BuildRequires: libacl-devel +BuildRequires: kdelibs-devel %description A filesharing client which uses giFT. @@ -31,12 +29,11 @@ %setup -q %patch1 -p1 -b .dtfix - +%patch2 -p1 -b .firstrun %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-rpath \ @@ -51,11 +48,10 @@ make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --delete-original --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category Application \ - --add-category X-Fedora \ +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ + --vendor="fedora" --delete-original \ + --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop ## File lists @@ -112,6 +108,15 @@ %changelog +* Mon Mar 13 2006 Rex Dieter 1.0.1-5 +- firstrun patch (#185258) + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Thu Jan 26 2006 Rex Dieter 1.0.1-4 +- drop libacl hack + * Tue Dec 20 2005 Rex Dieter 1.0.1-3 - BR: libacl-devel (workaround kdelibs bug #170602) From fedora-extras-commits at redhat.com Mon Mar 13 18:04:18 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 13 Mar 2006 13:04:18 -0500 Subject: rpms/tuxpaint/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tuxpaint.spec, 1.7, 1.8 tuxpaint-0.9.13-destdir.patch, 1.1, NONE Message-ID: <200603131804.k2DI4r3s009918@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/tuxpaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9895 Modified Files: .cvsignore sources tuxpaint.spec Removed Files: tuxpaint-0.9.13-destdir.patch Log Message: Update to 0.9.15. Drop destdir patch. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tuxpaint/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:29:43 -0000 1.3 +++ .cvsignore 13 Mar 2006 18:04:17 -0000 1.4 @@ -1 +1 @@ -tuxpaint-0.9.13.tar.gz +tuxpaint-0.9.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tuxpaint/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:29:43 -0000 1.3 +++ sources 13 Mar 2006 18:04:17 -0000 1.4 @@ -1 +1 @@ -580ed290af35c34a33f2206f7f36e489 tuxpaint-0.9.13.tar.gz +4431d1381712cbf3ade566aa47cb3cab tuxpaint-0.9.15.tar.gz Index: tuxpaint.spec =================================================================== RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tuxpaint.spec 22 May 2005 23:41:22 -0000 1.7 +++ tuxpaint.spec 13 Mar 2006 18:04:17 -0000 1.8 @@ -1,6 +1,6 @@ Name: tuxpaint -Version: 0.9.13 -Release: 3 +Version: 0.9.15 +Release: 1%{?dist} Epoch: 1 Summary: Drawing program designed for young children @@ -8,9 +8,8 @@ Group: Applications/Multimedia License: GPL URL: http://www.newbreedsoftware.com/tuxpaint/ -Source0: http://dl.sf.net/tuxpaint/tuxpaint-0.9.13.tar.gz +Source0: http://dl.sf.net/tuxpaint/tuxpaint-0.9.15.tar.gz Source1: %{name}.desktop -Patch0: %{name}-%{version}-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.4, SDL_image-devel, SDL_ttf-devel @@ -24,7 +23,6 @@ %prep %setup -q -%patch0 -p1 -b .destdir %build make %{?_smp_mflags} PREFIX=/usr @@ -35,8 +33,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applnk/Graphics mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/{16x16,32x32,48x48}/apps/ -make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_usr} \ - X11_ICON_PREFIX=%{_datadir}/pixmaps/ +make install PKG_ROOT=$RPM_BUILD_ROOT PREFIX=%{_usr} \ + X11_ICON_PREFIX=$RPM_BUILD_ROOT%{_datadir}/pixmaps/ find $RPM_BUILD_ROOT -type d|xargs chmod 0755 %find_lang %{name} @@ -66,6 +64,10 @@ %{_mandir}/*/man1/* %changelog +* Mon Mar 13 2006 Steven Pritchard 1:0.9.15-1 +- Update to 0.9.15 +- Drop destdir patch + * Sun May 22 2005 Jeremy Katz - 1:0.9.13-3 - rebuild on all arches --- tuxpaint-0.9.13-destdir.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 13 18:21:59 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 13 Mar 2006 13:21:59 -0500 Subject: rpms/hdf5/devel hdf5-1.6.5-flags.patch,1.1,1.2 Message-ID: <200603131822.k2DIMVk0010132@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10106 Modified Files: hdf5-1.6.5-flags.patch Log Message: We still need some stuff from gnu-flags. Just remove the arch stuff hdf5-1.6.5-flags.patch: Index: hdf5-1.6.5-flags.patch =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/hdf5-1.6.5-flags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf5-1.6.5-flags.patch 13 Mar 2006 16:54:44 -0000 1.1 +++ hdf5-1.6.5-flags.patch 13 Mar 2006 18:21:58 -0000 1.2 @@ -1,36 +1,56 @@ ---- hdf5-1.6.5/config/linux-gnulibc1.orig 2005-10-28 14:15:27.000000000 -0600 -+++ hdf5-1.6.5/config/linux-gnulibc1 2006-03-13 09:49:37.000000000 -0700 -@@ -25,14 +25,5 @@ - CC_BASENAME=gcc - fi +--- hdf5-1.6.5/config/gnu-flags.orig 2005-10-28 14:15:26.000000000 -0600 ++++ hdf5-1.6.5/config/gnu-flags 2006-03-13 10:59:58.000000000 -0700 +@@ -107,25 +107,6 @@ + gcc*|egcs*|pgcc*) + # Architecture-specific flags + arch= +- case "$host_os-$host_cpu" in +- # FreeBSD sets the information from "uname -m" to the general machine +- # architecture, not the specific CPU for the machine, so even our +- # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD +- # machine, use the "sysctl" command to get the CPU hardware model. +- freebsd*-i386) +- host_cpu_model=`sysctl -n hw.model` +- case "$host_cpu_model" in +- # Hmm.. this might not catch Celerons, but it won't hurt them either... +- *Pro*|*II*|*III*|*IV*|*Athlon*) +- arch="-march=i686" +- ;; +- esac +- ;; +- +- *-i686) +- arch="-march=i686" +- ;; +- esac --# Figure out GNU C compiler flags --. $srcdir/config/gnu-flags -- --# Figure out PGI C compiler flags --. $srcdir/config/pgi-flags -- --# Figure out Intel C compiler flags --. $srcdir/config/intel-flags -- - # Check MPICH settings - . $srcdir/config/mpich ---- hdf5-1.6.5/fortran/config/linux-gnulibc1.orig 2006-03-13 09:39:23.000000000 -0700 -+++ hdf5-1.6.5/fortran/config/linux-gnulibc1 2006-03-13 09:47:18.000000000 -0700 -@@ -25,16 +25,6 @@ - CC_BASENAME=gcc - fi + # Host-specific flags + case "`hostname`" in +--- hdf5-1.6.5/fortran/config/gnu-flags.orig 2005-10-28 14:57:02.000000000 -0600 ++++ hdf5-1.6.5/fortran/config/gnu-flags 2006-03-13 10:59:22.000000000 -0700 +@@ -107,25 +107,6 @@ + gcc*|egcs*|pgcc*) + # Architecture-specific flags + arch= +- case "$host_os-$host_cpu" in +- # FreeBSD sets the information from "uname -m" to the general machine +- # architecture, not the specific CPU for the machine, so even our +- # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD +- # machine, use the "sysctl" command to get the CPU hardware model. +- freebsd*-i386) +- host_cpu_model=`sysctl -n hw.model` +- case "$host_cpu_model" in +- # Hmm.. this might not catch Celerons, but it won't hurt them either... +- *Pro*|*II*|*III*|*IV*|*Athlon*) +- arch="-march=i686" +- ;; +- esac +- ;; +- +- *-i686) +- arch="-march=i686" +- ;; +- esac --# Figure out GNU C compiler flags --. $srcdir/config/gnu-flags -- --# Figure out PGI C compiler flags --. $srcdir/config/pgi-flags -- --# Figure out Intel C compiler flags --. $srcdir/config/intel-flags -- -- - # The default Fortran 90 compiler - if test "X-" = "X-$F9X"; then - case $CC_BASENAME in + # Host-specific flags + case "`hostname`" in From fedora-extras-commits at redhat.com Mon Mar 13 18:33:03 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:33:03 -0500 Subject: rpms/clearsilver/devel sources,1.2,1.3 Message-ID: <200603131833.k2DIXZhI010354@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10317 Modified Files: sources Log Message: release 0.10.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clearsilver/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Jan 2006 17:15:17 -0000 1.2 +++ sources 13 Mar 2006 18:33:03 -0000 1.3 @@ -1 +1 @@ -10e19526e87b712068e9073469b10d94 clearsilver-0.10.2.tar.gz +ff4104b0e58bca1b61d528edbd902769 clearsilver-0.10.3.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 18:33:21 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Mon, 13 Mar 2006 13:33:21 -0500 Subject: comps comps-fe5.xml,1.2,1.3 Message-ID: <200603131833.k2DIXrNC010357@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10337 Modified Files: comps-fe5.xml Log Message: merged Index: comps-fe5.xml =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- comps-fe5.xml 11 Mar 2006 06:38:21 -0000 1.2 +++ comps-fe5.xml 13 Mar 2006 18:33:21 -0000 1.3 @@ -99,16 +99,22 @@ blacs blas + cernlib-utils galculator + hmmer + kst + lagan lapack numpy octave qalculate-gtk qalculate-kde qcad + qucs R R-gnomeGUI scalapack + SIBsim4 @@ -146,6 +152,8 @@ gtweakui istanbul lock-keys-applet + nautilus-flac-converter + nautilus-image-converter sabayon seahorse smeg @@ -205,6 +213,7 @@ lacewing lincity-ng lmarbles + lucidlife Maelstrom nethack nethack-vultures @@ -225,6 +234,7 @@ uqm viruskiller wesnoth + worminator xboard xpilot-ng xplanet @@ -240,6 +250,7 @@ true drgeo + drgeo-doc gperiodic stellarium tuxtype2 @@ -307,6 +318,7 @@ digikam fontforge fyre + grads gpp gqview graphviz @@ -366,6 +378,7 @@ gnotime gnumeric gourmet + gramps grisbi gsview koffice-suite @@ -374,8 +387,8 @@ notecase notemeister MagicPoint + pybliographer qcad - xfcalendar @@ -402,8 +415,11 @@ graveman grip kover + libvisual-plugins soundconverter soundtracker + tagtool + ushare xmms xmms-cdread xmms-flac @@ -423,6 +439,7 @@ apt cfengine cfs + crack dkms epylog fuse @@ -433,7 +450,9 @@ ibmonitor lirc moodss + moomps nagios + nfswatch rdiff-backup sabayon shorewall @@ -474,6 +493,7 @@ ircd-hybrid jabberd kannel + ushare @@ -510,6 +530,7 @@ apachetop awstats boa + dap-server-cgi lighttpd lighttpd-fastcgi mediawiki @@ -564,6 +585,7 @@ xfce4-toys xfwm4-themes xfwm4-themes + xfcalendar @@ -629,6 +651,7 @@ aterm fonttools rxvt + workrave xlockmore @@ -664,6 +687,16 @@ + web-development + Web Development + These packages are helpful when developing web applications or web pages. + false + true + + + + + admin-tools Administration Tools This group is a collection of graphical administration tools for the system, such as for managing user accounts and configuring system hardware. @@ -739,6 +772,7 @@ 70 xfce-software-development + web-development @@ -751,4 +785,4 @@ network-server - + \ No newline at end of file From fedora-extras-commits at redhat.com Mon Mar 13 18:34:10 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:34:10 -0500 Subject: rpms/clearsilver/FC-3 sources,1.2,1.3 Message-ID: <200603131834.k2DIYglf010386@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10369 Modified Files: sources Log Message: release 0.10.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Jan 2006 17:15:17 -0000 1.2 +++ sources 13 Mar 2006 18:34:09 -0000 1.3 @@ -1 +1 @@ -10e19526e87b712068e9073469b10d94 clearsilver-0.10.2.tar.gz +ff4104b0e58bca1b61d528edbd902769 clearsilver-0.10.3.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 18:34:53 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:34:53 -0500 Subject: rpms/clearsilver/FC-4 sources,1.2,1.3 Message-ID: <200603131835.k2DIZPt4010409@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10392 Modified Files: sources Log Message: release 0.10.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Jan 2006 17:15:17 -0000 1.2 +++ sources 13 Mar 2006 18:34:53 -0000 1.3 @@ -1 +1 @@ -10e19526e87b712068e9073469b10d94 clearsilver-0.10.2.tar.gz +ff4104b0e58bca1b61d528edbd902769 clearsilver-0.10.3.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 18:36:57 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:36:57 -0500 Subject: rpms/clearsilver/devel clearsilver-0.10.3-fedora.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 clearsilver.spec, 1.2, 1.3 Message-ID: <200603131837.k2DIbTNE010446@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10424 Modified Files: .cvsignore clearsilver.spec Added Files: clearsilver-0.10.3-fedora.patch Log Message: * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 clearsilver-0.10.3-fedora.patch: --- NEW FILE clearsilver-0.10.3-fedora.patch --- diff -Nur clearsilver-0.10.3.orig/cgi/cgi.c clearsilver-0.10.3/cgi/cgi.c --- clearsilver-0.10.3.orig/cgi/cgi.c 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/cgi/cgi.c 2006-03-13 19:17:12.000000000 +0100 @@ -641,7 +641,7 @@ if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL) { - debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d"; + debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d"; } if (!pid) diff -Nur clearsilver-0.10.3.orig/configure clearsilver-0.10.3/configure --- clearsilver-0.10.3.orig/configure 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/configure 2006-03-13 19:20:09.000000000 +0100 @@ -6003,7 +6003,7 @@ echo $ECHO_N "checking for python includes... $ECHO_C" >&6 python_inc=no python_lib=no - python_search_path="/neo/opt /usr/local /usr /c" + python_search_path="/usr" python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15" if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then python_bin=$cs_cv_python_path @@ -6299,7 +6299,8 @@ done _ACJNI_FOLLOWED="$_cur" -_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +_JTOPDIR="$java_path" case "$host_os" in darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'` _JINC="$_JTOPDIR/Headers";; diff -Nur clearsilver-0.10.3.orig/imd/imdm.py clearsilver-0.10.3/imd/imdm.py --- clearsilver-0.10.3.orig/imd/imdm.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/imd/imdm.py 2006-03-13 19:20:25.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/local/bin/python +#!/usr/bin/python # # imdm # diff -Nur clearsilver-0.10.3.orig/java-jni/Makefile clearsilver-0.10.3/java-jni/Makefile --- clearsilver-0.10.3.orig/java-jni/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/java-jni/Makefile 2006-03-13 19:21:50.000000000 +0100 @@ -37,14 +37,14 @@ org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR) $(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS -CSTest.class: CSTest.java +CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR) $(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java gold: CSTest.class @/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold @echo "Generated gold files" -test: CSTest.class +test: CSTest.class $(NEO_UTIL_SO) @echo "Running java test" @failed=0; \ rm -f javatest.out; \ diff -Nur clearsilver-0.10.3.orig/ruby/Makefile clearsilver-0.10.3/ruby/Makefile --- clearsilver-0.10.3.orig/ruby/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/ruby/Makefile 2006-03-13 19:22:19.000000000 +0100 @@ -41,7 +41,7 @@ install: all - $(RUBY) install.rb install + $(RUBY) install.rb install --prefix=$(DESTDIR) clean: $(RM) ext/hdf/*.o ext/hdf/*.so diff -Nur clearsilver-0.10.3.orig/scripts/document.py clearsilver-0.10.3/scripts/document.py --- clearsilver-0.10.3.orig/scripts/document.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/scripts/document.py 2006-03-13 19:22:42.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python """ document.py -- Simple script to generate manpages from C header files. Looks for the following formatted C comments in the C header files: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clearsilver/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Jan 2006 17:15:17 -0000 1.2 +++ .cvsignore 13 Mar 2006 18:36:56 -0000 1.3 @@ -1 +1 @@ -clearsilver-0.10.2.tar.gz +clearsilver-0.10.3.tar.gz Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/devel/clearsilver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clearsilver.spec 13 Feb 2006 18:22:17 -0000 1.2 +++ clearsilver.spec 13 Mar 2006 18:36:56 -0000 1.3 @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: clearsilver -Version: 0.10.2 -Release: 3%{?dist} +Version: 0.10.3 +Release: 1%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License URL: http://www.clearsilver.net/ Source0: http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz -Patch0: %{name}-0.10.2-fedora.patch +Patch0: %{name}-0.10.3-fedora.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel Provides: %{name}-devel = %{version}-%{release} @@ -162,6 +162,9 @@ %endif %changelog +* Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 +- release 0.10.3 + * Mon Feb 13 2006 Joost Soeterbroek - 0.10.2-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon Mar 13 18:38:41 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:38:41 -0500 Subject: rpms/clearsilver/FC-3 clearsilver-0.10.3-fedora.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 clearsilver.spec, 1.1, 1.2 Message-ID: <200603131839.k2DIdDAN010475@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10452 Modified Files: .cvsignore clearsilver.spec Added Files: clearsilver-0.10.3-fedora.patch Log Message: * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 clearsilver-0.10.3-fedora.patch: --- NEW FILE clearsilver-0.10.3-fedora.patch --- diff -Nur clearsilver-0.10.3.orig/cgi/cgi.c clearsilver-0.10.3/cgi/cgi.c --- clearsilver-0.10.3.orig/cgi/cgi.c 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/cgi/cgi.c 2006-03-13 19:17:12.000000000 +0100 @@ -641,7 +641,7 @@ if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL) { - debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d"; + debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d"; } if (!pid) diff -Nur clearsilver-0.10.3.orig/configure clearsilver-0.10.3/configure --- clearsilver-0.10.3.orig/configure 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/configure 2006-03-13 19:20:09.000000000 +0100 @@ -6003,7 +6003,7 @@ echo $ECHO_N "checking for python includes... $ECHO_C" >&6 python_inc=no python_lib=no - python_search_path="/neo/opt /usr/local /usr /c" + python_search_path="/usr" python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15" if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then python_bin=$cs_cv_python_path @@ -6299,7 +6299,8 @@ done _ACJNI_FOLLOWED="$_cur" -_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +_JTOPDIR="$java_path" case "$host_os" in darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'` _JINC="$_JTOPDIR/Headers";; diff -Nur clearsilver-0.10.3.orig/imd/imdm.py clearsilver-0.10.3/imd/imdm.py --- clearsilver-0.10.3.orig/imd/imdm.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/imd/imdm.py 2006-03-13 19:20:25.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/local/bin/python +#!/usr/bin/python # # imdm # diff -Nur clearsilver-0.10.3.orig/java-jni/Makefile clearsilver-0.10.3/java-jni/Makefile --- clearsilver-0.10.3.orig/java-jni/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/java-jni/Makefile 2006-03-13 19:21:50.000000000 +0100 @@ -37,14 +37,14 @@ org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR) $(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS -CSTest.class: CSTest.java +CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR) $(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java gold: CSTest.class @/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold @echo "Generated gold files" -test: CSTest.class +test: CSTest.class $(NEO_UTIL_SO) @echo "Running java test" @failed=0; \ rm -f javatest.out; \ diff -Nur clearsilver-0.10.3.orig/ruby/Makefile clearsilver-0.10.3/ruby/Makefile --- clearsilver-0.10.3.orig/ruby/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/ruby/Makefile 2006-03-13 19:22:19.000000000 +0100 @@ -41,7 +41,7 @@ install: all - $(RUBY) install.rb install + $(RUBY) install.rb install --prefix=$(DESTDIR) clean: $(RM) ext/hdf/*.o ext/hdf/*.so diff -Nur clearsilver-0.10.3.orig/scripts/document.py clearsilver-0.10.3/scripts/document.py --- clearsilver-0.10.3.orig/scripts/document.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/scripts/document.py 2006-03-13 19:22:42.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python """ document.py -- Simple script to generate manpages from C header files. Looks for the following formatted C comments in the C header files: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Jan 2006 17:15:17 -0000 1.2 +++ .cvsignore 13 Mar 2006 18:38:41 -0000 1.3 @@ -1 +1 @@ -clearsilver-0.10.2.tar.gz +clearsilver-0.10.3.tar.gz Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-3/clearsilver.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clearsilver.spec 8 Jan 2006 17:15:17 -0000 1.1 +++ clearsilver.spec 13 Mar 2006 18:38:41 -0000 1.2 @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: clearsilver -Version: 0.10.2 -Release: 2%{?dist} +Version: 0.10.3 +Release: 1%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License URL: http://www.clearsilver.net/ Source0: http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz -Patch0: %{name}-0.10.2-fedora.patch +Patch0: %{name}-0.10.3-fedora.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel Provides: %{name}-devel = %{version}-%{release} @@ -162,6 +162,12 @@ %endif %changelog +* Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 +- release 0.10.3 + +* Mon Feb 13 2006 Joost Soeterbroek - 0.10.2-3 +- Rebuild for Fedora Extras 5 + * Fri Jan 6 2006 Joost Soeterbroek - 0.10.2-2 - Rebuild with disable-ruby, disable-java for any arch other than i386 - hardcoded version in Patch0 From fedora-extras-commits at redhat.com Mon Mar 13 18:39:50 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:39:50 -0500 Subject: rpms/clearsilver/FC-4 clearsilver-0.10.3-fedora.patch, NONE, 1.1 clearsilver.spec, 1.1, 1.2 Message-ID: <200603131840.k2DIeOhe010533@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10481 Modified Files: clearsilver.spec Added Files: clearsilver-0.10.3-fedora.patch Log Message: * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 clearsilver-0.10.3-fedora.patch: --- NEW FILE clearsilver-0.10.3-fedora.patch --- diff -Nur clearsilver-0.10.3.orig/cgi/cgi.c clearsilver-0.10.3/cgi/cgi.c --- clearsilver-0.10.3.orig/cgi/cgi.c 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/cgi/cgi.c 2006-03-13 19:17:12.000000000 +0100 @@ -641,7 +641,7 @@ if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL) { - debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d"; + debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d"; } if (!pid) diff -Nur clearsilver-0.10.3.orig/configure clearsilver-0.10.3/configure --- clearsilver-0.10.3.orig/configure 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/configure 2006-03-13 19:20:09.000000000 +0100 @@ -6003,7 +6003,7 @@ echo $ECHO_N "checking for python includes... $ECHO_C" >&6 python_inc=no python_lib=no - python_search_path="/neo/opt /usr/local /usr /c" + python_search_path="/usr" python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15" if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then python_bin=$cs_cv_python_path @@ -6299,7 +6299,8 @@ done _ACJNI_FOLLOWED="$_cur" -_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +_JTOPDIR="$java_path" case "$host_os" in darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'` _JINC="$_JTOPDIR/Headers";; diff -Nur clearsilver-0.10.3.orig/imd/imdm.py clearsilver-0.10.3/imd/imdm.py --- clearsilver-0.10.3.orig/imd/imdm.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/imd/imdm.py 2006-03-13 19:20:25.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/local/bin/python +#!/usr/bin/python # # imdm # diff -Nur clearsilver-0.10.3.orig/java-jni/Makefile clearsilver-0.10.3/java-jni/Makefile --- clearsilver-0.10.3.orig/java-jni/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/java-jni/Makefile 2006-03-13 19:21:50.000000000 +0100 @@ -37,14 +37,14 @@ org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR) $(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS -CSTest.class: CSTest.java +CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR) $(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java gold: CSTest.class @/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold @echo "Generated gold files" -test: CSTest.class +test: CSTest.class $(NEO_UTIL_SO) @echo "Running java test" @failed=0; \ rm -f javatest.out; \ diff -Nur clearsilver-0.10.3.orig/ruby/Makefile clearsilver-0.10.3/ruby/Makefile --- clearsilver-0.10.3.orig/ruby/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/ruby/Makefile 2006-03-13 19:22:19.000000000 +0100 @@ -41,7 +41,7 @@ install: all - $(RUBY) install.rb install + $(RUBY) install.rb install --prefix=$(DESTDIR) clean: $(RM) ext/hdf/*.o ext/hdf/*.so diff -Nur clearsilver-0.10.3.orig/scripts/document.py clearsilver-0.10.3/scripts/document.py --- clearsilver-0.10.3.orig/scripts/document.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/scripts/document.py 2006-03-13 19:22:42.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python """ document.py -- Simple script to generate manpages from C header files. Looks for the following formatted C comments in the C header files: Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-4/clearsilver.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clearsilver.spec 8 Jan 2006 17:15:17 -0000 1.1 +++ clearsilver.spec 13 Mar 2006 18:39:49 -0000 1.2 @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: clearsilver -Version: 0.10.2 -Release: 2%{?dist} +Version: 0.10.3 +Release: 1%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License URL: http://www.clearsilver.net/ Source0: http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz -Patch0: %{name}-0.10.2-fedora.patch +Patch0: %{name}-0.10.3-fedora.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel Provides: %{name}-devel = %{version}-%{release} @@ -162,6 +162,12 @@ %endif %changelog +* Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 +- release 0.10.3 + +* Mon Feb 13 2006 Joost Soeterbroek - 0.10.2-3 +- Rebuild for Fedora Extras 5 + * Fri Jan 6 2006 Joost Soeterbroek - 0.10.2-2 - Rebuild with disable-ruby, disable-java for any arch other than i386 - hardcoded version in Patch0 From fedora-extras-commits at redhat.com Mon Mar 13 18:42:58 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 13 Mar 2006 13:42:58 -0500 Subject: comps comps-fe5.xml.in,1.18,1.19 Message-ID: <200603131843.k2DIhU35010626@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10609 Modified Files: comps-fe5.xml.in Log Message: Add packages: highlight, inadyn Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- comps-fe5.xml.in 13 Mar 2006 18:18:46 -0000 1.18 +++ comps-fe5.xml.in 13 Mar 2006 18:42:58 -0000 1.19 @@ -41,6 +41,7 @@ gforth ghc git-core + highlight lincvs lua mach @@ -448,6 +449,7 @@ ghex hercules ibmonitor + inadyn>/packagereq> lirc moodss moomps From fedora-extras-commits at redhat.com Mon Mar 13 19:24:30 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 13 Mar 2006 14:24:30 -0500 Subject: comps comps-fe5.xml.in,1.19,1.20 Message-ID: <200603131925.k2DJP2mY012842@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12825 Modified Files: comps-fe5.xml.in Log Message: Added rogue and tong games. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- comps-fe5.xml.in 13 Mar 2006 18:42:58 -0000 1.19 +++ comps-fe5.xml.in 13 Mar 2006 19:24:29 -0000 1.20 @@ -226,11 +226,13 @@ qascade qqo rocksndiamonds + rogue scorched3d sirius sopwith starfighter supertux + tong torcs uqm viruskiller From fedora-extras-commits at redhat.com Mon Mar 13 19:34:41 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 13 Mar 2006 14:34:41 -0500 Subject: rpms/nomadsync/FC-4 nomadsync-libnjbloc64.patch, NONE, 1.1 nomadsync.spec, 1.2, 1.3 Message-ID: <200603131935.k2DJZDej012902@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12879 Modified Files: nomadsync.spec Added Files: nomadsync-libnjbloc64.patch Log Message: x86_64 patching, trying this approach... nomadsync-libnjbloc64.patch: --- NEW FILE nomadsync-libnjbloc64.patch --- --- src/Makefile.in.orig 2006-03-12 22:32:56.000000000 +0100 +++ src/Makefile.in 2006-03-13 07:54:27.000000000 +0100 @@ -67,7 +67,7 @@ layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) \ mpg123.$(OBJEXT) nomadsync_OBJECTS = $(am_nomadsync_OBJECTS) -nomadsync_DEPENDENCIES = /usr/local/lib/libnjb.so +nomadsync_DEPENDENCIES = /usr/lib64/libnjb.so DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -226,7 +226,7 @@ libmpg123/l2tables.h libmpg123/layer1.cpp libmpg123/layer2.cpp libmpg123/layer3.cpp \ libmpg123/mpg123.cpp libmpg123/mpg123.h -nomadsync_LDADD = /usr/local/lib/libnjb.so -lid3 +nomadsync_LDADD = /usr/lib64/libnjb.so -lid3 AM_CXXFLAGS = `gtk-config --cflags` # this is where the desktop file will go Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/FC-4/nomadsync.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nomadsync.spec 12 Mar 2006 22:07:33 -0000 1.2 +++ nomadsync.spec 13 Mar 2006 19:34:40 -0000 1.3 @@ -12,14 +12,14 @@ Name: nomadsync Version: 0.4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ - Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: nomadsync-libnjbloc.patch +Patch1: nomadsync-libnjbloc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -39,7 +39,11 @@ %prep %setup -q -n %{name} +%if "%{_arch}" == "x86_64" +%patch1 -p0 +%else %patch0 -p0 +%endif %build %configure --with-wx-config=%{_bindir}/wxgtk-2.4-config @@ -85,6 +89,9 @@ %doc ChangeLog authors copying readme %changelog +* Mon Mar 13 2006 Linus Walleij 0.4.2-10 +- Fixed a x86_64 bug, by separate patching, I think... + * Sun Mar 12 2006 Linus Walleij 0.4.2-9 - Found a patchable bug during build tests. From fedora-extras-commits at redhat.com Mon Mar 13 19:45:46 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 13 Mar 2006 14:45:46 -0500 Subject: rpms/rogue/devel rogue.png, NONE, 1.1 rogue.desktop, 1.1, 1.2 rogue.spec, 1.2, 1.3 Message-ID: <200603131946.k2DJkI7t013020@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12993 Modified Files: rogue.desktop rogue.spec Added Files: rogue.png Log Message: Added icon for .desktop file. Index: rogue.desktop =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rogue.desktop 10 Mar 2006 15:59:40 -0000 1.1 +++ rogue.desktop 13 Mar 2006 19:45:45 -0000 1.2 @@ -4,7 +4,7 @@ GenericName=Rogue Comment=The original curses-based adventure game Exec=rogue -Icon= +Icon=rogue.png Terminal=true Type=Application Categories=Application;Game; Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rogue.spec 13 Mar 2006 04:36:21 -0000 1.2 +++ rogue.spec 13 Mar 2006 19:45:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -8,6 +8,7 @@ URL: http://roguelike.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/roguelike/rogue5.4.2-src.tar.gz Source1: rogue.desktop +Source2: rogue.png Patch0: rogue-rpmopts.patch Patch1: rogue-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,23 +44,41 @@ --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,-) %attr(2755,games,games) %{_bindir}/rogue %{_mandir}/man6/rogue.6.gz %{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/32x32/apps/rogue.png %dir %attr(0775,games,games) %{_var}/games/roguelike %doc LICENSE.TXT rogue54.doc rogue54.html readme54.html %changelog +* Mon Mar 13 2006 Wart 5.4.2-3 +- Added icon for .desktop file. + * Sun Mar 12 2006 Wart 5.4.2-2 - Added missing BR: ncurses-devel, desktop-file-utils From fedora-extras-commits at redhat.com Mon Mar 13 20:10:28 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 13 Mar 2006 15:10:28 -0500 Subject: rpms/hdf5/FC-4 hdf5-1.6.5-flags.patch,NONE,1.1 hdf5.spec,1.7,1.8 Message-ID: <200603132011.k2DKB1b5015199@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15179 Modified Files: hdf5.spec Added Files: hdf5-1.6.5-flags.patch Log Message: Add patch to avoid HDF setting the compiler flags hdf5-1.6.5-flags.patch: --- NEW FILE hdf5-1.6.5-flags.patch --- --- hdf5-1.6.5/config/gnu-flags.orig 2005-10-28 14:15:26.000000000 -0600 +++ hdf5-1.6.5/config/gnu-flags 2006-03-13 10:59:58.000000000 -0700 @@ -107,25 +107,6 @@ gcc*|egcs*|pgcc*) # Architecture-specific flags arch= - case "$host_os-$host_cpu" in - # FreeBSD sets the information from "uname -m" to the general machine - # architecture, not the specific CPU for the machine, so even our - # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD - # machine, use the "sysctl" command to get the CPU hardware model. - freebsd*-i386) - host_cpu_model=`sysctl -n hw.model` - case "$host_cpu_model" in - # Hmm.. this might not catch Celerons, but it won't hurt them either... - *Pro*|*II*|*III*|*IV*|*Athlon*) - arch="-march=i686" - ;; - esac - ;; - - *-i686) - arch="-march=i686" - ;; - esac # Host-specific flags case "`hostname`" in --- hdf5-1.6.5/fortran/config/gnu-flags.orig 2005-10-28 14:57:02.000000000 -0600 +++ hdf5-1.6.5/fortran/config/gnu-flags 2006-03-13 10:59:22.000000000 -0700 @@ -107,25 +107,6 @@ gcc*|egcs*|pgcc*) # Architecture-specific flags arch= - case "$host_os-$host_cpu" in - # FreeBSD sets the information from "uname -m" to the general machine - # architecture, not the specific CPU for the machine, so even our - # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD - # machine, use the "sysctl" command to get the CPU hardware model. - freebsd*-i386) - host_cpu_model=`sysctl -n hw.model` - case "$host_cpu_model" in - # Hmm.. this might not catch Celerons, but it won't hurt them either... - *Pro*|*II*|*III*|*IV*|*Athlon*) - arch="-march=i686" - ;; - esac - ;; - - *-i686) - arch="-march=i686" - ;; - esac # Host-specific flags case "`hostname`" in Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hdf5.spec 21 Dec 2005 21:55:39 -0000 1.7 +++ hdf5.spec 13 Mar 2006 20:10:28 -0000 1.8 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -12,6 +12,7 @@ Patch3: hdf5-1.6.4-testh5repack.patch Patch4: hdf5-1.6.5-h5diff_attr.patch Patch5: hdf5-1.6.4-ppc.patch +Patch6: hdf5-1.6.5-flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran >= 4.0.2, krb5-devel, openssl-devel, zlib-devel, time @@ -40,6 +41,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 -b .flags %build autoconf @@ -95,6 +97,9 @@ %{_libdir}/*.mod %changelog +* Mon Mar 13 2006 Orion Poplawski 1.6.5-3 +- Add patch to avoid HDF setting the compiler flags + * Wed Dec 21 2005 Orion Poplawski 1.6.5-2 - Don't ship h5perf with missing library From fedora-extras-commits at redhat.com Mon Mar 13 20:14:51 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 13 Mar 2006 15:14:51 -0500 Subject: rpms/hdf5/FC-3 hdf5-1.6.5-flags.patch,NONE,1.1 hdf5.spec,1.2,1.3 Message-ID: <200603132015.k2DKFE4v015317@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15273 Modified Files: hdf5.spec Added Files: hdf5-1.6.5-flags.patch Log Message: Add patch to avoid HDF setting the march compiler flag hdf5-1.6.5-flags.patch: --- NEW FILE hdf5-1.6.5-flags.patch --- --- hdf5-1.6.5/config/gnu-flags.orig 2005-10-28 14:15:26.000000000 -0600 +++ hdf5-1.6.5/config/gnu-flags 2006-03-13 10:59:58.000000000 -0700 @@ -107,25 +107,6 @@ gcc*|egcs*|pgcc*) # Architecture-specific flags arch= - case "$host_os-$host_cpu" in - # FreeBSD sets the information from "uname -m" to the general machine - # architecture, not the specific CPU for the machine, so even our - # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD - # machine, use the "sysctl" command to get the CPU hardware model. - freebsd*-i386) - host_cpu_model=`sysctl -n hw.model` - case "$host_cpu_model" in - # Hmm.. this might not catch Celerons, but it won't hurt them either... - *Pro*|*II*|*III*|*IV*|*Athlon*) - arch="-march=i686" - ;; - esac - ;; - - *-i686) - arch="-march=i686" - ;; - esac # Host-specific flags case "`hostname`" in --- hdf5-1.6.5/fortran/config/gnu-flags.orig 2005-10-28 14:57:02.000000000 -0600 +++ hdf5-1.6.5/fortran/config/gnu-flags 2006-03-13 10:59:22.000000000 -0700 @@ -107,25 +107,6 @@ gcc*|egcs*|pgcc*) # Architecture-specific flags arch= - case "$host_os-$host_cpu" in - # FreeBSD sets the information from "uname -m" to the general machine - # architecture, not the specific CPU for the machine, so even our - # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD - # machine, use the "sysctl" command to get the CPU hardware model. - freebsd*-i386) - host_cpu_model=`sysctl -n hw.model` - case "$host_cpu_model" in - # Hmm.. this might not catch Celerons, but it won't hurt them either... - *Pro*|*II*|*III*|*IV*|*Athlon*) - arch="-march=i686" - ;; - esac - ;; - - *-i686) - arch="-march=i686" - ;; - esac # Host-specific flags case "`hostname`" in Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/hdf5.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hdf5.spec 2 Mar 2006 21:38:43 -0000 1.2 +++ hdf5.spec 13 Mar 2006 20:14:51 -0000 1.3 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -11,6 +11,7 @@ Patch2: hdf5-1.6.4-norpath.patch Patch3: hdf5-1.6.4-testh5repack.patch Patch4: hdf5-1.6.5-h5diff_attr.patch +Patch5: hdf5-1.6.5-flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, time @@ -38,6 +39,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 -b .flags %build autoconf @@ -92,6 +94,9 @@ %{_libdir}/*.so %changelog +* Mon Mar 13 2006 Orion Poplawski 1.6.5-2 +- Add patch to avoid HDF setting the march compiler flag + * Thu Mar 02 2006 Orion Poplawski 1.6.5-1 - Update to 1.6.5 From fedora-extras-commits at redhat.com Mon Mar 13 20:15:16 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:15:16 -0500 Subject: rpms/adime - New directory Message-ID: <200603132015.k2DKFIMt015331@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15321/adime Log Message: Directory /cvs/extras/rpms/adime added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 20:15:23 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:15:23 -0500 Subject: rpms/adime/devel - New directory Message-ID: <200603132015.k2DKFPg5015375@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15321/adime/devel Log Message: Directory /cvs/extras/rpms/adime/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 20:15:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:15:58 -0500 Subject: rpms/adime Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603132016.k2DKG0iV015419@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404 Added Files: Makefile import.log Log Message: Setup of module adime --- NEW FILE Makefile --- # Top level Makefile for module adime all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 13 20:16:04 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:16:04 -0500 Subject: rpms/adime/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603132016.k2DKG64x015437@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module adime --- NEW 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 Mar 13 20:16:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:16:58 -0500 Subject: rpms/adime import.log,1.1,1.2 Message-ID: <200603132017.k2DKHVjM015517@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15478 Modified Files: import.log Log Message: auto-import adime-2.2.1-3 on branch devel from adime-2.2.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/adime/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Mar 2006 20:15:58 -0000 1.1 +++ import.log 13 Mar 2006 20:16:58 -0000 1.2 @@ -0,0 +1 @@ +adime-2_2_1-3:HEAD:adime-2.2.1-3.src.rpm:1142280752 From fedora-extras-commits at redhat.com Mon Mar 13 20:17:08 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:17:08 -0500 Subject: rpms/adime/devel adime-2.2.1-so-fixes.patch, NONE, 1.1 adime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603132017.k2DKHek9015521@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15478/devel Modified Files: .cvsignore sources Added Files: adime-2.2.1-so-fixes.patch adime.spec Log Message: auto-import adime-2.2.1-3 on branch devel from adime-2.2.1-3.src.rpm adime-2.2.1-so-fixes.patch: --- NEW FILE adime-2.2.1-so-fixes.patch --- --- adime-2.2.1/misc/makefile.uni.soname 2004-09-10 21:34:54.000000000 +0200 +++ adime-2.2.1/misc/makefile.uni 2006-03-12 09:23:54.000000000 +0100 @@ -53,7 +53,7 @@ # link as a shared object OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) -IMPLIB_BASENAME = lib$(PACKAGE5).so +IMPLIB_BASENAME = lib$(PACKAGE5).so.0 IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) LIB_NAME = $(IMPLIB_NAME) @@ -153,7 +153,11 @@ SFLAGS = $(WFLAGS) ifndef SYMBOLMODE LFLAGS += -s -LIB_FLAGS = `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)` +# allegro-config --libs drags in -lalleg_unshareable, which is non-PIC +# and thus should only be in the application not a .so file. This means all +# applications which use adime must be linked with: +# -Wl,--export-dynamic -lalleg_unsharable (or `allegro-config --libs`) +LIB_FLAGS= $(shell allegro-config --libs | sed 's/-lalleg_unsharable//') endif endif endif @@ -236,7 +240,7 @@ LINK_LIB_DEPS = define LINK_LIB -gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) +gcc $(LFLAGS) -shared -Wl,-soname=$(IMPLIB_BASENAME) -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) endef LINK_EXE_DEPS = @@ -270,7 +274,7 @@ $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) install -m 755 -d $(SYSTEM_LIB_DIR) - install -m 644 $< $@ + install -m 755 $< $@ $(SYSTEM_INCLUDE_DIR)/adime.h: include/adime.h install -m 755 -d $(SYSTEM_INCLUDE_DIR) --- NEW FILE adime.spec --- Name: adime Version: 2.2.1 Release: 3%{?dist} Summary: Allegro Dialogs Made Easy Group: System Environment/Libraries License: zlib License URL: http://adime.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Patch0: adime-2.2.1-so-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel texinfo Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description Adime is a portable add-on library for Allegro with functions for generating Allegro dialogs in a very simple way. Its main purpose is to give as easy an API as possible to people who want dialogs for editing many kinds of input data. %package devel Summary: Development libraries and headers for adime Group: Development/Libraries Requires: %{name} = %{version} Requires: allegro-devel %description devel The developmental files that must be installed in order to compile applications which use adime. %prep %setup -q %patch0 -p1 -z .so-fixes ./fix.sh unix rm docs/txt/tmpfile.txt mkdir docs/html docs/rtf %build make %{?_smp_mflags} lib docs \ CFLAGS="-fPIC -DPIC $RPM_OPT_FLAGS" \ CFLAGS_NO_OPTIMIZE="-fPIC -DPIC $RPM_OPT_FLAGS" \ LFLAGS=-g %install rm -rf $RPM_BUILD_ROOT make install install-man install-info \ SYSTEM_DIR=$RPM_BUILD_ROOT/usr \ SYSTEM_LIB_DIR=$RPM_BUILD_ROOT%{_libdir} \ SYSTEM_MAN_DIR=$RPM_BUILD_ROOT%{_mandir} \ SYSTEM_INFO_DIR=$RPM_BUILD_ROOT%{_infodir} rm $RPM_BUILD_ROOT%{_infodir}/dir ln -s libadime.so.0 $RPM_BUILD_ROOT%{_libdir}/libadime.so %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post devel /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun devel if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) %doc license.txt thanks.txt changes.txt %{_libdir}/libadime.so.0 %files devel %defattr(-,root,root,-) %doc readme.txt docs/txt/*.txt docs/rtf docs/html %{_includedir}/adime.h %{_includedir}/adime %{_libdir}/libadime.so %{_mandir}/man3/* %{_infodir}/adime.info.gz %changelog * Sun Mar 12 2006 Hans de Goede 2.2.1-3 - change license to "zlib License" - modify adime-2.2.1-so-fixes.patch to strip -lalleg_unshareble from allegro-config --libs output instead of using a hardcoded allegro linkerflag * Sun Mar 12 2006 Hans de Goede 2.2.1-2 - add BR texinfo - mkdir docs/html and docs/rtf during %%prep to make "make docs" happy, include the results in %%doc - don't link liballeg_unsharable.a into our .so.0 file * Sat Mar 11 2006 Hans de Goede 2.2.1-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adime/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Mar 2006 20:16:04 -0000 1.1 +++ .cvsignore 13 Mar 2006 20:17:07 -0000 1.2 @@ -0,0 +1 @@ +adime-2.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/adime/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Mar 2006 20:16:04 -0000 1.1 +++ sources 13 Mar 2006 20:17:07 -0000 1.2 @@ -0,0 +1 @@ +aa71fbe7661e56421cab42e6bca70c7c adime-2.2.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 20:47:03 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 13 Mar 2006 15:47:03 -0500 Subject: rpms/nomadsync/devel nomadsync-libnjbloc64.patch, NONE, 1.1 nomadsync.spec, 1.2, 1.3 Message-ID: <200603132047.k2DKlZR4015760@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15740 Modified Files: nomadsync.spec Added Files: nomadsync-libnjbloc64.patch Log Message: Don't think this will work on devel but need to bump anyway. nomadsync-libnjbloc64.patch: --- NEW FILE nomadsync-libnjbloc64.patch --- --- src/Makefile.in.orig 2006-03-12 22:32:56.000000000 +0100 +++ src/Makefile.in 2006-03-13 07:54:27.000000000 +0100 @@ -67,7 +67,7 @@ layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) \ mpg123.$(OBJEXT) nomadsync_OBJECTS = $(am_nomadsync_OBJECTS) -nomadsync_DEPENDENCIES = /usr/local/lib/libnjb.so +nomadsync_DEPENDENCIES = /usr/lib64/libnjb.so DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -226,7 +226,7 @@ libmpg123/l2tables.h libmpg123/layer1.cpp libmpg123/layer2.cpp libmpg123/layer3.cpp \ libmpg123/mpg123.cpp libmpg123/mpg123.h -nomadsync_LDADD = /usr/local/lib/libnjb.so -lid3 +nomadsync_LDADD = /usr/lib64/libnjb.so -lid3 AM_CXXFLAGS = `gtk-config --cflags` # this is where the desktop file will go Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/nomadsync.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nomadsync.spec 12 Mar 2006 21:56:38 -0000 1.2 +++ nomadsync.spec 13 Mar 2006 20:47:03 -0000 1.3 @@ -12,14 +12,14 @@ Name: nomadsync Version: 0.4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ - Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: nomadsync-libnjbloc.patch +Patch1: nomadsync-libnjbloc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -39,7 +39,11 @@ %prep %setup -q -n %{name} +%if "%{_arch}" == "x86_64" +%patch1 -p0 +%else %patch0 -p0 +%endif %build %configure --with-wx-config=%{_bindir}/wxgtk-2.4-config @@ -85,6 +89,9 @@ %doc ChangeLog authors copying readme %changelog +* Mon Mar 13 2006 Linus Walleij 0.4.2-10 +- Fixed a x86_64 bug, by separate patching, I think... + * Sun Mar 12 2006 Linus Walleij 0.4.2-9 - Found a patchable bug during build tests. From fedora-extras-commits at redhat.com Mon Mar 13 21:02:59 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 13 Mar 2006 16:02:59 -0500 Subject: comps comps-fe5.xml.in,1.20,1.21 Message-ID: <200603132103.k2DL3TCt017870@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17829 Modified Files: comps-fe5.xml.in Log Message: Add gdl, ncarg, gv, environment-modules, kompose Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- comps-fe5.xml.in 13 Mar 2006 19:24:29 -0000 1.20 +++ comps-fe5.xml.in 13 Mar 2006 21:02:56 -0000 1.21 @@ -102,10 +102,12 @@ blas cernlib-utils galculator + gdl hmmer kst lagan lapack + ncarg numpy octave qalculate-gtk @@ -322,6 +324,7 @@ fontforge fyre grads + gv gpp gqview graphviz @@ -444,6 +447,7 @@ cfs crack dkms + environment-modules epylog fuse fwbuilder @@ -674,6 +678,7 @@ kbibtex kiosktool kmymoney2 + kompose kyum From fedora-extras-commits at redhat.com Mon Mar 13 21:06:07 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 13 Mar 2006 16:06:07 -0500 Subject: rpms/lirc-kmod/devel kmodtool,1.2,1.3 lirc-kmod.spec,1.2,1.3 Message-ID: <200603132106.k2DL6dk3017921@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17902 Modified Files: kmodtool lirc-kmod.spec Log Message: * Mon Mar 13 2006 Ville Skytt?? - 0.8.0-3 - Hardcode kernel version and variants for test builds. - Remove xen-hypervisor and xen-guest from kmodtool. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kmodtool 28 Jan 2006 12:50:41 -0000 1.2 +++ kmodtool 13 Mar 2006 21:06:07 -0000 1.3 @@ -24,8 +24,8 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.4" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)' +myver="0.10.5" +knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= verrel= Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lirc-kmod.spec 28 Jan 2006 12:50:41 -0000 1.2 +++ lirc-kmod.spec 13 Mar 2006 21:06:07 -0000 1.3 @@ -5,13 +5,29 @@ %define kmodtool sh %{SOURCE10} # end stuff to be ... +# temporarily hardcoded: +%define kver 2.6.15-1.2041_FC5 +%ifnarch i686 x86_64 ppc +%define kvariants "" +%else +%ifarch i686 +%define kvariants "" smp xen0 xenU +%endif +%ifarch x86_64 +%define kvariants "" xen0 xenU +%endif +%ifarch ppc +%define kvariants "" smp +%endif +%endif + %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kver} 2>/dev/null) %{!?kvariants: %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)} Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 2.%(echo %{kverrel} | tr - _) +Release: 3.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -97,6 +113,10 @@ %changelog +* Mon Mar 13 2006 Ville Skytt?? - 0.8.0-3 +- Hardcode kernel version and variants for test builds. +- Remove xen-hypervisor and xen-guest from kmodtool. + * Sat Jan 28 2006 Ville Skytt?? - 0.8.0-2 - Update kmodtool to 0.10.4, fixes support for non-UP FC kernels. From fedora-extras-commits at redhat.com Mon Mar 13 21:09:16 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 13 Mar 2006 16:09:16 -0500 Subject: rpms/lirc-kmod/devel lirc-kmod.spec,1.3,1.4 Message-ID: <200603132109.k2DL9mMZ018006@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17989 Modified Files: lirc-kmod.spec Log Message: Add ExclusiveArch for buildsys. Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lirc-kmod.spec 13 Mar 2006 21:06:07 -0000 1.3 +++ lirc-kmod.spec 13 Mar 2006 21:09:15 -0000 1.4 @@ -38,6 +38,8 @@ Patch1: %{name}-0.8.0-2616.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExclusiveArch: i586 i686 x86_64 ppc + %description LIRC is a package that allows you to decode and send infra-red and other signals of many (but not all) commonly used remote controls. From fedora-extras-commits at redhat.com Mon Mar 13 21:20:42 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 13 Mar 2006 16:20:42 -0500 Subject: rpms/thinkpad-kmod-common/devel thinkpad-kmod-common.spec,1.2,1.3 Message-ID: <200603132121.k2DLLGVM018122@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18103 Modified Files: thinkpad-kmod-common.spec Log Message: ... Index: thinkpad-kmod-common.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/thinkpad-kmod-common.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- thinkpad-kmod-common.spec 2 Mar 2006 21:29:22 -0000 1.2 +++ thinkpad-kmod-common.spec 13 Mar 2006 21:20:41 -0000 1.3 @@ -17,6 +17,7 @@ Requires: pam >= 0.79-8 Requires: initscripts >= 8.08-1 +# ExclusiveArch due to kmod-thinkpad availability. ExclusiveArch: i386 %description From fedora-extras-commits at redhat.com Mon Mar 13 21:57:23 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 13 Mar 2006 16:57:23 -0500 Subject: rpms/perl-Image-Info/devel .cvsignore, 1.4, 1.5 perl-Image-Info.spec, 1.10, 1.11 sources, 1.4, 1.5 Image-Info-1.19-inc-Module-Install.pm.patch, 1.1, NONE Message-ID: <200603132157.k2DLvtYf018490@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18469 Modified Files: .cvsignore perl-Image-Info.spec sources Removed Files: Image-Info-1.19-inc-Module-Install.pm.patch Log Message: Update to 1.20. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Mar 2006 21:25:14 -0000 1.4 +++ .cvsignore 13 Mar 2006 21:57:23 -0000 1.5 @@ -1 +1 @@ -Image-Info-1.19.tar.gz +Image-Info-1.20.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Image-Info.spec 8 Mar 2006 21:25:14 -0000 1.10 +++ perl-Image-Info.spec 13 Mar 2006 21:57:23 -0000 1.11 @@ -1,7 +1,7 @@ %define rgbtxt %{_datadir}/X11/rgb.txt Name: perl-Image-Info -Version: 1.19 +Version: 1.20 Release: 1%{?dist} Summary: Image meta information extraction module for Perl @@ -9,7 +9,6 @@ License: GPL or Artistic URL: http://search.cpan.org/dist/Image-Info/ Source0: http://www.cpan.org/authors/id/T/TE/TELS/image/Image-Info-%{version}.tar.gz -Patch0: Image-Info-1.19-inc-Module-Install.pm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,8 +25,7 @@ %prep %setup -q -n Image-Info-%{version} -%patch0 -p1 -chmod 644 Changes README exifdump imgdump +chmod 644 README exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -61,8 +59,11 @@ %changelog +* Mon Mar 13 2006 Jose Pedro Oliveira - 1.20-1 +- Update to 1.20. + * Wed Mar 8 2006 Jose Pedro Oliveira - 1.19-1 -- Update to 1.19. +- Update to 1.19 (broken: cpan tickets: #18020 and #18147). - Module::Install 0.58 is broken (Image-Info-1.19-inc-Module-Install.pm.patch). - BR: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Mar 2006 21:25:14 -0000 1.4 +++ sources 13 Mar 2006 21:57:23 -0000 1.5 @@ -1 +1 @@ -5a63a7071b62d2420f822b85efde3395 Image-Info-1.19.tar.gz +91d44efe6387ee189b1c7164b087bf7a Image-Info-1.20.tar.gz --- Image-Info-1.19-inc-Module-Install.pm.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 13 22:18:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 13 Mar 2006 17:18:17 -0500 Subject: rpms/perl-Image-Info/FC-4 .cvsignore, 1.2, 1.3 perl-Image-Info.spec, 1.7, 1.8 sources, 1.2, 1.3 Image-Info-1.16-XBM.pm.patch, 1.1, NONE Image-Info-1.16-XPM.pm.patch, 1.1, NONE Image-Info-1.16-string.t.patch, 1.1, NONE Message-ID: <200603132218.k2DMIn9H020649@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20628 Modified Files: .cvsignore perl-Image-Info.spec sources Removed Files: Image-Info-1.16-XBM.pm.patch Image-Info-1.16-XPM.pm.patch Image-Info-1.16-string.t.patch Log Message: Update to 1.20. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:03:17 -0000 1.2 +++ .cvsignore 13 Mar 2006 22:18:15 -0000 1.3 @@ -1 +1 @@ -Image-Info-1.16.tar.gz +Image-Info-1.20.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/perl-Image-Info.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Image-Info.spec 23 Nov 2005 15:28:57 -0000 1.7 +++ perl-Image-Info.spec 13 Mar 2006 22:18:15 -0000 1.8 @@ -1,23 +1,22 @@ %define rgbtxt %{_prefix}/X11R6/lib/X11/rgb.txt Name: perl-Image-Info -Version: 1.16 -Release: 5%{?dist} +Version: 1.20 +Release: 1%{?dist} Summary: Image meta information extraction module for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Image-Info/ -Source0: http://www.cpan.org/authors/id/G/GA/GAAS/Image-Info-1.16.tar.gz -Patch0: Image-Info-1.16-string.t.patch -Patch1: Image-Info-1.16-XBM.pm.patch -Patch2: Image-Info-1.16-XPM.pm.patch +Source0: http://www.cpan.org/authors/id/T/TE/TELS/image/Image-Info-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl +BuildRequires: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple) +BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: %{rgbtxt} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This Perl extension allows you to extract meta information from @@ -26,10 +25,7 @@ %prep %setup -q -n Image-Info-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -chmod 644 Changes README exifdump imgdump +chmod 644 README exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -63,6 +59,9 @@ %changelog +* Mon Mar 13 2006 Jose Pedro Oliveira - 1.20-1 +- Update to 1.20. + * Wed Nov 23 2005 Ville Skytt?? - 1.16-5 - Add dependency on rgb.txt. - Specfile cleanups. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:03:17 -0000 1.2 +++ sources 13 Mar 2006 22:18:15 -0000 1.3 @@ -1 +1 @@ -502b6299ef2d41f67bca4e1f7d9335ab Image-Info-1.16.tar.gz +91d44efe6387ee189b1c7164b087bf7a Image-Info-1.20.tar.gz --- Image-Info-1.16-XBM.pm.patch DELETED --- --- Image-Info-1.16-XPM.pm.patch DELETED --- --- Image-Info-1.16-string.t.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 13 22:42:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 13 Mar 2006 17:42:16 -0500 Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.5, 1.6 perl-Test-MockObject.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603132242.k2DMgneW020884@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-MockObject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20854 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: Update to 1.03. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Feb 2006 03:06:10 -0000 1.5 +++ .cvsignore 13 Mar 2006 22:42:16 -0000 1.6 @@ -1 +1 @@ -Test-MockObject-1.02.tar.gz +Test-MockObject-1.03.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Test-MockObject.spec 28 Feb 2006 03:06:10 -0000 1.9 +++ perl-Test-MockObject.spec 13 Mar 2006 22:42:16 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Test-MockObject -Version: 1.02 +Version: 1.03 Release: 1%{?dist} Summary: Perl extension for emulating troublesome interfaces @@ -11,10 +11,10 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Test::Exception), perl(Test::Warn) +BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) -BuildRequires: perl(UNIVERSAL::can) >= 1.00 -BuildRequires: perl(UNIVERSAL::isa) >= 0.02 +BuildRequires: perl(UNIVERSAL::can) >= 1.11 +BuildRequires: perl(UNIVERSAL::isa) >= 0.06 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -60,6 +60,9 @@ %changelog +* Mon Mar 13 2006 Jose Pedro Oliveira - 1.03-1 +- Update to 1.03. + * Tue Feb 28 2006 Jose Pedro Oliveira - 1.02-1 - Update to 1.02. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Feb 2006 03:06:10 -0000 1.5 +++ sources 13 Mar 2006 22:42:16 -0000 1.6 @@ -1 +1 @@ -df6dfa7a6d260230db2d48d4a446bd1d Test-MockObject-1.02.tar.gz +b6a13614c61f68ff1cfc4c5609bff947 Test-MockObject-1.03.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 22:45:27 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:45:27 -0500 Subject: rpms/glyph-keeper - New directory Message-ID: <200603132245.k2DMjT72021008@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21000/glyph-keeper Log Message: Directory /cvs/extras/rpms/glyph-keeper added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 22:45:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:45:33 -0500 Subject: rpms/glyph-keeper/devel - New directory Message-ID: <200603132245.k2DMjZsj021023@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21000/glyph-keeper/devel Log Message: Directory /cvs/extras/rpms/glyph-keeper/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 22:45:51 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:45:51 -0500 Subject: rpms/glyph-keeper Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603132245.k2DMjrAl021057@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21045 Added Files: Makefile import.log Log Message: Setup of module glyph-keeper --- NEW FILE Makefile --- # Top level Makefile for module glyph-keeper all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 13 22:45:57 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:45:57 -0500 Subject: rpms/glyph-keeper/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603132245.k2DMjxHb021077@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21045/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module glyph-keeper --- NEW 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 Mar 13 22:46:39 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:46:39 -0500 Subject: rpms/glyph-keeper import.log,1.1,1.2 Message-ID: <200603132247.k2DMlBMK021154@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21117 Modified Files: import.log Log Message: auto-import glyph-keeper-0.29.1-2 on branch devel from glyph-keeper-0.29.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/glyph-keeper/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Mar 2006 22:45:51 -0000 1.1 +++ import.log 13 Mar 2006 22:46:38 -0000 1.2 @@ -0,0 +1 @@ +glyph-keeper-0_29_1-2:HEAD:glyph-keeper-0.29.1-2.src.rpm:1142289734 From fedora-extras-commits at redhat.com Mon Mar 13 22:46:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:46:44 -0500 Subject: rpms/glyph-keeper/devel glyph-keeper-0.29.1-fixes.patch, NONE, 1.1 glyph-keeper.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603132247.k2DMlHlk021158@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21117/devel Modified Files: .cvsignore sources Added Files: glyph-keeper-0.29.1-fixes.patch glyph-keeper.spec Log Message: auto-import glyph-keeper-0.29.1-2 on branch devel from glyph-keeper-0.29.1-2.src.rpm glyph-keeper-0.29.1-fixes.patch: --- NEW FILE glyph-keeper-0.29.1-fixes.patch --- diff -ur glyph-keeper-0.29.1.orig/Makefile.GNU.all glyph-keeper-0.29.1/Makefile.GNU.all --- glyph-keeper-0.29.1.orig/Makefile.GNU.all 2005-07-09 16:26:56.000000000 +0200 +++ glyph-keeper-0.29.1/Makefile.GNU.all 2006-03-11 17:11:10.000000000 +0100 @@ -66,13 +66,9 @@ CC := gcc -WFLAGS := -W -Wall - -OFLAGS := -O3 -s - FT_CFLAGS := $(WFLAGS) -std=c89 $(OFLAGS) -Ifreetype/include $(ft_defines) -GK_CFLAGS := $(WFLAGS) -std=c89 $(OFLAGS) -Iinclude $(gk_defines) $(if $(FT_LIB),,-Ifreetype/include) +GK_CFLAGS := $(CFLAGS) -std=c89 -Iinclude $(gk_defines) $(if $(FT_LIB),,-Ifreetype/include) Only in glyph-keeper-0.29.1: Makefile.GNU.all~ diff -ur glyph-keeper-0.29.1.orig/include/glyph.h glyph-keeper-0.29.1/include/glyph.h --- glyph-keeper-0.29.1.orig/include/glyph.h 2005-07-09 15:02:50.000000000 +0200 +++ glyph-keeper-0.29.1/include/glyph.h 2006-03-11 19:13:38.000000000 +0100 @@ -149,7 +149,7 @@ #elif (GLYPH_TARGET == GLYPH_TARGET_SDL) -#include +#include #define GLYPH_TARGET_STR "SDL" #define GLYPH_TARGET_SURFACE SDL_Surface #define GLYPH_TARGET_HAS_RECTFILL Only in glyph-keeper-0.29.1/include: glyph.h~ Only in glyph-keeper-0.29.1: log Only in glyph-keeper-0.29.1/obj: glyph-alleg.o Only in glyph-keeper-0.29.1/obj: glyph-sdl.o Only in glyph-keeper-0.29.1/obj: libglyph-alleg.a Only in glyph-keeper-0.29.1/obj: libglyph-sdl.a diff -ur glyph-keeper-0.29.1.orig/src/glyph_index.c glyph-keeper-0.29.1/src/glyph_index.c --- glyph-keeper-0.29.1.orig/src/glyph_index.c 2005-06-24 11:35:00.000000000 +0200 +++ glyph-keeper-0.29.1/src/glyph_index.c 2006-03-11 19:11:04.000000000 +0100 @@ -58,13 +58,13 @@ if (!index->pages) return size; size += 69*sizeof(void*); - if ((int)index->pages[68]) + if ((long)index->pages[68]) { for (a=0; a<68; a++) { if (!index->pages[a]) continue; size += 129*sizeof(void*); - if ((int)index->pages[a][128]) + if ((long)index->pages[a][128]) { for (b=0; b<128; b++) { if (index->pages[a][b]) size += 129*sizeof(void*); } } @@ -220,7 +220,7 @@ /* unlinking the glyph from index */ page_c[c_index] = 0; - (*(int*)(page_c+128))--; + (*(long*)(page_c+128))--; /* uninking the glyph from keeper's list */ if (glyph == keeper->head) keeper->head = keeper->head->next; @@ -235,19 +235,19 @@ free(glyph); /* releasing unnecessary index pages, and index itself */ - if (((int)page_c[128])<=0) + if (((long)page_c[128])<=0) { free(page_c); page_b[b_index] = 0; keeper->allocated -= 129*sizeof(void*); - (*(int*)(page_b+128))--; - if (((int)page_b[128])<=0) + (*(long*)(page_b+128))--; + if (((long)page_b[128])<=0) { free(page_b); index->pages[a_index] = 0; keeper->allocated -= 129*sizeof(void*); - (*(int*)(index->pages+68))--; - if (((int)index->pages[68])<=0) + (*(long*)(index->pages+68))--; + if (((long)index->pages[68])<=0) { free(index->pages); index->pages = 0; @@ -314,7 +314,7 @@ { index->pages[a_index] = (GLYPH***)_gk_malloc(129*sizeof(void*)); if (!index->pages[a_index]) return 0; - (*(int*)(index->pages+68))++; + (*(long*)(index->pages+68))++; memset(index->pages[a_index],0,129*sizeof(void*)); keeper->allocated += 129*sizeof(void*); } @@ -326,7 +326,7 @@ { page_b[b_index] = (GLYPH**)_gk_malloc(129*sizeof(void*)); if (!page_b[b_index]) return 0; - (*(int*)(page_b+128))++; + (*(long*)(page_b+128))++; memset(page_b[b_index],0,129*sizeof(void*)); keeper->allocated += 129*sizeof(void*); } @@ -338,7 +338,7 @@ CARE(page_c[c_index]==0); page_c[c_index] = glyph; - (*(int*)(page_c+128))++; + (*(long*)(page_c+128))++; glyph->index = index; glyph->prev = 0; @@ -512,7 +512,7 @@ GLYPH_REND *rend; int ni = 0, nr = 0; - _gk_msg("GLYPH_KEEP object (address:%d):\n",(int)keeper); + _gk_msg("GLYPH_KEEP object (address:%p):\n", keeper); if (!keeper) return; _gk_msg(" can keep %d glyphs, currently keeping %d\n",keeper->max_glyphs,keeper->num_glyphs); Only in glyph-keeper-0.29.1/src: glyph_index.c~ --- NEW FILE glyph-keeper.spec --- Name: glyph-keeper Version: 0.29.1 Release: 2%{?dist} Summary: Library for text rendering Group: System Environment/Libraries License: zlib License URL: http://kd.lab.nig.ac.jp/glyph-keeper/ Source0: http://kd.lab.nig.ac.jp/%{name}/files/%{name}-%{version}-no-freetype.zip Patch0: glyph-keeper-0.29.1-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel >= 2.1.10 BuildRequires: SDL-devel allegro-devel %description Glyph Keeper is a library for text rendering. It is written in C and can be used by C or C++ code. Glyph Keeper helps your program to load a font, render character glyphs and write them to the target surface. Right now only Allegro and SDL targets are supported, but there will be more in future. Glyph Keeper uses FreeType as a font engine. %package devel Summary: Library for text rendering Group: Development/Libraries Requires: allegro-devel SDL-devel %description devel Glyph Keeper is a library for text rendering. It is written in C and can be used by C or C++ code. Glyph Keeper helps your program to load a font, render character glyphs and write them to the target surface. Right now only Allegro and SDL targets are supported, but there will be more in future. Glyph Keeper uses FreeType as a font engine. %prep %setup -q %patch -p1 %build make %{?_smp_mflags} -f Makefile.GNU.all TARGET=ALLEGRO FT_LIB=-lfreetype \ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/freetype2" lib make %{?_smp_mflags} -f Makefile.GNU.all TARGET=SDL FT_LIB=-lfreetype \ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/freetype2" lib %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir} mkdir -p $RPM_BUILD_ROOT%{_includedir} install -m 644 obj/libglyph-*.a $RPM_BUILD_ROOT%{_libdir} install -m 644 include/glyph.h $RPM_BUILD_ROOT%{_includedir} %clean rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %doc license.txt changes.txt authors.txt docs/* %{_includedir}/glyph.h %{_libdir}/libglyph-*.a %changelog * Mon Mar 13 2006 Hans de Goede 0.29.1-2 -change license to "zlib License" -add authors.txt and docs/* to %%doc * Sat Mar 11 2006 Hans de Goede 0.29.1-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glyph-keeper/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Mar 2006 22:45:57 -0000 1.1 +++ .cvsignore 13 Mar 2006 22:46:44 -0000 1.2 @@ -0,0 +1 @@ +glyph-keeper-0.29.1-no-freetype.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/glyph-keeper/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Mar 2006 22:45:57 -0000 1.1 +++ sources 13 Mar 2006 22:46:44 -0000 1.2 @@ -0,0 +1 @@ +e90e5103dce7d89aba2180bb830de8d9 glyph-keeper-0.29.1-no-freetype.zip From fedora-extras-commits at redhat.com Mon Mar 13 22:57:30 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:57:30 -0500 Subject: rpms/allegro/devel allegro-4.2.0-no-execheap.patch, NONE, 1.1 allegro.spec, 1.28, 1.29 Message-ID: <200603132258.k2DMw2dQ021356@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21321 Modified Files: allegro.spec Added Files: allegro-4.2.0-no-execheap.patch Log Message: * Mon Mar 13 2006 Hans de Goede 4.2.0-11 - really, _really_ fix asm stretch code on i386 with NX processors, long ?? story see bugzilla bug 185214 . allegro-4.2.0-no-execheap.patch: --- NEW FILE allegro-4.2.0-no-execheap.patch --- diff -ur allegro-4.2.0.orig/src/i386/icsprite.c allegro-4.2.0/src/i386/icsprite.c --- allegro-4.2.0.orig/src/i386/icsprite.c 2001-11-06 16:30:47.000000000 +0100 +++ allegro-4.2.0/src/i386/icsprite.c 2006-03-13 23:26:53.000000000 +0100 @@ -45,6 +45,11 @@ #if defined ALLEGRO_COLOR24 || defined ALLEGRO_COLOR32 unsigned long *p32; #endif + + #ifdef USE_MMAP_GEN_CODE_BUF + /* make sure we get a new map */ + _map_size = 0; + #endif for (y=0; yh; y++) { @@ -270,13 +275,40 @@ COMPILER_RET(); + #ifdef USE_MMAP_GEN_CODE_BUF + /* Lie about the size, return the size mapped which >= size used / + compiler_pos, because we need the size mapped for munmap */ + *len = _map_size; + /* we don't need _rw_map or _map_fd anymore */ + munmap(_rw_map, _map_size); + close(_map_fd); + return _exec_map; + #else p = malloc(compiler_pos); if (p) { memcpy(p, _scratch_mem, compiler_pos); *len = compiler_pos; + #ifdef ALLEGRO_WINDOWS + { + DWORD old_protect; + /* Play nice with Windows executable memory protection */ + VirtualProtect(p, compiler_pos, PAGE_EXECUTE_READWRITE, &old_protect); + } + #elif defined(HAVE_MPROTECT) + { + char *aligned_p = (char *)((unsigned long)p & ~(PAGE_SIZE-1ul)); + if (mprotect(aligned_p, compiler_pos + ((char *)p - aligned_p), + PROT_EXEC|PROT_READ|PROT_WRITE)) { + perror("allegro-error: mprotect failed during stretched blit!"); + free(p); + return NULL; + } + } + #endif } return p; + #endif } @@ -327,8 +359,11 @@ if (sprite) { for (plane=0; plane<4; plane++) if (sprite->proc[plane].draw) + #ifdef USE_MMAP_GEN_CODE_BUF + munmap(sprite->proc[plane].draw, sprite->proc[plane].len); + #else free(sprite->proc[plane].draw); - + #endif free(sprite); } } diff -ur allegro-4.2.0.orig/src/i386/istretch.c allegro-4.2.0/src/i386/istretch.c --- allegro-4.2.0.orig/src/i386/istretch.c 2006-03-13 22:48:45.000000000 +0100 +++ allegro-4.2.0/src/i386/istretch.c 2006-03-13 23:18:56.000000000 +0100 @@ -216,29 +216,18 @@ char depth; char flags; int lru; - void *data; + void *exec; /* xr_ mapping in the mmap case, normally both in one. */ int size; +#ifdef USE_MMAP_GEN_CODE_BUF + void *rw; /* _rw mapping for the mmap case. */ + int fd; /* mapping backing fd for the mmap case. */ +#endif } STRETCHER_INFO; - #define NUM_STRETCHERS 8 - -static STRETCHER_INFO stretcher_info[NUM_STRETCHERS] = -{ - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 } -}; - - +static STRETCHER_INFO stretcher_info[NUM_STRETCHERS]; static int stretcher_count = 0; - static int stretcher_virgin = TRUE; @@ -251,11 +240,14 @@ int i; for (i=0; i>= 2; - _do_stretch(source, dest, stretcher_info[i].data, sx>>16, sy, syd, + _do_stretch(source, dest, stretcher_info[i].exec, sx>>16, sy, syd, dest_x, dest_y, dest_height, dest->vtable->color_depth); stretcher_info[i].lru = stretcher_count; return; @@ -382,17 +383,18 @@ } } - /* make sure all allocated memory is freed atexit */ - if (stretcher_virgin) { - stretcher_virgin = FALSE; - _add_exit_func(free_stretchers, "free_stretchers"); - } - + #ifdef USE_MMAP_GEN_CODE_BUF + _exec_map = stretcher_info[best].exec; + _rw_map = stretcher_info[best].rw; + _map_size = stretcher_info[best].size; + _map_fd = stretcher_info[best].fd; + #else prev_scratch_mem = _scratch_mem; prev_scratch_mem_size = _scratch_mem_size; - _scratch_mem = stretcher_info[best].data; + _scratch_mem = stretcher_info[best].exec; _scratch_mem_size = stretcher_info[best].size; + #endif if (is_linear_bitmap(dest)) { /* build a simple linear stretcher */ @@ -439,7 +441,7 @@ #ifdef ALLEGRO_WINDOWS /* Play nice with Windows executable memory protection */ VirtualProtect(_scratch_mem, _scratch_mem_size, PAGE_EXECUTE_READWRITE, &old_protect); - #elif defined(HAVE_MPROTECT) + #elif defined(HAVE_MPROTECT) && !defined(USE_MMAP_GEN_CODE_BUF) { char *p = (char *)((unsigned long)_scratch_mem & ~(PAGE_SIZE-1ul)); if (mprotect(p, _scratch_mem_size + ((char *)_scratch_mem - p), @@ -448,22 +450,29 @@ } #endif - /* call the stretcher */ - _do_stretch(source, dest, _scratch_mem, sx>>16, sy, syd, - dest_x, dest_y, dest_height, dest->vtable->color_depth); - - /* and store it in the cache */ + /* store it in the cache */ stretcher_info[best].sx = sx; stretcher_info[best].sxd = sxd; stretcher_info[best].dest_width = dest_width; stretcher_info[best].depth = dest->vtable->color_depth; stretcher_info[best].flags = flags; stretcher_info[best].lru = stretcher_count; - stretcher_info[best].data = _scratch_mem; + #ifdef USE_MMAP_GEN_CODE_BUF + stretcher_info[best].exec = _exec_map; + stretcher_info[best].rw = _rw_map; + stretcher_info[best].size = _map_size; + stretcher_info[best].fd = _map_fd; + #else + stretcher_info[best].exec = _scratch_mem; stretcher_info[best].size = _scratch_mem_size; _scratch_mem = prev_scratch_mem; _scratch_mem_size = prev_scratch_mem_size; + #endif + + /* and call the stretcher */ + _do_stretch(source, dest, stretcher_info[best].exec, sx>>16, sy, syd, + dest_x, dest_y, dest_height, dest->vtable->color_depth); } diff -ur allegro-4.2.0.orig/src/i386/opcodes.h allegro-4.2.0/src/i386/opcodes.h --- allegro-4.2.0.orig/src/i386/opcodes.h 2000-05-14 22:17:13.000000000 +0200 +++ allegro-4.2.0/src/i386/opcodes.h 2006-03-13 23:00:31.000000000 +0100 @@ -19,6 +19,51 @@ #ifndef OPCODES_H #define OPCODES_H +/* mremap is only available under Linux, so is selinux which is the reason for + USE_MMAP_GEN_CODE_BUF so that is no problem. */ +#ifdef ALLEGRO_LINUX + #define USE_MMAP_GEN_CODE_BUF + #define __USE_GNU /* for mremap */ + #include /* for mkstemp */ + #include /* for unlink */ + #include /* for PAGE_SIZE */ + #include /* for mmap */ + + static void *_exec_map; + static void *_rw_map; + static int _map_size; + static int _map_fd; + + #define GROW_GEN_CODE_BUF(size) \ + if (!_map_size) { \ + /* Create backing file. FIXME: error-checking, but how? */ \ + char tempfile_name[] = "/tmp/allegroXXXXXX"; \ + _map_fd = mkstemp(tempfile_name); \ + unlink(tempfile_name); \ + /* Grow backing file to multiple of page size */ \ + _map_size = (size + (PAGE_SIZE-1)) & ~(PAGE_SIZE-1); \ + ftruncate(_map_fd, _map_size); \ + /* And create the 2 mappings */ \ + _exec_map = mmap(0, _map_size, PROT_EXEC | PROT_READ, MAP_SHARED, \ + _map_fd, 0); \ + _rw_map = mmap(0, _map_size, PROT_READ | PROT_WRITE, MAP_SHARED, \ + _map_fd, 0); \ + } \ + else if (size > _map_size) { \ + int old_size = _map_size; \ + /* Grow backing file to multiple of page size */ \ + _map_size = (size + (PAGE_SIZE-1)) & ~(PAGE_SIZE-1); \ + ftruncate(_map_fd, _map_size); \ + /* And remap the 2 mappings */ \ + _exec_map = mremap(_exec_map, old_size, _map_size, MREMAP_MAYMOVE); \ + _rw_map = mremap(_rw_map, old_size, _map_size, MREMAP_MAYMOVE); \ + } + + #define GEN_CODE_BUF _rw_map +#else + #define GROW_GEN_CODE_BUF(size) _grow_scratch_mem(size) + #define GEN_CODE_BUF _scratch_mem +#endif #ifdef ALLEGRO_ASM_USE_FS #define FS_PREFIX() COMPILER_BYTE(0x64) @@ -30,37 +75,37 @@ #define COMPILER_BYTE(val) { \ - *(((unsigned char *)_scratch_mem)+compiler_pos) = val; \ + *(((unsigned char *)GEN_CODE_BUF)+compiler_pos) = val; \ compiler_pos++; \ } #define COMPILER_WORD(val) { \ - *((unsigned short *)(((char *)_scratch_mem)+compiler_pos)) = val; \ + *((unsigned short *)(((char *)GEN_CODE_BUF)+compiler_pos)) = val; \ compiler_pos += 2; \ } #define COMPILER_LONG(val) { \ - *((unsigned long *)(((char *)_scratch_mem)+compiler_pos)) = val; \ + *((unsigned long *)(((char *)GEN_CODE_BUF)+compiler_pos)) = val; \ compiler_pos += 4; \ } #define COMPILER_INC_ESI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x46); /* incl %esi */ \ } #define COMPILER_INC_EDI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x47); /* incl %edi */ \ } #define COMPILER_ADD_ESI(val) { \ - _grow_scratch_mem(compiler_pos+6); \ + GROW_GEN_CODE_BUF(compiler_pos+6); \ COMPILER_BYTE(0x81); /* addl $val, %esi */ \ COMPILER_BYTE(0xC6); \ COMPILER_LONG(val); \ @@ -68,87 +113,87 @@ #define COMPILER_ADD_ECX_EAX() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0x01); /* addl %ecx, %eax */ \ COMPILER_BYTE(0xC8); \ } #define COMPILER_MOV_EAX(val) { \ - _grow_scratch_mem(compiler_pos+5); \ + GROW_GEN_CODE_BUF(compiler_pos+5); \ COMPILER_BYTE(0xB8); /* movl $val, %eax */ \ COMPILER_LONG(val); \ } #define COMPILER_MOV_ECX(val) { \ - _grow_scratch_mem(compiler_pos+5); \ + GROW_GEN_CODE_BUF(compiler_pos+5); \ COMPILER_BYTE(0xB9); /* movl $val, %ecx */ \ COMPILER_LONG(val); \ } #define COMPILER_MOV_EDX(val) { \ - _grow_scratch_mem(compiler_pos+5); \ + GROW_GEN_CODE_BUF(compiler_pos+5); \ COMPILER_BYTE(0xBA); /* movl $val, %edx */ \ COMPILER_LONG(val); \ } #define COMPILER_MOV_EDI_EAX() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0x89); /* movl %edi, %eax */ \ COMPILER_BYTE(0xF8); \ } #define COMPILER_CALL_ESI() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0xFF); /* call *%esi */ \ COMPILER_BYTE(0xD6); \ } #define COMPILER_OUTW() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0x66); /* outw %ax, %dx */ \ COMPILER_BYTE(0xEF); \ } #define COMPILER_PUSH_ESI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x56); /* pushl %esi */ \ } #define COMPILER_PUSH_EDI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x57); /* pushl %edi */ \ } #define COMPILER_POP_ESI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x5E); /* popl %esi */ \ } #define COMPILER_POP_EDI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x5F); /* popl %edi */ \ } #define COMPILER_REP_MOVSB() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0xF2); /* rep */ \ COMPILER_BYTE(0xA4); /* movsb */ \ } #define COMPILER_REP_MOVSW() { \ - _grow_scratch_mem(compiler_pos+3); \ + GROW_GEN_CODE_BUF(compiler_pos+3); \ COMPILER_BYTE(0xF3); /* rep */ \ COMPILER_BYTE(0x66); /* word prefix */ \ COMPILER_BYTE(0xA5); /* movsw */ \ @@ -156,14 +201,14 @@ #define COMPILER_REP_MOVSL() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0xF3); /* rep */ \ COMPILER_BYTE(0xA5); /* movsl */ \ } #define COMPILER_REP_MOVSL2() { \ - _grow_scratch_mem(compiler_pos+17); \ + GROW_GEN_CODE_BUF(compiler_pos+17); \ COMPILER_BYTE(0x8D); /* leal (%ecx, %ecx, 2), %ecx */ \ COMPILER_BYTE(0x0C); \ COMPILER_BYTE(0x49); \ @@ -185,7 +230,7 @@ #define COMPILER_LODSB() { \ - _grow_scratch_mem(compiler_pos+3); \ + GROW_GEN_CODE_BUF(compiler_pos+3); \ COMPILER_BYTE(0x8A); /* movb (%esi), %al */ \ COMPILER_BYTE(0x06); \ COMPILER_BYTE(0x46); /* incl %esi */ \ @@ -193,7 +238,7 @@ #define COMPILER_LODSW() { \ - _grow_scratch_mem(compiler_pos+6); \ + GROW_GEN_CODE_BUF(compiler_pos+6); \ COMPILER_BYTE(0x66); /* word prefix */ \ COMPILER_BYTE(0x8B); /* movw (%esi), %ax */ \ COMPILER_BYTE(0x06); \ @@ -204,7 +249,7 @@ #define COMPILER_LODSL() { \ - _grow_scratch_mem(compiler_pos+5); \ + GROW_GEN_CODE_BUF(compiler_pos+5); \ COMPILER_BYTE(0x8B); /* movl (%esi), %eax */ \ COMPILER_BYTE(0x06); \ COMPILER_BYTE(0x83); /* addl $4, %esi */ \ @@ -214,7 +259,7 @@ #define COMPILER_LODSL2() { \ - _grow_scratch_mem(compiler_pos+15); \ + GROW_GEN_CODE_BUF(compiler_pos+15); \ COMPILER_BYTE(0x8B); /* movl (%esi), %eax */ \ COMPILER_BYTE(0x06); \ COMPILER_BYTE(0x25); /* andl $0xFFFFFF, %eax */ \ @@ -231,7 +276,7 @@ #define COMPILER_STOSB() { \ - _grow_scratch_mem(compiler_pos+4); \ + GROW_GEN_CODE_BUF(compiler_pos+4); \ COMPILER_BYTE(0x26); /* movb %al, %es:(%edi) */ \ COMPILER_BYTE(0x88); \ COMPILER_BYTE(0x07); \ @@ -240,7 +285,7 @@ #define COMPILER_STOSW() { \ - _grow_scratch_mem(compiler_pos+7); \ + GROW_GEN_CODE_BUF(compiler_pos+7); \ COMPILER_BYTE(0x26); /* es segment prefix */ \ COMPILER_BYTE(0x66); /* word prefix */ \ COMPILER_BYTE(0x89); /* movw %ax, %es:(%edi) */ \ @@ -252,7 +297,7 @@ #define COMPILER_STOSL() { \ - _grow_scratch_mem(compiler_pos+6); \ + GROW_GEN_CODE_BUF(compiler_pos+6); \ COMPILER_BYTE(0x26); /* es segment prefix */ \ COMPILER_BYTE(0x89); /* movl %eax, %es:(%edi) */ \ COMPILER_BYTE(0x07); \ @@ -263,7 +308,7 @@ #define COMPILER_STOSL2() { \ - _grow_scratch_mem(compiler_pos+11); \ + GROW_GEN_CODE_BUF(compiler_pos+11); \ COMPILER_BYTE(0x66); /* word prefix */ \ COMPILER_BYTE(0x26); /* es segment prefix */ \ COMPILER_BYTE(0x89); /* movw %ax, %es:(%edi) */ \ @@ -279,7 +324,7 @@ #define COMPILER_MASKED_STOSB(mask_color) { \ - _grow_scratch_mem(compiler_pos+8); \ + GROW_GEN_CODE_BUF(compiler_pos+8); \ COMPILER_BYTE(0x08); /* orb %al, %al */ \ COMPILER_BYTE(0xC0); \ COMPILER_BYTE(0x74); /* jz skip */ \ @@ -292,7 +337,7 @@ #define COMPILER_MASKED_STOSW(mask_color) { \ - _grow_scratch_mem(compiler_pos+13); \ + GROW_GEN_CODE_BUF(compiler_pos+13); \ COMPILER_BYTE(0x66); /* word prefix */ \ COMPILER_BYTE(0x3D); /* cmpw mask_color, %ax */ \ COMPILER_WORD(mask_color); \ @@ -309,7 +354,7 @@ #define COMPILER_MASKED_STOSL(mask_color) { \ - _grow_scratch_mem(compiler_pos+13); \ + GROW_GEN_CODE_BUF(compiler_pos+13); \ COMPILER_BYTE(0x3D); /* cmpl mask_color, %eax */ \ COMPILER_LONG(mask_color); \ COMPILER_BYTE(0x74); /* jz skip */ \ @@ -324,7 +369,7 @@ #define COMPILER_MASKED_STOSL2(mask_color) { \ - _grow_scratch_mem(compiler_pos+18); \ + GROW_GEN_CODE_BUF(compiler_pos+18); \ COMPILER_BYTE(0x3D); /* cmpl mask_color, %eax */ \ COMPILER_LONG(mask_color); \ COMPILER_BYTE(0x74); /* jz skip */ \ @@ -360,7 +405,7 @@ #define COMPILER_MOVB_IMMED(offset, val) { \ - _grow_scratch_mem(MOV_IMMED_SIZE(2+FS_SIZE, offset)); \ + GROW_GEN_CODE_BUF(MOV_IMMED_SIZE(2+FS_SIZE, offset)); \ FS_PREFIX(); /* fs: */ \ COMPILER_BYTE(0xC6); /* movb $val, offset(%eax) */ \ MOV_IMMED(offset); \ @@ -369,7 +414,7 @@ #define COMPILER_MOVW_IMMED(offset, val) { \ - _grow_scratch_mem(MOV_IMMED_SIZE(4+FS_SIZE, offset)); \ + GROW_GEN_CODE_BUF(MOV_IMMED_SIZE(4+FS_SIZE, offset)); \ COMPILER_BYTE(0x66); /* word prefix */ \ FS_PREFIX(); /* fs: */ \ COMPILER_BYTE(0xC7); /* movw $val, offset(%eax) */ \ @@ -379,7 +424,7 @@ #define COMPILER_MOVL_IMMED(offset, val) { \ - _grow_scratch_mem(MOV_IMMED_SIZE(5+FS_SIZE, offset)); \ + GROW_GEN_CODE_BUF(MOV_IMMED_SIZE(5+FS_SIZE, offset)); \ FS_PREFIX(); /* fs: */ \ COMPILER_BYTE(0xC7); /* movl $val, offset(%eax) */ \ MOV_IMMED(offset); \ @@ -388,7 +433,7 @@ #define COMPILER_RET() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0xC3); /* ret */ \ } Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- allegro.spec 11 Mar 2006 22:50:34 -0000 1.28 +++ allegro.spec 13 Mar 2006 22:57:30 -0000 1.29 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 10 +Release: 11 Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -20,6 +20,7 @@ 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 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 @@ -132,6 +133,7 @@ %patch6 -p1 -z .64bit %patch7 -p1 -z .fullscreen %patch8 -p1 -z .mprotect +%patch9 -p1 -z .execheap %build @@ -219,6 +221,10 @@ %changelog +* Mon Mar 13 2006 Hans de Goede 4.2.0-11 +- really, _really_ fix asm stretch code on i386 with NX processors, long +?? story see bugzilla bug 185214 . + * Sat Mar 11 2006 Hans de Goede 4.2.0-10 - really fix asm stretch code on i386 with NX processors, on OpenBSD mprotects first argument does not need to be page-aligned, but on Linux it does. From fedora-extras-commits at redhat.com Mon Mar 13 23:01:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 18:01:33 -0500 Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.12, 1.13 abcm2ps.spec, 1.12, 1.13 sources, 1.12, 1.13 Message-ID: <200603132302.k2DN27e0023444@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23350/FC-4 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Feb 2006 11:30:30 -0000 1.12 +++ .cvsignore 13 Mar 2006 23:01:33 -0000 1.13 @@ -1,2 +1,2 @@ -abcm2ps-4.12.8.tar.gz +abcm2ps-4.12.10.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- abcm2ps.spec 13 Feb 2006 11:30:30 -0000 1.12 +++ abcm2ps.spec 13 Mar 2006 23:01:33 -0000 1.13 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.8 +Version: 4.12.10 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-4.12.8.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.10.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 +* Mon Mar 13 2006 Gerard Milmeister - 4.12.10-1 +- new version 4.12.10 + * Mon Feb 13 2006 Gerard Milmeister - 4.12.8-1 - new version 4.12.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2006 11:30:30 -0000 1.12 +++ sources 13 Mar 2006 23:01:33 -0000 1.13 @@ -1,2 +1,2 @@ -119acfaf7c93ea0a83a69d4c6ae5c9ac abcm2ps-4.12.8.tar.gz +4866c0fdc9a9151e03400bb3fd55bb18 abcm2ps-4.12.10.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Mon Mar 13 23:01:40 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 18:01:40 -0500 Subject: rpms/abcm2ps/devel .cvsignore, 1.12, 1.13 abcm2ps.spec, 1.13, 1.14 sources, 1.12, 1.13 Message-ID: <200603132302.k2DN2FEa023453@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23350/devel Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Feb 2006 11:37:41 -0000 1.12 +++ .cvsignore 13 Mar 2006 23:01:39 -0000 1.13 @@ -1,2 +1,2 @@ -abcm2ps-4.12.8.tar.gz +abcm2ps-4.12.10.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- abcm2ps.spec 17 Feb 2006 20:37:47 -0000 1.13 +++ abcm2ps.spec 13 Mar 2006 23:01:40 -0000 1.14 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.8 -Release: 2%{?dist} +Version: 4.12.10 +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-4.12.8.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.10.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,8 +52,8 @@ %changelog -* Fri Feb 17 2006 Gerard Milmeister - 4.12.8-2 -- Rebuild for Fedora Extras 5 +* Mon Mar 13 2006 Gerard Milmeister - 4.12.10-1 +- new version 4.12.10 * Mon Feb 13 2006 Gerard Milmeister - 4.12.8-1 - new version 4.12.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2006 11:37:41 -0000 1.12 +++ sources 13 Mar 2006 23:01:40 -0000 1.13 @@ -1,2 +1,2 @@ -119acfaf7c93ea0a83a69d4c6ae5c9ac abcm2ps-4.12.8.tar.gz +4866c0fdc9a9151e03400bb3fd55bb18 abcm2ps-4.12.10.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Mon Mar 13 23:15:36 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 13 Mar 2006 18:15:36 -0500 Subject: comps comps-fe5.xml.in,1.21,1.22 Message-ID: <200603132316.k2DNGB9L023612@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23588 Modified Files: comps-fe5.xml.in Log Message: add pork and valknut to comps Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- comps-fe5.xml.in 13 Mar 2006 21:02:56 -0000 1.21 +++ comps-fe5.xml.in 13 Mar 2006 23:15:35 -0000 1.22 @@ -307,6 +307,7 @@ straw sylpheed sylpheed-claws + valknut x3270-x11 xchat-gnome @@ -522,6 +523,7 @@ nget ninja nmh + pork rtorrent snownews tin From fedora-extras-commits at redhat.com Mon Mar 13 23:24:21 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:24:21 -0500 Subject: rpms/libibverbs import.log,1.6,1.7 Message-ID: <200603132324.k2DNOrW6023777@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23743 Modified Files: import.log Log Message: auto-import libibverbs-1.0-1 on branch devel from libibverbs-1.0-1.src.rpm Import libibverbs 1.0 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 16 Feb 2006 19:00:18 -0000 1.6 +++ import.log 13 Mar 2006 23:24:20 -0000 1.7 @@ -3,3 +3,4 @@ libibverbs-1_0-0_3_rc5:FC-4:libibverbs-1.0-0.3.rc5.src.rpm:1137996521 libibverbs-1_0-0_5_rc7:HEAD:libibverbs-1.0-0.5.rc7.src.rpm:1140116192 libibverbs-1_0-0_5_rc7:FC-4:libibverbs-1.0-0.5.rc7.src.rpm:1140116508 +libibverbs-1_0-1:HEAD:libibverbs-1.0-1.src.rpm:1142292336 From fedora-extras-commits at redhat.com Mon Mar 13 23:24:27 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:24:27 -0500 Subject: rpms/libibverbs/devel .cvsignore, 1.4, 1.5 libibverbs.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603132324.k2DNOxNc023782@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23743/devel Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0-1 on branch devel from libibverbs-1.0-1.src.rpm Import libibverbs 1.0 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2006 18:55:08 -0000 1.4 +++ .cvsignore 13 Mar 2006 23:24:26 -0000 1.5 @@ -1 +1 @@ -libibverbs-1.0-rc7.tar.gz +libibverbs-1.0.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libibverbs.spec 16 Feb 2006 18:55:08 -0000 1.3 +++ libibverbs.spec 13 Mar 2006 23:24:26 -0000 1.4 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0-rc7 +%define ver 1.0 Name: libibverbs Version: 1.0 -Release: 0.5.rc7%{?dist} +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-rc7.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sysfsutils-devel @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Thu Feb 16 2006 Roland Dreier - 1.0-1 +- New upstream release + * Wed Feb 15 2006 Roland Dreier - 1.0-0.5.rc7 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2006 18:55:08 -0000 1.4 +++ sources 13 Mar 2006 23:24:26 -0000 1.5 @@ -1 +1 @@ -432245140a984601eaf1a1a6badad709 libibverbs-1.0-rc7.tar.gz +49769f2956f1e6fc40693c924a8d97af libibverbs-1.0.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 23:28:39 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:28:39 -0500 Subject: rpms/libibverbs import.log,1.7,1.8 Message-ID: <200603132329.k2DNTBDB023996@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23962 Modified Files: import.log Log Message: auto-import libibverbs-1.0-1 on branch FC-4 from libibverbs-1.0-1.src.rpm Import libibverbs 1.0 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 13 Mar 2006 23:24:20 -0000 1.7 +++ import.log 13 Mar 2006 23:28:39 -0000 1.8 @@ -4,3 +4,4 @@ libibverbs-1_0-0_5_rc7:HEAD:libibverbs-1.0-0.5.rc7.src.rpm:1140116192 libibverbs-1_0-0_5_rc7:FC-4:libibverbs-1.0-0.5.rc7.src.rpm:1140116508 libibverbs-1_0-1:HEAD:libibverbs-1.0-1.src.rpm:1142292336 +libibverbs-1_0-1:FC-4:libibverbs-1.0-1.src.rpm:1142292600 From fedora-extras-commits at redhat.com Mon Mar 13 23:28:45 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:28:45 -0500 Subject: rpms/libibverbs/FC-4 .cvsignore, 1.4, 1.5 libibverbs.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603132329.k2DNTHUc024001@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23962/FC-4 Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0-1 on branch FC-4 from libibverbs-1.0-1.src.rpm Import libibverbs 1.0 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2006 19:00:23 -0000 1.4 +++ .cvsignore 13 Mar 2006 23:28:45 -0000 1.5 @@ -1 +1 @@ -libibverbs-1.0-rc7.tar.gz +libibverbs-1.0.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/libibverbs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libibverbs.spec 16 Feb 2006 19:00:24 -0000 1.3 +++ libibverbs.spec 13 Mar 2006 23:28:45 -0000 1.4 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0-rc7 +%define ver 1.0 Name: libibverbs Version: 1.0 -Release: 0.5.rc7%{?dist} +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-rc7.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sysfsutils-devel @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Thu Feb 16 2006 Roland Dreier - 1.0-1 +- New upstream release + * Wed Feb 15 2006 Roland Dreier - 1.0-0.5.rc7 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2006 19:00:24 -0000 1.4 +++ sources 13 Mar 2006 23:28:45 -0000 1.5 @@ -1 +1 @@ -432245140a984601eaf1a1a6badad709 libibverbs-1.0-rc7.tar.gz +49769f2956f1e6fc40693c924a8d97af libibverbs-1.0.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 23:36:58 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:36:58 -0500 Subject: rpms/libmthca import.log,1.6,1.7 Message-ID: <200603132337.k2DNbUfp024163@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libmthca In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24129 Modified Files: import.log Log Message: auto-import libmthca-1.0-1 on branch devel from libmthca-1.0-1.src.rpm Import libmthca 1.0 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libmthca/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 16 Feb 2006 19:07:05 -0000 1.6 +++ import.log 13 Mar 2006 23:36:58 -0000 1.7 @@ -3,3 +3,4 @@ libmthca-1_0-0_3_rc5:FC-4:libmthca-1.0-0.3.rc5.src.rpm:1137996363 libmthca-1_0-0_5_rc7:HEAD:libmthca-1.0-0.5.rc7.src.rpm:1140116808 libmthca-1_0-0_5_rc7:FC-4:libmthca-1.0-0.5.rc7.src.rpm:1140116913 +libmthca-1_0-1:HEAD:libmthca-1.0-1.src.rpm:1142293099 From fedora-extras-commits at redhat.com Mon Mar 13 23:37:04 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:37:04 -0500 Subject: rpms/libmthca/devel .cvsignore, 1.4, 1.5 libmthca.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603132337.k2DNbaSP024169@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libmthca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24129/devel Modified Files: .cvsignore libmthca.spec sources Log Message: auto-import libmthca-1.0-1 on branch devel from libmthca-1.0-1.src.rpm Import libmthca 1.0 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmthca/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2006 19:05:25 -0000 1.4 +++ .cvsignore 13 Mar 2006 23:37:04 -0000 1.5 @@ -1 +1 @@ -libmthca-1.0-rc7.tar.gz +libmthca-1.0.tar.gz Index: libmthca.spec =================================================================== RCS file: /cvs/extras/rpms/libmthca/devel/libmthca.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libmthca.spec 16 Feb 2006 19:05:25 -0000 1.3 +++ libmthca.spec 13 Mar 2006 23:37:04 -0000 1.4 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0-rc7 +%define ver 1.0 Name: libmthca Version: 1.0 -Release: 0.5.rc7%{?dist} +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-rc7.tar.gz +Source: http://openib.org/downloads/libmthca-1.0.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 +* Thu Feb 16 2006 Roland Dreier - 1.0-1 +- New upstream release + * Sun Feb 15 2006 Roland Dreier - 1.0-0.5.rc7 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmthca/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2006 19:05:25 -0000 1.4 +++ sources 13 Mar 2006 23:37:04 -0000 1.5 @@ -1 +1 @@ -7972d80c24461ba61996004eb37ae259 libmthca-1.0-rc7.tar.gz +f0a3aba79e35215064c7c45da17f3abe libmthca-1.0.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 23:38:04 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:38:04 -0500 Subject: rpms/libmthca import.log,1.7,1.8 Message-ID: <200603132338.k2DNcall024264@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libmthca In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24230 Modified Files: import.log Log Message: auto-import libmthca-1.0-1 on branch FC-4 from libmthca-1.0-1.src.rpm Import libmthca 1.0 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libmthca/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 13 Mar 2006 23:36:58 -0000 1.7 +++ import.log 13 Mar 2006 23:38:04 -0000 1.8 @@ -4,3 +4,4 @@ libmthca-1_0-0_5_rc7:HEAD:libmthca-1.0-0.5.rc7.src.rpm:1140116808 libmthca-1_0-0_5_rc7:FC-4:libmthca-1.0-0.5.rc7.src.rpm:1140116913 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 From fedora-extras-commits at redhat.com Mon Mar 13 23:38:10 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:38:10 -0500 Subject: rpms/libmthca/FC-4 .cvsignore, 1.4, 1.5 libmthca.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603132338.k2DNch0J024271@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libmthca/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24230/FC-4 Modified Files: .cvsignore libmthca.spec sources Log Message: auto-import libmthca-1.0-1 on branch FC-4 from libmthca-1.0-1.src.rpm Import libmthca 1.0 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmthca/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2006 19:07:31 -0000 1.4 +++ .cvsignore 13 Mar 2006 23:38:10 -0000 1.5 @@ -1 +1 @@ -libmthca-1.0-rc7.tar.gz +libmthca-1.0.tar.gz Index: libmthca.spec =================================================================== RCS file: /cvs/extras/rpms/libmthca/FC-4/libmthca.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libmthca.spec 16 Feb 2006 19:07:31 -0000 1.3 +++ libmthca.spec 13 Mar 2006 23:38:10 -0000 1.4 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0-rc7 +%define ver 1.0 Name: libmthca Version: 1.0 -Release: 0.5.rc7%{?dist} +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-rc7.tar.gz +Source: http://openib.org/downloads/libmthca-1.0.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 +* Thu Feb 16 2006 Roland Dreier - 1.0-1 +- New upstream release + * Sun Feb 15 2006 Roland Dreier - 1.0-0.5.rc7 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmthca/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2006 19:07:31 -0000 1.4 +++ sources 13 Mar 2006 23:38:10 -0000 1.5 @@ -1 +1 @@ -7972d80c24461ba61996004eb37ae259 libmthca-1.0-rc7.tar.gz +f0a3aba79e35215064c7c45da17f3abe libmthca-1.0.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 04:04:20 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 13 Mar 2006 23:04:20 -0500 Subject: rpms/uudeview/devel uudeview.spec,1.8,1.9 Message-ID: <200603140404.k2E44qVB002827@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/uudeview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2810 Modified Files: uudeview.spec Log Message: * Mon Mar 13 2006 Adrian Reber - 0.5.20-7 - rebuilt Index: uudeview.spec =================================================================== RCS file: /cvs/extras/rpms/uudeview/devel/uudeview.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- uudeview.spec 29 Apr 2005 07:57:41 -0000 1.8 +++ uudeview.spec 14 Mar 2006 04:04:19 -0000 1.9 @@ -1,6 +1,6 @@ Name: uudeview Version: 0.5.20 -Release: 6 +Release: 7 License: GPL Group: Applications/File @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: inews, tcl, tk BuildRequires: tetex-latex, transfig, desktop-file-utils -BuildRequires: XFree86-devel, %{_includedir}/tcl.h, %{_includedir}/tk.h +BuildRequires: %{_includedir}/tcl.h, %{_includedir}/tk.h Requires: %{_sbindir}/sendmail %description @@ -82,6 +82,9 @@ %{_libdir}/*.a %changelog +* Mon Mar 13 2006 Adrian Reber - 0.5.20-7 +- rebuilt + * Fri Apr 29 2005 Adrian Reber - 0.5.20-6 - renamed psfig to epsfig in library.ltx (#156249) From fedora-extras-commits at redhat.com Tue Mar 14 05:57:39 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 14 Mar 2006 00:57:39 -0500 Subject: rpms/libibverbs import.log,1.8,1.9 Message-ID: <200603140558.k2E5wCPX005130@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5096 Modified Files: import.log Log Message: auto-import libibverbs-1.0.1-1 on branch devel from libibverbs-1.0.1-1.src.rpm Import libibverbs 1.0.1 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 13 Mar 2006 23:28:39 -0000 1.8 +++ import.log 14 Mar 2006 05:57:39 -0000 1.9 @@ -5,3 +5,4 @@ libibverbs-1_0-0_5_rc7:FC-4:libibverbs-1.0-0.5.rc7.src.rpm:1140116508 libibverbs-1_0-1:HEAD:libibverbs-1.0-1.src.rpm:1142292336 libibverbs-1_0-1:FC-4:libibverbs-1.0-1.src.rpm:1142292600 +libibverbs-1_0_1-1:HEAD:libibverbs-1.0.1-1.src.rpm:1142315940 From fedora-extras-commits at redhat.com Tue Mar 14 05:57:46 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 14 Mar 2006 00:57:46 -0500 Subject: rpms/libibverbs/devel .cvsignore, 1.5, 1.6 libibverbs.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603140558.k2E5wIXT005135@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5096/devel Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0.1-1 on branch devel from libibverbs-1.0.1-1.src.rpm Import libibverbs 1.0.1 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 23:24:26 -0000 1.5 +++ .cvsignore 14 Mar 2006 05:57:45 -0000 1.6 @@ -1 +1 @@ -libibverbs-1.0.tar.gz +libibverbs-1.0.1.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libibverbs.spec 13 Mar 2006 23:24:26 -0000 1.4 +++ libibverbs.spec 14 Mar 2006 05:57:45 -0000 1.5 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0 +%define ver 1.0.1 Name: libibverbs -Version: 1.0 +Version: 1.0.1 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.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sysfsutils-devel @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 13 2006 Roland Dreier - 1.0.1-1 +- New upstream release + * Thu Feb 16 2006 Roland Dreier - 1.0-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 23:24:26 -0000 1.5 +++ sources 14 Mar 2006 05:57:45 -0000 1.6 @@ -1 +1 @@ -49769f2956f1e6fc40693c924a8d97af libibverbs-1.0.tar.gz +641aa8589b0da6032884aa31a6716337 libibverbs-1.0.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 06:18:40 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 14 Mar 2006 01:18:40 -0500 Subject: rpms/libibverbs import.log,1.9,1.10 Message-ID: <200603140619.k2E6JCNr007232@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7198 Modified Files: import.log Log Message: auto-import libibverbs-1.0.1-1 on branch FC-4 from libibverbs-1.0.1-1.src.rpm Import libibverbs 1.0.1 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 14 Mar 2006 05:57:39 -0000 1.9 +++ import.log 14 Mar 2006 06:18:39 -0000 1.10 @@ -6,3 +6,4 @@ libibverbs-1_0-1:HEAD:libibverbs-1.0-1.src.rpm:1142292336 libibverbs-1_0-1:FC-4:libibverbs-1.0-1.src.rpm:1142292600 libibverbs-1_0_1-1:HEAD:libibverbs-1.0.1-1.src.rpm:1142315940 +libibverbs-1_0_1-1:FC-4:libibverbs-1.0.1-1.src.rpm:1142317199 From fedora-extras-commits at redhat.com Tue Mar 14 06:18:46 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 14 Mar 2006 01:18:46 -0500 Subject: rpms/libibverbs/FC-4 .cvsignore, 1.5, 1.6 libibverbs.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603140619.k2E6JI9d007237@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7198/FC-4 Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0.1-1 on branch FC-4 from libibverbs-1.0.1-1.src.rpm Import libibverbs 1.0.1 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 23:28:45 -0000 1.5 +++ .cvsignore 14 Mar 2006 06:18:46 -0000 1.6 @@ -1 +1 @@ -libibverbs-1.0.tar.gz +libibverbs-1.0.1.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/libibverbs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libibverbs.spec 13 Mar 2006 23:28:45 -0000 1.4 +++ libibverbs.spec 14 Mar 2006 06:18:46 -0000 1.5 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0 +%define ver 1.0.1 Name: libibverbs -Version: 1.0 +Version: 1.0.1 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.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sysfsutils-devel @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 13 2006 Roland Dreier - 1.0.1-1 +- New upstream release + * Thu Feb 16 2006 Roland Dreier - 1.0-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 23:28:45 -0000 1.5 +++ sources 14 Mar 2006 06:18:46 -0000 1.6 @@ -1 +1 @@ -49769f2956f1e6fc40693c924a8d97af libibverbs-1.0.tar.gz +641aa8589b0da6032884aa31a6716337 libibverbs-1.0.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 07:53:26 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:53:26 -0500 Subject: rpms/ecl - New directory Message-ID: <200603140753.k2E7rSVp009592@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9584/ecl Log Message: Directory /cvs/extras/rpms/ecl added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 07:53:31 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:53:31 -0500 Subject: rpms/ecl/devel - New directory Message-ID: <200603140753.k2E7rY0V009607@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9584/ecl/devel Log Message: Directory /cvs/extras/rpms/ecl/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 07:53:50 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:53:50 -0500 Subject: rpms/ecl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603140753.k2E7rq8c009641@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9629 Added Files: Makefile import.log Log Message: Setup of module ecl --- NEW FILE Makefile --- # Top level Makefile for module ecl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 14 07:53:56 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:53:56 -0500 Subject: rpms/ecl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603140753.k2E7rwOI009661@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9629/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ecl --- NEW 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 Mar 14 07:56:10 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:56:10 -0500 Subject: rpms/ecl import.log,1.1,1.2 Message-ID: <200603140756.k2E7ugK5009730@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9696 Modified Files: import.log Log Message: auto-import ecl-0.9h-4 on branch devel from ecl-0.9h-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ecl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Mar 2006 07:53:50 -0000 1.1 +++ import.log 14 Mar 2006 07:56:09 -0000 1.2 @@ -0,0 +1 @@ +ecl-0_9h-4:HEAD:ecl-0.9h-4.src.rpm:1142322962 From fedora-extras-commits at redhat.com Tue Mar 14 07:56:15 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:56:15 -0500 Subject: rpms/ecl/devel ecl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603140756.k2E7umoA009734@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9696/devel Modified Files: .cvsignore sources Added Files: ecl.spec Log Message: auto-import ecl-0.9h-4 on branch devel from ecl-0.9h-4.src.rpm --- NEW FILE ecl.spec --- Name: ecl Version: 0.9h Release: 4 Summary: Embeddable Common-Lisp Group: Development/Languages License: LGPL URL: http://ecls.sourceforge.net Source0: http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-0.9h.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel BuildRequires: m4 BuildRequires: texinfo Requires(post): /sbin/install-info Requires(postun): /sbin/install-info %description ECL (Embeddable Common-Lisp) is an interpreter of the Common-Lisp language as described in the X3J13 Ansi specification, featuring CLOS (Common-Lisp Object System), conditions, loops, etc, plus a translator to C, which can produce standalone executables. # no -devel package for header files is split off # since they are required by the main package %prep %setup0 -q # wrong character in texinfo file perl -pi -e 's|\xc7||' src/doc/user.txi %build %configure --enable-boehm=included --enable-threads=yes --with-cxx make (cd build/doc; make all html) %install rm -rf $RPM_BUILD_ROOT make prefix=$RPM_BUILD_ROOT%{_prefix} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ libdir=$RPM_BUILD_ROOT%{_libdir}/ecl \ mandir=$RPM_BUILD_ROOT%{_mandir} \ docdir=$RPM_BUILD_ROOT%{_docdir} \ infodir=$RPM_BUILD_ROOT%{_infodir} \ install rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -fr $RPM_BUILD_ROOT%{_docdir} find $RPM_BUILD_ROOT%{_libdir}/ecl -name '*.lsp' | xargs chmod 0644 %post /sbin/install-info %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || : /sbin/install-info %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || : %postun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || : /sbin/install-info --delete %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || : fi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/ecl %{_bindir}/ecl-config %{_libdir}/ecl %{_mandir}/man*/* %{_infodir}/* %doc ANNOUNCEMENT Copyright LGPL README.1st build/doc/*.html build/doc/ecl build/doc/ecldev %changelog * Tue Mar 14 2006 Gerard Milmeister - 0.9h-4 - removed buildreq perl * Fri Mar 10 2006 Gerard Milmeister - 0.9h-3 - fixed permissions and texinfo problems * Sun Dec 4 2005 Gerard Milmeister - 0.9h-2 - buildreq m4, texinfo * Mon Nov 21 2005 Gerard Milmeister - 0.9h-1 - New Version 0.9h * Sat Aug 20 2005 Gerard Milmeister - 0.9g-1 - New Version 0.9g * Sun Apr 10 2005 Gerard Milmeister - 0.9e-1.cvs20050410 - CVS Version 20050410 * Sun Apr 10 2005 Gerard Milmeister - 0.9e-1 - New Version 0.9e * Sat Nov 6 2004 Gerard Milmeister - 0:0.9-0.fdr.1.d - New Version 0.9d * Sat Mar 27 2004 Gerard Milmeister - 0:0.9-0.fdr.1.c - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ecl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Mar 2006 07:53:56 -0000 1.1 +++ .cvsignore 14 Mar 2006 07:56:15 -0000 1.2 @@ -0,0 +1 @@ +ecl-0.9h.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ecl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Mar 2006 07:53:56 -0000 1.1 +++ sources 14 Mar 2006 07:56:15 -0000 1.2 @@ -0,0 +1 @@ +d02ae5ce7fa48fe534666ce853aaa27e ecl-0.9h.tgz From fedora-extras-commits at redhat.com Tue Mar 14 08:00:42 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 03:00:42 -0500 Subject: owners owners.list,1.741,1.742 Message-ID: <200603140801.k2E81EFh010677@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9832 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.741 retrieving revision 1.742 diff -u -r1.741 -r1.742 --- owners.list 13 Mar 2006 11:14:10 -0000 1.741 +++ owners.list 14 Mar 2006 08:00:41 -0000 1.742 @@ -202,6 +202,7 @@ Fedora Extras|dynamite|Extract data compressed with PKWARE Data Compression Library|andreas.bierfert at lowlatency.de|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|ecl|Embeddable Common-Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|ecore|An event and X abstraction layer|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|edb|A database convenience library wrapped around BDB|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Mar 14 08:26:07 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Tue, 14 Mar 2006 03:26:07 -0500 Subject: rpms/pikdev import.log,1.1,1.2 Message-ID: <200603140826.k2E8Qd4I011900@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11863 Modified Files: import.log Log Message: auto-import pikdev-0.8.4-3 on branch devel from pikdev-0.8.4-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pikdev/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Mar 2006 10:12:55 -0000 1.1 +++ import.log 14 Mar 2006 08:26:06 -0000 1.2 @@ -0,0 +1 @@ +pikdev-0_8_4-3:HEAD:pikdev-0.8.4-3.src.rpm:1142326024 From fedora-extras-commits at redhat.com Tue Mar 14 08:26:13 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Tue, 14 Mar 2006 03:26:13 -0500 Subject: rpms/pikdev/devel LISEZMOI.Fedora, NONE, 1.1 README.Fedora, NONE, 1.1 pikdev.desktop, NONE, 1.1 pikdev.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603140826.k2E8QjFU011904@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11863/devel Modified Files: .cvsignore sources Added Files: LISEZMOI.Fedora README.Fedora pikdev.desktop pikdev.spec Log Message: auto-import pikdev-0.8.4-3 on branch devel from pikdev-0.8.4-3.src.rpm --- NEW FILE LISEZMOI.Fedora --- Pour utiliser pikdev, les utilisateurs ont besoin d'acc??der au(x) port(s) s??rie et/ou parall??le en mode lecture/??criture, suivant le programmateur utilis??. Aussi, le super-utilisateur doit ajouter les utilisateurs susceptibles d'utiliser le programmateur aux groupes uucp (pour le port s??rie) et/ou lp (pour le port parall??le). Pour ce faire, taper la commande suivante : useradd -G lp,uucp utilisateur pour chaque utilisateur que vous souhaitez ajouter. De plus, si un programmateur sur port parall??le est utilis??, il est n??cessaire de charger le module ppdev, gr??ce ?? la commande : modprobe ppdev --- NEW FILE README.Fedora --- This application needs the users to access serial and/or paralell port in RW mode, depends upon the programmer is used. So, administrator have to add allowed users to uucp and/or lp groups. To do this, type the following command line: useradd -G lp,uucp allowed_user for each allowed_user you want to add. And if a paralell port programmer is used, you need to load the ppdev module, by typing the following command line: modprobe ppdev --- NEW FILE pikdev.desktop --- [Desktop Entry] Name=Pikdev Comment=IDE for PICmicro based applications Comment[fr]=Environnement de d??veloppement int??gr?? pour applications ?? base de microcontr??leurs PIC Exec=pikdev -caption "%c" %i %m Icon=pikdev.png Terminal=false Type=Application Encoding=UTF-8 Categories=Application; DocPath=pikdev/index.html --- NEW FILE pikdev.spec --- Name: pikdev Version: 0.8.4 Release: 3%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC Group: Development/Tools License: GPL Url: http://pikdev.free.fr Source0: http://pikdev.free.fr/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source2: README.Fedora Source3: LISEZMOI.Fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, kdelibs-devel Requires: gputils %description PiKdev is a simple IDE dedicated to the development of PIC based applications under KDE. Features: - Integrated editor - Project management - Integrated programming engine for 12, 14 and 16 bits PIC (flash or EPROM technology) - Support for parallel and serial port programmers - KDE compliant look-and-feel WARNING: Administrator have to see the README.Fedora file locate in the %{_docdir}/%{name}-%{version} directory to complete full feature installation. %description -l fr PiKdev est un EDI (Environnement de D??veloppement Int??gr??) d??di?? au d??veloppement, sous KDE, d'applications ?? base de microcontr??leurs PIC de Microchip. Fonctionnalit??s : - ??diteur int??gr?? - Gestionnaire de projet - Engin de programmation int??gr?? pour les PIC 12, 14 et 16 bits (technologie flash ou EPROM) - Gestion des programmateurs pour port parall??le et port s??rie - Conformit?? de l'aspect et de la convivialit?? de KDE ATTENTION : l'installateur du paquetage doit lire le fichier LISEZMOI.Fedora, situ?? dans le r??pertoire %{_docdir}/%{name}-%{version}, afin de voir comment finir l'installation. %prep %setup -q %{__cp} -p %{SOURCE2} . %{__cp} -p %{SOURCE3} . %build %configure --disable-rpath rm -rf pkp cd pikdev make -f Makefile.pkp cd .. cp pikdev/pkp . make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install-strip DESTDIR=$RPM_BUILD_ROOT chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category "Development" \ --add-category "IDE" \ --add-category "X-Fedora" \ %{SOURCE1} %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-, root, root) %doc LICENSE README.Fedora LISEZMOI.Fedora %{_bindir}/* %{_datadir}/applications/* %{_datadir}/apps/%{name}/ %{_datadir}/apps/katepart/syntax/* %{_datadir}/icons/* %changelog * Wed Mar 08 2006 Alain Portal 0.8.4-3 - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5 - Package must own %{_datadir}/apps/%{name} directory * Tue Jan 31 2006 Alain Portal 0.8.4-2 - Don't use the precompiled version of pkp * Mon Jan 30 2006 Alain Portal 0.8.4-1 - New upstream version * Tue Jan 10 2006 Alain Portal 0.8.2-2 - Add the %{?dist} macro * Fri Dec 16 2005 Alain Portal 0.8.2-1 - New version - Add french summary and description - Add french documentation * Mon Jan 10 2005 Alain Portal 0:0.7.2-0.fdr.1 - New version * Mon Nov 08 2004 Alain Portal 0:0.7.1-0.fdr.2 - Add BuildRequires kdelibs-devel, qt-devel, xorg-x11-devel * Wed Oct 27 2004 Alain Portal 0:0.7.1-0.fdr.1 - Initial Fedora RPM - Patch to fix french typo Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pikdev/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Mar 2006 10:13:01 -0000 1.1 +++ .cvsignore 14 Mar 2006 08:26:13 -0000 1.2 @@ -0,0 +1 @@ +pikdev-0.8.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pikdev/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Mar 2006 10:13:01 -0000 1.1 +++ sources 14 Mar 2006 08:26:13 -0000 1.2 @@ -0,0 +1 @@ +95c6cf21241134ed684373b8176f6ea1 pikdev-0.8.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 08:38:53 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 14 Mar 2006 03:38:53 -0500 Subject: rpms/amarok/devel amarok-1.4-engines-cfg.patch, NONE, 1.1 amarok-1.4-helix.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 amarok.spec, 1.43, 1.44 sources, 1.19, 1.20 amarok-1.3-engines-cfg.patch, 1.3, NONE amarok-1.3.4-helix-libs.patch, 1.1, NONE Message-ID: <200603140839.k2E8dPWi012021@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11994 Modified Files: .cvsignore amarok.spec sources Added Files: amarok-1.4-engines-cfg.patch amarok-1.4-helix.patch Removed Files: amarok-1.3-engines-cfg.patch amarok-1.3.4-helix-libs.patch Log Message: version 1.4beta2 amarok-1.4-engines-cfg.patch: --- NEW FILE amarok-1.4-engines-cfg.patch --- diff -Nur amarok-1.3-orig/amarok/src/engine/gst10/config/gstconfig.kcfg amarok-1.3/amarok/src/engine/gst10/config/gstconfig.kcfg --- amarok-1.3-orig/amarok/src/engine/gst10/config/gstconfig.kcfg 2005-08-14 17:53:18.000000000 -0500 +++ amarok-1.3/amarok/src/engine/gst10/config/gstconfig.kcfg 2005-08-16 12:15:31.000000000 -0500 @@ -10,7 +10,7 @@ Select the sound output plugin ("sink"). Their availability depends on the system configuration. - osssink + autoaudiosink amarok-1.4-helix.patch: --- NEW FILE amarok-1.4-helix.patch --- --- ./configure.helix 2006-03-05 20:28:13.000000000 +0100 +++ ./configure 2006-03-13 23:04:01.000000000 +0100 @@ -38181,7 +38181,7 @@ # BEGIN DO_NOT_COMPILE CHECK ############################################################################### -if test x$build_xine != xyes -a x$build_helix != xno; then +if test x$build_xine = xno -a x$build_helix = xno; then DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" no_engine=yes Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 17 Feb 2006 11:00:41 -0000 1.19 +++ .cvsignore 14 Mar 2006 08:38:52 -0000 1.20 @@ -1 +1 @@ -amarok-1.4-beta1.tar.bz2 +amarok-1.4-beta2.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- amarok.spec 22 Feb 2006 09:22:26 -0000 1.43 +++ amarok.spec 14 Mar 2006 08:38:52 -0000 1.44 @@ -7,16 +7,16 @@ Name: amarok Summary: Media player for KDE Version: 1.4 -Release: 0.7.beta1%{?dist} +Release: 0.8.beta2%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.4-beta1.tar.bz2 +Source0: http://dl.sf.net/amarok/amarok-1.4-beta2.tar.bz2 Patch0: amarok-1.4beta1-gst10.patch -#Patch0: amarok-1.3.4-helix-libs.patch +Patch1: amarok-1.4-helix.patch #Patch1: amarok-1.3.6-libtunepimp040.patch -Patch2: amarok-1.3-engines-cfg.patch +Patch2: amarok-1.4-engines-cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -47,7 +47,6 @@ BuildRequires: faad2-devel %endif -Requires: kdemultimedia >= 6:3.2 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -97,15 +96,15 @@ %prep -%setup -q -n %{name}-%{version}-beta1 +%setup -q -n %{name}-%{version}-beta2 # Discover the helix libs -#%patch0 -p1 -b .helix-libs +%patch1 -p1 -b .helix # Use libtunepimp 0.4.0 (api changed) #%patch1 -p1 -b .libtunepimp040 # Gstreamer default sink should be autoaudiosink %patch2 -p1 -b .engines-cfg # Don't use cache to detect gst 0.10 or it will fail because gst 0.8 is not present -%patch0 -p1 -b .gst10 +#%patch0 -p1 -b .gst10 %build @@ -222,8 +221,6 @@ %{_libdir}/libamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop %{_datadir}/apps/profiles/amarok.profile.xml -%{_libdir}/mcop/Amarok -%{_libdir}/mcop/amarok* %{_datadir}/config/amarokrc %{_datadir}/config.kcfg/*.kcfg # Gstreamer engine @@ -237,10 +234,6 @@ # Akode engine %{_datadir}/services/amarok_aKode-engine.desktop %{_libdir}/kde3/libamarok_aKode-engine.* -# Arts engine -%{_libdir}/libamarokarts* -%{_libdir}/kde3/libamarok_artsengine_plugin.* -%{_datadir}/services/amarok_artsengine_plugin.desktop # Helix engine %ifnarch ppc64 x86_64 s390 s390x ia64 %{_libdir}/kde3/libamarok_helixengine_plugin.* @@ -264,6 +257,9 @@ %changelog +* Sun Mar 05 2006 Aurelien Bompard 1.4-0.8.beta2 +- version 1.4 beta2 + * Wed Feb 22 2006 Aurelien Bompard 1.4-0.7.beta1 - disable build of Helix engine on x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 17 Feb 2006 11:00:41 -0000 1.19 +++ sources 14 Mar 2006 08:38:52 -0000 1.20 @@ -1 +1 @@ -78dfa2c8c65cb7fe1cf26aaa6cc193e8 amarok-1.4-beta1.tar.bz2 +0c7e2a5e8ea2d73d8e73b986090cfc37 amarok-1.4-beta2.tar.bz2 --- amarok-1.3-engines-cfg.patch DELETED --- --- amarok-1.3.4-helix-libs.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 14 08:45:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:45:32 -0500 Subject: rpms/nessus-libraries - New directory Message-ID: <200603140845.k2E8jYop012156@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12148/nessus-libraries Log Message: Directory /cvs/extras/rpms/nessus-libraries added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 08:45:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:45:39 -0500 Subject: rpms/nessus-libraries/devel - New directory Message-ID: <200603140845.k2E8jf39012171@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12148/nessus-libraries/devel Log Message: Directory /cvs/extras/rpms/nessus-libraries/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 08:46:00 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:46:00 -0500 Subject: rpms/nessus-libraries Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603140846.k2E8k2lV012205@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12193 Added Files: Makefile import.log Log Message: Setup of module nessus-libraries --- NEW FILE Makefile --- # Top level Makefile for module nessus-libraries all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 14 08:46:05 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:46:05 -0500 Subject: rpms/nessus-libraries/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603140846.k2E8k8hv012225@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12193/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nessus-libraries --- NEW 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 Mar 14 08:46:57 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:46:57 -0500 Subject: rpms/nessus-libraries import.log,1.1,1.2 Message-ID: <200603140847.k2E8lTeY012312@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12270 Modified Files: import.log Log Message: auto-import nessus-libraries-2.2.6-2 on branch devel from nessus-libraries-2.2.6-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Mar 2006 08:46:00 -0000 1.1 +++ import.log 14 Mar 2006 08:46:57 -0000 1.2 @@ -0,0 +1 @@ +nessus-libraries-2_2_6-2:HEAD:nessus-libraries-2.2.6-2.src.rpm:1142326008 From fedora-extras-commits at redhat.com Tue Mar 14 08:47:03 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:47:03 -0500 Subject: rpms/nessus-libraries/devel nessus-libraries-2.2.4.Makefile.patch, NONE, 1.1 nessus-libraries-config.patch, NONE, 1.1 nessus-libraries.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603140847.k2E8lZ1t012316@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12270/devel Modified Files: .cvsignore sources Added Files: nessus-libraries-2.2.4.Makefile.patch nessus-libraries-config.patch nessus-libraries.spec Log Message: auto-import nessus-libraries-2.2.6-2 on branch devel from nessus-libraries-2.2.6-2.src.rpm nessus-libraries-2.2.4.Makefile.patch: --- NEW FILE nessus-libraries-2.2.4.Makefile.patch --- diff -Naurp nessus-libraries.orig/libnessus/Makefile nessus-libraries/libnessus/Makefile --- nessus-libraries.orig/libnessus/Makefile 2004-08-31 19:15:07.000000000 +0200 +++ nessus-libraries/libnessus/Makefile 2005-07-06 12:56:28.000000000 +0200 @@ -72,7 +72,7 @@ ids_send.o : ids_send.c $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ids_send.c bpf_share.o: bpf_share.c - $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c bpf_share.c + $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" -c bpf_share.c rand.o: rand.c $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c rand.c @@ -81,16 +81,16 @@ popen.o: popen.c $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c popen.c services.o: services.c - $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c + $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" -c services.c services1.o: services1.c - $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c + $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c proctitle.o: proctitle.c $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c proctitle.c store.o: store.c - $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c + $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" -c store.c kb.o: kb.c nessus-libraries-config.patch: --- NEW FILE nessus-libraries-config.patch --- --- nessus-config.pre.in.orig 2006-02-24 10:23:33.000000000 +0100 +++ nessus-config.pre.in 2006-02-24 10:24:22.000000000 +0100 @@ -12,8 +12,8 @@ PREFIX=@prefix@ -LIBDIR=$PREFIX/lib -INCLUDEDIR=$PREFIX/include +LIBDIR=@libdir@ +INCLUDEDIR=@includedir@ DEFS="@syspcap@" VERSION=@version@ CIPHER="%CIPHER_LDFLAGS%" --- NEW FILE nessus-libraries.spec --- Name: nessus-libraries Version: 2.2.6 Release: 2%{?dist} Summary: Support libraries for nessus Group: System Environment/Libraries License: GPL URL: http://www.nessus.org Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-libraries-2.2.6.tar.gz Patch0: nessus-libraries-config.patch Patch1: nessus-libraries-2.2.4.Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison BuildRequires: flex BuildRequires: libpcap BuildRequires: openssl-devel %description Support libraries for nessus %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libpcap Requires: openssl-devel %description devel The %{name}-devel package contains the files needed for development with %{name}. %prep %setup -q -n %{name} %patch0 %patch1 -p1 %build %configure --enable-chiper --disable-nessuspcap --enable-shared \ --disable-static --with-pic make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # generate ghost service.* files mkdir -m 0755 -p %{buildroot}%{_localstatedir}/lib/nessus touch %{buildroot}%{_localstatedir}/lib/nessus/services.{tcp,udp,txt} 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 libnessus/COPYING %ghost %dir %{_localstatedir}/lib/nessus %ghost %verify(not md5 size mtime) %{_localstatedir}/lib/nessus/services.* %{_libdir}/libhosts_gatherer.so.* %{_libdir}/libnessus.so.* %exclude %{_sbindir}/uninstall-nessus %files devel %defattr(-,root,root,-) %{_libdir}/libhosts_gatherer.so %{_libdir}/libnessus.so %{_includedir}/nessus %{_mandir}/man1/nessus-config.* %{_bindir}/nessus-config %changelog * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - include patch for localstatedir - build pic only - ghost service files * Tue Feb 21 2006 Andreas Bierfert 2.2.6-1 - Initial Revision Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Mar 2006 08:46:05 -0000 1.1 +++ .cvsignore 14 Mar 2006 08:47:02 -0000 1.2 @@ -0,0 +1 @@ +nessus-libraries-2.2.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Mar 2006 08:46:05 -0000 1.1 +++ sources 14 Mar 2006 08:47:02 -0000 1.2 @@ -0,0 +1 @@ +ac027cd2dfa149a44a6dbb748eb93ce9 nessus-libraries-2.2.6.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 10:41:19 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 05:41:19 -0500 Subject: rpms/diradmin/devel diradmin.spec,1.10,1.11 Message-ID: <200603141041.k2EAfpg0017482@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/diradmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17465 Modified Files: diradmin.spec Log Message: Rework modular X build requirements. Index: diradmin.spec =================================================================== RCS file: /cvs/extras/rpms/diradmin/devel/diradmin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- diradmin.spec 8 Feb 2006 15:10:20 -0000 1.10 +++ diradmin.spec 14 Mar 2006 10:41:18 -0000 1.11 @@ -1,7 +1,7 @@ Summary: User control management tool for LDAP directories Name: diradmin Version: 1.7.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://diradmin.open-it.org/ @@ -10,9 +10,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gnome-libs-devel, openldap-devel, desktop-file-utils BuildRequires: openssl-devel -# Workaround for modular X and gtk+-devel < 1.2.10-48 -BuildRequires: libX11-devel, libXext-devel, libXi-devel -BuildRequires: libXpm-devel, libSM-devel +# Required until libSM-devel gets required by gnome-libs-devel (#184125) +# Use modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libSM-devel, libXpm-devel +%endif + Obsoletes: directory_administrator <= 1.5.1-4 %description @@ -88,6 +91,10 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 1.7.1-4 +- Remove nearly all modular X build requirements (still libSM-devel #184125). +- Add libXpm-devel build requirement, it's an optional configure check. + * Wed Feb 8 2006 Matthias Saou 1.7.1-3 - Rebuild for new gcc/glibc. - Still no fix for #171557 though, sorry. From fedora-extras-commits at redhat.com Tue Mar 14 10:54:50 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 05:54:50 -0500 Subject: rpms/gtktalog/devel gtktalog.spec,1.7,1.8 Message-ID: <200603141055.k2EAtMaS017569@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gtktalog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17547 Modified Files: gtktalog.spec Log Message: Rearrange requirements and build requirements, have eject and ogginfo detected. Index: gtktalog.spec =================================================================== RCS file: /cvs/extras/rpms/gtktalog/devel/gtktalog.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtktalog.spec 9 Feb 2006 10:16:30 -0000 1.7 +++ gtktalog.spec 14 Mar 2006 10:54:49 -0000 1.8 @@ -1,16 +1,18 @@ Summary: The GNOME disk catalog Name: gtktalog Version: 1.0.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Archiving URL: http://www.nongnu.org/gtktalog/ Source: ftp://ftp.gnu.org/savannah/files/gtktalog/gtktalog.pkg/%{version}/gtktalog-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: gnome-libs >= 1.2, zlib, eject, bzip2, /usr/bin/file -BuildRequires: gnome-libs-devel, gtk+-devel, desktop-file-utils, gcc-c++ -%if 0%{?fedora} < 5 -%else +Requires: gnome-libs >= 1.2, unzip, bzip2, file, eject, vorbis-tools +BuildRequires: gnome-libs-devel >= 1.2, desktop-file-utils, gettext-devel +BuildRequires: unzip, bzip2, file, eject, vorbis-tools +# Required until libSM-devel gets required by gnome-libs-devel (#184125) +# Use modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libSM-devel %endif @@ -62,6 +64,11 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 1.0.4-7 +- Make libSM-devel buildd requirement conditional. It souldn't be here + anyway an will go away when #184125 gets fixed. +- Add eject and vorbis-tools (ogginfo) support, rearrange requirements. + * Thu Feb 9 2006 Matthias Saou 1.0.4-6 - Add conditional to build with modular X depending on FC version. - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Tue Mar 14 11:04:10 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 06:04:10 -0500 Subject: rpms/i8kutils/devel i8kbuttons.init,1.6,1.7 i8kutils.spec,1.8,1.9 Message-ID: <200603141104.k2EB4lxZ019622@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/i8kutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19594 Modified Files: i8kbuttons.init i8kutils.spec Log Message: FC5 rebuild and silence possible kernel module insertion error. Index: i8kbuttons.init =================================================================== RCS file: /cvs/extras/rpms/i8kutils/devel/i8kbuttons.init,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- i8kbuttons.init 23 Aug 2005 16:29:05 -0000 1.6 +++ i8kbuttons.init 14 Mar 2006 11:04:08 -0000 1.7 @@ -24,7 +24,7 @@ case "$1" in start) echo -n $"Starting $prog: " - /sbin/modprobe i8k force=1 + /sbin/modprobe i8k force=1 &>/dev/null if pidofproc $prog &>/dev/null; then echo_failure RETVAL=1 Index: i8kutils.spec =================================================================== RCS file: /cvs/extras/rpms/i8kutils/devel/i8kutils.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- i8kutils.spec 9 Feb 2006 15:21:52 -0000 1.8 +++ i8kutils.spec 14 Mar 2006 11:04:10 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools Name: i8kutils Version: 1.25 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Base URL: http://people.debian.org/~dz/i8k/ @@ -83,6 +83,10 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 1.25-6 +- FC5 rebuild. +- Silence possible kernel module insertion error in the init script. + * Thu Feb 9 2006 Matthias Saou 1.25-5 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Tue Mar 14 11:05:06 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 06:05:06 -0500 Subject: rpms/php-eaccelerator/devel .cvsignore, 1.4, 1.5 php-eaccelerator.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200603141105.k2EB5cJ2019686@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19620 Modified Files: .cvsignore php-eaccelerator.spec sources Log Message: Update to latest svn200603090012 snapshot. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Feb 2006 17:12:20 -0000 1.4 +++ .cvsignore 14 Mar 2006 11:05:06 -0000 1.5 @@ -1 +1 @@ -eaccelerator-5.1-cvs200602071647.tar.gz +eaccelerator-svn200603090012.tar.gz Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- php-eaccelerator.spec 9 Feb 2006 17:12:24 -0000 1.8 +++ php-eaccelerator.spec 14 Mar 2006 11:05:06 -0000 1.9 @@ -2,17 +2,17 @@ %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.4.1)} %define module_version 0.9.3 -%define prever cvs200602071647 +%define prever svn200603090012 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 0.1%{?dist} +Release: 0.2%{?dist} License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ #Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.gz -Source: http://snapshots.eaccelerator.net/eaccelerator-5.1-%{prever}.tar.gz +Source: http://snapshots.eaccelerator.net/eaccelerator-%{prever}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: php = %{php_version} Provides: php-zend_extension @@ -29,7 +29,7 @@ %prep #setup -n eaccelerator-%{module_version} -%setup -n eaccelerator-5.1-%{prever} +%setup -n eaccelerator-%{prever} %build @@ -90,6 +90,9 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 5.1.x_0.9.3-0.2 +- Update to latest eaccelerator-svn200603090012 snapshot. + * Thu Feb 9 2006 Matthias Saou 5.1.x_0.9.3-0.1 - Update to 5.1.x compatible snapshot. - Will try to make re2c available in Extras in order to build require it. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Feb 2006 17:12:24 -0000 1.4 +++ sources 14 Mar 2006 11:05:06 -0000 1.5 @@ -1 +1 @@ -6ad0cd6244c8bb165367c848e14dd382 eaccelerator-5.1-cvs200602071647.tar.gz +762cb56c56190186e5e9a46b2fd2798d eaccelerator-svn200603090012.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 12:08:27 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 07:08:27 -0500 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.9,1.10 Message-ID: <200603141209.k2EC916S021869@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21850 Modified Files: php-eaccelerator.spec Log Message: Pass userid 48 to configure script on PPC for sysvipc semaphores. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- php-eaccelerator.spec 14 Mar 2006 11:05:06 -0000 1.9 +++ php-eaccelerator.spec 14 Mar 2006 12:08:27 -0000 1.10 @@ -4,10 +4,14 @@ %define module_version 0.9.3 %define prever svn200603090012 +# This is the apache userid, only used for sysvipc semaphores which is the +# default on ppc since spinlock is not detected +%define userid 48 + Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ @@ -34,7 +38,10 @@ %build phpize -%configure +%configure \ +%ifarch ppc + --with-eaccelerator-userid="%{userid}" +%endif # Set fcntl based semaphores to avoid ipc based locking issues on x86_64 %ifarch x86_64 %{__perl} -pi -e 's|.*(MM_SEM_[A-Z]+).*|/* #undef $1 */|g' config.h @@ -90,6 +97,9 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 5.1.x_0.9.3-0.3 +- Pass userid 48 to configure script on PPC for sysvipc semaphores. + * Tue Mar 14 2006 Matthias Saou 5.1.x_0.9.3-0.2 - Update to latest eaccelerator-svn200603090012 snapshot. From fedora-extras-commits at redhat.com Tue Mar 14 12:12:16 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 14 Mar 2006 07:12:16 -0500 Subject: rpms/phpldapadmin/devel .cvsignore, 1.5, 1.6 phpldapadmin.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200603141212.k2ECCntU021958@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21937 Modified Files: .cvsignore phpldapadmin.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Mar 2006 17:41:50 -0000 1.5 +++ .cvsignore 14 Mar 2006 12:12:16 -0000 1.6 @@ -1 +1 @@ -phpldapadmin-0.9.8.1.tar.gz +phpldapadmin-0.9.8.2.tar.gz Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- phpldapadmin.spec 2 Mar 2006 17:41:50 -0000 1.9 +++ phpldapadmin.spec 14 Mar 2006 12:12:16 -0000 1.10 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.1 +Version: 0.9.8.2 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 +- update to 0.9.8.2 + * Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 - upgrade to 0.9.8.1 - remove unneeded tools dir *.po files in locale dir Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 17:41:50 -0000 1.6 +++ sources 14 Mar 2006 12:12:16 -0000 1.7 @@ -1 +1 @@ -6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz +a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 12:27:01 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 14 Mar 2006 07:27:01 -0500 Subject: rpms/phpldapadmin/FC-4 phpldapadmin.spec,1.10,1.11 sources,1.5,1.6 Message-ID: <200603141227.k2ECRYiW022085@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22066 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/phpldapadmin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- phpldapadmin.spec 2 Mar 2006 17:43:05 -0000 1.10 +++ phpldapadmin.spec 14 Mar 2006 12:27:01 -0000 1.11 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.1 +Version: 0.9.8.2 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 +- update to 0.9.8.2 + * Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 - upgrade to 0.9.8.1 - remove unneeded tools dir *.po files in locale dir Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Mar 2006 17:43:05 -0000 1.5 +++ sources 14 Mar 2006 12:27:01 -0000 1.6 @@ -1 +1 @@ -6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz +a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 12:28:04 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 14 Mar 2006 07:28:04 -0500 Subject: rpms/phpldapadmin/FC-3 phpldapadmin.spec,1.9,1.10 sources,1.5,1.6 Message-ID: <200603141228.k2ECSa1Z022153@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22134 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/phpldapadmin.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- phpldapadmin.spec 2 Mar 2006 17:44:39 -0000 1.9 +++ phpldapadmin.spec 14 Mar 2006 12:28:04 -0000 1.10 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.1 +Version: 0.9.8.2 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 +- update to 0.9.8.2 + * Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 - upgrade to 0.9.8.1 - remove unneeded tools dir *.po files in locale dir Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Mar 2006 17:44:39 -0000 1.5 +++ sources 14 Mar 2006 12:28:04 -0000 1.6 @@ -1 +1 @@ -6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz +a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 12:32:55 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 14 Mar 2006 07:32:55 -0500 Subject: fedora-security/audit fc4,1.171,1.172 fc5,1.79,1.80 Message-ID: <200603141232.k2ECWtse022229@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22209 Modified Files: fc4 fc5 Log Message: Note new gnupg issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- fc4 9 Mar 2006 12:04:35 -0000 1.171 +++ fc4 14 Mar 2006 12:32:47 -0000 1.172 @@ -76,6 +76,7 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] patch-2.6.15.5 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) +CVE-2006-0049 version (gnupg, 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.5 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- fc5 13 Mar 2006 13:28:27 -0000 1.79 +++ fc5 14 Mar 2006 12:32:47 -0000 1.80 @@ -90,6 +90,7 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) patch-2.6.16-rc3 CVE-2006-0082 version (ImageMagick, not 6.2.5.4) +CVE-2006-0049 VULNERABLE (gnupg, fixed 1.4.2.2) CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 From fedora-extras-commits at redhat.com Tue Mar 14 12:33:31 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 14 Mar 2006 07:33:31 -0500 Subject: rpms/worminator/devel worminator.spec,1.1,1.2 Message-ID: <200603141234.k2ECY3nK022252@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22235 Modified Files: worminator.spec Log Message: * Tue Mar 14 2006 Hans de Goede 3.0R2.1-2 - move worminator data dir from /usr/share/games to just /usr/share to match the games-SIG guidelines. Sorry about the somewhat large download for effectivly no changes, but I wanted to make this change before FC5 release. Index: worminator.spec =================================================================== RCS file: /cvs/extras/rpms/worminator/devel/worminator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- worminator.spec 6 Mar 2006 07:19:09 -0000 1.1 +++ worminator.spec 14 Mar 2006 12:33:31 -0000 1.2 @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Sidescrolling platform and shoot'em up action-game Group: Amusements/Games License: GPL @@ -10,7 +10,7 @@ Source2: worminator.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel, desktop-file-utils -Requires: worminator-data = 3.0R2.1 +Requires: worminator-data >= 3.0R2.1-2 %description You play as The Worminator and fight your way through many levels of madness @@ -24,7 +24,7 @@ %build gcc $RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations \ - -Wno-char-subscripts -DDATADIR=\"%{_datadir}/games/%{name}/\" -o %{name} \ + -Wno-char-subscripts -DDATADIR=\"%{_datadir}/%{name}/\" -o %{name} \ Worminator.c `allegro-config --libs` @@ -69,6 +69,11 @@ %changelog +* Tue Mar 14 2006 Hans de Goede 3.0R2.1-2 +- move worminator data dir from /usr/share/games to just /usr/share to match + the games-SIG guidelines. Sorry about the somewhat large download for + effectivly no changes, but I wanted to make this change before FC5 release. + * Sat Mar 4 2006 Hans de Goede 3.0R2.1-1 - initial Fedora Extras package - loosely based on the SRPM from Cru: From fedora-extras-commits at redhat.com Tue Mar 14 12:47:13 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 14 Mar 2006 07:47:13 -0500 Subject: fedora-security/audit fc4,1.172,1.173 fc5,1.80,1.81 Message-ID: <200603141247.k2EClDnj022342@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22320 Modified Files: fc4 fc5 Log Message: Minor fixes Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- fc4 14 Mar 2006 12:32:47 -0000 1.172 +++ fc4 14 Mar 2006 12:47:06 -0000 1.173 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060308 -Up to date FC4 as of 20060308 +Up to date CVE as of CVE email 20060313 +Up to date FC4 as of 20060313 ** are items that need attention @@ -9,17 +9,18 @@ CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe -CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) CVE-2006-0746 VULNERABLE (kpdf) bz#184308 +CVE-2006-0742 VULNERABLE (kernel) CVE-2006-0741 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 version (postgresql, 8.1 only) CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107] CVE-2006-0591 version (postgresql, fixed 8.0.6) [since FEDORA-2005-021] CVE-2006-0576 VULNERABLE (oprofile) +CVE-2006-0557 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0555 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0554 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0553 version (postgresql, 8.1 only) @@ -28,6 +29,7 @@ CVE-2006-0496 VULNERABLE (firefox) CVE-2006-0482 ignore (kernel) sparc only CVE-2006-0481 version (libpng, 1.2.7 only) +CVE-2006-0459 version (flex) by inspection CVE-2006-0457 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0455 version (gnupg, fixed 1.4.2.1) [since FEDORA-2006-116] CVE-2006-0454 backport (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3 @@ -76,7 +78,8 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] patch-2.6.15.5 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) -CVE-2006-0049 version (gnupg, 1.4.2.2) [since FEDORA-2006-147] +CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] +CVE-2006-0040 VULNERABLE (gtkhtml) CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.5 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- fc5 14 Mar 2006 12:32:47 -0000 1.80 +++ fc5 14 Mar 2006 12:47:06 -0000 1.81 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060312 +Up to date CVE as of CVE email 20060313 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -23,7 +23,6 @@ CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe -CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) low/not upstream yet CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) @@ -42,6 +41,7 @@ CVE-2006-0496 VULNERABLE (firefox) not fixed upstream CVE-2006-0482 ignore (kernel) sparc only CVE-2006-0481 version (libpng, 1.2.7 only) +CVE-2006-0459 version (flex) by inspection CVE-2006-0455 version (gnupg, fixed 1.4.2.1) CVE-2006-0454 backport (kernel, fixed 2.6.15.3) patch-2.6.16-rc3 CVE-2006-0405 version (libtiff, 3.8.0 only) From fedora-extras-commits at redhat.com Tue Mar 14 13:35:37 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 14 Mar 2006 08:35:37 -0500 Subject: rpms/worminator-data/devel worminator-data.spec,1.1,1.2 Message-ID: <200603141336.k2EDa9pW024434@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24417 Modified Files: worminator-data.spec Log Message: * Tue Mar 14 2006 Hans de Goede 3.0R2.1-2 - move worminator data dir from /usr/share/games to just /usr/share to match the games-SIG guidelines. Sorry about the somewhat large download for effectivly no changes, but I wanted to make this change before FC5 release. Index: worminator-data.spec =================================================================== RCS file: /cvs/extras/rpms/worminator-data/devel/worminator-data.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- worminator-data.spec 6 Mar 2006 07:16:07 -0000 1.1 +++ worminator-data.spec 14 Mar 2006 13:35:37 -0000 1.2 @@ -1,6 +1,6 @@ Name: worminator-data Version: 3.0R2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Data for worminator the game Group: Amusements/Games License: GPL @@ -29,9 +29,9 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/games/worminator -tar xzf %{SOURCE0} -C $RPM_BUILD_ROOT%{_datadir}/games/worminator -rm $RPM_BUILD_ROOT%{_datadir}/games/worminator/ICON.ICO +mkdir -p $RPM_BUILD_ROOT%{_datadir}/worminator +tar xzf %{SOURCE0} -C $RPM_BUILD_ROOT%{_datadir}/worminator +rm $RPM_BUILD_ROOT%{_datadir}/worminator/ICON.ICO %clean @@ -41,10 +41,15 @@ %files %defattr(-,root,root) %doc license.txt license-change.txt -%{_datadir}/games/worminator +%{_datadir}/worminator %changelog +* Tue Mar 14 2006 Hans de Goede 3.0R2.1-2 +- move worminator data dir from /usr/share/games to just /usr/share to match + the games-SIG guidelines. Sorry about the somewhat large download for + effectivly no changes, but I wanted to make this change before FC5 release. + * Sat Mar 4 2006 Hans de Goede 3.0R2.1-1 - initial Fedora Extras package - loosely based on the SRPM from Cru: From fedora-extras-commits at redhat.com Tue Mar 14 14:59:13 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Tue, 14 Mar 2006 09:59:13 -0500 Subject: rpms/gpsim/devel gpsim-0.21.11.happy_gcc, NONE, 1.1 gpsim.spec, 1.5, 1.6 Message-ID: <200603141459.k2EExjBt026615@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26571 Modified Files: gpsim.spec Added Files: gpsim-0.21.11.happy_gcc Log Message: Add patch to fix a compile time error with gcc-4.1.0. --- NEW FILE gpsim-0.21.11.happy_gcc --- --- gpsim-0.21.11/src/value.h 2005-09-07 15:34:24.000000000 +0200 +++ gpsim-0.21.11.fix/src/value.h 2006-03-14 15:31:44.000000000 +0100 @@ -290,7 +290,7 @@ bool getVal() { return value; } - static Boolean* Boolean::typeCheck(Value* val, string valDesc); + static Boolean* typeCheck(Value* val, string valDesc); virtual bool compare(ComparisonOperator *compOp, Value *rvalue); virtual Value *copy() { return new Boolean(value); } @@ -353,9 +353,9 @@ virtual char *toString(char *, int len); virtual char *toBitStr(char *, int len); - static Integer* Integer::typeCheck(Value* val, string valDesc); - static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin); - static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax); + static Integer* typeCheck(Value* val, string valDesc); + static Integer* assertValid(Value* val, string valDesc, gint64 valMin); + static Integer* assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax); virtual bool compare(ComparisonOperator *compOp, Value *rvalue); inline operator gint64() { @@ -498,7 +498,7 @@ /// copy the object value to a user char array virtual char *toString(char *, int len); - static AbstractRange* AbstractRange::typeCheck(Value* val, string valDesc); + static AbstractRange* typeCheck(Value* val, string valDesc); virtual bool compare(ComparisonOperator *compOp, Value *rvalue); private: Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gpsim.spec 13 Mar 2006 10:00:51 -0000 1.5 +++ gpsim.spec 14 Mar 2006 14:59:13 -0000 1.6 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.21.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -8,6 +8,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+extra-devel, flex, readline-devel @@ -43,6 +44,7 @@ %prep %setup -q +%patch -p1 %{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm %build @@ -78,6 +80,9 @@ %{_includedir}/* %changelog +* Tue Mar 14 2006 Alain Portal 0.21.11-4 + - Patch to make gcc-4.1.0 happy + * Mon Mar 13 2006 Alain Portal 0.21.11-3 - Rebuild for FE5 From fedora-extras-commits at redhat.com Tue Mar 14 15:05:44 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 10:05:44 -0500 Subject: rpms/hercules/devel .cvsignore, 1.3, 1.4 hercules.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200603141506.k2EF6I8b028668@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/hercules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28619 Modified Files: .cvsignore hercules.spec sources Log Message: Upate to 3.03.1, then 3.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Jan 2005 14:27:55 -0000 1.3 +++ .cvsignore 14 Mar 2006 15:05:31 -0000 1.4 @@ -1 +1 @@ -hercules-3.02.tar.gz +hercules-3.04.tar.gz Index: hercules.spec =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/hercules.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hercules.spec 23 May 2005 10:41:05 -0000 1.8 +++ hercules.spec 14 Mar 2006 15:05:31 -0000 1.9 @@ -2,8 +2,8 @@ Summary: Hercules S/370, ESA/390, and z/Architecture emulator Name: hercules -Version: 3.02 -Release: %{?date:0.%{date}.}3 +Version: 3.04 +Release: 1%{?date:.%{date}} License: QPL Group: Applications/Emulators URL: http://www.conmicro.cx/hercules/ @@ -20,12 +20,13 @@ card reader, card punch, channel-to-channel adapter, LCS Ethernet, and printer-keyboard, 3270 terminal, and 3287 printer devices. + %prep %setup -n %{name}-%{version}%{?date:-cvs} ### FIXME: Make buildsystem use standard autotools directories (Fix upstream please) %{__perl} -pi.orig -e 's|^(modexecdir) =.*$|$1 = \$(libdir)/hercules|' \ - Makefile.in crypto/Makefile.in + Makefile.in crypto/Makefile.in %{__mv} hercules.cnf hercules.cnf.sample %{__cat} <hercules.cnf @@ -98,13 +99,13 @@ unset LANG LC_COLLATE if [ `id -u` != 0 ]; then - echo "This script requires root permissions." - exit 1 + echo "This script requires root permissions." + exit 1 fi lsmod | grep -q ipchains && { - echo "ipchains module is already loaded, cannot setup iptables." - exit 1 + echo "ipchains module is already loaded, cannot setup iptables." + exit 1 } ### This device must be present for hercules to setup networking. @@ -116,7 +117,7 @@ ### Enable IP forwarding, you can permanently change this in in ### /etc/sysctl.conf with "net.ipv4.ip_forward = 1". -echo "1" >/proc/sys/net/ipv4/ip_forward +echo "1" > /proc/sys/net/ipv4/ip_forward ### Masquerade the hercules network. iptables -t nat -A POSTROUTING -s ${HERCNET} -j MASQUERADE @@ -142,12 +143,14 @@ EOT EOF + %build %configure \ - --enable-dependency-tracking \ - --enable-optimization="%{optflags}" + --enable-dependency-tracking \ + --enable-optimization="%{optflags}" %{__make} %{?_smp_mflags} + %install %{__rm} -rf %{buildroot} %makeinstall @@ -157,6 +160,7 @@ %{__install} -m0644 hercules.cnf hercules.{ins,prm,tdf} \ %{buildroot}%{_sysconfdir}/hercules/ + %clean %{__rm} -rf %{buildroot} @@ -173,7 +177,14 @@ %exclude %{_libdir}/*.la %{_mandir}/man?/* + %changelog +* Tue Mar 14 2006 Matthias Saou 3.04-1 +- Update to 3.04. + +* Thu Feb 9 2006 Matthias Saou 3.03.1-1 +- Update to 3.03.1. + * Sun May 22 2005 Jeremy Katz - 3.02-3 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Jan 2005 14:27:55 -0000 1.3 +++ sources 14 Mar 2006 15:05:31 -0000 1.4 @@ -1 +1 @@ -d765ad315a1eba281bd816e63d854dc5 hercules-3.02.tar.gz +7c7df7d52bf0365d5cbe051dc9e2e481 hercules-3.04.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 15:23:38 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 14 Mar 2006 10:23:38 -0500 Subject: rpms/deskbar-applet/devel deskbar-applet.spec, 1.20, 1.21 fedorabz.py, 1.6, 1.7 Message-ID: <200603141524.k2EFOAuJ028861@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28835 Modified Files: deskbar-applet.spec fedorabz.py Log Message: Fixed bug in Fedora Bugzilla handler (#184231) Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- deskbar-applet.spec 13 Mar 2006 05:49:42 -0000 1.20 +++ deskbar-applet.spec 14 Mar 2006 15:23:37 -0000 1.21 @@ -3,7 +3,7 @@ Name: deskbar-applet Version: 2.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet @@ -84,6 +84,9 @@ %{_datadir}/pixmaps/%{name}.svg %changelog +* Tue Mar 14 2006 Ignacio Vazquez-Abrams 2.14.0-2 +- Fixed bug in Fedora Bugzilla handler (#184231) + * Sun Mar 12 2006 Ignacio Vazquez-Abrams 2.14.0-1 - Upstream update Index: fedorabz.py =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/fedorabz.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fedorabz.py 3 Feb 2006 00:13:25 -0000 1.6 +++ fedorabz.py 14 Mar 2006 15:23:37 -0000 1.7 @@ -32,3 +32,5 @@ def query(self, query, max=5): if query.isdigit(): return [FedoraBZMatch(self, name=query)] + else: + return [] From fedora-extras-commits at redhat.com Tue Mar 14 15:27:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 10:27:30 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-4 .cvsignore, 1.11, 1.12 perl-ExtUtils-CBuilder.spec, 1.15, 1.16 sources, 1.11, 1.12 Message-ID: <200603141528.k2EFS23F028946@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28908/FC-4 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.16. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 6 Oct 2005 22:02:26 -0000 1.11 +++ .cvsignore 14 Mar 2006 15:27:29 -0000 1.12 @@ -1 +1 @@ -ExtUtils-CBuilder-0.15.tar.gz +ExtUtils-CBuilder-0.16.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-ExtUtils-CBuilder.spec 6 Oct 2005 22:02:26 -0000 1.15 +++ perl-ExtUtils-CBuilder.spec 14 Mar 2006 15:27:29 -0000 1.16 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.15 +Version: 0.16 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -11,7 +11,7 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module can build the C portions of Perl modules by invoking the @@ -53,6 +53,12 @@ %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 0.16-1 +- Update to 0.16. + +* Wed Feb 15 2006 Jose Pedro Oliveira - 0.15-2 +- Rebuild for FC5 (perl 5.8.8). + * Thu Oct 6 2005 Jose Pedro Oliveira - 0.15-1 - Update 0.15. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 6 Oct 2005 22:02:26 -0000 1.11 +++ sources 14 Mar 2006 15:27:29 -0000 1.12 @@ -1 +1 @@ -f104f2221f43c27c3b164ce94e138b97 ExtUtils-CBuilder-0.15.tar.gz +3436fdd2b13cabb95a59df5e699fa6f3 ExtUtils-CBuilder-0.16.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 15:27:35 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 10:27:35 -0500 Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.11, 1.12 perl-ExtUtils-CBuilder.spec, 1.16, 1.17 sources, 1.11, 1.12 Message-ID: <200603141528.k2EFS8wJ028951@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28908/devel Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.16. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 6 Oct 2005 21:53:05 -0000 1.11 +++ .cvsignore 14 Mar 2006 15:27:35 -0000 1.12 @@ -1 +1 @@ -ExtUtils-CBuilder-0.15.tar.gz +ExtUtils-CBuilder-0.16.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-ExtUtils-CBuilder.spec 15 Feb 2006 18:00:57 -0000 1.16 +++ perl-ExtUtils-CBuilder.spec 14 Mar 2006 15:27:35 -0000 1.17 @@ -1,6 +1,6 @@ Name: perl-ExtUtils-CBuilder -Version: 0.15 -Release: 2%{?dist} +Version: 0.16 +Release: 1%{?dist} Summary: Compile and link C code for Perl modules Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 0.16-1 +- Update to 0.16. + * Wed Feb 15 2006 Jose Pedro Oliveira - 0.15-2 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 6 Oct 2005 21:53:05 -0000 1.11 +++ sources 14 Mar 2006 15:27:35 -0000 1.12 @@ -1 +1 @@ -f104f2221f43c27c3b164ce94e138b97 ExtUtils-CBuilder-0.15.tar.gz +3436fdd2b13cabb95a59df5e699fa6f3 ExtUtils-CBuilder-0.16.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 15:57:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 10:57:33 -0500 Subject: rpms/multitail/FC-4 .cvsignore, 1.2, 1.3 multitail.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603141558.k2EFw55X029329@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29291/FC-4 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 3.8.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Mar 2006 21:09:47 -0000 1.2 +++ .cvsignore 14 Mar 2006 15:57:33 -0000 1.3 @@ -1 +1 @@ -multitail-3.8.7.tgz +multitail-3.8.9.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/multitail.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multitail.spec 8 Mar 2006 21:09:47 -0000 1.1 +++ multitail.spec 14 Mar 2006 15:57:33 -0000 1.2 @@ -1,6 +1,6 @@ Name: multitail -Version: 3.8.7 -Release: 3%{?dist} +Version: 3.8.9 +Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows Group: Applications/Text @@ -52,6 +52,9 @@ %{_bindir}/multitail %changelog +* Tue Mar 14 2006 Folkert van Heuesden - 3.8.9-1 +- Updated to release 3.8.9. + * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7-3 - Small changes as suggested in #182122. - Updated to release 3.8.7-3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Mar 2006 21:09:47 -0000 1.2 +++ sources 14 Mar 2006 15:57:33 -0000 1.3 @@ -1 +1 @@ -b216c9e0d598e3e048b2c6738a54ba08 multitail-3.8.7.tgz +feac6869ddb5ee974abbe52a0130af7e multitail-3.8.9.tgz From fedora-extras-commits at redhat.com Tue Mar 14 15:57:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 10:57:39 -0500 Subject: rpms/multitail/devel .cvsignore, 1.2, 1.3 multitail.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603141558.k2EFwBWe029334@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29291/devel Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 3.8.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Mar 2006 21:09:47 -0000 1.2 +++ .cvsignore 14 Mar 2006 15:57:38 -0000 1.3 @@ -1 +1 @@ -multitail-3.8.7.tgz +multitail-3.8.9.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multitail.spec 8 Mar 2006 21:09:47 -0000 1.1 +++ multitail.spec 14 Mar 2006 15:57:38 -0000 1.2 @@ -1,6 +1,6 @@ Name: multitail -Version: 3.8.7 -Release: 3%{?dist} +Version: 3.8.9 +Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows Group: Applications/Text @@ -52,6 +52,9 @@ %{_bindir}/multitail %changelog +* Tue Mar 14 2006 Folkert van Heuesden - 3.8.9-1 +- Updated to release 3.8.9. + * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7-3 - Small changes as suggested in #182122. - Updated to release 3.8.7-3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Mar 2006 21:09:47 -0000 1.2 +++ sources 14 Mar 2006 15:57:38 -0000 1.3 @@ -1 +1 @@ -b216c9e0d598e3e048b2c6738a54ba08 multitail-3.8.7.tgz +feac6869ddb5ee974abbe52a0130af7e multitail-3.8.9.tgz From fedora-extras-commits at redhat.com Tue Mar 14 16:30:39 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 11:30:39 -0500 Subject: rpms/d4x/devel d4x.spec,1.10,1.11 Message-ID: <200603141631.k2EGVCci031839@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/d4x/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31819 Modified Files: d4x.spec Log Message: FC5 rebuild (and modular X support). Index: d4x.spec =================================================================== RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- d4x.spec 2 Nov 2005 13:11:56 -0000 1.10 +++ d4x.spec 14 Mar 2006 16:30:39 -0000 1.11 @@ -4,7 +4,7 @@ Summary: Downloader for X that supports resuming and many other features Name: d4x Version: 2.5.6 -Release: 1%{?pre:.%{pre}}%{?dist} +Release: 2%{?pre:.%{pre}}%{?dist} Group: Applications/Internet License: Artistic URL: http://www.krasu.ru/soft/chuchelo/ @@ -12,6 +12,10 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel BuildRequires: libao-devel, esound-devel, desktop-file-utils, openssl-devel +# Use modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libXt-devel +%endif %description This program lets you download files from the internet using either the ftp @@ -66,6 +70,11 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 2.5.6-2 +- FC5 rebuild... the build error that kept this rebuild pending was only X + not being detected by configure (libXt-devel missing) that was not making + configure exit... because make then failed miserably. + * Wed Nov 2 2005 Matthias Saou 2.5.6-1 - Update to 2.5.6. From fedora-extras-commits at redhat.com Tue Mar 14 16:39:55 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 14 Mar 2006 11:39:55 -0500 Subject: rpms/uudeview/devel uudeview.spec,1.9,1.10 Message-ID: <200603141640.k2EGeRMr031941@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/uudeview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31922 Modified Files: uudeview.spec Log Message: * Mon Mar 13 2006 Adrian Reber - 0.5.20-8 - make it also build on x86_64 Index: uudeview.spec =================================================================== RCS file: /cvs/extras/rpms/uudeview/devel/uudeview.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- uudeview.spec 14 Mar 2006 04:04:19 -0000 1.9 +++ uudeview.spec 14 Mar 2006 16:39:55 -0000 1.10 @@ -1,6 +1,6 @@ Name: uudeview Version: 0.5.20 -Release: 7 +Release: 8 License: GPL Group: Applications/File @@ -39,6 +39,7 @@ %patch0 -p1 %patch1 -p0 %{__sed} -i -e "s,psfig,epsfig,g" doc/library.ltx +%{__sed} -i -e "s,for ff_subdir in lib,for ff_subdir in %{_lib},g" configure %build %configure --enable-sendmail=%{_sbindir}/sendmail @@ -82,6 +83,9 @@ %{_libdir}/*.a %changelog +* Mon Mar 13 2006 Adrian Reber - 0.5.20-8 +- make it also build on x86_64 + * Mon Mar 13 2006 Adrian Reber - 0.5.20-7 - rebuilt From fedora-extras-commits at redhat.com Tue Mar 14 16:57:32 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 14 Mar 2006 11:57:32 -0500 Subject: rpms/banshee/devel .cvsignore, 1.3, 1.4 banshee.spec, 1.5, 1.6 sources, 1.3, 1.4 banshee-0.10.7-dll-path.patch, 1.1, NONE Message-ID: <200603141658.k2EGw4sI032029@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32008 Modified Files: .cvsignore banshee.spec sources Removed Files: banshee-0.10.7-dll-path.patch Log Message: * Tue Mar 14 2006 Christopher Aillon 0.10.8-1 - Update to 0.10.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Mar 2006 19:57:34 -0000 1.3 +++ .cvsignore 14 Mar 2006 16:57:31 -0000 1.4 @@ -1 +1 @@ -banshee-0.10.7.tar.gz +banshee-0.10.8.tar.gz Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- banshee.spec 9 Mar 2006 18:22:51 -0000 1.5 +++ banshee.spec 14 Mar 2006 16:57:31 -0000 1.6 @@ -1,6 +1,6 @@ Name: banshee -Version: 0.10.7 -Release: 2 +Version: 0.10.8 +Release: 1 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -29,8 +29,6 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -Patch1: banshee-0.10.7-dll-path.patch - %description Banshee allows you to import CDs, sync your music collection to an iPod, play music directly from an iPod, create playlists with songs from your @@ -38,7 +36,6 @@ %prep %setup -q -%patch1 -p1 -b .dll-path %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -99,6 +96,9 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Tue Mar 14 2006 Christopher Aillon 0.10.8-1 +- Update to 0.10.8 + * Thu Mar 9 2006 Christopher Aillon 0.10.7-2 - Add explicit Requires on libipoddevice (#184482) Index: sources =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2006 19:57:34 -0000 1.3 +++ sources 14 Mar 2006 16:57:31 -0000 1.4 @@ -1 +1 @@ -cae68ff23077f4ec37ab23b040c2470a banshee-0.10.7.tar.gz +cfa4051cd8aba171a09dcb9a3f34fef3 banshee-0.10.8.tar.gz --- banshee-0.10.7-dll-path.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 14 17:21:16 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Tue, 14 Mar 2006 12:21:16 -0500 Subject: rpms/gpsim/devel gpsim-0.21.11.happy_gcc,1.1,1.2 Message-ID: <200603141721.k2EHLpb0001953@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1934 Modified Files: gpsim-0.21.11.happy_gcc Log Message: Update patch. Index: gpsim-0.21.11.happy_gcc =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim-0.21.11.happy_gcc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gpsim-0.21.11.happy_gcc 14 Mar 2006 14:59:13 -0000 1.1 +++ gpsim-0.21.11.happy_gcc 14 Mar 2006 17:21:15 -0000 1.2 @@ -1,3 +1,16 @@ +diff -ru gpsim-0.21.11/cli/ui_gpsim.cc gpsim-0.21.11.fix/cli/ui_gpsim.cc +--- gpsim-0.21.11/cli/ui_gpsim.cc 2005-09-24 05:59:20.000000000 +0200 ++++ gpsim-0.21.11.fix/cli/ui_gpsim.cc 2006-03-14 18:34:12.000000000 +0100 +@@ -34,7 +34,7 @@ + CGpsimUserInterface(const char *paStrings[]); + virtual ~CGpsimUserInterface() {} + +- void CGpsimUserInterface::SetStreams(FILE *in, FILE *out); ++ void SetStreams(FILE *in, FILE *out); + virtual ISimConsole &GetConsole(); + virtual void DisplayMessage(unsigned int uStringID, ...); + virtual void DisplayMessage(FILE * pOut, unsigned int uStringID, ...); +diff -ru gpsim-0.21.11/src/value.h gpsim-0.21.11.fix/src/value.h --- gpsim-0.21.11/src/value.h 2005-09-07 15:34:24.000000000 +0200 +++ gpsim-0.21.11.fix/src/value.h 2006-03-14 15:31:44.000000000 +0100 @@ -290,7 +290,7 @@ From fedora-extras-commits at redhat.com Tue Mar 14 17:37:49 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Tue, 14 Mar 2006 12:37:49 -0500 Subject: rpms/denyhosts/devel .cvsignore, 1.16, 1.17 denyhosts.spec, 1.26, 1.27 sources, 1.16, 1.17 Message-ID: <200603141738.k2EHcLdD002176@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2155 Modified Files: .cvsignore denyhosts.spec sources Log Message: * Tue Mar 14 2006 Jason L Tibbitts III - 2.2-1 - Update to 2.2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 10 Feb 2006 18:45:54 -0000 1.16 +++ .cvsignore 14 Mar 2006 17:37:48 -0000 1.17 @@ -1 +1 @@ -DenyHosts-2.1.tar.gz +DenyHosts-2.2.tar.gz Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- denyhosts.spec 28 Feb 2006 15:04:19 -0000 1.26 +++ denyhosts.spec 14 Mar 2006 17:37:48 -0000 1.27 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 2.1 -release: 2%{?dist} +Version: 2.2 +release: 1%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -142,6 +142,9 @@ %changelog +* Tue Mar 14 2006 Jason L Tibbitts III - 2.2-1 +- Update to 2.2. + * Tue Feb 28 2006 Jason L Tibbitts III - 2.1-2 - Add some additional ghosted files. Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 10 Feb 2006 18:45:54 -0000 1.16 +++ sources 14 Mar 2006 17:37:48 -0000 1.17 @@ -1 +1 @@ -1c40bda86884901f125bfbce3d8c35cb DenyHosts-2.1.tar.gz +feba0e9a48dbf1fa9cbd2b5b8907f349 DenyHosts-2.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 18:05:05 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:05:05 -0500 Subject: rpms/freedoom - New directory Message-ID: <200603141805.k2EI57of004261@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4253/freedoom Log Message: Directory /cvs/extras/rpms/freedoom added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 18:05:23 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:05:23 -0500 Subject: rpms/freedoom/devel - New directory Message-ID: <200603141805.k2EI5Pt3004279@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4253/freedoom/devel Log Message: Directory /cvs/extras/rpms/freedoom/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 18:05:36 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:05:36 -0500 Subject: rpms/freedoom Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603141805.k2EI5cti004314@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4301 Added Files: Makefile import.log Log Message: Setup of module freedoom --- NEW FILE Makefile --- # Top level Makefile for module freedoom all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 14 18:05:55 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:05:55 -0500 Subject: rpms/freedoom/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603141805.k2EI5vPt004339@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4301/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module freedoom --- NEW 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 Mar 14 18:11:19 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:11:19 -0500 Subject: rpms/freedoom import.log,1.1,1.2 Message-ID: <200603141811.k2EIBqC3004456@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4420 Modified Files: import.log Log Message: auto-import freedoom-0.4.1-3 on branch devel from freedoom-0.4.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freedoom/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Mar 2006 18:05:36 -0000 1.1 +++ import.log 14 Mar 2006 18:11:19 -0000 1.2 @@ -0,0 +1 @@ +freedoom-0_4_1-3:HEAD:freedoom-0.4.1-3.src.rpm:1142359875 From fedora-extras-commits at redhat.com Tue Mar 14 18:11:27 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:11:27 -0500 Subject: rpms/freedoom/devel freedoom.desktop, NONE, 1.1 freedoom.png, NONE, 1.1 freedoom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603141812.k2EICLWW004460@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4420/devel Modified Files: .cvsignore sources Added Files: freedoom.desktop freedoom.png freedoom.spec Log Message: auto-import freedoom-0.4.1-3 on branch devel from freedoom-0.4.1-3.src.rpm --- NEW FILE freedoom.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Freedoom GenericName=Free Doom Comment=A new set of Doom levels Exec=prboom -iwad /usr/share/doom/freedoom.wad Icon=freedoom.png Terminal=false Type=Application Categories=Application;Game; Version=0.4.1 --- NEW FILE freedoom.spec --- %define waddir %{_datadir}/doom Name: freedoom Version: 0.4.1 Release: 3%{?dist} Summary: Replacement game files for doom game engines Group: Amusements/Games License: BSD URL: http://freedoom.sourceforge.net Source0: http://dl.sourceforge.net/sourceforge/freedoom/freedoom-iwad-%{version}.zip Source1: freedoom.desktop Source2: freedoom.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: desktop-file-utils Requires: prboom %description A set of game resources for the DOOM game engine. While the Doom source code is Free, you currently still need one of the proprietary IWAD files from id in order to play Doom. Freedoom aims to create a Free alternative. Combined with the GPL-licensed Doom source code this will result in a completely Free Doom-based game. %prep %setup -q -n freedoom-iwad-%{version} %build # Game data files. Nothing to build! %install rm -rf $RPM_BUILD_ROOT install -pD -m 0644 doom2.wad $RPM_BUILD_ROOT/%{waddir}/freedoom.wad desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %{waddir}/%{name}.wad %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/48x48/apps/*.png %doc README COPYING CREDITS NEWS %changelog * Tue Mar 14 2006 Wart 0.4.1-3 - Use correct License: tag. - Remove unnecessary comment. * Mon Mar 13 2006 Wart 0.4.1-2 - Install wad in new location (see discussion on bz #185211) * Sat Mar 11 2006 Wart 0.4.1-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freedoom/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Mar 2006 18:05:55 -0000 1.1 +++ .cvsignore 14 Mar 2006 18:11:27 -0000 1.2 @@ -0,0 +1 @@ +freedoom-iwad-0.4.1.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/freedoom/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Mar 2006 18:05:55 -0000 1.1 +++ sources 14 Mar 2006 18:11:27 -0000 1.2 @@ -0,0 +1 @@ +ff53600885f09d0335bbdcd574df30c3 freedoom-iwad-0.4.1.zip From fedora-extras-commits at redhat.com Tue Mar 14 18:32:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 13:32:21 -0500 Subject: rpms/perl-Glib/devel .cvsignore, 1.10, 1.11 perl-Glib.spec, 1.15, 1.16 sources, 1.10, 1.11 Message-ID: <200603141832.k2EIWrZd004708@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4687 Modified Files: .cvsignore perl-Glib.spec sources Log Message: Update to 1.120. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Feb 2006 20:31:13 -0000 1.10 +++ .cvsignore 14 Mar 2006 18:32:21 -0000 1.11 @@ -1 +1 @@ -Glib-1.105.tar.gz +Glib-1.120.tar.gz Index: perl-Glib.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Glib.spec 13 Feb 2006 20:33:36 -0000 1.15 +++ perl-Glib.spec 14 Mar 2006 18:32:21 -0000 1.16 @@ -1,6 +1,6 @@ Name: perl-Glib -Version: 1.105 -Release: 2%{?dist} +Version: 1.120 +Release: 1%{?dist} Summary: Perl interface to GLib Group: Development/Libraries @@ -59,13 +59,16 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog LICENSE NEWS README README.api-changes TODO +%doc AUTHORS ChangeLog LICENSE NEWS README TODO %{perl_vendorarch}/auto/Glib/ %{perl_vendorarch}/Glib* %{_mandir}/man3/*.3* %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 1.120-1 +- Update to 1.120. + * Mon Feb 13 2006 Jose Pedro Oliveira - 1.105-2 - make tag problem. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 13 Feb 2006 20:31:13 -0000 1.10 +++ sources 14 Mar 2006 18:32:21 -0000 1.11 @@ -1 +1 @@ -b3ab8094fb83d0931e4042f2f6704342 Glib-1.105.tar.gz +639d22451339e07844e6be3b5e345959 Glib-1.120.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 19:16:53 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 14:16:53 -0500 Subject: rpms/perl-Gtk2/devel .cvsignore, 1.11, 1.12 perl-Gtk2.spec, 1.15, 1.16 sources, 1.11, 1.12 Message-ID: <200603141917.k2EJHPV4006824@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6803 Modified Files: .cvsignore perl-Gtk2.spec sources Log Message: Update to 1.120. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 20 Feb 2006 20:08:29 -0000 1.11 +++ .cvsignore 14 Mar 2006 19:16:52 -0000 1.12 @@ -1 +1 @@ -Gtk2-1.104.tar.gz +Gtk2-1.120.tar.gz Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Gtk2.spec 20 Feb 2006 20:08:29 -0000 1.15 +++ perl-Gtk2.spec 14 Mar 2006 19:16:52 -0000 1.16 @@ -5,7 +5,7 @@ # Name: perl-Gtk2 -Version: 1.104 +Version: 1.120 Release: 1%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library @@ -16,9 +16,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 2:5.8.0 -BuildRequires: gtk2-devel, perl-Glib >= 1.105 +BuildRequires: gtk2-devel, perl-Glib >= 1.120 BuildRequires: perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig) -Requires: perl-Glib >= 1.105 +Requires: perl-Glib >= 1.120 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -75,6 +75,9 @@ %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 1.120-1 +- Update to 1.120. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.104-1 - Update to 1.104. - Requires perl(Glib) >= 1.105 (1.104 had problems with perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 20 Feb 2006 20:08:29 -0000 1.11 +++ sources 14 Mar 2006 19:16:52 -0000 1.12 @@ -1 +1 @@ -89bb024113a12f233094dd32ac0be462 Gtk2-1.104.tar.gz +3d0eef4271bd624b284f9a23f4bdbb96 Gtk2-1.120.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 19:28:43 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:28:43 -0500 Subject: rpms/prboom - New directory Message-ID: <200603141928.k2EJSjRr007008@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997/prboom Log Message: Directory /cvs/extras/rpms/prboom added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 19:28:49 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:28:49 -0500 Subject: rpms/prboom/devel - New directory Message-ID: <200603141928.k2EJSpu9007023@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997/prboom/devel Log Message: Directory /cvs/extras/rpms/prboom/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 19:29:02 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:29:02 -0500 Subject: rpms/prboom Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603141929.k2EJT4lH007057@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7045 Added Files: Makefile import.log Log Message: Setup of module prboom --- NEW FILE Makefile --- # Top level Makefile for module prboom all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 14 19:29:08 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:29:08 -0500 Subject: rpms/prboom/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603141929.k2EJTAi4007077@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7045/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module prboom --- NEW 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 Mar 14 19:30:04 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:30:04 -0500 Subject: rpms/prboom import.log,1.1,1.2 Message-ID: <200603141930.k2EJUdNZ007185@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7137 Modified Files: import.log Log Message: auto-import prboom-2.3.1-4 on branch devel from prboom-2.3.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/prboom/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Mar 2006 19:29:02 -0000 1.1 +++ import.log 14 Mar 2006 19:30:04 -0000 1.2 @@ -0,0 +1 @@ +prboom-2_3_1-4:HEAD:prboom-2.3.1-4.src.rpm:1142364598 From fedora-extras-commits at redhat.com Tue Mar 14 19:30:10 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:30:10 -0500 Subject: rpms/prboom/devel prboom-2.3.1-64bit.patch, NONE, 1.1 prboom-2.3.1-config.patch, NONE, 1.1 prboom-2.3.1-gamedir.patch, NONE, 1.1 prboom-2.3.1-gcc4.patch, NONE, 1.1 prboom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603141930.k2EJUg1V007189@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7137/devel Modified Files: .cvsignore sources Added Files: prboom-2.3.1-64bit.patch prboom-2.3.1-config.patch prboom-2.3.1-gamedir.patch prboom-2.3.1-gcc4.patch prboom.spec Log Message: auto-import prboom-2.3.1-4 on branch devel from prboom-2.3.1-4.src.rpm prboom-2.3.1-64bit.patch: --- NEW FILE prboom-2.3.1-64bit.patch --- diff -ur prboom-2.3.1.orig/src/d_main.c prboom-2.3.1/src/d_main.c --- prboom-2.3.1.orig/src/d_main.c 2006-03-12 10:53:56.000000000 +0100 +++ prboom-2.3.1/src/d_main.c 2006-03-12 10:37:27.000000000 +0100 @@ -1719,13 +1719,21 @@ { // for statistics driver extern void* statcopy; + void *orig_statcopy = statcopy; + char *check; // killough 5/2/98: this takes a memory // address as an integer on the command line! - statcopy = (void*) atoi(myargv[p+1]); - //jff 9/3/98 use logical output routine - lprintf (LO_CONFIRM,"External statistics registered.\n"); + // HDG 11/3/2006: UGLY! Fixed to use strtoul, so this has + // atleast a chance to work on 64 bit. + statcopy = (void*) strtoul(myargv[p+1], &check, 0); + if (*check == '\0') + //jff 9/3/98 use logical output routine + lprintf (LO_CONFIRM,"External statistics registered.\n"); + else + // we should report an error here I Guess + statcopy = orig_statcopy; } // sf: -blockmap option as a variable now Only in prboom-2.3.1/src: d_main.c~ diff -ur prboom-2.3.1.orig/src/doomdata.h prboom-2.3.1/src/doomdata.h --- prboom-2.3.1.orig/src/doomdata.h 2004-09-15 21:09:42.000000000 +0200 +++ prboom-2.3.1/src/doomdata.h 2006-03-12 10:53:43.000000000 +0100 @@ -82,9 +82,9 @@ typedef struct { short textureoffset GCC_PACKED; short rowoffset GCC_PACKED; - char toptexture[8] GCC_PACKED; - char bottomtexture[8] GCC_PACKED; - char midtexture[8] GCC_PACKED; + char toptexture[8] /* GCC_PACKED */; + char bottomtexture[8] /* GCC_PACKED */; + char midtexture[8] /* GCC_PACKED */; short sector GCC_PACKED; // Front sector, towards viewer. } GCC_PACKED mapsidedef_t; @@ -147,8 +147,8 @@ typedef struct { short floorheight GCC_PACKED; short ceilingheight GCC_PACKED; - char floorpic[8] GCC_PACKED; - char ceilingpic[8] GCC_PACKED; + char floorpic[8] /* GCC_PACKED */; + char ceilingpic[8] /* GCC_PACKED */; short lightlevel GCC_PACKED; short special GCC_PACKED; short tag GCC_PACKED; Only in prboom-2.3.1/src: doomdata.h~ diff -ur prboom-2.3.1.orig/src/p_saveg.c prboom-2.3.1/src/p_saveg.c --- prboom-2.3.1.orig/src/p_saveg.c 2004-09-15 21:09:45.000000000 +0200 +++ prboom-2.3.1/src/p_saveg.c 2006-03-12 10:44:33.000000000 +0100 @@ -45,7 +45,7 @@ // Pads save_p to a 4-byte boundary // so that the load/save works on SGI&Gecko. -#define PADSAVEP() do { save_p += (4 - ((int) save_p & 3)) & 3; } while (0) +#define PADSAVEP() do { save_p += (4 - ((long) save_p & 3)) & 3; } while (0) // // P_ArchivePlayers // @@ -95,7 +95,7 @@ for (j=0 ; jnext) if (th->function == P_MobjThinker) - th->prev = (thinker_t *) ++number_of_thinkers; + th->prev = (thinker_t *)(long) ++number_of_thinkers; } // phares 9/13/98: Moved this code outside of P_ArchiveThinkers so the @@ -436,10 +436,10 @@ PADSAVEP(); memcpy (mobj, save_p, sizeof(mobj_t)); save_p += sizeof(mobj_t); - mobj->state = states + (int) mobj->state; + mobj->state = states + (long) mobj->state; if (mobj->player) - (mobj->player = &players[(int) mobj->player - 1]) -> mo = mobj; + (mobj->player = &players[(long) mobj->player - 1]) -> mo = mobj; P_SetThingPosition (mobj); mobj->info = &mobjinfo[mobj->type]; @@ -746,7 +746,7 @@ ceiling_t *ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVEL, NULL); memcpy (ceiling, save_p, sizeof(*ceiling)); save_p += sizeof(*ceiling); - ceiling->sector = §ors[(int)ceiling->sector]; + ceiling->sector = §ors[(long)ceiling->sector]; ceiling->sector->ceilingdata = ceiling; //jff 2/22/98 if (ceiling->thinker.function) @@ -763,10 +763,10 @@ vldoor_t *door = Z_Malloc (sizeof(*door), PU_LEVEL, NULL); memcpy (door, save_p, sizeof(*door)); save_p += sizeof(*door); - door->sector = §ors[(int)door->sector]; + door->sector = §ors[(long)door->sector]; //jff 1/31/98 unarchive line remembered by door as well - door->line = (int)door->line!=-1? &lines[(int)door->line] : NULL; + door->line = (long)door->line!=-1? &lines[(long)door->line] : NULL; door->sector->ceilingdata = door; //jff 2/22/98 door->thinker.function = T_VerticalDoor; @@ -780,7 +780,7 @@ floormove_t *floor = Z_Malloc (sizeof(*floor), PU_LEVEL, NULL); memcpy (floor, save_p, sizeof(*floor)); save_p += sizeof(*floor); - floor->sector = §ors[(int)floor->sector]; + floor->sector = §ors[(long)floor->sector]; floor->sector->floordata = floor; //jff 2/22/98 floor->thinker.function = T_MoveFloor; P_AddThinker (&floor->thinker); @@ -793,7 +793,7 @@ plat_t *plat = Z_Malloc (sizeof(*plat), PU_LEVEL, NULL); memcpy (plat, save_p, sizeof(*plat)); save_p += sizeof(*plat); - plat->sector = §ors[(int)plat->sector]; + plat->sector = §ors[(long)plat->sector]; plat->sector->floordata = plat; //jff 2/22/98 if (plat->thinker.function) @@ -810,7 +810,7 @@ lightflash_t *flash = Z_Malloc (sizeof(*flash), PU_LEVEL, NULL); memcpy (flash, save_p, sizeof(*flash)); save_p += sizeof(*flash); - flash->sector = §ors[(int)flash->sector]; + flash->sector = §ors[(long)flash->sector]; flash->thinker.function = T_LightFlash; P_AddThinker (&flash->thinker); break; @@ -822,7 +822,7 @@ strobe_t *strobe = Z_Malloc (sizeof(*strobe), PU_LEVEL, NULL); memcpy (strobe, save_p, sizeof(*strobe)); save_p += sizeof(*strobe); - strobe->sector = §ors[(int)strobe->sector]; + strobe->sector = §ors[(long)strobe->sector]; strobe->thinker.function = T_StrobeFlash; P_AddThinker (&strobe->thinker); break; @@ -834,7 +834,7 @@ glow_t *glow = Z_Malloc (sizeof(*glow), PU_LEVEL, NULL); memcpy (glow, save_p, sizeof(*glow)); save_p += sizeof(*glow); - glow->sector = §ors[(int)glow->sector]; + glow->sector = §ors[(long)glow->sector]; glow->thinker.function = T_Glow; P_AddThinker (&glow->thinker); break; @@ -846,7 +846,7 @@ fireflicker_t *flicker = Z_Malloc (sizeof(*flicker), PU_LEVEL, NULL); memcpy (flicker, save_p, sizeof(*flicker)); save_p += sizeof(*flicker); - flicker->sector = §ors[(int)flicker->sector]; + flicker->sector = §ors[(long)flicker->sector]; flicker->thinker.function = T_FireFlicker; P_AddThinker (&flicker->thinker); break; @@ -859,7 +859,7 @@ elevator_t *elevator = Z_Malloc (sizeof(*elevator), PU_LEVEL, NULL); memcpy (elevator, save_p, sizeof(*elevator)); save_p += sizeof(*elevator); - elevator->sector = §ors[(int)elevator->sector]; + elevator->sector = §ors[(long)elevator->sector]; elevator->sector->floordata = elevator; //jff 2/22/98 elevator->sector->ceilingdata = elevator; //jff 2/22/98 elevator->thinker.function = T_MoveElevator; Only in prboom-2.3.1/src: p_saveg.c~ diff -ur prboom-2.3.1.orig/src/p_spec.c prboom-2.3.1/src/p_spec.c --- prboom-2.3.1.orig/src/p_spec.c 2004-09-15 21:09:36.000000000 +0200 +++ prboom-2.3.1/src/p_spec.c 2006-03-12 10:46:28.000000000 +0100 @@ -976,11 +976,11 @@ switch (t) // return whether thinker of same type is active { case floor_special: - return (int)sec->floordata; + return (long)sec->floordata; case ceiling_special: - return (int)sec->ceilingdata; + return (long)sec->ceilingdata; case lighting_special: - return (int)sec->lightingdata; + return (long)sec->lightingdata; } return 1; // don't know which special, must be active, shouldn't be here } Only in prboom-2.3.1/src: p_spec.c~ diff -ur prboom-2.3.1.orig/src/r_patch.c prboom-2.3.1/src/r_patch.c --- prboom-2.3.1.orig/src/r_patch.c 2004-09-15 21:09:19.000000000 +0200 +++ prboom-2.3.1/src/r_patch.c 2006-03-12 10:51:25.000000000 +0100 @@ -198,7 +198,7 @@ // allocate our data chunk dataSize = pixelDataSize + columnsDataSize + postsDataSize; - patch->data = (unsigned char*)Z_Malloc(dataSize, PU_CACHE, &patch->data); + patch->data = (unsigned char*)Z_Malloc(dataSize, PU_CACHE, (void **)&patch->data); memset(patch->data, 0, dataSize); // set out pixel, column, and post pointers into our data array @@ -207,7 +207,7 @@ patch->posts = (TPatchPost*)((unsigned char*)patch->columns + columnsDataSize); // sanity check that we've got all the memory allocated we need - assert(((int)patch->posts + (int)(numPostsTotal*sizeof(TPatchPost)) - (int)patch->data) == dataSize); + assert(((long)patch->posts + (long)(numPostsTotal*sizeof(TPatchPost)) - (long)patch->data) == dataSize); memset(patch->pixels, 0xff, (patch->width*patch->height)); @@ -422,7 +422,7 @@ // allocate our data chunk dataSize = pixelDataSize + columnsDataSize + postsDataSize; - composite_patch->data = (unsigned char*)Z_Malloc(dataSize, PU_STATIC, &composite_patch->data); + composite_patch->data = (unsigned char*)Z_Malloc(dataSize, PU_STATIC, (void **)&composite_patch->data); memset(composite_patch->data, 0, dataSize); // set out pixel, column, and post pointers into our data array @@ -431,7 +431,7 @@ composite_patch->posts = (TPatchPost*)((unsigned char*)composite_patch->columns + columnsDataSize); // sanity check that we've got all the memory allocated we need - assert(((int)composite_patch->posts + (int)(numPostsTotal*sizeof(TPatchPost)) - (int)composite_patch->data) == dataSize); + assert(((long)composite_patch->posts + (long)(numPostsTotal*sizeof(TPatchPost)) - (long)composite_patch->data) == dataSize); memset(composite_patch->pixels, 0xff, (composite_patch->width*composite_patch->height)); Only in prboom-2.3.1/src: r_patch.c~ prboom-2.3.1-config.patch: --- NEW FILE prboom-2.3.1-config.patch --- --- prboom-2.3.1/src/g_cmd.c.hdg 2006-03-10 21:48:49.000000000 +0100 +++ prboom-2.3.1/src/g_cmd.c 2006-03-10 22:10:46.000000000 +0100 @@ -501,7 +501,6 @@ // CPhipps - compatibility vars static const char *complevel_str[] = { - "prboom_current", // -1 = best "doom_12", "doom_1666", "doom2_19", @@ -516,19 +515,16 @@ "MBF", "prboom_203beta", "prboom_210_211", - "prboom_212_223", + "prboom_212_223", /* untill 224 actually but lets not mod the string */ + "prboom_current" /* 230 - 231 and probably later */ }; -static int desired_default_compatibility_level; -CONSOLE_INT(default_compatibility_level, desired_default_compatibility_level, NULL, 0, MAX_COMPATIBILITY_LEVEL-1, complevel_str, 0) +CONSOLE_INT(default_compatibility_level, default_compatibility_level, NULL, 0, MAX_COMPATIBILITY_LEVEL-1, complevel_str, 0) { - default_compatibility_level = desired_default_compatibility_level - 1; } -static int desired_compatibility_level; -CONSOLE_INT(compatibility_level, desired_compatibility_level, NULL, 0, MAX_COMPATIBILITY_LEVEL-1, complevel_str, 0) +CONSOLE_INT(compatibility_level, compatibility_level, NULL, 0, MAX_COMPATIBILITY_LEVEL-1, complevel_str, 0) { - compatibility_level = desired_compatibility_level - 1; G_Compatibility(); } prboom-2.3.1-gamedir.patch: --- NEW FILE prboom-2.3.1-gamedir.patch --- diff -Naur prboom-2.3.1/configure prboom-2.3.1.new/configure --- prboom-2.3.1/configure 2004-09-15 12:11:41.000000000 -0700 +++ prboom-2.3.1.new/configure 2006-03-13 15:42:56.000000000 -0800 @@ -1853,9 +1853,9 @@ if test "x$prefix" != xNONE; then - DOOMWADDIR="$prefix/share/games/doom" + DOOMWADDIR="$prefix/share/doom" else - DOOMWADDIR="$ac_default_prefix/share/games/doom" + DOOMWADDIR="$ac_default_prefix/share/doom" fi cat >>confdefs.h <<_ACEOF #define DOOMWADDIR "$DOOMWADDIR" diff -Naur prboom-2.3.1/src/d_main.c prboom-2.3.1.new/src/d_main.c --- prboom-2.3.1/src/d_main.c 2006-03-08 18:41:07.000000000 -0800 +++ prboom-2.3.1.new/src/d_main.c 2006-03-13 15:31:16.000000000 -0800 @@ -158,6 +158,7 @@ "doom.wad", "doom1.wad", "doomu.wad", /* CPhipps - alow doomu.wad */ + "freedoom.wad", /* wart at kobold.org: added freedoom for Fedora Extras */ }; static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads; prboom-2.3.1-gcc4.patch: --- NEW FILE prboom-2.3.1-gcc4.patch --- diff -Naur prboom-2.3.1/src/c_runcmd.c prboom-2.3.1.new/src/c_runcmd.c --- prboom-2.3.1/src/c_runcmd.c 2004-09-15 12:09:37.000000000 -0700 +++ prboom-2.3.1.new/src/c_runcmd.c 2006-03-06 20:42:04.000000000 -0800 @@ -1212,7 +1212,7 @@ { char *filedata; - if(M_ReadFile(filename, (byte **)&filedata) <= 0) // haleyjd: ptr cast + if(M_ReadFile(filename, (char **)(&filedata)) <= 0) C_Printf("couldn't exec '%s'\n", filename); else { diff -Naur prboom-2.3.1/src/d_main.c prboom-2.3.1.new/src/d_main.c --- prboom-2.3.1/src/d_main.c 2004-09-24 11:27:37.000000000 -0700 +++ prboom-2.3.1.new/src/d_main.c 2006-03-06 20:42:04.000000000 -0800 @@ -137,7 +137,7 @@ extern boolean timingdemo, singledemo, demoplayback, fastdemo; // killough -static int basetic; +int basetic; char wadfile[PATH_MAX+1]; // primary wad file char mapdir[PATH_MAX+1]; // directory of development maps diff -Naur prboom-2.3.1/src/gl_intern.h prboom-2.3.1.new/src/gl_intern.h --- prboom-2.3.1/src/gl_intern.h 2004-09-15 12:09:48.000000000 -0700 +++ prboom-2.3.1.new/src/gl_intern.h 2006-03-06 20:42:04.000000000 -0800 @@ -93,7 +93,6 @@ extern boolean gl_shared_texture_palette; extern boolean use_mipmapping; extern int transparent_pal_index; -extern unsigned char gld_palmap[256]; extern GLTexture *last_gltexture; extern int last_cm; diff -Naur prboom-2.3.1/src/m_fixed.h prboom-2.3.1.new/src/m_fixed.h --- prboom-2.3.1/src/m_fixed.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/m_fixed.h 2006-03-06 20:42:04.000000000 -0800 @@ -123,7 +123,7 @@ /* CPhipps - made __inline__ to inline, as specified in the gcc docs * Also made const */ -inline static const fixed_t FixedMul(fixed_t a, fixed_t b) +inline static fixed_t FixedMul(fixed_t a, fixed_t b) { return (fixed_t)((int_64_t) a*b >> FRACBITS); } @@ -186,7 +186,7 @@ /* CPhipps - made __inline__ to inline, as specified in the gcc docs * Also made const */ -inline static const fixed_t FixedDiv(fixed_t a, fixed_t b) +inline static fixed_t FixedDiv(fixed_t a, fixed_t b) { return (D_abs(a)>>14) >= D_abs(b) ? ((a^b)>>31) ^ INT_MAX : (fixed_t)(((int_64_t) a << FRACBITS) / b); @@ -199,7 +199,7 @@ * (notice that the C standard for % does not guarantee this) */ -inline static const fixed_t FixedMod(fixed_t a, fixed_t b) +inline static fixed_t FixedMod(fixed_t a, fixed_t b) { if (b & (b-1)) { fixed_t r = a % b; diff -Naur prboom-2.3.1/src/p_maputl.h prboom-2.3.1.new/src/p_maputl.h --- prboom-2.3.1/src/p_maputl.h 2004-09-15 12:09:45.000000000 -0700 +++ prboom-2.3.1.new/src/p_maputl.h 2006-03-06 20:42:04.000000000 -0800 @@ -64,7 +64,9 @@ typedef boolean (*traverser_t)(intercept_t *in); #ifdef __GNUC__ -#define CONSTFUNC const +// Not for gcc4! +// #define CONSTFUNC const +#define CONSTFUNC #else #define CONSTFUNC #endif diff -Naur prboom-2.3.1/src/p_mobj.h prboom-2.3.1.new/src/p_mobj.h --- prboom-2.3.1/src/p_mobj.h 2004-09-15 12:09:47.000000000 -0700 +++ prboom-2.3.1.new/src/p_mobj.h 2006-03-06 20:42:04.000000000 -0800 @@ -369,8 +369,6 @@ // Whether an object is "sentient" or not. Used for environmental influences. #define sentient(mobj) ((mobj)->health > 0 && (mobj)->info->seestate) -extern mapthing_t itemrespawnque[]; -extern int itemrespawntime[]; extern int iquehead; extern int iquetail; extern int gravity; diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c --- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.c 2006-03-06 20:42:04.000000000 -0800 @@ -130,7 +130,7 @@ case 'X': \ case 'p': \ GET_VARS \ - ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ state = STATE_NONE; \ break; \ case 'e': \ @@ -139,17 +139,17 @@ case 'g': \ case 'G': \ GET_VARS \ - ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ state = STATE_NONE; \ break; \ case 'c': \ GET_VARS \ - ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ state = STATE_NONE; \ break; \ case 's': \ GET_VARS \ - ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ state = STATE_NONE; \ break; \ case 'n': \ @@ -306,11 +306,11 @@ } int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, va_list ap) { if (*nmax > 1) { - **pinsertion = (char) va_arg(*ap, int); + **pinsertion = (char) va_arg(ap, int); *pinsertion += 1; *nmax -= 1; } @@ -338,9 +338,9 @@ */ int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, va_list ap) { - const char *str = va_arg(*ap, const char *); + const char *str = va_arg(ap, const char *); int nprinted; int len; int pad = 0; @@ -428,7 +428,7 @@ */ int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, va_list ap) { long int number = 0; unsigned long int unumber; @@ -463,17 +463,17 @@ { case 'd': case 'i': - number = (signed short int) va_arg(*ap, int); + number = (signed short int) va_arg(ap, int); break; case 'u': case 'o': case 'x': case 'X': - unumber = (unsigned short int) va_arg(*ap, int); + unumber = (unsigned short int) va_arg(ap, int); numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = (unsigned long) va_arg(ap, void *); numbersigned = 0; } break; @@ -482,17 +482,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed long int); + number = va_arg(ap, signed long int); break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned long int); + unumber = va_arg(ap, unsigned long int); numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = (unsigned long) va_arg(ap, void *); numbersigned = numbersigned; } break; @@ -501,17 +501,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed int); + number = va_arg(ap, signed int); break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned int); + unumber = va_arg(ap, unsigned int); numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = (unsigned long) va_arg(ap, void *); numbersigned = 0; } } /* switch fmt to retrieve number */ @@ -784,12 +784,12 @@ */ int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, va_list ap) { char *digits; int sign = 0; int dec; - double value = va_arg(*ap, double); + double value = va_arg(ap, double); int len; int pad = 0; diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h --- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.h 2006-03-06 20:42:04.000000000 -0800 @@ -17,16 +17,16 @@ * if there had been enough room). */ int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, va_list ap); int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, va_list ap); int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, va_list ap); int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, va_list ap); /* These are the flags you need (use logical OR) for the flags parameter of * fmt functions above. diff -Naur prboom-2.3.1/src/r_bsp.h prboom-2.3.1.new/src/r_bsp.h --- prboom-2.3.1/src/r_bsp.h 2004-09-15 12:09:31.000000000 -0700 +++ prboom-2.3.1.new/src/r_bsp.h 2006-03-06 20:42:04.000000000 -0800 @@ -41,11 +41,6 @@ extern line_t *linedef; extern sector_t *frontsector; extern sector_t *backsector; -extern int rw_x; -extern int rw_stopx; -extern boolean segtextured; -extern boolean markfloor; /* false if the back side is the same plane */ -extern boolean markceiling; /* old code -- killough: * extern drawseg_t drawsegs[MAXDRAWSEGS]; diff -Naur prboom-2.3.1/src/r_data.h prboom-2.3.1.new/src/r_data.h --- prboom-2.3.1/src/r_data.h 2004-09-15 12:09:33.000000000 -0700 +++ prboom-2.3.1.new/src/r_data.h 2006-03-06 20:42:04.000000000 -0800 @@ -48,7 +48,7 @@ { int originx, originy; // Block origin, which has already accounted int patch; // for the internal origin of the patch. -} texpatch_t __attribute__((packed)); +} texpatch_t; // // Texture definition. diff -Naur prboom-2.3.1/src/r_main.c prboom-2.3.1.new/src/r_main.c --- prboom-2.3.1/src/r_main.c 2004-09-15 12:09:26.000000000 -0700 +++ prboom-2.3.1.new/src/r_main.c 2006-03-06 20:42:04.000000000 -0800 @@ -118,7 +118,7 @@ // killough 5/2/98: reformatted // -const int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node) +int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node) { if (!node->dx) return x <= node->x ? node->dy > 0 : node->dy < 0; @@ -137,7 +137,7 @@ // killough 5/2/98: reformatted -const int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line) +int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line) { fixed_t lx = line->v1->x; fixed_t ly = line->v1->y; diff -Naur prboom-2.3.1/src/r_main.h prboom-2.3.1.new/src/r_main.h --- prboom-2.3.1/src/r_main.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/r_main.h 2006-03-06 20:42:04.000000000 -0800 @@ -112,8 +112,8 @@ // Utility functions. // -const int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node); -const int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line); +int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node); +int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line); angle_t R_PointToAngle(fixed_t x, fixed_t y); angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2); subsector_t *R_PointInSubsector(fixed_t x, fixed_t y); diff -Naur prboom-2.3.1/src/SDL/i_system.c prboom-2.3.1.new/src/SDL/i_system.c --- prboom-2.3.1/src/SDL/i_system.c 2004-09-15 12:09:21.000000000 -0700 +++ prboom-2.3.1.new/src/SDL/i_system.c 2006-03-06 20:42:04.000000000 -0800 @@ -133,7 +133,8 @@ if (rc <= 0) { I_Error("I_Read: read failed: %s", rc ? strerror(errno) : "EOF"); } - sz -= rc; (unsigned char *)buf += rc; + sz -= rc; + buf += rc; } } --- NEW FILE prboom.spec --- %define waddir %{_datadir}/doom Name: prboom Version: 2.3.1 Release: 4%{?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.3.1.tar.gz Patch0: prboom-2.3.1-gcc4.patch Patch1: prboom-2.3.1-gamedir.patch Patch2: prboom-2.3.1-config.patch Patch3: prboom-2.3.1-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_net-devel Requires: freedoom %description prboom is an open-source port of Doom, the classic 3D first-person shooter game. It totally outclassed any 3D world games that preceded it, with amazing speed, flexibility, and outstanding gameplay. The specs to the game were released, and thousands of extra levels were written by fans of the game; even today new levels are written for Doom faster then any one person could play them. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %build %configure --disable-cpu-opt --program-prefix='' make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %makeinstall # Move the binaries out of the crufty /usr/games directory mkdir -p $RPM_BUILD_ROOT/%{_bindir} mv $RPM_BUILD_ROOT/usr/games/* $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{waddir} mv $RPM_BUILD_ROOT/%{_datadir}/games/doom/%{name}.wad $RPM_BUILD_ROOT/%{waddir} # Remove the doc files that will get picked up in the files # section below. rm -rf $RPM_BUILD_ROOT/%{_docdir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/prboom %{_bindir}/prboom-game-server %dir %{waddir} %{waddir}/prboom.wad %{_mandir}/man5/* %{_mandir}/man6/* %doc NEWS AUTHORS README COPYING %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt %changelog * Tue Mar 14 2006 Wart 2.3.1-4 - Added patch to fix up some x86_64 issues * Mon Mar 13 2006 Wart 2.3.1-3 - Once again, change the default wad dir to datadir/doom (see discussion on bz #185211) * Sun Mar 12 2006 Wart 2.3.1-2 - Replace datadir/games/doom with datadir/prboom in the files section. * Sat Mar 11 2006 Wart 2.3.1-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Mar 2006 19:29:08 -0000 1.1 +++ .cvsignore 14 Mar 2006 19:30:09 -0000 1.2 @@ -0,0 +1 @@ +prboom-2.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Mar 2006 19:29:08 -0000 1.1 +++ sources 14 Mar 2006 19:30:09 -0000 1.2 @@ -0,0 +1 @@ +c53231604fe6cf7352e73911ad44c90d prboom-2.3.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 19:35:06 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 14 Mar 2006 14:35:06 -0500 Subject: rpms/banshee/devel banshee.spec,1.6,1.7 Message-ID: <200603141935.k2EJZdhw007286@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7269 Modified Files: banshee.spec Log Message: disable helix, we use gstreamer Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- banshee.spec 14 Mar 2006 16:57:31 -0000 1.6 +++ banshee.spec 14 Mar 2006 19:35:06 -0000 1.7 @@ -39,7 +39,7 @@ %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} -%configure --disable-docs --with-gstreamer-0-10 +%configure --disable-docs --with-gstreamer-0-10 --disable-helix make %install From fedora-extras-commits at redhat.com Tue Mar 14 19:54:39 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:54:39 -0500 Subject: owners owners.list,1.742,1.743 Message-ID: <200603141955.k2EJtBaL007478@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459 Modified Files: owners.list Log Message: Added prboom and freedoom Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.742 retrieving revision 1.743 diff -u -r1.742 -r1.743 --- owners.list 14 Mar 2006 08:00:41 -0000 1.742 +++ owners.list 14 Mar 2006 19:54:38 -0000 1.743 @@ -259,6 +259,7 @@ Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|freealut|Implementation of OpenAL's ALUT standard|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| 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|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|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| @@ -1122,6 +1123,7 @@ 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| Fedora Extras|pptp|Point-to-Point Tunneling Protocol (PPTP) Client|paul at city-fan.org|extras-qa at fedoraproject.org| +Fedora Extras|prboom|GPL Doom game engine|wart at kobold.org|extras-qa at fedoraproject.org| 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|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Mar 14 20:49:40 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 15:49:40 -0500 Subject: comps comps-fe5.xml.in,1.22,1.23 Message-ID: <200603142050.k2EKoCXX009954@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9929 Modified Files: comps-fe5.xml.in Log Message: Added the freedoom game Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- comps-fe5.xml.in 13 Mar 2006 23:15:35 -0000 1.22 +++ comps-fe5.xml.in 14 Mar 2006 20:49:40 -0000 1.23 @@ -204,6 +204,7 @@ foobillard fortune-mod freeciv + freedoom freedroid freedroidrpg gl-117 From fedora-extras-commits at redhat.com Tue Mar 14 21:34:48 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 14 Mar 2006 16:34:48 -0500 Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.4, 1.5 NetworkManager-vpnc.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603142135.k2ELZKVX012817@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12754 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: * Tue Mar 14 2006 Dan Williams - 0.6.0-1 - Update to CVS snapshot of 0.6 for NM compatibility Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Jan 2006 06:48:22 -0000 1.4 +++ .cvsignore 14 Mar 2006 21:34:47 -0000 1.5 @@ -1,3 +1,4 @@ NetworkManager-vpnc-0.2.tar.gz NetworkManager-vpnc-0.3.tar.gz NetworkManager-vpnc-0.5.0.tar.gz +NetworkManager-vpnc-0.6.0.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- NetworkManager-vpnc.spec 27 Jan 2006 06:48:22 -0000 1.6 +++ NetworkManager-vpnc.spec 14 Mar 2006 21:34:47 -0000 1.7 @@ -1,12 +1,12 @@ -%define nm_version 0.5.1 -%define dbus_version 0.35 +%define nm_version 0.6.0 +%define dbus_version 0.60 %define gtk2_version 2.6.0 %define vpnc_version 0.3.3-3 %define shared_mime_version 0.16-3 Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc -Version: 0.5.0 +Version: 0.6.0 Release: 1 License: GPL Group: System Environment/Base @@ -84,6 +84,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Tue Mar 14 2006 Dan Williams - 0.6.0-1 +- Update to CVS snapshot of 0.6 for NM compatibility + * Fri Jan 27 2006 Dan Williams - 0.5.0-1 - CVS snapshot for compatibility new NetworkManager Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Jan 2006 06:48:22 -0000 1.4 +++ sources 14 Mar 2006 21:34:47 -0000 1.5 @@ -1 +1 @@ -45ffcb2a1c03c545db0c8d8a4fcbd885 NetworkManager-vpnc-0.5.0.tar.gz +ca50e94e775243965b5df36a26c45d42 NetworkManager-vpnc-0.6.0.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 22:14:14 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 14 Mar 2006 17:14:14 -0500 Subject: rpms/liferea/devel liferea-mozilla-lib64.patch, NONE, 1.1 liferea.spec, 1.34, 1.35 Message-ID: <200603142214.k2EMElGk015486@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15461 Modified Files: liferea.spec Added Files: liferea-mozilla-lib64.patch Log Message: * Tue Mar 14 2006 Brian Pepple - 1.0.7-3 - Add patch to find mozilla on x86_64 (#185243). liferea-mozilla-lib64.patch: --- NEW FILE liferea-mozilla-lib64.patch --- diff -ur liferea-1.0.7.ORIG/src/liferea.in liferea-1.0.7/src/liferea.in --- liferea-1.0.7.ORIG/src/liferea.in 2006-01-16 18:11:19.000000000 -0500 +++ liferea-1.0.7/src/liferea.in 2006-03-14 16:45:26.000000000 -0500 @@ -39,7 +39,7 @@ fi @MOZILLA_LIB_DIR_SEARCH@ -look_for_mozilla "/usr/lib/mozilla*/chrome/comm.jar" +look_for_mozilla "/usr/lib*/mozilla*/chrome/comm.jar" look_for_mozilla "/usr/local/mozilla*/chrome/comm.jar" look_for_mozilla "/opt/mozilla/chrome/comm.jar" look_for_mozilla "/opt/mozilla/lib/chrome/comm.jar" Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- liferea.spec 6 Mar 2006 15:09:38 -0000 1.34 +++ liferea.spec 14 Mar 2006 22:14:14 -0000 1.35 @@ -2,13 +2,14 @@ Name: liferea Version: 1.0.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-mozilla-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel @@ -38,6 +39,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .mozilla %build @@ -105,6 +107,9 @@ %changelog +* Tue Mar 14 2006 Brian Pepple - 1.0.7-3 +- Add patch to find mozilla on x86_64 (#185243). + * Mon Mar 6 2006 Brian Pepple - 1.0.7-2 - Update to 1.0.7. - Fix gconf scriptlets. From fedora-extras-commits at redhat.com Tue Mar 14 22:47:05 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 14 Mar 2006 17:47:05 -0500 Subject: rpms/emelfm2/devel .cvsignore, 1.5, 1.6 emelfm2.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603142247.k2EMlcFT015825@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15797 Modified Files: .cvsignore emelfm2.spec sources Log Message: Update to 0.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 Jan 2006 11:40:28 -0000 1.5 +++ .cvsignore 14 Mar 2006 22:47:05 -0000 1.6 @@ -1 +1 @@ -emelfm2-0.1.5.tar.gz +emelfm2-0.1.6.tar.gz Index: emelfm2.spec =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/emelfm2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- emelfm2.spec 18 Feb 2006 22:05:57 -0000 1.8 +++ emelfm2.spec 14 Mar 2006 22:47:05 -0000 1.9 @@ -1,6 +1,6 @@ Name: emelfm2 -Version: 0.1.5 -Release: 2%{?dist} +Version: 0.1.6 +Release: 1%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File @@ -10,7 +10,8 @@ Patch0: %{name}-0.1.2-makefile.config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.4.0, gettext, desktop-file-utils +BuildRequires: gtk2-devel >= 2.6.0, gettext, desktop-file-utils +Requires: findutils >= 4.2, file, grep, sed %description emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements @@ -53,7 +54,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc docs/ACTIONS docs/CHANGELOG docs/CONFIGURATION docs/CREDITS docs/HACKING -%doc docs/PLUGINS docs/README docs/TODO docs/USAGE docs/WARNING +%doc docs/README docs/TODO docs/USAGE docs/WARNING %doc docs/help.txt docs/GPL docs/LGPL %{_bindir}/%{name} %{_libdir}/%{name} @@ -63,6 +64,10 @@ %changelog +* Tue Mar 14 2006 Christoph Wickert - 0.1.6-1 +- Update to 0.1.6. +- Add Requires for plugins. + * Sat Feb 18 2006 Christoph Wickert - 0.1.5-2 - Rebuild for Fedora Extras 5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 26 Jan 2006 11:40:28 -0000 1.5 +++ sources 14 Mar 2006 22:47:05 -0000 1.6 @@ -1 +1 @@ -826e9edf31431a0b6a2c0208a475df54 emelfm2-0.1.5.tar.gz +389f78c70df52c592e61b873ce69ec30 emelfm2-0.1.6.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 23:03:19 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 14 Mar 2006 18:03:19 -0500 Subject: rpms/emelfm2/FC-4 .cvsignore, 1.4, 1.5 emelfm2.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603142303.k2EN3pNL017997@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17975 Modified Files: .cvsignore emelfm2.spec sources Log Message: Update to 0.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emelfm2/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Jan 2006 11:56:26 -0000 1.4 +++ .cvsignore 14 Mar 2006 23:03:19 -0000 1.5 @@ -1 +1 @@ -emelfm2-0.1.5.tar.gz +emelfm2-0.1.6.tar.gz Index: emelfm2.spec =================================================================== RCS file: /cvs/extras/rpms/emelfm2/FC-4/emelfm2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- emelfm2.spec 26 Jan 2006 11:56:26 -0000 1.4 +++ emelfm2.spec 14 Mar 2006 23:03:19 -0000 1.5 @@ -1,5 +1,5 @@ Name: emelfm2 -Version: 0.1.5 +Version: 0.1.6 Release: 1%{?dist} Summary: A file manager that implements the popular two-pane design @@ -10,7 +10,8 @@ Patch0: %{name}-0.1.2-makefile.config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.4.0, gettext, desktop-file-utils +BuildRequires: gtk2-devel >= 2.6.0, gettext, desktop-file-utils +Requires: findutils >= 4.2, file, grep, sed %description emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements @@ -53,7 +54,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc docs/ACTIONS docs/CHANGELOG docs/CONFIGURATION docs/CREDITS docs/HACKING -%doc docs/PLUGINS docs/README docs/TODO docs/USAGE docs/WARNING +%doc docs/README docs/TODO docs/USAGE docs/WARNING %doc docs/help.txt docs/GPL docs/LGPL %{_bindir}/%{name} %{_libdir}/%{name} @@ -63,6 +64,10 @@ %changelog +* Tue Mar 14 2006 Christoph Wickert - 0.1.6-1 +- Update to 0.1.6. +- Add Requires for plugins. + * Thu Jan 26 2006 Christoph Wickert - 0.1.5-1 - Update to 0.1.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/emelfm2/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Jan 2006 11:56:26 -0000 1.4 +++ sources 14 Mar 2006 23:03:19 -0000 1.5 @@ -1 +1 @@ -826e9edf31431a0b6a2c0208a475df54 emelfm2-0.1.5.tar.gz +389f78c70df52c592e61b873ce69ec30 emelfm2-0.1.6.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 00:01:53 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 14 Mar 2006 19:01:53 -0500 Subject: rpms/lock-keys-applet/devel lock-keys-applet.spec,1.14,1.15 Message-ID: <200603150002.k2F02csU020353@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/lock-keys-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20322 Modified Files: lock-keys-applet.spec Log Message: Let's give it a spin Index: lock-keys-applet.spec =================================================================== RCS file: /cvs/extras/rpms/lock-keys-applet/devel/lock-keys-applet.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lock-keys-applet.spec 3 Mar 2006 13:30:53 -0000 1.14 +++ lock-keys-applet.spec 15 Mar 2006 00:01:52 -0000 1.15 @@ -8,7 +8,7 @@ URL: http://mfcn.ilo.de/led_applet/ Source0: http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libgnomeui-devel gnome-panel-devel scrollkeeper libtool automake autoconf +BuildRequires: libgnomeui-devel gnome-panel-devel scrollkeeper gettext Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -23,9 +23,6 @@ %setup -q %build -%ifarch x86_64 -libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf -%endif %configure make %{?_smp_mflags} @@ -53,7 +50,7 @@ %{_libexecdir}/%{name} %changelog -* Mon Feb 13 2006 Ignacio Vazquez-Abrams 1.0-10 +* Tue Mar 14 2006 Ignacio Vazquez-Abrams 1.0-10 - Rebuild for Fedora Extras 5 * Fri Apr 22 2005 Ignacio Vazquez-Abrams 1.0-9 From fedora-extras-commits at redhat.com Wed Mar 15 05:55:59 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 15 Mar 2006 00:55:59 -0500 Subject: rpms/rogue/FC-4 rogue.png,1.1,1.2 Message-ID: <200603150556.k2F5u1RK000520@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv509 Modified Files: rogue.png Log Message: Resize image to match the directory that it's going into. From fedora-extras-commits at redhat.com Wed Mar 15 07:49:16 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 15 Mar 2006 02:49:16 -0500 Subject: rpms/perl-MailTools/devel .cvsignore, 1.8, 1.9 perl-MailTools.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <200603150749.k2F7nmDc004936@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-MailTools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4915 Modified Files: .cvsignore perl-MailTools.spec sources Log Message: * Wed Mar 1 2006 Ville Skytt?? - 1.74-1 - 1.74. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Jan 2006 08:16:53 -0000 1.8 +++ .cvsignore 15 Mar 2006 07:49:15 -0000 1.9 @@ -1 +1 @@ -MailTools-1.73.tar.gz +MailTools-1.74.tar.gz Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-MailTools.spec 22 Jan 2006 08:16:53 -0000 1.15 +++ perl-MailTools.spec 15 Mar 2006 07:49:15 -0000 1.16 @@ -1,6 +1,6 @@ Summary: Various mail-related perl modules Name: perl-MailTools -Version: 1.73 +Version: 1.74 Release: 1%{?dist} License: GPL or Artistic @@ -57,6 +57,9 @@ %changelog +* Wed Mar 1 2006 Ville Skytt?? - 1.74-1 +- 1.74. + * Sun Jan 22 2006 Ville Skytt?? - 1.73-1 - 1.73. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Jan 2006 08:16:53 -0000 1.8 +++ sources 15 Mar 2006 07:49:15 -0000 1.9 @@ -1 +1 @@ -5fae3213871ae435014c613e88d081a7 MailTools-1.73.tar.gz +aba82a7eb87906278d98174e10d838be MailTools-1.74.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 08:37:49 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 15 Mar 2006 03:37:49 -0500 Subject: rpms/gpsim/devel gpsim.spec,1.6,1.7 Message-ID: <200603150838.k2F8cLAm007063@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7043 Modified Files: gpsim.spec Log Message: Update patch. Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gpsim.spec 14 Mar 2006 14:59:13 -0000 1.6 +++ gpsim.spec 15 Mar 2006 08:37:48 -0000 1.7 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.21.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -80,6 +80,9 @@ %{_includedir}/* %changelog +* Wed Mar 15 2006 Alain Portal 0.21.11-5 + - Update Patch + * Tue Mar 14 2006 Alain Portal 0.21.11-4 - Patch to make gcc-4.1.0 happy From fedora-extras-commits at redhat.com Wed Mar 15 09:11:16 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 15 Mar 2006 04:11:16 -0500 Subject: rpms/gpsim/devel gpsim-0.21.11.happy_gcc, 1.2, 1.3 gpsim.spec, 1.7, 1.8 Message-ID: <200603150912.k2F9C8Uv009637@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9611 Modified Files: gpsim-0.21.11.happy_gcc gpsim.spec Log Message: Update patch. Index: gpsim-0.21.11.happy_gcc =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim-0.21.11.happy_gcc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gpsim-0.21.11.happy_gcc 14 Mar 2006 17:21:15 -0000 1.2 +++ gpsim-0.21.11.happy_gcc 15 Mar 2006 09:11:15 -0000 1.3 @@ -10,6 +10,18 @@ virtual ISimConsole &GetConsole(); virtual void DisplayMessage(unsigned int uStringID, ...); virtual void DisplayMessage(FILE * pOut, unsigned int uStringID, ...); +diff -ru gpsim-0.21.11/src/p12x.h gpsim-0.21.11.fix/src/p12x.h +--- gpsim-0.21.11/src/p12x.h 2005-09-26 05:51:23.000000000 +0200 ++++ gpsim-0.21.11.fix/src/p12x.h 2006-03-15 10:24:02.000000000 +0100 +@@ -108,7 +108,7 @@ + + virtual PROCESSOR_TYPE isa(void){return _P12CE518_;}; + virtual void tris_instruction(unsigned int tris_register); +- virtual void P12CE518::set_eeprom(I2C_EE *e); ++ virtual void set_eeprom(I2C_EE *e); + + P12CE518(void); + static Processor *construct(void); diff -ru gpsim-0.21.11/src/value.h gpsim-0.21.11.fix/src/value.h --- gpsim-0.21.11/src/value.h 2005-09-07 15:34:24.000000000 +0200 +++ gpsim-0.21.11.fix/src/value.h 2006-03-14 15:31:44.000000000 +0100 Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gpsim.spec 15 Mar 2006 08:37:48 -0000 1.7 +++ gpsim.spec 15 Mar 2006 09:11:15 -0000 1.8 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.21.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -80,6 +80,9 @@ %{_includedir}/* %changelog +* Wed Mar 15 2006 Alain Portal 0.21.11-6 + - Update Patch + * Wed Mar 15 2006 Alain Portal 0.21.11-5 - Update Patch From fedora-extras-commits at redhat.com Wed Mar 15 09:40:08 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Wed, 15 Mar 2006 04:40:08 -0500 Subject: rpms/gaim-guifications/devel gaim-guifications.spec,1.4,1.5 Message-ID: <200603150940.k2F9eeT6010341@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/gaim-guifications/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10301 Modified Files: gaim-guifications.spec Log Message: - rebuild Index: gaim-guifications.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-guifications/devel/gaim-guifications.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gaim-guifications.spec 18 Aug 2005 18:04:27 -0000 1.4 +++ gaim-guifications.spec 15 Mar 2006 09:40:07 -0000 1.5 @@ -13,7 +13,7 @@ Summary: Guifications Plugin for Gaim Name: gaim-guifications Version: 2.12 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet Url: http://guifications.sourceforge.net/Guifications/ @@ -53,6 +53,9 @@ %{_datadir}/pixmaps/gaim/guifications %changelog +* Wed Mar 15 2006 Radek Vok??l - 2.12-3 +- rebuild + * Thu Aug 18 2005 Jeremy Katz - 2.12-2 - rebuild for new cairo From fedora-extras-commits at redhat.com Wed Mar 15 09:41:19 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 04:41:19 -0500 Subject: rpms/polyxmass-bin/FC-3 .cvsignore, 1.4, 1.5 polyxmass-bin.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603150941.k2F9fp6X010456@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/polyxmass-bin/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10387/FC-3 Modified Files: .cvsignore polyxmass-bin.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Feb 2006 09:04:54 -0000 1.4 +++ .cvsignore 15 Mar 2006 09:41:19 -0000 1.5 @@ -1 +1 @@ -polyxmass-bin-0.9.2.tar.gz +polyxmass-bin-0.9.3.tar.gz Index: polyxmass-bin.spec =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/polyxmass-bin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- polyxmass-bin.spec 28 Feb 2006 09:04:54 -0000 1.4 +++ polyxmass-bin.spec 15 Mar 2006 09:41:19 -0000 1.5 @@ -1,12 +1,12 @@ Name: polyxmass-bin -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} Summary: The GNU polyxmass software suite Group: Applications/Engineering License: GPL URL: http://www.polyxmass.org/ -Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.2/polyxmass-bin-0.9.2.tar.gz +Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.3/polyxmass-bin-0.9.3.tar.gz Source1: polyxmass.desktop Patch0: polyxmass-bin-src-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,6 +72,10 @@ %exclude %{_datadir}/doc/polyxmass-bin %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.3-1 +- version upgrade + * Tue Feb 28 2006 Andreas Bierfert 0.9.2-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Feb 2006 09:04:54 -0000 1.4 +++ sources 15 Mar 2006 09:41:19 -0000 1.5 @@ -1 +1 @@ -12ef6f1dc89adc049503490039d6b6dc polyxmass-bin-0.9.2.tar.gz +d0f93501ea851fd21e0efacba95869ee polyxmass-bin-0.9.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 09:41:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 04:41:25 -0500 Subject: rpms/polyxmass-bin/FC-4 .cvsignore, 1.4, 1.5 polyxmass-bin.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603150941.k2F9fvRk010461@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/polyxmass-bin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10387/FC-4 Modified Files: .cvsignore polyxmass-bin.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Feb 2006 09:05:01 -0000 1.4 +++ .cvsignore 15 Mar 2006 09:41:25 -0000 1.5 @@ -1 +1 @@ -polyxmass-bin-0.9.2.tar.gz +polyxmass-bin-0.9.3.tar.gz Index: polyxmass-bin.spec =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/polyxmass-bin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- polyxmass-bin.spec 28 Feb 2006 09:05:01 -0000 1.4 +++ polyxmass-bin.spec 15 Mar 2006 09:41:25 -0000 1.5 @@ -1,12 +1,12 @@ Name: polyxmass-bin -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} Summary: The GNU polyxmass software suite Group: Applications/Engineering License: GPL URL: http://www.polyxmass.org/ -Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.2/polyxmass-bin-0.9.2.tar.gz +Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.3/polyxmass-bin-0.9.3.tar.gz Source1: polyxmass.desktop Patch0: polyxmass-bin-src-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,6 +72,10 @@ %exclude %{_datadir}/doc/polyxmass-bin %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.3-1 +- version upgrade + * Tue Feb 28 2006 Andreas Bierfert 0.9.2-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Feb 2006 09:05:01 -0000 1.4 +++ sources 15 Mar 2006 09:41:25 -0000 1.5 @@ -1 +1 @@ -12ef6f1dc89adc049503490039d6b6dc polyxmass-bin-0.9.2.tar.gz +d0f93501ea851fd21e0efacba95869ee polyxmass-bin-0.9.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 09:41:31 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 04:41:31 -0500 Subject: rpms/polyxmass-bin/devel .cvsignore, 1.4, 1.5 polyxmass-bin.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603150942.k2F9g3bn010467@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/polyxmass-bin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10387/devel Modified Files: .cvsignore polyxmass-bin.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Feb 2006 08:30:51 -0000 1.4 +++ .cvsignore 15 Mar 2006 09:41:30 -0000 1.5 @@ -1 +1 @@ -polyxmass-bin-0.9.2.tar.gz +polyxmass-bin-0.9.3.tar.gz Index: polyxmass-bin.spec =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/devel/polyxmass-bin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- polyxmass-bin.spec 28 Feb 2006 08:30:51 -0000 1.5 +++ polyxmass-bin.spec 15 Mar 2006 09:41:30 -0000 1.6 @@ -1,12 +1,12 @@ Name: polyxmass-bin -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} Summary: The GNU polyxmass software suite Group: Applications/Engineering License: GPL URL: http://www.polyxmass.org/ -Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.2/polyxmass-bin-0.9.2.tar.gz +Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.3/polyxmass-bin-0.9.3.tar.gz Source1: polyxmass.desktop Patch0: polyxmass-bin-src-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,6 +72,10 @@ %exclude %{_datadir}/doc/polyxmass-bin %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.3-1 +- version upgrade + * Tue Feb 28 2006 Andreas Bierfert 0.9.2-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Feb 2006 08:30:51 -0000 1.4 +++ sources 15 Mar 2006 09:41:30 -0000 1.5 @@ -1 +1 @@ -12ef6f1dc89adc049503490039d6b6dc polyxmass-bin-0.9.2.tar.gz +d0f93501ea851fd21e0efacba95869ee polyxmass-bin-0.9.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 09:44:39 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 04:44:39 -0500 Subject: rpms/plt-scheme/FC-4 plt-scheme.spec,1.14,1.15 Message-ID: <200603150945.k2F9jB24010566@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10511/FC-4 Modified Files: plt-scheme.spec Log Message: Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-4/plt-scheme.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- plt-scheme.spec 28 Jan 2006 13:37:03 -0000 1.14 +++ plt-scheme.spec 15 Mar 2006 09:44:39 -0000 1.15 @@ -85,7 +85,7 @@ rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes # get-base.ss causes error during install -find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f +#find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps From fedora-extras-commits at redhat.com Wed Mar 15 09:45:40 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 04:45:40 -0500 Subject: rpms/ecl/FC-4 ecl.spec,1.1,1.2 Message-ID: <200603150946.k2F9kCox010678@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10616 Modified Files: ecl.spec Log Message: Index: ecl.spec =================================================================== RCS file: /cvs/extras/rpms/ecl/FC-4/ecl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ecl.spec 14 Mar 2006 07:56:15 -0000 1.1 +++ ecl.spec 15 Mar 2006 09:45:39 -0000 1.2 @@ -1,6 +1,6 @@ Name: ecl Version: 0.9h -Release: 4 +Release: 4%{?dist} Summary: Embeddable Common-Lisp Group: Development/Languages From fedora-extras-commits at redhat.com Wed Mar 15 10:28:47 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 05:28:47 -0500 Subject: rpms/ecl/devel ecl.spec,1.1,1.2 Message-ID: <200603151029.k2FATKJ5012885@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12863 Modified Files: ecl.spec Log Message: Index: ecl.spec =================================================================== RCS file: /cvs/extras/rpms/ecl/devel/ecl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ecl.spec 14 Mar 2006 07:56:15 -0000 1.1 +++ ecl.spec 15 Mar 2006 10:28:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: ecl Version: 0.9h -Release: 4 +Release: 4%{?dist} Summary: Embeddable Common-Lisp Group: Development/Languages @@ -8,7 +8,7 @@ URL: http://ecls.sourceforge.net Source0: http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-0.9h.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xorg-x11-devel +BuildRequires: libX11-devel BuildRequires: m4 BuildRequires: texinfo Requires(post): /sbin/install-info From fedora-extras-commits at redhat.com Wed Mar 15 10:31:35 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 15 Mar 2006 05:31:35 -0500 Subject: rpms/pikdev/devel pikdev.spec,1.1,1.2 Message-ID: <200603151032.k2FAW72c012961@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12940 Modified Files: pikdev.spec Log Message: Exclude ppc arch which fail to build. Fix some other problem (see %changelog) Index: pikdev.spec =================================================================== RCS file: /cvs/extras/rpms/pikdev/devel/pikdev.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pikdev.spec 14 Mar 2006 08:26:13 -0000 1.1 +++ pikdev.spec 15 Mar 2006 10:31:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: pikdev Version: 0.8.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC @@ -17,6 +17,8 @@ Requires: gputils +ExcludeArch: ppc + %description PiKdev is a simple IDE dedicated to the development of PIC based applications under KDE. @@ -61,7 +63,11 @@ rm -rf pkp cd pikdev -make -f Makefile.pkp +make -f Makefile.pkp \ +CCPP=g++ \ +LINK=g++ \ +CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.8.4" \ +LIBS= cd .. cp pikdev/pkp . make %{?_smp_mflags} @@ -69,7 +75,7 @@ %install rm -rf $RPM_BUILD_ROOT -make install-strip DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop @@ -96,6 +102,13 @@ %{_datadir}/icons/* %changelog +* Wed Mar 15 2006 Alain Portal 0.8.4-4 + - Exclude temporarily ppc arch because don't exist + in ppc glibc headers + - Override compiler for pkp Makefile and propagate $RPM_OPT_FLAGS on it + - Make install instead of install-strip + - Contributions of Ralf Corsepius + Thanks to him. * Wed Mar 08 2006 Alain Portal 0.8.4-3 - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5 - Package must own %{_datadir}/apps/%{name} directory From fedora-extras-commits at redhat.com Wed Mar 15 12:14:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 15 Mar 2006 07:14:56 -0500 Subject: rpms/perl-Glib/FC-4 .cvsignore, 1.7, 1.8 perl-Glib.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200603151215.k2FCFURB017421@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Glib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17396 Modified Files: .cvsignore perl-Glib.spec sources Log Message: Sync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Jan 2006 11:30:49 -0000 1.7 +++ .cvsignore 15 Mar 2006 12:14:55 -0000 1.8 @@ -1 +1 @@ -Glib-1.103.tar.gz +Glib-1.120.tar.gz Index: perl-Glib.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-4/perl-Glib.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Glib.spec 19 Jan 2006 11:30:49 -0000 1.11 +++ perl-Glib.spec 15 Mar 2006 12:14:55 -0000 1.12 @@ -1,5 +1,5 @@ Name: perl-Glib -Version: 1.103 +Version: 1.120 Release: 1%{?dist} Summary: Perl interface to GLib @@ -59,13 +59,25 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog LICENSE NEWS README README.api-changes TODO +%doc AUTHORS ChangeLog LICENSE NEWS README TODO %{perl_vendorarch}/auto/Glib/ %{perl_vendorarch}/Glib* %{_mandir}/man3/*.3* %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 1.120-1 +- Update to 1.120. + +* Mon Feb 13 2006 Jose Pedro Oliveira - 1.105-2 +- make tag problem. + +* Mon Feb 13 2006 Jose Pedro Oliveira - 1.105-1 +- Update to 1.105. + +* Mon Feb 6 2006 Jose Pedro Oliveira - 1.104-1 +- Update to 1.104 (fails one test in perl 5.8.8). + * Thu Jan 19 2006 Jose Pedro Oliveira - 1.103-1 - Update to 1.103. - Provides list: filtered out perl(MY) (#177956). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Jan 2006 11:30:49 -0000 1.7 +++ sources 15 Mar 2006 12:14:55 -0000 1.8 @@ -1 +1 @@ -fe8d123a872776a0c5cae50d513bf938 Glib-1.103.tar.gz +639d22451339e07844e6be3b5e345959 Glib-1.120.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 12:18:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 15 Mar 2006 07:18:03 -0500 Subject: rpms/perl-Gtk2/FC-4 .cvsignore, 1.7, 1.8 perl-Gtk2.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200603151218.k2FCIZi0017527@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17506 Modified Files: .cvsignore perl-Gtk2.spec sources Log Message: Sync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 Jan 2006 16:35:08 -0000 1.7 +++ .cvsignore 15 Mar 2006 12:18:02 -0000 1.8 @@ -1 +1 @@ -Gtk2-1.102.tar.gz +Gtk2-1.120.tar.gz Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/perl-Gtk2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Gtk2.spec 2 Jan 2006 16:35:08 -0000 1.11 +++ perl-Gtk2.spec 15 Mar 2006 12:18:02 -0000 1.12 @@ -1,5 +1,11 @@ +# +# Rebuild option: +# +# --with testsuite - run the test suite (requires X) +# + Name: perl-Gtk2 -Version: 1.102 +Version: 1.120 Release: 1%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library @@ -10,10 +16,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 2:5.8.0 -BuildRequires: gtk2-devel, perl-Glib >= 1.102 +BuildRequires: gtk2-devel, perl-Glib >= 1.120 BuildRequires: perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig) -Requires: perl-Glib >= 1.102 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl-Glib >= 1.120 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module allows you to write Gtk+ graphical user interfaces in a @@ -25,6 +31,17 @@ %prep %setup -q -n Gtk2-%{version} +iconv -f iso-8859-1 -t utf-8 -o pm/Helper.pm{.utf8,} +mv pm/Helper.pm{.utf8,} + +# Provides: exclude perl(main) +cat <<__EOF__ > %{name}-perl.prov +#!/bin/sh +/usr/lib/rpm/perl.prov \$* | grep -v '^perl(main)$' +__EOF__ +%define __perl_provides %{_builddir}/Gtk2-%{version}/%{name}-perl.prov +chmod +x %{__perl_provides} + %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -41,8 +58,7 @@ %check -# Testing requires X -%{?_with_tests:make test} +%{?_with_testsuite:make test} %clean @@ -59,6 +75,18 @@ %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 1.120-1 +- Update to 1.120. + +* Mon Feb 20 2006 Jose Pedro Oliveira - 1.104-1 +- Update to 1.104. +- Requires perl(Glib) >= 1.105 (1.104 had problems with perl 5.8.8). + +* Thu Jan 19 2006 Jose Pedro Oliveira - 1.103-1 +- Update to 1.103. +- Converted the Gtk2::Helper man page to utf8 (#177802). +- Provides list: filtered out perl(main) (#177802). + * Wed Nov 30 2005 Jose Pedro Oliveira - 1.102-1 - Update to 1.102. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 Jan 2006 16:35:08 -0000 1.7 +++ sources 15 Mar 2006 12:18:02 -0000 1.8 @@ -1 +1 @@ -8bd7173c8a2b6b8baf2fa3c3d48d4bb5 Gtk2-1.102.tar.gz +3d0eef4271bd624b284f9a23f4bdbb96 Gtk2-1.120.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 12:20:02 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 15 Mar 2006 07:20:02 -0500 Subject: rpms/djvulibre/devel .cvsignore, 1.6, 1.7 djvulibre.spec, 1.14, 1.15 sources, 1.6, 1.7 djvulibre-3.5.15-gcc401.patch, 1.1, NONE djvulibre-3.5.16-extraqualif.patch, 1.1, NONE Message-ID: <200603151220.k2FCKYsS017595@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17574 Modified Files: .cvsignore djvulibre.spec sources Removed Files: djvulibre-3.5.15-gcc401.patch djvulibre-3.5.16-extraqualif.patch Log Message: Update to CVS to fix gcc 4.1 build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 6 Mar 2006 15:51:09 -0000 1.6 +++ .cvsignore 15 Mar 2006 12:20:02 -0000 1.7 @@ -1 +1 @@ -djvulibre-3.5.16.tar.gz +djvulibre-3.5.16cvs.tar.gz Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- djvulibre.spec 6 Mar 2006 16:34:50 -0000 1.14 +++ djvulibre.spec 15 Mar 2006 12:20:02 -0000 1.15 @@ -1,12 +1,11 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.16 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ -Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz -Patch0: djvulibre-3.5.16-extraqualif.patch +Source: http://dl.sf.net/djvu/djvulibre-%{version}cvs.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: qt-devel, libjpeg-devel, libtiff-devel BuildRequires: mozilla, redhat-menus, hicolor-icon-theme @@ -38,7 +37,9 @@ %prep %setup -%patch0 -p1 -b .extraqualif +# In 3.5.15cvs, hardcoded "/usr/include/qt3" needs replacing +. /etc/profile.d/qt.sh +%{__perl} -pi -e "s|/usr/include/qt3|${QTINC}|g" gui/djview/Makefile.dep %build @@ -97,13 +98,19 @@ #files devel #defattr(-, root, root, 0755) %{_includedir}/libdjvu/ +%{_libdir}/pkgconfig/ddjvuapi.pc %exclude %{_libdir}/*.la %{_libdir}/*.so %changelog +* Tue Mar 14 2006 Matthias Saou 3.5.16-3 +- Update to CVS snapshot, fixes the build with gcc 4.1 (sf.net #1420522). +- Include workaround for wrong qt3 includes in gui/djview/Makefile.dep. +- Add new pkgconfig ddjvuapi.pc file. + * Mon Mar 6 2006 Matthias Saou 3.5.16-2 -- FC5 rebuild. +- FC5 rebuild... nope. * Mon Jan 30 2006 Matthias Saou 3.5.16-1 - Update to 3.5.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Mar 2006 15:51:09 -0000 1.6 +++ sources 15 Mar 2006 12:20:02 -0000 1.7 @@ -1 +1 @@ -5591c99a50aed1613a796a5aa4978fc0 djvulibre-3.5.16.tar.gz +45e3436ca4a0f2d791909464da03bf62 djvulibre-3.5.16cvs.tar.gz --- djvulibre-3.5.15-gcc401.patch DELETED --- --- djvulibre-3.5.16-extraqualif.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 15 13:27:27 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 15 Mar 2006 08:27:27 -0500 Subject: rpms/pikdev/FC-4 pikdev.spec,1.1,1.2 Message-ID: <200603151327.k2FDRxtL019867@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19850 Modified Files: pikdev.spec Log Message: Same spec file than devel branch Index: pikdev.spec =================================================================== RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pikdev.spec 14 Mar 2006 08:26:13 -0000 1.1 +++ pikdev.spec 15 Mar 2006 13:27:26 -0000 1.2 @@ -1,6 +1,6 @@ Name: pikdev Version: 0.8.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC @@ -17,6 +17,8 @@ Requires: gputils +ExcludeArch: ppc + %description PiKdev is a simple IDE dedicated to the development of PIC based applications under KDE. @@ -61,7 +63,11 @@ rm -rf pkp cd pikdev -make -f Makefile.pkp +make -f Makefile.pkp \ +CCPP=g++ \ +LINK=g++ \ +CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.8.4" \ +LIBS= cd .. cp pikdev/pkp . make %{?_smp_mflags} @@ -69,7 +75,7 @@ %install rm -rf $RPM_BUILD_ROOT -make install-strip DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop @@ -96,6 +102,13 @@ %{_datadir}/icons/* %changelog +* Wed Mar 15 2006 Alain Portal 0.8.4-4 + - Exclude temporarily ppc arch because don't exist + in ppc glibc headers + - Override compiler for pkp Makefile and propagate $RPM_OPT_FLAGS on it + - Make install instead of install-strip + - Contributions of Ralf Corsepius + Thanks to him. * Wed Mar 08 2006 Alain Portal 0.8.4-3 - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5 - Package must own %{_datadir}/apps/%{name} directory From fedora-extras-commits at redhat.com Wed Mar 15 14:19:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 15 Mar 2006 09:19:14 -0500 Subject: rpms/perl-Mail-Sender/devel .cvsignore, 1.2, 1.3 perl-Mail-Sender.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603151419.k2FEJkmj022069@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Mail-Sender/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22011/devel Modified Files: .cvsignore perl-Mail-Sender.spec sources Log Message: Update to 0.8.13. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Sep 2005 15:12:40 -0000 1.2 +++ .cvsignore 15 Mar 2006 14:19:14 -0000 1.3 @@ -1 +1 @@ -Mail-Sender-0.8.10.tar.gz +Mail-Sender-0.8.13.tar.gz Index: perl-Mail-Sender.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/devel/perl-Mail-Sender.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Mail-Sender.spec 17 Feb 2006 20:37:31 -0000 1.2 +++ perl-Mail-Sender.spec 15 Mar 2006 14:19:14 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Mail-Sender -Version: 0.8.10 -Release: 3%{?dist} +Version: 0.8.13 +Release: 1%{?dist} Summary: Module for sending mails with attachments through an SMTP server Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 15 2006 Jose Pedro Oliveira - 0.8.13-1 +- Update to 0.8.13. + * Fri Feb 17 2006 Jose Pedro Oliveira - 0.8.10-3 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Sep 2005 15:12:40 -0000 1.2 +++ sources 15 Mar 2006 14:19:14 -0000 1.3 @@ -1 +1 @@ -4dac1115bacca2ed0b8403c3874975da Mail-Sender-0.8.10.tar.gz +a30a7267995f7503724b3195ce9493bd Mail-Sender-0.8.13.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 14:19:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 15 Mar 2006 09:19:03 -0500 Subject: rpms/perl-Mail-Sender/FC-4 .cvsignore, 1.2, 1.3 perl-Mail-Sender.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603151420.k2FEK7sX022077@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Mail-Sender/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22011/FC-4 Modified Files: .cvsignore perl-Mail-Sender.spec sources Log Message: Update to 0.8.13. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Sep 2005 15:12:40 -0000 1.2 +++ .cvsignore 15 Mar 2006 14:19:02 -0000 1.3 @@ -1 +1 @@ -Mail-Sender-0.8.10.tar.gz +Mail-Sender-0.8.13.tar.gz Index: perl-Mail-Sender.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/FC-4/perl-Mail-Sender.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Mail-Sender.spec 12 Sep 2005 15:12:40 -0000 1.1 +++ perl-Mail-Sender.spec 15 Mar 2006 14:19:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Mail-Sender -Version: 0.8.10 -Release: 2%{?dist} +Version: 0.8.13 +Release: 1%{?dist} Summary: Module for sending mails with attachments through an SMTP server Group: Development/Libraries @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. @@ -56,6 +56,12 @@ %changelog +* Wed Mar 15 2006 Jose Pedro Oliveira - 0.8.13-1 +- Update to 0.8.13. + +* Fri Feb 17 2006 Jose Pedro Oliveira - 0.8.10-3 +- Rebuild for FC5 (perl 5.8.8). + * Mon Sep 12 2005 Jose Pedro Oliveira - 0.8.10-2 - License clarification. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Sep 2005 15:12:40 -0000 1.2 +++ sources 15 Mar 2006 14:19:02 -0000 1.3 @@ -1 +1 @@ -4dac1115bacca2ed0b8403c3874975da Mail-Sender-0.8.10.tar.gz +a30a7267995f7503724b3195ce9493bd Mail-Sender-0.8.13.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 14:49:54 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 15 Mar 2006 09:49:54 -0500 Subject: owners owners.list,1.743,1.744 Message-ID: <200603151450.k2FEoRYg022376@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22356 Modified Files: owners.list Log Message: +kadischi Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.743 retrieving revision 1.744 diff -u -r1.743 -r1.744 --- owners.list 14 Mar 2006 19:54:38 -0000 1.743 +++ owners.list 15 Mar 2006 14:49:54 -0000 1.744 @@ -483,6 +483,7 @@ Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|juk|Jukebox and music manager for KDE|nomis80 at nomis80.org|extras-qa at fedoraproject.org| +Fedora Extras|kadischi|An application for Fedora-based LiveCD generation|cgoorah at yahoo.com.au|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 Wed Mar 15 14:51:42 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 15 Mar 2006 09:51:42 -0500 Subject: rpms/hercules/devel hercules.spec,1.9,1.10 Message-ID: <200603151452.k2FEqEmL022405@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/hercules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22388 Modified Files: hercules.spec Log Message: Next try, builds for me with mach, but not in the buildsys with mock :-( Index: hercules.spec =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/hercules.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hercules.spec 14 Mar 2006 15:05:31 -0000 1.9 +++ hercules.spec 15 Mar 2006 14:51:42 -0000 1.10 @@ -10,6 +10,8 @@ Source: http://www.conmicro.cx/hercules/hercules-%{version}%{?date:-cvs}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: bison, zlib-devel, bzip2-devel, libgcrypt-devel, gcc-c++ +BuildRequires: gettext-devel +BuildRequires: autoconf, automake, libtool Obsoletes: hercules-docs <= 3.01 %description @@ -23,6 +25,9 @@ %prep %setup -n %{name}-%{version}%{?date:-cvs} +#autoreconf -Iautoconf -Im4 -f -i +aclocal +automake -c -f ### FIXME: Make buildsystem use standard autotools directories (Fix upstream please) %{__perl} -pi.orig -e 's|^(modexecdir) =.*$|$1 = \$(libdir)/hercules|' \ From fedora-extras-commits at redhat.com Wed Mar 15 15:16:41 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 15 Mar 2006 10:16:41 -0500 Subject: rpms/pikdev/FC-4 pikdev.spec,1.2,1.3 Message-ID: <200603151517.k2FFHEap024573@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24552 Modified Files: pikdev.spec Log Message: Try to fix a x86_64 build failure. /usr/lib/qt-3.3 seems not set. Index: pikdev.spec =================================================================== RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pikdev.spec 15 Mar 2006 13:27:26 -0000 1.2 +++ pikdev.spec 15 Mar 2006 15:16:41 -0000 1.3 @@ -1,6 +1,6 @@ Name: pikdev Version: 0.8.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC @@ -59,6 +59,8 @@ %build +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh + %configure --disable-rpath rm -rf pkp @@ -102,6 +104,8 @@ %{_datadir}/icons/* %changelog +* Wed Mar 15 2006 Alain Portal 0.8.4-5 + - Source qt.sh if $QTDIR isn't set. Always Ralf... * Wed Mar 15 2006 Alain Portal 0.8.4-4 - Exclude temporarily ppc arch because don't exist in ppc glibc headers From fedora-extras-commits at redhat.com Wed Mar 15 15:23:22 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:23:22 -0500 Subject: rpms/muine - New directory Message-ID: <200603151523.k2FFNOii024768@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24760/muine Log Message: Directory /cvs/extras/rpms/muine added to the repository From fedora-extras-commits at redhat.com Wed Mar 15 15:23:27 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:23:27 -0500 Subject: rpms/muine/devel - New directory Message-ID: <200603151523.k2FFNTkJ024783@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24760/muine/devel Log Message: Directory /cvs/extras/rpms/muine/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 15 15:24:57 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:24:57 -0500 Subject: rpms/muine Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603151524.k2FFOxOk024817@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24805 Added Files: Makefile import.log Log Message: Setup of module muine --- NEW FILE Makefile --- # Top level Makefile for module muine all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 15 15:25:03 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:25:03 -0500 Subject: rpms/muine/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603151525.k2FFP5MI024837@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24805/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module muine --- NEW 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 Mar 15 15:27:12 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:27:12 -0500 Subject: rpms/muine import.log,1.1,1.2 Message-ID: <200603151527.k2FFRiLX024919@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24882 Modified Files: import.log Log Message: auto-import muine-0.8.4-5 on branch devel from muine-0.8.4-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/muine/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Mar 2006 15:24:57 -0000 1.1 +++ import.log 15 Mar 2006 15:27:12 -0000 1.2 @@ -0,0 +1 @@ +muine-0_8_4-5:HEAD:muine-0.8.4-5.src.rpm:1142436430 From fedora-extras-commits at redhat.com Wed Mar 15 15:27:18 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:27:18 -0500 Subject: rpms/muine/devel muine-gacutil_flags.patch, NONE, 1.1 muine.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603151527.k2FFRo3S024923@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24882/devel Modified Files: .cvsignore sources Added Files: muine-gacutil_flags.patch muine.spec Log Message: auto-import muine-0.8.4-5 on branch devel from muine-0.8.4-5.src.rpm muine-gacutil_flags.patch: --- NEW FILE muine-gacutil_flags.patch --- --- muine-0.8.4/configure.old 2006-03-14 20:51:14.000000000 +0100 +++ muine-0.8.4/configure 2006-03-14 20:52:32.000000000 +0100 @@ -21724,7 +21724,7 @@ { (exit 1); exit 1; }; } fi -GACUTIL_FLAGS='/package muine /gacdir $(libdir) /root $(DESTDIR)$(libdir)' +GACUTIL_FLAGS='/package muine /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib' --- NEW FILE muine.spec --- Name: muine Version: 0.8.4 Release: 5%{?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-gacutil_flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, gtk-sharp2-gapi, gtk-sharp2 BuildRequires: gtk2-devel, gnome-vfs2-devel, gnome-icon-theme BuildRequires: dbus-sharp >= 0.50, gdbm-devel BuildRequires: gstreamer08-plugins-devel BuildRequires: libid3tag-devel BuildRequires: libvorbis-devel, flac-devel BuildRequires: desktop-file-utils, gettext Requires: mono-core, dbus-sharp >= 0.50, gtk-sharp2 Requires(pre): GConf2 Requires(post): GConf2, desktop-file-utils Requires(preun): GConf2 Requires(postun): desktop-file-utils %description Muine is a new music player for GNOME using some new UI ideas. The idea is that it will be much easier and comfortable to use than the iTunes model, which is used by most GNOME music players. It is written in C and C#, using GStreamer for music playback. %package devel Summary: Files required for Muine plug-in development Group: Development/Libraries Requires: %{name} = %{epoch}:%{version} %description devel Files needed for building plug-ins for Muine. %prep %setup -q %patch0 -p1 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT #install tray plugin which is not included by default install plugins/TrayIcon.dll $RPM_BUILD_ROOT%{_libdir}/muine/plugins/ install -m 644 plugins/TrayIcon.dll.config $RPM_BUILD_ROOT%{_libdir}/muine/plugins/ install plugins/muine-tray* $RPM_BUILD_ROOT%{_libdir}/muine/plugins/ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %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 %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi %post update-desktop-database &> /dev/null ||: export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi %postun update-desktop-database &> /dev/null ||: %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_sysconfdir}/gconf/schemas/muine.schemas %{_bindir}/* %{_libdir}/dbus-1.0/services/org.gnome.Muine.service %{_prefix}/lib/mono/gac/muine-dbus/*/muine-dbus.dll %{_prefix}/lib/mono/gac/muine-plugin/*/muine-plugin.dll %{_prefix}/lib/mono/muine %{_libdir}/muine/*.so* %{_libdir}/muine/*.exe* %{_libdir}/muine/plugins/InotifyPlugin.dll* %{_datadir}/applications/* %{_datadir}/pixmaps/muine.png %{_libdir}/muine/plugins/TrayIcon.dll* %{_libdir}/muine/plugins/muine-tray-*.png %files devel %{_libdir}/pkgconfig/*.pc %{_libdir}/muine/*.a %changelog * Tue Mar 14 2006 Sindre Pedersen Bj??rdal - 0.8.4-5 - Patch added to really fix the x86_64 issue * Mon Mar 13 2006 Sindre Pedersen Bj??rdal - 0.8.4-4 - Replace {_libdir} with {_prefix}/lib/ for 64-bit * Mon Mar 06 2006 Sindre Pedersen Bj??rdal - 0.8.4-3 - Include trayicon by default - Fix GConf scriptlets - Create -devel package for devel files * Tue Feb 16 2006 Sindre Pedersen Bj??rdal - 0.8.4-2 - Remove Dashboard plugin, as dashboard doesn't exist yet. * Mon Jan 30 2006 Sindre Pedersen Bj??rdal - 0.8.4-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/muine/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Mar 2006 15:25:02 -0000 1.1 +++ .cvsignore 15 Mar 2006 15:27:18 -0000 1.2 @@ -0,0 +1 @@ +muine-0.8.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/muine/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Mar 2006 15:25:02 -0000 1.1 +++ sources 15 Mar 2006 15:27:18 -0000 1.2 @@ -0,0 +1 @@ +215dab4b1a0022deadb848b646640514 muine-0.8.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 16:02:02 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 11:02:02 -0500 Subject: owners owners.list,1.744,1.745 Message-ID: <200603151602.k2FG2YZS027085@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25046 Modified Files: owners.list Log Message: Add muine that I maintain Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.744 retrieving revision 1.745 diff -u -r1.744 -r1.745 --- owners.list 15 Mar 2006 14:49:54 -0000 1.744 +++ owners.list 15 Mar 2006 16:02:01 -0000 1.745 @@ -703,6 +703,7 @@ Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|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|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org| Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com From fedora-extras-commits at redhat.com Wed Mar 15 16:28:28 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 15 Mar 2006 11:28:28 -0500 Subject: rpms/highlight/devel highlight-2.4-fixcodegen.patch, NONE, 1.1 highlight.spec, 1.11, 1.12 Message-ID: <200603151629.k2FGT0gR027219@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27197 Modified Files: highlight.spec Added Files: highlight-2.4-fixcodegen.patch Log Message: Add fixcodegen patch, #184245 highlight-2.4-fixcodegen.patch: --- NEW FILE highlight-2.4-fixcodegen.patch --- diff -ur highlight-2.4.4.old/highlight/codegenerator.cpp highlight-2.4.4/highlight/codegenerator.cpp --- highlight-2.4.4.old/highlight/codegenerator.cpp 2006-02-19 09:11:18.000000000 -0800 +++ highlight-2.4.4/highlight/codegenerator.cpp 2006-02-19 09:11:18.000000000 -0800 @@ -284,7 +284,11 @@ bool CodeGenerator::readNewLine(string &newLine){ bool eof; - terminatingChar=newLine[lineIndex-1]; + if (lineIndex > 0) { + terminatingChar=newLine[lineIndex-1]; + } else { + terminatingChar = '\0'; + } if (formattingPossible && formattingEnabled) { eof=!formatter->hasMoreLines(); if (!eof) { Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- highlight.spec 12 Mar 2006 20:09:47 -0000 1.11 +++ highlight.spec 15 Mar 2006 16:28:28 -0000 1.12 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch +Patch3: highlight-2.4-fixcodegen.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -25,6 +26,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -49,6 +51,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 +- Add fixcodegen patch #184245 + * Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 - New upstream release - Adapt rpmopt patch to new upstream release From fedora-extras-commits at redhat.com Wed Mar 15 16:30:24 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 15 Mar 2006 11:30:24 -0500 Subject: rpms/highlight/FC-4 highlight-2.4-fixcodegen.patch, NONE, 1.1 highlight.spec, 1.8, 1.9 Message-ID: <200603151630.k2FGUubi027293@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27273 Modified Files: highlight.spec Added Files: highlight-2.4-fixcodegen.patch Log Message: Add fixcodegen patch, #184245 highlight-2.4-fixcodegen.patch: --- NEW FILE highlight-2.4-fixcodegen.patch --- diff -ur highlight-2.4.4.old/highlight/codegenerator.cpp highlight-2.4.4/highlight/codegenerator.cpp --- highlight-2.4.4.old/highlight/codegenerator.cpp 2006-02-19 09:11:18.000000000 -0800 +++ highlight-2.4.4/highlight/codegenerator.cpp 2006-02-19 09:11:18.000000000 -0800 @@ -284,7 +284,11 @@ bool CodeGenerator::readNewLine(string &newLine){ bool eof; - terminatingChar=newLine[lineIndex-1]; + if (lineIndex > 0) { + terminatingChar=newLine[lineIndex-1]; + } else { + terminatingChar = '\0'; + } if (formattingPossible && formattingEnabled) { eof=!formatter->hasMoreLines(); if (!eof) { Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/highlight.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- highlight.spec 12 Mar 2006 20:14:31 -0000 1.8 +++ highlight.spec 15 Mar 2006 16:30:24 -0000 1.9 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch +Patch3: highlight-2.4-fixcodegen.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -25,6 +26,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -49,6 +51,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 +- Add fixcodegen patch #184245 + * Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 - New upstream release - Adapt rpmopt patch to new upstream release From fedora-extras-commits at redhat.com Wed Mar 15 16:37:45 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 11:37:45 -0500 Subject: rpms/ecl/devel ecl-gcc41.patch,NONE,1.1 ecl.spec,1.2,1.3 Message-ID: <200603151638.k2FGcHsg027413@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27390 Modified Files: ecl.spec Added Files: ecl-gcc41.patch Log Message: ecl-gcc41.patch: --- NEW FILE ecl-gcc41.patch --- --- ecl-0.9h/src/gc/include/gc_cpp.h.gcc41 2006-03-15 17:11:48.000000000 +0100 +++ ecl-0.9h/src/gc/include/gc_cpp.h 2006-03-15 17:12:13.000000000 +0100 @@ -180,7 +180,7 @@ inline void* operator new[]( size_t size, void *p ); inline void operator delete[]( void* obj ); # ifdef GC_PLACEMENT_DELETE - inline void gc::operator delete[]( void*, void* ); + inline void operator delete[]( void*, void* ); # endif #endif /* GC_OPERATOR_NEW_ARRAY */ }; Index: ecl.spec =================================================================== RCS file: /cvs/extras/rpms/ecl/devel/ecl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ecl.spec 15 Mar 2006 10:28:47 -0000 1.2 +++ ecl.spec 15 Mar 2006 16:37:45 -0000 1.3 @@ -1,12 +1,13 @@ Name: ecl Version: 0.9h -Release: 4%{?dist} +Release: 5%{?dist} Summary: Embeddable Common-Lisp Group: Development/Languages License: LGPL URL: http://ecls.sourceforge.net Source0: http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-0.9h.tgz +Patch0: ecl-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel BuildRequires: m4 @@ -25,13 +26,14 @@ %prep %setup0 -q +%patch0 -p1 # wrong character in texinfo file perl -pi -e 's|\xc7||' src/doc/user.txi %build %configure --enable-boehm=included --enable-threads=yes --with-cxx -make +make -k (cd build/doc; make all html) @@ -77,6 +79,9 @@ %changelog +* Wed Mar 15 2006 Gerard Milmeister - 0.9h-5 +- patch for gcc 4.1 + * Tue Mar 14 2006 Gerard Milmeister - 0.9h-4 - removed buildreq perl From fedora-extras-commits at redhat.com Wed Mar 15 17:16:59 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 12:16:59 -0500 Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.13, 1.14 abcm2ps.spec, 1.13, 1.14 sources, 1.13, 1.14 Message-ID: <200603151717.k2FHHVV3029544@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29497/FC-4 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 13 Mar 2006 23:01:33 -0000 1.13 +++ .cvsignore 15 Mar 2006 17:16:59 -0000 1.14 @@ -1,2 +1,2 @@ -abcm2ps-4.12.10.tar.gz +abcm2ps-4.12.11.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- abcm2ps.spec 13 Mar 2006 23:01:33 -0000 1.13 +++ abcm2ps.spec 15 Mar 2006 17:16:59 -0000 1.14 @@ -1,5 +1,5 @@ Name: abcm2ps -Version: 4.12.10 +Version: 4.12.11 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript @@ -52,6 +52,9 @@ %changelog +* Wed Mar 15 2006 Gerard Milmeister - 4.12.11-1 +- new version 4.12.11 + * Mon Mar 13 2006 Gerard Milmeister - 4.12.10-1 - new version 4.12.10 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 13 Mar 2006 23:01:33 -0000 1.13 +++ sources 15 Mar 2006 17:16:59 -0000 1.14 @@ -1,2 +1,2 @@ -4866c0fdc9a9151e03400bb3fd55bb18 abcm2ps-4.12.10.tar.gz +8052dc74e322ecf065a44cf1e6bd05e0 abcm2ps-4.12.11.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Wed Mar 15 17:17:05 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 12:17:05 -0500 Subject: rpms/abcm2ps/devel .cvsignore, 1.13, 1.14 abcm2ps.spec, 1.14, 1.15 sources, 1.13, 1.14 Message-ID: <200603151717.k2FHHcBc029552@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29497/devel Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 13 Mar 2006 23:01:39 -0000 1.13 +++ .cvsignore 15 Mar 2006 17:17:05 -0000 1.14 @@ -1,2 +1,2 @@ -abcm2ps-4.12.10.tar.gz +abcm2ps-4.12.11.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- abcm2ps.spec 13 Mar 2006 23:01:40 -0000 1.14 +++ abcm2ps.spec 15 Mar 2006 17:17:05 -0000 1.15 @@ -1,5 +1,5 @@ Name: abcm2ps -Version: 4.12.10 +Version: 4.12.11 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript @@ -52,6 +52,9 @@ %changelog +* Wed Mar 15 2006 Gerard Milmeister - 4.12.11-1 +- new version 4.12.11 + * Mon Mar 13 2006 Gerard Milmeister - 4.12.10-1 - new version 4.12.10 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 13 Mar 2006 23:01:40 -0000 1.13 +++ sources 15 Mar 2006 17:17:05 -0000 1.14 @@ -1,2 +1,2 @@ -4866c0fdc9a9151e03400bb3fd55bb18 abcm2ps-4.12.10.tar.gz +8052dc74e322ecf065a44cf1e6bd05e0 abcm2ps-4.12.11.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Wed Mar 15 17:20:02 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 12:20:02 -0500 Subject: rpms/abcm2ps/FC-4 abcm2ps.spec,1.14,1.15 Message-ID: <200603151720.k2FHKYUv029687@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29655/FC-4 Modified Files: abcm2ps.spec Log Message: Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- abcm2ps.spec 15 Mar 2006 17:16:59 -0000 1.14 +++ abcm2ps.spec 15 Mar 2006 17:20:02 -0000 1.15 @@ -1,12 +1,12 @@ Name: abcm2ps Version: 4.12.11 -Release: 1%{?dist} +Release: 2%{?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-4.12.10.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.11.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Wed Mar 15 17:20:08 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 12:20:08 -0500 Subject: rpms/abcm2ps/devel abcm2ps.spec,1.15,1.16 Message-ID: <200603151720.k2FHKeiY029690@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29655/devel Modified Files: abcm2ps.spec Log Message: Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- abcm2ps.spec 15 Mar 2006 17:17:05 -0000 1.15 +++ abcm2ps.spec 15 Mar 2006 17:20:08 -0000 1.16 @@ -1,12 +1,12 @@ Name: abcm2ps Version: 4.12.11 -Release: 1%{?dist} +Release: 2%{?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-4.12.10.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.11.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Wed Mar 15 18:38:05 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:38:05 -0500 Subject: rpms/raidem - New directory Message-ID: <200603151838.k2FIc70W032082@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32074/raidem Log Message: Directory /cvs/extras/rpms/raidem added to the repository From fedora-extras-commits at redhat.com Wed Mar 15 18:38:11 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:38:11 -0500 Subject: rpms/raidem/devel - New directory Message-ID: <200603151838.k2FIcDH1032097@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32074/raidem/devel Log Message: Directory /cvs/extras/rpms/raidem/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 15 18:38:29 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:38:29 -0500 Subject: rpms/raidem Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603151838.k2FIcVAL032131@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32119 Added Files: Makefile import.log Log Message: Setup of module raidem --- NEW FILE Makefile --- # Top level Makefile for module raidem all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 15 18:38:34 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:38:34 -0500 Subject: rpms/raidem/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603151838.k2FIcaXt032152@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32119/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module raidem --- NEW 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 Mar 15 18:43:28 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:43:28 -0500 Subject: rpms/raidem import.log,1.1,1.2 Message-ID: <200603151844.k2FIi1Hc032314@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32246 Modified Files: import.log Log Message: auto-import raidem-0.3-1 on branch devel from raidem-0.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/raidem/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Mar 2006 18:38:28 -0000 1.1 +++ import.log 15 Mar 2006 18:43:28 -0000 1.2 @@ -0,0 +1 @@ +raidem-0_3-1:HEAD:raidem-0.3-1.src.rpm:1142447952 From fedora-extras-commits at redhat.com Wed Mar 15 18:43:34 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:43:34 -0500 Subject: rpms/raidem/devel raidem-0.3-datapath.patch, NONE, 1.1 raidem-0.3-no-mp3.patch, NONE, 1.1 raidem-0.3-syslibs.patch, NONE, 1.1 raidem-0.3-warn.patch, NONE, 1.1 raidem.desktop, NONE, 1.1 raidem.png, NONE, 1.1 raidem.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603151844.k2FIi6Ol032318@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32246/devel Modified Files: .cvsignore sources Added Files: raidem-0.3-datapath.patch raidem-0.3-no-mp3.patch raidem-0.3-syslibs.patch raidem-0.3-warn.patch raidem.desktop raidem.png raidem.spec Log Message: auto-import raidem-0.3-1 on branch devel from raidem-0.3-1.src.rpm raidem-0.3-datapath.patch: --- NEW FILE raidem-0.3-datapath.patch --- --- raidem-0.3/src/init.m.orig 2006-03-12 21:50:32.000000000 +0100 +++ raidem-0.3/src/init.m 2006-03-12 21:59:44.000000000 +0100 @@ -115,6 +115,8 @@ tiles_init(); set_colour_conversion_keep_alpha(); + /* so that Sebum will find our files */ + chdir(RAIDEM_DATA_DIR); base_sebum = [SebFile new]; if (not [base_sebum loadSebumDirectory:"data/base"]) { base_sebum = nil; raidem-0.3-no-mp3.patch: --- NEW FILE raidem-0.3-no-mp3.patch --- diff -urN raidem-0.3-src.orig/src/music.m raidem-0.3-src/src/music.m --- raidem-0.3-src.orig/src/music.m 2006-01-21 09:24:01.000000000 +0100 +++ raidem-0.3-src/src/music.m 2006-03-12 20:42:31.000000000 +0100 @@ -3,6 +3,8 @@ * This file handles music stuff using AllegroMP3. */ +#ifndef NO_MP3 + #include #include #include @@ -287,3 +289,47 @@ free(music_data); music_data = NULL; } + +/*--------------------------------------------------------------*/ + +#else /* ifndef NO_MP3 */ + +int music_vol = 255; + +void play_music(const char *directory) +{ +} + +void poll_music(void) +{ +} + +void free_music(void) +{ +} + +void adjust_music_volume(void) +{ +} + +void play_mp3(const char *filename) +{ +} + +void start_autopoll_music(void) +{ +} + +void stop_autopoll_music(void) +{ +} + +void music_init(void) +{ +} + +void music_shutdown(void) +{ +} + +#endif diff -urN raidem-0.3-src.orig/src/seborrhea/mp3.m raidem-0.3-src/src/seborrhea/mp3.m --- raidem-0.3-src.orig/src/seborrhea/mp3.m 2005-09-01 18:55:28.000000000 +0200 +++ raidem-0.3-src/src/seborrhea/mp3.m 2006-03-12 20:42:31.000000000 +0100 @@ -1,3 +1,4 @@ +#ifndef NO_MP3 /* seborrhea-mp3.m, * * This is for music lumps. @@ -76,3 +77,5 @@ [parent addToList:seb]; return YES; } + +#endif diff -urN raidem-0.3-src.orig/include/seborrhea/seborrhea.h raidem-0.3-src/include/seborrhea/seborrhea.h --- raidem-0.3-src.orig/include/seborrhea/seborrhea.h 2005-09-01 18:52:37.000000000 +0200 +++ raidem-0.3-src/include/seborrhea/seborrhea.h 2006-03-12 20:42:31.000000000 +0100 @@ -16,7 +16,9 @@ #include "seborrhea/container-queue.h" #include "seborrhea/container-shuffle.h" +#ifndef NO_MP3 #include "seborrhea/mp3.h" +#endif #include "seborrhea/spline.h" raidem-0.3-syslibs.patch: --- NEW FILE raidem-0.3-syslibs.patch --- diff -urN raidem-0.3-src.orig/Makefile raidem-0.3-src/Makefile --- raidem-0.3-src.orig/Makefile 2006-01-31 06:33:08.000000000 +0100 +++ raidem-0.3-src/Makefile 2006-03-12 20:42:31.000000000 +0100 @@ -208,10 +208,7 @@ spline.o \ strdup.o \ token.o \ - zzpk.o) \ - lib/alrand/alrand.o \ - lib/alrand/lcg.o \ - lib/alrand/mersenne.o + zzpk.o) UNITS := $(addprefix obj/units/,\ all-units.o \ diff -urN raidem-0.3-src.orig/include/alrand/alrand.h raidem-0.3-src/include/alrand/alrand.h --- raidem-0.3-src.orig/include/alrand/alrand.h 1970-01-01 01:00:00.000000000 +0100 +++ raidem-0.3-src/include/alrand/alrand.h 2006-03-12 20:43:25.000000000 +0100 @@ -0,0 +1,30 @@ +/* (partial) alrand emulation file for glibc */ +#ifndef __alrand_h +#define __alrand_h + +#include + +#define alrand_init() +#define alrand_exit() +#define alrand_set_global_generator_type(x) + + +#define alrand_rand() random() +#define alrand_srand(seed) srandom(seed) + + +#define alrand_create(a, b) calloc(1, sizeof(struct drand48_data)) +#define alrand_destroy(state) free(state) +#define alrand_seed(state, seed) srand48_r(seed, state) + +typedef unsigned int alrand_uint32_t; +typedef struct drand48_data alrand_state; + +static inline alrand_uint32_t alrand_generate(alrand_state *state) +{ + long ret; + lrand48_r(state, &ret); + return ret; +} + +#endif diff -urN raidem-0.3-src.orig/include/seborrhea/font-glyphkeeper.h raidem-0.3-src/include/seborrhea/font-glyphkeeper.h --- raidem-0.3-src.orig/include/seborrhea/font-glyphkeeper.h 2005-09-01 17:18:13.000000000 +0200 +++ raidem-0.3-src/include/seborrhea/font-glyphkeeper.h 2006-03-12 20:42:31.000000000 +0100 @@ -2,7 +2,7 @@ #ifndef _seb_included_font_glyphkeeper_h #define _seb_included_font_glyphkeeper_h -#include "glyph-keeper/include/glyph.h" +#include #include "seborrhea/font.h" @interface SebFontGlyphKeeper: AbstractSebFont diff -urN raidem-0.3-src.orig/src/map-editor/map-proc.m raidem-0.3-src/src/map-editor/map-proc.m --- raidem-0.3-src.orig/src/map-editor/map-proc.m 2006-01-20 03:33:33.000000000 +0100 +++ raidem-0.3-src/src/map-editor/map-proc.m 2006-03-12 20:42:31.000000000 +0100 @@ -4,7 +4,7 @@ #include #include #include -#include "adime/include/adime.h" +#include #include "common.h" #include "group.h" #include "gui/gui-clip.h" diff -urN raidem-0.3-src.orig/src/map-editor/redit.m raidem-0.3-src/src/map-editor/redit.m --- raidem-0.3-src.orig/src/map-editor/redit.m 2005-12-06 00:38:24.000000000 +0100 +++ raidem-0.3-src/src/map-editor/redit.m 2006-03-12 20:42:31.000000000 +0100 @@ -7,7 +7,7 @@ #include #include #include -#include "adime/include/adime.h" +#include #include "common.h" #include "game.h" #include "group.h" diff -urN raidem-0.3-src.orig/src/seborrhea/font-glyphkeeper.m raidem-0.3-src/src/seborrhea/font-glyphkeeper.m --- raidem-0.3-src.orig/src/seborrhea/font-glyphkeeper.m 2006-01-10 05:39:43.000000000 +0100 +++ raidem-0.3-src/src/seborrhea/font-glyphkeeper.m 2006-03-12 20:42:31.000000000 +0100 @@ -4,7 +4,7 @@ */ #include -#include "glyph-keeper/include/glyph.h" +#include #include "seborrhea/font-glyphkeeper.h" #include "seborrhea/seborrhea-common.h" #include "seborrhea/seborrhea-debug.h" raidem-0.3-warn.patch: --- NEW FILE raidem-0.3-warn.patch --- diff -urN raidem-0.3-src.orig/src/map.m raidem-0.3-src/src/map.m --- raidem-0.3-src.orig/src/map.m 2005-11-29 23:13:43.000000000 +0100 +++ raidem-0.3-src/src/map.m 2006-03-12 20:42:31.000000000 +0100 @@ -390,7 +390,7 @@ dirname = strrchr(temp, '/'); if (dirname) - *dirname++; + dirname++; } music_dirname = strdup(dirname); --- NEW FILE raidem.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Raidem GenericName=2d top-down shoot'em up Comment=Inspired by Raptor Exec=raidem Icon=raidem.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; Version=0.3 --- NEW FILE raidem.spec --- Name: raidem Version: 0.3 Release: 1%{?dist} Summary: 2d top-down shoot'em up Group: Amusements/Games License: zlib License URL: http://home.exetel.com.au/tjaden/raidem/ # This is an exacy copy of the upstream src except that lib/almp3 which is # an included mp3 decoder has been removed. Source0: %{name}-%{version}-src.zip Source1: raidem.png Source2: raidem.desktop Patch0: raidem-0.3-no-mp3.patch Patch1: raidem-0.3-syslibs.patch Patch2: raidem-0.3-datapath.patch Patch3: raidem-0.3-warn.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-objc glyph-keeper-devel freetype-devel adime-devel BuildRequires: zziplib-devel libpng-devel %description Raid'em is a 2d top-down shoot'em up. It began as a remake of Raid II (abandoned long ago), which was inspired by Raptor, but has turned out very differently. Features: Neat looking graphics, LOTS of explosions and scrap metal, Eye candy a-plenty, Many different powerups, A desert. And a space platform. And some snow, 2 player mode, Demo recording and playback, Loads of fun. %prep %setup -q -n %{name}-%{version}-src %patch0 -p1 -z .no_mp3 %patch1 -p1 -z .syslibs %patch2 -p1 -z .datapath %patch3 -p1 -z .warn # remove all included system libs, to avoid using the included system headers. mv lib/loadpng . rm -fr lib/* mv loadpng lib %build make %{?_smp_mflags} lib/loadpng/libldpng.a raid \ CFLAGS="-Iinclude -Ilib -DNO_MP3 -DNO_ID3TAGS -DNO_FBLEND \ -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -DITOUCH \ -DRAIDEM_DATA_DIR=\\\"%{_datadir}/%{name}/\\\"" \ LDLIBS="-lglyph-alleg `freetype-config --libs` lib/loadpng/libldpng.a -lpng \ -lzzip -ladime `allegro-config --libs` -lz -lpthread -lobjc" %install rm -rf $RPM_BUILD_ROOT #DIY, since the Makefile uses hardcoded ( := assigned) paths. mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 755 raid $RPM_BUILD_ROOT%{_bindir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a data demos maps $RPM_BUILD_ROOT%{_datadir}/%{name} # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc ChangeLog docs/LICENCE.txt docs/README.txt docs/damages.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-raidem.desktop %{_datadir}/icons/hicolor/48x48/apps/raidem.png %changelog * Sat Mar 12 2006 Hans de Goede 0.3-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/raidem/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Mar 2006 18:38:34 -0000 1.1 +++ .cvsignore 15 Mar 2006 18:43:34 -0000 1.2 @@ -0,0 +1 @@ +raidem-0.3-src.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/raidem/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Mar 2006 18:38:34 -0000 1.1 +++ sources 15 Mar 2006 18:43:34 -0000 1.2 @@ -0,0 +1 @@ +7a8de682a0fe122e784cc192b19ece4e raidem-0.3-src.zip From fedora-extras-commits at redhat.com Wed Mar 15 18:43:42 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:43:42 -0500 Subject: owners owners.list,1.745,1.746 Message-ID: <200603151844.k2FIiEY9032347@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32297/owners Modified Files: owners.list Log Message: Add adime, glyph-keeper, raidem Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.745 retrieving revision 1.746 diff -u -r1.745 -r1.746 --- owners.list 15 Mar 2006 16:02:01 -0000 1.745 +++ owners.list 15 Mar 2006 18:43:41 -0000 1.746 @@ -18,6 +18,7 @@ Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|acpitool|A command line ACPI client for Linux|pertusus at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|adime|Allegro Dialogs Made Easy|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org| @@ -331,6 +332,7 @@ Fedora Extras|global|A source code tag system|gemi at bluewin.ch|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|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|gnet2|A simple network library built upon glib|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| @@ -1215,6 +1217,7 @@ Fedora Extras|qucs|Circuit simulator|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|R|A language and environment for statistical computing and graphics|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|rdiff-backup|Convenient and transparent local/remote incremental mirror/backup|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 15 19:28:22 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 14:28:22 -0500 Subject: rpms/raidem/devel raidem.spec,1.1,1.2 Message-ID: <200603151928.k2FJSsow001954@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1937 Modified Files: raidem.spec Log Message: Add missing desktop-file-utils BR Index: raidem.spec =================================================================== RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- raidem.spec 15 Mar 2006 18:43:34 -0000 1.1 +++ raidem.spec 15 Mar 2006 19:28:21 -0000 1.2 @@ -16,7 +16,7 @@ Patch3: raidem-0.3-warn.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-objc glyph-keeper-devel freetype-devel adime-devel -BuildRequires: zziplib-devel libpng-devel +BuildRequires: zziplib-devel libpng-devel desktop-file-utils %description Raid'em is a 2d top-down shoot'em up. It began as a remake of Raid II From fedora-extras-commits at redhat.com Wed Mar 15 19:52:17 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 15 Mar 2006 14:52:17 -0500 Subject: rpms/thinkpad-kmod/devel kmodtool, 1.2, 1.3 thinkpad-kmod.spec, 1.5, 1.6 Message-ID: <200603151952.k2FJqn7n002348@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2329 Modified Files: kmodtool thinkpad-kmod.spec Log Message: * Wed Mar 15 2006 Ville Skytt?? - 5.9-3 - Build for xen0 and xenU too. - Remove xen-hypervisor and xen-guest from kmodtool. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/kmodtool,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kmodtool 28 Jan 2006 12:51:08 -0000 1.2 +++ kmodtool 15 Mar 2006 19:52:17 -0000 1.3 @@ -24,8 +24,8 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.4" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)' +myver="0.10.5" +knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= verrel= Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- thinkpad-kmod.spec 12 Mar 2006 16:52:39 -0000 1.5 +++ thinkpad-kmod.spec 15 Mar 2006 19:52:17 -0000 1.6 @@ -4,8 +4,12 @@ # end stuff to be ... # temporarily hardcoded: -%define kver 2.6.15-1.2041_FC5 +%define kver 2.6.15-1.2054_FC5 +%ifarch i686 +%define kvariants "" xen0 xenU +%else %define kvariants "" +%endif %define kmod_name thinkpad %define kverrel %(%{kmodtool} verrel %{?kver} 2>/dev/null) @@ -65,6 +69,10 @@ %changelog +* Wed Mar 15 2006 Ville Skytt?? - 5.9-3 +- Build for xen0 and xenU too. +- Remove xen-hypervisor and xen-guest from kmodtool. + * Thu Mar 2 2006 Ville Skytt?? - 5.9-2 - Hardcode kernel version and variants for a test build. From fedora-extras-commits at redhat.com Wed Mar 15 19:55:56 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 15 Mar 2006 14:55:56 -0500 Subject: rpms/lirc-kmod/devel lirc-kmod.spec,1.4,1.5 Message-ID: <200603151956.k2FJuSxO002436@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2413 Modified Files: lirc-kmod.spec Log Message: * Wed Mar 15 2006 Ville Skytt?? - 0.8.0-4 - Add ppc64 and ppc64iseries while waiting for #185387. Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lirc-kmod.spec 13 Mar 2006 21:09:15 -0000 1.4 +++ lirc-kmod.spec 15 Mar 2006 19:55:56 -0000 1.5 @@ -6,7 +6,7 @@ # end stuff to be ... # temporarily hardcoded: -%define kver 2.6.15-1.2041_FC5 +%define kver 2.6.15-1.2054_FC5 %ifnarch i686 x86_64 ppc %define kvariants "" %else @@ -27,7 +27,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 3.%(echo %{kverrel} | tr - _) +Release: 4.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -38,7 +38,8 @@ Patch1: %{name}-0.8.0-2616.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: i586 i686 x86_64 ppc +# ExclusiveArch to assist the FE build system. +ExclusiveArch: i586 i686 x86_64 ppc ppc64 ppc64iseries %description LIRC is a package that allows you to decode and send infra-red and @@ -115,6 +116,9 @@ %changelog +* Wed Mar 15 2006 Ville Skytt?? - 0.8.0-4 +- Add ppc64 and ppc64iseries while waiting for #185387. + * Mon Mar 13 2006 Ville Skytt?? - 0.8.0-3 - Hardcode kernel version and variants for test builds. - Remove xen-hypervisor and xen-guest from kmodtool. From fedora-extras-commits at redhat.com Wed Mar 15 20:23:26 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 15 Mar 2006 15:23:26 -0500 Subject: rpms/thinkpad-kmod/devel thinkpad-kmod.spec,1.6,1.7 Message-ID: <200603152023.k2FKNwjm004577@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4560 Modified Files: thinkpad-kmod.spec Log Message: * Wed Mar 15 2006 Ville Skytt?? - 5.9-4 - Drop xenU. Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- thinkpad-kmod.spec 15 Mar 2006 19:52:17 -0000 1.6 +++ thinkpad-kmod.spec 15 Mar 2006 20:23:25 -0000 1.7 @@ -6,7 +6,7 @@ # temporarily hardcoded: %define kver 2.6.15-1.2054_FC5 %ifarch i686 -%define kvariants "" xen0 xenU +%define kvariants "" xen0 %else %define kvariants "" %endif @@ -18,7 +18,7 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules Version: 5.9 -Release: 2.%(echo %{kverrel} | tr - _) +Release: 4.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz @@ -69,6 +69,9 @@ %changelog +* Wed Mar 15 2006 Ville Skytt?? - 5.9-4 +- Drop xenU. + * Wed Mar 15 2006 Ville Skytt?? - 5.9-3 - Build for xen0 and xenU too. - Remove xen-hypervisor and xen-guest from kmodtool. From fedora-extras-commits at redhat.com Wed Mar 15 21:16:35 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 16:16:35 -0500 Subject: rpms/koffice/devel .cvsignore, 1.7, 1.8 koffice.spec, 1.31, 1.32 sources, 1.7, 1.8 Message-ID: <200603152117.k2FLH72o006834@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6787 Modified Files: .cvsignore koffice.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 Feb 2006 12:47:27 -0000 1.7 +++ .cvsignore 15 Mar 2006 21:16:35 -0000 1.8 @@ -1 +1 @@ -koffice-1.4.90.tar.bz2 +koffice-1.4.95.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- koffice.spec 26 Feb 2006 08:54:13 -0000 1.31 +++ koffice.spec 15 Mar 2006 21:16:35 -0000 1.32 @@ -1,18 +1,17 @@ Name: koffice -Version: 1.4.90 -Release: 4%{?dist} +Version: 1.4.95 +Release: 1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: http://download.kde.org/unstable/koffice-1.5-beta1/src/koffice-1.4.90.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-beta2/koffice-1.4.95.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -# Fix --enable-final -Patch1: koffice-kotext-lines.patch +Patch1: koffice-kspread-cpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -54,7 +53,6 @@ BuildRequires: aspell-devel BuildRequires: libacl-devel BuildRequires: libxslt-devel -# new with 1.4.90 BuildRequires: OpenEXR-devel BuildRequires: libexif-devel BuildRequires: libGL-devel libGLU-devel @@ -210,7 +208,7 @@ %prep %setup -q %patch0 -p1 -%patch1 -p2 +%patch1 # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -400,15 +398,6 @@ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kplato.desktop -#writeup -desktop-file-install \ - --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category=X-Fedora \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applnk/Office/writeup.desktop - - rm $RPM_BUILD_ROOT/%{_libdir}/*.la %clean @@ -524,14 +513,6 @@ %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png %{_datadir}/apps/kross -# add writeup here for now -%{_bindir}/writeup -%{_libdir}/kde3/libwriteup_part.* -%{_libdir}/kde3/writeup.* -%{_libdir}/libkdeinit_writeup.so -%{_datadir}/applications/fedora-writeup.desktop -%{_datadir}/apps/writeup -%{_datadir}/services/writeuppart.desktop %exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel @@ -742,6 +723,7 @@ %defattr(-,root,root,-) %{_bindir}/kexi %{_bindir}/ksqlite* +%{_bindir}/krossrunner %{_libdir}/libkdeinit_kexi.so %{_libdir}/libkexicore.so.* %{_libdir}/libkexidatatable.so.* @@ -913,6 +895,10 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Mon Mar 13 2006 Andreas Bierfert +1.4.95-1 +- version upgrade + * Sun Feb 26 2006 Andreas Bierfert 1.4.90-4 - kivio requires kdegraphics (#182289) Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 Feb 2006 12:47:27 -0000 1.7 +++ sources 15 Mar 2006 21:16:35 -0000 1.8 @@ -1 +1 @@ -99a8de4e93b00e1c3148a5f96b67d966 koffice-1.4.90.tar.bz2 +ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 15 21:29:38 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 16:29:38 -0500 Subject: rpms/koffice/devel koffice-kspread-cpp.patch,NONE,1.1 Message-ID: <200603152129.k2FLTeDi006974@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6960 Added Files: koffice-kspread-cpp.patch Log Message: - forgot patch koffice-kspread-cpp.patch: --- NEW FILE koffice-kspread-cpp.patch --- --- kspread/valueparser.h.orig 2006-03-14 10:36:32.000000000 +0100 +++ kspread/valueparser.h 2006-03-14 10:36:54.000000000 +0100 @@ -70,7 +70,7 @@ bool & duration); /** a helper function to read numbers and distinguish integers and FPs */ - double ValueParser::readNumber(const QString &_str, bool * ok, bool * isInt); + double readNumber(const QString &_str, bool * ok, bool * isInt); /** a helper function to read integers */ int readInt (const QString &str, uint &pos); FormatType fmtType; From fedora-extras-commits at redhat.com Wed Mar 15 21:39:41 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 15 Mar 2006 16:39:41 -0500 Subject: rpms/nomadsync/devel nomadsync-baseclass.patch, NONE, 1.1 nomadsync-baseclass2.patch, NONE, 1.1 nomadsync.spec, 1.3, 1.4 Message-ID: <200603152140.k2FLeE5j007126@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7101 Modified Files: nomadsync.spec Added Files: nomadsync-baseclass.patch nomadsync-baseclass2.patch Log Message: Patching two files to make GCC4.1.0 happy. nomadsync-baseclass.patch: --- NEW FILE nomadsync-baseclass.patch --- --- src/BaseNomad.h~ 2004-10-18 17:06:18.000000000 +0200 +++ src/BaseNomad.h 2006-03-15 22:14:36.000000000 +0100 @@ -17,7 +17,7 @@ class BaseNomad { public: - BaseNomad::BaseNomad() : m_nLastError(0), m_bPlaylistsRead(false){} + BaseNomad() : m_nLastError(0), m_bPlaylistsRead(false){} virtual ~BaseNomad(); void RemoveTracks(); void RemovePlaylists(); nomadsync-baseclass2.patch: --- NEW FILE nomadsync-baseclass2.patch --- --- src/EzGrid.h~ 2005-01-20 14:39:50.000000000 +0100 +++ src/EzGrid.h 2006-03-15 22:22:10.000000000 +0100 @@ -8,7 +8,7 @@ class EzGrid : public wxGrid { public: - EzGrid::EzGrid(wxWindow *parent, + EzGrid(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxWANTS_CHARS, const wxString& name = wxPanelNameStr); Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/nomadsync.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nomadsync.spec 13 Mar 2006 20:47:03 -0000 1.3 +++ nomadsync.spec 15 Mar 2006 21:39:41 -0000 1.4 @@ -12,7 +12,7 @@ Name: nomadsync Version: 0.4.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ Group: Applications/Multimedia @@ -20,6 +20,8 @@ Source1: %{name}.desktop Patch0: nomadsync-libnjbloc.patch Patch1: nomadsync-libnjbloc64.patch +Patch2: nomadsync-baseclass.patch +Patch3: nomadsync-baseclass2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -44,6 +46,8 @@ %else %patch0 -p0 %endif +%patch2 -p0 +%patch3 -p0 %build %configure --with-wx-config=%{_bindir}/wxgtk-2.4-config @@ -89,6 +93,9 @@ %doc ChangeLog authors copying readme %changelog +* Wed Mar 15 2006 Linus Walleij 0.4.2-11 +- Patched a baseclass issue that annoyed GCC 4.1.0 + * Mon Mar 13 2006 Linus Walleij 0.4.2-10 - Fixed a x86_64 bug, by separate patching, I think... From fedora-extras-commits at redhat.com Wed Mar 15 21:45:39 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Wed, 15 Mar 2006 16:45:39 -0500 Subject: rpms/irssi/devel irssi-0.8.10-glibc-invalid-pointer.patch, NONE, 1.1 irssi.spec, 1.14, 1.15 Message-ID: <200603152146.k2FLkBf1007207@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/irssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7187 Modified Files: irssi.spec Added Files: irssi-0.8.10-glibc-invalid-pointer.patch Log Message: irssi: fix for invalid pointer irssi-0.8.10-glibc-invalid-pointer.patch: --- NEW FILE irssi-0.8.10-glibc-invalid-pointer.patch --- --- src/irc/dcc/dcc.c 2005-12-25 02:12:48.000000000 -0600 +++ src/irc/dcc/dcc.c 2005-12-25 02:12:55.000000000 -0600 @@ -58,8 +58,8 @@ pos = gslist_find_string(dcc_types, type); if (pos != NULL) { - dcc_types = g_slist_remove(dcc_types, pos->data); g_free(pos->data); + dcc_types = g_slist_remove(dcc_types, pos->data); } } Index: irssi.spec =================================================================== RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- irssi.spec 28 Jan 2006 20:10:50 -0000 1.14 +++ irssi.spec 15 Mar 2006 21:45:39 -0000 1.15 @@ -3,12 +3,13 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi Version: 0.8.10 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Communications URL: http://irssi.org/ Source0: http://irssi.org/files/irssi-%{version}.tar.bz2 +Patch0: irssi-0.8.10-glibc-invalid-pointer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ncurses-devel openssl-devel zlib-devel BuildRequires: pkgconfig glib2-devel @@ -36,6 +37,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p0 %build %configure --enable-ipv6 --with-textui \ @@ -83,6 +85,9 @@ %{_includedir}/irssi %changelog +* Wed Mar 15 2006 Dams - 0.8.10-4 +- Added patch from Saleem Abdulrasool to fix invalid pointer. + * Sat Jan 28 2006 Dams - 0.8.10-3 - Fixed changelog -_- From fedora-extras-commits at redhat.com Wed Mar 15 21:53:58 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 15 Mar 2006 16:53:58 -0500 Subject: rpms/nomadsync/devel nomadsync-baseclass3.patch, NONE, 1.1 nomadsync.spec, 1.4, 1.5 Message-ID: <200603152154.k2FLsUbW007295@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7264 Modified Files: nomadsync.spec Added Files: nomadsync-baseclass3.patch Log Message: Iteratively adding patches. nomadsync-baseclass3.patch: --- NEW FILE nomadsync-baseclass3.patch --- --- src/NomadSyncDlg.h~ 2005-03-05 16:15:58.000000000 +0100 +++ src/NomadSyncDlg.h 2006-03-15 22:51:09.000000000 +0100 @@ -31,7 +31,7 @@ void OnAbout(wxCommandEvent& WXUNUSED(event)); void OnCellValueChanged(wxGridEvent& ev); void CheckActionsToDo(); - ActionList::iterator NomadSyncDlg::FindAction(int nRow); + ActionList::iterator FindAction(int nRow); void OnContextMenu(wxCommandEvent& event); void OnRightClick(wxGridEvent& event); void OnLabelLeftClick(wxGridEvent& event); Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/nomadsync.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nomadsync.spec 15 Mar 2006 21:39:41 -0000 1.4 +++ nomadsync.spec 15 Mar 2006 21:53:58 -0000 1.5 @@ -12,7 +12,7 @@ Name: nomadsync Version: 0.4.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ Group: Applications/Multimedia @@ -22,6 +22,7 @@ Patch1: nomadsync-libnjbloc64.patch Patch2: nomadsync-baseclass.patch Patch3: nomadsync-baseclass2.patch +Patch4: nomadsync-baseclass3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -48,6 +49,7 @@ %endif %patch2 -p0 %patch3 -p0 +%patch4 -p0 %build %configure --with-wx-config=%{_bindir}/wxgtk-2.4-config @@ -93,6 +95,9 @@ %doc ChangeLog authors copying readme %changelog +* Wed Mar 15 2006 Linus Walleij 0.4.2-12 +- Iteratively adding patches to find problems. + * Wed Mar 15 2006 Linus Walleij 0.4.2-11 - Patched a baseclass issue that annoyed GCC 4.1.0 From fedora-extras-commits at redhat.com Wed Mar 15 21:59:46 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 16:59:46 -0500 Subject: rpms/wine/devel .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 wine.spec, 1.19, 1.20 Message-ID: <200603152200.k2FM0I2J007423@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7389 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 3 Mar 2006 00:28:43 -0000 1.10 +++ .cvsignore 15 Mar 2006 21:59:45 -0000 1.11 @@ -1,2 +1,2 @@ wine-fonts-20050524.tar.gz -wine-0.9.9-fe.tar.bz2 +wine-0.9.10-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Mar 2006 00:28:43 -0000 1.11 +++ sources 15 Mar 2006 21:59:45 -0000 1.12 @@ -1,2 +1,2 @@ fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 +054e71983834d777be3271f63f8484d6 wine-0.9.10-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- wine.spec 3 Mar 2006 07:36:29 -0000 1.19 +++ wine.spec 15 Mar 2006 21:59:45 -0000 1.20 @@ -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.9 +Version: 0.9.10 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.9-fe.tar.bz2 +Source0: wine-0.9.10-fe.tar.bz2 Source1: wine.init Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora From fedora-extras-commits at redhat.com Wed Mar 15 22:14:59 2006 From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia)) Date: Wed, 15 Mar 2006 17:14:59 -0500 Subject: mock mock.py,1.36,1.37 Message-ID: <200603152214.k2FMExBa009507@cvs-int.fedora.redhat.com> Author: jcwillia Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9488 Modified Files: mock.py Log Message: add chroot command for running arbitrary commands in the chroot Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- mock.py 24 Feb 2006 19:31:57 -0000 1.36 +++ mock.py 15 Mar 2006 22:14:38 -0000 1.37 @@ -780,6 +780,12 @@ my.close() print 'Finished initializing root' + + elif args[0] == 'chroot': + config_opts['clean'] = config_opts['quiet'] = False + my= Root(config_opts) + my.do_chroot(' '.join(args[1:]), True) + print 'Finished chroot command' else: if args[0] == 'rebuild': From fedora-extras-commits at redhat.com Wed Mar 15 22:27:52 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:27:52 -0500 Subject: rpms/hdf5/devel hdf5-1.6.5-x86_64.patch,NONE,1.1 Message-ID: <200603152227.k2FMRs5M009674@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9655 Added Files: hdf5-1.6.5-x86_64.patch Log Message: Patch for libtool to find libraries on x86_64 hdf5-1.6.5-x86_64.patch: --- NEW FILE hdf5-1.6.5-x86_64.patch --- --- hdf5-1.6.5/configure.norpath 2006-03-15 14:12:46.000000000 -0700 +++ hdf5-1.6.5/configure 2006-03-15 14:14:09.000000000 -0700 @@ -6097,8 +6097,8 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib" case $host_os in aix3*) From fedora-extras-commits at redhat.com Wed Mar 15 22:27:26 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 17:27:26 -0500 Subject: rpms/wine-docs/FC-3 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wine-docs.spec, 1.9, 1.10 Message-ID: <200603152227.k2FMRwqH009685@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9601/FC-3 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Mar 2006 23:26:11 -0000 1.6 +++ .cvsignore 15 Mar 2006 22:27:26 -0000 1.7 @@ -1 +1 @@ -wine-docs-0.9.9.tar.bz2 +wine-docs-0.9.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 23:26:11 -0000 1.6 +++ sources 15 Mar 2006 22:27:26 -0000 1.7 @@ -1 +1 @@ -dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 +8057a2d7901c6436d69ee7bbe88700b4 wine-docs-0.9.10.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wine-docs.spec 3 Mar 2006 12:27:53 -0000 1.9 +++ wine-docs.spec 15 Mar 2006 22:27:26 -0000 1.10 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.10.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.10-1 +- version upgrade + * Fri Mar 03 2006 Andreas Bierfert 0.9.9-1 - version upgrade From fedora-extras-commits at redhat.com Wed Mar 15 22:27:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 17:27:32 -0500 Subject: rpms/wine-docs/FC-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wine-docs.spec, 1.9, 1.10 Message-ID: <200603152228.k2FMS4je009690@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9601/FC-4 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Mar 2006 23:26:17 -0000 1.6 +++ .cvsignore 15 Mar 2006 22:27:32 -0000 1.7 @@ -1 +1 @@ -wine-docs-0.9.9.tar.bz2 +wine-docs-0.9.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 23:26:17 -0000 1.6 +++ sources 15 Mar 2006 22:27:32 -0000 1.7 @@ -1 +1 @@ -dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 +8057a2d7901c6436d69ee7bbe88700b4 wine-docs-0.9.10.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wine-docs.spec 3 Mar 2006 11:35:42 -0000 1.9 +++ wine-docs.spec 15 Mar 2006 22:27:32 -0000 1.10 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.10.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.10-1 +- version upgrade + * Fri Mar 03 2006 Andreas Bierfert 0.9.9-1 - version upgrade From fedora-extras-commits at redhat.com Wed Mar 15 22:27:37 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 17:27:37 -0500 Subject: rpms/wine-docs/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wine-docs.spec, 1.6, 1.7 Message-ID: <200603152228.k2FMSADg009695@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9601/devel Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Mar 2006 23:26:23 -0000 1.6 +++ .cvsignore 15 Mar 2006 22:27:37 -0000 1.7 @@ -1 +1 @@ -wine-docs-0.9.9.tar.bz2 +wine-docs-0.9.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 23:26:23 -0000 1.6 +++ sources 15 Mar 2006 22:27:37 -0000 1.7 @@ -1 +1 @@ -dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 +8057a2d7901c6436d69ee7bbe88700b4 wine-docs-0.9.10.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wine-docs.spec 2 Mar 2006 23:26:23 -0000 1.6 +++ wine-docs.spec 15 Mar 2006 22:27:37 -0000 1.7 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.10.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.10-1 +- version upgrade + * Fri Mar 03 2006 Andreas Bierfert 0.9.9-1 - version upgrade From fedora-extras-commits at redhat.com Wed Mar 15 22:28:30 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:28:30 -0500 Subject: rpms/hdf5/devel hdf5-1.6.4-norpath.patch,1.1,1.2 Message-ID: <200603152229.k2FMT2s7009767@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9701 Modified Files: hdf5-1.6.4-norpath.patch Log Message: Change to patch configure - no autoconf hdf5-1.6.4-norpath.patch: Index: hdf5-1.6.4-norpath.patch =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/hdf5-1.6.4-norpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf5-1.6.4-norpath.patch 5 Jul 2005 20:20:17 -0000 1.1 +++ hdf5-1.6.4-norpath.patch 15 Mar 2006 22:28:30 -0000 1.2 @@ -10,17 +10,6 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) ---- hdf5-1.6.4/aclocal.m4.BAD 2005-04-03 18:53:47.000000000 -0500 -+++ hdf5-1.6.4/aclocal.m4 2005-04-03 18:54:13.000000000 -0500 -@@ -1383,7 +1383,7 @@ - - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='' - export_dynamic_flag_spec='${wl}--export-dynamic' - case $host_os in - cygwin* | mingw* | pw32*) --- hdf5-1.6.4/c++/config/commence.in.BAD 2005-04-03 18:55:05.000000000 -0500 +++ hdf5-1.6.4/c++/config/commence.in 2005-04-03 18:55:25.000000000 -0500 @@ -50,8 +50,8 @@ @@ -44,3 +33,14 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) +--- hdf5-1.6.4/configure.norpath 2006-03-15 14:12:46.000000000 -0700 ++++ hdf5-1.6.4/configure 2006-03-15 14:14:09.000000000 -0700 +@@ -5569,7 +5569,7 @@ + + if test "$ld_shlibs" = yes; then + runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec='' + export_dynamic_flag_spec='${wl}--export-dynamic' + case $host_os in + cygwin* | mingw* | pw32*) From fedora-extras-commits at redhat.com Wed Mar 15 22:29:45 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:29:45 -0500 Subject: rpms/hdf5/devel hdf5.spec,1.9,1.10 Message-ID: <200603152230.k2FMUHeX009797@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9773 Modified Files: hdf5.spec Log Message: - Change rpath patch to not need autoconf - Add patch for libtool on x86_64 - Fix shared lib permissions Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hdf5.spec 13 Mar 2006 16:54:44 -0000 1.9 +++ hdf5.spec 15 Mar 2006 22:29:45 -0000 1.10 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -13,6 +13,7 @@ Patch4: hdf5-1.6.5-h5diff_attr.patch Patch5: hdf5-1.6.4-ppc.patch Patch6: hdf5-1.6.5-flags.patch +Patch7: hdf5-1.6.5-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time @@ -42,9 +43,9 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -b .flags +%patch7 -p1 -b .x86_64 %build -autoconf %configure --with-ssl --enable-cxx --enable-fortran \ --enable-threadsafe --with-pthread make @@ -52,7 +53,8 @@ %install rm -rf $RPM_BUILD_ROOT find doc/html -type f | xargs chmod -x -find doc/html -name '*.sh*' | xargs chmod +x +#find doc/html -name '*.sh*' | xargs chmod +x +find doc/html -name Dependencies | xargs rm %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir} rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings # Don't instal h5perf until h5test.so.0 issues is sorted out @@ -69,7 +71,7 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt %doc release_docs/HISTORY.txt doc/html %{_bindir}/gif2h5 @@ -83,10 +85,10 @@ %{_bindir}/h5repack %{_bindir}/h5repart %{_bindir}/h5unjam -%{_libdir}/*.so.* +%attr(0755,root,root) %{_libdir}/*.so.* %files devel -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %{_bindir}/h5c++ %{_bindir}/h5cc %{_bindir}/h5fc @@ -98,6 +100,11 @@ %{_libdir}/*.mod %changelog +* Wed Mar 15 2006 Orion Poplawski 1.6.5-5 +- Change rpath patch to not need autoconf +- Add patch for libtool on x86_64 +- Fix shared lib permissions + * Mon Mar 13 2006 Orion Poplawski 1.6.5-4 - Add patch to avoid HDF setting the compiler flags From fedora-extras-commits at redhat.com Wed Mar 15 22:36:52 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:36:52 -0500 Subject: rpms/hdf5/FC-4 hdf5-1.6.4-norpath.patch,1.1,1.2 Message-ID: <200603152237.k2FMbPUS010031@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9933 Modified Files: hdf5-1.6.4-norpath.patch Log Message: Change to patch configure, no need for autoconf hdf5-1.6.4-norpath.patch: Index: hdf5-1.6.4-norpath.patch =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5-1.6.4-norpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf5-1.6.4-norpath.patch 5 Jul 2005 20:20:17 -0000 1.1 +++ hdf5-1.6.4-norpath.patch 15 Mar 2006 22:36:52 -0000 1.2 @@ -10,17 +10,6 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) ---- hdf5-1.6.4/aclocal.m4.BAD 2005-04-03 18:53:47.000000000 -0500 -+++ hdf5-1.6.4/aclocal.m4 2005-04-03 18:54:13.000000000 -0500 -@@ -1383,7 +1383,7 @@ - - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='' - export_dynamic_flag_spec='${wl}--export-dynamic' - case $host_os in - cygwin* | mingw* | pw32*) --- hdf5-1.6.4/c++/config/commence.in.BAD 2005-04-03 18:55:05.000000000 -0500 +++ hdf5-1.6.4/c++/config/commence.in 2005-04-03 18:55:25.000000000 -0500 @@ -50,8 +50,8 @@ @@ -44,3 +33,14 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) +--- hdf5-1.6.4/configure.norpath 2006-03-15 14:12:46.000000000 -0700 ++++ hdf5-1.6.4/configure 2006-03-15 14:14:09.000000000 -0700 +@@ -5569,7 +5569,7 @@ + + if test "$ld_shlibs" = yes; then + runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec='' + export_dynamic_flag_spec='${wl}--export-dynamic' + case $host_os in + cygwin* | mingw* | pw32*) From fedora-extras-commits at redhat.com Wed Mar 15 22:38:19 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:38:19 -0500 Subject: rpms/hdf5/FC-4 hdf5-1.6.5-x86_64.patch,NONE,1.1 Message-ID: <200603152238.k2FMcLtB010229@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10144 Added Files: hdf5-1.6.5-x86_64.patch Log Message: Patch to tell libtool to look in 64bit lib dirs hdf5-1.6.5-x86_64.patch: --- NEW FILE hdf5-1.6.5-x86_64.patch --- --- hdf5-1.6.5/configure.norpath 2006-03-15 14:12:46.000000000 -0700 +++ hdf5-1.6.5/configure 2006-03-15 14:14:09.000000000 -0700 @@ -6097,8 +6097,8 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib" case $host_os in aix3*) From fedora-extras-commits at redhat.com Wed Mar 15 22:38:36 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:38:36 -0500 Subject: rpms/hdf5/FC-4 hdf5.spec,1.8,1.9 Message-ID: <200603152239.k2FMd9eR010392@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253 Modified Files: hdf5.spec Log Message: - Change rpath patch to not need autoconf - Add patch for libtool on x86_64 - Fix shared lib permissions Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hdf5.spec 13 Mar 2006 20:10:28 -0000 1.8 +++ hdf5.spec 15 Mar 2006 22:38:36 -0000 1.9 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -13,6 +13,7 @@ Patch4: hdf5-1.6.5-h5diff_attr.patch Patch5: hdf5-1.6.4-ppc.patch Patch6: hdf5-1.6.5-flags.patch +Patch7: hdf5-1.6.5-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran >= 4.0.2, krb5-devel, openssl-devel, zlib-devel, time @@ -42,16 +43,16 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -b .flags +%patch7 -p1 -b .x86_64 %build -autoconf %configure --with-ssl --enable-fortran --enable-cxx --enable-threadsafe --with-pthread make %install rm -rf $RPM_BUILD_ROOT find doc/html -type f | xargs chmod -x -find doc/html -name '*.sh*' | xargs chmod +x +find doc/html -name 'Dependencies' | xargs rm %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir} rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings # Don't instal h5perf until h5test.so.0 issues is sorted out @@ -68,7 +69,7 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt %doc release_docs/HISTORY.txt doc/html %{_bindir}/gif2h5 @@ -82,10 +83,10 @@ %{_bindir}/h5repack %{_bindir}/h5repart %{_bindir}/h5unjam -%{_libdir}/*.so.* +%attr(0755,root,root) %{_libdir}/*.so.* %files devel -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %{_bindir}/h5c++ %{_bindir}/h5cc %{_bindir}/h5fc @@ -97,6 +98,11 @@ %{_libdir}/*.mod %changelog +* Wed Mar 15 2006 Orion Poplawski 1.6.5-4 +- Change rpath patch to not need autoconf +- Add patch for libtool on x86_64 +- Fix shared lib permissions + * Mon Mar 13 2006 Orion Poplawski 1.6.5-3 - Add patch to avoid HDF setting the compiler flags From fedora-extras-commits at redhat.com Wed Mar 15 22:41:08 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:41:08 -0500 Subject: rpms/hdf5/FC-3 hdf5-1.6.4-norpath.patch,1.1,1.2 Message-ID: <200603152241.k2FMffNp010637@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10617 Modified Files: hdf5-1.6.4-norpath.patch Log Message: Patch configure to avoid needed autoconf hdf5-1.6.4-norpath.patch: Index: hdf5-1.6.4-norpath.patch =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/hdf5-1.6.4-norpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf5-1.6.4-norpath.patch 5 Jul 2005 20:20:17 -0000 1.1 +++ hdf5-1.6.4-norpath.patch 15 Mar 2006 22:41:08 -0000 1.2 @@ -10,17 +10,6 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) ---- hdf5-1.6.4/aclocal.m4.BAD 2005-04-03 18:53:47.000000000 -0500 -+++ hdf5-1.6.4/aclocal.m4 2005-04-03 18:54:13.000000000 -0500 -@@ -1383,7 +1383,7 @@ - - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='' - export_dynamic_flag_spec='${wl}--export-dynamic' - case $host_os in - cygwin* | mingw* | pw32*) --- hdf5-1.6.4/c++/config/commence.in.BAD 2005-04-03 18:55:05.000000000 -0500 +++ hdf5-1.6.4/c++/config/commence.in 2005-04-03 18:55:25.000000000 -0500 @@ -50,8 +50,8 @@ @@ -44,3 +33,14 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) +--- hdf5-1.6.4/configure.norpath 2006-03-15 14:12:46.000000000 -0700 ++++ hdf5-1.6.4/configure 2006-03-15 14:14:09.000000000 -0700 +@@ -5569,7 +5569,7 @@ + + if test "$ld_shlibs" = yes; then + runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec='' + export_dynamic_flag_spec='${wl}--export-dynamic' + case $host_os in + cygwin* | mingw* | pw32*) From fedora-extras-commits at redhat.com Wed Mar 15 22:42:23 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:42:23 -0500 Subject: rpms/hdf5/FC-3 hdf5-1.6.5-x86_64.patch,NONE,1.1 Message-ID: <200603152242.k2FMgPii010660@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10648 Added Files: hdf5-1.6.5-x86_64.patch Log Message: Patch to tell libtool to look for 64bit libs hdf5-1.6.5-x86_64.patch: --- NEW FILE hdf5-1.6.5-x86_64.patch --- --- hdf5-1.6.5/configure.norpath 2006-03-15 14:12:46.000000000 -0700 +++ hdf5-1.6.5/configure 2006-03-15 14:14:09.000000000 -0700 @@ -6097,8 +6097,8 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib" case $host_os in aix3*) From fedora-extras-commits at redhat.com Wed Mar 15 22:44:41 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:44:41 -0500 Subject: rpms/hdf5/FC-3 hdf5.spec,1.3,1.4 Message-ID: <200603152245.k2FMjDq9010700@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10676 Modified Files: hdf5.spec Log Message: - Change rpath patch to not need autoconf - Add patch for libtool on x86_64 - Fix shared lib permissions Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/hdf5.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hdf5.spec 13 Mar 2006 20:14:51 -0000 1.3 +++ hdf5.spec 15 Mar 2006 22:44:40 -0000 1.4 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -12,6 +12,7 @@ Patch3: hdf5-1.6.4-testh5repack.patch Patch4: hdf5-1.6.5-h5diff_attr.patch Patch5: hdf5-1.6.5-flags.patch +Patch6: hdf5-1.6.5-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, time @@ -40,9 +41,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -b .flags +%patch6 -p1 -b .x86_64 %build -autoconf # the Fortran parts are hitting GCC bug 17917, add --enable-fortran when it gets fixed. %configure --with-ssl --enable-cxx --enable-threadsafe --with-pthread make @@ -50,7 +51,7 @@ %install rm -rf $RPM_BUILD_ROOT find doc/html -type f | xargs chmod -x -find doc/html -name '*.sh*' | xargs chmod +x +find doc/html -name Dependencies | xargs rm %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir} rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings # Don't instal h5perf until h5test.so.0 issues is sorted out @@ -67,7 +68,7 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt %doc release_docs/HISTORY.txt doc/html %{_bindir}/gif2h5 @@ -81,10 +82,10 @@ %{_bindir}/h5repack %{_bindir}/h5repart %{_bindir}/h5unjam -%{_libdir}/*.so.* +%attr(0755,root,root) %{_libdir}/*.so.* %files devel -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %{_bindir}/h5c++ %{_bindir}/h5cc %{_bindir}/h5redeploy @@ -94,6 +95,11 @@ %{_libdir}/*.so %changelog +* Wed Mar 15 2006 Orion Poplawski 1.6.5-3 +- Change rpath patch to not need autoconf +- Add patch for libtool on x86_64 +- Fix shared lib permissions + * Mon Mar 13 2006 Orion Poplawski 1.6.5-2 - Add patch to avoid HDF setting the march compiler flag From fedora-extras-commits at redhat.com Thu Mar 16 01:54:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 15 Mar 2006 20:54:12 -0500 Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.14,1.15 Message-ID: <200603160154.k2G1sirB017620@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-serv17603 Modified Files: perl-Module-Build.spec Log Message: Add versioned deps for Archive::Tar, ExtUtils::CBuilder, and ExtUtils::ParseXS. Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Module-Build.spec 12 Mar 2006 02:14:33 -0000 1.14 +++ perl-Module-Build.spec 16 Mar 2006 01:54:11 -0000 1.15 @@ -1,6 +1,6 @@ Name: perl-Module-Build Version: 0.2612 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl module for building and installing Perl modules Group: Development/Libraries License: GPL or Artistic @@ -8,8 +8,14 @@ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 -Requires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 +BuildRequires: perl(Archive::Tar) >= 1.08 +BuildRequires: perl(ExtUtils::CBuilder) >= 0.02 +BuildRequires: perl(ExtUtils::ParseXS) >= 2.02 +BuildRequires: perl(YAML) >= 0.35, perl(YAML) < 0.49 +Requires: perl(Archive::Tar) >= 1.08 +Requires: perl(ExtUtils::CBuilder) >= 0.02 +Requires: perl(ExtUtils::ParseXS) >= 2.02 +Requires: perl(YAML) >= 0.35, perl(YAML) < 0.49 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -50,6 +56,10 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Wed Mar 15 2006 Steven Pritchard - 0.2612-2 +- Add versioned deps for Archive::Tar, ExtUtils::CBuilder, and + ExtUtils::ParseXS. + * Sat Mar 11 2006 Steven Pritchard - 0.2612-1 - Update to 0.2612. From fedora-extras-commits at redhat.com Thu Mar 16 04:34:54 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 15 Mar 2006 23:34:54 -0500 Subject: owners owners.list,1.746,1.747 Message-ID: <200603160435.k2G4ZQUh023804@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23787/owners Modified Files: owners.list Log Message: Update owners.list with my new email address for ownership of lucidlife. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.746 retrieving revision 1.747 diff -u -r1.746 -r1.747 --- owners.list 15 Mar 2006 18:43:41 -0000 1.746 +++ owners.list 16 Mar 2006 04:34:53 -0000 1.747 @@ -652,7 +652,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|jcarpenter at condell.org|extras-qa at fedoraproject.org| Fedora Extras|lua|A powerful light-weight programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|lucidlife|A Conway's Life simulator|admin at ramshacklestudios.com|extras-qa at fedoraproject.org| +Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org| Fedora Extras|lvcool|Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lyx|WYSIWYM (What You See Is What You Mean) document processor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|lzo|A data compression library with very fast (de)compression|anvil at livna.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 16 06:53:04 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Thu, 16 Mar 2006 01:53:04 -0500 Subject: rpms/lucidlife/FC-4 lucidlife.spec,1.4,1.5 Message-ID: <200603160653.k2G6rbv3027970@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938/FC-4 Modified Files: lucidlife.spec Log Message: Update my email address in the spec files, bump release for rebuild due to new email address and previous minor spec file fixes. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/FC-4/lucidlife.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lucidlife.spec 12 Mar 2006 20:35:40 -0000 1.4 +++ lucidlife.spec 16 Mar 2006 06:53:04 -0000 1.5 @@ -1,6 +1,6 @@ Name: lucidlife Version: 0.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Conway's Life simulator Group: Amusements/Games @@ -58,10 +58,13 @@ %changelog -* Sun Feb 26 2006 Peter Gordon - 0.9-3 +* Wed Mar 15 2006 Peter Gordon - 0.9-4 +- Rebuild for spec file fixes and email address change. + +* Sun Feb 26 2006 Peter Gordon - 0.9-3 - Add %%{?dist} tag to the release to fix CVS tagging issue. -* Sun Feb 19 2006 Peter Gordon - 0.9-2 +* Sun Feb 19 2006 Peter Gordon - 0.9-2 - Dropped Requires: on gtk2 and gnome-vfs2, as the -devel sonames will pull these in. - Fixed handling of .desktop file to conform to Fedora Extras guidelines. @@ -69,5 +72,5 @@ "lucidlife" to help prevent file ownership problems - Thanks to Brian Pepple in BZ #177881 for these suggestions. -* Sun Jan 15 2006 Peter Gordon - 0.9-1 +* Sun Jan 15 2006 Peter Gordon - 0.9-1 - Initial packaging. From fedora-extras-commits at redhat.com Thu Mar 16 06:53:11 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Thu, 16 Mar 2006 01:53:11 -0500 Subject: rpms/lucidlife/devel lucidlife.spec,1.4,1.5 Message-ID: <200603160653.k2G6rhI5027973@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938/devel Modified Files: lucidlife.spec Log Message: Update my email address in the spec files, bump release for rebuild due to new email address and previous minor spec file fixes. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lucidlife.spec 12 Mar 2006 20:35:46 -0000 1.4 +++ lucidlife.spec 16 Mar 2006 06:53:10 -0000 1.5 @@ -1,6 +1,6 @@ Name: lucidlife Version: 0.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Conway's Life simulator Group: Amusements/Games @@ -58,10 +58,13 @@ %changelog -* Sun Feb 26 2006 Peter Gordon - 0.9-3 +* Wed Mar 15 2006 Peter Gordon - 0.9-4 +- Rebuild for spec file fixes and email address change. + +* Sun Feb 26 2006 Peter Gordon - 0.9-3 - Add %%{?dist} tag to the release to fix CVS tagging issue. -* Sun Feb 19 2006 Peter Gordon - 0.9-2 +* Sun Feb 19 2006 Peter Gordon - 0.9-2 - Dropped Requires: on gtk2 and gnome-vfs2, as the -devel sonames will pull these in. - Fixed handling of .desktop file to conform to Fedora Extras guidelines. @@ -69,5 +72,5 @@ "lucidlife" to help prevent file ownership problems - Thanks to Brian Pepple in BZ #177881 for these suggestions. -* Sun Jan 15 2006 Peter Gordon - 0.9-1 +* Sun Jan 15 2006 Peter Gordon - 0.9-1 - Initial packaging. From fedora-extras-commits at redhat.com Thu Mar 16 08:10:14 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 16 Mar 2006 03:10:14 -0500 Subject: rpms/libsexy/devel .cvsignore, 1.5, 1.6 libsexy.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200603160810.k2G8Aop8032190@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libsexy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32169 Modified Files: .cvsignore libsexy.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Feb 2006 04:33:59 -0000 1.5 +++ .cvsignore 16 Mar 2006 08:10:12 -0000 1.6 @@ -1 +1 @@ -libsexy-0.1.6.tar.gz +libsexy-0.1.7.tar.gz Index: libsexy.spec =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/libsexy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libsexy.spec 14 Feb 2006 05:01:42 -0000 1.6 +++ libsexy.spec 16 Mar 2006 08:10:12 -0000 1.7 @@ -1,12 +1,12 @@ Name: libsexy -Version: 0.1.6 -Release: 2%{?dist} +Version: 0.1.7 +Release: 1%{?dist} Summary: Funky fresh graphical widgets for GTK+ 2 Group: System Environment/Libraries License: LGPL URL: http://wiki.chipx86.com/wiki/Libsexy -Source0: http://osiris.chipx86.com/projects/libsexy/releases/%{name}-%{version}.tar.gz +Source0: http://releases.chipx86.com/libsexy/libsexy/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libxml2-devel enchant-devel @@ -55,6 +55,9 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Mar 16 2006 Ignacio Vazquez-Abrams 0.1.7-1 +- Upstream update + * Mon Feb 13 2006 Ignacio Vazquez-Abrams 0.1.6-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Feb 2006 04:33:59 -0000 1.5 +++ sources 16 Mar 2006 08:10:12 -0000 1.6 @@ -1 +1 @@ -495d8d986f0caa23b001f8e09d11eaf3 libsexy-0.1.6.tar.gz +227df7c2d7ca421f41cef12c98b1e40f libsexy-0.1.7.tar.gz From fedora-extras-commits at redhat.com Thu Mar 16 16:29:16 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 16 Mar 2006 11:29:16 -0500 Subject: rpms/python-matplotlib/devel .cvsignore, 1.9, 1.10 python-matplotlib.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200603161629.k2GGTnan017763@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17738 Modified Files: .cvsignore python-matplotlib.spec sources Log Message: Update to 0.87.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 7 Mar 2006 19:53:22 -0000 1.9 +++ .cvsignore 16 Mar 2006 16:29:16 -0000 1.10 @@ -1 +1 @@ -matplotlib-0.87.1.tar.gz +matplotlib-0.87.2.tar.gz Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- python-matplotlib.spec 7 Mar 2006 19:53:22 -0000 1.15 +++ python-matplotlib.spec 16 Mar 2006 16:29:16 -0000 1.16 @@ -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.1 +Version: 0.87.2 Release: 1%{?dist} Summary: Python plotting library @@ -90,6 +90,9 @@ %{python_sitearch}/matplotlib/backends/_tkagg.so %changelog +* Tue Mar 7 2006 Orion Poplawski 0.87.2-1 +- Update to 0.87.2 + * Tue Mar 7 2006 Orion Poplawski 0.87.1-1 - Update to 0.87.1 - Add pycairo >= 1.0.2 requires (FC5+ only) Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 19:53:22 -0000 1.9 +++ sources 16 Mar 2006 16:29:16 -0000 1.10 @@ -1 +1 @@ -bc605e5346128a0e2b9c5b0d602ecec8 matplotlib-0.87.1.tar.gz +74dde3c3e33797f56ebd6ca578090f8e matplotlib-0.87.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 16 17:30:16 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 16 Mar 2006 12:30:16 -0500 Subject: rpms/freedroidrpg/devel freedroidrpg.spec,1.12,1.13 Message-ID: <200603161730.k2GHUnkg019956@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedroidrpg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19937 Modified Files: freedroidrpg.spec Log Message: Add needed BR for modular xorg. Index: freedroidrpg.spec =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- freedroidrpg.spec 2 Mar 2006 21:29:04 -0000 1.12 +++ freedroidrpg.spec 16 Mar 2006 17:30:16 -0000 1.13 @@ -1,6 +1,6 @@ Name: freedroidrpg Version: 0.9.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Role playing game with Freedroid theme and Tux as the hero Group: Amusements/Games @@ -19,6 +19,7 @@ BuildRequires: ImageMagick BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils +BuildRequires: mesa-libGLU-devel %description The Freedroid RPG is an extension/modification of the classical @@ -26,13 +27,6 @@ %prep -cat< - 0.9.13-2 +- Add BR: for modular xorg. + * Sat Sep 10 2005 Ville Skytt?? - 0.9.13-1 - 0.9.13. - Drop some outdated docs. From fedora-extras-commits at redhat.com Thu Mar 16 17:39:03 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 16 Mar 2006 10:39:03 -0700 Subject: rpms/bonnie++/devel bonnie++.spec,1.8,1.9 Message-ID: <200603161739.k2GHd3fe020078@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/bonnie++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20067 Modified Files: bonnie++.spec Log Message: rebuild for FC5 Index: bonnie++.spec =================================================================== RCS file: /cvs/extras/rpms/bonnie++/devel/bonnie++.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bonnie++.spec 6 Apr 2005 22:11:13 -0000 1.8 +++ bonnie++.spec 16 Mar 2006 17:39:03 -0000 1.9 @@ -1,6 +1,6 @@ Name: bonnie++ Version: 1.03a -Release: 4 +Release: 5%{?dist} Summary: Filesystem and disk benchmark & burn-in suite @@ -56,6 +56,9 @@ %changelog +* Thu Mar 16 2006 Warren Togami 0:1.03a-5 +- rebuild for FC5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Mar 16 17:41:57 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 16 Mar 2006 10:41:57 -0700 Subject: rpms/lvcool/devel lvcool.spec,1.9,1.10 Message-ID: <200603161741.k2GHfvCH020178@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/lvcool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20167 Modified Files: lvcool.spec Log Message: rebuild for FC5 Index: lvcool.spec =================================================================== RCS file: /cvs/extras/rpms/lvcool/devel/lvcool.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lvcool.spec 12 Apr 2005 14:54:53 -0000 1.9 +++ lvcool.spec 16 Mar 2006 17:41:57 -0000 1.10 @@ -2,7 +2,7 @@ Name: lvcool # Upstream has no version, tarball repacked Version: 1.0.0 -Release: 3 +Release: 4%{?dist} URL: http://vcool.occludo.net/VC_Linux.html License: GPL @@ -48,6 +48,9 @@ %changelog +* Thu Mar 16 2006 Warren Togami - 1.0.0-4 +- rebuild for FC5 + * Tue Apr 12 2005 Michael Schwendt - 1.0.0-3 - Remove "BuildArch: athlon" again. It would be correct, but is not supported by Fedora Extras CVS Makefile. From fedora-extras-commits at redhat.com Thu Mar 16 17:51:43 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 16 Mar 2006 12:51:43 -0500 Subject: rpms/nexuiz-data/devel .cvsignore, 1.4, 1.5 nexuiz-data.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603161752.k2GHqFKC020342@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20308 Modified Files: .cvsignore nexuiz-data.spec sources Log Message: * Thu Mar 16 2006 Adrian Reber - 1.5-1 - updated to 1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Sep 2005 14:22:04 -0000 1.4 +++ .cvsignore 16 Mar 2006 17:51:43 -0000 1.5 @@ -1 +1 @@ -nexuiz-data-1.2.1.tar +nexuiz-data-1.5.tar Index: nexuiz-data.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/nexuiz-data.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nexuiz-data.spec 19 Sep 2005 14:22:04 -0000 1.4 +++ nexuiz-data.spec 16 Mar 2006 17:51:43 -0000 1.5 @@ -1,20 +1,19 @@ -%define datadate 20050905 +%define datadate 20060208 Summary: Game data for the Nexuiz first person shooter Name: nexuiz-data -Version: 1.2.1 +Version: 1.5 Release: 1 License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip -# unzip nexuiz121.zip -# mkdir nexuiz-data-1.2.1/ -# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/gpl.txt \ -# Nexuiz/betacredits.txt Nexuiz/gamemodes.txt \ -# nexuiz-data-1.2.1/ -# tar cvf nexuiz-data-1.2.1.tar nexuiz-data-1.2.1/ +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz15.zip +# unzip nexuiz15.zip +# mkdir nexuiz-data-1.5/ +# mv Nexuiz/data/ Nexuiz/gpl.txt Nexuiz/Docs/* \ +# nexuiz-data-1.5/ +# tar cvf nexuiz-data-1.5.tar nexuiz-data-1.5/ Source0: nexuiz-data-%{version}.tar BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,14 +26,14 @@ %prep %setup -q -%{__sed} -i 's/\r//' Readme.htm *.txt data/*.txt +%{__sed} -i 's/\r//' Readme.htm *.txt FAQ* %build %install %{__rm} -rf %{buildroot} %{__mkdir_p} %{buildroot}%{_datadir}/nexuiz/data/ -%{__install} -p data/data%{datadate}-full.pk3 \ +%{__install} -p data/data%{datadate}.pk3 \ %{buildroot}%{_datadir}/nexuiz/data/ %clean @@ -42,11 +41,14 @@ %files %defattr(0644, root, root, 0755) -%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt betacredits.txt -%doc gamemodes.txt +%doc Readme.htm gpl.txt cvars.txt mapping.txt +%doc gamemodes.txt FAQ* %{_datadir}/nexuiz/ %changelog +* Thu Mar 16 2006 Adrian Reber - 1.5-1 +- updated to 1.5 + * Mon Sep 19 2005 Adrian Reber - 1.2.1-1 - updated to 1.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Sep 2005 14:22:04 -0000 1.4 +++ sources 16 Mar 2006 17:51:43 -0000 1.5 @@ -1 +1 @@ -64d371d2008b096c67980e7a65a412bc nexuiz-data-1.2.1.tar +d7bcb0515a8d91b1cfb12546550e92fc nexuiz-data-1.5.tar From fedora-extras-commits at redhat.com Thu Mar 16 17:53:23 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 16 Mar 2006 10:53:23 -0700 Subject: rpms/perl-Digest-Nilsimsa/devel perl-Digest-Nilsimsa.spec,1.7,1.8 Message-ID: <200603161753.k2GHrNEK020374@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Digest-Nilsimsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20363 Modified Files: perl-Digest-Nilsimsa.spec Log Message: rebuild for FC5 Index: perl-Digest-Nilsimsa.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Digest-Nilsimsa/devel/perl-Digest-Nilsimsa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Digest-Nilsimsa.spec 6 Apr 2005 22:12:44 -0000 1.7 +++ perl-Digest-Nilsimsa.spec 16 Mar 2006 17:53:23 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Digest-Nilsimsa Version: 0.06 -Release: 5 +Release: 6%{?dist} Summary: Perl interface to the Nilsima Algorithm @@ -48,6 +48,9 @@ %changelog +* Thu Mar 16 2006 Warren Togami 0.06-6 +- rebuild for FC5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Mar 16 18:04:18 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 16 Mar 2006 13:04:18 -0500 Subject: rpms/nexuiz/devel .cvsignore, 1.4, 1.5 nexuiz-1.0-basedir.patch, 1.1, 1.2 nexuiz.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200603161804.k2GI4pni022477@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22451 Modified Files: .cvsignore nexuiz-1.0-basedir.patch nexuiz.spec sources Log Message: * Wed Mar 16 2006 Adrian Reber - 1.5-1 - updated to 1.5 - enabled sdl binary Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Sep 2005 14:25:48 -0000 1.4 +++ .cvsignore 16 Mar 2006 18:04:18 -0000 1.5 @@ -1 +1 @@ -nexuizenginesource20050911.zip +nexuizenginesource20060208.zip nexuiz-1.0-basedir.patch: Index: nexuiz-1.0-basedir.patch =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz-1.0-basedir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nexuiz-1.0-basedir.patch 9 Jul 2005 11:59:33 -0000 1.1 +++ nexuiz-1.0-basedir.patch 16 Mar 2006 18:04:18 -0000 1.2 @@ -4,7 +4,7 @@ fs_mempool = Mem_AllocPool("file management", 0, NULL); -- strcpy(fs_basedir, "."); +- strcpy(fs_basedir, ""); + strcpy(fs_basedir, "/usr/share/nexuiz"); strcpy(fs_gamedir, ""); Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nexuiz.spec 30 Nov 2005 12:53:04 -0000 1.8 +++ nexuiz.spec 16 Mar 2006 18:04:18 -0000 1.9 @@ -1,14 +1,14 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.5 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip -# unzip nexuiz121.zip Nexuiz/nexuizenginesource20050911.zip -Source: nexuizenginesource20050911.zip +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz15.zip +# unzip nexuiz15.zip Nexuiz/nexuizenginesource20060208.zip +Source: nexuizenginesource20060208.zip Patch0: nexuiz-1.0-basedir.patch Patch1: nexuiz-1.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,7 +16,7 @@ BuildRequires: ImageMagick, file BuildRequires: libX11-devel, alsa-lib-devel, desktop-file-utils BuildRequires: mesa-libGL-devel libXext-devel libXxf86dga-devel -BuildRequires: libXxf86vm-devel +BuildRequires: libXxf86vm-devel SDL-devel # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build Requires: zlib libvorbis libjpeg @@ -36,7 +36,7 @@ Requires: nexuiz-data = %{version} # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build -Requires: libz.so.1 +Requires: zlib %description server Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, @@ -54,7 +54,7 @@ %build -%{__make} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" +%{__make} cl-release sv-release sdl-release OPTIM_RELEASE="$RPM_OPT_FLAGS" convert darkplaces.ico nexuiz.png @@ -63,9 +63,11 @@ # Install the main programs %{__mkdir_p} %{buildroot}%{_bindir} -%{__install} -m 0755 darkplaces-glx \ +%{__install} -m 0755 nexuiz-glx \ %{buildroot}%{_bindir}/nexuiz-glx -%{__install} -m 0755 darkplaces-dedicated \ +%{__install} -m 0755 nexuiz-sdl \ + %{buildroot}%{_bindir}/nexuiz-sdl +%{__install} -m 0755 nexuiz-dedicated \ %{buildroot}%{_bindir}/nexuiz-dedicated # Create the desktop file @@ -115,6 +117,7 @@ %defattr(-,root,root,-) %doc COPYING darkplaces.txt %{_bindir}/nexuiz-glx +%{_bindir}/nexuiz-sdl %{_datadir}/icons/hicolor/*/apps/nexuiz.png %{_datadir}/applications/*%{name}.desktop @@ -125,6 +128,10 @@ %changelog +* Wed Mar 16 2006 Adrian Reber - 1.5-1 +- updated to 1.5 +- enabled sdl binary + * Wed Nov 30 2005 Adrian Reber - 1.2.1-3 - changes for modular X Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Sep 2005 14:25:48 -0000 1.4 +++ sources 16 Mar 2006 18:04:18 -0000 1.5 @@ -1 +1 @@ -ea845ee2842ad6a2304da1f0b2c95bdd nexuizenginesource20050911.zip +9ad968b3706b00d4a0f196d1c3f2267d nexuizenginesource20060208.zip From fedora-extras-commits at redhat.com Thu Mar 16 18:07:20 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 16 Mar 2006 13:07:20 -0500 Subject: rpms/libtunepimp/devel .cvsignore, 1.2, 1.3 libtunepimp.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200603161807.k2GI7sdh022526@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libtunepimp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22491 Modified Files: .cvsignore libtunepimp.spec sources Log Message: * Thu Mar 16 2006 Rex Dieter 0.4.2-1 - 0.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Nov 2005 19:14:31 -0000 1.2 +++ .cvsignore 16 Mar 2006 18:07:20 -0000 1.3 @@ -1 +1 @@ -libtunepimp-0.4.0.tar.gz +libtunepimp-0.4.2.tar.gz Index: libtunepimp.spec =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libtunepimp.spec 1 Mar 2006 16:18:04 -0000 1.6 +++ libtunepimp.spec 16 Mar 2006 18:07:20 -0000 1.7 @@ -1,16 +1,17 @@ Summary: A library for creating MusicBrainz enabled tagging applications Name: libtunepimp -Version: 0.4.0 -Release: 5%{?dist}.2 +Version: 0.4.2 +Release: 1%{?dist} + # README.LGPL implies that it's not completely lgpl, yet. License: GPL Group: System Environment/Libraries URL: http://www.musicbrainz.org/products/tunepimp/ -Source: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-0.4.0.tar.gz +Source: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: libtunepimp-0.4.0-gcc41.patch +#Patch1: libtunepimp-0.4.0-gcc41.patch BuildRequires: readline-devel BuildRequires: libvorbis-devel @@ -42,7 +43,7 @@ %prep %setup -q -%patch1 -p1 -b .gcc41 +#patch1 -p1 -b .gcc41 %build @@ -95,6 +96,9 @@ %changelog +* Thu Mar 16 2006 Rex Dieter 0.4.2-1 +- 0.4.2 + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Nov 2005 19:14:31 -0000 1.2 +++ sources 16 Mar 2006 18:07:20 -0000 1.3 @@ -1 +1 @@ -c11c3082ee72896949cb4fdb7acbbf63 libtunepimp-0.4.0.tar.gz +10b9e4a2f1930aed78ef7ddaebbe0fde libtunepimp-0.4.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 16 18:08:00 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:08:00 -0500 Subject: rpms/lzo/devel lzo.spec,1.9,1.10 Message-ID: <200603161808.k2GI8Yuh022595@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/lzo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22560 Modified Files: lzo.spec Log Message: lzo: release bump Index: lzo.spec =================================================================== RCS file: /cvs/extras/rpms/lzo/devel/lzo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lzo.spec 17 Jan 2006 17:37:43 -0000 1.9 +++ lzo.spec 16 Mar 2006 18:08:00 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Data compression library with very fast (de)compression Name: lzo Version: 1.08 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Libraries @@ -59,6 +59,9 @@ %{_libdir}/liblzo.a %changelog +* Thu Mar 16 2006 Dams - 1.08-6.fc5 +- Rebuild for new gcc + * Tue Jan 17 2006 Dams - 1.08-5.fc5 - Bumped release for gcc 4.1 rebuild From fedora-extras-commits at redhat.com Thu Mar 16 18:08:47 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 16 Mar 2006 13:08:47 -0500 Subject: rpms/libtunepimp/FC-4 libtunepimp.spec,1.3,1.4 sources,1.2,1.3 Message-ID: <200603161809.k2GI9J7f022664@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libtunepimp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22601 Modified Files: libtunepimp.spec sources Log Message: * Thu Mar 16 2006 Rex Dieter 0.4.2-1 - 0.4.2 Index: libtunepimp.spec =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/FC-4/libtunepimp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libtunepimp.spec 19 Dec 2005 18:08:42 -0000 1.3 +++ libtunepimp.spec 16 Mar 2006 18:08:47 -0000 1.4 @@ -1,16 +1,17 @@ Summary: A library for creating MusicBrainz enabled tagging applications Name: libtunepimp -Version: 0.4.0 -Release: 4%{?dist} +Version: 0.4.2 +Release: 1%{?dist} + # README.LGPL implies that it's not completely lgpl, yet. License: GPL Group: System Environment/Libraries URL: http://www.musicbrainz.org/products/tunepimp/ -Source: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-0.4.0.tar.gz +Source: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: libtunepimp-0.3.0-gcc4.patch +#Patch1: libtunepimp-0.4.0-gcc41.patch BuildRequires: readline-devel BuildRequires: libvorbis-devel @@ -42,7 +43,7 @@ %prep %setup -q -%patch1 -p1 -b .gcc4 +#patch1 -p1 -b .gcc41 %build @@ -95,6 +96,15 @@ %changelog +* Thu Mar 16 2006 Rex Dieter 0.4.2-1 +- 0.4.2 + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Mon Dec 19 2005 Rex Dieter 0.4.0-5 +- update gcc4 patch + * Mon Dec 19 2005 Rex Dieter 0.4.0-4 - -tools: fix Req: %%name dependancy Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Nov 2005 19:14:31 -0000 1.2 +++ sources 16 Mar 2006 18:08:47 -0000 1.3 @@ -1 +1 @@ -c11c3082ee72896949cb4fdb7acbbf63 libtunepimp-0.4.0.tar.gz +10b9e4a2f1930aed78ef7ddaebbe0fde libtunepimp-0.4.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 16 18:14:11 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 16 Mar 2006 11:14:11 -0700 Subject: rpms/perl-Razor-Agent/devel perl-Razor-Agent.spec,1.11,1.12 Message-ID: <200603161814.k2GIEBRw022792@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Razor-Agent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22780 Modified Files: perl-Razor-Agent.spec Log Message: rebuild for FC5 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/devel/perl-Razor-Agent.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Razor-Agent.spec 11 Nov 2005 21:11:31 -0000 1.11 +++ perl-Razor-Agent.spec 16 Mar 2006 18:14:11 -0000 1.12 @@ -3,7 +3,7 @@ Name: perl-Razor-Agent Version: 2.77 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Use a Razor catalogue server to filter spam messages Group: Applications/Internet @@ -89,6 +89,9 @@ %changelog +* Thu Mar 16 2006 Warren Togami - 2.77-3 +- rebuild for FC5 + * Fri Nov 11 2005 Warren Togami - 2.77-2 - 2.77 From fedora-extras-commits at redhat.com Thu Mar 16 18:14:16 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:14:16 -0500 Subject: rpms/libtar/devel libtar.spec,1.8,1.9 Message-ID: <200603161814.k2GIEmP1022835@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libtar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22808 Modified Files: libtar.spec Log Message: libtar: release bump, URLs corrections Index: libtar.spec =================================================================== RCS file: /cvs/extras/rpms/libtar/devel/libtar.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libtar.spec 22 May 2005 23:53:32 -0000 1.8 +++ libtar.spec 16 Mar 2006 18:14:16 -0000 1.9 @@ -1,12 +1,12 @@ Summary: Tar file manipulation API Name: libtar Version: 1.2.11 -Release: 5 +Release: 6%{?dist} License: BSD Group: System Environment/Libraries -URL: http://www-dev.cites.uiuc.edu/libtar/ -Source0: %{name}-%{version}.tar.gz +URL: http://www.feep.net/libtar/ +Source0: ftp://ftp.feep.net/pub/software/libtar/libtar-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Provides: libtar-devel = %{name}-%{version} BuildRequires: zlib-devel @@ -47,6 +47,9 @@ %changelog +* Thu Mar 16 2006 Dams - 1.2.11-6.fc5 +- Modified URL and added one in Source0 + * Sun May 22 2005 Jeremy Katz - 1.2.11-5 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Mar 16 18:20:32 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 16 Mar 2006 13:20:32 -0500 Subject: rpms/libtunepimp/devel libtunepimp.spec, 1.7, 1.8 libtunepimp-0.4.0-gcc41.patch, 1.1, NONE Message-ID: <200603161821.k2GIL4CB023027@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libtunepimp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23006 Modified Files: libtunepimp.spec Removed Files: libtunepimp-0.4.0-gcc41.patch Log Message: drop deprecated libtunepimp-0.4.0-gcc41.patch Index: libtunepimp.spec =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libtunepimp.spec 16 Mar 2006 18:07:20 -0000 1.7 +++ libtunepimp.spec 16 Mar 2006 18:20:32 -0000 1.8 @@ -11,8 +11,6 @@ Source: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Patch1: libtunepimp-0.4.0-gcc41.patch - BuildRequires: readline-devel BuildRequires: libvorbis-devel BuildRequires: flac-devel @@ -43,8 +41,6 @@ %prep %setup -q -#patch1 -p1 -b .gcc41 - %build %configure \ --- libtunepimp-0.4.0-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 16 18:26:09 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:26:09 -0500 Subject: rpms/libsndfile/devel .cvsignore, 1.3, 1.4 libsndfile.spec, 1.9, 1.10 sources, 1.3, 1.4 libsndfile-1.0.11-svx-channels.patch, 1.1, NONE Message-ID: <200603161826.k2GIQfSe023155@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libsndfile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23132 Modified Files: .cvsignore libsndfile.spec sources Removed Files: libsndfile-1.0.11-svx-channels.patch Log Message: libsndfile: updated to 1.0.14 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Mar 2005 01:44:40 -0000 1.3 +++ .cvsignore 16 Mar 2006 18:26:08 -0000 1.4 @@ -1 +1 @@ -libsndfile-1.0.11.tar.gz +libsndfile-1.0.14.tar.gz Index: libsndfile.spec =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/libsndfile.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libsndfile.spec 27 Jun 2005 18:19:30 -0000 1.9 +++ libsndfile.spec 16 Mar 2006 18:26:08 -0000 1.10 @@ -1,12 +1,11 @@ Summary: Library for reading and writing sound files Name: libsndfile -Version: 1.0.11 -Release: 3%{?dist} +Version: 1.0.14 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.mega-nerd.com/libsndfile/ Source0: http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz -Patch0: libsndfile-1.0.11-svx-channels.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -32,8 +31,6 @@ %prep %setup -q -%patch0 -p1 -b .svx-channels - %build %configure --disable-dependency-tracking @@ -62,6 +59,7 @@ %{_bindir}/sndfile-info %{_bindir}/sndfile-play %{_bindir}/sndfile-convert +%{_bindir}/sndfile-regtest %{_mandir}/man1/sndfile-info.1* %{_mandir}/man1/sndfile-play.1* %{_mandir}/man1/sndfile-convert.1* @@ -79,6 +77,10 @@ %changelog +* Thu Mar 16 2006 Dams - 1.0.14-1.fc5 +- Updated to 1.0.14 +- Dropped patch0 + * Thu May 12 2005 Michael Schwendt - 1.0.11-3 - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Mar 2005 01:44:40 -0000 1.3 +++ sources 16 Mar 2006 18:26:08 -0000 1.4 @@ -1 +1 @@ -9ec0b3610041423a57387f284849f2fc libsndfile-1.0.11.tar.gz +3513c2283f4063f57615c5b9b45bf30a libsndfile-1.0.14.tar.gz --- libsndfile-1.0.11-svx-channels.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 16 18:32:42 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:32:42 -0500 Subject: rpms/libsamplerate/devel libsamplerate.spec,1.10,1.11 Message-ID: <200603161833.k2GIXEkm023233@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libsamplerate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23216 Modified Files: libsamplerate.spec Log Message: libsamplerate: release bump Index: libsamplerate.spec =================================================================== RCS file: /cvs/extras/rpms/libsamplerate/devel/libsamplerate.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libsamplerate.spec 27 Jun 2005 18:19:30 -0000 1.10 +++ libsamplerate.spec 16 Mar 2006 18:32:42 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Sample rate conversion library for audio data Name: libsamplerate Version: 0.1.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.mega-nerd.com/SRC/ @@ -75,6 +75,9 @@ %changelog +* Thu Mar 16 2006 Dams - 0.1.2-4.fc5 +- rebuild + * Thu May 12 2005 Michael Schwendt - 0.1.2-3 - rebuilt From fedora-extras-commits at redhat.com Thu Mar 16 18:36:26 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 16 Mar 2006 13:36:26 -0500 Subject: rpms/octave/devel octave.spec,1.31,1.32 Message-ID: <200603161836.k2GIaw70023326@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23309 Modified Files: octave.spec Log Message: Rebuild for new hdf5. Misc spec changes. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- octave.spec 24 Feb 2006 07:23:11 -0000 1.31 +++ octave.spec 16 Mar 2006 18:36:26 -0000 1.32 @@ -63,10 +63,9 @@ %define enable64 --enable-64=no %endif CPPFLAGS=-I%{_includedir}/glpk \ -CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure %enable64 \ - --enable-shared=yes --enable-lite-kernel --enable-static=no \ - --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} \ - --mandir=%{_mandir} +CXXFLAGS="$RPM_OPT_FLAGS" ./configure %enable64 \ + --enable-shared --disable-static --prefix=%{_prefix} \ + --infodir=%{_infodir} --libdir=%{_libdir} --mandir=%{_mandir} make %{?_smp_mflags} @@ -128,6 +127,8 @@ %changelog * Fri Feb 24 2006 Quentin Spencer 2.9.4-8 +- Rebuild for new hdf5. +- Remove obsolete configure options. - Make sure /usr/libexec/octave is owned by octave. * Wed Feb 15 2006 Quentin Spencer 2.9.4-7 From fedora-extras-commits at redhat.com Thu Mar 16 18:38:41 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:38:41 -0500 Subject: rpms/libebml/devel libebml.spec,1.12,1.13 Message-ID: <200603161839.k2GIdDse023436@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libebml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23385 Modified Files: libebml.spec Log Message: libebml: release bump Index: libebml.spec =================================================================== RCS file: /cvs/extras/rpms/libebml/devel/libebml.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libebml.spec 29 Nov 2005 09:46:41 -0000 1.12 +++ libebml.spec 16 Mar 2006 18:38:40 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 0.7.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -67,6 +67,9 @@ %changelog +* Thu Mar 16 2006 Dams - 0.7.6-2.fc5 +- Release bump + * Tue Nov 29 2005 Matthias Saou 0.7.6-1 - Update to 0.7.6. - Change URL to the project's one. From fedora-extras-commits at redhat.com Thu Mar 16 18:40:06 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 16 Mar 2006 13:40:06 -0500 Subject: rpms/octave/FC-4 octave.spec,1.26,1.27 Message-ID: <200603161840.k2GIed8V023587@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23519 Modified Files: octave.spec Log Message: Remove obsolete configure options. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- octave.spec 24 Feb 2006 07:16:14 -0000 1.26 +++ octave.spec 16 Mar 2006 18:40:06 -0000 1.27 @@ -53,9 +53,7 @@ %build -CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure \ - --enable-shared=yes --enable-lite-kernel --enable-static=no \ - --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} +%configure --enable-shared --disable-static make %{?_smp_mflags} @@ -118,8 +116,9 @@ %changelog -* Fri Feb 24 2006 Quentin Spencer 2.1.72-4 +* Thu Mar 16 2006 Quentin Spencer 2.1.72-4 - Make sure /usr/libexec/octave is owned by octave. +- Remove configure options that are now obsolete. * Wed Feb 1 2006 Quentin Spencer 2.1.72-3 - Patch to fix bug #179242. From fedora-extras-commits at redhat.com Thu Mar 16 18:44:26 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:44:26 -0500 Subject: rpms/libmatroska/devel libmatroska.spec,1.12,1.13 Message-ID: <200603161844.k2GIix5H023695@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libmatroska/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23673 Modified Files: libmatroska.spec Log Message: libmatroska: release bump Index: libmatroska.spec =================================================================== RCS file: /cvs/extras/rpms/libmatroska/devel/libmatroska.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libmatroska.spec 29 Nov 2005 09:56:55 -0000 1.12 +++ libmatroska.spec 16 Mar 2006 18:44:26 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -71,6 +71,9 @@ %changelog +* Thu Mar 16 2006 Dams - 0.8.0-2.fc5 +- Rebuild + * Tue Nov 29 2005 Matthias Saou 0.8.0-1 - Update to 0.8.0. - Add a full description for the devel package. From fedora-extras-commits at redhat.com Thu Mar 16 18:54:51 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:54:51 -0500 Subject: rpms/libcddb/devel libcddb.spec,1.15,1.16 Message-ID: <200603161855.k2GItNM9023792@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23774 Modified Files: libcddb.spec Log Message: libcddb: release bump Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libcddb.spec 23 Aug 2005 14:50:41 -0000 1.15 +++ libcddb.spec 16 Mar 2006 18:54:50 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Thu Mar 16 2006 Dams - 1.2.1-2.fc5 +- Rebuild + * Tue Aug 23 2005 Dams - 1.2.1 - Updated to 1.2.1 From fedora-extras-commits at redhat.com Thu Mar 16 19:37:06 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:37:06 -0500 Subject: rpms/dumb - New directory Message-ID: <200603161937.k2GJb8Nr026115@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26107/dumb Log Message: Directory /cvs/extras/rpms/dumb added to the repository From fedora-extras-commits at redhat.com Thu Mar 16 19:37:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:37:12 -0500 Subject: rpms/dumb/devel - New directory Message-ID: <200603161937.k2GJbELj026130@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26107/dumb/devel Log Message: Directory /cvs/extras/rpms/dumb/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 16 19:37:29 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:37:29 -0500 Subject: rpms/dumb Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603161937.k2GJbV9v026164@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26152 Added Files: Makefile import.log Log Message: Setup of module dumb --- NEW FILE Makefile --- # Top level Makefile for module dumb all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 16 19:37:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:37:35 -0500 Subject: rpms/dumb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603161937.k2GJbbZ8026184@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26152/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dumb --- NEW 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 Mar 16 19:38:06 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:38:06 -0500 Subject: rpms/dumb import.log,1.1,1.2 Message-ID: <200603161938.k2GJcch6026254@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26220 Modified Files: import.log Log Message: auto-import dumb-0.9.3-2 on branch devel from dumb-0.9.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dumb/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 Mar 2006 19:37:29 -0000 1.1 +++ import.log 16 Mar 2006 19:38:06 -0000 1.2 @@ -0,0 +1 @@ +dumb-0_9_3-2:HEAD:dumb-0.9.3-2.src.rpm:1142538114 From fedora-extras-commits at redhat.com Thu Mar 16 19:38:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:38:12 -0500 Subject: rpms/dumb/devel dumb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603161938.k2GJci7d026258@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26220/devel Modified Files: .cvsignore sources Added Files: dumb.spec Log Message: auto-import dumb-0.9.3-2 on branch devel from dumb-0.9.3-2.src.rpm --- NEW FILE dumb.spec --- Name: dumb Version: 0.9.3 Release: 2%{?dist} Summary: IT, XM, S3M and MOD player library Group: System Environment/Libraries License: GPL-Compatible URL: http://dumb.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Source1: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-autotools.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel %description IT, XM, S3M and MOD player library. Mainly targeted for use with the allegro game programming library, but it can be used without allegro. Faithful to the original trackers, especially IT. %package devel Summary: Development libraries and headers for dumb Group: Development/Libraries Requires: %{name} = %{version} %description devel The developmental files that must be installed in order to compile applications which use dumb. %prep %setup -q -b 01 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT #clean out .la and static libs rm -f $RPM_BUILD_ROOT%{_libdir}/*.a $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc licence.txt release.txt readme.txt %{_bindir}/dumb* %{_libdir}/lib*-%{version}.so %files devel %defattr(-,root,root,-) %doc docs/deprec.txt docs/dumb.txt docs/faq.txt docs/fnptr.txt docs/howto.txt docs/ptr.txt %{_includedir}/*.h %{_libdir}/libdumb.so %{_libdir}/libaldmb.so %changelog * Thu Mar 16 2006 Hans de Goede 0.9.3-2 - Drop modplug.txt from %doc and move release.txt and readme.txt from the -devel package to the main package (bz 185576). * Fri Jan 27 2006 Hans de Goede 0.9.3-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dumb/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Mar 2006 19:37:35 -0000 1.1 +++ .cvsignore 16 Mar 2006 19:38:11 -0000 1.2 @@ -0,0 +1,2 @@ +dumb-0.9.3-autotools.tar.gz +dumb-0.9.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dumb/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Mar 2006 19:37:35 -0000 1.1 +++ sources 16 Mar 2006 19:38:12 -0000 1.2 @@ -0,0 +1,2 @@ +3e345d643060880bab7c574774c4b35b dumb-0.9.3-autotools.tar.gz +f48da5b990aa8aa822d3b6a951baf5c2 dumb-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 16 19:44:20 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Thu, 16 Mar 2006 14:44:20 -0500 Subject: rpms/galeon/FC-4 galeon.spec,1.20,1.21 Message-ID: <200603161944.k2GJiqux026461@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444 Modified Files: galeon.spec Log Message: Removed x86_64 specific automake runs Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- galeon.spec 1 Mar 2006 18:49:01 -0000 1.20 +++ galeon.spec 16 Mar 2006 19:44:20 -0000 1.21 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -11,13 +11,12 @@ Requires: mozilla = 37:1.7.12 BuildRequires: gettext mozilla-nspr-devel desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 gnome-desktop-devel +BuildRequires: libglade2-devel >= 2.3.1 libbonoboui-devel >= 2.1.1 BuildRequires: mozilla-devel >= 37:1.7.2 BuildRequires: libxml2-devel >= 2.6.6 BuildRequires: libgnomeui-devel >= 2.5.2 +BuildRequires: ORBit2-devel >= 2.0.0 BuildRequires: perl(XML::Parser) scrollkeeper -%ifarch x86_64 -BuildRequires: autoconf automake libtool intltool -%endif %description Galeon is a web browser built around Gecko (Mozilla's rendering @@ -29,10 +28,6 @@ %prep %setup -q -n %{name}-%{version}%{?extraversion} -%ifarch x86_64 -aclocal -autoconf -%endif %build %configure \ @@ -101,6 +96,9 @@ %changelog +* Thu Mar 16 2006 Denis Leroy - 2.0.1-2 +- Removed x86_64 specific automake runs + * Wed Mar 1 2006 Denis Leroy - 2.0.1-1 - Update to 2.0.1 From fedora-extras-commits at redhat.com Thu Mar 16 20:25:34 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 16 Mar 2006 15:25:34 -0500 Subject: devel/common branches,1.3,1.4 Message-ID: <200603162026.k2GKQ6rX011548@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11035 Modified Files: branches Log Message: branch adjust Index: branches =================================================================== RCS file: /cvs/extras/devel/common/branches,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- branches 31 May 2005 18:50:04 -0000 1.3 +++ branches 16 Mar 2006 20:25:32 -0000 1.4 @@ -5,4 +5,5 @@ FC-2:fc2:.fc2:fedora:2 FC-3:fc3:.fc3:fedora:3 FC-4:fc4:.fc4:fedora:4 -devel:devel:.fc5:fedora:5 +FC-5:fc5:.fc5:fedora:5 +devel:devel:.fc6:fedora:6 From fedora-extras-commits at redhat.com Thu Mar 16 22:33:48 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Thu, 16 Mar 2006 17:33:48 -0500 Subject: rpms/ghdl/devel ghdl-svn49.patch,NONE,1.1 ghdl.spec,1.10,1.11 Message-ID: <200603162234.k2GMYKCk009344@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9314 Modified Files: ghdl.spec Added Files: ghdl-svn49.patch Log Message: update to svn49 ghdl-svn49.patch: --- NEW FILE ghdl-svn49.patch --- diff -urN ghdl-0.21/README ghdl-0.22dev/README --- ghdl-0.21/README 2005-12-18 14:49:00.000000000 +0100 +++ ghdl-0.22dev/README 2006-03-16 20:52:11.000000000 +0100 @@ -27,19 +27,33 @@ *************************** Required: -* the sources of gcc-4.0.2 (at least the core part). +* the sources of gcc-4.1.0 (at least the core part). Note: other versions of gcc sources have not been tested. * the Ada95 GNAT compiler (GNAT v3.15p and GNAT GPL 2005 are known to work; Ada compilers in most Linux distributions are more or less buggy) * GNU/Linux for ix86 (pc systems) (porting is necessary for other systems) Procedure: +* Check your Ada compiler. On some systems (or with some distribution), the + GNAT compiler seems broken. Try this very simple example, using file + example.adb +<<<<<<<<<<<<<<<<<< +procedure Example is +begin + null; +end Example; +<<<<<<<<<<<<<<<<<< + Compile with + $ gnatmake example + It should create an executable, 'example'. + If this doesn't work, your GNAT installation is broken. It may be a PATH + problem or something else. * untar the gcc tarball * untar the ghdl tarball (this sould have been done, since you are reading a file from it). * move or copy the vhdl directory of ghdl into the gcc subdirectory of the gcc distribution. - You should have a gcc-4.0.2/gcc/vhdl directory. + You should have a gcc-4.1.0/gcc/vhdl directory. * configure gcc with the --enable-languages=vhdl option. You may of course add other languages. Refer to the gcc installation documentation. diff -urN ghdl-0.21/vhdl/Make-lang.in ghdl-0.22dev/vhdl/Make-lang.in --- ghdl-0.21/vhdl/Make-lang.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Make-lang.in 2006-03-16 20:52:10.000000000 +0100 @@ -96,22 +96,21 @@ AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \ -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \ -I$(AGCC_GCCSRC_DIR)/libcpp/include -AGCC_CFLAGS=-g -DIN_GCC $(AGCC_INC_FLAGS) +AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) AGCC_LOCAL_OBJS=ortho-lang.o gcc-version.o AGCC_DEPS := $(AGCC_LOCAL_OBJS) AGCC_OBJS := $(AGCC_LOCAL_OBJS) \ $(AGCC_GCCOBJ_DIR)/gcc/toplev.o \ - $(AGCC_GCCOBJ_DIR)/gcc/c-convert.o \ $(AGCC_GCCOBJ_DIR)/gcc/libbackend.a \ $(AGCC_GCCOBJ_DIR)/libcpp/libcpp.a \ $(AGCC_GCCOBJ_DIR)/libiberty/libiberty.a -gcc-version.c: $(AGCC_GCCSRC_DIR)/gcc/version.c +gcc-version.c: $(AGCC_GCCSRC_DIR)/gcc/BASE-VER -$(RM) -f $@ echo '#include "version.h"' > $@ - sed -n -e '/version_string/ s/";/ (ghdl)";/p' < $< >> $@ + echo "const char version_string[] = \""`cat $<` "(ghdl)\";" >> $@ echo 'const char bug_report_url[] = "";' >> $@ gcc-version.o: gcc-version.c diff -urN ghdl-0.21/vhdl/Makefile.in ghdl-0.22dev/vhdl/Makefile.in --- ghdl-0.21/vhdl/Makefile.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Makefile.in 2006-03-16 20:52:10.000000000 +0100 @@ -480,6 +480,7 @@ #GRT_USE_PTHREADS=y ifeq ($(GRT_USE_PTHREADS),y) + GRT_CFLAGS+=-DUSE_THREADS GRT_ADD_OBJS+=grt-cthreads.o GRT_EXTRA_LIB+=-lpthread endif @@ -527,7 +528,7 @@ $(CC) -c $(GRT_FLAGS) -o $@ $< linux.o: $(GRTSRCDIR)/config/linux.c - $(CC) -c $(GRT_FLAGS) -o $@ $< + $(CC) -c $(GRT_FLAGS) $(GRT_CFLAGS) -o $@ $< win32.o: $(GRTSRCDIR)/config/win32.c $(CC) -c $(GRT_FLAGS) -o $@ $< diff -urN ghdl-0.21/vhdl/configuration.adb ghdl-0.22dev/vhdl/configuration.adb --- ghdl-0.21/vhdl/configuration.adb 2005-09-22 23:26:43.000000000 +0200 +++ ghdl-0.22dev/vhdl/configuration.adb 2006-03-16 20:51:10.000000000 +0100 @@ -25,7 +25,7 @@ package body Configuration is procedure Add_Design_Concurrent_Stmts (Parent : Iir); procedure Add_Design_Block_Configuration (Blk : Iir_Block_Configuration); - procedure Add_Design_Aspect (Aspect : Iir); + procedure Add_Design_Aspect (Aspect : Iir; Add_Default : Boolean); Current_File_Dependence : Iir_List := Null_Iir_List; Current_Configuration : Iir_Configuration_Declaration := Null_Iir; @@ -53,6 +53,16 @@ return; end if; + -- May be enabled to debug dependency construction. + if False then + if From = Null_Iir then + Warning_Msg_Elab (Disp_Node (Unit) & " added", Unit); + else + Warning_Msg_Elab + (Disp_Node (Unit) & " added by " & Disp_Node (From), From); + end if; + end if; + Set_Elab_Flag (Unit, True); Lib_Unit := Get_Library_Unit (Unit); @@ -200,7 +210,7 @@ begin Unit := Get_Instantiated_Unit (Stmt); if Get_Kind (Unit) /= Iir_Kind_Component_Declaration then - Add_Design_Aspect (Unit); + Add_Design_Aspect (Unit, True); end if; end; when Iir_Kind_Generate_Statement @@ -216,7 +226,7 @@ end loop; end Add_Design_Concurrent_Stmts; - procedure Add_Design_Aspect (Aspect : Iir) + procedure Add_Design_Aspect (Aspect : Iir; Add_Default : Boolean) is use Libraries; @@ -231,10 +241,13 @@ end if; case Get_Kind (Aspect) is when Iir_Kind_Entity_Aspect_Entity => + -- Add the entity. Entity := Get_Entity (Aspect); - Entity_Lib := Get_Library_Unit (Entity); Add_Design_Unit (Entity, Aspect); + + -- Extract and add the architecture. Arch := Get_Architecture (Aspect); + Entity_Lib := Get_Library_Unit (Entity); if Arch /= Null_Iir then case Get_Kind (Arch) is when Iir_Kind_Simple_Name => @@ -263,10 +276,15 @@ Arch := Get_Design_Unit (Arch); end if; Load_Design_Unit (Arch, Aspect); - Config := Get_Default_Configuration_Declaration - (Get_Library_Unit (Arch)); - if Config /= Null_Iir then - Add_Design_Unit (Config, Aspect); + Add_Design_Unit (Arch, Aspect); + + -- Add the default configuration if required. + if Add_Default then + Config := Get_Default_Configuration_Declaration + (Get_Library_Unit (Arch)); + if Config /= Null_Iir then + Add_Design_Unit (Config, Aspect); + end if; end if; when Iir_Kind_Entity_Aspect_Configuration => Add_Design_Unit (Get_Configuration (Aspect), Aspect); @@ -424,7 +442,9 @@ -- CONF is either a configuration specification or a component -- configuration. - procedure Add_Design_Binding_Indication (Conf : Iir) + -- If ADD_DEFAULT is true, then the default configuration for the design + -- binding must be added if required. + procedure Add_Design_Binding_Indication (Conf : Iir; Add_Default : Boolean) is Bind : Iir_Binding_Indication; Inst : Iir; @@ -442,12 +462,13 @@ return; end if; Check_Binding_Indication (Conf); - Add_Design_Aspect (Get_Entity_Aspect (Bind)); + Add_Design_Aspect (Get_Entity_Aspect (Bind), Add_Default); end Add_Design_Binding_Indication; procedure Add_Design_Block_Configuration (Blk : Iir_Block_Configuration) is Item : Iir; + Sub_Config : Iir; begin if Blk = Null_Iir then return; @@ -456,10 +477,11 @@ while Item /= Null_Iir loop case Get_Kind (Item) is when Iir_Kind_Configuration_Specification => - Add_Design_Binding_Indication (Item); + Add_Design_Binding_Indication (Item, True); when Iir_Kind_Component_Configuration => - Add_Design_Binding_Indication (Item); - Add_Design_Block_Configuration (Get_Block_Configuration (Item)); + Sub_Config := Get_Block_Configuration (Item); + Add_Design_Binding_Indication (Item, Sub_Config = Null_Iir); + Add_Design_Block_Configuration (Sub_Config); when Iir_Kind_Block_Configuration => Add_Design_Block_Configuration (Item); when others => diff -urN ghdl-0.21/vhdl/errorout.adb ghdl-0.22dev/vhdl/errorout.adb --- ghdl-0.21/vhdl/errorout.adb 2005-09-22 23:27:25.000000000 +0200 +++ ghdl-0.22dev/vhdl/errorout.adb 2006-03-16 20:51:10.000000000 +0100 @@ -501,7 +501,7 @@ & Name_Table.Name_Buffer (1 .. Name_Table.Name_Length) & '''; when Iir_Kind_Entity_Aspect_Entity => - return Disp_Node (Get_Entity (Node)) + return "aspect " & Disp_Node (Get_Entity (Node)) & '(' & Iirs_Utils.Image_Identifier (Get_Architecture (Node)) & ')'; when Iir_Kind_Entity_Aspect_Configuration => diff -urN ghdl-0.21/vhdl/evaluation.adb ghdl-0.22dev/vhdl/evaluation.adb --- ghdl-0.21/vhdl/evaluation.adb 2005-12-11 16:32:03.000000000 +0100 +++ ghdl-0.22dev/vhdl/evaluation.adb 2006-03-16 20:51:10.000000000 +0100 @@ -836,6 +836,28 @@ return Build_Simple_Aggregate (Res_List, Orig, Res_Type); end Eval_Concatenation; + function Eval_Array_Equality (Left, Right : Iir) return Boolean + is + L_List : Iir_List; + R_List : Iir_List; + N : Natural; + begin + -- FIXME: the simple aggregates are lost. + L_List := Get_Simple_Aggregate_List (Eval_String_Literal (Left)); + R_List := Get_Simple_Aggregate_List (Eval_String_Literal (Right)); + N := Get_Nbr_Elements (L_List); + if N /= Get_Nbr_Elements (R_List) then + return False; + end if; + for I in 0 .. N - 1 loop + -- FIXME: this is wrong: (eg: evaluated lit) + if Get_Nth_Element (L_List, I) /= Get_Nth_Element (R_List, I) then + return False; + end if; + end loop; + return True; + end Eval_Array_Equality; + -- ORIG is either a dyadic operator or a function call. function Eval_Dyadic_Operator (Orig : Iir; Left, Right : Iir) return Iir @@ -1073,34 +1095,10 @@ (Get_Fp_Value (Left) / Iir_Fp64 (Get_Value (Right)), Orig); when Iir_Predefined_Array_Equality => - declare - L_List : Iir_List; - R_List : Iir_List; - R : Boolean; - N : Natural; - begin - -- FIXME: the simple aggregates are lost. - L_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Left)); - R_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Right)); - N := Get_Nbr_Elements (L_List); - if N /= Get_Nbr_Elements (R_List) then - R := False; - else - R := True; - for I in 0 .. N - 1 loop - -- FIXME: this is wrong: (eg: evaluated lit) - if Get_Nth_Element (L_List, I) - /= Get_Nth_Element (R_List, I) - then - R := False; - exit; - end if; - end loop; - end if; - return Build_Boolean (R, Orig); - end; + return Build_Boolean (Eval_Array_Equality (Left, Right), Orig); + + when Iir_Predefined_Array_Inequality => + return Build_Boolean (not Eval_Array_Equality (Left, Right), Orig); when Iir_Predefined_Array_Sll | Iir_Predefined_Array_Srl @@ -1111,8 +1109,7 @@ return Eval_Shift_Operator (Eval_String_Literal (Left), Right, Orig, Func); - when Iir_Predefined_Array_Inequality - | Iir_Predefined_Array_Less + when Iir_Predefined_Array_Less | Iir_Predefined_Array_Less_Equal | Iir_Predefined_Array_Greater | Iir_Predefined_Array_Greater_Equal diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi --- ghdl-0.21/vhdl/ghdl.texi 2005-12-12 03:21:55.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdl.texi 2006-03-16 20:51:01.000000000 +0100 @@ -4,15 +4,19 @@ @settitle GHDL guide @c %**end of header + at direntry +* ghdl: (ghdl). VHDL compiler. + at end direntry + @titlepage @title GHDL guide @subtitle GHDL, a VHDL compiler - at subtitle For GHDL version 0.21 (Sokcho edition) + at subtitle For GHDL version 0.22 (Sokcho edition) @author Tristan Gingold @c The following two commands start the copyright page. @page @vskip 0pt plus 1filll -Copyright @copyright{} 2002, 2003, 2004, 2005 Tristan Gingold. +Copyright @copyright{} 2002, 2003, 2004, 2005, 2006 Tristan Gingold. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or @@ -70,11 +74,11 @@ @contents @ifnottex - at node Top + at node Top, Introduction, (dir), (dir) @top GHDL guide GHDL, a VHDL compiler. -Copyright @copyright{} 2002, 2003, 2004 Tristan Gingold. +Copyright @copyright{} 2002, 2003, 2004, 2005, 2006 Tristan Gingold. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 @@ -90,7 +94,6 @@ * Flaws and bugs report:: * Copyrights:: * Index:: - @end menu @end ifnottex @@ -902,6 +905,9 @@ messages that report such constructions. Some warnings are reported only during analysis, others during elaboration. +You could disable a warning by using the @option{--warn-no-XXX} +instead of @option{--warn-XXX}. + @table @code @item --warn-reserved @cindex @option{--warn-reserved} switch @@ -1688,6 +1694,7 @@ * Library database:: * VHDL files format:: * Top entity:: +* Using vendor libraries:: * Interfacing to other languages:: @end menu @@ -1865,7 +1872,7 @@ If the type mark is a composite type (record or array), the file is composed of a 2 lines signature, followed by a raw stream. - at node Top entity, Interfacing to other languages, VHDL files format, GHDL implementation of VHDL + at node Top entity, Using vendor libraries, VHDL files format, GHDL implementation of VHDL @comment node-name, next, previous, up @section Top entity There are some restrictions on the entity being at the apex of a design @@ -1879,8 +1886,38 @@ The ports type must be constrained. @end itemize - at node Interfacing to other languages, , Top entity, GHDL implementation of VHDL - at comment node-name, next, previous, up at section Interfacing with other languages + at node Using vendor libraries, Interfacing to other languages, Top entity, GHDL implementation of VHDL + at comment node-name, next, previous, up + at section Using vendor libraries +Many vendors libraries have been analyzed with GHDL. There are +usually no problems. Be sure to use the @option{--work=} option. +However, some problems have been encountered. + +GHDL follows the VHDL LRM (the manual which defines VHDL) more +strictly than other VHDL tools. You could try to relax the +restrictions by using the @option{--std=93c}, @option{-fexplicit} and + at option{--warn-no-vital-generic}. + +Even with these relaxations, some broken libraries may fail. + +For example, @code{unisim_VITAL.vhd} from @code{Xilinx} can't be +compiled because lines such as: + at smallexample + variable Write_A_Write_B : memory_collision_type := Write_A_Write_B; + variable Read_A_Write_B : memory_collision_type := Read_A_Write_B; + at end smallexample +(there are 6 such lines). +According to VHDL visibility rules, @samp{Write_A_Write_B} cannot be used +while it is defined. This is very logical because it prevents from silly +declarations such as + at smallexample + constant k : natural := 2 * k; + at end smallexample +This files must be modified. Fortunatly, in the example the variables +are never written. So it is enough to remove them. + + at node Interfacing to other languages, , Using vendor libraries, GHDL implementation of VHDL + at comment node-name, next, previous, up @section Interfacing to other languages @cindex interfacing @cindex other languages @@ -1931,7 +1968,7 @@ * Linking with foreign object files:: * Starting a simulation from a foreign program:: * Linking with Ada:: -* Using GRT from Ada:: +* Using GRT from Ada:: @end menu @node Restrictions on foreign declarations, Linking with foreign object files, Interfacing to other languages, Interfacing to other languages @@ -2036,7 +2073,7 @@ $ gnatmake my_prog -largs `ghdl --list-link design` @end smallexample - at node Using GRT from Ada, , Linking with Ada, Interfacing to other languages + at node Using GRT from Ada, , Linking with Ada, Interfacing to other languages @comment node-name, next, previous, up @subsection Using GRT from Ada @quotation Warning diff -urN ghdl-0.21/vhdl/ghdldrv/ghdlmain.adb ghdl-0.22dev/vhdl/ghdldrv/ghdlmain.adb --- ghdl-0.21/vhdl/ghdldrv/ghdlmain.adb 2005-12-04 04:51:33.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdldrv/ghdlmain.adb 2006-03-16 20:51:04.000000000 +0100 @@ -1,5 +1,5 @@ -- GHDL driver - main part. --- Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold +-- Copyright (C) 2002, 2003, 2004, 2005, 2006 Tristan Gingold -- -- GHDL 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 @@ -225,7 +225,7 @@ Put_Line ("Written by Tristan Gingold."); New_Line; -- Display copyright. Assume 80 cols terminal. - Put_Line ("Copyright (C) 2003, 2004, 2005 Tristan Gingold."); + Put_Line ("Copyright (C) 2003, 2004, 2005, 2006 Tristan Gingold."); Put_Line ("GHDL is free software, covered by the " & "GNU General Public License. There is NO"); Put_Line ("warranty; not even for MERCHANTABILITY or" diff -urN ghdl-0.21/vhdl/grt/config/linux.c ghdl-0.22dev/vhdl/grt/config/linux.c --- ghdl-0.21/vhdl/grt/config/linux.c 2005-12-12 03:29:26.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/linux.c 2006-03-16 20:51:05.000000000 +0100 @@ -189,7 +189,12 @@ #endif /* Context for the main stack. */ -static __thread struct stack_context main_stack_context; +#ifdef USE_THREADS +#define THREAD __thread +#else +#define THREAD +#endif +static THREAD struct stack_context main_stack_context; extern void grt_set_main_stack (struct stack_context *stack); @@ -280,3 +285,28 @@ res->cur_length = stack_size; return res; } + +#include +static int run_env_en; +static jmp_buf run_env; + +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (run_env_en) + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; +} + diff -urN ghdl-0.21/vhdl/grt/config/pthread.c ghdl-0.22dev/vhdl/grt/config/pthread.c --- ghdl-0.21/vhdl/grt/config/pthread.c 2005-12-12 03:37:47.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/pthread.c 2006-03-16 20:51:05.000000000 +0100 @@ -27,7 +27,7 @@ #include #include #include - +#include //#define INFO printf #define INFO (void) @@ -41,7 +41,8 @@ void* Arg; // ARG passed to FUNC } Stack_Type_t, *Stack_Type; -Stack_Type_t main_stack_context; +static Stack_Type_t main_stack_context; +static Stack_Type_t *current; extern void grt_set_main_stack (Stack_Type_t *stack); //---------------------------------------------------------------------------- @@ -58,6 +59,8 @@ // lock the mutex, as we are currently running pthread_mutex_lock(&(main_stack_context.mutex)); + current = &main_stack_context; + grt_set_main_stack (&main_stack_context); } @@ -115,6 +118,10 @@ return newStack; } +static int need_longjmp; +static int run_env_en; +static jmp_buf run_env; + //---------------------------------------------------------------------------- void grt_stack_switch(Stack_Type To, Stack_Type From) // Resume stack TO and save the current context to the stack pointed by @@ -122,7 +129,9 @@ // => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); { INFO("grt_stack_switch\n"); INFO(" from 0x%08x to 0x%08x\n", From, To); - + + current = To; + // unlock 'To' mutex. this will make the other thread either // - starts for first time in grt_stack_loop // - resumes at lock below @@ -132,6 +141,9 @@ // as we are running, our mutex is locked and we block here // when stacks are switched, with above unlock, we may proceed pthread_mutex_lock(&(From->mutex)); + + if (From == &main_stack_context && need_longjmp != 0) + longjmp (run_env, need_longjmp); } //---------------------------------------------------------------------------- @@ -141,6 +153,35 @@ { INFO("grt_stack_delete\n"); } +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (!run_env_en) + return; + + if (current != &main_stack_context) + { + need_longjmp = val; + grt_stack_switch (&main_stack_context, current); + } + else + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; +} + + //---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c --- ghdl-0.21/vhdl/grt/config/win32.c 2005-12-12 03:39:16.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/win32.c 2006-03-16 20:51:05.000000000 +0100 @@ -1,5 +1,5 @@ -/* GRT stack implementation for Win32 - Copyright (C) 2004, 2005 Felix Bertram. +/* GRT stack implementation for Win32 using fibers. + Copyright (C) 2005 Tristan Gingold. GHDL 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 @@ -16,139 +16,120 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -//----------------------------------------------------------------------------- -// Project: GHDL - VHDL Simulator -// Description: Win32 port of stacks package -// Note: Tristan's original i386/Linux used assembly-code -// to manually switch stacks for performance reasons. -// History: 2004feb09, FB, created. -//----------------------------------------------------------------------------- #include -//#include -//#include -//#include - - -//#define INFO printf -#define INFO (void) - -// GHDL names an endless loop calling FUNC with ARG a 'stack' -// at a given time, only one stack may be 'executed' -typedef struct -{ HANDLE thread; // stack's thread - HANDLE mutex; // mutex to suspend/resume thread - void (*Func)(void*); // stack's FUNC - void* Arg; // ARG passed to FUNC -} Stack_Type_t, *Stack_Type; +#include +#include +#include -Stack_Type_t main_stack_context; -extern Stack_Type grt_stack_main_stack; +struct stack_type +{ + LPVOID fiber; // Win fiber. + void (*func)(void *); // Function + void *arg; // Function argument. +}; + +static struct stack_type main_stack_context; +static struct stack_type *current; +extern void grt_set_main_stack (struct stack_type *stack); -//------------------------------------------------------------------------------ void grt_stack_init(void) -// Initialize the stacks package. -// This may adjust stack sizes. -// Must be called after grt.options.decode. -// => procedure Stack_Init; -{ INFO("grt_stack_init\n"); - INFO(" main_stack_context=0x%08x\n", &main_stack_context); - - // create event. reset event, as we are currently running - main_stack_context.mutex = CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - grt_stack_main_stack= &main_stack_context; -} - -//------------------------------------------------------------------------------ -static unsigned long __stdcall grt_stack_loop(void* pv_myStack) -{ - Stack_Type myStack= (Stack_Type)pv_myStack; - - INFO("grt_stack_loop\n"); - - INFO(" myStack=0x%08x\n", myStack); - - // block until event becomes set again. - // this happens when this stack is enabled for the first time - WaitForSingleObject(myStack->mutex, INFINITE); - - // run stack's function in endless loop - while(1) - { INFO(" call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg); - myStack->Func(myStack->Arg); - } - - // we never get here... - return 0; -} - -//------------------------------------------------------------------------------ -Stack_Type grt_stack_create(void* Func, void* Arg) -// Create a new stack, which on first execution will call FUNC with -// an argument ARG. -// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type; -{ Stack_Type newStack; - DWORD m_IDThread; // Thread's ID (dummy) - - INFO("grt_stack_create\n"); - INFO(" call 0x%08x with 0x%08x\n", Func, Arg); - - newStack= malloc(sizeof(Stack_Type_t)); - - // init function and argument - newStack->Func= Func; - newStack->Arg= Arg; - - // create event. reset event, so that thread will blocked in grt_stack_loop - newStack->mutex= CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - INFO(" newStack=0x%08x\n", newStack); - - // create thread, which executes grt_stack_loop - newStack->thread= CreateThread(NULL, // lpsa - 0, // cbStack - grt_stack_loop, // lpStartAddr - newStack, // lpvThreadParm - 0, // fdwCreate - &m_IDThread); // lpIDThread - - return newStack; -} - -//------------------------------------------------------------------------------ -void grt_stack_switch(Stack_Type To, Stack_Type From) -// Resume stack TO and save the current context to the stack pointed by -// CUR. -// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); -{ INFO("grt_stack_switch\n"); - INFO(" from 0x%08x to 0x%08x\n", From, To); - - // set 'To' event. this will make the other thread either - // - start for first time in grt_stack_loop - // - resume at WaitForSingleObject below - SetEvent(To->mutex); - - // block until 'From' event becomes set again - // as we are running, our event is reset and we block here - // when stacks are switched, with above SetEvent, we may proceed - WaitForSingleObject(From->mutex, INFINITE); -} - -//------------------------------------------------------------------------------ -void grt_stack_delete(Stack_Type Stack) -// Delete stack STACK, which must not be currently executed. -// => procedure Stack_Delete (Stack : Stack_Type); -{ INFO("grt_stack_delete\n"); +{ + main_stack_context.fiber = ConvertThreadToFiber (NULL); + if (main_stack_context.fiber == NULL) + { + fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n", + GetLastError ()); + abort (); + } + grt_set_main_stack (&main_stack_context); + current = &main_stack_context; +} + +static VOID __stdcall +grt_stack_loop (void *v_stack) +{ + struct stack_type *stack = (struct stack_type *)v_stack; + while (1) + { + (*stack->func)(stack->arg); + } +} + +struct stack_type * +grt_stack_create (void (*func)(void *), void *arg) +{ + struct stack_type *res; + + res = malloc (sizeof (struct stack_type)); + if (res == NULL) + return NULL; + res->func = func; + res->arg = arg; + res->fiber = CreateFiber (0, &grt_stack_loop, res); + if (res->fiber == NULL) + { + free (res); + return NULL; + } + return res; +} + +static int run_env_en; +static jmp_buf run_env; +static int need_longjmp; + +void +grt_stack_switch (struct stack_type *to, struct stack_type *from) +{ + assert (current == from); + current = to; + SwitchToFiber (to->fiber); + if (from == &main_stack_context && need_longjmp) + { + /* We returned to do the longjump. */ + current = &main_stack_context; + longjmp (run_env, need_longjmp); + } +} + +void +grt_stack_delete (struct stack_type *stack) +{ + DeleteFiber (stack->fiber); + stack->fiber = NULL; +} + +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (!run_env_en) + return; + + if (current != &main_stack_context) + { + /* We are allowed to jump only in the same stack. + First switch back to the main thread. */ + need_longjmp = val; + SwitchToFiber (main_stack_context.fiber); + } + else + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; } -//---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME void __gnat_raise_storage_error(void) { @@ -161,6 +142,3 @@ } #endif -//---------------------------------------------------------------------------- -// end of file - diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c --- ghdl-0.21/vhdl/grt/ghwlib.c 2005-12-07 06:29:04.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.c 2006-03-16 20:51:05.000000000 +0100 @@ -1214,16 +1214,31 @@ return 0; } +static const char * +ghw_get_lit (union ghw_type *type, int e) +{ + if (e >= type->en.nbr || e < 0) + return "??"; + else + return type->en.lits[e]; +} + +static void +ghw_disp_lit (union ghw_type *type, int e) +{ + printf ("%s (%d)", ghw_get_lit (type, e), e); +} + void ghw_disp_value (union ghw_val *val, union ghw_type *type) { switch (ghw_get_base_type (type)->kind) { case ghdl_rtik_type_b2: - printf ("%s (%d)", type->en.lits[val->b2], val->b2); + ghw_disp_lit (type, val->b2); break; case ghdl_rtik_type_e8: - printf ("%s (%d)", type->en.lits[val->e8], val->e8); + ghw_disp_lit (type, val->e8); break; case ghdl_rtik_type_i32: printf ("%d", val->i32); @@ -1582,10 +1597,14 @@ } void -ghw_disp_range (union ghw_range *rng) +ghw_disp_range (union ghw_type *type, union ghw_range *rng) { switch (rng->kind) { + case ghdl_rtik_type_e8: + printf ("%s %s %s", ghw_get_lit (type, rng->e8.left), + ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right)); + break; case ghdl_rtik_type_i32: case ghdl_rtik_type_p32: printf ("%d %s %d", @@ -1657,7 +1676,7 @@ printf ("subtype %s is ", s->name); ghw_disp_typename (h, s->base); printf (" range "); - ghw_disp_range (s->rng); + ghw_disp_range (s->base, s->rng); printf (";\n"); } break; @@ -1692,7 +1711,7 @@ { if (i != 0) printf (", "); - ghw_disp_range (a->rngs[i]); + ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]); } printf (");\n"); } diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h --- ghdl-0.21/vhdl/grt/ghwlib.h 2005-12-07 06:27:09.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.h 2006-03-16 20:51:05.000000000 +0100 @@ -390,7 +390,8 @@ const char *ghw_get_dir (int is_downto); -void ghw_disp_range (union ghw_range *rng); +/* Note: TYPE must be a base type (used only to display literals). */ +void ghw_disp_range (union ghw_type *type, union ghw_range *rng); void ghw_disp_type (struct ghw_handler *h, union ghw_type *t); diff -urN ghdl-0.21/vhdl/grt/grt-cbinding.c ghdl-0.22dev/vhdl/grt/grt-cbinding.c --- ghdl-0.21/vhdl/grt/grt-cbinding.c 2005-12-11 15:03:18.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-cbinding.c 2006-03-16 20:51:05.000000000 +0100 @@ -18,7 +18,6 @@ */ #include #include -#include FILE * __ghdl_get_stdout (void) @@ -44,29 +43,6 @@ fprintf (stream, "%g", val); } -static int run_env_en; -static jmp_buf run_env; - -void -__ghdl_maybe_return_via_longjump (int val) -{ - if (run_env_en) - longjmp (run_env, val); -} - -int -__ghdl_run_through_longjump (int (*func)(void)) -{ - int res; - - run_env_en = 1; - res = setjmp (run_env); - if (res == 0) - res = (*func)(); - run_env_en = 0; - return res; -} - #if 1 void __gnat_last_chance_handler (void) diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb --- ghdl-0.21/vhdl/grt/grt-signals.adb 2005-11-18 03:13:36.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-signals.adb 2006-03-16 20:51:05.000000000 +0100 @@ -1095,15 +1095,6 @@ when others => Internal_Error ("ghdl_create_signal_attribute"); end case; --- Sig_Instance_Name := new Ghdl_Instance_Name_Type' --- (Kind => Ghdl_Name_Signal, --- Name => null, --- Parent => null, --- Brother => null, --- Sig_Mode => Mode, --- Sig_Kind => Kind_Signal_No, --- Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last), --- Sig_Type_Desc => Sig_Type); -- Note: bit and boolean are both mode_b2. Res := Create_Signal (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True), diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb --- ghdl-0.21/vhdl/grt/grt-waves.adb 2005-12-07 05:50:07.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-waves.adb 2006-03-16 20:51:05.000000000 +0100 @@ -785,6 +785,15 @@ Nbr_Scope_Signals : Natural := 0; Nbr_Dumped_Signals : Natural := 0; + -- This is only valid during write_hierarchy. + function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural + is + function To_Integer_Address is new Ada.Unchecked_Conversion + (Ghdl_Signal_Ptr, Integer_Address); + begin + return Natural (To_Integer_Address (Sig.Alink)); + end Get_Signal_Number; + procedure Write_Signal_Number (Val_Addr : Address; Val_Name : Vstring; Val_Type : Ghdl_Rti_Access) @@ -792,20 +801,28 @@ pragma Unreferenced (Val_Name); pragma Unreferenced (Val_Type); - function To_Integer_Address is new Ada.Unchecked_Conversion - (Ghdl_Signal_Ptr, Integer_Address); + Num : Natural; + function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion (Source => Integer_Address, Target => Ghdl_Signal_Ptr); Sig : Ghdl_Signal_Ptr; begin + -- Convert to signal. Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all); - if not Sig.Flags.Is_Dumped then - Sig.Flags.Is_Dumped := True; + + -- Get signal number. + Num := Get_Signal_Number (Sig); + + -- If the signal number is 0, then assign a valid signal number. + if Num = 0 then Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1; - Sig.Flink := To_Ghdl_Signal_Ptr + Sig.Alink := To_Ghdl_Signal_Ptr (Integer_Address (Nbr_Dumped_Signals)); + Num := Nbr_Dumped_Signals; end if; - Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink))); + + -- Do the real job: write the signal number. + Wave_Put_ULEB128 (Ghdl_E32 (Num)); end Write_Signal_Number; procedure Foreach_Scalar_Signal_Number is new @@ -1370,13 +1387,18 @@ Table_Initial => 32, Table_Increment => 100); + function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is + begin + return Dump_Table.Table (N); + end Get_Dump_Entry; + procedure Write_Hierarchy (Root : VhpiHandleT) is N : Natural; begin - -- Check Flink is 0. + -- Check Alink is 0. for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flink /= null then + if Sig_Table.Table (I).Alink /= null then Internal_Error ("wave.write_hierarchy"); end if; end loop; @@ -1393,15 +1415,20 @@ Wave_Put_Byte (0); Dump_Table.Set_Last (Nbr_Dumped_Signals); + for I in Dump_Table.First .. Dump_Table.Last loop + Dump_Table.Table (I) := null; + end loop; -- Save and clear. - N := 0; for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flags.Is_Dumped then - N := N + 1; + N := Get_Signal_Number (Sig_Table.Table (I)); + if N /= 0 then + if Dump_Table.Table (N) /= null then + Internal_Error ("wave.write_hierarchy(2)"); + end if; Dump_Table.Table (N) := Sig_Table.Table (I); + Sig_Table.Table (I).Alink := null; end if; - Sig_Table.Table (I).Flink := null; end loop; end Write_Hierarchy; diff -urN ghdl-0.21/vhdl/ortho-lang.c ghdl-0.22dev/vhdl/ortho-lang.c --- ghdl-0.21/vhdl/ortho-lang.c 2005-12-10 12:04:40.000000000 +0100 +++ ghdl-0.22dev/vhdl/ortho-lang.c 2006-03-16 20:51:08.000000000 +0100 @@ -18,6 +18,8 @@ #include "tree-gimple.h" #include "function.h" #include "cgraph.h" +#include "target.h" +#include "convert.h" const int tree_identifier_size = sizeof (struct tree_identifier); @@ -494,6 +496,89 @@ } } +/* The following function has been copied and modified from c-convert.c. */ + +/* Change of width--truncation and extension of integers or reals-- + is represented with NOP_EXPR. Proper functioning of many things + assumes that no other conversions can be NOP_EXPRs. + + Conversion between integer and pointer is represented with CONVERT_EXPR. + Converting integer to real uses FLOAT_EXPR + and real to integer uses FIX_TRUNC_EXPR. + + Here is a list of all the functions that assume that widening and + narrowing is always done with a NOP_EXPR: + In convert.c, convert_to_integer. + In c-typeck.c, build_binary_op (boolean ops), and + c_common_truthvalue_conversion. + In expr.c: expand_expr, for operands of a MULT_EXPR. + In fold-const.c: fold. + In tree.c: get_narrower and get_unwidened. */ + +/* Subroutines of `convert'. */ + + + +/* Create an expression whose value is that of EXPR, + converted to type TYPE. The TREE_TYPE of the value + is always TYPE. This function implements all reasonable + conversions; callers should filter out those that are + not permitted by the language being compiled. */ + +tree +convert (tree type, tree expr) +{ + tree e = expr; + enum tree_code code = TREE_CODE (type); + const char *invalid_conv_diag; + + if (type == error_mark_node + || expr == error_mark_node + || TREE_TYPE (expr) == error_mark_node) + return error_mark_node; + + if ((invalid_conv_diag + = targetm.invalid_conversion (TREE_TYPE (expr), type))) + { + error (invalid_conv_diag); + return error_mark_node; + } + + if (type == TREE_TYPE (expr)) + return expr; + + if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (TREE_TYPE (expr))) + return fold_build1 (NOP_EXPR, type, expr); + if (TREE_CODE (TREE_TYPE (expr)) == ERROR_MARK) + return error_mark_node; + if (TREE_CODE (TREE_TYPE (expr)) == VOID_TYPE || code == VOID_TYPE) + { + abort (); + return error_mark_node; + } + if (code == INTEGER_TYPE || code == ENUMERAL_TYPE) + return fold (convert_to_integer (type, e)); + if (code == BOOLEAN_TYPE) + { + tree t = ortho_truthvalue_conversion (expr); + if (TREE_CODE (t) == ERROR_MARK) + return t; + + /* If it returns a NOP_EXPR, we must fold it here to avoid + infinite recursion between fold () and convert (). */ + if (TREE_CODE (t) == NOP_EXPR) + return fold_build1 (NOP_EXPR, type, TREE_OPERAND (t, 0)); + else + return fold_build1 (NOP_EXPR, type, t); + } + if (code == POINTER_TYPE || code == REFERENCE_TYPE) + return fold (convert_to_pointer (type, e)); + if (code == REAL_TYPE) + return fold (convert_to_real (type, e)); + + abort (); +} + /* Return a definition for a builtin function named NAME and whose data type is TYPE. TYPE should be a function type with argument types. FUNCTION_CODE tells later passes how to compile calls to this function. @@ -603,8 +688,6 @@ #define LANG_HOOKS_POST_OPTIONS ortho_post_options #undef LANG_HOOKS_HONOR_READONLY #define LANG_HOOKS_HONOR_READONLY true -#undef LANG_HOOKS_TRUTHVALUE_CONVERSION -#define LANG_HOOKS_TRUTHVALUE_CONVERSION ortho_truthvalue_conversion #undef LANG_HOOKS_MARK_ADDRESSABLE #define LANG_HOOKS_MARK_ADDRESSABLE ortho_mark_addressable #undef LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION @@ -1234,7 +1317,7 @@ void finish_record_aggr (struct o_record_aggr_list *list, tree *res) { - *res = build_constructor (list->atype, list->chain.first); + *res = build_constructor_from_list (list->atype, list->chain.first); } @@ -1260,18 +1343,16 @@ void finish_array_aggr (struct o_array_aggr_list *list, tree *res) { - *res = build_constructor (list->atype, list->chain.first); + *res = build_constructor_from_list (list->atype, list->chain.first); } tree new_union_aggr (tree atype, tree field, tree value) { - tree el; tree res; - el = build_tree_list (field, value); - res = build_constructor (atype, el); + res = build_constructor_single (atype, field, value); TREE_CONSTANT (res) = 1; return res; } diff -urN ghdl-0.21/vhdl/parse.adb ghdl-0.22dev/vhdl/parse.adb --- ghdl-0.21/vhdl/parse.adb 2005-12-17 07:18:00.000000000 +0100 +++ ghdl-0.22dev/vhdl/parse.adb 2006-03-16 20:51:10.000000000 +0100 @@ -3540,7 +3540,7 @@ Set_Location (Res); Set_Expression (Res, Parse_Expression); - Expect (Tok_Select, "after expression"); + Expect (Tok_Select, "'select' expected after expression"); Scan.Scan; if Current_Token = Tok_Left_Paren then Target := Parse_Aggregate; @@ -3556,13 +3556,13 @@ Build_Init (Last); loop Wf_Chain := Parse_Waveform; - Expect (Tok_When, "after waveform"); + Expect (Tok_When, "'when' expected after waveform"); Scan.Scan; Assoc := Parse_Choices (Null_Iir); Set_Associated (Assoc, Wf_Chain); Append_Subchain (Last, Res, Assoc); exit when Current_Token = Tok_Semi_Colon; - Expect (Tok_Comma, "after choice"); + Expect (Tok_Comma, "',' (comma) expected after choice"); Scan.Scan; end loop; return Res; diff -urN ghdl-0.21/vhdl/sem_assocs.adb ghdl-0.22dev/vhdl/sem_assocs.adb --- ghdl-0.21/vhdl/sem_assocs.adb 2005-10-08 14:45:00.000000000 +0200 +++ ghdl-0.22dev/vhdl/sem_assocs.adb 2006-03-16 20:51:10.000000000 +0100 @@ -551,7 +551,7 @@ exit when Index_Type = Null_Iir; Chain := Get_Individual_Association_Chain (Assoc); Sem_Choices_Range - (Chain, Index_Type, True, Get_Location (Assoc), Low, High); + (Chain, Index_Type, False, Get_Location (Assoc), Low, High); Set_Individual_Association_Chain (Assoc, Chain); end loop; end Finish_Individual_Assoc_Array_Subtype; diff -urN ghdl-0.21/vhdl/sem_expr.adb ghdl-0.22dev/vhdl/sem_expr.adb --- ghdl-0.21/vhdl/sem_expr.adb 2005-12-17 07:13:37.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_expr.adb 2006-03-16 20:51:10.000000000 +0100 @@ -2278,6 +2278,7 @@ Lb := Low; Hb := High; end if; + -- Checks all values between POS and POS_MAX are handled. Pos := Eval_Pos (Lb); Pos_Max := Eval_Pos (Hb); if Pos > Pos_Max then diff -urN ghdl-0.21/vhdl/sem_names.adb ghdl-0.22dev/vhdl/sem_names.adb --- ghdl-0.21/vhdl/sem_names.adb 2005-12-11 14:50:31.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_names.adb 2006-03-16 20:51:10.000000000 +0100 @@ -1974,7 +1974,8 @@ Error_Msg_Sem ("function name is a procedure", Name); when Iir_Kind_Process_Statement - | Iir_Kind_Component_Declaration => + | Iir_Kind_Component_Declaration + | Iir_Kind_Type_Conversion => Error_Msg_Sem (Disp_Node (Prefix) & " cannot be indexed or sliced", Name); Res := Null_Iir; diff -urN ghdl-0.21/vhdl/translation.adb ghdl-0.22dev/vhdl/translation.adb --- ghdl-0.21/vhdl/translation.adb 2005-12-10 12:11:41.000000000 +0100 +++ ghdl-0.22dev/vhdl/translation.adb 2006-03-16 20:51:05.000000000 +0100 @@ -1,5 +1,5 @@ -- Iir to ortho translator. --- Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold +-- Copyright (C) 2002, 2003, 2004, 2005, 2006 Tristan Gingold -- -- GHDL 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 @@ -1797,15 +1797,13 @@ -- Check bounds length of L match bounds length of R. -- If L_TYPE (resp. R_TYPE) is not a thin array, then L_NODE - -- (resp. R_NODE) are not used (and may be o_lnode_null). + -- (resp. R_NODE) are not used (and may be Mnode_Null). -- If L_TYPE (resp. T_TYPE) is a fat array, then L_NODE (resp. R_NODE) - -- must be a variable pointing to the array. + -- must designate the array. procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir); -- Create a subtype range to be stored into the location pointed by @@ -8412,10 +8410,19 @@ return True; end Need_Range_Check; - procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) + procedure Check_Range_Low (Value : O_Dnode; Atype : Iir) is If_Blk : O_If_Block; begin + Open_Temp; + Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); + Chap6.Gen_Bound_Error (Null_Iir); + Finish_If_Stmt (If_Blk); + Close_Temp; + end Check_Range_Low; + + procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) is + begin if not Need_Range_Check (Expr, Atype) then return; end if; @@ -8428,20 +8435,14 @@ Chap6.Gen_Bound_Error (Expr); end if; else - Open_Temp; - Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); - Chap6.Gen_Bound_Error (Null_Iir); - Finish_If_Stmt (If_Blk); - Close_Temp; + Check_Range_Low (Value, Atype); end if; end Check_Range; procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir) is L_Tinfo, R_Tinfo : Type_Info_Acc; @@ -8491,10 +8492,10 @@ exit when Index = Null_Iir; Sub_Cond := New_Compare_Op (ON_Neq, - Chap6.Get_Array_Ptr_Bound_Length (L_Node, L_Type, - I + 1, L_Mode), - Chap6.Get_Array_Ptr_Bound_Length (R_Node, R_Type, - I + 1, R_Mode), + M2E (Range_To_Length + (Get_Array_Range (L_Node, L_Type, I + 1))), + M2E (Range_To_Length + (Get_Array_Range (R_Node, R_Type, I + 1))), Ghdl_Bool_Type); if I = 0 then Cond := Sub_Cond; @@ -10081,8 +10082,8 @@ New_Assign_Stmt (Get_Var (Alias_Info.Alias_Var), New_Value (M2Lp (Chap3.Get_Array_Base (Name_Node)))); - Chap3.Check_Array_Match (Decl_Type, O_Lnode_Null, Kind, - Name_Type, M2Lp (Name_Node), Kind, + Chap3.Check_Array_Match (Decl_Type, T2M (Decl_Type, Kind), + Name_Type, Name_Node, Decl); Close_Temp; when Type_Mode_Scalar => @@ -11691,6 +11692,16 @@ end; end if; + if Get_Kind (Formal_Type) in Iir_Kinds_Array_Type_Definition + then + -- Check length matches. + Stabilize (Formal_Node); + Stabilize (Actual_Node); + Chap3.Check_Array_Match (Formal_Type, Formal_Node, + Actual_Type, Actual_Node, + Assoc); + end if; + Data := (Actual_Node => Actual_Node, Actual_Type => Actual_Type, Mode => Mode, @@ -14420,8 +14431,8 @@ E := Create_Temp_Init (T_Info.Ortho_Ptr_Type (Mode_Value), Val); Chap3.Check_Array_Match - (Target_Type, M2Lp (T), Mode_Value, - Get_Type (Expr), New_Obj (E), Mode_Value, + (Target_Type, T, + Get_Type (Expr), Dp2M (E, T_Info, Mode_Value), Null_Iir); Chap3.Translate_Object_Copy (T, New_Obj_Value (E), Target_Type); @@ -15169,9 +15180,10 @@ begin E := Create_Temp_Init (Expr_Info.Ortho_Ptr_Type (Mode_Value), Expr); - Chap3.Check_Array_Match (Res_Type, O_Lnode_Null, Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, T2M (Res_Type, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); return New_Convert_Ov (New_Value (Chap3.Get_Array_Ptr_Base_Ptr (New_Obj (E), Expr_Type, Mode_Value)), @@ -15199,9 +15211,10 @@ Chap3.Get_Array_Bounds_Ptr (O_Lnode_Null, Expr_Type, Mode_Value)); -- Check array match. - Chap3.Check_Array_Match (Res_Type, New_Obj (Res), Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, Dv2M (Res, Res_Info, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); Close_Temp; return New_Address (New_Obj (Res), Res_Info.Ortho_Ptr_Type (Mode_Value)); @@ -22283,19 +22296,58 @@ function Translate_Val_Attribute (Attr : Iir) return O_Enode is - T : O_Dnode; - Prefix : Iir; - Ttype : O_Tnode; + Val : O_Enode; + Attr_Type : Iir; + Res_Var : O_Dnode; + Res_Type : O_Tnode; begin - Prefix := Get_Type (Attr); - Ttype := Get_Ortho_Type (Prefix, Mode_Value); - T := Create_Temp (Ttype); - New_Assign_Stmt - (New_Obj (T), - New_Convert_Ov (Chap7.Translate_Expression (Get_Parameter (Attr)), - Ttype)); - Chap3.Check_Range (T, Attr, Get_Type (Get_Prefix (Attr))); - return New_Obj_Value (T); + Attr_Type := Get_Type (Attr); + Res_Type := Get_Ortho_Type (Attr_Type, Mode_Value); + Res_Var := Create_Temp (Res_Type); + Val := Chap7.Translate_Expression (Get_Parameter (Attr)); + + case Get_Kind (Attr_Type) is + when Iir_Kind_Enumeration_Type_Definition + | Iir_Kind_Enumeration_Subtype_Definition => + -- For enumeration, always check the value is in the enum + -- range. + declare + Val_Type : O_Tnode; + Val_Var : O_Dnode; + If_Blk : O_If_Block; + begin + Val_Type := Get_Ortho_Type (Get_Type (Get_Parameter (Attr)), + Mode_Value); + Val_Var := Create_Temp_Init (Val_Type, Val); + Start_If_Stmt + (If_Blk, + New_Dyadic_Op + (ON_Or, + New_Compare_Op (ON_Lt, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, 0)), + Ghdl_Bool_Type), + New_Compare_Op (ON_Ge, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, + Integer_64 + (Get_Nbr_Elements + (Get_Enumeration_Literal_List + (Attr_Type))))), + Ghdl_Bool_Type))); + Chap6.Gen_Bound_Error (Attr); + Finish_If_Stmt (If_Blk); + Val := New_Obj_Value (Val_Var); + end; + when others => + null; + end case; + + New_Assign_Stmt (New_Obj (Res_Var), New_Convert_Ov (Val, Res_Type)); + Chap3.Check_Range (Res_Var, Attr, Get_Type (Get_Prefix (Attr))); + return New_Obj_Value (Res_Var); end Translate_Val_Attribute; function Translate_Pos_Attribute (Attr : Iir; Res_Type : Iir) diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads --- ghdl-0.21/vhdl/version.ads 2005-12-18 14:07:38.000000000 +0100 +++ ghdl-0.22dev/vhdl/version.ads 2006-03-16 20:51:10.000000000 +0100 @@ -1,4 +1,4 @@ package Version is Ghdl_Version : constant String := - "GHDL 0.21 (20051218) [Sokcho edition]"; + "GHDL 0.22dev (20051220) [Sokcho edition]"; end Version; Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ghdl.spec 6 Mar 2006 14:50:41 -0000 1.10 +++ ghdl.spec 16 Mar 2006 22:33:48 -0000 1.11 @@ -1,10 +1,10 @@ -%define gccver 4.0.2 +%define gccver 4.1.0 %define ghdlver 0.21 Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.40svn.0%{?dist} +Release: 0.49svn.0%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -14,7 +14,7 @@ # ./dist.sh sources Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2 -Patch0: ghdl-svn40.patch +Patch0: ghdl-svn49.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo Requires(post): /sbin/install-info @@ -215,6 +215,9 @@ %{_libexecdir}/gcc/ %changelog +* Thu Mar 16 2006 Thomas Sailer - 0.22-0.49svn.0 +- update to svn49, using gcc 4.1.0 + * Mon Mar 6 2006 Thomas Sailer - 0.22-0.40svn.0 - update to svn40, to fix an array bounds checking bug apparently introduced in svn39 From fedora-extras-commits at redhat.com Thu Mar 16 22:51:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 16 Mar 2006 17:51:29 -0500 Subject: rpms/scons/devel .cvsignore, 1.2, 1.3 scons.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200603162252.k2GMq1ns009397@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/scons/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9370/devel Modified Files: .cvsignore scons.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scons/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:19:08 -0000 1.2 +++ .cvsignore 16 Mar 2006 22:51:29 -0000 1.3 @@ -1 +1 @@ -scons-0.96.tar.gz +scons-0.96.1.tar.gz Index: scons.spec =================================================================== RCS file: /cvs/extras/rpms/scons/devel/scons.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scons.spec 17 Feb 2006 21:39:32 -0000 1.6 +++ scons.spec 16 Mar 2006 22:51:29 -0000 1.7 @@ -1,6 +1,6 @@ Name: scons -Version: 0.96 -Release: 6%{?dist} +Version: 0.96.1 +Release: 1%{?dist} Summary: An Open Source software construction tool @@ -52,8 +52,8 @@ %{_mandir}/man*/* %changelog -* Fri Feb 17 2006 Gerard Milmeister - 0.96-6 -- Rebuild for Fedora Extras 5 +* Sat Jun 18 2005 Gerard Milmeister - 0.96.1-1 +- New Version 0.96.1 * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/scons/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:19:08 -0000 1.2 +++ sources 16 Mar 2006 22:51:29 -0000 1.3 @@ -1 +1 @@ -0c08161c77a4338fca58840bd87151f6 scons-0.96.tar.gz +45b1c346edd8a0970210aeb1e82557c9 scons-0.96.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 00:31:04 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 16 Mar 2006 19:31:04 -0500 Subject: rpms/qemu/FC-4 .cvsignore, 1.3, 1.4 qemu.spec, 1.6, 1.7 sources, 1.3, 1.4 qemu-0.7.0-gcc4-ppc.patch, 1.1, NONE qemu-0.7.0-gcc4-x86.patch, 1.1, NONE Message-ID: <200603170031.k2H0VjCh013635@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13614 Modified Files: .cvsignore qemu.spec sources Removed Files: qemu-0.7.0-gcc4-ppc.patch qemu-0.7.0-gcc4-x86.patch Log Message: Update to 0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Apr 2005 11:34:52 -0000 1.3 +++ .cvsignore 17 Mar 2006 00:31:03 -0000 1.4 @@ -1 +1 @@ -qemu-0.7.0.tar.gz +qemu-0.8.0.tar.gz Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qemu.spec 16 May 2005 09:39:10 -0000 1.6 +++ qemu.spec 17 Mar 2006 00:31:03 -0000 1.7 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.7.0 -Release: 2 +Version: 0.8.0 +Release: 1.%{?dist} License: GPL/LGPL Group: Development/Tools @@ -9,10 +9,8 @@ Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch -Patch1: qemu-0.7.0-gcc4-x86.patch -Patch2: qemu-0.7.0-gcc4-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: SDL-devel +BuildRequires: SDL-devel compat-gcc-32 PreReq: /sbin/chkconfig PreReq: /sbin/service ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64 @@ -36,11 +34,9 @@ %prep %setup -q %patch0 -p1 -%patch1 -p0 -%patch2 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M +./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa make %install @@ -78,11 +74,16 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog -* Mon May 16 2005 David Woodhouse .0.7.0-2 +* Fri Mar 17 2006 David Woodhouse 0.8.0-1 +- Update to 0.8.0 +- Resort to using compat-gcc-32 +- Enable ALSA + +* Mon May 16 2005 David Woodhouse 0.7.0-2 - Proper fix for GCC 4 putting 'blr' or 'ret' in the middle of the function, for i386, x86_64 and PPC. -* Sat Apr 30 2005 David Woodhouse .0.7.0-1 +* Sat Apr 30 2005 David Woodhouse 0.7.0-1 - Update to 0.7.0 - Fix dyngen for PPC functions which end in unconditional branch Index: sources =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Apr 2005 11:34:52 -0000 1.3 +++ sources 17 Mar 2006 00:31:03 -0000 1.4 @@ -1 +1 @@ -234e9ace03b00259bb57dc5a9c633056 qemu-0.7.0.tar.gz +eb175b26583280706fe7e4d8910d320d qemu-0.8.0.tar.gz --- qemu-0.7.0-gcc4-ppc.patch DELETED --- --- qemu-0.7.0-gcc4-x86.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 00:32:17 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 16 Mar 2006 19:32:17 -0500 Subject: rpms/qemu/FC-4 qemu.spec,1.7,1.8 Message-ID: <200603170032.k2H0Wn5g013678@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13664 Modified Files: qemu.spec Log Message: no dot before dist Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qemu.spec 17 Mar 2006 00:31:03 -0000 1.7 +++ qemu.spec 17 Mar 2006 00:32:16 -0000 1.8 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 1.%{?dist} +Release: 1%{?dist} License: GPL/LGPL Group: Development/Tools From fedora-extras-commits at redhat.com Fri Mar 17 00:34:39 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 16 Mar 2006 19:34:39 -0500 Subject: rpms/qemu/devel .cvsignore, 1.3, 1.4 qemu.spec, 1.6, 1.7 sources, 1.3, 1.4 qemu-0.7.0-gcc4-ppc.patch, 1.1, NONE qemu-0.7.0-gcc4-x86.patch, 1.1, NONE Message-ID: <200603170035.k2H0ZB5Q013748@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13723 Modified Files: .cvsignore qemu.spec sources Removed Files: qemu-0.7.0-gcc4-ppc.patch qemu-0.7.0-gcc4-x86.patch Log Message: Update to 0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Apr 2005 11:34:52 -0000 1.3 +++ .cvsignore 17 Mar 2006 00:34:39 -0000 1.4 @@ -1 +1 @@ -qemu-0.7.0.tar.gz +qemu-0.8.0.tar.gz Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qemu.spec 16 May 2005 09:39:10 -0000 1.6 +++ qemu.spec 17 Mar 2006 00:34:39 -0000 1.7 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.7.0 -Release: 2 +Version: 0.8.0 +Release: 1%{?dist} License: GPL/LGPL Group: Development/Tools @@ -9,10 +9,8 @@ Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch -Patch1: qemu-0.7.0-gcc4-x86.patch -Patch2: qemu-0.7.0-gcc4-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: SDL-devel +BuildRequires: SDL-devel compat-gcc-32 PreReq: /sbin/chkconfig PreReq: /sbin/service ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64 @@ -36,11 +34,9 @@ %prep %setup -q %patch0 -p1 -%patch1 -p0 -%patch2 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M +./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa make %install @@ -78,11 +74,16 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog -* Mon May 16 2005 David Woodhouse .0.7.0-2 +* Fri Mar 17 2006 David Woodhouse 0.8.0-1 +- Update to 0.8.0 +- Resort to using compat-gcc-32 +- Enable ALSA + +* Mon May 16 2005 David Woodhouse 0.7.0-2 - Proper fix for GCC 4 putting 'blr' or 'ret' in the middle of the function, for i386, x86_64 and PPC. -* Sat Apr 30 2005 David Woodhouse .0.7.0-1 +* Sat Apr 30 2005 David Woodhouse 0.7.0-1 - Update to 0.7.0 - Fix dyngen for PPC functions which end in unconditional branch Index: sources =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Apr 2005 11:34:52 -0000 1.3 +++ sources 17 Mar 2006 00:34:39 -0000 1.4 @@ -1 +1 @@ -234e9ace03b00259bb57dc5a9c633056 qemu-0.7.0.tar.gz +eb175b26583280706fe7e4d8910d320d qemu-0.8.0.tar.gz --- qemu-0.7.0-gcc4-ppc.patch DELETED --- --- qemu-0.7.0-gcc4-x86.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 00:35:33 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 16 Mar 2006 19:35:33 -0500 Subject: rpms/qemu/FC-5 .cvsignore, 1.3, 1.4 qemu.spec, 1.6, 1.7 sources, 1.3, 1.4 qemu-0.7.0-gcc4-ppc.patch, 1.1, NONE qemu-0.7.0-gcc4-x86.patch, 1.1, NONE Message-ID: <200603170036.k2H0a54G013831@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13751 Modified Files: .cvsignore qemu.spec sources Removed Files: qemu-0.7.0-gcc4-ppc.patch qemu-0.7.0-gcc4-x86.patch Log Message: Update to 0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Apr 2005 11:34:52 -0000 1.3 +++ .cvsignore 17 Mar 2006 00:35:32 -0000 1.4 @@ -1 +1 @@ -qemu-0.7.0.tar.gz +qemu-0.8.0.tar.gz Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qemu.spec 16 May 2005 09:39:10 -0000 1.6 +++ qemu.spec 17 Mar 2006 00:35:32 -0000 1.7 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.7.0 -Release: 2 +Version: 0.8.0 +Release: 1%{?dist} License: GPL/LGPL Group: Development/Tools @@ -9,10 +9,8 @@ Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch -Patch1: qemu-0.7.0-gcc4-x86.patch -Patch2: qemu-0.7.0-gcc4-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: SDL-devel +BuildRequires: SDL-devel compat-gcc-32 PreReq: /sbin/chkconfig PreReq: /sbin/service ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64 @@ -36,11 +34,9 @@ %prep %setup -q %patch0 -p1 -%patch1 -p0 -%patch2 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M +./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa make %install @@ -78,11 +74,16 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog -* Mon May 16 2005 David Woodhouse .0.7.0-2 +* Fri Mar 17 2006 David Woodhouse 0.8.0-1 +- Update to 0.8.0 +- Resort to using compat-gcc-32 +- Enable ALSA + +* Mon May 16 2005 David Woodhouse 0.7.0-2 - Proper fix for GCC 4 putting 'blr' or 'ret' in the middle of the function, for i386, x86_64 and PPC. -* Sat Apr 30 2005 David Woodhouse .0.7.0-1 +* Sat Apr 30 2005 David Woodhouse 0.7.0-1 - Update to 0.7.0 - Fix dyngen for PPC functions which end in unconditional branch Index: sources =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Apr 2005 11:34:52 -0000 1.3 +++ sources 17 Mar 2006 00:35:32 -0000 1.4 @@ -1 +1 @@ -234e9ace03b00259bb57dc5a9c633056 qemu-0.7.0.tar.gz +eb175b26583280706fe7e4d8910d320d qemu-0.8.0.tar.gz --- qemu-0.7.0-gcc4-ppc.patch DELETED --- --- qemu-0.7.0-gcc4-x86.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 00:37:51 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 16 Mar 2006 19:37:51 -0500 Subject: rpms/python-myghty/devel .cvsignore, 1.5, 1.6 python-myghty.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200603170038.k2H0cdcf013923@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-myghty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13885 Modified Files: .cvsignore python-myghty.spec sources Log Message: - 1.0.1; build requires python-setuptools Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-myghty/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 Jan 2006 07:17:19 -0000 1.5 +++ .cvsignore 17 Mar 2006 00:37:51 -0000 1.6 @@ -1 +1 @@ -Myghty-1.0.tar.gz +Myghty-1.0.1.tar.gz Index: python-myghty.spec =================================================================== RCS file: /cvs/extras/rpms/python-myghty/devel/python-myghty.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-myghty.spec 26 Jan 2006 07:17:19 -0000 1.5 +++ python-myghty.spec 17 Mar 2006 00:37:51 -0000 1.6 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-myghty -Version: 1.0 +Version: 1.0.1 Release: 1%{?dist} Summary: A Python-based templating system derived from HTML::Mason @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python +BuildRequires: python-setuptools %description Myghty is a Python based web and templating framework originally based on @@ -48,6 +48,9 @@ %changelog +* Thu Mar 16 2006 Luke Macken 1.0.1-1 +- 1.0.1; build requires python-setuptools + * Wed Jan 04 2006 Luke Macken 1.0-1 - 1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-myghty/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 26 Jan 2006 07:17:19 -0000 1.5 +++ sources 17 Mar 2006 00:37:51 -0000 1.6 @@ -1 +1 @@ -4329dea233683c2e073036ea48f23fd8 Myghty-1.0.tar.gz +82b2a05f421b2b81cae716ccde74dce1 Myghty-1.0.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 00:38:16 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 16 Mar 2006 19:38:16 -0500 Subject: rpms/qemu/FC-5 qemu.spec,1.7,1.8 Message-ID: <200603170038.k2H0cmH5013926@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13904 Modified Files: qemu.spec Log Message: bump release Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qemu.spec 17 Mar 2006 00:35:32 -0000 1.7 +++ qemu.spec 17 Mar 2006 00:38:15 -0000 1.8 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 1%{?dist} +Release: 1.1%{?dist} License: GPL/LGPL Group: Development/Tools @@ -74,6 +74,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Fri Mar 17 2006 David Woodhouse 0.8.0-1.1 +- Bump release to work around accidental .fc5 tag in -devel branch + * Fri Mar 17 2006 David Woodhouse 0.8.0-1 - Update to 0.8.0 - Resort to using compat-gcc-32 From fedora-extras-commits at redhat.com Fri Mar 17 01:01:43 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 16 Mar 2006 20:01:43 -0500 Subject: rpms/naim/devel .cvsignore, 1.5, 1.6 naim.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603170102.k2H12FrG016051@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16016 Modified Files: .cvsignore naim.spec sources Log Message: naim-0.11.8.2-2006-02-28-2047 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/naim/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Feb 2006 22:22:42 -0000 1.5 +++ .cvsignore 17 Mar 2006 01:01:43 -0000 1.6 @@ -1 +1 @@ -naim-0.11.8.2-2006-01-29-1935.tar.bz2 +naim-0.11.8.2-2006-02-28-2047.tar.bz2 Index: naim.spec =================================================================== RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- naim.spec 19 Feb 2006 02:11:32 -0000 1.8 +++ naim.spec 17 Mar 2006 01:01:43 -0000 1.9 @@ -1,4 +1,4 @@ -%define snapshot 2006-01-29-1935 +%define snapshot 2006-02-28-2047 Name: naim Version: 0.11.8.2 @@ -40,6 +40,9 @@ %{_mandir}/*/* %changelog +* Thu Mar 16 2006 Luke Macken 0.11.8.2-3 +- 2006-02-28-2047 development snapshot + * Sat Feb 18 2006 Luke Macken 0.11.8.2-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/naim/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Feb 2006 22:22:42 -0000 1.5 +++ sources 17 Mar 2006 01:01:43 -0000 1.6 @@ -1 +1 @@ -e03200205b6ffaff8baa790b0b22a7bc naim-0.11.8.2-2006-01-29-1935.tar.bz2 +6e4f551a4bc784b889a0368e0aa2a0a3 naim-0.11.8.2-2006-02-28-2047.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 17 01:16:59 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 16 Mar 2006 20:16:59 -0500 Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.20,1.21 Message-ID: <200603170117.k2H1HV8F016251@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/xchat-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16209 Modified Files: xchat-gnome.spec Log Message: * Thu Mar 16 2006 Brian Pepple - 0.10-4 - Rebuild for new libsexy. Index: xchat-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xchat-gnome.spec 25 Feb 2006 17:42:09 -0000 1.20 +++ xchat-gnome.spec 17 Mar 2006 01:16:59 -0000 1.21 @@ -3,7 +3,7 @@ Name: xchat-gnome Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -137,6 +137,9 @@ %changelog +* Thu Mar 16 2006 Brian Pepple - 0.10-4 +- Rebuild for new libsexy. + * Sat Feb 25 2006 Brian Pepple - 0.10-3 - Add libnotify patch to work with 0.3.0 api. From fedora-extras-commits at redhat.com Fri Mar 17 01:19:16 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 16 Mar 2006 20:19:16 -0500 Subject: rpms/xchat-gnome/FC-5 xchat-gnome.spec,1.20,1.21 Message-ID: <200603170119.k2H1JmIQ016346@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/xchat-gnome/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16329 Modified Files: xchat-gnome.spec Log Message: * Thu Mar 16 2006 Brian Pepple - 0.10-4 - Rebuild for new libsexy. Index: xchat-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/xchat-gnome/FC-5/xchat-gnome.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xchat-gnome.spec 25 Feb 2006 17:42:09 -0000 1.20 +++ xchat-gnome.spec 17 Mar 2006 01:19:16 -0000 1.21 @@ -3,7 +3,7 @@ Name: xchat-gnome Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -137,6 +137,9 @@ %changelog +* Thu Mar 16 2006 Brian Pepple - 0.10-4 +- Rebuild for new libsexy. + * Sat Feb 25 2006 Brian Pepple - 0.10-3 - Add libnotify patch to work with 0.3.0 api. From fedora-extras-commits at redhat.com Fri Mar 17 06:48:05 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 17 Mar 2006 01:48:05 -0500 Subject: rpms/mercurial/FC-5 mercurial.spec,1.7,1.8 Message-ID: <200603170648.k2H6mbB1027176@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27157 Modified Files: mercurial.spec Log Message: rebuild to test the buildsys Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-5/mercurial.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mercurial.spec 17 Feb 2006 20:05:53 -0000 1.7 +++ mercurial.spec 17 Mar 2006 06:48:05 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -34,6 +34,9 @@ %changelog +* Fri Mar 17 2006 Jeremy Katz - 0.8-3 +- rebuild + * Fri Feb 17 2006 Jeremy Katz - 0.8-2 - rebuild From fedora-extras-commits at redhat.com Fri Mar 17 07:02:33 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 17 Mar 2006 02:02:33 -0500 Subject: rpms/mercurial/devel mercurial.spec,1.7,1.8 Message-ID: <200603170703.k2H736GH029204@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29187 Modified Files: mercurial.spec Log Message: rebuild to test the buildsys Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mercurial.spec 17 Feb 2006 20:05:53 -0000 1.7 +++ mercurial.spec 17 Mar 2006 07:02:33 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -34,6 +34,9 @@ %changelog +* Fri Mar 17 2006 Jeremy Katz - 0.8-3 +- rebuild + * Fri Feb 17 2006 Jeremy Katz - 0.8-2 - rebuild From fedora-extras-commits at redhat.com Fri Mar 17 07:28:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 02:28:47 -0500 Subject: rpms/lirc-kmod/devel lirc-kmod.spec,1.5,1.6 Message-ID: <200603170729.k2H7TJHX029385@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29366 Modified Files: lirc-kmod.spec Log Message: * Fri Mar 17 2006 Ville Skytt?? - 0.8.0-5 - Drop the ppc64* experiment. Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lirc-kmod.spec 15 Mar 2006 19:55:56 -0000 1.5 +++ lirc-kmod.spec 17 Mar 2006 07:28:47 -0000 1.6 @@ -27,7 +27,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 4.%(echo %{kverrel} | tr - _) +Release: 5.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -39,7 +39,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # ExclusiveArch to assist the FE build system. -ExclusiveArch: i586 i686 x86_64 ppc ppc64 ppc64iseries +ExclusiveArch: i586 i686 x86_64 ppc %description LIRC is a package that allows you to decode and send infra-red and @@ -116,6 +116,9 @@ %changelog +* Fri Mar 17 2006 Ville Skytt?? - 0.8.0-5 +- Drop the ppc64* experiment. + * Wed Mar 15 2006 Ville Skytt?? - 0.8.0-4 - Add ppc64 and ppc64iseries while waiting for #185387. From fedora-extras-commits at redhat.com Fri Mar 17 07:33:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 02:33:45 -0500 Subject: rpms/lirc-kmod/FC-5 lirc-kmod.spec,1.5,1.6 Message-ID: <200603170734.k2H7YHqH029463@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29446 Modified Files: lirc-kmod.spec Log Message: * Fri Mar 17 2006 Ville Skytt?? - 0.8.0-5 - Drop the ppc64* experiment. Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/lirc-kmod.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lirc-kmod.spec 15 Mar 2006 19:55:56 -0000 1.5 +++ lirc-kmod.spec 17 Mar 2006 07:33:45 -0000 1.6 @@ -27,7 +27,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 4.%(echo %{kverrel} | tr - _) +Release: 5.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -39,7 +39,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # ExclusiveArch to assist the FE build system. -ExclusiveArch: i586 i686 x86_64 ppc ppc64 ppc64iseries +ExclusiveArch: i586 i686 x86_64 ppc %description LIRC is a package that allows you to decode and send infra-red and @@ -116,6 +116,9 @@ %changelog +* Fri Mar 17 2006 Ville Skytt?? - 0.8.0-5 +- Drop the ppc64* experiment. + * Wed Mar 15 2006 Ville Skytt?? - 0.8.0-4 - Add ppc64 and ppc64iseries while waiting for #185387. From fedora-extras-commits at redhat.com Fri Mar 17 07:46:56 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 02:46:56 -0500 Subject: extras-buildsys/utils extras-push-all, 1.1, 1.2 extras-repobuild.py, 1.10, 1.11 extras-repoview.py, 1.1, 1.2 extras-sign-move.py, 1.6, 1.7 Message-ID: <200603170746.k2H7kuSH029569@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29545 Modified Files: extras-push-all extras-repobuild.py extras-repoview.py extras-sign-move.py Log Message: Update for FE5, keep only one latest package in devel. Index: extras-push-all =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-all,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- extras-push-all 22 Jan 2006 10:51:45 -0000 1.1 +++ extras-push-all 17 Mar 2006 07:46:49 -0000 1.2 @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -dists="3 4 development" +dists="3 4 5 development" changed= sign_move() Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- extras-repobuild.py 21 Jan 2006 18:18:51 -0000 1.10 +++ extras-repobuild.py 17 Mar 2006 07:46:49 -0000 1.11 @@ -29,8 +29,10 @@ cachedir = '/tmp/repomd-cache' compsname = 'comps.xml' archdict = {'3':['x86_64', 'i386'], + '4':['ppc','x86_64', 'i386'], + '5':['ppc','x86_64', 'i386'], 'development':['ppc','x86_64','i386'], - '4':['ppc','x86_64', 'i386']} + } ts = rpmUtils.transaction.initReadOnlyTransaction() @@ -50,7 +52,7 @@ sys.exit(result) -def do_repo_stuff(repodir): +def do_repo_stuff(repodir, keep=2): compspath = os.path.join(repodir, compsname) rpdata = os.path.join(repodir, 'repodata') debugprint('removing tree %s' % rpdata) @@ -59,8 +61,8 @@ if os.path.exists(rpdata): shutil.rmtree(rpdata) print 'processing: %s' % repodir - print 'Cleaning up older packages' - cmd = '/usr/bin/repomanage -k2 -o %s | xargs rm -f' % (repodir) + print 'Cleaning up older packages (keeping %d latest)' % (keep) + cmd = '/usr/bin/repomanage -k%d -o %s | xargs rm -f' % (keep, repodir) run_and_check(cmd) print 'Creating repository metadata' @@ -92,15 +94,16 @@ sys.exit(1) distdir = 'fedora-%s-extras' % dist destdir = os.path.join(treedir, dist) + keep = (dist == 'development') and 1 or 2 print "Making Repository Metadata" - do_repo_stuff(os.path.join(destdir, 'SRPMS')) + do_repo_stuff(os.path.join(destdir, 'SRPMS'), keep) # arch repo creation for arch in archdict[dist]: repodir = os.path.join(destdir, arch) - do_repo_stuff(repodir) + do_repo_stuff(repodir, keep) if __name__ == '__main__': me = os.getcwd() Index: extras-repoview.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repoview.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- extras-repoview.py 21 Jan 2006 18:18:51 -0000 1.1 +++ extras-repoview.py 17 Mar 2006 07:46:49 -0000 1.2 @@ -23,8 +23,10 @@ treedir = '/rpmbuild/extras/tree/extras' archdict = {'3':['x86_64', 'i386'], + '4':['ppc','x86_64', 'i386'], + '5':['ppc','x86_64', 'i386'], 'development':['ppc','x86_64','i386'], - '4':['ppc','x86_64', 'i386']} + } DEBUG = False Index: extras-sign-move.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- extras-sign-move.py 21 Jan 2006 18:18:51 -0000 1.6 +++ extras-sign-move.py 17 Mar 2006 07:46:49 -0000 1.7 @@ -36,9 +36,10 @@ cachedir = '/tmp/repomd-cache' compsname = 'comps.xml' archdict = {'3':['x86_64', 'i386'], - 'development':['ppc','x86_64','i386'], '4':['ppc','x86_64', 'i386'], - '5':['ppc','x86_64', 'i386']} + '5':['ppc','x86_64', 'i386'], + 'development':['ppc','x86_64','i386'], + } ts = rpmUtils.transaction.initReadOnlyTransaction() From fedora-extras-commits at redhat.com Fri Mar 17 08:36:49 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 17 Mar 2006 03:36:49 -0500 Subject: rpms/scons/FC-5 .cvsignore,1.2,1.3 scons.spec,1.6,1.7 Message-ID: <200603170837.k2H8bL4g031799@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/scons/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31769 Modified Files: .cvsignore scons.spec Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scons/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:19:08 -0000 1.2 +++ .cvsignore 17 Mar 2006 08:36:49 -0000 1.3 @@ -1 +1 @@ -scons-0.96.tar.gz +scons-0.96.1.tar.gz Index: scons.spec =================================================================== RCS file: /cvs/extras/rpms/scons/FC-5/scons.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scons.spec 17 Feb 2006 21:39:32 -0000 1.6 +++ scons.spec 17 Mar 2006 08:36:49 -0000 1.7 @@ -1,6 +1,6 @@ Name: scons -Version: 0.96 -Release: 6%{?dist} +Version: 0.96.1 +Release: 1%{?dist} Summary: An Open Source software construction tool @@ -52,8 +52,8 @@ %{_mandir}/man*/* %changelog -* Fri Feb 17 2006 Gerard Milmeister - 0.96-6 -- Rebuild for Fedora Extras 5 +* Sat Jun 18 2005 Gerard Milmeister - 0.96.1-1 +- New Version 0.96.1 * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Fri Mar 17 08:37:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 17 Mar 2006 03:37:33 -0500 Subject: rpms/scons/FC-5 sources,1.2,1.3 Message-ID: <200603170838.k2H8c6GU031829@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/scons/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31806 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/scons/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:19:08 -0000 1.2 +++ sources 17 Mar 2006 08:37:33 -0000 1.3 @@ -1 +1 @@ -0c08161c77a4338fca58840bd87151f6 scons-0.96.tar.gz +45b1c346edd8a0970210aeb1e82557c9 scons-0.96.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 08:39:03 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 17 Mar 2006 03:39:03 -0500 Subject: rpms/scons/FC-5 scons.spec,1.7,1.8 Message-ID: <200603170839.k2H8dZrZ031891@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/scons/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31871 Modified Files: scons.spec Log Message: Index: scons.spec =================================================================== RCS file: /cvs/extras/rpms/scons/FC-5/scons.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scons.spec 17 Mar 2006 08:36:49 -0000 1.7 +++ scons.spec 17 Mar 2006 08:39:03 -0000 1.8 @@ -1,6 +1,6 @@ Name: scons Version: 0.96.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An Open Source software construction tool From fedora-extras-commits at redhat.com Fri Mar 17 10:07:07 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 05:07:07 -0500 Subject: rpms/qemu/devel qemu-0.7.0-build.patch,1.1,1.2 qemu.spec,1.7,1.8 Message-ID: <200603171007.k2HA7erx004089@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4061 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: Fix i386 build qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu-0.7.0-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-0.7.0-build.patch 30 Apr 2005 11:34:52 -0000 1.1 +++ qemu-0.7.0-build.patch 17 Mar 2006 10:07:05 -0000 1.2 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall ++OP_CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qemu.spec 17 Mar 2006 00:34:39 -0000 1.7 +++ qemu.spec 17 Mar 2006 10:07:05 -0000 1.8 @@ -74,6 +74,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Fri Mar 17 2006 David Woodhouse 0.8.0-2 +- Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it + * Fri Mar 17 2006 David Woodhouse 0.8.0-1 - Update to 0.8.0 - Resort to using compat-gcc-32 From fedora-extras-commits at redhat.com Fri Mar 17 10:08:48 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 05:08:48 -0500 Subject: rpms/qemu/FC-4 qemu-0.7.0-build.patch,1.1,1.2 qemu.spec,1.8,1.9 Message-ID: <200603171009.k2HA9LDW004124@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4097 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: Fix i386 build qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu-0.7.0-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-0.7.0-build.patch 30 Apr 2005 11:34:52 -0000 1.1 +++ qemu-0.7.0-build.patch 17 Mar 2006 10:08:47 -0000 1.2 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall ++OP_CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qemu.spec 17 Mar 2006 00:32:16 -0000 1.8 +++ qemu.spec 17 Mar 2006 10:08:47 -0000 1.9 @@ -74,6 +74,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Fri Mar 17 2006 David Woodhouse 0.8.0-2 +- Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it + * Fri Mar 17 2006 David Woodhouse 0.8.0-1 - Update to 0.8.0 - Resort to using compat-gcc-32 From fedora-extras-commits at redhat.com Fri Mar 17 10:10:00 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 05:10:00 -0500 Subject: rpms/qemu/FC-4 qemu.spec,1.9,1.10 Message-ID: <200603171010.k2HAAXQL004171@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4154 Modified Files: qemu.spec Log Message: actually change the release Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- qemu.spec 17 Mar 2006 10:08:47 -0000 1.9 +++ qemu.spec 17 Mar 2006 10:10:00 -0000 1.10 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL Group: Development/Tools From fedora-extras-commits at redhat.com Fri Mar 17 10:24:47 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 05:24:47 -0500 Subject: rpms/qemu/FC-4 qemu-0.7.0-build.patch,1.2,1.3 Message-ID: <200603171025.k2HAPLlP004302@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4274 Modified Files: qemu-0.7.0-build.patch Log Message: use -mcpu for x86_64 too qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu-0.7.0-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qemu-0.7.0-build.patch 17 Mar 2006 10:08:47 -0000 1.2 +++ qemu-0.7.0-build.patch 17 Mar 2006 10:24:42 -0000 1.3 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall ++OP_CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld From fedora-extras-commits at redhat.com Fri Mar 17 10:58:02 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 05:58:02 -0500 Subject: rpms/multisync/FC-4 multisync-tool.patch, NONE, 1.1 multisync.spec, 1.1, 1.2 Message-ID: <200603171058.k2HAwY20004453@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397/FC-4 Modified Files: multisync.spec Added Files: multisync-tool.patch Log Message: - fix #185631 multisync-tool.patch: --- NEW FILE multisync-tool.patch --- --- multisync-0.90.18/tools/msynctool.c.editor 2005-11-06 16:14:21.000000000 +0200 +++ multisync-0.90.18/tools/msynctool.c 2005-11-12 12:48:18.570791944 +0200 @@ -509,7 +509,7 @@ static osync_bool configure(OSyncEnv *os char *editcmd = g_strdup_printf("%s %s", editor, tmpfile); if (system(editcmd)) { editcmd = g_strdup_printf("vi %s", tmpfile); - if (system("editcmd")) { + if (system(editcmd)) { osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to open editor. Aborting"); g_free(editcmd); goto error_free_tmp; Index: multisync.spec =================================================================== RCS file: /cvs/extras/rpms/multisync/FC-4/multisync.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multisync.spec 13 Mar 2006 09:11:47 -0000 1.1 +++ multisync.spec 17 Mar 2006 10:58:01 -0000 1.2 @@ -1,6 +1,6 @@ Name: multisync Version: 0.90.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Calendar (and other PIM data) synchronization program Group: Applications/Communications @@ -13,6 +13,7 @@ # this is svn151 with a few fixes Patch1: multisync-gui-svn151.patch Patch2: multisync-werror.patch +Patch3: multisync-tool.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel @@ -41,6 +42,7 @@ %patch0 %patch1 %patch2 +%patch3 -p1 %build # both don't like smp flags so disable them for now @@ -89,6 +91,10 @@ %{_datadir}/applications/*desktop %changelog +* Fri Mar 17 2006 Andreas Bierfert +0.90.18-5 +- fix #185631 + * Wed Mar 01 2006 Andreas Bierfert 0.90.18-4 - fix segfaulting binary From fedora-extras-commits at redhat.com Fri Mar 17 10:58:08 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 05:58:08 -0500 Subject: rpms/multisync/FC-5 multisync-tool.patch, NONE, 1.1 multisync.spec, 1.1, 1.2 Message-ID: <200603171058.k2HAweaq004456@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397/FC-5 Modified Files: multisync.spec Added Files: multisync-tool.patch Log Message: - fix #185631 multisync-tool.patch: --- NEW FILE multisync-tool.patch --- --- multisync-0.90.18/tools/msynctool.c.editor 2005-11-06 16:14:21.000000000 +0200 +++ multisync-0.90.18/tools/msynctool.c 2005-11-12 12:48:18.570791944 +0200 @@ -509,7 +509,7 @@ static osync_bool configure(OSyncEnv *os char *editcmd = g_strdup_printf("%s %s", editor, tmpfile); if (system(editcmd)) { editcmd = g_strdup_printf("vi %s", tmpfile); - if (system("editcmd")) { + if (system(editcmd)) { osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to open editor. Aborting"); g_free(editcmd); goto error_free_tmp; Index: multisync.spec =================================================================== RCS file: /cvs/extras/rpms/multisync/FC-5/multisync.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multisync.spec 13 Mar 2006 09:11:47 -0000 1.1 +++ multisync.spec 17 Mar 2006 10:58:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: multisync Version: 0.90.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Calendar (and other PIM data) synchronization program Group: Applications/Communications @@ -13,6 +13,7 @@ # this is svn151 with a few fixes Patch1: multisync-gui-svn151.patch Patch2: multisync-werror.patch +Patch3: multisync-tool.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel @@ -41,6 +42,7 @@ %patch0 %patch1 %patch2 +%patch3 -p1 %build # both don't like smp flags so disable them for now @@ -89,6 +91,10 @@ %{_datadir}/applications/*desktop %changelog +* Fri Mar 17 2006 Andreas Bierfert +0.90.18-5 +- fix #185631 + * Wed Mar 01 2006 Andreas Bierfert 0.90.18-4 - fix segfaulting binary From fedora-extras-commits at redhat.com Fri Mar 17 10:58:14 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 05:58:14 -0500 Subject: rpms/multisync/devel multisync-tool.patch, NONE, 1.1 multisync.spec, 1.1, 1.2 Message-ID: <200603171058.k2HAwkHl004459@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397/devel Modified Files: multisync.spec Added Files: multisync-tool.patch Log Message: - fix #185631 multisync-tool.patch: --- NEW FILE multisync-tool.patch --- --- multisync-0.90.18/tools/msynctool.c.editor 2005-11-06 16:14:21.000000000 +0200 +++ multisync-0.90.18/tools/msynctool.c 2005-11-12 12:48:18.570791944 +0200 @@ -509,7 +509,7 @@ static osync_bool configure(OSyncEnv *os char *editcmd = g_strdup_printf("%s %s", editor, tmpfile); if (system(editcmd)) { editcmd = g_strdup_printf("vi %s", tmpfile); - if (system("editcmd")) { + if (system(editcmd)) { osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to open editor. Aborting"); g_free(editcmd); goto error_free_tmp; Index: multisync.spec =================================================================== RCS file: /cvs/extras/rpms/multisync/devel/multisync.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multisync.spec 13 Mar 2006 09:11:47 -0000 1.1 +++ multisync.spec 17 Mar 2006 10:58:13 -0000 1.2 @@ -1,6 +1,6 @@ Name: multisync Version: 0.90.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Calendar (and other PIM data) synchronization program Group: Applications/Communications @@ -13,6 +13,7 @@ # this is svn151 with a few fixes Patch1: multisync-gui-svn151.patch Patch2: multisync-werror.patch +Patch3: multisync-tool.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel @@ -41,6 +42,7 @@ %patch0 %patch1 %patch2 +%patch3 -p1 %build # both don't like smp flags so disable them for now @@ -89,6 +91,10 @@ %{_datadir}/applications/*desktop %changelog +* Fri Mar 17 2006 Andreas Bierfert +0.90.18-5 +- fix #185631 + * Wed Mar 01 2006 Andreas Bierfert 0.90.18-4 - fix segfaulting binary From fedora-extras-commits at redhat.com Fri Mar 17 11:13:29 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 06:13:29 -0500 Subject: rpms/qemu/FC-4 qemu.spec,1.10,1.11 Message-ID: <200603171114.k2HBEEjx006545@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6528 Modified Files: qemu.spec Log Message: Fix x86_64 too Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qemu.spec 17 Mar 2006 10:10:00 -0000 1.10 +++ qemu.spec 17 Mar 2006 11:13:27 -0000 1.11 @@ -1,12 +1,12 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL/LGPL Group: Development/Tools URL: http://fabrice.bellard.free.fr/qemu -Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz +Source0: http://www.qemu.org/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -36,7 +36,11 @@ %patch0 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa +./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 %install @@ -74,6 +78,10 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Fri Mar 17 2006 David Woodhouse 0.8.0-3 +- Use -mcpu= instead of -mtune= on x86_64 too +- Disable SPARC targets on x86_64, because dyngen doesn't like fnegs + * Fri Mar 17 2006 David Woodhouse 0.8.0-2 - Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it From fedora-extras-commits at redhat.com Fri Mar 17 12:49:49 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 07:49:49 -0500 Subject: rpms/rkhunter/FC-1 rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.3, 1.4 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603171250.k2HCoL0v008812@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8790 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-1/rkhunter.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rkhunter.spec 11 Mar 2006 19:57:00 -0000 1.3 +++ rkhunter.spec 17 Mar 2006 12:49:48 -0000 1.4 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 12:52:55 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 07:52:55 -0500 Subject: rpms/rkhunter/FC-2 rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.3, 1.4 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603171253.k2HCrS0h008849@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8831 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-2/rkhunter.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rkhunter.spec 11 Mar 2006 20:51:42 -0000 1.3 +++ rkhunter.spec 17 Mar 2006 12:52:55 -0000 1.4 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 12:55:11 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 07:55:11 -0500 Subject: rpms/rkhunter/FC-3 rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.5, 1.6 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603171255.k2HCti9p008881@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8863 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-3/rkhunter.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rkhunter.spec 11 Mar 2006 20:57:35 -0000 1.5 +++ rkhunter.spec 17 Mar 2006 12:55:11 -0000 1.6 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 12:58:54 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 07:58:54 -0500 Subject: rpms/rkhunter/FC-4 rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.7, 1.8 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603171259.k2HCxQFq008976@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8924 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-4/rkhunter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rkhunter.spec 11 Mar 2006 21:02:45 -0000 1.7 +++ rkhunter.spec 17 Mar 2006 12:58:54 -0000 1.8 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:01:00 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 08:01:00 -0500 Subject: rpms/rkhunter/devel rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.7, 1.8 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603171301.k2HD1WcA010910@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9022 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rkhunter.spec 11 Mar 2006 21:08:16 -0000 1.7 +++ rkhunter.spec 17 Mar 2006 13:01:00 -0000 1.8 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:24:42 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:24:42 -0500 Subject: rpms/wine/FC-3 .cvsignore, 1.9, 1.10 sources, 1.10, 1.11 wine.spec, 1.13, 1.14 wine-20050524-generated.patch, 1.1, NONE Message-ID: <200603171325.k2HDPFs6011148@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074/FC-3 Modified Files: .cvsignore sources wine.spec Removed Files: wine-20050524-generated.patch Log Message: - version upgrade - drop ancient fonts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 3 Mar 2006 09:16:26 -0000 1.9 +++ .cvsignore 17 Mar 2006 13:24:42 -0000 1.10 @@ -1,2 +1 @@ -wine-fonts-20050524.tar.gz -wine-0.9.9-fe.tar.bz2 +wine-0.9.10-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 3 Mar 2006 09:16:26 -0000 1.10 +++ sources 17 Mar 2006 13:24:42 -0000 1.11 @@ -1,2 +1 @@ -fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 +054e71983834d777be3271f63f8484d6 wine-0.9.10-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wine.spec 3 Mar 2006 09:16:26 -0000 1.13 +++ wine.spec 17 Mar 2006 13:24:42 -0000 1.14 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,6 @@ # special fedora tarball without winemp3 stuff Source0: wine-0.9.9-fe.tar.bz2 Source1: wine.init -Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora Source4: wine-32.conf Source100: wine-notepad.desktop @@ -19,7 +18,6 @@ Source104: wine-winefile.desktop Source105: wine-winemine.desktop Source106: wine-winhelp.desktop -Patch2: wine-20050524-generated.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} @@ -180,10 +178,6 @@ mkdir -p %{buildroot}%{_initrddir} install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine -# Install Wine's fonts -mkdir -p %{buildroot}%{_datadir}/fonts/wine -tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine - desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ @@ -537,48 +531,7 @@ %{_libdir}/wine/wtsapi32.dll.so %{_libdir}/wine/security.dll.so %{_libdir}/wine/sfc.dll.so -%dir %{_datadir}/fonts/wine -%{_datadir}/fonts/wine/wine_coure.fon -%{_datadir}/fonts/wine/wine_couree.fon -%{_datadir}/fonts/wine/wine_courer.fon -%{_datadir}/fonts/wine/wine_marlett.ttf -%{_datadir}/fonts/wine/wine_sserife.fon -%{_datadir}/fonts/wine/wine_sserifee.fon -%{_datadir}/fonts/wine/wine_sserifer.fon -%{_datadir}/fonts/wine/wine_vgasys.fon -%{_datadir}/fonts/wine/wine_vgasyse.fon -%{_datadir}/fonts/wine/wine_vgasysr.fon -%{_datadir}/fonts/wine/coue1255.fon -%{_datadir}/fonts/wine/coue1256.fon -%{_datadir}/fonts/wine/coue1257.fon -%{_datadir}/fonts/wine/coure.fon -%{_datadir}/fonts/wine/couree.fon -%{_datadir}/fonts/wine/coureg.fon -%{_datadir}/fonts/wine/courer.fon -%{_datadir}/fonts/wine/couret.fon -%{_datadir}/fonts/wine/cvgasys.fon -%{_datadir}/fonts/wine/hvgasys.fon -%{_datadir}/fonts/wine/jvgasys.fon -%{_datadir}/fonts/wine/marlett.ttf -%{_datadir}/fonts/wine/ssee1255.fon -%{_datadir}/fonts/wine/ssee1256.fon -%{_datadir}/fonts/wine/ssee1257.fon -%{_datadir}/fonts/wine/ssee874.fon -%{_datadir}/fonts/wine/sserife.fon -%{_datadir}/fonts/wine/sserifee.fon -%{_datadir}/fonts/wine/sserifeg.fon -%{_datadir}/fonts/wine/sserifer.fon -%{_datadir}/fonts/wine/sserifet.fon -%{_datadir}/fonts/wine/svgasys.fon -%{_datadir}/fonts/wine/vgas1255.fon -%{_datadir}/fonts/wine/vgas1256.fon -%{_datadir}/fonts/wine/vgas1257.fon -%{_datadir}/fonts/wine/vgas874.fon -%{_datadir}/fonts/wine/vgasys.fon -%{_datadir}/fonts/wine/vgasyse.fon -%{_datadir}/fonts/wine/vgasysg.fon -%{_datadir}/fonts/wine/vgasysr.fon -%{_datadir}/fonts/wine/vgasyst.fon +%{_datadir}/wine/fonts/ %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so %{_libdir}/wine/wineps16.drv16 @@ -683,6 +636,11 @@ %{_libdir}/wine/*.def %changelog +* Fri Mar 17 2006 Andreas Bierfert 0.9.9-1 - version upgrade --- wine-20050524-generated.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:24:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:24:49 -0500 Subject: rpms/wine/FC-4 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 wine.spec, 1.15, 1.16 wine-20050524-generated.patch, 1.1, NONE Message-ID: <200603171325.k2HDPLEb011153@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074/FC-4 Modified Files: .cvsignore sources wine.spec Removed Files: wine-20050524-generated.patch Log Message: - version upgrade - drop ancient fonts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 3 Mar 2006 09:16:35 -0000 1.10 +++ .cvsignore 17 Mar 2006 13:24:48 -0000 1.11 @@ -1,2 +1 @@ -wine-fonts-20050524.tar.gz -wine-0.9.9-fe.tar.bz2 +wine-0.9.10-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Mar 2006 09:16:35 -0000 1.11 +++ sources 17 Mar 2006 13:24:48 -0000 1.12 @@ -1,2 +1 @@ -fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 +054e71983834d777be3271f63f8484d6 wine-0.9.10-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- wine.spec 3 Mar 2006 09:16:35 -0000 1.15 +++ wine.spec 17 Mar 2006 13:24:48 -0000 1.16 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,6 @@ # special fedora tarball without winemp3 stuff Source0: wine-0.9.9-fe.tar.bz2 Source1: wine.init -Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora Source4: wine-32.conf Source100: wine-notepad.desktop @@ -19,7 +18,6 @@ Source104: wine-winefile.desktop Source105: wine-winemine.desktop Source106: wine-winhelp.desktop -Patch2: wine-20050524-generated.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} @@ -180,10 +178,6 @@ mkdir -p %{buildroot}%{_initrddir} install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine -# Install Wine's fonts -mkdir -p %{buildroot}%{_datadir}/fonts/wine -tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine - desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ @@ -537,48 +531,7 @@ %{_libdir}/wine/wtsapi32.dll.so %{_libdir}/wine/security.dll.so %{_libdir}/wine/sfc.dll.so -%dir %{_datadir}/fonts/wine -%{_datadir}/fonts/wine/wine_coure.fon -%{_datadir}/fonts/wine/wine_couree.fon -%{_datadir}/fonts/wine/wine_courer.fon -%{_datadir}/fonts/wine/wine_marlett.ttf -%{_datadir}/fonts/wine/wine_sserife.fon -%{_datadir}/fonts/wine/wine_sserifee.fon -%{_datadir}/fonts/wine/wine_sserifer.fon -%{_datadir}/fonts/wine/wine_vgasys.fon -%{_datadir}/fonts/wine/wine_vgasyse.fon -%{_datadir}/fonts/wine/wine_vgasysr.fon -%{_datadir}/fonts/wine/coue1255.fon -%{_datadir}/fonts/wine/coue1256.fon -%{_datadir}/fonts/wine/coue1257.fon -%{_datadir}/fonts/wine/coure.fon -%{_datadir}/fonts/wine/couree.fon -%{_datadir}/fonts/wine/coureg.fon -%{_datadir}/fonts/wine/courer.fon -%{_datadir}/fonts/wine/couret.fon -%{_datadir}/fonts/wine/cvgasys.fon -%{_datadir}/fonts/wine/hvgasys.fon -%{_datadir}/fonts/wine/jvgasys.fon -%{_datadir}/fonts/wine/marlett.ttf -%{_datadir}/fonts/wine/ssee1255.fon -%{_datadir}/fonts/wine/ssee1256.fon -%{_datadir}/fonts/wine/ssee1257.fon -%{_datadir}/fonts/wine/ssee874.fon -%{_datadir}/fonts/wine/sserife.fon -%{_datadir}/fonts/wine/sserifee.fon -%{_datadir}/fonts/wine/sserifeg.fon -%{_datadir}/fonts/wine/sserifer.fon -%{_datadir}/fonts/wine/sserifet.fon -%{_datadir}/fonts/wine/svgasys.fon -%{_datadir}/fonts/wine/vgas1255.fon -%{_datadir}/fonts/wine/vgas1256.fon -%{_datadir}/fonts/wine/vgas1257.fon -%{_datadir}/fonts/wine/vgas874.fon -%{_datadir}/fonts/wine/vgasys.fon -%{_datadir}/fonts/wine/vgasyse.fon -%{_datadir}/fonts/wine/vgasysg.fon -%{_datadir}/fonts/wine/vgasysr.fon -%{_datadir}/fonts/wine/vgasyst.fon +%{_datadir}/wine/fonts/ %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so %{_libdir}/wine/wineps16.drv16 @@ -683,6 +636,11 @@ %{_libdir}/wine/*.def %changelog +* Fri Mar 17 2006 Andreas Bierfert 0.9.9-1 - version upgrade --- wine-20050524-generated.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:24:54 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:24:54 -0500 Subject: rpms/wine/FC-5 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 wine.spec, 1.20, 1.21 wine-20050524-generated.patch, 1.1, NONE Message-ID: <200603171325.k2HDPRbd011158@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074/FC-5 Modified Files: .cvsignore sources wine.spec Removed Files: wine-20050524-generated.patch Log Message: - version upgrade - drop ancient fonts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 15 Mar 2006 21:59:45 -0000 1.11 +++ .cvsignore 17 Mar 2006 13:24:54 -0000 1.12 @@ -1,2 +1 @@ -wine-fonts-20050524.tar.gz wine-0.9.10-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 15 Mar 2006 21:59:45 -0000 1.12 +++ sources 17 Mar 2006 13:24:54 -0000 1.13 @@ -1,2 +1 @@ -fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz 054e71983834d777be3271f63f8484d6 wine-0.9.10-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- wine.spec 15 Mar 2006 21:59:45 -0000 1.20 +++ wine.spec 17 Mar 2006 13:24:54 -0000 1.21 @@ -11,7 +11,6 @@ # special fedora tarball without winemp3 stuff Source0: wine-0.9.10-fe.tar.bz2 Source1: wine.init -Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora Source4: wine-32.conf Source100: wine-notepad.desktop @@ -21,7 +20,6 @@ Source104: wine-winefile.desktop Source105: wine-winemine.desktop Source106: wine-winhelp.desktop -Patch2: wine-20050524-generated.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -158,8 +156,6 @@ %prep %setup -q -n %{name}-%{version}-fe -%patch2 -p1 -b .generated -autoconf %build export CFLAGS="$RPM_OPT_FLAGS" @@ -193,10 +189,6 @@ mkdir -p %{buildroot}%{_initrddir} install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine -# Install Wine's fonts -mkdir -p %{buildroot}%{_datadir}/fonts/wine -tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine - desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ @@ -550,48 +542,7 @@ %{_libdir}/wine/wtsapi32.dll.so %{_libdir}/wine/security.dll.so %{_libdir}/wine/sfc.dll.so -%dir %{_datadir}/fonts/wine -%{_datadir}/fonts/wine/wine_coure.fon -%{_datadir}/fonts/wine/wine_couree.fon -%{_datadir}/fonts/wine/wine_courer.fon -%{_datadir}/fonts/wine/wine_marlett.ttf -%{_datadir}/fonts/wine/wine_sserife.fon -%{_datadir}/fonts/wine/wine_sserifee.fon -%{_datadir}/fonts/wine/wine_sserifer.fon -%{_datadir}/fonts/wine/wine_vgasys.fon -%{_datadir}/fonts/wine/wine_vgasyse.fon -%{_datadir}/fonts/wine/wine_vgasysr.fon -%{_datadir}/fonts/wine/coue1255.fon -%{_datadir}/fonts/wine/coue1256.fon -%{_datadir}/fonts/wine/coue1257.fon -%{_datadir}/fonts/wine/coure.fon -%{_datadir}/fonts/wine/couree.fon -%{_datadir}/fonts/wine/coureg.fon -%{_datadir}/fonts/wine/courer.fon -%{_datadir}/fonts/wine/couret.fon -%{_datadir}/fonts/wine/cvgasys.fon -%{_datadir}/fonts/wine/hvgasys.fon -%{_datadir}/fonts/wine/jvgasys.fon -%{_datadir}/fonts/wine/marlett.ttf -%{_datadir}/fonts/wine/ssee1255.fon -%{_datadir}/fonts/wine/ssee1256.fon -%{_datadir}/fonts/wine/ssee1257.fon -%{_datadir}/fonts/wine/ssee874.fon -%{_datadir}/fonts/wine/sserife.fon -%{_datadir}/fonts/wine/sserifee.fon -%{_datadir}/fonts/wine/sserifeg.fon -%{_datadir}/fonts/wine/sserifer.fon -%{_datadir}/fonts/wine/sserifet.fon -%{_datadir}/fonts/wine/svgasys.fon -%{_datadir}/fonts/wine/vgas1255.fon -%{_datadir}/fonts/wine/vgas1256.fon -%{_datadir}/fonts/wine/vgas1257.fon -%{_datadir}/fonts/wine/vgas874.fon -%{_datadir}/fonts/wine/vgasys.fon -%{_datadir}/fonts/wine/vgasyse.fon -%{_datadir}/fonts/wine/vgasysg.fon -%{_datadir}/fonts/wine/vgasysr.fon -%{_datadir}/fonts/wine/vgasyst.fon +%{_datadir}/wine/fonts/ %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so %{_libdir}/wine/wineps16.drv16 @@ -696,6 +647,11 @@ %{_libdir}/wine/*.def %changelog +* Thu Mar 16 2006 Andreas Bierfert +0.9.10-1 +- version upgrade +- drop ancient extra fonts + * Fri Mar 03 2006 Andreas Bierfert 0.9.9-1 - version upgrade --- wine-20050524-generated.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:25:00 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:25:00 -0500 Subject: rpms/wine/devel .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 wine.spec, 1.20, 1.21 wine-20050524-generated.patch, 1.1, NONE Message-ID: <200603171325.k2HDPWGo011163@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074/devel Modified Files: .cvsignore sources wine.spec Removed Files: wine-20050524-generated.patch Log Message: - version upgrade - drop ancient fonts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 15 Mar 2006 21:59:45 -0000 1.11 +++ .cvsignore 17 Mar 2006 13:25:00 -0000 1.12 @@ -1,2 +1 @@ -wine-fonts-20050524.tar.gz wine-0.9.10-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 15 Mar 2006 21:59:45 -0000 1.12 +++ sources 17 Mar 2006 13:25:00 -0000 1.13 @@ -1,2 +1 @@ -fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz 054e71983834d777be3271f63f8484d6 wine-0.9.10-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- wine.spec 15 Mar 2006 21:59:45 -0000 1.20 +++ wine.spec 17 Mar 2006 13:25:00 -0000 1.21 @@ -11,7 +11,6 @@ # special fedora tarball without winemp3 stuff Source0: wine-0.9.10-fe.tar.bz2 Source1: wine.init -Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora Source4: wine-32.conf Source100: wine-notepad.desktop @@ -21,7 +20,6 @@ Source104: wine-winefile.desktop Source105: wine-winemine.desktop Source106: wine-winhelp.desktop -Patch2: wine-20050524-generated.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -158,8 +156,6 @@ %prep %setup -q -n %{name}-%{version}-fe -%patch2 -p1 -b .generated -autoconf %build export CFLAGS="$RPM_OPT_FLAGS" @@ -193,10 +189,6 @@ mkdir -p %{buildroot}%{_initrddir} install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine -# Install Wine's fonts -mkdir -p %{buildroot}%{_datadir}/fonts/wine -tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine - desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ @@ -550,48 +542,7 @@ %{_libdir}/wine/wtsapi32.dll.so %{_libdir}/wine/security.dll.so %{_libdir}/wine/sfc.dll.so -%dir %{_datadir}/fonts/wine -%{_datadir}/fonts/wine/wine_coure.fon -%{_datadir}/fonts/wine/wine_couree.fon -%{_datadir}/fonts/wine/wine_courer.fon -%{_datadir}/fonts/wine/wine_marlett.ttf -%{_datadir}/fonts/wine/wine_sserife.fon -%{_datadir}/fonts/wine/wine_sserifee.fon -%{_datadir}/fonts/wine/wine_sserifer.fon -%{_datadir}/fonts/wine/wine_vgasys.fon -%{_datadir}/fonts/wine/wine_vgasyse.fon -%{_datadir}/fonts/wine/wine_vgasysr.fon -%{_datadir}/fonts/wine/coue1255.fon -%{_datadir}/fonts/wine/coue1256.fon -%{_datadir}/fonts/wine/coue1257.fon -%{_datadir}/fonts/wine/coure.fon -%{_datadir}/fonts/wine/couree.fon -%{_datadir}/fonts/wine/coureg.fon -%{_datadir}/fonts/wine/courer.fon -%{_datadir}/fonts/wine/couret.fon -%{_datadir}/fonts/wine/cvgasys.fon -%{_datadir}/fonts/wine/hvgasys.fon -%{_datadir}/fonts/wine/jvgasys.fon -%{_datadir}/fonts/wine/marlett.ttf -%{_datadir}/fonts/wine/ssee1255.fon -%{_datadir}/fonts/wine/ssee1256.fon -%{_datadir}/fonts/wine/ssee1257.fon -%{_datadir}/fonts/wine/ssee874.fon -%{_datadir}/fonts/wine/sserife.fon -%{_datadir}/fonts/wine/sserifee.fon -%{_datadir}/fonts/wine/sserifeg.fon -%{_datadir}/fonts/wine/sserifer.fon -%{_datadir}/fonts/wine/sserifet.fon -%{_datadir}/fonts/wine/svgasys.fon -%{_datadir}/fonts/wine/vgas1255.fon -%{_datadir}/fonts/wine/vgas1256.fon -%{_datadir}/fonts/wine/vgas1257.fon -%{_datadir}/fonts/wine/vgas874.fon -%{_datadir}/fonts/wine/vgasys.fon -%{_datadir}/fonts/wine/vgasyse.fon -%{_datadir}/fonts/wine/vgasysg.fon -%{_datadir}/fonts/wine/vgasysr.fon -%{_datadir}/fonts/wine/vgasyst.fon +%{_datadir}/wine/fonts/ %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so %{_libdir}/wine/wineps16.drv16 @@ -696,6 +647,11 @@ %{_libdir}/wine/*.def %changelog +* Thu Mar 16 2006 Andreas Bierfert +0.9.10-1 +- version upgrade +- drop ancient extra fonts + * Fri Mar 03 2006 Andreas Bierfert 0.9.9-1 - version upgrade --- wine-20050524-generated.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:28:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:28:49 -0500 Subject: rpms/wine/FC-3 wine.spec,1.14,1.15 Message-ID: <200603171329.k2HDTMN2011248@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11186/FC-3 Modified Files: wine.spec Log Message: - clean up BR Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- wine.spec 17 Mar 2006 13:24:42 -0000 1.14 +++ wine.spec 17 Mar 2006 13:28:49 -0000 1.15 @@ -22,7 +22,6 @@ ExclusiveArch: %{ix86} -BuildRequires: autoconf BuildRequires: bison BuildRequires: flex BuildRequires: alsa-lib-devel @@ -144,8 +143,6 @@ %prep %setup -q -n %{name}-%{version}-fe -%patch2 -p1 -b .generated -autoconf %build export CFLAGS="$RPM_OPT_FLAGS" From fedora-extras-commits at redhat.com Fri Mar 17 13:29:02 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:29:02 -0500 Subject: rpms/wine/FC-5 wine.spec,1.21,1.22 Message-ID: <200603171329.k2HDTZ5v011251@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11186/FC-5 Modified Files: wine.spec Log Message: - clean up BR Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- wine.spec 17 Mar 2006 13:24:54 -0000 1.21 +++ wine.spec 17 Mar 2006 13:29:02 -0000 1.22 @@ -25,7 +25,6 @@ ExclusiveArch: %{ix86} -BuildRequires: autoconf BuildRequires: bison BuildRequires: flex BuildRequires: alsa-lib-devel From fedora-extras-commits at redhat.com Fri Mar 17 13:29:08 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:29:08 -0500 Subject: rpms/wine/devel wine.spec,1.21,1.22 Message-ID: <200603171329.k2HDTeWj011255@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11186/devel Modified Files: wine.spec Log Message: - clean up BR Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- wine.spec 17 Mar 2006 13:25:00 -0000 1.21 +++ wine.spec 17 Mar 2006 13:29:08 -0000 1.22 @@ -25,7 +25,6 @@ ExclusiveArch: %{ix86} -BuildRequires: autoconf BuildRequires: bison BuildRequires: flex BuildRequires: alsa-lib-devel From fedora-extras-commits at redhat.com Fri Mar 17 13:28:56 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:28:56 -0500 Subject: rpms/wine/FC-4 wine.spec,1.16,1.17 Message-ID: <200603171329.k2HDTZZ2011252@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11186/FC-4 Modified Files: wine.spec Log Message: - clean up BR Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- wine.spec 17 Mar 2006 13:24:48 -0000 1.16 +++ wine.spec 17 Mar 2006 13:28:55 -0000 1.17 @@ -22,7 +22,6 @@ ExclusiveArch: %{ix86} -BuildRequires: autoconf BuildRequires: bison BuildRequires: flex BuildRequires: alsa-lib-devel @@ -144,8 +143,6 @@ %prep %setup -q -n %{name}-%{version}-fe -%patch2 -p1 -b .generated -autoconf %build export CFLAGS="$RPM_OPT_FLAGS" From fedora-extras-commits at redhat.com Fri Mar 17 13:51:45 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 17 Mar 2006 08:51:45 -0500 Subject: rpms/xfce4-xkb-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xfce4-xkb-plugin.spec, 1.4, 1.5 Message-ID: <200603171352.k2HDqIRQ011543@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11522 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Mar 2006 14:21:12 -0000 1.3 +++ .cvsignore 17 Mar 2006 13:51:45 -0000 1.4 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.3.tar.gz +xfce4-xkb-plugin-0.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Mar 2006 14:21:12 -0000 1.3 +++ sources 17 Mar 2006 13:51:45 -0000 1.4 @@ -1 +1 @@ -a23baec787ee6666e15a3c243fc14ec4 xfce4-xkb-plugin-0.3.3.tar.gz +06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xfce4-xkb-plugin.spec 10 Mar 2006 14:21:12 -0000 1.4 +++ xfce4-xkb-plugin.spec 17 Mar 2006 13:51:45 -0000 1.5 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -10,7 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel -BuildRequires: libXext-devel, libXpm-devel +# for modular X +%if "%{?fedora}" > "4" +BuildRequires: libXext-devel, libXpm-devel +%endif %description Xfce XKB layout switch plugin for the Xfce panel. It displays the current @@ -43,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 +- Update to 0.3.4. + * Fri Mar 10 2006 Christoph Wickert - 0.3.3-1 - Update to 0.3.3. From fedora-extras-commits at redhat.com Fri Mar 17 13:53:58 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 17 Mar 2006 08:53:58 -0500 Subject: rpms/xfce4-xkb-plugin/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xfce4-xkb-plugin.spec, 1.4, 1.5 Message-ID: <200603171354.k2HDsU9p011610@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11589 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Mar 2006 14:21:12 -0000 1.3 +++ .cvsignore 17 Mar 2006 13:53:57 -0000 1.4 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.3.tar.gz +xfce4-xkb-plugin-0.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Mar 2006 14:21:12 -0000 1.3 +++ sources 17 Mar 2006 13:53:57 -0000 1.4 @@ -1 +1 @@ -a23baec787ee6666e15a3c243fc14ec4 xfce4-xkb-plugin-0.3.3.tar.gz +06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/xfce4-xkb-plugin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xfce4-xkb-plugin.spec 10 Mar 2006 14:21:12 -0000 1.4 +++ xfce4-xkb-plugin.spec 17 Mar 2006 13:53:57 -0000 1.5 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -10,7 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel -BuildRequires: libXext-devel, libXpm-devel +# for modular X +%if "%{?fedora}" > "4" +BuildRequires: libXext-devel, libXpm-devel +%endif %description Xfce XKB layout switch plugin for the Xfce panel. It displays the current @@ -43,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 +- Update to 0.3.4. + * Fri Mar 10 2006 Christoph Wickert - 0.3.3-1 - Update to 0.3.3. From fedora-extras-commits at redhat.com Fri Mar 17 13:55:16 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 17 Mar 2006 08:55:16 -0500 Subject: rpms/xfce4-xkb-plugin/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xfce4-xkb-plugin.spec, 1.2, 1.3 Message-ID: <200603171355.k2HDtmDj011741@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11697 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Mar 2006 14:54:07 -0000 1.3 +++ .cvsignore 17 Mar 2006 13:55:15 -0000 1.4 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.3.tar.gz +xfce4-xkb-plugin-0.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Mar 2006 14:54:07 -0000 1.3 +++ sources 17 Mar 2006 13:55:15 -0000 1.4 @@ -1 +1 @@ -a23baec787ee6666e15a3c243fc14ec4 xfce4-xkb-plugin-0.3.3.tar.gz +06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/xfce4-xkb-plugin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xfce4-xkb-plugin.spec 10 Mar 2006 14:54:07 -0000 1.2 +++ xfce4-xkb-plugin.spec 17 Mar 2006 13:55:15 -0000 1.3 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -10,6 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel +# for modular X +%if "%{?fedora}" > "4" +BuildRequires: libXext-devel, libXpm-devel +%endif %description Xfce XKB layout switch plugin for the Xfce panel. It displays the current @@ -42,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 +- Update to 0.3.4. + * Fri Mar 10 2006 Christoph Wickert - 0.3.3-1 - Update to 0.3.3. From fedora-extras-commits at redhat.com Fri Mar 17 13:55:47 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:55:47 -0500 Subject: rpms/wine/FC-3 wine.spec,1.15,1.16 Message-ID: <200603171356.k2HDuJrc011775@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11725/FC-3 Modified Files: wine.spec Log Message: - forgot to change source Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- wine.spec 17 Mar 2006 13:28:49 -0000 1.15 +++ wine.spec 17 Mar 2006 13:55:47 -0000 1.16 @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.9-fe.tar.bz2 +Source0: wine-0.9.10-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf From fedora-extras-commits at redhat.com Fri Mar 17 13:55:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:55:53 -0500 Subject: rpms/wine/FC-4 wine.spec,1.17,1.18 Message-ID: <200603171356.k2HDuP4n011780@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11725/FC-4 Modified Files: wine.spec Log Message: - forgot to change source Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- wine.spec 17 Mar 2006 13:28:55 -0000 1.17 +++ wine.spec 17 Mar 2006 13:55:53 -0000 1.18 @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.9-fe.tar.bz2 +Source0: wine-0.9.10-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf From fedora-extras-commits at redhat.com Fri Mar 17 14:57:13 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 09:57:13 -0500 Subject: rpms/qemu/FC-5 qemu-0.7.0-build.patch,1.1,1.2 qemu.spec,1.8,1.9 Message-ID: <200603171457.k2HEvVgS014669@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14645 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: fix i386 and x86_64 builds qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu-0.7.0-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-0.7.0-build.patch 30 Apr 2005 11:34:52 -0000 1.1 +++ qemu-0.7.0-build.patch 17 Mar 2006 14:57:13 -0000 1.2 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall ++OP_CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qemu.spec 17 Mar 2006 00:38:15 -0000 1.8 +++ qemu.spec 17 Mar 2006 14:57:13 -0000 1.9 @@ -1,12 +1,12 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 1.1%{?dist} +Release: 3%{?dist} License: GPL/LGPL Group: Development/Tools URL: http://fabrice.bellard.free.fr/qemu -Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz +Source0: http://www.qemu.org/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -36,7 +36,11 @@ %patch0 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa +./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 %install @@ -74,8 +78,12 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog -* Fri Mar 17 2006 David Woodhouse 0.8.0-1.1 -- Bump release to work around accidental .fc5 tag in -devel branch +* Fri Mar 17 2006 David Woodhouse 0.8.0-3 +- Use -mcpu= instead of -mtune= on x86_64 too +- Disable SPARC targets on x86_64, because dyngen doesn't like fnegs + +* Fri Mar 17 2006 David Woodhouse 0.8.0-2 +- Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it * Fri Mar 17 2006 David Woodhouse 0.8.0-1 - Update to 0.8.0 From fedora-extras-commits at redhat.com Fri Mar 17 14:58:10 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 09:58:10 -0500 Subject: rpms/qemu/devel qemu-0.7.0-build.patch,1.2,1.3 qemu.spec,1.8,1.9 Message-ID: <200603171458.k2HEwgVA014736@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14710 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: fix i386 and x86_64 builds qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu-0.7.0-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qemu-0.7.0-build.patch 17 Mar 2006 10:07:05 -0000 1.2 +++ qemu-0.7.0-build.patch 17 Mar 2006 14:58:09 -0000 1.3 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall ++OP_CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qemu.spec 17 Mar 2006 10:07:05 -0000 1.8 +++ qemu.spec 17 Mar 2006 14:58:09 -0000 1.9 @@ -1,12 +1,12 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL/LGPL Group: Development/Tools URL: http://fabrice.bellard.free.fr/qemu -Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz +Source0: http://www.qemu.org/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -36,7 +36,11 @@ %patch0 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa +./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 %install @@ -74,6 +78,10 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Fri Mar 17 2006 David Woodhouse 0.8.0-3 +- Use -mcpu= instead of -mtune= on x86_64 too +- Disable SPARC targets on x86_64, because dyngen doesn't like fnegs + * Fri Mar 17 2006 David Woodhouse 0.8.0-2 - Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it From fedora-extras-commits at redhat.com Fri Mar 17 15:58:12 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 10:58:12 -0500 Subject: rpms/libshout/devel libshout.spec,1.10,1.11 Message-ID: <200603171558.k2HFwiAo017106@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17085 Modified Files: libshout.spec Log Message: rebuild again Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/devel/libshout.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libshout.spec 10 Mar 2006 15:48:41 -0000 1.10 +++ libshout.spec 17 Mar 2006 15:58:11 -0000 1.11 @@ -79,10 +79,6 @@ - new (incompatible) version, but deps are updated - various cleanups -* Sun Mar 05 2006 Thomas Vander Stichele -- 1.0.9-5 -- rebuild - * Sun May 22 2005 Jeremy Katz - 1.0.9-4 - rebuild on all arches From fedora-extras-commits at redhat.com Fri Mar 17 16:01:09 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 11:01:09 -0500 Subject: rpms/libshout/FC-5 libshout.spec,1.10,1.11 Message-ID: <200603171601.k2HG1fxv019107@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18035 Modified Files: libshout.spec Log Message: rebuild Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-5/libshout.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libshout.spec 10 Mar 2006 15:48:41 -0000 1.10 +++ libshout.spec 17 Mar 2006 16:01:09 -0000 1.11 @@ -79,10 +79,6 @@ - new (incompatible) version, but deps are updated - various cleanups -* Sun Mar 05 2006 Thomas Vander Stichele -- 1.0.9-5 -- rebuild - * Sun May 22 2005 Jeremy Katz - 1.0.9-4 - rebuild on all arches From fedora-extras-commits at redhat.com Fri Mar 17 16:25:24 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 17 Mar 2006 11:25:24 -0500 Subject: rpms/octave-forge/FC-4 .cvsignore, 1.5, 1.6 octave-forge.spec, 1.21, 1.22 sources, 1.5, 1.6 Message-ID: <200603171625.k2HGPvYx019272@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19251 Modified Files: .cvsignore octave-forge.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Jan 2006 16:00:43 -0000 1.5 +++ .cvsignore 17 Mar 2006 16:25:24 -0000 1.6 @@ -1 +1 @@ -octave-forge-2006.01.28.patched.tar.gz +octave-forge-2006.03.17.patched.tar.gz Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- octave-forge.spec 3 Feb 2006 17:12:03 -0000 1.21 +++ octave-forge.spec 17 Mar 2006 16:25:24 -0000 1.22 @@ -1,6 +1,6 @@ Name: octave-forge -Version: 2006.01.28 -Release: 2%{?dist} +Version: 2006.03.17 +Release: 1%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -15,7 +15,6 @@ ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version} ## rm -Rf octave-forge-%{version} Source0: %{name}-%{version}.patched.tar.gz -Patch0: octave-forge-2006.01.28.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: octave >= 2.1.69 ImageMagick @@ -33,7 +32,6 @@ %prep %setup -q -%patch0 -p0 %build @@ -67,6 +65,9 @@ %changelog +* Fri Mar 17 2006 Quentin Spencer 2001.03.17-1 +- New release. Remove old patch. + * Fri Feb 3 2006 Quentin Spencer 2001.01.28-2 - Patch to fix some files that were not installed. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Jan 2006 16:00:43 -0000 1.5 +++ sources 17 Mar 2006 16:25:24 -0000 1.6 @@ -1 +1 @@ -8192ee6bc3784e35180623592de4303f octave-forge-2006.01.28.patched.tar.gz +a1e76ab52fb9894586d6a7a0dc15e603 octave-forge-2006.03.17.patched.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 16:28:04 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 17 Mar 2006 11:28:04 -0500 Subject: rpms/octave-forge/FC-4 octave-forge-2006.01.28.patch,1.1,NONE Message-ID: <200603171628.k2HGS6vk019340@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19331 Removed Files: octave-forge-2006.01.28.patch Log Message: Remove old patches. --- octave-forge-2006.01.28.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 16:45:39 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 11:45:39 -0500 Subject: rpms/libshout/FC-5 libshout.spec,1.11,1.12 Message-ID: <200603171646.k2HGkBU7019542@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19520 Modified Files: libshout.spec Log Message: bump for rebuild Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-5/libshout.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libshout.spec 17 Mar 2006 16:01:09 -0000 1.11 +++ libshout.spec 17 Mar 2006 16:45:39 -0000 1.12 @@ -1,6 +1,6 @@ Name: libshout Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: icecast source streaming library Group: System Environment/Libraries @@ -74,6 +74,10 @@ %{_datadir}/aclocal/shout.m4 %changelog +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-2 +- rebuild to please the extras repository + * Fri Mar 10 2006 Thomas Vander Stichele - 2.2-1 - new (incompatible) version, but deps are updated From fedora-extras-commits at redhat.com Fri Mar 17 16:53:38 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 17 Mar 2006 11:53:38 -0500 Subject: rpms/octave-forge/FC-5 .cvsignore, 1.6, 1.7 octave-forge.spec, 1.20, 1.21 sources, 1.6, 1.7 octave-forge-2006.01.28.patch, 1.3, NONE Message-ID: <200603171654.k2HGsBFx019652@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19631 Modified Files: .cvsignore octave-forge.spec sources Removed Files: octave-forge-2006.01.28.patch Log Message: New release. Remove old patches. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Feb 2006 13:43:31 -0000 1.6 +++ .cvsignore 17 Mar 2006 16:53:38 -0000 1.7 @@ -1,2 +1 @@ -octave-forge-2006.01.28.patched.tar.gz -octave-forge-2006.01.28-fixed.patch.gz +octave-forge-2006.03.17.patched.tar.gz Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-5/octave-forge.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- octave-forge.spec 18 Feb 2006 06:46:36 -0000 1.20 +++ octave-forge.spec 17 Mar 2006 16:53:38 -0000 1.21 @@ -1,6 +1,6 @@ Name: octave-forge -Version: 2006.01.28 -Release: 5%{?dist} +Version: 2006.03.17 +Release: 1%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -15,8 +15,6 @@ ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version} ## rm -Rf octave-forge-%{version} Source0: %{name}-%{version}.patched.tar.gz -Patch0: %{name}-2006.01.28.patch -Patch1: %{name}-2006.01.28-fixed.patch.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: octave >= 2.9.4 ImageMagick @@ -34,11 +32,8 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 # The sparse matrix functions are in octave 2.9.x so don't install them touch main/sparse/NOINSTALL -chmod +x admin/octlink.sh %build export CPPFLAGS=-I%{_includedir}/netcdf-3 @@ -72,6 +67,9 @@ %changelog +* Fri Mar 17 2006 Quentin Spencer 2006.03.17-1 +- New release. Remove old patches. + * Sat Feb 18 2006 Quentin Spencer 2006.01.28-5 - Amend patch0 to correctly deal with 64-bit indexing. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Feb 2006 13:43:31 -0000 1.6 +++ sources 17 Mar 2006 16:53:38 -0000 1.7 @@ -1,2 +1 @@ -8192ee6bc3784e35180623592de4303f octave-forge-2006.01.28.patched.tar.gz -fb0c7cc8f4d759ef0de76c8218583a32 octave-forge-2006.01.28-fixed.patch.gz +a1e76ab52fb9894586d6a7a0dc15e603 octave-forge-2006.03.17.patched.tar.gz --- octave-forge-2006.01.28.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 17:52:25 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Fri, 17 Mar 2006 12:52:25 -0500 Subject: rpms/clearsilver/devel clearsilver.spec,1.3,1.4 Message-ID: <200603171752.k2HHqw95023436@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23380 Modified Files: clearsilver.spec Log Message: * Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 - fix for x86_64 Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/devel/clearsilver.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clearsilver.spec 13 Mar 2006 18:36:56 -0000 1.3 +++ clearsilver.spec 17 Mar 2006 17:52:25 -0000 1.4 @@ -2,7 +2,7 @@ Name: clearsilver Version: 0.10.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License @@ -81,6 +81,7 @@ %patch0 -p1 touch configure sed -i 's|/neo/opt/bin/python|%{__python}|' python/examples/*/*.py +sed -i 's|PYTHON_SITE = @PYTHON_SITE@|PYTHON_SITE = %{python_sitearch}|' rules.mk.in find python/examples -type f | xargs chmod -x %build @@ -162,6 +163,9 @@ %endif %changelog +* Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 +- fix for x86_64 + * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 From fedora-extras-commits at redhat.com Fri Mar 17 18:04:05 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:04:05 -0500 Subject: rpms/python-chm - New directory Message-ID: <200603171804.k2HI47Xe025958@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/python-chm Log Message: Directory /cvs/extras/rpms/python-chm added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 18:04:13 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:04:13 -0500 Subject: rpms/python-chm/devel - New directory Message-ID: <200603171804.k2HI4Fq1025973@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/python-chm/devel Log Message: Directory /cvs/extras/rpms/python-chm/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 18:04:48 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:04:48 -0500 Subject: rpms/python-chm Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603171804.k2HI4oqJ026007@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25995 Added Files: Makefile import.log Log Message: Setup of module python-chm --- NEW FILE Makefile --- # Top level Makefile for module python-chm all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 17 18:05:13 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:05:13 -0500 Subject: rpms/python-chm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603171805.k2HI5FrG026026@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25995/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-chm --- NEW 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 Mar 17 18:06:56 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:06:56 -0500 Subject: rpms/python-chm/devel python-chm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603171807.k2HI7Sxo026105@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26065/devel Modified Files: .cvsignore sources Added Files: python-chm.spec Log Message: auto-import python-chm-0.8.2-2 on branch devel from python-chm-0.8.2-2.src.rpm --- NEW FILE python-chm.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-chm Version: 0.8.2 Release: 2%{?dist} Summary: Python package for CHM files handling Group: Development/Languages License: GPL URL: http://gnochm.sourceforge.net/pychm.html Source0: http://dl.sf.net/gnochm/pychm-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: chmlib-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description The python chm package provides three modules, chm, chmlib and extra, which provide access to the API implemented by the C library chmlib and some additional classes and functions. They are used to access MS-ITSS encoded files - Compressed Html Help files (.chm). %prep %setup -q -n pychm-%{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 COPYING NEWS README %dir %{python_sitearch}/chm/ %{python_sitearch}/chm/*.py %{python_sitearch}/chm/*.pyc %{python_sitearch}/chm/*.so %ghost %{python_sitearch}/chm/*.pyo %changelog * Sun Mar 12 2006 Patrice Dumas 0.8.2-2 - Fedora Extras submission, loosely based on Dag. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-chm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Mar 2006 18:05:13 -0000 1.1 +++ .cvsignore 17 Mar 2006 18:06:56 -0000 1.2 @@ -0,0 +1 @@ +pychm-0.8.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-chm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Mar 2006 18:05:13 -0000 1.1 +++ sources 17 Mar 2006 18:06:56 -0000 1.2 @@ -0,0 +1 @@ +d1bc0d4d2d9f91aef5bf12ab0f92f0da pychm-0.8.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 18:06:29 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:06:29 -0500 Subject: rpms/python-chm import.log,1.1,1.2 Message-ID: <200603171807.k2HI7VO2026108@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26065 Modified Files: import.log Log Message: auto-import python-chm-0.8.2-2 on branch devel from python-chm-0.8.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-chm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Mar 2006 18:04:47 -0000 1.1 +++ import.log 17 Mar 2006 18:06:29 -0000 1.2 @@ -0,0 +1 @@ +python-chm-0_8_2-2:HEAD:python-chm-0.8.2-2.src.rpm:1142618750 From fedora-extras-commits at redhat.com Fri Mar 17 18:08:17 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Fri, 17 Mar 2006 13:08:17 -0500 Subject: rpms/clearsilver/FC-5 clearsilver.spec,1.3,1.4 Message-ID: <200603171808.k2HI8tPC026200@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26156 Modified Files: clearsilver.spec Log Message: * Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 - fix for x86_64 Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-5/clearsilver.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clearsilver.spec 13 Mar 2006 18:36:56 -0000 1.3 +++ clearsilver.spec 17 Mar 2006 18:08:17 -0000 1.4 @@ -2,7 +2,7 @@ Name: clearsilver Version: 0.10.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License @@ -81,6 +81,7 @@ %patch0 -p1 touch configure sed -i 's|/neo/opt/bin/python|%{__python}|' python/examples/*/*.py +sed -i 's|PYTHON_SITE = @PYTHON_SITE@|PYTHON_SITE = %{python_sitearch}|' rules.mk.in find python/examples -type f | xargs chmod -x %build @@ -162,6 +163,9 @@ %endif %changelog +* Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 +- fix for x86_64 + * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 From fedora-extras-commits at redhat.com Fri Mar 17 18:09:11 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Fri, 17 Mar 2006 13:09:11 -0500 Subject: rpms/clearsilver/FC-4 clearsilver.spec,1.2,1.3 Message-ID: <200603171809.k2HI9hIL026273@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26208 Modified Files: clearsilver.spec Log Message: * Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 - fix for x86_64 Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-4/clearsilver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clearsilver.spec 13 Mar 2006 18:39:49 -0000 1.2 +++ clearsilver.spec 17 Mar 2006 18:09:10 -0000 1.3 @@ -2,7 +2,7 @@ Name: clearsilver Version: 0.10.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License @@ -81,6 +81,7 @@ %patch0 -p1 touch configure sed -i 's|/neo/opt/bin/python|%{__python}|' python/examples/*/*.py +sed -i 's|PYTHON_SITE = @PYTHON_SITE@|PYTHON_SITE = %{python_sitearch}|' rules.mk.in find python/examples -type f | xargs chmod -x %build @@ -162,6 +163,9 @@ %endif %changelog +* Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 +- fix for x86_64 + * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 From fedora-extras-commits at redhat.com Fri Mar 17 18:09:58 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:09:58 -0500 Subject: rpms/ularn/devel - New directory Message-ID: <200603171810.k2HIA0kd026297@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/ularn/devel Log Message: Directory /cvs/extras/rpms/ularn/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 18:09:43 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:09:43 -0500 Subject: rpms/ularn - New directory Message-ID: <200603171809.k2HI9j2D026278@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/ularn Log Message: Directory /cvs/extras/rpms/ularn added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 18:10:01 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Fri, 17 Mar 2006 13:10:01 -0500 Subject: rpms/clearsilver/FC-3 clearsilver.spec,1.2,1.3 Message-ID: <200603171810.k2HIAXeU026393@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26296 Modified Files: clearsilver.spec Log Message: * Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 - fix for x86_64 Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-3/clearsilver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clearsilver.spec 13 Mar 2006 18:38:41 -0000 1.2 +++ clearsilver.spec 17 Mar 2006 18:10:00 -0000 1.3 @@ -2,7 +2,7 @@ Name: clearsilver Version: 0.10.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License @@ -81,6 +81,7 @@ %patch0 -p1 touch configure sed -i 's|/neo/opt/bin/python|%{__python}|' python/examples/*/*.py +sed -i 's|PYTHON_SITE = @PYTHON_SITE@|PYTHON_SITE = %{python_sitearch}|' rules.mk.in find python/examples -type f | xargs chmod -x %build @@ -162,6 +163,9 @@ %endif %changelog +* Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 +- fix for x86_64 + * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 From fedora-extras-commits at redhat.com Fri Mar 17 18:10:25 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:10:25 -0500 Subject: rpms/ularn Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603171810.k2HIARfH026381@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26342 Added Files: Makefile import.log Log Message: Setup of module ularn --- NEW FILE Makefile --- # Top level Makefile for module ularn all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 17 18:10:33 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:10:33 -0500 Subject: rpms/ularn/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603171810.k2HIAgXk026404@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26342/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ularn --- NEW 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 Mar 17 18:12:08 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:12:08 -0500 Subject: rpms/ularn import.log,1.1,1.2 Message-ID: <200603171812.k2HICfYN026633@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26575 Modified Files: import.log Log Message: auto-import ularn-1.5p4-4 on branch devel from ularn-1.5p4-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ularn/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Mar 2006 18:10:25 -0000 1.1 +++ import.log 17 Mar 2006 18:12:08 -0000 1.2 @@ -0,0 +1 @@ +ularn-1_5p4-4:HEAD:ularn-1.5p4-4.src.rpm:1142619107 From fedora-extras-commits at redhat.com Fri Mar 17 18:12:24 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:12:24 -0500 Subject: rpms/ularn/devel config.sh.in, NONE, 1.1 ularn-build.patch, NONE, 1.1 ularn-datadir.patch, NONE, 1.1 ularn-drop-setgid.patch, NONE, 1.1 ularn-euid.patch, NONE, 1.1 ularn.desktop, NONE, 1.1 ularn.png, NONE, 1.1 ularn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603171812.k2HICwoo026646@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26575/devel Modified Files: .cvsignore sources Added Files: config.sh.in ularn-build.patch ularn-datadir.patch ularn-drop-setgid.patch ularn-euid.patch ularn.desktop ularn.png ularn.spec Log Message: auto-import ularn-1.5p4-4 on branch devel from ularn-1.5p4-4.src.rpm --- NEW FILE config.sh.in --- #!/bin/sh # config.sh # This file was produced by running the Configure script. hpux='undef' linux='define' bsd='undef' cygwin='undef' syserr='define' bsdlibs='' d_eunice='undef' eunicefix=':' define='define' contains='grep' cppstdin='/usr/bin/cpp' cppminus='' d_ftime='define' d_getopt='define' d_index='define' d_termio='define' d_voidsig='define' libc='/usr/lib/libc.a' mansrc='' manext='' models='none' split='' small='' medium='' large='' huge='' ccflags='' ldflags='' cc='gcc' n='-n' c='' package='Ularn' spitshell='cat' shsharp='true' sharpbang='#!' startsh='#!/bin/sh' loclist=' expr sed echo cat rm tr grep ' expr='/usr/bin/expr' sed='/bin/sed' echo='/bin/echo' cat='/bin/cat' rm='/bin/rm' mv='' cp='' tail='' tr='/usr/bin/tr' mkdir='' sort='' uniq='' grep='/bin/grep' trylist=' xmkmf imake compress uncompress test Mcc cpp ' test='test' inews='' egrep='' more='' pg='' Mcc='Mcc' vi='' mailx='' mail='' cpp='@bindir@/cpp' perl='' compress='@bindir@/compress' uncompress='@bindir@/uncompress' imake='/usr/bin/X11/imake' xmkmf='/usr/bin/X11/xmkmf' bindir='@bindir@' d_drand48='define' d_havetlib='define' termlib='-lcurses' d_itimer='define' d_systime='' d_random='undef' defcomp='undef' imaketmpl='' libdir='@datadir@/ularn' scoredir='@var@/games' mycompress='@bindir@/compress -c' myuncompress='@bindir@/uncompress -c' CONFIG=true ularn-build.patch: --- NEW FILE ularn-build.patch --- diff -Naur Ularn/extern.h Ularn.new/extern.h --- Ularn/extern.h 2001-11-16 10:13:18.000000000 -0800 +++ Ularn.new/extern.h 2006-02-25 16:34:40.000000000 -0800 @@ -88,11 +88,11 @@ int getcharacter(void); int newgame(void); /*VARARGS*/ -int lprintf(); +int lprintf(char *, ...); int lprint(long); int lwrite(char *, int); long lgetc1(void); -long lrint(void); +long lr_int(void); int lrfill(char *, int); char *lgetw(void); char *lgetl(void); @@ -441,11 +441,11 @@ int getcharacter(); int newgame(); /*VARARGS*/ -int lprintf(); +int lprintf(char *, ...); int lprint(); int lwrite(); long lgetc1(); -long lrint(); +long lr_int(); int lrfill(); char *lgetw(); char *lgetl(); diff -Naur Ularn/fortune.c Ularn.new/fortune.c --- Ularn/fortune.c 2001-11-16 10:13:19.000000000 -0800 +++ Ularn.new/fortune.c 2006-02-25 16:21:57.000000000 -0800 @@ -16,7 +16,6 @@ int lines,tmp; struct stat stat; int retval; - char *malloc(); if (fortune_fd==0) { /* open the file */ diff -Naur Ularn/header.h Ularn.new/header.h --- Ularn/header.h 2001-11-16 10:13:19.000000000 -0800 +++ Ularn.new/header.h 2006-02-25 16:22:58.000000000 -0800 @@ -27,7 +27,8 @@ #include #include #include -#include +#include +#include #ifdef USG # include #else diff -Naur Ularn/io.c Ularn.new/io.c --- Ularn/io.c 2001-11-16 10:13:19.000000000 -0800 +++ Ularn.new/io.c 2006-02-25 20:02:55.000000000 -0800 @@ -19,7 +19,7 @@ * FILE INPUT ROUTINES * * long lgetc() read one character from input buffer - * long lrint() read one integer from input buffer + * long lr_int() read one integer from input buffer * lrfill(address,number) put input bytes into a buffer * char *lgetw() get a whitespace ended word from input * char *lgetl() get a \n or EOF ended line from input @@ -101,18 +101,14 @@ */ /*VARARGS*/ -lprintf(va_alist) -va_dcl +lprintf(char *fmt, ...) { va_list ap; /* pointer for variable argument list */ - char *fmt; char *outb,*tmpb; long wide,left,cont,n; /* data for lprintf */ char db[12]; /* %d buffer in lprintf */ - va_start(ap); /* initialize the var args pointer */ - - fmt = (char *)va_arg(ap, char *); /* pointer to format string */ + va_start(ap, fmt); /* initialize the var args pointer */ if (lpnt >= lpend) lflush(); outb = lpnt; @@ -308,7 +304,7 @@ } /* - * long lrint() Read one integer from input buffer + * long lr_int() Read one integer from input buffer * * +---------+---------+---------+---------+ * | high | | | low | @@ -320,7 +316,7 @@ * The save order is low order first, to high order (4 bytes total) * Returns the int read */ -long lrint() +long lr_int() { long i; @@ -562,7 +558,7 @@ { char termbuf[1024]; char *pc, *capptr = cap+10; - char *malloc(), *tgetstr(), *term, *getenv(); + char *tgetstr(), *term, *getenv(); switch (tgetent(termbuf, term = getenv("TERM"))) { case -1: diff -Naur Ularn/main.c Ularn.new/main.c --- Ularn/main.c 2001-11-16 10:13:20.000000000 -0800 +++ Ularn.new/main.c 2006-02-25 16:33:25.000000000 -0800 @@ -46,7 +46,7 @@ { int i, hard; char buf[BUFSIZ]; - char *malloc(), *getenv(), *getlogin(), *ptr=0; + char *getenv(), *getlogin(), *ptr=0; struct passwd *pwe,*getpwuid(); extern char *optarg; extern int optind, opterr; diff -Naur Ularn/Makefile.u.SH Ularn.new/Makefile.u.SH --- Ularn/Makefile.u.SH 2001-11-16 10:18:27.000000000 -0800 +++ Ularn.new/Makefile.u.SH 2006-02-25 17:20:26.000000000 -0800 @@ -97,12 +97,12 @@ ########################################################################## install: $(PROGRAM) $(LIBFILES) - if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi - -cp Umaps Ufortune Uhelp $(LIBDIR) - -chmod 644 $(LIBDIR)/Umaps $(LIBDIR)/Ufortune \ - $(LIBDIR)/Uhelp - if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi - -cp $(PROGRAM) $(BINDIR) + if test ! -d $(DESTDIR)$(LIBDIR) ; then mkdir -p $(DESTDIR)$(LIBDIR) ; fi + -cp Umaps Ufortune Uhelp $(DESTDIR)$(LIBDIR) + -chmod 644 $(DESTDIR)$(LIBDIR)/Umaps $(DESTDIR)$(LIBDIR)/Ufortune \ + $(DESTDIR)$(LIBDIR)/Uhelp + if test ! -d $(DESTDIR)$(BINDIR) ; then mkdir -p $(DESTDIR)$(BINDIR) ; fi + -cp $(PROGRAM) $(DESTDIR)$(BINDIR) lint: diff -Naur Ularn/savelev.c Ularn.new/savelev.c --- Ularn/savelev.c 2001-11-16 10:13:27.000000000 -0800 +++ Ularn.new/savelev.c 2006-02-25 17:19:14.000000000 -0800 @@ -6,14 +6,7 @@ #include "monst.h" #include "extern.h" -#ifdef CYGWIN #include -#define SYSERRLISTDEFINED -#endif - -#ifndef SYSERRLISTDEFINED -extern char *sys_errlist[]; -#endif extern int errno; @@ -216,11 +209,11 @@ unsigned int thesum, asum; struct sphere *sp,*splast; Saved_Level * storage; - char buf[1024], *tmp="/tmp/UtmpXXXXXX", *mkstemp(); + char buf[1024], *tempfilename="/tmp/UtmpXXXXXX"; int fd; if (compress) { - if ((tempfilename = mkstemp(tmp)) == NULL) { + if (fd = (mkstemp(tempfilename)) == -1) { fprintf(stderr,"Can't create temp file to restore game\n"); perror("mkstemp"); nosignal=0; @@ -241,6 +234,7 @@ unlink(tempfilename); return; } +/* if ((fd = open(tempfilename, O_RDONLY)) < 0) { fprintf(stderr,"Can't open temp file to restore game\n"); perror("open"); @@ -249,6 +243,7 @@ died(-265); return; } +*/ } else { if ((fd = open(fname, O_RDONLY)) <= 0) { fprintf(stderr,"Can't open file <%s> to restore game\n", @@ -454,7 +449,7 @@ ncalls++; if ((nwrote = write(fd, buf, num)) == -1) { fprintf(stderr, "Error writing to save file\n"); - fprintf(stderr, "errno = %d\t[%s]\n",errno,sys_errlist[errno]); + fprintf(stderr, "errno = %d\t[%s]\n",errno,strerror(errno)); fprintf(stderr, " Wrote %d bytes so far\n", w); fprintf(stderr, " Call: %d\n", ncalls); abort(); @@ -485,7 +480,7 @@ ncalls++; if ((nread = read(fd, buf, num)) == -1) { fprintf(stderr, "Error reading from save file\n"); - fprintf(stderr, "errno = %d\t[%s]\n",errno,sys_errlist[errno]); + fprintf(stderr, "errno = %d\t[%s]\n",errno,strerror(errno)); fprintf(stderr, " Read %d bytes so far\n", w); fprintf(stderr, " Call: %d\n", ncalls); perror("read"); diff -Naur Ularn/tok.c Ularn.new/tok.c --- Ularn/tok.c 2001-11-16 10:13:31.000000000 -0800 +++ Ularn.new/tok.c 2006-02-25 17:07:40.000000000 -0800 @@ -3,6 +3,7 @@ #include "player.h" #include "monst.h" #include "extern.h" +#include extern int nonap; #define MAXUM 52 /* maximum number of user re-named monsters */ @@ -61,11 +62,15 @@ /* shell escape */ if (cc == '!') { int pgrp; +/* #ifdef USG +*/ pgrp = getpgrp(); +/* #else pgrp = getpgrp(getpid()); -#endif /* USG */ +#endif +*/ resetscroll(); clear(); @@ -75,7 +80,7 @@ settty(); setuid(geteuid()); setgid(getegid()); - setpgrp(getpid(), pgrp); + setpgid(getpid(), pgrp); if ((sh = getenv("SHELL")) != (char *)NULL) { execl(sh, sh, (char *)0); if (!strcmp(sh, "/bin/sh")) { ularn-datadir.patch: --- NEW FILE ularn-datadir.patch --- diff -Naur Ularn/config.h.SH Ularn.new/config.h.SH --- Ularn/config.h.SH 2001-11-16 10:13:15.000000000 -0800 +++ Ularn.new/config.h.SH 2006-03-16 12:54:35.000000000 -0800 @@ -136,6 +136,11 @@ */ #define LIBDIR "$libdir" /**/ +/* SCOREBOARDDIR: + * This symbol indicates the directory containing the scoreboard file. + */ +#define SCOREBOARDDIR "$scoredir" /**/ + /* COMPRESS * This symbol contains the command to do compression from stdin * to stdout. diff -Naur Ularn/data.c Ularn.new/data.c --- Ularn/data.c 2001-11-16 10:48:22.000000000 -0800 +++ Ularn.new/data.c 2006-03-16 13:00:30.000000000 -0800 @@ -4,6 +4,7 @@ #include "itm.h" char *libdir = LIBDIR; +char *scoredir = SCOREBOARDDIR; /* the game save filename */ char savefilename[MAXPATHLEN]; diff -Naur Ularn/extern.h Ularn.new/extern.h --- Ularn/extern.h 2006-03-16 07:58:03.000000000 -0800 +++ Ularn.new/extern.h 2006-03-16 13:14:37.000000000 -0800 @@ -712,7 +712,7 @@ /************** extern decls for all data items **********/ -extern char *tempfilename, *libdir; +extern char *tempfilename, *libdir, *scoredir; extern char bot1f,bot2f,bot3f; /* in display.c */ extern char ckpfile[], monstnamelist[]; extern char larnlevels[],lastmonst[]; diff -Naur Ularn/header.h Ularn.new/header.h --- Ularn/header.h 2006-03-16 07:58:03.000000000 -0800 +++ Ularn.new/header.h 2006-03-16 13:21:29.000000000 -0800 @@ -47,7 +47,7 @@ /**************** File Names ****************/ -#define SCORENAME "Uscore" +#define SCORENAME "Ularn-scoreboard" #define HELPNAME "Uhelp" #define LEVELSNAME "Umaps" #define FORTSNAME "Ufortune" diff -Naur Ularn/main.c Ularn.new/main.c --- Ularn/main.c 2006-03-16 12:50:33.000000000 -0800 +++ Ularn.new/main.c 2006-03-16 13:17:19.000000000 -0800 @@ -95,7 +95,7 @@ sprintf(buf, "%s/%s", ptr, ckpfile); /* the checkpoint file */ strcpy(ckpfile, buf); - sprintf(scorefile, "%s/%s", libdir, SCORENAME); /* the Ularn scoreboard filename */ + sprintf(scorefile, "%s/%s", scoredir, SCORENAME); /* the Ularn scoreboard filename */ sprintf(helpfile, "%s/%s", libdir, HELPNAME); /* the Ularn on-line help file */ @@ -118,8 +118,9 @@ */ if (access(scorefile,0) == -1) /* not there */ if (makeboard() == -1) { - fprintf(stderr, "I can't create the scoreboard.\n"); - fprintf(stderr, "Check permissions on %s\n",libdir); + fprintf(stderr, "I can't create the scoreboard %s.\n", + scorefile); + fprintf(stderr, "Check permissions on %s\n",scoredir); exit(1); } ularn-drop-setgid.patch: --- NEW FILE ularn-drop-setgid.patch --- diff -Naur Ularn/data.c Ularn.new/data.c --- Ularn/data.c 2006-03-16 13:40:53.000000000 -0800 +++ Ularn.new/data.c 2006-03-16 13:39:41.000000000 -0800 @@ -5,6 +5,7 @@ char *libdir = LIBDIR; char *scoredir = SCOREBOARDDIR; +FILE *scoreboard_filehandle = (FILE *)NULL; /* the game save filename */ char savefilename[MAXPATHLEN]; diff -Naur Ularn/extern.h Ularn.new/extern.h --- Ularn/extern.h 2006-03-16 13:40:53.000000000 -0800 +++ Ularn.new/extern.h 2006-03-16 13:42:26.000000000 -0800 @@ -713,6 +713,7 @@ /************** extern decls for all data items **********/ extern char *tempfilename, *libdir, *scoredir; +extern FILE *scoreboard_filehandle; extern char bot1f,bot2f,bot3f; /* in display.c */ extern char ckpfile[], monstnamelist[]; extern char larnlevels[],lastmonst[]; diff -Naur Ularn/header.h Ularn.new/header.h --- Ularn/header.h 2006-03-16 13:40:53.000000000 -0800 +++ Ularn.new/header.h 2006-03-17 07:02:33.000000000 -0800 @@ -6,6 +6,9 @@ #include #include +#define _GNU_SOURCE /* this must be done before the first include of unistd.h */ +#include + #ifdef FTIMER # include #endif /* FTIMER */ diff -Naur Ularn/main.c Ularn.new/main.c --- Ularn/main.c 2006-03-16 13:40:53.000000000 -0800 +++ Ularn.new/main.c 2006-03-17 07:02:35.000000000 -0800 @@ -50,7 +50,22 @@ struct passwd *pwe,*getpwuid(); extern char *optarg; extern int optind, opterr; + gid_t realgid; + /* Open the scoreboard file immediately and then drop our setgid + * privileges. + */ + sprintf(scorefile, "%s/%s", scoredir, SCORENAME); /* the Ularn scoreboard filename */ + /* This could be NULL! Users of this variable must check + * before using and not bother writing a scoreboard if it is null. + */ + scoreboard_filehandle=fopen(scorefile, "r+"); + realgid = getgid(); + if (setresgid(-1, realgid, realgid) != 0) { + perror("Could not drop setgid privileges. Aborting."); + exit(1); + } + /* * first task is to identify the player @@ -95,7 +110,6 @@ sprintf(buf, "%s/%s", ptr, ckpfile); /* the checkpoint file */ strcpy(ckpfile, buf); - sprintf(scorefile, "%s/%s", scoredir, SCORENAME); /* the Ularn scoreboard filename */ sprintf(helpfile, "%s/%s", libdir, HELPNAME); /* the Ularn on-line help file */ diff -Naur Ularn/scores.c Ularn.new/scores.c --- Ularn/scores.c 2001-11-16 10:13:28.000000000 -0800 +++ Ularn.new/scores.c 2006-03-16 14:22:14.000000000 -0800 @@ -145,8 +145,9 @@ writeboard() { FILE *fp; + fp = scoreboard_filehandle; - if ((fp = fopen(scorefile, "w")) == (FILE *)NULL) { + if (fp == (FILE *)NULL) { lprcat("Can't open scorefile for writing\n"); lflush(); return(-1); @@ -185,7 +186,7 @@ } if (writeboard()) return(-1); - chmod(scorefile, 0666); + //chmod(scorefile, 0666); return(0); } ularn-euid.patch: --- NEW FILE ularn-euid.patch --- diff -Naur Ularn/main.c Ularn.new/main.c --- Ularn/main.c 2006-03-16 07:58:03.000000000 -0800 +++ Ularn.new/main.c 2006-03-16 12:37:51.000000000 -0800 @@ -55,15 +55,13 @@ /* * first task is to identify the player */ - if ((ptr = getlogin()) == (char *)NULL) { - if (pwe=getpwuid(geteuid())) - ptr = pwe->pw_name; - else if ((ptr = getenv("LOGNAME")) == (char *)NULL) - if ((ptr = getenv("USER")) == (char *)NULL) { -noone: fprintf(stderr,"Who *are* you?\n"); - exit(1); - } - } + if (pwe=getpwuid(geteuid())) + ptr = pwe->pw_name; + else if ((ptr = getenv("LOGNAME")) == (char *)NULL) + if ((ptr = getenv("USER")) == (char *)NULL) { +noone: fprintf(stderr,"Who *are* you?\n"); + exit(1); + } if (ptr==(char *)NULL) goto noone; if (strlen(ptr)==0) --- NEW FILE ularn.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Ularn GenericName=Ularn Comment=Text based game Exec=Ularn Icon=ularn.png Terminal=true Type=Application Categories=Application;Game; Version=1.5p4 --- NEW FILE ularn.spec --- Name: ularn Version: 1.5p4 Release: 4%{?dist} Summary: Simple roguelike game Group: Amusements/Games License: GPL URL: http://www.ularn.org Source0: http://www.ularn.org/Ularn-1.5ishPL4.tar.gz Source1: config.sh.in Source2: ularn.desktop Source3: ularn.png Patch0: ularn-build.patch Patch1: ularn-euid.patch Patch2: ularn-datadir.patch Patch3: ularn-drop-setgid.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses BuildRequires: desktop-file-utils Requires: ncompress %description A text-based roguelike game based on the original Larn. Travel through dungeons collecting weapons, killing monsters, in order to find and sell the Eye of Larn to save your sick daughter. %prep %setup -q -n Ularn # The configure script for this package is interactive. However, it # produces a config.sh script that can be customized if necessary. # a pre-built config.sh script is used to avoid running an interactive # configure script, but still must be customized slightly. sed -e 's#@bindir@#%{_bindir}#' \ -e 's#@datadir@#%{_datadir}#' \ -e 's#@var@#%{_var}#' < %{SOURCE1} > config.sh chmod +x config.h.SH %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %build # Keep track of where we are. Some of the configuration scripts change # the current working directory. builddir=`pwd` . config.h.SH ${builddir}/Makefile.u.SH cd ${builddir} mv Makefile.u Makefile CC="gcc $RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_var}/games touch $RPM_BUILD_ROOT/%{_var}/games/Ularn-scoreboard desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ install -p -m 644 %{SOURCE3} $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 # Note that the game is setgid games, and the directory with # the score file is group writable. %files %defattr(-,root,root,-) %attr(2755,root,games) %{_bindir}/Ularn %{_datadir}/%{name} %config(noreplace) %attr (0664,root,games) %{_var}/games/Ularn-scoreboard %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %doc README README.spoilers GPL CHANGES.text Ularnopts %changelog * Fri Mar 17 2006 Wart 1.5p4-4 - Updated setgid patch to prevent someone from regaining setgid privileges. - Own /usr/share/ularn directory * Thu Mar 16 2006 Wart 1.5p4-3 - Added a patch to use the effective uid in determining the players name, or more precisely, don't use the id of the controlling terminal's user. - Added a patch to look for game files in /usr/share/ularn and move the scoreboard to /var/games. - Added a patch to drop setgid privileges after opening the scoreboard file for writing. * Mon Mar 13 2006 Wart 1.5p4-2 - Added icon for .desktop file. - Change default permissions so that only critical files are owned by 'games' - Add missing scoreboard file. * Sat Feb 25 2006 Wart 1.5p4-1 - Initial spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ularn/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Mar 2006 18:10:33 -0000 1.1 +++ .cvsignore 17 Mar 2006 18:12:24 -0000 1.2 @@ -0,0 +1 @@ +Ularn-1.5ishPL4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ularn/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Mar 2006 18:10:33 -0000 1.1 +++ sources 17 Mar 2006 18:12:24 -0000 1.2 @@ -0,0 +1 @@ +e38861b422d4f8973536da0e8f475221 Ularn-1.5ishPL4.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 18:17:23 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:17:23 -0500 Subject: owners owners.list,1.747,1.748 Message-ID: <200603171817.k2HIHv0g026712@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26695 Modified Files: owners.list Log Message: Added ularn, a roguelike game. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.747 retrieving revision 1.748 diff -u -r1.747 -r1.748 --- owners.list 16 Mar 2006 04:34:53 -0000 1.747 +++ owners.list 17 Mar 2006 18:17:23 -0000 1.748 @@ -1412,6 +1412,7 @@ Fedora Extras|ufraw|Tool to retrieve raw image data from digital cameras|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ufsparse|University of Florida sparse matrix libraries|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|uim|A multilingual input method library|tagoh at redhat.com|extras-qa at fedoraproject.org|petersen at redhat.com +Fedora Extras|ularn|Roguelike game|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|ulogd|The userspace logging daemon for netfilter|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|unison|File synchronization tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 17 18:19:42 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:19:42 -0500 Subject: comps comps-fe5.xml.in,1.23,1.24 Message-ID: <200603171820.k2HIKFGI026774@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26733 Modified Files: comps-fe5.xml.in Log Message: Added new game 'ularn'; very minor formatting cleanup. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- comps-fe5.xml.in 14 Mar 2006 20:49:40 -0000 1.23 +++ comps-fe5.xml.in 17 Mar 2006 18:19:42 -0000 1.24 @@ -217,7 +217,7 @@ lacewing lincity-ng lmarbles - lucidlife + lucidlife Maelstrom nethack nethack-vultures @@ -237,6 +237,7 @@ supertux tong torcs + ularn uqm viruskiller wesnoth From fedora-extras-commits at redhat.com Fri Mar 17 18:22:17 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:22:17 -0500 Subject: rpms/ularn/devel ularn.spec,1.1,1.2 Message-ID: <200603171822.k2HIMnAc026807@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26788 Modified Files: ularn.spec Log Message: Clarify a comment. Index: ularn.spec =================================================================== RCS file: /cvs/extras/rpms/ularn/devel/ularn.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ularn.spec 17 Mar 2006 18:12:24 -0000 1.1 +++ ularn.spec 17 Mar 2006 18:22:17 -0000 1.2 @@ -80,8 +80,7 @@ fi -# Note that the game is setgid games, and the directory with -# the score file is group writable. +# Note that the game is setgid games, and the score file is group writable. %files %defattr(-,root,root,-) %attr(2755,root,games) %{_bindir}/Ularn From fedora-extras-commits at redhat.com Fri Mar 17 18:25:19 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Fri, 17 Mar 2006 13:25:19 -0500 Subject: rpms/opencv/FC-5 opencv.spec,1.4,1.5 Message-ID: <200603171825.k2HIPpCp026982@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26965 Modified Files: opencv.spec Log Message: Need to bump release for FC5 build Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-5/opencv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- opencv.spec 8 Mar 2006 13:15:09 -0000 1.4 +++ opencv.spec 17 Mar 2006 18:25:19 -0000 1.5 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -124,6 +124,9 @@ %changelog +* Fri Mar 17 2006 Simon Perreault - 0.9.7-16 +- Rebuild. + * Wed Mar 8 2006 Simon Perreault - 0.9.7-15 - Force a re-run of Autotools by calling autoreconf. From fedora-extras-commits at redhat.com Fri Mar 17 18:26:34 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Fri, 17 Mar 2006 13:26:34 -0500 Subject: rpms/camstream/FC-5 camstream.spec,1.11,1.12 Message-ID: <200603171827.k2HIR7jM027043@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/camstream/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27019 Modified Files: camstream.spec Log Message: Need to bump release for rebuild on FC5 Index: camstream.spec =================================================================== RCS file: /cvs/extras/rpms/camstream/FC-5/camstream.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- camstream.spec 12 Mar 2006 13:24:10 -0000 1.11 +++ camstream.spec 17 Mar 2006 18:26:34 -0000 1.12 @@ -1,6 +1,6 @@ Name: camstream Version: 0.26.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Set of programs to make use of your webcam @@ -89,6 +89,9 @@ %changelog +* Fri Mar 17 2006 Simon Perreault - 0.26.3-10 +- Rebuild. + * Sat Mar 11 2006 Simon Perreault - 0.26.3-9 - Taking ownership of package. - Fixed build dependencies (#178654). From fedora-extras-commits at redhat.com Fri Mar 17 19:03:21 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 14:03:21 -0500 Subject: comps comps-fe5.xml.in,1.24,1.25 Message-ID: <200603171903.k2HJ3sE3029603@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29573 Modified Files: comps-fe5.xml.in Log Message: Remove dead packages (cdiff, rpmproc) and sort development-tools. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- comps-fe5.xml.in 17 Mar 2006 18:19:42 -0000 1.24 +++ comps-fe5.xml.in 17 Mar 2006 19:03:20 -0000 1.25 @@ -24,9 +24,9 @@ abicheck bazaar + bigloo bzr ccache - cdiff clisp cogito colordiff @@ -41,24 +41,22 @@ gforth ghc git-core - highlight + highlight lincvs lua mach - mock meld mercurial + mock monotone - pylint ocaml + pylint quilt rpmlint - rpmproc splint tkcvs tla yasm - bigloo From fedora-extras-commits at redhat.com Fri Mar 17 19:08:16 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 14:08:16 -0500 Subject: comps comps-fe5.xml.in,1.25,1.26 Message-ID: <200603171908.k2HJ8mqE029688@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29671 Modified Files: comps-fe5.xml.in Log Message: Add kid3. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- comps-fe5.xml.in 17 Mar 2006 19:03:20 -0000 1.25 +++ comps-fe5.xml.in 17 Mar 2006 19:08:16 -0000 1.26 @@ -421,6 +421,7 @@ gnomebaker graveman grip + kid3 kover libvisual-plugins soundconverter From fedora-extras-commits at redhat.com Fri Mar 17 19:12:16 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 14:12:16 -0500 Subject: comps comps-fe5.xml.in,1.26,1.27 Message-ID: <200603171912.k2HJCmur029747@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29724 Modified Files: comps-fe5.xml.in Log Message: No apt or synaptic for FE5 (yet). Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- comps-fe5.xml.in 17 Mar 2006 19:08:16 -0000 1.26 +++ comps-fe5.xml.in 17 Mar 2006 19:12:16 -0000 1.27 @@ -444,7 +444,6 @@ aide airsnort apcupsd - apt cfengine cfs crack @@ -718,7 +717,6 @@ gparted gsynaptics qtparted - synaptic system-config-control yumex From fedora-extras-commits at redhat.com Fri Mar 17 19:13:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 17 Mar 2006 14:13:27 -0500 Subject: rpms/tuxtype2/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tuxtype2.spec, 1.7, 1.8 Message-ID: <200603171914.k2HJE0VG029798@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/tuxtype2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29769 Modified Files: .cvsignore sources tuxtype2.spec Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tuxtype2/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:30:27 -0000 1.2 +++ .cvsignore 17 Mar 2006 19:13:27 -0000 1.3 @@ -1 +1 @@ -tuxtype2-1.5.2.tar.gz +tuxtype2-1.5.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/tuxtype2/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:30:27 -0000 1.2 +++ sources 17 Mar 2006 19:13:27 -0000 1.3 @@ -1 +1 @@ -b47c4712ea7891dd7158faa98981de07 tuxtype2-1.5.2.tar.gz +ca04e65d3b19ddeeedb8a49147ed642b tuxtype2-1.5.3.tar.bz2 Index: tuxtype2.spec =================================================================== RCS file: /cvs/extras/rpms/tuxtype2/FC-4/tuxtype2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tuxtype2.spec 22 May 2005 22:28:39 -0000 1.7 +++ tuxtype2.spec 17 Mar 2006 19:13:27 -0000 1.8 @@ -1,12 +1,12 @@ Name: tuxtype2 -Version: 1.5.2 -Release: 3 +Version: 1.5.3 +Release: 1%{?dist} Summary: Tux Typing, an educational typing tutor for children Group: Amusements/Games License: GPL URL: http://tuxtype.sourceforge.net/ -Source0: http://dl.sf.net/tuxtype/%{name}-%{version}.tar.gz +Source0: http://dl.sf.net/tuxtype/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel @@ -66,6 +66,9 @@ %{_datadir}/applications/* %changelog +* Fri Feb 17 2006 Steven Pritchard 1.5.3-1 +- Update to 1.5.3 + * Sun May 22 2005 Jeremy Katz - 1.5.2-3 - rebuild on all arches From fedora-extras-commits at redhat.com Fri Mar 17 19:14:24 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 14:14:24 -0500 Subject: comps comps-fe5.xml.in,1.27,1.28 Message-ID: <200603171914.k2HJEvSm029861@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29816 Modified Files: comps-fe5.xml.in Log Message: Make xemacs-el optional, add (optional) xemacs-nox. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- comps-fe5.xml.in 17 Mar 2006 19:12:16 -0000 1.27 +++ comps-fe5.xml.in 17 Mar 2006 19:14:24 -0000 1.28 @@ -563,8 +563,9 @@ xemacs - xemacs-el + xemacs-el xemacs-info + xemacs-nox xemacs-sumo xemacs-sumo-el xemacs-sumo-info From fedora-extras-commits at redhat.com Fri Mar 17 19:31:22 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:31:22 -0500 Subject: rpms/argus - New directory Message-ID: <200603171931.k2HJVOGp030023@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30015/argus Log Message: Directory /cvs/extras/rpms/argus added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 19:31:27 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:31:27 -0500 Subject: rpms/argus/devel - New directory Message-ID: <200603171931.k2HJVTkt030038@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30015/argus/devel Log Message: Directory /cvs/extras/rpms/argus/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 19:31:41 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:31:41 -0500 Subject: rpms/argus Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603171931.k2HJVhra030073@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30061 Added Files: Makefile import.log Log Message: Setup of module argus --- NEW FILE Makefile --- # Top level Makefile for module argus all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 17 19:31:46 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:31:46 -0500 Subject: rpms/argus/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603171931.k2HJVmOg030093@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30061/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module argus --- NEW 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 Mar 17 19:32:30 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:32:30 -0500 Subject: rpms/argus import.log,1.1,1.2 Message-ID: <200603171933.k2HJX2Tb030221@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30170 Modified Files: import.log Log Message: auto-import argus-2.0.6.fixes.1-7 on branch devel from argus-2.0.6.fixes.1-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/argus/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Mar 2006 19:31:40 -0000 1.1 +++ import.log 17 Mar 2006 19:32:30 -0000 1.2 @@ -0,0 +1 @@ +argus-2_0_6_fixes_1-7:HEAD:argus-2.0.6.fixes.1-7.src.rpm:1142623945 From fedora-extras-commits at redhat.com Fri Mar 17 19:32:36 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:32:36 -0500 Subject: rpms/argus/devel README.fedora, NONE, 1.1 argus-2.0.6.fixes.1-build.patch, NONE, 1.1 argus-2.0.6.fixes.1-makefile.patch, NONE, 1.1 argus-clients-2.0.6.fixes.1-build.patch, NONE, 1.1 argus-clients-2.0.6.fixes.1-makefile.patch, NONE, 1.1 argus-clients-2.0.6.fixes.1-print.patch, NONE, 1.1 argus.init, NONE, 1.1 argus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603171933.k2HJX8aN030225@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30170/devel Modified Files: .cvsignore sources Added Files: README.fedora argus-2.0.6.fixes.1-build.patch argus-2.0.6.fixes.1-makefile.patch argus-clients-2.0.6.fixes.1-build.patch argus-clients-2.0.6.fixes.1-makefile.patch argus-clients-2.0.6.fixes.1-print.patch argus.init argus.spec Log Message: auto-import argus-2.0.6.fixes.1-7 on branch devel from argus-2.0.6.fixes.1-7.src.rpm --- NEW FILE README.fedora --- Several issues came up during packaging argus for Fedora Extras: 1. the contrib/ subdirectory of the Argus clients source package contains a PERL module, which causes a dependency on PERL, even though the contrib directory was added using %doc, and even though no executable bits were set. Here is a fix, suggested by dgregor on #fedora-extras: dgregor # Filter unwanted Requires: dgregor cat << \EOF > %{name}-req dgregor #!/bin/sh dgregor %{__perl_provides} $* | sed -e '/.*/d' dgregor EOF dgregor %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req dgregor chmod +x %{__perl_requires} dgregor It seems like overkill, but everything else I tried get the broken pipe error Currently I'm hoping for a fix to rpmbuild, allowing something like '%doc(nodeps) foo' in a spec file. If that doesn't pan out, the above solution will do the trick. Alternatively, creating a perl-Argus rpm from the material in contrib is a possibility. 2. aside from build and makefile patches (fixing gcc 4.0.2 and DESTDIR issues, respectively), I added an output formatting patch from Peter Van Epp which can be found on the Argus mailing list archives (https://lists.andrew.cmu.edu/mailman/listinfo/argus-info) This and other fixes will be incorporated upstream into a new release, as indicated by Argus's author on the list. argus-2.0.6.fixes.1-build.patch: --- NEW FILE argus-2.0.6.fixes.1-build.patch --- diff -NarU5 argus-2.0.6.fixes.1.orig/common/argus_parse.c argus-2.0.6.fixes.1/common/argus_parse.c --- argus-2.0.6.fixes.1.orig/common/argus_parse.c 2004-02-23 10:00:36.000000000 -0500 +++ argus-2.0.6.fixes.1/common/argus_parse.c 2006-02-24 12:00:56.000000000 -0500 @@ -1783,12 +1783,11 @@ int ArgusReadSaslStreamSocket (struct ARGUS_INPUT *input) { int retn = 0, fd = input->fd, cnt; unsigned int value = 0, *pvalue = &value; - struct ArgusRecord *argus = NULL; - char *output = NULL, *end = NULL, *ptr = NULL; + char *argus = NULL, *output = NULL, *end = NULL, *ptr = NULL; unsigned int outputlen = 0; if ((retn = sasl_getprop(input->sasl_conn, SASL_MAXOUTBUF, (void **) &pvalue)) != SASL_OK) ArgusLog (LOG_ERR, "ArgusReadSaslStreamSocket: sasl_getprop %s\n", strerror(errno)); @@ -1808,26 +1807,26 @@ ArgusDebug (5, "ArgusReadSaslStreamSocket (0x%x) sasl_decoded %d bytes\n", input, outputlen); #endif ptr += cnt; if (outputlen) { - argus = (struct ArgusRecord *) output; + argus = output; end = output + outputlen; - while ((char *)argus < end) { - input->ArgusReadSocketCnt = ntohs(argus->ahdr.length); + while (argus < end) { + input->ArgusReadSocketCnt = ntohs(((struct ArgusRecord *)argus)->ahdr.length); bcopy (argus, input->ArgusReadBuffer, input->ArgusReadSocketCnt); - if (ArgusHandleDatum (argus, &ArgusFilterCode) == 1) { + if (ArgusHandleDatum ((struct ArgusRecord *)argus, &ArgusFilterCode) == 1) { if (!input->filename) write (fd, "DONE: ", strlen("DONE: ")); retn = 1; break; } else - (char *)argus += input->ArgusReadSocketCnt; + argus += input->ArgusReadSocketCnt; } free (output); input->ArgusSaslBufCnt -= cnt; diff -NarU5 argus-2.0.6.fixes.1.orig/common/gencode.c argus-2.0.6.fixes.1/common/gencode.c --- argus-2.0.6.fixes.1.orig/common/gencode.c 2004-02-23 10:00:36.000000000 -0500 +++ argus-2.0.6.fixes.1/common/gencode.c 2006-02-24 11:54:41.000000000 -0500 @@ -57,11 +57,11 @@ #include #include #include #include -#include +#include #include #include #include #include diff -NarU5 argus-2.0.6.fixes.1.orig/server/ArgusOutput.c argus-2.0.6.fixes.1/server/ArgusOutput.c --- argus-2.0.6.fixes.1.orig/server/ArgusOutput.c 2004-02-23 10:00:36.000000000 -0500 +++ argus-2.0.6.fixes.1/server/ArgusOutput.c 2006-02-24 11:54:41.000000000 -0500 @@ -1196,11 +1196,11 @@ void ArgusCheckClientStatus () { int retn, fd; struct sockaddr from; - int len = sizeof (from); + socklen_t len = sizeof (from); if ((fd = accept (ArgusLfd, (struct sockaddr *)&from, &len)) > 0) { if ((fcntl (fd, F_SETFL, O_NONBLOCK)) >= 0) { if (ArgusTcpWrapper (fd, &from) >= 0) { int i; argus-2.0.6.fixes.1-makefile.patch: --- NEW FILE argus-2.0.6.fixes.1-makefile.patch --- diff -NarU5 argus-2.0.6.fixes.1.orig/common/Makefile.in argus-2.0.6.fixes.1/common/Makefile.in --- argus-2.0.6.fixes.1.orig/common/Makefile.in 2004-02-23 10:00:36.000000000 -0500 +++ argus-2.0.6.fixes.1/common/Makefile.in 2006-03-15 11:08:37.000000000 -0500 @@ -144,18 +144,18 @@ version.c: $(srcdir)/../VERSION @rm -f $@ sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@ install: force - [ -d $(LIBDEST) ] || \ - (mkdir -p $(LIBDEST); chmod 755 $(LIBDEST)) + [ -d $(DESTDIR)/$(LIBDEST) ] || \ + (mkdir -p $(DESTDIR)/$(LIBDEST); chmod 755 $(DESTDIR)/$(LIBDEST)) - $(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a - $(INSTALL) $(srcdir)/../lib/argus_parse.a $(LIBDEST)/argus_parse.a + $(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a + $(INSTALL) $(srcdir)/../lib/argus_parse.a $(DESTDIR)/$(LIBDEST)/argus_parse.a - $(RANLIB) $(LIBDEST)/argus_common.a - $(RANLIB) $(LIBDEST)/argus_parse.a + $(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a + $(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_parse.a clean: rm -f $(CLEANFILES) distclean: diff -NarU5 argus-2.0.6.fixes.1.orig/Makefile.in argus-2.0.6.fixes.1/Makefile.in --- argus-2.0.6.fixes.1.orig/Makefile.in 2004-04-13 01:32:58.000000000 -0400 +++ argus-2.0.6.fixes.1/Makefile.in 2006-03-15 11:08:37.000000000 -0500 @@ -29,14 +29,14 @@ LIBS = @LIBS@ CFLAGS = -g LDFLAGS = -g -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ -docdir = $(prefix)/share/doc/argus-2.0 +#docdir = $(prefix)/share/doc/argus-2.0 #### End of system configuration section. #### SHELL = /bin/sh @@ -62,82 +62,82 @@ .PHONY: all install: force ${MAKE} installdirs - [ -d $(prefix) ] || \ - (mkdir -p $(prefix); chmod 755 $(prefix)) + [ -d $(DESTDIR)/$(prefix) ] || \ + (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix)) - [ -d @sbindir@ ] || \ - (mkdir -p @sbindir@; chmod 755 @sbindir@) + [ -d $(DESTDIR)/@sbindir@ ] || \ + (mkdir -p $(DESTDIR)/@sbindir@; chmod 755 $(DESTDIR)/@sbindir@) - [ -d $(exec_prefix)/argus ] || \ - (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus) - - [ -d $(exec_prefix)/argus/archive ] || \ - (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive) - - [ -d $(docdir) ] || \ - (mkdir -p $(docdir); chmod 755 $(docdir)) - - [ -d $(docdir)/html ] || \ - (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html) - - [ -d $(docdir)/html/man ] || \ - (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man) +# [ -d $(exec_prefix)/argus ] || \ +# (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus) +# +# [ -d $(exec_prefix)/argus/archive ] || \ +# (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive) +# +# [ -d $(docdir) ] || \ +# (mkdir -p $(docdir); chmod 755 $(docdir)) +# +# [ -d $(docdir)/html ] || \ +# (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html) +# +# [ -d $(docdir)/html/man ] || \ +# (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man) @-for d in $(DIRS); \ do \ (cd $$d; echo "### Make install in" `pwd`; \ $(MAKE) $(MFLAGS) install; \ echo "### Done with" `pwd`); \ done - $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir) - $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir) - $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man - - $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus - $(INSTALL) -m 0644 $(srcdir)/README $(docdir) - $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus - $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir) - - $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug - - [ -d @mandir@ ] || \ - (mkdir -p @mandir@; chmod 755 @mandir@) - [ -d @mandir@/man1 ] || \ - (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1) - [ -d @mandir@/man5 ] || \ - (mkdir -p @mandir@/man5; chmod 755 @mandir@/man5) - [ -d @mandir@/man8 ] || \ - (mkdir -p @mandir@/man8; chmod 755 @mandir@/man8) - $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.5 @mandir@/man5/argus.5 - $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.conf.5 @mandir@/man5/argus.conf.5 - $(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5 - - $(INSTALL) -m 0644 $(srcdir)/man/man8/argus.8 @mandir@/man8/argus.8 - - $(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 @mandir@/man1/ra.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 @mandir@/man1/racount.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 @mandir@/man1/ragator.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 @mandir@/man1/ramon.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rapolicy.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rasort.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 @mandir@/man1/raxml.1 +# $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man +# +# $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus +# $(INSTALL) -m 0644 $(srcdir)/README $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus +# $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir) +# +# $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug + + [ -d $(DESTDIR)/@mandir@ ] || \ + (mkdir -p $(DESTDIR)/@mandir@; chmod 755 $(DESTDIR)/@mandir@) +# [ -d @mandir@/man1 ] || \ +# (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1) + [ -d $(DESTDIR)/@mandir@/man5 ] || \ + (mkdir -p $(DESTDIR)/@mandir@/man5; chmod 755 $(DESTDIR)/@mandir@/man5) + [ -d $(DESTDIR)/@mandir@/man8 ] || \ + (mkdir -p $(DESTDIR)/@mandir@/man8; chmod 755 $(DESTDIR)/@mandir@/man8) + $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.5 $(DESTDIR)/@mandir@/man5/argus.5 + $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.conf.5 $(DESTDIR)/@mandir@/man5/argus.conf.5 +# $(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5 + + $(INSTALL) -m 0644 $(srcdir)/man/man8/argus.8 $(DESTDIR)/@mandir@/man8/argus.8 + +# $(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 @mandir@/man1/ra.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 @mandir@/man1/racount.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 @mandir@/man1/ragator.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 @mandir@/man1/ramon.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rapolicy.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rasort.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 @mandir@/man1/raxml.1 uninstall: - rm -f @mandir@/man5/argus.5 - rm -f @mandir@/man5/argus.conf.5 - rm -f @mandir@/man8/argus.8 - - rm -rf $(docdir) - rm -f $(exec_prefix)/argus/COPYING - rm -f $(exec_prefix)/argus/README + rm -f $(DESTDIR)/@mandir@/man5/argus.5 + rm -f $(DESTDIR)/@mandir@/man5/argus.conf.5 + rm -f $(DESTDIR)/@mandir@/man8/argus.8 + +# rm -rf $(docdir) +# rm -f $(exec_prefix)/argus/COPYING +# rm -f $(exec_prefix)/argus/README installdirs: - ${srcdir}/config/mkinstalldirs $(bindir) $(infodir) + ${srcdir}/config/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir) Makefile: Makefile.in config.status $(SHELL) config.status config.status: configure diff -NarU5 argus-2.0.6.fixes.1.orig/server/Makefile.in argus-2.0.6.fixes.1/server/Makefile.in --- argus-2.0.6.fixes.1.orig/server/Makefile.in 2004-02-23 10:00:36.000000000 -0500 +++ argus-2.0.6.fixes.1/server/Makefile.in 2006-03-15 11:09:04.000000000 -0500 @@ -41,11 +41,11 @@ # # Various configurable paths (remember to edit Makefile.in, not Makefile) # # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of directory to install the system binaries SBINDIR = @sbindir@ # Pathname of directory to install the system binaries BINDIR = @bindir@ @@ -131,16 +131,16 @@ @rm -f $@ sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@ install: force - [ -d $(prefix) ] || \ - (mkdir -p $(prefix); chmod 755 $(prefix)) - [ -d $(SBINDIR) ] || \ - (mkdir -p $(SBINDIR); chmod 755 $(SBINDIR)) + [ -d $(DESTDIR)/$(prefix) ] || \ + (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix)) + [ -d $(DESTDIR)/$(SBINDIR) ] || \ + (mkdir -p $(DESTDIR)/$(SBINDIR); chmod 755 $(DESTDIR)/$(SBINDIR)) - $(INSTALL) $(srcdir)/../bin/argus_ at V_PCAP@ $(SBINDIR)/argus + $(INSTALL) $(srcdir)/../bin/argus_ at V_PCAP@ $(DESTDIR)/$(SBINDIR)/argus clean: rm -f $(CLEANFILES) distclean: argus-clients-2.0.6.fixes.1-build.patch: --- NEW FILE argus-clients-2.0.6.fixes.1-build.patch --- diff -NarU5 argus-clients-2.0.6.fixes.1.orig/common/argus_parse.c argus-clients-2.0.6.fixes.1/common/argus_parse.c --- argus-clients-2.0.6.fixes.1.orig/common/argus_parse.c 2003-12-06 12:42:13.000000000 -0500 +++ argus-clients-2.0.6.fixes.1/common/argus_parse.c 2006-02-24 14:06:04.000000000 -0500 @@ -2202,12 +2202,11 @@ int ArgusReadSaslStreamSocket (struct ARGUS_INPUT *input) { int retn = 0, fd = input->fd, cnt = 0; unsigned int val = 0, *pval = &val; - struct ArgusRecord *argus = NULL; - char *output = NULL, *end = NULL, *ptr = NULL; + char *argus = NULL, *output = NULL, *end = NULL, *ptr = NULL; unsigned int outputlen = 0; if ((retn = sasl_getprop(input->sasl_conn, SASL_MAXOUTBUF, (void **) &pval)) != SASL_OK) ArgusLog (LOG_ERR, "ArgusReadSaslStreamSocket: sasl_getprop %s", strerror(errno)); @@ -2226,26 +2225,26 @@ if ((retn = sasl_decode (input->sasl_conn, ptr, cnt, &output, &outputlen)) == SASL_OK) { #ifdef ARGUSDEBUG ArgusDebug (5, "ArgusReadSaslStreamSocket (0x%x) sasl_decoded %d bytes\n", input, outputlen); #endif if (outputlen) { - argus = (struct ArgusRecord *) output; + argus = output; end = output + outputlen; - while ((char *)argus < end) { - input->ArgusReadSocketCnt = ntohs(argus->ahdr.length); - bcopy ((char *) argus, input->ArgusReadBuffer, input->ArgusReadSocketCnt); + while (argus < end) { + input->ArgusReadSocketCnt = ntohs(((struct ArgusRecord *)argus)->ahdr.length); + bcopy (argus, input->ArgusReadBuffer, input->ArgusReadSocketCnt); - if (ArgusHandleDatum (argus, &ArgusFilterCode) == 1) { + if (ArgusHandleDatum ((struct ArgusRecord *)argus, &ArgusFilterCode) == 1) { if (Sflag) ArgusWriteConnection (input, "DONE: ", strlen("DONE: ")); retn = 1; break; } else - (char *)argus += input->ArgusReadSocketCnt; + argus += input->ArgusReadSocketCnt; } free (output); } diff -NarU5 argus-clients-2.0.6.fixes.1.orig/common/gencode.c argus-clients-2.0.6.fixes.1/common/gencode.c --- argus-clients-2.0.6.fixes.1.orig/common/gencode.c 2004-04-26 12:30:23.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/common/gencode.c 2006-02-24 14:05:56.000000000 -0500 @@ -230,11 +230,11 @@ #include #include -static u_int ArgusNetMask; +u_int ArgusNetMask; static int snaplen; int ArgusFilterCompile(struct bpf_program *program, char *buf, int optimize, unsigned int mask) { argus-clients-2.0.6.fixes.1-makefile.patch: --- NEW FILE argus-clients-2.0.6.fixes.1-makefile.patch --- diff -NarU5 argus-clients-2.0.6.fixes.1.orig/clients/Makefile.in argus-clients-2.0.6.fixes.1/clients/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/clients/Makefile.in 2003-07-10 13:28:32.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/clients/Makefile.in 2006-02-24 14:35:36.000000000 -0500 @@ -42,11 +42,11 @@ # # Various configurable paths (remember to edit Makefile.in, not Makefile) # # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of install directory # Pathname of directory to install the system binaries SBINDIR = @sbindir@ @@ -163,17 +163,17 @@ OBJ = $(SRC:.c=.o) CLEANFILES = $(OBJ) $(PROGS) install: force - [ -d $(prefix) ] || \ - (mkdir -p $(prefix); chmod 755 $(prefix)) + [ -d $(DESTDIR)/$(prefix) ] || \ + (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix)) - [ -d $(BINDIR) ] || \ - (mkdir -p $(BINDIR); chmod 755 $(BINDIR)) + [ -d $(DESTDIR)/$(BINDIR) ] || \ + (mkdir -p $(DESTDIR)/$(BINDIR); chmod 755 $(DESTDIR)/$(BINDIR)) - $(INSTALL) $(srcdir)/../bin/ra* $(BINDIR) + $(INSTALL) $(srcdir)/../bin/ra* $(DESTDIR)/$(BINDIR) clean: rm -f $(CLEANFILES) distclean: diff -NarU5 argus-clients-2.0.6.fixes.1.orig/common/Makefile.in argus-clients-2.0.6.fixes.1/common/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/common/Makefile.in 2003-07-10 13:28:32.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/common/Makefile.in 2006-02-24 14:35:36.000000000 -0500 @@ -19,11 +19,11 @@ # # Various configurable paths (remember to edit Makefile.in, not Makefile) # # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of directory to install the include files INCLDEST = @includedir@ # Pathname of directory to install the library LIBDEST = @libdir@ @@ -129,18 +129,18 @@ version.c: $(srcdir)/../VERSION @rm -f $@ sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@ install: force all - [ -d $(LIBDEST) ] || \ - (mkdir -p $(LIBDEST); chmod 755 $(LIBDEST)) + [ -d $(DESTDIR)/$(LIBDEST) ] || \ + (mkdir -p $(DESTDIR)/$(LIBDEST); chmod 755 $(DESTDIR)/$(LIBDEST)) - $(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a - $(INSTALL) $(srcdir)/../lib/argus_parse.a $(LIBDEST)/argus_parse.a + $(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a + $(INSTALL) $(srcdir)/../lib/argus_parse.a $(DESTDIR)/$(LIBDEST)/argus_parse.a - $(RANLIB) $(LIBDEST)/argus_common.a - $(RANLIB) $(LIBDEST)/argus_parse.a + $(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a + $(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_parse.a clean: rm -f $(CLEANFILES) distclean: diff -NarU5 argus-clients-2.0.6.fixes.1.orig/Makefile.in argus-clients-2.0.6.fixes.1/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/Makefile.in 2003-07-10 13:28:29.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/Makefile.in 2006-02-24 14:35:36.000000000 -0500 @@ -27,14 +27,14 @@ LIBS = @LIBS@ CFLAGS = -g LDFLAGS = -g -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ -docdir = $(prefix)/share/doc/argus-2.0 +#docdir = $(prefix)/share/doc/argus-2.0 #### End of system configuration section. #### SHELL = /bin/sh @@ -63,108 +63,109 @@ .PHONY: all install: force make installdirs - [ -d $(prefix) ] || \ - (mkdir -p $(prefix); chmod 755 $(prefix)) + [ -d $(DESTDIR)/$(prefix) ] || \ + (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix)) - [ -d @sbindir@ ] || \ - (mkdir -p @sbindir@; chmod 755 @sbindir@) +# [ -d @sbindir@ ] || \ +# (mkdir -p @sbindir@; chmod 755 @sbindir@) - [ -d @bindir@ ] || \ - (mkdir -p @bindir@; chmod 755 @bindir@) + [ -d $(DESTDIR)/@bindir@ ] || \ + (mkdir -p $(DESTDIR)/@bindir@; chmod 755 $(DESTDIR)/@bindir@) - [ -d $(exec_prefix)/argus ] || \ - (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus) - - [ -d $(exec_prefix)/argus/archive ] || \ - (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive) - - [ -d $(docdir) ] || \ - (mkdir -p $(docdir); chmod 755 $(docdir)) - - [ -d $(docdir)/html ] || \ - (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html) - - [ -d $(docdir)/html/man ] || \ - (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man) +# [ -d $(exec_prefix)/argus ] || \ +# (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus) +# +# [ -d $(exec_prefix)/argus/archive ] || \ +# (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive) +# +# [ -d $(docdir) ] || \ +# (mkdir -p $(docdir); chmod 755 $(docdir)) +# +# [ -d $(docdir)/html ] || \ +# (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html) +# +# [ -d $(docdir)/html/man ] || \ +# (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man) @for i in $(DIRS) ; do \ if [ -d $$i ] ; then \ echo "making in $$i"; \ cd $$i; \ make install; \ cd ..; \ fi; \ done - $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir) - $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir) - $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man - - $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus - $(INSTALL) -m 0644 $(srcdir)/README $(docdir) - $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus - $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir) - - $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug - - [ -d @mandir@ ] || \ - (mkdir -p @mandir@; chmod 755 @mandir@) - [ -d @mandir@/man1 ] || \ - (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1) +# $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man +# +# $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus +# $(INSTALL) -m 0644 $(srcdir)/README $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus +# $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir) +# +# $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug + + [ -d $(DESTDIR)/@mandir@ ] || \ + (mkdir -p $(DESTDIR)/@mandir@; chmod 755 $(DESTDIR)/@mandir@) + [ -d $(DESTDIR)/@mandir@/man1 ] || \ + (mkdir -p $(DESTDIR)/@mandir@/man1; chmod 755 $(DESTDIR)/@mandir@/man1) $(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 \ - @mandir@/man1/ra.1 + $(DESTDIR)/@mandir@/man1/ra.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 \ - @mandir@/man1/racount.1 + $(DESTDIR)/@mandir@/man1/racount.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 \ - @mandir@/man1/ragator.1 + $(DESTDIR)/@mandir@/man1/ragator.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/rahosts.1 \ - @mandir@/man1/rahosts.1 + $(DESTDIR)/@mandir@/man1/rahosts.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 \ - @mandir@/man1/ramon.1 + $(DESTDIR)/@mandir@/man1/ramon.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/ranonymize.1 \ - @mandir@/man1/ranonymize.1 + $(DESTDIR)/@mandir@/man1/ranonymize.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/rapolicy.1 \ - @mandir@/man1/rapolicy.1 + $(DESTDIR)/@mandir@/man1/rapolicy.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 \ - @mandir@/man1/rasort.1 + $(DESTDIR)/@mandir@/man1/rasort.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/rastrip.1 \ - @mandir@/man1/rastrip.1 + $(DESTDIR)/@mandir@/man1/rastrip.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 \ - @mandir@/man1/raxml.1 - [ -d @mandir@/man5 ] || \ - (mkdir -p @mandir@/man5; chmod 755 @mandir@/man5) + $(DESTDIR)/@mandir@/man1/raxml.1 + [ -d $(DESTDIR)/@mandir@/man5 ] || \ + (mkdir -p $(DESTDIR)/@mandir@/man5; chmod 755 $(DESTDIR)/@mandir@/man5) $(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 \ - @mandir@/man5/rarc.5 + $(DESTDIR)/@mandir@/man5/rarc.5 + uninstall: - rm -f @bindir@/argusbug - rm -f @bindir@/ra - rm -f @bindir@/racount - rm -f @bindir@/ragator - rm -f @bindir@/rahistogram - rm -f @bindir@/rahosts - rm -f @bindir@/rarpwatch - rm -f @bindir@/raseq - rm -f @bindir@/rasrvstats - rm -f @bindir@/ratop - rm -f @bindir@/raxml - - rm -f @mandir@/man1/ra.1 - rm -f @mandir@/man1/racount.1 - rm -f @mandir@/man1/ragator.1 - rm -f @mandir@/man1/rasort.1 - rm -f @mandir@/man1/raxml.1 - rm -f @mandir@/man1/tcpdump.1 - rm -f @mandir@/man5/argus.5 - rm -f @mandir@/man5/argus.conf.5 - rm -f @mandir@/man5/rarc.5 - - rm -rf $(docdir) - rm -f $(exec_prefix)/argus/COPYING - rm -f $(exec_prefix)/argus/README + rm -f $(DESTDIR)/@bindir@/argusbug + rm -f $(DESTDIR)/@bindir@/ra + rm -f $(DESTDIR)/@bindir@/racount + rm -f $(DESTDIR)/@bindir@/ragator + rm -f $(DESTDIR)/@bindir@/rahistogram + rm -f $(DESTDIR)/@bindir@/rahosts + rm -f $(DESTDIR)/@bindir@/rarpwatch + rm -f $(DESTDIR)/@bindir@/raseq + rm -f $(DESTDIR)/@bindir@/rasrvstats + rm -f $(DESTDIR)/@bindir@/ratop + rm -f $(DESTDIR)/@bindir@/raxml + + rm -f $(DESTDIR)/@mandir@/man1/ra.1 + rm -f $(DESTDIR)/@mandir@/man1/racount.1 + rm -f $(DESTDIR)/@mandir@/man1/ragator.1 + rm -f $(DESTDIR)/@mandir@/man1/rasort.1 + rm -f $(DESTDIR)/@mandir@/man1/raxml.1 + rm -f $(DESTDIR)/@mandir@/man1/tcpdump.1 + rm -f $(DESTDIR)/@mandir@/man5/argus.5 + rm -f $(DESTDIR)/@mandir@/man5/argus.conf.5 + rm -f $(DESTDIR)/@mandir@/man5/rarc.5 + + #rm -rf $(docdir) + #rm -f $(exec_prefix)/argus/COPYING + #rm -f $(exec_prefix)/argus/README installdirs: ${srcdir}/config/mkinstalldirs $(bindir) $(infodir) Makefile: Makefile.in config.status diff -NarU5 argus-clients-2.0.6.fixes.1.orig/ragraph/Makefile.in argus-clients-2.0.6.fixes.1/ragraph/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/ragraph/Makefile.in 2003-07-10 13:28:32.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/ragraph/Makefile.in 2006-02-24 14:35:36.000000000 -0500 @@ -20,11 +20,11 @@ # # Various configurable paths (remember to edit Makefile.in, not Makefile) # # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of directory to install the system binaries SBINDIR = @sbindir@ # Pathname of directory to install the system binaries @@ -92,18 +92,18 @@ OBJ = $(SRC:.c=.o) CLEANFILES = $(OBJ) $(PROGS) install: force all - [ -d $(DESTDIR) ] || \ - (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR)) +# [ -d $(DESTDIR) ] || \ +# (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR)) - [ -d $(BINDIR) ] || \ - (mkdir -p $(BINDIR); chmod 755 $(BINDIR)) + [ -d $(DESTDIR)/$(BINDIR) ] || \ + (mkdir -p $(DESTDIR)/$(BINDIR); chmod 755 $(DESTDIR)/$(BINDIR)) - $(INSTALL) @INSTALL_BIN@/rahistogram $(BINDIR) - $(INSTALL) @INSTALL_BIN@/ragraph $(BINDIR) + $(INSTALL) @INSTALL_BIN@/rahistogram $(DESTDIR)/$(BINDIR) + $(INSTALL) @INSTALL_BIN@/ragraph $(DESTDIR)/$(BINDIR) clean: rm -f $(CLEANFILES) distclean: diff -NarU5 argus-clients-2.0.6.fixes.1.orig/ragrep/Makefile.in argus-clients-2.0.6.fixes.1/ragrep/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/ragrep/Makefile.in 2003-07-10 13:28:32.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/ragrep/Makefile.in 2006-02-24 14:36:43.000000000 -0500 @@ -13,11 +13,11 @@ SHELL = /bin/sh # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of directory to install the system binaries SBINDIR = @sbindir@ # Pathname of directory to install the system binaries @@ -188,16 +188,17 @@ maintainer-clean-binPROGRAMS: install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(BINDIR) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done +# installation of binaries handled by toplevel makefile +# @list='$(bin_PROGRAMS)'; for p in $$list; do \ +# if test -f $$p; then \ +# echo " $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ +# $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ +# else :; fi; \ +# done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ diff -NarU5 argus-clients-2.0.6.fixes.1.orig/ratop/Makefile.in argus-clients-2.0.6.fixes.1/ratop/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/ratop/Makefile.in 2003-07-10 13:28:32.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/ratop/Makefile.in 2006-02-24 14:35:36.000000000 -0500 @@ -19,11 +19,11 @@ # # Various configurable paths (remember to edit Makefile.in, not Makefile) # # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of directory to install the system binaries SBINDIR = @sbindir@ # Pathname of directory to install the system binaries BINDIR = @bindir@ @@ -86,18 +86,18 @@ OBJ = $(SRC:.c=.o) CLEANFILES = $(OBJ) $(PROGS) install: force all - [ -d $(DESTDIR) ] || \ - (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR)) - [ -d $(prefix) ] || \ - (mkdir -p $(prefix); chmod 755 $(prefix)) - [ -d $(BINDIR) ] || \ - (mkdir -p $(BINDIR); chmod 755 $(BINDIR)) +# [ -d $(DESTDIR) ] || \ +# (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR)) + [ -d $(DESTDIR)/$(prefix) ] || \ + (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix)) + [ -d $(DESTDIR)/$(BINDIR) ] || \ + (mkdir -p $(DESTDIR)/$(BINDIR); chmod 755 $(DESTDIR)/$(BINDIR)) - $(INSTALL) @INSTALL_BIN@/ratop $(BINDIR) + $(INSTALL) @INSTALL_BIN@/ratop $(DESTDIR)/$(BINDIR) clean: rm -f $(CLEANFILES) distclean: argus-clients-2.0.6.fixes.1-print.patch: --- NEW FILE argus-clients-2.0.6.fixes.1-print.patch --- diff -NarU5 argus-clients-2.0.6.fixes.1.orig/common/argus_client.c argus-clients-2.0.6.fixes.1/common/argus_client.c --- argus-clients-2.0.6.fixes.1.orig/common/argus_client.c 2004-05-10 09:41:34.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/common/argus_client.c 2006-03-08 16:37:12.000000000 -0500 @@ -67,10 +67,14 @@ } RaPrintDate = 0; for (x = 0; x < MAX_PRINT_ALG_TYPES; x++) { if (!strncmp (RaPrintKeyWords[x], soption, strlen(RaPrintKeyWords[x]))) { + if (x == 0) { + RaPrintStartTime = 1; + RaPrintLastTime = 1; + } if (x < 3) RaPrintDate++; switch (RaOptionOperation) { case RA_ADD_OPTION: if (RaOptionRank == -1) { int z = 0; @@ -3088,11 +3092,11 @@ } else break; } if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) { - char tmpbuf[128], *ptr = tmpbuf, *str = RaLabel, lastchr = ' '; + char tmpbuf[1024], *ptr = tmpbuf, *str = RaLabel, lastchr = ' '; bzero (tmpbuf, sizeof(tmpbuf)); lastchr = RaFieldDelimiter; while (*str) { if (*str == ' ') { @@ -3118,12 +3122,14 @@ void ArgusPrintDateLabel (char *buf) { if (lflag) ArgusPrintLastDateLabel (buf); - else + else { ArgusPrintStartDateLabel (buf); + ArgusPrintLastDateLabel (buf); + } } void ArgusPrintStartDateLabel (char *buf) @@ -3446,11 +3452,12 @@ if (ArgusDstUserDataLen > 10) len++; sprintf (&buf[strlen(buf)], "%*sdstUdata%*s ", (len)/2, " ", (len)/2, " "); if (len & 0x01) sprintf(&buf[strlen(buf)], " "); } - } + } else + sprintf (&buf[strlen(buf)], " srcUdata%cdstUdata ", RaFieldDelimiter); } void ArgusPrintTCPExtensionsLabel (char *buf) { diff -NarU5 argus-clients-2.0.6.fixes.1.orig/common/argus_util.c argus-clients-2.0.6.fixes.1/common/argus_util.c --- argus-clients-2.0.6.fixes.1.orig/common/argus_util.c 2003-12-06 12:43:56.000000000 -0500 +++ argus-clients-2.0.6.fixes.1/common/argus_util.c 2006-03-08 16:45:56.000000000 -0500 @@ -907,39 +907,31 @@ extern char *ArgusProgramName; void ArgusPrintStartDate (char *date, struct ArgusRecord *ptr) { - char delim = ' '; struct timeval *tvp = NULL; if (ptr->ahdr.type & ARGUS_MAR) tvp = &ptr->argus_mar.startime; else tvp = &ptr->argus_far.time.start; - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - delim = RaFieldDelimiter; - - sprintf (&date[strlen(date)], "%s%c", print_time(tvp), delim); + sprintf (&date[strlen(date)], "%s", print_time(tvp)); } void ArgusPrintLastDate (char *date, struct ArgusRecord *ptr) { - char delim = ' '; struct timeval *tvp = NULL; if (ptr->ahdr.type & ARGUS_MAR) tvp = &ptr->argus_mar.now; else tvp = &ptr->argus_far.time.last; - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - delim = RaFieldDelimiter; - - sprintf (&date[strlen(date)], "%s%c", print_time(tvp), delim); + sprintf (&date[strlen(date)], "%s", print_time(tvp)); } void ArgusPrintDate (char *date, struct ArgusRecord *ptr) { @@ -965,11 +957,11 @@ if (!((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))) if (RaPrintStartTime && RaPrintLastTime) sprintf (&date[strlen(date)], " "); if (RaPrintLastTime) - sprintf (&date[strlen(date)], "%s%c", print_time(last), delim); + sprintf (&date[strlen(date)], "%s", print_time(last)); } void ArgusPrintSrcRate (char *, struct ArgusRecord *); void ArgusPrintDstRate (char *, struct ArgusRecord *); void ArgusPrintRate (char *, struct ArgusRecord *); @@ -1001,21 +993,21 @@ ArgusThisAgr = (struct ArgusAGRStruct *)ArgusThisFarHdrs[ARGUS_AGR_DSR_INDEX]; if (ArgusThisAgr && (ArgusThisAgr->type == ARGUS_AGR_DSR)) hits = ArgusThisAgr->count; - sprintf(&buf[strlen(buf)], "%5d ", hits); + sprintf(&buf[strlen(buf)], "%5d", hits); } } void ArgusPrintAverageDuration (char *, struct ArgusRecord *); void ArgusPrintAvgDuration (char *date, struct ArgusRecord *ptr) { struct ArgusAGRStruct *ArgusThisAgr = NULL; - char *sptr, *iptr, delim = ' '; + char *sptr, *iptr; struct timeval *start = NULL, *last = NULL; struct timeval buf, *time = &buf; if (ptr->ahdr.type & ARGUS_MAR) { start = &ptr->argus_mar.startime; @@ -1063,21 +1055,16 @@ if (pflag) { sptr = &date[strlen(date)]; sprintf(sptr, ".%06d", (int) time->tv_usec); sptr[pflag + 1] = '\0'; } - - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf(&date[strlen(date)], "%c", delim); - else - sprintf(&date[strlen(date)], "%c", ' '); } void ArgusPrintDuration (char *date, struct ArgusRecord *ptr) { - char *sptr, *iptr, delim = ' '; + char *sptr, *iptr; struct timeval *start = NULL, *last = NULL; struct timeval buf, *time = &buf; if (ptr->ahdr.type & ARGUS_MAR) { start = &ptr->argus_mar.startime; @@ -1113,15 +1100,10 @@ if (pflag) { sptr = &date[strlen(date)]; sprintf(sptr, ".%06d", (int) time->tv_usec); sptr[pflag + 1] = '\0'; } - - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf(&date[strlen(date)], "%c", delim); - else - sprintf(&date[strlen(date)], "%c", ' '); } void ArgusGetIndicatorString (struct ArgusRecord *, char *); @@ -1213,12 +1195,10 @@ } } } } - *ptr = RaFieldDelimiter; - } else { int encdone = 0; bcopy (" ", buf, 9); if (argus->ahdr.type & ARGUS_MAR) { @@ -1384,11 +1364,11 @@ if (ArgusInput->ArgusManStart.ahdr.status & ARGUS_ID_IS_IPADDR) argusIDStr = ipaddr_string (&argus->ahdr.argusid); else sprintf (argusIDStr, "%u", argus->ahdr.argusid); - sprintf(buf, "%-15.15s ", argusIDStr); + sprintf(buf, "%-15.15s", argusIDStr); } void ArgusPrintBinNumber (char *, struct ArgusRecord *); void ArgusPrintBins (char *, struct ArgusRecord *); @@ -1402,11 +1382,11 @@ } void ArgusPrintSequenceNumber (char *buf, struct ArgusRecord *argus) { - sprintf(buf, "%d ", argus->ahdr.seqNumber); + sprintf(buf, "%d", argus->ahdr.seqNumber); } void ArgusPrintIndicator (char *buf, struct ArgusRecord *argus) { @@ -1422,14 +1402,25 @@ struct ArgusMacStruct *mac = (struct ArgusMacStruct *) ArgusThisFarHdrs[ARGUS_MAC_DSR_INDEX]; esrcString = etheraddr_string ((u_char *)&mac->phys_union.ether.ethersrc); edstString = etheraddr_string ((u_char *)&mac->phys_union.ether.etherdst); - sprintf (buf, "%17.17s %17.17s ", esrcString, edstString); + sprintf (buf, "%17.17s", esrcString); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); + sprintf (&buf[strlen(buf)], "%17.17s", edstString); - } else - sprintf (buf, "%17.17s %17.17s ", blankStr, blankStr); + } else { + sprintf (buf, "%17.17s", blankStr); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); + sprintf (&buf[strlen(buf)], "%17.17s", blankStr); + } } void ArgusPrintProto (char *buf, struct ArgusRecord *argus) { @@ -1450,14 +1441,14 @@ protoStr = protoStrBuf; sprintf (protoStr, "%u", proto); protoStr = (nflag > 2) ? protoStrBuf : (proto >= IPPROTOSTR) ? "unas" : ip_proto_string[proto]; - if ((proto == IPPROTO_UDP) && (argus->argus_far.flow.ip_flow.tp_p == ARGUS_RTP_FLOWTAG)) + if ((nflag < 3) && (proto == IPPROTO_UDP) && (argus->argus_far.flow.ip_flow.tp_p == ARGUS_RTP_FLOWTAG)) protoStr = "rtp"; - if ((proto == IPPROTO_UDP) && (argus->argus_far.flow.ip_flow.tp_p == ARGUS_RTCP_FLOWTAG)) + if ((nflag < 3) && (proto == IPPROTO_UDP) && (argus->argus_far.flow.ip_flow.tp_p == ARGUS_RTCP_FLOWTAG)) protoStr = "rtcp"; break; } @@ -1466,11 +1457,11 @@ break; } } if (protoStr != NULL) - sprintf (buf, "%4.4s ", protoStr); + sprintf (buf, "%4.4s", protoStr); } int ArgusPrintNet = 0; void @@ -1535,11 +1526,11 @@ { void *addr = NULL; struct ArgusFlow *flow; if (argus->ahdr.type & ARGUS_MAR) { - sprintf (&buf[strlen(buf)], "%*d ", hfield, argus->argus_mar.nextMrSequenceNum); + sprintf (&buf[strlen(buf)], "%*u ", hfield, argus->argus_mar.nextMrSequenceNum); } else { flow = &argus->argus_far.flow; ArgusThisProto = argus->ahdr.status & 0xFFFF; @@ -1593,13 +1584,14 @@ addrstr = etheraddr_string ((unsigned char *) addr); break; } if (addr != NULL) - sprintf (buf, "%*.*s ", thishfield, thishfield, addrstr); + sprintf (buf, "%*.*s", thishfield, thishfield, addrstr); else - sprintf (buf, "%*.*s ", thishfield, thishfield, " "); + sprintf (buf, "%*.*s", thishfield, thishfield, " "); + } void ArgusPrintSrcPort (char *buf, struct ArgusRecord *argus) @@ -1629,12 +1621,10 @@ } case ETHERTYPE_REVARP: case ETHERTYPE_ARP: sprintf (&buf[strlen(buf)], "%*s", pfield - 1, " "); - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf (buf, "%c", RaFieldDelimiter); break; default: ArgusPrintPort (&buf[strlen(buf)], argus, flow->mac_flow.ssap); break; @@ -1648,11 +1638,11 @@ void ArgusPrintDstPort (char *buf, struct ArgusRecord *argus) { if (argus->ahdr.type & ARGUS_MAR) { - sprintf (&buf[strlen(buf)], "%-*d", pfield + 1, argus->argus_mar.flows); + sprintf (&buf[strlen(buf)], "%-*u", pfield + 1, argus->argus_mar.flows); } else { struct ArgusFlow *flow = &argus->argus_far.flow; ArgusThisProto = argus->ahdr.status & 0xFFFF; @@ -1671,13 +1661,10 @@ else sprintf (&buf[strlen(buf)], "%*s", pfield + 1, " "); } else sprintf (&buf[strlen(buf)], "%*s", pfield - 1, " "); - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf (buf, "%c", RaFieldDelimiter); - break; default: ArgusPrintPort (&buf[strlen(buf)], argus, flow->mac_flow.dsap); break; @@ -1697,75 +1684,82 @@ if (port != 0xFFFF) { if (nflag > 1) { switch (proto) { case IPPROTO_TCP: case IPPROTO_UDP: - if (RaPrintIndex > 0) + if ((RaPrintIndex > 0) && ((RaFieldDelimiter == ' ') || + (RaFieldDelimiter == '\0'))) { if ((RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintSrcAddr) || (RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintDstAddr)) if (RaFieldDelimiter == '\0') if (buf[strlen(buf) - 1] == ' ') buf[strlen(buf) - 1] = '.'; + } + + sprintf (buf, "%-*d", thispfield, port); - sprintf (buf, "%-*d ", thispfield, port); break; default: - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf (&buf[strlen(buf)], "%c", RaFieldDelimiter); - else - sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); break; } } else { switch (proto) { case IPPROTO_TCP: case IPPROTO_UDP: - if (RaPrintIndex > 0) + if ((RaPrintIndex > 0) && ((RaFieldDelimiter == ' ') || + (RaFieldDelimiter == '\0'))) { if ((RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintSrcAddr) || (RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintDstAddr)) if (RaFieldDelimiter == '\0') if (buf[strlen(buf) - 1] == ' ') buf[strlen(buf) - 1] = '.'; + } if (proto == IPPROTO_TCP) - sprintf (buf, "%-*.*s ", thispfield, thispfield, tcpport_string(port)); + sprintf (buf, "%-*.*s", thispfield, thispfield, tcpport_string(port)); else - sprintf (buf, "%-*.*s ", thispfield, thispfield, udpport_string(port)); + sprintf (buf, "%-*.*s", thispfield, thispfield, udpport_string(port)); break; default: - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf (&buf[strlen(buf)], "%c", RaFieldDelimiter); - else - sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); + break; } } } else { if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) { sprintf (buf, "%c", RaFieldDelimiter); } else { switch (proto) { default: - sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); + sprintf (buf, "%-*.*s", thispfield, thispfield, " "); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf (&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); break; case IPPROTO_TCP: case IPPROTO_UDP: - if (RaPrintIndex > 0) + if ((RaPrintIndex > 0) && ((RaFieldDelimiter == ' ') || + (RaFieldDelimiter == '\0'))) { if ((RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintSrcAddr) || (RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintDstAddr)) if (RaFieldDelimiter == '\0') if (buf[strlen(buf) - 1] == ' ') buf[strlen(buf) - 1] = '.'; - + } if (argus->ahdr.status & ARGUS_MERGED) sprintf (buf, "%-*.*s ", thispfield, thispfield, "*"); else - sprintf (buf, "%-*d ", thispfield, port); + sprintf (buf, "%-*d", thispfield, port); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf (&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); break; } } } @@ -1773,20 +1767,13 @@ } default: thispfield -= 2; - if ((ArgusThisProto == 0) && (proto != 0)) { - sprintf (buf, "%-*.*s ", thispfield, thispfield, llcsap_string((unsigned char) port)); - } else { + if ((ArgusThisProto == 0) && (proto != 0)) + sprintf (buf, "%-*.*s", thispfield, thispfield, llcsap_string((unsigned char) port)); - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) { - sprintf (buf, "%c", RaFieldDelimiter); - } else { - sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); - } - } } } @@ -1967,11 +1954,11 @@ sprintf (dirStr, " <-> "); break; } } - sprintf (buf, "%s ", dirStr); + sprintf (buf, "%s", dirStr); } void ArgusPrintCounts (char *buf, struct ArgusRecord *argus) { @@ -1984,11 +1971,11 @@ } else { src_count = argus->argus_far.src.count; dst_count = argus->argus_far.dst.count; } - sprintf (buf, "%-8u %-8u ", src_count, dst_count); + sprintf (buf, "%-8u%c%-8u", src_count,RaFieldDelimiter, dst_count); } void ArgusPrintSrcPackets (char *buf, struct ArgusRecord *argus) { @@ -1999,11 +1986,11 @@ } else { src_count = argus->argus_far.src.count; } - sprintf (buf, "%-8u ", src_count); + sprintf (buf, "%-8u", src_count); } void ArgusPrintDstPackets (char *buf, struct ArgusRecord *argus) { @@ -2014,11 +2001,11 @@ } else { dst_count = argus->argus_far.dst.count; } - sprintf (buf, "%-8u ", dst_count); + sprintf (buf, "%-8u", dst_count); } void ArgusPrintBytes (char *buf, struct ArgusRecord *argus) { @@ -2036,11 +2023,11 @@ src_bytes = argus->argus_far.src.bytes; dst_bytes = argus->argus_far.dst.bytes; } } - sprintf (buf, "%-12u %-12u", src_bytes, dst_bytes); + sprintf (buf, "%-12u%c%-12u", src_bytes, RaFieldDelimiter, dst_bytes); } void ArgusPrintSrcBytes (char *buf, struct ArgusRecord *argus) { @@ -2075,12 +2062,10 @@ } sprintf (buf, "%-12u", dst_bytes); } - - #include void ArgusPrintSrcJitter (char *buf, struct ArgusRecord *argus) { @@ -2090,12 +2075,12 @@ } void ArgusPrintDstJitter (char *buf, struct ArgusRecord *argus) { - RaPrintSrcTime = 1; - RaPrintDstTime = 0; + RaPrintSrcTime = 0; + RaPrintDstTime = 1; ArgusPrintJitter (buf, argus); } void ArgusPrintJitter (char *buf, struct ArgusRecord *argus) @@ -2145,15 +2130,22 @@ sprintf (stdstr, "%d.%03d", istdev/1000, istdev%1000); stdstr[6] = '\0'; sprintf (jitterstr, "%6d.%03d (%6s)", meanval/1000, meanval%1000, stdstr); */ sprintf (jitterstr, "%6d.%03d", meanval/1000, meanval%1000); - sprintf (&buf[strlen(buf)], "%-12s ", jitterstr); + sprintf (&buf[strlen(buf)], "%-12s", jitterstr); } else { sprintf (jitterstr, "%6d.%03d", meanval/1000, meanval%1000); - sprintf (&buf[strlen(buf)], "%-12s ", jitterstr); + sprintf (&buf[strlen(buf)], "%-12s", jitterstr); + } + + if (RaPrintDstTime) { + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); } } if (RaPrintDstTime) { bzero (stdstr, 128); @@ -2318,16 +2310,21 @@ else sprintf (ptr, "%.2f", 0.0); sprintf (buf, "%10s", ptr); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); + if (dst_count > 1) sprintf (ptr, "%.2f", ((double)(dst_count)/seconds)); else sprintf (ptr, "%.2f", 0.0); - sprintf (&buf[strlen(buf)], "%10s ", ptr); + sprintf (&buf[strlen(buf)], "%10s", ptr); } /* struct ArgusTCPObjectMetrics { @@ -2441,15 +2438,23 @@ seconds = (double)(time->tv_sec * 1.0) + (double)(time->tv_usec/1000000.0); if (seconds) { sprintf (ptr, "%.4f", ((double)srcLossPkts)); sprintf (buf, "%10s", ptr); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); sprintf (ptr, "%.4f", ((double)dstLossPkts)); - sprintf (&buf[strlen(buf)], "%10s ", ptr); + sprintf (&buf[strlen(buf)], "%10s", ptr); } else { sprintf (ptr, "%.4f", 0.0); sprintf (buf, "%10s", ptr); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); sprintf (ptr, "%.4f", 0.0); sprintf (&buf[strlen(buf)], "%10s ", ptr); } } } @@ -2490,14 +2495,14 @@ src_bytes = argus->argus_far.src.bytes; } if (seconds) { sprintf (ptr, "%.2f", ((double)(src_bytes * 8.0))/seconds); - sprintf (&buf[strlen(buf)], "%11s ", ptr); + sprintf (&buf[strlen(buf)], "%11s", ptr); } else { sprintf (ptr, "%.2f", 0.0); - sprintf (&buf[strlen(buf)], "%11s ", ptr); + sprintf (&buf[strlen(buf)], "%11s", ptr); } } void @@ -2536,24 +2541,24 @@ dst_bytes = argus->argus_far.dst.bytes; } if (seconds) { sprintf (ptr, "%.2f", ((double)(dst_bytes * 8.0))/seconds); - sprintf (&buf[strlen(buf)], "%13s ", ptr); + sprintf (&buf[strlen(buf)], "%13s", ptr); } else { sprintf (ptr, "%.2f", 0.0); - sprintf (&buf[strlen(buf)], "%13s ", ptr); + sprintf (&buf[strlen(buf)], "%13s", ptr); } } void ArgusPrintLoad (char *buf, struct ArgusRecord *argus) { int src_count = 0, dst_count = 0, src_bytes = 0, dst_bytes = 0; struct timeval *start = NULL, *last = NULL; struct timeval timebuf, *time = &timebuf; - char tmpbuf[128], *ptr = tmpbuf; + char tmpbuf[128], *ptr = tmpbuf, delim = ' '; double seconds; start = &argus->argus_far.time.start; last = &argus->argus_far.time.last; @@ -2581,21 +2586,24 @@ dst_bytes = argus->argus_far.dst.appbytes; } else { src_bytes = argus->argus_far.src.bytes; dst_bytes = argus->argus_far.dst.bytes; } + + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + delim = RaFieldDelimiter; if (seconds) { sprintf (ptr, "%.2f", ((double)(src_bytes * 8.0))/seconds); - sprintf (buf, "%13s", ptr); + sprintf (buf, "%13s%c", ptr, delim); sprintf (ptr, "%.2f", ((double)(dst_bytes * 8.0))/seconds); - sprintf (&buf[strlen(buf)], "%13s ", ptr); + sprintf (&buf[strlen(buf)], "%13s", ptr); } else { sprintf (ptr, "%.2f", 0.0); - sprintf (buf, "%13s", ptr); + sprintf (buf, "%13s%c", ptr, delim); sprintf (ptr, "%.2f", 0.0); - sprintf (&buf[strlen(buf)], "%13s ", ptr); + sprintf (&buf[strlen(buf)], "%13s", ptr); } } void ArgusPrintSrcTTL (char *buf, struct ArgusRecord *argus) @@ -2606,13 +2614,13 @@ for (i = 1; i < 257; i <<= 1) { if ((sdis < 0) && (argus->argus_far.attr_ip.sttl <= i)) { sdis = i - argus->argus_far.attr_ip.sttl; } } - sprintf (&buf[strlen(buf)], " %3d ", sdis); + sprintf (&buf[strlen(buf)], " %3d", sdis); } else - sprintf (&buf[strlen(buf)], " %3d ", argus->argus_far.attr_ip.sttl); + sprintf (&buf[strlen(buf)], " %3d", argus->argus_far.attr_ip.sttl); } void ArgusPrintDstTTL (char *buf, struct ArgusRecord *argus) { @@ -2622,63 +2630,74 @@ for (i = 1; i < 257; i <<= 1) { if ((ddis < 0) && (argus->argus_far.attr_ip.dttl <= i)) { ddis = i - argus->argus_far.attr_ip.dttl; } } - sprintf (&buf[strlen(buf)], " %3d ", ddis); + sprintf (&buf[strlen(buf)], " %3d", ddis); } else - sprintf (&buf[strlen(buf)], " %3d ", argus->argus_far.attr_ip.dttl); + sprintf (&buf[strlen(buf)], " %3d", argus->argus_far.attr_ip.dttl); } void ArgusPrintVLAN (char *buf, struct ArgusRecord *argus) { if (ArgusThisFarStatus & ARGUS_VLAN_DSR_STATUS) { struct ArgusVlanStruct *vlan = (struct ArgusVlanStruct *) ArgusThisFarHdrs[ARGUS_VLAN_DSR_INDEX]; if (vlan->status & ARGUS_SRC_VLAN) - sprintf (&buf[strlen(buf)], "0x%04x ", vlan->sid); + sprintf (&buf[strlen(buf)], "0x%04x%c", vlan->sid, RaFieldDelimiter); else - sprintf(&buf[strlen(buf)], " "); + if (RaFieldDelimiter == ' ') + sprintf(&buf[strlen(buf)], " "); + else + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); if (vlan->status & ARGUS_DST_VLAN) - sprintf (&buf[strlen(buf)], "0x%04x ", vlan->did); + sprintf (&buf[strlen(buf)], "0x%04x", vlan->did); else - sprintf(&buf[strlen(buf)], " "); + if (RaFieldDelimiter == ' ') + sprintf(&buf[strlen(buf)], " "); } else - sprintf (&buf[strlen(buf)], " "); + if (RaFieldDelimiter == ' ') + sprintf (&buf[strlen(buf)], " "); + else + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); } void ArgusPrintMPLS (char *buf, struct ArgusRecord *argus) { if (ArgusThisFarStatus & ARGUS_MPLS_DSR_STATUS) { struct ArgusMplsStruct *mpls = (struct ArgusMplsStruct *) ArgusThisFarHdrs[ARGUS_MPLS_DSR_INDEX]; if (mpls->status & ARGUS_SRC_MPLS) - sprintf (&buf[strlen(buf)], " %5x ", mpls->slabel); + sprintf (&buf[strlen(buf)], "%5x%c", mpls->slabel, RaFieldDelimiter); else - sprintf(&buf[strlen(buf)], " "); + sprintf(&buf[strlen(buf)], " %c", RaFieldDelimiter); if (mpls->status & ARGUS_DST_MPLS) - sprintf (&buf[strlen(buf)], " %5x ", mpls->dlabel); + sprintf (&buf[strlen(buf)], "%5x", mpls->dlabel); else - sprintf(&buf[strlen(buf)], " "); + if (RaFieldDelimiter == ' ') + sprintf(&buf[strlen(buf)], " "); } else - sprintf (&buf[strlen(buf)], " "); + if (RaFieldDelimiter == ' ') + sprintf(&buf[strlen(buf)], " "); + else + sprintf (&buf[strlen(buf)], "%c", RaFieldDelimiter); } void ArgusPrintSrcTOS (char *buf, struct ArgusRecord *argus) { - sprintf (&buf[strlen(buf)], " %3d ", argus->argus_far.attr_ip.stos); + sprintf (&buf[strlen(buf)], " %3d ", argus->argus_far.attr_ip.stos); } void ArgusPrintDstTOS (char *buf, struct ArgusRecord *argus) { - sprintf (&buf[strlen(buf)], " %3d ", argus->argus_far.attr_ip.dtos); + sprintf (&buf[strlen(buf)], " %3d" , argus->argus_far.attr_ip.dtos); } void ArgusPrintWindow (char *buf, struct ArgusRecord *argus) @@ -2692,19 +2711,19 @@ tcp = (struct ArgusTCPObject *)ArgusThisFarHdrs[ARGUS_TCP_DSR_INDEX]; if (tcp != NULL) { srcwin = tcp->src.win; dstwin = tcp->dst.win; - sprintf (&buf[strlen(buf)], "%-5d %-5d ", srcwin, dstwin); + sprintf (&buf[strlen(buf)], "%-5d%c%-5d", srcwin, RaFieldDelimiter, dstwin); } else { - sprintf (&buf[strlen(buf)], "%14s", " "); + sprintf (&buf[strlen(buf)], "%5s%c%5s", " ", RaFieldDelimiter, " "); } break; } default: - sprintf (&buf[strlen(buf)], "%14s", " "); + sprintf (&buf[strlen(buf)], "%5s%c%5s", " ", RaFieldDelimiter, " "); } } void ArgusPrintTCPExtensions (char *buf, struct ArgusRecord *argus) @@ -2848,13 +2867,17 @@ bzero (argus_strbuf, MAXSTRLEN); bzero (tmpbuf, MAXSTRLEN); for (RaPrintIndex = 0; RaPrintIndex < MAX_PRINT_ALG_TYPES; RaPrintIndex++) { - if (RaPrintAlgorithms[RaPrintIndex] != NULL) + if (RaPrintAlgorithms[RaPrintIndex] != NULL) { RaPrintAlgorithms[RaPrintIndex](&argus_strbuf[strlen(argus_strbuf)], argus); - else + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&argus_strbuf[strlen(argus_strbuf)], "%c", RaFieldDelimiter); + else + sprintf(&argus_strbuf[strlen(argus_strbuf)], "%c", ' '); + } else break; } while (isspace((int)(argus_strbuf[strlen(argus_strbuf) - 1]))) argus_strbuf[strlen(argus_strbuf) - 1] = '\0'; @@ -2880,17 +2903,12 @@ *--ptr = '\0'; } } while (*str) { - if (*str == ' ') { - if (lastchr != RaFieldDelimiter) - *ptr++ = RaFieldDelimiter; + if (*str == ' ') while (isspace((int)*str)) str++; - } - lastchr = *str; - *ptr++ = *str++; } if (tmpbuf[strlen(tmpbuf) - 1] == RaFieldDelimiter) tmpbuf[strlen(tmpbuf) - 1] = '\0'; @@ -3225,11 +3243,11 @@ char delim = ' '; if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) delim = RaFieldDelimiter; - if ((ArgusSrcUserDataLen > 0) || (ArgusDstUserDataLen)) { + if ((ArgusSrcUserDataLen > 0) || (ArgusDstUserDataLen > 0)) { if (ArgusSrcUserDataLen > 0) { switch (eflag) { case ARGUS_ENCODE_ASCII: exlen = ArgusSrcUserDataLen; break; @@ -3251,26 +3269,25 @@ len = len > ArgusSrcUserDataLen ? ArgusSrcUserDataLen : len; bzero (strbuf, sizeof(strbuf)); bzero (conbuf, sizeof(conbuf)); if ((len = ArgusEncode (&user->data, NULL, len, str, sizeof(strbuf))) > 0) - sprintf (con, "%cs[%d]=%s", delim, len, str); + sprintf (con, "s[%d]=%s", len, str); else sprintf (con, " "); if (delim == ' ') - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, con); + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s", exlen, con); else - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-s ", con); + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-s", con); - } else { - if (delim != ' ') - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%c", delim); - else - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, " "); } } + if (delim != ' ') + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%c", delim); + else + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, " "); if (ArgusDstUserDataLen > 0) { switch (eflag) { case ARGUS_ENCODE_ASCII: exlen = ArgusDstUserDataLen; @@ -3294,27 +3311,31 @@ len = len > ArgusDstUserDataLen ? ArgusDstUserDataLen : len; bzero (strbuf, sizeof(strbuf)); bzero (conbuf, sizeof(conbuf)); if ((len = ArgusEncode (&user->data, NULL, len, str, sizeof(strbuf))) > 0) - sprintf (con, "%cd[%d]=%s", delim, len, str); + sprintf (con, "d[%d]=%s", len, str); else sprintf (con, " "); if (delim == ' ') sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, con); else - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-s ", con); + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-s", con); - } else - if (delim != ' ') - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%c", delim); - else - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, " "); + } } + if (delim != ' ') + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%c", delim); + else + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, " "); - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], " "); + } else { + if (delim != ' ') + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%c", delim); + else + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s %-*s ", exlen, " ", exlen, " "); } } static char basis_64[] = --- NEW FILE argus.init --- #!/bin/sh # # chkconfig: - 55 45 # description: argus generates network transaction audit records. # processname: argus # # Source function library. . /etc/init.d/functions [ -f /usr/sbin/argus ] || exit 0 # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ "${NETWORKING}" = "no" ] && exit 0 # Set up argus command-line options if [ -e /etc/argus.conf ] ; then ARGUS_OPTIONS="-d" else ARGUS_OPTIONS="-d -e $HOSTNAME -B 127.0.0.1 -P 561" fi RETVAL=0 start() { echo -n $"Starting argus: " daemon argus $ARGUS_OPTIONS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/argus return $RETVAL } stop() { echo -n $"Shutting down argus: " killproc argus RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/argus echo return $RETVAL } dostatus() { status argus } restart() { stop start } condrestart() { [ -e /var/lock/subsys/argus ] && restart || : } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart|reload) restart ;; condrestart) condrestart ;; status) dostatus ;; *) echo "Usage: argus {start|stop|restart|reload|condrestart|status}" exit 1 esac exit $RETVAL --- NEW FILE argus.spec --- Name: argus Version: 2.0.6.fixes.1 Release: 7%{?dist} Summary: Network transaction audit tool License: GPL Group: Applications/Internet Url: http://qosient.com/argus Source0: ftp://ftp.qosient.com/dev/argus-2.0/%{name}-%{version}.tar.gz Source1: ftp://ftp.qosient.com/dev/argus-2.0/%{name}-clients-%{version}.tar.gz Source2: argus.init Source3: README.fedora Patch0: argus-2.0.6.fixes.1-makefile.patch Patch1: argus-2.0.6.fixes.1-build.patch Patch2: argus-clients-2.0.6.fixes.1-makefile.patch Patch3: argus-clients-2.0.6.fixes.1-build.patch Patch4: argus-clients-2.0.6.fixes.1-print.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig #Requires: libpcap BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison %package clients Summary: Client tools for argus network audit Group: Applications/Internet %description Argus (Audit Record Generation and Utilization System) is an IP network transaction audit tool. The data generated by argus can be used for a wide range of tasks such as network operations, security and performance management. %description clients Clients to the argus probe which process and display information. %prep %setup -a0 %setup -a1 %patch0 -p1 %patch1 -p1 pushd %{name}-clients-%{version} %patch2 -p1 %patch3 -p1 %patch4 -p1 popd %{__install} -p -m 0644 %{SOURCE3} . %build %configure --with-sasl=yes %{__make} %{?_smp_mflags} pushd %{name}-clients-%{version} %configure --with-sasl=yes %{__make} %{?_smp_mflags} popd %install %{__rm} -rf %{buildroot} %{__make} DESTDIR=%{buildroot} install pushd %{name}-clients-%{version} %{__make} DESTDIR=%{buildroot} install # avoid unwanted dependencies when using these as docs (clients package): find doc contrib support ragraph -type f -exec chmod a-x '{}' \; popd %{__rm} -rf %{buildroot}/%{_libdir} %{__rm} -rf %{buildroot}/%{_bindir}/ragraph %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/lib/argus/archive %{__install} -D -m 0644 support/Config/argus.conf %{buildroot}/%{_sysconfdir}/argus.conf %{__install} -D -m 0755 %{SOURCE2} %{buildroot}/%{_initrddir}/argus # fix up argus.conf to a good default %{__sed} -i 's|var/log/argus|var/lib/argus|' %{buildroot}/%{_sysconfdir}/argus.conf %{__sed} -i 's|#ARGUS_BIND_IP|ARGUS_BIND_IP|' %{buildroot}/%{_sysconfdir}/argus.conf %{__sed} -i 's|#ARGUS_ACCESS_PORT|ARGUS_ACCESS_PORT|' %{buildroot}/%{_sysconfdir}/argus.conf # avoid unwanted dependencies when using these as docs (main package): find support -type f -exec chmod a-x '{}' \; %clean %{__rm} -rf %{buildroot} %post # only post-install if [ $1 -le 1 ]; then /sbin/chkconfig --add argus fi %preun # only pre-erase if [ $1 -eq 0 ]; then /sbin/service argus stop >/dev/null 2>&1 /sbin/chkconfig --del argus fi %postun # only postun-upgrade if [ $1 -ge 1 ]; then /sbin/service argus condrestart >/dev/null 2>&1 fi %files %defattr(-,root,root) %doc support doc/CHANGES doc/FAQ doc/HOW-TO doc/html bin/argusbug %doc COPYING CREDITS INSTALL README VERSION %config(noreplace) %{_sysconfdir}/argus.conf %{_initrddir}/argus %{_sbindir}/argus* %{_mandir}/man5/argus* %{_mandir}/man8/argus* %dir %{_localstatedir}/lib/argus %dir %{_localstatedir}/lib/argus/archive %files clients %doc %{name}-clients-%{version}/ChangeLog %{name}-clients-%{version}/COPYING %doc %{name}-clients-%{version}/CREDITS %{name}-clients-%{version}/INSTALL %doc %{name}-clients-%{version}/README %{name}-clients-%{version}/VERSION %doc %{name}-clients-%{version}/doc/CHANGES %{name}-clients-%{version}/doc/FAQ %doc %{name}-clients-%{version}/doc/HOW-TO %{name}-clients-%{version}/doc/html %doc %{name}-clients-%{version}/support %doc %{name}-clients-%{version}/ragraph/ragraph.pl # .pm checked for dependencies regardless of permissions #%doc %{name}-clients-%{version}/contrib %doc README.fedora %{_bindir}/ra* %{_mandir}/man1/ra* %{_mandir}/man5/ra* %changelog * Wed Mar 15 2006 Gabriel Somlo 2.0.6.fixes.1-7 - fixed argus makefile patch * Fri Mar 10 2006 Gabriel Somlo 2.0.6.fixes.1-6 - argus.conf now enables listening for connections on localhost - added README.fedora to clients subpackage explaining contrib situation and ra printing patch * Wed Mar 08 2006 Gabriel Somlo 2.0.6.fixes.1-5 - added patch from Peter Van Epp to fix ra printing bugs * Mon Mar 06 2006 Gabriel Somlo 2.0.6.fixes.1-4 - removing execute flag from all documentation - capture file location changed /var/argus -> /var/lib/argus - init script set to default-disabled * Sun Mar 05 2006 Gabriel Somlo 2.0.6.fixes.1-3 - backed out of __perl_requires redefine for .pm files - trouble w. rpmbuild * Fri Feb 24 2006 Gabriel Somlo 2.0.6.fixes.1-2 - empty perl_req/prov avoids .pm's in %doc from being dep-checked at all - misc spec file fixes * Fri Feb 24 2006 Gabriel Somlo 2.0.6.fixes.1-1 - initial build for fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/argus/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Mar 2006 19:31:46 -0000 1.1 +++ .cvsignore 17 Mar 2006 19:32:36 -0000 1.2 @@ -0,0 +1,2 @@ +argus-2.0.6.fixes.1.tar.gz +argus-clients-2.0.6.fixes.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/argus/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Mar 2006 19:31:46 -0000 1.1 +++ sources 17 Mar 2006 19:32:36 -0000 1.2 @@ -0,0 +1,2 @@ +b90b8ea951fd0e2193b9a6bab565a139 argus-2.0.6.fixes.1.tar.gz +59f65159070f849211685513384fa90f argus-clients-2.0.6.fixes.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 19:37:17 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:37:17 -0500 Subject: owners owners.list,1.748,1.749 Message-ID: <200603171937.k2HJboiS030310@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30293/owners Modified Files: owners.list Log Message: added entry for argus Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.748 retrieving revision 1.749 diff -u -r1.748 -r1.749 --- owners.list 17 Mar 2006 18:17:23 -0000 1.748 +++ owners.list 17 Mar 2006 19:37:17 -0000 1.749 @@ -47,6 +47,7 @@ Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|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|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org| Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| 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 Fri Mar 17 19:55:46 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Fri, 17 Mar 2006 14:55:46 -0500 Subject: rpms/dkms/devel .cvsignore, 1.5, 1.6 dkms.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603171956.k2HJuIbl030616@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/dkms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30595 Modified Files: .cvsignore dkms.spec sources Log Message: update to 2.0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Dec 2005 15:54:10 -0000 1.5 +++ .cvsignore 17 Mar 2006 19:55:45 -0000 1.6 @@ -1 +1 @@ -dkms-2.0.9.tar.gz +dkms-2.0.10.tar.gz Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dkms.spec 13 Feb 2006 04:27:51 -0000 1.9 +++ dkms.spec 17 Mar 2006 19:55:45 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.9 -Release: 2%{?dist} +Version: 2.0.10 +Release: 1%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch @@ -9,7 +9,7 @@ Requires: bash > 1.99 Provides: dkms-minimal URL: http://linux.dell.com/dkms -Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz +Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: kernel-devel @@ -103,6 +103,13 @@ %changelog +* Fri Mar 17 2006 Matt Domsch 2.0.10-1 +- Update to 2.0.10 + - add PRE_INSTALL dkms.conf directive + - add SuSE Kernel Module Package (mkkmp) support + - patch from Eric Devolder enables mkinitrd for Debian Sarge + - include debian/ directory in upstream tarball + * Sun Feb 12 2006 Matt Domsch 2.0.9-2 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Dec 2005 15:54:10 -0000 1.5 +++ sources 17 Mar 2006 19:55:45 -0000 1.6 @@ -1 +1 @@ -a0f0cff22c84386cbe897e812a2eda29 dkms-2.0.9.tar.gz +76cf622250341690649f5637c6d871f6 dkms-2.0.10.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 20:01:41 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 17 Mar 2006 15:01:41 -0500 Subject: rpms/gourmet/FC-4 .cvsignore, 1.4, 1.5 gourmet.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603172002.k2HK2IVO032594@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30676 Modified Files: .cvsignore gourmet.spec sources Log Message: Updated version removed shell bangs from site-lib stuff that isn't installed as executable fixed some EOL encoding errors Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Nov 2005 23:29:07 -0000 1.4 +++ .cvsignore 17 Mar 2006 20:01:40 -0000 1.5 @@ -1,2 +1,3 @@ gourmet-0.8.5.12.tar.gz gourmet-0.8.5.13.tar.gz +gourmet-0.8.5.14.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/gourmet.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gourmet.spec 11 Nov 2005 23:29:07 -0000 1.3 +++ gourmet.spec 17 Mar 2006 20:01:40 -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: gourmet -Version: 0.8.5.13 +Version: 0.8.5.14 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,10 +33,21 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop +%{__sed} -i 's?\r??' src/lib/defaults_sk.py +%{__sed} -i 's?\r??' src/lib/defaults_pt.py +chmod -x data/recipe.dtd # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f popd +# remove shell bangs +pushd src/lib +for file in `find . -type f`; do + cp $file $file.orig + grep -v "\#\!\/usr\/bin" $file.orig > $file + rm -f $file.orig +done +popd %build pushd i18n @@ -52,6 +63,7 @@ %{__python} setup.py install -O1 --skip-build --root %buildroot \ --disable-modules-check + desktop-file-install %buildroot%_datadir/applications/gourmet.desktop \ --vendor=fedora \ --add-category=X-Fedora \ @@ -59,7 +71,6 @@ --copy-name-to-generic-name \ --delete-original - %find_lang %{name} %clean @@ -98,6 +109,10 @@ %{_datadir}/gourmet %changelog +* Fri Mar 17 2006 Michael A. Peters - 0.8.5.14-1 +- New upstream version +- rpmlint cleanup + * Fri Nov 11 2005 Michael A. Peters - 0.8.5.13-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Nov 2005 23:29:07 -0000 1.4 +++ sources 17 Mar 2006 20:01:40 -0000 1.5 @@ -1,2 +1,3 @@ 77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz 3db64a0609bf5d97b81d8600dda559b9 gourmet-0.8.5.13.tar.gz +f958809ea958f79a0593c3e226388faa gourmet-0.8.5.14.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 20:07:42 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 17 Mar 2006 15:07:42 -0500 Subject: rpms/gourmet/FC-5 gourmet.spec,1.3,1.4 sources,1.4,1.5 Message-ID: <200603172008.k2HK8Hfw032655@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32632 Modified Files: gourmet.spec sources Log Message: sync with fc-4 changes Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-5/gourmet.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gourmet.spec 11 Nov 2005 23:30:17 -0000 1.3 +++ gourmet.spec 17 Mar 2006 20:07:41 -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: gourmet -Version: 0.8.5.13 +Version: 0.8.5.14 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,10 +33,21 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop +%{__sed} -i 's?\r??' src/lib/defaults_sk.py +%{__sed} -i 's?\r??' src/lib/defaults_pt.py +chmod -x data/recipe.dtd # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f popd +# remove shell bangs +pushd src/lib +for file in `find . -type f`; do + cp $file $file.orig + grep -v "\#\!\/usr\/bin" $file.orig > $file + rm -f $file.orig +done +popd %build pushd i18n @@ -52,6 +63,7 @@ %{__python} setup.py install -O1 --skip-build --root %buildroot \ --disable-modules-check + desktop-file-install %buildroot%_datadir/applications/gourmet.desktop \ --vendor=fedora \ --add-category=X-Fedora \ @@ -59,7 +71,6 @@ --copy-name-to-generic-name \ --delete-original - %find_lang %{name} %clean @@ -98,6 +109,10 @@ %{_datadir}/gourmet %changelog +* Fri Mar 17 2006 Michael A. Peters - 0.8.5.14-1 +- New upstream version +- rpmlint cleanup + * Fri Nov 11 2005 Michael A. Peters - 0.8.5.13-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Nov 2005 23:30:17 -0000 1.4 +++ sources 17 Mar 2006 20:07:41 -0000 1.5 @@ -1,2 +1,3 @@ 77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz 3db64a0609bf5d97b81d8600dda559b9 gourmet-0.8.5.13.tar.gz +f958809ea958f79a0593c3e226388faa gourmet-0.8.5.14.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 20:41:52 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Fri, 17 Mar 2006 15:41:52 -0500 Subject: rpms/dkms/FC-4 .cvsignore, 1.4, 1.5 dkms.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603172042.k2HKgPBn001349@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/dkms/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1301 Modified Files: .cvsignore dkms.spec sources Log Message: update to 2.0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Dec 2005 15:53:50 -0000 1.4 +++ .cvsignore 17 Mar 2006 20:41:52 -0000 1.5 @@ -1 +1 @@ -dkms-2.0.9.tar.gz +dkms-2.0.10.tar.gz Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-4/dkms.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dkms.spec 10 Dec 2005 15:53:50 -0000 1.7 +++ dkms.spec 17 Mar 2006 20:41:52 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.9 +Version: 2.0.10 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -9,7 +9,7 @@ Requires: bash > 1.99 Provides: dkms-minimal URL: http://linux.dell.com/dkms -Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz +Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: kernel-devel @@ -103,6 +103,16 @@ %changelog +* Fri Mar 17 2006 Matt Domsch 2.0.10-1 +- Update to 2.0.10 + - add PRE_INSTALL dkms.conf directive + - add SuSE Kernel Module Package (mkkmp) support + - patch from Eric Devolder enables mkinitrd for Debian Sarge + - include debian/ directory in upstream tarball + +* Sun Feb 12 2006 Matt Domsch 2.0.9-2 +- rebuild for FC5 + * Sat Dec 10 2005 Matt Domsch 2.0.9-1 - Added URL tag - Update to 2.0.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Dec 2005 15:53:50 -0000 1.5 +++ sources 17 Mar 2006 20:41:52 -0000 1.6 @@ -1 +1 @@ -a0f0cff22c84386cbe897e812a2eda29 dkms-2.0.9.tar.gz +76cf622250341690649f5637c6d871f6 dkms-2.0.10.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 20:44:02 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Fri, 17 Mar 2006 15:44:02 -0500 Subject: rpms/dkms/FC-3 .cvsignore, 1.4, 1.5 dkms.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603172044.k2HKiYRJ001535@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/dkms/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1478 Modified Files: .cvsignore dkms.spec sources Log Message: update to 2.0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Dec 2005 15:52:53 -0000 1.4 +++ .cvsignore 17 Mar 2006 20:44:01 -0000 1.5 @@ -1 +1 @@ -dkms-2.0.9.tar.gz +dkms-2.0.10.tar.gz Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-3/dkms.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dkms.spec 10 Dec 2005 15:52:53 -0000 1.7 +++ dkms.spec 17 Mar 2006 20:44:01 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.9 +Version: 2.0.10 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -9,7 +9,7 @@ Requires: bash > 1.99 Provides: dkms-minimal URL: http://linux.dell.com/dkms -Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz +Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: kernel-devel @@ -103,6 +103,16 @@ %changelog +* Fri Mar 17 2006 Matt Domsch 2.0.10-1 +- Update to 2.0.10 + - add PRE_INSTALL dkms.conf directive + - add SuSE Kernel Module Package (mkkmp) support + - patch from Eric Devolder enables mkinitrd for Debian Sarge + - include debian/ directory in upstream tarball + +* Sun Feb 12 2006 Matt Domsch 2.0.9-2 +- rebuild for FC5 + * Sat Dec 10 2005 Matt Domsch 2.0.9-1 - Added URL tag - Update to 2.0.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Dec 2005 15:52:53 -0000 1.5 +++ sources 17 Mar 2006 20:44:01 -0000 1.6 @@ -1 +1 @@ -a0f0cff22c84386cbe897e812a2eda29 dkms-2.0.9.tar.gz +76cf622250341690649f5637c6d871f6 dkms-2.0.10.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 21:13:37 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Fri, 17 Mar 2006 16:13:37 -0500 Subject: rpms/dkms/FC-5 .cvsignore, 1.5, 1.6 dkms.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603172114.k2HLEBGL003764@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/dkms/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3743 Modified Files: .cvsignore dkms.spec sources Log Message: update to 2.0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Dec 2005 15:54:10 -0000 1.5 +++ .cvsignore 17 Mar 2006 21:13:37 -0000 1.6 @@ -1 +1 @@ -dkms-2.0.9.tar.gz +dkms-2.0.10.tar.gz Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-5/dkms.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dkms.spec 13 Feb 2006 04:27:51 -0000 1.9 +++ dkms.spec 17 Mar 2006 21:13:37 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.9 -Release: 2%{?dist} +Version: 2.0.10 +Release: 1%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch @@ -9,7 +9,7 @@ Requires: bash > 1.99 Provides: dkms-minimal URL: http://linux.dell.com/dkms -Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz +Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: kernel-devel @@ -103,6 +103,13 @@ %changelog +* Fri Mar 17 2006 Matt Domsch 2.0.10-1 +- Update to 2.0.10 + - add PRE_INSTALL dkms.conf directive + - add SuSE Kernel Module Package (mkkmp) support + - patch from Eric Devolder enables mkinitrd for Debian Sarge + - include debian/ directory in upstream tarball + * Sun Feb 12 2006 Matt Domsch 2.0.9-2 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Dec 2005 15:54:10 -0000 1.5 +++ sources 17 Mar 2006 21:13:37 -0000 1.6 @@ -1 +1 @@ -a0f0cff22c84386cbe897e812a2eda29 dkms-2.0.9.tar.gz +76cf622250341690649f5637c6d871f6 dkms-2.0.10.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 21:16:40 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:16:40 -0500 Subject: rpms/libshout/FC-5 libshout.spec,1.12,1.13 Message-ID: <200603172117.k2HLHCFm003887@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3841 Modified Files: libshout.spec Log Message: bump for rebuild Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-5/libshout.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libshout.spec 17 Mar 2006 16:45:39 -0000 1.12 +++ libshout.spec 17 Mar 2006 21:16:39 -0000 1.13 @@ -1,6 +1,6 @@ Name: libshout Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: icecast source streaming library Group: System Environment/Libraries @@ -29,6 +29,11 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: libogg-devel +Requires: libvorbis-devel +Requires: libtheora-devel +Requires: speex-devel + %description devel The libshout-devel package contains the header files needed for developing applications that send data to an icecast server. Install libshout-devel if @@ -75,6 +80,10 @@ %changelog * Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-3 +- add Requires: to -devel package + +* Fri Mar 17 2006 Thomas Vander Stichele - 2.2-2 - rebuild to please the extras repository From fedora-extras-commits at redhat.com Fri Mar 17 21:18:12 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:18:12 -0500 Subject: rpms/libshout/FC-4 libshout.spec,1.9,1.10 Message-ID: <200603172118.k2HLIi2M003954@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3934 Modified Files: libshout.spec Log Message: bump for rebuild Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-4/libshout.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libshout.spec 10 Mar 2006 15:19:53 -0000 1.9 +++ libshout.spec 17 Mar 2006 21:18:12 -0000 1.10 @@ -1,6 +1,6 @@ Name: libshout Version: 2.2 -Release: 1%{?dist} +Release: 3%{?dist} Summary: icecast source streaming library Group: System Environment/Libraries @@ -29,6 +29,11 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: libogg-devel +Requires: libvorbis-devel +Requires: libtheora-devel +Requires: speex-devel + %description devel The libshout-devel package contains the header files needed for developing applications that send data to an icecast server. Install libshout-devel if @@ -74,6 +79,14 @@ %{_datadir}/aclocal/shout.m4 %changelog +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-3 +- add Requires: to -devel package + +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-2 +- rebuild to please the extras repository + * Fri Mar 10 2006 Thomas Vander Stichele - 2.2-1 - new (incompatible) version, but deps are updated From fedora-extras-commits at redhat.com Fri Mar 17 21:24:44 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:24:44 -0500 Subject: rpms/flumotion/FC-5 flumotion.spec,1.4,1.5 Message-ID: <200603172125.k2HLPHak004107@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/flumotion/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4089 Modified Files: flumotion.spec Log Message: require pyOpenSSL Index: flumotion.spec =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-5/flumotion.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- flumotion.spec 5 Mar 2006 14:17:25 -0000 1.4 +++ flumotion.spec 17 Mar 2006 21:24:44 -0000 1.5 @@ -5,7 +5,7 @@ Name: flumotion Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flumotion - the Fluendo Streaming Server Group: Applications/Internet @@ -21,6 +21,7 @@ Requires: python-twisted >= 1.3.0 Requires: pygtk2 >= 2.8.0 Requires: python-imaging +Requires: pyOpenSSL # for make-dummy-cert to work Requires(post): openssl @@ -219,6 +220,10 @@ %{_sysconfdir}/rc.d/init.d/flumotion %changelog +* Fri Mar 17 2006 Thomas Vander Stichele +- 0.2.0-2 +- require pyOpenSSL, without which the manager does not start + * Sun Mar 05 2006 Thomas Vander Stichele - 0.2.0-1 - new upstream release From fedora-extras-commits at redhat.com Fri Mar 17 21:25:34 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Fri, 17 Mar 2006 16:25:34 -0500 Subject: rpms/dkms/FC-5 dkms.spec,1.10,1.11 Message-ID: <200603172126.k2HLQ6l2004134@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/dkms/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4117 Modified Files: dkms.spec Log Message: bump release Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-5/dkms.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dkms.spec 17 Mar 2006 21:13:37 -0000 1.10 +++ dkms.spec 17 Mar 2006 21:25:34 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms Version: 2.0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch @@ -103,6 +103,9 @@ %changelog +* Fri Mar 17 2006 Matt Domsch 2.0.10-2 +- bump release + * Fri Mar 17 2006 Matt Domsch 2.0.10-1 - Update to 2.0.10 - add PRE_INSTALL dkms.conf directive From fedora-extras-commits at redhat.com Fri Mar 17 21:29:05 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:29:05 -0500 Subject: rpms/flumotion/FC-5 flumotion.spec,1.5,1.6 Message-ID: <200603172129.k2HLTbC4004241@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/flumotion/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4221 Modified Files: flumotion.spec Log Message: require pyOpenSSL Index: flumotion.spec =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-5/flumotion.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- flumotion.spec 17 Mar 2006 21:24:44 -0000 1.5 +++ flumotion.spec 17 Mar 2006 21:29:04 -0000 1.6 @@ -100,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT %pre -/usr/sbin/useradd -s /sbin/nologin -r -d %{_datadir}/flumotion -M -r \ +/usr/sbin/useradd -s /sbin/nologin -r -d %{_localstatedir}/cache/flumotion -M -r \ flumotion > /dev/null 2> /dev/null || : %post @@ -211,7 +211,6 @@ %{_datadir}/flumotion/image %{_datadir}/flumotion/make-dummy-cert %{_datadir}/flumotion/*.xsl -%dir %attr(750,flumotion,root) %{_datadir}/flumotion/.flumotion %attr(750,flumotion,root) %{_sysconfdir}/flumotion %attr(750,flumotion,root) %{_localstatedir}/run/flumotion @@ -223,6 +222,8 @@ * Fri Mar 17 2006 Thomas Vander Stichele - 0.2.0-2 - require pyOpenSSL, without which the manager does not start +- use /var/cache/flumotion as the home dir, so that the cache can be written, + instead of using datadir * Sun Mar 05 2006 Thomas Vander Stichele - 0.2.0-1 From fedora-extras-commits at redhat.com Fri Mar 17 21:42:49 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:42:49 -0500 Subject: rpms/acpi - New directory Message-ID: <200603172142.k2HLgpHL004354@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346/acpi Log Message: Directory /cvs/extras/rpms/acpi added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 21:42:55 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:42:55 -0500 Subject: rpms/acpi/devel - New directory Message-ID: <200603172142.k2HLgv1r004369@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346/acpi/devel Log Message: Directory /cvs/extras/rpms/acpi/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 21:43:17 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:43:17 -0500 Subject: rpms/acpi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603172143.k2HLhJsR004403@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4391 Added Files: Makefile import.log Log Message: Setup of module acpi --- NEW FILE Makefile --- # Top level Makefile for module acpi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 17 21:43:23 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:43:23 -0500 Subject: rpms/acpi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603172143.k2HLhPNP004427@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4391/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module acpi --- NEW 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 Mar 17 21:43:50 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:43:50 -0500 Subject: rpms/libshout/FC-3 .cvsignore, 1.2, 1.3 libshout.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200603172144.k2HLiMdj004533@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462 Modified Files: .cvsignore libshout.spec sources Log Message: bump for rebuild Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:46:31 -0000 1.2 +++ .cvsignore 17 Mar 2006 21:43:49 -0000 1.3 @@ -1 +1 @@ -libshout-1.0.9.tar.gz +libshout-2.2.tar.gz Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-3/libshout.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libshout.spec 10 Dec 2004 22:03:05 -0000 1.4 +++ libshout.spec 17 Mar 2006 21:43:49 -0000 1.5 @@ -1,19 +1,26 @@ Name: libshout -Version: 1.0.9 -Release: 1 -Summary: icecast source streaming library. +Version: 2.2 +Release: 3%{?dist} +Summary: icecast source streaming library -Group: Libraries/Multimedia +Group: System Environment/Libraries License: LGPL URL: http://www.icecast.org/ -Source: http://developer.icecast.org/libshout/releases/%{name}-%{version}.tar.gz -Patch: libshout-makefile.patch +Source: http://downloads.us.xiph.org/releases/libshout/libshout-%{version}.tar.gz +Patch: libshout.autotools.patch + +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: libtheora-devel +BuildRequires: speex-devel + +# so it generates and installs the .pc file +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires(post,postun): /sbin/ldconfig %description -Libshout is a library for communicating with and sending data to an +ibshout is a library for communicating with and sending data to an icecast server. It handles the socket connection, the timing of the data, and prevents most bad data from getting to the icecast server. @@ -22,6 +29,11 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: libogg-devel +Requires: libvorbis-devel +Requires: libtheora-devel +Requires: speex-devel + %description devel The libshout-devel package contains the header files needed for developing applications that send data to an icecast server. Install libshout-devel if @@ -38,11 +50,12 @@ %install rm -rf $RPM_BUILD_ROOT -# docs install in $(prefix)/doc, we don't want that, so don't go into SUBDIRS -%makeinstall SUBDIRS= +%makeinstall find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' - + +rm -rf $RPM_BUILD_ROOT%{_docdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -52,18 +65,41 @@ %files %defattr(-,root,root,-) -%doc AUTHORS CHANGES COPYING README +%doc COPYING NEWS README %{_libdir}/libshout.so.* %files devel %defattr(-,root,root,-) -%doc doc/*.html doc/style.css +%doc examples/*.c doc/*.xml doc/*.xsl %{_libdir}/libshout.a %{_libdir}/libshout.so +%{_libdir}/pkgconfig/shout.pc +%dir %{_includedir}/shout/ %{_includedir}/shout/shout.h - -# ----------------------------------------------------------------------------- +%{_datadir}/aclocal/shout.m4 %changelog +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-3 +- add Requires: to -devel package + +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-2 +- rebuild to please the extras repository + +* Fri Mar 10 2006 Thomas Vander Stichele +- 2.2-1 +- new (incompatible) version, but deps are updated +- various cleanups + +* Sun May 22 2005 Jeremy Katz - 1.0.9-4 +- rebuild on all arches + +* Fri Apr 1 2005 Michael Schwendt - 1.0.9-3 +- Include headers directory entry in -devel package. + +* Sat Feb 26 2005 Ville Skytt?? - 1.0.9-2 +- Remove redundant explicit /sbin/ldconfig dependency. + * Wed Jun 04 2003 Thomas Vander Stichele - 1.0.9-0.fdr.1: initial RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:46:31 -0000 1.2 +++ sources 17 Mar 2006 21:43:49 -0000 1.3 @@ -1 +1 @@ -bbe598e28bbf2989a90d78ff33953ea2 libshout-1.0.9.tar.gz +d5b273a072785ee14a85ff76f66850aa libshout-2.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 21:44:02 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:44:02 -0500 Subject: rpms/acpi import.log,1.1,1.2 Message-ID: <200603172144.k2HLiYIt004543@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4494 Modified Files: import.log Log Message: auto-import acpi-0.09-1 on branch devel from acpi-0.09-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/acpi/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Mar 2006 21:43:17 -0000 1.1 +++ import.log 17 Mar 2006 21:44:02 -0000 1.2 @@ -0,0 +1 @@ +acpi-0_09-1:HEAD:acpi-0.09-1.src.rpm:1142631817 From fedora-extras-commits at redhat.com Fri Mar 17 21:44:08 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:44:08 -0500 Subject: rpms/acpi/devel acpi-0.09-keep_CFLAGS.diff, NONE, 1.1 acpi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603172144.k2HLieEa004576@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4494/devel Modified Files: .cvsignore sources Added Files: acpi-0.09-keep_CFLAGS.diff acpi.spec Log Message: auto-import acpi-0.09-1 on branch devel from acpi-0.09-1.src.rpm acpi-0.09-keep_CFLAGS.diff: --- NEW FILE acpi-0.09-keep_CFLAGS.diff --- --- Makefile.in-old 2006-03-06 11:18:24.000000000 +0100 +++ Makefile.in 2006-03-06 11:18:41.000000000 +0100 @@ -69,7 +69,7 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -CFLAGS = -Wall +CFLAGS = @CFLAGS@ bin_PROGRAMS = acpi acpi_SOURCES = acpi.c main.c list.c --- NEW FILE acpi.spec --- Summary: Command-line ACPI client Summary(pl): Klient ACPI dzia??aj??cy z linii polece?? Name: acpi Version: 0.09 Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://grahame.angrygoats.net/source/acpi/acpi-%{version}.tar.gz Patch0: acpi-0.09-keep_CFLAGS.diff URL: http://grahame.angrygoats.net/acpi.shtml BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Linux ACPI client is a small command-line program that attempts to replicate the functionality of the 'old' apm command on ACPI systems. It includes battery and thermal information. %description -l pl Klient Linux ACPI to ma??y program dzia??aj??cy z linii polece??, b??d??cy pr??b?? zast??pienia funkcjonalno??ci "starego" polecenia apm na systemach opartych o ACPI. Zawiera informacje o zasilaniu i temperaturze. %prep %setup -q %patch0 %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 ChangeLog README COPYING %{_bindir}/acpi %changelog * Mon Mar 6 2006 Patrice Dumas - 0.09-1 - based on pld. Updated, and adapted to fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/acpi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Mar 2006 21:43:22 -0000 1.1 +++ .cvsignore 17 Mar 2006 21:44:08 -0000 1.2 @@ -0,0 +1 @@ +acpi-0.09.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/acpi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Mar 2006 21:43:22 -0000 1.1 +++ sources 17 Mar 2006 21:44:08 -0000 1.2 @@ -0,0 +1 @@ +a5a70595834b487c3a2f9278a3d60768 acpi-0.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 21:48:21 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Fri, 17 Mar 2006 16:48:21 -0500 Subject: rpms/ghdl/FC-5 ghdl-svn38.patch,1.1,NONE ghdl-svn39.patch,1.1,NONE Message-ID: <200603172148.k2HLmNjM004692@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4683 Removed Files: ghdl-svn38.patch ghdl-svn39.patch Log Message: remove unneeded patches --- ghdl-svn38.patch DELETED --- --- ghdl-svn39.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 21:51:00 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:51:00 -0500 Subject: rpms/libshout/FC-3 libshout.autotools.patch, NONE, 1.1 libshout-makefile.patch, 1.1, NONE Message-ID: <200603172151.k2HLp22f004728@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4716 Added Files: libshout.autotools.patch Removed Files: libshout-makefile.patch Log Message: bump for rebuild libshout.autotools.patch: --- NEW FILE libshout.autotools.patch --- diff -Naur libshout-2.2/include/shout/Makefile.am libshout-2.2.patched/include/shout/Makefile.am --- libshout-2.2/include/shout/Makefile.am 2004-03-21 05:03:33.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.am 2006-03-10 14:09:58.000000000 +0100 @@ -2,5 +2,5 @@ AUTOMAKE_OPTIONS = foreign -includedir = $(prefix)/include/shout -nodist_include_HEADERS = shout.h +pkgincludedir = $(includedir)/shout +nodist_pkginclude_HEADERS = shout.h diff -Naur libshout-2.2/include/shout/Makefile.in libshout-2.2.patched/include/shout/Makefile.in --- libshout-2.2/include/shout/Makefile.in 2006-01-03 20:19:05.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.in 2006-03-10 14:14:56.000000000 +0100 @@ -61,7 +61,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(includedir)" nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(nodist_include_HEADERS) +HEADERS = $(nodist_pkginclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -197,7 +197,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -includedir = $(prefix)/include/shout +pkgincludedir = $(includedir)//shout infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ @@ -217,7 +217,7 @@ target = @target@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign -nodist_include_HEADERS = shout.h +nodist_pkginclude_HEADERS = shout.h all: all-am .SUFFIXES: @@ -262,22 +262,22 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -install-nodist_includeHEADERS: $(nodist_include_HEADERS) +install-nodist_includeHEADERS: $(nodist_pkginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ - $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ done uninstall-nodist_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(includedir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) --- libshout-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 22:23:15 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:23:15 -0500 Subject: kadischi/bootsplash - New directory Message-ID: <200603172223.k2HMNFhd006909@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/bootsplash In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6900/bootsplash Log Message: Directory /cvs/devel/kadischi/bootsplash added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 22:30:07 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:30:07 -0500 Subject: kadischi/post_install_scripts 01prelink.sh, NONE, 1.1 01umountproc.sh, 1.1.1.1, NONE Message-ID: <200603172230.k2HMU7OJ007037@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6963/kadischi/post_install_scripts Added Files: 01prelink.sh Removed Files: 01umountproc.sh Log Message: Kadischi transitional fixes(FC4->FC5), standard bootsplash support --- NEW FILE 01prelink.sh --- #!/bin/bash # # chroot to build directory and prelink . /etc/kadischi/build.conf CHROOTDIR=$BUILDDIR/livecd-build_no$BUILDNUM/system if [ -f $CHROOTDIR/etc/prelink.conf ]; then echo "Prelinking.. " chroot $CHROOTDIR /bin/mount -t proc /proc /proc || exit 1 chroot $CHROOTDIR /usr/sbin/prelink --all >/dev/null 2>&1 chroot $CHROOTDIR /bin/umount /proc || exit 1 exit 0 else echo "No prelink.conf found.. won't prelink." exit 0 fi --- 01umountproc.sh DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 22:29:51 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:29:51 -0500 Subject: kadischi Makefile.am,1.1.1.1,1.2 configure.ac,1.2,1.3 Message-ID: <200603172230.k2HMULwh007041@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6963/kadischi Modified Files: Makefile.am configure.ac Log Message: Kadischi transitional fixes(FC4->FC5), standard bootsplash support Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile.am 21 Aug 2005 17:08:47 -0000 1.1.1.1 +++ Makefile.am 17 Mar 2006 22:29:49 -0000 1.2 @@ -11,7 +11,8 @@ patches \ post_install_scripts \ rc \ - scanswap + scanswap \ + bootsplash EXTRA_DIST = \ pycheckrc \ Index: configure.ac =================================================================== RCS file: /cvs/devel/kadischi/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.ac 13 Oct 2005 01:05:57 -0000 1.2 +++ configure.ac 17 Mar 2006 22:29:49 -0000 1.3 @@ -58,4 +58,5 @@ post_install_scripts/Makefile rc/Makefile scanswap/Makefile +bootsplash/Makefile ]) From fedora-extras-commits at redhat.com Fri Mar 17 22:29:56 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:29:56 -0500 Subject: kadischi/conf Makefile.am,1.3,1.4 Message-ID: <200603172230.k2HMUQld007044@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/conf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6963/kadischi/conf Modified Files: Makefile.am Log Message: Kadischi transitional fixes(FC4->FC5), standard bootsplash support Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/conf/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.am 29 Aug 2005 17:45:45 -0000 1.3 +++ Makefile.am 17 Mar 2006 22:29:54 -0000 1.4 @@ -2,8 +2,8 @@ conf_DATA = build.conf buildstamp install-data-hook: - echo INSTALLDIR=$(pkgdatadir) >> $(confdir)/build.conf + echo INSTALLDIR=$(pkgdatadir) >> $(DESTDIR)$(confdir)/build.conf uninstall-hook: rm -rf $(confdir)/*~ - rmdir $(confdir) \ No newline at end of file + rmdir $(confdir) From fedora-extras-commits at redhat.com Fri Mar 17 22:30:02 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:30:02 -0500 Subject: kadischi/livecd_generator install-boot.sh, 1.1.1.1, 1.2 kadischi.py, 1.4, 1.5 livecd-mkinitrd.sh, 1.3, 1.4 Message-ID: <200603172230.k2HMUWli007049@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6963/kadischi/livecd_generator Modified Files: install-boot.sh kadischi.py livecd-mkinitrd.sh Log Message: Kadischi transitional fixes(FC4->FC5), standard bootsplash support Index: install-boot.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- install-boot.sh 21 Aug 2005 17:09:00 -0000 1.1.1.1 +++ install-boot.sh 17 Mar 2006 22:30:00 -0000 1.2 @@ -3,18 +3,63 @@ sysdir=$1 csysdir=$2 kernel=$3 +kernel_is_xen=$(echo $kernel | grep -G [[:alnum:]]xen0) +kernel_version_proper=$(echo $kernel | sed -e 's|xen0||') +kernel_params='' + + . /etc/kadischi/build.conf + +if [ -x $sysdir/usr/bin/rhgb ]; then + kernel_params="$kernel_params rhgb" +fi cp $sysdir/boot/isolinux/initrd.img $csysdir/boot/isolinux/initrd.img cp $sysdir/boot/vmlinuz-$kernel $csysdir/boot/isolinux/vmlinuz cp /usr/lib/syslinux/isolinux.bin $csysdir/boot/isolinux/ + +if [ ! $kernel_is_xen ]; then +cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/ cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_ default linux prompt 1 +display boot.msg timeout 600 +F1 boot.msg +F2 options.msg +F3 general.msg +F4 license.msg label linux kernel vmlinuz - append initrd=initrd.img ramdisk_size=10000 -label test + append initrd=initrd.img quiet $kernel_params +label debug kernel vmlinuz - append initrd=initrd.img INITRD_DBG=x ramdisk_size=10000 -_EOF_ \ No newline at end of file + append initrd=initrd.img INITRD_DBG=x +label memtest86 + kernel memtest + append - +_EOF_ +else +cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/ +cp $sysdir/boot/xen.gz-$kernel_version_proper $csysdir/boot/isolinux/xen.gz +cp /usr/lib/syslinux/mboot.c32 $csysdir/boot/isolinux/ +cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_ +default linux +prompt 1 +display xenboot.msg +timeout 600 +F1 xenboot.msg +F2 options.msg +F3 general.msg +F4 license.msg +F5 xen.msg +label linux + kernel mboot.c32 + append xen.gz nosmp noacpi --- vmlinuz --- initrd.img quiet $kernel_params +label debug + kernel mboot.c32 + append xen.gz nosmp noacpi noreboot --- vmlinuz --- initrd.img INITRD_DBG=x +label memtest86 + kernel memtest + append - +_EOF_ +fi Index: kadischi.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kadischi.py 13 Oct 2005 01:05:48 -0000 1.4 +++ kadischi.py 17 Mar 2006 22:30:00 -0000 1.5 @@ -32,7 +32,7 @@ # process command line options -usage = 'usage: %prog [options] \n\npath-to-the-repository can be a path on the local file system (without any prefixes) but can also be a path to a http, ftp or some other type of repository. For details, consult the documentation at http://fedoraproject.org/wiki/KadischiDoc' +usage = 'usage: %prog [options] \n\npath-to-the-repository can be a path on the local file system (without any prefixes) but can also be a path to a http, ftp or some other type of repository. For details, consult the documentation at http://fedoraproject.org/wiki/Kadischi/Documentation' version = '%prog ' + version parser = optparse.OptionParser (usage=usage, version=version) @@ -177,7 +177,7 @@ # load config file options -flc_log ('Loadnig config file options') +flc_log ('Loading config file options') buildconf = shvarFile (normalize_path([confdir, 'build.conf']), True) builddir = buildconf ["BUILDDIR"] @@ -221,7 +221,7 @@ flc_log ('\n *** running anaconda *** \n') -run ("anaconda %s --rootpath=%s --method=%s --livecd" % (anaconda_args, sysdir, method), builddir) +run ("anaconda %s --rootpath=%s --method=%s" % (anaconda_args, sysdir, method), builddir) flc_log ('\n *** anaconda has finished the job *** \n') @@ -292,4 +292,4 @@ cleanup (builddir) flc_log ('Finished.') -sys.exit (0) \ No newline at end of file +sys.exit (0) Index: livecd-mkinitrd.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- livecd-mkinitrd.sh 13 Mar 2006 02:22:12 -0000 1.3 +++ livecd-mkinitrd.sh 17 Mar 2006 22:30:00 -0000 1.4 @@ -200,16 +200,16 @@ mkdir -p $MNTIMAGE/lib mkdir -p $MNTIMAGE/lib/tls -mkdir -p $MNTIMAGE/lib/obsolete/linuxthreads mkdir -p $MNTIMAGE/lib/modules/$kernel mkdir -p $MNTIMAGE/bin mkdir -p $MNTIMAGE/etc +mkdir -p $MNTIMAGE/etc/modprobe.d mkdir -p $MNTIMAGE/dev mkdir -p $MNTIMAGE/proc mkdir -p $MNTIMAGE/sys mkdir -p $MNTIMAGE/sysroot mkdir -p $MNTIMAGE/tmp -mkdir -p $MNTIMAGE/usr/share/hwdata +mkdir -p $MNTIMAGE/usr/lib mkdir -p $MNTIMAGE/var/lib/nfs/rpc_pipefs ln -s bin $MNTIMAGE/sbin @@ -219,19 +219,19 @@ inst $rootdir/lib/ld-linux.so.2 "$MNTIMAGE/lib/ld-linux.so.2" inst $rootdir/lib/libselinux.so.1 "$MNTIMAGE/lib/libselinux.so.1" inst $rootdir/lib/libsepol.so.1 "$MNTIMAGE/lib/libsepol.so.1" +inst $rootdir/lib/libdl.so.2 "$MNTIMAGE/lib/libdl.so.2" if [ -f $rootdir/lib/tls/libc.so.6 ]; then inst $rootdir/lib/tls/libc.so.6 "$MNTIMAGE/lib/libc.so.6" else - inst $rootdir/lib/obsolete/linuxthreads/libc.so.6 "$MNTIMAGE/lib/obsolete/linuxthreads/libc.so.6" - ln -s "/lib/obsolete/linuxthreads/libc.so.6" "$MNTIMAGE/lib/libc.so.6" + inst $rootdir/lib/libc.so.6 "$MNTIMAGE/lib/libc.so.6" fi if [ -f $rootdir/lib/tls/libm.so.6 ]; then inst $rootdir/lib/tls/libm.so.6 "$MNTIMAGE/lib/libm.so.6" else - inst $rootdir/lib/obsolete/linuxthreads/libm.so.6 "$MNTIMAGE/lib/obsolete/linuxthreads/libm.so.6" - ln -s "/lib/obsolete/linuxthreads/libm.so.6" "$MNTIMAGE/lib/libm.so.6" + inst $rootdir/lib/libm.so.6 "$MNTIMAGE/lib/libm.so.6" + ln -s "/lib/libm.so.6" "$MNTIMAGE/usr/lib/libm.so" fi inst /sbin/busybox.anaconda "$MNTIMAGE/bin/busybox" @@ -252,8 +252,7 @@ inst $rootdir/sbin/MAKEDEV "$MNTIMAGE/sbin/MAKEDEV" fi -inst $rootdir/usr/share/hwdata/pcitable "$MNTIMAGE/usr/share/hwdata/pcitable" -inst $rootdir/etc/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.conf.dist" +inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist" inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep" PPMODULES=$(findmodules drivers/parport) From fedora-extras-commits at redhat.com Fri Mar 17 22:36:41 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:36:41 -0500 Subject: kadischi/bootsplash Makefile.am, NONE, 1.1 boot.msg, NONE, 1.1 general.msg, NONE, 1.1 license.msg, NONE, 1.1 options.msg, NONE, 1.1 splash.lss, NONE, 1.1 xen.msg, NONE, 1.1 xenboot.msg, NONE, 1.1 Message-ID: <200603172236.k2HMaf9D007085@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/bootsplash In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7067/kadischi/bootsplash Added Files: Makefile.am boot.msg general.msg license.msg options.msg splash.lss xen.msg xenboot.msg Log Message: bootsplash/ files, bootsplash support --- NEW FILE Makefile.am --- bootsplashdir = $(pkgdatadir)/bootsplash bootsplash_DATA = memtest splash.lss boot.msg general.msg options.msg license.msg xenboot.msg xen.msg uninstall-hook: rmdir $(bootsplashdir) --- NEW FILE boot.msg --- splash.lss Welcome to the Fedora Core Live CD built with Kadischi. - To start the live cd press the 0107 key. - Use the function keys listed below for more information. 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 --- NEW FILE general.msg --- 00 01What is Fedora07 Fedora is a set of projects sponsored by Red Hat and guided by the Fedora Foundation. These projects are developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards. Fedora Core, the central Fedora project, is an operating system and platform based on Linux, that is always free for anyone to use, modify, and distribute, now and forever. 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 For the default live system, press 0107. --- NEW FILE license.msg --- 00 01Legal Notice07 Copyright (c) 2006 by Fedora Foundation and others. This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, v1.0, available at http://www.opencontent.org/openpub/. FEDORA, FEDORA PROJECT, and the Fedora Logo are trademarks of RedHat, Inc., are registered or pending registration in the U.S. and other countries, and are used here under license to the Fedora Foundation. 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 For the default live system, press 0107. --- NEW FILE options.msg --- 00 01Live CD built with Kadischi07 Kadischi is an application for Fedora-based Live CD generation. It takes input from a Fedora RPM repository as an input and outputs a Live CD ISO image. For advanced options, Type: 01memtest07 : to test memory 01debug07 : to view the debug output of the LiveCD 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 For the default live system, press 0107. --- NEW FILE splash.lss --- =??, OP??) 6?0U$ A@? @? fSf? @? @? fT?f? ??@?E?B? ?I ;0? @? i?? D?P?5 ?F 0? ??pe% 0? ??p?I?B? ?& @? ???U?b?@??c? 5 2 0???? B??0? ??????S6$ ?????pS&?XV???\k2?? ?E"2????????pR&?hV???LZ2?? ?Y#C?? ????I ????? ?E"B?? ?????pT%??V?p??$ ?E"B?? ????I ???P? ???PI ???@? ???@I pT# ?V ??z?? ?????Z? ??z? K`U?`?(? V`? ? ?pC ??B [ b??? ????S???5????2TfQ4  ???? ?f?3 ?f?3 T  --- NEW FILE xen.msg --- 00 01Xen Support in Kadischi07 Xen is an open source virtualization for the Linux kernel. Virtualization allows multiple instances of an operating system to run at the same time on a single physical hardware platform. Xen lets you enclose and test new upgrades to Fedora without disturbing the host system. Xen installation and support are significantly enhanced with Fedora Core 5. 0f[F1-Main] [F2-Options] [F3-General] [F4-License] [F5-Xen]07 For the default live system, press 0107. --- NEW FILE xenboot.msg --- splash.lss 01Welcome to the Fedora Core Live CD built with Kadischi07. - To start the live cd press the 0107 key. - Use the function keys listed below for more information. 0f[F1-Main] [F2-Options] [F3-General] [F4-License] [F5-Xen]07 From fedora-extras-commits at redhat.com Fri Mar 17 22:42:29 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:42:29 -0500 Subject: kadischi/post_install_scripts Makefile.am,1.1.1.1,1.2 Message-ID: <200603172243.k2HMh0Gu007121@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7102/kadischi/post_install_scripts Modified Files: Makefile.am Log Message: post_install_scripts/Makefile.am, commit Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile.am 21 Aug 2005 17:09:01 -0000 1.1.1.1 +++ Makefile.am 17 Mar 2006 22:42:27 -0000 1.2 @@ -1,5 +1,5 @@ PYTHON_FILES = 03fstab.py 05fsclean.py 06sysconfig.py -BASH_FILES = 01umountproc.sh 02install.sh 04auth.sh +BASH_FILES = 01prelink.sh 02install.sh 04auth.sh pisdir = $(pkgdatadir)/post_install_scripts pis_SCRIPTS = $(PYTHON_FILES) $(BASH_FILES) @@ -14,4 +14,4 @@ clean: rm -f *.pyo *.pyc - rm -f ${BUILT_SOURCES} \ No newline at end of file + rm -f ${BUILT_SOURCES} From fedora-extras-commits at redhat.com Fri Mar 17 23:22:16 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:22:16 -0500 Subject: rpms/mod_cband - New directory Message-ID: <200603172322.k2HNMIEa009252@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9243/mod_cband Log Message: Directory /cvs/extras/rpms/mod_cband added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 23:22:25 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:22:25 -0500 Subject: rpms/mod_cband/devel - New directory Message-ID: <200603172322.k2HNMRZk009264@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9243/mod_cband/devel Log Message: Directory /cvs/extras/rpms/mod_cband/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 23:22:53 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:22:53 -0500 Subject: rpms/mod_cband Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603172322.k2HNMtN9009309@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9297 Added Files: Makefile import.log Log Message: Setup of module mod_cband --- NEW FILE Makefile --- # Top level Makefile for module mod_cband all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 17 23:23:14 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:23:14 -0500 Subject: rpms/mod_cband/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603172323.k2HNNGIh009334@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9297/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mod_cband --- NEW 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 Mar 17 23:23:18 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 17 Mar 2006 18:23:18 -0500 Subject: rpms/audacity/FC-5 audacity-1.2.3-gcc41.patch, NONE, 1.1 audacity-1.2.4b-missing-pango.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 audacity.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200603172323.k2HNNoBZ009387@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/audacity/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9337 Modified Files: .cvsignore audacity.spec sources Added Files: audacity-1.2.3-gcc41.patch audacity-1.2.4b-missing-pango.patch Log Message: * Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b - Update to 1.2.4b (stable release). - Follow upstream recommendation and use the GTK+ 1.x wxGTK. This is because of various issues with fonts/layout/behaviour. - Build with compat-wxGTK-devel. - Modify build section to find wx-2.4-config instead of wx-config. audacity-1.2.3-gcc41.patch: --- NEW FILE audacity-1.2.3-gcc41.patch --- diff -Nur audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h --- audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h 2004-11-18 07:17:35.000000000 +0100 +++ audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h 2006-03-17 21:26:04.000000000 +0100 @@ -146,7 +146,7 @@ static const char *getVersionString(); /// Get SoundTouch library version Id - static uint SoundTouch::getVersionId(); + static uint getVersionId(); /// Sets new rate control value. Normal rate = 1.0, smaller values /// represent slower rate, larger faster rates. audacity-1.2.4b-missing-pango.patch: --- NEW FILE audacity-1.2.4b-missing-pango.patch --- diff -Nur audacity-src-1.2.4b-orig/src/Makefile.in audacity-src-1.2.4b/src/Makefile.in --- audacity-src-1.2.4b-orig/src/Makefile.in 2005-11-27 03:33:31.000000000 +0100 +++ audacity-src-1.2.4b/src/Makefile.in 2006-03-17 23:46:15.000000000 +0100 @@ -28,7 +28,7 @@ EXTRAOBJS = @EXTRAOBJS@ OPTOBJS = @OPTOBJS@ -LIBS = @LIBS@ +LIBS = @LIBS@ -lpangox-1.0 EXTRATARGETS = @EXTRATARGETS@ ######################################## Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:04:07 -0000 1.2 +++ .cvsignore 17 Mar 2006 23:23:18 -0000 1.3 @@ -1 +1 @@ -audacity-src-1.2.1.tar.bz2 +audacity-src-1.2.4b.tar.gz Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- audacity.spec 21 May 2005 10:36:06 -0000 1.12 +++ audacity.spec 17 Mar 2006 23:23:18 -0000 1.13 @@ -1,28 +1,32 @@ Name: audacity -Version: 1.2.3 -Release: 5 +Version: 1.2.4 +Release: 0.1.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.3.tar.gz +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 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 %{?_with_mp3:BuildRequires: libmad-devel} -%{?_with_gtk1:BuildRequires: wxGTK-devel} -%{!?_with_gtk1:BuildRequires: wxGTK2-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 Requires(postun): desktop-file-utils # Compile options: # --with mp3 : enable mp3 support -# --with gtk1 : use GTK+ version of wxGTK, else GTK2 version +# --with gtk2 : use GTK+ 2.x version of wxGTK, else GTK+ 1.x version # --with portaudiov19 : enable version 19 of portaudio (disables portmixer) @@ -35,8 +39,10 @@ Linux/*BSD, MacOS, and Windows. %prep -%setup -q -n %{name}-src-%{version} +%setup -q -n %{name}-src-%{version}b %patch1 -p1 -b .aboutdialog +%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 for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp @@ -45,6 +51,13 @@ 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-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 @@ -98,6 +111,13 @@ %doc %{_datadir}/doc/* %changelog +* Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b +- Update to 1.2.4b (stable release). +- Follow upstream recommendation and use the GTK+ 1.x wxGTK. + This is because of various issues with fonts/layout/behaviour. +- Build with compat-wxGTK-devel. +- Modify build section to find wx-2.4-config instead of wx-config. + * Fri May 20 2005 David Woodhouse - 1.2.3-5 - Bump release number again due to spurious build system failure and the fact that the build system seems to be ignoring repeated build Index: sources =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Dec 2004 16:24:36 -0000 1.4 +++ sources 17 Mar 2006 23:23:18 -0000 1.5 @@ -1 +1 @@ -dbfc1b401420aa694753d35acb5a8a28 audacity-src-1.2.3.tar.gz +37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 23:24:17 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:24:17 -0500 Subject: rpms/mod_cband import.log,1.1,1.2 Message-ID: <200603172324.k2HNOorE009483@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9435 Modified Files: import.log Log Message: auto-import mod_cband-0.9.7.2-3 on branch devel from mod_cband-0.9.7.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mod_cband/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Mar 2006 23:22:53 -0000 1.1 +++ import.log 17 Mar 2006 23:24:17 -0000 1.2 @@ -0,0 +1 @@ +mod_cband-0_9_7_2-3:HEAD:mod_cband-0.9.7.2-3.src.rpm:1142637847 From fedora-extras-commits at redhat.com Fri Mar 17 23:24:27 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:24:27 -0500 Subject: rpms/mod_cband/devel mod_cband.conf, NONE, 1.1 mod_cband.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603172324.k2HNOxDN009489@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9435/devel Modified Files: .cvsignore sources Added Files: mod_cband.conf mod_cband.spec Log Message: auto-import mod_cband-0.9.7.2-3 on branch devel from mod_cband-0.9.7.2-3.src.rpm --- NEW FILE mod_cband.conf --- # This is an example config for the mod_cband bandwidth limiting module # Load the module LoadModule cband_module modules/mod_cband.so # This can will give you the bandwidth status. You can append "?xml" to # the end of the URI if you have an XML fetish (weirdo!) and want to see # it in that format. SetHandler cband-status Order allow,deny Allow from 127.0.0.1/32 # This space intentionally left commented. See the docs for more examples, # including but not limited to per-user limits. # Speed limiting. # # DocumentRoot /var/www/xyz.org/ # ServerName xyz.org # CustomLog /var/log/apache2/xyz.org.access combined # ErrorLog /var/log/apache2/xyz.org.access.error # RewriteEngine On # RewriteOptions inherit # # # Maximal 1024kbps speed for this virtualhost # # Maximal 10 requests per second for this virtualhost # # Maximal 30 open connections for this virtualhost # CBandSpeed 1024 10 30 # # # Maximal 10kB/s speed, 3 requests/s and 2 open connections for any # remote client # CBandRemoteSpeed 10kb/s 3 2 # # # Maximal 20kB/s speed, 2 requests/s and 3 open connections for # remote # # clients from class googlebot_class :P # CBandClassRemoteSpeed googlebot_class 20kb/s 2 3 # # Bandwidth quota # Specify default 'bandwidth exceeded' location # CBandDefaultExceededURL http://grumblesmurf.org/bandwidth_exceeded.html # # # DocumentRoot /var/www/xyz.org/ # ServerName xyz.org # CustomLog /var/log/apache2/xyz.org.access combined # ErrorLog /var/log/apache2/xyz.org.access.error # RewriteEngine On # RewriteOptions inherit # # # 100MB virtualhost bandwidth limit # CBandLimit 100000 # # # redirect to http://abc.org/bandwidth_exceeded.html # # when the limit has been reached # CBandExceededURL http://abc.org/bandwidth_exceeded.html # # # virtualhost's scoreboard file # CBandScoreboard /var/run/apache2/xyz.org.scoreboard # # # a period of time after which the scoreboard will be cleared (30 # minutes) # CBandPeriod 30M # --- NEW FILE mod_cband.spec --- Name: mod_cband Version: 0.9.7.2 Release: 3%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL URL: http://cband.linux.pl/ Source0: http://cband.linux.pl/download/mod-cband-%{version}.tgz Source1: mod_cband.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: httpd-devel Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) %description mod_cband is an Apache 2 module provided to solve the problem of limiting virtualhosts bandwidth usage. When the configured virtualhost's transfer limit is exceeded, mod_cband will redirect all further requests to a location specified in the configuration file. %prep %setup -q -n mod-cband-%{version} %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} install -D -m755 src/.libs/mod_cband.so %{buildroot}/%{_libdir}/httpd/modules/mod_cband.so install -D -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/mod_cband.conf %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS Changes INSTALL LICENSE conf *.copyright %{_libdir}/httpd/modules/mod_cband.so %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 - Config file set not to be replaced on upgrade - Status information URI limited to localhost by default. * Tue Mar 7 2006 Michael Fleming 0.9.7.2-2 - Updated tarball from upstream (some very small changes in code, essentially in integer handling). - Example config file added and installed in Apache's conf.d dir * Sun Feb 5 2006 Michael Fleming 0.9.7.2-1 - Fedora Extras review release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Mar 2006 23:23:14 -0000 1.1 +++ .cvsignore 17 Mar 2006 23:24:26 -0000 1.2 @@ -0,0 +1 @@ +mod-cband-0.9.7.2.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Mar 2006 23:23:14 -0000 1.1 +++ sources 17 Mar 2006 23:24:26 -0000 1.2 @@ -0,0 +1 @@ +d261161ac299437a1342b12ae586cab9 mod-cband-0.9.7.2.tgz From fedora-extras-commits at redhat.com Fri Mar 17 23:31:30 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:31:30 -0500 Subject: rpms/GeoIP/FC-5 GeoIP.spec,1.1,1.2 Message-ID: <200603172332.k2HNW368009653@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9618 Modified Files: GeoIP.spec Log Message: * Sat Mar 18 2006 Michael Fleming 1.3.14-4 - Build for FC5 Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GeoIP.spec 18 Feb 2006 05:44:56 -0000 1.1 +++ GeoIP.spec 17 Mar 2006 23:31:30 -0000 1.2 @@ -1,6 +1,6 @@ Name: GeoIP Version: 1.3.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: GPL @@ -71,6 +71,9 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Sat Mar 18 2006 Michael Fleming 1.3.14-4 +- Build for FC5 + * Sat Feb 18 2006 Michael Fleming 1.3.14-3 - Fix Obsoletes/Provides for old "geoip"-convention packages - Move .so symlinks to -devel where they should be From fedora-extras-commits at redhat.com Fri Mar 17 23:31:35 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Fri, 17 Mar 2006 18:31:35 -0500 Subject: rpms/ghdl/devel ghdl.spec,1.11,1.12 Message-ID: <200603172332.k2HNW79D009659@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9613 Modified Files: ghdl.spec Log Message: -mtune=generic is apparently not supported by FSF gcc Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ghdl.spec 16 Mar 2006 22:33:48 -0000 1.11 +++ ghdl.spec 17 Mar 2006 23:31:35 -0000 1.12 @@ -71,6 +71,12 @@ # These compiler flags in rawhide seem to break the build, so get rid of them OPT_FLAGS=$(echo $OPT_FLAGS | %{__sed} \ +%ifarch i386 i486 i586 i686 + -e 's/-mtune=generic/-mtune=pentium4/g' \ +%endif +%ifarch x86_64 + -e 's/-mtune=generic/-mtune=nocona/g' \ +%endif -e 's/-fstack-protector//g ' \ -e 's/--param=ssp-buffer-size=[0-9]*//g') From fedora-extras-commits at redhat.com Fri Mar 17 23:33:43 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:33:43 -0500 Subject: rpms/mlmmj/FC-5 mlmmj.spec,1.21,1.22 Message-ID: <200603172334.k2HNYGLQ009723@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mlmmj/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9702 Modified Files: mlmmj.spec Log Message: * Sat Mar 18 2006 Michael Fleming 1.2.11-4 - Bump for FC5 final. Really Index: mlmmj.spec =================================================================== RCS file: /cvs/extras/rpms/mlmmj/FC-5/mlmmj.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mlmmj.spec 28 Feb 2006 22:48:35 -0000 1.21 +++ mlmmj.spec 17 Mar 2006 23:33:43 -0000 1.22 @@ -3,7 +3,7 @@ Summary: Mailserver-independent ezmlm-like mailing list manager Name: mlmmj Version: 1.2.11 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Group: Applications/Internet Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2 @@ -48,6 +48,9 @@ %{_mandir}/man1/mlmmj-* %changelog +* Sat Mar 18 2006 Michael Fleming 1.2.11-4 +- Bump for FC5 final. Really + * Wed Mar 1 2006 Michael Fleming 1.2.11-3 - Bump for FC5 From fedora-extras-commits at redhat.com Fri Mar 17 23:35:59 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:35:59 -0500 Subject: rpms/mod_security/FC-5 mod_security.spec,1.12,1.13 Message-ID: <200603172336.k2HNaVLs009793@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9767 Modified Files: mod_security.spec Log Message: * Sat Mar 18 2006 Michael Fleming 1.9.2-4 - Bump for FC5 final Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-5/mod_security.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mod_security.spec 28 Feb 2006 22:45:34 -0000 1.12 +++ mod_security.spec 17 Mar 2006 23:35:58 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Security module for the Apache HTTP Server Name: mod_security Version: 1.9.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://www.modsecurity.org/ Group: System Environment/Daemons @@ -40,6 +40,9 @@ %config(noreplace) /etc/httpd/conf.d/mod_security.conf %changelog +* Sat Mar 18 2006 Michael Fleming 1.9.2-4 +- Bump for FC5 final + * Wed Mar 1 2006 Michael Fleming 1.9.2-3 - Bump for FC5 From fedora-extras-commits at redhat.com Fri Mar 17 23:45:39 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:45:39 -0500 Subject: owners owners.list,1.749,1.750 Message-ID: <200603172346.k2HNkBvf009932@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9915 Modified Files: owners.list Log Message: Added mod_cband Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.749 retrieving revision 1.750 diff -u -r1.749 -r1.750 --- owners.list 17 Mar 2006 19:37:17 -0000 1.749 +++ owners.list 17 Mar 2006 23:45:23 -0000 1.750 @@ -692,6 +692,7 @@ Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|mod_annodex|Apache module for server-side support of annodex media|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|mod_auth_pam|PAM authentication module for Apache|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|mod_cband|Bandwidth limiting for virtual hosts|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|mod_geoip|GeoIP module for the Apache HTTP Server|mfleming+rpm at enlartenment.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| 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| From fedora-extras-commits at redhat.com Fri Mar 17 23:52:05 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 17 Mar 2006 18:52:05 -0500 Subject: rpms/vnstat/FC-5 vnstat.spec,1.4,1.5 Message-ID: <200603172352.k2HNqb6g009993@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/vnstat/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9973 Modified Files: vnstat.spec Log Message: * Fri Mar 18 2006 Adrian Reber - 1.4-6 - rebuilt Index: vnstat.spec =================================================================== RCS file: /cvs/extras/rpms/vnstat/FC-5/vnstat.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vnstat.spec 23 May 2005 00:22:11 -0000 1.4 +++ vnstat.spec 17 Mar 2006 23:52:05 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.4 -Release: 5 +Release: 6?%{dist} License: GPL Group: System Environment/Daemons @@ -87,6 +87,9 @@ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Fri Mar 18 2006 Adrian Reber - 1.4-6 +- rebuilt + * Sun May 22 2005 Jeremy Katz - 1.4-5 - rebuild on all arches From fedora-extras-commits at redhat.com Fri Mar 17 23:55:19 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 17 Mar 2006 18:55:19 -0500 Subject: rpms/vnstat/FC-5 vnstat.spec,1.5,1.6 Message-ID: <200603172355.k2HNtpPP010069@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/vnstat/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10052 Modified Files: vnstat.spec Log Message: * Fri Mar 18 2006 Adrian Reber - 1.4-7 - rebuilt; fixed dist tag Index: vnstat.spec =================================================================== RCS file: /cvs/extras/rpms/vnstat/FC-5/vnstat.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- vnstat.spec 17 Mar 2006 23:52:05 -0000 1.5 +++ vnstat.spec 17 Mar 2006 23:55:19 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.4 -Release: 6?%{dist} +Release: 7%{?dist} License: GPL Group: System Environment/Daemons @@ -87,6 +87,9 @@ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Fri Mar 18 2006 Adrian Reber - 1.4-7 +- rebuilt; fixed dist tag + * Fri Mar 18 2006 Adrian Reber - 1.4-6 - rebuilt From fedora-extras-commits at redhat.com Sat Mar 18 00:02:18 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 19:02:18 -0500 Subject: kadischi/bootsplash memtest,NONE,1.1 Message-ID: <200603180002.k2I02IH6012061@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/bootsplash In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12049/kadischi/bootsplash Added Files: memtest Log Message: po/Makefile bootsplash/memetest, commit --- NEW FILE memtest --- ????? ??s ???s? .??? a??? ??? Loading ? ?,j ?(j ?$j ? j?j ?S???1???f[????g? ??D:??B??h???;Qr??M???????????u???`???+?d????.??????????p???????@???p??????????@??l???;?p????????????????t????<?F????tc??tO?????l??????????@??x?????????f?x ??D:??B??????9Qw??>???????????u???x?????UWVS??? 9?r"? =?? ? ???t???????l ??  QPj?? ??` ??/ ?X/ ?H/ ?g. ?Y. ?#. ?. ?. ?y, ?k, ?C, ?5, ?$, ??0 P?s?`% ??Pj?s?? ^[^_]?????[[^_]?WVS?d? 1??4$????? j?.  ?D$@ ?? ? ? <?? ?<t\< tw?D$@ j?? ?2?????????????t!???b??Pjj?2 j?? ?2 ?( ? ?M ?? ?? ?? ????)??B9?u?1???^_]?UWV?l$?|$;l$s1?? ?L$? ?*B9?u??v??1???D5 [??PjJj?w????? [?S? ? ????? [?UWVS??? ??u?<$u??0? ?70F???W?7FB?$???<$u??L$$??~? B?D$(H9?|??|$, ??? P?FPU?I?????)d??P?F PU?y????? j VU? ?????[^_]?UWVS? ~K?D<a?D?|$ ~=?D<b?6?|$ ~/?D<c?(?|$ ~!?D<d??|$~?D<e? ?|$~?D<f1???~?D< ??????? ? ;G t ?G??????????w ???????? ?N???jjV?=? t ?G??????????G ????jjj j4j ??????? ?H t ?G??????????G ?????jjj ????????g??Pjj ???????g??Pjj ???????)g??Pjj ???????$??=g??Pjj ?r???Ujj?h?????????????????? ??????_g??Pjj ? ?????? ???????_g??Pjj ???????? P?4Vjj ?????Ujj ?????????| P?I????? ?|$MF????????????? P?????D$??? ???? ???;Eu-????F????D$1??@;T$s?J??t?;T$v?;Et ????;,$r?1???Y^[^_]?UWVS??? ??????????mh??Pjj ??????? ??X ?e????? ??? ??????? ?D$ ???????([^_]?UWVS? <?? j <?? ?`????? [?VS??? ???h??PR????h??P??h ??????Z????X?????[?S??? ?????????????j ??t$(Pj?R???????j z????ln????yi??P?? ?*?, ????u??ln???Hu???n??????n????,i??P?L$?T$?\$?D$???$???????0[^_?WVS??? ?? ????????u??u??pn???3???? ????|n???????????????u z????|n???D$@t ??????ln??????? ????n?????ln??????n??????n???? z???i?????h H??????PRV???$???????D$@??h ????Q??????1?RP?,$???$?h????D$?????? ??h H??????????u? ????D$Pjh? /jjh? ??X??? ??X??? ??X??? ??X??? ? ??X??? j?]????? ????B???|? ?v u??5? ??u????@??????u?????"??u???????u????? ??u??????????u???????u????? ??u?????h? ? ??u????@??????u?????"??u???????u????? ??u??????\???????????p' u ???? ???? ???? ???? ???? u ???? ???? ???? ???? ???? ??u5 u5 ??u5 ?|$u???$?4$jh? ??u????@Pjh? u ??5 ??u?????Pjh? u4??^?? u4??U?? u4??L?? u4??C??u4??:??u??p?0??u??`?&??u??P???u??@???u??0???u?? ?$?$ ??u5 ?|$u???$?$??p??u??p?0??u??`?&??u??P???u??@???u??0???u?? ?$?$???|$ u????|$ u??? ?|$ u???$?4$jh? 3q??Pjj ?\?????_g??Pjj ?L?????$j ?????r??Pjj?????Wjj???????$??????C????qRjj ?????Vjj ????????q??Pjj ???????$??r??Pjj ???????r??Pjj???????'r??Pjj???????$Wjj?}????%????j????? [^_??S? ???e???e??????????e???e???e???e???e???e???(???/???e???!???e?????????????????????????????? ntium 4 (0.13) Dual Channel (128 bits) odify Timing: [ a g ? From fedora-extras-commits at redhat.com Sat Mar 18 00:02:35 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 19:02:35 -0500 Subject: kadischi/po Makefile,NONE,1.1 Message-ID: <200603180002.k2I02Z5d012080@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12049/kadischi/po Added Files: Makefile Log Message: po/Makefile bootsplash/memetest, commit --- NEW FILE Makefile --- From fedora-extras-commits at redhat.com Sat Mar 18 01:10:01 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Fri, 17 Mar 2006 20:10:01 -0500 Subject: rpms/ghdl/devel .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <200603180110.k2I1AX6I014453@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14434 Modified Files: .cvsignore sources Log Message: svn49 now needs gcc-4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Dec 2005 22:47:39 -0000 1.4 +++ .cvsignore 18 Mar 2006 01:09:58 -0000 1.5 @@ -4,3 +4,4 @@ ghdl-imagef64fix.patch ghdl-0.20.tar.bz2 ghdl-0.21.tar.bz2 +gcc-core-4.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Dec 2005 22:47:39 -0000 1.4 +++ sources 18 Mar 2006 01:09:58 -0000 1.5 @@ -1,2 +1,2 @@ -f7781398ada62ba255486673e6274b26 gcc-core-4.0.2.tar.bz2 a0ebb9b4ea9d33e67e6ae9768d10eb3a ghdl-0.21.tar.bz2 +15efa164579c7cf4a48859ee87d2a1fa gcc-core-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 18 02:07:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 17 Mar 2006 21:07:14 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-4 .cvsignore, 1.12, 1.13 perl-ExtUtils-CBuilder.spec, 1.16, 1.17 sources, 1.12, 1.13 Message-ID: <200603180207.k2I27kXq016818@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16761/FC-4 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 14 Mar 2006 15:27:29 -0000 1.12 +++ .cvsignore 18 Mar 2006 02:07:13 -0000 1.13 @@ -1 +1 @@ -ExtUtils-CBuilder-0.16.tar.gz +ExtUtils-CBuilder-0.17.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-ExtUtils-CBuilder.spec 14 Mar 2006 15:27:29 -0000 1.16 +++ perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:13 -0000 1.17 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.16 +Version: 0.17 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 +- Update to 0.17. + * Tue Mar 14 2006 Jose Pedro Oliveira - 0.16-1 - Update to 0.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 14 Mar 2006 15:27:29 -0000 1.12 +++ sources 18 Mar 2006 02:07:13 -0000 1.13 @@ -1 +1 @@ -3436fdd2b13cabb95a59df5e699fa6f3 ExtUtils-CBuilder-0.16.tar.gz +b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 02:07:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 17 Mar 2006 21:07:21 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-5 .cvsignore, 1.12, 1.13 perl-ExtUtils-CBuilder.spec, 1.17, 1.18 sources, 1.12, 1.13 Message-ID: <200603180207.k2I27rbs016823@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16761/FC-5 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 14 Mar 2006 15:27:35 -0000 1.12 +++ .cvsignore 18 Mar 2006 02:07:21 -0000 1.13 @@ -1 +1 @@ -ExtUtils-CBuilder-0.16.tar.gz +ExtUtils-CBuilder-0.17.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-ExtUtils-CBuilder.spec 14 Mar 2006 15:27:35 -0000 1.17 +++ perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:21 -0000 1.18 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.16 +Version: 0.17 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 +- Update to 0.17. + * Tue Mar 14 2006 Jose Pedro Oliveira - 0.16-1 - Update to 0.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 14 Mar 2006 15:27:35 -0000 1.12 +++ sources 18 Mar 2006 02:07:21 -0000 1.13 @@ -1 +1 @@ -3436fdd2b13cabb95a59df5e699fa6f3 ExtUtils-CBuilder-0.16.tar.gz +b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 02:07:34 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 17 Mar 2006 21:07:34 -0500 Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.12, 1.13 perl-ExtUtils-CBuilder.spec, 1.17, 1.18 sources, 1.12, 1.13 Message-ID: <200603180208.k2I287b7016828@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16761/devel Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 14 Mar 2006 15:27:35 -0000 1.12 +++ .cvsignore 18 Mar 2006 02:07:33 -0000 1.13 @@ -1 +1 @@ -ExtUtils-CBuilder-0.16.tar.gz +ExtUtils-CBuilder-0.17.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-ExtUtils-CBuilder.spec 14 Mar 2006 15:27:35 -0000 1.17 +++ perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:33 -0000 1.18 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.16 +Version: 0.17 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 +- Update to 0.17. + * Tue Mar 14 2006 Jose Pedro Oliveira - 0.16-1 - Update to 0.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 14 Mar 2006 15:27:35 -0000 1.12 +++ sources 18 Mar 2006 02:07:33 -0000 1.13 @@ -1 +1 @@ -3436fdd2b13cabb95a59df5e699fa6f3 ExtUtils-CBuilder-0.16.tar.gz +b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 02:57:07 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 17 Mar 2006 21:57:07 -0500 Subject: rpms/tla/FC-5 tla-remove-invariant.patch, NONE, 1.1 tla.spec, 1.26, 1.27 Message-ID: <200603180257.k2I2vd4q017152@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tla/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17132 Modified Files: tla.spec Added Files: tla-remove-invariant.patch Log Message: Remove failing invariant check. Will need to revert when glibc is fixed tla-remove-invariant.patch: --- NEW FILE tla-remove-invariant.patch --- Index: tla-working/src/hackerlab/tests/arrays-tests/unit-ar.c =================================================================== --- tla-working.orig/src/hackerlab/tests/arrays-tests/unit-ar.c +++ tla-working/src/hackerlab/tests/arrays-tests/unit-ar.c @@ -50,7 +50,6 @@ static void check_array (size_t size, unsigned long * ar) { int x; - invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1))); invariant (size == ar_size ((void *)ar, lim_use_must_malloc, sizeof (*ar))); for (x = 0; x < size; ++x) invariant (ar[x] == HASH_INDEX (x)); Index: tla.spec =================================================================== RCS file: /cvs/extras/rpms/tla/FC-5/tla.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- tla.spec 3 Mar 2006 13:18:56 -0000 1.26 +++ tla.spec 18 Mar 2006 02:57:06 -0000 1.27 @@ -1,6 +1,6 @@ Name: tla Version: 1.3.4 -Release: 3%{?dist} +Release: 2%{?dist} Summary: GNU arch revision control system Group: Development/Tools @@ -12,6 +12,7 @@ Patch0: %{name}-1.2pre0-posix.patch # Patch1 and Source2 from Debian's 1.3.3-3, the latter updated for 1.3.4. Patch1: %{name}-1.3.3-sysneon.patch +Patch2: %{name}-remove-invariant.patch Source2: %{name}-generate-manpage.pl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,6 +40,7 @@ rm -rf src/libneon rm -rf src/expat %patch1 -p1 +%patch2 -p1 %build mkdir src/=build @@ -77,6 +79,9 @@ %{_mandir}/man1/tla.1* %changelog +* Fri Mar 17 2006 Josh Boyer - 1.3.4-4 +- Add patch to remove failing invariant (bug 182742) + * Fri Mar 3 2006 Josh Boyer - 1.3.4-3 - Remove ppc alignment patch now that glibc is fixed From fedora-extras-commits at redhat.com Sat Mar 18 03:01:54 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 17 Mar 2006 22:01:54 -0500 Subject: rpms/tla/FC-5 tla.spec,1.27,1.28 Message-ID: <200603180302.k2I32QvL019149@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tla/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19123 Modified Files: tla.spec Log Message: Um.. specify the right release number Index: tla.spec =================================================================== RCS file: /cvs/extras/rpms/tla/FC-5/tla.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- tla.spec 18 Mar 2006 02:57:06 -0000 1.27 +++ tla.spec 18 Mar 2006 03:01:54 -0000 1.28 @@ -1,6 +1,6 @@ Name: tla Version: 1.3.4 -Release: 2%{?dist} +Release: 4%{?dist} Summary: GNU arch revision control system Group: Development/Tools From fedora-extras-commits at redhat.com Sat Mar 18 03:08:32 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 17 Mar 2006 22:08:32 -0500 Subject: rpms/tla/devel tla-remove-invariant.patch, NONE, 1.1 tla.spec, 1.26, 1.27 Message-ID: <200603180309.k2I395oP019229@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19209 Modified Files: tla.spec Added Files: tla-remove-invariant.patch Log Message: Remove erroring invariant tla-remove-invariant.patch: --- NEW FILE tla-remove-invariant.patch --- Index: tla-working/src/hackerlab/tests/arrays-tests/unit-ar.c =================================================================== --- tla-working.orig/src/hackerlab/tests/arrays-tests/unit-ar.c +++ tla-working/src/hackerlab/tests/arrays-tests/unit-ar.c @@ -50,7 +50,6 @@ static void check_array (size_t size, unsigned long * ar) { int x; - invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1))); invariant (size == ar_size ((void *)ar, lim_use_must_malloc, sizeof (*ar))); for (x = 0; x < size; ++x) invariant (ar[x] == HASH_INDEX (x)); Index: tla.spec =================================================================== RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- tla.spec 3 Mar 2006 13:18:56 -0000 1.26 +++ tla.spec 18 Mar 2006 03:08:32 -0000 1.27 @@ -1,6 +1,6 @@ Name: tla Version: 1.3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GNU arch revision control system Group: Development/Tools @@ -12,6 +12,7 @@ Patch0: %{name}-1.2pre0-posix.patch # Patch1 and Source2 from Debian's 1.3.3-3, the latter updated for 1.3.4. Patch1: %{name}-1.3.3-sysneon.patch +Patch2: %{name}-remove-invariant.patch Source2: %{name}-generate-manpage.pl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,6 +40,7 @@ rm -rf src/libneon rm -rf src/expat %patch1 -p1 +%patch2 -p1 %build mkdir src/=build @@ -77,6 +79,9 @@ %{_mandir}/man1/tla.1* %changelog +* Fri Mar 17 2006 Josh Boyer - 1.3.4-4 +- Add patch to remove failing invariant (bug 182742) + * Fri Mar 3 2006 Josh Boyer - 1.3.4-3 - Remove ppc alignment patch now that glibc is fixed From fedora-extras-commits at redhat.com Sat Mar 18 03:30:06 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 22:30:06 -0500 Subject: rpms/rkhunter/FC-5 rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.7, 1.8 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603180330.k2I3UdpB019366@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19347 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-5/rkhunter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rkhunter.spec 11 Mar 2006 21:08:16 -0000 1.7 +++ rkhunter.spec 18 Mar 2006 03:30:06 -0000 1.8 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Sat Mar 18 03:58:49 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Fri, 17 Mar 2006 22:58:49 -0500 Subject: comps comps-fe5.xml.in,1.28,1.29 Message-ID: <200603180359.k2I3xLR0019581@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19522 Modified Files: comps-fe5.xml.in Log Message: Add both nautilus-actions and texmaker Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- comps-fe5.xml.in 17 Mar 2006 19:14:24 -0000 1.28 +++ comps-fe5.xml.in 18 Mar 2006 03:58:49 -0000 1.29 @@ -153,6 +153,7 @@ gtweakui istanbul lock-keys-applet + nautilus-actions nautilus-flac-converter nautilus-image-converter sabayon @@ -396,6 +397,7 @@ MagicPoint pybliographer qcad + texmaker From fedora-extras-commits at redhat.com Sat Mar 18 08:53:06 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:53:06 -0500 Subject: rpms/libnasl - New directory Message-ID: <200603180853.k2I8r8b2030295@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30287/libnasl Log Message: Directory /cvs/extras/rpms/libnasl added to the repository From fedora-extras-commits at redhat.com Sat Mar 18 08:53:12 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:53:12 -0500 Subject: rpms/libnasl/devel - New directory Message-ID: <200603180853.k2I8rEKT030310@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30287/libnasl/devel Log Message: Directory /cvs/extras/rpms/libnasl/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 18 08:53:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:53:32 -0500 Subject: rpms/libnasl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603180853.k2I8rY9a030344@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30332 Added Files: Makefile import.log Log Message: Setup of module libnasl --- NEW FILE Makefile --- # Top level Makefile for module libnasl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 18 08:53:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:53:39 -0500 Subject: rpms/libnasl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603180853.k2I8rfTK030364@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30332/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libnasl --- NEW 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 Mar 18 08:54:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:54:30 -0500 Subject: rpms/libnasl import.log,1.1,1.2 Message-ID: <200603180855.k2I8t2I6030457@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30413 Modified Files: import.log Log Message: auto-import libnasl-2.2.6-2 on branch devel from libnasl-2.2.6-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libnasl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Mar 2006 08:53:32 -0000 1.1 +++ import.log 18 Mar 2006 08:54:30 -0000 1.2 @@ -0,0 +1 @@ +libnasl-2_2_6-2:HEAD:libnasl-2.2.6-2.src.rpm:1142672061 From fedora-extras-commits at redhat.com Sat Mar 18 08:54:36 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:54:36 -0500 Subject: rpms/libnasl/devel libnasl-2.2.4.pki.patch, NONE, 1.1 libnasl-config.patch, NONE, 1.1 libnasl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603180855.k2I8t8QK030461@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30413/devel Modified Files: .cvsignore sources Added Files: libnasl-2.2.4.pki.patch libnasl-config.patch libnasl.spec Log Message: auto-import libnasl-2.2.6-2 on branch devel from libnasl-2.2.6-2.src.rpm libnasl-2.2.4.pki.patch: --- NEW FILE libnasl-2.2.4.pki.patch --- diff -Naurp libnasl.orig/Makefile libnasl/Makefile --- libnasl.orig/Makefile 2004-07-28 20:07:09.000000000 +0200 +++ libnasl/Makefile 2005-07-06 15:15:56.000000000 +0200 @@ -17,8 +17,9 @@ install: all $(INSTALL) -c -m 0644 doc/nasl-config.1 $(DESTDIR)${mandir}/man1 $(INSTALL) -c -m 0644 doc/nasl.1 $(DESTDIR)${mandir}/man1 $(INSTALL) -c -m 0644 doc/nasl-config.1 $(DESTDIR)${mandir}/man1 - test -d $(DESTDIR)${localstatedir}/nessus || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir}/nessus - $(INSTALL) -c -m 0644 doc/nessus_org.pem $(DESTDIR)${localstatedir}/nessus/nessus_org.pem + test -d $(DESTDIR)${localstatedir}/lib/nessus || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir}/lib/nessus + test -d $(DESTDIR)${sysconfdir}/pki/nessus || $(INSTALL_DIR) -m 755 $(DESTDIR)${sysconfdir}/pki/nessus + $(INSTALL) -c -m 0644 doc/nessus_org.pem $(DESTDIR)${sysconfdir}/pki/nessus/nessus_org.pem @echo diff -Naurp libnasl.orig/nasl/Makefile libnasl/nasl/Makefile --- libnasl.orig/nasl/Makefile 2005-02-10 17:03:51.000000000 +0100 +++ libnasl/nasl/Makefile 2005-07-06 15:10:46.000000000 +0200 @@ -126,13 +126,13 @@ nasl_init.o: nasl_init.c nasl_crypto2.o: nasl_crypto2.c - $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)\" nasl_crypto2.c + $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" -DNESSUS_PKI_DIR=\"$(sysconfdir)/pki\" nasl_crypto2.c nasl_server.o: nasl_server.c - $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)\" nasl_server.c + $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" nasl_server.c nasl_cmd_exec.o: nasl_cmd_exec.c - $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)\" nasl_cmd_exec.c + $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" nasl_cmd_exec.c nasl_func.o: nasl_func.c nasl_var.h diff -Naurp libnasl.orig/nasl/nasl_crypto2.c libnasl/nasl/nasl_crypto2.c --- libnasl.orig/nasl/nasl_crypto2.c 2005-03-19 23:23:49.000000000 +0100 +++ libnasl/nasl/nasl_crypto2.c 2005-07-06 15:08:37.000000000 +0200 @@ -798,7 +798,7 @@ char * map_file(char * filename, int * l int generate_signed_script(char * filename) { RSA * rsa = NULL; - FILE * fp = fopen(NESSUS_STATE_DIR "/nessus/nessus_org.priv.pem", "r"); + FILE * fp = fopen(NESSUS_PKI_DIR "/nessus/nessus_org.priv.pem", "r"); unsigned char * result; int len; int i; @@ -873,7 +873,7 @@ int verify_script_signature(char * filen char * t; unsigned char md[SHA_DIGEST_LENGTH+1]; RSA * rsa = NULL; - FILE * fp = fopen(NESSUS_STATE_DIR "/nessus/nessus_org.pem", "r"); + FILE * fp = fopen(NESSUS_PKI_DIR "/nessus/nessus_org.pem", "r"); char sig[16384]; unsigned char bin_sig[8192]; int binsz = 0; @@ -885,7 +885,7 @@ int verify_script_signature(char * filen if ( fp == NULL ) { - fprintf(stderr, "Open %s/nessus/nessus_org.pem : %s\n", NESSUS_STATE_DIR, strerror(errno)); + fprintf(stderr, "Open %s/nessus/nessus_org.pem : %s\n", NESSUS_PKI_DIR, strerror(errno)); return -1; } libnasl-config.patch: --- NEW FILE libnasl-config.patch --- --- nasl-config.in.orig 2006-02-24 11:21:23.000000000 +0100 +++ nasl-config.in 2006-02-24 11:21:46.000000000 +0100 @@ -12,8 +12,8 @@ PREFIX=@prefix@ -LIBDIR=$PREFIX/lib -INCLUDEDIR=$PREFIX/include +LIBDIR=@libdir@ +INCLUDEDIR=@includedir@ VERSION=@version@ usage() --- NEW FILE libnasl.spec --- Name: libnasl Version: 2.2.6 Release: 2%{?dist} Summary: Nessus Attack Scripting Language Group: System Environment/Libraries License: GPL URL: http://www.nessus.org Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/libnasl-2.2.6.tar.gz Patch0: libnasl-config.patch Patch1: libnasl-2.2.4.pki.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison BuildRequires: libpcap BuildRequires: nessus-libraries-devel >= %{version} BuildRequires: tetex-dvips BuildRequires: tetex-latex %description NASL is a scripting language designed for the Nessus security scanner. Its aim is to allow anyone to write a test for a given security hole in a few minutes, to allow people to share their tests without having to worry about their operating system, and to guarantee everyone that a NASL script can not do anything nasty except performing a given security test against a given target. Thus, NASL allows you to easily forge IP packets, or to send regular packets. It provides you some convenient functions that will make the test of web and FTP server more easy to write. NASL garantees you that a NASL script: - will not send any packet to a host other than the target host, - will not execute any commands on your local system. %package devel Summary: Nessus Attack Scripting Language header files Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains the files needed for development with %{name}. %prep %setup -q -n %{name} %patch0 %patch1 -p1 %build %configure --enable-shared --disable-static --with-pic #smp_mflags will breake build make cd doc make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/libnasl.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING doc/nasl_guide.ps doc/nasl_guide.dvi %{_bindir}/nasl %{_libdir}/libnasl.so.* %{_mandir}/man1/nasl.1* %{_localstatedir}/lib/nessus %{_sysconfdir}/pki/nessus %files devel %defattr(-,root,root,-) %{_bindir}/nasl-config %{_libdir}/libnasl.so %{_includedir}/nessus %{_mandir}/man1/nasl-config.1* %changelog * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - add pki location patch - tune BR - honor now localstatedir * Fri Feb 24 2006 Andreas Bierfert 2.2.6-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Mar 2006 08:53:38 -0000 1.1 +++ .cvsignore 18 Mar 2006 08:54:36 -0000 1.2 @@ -0,0 +1 @@ +libnasl-2.2.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Mar 2006 08:53:38 -0000 1.1 +++ sources 18 Mar 2006 08:54:36 -0000 1.2 @@ -0,0 +1 @@ +06f90680d20953fb9806b8c54e021683 libnasl-2.2.6.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 08:56:04 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Sat, 18 Mar 2006 03:56:04 -0500 Subject: rpms/gourmet/devel .cvsignore, 1.4, 1.5 gourmet.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603180856.k2I8uaVo030512@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30456 Modified Files: .cvsignore gourmet.spec sources Log Message: Testing branch of gourmet (adds some cool features). Spec file builds - but not ready for build request. Not for fc4/fc5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Nov 2005 23:30:17 -0000 1.4 +++ .cvsignore 18 Mar 2006 08:56:03 -0000 1.5 @@ -1,2 +1,3 @@ gourmet-0.8.5.12.tar.gz gourmet-0.8.5.13.tar.gz +gourmet-0.10.1.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/gourmet.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gourmet.spec 11 Nov 2005 23:30:17 -0000 1.3 +++ gourmet.spec 18 Mar 2006 08:56:04 -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: gourmet -Version: 0.8.5.13 +Version: 0.10.1 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,15 +33,31 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop +#%%{__sed} -i 's?\r??' src/lib/defaults_sk.py +#%%{__sed} -i 's?\r??' src/lib/defaults_pt.py +chmod -x data/recipe.dtd # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f popd +# remove shell bangs +pushd src/lib +for file in `find . -type f`; do + cp $file $file.orig + if [ ! "$file" = "./nutrition/__init__.py" ]; then + grep -v "^\#\!\/usr\/bin" $file.orig > $file + fi + rm -f $file.orig +done +popd %build pushd i18n for file in *.po; do - sh make_mo.sh $(basename $file .po) + # broken .po files + if [ ! ${file} = "hu.po" ] && [ ! ${file} = "pt_BR.po" ]; then + sh make_mo.sh $(basename $file .po) + fi done popd @@ -52,6 +68,7 @@ %{__python} setup.py install -O1 --skip-build --root %buildroot \ --disable-modules-check + desktop-file-install %buildroot%_datadir/applications/gourmet.desktop \ --vendor=fedora \ --add-category=X-Fedora \ @@ -59,7 +76,6 @@ --copy-name-to-generic-name \ --delete-original - %find_lang %{name} %clean @@ -92,12 +108,31 @@ %{python_sitelib}/gourmet/importers/html_plugins/*.py %{python_sitelib}/gourmet/importers/html_plugins/*.pyc %ghost %{python_sitelib}/gourmet/importers/html_plugins/*.pyo +%dir %{python_sitelib}/gourmet/nutrition +%{python_sitelib}/gourmet/nutrition/*.py +%{python_sitelib}/gourmet/nutrition/*.pyc +%ghost %{python_sitelib}/gourmet/nutrition/*.pyo # datadir stuff %{_datadir}/applications/fedora-gourmet.desktop %{_datadir}/pixmaps/recbox.png %{_datadir}/gourmet %changelog +* Sat Mar 18 2006 Michael A. Peters - 0.10.1-1 +- This is the unstable branch of gourmet - for the devel branch +- of Fedora Extras +-- Main new features since 0.8 stable branch: +-- adds nutritional information +-- uses sqlite database backend +- TODO (packaging) +-- broken po files (two of them) +-- verify sqlite backend works as advertised +-- verify updating existing recipe database works + +* Fri Mar 17 2006 Michael A. Peters - 0.8.5.14-1 +- New upstream version +- rpmlint cleanup + * Fri Nov 11 2005 Michael A. Peters - 0.8.5.13-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Nov 2005 23:30:17 -0000 1.4 +++ sources 18 Mar 2006 08:56:04 -0000 1.5 @@ -1,2 +1 @@ -77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz -3db64a0609bf5d97b81d8600dda559b9 gourmet-0.8.5.13.tar.gz +a3e73adb21c205ba0bd6ee76ee5860c9 gourmet-0.10.1.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 08:57:45 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:57:45 -0500 Subject: rpms/libnasl/devel libnasl.spec,1.1,1.2 Message-ID: <200603180858.k2I8wHaO030538@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30521 Modified Files: libnasl.spec Log Message: - Fix BR Index: libnasl.spec =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/libnasl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libnasl.spec 18 Mar 2006 08:54:36 -0000 1.1 +++ libnasl.spec 18 Mar 2006 08:57:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: libnasl Version: 2.2.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Nessus Attack Scripting Language Group: System Environment/Libraries @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison -BuildRequires: libpcap BuildRequires: nessus-libraries-devel >= %{version} BuildRequires: tetex-dvips BuildRequires: tetex-latex @@ -83,6 +82,10 @@ %{_mandir}/man1/nasl-config.1* %changelog +* Sat Mar 18 2006 Andreas Bierfert +2.2.6-3 +- fix BR + * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - add pki location patch From fedora-extras-commits at redhat.com Sat Mar 18 10:07:29 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Sat, 18 Mar 2006 05:07:29 -0500 Subject: rpms/gourmet/devel gourmet.spec,1.4,1.5 Message-ID: <200603181008.k2IA81pT002712@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2691 Modified Files: gourmet.spec Log Message: Missing explicit require for python-sqlite2 Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/gourmet.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gourmet.spec 18 Mar 2006 08:56:04 -0000 1.4 +++ gourmet.spec 18 Mar 2006 10:07:28 -0000 1.5 @@ -23,6 +23,7 @@ Requires: pygtk2 > 2.3.9 Requires: PyRTF Requires: python-imaging +Requires: python-sqlite2 %description Gourmet Recipe Manager is a recipe-organizer for GNOME that generates shopping From fedora-extras-commits at redhat.com Sat Mar 18 10:16:09 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 05:16:09 -0500 Subject: rpms/perl-File-Slurp/devel .cvsignore, 1.3, 1.4 perl-File-Slurp.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603181016.k2IAGjLS002821@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Slurp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2742/devel Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2006 06:27:17 -0000 1.3 +++ .cvsignore 18 Mar 2006 10:16:04 -0000 1.4 @@ -1 +1 @@ -File-Slurp-9999.11.tar.gz +File-Slurp-9999.12.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/perl-File-Slurp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-File-Slurp.spec 28 Feb 2006 23:24:04 -0000 1.4 +++ perl-File-Slurp.spec 18 Mar 2006 10:16:04 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-File-Slurp -Version: 9999.11 -Release: 2%{?dist} +Version: 9999.12 +Release: 1%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL or Artistic Group: Development/Libraries @@ -53,15 +53,12 @@ %{_mandir}/man3/* %changelog +* Sat Mar 18 2006 Ralf Cors??pius - 9999.12-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 9999.11-2 - Rebuild for perl-5.8.8. * Wed Feb 01 2006 Ralf Cors??pius - 9999.11-1 - Upstream update. - BR perl(Test::Pod), perl(Test::Pod::Coverage). - -* Sat Sep 10 2005 Ralf Corsepius - 9999.09-2 -- Apply JPO's patch (PR #167282). - -* Thu Sep 01 2005 Ralf Corsepius - 9999.09-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2006 06:27:17 -0000 1.3 +++ sources 18 Mar 2006 10:16:04 -0000 1.4 @@ -1 +1 @@ -f07d4a5e580412cb40cf50a0d99de30d File-Slurp-9999.11.tar.gz +6a162082834307bac95be3e3fc955ce9 File-Slurp-9999.12.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 10:16:17 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 05:16:17 -0500 Subject: rpms/perl-File-Slurp/FC-4 .cvsignore, 1.3, 1.4 perl-File-Slurp.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603181016.k2IAGor1002826@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Slurp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2742/FC-4 Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2006 06:27:23 -0000 1.3 +++ .cvsignore 18 Mar 2006 10:16:17 -0000 1.4 @@ -1 +1 @@ -File-Slurp-9999.11.tar.gz +File-Slurp-9999.12.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-4/perl-File-Slurp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-File-Slurp.spec 1 Feb 2006 06:27:23 -0000 1.3 +++ perl-File-Slurp.spec 18 Mar 2006 10:16:17 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-File-Slurp -Version: 9999.11 +Version: 9999.12 Release: 1%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL or Artistic @@ -53,12 +53,9 @@ %{_mandir}/man3/* %changelog +* Sat Mar 18 2006 Ralf Cors??pius - 9999.12-1 +- Upstream update. + * Wed Feb 01 2006 Ralf Cors??pius - 9999.11-1 - Upstream update. - BR perl(Test::Pod), perl(Test::Pod::Coverage). - -* Sat Sep 10 2005 Ralf Corsepius - 9999.09-2 -- Apply JPO's patch (PR #167282). - -* Thu Sep 01 2005 Ralf Corsepius - 9999.09-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2006 06:27:23 -0000 1.3 +++ sources 18 Mar 2006 10:16:17 -0000 1.4 @@ -1 +1 @@ -f07d4a5e580412cb40cf50a0d99de30d File-Slurp-9999.11.tar.gz +6a162082834307bac95be3e3fc955ce9 File-Slurp-9999.12.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 10:16:25 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 05:16:25 -0500 Subject: rpms/perl-File-Slurp/FC-5 .cvsignore, 1.3, 1.4 perl-File-Slurp.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603181016.k2IAGxDh002831@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Slurp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2742/FC-5 Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2006 06:27:17 -0000 1.3 +++ .cvsignore 18 Mar 2006 10:16:24 -0000 1.4 @@ -1 +1 @@ -File-Slurp-9999.11.tar.gz +File-Slurp-9999.12.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-5/perl-File-Slurp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-File-Slurp.spec 28 Feb 2006 23:24:04 -0000 1.4 +++ perl-File-Slurp.spec 18 Mar 2006 10:16:24 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-File-Slurp -Version: 9999.11 -Release: 2%{?dist} +Version: 9999.12 +Release: 1%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL or Artistic Group: Development/Libraries @@ -53,15 +53,12 @@ %{_mandir}/man3/* %changelog +* Sat Mar 18 2006 Ralf Cors??pius - 9999.12-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 9999.11-2 - Rebuild for perl-5.8.8. * Wed Feb 01 2006 Ralf Cors??pius - 9999.11-1 - Upstream update. - BR perl(Test::Pod), perl(Test::Pod::Coverage). - -* Sat Sep 10 2005 Ralf Corsepius - 9999.09-2 -- Apply JPO's patch (PR #167282). - -* Thu Sep 01 2005 Ralf Corsepius - 9999.09-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2006 06:27:17 -0000 1.3 +++ sources 18 Mar 2006 10:16:24 -0000 1.4 @@ -1 +1 @@ -f07d4a5e580412cb40cf50a0d99de30d File-Slurp-9999.11.tar.gz +6a162082834307bac95be3e3fc955ce9 File-Slurp-9999.12.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 10:16:31 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 05:16:31 -0500 Subject: rpms/perl-File-Slurp/FC-3 .cvsignore, 1.3, 1.4 perl-File-Slurp.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603181017.k2IAH5To002836@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Slurp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2742/FC-3 Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2006 06:27:29 -0000 1.3 +++ .cvsignore 18 Mar 2006 10:16:31 -0000 1.4 @@ -1 +1 @@ -File-Slurp-9999.11.tar.gz +File-Slurp-9999.12.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-3/perl-File-Slurp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-File-Slurp.spec 1 Feb 2006 06:27:29 -0000 1.3 +++ perl-File-Slurp.spec 18 Mar 2006 10:16:31 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-File-Slurp -Version: 9999.11 +Version: 9999.12 Release: 1%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL or Artistic @@ -53,12 +53,9 @@ %{_mandir}/man3/* %changelog +* Sat Mar 18 2006 Ralf Cors??pius - 9999.12-1 +- Upstream update. + * Wed Feb 01 2006 Ralf Cors??pius - 9999.11-1 - Upstream update. - BR perl(Test::Pod), perl(Test::Pod::Coverage). - -* Sat Sep 10 2005 Ralf Corsepius - 9999.09-2 -- Apply JPO's patch (PR #167282). - -* Thu Sep 01 2005 Ralf Corsepius - 9999.09-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2006 06:27:29 -0000 1.3 +++ sources 18 Mar 2006 10:16:31 -0000 1.4 @@ -1 +1 @@ -f07d4a5e580412cb40cf50a0d99de30d File-Slurp-9999.11.tar.gz +6a162082834307bac95be3e3fc955ce9 File-Slurp-9999.12.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 10:21:29 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 05:21:29 -0500 Subject: owners owners.list,1.750,1.751 Message-ID: <200603181022.k2IAM1FJ003028@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3009 Modified Files: owners.list Log Message: - add nessus-libraries - add libnasl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.750 retrieving revision 1.751 diff -u -r1.750 -r1.751 --- owners.list 17 Mar 2006 23:45:23 -0000 1.750 +++ owners.list 18 Mar 2006 10:21:28 -0000 1.751 @@ -584,6 +584,7 @@ Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org| Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|libnasl|Nessus Attack Scripting Language|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| @@ -729,6 +730,7 @@ Fedora Extras|nco|Suite of programs for manipulating NetCDF/HDF4 files|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|ncview|A visual browser for netCDF format files|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|nedit|A GUI text editor for systems with X and Motif|jnovy at redhat.com|extras-qa at fedoraproject.org| +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|netdiag|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 18 10:53:58 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 05:53:58 -0500 Subject: rpms/scribus/devel .cvsignore, 1.6, 1.7 scribus.spec, 1.15, 1.16 sources, 1.6, 1.7 Message-ID: <200603181054.k2IAsVbO003181@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/scribus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3160 Modified Files: .cvsignore scribus.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Jan 2006 08:19:35 -0000 1.6 +++ .cvsignore 18 Mar 2006 10:53:58 -0000 1.7 @@ -1 +1 @@ -scribus-1.2.4.1.tar.bz2 +scribus-1.3.2.tar.bz2 Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- scribus.spec 16 Feb 2006 22:59:17 -0000 1.15 +++ scribus.spec 18 Mar 2006 10:53:58 -0000 1.16 @@ -1,13 +1,13 @@ Name: scribus -Version: 1.2.4.1 -Release: 4%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Summary: DeskTop Publishing application written in Qt Group: Applications/Productivity License: GPL URL: http://www.scribus.net/ -Source0: http://www.scribus.org.uk/downloads/1.2.4.1/scribus-1.2.4.1.tar.bz2 +Source0: http://www.scribus.org.uk/downloads/1.3.2/scribus-1.3.2.tar.bz2 Source1: scribus.xml Source2: scribus.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -136,6 +136,10 @@ %changelog +* Sat Mar 18 2006 Andreas Bierfert +1.3.2-1 +- upgrade to beta version + * Thu Feb 16 2006 Andreas Bierfert 1.2.4.1-4 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Jan 2006 08:19:35 -0000 1.6 +++ sources 18 Mar 2006 10:53:58 -0000 1.7 @@ -1 +1 @@ -d72ffe72b1d9ba1230557692af803927 scribus-1.2.4.1.tar.bz2 +700b8ce377084e317aa9d34a2157428d scribus-1.3.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 18 13:58:06 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 08:58:06 -0500 Subject: rpms/liferea/FC-4 liferea-mozilla-lib64.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 liferea.spec, 1.25, 1.26 sources, 1.21, 1.22 Message-ID: <200603181358.k2IDwcuo010267@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10240 Modified Files: .cvsignore liferea.spec sources Added Files: liferea-mozilla-lib64.patch Log Message: * Sat Mar 18 2006 Brian Pepple - 1.0.7-1 - Update to 1.0.7. - Add patch to find mozilla on x86_64 - Fix gconf scriptlets. - Remove unnecessary BR (zlib-devel & libxml2-devel). liferea-mozilla-lib64.patch: --- NEW FILE liferea-mozilla-lib64.patch --- diff -ur liferea-1.0.7.ORIG/src/liferea.in liferea-1.0.7/src/liferea.in --- liferea-1.0.7.ORIG/src/liferea.in 2006-01-16 18:11:19.000000000 -0500 +++ liferea-1.0.7/src/liferea.in 2006-03-14 16:45:26.000000000 -0500 @@ -39,7 +39,7 @@ fi @MOZILLA_LIB_DIR_SEARCH@ -look_for_mozilla "/usr/lib/mozilla*/chrome/comm.jar" +look_for_mozilla "/usr/lib*/mozilla*/chrome/comm.jar" look_for_mozilla "/usr/local/mozilla*/chrome/comm.jar" look_for_mozilla "/opt/mozilla/chrome/comm.jar" look_for_mozilla "/opt/mozilla/lib/chrome/comm.jar" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 2 Feb 2006 18:25:21 -0000 1.20 +++ .cvsignore 18 Mar 2006 13:58:05 -0000 1.21 @@ -1 +1 @@ -liferea-1.0.3.tar.gz +liferea-1.0.7.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- liferea.spec 2 Feb 2006 18:25:21 -0000 1.25 +++ liferea.spec 18 Mar 2006 13:58:05 -0000 1.26 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.3 +Version: 1.0.7 Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -9,20 +9,20 @@ License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-mozilla-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libxml2-devel BuildRequires: gtkhtml2-devel mozilla-devel BuildRequires: GConf2-devel BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: zlib-devel %if %{with_dbus} BuildRequires: dbus-devel %endif -Requires(post): GConf2 +Requires(pre): GConf2 +Requires(post): GConf2 Requires(preun): GConf2 @@ -64,16 +64,26 @@ rm -rf ${RPM_BUILD_ROOT} +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : +fi + + %post -export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/liferea.schemas >/dev/null || : + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : %preun -export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) -gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/liferea.schemas >/dev/null || : +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : +fi %files -f %{name}.lang @@ -92,6 +102,12 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 1.0.7-1 +- Update to 1.0.7. +- Add patch to find mozilla on x86_64 +- Fix gconf scriptlets. +- Remove unnecessary BR (zlib-devel & libxml2-devel). + * Thu Feb 2 2006 Brian Pepple - 1.0.3-1 - Update to 1.0.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 2 Feb 2006 18:25:21 -0000 1.21 +++ sources 18 Mar 2006 13:58:05 -0000 1.22 @@ -1 +1 @@ -40232e6884e4ae9628916868a9a9c828 liferea-1.0.3.tar.gz +d75b2621d2e926695e833eaa2aed68c2 liferea-1.0.7.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 14:09:22 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 18 Mar 2006 09:09:22 -0500 Subject: rpms/tinyerp/devel tinyerp-server-pidlog.patch, NONE, 1.1 tinyerp-server, 1.2, 1.3 tinyerp-server.conf, 1.1, 1.2 tinyerp-server.patch, 1.4, 1.5 tinyerp.spec, 1.15, 1.16 Message-ID: <200603181409.k2IE9u6g012285@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12254 Modified Files: tinyerp-server tinyerp-server.conf tinyerp-server.patch tinyerp.spec Added Files: tinyerp-server-pidlog.patch Log Message: - added patch for handling the pid and log file in the server, modified the init.d script - updated config file to include only default values tinyerp-server-pidlog.patch: --- NEW FILE tinyerp-server-pidlog.patch --- diff -Nru server.orig/bin/netsvc.py server/bin/netsvc.py --- server.orig/bin/netsvc.py 2005-10-07 13:45:46.000000000 +0200 +++ server/bin/netsvc.py 2006-03-18 14:47:47.000000000 +0100 @@ -96,13 +96,20 @@ class ServiceUnavailable(Exception): pass +import tools.config +import os + LOG_DEBUG='debug' LOG_INFO='info' LOG_WARNING='warn' LOG_ERROR='error' LOG_CRITICAL='critical' -handler = logging.StreamHandler(sys.stdout) +if tools.config['logfile']: + fd = open(tools.config['logfile'], 'a') + handler = logging.StreamHandler(fd) +else: + handler = logging.StreamHandler(sys.stdout) # create a format for log messages and dates formatter = logging.Formatter('%(asctime)s %(levelname)s:%(name)s:%(message)s', '%a, %d %b %Y %H:%M:%S') @@ -202,11 +209,19 @@ self.server.socket.close() self.server.socket.close() Agent.quit() + if tools.config['pidfile']: + os.unlink(tools.config['pidfile']) del self.server sys.exit(0) def start(self): + if tools.config['pidfile']: + fd=open(tools.config['pidfile'], 'w') + pidtext="%d" % (os.getpid()) + fd.write(pidtext) + fd.close() signal.signal(signal.SIGINT, self.handler) + signal.signal(signal.SIGTERM, self.handler) self.server.register_introspection_functions() self.server.serve_forever() diff -Nru server.orig/bin/tools/config.py server/bin/tools/config.py --- server.orig/bin/tools/config.py 2006-01-22 20:26:30.000000000 +0100 +++ server/bin/tools/config.py 2006-03-10 11:16:19.000000000 +0100 @@ -50,6 +50,8 @@ 'language': None, 'addons_path' : None, 'root_path' : None, + 'pidfile' : None, + 'logfile' : None, } parser = optparse.OptionParser(version=tinyerp_version_string) @@ -57,6 +59,8 @@ parser.add_option("-c", "--config", dest="config", help="specify alternate config file") parser.add_option("-s", "--save", action="store_true", dest="save", default=False, help="save configuration to ~/.terp_serverrc") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable debugging") + parser.add_option("--pidfile", dest="pidfile", help="file where the server pid will be stored") + parser.add_option("--logfile", dest="logfile", help="file where the server log will be stored") parser.add_option("-n", "--interface", dest="interface", help="specify the TCP IP address") parser.add_option("-p", "--port", dest="port", help="specify the TCP port") @@ -104,6 +108,8 @@ self.options['upgrade'] = opt.upgrade self.options['verbose'] = opt.verbose + self.options['pidfile'] = opt.pidfile + self.options['logfile'] = opt.logfile init = {} if opt.init: Index: tinyerp-server =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp-server 25 Jan 2006 09:22:50 -0000 1.2 +++ tinyerp-server 18 Mar 2006 14:09:22 -0000 1.3 @@ -14,21 +14,23 @@ # Source function library. . /etc/rc.d/init.d/functions -OPTS="" +PIDFILE=/var/spool/tinyerp/tinyerp-server.pid +LOCKFILE=/var/lock/subsys/tinyerp-server +LOGFILE=/var/log/tinyerp/tinyerp-server.log + +OPTS="--pidfile=$PIDFILE --logfile=$LOGFILE" prog="tinyerp-server" # check if the tinyerp-server conf file is present, then use it if [ -f /etc/tinyerp-server.conf ]; then - OPTS="-c /etc/tinyerp-server.conf" + OPTS="$OPTS -c /etc/tinyerp-server.conf" fi # check the existence of the tinyerp-server script [ -z "/usr/bin/tinyerp-server" ] && exit 0 RETVAL=0 -PIDFILE=/var/spool/tinyerp/tinyerp-server.pid -LOCKFILE=/var/lock/subsys/tinyerp-server start() { echo -n $"Starting $prog: " @@ -45,7 +47,7 @@ kill -TERM `cat $PIDFILE` > /dev/null 2>&1 RETVAL=$? if [ $RETVAL -eq 0 ] ; then - rm -f $PIDFILE $LOCKFILE + rm -f $LOCKFILE echo_success echo Index: tinyerp-server.conf =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyerp-server.conf 20 Nov 2005 18:25:32 -0000 1.1 +++ tinyerp-server.conf 18 Mar 2006 14:09:22 -0000 1.2 @@ -1,21 +1,18 @@ [options] without_demo = False -root_path = None +upgrade = False verbose = False xmlrpc = True -db_user = tinyerp +db_user = False db_password = False -webdb_host = False -webdb_name = False +root_path = None soap = False -db_host = False -webdb_user = False -webdb_password = False -db_name = tinyerp -webdb_port = False +translate_modules = ['all'] +db_name = terp +netrpc = True demo = {} interface = -netrpc = True +db_host = False db_port = False port = 8069 addons_path = None tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-server.patch 30 Jan 2006 13:56:00 -0000 1.4 +++ tinyerp-server.patch 18 Mar 2006 14:09:22 -0000 1.5 @@ -21,14 +21,3 @@ 'stock', 'subscription'] required_modules = [('psycopg', 'PostgreSQL module'), -@@ -104,8 +106,9 @@ - # create startup script - start_script = \ - "#!/bin/sh\n\ -+echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\ - cd %s/lib/python%s/site-packages/tinyerp-server\n\ --exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable) -+exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable) - # write script - f = open('tinyerp-server', 'w') - f.write(start_script) Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- tinyerp.spec 14 Feb 2006 08:07:43 -0000 1.15 +++ tinyerp.spec 18 Mar 2006 14:09:22 -0000 1.16 @@ -3,7 +3,7 @@ Name: tinyerp Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client @@ -23,6 +23,7 @@ Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch +Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -50,6 +51,7 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 +%patch2 %build cd client @@ -137,6 +139,10 @@ %changelog +* Sat Mar 18 2006 Dan Horak 3.2.1-3 +- new config file with only default values (#184505) +- added a patch for handling the pid and log file in the server (#184502) + * Tue Feb 14 2006 Dan Horak 3.2.1-2 - rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sat Mar 18 14:39:59 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 18 Mar 2006 09:39:59 -0500 Subject: rpms/tinyerp/FC-3 tinyerp-server-pidlog.patch, NONE, 1.1 tinyerp-server, 1.3, 1.4 tinyerp-server.conf, 1.1, 1.2 tinyerp-server.patch, 1.5, 1.6 tinyerp.spec, 1.11, 1.12 Message-ID: <200603181440.k2IEeYdS012493@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12462 Modified Files: tinyerp-server tinyerp-server.conf tinyerp-server.patch tinyerp.spec Added Files: tinyerp-server-pidlog.patch Log Message: - added patch for handling the pid and log file in the server, modified the init.d script - updated config file to include only default values tinyerp-server-pidlog.patch: --- NEW FILE tinyerp-server-pidlog.patch --- diff -Nru server.orig/bin/netsvc.py server/bin/netsvc.py --- server.orig/bin/netsvc.py 2005-10-07 13:45:46.000000000 +0200 +++ server/bin/netsvc.py 2006-03-18 14:47:47.000000000 +0100 @@ -96,13 +96,20 @@ class ServiceUnavailable(Exception): pass +import tools.config +import os + LOG_DEBUG='debug' LOG_INFO='info' LOG_WARNING='warn' LOG_ERROR='error' LOG_CRITICAL='critical' -handler = logging.StreamHandler(sys.stdout) +if tools.config['logfile']: + fd = open(tools.config['logfile'], 'a') + handler = logging.StreamHandler(fd) +else: + handler = logging.StreamHandler(sys.stdout) # create a format for log messages and dates formatter = logging.Formatter('%(asctime)s %(levelname)s:%(name)s:%(message)s', '%a, %d %b %Y %H:%M:%S') @@ -202,11 +209,19 @@ self.server.socket.close() self.server.socket.close() Agent.quit() + if tools.config['pidfile']: + os.unlink(tools.config['pidfile']) del self.server sys.exit(0) def start(self): + if tools.config['pidfile']: + fd=open(tools.config['pidfile'], 'w') + pidtext="%d" % (os.getpid()) + fd.write(pidtext) + fd.close() signal.signal(signal.SIGINT, self.handler) + signal.signal(signal.SIGTERM, self.handler) self.server.register_introspection_functions() self.server.serve_forever() diff -Nru server.orig/bin/tools/config.py server/bin/tools/config.py --- server.orig/bin/tools/config.py 2006-01-22 20:26:30.000000000 +0100 +++ server/bin/tools/config.py 2006-03-10 11:16:19.000000000 +0100 @@ -50,6 +50,8 @@ 'language': None, 'addons_path' : None, 'root_path' : None, + 'pidfile' : None, + 'logfile' : None, } parser = optparse.OptionParser(version=tinyerp_version_string) @@ -57,6 +59,8 @@ parser.add_option("-c", "--config", dest="config", help="specify alternate config file") parser.add_option("-s", "--save", action="store_true", dest="save", default=False, help="save configuration to ~/.terp_serverrc") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable debugging") + parser.add_option("--pidfile", dest="pidfile", help="file where the server pid will be stored") + parser.add_option("--logfile", dest="logfile", help="file where the server log will be stored") parser.add_option("-n", "--interface", dest="interface", help="specify the TCP IP address") parser.add_option("-p", "--port", dest="port", help="specify the TCP port") @@ -104,6 +108,8 @@ self.options['upgrade'] = opt.upgrade self.options['verbose'] = opt.verbose + self.options['pidfile'] = opt.pidfile + self.options['logfile'] = opt.logfile init = {} if opt.init: Index: tinyerp-server =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tinyerp-server 25 Jan 2006 09:14:04 -0000 1.3 +++ tinyerp-server 18 Mar 2006 14:39:56 -0000 1.4 @@ -14,21 +14,23 @@ # Source function library. . /etc/rc.d/init.d/functions -OPTS="" +PIDFILE=/var/spool/tinyerp/tinyerp-server.pid +LOCKFILE=/var/lock/subsys/tinyerp-server +LOGFILE=/var/log/tinyerp/tinyerp-server.log + +OPTS="--pidfile=$PIDFILE --logfile=$LOGFILE" prog="tinyerp-server" # check if the tinyerp-server conf file is present, then use it if [ -f /etc/tinyerp-server.conf ]; then - OPTS="-c /etc/tinyerp-server.conf" + OPTS="$OPTS -c /etc/tinyerp-server.conf" fi # check the existence of the tinyerp-server script [ -z "/usr/bin/tinyerp-server" ] && exit 0 RETVAL=0 -PIDFILE=/var/spool/tinyerp/tinyerp-server.pid -LOCKFILE=/var/lock/subsys/tinyerp-server start() { echo -n $"Starting $prog: " @@ -45,7 +47,7 @@ kill -TERM `cat $PIDFILE` > /dev/null 2>&1 RETVAL=$? if [ $RETVAL -eq 0 ] ; then - rm -f $PIDFILE $LOCKFILE + rm -f $LOCKFILE echo_success echo Index: tinyerp-server.conf =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyerp-server.conf 27 Nov 2005 09:26:58 -0000 1.1 +++ tinyerp-server.conf 18 Mar 2006 14:39:57 -0000 1.2 @@ -1,21 +1,18 @@ [options] without_demo = False -root_path = None +upgrade = False verbose = False xmlrpc = True -db_user = tinyerp +db_user = False db_password = False -webdb_host = False -webdb_name = False +root_path = None soap = False -db_host = False -webdb_user = False -webdb_password = False -db_name = tinyerp -webdb_port = False +translate_modules = ['all'] +db_name = terp +netrpc = True demo = {} interface = -netrpc = True +db_host = False db_port = False port = 8069 addons_path = None tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tinyerp-server.patch 30 Jan 2006 13:42:31 -0000 1.5 +++ tinyerp-server.patch 18 Mar 2006 14:39:57 -0000 1.6 @@ -21,14 +21,3 @@ 'stock', 'subscription'] required_modules = [('psycopg', 'PostgreSQL module'), -@@ -104,8 +106,9 @@ - # create startup script - start_script = \ - "#!/bin/sh\n\ -+echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\ - cd %s/lib/python%s/site-packages/tinyerp-server\n\ --exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable) -+exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable) - # write script - f = open('tinyerp-server', 'w') - f.write(start_script) Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- tinyerp.spec 30 Jan 2006 13:42:31 -0000 1.11 +++ tinyerp.spec 18 Mar 2006 14:39:57 -0000 1.12 @@ -3,7 +3,7 @@ Name: tinyerp Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client @@ -22,6 +22,7 @@ Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch +Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -49,6 +50,7 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 +%patch2 %build cd client @@ -137,6 +139,10 @@ %changelog +* Sat Mar 18 2006 Dan Horak 3.2.1-2 +- new config file with only default values (#184505) +- added a patch for handling the pid and log file in the server (#184502) + * Mon Jan 30 2006 Dan Horak 3.2.1-1 - update to upstream tinyerp 3.2.1 - fixed filename for the czech translation From fedora-extras-commits at redhat.com Sat Mar 18 14:41:46 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 18 Mar 2006 09:41:46 -0500 Subject: rpms/tinyerp/FC-4 tinyerp-server-pidlog.patch, NONE, 1.1 tinyerp-server, 1.3, 1.4 tinyerp-server.conf, 1.1, 1.2 tinyerp-server.patch, 1.5, 1.6 tinyerp.spec, 1.13, 1.14 Message-ID: <200603181442.k2IEgJrN012566@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12537 Modified Files: tinyerp-server tinyerp-server.conf tinyerp-server.patch tinyerp.spec Added Files: tinyerp-server-pidlog.patch Log Message: - added patch for handling the pid and log file in the server, modified the init.d script - updated config file to include only default values tinyerp-server-pidlog.patch: --- NEW FILE tinyerp-server-pidlog.patch --- diff -Nru server.orig/bin/netsvc.py server/bin/netsvc.py --- server.orig/bin/netsvc.py 2005-10-07 13:45:46.000000000 +0200 +++ server/bin/netsvc.py 2006-03-18 14:47:47.000000000 +0100 @@ -96,13 +96,20 @@ class ServiceUnavailable(Exception): pass +import tools.config +import os + LOG_DEBUG='debug' LOG_INFO='info' LOG_WARNING='warn' LOG_ERROR='error' LOG_CRITICAL='critical' -handler = logging.StreamHandler(sys.stdout) +if tools.config['logfile']: + fd = open(tools.config['logfile'], 'a') + handler = logging.StreamHandler(fd) +else: + handler = logging.StreamHandler(sys.stdout) # create a format for log messages and dates formatter = logging.Formatter('%(asctime)s %(levelname)s:%(name)s:%(message)s', '%a, %d %b %Y %H:%M:%S') @@ -202,11 +209,19 @@ self.server.socket.close() self.server.socket.close() Agent.quit() + if tools.config['pidfile']: + os.unlink(tools.config['pidfile']) del self.server sys.exit(0) def start(self): + if tools.config['pidfile']: + fd=open(tools.config['pidfile'], 'w') + pidtext="%d" % (os.getpid()) + fd.write(pidtext) + fd.close() signal.signal(signal.SIGINT, self.handler) + signal.signal(signal.SIGTERM, self.handler) self.server.register_introspection_functions() self.server.serve_forever() diff -Nru server.orig/bin/tools/config.py server/bin/tools/config.py --- server.orig/bin/tools/config.py 2006-01-22 20:26:30.000000000 +0100 +++ server/bin/tools/config.py 2006-03-10 11:16:19.000000000 +0100 @@ -50,6 +50,8 @@ 'language': None, 'addons_path' : None, 'root_path' : None, + 'pidfile' : None, + 'logfile' : None, } parser = optparse.OptionParser(version=tinyerp_version_string) @@ -57,6 +59,8 @@ parser.add_option("-c", "--config", dest="config", help="specify alternate config file") parser.add_option("-s", "--save", action="store_true", dest="save", default=False, help="save configuration to ~/.terp_serverrc") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable debugging") + parser.add_option("--pidfile", dest="pidfile", help="file where the server pid will be stored") + parser.add_option("--logfile", dest="logfile", help="file where the server log will be stored") parser.add_option("-n", "--interface", dest="interface", help="specify the TCP IP address") parser.add_option("-p", "--port", dest="port", help="specify the TCP port") @@ -104,6 +108,8 @@ self.options['upgrade'] = opt.upgrade self.options['verbose'] = opt.verbose + self.options['pidfile'] = opt.pidfile + self.options['logfile'] = opt.logfile init = {} if opt.init: Index: tinyerp-server =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tinyerp-server 25 Jan 2006 08:40:27 -0000 1.3 +++ tinyerp-server 18 Mar 2006 14:41:46 -0000 1.4 @@ -14,21 +14,23 @@ # Source function library. . /etc/rc.d/init.d/functions -OPTS="" +PIDFILE=/var/spool/tinyerp/tinyerp-server.pid +LOCKFILE=/var/lock/subsys/tinyerp-server +LOGFILE=/var/log/tinyerp/tinyerp-server.log + +OPTS="--pidfile=$PIDFILE --logfile=$LOGFILE" prog="tinyerp-server" # check if the tinyerp-server conf file is present, then use it if [ -f /etc/tinyerp-server.conf ]; then - OPTS="-c /etc/tinyerp-server.conf" + OPTS="$OPTS -c /etc/tinyerp-server.conf" fi # check the existence of the tinyerp-server script [ -z "/usr/bin/tinyerp-server" ] && exit 0 RETVAL=0 -PIDFILE=/var/spool/tinyerp/tinyerp-server.pid -LOCKFILE=/var/lock/subsys/tinyerp-server start() { echo -n $"Starting $prog: " @@ -45,7 +47,7 @@ kill -TERM `cat $PIDFILE` > /dev/null 2>&1 RETVAL=$? if [ $RETVAL -eq 0 ] ; then - rm -f $PIDFILE $LOCKFILE + rm -f $LOCKFILE echo_success echo Index: tinyerp-server.conf =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyerp-server.conf 20 Nov 2005 18:40:53 -0000 1.1 +++ tinyerp-server.conf 18 Mar 2006 14:41:46 -0000 1.2 @@ -1,21 +1,18 @@ [options] without_demo = False -root_path = None +upgrade = False verbose = False xmlrpc = True -db_user = tinyerp +db_user = False db_password = False -webdb_host = False -webdb_name = False +root_path = None soap = False -db_host = False -webdb_user = False -webdb_password = False -db_name = tinyerp -webdb_port = False +translate_modules = ['all'] +db_name = terp +netrpc = True demo = {} interface = -netrpc = True +db_host = False db_port = False port = 8069 addons_path = None tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tinyerp-server.patch 30 Jan 2006 13:52:51 -0000 1.5 +++ tinyerp-server.patch 18 Mar 2006 14:41:46 -0000 1.6 @@ -21,14 +21,3 @@ 'stock', 'subscription'] required_modules = [('psycopg', 'PostgreSQL module'), -@@ -104,8 +106,9 @@ - # create startup script - start_script = \ - "#!/bin/sh\n\ -+echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\ - cd %s/lib/python%s/site-packages/tinyerp-server\n\ --exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable) -+exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable) - # write script - f = open('tinyerp-server', 'w') - f.write(start_script) Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- tinyerp.spec 30 Jan 2006 13:52:51 -0000 1.13 +++ tinyerp.spec 18 Mar 2006 14:41:46 -0000 1.14 @@ -3,7 +3,7 @@ Name: tinyerp Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client @@ -22,6 +22,7 @@ Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch +Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -49,6 +50,7 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 +%patch2 %build cd client @@ -137,6 +139,10 @@ %changelog +* Sat Mar 18 2006 Dan Horak 3.2.1-2 +- new config file with only default values (#184505) +- added a patch for handling the pid and log file in the server (#184502) + * Mon Jan 30 2006 Dan Horak 3.2.1-1 - update to upstream tinyerp 3.2.1 - fixed filename for the czech translation From fedora-extras-commits at redhat.com Sat Mar 18 14:43:35 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 18 Mar 2006 09:43:35 -0500 Subject: rpms/tinyerp/FC-5 tinyerp-server-pidlog.patch, NONE, 1.1 tinyerp-server, 1.2, 1.3 tinyerp-server.conf, 1.1, 1.2 tinyerp-server.patch, 1.4, 1.5 tinyerp.spec, 1.15, 1.16 Message-ID: <200603181444.k2IEi8OS012639@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12610 Modified Files: tinyerp-server tinyerp-server.conf tinyerp-server.patch tinyerp.spec Added Files: tinyerp-server-pidlog.patch Log Message: - added patch for handling the pid and log file in the server, modified the init.d script - updated config file to include only default values tinyerp-server-pidlog.patch: --- NEW FILE tinyerp-server-pidlog.patch --- diff -Nru server.orig/bin/netsvc.py server/bin/netsvc.py --- server.orig/bin/netsvc.py 2005-10-07 13:45:46.000000000 +0200 +++ server/bin/netsvc.py 2006-03-18 14:47:47.000000000 +0100 @@ -96,13 +96,20 @@ class ServiceUnavailable(Exception): pass +import tools.config +import os + LOG_DEBUG='debug' LOG_INFO='info' LOG_WARNING='warn' LOG_ERROR='error' LOG_CRITICAL='critical' -handler = logging.StreamHandler(sys.stdout) +if tools.config['logfile']: + fd = open(tools.config['logfile'], 'a') + handler = logging.StreamHandler(fd) +else: + handler = logging.StreamHandler(sys.stdout) # create a format for log messages and dates formatter = logging.Formatter('%(asctime)s %(levelname)s:%(name)s:%(message)s', '%a, %d %b %Y %H:%M:%S') @@ -202,11 +209,19 @@ self.server.socket.close() self.server.socket.close() Agent.quit() + if tools.config['pidfile']: + os.unlink(tools.config['pidfile']) del self.server sys.exit(0) def start(self): + if tools.config['pidfile']: + fd=open(tools.config['pidfile'], 'w') + pidtext="%d" % (os.getpid()) + fd.write(pidtext) + fd.close() signal.signal(signal.SIGINT, self.handler) + signal.signal(signal.SIGTERM, self.handler) self.server.register_introspection_functions() self.server.serve_forever() diff -Nru server.orig/bin/tools/config.py server/bin/tools/config.py --- server.orig/bin/tools/config.py 2006-01-22 20:26:30.000000000 +0100 +++ server/bin/tools/config.py 2006-03-10 11:16:19.000000000 +0100 @@ -50,6 +50,8 @@ 'language': None, 'addons_path' : None, 'root_path' : None, + 'pidfile' : None, + 'logfile' : None, } parser = optparse.OptionParser(version=tinyerp_version_string) @@ -57,6 +59,8 @@ parser.add_option("-c", "--config", dest="config", help="specify alternate config file") parser.add_option("-s", "--save", action="store_true", dest="save", default=False, help="save configuration to ~/.terp_serverrc") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable debugging") + parser.add_option("--pidfile", dest="pidfile", help="file where the server pid will be stored") + parser.add_option("--logfile", dest="logfile", help="file where the server log will be stored") parser.add_option("-n", "--interface", dest="interface", help="specify the TCP IP address") parser.add_option("-p", "--port", dest="port", help="specify the TCP port") @@ -104,6 +108,8 @@ self.options['upgrade'] = opt.upgrade self.options['verbose'] = opt.verbose + self.options['pidfile'] = opt.pidfile + self.options['logfile'] = opt.logfile init = {} if opt.init: Index: tinyerp-server =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-server,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp-server 25 Jan 2006 09:22:50 -0000 1.2 +++ tinyerp-server 18 Mar 2006 14:43:35 -0000 1.3 @@ -14,21 +14,23 @@ # Source function library. . /etc/rc.d/init.d/functions -OPTS="" +PIDFILE=/var/spool/tinyerp/tinyerp-server.pid +LOCKFILE=/var/lock/subsys/tinyerp-server +LOGFILE=/var/log/tinyerp/tinyerp-server.log + +OPTS="--pidfile=$PIDFILE --logfile=$LOGFILE" prog="tinyerp-server" # check if the tinyerp-server conf file is present, then use it if [ -f /etc/tinyerp-server.conf ]; then - OPTS="-c /etc/tinyerp-server.conf" + OPTS="$OPTS -c /etc/tinyerp-server.conf" fi # check the existence of the tinyerp-server script [ -z "/usr/bin/tinyerp-server" ] && exit 0 RETVAL=0 -PIDFILE=/var/spool/tinyerp/tinyerp-server.pid -LOCKFILE=/var/lock/subsys/tinyerp-server start() { echo -n $"Starting $prog: " @@ -45,7 +47,7 @@ kill -TERM `cat $PIDFILE` > /dev/null 2>&1 RETVAL=$? if [ $RETVAL -eq 0 ] ; then - rm -f $PIDFILE $LOCKFILE + rm -f $LOCKFILE echo_success echo Index: tinyerp-server.conf =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-server.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyerp-server.conf 20 Nov 2005 18:25:32 -0000 1.1 +++ tinyerp-server.conf 18 Mar 2006 14:43:35 -0000 1.2 @@ -1,21 +1,18 @@ [options] without_demo = False -root_path = None +upgrade = False verbose = False xmlrpc = True -db_user = tinyerp +db_user = False db_password = False -webdb_host = False -webdb_name = False +root_path = None soap = False -db_host = False -webdb_user = False -webdb_password = False -db_name = tinyerp -webdb_port = False +translate_modules = ['all'] +db_name = terp +netrpc = True demo = {} interface = -netrpc = True +db_host = False db_port = False port = 8069 addons_path = None tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-server.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-server.patch 30 Jan 2006 13:56:00 -0000 1.4 +++ tinyerp-server.patch 18 Mar 2006 14:43:35 -0000 1.5 @@ -21,14 +21,3 @@ 'stock', 'subscription'] required_modules = [('psycopg', 'PostgreSQL module'), -@@ -104,8 +106,9 @@ - # create startup script - start_script = \ - "#!/bin/sh\n\ -+echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\ - cd %s/lib/python%s/site-packages/tinyerp-server\n\ --exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable) -+exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable) - # write script - f = open('tinyerp-server', 'w') - f.write(start_script) Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- tinyerp.spec 14 Feb 2006 08:07:43 -0000 1.15 +++ tinyerp.spec 18 Mar 2006 14:43:35 -0000 1.16 @@ -3,7 +3,7 @@ Name: tinyerp Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client @@ -23,6 +23,7 @@ Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch +Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -50,6 +51,7 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 +%patch2 %build cd client @@ -137,6 +139,10 @@ %changelog +* Sat Mar 18 2006 Dan Horak 3.2.1-3 +- new config file with only default values (#184505) +- added a patch for handling the pid and log file in the server (#184502) + * Tue Feb 14 2006 Dan Horak 3.2.1-2 - rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sat Mar 18 16:08:03 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 18 Mar 2006 11:08:03 -0500 Subject: rpms/compat-wxGTK/devel compat-wxGTK.spec,1.2,1.3 Message-ID: <200603181608.k2IG8dqZ016734@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/compat-wxGTK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16714 Modified Files: compat-wxGTK.spec Log Message: Fix up issues mentioned in 175500. Index: compat-wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/compat-wxGTK/devel/compat-wxGTK.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- compat-wxGTK.spec 6 Jan 2006 17:52:38 -0000 1.2 +++ compat-wxGTK.spec 18 Mar 2006 16:08:02 -0000 1.3 @@ -2,7 +2,7 @@ Name: compat-wxGTK Version: 2.4.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Compatibility version of the wxWidgets GTK GUI library License: BSD Group: System Environment/Libraries @@ -19,8 +19,6 @@ Requires: %{name}-common = %{version}-%{release} Obsoletes: wxGTK <= 2.4.2-12 -Provides: wxGTK = %{version}-%{release} - %description wxWidgets/GTK is the GTK+ (1.2) port of the C++ cross-platform wxWidgets GUI library, offering classes for all common GUI controls as well as a @@ -38,7 +36,6 @@ Requires: gtk+-devel Conflicts: %{name}2-devel Obsoletes: wxGTK-devel <= 2.4.2-12 -Provides: wxGTK-devel = %{version}-%{release} %description devel This package includes files needed to link with the wxGTK library. @@ -48,7 +45,6 @@ Summary: Compatibility version of the wxWidgets GTK2 GUI library Requires: %{name}-common = %{version}-%{release} Obsoletes: wxGTK2 <= 2.4.2-12 -Provides: wxGTK2 = %{version}-%{release} %description -n %{name}2 wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets @@ -67,7 +63,6 @@ Requires: gtk2-devel Conflicts: %{name}-devel Obsoletes: wxGTK2-devel <= 2.4.2-12 -Provides: wxGTK2-devel = %{version}-%{release} %description -n %{name}2-devel This package include files needed to link with the wxGTK2 library. @@ -76,7 +71,6 @@ Group: System Environment/Libraries Summary: wxGTK* common files Obsoletes: wxGTK-common <= 2.4.2-12 -Provides: wxGTK-common = %{version}-%{release} %description common Common files for wxWidgets/GTK1 and GTK2. @@ -85,7 +79,6 @@ Group: Development/Libraries Summary: wxGTK* common development files Obsoletes: wxGTK-common-devel <= 2.4.2-12 -Provides: wxGTK-common-devel = %{version}-%{release} %description common-devel Common development files for wxWidgets/GTK1 and GTK2. @@ -95,7 +88,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-gl <= 2.4.2-12 -Provides: wxGTK-gl = %{version}-%{release} %description gl %{summary}. @@ -105,7 +97,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-gl <= 2.4.2-12 -Provides: wxGTK2-gl = %{version}-%{release} %description -n %{name}2-gl %{summary}. @@ -115,7 +106,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-stc <= 2.4.2-12 -Provides: wxGTK-stc = %{version}-%{release} %description stc Styled text control add-on for wxGTK. Based on the Scintillia project. @@ -125,7 +115,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-stc <= 2.4.2-12 -Provides: wxGTK2-stc = %{version}-%{release} %description -n %{name}2-stc Styled text control add-on for wxGTK2. Based on the Scintillia project. @@ -135,7 +124,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-xrc <= 2.4.2-12 -Provides: wxGTK-xrc = %{version}-%{release} %description xrc The XML-based resource system, known as XRC, allows user interface @@ -148,7 +136,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-xrc <= 2.4.2-12 -Provides: wxGTK2-xrc = %{version}-%{release} %description -n %{name}2-xrc The XML-based resource system, known as XRC, allows user interface @@ -288,7 +275,7 @@ %ghost %{_bindir}/wx-2.4-config %{_bindir}/wxgtk2-*-config %{_libdir}/libwx_gtk2[-_]*.so -%{_libdir}/wx/include/gtk-2* +%{_libdir}/wx/include/gtk2-2* %files common -f wxstd.lang %defattr(-,root,root,-) @@ -330,6 +317,10 @@ %changelog +* Sat Mar 18 2006 Tom "spot" Callaway - 2.4.2-17 +- fix include blob in files (bz 175500) +- remove all "Provides" (bz 175500) + * Fri Jan 6 2006 Tom "spot" Callaway - 2.4.2-16 - FC5 modular X deps From fedora-extras-commits at redhat.com Sat Mar 18 17:05:36 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 18 Mar 2006 12:05:36 -0500 Subject: rpms/compat-wxGTK/FC-5 compat-wxGTK.spec,1.2,1.3 Message-ID: <200603181706.k2IH6AOH019498@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/compat-wxGTK/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19466/FC-5 Modified Files: compat-wxGTK.spec Log Message: Do it for FC-4. Index: compat-wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/compat-wxGTK/FC-5/compat-wxGTK.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- compat-wxGTK.spec 6 Jan 2006 17:52:38 -0000 1.2 +++ compat-wxGTK.spec 18 Mar 2006 17:05:36 -0000 1.3 @@ -2,7 +2,7 @@ Name: compat-wxGTK Version: 2.4.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Compatibility version of the wxWidgets GTK GUI library License: BSD Group: System Environment/Libraries @@ -19,8 +19,6 @@ Requires: %{name}-common = %{version}-%{release} Obsoletes: wxGTK <= 2.4.2-12 -Provides: wxGTK = %{version}-%{release} - %description wxWidgets/GTK is the GTK+ (1.2) port of the C++ cross-platform wxWidgets GUI library, offering classes for all common GUI controls as well as a @@ -38,7 +36,6 @@ Requires: gtk+-devel Conflicts: %{name}2-devel Obsoletes: wxGTK-devel <= 2.4.2-12 -Provides: wxGTK-devel = %{version}-%{release} %description devel This package includes files needed to link with the wxGTK library. @@ -48,7 +45,6 @@ Summary: Compatibility version of the wxWidgets GTK2 GUI library Requires: %{name}-common = %{version}-%{release} Obsoletes: wxGTK2 <= 2.4.2-12 -Provides: wxGTK2 = %{version}-%{release} %description -n %{name}2 wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets @@ -67,7 +63,6 @@ Requires: gtk2-devel Conflicts: %{name}-devel Obsoletes: wxGTK2-devel <= 2.4.2-12 -Provides: wxGTK2-devel = %{version}-%{release} %description -n %{name}2-devel This package include files needed to link with the wxGTK2 library. @@ -76,7 +71,6 @@ Group: System Environment/Libraries Summary: wxGTK* common files Obsoletes: wxGTK-common <= 2.4.2-12 -Provides: wxGTK-common = %{version}-%{release} %description common Common files for wxWidgets/GTK1 and GTK2. @@ -85,7 +79,6 @@ Group: Development/Libraries Summary: wxGTK* common development files Obsoletes: wxGTK-common-devel <= 2.4.2-12 -Provides: wxGTK-common-devel = %{version}-%{release} %description common-devel Common development files for wxWidgets/GTK1 and GTK2. @@ -95,7 +88,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-gl <= 2.4.2-12 -Provides: wxGTK-gl = %{version}-%{release} %description gl %{summary}. @@ -105,7 +97,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-gl <= 2.4.2-12 -Provides: wxGTK2-gl = %{version}-%{release} %description -n %{name}2-gl %{summary}. @@ -115,7 +106,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-stc <= 2.4.2-12 -Provides: wxGTK-stc = %{version}-%{release} %description stc Styled text control add-on for wxGTK. Based on the Scintillia project. @@ -125,7 +115,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-stc <= 2.4.2-12 -Provides: wxGTK2-stc = %{version}-%{release} %description -n %{name}2-stc Styled text control add-on for wxGTK2. Based on the Scintillia project. @@ -135,7 +124,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-xrc <= 2.4.2-12 -Provides: wxGTK-xrc = %{version}-%{release} %description xrc The XML-based resource system, known as XRC, allows user interface @@ -148,7 +136,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-xrc <= 2.4.2-12 -Provides: wxGTK2-xrc = %{version}-%{release} %description -n %{name}2-xrc The XML-based resource system, known as XRC, allows user interface @@ -288,7 +275,7 @@ %ghost %{_bindir}/wx-2.4-config %{_bindir}/wxgtk2-*-config %{_libdir}/libwx_gtk2[-_]*.so -%{_libdir}/wx/include/gtk-2* +%{_libdir}/wx/include/gtk2-2* %files common -f wxstd.lang %defattr(-,root,root,-) @@ -330,6 +317,10 @@ %changelog +* Sat Mar 18 2006 Tom "spot" Callaway - 2.4.2-17 +- fix include blob in files (bz 175500) +- remove all "Provides" (bz 175500) + * Fri Jan 6 2006 Tom "spot" Callaway - 2.4.2-16 - FC5 modular X deps From fedora-extras-commits at redhat.com Sat Mar 18 17:05:29 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 18 Mar 2006 12:05:29 -0500 Subject: rpms/compat-wxGTK/FC-4 compat-wxGTK.spec,1.3,1.4 Message-ID: <200603181706.k2IH6Wbt019501@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/compat-wxGTK/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19466/FC-4 Modified Files: compat-wxGTK.spec Log Message: Do it for FC-4. Index: compat-wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/compat-wxGTK/FC-4/compat-wxGTK.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- compat-wxGTK.spec 18 Mar 2006 16:08:02 -0000 1.3 +++ compat-wxGTK.spec 18 Mar 2006 17:05:29 -0000 1.4 @@ -15,7 +15,7 @@ BuildRequires: gtk+-devel gtk2-devel zlib-devel >= 1.1.4 BuildRequires: libpng-devel libjpeg-devel libtiff-devel -BuildRequires: mesa-libGL-devel, mesa-libGLU-devel +BuildRequires: xorg-x11-Mesa-libGL, xorg-x11-Mesa-libGLU, xorg-x11-devel Requires: %{name}-common = %{version}-%{release} Obsoletes: wxGTK <= 2.4.2-12 From fedora-extras-commits at redhat.com Sat Mar 18 17:51:42 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 18 Mar 2006 12:51:42 -0500 Subject: rpms/prboom/devel prboom-2.3.1-fixpsnprintf.patch, NONE, 1.1 prboom-2.3.1-gcc4.patch, 1.1, 1.2 prboom.spec, 1.1, 1.2 Message-ID: <200603181752.k2IHqEmK020957@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20924 Modified Files: prboom-2.3.1-gcc4.patch prboom.spec Added Files: prboom-2.3.1-fixpsnprintf.patch Log Message: Updated patches to fix segfault on i386 (BZ #185741) prboom-2.3.1-fixpsnprintf.patch: --- NEW FILE prboom-2.3.1-fixpsnprintf.patch --- diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c --- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.c 2006-03-18 09:04:48.000000000 -0800 @@ -130,7 +130,7 @@ case 'X': \ case 'p': \ GET_VARS \ - ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, (*pfmt == 'p' || prefix == 'l')? va_arg(ap, unsigned long):va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 'e': \ @@ -139,17 +139,17 @@ case 'g': \ case 'G': \ GET_VARS \ - ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, double)); \ state = STATE_NONE; \ break; \ case 'c': \ GET_VARS \ - ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 's': \ GET_VARS \ - ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, char *)); \ state = STATE_NONE; \ break; \ case 'n': \ @@ -306,11 +306,11 @@ } int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, int arg) { if (*nmax > 1) { - **pinsertion = (char) va_arg(*ap, int); + **pinsertion = (char) arg; *pinsertion += 1; *nmax -= 1; } @@ -338,9 +338,8 @@ */ int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, const char *str) { - const char *str = va_arg(*ap, const char *); int nprinted; int len; int pad = 0; @@ -428,7 +427,7 @@ */ int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, unsigned long arg) { long int number = 0; unsigned long int unumber; @@ -463,17 +462,17 @@ { case 'd': case 'i': - number = (signed short int) va_arg(*ap, int); + number = (signed short int) arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = (unsigned short int) va_arg(*ap, int); + unumber = (unsigned short int) arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } break; @@ -482,17 +481,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed long int); + number = arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned long int); + unumber = arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = numbersigned; } break; @@ -501,17 +500,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed int); + number = (signed int)arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned int); + unumber = (unsigned int)arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } } /* switch fmt to retrieve number */ @@ -784,13 +783,11 @@ */ int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, double value) { char *digits; int sign = 0; int dec; - double value = va_arg(*ap, double); - int len; int pad = 0; int signwidth = 0; diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h --- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.h 2006-03-18 09:05:19.000000000 -0800 @@ -17,16 +17,16 @@ * if there had been enough room). */ int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, int arg); int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, unsigned long arg); int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, const char *str); int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, double value); /* These are the flags you need (use logical OR) for the flags parameter of * fmt functions above. prboom-2.3.1-gcc4.patch: Index: prboom-2.3.1-gcc4.patch =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/prboom-2.3.1-gcc4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom-2.3.1-gcc4.patch 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom-2.3.1-gcc4.patch 18 Mar 2006 17:51:42 -0000 1.2 @@ -89,176 +89,6 @@ extern int iquehead; extern int iquetail; extern int gravity; -diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c ---- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.c 2006-03-06 20:42:04.000000000 -0800 -@@ -130,7 +130,7 @@ - case 'X': \ - case 'p': \ - GET_VARS \ -- ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'e': \ -@@ -139,17 +139,17 @@ - case 'g': \ - case 'G': \ - GET_VARS \ -- ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'c': \ - GET_VARS \ -- ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 's': \ - GET_VARS \ -- ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'n': \ -@@ -306,11 +306,11 @@ - } - - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - if (*nmax > 1) - { -- **pinsertion = (char) va_arg(*ap, int); -+ **pinsertion = (char) va_arg(ap, int); - *pinsertion += 1; - *nmax -= 1; - } -@@ -338,9 +338,9 @@ - */ - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { -- const char *str = va_arg(*ap, const char *); -+ const char *str = va_arg(ap, const char *); - int nprinted; - int len; - int pad = 0; -@@ -428,7 +428,7 @@ - */ - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - long int number = 0; - unsigned long int unumber; -@@ -463,17 +463,17 @@ - { - case 'd': - case 'i': -- number = (signed short int) va_arg(*ap, int); -+ number = (signed short int) va_arg(ap, int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = (unsigned short int) va_arg(*ap, int); -+ unumber = (unsigned short int) va_arg(ap, int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - break; -@@ -482,17 +482,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed long int); -+ number = va_arg(ap, signed long int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned long int); -+ unumber = va_arg(ap, unsigned long int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = numbersigned; - } - break; -@@ -501,17 +501,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed int); -+ number = va_arg(ap, signed int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned int); -+ unumber = va_arg(ap, unsigned int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - } /* switch fmt to retrieve number */ -@@ -784,12 +784,12 @@ - */ - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - char *digits; - int sign = 0; - int dec; -- double value = va_arg(*ap, double); -+ double value = va_arg(ap, double); - - int len; - int pad = 0; -diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h ---- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.h 2006-03-06 20:42:04.000000000 -0800 -@@ -17,16 +17,16 @@ - * if there had been enough room). - */ - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - /* These are the flags you need (use logical OR) for the flags parameter of - * fmt functions above. diff -Naur prboom-2.3.1/src/r_bsp.h prboom-2.3.1.new/src/r_bsp.h --- prboom-2.3.1/src/r_bsp.h 2004-09-15 12:09:31.000000000 -0700 +++ prboom-2.3.1.new/src/r_bsp.h 2006-03-06 20:42:04.000000000 -0800 Index: prboom.spec =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom.spec 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom.spec 18 Mar 2006 17:51:42 -0000 1.2 @@ -2,7 +2,7 @@ Name: prboom Version: 2.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open source port of the DOOM game engine Group: Amusements/Games @@ -13,6 +13,7 @@ Patch1: prboom-2.3.1-gamedir.patch Patch2: prboom-2.3.1-config.patch Patch3: prboom-2.3.1-64bit.patch +Patch4: prboom-2.3.1-fixpsnprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_net-devel @@ -32,6 +33,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure --disable-cpu-opt --program-prefix='' @@ -67,6 +69,9 @@ %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt %changelog +* Fri Mar 17 2006 Wart 2.3.1-5 +- Updated patches to fix segfault on i386 (BZ #185741) + * Tue Mar 14 2006 Wart 2.3.1-4 - Added patch to fix up some x86_64 issues From fedora-extras-commits at redhat.com Sat Mar 18 18:35:40 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sat, 18 Mar 2006 13:35:40 -0500 Subject: rpms/qemu/FC-5 qemu-0.7.0-build.patch,1.2,1.3 qemu.spec,1.9,1.10 Message-ID: <200603181836.k2IIaDCr023305@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23283 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: filter out more compiler options qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu-0.7.0-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qemu-0.7.0-build.patch 17 Mar 2006 14:57:13 -0000 1.2 +++ qemu-0.7.0-build.patch 18 Mar 2006 18:35:40 -0000 1.3 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall ++OP_CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- qemu.spec 17 Mar 2006 14:57:13 -0000 1.9 +++ qemu.spec 18 Mar 2006 18:35:40 -0000 1.10 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL/LGPL Group: Development/Tools @@ -78,6 +78,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Sat Mar 18 2006 David Woodhouse 0.8.0-4 +- Disable stack-protector options which gcc 3.2 doesn't like + * Fri Mar 17 2006 David Woodhouse 0.8.0-3 - Use -mcpu= instead of -mtune= on x86_64 too - Disable SPARC targets on x86_64, because dyngen doesn't like fnegs From fedora-extras-commits at redhat.com Sat Mar 18 20:51:36 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 15:51:36 -0500 Subject: rpms/gossip/devel .cvsignore, 1.5, 1.6 gossip.spec, 1.15, 1.16 sources, 1.5, 1.6 Message-ID: <200603182052.k2IKq9Ce027962@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27941 Modified Files: .cvsignore gossip.spec sources Log Message: * Sat Mar 18 2006 Brian Pepple - 0.10.2-3 - Update to 0.10.2. - Add BR for iso-codes-devel & gnome-doc-utils. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Feb 2006 20:40:38 -0000 1.5 +++ .cvsignore 18 Mar 2006 20:51:36 -0000 1.6 @@ -1 +1 @@ -gossip-0.10.1.tar.bz2 +gossip-0.10.2.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gossip.spec 25 Feb 2006 20:53:19 -0000 1.15 +++ gossip.spec 18 Mar 2006 20:51:36 -0000 1.16 @@ -1,8 +1,8 @@ %define with_dbus 1 Name: gossip -Version: 0.10.1 -Release: 2%{?dist} +Version: 0.10.2 +Release: 3%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications @@ -21,6 +21,9 @@ BuildRequires: aspell-devel BuildRequires: gettext BuildRequires: scrollkeeper +BuildRequires: iso-codes-devel +BuildRequires: gnome-doc-utils + %if %{with_dbus} BuildRequires: dbus-devel >= 0.31 @@ -42,7 +45,7 @@ %build -%configure \ +%configure --disable-scrollkeeper \ %if %{with_dbus} --enable-dbus=yes %else @@ -118,6 +121,10 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 0.10.2-3 +- Update to 0.10.2. +- Add BR for iso-codes-devel & gnome-doc-utils. + * Sat Feb 25 2006 Brian Pepple - 0.10.1-2 - Bump to make upgrade path. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Feb 2006 20:40:38 -0000 1.5 +++ sources 18 Mar 2006 20:51:36 -0000 1.6 @@ -1 +1 @@ -2cf3be244b3983da193ef0ef35302782 gossip-0.10.1.tar.bz2 +f53dbf1fa951c620dbf4b95560e51c8c gossip-0.10.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 18 20:54:32 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 15:54:32 -0500 Subject: rpms/gossip/FC-5 .cvsignore, 1.5, 1.6 gossip.spec, 1.15, 1.16 sources, 1.5, 1.6 Message-ID: <200603182055.k2IKt4Jk028038@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28017 Modified Files: .cvsignore gossip.spec sources Log Message: * Sat Mar 18 2006 Brian Pepple - 0.10.2-2 - Update to 0.10.2. - Add BR for iso-codes-devel & gnome-doc-utils. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Feb 2006 20:40:38 -0000 1.5 +++ .cvsignore 18 Mar 2006 20:54:32 -0000 1.6 @@ -1 +1 @@ -gossip-0.10.1.tar.bz2 +gossip-0.10.2.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/gossip.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gossip.spec 25 Feb 2006 20:53:19 -0000 1.15 +++ gossip.spec 18 Mar 2006 20:54:32 -0000 1.16 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: gossip -Version: 0.10.1 +Version: 0.10.2 Release: 2%{?dist} Summary: Gnome Jabber Client @@ -21,6 +21,9 @@ BuildRequires: aspell-devel BuildRequires: gettext BuildRequires: scrollkeeper +BuildRequires: iso-codes-devel +BuildRequires: gnome-doc-utils + %if %{with_dbus} BuildRequires: dbus-devel >= 0.31 @@ -42,7 +45,7 @@ %build -%configure \ +%configure --disable-scrollkeeper \ %if %{with_dbus} --enable-dbus=yes %else @@ -118,6 +121,10 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 0.10.2-2 +- Update to 0.10.2. +- Add BR for iso-codes-devel & gnome-doc-utils. + * Sat Feb 25 2006 Brian Pepple - 0.10.1-2 - Bump to make upgrade path. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Feb 2006 20:40:38 -0000 1.5 +++ sources 18 Mar 2006 20:54:32 -0000 1.6 @@ -1 +1 @@ -2cf3be244b3983da193ef0ef35302782 gossip-0.10.1.tar.bz2 +f53dbf1fa951c620dbf4b95560e51c8c gossip-0.10.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 18 22:45:14 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sat, 18 Mar 2006 17:45:14 -0500 Subject: rpms/qemu/FC-5 qemu-0.7.0-build.patch,1.3,1.4 qemu.spec,1.10,1.11 Message-ID: <200603182245.k2IMjklu032326@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32304 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: drop qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu-0.7.0-build.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qemu-0.7.0-build.patch 18 Mar 2006 18:35:40 -0000 1.3 +++ qemu-0.7.0-build.patch 18 Mar 2006 22:45:13 -0000 1.4 @@ -1,33 +1,5 @@ --- qemu-0.7.0/Makefile.orig 2005-04-27 21:52:05.000000000 +0100 +++ qemu-0.7.0/Makefile 2005-04-30 11:01:41.000000000 +0100 -@@ -1,6 +1,6 @@ - -include config-host.mak - --CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing - ifdef CONFIG_DARWIN - CFLAGS+= -mdynamic-no-pic - endif ---- qemu-0.7.0/Makefile.target.orig 2005-04-27 21:52:05.000000000 +0100 -+++ qemu-0.7.0/Makefile.target 2005-04-30 11:03:59.000000000 +0100 -@@ -14,7 +14,7 @@ - VPATH+=:$(SRC_PATH)/linux-user - DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) - endif --CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing - #CFLAGS+=-Werror - LDFLAGS=-g - LIBS= -@@ -177,7 +177,7 @@ - ifeq ($(ARCH),alpha) - # -msmall-data is not used because we want two-instruction relocations - # for the constant constructions --OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing - # Ensure there's only a single GP - CFLAGS += -msmall-data - LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld @@ -463,7 +463,7 @@ install: all Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qemu.spec 18 Mar 2006 18:35:40 -0000 1.10 +++ qemu.spec 18 Mar 2006 22:45:13 -0000 1.11 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL/LGPL Group: Development/Tools @@ -10,7 +10,7 @@ Source1: qemu.init Patch0: qemu-0.7.0-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: SDL-devel compat-gcc-32 +BuildRequires: SDL-devel compat-gcc-32 zlib-devel PreReq: /sbin/chkconfig PreReq: /sbin/service ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64 @@ -78,6 +78,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Sat Mar 18 2006 David Woodhouse 0.8.0-5 +- Just drop $RPM_OPT_FLAGS. They're too much of a PITA + * Sat Mar 18 2006 David Woodhouse 0.8.0-4 - Disable stack-protector options which gcc 3.2 doesn't like From fedora-extras-commits at redhat.com Sat Mar 18 22:53:52 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sat, 18 Mar 2006 17:53:52 -0500 Subject: rpms/qemu/FC-5 qemu-0.7.0-build.patch,1.4,1.5 Message-ID: <200603182254.k2IMsP86032382@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32362 Modified Files: qemu-0.7.0-build.patch Log Message: Doh. Patch correct file qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu-0.7.0-build.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qemu-0.7.0-build.patch 18 Mar 2006 22:45:13 -0000 1.4 +++ qemu-0.7.0-build.patch 18 Mar 2006 22:53:52 -0000 1.5 @@ -1,5 +1,5 @@ ---- qemu-0.7.0/Makefile.orig 2005-04-27 21:52:05.000000000 +0100 -+++ qemu-0.7.0/Makefile 2005-04-30 11:01:41.000000000 +0100 +--- qemu-0.7.0/Makefile.target.orig 2005-04-27 21:52:05.000000000 +0100 ++++ qemu-0.7.0/Makefile.target 2005-04-30 11:01:41.000000000 +0100 @@ -463,7 +463,7 @@ install: all From fedora-extras-commits at redhat.com Sat Mar 18 23:07:35 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 18 Mar 2006 18:07:35 -0500 Subject: owners owners.list,1.751,1.752 Message-ID: <200603182308.k2IN888Y002136@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2119 Modified Files: owners.list Log Message: add acpi and python-chm Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.751 retrieving revision 1.752 diff -u -r1.751 -r1.752 --- owners.list 18 Mar 2006 10:21:28 -0000 1.751 +++ owners.list 18 Mar 2006 23:07:35 -0000 1.752 @@ -17,6 +17,7 @@ Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| +Fedora Extras|acpi|Command-line ACPI client|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|acpitool|A command line ACPI client for Linux|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|adime|Allegro Dialogs Made Easy|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|byte at fedoraproject.org|extras-qa at fedoraproject.org| @@ -1158,6 +1159,7 @@ Fedora Extras|python-cheetah|Template engine and code-generator|mikeb at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-cherrypy|A pythonic, object-oriented web development framework|gijs at gewis.nl|extras-qa at fedoraproject.org| Fedora Extras|python-cherrytemplate|An easy and powerful templating module for Python|gijs at gewis.nl|extras-qa at fedoraproject.org| +Fedora Extras|python-chm|Python package for CHM files handling|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|python-clientform|Python module for client-side HTML forms|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|python-cpio|A Python module for accessing cpio archives|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-crypto|A cryptography library for Python|fedora at leemhuis.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 19 01:16:33 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 18 Mar 2006 20:16:33 -0500 Subject: rpms/python-GeoIP/FC-5 python-GeoIP.spec,1.1,1.2 Message-ID: <200603190117.k2J1H6XK006288@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/python-GeoIP/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6266 Modified Files: python-GeoIP.spec Log Message: * Sun Mar 19 2006 Michael Fleming 1.2.1-4 - Bump for FC5 Index: python-GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/python-GeoIP/FC-5/python-GeoIP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-GeoIP.spec 21 Feb 2006 22:33:22 -0000 1.1 +++ python-GeoIP.spec 19 Mar 2006 01:16:32 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-GeoIP Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python bindings for the GeoIP geographical lookup libraries Group: Development/Languages @@ -43,6 +43,9 @@ %changelog +* Sun Mar 19 2006 Michael Fleming 1.2.1-4 +- Bump for FC5 + * Mon Feb 21 2006 Michael Fleming 1.2.1-3 - Trivial spec tweaks - Removed redundant GeoIP Requires: (rpm picks it up automatically) From fedora-extras-commits at redhat.com Sun Mar 19 01:29:53 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 18 Mar 2006 20:29:53 -0500 Subject: rpms/mod_geoip/FC-5 mod_geoip.spec,1.1,1.2 Message-ID: <200603190130.k2J1UQ9Q006467@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_geoip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6448 Modified Files: mod_geoip.spec Log Message: * Sun Mar 19 2006 Michael Fleming 1.1.7-3 - Bump for FC5 Index: mod_geoip.spec =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-5/mod_geoip.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_geoip.spec 20 Feb 2006 22:45:12 -0000 1.1 +++ mod_geoip.spec 19 Mar 2006 01:29:53 -0000 1.2 @@ -1,7 +1,7 @@ Summary: GeoIP module for the Apache HTTP Server Name: mod_geoip Version: 1.1.7 -Release: 2%{?dist} +Release: 3%{?dist} License: Apache Software License Group: System Environment/Daemons URL: http://www.maxmind.com/app/mod_geoip @@ -46,6 +46,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf %changelog +* Sun Mar 19 2006 Michael Fleming 1.1.7-3 +- Bump for FC5 + * Sat Feb 18 2006 Michael Fleming 1.1.7-2 - Small cleanups, including a saner Requires: for httpd - Don't strip the binary From fedora-extras-commits at redhat.com Sun Mar 19 01:49:51 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 18 Mar 2006 20:49:51 -0500 Subject: comps comps-fe5.xml.in,1.29,1.30 Message-ID: <200603190150.k2J1oNmP006555@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6538 Modified Files: comps-fe5.xml.in Log Message: Added mlmmj, mod_cband, mod_security & mod_geoip Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- comps-fe5.xml.in 18 Mar 2006 03:58:49 -0000 1.29 +++ comps-fe5.xml.in 19 Mar 2006 01:49:51 -0000 1.30 @@ -355,6 +355,7 @@ clamav-milter exim exim-doc + mlmmj pyzor @@ -546,6 +547,9 @@ lighttpd lighttpd-fastcgi mediawiki + mod_cband + mod_geoip + mod_security moin plone thttpd From fedora-extras-commits at redhat.com Sun Mar 19 02:52:11 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 21:52:11 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/FC-4 .cvsignore, 1.4, 1.5 perl-Locale-Maketext-Lexicon.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603190252.k2J2qhQr008718@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8663/FC-4 Modified Files: .cvsignore perl-Locale-Maketext-Lexicon.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Dec 2005 14:03:58 -0000 1.4 +++ .cvsignore 19 Mar 2006 02:52:11 -0000 1.5 @@ -1 +1 @@ -Locale-Maketext-Lexicon-0.53.tar.gz +Locale-Maketext-Lexicon-0.54.tar.gz Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Locale-Maketext-Lexicon.spec 5 Dec 2005 14:03:58 -0000 1.4 +++ perl-Locale-Maketext-Lexicon.spec 19 Mar 2006 02:52:11 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Locale-Maketext-Lexicon -Version: 0.53 +Version: 0.54 Release: 1%{?dist} Summary: Extract translatable strings from source License: GPL or Artistic @@ -55,16 +55,8 @@ %{_mandir}/man3/* %changelog -* Mon Dec 05 2005 Ralf Corsepius - 0.53-1 +* Sun Mar 19 2006 Ralf Cors??pius - 0.54-1 - Upstream update. -* Sun Nov 13 2005 Ralf Corsepius - 0.50-1 -- Upsteam update. -- Add docs to %%doc -- Inline provides-filter script into spec. - -* Sat Sep 17 2005 Ralf Corsepius - 0.49-2 -- Spec file cleanup. - -* Tue Sep 13 2005 Ralf Corsepius - 0.49-1 -- FE submission. +* Mon Dec 05 2005 Ralf Corsepius - 0.53-1 +- Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Dec 2005 14:03:58 -0000 1.4 +++ sources 19 Mar 2006 02:52:11 -0000 1.5 @@ -1 +1 @@ -c1bce07646a0d9bcd8a56a60235b63ec Locale-Maketext-Lexicon-0.53.tar.gz +2adcb8651081bcb07629305f8b5e8f71 Locale-Maketext-Lexicon-0.54.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 02:52:17 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 21:52:17 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/FC-5 .cvsignore, 1.4, 1.5 perl-Locale-Maketext-Lexicon.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603190252.k2J2qoGT008723@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8663/FC-5 Modified Files: .cvsignore perl-Locale-Maketext-Lexicon.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Dec 2005 13:40:16 -0000 1.4 +++ .cvsignore 19 Mar 2006 02:52:17 -0000 1.5 @@ -1 +1 @@ -Locale-Maketext-Lexicon-0.53.tar.gz +Locale-Maketext-Lexicon-0.54.tar.gz Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Locale-Maketext-Lexicon.spec 28 Feb 2006 23:25:33 -0000 1.6 +++ perl-Locale-Maketext-Lexicon.spec 19 Mar 2006 02:52:17 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Locale-Maketext-Lexicon -Version: 0.53 -Release: 2%{?dist} +Version: 0.54 +Release: 1%{?dist} Summary: Extract translatable strings from source License: GPL or Artistic Group: Development/Libraries @@ -55,19 +55,11 @@ %{_mandir}/man3/* %changelog +* Sun Mar 19 2006 Ralf Cors??pius - 0.54-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 0.53-2 - Rebuild for perl-5.8.8. * Mon Dec 05 2005 Ralf Corsepius - 0.53-1 - Upstream update. - -* Sun Nov 13 2005 Ralf Corsepius - 0.50-1 -- Upsteam update. -- Add docs to %%doc -- Inline provides-filter script into spec. - -* Sat Sep 17 2005 Ralf Corsepius - 0.49-2 -- Spec file cleanup. - -* Tue Sep 13 2005 Ralf Corsepius - 0.49-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Dec 2005 13:40:16 -0000 1.4 +++ sources 19 Mar 2006 02:52:17 -0000 1.5 @@ -1 +1 @@ -c1bce07646a0d9bcd8a56a60235b63ec Locale-Maketext-Lexicon-0.53.tar.gz +2adcb8651081bcb07629305f8b5e8f71 Locale-Maketext-Lexicon-0.54.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 02:52:18 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 21:52:18 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/devel .cvsignore, 1.4, 1.5 perl-Locale-Maketext-Lexicon.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603190252.k2J2qo7n008728@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8663/devel Modified Files: .cvsignore perl-Locale-Maketext-Lexicon.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Dec 2005 13:40:16 -0000 1.4 +++ .cvsignore 19 Mar 2006 02:52:18 -0000 1.5 @@ -1 +1 @@ -Locale-Maketext-Lexicon-0.53.tar.gz +Locale-Maketext-Lexicon-0.54.tar.gz Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Locale-Maketext-Lexicon.spec 28 Feb 2006 23:25:33 -0000 1.6 +++ perl-Locale-Maketext-Lexicon.spec 19 Mar 2006 02:52:18 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Locale-Maketext-Lexicon -Version: 0.53 -Release: 2%{?dist} +Version: 0.54 +Release: 1%{?dist} Summary: Extract translatable strings from source License: GPL or Artistic Group: Development/Libraries @@ -55,19 +55,11 @@ %{_mandir}/man3/* %changelog +* Sun Mar 19 2006 Ralf Cors??pius - 0.54-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 0.53-2 - Rebuild for perl-5.8.8. * Mon Dec 05 2005 Ralf Corsepius - 0.53-1 - Upstream update. - -* Sun Nov 13 2005 Ralf Corsepius - 0.50-1 -- Upsteam update. -- Add docs to %%doc -- Inline provides-filter script into spec. - -* Sat Sep 17 2005 Ralf Corsepius - 0.49-2 -- Spec file cleanup. - -* Tue Sep 13 2005 Ralf Corsepius - 0.49-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Dec 2005 13:40:16 -0000 1.4 +++ sources 19 Mar 2006 02:52:18 -0000 1.5 @@ -1 +1 @@ -c1bce07646a0d9bcd8a56a60235b63ec Locale-Maketext-Lexicon-0.53.tar.gz +2adcb8651081bcb07629305f8b5e8f71 Locale-Maketext-Lexicon-0.54.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 03:31:31 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 22:31:31 -0500 Subject: rpms/liferea/devel .cvsignore, 1.23, 1.24 liferea.spec, 1.35, 1.36 sources, 1.24, 1.25 liferea-mozilla-lib64.patch, 1.1, NONE Message-ID: <200603190332.k2J3W3Au010923@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10902 Modified Files: .cvsignore liferea.spec sources Removed Files: liferea-mozilla-lib64.patch Log Message: * Sat Mar 18 2006 Brian Pepple - 1.0.8-3 - Update to 1.0.8. - Drop mozilla-lib64 patch, fixed upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 6 Mar 2006 15:09:38 -0000 1.23 +++ .cvsignore 19 Mar 2006 03:31:30 -0000 1.24 @@ -1 +1 @@ -liferea-1.0.7.tar.gz +liferea-1.0.8.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- liferea.spec 14 Mar 2006 22:14:14 -0000 1.35 +++ liferea.spec 19 Mar 2006 03:31:30 -0000 1.36 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.7 +Version: 1.0.8 Release: 3%{?dist} Summary: An RSS/RDF feed reader @@ -9,7 +9,6 @@ License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-mozilla-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel @@ -39,7 +38,6 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .mozilla %build @@ -107,6 +105,10 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 1.0.8-3 +- Update to 1.0.8. +- Drop mozilla-lib64 patch, fixed upstream. + * Tue Mar 14 2006 Brian Pepple - 1.0.7-3 - Add patch to find mozilla on x86_64 (#185243). Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 6 Mar 2006 15:09:38 -0000 1.24 +++ sources 19 Mar 2006 03:31:30 -0000 1.25 @@ -1 +1 @@ -d75b2621d2e926695e833eaa2aed68c2 liferea-1.0.7.tar.gz +395a27a7d3e104e66767dc02161a9bdd liferea-1.0.8.tar.gz --- liferea-mozilla-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 03:33:39 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 22:33:39 -0500 Subject: rpms/liferea/FC-5 .cvsignore, 1.23, 1.24 liferea.spec, 1.35, 1.36 sources, 1.24, 1.25 liferea-mozilla-lib64.patch, 1.1, NONE Message-ID: <200603190334.k2J3YBZO011004@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10983 Modified Files: .cvsignore liferea.spec sources Removed Files: liferea-mozilla-lib64.patch Log Message: * Sat Mar 18 2006 Brian Pepple - 1.0.8-2 - Update to 1.0.8. - Drop mozilla-lib64 patch, fixed upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 6 Mar 2006 15:09:38 -0000 1.23 +++ .cvsignore 19 Mar 2006 03:33:39 -0000 1.24 @@ -1 +1 @@ -liferea-1.0.7.tar.gz +liferea-1.0.8.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/liferea.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- liferea.spec 14 Mar 2006 22:14:14 -0000 1.35 +++ liferea.spec 19 Mar 2006 03:33:39 -0000 1.36 @@ -1,15 +1,14 @@ %define with_dbus 1 Name: liferea -Version: 1.0.7 -Release: 3%{?dist} +Version: 1.0.8 +Release: 2%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-mozilla-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel @@ -39,7 +38,6 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .mozilla %build @@ -107,6 +105,10 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 1.0.8-2 +- Update to 1.0.8. +- Drop mozilla-lib64 patch, fixed upstream. + * Tue Mar 14 2006 Brian Pepple - 1.0.7-3 - Add patch to find mozilla on x86_64 (#185243). Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 6 Mar 2006 15:09:38 -0000 1.24 +++ sources 19 Mar 2006 03:33:39 -0000 1.25 @@ -1 +1 @@ -d75b2621d2e926695e833eaa2aed68c2 liferea-1.0.7.tar.gz +395a27a7d3e104e66767dc02161a9bdd liferea-1.0.8.tar.gz --- liferea-mozilla-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 03:35:49 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 22:35:49 -0500 Subject: rpms/liferea/FC-4 .cvsignore, 1.21, 1.22 liferea.spec, 1.26, 1.27 sources, 1.22, 1.23 liferea-mozilla-lib64.patch, 1.1, NONE Message-ID: <200603190336.k2J3aLxf011092@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11066 Modified Files: .cvsignore liferea.spec sources Removed Files: liferea-mozilla-lib64.patch Log Message: * Sat Mar 18 2006 Brian Pepple - 1.0.8-1 - Update to 1.0.8. - Drop mozilla-lib64 patch, fixed upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 18 Mar 2006 13:58:05 -0000 1.21 +++ .cvsignore 19 Mar 2006 03:35:49 -0000 1.22 @@ -1 +1 @@ -liferea-1.0.7.tar.gz +liferea-1.0.8.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- liferea.spec 18 Mar 2006 13:58:05 -0000 1.26 +++ liferea.spec 19 Mar 2006 03:35:49 -0000 1.27 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.7 +Version: 1.0.8 Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -9,7 +9,6 @@ License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-mozilla-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel mozilla-devel @@ -102,6 +101,10 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 1.0.8-1 +- Update to 1.0.8. +- Drop mozilla-lib64 patch, fixed upstream. + * Sat Mar 18 2006 Brian Pepple - 1.0.7-1 - Update to 1.0.7. - Add patch to find mozilla on x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 18 Mar 2006 13:58:05 -0000 1.22 +++ sources 19 Mar 2006 03:35:49 -0000 1.23 @@ -1 +1 @@ -d75b2621d2e926695e833eaa2aed68c2 liferea-1.0.7.tar.gz +395a27a7d3e104e66767dc02161a9bdd liferea-1.0.8.tar.gz --- liferea-mozilla-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 03:39:55 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 18 Mar 2006 22:39:55 -0500 Subject: rpms/rkhunter/FC-5 .cvsignore, 1.5, 1.6 rkhunter.spec, 1.8, 1.9 sources, 1.5, 1.6 rkhunter-1.2.8-2.src.sha, 1.1, NONE Message-ID: <200603190340.k2J3eReG011165@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11141 Modified Files: .cvsignore rkhunter.spec sources Removed Files: rkhunter-1.2.8-2.src.sha Log Message: * Sat Mar 18 2006 Greg Houlette - 1.2.8-3 - Made an RPM transparent change to move the sha1 canary check file out of CVS and into the external lookaside cache (whose filename changes with every new package release anyway...) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Mar 2006 21:08:16 -0000 1.5 +++ .cvsignore 19 Mar 2006 03:39:54 -0000 1.6 @@ -1,3 +1,4 @@ rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +rkhunter-1.2.8-3.src.sha clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-5/rkhunter.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rkhunter.spec 18 Mar 2006 03:30:06 -0000 1.8 +++ rkhunter.spec 19 Mar 2006 03:39:54 -0000 1.9 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 2 +%define rpmRel 3 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -190,6 +190,11 @@ %changelog +* Sat Mar 18 2006 Greg Houlette - 1.2.8-3 +- Made an RPM transparent change to move the sha1 canary check + file out of CVS and into the external lookaside cache (whose + filename changes with every new package release anyway...) + * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Mar 2006 21:08:16 -0000 1.5 +++ sources 19 Mar 2006 03:39:54 -0000 1.6 @@ -1,2 +1,3 @@ 41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz +31a24aa09e6afa4cc0ec783dfe429a58 rkhunter-1.2.8-3.src.sha --- rkhunter-1.2.8-2.src.sha DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 03:48:37 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Sat, 18 Mar 2006 22:48:37 -0500 Subject: rpms/gourmet/devel gourmet-0.10.1-hu.po.patch, NONE, 1.1 gourmet-0.10.1-pt_BR.po.patch, NONE, 1.1 nutritionDruid.glade, NONE, 1.1 .cvsignore, 1.5, 1.6 gourmet.spec, 1.5, 1.6 Message-ID: <200603190349.k2J3nALU011246@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11219 Modified Files: .cvsignore gourmet.spec Added Files: gourmet-0.10.1-hu.po.patch gourmet-0.10.1-pt_BR.po.patch nutritionDruid.glade Log Message: using spaces in spec file instead of tabs. added a file missing from upstream tarball. patched two broken .po files gourmet-0.10.1-hu.po.patch: --- NEW FILE gourmet-0.10.1-hu.po.patch --- --- gourmet-0.10.1/i18n/hu.po 2006-03-12 12:09:22.000000000 -0800 +++ hu.po 2006-03-18 19:21:00.000000000 -0800 @@ -558,9 +558,6 @@ "\n" "\n" msgstr "" -"???\n" -"???\n" -"\n" #: ../glade/recCard.glade.h:4 msgid "Category:" @@ -2818,4 +2815,4 @@ #, fuzzy #~ msgid "Recipe saved as Mealmaster file %(file)s" -#~ msgstr "Recept elmentve Melmaster %(file)s f??jlba." \ No newline at end of file +#~ msgstr "Recept elmentve Melmaster %(file)s f??jlba." gourmet-0.10.1-pt_BR.po.patch: --- NEW FILE gourmet-0.10.1-pt_BR.po.patch --- --- gourmet-0.10.1/i18n/pt_BR.po 2006-03-12 12:09:22.000000000 -0800 +++ pt_BR.po 2006-03-18 19:19:54.000000000 -0800 @@ -562,9 +562,6 @@ "\n" "\n" msgstr "" -"???\n" -"???\n" -"\n" #: ../glade/recCard.glade.h:4 msgid "Category:" @@ -2807,4 +2804,4 @@ #~ "MasterCook e alguns websites populares. Gourmet pode exportar receitas como " #~ "texto, arquivos MealMaster, p??ginas HTML, e um formato XML customizado para " #~ "interc??mbio com outros usu??rios Gourmet. Gourmet suporta linkar imagens com " -#~ "as receitas." \ No newline at end of file +#~ "as receitas." --- NEW FILE nutritionDruid.glade --- GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False 600 650 True False True False False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True False True False 0 True 0.5 0.5 1 1 0 0 12 6 True True True GTK_POS_TOP False False True False 0 True False 0 True <i>Select equivalent of</i> False True GTK_JUSTIFY_LEFT False False 0 0.5 0 6 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True True False True GTK_JUSTIFY_LEFT True True 0 0.5 6 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True True True 0 True * False 6 True True True <i>from USDA database</i> False True GTK_JUSTIFY_LEFT True False 0 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True _Change ingredient True GTK_RELIEF_NORMAL True 0 False False GTK_PACK_END True gtk-apply True GTK_RELIEF_NORMAL True 0 False True GTK_PACK_END 0 False True True <i>or</i> False True GTK_JUSTIFY_LEFT False False 0 0.5 10 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True 0.5 0.5 1 1 0 0 6 0 True False 0 True 0.5 0.5 1 1 0 0 0 0 True Enter C_ustom Information True GTK_RELIEF_NORMAL True 0 False False 6 False False True 0.5 0.5 1 1 6 0 12 0 True False 0 True 0 False True True False 0 True _Search USDA Ingredient Database: True False GTK_JUSTIFY_LEFT False False 0 0.5 0 0 searchEntry PANGO_ELLIPSIZE_NONE -1 False 0 0 False False gtk-find True GTK_RELIEF_NORMAL True 6 False False GTK_PACK_END True True True True True 0 True * False 12 True True True Search as you t_ype True GTK_RELIEF_NORMAL True False False True 6 False False GTK_PACK_END 0 False True True False 0 True Show only food in _group: True False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 foodGroupComboBox PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True False True 12 True True 6 False True True 0 False True True False 0 True <i>Search _results:</i> True True GTK_JUSTIFY_LEFT False False 0 0.5 0 0 treeview PANGO_ELLIPSIZE_NONE -1 False 0 0 True True True False 0 True gtk-goto-last True GTK_RELIEF_NORMAL True 6 True True GTK_PACK_END True gtk-go-forward True GTK_RELIEF_NORMAL True 6 True True GTK_PACK_END True gtk-go-back True GTK_RELIEF_NORMAL True 6 True True GTK_PACK_END True gtk-goto-first True GTK_RELIEF_NORMAL True 6 True True GTK_PACK_END True False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 True True GTK_PACK_END 0 False True 0 False True True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_SHADOW_NONE GTK_CORNER_TOP_LEFT True True False False True False False False 0 True True 0 True True False True True False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 tab True False 0 True False True GTK_JUSTIFY_LEFT True False 0 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False True True <i>From: </i> False True GTK_JUSTIFY_LEFT False False 0 0.5 0 12 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True 0 0.5 1 1 0 0 18 0 True 2 2 False 12 12 True _Amount: True False GTK_JUSTIFY_LEFT False False 0 0.5 0 0 fromAmountEntry PANGO_ELLIPSIZE_NONE -1 False 0 0 1 0 1 fill True Unit: True False GTK_JUSTIFY_LEFT False False 0 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 1 1 2 fill True True number_entry 0 0 Wed, 19 Oct 2005 23:46:08 GMT 1 2 0 1 fill True False 0 True False True True 0 False False True unit False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True _Change unit True GTK_RELIEF_NORMAL True 12 False False True _Save new unit True GTK_RELIEF_NORMAL True 0 False False True gtk-cancel True GTK_RELIEF_NORMAL True 12 False False 1 2 1 2 0 False False True <i>To: </i> False True GTK_JUSTIFY_LEFT False False 0 0.5 0 12 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True 0.5 0.5 1 1 0 0 18 0 True 2 2 False 12 6 True _Amount: True False GTK_JUSTIFY_LEFT False False 0 0.5 0 0 toAmountEntry PANGO_ELLIPSIZE_NONE -1 False 0 0 1 0 1 fill True _Unit: True False GTK_JUSTIFY_LEFT False False 0 0.5 0 0 toUnitCombo PANGO_ELLIPSIZE_NONE -1 False 0 0 1 1 2 fill True True number_entry 0 0 Wed, 19 Oct 2005 23:46:08 GMT 1 2 0 1 fill True False True 1 2 1 2 fill 0 False False False True True False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 tab True False 0 True False 0 True <i>Enter nutritional information for </i> False True GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True True number_entry 0 0 Wed, 19 Oct 2005 23:46:08 GMT 0 True True True False True 0 True True True True False True GTK_JUSTIFY_LEFT True True 0 0.5 6 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True False True GTK_JUSTIFY_LEFT True False 0 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False 0 False False True <i>or</i> False True GTK_JUSTIFY_LEFT False False 0 0.5 10 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True False 0 True 0.5 0.5 1 1 0 0 0 0 True _Use Information from USDA Database True GTK_RELIEF_NORMAL True 0 False False 0 False True True 4 False False True True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_SHADOW_NONE GTK_CORNER_TOP_LEFT True GTK_SHADOW_IN True False 0 0 True True False True True False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 tab True False 0 True <b>Choose a Density</b> False True GTK_JUSTIFY_LEFT False False 0 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True False False GTK_JUSTIFY_LEFT True False 0 0.5 12 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True 0.5 0.5 1 1 12 0 12 0 True False 0 0 True True False True True False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 tab 6 True True True GTK_BUTTONBOX_END 12 True gtk-go-back True GTK_RELIEF_NORMAL True True I_gnore True GTK_RELIEF_NORMAL True True True gtk-apply True GTK_RELIEF_NORMAL True 12 False True Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 18 Mar 2006 08:56:03 -0000 1.5 +++ .cvsignore 19 Mar 2006 03:48:37 -0000 1.6 @@ -1,3 +1 @@ -gourmet-0.8.5.12.tar.gz -gourmet-0.8.5.13.tar.gz gourmet-0.10.1.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/gourmet.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gourmet.spec 18 Mar 2006 10:07:28 -0000 1.5 +++ gourmet.spec 19 Mar 2006 03:48:37 -0000 1.6 @@ -1,29 +1,35 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -Name: gourmet -Version: 0.10.1 -Release: 1%{?dist} -Summary: PyGTK Recipe Manager - -Group: Applications/Productivity -License: GPL -URL: http://grecipe-manager.sourceforge.net -Source0: http://easynews.dl.sourceforge.net/sourceforge/grecipe-manager/%{name}-%{version}.tar.gz +Name: gourmet +Version: 0.10.1 +Release: 2%{?dist} +Summary: PyGTK Recipe Manager + +Group: Applications/Productivity +License: GPL +URL: http://grecipe-manager.sourceforge.net +Source0: http://easynews.dl.sourceforge.net/sourceforge/grecipe-manager/%{name}-%{version}.tar.gz +# Temporary - mistakingly left out of upstream tarball +# upstream notified of problem +Source90: nutritionDruid.glade + +# fix the .po files +patch90: gourmet-0.10.1-hu.po.patch +patch91: gourmet-0.10.1-pt_BR.po.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: python >= 0:2.2 -BuildRequires: gettext -BuildRequires: desktop-file-utils -BuildRequires: sed >= 3.95 -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: gnome-python2 -Requires: gnome-python2-gnomeprint -Requires: metakit +BuildArch: noarch +BuildRequires: python >= 0:2.2 +BuildRequires: gettext +BuildRequires: desktop-file-utils +BuildRequires: sed >= 3.95 +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Requires: gnome-python2 gnome-python2-gnomeprint metakit PyRTF Requires: pygtk2 > 2.3.9 -Requires: PyRTF -Requires: python-imaging -Requires: python-sqlite2 +Requires: python-imaging python-sqlite2 +# FC4 meets specified versions, but has glade errors - so somewhere the +# python glade requirements got bumped up w/o documenting %description Gourmet Recipe Manager is a recipe-organizer for GNOME that generates shopping @@ -33,6 +39,8 @@ %prep %setup -q +%patch90 -p1 +%patch91 -p1 %{__sed} -i 's?\.$??g' gourmet.desktop #%%{__sed} -i 's?\r??' src/lib/defaults_sk.py #%%{__sed} -i 's?\r??' src/lib/defaults_pt.py @@ -55,10 +63,7 @@ %build pushd i18n for file in *.po; do - # broken .po files - if [ ! ${file} = "hu.po" ] && [ ! ${file} = "pt_BR.po" ]; then - sh make_mo.sh $(basename $file .po) - fi + sh make_mo.sh $(basename $file .po) done popd @@ -77,6 +82,8 @@ --copy-name-to-generic-name \ --delete-original +install -p -m644 %{SOURCE90} %{buildroot}%{_datadir}/%{name}/ + %find_lang %{name} %clean @@ -119,6 +126,15 @@ %{_datadir}/gourmet %changelog +* Sat Mar 18 2006 Michael A. Peters - 0.10.1-2 +- A file was missing from the 0.10.1 upstream tarball. +- Added missing glade file from a cvs co of project (Source90). +- fixed broken po files (Patch90 + Patch91) +- (using 90 because those issues shouldn't be in final release) +-- +- TODO (upstream issue) +-- easier transition from 0.8.x user database to 0.10.x user database + * Sat Mar 18 2006 Michael A. Peters - 0.10.1-1 - This is the unstable branch of gourmet - for the devel branch - of Fedora Extras From fedora-extras-commits at redhat.com Sun Mar 19 04:25:44 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 18 Mar 2006 23:25:44 -0500 Subject: rpms/rkhunter/devel .cvsignore, 1.5, 1.6 rkhunter.spec, 1.8, 1.9 sources, 1.5, 1.6 rkhunter-1.2.8-2.src.sha, 1.1, NONE Message-ID: <200603190426.k2J4QG4N013299@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13278 Modified Files: .cvsignore rkhunter.spec sources Removed Files: rkhunter-1.2.8-2.src.sha Log Message: * Sat Mar 18 2006 Greg Houlette - 1.2.8-3 - Made an RPM transparent change to move the sha1 canary check file out of CVS and into the external lookaside cache (whose filename changes with every new package release anyway...) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Mar 2006 21:08:16 -0000 1.5 +++ .cvsignore 19 Mar 2006 04:25:43 -0000 1.6 @@ -1,3 +1,4 @@ rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +rkhunter-1.2.8-3.src.sha clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rkhunter.spec 17 Mar 2006 13:01:00 -0000 1.8 +++ rkhunter.spec 19 Mar 2006 04:25:43 -0000 1.9 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 2 +%define rpmRel 3 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -190,6 +190,11 @@ %changelog +* Sat Mar 18 2006 Greg Houlette - 1.2.8-3 +- Made an RPM transparent change to move the sha1 canary check + file out of CVS and into the external lookaside cache (whose + filename changes with every new package release anyway...) + * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Mar 2006 21:08:16 -0000 1.5 +++ sources 19 Mar 2006 04:25:43 -0000 1.6 @@ -1,2 +1,3 @@ 41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz +31a24aa09e6afa4cc0ec783dfe429a58 rkhunter-1.2.8-3.src.sha --- rkhunter-1.2.8-2.src.sha DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 04:45:19 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 18 Mar 2006 23:45:19 -0500 Subject: rpms/libsexy/devel .cvsignore, 1.6, 1.7 libsexy.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200603190445.k2J4jpF7013414@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libsexy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13387 Modified Files: .cvsignore libsexy.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Mar 2006 08:10:12 -0000 1.6 +++ .cvsignore 19 Mar 2006 04:45:18 -0000 1.7 @@ -1 +1 @@ -libsexy-0.1.7.tar.gz +libsexy-0.1.8.tar.gz Index: libsexy.spec =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/libsexy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libsexy.spec 16 Mar 2006 08:10:12 -0000 1.7 +++ libsexy.spec 19 Mar 2006 04:45:18 -0000 1.8 @@ -1,5 +1,5 @@ Name: libsexy -Version: 0.1.7 +Version: 0.1.8 Release: 1%{?dist} Summary: Funky fresh graphical widgets for GTK+ 2 @@ -9,7 +9,8 @@ Source0: http://releases.chipx86.com/libsexy/libsexy/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel libxml2-devel enchant-devel +BuildRequires: gtk2-devel libxml2-devel +Requires: enchant %description Some funky fresh graphical widgets for GTK+ 2 applications. @@ -55,6 +56,9 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Mar 18 2006 Ignacio Vazquez-Abrams 0.1.8-1 +- Upstream update + * Thu Mar 16 2006 Ignacio Vazquez-Abrams 0.1.7-1 - Upstream update Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Mar 2006 08:10:12 -0000 1.6 +++ sources 19 Mar 2006 04:45:18 -0000 1.7 @@ -1 +1 @@ -227df7c2d7ca421f41cef12c98b1e40f libsexy-0.1.7.tar.gz +ddc52cc8196f9f0bf48a5c7569b6bb38 libsexy-0.1.8.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 06:56:30 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 01:56:30 -0500 Subject: rpms/prboom/devel prboom.spec,1.2,1.3 Message-ID: <200603190657.k2J6v2kj017569@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17552 Modified Files: prboom.spec Log Message: Updated date to reflect checkin. Index: prboom.spec =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- prboom.spec 18 Mar 2006 17:51:42 -0000 1.2 +++ prboom.spec 19 Mar 2006 06:56:29 -0000 1.3 @@ -69,7 +69,7 @@ %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt %changelog -* Fri Mar 17 2006 Wart 2.3.1-5 +* Sat Mar 18 2006 Wart 2.3.1-5 - Updated patches to fix segfault on i386 (BZ #185741) * Tue Mar 14 2006 Wart 2.3.1-4 From fedora-extras-commits at redhat.com Sun Mar 19 06:59:52 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 01:59:52 -0500 Subject: rpms/prboom/FC-5 prboom-2.3.1-fixpsnprintf.patch, NONE, 1.1 prboom-2.3.1-gcc4.patch, 1.1, 1.2 prboom.spec, 1.1, 1.2 Message-ID: <200603190700.k2J70OxC017695@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17662 Modified Files: prboom-2.3.1-gcc4.patch prboom.spec Added Files: prboom-2.3.1-fixpsnprintf.patch Log Message: Fix segfault on i386 (BZ #185741) prboom-2.3.1-fixpsnprintf.patch: --- NEW FILE prboom-2.3.1-fixpsnprintf.patch --- diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c --- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.c 2006-03-18 09:04:48.000000000 -0800 @@ -130,7 +130,7 @@ case 'X': \ case 'p': \ GET_VARS \ - ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, (*pfmt == 'p' || prefix == 'l')? va_arg(ap, unsigned long):va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 'e': \ @@ -139,17 +139,17 @@ case 'g': \ case 'G': \ GET_VARS \ - ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, double)); \ state = STATE_NONE; \ break; \ case 'c': \ GET_VARS \ - ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 's': \ GET_VARS \ - ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, char *)); \ state = STATE_NONE; \ break; \ case 'n': \ @@ -306,11 +306,11 @@ } int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, int arg) { if (*nmax > 1) { - **pinsertion = (char) va_arg(*ap, int); + **pinsertion = (char) arg; *pinsertion += 1; *nmax -= 1; } @@ -338,9 +338,8 @@ */ int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, const char *str) { - const char *str = va_arg(*ap, const char *); int nprinted; int len; int pad = 0; @@ -428,7 +427,7 @@ */ int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, unsigned long arg) { long int number = 0; unsigned long int unumber; @@ -463,17 +462,17 @@ { case 'd': case 'i': - number = (signed short int) va_arg(*ap, int); + number = (signed short int) arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = (unsigned short int) va_arg(*ap, int); + unumber = (unsigned short int) arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } break; @@ -482,17 +481,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed long int); + number = arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned long int); + unumber = arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = numbersigned; } break; @@ -501,17 +500,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed int); + number = (signed int)arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned int); + unumber = (unsigned int)arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } } /* switch fmt to retrieve number */ @@ -784,13 +783,11 @@ */ int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, double value) { char *digits; int sign = 0; int dec; - double value = va_arg(*ap, double); - int len; int pad = 0; int signwidth = 0; diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h --- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.h 2006-03-18 09:05:19.000000000 -0800 @@ -17,16 +17,16 @@ * if there had been enough room). */ int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, int arg); int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, unsigned long arg); int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, const char *str); int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, double value); /* These are the flags you need (use logical OR) for the flags parameter of * fmt functions above. prboom-2.3.1-gcc4.patch: Index: prboom-2.3.1-gcc4.patch =================================================================== RCS file: /cvs/extras/rpms/prboom/FC-5/prboom-2.3.1-gcc4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom-2.3.1-gcc4.patch 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom-2.3.1-gcc4.patch 19 Mar 2006 06:59:52 -0000 1.2 @@ -89,176 +89,6 @@ extern int iquehead; extern int iquetail; extern int gravity; -diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c ---- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.c 2006-03-06 20:42:04.000000000 -0800 -@@ -130,7 +130,7 @@ - case 'X': \ - case 'p': \ - GET_VARS \ -- ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'e': \ -@@ -139,17 +139,17 @@ - case 'g': \ - case 'G': \ - GET_VARS \ -- ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'c': \ - GET_VARS \ -- ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 's': \ - GET_VARS \ -- ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'n': \ -@@ -306,11 +306,11 @@ - } - - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - if (*nmax > 1) - { -- **pinsertion = (char) va_arg(*ap, int); -+ **pinsertion = (char) va_arg(ap, int); - *pinsertion += 1; - *nmax -= 1; - } -@@ -338,9 +338,9 @@ - */ - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { -- const char *str = va_arg(*ap, const char *); -+ const char *str = va_arg(ap, const char *); - int nprinted; - int len; - int pad = 0; -@@ -428,7 +428,7 @@ - */ - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - long int number = 0; - unsigned long int unumber; -@@ -463,17 +463,17 @@ - { - case 'd': - case 'i': -- number = (signed short int) va_arg(*ap, int); -+ number = (signed short int) va_arg(ap, int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = (unsigned short int) va_arg(*ap, int); -+ unumber = (unsigned short int) va_arg(ap, int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - break; -@@ -482,17 +482,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed long int); -+ number = va_arg(ap, signed long int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned long int); -+ unumber = va_arg(ap, unsigned long int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = numbersigned; - } - break; -@@ -501,17 +501,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed int); -+ number = va_arg(ap, signed int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned int); -+ unumber = va_arg(ap, unsigned int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - } /* switch fmt to retrieve number */ -@@ -784,12 +784,12 @@ - */ - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - char *digits; - int sign = 0; - int dec; -- double value = va_arg(*ap, double); -+ double value = va_arg(ap, double); - - int len; - int pad = 0; -diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h ---- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.h 2006-03-06 20:42:04.000000000 -0800 -@@ -17,16 +17,16 @@ - * if there had been enough room). - */ - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - /* These are the flags you need (use logical OR) for the flags parameter of - * fmt functions above. diff -Naur prboom-2.3.1/src/r_bsp.h prboom-2.3.1.new/src/r_bsp.h --- prboom-2.3.1/src/r_bsp.h 2004-09-15 12:09:31.000000000 -0700 +++ prboom-2.3.1.new/src/r_bsp.h 2006-03-06 20:42:04.000000000 -0800 Index: prboom.spec =================================================================== RCS file: /cvs/extras/rpms/prboom/FC-5/prboom.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom.spec 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom.spec 19 Mar 2006 06:59:52 -0000 1.2 @@ -2,7 +2,7 @@ Name: prboom Version: 2.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open source port of the DOOM game engine Group: Amusements/Games @@ -13,6 +13,7 @@ Patch1: prboom-2.3.1-gamedir.patch Patch2: prboom-2.3.1-config.patch Patch3: prboom-2.3.1-64bit.patch +Patch4: prboom-2.3.1-fixpsnprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_net-devel @@ -32,6 +33,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure --disable-cpu-opt --program-prefix='' @@ -67,6 +69,9 @@ %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt %changelog +* Sat Mar 18 2006 Wart 2.3.1-5 +- Updated patches to fix segfault on i386 (BZ #185741) + * Tue Mar 14 2006 Wart 2.3.1-4 - Added patch to fix up some x86_64 issues From fedora-extras-commits at redhat.com Sun Mar 19 07:02:27 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 02:02:27 -0500 Subject: rpms/prboom/FC-4 prboom-2.3.1-fixpsnprintf.patch, NONE, 1.1 prboom-2.3.1-gcc4.patch, 1.1, 1.2 prboom.spec, 1.1, 1.2 Message-ID: <200603190703.k2J734Fg019627@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19590 Modified Files: prboom-2.3.1-gcc4.patch prboom.spec Added Files: prboom-2.3.1-fixpsnprintf.patch Log Message: Fix segfault on i386 (BZ #185741) prboom-2.3.1-fixpsnprintf.patch: --- NEW FILE prboom-2.3.1-fixpsnprintf.patch --- diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c --- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.c 2006-03-18 09:04:48.000000000 -0800 @@ -130,7 +130,7 @@ case 'X': \ case 'p': \ GET_VARS \ - ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, (*pfmt == 'p' || prefix == 'l')? va_arg(ap, unsigned long):va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 'e': \ @@ -139,17 +139,17 @@ case 'g': \ case 'G': \ GET_VARS \ - ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, double)); \ state = STATE_NONE; \ break; \ case 'c': \ GET_VARS \ - ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 's': \ GET_VARS \ - ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, char *)); \ state = STATE_NONE; \ break; \ case 'n': \ @@ -306,11 +306,11 @@ } int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, int arg) { if (*nmax > 1) { - **pinsertion = (char) va_arg(*ap, int); + **pinsertion = (char) arg; *pinsertion += 1; *nmax -= 1; } @@ -338,9 +338,8 @@ */ int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, const char *str) { - const char *str = va_arg(*ap, const char *); int nprinted; int len; int pad = 0; @@ -428,7 +427,7 @@ */ int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, unsigned long arg) { long int number = 0; unsigned long int unumber; @@ -463,17 +462,17 @@ { case 'd': case 'i': - number = (signed short int) va_arg(*ap, int); + number = (signed short int) arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = (unsigned short int) va_arg(*ap, int); + unumber = (unsigned short int) arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } break; @@ -482,17 +481,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed long int); + number = arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned long int); + unumber = arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = numbersigned; } break; @@ -501,17 +500,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed int); + number = (signed int)arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned int); + unumber = (unsigned int)arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } } /* switch fmt to retrieve number */ @@ -784,13 +783,11 @@ */ int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, double value) { char *digits; int sign = 0; int dec; - double value = va_arg(*ap, double); - int len; int pad = 0; int signwidth = 0; diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h --- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.h 2006-03-18 09:05:19.000000000 -0800 @@ -17,16 +17,16 @@ * if there had been enough room). */ int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, int arg); int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, unsigned long arg); int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, const char *str); int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, double value); /* These are the flags you need (use logical OR) for the flags parameter of * fmt functions above. prboom-2.3.1-gcc4.patch: Index: prboom-2.3.1-gcc4.patch =================================================================== RCS file: /cvs/extras/rpms/prboom/FC-4/prboom-2.3.1-gcc4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom-2.3.1-gcc4.patch 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom-2.3.1-gcc4.patch 19 Mar 2006 07:02:25 -0000 1.2 @@ -89,176 +89,6 @@ extern int iquehead; extern int iquetail; extern int gravity; -diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c ---- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.c 2006-03-06 20:42:04.000000000 -0800 -@@ -130,7 +130,7 @@ - case 'X': \ - case 'p': \ - GET_VARS \ -- ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'e': \ -@@ -139,17 +139,17 @@ - case 'g': \ - case 'G': \ - GET_VARS \ -- ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'c': \ - GET_VARS \ -- ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 's': \ - GET_VARS \ -- ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'n': \ -@@ -306,11 +306,11 @@ - } - - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - if (*nmax > 1) - { -- **pinsertion = (char) va_arg(*ap, int); -+ **pinsertion = (char) va_arg(ap, int); - *pinsertion += 1; - *nmax -= 1; - } -@@ -338,9 +338,9 @@ - */ - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { -- const char *str = va_arg(*ap, const char *); -+ const char *str = va_arg(ap, const char *); - int nprinted; - int len; - int pad = 0; -@@ -428,7 +428,7 @@ - */ - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - long int number = 0; - unsigned long int unumber; -@@ -463,17 +463,17 @@ - { - case 'd': - case 'i': -- number = (signed short int) va_arg(*ap, int); -+ number = (signed short int) va_arg(ap, int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = (unsigned short int) va_arg(*ap, int); -+ unumber = (unsigned short int) va_arg(ap, int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - break; -@@ -482,17 +482,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed long int); -+ number = va_arg(ap, signed long int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned long int); -+ unumber = va_arg(ap, unsigned long int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = numbersigned; - } - break; -@@ -501,17 +501,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed int); -+ number = va_arg(ap, signed int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned int); -+ unumber = va_arg(ap, unsigned int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - } /* switch fmt to retrieve number */ -@@ -784,12 +784,12 @@ - */ - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - char *digits; - int sign = 0; - int dec; -- double value = va_arg(*ap, double); -+ double value = va_arg(ap, double); - - int len; - int pad = 0; -diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h ---- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.h 2006-03-06 20:42:04.000000000 -0800 -@@ -17,16 +17,16 @@ - * if there had been enough room). - */ - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - /* These are the flags you need (use logical OR) for the flags parameter of - * fmt functions above. diff -Naur prboom-2.3.1/src/r_bsp.h prboom-2.3.1.new/src/r_bsp.h --- prboom-2.3.1/src/r_bsp.h 2004-09-15 12:09:31.000000000 -0700 +++ prboom-2.3.1.new/src/r_bsp.h 2006-03-06 20:42:04.000000000 -0800 Index: prboom.spec =================================================================== RCS file: /cvs/extras/rpms/prboom/FC-4/prboom.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom.spec 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom.spec 19 Mar 2006 07:02:25 -0000 1.2 @@ -2,7 +2,7 @@ Name: prboom Version: 2.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open source port of the DOOM game engine Group: Amusements/Games @@ -13,6 +13,7 @@ Patch1: prboom-2.3.1-gamedir.patch Patch2: prboom-2.3.1-config.patch Patch3: prboom-2.3.1-64bit.patch +Patch4: prboom-2.3.1-fixpsnprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_net-devel @@ -32,6 +33,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure --disable-cpu-opt --program-prefix='' @@ -67,6 +69,9 @@ %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt %changelog +* Sat Mar 18 2006 Wart 2.3.1-5 +- Updated patches to fix segfault on i386 (BZ #185741) + * Tue Mar 14 2006 Wart 2.3.1-4 - Added patch to fix up some x86_64 issues From fedora-extras-commits at redhat.com Sun Mar 19 09:47:25 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 19 Mar 2006 04:47:25 -0500 Subject: rpms/xemacs/FC-5 xemacs.spec,1.20,1.21 Message-ID: <200603190947.k2J9lvTF028010@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27976/FC-5 Modified Files: xemacs.spec Log Message: * Sat Mar 18 2006 Ville Skytt?? - 21.4.19-3 - Build without -fstack-protector by default for now (#183643). Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-5/xemacs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xemacs.spec 11 Feb 2006 13:11:48 -0000 1.20 +++ xemacs.spec 19 Mar 2006 09:47:24 -0000 1.21 @@ -2,13 +2,14 @@ %bcond_with xaw3d %bcond_without debug %bcond_without mule +%bcond_with stackprot %define pkgdir %{_datadir}/xemacs %define exectop %{_libdir}/xemacs-%{version} Name: xemacs Version: 21.4.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -186,7 +187,12 @@ %build -export CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" +CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" +%if ! %{with stackprot} +CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')" +CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')" +%endif +export CFLAGS # XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir, # --includedir, --libexecdir, --localstatedir, --sharedstatedir @@ -449,6 +455,9 @@ %changelog +* Sat Mar 18 2006 Ville Skytt?? - 21.4.19-3 +- Build without -fstack-protector by default for now (#183643). + * Thu Feb 2 2006 Ville Skytt?? - 21.4.19-2 - 21.4.19, X paths patch mostly applied upstream. From fedora-extras-commits at redhat.com Sun Mar 19 09:47:31 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 19 Mar 2006 04:47:31 -0500 Subject: rpms/xemacs/devel xemacs.spec,1.20,1.21 Message-ID: <200603190948.k2J9m4ib028013@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27976/devel Modified Files: xemacs.spec Log Message: * Sat Mar 18 2006 Ville Skytt?? - 21.4.19-3 - Build without -fstack-protector by default for now (#183643). Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xemacs.spec 11 Feb 2006 13:11:48 -0000 1.20 +++ xemacs.spec 19 Mar 2006 09:47:31 -0000 1.21 @@ -2,13 +2,14 @@ %bcond_with xaw3d %bcond_without debug %bcond_without mule +%bcond_with stackprot %define pkgdir %{_datadir}/xemacs %define exectop %{_libdir}/xemacs-%{version} Name: xemacs Version: 21.4.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -186,7 +187,12 @@ %build -export CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" +CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" +%if ! %{with stackprot} +CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')" +CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')" +%endif +export CFLAGS # XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir, # --includedir, --libexecdir, --localstatedir, --sharedstatedir @@ -449,6 +455,9 @@ %changelog +* Sat Mar 18 2006 Ville Skytt?? - 21.4.19-3 +- Build without -fstack-protector by default for now (#183643). + * Thu Feb 2 2006 Ville Skytt?? - 21.4.19-2 - 21.4.19, X paths patch mostly applied upstream. From fedora-extras-commits at redhat.com Sun Mar 19 11:57:25 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sun, 19 Mar 2006 06:57:25 -0500 Subject: rpms/exim/FC-4 exim-4.50-config.patch, 1.2, 1.3 exim.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200603191157.k2JBvvl6032342@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32318 Modified Files: exim-4.50-config.patch exim.spec sources Log Message: Update FC4 to 4.60 exim-4.50-config.patch: Index: exim-4.50-config.patch =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim-4.50-config.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- exim-4.50-config.patch 5 Oct 2005 10:13:18 -0000 1.2 +++ exim-4.50-config.patch 19 Mar 2006 11:57:24 -0000 1.3 @@ -58,7 +58,7 @@ #------------------------------------------------------------------------------ -@@ -255,17 +255,19 @@ +@@ -255,17 +255,20 @@ LOOKUP_DBM=yes LOOKUP_LSEARCH=yes @@ -72,8 +72,10 @@ -# LOOKUP_LDAP=yes +LOOKUP_LDAP=yes +LDAP_LIB_TYPE=OPENLDAP2 -+LOOKUP_LIBS=-lldap -llber -lsqlite3 - # LOOKUP_MYSQL=yes ++LOOKUP_INCLUDE=-I/usr/include/mysql ++LOOKUP_LIBS=-lldap -llber -lsqlite3 -L/usr/$(_lib)/mysql -lmysqlclient -lpq +-# LOOKUP_MYSQL=yes ++LOOKUP_MYSQL=yes -# LOOKUP_NIS=yes -# LOOKUP_NISPLUS=yes +LOOKUP_NIS=yes @@ -81,7 +83,8 @@ # LOOKUP_ORACLE=yes -# LOOKUP_PASSWD=yes +LOOKUP_PASSWD=yes - # LOOKUP_PGSQL=yes +-# LOOKUP_PGSQL=yes ++# LOOKUP_PGSQL=yes -# LOOKUP_SQLITE=yes +LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- exim.spec 5 Oct 2005 10:13:18 -0000 1.7 +++ exim.spec 19 Mar 2006 11:57:24 -0000 1.8 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.54 -Release: 1%{?dist} +Version: 4.60 +Release: 3%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -27,9 +27,10 @@ Patch15: exim-4.52-dynamic-pcre.patch Requires: /etc/aliases -BuildRequires: db4-devel openssl-devel openldap-devel XFree86-devel pam-devel +BuildRequires: db4-devel openssl-devel openldap-devel pam-devel BuildRequires: lynx pcre-devel sqlite-devel -BuildRequires: cyrus-sasl-devel openldap-devel openssl-devel +BuildRequires: cyrus-sasl-devel openldap-devel openssl-devel mysql-devel postgresql-devel +BuildRequires: xorg-x11-devel PreReq: cyrus-sasl openldap openssl %description @@ -285,6 +286,25 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue Mar 7 2006 David Woodhouse 4.60-3 +- Rebuild + +* Tue Nov 29 2005 David Woodhouse 4.60-2 +- Require libXt-devel + +* Tue Nov 29 2005 David Woodhouse 4.60-1 +- Update to 4.60 + +* Sun Nov 13 2005 David Woodhouse 4.54-4 +- Fix 64-bit build + +* Fri Nov 11 2005 David Woodhouse 4.54-3 +- Update X11 BuildRequires + +* Wed Oct 5 2005 David Woodhouse 4.54-2 +- Rebuild for new OpenSSL +- Add MySQL and Postgres support to keep jgarzik happy + * Wed Oct 5 2005 David Woodhouse 4.54-1 - Update to Exim 4.54 - Enable sqlite support Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 5 Oct 2005 10:13:18 -0000 1.6 +++ sources 19 Mar 2006 11:57:24 -0000 1.7 @@ -1,2 +1,2 @@ ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz -f3cdf5292f4bbb1ee2de42d4338b3b9f exim-4.54.tar.bz2 +eed3c8fc393cf7ccc9c1079b28516128 exim-4.60.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 12:31:52 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:31:52 -0500 Subject: rpms/libopts - New directory Message-ID: <200603191231.k2JCVsvo002016@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2008/libopts Log Message: Directory /cvs/extras/rpms/libopts added to the repository From fedora-extras-commits at redhat.com Sun Mar 19 12:31:57 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:31:57 -0500 Subject: rpms/libopts/devel - New directory Message-ID: <200603191231.k2JCVxHT002031@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2008/libopts/devel Log Message: Directory /cvs/extras/rpms/libopts/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 19 12:32:23 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:32:23 -0500 Subject: rpms/libopts Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603191232.k2JCWPo8002065@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2053 Added Files: Makefile import.log Log Message: Setup of module libopts --- NEW FILE Makefile --- # Top level Makefile for module libopts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 19 12:32:29 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:32:29 -0500 Subject: rpms/libopts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603191232.k2JCWVAE002085@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2053/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libopts --- NEW 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 Mar 19 12:33:30 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:33:30 -0500 Subject: rpms/libopts import.log,1.1,1.2 Message-ID: <200603191234.k2JCY2mj002155@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2121 Modified Files: import.log Log Message: auto-import libopts-27.1-3 on branch devel from libopts-27.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libopts/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Mar 2006 12:32:23 -0000 1.1 +++ import.log 19 Mar 2006 12:33:29 -0000 1.2 @@ -0,0 +1 @@ +libopts-27_1-3:HEAD:libopts-27.1-3.src.rpm:1142771597 From fedora-extras-commits at redhat.com Sun Mar 19 12:33:35 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:33:35 -0500 Subject: rpms/libopts/devel libopts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603191234.k2JCY8dR002159@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2121/devel Modified Files: .cvsignore sources Added Files: libopts.spec Log Message: auto-import libopts-27.1-3 on branch devel from libopts-27.1-3.src.rpm --- NEW FILE libopts.spec --- Summary: Options library for autogen Name: libopts Version: 27.1 Release: 3%{?dist} License: LGPL or BSD Group: Development/Libraries Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz URL: http://autogen.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(preun): /sbin/install-info Requires(post): /sbin/install-info %description libopts is part of the autogen build system %package devel Group: Development/Libraries Summary: Development files for libopts Requires: libopts = %{version}-%{release} %description devel Development files for libopts %prep rm -rf ${RPM_BUILD_ROOT} %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}/lib*.la rm -f ${RPM_BUILD_ROOT}%{_infodir}/libopts.txt* rm -f ${RPM_BUILD_ROOT}%{_infordir}/dir %clean rm -rf ${RPM_BUILD_ROOT} %postun -p /sbin/ldconfig %post -p /sbin/ldconfig %preun devel if [ $1 = 0 ]; then /sbin/install-info --delete \ --info-dir=%{__infodir} %{__infodir}/libopts.info fi %files %defattr(-,root,root) %doc COPYING* NEWS ChangeLog %{_libdir}/libopts.so.* %files devel %defattr(-,root,root) %{_libdir}/libopts.so %{_infodir}/libopts.info.gz %{_mandir}/man?/* %{_bindir}/libopts-config %{_includedir}/autoopts %changelog * Sun Mar 19 2006 Paul F. Johnson 27.1-3 - Small fixes to spec file * Fri Feb 24 2006 Ralf Corspius 27.1-2 - Rework spec * Thu Feb 23 2006 Paul F. Johnson 27.1-1 - Initial import, bug fixes to the spec and other such things Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libopts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Mar 2006 12:32:29 -0000 1.1 +++ .cvsignore 19 Mar 2006 12:33:35 -0000 1.2 @@ -0,0 +1 @@ +libopts-27.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libopts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Mar 2006 12:32:29 -0000 1.1 +++ sources 19 Mar 2006 12:33:35 -0000 1.2 @@ -0,0 +1 @@ +50a546ee14d866819afd502e809c8095 libopts-27.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 14:07:46 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 19 Mar 2006 09:07:46 -0500 Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.21,1.22 Message-ID: <200603191408.k2JE8I8g006750@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/xchat-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6733 Modified Files: xchat-gnome.spec Log Message: * Sun Mar 19 2006 Brian Pepple - 0.10-5 - Rebuild for libsexy-0.1.8. Index: xchat-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xchat-gnome.spec 17 Mar 2006 01:16:59 -0000 1.21 +++ xchat-gnome.spec 19 Mar 2006 14:07:45 -0000 1.22 @@ -3,7 +3,7 @@ Name: xchat-gnome Version: 0.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -137,6 +137,9 @@ %changelog +* Sun Mar 19 2006 Brian Pepple - 0.10-5 +- Rebuild for libsexy-0.1.8. + * Thu Mar 16 2006 Brian Pepple - 0.10-4 - Rebuild for new libsexy. From fedora-extras-commits at redhat.com Sun Mar 19 14:09:39 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 19 Mar 2006 09:09:39 -0500 Subject: rpms/xchat-gnome/FC-5 xchat-gnome.spec,1.21,1.22 Message-ID: <200603191410.k2JEAB0E006821@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/xchat-gnome/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6804 Modified Files: xchat-gnome.spec Log Message: * Sun Mar 19 2006 Brian Pepple - 0.10-5 - Rebuild for libsexy-0.1.8. Index: xchat-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/xchat-gnome/FC-5/xchat-gnome.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xchat-gnome.spec 17 Mar 2006 01:19:16 -0000 1.21 +++ xchat-gnome.spec 19 Mar 2006 14:09:39 -0000 1.22 @@ -3,7 +3,7 @@ Name: xchat-gnome Version: 0.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -137,6 +137,9 @@ %changelog +* Sun Mar 19 2006 Brian Pepple - 0.10-5 +- Rebuild for libsexy-0.1.8. + * Thu Mar 16 2006 Brian Pepple - 0.10-4 - Rebuild for new libsexy. From fedora-extras-commits at redhat.com Sun Mar 19 15:13:42 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Sun, 19 Mar 2006 10:13:42 -0500 Subject: rpms/ghdl/devel gcc41-ada-pr18302.patch, NONE, 1.1 gcc41-ada-tweaks.patch, NONE, 1.1 gcc41-cfaval.patch, NONE, 1.1 gcc41-gnuc-rh-release.patch, NONE, 1.1 gcc41-ia64-libunwind.patch, NONE, 1.1 gcc41-ice-hack.patch, NONE, 1.1 gcc41-java-nomulti.patch, NONE, 1.1 gcc41-java-slow_pthread_self.patch, NONE, 1.1 gcc41-mni.patch, NONE, 1.1 gcc41-ppc32-retaddr.patch, NONE, 1.1 gcc41-ppc64-m32-m64-multilib-only.patch, NONE, 1.1 gcc41-rh184446.patch, NONE, 1.1 gcc41-x86_64-sse3.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 ghdl.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200603191514.k2JFEF8V009144@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9079 Modified Files: .cvsignore ghdl.spec sources Added Files: gcc41-ada-pr18302.patch gcc41-ada-tweaks.patch gcc41-cfaval.patch gcc41-gnuc-rh-release.patch gcc41-ia64-libunwind.patch gcc41-ice-hack.patch gcc41-java-nomulti.patch gcc41-java-slow_pthread_self.patch gcc41-mni.patch gcc41-ppc32-retaddr.patch gcc41-ppc64-m32-m64-multilib-only.patch gcc41-rh184446.patch gcc41-x86_64-sse3.patch Log Message: use core gcc sources as baseline sources does not work yet on x86_64, waiting for upstream to fix gcc41-ada-pr18302.patch: --- NEW FILE gcc41-ada-pr18302.patch --- gcc/ada/ 2004-11-28 James A. Morrison PR ada/18302 * Make-lang.in (check-gnat): Set EXPECT environment variable. testsuite/ 2005-05-18 Jakub Jelinek * ada/acats/run_all.sh: Filter out spawn line from target_bit. 2004-11-28 James A. Morrison PR ada/18302 * ada/acats/run_all.sh (target_run): Run test through run_test.expect. * ada/acats/run_test.expect: Expect script for ACATS tests. --- gcc/testsuite/ada/acats/run_all.sh (.../gcc-4_0-branch) (revision 107266) +++ gcc/testsuite/ada/acats/run_all.sh (.../redhat/gcc-4_0-branch) (revision 107414) @@ -13,7 +13,8 @@ gnatflags="-gnatws" target_run () { -$* + LD_LIBRARY_PATH=$ADA_INCLUDE_PATH${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} \ + $EXPECT -f $testdir/run_test.exp $1 > $2 } # End of customization section. @@ -92,8 +93,8 @@ # Find out the size in bit of an address on the target target_gnatmake $testdir/support/impbit.adb >> $dir/acats.log 2>&1 -target_run $dir/support/impbit > $dir/support/impbit.out 2>&1 -target_bit=`cat $dir/support/impbit.out` +target_run $dir/support/impbit $dir/support/impbit.out 2>/dev/null +target_bit=`egrep -v -e ^spawn $dir/support/impbit.out` echo target_bit="$target_bit" >> $dir/acats.log # Find out a suitable asm statement @@ -259,7 +260,7 @@ if [ ! -x $dir/tests/$chapter/$i/$binmain ]; then sync fi - target_run $dir/tests/$chapter/$i/$binmain > $dir/tests/$chapter/$i/${i}.log 2>&1 + target_run $dir/tests/$chapter/$i/$binmain $dir/tests/$chapter/$i/${i}.log 2>&1 cd $dir/tests/$chapter/$i cat ${i}.log >> $dir/acats.log egrep -e '(==== |\+\+\+\+ |\!\!\!\! )' ${i}.log > /dev/null 2>&1 --- gcc/testsuite/ada/acats/run_test.exp (.../gcc-4_0-branch) (revision 0) +++ gcc/testsuite/ada/acats/run_test.exp (.../redhat/gcc-4_0-branch) (revision 107414) @@ -0,0 +1,13 @@ +#!/usr/bin/expect -f + +if {[info exists env(DEJAGNU_TIMEOUT)]} { + set timeout $env(DEJAGNU_TIMEOUT) +} else { + set timeout 300 +} + +spawn $argv +expect timeout { + send_user "Program timed out.\n" + exit 1 +} --- gcc/ada/Make-lang.in (.../gcc-4_0-branch) (revision 107266) +++ gcc/ada/Make-lang.in (.../redhat/gcc-4_0-branch) (revision 107414) @@ -809,6 +809,7 @@ check-gnat: test -d $(ACATSDIR) || mkdir -p $(ACATSDIR) testdir=`cd ${srcdir}/${ACATSDIR}; ${PWD_COMMAND}`; \ + EXPECT=${EXPECT} ; export EXPECT ; \ export testdir; cd $(ACATSDIR); $(SHELL) $${testdir}/run_acats $(CHAPTERS) .PHONY: check-gnat gcc41-ada-tweaks.patch: --- NEW FILE gcc41-ada-tweaks.patch --- 2004-10-04 Jakub Jelinek * gnat_ugn.texi: Add : and . to direntry. * gnat-style.texi: Change dircategory to GNU Ada tools. 2005-02-08 Jakub Jelinek * Makefile.in (gnatlib-shared-default): Disallow dlopening of libgnat.so. --- gcc/ada/gnat-style.texi (.../gcc-4_0-branch) (revision 107266) +++ gcc/ada/gnat-style.texi (.../redhat/gcc-4_0-branch) (revision 107414) @@ -28,7 +28,7 @@ @setchapternewpage odd - at dircategory Programming + at dircategory GNU Ada tools @direntry * gnat-style: (gnat-style). GNAT Coding Style @end direntry --- gcc/ada/Makefile.in (.../gcc-4_0-branch) (revision 107266) +++ gcc/ada/Makefile.in (.../redhat/gcc-4_0-branch) (revision 107414) @@ -1316,7 +1316,7 @@ LIBRARY_VERSION := $(LIB_VERSION) endif -ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),) +ifeq ($(strip $(filter-out powerpc% ppc% linux%,$(arch) $(osys))),) LIBGNAT_TARGET_PAIRS = \ a-intnam.ads * unwind-dw2.h (_Unwind_FrameState): Add REG_SAVED_VAL_OFFSET and REG_SAVED_VAL_EXP constants. * unwind-dw2.c (struct _Unwind_Context): Add by_value array. (_Unwind_GetGR, _Unwind_SetGR, _Unwind_GetGRPtr, _Unwind_SetGRPtr): Handle regs stored by value. (_Unwind_SetGRValue, _Unwind_GRByValue): New functions. (execute_cfa_program): Handle DW_CFA_val_offset, DW_CFA_val_offset_sf and DW_CFA_val_expression. (uw_update_context_1): Handle REG_SAVED_REG with regs stored by value specially. Handle REG_SAVED_VAL_OFFSET and REG_SAVED_VAL_EXP. (uw_install_context_1): Handle target regs stored by value. * gcc.target/i386/cleanup-1.c: New test. * gcc.target/i386/cleanup-2.c: New test. --- gcc/unwind-dw2.h.jj 2006-03-01 14:43:03.000000000 +0100 +++ gcc/unwind-dw2.h 2006-03-01 15:02:51.000000000 +0100 @@ -53,7 +53,9 @@ typedef struct REG_UNSAVED, REG_SAVED_OFFSET, REG_SAVED_REG, - REG_SAVED_EXP + REG_SAVED_EXP, + REG_SAVED_VAL_OFFSET, + REG_SAVED_VAL_EXP } how; } reg[DWARF_FRAME_REGISTERS+1]; --- gcc/unwind-dw2.c.jj 2006-03-01 14:43:03.000000000 +0100 +++ gcc/unwind-dw2.c 2006-03-02 18:59:34.000000000 +0100 @@ -72,6 +72,7 @@ struct _Unwind_Context struct dwarf_eh_bases bases; _Unwind_Word args_size; char signal_frame; + char by_value[DWARF_FRAME_REGISTERS+1]; }; /* Byte size of every register managed by these routines. */ @@ -118,7 +119,7 @@ read_8u (const void *p) { const union un static inline unsigned long read_8s (const void *p) { const union unaligned *up = p; return up->s8; } -/* Get the value of register REG as saved in CONTEXT. */ +/* Get the value of register INDEX as saved in CONTEXT. */ inline _Unwind_Word _Unwind_GetGR (struct _Unwind_Context *context, int index) @@ -136,6 +137,9 @@ _Unwind_GetGR (struct _Unwind_Context *c size = dwarf_reg_size_table[index]; ptr = context->reg[index]; + if (context->by_value[index]) + return (_Unwind_Word) (_Unwind_Internal_Ptr) ptr; + /* This will segfault if the register hasn't been saved. */ if (size == sizeof(_Unwind_Ptr)) return * (_Unwind_Ptr *) ptr; @@ -160,7 +164,7 @@ _Unwind_GetCFA (struct _Unwind_Context * return (_Unwind_Ptr) context->cfa; } -/* Overwrite the saved value for register REG in CONTEXT with VAL. */ +/* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ inline void _Unwind_SetGR (struct _Unwind_Context *context, int index, _Unwind_Word val) @@ -171,6 +175,13 @@ _Unwind_SetGR (struct _Unwind_Context *c index = DWARF_REG_TO_UNWIND_COLUMN (index); gcc_assert (index < (int) sizeof(dwarf_reg_size_table)); size = dwarf_reg_size_table[index]; + + if (context->by_value[index]) + { + context->reg[index] = (void *) (_Unwind_Internal_Ptr) val; + return; + } + ptr = context->reg[index]; if (size == sizeof(_Unwind_Ptr)) @@ -188,6 +199,8 @@ static inline void * _Unwind_GetGRPtr (struct _Unwind_Context *context, int index) { index = DWARF_REG_TO_UNWIND_COLUMN (index); + if (context->by_value[index]) + return &context->reg[index]; return context->reg[index]; } @@ -197,9 +210,34 @@ static inline void _Unwind_SetGRPtr (struct _Unwind_Context *context, int index, void *p) { index = DWARF_REG_TO_UNWIND_COLUMN (index); + context->by_value[index] = 0; context->reg[index] = p; } +/* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ + +static inline void +_Unwind_SetGRValue (struct _Unwind_Context *context, int index, + _Unwind_Word val) +{ + index = DWARF_REG_TO_UNWIND_COLUMN (index); + gcc_assert (index < (int) sizeof(dwarf_reg_size_table)); + gcc_assert (dwarf_reg_size_table[index] == sizeof (_Unwind_Ptr)); + + context->by_value[index] = 1; + context->reg[index] = (void *) (_Unwind_Internal_Ptr) val; +} + +/* Return non-zero if register INDEX is stored by value rather than + by reference. */ + +static inline int +_Unwind_GRByValue (struct _Unwind_Context *context, int index) +{ + index = DWARF_REG_TO_UNWIND_COLUMN (index); + return context->by_value[index]; +} + /* Retrieve the return address for CONTEXT. */ inline _Unwind_Ptr @@ -922,7 +960,7 @@ execute_cfa_program (const unsigned char insn_ptr += utmp; break; - /* From the dwarf3 draft. */ + /* Dwarf3. */ case DW_CFA_offset_extended_sf: insn_ptr = read_uleb128 (insn_ptr, ®); insn_ptr = read_sleb128 (insn_ptr, &stmp); @@ -945,6 +983,33 @@ execute_cfa_program (const unsigned char /* cfa_how deliberately not set. */ break; + case DW_CFA_val_offset: + insn_ptr = read_uleb128 (insn_ptr, ®); + insn_ptr = read_uleb128 (insn_ptr, &utmp); + offset = (_Unwind_Sword) utmp * fs->data_align; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].how + = REG_SAVED_VAL_OFFSET; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].loc.offset = offset; + break; + + case DW_CFA_val_offset_sf: + insn_ptr = read_uleb128 (insn_ptr, ®); + insn_ptr = read_sleb128 (insn_ptr, &stmp); + offset = stmp * fs->data_align; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].how + = REG_SAVED_VAL_OFFSET; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].loc.offset = offset; + break; + + case DW_CFA_val_expression: + insn_ptr = read_uleb128 (insn_ptr, ®); + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].how + = REG_SAVED_VAL_EXP; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].loc.exp = insn_ptr; + insn_ptr = read_uleb128 (insn_ptr, &utmp); + insn_ptr += utmp; + break; + case DW_CFA_GNU_window_save: /* ??? Hardcoded for SPARC register window configuration. */ for (reg = 16; reg < 32; ++reg) @@ -1113,7 +1178,7 @@ typedef union { _Unwind_Ptr ptr; _Unwind static inline void _Unwind_SetSpColumn (struct _Unwind_Context *context, void *cfa, - _Unwind_SpTmp *tmp_sp) + _Unwind_SpTmp *tmp_sp) { int size = dwarf_reg_size_table[__builtin_dwarf_sp_column ()]; @@ -1194,9 +1259,14 @@ uw_update_context_1 (struct _Unwind_Cont break; case REG_SAVED_REG: - _Unwind_SetGRPtr - (context, i, - _Unwind_GetGRPtr (&orig_context, fs->regs.reg[i].loc.reg)); + if (_Unwind_GRByValue (&orig_context, fs->regs.reg[i].loc.reg)) + _Unwind_SetGRValue (context, i, + _Unwind_GetGR (&orig_context, + fs->regs.reg[i].loc.reg)); + else + _Unwind_SetGRPtr (context, i, + _Unwind_GetGRPtr (&orig_context, + fs->regs.reg[i].loc.reg)); break; case REG_SAVED_EXP: @@ -1211,6 +1281,25 @@ uw_update_context_1 (struct _Unwind_Cont _Unwind_SetGRPtr (context, i, (void *) val); } break; + + case REG_SAVED_VAL_OFFSET: + _Unwind_SetGRValue (context, i, + (_Unwind_Internal_Ptr) + (cfa + fs->regs.reg[i].loc.offset)); + break; + + case REG_SAVED_VAL_EXP: + { + const unsigned char *exp = fs->regs.reg[i].loc.exp; + _Unwind_Word len; + _Unwind_Ptr val; + + exp = read_uleb128 (exp, &len); + val = execute_stack_op (exp, exp + len, &orig_context, + (_Unwind_Ptr) cfa); + _Unwind_SetGRValue (context, i, val); + } + break; } context->signal_frame = fs->signal_frame; @@ -1327,14 +1416,31 @@ uw_install_context_1 (struct _Unwind_Con /* If the target frame does not have a saved stack pointer, then set up the target's CFA. */ if (!_Unwind_GetGRPtr (target, __builtin_dwarf_sp_column ())) - _Unwind_SetSpColumn (target, target->cfa, &sp_slot); + _Unwind_SetSpColumn (target, target->cfa, &sp_slot); for (i = 0; i < DWARF_FRAME_REGISTERS; ++i) { void *c = current->reg[i]; void *t = target->reg[i]; - if (t && c && t != c) + gcc_assert (current->by_value[i] == 0); + if (target->by_value[i] && c) + { + _Unwind_Word w; + _Unwind_Ptr p; + if (dwarf_reg_size_table[i] == sizeof (_Unwind_Word)) + { + w = (_Unwind_Internal_Ptr) t; + memcpy (c, &w, sizeof (_Unwind_Word)); + } + else + { + gcc_assert (dwarf_reg_size_table[i] == sizeof (_Unwind_Ptr)); + p = (_Unwind_Internal_Ptr) t; + memcpy (c, &p, sizeof (_Unwind_Ptr)); + } + } + else if (t && c && t != c) memcpy (c, t, dwarf_reg_size_table[i]); } --- gcc/testsuite/gcc.target/i386/cleanup-1.c.jj 2006-03-03 11:25:14.000000000 +0100 +++ gcc/testsuite/gcc.target/i386/cleanup-1.c 2006-03-03 11:25:48.000000000 +0100 @@ -0,0 +1,240 @@ +/* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-options "-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2" } */ +/* Test complex CFA value expressions. */ + +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +void +bar (void) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +void __attribute__((noinline)) +foo (int x) +{ + char buf[256]; +#ifdef __i386__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leal %1, %%ecx\n" +"2:\t" "call bar\n" +"3:\t" "jmp 18f\n" +"4:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"5:\t" ".long 7f-6f # Length of Common Information Entry\n" +"6:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -4 # CIE Data Alignment Factor\n\t" + ".byte 0x8 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0xc # DW_CFA_def_cfa\n\t" + ".uleb128 0x4\n\t" + ".uleb128 0x0\n\t" + ".align 4\n" +"7:\t" ".long 17f-8f # FDE Length\n" +"8:\t" ".long 8b-5b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 4b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 10f-9f\n" +"9:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 3b-1b\n" +"10:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 12f-11f\n" +"11:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 3b-2b\n" +"12:\t" ".byte 0x40 + (3b-2b-1) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 16f-13f\n" +"13:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 15f-14f\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"14:\t" ".4byte 3b-.\n\t" + ".byte 0x1c # DW_OP_minus\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"15:\t" ".4byte 18f-.\n\t" + ".byte 0x22 # DW_OP_plus\n" +"16:\t" ".align 4\n" +"17:\t" ".previous\n" +"18:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "eax", "edx", "ecx"); +#elif defined __x86_64__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leaq %1, %%rdi\n" +"2:\t" "subq $128, %%rsp\n" +"3:\t" "call bar\n" +"4:\t" "addq $128, %%rsp\n" +"5:\t" "jmp 24f\n" +"6:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"7:\t" ".long 9f-8f # Length of Common Information Entry\n" +"8:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -8 # CIE Data Alignment Factor\n\t" + ".byte 0x10 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0x12 # DW_CFA_def_cfa_sf\n\t" + ".uleb128 0x7\n\t" + ".sleb128 16\n\t" + ".align 8\n" +"9:\t" ".long 23f-10f # FDE Length\n" +"10:\t" ".long 10b-7b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 6b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 12f-11f\n" +"11:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-1b\n" +"12:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 14f-13f\n" +"13:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-2b\n" +"14:\t" ".byte 0x40 + (3b-2b) # DW_CFA_advance_loc\n\t" + ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" + ".uleb128 0\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 16f-15f\n" +"15:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-3b\n" +"16:\t" ".byte 0x40 + (4b-3b-1) # DW_CFA_advance_loc\n\t" + ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" + ".uleb128 128\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 20f-17f\n" +"17:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 19f-18f\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"18:\t" ".4byte 4b-.\n\t" + ".byte 0x1c # DW_OP_minus\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"19:\t" ".4byte 24f-.\n\t" + ".byte 0x22 # DW_OP_plus\n" +"20:\t" ".byte 0x40 + (5b-4b+1) # DW_CFA_advance_loc\n\t" + ".byte 0x13 # DW_CFA_def_cfa_offset_sf\n\t" + ".sleb128 16\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 22f-21f\n" +"21:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-5b\n" +"22:\t" ".align 8\n" +"23:\t" ".previous\n" +"24:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "rax", "rdx", "rcx", "rsi", "rdi", + "r8", "r9", "r10", "r11"); +#else +# error Unsupported test architecture +#endif +} + +static int __attribute__((noinline)) +fn2 (void) +{ + foo (3); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ + fn2 (); + return 0; +} + +static void * +fn0 (void) +{ + char dummy __attribute__((cleanup (handler))); + fn1 (); + return 0; +} + +int +main (void) +{ + fn0 (); + return 0; +} --- gcc/testsuite/gcc.target/i386/cleanup-2.c.jj 2006-03-03 11:25:26.000000000 +0100 +++ gcc/testsuite/gcc.target/i386/cleanup-2.c 2006-03-03 11:27:06.000000000 +0100 @@ -0,0 +1,205 @@ +/* { dg-do run { target { { i?86-*-linux* x86_64-*-linux* } && lp64 } } } */ +/* { dg-options "-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2" } */ +/* Test complex CFA value expressions. */ + +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +void +bar (void) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +void __attribute__((noinline)) +foo (int x) +{ + char buf[256]; +#ifdef __x86_64__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leaq %1, %%rdi\n" +"2:\t" "subq $128, %%rsp\n" +"3:\t" "call bar\n" +"4:\t" "addq $128, %%rsp\n" +"5:\t" "jmp 21f\n" +"6:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"7:\t" ".long 9f-8f # Length of Common Information Entry\n" +"8:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -8 # CIE Data Alignment Factor\n\t" + ".byte 0x10 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0xc # DW_CFA_def_cfa\n\t" + ".uleb128 0x7\n\t" + ".uleb128 0x0\n\t" + ".align 8\n" +"9:\t" ".long 20f-10f # FDE Length\n" +"10:\t" ".long 10b-7b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 6b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + /* This CFA expression computes the address right + past the jnz instruction above, from %rip somewhere + within the _L_mutex_lock_%= subsection. */ + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 19f-11f\n" +"11:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 0\n" +"12:\t" ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0x48\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 16f-13f\n" +"13:\t" ".byte 0x13 # DW_OP_drop\n\t" + ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 1\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0x81\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 15f-14f\n" +"14:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 3b-2b-1\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-15f\n" +"15:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 2b-1b-1\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-16f\n" +"16:\t" ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0xe8\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 18f-17f\n" +"17:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 4b-3b\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-18f\n" +"18:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 4\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 72 - (6b-5b) * 8 # (6b-5b) == 5 ? 32 : 56\n\t" + ".byte 0x24 # DW_OP_shl\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 72 - (6b-5b) * 8 # (6b-5b) == 5 ? 32 : 56\n\t" + ".byte 0x26 # DW_OP_shra\n\t" + ".byte 0x22 # DW_OP_plus\n\t" + ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 6b-5b-1\n" +"19:\t" ".byte 0x40 + (3b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0xe # DW_CFA_def_cfa_offset\n\t" + ".uleb128 128\n\t" + ".byte 0x40 + (5b-3b) # DW_CFA_advance_loc\n\t" + ".byte 0xe # DW_CFA_def_cfa_offset\n\t" + ".uleb128 0\n\t" + ".align 8\n" +"20:\t" ".previous\n" +"21:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "rax", "rdx", "rcx", "rsi", "rdi", + "r8", "r9", "r10", "r11"); +#else +# error Unsupported test architecture +#endif +} + +static int __attribute__((noinline)) +fn2 (void) +{ + foo (3); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ + fn2 (); + return 0; +} + +static void * +fn0 (void) +{ + char dummy __attribute__((cleanup (handler))); + fn1 (); + return 0; +} + +int +main (void) +{ + fn0 (); + return 0; +} gcc41-gnuc-rh-release.patch: --- NEW FILE gcc41-gnuc-rh-release.patch --- 2004-10-19 Jakub Jelinek * c-cppbuiltin.c (define__GNUC__): Also define __GNUC_RH_RELEASE__. --- gcc/c-cppbuiltin.c.jj 2004-10-07 21:27:38.000000000 +0200 +++ gcc/c-cppbuiltin.c 2004-10-19 11:41:50.000000000 +0200 @@ -257,13 +257,13 @@ define__GNUC__ (void) { /* The format of the version string, enforced below, is ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)? */ - const char *q, *v = version_string; + const char *q, *v = version_string, *vstart, *vend; while (*v && !ISDIGIT (*v)) v++; gcc_assert (*v && (v <= version_string || v[-1] == '-')); - q = v; + vstart = q = v; while (ISDIGIT (*v)) v++; builtin_define_with_value_n ("__GNUC__", q, v - q); @@ -289,6 +289,27 @@ define__GNUC__ (void) builtin_define_with_value_n ("__GNUC_PATCHLEVEL__", "0", 1); gcc_assert (!*v || *v == ' ' || *v == '-'); + + vend = v; + v = strchr (v, '('); + if (v != NULL && strncmp (v + 1, "Red Hat ", 8) == 0) + { + v += 9; + if (strncmp (v, "Linux ", 6) == 0) + v += 6; + + gcc_assert (strncmp (v, vstart, vend - vstart) == 0); + gcc_assert (v[vend - vstart] == '-'); + + v += vend - vstart + 1; + q = v; + gcc_assert (ISDIGIT (*v)); + while (ISDIGIT (*v)) + v++; + builtin_define_with_value_n ("__GNUC_RH_RELEASE__", q, v - q); + + gcc_assert (!*v || *v == ')' || *v == '.'); + } } /* Define macros used by . Currently only defines limits gcc41-ia64-libunwind.patch: --- NEW FILE gcc41-ia64-libunwind.patch --- 2004-11-27 Jakub Jelinek * config.gcc (ia64*-*-linux*): If native and libelf is installed, use ia64/t-glibc-no-libunwind instead of the other t-*unwind* fragments. * config/ia64/t-glibc-no-libunwind: New file. * config/ia64/change-symver.c: New file. * config/ia64/unwind-ia64.c: If USE_SYMVER_GLOBAL and SHARED, define _Unwind_* to __symverglobal_Unwind_*. (alias): Undefine. (symverglobal): Define. Use it on _Unwind_*. * config/ia64/mkmap-symver-multi.awk: New file. * config/ia64/libgcc-ia64-no-libunwind.ver: New file. --- gcc/config.gcc.jj 2004-10-04 08:55:44.000000000 -0400 +++ gcc/config.gcc 2004-11-13 05:23:50.000000000 -0500 @@ -1185,9 +1185,16 @@ ia64*-*-freebsd*) ;; ia64*-*-linux*) tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h" - tmake_file="${tmake_file} ia64/t-ia64 t-libunwind ia64/t-glibc" - if test x$with_system_libunwind != xyes ; then - tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind" + tmake_file="${tmake_file} ia64/t-ia64" + if test x${target} = x${host} && test x${target} = x${build} \ + && grep gelf_getverdef /usr/include/gelf.h > /dev/null 2>&1 \ + && test -f /usr/lib/libelf.so; then + tmake_file="${tmake_file} ia64/t-glibc-no-libunwind" + else + tmake_file="${tmake_file} t-libunwind ia64/t-glibc" + if test x$with_system_libunwind != xyes ; then + tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind" + fi fi target_cpu_default="MASK_GNU_AS|MASK_GNU_LD" extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o" --- gcc/config/ia64/t-glibc-no-libunwind.jj 2004-02-18 10:27:36.000000000 -0500 +++ gcc/config/ia64/t-glibc-no-libunwind 2004-11-15 09:56:33.000000000 -0500 @@ -0,0 +1,30 @@ +# Don't use system libunwind library on IA-64 GLIBC based system, +# but make _Unwind_* symbols unversioned, so that created programs +# are usable even when libgcc_s uses libunwind. +LIB2ADDEH += $(srcdir)/config/ia64/fde-glibc.c +SHLIB_MAPFILES += $(srcdir)/config/ia64/libgcc-ia64-no-libunwind.ver +SHLIB_MKMAP = $(srcdir)/config/ia64/mkmap-symver-multi.awk + +SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ + -Wl,--soname=$(SHLIB_SONAME) \ + -Wl,--version-script=$(SHLIB_MAP) \ + -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \ + rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \ + if [ -f $(SHLIB_DIR)/$(SHLIB_SONAME) ]; then \ + mv -f $(SHLIB_DIR)/$(SHLIB_SONAME) \ + $(SHLIB_DIR)/$(SHLIB_SONAME).backup; \ + else true; fi && \ + gcc -O2 -o $(SHLIB_DIR)/$(SHLIB_SONAME).tweak \ + $(srcdir)/config/ia64/change-symver.c -lelf && \ + $(SHLIB_DIR)/$(SHLIB_SONAME).tweak $(SHLIB_DIR)/$(SHLIB_SONAME).tmp \ + GCC_3.4.2 _GLOBAL_ \ + _Unwind_GetGR _Unwind_RaiseException _Unwind_GetRegionStart _Unwind_SetIP \ + _Unwind_GetIP _Unwind_GetLanguageSpecificData _Unwind_Resume \ + _Unwind_DeleteException _Unwind_SetGR _Unwind_ForcedUnwind \ + _Unwind_Backtrace _Unwind_FindEnclosingFunction _Unwind_GetCFA \ + _Unwind_Resume_or_Rethrow _Unwind_GetBSP && \ + rm -f $(SHLIB_DIR)/$(SHLIB_SONAME).tweak && \ + mv $(SHLIB_DIR)/$(SHLIB_SONAME).tmp $(SHLIB_DIR)/$(SHLIB_SONAME) && \ + $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK) + +TARGET_LIBGCC2_CFLAGS += -DUSE_SYMVER_GLOBAL --- gcc/config/ia64/change-symver.c.jj 2004-02-18 10:27:36.000000000 -0500 +++ gcc/config/ia64/change-symver.c 2004-11-13 05:23:50.000000000 -0500 @@ -0,0 +1,211 @@ +#define _GNU_SOURCE 1 +#define _FILE_OFFSET_BITS 64 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int +compute_veridx (const char *name, Elf *elf, Elf_Data *verd, GElf_Shdr *verd_shdr) +{ + if (strcmp (name, "_GLOBAL_") == 0) + return 1; + + int cnt; + size_t offset = 0; + for (cnt = verd_shdr->sh_info; --cnt >= 0; ) + { + GElf_Verdef defmem; + GElf_Verdef *def; + GElf_Verdaux auxmem; + GElf_Verdaux *aux; + unsigned int auxoffset; + + /* Get the data at the next offset. */ + def = gelf_getverdef (verd, offset, &defmem); + if (def == NULL) + break; + + auxoffset = offset + def->vd_aux; + aux = gelf_getverdaux (verd, auxoffset, &auxmem); + if (aux == NULL) + break; + + if (strcmp (name, elf_strptr (elf, verd_shdr->sh_link, + aux->vda_name)) == 0) + return def->vd_ndx; + + /* Find the next offset. */ + offset += def->vd_next; + } + + return -1; +} + +int +main (int argc, char **argv) +{ + if (argc < 4) + error (1, 0, "Usage: change_symver library from_symver to_symver symbol...\nExample: change_symver libfoo.so FOO_1.0 *global* bar baz"); + + const char *fname = argv[1]; + + /* Open the file. */ + int fd; + fd = open (fname, O_RDWR); + if (fd == -1) + error (1, errno, fname); + + elf_version (EV_CURRENT); + + /* Now get the ELF descriptor. */ + Elf *elf = elf_begin (fd, ELF_C_READ_MMAP, NULL); + if (elf == NULL || elf_kind (elf) != ELF_K_ELF) + error (1, 0, "Couldn't open %s: %s", fname, elf_errmsg (-1)); + + size_t shstrndx; + /* Get the section header string table index. */ + if (elf_getshstrndx (elf, &shstrndx) < 0) + error (1, 0, "cannot get shstrndx from %s", fname); + + GElf_Ehdr ehdr_mem; + GElf_Ehdr *ehdr; + + /* We need the ELF header in a few places. */ + ehdr = gelf_getehdr (elf, &ehdr_mem); + if (ehdr == NULL) + error (1, 0, "couldn't get ELF headers %s: %s", fname, elf_errmsg (-1)); + + Elf_Scn *scn = NULL; + GElf_Shdr shdr_mem, verd_shdr, ver_shdr, dynsym_shdr; + Elf_Data *ver = NULL, *verd = NULL, *dynsym = NULL; + + while ((scn = elf_nextscn (elf, scn)) != NULL) + { + GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem); + + if (shdr == NULL) + error (1, 0, "couldn't get shdr from %s", fname); + + if ((shdr->sh_flags & SHF_ALLOC) != 0) + { + const char *name = elf_strptr (elf, shstrndx, shdr->sh_name); + Elf_Data **p; + + if (strcmp (name, ".gnu.version") == 0) + { + p = &ver; + ver_shdr = *shdr; + } + else if (strcmp (name, ".gnu.version_d") == 0) + { + p = &verd; + verd_shdr = *shdr; + } + else if (strcmp (name, ".dynsym") == 0) + { + p = &dynsym; + dynsym_shdr = *shdr; + } + else + continue; + + if (*p != NULL) + error (1, 0, "Two %s sections in %s", name, fname); + *p = elf_getdata (scn, NULL); + if (*p == NULL || elf_getdata (scn, *p) != NULL) + error (1, 0, "No data or non-contiguous data in %s section in %s", + name, fname); + } + } + + if (ver == NULL || verd == NULL || dynsym == NULL) + error (1, 0, "Couldn't find one of the needed sections in %s", fname); + + int from_idx = compute_veridx (argv[2], elf, verd, &verd_shdr); + if (from_idx == -1) + error (1, 0, "Could not find symbol version %s in %s", argv[2], fname); + + int to_idx = compute_veridx (argv[3], elf, verd, &verd_shdr); + if (to_idx == -1) + error (1, 0, "Could not find symbol version %s in %s", argv[3], fname); + + if (dynsym_shdr.sh_entsize != gelf_fsize (elf, ELF_T_SYM, 1, ehdr->e_version) + || dynsym_shdr.sh_size % dynsym_shdr.sh_entsize + || ver_shdr.sh_entsize != 2 + || (ver_shdr.sh_size & 1) + || dynsym_shdr.sh_size / dynsym_shdr.sh_entsize != ver_shdr.sh_size / 2) + error (1, 0, "Unexpected sh_size or sh_entsize in %s", fname); + + size_t nentries = ver_shdr.sh_size / 2; + size_t cnt; + GElf_Versym array[nentries]; + for (cnt = 0; cnt < nentries; ++cnt) + { + GElf_Versym vsymmem; + GElf_Versym *vsym; + + vsym = gelf_getversym (ver, cnt, &vsymmem); + if (vsym == NULL) + error (1, 0, "gelt_getversym failed in %s: %s", fname, elf_errmsg (-1)); + + array[cnt] = *vsym; + if (*vsym != from_idx) + continue; + + GElf_Sym sym_mem; + GElf_Sym *sym; + sym = gelf_getsym (dynsym, cnt, &sym_mem); + if (sym == NULL) + error (1, 0, "gelt_getsym failed in %s: %s", fname, elf_errmsg (-1)); + + const char *name = elf_strptr (elf, dynsym_shdr.sh_link, sym->st_name); + + int argn; + for (argn = 4; argn < argc; ++argn) + if (fnmatch (argv[argn], name, 0) == 0) + { + array[cnt] = to_idx; + break; + } + } + + if (sizeof (array[0]) != 2) + abort (); + +#if __BYTE_ORDER == __LITTLE_ENDIAN + if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) + ; + else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) +#elif __BYTE_ORDER == __BIG_ENDIAN + if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) + ; + else if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) +#else +# error Unsupported endianity +#endif + { + for (cnt = 0; cnt < nentries; ++cnt) + array[cnt] = ((array[cnt] & 0xff) << 8) | ((array[cnt] & 0xff00) >> 8); + } + else + error (1, 0, "Unknown EI_DATA %d in %s", ehdr->e_ident[EI_DATA], fname); + + if (elf_end (elf) != 0) + error (1, 0, "couldn't close %s: %s", fname, elf_errmsg (-1)); + + if (lseek (fd, ver_shdr.sh_offset, SEEK_SET) != (off_t) ver_shdr.sh_offset) + error (1, 0, "failed to seek to %zd in %s", (size_t) ver_shdr.sh_offset, + fname); + + if (write (fd, array, 2 * nentries) != (ssize_t) (2 * nentries)) + error (1, 0, "failed to write .gnu.version section into %s", fname); + + close (fd); + return 0; +} --- gcc/config/ia64/unwind-ia64.c.jj 2004-10-04 08:55:57.000000000 -0400 +++ gcc/config/ia64/unwind-ia64.c 2004-11-15 09:07:45.000000000 -0500 @@ -51,6 +51,51 @@ #define UNW_FLAG_UHANDLER(x) ((x) & 0x0000000200000000L) #define UNW_LENGTH(x) ((x) & 0x00000000ffffffffL) +#if defined (USE_SYMVER_GLOBAL) && defined (SHARED) +extern _Unwind_Reason_Code __symverglobal_Unwind_Backtrace + (_Unwind_Trace_Fn, void *); +extern void __symverglobal_Unwind_DeleteException + (struct _Unwind_Exception *); +extern void * __symverglobal_Unwind_FindEnclosingFunction (void *); +extern _Unwind_Reason_Code __symverglobal_Unwind_ForcedUnwind + (struct _Unwind_Exception *, _Unwind_Stop_Fn, void *); +extern _Unwind_Word __symverglobal_Unwind_GetCFA + (struct _Unwind_Context *); +extern _Unwind_Word __symverglobal_Unwind_GetBSP + (struct _Unwind_Context *); +extern _Unwind_Word __symverglobal_Unwind_GetGR + (struct _Unwind_Context *, int ); +extern _Unwind_Ptr __symverglobal_Unwind_GetIP (struct _Unwind_Context *); +extern void *__symverglobal_Unwind_GetLanguageSpecificData + (struct _Unwind_Context *); +extern _Unwind_Ptr __symverglobal_Unwind_GetRegionStart + (struct _Unwind_Context *); +extern _Unwind_Reason_Code __symverglobal_Unwind_RaiseException + (struct _Unwind_Exception *); +extern void __symverglobal_Unwind_Resume (struct _Unwind_Exception *); +extern _Unwind_Reason_Code __symverglobal_Unwind_Resume_or_Rethrow + (struct _Unwind_Exception *); +extern void __symverglobal_Unwind_SetGR + (struct _Unwind_Context *, int, _Unwind_Word); +extern void __symverglobal_Unwind_SetIP + (struct _Unwind_Context *, _Unwind_Ptr); +#define _Unwind_Backtrace __symverglobal_Unwind_Backtrace +#define _Unwind_DeleteException __symverglobal_Unwind_DeleteException +#define _Unwind_FindEnclosingFunction __symverglobal_Unwind_FindEnclosingFunction +#define _Unwind_ForcedUnwind __symverglobal_Unwind_ForcedUnwind +#define _Unwind_GetBSP __symverglobal_Unwind_GetBSP +#define _Unwind_GetCFA __symverglobal_Unwind_GetCFA +#define _Unwind_GetGR __symverglobal_Unwind_GetGR +#define _Unwind_GetIP __symverglobal_Unwind_GetIP +#define _Unwind_GetLanguageSpecificData __symverglobal_Unwind_GetLanguageSpecificData +#define _Unwind_GetRegionStart __symverglobal_Unwind_GetRegionStart +#define _Unwind_RaiseException __symverglobal_Unwind_RaiseException +#define _Unwind_Resume __symverglobal_Unwind_Resume +#define _Unwind_Resume_or_Rethrow __symverglobal_Unwind_Resume_or_Rethrow +#define _Unwind_SetGR __symverglobal_Unwind_SetGR +#define _Unwind_SetIP __symverglobal_Unwind_SetIP +#endif + enum unw_application_register { UNW_AR_BSP, @@ -2402,4 +2447,44 @@ alias (_Unwind_SetGR); alias (_Unwind_SetIP); #endif +#if defined (USE_SYMVER_GLOBAL) && defined (SHARED) +#undef alias +#define symverglobal(name, version) \ +__typeof (__symverglobal##name) __symverlocal##name \ + __attribute__ ((alias ("__symverglobal" #name))); \ +__asm__ (".symver __symverglobal" #name"," #name "@@GCC_3.4.2");\ +__asm__ (".symver __symverlocal" #name"," #name "@" #version) + +#undef _Unwind_Backtrace +#undef _Unwind_DeleteException +#undef _Unwind_FindEnclosingFunction +#undef _Unwind_ForcedUnwind +#undef _Unwind_GetBSP +#undef _Unwind_GetCFA +#undef _Unwind_GetGR +#undef _Unwind_GetIP +#undef _Unwind_GetLanguageSpecificData +#undef _Unwind_GetRegionStart +#undef _Unwind_RaiseException +#undef _Unwind_Resume +#undef _Unwind_Resume_or_Rethrow +#undef _Unwind_SetGR +#undef _Unwind_SetIP +symverglobal (_Unwind_Backtrace, GCC_3.3); +symverglobal (_Unwind_DeleteException, GCC_3.0); +symverglobal (_Unwind_FindEnclosingFunction, GCC_3.3); +symverglobal (_Unwind_ForcedUnwind, GCC_3.0); +symverglobal (_Unwind_GetBSP, GCC_3.3.2); +symverglobal (_Unwind_GetCFA, GCC_3.3); +symverglobal (_Unwind_GetGR, GCC_3.0); +symverglobal (_Unwind_GetIP, GCC_3.0); +symverglobal (_Unwind_GetLanguageSpecificData, GCC_3.0); +symverglobal (_Unwind_GetRegionStart, GCC_3.0); +symverglobal (_Unwind_RaiseException, GCC_3.0); +symverglobal (_Unwind_Resume, GCC_3.0); +symverglobal (_Unwind_Resume_or_Rethrow, GCC_3.3); +symverglobal (_Unwind_SetGR, GCC_3.0); +symverglobal (_Unwind_SetIP, GCC_3.0); +#endif + #endif --- gcc/config/ia64/mkmap-symver-multi.awk.jj 2004-02-18 10:27:36.000000000 -0500 +++ gcc/config/ia64/mkmap-symver-multi.awk 2004-11-15 09:46:50.000000000 -0500 @@ -0,0 +1,133 @@ +# Generate an ELF symbol version map a-la Solaris and GNU ld. +# Contributed by Richard Henderson +# +# This file is part of GCC. +# +# GCC 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, or (at your option) any later +# version. +# +# GCC 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 GCC; see the file COPYING. If not, write to the Free +# Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +BEGIN { + state = "nm"; + sawsymbol = 0; +} + +# Remove comment and blank lines. +/^ *#/ || /^ *$/ { + next; +} + +# We begin with nm input. Collect the set of symbols that are present +# so that we can not emit them into the final version script -- Solaris +# complains at us if we do. + +state == "nm" && /^%%/ { + state = "ver"; + next; +} + +state == "nm" && ($1 == "U" || $2 == "U") { + next; +} + +state == "nm" && NF == 3 { + if ($3 ~ /^[^@]*@GCC_[0-9.]*$/) { + def[$3] = 1 + tl=$3 + sub(/^.*@/,"",tl) + ver[$3] = tl + } else { + sub(/@@?GCC_[0-9.]*$/,"",$3) + def[$3] = 1; + } + sawsymbol = 1; + next; +} + +state == "nm" { + next; +} + +# Now we process a simplified variant of the Solaris symbol version +# script. We have one symbol per line, no semicolons, simple markers +# for beginning and ending each section, and %inherit markers for +# describing version inheritence. A symbol may appear in more than +# one symbol version, and the last seen takes effect. + +NF == 3 && $1 == "%inherit" { + inherit[$2] = $3; + next; +} + +NF == 2 && $2 == "{" { + libs[$1] = 1; + thislib = $1; + next; +} + +$1 == "}" { + thislib = ""; + next; +} + +{ + ver[$1] = thislib; + next; +} + +END { + if (!sawsymbol) + { + print "No symbols seen -- broken or mis-installed nm?" | "cat 1>&2"; + exit 1; + } + for (l in libs) + output(l); +} + +function output(lib) { + if (done[lib]) + return; + done[lib] = 1; + if (inherit[lib]) + output(inherit[lib]); + + empty=1 + for (sym in ver) + if ((ver[sym] == lib) && (sym in def)) + { + if (empty) + { + printf("%s {\n", lib); + printf(" global:\n"); + empty = 0; + } + symp = sym; + sub(/@GCC_[0-9.]*$/,"",symp); + printf("\t%s;\n", symp); + if (dotsyms) + printf("\t.%s;\n", symp); + } + + if (empty) + { + for (l in libs) + if (inherit[l] == lib) + inherit[l] = inherit[lib]; + } + else if (inherit[lib]) + printf("} %s;\n", inherit[lib]); + else + printf ("\n local:\n\t*;\n};\n"); +} --- gcc/config/ia64/libgcc-ia64-no-libunwind.ver.jj 2004-02-18 10:27:36.000000000 -0500 +++ gcc/config/ia64/libgcc-ia64-no-libunwind.ver 2004-11-15 09:19:56.000000000 -0500 @@ -0,0 +1,17 @@ +GCC_3.4.2 { + _Unwind_GetGR + _Unwind_RaiseException + _Unwind_GetRegionStart + _Unwind_SetIP + _Unwind_GetIP + _Unwind_GetLanguageSpecificData + _Unwind_Resume + _Unwind_DeleteException + _Unwind_SetGR + _Unwind_ForcedUnwind + _Unwind_Backtrace + _Unwind_FindEnclosingFunction + _Unwind_GetCFA + _Unwind_Resume_or_Rethrow + _Unwind_GetBSP +} gcc41-ice-hack.patch: --- NEW FILE gcc41-ice-hack.patch --- 2004-01-23 Jakub Jelinek * system.h (ICE_EXIT_CODE): Define. * gcc.c (execute): Don't free first string early, but at the end of the function. Call retry_ice if compiler exited with ICE_EXIT_CODE. (retry_ice): New function. * diagnostic.c (diagnostic_count_diagnostic, diagnostic_action_after_output, error_recursion): Exit with ICE_EXIT_CODE instead of FATAL_EXIT_CODE. --- gcc/system.h.jj 2004-01-19 17:29:30.000000000 +0100 +++ gcc/system.h 2004-01-21 11:53:41.000000000 +0100 @@ -153,6 +153,10 @@ extern int errno; # endif #endif +#ifndef ICE_EXIT_CODE +# define ICE_EXIT_CODE 27 +#endif + #ifdef HAVE_UNISTD_H # include #endif --- gcc/gcc.c.jj 2004-01-21 11:45:20.000000000 +0100 +++ gcc/gcc.c 2004-01-21 11:56:46.000000000 +0100 @@ -346,6 +346,9 @@ static void init_gcc_specs (struct obsta #if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX) static const char *convert_filename (const char *, int, int); #endif +#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS)) +static void retry_ice (const char *prog, const char **argv); +#endif static const char *if_exists_spec_function (int, const char **); static const char *if_exists_else_spec_function (int, const char **); @@ -2841,7 +2844,7 @@ execute (void) } } - if (string != commands[i].prog) + if (i && string != commands[i].prog) free ((void *) string); } @@ -2897,6 +2900,16 @@ See %s for instructions.", else if (WIFEXITED (status) && WEXITSTATUS (status) >= MIN_FATAL_STATUS) { +#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS)) + /* For ICEs in cc1, cc1obj, cc1plus see if it is + reproducible or not. */ + char *p; + if (WEXITSTATUS (status) == ICE_EXIT_CODE + && i == 0 + && (p = strrchr (commands[0].argv[0], DIR_SEPARATOR)) + && ! strncmp (p + 1, "cc1", 3)) + retry_ice (commands[0].prog, commands[0].argv); +#endif if (WEXITSTATUS (status) > greatest_status) greatest_status = WEXITSTATUS (status); ret_code = -1; @@ -2917,6 +2930,9 @@ See %s for instructions.", } } + if (commands[0].argv[0] != commands[0].prog) + free ((PTR) commands[0].argv[0]); + return ret_code; } } @@ -5898,6 +5914,224 @@ give_switch (int switchnum, int omit_fir switches[switchnum].validated = 1; } +#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS)) +#define RETRY_ICE_ATTEMPTS 2 + +static void +retry_ice (const char *prog, const char **argv) +{ + int nargs, out_arg = -1, quiet = 0, attempt; + int pid, retries, sleep_interval; + const char **new_argv; + char *temp_filenames[RETRY_ICE_ATTEMPTS * 2 + 2]; + + if (input_filename == NULL || ! strcmp (input_filename, "-")) + return; + + for (nargs = 0; argv[nargs] != NULL; ++nargs) + /* Only retry compiler ICEs, not preprocessor ones. */ + if (! strcmp (argv[nargs], "-E")) + return; + else if (argv[nargs][0] == '-' && argv[nargs][1] == 'o') + { + if (out_arg == -1) + out_arg = nargs; + else + return; + } + /* If the compiler is going to output any time information, + it might varry between invocations. */ + else if (! strcmp (argv[nargs], "-quiet")) + quiet = 1; + else if (! strcmp (argv[nargs], "-ftime-report")) + return; + + if (out_arg == -1 || !quiet) + return; + + memset (temp_filenames, '\0', sizeof (temp_filenames)); + new_argv = alloca ((nargs + 3) * sizeof (const char *)); + memcpy (new_argv, argv, (nargs + 1) * sizeof (const char *)); + new_argv[nargs++] = "-frandom-seed=0"; + new_argv[nargs] = NULL; + if (new_argv[out_arg][2] == '\0') + new_argv[out_arg + 1] = "-"; + else + new_argv[out_arg] = "-o-"; + + for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS + 1; ++attempt) + { + int fd = -1; + int status; + + temp_filenames[attempt * 2] = make_temp_file (".out"); + temp_filenames[attempt * 2 + 1] = make_temp_file (".err"); + + if (attempt == RETRY_ICE_ATTEMPTS) + { + int i; + int fd1, fd2; + struct stat st1, st2; + size_t n, len; + char *buf; + + buf = xmalloc (8192); + + for (i = 0; i < 2; ++i) + { + fd1 = open (temp_filenames[i], O_RDONLY); + fd2 = open (temp_filenames[2 + i], O_RDONLY); + + if (fd1 < 0 || fd2 < 0) + { + i = -1; + close (fd1); + close (fd2); + break; + } + + if (fstat (fd1, &st1) < 0 || fstat (fd2, &st2) < 0) + { + i = -1; + close (fd1); + close (fd2); + break; + } + + if (st1.st_size != st2.st_size) + { + close (fd1); + close (fd2); + break; + } + + len = 0; + for (n = st1.st_size; n; n -= len) + { + len = n; + if (len > 4096) + len = 4096; + + if (read (fd1, buf, len) != (int) len + || read (fd2, buf + 4096, len) != (int) len) + { + i = -1; + break; + } + + if (memcmp (buf, buf + 4096, len) != 0) + break; + } + + close (fd1); + close (fd2); + + if (n) + break; + } + + free (buf); + if (i == -1) + break; + + if (i != 2) + { + notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n"); + break; + } + + fd = open (temp_filenames[attempt * 2], O_RDWR); + if (fd < 0) + break; + write (fd, "//", 2); + for (i = 0; i < nargs; i++) + { + write (fd, " ", 1); + write (fd, new_argv[i], strlen (new_argv[i])); + } + write (fd, "\n", 1); + new_argv[nargs] = "-E"; + new_argv[nargs + 1] = NULL; + } + + /* Fork a subprocess; wait and retry if it fails. */ + sleep_interval = 1; + pid = -1; + for (retries = 0; retries < 4; retries++) + { + pid = fork (); + if (pid >= 0) + break; + sleep (sleep_interval); + sleep_interval *= 2; + } + + if (pid < 0) + break; + else if (pid == 0) + { + if (attempt != RETRY_ICE_ATTEMPTS) + fd = open (temp_filenames[attempt * 2], O_RDWR); + if (fd < 0) + exit (-1); + if (fd != 1) + { + close (1); + dup (fd); + close (fd); + } + + fd = open (temp_filenames[attempt * 2 + 1], O_RDWR); + if (fd < 0) + exit (-1); + if (fd != 2) + { + close (2); + dup (fd); + close (fd); + } + + if (prog == new_argv[0]) + execvp (prog, (char *const *) new_argv); + else + execv (new_argv[0], (char *const *) new_argv); + exit (-1); + } + + if (waitpid (pid, &status, 0) < 0) + break; + + if (attempt < RETRY_ICE_ATTEMPTS + && (! WIFEXITED (status) || WEXITSTATUS (status) != ICE_EXIT_CODE)) + { + notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n"); + break; + } + else if (attempt == RETRY_ICE_ATTEMPTS) + { + close (fd); + if (WIFEXITED (status) + && WEXITSTATUS (status) == SUCCESS_EXIT_CODE) + { + notice ("Preprocessed source stored into %s file, please attach this to your bugreport.\n", + temp_filenames[attempt * 2]); + /* Make sure it is not deleted. */ + free (temp_filenames[attempt * 2]); + temp_filenames[attempt * 2] = NULL; + break; + } + } + } + + for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS * 2 + 2; attempt++) + if (temp_filenames[attempt]) + { + unlink (temp_filenames[attempt]); + free (temp_filenames[attempt]); + } +} +#endif + /* Search for a file named NAME trying various prefixes including the user's -B prefix and some standard ones. Return the absolute file name found. If nothing is found, return NAME. */ --- gcc/diagnostic.c.jj 2003-10-01 12:09:21.000000000 +0200 +++ gcc/diagnostic.c 2004-01-21 11:54:47.000000000 +0100 @@ -237,14 +237,14 @@ diagnostic_action_after_output (diagnost fnotice (stderr, "Please submit a full bug report,\n" "with preprocessed source if appropriate.\n" "See %s for instructions.\n", bug_report_url); - exit (FATAL_EXIT_CODE); + exit (ICE_EXIT_CODE); case DK_FATAL: if (context->abort_on_error) real_abort (); fnotice (stderr, "compilation terminated.\n"); - exit (FATAL_EXIT_CODE); + exit (ICE_EXIT_CODE); default: gcc_unreachable (); gcc41-java-nomulti.patch: --- NEW FILE gcc41-java-nomulti.patch --- --- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200 +++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200 @@ -367,6 +367,10 @@ use_gtk_awt="" TOOLKIT= AC_SUBST(TOOLKIT) +if test -n "${with_multisubdir}"; then + peerlibs=no +fi + for peer in $peerlibs ; do case $peer in xlib) --- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200 +++ libjava/configure 2004-08-21 11:45:16.260738060 +0200 @@ -4118,6 +4118,9 @@ use_gtk_awt="" # The default toolkit to use is the first one specified. TOOLKIT= +if test -n "${with_multisubdir}"; then + peerlibs=no +fi for peer in $peerlibs ; do case $peer in gcc41-java-slow_pthread_self.patch: --- NEW FILE gcc41-java-slow_pthread_self.patch --- 2005-05-20 Jakub Jelinek * configure.host (slow_pthread_self): Set to empty unconditionally on Linux targets. --- libjava/configure.host (.../gcc-4_0-branch) (revision 107266) +++ libjava/configure.host (.../redhat/gcc-4_0-branch) (revision 107414) @@ -174,6 +174,7 @@ sh-linux* | sh[34]*-linux*) can_unwind_signal=yes libgcj_ld_symbolic='-Wl,-Bsymbolic' + slow_pthread_self= if test x$slow_pthread_self = xyes \ && test x$cross_compiling != xyes; then cat > conftest.c < * config.gcc (i[34567]86-*-*): Add tmmintrin.h to extra_headers. (x86_64-*-*): Likewise. * config/i386/i386.c (pta_flags): Add PTA_MNI. (override_options): Check MNI. (ix86_builtins): Add IX86_BUILTIN_PHADDW, IX86_BUILTIN_PHADDD, IX86_BUILTIN_PHADDSW, IX86_BUILTIN_PHSUBW, IX86_BUILTIN_PHSUBD, IX86_BUILTIN_PHSUBSW, IX86_BUILTIN_PMADDUBSW, IX86_BUILTIN_PMULHRSW, IX86_BUILTIN_PSHUFB, IX86_BUILTIN_PSIGNB, IX86_BUILTIN_PSIGNW, IX86_BUILTIN_PSIGND, IX86_BUILTIN_PALIGNR, IX86_BUILTIN_PABSB, IX86_BUILTIN_PABSW, IX86_BUILTIN_PABSD, IX86_BUILTIN_PHADDW128, IX86_BUILTIN_PHADDD128, IX86_BUILTIN_PHADDSW128, IX86_BUILTIN_PHSUBW128, IX86_BUILTIN_PHSUBD128, IX86_BUILTIN_PHSUBSW128, IX86_BUILTIN_PMADDUBSW128, IX86_BUILTIN_PMULHRSW128, IX86_BUILTIN_PSHUFB128, IX86_BUILTIN_PSIGNB128, IX86_BUILTIN_PSIGNW128, IX86_BUILTIN_PSIGND128, IX86_BUILTIN_PALIGNR128, IX86_BUILTIN_PABSB128, IX86_BUILTIN_PABSW128 and IX86_BUILTIN_PABSD128. (bdesc_2arg): Add MNI. (bdesc_1arg): Likewise. (ix86_init_mmx_sse_builtins): Support MNI. (ix86_expand_builtin): Likewise. * config/i386/i386.h (TARGET_CPU_CPP_BUILTINS): Likewise. * config/i386/i386.md (UNSPEC_LDQQU): Renamed to ... (UNSPEC_LDDQU): This. (UNSPEC_PSHUFB): New. (UNSPEC_PSIGN): Likewise. (UNSPEC_PALIGNR): Likewise. Include mmx.md before sse.md. * config/i386/i386.opt: Add -mmni. * config/i386/sse.md (sse3_lddqu): Updated. (mni_phaddwv8hi3): New pattern for MNI. (mni_phaddwv4hi3): Likewise. (mni_phadddv4si3): Likewise. (mni_phadddv2si3): Likewise. (mni_phaddswv8hi3): Likewise. (mni_phaddswv4hi3): Likewise. (mni_phsubwv8hi3): Likewise. (mni_phsubwv4hi3): Likewise. (mni_phsubdv4si3): Likewise. (mni_phsubdv2si3): Likewise. (mni_phsubswv8hi3): Likewise. (mni_phsubswv4hi3): Likewise. (mni_pmaddubswv8hi3): Likewise. (mni_pmaddubswv4hi3): Likewise. (mni_pmulhrswv8hi3): Likewise. (mni_pmulhrswv4hi3): Likewise. (mni_pshufbv16qi3): Likewise. (mni_pshufbv8qi3): Likewise. (mni_psign3): Likewise. (mni_psign3): Likewise. (mni_palignrti): Likewise. (mni_palignrdi): Likewise. (mni_pabs2): Likewise. (mni_pabs2): Likewise. * config/i386/tmmintrin.h: New file. * doc/extend.texi: Document MNI built-in functions. * doc/invoke.texi: Document -mmni/-mno-mni switches. --- gcc/config.gcc.mni 2006-02-14 13:18:08.000000000 -0800 +++ gcc/config.gcc 2006-02-24 13:39:19.000000000 -0800 @@ -263,11 +263,13 @@ xscale-*-*) ;; i[34567]86-*-*) cpu_type=i386 - extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h pmmintrin.h" + extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h + pmmintrin.h tmmintrin.h" ;; x86_64-*-*) cpu_type=i386 - extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h pmmintrin.h" + extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h + pmmintrin.h tmmintrin.h" need_64bit_hwint=yes ;; ia64-*-*) --- gcc/config/i386/i386.c.mni 2006-02-24 13:39:19.000000000 -0800 +++ gcc/config/i386/i386.c 2006-02-24 13:39:19.000000000 -0800 @@ -1446,11 +1446,12 @@ override_options (void) PTA_SSE = 1, PTA_SSE2 = 2, PTA_SSE3 = 4, - PTA_MMX = 8, - PTA_PREFETCH_SSE = 16, - PTA_3DNOW = 32, - PTA_3DNOW_A = 64, - PTA_64BIT = 128 + PTA_MNI = 8, + PTA_MMX = 16, + PTA_PREFETCH_SSE = 32, + PTA_3DNOW = 64, + PTA_3DNOW_A = 128, + PTA_64BIT = 256 } flags; } const processor_alias_table[] = @@ -1645,6 +1646,9 @@ override_options (void) if (processor_alias_table[i].flags & PTA_SSE3 && !(target_flags_explicit & MASK_SSE3)) target_flags |= MASK_SSE3; + if (processor_alias_table[i].flags & PTA_MNI + && !(target_flags_explicit & MASK_MNI)) + target_flags |= MASK_MNI; if (processor_alias_table[i].flags & PTA_PREFETCH_SSE) x86_prefetch_sse = true; if (TARGET_64BIT && !(processor_alias_table[i].flags & PTA_64BIT)) @@ -1836,6 +1840,10 @@ override_options (void) if (!TARGET_80387) target_flags |= MASK_NO_FANCY_MATH_387; + /* Turn on SSE3 builtins for -mmni. */ + if (TARGET_MNI) + target_flags |= MASK_SSE3; + /* Turn on SSE2 builtins for -msse3. */ if (TARGET_SSE3) target_flags |= MASK_SSE2; @@ -14147,6 +14155,41 @@ enum ix86_builtins IX86_BUILTIN_MONITOR, IX86_BUILTIN_MWAIT, + /* Merom New Instructions. */ + IX86_BUILTIN_PHADDW, + IX86_BUILTIN_PHADDD, + IX86_BUILTIN_PHADDSW, + IX86_BUILTIN_PHSUBW, + IX86_BUILTIN_PHSUBD, + IX86_BUILTIN_PHSUBSW, + IX86_BUILTIN_PMADDUBSW, + IX86_BUILTIN_PMULHRSW, + IX86_BUILTIN_PSHUFB, + IX86_BUILTIN_PSIGNB, + IX86_BUILTIN_PSIGNW, + IX86_BUILTIN_PSIGND, + IX86_BUILTIN_PALIGNR, + IX86_BUILTIN_PABSB, + IX86_BUILTIN_PABSW, + IX86_BUILTIN_PABSD, + + IX86_BUILTIN_PHADDW128, + IX86_BUILTIN_PHADDD128, + IX86_BUILTIN_PHADDSW128, + IX86_BUILTIN_PHSUBW128, + IX86_BUILTIN_PHSUBD128, + IX86_BUILTIN_PHSUBSW128, + IX86_BUILTIN_PMADDUBSW128, + IX86_BUILTIN_PMULHRSW128, + IX86_BUILTIN_PSHUFB128, + IX86_BUILTIN_PSIGNB128, + IX86_BUILTIN_PSIGNW128, + IX86_BUILTIN_PSIGND128, + IX86_BUILTIN_PALIGNR128, + IX86_BUILTIN_PABSB128, + IX86_BUILTIN_PABSW128, + IX86_BUILTIN_PABSD128, + IX86_BUILTIN_VEC_INIT_V2SI, IX86_BUILTIN_VEC_INIT_V4HI, IX86_BUILTIN_VEC_INIT_V8QI, @@ -14487,7 +14530,33 @@ static const struct builtin_description { MASK_SSE3, CODE_FOR_sse3_haddv4sf3, "__builtin_ia32_haddps", IX86_BUILTIN_HADDPS, 0, 0 }, { MASK_SSE3, CODE_FOR_sse3_haddv2df3, "__builtin_ia32_haddpd", IX86_BUILTIN_HADDPD, 0, 0 }, { MASK_SSE3, CODE_FOR_sse3_hsubv4sf3, "__builtin_ia32_hsubps", IX86_BUILTIN_HSUBPS, 0, 0 }, - { MASK_SSE3, CODE_FOR_sse3_hsubv2df3, "__builtin_ia32_hsubpd", IX86_BUILTIN_HSUBPD, 0, 0 } + { MASK_SSE3, CODE_FOR_sse3_hsubv2df3, "__builtin_ia32_hsubpd", IX86_BUILTIN_HSUBPD, 0, 0 }, + + /* MNI MMX */ + { MASK_MNI, CODE_FOR_mni_phaddwv8hi3, "__builtin_ia32_phaddw128", IX86_BUILTIN_PHADDW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phaddwv4hi3, "__builtin_ia32_phaddw", IX86_BUILTIN_PHADDW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phadddv4si3, "__builtin_ia32_phaddd128", IX86_BUILTIN_PHADDD128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phadddv2si3, "__builtin_ia32_phaddd", IX86_BUILTIN_PHADDD, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phaddswv8hi3, "__builtin_ia32_phaddsw128", IX86_BUILTIN_PHADDSW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phaddswv4hi3, "__builtin_ia32_phaddsw", IX86_BUILTIN_PHADDSW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubwv8hi3, "__builtin_ia32_phsubw128", IX86_BUILTIN_PHSUBW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubwv4hi3, "__builtin_ia32_phsubw", IX86_BUILTIN_PHSUBW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubdv4si3, "__builtin_ia32_phsubd128", IX86_BUILTIN_PHSUBD128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubdv2si3, "__builtin_ia32_phsubd", IX86_BUILTIN_PHSUBD, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubswv8hi3, "__builtin_ia32_phsubsw128", IX86_BUILTIN_PHSUBSW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubswv4hi3, "__builtin_ia32_phsubsw", IX86_BUILTIN_PHSUBSW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pmaddubswv8hi3, "__builtin_ia32_pmaddubsw128", IX86_BUILTIN_PMADDUBSW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pmaddubswv4hi3, "__builtin_ia32_pmaddubsw", IX86_BUILTIN_PMADDUBSW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pmulhrswv8hi3, "__builtin_ia32_pmulhrsw128", IX86_BUILTIN_PMULHRSW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pmulhrswv4hi3, "__builtin_ia32_pmulhrsw", IX86_BUILTIN_PMULHRSW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pshufbv16qi3, "__builtin_ia32_pshufb128", IX86_BUILTIN_PSHUFB128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pshufbv8qi3, "__builtin_ia32_pshufb", IX86_BUILTIN_PSHUFB, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv16qi3, "__builtin_ia32_psignb128", IX86_BUILTIN_PSIGNB128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv8qi3, "__builtin_ia32_psignb", IX86_BUILTIN_PSIGNB, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv8hi3, "__builtin_ia32_psignw128", IX86_BUILTIN_PSIGNW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv4hi3, "__builtin_ia32_psignw", IX86_BUILTIN_PSIGNW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv4si3, "__builtin_ia32_psignd128", IX86_BUILTIN_PSIGND128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv2si3, "__builtin_ia32_psignd", IX86_BUILTIN_PSIGND, 0, 0 } }; static const struct builtin_description bdesc_1arg[] = @@ -14532,8 +14601,16 @@ static const struct builtin_description { MASK_SSE2, CODE_FOR_sse2_cvttps2dq, 0, IX86_BUILTIN_CVTTPS2DQ, 0, 0 }, /* SSE3 */ - { MASK_SSE3, CODE_FOR_sse3_movshdup, 0, IX86_BUILTIN_MOVSHDUP, 0, 0 }, - { MASK_SSE3, CODE_FOR_sse3_movsldup, 0, IX86_BUILTIN_MOVSLDUP, 0, 0 }, + { MASK_SSE3, CODE_FOR_sse3_movshdup, "__builtin_ia32_movshdup", IX86_BUILTIN_MOVSHDUP, 0, 0 }, + { MASK_SSE3, CODE_FOR_sse3_movsldup, "__builtin_ia32_movsldup", IX86_BUILTIN_MOVSLDUP, 0, 0 }, + + /* MNI */ + { MASK_MNI, CODE_FOR_mni_pabsv16qi2, "__builtin_ia32_pabsb128", IX86_BUILTIN_PABSB128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pabsv8qi2, "__builtin_ia32_pabsb", IX86_BUILTIN_PABSB, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pabsv8hi2, "__builtin_ia32_pabsw128", IX86_BUILTIN_PABSW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pabsv4hi2, "__builtin_ia32_pabsw", IX86_BUILTIN_PABSW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pabsv4si2, "__builtin_ia32_pabsd128", IX86_BUILTIN_PABSD128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pabsv2si2, "__builtin_ia32_pabsd", IX86_BUILTIN_PABSD, 0, 0 } }; static void @@ -14678,6 +14755,16 @@ ix86_init_mmx_sse_builtins (void) /* Normal vector unops. */ tree v4sf_ftype_v4sf = build_function_type_list (V4SF_type_node, V4SF_type_node, NULL_TREE); + tree v16qi_ftype_v16qi + = build_function_type_list (V16QI_type_node, V16QI_type_node, NULL_TREE); + tree v8hi_ftype_v8hi + = build_function_type_list (V8HI_type_node, V8HI_type_node, NULL_TREE); + tree v4si_ftype_v4si + = build_function_type_list (V4SI_type_node, V4SI_type_node, NULL_TREE); + tree v8qi_ftype_v8qi + = build_function_type_list (V8QI_type_node, V8QI_type_node, NULL_TREE); + tree v4hi_ftype_v4hi + = build_function_type_list (V4HI_type_node, V4HI_type_node, NULL_TREE); /* Normal vector binops. */ tree v4sf_ftype_v4sf_v4sf @@ -14697,6 +14784,12 @@ ix86_init_mmx_sse_builtins (void) long_long_unsigned_type_node, long_long_unsigned_type_node, NULL_TREE); + tree di_ftype_di_di_int + = build_function_type_list (long_long_unsigned_type_node, + long_long_unsigned_type_node, + long_long_unsigned_type_node, + integer_type_node, NULL_TREE); + tree v2si_ftype_v2sf = build_function_type_list (V2SI_type_node, V2SF_type_node, NULL_TREE); tree v2sf_ftype_v2si @@ -14801,6 +14894,9 @@ ix86_init_mmx_sse_builtins (void) tree v2di_ftype_v2di_int = build_function_type_list (V2DI_type_node, V2DI_type_node, integer_type_node, NULL_TREE); + tree v2di_ftype_v2di_v2di_int + = build_function_type_list (V2DI_type_node, V2DI_type_node, + V2DI_type_node, integer_type_node, NULL_TREE); tree v4si_ftype_v4si_int = build_function_type_list (V4SI_type_node, V4SI_type_node, integer_type_node, NULL_TREE); @@ -14926,6 +15022,50 @@ ix86_init_mmx_sse_builtins (void) def_builtin (d->mask, d->name, type, d->code); } + /* Add all builtins that are more or less simple operations on 1 operand. */ + for (i = 0, d = bdesc_1arg; i < ARRAY_SIZE (bdesc_1arg); i++, d++) + { + enum machine_mode mode; + tree type; + + if (d->name == 0) + continue; + mode = insn_data[d->icode].operand[1].mode; + + switch (mode) + { + case V16QImode: + type = v16qi_ftype_v16qi; + break; + case V8HImode: + type = v8hi_ftype_v8hi; + break; + case V4SImode: + type = v4si_ftype_v4si; + break; + case V2DFmode: + type = v2df_ftype_v2df; + break; + case V4SFmode: + type = v4sf_ftype_v4sf; + break; + case V8QImode: + type = v8qi_ftype_v8qi; + break; + case V4HImode: + type = v4hi_ftype_v4hi; + break; + case V2SImode: + type = v2si_ftype_v2si; + break; + + default: + abort (); + } + + def_builtin (d->mask, d->name, type, d->code); + } + /* Add the remaining MMX insns with somewhat more complicated types. */ def_builtin (MASK_MMX, "__builtin_ia32_emms", void_ftype_void, IX86_BUILTIN_EMMS); def_builtin (MASK_MMX, "__builtin_ia32_psllw", v4hi_ftype_v4hi_di, IX86_BUILTIN_PSLLW); @@ -15128,15 +15268,15 @@ ix86_init_mmx_sse_builtins (void) void_ftype_unsigned_unsigned, IX86_BUILTIN_MWAIT); } - def_builtin (MASK_SSE3, "__builtin_ia32_movshdup", - v4sf_ftype_v4sf, - IX86_BUILTIN_MOVSHDUP); - def_builtin (MASK_SSE3, "__builtin_ia32_movsldup", - v4sf_ftype_v4sf, - IX86_BUILTIN_MOVSLDUP); def_builtin (MASK_SSE3, "__builtin_ia32_lddqu", v16qi_ftype_pcchar, IX86_BUILTIN_LDDQU); + /* Merom New Instructions. */ + def_builtin (MASK_MNI, "__builtin_ia32_palignr128", + v2di_ftype_v2di_v2di_int, IX86_BUILTIN_PALIGNR128); + def_builtin (MASK_MNI, "__builtin_ia32_palignr", di_ftype_di_di_int, + IX86_BUILTIN_PALIGNR); + /* Access to the vec_init patterns. */ ftype = build_function_type_list (V2SI_type_node, integer_type_node, integer_type_node, NULL_TREE); @@ -15627,7 +15767,7 @@ ix86_expand_builtin (tree exp, rtx targe tree arglist = TREE_OPERAND (exp, 1); tree arg0, arg1, arg2; rtx op0, op1, op2, pat; - enum machine_mode tmode, mode0, mode1, mode2; + enum machine_mode tmode, mode0, mode1, mode2, mode3; unsigned int fcode = DECL_FUNCTION_CODE (fndecl); switch (fcode) @@ -16004,6 +16144,52 @@ ix86_expand_builtin (tree exp, rtx targe return ix86_expand_unop_builtin (CODE_FOR_sse3_lddqu, arglist, target, 1); + case IX86_BUILTIN_PALIGNR: + case IX86_BUILTIN_PALIGNR128: + if (fcode == IX86_BUILTIN_PALIGNR) + { + icode = CODE_FOR_mni_palignrdi; + mode = DImode; + } + else + { + icode = CODE_FOR_mni_palignrti; + mode = V2DImode; + } + arg0 = TREE_VALUE (arglist); + arg1 = TREE_VALUE (TREE_CHAIN (arglist)); + arg2 = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist))); + op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0); + op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0); + op2 = expand_expr (arg2, NULL_RTX, VOIDmode, 0); + tmode = insn_data[icode].operand[0].mode; + mode1 = insn_data[icode].operand[1].mode; + mode2 = insn_data[icode].operand[2].mode; + mode3 = insn_data[icode].operand[3].mode; + + if (! (*insn_data[icode].operand[1].predicate) (op0, mode1)) + { + op0 = copy_to_reg (op0); + op0 = simplify_gen_subreg (mode1, op0, GET_MODE (op0), 0); + } + if (! (*insn_data[icode].operand[2].predicate) (op1, mode2)) + { + op1 = copy_to_reg (op1); + op1 = simplify_gen_subreg (mode2, op1, GET_MODE (op1), 0); + } + if (! (*insn_data[icode].operand[3].predicate) (op2, mode3)) + { + error ("shift must be an immediate"); + return const0_rtx; + } + target = gen_reg_rtx (mode); + pat = GEN_FCN (icode) (simplify_gen_subreg (tmode, target, mode, 0), + op0, op1, op2); + if (! pat) + return 0; + emit_insn (pat); + return target; + case IX86_BUILTIN_VEC_INIT_V2SI: case IX86_BUILTIN_VEC_INIT_V4HI: case IX86_BUILTIN_VEC_INIT_V8QI: --- gcc/config/i386/i386.h.mni 2006-02-04 06:59:11.000000000 -0800 +++ gcc/config/i386/i386.h 2006-02-24 13:39:19.000000000 -0800 @@ -385,6 +385,8 @@ extern int x86_prefetch_sse; builtin_define ("__SSE2__"); \ if (TARGET_SSE3) \ builtin_define ("__SSE3__"); \ + if (TARGET_MNI) \ + builtin_define ("__MNI__"); \ if (TARGET_SSE_MATH && TARGET_SSE) \ builtin_define ("__SSE_MATH__"); \ if (TARGET_SSE_MATH && TARGET_SSE2) \ --- gcc/config/i386/i386.md.mni 2006-02-24 13:39:19.000000000 -0800 +++ gcc/config/i386/i386.md 2006-02-24 13:39:19.000000000 -0800 @@ -102,7 +102,7 @@ (UNSPEC_MFENCE 44) (UNSPEC_LFENCE 45) (UNSPEC_PSADBW 46) - (UNSPEC_LDQQU 47) + (UNSPEC_LDDQU 47) ; Generic math support (UNSPEC_COPYSIGN 50) @@ -146,6 +146,11 @@ (UNSPEC_SP_TEST 101) (UNSPEC_SP_TLS_SET 102) (UNSPEC_SP_TLS_TEST 103) + + ; MNI + (UNSPEC_PSHUFB 120) + (UNSPEC_PSIGN 121) + (UNSPEC_PALIGNR 122) ]) (define_constants @@ -20262,6 +20267,6 @@ "mov{q}\t{%1, %3|%3, %1}\;xor{q}\t{%%fs:%P2, %3|%3, QWORD PTR %%fs:%P2}" [(set_attr "type" "multi")]) -(include "sse.md") (include "mmx.md") +(include "sse.md") (include "sync.md") --- gcc/config/i386/i386.opt.mni 2006-02-24 13:39:19.000000000 -0800 +++ gcc/config/i386/i386.opt 2006-02-24 13:39:19.000000000 -0800 @@ -197,6 +197,10 @@ msse3 Target Report Mask(SSE3) Support MMX, SSE, SSE2 and SSE3 built-in functions and code generation +mmni +Target Report Mask(MNI) +Support MMX, SSE, SSE2, SSE3 and MNI built-in functions and code generation + msseregparm Target RejectNegative Mask(SSEREGPARM) Use SSE register passing conventions for SF and DF mode --- gcc/config/i386/sse.md.mni 2006-02-24 13:39:19.000000000 -0800 +++ gcc/config/i386/sse.md 2006-02-24 13:39:19.000000000 -0800 @@ -278,7 +278,7 @@ (define_insn "sse3_lddqu" [(set (match_operand:V16QI 0 "register_operand" "=x") (unspec:V16QI [(match_operand:V16QI 1 "memory_operand" "m")] - UNSPEC_LDQQU))] + UNSPEC_LDDQU))] "TARGET_SSE3" "lddqu\t{%1, %0|%0, %1}" [(set_attr "type" "ssecvt") @@ -3923,3 +3923,578 @@ ;; "monitor\t%0, %1, %2" "monitor" [(set_attr "length" "3")]) + +;; MNI +(define_insn "mni_phaddwv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (vec_concat:V8HI + (vec_concat:V4HI + (vec_concat:V2HI + (plus:HI + (vec_select:HI + (match_operand:V8HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 5)]))) + (plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 7)]))))) + (vec_concat:V4HI + (vec_concat:V2HI + (plus:HI + (vec_select:HI + (match_operand:V8HI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 5)]))) + (plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))] + "TARGET_MNI" + "phaddw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phaddwv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (vec_concat:V4HI + (vec_concat:V2HI + (plus:HI + (vec_select:HI + (match_operand:V4HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (plus:HI + (vec_select:HI + (match_operand:V4HI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phaddw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_phadddv4si3" + [(set (match_operand:V4SI 0 "register_operand" "=x") + (vec_concat:V4SI + (vec_concat:V2SI + (plus:SI + (vec_select:SI + (match_operand:V4SI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 1)]))) + (plus:SI + (vec_select:SI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2SI + (plus:SI + (vec_select:SI + (match_operand:V4SI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 1)]))) + (plus:SI + (vec_select:SI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phaddd\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phadddv2si3" + [(set (match_operand:V2SI 0 "register_operand" "=y") + (vec_concat:V2SI + (plus:SI + (vec_select:SI + (match_operand:V2SI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 1)]))) + (plus:SI + (vec_select:SI + (match_operand:V2SI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 1)])))))] + "TARGET_MNI" + "phaddd\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_phaddswv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (vec_concat:V8HI + (vec_concat:V4HI + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI + (match_operand:V8HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (ss_plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 5)]))) + (ss_plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 7)]))))) + (vec_concat:V4HI + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI + (match_operand:V8HI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (ss_plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 5)]))) + (ss_plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))] + "TARGET_MNI" + "phaddsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phaddswv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (vec_concat:V4HI + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI + (match_operand:V4HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (ss_plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI + (match_operand:V4HI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (ss_plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phaddsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_phsubwv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (vec_concat:V8HI + (vec_concat:V4HI + (vec_concat:V2HI + (minus:HI + (vec_select:HI + (match_operand:V8HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 5)]))) + (minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 7)]))))) + (vec_concat:V4HI + (vec_concat:V2HI + (minus:HI + (vec_select:HI + (match_operand:V8HI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 5)]))) + (minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))] + "TARGET_MNI" + "phsubw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phsubwv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (vec_concat:V4HI + (vec_concat:V2HI + (minus:HI + (vec_select:HI + (match_operand:V4HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (minus:HI + (vec_select:HI + (match_operand:V4HI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phsubw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_phsubdv4si3" + [(set (match_operand:V4SI 0 "register_operand" "=x") + (vec_concat:V4SI + (vec_concat:V2SI + (minus:SI + (vec_select:SI + (match_operand:V4SI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 1)]))) + (minus:SI + (vec_select:SI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2SI + (minus:SI + (vec_select:SI + (match_operand:V4SI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 1)]))) + (minus:SI + (vec_select:SI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phsubd\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phsubdv2si3" + [(set (match_operand:V2SI 0 "register_operand" "=y") + (vec_concat:V2SI + (minus:SI + (vec_select:SI + (match_operand:V2SI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 1)]))) + (minus:SI + (vec_select:SI + (match_operand:V2SI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 1)])))))] + "TARGET_MNI" + "phsubd\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_phsubswv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (vec_concat:V8HI + (vec_concat:V4HI + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI + (match_operand:V8HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (ss_minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 5)]))) + (ss_minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 7)]))))) + (vec_concat:V4HI + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI + (match_operand:V8HI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (ss_minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 5)]))) + (ss_minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))] + "TARGET_MNI" + "phsubsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phsubswv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (vec_concat:V4HI + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI + (match_operand:V4HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (ss_minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI + (match_operand:V4HI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (ss_minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phsubsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_pmaddubswv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (ss_plus:V8HI + (mult:V8HI + (zero_extend:V8HI + (vec_select:V4QI + (match_operand:V16QI 1 "nonimmediate_operand" "%0") + (parallel [(const_int 0) + (const_int 2) + (const_int 4) + (const_int 6) + (const_int 8) + (const_int 10) + (const_int 12) + (const_int 14)]))) + (sign_extend:V8HI + (vec_select:V8QI + (match_operand:V16QI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0) + (const_int 2) + (const_int 4) + (const_int 6) + (const_int 8) + (const_int 10) + (const_int 12) + (const_int 14)])))) + (mult:V8HI + (zero_extend:V8HI + (vec_select:V16QI (match_dup 1) + (parallel [(const_int 1) + (const_int 3) + (const_int 5) + (const_int 7) + (const_int 9) + (const_int 11) + (const_int 13) + (const_int 15)]))) + (sign_extend:V8HI + (vec_select:V16QI (match_dup 2) + (parallel [(const_int 1) + (const_int 3) + (const_int 5) + (const_int 7) + (const_int 9) + (const_int 11) + (const_int 13) + (const_int 15)]))))))] + "TARGET_MNI" + "pmaddubsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_pmaddubswv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (ss_plus:V4HI + (mult:V4HI + (zero_extend:V4HI + (vec_select:V4QI + (match_operand:V8QI 1 "nonimmediate_operand" "%0") + (parallel [(const_int 0) + (const_int 2) + (const_int 4) + (const_int 6)]))) + (sign_extend:V4HI + (vec_select:V4QI + (match_operand:V8QI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0) + (const_int 2) + (const_int 4) + (const_int 6)])))) + (mult:V4HI + (zero_extend:V4HI + (vec_select:V8QI (match_dup 1) + (parallel [(const_int 1) + (const_int 3) + (const_int 5) + (const_int 7)]))) + (sign_extend:V4HI + (vec_select:V8QI (match_dup 2) + (parallel [(const_int 1) + (const_int 3) + (const_int 5) + (const_int 7)]))))))] + "TARGET_MNI" + "pmaddubsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_pmulhrswv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (truncate:V8HI + (lshiftrt:V8SI + (plus:V8SI + (lshiftrt:V8SI + (mult:V8SI + (sign_extend:V8SI + (match_operand:V8HI 1 "nonimmediate_operand" "%0")) + (sign_extend:V8SI + (match_operand:V8HI 2 "nonimmediate_operand" "xm"))) + (const_int 14)) + (const_vector:V8HI [(const_int 1) (const_int 1) + (const_int 1) (const_int 1) + (const_int 1) (const_int 1) + (const_int 1) (const_int 1)])) + (const_int 1))))] + "TARGET_MNI && ix86_binary_operator_ok (MULT, V8HImode, operands)" + "pmulhrsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseimul") + (set_attr "mode" "TI")]) + +(define_insn "mni_pmulhrswv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (truncate:V4HI + (lshiftrt:V4SI + (plus:V4SI + (lshiftrt:V4SI + (mult:V4SI + (sign_extend:V4SI + (match_operand:V4HI 1 "nonimmediate_operand" "%0")) + (sign_extend:V4SI + (match_operand:V4HI 2 "nonimmediate_operand" "ym"))) + (const_int 14)) + (const_vector:V4HI [(const_int 1) (const_int 1) + (const_int 1) (const_int 1)])) + (const_int 1))))] + "TARGET_MNI && ix86_binary_operator_ok (MULT, V4HImode, operands)" + "pmulhrsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseimul") + (set_attr "mode" "DI")]) + +(define_insn "mni_pshufbv16qi3" + [(set (match_operand:V16QI 0 "register_operand" "=x") + (unspec:V16QI [(match_operand:V16QI 1 "register_operand" "0") + (match_operand:V16QI 2 "nonimmediate_operand" "xm")] + UNSPEC_PSHUFB))] + "TARGET_MNI" + "pshufb\t{%2, %0|%0, %2}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "TI")]) + +(define_insn "mni_pshufbv8qi3" + [(set (match_operand:V8QI 0 "register_operand" "=y") + (unspec:V8QI [(match_operand:V8QI 1 "register_operand" "0") + (match_operand:V8QI 2 "nonimmediate_operand" "ym")] + UNSPEC_PSHUFB))] + "TARGET_MNI" + "pshufb\t{%2, %0|%0, %2}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "DI")]) + +(define_insn "mni_psign3" + [(set (match_operand:SSEMODE124 0 "register_operand" "=x") + (unspec:SSEMODE124 [(match_operand:SSEMODE124 1 "register_operand" "0") + (match_operand:SSEMODE124 2 "nonimmediate_operand" "xm")] + UNSPEC_PSIGN))] + "TARGET_MNI" + "psign\t{%2, %0|%0, %2}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "TI")]) + +(define_insn "mni_psign3" + [(set (match_operand:MMXMODEI 0 "register_operand" "=y") + (unspec:MMXMODEI [(match_operand:MMXMODEI 1 "register_operand" "0") + (match_operand:MMXMODEI 2 "nonimmediate_operand" "ym")] + UNSPEC_PSIGN))] + "TARGET_MNI" + "psign\t{%2, %0|%0, %2}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "DI")]) + +(define_insn "mni_palignrti" + [(set (match_operand:TI 0 "register_operand" "=x") + (unspec:TI [(match_operand:TI 1 "register_operand" "0") + (match_operand:TI 2 "nonimmediate_operand" "xm") + (match_operand:SI 3 "const_0_to_255_mul_8_operand" "n")] + UNSPEC_PALIGNR))] + "TARGET_MNI" +{ + operands[3] = GEN_INT (INTVAL (operands[3]) / 8); + return "palignr\t{%3, %2, %0|%0, %2, %3}"; +} + [(set_attr "type" "sseishft") + (set_attr "mode" "TI")]) + +(define_insn "mni_palignrdi" + [(set (match_operand:DI 0 "register_operand" "=y") + (unspec:DI [(match_operand:DI 1 "register_operand" "0") + (match_operand:DI 2 "nonimmediate_operand" "ym") + (match_operand:SI 3 "const_0_to_255_mul_8_operand" "n")] + UNSPEC_PALIGNR))] + "TARGET_MNI" +{ + operands[3] = GEN_INT (INTVAL (operands[3]) / 8); + return "palignr\t{%3, %2, %0|%0, %2, %3}"; +} + [(set_attr "type" "sseishft") + (set_attr "mode" "DI")]) + +(define_insn "mni_pabs2" + [(set (match_operand:SSEMODE124 0 "register_operand" "=x") + (abs:SSEMODE124 (match_operand:SSEMODE124 1 "nonimmediate_operand" "xm")))] + "TARGET_MNI" + "pabs\t{%1, %0|%0, %1}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "TI")]) + +(define_insn "mni_pabs2" + [(set (match_operand:MMXMODEI 0 "register_operand" "=y") + (abs:MMXMODEI (match_operand:MMXMODEI 1 "nonimmediate_operand" "ym")))] + "TARGET_MNI" + "pabs\t{%1, %0|%0, %1}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "DI")]) --- gcc/config/i386/tmmintrin.h.mni 2006-02-24 13:39:19.000000000 -0800 +++ gcc/config/i386/tmmintrin.h 2006-02-24 13:39:19.000000000 -0800 @@ -0,0 +1,224 @@ +/* Copyright (C) 2006 Free Software Foundation, Inc. + + This file is part of GCC. + + GCC 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, or (at your option) + any later version. + + GCC 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 GCC; see the file COPYING. If not, write to + the Free Software Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* As a special exception, if you include this header file into source + files compiled by GCC, this header file does not by itself cause + the resulting executable to be covered by the GNU General Public + License. This exception does not however invalidate any other + reasons why the executable file might be covered by the GNU General + Public License. */ + +/* Implemented from the specification included in the Intel C++ Compiler + User Guide and Reference, version 9.1. */ + +#ifndef _TMMINTRIN_H_INCLUDED +#define _TMMINTRIN_H_INCLUDED + +#ifdef __MNI__ +#include + +static __inline __m128i +_mm_hadd_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phaddw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m128i +_mm_hadd_epi32 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phaddd128 ((__v4si)__X, (__v4si)__Y); +} + +static __inline __m128i +_mm_hadds_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phaddsw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m64 +_mm_hadd_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phaddw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m64 +_mm_hadd_pi32 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phaddd ((__v2si)__X, (__v2si)__Y); +} + +static __inline __m64 +_mm_hadds_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phaddsw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m128i +_mm_hsub_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phsubw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m128i +_mm_hsub_epi32 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phsubd128 ((__v4si)__X, (__v4si)__Y); +} + +static __inline __m128i +_mm_hsubs_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phsubsw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m64 +_mm_hsub_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phsubw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m64 +_mm_hsub_pi32 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phsubd ((__v2si)__X, (__v2si)__Y); +} + +static __inline __m64 +_mm_hsubs_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phsubsw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m128i +_mm_maddubs_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_pmaddubsw128 ((__v16qi)__X, (__v16qi)__Y); +} + +static __inline __m64 +_mm_maddubs_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_pmaddubsw ((__v8qi)__X, (__v8qi)__Y); +} + +static __inline __m128i +_mm_mulhrs_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_pmulhrsw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m64 +_mm_mulhrs_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_pmulhrsw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m128i +_mm_shuffle_epi8 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_pshufb128 ((__v16qi)__X, (__v16qi)__Y); +} + +static __inline __m64 +_mm_shuffle_pi8 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_pshufb ((__v8qi)__X, (__v8qi)__Y); +} + +static __inline __m128i +_mm_sign_epi8 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_psignb128 ((__v16qi)__X, (__v16qi)__Y); +} + +static __inline __m128i +_mm_sign_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_psignw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m128i +_mm_sign_epi32 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_psignd128 ((__v4si)__X, (__v4si)__Y); +} + +static __inline __m64 +_mm_sign_pi8 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_psignb ((__v8qi)__X, (__v8qi)__Y); +} + +static __inline __m64 +_mm_sign_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_psignw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m64 +_mm_sign_pi32 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_psignd ((__v2si)__X, (__v2si)__Y); +} + +#define _mm_alignr_epi8(__X, __Y, __N) \ + ((__m128i)__builtin_ia32_palignr128 ((__v2di) __X, (__v2di) __Y, (__N) * 8)) + +#define _mm_alignr_pi8(__X, __Y, __N) \ + ((__m64)__builtin_ia32_palignr ((long long) (__X), (long long) (__Y), (__N) * 8)) + +static __inline __m128i +_mm_abs_epi8 (__m128i __X) +{ + return (__m128i) __builtin_ia32_pabsb128 ((__v16qi)__X); +} + +static __inline __m128i +_mm_abs_epi16 (__m128i __X) +{ + return (__m128i) __builtin_ia32_pabsw128 ((__v8hi)__X); +} + +static __inline __m128i +_mm_abs_epi32 (__m128i __X) +{ + return (__m128i) __builtin_ia32_pabsd128 ((__v4si)__X); +} + +static __inline __m64 +_mm_abs_pi8 (__m64 __X) +{ + return (__m64) __builtin_ia32_pabsb ((__v8qi)__X); +} + +static __inline __m64 +_mm_abs_pi16 (__m64 __X) +{ + return (__m64) __builtin_ia32_pabsw ((__v4hi)__X); +} + +static __inline __m64 +_mm_abs_pi32 (__m64 __X) +{ + return (__m64) __builtin_ia32_pabsd ((__v2si)__X); +} + +#endif /* __MNI__ */ + +#endif /* _TMMINTRIN_H_INCLUDED */ --- gcc/doc/extend.texi.mni 2006-02-21 22:42:04.000000000 -0800 +++ gcc/doc/extend.texi 2006-02-24 13:39:19.000000000 -0800 @@ -6701,6 +6701,52 @@ The following built-in functions are ava Generates the @code{movddup} machine instruction as a load from memory. @end table +The following built-in functions are available when @option{-mmni} is used. +All of them generate the machine instruction that is part of the name +with MMX registers. + + at smallexample +v2si __builtin_ia32_phaddd (v2si, v2si) +v4hi __builtin_ia32_phaddw (v4hi, v4hi) +v4hi __builtin_ia32_phaddsw (v4hi, v4hi) +v2si __builtin_ia32_phsubd (v2si, v2si) +v4hi __builtin_ia32_phsubw (v4hi, v4hi) +v4hi __builtin_ia32_phsubsw (v4hi, v4hi) +v8qi __builtin_ia32_pmaddubsw (v8qi, v8qi) +v4hi __builtin_ia32_pmulhrsw (v4hi, v4hi) +v8qi __builtin_ia32_pshufb (v8qi, v8qi) +v8qi __builtin_ia32_psignb (v8qi, v8qi) +v2si __builtin_ia32_psignd (v2si, v2si) +v4hi __builtin_ia32_psignw (v4hi, v4hi) +long long __builtin_ia32_palignr (long long, long long, int) +v8qi __builtin_ia32_pabsb (v8qi) +v2si __builtin_ia32_pabsd (v2si) +v4hi __builtin_ia32_pabsw (v4hi) + at end smallexample + +The following built-in functions are available when @option{-mmni} is used. +All of them generate the machine instruction that is part of the name +with SSE registers. + + at smallexample +v4si __builtin_ia32_phaddd128 (v4si, v4si) +v8hi __builtin_ia32_phaddw128 (v8hi, v8hi) +v8hi __builtin_ia32_phaddsw128 (v8hi, v8hi) +v4si __builtin_ia32_phsubd128 (v4si, v4si) +v8hi __builtin_ia32_phsubw128 (v8hi, v8hi) +v8hi __builtin_ia32_phsubsw128 (v8hi, v8hi) +v16qi __builtin_ia32_pmaddubsw128 (v16qi, v16qi) +v8hi __builtin_ia32_pmulhrsw128 (v8hi, v8hi) +v16qi __builtin_ia32_pshufb128 (v16qi, v16qi) +v16qi __builtin_ia32_psignb128 (v16qi, v16qi) +v4si __builtin_ia32_psignd128 (v4si, v4si) +v8hi __builtin_ia32_psignw128 (v8hi, v8hi) +v2di __builtin_ia32_palignr (v2di, v2di, int) +v16qi __builtin_ia32_pabsb128 (v16qi) +v4si __builtin_ia32_pabsd128 (v4si) +v8hi __builtin_ia32_pabsw128 (v8hi) + at end smallexample + The following built-in functions are available when @option{-m3dnow} is used. All of them generate the machine instruction that is part of the name. --- gcc/doc/invoke.texi.mni 2006-02-14 13:17:58.000000000 -0800 +++ gcc/doc/invoke.texi 2006-02-24 13:42:50.000000000 -0800 @@ -522,7 +522,7 @@ Objective-C and Objective-C++ Dialects}. -mno-fp-ret-in-387 -msoft-float -msvr3-shlib @gol -mno-wide-multiply -mrtd -malign-double @gol -mpreferred-stack-boundary=@var{num} @gol --mmmx -msse -msse2 -msse3 -m3dnow @gol +-mmmx -msse -msse2 -msse3 -mmni -m3dnow @gol -mthreads -mno-align-stringops -minline-all-stringops @gol -mpush-args -maccumulate-outgoing-args -m128bit-long-double @gol -m96bit-long-double -mregparm=@var{num} -msseregparm @gol @@ -9343,6 +9343,8 @@ preferred alignment to @option{-mpreferr @itemx -mno-sse2 @item -msse3 @itemx -mno-sse3 + at item -mmni + at itemx -mno-mni @item -m3dnow @itemx -mno-3dnow @opindex mmmx gcc41-ppc32-retaddr.patch: --- NEW FILE gcc41-ppc32-retaddr.patch --- 2005-11-28 Jakub Jelinek * config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0, read word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx instead of doing an extran indirection from frame_pointer_rtx. * gcc.dg/20051128-1.c: New test. --- gcc/config/rs6000/rs6000.c.jj 2005-11-26 14:38:01.000000000 +0100 +++ gcc/config/rs6000/rs6000.c 2005-11-28 20:32:18.000000000 +0100 @@ -13166,17 +13166,22 @@ rs6000_return_addr (int count, rtx frame don't try to be too clever here. */ if (count != 0 || (DEFAULT_ABI != ABI_AIX && flag_pic)) { + rtx x; cfun->machine->ra_needs_full_frame = 1; - return - gen_rtx_MEM - (Pmode, - memory_address - (Pmode, - plus_constant (copy_to_reg - (gen_rtx_MEM (Pmode, - memory_address (Pmode, frame))), - RETURN_ADDRESS_OFFSET))); + if (count == 0) + { + gcc_assert (frame == frame_pointer_rtx); + x = arg_pointer_rtx; + } + else + { + x = memory_address (Pmode, frame); + x = copy_to_reg (gen_rtx_MEM (Pmode, x)); + } + + x = plus_constant (x, RETURN_ADDRESS_OFFSET); + return gen_rtx_MEM (Pmode, memory_address (Pmode, x)); } cfun->machine->ra_need_lr = 1; --- gcc/testsuite/gcc.dg/20051128-1.c.jj 2005-10-10 11:21:41.096999000 +0200 +++ gcc/testsuite/gcc.dg/20051128-1.c 2005-11-28 12:30:57.000000000 +0100 @@ -0,0 +1,41 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -fpic" } */ + +extern void exit (int); +extern void abort (void); + +int b; + +struct A +{ + void *pad[147]; + void *ra, *h; + long o; +}; + +void +__attribute__((noinline)) +foo (struct A *a, void *x) +{ + __builtin_memset (a, 0, sizeof (a)); + if (!b) + exit (0); +} + +void +__attribute__((noinline)) +bar (void) +{ + struct A a; + + __builtin_unwind_init (); + foo (&a, __builtin_return_address (0)); +} + +int +main (void) +{ + bar (); + abort (); + return 0; +} gcc41-ppc64-m32-m64-multilib-only.patch: --- NEW FILE gcc41-ppc64-m32-m64-multilib-only.patch --- --- gcc/config/rs6000/t-linux64 2003-06-03 05:11:45.000000000 -0400 +++ gcc/config/rs6000/t-linux64 2003-06-11 17:07:16.000000000 -0400 @@ -4,13 +4,13 @@ LIB2FUNCS_EXTRA = tramp.S $(srcdir)/conf # Modify the shared lib version file SHLIB_MKMAP_OPTS = -v dotsyms=1 -MULTILIB_OPTIONS = m64/m32 msoft-float -MULTILIB_DIRNAMES = 64 32 nof +MULTILIB_OPTIONS = m64/m32 +MULTILIB_DIRNAMES = 64 32 MULTILIB_EXTRA_OPTS = fPIC mstrict-align -MULTILIB_EXCEPTIONS = m64/msoft-float -MULTILIB_EXCLUSIONS = m64/!m32/msoft-float -MULTILIB_OSDIRNAMES = ../lib64 ../lib nof -MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) +MULTILIB_EXCEPTIONS = +MULTILIB_EXCLUSIONS = +MULTILIB_OSDIRNAMES = ../lib64 ../lib +MULTILIB_MATCHES = TARGET_LIBGCC2_CFLAGS = -mno-minimal-toc -fPIC gcc41-rh184446.patch: --- NEW FILE gcc41-rh184446.patch --- for gcc/ChangeLog from Richard Henderson , Alexandre Oliva * config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Use secure-plt-compatible load sequence to compute the GOT address for -fPIC -msecure-plt. Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c.orig 2006-03-09 20:02:13.000000000 -0300 +++ gcc/config/rs6000/rs6000.c 2006-03-09 22:00:43.000000000 -0300 @@ -3081,7 +3081,7 @@ rs6000_legitimize_tls_address (rtx addr, { rtx gsym = rs6000_got_sym (); got = gen_reg_rtx (Pmode); - if (flag_pic == 0) + if (flag_pic == 0 || (flag_pic && TARGET_SECURE_PLT)) rs6000_emit_move (got, gsym, Pmode); else { gcc41-x86_64-sse3.patch: --- NEW FILE gcc41-x86_64-sse3.patch --- 2005-11-17 H.J. Lu PR target/24879 * config/i386/i386.c (ix86_init_mmx_sse_builtins): Add void_ftype_di_di and void_ftype_pcvoid_di_di. Use void_ftype_di_di on __builtin_ia32_mwait and void_ftype_pcvoid_di_di on __builtin_ia32_monitor for 64bit. (ix86_expand_builtin): Support 64bit monitor and mwait. * config/i386/pmmintrin.h (_mm_monitor): Remove macro. Use inline function. (_mm_mwait): Likewise. * config/i386/sse.md (sse3_mwait): Make it 32bit only. (sse3_mwait64): New. 64bit mwait. (sse3_monitor): Make it 32bit only. (sse3_monitor64): New. 64bit monitor. gcc/testsuite/ 2005-11-17 H.J. Lu PR target/24879 * gcc.target/i386/monitor.c: New file. --- gcc/config/i386/i386.c.sse3 2005-11-15 17:33:02.000000000 -0800 +++ gcc/config/i386/i386.c 2005-11-17 09:44:47.000000000 -0800 @@ -14347,10 +14347,20 @@ ix86_init_mmx_sse_builtins (void) tree void_ftype_unsigned_unsigned = build_function_type_list (void_type_node, unsigned_type_node, unsigned_type_node, NULL_TREE); + tree void_ftype_di_di + = build_function_type_list (void_type_node, + long_long_unsigned_type_node, + long_long_unsigned_type_node, + NULL_TREE); tree void_ftype_pcvoid_unsigned_unsigned = build_function_type_list (void_type_node, const_ptr_type_node, unsigned_type_node, unsigned_type_node, NULL_TREE); + tree void_ftype_pcvoid_di_di + = build_function_type_list (void_type_node, const_ptr_type_node, + long_long_unsigned_type_node, + long_long_unsigned_type_node, + NULL_TREE); tree unsigned_ftype_void = build_function_type (unsigned_type_node, void_list_node); tree v2si_ftype_v4sf @@ -14811,12 +14821,24 @@ ix86_init_mmx_sse_builtins (void) def_builtin (MASK_SSE2, "__builtin_ia32_pmaddwd128", v4si_ftype_v8hi_v8hi, IX86_BUILTIN_PMADDWD128); /* Prescott New Instructions. */ - def_builtin (MASK_SSE3, "__builtin_ia32_monitor", - void_ftype_pcvoid_unsigned_unsigned, - IX86_BUILTIN_MONITOR); - def_builtin (MASK_SSE3, "__builtin_ia32_mwait", - void_ftype_unsigned_unsigned, - IX86_BUILTIN_MWAIT); + if (TARGET_64BIT) + { + def_builtin (MASK_SSE3, "__builtin_ia32_monitor", + void_ftype_pcvoid_di_di, + IX86_BUILTIN_MONITOR); + def_builtin (MASK_SSE3, "__builtin_ia32_mwait", + void_ftype_di_di, + IX86_BUILTIN_MWAIT); + } + else + { + def_builtin (MASK_SSE3, "__builtin_ia32_monitor", + void_ftype_pcvoid_unsigned_unsigned, + IX86_BUILTIN_MONITOR); + def_builtin (MASK_SSE3, "__builtin_ia32_mwait", + void_ftype_unsigned_unsigned, + IX86_BUILTIN_MWAIT); + } def_builtin (MASK_SSE3, "__builtin_ia32_movshdup", v4sf_ftype_v4sf, IX86_BUILTIN_MOVSHDUP); @@ -15660,13 +15682,17 @@ ix86_expand_builtin (tree exp, rtx targe op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0); op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0); op2 = expand_expr (arg2, NULL_RTX, VOIDmode, 0); + mode = TARGET_64BIT ? DImode : SImode; if (!REG_P (op0)) - op0 = copy_to_mode_reg (SImode, op0); + op0 = copy_to_mode_reg (mode, op0); if (!REG_P (op1)) - op1 = copy_to_mode_reg (SImode, op1); + op1 = copy_to_mode_reg (mode, op1); if (!REG_P (op2)) - op2 = copy_to_mode_reg (SImode, op2); - emit_insn (gen_sse3_monitor (op0, op1, op2)); + op2 = copy_to_mode_reg (mode, op2); + if (TARGET_64BIT) + emit_insn (gen_sse3_monitor64 (op0, op1, op2)); + else + emit_insn (gen_sse3_monitor (op0, op1, op2)); return 0; case IX86_BUILTIN_MWAIT: @@ -15674,11 +15700,15 @@ ix86_expand_builtin (tree exp, rtx targe arg1 = TREE_VALUE (TREE_CHAIN (arglist)); op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0); op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0); + mode = TARGET_64BIT ? DImode : SImode; if (!REG_P (op0)) - op0 = copy_to_mode_reg (SImode, op0); + op0 = copy_to_mode_reg (mode, op0); if (!REG_P (op1)) - op1 = copy_to_mode_reg (SImode, op1); - emit_insn (gen_sse3_mwait (op0, op1)); + op1 = copy_to_mode_reg (mode, op1); + if (TARGET_64BIT) + emit_insn (gen_sse3_mwait64 (op0, op1)); + else + emit_insn (gen_sse3_mwait (op0, op1)); return 0; case IX86_BUILTIN_LDDQU: --- gcc/config/i386/pmmintrin.h.sse3 2005-11-04 14:13:48.000000000 -0800 +++ gcc/config/i386/pmmintrin.h 2005-11-15 22:44:02.000000000 -0800 @@ -110,7 +110,6 @@ _mm_lddqu_si128 (__m128i const *__P) return (__m128i) __builtin_ia32_lddqu ((char const *)__P); } -#if 0 static __inline void __attribute__((__always_inline__)) _mm_monitor (void const * __P, unsigned int __E, unsigned int __H) { @@ -122,10 +121,6 @@ _mm_mwait (unsigned int __E, unsigned in { __builtin_ia32_mwait (__E, __H); } -#else -#define _mm_monitor(P, E, H) __builtin_ia32_monitor ((P), (E), (H)) -#define _mm_mwait(E, H) __builtin_ia32_mwait ((E), (H)) -#endif #endif /* __SSE3__ */ --- gcc/config/i386/sse.md.sse3 2005-11-04 14:13:48.000000000 -0800 +++ gcc/config/i386/sse.md 2005-11-17 09:25:31.000000000 -0800 @@ -3890,15 +3890,36 @@ [(unspec_volatile [(match_operand:SI 0 "register_operand" "a") (match_operand:SI 1 "register_operand" "c")] UNSPECV_MWAIT)] - "TARGET_SSE3" + "TARGET_SSE3 && !TARGET_64BIT" "mwait\t%0, %1" [(set_attr "length" "3")]) +(define_insn "sse3_mwait64" + [(unspec_volatile [(match_operand:DI 0 "register_operand" "a") + (match_operand:DI 1 "register_operand" "c")] + UNSPECV_MWAIT)] + "TARGET_SSE3 && TARGET_64BIT" +;; Older assembler doesn't support "mwait %rax,%rcx". +;; "mwait\t%0, %1" + "mwait" + [(set_attr "length" "3")]) + (define_insn "sse3_monitor" [(unspec_volatile [(match_operand:SI 0 "register_operand" "a") (match_operand:SI 1 "register_operand" "c") (match_operand:SI 2 "register_operand" "d")] UNSPECV_MONITOR)] - "TARGET_SSE3" + "TARGET_SSE3 && !TARGET_64BIT" "monitor\t%0, %1, %2" [(set_attr "length" "3")]) + +(define_insn "sse3_monitor64" + [(unspec_volatile [(match_operand:DI 0 "register_operand" "a") + (match_operand:DI 1 "register_operand" "c") + (match_operand:DI 2 "register_operand" "d")] + UNSPECV_MONITOR)] + "TARGET_SSE3 && TARGET_64BIT" +;; Older assembler doesn't support "monitor %rax,%rcx,%rdx". +;; "monitor\t%0, %1, %2" + "monitor" + [(set_attr "length" "3")]) --- gcc/testsuite/gcc.target/i386/monitor.c.sse3 2005-11-15 22:59:54.000000000 -0800 +++ gcc/testsuite/gcc.target/i386/monitor.c 2005-11-15 23:25:23.000000000 -0800 @@ -0,0 +1,27 @@ +/* { dg-do compile { target i?86-*-* x86_64-*-* } } */ +/* { dg-options "-O2 -msse3" } */ + +/* Verify that they work in both 32bit and 64bit. */ + +#include + +void +foo (char *p, int x, int y, int z) +{ + _mm_monitor (p, y, x); + _mm_mwait (z, y); +} + +void +bar (char *p, long x, long y, long z) +{ + _mm_monitor (p, y, x); + _mm_mwait (z, y); +} + +void +foo1 (char *p) +{ + _mm_monitor (p, 0, 0); + _mm_mwait (0, 0); +} Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 18 Mar 2006 01:09:58 -0000 1.5 +++ .cvsignore 19 Mar 2006 15:13:36 -0000 1.6 @@ -4,4 +4,5 @@ ghdl-imagef64fix.patch ghdl-0.20.tar.bz2 ghdl-0.21.tar.bz2 +gcc-4.1.0-20060304.tar.bz2 gcc-core-4.1.0.tar.bz2 Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ghdl.spec 17 Mar 2006 23:31:35 -0000 1.12 +++ ghdl.spec 19 Mar 2006 15:13:36 -0000 1.13 @@ -1,10 +1,11 @@ %define gccver 4.1.0 %define ghdlver 0.21 +%define DATE 20060304 Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.49svn.0%{?dist} +Release: 0.49svn.1%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -12,16 +13,76 @@ # check out the SVN repo # cd translate/gcc/ # ./dist.sh sources -Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 -Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2 -Patch0: ghdl-svn49.patch +Source0: gcc-%{gccver}-%{DATE}.tar.bz2 +Source100: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 +Patch1: gcc41-ice-hack.patch +Patch2: gcc41-ppc64-m32-m64-multilib-only.patch +Patch3: gcc41-ia64-libunwind.patch +Patch4: gcc41-gnuc-rh-release.patch +Patch5: gcc41-java-nomulti.patch +Patch6: gcc41-ada-pr18302.patch +Patch7: gcc41-ada-tweaks.patch +Patch8: gcc41-java-slow_pthread_self.patch +Patch9: gcc41-ppc32-retaddr.patch +Patch10: gcc41-x86_64-sse3.patch +Patch11: gcc41-mni.patch +Patch12: gcc41-cfaval.patch +Patch13: gcc41-rh184446.patch +Patch100: ghdl-svn49.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires: gcc # gcc-gnat missing on ppc: Bug 174720 ExcludeArch: ppc +# (Build)Requires from fc gcc41 package +%define multilib_64_archs sparc64 ppc64 s390x x86_64 +%ifarch s390x +%define multilib_32_arch s390 +%endif +%ifarch sparc64 +%define multilib_32_arch sparc +%endif +%ifarch ppc64 +%define multilib_32_arch ppc +%endif +%ifarch x86_64 +%define multilib_32_arch i386 +%endif +# Need binutils with -pie support >= 2.14.90.0.4-4 +# Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4 +# Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2 +# Need binutils which support .weakref >= 2.16.91.0.3-1 +BuildRequires: binutils >= 2.16.91.0.3-1 +BuildRequires: zlib-devel, gettext, bison, flex, texinfo +# Make sure pthread.h doesn't contain __thread tokens +# Make sure glibc supports stack protector +BuildRequires: glibc-devel >= 2.3.90-2 +%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha +# Make sure glibc supports TFmode long double +BuildRequires: glibc >= 2.3.90-35 +%endif +%ifarch %{multilib_64_archs} sparc ppc +# Ensure glibc{,-devel} is installed for both multilib arches +BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so +%endif +# Ada requires Ada to build +BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 +# Need .eh_frame ld optimizations +# Need proper visibility support +# Need -pie support +# Need --as-needed/--no-as-needed support +# On ppc64, need omit dot symbols support and --non-overlapping-opd +# Need binutils that owns /usr/bin/c++filt +# Need binutils that support .weakref +Requires: binutils >= 2.16.91.0.3-1 +# Make sure gdb will understand DW_FORM_strp +Conflicts: gdb < 5.1-2 +Requires: glibc-devel >= 2.2.90-12 +%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha +# Make sure glibc supports TFmode long double +Requires: glibc >= 2.3.90-35 +%endif # Make sure we don't use clashing namespaces %define _vendor fedora_ghdl @@ -50,13 +111,29 @@ Ada95. %prep -%setup -q -n gcc-%{gccver} -T -b 1 -a 0 +%setup -q -n gcc-%{gccver}-%{DATE} -T -b 0 -a 100 +%patch1 -p0 -b .ice-hack~ +%patch2 -p0 -b .ppc64-m32-m64-multilib-only~ +%patch3 -p0 -b .ia64-libunwind~ +#patch4 -p0 -b .gnuc-rh-release~ +%patch5 -p0 -b .java-nomulti~ +%patch6 -p0 -b .ada-pr18302~ +%patch7 -p0 -b .ada-tweaks~ +%patch8 -p0 -b .java-slow_pthread_self~ +%patch9 -p0 -b .ppc32-retaddr~ +%patch10 -p0 -b .x86_64-sse3~ +%patch11 -p0 -b .mni~ +%patch12 -p0 -b .cfaval~ +%patch13 -p0 -b .rh184446~ +sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c +sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gccver})"/' gcc/version.c pushd ghdl-%{ghdlver} -%patch0 -p1 +%patch100 -p1 %{__mv} vhdl ../gcc/ popd %build +%{__rm} -fr obj-%{gcc_target_platform} %{__mkdir} obj-%{gcc_target_platform} pushd obj-%{gcc_target_platform} @@ -104,6 +181,13 @@ --infodir=%{_infodir} \ --enable-languages=vhdl \ %{!?_without_mock:--disable-multilib} \ + --enable-shared \ + --enable-threads=posix \ + --enable-checking=release \ + --with-system-zlib \ + --enable-__cxa_atexit \ + --disable-libunwind-exceptions \ + --disable-libgcj \ %ifarch sparc --host=%{gcc_target_platform} \ --build=%{gcc_target_platform} \ @@ -221,6 +305,9 @@ %{_libexecdir}/gcc/ %changelog +* Sun Mar 19 2006 Thomas Sailer - 0.22-0.49svn.1 +- use core gcc as base compiler sources + * Thu Mar 16 2006 Thomas Sailer - 0.22-0.49svn.0 - update to svn49, using gcc 4.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Mar 2006 01:09:58 -0000 1.5 +++ sources 19 Mar 2006 15:13:36 -0000 1.6 @@ -1,2 +1,2 @@ a0ebb9b4ea9d33e67e6ae9768d10eb3a ghdl-0.21.tar.bz2 -15efa164579c7cf4a48859ee87d2a1fa gcc-core-4.1.0.tar.bz2 +cc39dd702c70d0a784c7ecdedbb503b7 gcc-4.1.0-20060304.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 16:46:46 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sun, 19 Mar 2006 11:46:46 -0500 Subject: rpms/qgit/devel .cvsignore, 1.2, 1.3 qgit.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603191647.k2JGlI4g011452@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11431 Modified Files: .cvsignore qgit.spec sources Log Message: - update to upstream version 1.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 21:34:00 -0000 1.2 +++ .cvsignore 19 Mar 2006 16:46:45 -0000 1.3 @@ -1 +1 @@ -qgit-1.1.tar.bz2 +qgit-1.1.1.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qgit.spec 7 Mar 2006 07:17:33 -0000 1.2 +++ qgit.spec 19 Mar 2006 16:46:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: qgit -Version: 1.1 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -46,6 +46,9 @@ %changelog +* Sun Mar 19 2006 Dan Horak 1.1.1-1 +- update to upstream version 1.1.1 + * Tue Mar 7 2006 Dan Horak 1.1-2 - change requires from git to git-core only Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 21:34:00 -0000 1.2 +++ sources 19 Mar 2006 16:46:45 -0000 1.3 @@ -1 +1 @@ -add6add14f3dd0602a3607a0acd5e983 qgit-1.1.tar.bz2 +bf81d73fd1633fbd02cb74e0b5d5b0b4 qgit-1.1.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 16:50:10 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sun, 19 Mar 2006 11:50:10 -0500 Subject: rpms/qgit/FC-4 .cvsignore, 1.2, 1.3 qgit.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603191650.k2JGog83011537@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11516 Modified Files: .cvsignore qgit.spec sources Log Message: - update to upstream version 1.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 21:34:00 -0000 1.2 +++ .cvsignore 19 Mar 2006 16:50:10 -0000 1.3 @@ -1 +1 @@ -qgit-1.1.tar.bz2 +qgit-1.1.1.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-4/qgit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qgit.spec 7 Mar 2006 07:13:52 -0000 1.2 +++ qgit.spec 19 Mar 2006 16:50:10 -0000 1.3 @@ -1,6 +1,6 @@ Name: qgit -Version: 1.1 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -46,6 +46,9 @@ %changelog +* Sun Mar 19 2006 Dan Horak 1.1.1-1 +- update to upstream version 1.1.1 + * Tue Mar 7 2006 Dan Horak 1.1-2 - change requires from git to git-core only Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 21:34:00 -0000 1.2 +++ sources 19 Mar 2006 16:50:10 -0000 1.3 @@ -1 +1 @@ -add6add14f3dd0602a3607a0acd5e983 qgit-1.1.tar.bz2 +bf81d73fd1633fbd02cb74e0b5d5b0b4 qgit-1.1.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 16:52:39 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sun, 19 Mar 2006 11:52:39 -0500 Subject: rpms/qgit/FC-5 .cvsignore, 1.2, 1.3 qgit.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603191653.k2JGrCwB011613@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592 Modified Files: .cvsignore qgit.spec sources Log Message: - update to upstream version 1.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 21:34:00 -0000 1.2 +++ .cvsignore 19 Mar 2006 16:52:39 -0000 1.3 @@ -1 +1 @@ -qgit-1.1.tar.bz2 +qgit-1.1.1.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-5/qgit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qgit.spec 7 Mar 2006 07:17:33 -0000 1.2 +++ qgit.spec 19 Mar 2006 16:52:39 -0000 1.3 @@ -1,6 +1,6 @@ Name: qgit -Version: 1.1 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -46,6 +46,9 @@ %changelog +* Sun Mar 19 2006 Dan Horak 1.1.1-1 +- update to upstream version 1.1.1 + * Tue Mar 7 2006 Dan Horak 1.1-2 - change requires from git to git-core only Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 21:34:00 -0000 1.2 +++ sources 19 Mar 2006 16:52:39 -0000 1.3 @@ -1 +1 @@ -add6add14f3dd0602a3607a0acd5e983 qgit-1.1.tar.bz2 +bf81d73fd1633fbd02cb74e0b5d5b0b4 qgit-1.1.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 17:42:24 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 12:42:24 -0500 Subject: rpms/cfitsio/FC-4 cfitsio.spec,1.10,1.11 Message-ID: <200603191742.k2JHgugr013760@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13713/FC-4 Modified Files: cfitsio.spec Log Message: Fix references to %{buildroot} so they aren't in %build; only in %install. Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-4/cfitsio.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cfitsio.spec 10 Mar 2006 19:11:10 -0000 1.10 +++ cfitsio.spec 19 Mar 2006 17:42:23 -0000 1.11 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -39,14 +39,14 @@ %build FC=f95 export FC -%configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name} +%configure make shared %{?_smp_mflags} unset FC %install rm -rf %{buildroot} mkdir -p %{buildroot} -LIBDIR=%{_lib} INCLUDEDIR=include/%{name} make install +make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_PREFIX=%{buildroot}%{_prefix} install pushd %{buildroot}%{_libdir} ln -s libcfitsio.so.0 libcfitsio.so popd @@ -69,6 +69,10 @@ %{_libdir}/libcfitsio.so %changelog +* Sun Mar 19 2006 Matthew Truch - 3.006-4 +- Don't use %{buildroot} in %build, only in %_install as per + appended comments to Bugzilla bug 172042 + * Fri Mar 10 2006 Matthew Truch - 3.006-3 - Point to f95 instead of g95 as per bugzilla bug 185107 From fedora-extras-commits at redhat.com Sun Mar 19 17:42:30 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 12:42:30 -0500 Subject: rpms/cfitsio/FC-5 cfitsio.spec,1.11,1.12 Message-ID: <200603191743.k2JHh2D7013763@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13713/FC-5 Modified Files: cfitsio.spec Log Message: Fix references to %{buildroot} so they aren't in %build; only in %install. Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-5/cfitsio.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cfitsio.spec 10 Mar 2006 19:11:18 -0000 1.11 +++ cfitsio.spec 19 Mar 2006 17:42:29 -0000 1.12 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -39,14 +39,14 @@ %build FC=f95 export FC -%configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name} +%configure make shared %{?_smp_mflags} unset FC %install rm -rf %{buildroot} mkdir -p %{buildroot} -LIBDIR=%{_lib} INCLUDEDIR=include/%{name} make install +make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_PREFIX=%{buildroot}%{_prefix} install pushd %{buildroot}%{_libdir} ln -s libcfitsio.so.0 libcfitsio.so popd @@ -69,6 +69,10 @@ %{_libdir}/libcfitsio.so %changelog +* Sun Mar 19 2006 Matthew Truch - 3.006-4 +- Don't use %{buildroot} in %build, only in %_install as per + appended comments to Bugzilla bug 172042 + * Fri Mar 10 2006 Matthew Truch - 3.006-3 - Point to f95 instead of g95 as per bugzilla bug 185107 From fedora-extras-commits at redhat.com Sun Mar 19 17:42:35 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 12:42:35 -0500 Subject: rpms/cfitsio/devel cfitsio.spec,1.11,1.12 Message-ID: <200603191743.k2JHh874013766@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13713/devel Modified Files: cfitsio.spec Log Message: Fix references to %{buildroot} so they aren't in %build; only in %install. Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cfitsio.spec 10 Mar 2006 19:11:18 -0000 1.11 +++ cfitsio.spec 19 Mar 2006 17:42:35 -0000 1.12 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -39,14 +39,14 @@ %build FC=f95 export FC -%configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name} +%configure make shared %{?_smp_mflags} unset FC %install rm -rf %{buildroot} mkdir -p %{buildroot} -LIBDIR=%{_lib} INCLUDEDIR=include/%{name} make install +make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_PREFIX=%{buildroot}%{_prefix} install pushd %{buildroot}%{_libdir} ln -s libcfitsio.so.0 libcfitsio.so popd @@ -69,6 +69,10 @@ %{_libdir}/libcfitsio.so %changelog +* Sun Mar 19 2006 Matthew Truch - 3.006-4 +- Don't use %{buildroot} in %build, only in %_install as per + appended comments to Bugzilla bug 172042 + * Fri Mar 10 2006 Matthew Truch - 3.006-3 - Point to f95 instead of g95 as per bugzilla bug 185107 From fedora-extras-commits at redhat.com Sun Mar 19 18:04:57 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 13:04:57 -0500 Subject: rpms/libopts import.log,1.2,1.3 Message-ID: <200603191805.k2JI5TZv015904@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15872 Modified Files: import.log Log Message: auto-import libopts-27.1-4 on branch devel from libopts-27.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libopts/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 19 Mar 2006 12:33:29 -0000 1.2 +++ import.log 19 Mar 2006 18:04:57 -0000 1.3 @@ -1 +1,2 @@ libopts-27_1-3:HEAD:libopts-27.1-3.src.rpm:1142771597 +libopts-27_1-4:HEAD:libopts-27.1-4.src.rpm:1142791461 From fedora-extras-commits at redhat.com Sun Mar 19 18:05:05 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 13:05:05 -0500 Subject: rpms/libopts/devel libopts.spec,1.1,1.2 Message-ID: <200603191805.k2JI5bY2015907@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15872/devel Modified Files: libopts.spec Log Message: auto-import libopts-27.1-4 on branch devel from libopts-27.1-4.src.rpm Index: libopts.spec =================================================================== RCS file: /cvs/extras/rpms/libopts/devel/libopts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libopts.spec 19 Mar 2006 12:33:35 -0000 1.1 +++ libopts.spec 19 Mar 2006 18:05:05 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Options library for autogen Name: libopts Version: 27.1 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL or BSD Group: Development/Libraries Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz @@ -35,7 +35,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la rm -f ${RPM_BUILD_ROOT}%{_infodir}/libopts.txt* -rm -f ${RPM_BUILD_ROOT}%{_infordir}/dir +rm -rf ${RPM_BUILD_ROOT}%{_infordir}/dir %clean rm -rf ${RPM_BUILD_ROOT} @@ -64,6 +64,9 @@ %{_includedir}/autoopts %changelog +* Sun Mar 19 2006 Paul F. Johnson 27.1-4 +- Small patch to fix a build problem on the buildsys + * Sun Mar 19 2006 Paul F. Johnson 27.1-3 - Small fixes to spec file From fedora-extras-commits at redhat.com Sun Mar 19 18:41:43 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 13:41:43 -0500 Subject: rpms/nexuiz/FC-5 nexuiz.spec,1.9,1.10 Message-ID: <200603191842.k2JIgGGK016202@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16182 Modified Files: nexuiz.spec Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-5/nexuiz.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nexuiz.spec 16 Mar 2006 18:04:18 -0000 1.9 +++ nexuiz.spec 19 Mar 2006 18:41:43 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -128,6 +128,9 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-2 +- rebuilt + * Wed Mar 16 2006 Adrian Reber - 1.5-1 - updated to 1.5 - enabled sdl binary From fedora-extras-commits at redhat.com Sun Mar 19 18:44:56 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 13:44:56 -0500 Subject: rpms/nexuiz/devel nexuiz.spec,1.9,1.10 Message-ID: <200603191845.k2JIjSRg016270@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16251 Modified Files: nexuiz.spec Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nexuiz.spec 16 Mar 2006 18:04:18 -0000 1.9 +++ nexuiz.spec 19 Mar 2006 18:44:56 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -128,6 +128,9 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-2 +- rebuilt + * Wed Mar 16 2006 Adrian Reber - 1.5-1 - updated to 1.5 - enabled sdl binary From fedora-extras-commits at redhat.com Sun Mar 19 18:53:34 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 13:53:34 -0500 Subject: rpms/nexuiz-data/FC-4 .cvsignore, 1.3, 1.4 nexuiz-data.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603191854.k2JIs6oP016337@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16316 Modified Files: .cvsignore nexuiz-data.spec sources Log Message: * Thu Mar 16 2006 Adrian Reber - 1.5-1 - updated to 1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Sep 2005 18:03:30 -0000 1.3 +++ .cvsignore 19 Mar 2006 18:53:34 -0000 1.4 @@ -1 +1 @@ -nexuiz-data-1.2.1.tar +nexuiz-data-1.5.tar Index: nexuiz-data.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/nexuiz-data.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nexuiz-data.spec 19 Sep 2005 18:03:30 -0000 1.2 +++ nexuiz-data.spec 19 Mar 2006 18:53:34 -0000 1.3 @@ -1,20 +1,19 @@ -%define datadate 20050905 +%define datadate 20060208 Summary: Game data for the Nexuiz first person shooter Name: nexuiz-data -Version: 1.2.1 +Version: 1.5 Release: 1 License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip -# unzip nexuiz121.zip -# mkdir nexuiz-data-1.2.1/ -# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/gpl.txt \ -# Nexuiz/betacredits.txt Nexuiz/gamemodes.txt \ -# nexuiz-data-1.2.1/ -# tar cvf nexuiz-data-1.2.1.tar nexuiz-data-1.2.1/ +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz15.zip +# unzip nexuiz15.zip +# mkdir nexuiz-data-1.5/ +# mv Nexuiz/data/ Nexuiz/gpl.txt Nexuiz/Docs/* \ +# nexuiz-data-1.5/ +# tar cvf nexuiz-data-1.5.tar nexuiz-data-1.5/ Source0: nexuiz-data-%{version}.tar BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,14 +26,14 @@ %prep %setup -q -%{__sed} -i 's/\r//' Readme.htm *.txt data/*.txt +%{__sed} -i 's/\r//' Readme.htm *.txt FAQ* %build %install %{__rm} -rf %{buildroot} %{__mkdir_p} %{buildroot}%{_datadir}/nexuiz/data/ -%{__install} -p data/data%{datadate}-full.pk3 \ +%{__install} -p data/data%{datadate}.pk3 \ %{buildroot}%{_datadir}/nexuiz/data/ %clean @@ -42,11 +41,14 @@ %files %defattr(0644, root, root, 0755) -%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt betacredits.txt -%doc gamemodes.txt +%doc Readme.htm gpl.txt cvars.txt mapping.txt +%doc gamemodes.txt FAQ* %{_datadir}/nexuiz/ %changelog +* Thu Mar 16 2006 Adrian Reber - 1.5-1 +- updated to 1.5 + * Mon Sep 19 2005 Adrian Reber - 1.2.1-1 - updated to 1.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Sep 2005 18:03:30 -0000 1.3 +++ sources 19 Mar 2006 18:53:34 -0000 1.4 @@ -1 +1 @@ -64d371d2008b096c67980e7a65a412bc nexuiz-data-1.2.1.tar +d7bcb0515a8d91b1cfb12546550e92fc nexuiz-data-1.5.tar From fedora-extras-commits at redhat.com Sun Mar 19 19:02:48 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 14:02:48 -0500 Subject: rpms/nexuiz/FC-4 .cvsignore, 1.3, 1.4 nexuiz-1.0-basedir.patch, 1.1, 1.2 nexuiz.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603191903.k2JJ3K9W018378@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18352 Modified Files: .cvsignore nexuiz-1.0-basedir.patch nexuiz.spec sources Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Sep 2005 18:58:07 -0000 1.3 +++ .cvsignore 19 Mar 2006 19:02:47 -0000 1.4 @@ -1 +1 @@ -nexuizenginesource20050911.zip +nexuizenginesource20060208.zip nexuiz-1.0-basedir.patch: Index: nexuiz-1.0-basedir.patch =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz-1.0-basedir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nexuiz-1.0-basedir.patch 9 Jul 2005 11:59:33 -0000 1.1 +++ nexuiz-1.0-basedir.patch 19 Mar 2006 19:02:47 -0000 1.2 @@ -4,7 +4,7 @@ fs_mempool = Mem_AllocPool("file management", 0, NULL); -- strcpy(fs_basedir, "."); +- strcpy(fs_basedir, ""); + strcpy(fs_basedir, "/usr/share/nexuiz"); strcpy(fs_gamedir, ""); Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nexuiz.spec 19 Sep 2005 18:58:07 -0000 1.4 +++ nexuiz.spec 19 Mar 2006 19:02:47 -0000 1.5 @@ -1,23 +1,24 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz -Version: 1.2.1 -Release: 1%{?dist} +Version: 1.5 +Release: 2%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip -# unzip nexuiz121.zip Nexuiz/nexuizenginesource20050911.zip -Source: nexuizenginesource20050911.zip +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz15.zip +# unzip nexuiz15.zip Nexuiz/nexuizenginesource20060208.zip +Source: nexuizenginesource20060208.zip Patch0: nexuiz-1.0-basedir.patch Patch1: nexuiz-1.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # For the .ico extraction BuildRequires: ImageMagick, file BuildRequires: xorg-x11-devel, alsa-lib-devel, desktop-file-utils +BuildRequires: SDL-devel # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build -Requires: libz.so.1 libvorbis.so.0 libvorbisfile.so.3 libjpeg.so.62 +Requires: zlib libvorbis libjpeg Requires: desktop-file-utils >= 0.9 Requires: nexuiz-data = %{version} Requires(post): desktop-file-utils @@ -34,7 +35,7 @@ Requires: nexuiz-data = %{version} # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build -Requires: libz.so.1 +Requires: zlib %description server Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, @@ -48,10 +49,11 @@ %patch0 -p0 -b .basedir %patch1 -p0 -b .nostrip %{__sed} -i 's/\r//' darkplaces.txt +%{__sed} -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc %build -%{__make} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" +%{__make} cl-release sv-release sdl-release OPTIM_RELEASE="$RPM_OPT_FLAGS" convert darkplaces.ico nexuiz.png @@ -60,9 +62,11 @@ # Install the main programs %{__mkdir_p} %{buildroot}%{_bindir} -%{__install} -m 0755 darkplaces-glx \ +%{__install} -m 0755 nexuiz-glx \ %{buildroot}%{_bindir}/nexuiz-glx -%{__install} -m 0755 darkplaces-dedicated \ +%{__install} -m 0755 nexuiz-sdl \ + %{buildroot}%{_bindir}/nexuiz-sdl +%{__install} -m 0755 nexuiz-dedicated \ %{buildroot}%{_bindir}/nexuiz-dedicated # Create the desktop file @@ -112,6 +116,7 @@ %defattr(-,root,root,-) %doc COPYING darkplaces.txt %{_bindir}/nexuiz-glx +%{_bindir}/nexuiz-sdl %{_datadir}/icons/hicolor/*/apps/nexuiz.png %{_datadir}/applications/*%{name}.desktop @@ -122,6 +127,17 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-2 +- rebuilt + +* Wed Mar 16 2006 Adrian Reber - 1.5-1 +- updated to 1.5 +- enabled sdl binary + +* Wed Nov 30 2005 Adrian Reber - 1.2.1-2 +- changed requires to make it work on 64 bit platforms + (thanks thl) + * Mon Sep 19 2005 Adrian Reber - 1.2.1-1 - updated to 1.2.1 - icons and binaries are now being renamed from darkplaces* to nexuiz* Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Sep 2005 18:58:07 -0000 1.3 +++ sources 19 Mar 2006 19:02:47 -0000 1.4 @@ -1 +1 @@ -ea845ee2842ad6a2304da1f0b2c95bdd nexuizenginesource20050911.zip +9ad968b3706b00d4a0f196d1c3f2267d nexuizenginesource20060208.zip From fedora-extras-commits at redhat.com Sun Mar 19 19:25:01 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 14:25:01 -0500 Subject: rpms/nexuiz/FC-4 nexuiz.spec,1.5,1.6 Message-ID: <200603191925.k2JJPXQb018530@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18513 Modified Files: nexuiz.spec Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-3 - works better on FC4 without modular X changes Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nexuiz.spec 19 Mar 2006 19:02:47 -0000 1.5 +++ nexuiz.spec 19 Mar 2006 19:25:00 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -49,7 +49,6 @@ %patch0 -p0 -b .basedir %patch1 -p0 -b .nostrip %{__sed} -i 's/\r//' darkplaces.txt -%{__sed} -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc %build @@ -127,6 +126,9 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-3 +- works better on FC4 without modular X changes + * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt From fedora-extras-commits at redhat.com Sun Mar 19 19:27:34 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 14:27:34 -0500 Subject: rpms/nexuiz/FC-5 nexuiz.spec,1.10,1.11 Message-ID: <200603191928.k2JJS6di018596@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18579 Modified Files: nexuiz.spec Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-3 - rebuilt Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-5/nexuiz.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nexuiz.spec 19 Mar 2006 18:41:43 -0000 1.10 +++ nexuiz.spec 19 Mar 2006 19:27:34 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -128,6 +128,9 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-3 +- rebuilt + * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt From fedora-extras-commits at redhat.com Sun Mar 19 20:38:23 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 13:38:23 -0700 Subject: rpms/scponly/FC-5 scponly.spec,1.3,1.4 Message-ID: <200603192038.k2JKcNKo020842@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20831 Modified Files: scponly.spec Log Message: - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-5/scponly.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scponly.spec 17 Feb 2006 21:18:32 -0000 1.3 +++ scponly.spec 19 Mar 2006 20:38:22 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -22,7 +22,7 @@ %setup -q %build -%configure --enable-scp-compat +%configure --enable-scp-compat --enable-rsync-compat --enable-winscp-compat %{__make} %{?_smp_mflags} \ OPTS="%{optflags}" @@ -45,6 +45,10 @@ %{_bindir}/scponly %changelog +* Sun Mar 19 2006 Warren Togami - 4.6-2 +- --enable-winscp-compat seems necessary +- --enable-rsync-compat seems useful too + * Fri Feb 17 2006 Warren Togami - 4.6-1 - 4.6 - --enable-scp-compat so scp works From fedora-extras-commits at redhat.com Sun Mar 19 20:39:32 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 13:39:32 -0700 Subject: rpms/scponly/FC-4 scponly.spec,1.3,1.4 Message-ID: <200603192039.k2JKdWAP020944@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20933 Modified Files: scponly.spec Log Message: - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-4/scponly.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scponly.spec 17 Feb 2006 21:19:40 -0000 1.3 +++ scponly.spec 19 Mar 2006 20:39:32 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -22,7 +22,7 @@ %setup -q %build -%configure --enable-scp-compat +%configure --enable-scp-compat --enable-rsync-compat --enable-winscp-compat %{__make} %{?_smp_mflags} \ OPTS="%{optflags}" @@ -45,6 +45,10 @@ %{_bindir}/scponly %changelog +* Sun Mar 19 2006 Warren Togami - 4.6-2 +- --enable-winscp-compat seems necessary +- --enable-rsync-compat seems useful too + * Fri Feb 17 2006 Warren Togami - 4.6-1 - 4.6 - --enable-scp-compat so scp works From fedora-extras-commits at redhat.com Sun Mar 19 20:40:00 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 13:40:00 -0700 Subject: rpms/scponly/FC-3 scponly.spec,1.3,1.4 Message-ID: <200603192040.k2JKe0dj021042@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21031 Modified Files: scponly.spec Log Message: - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-3/scponly.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scponly.spec 17 Feb 2006 21:20:06 -0000 1.3 +++ scponly.spec 19 Mar 2006 20:40:00 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -22,7 +22,7 @@ %setup -q %build -%configure --enable-scp-compat +%configure --enable-scp-compat --enable-rsync-compat --enable-winscp-compat %{__make} %{?_smp_mflags} \ OPTS="%{optflags}" @@ -45,6 +45,10 @@ %{_bindir}/scponly %changelog +* Sun Mar 19 2006 Warren Togami - 4.6-2 +- --enable-winscp-compat seems necessary +- --enable-rsync-compat seems useful too + * Fri Feb 17 2006 Warren Togami - 4.6-1 - 4.6 - --enable-scp-compat so scp works From fedora-extras-commits at redhat.com Sun Mar 19 20:52:50 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 19 Mar 2006 15:52:50 -0500 Subject: rpms/apt/devel .cvsignore, 1.4, 1.5 apt.spec, 1.18, 1.19 default.conf, 1.5, 1.6 sources, 1.4, 1.5 apt-0.5.15cnc5-manifest-limit.patch, 1.1, NONE apt-0.5.15cnc6-pymake2.patch, 1.1, NONE apt-0.5.15cnc6-rdonly.patch, 1.1, NONE apt-pymake.patch, 1.1, NONE apt-scriptdir.patch, 1.1, NONE apt-shell-155990.patch, 1.1, NONE Message-ID: <200603192053.k2JKrNH4021187@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21164/devel Modified Files: .cvsignore apt.spec default.conf sources Removed Files: apt-0.5.15cnc5-manifest-limit.patch apt-0.5.15cnc6-pymake2.patch apt-0.5.15cnc6-rdonly.patch apt-pymake.patch apt-scriptdir.patch apt-shell-155990.patch Log Message: * Sun Mar 19 2006 Ville Skytt?? - 0.5.15lorg3-0.1.pre1 - 0.5.15lorg3-pre1: preliminary multilib and repomd support. - Update config for kernel and module packages. - Don't ship static libraries. - Don't mark init script as config. - Don't build -groupinstall for now. - Clean up dependency lists for FC5+. - Specfile cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Mar 2005 12:08:38 -0000 1.4 +++ .cvsignore 19 Mar 2006 20:52:50 -0000 1.5 @@ -1 +1 @@ -apt-0.5.15cnc7.tar.bz2 +apt-0.5.15lorg3-pre1.tar.bz2 Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- apt.spec 13 Nov 2005 14:52:50 -0000 1.18 +++ apt.spec 19 Mar 2006 20:52:50 -0000 1.19 @@ -1,165 +1,150 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define scriptdir %{_datadir}/apt/scripts/ - %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.15cnc7 -Release: 7%{?dist} -Group: System Environment/Base -URL: https://moin.conectiva.com.br/AptRpm -License: GPL -ExcludeArch: x86_64 ppc64 - -# unfortunately the source isn't really directly downloadable with wget etc: -#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc7.tar.bz2 -Source0: %{name}-%{version}.tar.bz2 +Summary: Debian's Advanced Packaging Tool with RPM support +Name: apt +Version: 0.5.15lorg3 +Release: 0.1.pre1%{?dist} +Group: System Environment/Base +URL: https://moin.conectiva.com.br/AptRpm +License: GPL + +Source0: http://laiskiainen.org/apt/testing/apt-0.5.15lorg3-pre1.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 # nightly updater scripts & config -Source20: apt.init -Source21: apt.cron -Source22: apt.sysconfig +Source20: apt.init +Source21: apt.cron +Source22: apt.sysconfig # Sources 50-99 are for Lua-scripts not in contrib/ -#Source50: -#Source51: -Source52: preserve-conf.lua -Source54: upgradevirt.lua +Source50: preserve-conf.lua +Source51: upgradevirt.lua # 100-149 for sources.list.d # no default entry for fedora at all -#Source100: fedora.list -#Source101: macromedia.list # 150-199 for apt.conf.d -# "factory defaults" for Fedora Core -Source150: default.conf +# "factory defaults" for Fedora Core + Extras +Source150: default.conf # 200-249 for trusted gpg keys # Fedora key -Source200: gpg-pubkey-4f2a6fd2-3f9d9d3b +Source200: gpg-pubkey-4f2a6fd2-3f9d9d3b # "Old" RHL key -Source202: gpg-pubkey-db42a60e-37ea5438 +Source202: gpg-pubkey-db42a60e-37ea5438 # Fedora Extras key -Source203: gpg-pubkey-1ac70ce6-41bebeef +Source203: gpg-pubkey-1ac70ce6-41bebeef # 250-299 for vendor.list.d -Source250: fedora-vendor.list -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source250: fedora-vendor.list -Provides: apt-mirrorselect - -# Other deps are automatically picked up by rpm -Requires: gnupg, bzip2 -Requires(post): chkconfig, ldconfig -Requires(preun): chkconfig -# Needed by the mirror-selector script -Requires: wget +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # TODO: verify the required minimum Python version -BuildRequires: python-devel >= 2.2 -BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext -BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel, libtool +BuildRequires: python-devel >= 2.2 +BuildRequires: libxml2-devel +BuildRequires: rpm-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, %{comps} +BuildRequires: %{_bindir}/xsltproc +BuildRequires: %{comps} +%endif +# libxml2-devel, #183689 +BuildRequires: pkgconfig +Requires: gnupg +Requires: bzip2 +# wget needed by the mirror-selector script +Requires: wget +Requires(post): chkconfig +Requires(post): ldconfig +Requires(preun): chkconfig +Provides: apt-mirrorselect +%if 0%{!?_with_groupinstall:1} +Obsoletes: %{name}-groupinstall < %{version}-%{release} %endif -# Work around missing deps in rpm-devel :-/ -BuildRequires: beecrypt-devel, elfutils-libelf-devel - -Patch0: apt-shell-155990.patch -# Fix some issues in python binding build -Patch1: apt-pymake.patch -Patch5: apt-0.5.15cnc6-pymake2.patch -# Make rpm manifest usage configurable -Patch3: apt-0.5.15cnc5-manifest-limit.patch -# Take read-only, not exclusive rpmdb lock for the initial dependency processing -Patch6: apt-0.5.15cnc6-rdonly.patch -# Move scripts from /usr/lib/apt to /usr/share/apt -Patch7: apt-scriptdir.patch %description -A port of Debian's apt tools for RPM based distributions. -It provides the apt-get utility that provides a simpler, safer way to -install and upgrade packages. APT features complete installation ordering, -multiple source capability and several other unique features. - -%package devel -Summary: Development files and documentation for APT's libapt-pkg. -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: rpm-devel -%description devel -This package contains the header files and static libraries 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} -%description python +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 +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 + +%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} + +%description python The apt-python package contains a module which allows python programs to access the APT library interface. -%package groupinstall -Summary: Add commands to install and remove package groups. -Group: System Environment/Base -Requires: %{name} = %{version}-%{release} -Requires: rhpl, comps -%description groupinstall -This package adds four new commands to apt for installing, removing and viewing -groups of packages: +%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 +This package adds four new commands to apt for installing, removing +and viewing groups of packages: apt-cache groupnames apt-cache showgroup [ ..] apt-get groupinstall [ ..] apt-get groupremove [ ..] -The group information is retrieved from comps.xml used by anaconda (the -system installer) and other package management tools of RHL/RHEL/FC -distributions. +The group information is retrieved from comps.xml used by anaconda +(the system installer) and other package management tools of +RHL/RHEL/FC distributions. %prep -%setup -q -%patch0 -p0 -b .155990 -%patch1 -p0 -b .pymake -%patch3 -p1 -b .manifest -%patch5 -p0 -b .pymake2 -%patch6 -p1 -b .rdonly -%patch7 -p0 -b .scriptdir +%setup -q -n %{name}-%{version}-pre1 # 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/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 -# appease aclocal >= 1.8 -perl -pi -e 's|^(AC_DEFUN\()(\w+)|$1\[$2\]|' buildlib/*.m4 - -# http://distro2.conectiva.com.br/pipermail/apt-rpm/2005-March/002664.html -libtoolize -f && autoreconf - %build -%configure --disable-dependency-tracking +%configure --disable-dependency-tracking --disable-static SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \ make %{?_smp_mflags} @@ -176,7 +161,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall includedir=$RPM_BUILD_ROOT%{_includedir}/apt-pkg +make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg %find_lang %{name} # The state files @@ -190,104 +175,108 @@ 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 -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list -install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list -install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences -install -p -m 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/ +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/ # install config parts -install -p -m 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/ -install -p -m 644 %{SOURCE250} $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list +install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/ +install -pm 644 %{SOURCE250} \ + $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list # GPG keys mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ -for gpgkey in %{SOURCE200} %{SOURCE202} %{SOURCE203}; do - install -p -m 644 $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ +for gpgkey in %{SOURCE200} %{SOURCE202} %{SOURCE203} ; do + install -pm 644 $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ done # Lua scripts -mkdir -p $RPM_BUILD_ROOT%{scriptdir} -for script in %{SOURCE52} %{SOURCE54}; do - install -p -m 755 $script $RPM_BUILD_ROOT%{scriptdir} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts +for script in %{SOURCE50} %{SOURCE51} ; do + install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts done # The python bindings mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/ -install -p -m 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/ -install -p -m 644 python/apt.py{c,} $RPM_BUILD_ROOT%{python_sitearch}/ +install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/ +install -pm 644 python/apt.py{c,} $RPM_BUILD_ROOT%{python_sitearch}/ touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo # Nightly updater scripts & default config -install -D -p -m 755 %{SOURCE20} $RPM_BUILD_ROOT/%{_initrddir}/apt -install -D -p -m 755 %{SOURCE21} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron -install -D -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt +install -Dpm 755 %{SOURCE20} $RPM_BUILD_ROOT/%{_initrddir}/apt +install -Dpm 755 %{SOURCE21} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron +install -Dpm 644 %{SOURCE22} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt # GPG checker from contrib -install -p -m 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{scriptdir}/ +install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts # apt-groupinstall from contrib -install -p -m 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{scriptdir} -install -p -m 644 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/ +%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 644 contrib/apt-groupinstall/apt-groupinstall.conf \ + $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/ +%endif # nuke .la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%clean +rm -rf $RPM_BUILD_ROOT + + %pre if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then - mv -f %{_sysconfdir}/apt/apt.conf %{_sysconfdir}/apt/apt.conf.rpmsave - echo "NOTE: Default configuration changed!" - echo "If you have made any changes to the configuration locally" - echo "Merge your local customizations from %{_sysconfdir}/apt/apt.conf.rpmsave" - echo "to %{_sysconfdir}/apt/apt.conf" + mv -f %{_sysconfdir}/apt/apt.conf %{_sysconfdir}/apt/apt.conf.rpmsave + echo "NOTE: Default configuration changed!" + echo "If you have made any changes to the configuration locally," + echo "Merge your local customizations from %{_sysconfdir}/apt/apt.conf.rpmsave" + echo "to %{_sysconfdir}/apt/apt.conf" fi -%preun -if [ $1 = 0 ]; then - /sbin/service apt stop > /dev/null 2>&1 - /sbin/chkconfig --del apt -fi -exit 0 - %post /sbin/ldconfig -if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then - echo "// User customizable configuration goes here" \ +if [ ! -f %{_sysconfdir}/apt/apt.conf ] ; then + echo "// User customizable configuration goes here" \ > %{_sysconfdir}/apt/apt.conf fi /sbin/chkconfig --add apt -%postun -p /sbin/ldconfig +%preun +if [ $1 -eq 0 ] ; then + %{_initrddir}/apt stop &>/dev/null || : + /sbin/chkconfig --del apt +fi -%clean -rm -rf $RPM_BUILD_ROOT +%postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS* COPYING* ABOUT* TODO comps2prio.xsl doc/examples/ contrib/ -%dir %{_sysconfdir}/apt -%dir %{_sysconfdir}/apt/sources.list.d -%dir %{_sysconfdir}/apt/vendors.list.d -%dir %{_sysconfdir}/apt/apt.conf.d -%dir %{_sysconfdir}/apt/gpg -%{_sysconfdir}/apt/gpg/gpg-pubkey* -%config(noreplace) %{_sysconfdir}/sysconfig/apt -%config(noreplace) %{_sysconfdir}/apt/rpmpriorities -%config(noreplace) %{_sysconfdir}/apt/preferences + +%dir %{_sysconfdir}/apt/ %config(noreplace) %{_sysconfdir}/apt/apt.conf +%config(noreplace) %{_sysconfdir}/apt/preferences +%config(noreplace) %{_sysconfdir}/apt/rpmpriorities %config(noreplace) %{_sysconfdir}/apt/sources.list %config(noreplace) %{_sysconfdir}/apt/vendors.list -# NOTE: no noreplace on these because we WANT to be able to change the defaults +# NOTE: no noreplace on *.d because we WANT to be able to change the defaults # without user intervention! -%config %{_sysconfdir}/apt/apt.conf.d/* -%exclude %{_sysconfdir}/apt/apt.conf.d/apt-groupinstall.conf -#%config %{_sysconfdir}/apt/sources.list.d/*.list -%config %{_sysconfdir}/apt/vendors.list.d/* -%config %{_initrddir}/apt +%dir %{_sysconfdir}/apt/apt.conf.d/ +%config %{_sysconfdir}/apt/apt.conf.d/default.conf +%config %{_sysconfdir}/apt/sources.list.d/ +%config %{_sysconfdir}/apt/vendors.list.d/ + +%config(noreplace) %{_sysconfdir}/sysconfig/apt %config %{_sysconfdir}/cron.daily/apt.cron +%{_sysconfdir}/apt/gpg/ +%{_initrddir}/apt + %{_bindir}/apt-cache %{_bindir}/apt-cdrom %{_bindir}/apt-config @@ -297,36 +286,51 @@ %{_bindir}/genpkglist %{_bindir}/gensrclist %{_bindir}/genbasedir -%{_libdir}/*.so.* -%{_libdir}/apt -%{_datadir}/apt -%exclude %{scriptdir}/apt-groupinstall.lua -%exclude %{scriptdir}/groupinstall-backend-comps.py -%{_mandir}/man?/* -%{_localstatedir}/cache/apt -%{_localstatedir}/state/apt +%{_libdir}/libapt-pkg*.so.* +%{_libdir}/apt/ +%dir %{_datadir}/apt/ +%dir %{_datadir}/apt/scripts/ +%{_datadir}/apt/scripts/gpg-check.lua +%{_datadir}/apt/scripts/gpg-import.lua +%{_datadir}/apt/scripts/preserve-conf.lua +%{_datadir}/apt/scripts/upgradevirt.lua +%{_localstatedir}/cache/apt/ +%{_localstatedir}/state/apt/ +%{_mandir}/man[58]/*.[58]* %files devel -%defattr(-, root, root) +%defattr(-,root,root,-) %{_includedir}/apt-pkg/ -%{_libdir}/*.so -%{_libdir}/*.a +%{_libdir}/libapt-pkg*.so %files python -%defattr(-, root, root) +%defattr(-,root,root,-) %{python_sitearch}/_apt.so %{python_sitearch}/apt.py %{python_sitearch}/apt.pyc %ghost %{python_sitearch}/apt.pyo +%if 0%{?_with_groupinstall:1} %files groupinstall -%defattr(-, root, root) +%defattr(-,root,root,-) +# XXX not config? %{_sysconfdir}/apt/apt.conf.d/apt-groupinstall.conf -%{scriptdir}/apt-groupinstall.lua -%{scriptdir}/groupinstall-backend-comps.py +%{_datadir}/apt/scripts/apt-groupinstall.lua +%{_datadir}/apt/scripts/groupinstall-backend-comps.py +%ghost %{_datadir}/apt/scripts/groupinstall-backend-comps.py[co] +%endif %changelog +* Sun Mar 19 2006 Ville Skytt?? - 0.5.15lorg3-0.1.pre1 +- 0.5.15lorg3-pre1: preliminary multilib and repomd support. +- Update config for kernel and module packages. +- Don't ship static libraries. +- Don't mark init script as config. +- Don't build -groupinstall for now. +- Clean up dependency lists for FC5+. +- Specfile cleanup. + * Sun Nov 13 2005 Ville Skytt?? - 0.5.15cnc7-7 - Rebuild against new OpenSSL. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- default.conf 18 Feb 2005 22:14:10 -0000 1.5 +++ default.conf 19 Mar 2006 20:52:50 -0000 1.6 @@ -26,9 +26,19 @@ // Completely ignore GnuPG signature packages (introduced in rpm 4.1) Ignore { "gpg-pubkey"; }; // Allow multiple kernel and kernel-related packages to be installed - Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; "^gpg-pubkey$"; }; + Allow-Duplicated { + "^kernel(-(hugemem|kdump|smp|xen[0U]))(-devel)?$"; + "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))$"; + "^kmod-.+$"; + "^gpg-pubkey$"; + }; // XXX: not used currently - //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; }; + //Allow-Duplicated-Upgrade { + // "^kernel(-(hugemem|kdump|smp|xen[0U]))(-devel)?$"; + // "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))$"; + // "^kmod-.+$"; + // "^gpg-pubkey$"; + //}; // "Upgrade" allow-duplicated packages as well Upgrade-Virtual "true"; // Enable source rebuilds Index: sources =================================================================== RCS file: /cvs/extras/rpms/apt/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Mar 2005 12:08:38 -0000 1.4 +++ sources 19 Mar 2006 20:52:50 -0000 1.5 @@ -1 +1 @@ -9e44ec1503fa96832bbd9b532543e4de apt-0.5.15cnc7.tar.bz2 +5c6b3f37374d266e89805a2912d11fb6 apt-0.5.15lorg3-pre1.tar.bz2 --- apt-0.5.15cnc5-manifest-limit.patch DELETED --- --- apt-0.5.15cnc6-pymake2.patch DELETED --- --- apt-0.5.15cnc6-rdonly.patch DELETED --- --- apt-pymake.patch DELETED --- --- apt-scriptdir.patch DELETED --- --- apt-shell-155990.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 21:04:22 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 14:04:22 -0700 Subject: rpms/scponly/FC-5 scponly.spec,1.4,1.5 Message-ID: <200603192104.k2JL4Mfj023228@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23217 Modified Files: scponly.spec Log Message: Need rsync in buildroot. Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-5/scponly.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scponly.spec 19 Mar 2006 20:38:22 -0000 1.4 +++ scponly.spec 19 Mar 2006 21:04:22 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -10,6 +10,7 @@ # Checks only for location of binaries BuildRequires: openssh-clients >= 3.4 +BuildRequires: rsync %description scponly is an alternative 'shell' for system administrators @@ -45,7 +46,7 @@ %{_bindir}/scponly %changelog -* Sun Mar 19 2006 Warren Togami - 4.6-2 +* Sun Mar 19 2006 Warren Togami - 4.6-3 - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too From fedora-extras-commits at redhat.com Sun Mar 19 21:07:22 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 14:07:22 -0700 Subject: rpms/scponly/FC-4 scponly.spec,1.4,1.5 Message-ID: <200603192107.k2JL7MBn023315@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23304 Modified Files: scponly.spec Log Message: Need rsync in buildroot. Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-4/scponly.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scponly.spec 19 Mar 2006 20:39:32 -0000 1.4 +++ scponly.spec 19 Mar 2006 21:07:22 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -10,6 +10,7 @@ # Checks only for location of binaries BuildRequires: openssh-clients >= 3.4 +BuildRequires: rsync %description scponly is an alternative 'shell' for system administrators @@ -45,7 +46,7 @@ %{_bindir}/scponly %changelog -* Sun Mar 19 2006 Warren Togami - 4.6-2 +* Sun Mar 19 2006 Warren Togami - 4.6-3 - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too From fedora-extras-commits at redhat.com Sun Mar 19 21:12:30 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 14:12:30 -0700 Subject: rpms/scponly/FC-3 scponly.spec,1.4,1.5 Message-ID: <200603192112.k2JLCUA6023420@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23409 Modified Files: scponly.spec Log Message: Need rsync in the buildroot too. Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-3/scponly.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scponly.spec 19 Mar 2006 20:40:00 -0000 1.4 +++ scponly.spec 19 Mar 2006 21:12:30 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -10,6 +10,7 @@ # Checks only for location of binaries BuildRequires: openssh-clients >= 3.4 +BuildRequires: rsync %description scponly is an alternative 'shell' for system administrators @@ -45,7 +46,7 @@ %{_bindir}/scponly %changelog -* Sun Mar 19 2006 Warren Togami - 4.6-2 +* Sun Mar 19 2006 Warren Togami - 4.6-3 - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too From fedora-extras-commits at redhat.com Sun Mar 19 21:21:54 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 19 Mar 2006 16:21:54 -0500 Subject: rpms/apt/devel apt.spec,1.19,1.20 default.conf,1.6,1.7 Message-ID: <200603192122.k2JLMQ6L023620@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23601 Modified Files: apt.spec default.conf Log Message: * Sun Mar 19 2006 Ville Skytt?? - 0.5.15lorg3-0.2.pre1 - Fix Allow-Duplicated* default.conf bugs introduced in previous version. Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- apt.spec 19 Mar 2006 20:52:50 -0000 1.19 +++ apt.spec 19 Mar 2006 21:21:54 -0000 1.20 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3 -Release: 0.1.pre1%{?dist} +Release: 0.2.pre1%{?dist} Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm License: GPL @@ -322,6 +322,9 @@ %changelog +* Sun Mar 19 2006 Ville Skytt?? - 0.5.15lorg3-0.2.pre1 +- Fix Allow-Duplicated* default.conf bugs introduced in previous version. + * Sun Mar 19 2006 Ville Skytt?? - 0.5.15lorg3-0.1.pre1 - 0.5.15lorg3-pre1: preliminary multilib and repomd support. - Update config for kernel and module packages. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- default.conf 19 Mar 2006 20:52:50 -0000 1.6 +++ default.conf 19 Mar 2006 21:21:54 -0000 1.7 @@ -27,15 +27,15 @@ Ignore { "gpg-pubkey"; }; // 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[0U]))?(-devel)?$"; + "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; "^kmod-.+$"; "^gpg-pubkey$"; }; // 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[0U]))?(-devel)?$"; + // "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; // "^kmod-.+$"; // "^gpg-pubkey$"; //}; From fedora-extras-commits at redhat.com Sun Mar 19 21:56:01 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:01 -0500 Subject: rpms/deutex - New directory Message-ID: <200603192156.k2JLu3Ah023839@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23831/deutex Log Message: Directory /cvs/extras/rpms/deutex added to the repository From fedora-extras-commits at redhat.com Sun Mar 19 21:56:07 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:07 -0500 Subject: rpms/deutex/devel - New directory Message-ID: <200603192156.k2JLu9h0023854@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23831/deutex/devel Log Message: Directory /cvs/extras/rpms/deutex/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 19 21:56:18 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:18 -0500 Subject: rpms/deutex Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603192156.k2JLuKUf023888@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876 Added Files: Makefile import.log Log Message: Setup of module deutex --- NEW FILE Makefile --- # Top level Makefile for module deutex all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 19 21:56:24 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:24 -0500 Subject: rpms/deutex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603192156.k2JLuQ6Q023908@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module deutex --- NEW 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 Mar 19 21:56:50 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:50 -0500 Subject: rpms/deutex import.log,1.1,1.2 Message-ID: <200603192157.k2JLvM3k023992@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23952 Modified Files: import.log Log Message: auto-import deutex-4.4.0-1 on branch devel from deutex-4.4.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/deutex/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Mar 2006 21:56:18 -0000 1.1 +++ import.log 19 Mar 2006 21:56:50 -0000 1.2 @@ -0,0 +1 @@ +deutex-4_4_0-1:HEAD:deutex-4.4.0-1.src.rpm:1142805407 From fedora-extras-commits at redhat.com Sun Mar 19 21:56:56 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:56 -0500 Subject: rpms/deutex/devel deutex-4.4.0-64bit.patch, NONE, 1.1 deutex-4.4.0-build.patch, NONE, 1.1 deutex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603192157.k2JLvSYK023996@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23952/devel Modified Files: .cvsignore sources Added Files: deutex-4.4.0-64bit.patch deutex-4.4.0-build.patch deutex.spec Log Message: auto-import deutex-4.4.0-1 on branch devel from deutex-4.4.0-1.src.rpm deutex-4.4.0-64bit.patch: --- NEW FILE deutex-4.4.0-64bit.patch --- diff -Naur deutex-4.4.0/src/deutex.h deutex-4.4.0.new/src/deutex.h --- deutex-4.4.0/src/deutex.h 1999-12-30 15:20:22.000000000 -0800 +++ deutex-4.4.0.new/src/deutex.h 2006-03-18 15:50:51.000000000 -0800 @@ -43,10 +43,10 @@ /*long = Int32 on a 32 bit processor*/ typedef char Int8; typedef short Int16; -typedef long Int32; +typedef int Int32; typedef unsigned char UInt8; typedef unsigned short UInt16; -typedef unsigned long UInt32; +typedef unsigned int UInt32; #endif #if defined DeuTex deutex-4.4.0-build.patch: --- NEW FILE deutex-4.4.0-build.patch --- diff -Naur deutex-4.4.0/Makefile deutex-4.4.0.new/Makefile --- deutex-4.4.0/Makefile 2006-03-18 15:53:16.000000000 -0800 +++ deutex-4.4.0.new/Makefile 2006-03-18 16:31:25.000000000 -0800 @@ -14,10 +14,10 @@ # Others Don't know. Send feedback to the maintainer. # -PREFIX=/usr/local +PREFIX=/usr # Compiled by users -CFLAGS = -O2 +CFLAGS := -O2 CC = cc LDFLAGS = @@ -190,10 +190,10 @@ touch $@ install: - install -p -m 0755 deutex $(PREFIX)/bin - install -p -m 0755 deusf $(PREFIX)/bin - install -p -m 0644 deutex.6 $(PREFIX)/man/man6 - ln -sf deutex.6 $(PREFIX)/man/man6/deusf.6 + install -pD -m 0755 deutex $(DESTDIR)$(PREFIX)/bin/deutex + install -pD -m 0755 deusf $(DESTDIR)$(PREFIX)/bin/deusf + install -pD -m 0644 deutex.6 $(DESTDIR)$(PREFIX)/share/man/man6/deutex.6 + install -pD -m 0644 deutex.6 $(DESTDIR)$(PREFIX)/share/man/man6/deusf.6 src/version.c: VERSION printf "const char deutex_version[] = \"%s\";\n" $(VERSION) >$@ --- NEW FILE deutex.spec --- Name: deutex Version: 4.4.0 Release: 1%{?dist} Summary: DOOM wad file manipulator Group: Amusements/Graphics License: GPL-Compatible URL: http://www.teaser.fr/~amajorel/deutex/ Source0: http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.tar.gz Patch0: deutex-4.4.0-build.patch Patch1: deutex-4.4.0-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description DeuTex is a wad composer for Doom, Heretic, Hexen and Strife. It can be used to extract the lumps of a wad and save them as individual files. Conversely, it can also build a wad from separate files. When extracting a lump to a file, it does not just copy the raw data, it converts it to an appropriate format (such as PPM for graphics, Sun audio for samples, etc.). Conversely, when it reads files for inclusion in pwads, it does the necessary conversions (for example, from PPM to Doom picture format). In addition, DeuTex has functions such as merging wads, etc. If you're doing any wad hacking beyond level editing, DeuTex is a must. %prep %setup -q %patch0 -p1 %patch1 -p1 # Minor permissions cleanup for rpmlint. chmod a-x src/picture.c %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} iconv --from=ISO-8859-1 --to=UTF-8 deutex.6 > deutex.6.new mv deutex.6.new deutex.6 %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/deutex %{_bindir}/deusf %{_mandir}/man6/* %doc COPYING COPYING.LIB LICENSE CHANGES README %doc docsrc/changes.html docsrc/hackers_guide.html %changelog * Sun Mar 19 2006 Wart 4.4.0-1 - Initial spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/deutex/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Mar 2006 21:56:24 -0000 1.1 +++ .cvsignore 19 Mar 2006 21:56:56 -0000 1.2 @@ -0,0 +1 @@ +deutex-4.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/deutex/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Mar 2006 21:56:24 -0000 1.1 +++ sources 19 Mar 2006 21:56:56 -0000 1.2 @@ -0,0 +1 @@ +4c4ea0ff9eae76165a3756b756d71a16 deutex-4.4.0.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 22:01:32 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 19 Mar 2006 17:01:32 -0500 Subject: rpms/sylpheed/devel sylpheed-2.2.3-defs.h.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 sylpheed.spec, 1.27, 1.28 sylpheed-default-browser.patch, 1.1, NONE Message-ID: <200603192202.k2JM24SE026029@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25991 Modified Files: .cvsignore sources sylpheed.spec Added Files: sylpheed-2.2.3-defs.h.patch Removed Files: sylpheed-default-browser.patch Log Message: * Sun Mar 19 2006 Michael Schwendt - 2.2.3-1 - Update to 2.2.3. - Update external commands (defs.h) patch. sylpheed-2.2.3-defs.h.patch: --- NEW FILE sylpheed-2.2.3-defs.h.patch --- diff -Nur sylpheed-2.2.3-orig/libsylph/defs.h sylpheed-2.2.3/libsylph/defs.h --- sylpheed-2.2.3-orig/libsylph/defs.h 2006-01-10 09:18:15.000000000 +0100 +++ sylpheed-2.2.3/libsylph/defs.h 2006-03-19 22:45:40.000000000 +0100 @@ -87,12 +87,12 @@ #else # define DEFAULT_SIGNATURE ".signature" #endif -#define DEFAULT_INC_PATH "/usr/bin/mh/inc" +#define DEFAULT_INC_PATH "/usr/bin/inc" #define DEFAULT_INC_PROGRAM "inc" /* #define DEFAULT_INC_PATH "/usr/bin/imget" */ /* #define DEFAULT_INC_PROGRAM "imget" */ #define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t -i" -#define DEFAULT_BROWSER_CMD "mozilla-firefox -remote 'openURL(%s,new-window)'" +#define DEFAULT_BROWSER_CMD "gnome-open '%s'" #ifdef _PATH_MAILDIR # define DEFAULT_SPOOL_PATH _PATH_MAILDIR Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 11 Nov 2005 11:03:34 -0000 1.15 +++ .cvsignore 19 Mar 2006 22:01:32 -0000 1.16 @@ -1,2 +1,2 @@ -sylpheed-2.0.4.tar.bz2.asc -sylpheed-2.0.4.tar.bz2 +sylpheed-2.2.3.tar.bz2.asc +sylpheed-2.2.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 11 Nov 2005 11:03:35 -0000 1.15 +++ sources 19 Mar 2006 22:01:32 -0000 1.16 @@ -1,2 +1,2 @@ -f4dc5a59840a59d92d432e297f7b5106 sylpheed-2.0.4.tar.bz2.asc -c9f1c4cf2b3933ebbb58519ba3b77887 sylpheed-2.0.4.tar.bz2 +e686a2fd8cf2ce3dd0ac766fd58fb15d sylpheed-2.2.3.tar.bz2.asc +4fe29639ac4f628f348120361310e0af sylpheed-2.2.3.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sylpheed.spec 15 Feb 2006 02:16:00 -0000 1.27 +++ sylpheed.spec 19 Mar 2006 22:01:32 -0000 1.28 @@ -4,8 +4,8 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed -Version: 2.0.4 -Release: 2%{?dist} +Version: 2.2.3 +Release: 1%{?dist} License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -16,11 +16,12 @@ %{!?_without_compface:BuildRequires: compface-devel} %{?_with_ldap:BuildRequires: openldap-devel} %{?_with_jpilot:BuildRequires: jpilot-devel} -Source0: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2 +BuildRequires: gtkspell-devel +Source0: http://sylpheed.good-day.net/sylpheed/v2.2/%{name}-%{version}.tar.bz2 Source1: sylpheed.1 -Patch2: sylpheed-default-browser.patch -Patch3: sylpheed-1.9.10-desktop.patch +Patch1: sylpheed-2.2.3-defs.h.patch +Patch2: sylpheed-1.9.10-desktop.patch %description This program is an X based fast email client which has features @@ -39,8 +40,8 @@ %prep %setup -q -%patch2 -p1 -b .default-browser -%patch3 -p1 -b .desktop +%patch1 -p1 -b .defs.h +%patch2 -p1 -b .desktop %build %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \ @@ -75,12 +76,20 @@ %doc COPYING ChangeLog README INSTALL TODO %doc ChangeLog.ja README.ja INSTALL.ja TODO.ja %{_bindir}/sylpheed -%{_datadir}/sylpheed +%{_datadir}/sylpheed/ %{_datadir}/applications/* %{_datadir}/pixmaps/* -%{_mandir}/man1 +%{_mandir}/man1/* %changelog +* Sun Mar 19 2006 Michael Schwendt - 2.2.3-1 +- Update to 2.2.3. +- Update external commands (defs.h) patch. + +* Sat Feb 18 2006 Michael Schwendt - 2.2.0-1 +- Update to 2.2.0 (new stable series). +- BR gtkspell-devel. + * Wed Feb 15 2006 Michael Schwendt - 2.0.4-2 - rebuilt for FC5 --- sylpheed-default-browser.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 22:19:55 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 17:19:55 -0500 Subject: owners owners.list,1.752,1.753 Message-ID: <200603192220.k2JMKSOV026122@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26093 Modified Files: owners.list Log Message: Added deutex Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.752 retrieving revision 1.753 diff -u -r1.752 -r1.753 --- owners.list 18 Mar 2006 23:07:35 -0000 1.752 +++ owners.list 19 Mar 2006 22:19:53 -0000 1.753 @@ -177,6 +177,7 @@ Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|denyhosts|A script to help thwart ssh server attacks|tibbs at math.uh.edu|extras-qa at fedoraproject.org| Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|deutex|Doom wad manipulation tool|wart at kobold.org|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|extras-orphan at fedoraproject.org|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 Sun Mar 19 22:42:34 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 19 Mar 2006 17:42:34 -0500 Subject: extras-buildsys/utils extras-sign-move.py,1.7,1.8 Message-ID: <200603192242.k2JMgYf0026250@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26221 Modified Files: extras-sign-move.py Log Message: - Add q'n'd arch copy functionality, use it for wine*.i386 -> x86_64. - Make code match comments wrt. use of copy2 for noarch packages. Index: extras-sign-move.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- extras-sign-move.py 17 Mar 2006 07:46:49 -0000 1.7 +++ extras-sign-move.py 19 Mar 2006 22:42:27 -0000 1.8 @@ -40,6 +40,20 @@ '5':['ppc','x86_64', 'i386'], 'development':['ppc','x86_64','i386'], } +# Note: *no* depsolving is done for these. +copydict = { 'wine.i386': ['x86_64'], + 'wine-arts.i386': ['x86_64'], + 'wine-capi.i386': ['x86_64'], + 'wine-cms.i386': ['x86_64'], + 'wine-debuginfo.i386': ['x86_64'], + 'wine-devel.i386': ['x86_64'], + 'wine-esd.i386': ['x86_64'], + 'wine-jack.i386': ['x86_64'], + 'wine-ldap.i386': ['x86_64'], + 'wine-nas.i386': ['x86_64'], + 'wine-tools.i386': ['x86_64'], + 'wine-twain.i386': ['x86_64'], + } ts = rpmUtils.transaction.initReadOnlyTransaction() @@ -198,11 +212,25 @@ # go through each package and move it to the right arch location. # if it is a noarch package, copy2 it to all arch locations and unlink it - # if it is a debuginfo package move it into the 'debug' dir for that arch + # if it is listed in copydict, copy2 it around as appropriate + # if it is a debuginfo package, move it into the 'debug' dir for that arch print "Moving Packages into Place" for package in files['rpm'] + files['debuginfo']: pkg_fn = os.path.basename(package) (n,a,e,v,r) = naevr(package) + + copyarchs = copydict.get('%s.%s' % (n, a)) + if copyarchs: + for arch in copyarchs: + if not arch in archdict[dist]: + continue + if package in files['debuginfo']: + arch = '%s/debug' % arch + rpmloc = os.path.join(destdir, arch, pkg_fn) + debugprint("Copying %s to %s" % (package, rpmloc)) + if not DEBUG: + shutil.copy2(package, rpmloc) + if a == 'noarch': for arch in archdict[dist]: if package in files['debuginfo']: @@ -210,7 +238,7 @@ rpmloc = os.path.join(destdir, arch, pkg_fn) debugprint("Copying %s to %s" % (package, rpmloc)) if not DEBUG: - shutil.copy(package, rpmloc) + shutil.copy2(package, rpmloc) if not DEBUG: os.unlink(package) From fedora-extras-commits at redhat.com Sun Mar 19 23:31:03 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 19 Mar 2006 18:31:03 -0500 Subject: rpms/fluxbox/FC-5 .cvsignore, 1.6, 1.7 fluxbox.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200603192331.k2JNVapt028445@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fluxbox/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28407/FC-5 Modified Files: .cvsignore fluxbox.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fluxbox/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Mar 2006 22:57:50 -0000 1.6 +++ .cvsignore 19 Mar 2006 23:31:02 -0000 1.7 @@ -1 +1 @@ -fluxbox-0.9.14.tar.bz2 +fluxbox-0.9.15.tar.bz2 Index: fluxbox.spec =================================================================== RCS file: /cvs/extras/rpms/fluxbox/FC-5/fluxbox.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fluxbox.spec 2 Mar 2006 22:57:50 -0000 1.16 +++ fluxbox.spec 19 Mar 2006 23:31:03 -0000 1.17 @@ -1,6 +1,6 @@ Name: fluxbox -Version: 0.9.14 -Release: 3%{?dist} +Version: 0.9.15 +Release: 1%{?dist} Summary: Window Manager based on Blackbox @@ -8,10 +8,9 @@ License: MIT URL: http://fluxbox.sourceforge.net -Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2 +Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.15.tar.bz2 Source3: fluxbox.desktop Source4: fluxbox-xdg-menu.py -Patch0: fluxbox-gcc41.patch Patch1: fluxbox-menu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -43,7 +42,6 @@ %prep %setup -q -%patch0 -p1 %patch1 %build @@ -80,6 +78,10 @@ %{_datadir}/xsessions/fluxbox.desktop %changelog +* Sun Mar 19 2006 Andreas Bierfert +0.9.15-1 +- version upgrade + * Thu Mar 02 2006 Andreas Bierfert 0.9.14-3 - fix Requires Index: sources =================================================================== RCS file: /cvs/extras/rpms/fluxbox/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 22:57:50 -0000 1.6 +++ sources 19 Mar 2006 23:31:03 -0000 1.7 @@ -1 +1 @@ -7641aaea532841e103e9705bb5b98f62 fluxbox-0.9.14.tar.bz2 +5fd0353b79d433c117f650a53c254e88 fluxbox-0.9.15.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 23:31:09 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 19 Mar 2006 18:31:09 -0500 Subject: rpms/fluxbox/devel .cvsignore, 1.6, 1.7 fluxbox.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200603192331.k2JNVfKZ028450@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fluxbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28407/devel Modified Files: .cvsignore fluxbox.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Mar 2006 22:57:50 -0000 1.6 +++ .cvsignore 19 Mar 2006 23:31:09 -0000 1.7 @@ -1 +1 @@ -fluxbox-0.9.14.tar.bz2 +fluxbox-0.9.15.tar.bz2 Index: fluxbox.spec =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fluxbox.spec 2 Mar 2006 22:57:50 -0000 1.16 +++ fluxbox.spec 19 Mar 2006 23:31:09 -0000 1.17 @@ -1,6 +1,6 @@ Name: fluxbox -Version: 0.9.14 -Release: 3%{?dist} +Version: 0.9.15 +Release: 1%{?dist} Summary: Window Manager based on Blackbox @@ -8,10 +8,9 @@ License: MIT URL: http://fluxbox.sourceforge.net -Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2 +Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.15.tar.bz2 Source3: fluxbox.desktop Source4: fluxbox-xdg-menu.py -Patch0: fluxbox-gcc41.patch Patch1: fluxbox-menu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -43,7 +42,6 @@ %prep %setup -q -%patch0 -p1 %patch1 %build @@ -80,6 +78,10 @@ %{_datadir}/xsessions/fluxbox.desktop %changelog +* Sun Mar 19 2006 Andreas Bierfert +0.9.15-1 +- version upgrade + * Thu Mar 02 2006 Andreas Bierfert 0.9.14-3 - fix Requires Index: sources =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 22:57:50 -0000 1.6 +++ sources 19 Mar 2006 23:31:09 -0000 1.7 @@ -1 +1 @@ -7641aaea532841e103e9705bb5b98f62 fluxbox-0.9.14.tar.bz2 +5fd0353b79d433c117f650a53c254e88 fluxbox-0.9.15.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 23:40:02 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 18:40:02 -0500 Subject: rpms/libopts import.log,1.3,1.4 Message-ID: <200603192340.k2JNeZJL028622@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28587 Modified Files: import.log Log Message: auto-import libopts-27.1-5 on branch devel from libopts-27.1-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libopts/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 19 Mar 2006 18:04:57 -0000 1.3 +++ import.log 19 Mar 2006 23:40:02 -0000 1.4 @@ -1,2 +1,3 @@ libopts-27_1-3:HEAD:libopts-27.1-3.src.rpm:1142771597 libopts-27_1-4:HEAD:libopts-27.1-4.src.rpm:1142791461 +libopts-27_1-5:HEAD:libopts-27.1-5.src.rpm:1142811579 From fedora-extras-commits at redhat.com Sun Mar 19 23:40:08 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 18:40:08 -0500 Subject: rpms/libopts/devel libopts.spec,1.2,1.3 Message-ID: <200603192340.k2JNefhY028625@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28587/devel Modified Files: libopts.spec Log Message: auto-import libopts-27.1-5 on branch devel from libopts-27.1-5.src.rpm Index: libopts.spec =================================================================== RCS file: /cvs/extras/rpms/libopts/devel/libopts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libopts.spec 19 Mar 2006 18:05:05 -0000 1.2 +++ libopts.spec 19 Mar 2006 23:40:08 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Options library for autogen Name: libopts Version: 27.1 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL or BSD Group: Development/Libraries Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz @@ -35,7 +35,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la rm -f ${RPM_BUILD_ROOT}%{_infodir}/libopts.txt* -rm -rf ${RPM_BUILD_ROOT}%{_infordir}/dir +rm -rf ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf ${RPM_BUILD_ROOT} @@ -64,6 +64,9 @@ %{_includedir}/autoopts %changelog +* Sun Mar 19 2006 Paul F. Johnson 27.1-5 +- Must learn to spell... must learn to spell... + * Sun Mar 19 2006 Paul F. Johnson 27.1-4 - Small patch to fix a build problem on the buildsys From fedora-extras-commits at redhat.com Sun Mar 19 23:47:46 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 19 Mar 2006 18:47:46 -0500 Subject: rpms/wine/FC-5 wine.spec,1.22,1.23 Message-ID: <200603192348.k2JNmIMs028741@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28709/FC-5 Modified Files: wine.spec Log Message: - bump for x86_64 inclusion Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- wine.spec 17 Mar 2006 13:29:02 -0000 1.22 +++ wine.spec 19 Mar 2006 23:47:46 -0000 1.23 @@ -2,7 +2,7 @@ Name: wine Version: 0.9.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -646,6 +646,10 @@ %{_libdir}/wine/*.def %changelog +* Mon Mar 20 2006 Andreas Bierfert +0.9.10-2 +- bump for x86_64 tree inclusion \o/ + * Thu Mar 16 2006 Andreas Bierfert 0.9.10-1 - version upgrade From fedora-extras-commits at redhat.com Sun Mar 19 23:47:52 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 19 Mar 2006 18:47:52 -0500 Subject: rpms/wine/devel wine.spec,1.22,1.23 Message-ID: <200603192348.k2JNmOh6028744@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28709/devel Modified Files: wine.spec Log Message: - bump for x86_64 inclusion Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- wine.spec 17 Mar 2006 13:29:08 -0000 1.22 +++ wine.spec 19 Mar 2006 23:47:51 -0000 1.23 @@ -2,7 +2,7 @@ Name: wine Version: 0.9.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -646,6 +646,10 @@ %{_libdir}/wine/*.def %changelog +* Mon Mar 20 2006 Andreas Bierfert +0.9.10-2 +- bump for x86_64 tree inclusion \o/ + * Thu Mar 16 2006 Andreas Bierfert 0.9.10-1 - version upgrade From fedora-extras-commits at redhat.com Mon Mar 20 00:58:53 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 19 Mar 2006 19:58:53 -0500 Subject: rpms/audacity/devel audacity-1.2.3-gcc41.patch, NONE, 1.1 audacity-1.2.4b-missing-pango.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 audacity.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200603200059.k2K0xP7q030983@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/audacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30942 Modified Files: .cvsignore audacity.spec sources Added Files: audacity-1.2.3-gcc41.patch audacity-1.2.4b-missing-pango.patch Log Message: sync with FC-5 branch audacity-1.2.3-gcc41.patch: --- NEW FILE audacity-1.2.3-gcc41.patch --- diff -Nur audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h --- audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h 2004-11-18 07:17:35.000000000 +0100 +++ audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h 2006-03-17 21:26:04.000000000 +0100 @@ -146,7 +146,7 @@ static const char *getVersionString(); /// Get SoundTouch library version Id - static uint SoundTouch::getVersionId(); + static uint getVersionId(); /// Sets new rate control value. Normal rate = 1.0, smaller values /// represent slower rate, larger faster rates. audacity-1.2.4b-missing-pango.patch: --- NEW FILE audacity-1.2.4b-missing-pango.patch --- diff -Nur audacity-src-1.2.4b-orig/src/Makefile.in audacity-src-1.2.4b/src/Makefile.in --- audacity-src-1.2.4b-orig/src/Makefile.in 2005-11-27 03:33:31.000000000 +0100 +++ audacity-src-1.2.4b/src/Makefile.in 2006-03-17 23:46:15.000000000 +0100 @@ -28,7 +28,7 @@ EXTRAOBJS = @EXTRAOBJS@ OPTOBJS = @OPTOBJS@ -LIBS = @LIBS@ +LIBS = @LIBS@ -lpangox-1.0 EXTRATARGETS = @EXTRATARGETS@ ######################################## Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:04:07 -0000 1.2 +++ .cvsignore 20 Mar 2006 00:58:52 -0000 1.3 @@ -1 +1 @@ -audacity-src-1.2.1.tar.bz2 +audacity-src-1.2.4b.tar.gz Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- audacity.spec 21 May 2005 10:36:06 -0000 1.12 +++ audacity.spec 20 Mar 2006 00:58:52 -0000 1.13 @@ -1,28 +1,32 @@ Name: audacity -Version: 1.2.3 -Release: 5 +Version: 1.2.4 +Release: 0.1.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.3.tar.gz +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 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 %{?_with_mp3:BuildRequires: libmad-devel} -%{?_with_gtk1:BuildRequires: wxGTK-devel} -%{!?_with_gtk1:BuildRequires: wxGTK2-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 Requires(postun): desktop-file-utils # Compile options: # --with mp3 : enable mp3 support -# --with gtk1 : use GTK+ version of wxGTK, else GTK2 version +# --with gtk2 : use GTK+ 2.x version of wxGTK, else GTK+ 1.x version # --with portaudiov19 : enable version 19 of portaudio (disables portmixer) @@ -35,8 +39,10 @@ Linux/*BSD, MacOS, and Windows. %prep -%setup -q -n %{name}-src-%{version} +%setup -q -n %{name}-src-%{version}b %patch1 -p1 -b .aboutdialog +%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 for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp @@ -45,6 +51,13 @@ 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-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 @@ -98,6 +111,13 @@ %doc %{_datadir}/doc/* %changelog +* Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b +- Update to 1.2.4b (stable release). +- Follow upstream recommendation and use the GTK+ 1.x wxGTK. + This is because of various issues with fonts/layout/behaviour. +- Build with compat-wxGTK-devel. +- Modify build section to find wx-2.4-config instead of wx-config. + * Fri May 20 2005 David Woodhouse - 1.2.3-5 - Bump release number again due to spurious build system failure and the fact that the build system seems to be ignoring repeated build Index: sources =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Dec 2004 16:24:36 -0000 1.4 +++ sources 20 Mar 2006 00:58:52 -0000 1.5 @@ -1 +1 @@ -dbfc1b401420aa694753d35acb5a8a28 audacity-src-1.2.3.tar.gz +37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz From fedora-extras-commits at redhat.com Mon Mar 20 02:44:37 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 21:44:37 -0500 Subject: rpms/cfitsio/FC-4 cfitsio.spec,1.11,1.12 Message-ID: <200603200245.k2K2jAjp002969@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2920/FC-4 Modified Files: cfitsio.spec Log Message: I know editing a changelog after the fact is wrong, but I had to get rid of the macros as they were screwing up many things. I originally thought that after the start of the changlog section, everything was treated as text and macros were not expanded. I was wrong. :-( Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-4/cfitsio.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cfitsio.spec 19 Mar 2006 17:42:23 -0000 1.11 +++ cfitsio.spec 20 Mar 2006 02:44:37 -0000 1.12 @@ -70,7 +70,7 @@ %changelog * Sun Mar 19 2006 Matthew Truch - 3.006-4 -- Don't use %{buildroot} in %build, only in %_install as per +- Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 * Fri Mar 10 2006 Matthew Truch - 3.006-3 From fedora-extras-commits at redhat.com Mon Mar 20 02:44:44 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 21:44:44 -0500 Subject: rpms/cfitsio/FC-5 cfitsio.spec,1.12,1.13 Message-ID: <200603200245.k2K2jGlu002972@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2920/FC-5 Modified Files: cfitsio.spec Log Message: I know editing a changelog after the fact is wrong, but I had to get rid of the macros as they were screwing up many things. I originally thought that after the start of the changlog section, everything was treated as text and macros were not expanded. I was wrong. :-( Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-5/cfitsio.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cfitsio.spec 19 Mar 2006 17:42:29 -0000 1.12 +++ cfitsio.spec 20 Mar 2006 02:44:43 -0000 1.13 @@ -70,7 +70,7 @@ %changelog * Sun Mar 19 2006 Matthew Truch - 3.006-4 -- Don't use %{buildroot} in %build, only in %_install as per +- Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 * Fri Mar 10 2006 Matthew Truch - 3.006-3 From fedora-extras-commits at redhat.com Mon Mar 20 02:44:49 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 21:44:49 -0500 Subject: rpms/cfitsio/devel cfitsio.spec,1.12,1.13 Message-ID: <200603200245.k2K2jLp3002975@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2920/devel Modified Files: cfitsio.spec Log Message: I know editing a changelog after the fact is wrong, but I had to get rid of the macros as they were screwing up many things. I originally thought that after the start of the changlog section, everything was treated as text and macros were not expanded. I was wrong. :-( Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cfitsio.spec 19 Mar 2006 17:42:35 -0000 1.12 +++ cfitsio.spec 20 Mar 2006 02:44:49 -0000 1.13 @@ -70,7 +70,7 @@ %changelog * Sun Mar 19 2006 Matthew Truch - 3.006-4 -- Don't use %{buildroot} in %build, only in %_install as per +- Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 * Fri Mar 10 2006 Matthew Truch - 3.006-3 From fedora-extras-commits at redhat.com Mon Mar 20 02:56:48 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 21:56:48 -0500 Subject: rpms/prboom/devel prboom-2.3.1-gamedir.patch,1.1,1.2 Message-ID: <200603200257.k2K2vKCl003001@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2981 Modified Files: prboom-2.3.1-gamedir.patch Log Message: Add freedoom to the in-game list of wads (Options -> Features -> Load Wad) prboom-2.3.1-gamedir.patch: Index: prboom-2.3.1-gamedir.patch =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/prboom-2.3.1-gamedir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom-2.3.1-gamedir.patch 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom-2.3.1-gamedir.patch 20 Mar 2006 02:56:47 -0000 1.2 @@ -1,6 +1,6 @@ diff -Naur prboom-2.3.1/configure prboom-2.3.1.new/configure ---- prboom-2.3.1/configure 2004-09-15 12:11:41.000000000 -0700 -+++ prboom-2.3.1.new/configure 2006-03-13 15:42:56.000000000 -0800 +--- prboom-2.3.1/configure 2006-03-19 18:45:36.000000000 -0800 ++++ prboom-2.3.1.new/configure 2006-03-18 08:59:30.000000000 -0800 @@ -1853,9 +1853,9 @@ @@ -13,10 +13,9 @@ fi cat >>confdefs.h <<_ACEOF #define DOOMWADDIR "$DOOMWADDIR" - diff -Naur prboom-2.3.1/src/d_main.c prboom-2.3.1.new/src/d_main.c ---- prboom-2.3.1/src/d_main.c 2006-03-08 18:41:07.000000000 -0800 -+++ prboom-2.3.1.new/src/d_main.c 2006-03-13 15:31:16.000000000 -0800 +--- prboom-2.3.1/src/d_main.c 2006-03-19 18:45:36.000000000 -0800 ++++ prboom-2.3.1.new/src/d_main.c 2006-03-18 08:59:35.000000000 -0800 @@ -158,6 +158,7 @@ "doom.wad", "doom1.wad", @@ -25,3 +24,14 @@ }; static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads; +diff -Naur prboom-2.3.1/src/mn_menus.c prboom-2.3.1.new/src/mn_menus.c +--- prboom-2.3.1/src/mn_menus.c 2004-09-15 12:09:48.000000000 -0700 ++++ prboom-2.3.1.new/src/mn_menus.c 2006-03-19 18:53:42.000000000 -0800 +@@ -425,6 +425,7 @@ + {it_title, FC_GOLD "load wad", NULL, "M_WAD"}, + {it_gap}, + {it_info, FC_GOLD "select iwad"}, ++ {it_runcmd, "Freedoom", "mn_iwad freedoom"}, + {it_runcmd, "Doom Shareware", "mn_iwad doom1"}, + {it_runcmd, "Doom", "mn_iwad doom"}, + {it_runcmd, "Ultimate Doom", "mn_iwad doomu"}, From fedora-extras-commits at redhat.com Mon Mar 20 03:07:02 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 19 Mar 2006 22:07:02 -0500 Subject: rpms/lucidlife/devel lucidlife.spec,1.5,1.6 Message-ID: <200603200307.k2K37a4g005047@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5027/devel Modified Files: lucidlife.spec Log Message: Update for new dist tag in Extras Development. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lucidlife.spec 16 Mar 2006 06:53:10 -0000 1.5 +++ lucidlife.spec 20 Mar 2006 03:07:02 -0000 1.6 @@ -1,6 +1,6 @@ Name: lucidlife Version: 0.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Conway's Life simulator Group: Amusements/Games @@ -58,6 +58,9 @@ %changelog +* Sun Mar 19 2006 Peter Gordon - 0.9-5 +- Rebuild for new dist tag in FE Devel. + * Wed Mar 15 2006 Peter Gordon - 0.9-4 - Rebuild for spec file fixes and email address change. From fedora-extras-commits at redhat.com Mon Mar 20 03:18:20 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 19 Mar 2006 22:18:20 -0500 Subject: rpms/lucidlife/FC-5 lucidlife.spec,1.5,1.6 Message-ID: <200603200318.k2K3IqYJ005246@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5214/FC-5 Modified Files: lucidlife.spec Log Message: Rebuild for new dist tag in FE Devel. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/FC-5/lucidlife.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lucidlife.spec 16 Mar 2006 06:53:10 -0000 1.5 +++ lucidlife.spec 20 Mar 2006 03:18:19 -0000 1.6 @@ -1,6 +1,6 @@ Name: lucidlife Version: 0.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Conway's Life simulator Group: Amusements/Games @@ -58,6 +58,9 @@ %changelog +* Sun Mar 19 2006 Peter Gordon - 0.9-5 +- Rebuild for new dist tag in FE Devel. + * Wed Mar 15 2006 Peter Gordon - 0.9-4 - Rebuild for spec file fixes and email address change. From fedora-extras-commits at redhat.com Mon Mar 20 03:18:31 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 19 Mar 2006 22:18:31 -0500 Subject: rpms/lucidlife/devel lucidlife.spec,1.6,1.7 Message-ID: <200603200319.k2K3J4UG005249@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5214/devel Modified Files: lucidlife.spec Log Message: Rebuild for new dist tag in FE Devel. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lucidlife.spec 20 Mar 2006 03:07:02 -0000 1.6 +++ lucidlife.spec 20 Mar 2006 03:18:31 -0000 1.7 @@ -1,6 +1,6 @@ Name: lucidlife Version: 0.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A Conway's Life simulator Group: Amusements/Games @@ -58,6 +58,9 @@ %changelog +* Sun Mar 19 2006 Peter Gordon - 0.9-6 +- Bump release due to CVS tagging not liking me. + * Sun Mar 19 2006 Peter Gordon - 0.9-5 - Rebuild for new dist tag in FE Devel. From fedora-extras-commits at redhat.com Mon Mar 20 04:21:17 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 19 Mar 2006 23:21:17 -0500 Subject: extras-buildsys/server Builder.py,1.31,1.32 Message-ID: <200603200421.k2K4LHbe007452@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7427/server Modified Files: Builder.py Log Message: Ping builders inactive at startup (#rh185514#) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Builder.py 19 Feb 2006 06:28:52 -0000 1.31 +++ Builder.py 20 Mar 2006 04:21:09 -0000 1.32 @@ -102,6 +102,10 @@ (self._alive, target_list) = self._ping_builder() if self._alive: self._init_builder(target_list) + else: + # Treat the builder as timed out and ping it periodically + self._ping_timeout = time.time() + self._suspend_reason = SUSPEND_TIMEOUT def _init_builder(self, target_list): self._target_list = target_list From fedora-extras-commits at redhat.com Mon Mar 20 04:22:16 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 19 Mar 2006 23:22:16 -0500 Subject: extras-buildsys/server Builder.py,1.20.2.8,1.20.2.9 Message-ID: <200603200422.k2K4MG0Y007481@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7463/server Modified Files: Tag: STABLE_0_4 Builder.py Log Message: Ping builders inactive at startup (#rh185514#) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.20.2.8 retrieving revision 1.20.2.9 diff -u -r1.20.2.8 -r1.20.2.9 --- Builder.py 19 Feb 2006 06:30:15 -0000 1.20.2.8 +++ Builder.py 20 Mar 2006 04:22:08 -0000 1.20.2.9 @@ -103,6 +103,10 @@ (self._alive, target_list) = self._ping_builder() if self._alive: self._init_builder(target_list) + else: + # Treat the builder as timed out and ping it periodically + self._ping_timeout = time.time() + self._suspend_reason = SUSPEND_TIMEOUT def _init_builder(self, target_list): self._target_list = target_list From fedora-extras-commits at redhat.com Mon Mar 20 05:59:02 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Mon, 20 Mar 2006 00:59:02 -0500 Subject: kadischi/ks_examples minimal-livecd.cfg,1.2,1.3 Message-ID: <200603200559.k2K5xWeJ009713@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/ks_examples In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9660/kadischi/ks_examples Modified Files: minimal-livecd.cfg Log Message: Various minor cleanups Index: minimal-livecd.cfg =================================================================== RCS file: /cvs/devel/kadischi/ks_examples/minimal-livecd.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- minimal-livecd.cfg 22 Aug 2005 20:34:15 -0000 1.2 +++ minimal-livecd.cfg 20 Mar 2006 05:59:00 -0000 1.3 @@ -19,6 +19,9 @@ # not guaranteed to work #clearpart --linux +# We shouldn't expect to be prompted when finished, let's not. +reboot + %packages %post From fedora-extras-commits at redhat.com Mon Mar 20 05:59:08 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Mon, 20 Mar 2006 00:59:08 -0500 Subject: kadischi/post_install_scripts 04auth.sh,1.1.1.1,1.2 Message-ID: <200603200559.k2K5xcoX009716@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9660/kadischi/post_install_scripts Modified Files: 04auth.sh Log Message: Various minor cleanups Index: 04auth.sh =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/04auth.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- 04auth.sh 21 Aug 2005 17:09:01 -0000 1.1.1.1 +++ 04auth.sh 20 Mar 2006 05:59:05 -0000 1.2 @@ -2,6 +2,11 @@ chroot $1 /usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth -chroot $1 /usr/sbin/lokkit --quiet --nostart -f --disabled - +# Don't disable a user's set firewall rules explicitly +fw_is_enabled=$(grep ^--enabled $1/etc/sysconfig/system-config-securitylevel) +if [ -n $fw_is_enabled ]; then + echo "Found an enabled firewall.." +else + chroot $1 /usr/sbin/lokkit --quiet --nostart -f --disabled +fi chroot $1 /usr/sbin/lokkit --quiet --nostart --selinux=disabled From fedora-extras-commits at redhat.com Mon Mar 20 05:59:13 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Mon, 20 Mar 2006 00:59:13 -0500 Subject: kadischi/rc rc.readonly-livecd,1.1.1.1,1.2 Message-ID: <200603200559.k2K5xh8h009720@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/rc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9660/kadischi/rc Modified Files: rc.readonly-livecd Log Message: Various minor cleanups Index: rc.readonly-livecd =================================================================== RCS file: /cvs/devel/kadischi/rc/rc.readonly-livecd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- rc.readonly-livecd 21 Aug 2005 17:08:47 -0000 1.1.1.1 +++ rc.readonly-livecd 20 Mar 2006 05:59:11 -0000 1.2 @@ -38,7 +38,11 @@ mount_file /etc echo "Moving /etc/rc.d to /livecd/ramfs (we need this for safe shutdown)" - mv /etc/rc.d /livecd/ramfs/ + if [ ! ${INITRD_DBG} ]; then + mv /etc/rc.d /livecd/ramfs/ >/dev/null 2>&1 + else + mv /etc/rc.d /livecd/ramfs/ + fi ln -s /livecd/ramfs/rc.d /etc/rc.d # Can be changed by dhcp: @@ -70,4 +74,4 @@ *) from_init ;; -esac \ No newline at end of file +esac From fedora-extras-commits at redhat.com Mon Mar 20 09:36:31 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 20 Mar 2006 04:36:31 -0500 Subject: fedora-security/audit fc5,1.81,1.82 Message-ID: <200603200936.k2K9aVQ7018649@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18615 Modified Files: fc5 Log Message: Bring up to date with GOLD FC5 For each vuln marked backport or VULNERABLE look to see if fc5-gold version has changed from fc5-test3 if not, keep the same marking as before if it has, see if we've changed major version if we have not then keep backport marking, but check vuln check code to see if we've fixed this by version or backport Add missing new vulns Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- fc5 14 Mar 2006 12:47:06 -0000 1.81 +++ fc5 20 Mar 2006 09:36:13 -0000 1.82 @@ -1,25 +1,17 @@ -Up to date CVE as of CVE email 20060313 -Up to date FC5 as of FC5-Test3 - -1. Removed packages with security issues that are no longer in FC5 -(iiimf, libungif, slocate) -2. Verified all marked as 'version', inc tricky packages like openssl -and httpd -3. Looked at those marked backport where we ship a newer version, manually -looked at rest marked backport -4. Looked at CVE for any new packages added to FC5 -5. Filed tracking bugs for vulnerable issues -6. Looked at extra packages in test2 which have had security issues -(mono, nss, php-pear) -7. Double check vulnerables and file fc5test2 bugs -8. Deal with new/removed packages in fc5test3 -9. Check all marked as backport/vulnerable to see what changed in test3 +Up to date CVE as of CVE email 20060319 +Up to date FC5 as of 20060320 ** are items that need attention +CVE-2006-1296 ** beagle +CVE-2006-1273 ** firefox (prob win only, vague) +CVE-2006-1251 ** exim +CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues +CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability +CVE-2006-1052 backport (kernel) patch-2.6.16-rc6 CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe @@ -27,23 +19,27 @@ CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) CVE-2006-0746 version (kdegraphics, fixed 3.4) -CVE-2006-0742 VULNERABLE (kernel) [fixed rawhide 1.2045] -CVE-2006-0741 VULNERABLE (kernel, fixed 2.6.15.5) [fixed rawhide 1.2045] +CVE-2006-0744 ** kernel +CVE-2006-0742 backport (kernel) patch-2.6.16-rc6 +CVE-2006-0741 backport (kernel, fixed 2.6.15.5) patch-2.6.16-rc6 CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 ignore (postgresql) we don't build --enable-cassert 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-0557 VULNERABLE (kernel, fixed 2.6.15.6) [fixed rawhide 1.2045] +CVE-2006-0557 backport (kernel, fixed 2.6.15.6) patch-2.6.16-rc6 +CVE-2006-0555 backport (kernel) patch-2.6.16-rc6-git3 +CVE-2006-0554 backport (kernel) patch-2.6.16-rc6 CVE-2006-0553 version (postgresql, only 8.1, fixed 8.1.3) -CVE-2006-0528 VULNERABLE (cairo) bz#182416 [fixed rawhide cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch] +CVE-2006-0528 backport (cairo) cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch CVE-2006-0496 VULNERABLE (mozilla) not fixed upstream CVE-2006-0496 VULNERABLE (firefox) not fixed upstream CVE-2006-0482 ignore (kernel) sparc only CVE-2006-0481 version (libpng, 1.2.7 only) CVE-2006-0459 version (flex) by inspection +CVE-2006-0457 backport (kernel) patch-2.6.16-rc6 CVE-2006-0455 version (gnupg, fixed 1.4.2.1) -CVE-2006-0454 backport (kernel, fixed 2.6.15.3) patch-2.6.16-rc3 +CVE-2006-0454 backport (kernel, fixed 2.6.15.3) patch-2.6.16-rc6 CVE-2006-0405 version (libtiff, 3.8.0 only) CVE-2006-0377 version (squirrelmail, fixed 1.4.6) CVE-2006-0369 ignore (mysql) this is not a security issue @@ -76,7 +72,7 @@ CVE-2006-0292 version (firefox, fixed 1.5.1) CVE-2006-0292 backport (mozilla) mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch CVE-2006-0292 version (thunderbird, fixed 1.5) -CVE-2006-0254 backport (tomcat5, fixed 5.5.16) +CVE-2006-0254 backport (tomcat5, fixed 5.5.16) **check this** CVE-2006-0236 ignore (thunderbird) windows only CVE-2006-0225 version (openssh, fixed 4.3p2) CVE-2006-0208 version (php, fixed 5.1.2) @@ -88,21 +84,21 @@ CVE-2006-0144 version (php-pear, not 1.4.4) CVE-2006-0097 ignore (php) Windows only CVE-2006-0096 ignore (kernel) minor and requires root -CVE-2006-0095 backport (kernel) patch-2.6.16-rc3 +CVE-2006-0095 backport (kernel) patch-2.6.16-rc6 CVE-2006-0082 version (ImageMagick, not 6.2.5.4) -CVE-2006-0049 VULNERABLE (gnupg, fixed 1.4.2.2) +CVE-2006-0049 version (gnupg, fixed 1.4.2.2) CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix -CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 -CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 -CVE-2006-0035 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 +CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 +CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 +CVE-2006-0035 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 CVE-2006-0019 version (kdelibs, fixed 3.5.1) CVE-2005-4703 ignore (tomcat) windows only CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS CVE-2005-4720 version (firefox, fixed 1.5) -CVE-2005-4720 versoin (thunderbird, fixed 1.5) +CVE-2005-4720 version (thunderbird, fixed 1.5) CVE-2005-4685 VULNERABLE (mozilla) not fixed upstream CVE-2005-4685 VULNERABLE (firefox) not fixed upstream -CVE-2005-4684 VULNERABLE (kdebase) not fixed upstream +CVE-2005-4684 ignore (kdebase) not fixed upstream, low, can't fix CVE-2005-4667 backport (unzip) CVE-2005-4639 version (kernel, fixed 2.6.15) CVE-2005-4636 version (openoffice.org, fixed 2.0.1) @@ -186,7 +182,7 @@ CVE-2005-3359 version (kernel, fixed 2.6.14) CVE-2005-3358 version (kernel, fixed 2.6.11) CVE-2005-3357 backport (httpd, affects 2.2.0) -CVE-2005-3356 backport (kernel) patch-2.6.16-rc3 +CVE-2005-3356 backport (kernel) patch-2.6.16-rc6 CVE-2005-3353 version (php, not 5.0) CVE-2005-3352 backport (httpd, fixed 2.2.1) CVE-2005-3351 version (spamassassin, fixed 3.1.0) @@ -269,7 +265,7 @@ CVE-2005-2917 version (squid, fixed 2.5.STABLE11) CVE-2005-2876 version (util-linux, fixed 2.13-pre3) CVE-2005-2874 version (cups, fixed 1.1.23) -CVE-2005-2873 VULNERABLE (kernel) not fixed upstream +CVE-2005-2873 VULNERABLE (kernel) not fixed upstream CVE-2005-2872 version (kernel, fixed 2.6.12) CVE-2005-2871 version (thunderbird) CVE-2005-2871 version (mozilla, fixed 1.7.12) @@ -1386,7 +1382,7 @@ CVE-2003-0133 version (evolution, fixed 1.2.4) CVE-2003-0132 version (httpd, fixed 2.0.45) CVE-2003-0131 version (openssl, not 0.9.8) -CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) +CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) CVE-2003-0130 version (evolution, fixed 1.2.3) CVE-2003-0129 version (evolution, fixed 1.2.3) CVE-2003-0128 version (evolution, fixed 1.2.3) From fedora-extras-commits at redhat.com Mon Mar 20 11:31:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 20 Mar 2006 06:31:07 -0500 Subject: rpms/TeXmacs/FC-5 TeXmacs-gcc41.patch, NONE, 1.1 TeXmacs.spec, 1.31, 1.32 Message-ID: <200603201131.k2KBVdMe023248@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23226 Modified Files: TeXmacs.spec Added Files: TeXmacs-gcc41.patch Log Message: TeXmacs-gcc41.patch: --- NEW FILE TeXmacs-gcc41.patch --- --- TeXmacs-1.0.6-src/src/Classes/Atomic/parse_string.hpp.gcc41 2006-03-20 11:50:54.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Classes/Atomic/parse_string.hpp 2006-03-20 11:51:11.000000000 +0100 @@ -48,4 +48,7 @@ }; CONCRETE_CODE(parse_string); +ostream& operator << (ostream& out, parse_string s); +bool test (parse_string s, string what); + #endif // defined PARSE_STRING_H --- TeXmacs-1.0.6-src/src/Typeset/Bridge/bridge.hpp.gcc41 2006-03-20 11:06:55.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/Bridge/bridge.hpp 2006-03-20 11:12:06.000000000 +0100 @@ -76,6 +76,7 @@ ostream& operator << (ostream& out, bridge br); extern bridge nil_bridge; tree substitute (tree t, path p, tree u); +bridge make_bridge (typesetter ttt, tree st, path ip); #include "impl_typesetter.hpp" --- TeXmacs-1.0.6-src/src/Typeset/Concat/concater.hpp.gcc41 2006-03-20 11:15:45.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/Concat/concater.hpp 2006-03-20 11:16:02.000000000 +0100 @@ -171,4 +171,10 @@ typedef concater_rep* concater; +box typeset_as_box (edit_env env, tree t, path ip); +array typeset_concat (edit_env env, tree t, path ip); +array typeset_concat_range (edit_env env, tree t, path ip, + int i1, int i2); +array typeset_marker (edit_env env, path ip); + #endif // defined CONCATER_H --- TeXmacs-1.0.6-src/src/Typeset/env.hpp.gcc41 2006-03-20 11:46:28.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/env.hpp 2006-03-20 11:46:41.000000000 +0100 @@ -434,4 +434,6 @@ void extract_format (tree fm, tree* r, int n); tree load_inclusion (url u); // implemented in tm_file.cpp +ostream& operator << (ostream& out, edit_env env); + #endif // defined ENV_H --- TeXmacs-1.0.6-src/src/Typeset/boxes.hpp.gcc41 2006-03-20 11:47:20.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/boxes.hpp 2006-03-20 11:47:51.000000000 +0100 @@ -314,4 +314,6 @@ attach_dip(t,decorate_middle(ip)),decorate_middle(ip) #define attach_right(t,ip) attach_dip(t,decorate_right(ip)),decorate_right(ip) +void make_eps (url dest, ::display dis, box b, int dpi); + #endif // defined BOXES_H --- TeXmacs-1.0.6-src/src/Window/ps_device.hpp.gcc41 2006-03-20 11:18:08.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Window/ps_device.hpp 2006-03-20 11:18:24.000000000 +0100 @@ -102,4 +102,9 @@ virtual void apply_shadow (SI x1, SI y1, SI x2, SI y2) = 0; }; + void abs_round (SI& l); + void abs_round (SI& x, SI& y); + void abs_inner_round (SI& x1, SI& y1, SI& x2, SI& y2); + void abs_outer_round (SI& x1, SI& y1, SI& x2, SI& y2); + #endif // defined PS_DEVICE_H Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- TeXmacs.spec 17 Feb 2006 23:47:44 -0000 1.31 +++ TeXmacs.spec 20 Mar 2006 11:31:06 -0000 1.32 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -10,6 +10,7 @@ Patch0: TeXmacs-maxima.patch Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch +Patch3: TeXmacs-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex @@ -51,6 +52,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -151,8 +153,11 @@ %changelog +* Mon Mar 20 2006 Gerard Milmeister - 1.0.6-6 +- fix problems with gcc41 (TeXmacs-gcc41.patch) + * Sat Feb 18 2006 Gerard Milmeister - 1.0.6-4 -- Temporary fix for compiling problem +- Temporary fix for compiling problem (TeXmacs-event.patch) * Fri Feb 17 2006 Gerard Milmeister - 1.0.6-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon Mar 20 11:32:58 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 20 Mar 2006 06:32:58 -0500 Subject: rpms/TeXmacs/devel TeXmacs-gcc41.patch, NONE, 1.1 TeXmacs.spec, 1.31, 1.32 Message-ID: <200603201133.k2KBXUuZ023324@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23304 Modified Files: TeXmacs.spec Added Files: TeXmacs-gcc41.patch Log Message: TeXmacs-gcc41.patch: --- NEW FILE TeXmacs-gcc41.patch --- --- TeXmacs-1.0.6-src/src/Classes/Atomic/parse_string.hpp.gcc41 2006-03-20 11:50:54.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Classes/Atomic/parse_string.hpp 2006-03-20 11:51:11.000000000 +0100 @@ -48,4 +48,7 @@ }; CONCRETE_CODE(parse_string); +ostream& operator << (ostream& out, parse_string s); +bool test (parse_string s, string what); + #endif // defined PARSE_STRING_H --- TeXmacs-1.0.6-src/src/Typeset/Bridge/bridge.hpp.gcc41 2006-03-20 11:06:55.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/Bridge/bridge.hpp 2006-03-20 11:12:06.000000000 +0100 @@ -76,6 +76,7 @@ ostream& operator << (ostream& out, bridge br); extern bridge nil_bridge; tree substitute (tree t, path p, tree u); +bridge make_bridge (typesetter ttt, tree st, path ip); #include "impl_typesetter.hpp" --- TeXmacs-1.0.6-src/src/Typeset/Concat/concater.hpp.gcc41 2006-03-20 11:15:45.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/Concat/concater.hpp 2006-03-20 11:16:02.000000000 +0100 @@ -171,4 +171,10 @@ typedef concater_rep* concater; +box typeset_as_box (edit_env env, tree t, path ip); +array typeset_concat (edit_env env, tree t, path ip); +array typeset_concat_range (edit_env env, tree t, path ip, + int i1, int i2); +array typeset_marker (edit_env env, path ip); + #endif // defined CONCATER_H --- TeXmacs-1.0.6-src/src/Typeset/env.hpp.gcc41 2006-03-20 11:46:28.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/env.hpp 2006-03-20 11:46:41.000000000 +0100 @@ -434,4 +434,6 @@ void extract_format (tree fm, tree* r, int n); tree load_inclusion (url u); // implemented in tm_file.cpp +ostream& operator << (ostream& out, edit_env env); + #endif // defined ENV_H --- TeXmacs-1.0.6-src/src/Typeset/boxes.hpp.gcc41 2006-03-20 11:47:20.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/boxes.hpp 2006-03-20 11:47:51.000000000 +0100 @@ -314,4 +314,6 @@ attach_dip(t,decorate_middle(ip)),decorate_middle(ip) #define attach_right(t,ip) attach_dip(t,decorate_right(ip)),decorate_right(ip) +void make_eps (url dest, ::display dis, box b, int dpi); + #endif // defined BOXES_H --- TeXmacs-1.0.6-src/src/Window/ps_device.hpp.gcc41 2006-03-20 11:18:08.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Window/ps_device.hpp 2006-03-20 11:18:24.000000000 +0100 @@ -102,4 +102,9 @@ virtual void apply_shadow (SI x1, SI y1, SI x2, SI y2) = 0; }; + void abs_round (SI& l); + void abs_round (SI& x, SI& y); + void abs_inner_round (SI& x1, SI& y1, SI& x2, SI& y2); + void abs_outer_round (SI& x1, SI& y1, SI& x2, SI& y2); + #endif // defined PS_DEVICE_H Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- TeXmacs.spec 17 Feb 2006 23:47:44 -0000 1.31 +++ TeXmacs.spec 20 Mar 2006 11:32:58 -0000 1.32 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -10,6 +10,7 @@ Patch0: TeXmacs-maxima.patch Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch +Patch3: TeXmacs-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex @@ -51,6 +52,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -151,8 +153,11 @@ %changelog +* Mon Mar 20 2006 Gerard Milmeister - 1.0.6-6 +- fix problems with gcc41 (TeXmacs-gcc41.patch) + * Sat Feb 18 2006 Gerard Milmeister - 1.0.6-4 -- Temporary fix for compiling problem +- Temporary fix for compiling problem (TeXmacs-event.patch) * Fri Feb 17 2006 Gerard Milmeister - 1.0.6-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon Mar 20 12:23:55 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Mon, 20 Mar 2006 07:23:55 -0500 Subject: rpms/libsexy/FC-5 .cvsignore, 1.6, 1.7 libsexy.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200603201224.k2KCORxv025560@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libsexy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25539 Modified Files: .cvsignore libsexy.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsexy/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Mar 2006 08:10:12 -0000 1.6 +++ .cvsignore 20 Mar 2006 12:23:54 -0000 1.7 @@ -1 +1 @@ -libsexy-0.1.7.tar.gz +libsexy-0.1.8.tar.gz Index: libsexy.spec =================================================================== RCS file: /cvs/extras/rpms/libsexy/FC-5/libsexy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libsexy.spec 16 Mar 2006 08:10:12 -0000 1.7 +++ libsexy.spec 20 Mar 2006 12:23:54 -0000 1.8 @@ -1,5 +1,5 @@ Name: libsexy -Version: 0.1.7 +Version: 0.1.8 Release: 1%{?dist} Summary: Funky fresh graphical widgets for GTK+ 2 @@ -9,7 +9,8 @@ Source0: http://releases.chipx86.com/libsexy/libsexy/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel libxml2-devel enchant-devel +BuildRequires: gtk2-devel libxml2-devel +Requires: enchant %description Some funky fresh graphical widgets for GTK+ 2 applications. @@ -55,6 +56,9 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Mar 20 2006 Ignacio Vazquez-Abrams 0.1.8-1 +- Upstream update + * Thu Mar 16 2006 Ignacio Vazquez-Abrams 0.1.7-1 - Upstream update Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsexy/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Mar 2006 08:10:12 -0000 1.6 +++ sources 20 Mar 2006 12:23:54 -0000 1.7 @@ -1 +1 @@ -227df7c2d7ca421f41cef12c98b1e40f libsexy-0.1.7.tar.gz +ddc52cc8196f9f0bf48a5c7569b6bb38 libsexy-0.1.8.tar.gz From fedora-extras-commits at redhat.com Mon Mar 20 12:32:25 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 20 Mar 2006 07:32:25 -0500 Subject: rpms/yumex/FC-5 sources,1.20,1.21 yumex.spec,1.21,1.22 Message-ID: <200603201232.k2KCWvM1025673@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25637/FC-5 Modified Files: sources yumex.spec Log Message: Release 0.99.13 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 13 Mar 2006 15:40:53 -0000 1.20 +++ sources 20 Mar 2006 12:32:25 -0000 1.21 @@ -1 +1 @@ -13564e96536b7e935ea5ee16eece3d3c yumex-0.99.12.tar.gz +cfad88b2e83aafa6f7523ea037ec2731 yumex-0.99.13.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- yumex.spec 13 Mar 2006 15:40:53 -0000 1.21 +++ yumex.spec 20 Mar 2006 12:32:25 -0000 1.22 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.12 +Version: 0.99.13 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,9 +65,11 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 +- Development Release 0.99.13-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 - Development Release 0.99.12-1.0 -- Added '-q' option to setup +- Added '-q' option to %%setup * Tue Feb 28 2006 Tim Lauridsen - 0.99.11-1.0 - Development Release 0.99.11-1.0 * Tue Feb 15 2006 Tim Lauridsen - 0.99.10-1.0 From fedora-extras-commits at redhat.com Mon Mar 20 12:32:31 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 20 Mar 2006 07:32:31 -0500 Subject: rpms/yumex/devel .cvsignore, 1.17, 1.18 sources, 1.20, 1.21 yumex.spec, 1.21, 1.22 Message-ID: <200603201233.k2KCX3sI025678@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25637/devel Modified Files: .cvsignore sources yumex.spec Log Message: Release 0.99.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 Mar 2006 15:40:53 -0000 1.17 +++ .cvsignore 20 Mar 2006 12:32:30 -0000 1.18 @@ -1 +1 @@ -yumex-0.99.12.tar.gz +yumex-0.99.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 13 Mar 2006 15:40:53 -0000 1.20 +++ sources 20 Mar 2006 12:32:30 -0000 1.21 @@ -1 +1 @@ -13564e96536b7e935ea5ee16eece3d3c yumex-0.99.12.tar.gz +cfad88b2e83aafa6f7523ea037ec2731 yumex-0.99.13.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- yumex.spec 13 Mar 2006 15:40:53 -0000 1.21 +++ yumex.spec 20 Mar 2006 12:32:30 -0000 1.22 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.12 +Version: 0.99.13 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,9 +65,11 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 +- Development Release 0.99.13-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 - Development Release 0.99.12-1.0 -- Added '-q' option to setup +- Added '-q' option to %%setup * Tue Feb 28 2006 Tim Lauridsen - 0.99.11-1.0 - Development Release 0.99.11-1.0 * Tue Feb 15 2006 Tim Lauridsen - 0.99.10-1.0 From fedora-extras-commits at redhat.com Mon Mar 20 12:43:28 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:43:28 -0500 Subject: extras-buildsys/server Builder.py, 1.32, 1.33 BuilderManager.py, 1.19, 1.20 Config.py, 1.13, 1.14 Message-ID: <200603201243.k2KChSDo025797@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25775/server Modified Files: Builder.py BuilderManager.py Config.py Log Message: 2006-03-20 Dan Williams * server/Config.py - Change config file format for builders. Each builder is now listed on a different line like this: builder1 = 20 https://127.0.0.1:8888 Each builder's tag (what's before the = sign) must start with 'builder'. The number right after the = is the builder's weight, or preference. Higher numbers mean the builder is more likely to be used. * server/BuilderManager.py - Use builder weights when picking which builder to use for a job * server/Builder.py - Add accessort for builder weight Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Builder.py 20 Mar 2006 04:21:09 -0000 1.32 +++ Builder.py 20 Mar 2006 12:43:21 -0000 1.33 @@ -67,7 +67,7 @@ _BUILDER_PING_INTERVAL = 60 * 5 # In seconds - def __init__(self, manager, cfg, address): + def __init__(self, manager, cfg, address, weight): self._cur_jobid = None self._manager = manager self._jobs = {} @@ -85,6 +85,7 @@ self._ping_now = False self._when_died = 0 self._server_cfg = cfg + self._weight = weight certs = None if self._server_cfg.get_bool("Builders", "use_ssl"): @@ -201,6 +202,9 @@ def free_slots(self): return self._free_slots + + def weight(self): + return self._weight def start_job(self, par_job, target_dict, srpm_url): if not self.available(): Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- BuilderManager.py 26 Nov 2005 06:10:22 -0000 1.19 +++ BuilderManager.py 20 Mar 2006 12:43:21 -0000 1.20 @@ -55,6 +55,7 @@ del builder_dict print string print "" + os._exit(1) self._queue_lock = threading.Lock() self._queue = [] @@ -72,21 +73,23 @@ def add_new_builders(self): self._builders_lock.acquire() - builder_list = [] - tmp_list = self._cfg.get_list("Builders", "builders") + tmp_list = self._cfg.builders() prefix = "http://" if self._cfg.get_bool("Builders", "use_ssl") == True: prefix = "https://" - for addr in tmp_list: + + builder_list = {} + for addr in tmp_list.keys(): + new_addr = addr # Rewrite addresses to match current builder connection method if addr.startswith("http://"): - addr = addr[7:] + new_addr = addr[7:] elif addr.startswith("https://"): - addr = addr[8:] - - builder_list.append(prefix + addr) + new_addr = addr[8:] + if new_addr: + builder_list[prefix + new_addr] = tmp_list[addr] - for address in builder_list: + for address in builder_list.keys(): # If the address is already in our _builders list, skip it skip = False for builder in self._builders: @@ -96,7 +99,8 @@ continue # Add the builder to our build list - builder = Builder.Builder(self, self._cfg, address) + weight = builder_list[address] + builder = Builder.Builder(self, self._cfg, address, weight) builder.start() self._builders.append(builder) @@ -124,15 +128,26 @@ return True return self._have_work - def _builder_sort_func(self, builder): - return builder.free_slots() - def _builder_cmp_func(self, builder1, builder2): - if builder1.free_slots() > builder2.free_slots(): + # If both builders have at least one free slot, sort on + # weight, not free slots + b1_free = builder1.free_slots() + b2_free = builder2.free_slots() + if b1_free > 0 and b2_free > 0: + b1_weight = builder1.weight() + b2_weight = builder2.weight() + # Equal weight case falls through to + # sort on free slots + if b1_weight > b2_weight: + return 1 + elif b1_weight < b2_weight: + return -1 + + if b1_free > b2_free: return 1 - elif builder1.free_slots() == builder2.free_slots(): + elif b1_free == b2_free: return 0 - elif builder1.free_slots() < builder2.free_slots(): + elif b1_free < b2_free: return -1 return 1 @@ -154,22 +169,21 @@ continue # Find all free builders that could satisfy the request - builder_list = [] + possible_builders = [] for builder in self._builders: if builder.available() and builder.can_build_for_target(req['target_dict']): - builder_list.append(builder) + possible_builders.append(builder) - # Use the builder with the most free build slots - if sys.version_info[:3] >= (2, 4, 0): - builder_list.sort(key=self._builder_sort_func, reverse=True) - else: - builder_list.sort(self._builder_cmp_func) - builder_list.reverse() + # Sort builder list by free slots and weights + possible_builders.sort(self._builder_cmp_func) + possible_builders.reverse() - for builder in builder_list: + for builder in possible_builders: try: job = builder.start_job(parent, req['target_dict'], req['srpm_url']) - except RuntimeError: + except RuntimeError, e: + print "Builder (%s) couldn't start job %s because: '%s'" % (builder.address(), + req['target_dict'], e) continue if not new_jobs.has_key(parent): Index: Config.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Config.py 13 Mar 2006 03:45:48 -0000 1.13 +++ Config.py 20 Mar 2006 12:43:21 -0000 1.14 @@ -39,10 +39,14 @@ self._targets = [] self._target_strings = {} self._target_aliases = {} + self._builders = self._load_builders() def targets(self): return self._targets + def builders(self): + return self._builders + def resolve_target_user_alias(self, user_alias): try: cfg = self._target_aliases[user_alias.lower()] @@ -91,7 +95,30 @@ try: self._add_target(target_cfg) except InvalidTargetException, e: - print "Error: could not add target %s because: %s" % (f, e) + print "Error: could not add target %s because: %s" % (f, e) + + def _load_builders(self): + if not self._config.has_section("Builders"): + return {} + items = self._config.items("Builders") + print items + builder_list = {} + for (tag, builder) in items: + if not tag.startswith("builder"): + continue + weight = 0 + weight_str = "0" + addr = None + try: + (weight_str, addr) = builder.split() + except ValueError: + pass + try: + weight = int(weight_str) + except ValueError: + weight = 0 + builder_list[addr] = weight + return builder_list def save_default_config(self, filename=None): self.add_section("General") @@ -113,7 +140,8 @@ self.add_section("Builders") self.set_option("Builders", "use_ssl", "yes") - self.set_option("Builders", "builders", "127.0.0.1:8888") + self.set_option("Builders", "0 builder1", "127.0.0.1:8888") + self.set_option("Builders", "10 builder2", "127.0.0.2:8888") self.add_section("SSL") self.set_option("SSL", "server_key_and_cert", "/etc/plague/server/certs/server_key_and_cert.pem") From fedora-extras-commits at redhat.com Mon Mar 20 12:44:28 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:44:28 -0500 Subject: extras-buildsys ChangeLog,1.175,1.176 Message-ID: <200603201244.k2KCiS7l025828@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25808 Modified Files: ChangeLog Log Message: 2006-03-20 Dan Williams * server/Config.py - Change config file format for builders. Each builder is now listed on a different line like this: builder1 = 20 https://127.0.0.1:8888 Each builder's tag (what's before the = sign) must start with 'builder'. The number right after the = is the builder's weight, or preference. Higher numbers mean the builder is more likely to be used. * server/BuilderManager.py - Use builder weights when picking which builder to use for a job * server/Builder.py - Add accessort for builder weight Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- ChangeLog 13 Mar 2006 15:19:21 -0000 1.175 +++ ChangeLog 20 Mar 2006 12:44:20 -0000 1.176 @@ -1,3 +1,19 @@ +2006-03-20 Dan Williams + + * server/Config.py + - Change config file format for builders. Each builder is now listed on + a different line like this: builder1 = 20 https://127.0.0.1:8888 + Each builder's tag (what's before the = sign) must start with + 'builder'. The number right after the = is the builder's + weight, or preference. Higher numbers mean the builder is more + likely to be used. + + * server/BuilderManager.py + - Use builder weights when picking which builder to use for a job + + * server/Builder.py + - Add accessort for builder weight + 2006-03-13 Dan Williams * builder/builder.py From fedora-extras-commits at redhat.com Mon Mar 20 12:47:08 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:47:08 -0500 Subject: extras-buildsys/server ArchJob.py,1.26,1.27 Message-ID: <200603201247.k2KCl8Ne025921@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25853/server Modified Files: ArchJob.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- ArchJob.py 23 Feb 2006 19:13:48 -0000 1.26 +++ ArchJob.py 20 Mar 2006 12:47:01 -0000 1.27 @@ -215,7 +215,7 @@ dl_dict[DL_WAIT_TIME] = 0 self._downloads[uf] = dl_dict - def dl_callback(self, status, cb_data): + def dl_callback(self, status, cb_data, err_msg): url = cb_data self._download_lock.acquire() dl_dict = self._downloads[url] @@ -226,8 +226,8 @@ if dl_dict[DL_RETRIES] >= 10: dl_dict[DL_STATUS] = STATUS_ERROR else: - print "%s (%s/%s): Failed to retrieve %s (attempt %d), trying again..." % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES]) + print "%s (%s/%s): Failed to retrieve %s (attempt %d) (Error %s), trying again..." % (self.par_job.uid, + self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES], err_msg) dl_dict[DL_STATUS] = STATUS_WAITING dl_dict[DL_WAIT_TIME] = 5 # Wait a bit before trying again dl_dict[DL_RETRIES] = dl_dict[DL_RETRIES] + 1 From fedora-extras-commits at redhat.com Mon Mar 20 12:46:52 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:46:52 -0500 Subject: extras-buildsys ChangeLog,1.176,1.177 Message-ID: <200603201247.k2KClMRw025924@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25853 Modified Files: ChangeLog Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- ChangeLog 20 Mar 2006 12:44:20 -0000 1.176 +++ ChangeLog 20 Mar 2006 12:46:44 -0000 1.177 @@ -1,5 +1,14 @@ 2006-03-20 Dan Williams + * common/FileDownloader.py + - Pass error message to download callback + + * builder/builder.py + server/ArchJob.py + - Print out download errors, if any + +2006-03-20 Dan Williams + * server/Config.py - Change config file format for builders. Each builder is now listed on a different line like this: builder1 = 20 https://127.0.0.1:8888 From fedora-extras-commits at redhat.com Mon Mar 20 12:46:57 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:46:57 -0500 Subject: extras-buildsys/builder builder.py,1.53,1.54 Message-ID: <200603201247.k2KClR9q025929@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25853/builder Modified Files: builder.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- builder.py 13 Mar 2006 15:19:27 -0000 1.53 +++ builder.py 20 Mar 2006 12:46:50 -0000 1.54 @@ -169,7 +169,7 @@ sys.stdout.write(s + string) sys.stdout.flush() - def dl_callback(self, dl_status, cb_data): + def dl_callback(self, dl_status, cb_data, err_msg): url = cb_data if dl_status == 'done': self._status = 'downloaded' @@ -187,7 +187,7 @@ else: # retry the download self._status = 'init' - self._log("ERROR: Failed to retrieve %s on attempt %d. Trying again...\n" % (url, self._srpm_tries)) + self._log("ERROR: Failed to retrieve %s on attempt %d (%s). Trying again...\n" % (url, self._srpm_tries, err_msg)) def _copy_mock_output_to_log(self): if self._mock_log and os.path.exists(self._mock_log): From fedora-extras-commits at redhat.com Mon Mar 20 12:47:03 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:47:03 -0500 Subject: extras-buildsys/common FileDownloader.py,1.16,1.17 Message-ID: <200603201247.k2KClXQE025935@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25853/common Modified Files: FileDownloader.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- FileDownloader.py 18 Nov 2005 15:11:27 -0000 1.16 +++ FileDownloader.py 20 Mar 2006 12:46:55 -0000 1.17 @@ -94,6 +94,7 @@ def run(self): result = None + err_msg = None if self._url and self._target_dir and self._filename: if not os.path.exists(self._target_dir): os.makedirs(self._target_dir) @@ -105,16 +106,16 @@ # if CommonErrors.canIgnoreSSLError(e): # pass except socket.error, e: - if CommonErrors.canIgnoreSocketError(e): - pass + if not CommonErrors.canIgnoreSocketError(e): + err_msg = "Socket Error: %s" % e except IOError, e: - if CommonErrors.canIgnoreSocketError(e): - pass + if not CommonErrors.canIgnoreSocketError(e): + err_msg = "IOError Error: %s" % e if result: - self._callback('done', self._cb_data) + self._callback('done', self._cb_data, err_msg) else: - self._callback('failed', self._cb_data) + self._callback('failed', self._cb_data, err_msg) From fedora-extras-commits at redhat.com Mon Mar 20 12:48:57 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:48:57 -0500 Subject: extras-buildsys/server ArchJob.py,1.16.2.9,1.16.2.10 Message-ID: <200603201248.k2KCmvRK026012@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25946/server Modified Files: Tag: STABLE_0_4 ArchJob.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.16.2.9 retrieving revision 1.16.2.10 diff -u -r1.16.2.9 -r1.16.2.10 --- ArchJob.py 23 Feb 2006 19:14:49 -0000 1.16.2.9 +++ ArchJob.py 20 Mar 2006 12:48:49 -0000 1.16.2.10 @@ -196,7 +196,7 @@ dl_dict[DL_WAIT_TIME] = 0 self._downloads[uf] = dl_dict - def dl_callback(self, status, cb_data): + def dl_callback(self, status, cb_data, err_msg): url = cb_data self._download_lock.acquire() dl_dict = self._downloads[url] @@ -207,8 +207,8 @@ if dl_dict[DL_RETRIES] >= 10: dl_dict[DL_STATUS] = STATUS_ERROR else: - print "%s (%s/%s): Failed to retrieve %s (attempt %d), trying again..." % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES]) + print "%s (%s/%s): Failed to retrieve %s (attempt %d) (Error %s), trying again..." % (self.par_job.uid, + self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES], err_msg) dl_dict[DL_STATUS] = STATUS_WAITING dl_dict[DL_WAIT_TIME] = 5 # Wait a bit before trying again dl_dict[DL_RETRIES] = dl_dict[DL_RETRIES] + 1 From fedora-extras-commits at redhat.com Mon Mar 20 12:48:40 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:48:40 -0500 Subject: extras-buildsys ChangeLog,1.126.2.45,1.126.2.46 Message-ID: <200603201249.k2KCnBlP026015@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25946 Modified Files: Tag: STABLE_0_4 ChangeLog Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.45 retrieving revision 1.126.2.46 diff -u -r1.126.2.45 -r1.126.2.46 --- ChangeLog 13 Mar 2006 15:17:43 -0000 1.126.2.45 +++ ChangeLog 20 Mar 2006 12:48:33 -0000 1.126.2.46 @@ -1,3 +1,12 @@ +2006-03-20 Dan Williams + + * common/FileDownloader.py + - Pass error message to download callback + + * builder/builder.py + server/ArchJob.py + - Print out download errors, if any + 2006-03-13 Dan Williams * Release of 0.4.4.1 From fedora-extras-commits at redhat.com Mon Mar 20 12:48:46 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:48:46 -0500 Subject: extras-buildsys/builder builder.py,1.44.2.9,1.44.2.10 Message-ID: <200603201249.k2KCnGTU026018@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25946/builder Modified Files: Tag: STABLE_0_4 builder.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.44.2.9 retrieving revision 1.44.2.10 diff -u -r1.44.2.9 -r1.44.2.10 --- builder.py 13 Mar 2006 15:17:49 -0000 1.44.2.9 +++ builder.py 20 Mar 2006 12:48:38 -0000 1.44.2.10 @@ -169,7 +169,7 @@ sys.stdout.write(s + string) sys.stdout.flush() - def dl_callback(self, dl_status, cb_data): + def dl_callback(self, dl_status, cb_data, err_msg): url = cb_data if dl_status == 'done': self._status = 'downloaded' @@ -187,7 +187,7 @@ else: # retry the download self._status = 'init' - self._log("ERROR: Failed to retrieve %s on attempt %d. Trying again...\n" % (url, self._srpm_tries)) + self._log("ERROR: Failed to retrieve %s on attempt %d (%s). Trying again...\n" % (url, self._srpm_tries, err_msg)) def _copy_mock_output_to_log(self): if self._mock_log and os.path.exists(self._mock_log): From fedora-extras-commits at redhat.com Mon Mar 20 12:48:51 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:48:51 -0500 Subject: extras-buildsys/common FileDownloader.py,1.15.2.1,1.15.2.2 Message-ID: <200603201249.k2KCnMZD026021@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25946/common Modified Files: Tag: STABLE_0_4 FileDownloader.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -u -r1.15.2.1 -r1.15.2.2 --- FileDownloader.py 18 Nov 2005 15:13:15 -0000 1.15.2.1 +++ FileDownloader.py 20 Mar 2006 12:48:44 -0000 1.15.2.2 @@ -94,6 +94,7 @@ def run(self): result = None + err_msg = None if self._url and self._target_dir and self._filename: if not os.path.exists(self._target_dir): os.makedirs(self._target_dir) @@ -105,16 +106,16 @@ # if CommonErrors.canIgnoreSSLError(e): # pass except socket.error, e: - if CommonErrors.canIgnoreSocketError(e): - pass + if not CommonErrors.canIgnoreSocketError(e): + err_msg = "Socket Error: %s" % e except IOError, e: - if CommonErrors.canIgnoreSocketError(e): - pass + if not CommonErrors.canIgnoreSocketError(e): + err_msg = "IOError Error: %s" % e if result: - self._callback('done', self._cb_data) + self._callback('done', self._cb_data, err_msg) else: - self._callback('failed', self._cb_data) + self._callback('failed', self._cb_data, err_msg) From fedora-extras-commits at redhat.com Mon Mar 20 14:37:11 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 20 Mar 2006 09:37:11 -0500 Subject: fedora-security/audit fc5,1.82,1.83 Message-ID: <200603201437.k2KEbB5b030844@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30819 Modified Files: fc5 Log Message: triage exim Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- fc5 20 Mar 2006 09:36:13 -0000 1.82 +++ fc5 20 Mar 2006 14:37:03 -0000 1.83 @@ -5,7 +5,7 @@ CVE-2006-1296 ** beagle CVE-2006-1273 ** firefox (prob win only, vague) -CVE-2006-1251 ** exim +CVE-2006-1251 version (exim) script not shipped CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) @@ -332,7 +332,7 @@ CVE-2005-2491 ignore (httpd) httpd uses system pcre CVE-2005-2490 version (kernel, fixed 2.6.13.1) CVE-2005-2475 backport (unzip) unzip-5.52-toctou.patch -CVE-2005-2471 verison (netpbm, fixed 10.31) +CVE-2005-2471 version (netpbm, fixed 10.31) CVE-2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible CVE-2005-2458 version (kernel, fixed 2.6.12.5) CVE-2005-2457 version (kernel, fixed 2.6.12.5) @@ -746,7 +746,7 @@ CVE-2004-2607 version (kernel, fixed 2.6.5) CVE-2004-2589 version (gaim, fixed 0.82) CVE-2004-2546 version (samba, fixed 3.0.6) -CVE-2004-2541 blocked (cscope) by FORTIFY_SOURCE +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 @@ -961,7 +961,7 @@ CVE-2004-0832 version (squid, fixed 2.5.STABLE7) CVE-2004-0829 version (samba, fixed 2.2.11) CVE-2004-0827 version (ImageMagick, fixed 6.0.6.2) -CVE-2004-0826 verson (nss, fixed 3.9.2) +CVE-2004-0826 version (nss, fixed 3.9.2) CVE-2004-0823 version (openldap, fixed after 2.1.19) CVE-2004-0817 version (imlib, fixed 2.1.20 at least) CVE-2004-0816 version (kernel, fixed 2.6.8) @@ -1337,7 +1337,7 @@ CVE-2003-0354 version (ghostscript, fixed 7.07) CVE-2003-0328 version (epic, fixed epic4-2.2 at least) CVE-2003-0300 ignore (sylpheed) only a crasher -CVE-2003-0299 ignmore (mutt) only a crasher +CVE-2003-0299 ignore (mutt) only a crasher CVE-2003-0298 version (mozilla, fixed after 1.4a) CVE-2003-0296 version (evolution, fixed 1.4.5 at least) CVE-2003-0289 version (cdrtools, fixed 2.01a14) From fedora-extras-commits at redhat.com Mon Mar 20 14:52:09 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 20 Mar 2006 09:52:09 -0500 Subject: fedora-security/audit fc4,1.173,1.174 fc5,1.83,1.84 Message-ID: <200603201452.k2KEq9ga030971@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30947 Modified Files: fc4 fc5 Log Message: Note the new cURL issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- fc4 14 Mar 2006 12:47:06 -0000 1.173 +++ fc4 20 Mar 2006 14:52:02 -0000 1.174 @@ -6,6 +6,7 @@ CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability +CVE-2006-1061 ignore (curl, 7.15.0 - 7.15.2 only) CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- fc5 20 Mar 2006 14:37:03 -0000 1.83 +++ fc5 20 Mar 2006 14:52:02 -0000 1.84 @@ -11,6 +11,7 @@ CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability +CVE-2006-1061 VULNERABLE (curl, fixed 7.15.3) CVE-2006-1052 backport (kernel) patch-2.6.16-rc6 CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe From fedora-extras-commits at redhat.com Mon Mar 20 16:09:28 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 20 Mar 2006 11:09:28 -0500 Subject: fedora-security/audit fc4,1.174,1.175 fc5,1.84,1.85 Message-ID: <200603201609.k2KG9SOi004706@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4686 Modified Files: fc4 fc5 Log Message: x.org issue is first advisory Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- fc4 20 Mar 2006 14:52:02 -0000 1.174 +++ fc4 20 Mar 2006 16:09:19 -0000 1.175 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060313 -Up to date FC4 as of 20060313 +Up to date CVE as of CVE email 20060315 +Up to date FC4 as of 20060315 ** are items that need attention +CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues +CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability @@ -14,6 +16,7 @@ CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) CVE-2006-0746 VULNERABLE (kpdf) bz#184308 +CVE-2006-0745 version (xorg-x11) not fc4 CVE-2006-0742 VULNERABLE (kernel) CVE-2006-0741 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0730 version (dovecot, 1.0beta[12] only) @@ -190,7 +193,7 @@ CVE-2005-3273 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] CVE-2005-3272 version (kernel, fixed 2.6.13) [since FEDORA-2005-949] CVE-2005-3271 version (kernel, fixed 2.6.9) since GA -CVE-2005-3258 backport (squid) [since FEDORA-2005-1009] +CVE-2005-3258 version (squid, fixed 2.5.STABLE12) [since FEDORA-2006-150] was backport since FEDORA-2005-1009 CVE-2005-3257 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2005-1138 CVE-2005-3249 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] CVE-2005-3248 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- fc5 20 Mar 2006 14:52:02 -0000 1.84 +++ fc5 20 Mar 2006 16:09:19 -0000 1.85 @@ -20,6 +20,7 @@ CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) CVE-2006-0746 version (kdegraphics, fixed 3.4) +CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172] CVE-2006-0744 ** kernel CVE-2006-0742 backport (kernel) patch-2.6.16-rc6 CVE-2006-0741 backport (kernel, fixed 2.6.15.5) patch-2.6.16-rc6 From fedora-extras-commits at redhat.com Mon Mar 20 16:40:47 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:40:47 -0500 Subject: owners owners.list,1.753,1.754 Message-ID: <200603201641.k2KGfJw3004979@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4962 Modified Files: owners.list Log Message: added perl-Date-Pcalc Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.753 retrieving revision 1.754 diff -u -r1.753 -r1.754 --- owners.list 19 Mar 2006 22:19:53 -0000 1.753 +++ owners.list 20 Mar 2006 16:40:46 -0000 1.754 @@ -875,6 +875,7 @@ Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Date-Pcalc|Gregorian calendar date calculations|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DBD-CSV|DBI driver for CSV files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon Mar 20 16:47:23 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:47:23 -0500 Subject: rpms/perl-Date-Pcalc - New directory Message-ID: <200603201647.k2KGlPJw005052@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5044/perl-Date-Pcalc Log Message: Directory /cvs/extras/rpms/perl-Date-Pcalc added to the repository From fedora-extras-commits at redhat.com Mon Mar 20 16:47:29 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:47:29 -0500 Subject: rpms/perl-Date-Pcalc/devel - New directory Message-ID: <200603201647.k2KGlVBM005067@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5044/perl-Date-Pcalc/devel Log Message: Directory /cvs/extras/rpms/perl-Date-Pcalc/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 20 16:47:40 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:47:40 -0500 Subject: rpms/perl-Date-Pcalc Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603201647.k2KGlgbx005101@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5089 Added Files: Makefile import.log Log Message: Setup of module perl-Date-Pcalc --- NEW FILE Makefile --- # Top level Makefile for module perl-Date-Pcalc all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 20 16:47:45 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:47:45 -0500 Subject: rpms/perl-Date-Pcalc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603201647.k2KGllX2005121@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5089/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Date-Pcalc --- NEW 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 Mar 20 16:48:06 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:48:06 -0500 Subject: rpms/perl-Date-Pcalc import.log,1.1,1.2 Message-ID: <200603201648.k2KGmdU6005235@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5155 Modified Files: import.log Log Message: auto-import perl-Date-Pcalc-1.2-3 on branch devel from perl-Date-Pcalc-1.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Date-Pcalc/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Mar 2006 16:47:39 -0000 1.1 +++ import.log 20 Mar 2006 16:48:06 -0000 1.2 @@ -0,0 +1 @@ +perl-Date-Pcalc-1_2-3:HEAD:perl-Date-Pcalc-1.2-3.src.rpm:1142876885 From fedora-extras-commits at redhat.com Mon Mar 20 16:48:13 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:48:13 -0500 Subject: rpms/perl-Date-Pcalc/devel perl-Date-Pcalc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603201648.k2KGmjrq005240@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5155/devel Modified Files: .cvsignore sources Added Files: perl-Date-Pcalc.spec Log Message: auto-import perl-Date-Pcalc-1.2-3 on branch devel from perl-Date-Pcalc-1.2-3.src.rpm --- NEW FILE perl-Date-Pcalc.spec --- Name: perl-Date-Pcalc Version: 1.2 Release: 3%{?dist} Summary: Gregorian calendar date calculations License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Date-Pcalc/ Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/Date-Pcalc-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: %{_bindir}/iconv %description This package consists of a Perl module for all kinds of date calculations based on the Gregorian calendar (the one used in all western countries today), thereby complying with all relevant norms and standards: ISO/R 2015-1971, DIN 1355 and, to some extent, ISO 8601 (where applicable). %prep %setup -q -n Date-Pcalc-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %{_bindir}/iconv --from-code=ISO-8859-1 --to-code=UTF-8 blib/man3/Date::Pcalc.3pm -o blib/man3/Date::Pcalc.3pm-utf8 mv blib/man3/Date::Pcalc.3pm-utf8 blib/man3/Date::Pcalc.3pm 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/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc CHANGES.txt README.txt EXAMPLES.txt CREDITS.txt GNU_GPL.txt Artistic.txt %{perl_vendorlib}/Date %{_mandir}/man3/* %changelog * Mon Mar 20 2006 Mike McGrath - 1.2-3 - Minor fixes and formatting in spec file * Sun Mar 19 2006 Mike McGrath - 1.2-2 - Include license and credits - Convert manpage to utf-8 * Sat Mar 18 2006 Mike McGrath - 1.2-1 - First attempt at a Fedora friendly spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Date-Pcalc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Mar 2006 16:47:45 -0000 1.1 +++ .cvsignore 20 Mar 2006 16:48:13 -0000 1.2 @@ -0,0 +1 @@ +Date-Pcalc-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Date-Pcalc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Mar 2006 16:47:45 -0000 1.1 +++ sources 20 Mar 2006 16:48:13 -0000 1.2 @@ -0,0 +1 @@ +1c09a09337c7d2e18a17898ca577c644 Date-Pcalc-1.2.tar.gz From fedora-extras-commits at redhat.com Mon Mar 20 17:33:21 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Mon, 20 Mar 2006 12:33:21 -0500 Subject: fedora-release fedora-core.repo, 1.2, 1.3 fedora-development.repo, 1.3, 1.4 fedora-extras-development.repo, 1.2, 1.3 fedora-extras.repo, 1.4, 1.5 fedora-legacy.repo, 1.1, 1.2 fedora-updates-testing.repo, 1.4, 1.5 fedora-updates.repo, 1.7, 1.8 Message-ID: <200603201733.k2KHXLUG007645@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7616 Modified Files: fedora-core.repo fedora-development.repo fedora-extras-development.repo fedora-extras.repo fedora-legacy.repo fedora-updates-testing.repo fedora-updates.repo Log Message: mirror-list should reference Download not download. Index: fedora-core.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-core.repo 9 Mar 2006 20:21:21 -0000 1.2 +++ fedora-core.repo 20 Mar 2006 17:33:14 -0000 1.3 @@ -1,7 +1,7 @@ [core] name=Fedora Core $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os/ -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-$releasever enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-development.repo 9 Mar 2006 20:21:21 -0000 1.3 +++ fedora-development.repo 20 Mar 2006 17:33:14 -0000 1.4 @@ -26,7 +26,7 @@ [development] name=Fedora Core - Development #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/ -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide enabled=0 gpgcheck=0 Index: fedora-extras-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-extras-development.repo 9 Mar 2006 20:21:21 -0000 1.2 +++ fedora-extras-development.repo 20 Mar 2006 17:33:14 -0000 1.3 @@ -1,7 +1,7 @@ [extras-development] name=Fedora Extras - Development Tree #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/ -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-devel enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-extras.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-extras.repo 9 Mar 2006 20:21:21 -0000 1.4 +++ fedora-extras.repo 20 Mar 2006 17:33:14 -0000 1.5 @@ -1,7 +1,7 @@ [extras] name=Fedora Extras $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/ -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-$releasever enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-legacy.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-legacy.repo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-legacy.repo 7 Mar 2006 00:53:09 -0000 1.1 +++ fedora-legacy.repo 20 Mar 2006 17:33:14 -0000 1.2 @@ -1,13 +1,13 @@ [legacy-updates] name=Fedora Legacy $releasever - $basearch - Updates -mirrorlist=http://fedora.redhat.com/download/mirrors/legacy-updates-released-fc$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/legacy-updates-released-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy [legacy-testing] name=Fedora Legacy $releasever - $basearch - Updates Testing -mirrorlist=http://fedora.redhat.com/download/mirrors/legacy-updates-testing-fc$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/legacy-updates-testing-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy Index: fedora-updates-testing.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-updates-testing.repo 15 Feb 2006 19:58:10 -0000 1.4 +++ fedora-updates-testing.repo 20 Mar 2006 17:33:14 -0000 1.5 @@ -1,7 +1,7 @@ [updates-testing] name=Fedora Core $releasever - $basearch - Test Updates #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/$basearch/ -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-testing-fc$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test Index: fedora-updates.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fedora-updates.repo 9 Mar 2006 20:21:21 -0000 1.7 +++ fedora-updates.repo 20 Mar 2006 17:33:14 -0000 1.8 @@ -1,7 +1,7 @@ [updates] name=Fedora Core $releasever - $basearch - Updates #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/ -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-fc$releasever enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora From fedora-extras-commits at redhat.com Mon Mar 20 18:00:55 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 20 Mar 2006 13:00:55 -0500 Subject: fedora-security/audit fc5,1.85,1.86 Message-ID: <200603201800.k2KI0tOF007877@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7859 Modified Files: fc5 Log Message: Note a new beagle issue. Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- fc5 20 Mar 2006 16:09:19 -0000 1.85 +++ fc5 20 Mar 2006 18:00:48 -0000 1.86 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-2006-1296 ** beagle +CVE-2006-1296 VULNERABLE (beagle) bz#185981 CVE-2006-1273 ** firefox (prob win only, vague) CVE-2006-1251 version (exim) script not shipped CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues From fedora-extras-commits at redhat.com Mon Mar 20 18:21:22 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 13:21:22 -0500 Subject: extras-buildsys/server Config.py,1.14,1.15 Message-ID: <200603201821.k2KILMJS009989@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9964/server Modified Files: Config.py Log Message: Some fixups from builder weight patch Index: Config.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Config.py 20 Mar 2006 12:43:21 -0000 1.14 +++ Config.py 20 Mar 2006 18:21:15 -0000 1.15 @@ -101,7 +101,6 @@ if not self._config.has_section("Builders"): return {} items = self._config.items("Builders") - print items builder_list = {} for (tag, builder) in items: if not tag.startswith("builder"): @@ -140,8 +139,8 @@ self.add_section("Builders") self.set_option("Builders", "use_ssl", "yes") - self.set_option("Builders", "0 builder1", "127.0.0.1:8888") - self.set_option("Builders", "10 builder2", "127.0.0.2:8888") + self.set_option("Builders", "builder1", "20 127.0.0.1:8888") + self.set_option("Builders", "builder2", "0 127.0.0.2:8888") self.add_section("SSL") self.set_option("SSL", "server_key_and_cert", "/etc/plague/server/certs/server_key_and_cert.pem") From fedora-extras-commits at redhat.com Mon Mar 20 18:28:45 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 13:28:45 -0500 Subject: extras-buildsys/server Config.py,1.15,1.16 Message-ID: <200603201828.k2KISjcM010035@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10017/server Modified Files: Config.py Log Message: Fix default path of server targets directory Index: Config.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Config.py 20 Mar 2006 18:21:15 -0000 1.15 +++ Config.py 20 Mar 2006 18:28:37 -0000 1.16 @@ -129,7 +129,7 @@ self.set_option("Directories", "server_work_dir", "/rpmbuild",) self.set_option("Directories", "repo_dir", "/repodir") self.set_option("Directories", "tmpdir", "/tmp") - self.set_option("Directories", "target_configs_dir", "/etc/plague/targets") + self.set_option("Directories", "target_configs_dir", "/etc/plague/server/targets") self.set_option("Directories", "mock_configs_dir", "/etc/mock") self.add_section("Email") From fedora-extras-commits at redhat.com Mon Mar 20 18:38:44 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Mon, 20 Mar 2006 13:38:44 -0500 Subject: rpms/argus/FC-4 argus.spec,1.1,1.2 Message-ID: <200603201839.k2KIdHHJ010120@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10073/FC-4 Modified Files: argus.spec Log Message: added buildrequires ncurses-devel Index: argus.spec =================================================================== RCS file: /cvs/extras/rpms/argus/FC-4/argus.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- argus.spec 17 Mar 2006 19:32:36 -0000 1.1 +++ argus.spec 20 Mar 2006 18:38:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: argus Version: 2.0.6.fixes.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Network transaction audit tool License: GPL Group: Applications/Internet @@ -18,7 +18,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig #Requires: libpcap -BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison +BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison ncurses-devel %package clients Summary: Client tools for argus network audit @@ -123,6 +123,9 @@ %{_mandir}/man5/ra* %changelog +* Mon Mar 20 2006 Gabriel Somlo 2.0.6.fixes.1-8 +- added ncurses-devel build requirement + * Wed Mar 15 2006 Gabriel Somlo 2.0.6.fixes.1-7 - fixed argus makefile patch From fedora-extras-commits at redhat.com Mon Mar 20 18:38:51 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Mon, 20 Mar 2006 13:38:51 -0500 Subject: rpms/argus/FC-5 argus.spec,1.1,1.2 Message-ID: <200603201839.k2KIdNZr010123@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10073/FC-5 Modified Files: argus.spec Log Message: added buildrequires ncurses-devel Index: argus.spec =================================================================== RCS file: /cvs/extras/rpms/argus/FC-5/argus.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- argus.spec 17 Mar 2006 19:32:36 -0000 1.1 +++ argus.spec 20 Mar 2006 18:38:51 -0000 1.2 @@ -1,6 +1,6 @@ Name: argus Version: 2.0.6.fixes.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Network transaction audit tool License: GPL Group: Applications/Internet @@ -18,7 +18,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig #Requires: libpcap -BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison +BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison ncurses-devel %package clients Summary: Client tools for argus network audit @@ -123,6 +123,9 @@ %{_mandir}/man5/ra* %changelog +* Mon Mar 20 2006 Gabriel Somlo 2.0.6.fixes.1-8 +- added ncurses-devel build requirement + * Wed Mar 15 2006 Gabriel Somlo 2.0.6.fixes.1-7 - fixed argus makefile patch From fedora-extras-commits at redhat.com Mon Mar 20 18:38:57 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Mon, 20 Mar 2006 13:38:57 -0500 Subject: rpms/argus/devel argus.spec,1.1,1.2 Message-ID: <200603201839.k2KIdTn5010126@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10073/devel Modified Files: argus.spec Log Message: added buildrequires ncurses-devel Index: argus.spec =================================================================== RCS file: /cvs/extras/rpms/argus/devel/argus.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- argus.spec 17 Mar 2006 19:32:36 -0000 1.1 +++ argus.spec 20 Mar 2006 18:38:56 -0000 1.2 @@ -1,6 +1,6 @@ Name: argus Version: 2.0.6.fixes.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Network transaction audit tool License: GPL Group: Applications/Internet @@ -18,7 +18,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig #Requires: libpcap -BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison +BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison ncurses-devel %package clients Summary: Client tools for argus network audit @@ -123,6 +123,9 @@ %{_mandir}/man5/ra* %changelog +* Mon Mar 20 2006 Gabriel Somlo 2.0.6.fixes.1-8 +- added ncurses-devel build requirement + * Wed Mar 15 2006 Gabriel Somlo 2.0.6.fixes.1-7 - fixed argus makefile patch From fedora-extras-commits at redhat.com Mon Mar 20 20:05:22 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 15:05:22 -0500 Subject: extras-buildsys/server BuilderManager.py,1.20,1.21 Message-ID: <200603202005.k2KK5MlK015032@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15014/server Modified Files: BuilderManager.py Log Message: Remove debug exit() Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- BuilderManager.py 20 Mar 2006 12:43:21 -0000 1.20 +++ BuilderManager.py 20 Mar 2006 20:05:11 -0000 1.21 @@ -55,7 +55,6 @@ del builder_dict print string print "" - os._exit(1) self._queue_lock = threading.Lock() self._queue = [] From fedora-extras-commits at redhat.com Tue Mar 21 00:33:51 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 20 Mar 2006 19:33:51 -0500 Subject: rpms/perl-Exception-Class/devel .cvsignore, 1.3, 1.4 perl-Exception-Class.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603210034.k2L0YOkv024636@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24605 Modified Files: .cvsignore perl-Exception-Class.spec sources Log Message: Update to 1.23. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jan 2006 02:26:49 -0000 1.3 +++ .cvsignore 21 Mar 2006 00:33:50 -0000 1.4 @@ -1 +1 @@ -Exception-Class-1.22.tar.gz +Exception-Class-1.23.tar.gz Index: perl-Exception-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/perl-Exception-Class.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Exception-Class.spec 11 Jan 2006 02:26:49 -0000 1.4 +++ perl-Exception-Class.spec 21 Mar 2006 00:33:50 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Exception-Class -Version: 1.22 +Version: 1.23 Release: 1%{?dist} Summary: Exception::Class Perl module License: GPL or Artistic @@ -8,9 +8,9 @@ Source0: http://www.cpan.org/modules/by-module/Exception/Exception-Class-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Devel::StackTrace) >= 1.1 +BuildRequires: perl(Devel::StackTrace) >= 1.12 BuildRequires: perl(Class::Data::Inheritable) >= 0.02 -Requires: perl(Devel::StackTrace) >= 1.1 +Requires: perl(Devel::StackTrace) >= 1.12 Requires: perl(Class::Data::Inheritable) >= 0.02 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Fri Feb 03 2006 Steven Pritchard 1.23-1 +- Update to 1.23 + * Tue Jan 10 2006 Steven Pritchard 1.22-1 - Update to 1.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jan 2006 02:26:49 -0000 1.3 +++ sources 21 Mar 2006 00:33:50 -0000 1.4 @@ -1 +1 @@ -ad8bb64e8473ba5817a2b329ec7dde42 Exception-Class-1.22.tar.gz +560b42c0cf8b795bdc793459edb7ec13 Exception-Class-1.23.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 01:05:37 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 20 Mar 2006 20:05:37 -0500 Subject: fedora-security/audit fc5,1.86,1.87 Message-ID: <200603210105.k2L15bW2026669@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26651 Modified Files: fc5 Log Message: Add a new gnome-screensaver issue. Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- fc5 20 Mar 2006 18:00:48 -0000 1.86 +++ fc5 21 Mar 2006 01:05:26 -0000 1.87 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-1335 version (gnome-screensaver, fixed 2.14) CVE-2006-1296 VULNERABLE (beagle) bz#185981 CVE-2006-1273 ** firefox (prob win only, vague) CVE-2006-1251 version (exim) script not shipped From fedora-extras-commits at redhat.com Tue Mar 21 02:07:57 2006 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Mon, 20 Mar 2006 21:07:57 -0500 Subject: rpms/mmv/devel mmv.spec,1.4,1.5 Message-ID: <200603210208.k2L28T0O028884@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28867 Modified Files: mmv.spec Log Message: * Mon Mar 20 2006 Zing - 1.01b-6 - fix permissions on doc files Index: mmv.spec =================================================================== RCS file: /cvs/extras/rpms/mmv/devel/mmv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mmv.spec 14 Feb 2006 01:19:57 -0000 1.4 +++ mmv.spec 21 Mar 2006 02:07:55 -0000 1.5 @@ -1,6 +1,6 @@ Name: mmv Version: 1.01b -Release: 5%{?dist} +Release: 6%{?dist} Summary: Move/copy/append/link multiple files Group: Applications/File @@ -49,8 +49,10 @@ rm -rf $RPM_BUILD_ROOT %files +%defattr(0644,root,root,-) +%doc copyright changelog %defattr(-,root,root,-) -%doc ANNOUNCE ARTICLE READ.ME copyright changelog +%doc ANNOUNCE ARTICLE READ.ME %{_bindir}/mmv %{_bindir}/mcp %{_bindir}/mad @@ -58,6 +60,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 20 2006 Zing - 1.01b-6 +- fix permissions on doc files + * Mon Feb 13 2006 Zing - 1.01b-5 - sync with debian mmv_1.01b-14 - symlink man page for mcp/mad/mln From fedora-extras-commits at redhat.com Tue Mar 21 03:26:52 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 20 Mar 2006 22:26:52 -0500 Subject: rpms/perl-Exception-Class/FC-5 .cvsignore, 1.3, 1.4 perl-Exception-Class.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603210327.k2L3RP2G031111@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31090 Modified Files: .cvsignore perl-Exception-Class.spec sources Log Message: Update to 1.23. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jan 2006 02:26:49 -0000 1.3 +++ .cvsignore 21 Mar 2006 03:26:52 -0000 1.4 @@ -1 +1 @@ -Exception-Class-1.22.tar.gz +Exception-Class-1.23.tar.gz Index: perl-Exception-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/FC-5/perl-Exception-Class.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Exception-Class.spec 11 Jan 2006 02:26:49 -0000 1.4 +++ perl-Exception-Class.spec 21 Mar 2006 03:26:52 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Exception-Class -Version: 1.22 +Version: 1.23 Release: 1%{?dist} Summary: Exception::Class Perl module License: GPL or Artistic @@ -8,9 +8,9 @@ Source0: http://www.cpan.org/modules/by-module/Exception/Exception-Class-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Devel::StackTrace) >= 1.1 +BuildRequires: perl(Devel::StackTrace) >= 1.12 BuildRequires: perl(Class::Data::Inheritable) >= 0.02 -Requires: perl(Devel::StackTrace) >= 1.1 +Requires: perl(Devel::StackTrace) >= 1.12 Requires: perl(Class::Data::Inheritable) >= 0.02 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Fri Feb 03 2006 Steven Pritchard 1.23-1 +- Update to 1.23 + * Tue Jan 10 2006 Steven Pritchard 1.22-1 - Update to 1.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jan 2006 02:26:49 -0000 1.3 +++ sources 21 Mar 2006 03:26:52 -0000 1.4 @@ -1 +1 @@ -ad8bb64e8473ba5817a2b329ec7dde42 Exception-Class-1.22.tar.gz +560b42c0cf8b795bdc793459edb7ec13 Exception-Class-1.23.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 08:45:55 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 21 Mar 2006 03:45:55 -0500 Subject: rpms/nexuiz/devel nexuiz.spec,1.10,1.11 Message-ID: <200603210846.k2L8kSZr009851@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9834 Modified Files: nexuiz.spec Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-3 - rebuilt Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nexuiz.spec 19 Mar 2006 18:44:56 -0000 1.10 +++ nexuiz.spec 21 Mar 2006 08:45:55 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -128,6 +128,9 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-3 +- rebuilt + * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt From fedora-extras-commits at redhat.com Tue Mar 21 10:24:55 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 05:24:55 -0500 Subject: rpms/exim/FC-4 exim-4.50-config.patch,1.3,1.4 exim.spec,1.8,1.9 Message-ID: <200603211025.k2LAPTua014942@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14908 Modified Files: exim-4.50-config.patch exim.spec Log Message: actually enable pgsql exim-4.50-config.patch: Index: exim-4.50-config.patch =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim-4.50-config.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- exim-4.50-config.patch 19 Mar 2006 11:57:24 -0000 1.3 +++ exim-4.50-config.patch 21 Mar 2006 10:24:55 -0000 1.4 @@ -84,7 +84,7 @@ -# LOOKUP_PASSWD=yes +LOOKUP_PASSWD=yes -# LOOKUP_PGSQL=yes -+# LOOKUP_PGSQL=yes ++LOOKUP_PGSQL=yes -# LOOKUP_SQLITE=yes +LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- exim.spec 19 Mar 2006 11:57:24 -0000 1.8 +++ exim.spec 21 Mar 2006 10:24:55 -0000 1.9 @@ -286,6 +286,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue Mar 21 2006 David Woodhouse 4.60-4 +- Actually enable Postgres + * Tue Mar 7 2006 David Woodhouse 4.60-3 - Rebuild From fedora-extras-commits at redhat.com Tue Mar 21 10:25:36 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 05:25:36 -0500 Subject: rpms/exim/FC-4 exim.spec,1.9,1.10 Message-ID: <200603211026.k2LAQ9gB014978@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14945 Modified Files: exim.spec Log Message: Bah. We should take the release tag from the changelog :) Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- exim.spec 21 Mar 2006 10:24:55 -0000 1.9 +++ exim.spec 21 Mar 2006 10:25:36 -0000 1.10 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons From fedora-extras-commits at redhat.com Tue Mar 21 10:26:52 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 05:26:52 -0500 Subject: rpms/exim/FC-5 exim-4.50-config.patch,1.4,1.5 exim.spec,1.14,1.15 Message-ID: <200603211027.k2LAROP8015042@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15020 Modified Files: exim-4.50-config.patch exim.spec Log Message: actually enable pgsql exim-4.50-config.patch: Index: exim-4.50-config.patch =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/exim-4.50-config.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim-4.50-config.patch 13 Nov 2005 19:31:25 -0000 1.4 +++ exim-4.50-config.patch 21 Mar 2006 10:26:51 -0000 1.5 @@ -84,7 +84,7 @@ -# LOOKUP_PASSWD=yes +LOOKUP_PASSWD=yes -# LOOKUP_PGSQL=yes -+# LOOKUP_PGSQL=yes ++LOOKUP_PGSQL=yes -# LOOKUP_SQLITE=yes +LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- exim.spec 7 Mar 2006 00:24:31 -0000 1.14 +++ exim.spec 21 Mar 2006 10:26:51 -0000 1.15 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -287,6 +287,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue Mar 21 2006 David Woodhouse 4.60-4 +- Actually enable Postgres + * Tue Mar 7 2006 David Woodhouse 4.60-3 - Rebuild From fedora-extras-commits at redhat.com Tue Mar 21 10:29:10 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 05:29:10 -0500 Subject: rpms/exim/devel exim-4.50-config.patch,1.4,1.5 exim.spec,1.14,1.15 Message-ID: <200603211029.k2LATgmd015132@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15110 Modified Files: exim-4.50-config.patch exim.spec Log Message: actually enable pgsql exim-4.50-config.patch: Index: exim-4.50-config.patch =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim-4.50-config.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim-4.50-config.patch 13 Nov 2005 19:31:25 -0000 1.4 +++ exim-4.50-config.patch 21 Mar 2006 10:29:09 -0000 1.5 @@ -84,7 +84,7 @@ -# LOOKUP_PASSWD=yes +LOOKUP_PASSWD=yes -# LOOKUP_PGSQL=yes -+# LOOKUP_PGSQL=yes ++LOOKUP_PGSQL=yes -# LOOKUP_SQLITE=yes +LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- exim.spec 7 Mar 2006 00:24:31 -0000 1.14 +++ exim.spec 21 Mar 2006 10:29:09 -0000 1.15 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -287,6 +287,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue Mar 21 2006 David Woodhouse 4.60-4 +- Actually enable Postgres + * Tue Mar 7 2006 David Woodhouse 4.60-3 - Rebuild From fedora-extras-commits at redhat.com Tue Mar 21 12:24:19 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 21 Mar 2006 07:24:19 -0500 Subject: rpms/liboil/FC-5 .cvsignore, 1.7, 1.8 liboil.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <200603211224.k2LCOpIt019380@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19350 Modified Files: .cvsignore liboil.spec sources Log Message: Update to 0.3.7.1 to fix PPC build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Feb 2006 09:46:01 -0000 1.7 +++ .cvsignore 21 Mar 2006 12:24:18 -0000 1.8 @@ -1 +1 @@ -liboil-0.3.7.tar.gz +liboil-0.3.7.1.tar.gz Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-5/liboil.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- liboil.spec 6 Mar 2006 15:28:29 -0000 1.15 +++ liboil.spec 21 Mar 2006 12:24:18 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.7 -Release: 3%{?dist} +Version: 0.3.7.1 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ @@ -68,6 +68,7 @@ %files devel %defattr(-, root, root, 0755) +%{_bindir}/oil-bugreport %{_includedir}/* %{_libdir}/*.a %exclude %{_libdir}/*.la @@ -77,6 +78,10 @@ %changelog +* Tue Mar 21 2006 Matthias Saou 0.3.7.1-1 +- Update to today's CVS code which should fix the PPC build issue. +- Include new oil-bugreport tool in the devel package. + * Mon Mar 6 2006 Matthias Saou 0.3.7-3 - FC5 rebuild (well, try at least since PPC fixes are required). Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Feb 2006 09:46:01 -0000 1.7 +++ sources 21 Mar 2006 12:24:18 -0000 1.8 @@ -1 +1 @@ -1f08e71fe775bfa1266a741742f1904b liboil-0.3.7.tar.gz +e6c5aee5a2f69e6ddce48a5ac74ee5bb liboil-0.3.7.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 12:43:29 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 21 Mar 2006 07:43:29 -0500 Subject: rpms/liboil/devel .cvsignore, 1.7, 1.8 liboil.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <200603211244.k2LCi29J019502@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481 Modified Files: .cvsignore liboil.spec sources Log Message: Sync with FC-5's update to 0.3.7.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Feb 2006 09:46:01 -0000 1.7 +++ .cvsignore 21 Mar 2006 12:43:29 -0000 1.8 @@ -1 +1 @@ -liboil-0.3.7.tar.gz +liboil-0.3.7.1.tar.gz Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/liboil.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- liboil.spec 6 Mar 2006 15:28:29 -0000 1.15 +++ liboil.spec 21 Mar 2006 12:43:29 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.7 -Release: 3%{?dist} +Version: 0.3.7.1 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ @@ -68,6 +68,7 @@ %files devel %defattr(-, root, root, 0755) +%{_bindir}/oil-bugreport %{_includedir}/* %{_libdir}/*.a %exclude %{_libdir}/*.la @@ -77,6 +78,10 @@ %changelog +* Tue Mar 21 2006 Matthias Saou 0.3.7.1-1 +- Update to today's CVS code which should fix the PPC build issue. +- Include new oil-bugreport tool in the devel package. + * Mon Mar 6 2006 Matthias Saou 0.3.7-3 - FC5 rebuild (well, try at least since PPC fixes are required). Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Feb 2006 09:46:01 -0000 1.7 +++ sources 21 Mar 2006 12:43:29 -0000 1.8 @@ -1 +1 @@ -1f08e71fe775bfa1266a741742f1904b liboil-0.3.7.tar.gz +e6c5aee5a2f69e6ddce48a5ac74ee5bb liboil-0.3.7.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 12:53:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 07:53:44 -0500 Subject: rpms/allegro/devel allegro-4.2.0-nicevsync.patch, NONE, 1.1 allegro.spec, 1.29, 1.30 Message-ID: <200603211254.k2LCsG3D019595@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19575 Modified Files: allegro.spec Added Files: allegro-4.2.0-nicevsync.patch Log Message: * Tue Mar 21 2006 Hans de Goede 4.2.0-12 - Sleep in xwindows vsync emulation, instead of busy waiting. allegro-4.2.0-nicevsync.patch: --- NEW FILE allegro-4.2.0-nicevsync.patch --- --- allegro-4.2.0/src/x/xwin.c~ 2006-03-21 12:57:42.000000000 +0100 +++ allegro-4.2.0/src/x/xwin.c 2006-03-21 12:57:42.000000000 +0100 @@ -2265,6 +2265,7 @@ XUNLOCK(); do { + rest(1); } while (retrace_count == prev); } else { Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- allegro.spec 13 Mar 2006 22:57:30 -0000 1.29 +++ allegro.spec 21 Mar 2006 12:53:44 -0000 1.30 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 11 +Release: 12 Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -21,6 +21,7 @@ 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 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 @@ -134,7 +135,7 @@ %patch7 -p1 -z .fullscreen %patch8 -p1 -z .mprotect %patch9 -p1 -z .execheap - +%patch10 -p1 -z .nicevsync %build %configure \ @@ -221,6 +222,9 @@ %changelog +* Tue Mar 21 2006 Hans de Goede 4.2.0-12 +- Sleep in xwindows vsync emulation, instead of busy waiting. + * Mon Mar 13 2006 Hans de Goede 4.2.0-11 - really, _really_ fix asm stretch code on i386 with NX processors, long ?? story see bugzilla bug 185214 . From fedora-extras-commits at redhat.com Tue Mar 21 14:06:35 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:06:35 -0500 Subject: rpms/libtranslate/FC-4 libtranslate-0.99-int64.diff, NONE, 1.1 libtranslate.spec, 1.2, 1.3 Message-ID: <200603211407.k2LE7837023782@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23762 Modified Files: libtranslate.spec Added Files: libtranslate-0.99-int64.diff Log Message: libtranslate-0.99-int64.diff: --- NEW FILE libtranslate-0.99-int64.diff --- --- src/translate-util.c.orig Mon Jan 17 17:45:45 2005 +++ src/translate-util.c Fri Dec 30 22:26:26 2005 @@ -136,7 +136,7 @@ g_return_val_if_fail(big != NULL, NULL); g_return_val_if_fail(little != NULL, NULL); - lower_big = g_ascii_strdown(big, big_len); + lower_big = g_ascii_strdown(big, (int) big_len); lower_little = g_ascii_strdown(little, -1); s = strstr(lower_big, lower_little); Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/FC-4/libtranslate.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libtranslate.spec 14 Sep 2005 11:10:52 -0000 1.2 +++ libtranslate.spec 21 Mar 2006 14:06:33 -0000 1.3 @@ -8,6 +8,7 @@ Source: %{url}/libtranslate-%{version}.tar.gz Patch1: %{url}/libtranslate-0.99-charsetparse.diff Patch2: %{url}/libtranslate-0.99-condfix.diff +Patch3: %{url}/libtranslate-0.99-int64.diff Patch10: libtranslate-add_Promt_service.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 1:0.8, gettext @@ -43,6 +44,7 @@ %setup -q -n %{name}-%{version} %patch1 -p0 %patch2 -p0 +%patch3 -p0 %patch10 -p0 %build @@ -95,6 +97,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 0.99-5 +- add upstream's patch fixing memory exhaustion on 64-bit platforms + * Wed Sep 7 2005 Dmitry Butskoy - 0.99-4 - even more cleanups - Accepted for Fedora Extra From fedora-extras-commits at redhat.com Tue Mar 21 14:07:45 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:07:45 -0500 Subject: rpms/libtranslate/FC-4 libtranslate.spec,1.3,1.4 Message-ID: <200603211408.k2LE8HHY023807@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23790 Modified Files: libtranslate.spec Log Message: Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/FC-4/libtranslate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libtranslate.spec 21 Mar 2006 14:06:33 -0000 1.3 +++ libtranslate.spec 21 Mar 2006 14:07:45 -0000 1.4 @@ -1,7 +1,7 @@ Name: libtranslate Summary: Natural language translation library Version: 0.99 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: System Environment/Libraries %define url http://savannah.nongnu.org/download/libtranslate From fedora-extras-commits at redhat.com Tue Mar 21 14:54:55 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:54:55 -0500 Subject: rpms/libtranslate/FC-5 libtranslate-0.99-int64.diff, NONE, 1.1 libtranslate.spec, 1.3, 1.4 Message-ID: <200603211455.k2LEtSpp024020@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24000 Modified Files: libtranslate.spec Added Files: libtranslate-0.99-int64.diff Log Message: libtranslate-0.99-int64.diff: --- NEW FILE libtranslate-0.99-int64.diff --- --- src/translate-util.c.orig Mon Jan 17 17:45:45 2005 +++ src/translate-util.c Fri Dec 30 22:26:26 2005 @@ -136,7 +136,7 @@ g_return_val_if_fail(big != NULL, NULL); g_return_val_if_fail(little != NULL, NULL); - lower_big = g_ascii_strdown(big, big_len); + lower_big = g_ascii_strdown(big, (int) big_len); lower_little = g_ascii_strdown(little, -1); s = strstr(lower_big, lower_little); Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/FC-5/libtranslate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libtranslate.spec 15 Feb 2006 12:18:06 -0000 1.3 +++ libtranslate.spec 21 Mar 2006 14:54:55 -0000 1.4 @@ -1,13 +1,14 @@ Name: libtranslate Summary: Natural language translation library Version: 0.99 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Libraries %define url http://savannah.nongnu.org/download/libtranslate Source: %{url}/libtranslate-%{version}.tar.gz Patch1: %{url}/libtranslate-0.99-charsetparse.diff Patch2: %{url}/libtranslate-0.99-condfix.diff +Patch3: %{url}/libtranslate-0.99-int64.diff Patch10: libtranslate-add_Promt_service.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 1:0.8, gettext @@ -43,6 +44,7 @@ %setup -q -n %{name}-%{version} %patch1 -p0 %patch2 -p0 +%patch3 -p0 %patch10 -p0 %build @@ -95,6 +97,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 0.99-6 +- add upstream's patch fixing memory exhaustion on 64-bit platforms + * Wed Feb 15 2006 Dmitry Butskoy - 0.99-5 - rebuild for FC5 From fedora-extras-commits at redhat.com Tue Mar 21 14:56:22 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:56:22 -0500 Subject: rpms/libtranslate/FC-4 libtranslate.spec,1.4,1.5 Message-ID: <200603211456.k2LEusEF024081@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24064 Modified Files: libtranslate.spec Log Message: Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/FC-4/libtranslate.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libtranslate.spec 21 Mar 2006 14:07:45 -0000 1.4 +++ libtranslate.spec 21 Mar 2006 14:56:22 -0000 1.5 @@ -1,7 +1,7 @@ Name: libtranslate Summary: Natural language translation library Version: 0.99 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Libraries %define url http://savannah.nongnu.org/download/libtranslate @@ -97,7 +97,7 @@ %{_libdir}/pkgconfig/* %changelog -* Tue Mar 21 2006 Dmitry Butskoy - 0.99-5 +* Tue Mar 21 2006 Dmitry Butskoy - 0.99-6 - add upstream's patch fixing memory exhaustion on 64-bit platforms * Wed Sep 7 2005 Dmitry Butskoy - 0.99-4 From fedora-extras-commits at redhat.com Tue Mar 21 14:57:46 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:57:46 -0500 Subject: rpms/libtranslate/FC-3 libtranslate-0.99-int64.diff, NONE, 1.1 libtranslate.spec, 1.2, 1.3 Message-ID: <200603211458.k2LEwIRH024112@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24092 Modified Files: libtranslate.spec Added Files: libtranslate-0.99-int64.diff Log Message: libtranslate-0.99-int64.diff: --- NEW FILE libtranslate-0.99-int64.diff --- --- src/translate-util.c.orig Mon Jan 17 17:45:45 2005 +++ src/translate-util.c Fri Dec 30 22:26:26 2005 @@ -136,7 +136,7 @@ g_return_val_if_fail(big != NULL, NULL); g_return_val_if_fail(little != NULL, NULL); - lower_big = g_ascii_strdown(big, big_len); + lower_big = g_ascii_strdown(big, (int) big_len); lower_little = g_ascii_strdown(little, -1); s = strstr(lower_big, lower_little); Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/FC-3/libtranslate.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libtranslate.spec 14 Sep 2005 11:12:05 -0000 1.2 +++ libtranslate.spec 21 Mar 2006 14:57:45 -0000 1.3 @@ -1,13 +1,14 @@ Name: libtranslate Summary: Natural language translation library Version: 0.99 -Release: 4%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Libraries %define url http://savannah.nongnu.org/download/libtranslate Source: %{url}/libtranslate-%{version}.tar.gz Patch1: %{url}/libtranslate-0.99-charsetparse.diff Patch2: %{url}/libtranslate-0.99-condfix.diff +Patch3: %{url}/libtranslate-0.99-int64.diff Patch10: libtranslate-add_Promt_service.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 1:0.8, gettext @@ -43,6 +44,7 @@ %setup -q -n %{name}-%{version} %patch1 -p0 %patch2 -p0 +%patch3 -p0 %patch10 -p0 %build @@ -95,6 +97,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 0.99-6 +- add upstream's patch fixing memory exhaustion on 64-bit platforms + * Wed Sep 7 2005 Dmitry Butskoy - 0.99-4 - even more cleanups - Accepted for Fedora Extra From fedora-extras-commits at redhat.com Tue Mar 21 14:59:09 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:59:09 -0500 Subject: rpms/libtranslate/devel libtranslate-0.99-int64.diff, NONE, 1.1 libtranslate.spec, 1.3, 1.4 Message-ID: <200603211459.k2LExgTZ024220@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24193 Modified Files: libtranslate.spec Added Files: libtranslate-0.99-int64.diff Log Message: libtranslate-0.99-int64.diff: --- NEW FILE libtranslate-0.99-int64.diff --- --- src/translate-util.c.orig Mon Jan 17 17:45:45 2005 +++ src/translate-util.c Fri Dec 30 22:26:26 2005 @@ -136,7 +136,7 @@ g_return_val_if_fail(big != NULL, NULL); g_return_val_if_fail(little != NULL, NULL); - lower_big = g_ascii_strdown(big, big_len); + lower_big = g_ascii_strdown(big, (int) big_len); lower_little = g_ascii_strdown(little, -1); s = strstr(lower_big, lower_little); Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/devel/libtranslate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libtranslate.spec 15 Feb 2006 12:18:06 -0000 1.3 +++ libtranslate.spec 21 Mar 2006 14:59:09 -0000 1.4 @@ -1,13 +1,14 @@ Name: libtranslate Summary: Natural language translation library Version: 0.99 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Libraries %define url http://savannah.nongnu.org/download/libtranslate Source: %{url}/libtranslate-%{version}.tar.gz Patch1: %{url}/libtranslate-0.99-charsetparse.diff Patch2: %{url}/libtranslate-0.99-condfix.diff +Patch3: %{url}/libtranslate-0.99-int64.diff Patch10: libtranslate-add_Promt_service.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 1:0.8, gettext @@ -43,6 +44,7 @@ %setup -q -n %{name}-%{version} %patch1 -p0 %patch2 -p0 +%patch3 -p0 %patch10 -p0 %build @@ -95,6 +97,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 0.99-6 +- add upstream's patch fixing memory exhaustion on 64-bit platforms + * Wed Feb 15 2006 Dmitry Butskoy - 0.99-5 - rebuild for FC5 From fedora-extras-commits at redhat.com Tue Mar 21 15:05:24 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:05:24 -0500 Subject: rpms/nail/FC-3 nail-12.0-nostrip.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nail.spec, 1.4, 1.5 sources, 1.2, 1.3 nail-11.25-nostrip.patch, 1.1, NONE Message-ID: <200603211505.k2LF5utd026228@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26202 Modified Files: .cvsignore nail.spec sources Added Files: nail-12.0-nostrip.patch Removed Files: nail-11.25-nostrip.patch Log Message: nail-12.0-nostrip.patch: --- NEW FILE nail-12.0-nostrip.patch --- diff -Nrbu nail-11.25/Makefile nail-11.25-OK/Makefile --- nail-11.25/Makefile 2005-07-29 15:31:44.000000000 +0400 +++ nail-11.25-OK/Makefile 2005-10-17 12:45:26.000000000 +0400 @@ -96,7 +96,7 @@ install: all test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) - $(UCBINSTALL) -c -s mailx $(DESTDIR)$(BINDIR)/mailx + $(UCBINSTALL) -c mailx $(DESTDIR)$(BINDIR)/mailx test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1 $(UCBINSTALL) -c -m 644 mailx.1 $(DESTDIR)$(MANDIR)/man1/mailx.1 test -d $(DESTDIR)$(SYSCONFDIR) || mkdir -p $(DESTDIR)$(SYSCONFDIR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nail/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 10:28:36 -0000 1.2 +++ .cvsignore 21 Mar 2006 15:05:24 -0000 1.3 @@ -1 +1 @@ -nail-11.25.tar.bz2 +mailx-12.0.tar.bz2 Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-3/nail.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nail.spec 17 Oct 2005 14:43:00 -0000 1.4 +++ nail.spec 21 Mar 2006 15:05:24 -0000 1.5 @@ -1,18 +1,17 @@ %define use_nss 0 +%define rename 1 Summary: Enhanced implementation of the mailx command Name: nail -Version: 11.25 -Release: 4%{?dist} +Version: 12.0 +Release: 1%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net -Source0: http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -# Note: it is just "lynx -source http://nail.sourceforge.net > nail.html" -Source1: nail.html +Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nail-11.25-config.patch -Patch1: nail-11.25-nostrip.patch +Patch1: nail-12.0-nostrip.patch %if %{use_nss} BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig @@ -36,11 +35,29 @@ %prep -%setup -q +%setup -q -n mailx-%{version} %patch0 -p1 %patch1 -p1 -cp %{SOURCE1} %{name}.html +%if %{rename} +# Use old name "nail" to avoid conflicts with the Core mailx package +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +' %{name}.rc + +mv mailx.1.html %{name}.html +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +s/MAILX/NAIL/g +s/Mailx/Nail/g +' %{name}.html +%endif %build @@ -56,7 +73,7 @@ BINDIR=%{_bindir} \ MANDIR=%{_mandir} \ SYSCONFDIR=%{_sysconfdir} \ - MAILRC=%{_sysconfdir}/nail.rc \ + MAILRC=%{_sysconfdir}/%{name}.rc \ MAILSPOOL=%{_localstatedir}/mail \ SENDMAIL=%{_sbindir}/sendmail \ UCBINSTALL=install \ @@ -69,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install +%if %{rename} +# rename to old name "nail", to avoid conflicts with the Core mailx package +mv -f $RPM_BUILD_ROOT%{_bindir}/mailx $RPM_BUILD_ROOT%{_bindir}/%{name} +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/mailx.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -77,12 +100,18 @@ %files %defattr(-,root,root) %doc COPYING AUTHORS README %{name}.html -%config(noreplace) %{_sysconfdir}/nail.rc -%{_bindir}/nail -%{_mandir}/man1/nail* +%config(noreplace) %{_sysconfdir}/%{name}.rc +%{_bindir}/%{name} +%{_mandir}/*/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 +- upgrade to 12.0 +- change new upstream name "mailx" to the old name "nail" to avoid + conflicts with the Core mailx package. +- drop Source1, use package's html file instead. + * Mon Oct 17 2005 Dmitry Butskoy - 11.25-4 - don't strip binaries on makeinstall (#170972) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nail/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 10:28:36 -0000 1.2 +++ sources 21 Mar 2006 15:05:24 -0000 1.3 @@ -1 +1 @@ -54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 +67e8236a73f8a2d85c45cf8a2bdf7af1 mailx-12.0.tar.bz2 --- nail-11.25-nostrip.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 15:08:40 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:08:40 -0500 Subject: rpms/nail/FC-3 nail.html,1.1,NONE Message-ID: <200603211508.k2LF8ghB026252@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26243 Removed Files: nail.html Log Message: --- nail.html DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 15:19:46 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:19:46 -0500 Subject: rpms/nail/FC-4 nail-12.0-nostrip.patch, NONE, 1.1 nail.spec, 1.4, 1.5 sources, 1.2, 1.3 nail-11.25-nostrip.patch, 1.1, NONE nail.html, 1.1, NONE Message-ID: <200603211520.k2LFKIcA026350@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26328 Modified Files: nail.spec sources Added Files: nail-12.0-nostrip.patch Removed Files: nail-11.25-nostrip.patch nail.html Log Message: nail-12.0-nostrip.patch: --- NEW FILE nail-12.0-nostrip.patch --- diff -Nrbu nail-11.25/Makefile nail-11.25-OK/Makefile --- nail-11.25/Makefile 2005-07-29 15:31:44.000000000 +0400 +++ nail-11.25-OK/Makefile 2005-10-17 12:45:26.000000000 +0400 @@ -96,7 +96,7 @@ install: all test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) - $(UCBINSTALL) -c -s mailx $(DESTDIR)$(BINDIR)/mailx + $(UCBINSTALL) -c mailx $(DESTDIR)$(BINDIR)/mailx test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1 $(UCBINSTALL) -c -m 644 mailx.1 $(DESTDIR)$(MANDIR)/man1/mailx.1 test -d $(DESTDIR)$(SYSCONFDIR) || mkdir -p $(DESTDIR)$(SYSCONFDIR) Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-4/nail.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nail.spec 17 Oct 2005 14:42:33 -0000 1.4 +++ nail.spec 21 Mar 2006 15:19:45 -0000 1.5 @@ -1,18 +1,17 @@ %define use_nss 0 +%define rename 1 Summary: Enhanced implementation of the mailx command Name: nail -Version: 11.25 -Release: 4%{?dist} +Version: 12.0 +Release: 1%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net -Source0: http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -# Note: it is just "lynx -source http://nail.sourceforge.net > nail.html" -Source1: nail.html +Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nail-11.25-config.patch -Patch1: nail-11.25-nostrip.patch +Patch1: nail-12.0-nostrip.patch %if %{use_nss} BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig @@ -36,11 +35,29 @@ %prep -%setup -q +%setup -q -n mailx-%{version} %patch0 -p1 %patch1 -p1 -cp %{SOURCE1} %{name}.html +%if %{rename} +# Use old name "nail" to avoid conflicts with the Core mailx package +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +' %{name}.rc + +mv mailx.1.html %{name}.html +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +s/MAILX/NAIL/g +s/Mailx/Nail/g +' %{name}.html +%endif %build @@ -56,7 +73,7 @@ BINDIR=%{_bindir} \ MANDIR=%{_mandir} \ SYSCONFDIR=%{_sysconfdir} \ - MAILRC=%{_sysconfdir}/nail.rc \ + MAILRC=%{_sysconfdir}/%{name}.rc \ MAILSPOOL=%{_localstatedir}/mail \ SENDMAIL=%{_sbindir}/sendmail \ UCBINSTALL=install \ @@ -69,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install +%if %{rename} +# rename to old name "nail", to avoid conflicts with the Core mailx package +mv -f $RPM_BUILD_ROOT%{_bindir}/mailx $RPM_BUILD_ROOT%{_bindir}/%{name} +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/mailx.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -77,12 +100,18 @@ %files %defattr(-,root,root) %doc COPYING AUTHORS README %{name}.html -%config(noreplace) %{_sysconfdir}/nail.rc -%{_bindir}/nail -%{_mandir}/man1/nail* +%config(noreplace) %{_sysconfdir}/%{name}.rc +%{_bindir}/%{name} +%{_mandir}/*/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 +- upgrade to 12.0 +- change new upstream name "mailx" to the old name "nail" to avoid + conflicts with the Core mailx package. +- drop Source1, use package's html file instead. + * Mon Oct 17 2005 Dmitry Butskoy - 11.25-4 - don't strip binaries on makeinstall (#170972) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nail/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 10:28:36 -0000 1.2 +++ sources 21 Mar 2006 15:19:45 -0000 1.3 @@ -1 +1 @@ -54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 +67e8236a73f8a2d85c45cf8a2bdf7af1 mailx-12.0.tar.bz2 --- nail-11.25-nostrip.patch DELETED --- --- nail.html DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 15:21:32 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:21:32 -0500 Subject: rpms/nail/FC-5 nail-12.0-nostrip.patch, NONE, 1.1 nail.spec, 1.9, 1.10 sources, 1.2, 1.3 nail-11.25-nostrip.patch, 1.1, NONE nail.html, 1.1, NONE Message-ID: <200603211522.k2LFM4Co026436@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26409 Modified Files: nail.spec sources Added Files: nail-12.0-nostrip.patch Removed Files: nail-11.25-nostrip.patch nail.html Log Message: nail-12.0-nostrip.patch: --- NEW FILE nail-12.0-nostrip.patch --- diff -Nrbu nail-11.25/Makefile nail-11.25-OK/Makefile --- nail-11.25/Makefile 2005-07-29 15:31:44.000000000 +0400 +++ nail-11.25-OK/Makefile 2005-10-17 12:45:26.000000000 +0400 @@ -96,7 +96,7 @@ install: all test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) - $(UCBINSTALL) -c -s mailx $(DESTDIR)$(BINDIR)/mailx + $(UCBINSTALL) -c mailx $(DESTDIR)$(BINDIR)/mailx test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1 $(UCBINSTALL) -c -m 644 mailx.1 $(DESTDIR)$(MANDIR)/man1/mailx.1 test -d $(DESTDIR)$(SYSCONFDIR) || mkdir -p $(DESTDIR)$(SYSCONFDIR) Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-5/nail.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nail.spec 15 Feb 2006 12:21:25 -0000 1.9 +++ nail.spec 21 Mar 2006 15:21:32 -0000 1.10 @@ -1,18 +1,17 @@ %define use_nss 0 +%define rename 1 Summary: Enhanced implementation of the mailx command Name: nail -Version: 11.25 -Release: 6%{?dist} +Version: 12.0 +Release: 1%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net -Source0: http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -# Note: it is just "lynx -source http://nail.sourceforge.net > nail.html" -Source1: nail.html +Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nail-11.25-config.patch -Patch1: nail-11.25-nostrip.patch +Patch1: nail-12.0-nostrip.patch %if %{use_nss} BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig @@ -36,11 +35,29 @@ %prep -%setup -q +%setup -q -n mailx-%{version} %patch0 -p1 %patch1 -p1 -cp %{SOURCE1} %{name}.html +%if %{rename} +# Use old name "nail" to avoid conflicts with the Core mailx package +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +' %{name}.rc + +mv mailx.1.html %{name}.html +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +s/MAILX/NAIL/g +s/Mailx/Nail/g +' %{name}.html +%endif %build @@ -56,7 +73,7 @@ BINDIR=%{_bindir} \ MANDIR=%{_mandir} \ SYSCONFDIR=%{_sysconfdir} \ - MAILRC=%{_sysconfdir}/nail.rc \ + MAILRC=%{_sysconfdir}/%{name}.rc \ MAILSPOOL=%{_localstatedir}/mail \ SENDMAIL=%{_sbindir}/sendmail \ UCBINSTALL=install \ @@ -69,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install +%if %{rename} +# rename to old name "nail", to avoid conflicts with the Core mailx package +mv -f $RPM_BUILD_ROOT%{_bindir}/mailx $RPM_BUILD_ROOT%{_bindir}/%{name} +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/mailx.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -77,17 +100,17 @@ %files %defattr(-,root,root) %doc COPYING AUTHORS README %{name}.html -%config(noreplace) %{_sysconfdir}/nail.rc -%{_bindir}/nail -%{_mandir}/man1/nail* +%config(noreplace) %{_sysconfdir}/%{name}.rc +%{_bindir}/%{name} +%{_mandir}/*/* %changelog -* Wed Feb 15 2006 Dmitry Butskoy - 11.25-6 -- rebuild for FC5 - -* Wed Nov 16 2005 Dmitry Butskoy - 11.25-5 -- rebuild. +* Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 +- upgrade to 12.0 +- change new upstream name "mailx" to the old name "nail" to avoid + conflicts with the Core mailx package. +- drop Source1, use package's html file instead. * Mon Oct 17 2005 Dmitry Butskoy - 11.25-4 - don't strip binaries on makeinstall (#170972) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nail/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 10:28:36 -0000 1.2 +++ sources 21 Mar 2006 15:21:32 -0000 1.3 @@ -1 +1 @@ -54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 +67e8236a73f8a2d85c45cf8a2bdf7af1 mailx-12.0.tar.bz2 --- nail-11.25-nostrip.patch DELETED --- --- nail.html DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 15:23:53 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:23:53 -0500 Subject: rpms/nail/devel nail-12.0-nostrip.patch, NONE, 1.1 nail.spec, 1.9, 1.10 sources, 1.2, 1.3 nail-11.25-nostrip.patch, 1.1, NONE nail.html, 1.1, NONE Message-ID: <200603211524.k2LFOP3T026562@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26537 Modified Files: nail.spec sources Added Files: nail-12.0-nostrip.patch Removed Files: nail-11.25-nostrip.patch nail.html Log Message: nail-12.0-nostrip.patch: --- NEW FILE nail-12.0-nostrip.patch --- diff -Nrbu nail-11.25/Makefile nail-11.25-OK/Makefile --- nail-11.25/Makefile 2005-07-29 15:31:44.000000000 +0400 +++ nail-11.25-OK/Makefile 2005-10-17 12:45:26.000000000 +0400 @@ -96,7 +96,7 @@ install: all test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) - $(UCBINSTALL) -c -s mailx $(DESTDIR)$(BINDIR)/mailx + $(UCBINSTALL) -c mailx $(DESTDIR)$(BINDIR)/mailx test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1 $(UCBINSTALL) -c -m 644 mailx.1 $(DESTDIR)$(MANDIR)/man1/mailx.1 test -d $(DESTDIR)$(SYSCONFDIR) || mkdir -p $(DESTDIR)$(SYSCONFDIR) Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/devel/nail.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nail.spec 15 Feb 2006 12:21:25 -0000 1.9 +++ nail.spec 21 Mar 2006 15:23:52 -0000 1.10 @@ -1,18 +1,17 @@ %define use_nss 0 +%define rename 1 Summary: Enhanced implementation of the mailx command Name: nail -Version: 11.25 -Release: 6%{?dist} +Version: 12.0 +Release: 1%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net -Source0: http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -# Note: it is just "lynx -source http://nail.sourceforge.net > nail.html" -Source1: nail.html +Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nail-11.25-config.patch -Patch1: nail-11.25-nostrip.patch +Patch1: nail-12.0-nostrip.patch %if %{use_nss} BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig @@ -36,11 +35,29 @@ %prep -%setup -q +%setup -q -n mailx-%{version} %patch0 -p1 %patch1 -p1 -cp %{SOURCE1} %{name}.html +%if %{rename} +# Use old name "nail" to avoid conflicts with the Core mailx package +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +' %{name}.rc + +mv mailx.1.html %{name}.html +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +s/MAILX/NAIL/g +s/Mailx/Nail/g +' %{name}.html +%endif %build @@ -56,7 +73,7 @@ BINDIR=%{_bindir} \ MANDIR=%{_mandir} \ SYSCONFDIR=%{_sysconfdir} \ - MAILRC=%{_sysconfdir}/nail.rc \ + MAILRC=%{_sysconfdir}/%{name}.rc \ MAILSPOOL=%{_localstatedir}/mail \ SENDMAIL=%{_sbindir}/sendmail \ UCBINSTALL=install \ @@ -69,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install +%if %{rename} +# rename to old name "nail", to avoid conflicts with the Core mailx package +mv -f $RPM_BUILD_ROOT%{_bindir}/mailx $RPM_BUILD_ROOT%{_bindir}/%{name} +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/mailx.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -77,17 +100,17 @@ %files %defattr(-,root,root) %doc COPYING AUTHORS README %{name}.html -%config(noreplace) %{_sysconfdir}/nail.rc -%{_bindir}/nail -%{_mandir}/man1/nail* +%config(noreplace) %{_sysconfdir}/%{name}.rc +%{_bindir}/%{name} +%{_mandir}/*/* %changelog -* Wed Feb 15 2006 Dmitry Butskoy - 11.25-6 -- rebuild for FC5 - -* Wed Nov 16 2005 Dmitry Butskoy - 11.25-5 -- rebuild. +* Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 +- upgrade to 12.0 +- change new upstream name "mailx" to the old name "nail" to avoid + conflicts with the Core mailx package. +- drop Source1, use package's html file instead. * Mon Oct 17 2005 Dmitry Butskoy - 11.25-4 - don't strip binaries on makeinstall (#170972) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nail/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 10:28:36 -0000 1.2 +++ sources 21 Mar 2006 15:23:52 -0000 1.3 @@ -1 +1 @@ -54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 +67e8236a73f8a2d85c45cf8a2bdf7af1 mailx-12.0.tar.bz2 --- nail-11.25-nostrip.patch DELETED --- --- nail.html DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 15:39:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 21 Mar 2006 10:39:54 -0500 Subject: rpms/bigloo/FC-4 .cvsignore, 1.4, 1.5 bigloo.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603211540.k2LFeQPD026890@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26867 Modified Files: .cvsignore bigloo.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Mar 2006 16:07:23 -0000 1.4 +++ .cvsignore 21 Mar 2006 15:39:54 -0000 1.5 @@ -1 +1 @@ -bigloo2.8a-alpha13Mar06.tar.gz +bigloo2.8a-alpha21Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/bigloo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bigloo.spec 13 Mar 2006 16:07:24 -0000 1.5 +++ bigloo.spec 21 Mar 2006 15:39:54 -0000 1.6 @@ -2,14 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060313%{?dist} +Release: 1.20060321%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha13Mar06.tar.gz -Patch0: bigloo-bmem.patch +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -69,8 +68,6 @@ %prep %setup -q -n %{name}%{version} -# disable bmem for now -# %patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -203,7 +200,10 @@ %changelog -* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 +- new version 2.8a-20060321 + +* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 * Mon Nov 28 2005 Gerard Milmeister - 2.7a-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Mar 2006 16:07:24 -0000 1.4 +++ sources 21 Mar 2006 15:39:54 -0000 1.5 @@ -1 +1 @@ -c545f654bfcc274a0eec5382ab00f58e bigloo2.8a-alpha13Mar06.tar.gz +de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 15:42:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 21 Mar 2006 10:42:14 -0500 Subject: rpms/bigloo/FC-5 .cvsignore, 1.4, 1.5 bigloo.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603211542.k2LFgkYY026972@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26934/FC-5 Modified Files: .cvsignore bigloo.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Mar 2006 16:33:53 -0000 1.4 +++ .cvsignore 21 Mar 2006 15:42:14 -0000 1.5 @@ -1 +1 @@ -bigloo2.8a-alpha13Mar06.tar.gz +bigloo2.8a-alpha21Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/bigloo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bigloo.spec 13 Mar 2006 16:33:53 -0000 1.6 +++ bigloo.spec 21 Mar 2006 15:42:14 -0000 1.7 @@ -2,14 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060313%{?dist} +Release: 1.20060321%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha13Mar06.tar.gz -Patch0: bigloo-bmem.patch +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -69,8 +68,6 @@ %prep %setup -q -n %{name}%{version} -# disable bmem for now -# %patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -203,7 +200,10 @@ %changelog -* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 +- new version 2.8a-20060321 + +* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 * Mon Nov 28 2005 Gerard Milmeister - 2.7a-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Mar 2006 16:33:53 -0000 1.4 +++ sources 21 Mar 2006 15:42:14 -0000 1.5 @@ -1 +1 @@ -c545f654bfcc274a0eec5382ab00f58e bigloo2.8a-alpha13Mar06.tar.gz +de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 15:42:20 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 21 Mar 2006 10:42:20 -0500 Subject: rpms/bigloo/devel .cvsignore, 1.4, 1.5 bigloo.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603211542.k2LFgqqb026977@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26934/devel Modified Files: .cvsignore bigloo.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Mar 2006 16:33:53 -0000 1.4 +++ .cvsignore 21 Mar 2006 15:42:19 -0000 1.5 @@ -1 +1 @@ -bigloo2.8a-alpha13Mar06.tar.gz +bigloo2.8a-alpha21Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/bigloo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bigloo.spec 13 Mar 2006 16:33:53 -0000 1.6 +++ bigloo.spec 21 Mar 2006 15:42:19 -0000 1.7 @@ -2,14 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060313%{?dist} +Release: 1.20060321%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha13Mar06.tar.gz -Patch0: bigloo-bmem.patch +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -69,8 +68,6 @@ %prep %setup -q -n %{name}%{version} -# disable bmem for now -# %patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -203,7 +200,10 @@ %changelog -* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 +- new version 2.8a-20060321 + +* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 * Mon Nov 28 2005 Gerard Milmeister - 2.7a-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Mar 2006 16:33:53 -0000 1.4 +++ sources 21 Mar 2006 15:42:19 -0000 1.5 @@ -1 +1 @@ -c545f654bfcc274a0eec5382ab00f58e bigloo2.8a-alpha13Mar06.tar.gz +de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 15:44:24 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:44:24 -0500 Subject: rpms/nail/FC-5 nail.spec,1.10,1.11 Message-ID: <200603211544.k2LFivMC027162@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27140 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-5/nail.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nail.spec 21 Mar 2006 15:21:32 -0000 1.10 +++ nail.spec 21 Mar 2006 15:44:24 -0000 1.11 @@ -79,7 +79,8 @@ UCBINSTALL=install \ > makeflags -make %{?_smp_mflags} `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +# %{?_smp_mflags} cannot be used here +make `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install From fedora-extras-commits at redhat.com Tue Mar 21 15:48:39 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 21 Mar 2006 10:48:39 -0500 Subject: fedora-security/audit fc4,1.175,1.176 fc5,1.87,1.88 Message-ID: <200603211548.k2LFmd3h027249@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27225 Modified Files: fc4 fc5 Log Message: Sort the files since from time to time I put lines in the wrong places Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- fc4 20 Mar 2006 16:09:19 -0000 1.175 +++ fc4 21 Mar 2006 15:48:32 -0000 1.176 @@ -8,7 +8,7 @@ CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability -CVE-2006-1061 ignore (curl, 7.15.0 - 7.15.2 only) +CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only) CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe @@ -41,33 +41,33 @@ CVE-2006-0377 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133] CVE-2006-0369 ignore (mysql) this is not a security issue CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected -CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104] CVE-2006-0301 version (poppler, fixed 0.4.5) [since FEDORA-2006-103] +CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104] CVE-2006-0301 backport (kdegraphics) [since FEDORA-2006-105] CVE-2006-0300 VULNERABLE (tar) bz#181773 -CVE-2006-0299 version (firefox, 1.5 only) -CVE-2006-0299 version (mozilla, 1.8 branch only) CVE-2006-0299 version (thunderbird, 1.5 only) -CVE-2006-0298 version (firefox, 1.5 only) -CVE-2006-0298 version (mozilla, 1.8 branch only) +CVE-2006-0299 version (mozilla, 1.8 branch only) +CVE-2006-0299 version (firefox, 1.5 only) CVE-2006-0298 version (thunderbird, 1.5 only) -CVE-2006-0297 version (firefox, 1.5 only) -CVE-2006-0297 version (mozilla, 1.8 branch only) +CVE-2006-0298 version (mozilla, 1.8 branch only) +CVE-2006-0298 version (firefox, 1.5 only) CVE-2006-0297 version (thunderbird, 1.5 only) -CVE-2006-0296 backport (firefox) [since FEDORA-2006-076] +CVE-2006-0297 version (mozilla, 1.8 branch only) +CVE-2006-0297 version (firefox, 1.5 only) CVE-2006-0296 backport (mozilla) [since FEDORA-2006-075] +CVE-2006-0296 backport (firefox) [since FEDORA-2006-076] CVE-2006-0296 VULNERABLE (thunderbird) -CVE-2006-0295 version (firefox, 1.5 only) -CVE-2006-0295 version (mozilla, 1.8 branch only) CVE-2006-0295 version (thunderbird, 1.5 only) -CVE-2006-0294 version (firefox, 1.5 only) -CVE-2006-0294 version (mozilla, 1.8 branch only) +CVE-2006-0295 version (mozilla, 1.8 branch only) +CVE-2006-0295 version (firefox, 1.5 only) CVE-2006-0294 version (thunderbird, 1.5 only) -CVE-2006-0293 version (firefox, 1.5 only) -CVE-2006-0293 version (mozilla, 1.8 branch only) +CVE-2006-0294 version (mozilla, 1.8 branch only) +CVE-2006-0294 version (firefox, 1.5 only) CVE-2006-0293 version (thunderbird, 1.5 only) -CVE-2006-0292 backport (firefox) [since FEDORA-2006-076] +CVE-2006-0293 version (mozilla, 1.8 branch only) +CVE-2006-0293 version (firefox, 1.5 only) CVE-2006-0292 backport (mozilla) [since FEDORA-2006-075] +CVE-2006-0292 backport (firefox) [since FEDORA-2006-076] CVE-2006-0292 VULNERABLE (thunderbird) CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178 CVE-2006-0236 ignore (thunderbird) windows only flaw @@ -88,9 +88,9 @@ CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050 +CVE-2005-4720 VULNERABLE (thunderbird) CVE-2005-4720 VULNERABLE (mozilla) CVE-2005-4720 VULNERABLE (firefox) -CVE-2005-4720 VULNERABLE (thunderbird) CVE-2005-4703 ignore (tomcat) windows only CVE-2005-4685 VULNERABLE (mozilla) CVE-2005-4685 VULNERABLE (firefox) @@ -141,30 +141,30 @@ CVE-2005-3632 version (netpbm) CVE-2005-3631 version (udev) CVE-2005-3629 ** initscripts -CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169] -CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3628 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 CVE-2005-3628 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 +CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169] +CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3628 backport (cups) [since FEDORA-2005-1142] +CVE-2005-3627 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3627 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3627 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3627 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3627 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3627 backport (cups) [since FEDORA-2006-010] -CVE-2005-3627 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3626 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3626 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3626 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3626 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3626 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3626 backport (cups) [since FEDORA-2006-010] -CVE-2005-3626 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3625 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3625 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3625 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3625 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3625 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3625 backport (cups) [since FEDORA-2006-010] -CVE-2005-3625 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3624 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3624 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3624 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3624 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3624 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 -CVE-2005-3624 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] CVE-2005-3624 backport (cups) [since FEDORA-2006-010] CVE-2005-3623 version (kernel, fixed 2.6.14.5) [since FEDORA-2006-077] was backport since FEDORA-2006-013 CVE-2005-3582 version (ImageMagick) gentoo only @@ -204,20 +204,20 @@ CVE-2005-3243 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] CVE-2005-3242 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] CVE-2005-3241 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] -CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169] -CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3193 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 CVE-2005-3193 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 +CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169] +CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3193 backport (cups) [since FEDORA-2005-1142] -CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169] -CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3192 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 CVE-2005-3192 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 +CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169] +CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3192 backport (cups) [since FEDORA-2005-1142] -CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169] -CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3191 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 CVE-2005-3191 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 +CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169] +CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3191 backport (cups) [since FEDORA-2005-1142] CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088] CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- fc5 21 Mar 2006 01:05:26 -0000 1.87 +++ fc5 21 Mar 2006 15:48:32 -0000 1.88 @@ -47,34 +47,34 @@ CVE-2006-0377 version (squirrelmail, fixed 1.4.6) CVE-2006-0369 ignore (mysql) this is not a security issue CVE-2006-0321 version (fetchmail, fixed 6.3.2) -CVE-2006-0301 backport (xpdf) xpdf-3.01pl2.patch CVE-2006-0301 version (poppler, fixed 0.4.5) +CVE-2006-0301 backport (xpdf) xpdf-3.01pl2.patch CVE-2006-0301 backport (kdegraphics) post-3.5.1-kdegraphics-CVE-2006-0301.diff CVE-2006-0300 VULNERABLE (tar) [fixed rawhide in tar-1.15.1-13] -CVE-2006-0299 version (firefox, fixed 1.5.0.1) -CVE-2006-0299 version (mozilla, 1.8 branch only) CVE-2006-0299 version (thunderbird, fixed 1.5) -CVE-2006-0298 version (firefox, fixed 1.5.0.1) -CVE-2006-0298 version (mozilla, 1.8 branch only) +CVE-2006-0299 version (mozilla, 1.8 branch only) +CVE-2006-0299 version (firefox, fixed 1.5.0.1) CVE-2006-0298 version (thunderbird, fixed 1.5) -CVE-2006-0297 version (firefox, fixed 1.5.0.1) -CVE-2006-0297 version (mozilla, 1.8 branch only) +CVE-2006-0298 version (mozilla, 1.8 branch only) +CVE-2006-0298 version (firefox, fixed 1.5.0.1) CVE-2006-0297 version (thunderbird, fixed 1.5) +CVE-2006-0297 version (mozilla, 1.8 branch only) +CVE-2006-0297 version (firefox, fixed 1.5.0.1) +CVE-2006-0296 version (thunderbird, fixed 1.5) CVE-2006-0296 version (firefox, fixed 1.5.0.1) CVE-2006-0296 backport (mozilla) mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch -CVE-2006-0296 version (thunderbird, fixed 1.5) -CVE-2006-0295 version (firefox, fixed 1.5.0.1) -CVE-2006-0295 version (mozilla, 1.8 branch only) CVE-2006-0295 version (thunderbird, fixed 1.5) -CVE-2006-0294 version (firefox, fixed 1.5.0.1) -CVE-2006-0294 version (mozilla, 1.8 branch only) +CVE-2006-0295 version (mozilla, 1.8 branch only) +CVE-2006-0295 version (firefox, fixed 1.5.0.1) CVE-2006-0294 version (thunderbird, fixed 1.5) -CVE-2006-0293 version (firefox, fixed 1.5.0.1) -CVE-2006-0293 version (mozilla, 1.8 branch only) +CVE-2006-0294 version (mozilla, 1.8 branch only) +CVE-2006-0294 version (firefox, fixed 1.5.0.1) CVE-2006-0293 version (thunderbird, fixed 1.5) +CVE-2006-0293 version (mozilla, 1.8 branch only) +CVE-2006-0293 version (firefox, fixed 1.5.0.1) +CVE-2006-0292 version (thunderbird, fixed 1.5) CVE-2006-0292 version (firefox, fixed 1.5.1) CVE-2006-0292 backport (mozilla) mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch -CVE-2006-0292 version (thunderbird, fixed 1.5) CVE-2006-0254 backport (tomcat5, fixed 5.5.16) **check this** CVE-2006-0236 ignore (thunderbird) windows only CVE-2006-0225 version (openssh, fixed 4.3p2) @@ -95,10 +95,10 @@ CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 CVE-2006-0035 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 CVE-2006-0019 version (kdelibs, fixed 3.5.1) -CVE-2005-4703 ignore (tomcat) windows only -CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS -CVE-2005-4720 version (firefox, fixed 1.5) CVE-2005-4720 version (thunderbird, fixed 1.5) +CVE-2005-4720 version (firefox, fixed 1.5) +CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS +CVE-2005-4703 ignore (tomcat) windows only CVE-2005-4685 VULNERABLE (mozilla) not fixed upstream CVE-2005-4685 VULNERABLE (firefox) not fixed upstream CVE-2005-4684 ignore (kdebase) not fixed upstream, low, can't fix @@ -115,8 +115,8 @@ CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment CVE-2005-4154 ignore (php) don't install untrusted pear packages CVE-2005-4153 backport (mailman) mailman-2.1.5-date_overflows.patch -CVE-2005-4134 backport (mozilla) mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html +CVE-2005-4134 backport (mozilla) mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch CVE-2005-4130 ignore (HelixPlayer) not verified CVE-2005-4126 ignore (HelixPlayer) not verified CVE-2005-4077 version (curl, fixed 7.15.1) @@ -147,30 +147,30 @@ CVE-2005-3632 version (netpbm) CVE-2005-3631 version (udev) CVE-2005-3629 version (initscripts, fixed 8.29 at least) -CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch -CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3628 version (poppler, fixed 0.4.4) CVE-2005-3628 version (kdegraphics, fixed 3.5.1) +CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch +CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3628 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3627 backport (xpdf) xpdf-3.01pl2.patch -CVE-2005-3627 backport (tetex) CVE-2005-3627 version (poppler, fixed 0.4.4) CVE-2005-3627 version (kdegraphics, fixed 3.5.1) +CVE-2005-3627 backport (xpdf) xpdf-3.01pl2.patch +CVE-2005-3627 backport (tetex) CVE-2005-3627 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3626 backport (xpdf) xpdf-3.01pl2.patch -CVE-2005-3626 backport (tetex) CVE-2005-3626 version (poppler, fixed 0.4.4) CVE-2005-3626 version (kdegraphics, fixed 3.5.1) +CVE-2005-3626 backport (xpdf) xpdf-3.01pl2.patch +CVE-2005-3626 backport (tetex) CVE-2005-3626 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3625 backport (xpdf) xpdf-3.01pl2.patch -CVE-2005-3625 backport (tetex) CVE-2005-3625 version (poppler, fixed 0.4.4) CVE-2005-3625 version (kdegraphics, fixed 3.5.1) +CVE-2005-3625 backport (xpdf) xpdf-3.01pl2.patch +CVE-2005-3625 backport (tetex) CVE-2005-3625 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3624 backport (xpdf) xpdf-3.01pl2.patch -CVE-2005-3624 backport (tetex) CVE-2005-3624 version (poppler, fixed 0.4.4) CVE-2005-3624 version (kdegraphics, fixed 3.5.1) +CVE-2005-3624 backport (xpdf) xpdf-3.01pl2.patch +CVE-2005-3624 backport (tetex) CVE-2005-3624 backport (cups) cups-CVE-2005-3625,6,7.patch CVE-2005-3623 version (kernel, fixed 2.6.14.5) CVE-2005-3582 version (ImageMagick) gentoo only @@ -209,21 +209,21 @@ CVE-2005-3243 version (ethereal, fixed 0.10.13) CVE-2005-3242 version (ethereal, fixed 0.10.13) CVE-2005-3241 version (ethereal, fixed 0.10.13) +CVE-2005-3193 version (poppler, fixed 0.4.4) +CVE-2005-3193 version (kdegraphics, fixed 3.5.1) CVE-2005-3193 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3193 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3193 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3193 version (poppler, fixed 0.4.4) -CVE-2005-3193 version (kdegraphics, fixed 3.5.1) +CVE-2005-3192 version (poppler, fixed 0.4.4) +CVE-2005-3192 version (kdegraphics, fixed 3.5.1) CVE-2005-3192 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3192 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3192 version (poppler, fixed 0.4.4) -CVE-2005-3192 version (kdegraphics, fixed 3.5.1) +CVE-2005-3191 version (poppler, fixed 0.4.4) +CVE-2005-3191 version (kdegraphics, fixed 3.5.1) CVE-2005-3191 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3191 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3191 version (poppler, fixed 0.4.4) -CVE-2005-3191 version (kdegraphics, fixed 3.5.1) CVE-2005-3186 version (gtk2, fixed 2.8.7 at least) CVE-2005-3186 backport (gdk-pixbuf) CVE-2005-3185 version (wget, fixed 1.10.2 at least) From fedora-extras-commits at redhat.com Tue Mar 21 16:06:59 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 11:06:59 -0500 Subject: rpms/nail/devel nail.spec,1.10,1.11 Message-ID: <200603211607.k2LG7VRK029309@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29283 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/devel/nail.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nail.spec 21 Mar 2006 15:23:52 -0000 1.10 +++ nail.spec 21 Mar 2006 16:06:59 -0000 1.11 @@ -79,7 +79,8 @@ UCBINSTALL=install \ > makeflags -make %{?_smp_mflags} `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +# %{?_smp_mflags} cannot be used here +make `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install From fedora-extras-commits at redhat.com Tue Mar 21 16:08:34 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 11:08:34 -0500 Subject: rpms/nail/FC-4 nail.spec,1.5,1.6 Message-ID: <200603211609.k2LG96pM029384@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29363 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-4/nail.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nail.spec 21 Mar 2006 15:19:45 -0000 1.5 +++ nail.spec 21 Mar 2006 16:08:33 -0000 1.6 @@ -79,7 +79,8 @@ UCBINSTALL=install \ > makeflags -make %{?_smp_mflags} `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +# %{?_smp_mflags} cannot be used here +make `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install From fedora-extras-commits at redhat.com Tue Mar 21 16:09:46 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 11:09:46 -0500 Subject: rpms/nail/FC-3 nail.spec,1.5,1.6 Message-ID: <200603211610.k2LGAI4C029434@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29415 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-3/nail.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nail.spec 21 Mar 2006 15:05:24 -0000 1.5 +++ nail.spec 21 Mar 2006 16:09:45 -0000 1.6 @@ -79,7 +79,8 @@ UCBINSTALL=install \ > makeflags -make %{?_smp_mflags} `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +# %{?_smp_mflags} cannot be used here +make `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install From fedora-extras-commits at redhat.com Tue Mar 21 16:15:52 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 21 Mar 2006 11:15:52 -0500 Subject: fedora-security/audit fc4,1.176,1.177 fc5,1.88,1.89 Message-ID: <200603211615.k2LGFqrX029495@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29476 Modified Files: fc4 fc5 Log Message: Expand the mozilla,firefox,thunderbird text we used in fc4 to make an easier comparison with fc5 file. Do a diff with fc4 to fc5 as a sanity check to make sure we're not missing anything. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- fc4 21 Mar 2006 15:48:32 -0000 1.176 +++ fc4 21 Mar 2006 16:15:43 -0000 1.177 @@ -3,12 +3,14 @@ ** are items that need attention +CVE-2006-1273 ** firefox (prob win only, vague) CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only) +CVE-2006-1052 ** kernel CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe @@ -17,6 +19,7 @@ CVE-2006-0836 version (thunderbird, 1.5 only) CVE-2006-0746 VULNERABLE (kpdf) bz#184308 CVE-2006-0745 version (xorg-x11) not fc4 +CVE-2006-0744 ** kernel CVE-2006-0742 VULNERABLE (kernel) CVE-2006-0741 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0730 version (dovecot, 1.0beta[12] only) @@ -494,15 +497,22 @@ CVE-2005-1175 backport (krb5) [since FEDORA-2005-553] CVE-2005-1174 backport (krb5) [since FEDORA-2005-553] CVE-2005-1160 version (thunderbird) [since FEDORA-2005-606] -CVE-2005-1160 version (firefox, mozilla) +CVE-2005-1160 version (firefox) +CVE-2005-1160 version (mozilla) CVE-2005-1159 version (thunderbird) [since FEDORA-2005-606] -CVE-2005-1159 version (firefox, mozilla) +CVE-2005-1159 version (firefox) +CVE-2005-1159 version (mozilla) CVE-2005-1158 version (firefox, fixed 1.0.3) -CVE-2005-1157 version (firefox, mozilla) -CVE-2005-1156 version (firefox, mozilla) -CVE-2005-1155 version (firefox, mozilla) -CVE-2005-1154 version (firefox, mozilla) -CVE-2005-1153 version (firefox, mozilla) +CVE-2005-1157 version (firefox) +CVE-2005-1157 version (mozilla) +CVE-2005-1156 version (firefox) +CVE-2005-1156 version (mozilla) +CVE-2005-1155 version (firefox) +CVE-2005-1155 version (mozilla) +CVE-2005-1154 version (firefox) +CVE-2005-1154 version (mozilla) +CVE-2005-1153 version (firefox) +CVE-2005-1153 version (mozilla) CVE-2005-1111 backport (cpio) from srpm CVE-2005-1065 version (tetex, not upstream) CVE-2005-1061 version (logwatch, in 4.3.2 at least) @@ -565,20 +575,31 @@ CVE-2005-0627 version (qt, fixed 3.3.4) CVE-2005-0626 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA CVE-2005-0605 backport (xorg-x11) ...-fix-CAN-2005-0605.patch +CVE-2005-0605 ** openmotif CVE-2005-0602 VULNERABLE (unzip, fixed 5.52) not in srpm CVE-2005-0596 version (php, fixed 5.0) -CVE-2005-0593 version (firefox, mozilla) -CVE-2005-0592 version (firefox, mozilla) +CVE-2005-0593 version (firefox) +CVE-2005-0593 version (mozilla) +CVE-2005-0592 version (firefox) +CVE-2005-0592 version (mozilla) CVE-2005-0591 version (firefox, fixed 1.0.1) CVE-2005-0590 version (openswan, fixed 2.1.4) -CVE-2005-0590 version (firefox, mozilla, thunderbird) +CVE-2005-0590 version (firefox) +CVE-2005-0590 version (mozilla) +CVE-2005-0590 version (thunderbird) CVE-2005-0589 version (firefox, fixed 1.0.1) -CVE-2005-0588 version (firefox, mozilla) -CVE-2005-0587 version (firefox, mozilla) -CVE-2005-0586 version (firefox, mozilla) -CVE-2005-0585 version (firefox, mozilla) -CVE-2005-0584 version (firefox, mozilla) -CVE-2005-0578 version (firefox, mozilla) +CVE-2005-0588 version (firefox) +CVE-2005-0588 version (mozilla) +CVE-2005-0587 version (firefox) +CVE-2005-0587 version (mozilla) +CVE-2005-0586 version (firefox) +CVE-2005-0586 version (mozilla) +CVE-2005-0585 version (firefox) +CVE-2005-0585 version (mozilla) +CVE-2005-0584 version (firefox) +CVE-2005-0584 version (mozilla) +CVE-2005-0578 version (firefox) +CVE-2005-0578 version (mozilla) CVE-2005-0565 version (kernel, not 2.6) CVE-2005-0532 version (kernel, fixed 2.6.11) CVE-2005-0531 version (kernel, fixed 2.6.11) @@ -607,7 +628,9 @@ CVE-2005-0401 version (mozilla, fixed 1.7.7) CVE-2005-0401 version (firefox, fixed 1.0.2) CVE-2005-0400 version (kernel, fixed in bk since 20050325, therefore 2.6.11.6) [since FEDORA-2005-510] was backport -CVE-2005-0399 version (mozilla, Firefox, thunderbird) +CVE-2005-0399 version (mozilla) +CVE-2005-0399 verison (firefox) +CVE-2005-0399 version (thunderbird) CVE-2005-0398 version (ipsec-tools, fixed 0.5) CVE-2005-0397 version (ImageMagick, fixed 6.0.2.5) CVE-2005-0396 version (kdelibs, fixed 3.4.0) @@ -660,14 +683,22 @@ CVE-2005-0155 backport (perl, not 5.8.6) perl-5.8.5-CAN-2005-0155+0156.patch CVE-2005-0152 version (squirrelmail, not 1.4) CVE-2005-0150 version (firefox, fixed 1.0) -CVE-2005-0149 version (mozilla, firefox) -CVE-2005-0147 version (mozilla, firefox) -CVE-2005-0146 version (mozilla, firefox) +CVE-2005-0149 version (mozilla) +CVE-2005-0149 version (firefox) +CVE-2005-0147 version (mozilla) +CVE-2005-0147 version (firefox) +CVE-2005-0146 version (mozilla) +CVE-2005-0146 version (firefox) CVE-2005-0145 version (firefox, fixed 1.0) -CVE-2005-0144 version (mozilla, firefox) -CVE-2005-0143 version (mozilla, firefox) -CVE-2005-0142 version (mozilla, firefox, thunderbird) -CVE-2005-0141 version (mozilla, firefox) +CVE-2005-0144 version (mozilla) +CVE-2005-0144 version (firefox) +CVE-2005-0143 version (mozilla) +CVE-2005-0143 version (firefox) +CVE-2005-0142 version (mozilla) +CVE-2005-0142 version (firefox) +CVE-2005-0142 version (thunderbird) +CVE-2005-0141 version (mozilla) +CVE-2005-0141 version (firefox) CVE-2005-0137 version (kernel, not 2.6) CVE-2005-0135 version (kernel, fixed 2.6.11) CVE-2005-0124 version (kernel, fixed 2.6.11) @@ -751,7 +782,8 @@ CVE-2004-1761 version (ethereal, fixed 0.10.3) CVE-2004-1689 version (sudo, fixed 1.6.8p1) CVE-2004-1653 ignore (openssh) -CVE-2004-1639 version (mozilla, firefox) +CVE-2004-1639 version (mozilla) +CVE-2004-1639 version (firefox) CVE-2004-1617 ignore (lynx) not able to verify flaw CVE-2004-1614 version (mozilla, fixed 1.7.5) CVE-2004-1613 version (mozilla, fixed 1.7.5) @@ -759,13 +791,21 @@ CVE-2004-1471 version (cvs, fixed 1.12.9) CVE-2004-1453 version (glibc, fixed 2.3.5) CVE-2004-1452 version (tomcat, fixed 5.0.27-r3) -CVE-2004-1451 version (mozilla, firefox, thunderbird) -CVE-2004-1450 version (mozilla, firefox, thunderbird) -CVE-2004-1449 version (mozilla, firefox, thunderbird) +CVE-2004-1451 version (mozilla) +CVE-2004-1451 version (firefox) +CVE-2004-1451 version (thunderbird) +CVE-2004-1450 version (mozilla) +CVE-2004-1450 version (firefox) +CVE-2004-1450 version (thunderbird) +CVE-2004-1449 version (mozilla) +CVE-2004-1449 version (firefox) +CVE-2004-1449 verison (thunderbird) CVE-2004-1392 version (php, fixed 5.0.4) CVE-2004-1382 version (glibc, not 2.3.5) -CVE-2004-1381 version (firefox, mozilla) -CVE-2004-1380 version (firefox, mozilla) +CVE-2004-1381 version (firefox) +CVE-2004-1381 version (mozilla) +CVE-2004-1380 version (firefox) +CVE-2004-1380 version (mozilla) CVE-2004-1377 backport (a2ps, fixed 4.13?) patch included in srpm CVE-2004-1337 version (kernel, fixed 2.6.11) CVE-2004-1336 version (tetex, fixed 3.0) at least, checked source @@ -888,10 +928,17 @@ CVE-2004-0923 version (cups, fixed 1.2.22) CVE-2004-0918 version (squid, fixed 2.4.STABLE7) CVE-2004-0914 version (xorg-x11, fixed after 6.8.1) -CVE-2004-0909 version (Mozilla, Thunderbird, Firefox) +CVE-2004-0914 ** openmotif +CVE-2004-0909 version (mozilla) +CVE-2004-0909 version (thunderbird) +CVE-2004-0909 version (firefox) CVE-2004-0908 version (mozilla #133021, fixed 1.7.3) -CVE-2004-0907 version (Mozilla, Thunderbird, Firefox) -CVE-2004-0906 version (Mozilla, Thunderbird, Firefox) +CVE-2004-0907 version (mozilla) +CVE-2004-0907 version (thunderbird) +CVE-2004-0907 version (firefox) +CVE-2004-0906 version (mozilla) +CVE-2004-0906 version (thunderbird) +CVE-2004-0906 version (firefox) CVE-2004-0905 version (mozilla #133012, fixed 1.7.3) CVE-2004-0904 version (mozilla #133014, fixed 1.7.3) CVE-2004-0903 version (mozilla #133016, fixed 1.7.3) @@ -952,7 +999,9 @@ CVE-2004-0783 version (gdk-pixbuf, fixed 0.22) CVE-2004-0782 version (gtk2, fixed 2.6.7 at least by inspection) CVE-2004-0782 version (gdk-pixbuf, fixed 0.22) -CVE-2004-0779 version (mozilla, firefox, thunderbird) +CVE-2004-0779 version (mozilla) +CVE-2004-0779 version (firefox) +CVE-2004-0779 version (thunderbird) CVE-2004-0778 version (cvs, fixed 1.11.17) CVE-2004-0772 version (krb5, fixed after 1.2.8) CVE-2004-0771 backport (lha, changelog) @@ -994,7 +1043,9 @@ CVE-2004-0686 version (samba, fixed 3.0.6) CVE-2004-0685 version (kernel, not 2.6) CVE-2004-0658 ignore (kernel) not a security issue -CVE-2004-0648 version (mozilla, firefox, thunderbird) +CVE-2004-0648 version (mozilla) +CVE-2004-0648 version (firefox) +CVE-2004-0648 version (thunderbird) CVE-2004-0644 version (krb5, fixed after 1.3.4) CVE-2004-0643 version (krb5, fixed after 1.3.1) CVE-2004-0642 version (krb5, fixed after 1.3.4) @@ -1219,12 +1270,10 @@ CVE-2003-0775 version (sane-backends, fixed 1.0.10) CVE-2003-0774 version (sane-backends, fixed 1.0.10) CVE-2003-0773 version (sane-backends, fixed 1.0.10) -CVE-2003-0743 version (exim, fixed 4.21) CVE-2003-0740 version (stunnel, fixed 3.26) CVE-2003-0730 version (xfree86, fixed after 4.3.0) CVE-2003-0700 version (kernel, not 2.6) CVE-2003-0699 version (kernel, not 2.6) -CVE-2003-0698 version (exim, fixed 4.21) CVE-2003-0695 version (openssh, fixed 3.7.1) CVE-2003-0694 version (sendmail, fixed 8.12.10) CVE-2003-0693 version (openssh, fixed 3.7) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- fc5 21 Mar 2006 15:48:32 -0000 1.88 +++ fc5 21 Mar 2006 16:15:43 -0000 1.89 @@ -6,7 +6,6 @@ CVE-2006-1335 version (gnome-screensaver, fixed 2.14) CVE-2006-1296 VULNERABLE (beagle) bz#185981 CVE-2006-1273 ** firefox (prob win only, vague) -CVE-2006-1251 version (exim) script not shipped CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) @@ -122,6 +121,7 @@ CVE-2005-4077 version (curl, fixed 7.15.1) CVE-2005-3964 backport (openmotif) CVE-2005-3962 version (perl, fixed 5.8.8) +CVE-2005-3912 ** perl CVE-2005-3896 ignore (mozilla) recoverable DoS only CVE-2005-3883 version (php, fixed 5.1.1 at least) CVE-2005-3858 version (kernel, fixed 2.6.13) @@ -1268,12 +1268,10 @@ CVE-2003-0775 version (sane-backends, fixed 1.0.10) CVE-2003-0774 version (sane-backends, fixed 1.0.10) CVE-2003-0773 version (sane-backends, fixed 1.0.10) -CVE-2003-0743 version (exim, fixed 4.21) CVE-2003-0740 version (stunnel, fixed 3.26) CVE-2003-0730 version (xfree86, fixed after 4.3.0) CVE-2003-0700 version (kernel, not 2.6) CVE-2003-0699 version (kernel, not 2.6) -CVE-2003-0698 version (exim, fixed 4.21) CVE-2003-0695 version (openssh, fixed 3.7.1) CVE-2003-0694 version (sendmail, fixed 8.12.10) CVE-2003-0693 version (openssh, fixed 3.7) From fedora-extras-commits at redhat.com Tue Mar 21 16:58:45 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 11:58:45 -0500 Subject: rpms/qemu/FC-5 qemu.spec,1.11,1.12 Message-ID: <200603211659.k2LGxHMw029777@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29756 Modified Files: qemu.spec Log Message: Fix linker script on PPC Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- qemu.spec 18 Mar 2006 22:45:13 -0000 1.11 +++ qemu.spec 21 Mar 2006 16:58:44 -0000 1.12 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL/LGPL Group: Development/Tools @@ -9,6 +9,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: SDL-devel compat-gcc-32 zlib-devel PreReq: /sbin/chkconfig @@ -34,6 +35,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build ./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M \ @@ -78,6 +80,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Sat Mar 18 2006 David Woodhouse 0.8.0-6 +- Update linker script for PPC + * Sat Mar 18 2006 David Woodhouse 0.8.0-5 - Just drop $RPM_OPT_FLAGS. They're too much of a PITA From fedora-extras-commits at redhat.com Tue Mar 21 16:59:20 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 11:59:20 -0500 Subject: rpms/qemu/FC-5 qemu-0.8.0-sdata.patch,NONE,1.1 Message-ID: <200603211659.k2LGxMqV029794@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29782 Added Files: qemu-0.8.0-sdata.patch Log Message: Fix linker script on PPC qemu-0.8.0-sdata.patch: --- NEW FILE qemu-0.8.0-sdata.patch --- --- qemu-0.8.0/ppc.ld~ 2005-12-19 22:51:53.000000000 +0000 +++ qemu-0.8.0/ppc.ld 2006-03-21 16:46:58.000000000 +0000 @@ -90,7 +90,11 @@ SECTIONS /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } + .sdata : + { + PROVIDE (_SDA_BASE_ = 32768); + *(.sdata .sdata.* .gnu.linkonce.s.*) + } _edata = .; PROVIDE (edata = .); __bss_start = .; From fedora-extras-commits at redhat.com Tue Mar 21 17:21:42 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 21 Mar 2006 12:21:42 -0500 Subject: fedora-security/audit fc5,1.89,1.90 Message-ID: <200603211721.k2LHLgmu031820@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31781 Modified Files: fc5 Log Message: Note two fedora updates. Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- fc5 21 Mar 2006 16:15:43 -0000 1.89 +++ fc5 21 Mar 2006 17:21:34 -0000 1.90 @@ -4,14 +4,14 @@ ** are items that need attention CVE-2006-1335 version (gnome-screensaver, fixed 2.14) -CVE-2006-1296 VULNERABLE (beagle) bz#185981 +CVE-2006-1296 backport (beagle) bz#185981 [since FEDORA-2006-188] CVE-2006-1273 ** firefox (prob win only, vague) CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability -CVE-2006-1061 VULNERABLE (curl, fixed 7.15.3) +CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189] CVE-2006-1052 backport (kernel) patch-2.6.16-rc6 CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe From fedora-extras-commits at redhat.com Tue Mar 21 17:28:20 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 12:28:20 -0500 Subject: rpms/qemu/devel qemu-0.8.0-sdata.patch, NONE, 1.1 qemu-0.7.0-build.patch, 1.3, 1.4 qemu.spec, 1.9, 1.10 Message-ID: <200603211728.k2LHSqNU031941@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31907 Modified Files: qemu-0.7.0-build.patch qemu.spec Added Files: qemu-0.8.0-sdata.patch Log Message: fix PPC linker script qemu-0.8.0-sdata.patch: --- NEW FILE qemu-0.8.0-sdata.patch --- --- qemu-0.8.0/ppc.ld~ 2005-12-19 22:51:53.000000000 +0000 +++ qemu-0.8.0/ppc.ld 2006-03-21 16:46:58.000000000 +0000 @@ -90,7 +90,11 @@ SECTIONS /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } + .sdata : + { + PROVIDE (_SDA_BASE_ = 32768); + *(.sdata .sdata.* .gnu.linkonce.s.*) + } _edata = .; PROVIDE (edata = .); __bss_start = .; qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu-0.7.0-build.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qemu-0.7.0-build.patch 17 Mar 2006 14:58:09 -0000 1.3 +++ qemu-0.7.0-build.patch 21 Mar 2006 17:28:20 -0000 1.4 @@ -1,33 +1,5 @@ ---- qemu-0.7.0/Makefile.orig 2005-04-27 21:52:05.000000000 +0100 -+++ qemu-0.7.0/Makefile 2005-04-30 11:01:41.000000000 +0100 -@@ -1,6 +1,6 @@ - -include config-host.mak - --CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing - ifdef CONFIG_DARWIN - CFLAGS+= -mdynamic-no-pic - endif --- qemu-0.7.0/Makefile.target.orig 2005-04-27 21:52:05.000000000 +0100 -+++ qemu-0.7.0/Makefile.target 2005-04-30 11:03:59.000000000 +0100 -@@ -14,7 +14,7 @@ - VPATH+=:$(SRC_PATH)/linux-user - DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) - endif --CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing - #CFLAGS+=-Werror - LDFLAGS=-g - LIBS= -@@ -177,7 +177,7 @@ - ifeq ($(ARCH),alpha) - # -msmall-data is not used because we want two-instruction relocations - # for the constant constructions --OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall - # Ensure there's only a single GP - CFLAGS += -msmall-data - LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld ++++ qemu-0.7.0/Makefile.target 2005-04-30 11:01:41.000000000 +0100 @@ -463,7 +463,7 @@ install: all Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- qemu.spec 17 Mar 2006 14:58:09 -0000 1.9 +++ qemu.spec 21 Mar 2006 17:28:20 -0000 1.10 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 3%{?dist} +Release: 6%{?dist} License: GPL/LGPL Group: Development/Tools @@ -9,8 +9,9 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: SDL-devel compat-gcc-32 +BuildRequires: SDL-devel compat-gcc-32 zlib-devel PreReq: /sbin/chkconfig PreReq: /sbin/service ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64 @@ -34,6 +35,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build ./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M \ @@ -78,6 +80,15 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Sat Mar 18 2006 David Woodhouse 0.8.0-6 +- Update linker script for PPC + +* Sat Mar 18 2006 David Woodhouse 0.8.0-5 +- Just drop $RPM_OPT_FLAGS. They're too much of a PITA + +* Sat Mar 18 2006 David Woodhouse 0.8.0-4 +- Disable stack-protector options which gcc 3.2 doesn't like + * Fri Mar 17 2006 David Woodhouse 0.8.0-3 - Use -mcpu= instead of -mtune= on x86_64 too - Disable SPARC targets on x86_64, because dyngen doesn't like fnegs From fedora-extras-commits at redhat.com Tue Mar 21 17:37:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 12:37:33 -0500 Subject: rpms/allegro/FC-5 allegro.spec,1.29,1.30 Message-ID: <200603211738.k2LHc5x6032145@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32128 Modified Files: allegro.spec Log Message: * Tue Mar 21 2006 Hans de Goede 4.2.0-12 - Sleep in xwindows vsync emulation, instead of busy waiting. Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/FC-5/allegro.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- allegro.spec 13 Mar 2006 22:57:30 -0000 1.29 +++ allegro.spec 21 Mar 2006 17:37:32 -0000 1.30 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 11 +Release: 12 Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -21,6 +21,7 @@ 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 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 @@ -134,7 +135,7 @@ %patch7 -p1 -z .fullscreen %patch8 -p1 -z .mprotect %patch9 -p1 -z .execheap - +%patch10 -p1 -z .nicevsync %build %configure \ @@ -221,6 +222,9 @@ %changelog +* Tue Mar 21 2006 Hans de Goede 4.2.0-12 +- Sleep in xwindows vsync emulation, instead of busy waiting. + * Mon Mar 13 2006 Hans de Goede 4.2.0-11 - really, _really_ fix asm stretch code on i386 with NX processors, long ?? story see bugzilla bug 185214 . From fedora-extras-commits at redhat.com Tue Mar 21 17:39:19 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 12:39:19 -0500 Subject: rpms/allegro/FC-5 allegro.spec,1.30,1.31 Message-ID: <200603211739.k2LHdpQg032199@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32182 Modified Files: allegro.spec Log Message: Add %{dist} to Release Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/FC-5/allegro.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- allegro.spec 21 Mar 2006 17:37:32 -0000 1.30 +++ allegro.spec 21 Mar 2006 17:39:18 -0000 1.31 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 12 +Release: 12%{dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -224,6 +224,7 @@ %changelog * Tue Mar 21 2006 Hans de Goede 4.2.0-12 - Sleep in xwindows vsync emulation, instead of busy waiting. +- Add %%{dist} to Release * Mon Mar 13 2006 Hans de Goede 4.2.0-11 - really, _really_ fix asm stretch code on i386 with NX processors, long From fedora-extras-commits at redhat.com Tue Mar 21 17:40:32 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 12:40:32 -0500 Subject: rpms/allegro/devel allegro.spec,1.30,1.31 Message-ID: <200603211741.k2LHf4vd032280@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32258 Modified Files: allegro.spec Log Message: Add %{dist} to Release Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- allegro.spec 21 Mar 2006 12:53:44 -0000 1.30 +++ allegro.spec 21 Mar 2006 17:40:31 -0000 1.31 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 12 +Release: 12%{dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -224,6 +224,7 @@ %changelog * Tue Mar 21 2006 Hans de Goede 4.2.0-12 - Sleep in xwindows vsync emulation, instead of busy waiting. +- Add %%{dist} to Release * Mon Mar 13 2006 Hans de Goede 4.2.0-11 - really, _really_ fix asm stretch code on i386 with NX processors, long From fedora-extras-commits at redhat.com Tue Mar 21 17:50:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 12:50:12 -0500 Subject: rpms/allegro/FC-5 allegro-4.2.0-nicevsync.patch,NONE,1.1 Message-ID: <200603211750.k2LHoEIk032369@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32357 Added Files: allegro-4.2.0-nicevsync.patch Log Message: * Tue Mar 21 2006 Hans de Goede 4.2.0-12 - Sleep in xwindows vsync emulation, instead of busy waiting. allegro-4.2.0-nicevsync.patch: --- NEW FILE allegro-4.2.0-nicevsync.patch --- --- allegro-4.2.0/src/x/xwin.c~ 2006-03-21 12:57:42.000000000 +0100 +++ allegro-4.2.0/src/x/xwin.c 2006-03-21 12:57:42.000000000 +0100 @@ -2265,6 +2265,7 @@ XUNLOCK(); do { + rest(1); } while (retrace_count == prev); } else { From fedora-extras-commits at redhat.com Tue Mar 21 17:52:42 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 12:52:42 -0500 Subject: rpms/goffice/devel goffice.spec,1.8,1.9 Message-ID: <200603211753.k2LHrEHE032406@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/goffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32389 Modified Files: goffice.spec Log Message: * Tue Mar 21 2006 Hans de Goede 0.2.0-2 - rebuild for new libgsf Index: goffice.spec =================================================================== RCS file: /cvs/extras/rpms/goffice/devel/goffice.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- goffice.spec 17 Feb 2006 00:15:36 -0000 1.8 +++ goffice.spec 21 Mar 2006 17:52:41 -0000 1.9 @@ -1,6 +1,6 @@ Name: goffice Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Goffice support libraries Group: System Environment/Libraries License: GPL @@ -70,6 +70,9 @@ %changelog +* Tue Mar 21 2006 Hans de Goede 0.2.0-2 +- rebuild for new libgsf + * Thu Feb 16 2006 Hans de Goede 0.2.0-1 - New upstream version - Remove .la files from plugin dirs From fedora-extras-commits at redhat.com Tue Mar 21 19:35:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 14:35:35 -0500 Subject: rpms/gnumeric/devel gnumeric.spec,1.15,1.16 Message-ID: <200603211936.k2LJa8tY004675@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4658 Modified Files: gnumeric.spec Log Message: * Tue Mar 21 2006 Hans de Goede 1:1.6.2-2 - rebuild for new libgsf Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnumeric.spec 17 Feb 2006 00:25:39 -0000 1.15 +++ gnumeric.spec 21 Mar 2006 19:35:35 -0000 1.16 @@ -1,7 +1,7 @@ Summary: A spreadsheet program for GNOME. Name: gnumeric Version: 1.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Productivity @@ -164,6 +164,9 @@ %changelog +* Tue Mar 21 2006 Hans de Goede 1:1.6.2-2 +- rebuild for new libgsf + * Thu Feb 16 2006 Hans de Goede 1:1.6.2-1 - New upstream version - Rebuild for new gcc4.1 and glibc From fedora-extras-commits at redhat.com Tue Mar 21 21:21:56 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:21:56 -0500 Subject: rpms/pdsh - New directory Message-ID: <200603212121.k2LLLwuN009192@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9184/pdsh Log Message: Directory /cvs/extras/rpms/pdsh added to the repository From fedora-extras-commits at redhat.com Tue Mar 21 21:22:02 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:22:02 -0500 Subject: rpms/pdsh/devel - New directory Message-ID: <200603212122.k2LLM4Gd009207@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9184/pdsh/devel Log Message: Directory /cvs/extras/rpms/pdsh/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 21 21:22:18 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:22:18 -0500 Subject: rpms/pdsh Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603212122.k2LLMKww009246@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9234 Added Files: Makefile import.log Log Message: Setup of module pdsh --- NEW FILE Makefile --- # Top level Makefile for module pdsh all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 21 21:22:24 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:22:24 -0500 Subject: rpms/pdsh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603212122.k2LLMQQF009267@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9234/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pdsh --- NEW 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 Mar 21 21:22:57 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:22:57 -0500 Subject: rpms/pdsh import.log,1.1,1.2 Message-ID: <200603212123.k2LLNTmk009462@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9334 Modified Files: import.log Log Message: auto-import pdsh-2.8.1-7 on branch devel from pdsh-2.8.1-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pdsh/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 21 Mar 2006 21:22:16 -0000 1.1 +++ import.log 21 Mar 2006 21:22:57 -0000 1.2 @@ -0,0 +1 @@ +pdsh-2_8_1-7:HEAD:pdsh-2.8.1-7.src.rpm:1142976171 From fedora-extras-commits at redhat.com Tue Mar 21 21:23:03 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:23:03 -0500 Subject: rpms/pdsh/devel pdsh-load-so.patch, NONE, 1.1 pdsh.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603212123.k2LLNZ9k009469@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9334/devel Modified Files: .cvsignore sources Added Files: pdsh-load-so.patch pdsh.spec Log Message: auto-import pdsh-2.8.1-7 on branch devel from pdsh-2.8.1-7.src.rpm pdsh-load-so.patch: --- NEW FILE pdsh-load-so.patch --- Index: src/pdsh/mod.c =================================================================== --- src/pdsh/mod.c (revision 1012) +++ src/pdsh/mod.c (working copy) @@ -720,13 +720,6 @@ _mod_load_dynamic_modules(const char *di strcpy(p, entry->d_name); - /* - * As an efficiency enhancement, only attempt to open - * libtool ".la" files. - */ - if (strcmp(&p[strlen(p) - 3], ".la") != 0) - continue; - if (stat(path, &st) < 0) continue; if (!S_ISREG(st.st_mode)) --- NEW FILE pdsh.spec --- Name: pdsh Version: 2.8.1 Release: 7 Summary: Parallel remote shell program License: GPL Url: http://sourceforge.net/projects/pdsh/ Group: System Environment/Base Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}-1.tar.gz Patch1: pdsh-load-so.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pdsh-rcmd # # Enabling and disabling pdsh options # defaults: # enabled: readline, rsh, ssh # disabled: rms, mrsh, qshell, mqshell, genders, nodeattr, machines, # nodeupdown # To build the various module subpackages, pass --with on # the rpmbuild command line (if your rpm is a recent enough version) # # Similarly, to disable various pdsh options pass --without on # the rpmbuild command line. # # This specfile also supports passing the --with and --without through # the environment variables PDSH_WITH_OPTIONS and PDSH_WITHOUT_OPTIONS. # e.g. PDSH_WITH_OPTIONS="qshell genders" rpmbuild .... # %define _without_env ${PDSH_WITHOUT_OPTIONS} %define _with_env ${PDSH_WITH_OPTIONS} %define dstr "%%%%"define %define check() echo %_%{1}_env|grep -qw %%1 && echo %dstr _%{1}_%%1 --%{1}-%%1 %{expand: %%define pdsh_with() %%((%{check with})||(%{check without}))%%{nil}} %define def() %%{!?_%{2}_%1: %%{!?_%{3}_%1: %%global _%{2}_%1 --%{2}-%1}} %{expand: %pdsh_with ssh} %{expand: %def ssh with without} %{expand: %pdsh_with rsh} %{expand: %def rsh with without} %{expand: %pdsh_with readline} %{expand: %def readline with without} %{expand: %pdsh_with mrsh} %{expand: %def mrsh without with} %{expand: %pdsh_with qshell} %{expand: %def qshell without with} %{expand: %pdsh_with mqshell} %{expand: %def mqshell without with} %{expand: %pdsh_with genders} %{expand: %def genders without with} %{expand: %pdsh_with nodeattr} %{expand: %def nodeattr without with} %{expand: %pdsh_with nodeupdown} %{expand: %def nodeupdown without with} %{expand: %pdsh_with dshgroups} %{expand: %def dshgroups without with} %{expand: %pdsh_with machines} %{expand: %def machines without with} %{expand: %pdsh_with slurm} %{expand: %def slurm without with} %{expand: %pdsh_with rms} %{expand: %def rms without with} %{expand: %pdsh_with debug} %{expand: %def debug without with} # # If "--with debug" is set compile with --enable-debug # and try not to strip binaries. # # (See /usr/share/doc/rpm-*/conditionalbuilds) # %if %{?_with_debug:1}%{!?_with_debug:0} %define _enable_debug --enable-debug %endif %{?_with_qshell:BuildRequires: qsnetlibs} %{?_with_mqshell:BuildRequires: qsnetlibs} %{?_with_readline:BuildRequires: readline-devel} %{?_with_nodeupdown:BuildRequires: whatsup} %{?_with_genders:BuildRequires: genders > 1.0} ############################################################################## # Pdsh description %description Pdsh is a multithreaded remote shell client which executes commands on multiple remote hosts in parallel. Pdsh can use several different remote shell services, including standard "rsh", Kerberos IV, and ssh. ############################################################################## %package qshd Summary: Remote shell daemon for pdsh/qshell/Elan3 Group: System Environment/Base Requires: xinetd %description qshd Remote shell service for running Quadrics Elan3 jobs under pdsh. Sets up Elan capabilities and environment variables needed by Quadrics MPICH executables. ############################################################################## %package mqshd Summary: Remote shell daemon for pdsh/mqshell/Elan3 Group: System Environment/Base Requires: xinetd %description mqshd Remote shell service for running Quadrics Elan3 jobs under pdsh with mrsh authentication. Sets up Elan capabilities and environment variables needed by Quadrics MPICH executables. ############################################################################## # # Module packages: # %package rcmd-rsh Summary: Provides bsd rcmd capability to pdsh Group: System Environment/Base Provides: pdsh-rcmd %description rcmd-rsh Pdsh module for bsd rcmd functionality. Note: This module requires that the pdsh binary be installed setuid root. %package rcmd-ssh Summary: Provides ssh rcmd capability to pdsh Group: System Environment/Base Provides: pdsh-rcmd %description rcmd-ssh Pdsh module for ssh rcmd functionality. %package rcmd-qshell Summary: Provides qshell rcmd capability to pdsh Group: System Environment/Base Provides: pdsh-rcmd Conflicts: pdsh-rcmd-mqshell %description rcmd-qshell Pdsh module for running QsNet MPI jobs. Note: This module requires that the pdsh binary be installed setuid root. %package rcmd-mrsh Summary: Provides mrsh rcmd capability to pdsh Group: System Environment/Base Provides: pdsh-rcmd %description rcmd-mrsh Pdsh module for mrsh rcmd functionality. %package rcmd-mqshell Summary: Provides mqshell rcmd capability to pdsh Group: System Environment/Base Provides: pdsh-rcmd Conflicts: pdsh-rcmd-qshell %description rcmd-mqshell Pdsh module for mqshell rcmd functionality. %package mod-genders Summary: Provides libgenders support for pdsh Group: System Environment/Base Requires: genders >= 1.1 Conflicts: pdsh-mod-nodeattr Conflicts: pdsh-mod-machines %description mod-genders Pdsh module for libgenders functionality. %package mod-nodeattr Summary: Provides genders support for pdsh using the nodeattr program Group: System Environment/Base Requires: genders Conflicts: pdsh-mod-genders Conflicts: pdsh-mod-machines %description mod-nodeattr Pdsh module for genders functionality using the nodeattr program. %package mod-nodeupdown Summary: Provides libnodeupdown support for pdsh Group: System Environment/Base Requires: whatsup %description mod-nodeupdown Pdsh module providing -v functionality using libnodeupdown. %package mod-rms Summary: Provides RMS support for pdsh Group: System Environment/Base Requires: qsrmslibs %description mod-rms Pdsh module providing support for gathering the list of target nodes from an allocated RMS resource. %package mod-machines Summary: Pdsh module for gathering list of target nodes from a machines file Group: System Environment/Base Conflicts: pdsh-mod-genders Conflicts: pdsh-mod-nodeattr %description mod-machines Pdsh module for gathering list of all target nodes from a machines file. %package mod-dshgroup Summary: Provides dsh-style group file support for pdsh Group: System Environment/Base Requires: whatsup %description mod-dshgroup Pdsh module providing dsh (Dancer's shell) style "group" file support. Provides -g groupname and -X groupname options to pdsh. %package mod-slurm Summary: Provides support for running pdsh under SLURM allocations Group: System Environment/Base Requires: slurm %description mod-slurm Pdsh module providing support for gathering the list of target nodes from an allocated SLURM job. ############################################################################## %prep %setup -n pdsh-2.8.1-1 %patch1 -p0 ############################################################################## %build %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ %{?_enable_debug} \ %{?_with_rsh} \ %{?_without_rsh} \ %{?_with_ssh} \ %{?_without_ssh} \ %{?_with_qshell} \ %{?_without_qshell} \ %{?_with_readline} \ %{?_without_readline} \ %{?_with_machines} \ %{?_without_machines} \ %{?_with_genders} \ %{?_without_genders} \ %{?_with_rms} \ %{?_without_rms} \ %{?_with_nodeupdown} \ %{?_without_nodeupdown} \ %{?_with_nodeattr} \ %{?_without_nodeattr} \ %{?_with_mrsh} \ %{?_without_mrsh} \ %{?_with_mqshell} \ %{?_without_mqshell} \ %{?_with_slurm} \ %{?_without_slurm} \ %{?_with_dshgroups} \ %{?_without_dshgroups} # FIXME: build fails when trying to build with _smp_mflags if qsnet is enabled # make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" make CFLAGS="$RPM_OPT_FLAGS" ############################################################################## %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT" make install # needed to allow rpm's find-debuginfo.sh to find binaries by default they # are installed with perms that aren't selected by the find in # find-debuginfo.sh chmod 755 $RPM_BUILD_ROOT/%{_bindir}/pd{sh,cp} if [ -x $RPM_BUILD_ROOT/%{_sbindir}/in.qshd ]; then install -D -m644 etc/qshell.xinetd $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/qshell fi if [ -x $RPM_BUILD_ROOT/%{_sbindir}/in.mqshd ]; then install -D -m644 etc/mqshell.xinetd $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/mqshell fi # according to developer: .so's are modules not really libraries .a's and # .la's don't need to be packaged. rm $RPM_BUILD_ROOT/%{_libdir}/pdsh/*a ############################################################################## %clean rm -rf "$RPM_BUILD_ROOT" ############################################################################## %files %defattr(-,root,root) %doc COPYING README ChangeLog NEWS DISCLAIMER README.KRB4 README.modules README.QsNet %{_bindir}/pdsh %{_bindir}/pdcp %{_bindir}/dshbak %{_mandir}/man1/* ############################################################################## %if %{?_with_rsh:1}%{!?_with_rsh:0} %files rcmd-rsh %defattr(-,root,root) %{_libdir}/pdsh/xrcmd.* %endif ############################################################################## %if %{?_with_ssh:1}%{!?_with_ssh:0} %files rcmd-ssh %defattr(-,root,root) %{_libdir}/pdsh/sshcmd.* %endif ############################################################################## %if %{?_with_qshell:1}%{!?_with_qshell:0} %files rcmd-qshell %defattr(-,root,root) %{_libdir}/pdsh/qcmd.* %endif ############################################################################## %if %{?_with_mrsh:1}%{!?_with_mrsh:0} %files rcmd-mrsh %defattr(-,root,root) %{_libdir}/pdsh/mcmd.* %endif ############################################################################## %if %{?_with_mqshell:1}%{!?_with_mqshell:0} %files rcmd-mqshell %defattr(-,root,root) %{_libdir}/pdsh/mqcmd.* %endif ############################################################################## %if %{?_with_genders:1}%{!?_with_genders:0} %files mod-genders %defattr(-,root,root) %{_libdir}/pdsh/genders.* %endif ############################################################################## %if %{?_with_nodeattr:1}%{!?_with_nodeattr:0} %files mod-nodeattr %defattr(-,root,root) %{_libdir}/pdsh/nodeattr.* %endif ############################################################################## %if %{?_with_nodeupdown:1}%{!?_with_nodeupdown:0} %files mod-nodeupdown %defattr(-,root,root) %{_libdir}/pdsh/nodeupdown.* %endif ############################################################################## %if %{?_with_rms:1}%{!?_with_rms:0} %files mod-rms %defattr(-,root,root) %{_libdir}/pdsh/rms.* %endif ############################################################################## %if %{?_with_machines:1}%{!?_with_machines:0} %files mod-machines %defattr(-,root,root) %{_libdir}/pdsh/machines.* %endif ############################################################################## %if %{?_with_dshgroups:1}%{!?_with_dshgroups:0} %files mod-dshgroup %defattr(-,root,root) %{_libdir}/pdsh/dshgroup.* %endif ############################################################################## %if %{?_with_slurm:1}%{!?_with_slurm:0} %files mod-slurm %defattr(-,root,root) %{_libdir}/pdsh/slurm.* %endif ############################################################################## %if %{?_with_qshell:1}%{!?_with_qshell:0} %files qshd %defattr(-,root,root) %{_sbindir}/in.qshd %{_sysconfdir}/xinetd.d/qshell %post qshd if ! grep "^qshell" /etc/services >/dev/null; then echo "qshell 523/tcp # pdsh/qshell/elan3" >>/etc/services fi %{_initrddir}/xinetd reload %endif ############################################################################## %if %{?_with_mqshell:1}%{!?_with_mqshell:0} %files mqshd %defattr(-,root,root) %{_sbindir}/in.mqshd %{_sysconfdir}/xinetd.d/mqshell %post mqshd if ! grep "^mqshell" /etc/services >/dev/null; then echo "mqshell 21234/tcp # pdsh/mqshell/elan3" >>/etc/services fi %{_initrddir}/xinetd reload %endif ############################################################################## %changelog * Mon Mar 13 2006 Ben Woodard 2.8.1-7 - An optimization in pdsh depended on the .la files being there. Removed optimization. * Mon Mar 6 2006 Ben Woodard 2.8.1-6 - Add COPYING file to file list - removed .la packages from sub packages. * Fri Feb 23 2006 Ben Woodard 2.8.1-5 - changed source location to point to main site not mirror. - inserted version macro in source line * Thu Feb 22 2006 Ben Woodard 2.8.1-4 - changed perms of pdsh and pcp after install so that find-debuginfo.sh finds the files and they get stripped. - removed change of attributes of pdsh and pcp in files section - removed .a files from packages. * Wed Feb 22 2006 Ben Woodard - add parameters to make - replace etc with _sysconfdir in most places - remove post section with unexplained removing of cached man pages. - removed dots at end of all summaries. * Wed Feb 16 2006 Ben Woodard 2.8.1-3 - removed dot at end of summary - removed unused/broken smp build - changed to using initrddir macro - changed depricated Prereq to Requires * Thu Feb 9 2006 Ben Woodard 2.8.1-2 - add in rpmlint fixes - change buildroot * Wed Feb 8 2006 Mark Grondona 2.8.1-1 - pdsh 2.8.1 critical bugfix release * Wed Feb 1 2006 Ben Woodard 2.8-2 - Modified spec file to fix some problems uncovered by rpmlint Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 21 Mar 2006 21:22:23 -0000 1.1 +++ .cvsignore 21 Mar 2006 21:23:03 -0000 1.2 @@ -0,0 +1 @@ +pdsh-2.8.1-1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 21 Mar 2006 21:22:23 -0000 1.1 +++ sources 21 Mar 2006 21:23:03 -0000 1.2 @@ -0,0 +1 @@ +d39b58da791f9437bdb4848da4efd6d1 pdsh-2.8.1-1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 21:36:21 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:36:21 -0500 Subject: owners owners.list,1.754,1.755 Message-ID: <200603212136.k2LLarCH009628@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9611 Modified Files: owners.list Log Message: added pdsh to owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.754 retrieving revision 1.755 diff -u -r1.754 -r1.755 --- owners.list 20 Mar 2006 16:40:46 -0000 1.754 +++ owners.list 21 Mar 2006 21:36:21 -0000 1.755 @@ -805,6 +805,7 @@ 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| +Fedora Extras|pdsh|Parallel remote shell program|woodard at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|perl-Algorithm-Dependency|Algorithmic framework for implementing dependency trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue Mar 21 21:50:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 16:50:59 -0500 Subject: mock mock.py,1.37,1.38 Message-ID: <200603212150.k2LLoxBF009721@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9698 Modified Files: mock.py Log Message: Patch from Clark Williams Set up links to /dev/std[in|out|err] in buildroots Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- mock.py 15 Mar 2006 22:14:38 -0000 1.37 +++ mock.py 21 Mar 2006 21:50:52 -0000 1.38 @@ -555,6 +555,14 @@ if not os.path.exists(devpath): os.symlink('../proc/self/fd', devpath) + fd = 0 + for item in ('stdin', 'stdout', 'stderr'): + devpath = os.path.join(self.rootdir, 'dev', item) + if not os.path.exists(devpath): + fdpath = os.path.join('../proc/self/fd', str(fd)) + os.symlink(fdpath, devpath) + fd += 1 + for item in [os.path.join(self.rootdir, 'etc', 'mtab'), os.path.join(self.rootdir, 'etc', 'fstab'), os.path.join(self.rootdir, 'var', 'log', 'yum.log')]: From fedora-extras-commits at redhat.com Tue Mar 21 21:56:40 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 16:56:40 -0500 Subject: rpms/mock/devel mock.spec,1.12,1.13 sources,1.5,1.6 Message-ID: <200603212157.k2LLvCha009837@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9818 Modified Files: mock.spec sources Log Message: * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mock.spec 2 Mar 2006 06:23:30 -0000 1.12 +++ mock.spec 21 Mar 2006 21:56:40 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -10,7 +10,6 @@ Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils BuildRequires: libselinux-devel -Patch0: mock-0.4-unpackaged-files-fix.patch %description Mock takes a srpm and builds it in a chroot @@ -18,8 +17,6 @@ %prep %setup -q -%patch0 -p1 -b .unpackaged-files-fix - %build make @@ -68,6 +65,9 @@ %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-7 +- Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots + * Thu Mar 2 2006 Seth Vidal - 0.4-6 - iterate for gcc rebuild and fc5 final Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Aug 2005 04:26:30 -0000 1.5 +++ sources 21 Mar 2006 21:56:40 -0000 1.6 @@ -1 +1 @@ -37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz +863fb1a60d49138f75ca899f1bbc4349 mock-0.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 21:57:46 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 16:57:46 -0500 Subject: rpms/mock/devel mock-0.4-unpackaged-files-fix.patch,1.1,NONE Message-ID: <200603212157.k2LLvmBJ009857@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9848 Removed Files: mock-0.4-unpackaged-files-fix.patch Log Message: Kill upstreamed patch --- mock-0.4-unpackaged-files-fix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 21:59:26 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 16:59:26 -0500 Subject: rpms/mock/FC-4 mock.spec, 1.11, 1.12 sources, 1.4, 1.5 mock-0.4-unpackaged-files-fix.patch, 1.1, NONE Message-ID: <200603212159.k2LLxwXl009974@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9953 Modified Files: mock.spec sources Removed Files: mock-0.4-unpackaged-files-fix.patch Log Message: * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mock.spec 24 Jan 2006 17:18:04 -0000 1.11 +++ mock.spec 21 Mar 2006 21:59:25 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 5%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -10,7 +10,6 @@ Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils BuildRequires: libselinux-devel -Patch0: mock-0.4-unpackaged-files-fix.patch %description Mock takes a srpm and builds it in a chroot @@ -18,8 +17,6 @@ %prep %setup -q -%patch0 -p1 -b .unpackaged-files-fix - %build make @@ -68,6 +65,12 @@ %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-7 +- Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots + +* Thu Mar 2 2006 Seth Vidal - 0.4-6 +- iterate for gcc rebuild and fc5 final + * Tue Jan 24 2006 Dan Williams - 0.4-5 - Back out setpgrp patch, found a better way to do it in plague Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Aug 2005 04:22:07 -0000 1.4 +++ sources 21 Mar 2006 21:59:25 -0000 1.5 @@ -1 +1 @@ -37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz +863fb1a60d49138f75ca899f1bbc4349 mock-0.4.tar.gz --- mock-0.4-unpackaged-files-fix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 22:01:57 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:01:57 -0500 Subject: rpms/mock/FC-3 mock.spec, 1.11, 1.12 sources, 1.5, 1.6 mock-0.4-unpackaged-files-fix.patch, 1.1, NONE Message-ID: <200603212202.k2LM2TcC011970@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11942 Modified Files: mock.spec sources Removed Files: mock-0.4-unpackaged-files-fix.patch Log Message: * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mock.spec 24 Jan 2006 17:20:23 -0000 1.11 +++ mock.spec 21 Mar 2006 22:01:57 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 5%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -10,7 +10,6 @@ Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils BuildRequires: libselinux-devel -Patch0: mock-0.4-unpackaged-files-fix.patch %description Mock takes a srpm and builds it in a chroot @@ -18,8 +17,6 @@ %prep %setup -q -%patch0 -p1 -b .unpackaged-files-fix - %build make @@ -68,6 +65,12 @@ %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-7 +- Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots + +* Thu Mar 2 2006 Seth Vidal - 0.4-6 +- iterate for gcc rebuild and fc5 final + * Tue Jan 24 2006 Dan Williams - 0.4-5 - Back out setpgrp patch, found a better way to do it in plague Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Aug 2005 04:26:06 -0000 1.5 +++ sources 21 Mar 2006 22:01:57 -0000 1.6 @@ -1 +1 @@ -37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz +863fb1a60d49138f75ca899f1bbc4349 mock-0.4.tar.gz --- mock-0.4-unpackaged-files-fix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 22:12:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 21 Mar 2006 17:12:45 -0500 Subject: rpms/perl-Net-CIDR-Lite/devel .cvsignore, 1.2, 1.3 perl-Net-CIDR-Lite.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603212213.k2LMDHVL012114@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Net-CIDR-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12085 Modified Files: .cvsignore perl-Net-CIDR-Lite.spec sources Log Message: Update to 0.20. Use canonical URL. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Aug 2005 19:47:09 -0000 1.2 +++ .cvsignore 21 Mar 2006 22:12:44 -0000 1.3 @@ -1 +1 @@ -Net-CIDR-Lite-0.18.tar.gz +Net-CIDR-Lite-0.20.tar.gz Index: perl-Net-CIDR-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/devel/perl-Net-CIDR-Lite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Net-CIDR-Lite.spec 6 Sep 2005 01:22:08 -0000 1.3 +++ perl-Net-CIDR-Lite.spec 21 Mar 2006 22:12:45 -0000 1.4 @@ -1,11 +1,11 @@ Name: perl-Net-CIDR-Lite -Version: 0.18 -Release: 3%{?dist} +Version: 0.20 +Release: 1%{?dist} Summary: Net::CIDR::Lite Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-CIDR-Lite/ -Source0: http://www.cpan.org/modules/by-module/Net/Net-CIDR-Lite-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/D/DO/DOUGW/Net-CIDR-Lite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -49,6 +49,10 @@ %{_mandir}/man3/* %changelog +* Tue Mar 21 2006 Steven Pritchard 0.20-1 +- Update to 0.20 +- Use canonical URL + * Mon Sep 05 2005 Steven Pritchard 0.18-3 - Minor spec cleanup - Add COPYING and Artistic Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Aug 2005 19:47:09 -0000 1.2 +++ sources 21 Mar 2006 22:12:45 -0000 1.3 @@ -1 +1 @@ -c4c839713b701458e880bf2d058cbab4 Net-CIDR-Lite-0.18.tar.gz +54998db6b297ffc8a20adb91ea744200 Net-CIDR-Lite-0.20.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 22:15:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:15:59 -0500 Subject: rpms/mock/devel mock.spec,1.13,1.14 Message-ID: <200603212216.k2LMGVoU012200@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12179 Modified Files: mock.spec Log Message: Merge some bits with upstream specfile; fix manpage packaging Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mock.spec 21 Mar 2006 21:56:40 -0000 1.13 +++ mock.spec 21 Mar 2006 22:15:58 -0000 1.14 @@ -11,6 +11,7 @@ Requires(pre): shadow-utils BuildRequires: libselinux-devel + %description Mock takes a srpm and builds it in a chroot @@ -59,6 +60,7 @@ %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} %{_libexecdir}/mock-yum +%{_mandir}/man1/mock.1* %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock %{_libdir}/libselinux-mock.so @@ -81,6 +83,9 @@ * Wed Jan 18 2006 Dan Williams - 0.4-3 - Add unpackaged files fix from RH#163576 (Adrian Reber) +* Tue Dec 27 2005 Seth Vidal +- add patch from Andreas Thienemann - adds man page + * Tue Aug 16 2005 Matthias Saou 0.4-2 - Fix ?fedora check when not defined (would fail to parse). @@ -92,6 +97,9 @@ * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for +* Sat Jun 11 2005 Seth Vidal +- security fix in mock-helper + * Sat Jun 11 2005 Seth Vidal - mock 0.3 - security release - mock-helper allowed execution of arbitrary commands by member of mock From fedora-extras-commits at redhat.com Tue Mar 21 22:21:19 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:21:19 -0500 Subject: rpms/mock/FC-5 mock.spec, 1.12, 1.13 sources, 1.5, 1.6 mock-0.4-unpackaged-files-fix.patch, 1.1, NONE Message-ID: <200603212221.k2LMLp9k012331@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12300 Modified Files: mock.spec sources Removed Files: mock-0.4-unpackaged-files-fix.patch Log Message: Update from devel Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mock.spec 2 Mar 2006 06:23:30 -0000 1.12 +++ mock.spec 21 Mar 2006 22:21:18 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -10,7 +10,7 @@ Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils BuildRequires: libselinux-devel -Patch0: mock-0.4-unpackaged-files-fix.patch + %description Mock takes a srpm and builds it in a chroot @@ -18,8 +18,6 @@ %prep %setup -q -%patch0 -p1 -b .unpackaged-files-fix - %build make @@ -62,12 +60,16 @@ %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} %{_libexecdir}/mock-yum +%{_mandir}/man1/mock.1* %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock %{_libdir}/libselinux-mock.so %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-7 +- Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots + * Thu Mar 2 2006 Seth Vidal - 0.4-6 - iterate for gcc rebuild and fc5 final @@ -81,6 +83,9 @@ * Wed Jan 18 2006 Dan Williams - 0.4-3 - Add unpackaged files fix from RH#163576 (Adrian Reber) +* Tue Dec 27 2005 Seth Vidal +- add patch from Andreas Thienemann - adds man page + * Tue Aug 16 2005 Matthias Saou 0.4-2 - Fix ?fedora check when not defined (would fail to parse). @@ -92,6 +97,9 @@ * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for +* Sat Jun 11 2005 Seth Vidal +- security fix in mock-helper + * Sat Jun 11 2005 Seth Vidal - mock 0.3 - security release - mock-helper allowed execution of arbitrary commands by member of mock Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Aug 2005 04:26:30 -0000 1.5 +++ sources 21 Mar 2006 22:21:18 -0000 1.6 @@ -1 +1 @@ -37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz +863fb1a60d49138f75ca899f1bbc4349 mock-0.4.tar.gz --- mock-0.4-unpackaged-files-fix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 22:25:14 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:25:14 -0500 Subject: rpms/mock/devel mock.spec,1.14,1.15 Message-ID: <200603212225.k2LMPkcV012479@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12462 Modified Files: mock.spec Log Message: bump release for fc5/fc6 split Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mock.spec 21 Mar 2006 22:15:58 -0000 1.14 +++ mock.spec 21 Mar 2006 22:24:58 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -67,6 +67,9 @@ %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-8 +- bump release for fc5/fc6 split + * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots From fedora-extras-commits at redhat.com Tue Mar 21 22:27:17 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:27:17 -0500 Subject: rpms/mock/FC-5 mock.spec,1.13,1.14 Message-ID: <200603212227.k2LMRn8e012562@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12543 Modified Files: mock.spec Log Message: update from devel Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mock.spec 21 Mar 2006 22:21:18 -0000 1.13 +++ mock.spec 21 Mar 2006 22:27:17 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -67,6 +67,9 @@ %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-8 +- bump release for fc5/fc6 split + * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots From fedora-extras-commits at redhat.com Tue Mar 21 22:29:54 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:29:54 -0500 Subject: rpms/mock/FC-4 mock.spec,1.12,1.13 Message-ID: <200603212230.k2LMUR7L012637@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12618 Modified Files: mock.spec Log Message: Update from devel Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mock.spec 21 Mar 2006 21:59:25 -0000 1.12 +++ mock.spec 21 Mar 2006 22:29:54 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Requires(pre): shadow-utils BuildRequires: libselinux-devel + %description Mock takes a srpm and builds it in a chroot @@ -59,12 +60,16 @@ %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} %{_libexecdir}/mock-yum +%{_mandir}/man1/mock.1* %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock %{_libdir}/libselinux-mock.so %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-8 +- bump release for fc5/fc6 split + * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots @@ -81,6 +86,9 @@ * Wed Jan 18 2006 Dan Williams - 0.4-3 - Add unpackaged files fix from RH#163576 (Adrian Reber) +* Tue Dec 27 2005 Seth Vidal +- add patch from Andreas Thienemann - adds man page + * Tue Aug 16 2005 Matthias Saou 0.4-2 - Fix ?fedora check when not defined (would fail to parse). @@ -92,6 +100,9 @@ * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for +* Sat Jun 11 2005 Seth Vidal +- security fix in mock-helper + * Sat Jun 11 2005 Seth Vidal - mock 0.3 - security release - mock-helper allowed execution of arbitrary commands by member of mock From fedora-extras-commits at redhat.com Tue Mar 21 22:31:26 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:31:26 -0500 Subject: rpms/mock/FC-3 mock.spec,1.12,1.13 Message-ID: <200603212231.k2LMVwRE012706@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12686 Modified Files: mock.spec Log Message: Update from devel Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mock.spec 21 Mar 2006 22:01:57 -0000 1.12 +++ mock.spec 21 Mar 2006 22:31:25 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Requires(pre): shadow-utils BuildRequires: libselinux-devel + %description Mock takes a srpm and builds it in a chroot @@ -59,12 +60,16 @@ %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} %{_libexecdir}/mock-yum +%{_mandir}/man1/mock.1* %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock %{_libdir}/libselinux-mock.so %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-8 +- bump release for fc5/fc6 split + * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots @@ -81,6 +86,9 @@ * Wed Jan 18 2006 Dan Williams - 0.4-3 - Add unpackaged files fix from RH#163576 (Adrian Reber) +* Tue Dec 27 2005 Seth Vidal +- add patch from Andreas Thienemann - adds man page + * Tue Aug 16 2005 Matthias Saou 0.4-2 - Fix ?fedora check when not defined (would fail to parse). @@ -92,6 +100,9 @@ * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for +* Sat Jun 11 2005 Seth Vidal +- security fix in mock-helper + * Sat Jun 11 2005 Seth Vidal - mock 0.3 - security release - mock-helper allowed execution of arbitrary commands by member of mock From fedora-extras-commits at redhat.com Tue Mar 21 22:35:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 21 Mar 2006 17:35:03 -0500 Subject: rpms/perl-Net-CIDR-Lite/FC-5 .cvsignore, 1.2, 1.3 perl-Net-CIDR-Lite.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603212235.k2LMZZfX012788@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Net-CIDR-Lite/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12756 Modified Files: .cvsignore perl-Net-CIDR-Lite.spec sources Log Message: Update to 0.20. Use canonical URL. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Aug 2005 19:47:09 -0000 1.2 +++ .cvsignore 21 Mar 2006 22:35:03 -0000 1.3 @@ -1 +1 @@ -Net-CIDR-Lite-0.18.tar.gz +Net-CIDR-Lite-0.20.tar.gz Index: perl-Net-CIDR-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/FC-5/perl-Net-CIDR-Lite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Net-CIDR-Lite.spec 6 Sep 2005 01:22:08 -0000 1.3 +++ perl-Net-CIDR-Lite.spec 21 Mar 2006 22:35:03 -0000 1.4 @@ -1,11 +1,11 @@ Name: perl-Net-CIDR-Lite -Version: 0.18 -Release: 3%{?dist} +Version: 0.20 +Release: 1%{?dist} Summary: Net::CIDR::Lite Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-CIDR-Lite/ -Source0: http://www.cpan.org/modules/by-module/Net/Net-CIDR-Lite-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/D/DO/DOUGW/Net-CIDR-Lite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -49,6 +49,10 @@ %{_mandir}/man3/* %changelog +* Tue Mar 21 2006 Steven Pritchard 0.20-1 +- Update to 0.20 +- Use canonical URL + * Mon Sep 05 2005 Steven Pritchard 0.18-3 - Minor spec cleanup - Add COPYING and Artistic Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Aug 2005 19:47:09 -0000 1.2 +++ sources 21 Mar 2006 22:35:03 -0000 1.3 @@ -1 +1 @@ -c4c839713b701458e880bf2d058cbab4 Net-CIDR-Lite-0.18.tar.gz +54998db6b297ffc8a20adb91ea744200 Net-CIDR-Lite-0.20.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 23:08:40 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 21 Mar 2006 18:08:40 -0500 Subject: rpms/amarok/FC-5 amarok-1.4-helix.patch, 1.1, 1.2 amarok.spec, 1.44, 1.45 Message-ID: <200603212309.k2LN9TnT016814@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16792 Modified Files: amarok-1.4-helix.patch amarok.spec Log Message: make amarok build with gstreamer only (helix is unavailable on x86_64) amarok-1.4-helix.patch: Index: amarok-1.4-helix.patch =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok-1.4-helix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amarok-1.4-helix.patch 14 Mar 2006 08:38:52 -0000 1.1 +++ amarok-1.4-helix.patch 21 Mar 2006 23:08:40 -0000 1.2 @@ -1,11 +1,20 @@ --- ./configure.helix 2006-03-05 20:28:13.000000000 +0100 -+++ ./configure 2006-03-13 23:04:01.000000000 +0100 ++++ ./configure 2006-03-22 00:04:48.000000000 +0100 @@ -38181,7 +38181,7 @@ # BEGIN DO_NOT_COMPILE CHECK ############################################################################### -if test x$build_xine != xyes -a x$build_helix != xno; then -+if test x$build_xine = xno -a x$build_helix = xno; then ++if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" no_engine=yes +@@ -40594,7 +40594,7 @@ + echo " ==================================" + echo " =" + echo " = No suitable multimedia framework was detected. You need to install at least" +- echo " = the Xine or Helix framework as detailed in the amaroK README." ++ echo " = the Xine, Helix framework or GStreamer as detailed in the amaroK README." + echo " =" + fi + Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- amarok.spec 14 Mar 2006 08:38:52 -0000 1.44 +++ amarok.spec 21 Mar 2006 23:08:40 -0000 1.45 @@ -7,7 +7,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4 -Release: 0.8.beta2%{?dist} +Release: 0.9.beta2%{?dist} Group: Applications/Multimedia License: GPL @@ -154,7 +154,7 @@ # Head until the blank line: perl -pi -e '/^$/ && exit' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop -desktop-file-install --vendor fedora \ +desktop-file-install --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --delete-original \ --add-category Application \ @@ -257,6 +257,9 @@ %changelog +* Wed Mar 22 2006 Aurelien Bompard 1.4-0.9.beta2 +- make amarok build even with gstreamer only + * Sun Mar 05 2006 Aurelien Bompard 1.4-0.8.beta2 - version 1.4 beta2 From fedora-extras-commits at redhat.com Wed Mar 22 00:04:33 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 21 Mar 2006 19:04:33 -0500 Subject: rpms/wine-docs/FC-4 wine-docs.spec,1.10,1.11 Message-ID: <200603220005.k2M0568X019007@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18990 Modified Files: wine-docs.spec Log Message: * Wed Mar 22 2006 Michael Schwendt - 0.9.10-0.1 - make this release 0.1 as to not move the old tag - insert docbook2txt wrapper script in %build to get strace output and work around FC-4 elinks FE-4 buildsys problem (#179852) Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- wine-docs.spec 15 Mar 2006 22:27:32 -0000 1.10 +++ wine-docs.spec 22 Mar 2006 00:04:33 -0000 1.11 @@ -1,6 +1,6 @@ Name: wine-docs Version: 0.9.10 -Release: 1%{?dist} +Release: 0.1%{?dist} Summary: Documentation for wine Group: Documentation @@ -22,6 +22,15 @@ %build ./configure + +cat< docbook2txt +#!/bin/sh +strace -f /usr/bin/docbook2txt \$* +exit 0 +EOT +chmod +x docbook2txt +PATH=$(pwd):$PATH make + make @@ -37,6 +46,11 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Wed Mar 22 2006 Michael Schwendt - 0.9.10-0.1 +- make this release 0.1 as to not move the old tag +- insert docbook2txt wrapper script in %%build to get strace output + and work around FC-4 elinks FE-4 buildsys problem (#179852) + * Wed Mar 15 2006 Andreas Bierfert 0.9.10-1 - version upgrade From fedora-extras-commits at redhat.com Wed Mar 22 03:32:34 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 21 Mar 2006 22:32:34 -0500 Subject: rpms/ghc/FC-5 ghc-6.4.1-gcc41.patch,NONE,1.1 ghc.spec,1.11,1.12 Message-ID: <200603220333.k2M3X6jd025794@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25769 Modified Files: ghc.spec Added Files: ghc-6.4.1-gcc41.patch Log Message: - add ghc-6.4.1-gcc41.patch to fix stage2 linking on x86_64 (Chris Parrott, #185914) ghc-6.4.1-gcc41.patch: --- NEW FILE ghc-6.4.1-gcc41.patch --- diff -urwpN ghc-6.4.1/ghc/rts/StgCRun.c ghc-6.4.1.patched/ghc/rts/StgCRun.c --- ghc-6.4.1/ghc/rts/StgCRun.c 2005-03-30 04:01:48.000000000 -0600 +++ ghc-6.4.1.patched/ghc/rts/StgCRun.c 2006-03-21 17:13:22.000000000 -0600 @@ -179,7 +179,7 @@ StgRun(StgFunPtr f, StgRegTable *basereg extern StgThreadReturnCode StgRun(StgFunPtr f, StgRegTable *basereg); -static void StgRunIsImplementedInAssembler(void) +static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void) { __asm__ volatile ( /* @@ -604,7 +604,7 @@ static void StgRunIsImplementedInAssembl // *) The Link Register is saved to a different offset in the caller's stack frame // (Linux: 4(r1), Darwin 8(r1)) -static void StgRunIsImplementedInAssembler(void) +static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void) { __asm__ volatile ( "\t.globl StgRun\n" @@ -683,7 +683,7 @@ static void StgRunIsImplementedInAssembl #ifdef linux_HOST_OS extern StgThreadReturnCode StgRun(StgFunPtr f, StgRegTable *basereg); -static void StgRunIsImplementedInAssembler(void) +static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void) { // r0 volatile // r1 stack pointer @@ -833,7 +833,7 @@ static void StgRunIsImplementedInAssembl #define LOCALS 31 #endif -static void StgRunIsImplementedInAssembler(void) +static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void) { __asm__ volatile( ".global StgRun\n" Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-5/ghc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ghc.spec 2 Mar 2006 08:40:15 -0000 1.11 +++ ghc.spec 22 Mar 2006 03:32:33 -0000 1.12 @@ -6,7 +6,7 @@ Name: ghc Version: 6.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -14,13 +14,14 @@ URL: http://haskell.org/ghc/ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ghc, sed -Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel +BuildRequires: ghc, sed +Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel %if %{build_doc} # haddock generates libraries/ docs -Buildrequires: libxslt, docbook-style-xsl, haddock +Buildrequires: libxslt, docbook-style-xsl, haddock %endif -Prefix: %{_prefix} +Prefix: %{_prefix} +Patch1: ghc-6.4.1-gcc41.patch %description GHC is a state-of-the-art programming suite for Haskell, a purely @@ -78,6 +79,7 @@ %prep %setup -q -n ghc-%{version} +%patch1 -p1 -b .1-gcc %build %if !%{build_prof} @@ -156,15 +158,19 @@ %endif %changelog -* Thu Mar 2 2006 Jens Petersen - 6.4.1-3 +* Wed Mar 22 2006 Jens Petersen - 6.4.1-4.fc5 +- add ghc-6.4.1-gcc41.patch from gentoo-haskell to fix stage2 linking on x86_64 + (Chris Parrott, #185914) + +* Thu Mar 2 2006 Jens Petersen - 6.4.1-3.fc5 - buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024) - make ghc-doc require ghc (Michel Salim, #180449) -* Tue Oct 11 2005 Jens Petersen - 6.4.1-2 +* Tue Oct 11 2005 Jens Petersen - 6.4.1-2.fc5 - turn on build_doc since haddock is now in Extras - no longer specify ghc version to build with (Ville Skytt??, #170176) -* Tue Sep 20 2005 Jens Petersen - 6.4.1-1 +* Tue Sep 20 2005 Jens Petersen - 6.4.1-1.fc5 - 6.4.1 release - the following patches are now upstream: ghc-6.4-powerpc.patch, rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, From fedora-extras-commits at redhat.com Wed Mar 22 04:31:57 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:31:57 -0500 Subject: rpms/jigdo - New directory Message-ID: <200603220431.k2M4VxJC027955@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27947/jigdo Log Message: Directory /cvs/extras/rpms/jigdo added to the repository From fedora-extras-commits at redhat.com Wed Mar 22 04:32:02 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:32:02 -0500 Subject: rpms/jigdo/devel - New directory Message-ID: <200603220432.k2M4W4KC027970@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27947/jigdo/devel Log Message: Directory /cvs/extras/rpms/jigdo/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 22 04:32:35 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:32:35 -0500 Subject: rpms/jigdo Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603220432.k2M4WbGo028004@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27992 Added Files: Makefile import.log Log Message: Setup of module jigdo --- NEW FILE Makefile --- # Top level Makefile for module jigdo all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 22 04:32:41 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:32:41 -0500 Subject: rpms/jigdo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603220432.k2M4WhAO028024@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27992/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jigdo --- NEW 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 Mar 22 04:35:09 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:35:09 -0500 Subject: rpms/jigdo import.log,1.1,1.2 Message-ID: <200603220435.k2M4ZfUU028122@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28078 Modified Files: import.log Log Message: auto-import jigdo-0.7.2-3 on branch devel from jigdo-0.7.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/jigdo/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 Mar 2006 04:32:35 -0000 1.1 +++ import.log 22 Mar 2006 04:35:09 -0000 1.2 @@ -0,0 +1 @@ +jigdo-0_7_2-3:HEAD:jigdo-0.7.2-3.src.rpm:1143002087 From fedora-extras-commits at redhat.com Wed Mar 22 04:35:15 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:35:15 -0500 Subject: rpms/jigdo/devel jigdo-0.7.1-debug.patch, NONE, 1.1 jigdo-0.7.2-amd64.patch, NONE, 1.1 jigdo-0.7.2-gcc41.patch, NONE, 1.1 jigdo.desktop, NONE, 1.1 jigdo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603220435.k2M4ZlfK028126@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28078/devel Modified Files: .cvsignore sources Added Files: jigdo-0.7.1-debug.patch jigdo-0.7.2-amd64.patch jigdo-0.7.2-gcc41.patch jigdo.desktop jigdo.spec Log Message: auto-import jigdo-0.7.2-3 on branch devel from jigdo-0.7.2-3.src.rpm jigdo-0.7.1-debug.patch: --- NEW FILE jigdo-0.7.1-debug.patch --- --- jigdo-0.7.1/configure.debug 2004-06-20 16:49:15.000000000 -0400 +++ jigdo-0.7.1/configure 2005-04-15 18:19:10.000000000 -0400 @@ -2723,8 +2723,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| \)-g\( \|$\)/ /'` -CXXFLAGS=`echo "$CXXFLAGS" | sed 's/\(^\| \)-g\( \|$\)/ /'` IF_GXX2="#" IF_NOGXX2="" if test "$GXX" = yes; then jigdo-0.7.2-amd64.patch: --- NEW FILE jigdo-0.7.2-amd64.patch --- Index: src/cachefile.hh =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/cachefile.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -B -r1.3 -r1.4 --- src/cachefile.hh 2 Jul 2005 22:05:03 -0000 1.3 +++ src/cachefile.hh 21 Jul 2005 11:31:43 -0000 1.4 @@ -1,4 +1,4 @@ -/* $Id: cachefile.hh,v 1.3 2005/07/02 22:05:03 atterer Exp $ -*- C++ -*- +/* $Id: cachefile.hh,v 1.4 2005/07/21 11:31:43 atterer Exp $ -*- C++ -*- __ _ |_) /| Copyright (C) 2001-2002 | richard@ | \/?| Richard Atterer | atterer.net @@ -94,7 +94,7 @@ only valid until the next database operation. */ Status findName(const byte*& resultData, size_t& resultSize, const string& fileName, - long long int& resultFileSize, time_t& resultMtime); + off_t& resultFileSize, time_t& resultMtime); /** Insert/overwrite entry for the given file (name must be absolute, file must have the supplied mtime and size). The data Index: src/cachefile.cc =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/cachefile.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -B -r1.7 -r1.8 --- src/cachefile.cc 2 Jul 2005 22:05:03 -0000 1.7 +++ src/cachefile.cc 21 Jul 2005 11:31:43 -0000 1.8 @@ -1,4 +1,4 @@ -/* $Id: cachefile.cc,v 1.7 2005/07/02 22:05:03 atterer Exp $ -*- C++ -*- +/* $Id: cachefile.cc,v 1.8 2005/07/21 11:31:43 atterer Exp $ -*- C++ -*- __ _ |_) /| Copyright (C) 2001-2003 | richard@ | \/?| Richard Atterer | atterer.net @@ -131,7 +131,7 @@ //________________________________________ Status CacheFile::findName(const byte*& resultData, size_t& resultSize, - const string& fileName, long long int& resultFileSize, + const string& fileName, off_t& resultFileSize, time_t& resultMtime) { DBT key; memset(&key, 0, sizeof(DBT)); key.data = const_cast(fileName.c_str()); jigdo-0.7.2-gcc41.patch: --- NEW FILE jigdo-0.7.2-gcc41.patch --- ? jigdo-gcc41.patch Index: src/jigdo-file.cc =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/jigdo-file.cc,v retrieving revision 1.19 diff -u -b -B -r1.19 jigdo-file.cc --- src/jigdo-file.cc 5 Jul 2005 12:47:17 -0000 1.19 +++ src/jigdo-file.cc 29 Jan 2006 23:42:14 -0000 @@ -477,6 +477,16 @@ } //______________________________________________________________________ +//______________________________________________________________________ + +void outOfMemory() { + cerr << subst(_("%1: Out of memory - aborted."), binName()) << endl; + exit(3); +} +//______________________________________________________________________ + +} // local namespace + enum { LONGOPT_BUFSIZE = 0x100, LONGOPT_NOFORCE, LONGOPT_MINSIZE, LONGOPT_MD5SIZE, LONGOPT_MKIMAGECHECK, LONGOPT_NOMKIMAGECHECK, @@ -722,15 +732,6 @@ return result; } -//______________________________________________________________________ - -void outOfMemory() { - cerr << subst(_("%1: Out of memory - aborted."), binName()) << endl; - exit(3); -} -//______________________________________________________________________ - -} // local namespace void exit_tryHelp() { cerr << subst(_("%1: Try `%1 -h' or `man jigdo-file' for more " Index: src/mktemplate.hh =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/mktemplate.hh,v retrieving revision 1.9 diff -u -b -B -r1.9 mktemplate.hh --- src/mktemplate.hh 5 Jul 2005 12:26:20 -0000 1.9 +++ src/mktemplate.hh 29 Jan 2006 23:42:14 -0000 @@ -136,7 +136,7 @@ void prepareJigdo(); void finalizeJigdo(const string& imageLeafName, const string& templLeafName, const MD5Sum& templMd5Sum); - INLINE bool MkTemplate::scanFiles(size_t blockLength, uint32 blockMask, + INLINE bool scanFiles(size_t blockLength, uint32 blockMask, size_t md5BlockLength); INLINE bool scanImage(byte* buf, size_t bufferLength, size_t blockLength, uint32 blockMask, size_t md5BlockLength, MD5Sum&); Index: src/recursedir.cc =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/recursedir.cc,v retrieving revision 1.9 diff -u -b -B -r1.9 recursedir.cc --- src/recursedir.cc 2 Jul 2005 22:05:04 -0000 1.9 +++ src/recursedir.cc 29 Jan 2006 23:42:14 -0000 @@ -56,6 +56,10 @@ //______________________________________________________________________ +} // local namespace +//________________________________________ + + /* Assign the next object name to result. Returns FAILURE if no more names available. Note: An object name is immediately removed from the start of "objects" when it is copied to "result". The name of @@ -130,9 +134,6 @@ } } } - -} // local namespace -//________________________________________ bool RecurseDir::getName(string& result, struct stat* fileInfo, bool checkFiles) Index: src/recursedir.hh =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/recursedir.hh,v retrieving revision 1.6 diff -u -b -B -r1.6 recursedir.hh --- src/recursedir.hh 4 Jul 2005 10:25:10 -0000 1.6 +++ src/recursedir.hh 29 Jan 2006 23:42:14 -0000 @@ -101,7 +101,7 @@ string curDir; stack recurseStack; - inline bool RecurseDir::getNextObjectName(string& result) + inline bool getNextObjectName(string& result) throw(RecurseError); queue objects; // Queue of filenames to output/dirs to recurse into queue objectsFrom; // Files containing filenames Index: src/net/download.hh =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/net/download.hh,v retrieving revision 1.16 diff -u -b -B -r1.16 download.hh --- src/net/download.hh 9 Apr 2005 23:09:52 -0000 1.16 +++ src/net/download.hh 29 Jan 2006 23:55:04 -0000 @@ -126,7 +126,7 @@ static size_t curlWriter(void* data, size_t size, size_t nmemb, void* selfPtr); // Called by glibcurl after curl_multi_perform() - static void Download::glibcurlCallback(void*); + static void glibcurlCallback(void*); // Unregister request from glibwww event loop // void pauseNow(); --- NEW FILE jigdo.desktop --- [Desktop Entry] Name=Jigsaw Download Manager GenericName=Download Manager Comment=Download files prepared for Jigdo Exec=jigdo Icon=jigdo-icon.png Terminal=false StartupWMClass="jigdo" Type=Application Categories=GTK;Application;Network; Encoding=UTF-8 --- NEW FILE jigdo.spec --- Name: jigdo Version: 0.7.2 Release: 3 Summary: Ease distribution of large files over the Internet Group: Applications/Internet License: GPL URL: http://atterer.net/jigdo/ Source0: http://atterer.net/jigdo/%{name}-%{version}.tar.bz2 Source1: jigdo.desktop Patch0: jigdo-0.7.2-amd64.patch Patch1: jigdo-0.7.1-debug.patch Patch2: jigdo-0.7.2-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel, bzip2-devel, curl-devel, /bin/awk, gettext BuildRequires: desktop-file-utils, gtk2-devel >= 0:2.0.6 Requires: wget %description Jigsaw Download, or short jigdo, is a tool designed to ease the distribution of very large files over the internet, for example CD or DVD images. Its aim is to make downloading the images as easy for users as a click on a direct download link in a browser, while avoiding all the problems that server administrators have with hosting such large files. It accomplishes this by using the separate pieces of any big file (such as the files contained within a CD/DVD image) to create a special "template" file which makes reassembly of the big file very easy for users who only have the pieces. %prep %setup -q %patch0 -p0 -b .amd64 %patch1 -p1 -b .debug %patch2 -p0 -b .gcc41 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" INSTALL_EXE="/usr/bin/install -c" install # remove debian-specific script rm -f $RPM_BUILD_ROOT%{_bindir}/jigdo-mirror \ $RPM_BUILD_ROOT%{_mandir}/man?/jigdo-mirror* %find_lang %{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --add-category X-Fedora-Extra \ %{SOURCE1} # icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps install -m 0644 -p gfx/jigdo-icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc changelog COPYING README THANKS doc/*.html doc/TechDetails.txt doc/README-bindist.txt %{_bindir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_datadir}/pixmaps/jigdo-icon.png %{_datadir}/applications/* %attr(0644,root,root) %{_mandir}/man[^3]/* %changelog * Wed Mar 8 2006 Ian Burrell - 0.7.2-3 - Remove dependency on w3c-libwww * Sun Jan 29 2006 Ian Burrell - 0.7.2-2 - Cleanup BuildRequires - Patch for GCC 4.1 * Thu Dec 22 2005 Ian Burrell - 0.7.2-1 - Update to 0.7.2 - Patch from CVS for 64-bit * Fri Apr 15 2005 Charles R. Anderson 0.7.1-4 - add gcc4 patch - remove --enable-debug and patch out configure's removal of -g * Fri Apr 15 2005 Charles R. Anderson 0.7.1-3 - BR gettext instead - move icon back to /usr/share/pixmaps - add Category GTK to desktop file * Fri Apr 15 2005 Charles R. Anderson 0.7.1-2 - BR gettext-devel - desktop category X-Fedora-Extra * Mon Apr 11 2005 Charles R. Anderson 0.7.1-1 - prepare for Fedora Extras - update to 0.7.1 - remove unneeded db41 and debug patches * Fri Jul 02 2004 Charles R. Anderson 0:0.7.0-0.fdr.5 - install icon to /usr/share/jigdo/pixmaps and use that path in desktop file - remove jigdo-mirror, since it is debian-specific * Tue Jun 01 2004 Charles R. Anderson 0:0.7.0-0.fdr.4 - don't strip binaries so debuginfo is created properly - make jigdo-icon.png non-executable - fixup buildroot path in jigdo-lite - use more descriptive summary, description, and desktop file metadata * Mon Feb 02 2004 Charles R. Anderson 0:0.7.0-0.fdr.3 - Revise patch to compile against db-4.1+ * Mon Feb 02 2004 Charles R. Anderson 0:0.7.0-0.fdr.2 - Add patch to compile against db-4.2. - BuildRequires: zlib-devel, /bin/awk - Requires: wget - Integrate jigdo.desktop into .spec file * Sat Jan 31 2004 Charles R. Anderson 0:0.7.0-0.fdr.1 - Initial fedoraized release - Install i18n files - Install desktop file and icon - Add a bunch of BuildRequires * Mon Jan 26 2002 Alexander Skwar 0.6.2-4mdk - Icons will be provided in the gfx subdirectory of the tarball * Sun Jan 25 2002 Alexander Skwar 0.6.2-3mdk - Jigdo compiles with gcc 2.96 now - Only re-define the macros if they aren't yet defined * Sat Jan 24 2002 Alexander Skwar 0.6.2-2mdk - Make the SPEC be generic, so that it can be built on non-Mandrake machines * Sat Jan 24 2002 Alexander Skwar 0.6.2-1mdk - 0.6.2 - Remove patch1 - merged upstream * Tue Jan 22 2002 Alexander Skwar 0.6.1-1mdk - First Mandrake release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jigdo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Mar 2006 04:32:41 -0000 1.1 +++ .cvsignore 22 Mar 2006 04:35:15 -0000 1.2 @@ -0,0 +1 @@ +jigdo-0.7.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jigdo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Mar 2006 04:32:41 -0000 1.1 +++ sources 22 Mar 2006 04:35:15 -0000 1.2 @@ -0,0 +1 @@ +031756ff6c7084a139dc9550a27f6906 jigdo-0.7.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 22 06:55:26 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 22 Mar 2006 01:55:26 -0500 Subject: rpms/haddock/FC-5 haddock.spec,1.1,1.2 Message-ID: <200603220655.k2M6tw1K032527@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32510 Modified Files: haddock.spec Log Message: - rebuild for FE5 Index: haddock.spec =================================================================== RCS file: /cvs/extras/rpms/haddock/FC-5/haddock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- haddock.spec 28 Sep 2005 03:00:15 -0000 1.1 +++ haddock.spec 22 Mar 2006 06:55:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: haddock Version: 0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Haddock documentation tool for annotated Haskell source code Group: Development/Tools @@ -62,6 +62,9 @@ %{_datadir}/haddock-%{version} %changelog +* Wed Mar 22 2006 Jens Petersen - 0.7-2.fc5 +- rebuild for FE5 + * Tue Sep 27 2005 Jens Petersen - 0.7-1 - cleanup for Fedora Extras (G??rard Milmeister) - drop versioned binary From fedora-extras-commits at redhat.com Wed Mar 22 07:17:42 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 22 Mar 2006 02:17:42 -0500 Subject: rpms/darcs/FC-5 darcs.spec,1.8,1.9 Message-ID: <200603220718.k2M7IENv002138@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2103 Modified Files: darcs.spec Log Message: build with new ghc build Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/darcs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- darcs.spec 2 Mar 2006 09:25:22 -0000 1.8 +++ darcs.spec 22 Mar 2006 07:17:41 -0000 1.9 @@ -84,7 +84,7 @@ %changelog -* Thu Mar 2 2006 Jens Petersen - 1.0.6-1 +* Wed Mar 22 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 - darcs-createrepo is gone From fedora-extras-commits at redhat.com Wed Mar 22 07:23:38 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 22 Mar 2006 02:23:38 -0500 Subject: rpms/darcs/FC-5 darcs.spec,1.9,1.10 Message-ID: <200603220724.k2M7OAdP002252@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2235 Modified Files: darcs.spec Log Message: bump release Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/darcs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- darcs.spec 22 Mar 2006 07:17:41 -0000 1.9 +++ darcs.spec 22 Mar 2006 07:23:38 -0000 1.10 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -84,7 +84,10 @@ %changelog -* Wed Mar 22 2006 Jens Petersen - 1.0.6-1 +* Wed Mar 22 2006 Jens Petersen - 1.0.6-2 +- build with rebuilt ghc + +* Thu Mar 2 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 - darcs-createrepo is gone From fedora-extras-commits at redhat.com Wed Mar 22 07:39:14 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Wed, 22 Mar 2006 02:39:14 -0500 Subject: owners owners.list,1.755,1.756 Message-ID: <200603220739.k2M7dk2G002351@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2333 Modified Files: owners.list Log Message: add jigdo Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.755 retrieving revision 1.756 diff -u -r1.755 -r1.756 --- owners.list 21 Mar 2006 21:36:21 -0000 1.755 +++ owners.list 22 Mar 2006 07:39:13 -0000 1.756 @@ -481,6 +481,7 @@ Fedora Extras|jasper|Implementation of the JPEG-2000 standard, Part 1|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|jed|A fast, compact editor based on the S-Lang screen library.|notting at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|jhead|Tool for displaying EXIF data embedded in JPEG images|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|jigdo|Ease distribution of large files over the Internet|ianburrell at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|jikes|A Java source file to bytecode compiler|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|jlint|Java program checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|jogl|Java bindings for the OpenGL API|green at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 22 08:14:51 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 22 Mar 2006 03:14:51 -0500 Subject: rpms/darcs/FC-4 .cvsignore, 1.3, 1.4 darcs.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200603220815.k2M8FN7L004464@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4439 Modified Files: .cvsignore darcs.spec sources Log Message: sync with FC-5: - update to 1.0.6 - darcs-createrepo is gone Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Nov 2005 07:03:41 -0000 1.3 +++ .cvsignore 22 Mar 2006 08:14:51 -0000 1.4 @@ -1 +1 @@ -darcs-1.0.4.tar.gz +darcs-1.0.6.tar.gz Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- darcs.spec 27 Dec 2005 04:55:18 -0000 1.7 +++ darcs.spec 22 Mar 2006 08:14:51 -0000 1.8 @@ -1,5 +1,5 @@ Name: darcs -Version: 1.0.5 +Version: 1.0.6 Release: 1%{?dist} Summary: David's advanced revision control system @@ -79,12 +79,15 @@ %files server %defattr(-,root,root,-) %{_localstatedir}/www/cgi-bin -%{_sbindir}/darcs-createrepo %{_sysconfdir}/darcs %{_datadir}/darcs %changelog +* Wed Mar 22 2006 Jens Petersen - 1.0.6-1 +- update to 1.0.6 + - darcs-createrepo is gone + * Thu Dec 8 2005 Jens Petersen - 1.0.5-1 - 1.0.5 bugfix release Index: sources =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2005 04:55:18 -0000 1.4 +++ sources 22 Mar 2006 08:14:51 -0000 1.5 @@ -1 +1 @@ -9a9a4f84ed5b6258f7ab321713adf20b darcs-1.0.5.tar.gz +8f3a1ee21b7bfbcca11bf4f9f0042cfd darcs-1.0.6.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 09:30:18 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 22 Mar 2006 04:30:18 -0500 Subject: rpms/yumex/FC-5 .cvsignore, 1.17, 1.18 sources, 1.21, 1.22 yumex.spec, 1.22, 1.23 Message-ID: <200603220930.k2M9UpUF007280@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7243/FC-5 Modified Files: .cvsignore sources yumex.spec Log Message: Release 0.99.14 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 Mar 2006 15:40:53 -0000 1.17 +++ .cvsignore 22 Mar 2006 09:30:17 -0000 1.18 @@ -1 +1 @@ -yumex-0.99.12.tar.gz +yumex-0.99.14.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 20 Mar 2006 12:32:25 -0000 1.21 +++ sources 22 Mar 2006 09:30:17 -0000 1.22 @@ -1 +1 @@ -cfad88b2e83aafa6f7523ea037ec2731 yumex-0.99.13.tar.gz +75aade2fc07e8672d61b0f553f37ab0d yumex-0.99.14.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- yumex.spec 20 Mar 2006 12:32:25 -0000 1.22 +++ yumex.spec 22 Mar 2006 09:30:17 -0000 1.23 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.13 +Version: 0.99.14 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Mar 20 2006 Tim Lauridsen - 0.99.14-1.0 +- Development Release 0.99.14-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 - Development Release 0.99.13-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 From fedora-extras-commits at redhat.com Wed Mar 22 09:30:25 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 22 Mar 2006 04:30:25 -0500 Subject: rpms/yumex/devel sources,1.21,1.22 yumex.spec,1.22,1.23 Message-ID: <200603220930.k2M9UvHa007285@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7243/devel Modified Files: sources yumex.spec Log Message: Release 0.99.14 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 20 Mar 2006 12:32:30 -0000 1.21 +++ sources 22 Mar 2006 09:30:25 -0000 1.22 @@ -1 +1 @@ -cfad88b2e83aafa6f7523ea037ec2731 yumex-0.99.13.tar.gz +75aade2fc07e8672d61b0f553f37ab0d yumex-0.99.14.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- yumex.spec 20 Mar 2006 12:32:30 -0000 1.22 +++ yumex.spec 22 Mar 2006 09:30:25 -0000 1.23 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.13 +Version: 0.99.14 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Mar 20 2006 Tim Lauridsen - 0.99.14-1.0 +- Development Release 0.99.14-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 - Development Release 0.99.13-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 From fedora-extras-commits at redhat.com Wed Mar 22 10:22:11 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 22 Mar 2006 05:22:11 -0500 Subject: fedora-security/audit fc4,1.177,1.178 fc5,1.90,1.91 Message-ID: <200603221022.k2MAMB1H009583@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9563 Modified Files: fc4 fc5 Log Message: Latest updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- fc4 21 Mar 2006 16:15:43 -0000 1.177 +++ fc4 22 Mar 2006 10:22:00 -0000 1.178 @@ -1,8 +1,11 @@ -Up to date CVE as of CVE email 20060315 -Up to date FC4 as of 20060315 +Up to date CVE as of CVE email 20060321 +Up to date FC4 as of 20060321 ** are items that need attention +CVE-2006-1354 VULNERABLE (freeradius) bz#186084 +CVE-2006-1343 ** kernel +CVE-2006-1342 ** kernel CVE-2006-1273 ** firefox (prob win only, vague) CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- fc5 21 Mar 2006 17:21:34 -0000 1.90 +++ fc5 22 Mar 2006 10:22:00 -0000 1.91 @@ -1,8 +1,11 @@ -Up to date CVE as of CVE email 20060319 -Up to date FC5 as of 20060320 +Up to date CVE as of CVE email 20060321 +Up to date FC5 as of 20060321 ** are items that need attention +CVE-2006-1354 VULNERABLE (freeradius) bz#186084 +CVE-2006-1343 ** kernel +CVE-2006-1342 ** kernel CVE-2006-1335 version (gnome-screensaver, fixed 2.14) CVE-2006-1296 backport (beagle) bz#185981 [since FEDORA-2006-188] CVE-2006-1273 ** firefox (prob win only, vague) From fedora-extras-commits at redhat.com Wed Mar 22 10:39:05 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:39:05 -0500 Subject: rpms/perl-pmtools/FC-3 pmtools-1.01-pman2pmman.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-pmtools.spec, 1.2, 1.3 sources, 1.2, 1.3 pmtools-1.00-different-tarball.patch, 1.1, NONE pmtools-1.00-pmall.patch, 1.1, NONE pmtools-1.00-pmeth-pman2pmman.patch, 1.1, NONE Message-ID: <200603221039.k2MAdbOx009796@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9712/FC-3 Modified Files: .cvsignore perl-pmtools.spec sources Added Files: pmtools-1.01-pman2pmman.patch Removed Files: pmtools-1.00-different-tarball.patch pmtools-1.00-pmall.patch pmtools-1.00-pmeth-pman2pmman.patch Log Message: Update to 1.01. pmtools-1.01-pman2pmman.patch: --- NEW FILE pmtools-1.01-pman2pmman.patch --- diff -ruN pmtools-1.01-orig/Makefile.lame pmtools-1.01/Makefile.lame --- pmtools-1.01-orig/Makefile.lame 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/Makefile.lame 2006-03-22 10:23:53.000000000 +0000 @@ -1,5 +1,5 @@ -PROGRAMS=basepods faqpods modpods pfcat plxload pmall pman pmcat \ +PROGRAMS=basepods faqpods modpods pfcat plxload pmall pmman pmcat \ pmdesc pmdirs pmeth pmexp pmfunc pminst pmload pmls pmpath pmvers podgrep \ podpath pods podtoc sitepods stdpods diff -ruN pmtools-1.01-orig/Makefile.PL pmtools-1.01/Makefile.PL --- pmtools-1.01-orig/Makefile.PL 2006-03-22 00:54:57.000000000 +0000 +++ pmtools-1.01/Makefile.PL 2006-03-22 10:23:53.000000000 +0000 @@ -4,8 +4,8 @@ NAME => "pmtools", DISTNAME => "pmtools", EXE_FILES => [ basepods, faqpods, modpods, pfcat, plxload, - pmall, pman, pmcat, pmdesc, pmdirs, pmeth, pmexp, - pmfunc, pminst, pmload, pmls, pmpath, pmvers, + pmall, pmcat, pmdesc, pmdirs, pmeth, pmexp, + pmfunc, pminst, pmload, pmman, pmls, pmpath, pmvers, podgrep, podpath, pods, podtoc, sitepods, stdpods ], PM => { 'Devel/Loaded.pm' => '$(INST_LIBDIR)/Devel/Loaded.pm' } diff -ruN pmtools-1.01-orig/MANIFEST pmtools-1.01/MANIFEST --- pmtools-1.01-orig/MANIFEST 2006-03-22 02:57:51.000000000 +0000 +++ pmtools-1.01/MANIFEST 2006-03-22 10:23:53.000000000 +0000 @@ -12,7 +12,7 @@ pfcat plxload pmall -pman +pmman pmcat pmdesc pmdirs diff -ruN pmtools-1.01-orig/pman pmtools-1.01/pman --- pmtools-1.01-orig/pman 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/pman 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -#!/usr/bin/env perl -# pman -- show a module's man page -# tchrist at perl.com - -BEGIN { $^W = 1 } -BEGIN { die "usage: $0 module ...\n" unless @ARGV } - -use FindBin qw($Bin); - -$errors = 0; - -unless ($pager = $ENV{PAGER}) { - require Config; - $pager = $Config::Config{"pager"} || "more"; -} - -for $module (@ARGV) { - my $path = `$Bin/pmpath $module`; - if ($?) { - $errors++; - next; - } - chomp $path; - system "pod2text $path | $pager"; - $errors += ($? != 1); -} - -exit($errors != 0); - -__END__ - -=head1 NAME - -pman - show a module's man page - -=head1 DESCRIPTION - -Send a module's pod through pod2text and your pager. - -This is mostly here for people too lazy to type - - $ pod2text `pmpath CGI` | $PAGER - -=head1 EXAMPLES - - $ pman CGI - $ pman Curses - -Or running under different versions of Perl: - - $ oldperl -S pman CGI - $ filsperl -S pman Threads - -=head1 SEE ALSO - -pod2text(1), perlpod(1), pod2man(1), pod2html(1). - -=head1 AUTHOR and COPYRIGHT - -Copyright (c) 1999 Tom Christiansen - -This is free software. You may modify it and distribute it -under Perl's Artistic Licence. Modified versions must be -clearly indicated. diff -ruN pmtools-1.01-orig/pmman pmtools-1.01/pmman --- pmtools-1.01-orig/pmman 1970-01-01 01:00:00.000000000 +0100 +++ pmtools-1.01/pmman 2006-03-22 10:23:53.000000000 +0000 @@ -0,0 +1,64 @@ +#!/usr/bin/env perl +# pmman -- show a module's man page +# tchrist at perl.com + +BEGIN { $^W = 1 } +BEGIN { die "usage: $0 module ...\n" unless @ARGV } + +use FindBin qw($Bin); + +$errors = 0; + +unless ($pager = $ENV{PAGER}) { + require Config; + $pager = $Config::Config{"pager"} || "more"; +} + +for $module (@ARGV) { + my $path = `$Bin/pmpath $module`; + if ($?) { + $errors++; + next; + } + chomp $path; + system "pod2text $path | $pager"; + $errors += ($? != 1); +} + +exit($errors != 0); + +__END__ + +=head1 NAME + +pmman - show a module's man page + +=head1 DESCRIPTION + +Send a module's pod through pod2text and your pager. + +This is mostly here for people too lazy to type + + $ pod2text `pmpath CGI` | $PAGER + +=head1 EXAMPLES + + $ pmman CGI + $ pmman Curses + +Or running under different versions of Perl: + + $ oldperl -S pmman CGI + $ filsperl -S pmman Threads + +=head1 SEE ALSO + +pod2text(1), perlpod(1), pod2man(1), pod2html(1). + +=head1 AUTHOR and COPYRIGHT + +Copyright (c) 1999 Tom Christiansen + +This is free software. You may modify it and distribute it +under Perl's Artistic Licence. Modified versions must be +clearly indicated. diff -ruN pmtools-1.01-orig/README pmtools-1.01/README --- pmtools-1.01-orig/README 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/README 2006-03-22 10:23:53.000000000 +0000 @@ -383,10 +383,10 @@ ========================================================= -pman - show the module's pod docs +pmman - show the module's pod docs - $ pman CGI - $ pman Curses + $ pmman CGI + $ pmman Curses This is mostly here for people too lazy to type $ pod2text `pmpath CGI` | more Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2005 02:06:20 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:39:05 -0000 1.3 @@ -1 +1 @@ -pmtools-1.00.tar.gz +pmtools-1.01.tar.gz Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-3/perl-pmtools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-pmtools.spec 17 Mar 2005 03:40:07 -0000 1.2 +++ perl-pmtools.spec 22 Mar 2006 10:39:05 -0000 1.3 @@ -1,22 +1,18 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-pmtools -Version: 1.00 -Release: 1 +Version: 1.01 +Release: 1%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries License: Artistic -Url: http://language.perl.com/ -Source: http://history.perl.org/src/pmtools-1.00.tar.gz -Patch1: pmtools-1.00-different-tarball.patch -Patch2: pmtools-1.00-pmall.patch -Patch3: pmtools-1.00-pmeth-pman2pmman.patch +URL: http://search.cpan.org/dist/pmtools/ +Source: http://www.cpan.org/authors/id/M/ML/MLFISHER/pmtools-%{version}.tar.gz +Patch: pmtools-1.01-pman2pmman.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This is pmtools -- a suite of small programs to help manage modules. @@ -29,9 +25,7 @@ %prep %setup -q -n pmtools-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -p1 chmod 755 pmman find . -type f -perm 755 | xargs %{__perl} -pi -e 's{^#!/usr/bin/env perl}{#!%{__perl}}' @@ -49,7 +43,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -67,6 +61,21 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 1.01-1 +- Update to 1.01. +- URL updated: pmtools is now available in CPAN. +- Dropped patches pmtools-1.00-{different-tarball.patch,pmall.patch}: + they were accepted upstream. + +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.00-4 +- Rebuild for FC5 (perl 5.8.8). + +* Thu Dec 22 2005 Jose Pedro Oliveira - 1.00-3 +- Dist tag. + +* Fri Apr 7 2005 Michael Schwendt - 1.00-2 +- rebuilt + * Sun Feb 06 2005 Jose Pedro Oliveira - 1.00-1 - Valid source file link found. - Package renamed to 'perl-pmtools' in order to avoid name clash with @@ -77,5 +86,5 @@ script 'pman' into 'pmman' in order to avoid a filename clash with the pinfo package. -* Sat Feb 28 2004 Jose Pedro Oliveira 0:1.00-0.fdr.0 +* Sat Feb 28 2004 Jose Pedro Oliveira - 0:1.00-0.fdr.0 - Initial build for fedora.us Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2005 02:06:20 -0000 1.2 +++ sources 22 Mar 2006 10:39:05 -0000 1.3 @@ -1 +1 @@ -88ee58113ac3d513d94f81f9fdfaeb00 pmtools-1.00.tar.gz +85d800dff1f73b559a929d7984435b57 pmtools-1.01.tar.gz --- pmtools-1.00-different-tarball.patch DELETED --- --- pmtools-1.00-pmall.patch DELETED --- --- pmtools-1.00-pmeth-pman2pmman.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 10:39:11 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:39:11 -0500 Subject: rpms/perl-pmtools/FC-4 pmtools-1.01-pman2pmman.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-pmtools.spec, 1.3, 1.4 sources, 1.2, 1.3 pmtools-1.00-different-tarball.patch, 1.1, NONE pmtools-1.00-pmall.patch, 1.1, NONE pmtools-1.00-pmeth-pman2pmman.patch, 1.1, NONE Message-ID: <200603221039.k2MAdhkN009801@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9712/FC-4 Modified Files: .cvsignore perl-pmtools.spec sources Added Files: pmtools-1.01-pman2pmman.patch Removed Files: pmtools-1.00-different-tarball.patch pmtools-1.00-pmall.patch pmtools-1.00-pmeth-pman2pmman.patch Log Message: Update to 1.01. pmtools-1.01-pman2pmman.patch: --- NEW FILE pmtools-1.01-pman2pmman.patch --- diff -ruN pmtools-1.01-orig/Makefile.lame pmtools-1.01/Makefile.lame --- pmtools-1.01-orig/Makefile.lame 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/Makefile.lame 2006-03-22 10:23:53.000000000 +0000 @@ -1,5 +1,5 @@ -PROGRAMS=basepods faqpods modpods pfcat plxload pmall pman pmcat \ +PROGRAMS=basepods faqpods modpods pfcat plxload pmall pmman pmcat \ pmdesc pmdirs pmeth pmexp pmfunc pminst pmload pmls pmpath pmvers podgrep \ podpath pods podtoc sitepods stdpods diff -ruN pmtools-1.01-orig/Makefile.PL pmtools-1.01/Makefile.PL --- pmtools-1.01-orig/Makefile.PL 2006-03-22 00:54:57.000000000 +0000 +++ pmtools-1.01/Makefile.PL 2006-03-22 10:23:53.000000000 +0000 @@ -4,8 +4,8 @@ NAME => "pmtools", DISTNAME => "pmtools", EXE_FILES => [ basepods, faqpods, modpods, pfcat, plxload, - pmall, pman, pmcat, pmdesc, pmdirs, pmeth, pmexp, - pmfunc, pminst, pmload, pmls, pmpath, pmvers, + pmall, pmcat, pmdesc, pmdirs, pmeth, pmexp, + pmfunc, pminst, pmload, pmman, pmls, pmpath, pmvers, podgrep, podpath, pods, podtoc, sitepods, stdpods ], PM => { 'Devel/Loaded.pm' => '$(INST_LIBDIR)/Devel/Loaded.pm' } diff -ruN pmtools-1.01-orig/MANIFEST pmtools-1.01/MANIFEST --- pmtools-1.01-orig/MANIFEST 2006-03-22 02:57:51.000000000 +0000 +++ pmtools-1.01/MANIFEST 2006-03-22 10:23:53.000000000 +0000 @@ -12,7 +12,7 @@ pfcat plxload pmall -pman +pmman pmcat pmdesc pmdirs diff -ruN pmtools-1.01-orig/pman pmtools-1.01/pman --- pmtools-1.01-orig/pman 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/pman 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -#!/usr/bin/env perl -# pman -- show a module's man page -# tchrist at perl.com - -BEGIN { $^W = 1 } -BEGIN { die "usage: $0 module ...\n" unless @ARGV } - -use FindBin qw($Bin); - -$errors = 0; - -unless ($pager = $ENV{PAGER}) { - require Config; - $pager = $Config::Config{"pager"} || "more"; -} - -for $module (@ARGV) { - my $path = `$Bin/pmpath $module`; - if ($?) { - $errors++; - next; - } - chomp $path; - system "pod2text $path | $pager"; - $errors += ($? != 1); -} - -exit($errors != 0); - -__END__ - -=head1 NAME - -pman - show a module's man page - -=head1 DESCRIPTION - -Send a module's pod through pod2text and your pager. - -This is mostly here for people too lazy to type - - $ pod2text `pmpath CGI` | $PAGER - -=head1 EXAMPLES - - $ pman CGI - $ pman Curses - -Or running under different versions of Perl: - - $ oldperl -S pman CGI - $ filsperl -S pman Threads - -=head1 SEE ALSO - -pod2text(1), perlpod(1), pod2man(1), pod2html(1). - -=head1 AUTHOR and COPYRIGHT - -Copyright (c) 1999 Tom Christiansen - -This is free software. You may modify it and distribute it -under Perl's Artistic Licence. Modified versions must be -clearly indicated. diff -ruN pmtools-1.01-orig/pmman pmtools-1.01/pmman --- pmtools-1.01-orig/pmman 1970-01-01 01:00:00.000000000 +0100 +++ pmtools-1.01/pmman 2006-03-22 10:23:53.000000000 +0000 @@ -0,0 +1,64 @@ +#!/usr/bin/env perl +# pmman -- show a module's man page +# tchrist at perl.com + +BEGIN { $^W = 1 } +BEGIN { die "usage: $0 module ...\n" unless @ARGV } + +use FindBin qw($Bin); + +$errors = 0; + +unless ($pager = $ENV{PAGER}) { + require Config; + $pager = $Config::Config{"pager"} || "more"; +} + +for $module (@ARGV) { + my $path = `$Bin/pmpath $module`; + if ($?) { + $errors++; + next; + } + chomp $path; + system "pod2text $path | $pager"; + $errors += ($? != 1); +} + +exit($errors != 0); + +__END__ + +=head1 NAME + +pmman - show a module's man page + +=head1 DESCRIPTION + +Send a module's pod through pod2text and your pager. + +This is mostly here for people too lazy to type + + $ pod2text `pmpath CGI` | $PAGER + +=head1 EXAMPLES + + $ pmman CGI + $ pmman Curses + +Or running under different versions of Perl: + + $ oldperl -S pmman CGI + $ filsperl -S pmman Threads + +=head1 SEE ALSO + +pod2text(1), perlpod(1), pod2man(1), pod2html(1). + +=head1 AUTHOR and COPYRIGHT + +Copyright (c) 1999 Tom Christiansen + +This is free software. You may modify it and distribute it +under Perl's Artistic Licence. Modified versions must be +clearly indicated. diff -ruN pmtools-1.01-orig/README pmtools-1.01/README --- pmtools-1.01-orig/README 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/README 2006-03-22 10:23:53.000000000 +0000 @@ -383,10 +383,10 @@ ========================================================= -pman - show the module's pod docs +pmman - show the module's pod docs - $ pman CGI - $ pman Curses + $ pmman CGI + $ pmman Curses This is mostly here for people too lazy to type $ pod2text `pmpath CGI` | more Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2005 02:06:20 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:39:11 -0000 1.3 @@ -1 +1 @@ -pmtools-1.00.tar.gz +pmtools-1.01.tar.gz Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-4/perl-pmtools.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-pmtools.spec 6 Apr 2005 22:13:29 -0000 1.3 +++ perl-pmtools.spec 22 Mar 2006 10:39:11 -0000 1.4 @@ -1,23 +1,18 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-pmtools -Version: 1.00 -Release: 2 - +Version: 1.01 +Release: 1%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries License: Artistic -Url: http://language.perl.com/ -Source: http://history.perl.org/src/pmtools-1.00.tar.gz -Patch1: pmtools-1.00-different-tarball.patch -Patch2: pmtools-1.00-pmall.patch -Patch3: pmtools-1.00-pmeth-pman2pmman.patch +URL: http://search.cpan.org/dist/pmtools/ +Source: http://www.cpan.org/authors/id/M/ML/MLFISHER/pmtools-%{version}.tar.gz +Patch: pmtools-1.01-pman2pmman.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This is pmtools -- a suite of small programs to help manage modules. @@ -30,9 +25,7 @@ %prep %setup -q -n pmtools-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -p1 chmod 755 pmman find . -type f -perm 755 | xargs %{__perl} -pi -e 's{^#!/usr/bin/env perl}{#!%{__perl}}' @@ -50,7 +43,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -68,7 +61,19 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Wed Mar 22 2006 Jose Pedro Oliveira - 1.01-1 +- Update to 1.01. +- URL updated: pmtools is now available in CPAN. +- Dropped patches pmtools-1.00-{different-tarball.patch,pmall.patch}: + they were accepted upstream. + +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.00-4 +- Rebuild for FC5 (perl 5.8.8). + +* Thu Dec 22 2005 Jose Pedro Oliveira - 1.00-3 +- Dist tag. + +* Fri Apr 7 2005 Michael Schwendt - 1.00-2 - rebuilt * Sun Feb 06 2005 Jose Pedro Oliveira - 1.00-1 @@ -81,5 +86,5 @@ script 'pman' into 'pmman' in order to avoid a filename clash with the pinfo package. -* Sat Feb 28 2004 Jose Pedro Oliveira 0:1.00-0.fdr.0 +* Sat Feb 28 2004 Jose Pedro Oliveira - 0:1.00-0.fdr.0 - Initial build for fedora.us Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2005 02:06:20 -0000 1.2 +++ sources 22 Mar 2006 10:39:11 -0000 1.3 @@ -1 +1 @@ -88ee58113ac3d513d94f81f9fdfaeb00 pmtools-1.00.tar.gz +85d800dff1f73b559a929d7984435b57 pmtools-1.01.tar.gz --- pmtools-1.00-different-tarball.patch DELETED --- --- pmtools-1.00-pmall.patch DELETED --- --- pmtools-1.00-pmeth-pman2pmman.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 10:39:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:39:17 -0500 Subject: rpms/perl-pmtools/FC-5 pmtools-1.01-pman2pmman.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-pmtools.spec, 1.5, 1.6 sources, 1.2, 1.3 pmtools-1.00-different-tarball.patch, 1.1, NONE pmtools-1.00-pmall.patch, 1.1, NONE pmtools-1.00-pmeth-pman2pmman.patch, 1.1, NONE Message-ID: <200603221039.k2MAdnMb009806@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9712/FC-5 Modified Files: .cvsignore perl-pmtools.spec sources Added Files: pmtools-1.01-pman2pmman.patch Removed Files: pmtools-1.00-different-tarball.patch pmtools-1.00-pmall.patch pmtools-1.00-pmeth-pman2pmman.patch Log Message: Update to 1.01. pmtools-1.01-pman2pmman.patch: --- NEW FILE pmtools-1.01-pman2pmman.patch --- diff -ruN pmtools-1.01-orig/Makefile.lame pmtools-1.01/Makefile.lame --- pmtools-1.01-orig/Makefile.lame 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/Makefile.lame 2006-03-22 10:23:53.000000000 +0000 @@ -1,5 +1,5 @@ -PROGRAMS=basepods faqpods modpods pfcat plxload pmall pman pmcat \ +PROGRAMS=basepods faqpods modpods pfcat plxload pmall pmman pmcat \ pmdesc pmdirs pmeth pmexp pmfunc pminst pmload pmls pmpath pmvers podgrep \ podpath pods podtoc sitepods stdpods diff -ruN pmtools-1.01-orig/Makefile.PL pmtools-1.01/Makefile.PL --- pmtools-1.01-orig/Makefile.PL 2006-03-22 00:54:57.000000000 +0000 +++ pmtools-1.01/Makefile.PL 2006-03-22 10:23:53.000000000 +0000 @@ -4,8 +4,8 @@ NAME => "pmtools", DISTNAME => "pmtools", EXE_FILES => [ basepods, faqpods, modpods, pfcat, plxload, - pmall, pman, pmcat, pmdesc, pmdirs, pmeth, pmexp, - pmfunc, pminst, pmload, pmls, pmpath, pmvers, + pmall, pmcat, pmdesc, pmdirs, pmeth, pmexp, + pmfunc, pminst, pmload, pmman, pmls, pmpath, pmvers, podgrep, podpath, pods, podtoc, sitepods, stdpods ], PM => { 'Devel/Loaded.pm' => '$(INST_LIBDIR)/Devel/Loaded.pm' } diff -ruN pmtools-1.01-orig/MANIFEST pmtools-1.01/MANIFEST --- pmtools-1.01-orig/MANIFEST 2006-03-22 02:57:51.000000000 +0000 +++ pmtools-1.01/MANIFEST 2006-03-22 10:23:53.000000000 +0000 @@ -12,7 +12,7 @@ pfcat plxload pmall -pman +pmman pmcat pmdesc pmdirs diff -ruN pmtools-1.01-orig/pman pmtools-1.01/pman --- pmtools-1.01-orig/pman 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/pman 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -#!/usr/bin/env perl -# pman -- show a module's man page -# tchrist at perl.com - -BEGIN { $^W = 1 } -BEGIN { die "usage: $0 module ...\n" unless @ARGV } - -use FindBin qw($Bin); - -$errors = 0; - -unless ($pager = $ENV{PAGER}) { - require Config; - $pager = $Config::Config{"pager"} || "more"; -} - -for $module (@ARGV) { - my $path = `$Bin/pmpath $module`; - if ($?) { - $errors++; - next; - } - chomp $path; - system "pod2text $path | $pager"; - $errors += ($? != 1); -} - -exit($errors != 0); - -__END__ - -=head1 NAME - -pman - show a module's man page - -=head1 DESCRIPTION - -Send a module's pod through pod2text and your pager. - -This is mostly here for people too lazy to type - - $ pod2text `pmpath CGI` | $PAGER - -=head1 EXAMPLES - - $ pman CGI - $ pman Curses - -Or running under different versions of Perl: - - $ oldperl -S pman CGI - $ filsperl -S pman Threads - -=head1 SEE ALSO - -pod2text(1), perlpod(1), pod2man(1), pod2html(1). - -=head1 AUTHOR and COPYRIGHT - -Copyright (c) 1999 Tom Christiansen - -This is free software. You may modify it and distribute it -under Perl's Artistic Licence. Modified versions must be -clearly indicated. diff -ruN pmtools-1.01-orig/pmman pmtools-1.01/pmman --- pmtools-1.01-orig/pmman 1970-01-01 01:00:00.000000000 +0100 +++ pmtools-1.01/pmman 2006-03-22 10:23:53.000000000 +0000 @@ -0,0 +1,64 @@ +#!/usr/bin/env perl +# pmman -- show a module's man page +# tchrist at perl.com + +BEGIN { $^W = 1 } +BEGIN { die "usage: $0 module ...\n" unless @ARGV } + +use FindBin qw($Bin); + +$errors = 0; + +unless ($pager = $ENV{PAGER}) { + require Config; + $pager = $Config::Config{"pager"} || "more"; +} + +for $module (@ARGV) { + my $path = `$Bin/pmpath $module`; + if ($?) { + $errors++; + next; + } + chomp $path; + system "pod2text $path | $pager"; + $errors += ($? != 1); +} + +exit($errors != 0); + +__END__ + +=head1 NAME + +pmman - show a module's man page + +=head1 DESCRIPTION + +Send a module's pod through pod2text and your pager. + +This is mostly here for people too lazy to type + + $ pod2text `pmpath CGI` | $PAGER + +=head1 EXAMPLES + + $ pmman CGI + $ pmman Curses + +Or running under different versions of Perl: + + $ oldperl -S pmman CGI + $ filsperl -S pmman Threads + +=head1 SEE ALSO + +pod2text(1), perlpod(1), pod2man(1), pod2html(1). + +=head1 AUTHOR and COPYRIGHT + +Copyright (c) 1999 Tom Christiansen + +This is free software. You may modify it and distribute it +under Perl's Artistic Licence. Modified versions must be +clearly indicated. diff -ruN pmtools-1.01-orig/README pmtools-1.01/README --- pmtools-1.01-orig/README 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/README 2006-03-22 10:23:53.000000000 +0000 @@ -383,10 +383,10 @@ ========================================================= -pman - show the module's pod docs +pmman - show the module's pod docs - $ pman CGI - $ pman Curses + $ pmman CGI + $ pmman Curses This is mostly here for people too lazy to type $ pod2text `pmpath CGI` | more Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2005 02:06:20 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:39:16 -0000 1.3 @@ -1 +1 @@ -pmtools-1.00.tar.gz +pmtools-1.01.tar.gz Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-5/perl-pmtools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-pmtools.spec 9 Mar 2006 18:18:58 -0000 1.5 +++ perl-pmtools.spec 22 Mar 2006 10:39:16 -0000 1.6 @@ -1,15 +1,13 @@ Name: perl-pmtools -Version: 1.00 -Release: 4%{?dist} +Version: 1.01 +Release: 1%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries License: Artistic -Url: http://language.perl.com/ -Source: http://history.perl.org/src/pmtools-%{version}.tar.gz -Patch1: pmtools-1.00-different-tarball.patch -Patch2: pmtools-1.00-pmall.patch -Patch3: pmtools-1.00-pmeth-pman2pmman.patch +URL: http://search.cpan.org/dist/pmtools/ +Source: http://www.cpan.org/authors/id/M/ML/MLFISHER/pmtools-%{version}.tar.gz +Patch: pmtools-1.01-pman2pmman.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,9 +25,7 @@ %prep %setup -q -n pmtools-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -p1 chmod 755 pmman find . -type f -perm 755 | xargs %{__perl} -pi -e 's{^#!/usr/bin/env perl}{#!%{__perl}}' @@ -65,6 +61,12 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 1.01-1 +- Update to 1.01. +- URL updated: pmtools is now available in CPAN. +- Dropped patches pmtools-1.00-{different-tarball.patch,pmall.patch}: + they were accepted upstream. + * Thu Mar 9 2006 Jose Pedro Oliveira - 1.00-4 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2005 02:06:20 -0000 1.2 +++ sources 22 Mar 2006 10:39:16 -0000 1.3 @@ -1 +1 @@ -88ee58113ac3d513d94f81f9fdfaeb00 pmtools-1.00.tar.gz +85d800dff1f73b559a929d7984435b57 pmtools-1.01.tar.gz --- pmtools-1.00-different-tarball.patch DELETED --- --- pmtools-1.00-pmall.patch DELETED --- --- pmtools-1.00-pmeth-pman2pmman.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 10:39:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:39:22 -0500 Subject: rpms/perl-pmtools/devel pmtools-1.01-pman2pmman.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-pmtools.spec, 1.5, 1.6 sources, 1.2, 1.3 pmtools-1.00-different-tarball.patch, 1.1, NONE pmtools-1.00-pmall.patch, 1.1, NONE pmtools-1.00-pmeth-pman2pmman.patch, 1.1, NONE Message-ID: <200603221039.k2MAdtI1009811@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9712/devel Modified Files: .cvsignore perl-pmtools.spec sources Added Files: pmtools-1.01-pman2pmman.patch Removed Files: pmtools-1.00-different-tarball.patch pmtools-1.00-pmall.patch pmtools-1.00-pmeth-pman2pmman.patch Log Message: Update to 1.01. pmtools-1.01-pman2pmman.patch: --- NEW FILE pmtools-1.01-pman2pmman.patch --- diff -ruN pmtools-1.01-orig/Makefile.lame pmtools-1.01/Makefile.lame --- pmtools-1.01-orig/Makefile.lame 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/Makefile.lame 2006-03-22 10:23:53.000000000 +0000 @@ -1,5 +1,5 @@ -PROGRAMS=basepods faqpods modpods pfcat plxload pmall pman pmcat \ +PROGRAMS=basepods faqpods modpods pfcat plxload pmall pmman pmcat \ pmdesc pmdirs pmeth pmexp pmfunc pminst pmload pmls pmpath pmvers podgrep \ podpath pods podtoc sitepods stdpods diff -ruN pmtools-1.01-orig/Makefile.PL pmtools-1.01/Makefile.PL --- pmtools-1.01-orig/Makefile.PL 2006-03-22 00:54:57.000000000 +0000 +++ pmtools-1.01/Makefile.PL 2006-03-22 10:23:53.000000000 +0000 @@ -4,8 +4,8 @@ NAME => "pmtools", DISTNAME => "pmtools", EXE_FILES => [ basepods, faqpods, modpods, pfcat, plxload, - pmall, pman, pmcat, pmdesc, pmdirs, pmeth, pmexp, - pmfunc, pminst, pmload, pmls, pmpath, pmvers, + pmall, pmcat, pmdesc, pmdirs, pmeth, pmexp, + pmfunc, pminst, pmload, pmman, pmls, pmpath, pmvers, podgrep, podpath, pods, podtoc, sitepods, stdpods ], PM => { 'Devel/Loaded.pm' => '$(INST_LIBDIR)/Devel/Loaded.pm' } diff -ruN pmtools-1.01-orig/MANIFEST pmtools-1.01/MANIFEST --- pmtools-1.01-orig/MANIFEST 2006-03-22 02:57:51.000000000 +0000 +++ pmtools-1.01/MANIFEST 2006-03-22 10:23:53.000000000 +0000 @@ -12,7 +12,7 @@ pfcat plxload pmall -pman +pmman pmcat pmdesc pmdirs diff -ruN pmtools-1.01-orig/pman pmtools-1.01/pman --- pmtools-1.01-orig/pman 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/pman 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -#!/usr/bin/env perl -# pman -- show a module's man page -# tchrist at perl.com - -BEGIN { $^W = 1 } -BEGIN { die "usage: $0 module ...\n" unless @ARGV } - -use FindBin qw($Bin); - -$errors = 0; - -unless ($pager = $ENV{PAGER}) { - require Config; - $pager = $Config::Config{"pager"} || "more"; -} - -for $module (@ARGV) { - my $path = `$Bin/pmpath $module`; - if ($?) { - $errors++; - next; - } - chomp $path; - system "pod2text $path | $pager"; - $errors += ($? != 1); -} - -exit($errors != 0); - -__END__ - -=head1 NAME - -pman - show a module's man page - -=head1 DESCRIPTION - -Send a module's pod through pod2text and your pager. - -This is mostly here for people too lazy to type - - $ pod2text `pmpath CGI` | $PAGER - -=head1 EXAMPLES - - $ pman CGI - $ pman Curses - -Or running under different versions of Perl: - - $ oldperl -S pman CGI - $ filsperl -S pman Threads - -=head1 SEE ALSO - -pod2text(1), perlpod(1), pod2man(1), pod2html(1). - -=head1 AUTHOR and COPYRIGHT - -Copyright (c) 1999 Tom Christiansen - -This is free software. You may modify it and distribute it -under Perl's Artistic Licence. Modified versions must be -clearly indicated. diff -ruN pmtools-1.01-orig/pmman pmtools-1.01/pmman --- pmtools-1.01-orig/pmman 1970-01-01 01:00:00.000000000 +0100 +++ pmtools-1.01/pmman 2006-03-22 10:23:53.000000000 +0000 @@ -0,0 +1,64 @@ +#!/usr/bin/env perl +# pmman -- show a module's man page +# tchrist at perl.com + +BEGIN { $^W = 1 } +BEGIN { die "usage: $0 module ...\n" unless @ARGV } + +use FindBin qw($Bin); + +$errors = 0; + +unless ($pager = $ENV{PAGER}) { + require Config; + $pager = $Config::Config{"pager"} || "more"; +} + +for $module (@ARGV) { + my $path = `$Bin/pmpath $module`; + if ($?) { + $errors++; + next; + } + chomp $path; + system "pod2text $path | $pager"; + $errors += ($? != 1); +} + +exit($errors != 0); + +__END__ + +=head1 NAME + +pmman - show a module's man page + +=head1 DESCRIPTION + +Send a module's pod through pod2text and your pager. + +This is mostly here for people too lazy to type + + $ pod2text `pmpath CGI` | $PAGER + +=head1 EXAMPLES + + $ pmman CGI + $ pmman Curses + +Or running under different versions of Perl: + + $ oldperl -S pmman CGI + $ filsperl -S pmman Threads + +=head1 SEE ALSO + +pod2text(1), perlpod(1), pod2man(1), pod2html(1). + +=head1 AUTHOR and COPYRIGHT + +Copyright (c) 1999 Tom Christiansen + +This is free software. You may modify it and distribute it +under Perl's Artistic Licence. Modified versions must be +clearly indicated. diff -ruN pmtools-1.01-orig/README pmtools-1.01/README --- pmtools-1.01-orig/README 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/README 2006-03-22 10:23:53.000000000 +0000 @@ -383,10 +383,10 @@ ========================================================= -pman - show the module's pod docs +pmman - show the module's pod docs - $ pman CGI - $ pman Curses + $ pmman CGI + $ pmman Curses This is mostly here for people too lazy to type $ pod2text `pmpath CGI` | more Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2005 02:06:20 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:39:22 -0000 1.3 @@ -1 +1 @@ -pmtools-1.00.tar.gz +pmtools-1.01.tar.gz Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/devel/perl-pmtools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-pmtools.spec 9 Mar 2006 18:18:58 -0000 1.5 +++ perl-pmtools.spec 22 Mar 2006 10:39:22 -0000 1.6 @@ -1,15 +1,13 @@ Name: perl-pmtools -Version: 1.00 -Release: 4%{?dist} +Version: 1.01 +Release: 1%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries License: Artistic -Url: http://language.perl.com/ -Source: http://history.perl.org/src/pmtools-%{version}.tar.gz -Patch1: pmtools-1.00-different-tarball.patch -Patch2: pmtools-1.00-pmall.patch -Patch3: pmtools-1.00-pmeth-pman2pmman.patch +URL: http://search.cpan.org/dist/pmtools/ +Source: http://www.cpan.org/authors/id/M/ML/MLFISHER/pmtools-%{version}.tar.gz +Patch: pmtools-1.01-pman2pmman.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,9 +25,7 @@ %prep %setup -q -n pmtools-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -p1 chmod 755 pmman find . -type f -perm 755 | xargs %{__perl} -pi -e 's{^#!/usr/bin/env perl}{#!%{__perl}}' @@ -65,6 +61,12 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 1.01-1 +- Update to 1.01. +- URL updated: pmtools is now available in CPAN. +- Dropped patches pmtools-1.00-{different-tarball.patch,pmall.patch}: + they were accepted upstream. + * Thu Mar 9 2006 Jose Pedro Oliveira - 1.00-4 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2005 02:06:20 -0000 1.2 +++ sources 22 Mar 2006 10:39:22 -0000 1.3 @@ -1 +1 @@ -88ee58113ac3d513d94f81f9fdfaeb00 pmtools-1.00.tar.gz +85d800dff1f73b559a929d7984435b57 pmtools-1.01.tar.gz --- pmtools-1.00-different-tarball.patch DELETED --- --- pmtools-1.00-pmall.patch DELETED --- --- pmtools-1.00-pmeth-pman2pmman.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 10:53:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:53:15 -0500 Subject: rpms/perl-HTTP-Proxy/FC-4 .cvsignore, 1.2, 1.3 perl-HTTP-Proxy.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603221053.k2MArmvD010070@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009/FC-4 Modified Files: .cvsignore perl-HTTP-Proxy.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Mar 2006 21:05:38 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:53:15 -0000 1.3 @@ -1 +1 @@ -HTTP-Proxy-0.17.tar.gz +HTTP-Proxy-0.18.tar.gz Index: perl-HTTP-Proxy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/perl-HTTP-Proxy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-HTTP-Proxy.spec 6 Mar 2006 23:27:42 -0000 1.2 +++ perl-HTTP-Proxy.spec 22 Mar 2006 10:53:15 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-HTTP-Proxy -Version: 0.17 -Release: 3%{?dist} +Version: 0.18 +Release: 1%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-3 - Added missing BR: perl(Test::Pod::Coverage). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Mar 2006 21:05:38 -0000 1.2 +++ sources 22 Mar 2006 10:53:15 -0000 1.3 @@ -1 +1 @@ -5f8dee810951840408092c07faccfa1a HTTP-Proxy-0.17.tar.gz +9a7e180caf7d6854cd3dad3fe0f21365 HTTP-Proxy-0.18.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 10:53:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:53:21 -0500 Subject: rpms/perl-HTTP-Proxy/FC-5 .cvsignore, 1.2, 1.3 perl-HTTP-Proxy.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603221053.k2MArrvV010076@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009/FC-5 Modified Files: .cvsignore perl-HTTP-Proxy.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Mar 2006 21:05:38 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:53:21 -0000 1.3 @@ -1 +1 @@ -HTTP-Proxy-0.17.tar.gz +HTTP-Proxy-0.18.tar.gz Index: perl-HTTP-Proxy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/perl-HTTP-Proxy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-HTTP-Proxy.spec 6 Mar 2006 22:58:02 -0000 1.2 +++ perl-HTTP-Proxy.spec 22 Mar 2006 10:53:21 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-HTTP-Proxy -Version: 0.17 -Release: 3%{?dist} +Version: 0.18 +Release: 1%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-3 - Added missing BR: perl(Test::Pod::Coverage). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Mar 2006 21:05:38 -0000 1.2 +++ sources 22 Mar 2006 10:53:21 -0000 1.3 @@ -1 +1 @@ -5f8dee810951840408092c07faccfa1a HTTP-Proxy-0.17.tar.gz +9a7e180caf7d6854cd3dad3fe0f21365 HTTP-Proxy-0.18.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 10:53:27 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:53:27 -0500 Subject: rpms/perl-HTTP-Proxy/devel .cvsignore, 1.2, 1.3 perl-HTTP-Proxy.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603221053.k2MArxAj010081@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009/devel Modified Files: .cvsignore perl-HTTP-Proxy.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Mar 2006 21:05:38 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:53:27 -0000 1.3 @@ -1 +1 @@ -HTTP-Proxy-0.17.tar.gz +HTTP-Proxy-0.18.tar.gz Index: perl-HTTP-Proxy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/perl-HTTP-Proxy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-HTTP-Proxy.spec 6 Mar 2006 22:58:02 -0000 1.2 +++ perl-HTTP-Proxy.spec 22 Mar 2006 10:53:27 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-HTTP-Proxy -Version: 0.17 -Release: 3%{?dist} +Version: 0.18 +Release: 1%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-3 - Added missing BR: perl(Test::Pod::Coverage). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Mar 2006 21:05:38 -0000 1.2 +++ sources 22 Mar 2006 10:53:27 -0000 1.3 @@ -1 +1 @@ -5f8dee810951840408092c07faccfa1a HTTP-Proxy-0.17.tar.gz +9a7e180caf7d6854cd3dad3fe0f21365 HTTP-Proxy-0.18.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 10:56:48 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Wed, 22 Mar 2006 05:56:48 -0500 Subject: rpms/ghdl/devel ghdl-svn50.patch, NONE, 1.1 ghdl.spec, 1.13, 1.14 ghdl-svn38.patch, 1.1, NONE ghdl-svn39.patch, 1.1, NONE ghdl-svn40.patch, 1.1, NONE ghdl-svn49.patch, 1.1, NONE Message-ID: <200603221057.k2MAvL0g010223@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10203 Modified Files: ghdl.spec Added Files: ghdl-svn50.patch Removed Files: ghdl-svn38.patch ghdl-svn39.patch ghdl-svn40.patch ghdl-svn49.patch Log Message: update to svn50 ghdl-svn50.patch: --- NEW FILE ghdl-svn50.patch --- diff -urN ghdl-0.21/README ghdl-0.22dev/README --- ghdl-0.21/README 2005-12-18 14:49:00.000000000 +0100 +++ ghdl-0.22dev/README 2006-03-22 11:15:27.000000000 +0100 @@ -27,19 +27,33 @@ *************************** Required: -* the sources of gcc-4.0.2 (at least the core part). +* the sources of gcc-4.1.0 (at least the core part). Note: other versions of gcc sources have not been tested. * the Ada95 GNAT compiler (GNAT v3.15p and GNAT GPL 2005 are known to work; Ada compilers in most Linux distributions are more or less buggy) * GNU/Linux for ix86 (pc systems) (porting is necessary for other systems) Procedure: +* Check your Ada compiler. On some systems (or with some distribution), the + GNAT compiler seems broken. Try this very simple example, using file + example.adb +<<<<<<<<<<<<<<<<<< +procedure Example is +begin + null; +end Example; +<<<<<<<<<<<<<<<<<< + Compile with + $ gnatmake example + It should create an executable, 'example'. + If this doesn't work, your GNAT installation is broken. It may be a PATH + problem or something else. * untar the gcc tarball * untar the ghdl tarball (this sould have been done, since you are reading a file from it). * move or copy the vhdl directory of ghdl into the gcc subdirectory of the gcc distribution. - You should have a gcc-4.0.2/gcc/vhdl directory. + You should have a gcc-4.1.0/gcc/vhdl directory. * configure gcc with the --enable-languages=vhdl option. You may of course add other languages. Refer to the gcc installation documentation. diff -urN ghdl-0.21/vhdl/configuration.adb ghdl-0.22dev/vhdl/configuration.adb --- ghdl-0.21/vhdl/configuration.adb 2005-09-22 23:26:43.000000000 +0200 +++ ghdl-0.22dev/vhdl/configuration.adb 2006-03-16 20:51:10.000000000 +0100 @@ -25,7 +25,7 @@ package body Configuration is procedure Add_Design_Concurrent_Stmts (Parent : Iir); procedure Add_Design_Block_Configuration (Blk : Iir_Block_Configuration); - procedure Add_Design_Aspect (Aspect : Iir); + procedure Add_Design_Aspect (Aspect : Iir; Add_Default : Boolean); Current_File_Dependence : Iir_List := Null_Iir_List; Current_Configuration : Iir_Configuration_Declaration := Null_Iir; @@ -53,6 +53,16 @@ return; end if; + -- May be enabled to debug dependency construction. + if False then + if From = Null_Iir then + Warning_Msg_Elab (Disp_Node (Unit) & " added", Unit); + else + Warning_Msg_Elab + (Disp_Node (Unit) & " added by " & Disp_Node (From), From); + end if; + end if; + Set_Elab_Flag (Unit, True); Lib_Unit := Get_Library_Unit (Unit); @@ -200,7 +210,7 @@ begin Unit := Get_Instantiated_Unit (Stmt); if Get_Kind (Unit) /= Iir_Kind_Component_Declaration then - Add_Design_Aspect (Unit); + Add_Design_Aspect (Unit, True); end if; end; when Iir_Kind_Generate_Statement @@ -216,7 +226,7 @@ end loop; end Add_Design_Concurrent_Stmts; - procedure Add_Design_Aspect (Aspect : Iir) + procedure Add_Design_Aspect (Aspect : Iir; Add_Default : Boolean) is use Libraries; @@ -231,10 +241,13 @@ end if; case Get_Kind (Aspect) is when Iir_Kind_Entity_Aspect_Entity => + -- Add the entity. Entity := Get_Entity (Aspect); - Entity_Lib := Get_Library_Unit (Entity); Add_Design_Unit (Entity, Aspect); + + -- Extract and add the architecture. Arch := Get_Architecture (Aspect); + Entity_Lib := Get_Library_Unit (Entity); if Arch /= Null_Iir then case Get_Kind (Arch) is when Iir_Kind_Simple_Name => @@ -263,10 +276,15 @@ Arch := Get_Design_Unit (Arch); end if; Load_Design_Unit (Arch, Aspect); - Config := Get_Default_Configuration_Declaration - (Get_Library_Unit (Arch)); - if Config /= Null_Iir then - Add_Design_Unit (Config, Aspect); + Add_Design_Unit (Arch, Aspect); + + -- Add the default configuration if required. + if Add_Default then + Config := Get_Default_Configuration_Declaration + (Get_Library_Unit (Arch)); + if Config /= Null_Iir then + Add_Design_Unit (Config, Aspect); + end if; end if; when Iir_Kind_Entity_Aspect_Configuration => Add_Design_Unit (Get_Configuration (Aspect), Aspect); @@ -424,7 +442,9 @@ -- CONF is either a configuration specification or a component -- configuration. - procedure Add_Design_Binding_Indication (Conf : Iir) + -- If ADD_DEFAULT is true, then the default configuration for the design + -- binding must be added if required. + procedure Add_Design_Binding_Indication (Conf : Iir; Add_Default : Boolean) is Bind : Iir_Binding_Indication; Inst : Iir; @@ -442,12 +462,13 @@ return; end if; Check_Binding_Indication (Conf); - Add_Design_Aspect (Get_Entity_Aspect (Bind)); + Add_Design_Aspect (Get_Entity_Aspect (Bind), Add_Default); end Add_Design_Binding_Indication; procedure Add_Design_Block_Configuration (Blk : Iir_Block_Configuration) is Item : Iir; + Sub_Config : Iir; begin if Blk = Null_Iir then return; @@ -456,10 +477,11 @@ while Item /= Null_Iir loop case Get_Kind (Item) is when Iir_Kind_Configuration_Specification => - Add_Design_Binding_Indication (Item); + Add_Design_Binding_Indication (Item, True); when Iir_Kind_Component_Configuration => - Add_Design_Binding_Indication (Item); - Add_Design_Block_Configuration (Get_Block_Configuration (Item)); + Sub_Config := Get_Block_Configuration (Item); + Add_Design_Binding_Indication (Item, Sub_Config = Null_Iir); + Add_Design_Block_Configuration (Sub_Config); when Iir_Kind_Block_Configuration => Add_Design_Block_Configuration (Item); when others => diff -urN ghdl-0.21/vhdl/errorout.adb ghdl-0.22dev/vhdl/errorout.adb --- ghdl-0.21/vhdl/errorout.adb 2005-09-22 23:27:25.000000000 +0200 +++ ghdl-0.22dev/vhdl/errorout.adb 2006-03-16 20:51:10.000000000 +0100 @@ -501,7 +501,7 @@ & Name_Table.Name_Buffer (1 .. Name_Table.Name_Length) & '''; when Iir_Kind_Entity_Aspect_Entity => - return Disp_Node (Get_Entity (Node)) + return "aspect " & Disp_Node (Get_Entity (Node)) & '(' & Iirs_Utils.Image_Identifier (Get_Architecture (Node)) & ')'; when Iir_Kind_Entity_Aspect_Configuration => diff -urN ghdl-0.21/vhdl/evaluation.adb ghdl-0.22dev/vhdl/evaluation.adb --- ghdl-0.21/vhdl/evaluation.adb 2005-12-11 16:32:03.000000000 +0100 +++ ghdl-0.22dev/vhdl/evaluation.adb 2006-03-16 20:51:10.000000000 +0100 @@ -836,6 +836,28 @@ return Build_Simple_Aggregate (Res_List, Orig, Res_Type); end Eval_Concatenation; + function Eval_Array_Equality (Left, Right : Iir) return Boolean + is + L_List : Iir_List; + R_List : Iir_List; + N : Natural; + begin + -- FIXME: the simple aggregates are lost. + L_List := Get_Simple_Aggregate_List (Eval_String_Literal (Left)); + R_List := Get_Simple_Aggregate_List (Eval_String_Literal (Right)); + N := Get_Nbr_Elements (L_List); + if N /= Get_Nbr_Elements (R_List) then + return False; + end if; + for I in 0 .. N - 1 loop + -- FIXME: this is wrong: (eg: evaluated lit) + if Get_Nth_Element (L_List, I) /= Get_Nth_Element (R_List, I) then + return False; + end if; + end loop; + return True; + end Eval_Array_Equality; + -- ORIG is either a dyadic operator or a function call. function Eval_Dyadic_Operator (Orig : Iir; Left, Right : Iir) return Iir @@ -1073,34 +1095,10 @@ (Get_Fp_Value (Left) / Iir_Fp64 (Get_Value (Right)), Orig); when Iir_Predefined_Array_Equality => - declare - L_List : Iir_List; - R_List : Iir_List; - R : Boolean; - N : Natural; - begin - -- FIXME: the simple aggregates are lost. - L_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Left)); - R_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Right)); - N := Get_Nbr_Elements (L_List); - if N /= Get_Nbr_Elements (R_List) then - R := False; - else - R := True; - for I in 0 .. N - 1 loop - -- FIXME: this is wrong: (eg: evaluated lit) - if Get_Nth_Element (L_List, I) - /= Get_Nth_Element (R_List, I) - then - R := False; - exit; - end if; - end loop; - end if; - return Build_Boolean (R, Orig); - end; + return Build_Boolean (Eval_Array_Equality (Left, Right), Orig); + + when Iir_Predefined_Array_Inequality => + return Build_Boolean (not Eval_Array_Equality (Left, Right), Orig); when Iir_Predefined_Array_Sll | Iir_Predefined_Array_Srl @@ -1111,8 +1109,7 @@ return Eval_Shift_Operator (Eval_String_Literal (Left), Right, Orig, Func); - when Iir_Predefined_Array_Inequality - | Iir_Predefined_Array_Less + when Iir_Predefined_Array_Less | Iir_Predefined_Array_Less_Equal | Iir_Predefined_Array_Greater | Iir_Predefined_Array_Greater_Equal diff -urN ghdl-0.21/vhdl/ghdldrv/ghdlmain.adb ghdl-0.22dev/vhdl/ghdldrv/ghdlmain.adb --- ghdl-0.21/vhdl/ghdldrv/ghdlmain.adb 2005-12-04 04:51:33.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdldrv/ghdlmain.adb 2006-03-16 20:51:04.000000000 +0100 @@ -1,5 +1,5 @@ -- GHDL driver - main part. --- Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold +-- Copyright (C) 2002, 2003, 2004, 2005, 2006 Tristan Gingold -- -- GHDL 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 @@ -225,7 +225,7 @@ Put_Line ("Written by Tristan Gingold."); New_Line; -- Display copyright. Assume 80 cols terminal. - Put_Line ("Copyright (C) 2003, 2004, 2005 Tristan Gingold."); + Put_Line ("Copyright (C) 2003, 2004, 2005, 2006 Tristan Gingold."); Put_Line ("GHDL is free software, covered by the " & "GNU General Public License. There is NO"); Put_Line ("warranty; not even for MERCHANTABILITY or" diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi --- ghdl-0.21/vhdl/ghdl.texi 2005-12-12 03:21:55.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdl.texi 2006-03-16 20:51:01.000000000 +0100 @@ -4,15 +4,19 @@ @settitle GHDL guide @c %**end of header + at direntry +* ghdl: (ghdl). VHDL compiler. + at end direntry + @titlepage @title GHDL guide @subtitle GHDL, a VHDL compiler - at subtitle For GHDL version 0.21 (Sokcho edition) + at subtitle For GHDL version 0.22 (Sokcho edition) @author Tristan Gingold @c The following two commands start the copyright page. @page @vskip 0pt plus 1filll -Copyright @copyright{} 2002, 2003, 2004, 2005 Tristan Gingold. +Copyright @copyright{} 2002, 2003, 2004, 2005, 2006 Tristan Gingold. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or @@ -70,11 +74,11 @@ @contents @ifnottex - at node Top + at node Top, Introduction, (dir), (dir) @top GHDL guide GHDL, a VHDL compiler. -Copyright @copyright{} 2002, 2003, 2004 Tristan Gingold. +Copyright @copyright{} 2002, 2003, 2004, 2005, 2006 Tristan Gingold. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 @@ -90,7 +94,6 @@ * Flaws and bugs report:: * Copyrights:: * Index:: - @end menu @end ifnottex @@ -902,6 +905,9 @@ messages that report such constructions. Some warnings are reported only during analysis, others during elaboration. +You could disable a warning by using the @option{--warn-no-XXX} +instead of @option{--warn-XXX}. + @table @code @item --warn-reserved @cindex @option{--warn-reserved} switch @@ -1688,6 +1694,7 @@ * Library database:: * VHDL files format:: * Top entity:: +* Using vendor libraries:: * Interfacing to other languages:: @end menu @@ -1865,7 +1872,7 @@ If the type mark is a composite type (record or array), the file is composed of a 2 lines signature, followed by a raw stream. - at node Top entity, Interfacing to other languages, VHDL files format, GHDL implementation of VHDL + at node Top entity, Using vendor libraries, VHDL files format, GHDL implementation of VHDL @comment node-name, next, previous, up @section Top entity There are some restrictions on the entity being at the apex of a design @@ -1879,8 +1886,38 @@ The ports type must be constrained. @end itemize - at node Interfacing to other languages, , Top entity, GHDL implementation of VHDL - at comment node-name, next, previous, up at section Interfacing with other languages + at node Using vendor libraries, Interfacing to other languages, Top entity, GHDL implementation of VHDL + at comment node-name, next, previous, up + at section Using vendor libraries +Many vendors libraries have been analyzed with GHDL. There are +usually no problems. Be sure to use the @option{--work=} option. +However, some problems have been encountered. + +GHDL follows the VHDL LRM (the manual which defines VHDL) more +strictly than other VHDL tools. You could try to relax the +restrictions by using the @option{--std=93c}, @option{-fexplicit} and + at option{--warn-no-vital-generic}. + +Even with these relaxations, some broken libraries may fail. + +For example, @code{unisim_VITAL.vhd} from @code{Xilinx} can't be +compiled because lines such as: + at smallexample + variable Write_A_Write_B : memory_collision_type := Write_A_Write_B; + variable Read_A_Write_B : memory_collision_type := Read_A_Write_B; + at end smallexample +(there are 6 such lines). +According to VHDL visibility rules, @samp{Write_A_Write_B} cannot be used +while it is defined. This is very logical because it prevents from silly +declarations such as + at smallexample + constant k : natural := 2 * k; + at end smallexample +This files must be modified. Fortunatly, in the example the variables +are never written. So it is enough to remove them. + + at node Interfacing to other languages, , Using vendor libraries, GHDL implementation of VHDL + at comment node-name, next, previous, up @section Interfacing to other languages @cindex interfacing @cindex other languages @@ -1931,7 +1968,7 @@ * Linking with foreign object files:: * Starting a simulation from a foreign program:: * Linking with Ada:: -* Using GRT from Ada:: +* Using GRT from Ada:: @end menu @node Restrictions on foreign declarations, Linking with foreign object files, Interfacing to other languages, Interfacing to other languages @@ -2036,7 +2073,7 @@ $ gnatmake my_prog -largs `ghdl --list-link design` @end smallexample - at node Using GRT from Ada, , Linking with Ada, Interfacing to other languages + at node Using GRT from Ada, , Linking with Ada, Interfacing to other languages @comment node-name, next, previous, up @subsection Using GRT from Ada @quotation Warning diff -urN ghdl-0.21/vhdl/grt/config/linux.c ghdl-0.22dev/vhdl/grt/config/linux.c --- ghdl-0.21/vhdl/grt/config/linux.c 2005-12-12 03:29:26.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/linux.c 2006-03-16 20:51:05.000000000 +0100 @@ -189,7 +189,12 @@ #endif /* Context for the main stack. */ -static __thread struct stack_context main_stack_context; +#ifdef USE_THREADS +#define THREAD __thread +#else +#define THREAD +#endif +static THREAD struct stack_context main_stack_context; extern void grt_set_main_stack (struct stack_context *stack); @@ -280,3 +285,28 @@ res->cur_length = stack_size; return res; } + +#include +static int run_env_en; +static jmp_buf run_env; + +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (run_env_en) + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; +} + diff -urN ghdl-0.21/vhdl/grt/config/pthread.c ghdl-0.22dev/vhdl/grt/config/pthread.c --- ghdl-0.21/vhdl/grt/config/pthread.c 2005-12-12 03:37:47.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/pthread.c 2006-03-16 20:51:05.000000000 +0100 @@ -27,7 +27,7 @@ #include #include #include - +#include //#define INFO printf #define INFO (void) @@ -41,7 +41,8 @@ void* Arg; // ARG passed to FUNC } Stack_Type_t, *Stack_Type; -Stack_Type_t main_stack_context; +static Stack_Type_t main_stack_context; +static Stack_Type_t *current; extern void grt_set_main_stack (Stack_Type_t *stack); //---------------------------------------------------------------------------- @@ -58,6 +59,8 @@ // lock the mutex, as we are currently running pthread_mutex_lock(&(main_stack_context.mutex)); + current = &main_stack_context; + grt_set_main_stack (&main_stack_context); } @@ -115,6 +118,10 @@ return newStack; } +static int need_longjmp; +static int run_env_en; +static jmp_buf run_env; + //---------------------------------------------------------------------------- void grt_stack_switch(Stack_Type To, Stack_Type From) // Resume stack TO and save the current context to the stack pointed by @@ -122,7 +129,9 @@ // => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); { INFO("grt_stack_switch\n"); INFO(" from 0x%08x to 0x%08x\n", From, To); - + + current = To; + // unlock 'To' mutex. this will make the other thread either // - starts for first time in grt_stack_loop // - resumes at lock below @@ -132,6 +141,9 @@ // as we are running, our mutex is locked and we block here // when stacks are switched, with above unlock, we may proceed pthread_mutex_lock(&(From->mutex)); + + if (From == &main_stack_context && need_longjmp != 0) + longjmp (run_env, need_longjmp); } //---------------------------------------------------------------------------- @@ -141,6 +153,35 @@ { INFO("grt_stack_delete\n"); } +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (!run_env_en) + return; + + if (current != &main_stack_context) + { + need_longjmp = val; + grt_stack_switch (&main_stack_context, current); + } + else + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; +} + + //---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c --- ghdl-0.21/vhdl/grt/config/win32.c 2005-12-12 03:39:16.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/win32.c 2006-03-16 20:51:05.000000000 +0100 @@ -1,5 +1,5 @@ -/* GRT stack implementation for Win32 - Copyright (C) 2004, 2005 Felix Bertram. +/* GRT stack implementation for Win32 using fibers. + Copyright (C) 2005 Tristan Gingold. GHDL 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 @@ -16,139 +16,120 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -//----------------------------------------------------------------------------- -// Project: GHDL - VHDL Simulator -// Description: Win32 port of stacks package -// Note: Tristan's original i386/Linux used assembly-code -// to manually switch stacks for performance reasons. -// History: 2004feb09, FB, created. -//----------------------------------------------------------------------------- #include -//#include -//#include -//#include - - -//#define INFO printf -#define INFO (void) - -// GHDL names an endless loop calling FUNC with ARG a 'stack' -// at a given time, only one stack may be 'executed' -typedef struct -{ HANDLE thread; // stack's thread - HANDLE mutex; // mutex to suspend/resume thread - void (*Func)(void*); // stack's FUNC - void* Arg; // ARG passed to FUNC -} Stack_Type_t, *Stack_Type; +#include +#include +#include -Stack_Type_t main_stack_context; -extern Stack_Type grt_stack_main_stack; +struct stack_type +{ + LPVOID fiber; // Win fiber. + void (*func)(void *); // Function + void *arg; // Function argument. +}; + +static struct stack_type main_stack_context; +static struct stack_type *current; +extern void grt_set_main_stack (struct stack_type *stack); -//------------------------------------------------------------------------------ void grt_stack_init(void) -// Initialize the stacks package. -// This may adjust stack sizes. -// Must be called after grt.options.decode. -// => procedure Stack_Init; -{ INFO("grt_stack_init\n"); - INFO(" main_stack_context=0x%08x\n", &main_stack_context); - - // create event. reset event, as we are currently running - main_stack_context.mutex = CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - grt_stack_main_stack= &main_stack_context; -} - -//------------------------------------------------------------------------------ -static unsigned long __stdcall grt_stack_loop(void* pv_myStack) -{ - Stack_Type myStack= (Stack_Type)pv_myStack; - - INFO("grt_stack_loop\n"); - - INFO(" myStack=0x%08x\n", myStack); - - // block until event becomes set again. - // this happens when this stack is enabled for the first time - WaitForSingleObject(myStack->mutex, INFINITE); - - // run stack's function in endless loop - while(1) - { INFO(" call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg); - myStack->Func(myStack->Arg); - } - - // we never get here... - return 0; -} - -//------------------------------------------------------------------------------ -Stack_Type grt_stack_create(void* Func, void* Arg) -// Create a new stack, which on first execution will call FUNC with -// an argument ARG. -// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type; -{ Stack_Type newStack; - DWORD m_IDThread; // Thread's ID (dummy) - - INFO("grt_stack_create\n"); - INFO(" call 0x%08x with 0x%08x\n", Func, Arg); - - newStack= malloc(sizeof(Stack_Type_t)); - - // init function and argument - newStack->Func= Func; - newStack->Arg= Arg; - - // create event. reset event, so that thread will blocked in grt_stack_loop - newStack->mutex= CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - INFO(" newStack=0x%08x\n", newStack); - - // create thread, which executes grt_stack_loop - newStack->thread= CreateThread(NULL, // lpsa - 0, // cbStack - grt_stack_loop, // lpStartAddr - newStack, // lpvThreadParm - 0, // fdwCreate - &m_IDThread); // lpIDThread - - return newStack; -} - -//------------------------------------------------------------------------------ -void grt_stack_switch(Stack_Type To, Stack_Type From) -// Resume stack TO and save the current context to the stack pointed by -// CUR. -// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); -{ INFO("grt_stack_switch\n"); - INFO(" from 0x%08x to 0x%08x\n", From, To); - - // set 'To' event. this will make the other thread either - // - start for first time in grt_stack_loop - // - resume at WaitForSingleObject below - SetEvent(To->mutex); - - // block until 'From' event becomes set again - // as we are running, our event is reset and we block here - // when stacks are switched, with above SetEvent, we may proceed - WaitForSingleObject(From->mutex, INFINITE); -} - -//------------------------------------------------------------------------------ -void grt_stack_delete(Stack_Type Stack) -// Delete stack STACK, which must not be currently executed. -// => procedure Stack_Delete (Stack : Stack_Type); -{ INFO("grt_stack_delete\n"); +{ + main_stack_context.fiber = ConvertThreadToFiber (NULL); + if (main_stack_context.fiber == NULL) + { + fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n", + GetLastError ()); + abort (); + } + grt_set_main_stack (&main_stack_context); + current = &main_stack_context; +} + +static VOID __stdcall +grt_stack_loop (void *v_stack) +{ + struct stack_type *stack = (struct stack_type *)v_stack; + while (1) + { + (*stack->func)(stack->arg); + } +} + +struct stack_type * +grt_stack_create (void (*func)(void *), void *arg) +{ + struct stack_type *res; + + res = malloc (sizeof (struct stack_type)); + if (res == NULL) + return NULL; + res->func = func; + res->arg = arg; + res->fiber = CreateFiber (0, &grt_stack_loop, res); + if (res->fiber == NULL) + { + free (res); + return NULL; + } + return res; +} + +static int run_env_en; +static jmp_buf run_env; +static int need_longjmp; + +void +grt_stack_switch (struct stack_type *to, struct stack_type *from) +{ + assert (current == from); + current = to; + SwitchToFiber (to->fiber); + if (from == &main_stack_context && need_longjmp) + { + /* We returned to do the longjump. */ + current = &main_stack_context; + longjmp (run_env, need_longjmp); + } +} + +void +grt_stack_delete (struct stack_type *stack) +{ + DeleteFiber (stack->fiber); + stack->fiber = NULL; +} + +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (!run_env_en) + return; + + if (current != &main_stack_context) + { + /* We are allowed to jump only in the same stack. + First switch back to the main thread. */ + need_longjmp = val; + SwitchToFiber (main_stack_context.fiber); + } + else + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; } -//---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME void __gnat_raise_storage_error(void) { @@ -161,6 +142,3 @@ } #endif -//---------------------------------------------------------------------------- -// end of file - diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c --- ghdl-0.21/vhdl/grt/ghwlib.c 2005-12-07 06:29:04.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.c 2006-03-16 20:51:05.000000000 +0100 @@ -1214,16 +1214,31 @@ return 0; } +static const char * +ghw_get_lit (union ghw_type *type, int e) +{ + if (e >= type->en.nbr || e < 0) + return "??"; + else + return type->en.lits[e]; +} + +static void +ghw_disp_lit (union ghw_type *type, int e) +{ + printf ("%s (%d)", ghw_get_lit (type, e), e); +} + void ghw_disp_value (union ghw_val *val, union ghw_type *type) { switch (ghw_get_base_type (type)->kind) { case ghdl_rtik_type_b2: - printf ("%s (%d)", type->en.lits[val->b2], val->b2); + ghw_disp_lit (type, val->b2); break; case ghdl_rtik_type_e8: - printf ("%s (%d)", type->en.lits[val->e8], val->e8); + ghw_disp_lit (type, val->e8); break; case ghdl_rtik_type_i32: printf ("%d", val->i32); @@ -1582,10 +1597,14 @@ } void -ghw_disp_range (union ghw_range *rng) +ghw_disp_range (union ghw_type *type, union ghw_range *rng) { switch (rng->kind) { + case ghdl_rtik_type_e8: + printf ("%s %s %s", ghw_get_lit (type, rng->e8.left), + ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right)); + break; case ghdl_rtik_type_i32: case ghdl_rtik_type_p32: printf ("%d %s %d", @@ -1657,7 +1676,7 @@ printf ("subtype %s is ", s->name); ghw_disp_typename (h, s->base); printf (" range "); - ghw_disp_range (s->rng); + ghw_disp_range (s->base, s->rng); printf (";\n"); } break; @@ -1692,7 +1711,7 @@ { if (i != 0) printf (", "); - ghw_disp_range (a->rngs[i]); + ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]); } printf (");\n"); } diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h --- ghdl-0.21/vhdl/grt/ghwlib.h 2005-12-07 06:27:09.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.h 2006-03-16 20:51:05.000000000 +0100 @@ -390,7 +390,8 @@ const char *ghw_get_dir (int is_downto); -void ghw_disp_range (union ghw_range *rng); +/* Note: TYPE must be a base type (used only to display literals). */ +void ghw_disp_range (union ghw_type *type, union ghw_range *rng); void ghw_disp_type (struct ghw_handler *h, union ghw_type *t); diff -urN ghdl-0.21/vhdl/grt/grt-cbinding.c ghdl-0.22dev/vhdl/grt/grt-cbinding.c --- ghdl-0.21/vhdl/grt/grt-cbinding.c 2005-12-11 15:03:18.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-cbinding.c 2006-03-16 20:51:05.000000000 +0100 @@ -18,7 +18,6 @@ */ #include #include -#include FILE * __ghdl_get_stdout (void) @@ -44,29 +43,6 @@ fprintf (stream, "%g", val); } -static int run_env_en; -static jmp_buf run_env; - -void -__ghdl_maybe_return_via_longjump (int val) -{ - if (run_env_en) - longjmp (run_env, val); -} - -int -__ghdl_run_through_longjump (int (*func)(void)) -{ - int res; - - run_env_en = 1; - res = setjmp (run_env); - if (res == 0) - res = (*func)(); - run_env_en = 0; - return res; -} - #if 1 void __gnat_last_chance_handler (void) diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb --- ghdl-0.21/vhdl/grt/grt-signals.adb 2005-11-18 03:13:36.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-signals.adb 2006-03-16 20:51:05.000000000 +0100 @@ -1095,15 +1095,6 @@ when others => Internal_Error ("ghdl_create_signal_attribute"); end case; --- Sig_Instance_Name := new Ghdl_Instance_Name_Type' --- (Kind => Ghdl_Name_Signal, --- Name => null, --- Parent => null, --- Brother => null, --- Sig_Mode => Mode, --- Sig_Kind => Kind_Signal_No, --- Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last), --- Sig_Type_Desc => Sig_Type); -- Note: bit and boolean are both mode_b2. Res := Create_Signal (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True), diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb --- ghdl-0.21/vhdl/grt/grt-waves.adb 2005-12-07 05:50:07.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-waves.adb 2006-03-16 20:51:05.000000000 +0100 @@ -785,6 +785,15 @@ Nbr_Scope_Signals : Natural := 0; Nbr_Dumped_Signals : Natural := 0; + -- This is only valid during write_hierarchy. + function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural + is + function To_Integer_Address is new Ada.Unchecked_Conversion + (Ghdl_Signal_Ptr, Integer_Address); + begin + return Natural (To_Integer_Address (Sig.Alink)); + end Get_Signal_Number; + procedure Write_Signal_Number (Val_Addr : Address; Val_Name : Vstring; Val_Type : Ghdl_Rti_Access) @@ -792,20 +801,28 @@ pragma Unreferenced (Val_Name); pragma Unreferenced (Val_Type); - function To_Integer_Address is new Ada.Unchecked_Conversion - (Ghdl_Signal_Ptr, Integer_Address); + Num : Natural; + function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion (Source => Integer_Address, Target => Ghdl_Signal_Ptr); Sig : Ghdl_Signal_Ptr; begin + -- Convert to signal. Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all); - if not Sig.Flags.Is_Dumped then - Sig.Flags.Is_Dumped := True; + + -- Get signal number. + Num := Get_Signal_Number (Sig); + + -- If the signal number is 0, then assign a valid signal number. + if Num = 0 then Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1; - Sig.Flink := To_Ghdl_Signal_Ptr + Sig.Alink := To_Ghdl_Signal_Ptr (Integer_Address (Nbr_Dumped_Signals)); + Num := Nbr_Dumped_Signals; end if; - Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink))); + + -- Do the real job: write the signal number. + Wave_Put_ULEB128 (Ghdl_E32 (Num)); end Write_Signal_Number; procedure Foreach_Scalar_Signal_Number is new @@ -1370,13 +1387,18 @@ Table_Initial => 32, Table_Increment => 100); + function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is + begin + return Dump_Table.Table (N); + end Get_Dump_Entry; + procedure Write_Hierarchy (Root : VhpiHandleT) is N : Natural; begin - -- Check Flink is 0. + -- Check Alink is 0. for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flink /= null then + if Sig_Table.Table (I).Alink /= null then Internal_Error ("wave.write_hierarchy"); end if; end loop; @@ -1393,15 +1415,20 @@ Wave_Put_Byte (0); Dump_Table.Set_Last (Nbr_Dumped_Signals); + for I in Dump_Table.First .. Dump_Table.Last loop + Dump_Table.Table (I) := null; + end loop; -- Save and clear. - N := 0; for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flags.Is_Dumped then - N := N + 1; + N := Get_Signal_Number (Sig_Table.Table (I)); + if N /= 0 then + if Dump_Table.Table (N) /= null then + Internal_Error ("wave.write_hierarchy(2)"); + end if; Dump_Table.Table (N) := Sig_Table.Table (I); + Sig_Table.Table (I).Alink := null; end if; - Sig_Table.Table (I).Flink := null; end loop; end Write_Hierarchy; diff -urN ghdl-0.21/vhdl/Makefile.in ghdl-0.22dev/vhdl/Makefile.in --- ghdl-0.21/vhdl/Makefile.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Makefile.in 2006-03-22 11:15:27.000000000 +0100 @@ -480,6 +480,7 @@ #GRT_USE_PTHREADS=y ifeq ($(GRT_USE_PTHREADS),y) + GRT_CFLAGS+=-DUSE_THREADS GRT_ADD_OBJS+=grt-cthreads.o GRT_EXTRA_LIB+=-lpthread endif @@ -527,7 +528,7 @@ $(CC) -c $(GRT_FLAGS) -o $@ $< linux.o: $(GRTSRCDIR)/config/linux.c - $(CC) -c $(GRT_FLAGS) -o $@ $< + $(CC) -c $(GRT_FLAGS) $(GRT_CFLAGS) -o $@ $< win32.o: $(GRTSRCDIR)/config/win32.c $(CC) -c $(GRT_FLAGS) -o $@ $< diff -urN ghdl-0.21/vhdl/Make-lang.in ghdl-0.22dev/vhdl/Make-lang.in --- ghdl-0.21/vhdl/Make-lang.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Make-lang.in 2006-03-22 11:15:27.000000000 +0100 @@ -96,22 +96,21 @@ AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \ -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \ -I$(AGCC_GCCSRC_DIR)/libcpp/include -AGCC_CFLAGS=-g -DIN_GCC $(AGCC_INC_FLAGS) +AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) AGCC_LOCAL_OBJS=ortho-lang.o gcc-version.o AGCC_DEPS := $(AGCC_LOCAL_OBJS) AGCC_OBJS := $(AGCC_LOCAL_OBJS) \ $(AGCC_GCCOBJ_DIR)/gcc/toplev.o \ - $(AGCC_GCCOBJ_DIR)/gcc/c-convert.o \ $(AGCC_GCCOBJ_DIR)/gcc/libbackend.a \ $(AGCC_GCCOBJ_DIR)/libcpp/libcpp.a \ $(AGCC_GCCOBJ_DIR)/libiberty/libiberty.a -gcc-version.c: $(AGCC_GCCSRC_DIR)/gcc/version.c +gcc-version.c: $(AGCC_GCCSRC_DIR)/gcc/BASE-VER -$(RM) -f $@ echo '#include "version.h"' > $@ - sed -n -e '/version_string/ s/";/ (ghdl)";/p' < $< >> $@ + echo "const char version_string[] = \""`cat $<` "(ghdl)\";" >> $@ echo 'const char bug_report_url[] = "";' >> $@ gcc-version.o: gcc-version.c diff -urN ghdl-0.21/vhdl/ortho-lang.c ghdl-0.22dev/vhdl/ortho-lang.c --- ghdl-0.21/vhdl/ortho-lang.c 2005-12-10 12:04:40.000000000 +0100 +++ ghdl-0.22dev/vhdl/ortho-lang.c 2006-03-22 11:15:00.000000000 +0100 @@ -18,6 +18,10 @@ #include "tree-gimple.h" #include "function.h" #include "cgraph.h" +#include "target.h" +#include "convert.h" +#include "tree-pass.h" +#include "tree-dump.h" const int tree_identifier_size = sizeof (struct tree_identifier); @@ -431,6 +435,7 @@ case COMPONENT_REF: case ARRAY_REF: + case ARRAY_RANGE_REF: n = TREE_OPERAND (n, 0); break; @@ -494,6 +499,89 @@ } } +/* The following function has been copied and modified from c-convert.c. */ + +/* Change of width--truncation and extension of integers or reals-- + is represented with NOP_EXPR. Proper functioning of many things + assumes that no other conversions can be NOP_EXPRs. + + Conversion between integer and pointer is represented with CONVERT_EXPR. + Converting integer to real uses FLOAT_EXPR + and real to integer uses FIX_TRUNC_EXPR. + + Here is a list of all the functions that assume that widening and + narrowing is always done with a NOP_EXPR: + In convert.c, convert_to_integer. + In c-typeck.c, build_binary_op (boolean ops), and + c_common_truthvalue_conversion. + In expr.c: expand_expr, for operands of a MULT_EXPR. + In fold-const.c: fold. + In tree.c: get_narrower and get_unwidened. */ + +/* Subroutines of `convert'. */ + + + +/* Create an expression whose value is that of EXPR, + converted to type TYPE. The TREE_TYPE of the value + is always TYPE. This function implements all reasonable + conversions; callers should filter out those that are + not permitted by the language being compiled. */ + +tree +convert (tree type, tree expr) +{ + tree e = expr; + enum tree_code code = TREE_CODE (type); + const char *invalid_conv_diag; + + if (type == error_mark_node + || expr == error_mark_node + || TREE_TYPE (expr) == error_mark_node) + return error_mark_node; + + if ((invalid_conv_diag + = targetm.invalid_conversion (TREE_TYPE (expr), type))) + { + error (invalid_conv_diag); + return error_mark_node; + } + + if (type == TREE_TYPE (expr)) + return expr; + + if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (TREE_TYPE (expr))) + return fold_build1 (NOP_EXPR, type, expr); + if (TREE_CODE (TREE_TYPE (expr)) == ERROR_MARK) + return error_mark_node; + if (TREE_CODE (TREE_TYPE (expr)) == VOID_TYPE || code == VOID_TYPE) + { + abort (); + return error_mark_node; + } + if (code == INTEGER_TYPE || code == ENUMERAL_TYPE) + return fold (convert_to_integer (type, e)); + if (code == BOOLEAN_TYPE) + { + tree t = ortho_truthvalue_conversion (expr); + if (TREE_CODE (t) == ERROR_MARK) + return t; + + /* If it returns a NOP_EXPR, we must fold it here to avoid + infinite recursion between fold () and convert (). */ + if (TREE_CODE (t) == NOP_EXPR) + return fold_build1 (NOP_EXPR, type, TREE_OPERAND (t, 0)); + else + return fold_build1 (NOP_EXPR, type, t); + } + if (code == POINTER_TYPE || code == REFERENCE_TYPE) + return fold (convert_to_pointer (type, e)); + if (code == REAL_TYPE) + return fold (convert_to_real (type, e)); + + abort (); +} + /* Return a definition for a builtin function named NAME and whose data type is TYPE. TYPE should be a function type with argument types. FUNCTION_CODE tells later passes how to compile calls to this function. @@ -603,8 +691,6 @@ #define LANG_HOOKS_POST_OPTIONS ortho_post_options #undef LANG_HOOKS_HONOR_READONLY #define LANG_HOOKS_HONOR_READONLY true -#undef LANG_HOOKS_TRUTHVALUE_CONVERSION -#define LANG_HOOKS_TRUTHVALUE_CONVERSION ortho_truthvalue_conversion #undef LANG_HOOKS_MARK_ADDRESSABLE #define LANG_HOOKS_MARK_ADDRESSABLE ortho_mark_addressable #undef LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION @@ -1234,7 +1320,7 @@ void finish_record_aggr (struct o_record_aggr_list *list, tree *res) { - *res = build_constructor (list->atype, list->chain.first); + *res = build_constructor_from_list (list->atype, list->chain.first); } @@ -1260,18 +1346,16 @@ void finish_array_aggr (struct o_array_aggr_list *list, tree *res) { - *res = build_constructor (list->atype, list->chain.first); + *res = build_constructor_from_list (list->atype, list->chain.first); } tree new_union_aggr (tree atype, tree field, tree value) { - tree el; tree res; - el = build_tree_list (field, value); - res = build_constructor (atype, el); + res = build_constructor_single (atype, field, value); TREE_CONSTANT (res) = 1; return res; } @@ -1298,6 +1382,7 @@ abort (); ortho_mark_addressable (arr); + return build4 (ARRAY_RANGE_REF, res_type, arr, index, NULL_TREE, NULL_TREE); el_type = TREE_TYPE (TREE_TYPE (arr)); el_ptr_type = build_pointer_type (el_type); @@ -1371,78 +1456,117 @@ return fold (build1 (NOP_EXPR, rtype, size)); } -#if 0 -static tree -ortho_build_addr (tree operand, tree atype) -{ - tree base = exp; +/* Convert the array expression EXP to a pointer. */ +static tree array_to_pointer_conversion (tree exp); - while (handled_component_p (base)) - base = TREE_OPERAND (base, 0); - - if (DECL_P (base)) - TREE_ADDRESSABLE (base) = 1; - - return build1 (ADDR_EXPR, atype, exp); -} -#endif - -tree -new_unchecked_address (tree lvalue, tree atype) +static tree +ortho_build_addr (tree lvalue, tree atype) { tree res; if (TREE_CODE (lvalue) == INDIRECT_REF) { + /* ADDR_REF(INDIRECT_REF(x)) -> x. */ res = TREE_OPERAND (lvalue, 0); } else { - ortho_mark_addressable (lvalue); - - if (TREE_TYPE (lvalue) != TREE_TYPE (atype)) + /* &base[off] -> base+off. */ + if (TREE_CODE (lvalue) == ARRAY_REF + || TREE_CODE (lvalue) == ARRAY_RANGE_REF) { - tree ptr; - ptr = build_pointer_type (TREE_TYPE (lvalue)); - res = build1 (ADDR_EXPR, ptr, lvalue); + tree base = TREE_OPERAND (lvalue, 0); + tree idx = TREE_OPERAND (lvalue, 1); + tree offset; + tree base_type; + + ortho_mark_addressable (base); + + offset = fold_build2 (MULT_EXPR, TREE_TYPE (idx), idx, + array_ref_element_size (lvalue)); + + base = array_to_pointer_conversion (base); + base_type = TREE_TYPE (base); + + res = build2 (PLUS_EXPR, base_type, + base, convert (base_type, offset)); } else - res = build1 (ADDR_EXPR, atype, lvalue); + { + ortho_mark_addressable (lvalue); + + if (TREE_TYPE (lvalue) != TREE_TYPE (atype)) + { + tree ptr; + ptr = build_pointer_type (TREE_TYPE (lvalue)); + res = build1 (ADDR_EXPR, ptr, lvalue); + } + else + res = build1 (ADDR_EXPR, atype, lvalue); + } + res = fold (res); } if (TREE_TYPE (res) != atype) - res = fold (build1 (NOP_EXPR, atype, res)); + res = fold_build1 (NOP_EXPR, atype, res); return res; +} -#if 0 - /* res = build_addr (lvalue, atype); */ - if (TREE_TYPE (res) != atype) +/* Convert the array expression EXP to a pointer. */ +static tree +array_to_pointer_conversion (tree exp) +{ + tree type = TREE_TYPE (exp); + tree adr; + tree restype = TREE_TYPE (type); + tree ptrtype; + + gcc_assert (TREE_CODE (type) == ARRAY_TYPE); + + /* Create a pointer to elements. */ + ptrtype = build_pointer_type (restype); + + switch (TREE_CODE (exp)) { - if (TREE_CODE (TREE_TYPE (res)) != POINTER_TYPE) - abort (); - res = build1 (NOP_EXPR, atype, res); + case INDIRECT_REF: + return convert (ptrtype, TREE_OPERAND (exp, 0)); + + case VAR_DECL: + /* Convert array to pointer to elements. */ + adr = build1 (ADDR_EXPR, ptrtype, exp); + ortho_mark_addressable (exp); + TREE_SIDE_EFFECTS (adr) = 0; /* Default would be, same as EXP. */ + return adr; + + default: + /* Get address. */ + return ortho_build_addr (exp, ptrtype); } - return res; -#endif +} + +tree +new_unchecked_address (tree lvalue, tree atype) +{ + return ortho_build_addr (lvalue, atype); } tree new_address (tree lvalue, tree atype) { - return new_unchecked_address (lvalue, atype); + return ortho_build_addr (lvalue, atype); } tree new_global_address (tree lvalue, tree atype) { - return new_unchecked_address (lvalue, atype); + return ortho_build_addr (lvalue, atype); } tree new_global_unchecked_address (tree lvalue, tree atype) { - return new_unchecked_address (lvalue, atype); + return ortho_build_addr (lvalue, atype); } /* Return a pointer to function FUNC. */ @@ -1748,6 +1872,10 @@ gimplify_function_tree (func); + /* Dump the genericized tree IR. + Enabled by -fdump-tree-gimple. */ + dump_function (TDI_generic, func); + parent = DECL_CONTEXT (func); if (parent != NULL) diff -urN ghdl-0.21/vhdl/parse.adb ghdl-0.22dev/vhdl/parse.adb --- ghdl-0.21/vhdl/parse.adb 2005-12-17 07:18:00.000000000 +0100 +++ ghdl-0.22dev/vhdl/parse.adb 2006-03-16 20:51:10.000000000 +0100 @@ -3540,7 +3540,7 @@ Set_Location (Res); Set_Expression (Res, Parse_Expression); - Expect (Tok_Select, "after expression"); + Expect (Tok_Select, "'select' expected after expression"); Scan.Scan; if Current_Token = Tok_Left_Paren then Target := Parse_Aggregate; @@ -3556,13 +3556,13 @@ Build_Init (Last); loop Wf_Chain := Parse_Waveform; - Expect (Tok_When, "after waveform"); + Expect (Tok_When, "'when' expected after waveform"); Scan.Scan; Assoc := Parse_Choices (Null_Iir); Set_Associated (Assoc, Wf_Chain); Append_Subchain (Last, Res, Assoc); exit when Current_Token = Tok_Semi_Colon; - Expect (Tok_Comma, "after choice"); + Expect (Tok_Comma, "',' (comma) expected after choice"); Scan.Scan; end loop; return Res; diff -urN ghdl-0.21/vhdl/sem_assocs.adb ghdl-0.22dev/vhdl/sem_assocs.adb --- ghdl-0.21/vhdl/sem_assocs.adb 2005-10-08 14:45:00.000000000 +0200 +++ ghdl-0.22dev/vhdl/sem_assocs.adb 2006-03-16 20:51:10.000000000 +0100 @@ -551,7 +551,7 @@ exit when Index_Type = Null_Iir; Chain := Get_Individual_Association_Chain (Assoc); Sem_Choices_Range - (Chain, Index_Type, True, Get_Location (Assoc), Low, High); + (Chain, Index_Type, False, Get_Location (Assoc), Low, High); Set_Individual_Association_Chain (Assoc, Chain); end loop; end Finish_Individual_Assoc_Array_Subtype; diff -urN ghdl-0.21/vhdl/sem_expr.adb ghdl-0.22dev/vhdl/sem_expr.adb --- ghdl-0.21/vhdl/sem_expr.adb 2005-12-17 07:13:37.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_expr.adb 2006-03-16 20:51:10.000000000 +0100 @@ -2278,6 +2278,7 @@ Lb := Low; Hb := High; end if; + -- Checks all values between POS and POS_MAX are handled. Pos := Eval_Pos (Lb); Pos_Max := Eval_Pos (Hb); if Pos > Pos_Max then diff -urN ghdl-0.21/vhdl/sem_names.adb ghdl-0.22dev/vhdl/sem_names.adb --- ghdl-0.21/vhdl/sem_names.adb 2005-12-11 14:50:31.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_names.adb 2006-03-16 20:51:10.000000000 +0100 @@ -1974,7 +1974,8 @@ Error_Msg_Sem ("function name is a procedure", Name); when Iir_Kind_Process_Statement - | Iir_Kind_Component_Declaration => + | Iir_Kind_Component_Declaration + | Iir_Kind_Type_Conversion => Error_Msg_Sem (Disp_Node (Prefix) & " cannot be indexed or sliced", Name); Res := Null_Iir; diff -urN ghdl-0.21/vhdl/translation.adb ghdl-0.22dev/vhdl/translation.adb --- ghdl-0.21/vhdl/translation.adb 2005-12-10 12:11:41.000000000 +0100 +++ ghdl-0.22dev/vhdl/translation.adb 2006-03-16 20:51:05.000000000 +0100 @@ -1,5 +1,5 @@ -- Iir to ortho translator. --- Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold +-- Copyright (C) 2002, 2003, 2004, 2005, 2006 Tristan Gingold -- -- GHDL 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 @@ -1797,15 +1797,13 @@ -- Check bounds length of L match bounds length of R. -- If L_TYPE (resp. R_TYPE) is not a thin array, then L_NODE - -- (resp. R_NODE) are not used (and may be o_lnode_null). + -- (resp. R_NODE) are not used (and may be Mnode_Null). -- If L_TYPE (resp. T_TYPE) is a fat array, then L_NODE (resp. R_NODE) - -- must be a variable pointing to the array. + -- must designate the array. procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir); -- Create a subtype range to be stored into the location pointed by @@ -8412,10 +8410,19 @@ return True; end Need_Range_Check; - procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) + procedure Check_Range_Low (Value : O_Dnode; Atype : Iir) is If_Blk : O_If_Block; begin + Open_Temp; + Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); + Chap6.Gen_Bound_Error (Null_Iir); + Finish_If_Stmt (If_Blk); + Close_Temp; + end Check_Range_Low; + + procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) is + begin if not Need_Range_Check (Expr, Atype) then return; end if; @@ -8428,20 +8435,14 @@ Chap6.Gen_Bound_Error (Expr); end if; else - Open_Temp; - Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); - Chap6.Gen_Bound_Error (Null_Iir); - Finish_If_Stmt (If_Blk); - Close_Temp; + Check_Range_Low (Value, Atype); end if; end Check_Range; procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir) is L_Tinfo, R_Tinfo : Type_Info_Acc; @@ -8491,10 +8492,10 @@ exit when Index = Null_Iir; Sub_Cond := New_Compare_Op (ON_Neq, - Chap6.Get_Array_Ptr_Bound_Length (L_Node, L_Type, - I + 1, L_Mode), - Chap6.Get_Array_Ptr_Bound_Length (R_Node, R_Type, - I + 1, R_Mode), + M2E (Range_To_Length + (Get_Array_Range (L_Node, L_Type, I + 1))), + M2E (Range_To_Length + (Get_Array_Range (R_Node, R_Type, I + 1))), Ghdl_Bool_Type); if I = 0 then Cond := Sub_Cond; @@ -10081,8 +10082,8 @@ New_Assign_Stmt (Get_Var (Alias_Info.Alias_Var), New_Value (M2Lp (Chap3.Get_Array_Base (Name_Node)))); - Chap3.Check_Array_Match (Decl_Type, O_Lnode_Null, Kind, - Name_Type, M2Lp (Name_Node), Kind, + Chap3.Check_Array_Match (Decl_Type, T2M (Decl_Type, Kind), + Name_Type, Name_Node, Decl); Close_Temp; when Type_Mode_Scalar => @@ -11691,6 +11692,16 @@ end; end if; + if Get_Kind (Formal_Type) in Iir_Kinds_Array_Type_Definition + then + -- Check length matches. + Stabilize (Formal_Node); + Stabilize (Actual_Node); + Chap3.Check_Array_Match (Formal_Type, Formal_Node, + Actual_Type, Actual_Node, + Assoc); + end if; + Data := (Actual_Node => Actual_Node, Actual_Type => Actual_Type, Mode => Mode, @@ -14420,8 +14431,8 @@ E := Create_Temp_Init (T_Info.Ortho_Ptr_Type (Mode_Value), Val); Chap3.Check_Array_Match - (Target_Type, M2Lp (T), Mode_Value, - Get_Type (Expr), New_Obj (E), Mode_Value, + (Target_Type, T, + Get_Type (Expr), Dp2M (E, T_Info, Mode_Value), Null_Iir); Chap3.Translate_Object_Copy (T, New_Obj_Value (E), Target_Type); @@ -15169,9 +15180,10 @@ begin E := Create_Temp_Init (Expr_Info.Ortho_Ptr_Type (Mode_Value), Expr); - Chap3.Check_Array_Match (Res_Type, O_Lnode_Null, Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, T2M (Res_Type, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); return New_Convert_Ov (New_Value (Chap3.Get_Array_Ptr_Base_Ptr (New_Obj (E), Expr_Type, Mode_Value)), @@ -15199,9 +15211,10 @@ Chap3.Get_Array_Bounds_Ptr (O_Lnode_Null, Expr_Type, Mode_Value)); -- Check array match. - Chap3.Check_Array_Match (Res_Type, New_Obj (Res), Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, Dv2M (Res, Res_Info, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); Close_Temp; return New_Address (New_Obj (Res), Res_Info.Ortho_Ptr_Type (Mode_Value)); @@ -22283,19 +22296,58 @@ function Translate_Val_Attribute (Attr : Iir) return O_Enode is - T : O_Dnode; - Prefix : Iir; - Ttype : O_Tnode; + Val : O_Enode; + Attr_Type : Iir; + Res_Var : O_Dnode; + Res_Type : O_Tnode; begin - Prefix := Get_Type (Attr); - Ttype := Get_Ortho_Type (Prefix, Mode_Value); - T := Create_Temp (Ttype); - New_Assign_Stmt - (New_Obj (T), - New_Convert_Ov (Chap7.Translate_Expression (Get_Parameter (Attr)), - Ttype)); - Chap3.Check_Range (T, Attr, Get_Type (Get_Prefix (Attr))); - return New_Obj_Value (T); + Attr_Type := Get_Type (Attr); + Res_Type := Get_Ortho_Type (Attr_Type, Mode_Value); + Res_Var := Create_Temp (Res_Type); + Val := Chap7.Translate_Expression (Get_Parameter (Attr)); + + case Get_Kind (Attr_Type) is + when Iir_Kind_Enumeration_Type_Definition + | Iir_Kind_Enumeration_Subtype_Definition => + -- For enumeration, always check the value is in the enum + -- range. + declare + Val_Type : O_Tnode; + Val_Var : O_Dnode; + If_Blk : O_If_Block; + begin + Val_Type := Get_Ortho_Type (Get_Type (Get_Parameter (Attr)), + Mode_Value); + Val_Var := Create_Temp_Init (Val_Type, Val); + Start_If_Stmt + (If_Blk, + New_Dyadic_Op + (ON_Or, + New_Compare_Op (ON_Lt, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, 0)), + Ghdl_Bool_Type), + New_Compare_Op (ON_Ge, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, + Integer_64 + (Get_Nbr_Elements + (Get_Enumeration_Literal_List + (Attr_Type))))), + Ghdl_Bool_Type))); + Chap6.Gen_Bound_Error (Attr); + Finish_If_Stmt (If_Blk); + Val := New_Obj_Value (Val_Var); + end; + when others => + null; + end case; + + New_Assign_Stmt (New_Obj (Res_Var), New_Convert_Ov (Val, Res_Type)); + Chap3.Check_Range (Res_Var, Attr, Get_Type (Get_Prefix (Attr))); + return New_Obj_Value (Res_Var); end Translate_Val_Attribute; function Translate_Pos_Attribute (Attr : Iir; Res_Type : Iir) diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads --- ghdl-0.21/vhdl/version.ads 2005-12-18 14:07:38.000000000 +0100 +++ ghdl-0.22dev/vhdl/version.ads 2006-03-16 20:51:10.000000000 +0100 @@ -1,4 +1,4 @@ package Version is Ghdl_Version : constant String := - "GHDL 0.21 (20051218) [Sokcho edition]"; + "GHDL 0.22dev (20051220) [Sokcho edition]"; end Version; Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ghdl.spec 19 Mar 2006 15:13:36 -0000 1.13 +++ ghdl.spec 22 Mar 2006 10:56:48 -0000 1.14 @@ -1,11 +1,12 @@ %define gccver 4.1.0 %define ghdlver 0.21 +%define ghdlsvnver 50 %define DATE 20060304 Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.49svn.1%{?dist} +Release: 0.%{ghdlsvnver}svn.1%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -28,7 +29,7 @@ Patch11: gcc41-mni.patch Patch12: gcc41-cfaval.patch Patch13: gcc41-rh184446.patch -Patch100: ghdl-svn49.patch +Patch100: ghdl-svn%{ghdlsvnver}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -84,6 +85,8 @@ Requires: glibc >= 2.3.90-35 %endif +Requires: ghdl-grt = %{version}-%{release} + # Make sure we don't use clashing namespaces %define _vendor fedora_ghdl @@ -110,6 +113,15 @@ functions or procedures written in a foreign language, such as C, C++, or Ada95. +%package grt +Summary: GHDL runtime libraries +Group: System Environment/Libraries + +%description grt +This package contains the runtime libraries needed to link ghdl-compiled +object files into simulator executables. grt contains the simulator kernel +that tracks signal updates and schedules processes. + %prep %setup -q -n gcc-%{gccver}-%{DATE} -T -b 0 -a 100 %patch1 -p0 -b .ice-hack~ @@ -297,14 +309,22 @@ %doc ghdl-%{ghdlver}/COPYING %{_bindir}/ghdl %{_infodir}/ghdl.info.gz -# Need to own directory %{_libdir}/gcc even though we only want the -# %{gcc_target_platform}/%{gccver} subdirectory -%{_libdir}/gcc/ # Need to own directory %{_libexecdir}/gcc even though we only want the # %{gcc_target_platform}/%{gccver} subdirectory %{_libexecdir}/gcc/ +%files grt +# Need to own directory %{_libdir}/gcc even though we only want the +# %{gcc_target_platform}/%{gccver} subdirectory +%{_libdir}/gcc/ + + %changelog +* Wed Mar 22 2006 Thomas Sailer - 0.22-0.50svn.0 +- update to svn50, to fix x86_64 breakage +- move grt (ghdl runtime library) into separate package, to allow parallel + install of i386 and x86_64 grt on x86_64 machines, thus making -m32 work + * Sun Mar 19 2006 Thomas Sailer - 0.22-0.49svn.1 - use core gcc as base compiler sources --- ghdl-svn38.patch DELETED --- --- ghdl-svn39.patch DELETED --- --- ghdl-svn40.patch DELETED --- --- ghdl-svn49.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 12:27:26 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Wed, 22 Mar 2006 07:27:26 -0500 Subject: rpms/nail/devel nail.spec,1.11,1.12 Message-ID: <200603221227.k2MCRw4A014391@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14374 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/devel/nail.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nail.spec 21 Mar 2006 16:06:59 -0000 1.11 +++ nail.spec 22 Mar 2006 12:27:25 -0000 1.12 @@ -4,7 +4,7 @@ Summary: Enhanced implementation of the mailx command Name: nail Version: 12.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net @@ -41,22 +41,21 @@ %if %{rename} # Use old name "nail" to avoid conflicts with the Core mailx package -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g +sed -i '/Heirloom/ n + s/mailx/nail/g ' %{name}.rc +sed -i '/Heirloom/ n + s/mailx/nail/g + s/Mailx/Nail/g +' mailx.1 + +sed -i '/Heirloom/ n + s/mailx/nail/g + s/MAILX /NAIL /g + s/Mailx/Nail/g +' mailx.1.html mv mailx.1.html %{name}.html -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g -s/MAILX/NAIL/g -s/Mailx/Nail/g -' %{name}.html %endif @@ -107,6 +106,10 @@ %changelog +* Wed Mar 22 2006 Dmitry Butskoy - 12.0-2 +- complete "mailx to nail" changes in the manual and config files +- drop _smp_mflags: it caused make to work incorrectly. + * Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 - upgrade to 12.0 - change new upstream name "mailx" to the old name "nail" to avoid From fedora-extras-commits at redhat.com Wed Mar 22 12:40:07 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Wed, 22 Mar 2006 07:40:07 -0500 Subject: rpms/nail/FC-5 nail.spec,1.11,1.12 Message-ID: <200603221240.k2MCee2c014477@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14458 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-5/nail.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nail.spec 21 Mar 2006 15:44:24 -0000 1.11 +++ nail.spec 22 Mar 2006 12:40:07 -0000 1.12 @@ -4,7 +4,7 @@ Summary: Enhanced implementation of the mailx command Name: nail Version: 12.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net @@ -41,22 +41,21 @@ %if %{rename} # Use old name "nail" to avoid conflicts with the Core mailx package -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g +sed -i '/Heirloom/ n + s/mailx/nail/g ' %{name}.rc +sed -i '/Heirloom/ n + s/mailx/nail/g + s/Mailx/Nail/g +' mailx.1 + +sed -i '/Heirloom/ n + s/mailx/nail/g + s/MAILX /NAIL /g + s/Mailx/Nail/g +' mailx.1.html mv mailx.1.html %{name}.html -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g -s/MAILX/NAIL/g -s/Mailx/Nail/g -' %{name}.html %endif @@ -107,6 +106,10 @@ %changelog +* Wed Mar 22 2006 Dmitry Butskoy - 12.0-2 +- complete "mailx to nail" changes in the manual and config files +- drop _smp_mflags: it caused make to work incorrectly. + * Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 - upgrade to 12.0 - change new upstream name "mailx" to the old name "nail" to avoid From fedora-extras-commits at redhat.com Wed Mar 22 12:54:13 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Wed, 22 Mar 2006 07:54:13 -0500 Subject: rpms/nail/FC-4 nail.spec,1.6,1.7 Message-ID: <200603221254.k2MCsjiK014899@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14882 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-4/nail.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nail.spec 21 Mar 2006 16:08:33 -0000 1.6 +++ nail.spec 22 Mar 2006 12:54:12 -0000 1.7 @@ -4,7 +4,7 @@ Summary: Enhanced implementation of the mailx command Name: nail Version: 12.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net @@ -41,22 +41,21 @@ %if %{rename} # Use old name "nail" to avoid conflicts with the Core mailx package -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g +sed -i '/Heirloom/ n + s/mailx/nail/g ' %{name}.rc +sed -i '/Heirloom/ n + s/mailx/nail/g + s/Mailx/Nail/g +' mailx.1 + +sed -i '/Heirloom/ n + s/mailx/nail/g + s/MAILX /NAIL /g + s/Mailx/Nail/g +' mailx.1.html mv mailx.1.html %{name}.html -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g -s/MAILX/NAIL/g -s/Mailx/Nail/g -' %{name}.html %endif @@ -107,6 +106,10 @@ %changelog +* Wed Mar 22 2006 Dmitry Butskoy - 12.0-2 +- complete "mailx to nail" changes in the manual and config files +- drop _smp_mflags: it caused make to work incorrectly. + * Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 - upgrade to 12.0 - change new upstream name "mailx" to the old name "nail" to avoid From fedora-extras-commits at redhat.com Wed Mar 22 12:59:29 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Wed, 22 Mar 2006 07:59:29 -0500 Subject: rpms/nail/FC-3 nail.spec,1.6,1.7 Message-ID: <200603221300.k2MD01Oi014992@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14975 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-3/nail.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nail.spec 21 Mar 2006 16:09:45 -0000 1.6 +++ nail.spec 22 Mar 2006 12:59:29 -0000 1.7 @@ -4,7 +4,7 @@ Summary: Enhanced implementation of the mailx command Name: nail Version: 12.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net @@ -41,22 +41,21 @@ %if %{rename} # Use old name "nail" to avoid conflicts with the Core mailx package -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g +sed -i '/Heirloom/ n + s/mailx/nail/g ' %{name}.rc +sed -i '/Heirloom/ n + s/mailx/nail/g + s/Mailx/Nail/g +' mailx.1 + +sed -i '/Heirloom/ n + s/mailx/nail/g + s/MAILX /NAIL /g + s/Mailx/Nail/g +' mailx.1.html mv mailx.1.html %{name}.html -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g -s/MAILX/NAIL/g -s/Mailx/Nail/g -' %{name}.html %endif @@ -107,6 +106,10 @@ %changelog +* Wed Mar 22 2006 Dmitry Butskoy - 12.0-2 +- complete "mailx to nail" changes in the manual and config files +- drop _smp_mflags: it caused make to work incorrectly. + * Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 - upgrade to 12.0 - change new upstream name "mailx" to the old name "nail" to avoid From fedora-extras-commits at redhat.com Wed Mar 22 13:26:10 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Wed, 22 Mar 2006 06:26:10 -0700 Subject: rpms/liboil/FC-5 README.CVS, NONE, 1.1 Makefile, 1.1, NONE branch, 1.1, NONE liboil-0.3.3-gccoptfixes.patch, 1.1, NONE liboil.spec, 1.16, NONE sources, 1.8, NONE Message-ID: <200603221326.k2MDQAlq017092@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/liboil/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17081 Added Files: README.CVS Removed Files: Makefile branch liboil-0.3.3-gccoptfixes.patch liboil.spec sources Log Message: This package has been moved into FC5 in order to support gstreamer-0.10 --- NEW FILE README.CVS --- This package has been moved into FC5 in order to support gstreamer-0.10 --- Makefile DELETED --- --- branch DELETED --- --- liboil-0.3.3-gccoptfixes.patch DELETED --- --- liboil.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 13:26:42 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Wed, 22 Mar 2006 06:26:42 -0700 Subject: rpms/liboil/devel README.CVS, NONE, 1.1 .cvsignore, 1.8, NONE Makefile, 1.1, NONE liboil-0.3.3-gccoptfixes.patch, 1.1, NONE liboil.spec, 1.16, NONE sources, 1.8, NONE Message-ID: <200603221326.k2MDQgLt017148@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/liboil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17137 Added Files: README.CVS Removed Files: .cvsignore Makefile liboil-0.3.3-gccoptfixes.patch liboil.spec sources Log Message: This package has been moved into FC5 in order to support gstreamer-0.10 --- NEW FILE README.CVS --- This package has been moved into FC5 in order to support gstreamer-0.10 --- .cvsignore DELETED --- --- Makefile DELETED --- --- liboil-0.3.3-gccoptfixes.patch DELETED --- --- liboil.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 13:49:58 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 22 Mar 2006 08:49:58 -0500 Subject: rpms/wv2/devel wv2.spec,1.5,1.6 Message-ID: <200603221350.k2MDoU9L017218@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17201 Modified Files: wv2.spec Log Message: - bump for libgsf Index: wv2.spec =================================================================== RCS file: /cvs/extras/rpms/wv2/devel/wv2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wv2.spec 21 Feb 2006 21:40:32 -0000 1.5 +++ wv2.spec 22 Mar 2006 13:49:57 -0000 1.6 @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library which allows access to Microsoft?? Word files Group: System Environment/Libraries @@ -77,6 +77,9 @@ %{_includedir}/wv2 %changelog +* Wed Mar 22 2006 Andreas Bierfert 0.2.2-9 +- bump for libgsf + * Tue Feb 21 2006 Andreas Bierfert 0.2.2-8 - Fix #19229{1,3} - Tune configure From fedora-extras-commits at redhat.com Wed Mar 22 15:16:42 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 22 Mar 2006 10:16:42 -0500 Subject: rpms/orange/devel orange.spec,1.3,1.4 Message-ID: <200603221517.k2MFHEKI022008@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/orange/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21986 Modified Files: orange.spec Log Message: - bump for libgsf - fix versioning Index: orange.spec =================================================================== RCS file: /cvs/extras/rpms/orange/devel/orange.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- orange.spec 28 Feb 2006 08:36:20 -0000 1.3 +++ orange.spec 22 Mar 2006 15:16:29 -0000 1.4 @@ -1,6 +1,6 @@ Name: orange Version: 0.3 -Release: 0.cvs20051118%{?dist}.2 +Release: 1.cvs20051118%{?dist} Summary: Squeeze out installable Microsoft cabinet files Group: Applications/Communications @@ -71,6 +71,11 @@ %{_includedir}/liborange.h %changelog +* Wed Mar 22 2006 Andreas Bierfert +0.3-1.cvs20051118 +- Bump for libgsf +- fix versioning + * Tue Feb 28 2006 Andreas Bierfert 0.3-0.cvs20051118.fc5.2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed Mar 22 15:21:16 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:21:16 -0500 Subject: rpms/libmal - New directory Message-ID: <200603221521.k2MFLakM022140@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22118/libmal Log Message: Directory /cvs/extras/rpms/libmal added to the repository From fedora-extras-commits at redhat.com Wed Mar 22 15:21:27 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:21:27 -0500 Subject: rpms/libmal/devel - New directory Message-ID: <200603221521.k2MFLZlD022139@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22118/libmal/devel Log Message: Directory /cvs/extras/rpms/libmal/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 22 15:21:48 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:21:48 -0500 Subject: rpms/libmal Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603221521.k2MFLoCU022175@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22163 Added Files: Makefile import.log Log Message: Setup of module libmal --- NEW FILE Makefile --- # Top level Makefile for module libmal all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 22 15:21:56 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:21:56 -0500 Subject: rpms/libmal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603221521.k2MFLwUL022193@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22163/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libmal --- NEW 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 Mar 22 15:22:43 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:22:43 -0500 Subject: rpms/libmal/devel libmal-0.31-64bit.patch, NONE, 1.1 libmal-0.31-pi12.patch, NONE, 1.1 libmal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603221523.k2MFNJxt022278@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22237/devel Modified Files: .cvsignore sources Added Files: libmal-0.31-64bit.patch libmal-0.31-pi12.patch libmal.spec Log Message: auto-import libmal-0.31-1 on branch devel from libmal-0.31-1.src.rpm libmal-0.31-64bit.patch: --- NEW FILE libmal-0.31-64bit.patch --- --- libmal-0.31/configure.64 2003-03-23 11:33:42.000000000 -0600 +++ libmal-0.31/configure 2004-12-16 11:37:13.000000000 -0600 @@ -8102,7 +8102,7 @@ pilotlibs=no PILOT_LIBS="-lpisock" -for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \ +for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \ /usr/extra/pilot/lib ; do if test -r "$pilot_libs/libpisock.so" ; then pilotlibs=yes --- libmal-0.31/configure.in.64 2003-03-22 12:37:22.000000000 -0600 +++ libmal-0.31/configure.in 2004-12-16 11:36:57.000000000 -0600 @@ -60,7 +60,7 @@ pilotlibs=no PILOT_LIBS="-lpisock" -for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \ +for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \ /usr/extra/pilot/lib ; do if test -r "$pilot_libs/libpisock.so" ; then pilotlibs=yes libmal-0.31-pi12.patch: --- NEW FILE libmal-0.31-pi12.patch --- --- libmal-0.31/libmal.c.pi12 2003-03-23 11:00:26.000000000 -0600 +++ libmal-0.31/libmal.c 2005-06-14 10:51:54.000000000 -0500 @@ -508,8 +508,13 @@ uint8 buffer[BUFFERSIZE]; AGBufferReader * r = NULL; +#if (PILOT_LINK_MAJOR >= 12) + rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, + &id, &attr, &cat); +#else rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, &id, &bufferSize, &attr, &cat); +#endif if (rc < 0) { #ifdef _DEBUG @@ -541,8 +546,13 @@ uint8 buffer[BUFFERSIZE]; AGBufferReader * r = NULL; +#if (PILOT_LINK_MAJOR >= 12) + rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, + &id, &attr, &cat); +#else rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, &id, &bufferSize, &attr, &cat); +#endif if (rc < 0) { #ifdef _DEBUG @@ -596,9 +606,13 @@ AGUserConfigWriteData(deviceUserConfig, (AGWriter*)w); } - result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer - , - &id, &bufferSize, &attr, &cat); +#if (PILOT_LINK_MAJOR >= 12) + result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, + &id, &attr, &cat); +#else + result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, + &id, &bufferSize, &attr, &cat); +#endif if (result < 0) id = 0; @@ -881,13 +895,25 @@ int idx = pInfo->pilot_RecIndex++; result = (modonly) ? +#if (PILOT_LINK_MAJOR >= 12) + dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pilot_buffer, + &pInfo->id, &idx, + &att, &cat) +#else dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pilot_buffer, &pInfo->id, &idx, &size, &att, &cat) +#endif : +#if (PILOT_LINK_MAJOR >= 12) + dlp_ReadRecordByIndex(sd, pInfo->pilot_rHandle, idx, + pInfo->pilot_buffer, &pInfo->id, + &att, &cat); +#else dlp_ReadRecordByIndex(sd, pInfo->pilot_rHandle, idx, pInfo->pilot_buffer, &pInfo->id, &size, &att, &cat); +#endif if (result < 0) { closeDatabase(pInfo); @@ -1208,7 +1234,11 @@ strcpy(addr.pi_device, device); +#if (PILOT_LINK_MAJOR >= 12) + ret = pi_bind(sd, (struct sockaddr*)&addr); +#else ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr)); +#endif if(ret == -1) { /*fprintf(stderr, "Unable to bind to port '%s'.\n", device);*/ (*printerror) ("Unable to bind to port '%s'.\n", device); --- NEW FILE libmal.spec --- 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 Version: 0.31 Release: 1%{?dist} License: MPL Url: http://jasonday.home.att.net/code/libmal/ Source: http://jasonday.home.att.net/code/libmal/libmal-0.31.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: libmal-0.31-64bit.patch # pilot-link-0.12 fixes Patch2: libmal-0.31-pi12.patch BuildRequires: pilot-link-devel %description A convenience library of the object files contained in Tom Whittaker's malsync distribution, along with a few wrapper functions. %package devel Summary: Header and library files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel %{summary}. %prep %setup -q %patch1 -p1 -b .64bits %patch2 -p1 -b .pi12 %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ## Unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS ChangeLog NEWS README TODO %{_libdir}/lib*.so.* %files devel %defattr(-,root,root) %{_libdir}/lib*.so %{_includedir}/* %changelog * Mon Oct 31 2005 Rex Dieter 0.31-1 - cleanup for Extras * Tue Jun 14 2005 Rex Dieter 0.31-0.1 - pilot-link-0.12 fixes * Thu Dec 16 2004 Rex Dieter 0.31-0.fdr.3 - fix 64 builds (for finding pilot-link libs) * Wed Jul 21 2004 Rex Dieter 0.31-0.fdr.2 - nuke .la file(s). - --disable-static * Fri Oct 17 2003 Rex Dieter 0.31-0.fdr.1 - first try Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmal/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Mar 2006 15:21:56 -0000 1.1 +++ .cvsignore 22 Mar 2006 15:22:43 -0000 1.2 @@ -0,0 +1 @@ +libmal-0.31.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmal/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Mar 2006 15:21:56 -0000 1.1 +++ sources 22 Mar 2006 15:22:43 -0000 1.2 @@ -0,0 +1 @@ +3d1fd0a5ece6de47d55df5829ee8b6a2 libmal-0.31.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 15:22:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:22:22 -0500 Subject: rpms/libmal import.log,1.1,1.2 Message-ID: <200603221523.k2MFNJwl022279@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22237 Modified Files: import.log Log Message: auto-import libmal-0.31-1 on branch devel from libmal-0.31-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libmal/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 Mar 2006 15:21:48 -0000 1.1 +++ import.log 22 Mar 2006 15:22:22 -0000 1.2 @@ -0,0 +1 @@ +libmal-0_31-1:HEAD:libmal-0.31-1.src.rpm:1143040939 From fedora-extras-commits at redhat.com Wed Mar 22 15:29:06 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 22 Mar 2006 10:29:06 -0500 Subject: rpms/octave-forge/devel .cvsignore, 1.6, 1.7 octave-forge.spec, 1.20, 1.21 sources, 1.6, 1.7 octave-forge-2006.01.28.patch, 1.3, NONE Message-ID: <200603221529.k2MFTcjH022430@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22379 Modified Files: .cvsignore octave-forge.spec sources Removed Files: octave-forge-2006.01.28.patch Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Feb 2006 13:43:31 -0000 1.6 +++ .cvsignore 22 Mar 2006 15:29:05 -0000 1.7 @@ -1,2 +1 @@ -octave-forge-2006.01.28.patched.tar.gz -octave-forge-2006.01.28-fixed.patch.gz +octave-forge-2006.03.17.patched.tar.gz Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- octave-forge.spec 18 Feb 2006 06:46:36 -0000 1.20 +++ octave-forge.spec 22 Mar 2006 15:29:05 -0000 1.21 @@ -1,6 +1,6 @@ Name: octave-forge -Version: 2006.01.28 -Release: 5%{?dist} +Version: 2006.03.17 +Release: 1%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -15,8 +15,6 @@ ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version} ## rm -Rf octave-forge-%{version} Source0: %{name}-%{version}.patched.tar.gz -Patch0: %{name}-2006.01.28.patch -Patch1: %{name}-2006.01.28-fixed.patch.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: octave >= 2.9.4 ImageMagick @@ -34,11 +32,8 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 # The sparse matrix functions are in octave 2.9.x so don't install them touch main/sparse/NOINSTALL -chmod +x admin/octlink.sh %build export CPPFLAGS=-I%{_includedir}/netcdf-3 @@ -72,6 +67,9 @@ %changelog +* Fri Mar 17 2006 Quentin Spencer 2006.03.17-1 +- New release. Remove old patches. + * Sat Feb 18 2006 Quentin Spencer 2006.01.28-5 - Amend patch0 to correctly deal with 64-bit indexing. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Feb 2006 13:43:31 -0000 1.6 +++ sources 22 Mar 2006 15:29:05 -0000 1.7 @@ -1,2 +1 @@ -8192ee6bc3784e35180623592de4303f octave-forge-2006.01.28.patched.tar.gz -fb0c7cc8f4d759ef0de76c8218583a32 octave-forge-2006.01.28-fixed.patch.gz +a1e76ab52fb9894586d6a7a0dc15e603 octave-forge-2006.03.17.patched.tar.gz --- octave-forge-2006.01.28.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 15:29:13 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:29:13 -0500 Subject: owners owners.list,1.756,1.757 Message-ID: <200603221529.k2MFTkgZ022436@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22394 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.756 retrieving revision 1.757 diff -u -r1.756 -r1.757 --- owners.list 22 Mar 2006 07:39:13 -0000 1.756 +++ owners.list 22 Mar 2006 15:29:13 -0000 1.757 @@ -581,6 +581,7 @@ Fedora Extras|libkexif|Allow Kipi plugins to extract EXIF information|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libkipi|Common plugin infrastructure for KDE image applications|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libksba|X.509 library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|libmal|A convenience library for malsync|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libmatroska|An open Audio/Video container format|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 22 15:33:38 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:33:38 -0500 Subject: rpms/libmal/devel libmal.spec,1.1,1.2 Message-ID: <200603221534.k2MFYAdl022558@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22537 Modified Files: libmal.spec Log Message: * Wed Mar 22 2006 Rex Dieter 0.31-2 - capitalize summary - drop empty %doc's: AUTHORS NEWS TODO Index: libmal.spec =================================================================== RCS file: /cvs/extras/rpms/libmal/devel/libmal.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmal.spec 22 Mar 2006 15:22:43 -0000 1.1 +++ libmal.spec 22 Mar 2006 15:33:38 -0000 1.2 @@ -1,10 +1,10 @@ -Summary: a convenience library for malsync +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 Version: 0.31 -Release: 1%{?dist} +Release: 2%{?dist} License: MPL Url: http://jasonday.home.att.net/code/libmal/ @@ -62,17 +62,23 @@ %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog NEWS README TODO +%defattr(-,root,root,-) +%doc ChangeLog README +#empties +#doc AUTHORS NEWS TODO %{_libdir}/lib*.so.* %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) %{_libdir}/lib*.so %{_includedir}/* %changelog +* Wed Mar 22 2006 Rex Dieter 0.31-2 +- capitalize summary +- drop empty %%doc's: AUTHORS NEWS TODO + * Mon Oct 31 2005 Rex Dieter 0.31-1 - cleanup for Extras From fedora-extras-commits at redhat.com Wed Mar 22 16:10:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 11:10:21 -0500 Subject: rpms/gpa/devel gpa-0.7.3-dt.patch, NONE, 1.1 gpa-0.7.3-keyservers.patch, NONE, 1.1 Message-ID: <200603221610.k2MGAOde024769@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24754 Added Files: gpa-0.7.3-dt.patch gpa-0.7.3-keyservers.patch Log Message: import new patches gpa-0.7.3-dt.patch: --- NEW FILE gpa-0.7.3-dt.patch --- --- gpa-0.7.3/gpa.desktop.dt 2005-10-06 10:17:35.000000000 -0500 +++ gpa-0.7.3/gpa.desktop 2006-03-22 10:03:33.000000000 -0600 @@ -2,7 +2,7 @@ Name=GNU Privacy Assistant Name[en_US.ISO8859-1]=GNU Privacy Assistant Exec=gpa -Icon=gpa.png +Icon=gpa Terminal=false Encoding=UTF-8 Type=Application gpa-0.7.3-keyservers.patch: --- NEW FILE gpa-0.7.3-keyservers.patch --- --- gpa-0.7.3/src/keyserver.c.pgp.mit.edu 2006-01-30 03:37:34.000000000 -0600 +++ gpa-0.7.3/src/keyserver.c 2006-03-22 09:54:31.000000000 -0600 @@ -179,6 +179,7 @@ add_server (&serverlist, "hkp://subkeys.pgp.net"); add_server (&serverlist, "ldap://keyserver.pgp.com"); + add_server (&serverlist, "hkp://pgp.mit.edu"); } return rc; From fedora-extras-commits at redhat.com Wed Mar 22 16:11:33 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 11:11:33 -0500 Subject: rpms/gpa/devel .cvsignore, 1.2, 1.3 gpa.spec, 1.7, 1.8 sources, 1.2, 1.3 gpa-keytable-init.patch, 1.1, NONE Message-ID: <200603221612.k2MGC6ba024820@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24792 Modified Files: .cvsignore gpa.spec sources Removed Files: gpa-keytable-init.patch Log Message: * Wed Mar 22 2006 Rex Dieter 0.7.3-1 - 0.7.3 (development release) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpa/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:28:52 -0000 1.2 +++ .cvsignore 22 Mar 2006 16:11:33 -0000 1.3 @@ -1 +1,2 @@ -gpa-0.7.0.tar.gz +gpa-0.7.3.tar.bz2 +gpa-0.7.3.tar.bz2.sig Index: gpa.spec =================================================================== RCS file: /cvs/extras/rpms/gpa/devel/gpa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gpa.spec 27 Feb 2006 21:01:01 -0000 1.7 +++ gpa.spec 22 Mar 2006 16:11:33 -0000 1.8 @@ -1,18 +1,19 @@ -Name: gpa -Summary: Graphical user interface for GnuPG -Version: 0.7.0 -Release: 5%{?dist} - -License: GPL -Group: Applications/System -URL: http://www.gnupg.org/related_software/gpa/ -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-0.7.0.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source1: gpa.desktop -Patch0: gpa-keyservers.patch -Patch1: gpa-keytable-init.patch +Name: gpa +Summary: Graphical user interface for GnuPG +Version: 0.7.3 +Release: 1%{?dist} + +License: GPL +Group: Applications/System +URL: http://www.gnupg.org/related_software/gpa/ +#Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-%{version}.tar.gz +Source0: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2 +Source1: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2.sig +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch1: gpa-0.7.3-keyservers.patch +Patch2: gpa-0.7.3-dt.patch BuildRequires: gtk2-devel BuildRequires: zlib-devel @@ -29,8 +30,8 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p1 +%patch1 -p1 -b .keyservers +%patch2 -p1 -b .dt %build @@ -44,12 +45,14 @@ make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - %{SOURCE1} + --vendor fedora --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop -install -p -m644 -D gpa-logo-48x48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +install -p -m644 -D gpa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gpa.png %find_lang %{name} @@ -77,6 +80,9 @@ %changelog +* Wed Mar 22 2006 Rex Dieter 0.7.3-1 +- 0.7.3 (development release) + * Mon Feb 27 2006 Rex Dieter 0.7.0-5 - follow fdo icon spec - drop superfluous BR: gnupg Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpa/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:28:52 -0000 1.2 +++ sources 22 Mar 2006 16:11:33 -0000 1.3 @@ -1 +1,2 @@ -44cb60cba64a48837588ed27f8db08b2 gpa-0.7.0.tar.gz +a3626266f9dda506445c7297c4172a65 gpa-0.7.3.tar.bz2 +68d7cafe71c21a386109878c206e4016 gpa-0.7.3.tar.bz2.sig --- gpa-keytable-init.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 16:22:26 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 22 Mar 2006 11:22:26 -0500 Subject: owners owners.list,1.757,1.758 Message-ID: <200603221622.k2MGMwAf025110@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25078 Modified Files: owners.list Log Message: * Add missing perl-YAML-Parser-Syck Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.757 retrieving revision 1.758 diff -u -r1.757 -r1.758 --- owners.list 22 Mar 2006 15:29:13 -0000 1.757 +++ owners.list 22 Mar 2006 16:22:25 -0000 1.758 @@ -1102,6 +1102,7 @@ Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|ville.skytta at iki.fi|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|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com 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|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 22 16:25:13 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 22 Mar 2006 11:25:13 -0500 Subject: rpms/highlight/FC-4 .cvsignore, 1.3, 1.4 highlight.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603221625.k2MGPj93025178@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25153 Modified Files: .cvsignore highlight.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Mar 2006 20:14:31 -0000 1.3 +++ .cvsignore 22 Mar 2006 16:25:13 -0000 1.4 @@ -1 +1 @@ -highlight-2.4.4.tar.gz +highlight-2.4.5.tar.gz Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/highlight.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- highlight.spec 15 Mar 2006 16:30:24 -0000 1.9 +++ highlight.spec 22 Mar 2006 16:25:13 -0000 1.10 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.4.4 -Release: 2%{?dist} +Version: 2.4.5 +Release: 1%{?dist} Group: Development/Tools License: GPL @@ -10,7 +10,6 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch -Patch3: highlight-2.4-fixcodegen.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -26,7 +25,6 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -51,8 +49,11 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Mar 22 2006 Jochen Schmitt 2.4.5-1 +- New upstream relase + * Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 -- Add fixcodegen patch #184245 +- Add fixcodegen patch from Eric Hopper #184245 * Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 20:14:31 -0000 1.5 +++ sources 22 Mar 2006 16:25:13 -0000 1.6 @@ -1 +1 @@ -c2ea3c4a11a76379d73bd4bccd6c3228 highlight-2.4.4.tar.gz +c62385c80fd0088a7798875aa0f9a460 highlight-2.4.5.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 16:28:48 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 22 Mar 2006 11:28:48 -0500 Subject: rpms/highlight/FC-5 .cvsignore, 1.5, 1.6 highlight.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200603221629.k2MGTKdO025261@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25237 Modified Files: .cvsignore highlight.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Mar 2006 20:09:47 -0000 1.5 +++ .cvsignore 22 Mar 2006 16:28:48 -0000 1.6 @@ -1 +1 @@ -highlight-2.4.4.tar.gz +highlight-2.4.5.tar.gz Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-5/highlight.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- highlight.spec 15 Mar 2006 16:28:28 -0000 1.12 +++ highlight.spec 22 Mar 2006 16:28:48 -0000 1.13 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.4.4 -Release: 2%{?dist} +Version: 2.4.5 +Release: 1%{?dist} Group: Development/Tools License: GPL @@ -10,7 +10,6 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch -Patch3: highlight-2.4-fixcodegen.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -26,7 +25,6 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -51,8 +49,11 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Mar 22 2006 Jochen Schmitt 2.4.5-1 +- New upstream relase + * Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 -- Add fixcodegen patch #184245 +- Add fixcodegen patch from Eric Hopper #184245 * Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 20:09:47 -0000 1.5 +++ sources 22 Mar 2006 16:28:48 -0000 1.6 @@ -1 +1 @@ -c2ea3c4a11a76379d73bd4bccd6c3228 highlight-2.4.4.tar.gz +c62385c80fd0088a7798875aa0f9a460 highlight-2.4.5.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 16:31:14 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 22 Mar 2006 11:31:14 -0500 Subject: rpms/highlight/devel .cvsignore, 1.5, 1.6 highlight.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200603221631.k2MGVkqa025346@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25325 Modified Files: .cvsignore highlight.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Mar 2006 20:09:47 -0000 1.5 +++ .cvsignore 22 Mar 2006 16:31:13 -0000 1.6 @@ -1 +1 @@ -highlight-2.4.4.tar.gz +highlight-2.4.5.tar.gz Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- highlight.spec 15 Mar 2006 16:28:28 -0000 1.12 +++ highlight.spec 22 Mar 2006 16:31:13 -0000 1.13 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.4.4 -Release: 2%{?dist} +Version: 2.4.5 +Release: 1%{?dist} Group: Development/Tools License: GPL @@ -10,7 +10,6 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch -Patch3: highlight-2.4-fixcodegen.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -26,7 +25,6 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -51,8 +49,11 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Mar 22 2006 Jochen Schmitt 2.4.5-1 +- New upstream relase + * Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 -- Add fixcodegen patch #184245 +- Add fixcodegen patch from Eric Hopper #184245 * Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 20:09:47 -0000 1.5 +++ sources 22 Mar 2006 16:31:13 -0000 1.6 @@ -1 +1 @@ -c2ea3c4a11a76379d73bd4bccd6c3228 highlight-2.4.4.tar.gz +c62385c80fd0088a7798875aa0f9a460 highlight-2.4.5.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 17:22:59 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 22 Mar 2006 12:22:59 -0500 Subject: rpms/highlight/devel highlight-2.4-gcc41.patch, NONE, 1.1 highlight.spec, 1.13, 1.14 highlight-2.4-fixcodegen.patch, 1.1, NONE Message-ID: <200603221723.k2MHNXah027690@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27668 Modified Files: highlight.spec Added Files: highlight-2.4-gcc41.patch Removed Files: highlight-2.4-fixcodegen.patch Log Message: Add gcc41 patch highlight-2.4-gcc41.patch: --- NEW FILE highlight-2.4-gcc41.patch --- --- highlight-2.4.5/highlight/codegenerator.h.org 2006-03-22 17:45:01.000000000 +0100 +++ highlight-2.4.5/highlight/codegenerator.h 2006-03-22 17:50:02.000000000 +0100 @@ -248,7 +248,7 @@ string &getTitle(); /** \param p HTML anchor prefix */ - void CodeGenerator::setHTMLAnchorPrefix(const string & p); + void setHTMLAnchorPrefix(const string & p); protected: CodeGenerator(highlight::OutputType type); Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- highlight.spec 22 Mar 2006 16:31:13 -0000 1.13 +++ highlight.spec 22 Mar 2006 17:22:58 -0000 1.14 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch +Patch3: highlight-2.4-gcc41.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -25,6 +26,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -49,8 +51,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog -* Wed Mar 22 2006 Jochen Schmitt 2.4.5-1 +* Wed Mar 22 2006 Jochen Schmitt 2.4.5-2 - New upstream relase +- Add gcc41 patch * Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 - Add fixcodegen patch from Eric Hopper #184245 --- highlight-2.4-fixcodegen.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 17:36:28 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 22 Mar 2006 12:36:28 -0500 Subject: rpms/highlight/FC-5 highlight-2.4-gcc41.patch, NONE, 1.1 highlight.spec, 1.13, 1.14 highlight-2.4-fixcodegen.patch, 1.1, NONE Message-ID: <200603221737.k2MHb0VA028145@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28104 Modified Files: highlight.spec Added Files: highlight-2.4-gcc41.patch Removed Files: highlight-2.4-fixcodegen.patch Log Message: Add gcc41 patch highlight-2.4-gcc41.patch: --- NEW FILE highlight-2.4-gcc41.patch --- --- highlight-2.4.5/highlight/codegenerator.h.org 2006-03-22 17:45:01.000000000 +0100 +++ highlight-2.4.5/highlight/codegenerator.h 2006-03-22 17:50:02.000000000 +0100 @@ -248,7 +248,7 @@ string &getTitle(); /** \param p HTML anchor prefix */ - void CodeGenerator::setHTMLAnchorPrefix(const string & p); + void setHTMLAnchorPrefix(const string & p); protected: CodeGenerator(highlight::OutputType type); Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-5/highlight.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- highlight.spec 22 Mar 2006 16:28:48 -0000 1.13 +++ highlight.spec 22 Mar 2006 17:36:28 -0000 1.14 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch +Patch3: highlight-2.4-gcc41.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -25,6 +26,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -49,8 +51,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog -* Wed Mar 22 2006 Jochen Schmitt 2.4.5-1 +* Wed Mar 22 2006 Jochen Schmitt 2.4.5-2 - New upstream relase +- Add gcc41 patch * Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 - Add fixcodegen patch from Eric Hopper #184245 --- highlight-2.4-fixcodegen.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 17:39:43 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 22 Mar 2006 12:39:43 -0500 Subject: rpms/fftw3 Makefile,1.1,NONE import.log,1.2,NONE Message-ID: <200603221739.k2MHdj4V028240@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/fftw3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28225 Removed Files: Makefile import.log Log Message: Removing files. --- Makefile DELETED --- --- import.log DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 17:45:51 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 22 Mar 2006 12:45:51 -0500 Subject: rpms/fftw3/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch, 1.1, NONE fftw3.spec, 1.2, NONE sources, 1.2, NONE Message-ID: <200603221745.k2MHjroK028313@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/fftw3/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302/FC-4 Removed Files: .cvsignore Makefile branch fftw3.spec sources Log Message: More removals. --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- fftw3.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 17:45:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 22 Mar 2006 12:45:57 -0500 Subject: rpms/fftw3/FC-5 .cvsignore, 1.3, NONE Makefile, 1.1, NONE branch, 1.1, NONE fftw3.spec, 1.3, NONE sources, 1.3, NONE Message-ID: <200603221745.k2MHjxPq028330@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/fftw3/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302/FC-5 Removed Files: .cvsignore Makefile branch fftw3.spec sources Log Message: More removals. --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- fftw3.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 17:46:02 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 22 Mar 2006 12:46:02 -0500 Subject: rpms/fftw3/devel .cvsignore, 1.3, NONE Makefile, 1.1, NONE fftw3.spec, 1.3, NONE sources, 1.3, NONE Message-ID: <200603221746.k2MHk5LJ028345@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/fftw3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302/devel Removed Files: .cvsignore Makefile fftw3.spec sources Log Message: More removals. --- .cvsignore DELETED --- --- Makefile DELETED --- --- fftw3.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 18:01:14 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 22 Mar 2006 13:01:14 -0500 Subject: rpms/gdesklets/FC-3 .cvsignore, 1.3, NONE Makefile, 1.1, NONE NullObject-1.0-fix.patch, 1.1, NONE branch, 1.1, NONE gdesklets.spec, 1.4, NONE sources, 1.3, NONE Message-ID: <200603221801.k2MI1GVr030037@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gdesklets/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28572/FC-3 Removed Files: .cvsignore Makefile NullObject-1.0-fix.patch branch gdesklets.spec sources Log Message: removing files --- .cvsignore DELETED --- --- Makefile DELETED --- --- NullObject-1.0-fix.patch DELETED --- --- branch DELETED --- --- gdesklets.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 19:26:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 22 Mar 2006 14:26:58 -0500 Subject: owners owners.list,1.758,1.759 Message-ID: <200603221927.k2MJRUUZ000984@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv967/owners Modified Files: owners.list Log Message: Remove libgsf113 add dumb Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.758 retrieving revision 1.759 diff -u -r1.758 -r1.759 --- owners.list 22 Mar 2006 16:22:25 -0000 1.758 +++ owners.list 22 Mar 2006 19:26:58 -0000 1.759 @@ -198,6 +198,7 @@ Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|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|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan 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| @@ -573,7 +574,6 @@ Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org| 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|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|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|libifp|A general-purpose library-driver for iRiver's iFP portable audio players|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 22 19:17:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 22 Mar 2006 14:17:35 -0500 Subject: rpms/lacewing/devel lacewing.spec,1.3,1.4 Message-ID: <200603221918.k2MJI8NZ000745@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lacewing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv725 Modified Files: lacewing.spec Log Message: * Wed Mar 22 2006 Hans de Goede 1.10-5 - Change fullscreen patch to not change to window / fullscreen untill the menu is left. - Fix all warnings. Index: lacewing.spec =================================================================== RCS file: /cvs/extras/rpms/lacewing/devel/lacewing.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lacewing.spec 22 Mar 2006 19:10:49 -0000 1.3 +++ lacewing.spec 22 Mar 2006 19:17:35 -0000 1.4 @@ -12,6 +12,7 @@ Patch0: lacewing.patch Patch1: lacewing-fullscreen.patch Patch2: lacewing-nicecpu.patch +Patch3: lacewing-warn.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel desktop-file-utils @@ -31,6 +32,7 @@ %patch0 -p1 -z .unix %patch1 -p1 -z .fullscreen %patch2 -p1 -z .nicecpu +%patch3 -p1 -z .warn %{__sed} -i 's/\r//' readme.txt licence.txt chmod 644 readme.txt licence.txt @@ -84,6 +86,7 @@ * Wed Mar 22 2006 Hans de Goede 1.10-5 - Change fullscreen patch to not change to window / fullscreen untill the menu is left. +- Fix all warnings. * Mon Feb 13 2006 Hans de Goede 1.10-4 - Bump release and rebuild for new gcc4.1 and glibc. From fedora-extras-commits at redhat.com Wed Mar 22 19:22:08 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 22 Mar 2006 14:22:08 -0500 Subject: fedora-security/audit fc4,1.178,1.179 fc5,1.91,1.92 Message-ID: <200603221922.k2MJM8d7000935@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv905 Modified Files: fc4 fc5 Log Message: Note the sendmail update. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- fc4 22 Mar 2006 10:22:00 -0000 1.178 +++ fc4 22 Mar 2006 19:22:01 -0000 1.179 @@ -88,6 +88,7 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] patch-2.6.15.5 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) +CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-194] CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0040 VULNERABLE (gtkhtml) CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- fc5 22 Mar 2006 10:22:00 -0000 1.91 +++ fc5 22 Mar 2006 19:22:01 -0000 1.92 @@ -91,6 +91,7 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) patch-2.6.16-rc6 CVE-2006-0082 version (ImageMagick, not 6.2.5.4) +CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-193] CVE-2006-0049 version (gnupg, fixed 1.4.2.2) CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 From fedora-extras-commits at redhat.com Wed Mar 22 19:21:19 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 22 Mar 2006 14:21:19 -0500 Subject: rpms/lacewing/devel lacewing-warn.patch,NONE,1.1 Message-ID: <200603221921.k2MJLLbQ000818@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lacewing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv797 Added Files: lacewing-warn.patch Log Message: * Wed Mar 22 2006 Hans de Goede 1.10-5 - Change fullscreen patch to not change to window / fullscreen untill the menu is left. - Fix all warnings. lacewing-warn.patch: --- NEW FILE lacewing-warn.patch --- --- lacewing-1.10/actor.c.warn 2003-11-25 03:28:14.000000000 +0100 +++ lacewing-1.10/actor.c 2006-03-22 20:11:29.000000000 +0100 @@ -536,7 +536,7 @@ // ysin2 = sin(angle_to_radians(actor[a].angle)) * GRAIN; // } - int target_x, target_y; + int target_x = 0, target_y = 0; float speed_mult; int accel = 0; --- lacewing-1.10/cmds.c.warn 2003-11-25 12:25:16.000000000 +0100 +++ lacewing-1.10/cmds.c 2006-03-22 20:11:29.000000000 +0100 @@ -1183,7 +1183,7 @@ { int special1; - int special2; + int special2 = 0; int special3; int special4; special5 *= 2; @@ -1354,9 +1354,9 @@ { int special1; int special2; - int special3; - int special4; - int special5; + int special3 = 0; + int special4 = 0; + int special5 = 0; timer += grand(4); --- lacewing-1.10/displ_in.c.warn 2006-03-22 20:11:29.000000000 +0100 +++ lacewing-1.10/displ_in.c 2006-03-22 20:11:29.000000000 +0100 @@ -85,9 +85,7 @@ void init_display(void) { - RGB temp_palette2 [1024]; RGB temp_palette [256]; - RGB temp_palette3 [1024]; DATAFILE *datf = load_datafile(DATADIR "gfx/data.dat"); if (datf == NULL) @@ -426,7 +424,7 @@ // else blit(source_bmp, temp_bmp, which_ship * 51 + 1, 1, 0, 0, 49, 49); - int i, x, y, px, base_col; + int i, x, y, px, base_col = 0; for (i = 0; i < 5; i ++) { --- lacewing-1.10/display.c.warn 2006-03-22 20:11:29.000000000 +0100 +++ lacewing-1.10/display.c 2006-03-22 20:11:30.000000000 +0100 @@ -3181,7 +3181,7 @@ // return; int i; - int col1, col2; + int col1 = 0, col2 = 0; int count; int count_x; int k; --- lacewing-1.10/enemy.c.warn 2003-11-25 01:51:16.000000000 +0100 +++ lacewing-1.10/enemy.c 2006-03-22 20:11:30.000000000 +0100 @@ -4440,8 +4440,6 @@ int speed = 0; int speed_div = 5; int mass; - int seed; - int status; int displaced = 0; int colours [4] = {COLOUR_GREEN8, COLOUR_GREEN6, COLOUR_GREEN4, COLOUR_GREEN2}; int colours_for_cloud [5] = {COLOUR_GREEN8, COLOUR_GREEN6, COLOUR_GREEN4, COLOUR_GREEN2, COLOUR_GREEN1}; @@ -5685,7 +5683,7 @@ create_bullet(btype, x, y, xs, ys, OWNER_ENEMY, damage, timer + grand(timer_rand), mass, firing_angle, - status, seed, colours, speed_div, special1,special2,special3,special4,special5); + 0, grand(256), colours, speed_div, special1,special2,special3,special4,special5); } @@ -5737,7 +5735,7 @@ int subtype = enemy[e].subtype; int carrying_pickup = enemy[e].carrying_pickup; int special [10]; - int change_to; + int change_to = 0; switch(enemy[e].type) { --- lacewing-1.10/palette.c.warn 2006-03-22 20:11:59.000000000 +0100 +++ lacewing-1.10/palette.c 2006-03-22 20:11:59.000000000 +0100 @@ -79,12 +79,7 @@ int limit_colour(int colour_input); int average_colours(int colour1, int colour2); -RGB other_palet [1324]; RGB palet [256]; -RGB other_palet2 [2048]; -// what seems to be a weird bug in Allegro forces me to put padding around -// the palet array, or it becomes corrupted. The same thing happened in -// World of Violence and I have no idea why. int adjust_lit_colour(int col, int lit); int add_light_to_colour(int col, int lit); From fedora-extras-commits at redhat.com Wed Mar 22 19:10:49 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 22 Mar 2006 14:10:49 -0500 Subject: rpms/lacewing/devel lacewing-fullscreen.patch, 1.1, 1.2 lacewing.spec, 1.2, 1.3 Message-ID: <200603221911.k2MJBNLc000579@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lacewing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv555 Modified Files: lacewing-fullscreen.patch lacewing.spec Log Message: * Wed Mar 22 2006 Hans de Goede 1.10-5 - Change fullscreen patch to not change to window / fullscreen untill the menu is left. lacewing-fullscreen.patch: Index: lacewing-fullscreen.patch =================================================================== RCS file: /cvs/extras/rpms/lacewing/devel/lacewing-fullscreen.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lacewing-fullscreen.patch 30 Jan 2006 21:34:11 -0000 1.1 +++ lacewing-fullscreen.patch 22 Mar 2006 19:10:49 -0000 1.2 @@ -1,17 +1,5 @@ -diff -ur lacewing.orig/config.h lacewing/config.h ---- lacewing.orig/config.h 2006-01-21 13:00:59.000000000 +0100 -+++ lacewing/config.h 2006-01-21 11:19:54.000000000 +0100 -@@ -792,6 +792,7 @@ - int run_vsync; // on or off - int sound_volume; // sound fx volume; if 0 sound effects not played - int ambience_volume; // if 0 ambience not played -+ int windowed; // GFX_AUTODETECT_FULLSCREEN or GFX_AUTODETECT_WINDOWED - }; - - struct starstruct -diff -ur lacewing.orig/main.c lacewing/main.c ---- lacewing.orig/main.c 2006-01-21 13:00:59.000000000 +0100 -+++ lacewing/main.c 2006-01-21 11:20:18.000000000 +0100 +--- lacewing-1.10/main.c.fullscreen 2006-02-28 23:01:57.000000000 +0100 ++++ lacewing-1.10/main.c 2006-02-28 23:03:21.000000000 +0100 @@ -245,7 +245,7 @@ set_color_depth(8); @@ -21,9 +9,8 @@ { set_gfx_mode(GFX_TEXT, 0, 0, 0, 0); allegro_message("Unable to set 640x480 mode\n%s\n", allegro_error); -diff -ur lacewing.orig/menu.c lacewing/menu.c ---- lacewing.orig/menu.c 2006-01-21 13:00:59.000000000 +0100 -+++ lacewing/menu.c 2006-01-21 11:54:18.000000000 +0100 +--- lacewing-1.10/menu.c.fullscreen 2006-02-28 23:01:57.000000000 +0100 ++++ lacewing-1.10/menu.c 2006-02-28 23:05:23.000000000 +0100 @@ -61,6 +61,7 @@ #define KP_WAIT_SHORT 5 @@ -32,7 +19,23 @@ enum { -@@ -604,7 +605,7 @@ +@@ -124,6 +125,7 @@ + int menu_index; + int menu_index_max; + int menu_index_min; ++int last_main_menu_index; + int keypress_wait; + int last_key; + int check_key(int scode); +@@ -327,6 +329,7 @@ + which_menu = MENU_MAIN; + menu_index_max = 4; + menu_index_min = 0; ++ last_main_menu_index = menu_index = 0; + keypress_wait = KP_WAIT_LONG; + + do +@@ -604,7 +610,7 @@ char ostr [50]; char istr [10]; @@ -41,7 +44,7 @@ { col = COLOUR_GREEN6; -@@ -663,114 +664,121 @@ +@@ -663,114 +669,121 @@ strcat(ostr, itoa(options.ambience_volume, istr, 10)); break; case 4: @@ -190,7 +193,7 @@ strcpy(ostr, "Exit"); break; -@@ -798,10 +806,10 @@ +@@ -798,10 +811,10 @@ { // case 5: // case 6: @@ -204,7 +207,15 @@ return 1; } -@@ -1116,13 +1124,13 @@ +@@ -1076,6 +1089,7 @@ + + void menu_trigger(void) + { ++ static char must_change_video_mode = FALSE; + + keypress_wait = KP_WAIT_LONG; + +@@ -1116,13 +1130,25 @@ } break; case MENU_OPTIONS: @@ -212,6 +223,18 @@ + if (menu_index == 32) { play_sound(WAV_MENU2); ++ if (must_change_video_mode) ++ { ++ if (set_gfx_mode(options.windowed, 640, 480, 0, 0) != 0) ++ { ++ set_gfx_mode(GFX_TEXT, 0, 0, 0, 0); ++ allegro_message("Error switching fullscreen / windowed mode\n%s\n", ++ allegro_error); ++ exit(1); ++ } ++ set_palette(palet); ++ must_change_video_mode = FALSE; ++ } change_menu(MENU_MAIN); break; } @@ -220,7 +243,7 @@ { switch(menu_index) { -@@ -1148,18 +1156,33 @@ +@@ -1148,18 +1174,26 @@ play_sound(WAV_MENU1); return; case 4: @@ -229,14 +252,7 @@ + else + options.windowed = GFX_AUTODETECT_WINDOWED; + play_sound(WAV_MENU1); -+ if (set_gfx_mode(options.windowed, 640, 480, 0, 0) != 0) -+ { -+ set_gfx_mode(GFX_TEXT, 0, 0, 0, 0); -+ allegro_message("Error switching fullscreen / windowed mode\n%s\n", -+ allegro_error); -+ exit(1); -+ } -+ set_palette(palet); ++ must_change_video_mode = TRUE; + return; + case 5: if (options.run_vsync == 1) @@ -256,7 +272,7 @@ play_sound(WAV_MENU2); jam_keys(); return; -@@ -1268,7 +1291,7 @@ +@@ -1268,7 +1302,7 @@ if (option_index() == -1) return; @@ -265,7 +281,7 @@ player[0].keys [option_index()] = inputted; else player[1].keys [option_index()] = inputted; -@@ -1282,35 +1305,35 @@ +@@ -1282,35 +1316,35 @@ { switch(menu_index) { @@ -312,7 +328,25 @@ return CMD_LINK; } -@@ -1391,7 +1414,7 @@ +@@ -1373,6 +1409,8 @@ + + void change_menu(int to_which) + { ++ if (which_menu == MENU_MAIN) ++ last_main_menu_index = menu_index; + + which_menu = to_which; + keypress_wait = KP_WAIT_LONG; +@@ -1383,7 +1421,7 @@ + case MENU_MAIN: + game.type = GAME_SINGLE; + which_menu = MENU_MAIN; +- menu_index = 0; ++ menu_index = last_main_menu_index; + menu_index_max = 4; + menu_index_min = 0; + save_config(); +@@ -1391,7 +1429,7 @@ case MENU_OPTIONS: which_menu = MENU_OPTIONS; menu_index = 1; @@ -321,7 +355,7 @@ menu_index_min = 1; break; case MENU_DUEL: -@@ -2827,6 +2850,7 @@ +@@ -2827,6 +2865,7 @@ options.run_vsync = get_config_int("Options", "Run_vsync", 0); options.sound_volume = get_config_int("Options", "Sound_volume", 100); options.ambience_volume = get_config_int("Options", "Ambience_volume", 100); @@ -329,7 +363,7 @@ for (i = 0; i < NO_CMDS; i ++) { -@@ -2905,6 +2929,7 @@ +@@ -2905,6 +2944,7 @@ set_config_int("Options", "Run_vsync", options.run_vsync); set_config_int("Options", "Sound_volume", options.sound_volume); set_config_int("Options", "Ambience_volume", options.ambience_volume); @@ -337,3 +371,13 @@ for (i = 0; i < NO_CMDS; i ++) { +--- lacewing-1.10/config.h.fullscreen 2006-02-28 23:01:57.000000000 +0100 ++++ lacewing-1.10/config.h 2006-02-28 23:01:57.000000000 +0100 +@@ -792,6 +792,7 @@ + int run_vsync; // on or off + int sound_volume; // sound fx volume; if 0 sound effects not played + int ambience_volume; // if 0 ambience not played ++ int windowed; // GFX_AUTODETECT_FULLSCREEN or GFX_AUTODETECT_WINDOWED + }; + + struct starstruct Index: lacewing.spec =================================================================== RCS file: /cvs/extras/rpms/lacewing/devel/lacewing.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lacewing.spec 13 Feb 2006 15:43:42 -0000 1.2 +++ lacewing.spec 22 Mar 2006 19:10:49 -0000 1.3 @@ -1,6 +1,6 @@ Name: lacewing Version: 1.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Asteroid like game with many different ships Group: Amusements/Games License: GPL @@ -36,7 +36,8 @@ %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" PREFIX=%{_prefix} +make %{?_smp_mflags} PREFIX=%{_prefix} \ + CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations" %install @@ -80,6 +81,10 @@ %{_datadir}/icons/hicolor/48x48/apps/lacewing.png %changelog +* Wed Mar 22 2006 Hans de Goede 1.10-5 +- Change fullscreen patch to not change to window / fullscreen untill + the menu is left. + * Mon Feb 13 2006 Hans de Goede 1.10-4 - Bump release and rebuild for new gcc4.1 and glibc. From fedora-extras-commits at redhat.com Wed Mar 22 20:47:17 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 22 Mar 2006 15:47:17 -0500 Subject: rpms/qps/FC-4 .cvsignore,1.5,1.6 qps.spec,1.5,1.6 sources,1.5,1.6 Message-ID: <200603222047.k2MKlnGc003576@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3514/FC-4 Modified Files: .cvsignore qps.spec sources Log Message: Update to 1.9.14 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Mar 2006 20:27:34 -0000 1.5 +++ .cvsignore 22 Mar 2006 20:47:16 -0000 1.6 @@ -1 +1 @@ -qps-1.9.13.tar.gz +qps-1.9.14.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/qps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qps.spec 9 Mar 2006 20:27:34 -0000 1.5 +++ qps.spec 22 Mar 2006 20:47:16 -0000 1.6 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.13 +Version: 1.9.14 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3228/qps-1.9.13.tar.gz +Source0: http://kldp.net/frs/download.php/3267/qps-1.9.14.tar.gz Source1: qps.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %changelog +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +- Update to 1.9.14 + * Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Mar 2006 20:27:34 -0000 1.5 +++ sources 22 Mar 2006 20:47:16 -0000 1.6 @@ -1 +1 @@ -4db5051d7880e3cf427b06319dd55676 qps-1.9.13.tar.gz +6c45c290670e8dc938afad1cd013ef81 qps-1.9.14.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 20:47:23 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 22 Mar 2006 15:47:23 -0500 Subject: rpms/qps/FC-5 .cvsignore,1.6,1.7 qps.spec,1.6,1.7 sources,1.6,1.7 Message-ID: <200603222047.k2MKltRw003581@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3514/FC-5 Modified Files: .cvsignore qps.spec sources Log Message: Update to 1.9.14 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Mar 2006 20:27:40 -0000 1.6 +++ .cvsignore 22 Mar 2006 20:47:22 -0000 1.7 @@ -1 +1 @@ -qps-1.9.13.tar.gz +qps-1.9.14.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/qps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qps.spec 9 Mar 2006 20:27:40 -0000 1.6 +++ qps.spec 22 Mar 2006 20:47:22 -0000 1.7 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.13 +Version: 1.9.14 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3228/qps-1.9.13.tar.gz +Source0: http://kldp.net/frs/download.php/3267/qps-1.9.14.tar.gz Source1: qps.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %changelog +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +- Update to 1.9.14 + * Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Mar 2006 20:27:40 -0000 1.6 +++ sources 22 Mar 2006 20:47:22 -0000 1.7 @@ -1 +1 @@ -4db5051d7880e3cf427b06319dd55676 qps-1.9.13.tar.gz +6c45c290670e8dc938afad1cd013ef81 qps-1.9.14.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 20:47:28 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 22 Mar 2006 15:47:28 -0500 Subject: rpms/qps/devel .cvsignore,1.6,1.7 qps.spec,1.6,1.7 sources,1.6,1.7 Message-ID: <200603222048.k2MKm0RT003586@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3514/devel Modified Files: .cvsignore qps.spec sources Log Message: Update to 1.9.14 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Mar 2006 20:27:40 -0000 1.6 +++ .cvsignore 22 Mar 2006 20:47:28 -0000 1.7 @@ -1 +1 @@ -qps-1.9.13.tar.gz +qps-1.9.14.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qps.spec 9 Mar 2006 20:27:40 -0000 1.6 +++ qps.spec 22 Mar 2006 20:47:28 -0000 1.7 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.13 +Version: 1.9.14 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3228/qps-1.9.13.tar.gz +Source0: http://kldp.net/frs/download.php/3267/qps-1.9.14.tar.gz Source1: qps.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %changelog +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +- Update to 1.9.14 + * Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Mar 2006 20:27:40 -0000 1.6 +++ sources 22 Mar 2006 20:47:28 -0000 1.7 @@ -1 +1 @@ -4db5051d7880e3cf427b06319dd55676 qps-1.9.13.tar.gz +6c45c290670e8dc938afad1cd013ef81 qps-1.9.14.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 21:17:55 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 22 Mar 2006 16:17:55 -0500 Subject: rpms/gnomad2/devel .cvsignore, 1.4, 1.5 gnomad2.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603222118.k2MLIc2N005867@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5846 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Oct 2005 21:10:32 -0000 1.4 +++ .cvsignore 22 Mar 2006 21:17:54 -0000 1.5 @@ -1 +1 @@ -gnomad2-2.8.2.tar.gz +gnomad2-2.8.3.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/gnomad2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnomad2.spec 14 Feb 2006 16:37:21 -0000 1.5 +++ gnomad2.spec 22 Mar 2006 21:17:54 -0000 1.6 @@ -4,13 +4,13 @@ # test building a Fedora Extras package, define the following # two macros in .rpmmacros: # -# %dist .fc4 -# %fedora 4 +# %dist .fc5 +# %fedora 5 # Name: gnomad2 -Version: 2.8.2 -Release: 2%{?dist} +Version: 2.8.3 +Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs License: GPL @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Tue Feb 14 2006 Linus Walleij 2.8.3-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 - Rebuild for Fedora Extras 5. * Wed Oct 23 2005 Linus Walleij 2.8.2-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Oct 2005 21:10:32 -0000 1.4 +++ sources 22 Mar 2006 21:17:54 -0000 1.5 @@ -1 +1 @@ -c84663cbb45125ad39fe4a2f854de19e gnomad2-2.8.2.tar.gz +cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 21:20:06 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 22 Mar 2006 16:20:06 -0500 Subject: rpms/gnomad2/FC-5 .cvsignore, 1.4, 1.5 gnomad2.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603222120.k2MLKePf005949@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5921 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Oct 2005 21:10:32 -0000 1.4 +++ .cvsignore 22 Mar 2006 21:20:06 -0000 1.5 @@ -1 +1 @@ -gnomad2-2.8.2.tar.gz +gnomad2-2.8.3.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/gnomad2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnomad2.spec 14 Feb 2006 16:37:21 -0000 1.5 +++ gnomad2.spec 22 Mar 2006 21:20:06 -0000 1.6 @@ -4,13 +4,13 @@ # test building a Fedora Extras package, define the following # two macros in .rpmmacros: # -# %dist .fc4 -# %fedora 4 +# %dist .fc5 +# %fedora 5 # Name: gnomad2 -Version: 2.8.2 -Release: 2%{?dist} +Version: 2.8.3 +Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs License: GPL @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Tue Feb 14 2006 Linus Walleij 2.8.3-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 - Rebuild for Fedora Extras 5. * Wed Oct 23 2005 Linus Walleij 2.8.2-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Oct 2005 21:10:32 -0000 1.4 +++ sources 22 Mar 2006 21:20:06 -0000 1.5 @@ -1 +1 @@ -c84663cbb45125ad39fe4a2f854de19e gnomad2-2.8.2.tar.gz +cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 21:22:35 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 22 Mar 2006 16:22:35 -0500 Subject: rpms/gnomad2/FC-4 .cvsignore, 1.4, 1.5 gnomad2.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603222123.k2MLN8UE006084@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6058 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Oct 2005 21:11:23 -0000 1.4 +++ .cvsignore 22 Mar 2006 21:22:35 -0000 1.5 @@ -1 +1 @@ -gnomad2-2.8.2.tar.gz +gnomad2-2.8.3.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/gnomad2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnomad2.spec 23 Oct 2005 21:11:23 -0000 1.4 +++ gnomad2.spec 22 Mar 2006 21:22:35 -0000 1.5 @@ -4,12 +4,12 @@ # test building a Fedora Extras package, define the following # two macros in .rpmmacros: # -# %dist .fc4 -# %fedora 4 +# %dist .fc5 +# %fedora 5 # Name: gnomad2 -Version: 2.8.2 +Version: 2.8.3 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,10 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Tue Feb 14 2006 Linus Walleij 2.8.3-1 +- New upstream version. +* Tue Feb 14 2006 Linus Walleij 2.8.2-2 +- Rebuild for Fedora Extras 5. * Wed Oct 23 2005 Linus Walleij 2.8.2-1 - New upstream realease. * Wed Sep 7 2005 Linus Walleij 2.8.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Oct 2005 21:11:23 -0000 1.4 +++ sources 22 Mar 2006 21:22:35 -0000 1.5 @@ -1 +1 @@ -c84663cbb45125ad39fe4a2f854de19e gnomad2-2.8.2.tar.gz +cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 21:24:25 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 22 Mar 2006 16:24:25 -0500 Subject: rpms/gnomad2/FC-3 .cvsignore, 1.4, 1.5 gnomad2.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603222124.k2MLOv3b006180@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6150 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Oct 2005 21:12:14 -0000 1.4 +++ .cvsignore 22 Mar 2006 21:24:25 -0000 1.5 @@ -1 +1 @@ -gnomad2-2.8.2.tar.gz +gnomad2-2.8.3.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/gnomad2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnomad2.spec 23 Oct 2005 21:12:14 -0000 1.4 +++ gnomad2.spec 22 Mar 2006 21:24:25 -0000 1.5 @@ -4,12 +4,12 @@ # test building a Fedora Extras package, define the following # two macros in .rpmmacros: # -# %dist .fc4 -# %fedora 4 +# %dist .fc5 +# %fedora 5 # Name: gnomad2 -Version: 2.8.2 +Version: 2.8.3 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,10 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Tue Feb 14 2006 Linus Walleij 2.8.3-1 +- New upstream version. +* Tue Feb 14 2006 Linus Walleij 2.8.2-2 +- Rebuild for Fedora Extras 5. * Wed Oct 23 2005 Linus Walleij 2.8.2-1 - New upstream realease. * Wed Sep 7 2005 Linus Walleij 2.8.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Oct 2005 21:12:14 -0000 1.4 +++ sources 22 Mar 2006 21:24:25 -0000 1.5 @@ -1 +1 @@ -c84663cbb45125ad39fe4a2f854de19e gnomad2-2.8.2.tar.gz +cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 23:10:13 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:10:13 -0500 Subject: rpms/dejavu-fonts import.log,1.38,1.39 Message-ID: <200603222310.k2MNAjwg011580@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11546 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4-1.fc6 on branch devel from dejavu-fonts-2.4-1.fc6.src.rpm 2.4 + experimental spit Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- import.log 4 Mar 2006 20:38:47 -0000 1.38 +++ import.log 22 Mar 2006 23:10:06 -0000 1.39 @@ -35,3 +35,4 @@ dejavu-fonts-2_3-1_fc5:HEAD:dejavu-fonts-2.3-1.fc5.src.rpm:1140419864 dejavu-fonts-2_3-2_fc5:HEAD:dejavu-fonts-2.3-2.fc5.src.rpm:1141475016 dejavu-fonts-2_3-3_fc5:HEAD:dejavu-fonts-2.3-3.fc5.src.rpm:1141504717 +dejavu-fonts-2_4-1_fc6:HEAD:dejavu-fonts-2.4-1.fc6.src.rpm:1143068995 From fedora-extras-commits at redhat.com Wed Mar 22 23:10:27 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:10:27 -0500 Subject: rpms/dejavu-fonts/devel .cvsignore, 1.10, 1.11 dejavu-fonts.spec, 1.16, 1.17 sources, 1.10, 1.11 Message-ID: <200603222310.k2MNAxQC011585@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11546/devel Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4-1.fc6 on branch devel from dejavu-fonts-2.4-1.fc6.src.rpm 2.4 + experimental spit Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 Feb 2006 07:18:17 -0000 1.10 +++ .cvsignore 22 Mar 2006 23:10:27 -0000 1.11 @@ -1 +1 @@ -dejavu-sfd-2.3-1.tar.gz +dejavu-sfd-2.4.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dejavu-fonts.spec 4 Mar 2006 20:38:53 -0000 1.16 +++ dejavu-fonts.spec 22 Mar 2006 23:10:27 -0000 1.17 @@ -1,6 +1,6 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion %{version}-1 +%define archiveversion %{version} %define fontdir %{_datadir}/fonts/%{name} %define xsldir %{_datadir}/xml/%{name} @@ -9,9 +9,9 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.3 -Release: 3%{?dist} -Summary: DejaVu Fonts +Version: 2.4 +Release: 1%{?dist} +Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ @@ -34,6 +34,19 @@ the process of collaborative develop +%package experimental +Group: User Interface/X +Summary: Experimental DejaVu typefaces +# Does not really make sense without the core typefaces +Requires: %{name} = %{version}-%{release} + + +%description experimental +The DejaVu fonts are a font family based on the Bitstream Vera Fonts release +1.10. This package includes the typefaces the DejaVu project considers +experimental. + + %package fontconfig Group: User Interface/X Summary: Files needed to register DejaVu fonts in fontconfig aliases @@ -43,7 +56,7 @@ %description fontconfig -This package will add DejaVu fonts to fontconfig aliases +This package will add DejaVu fonts to fontconfig aliases and keep them there. %prep @@ -58,6 +71,9 @@ DejaVuSans.sfd Sans \ DejaVuSerif.sfd Serif \ DejaVuMonoSans.sfd "Sans Mono" > unicover.txt +# We should probably also regenerate langcover.txt +# but it requires resolution of +# https://bugs.freedesktop.org/show_bug.cgi?id=6316 %check @@ -96,6 +112,21 @@ fi +%post experimental +if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts +fi + + +%postun experimental +if [ "$1" = "0" ]; then + if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts + fi +fi + + +# UGLY but safe and I hope won't be necessary soonish %triggerin fontconfig -- fontconfig, %{_sysconfdir}/fonts/fonts.conf if [ -x %{_sysconfdir}/fonts/fonts.conf ] ; then @@ -111,7 +142,16 @@ %doc *.txt AUTHORS BUGS LICENSE NEWS README %dir %{fontdir} -%{fontdir}/*.ttf +%{fontdir}/DejaVu*.ttf +%exclude %{fontdir}/DejaVu*Condensed*.ttf +%exclude %{fontdir}/DejaVu*ExtraLight*.ttf +%exclude %{fontdir}/DejaVuSerif-*Oblique.ttf + +%files experimental +%defattr(0644,root,root,0755) +%{fontdir}/DejaVu*Condensed*.ttf +%{fontdir}/DejaVu*ExtraLight*.ttf +%{fontdir}/DejaVuSerif-*Oblique.ttf %files fontconfig @@ -121,6 +161,10 @@ %changelog +* Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 +- 2.4 A big thanks to Stepan Roh for getting the project there +- split out experimental typefaces + * Sat Mar 04 2006 Nicolas Mailhot - 2.3-3 - split fontconfig registration in subpackage Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Feb 2006 07:18:17 -0000 1.10 +++ sources 22 Mar 2006 23:10:27 -0000 1.11 @@ -1 +1 @@ -b97e72f4823f93dd3c5d65481a303a5d dejavu-sfd-2.3-1.tar.gz +9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 23:17:17 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:17:17 -0500 Subject: rpms/dejavu-fonts import.log,1.39,1.40 Message-ID: <200603222317.k2MNHoTm011759@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11719 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4-1.fc4 on branch FC-4 from dejavu-fonts-2.4-1.fc4.src.rpm 2.4 + experimental spit Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- import.log 22 Mar 2006 23:10:06 -0000 1.39 +++ import.log 22 Mar 2006 23:17:14 -0000 1.40 @@ -36,3 +36,4 @@ dejavu-fonts-2_3-2_fc5:HEAD:dejavu-fonts-2.3-2.fc5.src.rpm:1141475016 dejavu-fonts-2_3-3_fc5:HEAD:dejavu-fonts-2.3-3.fc5.src.rpm:1141504717 dejavu-fonts-2_4-1_fc6:HEAD:dejavu-fonts-2.4-1.fc6.src.rpm:1143068995 +dejavu-fonts-2_4-1_fc4:FC-4:dejavu-fonts-2.4-1.fc4.src.rpm:1143069423 From fedora-extras-commits at redhat.com Wed Mar 22 23:17:37 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:17:37 -0500 Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.10, 1.11 dejavu-fonts.spec, 1.11, 1.12 sources, 1.10, 1.11 Message-ID: <200603222318.k2MNI9Bf011764@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11719/FC-4 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4-1.fc4 on branch FC-4 from dejavu-fonts-2.4-1.fc4.src.rpm 2.4 + experimental spit Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 Feb 2006 07:18:33 -0000 1.10 +++ .cvsignore 22 Mar 2006 23:17:37 -0000 1.11 @@ -1 +1 @@ -dejavu-sfd-2.3-1.tar.gz +dejavu-sfd-2.4.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dejavu-fonts.spec 20 Feb 2006 07:18:33 -0000 1.11 +++ dejavu-fonts.spec 22 Mar 2006 23:17:37 -0000 1.12 @@ -1,16 +1,16 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion %{version}-1 -%define fontdir %{_datadir}/fonts/dejavu +%define archiveversion %{version} +%define fontdir %{_datadir}/fonts/%{name} # Let the perl Maintainer worry about Unicode.org data files (updates, licensing) %define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.3 +Version: 2.4 Release: 1%{?dist} -Summary: DejaVu Fonts +Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ @@ -31,6 +31,19 @@ the process of collaborative develop +%package experimental +Group: User Interface/X +Summary: Experimental DejaVu typefaces +# Does not really make sense without the core typefaces +Requires: %{name} = %{version}-%{release} + + +%description experimental +The DejaVu fonts are a font family based on the Bitstream Vera Fonts release +1.10. This package includes the typefaces the DejaVu project considers +experimental. + + %prep %setup -q -n %{archivename}-%{version} @@ -80,16 +93,44 @@ fi +%post experimental +if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts +fi + + +%postun experimental +if [ "$1" = "0" ]; then + if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts + fi +fi + + %files %defattr(0644,root,root,0755) %doc *.txt AUTHORS BUGS LICENSE NEWS README - %dir %{fontdir} -%{fontdir}/*.ttf %ghost %{fontdir}/fonts.cache-1 +%{fontdir}/DejaVu*.ttf +%exclude %{fontdir}/DejaVu*Condensed*.ttf +%exclude %{fontdir}/DejaVu*ExtraLight*.ttf +%exclude %{fontdir}/DejaVuSerif-*Oblique.ttf + + +%files experimental +%defattr(0644,root,root,0755) +%{fontdir}/DejaVu*Condensed*.ttf +%{fontdir}/DejaVu*ExtraLight*.ttf +%{fontdir}/DejaVuSerif-*Oblique.ttf + %changelog +* Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 +- 2.4 A big thanks to Stepan Roh for getting the project there +- split out experimental typefaces + * Mon Feb 20 2006 Nicolas Mailhot - 2.3-1 - 2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Feb 2006 07:18:33 -0000 1.10 +++ sources 22 Mar 2006 23:17:37 -0000 1.11 @@ -1 +1 @@ -b97e72f4823f93dd3c5d65481a303a5d dejavu-sfd-2.3-1.tar.gz +9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 23:31:03 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:31:03 -0500 Subject: rpms/dejavu-fonts import.log,1.40,1.41 Message-ID: <200603222331.k2MNVZgJ011897@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4-1.fc5 on branch FC-5 from dejavu-fonts-2.4-1.fc5.src.rpm 2.4 + experimental spit Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- import.log 22 Mar 2006 23:17:14 -0000 1.40 +++ import.log 22 Mar 2006 23:31:03 -0000 1.41 @@ -37,3 +37,4 @@ dejavu-fonts-2_3-3_fc5:HEAD:dejavu-fonts-2.3-3.fc5.src.rpm:1141504717 dejavu-fonts-2_4-1_fc6:HEAD:dejavu-fonts-2.4-1.fc6.src.rpm:1143068995 dejavu-fonts-2_4-1_fc4:FC-4:dejavu-fonts-2.4-1.fc4.src.rpm:1143069423 +dejavu-fonts-2_4-1_fc5:FC-5:dejavu-fonts-2.4-1.fc5.src.rpm:1143070240 From fedora-extras-commits at redhat.com Wed Mar 22 23:31:11 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:31:11 -0500 Subject: rpms/dejavu-fonts/FC-5 .cvsignore, 1.10, 1.11 dejavu-fonts.spec, 1.16, 1.17 sources, 1.10, 1.11 Message-ID: <200603222331.k2MNVhXY011902@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842/FC-5 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4-1.fc5 on branch FC-5 from dejavu-fonts-2.4-1.fc5.src.rpm 2.4 + experimental spit Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 Feb 2006 07:18:17 -0000 1.10 +++ .cvsignore 22 Mar 2006 23:31:11 -0000 1.11 @@ -1 +1 @@ -dejavu-sfd-2.3-1.tar.gz +dejavu-sfd-2.4.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dejavu-fonts.spec 4 Mar 2006 20:38:53 -0000 1.16 +++ dejavu-fonts.spec 22 Mar 2006 23:31:11 -0000 1.17 @@ -1,6 +1,6 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion %{version}-1 +%define archiveversion %{version} %define fontdir %{_datadir}/fonts/%{name} %define xsldir %{_datadir}/xml/%{name} @@ -9,9 +9,9 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.3 -Release: 3%{?dist} -Summary: DejaVu Fonts +Version: 2.4 +Release: 1%{?dist} +Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ @@ -34,6 +34,19 @@ the process of collaborative develop +%package experimental +Group: User Interface/X +Summary: Experimental DejaVu typefaces +# Does not really make sense without the core typefaces +Requires: %{name} = %{version}-%{release} + + +%description experimental +The DejaVu fonts are a font family based on the Bitstream Vera Fonts release +1.10. This package includes the typefaces the DejaVu project considers +experimental. + + %package fontconfig Group: User Interface/X Summary: Files needed to register DejaVu fonts in fontconfig aliases @@ -43,7 +56,7 @@ %description fontconfig -This package will add DejaVu fonts to fontconfig aliases +This package will add DejaVu fonts to fontconfig aliases and keep them there. %prep @@ -58,6 +71,9 @@ DejaVuSans.sfd Sans \ DejaVuSerif.sfd Serif \ DejaVuMonoSans.sfd "Sans Mono" > unicover.txt +# We should probably also regenerate langcover.txt +# but it requires resolution of +# https://bugs.freedesktop.org/show_bug.cgi?id=6316 %check @@ -96,6 +112,21 @@ fi +%post experimental +if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts +fi + + +%postun experimental +if [ "$1" = "0" ]; then + if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts + fi +fi + + +# UGLY but safe and I hope won't be necessary soonish %triggerin fontconfig -- fontconfig, %{_sysconfdir}/fonts/fonts.conf if [ -x %{_sysconfdir}/fonts/fonts.conf ] ; then @@ -111,7 +142,16 @@ %doc *.txt AUTHORS BUGS LICENSE NEWS README %dir %{fontdir} -%{fontdir}/*.ttf +%{fontdir}/DejaVu*.ttf +%exclude %{fontdir}/DejaVu*Condensed*.ttf +%exclude %{fontdir}/DejaVu*ExtraLight*.ttf +%exclude %{fontdir}/DejaVuSerif-*Oblique.ttf + +%files experimental +%defattr(0644,root,root,0755) +%{fontdir}/DejaVu*Condensed*.ttf +%{fontdir}/DejaVu*ExtraLight*.ttf +%{fontdir}/DejaVuSerif-*Oblique.ttf %files fontconfig @@ -121,6 +161,10 @@ %changelog +* Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 +- 2.4 A big thanks to Stepan Roh for getting the project there +- split out experimental typefaces + * Sat Mar 04 2006 Nicolas Mailhot - 2.3-3 - split fontconfig registration in subpackage Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Feb 2006 07:18:17 -0000 1.10 +++ sources 22 Mar 2006 23:31:11 -0000 1.11 @@ -1 +1 @@ -b97e72f4823f93dd3c5d65481a303a5d dejavu-sfd-2.3-1.tar.gz +9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 02:20:01 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 22 Mar 2006 21:20:01 -0500 Subject: rpms/cpanspec/devel .cvsignore, 1.4, 1.5 cpanspec.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603230220.k2N2KXSM018319@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18298 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.62. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Mar 2006 20:49:03 -0000 1.4 +++ .cvsignore 23 Mar 2006 02:20:00 -0000 1.5 @@ -1 +1 @@ -cpanspec-1.61.tar.gz +cpanspec-1.62.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cpanspec.spec 11 Mar 2006 20:49:03 -0000 1.3 +++ cpanspec.spec 23 Mar 2006 02:20:00 -0000 1.4 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.61 +Version: 1.62 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 22 2006 Steven Pritchard 1.62-1 +- Update to 1.62. + * Sat Mar 11 2006 Steven Pritchard 1.61-1 - Update to 1.61. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Mar 2006 20:49:03 -0000 1.4 +++ sources 23 Mar 2006 02:20:00 -0000 1.5 @@ -1 +1 @@ -69df0b4f1a1fe4efd469c212cd8cb983 cpanspec-1.61.tar.gz +0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 02:24:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 22 Mar 2006 21:24:24 -0500 Subject: rpms/cpanspec/FC-5 .cvsignore, 1.4, 1.5 cpanspec.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603230224.k2N2OuOh018433@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18412 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.62. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Mar 2006 20:49:03 -0000 1.4 +++ .cvsignore 23 Mar 2006 02:24:24 -0000 1.5 @@ -1 +1 @@ -cpanspec-1.61.tar.gz +cpanspec-1.62.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cpanspec.spec 11 Mar 2006 20:49:03 -0000 1.3 +++ cpanspec.spec 23 Mar 2006 02:24:24 -0000 1.4 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.61 +Version: 1.62 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 22 2006 Steven Pritchard 1.62-1 +- Update to 1.62. + * Sat Mar 11 2006 Steven Pritchard 1.61-1 - Update to 1.61. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Mar 2006 20:49:03 -0000 1.4 +++ sources 23 Mar 2006 02:24:24 -0000 1.5 @@ -1 +1 @@ -69df0b4f1a1fe4efd469c212cd8cb983 cpanspec-1.61.tar.gz +0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 02:25:52 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 22 Mar 2006 21:25:52 -0500 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.4, 1.5 cpanspec.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603230226.k2N2QONP018514@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18486 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.62. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Mar 2006 21:19:46 -0000 1.4 +++ .cvsignore 23 Mar 2006 02:25:52 -0000 1.5 @@ -1 +1 @@ -cpanspec-1.61.tar.gz +cpanspec-1.62.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cpanspec.spec 11 Mar 2006 21:19:46 -0000 1.3 +++ cpanspec.spec 23 Mar 2006 02:25:52 -0000 1.4 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.61 +Version: 1.62 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 22 2006 Steven Pritchard 1.62-1 +- Update to 1.62. + * Sat Mar 11 2006 Steven Pritchard 1.61-1 - Update to 1.61. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Mar 2006 21:19:46 -0000 1.4 +++ sources 23 Mar 2006 02:25:52 -0000 1.5 @@ -1 +1 @@ -69df0b4f1a1fe4efd469c212cd8cb983 cpanspec-1.61.tar.gz +0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 02:36:22 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 22 Mar 2006 21:36:22 -0500 Subject: rpms/glibmm24/devel .cvsignore, 1.7, 1.8 glibmm.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200603230236.k2N2atlt018602@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18581 Modified Files: .cvsignore glibmm.spec sources Log Message: Update to 2.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Feb 2006 22:01:59 -0000 1.7 +++ .cvsignore 23 Mar 2006 02:36:22 -0000 1.8 @@ -1 +1 @@ -glibmm-2.8.4.tar.bz2 +glibmm-2.10.0.tar.bz2 Index: glibmm.spec =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- glibmm.spec 28 Feb 2006 22:02:00 -0000 1.10 +++ glibmm.spec 23 Mar 2006 02:36:22 -0000 1.11 @@ -1,5 +1,5 @@ Name: glibmm24 -Version: 2.8.4 +Version: 2.10.0 Release: 1 Summary: C++ interface for GTK2 (a GUI library for X) @@ -12,7 +12,7 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: libsigc++20-devel >= 2.0.0 -BuildRequires: glib2-devel >= 2.8.0 +BuildRequires: glib2-devel >= 2.9.0 %description gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2. @@ -77,6 +77,9 @@ %{_datadir}/aclocal/*.m4 %changelog +* Mon Mar 20 2006 Denis Leroy - 2.10.0-1 +- Update to 2.10.0, requires newer glib + * Tue Feb 28 2006 Denis Leroy - 2.8.4-1 - Update to 2.8.4 - Added optional macro to enable static libs Index: sources =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 28 Feb 2006 22:02:00 -0000 1.8 +++ sources 23 Mar 2006 02:36:22 -0000 1.9 @@ -1 +1 @@ -952cdde2d6aef201c528d431036d71e1 glibmm-2.8.4.tar.bz2 +3024ad2b8f8fd4f512e1f58d087599bb glibmm-2.10.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 23 06:06:56 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 23 Mar 2006 01:06:56 -0500 Subject: rpms/anthy/devel Makefile, 1.1, NONE anthy-init.el, 1.1, NONE anthy.spec, 1.9, NONE sources, 1.5, NONE Message-ID: <200603230607.k2N671x6026802@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26795 Removed Files: Makefile anthy-init.el anthy.spec sources Log Message: removed. --- Makefile DELETED --- --- anthy-init.el DELETED --- --- anthy.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Mar 23 06:19:41 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 23 Mar 2006 01:19:41 -0500 Subject: rpms/anthy/devel README,NONE,1.1 Message-ID: <200603230619.k2N6JhD8026885@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26875 Added Files: README Log Message: --- NEW FILE README --- anthy has moved to Fedora Core development. From fedora-extras-commits at redhat.com Thu Mar 23 06:33:58 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 23 Mar 2006 01:33:58 -0500 Subject: rpms/apt/devel fedora-core.list, NONE, 1.1 fedora-extras.list, NONE, 1.1 fedora-updates.list, NONE, 1.1 .cvsignore, 1.5, 1.6 apt.spec, 1.20, 1.21 default.conf, 1.7, 1.8 sources, 1.5, 1.6 gpg-pubkey-1ac70ce6-41bebeef, 1.1, NONE gpg-pubkey-4f2a6fd2-3f9d9d3b, 1.1, NONE gpg-pubkey-db42a60e-37ea5438, 1.1, NONE Message-ID: <200603230634.k2N6YU45026989@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26963 Modified Files: .cvsignore apt.spec default.conf sources Added Files: fedora-core.list fedora-extras.list fedora-updates.list Removed Files: gpg-pubkey-1ac70ce6-41bebeef gpg-pubkey-4f2a6fd2-3f9d9d3b gpg-pubkey-db42a60e-37ea5438 Log Message: * Wed Mar 22 2006 Ville Skytt?? - 0.5.15lorg3-0.2.pre2 - Don't ship our copies of GPG keys, use ones in /etc/pki/rpm-gpg instead. - Don't import the "Old RHL key" by default. * Wed Mar 22 2006 Panu Matilainen - 0.5.15lorg333-pre2 - set distroverpkg to fedora-release - add distro version and arch independent default source list entries for fedora core, extras + updates - remove old nasty fedora.us-time hacks from post scriptlets --- NEW FILE fedora-core.list --- # Fedora Core repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/os/ # Debug packages # repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/debug/ # sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/source/SRPMS/ --- NEW FILE fedora-extras.list --- # Fedora Extras repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/ # Debug packages # repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/debug/ # Sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/SRPMS/ --- NEW FILE fedora-updates.list --- # Fedora Core repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/ # Debug packages #repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/debug/ # sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/SRPMS/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Mar 2006 20:52:50 -0000 1.5 +++ .cvsignore 23 Mar 2006 06:33:58 -0000 1.6 @@ -1 +1 @@ -apt-0.5.15lorg3-pre1.tar.bz2 +apt-0.5.15lorg3-pre2.tar.bz2 Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- apt.spec 19 Mar 2006 21:21:54 -0000 1.20 +++ apt.spec 23 Mar 2006 06:33:58 -0000 1.21 @@ -6,12 +6,12 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3 -Release: 0.2.pre1%{?dist} +Release: 0.2.pre2%{?dist} Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm License: GPL -Source0: http://laiskiainen.org/apt/testing/apt-0.5.15lorg3-pre1.tar.bz2 +Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}-pre2.tar.bz2 # user editable template configs Source1: apt.conf @@ -33,19 +33,15 @@ Source51: upgradevirt.lua # 100-149 for sources.list.d -# no default entry for fedora at all +Source100: fedora-core.list +Source101: fedora-extras.list +Source102: fedora-updates.list # 150-199 for apt.conf.d # "factory defaults" for Fedora Core + Extras Source150: default.conf -# 200-249 for trusted gpg keys -# Fedora key -Source200: gpg-pubkey-4f2a6fd2-3f9d9d3b -# "Old" RHL key -Source202: gpg-pubkey-db42a60e-37ea5438 -# Fedora Extras key -Source203: gpg-pubkey-1ac70ce6-41bebeef +# 200-249 for additional trusted gpg keys # 250-299 for vendor.list.d Source250: fedora-vendor.list @@ -74,6 +70,7 @@ Requires: bzip2 # wget needed by the mirror-selector script Requires: wget +Requires: fedora-release >= 5 Requires(post): chkconfig Requires(post): ldconfig Requires(preun): chkconfig @@ -129,7 +126,7 @@ %prep -%setup -q -n %{name}-%{version}-pre1 +%setup -q -n %{name}-%{version}-pre2 # fix docs to reference correct paths perl -pi -e \ @@ -181,6 +178,11 @@ install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/ +# Default source list entries +for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do + install -pm 644 $source $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d/ +done + # install config parts install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/ install -pm 644 %{SOURCE250} \ @@ -188,9 +190,10 @@ # GPG keys mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ -for gpgkey in %{SOURCE200} %{SOURCE202} %{SOURCE203} ; do - install -pm 644 $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ -done +ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \ + $RPM_BUILD_ROOT%{_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 # Lua scripts mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts @@ -227,22 +230,8 @@ %clean rm -rf $RPM_BUILD_ROOT - -%pre -if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then - mv -f %{_sysconfdir}/apt/apt.conf %{_sysconfdir}/apt/apt.conf.rpmsave - echo "NOTE: Default configuration changed!" - echo "If you have made any changes to the configuration locally," - echo "Merge your local customizations from %{_sysconfdir}/apt/apt.conf.rpmsave" - echo "to %{_sysconfdir}/apt/apt.conf" -fi - %post /sbin/ldconfig -if [ ! -f %{_sysconfdir}/apt/apt.conf ] ; then - echo "// User customizable configuration goes here" \ - > %{_sysconfdir}/apt/apt.conf -fi /sbin/chkconfig --add apt %preun @@ -322,6 +311,17 @@ %changelog +* Wed Mar 22 2006 Ville Skytt?? - 0.5.15lorg3-0.2.pre2 +- Don't ship our copies of GPG keys, use ones in /etc/pki/rpm-gpg instead. +- Don't import the "Old RHL key" by default. + +* Wed Mar 22 2006 Panu Matilainen +- 0.5.15lorg3-pre2 +- set distroverpkg to fedora-release +- add distro version and arch independent default source list entries for + 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 - Fix Allow-Duplicated* default.conf bugs introduced in previous version. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- default.conf 19 Mar 2006 21:21:54 -0000 1.7 +++ default.conf 23 Mar 2006 06:33:58 -0000 1.8 @@ -17,6 +17,7 @@ { AllNames "false"; } + DistroVerPkg "fedora-release"; }; RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/apt/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Mar 2006 20:52:50 -0000 1.5 +++ sources 23 Mar 2006 06:33:58 -0000 1.6 @@ -1 +1 @@ -5c6b3f37374d266e89805a2912d11fb6 apt-0.5.15lorg3-pre1.tar.bz2 +530456d62eb62d980ebb0d057260a7f1 apt-0.5.15lorg3-pre2.tar.bz2 --- gpg-pubkey-1ac70ce6-41bebeef DELETED --- --- gpg-pubkey-4f2a6fd2-3f9d9d3b DELETED --- --- gpg-pubkey-db42a60e-37ea5438 DELETED --- From fedora-extras-commits at redhat.com Thu Mar 23 08:05:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 03:05:39 -0500 Subject: rpms/fnfx/FC-5 fnfx-sleep.patch,NONE,1.1 fnfx.spec,1.4,1.5 Message-ID: <200603230806.k2N86BQY031069@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fnfx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31030/FC-5 Modified Files: fnfx.spec Added Files: fnfx-sleep.patch Log Message: - add patch from Radek B??ba to allow fnfx to work again fnfx-sleep.patch: --- NEW FILE fnfx-sleep.patch --- --- fnfx-0.3/src/fnfxd_cmds.c.syspowerstate 2006-03-22 20:23:33.000000000 +0100 +++ fnfx-0.3/src/fnfxd_cmds.c 2006-03-22 20:25:38.000000000 +0100 @@ -362,9 +362,9 @@ } else { if (state == 3) - fprintf(f, "%d", state); + fprintf(f, "mem"); else if (state == 4) - fprintf(f, "%d", state); + fprintf(f, "disk"); else { debug("suspend() - Not supported sleep state."); return 1; --- fnfx-0.3/src/fnfx.h.syspowerstate 2006-03-22 20:23:10.000000000 +0100 +++ fnfx-0.3/src/fnfx.h 2006-03-22 20:24:21.000000000 +0100 @@ -50,7 +50,7 @@ #define ACPI_LCD "/proc/acpi/toshiba/lcd" #define ACPI_VERSION "/proc/acpi/toshiba/version" #define ACPI_VIDEO "/proc/acpi/toshiba/video" -#define ACPI_SLEEP "/proc/acpi/sleep" +#define ACPI_SLEEP "/sys/power/state" #define ACPI_CPU "/proc/acpi/processor/CPU0/limit" #define ACPI_BLUETOOTH "/proc/acpi/toshiba/bluetooth" Index: fnfx.spec =================================================================== RCS file: /cvs/extras/rpms/fnfx/FC-5/fnfx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fnfx.spec 14 Feb 2006 08:57:24 -0000 1.4 +++ fnfx.spec 23 Mar 2006 08:05:37 -0000 1.5 @@ -1,6 +1,6 @@ Name: fnfx Version: 0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Hotkey functions for Toshiba laptops Group: System Environment/Daemons @@ -8,6 +8,7 @@ URL: http://fnfx.sourceforge.net Source0: http://dl.sf.net/fnfx/fnfx-%{version}.tar.gz Source1: fnfx-fnfxd +Patch0: fnfx-sleep.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -63,6 +65,10 @@ %exclude %{_sysconfdir}/fnfx/fnfxrc_example %changelog +* Thu Mar 23 2006 Andreas Bierfert +0.3-7 +- add patch from Radek B??ba to allow fnfx to work again + * Tue Feb 14 2006 Andreas Bierfert 0.3-6 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Thu Mar 23 08:05:59 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 03:05:59 -0500 Subject: rpms/fnfx/devel fnfx-sleep.patch,NONE,1.1 fnfx.spec,1.4,1.5 Message-ID: <200603230806.k2N86bxs031072@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fnfx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31030/devel Modified Files: fnfx.spec Added Files: fnfx-sleep.patch Log Message: - add patch from Radek B??ba to allow fnfx to work again fnfx-sleep.patch: --- NEW FILE fnfx-sleep.patch --- --- fnfx-0.3/src/fnfxd_cmds.c.syspowerstate 2006-03-22 20:23:33.000000000 +0100 +++ fnfx-0.3/src/fnfxd_cmds.c 2006-03-22 20:25:38.000000000 +0100 @@ -362,9 +362,9 @@ } else { if (state == 3) - fprintf(f, "%d", state); + fprintf(f, "mem"); else if (state == 4) - fprintf(f, "%d", state); + fprintf(f, "disk"); else { debug("suspend() - Not supported sleep state."); return 1; --- fnfx-0.3/src/fnfx.h.syspowerstate 2006-03-22 20:23:10.000000000 +0100 +++ fnfx-0.3/src/fnfx.h 2006-03-22 20:24:21.000000000 +0100 @@ -50,7 +50,7 @@ #define ACPI_LCD "/proc/acpi/toshiba/lcd" #define ACPI_VERSION "/proc/acpi/toshiba/version" #define ACPI_VIDEO "/proc/acpi/toshiba/video" -#define ACPI_SLEEP "/proc/acpi/sleep" +#define ACPI_SLEEP "/sys/power/state" #define ACPI_CPU "/proc/acpi/processor/CPU0/limit" #define ACPI_BLUETOOTH "/proc/acpi/toshiba/bluetooth" Index: fnfx.spec =================================================================== RCS file: /cvs/extras/rpms/fnfx/devel/fnfx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fnfx.spec 14 Feb 2006 08:57:24 -0000 1.4 +++ fnfx.spec 23 Mar 2006 08:05:59 -0000 1.5 @@ -1,6 +1,6 @@ Name: fnfx Version: 0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Hotkey functions for Toshiba laptops Group: System Environment/Daemons @@ -8,6 +8,7 @@ URL: http://fnfx.sourceforge.net Source0: http://dl.sf.net/fnfx/fnfx-%{version}.tar.gz Source1: fnfx-fnfxd +Patch0: fnfx-sleep.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -63,6 +65,10 @@ %exclude %{_sysconfdir}/fnfx/fnfxrc_example %changelog +* Thu Mar 23 2006 Andreas Bierfert +0.3-7 +- add patch from Radek B??ba to allow fnfx to work again + * Tue Feb 14 2006 Andreas Bierfert 0.3-6 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Thu Mar 23 09:21:46 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 04:21:46 -0500 Subject: rpms/libetpan/FC-5 .cvsignore, 1.7, 1.8 libetpan.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <200603230922.k2N9MIYu001458@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1410/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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Feb 2006 08:52:44 -0000 1.7 +++ .cvsignore 23 Mar 2006 09:21:43 -0000 1.8 @@ -1 +1 @@ -libetpan-0.42.tar.gz +libetpan-0.45.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-5/libetpan.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libetpan.spec 15 Feb 2006 08:32:18 -0000 1.8 +++ libetpan.spec 23 Mar 2006 09:21:43 -0000 1.9 @@ -1,6 +1,6 @@ Name: libetpan -Version: 0.42 -Release: 2%{?dist} +Version: 0.45 +Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries @@ -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.6.0.1 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.6.1.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Thu Mar 23 2006 Andreas Bierfert +0.45-1 +- version upgrade + * Wed Feb 15 2006 Andreas Bierfert 0.42-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Feb 2006 08:52:44 -0000 1.7 +++ sources 23 Mar 2006 09:21:43 -0000 1.8 @@ -1 +1 @@ -269c275151bbb9c3e818b58863cca670 libetpan-0.42.tar.gz +0135cf6a9d97afb1f75001f514448836 libetpan-0.45.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 09:21:54 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 04:21:54 -0500 Subject: rpms/libetpan/devel .cvsignore, 1.7, 1.8 libetpan.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <200603230922.k2N9MQtY001463@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1410/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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Feb 2006 08:52:44 -0000 1.7 +++ .cvsignore 23 Mar 2006 09:21:54 -0000 1.8 @@ -1 +1 @@ -libetpan-0.42.tar.gz +libetpan-0.45.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libetpan.spec 15 Feb 2006 08:32:18 -0000 1.8 +++ libetpan.spec 23 Mar 2006 09:21:54 -0000 1.9 @@ -1,6 +1,6 @@ Name: libetpan -Version: 0.42 -Release: 2%{?dist} +Version: 0.45 +Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries @@ -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.6.0.1 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.6.1.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Thu Mar 23 2006 Andreas Bierfert +0.45-1 +- version upgrade + * Wed Feb 15 2006 Andreas Bierfert 0.42-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Feb 2006 08:52:44 -0000 1.7 +++ sources 23 Mar 2006 09:21:54 -0000 1.8 @@ -1 +1 @@ -269c275151bbb9c3e818b58863cca670 libetpan-0.42.tar.gz +0135cf6a9d97afb1f75001f514448836 libetpan-0.45.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 09:41:23 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 23 Mar 2006 04:41:23 -0500 Subject: rpms/pikdev/FC-4 pikdev.spec,1.3,1.4 Message-ID: <200603230941.k2N9fuKH001613@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1596 Modified Files: pikdev.spec Log Message: Try to fix x86_64 build failure by adding BR qt-devel Index: pikdev.spec =================================================================== RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pikdev.spec 15 Mar 2006 15:16:41 -0000 1.3 +++ pikdev.spec 23 Mar 2006 09:41:22 -0000 1.4 @@ -1,6 +1,6 @@ Name: pikdev Version: 0.8.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC @@ -13,7 +13,7 @@ Source3: LISEZMOI.Fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, kdelibs-devel +BuildRequires: desktop-file-utils, kdelibs-devel, qt-devel Requires: gputils @@ -59,8 +59,6 @@ %build -[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh - %configure --disable-rpath rm -rf pkp @@ -104,6 +102,9 @@ %{_datadir}/icons/* %changelog +* Thu Mar 23 2006 Alain Portal 0.8.4-6 + - $QTDIR is set. So, remove the previous change + - Try to fix x86_64 build failure by adding BR qt-devel * Wed Mar 15 2006 Alain Portal 0.8.4-5 - Source qt.sh if $QTDIR isn't set. Always Ralf... * Wed Mar 15 2006 Alain Portal 0.8.4-4 @@ -115,13 +116,13 @@ Thanks to him. * Wed Mar 08 2006 Alain Portal 0.8.4-3 - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5 - - Package must own %{_datadir}/apps/%{name} directory + - Package must own %%{_datadir}/apps/%%{name} directory * Tue Jan 31 2006 Alain Portal 0.8.4-2 - Don't use the precompiled version of pkp * Mon Jan 30 2006 Alain Portal 0.8.4-1 - New upstream version * Tue Jan 10 2006 Alain Portal 0.8.2-2 - - Add the %{?dist} macro + - Add the %%{?dist} macro * Fri Dec 16 2005 Alain Portal 0.8.2-1 - New version - Add french summary and description From fedora-extras-commits at redhat.com Thu Mar 23 10:00:05 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 23 Mar 2006 05:00:05 -0500 Subject: rpms/pikdev/FC-4 pikdev.spec,1.4,1.5 Message-ID: <200603231000.k2NA0bkw001743@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1725 Modified Files: pikdev.spec Log Message: Previous try don't fix. So, definitely ExcludeArch x86_64 on FC-4 Index: pikdev.spec =================================================================== RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pikdev.spec 23 Mar 2006 09:41:22 -0000 1.4 +++ pikdev.spec 23 Mar 2006 10:00:04 -0000 1.5 @@ -1,6 +1,6 @@ Name: pikdev Version: 0.8.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC @@ -13,11 +13,12 @@ Source3: LISEZMOI.Fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, kdelibs-devel, qt-devel +BuildRequires: desktop-file-utils, kdelibs-devel Requires: gputils ExcludeArch: ppc +ExcludeArch: x86_64 # Only for FC-4 %description PiKdev is a simple IDE dedicated to the development of PIC @@ -102,6 +103,9 @@ %{_datadir}/icons/* %changelog +* Thu Mar 23 2006 Alain Portal 0.8.4-7 + - No fix. So, remove the previous change + - Definitely exclude arch x86_64 for FC-4 * Thu Mar 23 2006 Alain Portal 0.8.4-6 - $QTDIR is set. So, remove the previous change - Try to fix x86_64 build failure by adding BR qt-devel From fedora-extras-commits at redhat.com Thu Mar 23 12:26:43 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 23 Mar 2006 07:26:43 -0500 Subject: rpms/exim/FC-4 exim-4.60-mon-overflow.patch, NONE, 1.1 exim.spec, 1.10, 1.11 Message-ID: <200603231227.k2NCRFVu008209@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8188 Modified Files: exim.spec Added Files: exim-4.60-mon-overflow.patch Log Message: fix #186303 exim-4.60-mon-overflow.patch: --- NEW FILE exim-4.60-mon-overflow.patch --- --- exim-4.60/exim_monitor/em_queue.c~ 2005-11-28 10:57:32.000000000 +0000 +++ exim-4.60/exim_monitor/em_queue.c 2006-03-23 12:23:20.000000000 +0000 @@ -500,7 +500,7 @@ for (i = 0; i < subdir_max; i++) uschar basename[SPOOL_NAME_LENGTH]; stripchart_total[0]++; if (!eximon_initialized) { printf("."); fflush(stdout); } - Ustrcpy(basename, name); + Ustrncpy(basename, name, SPOOL_NAME_LENGTH - 2); basename[SPOOL_NAME_LENGTH - 2] = 0; if (full) find_queue(basename, queue_add, subdirchar); } Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- exim.spec 21 Mar 2006 10:25:36 -0000 1.10 +++ exim.spec 23 Mar 2006 12:26:42 -0000 1.11 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -25,6 +25,7 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch +Patch16: exim-4.60-mon-overflow.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel pam-devel @@ -78,6 +79,7 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre +%patch16 -p1 %build %ifnarch s390 s390x @@ -286,6 +288,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Thu Mar 23 2006 David Woodhouse 4.60-5 +- Fix eximon buffer overflow (#186303) + * Tue Mar 21 2006 David Woodhouse 4.60-4 - Actually enable Postgres From fedora-extras-commits at redhat.com Thu Mar 23 12:27:47 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 23 Mar 2006 07:27:47 -0500 Subject: rpms/exim/FC-5 exim-4.60-mon-overflow.patch, NONE, 1.1 exim.spec, 1.15, 1.16 Message-ID: <200603231228.k2NCSJSZ008270@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8250 Modified Files: exim.spec Added Files: exim-4.60-mon-overflow.patch Log Message: fix #186303 exim-4.60-mon-overflow.patch: --- NEW FILE exim-4.60-mon-overflow.patch --- --- exim-4.60/exim_monitor/em_queue.c~ 2005-11-28 10:57:32.000000000 +0000 +++ exim-4.60/exim_monitor/em_queue.c 2006-03-23 12:23:20.000000000 +0000 @@ -500,7 +500,7 @@ for (i = 0; i < subdir_max; i++) uschar basename[SPOOL_NAME_LENGTH]; stripchart_total[0]++; if (!eximon_initialized) { printf("."); fflush(stdout); } - Ustrcpy(basename, name); + Ustrncpy(basename, name, SPOOL_NAME_LENGTH - 2); basename[SPOOL_NAME_LENGTH - 2] = 0; if (full) find_queue(basename, queue_add, subdirchar); } Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- exim.spec 21 Mar 2006 10:26:51 -0000 1.15 +++ exim.spec 23 Mar 2006 12:27:47 -0000 1.16 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -25,6 +25,7 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch +Patch16: exim-4.60-mon-overflow.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel pam-devel @@ -79,6 +80,7 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre +%patch16 -p1 %build %ifnarch s390 s390x @@ -287,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Thu Mar 23 2006 David Woodhouse 4.60-5 +- Fix eximon buffer overflow (#186303) + * Tue Mar 21 2006 David Woodhouse 4.60-4 - Actually enable Postgres From fedora-extras-commits at redhat.com Thu Mar 23 12:28:38 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 23 Mar 2006 07:28:38 -0500 Subject: rpms/exim/devel exim-4.60-mon-overflow.patch, NONE, 1.1 exim.spec, 1.15, 1.16 Message-ID: <200603231229.k2NCTB4t008326@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8302 Modified Files: exim.spec Added Files: exim-4.60-mon-overflow.patch Log Message: fix #186303 exim-4.60-mon-overflow.patch: --- NEW FILE exim-4.60-mon-overflow.patch --- --- exim-4.60/exim_monitor/em_queue.c~ 2005-11-28 10:57:32.000000000 +0000 +++ exim-4.60/exim_monitor/em_queue.c 2006-03-23 12:23:20.000000000 +0000 @@ -500,7 +500,7 @@ for (i = 0; i < subdir_max; i++) uschar basename[SPOOL_NAME_LENGTH]; stripchart_total[0]++; if (!eximon_initialized) { printf("."); fflush(stdout); } - Ustrcpy(basename, name); + Ustrncpy(basename, name, SPOOL_NAME_LENGTH - 2); basename[SPOOL_NAME_LENGTH - 2] = 0; if (full) find_queue(basename, queue_add, subdirchar); } Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- exim.spec 21 Mar 2006 10:29:09 -0000 1.15 +++ exim.spec 23 Mar 2006 12:28:38 -0000 1.16 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -25,6 +25,7 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch +Patch16: exim-4.60-mon-overflow.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel pam-devel @@ -79,6 +80,7 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre +%patch16 -p1 %build %ifnarch s390 s390x @@ -287,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Thu Mar 23 2006 David Woodhouse 4.60-5 +- Fix eximon buffer overflow (#186303) + * Tue Mar 21 2006 David Woodhouse 4.60-4 - Actually enable Postgres From fedora-extras-commits at redhat.com Thu Mar 23 13:32:29 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 23 Mar 2006 08:32:29 -0500 Subject: rpms/muine/FC-5 muine.spec,1.1,1.2 Message-ID: <200603231333.k2NDX1Em010484@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10467 Modified Files: muine.spec Log Message: Add missing mono-web dependency Index: muine.spec =================================================================== RCS file: /cvs/extras/rpms/muine/FC-5/muine.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- muine.spec 15 Mar 2006 15:27:18 -0000 1.1 +++ muine.spec 23 Mar 2006 13:32:28 -0000 1.2 @@ -1,6 +1,6 @@ Name: muine Version: 0.8.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Music Player for GNOME Group: Applications/Multimedia @@ -17,7 +17,7 @@ BuildRequires: libid3tag-devel BuildRequires: libvorbis-devel, flac-devel BuildRequires: desktop-file-utils, gettext -Requires: mono-core, dbus-sharp >= 0.50, gtk-sharp2 +Requires: mono-core, mono-web, dbus-sharp >= 0.50, gtk-sharp2 Requires(pre): GConf2 Requires(post): GConf2, desktop-file-utils @@ -115,6 +115,9 @@ %{_libdir}/muine/*.a %changelog +* Tue Mar 23 2006 Sindre Pedersen Bj??rdal - 0.8.4-6 +- Add missing mono-web dependency + * Tue Mar 14 2006 Sindre Pedersen Bj??rdal - 0.8.4-5 - Patch added to really fix the x86_64 issue From fedora-extras-commits at redhat.com Thu Mar 23 14:45:32 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 23 Mar 2006 09:45:32 -0500 Subject: rpms/octave/FC-4 .cvsignore, 1.5, 1.6 octave.spec, 1.27, 1.28 sources, 1.5, 1.6 Message-ID: <200603231446.k2NEk4Kn012751@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12730 Modified Files: .cvsignore octave.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Nov 2005 22:33:49 -0000 1.5 +++ .cvsignore 23 Mar 2006 14:45:31 -0000 1.6 @@ -1 +1 @@ -octave-2.1.72.tar.bz2 +octave-2.1.73.tar.bz2 Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- octave.spec 16 Mar 2006 18:40:06 -0000 1.27 +++ octave.spec 23 Mar 2006 14:45:31 -0000 1.28 @@ -1,6 +1,6 @@ Name: octave -Version: 2.1.72 -Release: 4%{?dist} +Version: 2.1.73 +Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -40,7 +40,7 @@ Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: readline-devel fftw-devel hdf5-devel zlib-devel -Requires: lapack-devel blas-devel +Requires: lapack-devel blas-devel gcc-c++ %description devel The octave-devel package contains files needed for developing @@ -116,9 +116,11 @@ %changelog -* Thu Mar 16 2006 Quentin Spencer 2.1.72-4 +* Thu Mar 23 2006 Quentin Spencer 2.1.73-1 +- New upstream release. - Make sure /usr/libexec/octave is owned by octave. - Remove configure options that are now obsolete. +- Add gcc-c++ as dependency of devel package. * Wed Feb 1 2006 Quentin Spencer 2.1.72-3 - Patch to fix bug #179242. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Nov 2005 22:33:49 -0000 1.5 +++ sources 23 Mar 2006 14:45:31 -0000 1.6 @@ -1 +1 @@ -47012ee5efee3a36d04fea3341748862 octave-2.1.72.tar.bz2 +c356475aa06d81a10f8bf27f1a1d27a0 octave-2.1.73.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 23 18:08:15 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Thu, 23 Mar 2006 13:08:15 -0500 Subject: rpms/ghdl/devel ghdl.spec,1.14,1.15 sources,1.6,1.7 Message-ID: <200603231808.k2NI8lJ4021667@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21643 Modified Files: ghdl.spec sources Log Message: back to using FSF gcc sources, as core sources cause a segfault when compiling on x86_64 Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ghdl.spec 22 Mar 2006 10:56:48 -0000 1.14 +++ ghdl.spec 23 Mar 2006 18:08:13 -0000 1.15 @@ -1,12 +1,11 @@ %define gccver 4.1.0 %define ghdlver 0.21 %define ghdlsvnver 50 -%define DATE 20060304 Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.%{ghdlsvnver}svn.1%{?dist} +Release: 0.%{ghdlsvnver}svn.0%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -14,21 +13,8 @@ # check out the SVN repo # cd translate/gcc/ # ./dist.sh sources -Source0: gcc-%{gccver}-%{DATE}.tar.bz2 +Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2 Source100: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 -Patch1: gcc41-ice-hack.patch -Patch2: gcc41-ppc64-m32-m64-multilib-only.patch -Patch3: gcc41-ia64-libunwind.patch -Patch4: gcc41-gnuc-rh-release.patch -Patch5: gcc41-java-nomulti.patch -Patch6: gcc41-ada-pr18302.patch -Patch7: gcc41-ada-tweaks.patch -Patch8: gcc41-java-slow_pthread_self.patch -Patch9: gcc41-ppc32-retaddr.patch -Patch10: gcc41-x86_64-sse3.patch -Patch11: gcc41-mni.patch -Patch12: gcc41-cfaval.patch -Patch13: gcc41-rh184446.patch Patch100: ghdl-svn%{ghdlsvnver}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info @@ -123,22 +109,7 @@ that tracks signal updates and schedules processes. %prep -%setup -q -n gcc-%{gccver}-%{DATE} -T -b 0 -a 100 -%patch1 -p0 -b .ice-hack~ -%patch2 -p0 -b .ppc64-m32-m64-multilib-only~ -%patch3 -p0 -b .ia64-libunwind~ -#patch4 -p0 -b .gnuc-rh-release~ -%patch5 -p0 -b .java-nomulti~ -%patch6 -p0 -b .ada-pr18302~ -%patch7 -p0 -b .ada-tweaks~ -%patch8 -p0 -b .java-slow_pthread_self~ -%patch9 -p0 -b .ppc32-retaddr~ -%patch10 -p0 -b .x86_64-sse3~ -%patch11 -p0 -b .mni~ -%patch12 -p0 -b .cfaval~ -%patch13 -p0 -b .rh184446~ -sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c -sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gccver})"/' gcc/version.c +%setup -q -n gcc-%{gccver} -T -b 0 -a 100 pushd ghdl-%{ghdlver} %patch100 -p1 %{__mv} vhdl ../gcc/ @@ -324,6 +295,8 @@ - update to svn50, to fix x86_64 breakage - move grt (ghdl runtime library) into separate package, to allow parallel install of i386 and x86_64 grt on x86_64 machines, thus making -m32 work +- back to using FSF gcc as base compiler sources, using core gcc sources + causes segfaults during library compile on x86_64 * Sun Mar 19 2006 Thomas Sailer - 0.22-0.49svn.1 - use core gcc as base compiler sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Mar 2006 15:13:36 -0000 1.6 +++ sources 23 Mar 2006 18:08:13 -0000 1.7 @@ -1,2 +1,2 @@ a0ebb9b4ea9d33e67e6ae9768d10eb3a ghdl-0.21.tar.bz2 -cc39dd702c70d0a784c7ecdedbb503b7 gcc-4.1.0-20060304.tar.bz2 +15efa164579c7cf4a48859ee87d2a1fa gcc-core-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 23 18:15:33 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 23 Mar 2006 13:15:33 -0500 Subject: rpms/python-durus/FC-5 .cvsignore, 1.6, 1.7 python-durus.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200603231816.k2NIG5eW021771@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-durus/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21709/FC-5 Modified Files: .cvsignore python-durus.spec sources Log Message: Update to upstream 3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Feb 2006 17:43:31 -0000 1.6 +++ .cvsignore 23 Mar 2006 18:15:32 -0000 1.7 @@ -1 +1 @@ -Durus-3.2.tar.gz +Durus-3.3.tar.gz Index: python-durus.spec =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-5/python-durus.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-durus.spec 13 Feb 2006 17:43:31 -0000 1.8 +++ python-durus.spec 23 Mar 2006 18:15:32 -0000 1.9 @@ -3,7 +3,7 @@ %define srcname Durus Name: python-durus -Version: 3.2 +Version: 3.3 Release: 1%{?dist} Summary: A Python Object Database @@ -53,6 +53,9 @@ %{_bindir}/durus %changelog +* Thu Mar 23 2006 Shahms E. King 3.3-1 +- Update to upstream 3.3 + * Mon Feb 13 2006 Shahms E. King 3.2-1 - Update to upstream 3.2 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Feb 2006 17:43:31 -0000 1.6 +++ sources 23 Mar 2006 18:15:32 -0000 1.7 @@ -1 +1 @@ -f10d3eebfa01eeee8113b82930c13320 Durus-3.2.tar.gz +e5a91e6fb04715a72f14a89eab329c6f Durus-3.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:15:39 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 23 Mar 2006 13:15:39 -0500 Subject: rpms/python-durus/devel .cvsignore, 1.6, 1.7 python-durus.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200603231816.k2NIGCqa021776@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-durus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21709/devel Modified Files: .cvsignore python-durus.spec sources Log Message: Update to upstream 3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-durus/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Feb 2006 17:43:31 -0000 1.6 +++ .cvsignore 23 Mar 2006 18:15:39 -0000 1.7 @@ -1 +1 @@ -Durus-3.2.tar.gz +Durus-3.3.tar.gz Index: python-durus.spec =================================================================== RCS file: /cvs/extras/rpms/python-durus/devel/python-durus.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-durus.spec 13 Feb 2006 17:43:31 -0000 1.8 +++ python-durus.spec 23 Mar 2006 18:15:39 -0000 1.9 @@ -3,7 +3,7 @@ %define srcname Durus Name: python-durus -Version: 3.2 +Version: 3.3 Release: 1%{?dist} Summary: A Python Object Database @@ -53,6 +53,9 @@ %{_bindir}/durus %changelog +* Thu Mar 23 2006 Shahms E. King 3.3-1 +- Update to upstream 3.3 + * Mon Feb 13 2006 Shahms E. King 3.2-1 - Update to upstream 3.2 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-durus/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Feb 2006 17:43:31 -0000 1.6 +++ sources 23 Mar 2006 18:15:39 -0000 1.7 @@ -1 +1 @@ -f10d3eebfa01eeee8113b82930c13320 Durus-3.2.tar.gz +e5a91e6fb04715a72f14a89eab329c6f Durus-3.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:15:25 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 23 Mar 2006 13:15:25 -0500 Subject: rpms/python-durus/FC-4 .cvsignore, 1.6, 1.7 python-durus.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200603231816.k2NIGRD7021787@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-durus/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21709/FC-4 Modified Files: .cvsignore python-durus.spec sources Log Message: Update to upstream 3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Feb 2006 17:43:25 -0000 1.6 +++ .cvsignore 23 Mar 2006 18:15:24 -0000 1.7 @@ -1 +1 @@ -Durus-3.2.tar.gz +Durus-3.3.tar.gz Index: python-durus.spec =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-4/python-durus.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-durus.spec 13 Feb 2006 17:43:25 -0000 1.8 +++ python-durus.spec 23 Mar 2006 18:15:25 -0000 1.9 @@ -3,7 +3,7 @@ %define srcname Durus Name: python-durus -Version: 3.2 +Version: 3.3 Release: 1%{?dist} Summary: A Python Object Database @@ -53,6 +53,9 @@ %{_bindir}/durus %changelog +* Thu Mar 23 2006 Shahms E. King 3.3-1 +- Update to upstream 3.3 + * Mon Feb 13 2006 Shahms E. King 3.2-1 - Update to upstream 3.2 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Feb 2006 17:43:25 -0000 1.6 +++ sources 23 Mar 2006 18:15:25 -0000 1.7 @@ -1 +1 @@ -f10d3eebfa01eeee8113b82930c13320 Durus-3.2.tar.gz +e5a91e6fb04715a72f14a89eab329c6f Durus-3.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:20:12 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 23 Mar 2006 13:20:12 -0500 Subject: rpms/kst/FC-4 .cvsignore,1.2,1.3 kst.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200603231820.k2NIKkEh022131@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/kst/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/FC-4 Modified Files: .cvsignore kst.spec sources Log Message: Update source tarball to new kst 1.2.1 bugfix release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kst/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Feb 2006 00:34:53 -0000 1.2 +++ .cvsignore 23 Mar 2006 18:20:12 -0000 1.3 @@ -1 +1 @@ -kst-1.2.0.tar.gz +kst-1.2.1.tar.gz Index: kst.spec =================================================================== RCS file: /cvs/extras/rpms/kst/FC-4/kst.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kst.spec 12 Mar 2006 17:57:48 -0000 1.4 +++ kst.spec 23 Mar 2006 18:20:12 -0000 1.5 @@ -1,6 +1,6 @@ Name: kst -Version: 1.2.0 -Release: 10%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: A data viewing program for KDE Group: Applications/Engineering @@ -210,6 +210,9 @@ %{_datadir}/services/kst/kstdata_netcdf.desktop %changelog +* Thu Mar 23 2006 Matthew Truch - 1.2.1-1 +- Update to kst 1.2.1 bugfix release from upstream. + * Sun Mar 12 2006 Matthew Truch - 1.2.0-10 - Yet another tweak to configure options. - Bump build so new cfitsio version is picked up. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kst/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Feb 2006 00:34:53 -0000 1.2 +++ sources 23 Mar 2006 18:20:12 -0000 1.3 @@ -1 +1 @@ -789aac131edb24cdefbb90634cbb4b56 kst-1.2.0.tar.gz +254f57baf35f1c5cff88d6aa666fb30c kst-1.2.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:20:20 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 23 Mar 2006 13:20:20 -0500 Subject: rpms/kst/FC-5 .cvsignore,1.2,1.3 kst.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200603231820.k2NIKqCx022162@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/kst/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/FC-5 Modified Files: .cvsignore kst.spec sources Log Message: Update source tarball to new kst 1.2.1 bugfix release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kst/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Feb 2006 00:34:53 -0000 1.2 +++ .cvsignore 23 Mar 2006 18:20:20 -0000 1.3 @@ -1 +1 @@ -kst-1.2.0.tar.gz +kst-1.2.1.tar.gz Index: kst.spec =================================================================== RCS file: /cvs/extras/rpms/kst/FC-5/kst.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kst.spec 12 Mar 2006 17:34:07 -0000 1.4 +++ kst.spec 23 Mar 2006 18:20:20 -0000 1.5 @@ -1,6 +1,6 @@ Name: kst -Version: 1.2.0 -Release: 10%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: A data viewing program for KDE Group: Applications/Engineering @@ -210,6 +210,9 @@ %{_datadir}/services/kst/kstdata_netcdf.desktop %changelog +* Thu Mar 23 2006 Matthew Truch - 1.2.1-1 +- Update to kst 1.2.1 bugfix release from upstream. + * Sun Mar 12 2006 Matthew Truch - 1.2.0-10 - Yet another tweak to configure options. - Bump build so new cfitsio version is picked up. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kst/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Feb 2006 00:34:53 -0000 1.2 +++ sources 23 Mar 2006 18:20:20 -0000 1.3 @@ -1 +1 @@ -789aac131edb24cdefbb90634cbb4b56 kst-1.2.0.tar.gz +254f57baf35f1c5cff88d6aa666fb30c kst-1.2.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:20:26 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 23 Mar 2006 13:20:26 -0500 Subject: rpms/kst/devel .cvsignore,1.2,1.3 kst.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200603231820.k2NIKw7T022168@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/kst/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/devel Modified Files: .cvsignore kst.spec sources Log Message: Update source tarball to new kst 1.2.1 bugfix release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kst/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Feb 2006 00:34:53 -0000 1.2 +++ .cvsignore 23 Mar 2006 18:20:26 -0000 1.3 @@ -1 +1 @@ -kst-1.2.0.tar.gz +kst-1.2.1.tar.gz Index: kst.spec =================================================================== RCS file: /cvs/extras/rpms/kst/devel/kst.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kst.spec 12 Mar 2006 17:34:07 -0000 1.4 +++ kst.spec 23 Mar 2006 18:20:26 -0000 1.5 @@ -1,6 +1,6 @@ Name: kst -Version: 1.2.0 -Release: 10%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: A data viewing program for KDE Group: Applications/Engineering @@ -210,6 +210,9 @@ %{_datadir}/services/kst/kstdata_netcdf.desktop %changelog +* Thu Mar 23 2006 Matthew Truch - 1.2.1-1 +- Update to kst 1.2.1 bugfix release from upstream. + * Sun Mar 12 2006 Matthew Truch - 1.2.0-10 - Yet another tweak to configure options. - Bump build so new cfitsio version is picked up. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kst/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Feb 2006 00:34:53 -0000 1.2 +++ sources 23 Mar 2006 18:20:26 -0000 1.3 @@ -1 +1 @@ -789aac131edb24cdefbb90634cbb4b56 kst-1.2.0.tar.gz +254f57baf35f1c5cff88d6aa666fb30c kst-1.2.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:22:28 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Thu, 23 Mar 2006 13:22:28 -0500 Subject: rpms/l2tpd/devel l2tpd.spec,1.5,1.6 Message-ID: <200603231823.k2NIN1k4022248@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/l2tpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22208 Modified Files: l2tpd.spec Log Message: * Thu Mar 23 2006 Paul Wouters 0.69-0.5.20051030 - Bumped version to release fc5 tag in devel wich is now fc6 Index: l2tpd.spec =================================================================== RCS file: /cvs/extras/rpms/l2tpd/devel/l2tpd.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- l2tpd.spec 3 Mar 2006 15:07:53 -0000 1.5 +++ l2tpd.spec 23 Mar 2006 18:22:28 -0000 1.6 @@ -3,7 +3,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: l2tpd Version: 0.69 -Release: 0.4.%{cvs}%{?dist} +Release: 0.5.%{cvs}%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Group: System Environment/Daemons @@ -127,6 +127,9 @@ %changelog +* Thu Mar 23 2006 Paul Wouters 0.69-0.5.20051030 +- Bumped version to release fc5 tag in devel wich is now fc6 + * Tue Mar 3 2006 Paul Wouters 0.69-0.4.20051030 - Bumped version From fedora-extras-commits at redhat.com Thu Mar 23 19:07:52 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 23 Mar 2006 14:07:52 -0500 Subject: fedora-security/audit fc4,1.179,1.180 fc5,1.92,1.93 Message-ID: <200603231907.k2NJ7qPC025759@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25737 Modified Files: fc4 fc5 Log Message: Note the firefox non issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- fc4 22 Mar 2006 19:22:01 -0000 1.179 +++ fc4 23 Mar 2006 19:07:40 -0000 1.180 @@ -6,7 +6,7 @@ CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 ** kernel CVE-2006-1342 ** kernel -CVE-2006-1273 ** firefox (prob win only, vague) +CVE-2006-1273 ignore (firefox) This is an IE only issue CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- fc5 22 Mar 2006 19:22:01 -0000 1.92 +++ fc5 23 Mar 2006 19:07:40 -0000 1.93 @@ -8,7 +8,7 @@ CVE-2006-1342 ** kernel CVE-2006-1335 version (gnome-screensaver, fixed 2.14) CVE-2006-1296 backport (beagle) bz#185981 [since FEDORA-2006-188] -CVE-2006-1273 ** firefox (prob win only, vague) +CVE-2006-1273 ignore (firefox) this issue only affects IE CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) From fedora-extras-commits at redhat.com Thu Mar 23 19:48:54 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 14:48:54 -0500 Subject: rpms/perl-SOAP-Lite/devel .cvsignore, 1.2, 1.3 perl-SOAP-Lite.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603231949.k2NJnQdH026075@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-SOAP-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26050 Modified Files: .cvsignore perl-SOAP-Lite.spec sources Log Message: Took ownership from Hunter, updated to new sources and new spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Apr 2005 22:42:45 -0000 1.2 +++ .cvsignore 23 Mar 2006 19:48:53 -0000 1.3 @@ -1 +1 @@ -SOAP-Lite-0.60a.tar.gz +SOAP-Lite-0.67.tar.gz Index: perl-SOAP-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/devel/perl-SOAP-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SOAP-Lite.spec 26 Oct 2005 18:23:25 -0000 1.2 +++ perl-SOAP-Lite.spec 23 Mar 2006 19:48:53 -0000 1.3 @@ -1,73 +1,78 @@ -Name: perl-SOAP-Lite -Version: 0.60a -Release: 3%{?dist} -Summary: Provides the Simple Object Access Protocol (SOAP) - -Group: Development/Libraries -License: GPL or Artistic -URL: http://search.cpan.org/dist/SOAP-Lite/ -Source0: http://www.cpan.org/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-0.60a.tar.gz -Source1: filter-requires.sh -Patch0: SOAP-Lite-0.60a-paths.patch +Name: perl-SOAP-Lite +Version: 0.67 +Release: 2%{?dist} +Summary: Client and server side SOAP implementation +License: GPL or Artistic +Group: Development/Libraries +URL: http://search.cpan.org/dist/SOAP-Lite/ +Source0: http://search.cpan.org/CPAN/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - -%define __perl_requires %{SOURCE1} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl-XML-Parser +BuildArch: noarch + +%define bogusreqs 'perl(MQClient::MQSeries)\ +perl(MQSeries)\ +perl(MQSeries::Message)\ +perl(MQSeries::Queue)\ +perl(MQSeries::QueueManager)\ +perl(Net::Jabber)' +%global reqfilt sh -c "%{__perl_requires} | %{__grep} -Fv %{bogusreqs}" +%define __perl_requires %{reqfilt} %description -SOAP::Lite for Perl is a collection of Perl modules which provides a simple -and lightweight interface to the Simple Object Access Protocol (SOAP) both -on client and server side. - -This version of SOAP::Lite supports a subset of the SOAP 1.1 specification -and has initial support for SOAP 1.2 specification. - +SOAP::Lite is a collection of Perl modules which provides a simple and +lightweight interface to the Simple Object Access Protocol (SOAP) both on +client and server side. %prep -%setup -q -n SOAP-Lite-0.60 # Upstream tar is inconsistent. -%patch0 -p1 - -# avoid dependencies -find examples -type f | xargs chmod 644 - +%setup -q -n SOAP-Lite-%{version} %build -# Despite the --noprompt, it prompts for a enter.... -%{__perl} Makefile.PL INSTALLDIRS=vendor --noprompt << EOL - -EOL +%{__perl} Makefile.PL --noprompt 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 -a \( -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +#Items not yet in Extras +#find $RPM_BUILD_ROOT -type f -name JABBER* -exec rm -f {} ';' +#find $RPM_BUILD_ROOT -type f -name MQ* -exec rm -f {} ';' -%check || : -make test - +chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT +%check +make test %files %defattr(-,root,root,-) -%doc README Changes examples -%{_bindir}/* -%{perl_vendorlib}/* -%{_mandir}/man1/*.1* -%{_mandir}/man3/*.3* - +# For license text(s), see the perl package. +%doc Changes README ReleaseNotes.txt +%{_bindir}/*pl +%{perl_vendorlib}/SOAP +%{perl_vendorlib}/Apache +%{perl_vendorlib}/IO +%{perl_vendorlib}/UDDI +%{perl_vendorlib}/OldDocs +%{perl_vendorlib}/XML +%{perl_vendorlib}/XMLRPC +%{_mandir}/man3/* +%{_mandir}/man1/* %changelog +* Mon Mar 20 2006 Mike McGrath - 0.67-2 +- Removed perl requirements that do not yet exist in Extras + +* Sat Mar 18 2006 Mike McGrath - 0.67-1 +- New Owner and new spec file + * Wed Oct 26 2005 Ville Skytt?? - 0.60a-3 - Fix build, doc permissions (#169821). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Apr 2005 22:42:45 -0000 1.2 +++ sources 23 Mar 2006 19:48:53 -0000 1.3 @@ -1 +1 @@ -aed9f8e9c4cf180d15c6e15aedc484d7 SOAP-Lite-0.60a.tar.gz +2473030e75838e86529ca57a49f9104f SOAP-Lite-0.67.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 19:51:10 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 14:51:10 -0500 Subject: owners owners.list,1.759,1.760 Message-ID: <200603231951.k2NJpgwE026151@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26132 Modified Files: owners.list Log Message: Took ownership from thm at duke.edu Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.759 retrieving revision 1.760 diff -u -r1.759 -r1.760 --- owners.list 22 Mar 2006 19:26:58 -0000 1.759 +++ owners.list 23 Mar 2006 19:51:09 -0000 1.760 @@ -1026,7 +1026,7 @@ Fedora Extras|perl-Regexp-Common|Regexp::Common Perl module|rc040203 at freenet.de|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-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)|thm at duke.edu|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 Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spiffy|Framework for doing object oriented (OO) programming in Perl|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu Mar 23 20:04:47 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:04:47 -0500 Subject: rpms/otrs - New directory Message-ID: <200603232004.k2NK4n73028223@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28215/otrs Log Message: Directory /cvs/extras/rpms/otrs added to the repository From fedora-extras-commits at redhat.com Thu Mar 23 20:04:54 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:04:54 -0500 Subject: rpms/otrs/devel - New directory Message-ID: <200603232004.k2NK4ulZ028238@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28215/otrs/devel Log Message: Directory /cvs/extras/rpms/otrs/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 23 20:05:17 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:05:17 -0500 Subject: rpms/otrs Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603232005.k2NK5JgY028272@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28260 Added Files: Makefile import.log Log Message: Setup of module otrs --- NEW FILE Makefile --- # Top level Makefile for module otrs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 23 20:05:24 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:05:24 -0500 Subject: rpms/otrs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603232005.k2NK5QgT028292@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28260/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module otrs --- NEW 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 Mar 23 20:12:00 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:12:00 -0500 Subject: rpms/otrs import.log,1.1,1.2 Message-ID: <200603232012.k2NKCXIa028369@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28334 Modified Files: import.log Log Message: auto-import otrs-2.0.4-3 on branch devel from otrs-2.0.4-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/otrs/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Mar 2006 20:05:17 -0000 1.1 +++ import.log 23 Mar 2006 20:12:00 -0000 1.2 @@ -0,0 +1 @@ +otrs-2_0_4-3:HEAD:otrs-2.0.4-3.src.rpm:1143148320 From fedora-extras-commits at redhat.com Thu Mar 23 20:12:09 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:12:09 -0500 Subject: rpms/otrs/devel otrs.httpd.conf, NONE, 1.1 otrs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603232012.k2NKCgi5028373@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28334/devel Modified Files: .cvsignore sources Added Files: otrs.httpd.conf otrs.spec Log Message: auto-import otrs-2.0.4-3 on branch devel from otrs-2.0.4-3.src.rpm --- NEW FILE otrs.httpd.conf --- # -- # added for OTRS (http://otrs.org/) # -- # agent, admin and customer frontend ScriptAlias /otrs/ "/var/www/otrs/bin/cgi-bin/" Alias /otrs-web/ "/var/www/otrs/var/httpd/htdocs/" # load all otrs modules Perlrequire /var/www/otrs/scripts/apache2-perl-startup.pl # Apache::Reload - Reload Perl Modules when Changed on Disk PerlModule Apache2::Reload PerlInitHandler Apache2::Reload PerlModule Apache2::RequestRec # set mod_perl2 options # ErrorDocument 403 /otrs/customer.pl ErrorDocument 403 /otrs/index.pl SetHandler perl-script PerlResponseHandler ModPerl::Registry Options +ExecCGI PerlOptions +ParseHeaders PerlOptions +SetupEnv Order Deny,Allow Deny from all Allow from 127.0.0.1 # directory settings AllowOverride None Options +ExecCGI -Includes Order allow,deny Allow from all AllowOverride None Order allow,deny Allow from all --- NEW FILE otrs.spec --- Summary: The Open Ticket Request System Name: otrs Version: 2.0.4 Release: 3 License: GPL Group: Applications/Internet URL: http://www.otrs.org/ Source0: ftp://ftp.otrs.org/pub/%{name}/%{name}-%{version}-01.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: otrs.httpd.conf BuildArch: noarch Requires: mod_perl httpd mysql fetchmail procmail /usr/sbin/sendmail Requires(pre): %{_sbindir}/useradd httpd Requires(preun): /sbin/service /sbin/chkconfig Requires(post): /sbin/chkconfig /sbin/service Requires(postun): /sbin/service #This package does not provide ANY perl modules %define bogusreqs 'perl(Kernel\ perl(HTML::Safe)' %global reqfilt sh -c "%{__perl_requires} | %{__grep} -Fv %{bogusreqs}" %global provfilt sh -c "%{__perl_provides} | %{__grep} -Fv %{bogusreqs}" %define __perl_requires %{reqfilt} %define __perl_provides %{provfilt} %define otrsdir %{_localstatedir}/www/%{name}/ %description OTRS is an Open source Ticket Request System (also well known as trouble ticket system) with many features to manage customer telephone calls and e-mails. The system is built to allow your support, sales, pre-sales, billing, internal IT, helpdesk, etc. department to react quickly to inbound inquiries. %prep %setup -qn otrs %build # copy config file cp Kernel/Config.pm.dist Kernel/Config.pm cd Kernel/Config/ && for foo in *.dist; do cp $foo `basename $foo .dist`; done && cd ../../ chmod 644 ./Kernel/System/Web/*.pm chmod 644 .fetchmailrc.dist sed -i "s/# chkconfig: 2345/# chkconfig: -/" scripts/redhat-rcotrs sed -i "s/OTRS_DB_RUNNING=1/OTRS_DB_RUNNING=0/" scripts/redhat-rcotrs-config sed -i "s|OTRS_ROOT=/opt/|OTRS_ROOT=%{_localstatedir}/www/|" scripts/redhat-rcotrs-config sed -i "s|/opt/|%{_localstatedir}/www/|g" INSTALL Kernel/Config/Defaults.pm Kernel/Config.pm Kernel/Config.pm.dist Kernel/Modules/Installer.pm scripts/apache2-perl-startup.pl README.webserver ./.procmailrc.dist ./bin/SetPermissions.sh ./bin/Cron.sh CHANGES README for foo in var/cron/*.dist; do mv $foo var/cron/`basename $foo .dist`; done for f in ./.*.dist; do mv $f `basename $f .dist`; done # These perl modules are not yet in extras rm ./Kernel/System/CustomerAuth/Radius.pm rm ./Kernel/System/Auth/Radius.pm # Not needed rm ./bin/Cron4Win32.pl rm `find ./scripts/ | grep -i "suse\|apache-"` %install rm -rf %{buildroot} mkdir -p %{buildroot}/%{otrsdir} install -d -m 755 %{buildroot}/etc/rc.d/init.d install -d -m 755 %{buildroot}/etc/sysconfig install -d -m 755 %{buildroot}/etc/httpd/conf.d install -m 755 scripts/redhat-rcotrs %{buildroot}/%{_initrddir}/otrs install -m 644 scripts/redhat-rcotrs-config %{buildroot}/%{_sysconfdir}/sysconfig/otrs install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf install -m 644 .*ail* %{buildroot}/%{otrsdir} install -m 644 RELEASE %{buildroot}/%{otrsdir}/ mv [bKsv]* %{buildroot}/%{otrsdir} chmod 755 %{buildroot}/%{otrsdir}/scripts/*pl chmod -R 2775 %{buildroot}/%{otrsdir}/var/[alstp]* chmod -R g+w %{buildroot}/%{otrsdir}/var/httpd rm %{buildroot}/%{otrsdir}/scripts/redhat-* rm -rf %{buildroot}/%{otrsdir}/Kernel/cpan-lib/[^H]* %pre %{_sbindir}/useradd -d %{otrsdir} -g apache -c 'OTRS System User' -r -s /sbin/nologin otrs 2> /dev/null || : %preun if [ $1 = 0 ]; then /sbin/service otrs stop > /dev/null 2>&1 || : /sbin/chkconfig --del %{name} || : fi %post /sbin/chkconfig --add %{name} || : /sbin/service httpd condrestart > /dev/null 2>&1 || : %postun /sbin/service httpd condrestart > /dev/null 2>&1 ||: %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/sysconfig/otrs %config(noreplace) %{_sysconfdir}/httpd/conf.d/otrs.conf %{_initrddir}/%{name} %doc doc/ README.webserver README INSTALL CHANGES COPYING CREDITS INSTALL.RedHat README.dtl README.database RELEASE TODO UPGRADING %defattr(-,apache,root,-) %dir %{otrsdir} %config(noreplace) %attr(0640,apache,root) %{otrsdir}/Kernel/Config.pm %dir %{otrsdir}/Kernel/ %{otrsdir}/Kernel/Config.pm.dist %{otrsdir}/Kernel/Config/ %{otrsdir}/Kernel/cpan-lib/ %{otrsdir}/Kernel/Language* %{otrsdir}/Kernel/Modules/ %{otrsdir}/Kernel/Output/ %{otrsdir}/Kernel/System/ %{otrsdir}/bin %{otrsdir}/scripts %{otrsdir}/RELEASE %attr(-,otrs,apache) %{otrsdir}/var %attr(0660,otrs,apache) %{otrsdir}/.*ail* %changelog * Wed Mar 22 2006 Mike McGrath 2.0.4-3 - Removed bogus req's and perl provides - Removed a number of perl packages that are provided by Fedora - Now using %{otrsdir} macro - Created an otrs.httpd.conf source - Changed permissions for otrs/var/httpd * Wed Mar 8 2006 Mike McGrath 2.0.4-2 - Major updates in permissions - Removed perl perl-DBI perl-DBD-MySQL and perl-URI from requires - Changed requires to /usr/sbin/sendmail - Updated Pre to check for udpate conditions - Removed Requires(postun) - Removed MaxRequestsPerChild from http config - Added RELEASE file to ~otrs. It's required there. * Wed Feb 1 2006 Mike McGrath 2.0.4-1 - Fedora friendly spec file * Thu Feb 12 2003 - martin+rpm at otrs.org - spec for RedHat 8.0 created Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/otrs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Mar 2006 20:05:24 -0000 1.1 +++ .cvsignore 23 Mar 2006 20:12:08 -0000 1.2 @@ -0,0 +1 @@ +otrs-2.0.4-01.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/otrs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Mar 2006 20:05:24 -0000 1.1 +++ sources 23 Mar 2006 20:12:08 -0000 1.2 @@ -0,0 +1 @@ +cfc0fa4f711c2fa92bc513b57632bbfe otrs-2.0.4-01.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 23 20:16:52 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:16:52 -0500 Subject: owners owners.list,1.760,1.761 Message-ID: <200603232017.k2NKHSbq028439@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28417 Modified Files: owners.list Log Message: Added otrs Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.760 retrieving revision 1.761 diff -u -r1.760 -r1.761 --- owners.list 23 Mar 2006 19:51:09 -0000 1.760 +++ owners.list 23 Mar 2006 20:16:51 -0000 1.761 @@ -787,6 +787,7 @@ Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|ortp|A C library implementing the RTP protocol (RFC3550)|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org| +Fedora Extras|otrs|The Open Ticket Request System|imlinux at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|overgod|Another Asteroid like game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|p0f|Versatile passive OS fingerprinting tool|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 23 21:31:05 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 16:31:05 -0500 Subject: rpms/libetpan/devel libetpan.spec,1.9,1.10 Message-ID: <200603232131.k2NLVbb2030753@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30718 Modified Files: libetpan.spec Log Message: - remove smp_mflags for now Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libetpan.spec 23 Mar 2006 09:21:54 -0000 1.9 +++ libetpan.spec 23 Mar 2006 21:31:04 -0000 1.10 @@ -35,7 +35,7 @@ %build %configure --disable-static --with-gnutls=no -make %{?_smp_mflags} +make # %{?_smp_mflags} not parallel clean %install From fedora-extras-commits at redhat.com Thu Mar 23 22:23:17 2006 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Thu, 23 Mar 2006 17:23:17 -0500 Subject: rpms/istanbul/devel istanbul.spec,1.5,1.6 Message-ID: <200603232223.k2NMNnU7000942@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv925 Modified Files: istanbul.spec Log Message: * Thu Mar 23 2006 Jef Spaleta - 0.1.1-9 - attempt to fix 64bit build failures do to unpackaged la Index: istanbul.spec =================================================================== RCS file: /cvs/extras/rpms/istanbul/devel/istanbul.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- istanbul.spec 1 Feb 2006 17:59:00 -0000 1.5 +++ istanbul.spec 23 Mar 2006 22:23:16 -0000 1.6 @@ -8,7 +8,7 @@ Summary: Desktop Session Recorder Name: istanbul Version: 0.1.1 -Release: 8 +Release: 9 License: GPL Group: Applications/Multimedia URL: http://live.gnome.org/Istanbul @@ -53,7 +53,7 @@ %install rm -rf $RPM_BUILD_ROOT %makeinstall -rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/istanbul/extern/pytrayicon/*.la +rm -f $RPM_BUILD_ROOT%{python_sitelib}/%{name}/extern/pytrayicon/*.la desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -80,6 +80,7 @@ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/glade %{_datadir}/%{name}/glade/prefs.glade + %dir %{python_sitelib}/%{name} %{python_sitelib}/%{name}/*.py* %dir %{python_sitelib}/%{name}/extern @@ -91,8 +92,12 @@ %{python_sitelib}/%{name}/main/*.py* %dir %{python_sitelib}/%{name}/configure %{python_sitelib}/%{name}/configure/*.py* +%{python_sitelib}/%{name}/extern/pytrayicon/*.so* %changelog +* Thu Mar 23 2006 Jef Spaleta - 0.1.1-9 +- attempt to fix 64bit build failures do to unpackaged la + * Wed Feb 01 2006 Jef Spaleta - 0.1.1-8 - added pygtk2-devel buildrequires From fedora-extras-commits at redhat.com Thu Mar 23 22:28:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 17:28:25 -0500 Subject: rpms/libetpan/FC-5 libetpan.spec,1.9,1.10 Message-ID: <200603232228.k2NMSwVx001063@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1046 Modified Files: libetpan.spec Log Message: - disable smp_mflags for now Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-5/libetpan.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libetpan.spec 23 Mar 2006 09:21:43 -0000 1.9 +++ libetpan.spec 23 Mar 2006 22:28:25 -0000 1.10 @@ -35,7 +35,7 @@ %build %configure --disable-static --with-gnutls=no -make %{?_smp_mflags} +make # %{?_smp_mflags} not parallel clean %install From fedora-extras-commits at redhat.com Thu Mar 23 22:43:54 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 23 Mar 2006 17:43:54 -0500 Subject: rpms/octave/FC-5 octave-2.9.5-sparse.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 octave.spec, 1.32, 1.33 sources, 1.6, 1.7 octave-2.9.4-header.patch, 1.1, NONE octave-2.9.4-x86_64.patch, 1.2, NONE Message-ID: <200603232244.k2NMiRmY001199@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1175 Modified Files: .cvsignore octave.spec sources Added Files: octave-2.9.5-sparse.patch Removed Files: octave-2.9.4-header.patch octave-2.9.4-x86_64.patch Log Message: New upstream release. Lots of spec changes--see changelog. octave-2.9.5-sparse.patch: --- NEW FILE octave-2.9.5-sparse.patch --- Index: liboctave/SparseCmplxQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v retrieving revision 1.2 diff -u -r1.2 SparseCmplxQR.h --- liboctave/SparseCmplxQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseCmplxQR.h 23 Mar 2006 17:56:07 -0000 @@ -137,6 +137,23 @@ #endif }; + +// Publish externally used friend functions. + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, + const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); #endif /* Index: liboctave/SparseQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseQR.h,v retrieving revision 1.2 diff -u -r1.2 SparseQR.h --- liboctave/SparseQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseQR.h 23 Mar 2006 17:56:07 -0000 @@ -133,6 +133,22 @@ #endif }; + +// Publish externally used friend functions. + +extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseMatrix qrsolve (const SparseMatrix &a, const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseMatrix &a, const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); + #endif /* Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Nov 2005 06:02:28 -0000 1.6 +++ .cvsignore 23 Mar 2006 22:43:54 -0000 1.7 @@ -1 +1 @@ -octave-2.9.4.tar.bz2 +octave-2.9.5.tar.bz2 Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- octave.spec 16 Mar 2006 18:36:26 -0000 1.32 +++ octave.spec 23 Mar 2006 22:43:54 -0000 1.33 @@ -1,14 +1,13 @@ Name: octave -Version: 2.9.4 -Release: 8%{?dist} +Version: 2.9.5 +Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering License: GPL Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 -Patch0: octave-2.9.4-header.patch -Patch1: octave-2.9.4-x86_64.patch +Patch0: octave-2.9.5-sparse.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -18,7 +17,7 @@ BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel BuildRequires: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildRequires: readline-devel glibc-devel fftw-devel autoconf gperf -BuildRequires: ufsparse-devel glpk-devel gnuplot +BuildRequires: ufsparse-devel glpk-devel gnuplot desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,7 +41,7 @@ Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: readline-devel fftw-devel hdf5-devel zlib-devel -Requires: lapack-devel blas-devel +Requires: lapack-devel blas-devel gcc-c++ %description devel The octave-devel package contains files needed for developing @@ -52,47 +51,53 @@ %prep %setup -q %patch0 -p0 -%patch1 -p0 -./autogen.sh %build %ifarch x86_64 -%define enable64 --enable-64=yes +%define enable64 yes %else -%define enable64 --enable-64=no +%define enable64 no %endif -CPPFLAGS=-I%{_includedir}/glpk \ -CXXFLAGS="$RPM_OPT_FLAGS" ./configure %enable64 \ - --enable-shared --disable-static --prefix=%{_prefix} \ - --infodir=%{_infodir} --libdir=%{_libdir} --mandir=%{_mandir} -make %{?_smp_mflags} +export CPPFLAGS=-I%{_includedir}/glpk +%configure --enable-shared --disable-static --enable-64=%enable64 +make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}" -#empty -rm -f interpreter/octave.{ky,pg,tp} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f doc/interpreter/munge-texi doc/interpreter/*.o strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir # Make library links mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/octave-%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/octave-%{_arch}.conf -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R +# Remove RPM_BUILD_ROOT from ls-R files +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ls-R +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_datadir}/%{name}/ls-R + +# Clean doc directory +pushd doc + make distclean + rm -f *.in */*.in */*.cc refcard/*.tex +popd + +# Create desktop file +rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop +desktop-file-install --vendor fedora --add-category X-Fedora \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop + -rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/install-info --info-dir=%{_infodir}/ --section="Programming:" --entry="* Octave:(octave). Interactive language for numerical computations." %{_infodir}/octave.info.gz +/sbin/install-info --info-dir=%{_infodir} --section="Programming:" \ + --entry="* Octave:(%{name}). %{summary}." %{_infodir}/octave.info.gz %preun if [ "$1" = "0" ]; then @@ -105,8 +110,8 @@ %files %defattr(-,root,root) %doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP -%doc SENDING-PATCHES THANKS -%doc doc/faq doc/liboctave doc/refcard emacs examples +%doc SENDING-PATCHES THANKS emacs examples doc/interpreter/octave.p* +%doc doc/faq doc/interpreter/HTML doc/refcard %{_bindir}/octave %{_bindir}/octave-%{version} %config(noreplace) /etc/ld.so.conf.d/* @@ -115,9 +120,11 @@ %{_libexecdir}/octave %{_mandir}/man*/octave* %{_infodir}/octave.info* +%{_datadir}/applications/* %files devel %defattr(-,root,root) +%doc doc/liboctave %{_bindir}/mkoctfile* %{_bindir}/octave-bug* %{_bindir}/octave-config* @@ -126,6 +133,13 @@ %changelog +* Thu Mar 23 2006 Quentin Spencer 2.9.5-1 +- New upstream release; remove old patches; add sparse patch. +- Add gcc-c++ as dependency for devel package. +- Add more docs; cleanup extra files in docs. +- Simplify configure command. +- Install desktop file. + * Fri Feb 24 2006 Quentin Spencer 2.9.4-8 - Rebuild for new hdf5. - Remove obsolete configure options. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Nov 2005 06:02:28 -0000 1.6 +++ sources 23 Mar 2006 22:43:54 -0000 1.7 @@ -1 +1 @@ -43561b0d8432847f5eae349c6e89b30a octave-2.9.4.tar.bz2 +09eff7b2319383778db7bb5e50619bf9 octave-2.9.5.tar.bz2 --- octave-2.9.4-header.patch DELETED --- --- octave-2.9.4-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 23 22:44:58 2006 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Thu, 23 Mar 2006 17:44:58 -0500 Subject: rpms/istanbul/FC-5 istanbul.spec,1.5,1.6 Message-ID: <200603232245.k2NMjV4V001224@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1205 Modified Files: istanbul.spec Log Message: * Thu Mar 23 2006 Jef Spaleta - 0.1.1-9 - attempt to fix 64bit build failures do to unpackaged la Index: istanbul.spec =================================================================== RCS file: /cvs/extras/rpms/istanbul/FC-5/istanbul.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- istanbul.spec 1 Feb 2006 17:59:00 -0000 1.5 +++ istanbul.spec 23 Mar 2006 22:44:58 -0000 1.6 @@ -8,7 +8,7 @@ Summary: Desktop Session Recorder Name: istanbul Version: 0.1.1 -Release: 8 +Release: 9%{?dist} License: GPL Group: Applications/Multimedia URL: http://live.gnome.org/Istanbul @@ -53,7 +53,7 @@ %install rm -rf $RPM_BUILD_ROOT %makeinstall -rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/istanbul/extern/pytrayicon/*.la +rm -f $RPM_BUILD_ROOT%{python_sitelib}/%{name}/extern/pytrayicon/*.la desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -80,6 +80,7 @@ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/glade %{_datadir}/%{name}/glade/prefs.glade + %dir %{python_sitelib}/%{name} %{python_sitelib}/%{name}/*.py* %dir %{python_sitelib}/%{name}/extern @@ -91,8 +92,12 @@ %{python_sitelib}/%{name}/main/*.py* %dir %{python_sitelib}/%{name}/configure %{python_sitelib}/%{name}/configure/*.py* +%{python_sitelib}/%{name}/extern/pytrayicon/*.so* %changelog +* Thu Mar 23 2006 Jef Spaleta - 0.1.1-9 +- attempt to fix 64bit build failures do to unpackaged la + * Wed Feb 01 2006 Jef Spaleta - 0.1.1-8 - added pygtk2-devel buildrequires From fedora-extras-commits at redhat.com Thu Mar 23 22:50:59 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 23 Mar 2006 17:50:59 -0500 Subject: rpms/octave/devel octave-2.9.5-sparse.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 octave.spec, 1.32, 1.33 sources, 1.6, 1.7 octave-2.9.4-header.patch, 1.1, NONE octave-2.9.4-x86_64.patch, 1.2, NONE Message-ID: <200603232251.k2NMpVr2001354@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1330 Modified Files: .cvsignore octave.spec sources Added Files: octave-2.9.5-sparse.patch Removed Files: octave-2.9.4-header.patch octave-2.9.4-x86_64.patch Log Message: New upstream release. Lots of spec changes--see changelog. octave-2.9.5-sparse.patch: --- NEW FILE octave-2.9.5-sparse.patch --- Index: liboctave/SparseCmplxQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v retrieving revision 1.2 diff -u -r1.2 SparseCmplxQR.h --- liboctave/SparseCmplxQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseCmplxQR.h 23 Mar 2006 17:56:07 -0000 @@ -137,6 +137,23 @@ #endif }; + +// Publish externally used friend functions. + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, + const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); #endif /* Index: liboctave/SparseQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseQR.h,v retrieving revision 1.2 diff -u -r1.2 SparseQR.h --- liboctave/SparseQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseQR.h 23 Mar 2006 17:56:07 -0000 @@ -133,6 +133,22 @@ #endif }; + +// Publish externally used friend functions. + +extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseMatrix qrsolve (const SparseMatrix &a, const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseMatrix &a, const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); + #endif /* Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Nov 2005 06:02:28 -0000 1.6 +++ .cvsignore 23 Mar 2006 22:50:59 -0000 1.7 @@ -1 +1 @@ -octave-2.9.4.tar.bz2 +octave-2.9.5.tar.bz2 Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- octave.spec 16 Mar 2006 18:36:26 -0000 1.32 +++ octave.spec 23 Mar 2006 22:50:59 -0000 1.33 @@ -1,14 +1,13 @@ Name: octave -Version: 2.9.4 -Release: 8%{?dist} +Version: 2.9.5 +Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering License: GPL Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 -Patch0: octave-2.9.4-header.patch -Patch1: octave-2.9.4-x86_64.patch +Patch0: octave-2.9.5-sparse.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -18,7 +17,7 @@ BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel BuildRequires: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildRequires: readline-devel glibc-devel fftw-devel autoconf gperf -BuildRequires: ufsparse-devel glpk-devel gnuplot +BuildRequires: ufsparse-devel glpk-devel gnuplot desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,7 +41,7 @@ Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: readline-devel fftw-devel hdf5-devel zlib-devel -Requires: lapack-devel blas-devel +Requires: lapack-devel blas-devel gcc-c++ %description devel The octave-devel package contains files needed for developing @@ -52,47 +51,53 @@ %prep %setup -q %patch0 -p0 -%patch1 -p0 -./autogen.sh %build %ifarch x86_64 -%define enable64 --enable-64=yes +%define enable64 yes %else -%define enable64 --enable-64=no +%define enable64 no %endif -CPPFLAGS=-I%{_includedir}/glpk \ -CXXFLAGS="$RPM_OPT_FLAGS" ./configure %enable64 \ - --enable-shared --disable-static --prefix=%{_prefix} \ - --infodir=%{_infodir} --libdir=%{_libdir} --mandir=%{_mandir} -make %{?_smp_mflags} +export CPPFLAGS=-I%{_includedir}/glpk +%configure --enable-shared --disable-static --enable-64=%enable64 +make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}" -#empty -rm -f interpreter/octave.{ky,pg,tp} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f doc/interpreter/munge-texi doc/interpreter/*.o strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir # Make library links mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/octave-%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/octave-%{_arch}.conf -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R +# Remove RPM_BUILD_ROOT from ls-R files +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ls-R +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_datadir}/%{name}/ls-R + +# Clean doc directory +pushd doc + make distclean + rm -f *.in */*.in */*.cc refcard/*.tex +popd + +# Create desktop file +rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop +desktop-file-install --vendor fedora --add-category X-Fedora \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop + -rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/install-info --info-dir=%{_infodir}/ --section="Programming:" --entry="* Octave:(octave). Interactive language for numerical computations." %{_infodir}/octave.info.gz +/sbin/install-info --info-dir=%{_infodir} --section="Programming:" \ + --entry="* Octave:(%{name}). %{summary}." %{_infodir}/octave.info.gz %preun if [ "$1" = "0" ]; then @@ -105,8 +110,8 @@ %files %defattr(-,root,root) %doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP -%doc SENDING-PATCHES THANKS -%doc doc/faq doc/liboctave doc/refcard emacs examples +%doc SENDING-PATCHES THANKS emacs examples doc/interpreter/octave.p* +%doc doc/faq doc/interpreter/HTML doc/refcard %{_bindir}/octave %{_bindir}/octave-%{version} %config(noreplace) /etc/ld.so.conf.d/* @@ -115,9 +120,11 @@ %{_libexecdir}/octave %{_mandir}/man*/octave* %{_infodir}/octave.info* +%{_datadir}/applications/* %files devel %defattr(-,root,root) +%doc doc/liboctave %{_bindir}/mkoctfile* %{_bindir}/octave-bug* %{_bindir}/octave-config* @@ -126,6 +133,13 @@ %changelog +* Thu Mar 23 2006 Quentin Spencer 2.9.5-1 +- New upstream release; remove old patches; add sparse patch. +- Add gcc-c++ as dependency for devel package. +- Add more docs; cleanup extra files in docs. +- Simplify configure command. +- Install desktop file. + * Fri Feb 24 2006 Quentin Spencer 2.9.4-8 - Rebuild for new hdf5. - Remove obsolete configure options. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Nov 2005 06:02:28 -0000 1.6 +++ sources 23 Mar 2006 22:50:59 -0000 1.7 @@ -1 +1 @@ -43561b0d8432847f5eae349c6e89b30a octave-2.9.4.tar.bz2 +09eff7b2319383778db7bb5e50619bf9 octave-2.9.5.tar.bz2 --- octave-2.9.4-header.patch DELETED --- --- octave-2.9.4-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 23 23:19:23 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 23 Mar 2006 18:19:23 -0500 Subject: comps comps-fe5.xml.in,1.30,1.31 Message-ID: <200603232319.k2NNJt2k003389@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3372 Modified Files: comps-fe5.xml.in Log Message: Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- comps-fe5.xml.in 19 Mar 2006 01:49:51 -0000 1.30 +++ comps-fe5.xml.in 23 Mar 2006 23:19:21 -0000 1.31 @@ -50,12 +50,15 @@ mock monotone ocaml + pl + plt-scheme pylint quilt rpmlint splint tkcvs tla + yap yasm From fedora-extras-commits at redhat.com Fri Mar 24 01:33:39 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 23 Mar 2006 20:33:39 -0500 Subject: extras-buildsys/server PackageJob.py,1.44,1.45 Message-ID: <200603240133.k2O1XdH8008021@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7987/server Modified Files: PackageJob.py Log Message: 2006-03-23 Dan Williams * server/PackageJob.py - (_arch_deps_solved): fix cachedir and logfile paths; turns out yum already adds the installroot to these. Furthermore, return an error when we can't find a suitable yum config file for the arch Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- PackageJob.py 13 Mar 2006 03:45:48 -0000 1.44 +++ PackageJob.py 24 Mar 2006 01:33:31 -0000 1.45 @@ -446,9 +446,9 @@ job_yum_dir = os.path.join(self._depsolve_dir, arch) for line in config_opts['yum.conf'].split('\n'): if string.find(line, "cachedir=") >= 0: - line = "cachedir=%s" % os.path.join(job_yum_dir, "cache") + line = "cachedir=cache" elif string.find(line, "logfile=") >= 0: - line = "logfile=%s" % os.path.join(job_yum_dir, "yum.log") + line = "logfile=yum.log" config_lines.append(line+'\n') del config_opts @@ -471,7 +471,12 @@ try: base = yum.YumBase() yum_config = self._write_yum_conf(arch) - base.doConfigSetup(fn=yum_config, root=os.path.dirname(yum_config)) + if not yum_config: + del base + raise DepError("WARNING: bad yum config for arch %s." % arch) + + depsolve_root = os.path.dirname(yum_config) + '/' + base.doConfigSetup(fn=yum_config, root=depsolve_root) threshold = 0 if DEBUG: threshold = 5 @@ -513,7 +518,10 @@ print "%s (%s/%s): Depsolve Error: %s" % (self.uid, self.package, arch, str(e)) success = False - del base, srpm + if base: + del base + if srpm: + del srpm return success def start_depsolve(self, first_try=False): From fedora-extras-commits at redhat.com Fri Mar 24 01:33:33 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 23 Mar 2006 20:33:33 -0500 Subject: extras-buildsys ChangeLog,1.177,1.178 Message-ID: <200603240134.k2O1Y3C1008024@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7987 Modified Files: ChangeLog Log Message: 2006-03-23 Dan Williams * server/PackageJob.py - (_arch_deps_solved): fix cachedir and logfile paths; turns out yum already adds the installroot to these. Furthermore, return an error when we can't find a suitable yum config file for the arch Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- ChangeLog 20 Mar 2006 12:46:44 -0000 1.177 +++ ChangeLog 24 Mar 2006 01:33:25 -0000 1.178 @@ -1,3 +1,10 @@ +2006-03-23 Dan Williams + + * server/PackageJob.py + - (_arch_deps_solved): fix cachedir and logfile paths; turns out yum + already adds the installroot to these. Furthermore, return an + error when we can't find a suitable yum config file for the arch + 2006-03-20 Dan Williams * common/FileDownloader.py From fedora-extras-commits at redhat.com Fri Mar 24 01:34:55 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 23 Mar 2006 20:34:55 -0500 Subject: extras-buildsys/server Repo.py,1.22,1.23 Message-ID: <200603240134.k2O1YtP1008064@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8030/server Modified Files: Repo.py Log Message: 2006-03-23 Dan Williams * server/Repo.py - Consolidate depsolve_again and depsolve_immediate locks into one lock to avoid deadlocks Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Repo.py 24 Feb 2006 17:27:02 -0000 1.22 +++ Repo.py 24 Mar 2006 01:34:48 -0000 1.23 @@ -71,9 +71,8 @@ # The queues are dicts mapping buildjob->boolean, where a boolean # value of True means the job's depsolve has started, and false # means it hasn't. - self._depsolve_immediate_lock = threading.Lock() + self._depsolve_lock = threading.Lock() self._depsolve_immediate_queue = {} - self._depsolve_again_lock = threading.Lock() self._depsolve_again_queue = {} # Repo unlock queue @@ -107,14 +106,12 @@ def request_depsolve(self, buildjob, first_try=False): """ Registers a buildjob be notified to start depsolving when the repo is ready """ + self._depsolve_lock.acquire() if first_try: - self._depsolve_immediate_lock.acquire() self._depsolve_immediate_queue[buildjob] = False - self._depsolve_immediate_lock.release() else: - self._depsolve_again_lock.acquire() self._depsolve_again_queue[buildjob] = False - self._depsolve_again_lock.release() + self._depsolve_lock.release() def request_unlock(self, archjob): self._repo_unlock_lock.acquire() @@ -154,10 +151,10 @@ """ Start waiting depsolves, but only a certain number to avoid nailing the build server too hard. """ - self._depsolve_immediate_lock.acquire() - self._depsolve_again_lock.acquire() + self._depsolve_lock.acquire() max_immediate_depsolves = self.MAX_DEPSOLVE_JOBS + max_again_depsolves = 0 if repo_changed: max_again_depsolves = self.MAX_DEPSOLVE_JOBS / 2 max_immediate_depsolves = self.MAX_DEPSOLVE_JOBS / 2 @@ -168,26 +165,22 @@ if repo_changed: self._start_depsolves_for_queue(self._depsolve_again_queue, max_again_depsolves, first_try=False) - self._depsolve_again_lock.release() - self._depsolve_immediate_lock.release() + self._depsolve_lock.release() def notify_depsolve_done(self, buildjob): """ Notifies the repo that a job is done depsolving """ - self._depsolve_immediate_lock.acquire() - self._depsolve_again_lock.acquire() + self._depsolve_lock.acquire() if buildjob in self._depsolve_immediate_queue: del self._depsolve_immediate_queue[buildjob] elif buildjob in self._depsolve_again_queue: del self._depsolve_again_queue[buildjob] - self._depsolve_again_lock.release() - self._depsolve_immediate_lock.release() + self._depsolve_lock.release() def _any_depsolving_jobs(self): """ Determines if any jobs are currently depsolving """ any_depsolving = False - self._depsolve_immediate_lock.acquire() - self._depsolve_again_lock.acquire() + self._depsolve_lock.acquire() for job in self._depsolve_immediate_queue.keys(): if self._depsolve_immediate_queue[job]: any_depsolving = True @@ -197,8 +190,7 @@ if self._depsolve_again_queue[job]: any_depsolving = True break - self._depsolve_again_lock.release() - self._depsolve_immediate_lock.release() + self._depsolve_lock.release() return any_depsolving @@ -349,6 +341,9 @@ time.sleep(5) + # done + print "Repo (%s): shut down." % self._target_cfg.target_string() + def stop(self): self._stop = True From fedora-extras-commits at redhat.com Fri Mar 24 01:34:50 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 23 Mar 2006 20:34:50 -0500 Subject: extras-buildsys ChangeLog,1.178,1.179 Message-ID: <200603240135.k2O1ZKlw008067@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8030 Modified Files: ChangeLog Log Message: 2006-03-23 Dan Williams * server/Repo.py - Consolidate depsolve_again and depsolve_immediate locks into one lock to avoid deadlocks Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- ChangeLog 24 Mar 2006 01:33:25 -0000 1.178 +++ ChangeLog 24 Mar 2006 01:34:42 -0000 1.179 @@ -1,5 +1,11 @@ 2006-03-23 Dan Williams + * server/Repo.py + - Consolidate depsolve_again and depsolve_immediate locks into + one lock to avoid deadlocks + +2006-03-23 Dan Williams + * server/PackageJob.py - (_arch_deps_solved): fix cachedir and logfile paths; turns out yum already adds the installroot to these. Furthermore, return an From fedora-extras-commits at redhat.com Fri Mar 24 03:54:36 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 22:54:36 -0500 Subject: owners owners.list,1.761,1.762 Message-ID: <200603240355.k2O3t9Ow012343@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12324 Modified Files: owners.list Log Message: Took over ownership of perl-bioperl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.761 retrieving revision 1.762 diff -u -r1.761 -r1.762 --- owners.list 23 Mar 2006 20:16:51 -0000 1.761 +++ owners.list 24 Mar 2006 03:54:36 -0000 1.762 @@ -819,7 +819,7 @@ Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Boulder|An API for hierarchical tag/value structures|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Business-Hours|Calculate business hours in a time period|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 24 04:05:08 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:05:08 -0500 Subject: owners owners.list,1.762,1.763 Message-ID: <200603240405.k2O45h0r014328@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14303 Modified Files: owners.list Log Message: Took ownership of perl-GD-SVG Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.762 retrieving revision 1.763 diff -u -r1.762 -r1.763 --- owners.list 24 Mar 2006 03:54:36 -0000 1.762 +++ owners.list 24 Mar 2006 04:05:08 -0000 1.763 @@ -918,7 +918,7 @@ Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GDGraph|Graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GD|Perl interface to the GD graphics library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-GD-SVG|GD SVG enables SVG output from scripts written using GD|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-GD-SVG|GD SVG enables SVG output from scripts written using GD|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com 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 From fedora-extras-commits at redhat.com Fri Mar 24 04:07:59 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:07:59 -0500 Subject: owners owners.list,1.763,1.764 Message-ID: <200603240408.k2O48VKD014363@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14344 Modified Files: owners.list Log Message: Took ownership of perl-Graph Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.763 retrieving revision 1.764 diff -u -r1.763 -r1.764 --- owners.list 24 Mar 2006 04:05:08 -0000 1.763 +++ owners.list 24 Mar 2006 04:07:58 -0000 1.764 @@ -924,7 +924,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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| 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-Graph|A Perl module for dealing with graphs, the abstract data structures|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|imlinux at gmail.com|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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 24 04:10:52 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:10:52 -0500 Subject: owners owners.list,1.764,1.765 Message-ID: <200603240411.k2O4BObI014391@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14374 Modified Files: owners.list Log Message: Took ownership of perl-Heap Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.764 retrieving revision 1.765 diff -u -r1.764 -r1.765 --- owners.list 24 Mar 2006 04:07:58 -0000 1.764 +++ owners.list 24 Mar 2006 04:10:51 -0000 1.765 @@ -927,7 +927,7 @@ Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|imlinux at gmail.com|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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| -Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|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 From fedora-extras-commits at redhat.com Fri Mar 24 04:13:15 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:13:15 -0500 Subject: owners owners.list,1.765,1.766 Message-ID: <200603240413.k2O4DmHl014423@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14406 Modified Files: owners.list Log Message: Took ownership of perl-MIME-Lite Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.765 retrieving revision 1.766 diff -u -r1.765 -r1.766 --- owners.list 24 Mar 2006 04:10:51 -0000 1.765 +++ owners.list 24 Mar 2006 04:13:15 -0000 1.766 @@ -988,7 +988,7 @@ Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-MailTools|MailTools module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Math-GMP|High speed arbitrary size integer math|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|thm at duke.edu|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|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|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 From fedora-extras-commits at redhat.com Fri Mar 24 04:17:18 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:17:18 -0500 Subject: owners owners.list,1.766,1.767 Message-ID: <200603240417.k2O4Hpbf014474@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14454 Modified Files: owners.list Log Message: Took ownership of perl-SVG Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.766 retrieving revision 1.767 diff -u -r1.766 -r1.767 --- owners.list 24 Mar 2006 04:13:15 -0000 1.766 +++ owners.list 24 Mar 2006 04:17:18 -0000 1.767 @@ -1038,7 +1038,7 @@ 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-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 24 04:19:37 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:19:37 -0500 Subject: owners owners.list,1.767,1.768 Message-ID: <200603240420.k2O4KAFN014530@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14494 Modified Files: owners.list Log Message: took ownership of perl-Text-Shellwords Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.767 retrieving revision 1.768 diff -u -r1.767 -r1.768 --- owners.list 24 Mar 2006 04:17:18 -0000 1.767 +++ owners.list 24 Mar 2006 04:19:37 -0000 1.768 @@ -1065,7 +1065,7 @@ 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 Fedora Extras|perl-Text-Reform|Manual text wrapping and reformatting|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Text-Shellwords|A thin wrapper around the shellwords.pl package|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Text-Shellwords|A thin wrapper around the shellwords.pl package|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Template|Expand template text with embedded Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Unidecode|US-ASCII transliterations of Unicode text|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|perl-Text-WikiFormat|Translate Wiki formatted text into other formats|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 24 04:21:48 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:21:48 -0500 Subject: owners owners.list,1.768,1.769 Message-ID: <200603240422.k2O4MKQG014560@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14543 Modified Files: owners.list Log Message: perl-XML-Writer Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.768 retrieving revision 1.769 diff -u -r1.768 -r1.769 --- owners.list 24 Mar 2006 04:19:37 -0000 1.768 +++ owners.list 24 Mar 2006 04:21:48 -0000 1.769 @@ -1099,7 +1099,7 @@ Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|ville.skytta at iki.fi|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 From fedora-extras-commits at redhat.com Fri Mar 24 07:09:31 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 24 Mar 2006 02:09:31 -0500 Subject: rpms/smbldap-tools - New directory Message-ID: <200603240709.k2O79Xwx020963@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/smbldap-tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20955/smbldap-tools Log Message: Directory /cvs/extras/rpms/smbldap-tools added to the repository From fedora-extras-commits at redhat.com Fri Mar 24 07:09:56 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 24 Mar 2006 02:09:56 -0500 Subject: rpms/smbldap-tools/devel - New directory Message-ID: <200603240709.k2O79wpM020978@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/smbldap-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20955/smbldap-tools/devel Log Message: Directory /cvs/extras/rpms/smbldap-tools/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 24 07:12:56 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 24 Mar 2006 02:12:56 -0500 Subject: rpms/smbldap-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603240712.k2O7CweQ021009@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/smbldap-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20997/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module smbldap-tools --- NEW 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 Mar 24 07:15:06 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 24 Mar 2006 02:15:06 -0500 Subject: rpms/smbldap-tools/devel smbldap-tools-0.9.2-config.patch, NONE, 1.1 smbldap-tools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603240715.k2O7FdIm021075@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/smbldap-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21050/devel Modified Files: .cvsignore sources Added Files: smbldap-tools-0.9.2-config.patch smbldap-tools.spec Log Message: auto-import smbldap-tools-0.9.2-2 on branch devel from smbldap-tools-0.9.2-2.src.rpm smbldap-tools-0.9.2-config.patch: --- NEW FILE smbldap-tools-0.9.2-config.patch --- --- smbldap.conf 2006-01-27 10:52:27.000000000 +0000 +++ smbldap.conf 2006-01-27 11:34:20.000000000 +0000 @@ -34,12 +34,12 @@ # Put your own SID. To obtain this number do: "net getlocalsid". # If not defined, parameter is taking from "net getlocalsid" return -SID="S-1-5-21-4205727931-4131263253-1851132061" +#SID="S-1-5-21-4205727931-4131263253-1851132061" # Domain name the Samba server is in charged. # If not defined, parameter is taking from smb.conf configuration file # Ex: sambaDomain="IDEALX-NT" -sambaDomain="IDEALX-NT" +#sambaDomain="IDEALX-NT" ############################################################################## # @@ -85,15 +85,15 @@ # CA certificate # see "man Net::LDAP" in start_tls section for more details -cafile="/etc/smbldap-tools/ca.pem" +cafile="/etc/pki/tls/certs/ldapserverca.pem" # certificate to use to connect to the ldap server # see "man Net::LDAP" in start_tls section for more details -clientcert="/etc/smbldap-tools/smbldap-tools.pem" +clientcert="/etc/pki/tls/certs/ldapclient.pem" # key certificate to use to connect to the ldap server # see "man Net::LDAP" in start_tls section for more details -clientkey="/etc/smbldap-tools/smbldap-tools.key" +clientkey="/etc/pki/tls/certs/ldapclientkey.pem" # LDAP Suffix # Ex: suffix=dc=IDEALX,dc=ORG @@ -102,7 +102,7 @@ # Where are stored Users # Ex: usersdn="ou=Users,dc=IDEALX,dc=ORG" # Warning: if 'suffix' is not set here, you must set the full dn for usersdn -usersdn="ou=Users,${suffix}" +usersdn="ou=People,${suffix}" # Where are stored Computers # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG" @@ -112,7 +112,7 @@ # Where are stored Groups # Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG" # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn -groupsdn="ou=Groups,${suffix}" +groupsdn="ou=Group,${suffix}" # Where are stored Idmap entries (used if samba is a domain member server) # Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG" --- NEW FILE smbldap-tools.spec --- Summary: User and group administration tools for Samba/OpenLDAP Name: smbldap-tools Version: 0.9.2 Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://samba.idealx.org/index.en.html Source: http://samba.idealx.org/dist/smbldap-tools-%{version}.tgz Patch0: smbldap-tools-0.9.2-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openldap-clients, samba Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch %description In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful to add, modify and delete users and groups, and to change Unix and Samba passwords. In those contexts they replace the system tools to manage users, groups and passwords. %prep %setup -q %{__perl} -pi -e 's|/etc/opt/IDEALX|%{_sysconfdir}|g; s|/opt/IDEALX||g;' \ Makefile smb.conf smbldap.conf \ smbldap-populate smbldap_tools.pm configure.pl \ doc/html/*.html %patch0 -p0 # Don't want this in %{_sbindir}... %{__mv} smbldap-tools.spec original-smbldap-tools.spec %build %install %{__rm} -rf %{buildroot} %{__install} -d -m0755 %{buildroot}%{_sbindir} %{__install} -d -m0755 %{buildroot}%{perl_vendorlib} %{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir} %{__install} -p -m0755 smbldap_tools.pm %{buildroot}%{perl_vendorlib} %{__install} -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf %{__install} -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc ChangeLog CONTRIBUTORS COPYING FILES INFRA INSTALL README TODO %doc configure.pl *.conf doc/* %dir %{_sysconfdir}/smbldap-tools/ %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap.conf %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap_bind.conf %{_sbindir}/smbldap-groupadd %{_sbindir}/smbldap-groupdel %{_sbindir}/smbldap-groupmod %{_sbindir}/smbldap-groupshow %{_sbindir}/smbldap-passwd %{_sbindir}/smbldap-populate %{_sbindir}/smbldap-useradd %{_sbindir}/smbldap-userdel %{_sbindir}/smbldap-usermod %{_sbindir}/smbldap-userinfo %{_sbindir}/smbldap-usershow %{perl_vendorlib}/smbldap_tools.pm %changelog * Fri Jan 27 2006 Paul Howarth 0.9.2-2 - Incorporate smbldap.conf review suggestions from Steven Pritchard (#178905) Undefine SID so it is fetched with "net getlocalsid" Undefine sambaDomain so it is fetched from smb.conf TLS keys and certs should go in /etc/pki/tls/certs usersdn should be "ou=People,${suffix}" to match OpenLDAP migration tools groupsdn should be "ou=Group,${suffix}" to match OpenLDAP migration tools * Wed Jan 25 2006 Paul Howarth 0.9.2-1 - Update to 0.9.2 * Tue Jan 17 2006 Paul Howarth 0.9.1-2 - Unpack tarball quietly - Clean up file list - Put smbldap_tools.pm in %{perl_vendorlib} rather than %{_sbindir} - Add %%{?dist} tag * Sat Jun 04 2005 Dag Wieers - 0.9.1-1 - 3108+/dag - Updated to release 0.9.1. * Tue Apr 05 2005 Dag Wieers - 0.8.8-1 - Updated to release 0.8.8. * Wed Feb 16 2005 Dag Wieers - 0.8.7-2 - Fixed locations, removed /opt/IDEALX. (Alain Rykaert) * Tue Feb 15 2005 Dag Wieers - 0.8.7-1 - Updated to release 0.8.7. * Sat Jan 22 2005 Dag Wieers - 0.8.6-1 - Updated to release 0.8.6. * Sun Jun 20 2004 Dag Wieers - 0.8.5-1 - Updated to release 0.8.5. * Sat Mar 13 2004 Dag Wieers - 0.8.4-1 - Updated to release 0.8.4. * Fri Dec 05 2003 Dag Wieers - 0.8.2-0 - Updated to release 0.8.2. * Thu Oct 09 2003 Dag Wieers - 0.8.1-0 - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smbldap-tools/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Mar 2006 07:12:56 -0000 1.1 +++ .cvsignore 24 Mar 2006 07:15:06 -0000 1.2 @@ -0,0 +1 @@ +smbldap-tools-0.9.2.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/smbldap-tools/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Mar 2006 07:12:56 -0000 1.1 +++ sources 24 Mar 2006 07:15:06 -0000 1.2 @@ -0,0 +1 @@ +bb8eb44adb4e7946de5b486acf480c24 smbldap-tools-0.9.2.tgz From fedora-extras-commits at redhat.com Fri Mar 24 07:19:43 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 24 Mar 2006 02:19:43 -0500 Subject: owners owners.list,1.769,1.770 Message-ID: <200603240720.k2O7KGqd021227@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21205 Modified Files: owners.list Log Message: Add smbldap-tools Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.769 retrieving revision 1.770 diff -u -r1.769 -r1.770 --- owners.list 24 Mar 2006 04:21:48 -0000 1.769 +++ owners.list 24 Mar 2006 07:19:42 -0000 1.770 @@ -1311,6 +1311,7 @@ Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|smb4k|The SMB/CIFS Share Browser for KDE|mgarski at post.pl|extras-qa at fedoraproject.org| +Fedora Extras|smbldap-tools|User and group administration tools for Samba/OpenLDAP|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|snort|An intrusion detection system|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 24 08:43:43 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 24 Mar 2006 03:43:43 -0500 Subject: fedora-security/audit fc4,1.180,1.181 fc5,1.93,1.94 Message-ID: <200603240843.k2O8hhYC023535@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23515 Modified Files: fc4 fc5 Log Message: A couple of days of updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- fc4 23 Mar 2006 19:07:40 -0000 1.180 +++ fc4 24 Mar 2006 08:43:34 -0000 1.181 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060321 -Up to date FC4 as of 20060321 +Up to date CVE as of CVE email 20060323 +Up to date FC4 as of 20060323 ** are items that need attention +CVE-2006-1368 ** kernel CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 ** kernel CVE-2006-1342 ** kernel @@ -270,6 +271,7 @@ CVE-2005-2933 backport (libc-client) [since FEDORA-2005-1115] CVE-2005-2933 VULNERABLE (uw-imap) bz#171345 CVE-2005-2929 backport (lynx) [since FEDORA-2005-1079] +CVE-2005-2922 version (HelixPlayer, fixed 1.0.6) [since FEDORA-2005-940] CVE-2005-2917 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] CVE-2005-2876 backport (util-linux, fixed 2.12r) [since FEDORA-2005-887] CVE-2005-2874 version (cups, fixed 1.1.23) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- fc5 23 Mar 2006 19:07:40 -0000 1.93 +++ fc5 24 Mar 2006 08:43:34 -0000 1.94 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060321 -Up to date FC5 as of 20060321 +Up to date CVE as of CVE email 20060323 +Up to date FC5 as of 20060323 ** are items that need attention +CVE-2006-1368 ** kernel CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 ** kernel CVE-2006-1342 ** kernel @@ -269,6 +270,7 @@ CVE-2005-2946 version (openssl, fixed 0.9.8) CVE-2005-2933 version (libc-client, fixed 2004g at least) CVE-2005-2929 backport (lynx) +CVE-2005-2922 version (HelixPlayer, fixed 1.0.6) CVE-2005-2917 version (squid, fixed 2.5.STABLE11) CVE-2005-2876 version (util-linux, fixed 2.13-pre3) CVE-2005-2874 version (cups, fixed 1.1.23) From fedora-extras-commits at redhat.com Fri Mar 24 09:35:24 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 24 Mar 2006 04:35:24 -0500 Subject: rpms/paps/devel paps-0.6.3-fix-pagesize.patch, NONE, 1.1 paps.spec, 1.6, 1.7 Message-ID: <200603240936.k2O9a0SX026291@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26271 Modified Files: paps.spec Added Files: paps-0.6.3-fix-pagesize.patch Log Message: * Fri Mar 24 2006 Akira TAGOH - 0.6.3-3 - paps-0.6.3-fix-pagesize.patch: fixed displaying the beginning of line at out of page. (#176207) paps-0.6.3-fix-pagesize.patch: --- NEW FILE paps-0.6.3-fix-pagesize.patch --- diff -ruN paps-0.6.3.orig/src/paps.c paps-0.6.3/src/paps.c --- paps-0.6.3.orig/src/paps.c 2005-12-21 05:22:04.000000000 +0900 +++ paps-0.6.3/src/paps.c 2006-03-24 18:27:06.000000000 +0900 @@ -558,6 +558,7 @@ "%%%%Title: %s\n" "%%%%Creator: paps version 0.1 by Dov Grobgeld\n" "%%%%Pages: (atend)\n" + "%%%%BoundingBox: 0 0 %d %d\n" "%%%%BeginProlog\n" "%%%%Orientation: %s\n" "/papsdict 1 dict def\n" @@ -605,6 +606,8 @@ " 0 pageheight neg translate\n" "} def\n", title, + page_layout->page_width, + page_layout->page_height, orientation_names[orientation] ); @@ -612,6 +615,7 @@ "%% User settings\n" "/pagewidth %d def\n" "/pageheight %d def\n" + "pagewidth pageheight setpagesize\n" "/column_width %d def\n" "/bodyheight %d def\n" Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- paps.spec 2 Mar 2006 07:32:59 -0000 1.6 +++ paps.spec 24 Mar 2006 09:35:23 -0000 1.7 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -8,6 +8,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pango-devel Patch0: paps-0.6.1-makefile.patch +Patch1: paps-0.6.3-fix-pagesize.patch Summary: Plain Text to PostScript converter Group: Applications/Publishing @@ -18,6 +19,7 @@ %prep %setup -q %patch0 -p1 -b .makefile +%patch1 -p1 -b .pagesize aclocal automake autoconf @@ -44,6 +46,9 @@ %changelog +* Fri Mar 24 2006 Akira TAGOH - 0.6.3-3 +- paps-0.6.3-fix-pagesize.patch: fixed displaying the beginning of line at out of page. (#176207) + * Thu Mar 2 2006 Akira TAGOH - 0.6.3-2 - rebuilt. From fedora-extras-commits at redhat.com Fri Mar 24 09:43:06 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 24 Mar 2006 04:43:06 -0500 Subject: rpms/paps/devel paps-0.6.2-fix-bufferoverflow.patch,1.1,NONE Message-ID: <200603240943.k2O9h8v1026353@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26344 Removed Files: paps-0.6.2-fix-bufferoverflow.patch Log Message: --- paps-0.6.2-fix-bufferoverflow.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 09:46:46 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 24 Mar 2006 04:46:46 -0500 Subject: rpms/paps/FC-5 paps.spec, 1.6, 1.7 paps-0.6.2-fix-bufferoverflow.patch, 1.1, NONE Message-ID: <200603240947.k2O9lIuV026443@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26426 Modified Files: paps.spec Removed Files: paps-0.6.2-fix-bufferoverflow.patch Log Message: * Fri Mar 24 2006 Akira TAGOH - 0.6.3-3 - paps-0.6.3-fix-pagesize.patch: fixed displaying the beginning of line at out of page. (#176207) Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/FC-5/paps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- paps.spec 2 Mar 2006 07:32:59 -0000 1.6 +++ paps.spec 24 Mar 2006 09:46:45 -0000 1.7 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -8,6 +8,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pango-devel Patch0: paps-0.6.1-makefile.patch +Patch1: paps-0.6.3-fix-pagesize.patch Summary: Plain Text to PostScript converter Group: Applications/Publishing @@ -18,6 +19,7 @@ %prep %setup -q %patch0 -p1 -b .makefile +%patch1 -p1 -b .pagesize aclocal automake autoconf @@ -44,6 +46,9 @@ %changelog +* Fri Mar 24 2006 Akira TAGOH - 0.6.3-3 +- paps-0.6.3-fix-pagesize.patch: fixed displaying the beginning of line at out of page. (#176207) + * Thu Mar 2 2006 Akira TAGOH - 0.6.3-2 - rebuilt. --- paps-0.6.2-fix-bufferoverflow.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 09:49:54 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 24 Mar 2006 04:49:54 -0500 Subject: rpms/paps/FC-5 paps-0.6.3-fix-pagesize.patch,NONE,1.1 Message-ID: <200603240949.k2O9nuB2026506@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26497 Added Files: paps-0.6.3-fix-pagesize.patch Log Message: paps-0.6.3-fix-pagesize.patch: --- NEW FILE paps-0.6.3-fix-pagesize.patch --- diff -ruN paps-0.6.3.orig/src/paps.c paps-0.6.3/src/paps.c --- paps-0.6.3.orig/src/paps.c 2005-12-21 05:22:04.000000000 +0900 +++ paps-0.6.3/src/paps.c 2006-03-24 18:27:06.000000000 +0900 @@ -558,6 +558,7 @@ "%%%%Title: %s\n" "%%%%Creator: paps version 0.1 by Dov Grobgeld\n" "%%%%Pages: (atend)\n" + "%%%%BoundingBox: 0 0 %d %d\n" "%%%%BeginProlog\n" "%%%%Orientation: %s\n" "/papsdict 1 dict def\n" @@ -605,6 +606,8 @@ " 0 pageheight neg translate\n" "} def\n", title, + page_layout->page_width, + page_layout->page_height, orientation_names[orientation] ); @@ -612,6 +615,7 @@ "%% User settings\n" "/pagewidth %d def\n" "/pageheight %d def\n" + "pagewidth pageheight setpagesize\n" "/column_width %d def\n" "/bodyheight %d def\n" From fedora-extras-commits at redhat.com Fri Mar 24 10:04:50 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:04:50 -0500 Subject: rpms/python-simpy import.log,1.2,1.3 Message-ID: <200603241005.k2OA5X0I028673@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28630 Modified Files: import.log Log Message: auto-import python-simpy-1.7-1 on branch devel from python-simpy-1.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-simpy/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 22 Dec 2005 20:27:14 -0000 1.2 +++ import.log 24 Mar 2006 10:04:48 -0000 1.3 @@ -1 +1,2 @@ python-simpy-1_6_1-2:HEAD:python-simpy-1.6.1-2.src.rpm:1135283225 +python-simpy-1_7-1:HEAD:python-simpy-1.7-1.src.rpm:1143194680 From fedora-extras-commits at redhat.com Fri Mar 24 10:05:09 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:05:09 -0500 Subject: rpms/python-simpy/devel .cvsignore, 1.2, 1.3 python-simpy.spec, 1.4, 1.5 sources, 1.2, 1.3 python-simpy-1.6.1-no-shebang.patch, 1.1, NONE Message-ID: <200603241005.k2OA5jrG028678@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28630/devel Modified Files: .cvsignore python-simpy.spec sources Removed Files: python-simpy-1.6.1-no-shebang.patch Log Message: auto-import python-simpy-1.7-1 on branch devel from python-simpy-1.7-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Dec 2005 20:27:20 -0000 1.2 +++ .cvsignore 24 Mar 2006 10:05:09 -0000 1.3 @@ -1 +1 @@ -SimPy-1.6.1.tar.gz +SimPy-1.7final.tar.gz Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-simpy.spec 20 Feb 2006 14:13:18 -0000 1.4 +++ python-simpy.spec 24 Mar 2006 10:05:09 -0000 1.5 @@ -2,14 +2,13 @@ %define pkgname SimPy Name: python-simpy -Version: 1.6.1 -Release: 4%{?dist} +Version: 1.7 +Release: 1%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL URL: http://simpy.sourceforge.net -Source0: http://download.sourceforge.net/simpy/SimPy-%{version}.tar.gz -Patch1: python-simpy-1.6.1-no-shebang.patch +Source0: http://dl.sf.net/simpy/SimPy-%{version}final.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -39,8 +38,8 @@ %prep %setup -q -n %{pkgname}-%{version} -%patch1 - +# Remove the shebangs to make rpmlint happy +%{__sed} -i '1{\?^#!/usr/bin/env\ python$?d}' SimPy/*.py %build %{__python} setup.py build @@ -58,7 +57,9 @@ %files %defattr(-,root,root,-) # choose html over txt files for documentation -%doc *.html PKG-INFO LGPLlicense_files SimPyDocs SimPyModels +%doc *.html PKG-INFO LGPLlicense_files SimPyModels +%doc SimPyDocs/*.html SimPyDocs/*.css +%doc SimPyDocs/bankprograms SimPyDocs/images SimPyDocs/Interfacing SimPyDocs/SimGUIManual SimPyDocs/SimPlotManual SimPyDocs/SimStepManual %dir %{python_sitelib}/%{pkgname}/ %{python_sitelib}/%{pkgname}/*.py %{python_sitelib}/%{pkgname}/*.pyc @@ -71,6 +72,10 @@ %changelog +* Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 +- SimPy-1.7 +- Drop shebang removal patch. Implement it with sed script. + * Mon Feb 20 2006 Sarantis Paskalis - 1.6.1-4 - Rebuild for FC5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Dec 2005 20:27:20 -0000 1.2 +++ sources 24 Mar 2006 10:05:09 -0000 1.3 @@ -1 +1 @@ -6de42d6289bee6d767d07f8839f89d07 SimPy-1.6.1.tar.gz +0bf0102e7976b3f40e52fc43f93751ad SimPy-1.7final.tar.gz --- python-simpy-1.6.1-no-shebang.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 10:20:29 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:20:29 -0500 Subject: rpms/python-simpy/FC-5 python-simpy.spec,1.4,1.5 Message-ID: <200603241021.k2OAL1wW028792@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28775 Modified Files: python-simpy.spec Log Message: SimPy 1.7 Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/python-simpy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-simpy.spec 20 Feb 2006 14:13:18 -0000 1.4 +++ python-simpy.spec 24 Mar 2006 10:20:28 -0000 1.5 @@ -2,14 +2,13 @@ %define pkgname SimPy Name: python-simpy -Version: 1.6.1 -Release: 4%{?dist} +Version: 1.7 +Release: 1%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL URL: http://simpy.sourceforge.net -Source0: http://download.sourceforge.net/simpy/SimPy-%{version}.tar.gz -Patch1: python-simpy-1.6.1-no-shebang.patch +Source0: http://dl.sf.net/simpy/SimPy-%{version}final.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -39,8 +38,8 @@ %prep %setup -q -n %{pkgname}-%{version} -%patch1 - +# Remove the shebangs to make rpmlint happy +%{__sed} -i '1{\?^#!/usr/bin/env\ python$?d}' SimPy/*.py %build %{__python} setup.py build @@ -58,7 +57,9 @@ %files %defattr(-,root,root,-) # choose html over txt files for documentation -%doc *.html PKG-INFO LGPLlicense_files SimPyDocs SimPyModels +%doc *.html PKG-INFO LGPLlicense_files SimPyModels +%doc SimPyDocs/*.html SimPyDocs/*.css +%doc SimPyDocs/bankprograms SimPyDocs/images SimPyDocs/Interfacing SimPyDocs/SimGUIManual SimPyDocs/SimPlotManual SimPyDocs/SimStepManual %dir %{python_sitelib}/%{pkgname}/ %{python_sitelib}/%{pkgname}/*.py %{python_sitelib}/%{pkgname}/*.pyc @@ -71,6 +72,10 @@ %changelog +* Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 +- SimPy-1.7 +- Drop shebang removal patch. Implement it with sed script. + * Mon Feb 20 2006 Sarantis Paskalis - 1.6.1-4 - Rebuild for FC5. From fedora-extras-commits at redhat.com Fri Mar 24 10:22:03 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 24 Mar 2006 05:22:03 -0500 Subject: rpms/libgnomedb/devel libgnomedb-1.9.100-unknown-datatype-fix.patch, NONE, 1.1 libgnomedb.spec, 1.12, 1.13 Message-ID: <200603241022.k2OAMZ7S028856@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgnomedb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28836 Modified Files: libgnomedb.spec Added Files: libgnomedb-1.9.100-unknown-datatype-fix.patch Log Message: * Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 - Add patch2 fixing bz 186517 libgnomedb-1.9.100-unknown-datatype-fix.patch: --- NEW FILE libgnomedb-1.9.100-unknown-datatype-fix.patch --- diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c 2005-08-07 15:07:13.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c 2006-03-24 10:22:13.000000000 +0100 @@ -1056,6 +1056,12 @@ GSList *params; GnomeDbParameter *similar = NULL; GSList *param_dest_fields; + + /* If people try to call us to add a NULL param do notting. */ + if (!param) { + g_warning ("Cannot add NULL param"); + return; + } if (g_slist_find (dataset->parameters, param)) return; Only in libgnomedb-1.9.100/libgnomedb: gnome-db-data-set.c~ diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c 2005-09-08 12:36:57.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c 2006-03-24 10:16:17.000000000 +0100 @@ -99,6 +99,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; /* Assoc transl[] = { */ @@ -181,6 +182,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -254,6 +256,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -327,6 +330,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -386,7 +390,7 @@ info->value_test_gda_types = g_new0 (GdaValueType, GDA_VALUE_TYPE_UNKNOWN); gda_type = GDA_VALUE_TYPE_NULL; - for (gda_type ++; gda_type < GDA_VALUE_TYPE_UNKNOWN; gda_type ++) { + for (gda_type ++; gda_type <= GDA_VALUE_TYPE_UNKNOWN; gda_type ++) { info->value_test_data_types [gda_type - 1] = gda_type_to_string (gda_type); info->value_test_gda_types [gda_type - 1] = gda_type; } Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c~ diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c 2005-08-07 15:07:14.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c 2006-03-24 10:25:21.000000000 +0100 @@ -285,7 +285,13 @@ } } - if (type) { + if (!type) + { + g_warning ("Could not determine the DBMS data type for Gda type %d", gda_column_get_gdatype (col_attrs)); + type = "unknown"; + } + + { retval = gnome_db_server_get_data_type_by_name (srv, type); if (!retval) { /* create a GnomeDbServerDataType for that 'type' */ @@ -297,8 +303,6 @@ g_object_unref (retval); } } - else - g_warning ("Could not determine the DBMS data type for Gda type %d", gda_column_get_gdatype (col_attrs)); return retval; } Only in libgnomedb-1.9.100/libgnomedb: gnome-db-wrapper-field.c~ Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libgnomedb.spec 14 Feb 2006 21:29:02 -0000 1.12 +++ libgnomedb.spec 24 Mar 2006 10:22:02 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Library for writing gnome database programs Name: libgnomedb Version: 1.9.100 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -17,6 +17,7 @@ Patch0: libgnomedb-1.2.0-desktop.patch Patch1: libgnomedb-1.9.100-sharp.patch +Patch2: libgnomedb-1.9.100-unknown-datatype-fix.patch %description libgnomedb is a library that eases the task of writing @@ -54,6 +55,7 @@ %setup -q %patch0 -p1 -b .desktop.patch %patch1 -p1 -b .sharp +%patch2 -p1 -b .unknown %build @@ -153,6 +155,9 @@ %changelog +* Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 +- Add patch2 fixing bz 186517 + * Mon Feb 13 2006 Hans de Goede 1:1.9.100-5 - Bump release and rebuild for new gcc4.1 and glibc - Attempt to properly install C-sharp/mono bindings From fedora-extras-commits at redhat.com Fri Mar 24 10:23:34 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:23:34 -0500 Subject: rpms/python-simpy/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200603241024.k2OAO6dv028930@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28902 Modified Files: .cvsignore sources Log Message: Update sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Dec 2005 20:27:20 -0000 1.2 +++ .cvsignore 24 Mar 2006 10:23:34 -0000 1.3 @@ -1 +1 @@ -SimPy-1.6.1.tar.gz +SimPy-1.7final.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Dec 2005 20:27:20 -0000 1.2 +++ sources 24 Mar 2006 10:23:34 -0000 1.3 @@ -1 +1 @@ -6de42d6289bee6d767d07f8839f89d07 SimPy-1.6.1.tar.gz +0bf0102e7976b3f40e52fc43f93751ad SimPy-1.7final.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 10:27:37 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:27:37 -0500 Subject: rpms/python-simpy/FC-5 python-simpy.spec,1.5,1.6 Message-ID: <200603241028.k2OASAd0029078@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29061 Modified Files: python-simpy.spec Log Message: Bump release Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/python-simpy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-simpy.spec 24 Mar 2006 10:20:28 -0000 1.5 +++ python-simpy.spec 24 Mar 2006 10:27:37 -0000 1.6 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,6 +72,9 @@ %changelog +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 +- Bump release + * Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 - SimPy-1.7 - Drop shebang removal patch. Implement it with sed script. From fedora-extras-commits at redhat.com Fri Mar 24 10:30:33 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:30:33 -0500 Subject: rpms/python-simpy import.log,1.3,1.4 Message-ID: <200603241031.k2OAV6Qg029174@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29142 Modified Files: import.log Log Message: auto-import python-simpy-1.7-1 on branch FC-5 from python-simpy-1.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-simpy/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 24 Mar 2006 10:04:48 -0000 1.3 +++ import.log 24 Mar 2006 10:30:33 -0000 1.4 @@ -1,2 +1,3 @@ python-simpy-1_6_1-2:HEAD:python-simpy-1.6.1-2.src.rpm:1135283225 python-simpy-1_7-1:HEAD:python-simpy-1.7-1.src.rpm:1143194680 +python-simpy-1_7-1:FC-5:python-simpy-1.7-1.src.rpm:1143196225 From fedora-extras-commits at redhat.com Fri Mar 24 10:30:39 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:30:39 -0500 Subject: rpms/python-simpy/FC-5 python-simpy.spec, 1.6, 1.7 python-simpy-1.6.1-no-shebang.patch, 1.1, NONE Message-ID: <200603241031.k2OAVBmF029177@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29142/FC-5 Modified Files: python-simpy.spec Removed Files: python-simpy-1.6.1-no-shebang.patch Log Message: auto-import python-simpy-1.7-1 on branch FC-5 from python-simpy-1.7-1.src.rpm Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/python-simpy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-simpy.spec 24 Mar 2006 10:27:37 -0000 1.6 +++ python-simpy.spec 24 Mar 2006 10:30:39 -0000 1.7 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,9 +72,6 @@ %changelog -* Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 -- Bump release - * Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 - SimPy-1.7 - Drop shebang removal patch. Implement it with sed script. --- python-simpy-1.6.1-no-shebang.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 10:35:59 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:35:59 -0500 Subject: rpms/python-simpy import.log,1.4,1.5 Message-ID: <200603241036.k2OAaWwQ029266@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29234 Modified Files: import.log Log Message: auto-import python-simpy-1.7-3 on branch devel from python-simpy-1.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-simpy/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 24 Mar 2006 10:30:33 -0000 1.4 +++ import.log 24 Mar 2006 10:35:59 -0000 1.5 @@ -1,3 +1,4 @@ python-simpy-1_6_1-2:HEAD:python-simpy-1.6.1-2.src.rpm:1135283225 python-simpy-1_7-1:HEAD:python-simpy-1.7-1.src.rpm:1143194680 python-simpy-1_7-1:FC-5:python-simpy-1.7-1.src.rpm:1143196225 +python-simpy-1_7-3:HEAD:python-simpy-1.7-3.src.rpm:1143196551 From fedora-extras-commits at redhat.com Fri Mar 24 10:36:05 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:36:05 -0500 Subject: rpms/python-simpy/devel python-simpy.spec,1.5,1.6 Message-ID: <200603241036.k2OAabQp029269@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29234/devel Modified Files: python-simpy.spec Log Message: auto-import python-simpy-1.7-3 on branch devel from python-simpy-1.7-3.src.rpm Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-simpy.spec 24 Mar 2006 10:05:09 -0000 1.5 +++ python-simpy.spec 24 Mar 2006 10:36:05 -0000 1.6 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,6 +72,12 @@ %changelog +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +- Bump release to make tag for building. + +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 +- Bump release + * Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 - SimPy-1.7 - Drop shebang removal patch. Implement it with sed script. From fedora-extras-commits at redhat.com Fri Mar 24 10:37:22 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:37:22 -0500 Subject: rpms/python-simpy import.log,1.5,1.6 Message-ID: <200603241037.k2OAbtRT029370@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29331 Modified Files: import.log Log Message: auto-import python-simpy-1.7-3 on branch FC-5 from python-simpy-1.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-simpy/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 24 Mar 2006 10:35:59 -0000 1.5 +++ import.log 24 Mar 2006 10:37:22 -0000 1.6 @@ -2,3 +2,4 @@ python-simpy-1_7-1:HEAD:python-simpy-1.7-1.src.rpm:1143194680 python-simpy-1_7-1:FC-5:python-simpy-1.7-1.src.rpm:1143196225 python-simpy-1_7-3:HEAD:python-simpy-1.7-3.src.rpm:1143196551 +python-simpy-1_7-3:FC-5:python-simpy-1.7-3.src.rpm:1143196634 From fedora-extras-commits at redhat.com Fri Mar 24 10:37:29 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:37:29 -0500 Subject: rpms/python-simpy/FC-5 python-simpy.spec,1.7,1.8 Message-ID: <200603241038.k2OAc14c029373@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29331/FC-5 Modified Files: python-simpy.spec Log Message: auto-import python-simpy-1.7-3 on branch FC-5 from python-simpy-1.7-3.src.rpm Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/python-simpy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-simpy.spec 24 Mar 2006 10:30:39 -0000 1.7 +++ python-simpy.spec 24 Mar 2006 10:37:28 -0000 1.8 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,6 +72,12 @@ %changelog +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +- Bump release to make tag for building. + +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 +- Bump release + * Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 - SimPy-1.7 - Drop shebang removal patch. Implement it with sed script. From fedora-extras-commits at redhat.com Fri Mar 24 10:46:36 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:46:36 -0500 Subject: rpms/python-simpy import.log,1.6,1.7 Message-ID: <200603241047.k2OAl8PD029539@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29505 Modified Files: import.log Log Message: auto-import python-simpy-1.7-3 on branch FC-4 from python-simpy-1.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-simpy/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 24 Mar 2006 10:37:22 -0000 1.6 +++ import.log 24 Mar 2006 10:46:35 -0000 1.7 @@ -3,3 +3,4 @@ python-simpy-1_7-1:FC-5:python-simpy-1.7-1.src.rpm:1143196225 python-simpy-1_7-3:HEAD:python-simpy-1.7-3.src.rpm:1143196551 python-simpy-1_7-3:FC-5:python-simpy-1.7-3.src.rpm:1143196634 +python-simpy-1_7-3:FC-4:python-simpy-1.7-3.src.rpm:1143197187 From fedora-extras-commits at redhat.com Fri Mar 24 10:46:41 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:46:41 -0500 Subject: rpms/python-simpy/FC-4 .cvsignore, 1.2, 1.3 python-simpy.spec, 1.2, 1.3 sources, 1.2, 1.3 python-simpy-1.6.1-no-shebang.patch, 1.1, NONE Message-ID: <200603241047.k2OAlEqu029546@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29505/FC-4 Modified Files: .cvsignore python-simpy.spec sources Removed Files: python-simpy-1.6.1-no-shebang.patch Log Message: auto-import python-simpy-1.7-3 on branch FC-4 from python-simpy-1.7-3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Dec 2005 20:27:20 -0000 1.2 +++ .cvsignore 24 Mar 2006 10:46:41 -0000 1.3 @@ -1 +1 @@ -SimPy-1.6.1.tar.gz +SimPy-1.7final.tar.gz Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-4/python-simpy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-simpy.spec 26 Dec 2005 11:15:22 -0000 1.2 +++ python-simpy.spec 24 Mar 2006 10:46:41 -0000 1.3 @@ -2,14 +2,13 @@ %define pkgname SimPy Name: python-simpy -Version: 1.6.1 +Version: 1.7 Release: 3%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL URL: http://simpy.sourceforge.net -Source0: http://download.sourceforge.net/simpy/SimPy-%{version}.tar.gz -Patch1: python-simpy-1.6.1-no-shebang.patch +Source0: http://dl.sf.net/simpy/SimPy-%{version}final.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -39,8 +38,8 @@ %prep %setup -q -n %{pkgname}-%{version} -%patch1 - +# Remove the shebangs to make rpmlint happy +%{__sed} -i '1{\?^#!/usr/bin/env\ python$?d}' SimPy/*.py %build %{__python} setup.py build @@ -58,7 +57,9 @@ %files %defattr(-,root,root,-) # choose html over txt files for documentation -%doc *.html PKG-INFO LGPLlicense_files SimPyDocs SimPyModels +%doc *.html PKG-INFO LGPLlicense_files SimPyModels +%doc SimPyDocs/*.html SimPyDocs/*.css +%doc SimPyDocs/bankprograms SimPyDocs/images SimPyDocs/Interfacing SimPyDocs/SimGUIManual SimPyDocs/SimPlotManual SimPyDocs/SimStepManual %dir %{python_sitelib}/%{pkgname}/ %{python_sitelib}/%{pkgname}/*.py %{python_sitelib}/%{pkgname}/*.pyc @@ -71,6 +72,19 @@ %changelog +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +- Bump release to make tag for building. + +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 +- Bump release + +* Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 +- SimPy-1.7 +- Drop shebang removal patch. Implement it with sed script. + +* Mon Feb 20 2006 Sarantis Paskalis - 1.6.1-4 +- Rebuild for FC5. + * Mon Dec 26 2005 Sarantis Paskalis - 1.6.1-3 - Add dist in release. Bump release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Dec 2005 20:27:20 -0000 1.2 +++ sources 24 Mar 2006 10:46:41 -0000 1.3 @@ -1 +1 @@ -6de42d6289bee6d767d07f8839f89d07 SimPy-1.6.1.tar.gz +0bf0102e7976b3f40e52fc43f93751ad SimPy-1.7final.tar.gz --- python-simpy-1.6.1-no-shebang.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 11:04:12 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 06:04:12 -0500 Subject: rpms/python-simpy/FC-5 python-simpy.spec,1.8,1.9 Message-ID: <200603241104.k2OB4kJ9031688@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31671 Modified Files: python-simpy.spec Log Message: Rebump release Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/python-simpy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-simpy.spec 24 Mar 2006 10:37:28 -0000 1.8 +++ python-simpy.spec 24 Mar 2006 11:04:11 -0000 1.9 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,7 +72,7 @@ %changelog -* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3, 1.7-4 - Bump release to make tag for building. * Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 From fedora-extras-commits at redhat.com Fri Mar 24 11:07:54 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 06:07:54 -0500 Subject: rpms/python-simpy/FC-4 python-simpy.spec,1.3,1.4 Message-ID: <200603241108.k2OB8QJY031742@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31725 Modified Files: python-simpy.spec Log Message: Bump release Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-4/python-simpy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-simpy.spec 24 Mar 2006 10:46:41 -0000 1.3 +++ python-simpy.spec 24 Mar 2006 11:07:54 -0000 1.4 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,7 +72,7 @@ %changelog -* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3, 1.7-4 - Bump release to make tag for building. * Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 From fedora-extras-commits at redhat.com Fri Mar 24 11:09:30 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 06:09:30 -0500 Subject: rpms/python-simpy/devel python-simpy.spec,1.6,1.7 Message-ID: <200603241110.k2OBA23N031794@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31777 Modified Files: python-simpy.spec Log Message: Bump release. Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-simpy.spec 24 Mar 2006 10:36:05 -0000 1.6 +++ python-simpy.spec 24 Mar 2006 11:09:29 -0000 1.7 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,7 +72,7 @@ %changelog -* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3, 1.7-4 - Bump release to make tag for building. * Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 From fedora-extras-commits at redhat.com Fri Mar 24 11:39:55 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:39:55 -0500 Subject: rpms/bcm43xx-fwcutter - New directory Message-ID: <200603241139.k2OBdvtY032027@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32015/bcm43xx-fwcutter Log Message: Directory /cvs/extras/rpms/bcm43xx-fwcutter added to the repository From fedora-extras-commits at redhat.com Fri Mar 24 11:40:01 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:40:01 -0500 Subject: rpms/bcm43xx-fwcutter/devel - New directory Message-ID: <200603241140.k2OBe3Tc032052@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32015/bcm43xx-fwcutter/devel Log Message: Directory /cvs/extras/rpms/bcm43xx-fwcutter/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 24 11:40:12 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:40:12 -0500 Subject: rpms/bcm43xx-fwcutter Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603241140.k2OBeE75032093@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32077 Added Files: Makefile import.log Log Message: Setup of module bcm43xx-fwcutter --- NEW FILE Makefile --- # Top level Makefile for module bcm43xx-fwcutter all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 24 11:40:17 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:40:17 -0500 Subject: rpms/bcm43xx-fwcutter/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603241140.k2OBeJtg032121@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32077/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bcm43xx-fwcutter --- NEW 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 Mar 24 11:40:41 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:40:41 -0500 Subject: rpms/bcm43xx-fwcutter import.log,1.1,1.2 Message-ID: <200603241141.k2OBfD3r032234@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32170 Modified Files: import.log Log Message: auto-import bcm43xx-fwcutter-003-2 on branch devel from bcm43xx-fwcutter-003-2.src.rpm Import bcm43xx-fwcutter Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 Mar 2006 11:40:11 -0000 1.1 +++ import.log 24 Mar 2006 11:40:40 -0000 1.2 @@ -0,0 +1 @@ +bcm43xx-fwcutter-003-2:HEAD:bcm43xx-fwcutter-003-2.src.rpm:1143200438 From fedora-extras-commits at redhat.com Fri Mar 24 11:40:46 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:40:46 -0500 Subject: rpms/bcm43xx-fwcutter/devel README.Fedora, NONE, 1.1 bcm43xx-fwcutter.spec, NONE, 1.1 modprobe.bcm43xx, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603241141.k2OBfJ1c032245@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32170/devel Modified Files: .cvsignore sources Added Files: README.Fedora bcm43xx-fwcutter.spec modprobe.bcm43xx Log Message: auto-import bcm43xx-fwcutter-003-2 on branch devel from bcm43xx-fwcutter-003-2.src.rpm Import bcm43xx-fwcutter --- NEW FILE README.Fedora --- Using the bcm43xx-fwcutter tool to install Broadcom firmware in Fedora. ----------------------------------------------------------------------- To use the bcm43xx driver which is part of the Fedora kernel, you need to extract the firmware which is part of the official MacOS, Windows, or Linux drivers. If your Fedora installation is dual-booting with MacOS or Windows, then you probably already have a suitable driver available. Otherwise, the README file contains a number of links from which you can download drivers. It shouldn't matter which one you use -- the kernel's bcm43xx driver ought to work with all of them. Having obtained the file from which you wish to extract the firmware, run this command as root. Replace '' with the actual name of the file, of course: bcm43xx-fwcutter -w /lib/firmware This will save the various firmware files into the /lib/firmware directory, from where the kernel can load them when necessary. Because the bcm43xx driver is new and experimental, it is not configured to be automatically loaded in the Fedora Core 5 kernel. In order to ensure that the driver is loaded, you may need to copy the 'modprobe.bcm43xx' file into the /etc/modprobe.d directory. Please report your success or failure with the bcm43xx driver in bugzilla at https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=186329 --- NEW FILE bcm43xx-fwcutter.spec --- Name: bcm43xx-fwcutter Version: 003 Release: 2%{?dist} Summary: Firmware extraction tool for Broadcom wireless driver Group: System Environment/Base License: GPL URL: http://bcm43xx.berlios.de/ Source0: http://download.berlios.de/bcm43xx/%{name}-%{version}.tar.bz2 Source1: README.Fedora Source2: modprobe.bcm43xx BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This package contains the 'bcm43xx-fwcutter' tool which is used to extract firmware for the Broadcom network devices, from the official Windows, MacOS or Linux drivers. See the README.Fedora file shipped in the package's documentation for instructions on using this tool. %prep %setup -q sed -i -e 's/-O2/$(RPM_OPT_FLAGS)/' Makefile %build make cp %{SOURCE1} . cp %{SOURCE2} . %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m0755 bcm43xx-fwcutter $RPM_BUILD_ROOT%{_bindir}/bcm43xx-fwcutter mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -m0644 bcm43xx-fwcutter.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/bcm43xx-fwcutter %{_mandir}/man1/* %doc README README.Fedora modprobe.bcm43xx %changelog * Thu Mar 23 2006 David Woodhouse 003-2 - Package review. Use $RPM_OPT_FLAGS, ship man page, etc. - Complete documentation, add sample bcm43xx.modprobe file * Wed Mar 22 2006 David Woodhouse 003-1 - Initial build. --- NEW FILE modprobe.bcm43xx --- alias pci:v000014E4d0x00004301sv*sd*bc*sc*i* bcm43xx alias pci:v000014E4d0x00004307sv*sd*bc*sc*i* bcm43xx alias pci:v000014E4d0x00004318sv*sd*bc*sc*i* bcm43xx alias pci:v000014E4d0x00004320sv*sd*bc*sc*i* bcm43xx alias pci:v000014E4d0x00004324sv*sd*bc*sc*i* bcm43xx alias pci:v000014E4d0x00004325sv*sd*bc*sc*i* bcm43xx Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Mar 2006 11:40:17 -0000 1.1 +++ .cvsignore 24 Mar 2006 11:40:46 -0000 1.2 @@ -0,0 +1 @@ +bcm43xx-fwcutter-003.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Mar 2006 11:40:17 -0000 1.1 +++ sources 24 Mar 2006 11:40:46 -0000 1.2 @@ -0,0 +1 @@ +89b407d920811cfd15507da17f901bb0 bcm43xx-fwcutter-003.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 24 13:26:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 24 Mar 2006 08:26:35 -0500 Subject: rpms/libgnomedb/devel libgnomedb-1.9.100-unknown-datatype-fix.patch, 1.1, 1.2 Message-ID: <200603241327.k2ODR7hO005560@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgnomedb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5540 Modified Files: libgnomedb-1.9.100-unknown-datatype-fix.patch Log Message: * Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 - Add patch2 fixing bz 186517 libgnomedb-1.9.100-unknown-datatype-fix.patch: Index: libgnomedb-1.9.100-unknown-datatype-fix.patch =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb-1.9.100-unknown-datatype-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgnomedb-1.9.100-unknown-datatype-fix.patch 24 Mar 2006 10:22:02 -0000 1.1 +++ libgnomedb-1.9.100-unknown-datatype-fix.patch 24 Mar 2006 13:26:34 -0000 1.2 @@ -1,6 +1,6 @@ diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c 2005-08-07 15:07:13.000000000 +0200 -+++ libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c 2006-03-24 10:22:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c 2006-03-24 11:20:29.000000000 +0100 @@ -1056,6 +1056,12 @@ GSList *params; GnomeDbParameter *similar = NULL; @@ -14,10 +14,10 @@ if (g_slist_find (dataset->parameters, param)) return; -Only in libgnomedb-1.9.100/libgnomedb: gnome-db-data-set.c~ +Only in libgnomedb-1.9.100/libgnomedb: gnome-db-data-set.c.unknown diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c 2005-09-08 12:36:57.000000000 +0200 -+++ libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c 2006-03-24 10:16:17.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c 2006-03-24 11:21:38.000000000 +0100 @@ -99,6 +99,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, @@ -50,7 +50,13 @@ }; info = g_new0 (GnomeDbServerInfo, 1); -@@ -386,7 +390,7 @@ +@@ -381,12 +385,12 @@ + info->implicit_data_types_casts = TRUE; + info->alias_needs_as_keyword = TRUE; + +- info->value_nb_tests_types = GDA_VALUE_TYPE_UNKNOWN - 1; ++ info->value_nb_tests_types = GDA_VALUE_TYPE_UNKNOWN; + info->value_test_data_types = g_new0 (gchar *, GDA_VALUE_TYPE_UNKNOWN); info->value_test_gda_types = g_new0 (GdaValueType, GDA_VALUE_TYPE_UNKNOWN); gda_type = GDA_VALUE_TYPE_NULL; @@ -59,10 +65,11 @@ info->value_test_data_types [gda_type - 1] = gda_type_to_string (gda_type); info->value_test_gda_types [gda_type - 1] = gda_type; } +Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c.unknown Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c~ diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c 2005-08-07 15:07:14.000000000 +0200 -+++ libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c 2006-03-24 10:25:21.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c 2006-03-24 11:20:29.000000000 +0100 @@ -285,7 +285,13 @@ } } @@ -87,4 +94,174 @@ return retval; } -Only in libgnomedb-1.9.100/libgnomedb: gnome-db-wrapper-field.c~ +Only in libgnomedb-1.9.100/libgnomedb: gnome-db-wrapper-field.c.unknown +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-time.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-time.c 2006-03-24 11:52:45.000000000 +0100 +@@ -173,7 +173,6 @@ + GnomeDbEntryTime *mgtim; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_TIME, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-none.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-none.c 2006-03-24 11:52:36.000000000 +0100 +@@ -109,7 +109,6 @@ + GnomeDbEntryNone *mgnone; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_NONE, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-boolean.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-boolean.c 2006-03-24 11:53:03.000000000 +0100 +@@ -355,7 +355,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_BOOLEAN (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_BOOLEAN (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-time.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-time.c 2006-03-24 11:54:05.000000000 +0100 +@@ -846,7 +846,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_TIME (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_TIME (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-string.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-string.c 2006-03-24 11:54:01.000000000 +0100 +@@ -337,7 +337,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_STRING (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_STRING (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-none.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-none.c 2006-03-24 11:53:43.000000000 +0100 +@@ -276,7 +276,6 @@ + GnomeDbHandlerNone *hdl; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_NONE (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_NONE (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-numerical.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-numerical.c 2006-03-24 11:53:52.000000000 +0100 +@@ -402,7 +402,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_NUMERICAL (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_NUMERICAL (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-boolean.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-boolean.c 2006-03-24 11:52:31.000000000 +0100 +@@ -112,7 +112,6 @@ + GnomeDbEntryBoolean *mgbool; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_BOOLEAN, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-string.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-string.c 2006-03-24 11:52:43.000000000 +0100 +@@ -166,7 +166,6 @@ + GnomeDbEntryString *mgstr; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_STRING, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-text.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-text.c 2006-03-24 12:18:54.000000000 +0100 +@@ -324,7 +324,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_TEXT (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_TEXT (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-text.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-text.c 2006-03-24 12:18:24.000000000 +0100 +@@ -111,7 +111,6 @@ + GnomeDbEntryText *mgtxt; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_TEXT, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-passmd5.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-passmd5.c 2006-03-24 12:18:48.000000000 +0100 +@@ -322,7 +322,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_PASSMD5 (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_PASSMD5 (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c 2006-03-24 12:18:45.000000000 +0100 +@@ -341,7 +341,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_FILESEL (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_FILESEL (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-cidr.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-cidr.c 2006-03-24 12:18:14.000000000 +0100 +@@ -122,7 +122,6 @@ + GnomeDbEntryCidr *mgcidr; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_CIDR, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-cidr.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-cidr.c 2006-03-24 12:18:36.000000000 +0100 +@@ -330,7 +330,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_CIDR (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_CIDR (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-passmd5.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-passmd5.c 2006-03-24 12:18:21.000000000 +0100 +@@ -111,7 +111,6 @@ + GnomeDbEntryPassmd5 *mgtxt; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_ENTRY_PASSMD5_TYPE, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-filesel.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-filesel.c 2006-03-24 12:18:18.000000000 +0100 +@@ -109,7 +109,6 @@ + GnomeDbEntryFilesel *filesel; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_FILESEL, "handler", dh, NULL); From fedora-extras-commits at redhat.com Fri Mar 24 14:04:02 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Fri, 24 Mar 2006 09:04:02 -0500 Subject: rpms/ghdl/devel ghdl.spec,1.15,1.16 Message-ID: <200603241404.k2OE4gOC007959@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7932 Modified Files: ghdl.spec Log Message: fix x86_64 BR Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ghdl.spec 23 Mar 2006 18:08:13 -0000 1.15 +++ ghdl.spec 24 Mar 2006 14:03:44 -0000 1.16 @@ -5,7 +5,7 @@ Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.%{ghdlsvnver}svn.0%{?dist} +Release: 0.%{ghdlsvnver}svn.1%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -49,10 +49,6 @@ # Make sure glibc supports TFmode long double BuildRequires: glibc >= 2.3.90-35 %endif -%ifarch %{multilib_64_archs} sparc ppc -# Ensure glibc{,-devel} is installed for both multilib arches -BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so -%endif # Ada requires Ada to build BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 # Need .eh_frame ld optimizations @@ -291,6 +287,9 @@ %changelog +* Fri Mar 24 2006 Thomas Sailer - 0.22-0.50svn.1 +- do not require /lib/libc.so.* on x86_64, this does not work under mock + * Wed Mar 22 2006 Thomas Sailer - 0.22-0.50svn.0 - update to svn50, to fix x86_64 breakage - move grt (ghdl runtime library) into separate package, to allow parallel From fedora-extras-commits at redhat.com Fri Mar 24 14:25:52 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 24 Mar 2006 09:25:52 -0500 Subject: rpms/octave/devel octave-2.9.5-sparse.patch, 1.1, 1.2 octave.spec, 1.33, 1.34 Message-ID: <200603241426.k2OEQOJK008138@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8114 Modified Files: octave-2.9.5-sparse.patch octave.spec Log Message: Add more changes to sparse patch. octave-2.9.5-sparse.patch: Index: octave-2.9.5-sparse.patch =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave-2.9.5-sparse.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- octave-2.9.5-sparse.patch 23 Mar 2006 22:50:59 -0000 1.1 +++ octave-2.9.5-sparse.patch 24 Mar 2006 14:25:50 -0000 1.2 @@ -59,3 +59,89 @@ #endif /* +Index: liboctave/CSparse.cc +=================================================================== +RCS file: /cvs/octave/liboctave/CSparse.cc,v +retrieving revision 1.22 +diff -u -r1.22 CSparse.cc +--- liboctave/CSparse.cc 22 Mar 2006 22:58:12 -0000 1.22 ++++ liboctave/CSparse.cc 24 Mar 2006 14:23:38 -0000 +@@ -4273,7 +4273,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4548,7 +4548,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4899,7 +4899,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5176,7 +5176,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +Index: liboctave/dSparse.cc +=================================================================== +RCS file: /cvs/octave/liboctave/dSparse.cc,v +retrieving revision 1.21 +diff -u -r1.21 dSparse.cc +--- liboctave/dSparse.cc 22 Mar 2006 22:58:12 -0000 1.21 ++++ liboctave/dSparse.cc 24 Mar 2006 14:23:39 -0000 +@@ -4376,7 +4376,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4652,7 +4652,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5003,7 +5003,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5350,7 +5350,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- octave.spec 23 Mar 2006 22:50:59 -0000 1.33 +++ octave.spec 24 Mar 2006 14:25:50 -0000 1.34 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -133,6 +133,9 @@ %changelog +* Fri Mar 24 2006 Quentin Spencer 2.9.5-2 +- Add more changes to sparse patch. + * Thu Mar 23 2006 Quentin Spencer 2.9.5-1 - New upstream release; remove old patches; add sparse patch. - Add gcc-c++ as dependency for devel package. From fedora-extras-commits at redhat.com Fri Mar 24 14:49:54 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 24 Mar 2006 09:49:54 -0500 Subject: rpms/libgnomedb/FC-5 libgnomedb-1.9.100-unknown-datatype-fix.patch, NONE, 1.1 libgnomedb.spec, 1.12, 1.13 Message-ID: <200603241450.k2OEoRbM008297@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgnomedb/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8275 Modified Files: libgnomedb.spec Added Files: libgnomedb-1.9.100-unknown-datatype-fix.patch Log Message: * Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 - Add patch2 fixing bz 186517 libgnomedb-1.9.100-unknown-datatype-fix.patch: --- NEW FILE libgnomedb-1.9.100-unknown-datatype-fix.patch --- diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c 2005-08-07 15:07:13.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c 2006-03-24 11:20:29.000000000 +0100 @@ -1056,6 +1056,12 @@ GSList *params; GnomeDbParameter *similar = NULL; GSList *param_dest_fields; + + /* If people try to call us to add a NULL param do notting. */ + if (!param) { + g_warning ("Cannot add NULL param"); + return; + } if (g_slist_find (dataset->parameters, param)) return; Only in libgnomedb-1.9.100/libgnomedb: gnome-db-data-set.c.unknown diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c 2005-09-08 12:36:57.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c 2006-03-24 11:21:38.000000000 +0100 @@ -99,6 +99,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; /* Assoc transl[] = { */ @@ -181,6 +182,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -254,6 +256,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -327,6 +330,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -381,12 +385,12 @@ info->implicit_data_types_casts = TRUE; info->alias_needs_as_keyword = TRUE; - info->value_nb_tests_types = GDA_VALUE_TYPE_UNKNOWN - 1; + info->value_nb_tests_types = GDA_VALUE_TYPE_UNKNOWN; info->value_test_data_types = g_new0 (gchar *, GDA_VALUE_TYPE_UNKNOWN); info->value_test_gda_types = g_new0 (GdaValueType, GDA_VALUE_TYPE_UNKNOWN); gda_type = GDA_VALUE_TYPE_NULL; - for (gda_type ++; gda_type < GDA_VALUE_TYPE_UNKNOWN; gda_type ++) { + for (gda_type ++; gda_type <= GDA_VALUE_TYPE_UNKNOWN; gda_type ++) { info->value_test_data_types [gda_type - 1] = gda_type_to_string (gda_type); info->value_test_gda_types [gda_type - 1] = gda_type; } Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c.unknown Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c~ diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c 2005-08-07 15:07:14.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c 2006-03-24 11:20:29.000000000 +0100 @@ -285,7 +285,13 @@ } } - if (type) { + if (!type) + { + g_warning ("Could not determine the DBMS data type for Gda type %d", gda_column_get_gdatype (col_attrs)); + type = "unknown"; + } + + { retval = gnome_db_server_get_data_type_by_name (srv, type); if (!retval) { /* create a GnomeDbServerDataType for that 'type' */ @@ -297,8 +303,6 @@ g_object_unref (retval); } } - else - g_warning ("Could not determine the DBMS data type for Gda type %d", gda_column_get_gdatype (col_attrs)); return retval; } Only in libgnomedb-1.9.100/libgnomedb: gnome-db-wrapper-field.c.unknown --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-time.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-time.c 2006-03-24 11:52:45.000000000 +0100 @@ -173,7 +173,6 @@ GnomeDbEntryTime *mgtim; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_TIME, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-none.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-none.c 2006-03-24 11:52:36.000000000 +0100 @@ -109,7 +109,6 @@ GnomeDbEntryNone *mgnone; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_NONE, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-boolean.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-boolean.c 2006-03-24 11:53:03.000000000 +0100 @@ -355,7 +355,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_BOOLEAN (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_BOOLEAN (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-time.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-time.c 2006-03-24 11:54:05.000000000 +0100 @@ -846,7 +846,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_TIME (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_TIME (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-string.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-string.c 2006-03-24 11:54:01.000000000 +0100 @@ -337,7 +337,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_STRING (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_STRING (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-none.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-none.c 2006-03-24 11:53:43.000000000 +0100 @@ -276,7 +276,6 @@ GnomeDbHandlerNone *hdl; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_NONE (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_NONE (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-numerical.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-numerical.c 2006-03-24 11:53:52.000000000 +0100 @@ -402,7 +402,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_NUMERICAL (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_NUMERICAL (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-boolean.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-boolean.c 2006-03-24 11:52:31.000000000 +0100 @@ -112,7 +112,6 @@ GnomeDbEntryBoolean *mgbool; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_BOOLEAN, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-string.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-string.c 2006-03-24 11:52:43.000000000 +0100 @@ -166,7 +166,6 @@ GnomeDbEntryString *mgstr; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_STRING, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-text.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-text.c 2006-03-24 12:18:54.000000000 +0100 @@ -324,7 +324,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_TEXT (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_TEXT (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-text.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-text.c 2006-03-24 12:18:24.000000000 +0100 @@ -111,7 +111,6 @@ GnomeDbEntryText *mgtxt; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_TEXT, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-passmd5.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-passmd5.c 2006-03-24 12:18:48.000000000 +0100 @@ -322,7 +322,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_PASSMD5 (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_PASSMD5 (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c 2006-03-24 12:18:45.000000000 +0100 @@ -341,7 +341,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_FILESEL (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_FILESEL (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-cidr.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-cidr.c 2006-03-24 12:18:14.000000000 +0100 @@ -122,7 +122,6 @@ GnomeDbEntryCidr *mgcidr; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_CIDR, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-cidr.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-cidr.c 2006-03-24 12:18:36.000000000 +0100 @@ -330,7 +330,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_CIDR (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_CIDR (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-passmd5.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-passmd5.c 2006-03-24 12:18:21.000000000 +0100 @@ -111,7 +111,6 @@ GnomeDbEntryPassmd5 *mgtxt; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_ENTRY_PASSMD5_TYPE, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-filesel.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-filesel.c 2006-03-24 12:18:18.000000000 +0100 @@ -109,7 +109,6 @@ GnomeDbEntryFilesel *filesel; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_FILESEL, "handler", dh, NULL); Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/FC-5/libgnomedb.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libgnomedb.spec 14 Feb 2006 21:29:02 -0000 1.12 +++ libgnomedb.spec 24 Mar 2006 14:49:54 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Library for writing gnome database programs Name: libgnomedb Version: 1.9.100 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -17,6 +17,7 @@ Patch0: libgnomedb-1.2.0-desktop.patch Patch1: libgnomedb-1.9.100-sharp.patch +Patch2: libgnomedb-1.9.100-unknown-datatype-fix.patch %description libgnomedb is a library that eases the task of writing @@ -54,6 +55,7 @@ %setup -q %patch0 -p1 -b .desktop.patch %patch1 -p1 -b .sharp +%patch2 -p1 -b .unknown %build @@ -153,6 +155,9 @@ %changelog +* Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 +- Add patch2 fixing bz 186517 + * Mon Feb 13 2006 Hans de Goede 1:1.9.100-5 - Bump release and rebuild for new gcc4.1 and glibc - Attempt to properly install C-sharp/mono bindings From fedora-extras-commits at redhat.com Fri Mar 24 15:13:26 2006 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Fri, 24 Mar 2006 10:13:26 -0500 Subject: rpms/smb4k/devel .cvsignore, 1.4, 1.5 smb4k.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200603241514.k2OFE2Wv010347@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/extras/rpms/smb4k/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10321 Modified Files: .cvsignore smb4k.spec sources Log Message: - Updated to version 0.6.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Feb 2006 16:23:30 -0000 1.4 +++ .cvsignore 24 Mar 2006 15:13:26 -0000 1.5 @@ -1 +1 @@ -smb4k-0.6.8.tar.gz +smb4k-0.6.9.tar.gz Index: smb4k.spec =================================================================== RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- smb4k.spec 24 Feb 2006 16:23:30 -0000 1.7 +++ smb4k.spec 24 Mar 2006 15:13:26 -0000 1.8 @@ -1,5 +1,5 @@ Name: smb4k -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Summary: The SMB/CIFS Share Browser for KDE @@ -107,6 +107,9 @@ %{_libdir}/*.so %changelog +* Fri Mar 24 2006 Marcin Garski 0.6.9-1 +- Updated to version 0.6.9 + * Fri Feb 24 2006 Marcin Garski 0.6.8-1 - Updated to version 0.6.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/smb4k/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Feb 2006 16:23:30 -0000 1.4 +++ sources 24 Mar 2006 15:13:26 -0000 1.5 @@ -1 +1 @@ -675add7e36699c392cf1c2067abebf68 smb4k-0.6.8.tar.gz +d11cb15febf8c55c04f5c96e14fced0b smb4k-0.6.9.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 15:32:58 2006 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Fri, 24 Mar 2006 10:32:58 -0500 Subject: rpms/smb4k/FC-4 .cvsignore, 1.4, 1.5 smb4k.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603241533.k2OFXVmR010520@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/extras/rpms/smb4k/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10497 Modified Files: .cvsignore smb4k.spec sources Log Message: - Updated to version 0.6.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Feb 2006 16:29:31 -0000 1.4 +++ .cvsignore 24 Mar 2006 15:32:58 -0000 1.5 @@ -1 +1 @@ -smb4k-0.6.8.tar.gz +smb4k-0.6.9.tar.gz Index: smb4k.spec =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-4/smb4k.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- smb4k.spec 24 Feb 2006 16:29:33 -0000 1.4 +++ smb4k.spec 24 Mar 2006 15:32:58 -0000 1.5 @@ -1,5 +1,5 @@ Name: smb4k -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Summary: The SMB/CIFS Share Browser for KDE @@ -107,6 +107,9 @@ %{_libdir}/*.so %changelog +* Fri Mar 24 2006 Marcin Garski 0.6.9-1 +- Updated to version 0.6.9 + * Fri Feb 24 2006 Marcin Garski 0.6.8-1 - Updated to version 0.6.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Feb 2006 16:29:33 -0000 1.4 +++ sources 24 Mar 2006 15:32:58 -0000 1.5 @@ -1 +1 @@ -675add7e36699c392cf1c2067abebf68 smb4k-0.6.8.tar.gz +d11cb15febf8c55c04f5c96e14fced0b smb4k-0.6.9.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 15:35:12 2006 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Fri, 24 Mar 2006 10:35:12 -0500 Subject: rpms/smb4k/FC-5 .cvsignore, 1.4, 1.5 smb4k.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200603241535.k2OFZifO010596@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/extras/rpms/smb4k/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10574 Modified Files: .cvsignore smb4k.spec sources Log Message: - Updated to version 0.6.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Feb 2006 16:23:30 -0000 1.4 +++ .cvsignore 24 Mar 2006 15:35:11 -0000 1.5 @@ -1 +1 @@ -smb4k-0.6.8.tar.gz +smb4k-0.6.9.tar.gz Index: smb4k.spec =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-5/smb4k.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- smb4k.spec 24 Feb 2006 16:23:30 -0000 1.7 +++ smb4k.spec 24 Mar 2006 15:35:11 -0000 1.8 @@ -1,5 +1,5 @@ Name: smb4k -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Summary: The SMB/CIFS Share Browser for KDE @@ -107,6 +107,9 @@ %{_libdir}/*.so %changelog +* Fri Mar 24 2006 Marcin Garski 0.6.9-1 +- Updated to version 0.6.9 + * Fri Feb 24 2006 Marcin Garski 0.6.8-1 - Updated to version 0.6.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Feb 2006 16:23:30 -0000 1.4 +++ sources 24 Mar 2006 15:35:11 -0000 1.5 @@ -1 +1 @@ -675add7e36699c392cf1c2067abebf68 smb4k-0.6.8.tar.gz +d11cb15febf8c55c04f5c96e14fced0b smb4k-0.6.9.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 16:36:14 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 11:36:14 -0500 Subject: rpms/cpanspec/devel .cvsignore, 1.5, 1.6 cpanspec.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603241636.k2OGakb7012901@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12878 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.63. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Mar 2006 02:20:00 -0000 1.5 +++ .cvsignore 24 Mar 2006 16:36:13 -0000 1.6 @@ -1 +1 @@ -cpanspec-1.62.tar.gz +cpanspec-1.63.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cpanspec.spec 23 Mar 2006 02:20:00 -0000 1.4 +++ cpanspec.spec 24 Mar 2006 16:36:13 -0000 1.5 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.62 +Version: 1.63 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.63-1 +- Update to 1.63. + * Wed Mar 22 2006 Steven Pritchard 1.62-1 - Update to 1.62. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Mar 2006 02:20:00 -0000 1.5 +++ sources 24 Mar 2006 16:36:13 -0000 1.6 @@ -1 +1 @@ -0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz +726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 16:37:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 11:37:56 -0500 Subject: rpms/cpanspec/FC-5 .cvsignore, 1.5, 1.6 cpanspec.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603241638.k2OGcSEg012998@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12965 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.63. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Mar 2006 02:24:24 -0000 1.5 +++ .cvsignore 24 Mar 2006 16:37:55 -0000 1.6 @@ -1 +1 @@ -cpanspec-1.62.tar.gz +cpanspec-1.63.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cpanspec.spec 23 Mar 2006 02:24:24 -0000 1.4 +++ cpanspec.spec 24 Mar 2006 16:37:55 -0000 1.5 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.62 +Version: 1.63 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.63-1 +- Update to 1.63. + * Wed Mar 22 2006 Steven Pritchard 1.62-1 - Update to 1.62. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Mar 2006 02:24:24 -0000 1.5 +++ sources 24 Mar 2006 16:37:55 -0000 1.6 @@ -1 +1 @@ -0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz +726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 16:39:20 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 11:39:20 -0500 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.5, 1.6 cpanspec.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603241639.k2OGdq4R013075@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13045 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.63. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Mar 2006 02:25:52 -0000 1.5 +++ .cvsignore 24 Mar 2006 16:39:20 -0000 1.6 @@ -1 +1 @@ -cpanspec-1.62.tar.gz +cpanspec-1.63.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cpanspec.spec 23 Mar 2006 02:25:52 -0000 1.4 +++ cpanspec.spec 24 Mar 2006 16:39:20 -0000 1.5 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.62 +Version: 1.63 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.63-1 +- Update to 1.63. + * Wed Mar 22 2006 Steven Pritchard 1.62-1 - Update to 1.62. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Mar 2006 02:25:52 -0000 1.5 +++ sources 24 Mar 2006 16:39:20 -0000 1.6 @@ -1 +1 @@ -0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz +726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 16:46:26 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 11:46:26 -0500 Subject: rpms/environment-modules/devel .cvsignore, 1.2, 1.3 environment-modules.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603241646.k2OGkwRw013189@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13162 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Feb 2006 21:06:55 -0000 1.2 +++ .cvsignore 24 Mar 2006 16:46:26 -0000 1.3 @@ -1 +1 @@ -modules-3.2.0p1.tar.bz2 +modules-3.2.1.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/environment-modules.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- environment-modules.spec 14 Feb 2006 21:06:55 -0000 1.1 +++ environment-modules.spec 24 Mar 2006 16:46:26 -0000 1.2 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.0p1 +Version: 3.2.1 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 +- Update to 3.2.1 + * Thu Feb 9 2006 - Orion Poplawski - 3.2.0p1-1 - Update to 3.2.0p1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Feb 2006 21:06:55 -0000 1.2 +++ sources 24 Mar 2006 16:46:26 -0000 1.3 @@ -1 +1 @@ -e5167ea2b7c760920bebbedd7a0b25e5 modules-3.2.0p1.tar.bz2 +fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 24 17:04:57 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 24 Mar 2006 12:04:57 -0500 Subject: rpms/octave/devel octave-2.9.5-sparse.patch, 1.2, 1.3 octave.spec, 1.34, 1.35 Message-ID: <200603241705.k2OH5cav015294@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15272 Modified Files: octave-2.9.5-sparse.patch octave.spec Log Message: Fix patch (wrong whitespace characters). octave-2.9.5-sparse.patch: Index: octave-2.9.5-sparse.patch =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave-2.9.5-sparse.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- octave-2.9.5-sparse.patch 24 Mar 2006 14:25:50 -0000 1.2 +++ octave-2.9.5-sparse.patch 24 Mar 2006 17:04:57 -0000 1.3 @@ -1,147 +1,149 @@ +Index: liboctave/CSparse.cc +=================================================================== +RCS file: /cvs/octave/liboctave/CSparse.cc,v +retrieving revision 1.22 +diff -u -r1.22 CSparse.cc +--- liboctave/CSparse.cc 22 Mar 2006 22:58:12 -0000 1.22 ++++ liboctave/CSparse.cc 24 Mar 2006 17:01:34 -0000 +@@ -4273,7 +4273,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4548,7 +4548,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4899,7 +4899,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5176,7 +5176,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), Index: liboctave/SparseCmplxQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v retrieving revision 1.2 -diff -u -r1.2 SparseCmplxQR.h ---- liboctave/SparseCmplxQR.h 8 Mar 2006 20:17:38 -0000 1.2 -+++ liboctave/SparseCmplxQR.h 23 Mar 2006 17:56:07 -0000 +retrieving revision 1.3 +diff -u -r1.2 -r1.3 +--- liboctave/SparseCmplxQR.h 8 Mar 2006 20:17:38 -0000 1.2 ++++ liboctave/SparseCmplxQR.h 23 Mar 2006 18:22:51 -0000 1.3 @@ -137,6 +137,23 @@ #endif }; - + + +// Publish externally used friend functions. + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, const Matrix &b, -+ octave_idx_type &info); ++ octave_idx_type &info); + -+extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, -+ const SparseMatrix &b, -+ octave_idx_type &info); -+ -+extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, -+ const ComplexMatrix &b, -+ octave_idx_type &info); -+ -+extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, -+ const SparseComplexMatrix &b, -+ octave_idx_type &info); ++extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, ++ const SparseMatrix &b, ++ octave_idx_type &info); ++ ++extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, ++ const ComplexMatrix &b, ++ octave_idx_type &info); ++ ++extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, ++ const SparseComplexMatrix &b, ++ octave_idx_type &info); #endif - + /* Index: liboctave/SparseQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseQR.h,v retrieving revision 1.2 -diff -u -r1.2 SparseQR.h ---- liboctave/SparseQR.h 8 Mar 2006 20:17:38 -0000 1.2 -+++ liboctave/SparseQR.h 23 Mar 2006 17:56:07 -0000 +retrieving revision 1.3 +diff -u -r1.2 -r1.3 +--- liboctave/SparseQR.h 8 Mar 2006 20:17:38 -0000 1.2 ++++ liboctave/SparseQR.h 23 Mar 2006 18:22:51 -0000 1.3 @@ -133,6 +133,22 @@ #endif }; - + + +// Publish externally used friend functions. + -+extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, -+ octave_idx_type &info); ++extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, ++ octave_idx_type &info); + +extern SparseMatrix qrsolve (const SparseMatrix &a, const SparseMatrix &b, -+ octave_idx_type &info); ++ octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseMatrix &a, const ComplexMatrix &b, -+ octave_idx_type &info); ++ octave_idx_type &info); + -+extern SparseComplexMatrix qrsolve (const SparseMatrix &a, -+ const SparseComplexMatrix &b, -+ octave_idx_type &info); ++extern SparseComplexMatrix qrsolve (const SparseMatrix &a, ++ const SparseComplexMatrix &b, ++ octave_idx_type &info); + #endif - + /* -Index: liboctave/CSparse.cc -=================================================================== -RCS file: /cvs/octave/liboctave/CSparse.cc,v -retrieving revision 1.22 -diff -u -r1.22 CSparse.cc ---- liboctave/CSparse.cc 22 Mar 2006 22:58:12 -0000 1.22 -+++ liboctave/CSparse.cc 24 Mar 2006 14:23:38 -0000 -@@ -4273,7 +4273,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -4548,7 +4548,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -4899,7 +4899,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -5176,7 +5176,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), Index: liboctave/dSparse.cc =================================================================== RCS file: /cvs/octave/liboctave/dSparse.cc,v retrieving revision 1.21 diff -u -r1.21 dSparse.cc ---- liboctave/dSparse.cc 22 Mar 2006 22:58:12 -0000 1.21 -+++ liboctave/dSparse.cc 24 Mar 2006 14:23:39 -0000 +--- liboctave/dSparse.cc 22 Mar 2006 22:58:12 -0000 1.21 ++++ liboctave/dSparse.cc 24 Mar 2006 17:01:35 -0000 @@ -4376,7 +4376,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4652,7 +4652,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5003,7 +5003,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5350,7 +5350,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- octave.spec 24 Mar 2006 14:25:50 -0000 1.34 +++ octave.spec 24 Mar 2006 17:04:57 -0000 1.35 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -133,6 +133,9 @@ %changelog +* Fri Mar 24 2006 Quentin Spencer 2.9.5-3 +- Fix broken patch. + * Fri Mar 24 2006 Quentin Spencer 2.9.5-2 - Add more changes to sparse patch. From fedora-extras-commits at redhat.com Fri Mar 24 18:51:28 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 13:51:28 -0500 Subject: rpms/environment-modules/FC-5 .cvsignore, 1.2, 1.3 environment-modules.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603241852.k2OIq1i6017841@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17820 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Feb 2006 21:06:55 -0000 1.2 +++ .cvsignore 24 Mar 2006 18:51:28 -0000 1.3 @@ -1 +1 @@ -modules-3.2.0p1.tar.bz2 +modules-3.2.1.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/environment-modules.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- environment-modules.spec 14 Feb 2006 21:06:55 -0000 1.1 +++ environment-modules.spec 24 Mar 2006 18:51:28 -0000 1.2 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.0p1 +Version: 3.2.1 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 +- Update to 3.2.1 + * Thu Feb 9 2006 - Orion Poplawski - 3.2.0p1-1 - Update to 3.2.0p1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Feb 2006 21:06:55 -0000 1.2 +++ sources 24 Mar 2006 18:51:28 -0000 1.3 @@ -1 +1 @@ -e5167ea2b7c760920bebbedd7a0b25e5 modules-3.2.0p1.tar.bz2 +fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 24 18:53:24 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 13:53:24 -0500 Subject: rpms/environment-modules/FC-4 .cvsignore, 1.2, 1.3 environment-modules.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603241853.k2OIrutf017912@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17891 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Feb 2006 21:06:55 -0000 1.2 +++ .cvsignore 24 Mar 2006 18:53:24 -0000 1.3 @@ -1 +1 @@ -modules-3.2.0p1.tar.bz2 +modules-3.2.1.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/environment-modules.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- environment-modules.spec 14 Feb 2006 21:06:55 -0000 1.1 +++ environment-modules.spec 24 Mar 2006 18:53:24 -0000 1.2 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.0p1 +Version: 3.2.1 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 +- Update to 3.2.1 + * Thu Feb 9 2006 - Orion Poplawski - 3.2.0p1-1 - Update to 3.2.0p1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Feb 2006 21:06:55 -0000 1.2 +++ sources 24 Mar 2006 18:53:24 -0000 1.3 @@ -1 +1 @@ -e5167ea2b7c760920bebbedd7a0b25e5 modules-3.2.0p1.tar.bz2 +fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 24 19:13:50 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 24 Mar 2006 14:13:50 -0500 Subject: extras-buildsys/server BuildMaster.py, 1.38, 1.39 DBManager.py, 1.6, 1.7 User.py, 1.9, 1.10 UserInterface.py, 1.61, 1.62 Message-ID: <200603241913.k2OJDowY020096@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20028/server Modified Files: BuildMaster.py DBManager.py User.py UserInterface.py Log Message: 2006-03-24 Dan Williams * server/DBManager.py - Close database connection on delete for PostgreSQL and MySQL. Fixes leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, as seen on RHEL4. #rh182441# * server/BuildMaster.py - Delete the database context when on stop * server/User.py * server/UserInterface.py - Clean up deletion of database contexts and cursors Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- BuildMaster.py 12 Mar 2006 13:43:40 -0000 1.38 +++ BuildMaster.py 24 Mar 2006 19:13:41 -0000 1.39 @@ -72,6 +72,9 @@ threading.Thread.__init__(self) self.setName("BuildMaster") + def _cleanup(self): + del self._cursor, self._dbcx + def _requeue_interrupted_jobs(self): """ Restart interrupted jobs from our db. """ self._cursor.execute("SELECT uid FROM jobs WHERE (status!='needsign' AND status!='failed' AND status!='finished') ORDER BY uid") @@ -416,3 +419,5 @@ while not self._have_work() and time.time() <= last_time + 5: time.sleep(0.25) + self._cleanup() + Index: DBManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/DBManager.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- DBManager.py 12 Mar 2006 13:43:40 -0000 1.6 +++ DBManager.py 24 Mar 2006 19:13:41 -0000 1.7 @@ -211,6 +211,10 @@ return dbcx + def __del__(self): + self._dbcx.close() + del self._dbcx + class mysqlEngineClass(BaseDBEngineClass): @@ -263,6 +267,10 @@ return dbcx + def __del__(self): + self._dbcx.close() + del self._dbcx + db_engines = { 'sqlite': sqliteEngineClass, Index: User.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/User.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- User.py 25 Nov 2005 22:45:56 -0000 1.9 +++ User.py 24 Mar 2006 19:13:41 -0000 1.10 @@ -46,8 +46,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: - del curs - del dbcx + del curs, dbcx print "Unable to access user database: '%s'" % str(e) return None user = None @@ -62,7 +61,6 @@ else: if self._cfg.get_bool("UI", "guest_allowed"): user = User('guest at guest', True) - del curs - del dbcx + del curs, dbcx return user Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- UserInterface.py 12 Mar 2006 13:43:40 -0000 1.61 +++ UserInterface.py 24 Mar 2006 19:13:41 -0000 1.62 @@ -181,6 +181,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) job = dbcx.fetchone(curs) @@ -193,9 +194,8 @@ self._bm.requeue_job(uid) result = (0, "Success: Job %d has been requeued." % uid) - del curs - del dbcx - return result + del curs, dbcx + return result def _kill_job(self, email, job, jobid): if not job: @@ -315,6 +315,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e, []) curs.execute(sql) data = dbcx.fetchall(curs) @@ -363,8 +364,7 @@ if job['uid'] == ajrec['parent_uid']: job['archjobs'].append(copy.deepcopy(ajrec)) - del curs - del dbcx + del curs, dbcx return (0, "Success.", jobs) @@ -384,12 +384,12 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e, {}) curs.execute(sql) job = dbcx.fetchone(curs) if not job: - del curs - del dbcx + del curs, dbcx return (-1, "Error: Invalid job UID.", {}) jobrec = {} jobrec['uid'] = job['uid'] @@ -436,8 +436,7 @@ ret_job = copy.deepcopy(jobrec) - del curs - del dbcx + del curs, dbcx return (0, "Success.", ret_job) @@ -473,6 +472,13 @@ return self._bm.is_paused() def finish(self, uid_list): + try: + dbcx = self._db_manager.dbcx() + curs = dbcx.cursor() + except StandardError, e: + del curs, dbcx + return (-1, "Unable to access job database: '%s'" % e) + uids = '' for uid in uid_list: uid = validate_uid(uid) @@ -486,16 +492,10 @@ if len(uids): sql = "UPDATE jobs SET status='finished' WHERE %s" % uids - try: - dbcx = self._db_manager.dbcx() - curs = dbcx.cursor() - except StandardError, e: - return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) dbcx.commit() - del curs - del dbcx + del curs, dbcx return (0, "Success.") def srpm_upload_dir(self, target_alias): @@ -538,6 +538,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) @@ -551,8 +552,7 @@ else: result = UserInterface.requeue(self, uid) - del curs - del dbcx + del curs, dbcx return result def kill_job(self, email, jobid): @@ -627,6 +627,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) @@ -656,8 +657,7 @@ final_uid_list.append(uid) - del curs - del dbcx + del curs, dbcx if error: return error From fedora-extras-commits at redhat.com Fri Mar 24 19:13:43 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 24 Mar 2006 14:13:43 -0500 Subject: extras-buildsys ChangeLog,1.179,1.180 Message-ID: <200603241914.k2OJEEcl020102@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20028 Modified Files: ChangeLog Log Message: 2006-03-24 Dan Williams * server/DBManager.py - Close database connection on delete for PostgreSQL and MySQL. Fixes leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, as seen on RHEL4. #rh182441# * server/BuildMaster.py - Delete the database context when on stop * server/User.py * server/UserInterface.py - Clean up deletion of database contexts and cursors Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- ChangeLog 24 Mar 2006 01:34:42 -0000 1.179 +++ ChangeLog 24 Mar 2006 19:13:40 -0000 1.180 @@ -1,3 +1,17 @@ +2006-03-24 Dan Williams + + * server/DBManager.py + - Close database connection on delete for PostgreSQL and MySQL. Fixes + leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, + as seen on RHEL4. #rh182441# + + * server/BuildMaster.py + - Delete the database context when on stop + + * server/User.py + * server/UserInterface.py + - Clean up deletion of database contexts and cursors + 2006-03-23 Dan Williams * server/Repo.py From fedora-extras-commits at redhat.com Fri Mar 24 19:17:22 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 24 Mar 2006 14:17:22 -0500 Subject: extras-buildsys/server BuildMaster.py, 1.35.2.1, 1.35.2.2 DBManager.py, 1.1.2.2, 1.1.2.3 User.py, 1.7, 1.7.2.1 UserInterface.py, 1.58.2.2, 1.58.2.3 Message-ID: <200603241917.k2OJHMfB020174@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20129/server Modified Files: Tag: STABLE_0_4 BuildMaster.py DBManager.py User.py UserInterface.py Log Message: 2006-03-24 Dan Williams * server/DBManager.py - Close database connection on delete for PostgreSQL and MySQL. Fixes leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, as seen on RHEL4. #rh182441# * server/BuildMaster.py - Delete the database context when on stop * server/User.py * server/UserInterface.py - Clean up deletion of database contexts and cursors Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.35.2.1 retrieving revision 1.35.2.2 diff -u -r1.35.2.1 -r1.35.2.2 --- BuildMaster.py 29 Nov 2005 06:36:43 -0000 1.35.2.1 +++ BuildMaster.py 24 Mar 2006 19:17:11 -0000 1.35.2.2 @@ -72,6 +72,9 @@ threading.Thread.__init__(self) self.setName("BuildMaster") + def _cleanup(self): + del self._cursor, self._dbcx + def _requeue_interrupted_jobs(self): """ Restart interrupted jobs from our db. """ self._cursor.execute("SELECT uid FROM jobs WHERE (status!='needsign' AND status!='failed' AND status!='finished') ORDER BY uid") @@ -416,3 +419,5 @@ while not self._have_work() and time.time() <= last_time + 5: time.sleep(0.25) + self._cleanup() + Index: DBManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/DBManager.py,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- DBManager.py 24 Oct 2005 15:34:24 -0000 1.1.2.2 +++ DBManager.py 24 Mar 2006 19:17:11 -0000 1.1.2.3 @@ -198,6 +198,10 @@ return dbcx + def __del__(self): + self._dbcx.close() + del self._dbcx + class mysqlEngineClass(BaseDBEngineClass): @@ -247,6 +251,10 @@ return dbcx + def __del__(self): + self._dbcx.close() + del self._dbcx + db_engines = { 'sqlite': sqliteEngineClass, Index: User.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/User.py,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- User.py 15 Aug 2005 03:18:20 -0000 1.7 +++ User.py 24 Mar 2006 19:17:11 -0000 1.7.2.1 @@ -68,6 +68,7 @@ 'user_admin BOOLEAN, ' \ 'server_admin BOOLEAN)') dbcx.commit() + del curs, dbcx def new_authed_user(self, email, client_address): @@ -88,5 +89,6 @@ else: if self._cfg.get_bool("UI", "guest_allowed"): user = User('guest at guest', True) + del curs, dbcx return user Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.58.2.2 retrieving revision 1.58.2.3 diff -u -r1.58.2.2 -r1.58.2.3 --- UserInterface.py 28 Nov 2005 17:50:15 -0000 1.58.2.2 +++ UserInterface.py 24 Mar 2006 19:17:12 -0000 1.58.2.3 @@ -181,6 +181,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) job = dbcx.fetchone(curs) @@ -193,9 +194,8 @@ self._bm.requeue_job(uid) result = (0, "Success: Job %d has been requeued." % uid) - del curs - del dbcx - return result + del curs, dbcx + return result def _kill_job(self, email, job, jobid): if not job: @@ -315,6 +315,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e, []) curs.execute(sql) data = dbcx.fetchall(curs) @@ -363,8 +364,7 @@ if job['uid'] == ajrec['parent_uid']: job['archjobs'].append(copy.deepcopy(ajrec)) - del curs - del dbcx + del curs, dbcx return (0, "Success.", jobs) @@ -384,12 +384,12 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e, {}) curs.execute(sql) job = dbcx.fetchone(curs) if not job: - del curs - del dbcx + del curs, dbcx return (-1, "Error: Invalid job UID.", {}) jobrec = {} jobrec['uid'] = job['uid'] @@ -436,8 +436,7 @@ ret_job = copy.deepcopy(jobrec) - del curs - del dbcx + del curs, dbcx return (0, "Success.", ret_job) @@ -473,6 +472,13 @@ return self._bm.is_paused() def finish(self, uid_list): + try: + dbcx = self._db_manager.dbcx() + curs = dbcx.cursor() + except StandardError, e: + del curs, dbcx + return (-1, "Unable to access job database: '%s'" % e) + uids = '' for uid in uid_list: uid = validate_uid(uid) @@ -486,16 +492,10 @@ if len(uids): sql = "UPDATE jobs SET status='finished' WHERE %s" % uids - try: - dbcx = self._db_manager.dbcx() - curs = dbcx.cursor() - except StandardError, e: - return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) dbcx.commit() - del curs - del dbcx + del curs, dbcx return (0, "Success.") def srpm_upload_dir(self, target_alias): @@ -538,6 +538,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) @@ -551,8 +552,7 @@ else: result = UserInterface.requeue(self, uid) - del curs - del dbcx + del curs, dbcx return result def kill_job(self, email, jobid): @@ -627,6 +627,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) @@ -656,8 +657,7 @@ final_uid_list.append(uid) - del curs - del dbcx + del curs, dbcx if error: return error From fedora-extras-commits at redhat.com Fri Mar 24 19:17:13 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 24 Mar 2006 14:17:13 -0500 Subject: extras-buildsys ChangeLog,1.126.2.46,1.126.2.47 Message-ID: <200603241917.k2OJHvkh020184@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20129 Modified Files: Tag: STABLE_0_4 ChangeLog Log Message: 2006-03-24 Dan Williams * server/DBManager.py - Close database connection on delete for PostgreSQL and MySQL. Fixes leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, as seen on RHEL4. #rh182441# * server/BuildMaster.py - Delete the database context when on stop * server/User.py * server/UserInterface.py - Clean up deletion of database contexts and cursors Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.46 retrieving revision 1.126.2.47 diff -u -r1.126.2.46 -r1.126.2.47 --- ChangeLog 20 Mar 2006 12:48:33 -0000 1.126.2.46 +++ ChangeLog 24 Mar 2006 19:16:51 -0000 1.126.2.47 @@ -1,3 +1,17 @@ +2006-03-24 Dan Williams + + * server/DBManager.py + - Close database connection on delete for PostgreSQL and MySQL. Fixes + leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, + as seen on RHEL4. #rh182441# + + * server/BuildMaster.py + - Delete the database context when on stop + + * server/User.py + * server/UserInterface.py + - Clean up deletion of database contexts and cursors + 2006-03-20 Dan Williams * common/FileDownloader.py From fedora-extras-commits at redhat.com Fri Mar 24 20:36:38 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 24 Mar 2006 15:36:38 -0500 Subject: rpms/libmodplug/FC-5 .cvsignore, 1.2, 1.3 libmodplug.spec, 1.8, 1.9 sources, 1.2, 1.3 libmodplug-64bit.patch, 1.1, NONE Message-ID: <200603242037.k2OKbBx7022685@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libmodplug/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/FC-5 Modified Files: .cvsignore libmodplug.spec sources Removed Files: libmodplug-64bit.patch Log Message: * Fri Mar 24 2006 Ville Skytt?? - 1:0.8-1 - 0.8, 64bit patch included upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmodplug/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:45:31 -0000 1.2 +++ .cvsignore 24 Mar 2006 20:36:37 -0000 1.3 @@ -1 +1 @@ -libmodplug-0.7.tar.gz +libmodplug-0.8.tar.gz Index: libmodplug.spec =================================================================== RCS file: /cvs/extras/rpms/libmodplug/FC-5/libmodplug.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libmodplug.spec 13 Feb 2006 20:15:00 -0000 1.8 +++ libmodplug.spec 24 Mar 2006 20:36:37 -0000 1.9 @@ -1,6 +1,6 @@ Name: libmodplug -Version: 0.7 -Release: 5%{?dist} +Version: 0.8 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -8,7 +8,6 @@ License: Public Domain URL: http://modplug-xmms.sourceforge.net/ Source0: http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz -Patch0: %{name}-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -26,7 +25,7 @@ %prep %setup -q -%patch0 -p1 +chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h sed -i -e 's/\r//g' ChangeLog @@ -50,6 +49,7 @@ %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig @@ -66,6 +66,9 @@ %changelog +* Fri Mar 24 2006 Ville Skytt?? - 1:0.8-1 +- 0.8, 64bit patch included upstream. + * Mon Feb 13 2006 Ville Skytt?? - 1:0.7-5 - Rebuild, cosmetics. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmodplug/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:45:31 -0000 1.2 +++ sources 24 Mar 2006 20:36:37 -0000 1.3 @@ -1 +1 @@ -b6e7412f90cdd4a27a2dd3de94909905 libmodplug-0.7.tar.gz +cea399626e2a074e2a77c8cd98387a48 libmodplug-0.8.tar.gz --- libmodplug-64bit.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 20:36:44 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 24 Mar 2006 15:36:44 -0500 Subject: rpms/libmodplug/devel .cvsignore, 1.2, 1.3 libmodplug.spec, 1.8, 1.9 sources, 1.2, 1.3 libmodplug-64bit.patch, 1.1, NONE Message-ID: <200603242037.k2OKbSd6022698@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libmodplug/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/devel Modified Files: .cvsignore libmodplug.spec sources Removed Files: libmodplug-64bit.patch Log Message: * Fri Mar 24 2006 Ville Skytt?? - 1:0.8-1 - 0.8, 64bit patch included upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmodplug/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:45:31 -0000 1.2 +++ .cvsignore 24 Mar 2006 20:36:44 -0000 1.3 @@ -1 +1 @@ -libmodplug-0.7.tar.gz +libmodplug-0.8.tar.gz Index: libmodplug.spec =================================================================== RCS file: /cvs/extras/rpms/libmodplug/devel/libmodplug.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libmodplug.spec 13 Feb 2006 20:15:00 -0000 1.8 +++ libmodplug.spec 24 Mar 2006 20:36:44 -0000 1.9 @@ -1,6 +1,6 @@ Name: libmodplug -Version: 0.7 -Release: 5%{?dist} +Version: 0.8 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -8,7 +8,6 @@ License: Public Domain URL: http://modplug-xmms.sourceforge.net/ Source0: http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz -Patch0: %{name}-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -26,7 +25,7 @@ %prep %setup -q -%patch0 -p1 +chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h sed -i -e 's/\r//g' ChangeLog @@ -50,6 +49,7 @@ %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig @@ -66,6 +66,9 @@ %changelog +* Fri Mar 24 2006 Ville Skytt?? - 1:0.8-1 +- 0.8, 64bit patch included upstream. + * Mon Feb 13 2006 Ville Skytt?? - 1:0.7-5 - Rebuild, cosmetics. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmodplug/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:45:31 -0000 1.2 +++ sources 24 Mar 2006 20:36:44 -0000 1.3 @@ -1 +1 @@ -b6e7412f90cdd4a27a2dd3de94909905 libmodplug-0.7.tar.gz +cea399626e2a074e2a77c8cd98387a48 libmodplug-0.8.tar.gz --- libmodplug-64bit.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 21:17:33 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 24 Mar 2006 16:17:33 -0500 Subject: rpms/thinkpad-kmod/devel kmodtool,1.3,1.4 Message-ID: <200603242118.k2OLI58u025024@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24992/thinkpad-kmod/devel Modified Files: kmodtool Log Message: kmodtool 0.10.6: add epoch handling to package template. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/kmodtool,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kmodtool 15 Mar 2006 19:52:17 -0000 1.3 +++ kmodtool 24 Mar 2006 21:17:32 -0000 1.4 @@ -24,7 +24,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.5" +myver="0.10.6" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= @@ -68,9 +68,9 @@ Summary: ${kmod_name} kernel module(s) Group: System Environment/Kernel Provides: kernel-module = ${verrel}${variant} -Provides: kmod-${kmod_name} = %{version}-%{release} +Provides: kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: ${kdep} -Requires: ${kmod_name}-kmod-common = %{version} +Requires: ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version} Requires(post): /sbin/depmod Requires(postun): /sbin/depmod BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel} From fedora-extras-commits at redhat.com Fri Mar 24 21:17:39 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 24 Mar 2006 16:17:39 -0500 Subject: rpms/lirc-kmod/devel kmodtool,1.3,1.4 Message-ID: <200603242118.k2OLICRC025027@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24992/lirc-kmod/devel Modified Files: kmodtool Log Message: kmodtool 0.10.6: add epoch handling to package template. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kmodtool 13 Mar 2006 21:06:07 -0000 1.3 +++ kmodtool 24 Mar 2006 21:17:39 -0000 1.4 @@ -24,7 +24,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.5" +myver="0.10.6" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= @@ -68,9 +68,9 @@ Summary: ${kmod_name} kernel module(s) Group: System Environment/Kernel Provides: kernel-module = ${verrel}${variant} -Provides: kmod-${kmod_name} = %{version}-%{release} +Provides: kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: ${kdep} -Requires: ${kmod_name}-kmod-common = %{version} +Requires: ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version} Requires(post): /sbin/depmod Requires(postun): /sbin/depmod BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel} From fedora-extras-commits at redhat.com Fri Mar 24 21:19:20 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 24 Mar 2006 16:19:20 -0500 Subject: rpms/octave/devel octave-2.9.5-sparse.patch, 1.3, 1.4 octave.spec, 1.35, 1.36 Message-ID: <200603242119.k2OLJqtS025055@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25033 Modified Files: octave-2.9.5-sparse.patch octave.spec Log Message: Change patch and try again. octave-2.9.5-sparse.patch: Index: octave-2.9.5-sparse.patch =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave-2.9.5-sparse.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- octave-2.9.5-sparse.patch 24 Mar 2006 17:04:57 -0000 1.3 +++ octave-2.9.5-sparse.patch 24 Mar 2006 21:19:19 -0000 1.4 @@ -1,46 +1,3 @@ -Index: liboctave/CSparse.cc -=================================================================== -RCS file: /cvs/octave/liboctave/CSparse.cc,v -retrieving revision 1.22 -diff -u -r1.22 CSparse.cc ---- liboctave/CSparse.cc 22 Mar 2006 22:58:12 -0000 1.22 -+++ liboctave/CSparse.cc 24 Mar 2006 17:01:34 -0000 -@@ -4273,7 +4273,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -4548,7 +4548,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -4899,7 +4899,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -5176,7 +5176,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), Index: liboctave/SparseCmplxQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v @@ -104,46 +61,342 @@ #endif /* +Index: liboctave/CMatrix.cc +=================================================================== +RCS file: /cvs/octave/liboctave/CMatrix.cc,v +retrieving revision 1.114 +diff -u -r1.114 CMatrix.cc +--- liboctave/CMatrix.cc 2 Mar 2006 03:40:00 -0000 1.114 ++++ liboctave/CMatrix.cc 24 Mar 2006 18:53:58 -0000 +@@ -889,27 +889,6 @@ + return retval; + } + +-ComplexRowVector +-ComplexMatrix::row (char *s) const +-{ +- if (! s) +- { +- (*current_liboctave_error_handler) ("invalid row selection"); +- return ComplexRowVector (); +- } +- +- char c = *s; +- if (c == 'f' || c == 'F') +- return row (static_cast(0)); +- else if (c == 'l' || c == 'L') +- return row (rows () - 1); +- else +- { +- (*current_liboctave_error_handler) ("invalid row selection"); +- return ComplexRowVector (); +- } +-} +- + ComplexColumnVector + ComplexMatrix::column (octave_idx_type i) const + { +@@ -927,27 +906,6 @@ + return retval; + } + +-ComplexColumnVector +-ComplexMatrix::column (char *s) const +-{ +- if (! s) +- { +- (*current_liboctave_error_handler) ("invalid column selection"); +- return ComplexColumnVector (); +- } +- +- char c = *s; +- if (c == 'f' || c == 'F') +- return column (static_cast(0)); +- else if (c == 'l' || c == 'L') +- return column (cols () - 1); +- else +- { +- (*current_liboctave_error_handler) ("invalid column selection"); +- return ComplexColumnVector (); +- } +-} +- + ComplexMatrix + ComplexMatrix::inverse (void) const + { +Index: liboctave/CMatrix.h +=================================================================== +RCS file: /cvs/octave/liboctave/CMatrix.h,v +retrieving revision 1.55 +diff -u -r1.55 CMatrix.h +--- liboctave/CMatrix.h 26 Oct 2005 15:24:08 -0000 1.55 ++++ liboctave/CMatrix.h 24 Mar 2006 18:53:58 -0000 +@@ -130,10 +130,8 @@ + // extract row or column i. + + ComplexRowVector row (octave_idx_type i) const; +- ComplexRowVector row (char *s) const; + + ComplexColumnVector column (octave_idx_type i) const; +- ComplexColumnVector column (char *s) const; + + ComplexMatrix inverse (void) const; + ComplexMatrix inverse (octave_idx_type& info) const; +Index: liboctave/dMatrix.cc +=================================================================== +RCS file: /cvs/octave/liboctave/dMatrix.cc,v +retrieving revision 1.120 +diff -u -r1.120 dMatrix.cc +--- liboctave/dMatrix.cc 2 Mar 2006 03:40:01 -0000 1.120 ++++ liboctave/dMatrix.cc 24 Mar 2006 18:53:59 -0000 +@@ -559,27 +559,6 @@ + return retval; + } + +-RowVector +-Matrix::row (char *s) const +-{ +- if (! s) +- { +- (*current_liboctave_error_handler) ("invalid row selection"); +- return RowVector (); +- } +- +- char c = *s; +- if (c == 'f' || c == 'F') +- return row ( static_cast(0) ); +- else if (c == 'l' || c == 'L') +- return row (rows () - 1); +- else +- { +- (*current_liboctave_error_handler) ("invalid row selection"); +- return RowVector (); +- } +-} +- + ColumnVector + Matrix::column (octave_idx_type i) const + { +@@ -597,27 +576,6 @@ + return retval; + } + +-ColumnVector +-Matrix::column (char *s) const +-{ +- if (! s) +- { +- (*current_liboctave_error_handler) ("invalid column selection"); +- return ColumnVector (); +- } +- +- char c = *s; +- if (c == 'f' || c == 'F') +- return column (static_cast (0)); +- else if (c == 'l' || c == 'L') +- return column (cols () - 1); +- else +- { +- (*current_liboctave_error_handler) ("invalid column selection"); +- return ColumnVector (); +- } +-} +- + Matrix + Matrix::inverse (void) const + { +Index: liboctave/dMatrix.h +=================================================================== +RCS file: /cvs/octave/liboctave/dMatrix.h,v +retrieving revision 1.61 +diff -u -r1.61 dMatrix.h +--- liboctave/dMatrix.h 26 Oct 2005 15:24:08 -0000 1.61 ++++ liboctave/dMatrix.h 24 Mar 2006 18:53:59 -0000 +@@ -102,10 +102,8 @@ + // extract row or column i. + + RowVector row (octave_idx_type i) const; +- RowVector row (char *s) const; + + ColumnVector column (octave_idx_type i) const; +- ColumnVector column (char *s) const; + + Matrix inverse (void) const; + Matrix inverse (octave_idx_type& info) const; Index: liboctave/dSparse.cc =================================================================== RCS file: /cvs/octave/liboctave/dSparse.cc,v retrieving revision 1.21 diff -u -r1.21 dSparse.cc --- liboctave/dSparse.cc 22 Mar 2006 22:58:12 -0000 1.21 -+++ liboctave/dSparse.cc 24 Mar 2006 17:01:35 -0000 -@@ -4376,7 +4376,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -4652,7 +4652,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -5003,7 +5003,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -5350,7 +5350,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), ++++ liboctave/dSparse.cc 24 Mar 2006 18:54:00 -0000 +@@ -4404,7 +4404,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dpbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4540,7 +4540,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dgbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4678,7 +4678,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dpbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4851,7 +4851,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dgbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5031,7 +5031,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dpbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5208,7 +5208,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dpbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5379,7 +5379,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dpbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5586,7 +5586,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dgbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +Index: src/ov-cell.cc +=================================================================== +RCS file: /cvs/octave/src/ov-cell.cc,v +retrieving revision 1.58 +diff -u -r1.58 ov-cell.cc +--- src/ov-cell.cc 24 Mar 2006 16:42:44 -0000 1.58 ++++ src/ov-cell.cc 24 Mar 2006 19:14:32 -0000 +@@ -783,10 +783,12 @@ + + for (octave_idx_type i = 0; i < dv.numel (); i++) + { +- char s[20]; +- sprintf (s, "_%d", i); ++ OSSTREAM buf; ++ buf << "_" << i << OSSTREAM_ENDS; ++ std::string s = OSSTREAM_STR (buf); ++ OSSTREAM_FREEZE (buf); + +- if (! add_hdf5_data(data_hid, tmp.elem (i), s, "", false, ++ if (! add_hdf5_data(data_hid, tmp.elem (i), s.c_str (), "", false, + save_as_floats)) + { + H5Gclose (data_hid); +Index: src/ov-list.cc +=================================================================== +RCS file: /cvs/octave/src/ov-list.cc,v +retrieving revision 1.44 +diff -u -r1.44 ov-list.cc +--- src/ov-list.cc 26 Apr 2005 19:24:33 -0000 1.44 ++++ src/ov-list.cc 24 Mar 2006 19:14:32 -0000 +@@ -536,9 +536,13 @@ + for (int i = 0; i < lst.length (); ++i) + { + // should we use lst.name_tags () to label the elements? +- char s[20]; +- sprintf (s, "_%d", i); +- bool b = save_ascii_data (os, lst (i), s, infnan_warned, ++ ++ OSSTREAM buf; ++ buf << "_" << i << OSSTREAM_ENDS; ++ std::string s = OSSTREAM_STR (buf); ++ OSSTREAM_FREEZE (buf); ++ ++ bool b = save_ascii_data (os, lst (i), s.c_str (), infnan_warned, + strip_nan_and_inf, 0, 0); + + if (! b) +@@ -607,11 +611,15 @@ + for (int i = 0; i < lst.length (); i++) + { + // should we use lst.name_tags () to label the elements? +- char s[20]; +- sprintf (s, "_%d", i); ++ ++ OSSTREAM buf; ++ buf << "_" << i << OSSTREAM_ENDS; ++ std::string s = OSSTREAM_STR (buf); ++ OSSTREAM_FREEZE (buf); + + // Recurse to print sub-value. +- bool b = save_binary_data (os, lst(i), s, "", 0, save_as_floats); ++ bool b = save_binary_data (os, lst(i), s.c_str (), "", 0, ++ save_as_floats); + + if (! b) + return false; +@@ -683,9 +691,13 @@ + for (octave_idx_type i = 0; i < lst.length (); ++i) + { + // should we use lst.name_tags () to label the elements? +- char s[20]; +- sprintf (s, "_%d", i); +- bool retval2 = add_hdf5_data (data_hid, lst (i), s, "", ++ ++ OSSTREAM buf; ++ buf << "_" << i << OSSTREAM_ENDS; ++ std::string s = OSSTREAM_STR (buf); ++ OSSTREAM_FREEZE (buf); ++ ++ bool retval2 = add_hdf5_data (data_hid, lst (i), s.c_str (), "", + false, save_as_floats); + if (! retval2) + break; +Index: src/DLD-FUNCTIONS/spchol.cc +=================================================================== +RCS file: /cvs/octave/src/DLD-FUNCTIONS/spchol.cc,v +retrieving revision 1.7 +diff -u -r1.7 spchol.cc +--- src/DLD-FUNCTIONS/spchol.cc 22 Mar 2006 22:58:12 -0000 1.7 ++++ src/DLD-FUNCTIONS/spchol.cc 24 Mar 2006 19:55:38 -0000 +@@ -607,7 +607,7 @@ + for (octave_idx_type k = 0 ; k < n ; k++) + { + // get the kth row of L and store in the columns of L +- cholmod_row_subtree (A1, A2, k, Parent, R, cm) ; ++ CHOLMOD_NAME (row_subtree) (A1, A2, k, Parent, R, cm) ; + for (octave_idx_type p = 0 ; p < Rp [1] ; p++) + L.xridx (W [Ri [p]]++) = k ; Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- octave.spec 24 Mar 2006 17:04:57 -0000 1.35 +++ octave.spec 24 Mar 2006 21:19:19 -0000 1.36 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -133,6 +133,9 @@ %changelog +* Fri Mar 24 2006 Quentin Spencer 2.9.5-4 +- Change patch again (suggested by the author on Octave mailing list). + * Fri Mar 24 2006 Quentin Spencer 2.9.5-3 - Fix broken patch. From fedora-extras-commits at redhat.com Fri Mar 24 22:09:44 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 24 Mar 2006 17:09:44 -0500 Subject: rpms/lincity-ng/FC-4 lincity-ng.spec,1.5,1.6 Message-ID: <200603242210.k2OMAH3S027250@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27188/FC-4 Modified Files: lincity-ng.spec Log Message: Resolve 186513 by using proper OPT_FLAGS, not -O3. Index: lincity-ng.spec =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/FC-4/lincity-ng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lincity-ng.spec 28 Feb 2006 22:52:58 -0000 1.5 +++ lincity-ng.spec 24 Mar 2006 22:09:44 -0000 1.6 @@ -1,6 +1,6 @@ Name: lincity-ng Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games Summary: City Simulation Game @@ -31,6 +31,8 @@ %prep %setup -q %patch0 -p1 +sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules +sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules %build %configure @@ -62,6 +64,9 @@ %{_datadir}/lincity-ng/ %changelog +* Fri Mar 24 2006 Tom "spot" Callaway 1.0.2-4 +- -O3 optimization makes the code cry + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.2-3 - bump for FC-5 From fedora-extras-commits at redhat.com Fri Mar 24 22:09:51 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 24 Mar 2006 17:09:51 -0500 Subject: rpms/lincity-ng/FC-5 lincity-ng.spec,1.5,1.6 Message-ID: <200603242210.k2OMAOlr027253@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27188/FC-5 Modified Files: lincity-ng.spec Log Message: Resolve 186513 by using proper OPT_FLAGS, not -O3. Index: lincity-ng.spec =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/FC-5/lincity-ng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lincity-ng.spec 28 Feb 2006 22:53:04 -0000 1.5 +++ lincity-ng.spec 24 Mar 2006 22:09:51 -0000 1.6 @@ -1,6 +1,6 @@ Name: lincity-ng Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games Summary: City Simulation Game @@ -32,6 +32,8 @@ %prep %setup -q %patch0 -p1 +sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules +sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules %build %configure @@ -63,6 +65,9 @@ %{_datadir}/lincity-ng/ %changelog +* Fri Mar 24 2006 Tom "spot" Callaway 1.0.2-4 +- -O3 optimization makes the code cry + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.2-3 - bump for FC-5 From fedora-extras-commits at redhat.com Fri Mar 24 22:09:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 24 Mar 2006 17:09:57 -0500 Subject: rpms/lincity-ng/devel lincity-ng.spec,1.5,1.6 Message-ID: <200603242210.k2OMAUgZ027259@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27188/devel Modified Files: lincity-ng.spec Log Message: Resolve 186513 by using proper OPT_FLAGS, not -O3. Index: lincity-ng.spec =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lincity-ng.spec 28 Feb 2006 22:53:04 -0000 1.5 +++ lincity-ng.spec 24 Mar 2006 22:09:57 -0000 1.6 @@ -1,6 +1,6 @@ Name: lincity-ng Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games Summary: City Simulation Game @@ -32,6 +32,8 @@ %prep %setup -q %patch0 -p1 +sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules +sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules %build %configure @@ -63,6 +65,9 @@ %{_datadir}/lincity-ng/ %changelog +* Fri Mar 24 2006 Tom "spot" Callaway 1.0.2-4 +- -O3 optimization makes the code cry + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.2-3 - bump for FC-5 From fedora-extras-commits at redhat.com Fri Mar 24 22:09:23 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 24 Mar 2006 17:09:23 -0500 Subject: rpms/lincity-ng/FC-3 lincity-ng.spec,1.5,1.6 Message-ID: <200603242210.k2OMAQHS027255@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27188/FC-3 Modified Files: lincity-ng.spec Log Message: Resolve 186513 by using proper OPT_FLAGS, not -O3. Index: lincity-ng.spec =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/FC-3/lincity-ng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lincity-ng.spec 28 Feb 2006 22:52:52 -0000 1.5 +++ lincity-ng.spec 24 Mar 2006 22:09:23 -0000 1.6 @@ -1,6 +1,6 @@ Name: lincity-ng Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games Summary: City Simulation Game @@ -31,6 +31,8 @@ %prep %setup -q %patch0 -p1 +sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules +sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules %build %configure @@ -62,6 +64,9 @@ %{_datadir}/lincity-ng/ %changelog +* Fri Mar 24 2006 Tom "spot" Callaway 1.0.2-4 +- -O3 optimization makes the code cry + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.2-3 - bump for FC-5 From fedora-extras-commits at redhat.com Fri Mar 24 23:00:40 2006 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Fri, 24 Mar 2006 18:00:40 -0500 Subject: rpms/libesmtp/devel .cvsignore, 1.4, 1.5 libesmtp-build.patch, 1.1, 1.2 libesmtp.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603242301.k2ON1C68028069@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/libesmtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27597 Modified Files: .cvsignore libesmtp-build.patch libesmtp.spec sources Log Message: - Update to 1.0.4 - redo build and ssl patches. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Dec 2005 12:45:56 -0000 1.4 +++ .cvsignore 24 Mar 2006 23:00:39 -0000 1.5 @@ -1,3 +1,3 @@ -libesmtp-1.0.3r1.tar.bz2 -libesmtp-ssl.patch -COPYING.LGPL +libesmtp-1.0.4-ssl.patch +libesmtp-build.patch +libesmtp-1.0.4.tar.bz2 libesmtp-build.patch: Index: libesmtp-build.patch =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/libesmtp-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libesmtp-build.patch 12 Jun 2005 21:08:03 -0000 1.1 +++ libesmtp-build.patch 24 Mar 2006 23:00:39 -0000 1.2 @@ -1,103 +1,28 @@ -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/configure.in libesmtp-1.0.3r1/configure.in ---- libesmtp-1.0.3r1-orig/configure.in 2004-04-21 10:21:32.000000000 +0200 -+++ libesmtp-1.0.3r1/configure.in 2005-05-26 23:34:19.000000000 +0200 -@@ -56,7 +56,7 @@ - dnl Miscellaneous stuff - dnl ######################################################################### +--- libesmtp-1.0.4/missing.h.build 2004-04-19 13:15:45.000000000 +0200 ++++ libesmtp-1.0.4/missing.h 2006-03-24 23:50:38.000000000 +0100 +@@ -43,15 +43,4 @@ + void *memrchr (const void *a, int c, size_t len); + #endif + +-#ifndef HAVE_SNPRINTF +-#include +-int snprintf(char *s, size_t n, const char *format, ...); +-#endif +- +-#ifndef HAVE_VSNPRINTF +-#include +-#include +-int vsnprintf(char *s, size_t n, const char *format, va_list ap); +-#endif +- + #endif +--- libesmtp-1.0.4/headers.c~ 2005-12-15 21:52:01.000000000 +0100 ++++ libesmtp-1.0.4/headers.c 2006-03-24 23:53:58.000000000 +0100 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include --EXTRA_CFLAGS="" -+AM_CFLAGS="" - case $host_vendor-$host_os in - sun*) - AC_DEFINE(__EXTENSIONS__,1,[Sun's netdb.h needs this for getaddrinfo]) -@@ -79,13 +79,13 @@ - enable_more_warnings=yes) - - if test "$GCC" = "yes" -a "$enable_more_warnings" != "no"; then -- EXTRA_CFLAGS="$EXTRA_CFLAGS \ -+ AM_CFLAGS="$AM_CFLAGS \ - -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ - -Wstrict-prototypes -Wnested-externs -Wpointer-arith \ - -Wbad-function-cast -Wcast-align" - fi - if test "$GCC" = "yes" -a "$enable_more_warnings" = "picky"; then -- EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-builtin -W -Werror -Wwrite-strings \ -+ $AM_CFLAGS="$AM_CFLAGS -fno-builtin -W -Werror -Wwrite-strings \ - -Wcast-qual" - fi - -@@ -538,7 +538,7 @@ - dnl ######################################################################### - - AC_REPLACE_FUNCS(strdup strcasecmp strncasecmp memrchr) --AC_CHECK_FUNCS(strtol uname gethostname) -+AC_CHECK_FUNCS(strtol uname gethostname snprintf vsnprintf) - AC_SEARCH_LIBS(socket, socket) - - dnl Conditional check for functions needed in threaded code -@@ -582,9 +582,7 @@ - AC_SUBST(DIST_PLUGINS) - AC_SUBST(LIBTOOL_DEPS) - AC_SUBST(LIBS) --AC_SUBST(CFLAGS) --AC_SUBST(EXTRA_CFLAGS) --AC_SUBST(CC) -+AC_SUBST(AM_CFLAGS) - AC_SUBST(RANLIB) - AC_SUBST(subdirs) - -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/crammd5/Makefile.am libesmtp-1.0.3r1/crammd5/Makefile.am ---- libesmtp-1.0.3r1-orig/crammd5/Makefile.am 2001-10-17 11:15:27.000000000 +0200 -+++ libesmtp-1.0.3r1/crammd5/Makefile.am 2005-05-26 23:28:15.000000000 +0200 -@@ -3,7 +3,6 @@ - libdir = @plugindir@ - - INCLUDES = -I at srcdir@ --CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-cram-md5.la - -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/login/Makefile.am libesmtp-1.0.3r1/login/Makefile.am ---- libesmtp-1.0.3r1-orig/login/Makefile.am 2001-10-17 09:18:00.000000000 +0200 -+++ libesmtp-1.0.3r1/login/Makefile.am 2005-05-26 23:28:12.000000000 +0200 -@@ -5,7 +5,6 @@ - INCLUDES = -I at srcdir@ - - lib_LTLIBRARIES = sasl-login.la --CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - sasl_login_la_SOURCES = client-login.c - sasl_login_la_LDFLAGS = -module -avoid-version -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/Makefile.am libesmtp-1.0.3r1/Makefile.am ---- libesmtp-1.0.3r1-orig/Makefile.am 2003-01-22 09:45:23.000000000 +0100 -+++ libesmtp-1.0.3r1/Makefile.am 2005-05-26 23:28:20.000000000 +0200 -@@ -4,7 +4,6 @@ - INCLUDES = -I$(srcdir) $(VERSION_FLAGS) - SUBDIRS = @subdirs@ @SASL_PLUGINS@ - DIST_SUBDIRS = @subdirs@ @DIST_PLUGINS@ --CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = libesmtp.la - -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/ntlm/Makefile.am libesmtp-1.0.3r1/ntlm/Makefile.am ---- libesmtp-1.0.3r1-orig/ntlm/Makefile.am 2002-05-31 15:35:47.000000000 +0200 -+++ libesmtp-1.0.3r1/ntlm/Makefile.am 2005-05-26 23:28:08.000000000 +0200 -@@ -3,7 +3,6 @@ - libdir = @plugindir@ - - INCLUDES = -I at srcdir@ --CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-ntlm.la - -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/plain/Makefile.am libesmtp-1.0.3r1/plain/Makefile.am ---- libesmtp-1.0.3r1-orig/plain/Makefile.am 2001-10-17 09:18:08.000000000 +0200 -+++ libesmtp-1.0.3r1/plain/Makefile.am 2005-05-26 23:28:04.000000000 +0200 -@@ -3,7 +3,6 @@ - libdir = @plugindir@ - - INCLUDES = -I at srcdir@ --CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-plain.la + #include Index: libesmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/libesmtp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libesmtp.spec 1 Mar 2006 20:14:16 -0000 1.6 +++ libesmtp.spec 24 Mar 2006 23:00:39 -0000 1.7 @@ -2,14 +2,13 @@ Summary: SMTP client library Name: libesmtp -Version: 1.0.3r1 -Release: 8%{?dist} +Version: 1.0.4 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2 -Source1: COPYING.LGPL Patch1: libesmtp-build.patch -Patch2: libesmtp-ssl.patch +Patch2: libesmtp-1.0.4-ssl.patch URL: http://www.stafford.uklinux.net/libesmtp/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel pkgconfig automake libtool @@ -39,15 +38,8 @@ %setup -q %patch1 -p1 -b .build %patch2 -p1 -b .ssl -cp %{SOURCE1} . %build -#we run auto* because the distributed configure script is inferior. -libtoolize --force -aclocal -autoconf -autoheader -automake --gnu --add-missing --copy if pkg-config openssl ; then export CFLAGS="$CFLAGS $RPM_OPT_FLAGS `pkg-config --cflags openssl`" @@ -74,19 +66,22 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING.LGPL NEWS Notes README +%doc AUTHORS COPYING.LIB NEWS Notes README %{_libdir}/libesmtp.so.* %{plugindir} %files devel %defattr(-,root,root,-) -%doc examples COPYING.GPL +%doc examples COPYING %{_bindir}/libesmtp-config %{_prefix}/include/* %{_libdir}/libesmtp.so %{_libdir}/libesmtp.a %changelog +* Fri Mar 24 2006 Pawel Salek - 1.0.4-1 +- Update to 1.0.4 - redo build and ssl patches. + * Wed Mar 1 2006 Pawel Salek - 1.0.3r1-8 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Dec 2005 12:45:56 -0000 1.4 +++ sources 24 Mar 2006 23:00:39 -0000 1.5 @@ -1,3 +1,3 @@ -c07aa79293aa36298626fe5e68d6bfba libesmtp-1.0.3r1.tar.bz2 -f018f16cbebc56490d2c3c18a23d3113 libesmtp-ssl.patch -a6f89e2100d9b6cdffcea4f398e37343 COPYING.LGPL +8ddc9f7691fa3561e4a73dafb6658369 libesmtp-1.0.4-ssl.patch +d0397bf2129d3a213cbc3d5cc74b9b63 libesmtp-build.patch +8b4e8a794adc46268f0c6a0b3fb79486 libesmtp-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 24 23:07:59 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 18:07:59 -0500 Subject: rpms/ftnchek/devel ftnchek.spec,1.2,1.3 Message-ID: <200603242308.k2ON8Vg6029642@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29625 Modified Files: ftnchek.spec Log Message: * Fri Mar 24 2006 Orion Poplawki 3.3.1-4 - Don't strip binaries so we get a good debuginfo Index: ftnchek.spec =================================================================== RCS file: /cvs/extras/rpms/ftnchek/devel/ftnchek.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ftnchek.spec 8 Mar 2006 22:59:47 -0000 1.2 +++ ftnchek.spec 24 Mar 2006 23:07:58 -0000 1.3 @@ -1,6 +1,6 @@ Name: ftnchek Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Static analyzer for Fortran 77 programs Group: Development/Tools @@ -54,7 +54,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -%makeinstall datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ +%makeinstall STRIP=/bin/true datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ lispdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -77,6 +77,9 @@ %changelog +* Fri Mar 24 2006 Orion Poplawki 3.3.1-4 +- Don't strip binaries so we get a good debuginfo + * Wed Mar 08 2006 Orion Poplawki 3.3.1-3 - Own %{_datadir}/ftnchek/ - Add period to end of emacs package description From fedora-extras-commits at redhat.com Fri Mar 24 23:09:49 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 18:09:49 -0500 Subject: rpms/ftnchek/FC-5 ftnchek.spec,1.2,1.3 Message-ID: <200603242310.k2ONAdrI029707@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29690 Modified Files: ftnchek.spec Log Message: * Fri Mar 24 2006 Orion Poplawki 3.3.1-4 - Don't strip binaries so we get a good debuginfo Index: ftnchek.spec =================================================================== RCS file: /cvs/extras/rpms/ftnchek/FC-5/ftnchek.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ftnchek.spec 8 Mar 2006 22:59:47 -0000 1.2 +++ ftnchek.spec 24 Mar 2006 23:09:49 -0000 1.3 @@ -1,6 +1,6 @@ Name: ftnchek Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Static analyzer for Fortran 77 programs Group: Development/Tools @@ -54,7 +54,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -%makeinstall datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ +%makeinstall STRIP=/bin/true datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ lispdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -77,6 +77,9 @@ %changelog +* Fri Mar 24 2006 Orion Poplawki 3.3.1-4 +- Don't strip binaries so we get a good debuginfo + * Wed Mar 08 2006 Orion Poplawki 3.3.1-3 - Own %{_datadir}/ftnchek/ - Add period to end of emacs package description From fedora-extras-commits at redhat.com Fri Mar 24 23:12:31 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 18:12:31 -0500 Subject: rpms/ftnchek/FC-4 ftnchek.spec,1.2,1.3 Message-ID: <200603242313.k2ONDAIN029781@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29749 Modified Files: ftnchek.spec Log Message: * Fri Mar 24 2006 Orion Poplawki 3.3.1-4 - Don't strip binaries so we get a good debuginfo Index: ftnchek.spec =================================================================== RCS file: /cvs/extras/rpms/ftnchek/FC-4/ftnchek.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ftnchek.spec 8 Mar 2006 22:59:47 -0000 1.2 +++ ftnchek.spec 24 Mar 2006 23:12:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: ftnchek Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Static analyzer for Fortran 77 programs Group: Development/Tools @@ -54,7 +54,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -%makeinstall datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ +%makeinstall STRIP=/bin/true datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ lispdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -77,6 +77,9 @@ %changelog +* Fri Mar 24 2006 Orion Poplawki 3.3.1-4 +- Don't strip binaries so we get a good debuginfo + * Wed Mar 08 2006 Orion Poplawki 3.3.1-3 - Own %{_datadir}/ftnchek/ - Add period to end of emacs package description From fedora-extras-commits at redhat.com Fri Mar 24 23:14:37 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 24 Mar 2006 18:14:37 -0500 Subject: extras-buildsys/utils extras-repobuild.py,1.11,1.12 Message-ID: <200603242314.k2ONEbDB029849@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29831 Modified Files: extras-repobuild.py Log Message: Skip package payload digest/signature checks in repomanage. Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- extras-repobuild.py 17 Mar 2006 07:46:49 -0000 1.11 +++ extras-repobuild.py 24 Mar 2006 23:14:28 -0000 1.12 @@ -62,7 +62,7 @@ print 'processing: %s' % repodir print 'Cleaning up older packages (keeping %d latest)' % (keep) - cmd = '/usr/bin/repomanage -k%d -o %s | xargs rm -f' % (keep, repodir) + cmd = '/usr/bin/repomanage -c -k%d -o %s | xargs rm -f' % (keep, repodir) run_and_check(cmd) print 'Creating repository metadata' From fedora-extras-commits at redhat.com Fri Mar 24 23:50:41 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 24 Mar 2006 18:50:41 -0500 Subject: rpms/anjuta import.log,1.6,1.7 Message-ID: <200603242351.k2ONpDNf030062@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30025 Modified Files: import.log Log Message: auto-import anjuta-1.2.4-5 on branch devel from anjuta-1.2.4-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anjuta/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 22 Feb 2006 21:32:40 -0000 1.6 +++ import.log 24 Mar 2006 23:50:40 -0000 1.7 @@ -3,3 +3,4 @@ anjuta-1_2_2-0_fdr_2_2:HEAD:anjuta-1.2.2-0.fdr.2.2.src.rpm:1099886584 anjuta-1_2_4-2:HEAD:anjuta-1.2.4-2.src.rpm:1140477846 anjuta-1_2_4-3:HEAD:anjuta-1.2.4-3.src.rpm:1140643945 +anjuta-1_2_4-5:HEAD:anjuta-1.2.4-5.src.rpm:1143244226 From fedora-extras-commits at redhat.com Fri Mar 24 23:50:47 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 24 Mar 2006 18:50:47 -0500 Subject: rpms/anjuta/devel anjuta-encodings.patch, 1.1, 1.2 anjuta.spec, 1.15, 1.16 Message-ID: <200603242351.k2ONpJ7l030066@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30025/devel Modified Files: anjuta-encodings.patch anjuta.spec Log Message: auto-import anjuta-1.2.4-5 on branch devel from anjuta-1.2.4-5.src.rpm anjuta-encodings.patch: Index: anjuta-encodings.patch =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/anjuta-encodings.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- anjuta-encodings.patch 20 Feb 2006 23:24:25 -0000 1.1 +++ anjuta-encodings.patch 24 Mar 2006 23:50:46 -0000 1.2 @@ -1,4 +1,4 @@ ---- src/anjuta-encodings.c.orig 2005-12-15 18:50:55.000000000 +0100 +--- src/anjuta-encodings.c 2005-12-15 18:50:55.000000000 +0100 +++ src/anjuta-encodings.c 2005-12-15 18:51:38.000000000 +0100 @@ -707,15 +707,15 @@ gtk_tree_view_set_search_column (GTK_TREE_VIEW (stock_treeview), @@ -37,4 +37,16 @@ anjuta_preferences_register_property_custom (pref, supported_treeview, SUPPORTED_ENCODINGS, - "ISO-8859-15", + +--- src/Makefile.in 2005-08-12 16:37:02.000000000 +0200 ++++ src/Makefile.in 2006-03-24 19:16:54.000000000 +0100 +@@ -723,7 +723,7 @@ + done + anjuta$(EXEEXT): $(anjuta_OBJECTS) $(anjuta_DEPENDENCIES) + @rm -f anjuta$(EXEEXT) +- $(CXXLINK) $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS) ++ $(CXXLINK) -Wl,--export-dynamic $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) + "ISO-8859-15", Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- anjuta.spec 22 Feb 2006 21:32:45 -0000 1.15 +++ anjuta.spec 24 Mar 2006 23:50:46 -0000 1.16 @@ -1,6 +1,6 @@ Name: anjuta Version: 1.2.4 -Release: 3%{?dist} +Release: 5%{?dist} Summary: GNOME IDE for C and C++ Group: Development/Tools @@ -20,6 +20,8 @@ BuildRequires: libtool BuildRequires: gettext BuildRequires: desktop-file-utils +BuildRequires: libgnome-devel +BuildRequires: gtk2-devel Epoch: 1 Requires: pkgconfig libtool gettext-devel Requires(post): scrollkeeper @@ -46,12 +48,12 @@ %prep %setup -q -%patch -p0 -b patch0 +%patch -p0 -b .encodings %build # configure option --enable-final does not work corretly on x86_64; Use # -DNDEBUG in CFLAGS -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %configure %define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,') sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status @@ -78,6 +80,10 @@ s!(^GLOBAL_TAGS_FILE=).*!$1%{_datadir}/%{name}/system.tags!; s!tm_global_tags!%{name}_tm_global_tags!g; ' ${RPM_BUILD_ROOT}%{_bindir}/anjuta_create_global_tags.sh +pushd ${RPM_BUILD_ROOT}%{_docdir} +ln -s anjuta-1.2.4 anjuta +popd + %clean rm -rf ${RPM_BUILD_ROOT} @@ -95,6 +101,7 @@ %{_bindir}/%{name}* %{_libdir}/%{name} %{_datadir}/%{name} +%{_datadir}/doc/anjuta %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name} %{_datadir}/mime-info/anjuta.mime @@ -107,6 +114,15 @@ %{_datadir}/omf/%{name} %changelog +* Fri Mar 24 2006 Michael Schwendt - 1.2.4-5 +- Added export dynamic +- trivial spec changes + +* Fri Mar 24 2006 Paul F. Johnson - 1.2.4-4 +- Added dependancies for gtk2-devel and libgnome-devel +- Re-instated debug +- Add symlink for documentation + * Wed Feb 22 2006 Paul F. Johnson - 1.2.4-3 - Added back in the epoch - oopsie! From fedora-extras-commits at redhat.com Sat Mar 25 01:02:25 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Fri, 24 Mar 2006 20:02:25 -0500 Subject: krbVmodule krb5err.c, 1.2, 1.3 krb5module.c, 1.19, 1.20 krbVmodule.spec.in, 1.8, 1.9 Message-ID: <200603250102.k2P12t4C001852@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/devel/krbVmodule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1821 Modified Files: krb5err.c krb5module.c krbVmodule.spec.in Log Message: - fixed typo - changed the return value of recvauth() to include remote principal - renamed RPM to be more Extras-friendly Index: krb5err.c =================================================================== RCS file: /cvs/devel/krbVmodule/krb5err.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- krb5err.c 7 Mar 2002 00:21:02 -0000 1.2 +++ krb5err.c 25 Mar 2006 01:02:22 -0000 1.3 @@ -42,6 +42,6 @@ PyObject *dict; dict = PyModule_GetDict(module); - pk_exception = PyErr_NewException("krb5.Krb5Error", NULL, NULL); + pk_exception = PyErr_NewException("krbV.Krb5Error", NULL, NULL); PyDict_SetItemString(dict, "Krb5Error", pk_exception); } Index: krb5module.c =================================================================== RCS file: /cvs/devel/krbVmodule/krb5module.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- krb5module.c 17 Oct 2003 18:58:35 -0000 1.19 +++ krb5module.c 25 Mar 2006 01:02:22 -0000 1.20 @@ -23,6 +23,7 @@ #include #include #include +#include #if !defined(_KRB5_INT_H) && defined(KRB5_PROTOTYPE) krb5_error_code krb5_get_krbhst KRB5_PROTOTYPE((krb5_context, const krb5_data *, char ***)); @@ -798,6 +799,7 @@ krb5_auth_context ac_out = NULL; krb5_keytab kt; krb5_principal pserver; + krb5_ticket *cticket; krb5_flags ap_req_options = 0; krb5_error_code rc = 0; int free_keytab = 0; @@ -851,20 +853,42 @@ ap_req_options = PyInt_AsLong(options); Py_BEGIN_ALLOW_THREADS - rc = krb5_recvauth(kctx, &ac_out, fd_ptr, appl_version, pserver, ap_req_options, kt, NULL); + rc = krb5_recvauth(kctx, &ac_out, fd_ptr, appl_version, pserver, ap_req_options, kt, &cticket); Py_END_ALLOW_THREADS if(rc) return pk_error(rc); + retval = PyTuple_New(2); + + if (cticket->enc_part2) + { + PyObject *cprinc; + + if (!(cprinc = make_principal(self, kctx, cticket->enc_part2->client))) + { + Py_DECREF(retval); + krb5_free_ticket(kctx, cticket); + return NULL; + } + PyTuple_SetItem(retval, 1, cprinc); + } + else + { + PyTuple_SetItem(retval, 1, Py_None); + Py_INCREF(Py_None); + } + krb5_free_ticket(kctx, cticket); + { - PyObject *subargs, *mykw = NULL, *otmp; + PyObject *subargs, *mykw = NULL, *otmp, *auth_context; subargs = Py_BuildValue("()"); mykw = PyDict_New(); PyDict_SetItemString(mykw, "context", self); otmp = PyCObject_FromVoidPtrAndDesc(ac_out, kctx, destroy_ac); PyDict_SetItemString(mykw, "ac", otmp); - retval = PyEval_CallObjectWithKeywords(auth_context_class, subargs, mykw); + auth_context = PyEval_CallObjectWithKeywords(auth_context_class, subargs, mykw); + PyTuple_SetItem(retval, 0, auth_context); Py_DECREF(otmp); Py_DECREF(subargs); Py_XDECREF(mykw); @@ -989,6 +1013,36 @@ return retval; } +/* Convert a krb5_address to a string representation. */ +static PyObject * +addr_to_str(krb5_address *kaddr) +{ + const char* ret = NULL; + char *addr = NULL; + + if (kaddr->addrtype == ADDRTYPE_INET) + { + addr = alloca(INET_ADDRSTRLEN); + ret = inet_ntop(AF_INET, kaddr->contents, + addr, INET_ADDRSTRLEN); + } + else if (kaddr->addrtype == ADDRTYPE_INET6) + { + addr = alloca(INET6_ADDRSTRLEN); + ret = inet_ntop(AF_INET6, kaddr->contents, + addr, INET6_ADDRSTRLEN); + } + + if (addr == NULL || ret == NULL) + { + return NULL; + } + else + { + return PyString_FromString(addr); + } +} + /*********************** AuthContext **********************/ static PyObject* AuthContext_getattr(PyObject *unself, PyObject *args) @@ -1028,16 +1082,23 @@ } else if(!strcmp(name, "addrs")) { - PyObject *ra1, *ra2; + PyObject *ra1, *ra2, *laddr, *raddr; krb5_address *a1=NULL, *a2=NULL; rc = krb5_auth_con_getaddrs(ctx, ac, &a1, &a2); if(rc) return pk_error(rc); if(a1) { + laddr = addr_to_str(a1); + if (laddr == NULL) + { + laddr = Py_None; + Py_INCREF(Py_None); + } + ra1 = PyTuple_New(2); PyTuple_SetItem(ra1, 0, PyInt_FromLong(a1->addrtype)); - PyTuple_SetItem(ra1, 1, PyString_FromStringAndSize(a1->contents, a1->length)); + PyTuple_SetItem(ra1, 1, laddr); krb5_free_address(ctx, a1); } else @@ -1047,9 +1108,16 @@ } if(a2) { + raddr = addr_to_str(a2); + if (raddr == NULL) + { + raddr = Py_None; + Py_INCREF(Py_None); + } + ra2 = PyTuple_New(2); PyTuple_SetItem(ra2, 0, PyInt_FromLong(a2->addrtype)); - PyTuple_SetItem(ra2, 1, PyString_FromStringAndSize(a2->contents, a2->length)); + PyTuple_SetItem(ra2, 1, raddr); krb5_free_address(ctx, a2); } else Index: krbVmodule.spec.in =================================================================== RCS file: /cvs/devel/krbVmodule/krbVmodule.spec.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- krbVmodule.spec.in 14 Jan 2004 17:51:50 -0000 1.8 +++ krbVmodule.spec.in 25 Mar 2006 01:02:23 -0000 1.9 @@ -1,18 +1,18 @@ -%define pyver 2.3 +%define pyver %(%{__python} -c "import sys ; print sys.version[:3]") Summary: Python extension module for Kerberos 5 -Name: krbV-python%{pyver} +Name: python-krbV Version: @VERSION@ Release: 1 -Copyright: LGPL +License: LGPL Group: Development/Languages Source: krbVmodule-%{version}.tar.gz Buildroot: /var/tmp/krb5module-root -Requires: python2 >= %{pyver} -BuildRequires: python2-devel >= %{pyver} +BuildRequires: python-devel >= %{pyver} BuildRequires: krb5-devel >= 1.2.2 -Requires: krb5-libs >= 1.2.2 BuildRequires: /bin/awk +Requires: python-abi = %{pyver} +Requires: krb5-libs >= 1.2.2 %description Allows python programs to use Kerberos 5 authentication/security. @@ -41,5 +41,10 @@ %{_libdir}/python%{pyver}/site-packages/krbVmodule.so %changelog +* Fri Mar 24 2006 Mike Bonnet +- fix typo in error definition +- change the return value of recvauth() from ac to (ac, princ), where princ is the principal sent by sendauth() +- rename the RPM and reorganize the BuildRequires, to be more Extras-friendly + * Tue Sep 25 2001 Elliot Lee - Initial version From fedora-extras-commits at redhat.com Sat Mar 25 02:00:48 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 21:00:48 -0500 Subject: rpms/cpanspec/devel .cvsignore, 1.6, 1.7 cpanspec.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200603250201.k2P21Km3003704@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2050 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.64. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Mar 2006 16:36:13 -0000 1.6 +++ .cvsignore 25 Mar 2006 02:00:47 -0000 1.7 @@ -1 +1 @@ -cpanspec-1.63.tar.gz +cpanspec-1.64.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cpanspec.spec 24 Mar 2006 16:36:13 -0000 1.5 +++ cpanspec.spec 25 Mar 2006 02:00:47 -0000 1.6 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.63 +Version: 1.64 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.64-1 +- Update to 1.64. + * Wed Mar 24 2006 Steven Pritchard 1.63-1 - Update to 1.63. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Mar 2006 16:36:13 -0000 1.6 +++ sources 25 Mar 2006 02:00:47 -0000 1.7 @@ -1 +1 @@ -726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz +a77d2b4ef27633fc551d557f459b3462 cpanspec-1.64.tar.gz From fedora-extras-commits at redhat.com Sat Mar 25 02:02:37 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 21:02:37 -0500 Subject: rpms/cpanspec/FC-5 .cvsignore, 1.6, 1.7 cpanspec.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200603250203.k2P23A5W004092@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4071 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.64. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Mar 2006 16:37:55 -0000 1.6 +++ .cvsignore 25 Mar 2006 02:02:36 -0000 1.7 @@ -1 +1 @@ -cpanspec-1.63.tar.gz +cpanspec-1.64.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cpanspec.spec 24 Mar 2006 16:37:55 -0000 1.5 +++ cpanspec.spec 25 Mar 2006 02:02:36 -0000 1.6 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.63 +Version: 1.64 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.64-1 +- Update to 1.64. + * Wed Mar 24 2006 Steven Pritchard 1.63-1 - Update to 1.63. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Mar 2006 16:37:55 -0000 1.6 +++ sources 25 Mar 2006 02:02:36 -0000 1.7 @@ -1 +1 @@ -726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz +a77d2b4ef27633fc551d557f459b3462 cpanspec-1.64.tar.gz From fedora-extras-commits at redhat.com Sat Mar 25 02:24:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 21:24:16 -0500 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.6, 1.7 cpanspec.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200603250224.k2P2OmFU004222@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4201 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.64. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Mar 2006 16:39:20 -0000 1.6 +++ .cvsignore 25 Mar 2006 02:24:16 -0000 1.7 @@ -1 +1 @@ -cpanspec-1.63.tar.gz +cpanspec-1.64.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cpanspec.spec 24 Mar 2006 16:39:20 -0000 1.5 +++ cpanspec.spec 25 Mar 2006 02:24:16 -0000 1.6 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.63 +Version: 1.64 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.64-1 +- Update to 1.64. + * Wed Mar 24 2006 Steven Pritchard 1.63-1 - Update to 1.63. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Mar 2006 16:39:20 -0000 1.6 +++ sources 25 Mar 2006 02:24:16 -0000 1.7 @@ -1 +1 @@ -726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz +a77d2b4ef27633fc551d557f459b3462 cpanspec-1.64.tar.gz From fedora-extras-commits at redhat.com Sat Mar 25 11:23:53 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sat, 25 Mar 2006 06:23:53 -0500 Subject: owners owners.list,1.770,1.771 Message-ID: <200603251124.k2PBODEM004609@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4586/owners Modified Files: owners.list Log Message: owners/owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.770 retrieving revision 1.771 diff -u -r1.770 -r1.771 --- owners.list 24 Mar 2006 07:19:42 -0000 1.770 +++ owners.list 25 Mar 2006 11:23:50 -0000 1.771 @@ -603,6 +603,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|libopts|Options library for autogen|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org| Fedora Extras|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|libosip|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xtdnet.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 25 18:10:10 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:10:10 -0500 Subject: rpms/php-extras - New directory Message-ID: <200603251810.k2PIACoV019196@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19188/php-extras Log Message: Directory /cvs/extras/rpms/php-extras added to the repository From fedora-extras-commits at redhat.com Sat Mar 25 18:10:16 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:10:16 -0500 Subject: rpms/php-extras/devel - New directory Message-ID: <200603251810.k2PIAIeZ019211@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19188/php-extras/devel Log Message: Directory /cvs/extras/rpms/php-extras/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 25 18:10:54 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:10:54 -0500 Subject: rpms/php-extras Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603251810.k2PIAuSd019247@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19235 Added Files: Makefile import.log Log Message: Setup of module php-extras --- NEW FILE Makefile --- # Top level Makefile for module php-extras all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 25 18:11:00 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:11:00 -0500 Subject: rpms/php-extras/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603251811.k2PIBHuo019270@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19235/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-extras --- NEW 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 Mar 25 18:13:26 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:13:26 -0500 Subject: rpms/php-extras import.log,1.1,1.2 Message-ID: <200603251813.k2PIDwI9019368@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19329 Modified Files: import.log Log Message: auto-import php-extras-5.1.2-2 on branch devel from php-extras-5.1.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/php-extras/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 Mar 2006 18:10:53 -0000 1.1 +++ import.log 25 Mar 2006 18:13:26 -0000 1.2 @@ -0,0 +1 @@ +php-extras-5_1_2-2:HEAD:php-extras-5.1.2-2.src.rpm:1143310397 From fedora-extras-commits at redhat.com Sat Mar 25 18:13:47 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:13:47 -0500 Subject: rpms/php-extras/devel php-extras-5.1.2-readline.patch, NONE, 1.1 php-extras.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603251814.k2PIENeC019374@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19329/devel Modified Files: .cvsignore sources Added Files: php-extras-5.1.2-readline.patch php-extras.spec Log Message: auto-import php-extras-5.1.2-2 on branch devel from php-extras-5.1.2-2.src.rpm php-extras-5.1.2-readline.patch: --- NEW FILE php-extras-5.1.2-readline.patch --- diff -Nrbu php-5.1.2/ext/readline/config.m4 php-5.1.2-OK/ext/readline/config.m4 --- php-5.1.2/ext/readline/config.m4 2005-11-29 02:04:01.000000000 +0300 +++ php-5.1.2-OK/ext/readline/config.m4 2006-02-28 18:53:48.000000000 +0300 @@ -5,10 +5,8 @@ PHP_ARG_WITH(libedit,for libedit readline replacement, [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) -if test "$PHP_LIBEDIT" = "no"; then PHP_ARG_WITH(readline,for readline support, [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) -fi if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then for i in $PHP_READLINE /usr/local /usr; do --- NEW FILE php-extras.spec --- # FC5: dbase, readline, recode, mcrypt, mhash, tidy, mssql %define def() %%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}} %{expand:%def dbase} %{expand:%def readline} # recode %{expand:%def mcrypt} %{expand:%def mhash} %{expand:%def tidy} # mssql %define list %{?_with_dbase:dbase} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql} %define extdir %(php-config --extension-dir) %define apiver %(echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) Name: php-extras Summary: Additional PHP modules from the standard PHP distribution #Version: %(php-config --version) Version: 5.1.2 Release: 2%{?dist} Group: Development/Languages License: The PHP License URL: http://www.php.net/ Source0: http://www.php.net/distributions/php-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel = %{version} Patch1: php-extras-5.1.2-readline.patch %description PHP is an HTML-embedded scripting language. This package contains various additional modules for PHP, which have not been included in the basic PHP package for Fedora Core. %package -n php-dbase Summary: Standard dBase module for PHP applications Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %description -n php-dbase Standard dBase module for PHP applications %package -n php-readline Summary: Standard PHP module provides readline library support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_readline:BuildRequires: readline-devel} %description -n php-readline Standard PHP module provides readline library support %package -n php-recode Summary: Standard PHP module provides GNU recode support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_recode:BuildRequires: recode-devel} %description -n php-recode Standard PHP module provides GNU recode support %package -n php-mcrypt Summary: Standard PHP module provides mcrypt library support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_mcrypt:BuildRequires: libmcrypt-devel} %description -n php-mcrypt Standard PHP module provides mcrypt library support %package -n php-mhash Summary: Standard PHP module provides mhash support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_mhash:BuildRequires: mhash-devel} %description -n php-mhash Standard PHP module provides mhash support %package -n php-tidy Summary: Standard PHP module provides tidy library support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_tidy:BuildRequires: libtidy-devel} %description -n php-tidy Standard PHP module provides tidy library support %package -n php-mssql Summary: Standard PHP module provides mssql support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_mssql:BuildRequires: freetds-devel} %description -n php-mssql Standard PHP module provides mssql support %prep %setup -q -n php-%{version} %patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing" for mod in %{list} do pushd ext/$mod phpize %configure # cause libtool to avoid passing -rpath when linking # (this hack is well-known as "libtool rpath workaround") sed -i 's|^hardcode_libdir_flag_spec|hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "|' libtool make %{?_smp_mflags} popd done %check # # As we don't build whole php here, we must do all the tests # with the system php executable. Unfortunately, we cannot use # system's /usr/bin/php directly, therefore a wrapper is needed. # # Some reasons for such a wrapper are: # - /usr/bin/php cannot handle "-d extension=" etc. on the command line # (probably because of the CGI-oriented variant of php executable is # installed as /usr/bin/php). We should use own config file for this. # - During "run-tests.php" execution, php is invoked again (recursively). # (i.e. we cannot explicitly set another config for deeper php invokation). # - We cannot exclude /etc/php.d/* files on the host machine. It can lead to # some stderr reports, which spoil the tests' output. To omit extra warnings, # the stderr is redirected to /dev/null # - When invoked again, some CGI-related environment variables are set # by default, which confuse php a lot. Therefore the environment is cleared, # and only needed variables are provided. # # The test stuff is derived from the original tests in the php tarball, # with preserving some needed specifications etc. # mkdir modules || exit 1 cat >modules.ini <>modules.ini done cat >php </dev/null env -i TEST_PHP_EXECUTABLE=$PWD/php TEST_PHP_SRCDIR=\$TEST_PHP_SRCDIR \ NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 \ %{_bindir}/php -c $PWD/modules.ini "\$@" EOF chmod +x ./php for mod in %{list} do [ -d ext/$mod/tests ] || continue pushd ext/$mod TEST_PHP_SRCDIR=$PWD ../../php ../../run-tests.php tests set +x fail=0 for f in tests/*.diff do [ -f "$f" ] || continue echo "TEST FAILURE: $PWD/$f --" cat $f echo echo "-- $PWD/$f result ends." fail=1 done [ $fail -ne 0 ] && exit $fail popd done %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{extdir} install -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d for mod in %{list} do install -m755 ext/${mod}/modules/*.so $RPM_BUILD_ROOT%{extdir} cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini < files.${mod} < - 5.1.2-2 - more accurate Requires for the main php (using php-api, provided now by the Core php package). * Tue Feb 28 2006 Dmitry Butskoy - 5.1.2-1 - update to 5.1.2 - replace readline patch (old issue go away and a new appears). - apply well-known "libtool-rpath-workaround" (see in Internet ;-)) to avoid use -rpath for linking * Sat Dec 17 2005 Dmitry Butskoy - 5.1.1-1 - upgrade to 5.1.1 for FC5 - drop now missed "fam" and obsolete "sqlite" (sqlite2) modules * Mon Nov 14 2005 Dmitry Butskoy - 5.0.4-1 - spec file cleanups * Mon Oct 10 2005 Dmitry Butskoy - 5.0.4-0 - adaptation for php5 - drop tests patch (no more needed). * Fri Oct 7 2005 Dmitry Butskoy - 4.3.11-0 - initial release - create test stuff for check section. A lot of work because we play with extra modules by our own way... - add patch to fix some pathes in tests - add patch for readline configure Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Mar 2006 18:11:00 -0000 1.1 +++ .cvsignore 25 Mar 2006 18:13:47 -0000 1.2 @@ -0,0 +1 @@ +php-5.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Mar 2006 18:11:00 -0000 1.1 +++ sources 25 Mar 2006 18:13:47 -0000 1.2 @@ -0,0 +1 @@ +b5b6564e8c6a0d5bc1d2b4787480d792 php-5.1.2.tar.gz From fedora-extras-commits at redhat.com Sat Mar 25 18:24:45 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:24:45 -0500 Subject: owners owners.list,1.771,1.772 Message-ID: <200603251825.k2PIPHW6019478@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19448 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.771 retrieving revision 1.772 diff -u -r1.771 -r1.772 --- owners.list 25 Mar 2006 11:23:50 -0000 1.771 +++ owners.list 25 Mar 2006 18:24:44 -0000 1.772 @@ -1110,6 +1110,7 @@ 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| +Fedora Extras|php-extras|Additional PHP modules from the standard PHP distribution|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|php-json|An extremely fast PHP extension for JSON|ivazquez at ivazquez.net|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|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 25 19:21:46 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 25 Mar 2006 14:21:46 -0500 Subject: rpms/pcsc-tools/FC-5 .cvsignore, 1.4, 1.5 pcsc-tools.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603251922.k2PJMIbl021661@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21623/FC-5 Modified Files: .cvsignore pcsc-tools.spec sources Log Message: * Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 - 1.4.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Mar 2006 16:50:07 -0000 1.4 +++ .cvsignore 25 Mar 2006 19:21:44 -0000 1.5 @@ -1 +1 @@ -pcsc-tools-1.4.3.tar.gz +pcsc-tools-1.4.4.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/pcsc-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pcsc-tools.spec 9 Mar 2006 16:50:07 -0000 1.5 +++ pcsc-tools.spec 25 Mar 2006 19:21:44 -0000 1.6 @@ -1,5 +1,5 @@ Name: pcsc-tools -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC @@ -64,6 +64,9 @@ %changelog +* Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 +- 1.4.4. + * Thu Mar 9 2006 Ville Skytt?? - 1.4.3-1 - 1.4.3. - Improve description. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Mar 2006 16:50:07 -0000 1.4 +++ sources 25 Mar 2006 19:21:44 -0000 1.5 @@ -1 +1 @@ -c21a0865983d0f3eb9841eb4d03e67f1 pcsc-tools-1.4.3.tar.gz +f224de5a58f533f7b5bce1b9e9a340d7 pcsc-tools-1.4.4.tar.gz From fedora-extras-commits at redhat.com Sat Mar 25 19:21:52 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 25 Mar 2006 14:21:52 -0500 Subject: rpms/pcsc-tools/devel .cvsignore, 1.4, 1.5 pcsc-tools.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603251922.k2PJMONR021666@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21623/devel Modified Files: .cvsignore pcsc-tools.spec sources Log Message: * Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 - 1.4.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Mar 2006 16:50:07 -0000 1.4 +++ .cvsignore 25 Mar 2006 19:21:52 -0000 1.5 @@ -1 +1 @@ -pcsc-tools-1.4.3.tar.gz +pcsc-tools-1.4.4.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pcsc-tools.spec 9 Mar 2006 16:50:07 -0000 1.5 +++ pcsc-tools.spec 25 Mar 2006 19:21:52 -0000 1.6 @@ -1,5 +1,5 @@ Name: pcsc-tools -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC @@ -64,6 +64,9 @@ %changelog +* Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 +- 1.4.4. + * Thu Mar 9 2006 Ville Skytt?? - 1.4.3-1 - 1.4.3. - Improve description. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Mar 2006 16:50:07 -0000 1.4 +++ sources 25 Mar 2006 19:21:52 -0000 1.5 @@ -1 +1 @@ -c21a0865983d0f3eb9841eb4d03e67f1 pcsc-tools-1.4.3.tar.gz +f224de5a58f533f7b5bce1b9e9a340d7 pcsc-tools-1.4.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 26 06:41:31 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 26 Mar 2006 01:41:31 -0500 Subject: rpms/gconfmm26/devel .cvsignore, 1.5, 1.6 gconfmm.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200603260642.k2Q6g36A012462@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gconfmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12441 Modified Files: .cvsignore gconfmm.spec sources Log Message: Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Sep 2005 07:20:16 -0000 1.5 +++ .cvsignore 26 Mar 2006 06:41:30 -0000 1.6 @@ -1 +1 @@ -gconfmm-2.12.0.tar.bz2 +gconfmm-2.14.0.tar.bz2 Index: gconfmm.spec =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/gconfmm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gconfmm.spec 28 Feb 2006 22:05:56 -0000 1.10 +++ gconfmm.spec 26 Mar 2006 06:41:30 -0000 1.11 @@ -1,6 +1,6 @@ Name: gconfmm26 -Version: 2.12.0 -Release: 3 +Version: 2.14.0 +Release: 1 Summary: C++ wrapper for GConf2 @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 20 2006 Denis Leroy - 2.14.0-1 +- Update to 2.14.0 + * Tue Feb 28 2006 Denis Leroy - 2.12.0-3 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Sep 2005 07:20:16 -0000 1.5 +++ sources 26 Mar 2006 06:41:30 -0000 1.6 @@ -1 +1 @@ -dfd62a95e7675943933b793183649402 gconfmm-2.12.0.tar.bz2 +27b4703412c582ae9e6383de7c7ead6b gconfmm-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 26 06:47:25 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 26 Mar 2006 01:47:25 -0500 Subject: rpms/gnome-vfsmm26/devel .cvsignore, 1.4, 1.5 gnome-vfsmm.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603260647.k2Q6lwgX012554@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gnome-vfsmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12533 Modified Files: .cvsignore gnome-vfsmm.spec sources Log Message: Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Sep 2005 07:24:20 -0000 1.4 +++ .cvsignore 26 Mar 2006 06:47:25 -0000 1.5 @@ -1 +1 @@ -gnome-vfsmm-2.12.0.tar.bz2 +gnome-vfsmm-2.14.0.tar.bz2 Index: gnome-vfsmm.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnome-vfsmm.spec 28 Feb 2006 23:14:43 -0000 1.9 +++ gnome-vfsmm.spec 26 Mar 2006 06:47:25 -0000 1.10 @@ -1,6 +1,6 @@ Name: gnome-vfsmm26 -Version: 2.12.0 -Release: 3 +Version: 2.14.0 +Release: 1 Summary: C++ wrapper for gnome-vfs @@ -71,6 +71,9 @@ %changelog +* Thu Mar 23 2006 Denis Leroy - 2.14.0-1 +- Update to 2.14.0 + * Tue Feb 28 2006 Denis Leroy - 2.12.0-3 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Sep 2005 07:24:20 -0000 1.5 +++ sources 26 Mar 2006 06:47:25 -0000 1.6 @@ -1 +1 @@ -4a73741ab5232bf85cb631108c5b6430 gnome-vfsmm-2.12.0.tar.bz2 +bd5c3796e417a9780201835060461be3 gnome-vfsmm-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 26 07:01:05 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 26 Mar 2006 02:01:05 -0500 Subject: rpms/libgnomecanvasmm26/devel .cvsignore, 1.4, 1.5 libgnomecanvasmm.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200603260701.k2Q71bN9014602@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomecanvasmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12684 Modified Files: .cvsignore libgnomecanvasmm.spec sources Log Message: Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Sep 2005 07:27:17 -0000 1.4 +++ .cvsignore 26 Mar 2006 07:01:05 -0000 1.5 @@ -1 +1 @@ -libgnomecanvasmm-2.12.0.tar.bz2 +libgnomecanvasmm-2.14.0.tar.bz2 Index: libgnomecanvasmm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libgnomecanvasmm.spec 1 Mar 2006 01:11:59 -0000 1.9 +++ libgnomecanvasmm.spec 26 Mar 2006 07:01:05 -0000 1.10 @@ -1,6 +1,6 @@ Name: libgnomecanvasmm26 -Version: 2.12.0 -Release: 3 +Version: 2.14.0 +Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -74,6 +74,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Mar 23 2006 Denis Leroy - 2.14.0-1 +- Update to 2.14.0 + * Tue Feb 28 2006 Denis Leroy - 2.12.0-3 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Sep 2005 07:27:17 -0000 1.4 +++ sources 26 Mar 2006 07:01:05 -0000 1.5 @@ -1 +1 @@ -b05bba03433745043ef0c781020d4738 libgnomecanvasmm-2.12.0.tar.bz2 +a4e5bf13a31e38b4f30b99153bc10aca libgnomecanvasmm-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 26 07:05:02 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 26 Mar 2006 02:05:02 -0500 Subject: rpms/libgnomemm26/devel .cvsignore, 1.6, 1.7 libgnomemm.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200603260705.k2Q75Ypm014711@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomemm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14690 Modified Files: .cvsignore libgnomemm.spec sources Log Message: Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Mar 2006 01:16:43 -0000 1.6 +++ .cvsignore 26 Mar 2006 07:05:01 -0000 1.7 @@ -1 +1 @@ -libgnomemm-2.12.2.tar.bz2 +libgnomemm-2.14.0.tar.bz2 Index: libgnomemm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libgnomemm.spec 1 Mar 2006 01:16:43 -0000 1.10 +++ libgnomemm.spec 26 Mar 2006 07:05:01 -0000 1.11 @@ -1,5 +1,5 @@ Name: libgnomemm26 -Version: 2.12.2 +Version: 2.14.0 Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Mar 23 2006 Denis Leroy - 2.14.0-1 +- Update to 2.14.0 + * Tue Feb 28 2006 Denis Leroy - 2.12.2-1 - Update to 2.12.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Mar 2006 01:16:43 -0000 1.7 +++ sources 26 Mar 2006 07:05:01 -0000 1.8 @@ -1 +1 @@ -c43421c77999f1c225ec5a39c6c64dff libgnomemm-2.12.2.tar.bz2 +8e31905b9732fdb099381569736829fa libgnomemm-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 26 07:19:27 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 26 Mar 2006 02:19:27 -0500 Subject: rpms/libgnomeuimm26/devel .cvsignore, 1.4, 1.5 libgnomeuimm.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200603260719.k2Q7JxBp014839@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomeuimm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14818 Modified Files: .cvsignore libgnomeuimm.spec sources Log Message: Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Sep 2005 07:31:06 -0000 1.4 +++ .cvsignore 26 Mar 2006 07:19:26 -0000 1.5 @@ -1 +1 @@ -libgnomeuimm-2.12.0.tar.bz2 +libgnomeuimm-2.14.0.tar.bz2 Index: libgnomeuimm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libgnomeuimm.spec 1 Mar 2006 01:27:29 -0000 1.10 +++ libgnomeuimm.spec 26 Mar 2006 07:19:26 -0000 1.11 @@ -1,6 +1,6 @@ Name: libgnomeuimm26 -Version: 2.12.0 -Release: 3 +Version: 2.14.0 +Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -82,6 +82,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Mar 23 2006 Denis Leroy - 2.14.0-1 +- Update to 2.14.0 + * Tue Feb 28 2006 Denis Leroy - 2.12.0-3 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Sep 2005 07:31:06 -0000 1.5 +++ sources 26 Mar 2006 07:19:26 -0000 1.6 @@ -1 +1 @@ -50ee34ec10c4527f1dc49bb12d0e0954 libgnomeuimm-2.12.0.tar.bz2 +066edc6d3dea4f0dce317dbf5ea7c24e libgnomeuimm-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 26 07:57:33 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 26 Mar 2006 02:57:33 -0500 Subject: rpms/gweled/devel gweled.spec,1.13,1.14 Message-ID: <200603260758.k2Q7w5XG015032@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gweled/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15015 Modified Files: gweled.spec Log Message: Add LDFLAGS=-Wl,--export-dynamic (thx to Kevin Kofler for the hint) Index: gweled.spec =================================================================== RCS file: /cvs/extras/rpms/gweled/devel/gweled.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gweled.spec 13 Feb 2006 17:31:45 -0000 1.13 +++ gweled.spec 26 Mar 2006 07:57:32 -0000 1.14 @@ -1,6 +1,6 @@ Name: gweled Version: 0.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Swapping gem game @@ -31,6 +31,7 @@ %patch1 -p0 -b .patch0 %build +export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic" %configure echo "Encoding=UTF-8" >> gweled.desktop mv gweled.desktop gweled.desktop.old @@ -66,7 +67,10 @@ %{_datadir}/sounds/%{name}/ %changelog -* Mon Feb 13 2006 Thorsten Leemhuis +* Sun Mar 26 2006 Thorsten Leemhuis - 0.7-5 +- Add LDFLAGS="-Wl,--export-dynamic" (thx to Kevin Kofler for the hint) + +* Mon Feb 13 2006 Thorsten Leemhuis - 0.7-4 - Rebuild for Fedora Extras 5 * Sun Jan 29 2006 Thorsten Leemhuis - 0.7-3 From fedora-extras-commits at redhat.com Sun Mar 26 07:58:43 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 26 Mar 2006 02:58:43 -0500 Subject: rpms/gweled/FC-5 gweled.spec,1.13,1.14 Message-ID: <200603260759.k2Q7xGbH015093@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gweled/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15076 Modified Files: gweled.spec Log Message: Add LDFLAGS=-Wl,--export-dynamic (thx to Kevin Kofler for the hint) Index: gweled.spec =================================================================== RCS file: /cvs/extras/rpms/gweled/FC-5/gweled.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gweled.spec 13 Feb 2006 17:31:45 -0000 1.13 +++ gweled.spec 26 Mar 2006 07:58:43 -0000 1.14 @@ -1,6 +1,6 @@ Name: gweled Version: 0.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Swapping gem game @@ -31,6 +31,7 @@ %patch1 -p0 -b .patch0 %build +export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic" %configure echo "Encoding=UTF-8" >> gweled.desktop mv gweled.desktop gweled.desktop.old @@ -66,7 +67,10 @@ %{_datadir}/sounds/%{name}/ %changelog -* Mon Feb 13 2006 Thorsten Leemhuis +* Sun Mar 26 2006 Thorsten Leemhuis - 0.7-5 +- Add LDFLAGS="-Wl,--export-dynamic" (thx to Kevin Kofler for the hint) + +* Mon Feb 13 2006 Thorsten Leemhuis - 0.7-4 - Rebuild for Fedora Extras 5 * Sun Jan 29 2006 Thorsten Leemhuis - 0.7-3 From fedora-extras-commits at redhat.com Sun Mar 26 10:40:08 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 26 Mar 2006 05:40:08 -0500 Subject: owners owners.list,1.772,1.773 Message-ID: <200603261040.k2QAefsi025391@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25372 Modified Files: owners.list Log Message: Orphan perl-Chart, perl-Convert-BinHex, perl-IO-stringy, perl-MailTools, perl-MIME-tools, perl-Net-Netmask, perl-XML-DOM, perl-XML-RegExp, perl-XML-Simple, perl-XML-XPath, uqm, uqm-content Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.772 retrieving revision 1.773 diff -u -r1.772 -r1.773 --- owners.list 25 Mar 2006 18:24:44 -0000 1.772 +++ owners.list 26 Mar 2006 10:40:08 -0000 1.773 @@ -832,7 +832,7 @@ Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint-date|Validate a date|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint|Process CGI input parameters|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Chart|Perl modules for producing many types of charts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Chart|Perl modules for producing many types of charts|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Accessor-Chained|Make chained accessors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Autouse|Run-time class loading on first method call|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -866,7 +866,7 @@ 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 Fedora Extras|perl-Convert-ASCII-Armour|Convert::ASCII::Armour Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-PEM|Convert::PEM Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -953,7 +953,7 @@ Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|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-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 @@ -987,10 +987,10 @@ Fedora Extras|perl-Mail-Sender|Module for sending mails with attachments through an SMTP server|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-MailTools|MailTools module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-MailTools|MailTools module for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Math-GMP|High speed arbitrary size integer math|paul at city-fan.org|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|ville.skytta at iki.fi|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|extras-orphan 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 @@ -1001,7 +1001,7 @@ 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-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-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-Netmask|Perl module for manipulation and lookup of IP network blocks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Patricia|Patricia Trie perl module for fast IP address lookups|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1095,14 +1095,14 @@ 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-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-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.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|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| @@ -1435,8 +1435,8 @@ 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|uqm-content|Base content files for The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|uqm|The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi +Fedora Extras|uqm|The Ur-Quan Masters|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi 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 Sun Mar 26 10:45:57 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 26 Mar 2006 05:45:57 -0500 Subject: kadischi/doc kadischi.1,NONE,1.1 kadischi.conf.5,NONE,1.1 Message-ID: <200603261045.k2QAjvN4025449@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25415/kadischi/doc Added Files: kadischi.1 kadischi.conf.5 Log Message: Updates to bootsplash/ and addition of manual pages kadischi(1) and kadischi.conf(5) --- NEW FILE kadischi.1 --- .\" PROCESS THIS FILE WITH .\" groff -man -Tascii kadischi.1 .\" .TH KADISCHI 1 "MARCH 2006" "Fedora Core Linux" "User Manuals" .SH NAME kadischi - generate a live ISO9660 CDROM image from an RPM repository .SH SYNOPSIS kadischi [--text|--graphical] [--kickstart=] [-C|--cmdline] REPOSITORY [-f] IMAGE .SH DESCRIPTION .B kadischi(1) generates a live ISO9660 CDROM image from an RPM repository tree by invoking anaconda passing it the correct options and installing to the build directory specified. Kadischi will invoke .BR mkzftree(1) and .BR mkisofs(1) to produce an image that can be written to a CD or DVD ROM. .SH OPTIONS .IP --text Run in a textual mode that does not require X. .IP --graphical Run in graphical mode. .IP --kickstart Read from using the installation options provided in the file for the produced ISO9660 image. This option can be used with -C to automate builds. .IP -C Run strictly in command line mode requiring no user input. .IP --cmdline Same as -C .IP -f Overwrite an existing ISO9660 image, if it already exists. .SH FILES .I /etc/kadischi/build.conf .RS The system wide configuration file. See .BR kadischi(5) for more information. .RE .I /etc/kadischi/buildstamp .RS The build-stamp file. Used for stamping a CD. See .BR kadischi(5) for more information. .SH BUGS The module shvarFile is not always imported properly or is not imported sometimes at all, resulting in the build directory needing to be manually cleaned up. .SH AVAILABILITY Kadischi is available via anonymous CVS: .nf export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/devel cvs login cvs -z3 co kadischi .fi .SH AUTHOR .RS Darko Ilic .RS Jasper Hartline .RS Chitlesh Goorah .SH "SEE ALSO" .BR mkzftree(1), .BR mkisofs(1), .BR busybox(1), .BR anaconda(1) --- NEW FILE kadischi.conf.5 --- .\" PROCESS THIS FILE WITH .\" groff -man -Tascii kadischi.conf.5 .\" .TH KADISCHI.CONF 5 "MARCH 2006" "Fedora Core Linux" "File Formats" .SH NAME .B kadischi.conf(5) Configuration file for Kadischi live CD/DVD generator .SH SYNOPSIS .B kadischi.conf(5) is the configuration file for .B kadischi(1) live CD/DVD generation utility. It's syntax is much simpler than many configuration files and has few options currently but may be expanded at any time. .SH FILE FORMAT .B kadischi.conf(5) utilizes configuration options in the form of .IP OPTION=VALUE .SH PARAMETERS .IP BUILDDIR Specifies where .B kadischi(1) will place any of it's build directories. Pretty self explanatory and a common location is /tmp. .IP BUILDNUM This value is incremented after every build with .B kadischi(1). The BUILDNUM will reflect the current build instance in progress, or a previous build. .IP INSTALLDIR This option reflects where .B kadischi(1) is installed on the local system and is set at installation time. .SH AUTHOR .RS Jasper Hartline .RS .SH SEE ALSO .BR kadischi(1) From fedora-extras-commits at redhat.com Sun Mar 26 10:45:52 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 26 Mar 2006 05:45:52 -0500 Subject: kadischi/bootsplash boot.msg, 1.1, 1.2 general.msg, 1.1, 1.2 license.msg, 1.1, 1.2 options.msg, 1.1, 1.2 xen.msg, 1.1, 1.2 xenboot.msg, 1.1, 1.2 Message-ID: <200603261046.k2QAkMsR025462@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/bootsplash In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25415/kadischi/bootsplash Modified Files: boot.msg general.msg license.msg options.msg xen.msg xenboot.msg Log Message: Updates to bootsplash/ and addition of manual pages kadischi(1) and kadischi.conf(5) Index: boot.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/boot.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- boot.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ boot.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,8 +1,10 @@ splash.lss Welcome to the Fedora Core Live CD built with Kadischi. +This Live CD is NOT an official release from the Fedora Project. +It is meant for TESTING PURPOSES ONLY. - - To start the live cd press the 0107 key. + - To start the live cd press the 01[ENTER]07 key. - Use the function keys listed below for more information. 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 Index: general.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/general.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- general.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ general.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,15 +1,16 @@ 00 - 01What is Fedora07 + + 01What is Fedora07 Fedora is a set of projects sponsored by Red Hat and guided -by the Fedora Foundation. These projects are developed by a -large community of people who strive to provide and maintain -the very best in free, open source software and standards. -Fedora Core, the central Fedora project, is an operating -system and platform based on Linux, that is always free for +by the Fedora Foundation. These projects are developed by a large +community of people who strive to provide and maintain the very best +in free, open source software and standards. +Fedora Core, the central Fedora project, is an operating system +and platform based on Linux, that is always free for anyone to use, modify, and distribute, now and forever. 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 -For the default live system, press 0107. +For the default live system, press 01[ENTER]07. Index: license.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/license.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- license.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ license.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,17 +1,20 @@ 00 - 01Legal Notice07 + 01End User License Agreement07 +This agreement governs the download, installation or use of the Software +(as defined below) and any updates to the Software, regardless of the +delivery mechanism. The Software is a collective work under U.S. +Copyright Law. Subject to the following terms, Fedora Project grants to +the user ("User") a license to this collective work pursuant to the GNU +General Public License. By downloading, installing or using the Software, +User agrees to the terms of this agreement. -Copyright (c) 2006 by Fedora Foundation and others. This material -may be distributed only subject to the terms and conditions set -forth in the Open Publication License, v1.0, available at -http://www.opencontent.org/openpub/. +FEDORA, FEDORA PROJECT, and the Fedora Logo are trademarks of Red Hat, +Inc., are registered or pending registration in the U.S. and other +countries, and are used here under license to the Fedora Foundation. -FEDORA, FEDORA PROJECT, and the Fedora Logo are trademarks of -RedHat, Inc., are registered or pending registration in the U.S. -and other countries, and are used here under license to the -Fedora Foundation. +Copyright (c) 2006 by Fedora Foundation and others. +see http://fedoraproject.org/wiki/Kadischi/Legal 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 - -For the default live system, press 0107. +For the default live system, press 01[Enter]07. Index: options.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/options.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- options.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ options.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,9 +1,11 @@ 00 - 01Live CD built with Kadischi07 + + 01Live CD built with Kadischi07 + Kadischi is an application for Fedora-based Live CD generation. -It takes input from a Fedora RPM repository as an input and outputs a Live CD -ISO image. +It takes input from a Fedora RPM repository and outputs a live ISO9660 +CD ROM image. For advanced options, Type: @@ -12,4 +14,4 @@ 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 -For the default live system, press 0107. +For the default live system, press 01[ENTER]07. Index: xen.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/xen.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ xen.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,6 +1,7 @@ 00 - 01Xen Support in Kadischi07 + + 01Xen Support in Kadischi07 Xen is an open source virtualization for the Linux kernel. Virtualization allows multiple instances of an operating system to run @@ -13,4 +14,4 @@ 0f[F1-Main] [F2-Options] [F3-General] [F4-License] [F5-Xen]07 -For the default live system, press 0107. +For the default live system, press 01[ENTER]07. Index: xenboot.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/xenboot.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xenboot.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ xenboot.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,8 +1,10 @@ splash.lss 01Welcome to the Fedora Core Live CD built with Kadischi07. +This Live CD is NOT an official release from the Fedora Project. +It is meant for TESTING PURPOSES ONLY. - - To start the live cd press the 0107 key. + - To start the live cd press the 01[ENTER]07 key. - Use the function keys listed below for more information. 0f[F1-Main] [F2-Options] [F3-General] [F4-License] [F5-Xen]07 From fedora-extras-commits at redhat.com Sun Mar 26 10:58:23 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 05:58:23 -0500 Subject: rpms/tkcvs/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tkcvs.spec, 1.16, 1.17 Message-ID: <200603261058.k2QAwtKn025559@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25504/FC-4 Modified Files: .cvsignore sources tkcvs.spec Log Message: new version 8.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 31 Jan 2006 14:26:49 -0000 1.8 +++ .cvsignore 26 Mar 2006 10:58:23 -0000 1.9 @@ -1 +1 @@ -tkcvs_8_0_2.tar.gz +tkcvs_8_0_3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 31 Jan 2006 14:26:49 -0000 1.8 +++ sources 26 Mar 2006 10:58:23 -0000 1.9 @@ -1 +1 @@ -aaeaa34a9e1d309baee9fcf7cbba9799 tkcvs_8_0_2.tar.gz +f02a40b84ac7c8de7f24acbcac066207 tkcvs_8_0_3.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tkcvs.spec 31 Jan 2006 14:34:13 -0000 1.16 +++ tkcvs.spec 26 Mar 2006 10:58:23 -0000 1.17 @@ -1,5 +1,5 @@ Name: tkcvs -Version: 8.0.2 +Version: 8.0.3 Release: 1%{?dist} Summary: TkCVS and TkDiff @@ -7,9 +7,11 @@ Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz +Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tk, tcl, cvs +Requires: tk +Requires: tcl +Requires: cvs BuildArch: noarch %description @@ -33,7 +35,7 @@ %prep -%setup -q -n tkcvs_8_0_2 +%setup -q -n tkcvs_8_0_3 %build @@ -68,6 +70,9 @@ %changelog +* Sun Mar 26 2006 Gerard Milmeister - 8.0.3-1 +- new version 8.0.3 + * Tue Jan 31 2006 Gerard Milmeister - 8.0.2-1 - new version 8.0.2 From fedora-extras-commits at redhat.com Sun Mar 26 10:58:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 05:58:29 -0500 Subject: rpms/tkcvs/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tkcvs.spec, 1.17, 1.18 Message-ID: <200603261059.k2QAx1Jj025564@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25504/FC-5 Modified Files: .cvsignore sources tkcvs.spec Log Message: new version 8.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 31 Jan 2006 14:27:00 -0000 1.8 +++ .cvsignore 26 Mar 2006 10:58:28 -0000 1.9 @@ -1 +1 @@ -tkcvs_8_0_2.tar.gz +tkcvs_8_0_3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 31 Jan 2006 14:27:00 -0000 1.8 +++ sources 26 Mar 2006 10:58:28 -0000 1.9 @@ -1 +1 @@ -aaeaa34a9e1d309baee9fcf7cbba9799 tkcvs_8_0_2.tar.gz +f02a40b84ac7c8de7f24acbcac066207 tkcvs_8_0_3.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-5/tkcvs.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- tkcvs.spec 17 Feb 2006 21:42:05 -0000 1.17 +++ tkcvs.spec 26 Mar 2006 10:58:28 -0000 1.18 @@ -1,15 +1,17 @@ Name: tkcvs -Version: 8.0.2 -Release: 2%{?dist} +Version: 8.0.3 +Release: 1%{?dist} Summary: TkCVS and TkDiff Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz +Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tk, tcl, cvs +Requires: tk +Requires: tcl +Requires: cvs BuildArch: noarch %description @@ -33,7 +35,7 @@ %prep -%setup -q -n tkcvs_8_0_2 +%setup -q -n tkcvs_8_0_3 %build @@ -68,6 +70,9 @@ %changelog +* Sun Mar 26 2006 Gerard Milmeister - 8.0.3-1 +- new version 8.0.3 + * Fri Feb 17 2006 Gerard Milmeister - 8.0.2-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sun Mar 26 10:58:34 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 05:58:34 -0500 Subject: rpms/tkcvs/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tkcvs.spec, 1.17, 1.18 Message-ID: <200603261059.k2QAx749025569@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25504/devel Modified Files: .cvsignore sources tkcvs.spec Log Message: new version 8.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 31 Jan 2006 14:27:00 -0000 1.8 +++ .cvsignore 26 Mar 2006 10:58:34 -0000 1.9 @@ -1 +1 @@ -tkcvs_8_0_2.tar.gz +tkcvs_8_0_3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 31 Jan 2006 14:27:00 -0000 1.8 +++ sources 26 Mar 2006 10:58:34 -0000 1.9 @@ -1 +1 @@ -aaeaa34a9e1d309baee9fcf7cbba9799 tkcvs_8_0_2.tar.gz +f02a40b84ac7c8de7f24acbcac066207 tkcvs_8_0_3.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- tkcvs.spec 17 Feb 2006 21:42:05 -0000 1.17 +++ tkcvs.spec 26 Mar 2006 10:58:34 -0000 1.18 @@ -1,15 +1,17 @@ Name: tkcvs -Version: 8.0.2 -Release: 2%{?dist} +Version: 8.0.3 +Release: 1%{?dist} Summary: TkCVS and TkDiff Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz +Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tk, tcl, cvs +Requires: tk +Requires: tcl +Requires: cvs BuildArch: noarch %description @@ -33,7 +35,7 @@ %prep -%setup -q -n tkcvs_8_0_2 +%setup -q -n tkcvs_8_0_3 %build @@ -68,6 +70,9 @@ %changelog +* Sun Mar 26 2006 Gerard Milmeister - 8.0.3-1 +- new version 8.0.3 + * Fri Feb 17 2006 Gerard Milmeister - 8.0.2-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sun Mar 26 11:30:49 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 06:30:49 -0500 Subject: rpms/bigloo/FC-4 .cvsignore, 1.5, 1.6 bigloo.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200603261131.k2QBVOTS027771@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27716/FC-4 Modified Files: .cvsignore bigloo.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Mar 2006 15:39:54 -0000 1.5 +++ .cvsignore 26 Mar 2006 11:30:49 -0000 1.6 @@ -1 +1 @@ -bigloo2.8a-alpha21Mar06.tar.gz +bigloo2.8a-alpha22Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/bigloo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bigloo.spec 21 Mar 2006 15:39:54 -0000 1.6 +++ bigloo.spec 26 Mar 2006 11:30:49 -0000 1.7 @@ -2,13 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060321%{?dist} +Release: 1.20060322%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha22Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -200,8 +200,8 @@ %changelog -* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 -- new version 2.8a-20060321 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060322 +- new version 2.8a-20060322 * Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 21 Mar 2006 15:39:54 -0000 1.5 +++ sources 26 Mar 2006 11:30:49 -0000 1.6 @@ -1 +1 @@ -de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz +fdf588a8bcfc97d9b9d29eec19c80af8 bigloo2.8a-alpha22Mar06.tar.gz From fedora-extras-commits at redhat.com Sun Mar 26 11:30:59 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 06:30:59 -0500 Subject: rpms/bigloo/FC-5 .cvsignore, 1.5, 1.6 bigloo.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603261131.k2QBVWIG027776@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27716/FC-5 Modified Files: .cvsignore bigloo.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Mar 2006 15:42:14 -0000 1.5 +++ .cvsignore 26 Mar 2006 11:30:59 -0000 1.6 @@ -1 +1 @@ -bigloo2.8a-alpha21Mar06.tar.gz +bigloo2.8a-alpha22Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/bigloo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bigloo.spec 21 Mar 2006 15:42:14 -0000 1.7 +++ bigloo.spec 26 Mar 2006 11:30:59 -0000 1.8 @@ -2,13 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060321%{?dist} +Release: 1.20060322%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha22Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -200,8 +200,8 @@ %changelog -* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 -- new version 2.8a-20060321 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060322 +- new version 2.8a-20060322 * Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 21 Mar 2006 15:42:14 -0000 1.5 +++ sources 26 Mar 2006 11:30:59 -0000 1.6 @@ -1 +1 @@ -de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz +fdf588a8bcfc97d9b9d29eec19c80af8 bigloo2.8a-alpha22Mar06.tar.gz From fedora-extras-commits at redhat.com Sun Mar 26 11:31:05 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 06:31:05 -0500 Subject: rpms/bigloo/devel .cvsignore, 1.5, 1.6 bigloo.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603261131.k2QBVclH027781@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27716/devel Modified Files: .cvsignore bigloo.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Mar 2006 15:42:19 -0000 1.5 +++ .cvsignore 26 Mar 2006 11:31:05 -0000 1.6 @@ -1 +1 @@ -bigloo2.8a-alpha21Mar06.tar.gz +bigloo2.8a-alpha22Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/bigloo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bigloo.spec 21 Mar 2006 15:42:19 -0000 1.7 +++ bigloo.spec 26 Mar 2006 11:31:05 -0000 1.8 @@ -2,13 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060321%{?dist} +Release: 1.20060322%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha22Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -200,8 +200,8 @@ %changelog -* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 -- new version 2.8a-20060321 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060322 +- new version 2.8a-20060322 * Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 21 Mar 2006 15:42:19 -0000 1.5 +++ sources 26 Mar 2006 11:31:05 -0000 1.6 @@ -1 +1 @@ -de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz +fdf588a8bcfc97d9b9d29eec19c80af8 bigloo2.8a-alpha22Mar06.tar.gz From fedora-extras-commits at redhat.com Sun Mar 26 14:21:53 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 26 Mar 2006 09:21:53 -0500 Subject: rpms/gnome-blog/devel gnome-blog.spec,1.12,1.13 Message-ID: <200603261422.k2QEMPvo001748@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnome-blog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1722 Modified Files: gnome-blog.spec Log Message: * Sun Mar 26 2006 Brian Pepple - 0.8-13 - Rebuild. Index: gnome-blog.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnome-blog.spec 13 Feb 2006 17:45:26 -0000 1.12 +++ gnome-blog.spec 26 Mar 2006 14:21:51 -0000 1.13 @@ -4,7 +4,7 @@ Name: gnome-blog Version: 0.8 -Release: 12%{?dist} +Release: 13%{?dist} Summary: GNOME panel object for posting blog entries Group: Applications/Internet @@ -94,6 +94,9 @@ %ghost %{python_sitelib}/gnomeblog/*.pyo %changelog +* Sun Mar 26 2006 Brian Pepple - 0.8-13 +- Rebuild. + * Mon Feb 13 2006 Brian Pepple - 0.8-12 - rebuilt for new gcc4.1 snapshot and glibc changes From fedora-extras-commits at redhat.com Sun Mar 26 15:41:03 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 26 Mar 2006 10:41:03 -0500 Subject: rpms/gnome-blog/FC-5 gnome-blog.spec,1.12,1.13 Message-ID: <200603261541.k2QFfaX2003911@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnome-blog/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3894 Modified Files: gnome-blog.spec Log Message: * Sun Mar 26 2006 Brian Pepple - 0.8-13 - Rebuild. Index: gnome-blog.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-blog/FC-5/gnome-blog.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnome-blog.spec 13 Feb 2006 17:45:26 -0000 1.12 +++ gnome-blog.spec 26 Mar 2006 15:41:03 -0000 1.13 @@ -4,7 +4,7 @@ Name: gnome-blog Version: 0.8 -Release: 12%{?dist} +Release: 13%{?dist} Summary: GNOME panel object for posting blog entries Group: Applications/Internet @@ -94,6 +94,9 @@ %ghost %{python_sitelib}/gnomeblog/*.pyo %changelog +* Sun Mar 26 2006 Brian Pepple - 0.8-13 +- Rebuild. + * Mon Feb 13 2006 Brian Pepple - 0.8-12 - rebuilt for new gcc4.1 snapshot and glibc changes From fedora-extras-commits at redhat.com Sun Mar 26 16:36:12 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:36:12 -0500 Subject: rpms/libtasn1/FC-4 sources,1.4,1.5 Message-ID: <200603261636.k2QGajjD006078@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6029/FC-4 Modified Files: sources Log Message: updated to 0.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Mar 2006 18:20:51 -0000 1.4 +++ sources 26 Mar 2006 16:36:12 -0000 1.5 @@ -1,2 +1,2 @@ -f56641ed0e1ee4d1903ba25ab046ed45 libtasn1-0.3.1.tar.gz -8097b205dd0fb3b351f8fd707dee903e libtasn1-0.3.1.tar.gz.sig +0de8869c2ac94ec3f04d237d50aeda9e libtasn1-0.3.2.tar.gz +96f8762f63bcc95174274270f01e3c0d libtasn1-0.3.2.tar.gz.sig From fedora-extras-commits at redhat.com Sun Mar 26 16:36:25 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:36:25 -0500 Subject: rpms/libtasn1/devel sources,1.4,1.5 Message-ID: <200603261636.k2QGavPH006084@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6029/devel Modified Files: sources Log Message: updated to 0.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Mar 2006 18:20:57 -0000 1.4 +++ sources 26 Mar 2006 16:36:24 -0000 1.5 @@ -1,2 +1,2 @@ -f56641ed0e1ee4d1903ba25ab046ed45 libtasn1-0.3.1.tar.gz -8097b205dd0fb3b351f8fd707dee903e libtasn1-0.3.1.tar.gz.sig +0de8869c2ac94ec3f04d237d50aeda9e libtasn1-0.3.2.tar.gz +96f8762f63bcc95174274270f01e3c0d libtasn1-0.3.2.tar.gz.sig From fedora-extras-commits at redhat.com Sun Mar 26 16:36:19 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:36:19 -0500 Subject: rpms/libtasn1/FC-5 sources,1.4,1.5 Message-ID: <200603261636.k2QGapeq006081@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6029/FC-5 Modified Files: sources Log Message: updated to 0.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Mar 2006 18:20:57 -0000 1.4 +++ sources 26 Mar 2006 16:36:18 -0000 1.5 @@ -1,2 +1,2 @@ -f56641ed0e1ee4d1903ba25ab046ed45 libtasn1-0.3.1.tar.gz -8097b205dd0fb3b351f8fd707dee903e libtasn1-0.3.1.tar.gz.sig +0de8869c2ac94ec3f04d237d50aeda9e libtasn1-0.3.2.tar.gz +96f8762f63bcc95174274270f01e3c0d libtasn1-0.3.2.tar.gz.sig From fedora-extras-commits at redhat.com Sun Mar 26 16:38:28 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:38:28 -0500 Subject: rpms/libtasn1/FC-5 libtasn1.spec,1.11,1.12 Message-ID: <200603261639.k2QGd0de006148@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6101/FC-5 Modified Files: libtasn1.spec Log Message: updated to 0.3.2 added -tool subpackage Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-5/libtasn1.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libtasn1.spec 8 Mar 2006 18:20:57 -0000 1.11 +++ libtasn1.spec 26 Mar 2006 16:38:28 -0000 1.12 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.1 +Version: 0.3.2 Release: %release_func 1 License: LGPL @@ -26,6 +26,12 @@ Requires(postun): /sbin/install-info +%package tools +Summary: Some ASN.1 tools +Group: Applications/Text +Requires: %name = %version-%release + + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org @@ -34,8 +40,15 @@ This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org -This packages contains files for development of applications which -will use libtasn1. +This package contains files for development of applications which will +use libtasn1. + + +%description tools +This is the ASN.1 library used in GNUTLS. More up to date information can +be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org + +This package contains tools using the libtasn library. %prep @@ -80,6 +93,10 @@ %doc AUTHORS COPYING* ChangeLog NEWS README THANKS %_libdir/*.so.* +%files tools +%defattr(-,root,root,-) +%_bindir/asn1* +%_mandir/man1/asn1* %files devel %defattr(-,root,root,-) @@ -93,6 +110,10 @@ %changelog +* Sun Mar 26 2006 Enrico Scholz - 0.3.2-1 +- updated to 0.3.2 +- added -tools subpackage + * Wed Mar 8 2006 Enrico Scholz - 0.3.1-1 - updated to 0.3.1 From fedora-extras-commits at redhat.com Sun Mar 26 16:38:34 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:38:34 -0500 Subject: rpms/libtasn1/devel libtasn1.spec,1.11,1.12 Message-ID: <200603261639.k2QGd6vq006151@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6101/devel Modified Files: libtasn1.spec Log Message: updated to 0.3.2 added -tool subpackage Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libtasn1.spec 8 Mar 2006 18:20:57 -0000 1.11 +++ libtasn1.spec 26 Mar 2006 16:38:34 -0000 1.12 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.1 +Version: 0.3.2 Release: %release_func 1 License: LGPL @@ -26,6 +26,12 @@ Requires(postun): /sbin/install-info +%package tools +Summary: Some ASN.1 tools +Group: Applications/Text +Requires: %name = %version-%release + + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org @@ -34,8 +40,15 @@ This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org -This packages contains files for development of applications which -will use libtasn1. +This package contains files for development of applications which will +use libtasn1. + + +%description tools +This is the ASN.1 library used in GNUTLS. More up to date information can +be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org + +This package contains tools using the libtasn library. %prep @@ -80,6 +93,10 @@ %doc AUTHORS COPYING* ChangeLog NEWS README THANKS %_libdir/*.so.* +%files tools +%defattr(-,root,root,-) +%_bindir/asn1* +%_mandir/man1/asn1* %files devel %defattr(-,root,root,-) @@ -93,6 +110,10 @@ %changelog +* Sun Mar 26 2006 Enrico Scholz - 0.3.2-1 +- updated to 0.3.2 +- added -tools subpackage + * Wed Mar 8 2006 Enrico Scholz - 0.3.1-1 - updated to 0.3.1 From fedora-extras-commits at redhat.com Sun Mar 26 16:38:22 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:38:22 -0500 Subject: rpms/libtasn1/FC-4 libtasn1.spec,1.12,1.13 Message-ID: <200603261639.k2QGdOES006154@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6101/FC-4 Modified Files: libtasn1.spec Log Message: updated to 0.3.2 added -tool subpackage Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/libtasn1.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libtasn1.spec 8 Mar 2006 18:20:51 -0000 1.12 +++ libtasn1.spec 26 Mar 2006 16:38:22 -0000 1.13 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.1 +Version: 0.3.2 Release: %release_func 1 License: LGPL @@ -26,6 +26,12 @@ Requires(postun): /sbin/install-info +%package tools +Summary: Some ASN.1 tools +Group: Applications/Text +Requires: %name = %version-%release + + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org @@ -34,8 +40,15 @@ This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org -This packages contains files for development of applications which -will use libtasn1. +This package contains files for development of applications which will +use libtasn1. + + +%description tools +This is the ASN.1 library used in GNUTLS. More up to date information can +be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org + +This package contains tools using the libtasn library. %prep @@ -80,6 +93,10 @@ %doc AUTHORS COPYING* ChangeLog NEWS README THANKS %_libdir/*.so.* +%files tools +%defattr(-,root,root,-) +%_bindir/asn1* +%_mandir/man1/asn1* %files devel %defattr(-,root,root,-) @@ -93,6 +110,10 @@ %changelog +* Sun Mar 26 2006 Enrico Scholz - 0.3.2-1 +- updated to 0.3.2 +- added -tools subpackage + * Wed Mar 8 2006 Enrico Scholz - 0.3.1-1 - updated to 0.3.1 From fedora-extras-commits at redhat.com Sun Mar 26 18:53:04 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 26 Mar 2006 13:53:04 -0500 Subject: extras-buildsys/common HTTPServer.py,1.9,1.10 Message-ID: <200603261853.k2QIr4NX010777@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10743/common Modified Files: HTTPServer.py Log Message: 2006-03-26 Dan Williams * common/HTTPServer.py - Add ability to process HTTP POST requests, mostly for file uploads Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- HTTPServer.py 12 Mar 2006 05:44:24 -0000 1.9 +++ HTTPServer.py 26 Mar 2006 18:52:56 -0000 1.10 @@ -27,6 +27,7 @@ import socket from OpenSSL import SSL import DebugUtils +import cgi class PlgHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): @@ -43,6 +44,21 @@ except socket.timeout: pass + def do_POST(self): + handler = self._server.get_POST_handler(self.path) + if not handler: + self.send_error(404) + return + + environ = {} + environ['REQUEST_METHOD'] = "POST" + fs = cgi.FieldStorage(fp=self.rfile, headers=self.headers, environ=environ) + try: + handler(self, fs) + except Exception, e: + self.send_error(500, "Error processing POST request: %s" % e) + del fs, environ + def list_directory(self, path): self.send_error(404, "No permission to list directory") @@ -85,19 +101,36 @@ pass -class PlgHTTPSServer(SSLCommon.PlgBaseSSLServer): +class PlgHTTPPOSTHandler(object): + def __init__(self): + self._POST_handlers = {} + + def set_POST_handler(self, location, handler): + if handler: + self._POST_handlers[location] = handler + else: + del self._POST_handlers[location] + + def get_POST_handler(self, location): + if self._POST_handlers.has_key(location): + return self._POST_handlers[location] + return None + +class PlgHTTPSServer(SSLCommon.PlgBaseSSLServer, PlgHTTPPOSTHandler): def __init__(self, server_address, http_dir, certs): self.http_dir = http_dir + PlgHTTPPOSTHandler.__init__(self) SSLCommon.PlgBaseSSLServer.__init__(self, server_address, PlgHTTPRequestHandler, certs) -class PlgHTTPServer(SSLCommon.PlgBaseServer): +class PlgHTTPServer(SSLCommon.PlgBaseServer, PlgHTTPPOSTHandler): def __init__(self, server_address, http_dir): self.http_dir = http_dir + PlgHTTPPOSTHandler.__init__(self) SSLCommon.PlgBaseServer.__init__(self, server_address, PlgHTTPRequestHandler) class PlgHTTPServerManager(threading.Thread): - def __init__(self, addr, http_dir, certs): + def __init__(self, addr, http_dir, certs=None): if certs and len(certs) > 0: self._server = PlgHTTPSServer(addr, http_dir, certs) else: @@ -106,6 +139,12 @@ threading.Thread.__init__(self) self.setName("PlgHTTPServerManager: %s/%s" % (addr, http_dir)) + def set_POST_handler(self, location, handler): + self._server.set_POST_handler(location, handler) + + def get_POST_handler(self, location): + return self._server.get_POST_handler(location) + def run(self): DebugUtils.registerThreadName(self) self._server.serve_forever() @@ -123,6 +162,48 @@ # Testing stuff ########################################################### +""" Use this HTML: + +
+File to process: + + + +
+ +""" + +def upload_callback(request_handler, fs): + # Search for filename + fslist = [fs] + if not fs.name and not fs.filename and fs.value: + fslist = fs.value + jobid = arch = filename = tmpfile = None + for item in fslist: + if item.name == 'jobid': + try: + jobid = int(item.value) + except ValueError: + pass + elif item.name == 'arch': + arch = item.value + elif item.name == 'filedata': + filename = item.filename + tmpfile = item.file + + if jobid and arch and filename and tmpfile: + import shutil + dest = file("/tmp/%s" % filename, "w+b") + print dest, tmpfile + shutil.copyfileobj(tmpfile, dest) + dest.close() + request_handler.send_response(200, "Success") + request_handler.send_header("Content-type", "text/html") + request_handler.end_headers() + request_handler.wfile.write("Success!") + else: + request_handler.send_error(400, "Invalid request for %s" % request_handler.path) + if __name__ == '__main__': if len(sys.argv) < 4: print "Usage: python HTTPServer.py key_and_cert ca_cert peer_ca_cert" @@ -154,6 +235,7 @@ print "Starting the server." server = PlgHTTPServerManager(('localhost', 8886), srcdir, certs) + server.set_POST_handler('/upload', upload_callback) server.start() while True: From fedora-extras-commits at redhat.com Sun Mar 26 18:52:58 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 26 Mar 2006 13:52:58 -0500 Subject: extras-buildsys ChangeLog,1.180,1.181 Message-ID: <200603261853.k2QIrSnW010780@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10743 Modified Files: ChangeLog Log Message: 2006-03-26 Dan Williams * common/HTTPServer.py - Add ability to process HTTP POST requests, mostly for file uploads Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- ChangeLog 24 Mar 2006 19:13:40 -0000 1.180 +++ ChangeLog 26 Mar 2006 18:52:50 -0000 1.181 @@ -1,3 +1,9 @@ +2006-03-26 Dan Williams + + * common/HTTPServer.py + - Add ability to process HTTP POST requests, mostly for + file uploads + 2006-03-24 Dan Williams * server/DBManager.py From fedora-extras-commits at redhat.com Sun Mar 26 21:49:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 16:49:33 -0500 Subject: rpms/audacity/FC-5 audacity-1.3.0b-gcc41.patch, NONE, 1.1 audacity-1.3.0b-install.patch, NONE, 1.1 audacity-1.3.0b-lsrver.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 audacity.spec, 1.13, 1.14 sources, 1.5, 1.6 Message-ID: <200603262150.k2QLo5LD017438@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17363 Modified Files: .cvsignore audacity.spec sources Added Files: audacity-1.3.0b-gcc41.patch audacity-1.3.0b-install.patch audacity-1.3.0b-lsrver.patch Log Message: new version 1.3.0beta audacity-1.3.0b-gcc41.patch: --- NEW FILE audacity-1.3.0b-gcc41.patch --- --- audacity-src-1.3.0b-beta/lib-src/soundtouch/include/SoundTouch.h.gcc41 2006-03-26 22:23:42.000000000 +0200 +++ audacity-src-1.3.0b-beta/lib-src/soundtouch/include/SoundTouch.h 2006-03-26 22:24:01.000000000 +0200 @@ -146,7 +146,7 @@ static const char *getVersionString(); /// Get SoundTouch library version Id - static uint SoundTouch::getVersionId(); + static uint getVersionId(); /// Sets new rate control value. Normal rate = 1.0, smaller values /// represent slower rate, larger faster rates. audacity-1.3.0b-install.patch: --- NEW FILE audacity-1.3.0b-install.patch --- --- audacity-src-1.3.0b-beta/locale/Makefile.in.install 2006-03-26 23:03:18.000000000 +0200 +++ audacity-src-1.3.0b-beta/locale/Makefile.in 2006-03-26 23:03:34.000000000 +0200 @@ -17,7 +17,7 @@ INSTALL=@INSTALL@ AUDACITY_NAME=@AUDACITY_NAME@ ifdef DESTDIR - INSTALL_PATH=$(top_srcdir)/$(DESTDIR) + INSTALL_PATH=$(DESTDIR) else INSTALL_PATH= endif audacity-1.3.0b-lsrver.patch: --- NEW FILE audacity-1.3.0b-lsrver.patch --- --- audacity-src-1.3.0b-beta/configure.lsrver 2006-03-26 23:00:25.000000000 +0200 +++ audacity-src-1.3.0b-beta/configure 2006-03-26 23:01:10.000000000 +0200 @@ -5103,23 +5103,23 @@ else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for samplerate >= 0.15.0" >&5 -echo $ECHO_N "checking for samplerate >= 0.15.0... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for samplerate >= 0.1.2" >&5 +echo $ECHO_N "checking for samplerate >= 0.1.2... $ECHO_C" >&6 - if $PKG_CONFIG --exists "samplerate >= 0.15.0" ; then + if $PKG_CONFIG --exists "samplerate >= 0.1.2" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes echo "$as_me:$LINENO: checking SAMPLERATE_CFLAGS" >&5 echo $ECHO_N "checking SAMPLERATE_CFLAGS... $ECHO_C" >&6 - SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.15.0"` + SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.1.2"` echo "$as_me:$LINENO: result: $SAMPLERATE_CFLAGS" >&5 echo "${ECHO_T}$SAMPLERATE_CFLAGS" >&6 echo "$as_me:$LINENO: checking SAMPLERATE_LIBS" >&5 echo $ECHO_N "checking SAMPLERATE_LIBS... $ECHO_C" >&6 - SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.15.0"` + SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.1.2"` echo "$as_me:$LINENO: result: $SAMPLERATE_LIBS" >&5 echo "${ECHO_T}$SAMPLERATE_LIBS" >&6 else @@ -5127,7 +5127,7 @@ SAMPLERATE_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.15.0"` + SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.1.2"` fi Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Mar 2006 23:23:18 -0000 1.3 +++ .cvsignore 26 Mar 2006 21:49:32 -0000 1.4 @@ -1 +1 @@ -audacity-src-1.2.4b.tar.gz +audacity-src-1.3.0b.tar.gz Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- audacity.spec 17 Mar 2006 23:23:18 -0000 1.13 +++ audacity.spec 26 Mar 2006 21:49:32 -0000 1.14 @@ -1,35 +1,44 @@ Name: audacity -Version: 1.2.4 -Release: 0.1.b%{?dist} +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.2.4b.tar.gz +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 +#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 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 +BuildRequires: wxGTK-devel >= 2.6.2 %{?_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 -Requires(postun): desktop-file-utils +#%{?_with_gtk2: BuildRequires: pango-devel} +Requires(post): desktop-file-utils, shared-mime-info +Requires(postun): desktop-file-utils, shared-mime-info # 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 @@ -38,29 +47,47 @@ 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 -%patch1 -p1 -b .aboutdialog -%patch2 -p1 -b .gcc4 -%{?_with_gtk2: %patch3 -p1 -b .missing-pango } +%setup -q -n %{name}-src-%{version}b-beta +#%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 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-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} +#%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 + %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install @@ -78,7 +105,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=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 StartupWMClass=Audacity EOF @@ -95,12 +122,17 @@ %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}/* @@ -108,9 +140,14 @@ %{_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 Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b - Update to 1.2.4b (stable release). - Follow upstream recommendation and use the GTK+ 1.x wxGTK. @@ -163,4 +200,3 @@ * Sat Oct 25 2003 Gerard Milmeister - 0:1.2.0-pre2.fdr.1 - First Fedora release - Index: sources =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 17 Mar 2006 23:23:18 -0000 1.5 +++ sources 26 Mar 2006 21:49:32 -0000 1.6 @@ -1 +1 @@ -37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz +d1c5a3359ad95eab6ca8b375972c1a91 audacity-src-1.3.0b.tar.gz From fedora-extras-commits at redhat.com Mon Mar 27 00:13:53 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sun, 26 Mar 2006 19:13:53 -0500 Subject: rpms/barcode/devel barcode.spec,1.6,1.7 Message-ID: <200603270014.k2R0ESOH023735@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23705 Modified Files: barcode.spec Log Message: * Mon Mar 27 2006 Andreas Thienemann 0.9.8-9 - Changed texinfo dependency to texinfo-tex to satisfy #186825 Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- barcode.spec 5 Feb 2006 15:31:21 -0000 1.6 +++ barcode.spec 27 Mar 2006 00:13:51 -0000 1.7 @@ -1,7 +1,7 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(preun): /sbin/install-info Requires(post): /sbin/install-info -BuildRequires: tetex, tetex-dvips, texinfo, ghostscript +BuildRequires: tetex, tetex-dvips, texinfo-tex, ghostscript %description Barcode is meant to solve most needs in barcode creation with a @@ -67,6 +67,9 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Mon Mar 27 2006 Andreas Thienemann 0.9.8-9 +- Changed texinfo dependency to texinfo-tex to satisfy #186825 + * Sun Feb 05 2006 Andreas Thienemann 0.98-8 - Enabled --excludedocs install From fedora-extras-commits at redhat.com Wed Mar 29 19:25:23 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:25:23 -0700 Subject: rpms/dejavu-fonts import.log,1.41,1.42 Message-ID: <200603291925.k2TJPPnQ018500@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18465 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4.1-1.fc6 on branch devel from dejavu-fonts-2.4.1-1.fc6.src.rpm 2.4.1 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- import.log 22 Mar 2006 23:31:03 -0000 1.41 +++ import.log 29 Mar 2006 19:25:22 -0000 1.42 @@ -38,3 +38,4 @@ dejavu-fonts-2_4-1_fc6:HEAD:dejavu-fonts-2.4-1.fc6.src.rpm:1143068995 dejavu-fonts-2_4-1_fc4:FC-4:dejavu-fonts-2.4-1.fc4.src.rpm:1143069423 dejavu-fonts-2_4-1_fc5:FC-5:dejavu-fonts-2.4-1.fc5.src.rpm:1143070240 +dejavu-fonts-2_4_1-1_fc6:HEAD:dejavu-fonts-2.4.1-1.fc6.src.rpm:1143660306 From fedora-extras-commits at redhat.com Wed Mar 29 19:25:23 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:25:23 -0700 Subject: rpms/dejavu-fonts/devel .cvsignore, 1.11, 1.12 dejavu-fonts.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200603291925.k2TJPP6k018506@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18465/devel Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4.1-1.fc6 on branch devel from dejavu-fonts-2.4.1-1.fc6.src.rpm 2.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 22 Mar 2006 23:10:27 -0000 1.11 +++ .cvsignore 29 Mar 2006 19:25:23 -0000 1.12 @@ -1 +1 @@ -dejavu-sfd-2.4.tar.gz +dejavu-sfd-2.4.1.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dejavu-fonts.spec 22 Mar 2006 23:10:27 -0000 1.17 +++ dejavu-fonts.spec 29 Mar 2006 19:25:23 -0000 1.18 @@ -9,7 +9,7 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.4 +Version: 2.4.1 Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -161,6 +161,9 @@ %changelog +* Wed Mar 29 2006 Nicolas Mailhot - 2.4.1-1 +- 2.4.1 (workaround pango problems) + * Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 - 2.4 A big thanks to Stepan Roh for getting the project there - split out experimental typefaces Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 22 Mar 2006 23:10:27 -0000 1.11 +++ sources 29 Mar 2006 19:25:23 -0000 1.12 @@ -1 +1 @@ -9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz +ea7ee1cd16880a8ce5b3e70d97c41fc8 dejavu-sfd-2.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:30:47 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:30:47 -0700 Subject: rpms/dejavu-fonts import.log,1.42,1.43 Message-ID: <200603291930.k2TJUn09018664@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18631 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4.1-1.fc5 on branch FC-5 from dejavu-fonts-2.4.1-1.fc5.src.rpm 2.4.1 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- import.log 29 Mar 2006 19:25:22 -0000 1.42 +++ import.log 29 Mar 2006 19:30:47 -0000 1.43 @@ -39,3 +39,4 @@ dejavu-fonts-2_4-1_fc4:FC-4:dejavu-fonts-2.4-1.fc4.src.rpm:1143069423 dejavu-fonts-2_4-1_fc5:FC-5:dejavu-fonts-2.4-1.fc5.src.rpm:1143070240 dejavu-fonts-2_4_1-1_fc6:HEAD:dejavu-fonts-2.4.1-1.fc6.src.rpm:1143660306 +dejavu-fonts-2_4_1-1_fc5:FC-5:dejavu-fonts-2.4.1-1.fc5.src.rpm:1143660631 From fedora-extras-commits at redhat.com Wed Mar 29 19:30:48 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:30:48 -0700 Subject: rpms/dejavu-fonts/FC-5 .cvsignore, 1.11, 1.12 dejavu-fonts.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200603291930.k2TJUoQ5018670@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18631/FC-5 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4.1-1.fc5 on branch FC-5 from dejavu-fonts-2.4.1-1.fc5.src.rpm 2.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 22 Mar 2006 23:31:11 -0000 1.11 +++ .cvsignore 29 Mar 2006 19:30:48 -0000 1.12 @@ -1 +1 @@ -dejavu-sfd-2.4.tar.gz +dejavu-sfd-2.4.1.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dejavu-fonts.spec 22 Mar 2006 23:31:11 -0000 1.17 +++ dejavu-fonts.spec 29 Mar 2006 19:30:48 -0000 1.18 @@ -9,7 +9,7 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.4 +Version: 2.4.1 Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -161,6 +161,9 @@ %changelog +* Wed Mar 29 2006 Nicolas Mailhot - 2.4.1-1 +- 2.4.1 (workaround pango problems) + * Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 - 2.4 A big thanks to Stepan Roh for getting the project there - split out experimental typefaces Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 22 Mar 2006 23:31:11 -0000 1.11 +++ sources 29 Mar 2006 19:30:48 -0000 1.12 @@ -1 +1 @@ -9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz +ea7ee1cd16880a8ce5b3e70d97c41fc8 dejavu-sfd-2.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:34:05 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Wed, 29 Mar 2006 12:34:05 -0700 Subject: rpms/cogito/devel .cvsignore, 1.7, 1.8 cogito.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200603291934.k2TJY7kb018767@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18746 Modified Files: .cvsignore cogito.spec sources Log Message: Update cogito to 0.17.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Feb 2006 18:15:48 -0000 1.7 +++ .cvsignore 29 Mar 2006 19:34:04 -0000 1.8 @@ -1 +1 @@ -cogito-0.17.tar.gz +cogito-0.17.1.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cogito.spec 28 Feb 2006 18:15:48 -0000 1.9 +++ cogito.spec 29 Mar 2006 19:34:04 -0000 1.10 @@ -1,5 +1,5 @@ Name: cogito -Version: 0.17 +Version: 0.17.1 Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL @@ -44,6 +44,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Tue Mar 28 2006 Chris Wright 0.17.1-1 +- 0.17.1 + * Tue Feb 28 2006 Chris Wright 0.17-1 - 0.17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Feb 2006 18:15:48 -0000 1.7 +++ sources 29 Mar 2006 19:34:04 -0000 1.8 @@ -1 +1 @@ -549a1720f896bcf1da16b581f1e4cc33 cogito-0.17.tar.gz +2c79629440ab0b652ebfcc1d4bae0122 cogito-0.17.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:35:41 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:35:41 -0700 Subject: rpms/dejavu-fonts import.log,1.43,1.44 Message-ID: <200603291935.k2TJZhbF018906@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18868 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4.1-1.fc4 on branch FC-4 from dejavu-fonts-2.4.1-1.fc4.src.rpm 2.4.1 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- import.log 29 Mar 2006 19:30:47 -0000 1.43 +++ import.log 29 Mar 2006 19:35:41 -0000 1.44 @@ -40,3 +40,4 @@ dejavu-fonts-2_4-1_fc5:FC-5:dejavu-fonts-2.4-1.fc5.src.rpm:1143070240 dejavu-fonts-2_4_1-1_fc6:HEAD:dejavu-fonts-2.4.1-1.fc6.src.rpm:1143660306 dejavu-fonts-2_4_1-1_fc5:FC-5:dejavu-fonts-2.4.1-1.fc5.src.rpm:1143660631 +dejavu-fonts-2_4_1-1_fc4:FC-4:dejavu-fonts-2.4.1-1.fc4.src.rpm:1143660926 From fedora-extras-commits at redhat.com Wed Mar 29 19:35:42 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:35:42 -0700 Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.11, 1.12 dejavu-fonts.spec, 1.12, 1.13 sources, 1.11, 1.12 Message-ID: <200603291935.k2TJZirY018912@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18868/FC-4 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4.1-1.fc4 on branch FC-4 from dejavu-fonts-2.4.1-1.fc4.src.rpm 2.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 22 Mar 2006 23:17:37 -0000 1.11 +++ .cvsignore 29 Mar 2006 19:35:42 -0000 1.12 @@ -1 +1 @@ -dejavu-sfd-2.4.tar.gz +dejavu-sfd-2.4.1.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- dejavu-fonts.spec 22 Mar 2006 23:17:37 -0000 1.12 +++ dejavu-fonts.spec 29 Mar 2006 19:35:42 -0000 1.13 @@ -8,7 +8,7 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.4 +Version: 2.4.1 Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -127,6 +127,9 @@ %changelog +* Wed Mar 29 2006 Nicolas Mailhot - 2.4.1-1 +- 2.4.1 (workaround pango problems) + * Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 - 2.4 A big thanks to Stepan Roh for getting the project there - split out experimental typefaces Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 22 Mar 2006 23:17:37 -0000 1.11 +++ sources 29 Mar 2006 19:35:42 -0000 1.12 @@ -1 +1 @@ -9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz +ea7ee1cd16880a8ce5b3e70d97c41fc8 dejavu-sfd-2.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:35:49 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Wed, 29 Mar 2006 12:35:49 -0700 Subject: rpms/cogito/FC-5 .cvsignore, 1.7, 1.8 cogito.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200603291935.k2TJZpqP018937@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18914 Modified Files: .cvsignore cogito.spec sources Log Message: Update cogito to 0.17.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Feb 2006 18:15:48 -0000 1.7 +++ .cvsignore 29 Mar 2006 19:35:49 -0000 1.8 @@ -1 +1 @@ -cogito-0.17.tar.gz +cogito-0.17.1.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-5/cogito.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cogito.spec 28 Feb 2006 18:15:48 -0000 1.9 +++ cogito.spec 29 Mar 2006 19:35:49 -0000 1.10 @@ -1,5 +1,5 @@ Name: cogito -Version: 0.17 +Version: 0.17.1 Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL @@ -44,6 +44,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Tue Mar 28 2006 Chris Wright 0.17.1-1 +- 0.17.1 + * Tue Feb 28 2006 Chris Wright 0.17-1 - 0.17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Feb 2006 18:15:48 -0000 1.7 +++ sources 29 Mar 2006 19:35:49 -0000 1.8 @@ -1 +1 @@ -549a1720f896bcf1da16b581f1e4cc33 cogito-0.17.tar.gz +2c79629440ab0b652ebfcc1d4bae0122 cogito-0.17.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:36:46 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Wed, 29 Mar 2006 12:36:46 -0700 Subject: rpms/cogito/FC-4 .cvsignore, 1.7, 1.8 cogito.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <200603291936.k2TJamMV019046@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19025 Modified Files: .cvsignore cogito.spec sources Log Message: Update cogito to 0.17.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Feb 2006 18:20:22 -0000 1.7 +++ .cvsignore 29 Mar 2006 19:36:46 -0000 1.8 @@ -1 +1 @@ -cogito-0.17.tar.gz +cogito-0.17.1.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cogito.spec 28 Feb 2006 18:20:22 -0000 1.8 +++ cogito.spec 29 Mar 2006 19:36:46 -0000 1.9 @@ -1,5 +1,5 @@ Name: cogito -Version: 0.17 +Version: 0.17.1 Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL @@ -44,6 +44,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Tue Mar 28 2006 Chris Wright 0.17.1-1 +- 0.17.1 + * Tue Feb 28 2006 Chris Wright 0.17-1 - 0.17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Feb 2006 18:20:22 -0000 1.7 +++ sources 29 Mar 2006 19:36:46 -0000 1.8 @@ -1 +1 @@ -549a1720f896bcf1da16b581f1e4cc33 cogito-0.17.tar.gz +2c79629440ab0b652ebfcc1d4bae0122 cogito-0.17.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:37:52 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Wed, 29 Mar 2006 12:37:52 -0700 Subject: rpms/cogito/FC-3 .cvsignore, 1.7, 1.8 cogito.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <200603291937.k2TJbsOY019158@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19136 Modified Files: .cvsignore cogito.spec sources Log Message: Update cogito to 0.17.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Feb 2006 18:21:50 -0000 1.7 +++ .cvsignore 29 Mar 2006 19:37:52 -0000 1.8 @@ -1 +1 @@ -cogito-0.17.tar.gz +cogito-0.17.1.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cogito.spec 28 Feb 2006 18:21:50 -0000 1.8 +++ cogito.spec 29 Mar 2006 19:37:52 -0000 1.9 @@ -1,5 +1,5 @@ Name: cogito -Version: 0.17 +Version: 0.17.1 Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL @@ -44,6 +44,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Tue Mar 28 2006 Chris Wright 0.17.1-1 +- 0.17.1 + * Tue Feb 28 2006 Chris Wright 0.17-1 - 0.17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Feb 2006 18:21:50 -0000 1.7 +++ sources 29 Mar 2006 19:37:52 -0000 1.8 @@ -1 +1 @@ -549a1720f896bcf1da16b581f1e4cc33 cogito-0.17.tar.gz +2c79629440ab0b652ebfcc1d4bae0122 cogito-0.17.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:45:02 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 29 Mar 2006 12:45:02 -0700 Subject: rpms/njam import.log,1.1,1.2 Message-ID: <200603291945.k2TJj4LK019382@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/njam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19343 Modified Files: import.log Log Message: auto-import njam-1.25-2 on branch devel from njam-1.25-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/njam/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Mar 2006 18:20:22 -0000 1.1 +++ import.log 29 Mar 2006 19:45:01 -0000 1.2 @@ -0,0 +1 @@ +njam-1_25-2:HEAD:njam-1.25-2.src.rpm:1143661308 From fedora-extras-commits at redhat.com Wed Mar 29 19:45:02 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 29 Mar 2006 12:45:02 -0700 Subject: rpms/njam/devel njam-1.25-drop-setgid.patch, NONE, 1.1 njam-1.25-html.patch, NONE, 1.1 njam.6, NONE, 1.1 njam.desktop, NONE, 1.1 njam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603291945.k2TJj4x8019392@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/njam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19343/devel Modified Files: .cvsignore sources Added Files: njam-1.25-drop-setgid.patch njam-1.25-html.patch njam.6 njam.desktop njam.spec Log Message: auto-import njam-1.25-2 on branch devel from njam-1.25-2.src.rpm njam-1.25-drop-setgid.patch: --- NEW FILE njam-1.25-drop-setgid.patch --- diff -ur njam-1.25-src.orig/src/njam.cpp njam-1.25-src/src/njam.cpp --- njam-1.25-src.orig/src/njam.cpp 2005-12-13 12:56:43.000000000 +0100 +++ njam-1.25-src/src/njam.cpp 2006-03-26 20:29:22.000000000 +0200 @@ -32,6 +32,8 @@ -----------------------------------------------------------------------------*/ // needed for chdir #ifdef __linux__ +/* this must be done before the first include of unistd.h for setresgid */ +#define _GNU_SOURCE #include #include #endif @@ -47,12 +49,24 @@ #include "njamfont.h" #include "njammap.h" #include "njam.h" + +static FILE* highscore_fp; + //----------------------------------------------------------------------------- int main(int argc, char *argv[]) { bool Fullscreen = true; bool SWSurface = true; bool UseDGA = false; + gid_t realgid; + + highscore_fp = fopen("/var/lib/games/njam.hs", "r+"); + realgid = getgid(); + if (setresgid(-1, realgid, realgid) != 0) { + perror("Could not drop setgid privileges. Aborting."); + return 1; + } + if (argc > 1) { for (int i=1; i Njam is a full-featured cross-platform pacman-like game written in C++ using SDL library - HOME  >>
--- NEW FILE njam.6 --- .\" $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/cmd/docbook-to-man.sh,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $ .\" .\" transcript compatibility for postscript use. .\" .\" synopsis: .P! .\" .de P! .fl \!!1 setgray .fl \\&.\" .fl \!!0 setgray .fl \" force out current output buffer \!!save /psv exch def currentpoint translate 0 0 moveto \!!/showpage{}def .fl \" prolog .sy sed \-e 's/^/!/' \\$1\" bring in postscript file \!!psv restore . .de pF .ie \\*(f1 .ds f1 \\n(.f .el .ie \\*(f2 .ds f2 \\n(.f .el .ie \\*(f3 .ds f3 \\n(.f .el .ie \\*(f4 .ds f4 \\n(.f .el .tm ? font overflow .ft \\$1 .. .de fP .ie !\\*(f4 \{\ . ft \\*(f4 . ds f4\" ' br \} .el .ie !\\*(f3 \{\ . ft \\*(f3 . ds f3\" ' br \} .el .ie !\\*(f2 \{\ . ft \\*(f2 . ds f2\" ' br \} .el .ie !\\*(f1 \{\ . ft \\*(f1 . ds f1\" ' br \} .el .tm ? font underflow .. .ds f1\" .ds f2\" .ds f3\" .ds f4\" '\" t .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n .TH "NJAM" "6" .SH "NAME" njam \(em maze-game, eat all the cookies while avoiding the badguys .SH "SYNOPSIS" .PP \fBnjam\fR [-w] [-h] [-d] .SH "DESCRIPTION" .PP \fBnjam\fR is a fast-paced maze-game where you must eat all the cookies while avoiding the badguys. Special cookies give you the power to freeze or eat the bad guys. The game features single and multiplayer modes, network play, duelling and cooperative games, great music and sound effects, customizable level skins, many different levels and an integrated level editor. .SH "OPTIONS" .PP The options are; .IP "\fB\-w\fP " 10 Start in windowed mode (as opposed to fullscreen) .IP "\fB\-h\fP " 10 use hardware surfaces (faster, doesn't work well with all graphic cards .IP "\fB\-d\fP " 10 use DGA driver on Linux, (must faster, but must run as root) .SH "AUTHOR" .IP "Application:" 10 M.Babuskov .PP This manual page was written by Anibal Avelar avelar at gmail.com for the Debian Project based on the manual wrote by Stephan Hermann sh at sourcecode.de for the \fBUbuntu\fP system. It has been modified for \fBFedora Extras\fP by Hans de Goede j.w.r.degoede at hhs.nl. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or (at your option) any later version published by the Free Software Foundation. .\" created by instant / docbook-to-man, Sun 20 Nov 2005, 20:58 --- NEW FILE njam.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Njam GenericName=Maze-game where you must eat all the dots Comment=Eat all the dots while avoiding the badguys Exec=njam Icon=njam.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; Version=1.25 --- NEW FILE njam.spec --- Name: njam Version: 1.25 Release: 2%{?dist} Summary: Maze-game, eat all the cookies while avoiding the badguys Group: Amusements/Games License: GPL URL: http://njam.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz Source1: njam.6 Source2: njam.desktop Patch0: njam-1.25-drop-setgid.patch Patch1: njam-1.25-html.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel SDL_mixer-devel SDL_image-devel SDL_net-devel BuildRequires: ImageMagick desktop-file-utils %description Njam is a fast-paced maze-game where you must eat all the cookies while avoiding the badguys. Special cookies give you the power to freeze or eat the bad guys. The game features single and multiplayer modes, network play, duelling and cooperative games, great music and sound effects, customizable level skins, many different levels and an integrated level editor. %prep %setup -q -n %{name}-%{version}-src %patch0 -p1 -z .setgid %patch1 -p1 %build %configure make %{?_smp_mflags} convert -transparent black njamicon.ico %{name}.png %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # make install installs the docs under /usr/share/njam. We want them in %doc. rm $RPM_BUILD_ROOT%{_datadir}/%{name}/README rm $RPM_BUILD_ROOT%{_datadir}/%{name}/levels/readme.txt rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/html # clean up cruft rm $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.* rm $RPM_BUILD_ROOT%{_datadir}/%{name}/njamicon.ico # we want the hiscore in /var/lib/games mkdir -p $RPM_BUILD_ROOT%{_var}/lib/games mv $RPM_BUILD_ROOT%{_datadir}/%{name}/hiscore.dat \ $RPM_BUILD_ROOT%{_var}/lib/games/%{name}.hs # add the manpage (courtesy of Debian) mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6 # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/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 NEWS README TODO levels/readme.txt html %attr(2755,root,games) %{_bindir}/%{name} %{_datadir}/%{name} %{_mandir}/man6/%{name}.6.gz %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %config(noreplace) %attr (0664,root,games) %{_var}/lib/games/%{name}.hs %changelog * Tue Mar 28 2006 Hans de Goede 1.25-2 - Cleaned up description in spec and man using the cleaner description provided in bz 186813 - Use cookies instead of dots in summary (bz 186813) - Put manpage in man6 (bz 186813) - fix broken home link in doc-editor.html (bz 186813) * Wed Mar 22 2006 Hans de Goede 1.25-1 - initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/njam/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Mar 2006 18:20:22 -0000 1.1 +++ .cvsignore 29 Mar 2006 19:45:02 -0000 1.2 @@ -0,0 +1 @@ +njam-1.25-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/njam/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Mar 2006 18:20:22 -0000 1.1 +++ sources 29 Mar 2006 19:45:02 -0000 1.2 @@ -0,0 +1 @@ +231fda022d309e1ef4a0d993ca693462 njam-1.25-src.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:48:06 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 29 Mar 2006 12:48:06 -0700 Subject: rpms/openoffice.org-dict-cs_CZ import.log,1.1,1.2 Message-ID: <200603291948.k2TJm9IG019537@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/openoffice.org-dict-cs_CZ In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19504 Modified Files: import.log Log Message: auto-import openoffice.org-dict-cs_CZ-20060303-1 on branch devel from openoffice.org-dict-cs_CZ-20060303-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/openoffice.org-dict-cs_CZ/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Mar 2006 08:48:09 -0000 1.1 +++ import.log 29 Mar 2006 19:48:06 -0000 1.2 @@ -0,0 +1 @@ +openoffice_org-dict-cs_CZ-20060303-1:HEAD:openoffice.org-dict-cs_CZ-20060303-1.src.rpm:1143661678 From fedora-extras-commits at redhat.com Wed Mar 29 19:48:07 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 29 Mar 2006 12:48:07 -0700 Subject: rpms/openoffice.org-dict-cs_CZ/devel openoffice.org-dict-cs_CZ.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603291948.k2TJm9ID019542@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/openoffice.org-dict-cs_CZ/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19504/devel Modified Files: .cvsignore sources Added Files: openoffice.org-dict-cs_CZ.spec Log Message: auto-import openoffice.org-dict-cs_CZ-20060303-1 on branch devel from openoffice.org-dict-cs_CZ-20060303-1.src.rpm --- NEW FILE openoffice.org-dict-cs_CZ.spec --- Name: openoffice.org-dict-cs_CZ Version: 20060303 Release: 1%{?dist} Summary: Czech spellchecker and hyphenation dictionaries for OpenOffice.org # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPL Group: Applications/Productivity URL: ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/Czech/spell_checking/ Source0: openoffice.org-dict-cs_CZ.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: openoffice.org-core %define instdir %{_libdir}/openoffice.org2.0 %description This package contains the czech spellchecker and hyphenation dictionaries for the Openoffice.org application suite. %prep %setup -q -n %{name} %build %install %{__rm} -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{instdir}/share/dict/ooo install -m 644 *.aff *.dic $RPM_BUILD_ROOT%{instdir}/share/dict/ooo %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README*.txt %{instdir}/share/dict/ooo/* %triggerin -- openoffice.org-core grep -q '^HYPH cs CZ hyph_cs_CZ' %{instdir}/share/dict/ooo/dictionary.lst || \ echo 'HYPH cs CZ hyph_cs_CZ' >> %{instdir}/share/dict/ooo/dictionary.lst grep -q '^DICT cs CZ cs_CZ' %{instdir}/share/dict/ooo/dictionary.lst || \ echo 'DICT cs CZ cs_CZ' >> %{instdir}/share/dict/ooo/dictionary.lst %changelog * Tue Mar 21 2005 Tomas Mraz - 20060303-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/openoffice.org-dict-cs_CZ/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Mar 2006 08:48:10 -0000 1.1 +++ .cvsignore 29 Mar 2006 19:48:07 -0000 1.2 @@ -0,0 +1 @@ +openoffice.org-dict-cs_CZ.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/openoffice.org-dict-cs_CZ/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Mar 2006 08:48:10 -0000 1.1 +++ sources 29 Mar 2006 19:48:07 -0000 1.2 @@ -0,0 +1 @@ +b23377236132316b1c23c01ab8dc38a7 openoffice.org-dict-cs_CZ.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 20:18:46 2006 From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64)) Date: Wed, 29 Mar 2006 13:18:46 -0700 Subject: CVSROOT avail,1.26,1.27 Message-ID: <200603292018.k2TKIk5q021883@cvs-int.fedora.redhat.com> Author: nman64 Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21865 Modified Files: avail Log Message: Expanding access for eitch for mirror management Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- avail 29 Mar 2006 18:53:24 -0000 1.26 +++ avail 29 Mar 2006 20:18:44 -0000 1.27 @@ -38,8 +38,8 @@ avail | riel | web/html/docs/virtualisation avail | riel | web/html/About/Projects/virtualisation avail | harald | web/html/docs/udev -avail | eitch | web/html/download/mirrors -avail | eitch | web/html/Download/mirrors +avail | eitch | web/html/download +avail | eitch | web/html/Download unavail | | fedora-security avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security From fedora-extras-commits at redhat.com Wed Mar 29 20:24:15 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 29 Mar 2006 13:24:15 -0700 Subject: rpms/openoffice.org-dict-cs_CZ/devel openoffice.org-dict-cs_CZ.spec, 1.1, 1.2 Message-ID: <200603292024.k2TKOHP5021990@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/openoffice.org-dict-cs_CZ/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21969 Modified Files: openoffice.org-dict-cs_CZ.spec Log Message: - removed leftover comment Index: openoffice.org-dict-cs_CZ.spec =================================================================== RCS file: /cvs/extras/rpms/openoffice.org-dict-cs_CZ/devel/openoffice.org-dict-cs_CZ.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-dict-cs_CZ.spec 29 Mar 2006 19:48:07 -0000 1.1 +++ openoffice.org-dict-cs_CZ.spec 29 Mar 2006 20:24:15 -0000 1.2 @@ -2,7 +2,6 @@ Version: 20060303 Release: 1%{?dist} Summary: Czech spellchecker and hyphenation dictionaries for OpenOffice.org -# Based on older packages by Dag Wieers and Steve Ratcliffe License: GPL Group: Applications/Productivity URL: ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/Czech/spell_checking/ From fedora-extras-commits at redhat.com Wed Mar 29 20:33:40 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 29 Mar 2006 13:33:40 -0700 Subject: owners owners.list,1.775,1.776 Message-ID: <200603292033.k2TKXgSN022186@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22169 Modified Files: owners.list Log Message: - added openoffice.org-dict-cs_CZ Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.775 retrieving revision 1.776 diff -u -r1.775 -r1.776 --- owners.list 29 Mar 2006 04:32:10 -0000 1.775 +++ owners.list 29 Mar 2006 20:33:40 -0000 1.776 @@ -781,6 +781,7 @@ 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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias 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|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|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|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 29 20:39:43 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 29 Mar 2006 13:39:43 -0700 Subject: owners owners.list,1.776,1.777 Message-ID: <200603292039.k2TKdjjk022487@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22469 Modified Files: owners.list Log Message: Add cmake Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.776 retrieving revision 1.777 diff -u -r1.776 -r1.777 --- owners.list 29 Mar 2006 20:33:40 -0000 1.776 +++ owners.list 29 Mar 2006 20:39:43 -0000 1.777 @@ -129,6 +129,7 @@ Fedora Extras|clearsilver|HTML template system|fedora at soeterbroek.com|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|cmake|Cross-platform make system|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|cmucl|CMU Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 29 20:42:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 29 Mar 2006 13:42:33 -0700 Subject: owners owners.list,1.777,1.778 Message-ID: <200603292042.k2TKgZHY022715@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22698/owners Modified Files: owners.list Log Message: Add njam Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.777 retrieving revision 1.778 diff -u -r1.777 -r1.778 --- owners.list 29 Mar 2006 20:39:43 -0000 1.777 +++ owners.list 29 Mar 2006 20:42:32 -0000 1.778 @@ -757,6 +757,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|oliver at linux-kernel.at|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|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|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 Mar 29 20:59:01 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Wed, 29 Mar 2006 13:59:01 -0700 Subject: rpms/wxGTK/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wxGTK.spec, 1.17, 1.18 wxGTK-2.6.2-gcc41stringh.patch, 1.1, NONE wxGTK-2.6.2-intl_cpp.patch, 1.1, NONE wxGTK-2.6.2-socketclosefix.patch, 1.1, NONE Message-ID: <200603292059.k2TKx3tZ022802@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxGTK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22776 Modified Files: .cvsignore sources wxGTK.spec Removed Files: wxGTK-2.6.2-gcc41stringh.patch wxGTK-2.6.2-intl_cpp.patch wxGTK-2.6.2-socketclosefix.patch Log Message: Update to wxGTK 2.6.3; remove patches which are now upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Nov 2005 19:57:40 -0000 1.4 +++ .cvsignore 29 Mar 2006 20:59:01 -0000 1.5 @@ -1 +1 @@ -wxGTK-2.6.2.tar.bz2 +wxGTK-2.6.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Nov 2005 19:57:40 -0000 1.4 +++ sources 29 Mar 2006 20:59:01 -0000 1.5 @@ -1 +1 @@ -ba2afe7bd028062c5fff6d5ef3249c67 wxGTK-2.6.2.tar.bz2 +3cd76c3c47913e52a3175dd47239c6ec wxGTK-2.6.3.tar.bz2 Index: wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- wxGTK.spec 13 Feb 2006 19:50:49 -0000 1.17 +++ wxGTK.spec 29 Mar 2006 20:59:01 -0000 1.18 @@ -1,8 +1,12 @@ %define x11libdir %{_prefix}/X11R6/%{_lib} +# Option - build an ODBC subpackage using unixODBC. (This is currently +# broken; see .) +%define withodbc 0 + Name: wxGTK -Version: 2.6.2 -Release: 5%{?dist} +Version: 2.6.3 +Release: 0%{?dist} Summary: GTK2 port of the wxWidgets GUI library # The wxWindows licence is the LGPL with a specific exemption allowing # distribution of derived binaries under any terms. (This will eventually @@ -11,15 +15,15 @@ Group: System Environment/Libraries URL: http://www.wxwidgets.org/ Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2 -Patch0: wxGTK-2.6.2-intl_cpp.patch -Patch1: wxGTK-2.6.2-socketclosefix.patch -Patch2: wxGTK-2.6.2-gcc41stringh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, zlib-devel >= 1.1.4 BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: expat-devel, SDL-devel, libgnomeprintui22-devel BuildRequires: mesa-libGL-devel, mesa-libGLU-devel +%if %{withodbc} +BuildRequires: unixODBC-devel +%endif # all of these are for previous Fedora Extras sub-packages Obsoletes: wxGTK2 < 2.6.2-1 @@ -68,14 +72,20 @@ Provides: wxGTK2-gl = %{version}-%{release} %description gl -OpenGL add-on for the wxWidgets library. +OpenGL (a 3D graphics API) add-on for the wxWidgets library. + +%if %{withodbc} +%package odbc +Summary: ODBC add-on for the wxWidgets library +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +%description odbc +ODBC (a SQL database connectivity API) add-on for the wxWidgets library. +%endif %prep %setup -q -%patch0 -p0 -b .intlcpp -%patch1 -p1 -b .socketclose -%patch2 -p1 -b .gcc41 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure @@ -89,6 +99,9 @@ --x-libraries=%{x11libdir} \ --with-gtk=2 \ --with-opengl \ +%if %{withodbc} + --with-odbc \ +%endif --with-sdl \ --with-gnomeprint \ --enable-shared \ @@ -170,8 +183,31 @@ %defattr(-,root,root,-) %{_libdir}/libwx_gtk2u_gl-*.so.* +%if %{withodbc} +%files odbc +%defattr(-,root,root,-) +%{_libdir}/libwx_gtk2u_odbc-*.so.* +%endif %changelog +* Sat Mar 25 2006 Matthew Miller - 2.6.3-1 +- 2.6.3 final +- remove the locale_install thing -- that was just an issue with using the + release candidate. + +* Tue Mar 21 2006 Matthew Miller - 2.6.3-0.rc2 +- update to 2.6.3-rc2 package +- all patches now upstream -- removing 'em. +- use complete 'wxWidgets' source tarball instead of the wxGTK-subset one, + since that's all there is for the release candidate. I'm operating under + the assumption that we'll have a wxGTK source tarball in the future -- + otherwise, I'm going to eventually have to change the name of this + package again. :) +- add ODBC support via unixODBC as subpackage (see bug #176950) +- wait, no; comment out ODBC support as it doesn't build... +- add explicit make locale_install; apparently not done as part of + the general 'make install' anymore. + * Mon Feb 13 2006 Matthew Miller - 2.6.2-5 - rebuild in preparation for FC5 --- wxGTK-2.6.2-gcc41stringh.patch DELETED --- --- wxGTK-2.6.2-intl_cpp.patch DELETED --- --- wxGTK-2.6.2-socketclosefix.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 29 21:42:11 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 29 Mar 2006 14:42:11 -0700 Subject: rpms/ebtables/FC-4 ebtables.spec,1.5,1.6 Message-ID: <200603292142.k2TLgDcS025056@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/FC-4 Modified Files: ebtables.spec Log Message: ebtables gets hung up on -fstack-protector, needs -fPIC Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ebtables.spec 10 Jan 2006 16:03:54 -0000 1.5 +++ ebtables.spec 29 Mar 2006 21:42:11 -0000 1.6 @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.8 -Release: 0.1.%{prever}%{?dist} +Release: 0.3.%{prever}%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -28,7 +28,8 @@ %setup -q -n ebtables-v%{version}-%{prever} %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'` +make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -69,6 +70,12 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.3.rc1 +- use -fPIC + +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.2.rc1 +- broken tagging + * Tue Jan 10 2006 Tom "spot" Callaway 2.0.8-0.1.rc1 - bump to 2.0.8-rc1 From fedora-extras-commits at redhat.com Wed Mar 29 21:42:13 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 29 Mar 2006 14:42:13 -0700 Subject: rpms/ebtables/devel ebtables.spec,1.6,1.7 Message-ID: <200603292142.k2TLgFNQ025064@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/devel Modified Files: ebtables.spec Log Message: ebtables gets hung up on -fstack-protector, needs -fPIC Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ebtables.spec 29 Mar 2006 16:23:55 -0000 1.6 +++ ebtables.spec 29 Mar 2006 21:42:13 -0000 1.7 @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.8 -Release: 0.2.%{prever}%{?dist} +Release: 0.3.%{prever}%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -28,7 +28,8 @@ %setup -q -n ebtables-v%{version}-%{prever} %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'` +make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -69,6 +70,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.3.rc1 +- use -fPIC + * Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.2.rc1 - broken tagging From fedora-extras-commits at redhat.com Wed Mar 29 21:42:12 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 29 Mar 2006 14:42:12 -0700 Subject: rpms/ebtables/FC-5 ebtables.spec,1.6,1.7 Message-ID: <200603292142.k2TLgElo025060@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/FC-5 Modified Files: ebtables.spec Log Message: ebtables gets hung up on -fstack-protector, needs -fPIC Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-5/ebtables.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ebtables.spec 29 Mar 2006 16:23:55 -0000 1.6 +++ ebtables.spec 29 Mar 2006 21:42:12 -0000 1.7 @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.8 -Release: 0.2.%{prever}%{?dist} +Release: 0.3.%{prever}%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -28,7 +28,8 @@ %setup -q -n ebtables-v%{version}-%{prever} %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'` +make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -69,6 +70,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.3.rc1 +- use -fPIC + * Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.2.rc1 - broken tagging From fedora-extras-commits at redhat.com Wed Mar 29 21:42:11 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 29 Mar 2006 14:42:11 -0700 Subject: rpms/ebtables/FC-3 ebtables.spec,1.5,1.6 Message-ID: <200603292142.k2TLghq3025097@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/FC-3 Modified Files: ebtables.spec Log Message: ebtables gets hung up on -fstack-protector, needs -fPIC Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ebtables.spec 10 Jan 2006 16:03:38 -0000 1.5 +++ ebtables.spec 29 Mar 2006 21:42:10 -0000 1.6 @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.8 -Release: 0.1.%{prever}%{?dist} +Release: 0.3.%{prever}%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -28,7 +28,8 @@ %setup -q -n ebtables-v%{version}-%{prever} %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'` +make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -69,6 +70,12 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.3.rc1 +- use -fPIC + +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.2.rc1 +- broken tagging + * Tue Jan 10 2006 Tom "spot" Callaway 2.0.8-0.1.rc1 - bump to 2.0.8-rc1 From fedora-extras-commits at redhat.com Wed Mar 29 21:43:36 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 29 Mar 2006 14:43:36 -0700 Subject: rpms/otrs/FC-4 otrs.spec,1.1,1.2 Message-ID: <200603292144.k2TLi8ts025288@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25234/FC-4 Modified Files: otrs.spec Log Message: Added Dist tag - mmcgrath Index: otrs.spec =================================================================== RCS file: /cvs/extras/rpms/otrs/FC-4/otrs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otrs.spec 23 Mar 2006 20:12:08 -0000 1.1 +++ otrs.spec 29 Mar 2006 21:43:36 -0000 1.2 @@ -1,7 +1,7 @@ Summary: The Open Ticket Request System Name: otrs Version: 2.0.4 -Release: 3 +Release: 3%{?dist} License: GPL Group: Applications/Internet URL: http://www.otrs.org/ From fedora-extras-commits at redhat.com Wed Mar 29 21:43:37 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 29 Mar 2006 14:43:37 -0700 Subject: rpms/otrs/FC-5 otrs.spec,1.1,1.2 Message-ID: <200603292144.k2TLi9mD025291@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25234/FC-5 Modified Files: otrs.spec Log Message: Added Dist tag - mmcgrath Index: otrs.spec =================================================================== RCS file: /cvs/extras/rpms/otrs/FC-5/otrs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otrs.spec 23 Mar 2006 20:12:08 -0000 1.1 +++ otrs.spec 29 Mar 2006 21:43:37 -0000 1.2 @@ -1,7 +1,7 @@ Summary: The Open Ticket Request System Name: otrs Version: 2.0.4 -Release: 3 +Release: 3%{?dist} License: GPL Group: Applications/Internet URL: http://www.otrs.org/ From fedora-extras-commits at redhat.com Wed Mar 29 21:43:38 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 29 Mar 2006 14:43:38 -0700 Subject: rpms/otrs/devel otrs.spec,1.1,1.2 Message-ID: <200603292144.k2TLiAad025294@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25234/devel Modified Files: otrs.spec Log Message: Added Dist tag - mmcgrath Index: otrs.spec =================================================================== RCS file: /cvs/extras/rpms/otrs/devel/otrs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otrs.spec 23 Mar 2006 20:12:08 -0000 1.1 +++ otrs.spec 29 Mar 2006 21:43:37 -0000 1.2 @@ -1,7 +1,7 @@ Summary: The Open Ticket Request System Name: otrs Version: 2.0.4 -Release: 3 +Release: 3%{?dist} License: GPL Group: Applications/Internet URL: http://www.otrs.org/ From fedora-extras-commits at redhat.com Wed Mar 29 21:48:57 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 29 Mar 2006 14:48:57 -0700 Subject: rpms/ser import.log,1.1,1.2 Message-ID: <200603292148.k2TLmx0p025424@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25393 Modified Files: import.log Log Message: auto-import ser-0.9.6-2 on branch devel from ser-0.9.6-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ser/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Mar 2006 11:04:58 -0000 1.1 +++ import.log 29 Mar 2006 21:48:57 -0000 1.2 @@ -0,0 +1 @@ +ser-0_9_6-2:HEAD:ser-0.9.6-2.src.rpm:1143668924 From fedora-extras-commits at redhat.com Wed Mar 29 21:48:58 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 29 Mar 2006 14:48:58 -0700 Subject: rpms/ser/devel .cvsignore,1.1,1.2 Message-ID: <200603292149.k2TLn0vf025428@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25393/devel Modified Files: .cvsignore Log Message: auto-import ser-0.9.6-2 on branch devel from ser-0.9.6-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ser/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Mar 2006 11:04:58 -0000 1.1 +++ .cvsignore 29 Mar 2006 21:48:58 -0000 1.2 @@ -0,0 +1,2 @@ +ser-0.9.6_src.tar.gz +serweb-0.9.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 21:57:47 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 29 Mar 2006 14:57:47 -0700 Subject: owners owners.list,1.778,1.779 Message-ID: <200603292157.k2TLvnme025564@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25547 Modified Files: owners.list Log Message: Added ser Changed ownership of libsndfile #180324 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.778 retrieving revision 1.779 diff -u -r1.778 -r1.779 --- owners.list 29 Mar 2006 20:42:32 -0000 1.778 +++ owners.list 29 Mar 2006 21:57:47 -0000 1.779 @@ -623,7 +623,7 @@ Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|libsigc++|Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org| -Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|libsndfile|A library for reading and writing sound files|andreas at bawue.net|extras-qa at fedoraproject.org| 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|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|libsx|Simple X library|pertusus at free.fr|extras-qa at fedoraproject.org| @@ -1307,6 +1307,7 @@ Fedora Extras|SDL_net|SDL portable network library|bdpepple at ameritech.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|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| +Fedora Extras|ser|SIP Express Router|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|robert at marcanoonline.com|extras-qa at fedoraproject.org| Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 29 22:03:36 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 29 Mar 2006 15:03:36 -0700 Subject: rpms/libsndfile/devel .cvsignore, 1.4, 1.5 libsndfile.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200603292203.k2TM3cAP027907@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/libsndfile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27884 Modified Files: .cvsignore libsndfile.spec sources Log Message: * Thu Mar 30 2006 Andreas Thienemann - 1.0.14-1 - Updated to 1.0.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Mar 2006 18:26:08 -0000 1.4 +++ .cvsignore 29 Mar 2006 22:03:36 -0000 1.5 @@ -1 +1 @@ -libsndfile-1.0.14.tar.gz +libsndfile-1.0.15.tar.gz Index: libsndfile.spec =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/libsndfile.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libsndfile.spec 16 Mar 2006 18:26:08 -0000 1.10 +++ libsndfile.spec 29 Mar 2006 22:03:36 -0000 1.11 @@ -1,6 +1,6 @@ Summary: Library for reading and writing sound files Name: libsndfile -Version: 1.0.14 +Version: 1.0.15 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -77,6 +77,9 @@ %changelog +* Thu Mar 30 2006 Andreas Thienemann - 1.0.15-1 +- Updated to 1.0.15 + * Thu Mar 16 2006 Dams - 1.0.14-1.fc5 - Updated to 1.0.14 - Dropped patch0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Mar 2006 18:26:08 -0000 1.4 +++ sources 29 Mar 2006 22:03:36 -0000 1.5 @@ -1 +1 @@ -3513c2283f4063f57615c5b9b45bf30a libsndfile-1.0.14.tar.gz +4171faabfad0ce550cbe9bf1b065e976 libsndfile-1.0.15.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 22:15:38 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Wed, 29 Mar 2006 15:15:38 -0700 Subject: fedora-release fedora-core.repo, 1.3, 1.4 fedora-development.repo, 1.4, 1.5 fedora-extras.repo, 1.5, 1.6 fedora-updates-testing.repo, 1.5, 1.6 fedora-updates.repo, 1.8, 1.9 Message-ID: <200603292215.k2TMFcoB027994@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27969 Modified Files: fedora-core.repo fedora-development.repo fedora-extras.repo fedora-updates-testing.repo fedora-updates.repo Log Message: Adding mirror files for debug and source repos. Index: fedora-core.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-core.repo 20 Mar 2006 17:33:14 -0000 1.3 +++ fedora-core.repo 29 Mar 2006 22:15:35 -0000 1.4 @@ -8,14 +8,16 @@ [core-debuginfo] name=Fedora Core $releasever - $basearch - Debug -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/debug/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/debug/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-debug-$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY [core-source] name=Fedora Core $releasever - Source -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/source/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/source/SRPMS/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-source-$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-development.repo 20 Mar 2006 17:33:14 -0000 1.4 +++ fedora-development.repo 29 Mar 2006 22:15:35 -0000 1.5 @@ -32,13 +32,15 @@ [development-debuginfo] name=Fedora Core - Development - Debug -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/debug/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/debug/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide-debug enabled=0 gpgcheck=0 [development-source] name=Fedora Core - Development - Source -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide-source enabled=0 gpgcheck=0 Index: fedora-extras.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedora-extras.repo 20 Mar 2006 17:33:14 -0000 1.5 +++ fedora-extras.repo 29 Mar 2006 22:15:35 -0000 1.6 @@ -8,14 +8,16 @@ [extras-debuginfo] name=Fedora Extras $releasever - $basearch - Debug -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/debug/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/debug/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-debug-$releasever enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 [extras-source] name=Fedora Extras $releasever - Source -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/SRPMS/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-source-$releasever enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-updates-testing.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedora-updates-testing.repo 20 Mar 2006 17:33:14 -0000 1.5 +++ fedora-updates-testing.repo 29 Mar 2006 22:15:35 -0000 1.6 @@ -8,14 +8,16 @@ [updates-testing-debuginfo] name=Fedora Core $releasever - $basearch - Test Updates Debug -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/$basearch/debug/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/$basearch/debug/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-debug-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test [updates-testing-source] name=Fedora Core $releasever - Test Updates Source -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/SRPMS/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-source-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test Index: fedora-updates.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fedora-updates.repo 20 Mar 2006 17:33:14 -0000 1.8 +++ fedora-updates.repo 29 Mar 2006 22:15:35 -0000 1.9 @@ -8,14 +8,16 @@ [updates-debuginfo] name=Fedora Core $releasever - $basearch - Updates - Debug -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/debug/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/debug/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-debug-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora [updates-source] name=Fedora Core $releasever - Updates Source -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/SRPMS/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-source-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora From fedora-extras-commits at redhat.com Wed Mar 29 23:08:41 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 29 Mar 2006 16:08:41 -0700 Subject: rpms/cmake/FC-4 cmake.spec,1.1,1.2 Message-ID: <200603292308.k2TN8hOG030433@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/cmake/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30412 Modified Files: cmake.spec Log Message: Alter BR for FC-4 xorg Index: cmake.spec =================================================================== RCS file: /cvs/extras/rpms/cmake/FC-4/cmake.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cmake.spec 29 Mar 2006 19:03:00 -0000 1.1 +++ cmake.spec 29 Mar 2006 23:08:41 -0000 1.2 @@ -9,7 +9,7 @@ Source0: http://www.cmake.org/files/v2.2/cmake-%{version}.tar.gz Source1: cmake-init-fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel, libX11-devel +BuildRequires: ncurses-devel, xorg-x11-devel %description CMake is used to control the software compilation process using simple From fedora-extras-commits at redhat.com Wed Mar 29 23:31:25 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Wed, 29 Mar 2006 16:31:25 -0700 Subject: fedora-release fedora-core.repo, 1.4, 1.5 fedora-development.repo, 1.5, 1.6 fedora-extras-development.repo, 1.3, 1.4 fedora-extras.repo, 1.6, 1.7 fedora-updates.repo, 1.9, 1.10 Message-ID: <200603292331.k2TNVPF3030579@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30553 Modified Files: fedora-core.repo fedora-development.repo fedora-extras-development.repo fedora-extras.repo fedora-updates.repo Log Message: enabling developments and turning off others for rawhide package. Index: fedora-core.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-core.repo 29 Mar 2006 22:15:35 -0000 1.4 +++ fedora-core.repo 29 Mar 2006 23:31:22 -0000 1.5 @@ -2,7 +2,7 @@ name=Fedora Core $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-$releasever -enabled=1 +enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedora-development.repo 29 Mar 2006 22:15:35 -0000 1.5 +++ fedora-development.repo 29 Mar 2006 23:31:22 -0000 1.6 @@ -27,7 +27,7 @@ name=Fedora Core - Development #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide -enabled=0 +enabled=1 gpgcheck=0 [development-debuginfo] Index: fedora-extras-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-extras-development.repo 20 Mar 2006 17:33:14 -0000 1.3 +++ fedora-extras-development.repo 29 Mar 2006 23:31:22 -0000 1.4 @@ -2,7 +2,7 @@ name=Fedora Extras - Development Tree #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-devel -enabled=0 +enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-extras.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fedora-extras.repo 29 Mar 2006 22:15:35 -0000 1.6 +++ fedora-extras.repo 29 Mar 2006 23:31:22 -0000 1.7 @@ -2,7 +2,7 @@ name=Fedora Extras $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-$releasever -enabled=1 +enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-updates.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fedora-updates.repo 29 Mar 2006 22:15:35 -0000 1.9 +++ fedora-updates.repo 29 Mar 2006 23:31:22 -0000 1.10 @@ -2,7 +2,7 @@ name=Fedora Core $releasever - $basearch - Updates #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/ mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-fc$releasever -enabled=1 +enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora From fedora-extras-commits at redhat.com Thu Mar 30 01:15:03 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 29 Mar 2006 18:15:03 -0700 Subject: rpms/gnome-applet-music import.log,1.1,1.2 Message-ID: <200603300115.k2U1F5AH002965@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/gnome-applet-music In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2927 Modified Files: import.log Log Message: auto-import gnome-applet-music-0.9.0-1 on branch devel from gnome-applet-music-0.9.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-music/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Mar 2006 14:39:25 -0000 1.1 +++ import.log 30 Mar 2006 01:15:03 -0000 1.2 @@ -0,0 +1 @@ +gnome-applet-music-0_9_0-1:HEAD:gnome-applet-music-0.9.0-1.src.rpm:1143681729 From fedora-extras-commits at redhat.com Thu Mar 30 01:15:04 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 29 Mar 2006 18:15:04 -0700 Subject: rpms/gnome-applet-music/devel gnome-applet-music.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603300115.k2U1F6On002971@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/gnome-applet-music/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2927/devel Modified Files: .cvsignore sources Added Files: gnome-applet-music.spec Log Message: auto-import gnome-applet-music-0.9.0-1 on branch devel from gnome-applet-music-0.9.0-1.src.rpm --- NEW FILE gnome-applet-music.spec --- Name: gnome-applet-music Version: 0.9.0 Release: 1%{?dist} Summary: A GNOME panel applet to control various music players Group: Applications/Multimedia License: GPL URL: http://web.ics.purdue.edu/~kuliniew/music-applet/ Source0: http://web.ics.purdue.edu/~kuliniew/music-applet/downloads/music-applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-panel-devel eel2-devel dbus-devel #Requires: Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 Provides: music-applet gnome-applet-rhythmbox rhythmbox-applet Obsoletes: gnome-applet-rhythmbox %description Music Applet is a small, simple GNOME panel applet that lets you control a variety of different music players from the panel. Music Applet provides easy access to information about the current song and the most important playback controls. Music Applet currently supports the following music players: * Banshee * Rhythmbox Music Applet is the successor to Rhythmbox Applet. %prep %setup -q -n music-applet-%{version} %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT %find_lang music-applet %clean rm -rf $RPM_BUILD_ROOT %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/music-applet.schemas >/dev/null || : killall -HUP gconfd-2 || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/music-applet.schemas > /dev/null || : killall -HUP gconfd-2 || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/music-applet.schemas > /dev/null || : killall -HUP gconfd-2 || : fi %files -f music-applet.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO %{_datadir}/gnome-2.0/ui/*.xml %{_datadir}/music-applet %{_libdir}/bonobo/servers/*.server %{_libexecdir}/* %{_sysconfdir}/gconf/schemas/*.schemas %changelog * Sun Mar 26 2006 Ignacio Vazquez-Abrams 0.9.0 - Renamed to gnome-applet-music from gnome-applet-rhythmbox Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-music/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Mar 2006 14:39:25 -0000 1.1 +++ .cvsignore 30 Mar 2006 01:15:04 -0000 1.2 @@ -0,0 +1 @@ +music-applet-0.9.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-music/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Mar 2006 14:39:25 -0000 1.1 +++ sources 30 Mar 2006 01:15:04 -0000 1.2 @@ -0,0 +1 @@ +d22543fb3d7780fcbf5b688984e17d0a music-applet-0.9.0.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 04:29:23 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 21:29:23 -0700 Subject: kadischi/linuxrc livecd-linuxrc,1.1.1.1,1.2 Message-ID: <200603300429.k2U4TNH4009778@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/linuxrc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9717/kadischi/linuxrc Modified Files: livecd-linuxrc Log Message: Contributor: Toshio Kuratomi(SquashFS functionality as optional ), other minor fixes of unneccessary dependants on installed files. Index: livecd-linuxrc =================================================================== RCS file: /cvs/devel/kadischi/linuxrc/livecd-linuxrc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- livecd-linuxrc 21 Aug 2005 17:09:00 -0000 1.1.1.1 +++ livecd-linuxrc 30 Mar 2006 04:29:21 -0000 1.2 @@ -12,11 +12,21 @@ cd / -find-live-cd /sysroot +find-live-cd /cdrom # Make kernel don't mount root fs echo 0x100 > /proc/sys/kernel/real-root-dev +# Check for squashfs file +if [ -f /cdrom/kadischi.sqsh ]; then + echo "Mounting squashfs filesystem" + modprobe loop + modprobe squashfs + mount -t squashfs -o loop /cdrom/kadischi.sqsh /sysroot +else + mount --bind /cdrom /sysroot +fi + echo "Doing the pivot_root" cd /sysroot pivot_root /sysroot /sysroot/initrd @@ -45,4 +55,4 @@ echo "Setting up readonly-root" /etc/rc.readonly linuxrc -# rc.readonly will umount both /initrd/tmp and /initrd \ No newline at end of file +# rc.readonly will umount both /initrd/tmp and /initrd From fedora-extras-commits at redhat.com Thu Mar 30 04:29:24 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 21:29:24 -0700 Subject: kadischi/livecd_generator create-iso.sh, 1.1.1.1, 1.2 install-boot.sh, 1.2, 1.3 kadischi.py, 1.5, 1.6 livecd-mkinitrd.sh, 1.4, 1.5 Message-ID: <200603300429.k2U4TOCM009787@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9717/kadischi/livecd_generator Modified Files: create-iso.sh install-boot.sh kadischi.py livecd-mkinitrd.sh Log Message: Contributor: Toshio Kuratomi(SquashFS functionality as optional ), other minor fixes of unneccessary dependants on installed files. Index: create-iso.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/create-iso.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- create-iso.sh 21 Aug 2005 17:09:00 -0000 1.1.1.1 +++ create-iso.sh 30 Mar 2006 04:29:22 -0000 1.2 @@ -3,4 +3,4 @@ sysdir=$1 isoimage=$2 -mkisofs -quiet -z -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir \ No newline at end of file +mkisofs -quiet $MKISOFSOPTION -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir Index: install-boot.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- install-boot.sh 17 Mar 2006 22:30:00 -0000 1.2 +++ install-boot.sh 30 Mar 2006 04:29:22 -0000 1.3 @@ -5,7 +5,7 @@ kernel=$3 kernel_is_xen=$(echo $kernel | grep -G [[:alnum:]]xen0) kernel_version_proper=$(echo $kernel | sed -e 's|xen0||') -kernel_params='' +kernel_params='selinux=0' . /etc/kadischi/build.conf Index: kadischi.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kadischi.py 17 Mar 2006 22:30:00 -0000 1.5 +++ kadischi.py 30 Mar 2006 04:29:22 -0000 1.6 @@ -48,6 +48,8 @@ parser.add_option ("", "--buildstamp", dest="buildstamp", help="buildstamp file (if not set, using the default buildstamp from the config directory)") +parser.add_option ("", "--filesystem", dest="filesystem", help="set the filesystem to use on the iso to either zisofs[default] or squashfs.") + flc_log ('Parsing command line arguments') (options, args) = parser.parse_args () @@ -156,7 +158,13 @@ flc_log ('Checking required packages') -required_rpms = ['anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs'] +# Set required filesystem_tools to something appropriate depending on what is chosen +if options.filesystem == 'squashfs': + filesystem_tools = 'squashfs-tools' +else + filesystem_tools = 'zisofs-tools' + +required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', filesystem_tools) missing_rpms = check_installed_rpms ('/', required_rpms, False) @@ -236,10 +244,10 @@ scripts = [] for root, dirs, files in os.walk (normalize_path([bindir, 'post_install_scripts'])): - for file in files: - file = normalize_path([bindir, 'post_install_scripts', file]) - if os.access(file, 1): - scripts.append (file) + for filename in files: + filename = normalize_path([bindir, 'post_install_scripts', filename]) + if os.access(filename, 1): + scripts.append (filename) scripts.sort() @@ -263,7 +271,19 @@ flc_log ('compressing the tree (order a pizza `cause this will take a while)') -run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir) +if options.filesystem == 'squashfs': + # zisofs has a tree which can be seen; squashfs is a file that we mount + # loopback. So we need to create supporting files and directories + # seperately. + os.makedirs (os.path.join(csysdir, 'boot/isolinux')) + os.makedirs(normalize_path([csysdir, '/livecd'])) + touch = file(normalize_path([csysdir, '.livecd']), 'w') + touch.close() + # compress a squashfs tree + run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh']))) +else: + # compress a zisofs tree + run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir) # install boot & conf files in compressed tree (they shoudn`t be compressed) @@ -283,7 +303,11 @@ flc_log ('creating iso image %s' % isoimage) -run ("%s %s %s" % (normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir) +if options.filesystem == 'squashfs': + mkisoflags='' +else: + mkisoflags='MKISOFSOPTION=-z ' +run ("%s%s %s %s" % (mkisoflags, normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir) # delete builddir Index: livecd-mkinitrd.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- livecd-mkinitrd.sh 17 Mar 2006 22:30:00 -0000 1.4 +++ livecd-mkinitrd.sh 30 Mar 2006 04:29:22 -0000 1.5 @@ -208,6 +208,7 @@ mkdir -p $MNTIMAGE/proc mkdir -p $MNTIMAGE/sys mkdir -p $MNTIMAGE/sysroot +mkdir -p $MNTIMAGE/cdrom mkdir -p $MNTIMAGE/tmp mkdir -p $MNTIMAGE/usr/lib mkdir -p $MNTIMAGE/var/lib/nfs/rpc_pipefs @@ -255,9 +256,8 @@ inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist" inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep" -PPMODULES=$(findmodules drivers/parport) - -for MODULE in $PPMODULES; do +MODULES=$(findmodules drivers/parport fs/squashfs drivers/block/loop.ko) +for MODULE in $MODULES; do instmodule $MODULE done @@ -270,6 +270,9 @@ for i in 1 2 3 4; do mknod $MNTIMAGE/dev/tty$i c 4 $i done +for i in 0 1 2 3 4 5 6 7 8 9; do + mknod $MNTIMAGE/dev/loop$i b 7 $i +done inst $INSTALLDIR/initrd/livecd-linuxrc "$MNTIMAGE/linuxrc" From fedora-extras-commits at redhat.com Thu Mar 30 04:29:24 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 21:29:24 -0700 Subject: kadischi/post_install_scripts 04auth.sh, 1.2, 1.3 05fsclean.py, 1.1.1.1, 1.2 Message-ID: <200603300429.k2U4TOHx009794@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9717/kadischi/post_install_scripts Modified Files: 04auth.sh 05fsclean.py Log Message: Contributor: Toshio Kuratomi(SquashFS functionality as optional ), other minor fixes of unneccessary dependants on installed files. Index: 04auth.sh =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/04auth.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 04auth.sh 20 Mar 2006 05:59:05 -0000 1.2 +++ 04auth.sh 30 Mar 2006 04:29:22 -0000 1.3 @@ -2,11 +2,15 @@ chroot $1 /usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth +# We could eventually make this more useful, and maybe in another way. +# With selinux=0 we shouldn't be having SELinux problems. +# Likewise a firewall will exist unless we've used kickstart to disable it. + # Don't disable a user's set firewall rules explicitly -fw_is_enabled=$(grep ^--enabled $1/etc/sysconfig/system-config-securitylevel) -if [ -n $fw_is_enabled ]; then - echo "Found an enabled firewall.." -else - chroot $1 /usr/sbin/lokkit --quiet --nostart -f --disabled -fi -chroot $1 /usr/sbin/lokkit --quiet --nostart --selinux=disabled +#fw_is_enabled=$(grep ^--enabled $1/etc/sysconfig/system-config-securitylevel) +#if [ -n $fw_is_enabled ]; then +# echo "Found an enabled firewall.." +#else +# chroot $1 /usr/sbin/lokkit --quiet --nostart -f --disabled +#fi +#chroot $1 /usr/sbin/lokkit --quiet --nostart --selinux=disabled Index: 05fsclean.py =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/05fsclean.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- 05fsclean.py 21 Aug 2005 17:09:01 -0000 1.1.1.1 +++ 05fsclean.py 30 Mar 2006 04:29:22 -0000 1.2 @@ -2,6 +2,7 @@ import os import sys +import shutil from functions import * # Directories that we want to empty but not delete @@ -60,4 +61,4 @@ directories_to_be_emptied, directories_to_be_cleaned, files_to_be_removed) -clean_up_root (rootdir) \ No newline at end of file +clean_up_root (rootdir) From fedora-extras-commits at redhat.com Thu Mar 30 04:29:23 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 21:29:23 -0700 Subject: kadischi/lib functions.py,1.4,1.5 Message-ID: <200603300429.k2U4TNGs009771@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9717/kadischi/lib Modified Files: functions.py Log Message: Contributor: Toshio Kuratomi(SquashFS functionality as optional ), other minor fixes of unneccessary dependants on installed files. Index: functions.py =================================================================== RCS file: /cvs/devel/kadischi/lib/functions.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- functions.py 12 Mar 2006 23:04:49 -0000 1.4 +++ functions.py 30 Mar 2006 04:29:21 -0000 1.5 @@ -2,6 +2,7 @@ import os import sys +import shutil import shvar import rpm import urlgrabber.grabber as grabber From fedora-extras-commits at redhat.com Thu Mar 30 04:52:01 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 29 Mar 2006 21:52:01 -0700 Subject: rpms/snort/devel README.fedora,NONE,1.1 snort.spec,1.6,1.7 Message-ID: <200603300452.k2U4q3wm009902@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9884 Modified Files: snort.spec Added Files: README.fedora Log Message: add readme file with rules and run a make clean so configure runs correctly --- NEW FILE README.fedora --- - Why is there no Rules in this package? * sourcefire licenses the rules under a different license than snort. Sourcefire VRT Certified Rules are the official rules of snort.org. Each rule has been rigorously tested against the same standards the VRT uses for Sourcefire customers. * Subscribers receive real-time rules updates as they are available ??? get more subscription highlights here * Registered users can access rule updates 5 days after release to subscription users. * Unregistered users receive a static ruleset at the time of each major Snort Release Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- snort.spec 9 Mar 2006 19:09:08 -0000 1.6 +++ snort.spec 30 Mar 2006 04:52:00 -0000 1.7 @@ -1,11 +1,12 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz Source1: snortd +Source2: README.fedora Patch: snort-2.4.3-configure64.patch Url: http://www.snort.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -88,9 +89,6 @@ Snort has a real-time alerting capabilty, with alerts being sent to syslog, a seperate "alert" file, or as a WinPopup message via Samba's smbclient -This version is compiled without database support. Edit the spec file -and rebuild the rpm to enable it. - Edit %{_sysconfdir}/snort.conf to configure snort and use snort.d to start snort This rpm is different from previous rpms and while it will not clobber @@ -152,6 +150,7 @@ %setup -q %patch0 -p1 -b .config +cp %{SOURCE2} doc/ %build @@ -170,7 +169,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-plain - +make clean } # plain+flexresp @@ -182,6 +181,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp +make clean } # mysql+flexresp @@ -193,6 +193,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp +make clean } # mysql @@ -203,6 +204,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql +make clean } @@ -216,6 +218,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp +make clean } # postgresql @@ -226,6 +229,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql +make clean } # snmp @@ -239,6 +243,7 @@ make %{?_smp_mflags} mv src/snort snort-snmp +make clean } @@ -253,7 +258,7 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-snmp+flexresp -# make distclean + make clean } # bloat @@ -267,9 +272,11 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-bloat -# make distclean +make clean } +#remove Makefile stuff from docs +rm doc/Makefile* %install if [ -d %{buildroot} ]; then @@ -295,7 +302,8 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir} +mkdir %{buildroot}%{_sysconfdir}/snort +install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf @@ -355,7 +363,7 @@ %files %defattr(-,root,root) -%doc doc/* +%doc doc/* %attr(755,root,root) %{_sbindir}/snort-plain # handle compressed man pages. @@ -390,6 +398,10 @@ %changelog +* Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 +- Add fedora README +- do make clean to make sure that each configure runs properly + * Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 - Update to 2.4.4 - Fixes CVE-2006-0839 From fedora-extras-commits at redhat.com Thu Mar 30 04:54:54 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 29 Mar 2006 21:54:54 -0700 Subject: rpms/snort/FC-3 README.fedora,NONE,1.1 snort.spec,1.5,1.6 Message-ID: <200603300454.k2U4suS7009971@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9953 Modified Files: snort.spec Added Files: README.fedora Log Message: add readme file with rules and run a make clean so configure runs correctly --- NEW FILE README.fedora --- - Why is there no Rules in this package? * sourcefire licenses the rules under a different license than snort. Sourcefire VRT Certified Rules are the official rules of snort.org. Each rule has been rigorously tested against the same standards the VRT uses for Sourcefire customers. * Subscribers receive real-time rules updates as they are available ??? get more subscription highlights here * Registered users can access rule updates 5 days after release to subscription users. * Unregistered users receive a static ruleset at the time of each major Snort Release Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-3/snort.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- snort.spec 9 Mar 2006 19:11:25 -0000 1.5 +++ snort.spec 30 Mar 2006 04:54:54 -0000 1.6 @@ -1,11 +1,12 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz Source1: snortd +Source2: README.fedora Patch: snort-2.4.3-configure64.patch Url: http://www.snort.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -88,9 +89,6 @@ Snort has a real-time alerting capabilty, with alerts being sent to syslog, a seperate "alert" file, or as a WinPopup message via Samba's smbclient -This version is compiled without database support. Edit the spec file -and rebuild the rpm to enable it. - Edit %{_sysconfdir}/snort.conf to configure snort and use snort.d to start snort This rpm is different from previous rpms and while it will not clobber @@ -152,6 +150,7 @@ %setup -q %patch0 -p1 -b .config +cp %{SOURCE2} doc/ %build @@ -170,7 +169,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-plain - +make clean } # plain+flexresp @@ -182,6 +181,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp +make clean } # mysql+flexresp @@ -193,6 +193,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp +make clean } # mysql @@ -203,6 +204,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql +make clean } @@ -216,6 +218,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp +make clean } # postgresql @@ -226,6 +229,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql +make clean } # snmp @@ -239,6 +243,7 @@ make %{?_smp_mflags} mv src/snort snort-snmp +make clean } @@ -253,7 +258,7 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-snmp+flexresp -# make distclean + make clean } # bloat @@ -267,9 +272,11 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-bloat -# make distclean +make clean } +#remove Makefile stuff from docs +rm doc/Makefile* %install if [ -d %{buildroot} ]; then @@ -295,7 +302,8 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir} +mkdir %{buildroot}%{_sysconfdir}/snort +install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf @@ -355,7 +363,7 @@ %files %defattr(-,root,root) -%doc doc/* +%doc doc/* %attr(755,root,root) %{_sbindir}/snort-plain # handle compressed man pages. @@ -390,6 +398,10 @@ %changelog +* Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 +- Add fedora README +- do make clean to make sure that each configure runs properly + * Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 - Update to 2.4.4 - Fixes CVE-2006-0839 From fedora-extras-commits at redhat.com Thu Mar 30 04:55:14 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 21:55:14 -0700 Subject: kadischi/man - New directory Message-ID: <200603300455.k2U4tED1009994@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/man In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9979/man Log Message: Directory /cvs/devel/kadischi/man added to the repository From fedora-extras-commits at redhat.com Thu Mar 30 04:56:43 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 29 Mar 2006 21:56:43 -0700 Subject: rpms/snort/FC-4 README.fedora,NONE,1.1 snort.spec,1.6,1.7 Message-ID: <200603300456.k2U4ujbV010058@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10040 Modified Files: snort.spec Added Files: README.fedora Log Message: add readme file with rules and run a make clean so configure runs correctly --- NEW FILE README.fedora --- - Why is there no Rules in this package? * sourcefire licenses the rules under a different license than snort. Sourcefire VRT Certified Rules are the official rules of snort.org. Each rule has been rigorously tested against the same standards the VRT uses for Sourcefire customers. * Subscribers receive real-time rules updates as they are available ??? get more subscription highlights here * Registered users can access rule updates 5 days after release to subscription users. * Unregistered users receive a static ruleset at the time of each major Snort Release Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-4/snort.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- snort.spec 9 Mar 2006 19:12:38 -0000 1.6 +++ snort.spec 30 Mar 2006 04:56:43 -0000 1.7 @@ -1,11 +1,12 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz Source1: snortd +Source2: README.fedora Patch: snort-2.4.3-configure64.patch Url: http://www.snort.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -88,9 +89,6 @@ Snort has a real-time alerting capabilty, with alerts being sent to syslog, a seperate "alert" file, or as a WinPopup message via Samba's smbclient -This version is compiled without database support. Edit the spec file -and rebuild the rpm to enable it. - Edit %{_sysconfdir}/snort.conf to configure snort and use snort.d to start snort This rpm is different from previous rpms and while it will not clobber @@ -152,6 +150,7 @@ %setup -q %patch0 -p1 -b .config +cp %{SOURCE2} doc/ %build @@ -170,7 +169,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-plain - +make clean } # plain+flexresp @@ -182,6 +181,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp +make clean } # mysql+flexresp @@ -193,6 +193,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp +make clean } # mysql @@ -203,6 +204,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql +make clean } @@ -216,6 +218,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp +make clean } # postgresql @@ -226,6 +229,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql +make clean } # snmp @@ -239,6 +243,7 @@ make %{?_smp_mflags} mv src/snort snort-snmp +make clean } @@ -253,7 +258,7 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-snmp+flexresp -# make distclean + make clean } # bloat @@ -267,9 +272,11 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-bloat -# make distclean +make clean } +#remove Makefile stuff from docs +rm doc/Makefile* %install if [ -d %{buildroot} ]; then @@ -295,7 +302,8 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir} +mkdir %{buildroot}%{_sysconfdir}/snort +install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf @@ -355,7 +363,7 @@ %files %defattr(-,root,root) -%doc doc/* +%doc doc/* %attr(755,root,root) %{_sbindir}/snort-plain # handle compressed man pages. @@ -390,6 +398,10 @@ %changelog +* Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 +- Add fedora README +- do make clean to make sure that each configure runs properly + * Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 - Update to 2.4.4 - Fixes CVE-2006-0839 From fedora-extras-commits at redhat.com Thu Mar 30 04:59:27 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 29 Mar 2006 21:59:27 -0700 Subject: rpms/snort/FC-5 README.fedora,NONE,1.1 snort.spec,1.6,1.7 Message-ID: <200603300459.k2U4xT5v010135@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10117 Modified Files: snort.spec Added Files: README.fedora Log Message: add readme file with rules and run a make clean so configure runs correctly --- NEW FILE README.fedora --- - Why is there no Rules in this package? * sourcefire licenses the rules under a different license than snort. Sourcefire VRT Certified Rules are the official rules of snort.org. Each rule has been rigorously tested against the same standards the VRT uses for Sourcefire customers. * Subscribers receive real-time rules updates as they are available ??? get more subscription highlights here * Registered users can access rule updates 5 days after release to subscription users. * Unregistered users receive a static ruleset at the time of each major Snort Release Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-5/snort.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- snort.spec 9 Mar 2006 19:09:08 -0000 1.6 +++ snort.spec 30 Mar 2006 04:59:26 -0000 1.7 @@ -1,11 +1,12 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz Source1: snortd +Source2: README.fedora Patch: snort-2.4.3-configure64.patch Url: http://www.snort.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -88,9 +89,6 @@ Snort has a real-time alerting capabilty, with alerts being sent to syslog, a seperate "alert" file, or as a WinPopup message via Samba's smbclient -This version is compiled without database support. Edit the spec file -and rebuild the rpm to enable it. - Edit %{_sysconfdir}/snort.conf to configure snort and use snort.d to start snort This rpm is different from previous rpms and while it will not clobber @@ -152,6 +150,7 @@ %setup -q %patch0 -p1 -b .config +cp %{SOURCE2} doc/ %build @@ -170,7 +169,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-plain - +make clean } # plain+flexresp @@ -182,6 +181,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp +make clean } # mysql+flexresp @@ -193,6 +193,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp +make clean } # mysql @@ -203,6 +204,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql +make clean } @@ -216,6 +218,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp +make clean } # postgresql @@ -226,6 +229,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql +make clean } # snmp @@ -239,6 +243,7 @@ make %{?_smp_mflags} mv src/snort snort-snmp +make clean } @@ -253,7 +258,7 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-snmp+flexresp -# make distclean + make clean } # bloat @@ -267,9 +272,11 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-bloat -# make distclean +make clean } +#remove Makefile stuff from docs +rm doc/Makefile* %install if [ -d %{buildroot} ]; then @@ -295,7 +302,8 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir} +mkdir %{buildroot}%{_sysconfdir}/snort +install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf @@ -355,7 +363,7 @@ %files %defattr(-,root,root) -%doc doc/* +%doc doc/* %attr(755,root,root) %{_sbindir}/snort-plain # handle compressed man pages. @@ -390,6 +398,10 @@ %changelog +* Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 +- Add fedora README +- do make clean to make sure that each configure runs properly + * Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 - Update to 2.4.4 - Fixes CVE-2006-0839 From fedora-extras-commits at redhat.com Thu Mar 30 05:39:42 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 29 Mar 2006 22:39:42 -0700 Subject: rpms/scribus/devel .cvsignore, 1.7, 1.8 scribus.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <200603300539.k2U5diGE012344@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/scribus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12321 Modified Files: .cvsignore scribus.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 18 Mar 2006 10:53:58 -0000 1.7 +++ .cvsignore 30 Mar 2006 05:39:42 -0000 1.8 @@ -1 +1 @@ -scribus-1.3.2.tar.bz2 +scribus-1.3.3.tar.bz2 Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- scribus.spec 18 Mar 2006 10:53:58 -0000 1.16 +++ scribus.spec 30 Mar 2006 05:39:42 -0000 1.17 @@ -1,5 +1,5 @@ Name: scribus -Version: 1.3.2 +Version: 1.3.3 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://www.scribus.org.uk/downloads/1.3.2/scribus-1.3.2.tar.bz2 +Source0: http://www.scribus.org.uk/downloads/1.3.3/scribus-1.3.3.tar.bz2 Source1: scribus.xml Source2: scribus.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -136,6 +136,10 @@ %changelog +* Tue Mar 28 2006 Andreas Bierfert +1.3.3-1 +- version upgrade + * Sat Mar 18 2006 Andreas Bierfert 1.3.2-1 - upgrade to beta version Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 18 Mar 2006 10:53:58 -0000 1.7 +++ sources 30 Mar 2006 05:39:42 -0000 1.8 @@ -1 +1 @@ -700b8ce377084e317aa9d34a2157428d scribus-1.3.2.tar.bz2 +3d1dc7f13573243569b18239149b4e6c scribus-1.3.3.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 05:46:07 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:46:07 -0700 Subject: kadischi/doc kadischi.1,1.1,NONE kadischi.conf.5,1.1,NONE Message-ID: <200603300546.k2U5k785012477@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12407/kadischi/doc Removed Files: kadischi.1 kadischi.conf.5 Log Message: Organization of man pages, build.conf to kadischi.conf --- kadischi.1 DELETED --- --- kadischi.conf.5 DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 05:46:06 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:46:06 -0700 Subject: kadischi Makefile.am,1.2,1.3 configure.ac,1.3,1.4 Message-ID: <200603300546.k2U5kaLi012491@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12407/kadischi Modified Files: Makefile.am configure.ac Log Message: Organization of man pages, build.conf to kadischi.conf Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.am 17 Mar 2006 22:29:49 -0000 1.2 +++ Makefile.am 30 Mar 2006 05:46:04 -0000 1.3 @@ -12,7 +12,8 @@ post_install_scripts \ rc \ scanswap \ - bootsplash + bootsplash \ + man EXTRA_DIST = \ pycheckrc \ Index: configure.ac =================================================================== RCS file: /cvs/devel/kadischi/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- configure.ac 17 Mar 2006 22:29:49 -0000 1.3 +++ configure.ac 30 Mar 2006 05:46:04 -0000 1.4 @@ -59,4 +59,5 @@ rc/Makefile scanswap/Makefile bootsplash/Makefile +man/Makefile ]) From fedora-extras-commits at redhat.com Thu Mar 30 05:46:07 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:46:07 -0700 Subject: kadischi/conf Makefile.am,1.4,1.5 build.conf,1.3,NONE Message-ID: <200603300546.k2U5kbFl012494@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/conf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12407/kadischi/conf Modified Files: Makefile.am Removed Files: build.conf Log Message: Organization of man pages, build.conf to kadischi.conf Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/conf/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.am 17 Mar 2006 22:29:54 -0000 1.4 +++ Makefile.am 30 Mar 2006 05:46:05 -0000 1.5 @@ -1,8 +1,8 @@ confdir = /etc/kadischi -conf_DATA = build.conf buildstamp +conf_DATA = kadischi.conf buildstamp install-data-hook: - echo INSTALLDIR=$(pkgdatadir) >> $(DESTDIR)$(confdir)/build.conf + echo INSTALLDIR=$(pkgdatadir) >> $(DESTDIR)$(confdir)/kadischi.conf uninstall-hook: rm -rf $(confdir)/*~ --- build.conf DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 05:46:08 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:46:08 -0700 Subject: kadischi/livecd_generator install-boot.sh, 1.3, 1.4 kadischi, 1.1.1.1, 1.2 kadischi.py, 1.6, 1.7 livecd-mkinitrd.sh, 1.5, 1.6 Message-ID: <200603300546.k2U5kcCm012498@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12407/kadischi/livecd_generator Modified Files: install-boot.sh kadischi kadischi.py livecd-mkinitrd.sh Log Message: Organization of man pages, build.conf to kadischi.conf Index: install-boot.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- install-boot.sh 30 Mar 2006 04:29:22 -0000 1.3 +++ install-boot.sh 30 Mar 2006 05:46:06 -0000 1.4 @@ -7,7 +7,7 @@ kernel_version_proper=$(echo $kernel | sed -e 's|xen0||') kernel_params='selinux=0' - . /etc/kadischi/build.conf + . /etc/kadischi/kadischi.conf if [ -x $sysdir/usr/bin/rhgb ]; then kernel_params="$kernel_params rhgb" Index: kadischi =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/kadischi,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- kadischi 21 Aug 2005 17:09:00 -0000 1.1.1.1 +++ kadischi 30 Mar 2006 05:46:06 -0000 1.2 @@ -1,6 +1,6 @@ #!/bin/sh - . /etc/kadischi/build.conf + . /etc/kadischi/kadischi.conf export PYTHONPATH=$INSTALLDIR/lib:$PYTHONPATH -exec python $INSTALLDIR/kadischi.py $@ \ No newline at end of file +exec python $INSTALLDIR/kadischi.py $@ Index: kadischi.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kadischi.py 30 Mar 2006 04:29:22 -0000 1.6 +++ kadischi.py 30 Mar 2006 05:46:06 -0000 1.7 @@ -161,7 +161,7 @@ # Set required filesystem_tools to something appropriate depending on what is chosen if options.filesystem == 'squashfs': filesystem_tools = 'squashfs-tools' -else +else: filesystem_tools = 'zisofs-tools' required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', filesystem_tools) @@ -179,15 +179,15 @@ flc_log ('Looking for config file') -if not os.path.isfile (normalize_path([confdir, 'build.conf'])): - flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'build.conf'])) +if not os.path.isfile (normalize_path([confdir, 'kadischi.conf'])): + flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'kadischi.conf'])) sys.exit (1) # load config file options flc_log ('Loading config file options') -buildconf = shvarFile (normalize_path([confdir, 'build.conf']), True) +buildconf = shvarFile (normalize_path([confdir, 'kadischi.conf']), True) builddir = buildconf ["BUILDDIR"] buildnum = str (int (buildconf ["BUILDNUM"]) + 1) Index: livecd-mkinitrd.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- livecd-mkinitrd.sh 30 Mar 2006 04:29:22 -0000 1.5 +++ livecd-mkinitrd.sh 30 Mar 2006 05:46:06 -0000 1.6 @@ -24,7 +24,7 @@ IMAGESIZE=10000 - . /etc/kadischi/build.conf + . /etc/kadischi/kadischi.conf usage () { echo "usage: `basename $0` [--version] [-v] [-f] [--nocompress]" >&2 From fedora-extras-commits at redhat.com Thu Mar 30 05:46:08 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:46:08 -0700 Subject: kadischi/post_install_scripts 01prelink.sh, 1.1, 1.2 02install.sh, 1.1.1.1, 1.2 Message-ID: <200603300546.k2U5kcDU012502@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12407/kadischi/post_install_scripts Modified Files: 01prelink.sh 02install.sh Log Message: Organization of man pages, build.conf to kadischi.conf Index: 01prelink.sh =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/01prelink.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 01prelink.sh 17 Mar 2006 22:30:05 -0000 1.1 +++ 01prelink.sh 30 Mar 2006 05:46:06 -0000 1.2 @@ -2,7 +2,7 @@ # # chroot to build directory and prelink - . /etc/kadischi/build.conf + . /etc/kadischi/kadischi.conf CHROOTDIR=$BUILDDIR/livecd-build_no$BUILDNUM/system Index: 02install.sh =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/02install.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- 02install.sh 21 Aug 2005 17:09:01 -0000 1.1.1.1 +++ 02install.sh 30 Mar 2006 05:46:06 -0000 1.2 @@ -1,6 +1,6 @@ #!/bin/bash - . /etc/kadischi/build.conf + . /etc/kadischi/kadischi.conf SRCDIR=$INSTALLDIR/install DSTDIR=$1 @@ -16,4 +16,4 @@ inst rc.readonly-livecd etc/rc.d/ inst readonly-halt etc/init.d/ inst readonly-root etc/sysconfig/ -inst scanswap usr/sbin/ \ No newline at end of file +inst scanswap usr/sbin/ From fedora-extras-commits at redhat.com Thu Mar 30 05:51:48 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:51:48 -0700 Subject: kadischi/conf kadischi.conf,NONE,1.1 Message-ID: <200603300551.k2U5pm4D012585@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/conf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12555/kadischi/conf Added Files: kadischi.conf Log Message: conf/kadischi.conf, man/kadischi.1, man/kadischi.conf.5, man/Makefile.am, commit --- NEW FILE kadischi.conf --- # This file contains vars related to livecd build process # BUILDDIR is the directory which will be used for temporary files. # If anaconda says that size of your installation is 1GB, you will # need ~1.5GB of free space on the device # example: BUILDDIR=/tmp BUILDDIR= # this var just counts builds. Every time you run fedora-livecd # it creates a directory (under BUILDDIR) named livecd-build_No($BUILDNUM) BUILDNUM=0 # directory which contains kadischi scripts. Automatically generated during # make install # INSTALLDIR= From fedora-extras-commits at redhat.com Thu Mar 30 05:51:48 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:51:48 -0700 Subject: kadischi/man Makefile.am, NONE, 1.1 kadischi.1, NONE, 1.1 kadischi.conf.5, NONE, 1.1 Message-ID: <200603300551.k2U5pmLq012590@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/man In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12555/kadischi/man Added Files: Makefile.am kadischi.1 kadischi.conf.5 Log Message: conf/kadischi.conf, man/kadischi.1, man/kadischi.conf.5, man/Makefile.am, commit --- NEW FILE Makefile.am --- mandir = /usr/share/man man_DOC = kadischi.1 kadischi.conf.5 install-data-hook: install -m644 kadischi.1 $(DESTDIR)$(mandir)/man1/kadischi.1 install -m644 kadischi.conf.5 $(DESTDIR)$(mandir)/man5/kadischi.conf.5 uninstall-hook: rm -rf $(mandir)/man1/kadischi.1 rm -rf $(mandir)/man5/kadischi.conf.5 --- NEW FILE kadischi.1 --- .\" PROCESS THIS FILE WITH .\" groff -man -Tascii kadischi.1 .\" .TH KADISCHI 1 "MARCH 2006" "Fedora Core Linux" "User Manuals" .SH NAME kadischi - generate a live ISO9660 CDROM image from an RPM repository .SH SYNOPSIS kadischi [--text|--graphical] [--kickstart=] [-C|--cmdline] REPOSITORY [-f] IMAGE .SH DESCRIPTION .B kadischi(1) generates a live ISO9660 CDROM image from an RPM repository tree by invoking anaconda passing it the correct options and installing to the build directory specified. Kadischi will invoke .BR mkzftree(1) and .BR mkisofs(1) to produce an image that can be written to a CD or DVD ROM. .SH OPTIONS .IP --text Run in a textual mode that does not require X. .IP --graphical Run in graphical mode. .IP --kickstart Read from using the installation options provided in the file for the produced ISO9660 image. This option can be used with -C to automate builds. .IP -C Run strictly in command line mode requiring no user input. .IP --cmdline Same as -C .IP -f Overwrite an existing ISO9660 image, if it already exists. .SH FILES .I /etc/kadischi/kadischi.conf .RS The system wide configuration file. See .BR kadischi.conf(5) for more information. .RE .I /etc/kadischi/buildstamp .RS The build-stamp file. Used for stamping a CD. See .BR kadischi.conf(5) for more information. .SH BUGS The module shvarFile is not always imported properly or is not imported sometimes at all, resulting in the build directory needing to be manually cleaned up. .SH AVAILABILITY Kadischi is available via anonymous CVS: .nf export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/devel cvs login cvs -z3 co kadischi .fi .SH AUTHOR .RS Darko Ilic .RS Jasper Hartline .RS Chitlesh Goorah .SH "SEE ALSO" .BR mkzftree(1), .BR mkisofs(1), .BR busybox(1), .BR anaconda(1) --- NEW FILE kadischi.conf.5 --- .\" PROCESS THIS FILE WITH .\" groff -man -Tascii kadischi.conf.5 .\" .TH KADISCHI.CONF 5 "MARCH 2006" "Fedora Core Linux" "File Formats" .SH NAME .B kadischi.conf(5) Configuration file for Kadischi live CD/DVD generator .SH SYNOPSIS .B kadischi.conf(5) is the configuration file for .B kadischi(1) live CD/DVD generation utility. It's syntax is much simpler than many configuration files and has few options currently but may be expanded at any time. .SH FILE FORMAT .B kadischi.conf(5) utilizes configuration options in the form of .IP OPTION=VALUE .SH PARAMETERS .IP BUILDDIR Specifies where .B kadischi(1) will place any of it's build directories. Pretty self explanatory and a common location is /tmp. .IP BUILDNUM This value is incremented after every build with .B kadischi(1). The BUILDNUM will reflect the current build instance in progress, or a previous build. .IP INSTALLDIR This option reflects where .B kadischi(1) is installed on the local system and is set at installation time. .SH AUTHOR .RS Jasper Hartline .RS .SH SEE ALSO .BR kadischi(1) From fedora-extras-commits at redhat.com Thu Mar 30 06:24:17 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:24:17 -0700 Subject: rpms/chmlib/FC-5 chmlib.spec,1.10,1.11 Message-ID: <200603300624.k2U6OJc8014799@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14782 Modified Files: chmlib.spec Log Message: rebuild Index: chmlib.spec =================================================================== RCS file: /cvs/extras/rpms/chmlib/FC-5/chmlib.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- chmlib.spec 29 Mar 2006 12:41:26 -0000 1.10 +++ chmlib.spec 30 Mar 2006 06:24:17 -0000 1.11 @@ -1,7 +1,7 @@ Name: chmlib Summary: Library for dealing with ITSS/CHM format files Version: 0.37.4 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: Development/Libraries Url: http://66.93.236.84/~jedwin/projects/chmlib/ @@ -56,6 +56,9 @@ %changelog +* Thu Mar 30 2006 Peter Lemenkov 0.37.4-6%{?dist} +- rebuild + * Mon Mar 27 2006 Peter Lemenkov 0.37.4-5%{?dist} - rebuild From fedora-extras-commits at redhat.com Thu Mar 30 06:25:56 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:25:56 -0700 Subject: rpms/chmlib/devel chmlib.spec,1.8,1.9 Message-ID: <200603300625.k2U6PwU3014861@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14844 Modified Files: chmlib.spec Log Message: rebuild Index: chmlib.spec =================================================================== RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- chmlib.spec 27 Mar 2006 07:31:56 -0000 1.8 +++ chmlib.spec 30 Mar 2006 06:25:56 -0000 1.9 @@ -1,7 +1,7 @@ Name: chmlib Summary: Library for dealing with ITSS/CHM format files Version: 0.37.4 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: Development/Libraries Url: http://66.93.236.84/~jedwin/projects/chmlib/ @@ -56,6 +56,9 @@ %changelog +* Thu Mar 30 2006 Peter Lemenkov 0.37.4-6%{?dist} +- rebuild + * Mon Mar 27 2006 Peter Lemenkov 0.37.4-5%{?dist} - rebuild From fedora-extras-commits at redhat.com Thu Mar 30 06:28:59 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:28:59 -0700 Subject: rpms/wavpack/FC-5 wavpack.spec,1.1,1.2 Message-ID: <200603300629.k2U6T1ZB014936@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/wavpack/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14905/FC-5 Modified Files: wavpack.spec Log Message: rebuild Index: wavpack.spec =================================================================== RCS file: /cvs/extras/rpms/wavpack/FC-5/wavpack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wavpack.spec 15 Jan 2006 10:52:01 -0000 1.1 +++ wavpack.spec 30 Mar 2006 06:28:58 -0000 1.2 @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.31 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -59,6 +59,10 @@ %doc ChangeLog format.txt README %changelog + +* Thu Mar 30 2006 Peter Lemenkov 4.31-2%{?dist} +- rebuild + * Sat Jan 07 2006 Peter Lemenkov 4.31-1 - Fixed several issues with wavpack.pc.in - Cosmetic fixes. From fedora-extras-commits at redhat.com Thu Mar 30 06:28:59 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:28:59 -0700 Subject: rpms/wavpack/devel wavpack.spec,1.1,1.2 Message-ID: <200603300629.k2U6T1Q8014940@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/wavpack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14905/devel Modified Files: wavpack.spec Log Message: rebuild Index: wavpack.spec =================================================================== RCS file: /cvs/extras/rpms/wavpack/devel/wavpack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wavpack.spec 15 Jan 2006 10:52:01 -0000 1.1 +++ wavpack.spec 30 Mar 2006 06:28:59 -0000 1.2 @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.31 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -59,6 +59,10 @@ %doc ChangeLog format.txt README %changelog + +* Thu Mar 30 2006 Peter Lemenkov 4.31-2%{?dist} +- rebuild + * Sat Jan 07 2006 Peter Lemenkov 4.31-1 - Fixed several issues with wavpack.pc.in - Cosmetic fixes. From fedora-extras-commits at redhat.com Thu Mar 30 06:33:08 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:33:08 -0700 Subject: rpms/fuse/devel fuse.spec,1.7,1.8 Message-ID: <200603300633.k2U6XeVq015057@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15006/devel Modified Files: fuse.spec Log Message: rebuild Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fuse.spec 13 Feb 2006 11:10:34 -0000 1.7 +++ fuse.spec 30 Mar 2006 06:33:08 -0000 1.8 @@ -1,6 +1,6 @@ Name: fuse Version: 2.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -116,6 +116,10 @@ %{_includedir}/fuse %changelog + +* Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} +- rebuild + * Mon Feb 13 2006 Peter Lemenkov - 2.5.2-3 - Proper udev rule From fedora-extras-commits at redhat.com Thu Mar 30 06:33:07 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:33:07 -0700 Subject: rpms/fuse/FC-4 fuse.spec,1.4,1.5 Message-ID: <200603300633.k2U6XdJ5015053@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15006/FC-4 Modified Files: fuse.spec Log Message: rebuild Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fuse.spec 13 Feb 2006 12:23:49 -0000 1.4 +++ fuse.spec 30 Mar 2006 06:33:07 -0000 1.5 @@ -1,6 +1,6 @@ Name: fuse Version: 2.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -116,6 +116,10 @@ %{_includedir}/fuse %changelog + +* Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} +- rebuild + * Mon Feb 13 2006 Peter Lemenkov - 2.5.2-3 - Proper udev rule From fedora-extras-commits at redhat.com Thu Mar 30 06:33:07 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:33:07 -0700 Subject: rpms/fuse/FC-5 fuse.spec,1.7,1.8 Message-ID: <200603300633.k2U6Xdi0015056@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15006/FC-5 Modified Files: fuse.spec Log Message: rebuild Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fuse.spec 13 Feb 2006 11:10:34 -0000 1.7 +++ fuse.spec 30 Mar 2006 06:33:07 -0000 1.8 @@ -1,6 +1,6 @@ Name: fuse Version: 2.5.2 -Release: 3%{?dist} +Release: 4444%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -116,6 +116,10 @@ %{_includedir}/fuse %changelog + +* Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} +- rebuild + * Mon Feb 13 2006 Peter Lemenkov - 2.5.2-3 - Proper udev rule From fedora-extras-commits at redhat.com Thu Mar 30 06:35:10 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:35:10 -0700 Subject: rpms/fuse/FC-5 fuse.spec,1.8,1.9 Message-ID: <200603300635.k2U6ZCie015123@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15106 Modified Files: fuse.spec Log Message: typo fix Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fuse.spec 30 Mar 2006 06:33:07 -0000 1.8 +++ fuse.spec 30 Mar 2006 06:35:09 -0000 1.9 @@ -1,6 +1,6 @@ Name: fuse Version: 2.5.2 -Release: 4444%{?dist} +Release: 4%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -119,6 +119,7 @@ * Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} - rebuild +- typo fix * Mon Feb 13 2006 Peter Lemenkov - 2.5.2-3 - Proper udev rule From fedora-extras-commits at redhat.com Thu Mar 30 06:38:17 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:38:17 -0700 Subject: rpms/stratagus import.log,1.1,1.2 Message-ID: <200603300638.k2U6cnkQ015299@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262 Modified Files: import.log Log Message: auto-import stratagus-2.1-1 on branch devel from stratagus-2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/stratagus/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Mar 2006 07:41:45 -0000 1.1 +++ import.log 30 Mar 2006 06:38:16 -0000 1.2 @@ -0,0 +1 @@ +stratagus-2_1-1:HEAD:stratagus-2.1-1.src.rpm:1143700677 From fedora-extras-commits at redhat.com Thu Mar 30 06:38:17 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:38:17 -0700 Subject: rpms/stratagus/devel stratagus--lp64.diff, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 stratagus.spec, 1.2, 1.3 Message-ID: <200603300638.k2U6cnnq015304@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262/devel Modified Files: .cvsignore sources stratagus.spec Added Files: stratagus--lp64.diff Log Message: auto-import stratagus-2.1-1 on branch devel from stratagus-2.1-1.src.rpm stratagus--lp64.diff: --- NEW FILE stratagus--lp64.diff --- --- src/movie/vp31/FrameIni.c.ORG 2002-07-15 03:43:33.000000000 +0200 +++ src/movie/vp31/FrameIni.c 2005-03-09 11:14:43.484908045 +0100 @@ -275,7 +275,9 @@ * ERRORS : None. * ****************************************************************************/ -#define ROUNDUP32(X) ( ( ( (unsigned long) X ) + 31 )&( 0xFFFFFFE0 ) ) + +// This will also work on LP64 architectures +#define ROUNDUP32(X) ( ( ( (unsigned long) X ) + 31L )&( (unsigned long) -32 ) ) BOOL AllocateFragmentInfo(PB_INSTANCE * pbi) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Mar 2006 07:41:45 -0000 1.1 +++ .cvsignore 30 Mar 2006 06:38:17 -0000 1.2 @@ -0,0 +1 @@ +stratagus-2.1-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Mar 2006 07:41:45 -0000 1.1 +++ sources 30 Mar 2006 06:38:17 -0000 1.2 @@ -0,0 +1 @@ +ff6b2070b66e8847eeed6bedc24ad8bb stratagus-2.1-src.tar.gz Index: stratagus.spec =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stratagus.spec 29 Mar 2006 12:56:16 -0000 1.2 +++ stratagus.spec 30 Mar 2006 06:38:17 -0000 1.3 @@ -6,7 +6,7 @@ Name: stratagus Summary: Real-time strategy gaming engine Version: 2.1 -Release: 2%{?dist} +Release: 1 License: GPL Group: Development/Libraries URL: http://stratagus.sourceforge.net/ @@ -68,9 +68,5 @@ %{_bindir}/stratagus %changelog - -* Wed Mar 29 2006 Peter Lemenkov 2.1-2 -- Added dist-tag - * Sat Nov 19 2005 Peter Lemenkov 2.1-1 - Initial build for FC-Extras From fedora-extras-commits at redhat.com Thu Mar 30 06:56:21 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:56:21 -0700 Subject: rpms/stratagus/devel stratagus.spec,1.3,1.4 Message-ID: <200603300656.k2U6uNVi015658@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15641 Modified Files: stratagus.spec Log Message: added dist-tag Index: stratagus.spec =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stratagus.spec 30 Mar 2006 06:38:17 -0000 1.3 +++ stratagus.spec 30 Mar 2006 06:56:21 -0000 1.4 @@ -6,7 +6,7 @@ Name: stratagus Summary: Real-time strategy gaming engine Version: 2.1 -Release: 1 +Release: 3%{?dist} License: GPL Group: Development/Libraries URL: http://stratagus.sourceforge.net/ @@ -68,5 +68,12 @@ %{_bindir}/stratagus %changelog + +* Thu Mar 30 2006 Peter Lemenkov 2.1-2%{?dist} +- added dist-tag + +* Thu Mar 30 2006 Peter Lemenkov 2.1-2 +- rebuild + * Sat Nov 19 2005 Peter Lemenkov 2.1-1 - Initial build for FC-Extras From fedora-extras-commits at redhat.com Thu Mar 30 07:00:47 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 00:00:47 -0700 Subject: rpms/scim-hangul/FC-4 .cvsignore, 1.3, 1.4 scim-hangul.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200603300700.k2U70nSl015753@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15732 Modified Files: .cvsignore scim-hangul.spec sources Log Message: * Thu Mar 30 2006 Akira TAGOH - 0.2.2-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 Oct 2005 03:43:54 -0000 1.3 +++ .cvsignore 30 Mar 2006 07:00:47 -0000 1.4 @@ -1,2 +1,3 @@ scim-hangul-0.2.0.tar.gz scim-hangul-0.2.1.tar.gz +scim-hangul-0.2.2.tar.gz Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-4/scim-hangul.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-hangul.spec 31 Oct 2005 03:43:54 -0000 1.8 +++ scim-hangul.spec 30 Mar 2006 07:00:47 -0000 1.9 @@ -1,5 +1,5 @@ Name: scim-hangul -Version: 0.2.1 +Version: 0.2.2 Release: 1%{?dist} License: GPL @@ -47,6 +47,9 @@ %changelog +* Thu Mar 30 2006 Akira TAGOH - 0.2.2-1 +- New upstream release. + * Mon Oct 31 2005 Akira TAGOH - 0.2.1-1 - New upstream release. - clean up the spec file - sync from devel. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Oct 2005 03:43:54 -0000 1.3 +++ sources 30 Mar 2006 07:00:47 -0000 1.4 @@ -1 +1 @@ -586dbd1c01d414125e1bb13821c57f93 scim-hangul-0.2.1.tar.gz +de50471ffb5689696215a6eeea24b817 scim-hangul-0.2.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 07:10:48 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 00:10:48 -0700 Subject: rpms/scribus/devel scribus.spec,1.17,1.18 Message-ID: <200603300710.k2U7AotP017834@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/scribus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17817 Modified Files: scribus.spec Log Message: - add BR gnutls-devel Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- scribus.spec 30 Mar 2006 05:39:42 -0000 1.17 +++ scribus.spec 30 Mar 2006 07:10:48 -0000 1.18 @@ -26,6 +26,7 @@ BuildRequires: qt-devel >= 1:3.3 BuildRequires: zlib-devel BuildRequires: freetype-devel +BuildRequires: gnutls-devel Requires: ghostscript >= 7.07 Requires: python >= 2.3 Requires: python-imaging @@ -139,6 +140,7 @@ * Tue Mar 28 2006 Andreas Bierfert 1.3.3-1 - version upgrade +- add BR gnutls-devel * Sat Mar 18 2006 Andreas Bierfert 1.3.2-1 From fedora-extras-commits at redhat.com Thu Mar 30 07:31:35 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 00:31:35 -0700 Subject: rpms/scim-hangul/FC-4 scim-hangul.spec,1.9,1.10 Message-ID: <200603300731.k2U7VbGT018021@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18004 Modified Files: scim-hangul.spec Log Message: moved all plugins under the versioned directory. Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-4/scim-hangul.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim-hangul.spec 30 Mar 2006 07:00:47 -0000 1.9 +++ scim-hangul.spec 30 Mar 2006 07:31:35 -0000 1.10 @@ -1,6 +1,6 @@ Name: scim-hangul Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.scim-im.org/ @@ -29,7 +29,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/hangul*.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/hangul*.la %find_lang %{name} @@ -41,14 +41,15 @@ %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING README ChangeLog -%{_libdir}/scim-1.0/IMEngine/hangul.* -%{_libdir}/scim-1.0/SetupUI/hangul-imengine-setup.* +%{_libdir}/scim-1.0/*/IMEngine/hangul.so +%{_libdir}/scim-1.0/*/SetupUI/hangul-imengine-setup.so %{_datadir}/scim/icons/scim-hangul.png %changelog -* Thu Mar 30 2006 Akira TAGOH - 0.2.2-1 +* Thu Mar 30 2006 Akira TAGOH - 0.2.2-2 - New upstream release. +- moved all plugins under the versioned directory. * Mon Oct 31 2005 Akira TAGOH - 0.2.1-1 - New upstream release. From fedora-extras-commits at redhat.com Thu Mar 30 07:35:42 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:35:42 -0700 Subject: rpms/fuse-sshfs/FC-4 .cvsignore, 1.3, 1.4 fuse-sshfs.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603300735.k2U7ZiGR018222@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18160/FC-4 Modified Files: .cvsignore fuse-sshfs.spec sources Log Message: Version 1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 12:14:49 -0000 1.3 +++ .cvsignore 30 Mar 2006 07:35:42 -0000 1.4 @@ -1 +1 @@ -sshfs-fuse-1.4.tar.gz +sshfs-fuse-1.6.tar.gz Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/fuse-sshfs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fuse-sshfs.spec 13 Feb 2006 12:14:49 -0000 1.4 +++ fuse-sshfs.spec 30 Mar 2006 07:35:42 -0000 1.5 @@ -1,6 +1,6 @@ Name: fuse-sshfs -Version: 1.4 -Release: 2%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH Group: System Environment/Base @@ -39,6 +39,10 @@ %{_bindir}/sshfs %changelog + +* Thu Mar 30 2006 Peter Lemenkov - 1.6-1 +- Version 1.6 + * Mon Feb 13 2006 Peter Lemenkov - 1.4-2 - small cosmetic fixes Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 12:14:49 -0000 1.3 +++ sources 30 Mar 2006 07:35:42 -0000 1.4 @@ -1 +1 @@ -3777dd6f232d33c9110abfa5ecd5518e sshfs-fuse-1.4.tar.gz +04fa75c1357bea362537efe15805e7da sshfs-fuse-1.6.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 07:35:43 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:35:43 -0700 Subject: rpms/fuse-sshfs/devel .cvsignore, 1.3, 1.4 fuse-sshfs.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603300735.k2U7Zj80018229@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18160/devel Modified Files: .cvsignore fuse-sshfs.spec sources Log Message: Version 1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 11:26:54 -0000 1.3 +++ .cvsignore 30 Mar 2006 07:35:43 -0000 1.4 @@ -1 +1 @@ -sshfs-fuse-1.4.tar.gz +sshfs-fuse-1.6.tar.gz Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/devel/fuse-sshfs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fuse-sshfs.spec 13 Feb 2006 12:16:17 -0000 1.4 +++ fuse-sshfs.spec 30 Mar 2006 07:35:43 -0000 1.5 @@ -1,6 +1,6 @@ Name: fuse-sshfs -Version: 1.4 -Release: 2%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH Group: System Environment/Base @@ -39,6 +39,10 @@ %{_bindir}/sshfs %changelog + +* Thu Mar 30 2006 Peter Lemenkov - 1.6-1 +- Version 1.6 + * Mon Feb 13 2006 Peter Lemenkov - 1.4-2 - small cosmetic fixes Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 11:26:54 -0000 1.3 +++ sources 30 Mar 2006 07:35:43 -0000 1.4 @@ -1 +1 @@ -3777dd6f232d33c9110abfa5ecd5518e sshfs-fuse-1.4.tar.gz +04fa75c1357bea362537efe15805e7da sshfs-fuse-1.6.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 07:46:40 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:46:40 -0700 Subject: rpms/fuse-encfs/FC-5 .cvsignore, 1.2, 1.3 fuse-encfs.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603300746.k2U7kg9Q019801@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19727/FC-5 Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Dec 2005 08:23:58 -0000 1.2 +++ .cvsignore 30 Mar 2006 07:46:40 -0000 1.3 @@ -1 +1,2 @@ -encfs-1.2.5-1.tgz +encfs-1.3.0-1.tgz +encfs-1.3.0-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/fuse-encfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fuse-encfs.spec 17 Dec 2005 08:31:41 -0000 1.2 +++ fuse-encfs.spec 30 Mar 2006 07:46:40 -0000 1.3 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.2.5 +Version: 1.3.0 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -46,6 +46,10 @@ %{_mandir}/man1/* %changelog + +* Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} +- Version 1.3.0 + * Fri Dec 16 2005 Peter Lemenkov 1.2.5-1 - Initial build for FE Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Dec 2005 08:23:58 -0000 1.2 +++ sources 30 Mar 2006 07:46:40 -0000 1.3 @@ -1 +1,2 @@ -f2d92d1f8e82f72cd0dd4cf9eea736c6 encfs-1.2.5-1.tgz +6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz +62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc From fedora-extras-commits at redhat.com Thu Mar 30 07:46:41 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:46:41 -0700 Subject: rpms/fuse-encfs/devel .cvsignore, 1.2, 1.3 fuse-encfs.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603300746.k2U7khSJ019809@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19727/devel Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Dec 2005 08:23:58 -0000 1.2 +++ .cvsignore 30 Mar 2006 07:46:41 -0000 1.3 @@ -1 +1,2 @@ -encfs-1.2.5-1.tgz +encfs-1.3.0-1.tgz +encfs-1.3.0-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/fuse-encfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fuse-encfs.spec 17 Dec 2005 08:31:41 -0000 1.2 +++ fuse-encfs.spec 30 Mar 2006 07:46:41 -0000 1.3 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.2.5 +Version: 1.3.0 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -46,6 +46,10 @@ %{_mandir}/man1/* %changelog + +* Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} +- Version 1.3.0 + * Fri Dec 16 2005 Peter Lemenkov 1.2.5-1 - Initial build for FE Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Dec 2005 08:23:58 -0000 1.2 +++ sources 30 Mar 2006 07:46:41 -0000 1.3 @@ -1 +1,2 @@ -f2d92d1f8e82f72cd0dd4cf9eea736c6 encfs-1.2.5-1.tgz +6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz +62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc From fedora-extras-commits at redhat.com Thu Mar 30 07:46:39 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:46:39 -0700 Subject: rpms/fuse-encfs/FC-4 .cvsignore, 1.2, 1.3 fuse-encfs.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603300747.k2U7lBfO019850@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19727/FC-4 Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Dec 2005 08:23:58 -0000 1.2 +++ .cvsignore 30 Mar 2006 07:46:39 -0000 1.3 @@ -1 +1,2 @@ -encfs-1.2.5-1.tgz +encfs-1.3.0-1.tgz +encfs-1.3.0-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/fuse-encfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fuse-encfs.spec 17 Dec 2005 08:31:41 -0000 1.2 +++ fuse-encfs.spec 30 Mar 2006 07:46:39 -0000 1.3 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.2.5 +Version: 1.3.0 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -46,6 +46,10 @@ %{_mandir}/man1/* %changelog + +* Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} +- Version 1.3.0 + * Fri Dec 16 2005 Peter Lemenkov 1.2.5-1 - Initial build for FE Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Dec 2005 08:23:58 -0000 1.2 +++ sources 30 Mar 2006 07:46:39 -0000 1.3 @@ -1 +1,2 @@ -f2d92d1f8e82f72cd0dd4cf9eea736c6 encfs-1.2.5-1.tgz +6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz +62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc From fedora-extras-commits at redhat.com Thu Mar 30 07:53:54 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:53:54 -0700 Subject: rpms/fuse-sshfs/FC-4 fuse-sshfs.spec,1.5,1.6 Message-ID: <200603300753.k2U7ruDh020772@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20714 Modified Files: fuse-sshfs.spec Log Message: Added missing sshnodelay.so Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/fuse-sshfs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fuse-sshfs.spec 30 Mar 2006 07:35:42 -0000 1.5 +++ fuse-sshfs.spec 30 Mar 2006 07:53:54 -0000 1.6 @@ -1,6 +1,6 @@ Name: fuse-sshfs Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH Group: System Environment/Base @@ -37,9 +37,13 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/sshfs +%{_libdir}/sshnodelay.so %changelog +* Thu Mar 30 2006 Peter Lemenkov - 1.6-2 +- added missing sshnodelay.so + * Thu Mar 30 2006 Peter Lemenkov - 1.6-1 - Version 1.6 From fedora-extras-commits at redhat.com Thu Mar 30 07:54:18 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:54:18 -0700 Subject: rpms/fuse-sshfs/devel fuse-sshfs.spec,1.5,1.6 Message-ID: <200603300754.k2U7sKxM020850@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20800 Modified Files: fuse-sshfs.spec Log Message: Added missing sshnodelay.so Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/devel/fuse-sshfs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fuse-sshfs.spec 30 Mar 2006 07:35:43 -0000 1.5 +++ fuse-sshfs.spec 30 Mar 2006 07:54:18 -0000 1.6 @@ -1,6 +1,6 @@ Name: fuse-sshfs Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH Group: System Environment/Base @@ -37,9 +37,13 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/sshfs +%{_libdir}/sshnodelay.so %changelog +* Thu Mar 30 2006 Peter Lemenkov - 1.6-2 +- added missing sshnodelay.so + * Thu Mar 30 2006 Peter Lemenkov - 1.6-1 - Version 1.6 From fedora-extras-commits at redhat.com Thu Mar 30 09:29:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 02:29:33 -0700 Subject: rpms/sweep/devel sweep.spec,1.1,1.2 Message-ID: <200603300929.k2U9TZZr025957@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/sweep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25940 Modified Files: sweep.spec Log Message: Index: sweep.spec =================================================================== RCS file: /cvs/extras/rpms/sweep/devel/sweep.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sweep.spec 27 Mar 2006 11:24:06 -0000 1.1 +++ sweep.spec 30 Mar 2006 09:29:33 -0000 1.2 @@ -1,6 +1,6 @@ Name: sweep Version: 0.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An audio editor and live playback tool Group: Applications/Multimedia From fedora-extras-commits at redhat.com Thu Mar 30 10:03:24 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Thu, 30 Mar 2006 03:03:24 -0700 Subject: rpms/yumex/FC-5 sources,1.22,1.23 yumex.spec,1.23,1.24 Message-ID: <200603301003.k2UA3QCe028093@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28058/FC-5 Modified Files: sources yumex.spec Log Message: Release 0.99.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 22 Mar 2006 09:30:17 -0000 1.22 +++ sources 30 Mar 2006 10:03:23 -0000 1.23 @@ -1 +1 @@ -75aade2fc07e8672d61b0f553f37ab0d yumex-0.99.14.tar.gz +e47a2d9b14bbe8b488f2890af2df7bc8 yumex-0.99.15.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- yumex.spec 22 Mar 2006 09:30:17 -0000 1.23 +++ yumex.spec 30 Mar 2006 10:03:23 -0000 1.24 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.14 +Version: 0.99.15 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Mar 22 2006 Tim Lauridsen - 0.99.15-1.0 +- Development Release 0.99.15-1.0 * Mon Mar 20 2006 Tim Lauridsen - 0.99.14-1.0 - Development Release 0.99.14-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 From fedora-extras-commits at redhat.com Thu Mar 30 10:03:24 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Thu, 30 Mar 2006 03:03:24 -0700 Subject: rpms/yumex/devel .cvsignore, 1.18, 1.19 sources, 1.22, 1.23 yumex.spec, 1.23, 1.24 Message-ID: <200603301003.k2UA3QDE028099@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28058/devel Modified Files: .cvsignore sources yumex.spec Log Message: Release 0.99.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 20 Mar 2006 12:32:30 -0000 1.18 +++ .cvsignore 30 Mar 2006 10:03:24 -0000 1.19 @@ -1 +1 @@ -yumex-0.99.13.tar.gz +yumex-0.99.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 22 Mar 2006 09:30:25 -0000 1.22 +++ sources 30 Mar 2006 10:03:24 -0000 1.23 @@ -1 +1 @@ -75aade2fc07e8672d61b0f553f37ab0d yumex-0.99.14.tar.gz +e47a2d9b14bbe8b488f2890af2df7bc8 yumex-0.99.15.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- yumex.spec 22 Mar 2006 09:30:25 -0000 1.23 +++ yumex.spec 30 Mar 2006 10:03:24 -0000 1.24 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.14 +Version: 0.99.15 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Mar 22 2006 Tim Lauridsen - 0.99.15-1.0 +- Development Release 0.99.15-1.0 * Mon Mar 20 2006 Tim Lauridsen - 0.99.14-1.0 - Development Release 0.99.14-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 From fedora-extras-commits at redhat.com Thu Mar 30 10:13:14 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Thu, 30 Mar 2006 03:13:14 -0700 Subject: kadischi/linuxrc livecd-linuxrc,1.2,1.3 Message-ID: <200603301013.k2UADEJw028232@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/linuxrc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28215/kadischi/linuxrc Modified Files: livecd-linuxrc Log Message: Correction of invalid use of bind argument to busybox.anaconda (livecd-linuxrc) Index: livecd-linuxrc =================================================================== RCS file: /cvs/devel/kadischi/linuxrc/livecd-linuxrc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- livecd-linuxrc 30 Mar 2006 04:29:21 -0000 1.2 +++ livecd-linuxrc 30 Mar 2006 10:13:12 -0000 1.3 @@ -24,7 +24,7 @@ modprobe squashfs mount -t squashfs -o loop /cdrom/kadischi.sqsh /sysroot else - mount --bind /cdrom /sysroot + mount -o bind /cdrom /sysroot fi echo "Doing the pivot_root" From fedora-extras-commits at redhat.com Thu Mar 30 10:13:24 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 03:13:24 -0700 Subject: rpms/php-extras/devel php-extras.spec,1.1,1.2 Message-ID: <200603301013.k2UADQaQ028255@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28238 Modified Files: php-extras.spec Log Message: Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/php-extras.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-extras.spec 25 Mar 2006 18:13:47 -0000 1.1 +++ php-extras.spec 30 Mar 2006 10:13:23 -0000 1.2 @@ -251,6 +251,10 @@ %changelog +* Sat Mar 25 2006 Dmitry Butskoy - 5.1.2-2 +- Accepted for Fedora Extras + (review by Tom "spot" Callaway ) + * Wed Mar 1 2006 Dmitry Butskoy - 5.1.2-2 - more accurate Requires for the main php (using php-api, provided now by the Core php package). From fedora-extras-commits at redhat.com Thu Mar 30 10:14:04 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 03:14:04 -0700 Subject: rpms/php-extras/FC-5 php-extras.spec,1.1,1.2 Message-ID: <200603301014.k2UAE6vp028279@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28261 Modified Files: php-extras.spec Log Message: Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/FC-5/php-extras.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-extras.spec 25 Mar 2006 18:13:47 -0000 1.1 +++ php-extras.spec 30 Mar 2006 10:14:04 -0000 1.2 @@ -251,6 +251,10 @@ %changelog +* Sat Mar 25 2006 Dmitry Butskoy - 5.1.2-2 +- Accepted for Fedora Extras + (review by Tom "spot" Callaway ) + * Wed Mar 1 2006 Dmitry Butskoy - 5.1.2-2 - more accurate Requires for the main php (using php-api, provided now by the Core php package). From fedora-extras-commits at redhat.com Thu Mar 30 10:19:21 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 03:19:21 -0700 Subject: rpms/php-extras/FC-4 php-extras-4.3.11-readline.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 php-extras.spec, 1.1, 1.2 sources, 1.2, 1.3 php-extras-5.1.2-readline.patch, 1.1, NONE Message-ID: <200603301019.k2UAJN06028401@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28377 Modified Files: .cvsignore php-extras.spec sources Added Files: php-extras-4.3.11-readline.patch Removed Files: php-extras-5.1.2-readline.patch Log Message: php-extras-4.3.11-readline.patch: --- NEW FILE php-extras-4.3.11-readline.patch --- diff -Nrbu php-4.3.11/ext/readline/config.m4 php-4.3.11-OK/ext/readline/config.m4 --- php-4.3.11/ext/readline/config.m4 2003-10-01 06:54:04.000000000 +0400 +++ php-4.3.11-OK/ext/readline/config.m4 2005-10-17 19:25:13.000000000 +0400 @@ -22,10 +22,12 @@ AC_CHECK_LIB(ncurses, tgetent, [ PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY(ncurses,,LIBS) ],[ AC_CHECK_LIB(termcap, tgetent, [ PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY(termcap,,LIBS) ]) ]) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-extras/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Mar 2006 18:13:47 -0000 1.2 +++ .cvsignore 30 Mar 2006 10:19:21 -0000 1.3 @@ -1 +1 @@ -php-5.1.2.tar.gz +php-5.0.4.tar.gz Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/FC-4/php-extras.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-extras.spec 25 Mar 2006 18:13:47 -0000 1.1 +++ php-extras.spec 30 Mar 2006 10:19:21 -0000 1.2 @@ -1,28 +1,29 @@ -# FC5: dbase, readline, recode, mcrypt, mhash, tidy, mssql +# FC4: dbase, fam, readline, recode, mcrypt, mhash, sqlite, tidy, mssql %define def() %%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}} %{expand:%def dbase} +# fam %{expand:%def readline} # recode %{expand:%def mcrypt} %{expand:%def mhash} +# sqlite %{expand:%def tidy} # mssql -%define list %{?_with_dbase:dbase} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql} +%define list %{?_with_dbase:dbase} %{?_with_fam:fam} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_sqlite:sqlite} %{?_with_tidy:tidy} %{?_with_mssql:mssql} %define extdir %(php-config --extension-dir) -%define apiver %(echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) Name: php-extras Summary: Additional PHP modules from the standard PHP distribution #Version: %(php-config --version) -Version: 5.1.2 -Release: 2%{?dist} +Version: 5.0.4 +Release: 3%{?dist} Group: Development/Languages License: The PHP License URL: http://www.php.net/ @@ -30,7 +31,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel = %{version} -Patch1: php-extras-5.1.2-readline.patch +Requires: php = %{version} +Patch1: php-extras-4.3.11-readline.patch %description @@ -43,16 +45,26 @@ %package -n php-dbase Summary: Standard dBase module for PHP applications Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %description -n php-dbase Standard dBase module for PHP applications +%package -n php-fam +Summary: Standard PHP module provides FAM support +Group: Development/Languages +Requires: php = %{version} +%{?_with_fam:BuildRequires: gamin-devel} + +%description -n php-fam +Standard PHP module provides FAM support + + %package -n php-readline Summary: Standard PHP module provides readline library support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_readline:BuildRequires: readline-devel} %description -n php-readline @@ -62,7 +74,7 @@ %package -n php-recode Summary: Standard PHP module provides GNU recode support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_recode:BuildRequires: recode-devel} %description -n php-recode @@ -72,7 +84,7 @@ %package -n php-mcrypt Summary: Standard PHP module provides mcrypt library support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_mcrypt:BuildRequires: libmcrypt-devel} %description -n php-mcrypt @@ -82,17 +94,27 @@ %package -n php-mhash Summary: Standard PHP module provides mhash support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_mhash:BuildRequires: mhash-devel} %description -n php-mhash Standard PHP module provides mhash support +%package -n php-sqlite +Summary: Standard PHP module provides sqlite support +Group: Development/Languages +Requires: php = %{version} +#%%{?_with_sqlite:BuildRequires: sqlite-devel} + +%description -n php-sqlite +Standard PHP module provides sqlite support + + %package -n php-tidy Summary: Standard PHP module provides tidy library support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_tidy:BuildRequires: libtidy-devel} %description -n php-tidy @@ -102,7 +124,7 @@ %package -n php-mssql Summary: Standard PHP module provides mssql support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_mssql:BuildRequires: freetds-devel} %description -n php-mssql @@ -130,7 +152,7 @@ # cause libtool to avoid passing -rpath when linking # (this hack is well-known as "libtool rpath workaround") sed -i 's|^hardcode_libdir_flag_spec|hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "|' libtool - + make %{?_smp_mflags} popd @@ -241,29 +263,26 @@ #%%files %define fil() %%{?_with_%1:%%files -n php-%1 -f files.%1} %{expand:%fil dbase} +%{expand:%fil fam} %{expand:%fil readline} %{expand:%fil recode} %{expand:%fil mcrypt} %{expand:%fil mhash} +%{expand:%fil sqlite} %{expand:%fil tidy} %{expand:%fil mssql} %changelog -* Wed Mar 1 2006 Dmitry Butskoy - 5.1.2-2 -- more accurate Requires for the main php - (using php-api, provided now by the Core php package). - -* Tue Feb 28 2006 Dmitry Butskoy - 5.1.2-1 -- update to 5.1.2 -- replace readline patch (old issue go away and a new appears). +* Tue Feb 28 2006 Dmitry Butskoy - 5.0.4-3 - apply well-known "libtool-rpath-workaround" (see in Internet ;-)) to avoid use -rpath for linking -* Sat Dec 17 2005 Dmitry Butskoy - 5.1.1-1 -- upgrade to 5.1.1 for FC5 -- drop now missed "fam" and obsolete "sqlite" (sqlite2) modules +* Sat Dec 17 2005 Dmitry Butskoy - 5.0.4-2 +- don't build "fam" and "sqlite" by default. + ("fam" will disappear in php >= 5.1, bundled "sqlite" is sqlite 2.x, + but php >= 5.1 use system's sqlite >= 3.0.0) * Mon Nov 14 2005 Dmitry Butskoy - 5.0.4-1 - spec file cleanups Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-extras/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Mar 2006 18:13:47 -0000 1.2 +++ sources 30 Mar 2006 10:19:21 -0000 1.3 @@ -1 +1 @@ -b5b6564e8c6a0d5bc1d2b4787480d792 php-5.1.2.tar.gz +8edf259bcfab4cfc890a4bb4e7c3649f php-5.0.4.tar.gz --- php-extras-5.1.2-readline.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 10:21:01 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 03:21:01 -0700 Subject: rpms/scim-anthy/FC-4 .cvsignore, 1.9, 1.10 scim-anthy.spec, 1.24, 1.25 sources, 1.11, 1.12 Message-ID: <200603301021.k2UAL3EH028500@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28479 Modified Files: .cvsignore scim-anthy.spec sources Log Message: * Thu Mar 30 2006 Akira TAGOH - 1.0.0-1 - New upstream release. - can input numerals when the candidate window doesn't appear. (#185934) - add an UI for the symbol style. (#178400) - scim-anthy-helper-moduledir.patch: backported from devel to tweak the helper module install dir since scim.pc now returns moduledir with api-version. - remove anthy-imengine-helper.la. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 30 Jan 2006 10:16:07 -0000 1.9 +++ .cvsignore 30 Mar 2006 10:21:01 -0000 1.10 @@ -2,3 +2,5 @@ scim-anthy-0.7.1.tar.gz scim-anthy-0.8.0.tar.gz scim-anthy-0.9.0.tar.gz +*.rpm +scim-anthy-1.0.0.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- scim-anthy.spec 30 Jan 2006 10:16:07 -0000 1.24 +++ scim-anthy.spec 30 Mar 2006 10:21:01 -0000 1.25 @@ -1,5 +1,5 @@ Name: scim-anthy -Version: 0.9.0 +Version: 1.0.0 Release: 1%{?dist} License: GPL @@ -7,7 +7,8 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: scim-devel -BuildRequires: anthy-devel >= 6700b-1 +BuildRequires: anthy-devel >= 6700b-1 gettext-devel +Patch1: scim-anthy-helper-moduledir.patch Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -18,6 +19,11 @@ %prep %setup -q +%patch1 -p1 -b .1-moduledir +# patch1 touches src/Makefile.am +aclocal +automake +autoconf %build @@ -29,7 +35,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*/*.la %find_lang %{name} @@ -41,11 +47,21 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO -%{_libdir}/scim-1.0 +%{_libdir}/scim-1.0/*/Helper/anthy-imengine-helper.so +%{_libdir}/scim-1.0/*/IMEngine/anthy.so +%{_libdir}/scim-1.0/*/SetupUI/anthy-imengine-setup.so %{_datadir}/scim %changelog +* Thu Mar 30 2006 Akira TAGOH - 1.0.0-1 +- New upstream release. + - can input numerals when the candidate window doesn't appear. (#185934) + - add an UI for the symbol style. (#178400) +- scim-anthy-helper-moduledir.patch: backported from devel to tweak the helper + module install dir since scim.pc now returns moduledir with api-version. +- remove anthy-imengine-helper.la. + * Mon Jan 30 2006 Akira TAGOH - 0.9.0-1 - New upstream release. - scim-anthy-wide-latin.diff: removed. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 30 Jan 2006 10:16:07 -0000 1.11 +++ sources 30 Mar 2006 10:21:01 -0000 1.12 @@ -1 +1 @@ -5e4742d011cdbf3554cc276f74a11ea9 scim-anthy-0.9.0.tar.gz +b0c452da1886ba36f47d9bd9f6ea7a10 scim-anthy-1.0.0.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 10:22:26 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 30 Mar 2006 03:22:26 -0700 Subject: rpms/grip/FC-5 grip-3.2.0-default.patch, 1.1, 1.2 grip.spec, 1.11, 1.12 Message-ID: <200603301022.k2UAMSxc028577@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28554 Modified Files: grip-3.2.0-default.patch grip.spec Log Message: * Mon Feb 13 2006 Adrian Reber - 1:3.2.0-11 - changed grip-3.2.0-default.patch to fix #187023 grip-3.2.0-default.patch: Index: grip-3.2.0-default.patch =================================================================== RCS file: /cvs/extras/rpms/grip/FC-5/grip-3.2.0-default.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grip-3.2.0-default.patch 2 Mar 2005 08:48:40 -0000 1.1 +++ grip-3.2.0-default.patch 30 Mar 2006 10:22:26 -0000 1.2 @@ -23,6 +23,15 @@ {"",""} --- grip-3.2.0/src/grip.c.rh-default-encoder 2004-04-15 20:23:54.000000000 +0200 +++ grip-3.2.0/src/grip.c 2004-06-20 01:51:47.994840760 +0200 +@@ -515,7 +515,7 @@ + GtkWidget *logo; + GtkWidget *ebox; + GtkWidget *button; +- char versionbuf[20]; ++ char versionbuf[22]; + + aboutpage=MakeNewPage(uinfo->notebook,_("About")); + @@ -832,7 +832,7 @@ ginfo->using_builtin_cdp=FALSE; #endif Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/FC-5/grip.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- grip.spec 13 Feb 2006 21:05:19 -0000 1.11 +++ grip.spec 30 Mar 2006 10:22:26 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -72,6 +72,9 @@ %{_mandir}/man1/* %changelog +* Mon Feb 13 2006 Adrian Reber - 1:3.2.0-11 +- changed grip-3.2.0-default.patch to fix #187023 + * Mon Feb 13 2006 Adrian Reber - 1:3.2.0-10 - rebuilt From fedora-extras-commits at redhat.com Thu Mar 30 10:23:21 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 03:23:21 -0700 Subject: rpms/scim-anthy/FC-4 scim-anthy-helper-moduledir.patch,NONE,1.1 Message-ID: <200603301023.k2UANNNq028648@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28630 Added Files: scim-anthy-helper-moduledir.patch Log Message: add scim-anthy-helper-moduledir.patch: --- NEW FILE scim-anthy-helper-moduledir.patch --- --- scim-anthy-0.9.0/src/Makefile.am~ 2006-01-28 11:05:42.000000000 +0900 +++ scim-anthy-0.9.0/src/Makefile.am 2006-02-09 16:19:59.000000000 +0900 @@ -125,7 +125,7 @@ if SCIM_BUILD_HELPER HELPER_MODULE = anthy-imengine-helper.la endif -helpermoduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +helpermoduledir = @SCIM_MODULEDIR@/Helper helpermodule_LTLIBRARIES = $(HELPER_MODULE) anthy_imengine_helper_la_SOURCES = scim_anthy_helper.cpp From fedora-extras-commits at redhat.com Thu Mar 30 11:00:33 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 04:00:33 -0700 Subject: rpms/dosbox/FC-5 .cvsignore, 1.3, 1.4 dosbox.spec, 1.17, 1.18 sources, 1.3, 1.4 dosbox-64bit-gcc4.1.patch, 1.1, NONE dosbox-gcc4.1.patch, 1.1, NONE dosbox-x86-64-build.patch, 1.4, NONE Message-ID: <200603301100.k2UB0ZEN028844@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dosbox/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28765/FC-5 Modified Files: .cvsignore dosbox.spec sources Removed Files: dosbox-64bit-gcc4.1.patch dosbox-gcc4.1.patch dosbox-x86-64-build.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:56:55 -0000 1.3 +++ .cvsignore 30 Mar 2006 11:00:33 -0000 1.4 @@ -1 +1 @@ -dosbox-0.63.tar.gz +dosbox-0.65.tar.gz Index: dosbox.spec =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-5/dosbox.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dosbox.spec 14 Feb 2006 08:43:05 -0000 1.17 +++ dosbox.spec 30 Mar 2006 11:00:33 -0000 1.18 @@ -1,6 +1,6 @@ Name: dosbox -Version: 0.63 -Release: 9%{?dist} +Version: 0.65 +Release: 1%{?dist} Summary: x86/DOS emulator with sound and graphics @@ -10,14 +10,13 @@ Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: dosbox.desktop Source2: dosbox.png -# See upstream bug 1414547 -Patch0: dosbox-64bit-gcc4.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libpng-devel BuildRequires: SDL-devel BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel +BuildRequireS: libGLU-devel %description @@ -33,7 +32,6 @@ %prep %setup -q -%patch0 -p1 %build %configure --enable-shots @@ -72,6 +70,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +0.65-1 +- version upgrade + * Tue Feb 14 2006 Andreas Bierfert 0.63-9 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:56:55 -0000 1.3 +++ sources 30 Mar 2006 11:00:33 -0000 1.4 @@ -1 +1 @@ -629413e41224ae9cdd115fdafd55cbdc dosbox-0.63.tar.gz +fef84c292c3aeae747368b9875c1575a dosbox-0.65.tar.gz --- dosbox-64bit-gcc4.1.patch DELETED --- --- dosbox-gcc4.1.patch DELETED --- --- dosbox-x86-64-build.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 11:00:34 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 04:00:34 -0700 Subject: rpms/dosbox/devel .cvsignore, 1.3, 1.4 dosbox.spec, 1.17, 1.18 sources, 1.3, 1.4 dosbox-64bit-gcc4.1.patch, 1.1, NONE dosbox-gcc4.1.patch, 1.1, NONE dosbox-x86-64-build.patch, 1.4, NONE Message-ID: <200603301100.k2UB0aHi028850@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dosbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28765/devel Modified Files: .cvsignore dosbox.spec sources Removed Files: dosbox-64bit-gcc4.1.patch dosbox-gcc4.1.patch dosbox-x86-64-build.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dosbox/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:56:55 -0000 1.3 +++ .cvsignore 30 Mar 2006 11:00:34 -0000 1.4 @@ -1 +1 @@ -dosbox-0.63.tar.gz +dosbox-0.65.tar.gz Index: dosbox.spec =================================================================== RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dosbox.spec 14 Feb 2006 08:43:05 -0000 1.17 +++ dosbox.spec 30 Mar 2006 11:00:34 -0000 1.18 @@ -1,6 +1,6 @@ Name: dosbox -Version: 0.63 -Release: 9%{?dist} +Version: 0.65 +Release: 1%{?dist} Summary: x86/DOS emulator with sound and graphics @@ -10,14 +10,13 @@ Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: dosbox.desktop Source2: dosbox.png -# See upstream bug 1414547 -Patch0: dosbox-64bit-gcc4.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libpng-devel BuildRequires: SDL-devel BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel +BuildRequireS: libGLU-devel %description @@ -33,7 +32,6 @@ %prep %setup -q -%patch0 -p1 %build %configure --enable-shots @@ -72,6 +70,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +0.65-1 +- version upgrade + * Tue Feb 14 2006 Andreas Bierfert 0.63-9 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dosbox/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:56:55 -0000 1.3 +++ sources 30 Mar 2006 11:00:34 -0000 1.4 @@ -1 +1 @@ -629413e41224ae9cdd115fdafd55cbdc dosbox-0.63.tar.gz +fef84c292c3aeae747368b9875c1575a dosbox-0.65.tar.gz --- dosbox-64bit-gcc4.1.patch DELETED --- --- dosbox-gcc4.1.patch DELETED --- --- dosbox-x86-64-build.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 11:00:27 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 04:00:27 -0700 Subject: rpms/dosbox/FC-3 .cvsignore, 1.3, 1.4 dosbox.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200603301100.k2UB0xh3028856@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dosbox/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28765/FC-3 Modified Files: .cvsignore dosbox.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:56:55 -0000 1.3 +++ .cvsignore 30 Mar 2006 11:00:27 -0000 1.4 @@ -1 +1 @@ -dosbox-0.63.tar.gz +dosbox-0.65.tar.gz Index: dosbox.spec =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-3/dosbox.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dosbox.spec 13 Feb 2005 11:56:55 -0000 1.6 +++ dosbox.spec 30 Mar 2006 11:00:27 -0000 1.7 @@ -1,5 +1,5 @@ Name: dosbox -Version: 0.63 +Version: 0.65 Release: 1 Epoch: 0 Summary: An x86/DOS emulator with sound/graphics @@ -16,6 +16,7 @@ BuildRequires: SDL-devel BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel +BuildRequires: xorg-x11-devel %description @@ -66,6 +67,10 @@ %{_datadir}/pixmaps/dosbox.png %changelog +* Thu Mar 30 2006 Andreas Bierfert +0:0.65-1 +- version upgrade + * Thu Nov 25 2004 Andreas Bierfert 0:0.63-1 - new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:56:55 -0000 1.3 +++ sources 30 Mar 2006 11:00:27 -0000 1.4 @@ -1 +1 @@ -629413e41224ae9cdd115fdafd55cbdc dosbox-0.63.tar.gz +fef84c292c3aeae747368b9875c1575a dosbox-0.65.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 11:00:28 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 04:00:28 -0700 Subject: rpms/dosbox/FC-4 .cvsignore, 1.3, 1.4 dosbox.spec, 1.13, 1.14 sources, 1.3, 1.4 dosbox-x86-64-build.patch, 1.4, NONE Message-ID: <200603301101.k2UB109G028861@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dosbox/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28765/FC-4 Modified Files: .cvsignore dosbox.spec sources Removed Files: dosbox-x86-64-build.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:56:55 -0000 1.3 +++ .cvsignore 30 Mar 2006 11:00:27 -0000 1.4 @@ -1 +1 @@ -dosbox-0.63.tar.gz +dosbox-0.65.tar.gz Index: dosbox.spec =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-4/dosbox.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- dosbox.spec 30 May 2005 19:44:28 -0000 1.13 +++ dosbox.spec 30 Mar 2006 11:00:27 -0000 1.14 @@ -1,6 +1,6 @@ Name: dosbox -Version: 0.63 -Release: 6 +Version: 0.65 +Release: 1 Summary: x86/DOS emulator with sound and graphics @@ -10,13 +10,13 @@ Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: dosbox.desktop Source2: dosbox.png -Patch0: dosbox-x86-64-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libpng-devel BuildRequires: SDL-devel BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel +BuildRequires: xorg-x11-devel %description @@ -32,7 +32,6 @@ %prep %setup -q -%patch0 %build %configure --enable-shots @@ -71,12 +70,16 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +0.65-1 +- version upgrade + * Mon May 30 2005 Andreas Bierfert -0.64-6 +0.63-6 - add a x86_64 bugfix from upstream * Mon May 30 2005 Andreas Bierfert -0.64-5 +0.63-5 - more build fixes and cleanups... * Mon May 30 2005 Andreas Bierfert Index: sources =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:56:55 -0000 1.3 +++ sources 30 Mar 2006 11:00:27 -0000 1.4 @@ -1 +1 @@ -629413e41224ae9cdd115fdafd55cbdc dosbox-0.63.tar.gz +fef84c292c3aeae747368b9875c1575a dosbox-0.65.tar.gz --- dosbox-x86-64-build.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 11:05:58 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 04:05:58 -0700 Subject: rpms/dosbox/FC-4 dosbox.spec,1.14,1.15 Message-ID: <200603301106.k2UB60XE031171@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dosbox/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31154 Modified Files: dosbox.spec Log Message: - add dist Index: dosbox.spec =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-4/dosbox.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dosbox.spec 30 Mar 2006 11:00:27 -0000 1.14 +++ dosbox.spec 30 Mar 2006 11:05:58 -0000 1.15 @@ -1,6 +1,6 @@ Name: dosbox Version: 0.65 -Release: 1 +Release: 1%{?dist} Summary: x86/DOS emulator with sound and graphics From fedora-extras-commits at redhat.com Thu Mar 30 12:02:36 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 05:02:36 -0700 Subject: rpms/dvdisaster/devel .cvsignore, 1.3, 1.4 dvdisaster.spec, 1.7, 1.8 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE Message-ID: <200603301203.k2UC38YG001261@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1240 Modified Files: .cvsignore dvdisaster.spec sources Removed Files: dvdisaster.desktop Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 Jan 2006 14:02:39 -0000 1.3 +++ .cvsignore 30 Mar 2006 12:02:36 -0000 1.4 @@ -1 +1 @@ -dvdisaster-0.65.tar.bz2 +dvdisaster-0.66.tar.bz2 Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dvdisaster.spec 14 Feb 2006 18:06:14 -0000 1.7 +++ dvdisaster.spec 30 Mar 2006 12:02:36 -0000 1.8 @@ -1,12 +1,11 @@ Name: dvdisaster -Summary: CD/DVD media data loss/scratch/aging protection -Version: 0.65 -Release: 2%{?dist} +Summary: Additional error protection for CD/DVD media +Version: 0.66 +Release: 1%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2 -Source1: dvdisaster.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,10 +33,10 @@ se il supporto dovesse danneggiarsi col tempo. %description -l cs -%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat -na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m. -Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch -sektor??, pokud se disk pozd??ji po??kod??. +%{name} poskytuje dodate??nou ochranu proti ztr??t?? dat na m??di??ch CD a DVD +zp??soben??ch po??kr??b??n??m nebo st??rnut??m. Vytv?????? data oprav chyb, kter?? +jsou pou??ita pro obnovu ne??iteln??ch sektor??, pokud se disk pozd??ji +po??kod??. %prep @@ -46,41 +45,35 @@ %build -%configure +%configure \ + --docdir=%{_docdir} \ + --docsubdir=%{name}-%{version} \ + --localedir=%{_datadir}/locale \ + --with-nls=yes + #make show -make %{?_smp_mflags} \ - PREFIX=%{_prefix} \ - BINDIR=%{_bindir} \ - MANDIR=%{_mandir} \ - LOCALEDIR=%{_prefix}/share/locale \ - DOCDIR=%{_docdir} \ - DOCSUBDIR=%{_docdir}/%{name}-%{version} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ +make install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ DOCSUBDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \ MANDIR=$RPM_BUILD_ROOT%{_mandir} \ LOCALEDIR=$RPM_BUILD_ROOT%{_prefix}/share/locale -for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print` -do - sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man -done +rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 icons/create.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png - -sed 's/@NAME@/%{name}/g' %{SOURCE1} >%{name}.desktop +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{name}.desktop + contrib/%{name}.desktop %find_lang %{name} @@ -113,8 +106,11 @@ %changelog -* Tue Feb 14 2006 Dmitry Butskoy - 0.65-2 -- rebuild for FC5 +* Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 +- upgrade to 0.66 +- spec file changes/cleanups, merged from a skeleton now included upstream +- still specify dirs explicitly on install due to typo in GNUmakefile +- remove unneeded uninstall.sh script after install * Tue Jan 31 2006 Dmitry Butskoy - 0.65-1 - upgrade to 0.65 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jan 2006 14:02:39 -0000 1.3 +++ sources 30 Mar 2006 12:02:36 -0000 1.4 @@ -1 +1 @@ -bcab797d77656ca6c672cb646b9c7971 dvdisaster-0.65.tar.bz2 +0bae5ab6bad8c4613d1250609ed1fbab dvdisaster-0.66.tar.bz2 --- dvdisaster.desktop DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:04:31 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 05:04:31 -0700 Subject: rpms/dvdisaster/FC-5 dvdisaster.spec, 1.7, 1.8 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE Message-ID: <200603301204.k2UC4X9o001376@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1357 Modified Files: dvdisaster.spec sources Removed Files: dvdisaster.desktop Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-5/dvdisaster.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dvdisaster.spec 14 Feb 2006 18:06:14 -0000 1.7 +++ dvdisaster.spec 30 Mar 2006 12:04:30 -0000 1.8 @@ -1,12 +1,11 @@ Name: dvdisaster -Summary: CD/DVD media data loss/scratch/aging protection -Version: 0.65 -Release: 2%{?dist} +Summary: Additional error protection for CD/DVD media +Version: 0.66 +Release: 1%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2 -Source1: dvdisaster.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,10 +33,10 @@ se il supporto dovesse danneggiarsi col tempo. %description -l cs -%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat -na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m. -Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch -sektor??, pokud se disk pozd??ji po??kod??. +%{name} poskytuje dodate??nou ochranu proti ztr??t?? dat na m??di??ch CD a DVD +zp??soben??ch po??kr??b??n??m nebo st??rnut??m. Vytv?????? data oprav chyb, kter?? +jsou pou??ita pro obnovu ne??iteln??ch sektor??, pokud se disk pozd??ji +po??kod??. %prep @@ -46,41 +45,35 @@ %build -%configure +%configure \ + --docdir=%{_docdir} \ + --docsubdir=%{name}-%{version} \ + --localedir=%{_datadir}/locale \ + --with-nls=yes + #make show -make %{?_smp_mflags} \ - PREFIX=%{_prefix} \ - BINDIR=%{_bindir} \ - MANDIR=%{_mandir} \ - LOCALEDIR=%{_prefix}/share/locale \ - DOCDIR=%{_docdir} \ - DOCSUBDIR=%{_docdir}/%{name}-%{version} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ +make install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ DOCSUBDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \ MANDIR=$RPM_BUILD_ROOT%{_mandir} \ LOCALEDIR=$RPM_BUILD_ROOT%{_prefix}/share/locale -for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print` -do - sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man -done +rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 icons/create.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png - -sed 's/@NAME@/%{name}/g' %{SOURCE1} >%{name}.desktop +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{name}.desktop + contrib/%{name}.desktop %find_lang %{name} @@ -113,8 +106,11 @@ %changelog -* Tue Feb 14 2006 Dmitry Butskoy - 0.65-2 -- rebuild for FC5 +* Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 +- upgrade to 0.66 +- spec file changes/cleanups, merged from a skeleton now included upstream +- still specify dirs explicitly on install due to typo in GNUmakefile +- remove unneeded uninstall.sh script after install * Tue Jan 31 2006 Dmitry Butskoy - 0.65-1 - upgrade to 0.65 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jan 2006 14:02:39 -0000 1.3 +++ sources 30 Mar 2006 12:04:30 -0000 1.4 @@ -1 +1 @@ -bcab797d77656ca6c672cb646b9c7971 dvdisaster-0.65.tar.bz2 +0bae5ab6bad8c4613d1250609ed1fbab dvdisaster-0.66.tar.bz2 --- dvdisaster.desktop DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:05:10 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 05:05:10 -0700 Subject: rpms/dvdisaster/FC-4 dvdisaster.spec, 1.6, 1.7 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE Message-ID: <200603301205.k2UC5CCe001410@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1390 Modified Files: dvdisaster.spec sources Removed Files: dvdisaster.desktop Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-4/dvdisaster.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dvdisaster.spec 31 Jan 2006 14:18:05 -0000 1.6 +++ dvdisaster.spec 30 Mar 2006 12:05:09 -0000 1.7 @@ -1,12 +1,11 @@ Name: dvdisaster -Summary: CD/DVD media data loss/scratch/aging protection -Version: 0.65 +Summary: Additional error protection for CD/DVD media +Version: 0.66 Release: 1%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2 -Source1: dvdisaster.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,10 +33,10 @@ se il supporto dovesse danneggiarsi col tempo. %description -l cs -%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat -na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m. -Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch -sektor??, pokud se disk pozd??ji po??kod??. +%{name} poskytuje dodate??nou ochranu proti ztr??t?? dat na m??di??ch CD a DVD +zp??soben??ch po??kr??b??n??m nebo st??rnut??m. Vytv?????? data oprav chyb, kter?? +jsou pou??ita pro obnovu ne??iteln??ch sektor??, pokud se disk pozd??ji +po??kod??. %prep @@ -46,41 +45,35 @@ %build -%configure +%configure \ + --docdir=%{_docdir} \ + --docsubdir=%{name}-%{version} \ + --localedir=%{_datadir}/locale \ + --with-nls=yes + #make show -make %{?_smp_mflags} \ - PREFIX=%{_prefix} \ - BINDIR=%{_bindir} \ - MANDIR=%{_mandir} \ - LOCALEDIR=%{_prefix}/share/locale \ - DOCDIR=%{_docdir} \ - DOCSUBDIR=%{_docdir}/%{name}-%{version} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ +make install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ DOCSUBDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \ MANDIR=$RPM_BUILD_ROOT%{_mandir} \ LOCALEDIR=$RPM_BUILD_ROOT%{_prefix}/share/locale -for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print` -do - sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man -done +rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 icons/create.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png - -sed 's/@NAME@/%{name}/g' %{SOURCE1} >%{name}.desktop +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{name}.desktop + contrib/%{name}.desktop %find_lang %{name} @@ -113,6 +106,12 @@ %changelog +* Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 +- upgrade to 0.66 +- spec file changes/cleanups, merged from a skeleton now included upstream +- still specify dirs explicitly on install due to typo in GNUmakefile +- remove unneeded uninstall.sh script after install + * Tue Jan 31 2006 Dmitry Butskoy - 0.65-1 - upgrade to 0.65 - drop browser patch (no more needed) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jan 2006 14:05:15 -0000 1.3 +++ sources 30 Mar 2006 12:05:09 -0000 1.4 @@ -1 +1 @@ -bcab797d77656ca6c672cb646b9c7971 dvdisaster-0.65.tar.bz2 +0bae5ab6bad8c4613d1250609ed1fbab dvdisaster-0.66.tar.bz2 --- dvdisaster.desktop DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:05:37 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 05:05:37 -0700 Subject: rpms/dvdisaster/FC-3 dvdisaster.spec, 1.6, 1.7 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE Message-ID: <200603301205.k2UC5dF6001447@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1426 Modified Files: dvdisaster.spec sources Removed Files: dvdisaster.desktop Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-3/dvdisaster.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dvdisaster.spec 31 Jan 2006 14:19:10 -0000 1.6 +++ dvdisaster.spec 30 Mar 2006 12:05:37 -0000 1.7 @@ -1,12 +1,11 @@ Name: dvdisaster -Summary: CD/DVD media data loss/scratch/aging protection -Version: 0.65 +Summary: Additional error protection for CD/DVD media +Version: 0.66 Release: 1%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2 -Source1: dvdisaster.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,10 +33,10 @@ se il supporto dovesse danneggiarsi col tempo. %description -l cs -%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat -na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m. -Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch -sektor??, pokud se disk pozd??ji po??kod??. +%{name} poskytuje dodate??nou ochranu proti ztr??t?? dat na m??di??ch CD a DVD +zp??soben??ch po??kr??b??n??m nebo st??rnut??m. Vytv?????? data oprav chyb, kter?? +jsou pou??ita pro obnovu ne??iteln??ch sektor??, pokud se disk pozd??ji +po??kod??. %prep @@ -46,41 +45,35 @@ %build -%configure +%configure \ + --docdir=%{_docdir} \ + --docsubdir=%{name}-%{version} \ + --localedir=%{_datadir}/locale \ + --with-nls=yes + #make show -make %{?_smp_mflags} \ - PREFIX=%{_prefix} \ - BINDIR=%{_bindir} \ - MANDIR=%{_mandir} \ - LOCALEDIR=%{_prefix}/share/locale \ - DOCDIR=%{_docdir} \ - DOCSUBDIR=%{_docdir}/%{name}-%{version} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ +make install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ DOCSUBDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \ MANDIR=$RPM_BUILD_ROOT%{_mandir} \ LOCALEDIR=$RPM_BUILD_ROOT%{_prefix}/share/locale -for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print` -do - sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man -done +rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 icons/create.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png - -sed 's/@NAME@/%{name}/g' %{SOURCE1} >%{name}.desktop +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{name}.desktop + contrib/%{name}.desktop %find_lang %{name} @@ -113,6 +106,12 @@ %changelog +* Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 +- upgrade to 0.66 +- spec file changes/cleanups, merged from a skeleton now included upstream +- still specify dirs explicitly on install due to typo in GNUmakefile +- remove unneeded uninstall.sh script after install + * Tue Jan 31 2006 Dmitry Butskoy - 0.65-1 - upgrade to 0.65 - drop browser patch (no more needed) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jan 2006 14:08:12 -0000 1.3 +++ sources 30 Mar 2006 12:05:37 -0000 1.4 @@ -1 +1 @@ -bcab797d77656ca6c672cb646b9c7971 dvdisaster-0.65.tar.bz2 +0bae5ab6bad8c4613d1250609ed1fbab dvdisaster-0.66.tar.bz2 --- dvdisaster.desktop DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:07:43 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:07:43 -0700 Subject: rpms/koffice/FC-5 koffice-filters-krita-tiff.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 koffice.spec, 1.32, 1.33 sources, 1.8, 1.9 koffice-kotext-lines.patch, 1.1, NONE koffice-kspread-cpp.patch, 1.1, NONE Message-ID: <200603301207.k2UC7jQi001546@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1499/FC-5 Modified Files: .cvsignore koffice.spec sources Added Files: koffice-filters-krita-tiff.patch Removed Files: koffice-kotext-lines.patch koffice-kspread-cpp.patch Log Message: - version upgrade koffice-filters-krita-tiff.patch: --- NEW FILE koffice-filters-krita-tiff.patch --- --- branches/koffice/1.5/koffice/filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp 2006/03/24 09:22:37 522034 +++ branches/koffice/1.5/koffice/filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp 2006/03/27 12:34:23 523115 @@ -26,8 +26,8 @@ #include namespace { - const Q_INT32 MAX_CHANNEL_YCbCr = 3; - const Q_INT32 MAX_CHANNEL_YCbCrA = 4; + const Q_INT32 MAX_CHANNEL_YCbCr_U8 = 3; + const Q_INT32 MAX_CHANNEL_YCbCrA_U8 = 4; } KisYCbCrU8ColorSpace::KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* p) @@ -169,15 +169,15 @@ } Q_UINT32 KisYCbCrU8ColorSpace::nChannels() const { - return MAX_CHANNEL_YCbCrA; + return MAX_CHANNEL_YCbCrA_U8; } Q_UINT32 KisYCbCrU8ColorSpace::nColorChannels() const { - return MAX_CHANNEL_YCbCr; + return MAX_CHANNEL_YCbCr_U8; } Q_UINT32 KisYCbCrU8ColorSpace::pixelSize() const { - return MAX_CHANNEL_YCbCrA*sizeof(Q_UINT8); + return MAX_CHANNEL_YCbCrA_U8*sizeof(Q_UINT8); } @@ -192,7 +192,7 @@ Q_INT32 i = 0; uchar *j = img.bits(); - while ( i < width * height * MAX_CHANNEL_YCbCrA) { + while ( i < width * height * MAX_CHANNEL_YCbCrA_U8) { Q_UINT8 Y = *( data + i + PIXEL_Y ); Q_UINT8 Cb = *( data + i + PIXEL_Cb ); Q_UINT8 Cr = *( data + i + PIXEL_Cr ); @@ -210,8 +210,8 @@ *( j + 1 ) = Cb; *( j + 0 ) = Cr;*/ #endif - i += MAX_CHANNEL_YCbCrA; - j += MAX_CHANNEL_YCbCrA; + i += MAX_CHANNEL_YCbCrA_U8; + j += MAX_CHANNEL_YCbCrA_U8; } return img; } @@ -265,7 +265,7 @@ } if (srcAlpha == OPACITY_OPAQUE) { - memcpy(dst, src, MAX_CHANNEL_YCbCrA * sizeof(Q_UINT8)); + memcpy(dst, src, MAX_CHANNEL_YCbCrA_U8 * sizeof(Q_UINT8)); } else { Q_UINT8 dstAlpha = dst[PIXEL_ALPHA]; @@ -285,7 +285,7 @@ } if (srcBlend == OPACITY_OPAQUE) { - memcpy(dst, src, MAX_CHANNEL_YCbCr * sizeof(Q_UINT8)); + memcpy(dst, src, MAX_CHANNEL_YCbCr_U8 * sizeof(Q_UINT8)); } else { dst[PIXEL_Y] = UINT8_BLEND(src[PIXEL_Y], dst[PIXEL_Y], srcBlend); dst[PIXEL_Cb] = UINT8_BLEND(src[PIXEL_Cb], dst[PIXEL_Cb], srcBlend); @@ -295,8 +295,8 @@ } columns--; - src += MAX_CHANNEL_YCbCrA; - dst += MAX_CHANNEL_YCbCrA; + src += MAX_CHANNEL_YCbCrA_U8; + dst += MAX_CHANNEL_YCbCrA_U8; } rows--; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 15 Mar 2006 21:16:35 -0000 1.8 +++ .cvsignore 30 Mar 2006 12:07:42 -0000 1.9 @@ -1 +1 @@ -koffice-1.4.95.tar.bz2 +koffice-1.5.0-rc1.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- koffice.spec 15 Mar 2006 21:16:35 -0000 1.32 +++ koffice.spec 30 Mar 2006 12:07:42 -0000 1.33 @@ -1,17 +1,17 @@ Name: koffice -Version: 1.4.95 -Release: 1%{?dist} +Version: 1.5.0 +Release: 0.1.rc1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-beta2/koffice-1.4.95.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-rc1/src/koffice-1.5.0-rc1.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -Patch1: koffice-kspread-cpp.patch +Patch1: koffice-filters-krita-tiff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -206,9 +206,9 @@ %{summary} %prep -%setup -q +%setup -q -n %{name}-%{version}-rc1 %patch0 -p1 -%patch1 +%patch1 -p4 # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -513,7 +513,6 @@ %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png %{_datadir}/apps/kross -%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -669,7 +668,6 @@ %{_libdir}/kde3/krita_rgb_u16_plugin.* %{_libdir}/kde3/kritabumpmap.* %{_libdir}/kde3/kritacmykplugin.* -%{_libdir}/kde3/kritacubismfilter.* %{_libdir}/kde3/kritadropshadow.* %{_libdir}/kde3/kritafiltersgallery.* %{_libdir}/kde3/kritahistogramdocker.* @@ -692,6 +690,7 @@ %{_libdir}/kde3/libkritapngimport.* %{_libdir}/kde3/libkritatiffexport.* %{_libdir}/kde3/libkritatiffimport.* +%{_libdir}/kde3/kritaperftest.* %{_datadir}/apps/krita %{_datadir}/services/krita*.desktop %{_datadir}/servicetypes/krita*.desktop @@ -895,6 +894,10 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.5.0-0.1.rc1 +- version upgrade + * Mon Mar 13 2006 Andreas Bierfert 1.4.95-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 15 Mar 2006 21:16:35 -0000 1.8 +++ sources 30 Mar 2006 12:07:42 -0000 1.9 @@ -1 +1 @@ -ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 +e9346977d18c67185d5b50f49ee8225b koffice-1.5.0-rc1.tar.bz2 --- koffice-kotext-lines.patch DELETED --- --- koffice-kspread-cpp.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:07:43 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:07:43 -0700 Subject: rpms/koffice/devel koffice-filters-krita-tiff.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 koffice.spec, 1.32, 1.33 sources, 1.8, 1.9 koffice-kotext-lines.patch, 1.1, NONE koffice-kspread-cpp.patch, 1.1, NONE Message-ID: <200603301207.k2UC7jQI001554@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1499/devel Modified Files: .cvsignore koffice.spec sources Added Files: koffice-filters-krita-tiff.patch Removed Files: koffice-kotext-lines.patch koffice-kspread-cpp.patch Log Message: - version upgrade koffice-filters-krita-tiff.patch: --- NEW FILE koffice-filters-krita-tiff.patch --- --- branches/koffice/1.5/koffice/filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp 2006/03/24 09:22:37 522034 +++ branches/koffice/1.5/koffice/filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp 2006/03/27 12:34:23 523115 @@ -26,8 +26,8 @@ #include namespace { - const Q_INT32 MAX_CHANNEL_YCbCr = 3; - const Q_INT32 MAX_CHANNEL_YCbCrA = 4; + const Q_INT32 MAX_CHANNEL_YCbCr_U8 = 3; + const Q_INT32 MAX_CHANNEL_YCbCrA_U8 = 4; } KisYCbCrU8ColorSpace::KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* p) @@ -169,15 +169,15 @@ } Q_UINT32 KisYCbCrU8ColorSpace::nChannels() const { - return MAX_CHANNEL_YCbCrA; + return MAX_CHANNEL_YCbCrA_U8; } Q_UINT32 KisYCbCrU8ColorSpace::nColorChannels() const { - return MAX_CHANNEL_YCbCr; + return MAX_CHANNEL_YCbCr_U8; } Q_UINT32 KisYCbCrU8ColorSpace::pixelSize() const { - return MAX_CHANNEL_YCbCrA*sizeof(Q_UINT8); + return MAX_CHANNEL_YCbCrA_U8*sizeof(Q_UINT8); } @@ -192,7 +192,7 @@ Q_INT32 i = 0; uchar *j = img.bits(); - while ( i < width * height * MAX_CHANNEL_YCbCrA) { + while ( i < width * height * MAX_CHANNEL_YCbCrA_U8) { Q_UINT8 Y = *( data + i + PIXEL_Y ); Q_UINT8 Cb = *( data + i + PIXEL_Cb ); Q_UINT8 Cr = *( data + i + PIXEL_Cr ); @@ -210,8 +210,8 @@ *( j + 1 ) = Cb; *( j + 0 ) = Cr;*/ #endif - i += MAX_CHANNEL_YCbCrA; - j += MAX_CHANNEL_YCbCrA; + i += MAX_CHANNEL_YCbCrA_U8; + j += MAX_CHANNEL_YCbCrA_U8; } return img; } @@ -265,7 +265,7 @@ } if (srcAlpha == OPACITY_OPAQUE) { - memcpy(dst, src, MAX_CHANNEL_YCbCrA * sizeof(Q_UINT8)); + memcpy(dst, src, MAX_CHANNEL_YCbCrA_U8 * sizeof(Q_UINT8)); } else { Q_UINT8 dstAlpha = dst[PIXEL_ALPHA]; @@ -285,7 +285,7 @@ } if (srcBlend == OPACITY_OPAQUE) { - memcpy(dst, src, MAX_CHANNEL_YCbCr * sizeof(Q_UINT8)); + memcpy(dst, src, MAX_CHANNEL_YCbCr_U8 * sizeof(Q_UINT8)); } else { dst[PIXEL_Y] = UINT8_BLEND(src[PIXEL_Y], dst[PIXEL_Y], srcBlend); dst[PIXEL_Cb] = UINT8_BLEND(src[PIXEL_Cb], dst[PIXEL_Cb], srcBlend); @@ -295,8 +295,8 @@ } columns--; - src += MAX_CHANNEL_YCbCrA; - dst += MAX_CHANNEL_YCbCrA; + src += MAX_CHANNEL_YCbCrA_U8; + dst += MAX_CHANNEL_YCbCrA_U8; } rows--; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 15 Mar 2006 21:16:35 -0000 1.8 +++ .cvsignore 30 Mar 2006 12:07:43 -0000 1.9 @@ -1 +1 @@ -koffice-1.4.95.tar.bz2 +koffice-1.5.0-rc1.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- koffice.spec 15 Mar 2006 21:16:35 -0000 1.32 +++ koffice.spec 30 Mar 2006 12:07:43 -0000 1.33 @@ -1,17 +1,17 @@ Name: koffice -Version: 1.4.95 -Release: 1%{?dist} +Version: 1.5.0 +Release: 0.1.rc1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-beta2/koffice-1.4.95.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-rc1/src/koffice-1.5.0-rc1.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -Patch1: koffice-kspread-cpp.patch +Patch1: koffice-filters-krita-tiff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -206,9 +206,9 @@ %{summary} %prep -%setup -q +%setup -q -n %{name}-%{version}-rc1 %patch0 -p1 -%patch1 +%patch1 -p4 # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -513,7 +513,6 @@ %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png %{_datadir}/apps/kross -%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -669,7 +668,6 @@ %{_libdir}/kde3/krita_rgb_u16_plugin.* %{_libdir}/kde3/kritabumpmap.* %{_libdir}/kde3/kritacmykplugin.* -%{_libdir}/kde3/kritacubismfilter.* %{_libdir}/kde3/kritadropshadow.* %{_libdir}/kde3/kritafiltersgallery.* %{_libdir}/kde3/kritahistogramdocker.* @@ -692,6 +690,7 @@ %{_libdir}/kde3/libkritapngimport.* %{_libdir}/kde3/libkritatiffexport.* %{_libdir}/kde3/libkritatiffimport.* +%{_libdir}/kde3/kritaperftest.* %{_datadir}/apps/krita %{_datadir}/services/krita*.desktop %{_datadir}/servicetypes/krita*.desktop @@ -895,6 +894,10 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.5.0-0.1.rc1 +- version upgrade + * Mon Mar 13 2006 Andreas Bierfert 1.4.95-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 15 Mar 2006 21:16:35 -0000 1.8 +++ sources 30 Mar 2006 12:07:43 -0000 1.9 @@ -1 +1 @@ -ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 +e9346977d18c67185d5b50f49ee8225b koffice-1.5.0-rc1.tar.bz2 --- koffice-kotext-lines.patch DELETED --- --- koffice-kspread-cpp.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:11:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:11:25 -0700 Subject: rpms/fbdesk/FC-4 .cvsignore, 1.3, 1.4 fbdesk.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200603301211.k2UCBRQE001740@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1660/FC-4 Modified Files: .cvsignore fbdesk.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:02:17 -0000 1.3 +++ .cvsignore 30 Mar 2006 12:11:25 -0000 1.4 @@ -1 +1 @@ -fbdesk-1.2.1.tar.gz +fbdesk-1.4.0.tar.gz Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-4/fbdesk.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fbdesk.spec 6 Apr 2005 22:11:37 -0000 1.8 +++ fbdesk.spec 30 Mar 2006 12:11:25 -0000 1.9 @@ -1,13 +1,13 @@ Name: fbdesk -Version: 1.2.1 -Release: 2 +Version: 1.4.0 +Release: 1%{?dist} Summary: Icon Manager for Fluxbox Group: User Interface/Desktops License: MIT URL: http://fluxbox.sourceforge.net/fbdesk/ -Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz +Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.4.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel BuildRequires: freetype-devel @@ -47,6 +47,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.4.0-1 +- version upgrade + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:02:17 -0000 1.3 +++ sources 30 Mar 2006 12:11:25 -0000 1.4 @@ -1 +1 @@ -382a32a6e26b3f3d3a647fa4bdc81b7a fbdesk-1.2.1.tar.gz +c52a5c2524d90c0613394478dce39156 fbdesk-1.4.0.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 12:11:26 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:11:26 -0700 Subject: rpms/fbdesk/FC-5 .cvsignore, 1.3, 1.4 fbdesk.spec, 1.14, 1.15 sources, 1.3, 1.4 fbdesk-gcc41.patch, 1.1, NONE Message-ID: <200603301211.k2UCBSL9001746@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1660/FC-5 Modified Files: .cvsignore fbdesk.spec sources Removed Files: fbdesk-gcc41.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:02:17 -0000 1.3 +++ .cvsignore 30 Mar 2006 12:11:26 -0000 1.4 @@ -1 +1 @@ -fbdesk-1.2.1.tar.gz +fbdesk-1.4.0.tar.gz Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-5/fbdesk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fbdesk.spec 2 Mar 2006 00:35:09 -0000 1.14 +++ fbdesk.spec 30 Mar 2006 12:11:26 -0000 1.15 @@ -1,14 +1,13 @@ Name: fbdesk -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.4.0 +Release: 4%{?dist} Summary: Icon Manager for Fluxbox Group: User Interface/Desktops License: MIT URL: http://fluxbox.sourceforge.net/fbdesk/ -Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz -Patch0: fbdesk-gcc41.patch +Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.4.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: freetype-devel BuildRequires: libpng-devel @@ -25,7 +24,6 @@ %prep %setup -q -%patch0 %build %configure --x-includes=%{_includedir} --x-libraries=%{_libdir} @@ -50,6 +48,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.4.0 +- version upgrade + * Thu Mar 02 2006 Andreas Bierfert 1.2.1-3 - add gcc4.1 patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:02:17 -0000 1.3 +++ sources 30 Mar 2006 12:11:26 -0000 1.4 @@ -1 +1 @@ -382a32a6e26b3f3d3a647fa4bdc81b7a fbdesk-1.2.1.tar.gz +c52a5c2524d90c0613394478dce39156 fbdesk-1.4.0.tar.gz --- fbdesk-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:11:27 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:11:27 -0700 Subject: rpms/fbdesk/devel .cvsignore, 1.3, 1.4 fbdesk.spec, 1.14, 1.15 sources, 1.3, 1.4 fbdesk-gcc41.patch, 1.1, NONE Message-ID: <200603301211.k2UCBTv6001752@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1660/devel Modified Files: .cvsignore fbdesk.spec sources Removed Files: fbdesk-gcc41.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:02:17 -0000 1.3 +++ .cvsignore 30 Mar 2006 12:11:27 -0000 1.4 @@ -1 +1 @@ -fbdesk-1.2.1.tar.gz +fbdesk-1.4.0.tar.gz Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fbdesk.spec 2 Mar 2006 00:35:09 -0000 1.14 +++ fbdesk.spec 30 Mar 2006 12:11:27 -0000 1.15 @@ -1,14 +1,13 @@ Name: fbdesk -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.4.0 +Release: 4%{?dist} Summary: Icon Manager for Fluxbox Group: User Interface/Desktops License: MIT URL: http://fluxbox.sourceforge.net/fbdesk/ -Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz -Patch0: fbdesk-gcc41.patch +Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.4.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: freetype-devel BuildRequires: libpng-devel @@ -25,7 +24,6 @@ %prep %setup -q -%patch0 %build %configure --x-includes=%{_includedir} --x-libraries=%{_libdir} @@ -50,6 +48,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.4.0 +- version upgrade + * Thu Mar 02 2006 Andreas Bierfert 1.2.1-3 - add gcc4.1 patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:02:17 -0000 1.3 +++ sources 30 Mar 2006 12:11:27 -0000 1.4 @@ -1 +1 @@ -382a32a6e26b3f3d3a647fa4bdc81b7a fbdesk-1.2.1.tar.gz +c52a5c2524d90c0613394478dce39156 fbdesk-1.4.0.tar.gz --- fbdesk-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:11:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:11:25 -0700 Subject: rpms/fbdesk/FC-3 .cvsignore, 1.3, 1.4 fbdesk.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200603301211.k2UCBveN001757@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1660/FC-3 Modified Files: .cvsignore fbdesk.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:02:17 -0000 1.3 +++ .cvsignore 30 Mar 2006 12:11:25 -0000 1.4 @@ -1 +1 @@ -fbdesk-1.2.1.tar.gz +fbdesk-1.4.0.tar.gz Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-3/fbdesk.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fbdesk.spec 13 Feb 2005 11:02:17 -0000 1.6 +++ fbdesk.spec 30 Mar 2006 12:11:25 -0000 1.7 @@ -1,13 +1,13 @@ Name: fbdesk -Version: 1.2.1 -Release: 1 +Version: 1.4.0 +Release: 1%{?dist} Epoch: 0 Summary: Icon Manager for Fluxbox Group: User Interface/Desktops License: MIT URL: http://fluxbox.sourceforge.net/fbdesk/ -Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz +Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.4.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel BuildRequires: freetype-devel @@ -47,6 +47,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.4.0-1 +- version ugprade + * Sun Feb 13 2005 Andreas Bierfert 1.2.1-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:02:17 -0000 1.3 +++ sources 30 Mar 2006 12:11:25 -0000 1.4 @@ -1 +1 @@ -382a32a6e26b3f3d3a647fa4bdc81b7a fbdesk-1.2.1.tar.gz +c52a5c2524d90c0613394478dce39156 fbdesk-1.4.0.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 12:56:22 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:56:22 -0700 Subject: rpms/perl-Data-HexDump - New directory Message-ID: <200603301256.k2UCuOO5002195@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2174/perl-Data-HexDump Log Message: Directory /cvs/extras/rpms/perl-Data-HexDump added to the repository From fedora-extras-commits at redhat.com Thu Mar 30 12:56:23 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:56:23 -0700 Subject: rpms/perl-Data-HexDump/devel - New directory Message-ID: <200603301256.k2UCuPKB002198@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2174/perl-Data-HexDump/devel Log Message: Directory /cvs/extras/rpms/perl-Data-HexDump/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 30 12:56:41 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:56:41 -0700 Subject: rpms/perl-Data-HexDump/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603301256.k2UCuhBH002255@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2219/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Data-HexDump --- NEW 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 Mar 30 12:56:40 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:56:40 -0700 Subject: rpms/perl-Data-HexDump Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603301256.k2UCugUa002252@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2219 Added Files: Makefile import.log Log Message: Setup of module perl-Data-HexDump --- NEW FILE Makefile --- # Top level Makefile for module perl-Data-HexDump all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 30 12:57:08 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:57:08 -0700 Subject: rpms/perl-Data-HexDump import.log,1.1,1.2 Message-ID: <200603301257.k2UCvAfP002316@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2283 Modified Files: import.log Log Message: auto-import perl-Data-HexDump-0.02-2 on branch devel from perl-Data-HexDump-0.02-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Data-HexDump/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Mar 2006 12:56:40 -0000 1.1 +++ import.log 30 Mar 2006 12:57:08 -0000 1.2 @@ -0,0 +1 @@ +perl-Data-HexDump-0_02-2:HEAD:perl-Data-HexDump-0.02-2.src.rpm:1143723416 From fedora-extras-commits at redhat.com Thu Mar 30 12:57:09 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:57:09 -0700 Subject: rpms/perl-Data-HexDump/devel perl-Data-HexDump.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603301257.k2UCvBcD002321@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2283/devel Modified Files: .cvsignore sources Added Files: perl-Data-HexDump.spec Log Message: auto-import perl-Data-HexDump-0.02-2 on branch devel from perl-Data-HexDump-0.02-2.src.rpm --- NEW FILE perl-Data-HexDump.spec --- Name: perl-Data-HexDump Version: 0.02 Release: 2%{?dist} Summary: Hexadecial Dumper License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-HexDump/ Source0: http://www.cpan.org/modules/by-module/Data/Data-HexDump-%{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 Dump in hexadecimal the content of a scalar. The result is returned in a string. Each line of the result consists of the offset in the source in the leftmost column of each line, followed by one or more columns of data from the source in hexadecimal. The rightmost column of each line shows the printable characters (all others are shown as single dots). %prep %setup -q -n Data-HexDump-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} # rename binary not to conflict with util-linux mv %{buildroot}%{_bindir}/hexdump %{buildroot}%{_bindir}/hexdump.pl 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}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README %{_bindir}/hexdump.pl %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Thu Mar 30 2006 Andreas Thienemann 0.02-2 - Fixed review showstoppers * Thu Mar 30 2006 Andreas Thienemann 0.02-1 - Cleaned up for FE - Specfile autogenerated by cpanspec 1.64. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Data-HexDump/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Mar 2006 12:56:41 -0000 1.1 +++ .cvsignore 30 Mar 2006 12:57:09 -0000 1.2 @@ -0,0 +1 @@ +Data-HexDump-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Data-HexDump/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Mar 2006 12:56:41 -0000 1.1 +++ sources 30 Mar 2006 12:57:09 -0000 1.2 @@ -0,0 +1 @@ +467b7183d1062ab4a502b50c34e7d67f Data-HexDump-0.02.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 12:58:25 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 05:58:25 -0700 Subject: rpms/libfac/FC-5 libfac.spec,1.10,1.11 Message-ID: <200603301258.k2UCwRqn002391@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libfac/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2374 Modified Files: libfac.spec Log Message: * Thu Mar 30 2006 Rex Dieter 2.0.5-4 - BR: factory-devel >= 2.0.5-7 Index: libfac.spec =================================================================== RCS file: /cvs/extras/rpms/libfac/FC-5/libfac.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libfac.spec 10 Feb 2006 14:27:55 -0000 1.10 +++ libfac.spec 30 Mar 2006 12:58:24 -0000 1.11 @@ -2,7 +2,7 @@ Summary: An extension to Singular-factory Name: libfac Version: 2.0.5 -Release: 3%{?dist}.1 +Release: 4%{?dist} License: GPL Url: http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/ @@ -11,8 +11,7 @@ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: factory-devel >= 2.0.5 -#BuildRequires: autoconf +BuildRequires: factory-devel >= 2.0.5-7 %description Singular-libfac is an extension to Singular-factory which implements @@ -54,7 +53,7 @@ %makeinstall # fix perms -chmod a-x $RPM_BUILD_ROOT%{_libdir}/lib*.a +chmod 644 $RPM_BUILD_ROOT%{_libdir}/lib*.a %clean @@ -69,6 +68,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 2.0.5-4 +- BR: factory-devel >= 2.0.5-7 + * Fri Feb 10 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Thu Mar 30 13:02:04 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 06:02:04 -0700 Subject: rpms/fbdesk/FC-4 fbdesk.spec,1.9,1.10 Message-ID: <200603301302.k2UD2ako004506@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442/FC-4 Modified Files: fbdesk.spec Log Message: - add missing BR Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-4/fbdesk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fbdesk.spec 30 Mar 2006 12:11:25 -0000 1.9 +++ fbdesk.spec 30 Mar 2006 13:02:04 -0000 1.10 @@ -13,6 +13,7 @@ BuildRequires: freetype-devel BuildRequires: libpng-devel BuildRequires: pkgconfig +BuildRequires: imlib2-devel Requires: fluxbox %description From fedora-extras-commits at redhat.com Thu Mar 30 13:02:11 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 06:02:11 -0700 Subject: rpms/fbdesk/FC-5 fbdesk.spec,1.15,1.16 Message-ID: <200603301302.k2UD2ina004516@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442/FC-5 Modified Files: fbdesk.spec Log Message: - add missing BR Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-5/fbdesk.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fbdesk.spec 30 Mar 2006 12:11:26 -0000 1.15 +++ fbdesk.spec 30 Mar 2006 13:02:10 -0000 1.16 @@ -15,6 +15,7 @@ BuildRequires: libICE-devel libSM-devel libX11-devel libXext-devel BuildRequires: libXft-devel libXpm-devel libXrender-devel BuildRequires: fontconfig-devel +BuildRequires: imlib2-devel Requires: fluxbox %description From fedora-extras-commits at redhat.com Thu Mar 30 13:02:00 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 06:02:00 -0700 Subject: rpms/fbdesk/FC-3 fbdesk.spec,1.7,1.8 Message-ID: <200603301303.k2UD34Jr004586@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442/FC-3 Modified Files: fbdesk.spec Log Message: - add missing BR Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-3/fbdesk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fbdesk.spec 30 Mar 2006 12:11:25 -0000 1.7 +++ fbdesk.spec 30 Mar 2006 13:02:00 -0000 1.8 @@ -13,6 +13,7 @@ BuildRequires: freetype-devel BuildRequires: libpng-devel BuildRequires: pkgconfig +BuildRequires: imlib2-devel Requires: fluxbox %description From fedora-extras-commits at redhat.com Thu Mar 30 13:02:24 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 06:02:24 -0700 Subject: rpms/fbdesk/devel fbdesk.spec,1.15,1.16 Message-ID: <200603301302.k2UD2w95004573@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442/devel Modified Files: fbdesk.spec Log Message: - add missing BR Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fbdesk.spec 30 Mar 2006 12:11:27 -0000 1.15 +++ fbdesk.spec 30 Mar 2006 13:02:24 -0000 1.16 @@ -15,6 +15,7 @@ BuildRequires: libICE-devel libSM-devel libX11-devel libXext-devel BuildRequires: libXft-devel libXpm-devel libXrender-devel BuildRequires: fontconfig-devel +BuildRequires: imlib2-devel Requires: fluxbox %description From fedora-extras-commits at redhat.com Thu Mar 30 14:15:55 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 07:15:55 -0700 Subject: rpms/ser/devel ser-0.9.6-ppc.patch,NONE,1.1 ser.spec,1.1,1.2 Message-ID: <200603301415.k2UEFvhw007259@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7239 Modified Files: ser.spec Added Files: ser-0.9.6-ppc.patch Log Message: * Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 - PPC patch to build the postgresql module on ppc ser-0.9.6-ppc.patch: --- NEW FILE ser-0.9.6-ppc.patch --- --- ser-0.9.6/modules/postgres/aug_sysdep.h.orig 2006-03-30 16:07:32.113066656 +0200 +++ ser-0.9.6/modules/postgres/aug_sysdep.h 2006-03-30 16:05:31.611385696 +0200 @@ -225,6 +225,16 @@ typedef unsigned int augUInt32; #endif /* x86-64 */ + +#if defined(__powerpc) + +#if defined(__GNUC__) +#define AUG_CONFIGURATION "Linux PowerPC with GCC" +#endif + +typedef unsigned int augUInt32; + +#endif /* PowerPC */ #endif /* linux */ /* Index: ser.spec =================================================================== RCS file: /cvs/extras/rpms/ser/devel/ser.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ser.spec 29 Mar 2006 11:18:24 -0000 1.1 +++ ser.spec 30 Mar 2006 14:15:55 -0000 1.2 @@ -4,7 +4,7 @@ Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz @@ -12,6 +12,7 @@ Source2: serweb.conf Source3: ser.init Patch0: serweb-path.patch +Patch1: ser-0.9.6-ppc.patch URL: http://www.iptel.org/ser/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel @@ -66,6 +67,7 @@ %setup -q %setup -q -a 1 %patch0 -p1 -b .path +%patch1 -p1 -b .ppc # Enable SQL support for the acc module sed -i -e 's/#DEFS+=-DSQL_ACC/DEFS+=-DSQL_ACC/' modules/acc/Makefile @@ -199,6 +201,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf %changelog +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 +- PPC patch to build the postgresql module on ppc + * Tue Mar 28 2006 Andreas Thienemann 0.9.6-2 - Changes to the spec-file, to conform to FE policies. From fedora-extras-commits at redhat.com Thu Mar 30 14:24:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 07:24:30 -0700 Subject: rpms/fbdesk/FC-5 fbdesk.spec,1.16,1.17 Message-ID: <200603301424.k2UEOWsB007428@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7397/FC-5 Modified Files: fbdesk.spec Log Message: - fix typo in release Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-5/fbdesk.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fbdesk.spec 30 Mar 2006 13:02:10 -0000 1.16 +++ fbdesk.spec 30 Mar 2006 14:24:30 -0000 1.17 @@ -1,6 +1,6 @@ Name: fbdesk Version: 1.4.0 -Release: 4%{?dist} +Release: 1%{?dist} Summary: Icon Manager for Fluxbox @@ -50,7 +50,7 @@ %changelog * Thu Mar 30 2006 Andreas Bierfert -1.4.0 +1.4.0-1 - version upgrade * Thu Mar 02 2006 Andreas Bierfert From fedora-extras-commits at redhat.com Thu Mar 30 14:24:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 07:24:30 -0700 Subject: rpms/fbdesk/devel fbdesk.spec,1.16,1.17 Message-ID: <200603301424.k2UEOWXQ007432@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7397/devel Modified Files: fbdesk.spec Log Message: - fix typo in release Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fbdesk.spec 30 Mar 2006 13:02:24 -0000 1.16 +++ fbdesk.spec 30 Mar 2006 14:24:30 -0000 1.17 @@ -1,6 +1,6 @@ Name: fbdesk Version: 1.4.0 -Release: 4%{?dist} +Release: 1%{?dist} Summary: Icon Manager for Fluxbox @@ -50,7 +50,7 @@ %changelog * Thu Mar 30 2006 Andreas Bierfert -1.4.0 +1.4.0-1 - version upgrade * Thu Mar 02 2006 Andreas Bierfert From fedora-extras-commits at redhat.com Thu Mar 30 15:01:03 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 08:01:03 -0700 Subject: rpms/abcm2ps/devel .cvsignore, 1.14, 1.15 abcm2ps.spec, 1.16, 1.17 sources, 1.14, 1.15 Message-ID: <200603301501.k2UF15uO009477@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8634 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 15 Mar 2006 17:17:05 -0000 1.14 +++ .cvsignore 30 Mar 2006 15:01:02 -0000 1.15 @@ -1,2 +1,2 @@ -abcm2ps-4.12.11.tar.gz +abcm2ps-4.12.12.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- abcm2ps.spec 15 Mar 2006 17:20:08 -0000 1.16 +++ abcm2ps.spec 30 Mar 2006 15:01:02 -0000 1.17 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.11 -Release: 2%{?dist} +Version: 4.12.12 +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-4.12.11.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.12.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 Mar 30 2006 Gerard Milmeister - 4.12.12-1 +- new version 4.12.12 + * Wed Mar 15 2006 Gerard Milmeister - 4.12.11-1 - new version 4.12.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 15 Mar 2006 17:17:05 -0000 1.14 +++ sources 30 Mar 2006 15:01:02 -0000 1.15 @@ -1,2 +1,2 @@ -8052dc74e322ecf065a44cf1e6bd05e0 abcm2ps-4.12.11.tar.gz +e293f78046593cdf9073878690e80e9a abcm2ps-4.12.12.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu Mar 30 15:04:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 08:04:07 -0700 Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.14, 1.15 abcm2ps.spec, 1.15, 1.16 sources, 1.14, 1.15 Message-ID: <200603301504.k2UF49hB009781@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9744/FC-4 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 15 Mar 2006 17:16:59 -0000 1.14 +++ .cvsignore 30 Mar 2006 15:04:07 -0000 1.15 @@ -1,2 +1,2 @@ -abcm2ps-4.12.11.tar.gz +abcm2ps-4.12.12.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- abcm2ps.spec 15 Mar 2006 17:20:02 -0000 1.15 +++ abcm2ps.spec 30 Mar 2006 15:04:07 -0000 1.16 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.11 -Release: 2%{?dist} +Version: 4.12.12 +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-4.12.11.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.12.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 Mar 30 2006 Gerard Milmeister - 4.12.12-1 +- new version 4.12.12 + * Wed Mar 15 2006 Gerard Milmeister - 4.12.11-1 - new version 4.12.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 15 Mar 2006 17:16:59 -0000 1.14 +++ sources 30 Mar 2006 15:04:07 -0000 1.15 @@ -1,2 +1,2 @@ -8052dc74e322ecf065a44cf1e6bd05e0 abcm2ps-4.12.11.tar.gz +e293f78046593cdf9073878690e80e9a abcm2ps-4.12.12.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu Mar 30 15:04:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 08:04:07 -0700 Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.14, 1.15 abcm2ps.spec, 1.16, 1.17 sources, 1.14, 1.15 Message-ID: <200603301504.k2UF495j009787@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9744/FC-5 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 15 Mar 2006 17:17:05 -0000 1.14 +++ .cvsignore 30 Mar 2006 15:04:07 -0000 1.15 @@ -1,2 +1,2 @@ -abcm2ps-4.12.11.tar.gz +abcm2ps-4.12.12.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.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- abcm2ps.spec 15 Mar 2006 17:20:08 -0000 1.16 +++ abcm2ps.spec 30 Mar 2006 15:04:07 -0000 1.17 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.11 -Release: 2%{?dist} +Version: 4.12.12 +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-4.12.11.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.12.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 Mar 30 2006 Gerard Milmeister - 4.12.12-1 +- new version 4.12.12 + * Wed Mar 15 2006 Gerard Milmeister - 4.12.11-1 - new version 4.12.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 15 Mar 2006 17:17:05 -0000 1.14 +++ sources 30 Mar 2006 15:04:07 -0000 1.15 @@ -1,2 +1,2 @@ -8052dc74e322ecf065a44cf1e6bd05e0 abcm2ps-4.12.11.tar.gz +e293f78046593cdf9073878690e80e9a abcm2ps-4.12.12.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu Mar 30 15:19:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 08:19:29 -0700 Subject: owners owners.list,1.779,1.780 Message-ID: <200603301519.k2UFJV3G010045@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10028 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.779 retrieving revision 1.780 diff -u -r1.779 -r1.780 --- owners.list 29 Mar 2006 21:57:47 -0000 1.779 +++ owners.list 30 Mar 2006 15:19:28 -0000 1.780 @@ -1348,6 +1348,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|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|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| +Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|syck|YAML for C, Python, and PHP|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 30 15:57:26 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 30 Mar 2006 08:57:26 -0700 Subject: rpms/cfitsio/devel cfitsio.spec,1.13,1.14 Message-ID: <200603301557.k2UFvSof010225@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10163/devel Modified Files: cfitsio.spec Log Message: Forgot to include %defattr() for the devel pacakge. Surprized this was missed for so long. Bugzilla bug 187366 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- cfitsio.spec 20 Mar 2006 02:44:49 -0000 1.13 +++ cfitsio.spec 30 Mar 2006 15:57:25 -0000 1.14 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -64,11 +64,15 @@ %{_libdir}/libcfitsio.so.* %files devel +%defattr(-,root,root,-) %{_includedir}/%{name} %{_libdir}/libcfitsio.a %{_libdir}/libcfitsio.so %changelog +* Thu Mar 30 2006 Matthew Truch - 3.006-5 +- Include defattr() for devel package as well - bug 187366 + * Sun Mar 19 2006 Matthew Truch - 3.006-4 - Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 From fedora-extras-commits at redhat.com Thu Mar 30 15:57:18 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 30 Mar 2006 08:57:18 -0700 Subject: rpms/cfitsio/FC-3 cfitsio.spec,1.8,1.9 Message-ID: <200603301557.k2UFvoe7010228@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10163/FC-3 Modified Files: cfitsio.spec Log Message: Forgot to include %defattr() for the devel pacakge. Surprized this was missed for so long. Bugzilla bug 187366 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-3/cfitsio.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cfitsio.spec 28 Feb 2006 20:33:38 -0000 1.8 +++ cfitsio.spec 30 Mar 2006 15:57:18 -0000 1.9 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -61,11 +61,15 @@ %{_libdir}/libcfitsio.so.* %files devel +%defattr(-,root,root,-) %{_includedir}/%{name} %{_libdir}/libcfitsio.a %{_libdir}/libcfitsio.so %changelog +* Thu Mar 30 2006 Matthew Truch - 3.006-3 +- Use defattr() for devel package as well - bug 187366 + * Tue Feb 28 2006 Matthew Truch - 3.006-2 - Fix spelling typo in name of License.txt file. From fedora-extras-commits at redhat.com Thu Mar 30 15:57:19 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 30 Mar 2006 08:57:19 -0700 Subject: rpms/cfitsio/FC-4 cfitsio.spec,1.12,1.13 Message-ID: <200603301557.k2UFvpVX010231@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10163/FC-4 Modified Files: cfitsio.spec Log Message: Forgot to include %defattr() for the devel pacakge. Surprized this was missed for so long. Bugzilla bug 187366 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-4/cfitsio.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cfitsio.spec 20 Mar 2006 02:44:37 -0000 1.12 +++ cfitsio.spec 30 Mar 2006 15:57:19 -0000 1.13 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -64,11 +64,15 @@ %{_libdir}/libcfitsio.so.* %files devel +%defattr(-,root,root,-) %{_includedir}/%{name} %{_libdir}/libcfitsio.a %{_libdir}/libcfitsio.so %changelog +* Thu Mar 30 2006 Matthew Truch - 3.006-5 +- Include defattr() for devel package as well - bug 187366 + * Sun Mar 19 2006 Matthew Truch - 3.006-4 - Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 From fedora-extras-commits at redhat.com Thu Mar 30 15:57:20 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 30 Mar 2006 08:57:20 -0700 Subject: rpms/cfitsio/FC-5 cfitsio.spec,1.13,1.14 Message-ID: <200603301557.k2UFvqUj010234@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10163/FC-5 Modified Files: cfitsio.spec Log Message: Forgot to include %defattr() for the devel pacakge. Surprized this was missed for so long. Bugzilla bug 187366 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-5/cfitsio.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- cfitsio.spec 20 Mar 2006 02:44:43 -0000 1.13 +++ cfitsio.spec 30 Mar 2006 15:57:20 -0000 1.14 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -64,11 +64,15 @@ %{_libdir}/libcfitsio.so.* %files devel +%defattr(-,root,root,-) %{_includedir}/%{name} %{_libdir}/libcfitsio.a %{_libdir}/libcfitsio.so %changelog +* Thu Mar 30 2006 Matthew Truch - 3.006-5 +- Include defattr() for devel package as well - bug 187366 + * Sun Mar 19 2006 Matthew Truch - 3.006-4 - Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 From fedora-extras-commits at redhat.com Thu Mar 30 16:03:53 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 09:03:53 -0700 Subject: rpms/ser/devel ser.spec,1.2,1.3 Message-ID: <200603301603.k2UG3teJ012419@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402 Modified Files: ser.spec Log Message: * Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 - Fix buildissue with %{_libdir} Index: ser.spec =================================================================== RCS file: /cvs/extras/rpms/ser/devel/ser.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ser.spec 30 Mar 2006 14:15:55 -0000 1.2 +++ ser.spec 30 Mar 2006 16:03:53 -0000 1.3 @@ -4,7 +4,7 @@ Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz @@ -77,19 +77,19 @@ %build -%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ +%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ + %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules done %install rm -rf $RPM_BUILD_ROOT -%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} +%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} + %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules done # postgres extras @@ -201,6 +201,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf %changelog +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 +- Fix buildissue with %%{_libdir} + * Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 - PPC patch to build the postgresql module on ppc From fedora-extras-commits at redhat.com Thu Mar 30 16:05:17 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 30 Mar 2006 09:05:17 -0700 Subject: owners owners.list,1.780,1.781 Message-ID: <200603301605.k2UG5JKN012493@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12476 Modified Files: owners.list Log Message: +gnome-applet-music Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.780 retrieving revision 1.781 diff -u -r1.780 -r1.781 --- owners.list 30 Mar 2006 15:19:28 -0000 1.780 +++ owners.list 30 Mar 2006 16:05:17 -0000 1.781 @@ -344,6 +344,7 @@ Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnomebaker|Gnome CD burner|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-music|A GNOME panel applet to control various music players|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netmon|GNOME Network Load Applet|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-rhythmbox|A GNOME panel applet to control Rhythmbox's playback|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 30 16:12:00 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 09:12:00 -0700 Subject: owners owners.list,1.781,1.782 Message-ID: <200603301612.k2UGC2ln012547@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12530 Modified Files: owners.list Log Message: Added perl-Data-HexDump Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.781 retrieving revision 1.782 diff -u -r1.781 -r1.782 --- owners.list 30 Mar 2006 16:05:17 -0000 1.781 +++ owners.list 30 Mar 2006 16:12:00 -0000 1.782 @@ -884,6 +884,7 @@ Fedora Extras|perl-Crypt-DSA|Perl module for DSA signatures and key generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Date-Pcalc|Gregorian calendar date calculations|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu Mar 30 16:19:12 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:19:12 -0700 Subject: rpms/ircd-hybrid/devel sources,1.4,1.5 Message-ID: <200603301619.k2UGJEkV012600@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12583 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Mar 2006 18:57:56 -0000 1.4 +++ sources 30 Mar 2006 16:19:11 -0000 1.5 @@ -1 +1 @@ -00901c5e2e9bf44ab37a28596af6608e ircd-hybrid-7.2.1.tgz + From fedora-extras-commits at redhat.com Thu Mar 30 16:25:56 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:25:56 -0700 Subject: rpms/ircd-hybrid import.log,1.21,1.22 Message-ID: <200603301625.k2UGPxWJ012709@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12676 Modified Files: import.log Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-3 from ircd-hybrid-7.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- import.log 29 Mar 2006 18:57:55 -0000 1.21 +++ import.log 30 Mar 2006 16:25:56 -0000 1.22 @@ -18,3 +18,4 @@ ircd-hybrid-7_2_0-5:HEAD:ircd-hybrid-7.2.0-5.src.rpm:1139607686 ircd-hybrid-7_2_0-6:HEAD:ircd-hybrid-7.2.0-6.src.rpm:1139953882 ircd-hybrid-7_2_1-1:HEAD:ircd-hybrid-7.2.1-1.src.rpm:1143658678 +ircd-hybrid-7_2_1-1:FC-3:ircd-hybrid-7.2.1-1.src.rpm:1143735948 From fedora-extras-commits at redhat.com Thu Mar 30 16:25:57 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:25:57 -0700 Subject: rpms/ircd-hybrid/FC-3 .cvsignore, 1.3, 1.4 ircd-hybrid.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200603301625.k2UGPx3U012715@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12676/FC-3 Modified Files: .cvsignore ircd-hybrid.spec sources Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-3 from ircd-hybrid-7.2.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Dec 2005 22:08:50 -0000 1.3 +++ .cvsignore 30 Mar 2006 16:25:57 -0000 1.4 @@ -1 +1 @@ -ircd-hybrid-7.2.0.tgz +ircd-hybrid-7.2.1.tgz Index: ircd-hybrid.spec =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/ircd-hybrid.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ircd-hybrid.spec 12 Dec 2005 15:16:36 -0000 1.6 +++ ircd-hybrid.spec 30 Mar 2006 16:25:57 -0000 1.7 @@ -9,11 +9,11 @@ Summary: Internet Relay Chat Server Name: ircd-hybrid -Version: 7.2.0 -Release: 4%{?dist} +Version: 7.2.1 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons -Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz +Source0: http://ovh.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz Source1: ircd-hybrid.init Source2: ircd-hybrid.sysconfig Patch0: ircd-hybrid-7.2.0-help.diff @@ -126,6 +126,15 @@ %changelog +* Tue Feb 14 2006 Eric Tanguy - 7.2.1-1 +- Update de 7.2.1 + +* Tue Feb 14 2006 Eric Tanguy - 7.2.0-6 +- Rebuild for FC5 + +* Fri Feb 10 2006 Eric Tanguy - 7.2.0-5 +- Rebuild for FC5 + * Fri Dec 09 2005 Eric Tanguy 7.2.0-4 - Modify spec file to help files Index: sources =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Dec 2005 22:08:50 -0000 1.3 +++ sources 30 Mar 2006 16:25:57 -0000 1.4 @@ -1 +1 @@ -e3c716fef0c62eaba147df06f32ea87d ircd-hybrid-7.2.0.tgz +00901c5e2e9bf44ab37a28596af6608e ircd-hybrid-7.2.1.tgz From fedora-extras-commits at redhat.com Thu Mar 30 16:26:54 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:26:54 -0700 Subject: rpms/perl-Test-MockObject/FC-5 .cvsignore, 1.6, 1.7 perl-Test-MockObject.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200603301626.k2UGQuLp012813@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-MockObject/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12773/FC-5 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Mar 2006 22:42:16 -0000 1.6 +++ .cvsignore 30 Mar 2006 16:26:54 -0000 1.7 @@ -1 +1 @@ -Test-MockObject-1.03.tar.gz +Test-MockObject-1.04.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/perl-Test-MockObject.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Test-MockObject.spec 13 Mar 2006 22:42:16 -0000 1.10 +++ perl-Test-MockObject.spec 30 Mar 2006 16:26:54 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-Test-MockObject -Version: 1.03 +Version: 1.04 Release: 1%{?dist} Summary: Perl extension for emulating troublesome interfaces @@ -11,6 +11,7 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) BuildRequires: perl(UNIVERSAL::can) >= 1.11 @@ -31,21 +32,19 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %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 ';' +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check -mv t/0-signature.t t/0-signature.t.disable -make test +mv t/developer/0-signature.t t/developer/0-signature.t.disable +PERL_RUN_ALL_TESTS=1 ./Build test %clean @@ -60,6 +59,10 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. +- Makefile.PL -> Build.PL. + * Mon Mar 13 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Mar 2006 22:42:16 -0000 1.6 +++ sources 30 Mar 2006 16:26:54 -0000 1.7 @@ -1 +1 @@ -b6a13614c61f68ff1cfc4c5609bff947 Test-MockObject-1.03.tar.gz +03224e5cecd7267c720994eeeb02c376 Test-MockObject-1.04.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 16:26:54 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:26:54 -0700 Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.6, 1.7 perl-Test-MockObject.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200603301626.k2UGQvqf012819@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-MockObject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12773/devel Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Mar 2006 22:42:16 -0000 1.6 +++ .cvsignore 30 Mar 2006 16:26:54 -0000 1.7 @@ -1 +1 @@ -Test-MockObject-1.03.tar.gz +Test-MockObject-1.04.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Test-MockObject.spec 13 Mar 2006 22:42:16 -0000 1.10 +++ perl-Test-MockObject.spec 30 Mar 2006 16:26:54 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-Test-MockObject -Version: 1.03 +Version: 1.04 Release: 1%{?dist} Summary: Perl extension for emulating troublesome interfaces @@ -11,6 +11,7 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) BuildRequires: perl(UNIVERSAL::can) >= 1.11 @@ -31,21 +32,19 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %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 ';' +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check -mv t/0-signature.t t/0-signature.t.disable -make test +mv t/developer/0-signature.t t/developer/0-signature.t.disable +PERL_RUN_ALL_TESTS=1 ./Build test %clean @@ -60,6 +59,10 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. +- Makefile.PL -> Build.PL. + * Mon Mar 13 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Mar 2006 22:42:16 -0000 1.6 +++ sources 30 Mar 2006 16:26:54 -0000 1.7 @@ -1 +1 @@ -b6a13614c61f68ff1cfc4c5609bff947 Test-MockObject-1.03.tar.gz +03224e5cecd7267c720994eeeb02c376 Test-MockObject-1.04.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 16:27:15 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:27:15 -0700 Subject: rpms/ircd-hybrid import.log,1.22,1.23 Message-ID: <200603301627.k2UGRH85012869@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12836 Modified Files: import.log Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-4 from ircd-hybrid-7.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- import.log 30 Mar 2006 16:25:56 -0000 1.22 +++ import.log 30 Mar 2006 16:27:15 -0000 1.23 @@ -19,3 +19,4 @@ ircd-hybrid-7_2_0-6:HEAD:ircd-hybrid-7.2.0-6.src.rpm:1139953882 ircd-hybrid-7_2_1-1:HEAD:ircd-hybrid-7.2.1-1.src.rpm:1143658678 ircd-hybrid-7_2_1-1:FC-3:ircd-hybrid-7.2.1-1.src.rpm:1143735948 +ircd-hybrid-7_2_1-1:FC-4:ircd-hybrid-7.2.1-1.src.rpm:1143736027 From fedora-extras-commits at redhat.com Thu Mar 30 16:27:16 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:27:16 -0700 Subject: rpms/ircd-hybrid/FC-4 .cvsignore, 1.3, 1.4 ircd-hybrid.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200603301627.k2UGRIFp012875@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12836/FC-4 Modified Files: .cvsignore ircd-hybrid.spec sources Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-4 from ircd-hybrid-7.2.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Dec 2005 22:04:11 -0000 1.3 +++ .cvsignore 30 Mar 2006 16:27:16 -0000 1.4 @@ -1 +1 @@ -ircd-hybrid-7.2.0.tgz +ircd-hybrid-7.2.1.tgz Index: ircd-hybrid.spec =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/ircd-hybrid.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ircd-hybrid.spec 12 Dec 2005 15:15:12 -0000 1.6 +++ ircd-hybrid.spec 30 Mar 2006 16:27:16 -0000 1.7 @@ -9,11 +9,11 @@ Summary: Internet Relay Chat Server Name: ircd-hybrid -Version: 7.2.0 -Release: 4%{?dist} +Version: 7.2.1 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons -Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz +Source0: http://ovh.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz Source1: ircd-hybrid.init Source2: ircd-hybrid.sysconfig Patch0: ircd-hybrid-7.2.0-help.diff @@ -126,6 +126,15 @@ %changelog +* Tue Feb 14 2006 Eric Tanguy - 7.2.1-1 +- Update de 7.2.1 + +* Tue Feb 14 2006 Eric Tanguy - 7.2.0-6 +- Rebuild for FC5 + +* Fri Feb 10 2006 Eric Tanguy - 7.2.0-5 +- Rebuild for FC5 + * Fri Dec 09 2005 Eric Tanguy 7.2.0-4 - Modify spec file to help files Index: sources =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Dec 2005 22:04:11 -0000 1.3 +++ sources 30 Mar 2006 16:27:16 -0000 1.4 @@ -1 +1 @@ -e3c716fef0c62eaba147df06f32ea87d ircd-hybrid-7.2.0.tgz +00901c5e2e9bf44ab37a28596af6608e ircd-hybrid-7.2.1.tgz From fedora-extras-commits at redhat.com Thu Mar 30 16:28:23 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:28:23 -0700 Subject: rpms/ircd-hybrid import.log,1.23,1.24 Message-ID: <200603301628.k2UGSPGh013008@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12975 Modified Files: import.log Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-5 from ircd-hybrid-7.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- import.log 30 Mar 2006 16:27:15 -0000 1.23 +++ import.log 30 Mar 2006 16:28:23 -0000 1.24 @@ -20,3 +20,4 @@ ircd-hybrid-7_2_1-1:HEAD:ircd-hybrid-7.2.1-1.src.rpm:1143658678 ircd-hybrid-7_2_1-1:FC-3:ircd-hybrid-7.2.1-1.src.rpm:1143735948 ircd-hybrid-7_2_1-1:FC-4:ircd-hybrid-7.2.1-1.src.rpm:1143736027 +ircd-hybrid-7_2_1-1:FC-5:ircd-hybrid-7.2.1-1.src.rpm:1143736095 From fedora-extras-commits at redhat.com Thu Mar 30 16:28:24 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:28:24 -0700 Subject: rpms/ircd-hybrid/FC-5 .cvsignore, 1.3, 1.4 ircd-hybrid.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200603301628.k2UGSQFv013014@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12975/FC-5 Modified Files: .cvsignore ircd-hybrid.spec sources Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-5 from ircd-hybrid-7.2.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Dec 2005 19:14:31 -0000 1.3 +++ .cvsignore 30 Mar 2006 16:28:23 -0000 1.4 @@ -1 +1 @@ -ircd-hybrid-7.2.0.tgz +ircd-hybrid-7.2.1.tgz Index: ircd-hybrid.spec =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-5/ircd-hybrid.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ircd-hybrid.spec 14 Feb 2006 21:51:39 -0000 1.9 +++ ircd-hybrid.spec 30 Mar 2006 16:28:23 -0000 1.10 @@ -9,11 +9,11 @@ Summary: Internet Relay Chat Server Name: ircd-hybrid -Version: 7.2.0 -Release: 6%{?dist} +Version: 7.2.1 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons -Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz +Source0: http://ovh.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz Source1: ircd-hybrid.init Source2: ircd-hybrid.sysconfig Patch0: ircd-hybrid-7.2.0-help.diff @@ -126,6 +126,9 @@ %changelog +* Tue Feb 14 2006 Eric Tanguy - 7.2.1-1 +- Update de 7.2.1 + * Tue Feb 14 2006 Eric Tanguy - 7.2.0-6 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Dec 2005 19:14:31 -0000 1.3 +++ sources 30 Mar 2006 16:28:23 -0000 1.4 @@ -1 +1 @@ -e3c716fef0c62eaba147df06f32ea87d ircd-hybrid-7.2.0.tgz +00901c5e2e9bf44ab37a28596af6608e ircd-hybrid-7.2.1.tgz From fedora-extras-commits at redhat.com Thu Mar 30 16:34:29 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 09:34:29 -0700 Subject: rpms/ser/FC-3 ser-0.9.6-ppc.patch,NONE,1.1 ser.spec,1.1,1.2 Message-ID: <200603301635.k2UGZ14i013401@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13340/FC-3 Modified Files: ser.spec Added Files: ser-0.9.6-ppc.patch Log Message: * Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 - Fix buildissue with %{_libdir} ser-0.9.6-ppc.patch: --- NEW FILE ser-0.9.6-ppc.patch --- --- ser-0.9.6/modules/postgres/aug_sysdep.h.orig 2006-03-30 16:07:32.113066656 +0200 +++ ser-0.9.6/modules/postgres/aug_sysdep.h 2006-03-30 16:05:31.611385696 +0200 @@ -225,6 +225,16 @@ typedef unsigned int augUInt32; #endif /* x86-64 */ + +#if defined(__powerpc) + +#if defined(__GNUC__) +#define AUG_CONFIGURATION "Linux PowerPC with GCC" +#endif + +typedef unsigned int augUInt32; + +#endif /* PowerPC */ #endif /* linux */ /* Index: ser.spec =================================================================== RCS file: /cvs/extras/rpms/ser/FC-3/ser.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ser.spec 29 Mar 2006 11:18:24 -0000 1.1 +++ ser.spec 30 Mar 2006 16:34:29 -0000 1.2 @@ -4,7 +4,7 @@ Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 2%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz @@ -12,6 +12,7 @@ Source2: serweb.conf Source3: ser.init Patch0: serweb-path.patch +Patch1: ser-0.9.6-ppc.patch URL: http://www.iptel.org/ser/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel @@ -66,6 +67,7 @@ %setup -q %setup -q -a 1 %patch0 -p1 -b .path +%patch1 -p1 -b .ppc # Enable SQL support for the acc module sed -i -e 's/#DEFS+=-DSQL_ACC/DEFS+=-DSQL_ACC/' modules/acc/Makefile @@ -75,19 +77,19 @@ %build -%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ +%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ + %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules done %install rm -rf $RPM_BUILD_ROOT -%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} +%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} + %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules done # postgres extras @@ -199,6 +201,12 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf %changelog +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 +- Fix buildissue with %%{_libdir} + +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 +- PPC patch to build the postgresql module on ppc + * Tue Mar 28 2006 Andreas Thienemann 0.9.6-2 - Changes to the spec-file, to conform to FE policies. From fedora-extras-commits at redhat.com Thu Mar 30 16:34:30 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 09:34:30 -0700 Subject: rpms/ser/FC-4 ser-0.9.6-ppc.patch,NONE,1.1 ser.spec,1.1,1.2 Message-ID: <200603301635.k2UGZ29X013404@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13340/FC-4 Modified Files: ser.spec Added Files: ser-0.9.6-ppc.patch Log Message: * Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 - Fix buildissue with %{_libdir} ser-0.9.6-ppc.patch: --- NEW FILE ser-0.9.6-ppc.patch --- --- ser-0.9.6/modules/postgres/aug_sysdep.h.orig 2006-03-30 16:07:32.113066656 +0200 +++ ser-0.9.6/modules/postgres/aug_sysdep.h 2006-03-30 16:05:31.611385696 +0200 @@ -225,6 +225,16 @@ typedef unsigned int augUInt32; #endif /* x86-64 */ + +#if defined(__powerpc) + +#if defined(__GNUC__) +#define AUG_CONFIGURATION "Linux PowerPC with GCC" +#endif + +typedef unsigned int augUInt32; + +#endif /* PowerPC */ #endif /* linux */ /* Index: ser.spec =================================================================== RCS file: /cvs/extras/rpms/ser/FC-4/ser.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ser.spec 29 Mar 2006 11:18:24 -0000 1.1 +++ ser.spec 30 Mar 2006 16:34:30 -0000 1.2 @@ -4,7 +4,7 @@ Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 2%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz @@ -12,6 +12,7 @@ Source2: serweb.conf Source3: ser.init Patch0: serweb-path.patch +Patch1: ser-0.9.6-ppc.patch URL: http://www.iptel.org/ser/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel @@ -66,6 +67,7 @@ %setup -q %setup -q -a 1 %patch0 -p1 -b .path +%patch1 -p1 -b .ppc # Enable SQL support for the acc module sed -i -e 's/#DEFS+=-DSQL_ACC/DEFS+=-DSQL_ACC/' modules/acc/Makefile @@ -75,19 +77,19 @@ %build -%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ +%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ + %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules done %install rm -rf $RPM_BUILD_ROOT -%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} +%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} + %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules done # postgres extras @@ -199,6 +201,12 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf %changelog +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 +- Fix buildissue with %%{_libdir} + +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 +- PPC patch to build the postgresql module on ppc + * Tue Mar 28 2006 Andreas Thienemann 0.9.6-2 - Changes to the spec-file, to conform to FE policies. From fedora-extras-commits at redhat.com Thu Mar 30 16:34:31 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 09:34:31 -0700 Subject: rpms/ser/FC-5 ser-0.9.6-ppc.patch,NONE,1.1 ser.spec,1.1,1.2 Message-ID: <200603301635.k2UGZ3wZ013407@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13340/FC-5 Modified Files: ser.spec Added Files: ser-0.9.6-ppc.patch Log Message: * Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 - Fix buildissue with %{_libdir} ser-0.9.6-ppc.patch: --- NEW FILE ser-0.9.6-ppc.patch --- --- ser-0.9.6/modules/postgres/aug_sysdep.h.orig 2006-03-30 16:07:32.113066656 +0200 +++ ser-0.9.6/modules/postgres/aug_sysdep.h 2006-03-30 16:05:31.611385696 +0200 @@ -225,6 +225,16 @@ typedef unsigned int augUInt32; #endif /* x86-64 */ + +#if defined(__powerpc) + +#if defined(__GNUC__) +#define AUG_CONFIGURATION "Linux PowerPC with GCC" +#endif + +typedef unsigned int augUInt32; + +#endif /* PowerPC */ #endif /* linux */ /* Index: ser.spec =================================================================== RCS file: /cvs/extras/rpms/ser/FC-5/ser.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ser.spec 29 Mar 2006 11:18:24 -0000 1.1 +++ ser.spec 30 Mar 2006 16:34:31 -0000 1.2 @@ -4,7 +4,7 @@ Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 2%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz @@ -12,6 +12,7 @@ Source2: serweb.conf Source3: ser.init Patch0: serweb-path.patch +Patch1: ser-0.9.6-ppc.patch URL: http://www.iptel.org/ser/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel @@ -66,6 +67,7 @@ %setup -q %setup -q -a 1 %patch0 -p1 -b .path +%patch1 -p1 -b .ppc # Enable SQL support for the acc module sed -i -e 's/#DEFS+=-DSQL_ACC/DEFS+=-DSQL_ACC/' modules/acc/Makefile @@ -75,19 +77,19 @@ %build -%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ +%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ + %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules done %install rm -rf $RPM_BUILD_ROOT -%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} +%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} + %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules done # postgres extras @@ -199,6 +201,12 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf %changelog +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 +- Fix buildissue with %%{_libdir} + +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 +- PPC patch to build the postgresql module on ppc + * Tue Mar 28 2006 Andreas Thienemann 0.9.6-2 - Changes to the spec-file, to conform to FE policies. From fedora-extras-commits at redhat.com Thu Mar 30 16:35:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:35:30 -0700 Subject: rpms/perl-pmtools/devel perl-pmtools.spec,1.6,1.7 Message-ID: <200603301635.k2UGZWUs013472@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13453 Modified Files: perl-pmtools.spec Log Message: New doc files: Changes and TODO. Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/devel/perl-pmtools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-pmtools.spec 22 Mar 2006 10:39:22 -0000 1.6 +++ perl-pmtools.spec 30 Mar 2006 16:35:30 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-pmtools Version: 1.01 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries @@ -53,7 +53,7 @@ %files %defattr(-,root,root,-) -%doc README +%doc Changes README TODO %{_bindir}/* %{perl_vendorlib}/Devel/ %{_mandir}/man1/*.1* @@ -61,6 +61,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.01-2 +- New doc files: Changes and TODO. + * Wed Mar 22 2006 Jose Pedro Oliveira - 1.01-1 - Update to 1.01. - URL updated: pmtools is now available in CPAN. From fedora-extras-commits at redhat.com Thu Mar 30 16:36:17 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 30 Mar 2006 09:36:17 -0700 Subject: rpms/denyhosts/devel denyhosts-2.2-config.patch, NONE, 1.1 denyhosts.init, 1.5, 1.6 denyhosts.spec, 1.27, 1.28 denyhosts-1.1.4-config.patch, 1.1, NONE Message-ID: <200603301636.k2UGaJ5E013646@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13596 Modified Files: denyhosts.init denyhosts.spec Added Files: denyhosts-2.2-config.patch Removed Files: denyhosts-1.1.4-config.patch Log Message: * Wed Mar 29 2006 Jason L Tibbitts III - 2.2-2 - Specfile cleanups. - Add hostname to default report subject. denyhosts-2.2-config.patch: --- NEW FILE denyhosts-2.2-config.patch --- --- denyhosts.cfg-dist.orig 2006-03-13 15:15:24.000000000 -0600 +++ denyhosts.cfg-dist 2006-03-29 21:53:36.198459392 -0600 @@ -46,13 +46,18 @@ # 'y' = years # # never purge: -PURGE_DENY = +#PURGE_DENY = # # purge entries older than 1 week #PURGE_DENY = 1w # # purge entries older than 5 days #PURGE_DENY = 5d +# +# For the default Fedora Extras install, we want timestamping but no +# expiration (at least by default) so this is deliberately set high. +# Adjust to taste. +PURGE_DENY = 4w ####################################################################### @@ -126,7 +131,7 @@ # Note: it is recommended that you use an absolute pathname # for this value (eg. /home/foo/denyhosts/data) # -WORK_DIR = /usr/share/denyhosts/data +WORK_DIR = /var/lib/denyhosts # ####################################################################### @@ -189,7 +194,7 @@ # match your email address. If you do not want to receive these reports # leave this field blank (or run with the --noemail option) # -ADMIN_EMAIL = +ADMIN_EMAIL = root # ####################################################################### @@ -228,7 +233,7 @@ # # SMTP_SUBJECT: you can specify the "Subject:" of messages sent # by DenyHosts when it reports thwarted abuse attempts -SMTP_SUBJECT = DenyHosts Report +SMTP_SUBJECT = DenyHosts Report from $[HOSTNAME] # ###################################################################### Index: denyhosts.init =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.init,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- denyhosts.init 16 Aug 2005 22:41:43 -0000 1.5 +++ denyhosts.init 30 Mar 2006 16:36:17 -0000 1.6 @@ -15,6 +15,11 @@ # source function library . /etc/rc.d/init.d/functions +# Make sure HOSTNAME is in the environment so denyhosts can +# use it in report subjects +HOSTNAME=$(hostname) +export HOSTNAME + CONTROL=/usr/bin/denyhosts-control CRONLOCK=/var/lock/subsys/denyhosts.init LOCKFILE=/var/lock/subsys/denyhosts Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- denyhosts.spec 14 Mar 2006 17:37:48 -0000 1.27 +++ denyhosts.spec 30 Mar 2006 16:36:17 -0000 1.28 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.2 -release: 1%{?dist} +Release: 2%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -13,11 +13,11 @@ Source4: denyhosts.sysconfig Source5: denyhosts.logrotate Source6: README.fedora -Patch0: denyhosts-1.1.4-config.patch +Patch0: denyhosts-2.2-config.patch Patch1: denyhosts-2.1-setup.patch Patch2: denyhosts-2.0-daemon-control.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArchitectures: noarch +BuildArch: noarch BuildRequires: python-devel Requires: openssh-server @@ -142,6 +142,10 @@ %changelog +* Wed Mar 29 2006 Jason L Tibbitts III - 2.2-2 +- Specfile cleanups. +- Add hostname to default report subject. + * Tue Mar 14 2006 Jason L Tibbitts III - 2.2-1 - Update to 2.2. --- denyhosts-1.1.4-config.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 16:52:51 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:52:51 -0700 Subject: rpms/syslog-ng/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 syslog-ng.spec, 1.11, 1.12 Message-ID: <200603301652.k2UGqr7N014494@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14437/FC-5 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Nov 2005 12:14:48 -0000 1.4 +++ .cvsignore 30 Mar 2006 16:52:51 -0000 1.5 @@ -1 +1 @@ -syslog-ng-1.6.9.tar.gz +syslog-ng-1.6.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Nov 2005 12:14:48 -0000 1.4 +++ sources 30 Mar 2006 16:52:51 -0000 1.5 @@ -1 +1 @@ -5280a86b4f5c25b2ba157c8cea302cf0 syslog-ng-1.6.9.tar.gz +b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/syslog-ng.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- syslog-ng.spec 15 Feb 2006 01:14:10 -0000 1.11 +++ syslog-ng.spec 30 Mar 2006 16:52:51 -0000 1.12 @@ -2,8 +2,8 @@ %define sbindir /sbin Name: syslog-ng -Version: 1.6.9 -Release: 3%{?dist} +Version: 1.6.10 +Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons @@ -17,8 +17,7 @@ BuildConflicts: libol-devel < 0.3.17 BuildRequires: flex, tcp_wrappers, which -# Requires sed v3.95 (command line option -i) -Requires: logrotate, sed >= 3.95 +Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts Requires(postun): initscripts @@ -43,7 +42,7 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.17/ChangeLog ChangeLog.libol +mv libol-0.3.18/ChangeLog ChangeLog.libol %build %configure \ @@ -98,7 +97,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt doc/sgml/syslog-ng.ps +%doc doc/sgml/syslog-ng.txt %doc doc/*.demo doc/*.sample %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl @@ -114,6 +113,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 +- Update to 1.6.10. + * Wed Feb 15 2006 Jose Pedro Oliveira - 1.6.9-3 - Rebuild. From fedora-extras-commits at redhat.com Thu Mar 30 16:52:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:52:52 -0700 Subject: rpms/syslog-ng/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 syslog-ng.spec, 1.11, 1.12 Message-ID: <200603301652.k2UGqs1e014500@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14437/devel Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Nov 2005 12:14:48 -0000 1.4 +++ .cvsignore 30 Mar 2006 16:52:52 -0000 1.5 @@ -1 +1 @@ -syslog-ng-1.6.9.tar.gz +syslog-ng-1.6.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Nov 2005 12:14:48 -0000 1.4 +++ sources 30 Mar 2006 16:52:52 -0000 1.5 @@ -1 +1 @@ -5280a86b4f5c25b2ba157c8cea302cf0 syslog-ng-1.6.9.tar.gz +b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- syslog-ng.spec 15 Feb 2006 01:14:10 -0000 1.11 +++ syslog-ng.spec 30 Mar 2006 16:52:52 -0000 1.12 @@ -2,8 +2,8 @@ %define sbindir /sbin Name: syslog-ng -Version: 1.6.9 -Release: 3%{?dist} +Version: 1.6.10 +Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons @@ -17,8 +17,7 @@ BuildConflicts: libol-devel < 0.3.17 BuildRequires: flex, tcp_wrappers, which -# Requires sed v3.95 (command line option -i) -Requires: logrotate, sed >= 3.95 +Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts Requires(postun): initscripts @@ -43,7 +42,7 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.17/ChangeLog ChangeLog.libol +mv libol-0.3.18/ChangeLog ChangeLog.libol %build %configure \ @@ -98,7 +97,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt doc/sgml/syslog-ng.ps +%doc doc/sgml/syslog-ng.txt %doc doc/*.demo doc/*.sample %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl @@ -114,6 +113,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 +- Update to 1.6.10. + * Wed Feb 15 2006 Jose Pedro Oliveira - 1.6.9-3 - Rebuild. From fedora-extras-commits at redhat.com Thu Mar 30 16:52:50 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:52:50 -0700 Subject: rpms/syslog-ng/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 syslog-ng.spec, 1.7, 1.8 Message-ID: <200603301652.k2UGqq3B014490@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14437/FC-4 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Dec 2005 20:37:38 -0000 1.4 +++ .cvsignore 30 Mar 2006 16:52:50 -0000 1.5 @@ -1 +1 @@ -syslog-ng-1.6.9.tar.gz +syslog-ng-1.6.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Dec 2005 20:37:38 -0000 1.4 +++ sources 30 Mar 2006 16:52:50 -0000 1.5 @@ -1 +1 @@ -5280a86b4f5c25b2ba157c8cea302cf0 syslog-ng-1.6.9.tar.gz +b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/syslog-ng.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- syslog-ng.spec 2 Dec 2005 20:37:38 -0000 1.7 +++ syslog-ng.spec 30 Mar 2006 16:52:50 -0000 1.8 @@ -2,7 +2,7 @@ %define sbindir /sbin Name: syslog-ng -Version: 1.6.9 +Version: 1.6.10 Release: 1%{?dist} Summary: Syslog replacement daemon @@ -17,8 +17,7 @@ BuildConflicts: libol-devel < 0.3.17 BuildRequires: flex, tcp_wrappers, which -# Requires sed v3.95 (command line option -i) -Requires: logrotate, sed >= 3.95 +Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts Requires(postun): initscripts @@ -48,7 +47,7 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.17/ChangeLog ChangeLog.libol +mv libol-0.3.18/ChangeLog ChangeLog.libol %build %configure \ @@ -103,7 +102,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt doc/sgml/syslog-ng.ps +%doc doc/sgml/syslog-ng.txt %doc doc/*.demo doc/*.sample %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl @@ -119,6 +118,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 +- Update to 1.6.10. + * Wed Nov 30 2005 Jose Pedro Oliveira - 1.6.9-1 - Build conflict statement (see: https://lists.balabit.hu/pipermail/syslog-ng/2005-June/007630.html) @@ -260,4 +262,4 @@ * Sun Dec 08 2002 Richard E. Perlotto II 1.5.23-1 - Updated file with notes and PGP signatures -# vim:set ai ts=4 sw=4: +# vim:set ai ts=4 sw=4 sts=4: From fedora-extras-commits at redhat.com Thu Mar 30 17:03:09 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 10:03:09 -0700 Subject: rpms/Macaulay2/FC-5 Macaulay2.spec,1.10,1.11 Message-ID: <200603301703.k2UH3Bv5016680@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16663 Modified Files: Macaulay2.spec Log Message: * Thu Mar 30 2006 Rex Dieter 0.9.2-19 - BR: factory-devel >= 2.0.5-7, libfac-devel >= 2.0.5-4 (bug #183265) Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Macaulay2.spec 14 Sep 2005 14:55:50 -0000 1.10 +++ Macaulay2.spec 30 Mar 2006 17:03:09 -0000 1.11 @@ -6,7 +6,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 0.9.2 -Release: 18%{?dist} +Release: 19%{?dist} License: GPL Group: Applications/Engineering URL: http://www.math.uiuc.edu/Macaulay2/ @@ -26,8 +26,8 @@ BuildRequires: desktop-file-utils BuildRequires: gc-devel >= 6.6 -BuildRequires: factory-devel >= 2.0.5 -BuildRequires: libfac-devel >= 2.0.5 +BuildRequires: factory-devel >= 2.0.5-7 +BuildRequires: libfac-devel >= 2.0.5-4 BuildRequires: gdbm-devel BuildRequires: time @@ -161,6 +161,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 0.9.2-19 +- BR: factory-devel >= 2.0.5-7, libfac-devel >= 2.0.5-4 (bug #183265) + * Wed Sep 14 2005 Rex Dieter - 0.9.2-18 - rebuild against gc-6.6 From fedora-extras-commits at redhat.com Thu Mar 30 17:32:57 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 10:32:57 -0700 Subject: rpms/perl-ExtUtils-CBuilder/FC-4 .cvsignore, 1.13, 1.14 perl-ExtUtils-CBuilder.spec, 1.17, 1.18 sources, 1.13, 1.14 Message-ID: <200603301732.k2UHWxZO016951@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16895/FC-4 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 18 Mar 2006 02:07:13 -0000 1.13 +++ .cvsignore 30 Mar 2006 17:32:56 -0000 1.14 @@ -1 +1 @@ -ExtUtils-CBuilder-0.17.tar.gz +ExtUtils-CBuilder-0.18.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:13 -0000 1.17 +++ perl-ExtUtils-CBuilder.spec 30 Mar 2006 17:32:57 -0000 1.18 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.17 +Version: 0.18 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 - Update to 0.17. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Mar 2006 02:07:13 -0000 1.13 +++ sources 30 Mar 2006 17:32:57 -0000 1.14 @@ -1 +1 @@ -b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz +d119f0c6c12787a8d5b255208c3c74c5 ExtUtils-CBuilder-0.18.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 17:32:57 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 10:32:57 -0700 Subject: rpms/perl-ExtUtils-CBuilder/FC-5 .cvsignore, 1.13, 1.14 perl-ExtUtils-CBuilder.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200603301732.k2UHWxjt016957@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16895/FC-5 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 18 Mar 2006 02:07:21 -0000 1.13 +++ .cvsignore 30 Mar 2006 17:32:57 -0000 1.14 @@ -1 +1 @@ -ExtUtils-CBuilder-0.17.tar.gz +ExtUtils-CBuilder-0.18.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:21 -0000 1.18 +++ perl-ExtUtils-CBuilder.spec 30 Mar 2006 17:32:57 -0000 1.19 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.17 +Version: 0.18 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 - Update to 0.17. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Mar 2006 02:07:21 -0000 1.13 +++ sources 30 Mar 2006 17:32:57 -0000 1.14 @@ -1 +1 @@ -b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz +d119f0c6c12787a8d5b255208c3c74c5 ExtUtils-CBuilder-0.18.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 17:32:58 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 10:32:58 -0700 Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.13, 1.14 perl-ExtUtils-CBuilder.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200603301733.k2UHX0Nu016963@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16895/devel Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 18 Mar 2006 02:07:33 -0000 1.13 +++ .cvsignore 30 Mar 2006 17:32:58 -0000 1.14 @@ -1 +1 @@ -ExtUtils-CBuilder-0.17.tar.gz +ExtUtils-CBuilder-0.18.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:33 -0000 1.18 +++ perl-ExtUtils-CBuilder.spec 30 Mar 2006 17:32:58 -0000 1.19 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.17 +Version: 0.18 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 - Update to 0.17. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Mar 2006 02:07:33 -0000 1.13 +++ sources 30 Mar 2006 17:32:58 -0000 1.14 @@ -1 +1 @@ -b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz +d119f0c6c12787a8d5b255208c3c74c5 ExtUtils-CBuilder-0.18.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 17:41:38 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 30 Mar 2006 10:41:38 -0700 Subject: rpms/heartbeat/FC-4 heartbeat-fedora-ccmuser.patch, NONE, 1.1 heartbeat-fedora-chkconfig.patch, NONE, 1.1 heartbeat-fedora-pam.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 heartbeat.spec, 1.1, 1.2 Message-ID: <200603301741.k2UHfeLg017210@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17180 Modified Files: .cvsignore sources heartbeat.spec Added Files: heartbeat-fedora-ccmuser.patch heartbeat-fedora-chkconfig.patch heartbeat-fedora-pam.patch Log Message: Update to 2.0.4 heartbeat-fedora-ccmuser.patch: --- NEW FILE heartbeat-fedora-ccmuser.patch --- diff -Nur heartbeat-2.0.4.orig/cts/CM_LinuxHAv2.py.in heartbeat-2.0.4/cts/CM_LinuxHAv2.py.in --- heartbeat-2.0.4.orig/cts/CM_LinuxHAv2.py.in 2006-02-27 10:19:42.000000000 +0100 +++ heartbeat-2.0.4/cts/CM_LinuxHAv2.py.in 2006-03-27 19:49:36.000000000 +0200 @@ -155,7 +155,7 @@ "root@" + (self["CIBfile"]%node)): raise ValueError("Can not scp file to %s "%node) - self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUID@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") + self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUSER@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") def prepare(self): '''Finish the Initialization process. Prepare to test...''' heartbeat-fedora-chkconfig.patch: --- NEW FILE heartbeat-fedora-chkconfig.patch --- diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.4/heartbeat/init.d/heartbeat.in --- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in 2005-09-10 23:46:23.000000000 +0200 +++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in 2006-03-27 19:55:19.000000000 +0200 @@ -13,7 +13,7 @@ # We don't hate anyone, and like for everyone to use # our software, no matter what OS or distribution you're using. # -# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ +# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ # description: Startup script high-availability services. # processname: heartbeat # pidfile: @localstatedir@/run/heartbeat.pid @@ -51,18 +51,6 @@ RUNDIR=@localstatedir@/run if - [ -r /etc/SuSE-release ] -then - # rc.status is new since SuSE 7.0 - [ -r /etc/rc.status ] && . /etc/rc.status - [ -r /etc/rc.config ] && . /etc/rc.config - - # Determine the base and follow a runlevel link name. - base=${0##*/} - link=${base#*[SK][0-9][0-9]} - -fi -if [ -z "$rc_done" ] then rc_done="Done." @@ -391,12 +379,7 @@ StartHA RC=$? Echo - if - [ $RC -eq 0 ] - then - [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR - touch $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && touch /var/lock/subsys/heartbeat RunStartStop post-start $RC ;; @@ -413,11 +396,7 @@ StopHA RC=$? Echo - if - [ $RC -eq 0 ] - then - rm -f $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && rm -f /var/lock/subsys/heartbeat RunStartStop post-stop $RC StopLogd ;; diff -Nur heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord heartbeat-2.0.4/ldirectord/init.d/ldirectord --- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord 2005-10-17 14:49:21.000000000 +0200 +++ heartbeat-2.0.4/ldirectord/init.d/ldirectord 2006-03-27 19:56:40.000000000 +0200 @@ -2,7 +2,7 @@ # # ldirectord Linux Director Daemon # -# chkconfig: 2345 92 40 +# chkconfig: - 92 40 # description: Start and stop ldirectord on non-heartbeat systems # Using the config file /etc/ha.d/ldirectord.cf # @@ -59,9 +59,11 @@ case "$1" in start) action "Starting ldirectord" $DAEMON start + touch /var/lock/subsys/ldirectord ;; stop) action "Stopping ldirectord" $DAEMON stop + rm -f /var/lock/subsys/ldirectord ;; restart) action "Restarting ldirectord" $DAEMON restart heartbeat-fedora-pam.patch: --- NEW FILE heartbeat-fedora-pam.patch --- diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.4/mgmt/daemon/mgmtd.pam --- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam 2005-12-30 09:35:27.000000000 +0100 +++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam 2006-03-27 19:59:12.000000000 +0200 @@ -1,3 +1,8 @@ -auth required pam_unix.so -account required pam_unix.so - +#%PAM-1.0 +auth sufficient pam_rootok.so +auth sufficient pam_timestamp.so +auth required pam_stack.so service=system-auth +session required pam_permit.so +session optional pam_xauth.so +session optional pam_timestamp.so +account required pam_permit.so Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Mar 2006 06:41:39 -0000 1.2 +++ .cvsignore 30 Mar 2006 17:41:38 -0000 1.3 @@ -1 +1 @@ -heartbeat-2.0.3.tar.gz +heartbeat-2.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Mar 2006 06:41:39 -0000 1.2 +++ sources 30 Mar 2006 17:41:38 -0000 1.3 @@ -1 +1 @@ -ef926928325e7f4c1aaa51b93dffdcf4 heartbeat-2.0.3.tar.gz +659aae2365daea3a17e5a4a4ae0b0a3e heartbeat-2.0.4.tar.gz Index: heartbeat.spec =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- heartbeat.spec 2 Mar 2006 06:41:39 -0000 1.1 +++ heartbeat.spec 30 Mar 2006 17:41:38 -0000 1.2 @@ -5,22 +5,21 @@ %define uname hacluster Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat -Version: 2.0.3 -Release: 9%{?dist} +Version: 2.0.4 +Release: 2%{?dist} License: GPL/LGPL URL: http://linux-ha.org/ Group: System Environment/Daemons Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz -Patch0: heartbeat-2.0.3-fedora-pam.patch -Patch1: heartbeat-2.0.3-fedora-chkconfig.patch -Patch2: heartbeat-2.0.3-fedora-ccmuser.patch +Patch0: heartbeat-fedora-pam.patch +Patch1: heartbeat-fedora-chkconfig.patch +Patch2: heartbeat-fedora-ccmuser.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel BuildRequires: iputils BuildRequires: openssl-devel BuildRequires: libnet-devel BuildRequires: libtool-ltdl-devel -#BuildRequires: fedora-usermgmt BuildRequires: net-snmp-devel BuildRequires: bzip2-devel %if %{ENABLE_MGMT} @@ -291,6 +290,9 @@ %{_libdir}/*.so %changelog +* Wed Mar 29 2006 Joost Soeterbroek - 2.0.4-2 +- Version 2.0.4 + * Wed Mar 1 2006 Joost Soeterbroek - 2.0.3-9 - changed user creation - added patch2 heartbeat-2.0.3-fedora-ccmuser.patch From fedora-extras-commits at redhat.com Thu Mar 30 17:42:04 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 30 Mar 2006 10:42:04 -0700 Subject: rpms/heartbeat/FC-5 heartbeat-fedora-ccmuser.patch, NONE, 1.1 heartbeat-fedora-chkconfig.patch, NONE, 1.1 heartbeat-fedora-pam.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 heartbeat.spec, 1.1, 1.2 Message-ID: <200603301742.k2UHg6kd017246@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17216 Modified Files: .cvsignore sources heartbeat.spec Added Files: heartbeat-fedora-ccmuser.patch heartbeat-fedora-chkconfig.patch heartbeat-fedora-pam.patch Log Message: Update to 2.0.4 heartbeat-fedora-ccmuser.patch: --- NEW FILE heartbeat-fedora-ccmuser.patch --- diff -Nur heartbeat-2.0.4.orig/cts/CM_LinuxHAv2.py.in heartbeat-2.0.4/cts/CM_LinuxHAv2.py.in --- heartbeat-2.0.4.orig/cts/CM_LinuxHAv2.py.in 2006-02-27 10:19:42.000000000 +0100 +++ heartbeat-2.0.4/cts/CM_LinuxHAv2.py.in 2006-03-27 19:49:36.000000000 +0200 @@ -155,7 +155,7 @@ "root@" + (self["CIBfile"]%node)): raise ValueError("Can not scp file to %s "%node) - self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUID@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") + self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUSER@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") def prepare(self): '''Finish the Initialization process. Prepare to test...''' heartbeat-fedora-chkconfig.patch: --- NEW FILE heartbeat-fedora-chkconfig.patch --- diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.4/heartbeat/init.d/heartbeat.in --- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in 2005-09-10 23:46:23.000000000 +0200 +++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in 2006-03-27 19:55:19.000000000 +0200 @@ -13,7 +13,7 @@ # We don't hate anyone, and like for everyone to use # our software, no matter what OS or distribution you're using. # -# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ +# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ # description: Startup script high-availability services. # processname: heartbeat # pidfile: @localstatedir@/run/heartbeat.pid @@ -51,18 +51,6 @@ RUNDIR=@localstatedir@/run if - [ -r /etc/SuSE-release ] -then - # rc.status is new since SuSE 7.0 - [ -r /etc/rc.status ] && . /etc/rc.status - [ -r /etc/rc.config ] && . /etc/rc.config - - # Determine the base and follow a runlevel link name. - base=${0##*/} - link=${base#*[SK][0-9][0-9]} - -fi -if [ -z "$rc_done" ] then rc_done="Done." @@ -391,12 +379,7 @@ StartHA RC=$? Echo - if - [ $RC -eq 0 ] - then - [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR - touch $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && touch /var/lock/subsys/heartbeat RunStartStop post-start $RC ;; @@ -413,11 +396,7 @@ StopHA RC=$? Echo - if - [ $RC -eq 0 ] - then - rm -f $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && rm -f /var/lock/subsys/heartbeat RunStartStop post-stop $RC StopLogd ;; diff -Nur heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord heartbeat-2.0.4/ldirectord/init.d/ldirectord --- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord 2005-10-17 14:49:21.000000000 +0200 +++ heartbeat-2.0.4/ldirectord/init.d/ldirectord 2006-03-27 19:56:40.000000000 +0200 @@ -2,7 +2,7 @@ # # ldirectord Linux Director Daemon # -# chkconfig: 2345 92 40 +# chkconfig: - 92 40 # description: Start and stop ldirectord on non-heartbeat systems # Using the config file /etc/ha.d/ldirectord.cf # @@ -59,9 +59,11 @@ case "$1" in start) action "Starting ldirectord" $DAEMON start + touch /var/lock/subsys/ldirectord ;; stop) action "Stopping ldirectord" $DAEMON stop + rm -f /var/lock/subsys/ldirectord ;; restart) action "Restarting ldirectord" $DAEMON restart heartbeat-fedora-pam.patch: --- NEW FILE heartbeat-fedora-pam.patch --- diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.4/mgmt/daemon/mgmtd.pam --- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam 2005-12-30 09:35:27.000000000 +0100 +++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam 2006-03-27 19:59:12.000000000 +0200 @@ -1,3 +1,8 @@ -auth required pam_unix.so -account required pam_unix.so - +#%PAM-1.0 +auth sufficient pam_rootok.so +auth sufficient pam_timestamp.so +auth required pam_stack.so service=system-auth +session required pam_permit.so +session optional pam_xauth.so +session optional pam_timestamp.so +account required pam_permit.so Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Mar 2006 06:41:39 -0000 1.2 +++ .cvsignore 30 Mar 2006 17:42:04 -0000 1.3 @@ -1 +1 @@ -heartbeat-2.0.3.tar.gz +heartbeat-2.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Mar 2006 06:41:39 -0000 1.2 +++ sources 30 Mar 2006 17:42:04 -0000 1.3 @@ -1 +1 @@ -ef926928325e7f4c1aaa51b93dffdcf4 heartbeat-2.0.3.tar.gz +659aae2365daea3a17e5a4a4ae0b0a3e heartbeat-2.0.4.tar.gz Index: heartbeat.spec =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- heartbeat.spec 2 Mar 2006 06:41:39 -0000 1.1 +++ heartbeat.spec 30 Mar 2006 17:42:04 -0000 1.2 @@ -5,22 +5,21 @@ %define uname hacluster Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat -Version: 2.0.3 -Release: 9%{?dist} +Version: 2.0.4 +Release: 2%{?dist} License: GPL/LGPL URL: http://linux-ha.org/ Group: System Environment/Daemons Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz -Patch0: heartbeat-2.0.3-fedora-pam.patch -Patch1: heartbeat-2.0.3-fedora-chkconfig.patch -Patch2: heartbeat-2.0.3-fedora-ccmuser.patch +Patch0: heartbeat-fedora-pam.patch +Patch1: heartbeat-fedora-chkconfig.patch +Patch2: heartbeat-fedora-ccmuser.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel BuildRequires: iputils BuildRequires: openssl-devel BuildRequires: libnet-devel BuildRequires: libtool-ltdl-devel -#BuildRequires: fedora-usermgmt BuildRequires: net-snmp-devel BuildRequires: bzip2-devel %if %{ENABLE_MGMT} @@ -291,6 +290,9 @@ %{_libdir}/*.so %changelog +* Wed Mar 29 2006 Joost Soeterbroek - 2.0.4-2 +- Version 2.0.4 + * Wed Mar 1 2006 Joost Soeterbroek - 2.0.3-9 - changed user creation - added patch2 heartbeat-2.0.3-fedora-ccmuser.patch From fedora-extras-commits at redhat.com Thu Mar 30 17:49:15 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Thu, 30 Mar 2006 10:49:15 -0700 Subject: rpms/dejavu-fonts import.log,1.44,1.45 Message-ID: <200603301749.k2UHnHLe017383@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17352 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4.1-2.fc6 on branch devel from dejavu-fonts-2.4.1-2.fc6.src.rpm I hate the buildsystem Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- import.log 29 Mar 2006 19:35:41 -0000 1.44 +++ import.log 30 Mar 2006 17:49:15 -0000 1.45 @@ -41,3 +41,4 @@ dejavu-fonts-2_4_1-1_fc6:HEAD:dejavu-fonts-2.4.1-1.fc6.src.rpm:1143660306 dejavu-fonts-2_4_1-1_fc5:FC-5:dejavu-fonts-2.4.1-1.fc5.src.rpm:1143660631 dejavu-fonts-2_4_1-1_fc4:FC-4:dejavu-fonts-2.4.1-1.fc4.src.rpm:1143660926 +dejavu-fonts-2_4_1-2_fc6:HEAD:dejavu-fonts-2.4.1-2.fc6.src.rpm:1143740939 From fedora-extras-commits at redhat.com Thu Mar 30 17:49:16 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Thu, 30 Mar 2006 10:49:16 -0700 Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.18,1.19 Message-ID: <200603301749.k2UHnI05017387@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17352/devel Modified Files: dejavu-fonts.spec Log Message: auto-import dejavu-fonts-2.4.1-2.fc6 on branch devel from dejavu-fonts-2.4.1-2.fc6.src.rpm I hate the buildsystem Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- dejavu-fonts.spec 29 Mar 2006 19:25:23 -0000 1.18 +++ dejavu-fonts.spec 30 Mar 2006 17:49:16 -0000 1.19 @@ -10,7 +10,7 @@ Name: dejavu-fonts Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions From fedora-extras-commits at redhat.com Thu Mar 30 18:04:10 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 11:04:10 -0700 Subject: comps comps-fe5.xml.in,1.31,1.32 Message-ID: <200603301804.k2UI4C3N019505@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19488 Modified Files: comps-fe5.xml.in Log Message: Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- comps-fe5.xml.in 23 Mar 2006 23:19:21 -0000 1.31 +++ comps-fe5.xml.in 30 Mar 2006 18:04:10 -0000 1.32 @@ -432,6 +432,7 @@ libvisual-plugins soundconverter soundtracker + sweep tagtool ushare xmms From fedora-extras-commits at redhat.com Thu Mar 30 18:15:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 11:15:24 -0700 Subject: rpms/sbcl/devel .cvsignore, 1.10, 1.11 sbcl.spec, 1.39, 1.40 sources, 1.10, 1.11 Message-ID: <200603301815.k2UIFQuc019605@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19584 Modified Files: .cvsignore sbcl.spec sources Log Message: * Mon Mar 27 2006 Rex Dieter 0.9.11-1 - 0.9.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Feb 2006 12:55:38 -0000 1.10 +++ .cvsignore 30 Mar 2006 18:15:23 -0000 1.11 @@ -1,4 +1,4 @@ -sbcl-0.9.10-source.tar.bz2 -sbcl-0.9.9-x86-linux-binary.tar.bz2 -sbcl-0.9.9-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-source.tar.bz2 +sbcl-0.9.11-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-x86-linux-binary.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sbcl.spec 27 Feb 2006 14:22:56 -0000 1.39 +++ sbcl.spec 30 Mar 2006 18:15:23 -0000 1.40 @@ -12,7 +12,7 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.10 +Version: 0.9.11 Release: 1%{?dist} License: BSD/MIT @@ -31,17 +31,17 @@ %define sbcl_arch x86 BuildRequires: sbcl # or -#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2 #define sbcl_bootstrap_src -a 10 %endif ## x86_64 section %ifarch x86_64 %define sbcl_arch x86-64 -#BuildRequires: sbcl +BuildRequires: sbcl # or -Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -%define sbcl_bootstrap_src -a 20 +#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 @@ -228,6 +228,9 @@ %changelog +* Mon Mar 27 2006 Rex Dieter 0.9.11-1 +- 0.9.11 + * Mon Feb 27 2006 Rex Dieter 0.9.10-1 - 0.9.10 - update/fix make-config-ppc patch (still broken, #177029) Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Feb 2006 12:55:38 -0000 1.10 +++ sources 30 Mar 2006 18:15:23 -0000 1.11 @@ -1,4 +1 @@ -58678d7081f32bdcd174c5233efba4f3 sbcl-0.9.10-source.tar.bz2 -417f524958fd7a4115902f14eaed3ab1 sbcl-0.9.9-x86-linux-binary.tar.bz2 -d9e4a6d95e255b3a24431f336fae236d sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +b82c3b7cf5c351cbe97af5150c17ad27 sbcl-0.9.11-source.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 18:28:12 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 11:28:12 -0700 Subject: rpms/multitail/FC-4 .cvsignore, 1.3, 1.4 multitail.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603301828.k2UISihl019834@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777/FC-4 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 3.8.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Mar 2006 15:57:33 -0000 1.3 +++ .cvsignore 30 Mar 2006 18:28:12 -0000 1.4 @@ -1 +1 @@ -multitail-3.8.9.tgz +multitail-3.8.10.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/multitail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- multitail.spec 14 Mar 2006 15:57:33 -0000 1.2 +++ multitail.spec 30 Mar 2006 18:28:12 -0000 1.3 @@ -1,5 +1,5 @@ Name: multitail -Version: 3.8.9 +Version: 3.8.10 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -27,9 +27,9 @@ external software, MultiTail can mimic the functionality of tools like 'watch' and such. + %prep %setup -q -%{__sed} -i 's/\r//' *.html %build CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} @@ -44,6 +44,7 @@ %clean %{__rm} -rf %{buildroot} + %files %defattr(-, root, root, 0755) %doc *.conf *.html Changes license.txt readme.txt @@ -51,7 +52,11 @@ %config(noreplace) %{_sysconfdir}/multitail.conf %{_bindir}/multitail + %changelog +* Thu Mar 30 2006 Folkert van Heuesden - 3.8.10-1 +- Updated to release 3.8.10. + * Tue Mar 14 2006 Folkert van Heuesden - 3.8.9-1 - Updated to release 3.8.9. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Mar 2006 15:57:33 -0000 1.3 +++ sources 30 Mar 2006 18:28:12 -0000 1.4 @@ -1 +1 @@ -feac6869ddb5ee974abbe52a0130af7e multitail-3.8.9.tgz +1b4cb6288298fe61c4c5147b50bfd48d multitail-3.8.10.tgz From fedora-extras-commits at redhat.com Thu Mar 30 18:28:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 11:28:14 -0700 Subject: rpms/multitail/devel .cvsignore, 1.3, 1.4 multitail.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603301828.k2UISkQj019844@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777/devel Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 3.8.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Mar 2006 15:57:38 -0000 1.3 +++ .cvsignore 30 Mar 2006 18:28:13 -0000 1.4 @@ -1 +1 @@ -multitail-3.8.9.tgz +multitail-3.8.10.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- multitail.spec 14 Mar 2006 15:57:38 -0000 1.2 +++ multitail.spec 30 Mar 2006 18:28:13 -0000 1.3 @@ -1,5 +1,5 @@ Name: multitail -Version: 3.8.9 +Version: 3.8.10 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -27,9 +27,9 @@ external software, MultiTail can mimic the functionality of tools like 'watch' and such. + %prep %setup -q -%{__sed} -i 's/\r//' *.html %build CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} @@ -44,6 +44,7 @@ %clean %{__rm} -rf %{buildroot} + %files %defattr(-, root, root, 0755) %doc *.conf *.html Changes license.txt readme.txt @@ -51,7 +52,11 @@ %config(noreplace) %{_sysconfdir}/multitail.conf %{_bindir}/multitail + %changelog +* Thu Mar 30 2006 Folkert van Heuesden - 3.8.10-1 +- Updated to release 3.8.10. + * Tue Mar 14 2006 Folkert van Heuesden - 3.8.9-1 - Updated to release 3.8.9. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Mar 2006 15:57:38 -0000 1.3 +++ sources 30 Mar 2006 18:28:13 -0000 1.4 @@ -1 +1 @@ -feac6869ddb5ee974abbe52a0130af7e multitail-3.8.9.tgz +1b4cb6288298fe61c4c5147b50bfd48d multitail-3.8.10.tgz From fedora-extras-commits at redhat.com Thu Mar 30 18:28:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 11:28:13 -0700 Subject: rpms/multitail/FC-5 .cvsignore, 1.3, 1.4 multitail.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603301828.k2UISjQo019839@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777/FC-5 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 3.8.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Mar 2006 15:57:38 -0000 1.3 +++ .cvsignore 30 Mar 2006 18:28:13 -0000 1.4 @@ -1 +1 @@ -multitail-3.8.9.tgz +multitail-3.8.10.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/multitail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- multitail.spec 14 Mar 2006 15:57:38 -0000 1.2 +++ multitail.spec 30 Mar 2006 18:28:13 -0000 1.3 @@ -1,5 +1,5 @@ Name: multitail -Version: 3.8.9 +Version: 3.8.10 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -27,9 +27,9 @@ external software, MultiTail can mimic the functionality of tools like 'watch' and such. + %prep %setup -q -%{__sed} -i 's/\r//' *.html %build CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} @@ -44,6 +44,7 @@ %clean %{__rm} -rf %{buildroot} + %files %defattr(-, root, root, 0755) %doc *.conf *.html Changes license.txt readme.txt @@ -51,7 +52,11 @@ %config(noreplace) %{_sysconfdir}/multitail.conf %{_bindir}/multitail + %changelog +* Thu Mar 30 2006 Folkert van Heuesden - 3.8.10-1 +- Updated to release 3.8.10. + * Tue Mar 14 2006 Folkert van Heuesden - 3.8.9-1 - Updated to release 3.8.9. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Mar 2006 15:57:38 -0000 1.3 +++ sources 30 Mar 2006 18:28:13 -0000 1.4 @@ -1 +1 @@ -feac6869ddb5ee974abbe52a0130af7e multitail-3.8.9.tgz +1b4cb6288298fe61c4c5147b50bfd48d multitail-3.8.10.tgz From fedora-extras-commits at redhat.com Thu Mar 30 18:42:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 11:42:06 -0700 Subject: rpms/lyx/devel helpers.sh,1.1,1.2 lyx.spec,1.30,1.31 Message-ID: <200603301842.k2UIg8wW020083@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20061 Modified Files: helpers.sh lyx.spec Log Message: * Thu Mar 30 2006 Rex Dieter 1.4.0-5 - %trigger ImageMagick (#186319) Index: helpers.sh =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/helpers.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- helpers.sh 20 Jan 2006 15:37:52 -0000 1.1 +++ helpers.sh 30 Mar 2006 18:42:06 -0000 1.2 @@ -1,5 +1,4 @@ #!/bin/bash -# $Id$ if [ -f /etc/lyx.conf ]; then source /etc/helpers.conf Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- lyx.spec 9 Mar 2006 16:15:37 -0000 1.30 +++ lyx.spec 30 Mar 2006 18:42:06 -0000 1.31 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Publishing @@ -104,26 +104,18 @@ optflags="$(echo %optflags | sed -e 's|-fexceptions||' )" %global optflags $optflags -for frontend in qt xforms ; do - %configure \ --disable-rpath \ --enable-compression-support \ - --with-frontend=$frontend \ + --with-frontend="qt xforms" \ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ --without-warnings --disable-dependency-tracking \ - --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ - -# Intermediate cleanup -# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking -make -C src/frontends clean + --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks make %{?_smp_mflags} -done - %install rm -rf $RPM_BUILD_ROOT @@ -163,12 +155,12 @@ texhash > /dev/null 2>&1 ||: # Catch installed/uninstalled helpers -%triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi -%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi @@ -203,6 +195,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 1.4.0-5 +- %%trigger ImageMagick (#186319) + * Thu Mar 09 2006 Rex Dieter 1.4.0-4 - fix stripping of -fexceptions from %%optflags From fedora-extras-commits at redhat.com Thu Mar 30 18:47:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 11:47:03 -0700 Subject: rpms/lyx/FC-5 helpers.sh,1.1,1.2 lyx.spec,1.30,1.31 Message-ID: <200603301847.k2UIl5Qn020185@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20166 Modified Files: helpers.sh lyx.spec Log Message: * Thu Mar 30 2006 Rex Dieter 1.4.0-5 - %trigger ImageMagick (#186319) Index: helpers.sh =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/helpers.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- helpers.sh 20 Jan 2006 15:37:52 -0000 1.1 +++ helpers.sh 30 Mar 2006 18:47:02 -0000 1.2 @@ -1,5 +1,4 @@ #!/bin/bash -# $Id$ if [ -f /etc/lyx.conf ]; then source /etc/helpers.conf Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- lyx.spec 9 Mar 2006 16:15:37 -0000 1.30 +++ lyx.spec 30 Mar 2006 18:47:02 -0000 1.31 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Publishing @@ -104,26 +104,18 @@ optflags="$(echo %optflags | sed -e 's|-fexceptions||' )" %global optflags $optflags -for frontend in qt xforms ; do - %configure \ --disable-rpath \ --enable-compression-support \ - --with-frontend=$frontend \ + --with-frontend="qt xforms" \ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ --without-warnings --disable-dependency-tracking \ - --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ - -# Intermediate cleanup -# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking -make -C src/frontends clean + --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks make %{?_smp_mflags} -done - %install rm -rf $RPM_BUILD_ROOT @@ -163,12 +155,12 @@ texhash > /dev/null 2>&1 ||: # Catch installed/uninstalled helpers -%triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi -%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi @@ -203,6 +195,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 1.4.0-5 +- %%trigger ImageMagick (#186319) + * Thu Mar 09 2006 Rex Dieter 1.4.0-4 - fix stripping of -fexceptions from %%optflags From fedora-extras-commits at redhat.com Thu Mar 30 19:04:59 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:04:59 -0700 Subject: rpms/sbcl/FC-5 .cvsignore, 1.10, 1.11 sbcl.spec, 1.39, 1.40 sources, 1.10, 1.11 Message-ID: <200603301905.k2UJ514A022280@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22259 Modified Files: .cvsignore sbcl.spec sources Log Message: * Mon Mar 27 2006 Rex Dieter 0.9.11-1 - 0.9.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Feb 2006 12:55:38 -0000 1.10 +++ .cvsignore 30 Mar 2006 19:04:59 -0000 1.11 @@ -1,4 +1,4 @@ -sbcl-0.9.10-source.tar.bz2 -sbcl-0.9.9-x86-linux-binary.tar.bz2 -sbcl-0.9.9-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-source.tar.bz2 +sbcl-0.9.11-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-x86-linux-binary.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sbcl.spec 27 Feb 2006 14:22:56 -0000 1.39 +++ sbcl.spec 30 Mar 2006 19:04:59 -0000 1.40 @@ -12,7 +12,7 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.10 +Version: 0.9.11 Release: 1%{?dist} License: BSD/MIT @@ -31,17 +31,17 @@ %define sbcl_arch x86 BuildRequires: sbcl # or -#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2 #define sbcl_bootstrap_src -a 10 %endif ## x86_64 section %ifarch x86_64 %define sbcl_arch x86-64 -#BuildRequires: sbcl +BuildRequires: sbcl # or -Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -%define sbcl_bootstrap_src -a 20 +#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 @@ -228,6 +228,9 @@ %changelog +* Mon Mar 27 2006 Rex Dieter 0.9.11-1 +- 0.9.11 + * Mon Feb 27 2006 Rex Dieter 0.9.10-1 - 0.9.10 - update/fix make-config-ppc patch (still broken, #177029) Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Feb 2006 12:55:38 -0000 1.10 +++ sources 30 Mar 2006 19:04:59 -0000 1.11 @@ -1,4 +1 @@ -58678d7081f32bdcd174c5233efba4f3 sbcl-0.9.10-source.tar.bz2 -417f524958fd7a4115902f14eaed3ab1 sbcl-0.9.9-x86-linux-binary.tar.bz2 -d9e4a6d95e255b3a24431f336fae236d sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +b82c3b7cf5c351cbe97af5150c17ad27 sbcl-0.9.11-source.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 19:12:27 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:12:27 -0700 Subject: rpms/maxima/devel maxima.spec,1.20,1.21 Message-ID: <200603301912.k2UJCTO2022374@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22357 Modified Files: maxima.spec Log Message: * Thu Mar 30 2006 Rex Dieter 5.9.2-13 - respin for sbcl-0.9.11 Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- maxima.spec 27 Mar 2006 18:07:59 -0000 1.20 +++ maxima.spec 30 Mar 2006 19:12:27 -0000 1.21 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 12%{?dist}.1 +Release: 13%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -147,7 +147,7 @@ %package runtime-sbcl Summary: Maxima compiled with SBCL Group: Applications/Engineering -BuildRequires: sbcl +BuildRequires: sbcl >= 0.9.11 # maxima requires the *same* version it was built against # this hack should work, even in mock (-: -- Rex %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) @@ -362,6 +362,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 5.9.2-13 +- respin for sbcl-0.9.11 + * Mon Mar 27 2006 Rex Dieter - fc5+: BR: texinfo -> texinfo-tex (#186827) From fedora-extras-commits at redhat.com Thu Mar 30 19:17:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:17:52 -0700 Subject: rpms/lyx/FC-4 lyx.spec,1.17,1.18 Message-ID: <200603301917.k2UJHsjh022461@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22444 Modified Files: lyx.spec Log Message: * Thu Mar 30 2006 Rex Dieter 1.4.0-5 - %trigger ImageMagick (#186319) Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- lyx.spec 10 Mar 2006 18:51:26 -0000 1.17 +++ lyx.spec 30 Mar 2006 19:17:52 -0000 1.18 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Publishing @@ -104,26 +104,18 @@ optflags="$(echo %optflags | sed -e 's|-fexceptions||' )" %global optflags $optflags -for frontend in qt xforms ; do - %configure \ --disable-rpath \ --enable-compression-support \ - --with-frontend=$frontend \ + --with-frontend="qt xforms" \ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ --without-warnings --disable-dependency-tracking \ - --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ - -# Intermediate cleanup -# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking -make -C src/frontends clean + --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks make %{?_smp_mflags} -done - %install rm -rf $RPM_BUILD_ROOT @@ -163,12 +155,12 @@ texhash > /dev/null 2>&1 ||: # Catch installed/uninstalled helpers -%triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi -%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi @@ -203,6 +195,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 1.4.0-5 +- %%trigger ImageMagick (#186319) + * Thu Mar 09 2006 Rex Dieter 1.4.0-4 - fix stripping of -fexceptions from %%optflags From fedora-extras-commits at redhat.com Thu Mar 30 19:29:12 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 12:29:12 -0700 Subject: rpms/pdsh/devel .cvsignore, 1.2, 1.3 pdsh.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603301929.k2UJTEB0022590@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22569 Modified Files: .cvsignore pdsh.spec sources Log Message: track upstream version 2.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Mar 2006 21:23:03 -0000 1.2 +++ .cvsignore 30 Mar 2006 19:29:11 -0000 1.3 @@ -1 +1 @@ -pdsh-2.8.1-1.tar.gz +pdsh-2.10.tar.gz Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/pdsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pdsh.spec 21 Mar 2006 21:23:03 -0000 1.1 +++ pdsh.spec 30 Mar 2006 19:29:11 -0000 1.2 @@ -1,14 +1,13 @@ Name: pdsh -Version: 2.8.1 -Release: 7 +Version: 2.10 +Release: 2 Summary: Parallel remote shell program License: GPL Url: http://sourceforge.net/projects/pdsh/ Group: System Environment/Base -Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}-1.tar.gz -Patch1: pdsh-load-so.patch +Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pdsh-rcmd @@ -217,8 +216,7 @@ ############################################################################## %prep -%setup -n pdsh-2.8.1-1 -%patch1 -p0 +%setup ############################################################################## @@ -260,10 +258,6 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT" make install -# needed to allow rpm's find-debuginfo.sh to find binaries by default they -# are installed with perms that aren't selected by the find in -# find-debuginfo.sh -chmod 755 $RPM_BUILD_ROOT/%{_bindir}/pd{sh,cp} if [ -x $RPM_BUILD_ROOT/%{_sbindir}/in.qshd ]; then install -D -m644 etc/qshell.xinetd $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/qshell fi @@ -404,6 +398,13 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-2 +- new version 2.10-1 used by upstream +- remove release from source line to track upstream +- deleted patch which is no longer needed +- removed -n from setup line. No longer needed. +- hack to fix perms so no longer needed + * Mon Mar 13 2006 Ben Woodard 2.8.1-7 - An optimization in pdsh depended on the .la files being there. Removed optimization. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Mar 2006 21:23:03 -0000 1.2 +++ sources 30 Mar 2006 19:29:11 -0000 1.3 @@ -1 +1 @@ -d39b58da791f9437bdb4848da4efd6d1 pdsh-2.8.1-1.tar.gz +60f7fe11a98c72733a716ee392c0313a pdsh-2.10.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:38:34 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 30 Mar 2006 12:38:34 -0700 Subject: rpms/perl-MIME-Lite/FC-4 perl-MIME-Lite.spec,1.2,1.3 Message-ID: <200603301939.k2UJd6QX022772@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-MIME-Lite/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22723/FC-4 Modified Files: perl-MIME-Lite.spec Log Message: New Maintainer Index: perl-MIME-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/FC-4/perl-MIME-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-MIME-Lite.spec 23 Jun 2005 02:44:11 -0000 1.2 +++ perl-MIME-Lite.spec 30 Mar 2006 19:38:34 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-MIME-Lite Version: 3.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MIME::Lite - low-calorie MIME generator Group: Development/Libraries @@ -14,10 +14,10 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -MIME::Lite is intended as a simple, standalone module for generating -(not parsing!) MIME messages... specifically, it allows you to -output a simple, decent single- or multi-part message with text or binaryattachments. It does not require that you have the Mail:: or MIME:: -modules installed. +MIME::Lite is intended as a simple, standalone module for generating (not +parsing!) MIME messages... specifically, it allows you to output a simple, +decent single- or multi-part message with text or binaryattachments. It does +not require that you have the Mail:: or MIME:: modules installed. %prep %setup -q -n MIME-Lite-%{version} @@ -52,6 +52,9 @@ %changelog +* Thu Mar 30 2006 Mike McGrath 3.01-4 +- New maintainer + * Thu Jun 23 2005 Ralf Corsepius 3.01-3 - Add %%{dist}. From fedora-extras-commits at redhat.com Thu Mar 30 19:38:35 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 30 Mar 2006 12:38:35 -0700 Subject: rpms/perl-MIME-Lite/FC-5 perl-MIME-Lite.spec,1.2,1.3 Message-ID: <200603301939.k2UJd71K022775@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-MIME-Lite/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22723/FC-5 Modified Files: perl-MIME-Lite.spec Log Message: New Maintainer Index: perl-MIME-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/FC-5/perl-MIME-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-MIME-Lite.spec 23 Jun 2005 02:44:12 -0000 1.2 +++ perl-MIME-Lite.spec 30 Mar 2006 19:38:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-MIME-Lite Version: 3.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MIME::Lite - low-calorie MIME generator Group: Development/Libraries @@ -14,10 +14,10 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -MIME::Lite is intended as a simple, standalone module for generating -(not parsing!) MIME messages... specifically, it allows you to -output a simple, decent single- or multi-part message with text or binaryattachments. It does not require that you have the Mail:: or MIME:: -modules installed. +MIME::Lite is intended as a simple, standalone module for generating (not +parsing!) MIME messages... specifically, it allows you to output a simple, +decent single- or multi-part message with text or binaryattachments. It does +not require that you have the Mail:: or MIME:: modules installed. %prep %setup -q -n MIME-Lite-%{version} @@ -52,6 +52,9 @@ %changelog +* Thu Mar 30 2006 Mike McGrath 3.01-4 +- New maintainer + * Thu Jun 23 2005 Ralf Corsepius 3.01-3 - Add %%{dist}. From fedora-extras-commits at redhat.com Thu Mar 30 19:38:35 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 30 Mar 2006 12:38:35 -0700 Subject: rpms/perl-MIME-Lite/devel perl-MIME-Lite.spec,1.2,1.3 Message-ID: <200603301939.k2UJd8p9022778@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-MIME-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22723/devel Modified Files: perl-MIME-Lite.spec Log Message: New Maintainer Index: perl-MIME-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/devel/perl-MIME-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-MIME-Lite.spec 23 Jun 2005 02:44:12 -0000 1.2 +++ perl-MIME-Lite.spec 30 Mar 2006 19:38:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-MIME-Lite Version: 3.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MIME::Lite - low-calorie MIME generator Group: Development/Libraries @@ -14,10 +14,10 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -MIME::Lite is intended as a simple, standalone module for generating -(not parsing!) MIME messages... specifically, it allows you to -output a simple, decent single- or multi-part message with text or binaryattachments. It does not require that you have the Mail:: or MIME:: -modules installed. +MIME::Lite is intended as a simple, standalone module for generating (not +parsing!) MIME messages... specifically, it allows you to output a simple, +decent single- or multi-part message with text or binaryattachments. It does +not require that you have the Mail:: or MIME:: modules installed. %prep %setup -q -n MIME-Lite-%{version} @@ -52,6 +52,9 @@ %changelog +* Thu Mar 30 2006 Mike McGrath 3.01-4 +- New maintainer + * Thu Jun 23 2005 Ralf Corsepius 3.01-3 - Add %%{dist}. From fedora-extras-commits at redhat.com Thu Mar 30 19:42:58 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 12:42:58 -0700 Subject: rpms/pdsh/FC-4 .cvsignore, 1.2, 1.3 pdsh.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603301943.k2UJh03p022858@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22837 Modified Files: .cvsignore pdsh.spec sources Log Message: track upstream version 2.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Mar 2006 21:23:03 -0000 1.2 +++ .cvsignore 30 Mar 2006 19:42:58 -0000 1.3 @@ -1 +1 @@ -pdsh-2.8.1-1.tar.gz +pdsh-2.10.tar.gz Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-4/pdsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pdsh.spec 21 Mar 2006 21:23:03 -0000 1.1 +++ pdsh.spec 30 Mar 2006 19:42:58 -0000 1.2 @@ -1,14 +1,13 @@ Name: pdsh -Version: 2.8.1 -Release: 7 +Version: 2.10 +Release: 2 Summary: Parallel remote shell program License: GPL Url: http://sourceforge.net/projects/pdsh/ Group: System Environment/Base -Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}-1.tar.gz -Patch1: pdsh-load-so.patch +Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pdsh-rcmd @@ -217,8 +216,7 @@ ############################################################################## %prep -%setup -n pdsh-2.8.1-1 -%patch1 -p0 +%setup ############################################################################## @@ -260,10 +258,6 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT" make install -# needed to allow rpm's find-debuginfo.sh to find binaries by default they -# are installed with perms that aren't selected by the find in -# find-debuginfo.sh -chmod 755 $RPM_BUILD_ROOT/%{_bindir}/pd{sh,cp} if [ -x $RPM_BUILD_ROOT/%{_sbindir}/in.qshd ]; then install -D -m644 etc/qshell.xinetd $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/qshell fi @@ -404,6 +398,13 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-2 +- new version 2.10-1 used by upstream +- remove release from source line to track upstream +- deleted patch which is no longer needed +- removed -n from setup line. No longer needed. +- hack to fix perms so no longer needed + * Mon Mar 13 2006 Ben Woodard 2.8.1-7 - An optimization in pdsh depended on the .la files being there. Removed optimization. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Mar 2006 21:23:03 -0000 1.2 +++ sources 30 Mar 2006 19:42:58 -0000 1.3 @@ -1 +1 @@ -d39b58da791f9437bdb4848da4efd6d1 pdsh-2.8.1-1.tar.gz +60f7fe11a98c72733a716ee392c0313a pdsh-2.10.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:52:12 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:52:12 -0700 Subject: rpms/baobab/FC-4 .cvsignore, 1.8, 1.9 baobab.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200603301952.k2UJqEk3022973@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22952 Modified Files: .cvsignore baobab.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Jan 2006 17:39:44 -0000 1.8 +++ .cvsignore 30 Mar 2006 19:52:12 -0000 1.9 @@ -1 +1 @@ -baobab-2.3.1.tar.gz +baobab-2.3.2.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- baobab.spec 12 Jan 2006 17:39:44 -0000 1.8 +++ baobab.spec 30 Mar 2006 19:52:12 -0000 1.9 @@ -1,5 +1,5 @@ Name: baobab -Version: 2.3.1 +Version: 2.3.2 Release: 1%{?dist} Summary: Graphical tool to analyse directory trees @@ -57,6 +57,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 +- Update to newer version + * Thu Jan 12 2006 Deji Akingunola - 2.3.1-1 - Take over packaging from Thorsten Leemhuis - Update to 2.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Jan 2006 17:39:44 -0000 1.8 +++ sources 30 Mar 2006 19:52:12 -0000 1.9 @@ -1 +1 @@ -474f95940d90474b2bc15fa989f17393 baobab-2.3.1.tar.gz +00cd8c87183e8ecadadfe225112efd46 baobab-2.3.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:52:46 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:52:46 -0700 Subject: rpms/maxima/devel maxima.spec,1.21,1.22 Message-ID: <200603301952.k2UJqmtI023048@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23023 Modified Files: maxima.spec Log Message: oops, texinfo-tex applies only to fc6+ Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- maxima.spec 30 Mar 2006 19:12:27 -0000 1.21 +++ maxima.spec 30 Mar 2006 19:52:45 -0000 1.22 @@ -62,7 +62,7 @@ BuildRequires: time # texi2dvi -%if "%{?fedora}" > "4" +%if "%{?fedora}" > "5" BuildRequires: texinfo-tex %else BuildRequires: texinfo @@ -366,7 +366,7 @@ - respin for sbcl-0.9.11 * Mon Mar 27 2006 Rex Dieter -- fc5+: BR: texinfo -> texinfo-tex (#186827) +- fc6+: BR: texinfo -> texinfo-tex (#186827) * Thu Mar 09 2006 Rex Dieter 5.9.2-12 - enable runtime-cmucl (%%ix86 only, atm) From fedora-extras-commits at redhat.com Thu Mar 30 19:53:13 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:53:13 -0700 Subject: rpms/baobab/FC-5 .cvsignore, 1.8, 1.9 baobab.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200603301953.k2UJrF8h023091@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23070 Modified Files: .cvsignore baobab.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Jan 2006 17:36:55 -0000 1.8 +++ .cvsignore 30 Mar 2006 19:53:13 -0000 1.9 @@ -1 +1 @@ -baobab-2.3.1.tar.gz +baobab-2.3.2.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-5/baobab.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- baobab.spec 13 Feb 2006 20:59:21 -0000 1.12 +++ baobab.spec 30 Mar 2006 19:53:13 -0000 1.13 @@ -1,6 +1,6 @@ Name: baobab -Version: 2.3.1 -Release: 2%{?dist} +Version: 2.3.2 +Release: 1%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System @@ -56,6 +56,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 2.3.1-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Jan 2006 17:36:55 -0000 1.8 +++ sources 30 Mar 2006 19:53:13 -0000 1.9 @@ -1 +1 @@ -474f95940d90474b2bc15fa989f17393 baobab-2.3.1.tar.gz +00cd8c87183e8ecadadfe225112efd46 baobab-2.3.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:53:18 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:53:18 -0700 Subject: rpms/maxima/FC-5 maxima.spec,1.19,1.20 Message-ID: <200603301953.k2UJrLox023116@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23097 Modified Files: maxima.spec Log Message: * Thu Mar 30 2006 Rex Dieter 5.9.2-13 - respin for sbcl-0.9.11 Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- maxima.spec 9 Mar 2006 21:37:42 -0000 1.19 +++ maxima.spec 30 Mar 2006 19:53:18 -0000 1.20 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -61,7 +61,12 @@ %define debug_package %{nil} BuildRequires: time +# texi2dvi +%if "%{?fedora}" > "5" +BuildRequires: texinfo-tex +%else BuildRequires: texinfo +%endif BuildRequires: tetex-latex BuildRequires: desktop-file-utils # /usr/bin/wish @@ -142,7 +147,7 @@ %package runtime-sbcl Summary: Maxima compiled with SBCL Group: Applications/Engineering -BuildRequires: sbcl +BuildRequires: sbcl >= 0.9.11 # maxima requires the *same* version it was built against # this hack should work, even in mock (-: -- Rex %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) @@ -205,7 +210,7 @@ install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf pushd info - texi2dvi -p maxima.texi + texi2dvi --pdf maxima.texi popd pushd intromax @@ -357,6 +362,12 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 5.9.2-13 +- respin for sbcl-0.9.11 + +* Mon Mar 27 2006 Rex Dieter +- fc6+: BR: texinfo -> texinfo-tex (#186827) + * Thu Mar 09 2006 Rex Dieter 5.9.2-12 - enable runtime-cmucl (%%ix86 only, atm) From fedora-extras-commits at redhat.com Thu Mar 30 19:54:09 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:54:09 -0700 Subject: rpms/baobab/devel .cvsignore, 1.8, 1.9 baobab.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200603301954.k2UJsBvZ023229@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23208 Modified Files: .cvsignore baobab.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Jan 2006 17:36:55 -0000 1.8 +++ .cvsignore 30 Mar 2006 19:54:08 -0000 1.9 @@ -1 +1 @@ -baobab-2.3.1.tar.gz +baobab-2.3.2.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- baobab.spec 13 Feb 2006 20:59:21 -0000 1.12 +++ baobab.spec 30 Mar 2006 19:54:08 -0000 1.13 @@ -1,6 +1,6 @@ Name: baobab -Version: 2.3.1 -Release: 2%{?dist} +Version: 2.3.2 +Release: 1%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System @@ -56,6 +56,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 2.3.1-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Jan 2006 17:36:55 -0000 1.8 +++ sources 30 Mar 2006 19:54:09 -0000 1.9 @@ -1 +1 @@ -474f95940d90474b2bc15fa989f17393 baobab-2.3.1.tar.gz +00cd8c87183e8ecadadfe225112efd46 baobab-2.3.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:55:52 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:55:52 -0700 Subject: rpms/gparted/FC-5 .cvsignore, 1.5, 1.6 gparted.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200603301955.k2UJtsf7023311@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gparted/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23290 Modified Files: .cvsignore gparted.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.2.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gparted/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Mar 2006 20:10:44 -0000 1.5 +++ .cvsignore 30 Mar 2006 19:55:52 -0000 1.6 @@ -1 +1 @@ -gparted-0.2.2.tar.bz2 +gparted-0.2.3.tar.bz2 Index: gparted.spec =================================================================== RCS file: /cvs/extras/rpms/gparted/FC-5/gparted.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gparted.spec 7 Mar 2006 20:10:44 -0000 1.6 +++ gparted.spec 30 Mar 2006 19:55:52 -0000 1.7 @@ -1,6 +1,6 @@ Summary: Gnome Partition Editor Name: gparted -Version: 0.2.2 +Version: 0.2.3 Release: 1%{?dist} Group: Applications/System License: GPL @@ -77,6 +77,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.2.3-1 +- Update to newer version + * Mon Mar 07 2006 Deji Akingunola - 0.2.2-1 - New release Index: sources =================================================================== RCS file: /cvs/extras/rpms/gparted/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Mar 2006 20:10:44 -0000 1.5 +++ sources 30 Mar 2006 19:55:52 -0000 1.6 @@ -1 +1 @@ -40419b1b10723055edfc6567a296fea0 gparted-0.2.2.tar.bz2 +329e7a254e82d29b67e521ec3f1906c7 gparted-0.2.3.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 19:56:23 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:56:23 -0700 Subject: rpms/sbcl/FC-4 .cvsignore, 1.9, 1.10 sbcl.spec, 1.33, 1.34 sources, 1.9, 1.10 Message-ID: <200603301956.k2UJuPKr023384@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23363 Modified Files: .cvsignore sbcl.spec sources Log Message: * Mon Mar 27 2006 Rex Dieter 0.9.11-1 - 0.9.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 27 Feb 2006 14:59:42 -0000 1.9 +++ .cvsignore 30 Mar 2006 19:56:23 -0000 1.10 @@ -1,4 +1,4 @@ -sbcl-0.9.10-source.tar.bz2 -sbcl-0.9.9-x86-linux-binary.tar.bz2 -sbcl-0.9.9-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-source.tar.bz2 +sbcl-0.9.11-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-x86-linux-binary.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sbcl.spec 27 Feb 2006 14:59:42 -0000 1.33 +++ sbcl.spec 30 Mar 2006 19:56:23 -0000 1.34 @@ -12,7 +12,7 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.10 +Version: 0.9.11 Release: 1%{?dist} License: BSD/MIT @@ -31,17 +31,17 @@ %define sbcl_arch x86 BuildRequires: sbcl # or -#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2 #define sbcl_bootstrap_src -a 10 %endif ## x86_64 section %ifarch x86_64 %define sbcl_arch x86-64 -#BuildRequires: sbcl +BuildRequires: sbcl # or -Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -%define sbcl_bootstrap_src -a 20 +#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 @@ -228,6 +228,9 @@ %changelog +* Mon Mar 27 2006 Rex Dieter 0.9.11-1 +- 0.9.11 + * Mon Feb 27 2006 Rex Dieter 0.9.10-1 - 0.9.10 - update/fix make-config-ppc patch (still broken, #177029) Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 27 Feb 2006 14:59:42 -0000 1.9 +++ sources 30 Mar 2006 19:56:23 -0000 1.10 @@ -1,4 +1 @@ -58678d7081f32bdcd174c5233efba4f3 sbcl-0.9.10-source.tar.bz2 -417f524958fd7a4115902f14eaed3ab1 sbcl-0.9.9-x86-linux-binary.tar.bz2 -d9e4a6d95e255b3a24431f336fae236d sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +b82c3b7cf5c351cbe97af5150c17ad27 sbcl-0.9.11-source.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 19:56:32 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:56:32 -0700 Subject: rpms/gparted/devel .cvsignore, 1.5, 1.6 gparted.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200603301956.k2UJuYMD023449@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gparted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23426 Modified Files: .cvsignore gparted.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.2.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Mar 2006 20:10:44 -0000 1.5 +++ .cvsignore 30 Mar 2006 19:56:32 -0000 1.6 @@ -1 +1 @@ -gparted-0.2.2.tar.bz2 +gparted-0.2.3.tar.bz2 Index: gparted.spec =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gparted.spec 7 Mar 2006 20:10:44 -0000 1.6 +++ gparted.spec 30 Mar 2006 19:56:32 -0000 1.7 @@ -1,6 +1,6 @@ Summary: Gnome Partition Editor Name: gparted -Version: 0.2.2 +Version: 0.2.3 Release: 1%{?dist} Group: Applications/System License: GPL @@ -77,6 +77,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.2.3-1 +- Update to newer version + * Mon Mar 07 2006 Deji Akingunola - 0.2.2-1 - New release Index: sources =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Mar 2006 20:10:44 -0000 1.5 +++ sources 30 Mar 2006 19:56:32 -0000 1.6 @@ -1 +1 @@ -40419b1b10723055edfc6567a296fea0 gparted-0.2.2.tar.bz2 +329e7a254e82d29b67e521ec3f1906c7 gparted-0.2.3.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 19:58:20 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:58:20 -0700 Subject: rpms/libqalculate/FC-4 .cvsignore, 1.5, 1.6 libqalculate.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603301958.k2UJwNOl023545@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/libqalculate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23524 Modified Files: .cvsignore libqalculate.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 22:57:06 -0000 1.5 +++ .cvsignore 30 Mar 2006 19:58:20 -0000 1.6 @@ -1 +1 @@ -libqalculate-0.9.2.tar.gz +libqalculate-0.9.3.tar.gz Index: libqalculate.spec =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-4/libqalculate.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libqalculate.spec 27 Dec 2005 22:57:06 -0000 1.7 +++ libqalculate.spec 30 Mar 2006 19:58:20 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Multi-purpose calculator library Name: libqalculate -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -73,6 +73,9 @@ %{_bindir}/qalc %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Tue Dec 27 2005 Deji Akingunola - 0.9.2-1 - Upgrade to new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 22:57:06 -0000 1.5 +++ sources 30 Mar 2006 19:58:20 -0000 1.6 @@ -1 +1 @@ -f7a67bb97e943641868fd1ddf395742d libqalculate-0.9.2.tar.gz +de72bbdb75d39e4e274d4142a92c90d3 libqalculate-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:59:08 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:59:08 -0700 Subject: rpms/libqalculate/FC-5 .cvsignore, 1.5, 1.6 libqalculate.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603301959.k2UJxA6m023616@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/libqalculate/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23595 Modified Files: .cvsignore libqalculate.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 22:54:20 -0000 1.5 +++ .cvsignore 30 Mar 2006 19:59:08 -0000 1.6 @@ -1 +1 @@ -libqalculate-0.9.2.tar.gz +libqalculate-0.9.3.tar.gz Index: libqalculate.spec =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-5/libqalculate.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libqalculate.spec 13 Feb 2006 20:56:12 -0000 1.7 +++ libqalculate.spec 30 Mar 2006 19:59:08 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Multi-purpose calculator library Name: libqalculate -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://qalculate.sourceforge.net/ @@ -73,6 +73,9 @@ %{_bindir}/qalc %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 22:54:20 -0000 1.5 +++ sources 30 Mar 2006 19:59:08 -0000 1.6 @@ -1 +1 @@ -f7a67bb97e943641868fd1ddf395742d libqalculate-0.9.2.tar.gz +de72bbdb75d39e4e274d4142a92c90d3 libqalculate-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:59:49 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:59:49 -0700 Subject: rpms/libqalculate/devel .cvsignore, 1.5, 1.6 libqalculate.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603301959.k2UJxp6l023687@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/libqalculate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23666 Modified Files: .cvsignore libqalculate.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libqalculate/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 22:54:20 -0000 1.5 +++ .cvsignore 30 Mar 2006 19:59:49 -0000 1.6 @@ -1 +1 @@ -libqalculate-0.9.2.tar.gz +libqalculate-0.9.3.tar.gz Index: libqalculate.spec =================================================================== RCS file: /cvs/extras/rpms/libqalculate/devel/libqalculate.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libqalculate.spec 13 Feb 2006 20:56:12 -0000 1.7 +++ libqalculate.spec 30 Mar 2006 19:59:49 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Multi-purpose calculator library Name: libqalculate -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://qalculate.sourceforge.net/ @@ -73,6 +73,9 @@ %{_bindir}/qalc %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libqalculate/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 22:54:20 -0000 1.5 +++ sources 30 Mar 2006 19:59:49 -0000 1.6 @@ -1 +1 @@ -f7a67bb97e943641868fd1ddf395742d libqalculate-0.9.2.tar.gz +de72bbdb75d39e4e274d4142a92c90d3 libqalculate-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:04:23 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 13:04:23 -0700 Subject: rpms/stratagus/devel stratagus.spec,1.4,1.5 Message-ID: <200603302004.k2UK4PBP025767@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25750 Modified Files: stratagus.spec Log Message: Disabled parallel builds Index: stratagus.spec =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- stratagus.spec 30 Mar 2006 06:56:21 -0000 1.4 +++ stratagus.spec 30 Mar 2006 20:04:22 -0000 1.5 @@ -6,12 +6,13 @@ Name: stratagus Summary: Real-time strategy gaming engine Version: 2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Libraries URL: http://stratagus.sourceforge.net/ Source0: http://dl.sf.net/%{name}/%{name}-%{version}-src.tar.gz Patch0: stratagus--lp64.diff +Patch1: stratagus--Rules_make_in.diff BuildRequires: flac-devel BuildRequires: mikmod-devel BuildRequires: lua @@ -38,6 +39,7 @@ %prep %setup -q -n %{name}-040702 %patch0 +%patch1 %build %configure --with-x \ @@ -52,7 +54,7 @@ --with-opengl \ --with-cdaudio=sdlcd -%{__make} %{?_smp_mflags} +%{__make} %install %{__rm} -rf %{buildroot} @@ -69,6 +71,10 @@ %changelog +* Thu Mar 30 2006 Peter Lemenkov 2.1-4%{?dist} +- patch for removal /usr/local/-directories from Rules.make.in +- temporarily disabled parallel make + * Thu Mar 30 2006 Peter Lemenkov 2.1-2%{?dist} - added dist-tag From fedora-extras-commits at redhat.com Thu Mar 30 20:07:06 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 13:07:06 -0700 Subject: rpms/pdsh/devel pdsh.spec,1.2,1.3 pdsh-load-so.patch,1.1,NONE Message-ID: <200603302007.k2UK7820025837@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25815 Modified Files: pdsh.spec Removed Files: pdsh-load-so.patch Log Message: Added the dist tag so that I can build for FC4 & FC5. Removed unneeded patch. Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/pdsh.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pdsh.spec 30 Mar 2006 19:29:11 -0000 1.2 +++ pdsh.spec 30 Mar 2006 20:07:06 -0000 1.3 @@ -1,6 +1,6 @@ Name: pdsh Version: 2.10 -Release: 2 +Release: 3%{?dist} Summary: Parallel remote shell program @@ -398,6 +398,9 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-3 +- added dist tag so that I can build on multiple versions + * Thu Mar 30 2006 Ben Woodard 2.10-2 - new version 2.10-1 used by upstream - remove release from source line to track upstream --- pdsh-load-so.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 20:07:27 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 13:07:27 -0700 Subject: rpms/stratagus/devel stratagus--Rules_make_in.diff,NONE,1.1 Message-ID: <200603302007.k2UK7TOS025903@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25845 Added Files: stratagus--Rules_make_in.diff Log Message: Added new patch stratagus--Rules_make_in.diff: --- NEW FILE stratagus--Rules_make_in.diff --- --- Rules.make.in 2004-07-02 05:38:08.000000000 +0400 +++ Rules.make.in 2006-03-30 23:51:00.000000000 +0400 @@ -29,13 +29,13 @@ COMP_CFLAGS = -DUSE_ZLIB @BZ2_CFLAGS@ COMP_LIBS = -lz @BZ2_LIBS@ -TOOLLIBS=$(XLDFLAGS) -lpng -lz -lm @EXTRA_LIBS@ @THREAD_LIBS@ -L/usr/local/lib \ +TOOLLIBS=$(XLDFLAGS) -lpng -lz -lm @EXTRA_LIBS@ @THREAD_LIBS@ \ @STATIC_LDFLAGS@ STRATAGUS_LIBS= -lpng -lz -lm \ @EXTRA_LIBS@ @VIDEO_LIBS@ @THREAD_LIBS@ $(CCLLIB) $(COMP_LIBS) \ @FLAC_LIBS@ @OGG_LIBS@ @MAD_LIBS@ @MIKMOD_LIBS@ @CDAUDIO_LIBS@ \ - @LUA_LIBS@ @STATIC_LDFLAGS@ -lz -lm -L/usr/local/lib + @LUA_LIBS@ @STATIC_LDFLAGS@ -lz -lm DISTLIST=$(TOPDIR)/distlist TAGS=$(TOPDIR)/src/tags @@ -54,8 +54,7 @@ @PROFILE_CFLAGS@ @DEBUG_CFLAGS@ @VIDEO_CFLAGS@ @BZ2_CFLAGS@ \ @OGG_CFLAGS@ @MAD_CFLAGS@ @FLAC_CFLAGS@ @CDAUDIO_CFLAGS@ \ @MIKMOD_CFLAGS@ @LUA_CFLAGS@ $(CCL) \ - $(COMP_CFLAGS) @PLATFORM@ \ - -I/usr/local/include + $(COMP_CFLAGS) @PLATFORM@ CTAGSFLAGS=-i defptvS -a -f From fedora-extras-commits at redhat.com Thu Mar 30 20:07:52 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:07:52 -0700 Subject: rpms/qalculate-gtk/FC-4 .cvsignore, 1.4, 1.5 qalculate-gtk.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603302007.k2UK7sMD025968@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-gtk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25945 Modified Files: .cvsignore qalculate-gtk.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Dec 2005 23:22:03 -0000 1.4 +++ .cvsignore 30 Mar 2006 20:07:51 -0000 1.5 @@ -1 +1 @@ -qalculate-gtk-0.9.2.tar.gz +qalculate-gtk-0.9.3.tar.gz Index: qalculate-gtk.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/qalculate-gtk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qalculate-gtk.spec 27 Dec 2005 23:22:03 -0000 1.5 +++ qalculate-gtk.spec 30 Mar 2006 20:07:51 -0000 1.6 @@ -1,6 +1,6 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-gtk -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} License: GPL Group: Applications/Engineering @@ -62,6 +62,9 @@ %{_datadir}/qalculate-gtk/ %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Tue Dec 27 2005 Deji Akingunola - 0.9.2-1 - Upgrade to new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2005 23:22:03 -0000 1.4 +++ sources 30 Mar 2006 20:07:51 -0000 1.5 @@ -1 +1 @@ -287cb244e13f7c12074f89ca8f008528 qalculate-gtk-0.9.2.tar.gz +debcba3c990ee391d3c11f9d5c44e910 qalculate-gtk-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:08:35 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 13:08:35 -0700 Subject: rpms/stratagus/devel stratagus.spec,1.5,1.6 Message-ID: <200603302008.k2UK8bpr026034@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26017 Modified Files: stratagus.spec Log Message: rebuild Index: stratagus.spec =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- stratagus.spec 30 Mar 2006 20:04:22 -0000 1.5 +++ stratagus.spec 30 Mar 2006 20:08:35 -0000 1.6 @@ -6,7 +6,7 @@ Name: stratagus Summary: Real-time strategy gaming engine Version: 2.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Development/Libraries URL: http://stratagus.sourceforge.net/ @@ -71,6 +71,9 @@ %changelog +* Thu Mar 30 2006 Peter Lemenkov 2.1-5%{?dist} +- addition of new patch + * Thu Mar 30 2006 Peter Lemenkov 2.1-4%{?dist} - patch for removal /usr/local/-directories from Rules.make.in - temporarily disabled parallel make From fedora-extras-commits at redhat.com Thu Mar 30 20:08:59 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:08:59 -0700 Subject: rpms/qalculate-gtk/FC-5 .cvsignore, 1.5, 1.6 qalculate-gtk.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603302009.k2UK91Xx026072@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-gtk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26051 Modified Files: .cvsignore qalculate-gtk.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 23:12:13 -0000 1.5 +++ .cvsignore 30 Mar 2006 20:08:59 -0000 1.6 @@ -1 +1 @@ -qalculate-gtk-0.9.2.tar.gz +qalculate-gtk-0.9.3.tar.gz Index: qalculate-gtk.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-5/qalculate-gtk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qalculate-gtk.spec 13 Feb 2006 21:05:38 -0000 1.7 +++ qalculate-gtk.spec 30 Mar 2006 20:08:59 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-gtk -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3 +Release: 1%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -62,6 +62,9 @@ %{_datadir}/qalculate-gtk/ %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 23:12:13 -0000 1.5 +++ sources 30 Mar 2006 20:08:59 -0000 1.6 @@ -1 +1 @@ -287cb244e13f7c12074f89ca8f008528 qalculate-gtk-0.9.2.tar.gz +debcba3c990ee391d3c11f9d5c44e910 qalculate-gtk-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:09:31 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:09:31 -0700 Subject: rpms/qalculate-gtk/devel .cvsignore, 1.5, 1.6 qalculate-gtk.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603302009.k2UK9XfO026105@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26084 Modified Files: .cvsignore qalculate-gtk.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 23:12:13 -0000 1.5 +++ .cvsignore 30 Mar 2006 20:09:31 -0000 1.6 @@ -1 +1 @@ -qalculate-gtk-0.9.2.tar.gz +qalculate-gtk-0.9.3.tar.gz Index: qalculate-gtk.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/devel/qalculate-gtk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qalculate-gtk.spec 13 Feb 2006 21:05:38 -0000 1.7 +++ qalculate-gtk.spec 30 Mar 2006 20:09:31 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-gtk -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3 +Release: 1%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -62,6 +62,9 @@ %{_datadir}/qalculate-gtk/ %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 23:12:13 -0000 1.5 +++ sources 30 Mar 2006 20:09:31 -0000 1.6 @@ -1 +1 @@ -287cb244e13f7c12074f89ca8f008528 qalculate-gtk-0.9.2.tar.gz +debcba3c990ee391d3c11f9d5c44e910 qalculate-gtk-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:10:26 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:10:26 -0700 Subject: rpms/qalculate-kde/FC-4 .cvsignore, 1.4, 1.5 qalculate-kde.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603302010.k2UKASet026177@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26156 Modified Files: .cvsignore qalculate-kde.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Dec 2005 23:36:09 -0000 1.4 +++ .cvsignore 30 Mar 2006 20:10:26 -0000 1.5 @@ -1 +1 @@ -qalculate-kde-0.9.2.tar.gz +qalculate-kde-0.9.3.1.tar.gz Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/qalculate-kde.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qalculate-kde.spec 27 Dec 2005 23:36:09 -0000 1.4 +++ qalculate-kde.spec 30 Mar 2006 20:10:26 -0000 1.5 @@ -1,6 +1,6 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde -Version: 0.9.2 +Version: 0.9.3.1 Release: 1%{?dist} License: GPL Group: Applications/Engineering @@ -61,6 +61,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 +- Update to newer version + * Tue Dec 27 2005 Deji Akingunola - 0.9.2-1 - Upgrade to new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2005 23:36:09 -0000 1.4 +++ sources 30 Mar 2006 20:10:26 -0000 1.5 @@ -1 +1 @@ -f77569e3396e3af769526ded6393c0e1 qalculate-kde-0.9.2.tar.gz +38a9ff6a0d832abf2618b06a61a1add3 qalculate-kde-0.9.3.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:10:52 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:10:52 -0700 Subject: rpms/qalculate-kde/FC-5 .cvsignore, 1.4, 1.5 qalculate-kde.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603302010.k2UKAs2k026212@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26191 Modified Files: .cvsignore qalculate-kde.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Dec 2005 23:27:45 -0000 1.4 +++ .cvsignore 30 Mar 2006 20:10:52 -0000 1.5 @@ -1 +1 @@ -qalculate-kde-0.9.2.tar.gz +qalculate-kde-0.9.3.1.tar.gz Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-5/qalculate-kde.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qalculate-kde.spec 13 Feb 2006 21:06:54 -0000 1.5 +++ qalculate-kde.spec 30 Mar 2006 20:10:52 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3.1 +Release: 1%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -61,6 +61,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2005 23:27:45 -0000 1.4 +++ sources 30 Mar 2006 20:10:52 -0000 1.5 @@ -1 +1 @@ -f77569e3396e3af769526ded6393c0e1 qalculate-kde-0.9.2.tar.gz +38a9ff6a0d832abf2618b06a61a1add3 qalculate-kde-0.9.3.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:11:24 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:11:24 -0700 Subject: rpms/qalculate-kde/devel .cvsignore, 1.4, 1.5 qalculate-kde.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603302011.k2UKBQRu026254@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26233 Modified Files: .cvsignore qalculate-kde.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Dec 2005 23:27:45 -0000 1.4 +++ .cvsignore 30 Mar 2006 20:11:24 -0000 1.5 @@ -1 +1 @@ -qalculate-kde-0.9.2.tar.gz +qalculate-kde-0.9.3.1.tar.gz Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/devel/qalculate-kde.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qalculate-kde.spec 13 Feb 2006 21:06:54 -0000 1.5 +++ qalculate-kde.spec 30 Mar 2006 20:11:24 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3.1 +Release: 1%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -61,6 +61,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2005 23:27:45 -0000 1.4 +++ sources 30 Mar 2006 20:11:24 -0000 1.5 @@ -1 +1 @@ -f77569e3396e3af769526ded6393c0e1 qalculate-kde-0.9.2.tar.gz +38a9ff6a0d832abf2618b06a61a1add3 qalculate-kde-0.9.3.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:11:58 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 13:11:58 -0700 Subject: rpms/pdsh/FC-4 pdsh.spec,1.2,1.3 pdsh-load-so.patch,1.1,NONE Message-ID: <200603302012.k2UKC0WH026283@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26231 Modified Files: pdsh.spec Removed Files: pdsh-load-so.patch Log Message: Added dist tag so that I can build on different versions of fedora removed load patch which is not needed in 2.10 Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-4/pdsh.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pdsh.spec 30 Mar 2006 19:42:58 -0000 1.2 +++ pdsh.spec 30 Mar 2006 20:11:57 -0000 1.3 @@ -1,6 +1,6 @@ Name: pdsh Version: 2.10 -Release: 2 +Release: 3%{?dist} Summary: Parallel remote shell program @@ -398,6 +398,9 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-3 +- added dist tag so that I can build on multiple versions + * Thu Mar 30 2006 Ben Woodard 2.10-2 - new version 2.10-1 used by upstream - remove release from source line to track upstream --- pdsh-load-so.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 20:14:19 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:14:19 -0700 Subject: rpms/baobab/FC-4 baobab.spec,1.9,1.10 Message-ID: <200603302014.k2UKELs1026367@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26350 Modified Files: baobab.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 - Put in right version in the source tag Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- baobab.spec 30 Mar 2006 19:52:12 -0000 1.9 +++ baobab.spec 30 Mar 2006 20:14:19 -0000 1.10 @@ -1,12 +1,12 @@ Name: baobab Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-2.3.1.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -57,6 +57,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 +- Put in right version in the source tag + * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:15:09 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:15:09 -0700 Subject: rpms/baobab/FC-5 baobab.spec,1.13,1.14 Message-ID: <200603302015.k2UKFCIp026434@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26417 Modified Files: baobab.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 - Put in right version in the source tag Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-5/baobab.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- baobab.spec 30 Mar 2006 19:53:13 -0000 1.13 +++ baobab.spec 30 Mar 2006 20:15:09 -0000 1.14 @@ -1,12 +1,12 @@ Name: baobab Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-2.3.1.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -56,6 +56,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 +- Put in right version in the source tag + * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:15:45 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:15:45 -0700 Subject: rpms/baobab/devel baobab.spec,1.13,1.14 Message-ID: <200603302015.k2UKFlTU026498@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26480 Modified Files: baobab.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 - Put in right version in the source tag Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- baobab.spec 30 Mar 2006 19:54:08 -0000 1.13 +++ baobab.spec 30 Mar 2006 20:15:45 -0000 1.14 @@ -1,12 +1,12 @@ Name: baobab Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-2.3.1.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -56,6 +56,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 +- Put in right version in the source tag + * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:18:57 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 13:18:57 -0700 Subject: rpms/pdsh/FC-5 pdsh.spec,1.1,1.2 pdsh-load-so.patch,1.1,NONE Message-ID: <200603302018.k2UKIxJb026573@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26556 Modified Files: pdsh.spec Removed Files: pdsh-load-so.patch Log Message: added dist tag so that I could on multiple versions of fedora removed pdsh-load-so.patch which isn't needed in 2.10 track upstream 2.10 version of pdsh Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-5/pdsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pdsh.spec 21 Mar 2006 21:23:03 -0000 1.1 +++ pdsh.spec 30 Mar 2006 20:18:57 -0000 1.2 @@ -1,14 +1,13 @@ Name: pdsh -Version: 2.8.1 -Release: 7 +Version: 2.10 +Release: 3%{?dist} Summary: Parallel remote shell program License: GPL Url: http://sourceforge.net/projects/pdsh/ Group: System Environment/Base -Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}-1.tar.gz -Patch1: pdsh-load-so.patch +Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pdsh-rcmd @@ -217,8 +216,7 @@ ############################################################################## %prep -%setup -n pdsh-2.8.1-1 -%patch1 -p0 +%setup ############################################################################## @@ -260,10 +258,6 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT" make install -# needed to allow rpm's find-debuginfo.sh to find binaries by default they -# are installed with perms that aren't selected by the find in -# find-debuginfo.sh -chmod 755 $RPM_BUILD_ROOT/%{_bindir}/pd{sh,cp} if [ -x $RPM_BUILD_ROOT/%{_sbindir}/in.qshd ]; then install -D -m644 etc/qshell.xinetd $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/qshell fi @@ -404,6 +398,16 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-3 +- added dist tag so that I can build on multiple versions + +* Thu Mar 30 2006 Ben Woodard 2.10-2 +- new version 2.10-1 used by upstream +- remove release from source line to track upstream +- deleted patch which is no longer needed +- removed -n from setup line. No longer needed. +- hack to fix perms so no longer needed + * Mon Mar 13 2006 Ben Woodard 2.8.1-7 - An optimization in pdsh depended on the .la files being there. Removed optimization. --- pdsh-load-so.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 20:20:15 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 13:20:15 -0700 Subject: rpms/pdsh/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200603302020.k2UKKHTW026606@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26587 Modified Files: .cvsignore sources Log Message: updated the tarball on this branch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Mar 2006 21:23:03 -0000 1.2 +++ .cvsignore 30 Mar 2006 20:20:15 -0000 1.3 @@ -1 +1 @@ -pdsh-2.8.1-1.tar.gz +pdsh-2.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Mar 2006 21:23:03 -0000 1.2 +++ sources 30 Mar 2006 20:20:15 -0000 1.3 @@ -1 +1 @@ -d39b58da791f9437bdb4848da4efd6d1 pdsh-2.8.1-1.tar.gz +60f7fe11a98c72733a716ee392c0313a pdsh-2.10.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:48:19 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 13:48:19 -0700 Subject: rpms/maxima/FC-4 maxima.spec,1.17,1.18 Message-ID: <200603302048.k2UKmL4X026871@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26854 Modified Files: maxima.spec Log Message: * Thu Mar 30 2006 Rex Dieter 5.9.2-13 - respin for sbcl-0.9.11 Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- maxima.spec 10 Mar 2006 19:36:33 -0000 1.17 +++ maxima.spec 30 Mar 2006 20:48:19 -0000 1.18 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -61,7 +61,12 @@ %define debug_package %{nil} BuildRequires: time +# texi2dvi +%if "%{?fedora}" > "5" +BuildRequires: texinfo-tex +%else BuildRequires: texinfo +%endif BuildRequires: tetex-latex BuildRequires: desktop-file-utils # /usr/bin/wish @@ -142,7 +147,7 @@ %package runtime-sbcl Summary: Maxima compiled with SBCL Group: Applications/Engineering -BuildRequires: sbcl +BuildRequires: sbcl >= 0.9.11 # maxima requires the *same* version it was built against # this hack should work, even in mock (-: -- Rex %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) @@ -205,7 +210,7 @@ install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf pushd info - texi2dvi -p maxima.texi + texi2dvi --pdf maxima.texi popd pushd intromax @@ -357,6 +362,12 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 5.9.2-13 +- respin for sbcl-0.9.11 + +* Mon Mar 27 2006 Rex Dieter +- fc6+: BR: texinfo -> texinfo-tex (#186827) + * Thu Mar 09 2006 Rex Dieter 5.9.2-12 - enable runtime-cmucl (%%ix86 only, atm) From fedora-extras-commits at redhat.com Thu Mar 30 20:48:31 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:48:31 -0700 Subject: rpms/qalculate-kde/FC-5 qalculate-kde.spec,1.6,1.7 Message-ID: <200603302048.k2UKmXsN026937@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26916 Modified Files: qalculate-kde.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 - Update the icons location Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-5/qalculate-kde.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qalculate-kde.spec 30 Mar 2006 20:10:52 -0000 1.6 +++ qalculate-kde.spec 30 Mar 2006 20:48:31 -0000 1.7 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde Version: 0.9.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -59,8 +59,12 @@ %{_datadir}/applications/fedora-qalculate_kde.desktop %{_datadir}/apps/qalculate_kde/ %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/actions/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 +- Update the icons location + * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:49:10 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:49:10 -0700 Subject: rpms/qalculate-kde/devel qalculate-kde.spec,1.6,1.7 Message-ID: <200603302049.k2UKnCar027003@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26986 Modified Files: qalculate-kde.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 - Update the icons location Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/devel/qalculate-kde.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qalculate-kde.spec 30 Mar 2006 20:11:24 -0000 1.6 +++ qalculate-kde.spec 30 Mar 2006 20:49:10 -0000 1.7 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde Version: 0.9.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -59,8 +59,12 @@ %{_datadir}/applications/fedora-qalculate_kde.desktop %{_datadir}/apps/qalculate_kde/ %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/actions/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 +- Update the icons location + * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:50:16 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:50:16 -0700 Subject: rpms/qalculate-kde/FC-4 qalculate-kde.spec,1.5,1.6 Message-ID: <200603302050.k2UKoIhw027117@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27100 Modified Files: qalculate-kde.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 - Update the icons location Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/qalculate-kde.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qalculate-kde.spec 30 Mar 2006 20:10:26 -0000 1.5 +++ qalculate-kde.spec 30 Mar 2006 20:50:15 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde Version: 0.9.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -59,8 +59,12 @@ %{_datadir}/applications/fedora-qalculate_kde.desktop %{_datadir}/apps/qalculate_kde/ %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/actions/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 +- Update the icons location + * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:51:42 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 30 Mar 2006 13:51:42 -0700 Subject: rpms/gajim/FC-5 gajim-0.9.1.notify_crash.patch, NONE, 1.1 gajim.spec, 1.8, 1.9 Message-ID: <200603302051.k2UKpiGP027196@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27161/FC-5 Modified Files: gajim.spec Added Files: gajim-0.9.1.notify_crash.patch Log Message: - Remove Gnome dependencies - Fix crash with notify-daemon (#187274, Stefan Plewako) http://trac.gajim.org/ticket/1347 gajim-0.9.1.notify_crash.patch: --- NEW FILE gajim-0.9.1.notify_crash.patch --- diff -Nur gajim-0.9.1.orig/src/notify.py gajim-0.9.1/src/notify.py --- gajim-0.9.1.orig/src/notify.py 2005-12-27 01:07:44.000000000 +0100 +++ gajim-0.9.1/src/notify.py 2006-03-30 01:34:02.000000000 +0200 @@ -189,10 +189,29 @@ self.notif = dbus_support.get_notifications_interface() if self.notif is None: raise dbus.dbus_bindings.DBusException() - self.id = self.notif.Notify(dbus.String(_('Gajim')), - dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0), - dbus.String(event_type), dbus.String(txt), - [dbus.String(path)], {'default':0}, [''], True, dbus.UInt32(5)) + timeout = gajim.config.get('notification_timeout') # in seconds + # Determine the version of notifications + # FIXME: This code is blocking, as is the next set. That should be fixed + # now that we have a class to encapsulate this behavior + try: + (name, vendor, version) = self.notif.GetServerInfo() + except: + # No way to determine the version number, set it to the latest + # since it doesn't properly support the version number + version = '0.3.1' + if version.startswith('0.2'): + try: + self.id = self.notif.Notify(dbus.String(_('Gajim')), + dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0), + dbus.String(event_type), dbus.String(txt), + [dbus.String(path)], {'default': 0}, [''], True, dbus.UInt32( + timeout)) + except AttributeError: + version = '0.3.1' # we're actually dealing with the newer version + if version.startswith('0.3'): + self.id = self.notif.Notify(dbus.String(_('Gajim')), + dbus.String(path), dbus.UInt32(0), dbus.String(event_type), + dbus.String(txt), dbus.String(""), {}, dbus.UInt32(timeout*1000)) notification_response_manager.attach_to_interface() notification_response_manager.pending[self.id] = self Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-5/gajim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gajim.spec 14 Feb 2006 10:06:51 -0000 1.8 +++ gajim.spec 30 Mar 2006 20:51:41 -0000 1.9 @@ -1,9 +1,6 @@ -# Set to '1' if you want to use internal trayicon and gtkspell modules. -%define use_internal_modules 0 - Name: gajim Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Jabber client written in PyGTK Group: Applications/Internet @@ -11,6 +8,7 @@ URL: http://gajim.org/ Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 Patch0: gajim-0.9.1.modularX.patch +Patch1: gajim-0.9.1.notify_crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -21,16 +19,10 @@ BuildRequires: pkgconfig BuildRequires: pygtk2-devel BuildRequires: python-devel - -%if %{use_internal_modules} BuildRequires: gtkspell-devel -%else -Requires: gnome-python2-gtkspell -Requires: gnome-python2-libegg -%endif Requires: dbus-python -Requires: gnome-python2-gconf +#Requires: gnome-python2-gconf Requires: pygtk2-libglade Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-sqlite2 @@ -44,18 +36,13 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -sed -i -e 's/install\: all/install\:/' Makefile # gajim wants to handle executables; why? sed -i -e '/MimeType/d' gajim.desktop.in %build make \ -%if ! %{use_internal_modules} - translation \ - idle \ - gajim.desktop \ -%endif CC="%{__cc}" \ LIBDIR="/%{_lib}" \ OPTFLAGS="%{optflags}" \ @@ -98,6 +85,11 @@ %{_mandir}/man1/gajim-remote.1* %changelog +* Thu Mar 30 2006 Dawid Gajownik - 0.9.1-3 +- Remove Gnome dependencies +- Fix crash with notify-daemon (#187274, Stefan Plewako) + http://trac.gajim.org/ticket/1347 + * Tue Feb 14 2006 Dawid Gajownik - 0.9.1-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Thu Mar 30 20:51:42 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 30 Mar 2006 13:51:42 -0700 Subject: rpms/gajim/devel gajim-0.9.1.notify_crash.patch, NONE, 1.1 gajim.spec, 1.8, 1.9 Message-ID: <200603302051.k2UKpiqK027202@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27161/devel Modified Files: gajim.spec Added Files: gajim-0.9.1.notify_crash.patch Log Message: - Remove Gnome dependencies - Fix crash with notify-daemon (#187274, Stefan Plewako) http://trac.gajim.org/ticket/1347 gajim-0.9.1.notify_crash.patch: --- NEW FILE gajim-0.9.1.notify_crash.patch --- diff -Nur gajim-0.9.1.orig/src/notify.py gajim-0.9.1/src/notify.py --- gajim-0.9.1.orig/src/notify.py 2005-12-27 01:07:44.000000000 +0100 +++ gajim-0.9.1/src/notify.py 2006-03-30 01:34:02.000000000 +0200 @@ -189,10 +189,29 @@ self.notif = dbus_support.get_notifications_interface() if self.notif is None: raise dbus.dbus_bindings.DBusException() - self.id = self.notif.Notify(dbus.String(_('Gajim')), - dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0), - dbus.String(event_type), dbus.String(txt), - [dbus.String(path)], {'default':0}, [''], True, dbus.UInt32(5)) + timeout = gajim.config.get('notification_timeout') # in seconds + # Determine the version of notifications + # FIXME: This code is blocking, as is the next set. That should be fixed + # now that we have a class to encapsulate this behavior + try: + (name, vendor, version) = self.notif.GetServerInfo() + except: + # No way to determine the version number, set it to the latest + # since it doesn't properly support the version number + version = '0.3.1' + if version.startswith('0.2'): + try: + self.id = self.notif.Notify(dbus.String(_('Gajim')), + dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0), + dbus.String(event_type), dbus.String(txt), + [dbus.String(path)], {'default': 0}, [''], True, dbus.UInt32( + timeout)) + except AttributeError: + version = '0.3.1' # we're actually dealing with the newer version + if version.startswith('0.3'): + self.id = self.notif.Notify(dbus.String(_('Gajim')), + dbus.String(path), dbus.UInt32(0), dbus.String(event_type), + dbus.String(txt), dbus.String(""), {}, dbus.UInt32(timeout*1000)) notification_response_manager.attach_to_interface() notification_response_manager.pending[self.id] = self Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gajim.spec 14 Feb 2006 10:06:51 -0000 1.8 +++ gajim.spec 30 Mar 2006 20:51:42 -0000 1.9 @@ -1,9 +1,6 @@ -# Set to '1' if you want to use internal trayicon and gtkspell modules. -%define use_internal_modules 0 - Name: gajim Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Jabber client written in PyGTK Group: Applications/Internet @@ -11,6 +8,7 @@ URL: http://gajim.org/ Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 Patch0: gajim-0.9.1.modularX.patch +Patch1: gajim-0.9.1.notify_crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -21,16 +19,10 @@ BuildRequires: pkgconfig BuildRequires: pygtk2-devel BuildRequires: python-devel - -%if %{use_internal_modules} BuildRequires: gtkspell-devel -%else -Requires: gnome-python2-gtkspell -Requires: gnome-python2-libegg -%endif Requires: dbus-python -Requires: gnome-python2-gconf +#Requires: gnome-python2-gconf Requires: pygtk2-libglade Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-sqlite2 @@ -44,18 +36,13 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -sed -i -e 's/install\: all/install\:/' Makefile # gajim wants to handle executables; why? sed -i -e '/MimeType/d' gajim.desktop.in %build make \ -%if ! %{use_internal_modules} - translation \ - idle \ - gajim.desktop \ -%endif CC="%{__cc}" \ LIBDIR="/%{_lib}" \ OPTFLAGS="%{optflags}" \ @@ -98,6 +85,11 @@ %{_mandir}/man1/gajim-remote.1* %changelog +* Thu Mar 30 2006 Dawid Gajownik - 0.9.1-3 +- Remove Gnome dependencies +- Fix crash with notify-daemon (#187274, Stefan Plewako) + http://trac.gajim.org/ticket/1347 + * Tue Feb 14 2006 Dawid Gajownik - 0.9.1-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Thu Mar 30 21:15:18 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 14:15:18 -0700 Subject: rpms/Macaulay2/FC-5 Macaulay2.desktop, 1.1, 1.2 Macaulay2.spec, 1.11, 1.12 Message-ID: <200603302115.k2ULFKKj029570@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29547 Modified Files: Macaulay2.desktop Macaulay2.spec Log Message: * Fri Jan 20 2006 Rex Dieter 0.9.2-20 - .desktop: drop Category=Development - app icon: follow icon spec - drop -emacs subpkg (in main now) * Fri Sep 16 2005 Rex Dieter - 0.9.2-19 - disable 'make check' (fc5/buildsystem error), besides, we get a good consistency check when M2 builds all the doc examples. Index: Macaulay2.desktop =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Macaulay2.desktop 8 Dec 2004 16:15:35 -0000 1.1 +++ Macaulay2.desktop 30 Mar 2006 21:15:18 -0000 1.2 @@ -5,5 +5,5 @@ SwallowTitle=Macaulay2 Terminal=true Type=Application -Categories=Application;Education;Math;Scientific;Development; +Categories=Application;Education;Math;Scientific; Encoding=UTF-8 Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Macaulay2.spec 30 Mar 2006 17:03:09 -0000 1.11 +++ Macaulay2.spec 30 Mar 2006 21:15:18 -0000 1.12 @@ -6,7 +6,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 0.9.2 -Release: 19%{?dist} +Release: 20%{?dist} License: GPL Group: Applications/Engineering URL: http://www.math.uiuc.edu/Macaulay2/ @@ -20,16 +20,19 @@ Patch1: Macaulay2-0.9-htmlview.patch Patch2: Macaulay2-0.9.2-static.patch Patch3: Macaulay2-0.9.2-gcc3.patch -# See http://bugzilla.fedora.us/attachment.cgi?id=877&action=view Patch4: Macaulay2-0.9.2-gcc34.patch Patch5: Macaulay2-0.9.2-gcc4.patch BuildRequires: desktop-file-utils -BuildRequires: gc-devel >= 6.6 -BuildRequires: factory-devel >= 2.0.5-7 -BuildRequires: libfac-devel >= 2.0.5-4 +BuildRequires: gc-devel +BuildRequires: factory-devel >= 2.0.5 +BuildRequires: libfac-devel >= 2.0.5 BuildRequires: gdbm-devel BuildRequires: time +#BuildRequires: lapack-devel + +Obsoletes: %{name}-emacs < %{version}-%{release} +Provides: %{name}-emacs = %{version}-%{release} %description Macaulay 2 is a new software system devoted to supporting research in @@ -44,15 +47,6 @@ %description doc %{name} documentation. -%package emacs -Summary: %{name} emacs mode -Group: Applications/Editors -Requires: emacs -Requires: %{name} = %{version} -%description emacs -%{name} emacs mode. - - %prep %setup -q @@ -64,34 +58,33 @@ %patch3 -p1 -b .gcc3 # fc3/gcc34 fix %patch4 -p1 -b .gcc34 +# fc4/gcc4 fix %patch5 -p1 -b .gcc4 %build + %configure \ - --enable-gc-for-new \ --disable-dumpdata \ - --disable-optimize \ - --disable-static \ - %{?debug_package:--disable-strip} + --disable-optimize + +#TODO: --with-lapacklibs + +make -# not smp-safe -make -# Takes a *long* time, default off %check || : -%{!?_without_check:make check } +#disable, for now, util/screen dies on fc5/buildsystem (could not open pty) +make check %install %makeinstall # Fix locations -perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \ - $RPM_BUILD_ROOT%{_bindir}/M2 -perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \ - $RPM_BUILD_ROOT%{_bindir}/M2-help -perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/* +sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2 +sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2-help +sed -i -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/* ## emacs files install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -99,18 +92,18 @@ $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ # app img -install -p -D -m644 \ - %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps/Macaulay2.png +install -p -m644 -D %{SOURCE1} \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps/32x32/Macaulay2.png -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --add-category "X-Fedora" \ %{SOURCE2} ## Unpackaged files +rm -f $RPM_BUILD_ROOT%{m2home}/setup # %doc stuff, no need to dup in appdir rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING} # created by make check @@ -129,40 +122,46 @@ # Handle possibly existing dumpdata #rm -f %{m2home}/libexec/Macaulay2-*-data ||: +%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 ||: + %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc Macaulay2/README Macaulay2/CHANGES %{_bindir}/M2 %{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/*.png +%{_datadir}/icons/hicolor/*/*/* %dir %{m2home} -%{m2home}/cache -%{m2home}/libexec -%{m2home}/m2 -%{m2home}/packages -# Not needed/wanted -%exclude %{m2home}/setup - -%files emacs -%defattr(-,root,root) -%dir %{m2home}/emacs -%doc %{m2home}/emacs/*.m2 -%doc %{m2home}/emacs/*.txt -%doc %{m2home}/emacs/README -%{m2home}/emacs/*.el -%{_datadir}/emacs/site-lisp/*.el +%{m2home}/cache/ +%{m2home}/libexec/ +%{m2home}/m2/ +%{m2home}/packages/ +# emacs bits +%{m2home}/emacs/ +%{_datadir}/emacs/site-lisp/ %files doc -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/M2-help -%{m2home}/html -%{m2home}/tutorial +%{m2home}/html/ +%{m2home}/tutorial/ %changelog -* Thu Mar 30 2006 Rex Dieter 0.9.2-19 -- BR: factory-devel >= 2.0.5-7, libfac-devel >= 2.0.5-4 (bug #183265) +* Fri Jan 20 2006 Rex Dieter 0.9.2-20 +- .desktop: drop Category=Development +- app icon: follow icon spec +- drop -emacs subpkg (in main now) + +* Fri Sep 16 2005 Rex Dieter - 0.9.2-19 +- disable 'make check' (fc5/buildsystem error), besides, we get a + good consistency check when M2 builds all the doc examples. * Wed Sep 14 2005 Rex Dieter - 0.9.2-18 - rebuild against gc-6.6 From fedora-extras-commits at redhat.com Thu Mar 30 21:41:20 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 14:41:20 -0700 Subject: rpms/Macaulay2/FC-5 Macaulay2.spec,1.12,1.13 Message-ID: <200603302141.k2ULfMnB029914@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29897 Modified Files: Macaulay2.spec Log Message: * Thu Mar 30 2006 Rex Dieter 0.9.2-21 - *really* disable %check (fails on fc5+ anyway) Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Macaulay2.spec 30 Mar 2006 21:15:18 -0000 1.12 +++ Macaulay2.spec 30 Mar 2006 21:41:20 -0000 1.13 @@ -6,7 +6,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 0.9.2 -Release: 20%{?dist} +Release: 21%{?dist} License: GPL Group: Applications/Engineering URL: http://www.math.uiuc.edu/Macaulay2/ @@ -74,8 +74,8 @@ %check || : -#disable, for now, util/screen dies on fc5/buildsystem (could not open pty) -make check +# NOTE: util/screen dies on fc5/buildsystem (could not open pty) +#make check ||: %install @@ -154,6 +154,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 0.9.2-21 +- *really* disable %%check (fails on fc5+ anyway) + * Fri Jan 20 2006 Rex Dieter 0.9.2-20 - .desktop: drop Category=Development - app icon: follow icon spec From fedora-extras-commits at redhat.com Thu Mar 30 21:52:39 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 14:52:39 -0700 Subject: rpms/pdsh/devel pdsh.spec,1.3,1.4 Message-ID: <200603302152.k2ULqfGb029991@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29974 Modified Files: pdsh.spec Log Message: Upstream pointed out that I'd missed two new capabilities in pdsh that were added to the 2.10 spec file. I added these to keep in sync with upstream. Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/pdsh.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pdsh.spec 30 Mar 2006 20:07:06 -0000 1.3 +++ pdsh.spec 30 Mar 2006 21:52:39 -0000 1.4 @@ -1,6 +1,6 @@ Name: pdsh Version: 2.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parallel remote shell program @@ -15,9 +15,9 @@ # Enabling and disabling pdsh options # defaults: # enabled: readline, rsh, ssh -# disabled: rms, mrsh, qshell, mqshell, genders, nodeattr, machines, -# nodeupdown - +# disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines, +# nodeupdown, dshgroup, netgroups +# # To build the various module subpackages, pass --with on # the rpmbuild command line (if your rpm is a recent enough version) # @@ -48,6 +48,8 @@ %{expand: %def qshell without with} %{expand: %pdsh_with mqshell} %{expand: %def mqshell without with} +%{expand: %pdsh_with xcpu} +%{expand: %def xcpu without with} %{expand: %pdsh_with genders} %{expand: %def genders without with} %{expand: %pdsh_with nodeattr} @@ -56,6 +58,8 @@ %{expand: %def nodeupdown without with} %{expand: %pdsh_with dshgroups} %{expand: %def dshgroups without with} +%{expand: %pdsh_with netgroup} +%{expand: %def netgroup without with} %{expand: %pdsh_with machines} %{expand: %def machines without with} %{expand: %pdsh_with slurm} @@ -153,6 +157,13 @@ %description rcmd-mqshell Pdsh module for mqshell rcmd functionality. +%package rcmd-xcpu +Summary: Provides xcpu rcmd capability to pdsh +Group: System Environment/Base +Provides: pdsh-xcpu +%description rcmd-xcpu +Pdsh module for xcpu rcmd functionality. + %package mod-genders Summary: Provides libgenders support for pdsh Group: System Environment/Base @@ -202,6 +213,13 @@ Pdsh module providing dsh (Dancer's shell) style "group" file support. Provides -g groupname and -X groupname options to pdsh. +%package mod-netgroup +Summary: Provides netgroup support for pdsh +Group: System Environment/Base +Requires: whatsup +%description mod-netgroup +Pdsh module providing support for targeting hosts based on netgroup. +Provides -g groupname and -X groupname options to pdsh. %package mod-slurm Summary: Provides support for running pdsh under SLURM allocations @@ -245,10 +263,15 @@ %{?_without_mrsh} \ %{?_with_mqshell} \ %{?_without_mqshell} \ + %{?_with_xcpu} \ + %{?_without_xcpu} \ %{?_with_slurm} \ %{?_without_slurm} \ %{?_with_dshgroups} \ - %{?_without_dshgroups} + %{?_without_dshgroups} \ + %{?_with_netgroup} \ + %{?_without_netgroup} + # FIXME: build fails when trying to build with _smp_mflags if qsnet is enabled # make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" make CFLAGS="$RPM_OPT_FLAGS" @@ -318,6 +341,13 @@ %endif ############################################################################## +%if %{?_with_xcpu:1}%{!?_with_xcpu:0} +%files rcmd-xcpu +%defattr(-,root,root) +%{_libdir}/pdsh/xcpucmd.* +%endif +############################################################################## + %if %{?_with_genders:1}%{!?_with_genders:0} %files mod-genders %defattr(-,root,root) @@ -359,6 +389,14 @@ %{_libdir}/pdsh/dshgroup.* %endif ############################################################################## + +%if %{?_with_netgroup:1}%{!?_with_netgroup:0} +%files mod-netgroup +%defattr(-,root,root) +%{_libdir}/pdsh/netgroup.* +%endif +############################################################################## + %if %{?_with_slurm:1}%{!?_with_slurm:0} %files mod-slurm %defattr(-,root,root) @@ -398,6 +436,10 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-4 +- upstream pointed out that they had added two new subpackages + that I'd failed to include. + * Thu Mar 30 2006 Ben Woodard 2.10-3 - added dist tag so that I can build on multiple versions From fedora-extras-commits at redhat.com Thu Mar 30 21:55:11 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 14:55:11 -0700 Subject: rpms/pdsh/FC-4 pdsh.spec,1.3,1.4 Message-ID: <200603302155.k2ULtDCo030078@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30061 Modified Files: pdsh.spec Log Message: Upsteam pointed out that they had added two new subpackages that I'd failed to include. Added these to keep in sync with upstream. Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-4/pdsh.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pdsh.spec 30 Mar 2006 20:11:57 -0000 1.3 +++ pdsh.spec 30 Mar 2006 21:55:11 -0000 1.4 @@ -1,6 +1,6 @@ Name: pdsh Version: 2.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parallel remote shell program @@ -15,9 +15,9 @@ # Enabling and disabling pdsh options # defaults: # enabled: readline, rsh, ssh -# disabled: rms, mrsh, qshell, mqshell, genders, nodeattr, machines, -# nodeupdown - +# disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines, +# nodeupdown, dshgroup, netgroups +# # To build the various module subpackages, pass --with on # the rpmbuild command line (if your rpm is a recent enough version) # @@ -48,6 +48,8 @@ %{expand: %def qshell without with} %{expand: %pdsh_with mqshell} %{expand: %def mqshell without with} +%{expand: %pdsh_with xcpu} +%{expand: %def xcpu without with} %{expand: %pdsh_with genders} %{expand: %def genders without with} %{expand: %pdsh_with nodeattr} @@ -56,6 +58,8 @@ %{expand: %def nodeupdown without with} %{expand: %pdsh_with dshgroups} %{expand: %def dshgroups without with} +%{expand: %pdsh_with netgroup} +%{expand: %def netgroup without with} %{expand: %pdsh_with machines} %{expand: %def machines without with} %{expand: %pdsh_with slurm} @@ -153,6 +157,13 @@ %description rcmd-mqshell Pdsh module for mqshell rcmd functionality. +%package rcmd-xcpu +Summary: Provides xcpu rcmd capability to pdsh +Group: System Environment/Base +Provides: pdsh-xcpu +%description rcmd-xcpu +Pdsh module for xcpu rcmd functionality. + %package mod-genders Summary: Provides libgenders support for pdsh Group: System Environment/Base @@ -202,6 +213,13 @@ Pdsh module providing dsh (Dancer's shell) style "group" file support. Provides -g groupname and -X groupname options to pdsh. +%package mod-netgroup +Summary: Provides netgroup support for pdsh +Group: System Environment/Base +Requires: whatsup +%description mod-netgroup +Pdsh module providing support for targeting hosts based on netgroup. +Provides -g groupname and -X groupname options to pdsh. %package mod-slurm Summary: Provides support for running pdsh under SLURM allocations @@ -245,10 +263,15 @@ %{?_without_mrsh} \ %{?_with_mqshell} \ %{?_without_mqshell} \ + %{?_with_xcpu} \ + %{?_without_xcpu} \ %{?_with_slurm} \ %{?_without_slurm} \ %{?_with_dshgroups} \ - %{?_without_dshgroups} + %{?_without_dshgroups} \ + %{?_with_netgroup} \ + %{?_without_netgroup} + # FIXME: build fails when trying to build with _smp_mflags if qsnet is enabled # make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" make CFLAGS="$RPM_OPT_FLAGS" @@ -318,6 +341,13 @@ %endif ############################################################################## +%if %{?_with_xcpu:1}%{!?_with_xcpu:0} +%files rcmd-xcpu +%defattr(-,root,root) +%{_libdir}/pdsh/xcpucmd.* +%endif +############################################################################## + %if %{?_with_genders:1}%{!?_with_genders:0} %files mod-genders %defattr(-,root,root) @@ -359,6 +389,14 @@ %{_libdir}/pdsh/dshgroup.* %endif ############################################################################## + +%if %{?_with_netgroup:1}%{!?_with_netgroup:0} +%files mod-netgroup +%defattr(-,root,root) +%{_libdir}/pdsh/netgroup.* +%endif +############################################################################## + %if %{?_with_slurm:1}%{!?_with_slurm:0} %files mod-slurm %defattr(-,root,root) @@ -398,6 +436,10 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-4 +- upstream pointed out that they had added two new subpackages + that I'd failed to include. + * Thu Mar 30 2006 Ben Woodard 2.10-3 - added dist tag so that I can build on multiple versions From fedora-extras-commits at redhat.com Thu Mar 30 21:55:26 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 14:55:26 -0700 Subject: rpms/pdsh/FC-5 pdsh.spec,1.2,1.3 Message-ID: <200603302155.k2ULtSx5030101@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30084 Modified Files: pdsh.spec Log Message: Upsteam pointed out that they had added two new subpackages that I'd failed to include. Added these to keep in sync with upstream. Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-5/pdsh.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pdsh.spec 30 Mar 2006 20:18:57 -0000 1.2 +++ pdsh.spec 30 Mar 2006 21:55:26 -0000 1.3 @@ -1,6 +1,6 @@ Name: pdsh Version: 2.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parallel remote shell program @@ -15,9 +15,9 @@ # Enabling and disabling pdsh options # defaults: # enabled: readline, rsh, ssh -# disabled: rms, mrsh, qshell, mqshell, genders, nodeattr, machines, -# nodeupdown - +# disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines, +# nodeupdown, dshgroup, netgroups +# # To build the various module subpackages, pass --with on # the rpmbuild command line (if your rpm is a recent enough version) # @@ -48,6 +48,8 @@ %{expand: %def qshell without with} %{expand: %pdsh_with mqshell} %{expand: %def mqshell without with} +%{expand: %pdsh_with xcpu} +%{expand: %def xcpu without with} %{expand: %pdsh_with genders} %{expand: %def genders without with} %{expand: %pdsh_with nodeattr} @@ -56,6 +58,8 @@ %{expand: %def nodeupdown without with} %{expand: %pdsh_with dshgroups} %{expand: %def dshgroups without with} +%{expand: %pdsh_with netgroup} +%{expand: %def netgroup without with} %{expand: %pdsh_with machines} %{expand: %def machines without with} %{expand: %pdsh_with slurm} @@ -153,6 +157,13 @@ %description rcmd-mqshell Pdsh module for mqshell rcmd functionality. +%package rcmd-xcpu +Summary: Provides xcpu rcmd capability to pdsh +Group: System Environment/Base +Provides: pdsh-xcpu +%description rcmd-xcpu +Pdsh module for xcpu rcmd functionality. + %package mod-genders Summary: Provides libgenders support for pdsh Group: System Environment/Base @@ -202,6 +213,13 @@ Pdsh module providing dsh (Dancer's shell) style "group" file support. Provides -g groupname and -X groupname options to pdsh. +%package mod-netgroup +Summary: Provides netgroup support for pdsh +Group: System Environment/Base +Requires: whatsup +%description mod-netgroup +Pdsh module providing support for targeting hosts based on netgroup. +Provides -g groupname and -X groupname options to pdsh. %package mod-slurm Summary: Provides support for running pdsh under SLURM allocations @@ -245,10 +263,15 @@ %{?_without_mrsh} \ %{?_with_mqshell} \ %{?_without_mqshell} \ + %{?_with_xcpu} \ + %{?_without_xcpu} \ %{?_with_slurm} \ %{?_without_slurm} \ %{?_with_dshgroups} \ - %{?_without_dshgroups} + %{?_without_dshgroups} \ + %{?_with_netgroup} \ + %{?_without_netgroup} + # FIXME: build fails when trying to build with _smp_mflags if qsnet is enabled # make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" make CFLAGS="$RPM_OPT_FLAGS" @@ -318,6 +341,13 @@ %endif ############################################################################## +%if %{?_with_xcpu:1}%{!?_with_xcpu:0} +%files rcmd-xcpu +%defattr(-,root,root) +%{_libdir}/pdsh/xcpucmd.* +%endif +############################################################################## + %if %{?_with_genders:1}%{!?_with_genders:0} %files mod-genders %defattr(-,root,root) @@ -359,6 +389,14 @@ %{_libdir}/pdsh/dshgroup.* %endif ############################################################################## + +%if %{?_with_netgroup:1}%{!?_with_netgroup:0} +%files mod-netgroup +%defattr(-,root,root) +%{_libdir}/pdsh/netgroup.* +%endif +############################################################################## + %if %{?_with_slurm:1}%{!?_with_slurm:0} %files mod-slurm %defattr(-,root,root) @@ -398,6 +436,10 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-4 +- upstream pointed out that they had added two new subpackages + that I'd failed to include. + * Thu Mar 30 2006 Ben Woodard 2.10-3 - added dist tag so that I can build on multiple versions From fedora-extras-commits at redhat.com Thu Mar 30 23:48:02 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 30 Mar 2006 16:48:02 -0700 Subject: rpms/cogito/devel cg-admin-rewritehist-fix.patch, NONE, 1.1 cogito.spec, 1.10, 1.11 Message-ID: <200603302348.k2UNm4oa002350@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2330 Modified Files: cogito.spec Added Files: cg-admin-rewritehist-fix.patch Log Message: fix for bz 187434, 0.17.1-2 cg-admin-rewritehist-fix.patch: --- NEW FILE cg-admin-rewritehist-fix.patch --- 16c76deb91b167c921a02641a2002e052143e16a diff --git a/cg-admin-rewritehist b/cg-admin-rewritehist index 306f855..9c49d80 100755 --- a/cg-admin-rewritehist +++ b/cg-admin-rewritehist @@ -143,7 +143,7 @@ filter_tree= filter_index= filter_parent= filter_msg=cat -filter_commit=git-commit-tree +filter_commit='git-commit-tree "$@"' while optparse; do if optparse -d=; then tempdir="$OPTARG" Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cogito.spec 29 Mar 2006 19:34:04 -0000 1.10 +++ cogito.spec 30 Mar 2006 23:48:02 -0000 1.11 @@ -1,6 +1,6 @@ Name: cogito Version: 0.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools @@ -11,6 +11,8 @@ BuildRequires: asciidoc, xmlto BuildArch: noarch +Patch1: cg-admin-rewritehist-fix.patch + %description Cogito is a version control system layered on top of the git tree history storage system. It aims at seamless user interface and ease of use, providing @@ -19,6 +21,7 @@ %prep %setup -q +%patch1 -p1 %build @@ -44,6 +47,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Thu Mar 30 2006 Chris Wright 0.17.1-2 +- cg-admin-rewritehist fix + * Tue Mar 28 2006 Chris Wright 0.17.1-1 - 0.17.1 From fedora-extras-commits at redhat.com Thu Mar 30 23:49:10 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 30 Mar 2006 16:49:10 -0700 Subject: rpms/cogito/FC-5 cg-admin-rewritehist-fix.patch, NONE, 1.1 cogito.spec, 1.10, 1.11 Message-ID: <200603302349.k2UNnCIU002391@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371 Modified Files: cogito.spec Added Files: cg-admin-rewritehist-fix.patch Log Message: fix for bz 187434, 0.17.1-2 cg-admin-rewritehist-fix.patch: --- NEW FILE cg-admin-rewritehist-fix.patch --- 16c76deb91b167c921a02641a2002e052143e16a diff --git a/cg-admin-rewritehist b/cg-admin-rewritehist index 306f855..9c49d80 100755 --- a/cg-admin-rewritehist +++ b/cg-admin-rewritehist @@ -143,7 +143,7 @@ filter_tree= filter_index= filter_parent= filter_msg=cat -filter_commit=git-commit-tree +filter_commit='git-commit-tree "$@"' while optparse; do if optparse -d=; then tempdir="$OPTARG" Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-5/cogito.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cogito.spec 29 Mar 2006 19:35:49 -0000 1.10 +++ cogito.spec 30 Mar 2006 23:49:10 -0000 1.11 @@ -1,6 +1,6 @@ Name: cogito Version: 0.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools @@ -11,6 +11,8 @@ BuildRequires: asciidoc, xmlto BuildArch: noarch +Patch1: cg-admin-rewritehist-fix.patch + %description Cogito is a version control system layered on top of the git tree history storage system. It aims at seamless user interface and ease of use, providing @@ -19,6 +21,7 @@ %prep %setup -q +%patch1 -p1 %build @@ -44,6 +47,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Thu Mar 30 2006 Chris Wright 0.17.1-2 +- cg-admin-rewritehist fix + * Tue Mar 28 2006 Chris Wright 0.17.1-1 - 0.17.1 From fedora-extras-commits at redhat.com Thu Mar 30 23:51:26 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 30 Mar 2006 16:51:26 -0700 Subject: rpms/cogito/FC-4 cg-admin-rewritehist-fix.patch, NONE, 1.1 cogito.spec, 1.9, 1.10 Message-ID: <200603302351.k2UNpSt6002520@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2500 Modified Files: cogito.spec Added Files: cg-admin-rewritehist-fix.patch Log Message: fix for bz 187434, 0.17.1-2 cg-admin-rewritehist-fix.patch: --- NEW FILE cg-admin-rewritehist-fix.patch --- 16c76deb91b167c921a02641a2002e052143e16a diff --git a/cg-admin-rewritehist b/cg-admin-rewritehist index 306f855..9c49d80 100755 --- a/cg-admin-rewritehist +++ b/cg-admin-rewritehist @@ -143,7 +143,7 @@ filter_tree= filter_index= filter_parent= filter_msg=cat -filter_commit=git-commit-tree +filter_commit='git-commit-tree "$@"' while optparse; do if optparse -d=; then tempdir="$OPTARG" Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cogito.spec 29 Mar 2006 19:36:46 -0000 1.9 +++ cogito.spec 30 Mar 2006 23:51:26 -0000 1.10 @@ -1,6 +1,6 @@ Name: cogito Version: 0.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools @@ -11,6 +11,8 @@ BuildRequires: asciidoc, xmlto BuildArch: noarch +Patch1: cg-admin-rewritehist-fix.patch + %description Cogito is a version control system layered on top of the git tree history storage system. It aims at seamless user interface and ease of use, providing @@ -19,6 +21,7 @@ %prep %setup -q +%patch1 -p1 %build @@ -44,6 +47,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Thu Mar 30 2006 Chris Wright 0.17.1-2 +- cg-admin-rewritehist fix + * Tue Mar 28 2006 Chris Wright 0.17.1-1 - 0.17.1 From fedora-extras-commits at redhat.com Thu Mar 30 23:52:19 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 30 Mar 2006 16:52:19 -0700 Subject: rpms/cogito/FC-3 cg-admin-rewritehist-fix.patch, NONE, 1.1 cogito.spec, 1.9, 1.10 Message-ID: <200603302352.k2UNqLRV002602@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2582 Modified Files: cogito.spec Added Files: cg-admin-rewritehist-fix.patch Log Message: fix for bz 187434, 0.17.1-2 cg-admin-rewritehist-fix.patch: --- NEW FILE cg-admin-rewritehist-fix.patch --- 16c76deb91b167c921a02641a2002e052143e16a diff --git a/cg-admin-rewritehist b/cg-admin-rewritehist index 306f855..9c49d80 100755 --- a/cg-admin-rewritehist +++ b/cg-admin-rewritehist @@ -143,7 +143,7 @@ filter_tree= filter_index= filter_parent= filter_msg=cat -filter_commit=git-commit-tree +filter_commit='git-commit-tree "$@"' while optparse; do if optparse -d=; then tempdir="$OPTARG" Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cogito.spec 29 Mar 2006 19:37:52 -0000 1.9 +++ cogito.spec 30 Mar 2006 23:52:19 -0000 1.10 @@ -1,6 +1,6 @@ Name: cogito Version: 0.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools @@ -11,6 +11,8 @@ BuildRequires: asciidoc, xmlto BuildArch: noarch +Patch1: cg-admin-rewritehist-fix.patch + %description Cogito is a version control system layered on top of the git tree history storage system. It aims at seamless user interface and ease of use, providing @@ -19,6 +21,7 @@ %prep %setup -q +%patch1 -p1 %build @@ -44,6 +47,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Thu Mar 30 2006 Chris Wright 0.17.1-2 +- cg-admin-rewritehist fix + * Tue Mar 28 2006 Chris Wright 0.17.1-1 - 0.17.1 From fedora-extras-commits at redhat.com Fri Mar 31 01:33:31 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 30 Mar 2006 18:33:31 -0700 Subject: rpms/sylpheed/devel .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 sylpheed.spec, 1.28, 1.29 Message-ID: <200603310133.k2V1XXv1007029@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7008 Modified Files: .cvsignore sources sylpheed.spec Log Message: * Fri Mar 31 2006 Michael Schwendt - 2.2.4-1 - Update to 2.2.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 19 Mar 2006 22:01:32 -0000 1.16 +++ .cvsignore 31 Mar 2006 01:33:31 -0000 1.17 @@ -1,2 +1,2 @@ -sylpheed-2.2.3.tar.bz2.asc -sylpheed-2.2.3.tar.bz2 +sylpheed-2.2.4.tar.bz2.asc +sylpheed-2.2.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 19 Mar 2006 22:01:32 -0000 1.16 +++ sources 31 Mar 2006 01:33:31 -0000 1.17 @@ -1,2 +1,2 @@ -e686a2fd8cf2ce3dd0ac766fd58fb15d sylpheed-2.2.3.tar.bz2.asc -4fe29639ac4f628f348120361310e0af sylpheed-2.2.3.tar.bz2 +6f60a04132f85161f8b3e44af2b63a98 sylpheed-2.2.4.tar.bz2.asc +4e5608e63d4ea413bf4a0fa3abb4223f sylpheed-2.2.4.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sylpheed.spec 19 Mar 2006 22:01:32 -0000 1.28 +++ sylpheed.spec 31 Mar 2006 01:33:31 -0000 1.29 @@ -4,7 +4,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed -Version: 2.2.3 +Version: 2.2.4 Release: 1%{?dist} License: GPL URL: http://sylpheed.good-day.net/ @@ -82,6 +82,9 @@ %{_mandir}/man1/* %changelog +* Fri Mar 31 2006 Michael Schwendt - 2.2.4-1 +- Update to 2.2.4. + * Sun Mar 19 2006 Michael Schwendt - 2.2.3-1 - Update to 2.2.3. - Update external commands (defs.h) patch. From fedora-extras-commits at redhat.com Fri Mar 31 02:23:27 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Thu, 30 Mar 2006 19:23:27 -0700 Subject: rpms/wxPython/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wxPython.spec, 1.5, 1.6 Message-ID: <200603310223.k2V2NTEt009384@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9363 Added Files: .cvsignore sources wxPython.spec Log Message: Update to 2.6.3.0 (finally, I know) Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 31 Mar 2006 02:23:27 -0000 1.4 @@ -0,0 +1 @@ +wxPython-src-2.6.3.0.tar.gz Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 31 Mar 2006 02:23:27 -0000 1.4 @@ -0,0 +1 @@ +2891a496f4a415179e6a231619344b27 wxPython-src-2.6.3.0.tar.gz Index: wxPython.spec =================================================================== RCS file: wxPython.spec diff -N wxPython.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ wxPython.spec 31 Mar 2006 02:23:27 -0000 1.6 @@ -0,0 +1,128 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +%define buildflags WXPORT=gtk2 UNICODE=1 + +Name: wxPython +Version: 2.6.3.0 +Release: 1%{?dist} + +Summary: GUI toolkit for the Python programming language + +Group: Development/Languages +License: LGPL +URL: http://www.wxpython.org/ +Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: wxGTK-devel = 2.6.3, pkgconfig +BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel +BuildRequires: python-devel, wxGTK-gl + +# packages should depend on "wxPython", not "wxPythonGTK2", but in case +# one does, here's the provides for it. +Provides: wxPythonGTK2 = %{version}-%{release} + +%description +wxPython is a GUI toolkit for the Python programming language. It allows +Python programmers to create programs with a robust, highly functional +graphical user interface, simply and easily. It is implemented as a Python +extension module (native code) that wraps the popular wxWindows cross +platform GUI library, which is written in C++. + +%package devel +Group: Development/Libraries +Summary: Development files for wxPython add-on modules +Requires: %{name} = %{version}-%{release} +Requires: wxGTK-devel + +%description devel +This package includes C++ header files and SWIG files needed for developing +add-on modules for wxPython. It is NOT needed for development of most +programs which use the wxPython toolkit. + + +%prep +%setup -q -n wxPython-src-%{version} + +# There's binaries included in the source tarball, resulting in bogus +# dependencies for the package -- clean it up: +rm wxPython/samples/embedded/embedded wxPython/samples/embedded/embedded.o + +%build +# Just build the wxPython part, not all of wxWindows which we already have +# in Fedora +cd wxPython +# included distutils is not multilib aware; use normal +rm -rf distutils +python setup.py %{buildflags} build + + +%install +rm -rf $RPM_BUILD_ROOT +cd wxPython +python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples +%{_bindir}/* +%{python_sitearch}/wx.pth +%{python_sitearch}/wxversion.py* +%dir %{python_sitearch}/wx-2.6-gtk2-unicode/ +%{python_sitearch}/wx-2.6-gtk2-unicode/wx +%{python_sitearch}/wx-2.6-gtk2-unicode/wxPython + +%files devel +%defattr(-,root,root,-) +%dir %{_includedir}/wx-2.6/wx/wxPython +%{_includedir}/wx-2.6/wx/wxPython/*.h +%dir %{_includedir}/wx-2.6/wx/wxPython/i_files +%{_includedir}/wx-2.6/wx/wxPython/i_files/*.i +%{_includedir}/wx-2.6/wx/wxPython/i_files/*.py* +%{_includedir}/wx-2.6/wx/wxPython/i_files/*.swg + + +%changelog +* Thu Mar 30 2006 Matthew Miller - 2.6.3.0-1 +- update to 2.6.3.0 +- wxGTK and wxPython versions are inexorably linked; make BuildRequires + be exact, rather than >=. +- make devel subpackage as per comment #7 in bug #163440. + +* Thu Nov 24 2005 Matthew Miller - 2.6.1.0-1 +- update to 2.6.0.0 +- merge in changes from current extras 2.4.x package +- Happy Thanksgiving +- build animate extention again -- works now. + +* Thu Apr 28 2005 Matthew Miller - 2.6.0.0-bu45.1 +- get rid of accidental binaries in source tarball -- they generates + spurious dependencies and serve no purpose +- update to 2.6.0.0 and build for Velouria +- switch to Fedora Extras base spec file +- enable gtk2 and unicode and all the code stuff (as FE does) +- disable BUILD_ANIMATE extension from contrib -- doesn't build +- files are in a different location now -- adjust to that +- zap include files (needed only for building wxPython 3rd-party modules), + because I don't think this is likely to be very useful. Other option + would be to create a -devel package, but I think that'd be confusing. + +* Tue Feb 08 2005 Thorsten Leemhuis 0:2.4.2.4-4 +- remove included disutils - it is not multilib aware; this + fixes build on x86_64 + +* Tue Jan 06 2004 Panu Matilainen 0:2.4.2.4-0.fdr.3 +- rename package to wxPythonGTK2, provide wxPython (see bug 927) +- dont ship binaries in /usr/share + +* Thu Nov 20 2003 Panu Matilainen 0:2.4.2.4-0.fdr.2 +- add missing buildrequires: python-devel, wxGTK2-gl + +* Sun Nov 02 2003 Panu Matilainen 0:2.4.2.4-0.fdr.1 +- Initial RPM release. +~ From fedora-extras-commits at redhat.com Fri Mar 31 02:59:33 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 30 Mar 2006 19:59:33 -0700 Subject: rpms/denyhosts/devel denyhosts-2.2-daemon-control.patch, NONE, 1.1 README.fedora, 1.3, 1.4 denyhosts.cron, 1.5, 1.6 denyhosts.spec, 1.28, 1.29 denyhosts-2.0-daemon-control.patch, 1.1, NONE Message-ID: <200603310259.k2V2xZJ3009483@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9459 Modified Files: README.fedora denyhosts.cron denyhosts.spec Added Files: denyhosts-2.2-daemon-control.patch Removed Files: denyhosts-2.0-daemon-control.patch Log Message: * Thu Mar 30 2006 Jason L Tibbitts III - 2.2-3 - Switch from $RPM_BUILD_ROOT to %{buildroot} (looks cleaner). - Rename the main executable from denyhosts.py to denyhosts. denyhosts-2.2-daemon-control.patch: --- NEW FILE denyhosts-2.2-daemon-control.patch --- --- daemon-control-dist.daemon-control 2006-02-07 21:37:51.000000000 -0600 +++ daemon-control-dist 2006-03-30 19:49:23.200435174 -0600 @@ -11,9 +11,9 @@ #### Edit these to suit your configuration #### ############################################### -DENYHOSTS_BIN = "/usr/bin/denyhosts.py" +DENYHOSTS_BIN = "/usr/bin/denyhosts" DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts" -DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg" +DENYHOSTS_CFG = "/etc/denyhosts.conf" ############################################### @@ -35,7 +35,7 @@ print "Usage: %s {start [args...] | stop | restart [args...] | status | debug | condrestart [args...] }" % sys.argv[0] print print "For a list of valid 'args' refer to:" - print "$ denyhosts.py --help" + print "$ denyhosts --help" print sys.exit(0) Index: README.fedora =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/README.fedora,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- README.fedora 20 Nov 2005 17:21:49 -0000 1.3 +++ README.fedora 31 Mar 2006 02:59:32 -0000 1.4 @@ -29,7 +29,7 @@ If you want to incorporate an old logfile (in this example, /var/log/secure.1) , you can run - denyhosts.py -c /etc/denyhosts.conf /var/log/secure.1 + denyhosts -c /etc/denyhosts.conf /var/log/secure.1 DenyHosts can also handle logs compressed with gzip or bzip2. Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.cron,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- denyhosts.cron 16 Aug 2005 03:30:56 -0000 1.5 +++ denyhosts.cron 31 Mar 2006 02:59:32 -0000 1.6 @@ -4,9 +4,9 @@ # "service" and set it to run at boot if necessary.) # # Run denyhosts occasionally; adjust the time span to your liking -#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf +#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts -c /etc/denyhosts.conf # # Automatically purge old entries early in the morning. Note that you must # edit /etc/denyhosts.conf and set PURGE_DENY to something reasonable, as the # default value purge time is set very high. -#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf --purge +#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts -c /etc/denyhosts.conf --purge Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- denyhosts.spec 30 Mar 2006 16:36:17 -0000 1.28 +++ denyhosts.spec 31 Mar 2006 02:59:32 -0000 1.29 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -15,7 +15,7 @@ Source6: README.fedora Patch0: denyhosts-2.2-config.patch Patch1: denyhosts-2.1-setup.patch -Patch2: denyhosts-2.0-daemon-control.patch +Patch2: denyhosts-2.2-daemon-control.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,9 +37,9 @@ %prep %setup -q -n DenyHosts-%{version} -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 +%patch0 -p0 -b .config +%patch1 -p0 -b .setup +%patch2 -p0 -b .daemon-control cp %{SOURCE6} . @@ -53,40 +53,41 @@ %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT +%{__python} setup.py install -O1 --skip-build --root=%{buildroot} -install -d $RPM_BUILD_ROOT%{_bindir} -install -d $RPM_BUILD_ROOT%{_initrddir} -install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d -install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig - -install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts -install -d $RPM_BUILD_ROOT%{_localstatedir}/log - -install -p -m 600 denyhosts.cfg-dist $RPM_BUILD_ROOT%{_sysconfdir}/denyhosts.conf -install -p -m 755 daemon-control-dist $RPM_BUILD_ROOT%{_bindir}/denyhosts-control -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/denyhosts -install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/denyhosts -install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/allowed-hosts -install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/denyhosts -install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/denyhosts +install -d %{buildroot}/%{_bindir} +install -d %{buildroot}/%{_initrddir} +install -d %{buildroot}/%{_sysconfdir}/cron.d +install -d %{buildroot}/%{_sysconfdir}/logrotate.d +install -d %{buildroot}/%{_sysconfdir}/sysconfig + +install -d -m 700 %{buildroot}/%{_localstatedir}/lib/denyhosts +install -d %{buildroot}/%{_localstatedir}/log + +install -p -m 600 denyhosts.cfg-dist %{buildroot}/%{_sysconfdir}/denyhosts.conf +install -p -m 755 daemon-control-dist %{buildroot}/%{_bindir}/denyhosts-control +install -p -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/cron.d/denyhosts +install -p -m 755 %{SOURCE2} %{buildroot}/%{_initrddir}/denyhosts +install -p -m 644 %{SOURCE3} %{buildroot}/%{_localstatedir}/lib/denyhosts/allowed-hosts +install -p -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/denyhosts +install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/denyhosts -touch $RPM_BUILD_ROOT%{_localstatedir}/log/denyhosts +touch %{buildroot}/%{_localstatedir}/log/denyhosts for i in allowed-warned-hosts hosts hosts-restricted hosts-root \ hosts-valid offset suspicious-logins sync-hosts \ users-hosts users-invalid users-valid; do - touch $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/$i + touch %{buildroot}/%{_localstatedir}/lib/denyhosts/$i done -rm -f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc - +# RPM will byte-compile this for us if we leave the .py extension. It +# looks cleaner without it, so we'll rename it. +mv %{buildroot}/%{_bindir}/denyhosts.py %{buildroot}/%{_bindir}/denyhosts %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} # Note that we do not automaticaly run --migrate, because we can't be @@ -110,7 +111,8 @@ %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt %doc README.fedora README.txt setup.py README.contrib -%{_bindir}/denyhosts.py +%{_bindir}/denyhosts + %{_bindir}/denyhosts-control %{_datadir}/denyhosts %{python_sitelib}/DenyHosts/*.py @@ -142,6 +144,10 @@ %changelog +* Thu Mar 30 2006 Jason L Tibbitts III - 2.2-3 +- Switch from $RPM_BUILD_ROOT to %{buildroot} (looks cleaner). +- Rename the main executable from denyhosts.py to denyhosts. + * Wed Mar 29 2006 Jason L Tibbitts III - 2.2-2 - Specfile cleanups. - Add hostname to default report subject. --- denyhosts-2.0-daemon-control.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 31 04:34:48 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 21:34:48 -0700 Subject: rpms/fuse-sshfs/FC-5 .cvsignore, 1.3, 1.4 fuse-sshfs.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603310434.k2V4Yoje013915@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13894 Modified Files: .cvsignore fuse-sshfs.spec sources Log Message: Version 1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 11:26:54 -0000 1.3 +++ .cvsignore 31 Mar 2006 04:34:48 -0000 1.4 @@ -1 +1 @@ -sshfs-fuse-1.4.tar.gz +sshfs-fuse-1.6.tar.gz Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-5/fuse-sshfs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fuse-sshfs.spec 13 Feb 2006 12:16:17 -0000 1.4 +++ fuse-sshfs.spec 31 Mar 2006 04:34:48 -0000 1.5 @@ -1,5 +1,5 @@ Name: fuse-sshfs -Version: 1.4 +Version: 1.6 Release: 2%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH @@ -37,8 +37,16 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/sshfs +%{_libdir}/sshnodelay.so %changelog + +* Thu Mar 30 2006 Peter Lemenkov - 1.6-2 +- added missing sshnodelay.so + +* Thu Mar 30 2006 Peter Lemenkov - 1.6-1 +- Version 1.6 + * Mon Feb 13 2006 Peter Lemenkov - 1.4-2 - small cosmetic fixes Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 11:26:54 -0000 1.3 +++ sources 31 Mar 2006 04:34:48 -0000 1.4 @@ -1 +1 @@ -3777dd6f232d33c9110abfa5ecd5518e sshfs-fuse-1.4.tar.gz +04fa75c1357bea362537efe15805e7da sshfs-fuse-1.6.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 04:37:30 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 21:37:30 -0700 Subject: rpms/fuse-sshfs/FC-5 fuse-sshfs.spec,1.5,1.6 Message-ID: <200603310437.k2V4bWTB014011@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13994 Modified Files: fuse-sshfs.spec Log Message: rebuild Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-5/fuse-sshfs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fuse-sshfs.spec 31 Mar 2006 04:34:48 -0000 1.5 +++ fuse-sshfs.spec 31 Mar 2006 04:37:30 -0000 1.6 @@ -1,6 +1,6 @@ Name: fuse-sshfs Version: 1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH Group: System Environment/Base @@ -41,6 +41,9 @@ %changelog +* Fri Mar 31 2006 Peter Lemenkov - 1.6-3 +- rebuild + * Thu Mar 30 2006 Peter Lemenkov - 1.6-2 - added missing sshnodelay.so From fedora-extras-commits at redhat.com Fri Mar 31 04:48:51 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 21:48:51 -0700 Subject: owners owners.list,1.782,1.783 Message-ID: <200603310448.k2V4mr6T014093@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14076/owners Modified Files: owners.list Log Message: Added stratagus Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.782 retrieving revision 1.783 diff -u -r1.782 -r1.783 --- owners.list 30 Mar 2006 16:12:00 -0000 1.782 +++ owners.list 31 Mar 2006 04:48:51 -0000 1.783 @@ -1342,6 +1342,7 @@ Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|stellarium|A photo-realistic nightsky renderer|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|stratagus|Real-rime strategy game engine|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|straw|GNOME desktop news aggregator|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org| Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 31 05:21:07 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 22:21:07 -0700 Subject: rpms/paps/devel paps-0.6.3-formfeed.patch, NONE, 1.1 paps-0.6.3-goption.patch, NONE, 1.1 paps-0.6.3-header.patch, NONE, 1.1 paps.spec, 1.7, 1.8 Message-ID: <200603310521.k2V5L9rG016160@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16134 Modified Files: paps.spec Added Files: paps-0.6.3-formfeed.patch paps-0.6.3-goption.patch paps-0.6.3-header.patch Log Message: * Fri Mar 31 2006 Akira TAGOH - 0.6.3-4 - paps-0.6.3-formfeed.patch: applied to deal with the formfeed mark properly. - paps-0.6.3-goption.patch: rewritten option parser using GOption. and segfault gone as well. (#187205) - paps-0.6.3-header.patch: applied to support the output of the page header. paps-0.6.3-formfeed.patch: --- NEW FILE paps-0.6.3-formfeed.patch --- diff -ruN paps-0.6.3.orig/src/paps.c paps-0.6.3/src/paps.c --- paps-0.6.3.orig/src/paps.c 2006-03-28 12:10:36.000000000 +0900 +++ paps-0.6.3/src/paps.c 2006-03-28 15:54:21.000000000 +0900 @@ -83,6 +83,7 @@ PangoLayoutLine *pango_line; PangoRectangle logical_rect; PangoRectangle ink_rect; + int formfeed; } LineLink; typedef struct _Paragraph Paragraph; @@ -93,6 +94,7 @@ char *text; int length; int height; /* Height, in pixels */ + int formfeed; PangoLayout *layout; }; @@ -431,7 +433,7 @@ fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ()); wc = 0; } - if (!*p || !wc || wc == '\n') + if (!*p || !wc || wc == '\n' || wc == '\f') { Paragraph *para = g_new (Paragraph, 1); para->text = last_para; @@ -445,6 +447,11 @@ pango_layout_set_width (para->layout, paint_width * PANGO_SCALE); para->height = 0; + if (wc == '\f') + para->formfeed = 1; + else + para->formfeed = 0; + last_para = next; result = g_list_prepend (result, para); @@ -472,6 +479,7 @@ while(par_list) { int para_num_lines, i; + LineLink *line_link; Paragraph *para = par_list->data; para_num_lines = pango_layout_get_line_count(para->layout); @@ -479,12 +487,15 @@ for (i=0; iformfeed = 0; line_link->pango_line = pango_layout_get_line(para->layout, i); pango_layout_line_get_extents(line_link->pango_line, &ink_rect, &logical_rect); line_link->logical_rect = logical_rect; + if (para->formfeed && i == (para_num_lines - 1)) + line_link->formfeed = 1; line_link->ink_rect = ink_rect; line_list = g_list_prepend(line_list, line_link); } @@ -513,8 +524,8 @@ PangoLayoutLine *line = line_link->pango_line; /* Check if we need to move to next column */ - if (column_y_pos + line_link->logical_rect.height - >= pango_column_height) + if ((column_y_pos + line_link->logical_rect.height + >= pango_column_height) || line_link->formfeed) { column_idx++; column_y_pos = 0; paps-0.6.3-goption.patch: --- NEW FILE paps-0.6.3-goption.patch --- diff -ruN paps-0.6.3.orig/src/paps.c paps-0.6.3/src/paps.c --- paps-0.6.3.orig/src/paps.c 2006-03-29 15:21:53.000000000 +0900 +++ paps-0.6.3/src/paps.c 2006-03-29 16:22:59.000000000 +0900 @@ -138,12 +138,58 @@ double last_pos_y = -1; double last_pos_x = -1; paps_t *paps; +paper_type_t paper_type = PAPER_TYPE_A4; #define CASE(s) if (strcmp(S_, s) == 0) +static gboolean +_paps_arg_paper_cb(const char *option_name, + const char *value, + gpointer data) +{ + gboolean retval = TRUE; + + if (value && *value) { + if (g_ascii_strcasecmp(value, "legal") == 0) + paper_type = PAPER_TYPE_US_LEGAL; + else if (g_ascii_strcasecmp(value, "letter") == 0) + paper_type = PAPER_TYPE_US_LETTER; + else if (g_ascii_strcasecmp(value, "a4") == 0) + paper_type = PAPER_TYPE_A4; + else { + retval = FALSE; + fprintf(stderr, "Unknown page size %s.\n", value); + } + } else { + fprintf(stderr, "You must specify page size.\n"); + retval = FALSE; + } + + return retval; +} + int main(int argc, char *argv[]) { - int argp=1; + gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE; + int num_columns = 1, font_scale = 12; + int top_margin = 36, bottom_margin = 36, right_margin = 36, left_margin = 36; + char *font_family = "Monospace"; + GOptionContext *ctxt = g_option_context_new("[text file]"); + GOptionEntry entries[] = { + {"landscape", 0, 0, G_OPTION_ARG_NONE, &do_landscape, "Landscape output. (Default: portrait)", NULL}, + {"columns", 0, 0, G_OPTION_ARG_INT, &num_columns, "Number of columns output. (Default: 1)", "NUM"}, + {"font_scale", 0, 0, G_OPTION_ARG_INT, &font_scale, "Font scaling. (Default: 12)", "NUM"}, + {"family", 0, 0, G_OPTION_ARG_STRING, &font_family, "Pango FT2 font family. (Default: Monospace)", "FAMILY"}, + {"rtl", 0, 0, G_OPTION_ARG_NONE, &do_rtl, "Do rtl layout.", NULL}, + {"justify", 0, 0, G_OPTION_ARG_NONE, &do_justify, "Do justify the lines.", NULL}, + {"paper", 0, 0, G_OPTION_ARG_CALLBACK, _paps_arg_paper_cb, "Choose paper size. Known paper sizes are legal, letter, a4. (Default: a4)", "PAPER"}, + {"bottom-margin", 0, 0, G_OPTION_ARG_INT, &bottom_margin, "Set bottom margin. (Default: 36)", "NUM"}, + {"top-margin", 0, 0, G_OPTION_ARG_INT, &top_margin, "Set top margin. (Default: 36)", "NUM"}, + {"right-margin", 0, 0, G_OPTION_ARG_INT, &right_margin, "Set right margin. (Default: 36)", "NUM"}, + {"left-margin", 0, 0, G_OPTION_ARG_INT, &left_margin, "Set left margin. (Default: 36)", "NUM"}, + {NULL} + }; + GError *error = NULL; char *filename_in; char *title; FILE *IN, *OUT = NULL; @@ -154,108 +200,32 @@ PangoContext *pango_context; PangoFontDescription *font_description; PangoDirection pango_dir = PANGO_DIRECTION_LTR; - char *font_family = "Monospace"; - int font_scale = 12; int num_pages = 1; - int num_columns = 1; int gutter_width = 40; int total_gutter_width; - paper_type_t paper_type = PAPER_TYPE_A4; int page_width = paper_sizes[0].width; int page_height = paper_sizes[0].height; - gboolean do_landscape = FALSE; int do_tumble = -1; /* -1 means not initialized */ int do_duplex = -1; gboolean do_draw_header = FALSE; - gboolean do_justify = FALSE; gchar *paps_header = NULL; - int top_margin = 36; - int bottom_margin = 36; - int left_margin = 36; - int right_margin = 36; /* Prerequisite when using glib. */ g_type_init(); + g_option_context_add_main_entries(ctxt, entries, NULL); /* Parse command line */ - while(argp < argc && argv[argp][0] == '-') + if (!g_option_context_parse(ctxt, &argc, &argv, &error)) { - char *S_ = argv[argp++]; - CASE("--help") - { - printf("paps - A postscript generating program using pango.\n" - "\n" - "Syntax:\n" - " paps [--landscape] [--columns cl] [--font_scale fs]\n" - " [--family f] [--rtl] [--paper type]\n" - " [--bottom-margin bm] [--top-margin tm] [--left-margin lm]\n" - " [--right-margin rm]\n" - "\n" - "Description:\n" - " paps reads a UTF-8 encoded file and generates a PostScript\n" - " rendering of the file. The rendering is done by creating\n" - " outline curves through the pango FT2 backend.\n" - "\n" - "Options:\n" - " --landscape Landscape output. Default is portrait.\n" - " --columns cl Number of columns output. Default is 1.\n" - " --font_scale fs Font scaling. Default is 12.\n" - " --family f Pango ft2 font family. Default is sans.\n" - " --rtl Do rtl layout.\n" - " --paper ps Choose paper size. Known paper sizes are legal, letter, a4.\n" - " Default is A4.\n" - " --bottom-margin bm Set bottom margin. Default is 36." - " --top-margin tm Set top margin. Default is 36." - " --left-margin lm Set left margin. Default is 36." - " --right-margin rm Set right margin. Default is 36." - - ); - - exit(0); - } - CASE("--landscape") { do_landscape = TRUE; continue; } - CASE("--columns") { num_columns = atoi(argv[argp++]); continue; } - CASE("--font_scale") { font_scale = atoi(argv[argp++]); continue; } - CASE("--family") { font_family = argv[argp++]; continue; } - CASE("--rtl") { pango_dir = PANGO_DIRECTION_RTL; continue; } - CASE("--justify") { do_justify = TRUE; continue; } - CASE("--paper") - { - char *S_ = argv[argp++]; - while(1) /* So that I can break */ - { - CASE("legal") { paper_type=PAPER_TYPE_US_LEGAL; break; } - CASE("letter") { paper_type=PAPER_TYPE_US_LETTER; break; } - CASE("a4") { paper_type=PAPER_TYPE_A4; break; } - - fprintf(stderr, "Unknown page size %s!\n", S_); - exit(1); - } - continue; - } - CASE("--bottom-margin") - { - bottom_margin = atoi(argv[argp++]); continue; - } - CASE("--top-margin") - { - top_margin = atoi(argv[argp++]); continue; - } - CASE("--right-margin") - { - right_margin = atoi(argv[argp++]); continue; - } - CASE("--left-margin") - { - left_margin = atoi(argv[argp++]); continue; - } - fprintf(stderr, "Unknown option %s!\n", S_); + fprintf(stderr, "Failed to parse the given options. maybe unknown options or missing extra argument.\n"); exit(1); } + if (do_rtl) + pango_dir = PANGO_DIRECTION_RTL; - if (argp < argc) + if (argc > 1) { - filename_in = argv[argp++]; + filename_in = argv[1]; IN = fopen(filename_in, "rb"); if (!IN) { @@ -368,6 +338,7 @@ // Cleanup g_string_free(ps_pages_string, TRUE); + g_option_context_free(ctxt); return 0; } paps-0.6.3-header.patch: --- NEW FILE paps-0.6.3-header.patch --- diff -ruN -x Makefile -x autom4te.cache -x 'config*' -x doc -x libtool -x '*o' -x '*~' -x 'stamp*' -x 'test*' -x paps -x '*a' paps-0.6.3.orig/src/paps.c paps-0.6.3/src/paps.c --- paps-0.6.3.orig/src/paps.c 2006-03-29 17:26:44.000000000 +0900 +++ paps-0.6.3/src/paps.c 2006-03-30 22:42:36.000000000 +0900 @@ -63,6 +63,8 @@ int page_height; int header_ypos; int header_sep; + int header_height; + int footer_height; gboolean do_draw_header; gboolean do_draw_footer; gboolean do_duplex; @@ -72,6 +74,7 @@ gboolean do_separation_line; gboolean do_draw_contour; PangoDirection pango_dir; + gchar *filename; } page_layout_t; typedef struct { @@ -99,32 +102,39 @@ }; /* Information passed in user data when drawing outlines */ -GList *split_paragraphs_into_lines(GList *paragraphs); -static char *read_file (FILE *file); -static GList * -split_text_into_paragraphs (PangoContext *pango_context, - page_layout_t *page_layout, - int paint_width, - char *text); +GList *split_paragraphs_into_lines (GList *paragraphs); +static char *read_file (FILE *file); +static GList *split_text_into_paragraphs (PangoContext *pango_context, + page_layout_t *page_layout, + int paint_width, + char *text); +static int output_pages (FILE *OUT, + GList *pango_lines, + page_layout_t *page_layout, + gboolean need_header, + PangoContext *pango_context); +static void print_postscript_header (FILE *OUT, + const char *title, + page_layout_t *page_layout); +static void print_postscript_trailer (FILE *OUT, + int num_pages); +static void eject_column (FILE *OUT, + page_layout_t *page_layout, + int column_idx); +static void eject_page (FILE *OUT); +static void start_page (FILE *OUT, + int page_idx); +static void draw_line_to_page (FILE *OUT, + int column_idx, + int column_pos, + page_layout_t *page_layout, + PangoLayoutLine *line); +static int draw_page_header_line_to_page(FILE *OUT, + gboolean is_footer, + page_layout_t *page_layout, + PangoContext *ctx, + int page); -int output_pages(FILE *OUT, - GList *pango_lines, - page_layout_t *page_layout); -void print_postscript_header(FILE *OUT, - const char *title, - page_layout_t *page_layout); -void print_postscript_trailer(FILE *OUT, int num_pages); -void print_svg_trailer(FILE *OUT, int num_pages); -void eject_column(FILE *OUT, - page_layout_t *page_layout, - int column_idx); -void eject_page(FILE *OUT); -void start_page(FILE *OUT, int page_idx); -void draw_line_to_page(FILE *OUT, - int column_idx, - int column_pos, - page_layout_t *page_layout, - PangoLayoutLine *line); // Fonts are three character symbols in an alphabet composing of // the following characters: // @@ -170,7 +180,7 @@ int main(int argc, char *argv[]) { - gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify; + gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE, do_draw_header = FALSE; int num_columns = 1, font_scale = 12; int top_margin = 36, bottom_margin = 36, right_margin = 36, left_margin = 36; char *font_family = "Monospace"; @@ -187,6 +197,7 @@ {"top-margin", 0, 0, G_OPTION_ARG_INT, &top_margin, "Set top margin. (Default: 36)", "NUM"}, {"right-margin", 0, 0, G_OPTION_ARG_INT, &right_margin, "Set right margin. (Default: 36)", "NUM"}, {"left-margin", 0, 0, G_OPTION_ARG_INT, &left_margin, "Set left margin. (Default: 36)", "NUM"}, + {"header", 0, 0, G_OPTION_ARG_NONE, &do_draw_header, "Draw page header for each page.", NULL}, {NULL} }; GError *error = NULL; @@ -207,7 +218,6 @@ int page_height = paper_sizes[0].height; int do_tumble = -1; /* -1 means not initialized */ int do_duplex = -1; - gboolean do_draw_header = FALSE; gchar *paps_header = NULL; /* Prerequisite when using glib. */ @@ -292,6 +302,8 @@ page_layout.top_margin = top_margin; page_layout.bottom_margin = bottom_margin; page_layout.header_ypos = page_layout.top_margin; + page_layout.header_height = 0; + page_layout.footer_height = 0; if (do_draw_header) page_layout.header_sep = font_scale * 2.5; else @@ -312,6 +324,7 @@ page_layout.do_tumble = do_tumble; page_layout.do_duplex = do_duplex; page_layout.pango_dir = pango_dir; + page_layout.filename = filename_in; text = read_file(IN); paragraphs = split_text_into_paragraphs(pango_context, @@ -326,7 +339,7 @@ print_postscript_header(OUT, title, &page_layout); ps_pages_string = g_string_new(""); - num_pages = output_pages(OUT, pango_lines, &page_layout); + num_pages = output_pages(OUT, pango_lines, &page_layout, do_draw_header, pango_context); paps_header = paps_get_postscript_header_strdup(paps); fprintf(OUT, "%s", paps_header); @@ -478,9 +491,12 @@ } -int output_pages(FILE *OUT, - GList *pango_lines, - page_layout_t *page_layout) +int +output_pages(FILE *OUT, + GList *pango_lines, + page_layout_t *page_layout, + gboolean need_header, + PangoContext *pango_context) { int column_idx = 0; int column_y_pos = 0; @@ -489,6 +505,9 @@ start_page(OUT, page_idx); + if (need_header) + column_y_pos += draw_page_header_line_to_page(OUT, FALSE, page_layout, pango_context, page_idx); + while(pango_lines) { LineLink *line_link = pango_lines->data; @@ -506,12 +525,17 @@ eject_page(OUT); page_idx++; start_page(OUT, page_idx); + + if (need_header) + column_y_pos += draw_page_header_line_to_page(OUT, FALSE, page_layout, pango_context, page_idx); } else - eject_column(OUT, - page_layout, - column_idx - ); + { + eject_column(OUT, + page_layout, + column_idx + ); + } } draw_line_to_page(OUT, column_idx, @@ -706,8 +730,8 @@ + page_layout->column_width * column_idx + total_gutter; - y_top = page_layout->page_height - page_layout->top_margin; - y_bot = page_layout->bottom_margin; + y_top = page_layout->page_height - page_layout->top_margin - page_layout->header_height - page_layout->header_sep / 2; + y_bot = page_layout->bottom_margin - page_layout->footer_height; g_string_append_printf(ps_pages_string, "%f %f moveto %f %f lineto 0 setlinewidth stroke\n", @@ -778,3 +802,89 @@ g_free(ps_layout); } +int +draw_page_header_line_to_page(FILE *OUT, + gboolean is_footer, + page_layout_t *page_layout, + PangoContext *ctx, + int page) +{ + PangoLayout *layout = pango_layout_new(ctx); + PangoLayoutLine *line; + PangoRectangle ink_rect, logical_rect; + /* Assume square aspect ratio for now */ + double x_pos, y_pos; + gchar *ps_layout, *header, date[256]; + time_t t; + struct tm tm; + int height; + gdouble line_pos; + + t = time(NULL); + tm = *localtime(&t); + strftime(date, 255, "%c", &tm); + header = g_strdup_printf("%s\n%s\nPage %d", date, page_layout->filename, page); + pango_layout_set_markup(layout, header, -1); + g_free(header); + + /* output a left edge of header/footer */ + line = pango_layout_get_line(layout, 0); + pango_layout_line_get_extents(line, + &ink_rect, + &logical_rect); + x_pos = page_layout->left_margin; + height = logical_rect.height / PANGO_SCALE * page_layout->pixel_to_pt; + if (is_footer) + { + y_pos = page_layout->top_margin + height; + page_layout->footer_height = height; + } + else + { + y_pos = page_layout->page_height - page_layout->bottom_margin - height; + page_layout->header_height = height; + } + ps_layout = paps_layout_line_to_postscript_strdup(paps, + x_pos, y_pos, + line); + g_string_append(ps_pages_string, + ps_layout); + g_free(ps_layout); + + /* output a center of header/footer */ + line = pango_layout_get_line(layout, 1); + pango_layout_line_get_extents(line, + &ink_rect, + &logical_rect); + x_pos = (page_layout->page_width - (logical_rect.width / PANGO_SCALE * page_layout->pixel_to_pt)) / 2; + ps_layout = paps_layout_line_to_postscript_strdup(paps, + x_pos, y_pos, + line); + g_string_append(ps_pages_string, + ps_layout); + g_free(ps_layout); + + /* output a right edge of header/footer */ + line = pango_layout_get_line(layout, 2); + pango_layout_line_get_extents(line, + &ink_rect, + &logical_rect); + x_pos = page_layout->page_width - page_layout->right_margin - (logical_rect.width / PANGO_SCALE * page_layout->pixel_to_pt); + ps_layout = paps_layout_line_to_postscript_strdup(paps, + x_pos, y_pos, + line); + g_string_append(ps_pages_string, + ps_layout); + g_free(ps_layout); + + g_object_unref(layout); + + /* header separator */ + line_pos = page_layout->page_height - page_layout->top_margin - page_layout->header_height - page_layout->header_sep / 2; + g_string_append_printf(ps_pages_string, + "%d %f moveto %d %f lineto 0 setlinewidth stroke\n", + page_layout->left_margin, line_pos, + page_layout->page_width - page_layout->right_margin, line_pos); + + return logical_rect.height; +} Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- paps.spec 24 Mar 2006 09:35:23 -0000 1.7 +++ paps.spec 31 Mar 2006 05:21:07 -0000 1.8 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.3 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -9,6 +9,9 @@ BuildRequires: pango-devel Patch0: paps-0.6.1-makefile.patch Patch1: paps-0.6.3-fix-pagesize.patch +Patch2: paps-0.6.3-formfeed.patch +Patch3: paps-0.6.3-goption.patch +Patch4: paps-0.6.3-header.patch Summary: Plain Text to PostScript converter Group: Applications/Publishing @@ -20,6 +23,9 @@ %setup -q %patch0 -p1 -b .makefile %patch1 -p1 -b .pagesize +%patch2 -p1 -b .formfeed +%patch3 -p1 -b .goption +%patch4 -p1 -b .header aclocal automake autoconf @@ -46,6 +52,12 @@ %changelog +* Fri Mar 31 2006 Akira TAGOH - 0.6.3-4 +- paps-0.6.3-formfeed.patch: applied to deal with the formfeed mark properly. +- paps-0.6.3-goption.patch: rewritten option parser using GOption. and segfault + gone as well. (#187205) +- paps-0.6.3-header.patch: applied to support the output of the page header. + * Fri Mar 24 2006 Akira TAGOH - 0.6.3-3 - paps-0.6.3-fix-pagesize.patch: fixed displaying the beginning of line at out of page. (#176207) From fedora-extras-commits at redhat.com Fri Mar 31 05:34:20 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 22:34:20 -0700 Subject: rpms/paps/devel paps-0.6.3-header.patch,1.1,1.2 Message-ID: <200603310534.k2V5YMkJ016261@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16241 Modified Files: paps-0.6.3-header.patch Log Message: paps-0.6.3-header.patch: Index: paps-0.6.3-header.patch =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps-0.6.3-header.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- paps-0.6.3-header.patch 31 Mar 2006 05:21:07 -0000 1.1 +++ paps-0.6.3-header.patch 31 Mar 2006 05:34:20 -0000 1.2 @@ -87,7 +87,7 @@ int main(int argc, char *argv[]) { -- gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify; +- gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE; + gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE, do_draw_header = FALSE; int num_columns = 1, font_scale = 12; int top_margin = 36, bottom_margin = 36, right_margin = 36, left_margin = 36; From fedora-extras-commits at redhat.com Fri Mar 31 06:42:40 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 30 Mar 2006 23:42:40 -0700 Subject: rpms/bcm43xx-fwcutter/devel .cvsignore, 1.2, 1.3 bcm43xx-fwcutter.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603310642.k2V6ggq6018506@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18485 Modified Files: .cvsignore bcm43xx-fwcutter.spec sources Log Message: 004 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Mar 2006 11:40:46 -0000 1.2 +++ .cvsignore 31 Mar 2006 06:42:40 -0000 1.3 @@ -1 +1 @@ -bcm43xx-fwcutter-003.tar.bz2 +bcm43xx-fwcutter-004.tar.bz2 Index: bcm43xx-fwcutter.spec =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/bcm43xx-fwcutter.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bcm43xx-fwcutter.spec 24 Mar 2006 11:40:46 -0000 1.1 +++ bcm43xx-fwcutter.spec 31 Mar 2006 06:42:40 -0000 1.2 @@ -1,6 +1,6 @@ Name: bcm43xx-fwcutter -Version: 003 -Release: 2%{?dist} +Version: 004 +Release: 1%{?dist} Summary: Firmware extraction tool for Broadcom wireless driver Group: System Environment/Base @@ -47,6 +47,9 @@ %doc README README.Fedora modprobe.bcm43xx %changelog +* Fri Mar 31 2006 David Woodhouse 004-1 +- Update to 004 + * Thu Mar 23 2006 David Woodhouse 003-2 - Package review. Use $RPM_OPT_FLAGS, ship man page, etc. - Complete documentation, add sample bcm43xx.modprobe file Index: sources =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Mar 2006 11:40:46 -0000 1.2 +++ sources 31 Mar 2006 06:42:40 -0000 1.3 @@ -1 +1 @@ -89b407d920811cfd15507da17f901bb0 bcm43xx-fwcutter-003.tar.bz2 +6a6ab01b56b1e191fa54d60a015fecd9 bcm43xx-fwcutter-004.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 06:42:58 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 30 Mar 2006 23:42:58 -0700 Subject: rpms/bcm43xx-fwcutter/FC-5 .cvsignore, 1.2, 1.3 bcm43xx-fwcutter.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603310643.k2V6h0LX018562@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18541 Modified Files: .cvsignore bcm43xx-fwcutter.spec sources Log Message: 004 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Mar 2006 11:40:46 -0000 1.2 +++ .cvsignore 31 Mar 2006 06:42:58 -0000 1.3 @@ -1 +1 @@ -bcm43xx-fwcutter-003.tar.bz2 +bcm43xx-fwcutter-004.tar.bz2 Index: bcm43xx-fwcutter.spec =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/FC-5/bcm43xx-fwcutter.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bcm43xx-fwcutter.spec 24 Mar 2006 11:40:46 -0000 1.1 +++ bcm43xx-fwcutter.spec 31 Mar 2006 06:42:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: bcm43xx-fwcutter -Version: 003 -Release: 2%{?dist} +Version: 004 +Release: 1%{?dist} Summary: Firmware extraction tool for Broadcom wireless driver Group: System Environment/Base @@ -47,6 +47,9 @@ %doc README README.Fedora modprobe.bcm43xx %changelog +* Fri Mar 31 2006 David Woodhouse 004-1 +- Update to 004 + * Thu Mar 23 2006 David Woodhouse 003-2 - Package review. Use $RPM_OPT_FLAGS, ship man page, etc. - Complete documentation, add sample bcm43xx.modprobe file Index: sources =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Mar 2006 11:40:46 -0000 1.2 +++ sources 31 Mar 2006 06:42:58 -0000 1.3 @@ -1 +1 @@ -89b407d920811cfd15507da17f901bb0 bcm43xx-fwcutter-003.tar.bz2 +6a6ab01b56b1e191fa54d60a015fecd9 bcm43xx-fwcutter-004.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 08:16:50 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:16:50 -0700 Subject: rpms/shippy - New directory Message-ID: <200603310816.k2V8GqQu022768@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22742/shippy Log Message: Directory /cvs/extras/rpms/shippy added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 08:16:50 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:16:50 -0700 Subject: rpms/shippy/devel - New directory Message-ID: <200603310816.k2V8GqFY022771@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22742/shippy/devel Log Message: Directory /cvs/extras/rpms/shippy/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 08:17:05 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:17:05 -0700 Subject: rpms/shippy Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603310817.k2V8H7rx022820@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22787 Added Files: Makefile import.log Log Message: Setup of module shippy --- NEW FILE Makefile --- # Top level Makefile for module shippy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 31 08:17:05 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:17:05 -0700 Subject: rpms/shippy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603310817.k2V8H7xV022823@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22787/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module shippy --- NEW 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 Mar 31 08:18:18 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:18:18 -0700 Subject: rpms/shippy import.log,1.1,1.2 Message-ID: <200603310818.k2V8IKJw022932@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22891 Modified Files: import.log Log Message: auto-import shippy-1.3.3.7-2 on branch devel from shippy-1.3.3.7-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/shippy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 Mar 2006 08:17:04 -0000 1.1 +++ import.log 31 Mar 2006 08:18:18 -0000 1.2 @@ -0,0 +1 @@ +shippy-1_3_3_7-2:HEAD:shippy-1.3.3.7-2.src.rpm:1143792911 From fedora-extras-commits at redhat.com Fri Mar 31 08:18:18 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:18:18 -0700 Subject: rpms/shippy/devel shippy-fixes.patch, NONE, 1.1 shippy-fullscreen.patch, NONE, 1.1 shippy-joy.patch, NONE, 1.1 shippy-lcdfix.patch, NONE, 1.1 shippy-warnings.patch, NONE, 1.1 shippy.desktop, NONE, 1.1 shippy.png, NONE, 1.1 shippy.sh, NONE, 1.1 shippy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603310818.k2V8ILAF022947@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22891/devel Modified Files: .cvsignore sources Added Files: shippy-fixes.patch shippy-fullscreen.patch shippy-joy.patch shippy-lcdfix.patch shippy-warnings.patch shippy.desktop shippy.png shippy.sh shippy.spec Log Message: auto-import shippy-1.3.3.7-2 on branch devel from shippy-1.3.3.7-2.src.rpm shippy-fixes.patch: --- NEW FILE shippy-fixes.patch --- --- shippy-1.3.3.7/shippy.c.fix 2004-03-08 06:41:30.000000000 +0100 +++ shippy-1.3.3.7/shippy.c 2006-03-27 19:52:23.000000000 +0200 @@ -4,6 +4,9 @@ http://ship84.sourceforge.net */ +/* this must be done before the first include of unistd.h for setresgid */ +#define _GNU_SOURCE +#include #include #include "shippy.h" @@ -98,6 +101,8 @@ int missedshots = 0; int firedshots = 0; +FILE *highscore_fp; + int compare(const void *a, const void *b) { struct HISCORE *test = (struct HISCORE *)a; @@ -656,7 +661,7 @@ if(shots<10) { AddObject(BULLET, ShippyObjects[number].x, ShippyObjects[number].y,0,0,0,NULL,0,0); - audio_play("data/shot.wav"); + audio_play(DATADIR "shot.wav"); ++shots; ++firedshots; } @@ -670,7 +675,7 @@ { if(shots<6) { - audio_play("data/helix.wav"); + audio_play(DATADIR "helix.wav"); AddObject(BULLWAVE, ShippyObjects[number].x-6, ShippyObjects[number].y-8,0,-16,0,NULL,0,0); AddObject(BULLWAVE, ShippyObjects[number].x+6, ShippyObjects[number].y-8,0,16,0,NULL,0,0); shots+=2; @@ -693,7 +698,7 @@ if(shots<3) { AddObject(BULLET, ShippyObjects[number].x, ShippyObjects[number].y,0,0,0,NULL,0,0); - audio_play("data/shot.wav"); + audio_play(DATADIR "shot.wav"); ++shots; ++firedshots; } @@ -837,7 +842,7 @@ } diedlast = 1; - audio_play("data/die.wav"); + audio_play(DATADIR "die.wav"); ShippyObjects[number].type=EXPLOSION; ShippyObjects[number].special=4; } @@ -937,7 +942,7 @@ 0); } - audio_play("data/hit.wav"); + audio_play(DATADIR "hit.wav"); break; case ENEMYSHIPPY: @@ -955,7 +960,7 @@ 0, 0); } - audio_play("data/hit.wav"); + audio_play(DATADIR "hit.wav"); break; case FEZBOMB: @@ -976,7 +981,7 @@ 0, 0); } - audio_play("data/hit.wav"); + audio_play(DATADIR "hit.wav"); break; } @@ -1059,7 +1064,7 @@ } diedlast = 1; - audio_play("data/die.wav"); + audio_play(DATADIR "die.wav"); ShippyObjects[number].type=EXPLOSION; ShippyObjects[number].special=4; return; @@ -1097,43 +1102,26 @@ void StoreHS() { - FILE *savehs = NULL; - savehs = fopen("data/scores.lst","wb"); - - if(savehs==NULL) return; - - fwrite(winners,sizeof(struct HISCORE), 14, savehs); - fclose(savehs); - return; - + if(highscore_fp==NULL) return; + rewind(highscore_fp); + fwrite(winners,sizeof(struct HISCORE), 14, highscore_fp); } void RestoreHS() { int i; - FILE *loadhs = NULL; - - loadhs = fopen("data/scores.lst","rb"); - if(loadhs!=NULL) + if(highscore_fp!=NULL) { - if(fread(winners,sizeof(struct HISCORE), 14, loadhs)==14) + if(fread(winners,sizeof(struct HISCORE), 14, highscore_fp)==14) { - fclose(loadhs); highscore=winners[0].score; return; } - else - { - fclose(loadhs); - } - - } - strcpy(winners[0].name,"RAB"); winners[0].level = 14; winners[0].score = 250000; @@ -1225,17 +1213,17 @@ if(operational==600) { - SYSTEM_BG("data/splash.bmp"); + SYSTEM_BG(DATADIR "splash.bmp"); } if(operational>0) { --operational; - if(operational==0) audio_play("data/splash.wav"); + if(operational==0) audio_play(DATADIR "splash.wav"); } if(operational==120) { - SYSTEM_BG("data/splash2.bmp"); + SYSTEM_BG(DATADIR "splash2.bmp"); } if(waitforkey==0) { @@ -1339,7 +1327,7 @@ { ShippyObjects[0].lives++; extralife *= 2; - audio_play("data/fanfare.wav"); + audio_play(DATADIR "fanfare.wav"); } if(leftmonsters>0 && done == 0 && gameover==0) @@ -1388,7 +1376,7 @@ } for(increment=0;increment<14;++increment) winners[increment].last=0; gamestate = INITIALS; - audio_music("data/score.xm"); + audio_music(DATADIR "score.xm"); waitforkey=30; operational = 0; } @@ -1401,7 +1389,7 @@ { NewGame(-1); operational = 1; - if(gamestate==TITLE) audio_music("data/title.xm"); + if(gamestate==TITLE) audio_music(DATADIR "title.xm"); } if(done==0 && operational==1) @@ -1429,7 +1417,7 @@ else { - audio_music("data/shippy.xm"); + audio_music(DATADIR "shippy.xm"); gamestate = GAME; operational = 0; } @@ -1467,7 +1455,7 @@ { ShippyObjects[0].lives++; extralife *= 2; - audio_play("data/fanfare.wav"); + audio_play(DATADIR "fanfare.wav"); } @@ -1513,6 +1501,16 @@ void SHIPPY_MAIN() { int increment; + gid_t realgid; + + highscore_fp = fopen("/var/lib/games/shippy.hs", "r+"); + + realgid = getgid(); + if (setresgid(-1, realgid, realgid) != 0) { + perror("Could not drop setgid privileges. Aborting."); + exit(1); + } + srand(time(0)); if(SYSTEM_INIT()!=0) return; InitShippy(); --- shippy-1.3.3.7/shippy.h.fix 2004-02-03 21:10:00.000000000 +0100 +++ shippy-1.3.3.7/shippy.h 2006-03-27 19:51:06.000000000 +0200 @@ -3,6 +3,10 @@ #include "externs.h" +#ifndef DATADIR +#define DATADIR "data/" +#endif + void Start_Audio(); void audio_start(); void audio_play(char *wav); --- shippy-1.3.3.7/shipall.c.fix 2004-03-04 00:52:10.000000000 +0100 +++ shippy-1.3.3.7/shipall.c 2006-03-27 19:51:06.000000000 +0200 @@ -199,7 +199,7 @@ BackBuffer=create_system_bitmap(240,160); Graphics=create_system_bitmap(320,128); - mytest2 = load_bmp("data/graphics.bmp",mypal); + mytest2 = load_bmp(DATADIR "graphics.bmp",mypal); if(mytest2==NULL) return; blit(mytest2,Graphics,0,0,0,0,320,128); destroy_bitmap(mytest2); --- shippy-1.3.3.7/shipsdl.c.fix 2004-03-04 00:53:02.000000000 +0100 +++ shippy-1.3.3.7/shipsdl.c 2006-03-27 19:51:06.000000000 +0200 @@ -164,9 +164,9 @@ void End_Audio() { + audio_end(); Mix_HaltMusic(); Mix_CloseAudio(); - audio_end(); } @@ -194,8 +194,8 @@ SYSTEM_CLEANBMP(); - Graphics = CreateSurfaceFromBitmap("data/graphics.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY); - BackBuffer= CreateSurfaceFromBitmap("data/splash.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY); + Graphics = CreateSurfaceFromBitmap(DATADIR "graphics.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY); + BackBuffer= CreateSurfaceFromBitmap(DATADIR "splash.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY); SDL_SetColors(screen, Graphics->format->palette->colors, 0,Graphics->format->palette->ncolors); SDL_SetColorKey(Graphics,SDL_SRCCOLORKEY, SDL_MapRGB(Graphics->format, 255, 0, 255)); SDL_SetColorKey(BackBuffer,SDL_SRCCOLORKEY, SDL_MapRGB(Graphics->format, 255, 0, 255)); @@ -356,6 +356,10 @@ void SYSTEM_IDLE() { Uint32 test = SDL_GetTicks(); + + if (test < timing) + usleep(1000); + while(test>timing) { timing+=14; shippy-fullscreen.patch: --- NEW FILE shippy-fullscreen.patch --- diff -ur shippy-1.3.3.7.orig/shipall.c shippy-1.3.3.7/shipall.c --- shippy-1.3.3.7.orig/shipall.c 2006-03-27 23:12:03.000000000 +0200 +++ shippy-1.3.3.7/shipall.c 2006-03-27 22:55:33.000000000 +0200 @@ -10,6 +10,11 @@ volatile int objectsynch = 0; +#ifndef ALLEGRO_DOS +static int vidmode; +#endif +static RGB mypal[256]; + DUH *music=NULL; AL_DUH_PLAYER *dp=NULL; @@ -172,7 +177,6 @@ { int GraphicsFlag; BITMAP *mytest2; - RGB mypal[256]; set_color_depth(8); bitsperpixel = 8; set_color_conversion(COLORCONV_TOTAL); @@ -189,12 +193,15 @@ #else - GraphicsFlag=set_gfx_mode(GFX_AUTODETECT_WINDOWED, 480, 320, 0, 0); + GraphicsFlag=set_gfx_mode(GFX_AUTODETECT_FULLSCREEN, 480, 320, 0, 0); if(GraphicsFlag!=0) { GraphicsFlag=set_gfx_mode(GFX_SAFE, 480, 320, 0, 0); if(GraphicsFlag!=0) exit(-1); + else vidmode = GFX_SAFE; } + else + vidmode = GFX_AUTODETECT_FULLSCREEN; #endif BackBuffer=create_system_bitmap(240,160); @@ -306,6 +313,25 @@ if(SYSTEM_GETKEY(KEY_ESC)) done = 1; + +#ifndef ALLEGRO_DOS + if (key[KEY_ENTER] && key[KEY_ALT] && (vidmode != GFX_SAFE)) + { + vidmode = (vidmode == GFX_AUTODETECT_FULLSCREEN)? + GFX_AUTODETECT_WINDOWED:GFX_AUTODETECT_FULLSCREEN; + if(set_gfx_mode(vidmode, 480, 320, 0, 0)) + { + vidmode = GFX_SAFE; + if(set_gfx_mode(vidmode, 480, 320, 0, 0)) + { + fprintf(stderr, "FATAL error switching Fullscreen <-> Window\n"); + exit(1); + } + } + set_palette(mypal); + } +#endif + if(waitforkey>0) { --waitforkey; diff -ur shippy-1.3.3.7.orig/shipsdl.c shippy-1.3.3.7/shipsdl.c --- shippy-1.3.3.7.orig/shipsdl.c 2006-03-27 23:12:03.000000000 +0200 +++ shippy-1.3.3.7/shipsdl.c 2006-03-27 22:39:46.000000000 +0200 @@ -189,7 +189,8 @@ void SYSTEM_SETVID() { - screen = SDL_SetVideoMode(480, 320, 8, SDL_SWSURFACE | SDL_HWPALETTE); + SDL_ShowCursor(SDL_DISABLE); + screen = SDL_SetVideoMode(480, 320, 8, SDL_SWSURFACE | SDL_HWPALETTE | SDL_FULLSCREEN); if ( screen == NULL ) { return; @@ -328,6 +329,9 @@ if(key[SDLK_ESCAPE]) done = 1; + if(key[SDLK_RETURN] && key[SDLK_LALT]) + SDL_WM_ToggleFullScreen(screen); + if(waitforkey>0) { --waitforkey; shippy-joy.patch: --- NEW FILE shippy-joy.patch --- --- shippy-1.3.3.7/shippy.c.joy 2006-03-31 01:07:13.000000000 +0200 +++ shippy-1.3.3.7/shippy.c 2006-03-31 01:07:13.000000000 +0200 @@ -1281,13 +1281,13 @@ } - if(jdirx == -2) + if(jdirx <= -1) { --currchar; if(currchar<'A') currchar = 'Z'; waitforkey=15; } - if(jdirx == 2) + if(jdirx >= 1) { ++currchar; if(currchar>'Z') currchar = 'A'; --- shippy-1.3.3.7/shipsdl.c.joy 2006-03-31 01:07:13.000000000 +0200 +++ shippy-1.3.3.7/shipsdl.c 2006-03-31 01:15:09.000000000 +0200 @@ -8,6 +8,7 @@ SDL_Surface *screen = NULL; SDL_Surface *BackBuffer = NULL; SDL_Surface *Graphics = NULL; +SDL_Joystick *Joystick = NULL; Uint8 key[1337]; Uint32 CLEARCOLOR = 0; @@ -215,7 +216,7 @@ int SYSTEM_INIT() { - if((SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO)==-1)) + if((SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO|SDL_INIT_JOYSTICK)==-1)) { return 1; } @@ -226,6 +227,8 @@ SDL_WM_SetCaption("Shippy1984 by Ryan Broomfield SDL VERSION", NULL); audio_start(); + + Joystick = SDL_JoystickOpen(0); return 0; } @@ -234,6 +237,8 @@ { SYSTEM_CLEANBMP(); End_Audio(); + if (Joystick) + SDL_JoystickClose(Joystick); return 0; } @@ -327,21 +332,20 @@ return; } -/* if(num_joysticks>0) - { - poll_joystick(); - jaction = joy[0].button[0].b; - jsecond = joy[0].button[1].b; - jdirx = (joy[0].stick[0].axis[0].d1 - joy[0].stick[0].axis[0].d2)*2; - jdiry = (joy[0].stick[0].axis[1].d1 - joy[0].stick[0].axis[1].d2); - } -*/ - jdirx = 0; jdiry = 0; jaction = 0; jsecond = 0; + if(Joystick) + { + SDL_JoystickUpdate(); + jaction = SDL_JoystickGetButton(Joystick, 0); + jsecond = SDL_JoystickGetButton(Joystick, 1); + jdirx = SDL_JoystickGetAxis(Joystick, 0) / (50 * 256); + jdiry = SDL_JoystickGetAxis(Joystick, 1) / (65 * 256); + } + if(jdirx == 0) jdirx=(key[SDLK_RIGHT] - key[SDLK_LEFT]) * 2; if(jdiry == 0) jdiry=key[SDLK_DOWN] - key[SDLK_UP]; if(jaction == 0) jaction = key[SDLK_LCTRL]; --- shippy-1.3.3.7/shipall.c.joy 2006-03-31 01:07:13.000000000 +0200 +++ shippy-1.3.3.7/shipall.c 2006-03-31 01:15:40.000000000 +0200 @@ -344,8 +344,8 @@ poll_joystick(); jaction = joy[0].button[0].b; jsecond = joy[0].button[1].b; - jdirx = (joy[0].stick[0].axis[0].d1 - joy[0].stick[0].axis[0].d2)*2; - jdiry = (joy[0].stick[0].axis[1].d1 - joy[0].stick[0].axis[1].d2); + jdirx = joy[0].stick[0].axis[0].pos / 50; + jdiry = joy[0].stick[0].axis[1].pos / 65; } if(jdirx == 0) jdirx=(SYSTEM_GETKEY(KEY_LEFT) - SYSTEM_GETKEY(KEY_RIGHT)) * 2; if(jdiry == 0) jdiry=SYSTEM_GETKEY(KEY_UP) - SYSTEM_GETKEY(KEY_DOWN); shippy-lcdfix.patch: --- NEW FILE shippy-lcdfix.patch --- --- shippy-1.3.3.7/shipsdl.c.lcdfix 2006-03-28 21:57:07.000000000 +0200 +++ shippy-1.3.3.7/shipsdl.c 2006-03-28 21:57:07.000000000 +0200 @@ -189,8 +189,11 @@ void SYSTEM_SETVID() { + Uint32 flags = SDL_SWSURFACE | SDL_HWPALETTE | SDL_FULLSCREEN; + if (start_windowed) + flags &= ~SDL_FULLSCREEN; SDL_ShowCursor(SDL_DISABLE); - screen = SDL_SetVideoMode(480, 320, 8, SDL_SWSURFACE | SDL_HWPALETTE | SDL_FULLSCREEN); + screen = SDL_SetVideoMode(screen_width, screen_height, 8, flags); if ( screen == NULL ) { return; @@ -253,36 +256,22 @@ /* NEW SYSTEM_FINISHRENDER() BY JONATHAN GILBERT 1-28-2004 */ void SYSTEM_FINISHRENDER() { - int x, y, w; - Uint8 *in; - Uint16 *out; - + src.x = 0; + src.y = 0; + src.w = 240; + src.h = 160; + + dest.x = 0; + dest.y = 0; + dest.w = screen_width; + dest.h = screen_height; + if (SDL_MUSTLOCK(BackBuffer)) SDL_LockSurface(BackBuffer); if (SDL_MUSTLOCK(screen)) SDL_LockSurface(screen); - - in = BackBuffer->pixels; - out = (Uint16 *)screen->pixels; - - w = BackBuffer->pitch; - - for (y=0; y<160; y++) - { - for (x=0; x> 8 << 16); - sample *= 257; - - *(Uint32 *)(&out[x]) = sample; - *(Uint32 *)(&out[x + w]) = sample; - } - - in += w; - out += w + w; - } + + SDL_SoftStretch(BackBuffer, &src, screen, &dest); if (SDL_MUSTLOCK(BackBuffer)) SDL_UnlockSurface(BackBuffer); @@ -399,8 +388,5 @@ int main(int argc, char*argv[]) { - - SHIPPY_MAIN(); - return 0; - + return SHIPPY_MAIN(argc, argv); } --- shippy-1.3.3.7/shipall.c.lcdfix 2006-03-28 21:57:07.000000000 +0200 +++ shippy-1.3.3.7/shipall.c 2006-03-28 21:57:07.000000000 +0200 @@ -193,10 +193,11 @@ #else - GraphicsFlag=set_gfx_mode(GFX_AUTODETECT_FULLSCREEN, 480, 320, 0, 0); + GraphicsFlag=set_gfx_mode(start_windowed? GFX_AUTODETECT_WINDOWED: + GFX_AUTODETECT_FULLSCREEN, screen_width, screen_height, 0, 0); if(GraphicsFlag!=0) { - GraphicsFlag=set_gfx_mode(GFX_SAFE, 480, 320, 0, 0); + GraphicsFlag=set_gfx_mode(GFX_SAFE, screen_width, screen_height, 0, 0); if(GraphicsFlag!=0) exit(-1); else vidmode = GFX_SAFE; } @@ -289,7 +290,7 @@ blit(BackBuffer,screen,0,0,40,20,240,160); #else acquire_screen(); - stretch_blit(BackBuffer,screen,0,0,240,160,0,0,480,320); + stretch_blit(BackBuffer,screen,0,0,240,160,0,0,screen_width,screen_height); release_screen(); #endif } @@ -319,10 +320,10 @@ { vidmode = (vidmode == GFX_AUTODETECT_FULLSCREEN)? GFX_AUTODETECT_WINDOWED:GFX_AUTODETECT_FULLSCREEN; - if(set_gfx_mode(vidmode, 480, 320, 0, 0)) + if(set_gfx_mode(vidmode, screen_width, screen_height, 0, 0)) { vidmode = GFX_SAFE; - if(set_gfx_mode(vidmode, 480, 320, 0, 0)) + if(set_gfx_mode(vidmode, screen_width, screen_height, 0, 0)) { fprintf(stderr, "FATAL error switching Fullscreen <-> Window\n"); exit(1); @@ -354,13 +355,12 @@ void SYSTEM_IDLE() { - + if (objectsynch == 0) + rest(1); } int main(int argc, char*argv[]) { - SHIPPY_MAIN(); - return 0; - + return SHIPPY_MAIN(argc, argv); } END_OF_MAIN() --- shippy-1.3.3.7/shippy.c.lcdfix 2006-03-28 21:57:07.000000000 +0200 +++ shippy-1.3.3.7/shippy.c 2006-03-28 21:57:51.000000000 +0200 @@ -106,6 +106,11 @@ FILE *highscore_fp; +int start_windowed = 0; +int use_arcade_mode = 0; +int screen_width = 640; +int screen_height = 480; + int compare(const void *a, const void *b) { struct HISCORE *test = (struct HISCORE *)a; @@ -1499,9 +1504,19 @@ } } -void SHIPPY_MAIN() +static void show_usage(char *name, FILE *f) { - int increment; + fprintf(f, + "Usage: %s [-w] [-a] [-h]\n\n" + "Options:\n" + "-w\tWindowed, start in a window (default fullscreen)\n" + "-a\tArcade, use an arcade-ish video mode with scanlines (CRT only!)\n" + "-h\tHelp, display this help and exit\n", name); +} + +int SHIPPY_MAIN(int argc, char *argv[]) +{ + int i; gid_t realgid; highscore_fp = fopen("/var/games/shippy.hs", "r+"); @@ -1509,11 +1524,37 @@ realgid = getgid(); if (setresgid(-1, realgid, realgid) != 0) { perror("Could not drop setgid privileges. Aborting."); - exit(1); + return 1; + } + + for (i = 1; i < argc; i++) + { + if (!strcmp(argv[i], "-w")) + start_windowed = 1; + else if (!strcmp(argv[i], "-a")) + { + use_arcade_mode = 1; + screen_width = 480; + screen_height = 320; + } + else if (!strcmp(argv[i], "-h") || + !strcmp(argv[i], "-?") || + !strcmp(argv[i], "-help") || + !strcmp(argv[i], "--help")) + { + show_usage(argv[0], stdout); + return 0; + } + else + { + fprintf(stderr, "Error: unknown argument: %s\n", argv[i]); + show_usage(argv[0], stderr); + return 1; + } } srand(time(0)); - if(SYSTEM_INIT()!=0) return; + if(SYSTEM_INIT()!=0) return 1; InitShippy(); while(done==0) { @@ -1532,9 +1573,9 @@ countframes=0; } - for(increment=0;increment +#include #include +#include +#include #include "shippy.h" #define TEXT_WHITE 0 @@ -304,10 +307,7 @@ { int increment; int adder; - int accuracy; - int courage; int bonus; - float floatop; shots = 0; powerupframe = 0; @@ -595,7 +595,6 @@ if(ShippyObjects[number].used==0) return; int increment; int runsim; - int tx,ty; switch(ShippyObjects[number].type) { @@ -807,7 +806,7 @@ --ShippyObjects[number].special; } - if(ShippyObjects[number].x<-7 || ShippyObjects[number].x>247 && ShippyObjects[number].type==ENEMYSHIPPY) + if(ShippyObjects[number].x<-7 || (ShippyObjects[number].x>247 && ShippyObjects[number].type==ENEMYSHIPPY)) { ShippyObjects[number].y+=16; ShippyObjects[number].level=-ShippyObjects[number].level; @@ -1102,10 +1101,12 @@ void StoreHS() { + size_t silence_warnings; + if(highscore_fp==NULL) return; rewind(highscore_fp); - fwrite(winners,sizeof(struct HISCORE), 14, highscore_fp); + silence_warnings = fwrite(winners,sizeof(struct HISCORE), 14, highscore_fp); } --- shippy-1.3.3.7/shipsdl.c~ 2006-03-27 20:27:19.000000000 +0200 +++ shippy-1.3.3.7/shipsdl.c 2006-03-27 20:27:19.000000000 +0200 @@ -1,3 +1,6 @@ +#include +#include +#include #include #include #include "shippy.h" @@ -236,7 +239,7 @@ } -int SYSTEM_BG(char *bmp) +void SYSTEM_BG(char *bmp) { if(BackBuffer!=NULL) SDL_FreeSurface(BackBuffer); BackBuffer= CreateSurfaceFromBitmap(bmp,SDL_SWSURFACE|SDL_SRCCOLORKEY); @@ -247,7 +250,7 @@ /* NEW SYSTEM_FINISHRENDER() BY JONATHAN GILBERT 1-28-2004 */ -int SYSTEM_FINISHRENDER() +void SYSTEM_FINISHRENDER() { int x, y, w; Uint8 *in; @@ -294,10 +297,12 @@ if(SDL_FillRect(BackBuffer, NULL, CLEARCOLOR)==-1) { printf("CLS ERROR! \n"); + return 1; } + return 0; } -int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy) +void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy) { src.x = sx; src.y = sy; @@ -316,7 +321,6 @@ void SYSTEM_POLLINPUT() { - int tx,ty; jaction = 0; jsecond = 0; jdirx = 0; @@ -393,5 +397,6 @@ { SHIPPY_MAIN(); + return 0; } --- shippy-1.3.3.7/shippy.h~ 2006-03-27 20:25:10.000000000 +0200 +++ shippy-1.3.3.7/shippy.h 2006-03-27 20:25:10.000000000 +0200 @@ -18,13 +18,13 @@ void SCRAPPABLE_CLOSE(); void SYSTEM_CLEANBMP(); void SYSTEM_SETVID(); -int SYSTEM_BG(); +void SYSTEM_BG(); int SYSTEM_INIT(); int SYSTEM_CLEAN(); int SYSTEM_GETKEY(int scancode); -int SYSTEM_FINISHRENDER(); +void SYSTEM_FINISHRENDER(); int SYSTEM_CLEARSCREEN(); -int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy); +void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy); void SYSTEM_POLLINPUT(); void SYSTEM_IDLE(); int compare(const void *a, const void *b); --- shippy-1.3.3.7/shipall.c~ 2006-03-27 20:21:26.000000000 +0200 +++ shippy-1.3.3.7/shipall.c 2006-03-27 20:21:26.000000000 +0200 @@ -1,3 +1,4 @@ +#include #include #include #include "shippy.h" @@ -215,7 +216,7 @@ set_palette(mypal); } -int SYSTEM_BG(char *bmp) +void SYSTEM_BG(char *bmp) { BITMAP *mytest2; mytest2 = load_bmp(bmp,NULL); @@ -227,12 +228,8 @@ } int SYSTEM_INIT() { - int AllegroInitFlag; - int GraphicsFlag; - int width,height; - BITMAP *mytest2; - - AllegroInitFlag = allegro_init(); + if (allegro_init()) + return -1; atexit(&dumb_exit); dumb_register_stdfiles(); @@ -279,7 +276,7 @@ return key[scancode]; } -int SYSTEM_FINISHRENDER() +void SYSTEM_FINISHRENDER() { #ifdef ALLEGRO_DOS blit(BackBuffer,screen,0,0,40,20,240,160); @@ -295,14 +292,13 @@ return 0; } -int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy) +void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy) { masked_blit(Graphics,BackBuffer,sx,sy,x,y,szx,szy); } void SYSTEM_POLLINPUT() { - int tx,ty; jaction = 0; jsecond = 0; jdirx = 0; @@ -338,6 +334,7 @@ int main(int argc, char*argv[]) { SHIPPY_MAIN(); + return 0; } END_OF_MAIN() --- NEW FILE shippy.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Shippy 1984 GenericName=Space invaders / Galaxians like game Comment=Galaxians with powerups! Exec=shippy Icon=shippy.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; Version=1.3.3.7 --- NEW FILE shippy.sh --- #!/bin/bash SHIPPY=`which shippy-sdl 2> /dev/null` if [ -z "$SHIPPY" ]; then SHIPPY=`which shippy-allegro 2> /dev/null` fi if [ -z "$SHIPPY" ]; then echo "error could find neither shippy-sdl nor shippy-allegro" exit 1 fi exec $SHIPPY "$@" --- NEW FILE shippy.spec --- Name: shippy Version: 1.3.3.7 Release: 2%{?dist} Summary: Space invaders / Galaxians like game with powerups Group: Amusements/Games License: GPL URL: http://www.shippysite.com/ Source0: http://download.sourceforge.net/ship84/shipv%{version}UNIX.zip Source1: shippy.png Source2: shippy.desktop Source3: shippy.sh Patch0: shippy-fixes.patch Patch1: shippy-warnings.patch Patch2: shippy-fullscreen.patch Patch3: shippy-lcdfix.patch Patch4: shippy-joy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dumb-devel SDL_mixer-devel desktop-file-utils Requires: %{name}-common = %{version} Provides: %{name}-engine = %{version} %description Shippy1984 is a small, portable game designed to bring back nostalgia for the ways games used to be made--addicting as hell! Mash buttons on your way to the high score! Shippy1984 is designed from the ground up for the avid casual gamer who feels left behind by the technological overload of today's games! No longer! Shippy1984 is the game you have been waiting for! %package allegro Summary: Shippy1984 Allegro version Group: Amusements/Games Requires: %{name}-common = %{version} Provides: %{name}-engine = %{version} %description allegro Alternative version of Shippy1984 compiled to use the allegro display library. %package common Summary: Shippy1984 common files Group: Amusements/Games Requires: %{name}-engine = %{version} %description common Data files, desktop entry and icon, docs and wrapper-script for the Shippy1984 game. %prep %setup -q -c %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %{__sed} -i 's/\r//' NOTES.txt LICENSE.txt docs/manual.html mv docs html #see comment in %%install rm data/scores.lst %build make %{?_smp_mflags} SDL=1 \ CFLAGS="$RPM_OPT_FLAGS -fsigned-char -DDATADIR=\\\"%{_datadir}/%{name}/\\\"" \ LDFLAGS="-g `sdl-config --libs` -lSDL_mixer" mv %{name} %{name}-sdl make %{?_smp_mflags} ALLEGRO=1 \ CFLAGS="$RPM_OPT_FLAGS -fsigned-char -DDATADIR=\\\"%{_datadir}/%{name}/\\\"" \ LDFLAGS="-g -laldmb -ldumb `allegro-config --libs`" mv %{name} %{name}-allegro %install rm -rf $RPM_BUILD_ROOT # no make install target so DIY mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name} install -m 755 %{name}-sdl %{name}-allegro $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} install -p -m 644 data/* $RPM_BUILD_ROOT%{_datadir}/%{name} # scores.lst is a binary file which is different on MSB vs LSB, so we just # create an empty file, then the game will use its identical internal defaults # and fill it with data in platform format after the first run. mkdir -p $RPM_BUILD_ROOT%{_var}/lib/games touch $RPM_BUILD_ROOT%{_var}/lib/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 \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps install -p -m 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/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,-) %attr(2755,root,games) %{_bindir}/%{name}-sdl %files allegro %defattr(-,root,root,-) %attr(2755,root,games) %{_bindir}/%{name}-allegro %files common %defattr(-,root,root,-) %doc NOTES.txt LICENSE.txt html %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %config(noreplace) %attr (0664,root,games) %{_var}/lib/games/%{name}.hs %changelog * Thu Mar 30 2006 Hans de Goede 1.3.3.7-2 - Fix reversed joy directions in allegro version - Improve support for analog joysticks in the allegro version - Add support for joysticks to the SDL version * Mon Mar 27 2006 Hans de Goede 1.3.3.7-1 - Initial Fedora Extras package - Todo: add joystick support to SDL version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shippy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Mar 2006 08:17:05 -0000 1.1 +++ .cvsignore 31 Mar 2006 08:18:18 -0000 1.2 @@ -0,0 +1 @@ +shipv1.3.3.7UNIX.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/shippy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Mar 2006 08:17:05 -0000 1.1 +++ sources 31 Mar 2006 08:18:18 -0000 1.2 @@ -0,0 +1 @@ +06df2ae060fe4a076d7fa17a57205348 shipv1.3.3.7UNIX.zip From fedora-extras-commits at redhat.com Fri Mar 31 08:20:11 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 31 Mar 2006 01:20:11 -0700 Subject: rpms/libopensync-plugin-palm/devel libopensync-plugin-palm.spec, 1.3, 1.4 Message-ID: <200603310820.k2V8KDP1023039@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-palm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23022 Modified Files: libopensync-plugin-palm.spec Log Message: - bump Index: libopensync-plugin-palm.spec =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/libopensync-plugin-palm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libopensync-plugin-palm.spec 16 Feb 2006 23:18:36 -0000 1.3 +++ libopensync-plugin-palm.spec 31 Mar 2006 08:20:11 -0000 1.4 @@ -1,6 +1,6 @@ Name: libopensync-plugin-palm Version: 0.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Palm plugin for libopensync Group: System Environment/Libraries @@ -60,6 +60,9 @@ %{_includedir}/opensync-1.0/opensync/palm*.h %changelog +* Fri Mar 31 2006 Andreas Bierfert 0.18-4 +- bump + * Thu Feb 16 2006 Andreas Bierfert 0.18-3 - Rebuild for Fedora Extras From fedora-extras-commits at redhat.com Fri Mar 31 08:22:03 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 31 Mar 2006 01:22:03 -0700 Subject: rpms/koffice/FC-5 koffice.spec,1.33,1.34 Message-ID: <200603310822.k2V8M5Ah023105@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23085 Modified Files: koffice.spec Log Message: - exclude not needed file Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- koffice.spec 30 Mar 2006 12:07:42 -0000 1.33 +++ koffice.spec 31 Mar 2006 08:22:02 -0000 1.34 @@ -513,6 +513,8 @@ %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png %{_datadir}/apps/kross +# why is this still here on fc5 and not on devel? +%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* From fedora-extras-commits at redhat.com Fri Mar 31 08:22:30 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:22:30 -0700 Subject: rpms/dumb/FC-5 dumb.spec,1.1,1.2 Message-ID: <200603310822.k2V8MW3X023183@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23166 Modified Files: dumb.spec Log Message: * Wed Mar 29 2006 Hans de Goede 0.9.3-3 - Add Requires: allegro-devel to -devel package Index: dumb.spec =================================================================== RCS file: /cvs/extras/rpms/dumb/FC-5/dumb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dumb.spec 16 Mar 2006 19:38:11 -0000 1.1 +++ dumb.spec 31 Mar 2006 08:22:30 -0000 1.2 @@ -1,6 +1,6 @@ Name: dumb Version: 0.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: IT, XM, S3M and MOD player library Group: System Environment/Libraries License: GPL-Compatible @@ -20,6 +20,7 @@ Summary: Development libraries and headers for dumb Group: Development/Libraries Requires: %{name} = %{version} +Requires: allegro-devel %description devel The developmental files that must be installed in order to compile @@ -66,6 +67,9 @@ %changelog +* Wed Mar 29 2006 Hans de Goede 0.9.3-3 +- Add Requires: allegro-devel to -devel package + * Thu Mar 16 2006 Hans de Goede 0.9.3-2 - Drop modplug.txt from %doc and move release.txt and readme.txt from the -devel package to the main package (bz 185576). From fedora-extras-commits at redhat.com Fri Mar 31 08:27:50 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 31 Mar 2006 01:27:50 -0700 Subject: rpms/sylpheed-claws/FC-5 sylpheed-claws.spec,1.37,1.38 Message-ID: <200603310828.k2V8SMLe023283@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-serv23229/FC-5 Modified Files: sylpheed-claws.spec Log Message: - fix #187383 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sylpheed-claws.spec 2 Mar 2006 00:09:15 -0000 1.37 +++ sylpheed-claws.spec 31 Mar 2006 08:27:49 -0000 1.38 @@ -1,6 +1,6 @@ Name: sylpheed-claws Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL @@ -25,6 +25,7 @@ BuildRequires: pkgconfig BuildRequires: gettext-devel BuildRequires: libetpan-devel >= 0.41 +BuildRequires: libgnomeprintui22-devel Requires: spamassassin Requires: dillo @@ -106,6 +107,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Fri Mar 31 2006 Andreas Bierfert +2.0.0-4 +- #187383: add BR libgnomeprintui22-devel + * Thu Mar 02 2006 Andreas Bierfert 2.0.0-3 - Fix .desktop From fedora-extras-commits at redhat.com Fri Mar 31 08:27:50 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 31 Mar 2006 01:27:50 -0700 Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.37,1.38 Message-ID: <200603310828.k2V8SMYi023286@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23229/devel Modified Files: sylpheed-claws.spec Log Message: - fix #187383 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sylpheed-claws.spec 2 Mar 2006 00:09:15 -0000 1.37 +++ sylpheed-claws.spec 31 Mar 2006 08:27:50 -0000 1.38 @@ -1,6 +1,6 @@ Name: sylpheed-claws Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL @@ -25,6 +25,7 @@ BuildRequires: pkgconfig BuildRequires: gettext-devel BuildRequires: libetpan-devel >= 0.41 +BuildRequires: libgnomeprintui22-devel Requires: spamassassin Requires: dillo @@ -106,6 +107,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Fri Mar 31 2006 Andreas Bierfert +2.0.0-4 +- #187383: add BR libgnomeprintui22-devel + * Thu Mar 02 2006 Andreas Bierfert 2.0.0-3 - Fix .desktop From fedora-extras-commits at redhat.com Fri Mar 31 08:27:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 31 Mar 2006 01:27:49 -0700 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.27,1.28 Message-ID: <200603310828.k2V8SLqC023280@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-serv23229/FC-4 Modified Files: sylpheed-claws.spec Log Message: - fix #187383 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sylpheed-claws.spec 2 Mar 2006 00:09:07 -0000 1.27 +++ sylpheed-claws.spec 31 Mar 2006 08:27:49 -0000 1.28 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL @@ -27,6 +27,7 @@ BuildRequires: pkgconfig BuildRequires: gettext-devel BuildRequires: libetpan-devel >= 0.41 +BuildRequires: libgnomeprintui22-devel Requires: spamassassin Requires: dillo @@ -113,6 +114,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Fri Mar 31 2006 Andreas Bierfert +2.0.0-3 +- #187383: add BR libgnomeprintui22-devel + * Thu Mar 02 2006 Andreas Bierfert 2.0.0-2 - fix .desktop From fedora-extras-commits at redhat.com Fri Mar 31 08:31:46 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:31:46 -0700 Subject: owners owners.list,1.783,1.784 Message-ID: <200603310831.k2V8VmR1023322@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23305/owners Modified Files: owners.list Log Message: Add shippy, take ownership of dia Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.783 retrieving revision 1.784 diff -u -r1.783 -r1.784 --- owners.list 31 Mar 2006 04:48:51 -0000 1.783 +++ owners.list 31 Mar 2006 08:31:46 -0000 1.784 @@ -180,7 +180,7 @@ Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|deutex|Doom wad manipulation tool|wart at kobold.org|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|extras-orphan at fedoraproject.org|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| Fedora Extras|diction|Identifies diction and style errors|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|dietlibc|Small libc implementation|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| @@ -1311,6 +1311,7 @@ Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|ser|SIP Express Router|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| +Fedora Extras|shippy|Space invaders / Galaxians like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|robert at marcanoonline.com|extras-qa at fedoraproject.org| Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|SIBsim4|Align expressed RNA sequences on a DNA template|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 31 10:14:21 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 31 Mar 2006 03:14:21 -0700 Subject: fedora-security/audit fc4,1.181,1.182 fc5,1.94,1.95 Message-ID: <200603311014.k2VAELL0027618@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27598 Modified Files: fc4 fc5 Log Message: Catchup (apart from kernel) Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- fc4 24 Mar 2006 08:43:34 -0000 1.181 +++ fc4 31 Mar 2006 10:14:19 -0000 1.182 @@ -1,8 +1,12 @@ -Up to date CVE as of CVE email 20060323 -Up to date FC4 as of 20060323 +Up to date CVE as of CVE email 20060330 +Up to date FC4 as of 20060330 ** are items that need attention +CVE-2006-1550 VULNERABLE (dia) bz#187402 +CVE-2006-1548 ** struts +CVE-2006-1547 ** struts +CVE-2006-1546 ** struts CVE-2006-1368 ** kernel CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 ** kernel @@ -13,7 +17,9 @@ CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability +CVE-2006-1066 ** kernel CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only) +CVE-2006-1059 version (samba) CVE-2006-1052 ** kernel CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe @@ -96,6 +102,8 @@ CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050 +CVE-2005-4746 version (freeradius) we don't build vulnerable bits +CVE-2005-4745 version (freeradius) we don't build vulnerable bits CVE-2005-4720 VULNERABLE (thunderbird) CVE-2005-4720 VULNERABLE (mozilla) CVE-2005-4720 VULNERABLE (firefox) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- fc5 24 Mar 2006 08:43:34 -0000 1.94 +++ fc5 31 Mar 2006 10:14:19 -0000 1.95 @@ -1,8 +1,11 @@ -Up to date CVE as of CVE email 20060323 -Up to date FC5 as of 20060323 +Up to date CVE as of CVE email 20060330 +Up to date FC5 as of 20060330 ** are items that need attention +CVE-2006-1548 ** struts +CVE-2006-1547 ** struts +CVE-2006-1546 ** struts CVE-2006-1368 ** kernel CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 ** kernel @@ -15,7 +18,9 @@ CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability +CVE-2006-1066 ** kernel CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189] +CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259] CVE-2006-1052 backport (kernel) patch-2.6.16-rc6 CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe @@ -99,6 +104,8 @@ CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 CVE-2006-0035 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 CVE-2006-0019 version (kdelibs, fixed 3.5.1) +CVE-2005-4746 version (freeradius) we don't build vulnerable bits +CVE-2005-4745 version (freeradius) we don't build vulnerable bits CVE-2005-4720 version (thunderbird, fixed 1.5) CVE-2005-4720 version (firefox, fixed 1.5) CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS @@ -574,6 +581,7 @@ CVE-2005-0705 version (ethereal, fixed after 0.10.9) CVE-2005-0704 version (ethereal, fixed after 0.10.9) CVE-2005-0698 version (ethereal, fixed after 0.10.9) +CVE-2005-0670 ** hcidump CVE-2005-0664 version (libexif, fixed 0.6.12) CVE-2005-0654 ignore (gimp, not fixed 2.2) upstream considers harmless CVE-2005-0627 version (qt, fixed 3.3.4) From fedora-extras-commits at redhat.com Fri Mar 31 12:15:08 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 05:15:08 -0700 Subject: rpms/dvdisaster/devel dvdisaster.spec,1.8,1.9 Message-ID: <200603311215.k2VCFAhM032305@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32288 Modified Files: dvdisaster.spec Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dvdisaster.spec 30 Mar 2006 12:02:36 -0000 1.8 +++ dvdisaster.spec 31 Mar 2006 12:15:07 -0000 1.9 @@ -1,7 +1,7 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media Version: 0.66 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com @@ -68,7 +68,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -106,6 +106,9 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 0.66-2 +- fix pixmap icon name + * Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 - upgrade to 0.66 - spec file changes/cleanups, merged from a skeleton now included upstream From fedora-extras-commits at redhat.com Fri Mar 31 12:15:36 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 05:15:36 -0700 Subject: rpms/dvdisaster/FC-5 dvdisaster.spec,1.8,1.9 Message-ID: <200603311215.k2VCFcEf032328@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32311 Modified Files: dvdisaster.spec Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-5/dvdisaster.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dvdisaster.spec 30 Mar 2006 12:04:30 -0000 1.8 +++ dvdisaster.spec 31 Mar 2006 12:15:36 -0000 1.9 @@ -1,7 +1,7 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media Version: 0.66 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com @@ -68,7 +68,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -106,6 +106,9 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 0.66-2 +- fix pixmap icon name + * Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 - upgrade to 0.66 - spec file changes/cleanups, merged from a skeleton now included upstream From fedora-extras-commits at redhat.com Fri Mar 31 12:16:11 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 05:16:11 -0700 Subject: rpms/dvdisaster/FC-4 dvdisaster.spec,1.7,1.8 Message-ID: <200603311216.k2VCGDWK032389@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32372 Modified Files: dvdisaster.spec Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-4/dvdisaster.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dvdisaster.spec 30 Mar 2006 12:05:09 -0000 1.7 +++ dvdisaster.spec 31 Mar 2006 12:16:11 -0000 1.8 @@ -1,7 +1,7 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media Version: 0.66 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com @@ -68,7 +68,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -106,6 +106,9 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 0.66-2 +- fix pixmap icon name + * Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 - upgrade to 0.66 - spec file changes/cleanups, merged from a skeleton now included upstream From fedora-extras-commits at redhat.com Fri Mar 31 12:19:15 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 05:19:15 -0700 Subject: rpms/dvdisaster/FC-3 dvdisaster.spec,1.7,1.8 Message-ID: <200603311219.k2VCJHRv032454@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32437 Modified Files: dvdisaster.spec Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-3/dvdisaster.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dvdisaster.spec 30 Mar 2006 12:05:37 -0000 1.7 +++ dvdisaster.spec 31 Mar 2006 12:19:15 -0000 1.8 @@ -1,7 +1,7 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media Version: 0.66 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com @@ -68,7 +68,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -106,6 +106,9 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 0.66-2 +- fix pixmap icon name + * Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 - upgrade to 0.66 - spec file changes/cleanups, merged from a skeleton now included upstream From fedora-extras-commits at redhat.com Fri Mar 31 12:37:13 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:37:13 -0700 Subject: rpms/libmal/devel libmal.spec,1.2,1.3 Message-ID: <200603311237.k2VCbFUx032571@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32554 Modified Files: libmal.spec Log Message: respin for new pilot-link Index: libmal.spec =================================================================== RCS file: /cvs/extras/rpms/libmal/devel/libmal.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libmal.spec 22 Mar 2006 15:33:38 -0000 1.2 +++ libmal.spec 31 Mar 2006 12:37:13 -0000 1.3 @@ -4,7 +4,7 @@ # NOTE: this isn't the latest version, but is the last version known to # work with kdepim Version: 0.31 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: MPL Url: http://jasonday.home.att.net/code/libmal/ From fedora-extras-commits at redhat.com Fri Mar 31 12:39:14 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:14 -0700 Subject: rpms/kdemultimedia-extras - New directory Message-ID: <200603311239.k2VCdG3U032695@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32669/kdemultimedia-extras Log Message: Directory /cvs/extras/rpms/kdemultimedia-extras added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 12:39:15 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:15 -0700 Subject: rpms/kdemultimedia-extras/devel - New directory Message-ID: <200603311239.k2VCdH3d032698@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32669/kdemultimedia-extras/devel Log Message: Directory /cvs/extras/rpms/kdemultimedia-extras/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 12:39:27 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:27 -0700 Subject: rpms/kdemultimedia-extras Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603311239.k2VCdTbO032749@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32716 Added Files: Makefile import.log Log Message: Setup of module kdemultimedia-extras --- NEW FILE Makefile --- # Top level Makefile for module kdemultimedia-extras all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 31 12:39:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:28 -0700 Subject: rpms/kdemultimedia-extras/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603311239.k2VCdUcF032752@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32716/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kdemultimedia-extras --- NEW 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 Mar 31 12:39:58 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:58 -0700 Subject: rpms/kdemultimedia-extras import.log,1.1,1.2 Message-ID: <200603311240.k2VCe0JP000389@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350 Modified Files: import.log Log Message: auto-import kdemultimedia-extras-3.5.1-7 on branch devel from kdemultimedia-extras-3.5.1-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 Mar 2006 12:39:27 -0000 1.1 +++ import.log 31 Mar 2006 12:39:58 -0000 1.2 @@ -0,0 +1 @@ +kdemultimedia-extras-3_5_1-7:HEAD:kdemultimedia-extras-3.5.1-7.src.rpm:1143808795 From fedora-extras-commits at redhat.com Fri Mar 31 12:39:59 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:59 -0700 Subject: rpms/kdemultimedia-extras/devel kde-libtool.patch, NONE, 1.1 kdemultimedia-3.2.2-mpeglib-buffer.patch, NONE, 1.1 kdemultimedia-3.4.0-arts_includes.patch, NONE, 1.1 kdemultimedia-3.4.0-xdg.patch, NONE, 1.1 kdemultimedia-3.5.0-116958.patch, NONE, 1.1 kdemultimedia-3.5.0-oggvorbis_artsplugin.patch, NONE, 1.1 kdemultimedia-extras.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603311240.k2VCe1d5000406@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350/devel Modified Files: .cvsignore sources Added Files: kde-libtool.patch kdemultimedia-3.2.2-mpeglib-buffer.patch kdemultimedia-3.4.0-arts_includes.patch kdemultimedia-3.4.0-xdg.patch kdemultimedia-3.5.0-116958.patch kdemultimedia-3.5.0-oggvorbis_artsplugin.patch kdemultimedia-extras.spec Log Message: auto-import kdemultimedia-extras-3.5.1-7 on branch devel from kdemultimedia-extras-3.5.1-7.src.rpm kde-libtool.patch: --- NEW FILE kde-libtool.patch --- --- kdelibs-3.1/admin/ltmain.sh.orig 2003-02-20 17:52:07.000000000 -0500 +++ kdelibs-3.1/admin/ltmain.sh 2003-02-20 18:30:32.000000000 -0500 @@ -4459,6 +4459,14 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac + newdeplib="" + for j in $dependency_libs ; do + if echo $j | grep "gcc-lib" >& /dev/null ; then + continue + fi + newdeplib="$newdeplib $j" + done + dependency_libs="$newdeplib" $echo > $output "\ # $outputname - a libtool library file # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP kdemultimedia-3.2.2-mpeglib-buffer.patch: --- NEW FILE kdemultimedia-3.2.2-mpeglib-buffer.patch --- --- kdemultimedia-3.2.2/mpeglib_artsplug/splayPlayObject_impl.cpp.buffer 2003-05-05 07:19:44.000000000 -0500 +++ kdemultimedia-3.2.2/mpeglib_artsplug/splayPlayObject_impl.cpp 2004-05-21 09:37:26.312000308 -0500 @@ -17,7 +17,7 @@ #include "debug.h" -#define INPUT_SIZE 8192 +#define INPUT_SIZE 32768 /** Problems with streaming, which must be solved: --- kdemultimedia-3.2.2/mpeglib/lib/decoder/splayPlugin.cpp.buffer 2003-06-27 08:44:43.000000000 -0500 +++ kdemultimedia-3.2.2/mpeglib/lib/decoder/splayPlugin.cpp 2004-05-21 09:38:12.550471578 -0500 @@ -25,7 +25,7 @@ using namespace std; -#define INPUTBUFFER_SIZE 8192 +#define INPUTBUFFER_SIZE 32768 SplayPlugin::SplayPlugin() { pow(6.0,3.0); // fixes bug in __math.h kdemultimedia-3.4.0-arts_includes.patch: --- NEW FILE kdemultimedia-3.4.0-arts_includes.patch --- --- kdemultimedia-3.4.0/juk/configure.in.in.arts_includes 2005-02-23 04:20:58.000000000 -0600 +++ kdemultimedia-3.4.0/juk/configure.in.in 2005-03-05 02:06:26.000000000 -0600 @@ -8,7 +8,7 @@ if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then LIB_ARTS="-lartskde" ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`] - ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts" + ARTS_CFLAGS="-I$arts_includes" AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk]) else build_arts="no" --- kdemultimedia-3.4.0/configure.in.arts_includes 2005-03-04 06:29:23.000000000 -0600 +++ kdemultimedia-3.4.0/configure.in 2005-03-05 02:06:26.000000000 -0600 @@ -1144,7 +1144,7 @@ if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then LIB_ARTS="-lartskde" ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`] - ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts" + ARTS_CFLAGS="-I$arts_includes" AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk]) else build_arts="no" --- kdemultimedia-3.4.0/configure.arts_includes 2005-03-04 06:31:57.000000000 -0600 +++ kdemultimedia-3.4.0/configure 2005-03-05 02:07:09.000000000 -0600 @@ -39041,7 +39041,7 @@ if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then LIB_ARTS="-lartskde" ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix` - ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts" + ARTS_CFLAGS="-I$arts_includes" cat >>confdefs.h <<\_ACEOF #define HAVE_ARTS 1 kdemultimedia-3.4.0-xdg.patch: --- NEW FILE kdemultimedia-3.4.0-xdg.patch --- --- kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu.tn 2005-04-25 16:16:32.000000000 +0200 +++ kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu 2005-04-25 16:17:51.000000000 +0200 @@ -2,6 +2,7 @@ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> +Applications Multimedia kdemultimedia-3.5.0-116958.patch: --- NEW FILE kdemultimedia-3.5.0-116958.patch --- --- kdemultimedia-3.5.0/configure.in.in.116958 2005-11-26 00:56:42.000000000 -0600 +++ kdemultimedia-3.5.0/configure.in.in 2005-12-21 09:12:14.000000000 -0600 @@ -346,16 +346,6 @@ AC_SUBST(akode_includes) AC_SUBST(akode_libs) - KDE_CHECK_LIB(akode_mpeg_decoder, mpeg_decoder, have_akode_mpeg=yes, have_akode_mpeg=no, -lakode) - KDE_CHECK_LIB(akode_mpc_decoder, mpc_decoder, have_akode_mpc=yes, have_akode_mpc=no, -lakode) - KDE_CHECK_LIB(akode_xiph_decoder, xiph_decoder, have_akode_xiph=yes, have_akode_xiph=no, -lakode) - KDE_CHECK_LIB(akode_ffmpeg_decoder, ffmpeg_decoder, have_akode_ffmpeg=yes, have_akode_ffmpeg=no, -lakode) - - AM_CONDITIONAL(include_akode_mpeg, test x$have_akode_mpeg = xyes) - AM_CONDITIONAL(include_akode_mpc, test x$have_akode_mpc = xyes) - AM_CONDITIONAL(include_akode_xiph, test x$have_akode_xiph = xyes) - AM_CONDITIONAL(include_akode_ffmpeg, test x$have_akode_ffmpeg = xyes) - ]) --- kdemultimedia-3.5.0/akode_artsplugin/configure.in.in.116958 2005-09-10 03:20:04.000000000 -0500 +++ kdemultimedia-3.5.0/akode_artsplugin/configure.in.in 2005-12-21 09:13:50.000000000 -0600 @@ -1,4 +1,14 @@ if test x$build_arts != xyes || test x$have_akode != xyes then DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin" +else +KDE_CHECK_LIB(akode_mpeg_decoder, mpeg_decoder, have_akode_mpeg=yes, have_akode_mpeg=no, -lakode) +KDE_CHECK_LIB(akode_mpc_decoder, mpc_decoder, have_akode_mpc=yes, have_akode_mpc=no, -lakode) +KDE_CHECK_LIB(akode_xiph_decoder, xiph_decoder, have_akode_xiph=yes, have_akode_xiph=no, -lakode) +KDE_CHECK_LIB(akode_ffmpeg_decoder, ffmpeg_decoder, have_akode_ffmpeg=yes, have_akode_ffmpeg=no, -lakode) fi + +AM_CONDITIONAL(include_akode_mpeg, test x$have_akode_mpeg = xyes) +AM_CONDITIONAL(include_akode_mpc, test x$have_akode_mpc = xyes) +AM_CONDITIONAL(include_akode_xiph, test x$have_akode_xiph = xyes) +AM_CONDITIONAL(include_akode_ffmpeg, test x$have_akode_ffmpeg = xyes) kdemultimedia-3.5.0-oggvorbis_artsplugin.patch: --- NEW FILE kdemultimedia-3.5.0-oggvorbis_artsplugin.patch --- --- kdemultimedia-3.5.0/oggvorbis_artsplugin/configure.in.in.oggvorbis_artsplugin 2005-09-10 03:19:44.000000000 -0500 +++ kdemultimedia-3.5.0/oggvorbis_artsplugin/configure.in.in 2005-11-23 11:33:09.000000000 -0600 @@ -1,5 +1,5 @@ -if test "$kde_mpeglib_compiles" = "yes" -then -DO_NOT_COMPILE="$DO_NOT_COMPILE oggvorbis_artsplugin" -fi +#if test "$kde_mpeglib_compiles" = "yes" +#then +#DO_NOT_COMPILE="$DO_NOT_COMPILE oggvorbis_artsplugin" +#fi --- NEW FILE kdemultimedia-extras.spec --- # $Id: kdemultimedia.spec,v 1.48 2006/03/08 15:30:42 rexdieter Exp $ # NOTE: can only build *one* of the following at a time # core: kdemultidia/kdemultimedia-devel # extras: kdemultimedia-extras # nonfree: kdemultimedia-nonfree #define core 1 %define extras 1 #define nonfree 1 # enable pkg/filelist debugging -- Rex #define debug 1 %if "%{?core}" == "1" %define patched -patched %endif %if "%{?extras}" == "1" %define patched -patched %define _with_akode --with-akode #define to include/build juk, undef not %define juk juk # to make sure no nonfree bits get included BuildConflicts: akode-extras # debugging: to make sure no extras bits (accidentally) get excluded %{?debug:BuildConflicts: kdemultimedia-extras = %{epoch}:%{version}} %define _with_musicbrainz --with-musicbrainz %define _with_libsamplerate --with-libsamplerate %define _with_taglib --with-taglib %endif %if "%{?nonfree}" == "1" %define _with_akode --with-akode BuildRequires: akode-extras %define _with_lame --with-lame --disable-lametest %define _with_xine --with-xine %endif # distro/release bits %if "%{?fedora}" > "2" %define _with_gstreamer --with-gstreamer %endif %if "%{?fedora}" > "4" %define gst gstreamer08 %endif %if "%{?rhel}" > "3" %define _with_gstreamer --with-gstreamer %endif %define is_release 2 %if "%{?core}" == "1" Name: kdemultimedia Summary: Multimedia applications for the K Desktop Environment (KDE) %endif %if "%{?extras}" == "1" Name: kdemultimedia-extras Summary: Extras for KDE multimedia applications %endif %if "%{?nonfree}" == "1" Name: kdemultimedia-nonfree Summary: Nonfree Extras for KDE multimedia applications %endif Group: Applications/Multimedia Epoch: 6 Version: 3.5.1 Release: 7%{?dist}%{?kde} License: GPL %if "%{?nonfree}" == "1" Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 %else # From Core's kdemultimedia pkg Source0: kdemultimedia-3.5.1-patched.tar.bz2 %endif Url: http://multimedia.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:%{version} Requires: kdelibs >= 6:%{version} BuildRequires: libtool %if "%{is_release}" != "1" BuildRequires: automake %endif BuildRequires: desktop-file-utils BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel BuildRequires: cdparanoia-devel cdparanoia BuildRequires: flac-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel >= 1:1.1.0 %{?core:Requires: libvorbis >= 1:1.1.0} %{?_with_taglib:BuildRequires: taglib-devel} %{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel >= 0:2.1, libtunepimp-devel} %{?_with_akode:BuildRequires: akode-devel} # gstreamer(08) pkg_name %{?_with_gstreamer:BuildRequires: %{?gst}%{!?gst:gstreamer}-plugins-devel} %{?_with_lame:BuildRequires: lame-devel} %{?_with_libsamplerate:BuildRequires: libsamplerate-devel} %{?_with_xine:BuildRequires: xine-lib-devel >= 0:1.0} ## TODO (?) #BuildRequires: gstreamer/gst, %{?_with_jack:BuildRequires: jack-audio-connection-kit} %{?_with_polypaudio:BuildRequires: polypaudio-devel} Patch0: kde-libtool.patch #Patch2: kdemultimedia-3.4.0-config.patch Patch2: kdemultimedia-3.4.0-arts_includes.patch Patch4: kdemultimedia-3.4.0-xdg.patch ## kde-redhat patches # unconditinally include oggvorbis_artsplugin Patch1000: kdemultimedia-3.5.0-oggvorbis_artsplugin.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 Multimedia applications for KDE, including: * noatun: a multimedia player for sound and movies, very extensible due to it's plugin interface * kaudiocreator: CD ripper and audio encoder frontend. * kaboodle: light media player * kmid: A standalone and embeddable midi player, includes a karaoke-mode * kmidi: midi player, can use sound patch files and create a WAV file * kmix: the audio mixer as a standalone program and Kicker applet * kscd: A CD player with an interface to the internet CDDB database * krec: A recording frontend using aRts The following are libraries and plugins that are building the core infrastructure of above applications: * arts: a versatily multimedia system the consists of various little building blocks that you (or an application) can combine in almost arbitrary ways to create sound and video processing pipes * kfile-plugins: provide meta information about sound files * libkcddb: a library for retrieving and sending cddb information %package devel Summary: Header files, libraries for %{name} Group: Development/Libraries Requires: kdelibs-devel Requires: %{name} = %{epoch}:%{version}-%{release} %description devel %{summary}. %endif %if "%{?extras}" == "1" # debugging %{?debug:BuildConflicts: kdemultimedia-extras } Requires: kdemultimedia = %{epoch}:%{version} %description %{summary}, including: * akode_artsplugin (akode) %{?juk:* juk (libtunepimp)} * kfile-plugins: flac, mpc (taglib) %endif %if "%{?nonfree}" == "1" # debugging %{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}} %{?debug:BuildConflicts: kdemultimedia-nonfree} Requires: kdemultimedia = %{epoch}:%{version} # for main akode_artsplugins bits Requires: kdemultimedia-extras = %{epoch}:%{version} Requires: akode-extras %description %{summary}, including: * akode_artsplugin (akode-extras), * kfile-plugins: mp3 (taglib), * krec mp3 export (lame), * mpeglib_artsplugin, * xine_artsplugin (xine-lib) %endif %prep %if "%{?is_release}" != "0" %setup -q -n kdemultimedia-%{version}%{?patched} %else %setup -q -n kdemultimedia %endif #patch0 -p1 -b .libtool %patch2 -p1 -b .arts_include %patch4 -p1 -b .xdg #with mpeglib in -extras, not really needed -- Rex #patch1000 -p1 -b .oggvorbis_artsplugin %{?nonfree:%patch74744 -p1 -b .74744} %patch116958 -p1 -b .116958 %if "%{is_release}" != "1" make -f admin/Makefile.common cvs %endif %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include DO_NOT_COMPILE="" %{!?juk:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} #{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} #{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin"} %{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"} %{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE mpg123_artsplugin"} %configure \ --includedir=%{_includedir}/kde \ --disable-rpath \ --disable-gcc-hidden-visibility \ --enable-new-ldflags \ --disable-debug --disable-warnings \ --disable-dependancy-tracking --enable-final \ --without-libltdl \ --with-alsa --with-arts-alsa \ --with-audiofile \ --with-cdparanoia --with-extra-includes="%{_includedir}/cdda" \ --with-flac \ --with-theora \ --with-vorbis \ %{?_with_akode} %{!?_with_akode:--without-akode} \ %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \ %{?_with_jack} %{!?_with_jack:--without-jack} \ %{?_with_lame} %{!?_with_lame:--without-lame} \ %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \ %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \ %{?_with_polypaudio} %{!?_with_polypaudio:--without-polypaudio} \ %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ %{?_with_xine} %{!?_with_xine:--without-xine} %if "%{?core}" == "1" make %{?_smp_mflags} %endif %if "%{?extras}" == "1" for module in arts akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do make -C $module %{?_smp_mflags} done %endif %if "%{?nonfree}" == "1" for module in arts akode_artsplugin kfile-plugins/mp3 krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do make -C $module %{?_smp_mflags} done %endif %install rm -rf $RPM_BUILD_ROOT %if "%{?core}" == "1" make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT %endif %if "%{?extras}" == "1" for module in akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT done %if "%{?juk:1}" == "1" desktop-file-install --vendor="fedora" \ --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop %endif %if "%{?debug}" == "1" # Conflicts check (debuging only) find $RPM_BUILD_ROOT -type f -o -type l | sed -e "s|$RPM_BUILD_ROOT||" | while read FILE do if [ -f ${FILE} -o -L ${FILE} ]; then echo "WARNING: $FILE conflicts (already installed)" # && rm -f $RPM_BUILD_ROOT${FILE} fi done %endif # file list (naive) find $RPM_BUILD_ROOT -type f -o -type l | sed -e "s|$RPM_BUILD_ROOT||" | grep -v '.debug$' > extras.list %endif %if "%{?nonfree}" == "1" for module in akode_artsplugin kfile-plugins/mp3 krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT done ## Remove/unstinstall (conflicting) bits we don't want # -extras bits rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akodearts.mcop{class,type} rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode{,MPC,SpeexStream,VorbisStream,Xiph}PlayObject.mcopclass rm -f $RPM_BUILD_ROOT%{_libdir}/libarts_akode.{la,so} %if "%{?debug}" == "1" # Conflicts check (debuging only) find $RPM_BUILD_ROOT -type f -o -type l| sed -e "s|$RPM_BUILD_ROOT||" | while read FILE do if [ -f ${FILE} -o -L ${FILE} ]; then echo "WARNING: $FILE conflicts (already installed)" # && rm -f $RPM_BUILD_ROOT${FILE} fi done %endif ## (regen) file list (naive) find $RPM_BUILD_ROOT -type f -o -type l| sed -e "s|$RPM_BUILD_ROOT||" | grep -v '.debug$' | grep -v "%{_includedir}" > nonfree.list %endif ## File lists # locale's %find_lang %{name} || touch %{name}.lang # 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 ] && ln -nsf ../common $i/common done popd fi done fi mv %{name}.lang %{name}.list [ ! -f %{name}.list ] && echo "%defattr(-,root,root)" > %{name}.list [ ! -f devel.list ] && echo "%defattr(-,root,root)" > devel.list ## cleanup .la files (178734) # if built without --without-libltdl: /usr/lib/libltdl.la sed -i -e "s@%{_libdir}/libltdl.la@@g" $RPM_BUILD_ROOT%{_libdir}/lib*.la ||: # alsa-lib/asound sed -i -e "s at -lasound@@g" $RPM_BUILD_ROOT%{_libdir}/lib*.la ||: %if "%{?core}" == "1" %post /sbin/ldconfig for icon_theme in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun /sbin/ldconfig for icon_theme in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %endif %if "%{?extras}" == "1" # Since the icons come from juk %if "%{?juk:1}" == "1" %post for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done %postun for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done %endif %endif %if "%{?nonfree}" == "1" %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %endif %if "%{?core}" == "1" %files -f %{name}.list %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libdir}/lib*.so* %{_libdir}/lib*.la %{_bindir}/* # Own dir(s) until owned by kdelibs? -- Rex %{_sysconfdir}/xdg/menus/applications-merged/ %{_datadir}/desktop-directories/ %{_datadir}/apps/* %{_datadir}/autostart/*.desktop %config %{_datadir}/config*/* %{_datadir}/icons/crystalsvg/*/*/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/locolor/*/*/* %{_datadir}/mimelnk/* %{_datadir}/service*/* %{_datadir}/appl*/*/* %{_libdir}/mcop/* %{_libdir}/kde3/* %files devel -f devel.list %defattr(-,root,root,-) %{_includedir}/* %endif %if "%{?extras}" == "1" %files -f extras.list %defattr(-,root,root,-) %doc AUTHORS COPYING README %{?juk:%dir %{_datadir}/apps/juk/} %endif %if "%{?nonfree}" == "1" %files -f nonfree.list %defattr(-,root,root,-) %doc AUTHORS COPYING README %dir %{_datadir}/apps/videothumbnail/ ## FIXME? -- Rex %{_includedir}/kde/mpeglib/ %{_includedir}/kde/mpeglib_artsplug/ %endif %clean rm -rf $RPM_BUILD_ROOT %changelog * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7 - kfile-plugins/mp3: -extras -> -nonfree * Thu Mar 16 2006 Rex Dieter 6:3.5.1-6 - -core/-extras: use (fc's) kdemultimedia-3.5.1-patched.tar.bz2 * Sun Feb 26 2006 Rex Dieter 6:3.5.1-5 - remove stray 'done' - set QTLIB/QTINC (at least until #169132 is backported to fc4) * Sat Feb 25 2006 Rex Dieter 6:3.5.1-4 - -extras: --vendor="fedora" * Fri Feb 24 2006 Rex Dieter 6:3.5.1-3 - -extras: --add-category="X-Fedora" * Sun Feb 05 2006 Rex Dieter 6:3.5.1-2 - fc5+: BR: gstreamer08-plugins-devel * Mon Jan 23 2006 Rex Dieter 6:3.5.1-1.1 - document "cleanup .la files" (#178734) - (re)enable juk * Sat Jan 21 2006 Rex Dieter 6:3.5.1-1.0 - kde-3.5.1 * Fri Dec 23 2005 Rex Dieter 6:3.5.0-5 - disable juk (for now) * Wed Dec 21 2005 Rex Dieter 6:3.5.0-4 - disable debugging/filelist-conflicts-check crud (for now) * Wed Dec 21 2005 Rex Dieter 6:3.5.0-3 - Source: redownload, fix URL - %%doc: AUTHORS COPYING README - -extras: drop Obsoletes: juk * Tue Dec 20 2005 Rex Dieter 6:3.5.0-2 - cleanup for Extras/Livna * Fri Dec 09 2005 Rex Dieter 6:3.5.0-1.7 - --enable-new-ldflags * Tue Nov 29 2005 Rex Dieter 6:3.5.0-1.6 - add/use %%post/%%postun for extras/nonfree - TODO/FIXME: -nonfree includes -devel bits (mpeglib) * Sun Nov 27 2005 Rex Dieter 6:3.5.0-1.5 - respin * Fri Nov 25 2005 Rex Dieter 6:3.5.0-1.4 - -extras,-nonfree: include symlinks too * Thu Nov 24 2005 Rex Dieter 6:3.5.0-1.3 - -extras,-nonfree bits (ugh) * Wed Nov 23 2005 Rex Dieter 6:3.5.0-1.2 - -akode patch - drop .la file stripper * Tue Nov 22 2005 Rex Dieter 6:3.5.0-1.1 - --with-akode * Mon Nov 21 2005 Rex Dieter 6:3.5.0-1.0 - kde-3.5.0 * Thu Nov 17 2005 Rex Dieter 6:3.5.0-0.2.rc1.kde - (re)build against libtunepimp-0.4 (kde bug #116575) * Sat Nov 12 2005 Rex Dieter 6:3.5.0-0.1.rc1.kde - kde-3.5.0-rc1 * Fri Aug 12 2005 Rex Dieter 6:3.4.2-1.2.kde - respin * Thu Jul 21 2005 Rex Dieter 6:3.4.2-1.0.kde - kde-3.4.2 * Mon Jun 20 2005 Rex Dieter 6:3.4.1-1.2.kde - disable -fvisibility, for now (kde bug #101542) * Tue May 24 2005 Rex Dieter 6:3.4.1-1.0.kde - 3.4.1 * Fri Apr 29 2005 Rex Dieter 6:3.4.0-2.2.kde - Ob/Pr: kdemultimedia-extras * Wed Apr 20 2005 Rex Dieter 6:3.4.0-2.1.kde - patch for slow kaudiocreator (kde bug #98477) * Tue Mar 29 2005 Rex Dieter 6:3.4.0-2.0.kde - remove libltdl.la reference(s) from .la files - make all(most?) configure options explicit * Wed Mar 23 2005 Rex Dieter 6:3.4.0-1.2.kde - %%post/%%postun workarounds for recent /sbin/ldconfig (fc3/el4) * Sat Mar 12 2005 Rex Dieter 6:3.4.0-1.1.kde - enumerate via --with/--without exactly what is(should!) and isn't supported * Fri Mar 05 2005 Rex Dieter 6:3.4.0-1.0.kde - 3.4.0(final) * Thu Mar 03 2005 Rex Dieter 6:3.4.0-0.1.rc1.kde - 3.4.0 * Tue Feb 21 2005 Rex Dieter 6:3.3.92-0.3.kde - (try to) fix artsd crasher * Tue Feb 15 2005 Rex Dieter 6:3.3.92-0.2.kde - 3.3.92 * Mon Nov 29 2004 Rex Dieter 3.3.2-1.0.kde - 3.2.2 * Thu Nov 11 2004 Rex Dieter 3.3.1-1.0.kde - fc3 * Tue Oct 05 2004 Rex Dieter 3.3.1-0.0.kde - 3.3.1 * Wed Sep 29 2004 Rex Dieter 3.3.0-1.2.kde - BR: libtunepimp-devel (musicbrainz support for juk) * Wed Sep 08 2004 Rex Dieter 3.3.0-1.1.kde - include better/cleaner vorbis patch * Mon Aug 16 2004 Rex Dieter 3.3.0-1.0.kde - 3.3.0 - fix build (libvorbisenc linking) on rh90/el3 (kde bug #88106) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Mar 2006 12:39:28 -0000 1.1 +++ .cvsignore 31 Mar 2006 12:39:58 -0000 1.2 @@ -0,0 +1 @@ +kdemultimedia-3.5.1-patched.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Mar 2006 12:39:28 -0000 1.1 +++ sources 31 Mar 2006 12:39:58 -0000 1.2 @@ -0,0 +1 @@ +31630864143d052b8f4342da0fa098fd kdemultimedia-3.5.1-patched.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 12:57:04 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 31 Mar 2006 05:57:04 -0700 Subject: rpms/snort/devel snort.spec,1.7,1.8 Message-ID: <200603311257.k2VCv6IR000482@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv465 Modified Files: snort.spec Log Message: make initscript not a config file Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- snort.spec 30 Mar 2006 04:52:00 -0000 1.7 +++ snort.spec 31 Mar 2006 12:57:03 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz @@ -283,7 +283,7 @@ rm -rf %{buildroot} fi -mkdir -p %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sysconfdir}/snort mkdir -p %{buildroot}/var/log/snort mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/etc/rc.d/init.d @@ -302,11 +302,10 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -mkdir %{buildroot}%{_sysconfdir}/snort install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d -perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf +perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort/snort.conf %clean @@ -369,8 +368,8 @@ # handle compressed man pages. %attr(755,root,root) %{_mandir}/man8/snort.8* %attr(755,root,root) %dir /var/log/snort -%attr(644,root,root) %config %{_sysconfdir}/* -%attr(755,root,root) %config /etc/rc.d/init.d/snortd +%attr(644,root,root) %config %{_sysconfdir}/snort +%attr(755,root,root) /etc/rc.d/init.d/snortd %files plain+flexresp %attr(755,root,root) %{_sbindir}/snort-plain+flexresp @@ -398,6 +397,10 @@ %changelog +* Fri Mar 31 3006 Dennis Gilmore - 2.4.4-3 +- make initscript not a config file +- own /etc/snort + * Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 - Add fedora README - do make clean to make sure that each configure runs properly From fedora-extras-commits at redhat.com Fri Mar 31 12:57:48 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 31 Mar 2006 05:57:48 -0700 Subject: rpms/snort/devel snort.spec,1.8,1.9 Message-ID: <200603311257.k2VCvo8W000564@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv508 Modified Files: snort.spec Log Message: make initscript not a config file Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- snort.spec 31 Mar 2006 12:57:03 -0000 1.8 +++ snort.spec 31 Mar 2006 12:57:48 -0000 1.9 @@ -397,7 +397,7 @@ %changelog -* Fri Mar 31 3006 Dennis Gilmore - 2.4.4-3 +* Fri Mar 31 2006 Dennis Gilmore - 2.4.4-3 - make initscript not a config file - own /etc/snort From fedora-extras-commits at redhat.com Fri Mar 31 12:58:53 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 31 Mar 2006 05:58:53 -0700 Subject: rpms/snort/FC-3 snort.spec,1.6,1.7 Message-ID: <200603311258.k2VCwtm2000629@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv612 Modified Files: snort.spec Log Message: make initscript not a config file Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-3/snort.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- snort.spec 30 Mar 2006 04:54:54 -0000 1.6 +++ snort.spec 31 Mar 2006 12:58:53 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz @@ -283,7 +283,7 @@ rm -rf %{buildroot} fi -mkdir -p %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sysconfdir}/snort mkdir -p %{buildroot}/var/log/snort mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/etc/rc.d/init.d @@ -302,11 +302,10 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -mkdir %{buildroot}%{_sysconfdir}/snort install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d -perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf +perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort/snort.conf %clean @@ -369,8 +368,8 @@ # handle compressed man pages. %attr(755,root,root) %{_mandir}/man8/snort.8* %attr(755,root,root) %dir /var/log/snort -%attr(644,root,root) %config %{_sysconfdir}/* -%attr(755,root,root) %config /etc/rc.d/init.d/snortd +%attr(644,root,root) %config %{_sysconfdir}/snort +%attr(755,root,root) /etc/rc.d/init.d/snortd %files plain+flexresp %attr(755,root,root) %{_sbindir}/snort-plain+flexresp @@ -398,6 +397,10 @@ %changelog +* Fri Mar 31 2006 Dennis Gilmore - 2.4.4-3 +- make initscript not a config file +- own /etc/snort + * Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 - Add fedora README - do make clean to make sure that each configure runs properly From fedora-extras-commits at redhat.com Fri Mar 31 12:59:27 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 31 Mar 2006 05:59:27 -0700 Subject: rpms/snort/FC-4 snort.spec,1.7,1.8 Message-ID: <200603311259.k2VCxTN9000705@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv673 Modified Files: snort.spec Log Message: make initscript not a config file Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-4/snort.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- snort.spec 30 Mar 2006 04:56:43 -0000 1.7 +++ snort.spec 31 Mar 2006 12:59:27 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz @@ -283,7 +283,7 @@ rm -rf %{buildroot} fi -mkdir -p %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sysconfdir}/snort mkdir -p %{buildroot}/var/log/snort mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/etc/rc.d/init.d @@ -302,11 +302,10 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -mkdir %{buildroot}%{_sysconfdir}/snort install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d -perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf +perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort/snort.conf %clean @@ -369,8 +368,8 @@ # handle compressed man pages. %attr(755,root,root) %{_mandir}/man8/snort.8* %attr(755,root,root) %dir /var/log/snort -%attr(644,root,root) %config %{_sysconfdir}/* -%attr(755,root,root) %config /etc/rc.d/init.d/snortd +%attr(644,root,root) %config %{_sysconfdir}/snort +%attr(755,root,root) /etc/rc.d/init.d/snortd %files plain+flexresp %attr(755,root,root) %{_sbindir}/snort-plain+flexresp @@ -398,6 +397,10 @@ %changelog +* Fri Mar 31 2006 Dennis Gilmore - 2.4.4-3 +- make initscript not a config file +- own /etc/snort + * Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 - Add fedora README - do make clean to make sure that each configure runs properly From fedora-extras-commits at redhat.com Fri Mar 31 12:59:58 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 31 Mar 2006 05:59:58 -0700 Subject: rpms/snort/FC-5 snort.spec,1.7,1.8 Message-ID: <200603311300.k2VD0163000766@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv749 Modified Files: snort.spec Log Message: make initscript not a config file Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-5/snort.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- snort.spec 30 Mar 2006 04:59:26 -0000 1.7 +++ snort.spec 31 Mar 2006 12:59:58 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz @@ -283,7 +283,7 @@ rm -rf %{buildroot} fi -mkdir -p %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sysconfdir}/snort mkdir -p %{buildroot}/var/log/snort mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/etc/rc.d/init.d @@ -302,11 +302,10 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -mkdir %{buildroot}%{_sysconfdir}/snort install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d -perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf +perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort/snort.conf %clean @@ -369,8 +368,8 @@ # handle compressed man pages. %attr(755,root,root) %{_mandir}/man8/snort.8* %attr(755,root,root) %dir /var/log/snort -%attr(644,root,root) %config %{_sysconfdir}/* -%attr(755,root,root) %config /etc/rc.d/init.d/snortd +%attr(644,root,root) %config %{_sysconfdir}/snort +%attr(755,root,root) /etc/rc.d/init.d/snortd %files plain+flexresp %attr(755,root,root) %{_sbindir}/snort-plain+flexresp @@ -398,6 +397,10 @@ %changelog +* Fri Mar 31 2006 Dennis Gilmore - 2.4.4-3 +- make initscript not a config file +- own /etc/snort + * Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 - Add fedora README - do make clean to make sure that each configure runs properly From fedora-extras-commits at redhat.com Fri Mar 31 13:00:38 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 06:00:38 -0700 Subject: rpms/Macaulay2/devel Macaulay2.desktop, 1.1, 1.2 Macaulay2.spec, 1.10, 1.11 Message-ID: <200603311300.k2VD0etQ000847@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828 Modified Files: Macaulay2.desktop Macaulay2.spec Log Message: * Thu Mar 30 2006 Rex Dieter 0.9.2-21 - *really* disable %%check (fails on fc5+ anyway) * Fri Jan 20 2006 Rex Dieter 0.9.2-20 - .desktop: drop Category=Development - app icon: follow icon spec - drop -emacs subpkg (in main now) * Fri Sep 16 2005 Rex Dieter - 0.9.2-19 - disable 'make check' (fc5/buildsystem error), besides, we get a good consistency check when M2 builds all the doc examples. Index: Macaulay2.desktop =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Macaulay2.desktop 8 Dec 2004 16:15:35 -0000 1.1 +++ Macaulay2.desktop 31 Mar 2006 13:00:38 -0000 1.2 @@ -5,5 +5,5 @@ SwallowTitle=Macaulay2 Terminal=true Type=Application -Categories=Application;Education;Math;Scientific;Development; +Categories=Application;Education;Math;Scientific; Encoding=UTF-8 Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Macaulay2.spec 14 Sep 2005 14:55:50 -0000 1.10 +++ Macaulay2.spec 31 Mar 2006 13:00:38 -0000 1.11 @@ -6,7 +6,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 0.9.2 -Release: 18%{?dist} +Release: 21%{?dist} License: GPL Group: Applications/Engineering URL: http://www.math.uiuc.edu/Macaulay2/ @@ -20,16 +20,19 @@ Patch1: Macaulay2-0.9-htmlview.patch Patch2: Macaulay2-0.9.2-static.patch Patch3: Macaulay2-0.9.2-gcc3.patch -# See http://bugzilla.fedora.us/attachment.cgi?id=877&action=view Patch4: Macaulay2-0.9.2-gcc34.patch Patch5: Macaulay2-0.9.2-gcc4.patch BuildRequires: desktop-file-utils -BuildRequires: gc-devel >= 6.6 +BuildRequires: gc-devel BuildRequires: factory-devel >= 2.0.5 BuildRequires: libfac-devel >= 2.0.5 BuildRequires: gdbm-devel BuildRequires: time +#BuildRequires: lapack-devel + +Obsoletes: %{name}-emacs < %{version}-%{release} +Provides: %{name}-emacs = %{version}-%{release} %description Macaulay 2 is a new software system devoted to supporting research in @@ -44,15 +47,6 @@ %description doc %{name} documentation. -%package emacs -Summary: %{name} emacs mode -Group: Applications/Editors -Requires: emacs -Requires: %{name} = %{version} -%description emacs -%{name} emacs mode. - - %prep %setup -q @@ -64,34 +58,33 @@ %patch3 -p1 -b .gcc3 # fc3/gcc34 fix %patch4 -p1 -b .gcc34 +# fc4/gcc4 fix %patch5 -p1 -b .gcc4 %build + %configure \ - --enable-gc-for-new \ --disable-dumpdata \ - --disable-optimize \ - --disable-static \ - %{?debug_package:--disable-strip} + --disable-optimize + +#TODO: --with-lapacklibs + +make -# not smp-safe -make -# Takes a *long* time, default off %check || : -%{!?_without_check:make check } +# NOTE: util/screen dies on fc5/buildsystem (could not open pty) +#make check ||: %install %makeinstall # Fix locations -perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \ - $RPM_BUILD_ROOT%{_bindir}/M2 -perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \ - $RPM_BUILD_ROOT%{_bindir}/M2-help -perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/* +sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2 +sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2-help +sed -i -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/* ## emacs files install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -99,18 +92,18 @@ $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ # app img -install -p -D -m644 \ - %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps/Macaulay2.png +install -p -m644 -D %{SOURCE1} \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps/32x32/Macaulay2.png -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --add-category "X-Fedora" \ %{SOURCE2} ## Unpackaged files +rm -f $RPM_BUILD_ROOT%{m2home}/setup # %doc stuff, no need to dup in appdir rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING} # created by make check @@ -129,38 +122,50 @@ # Handle possibly existing dumpdata #rm -f %{m2home}/libexec/Macaulay2-*-data ||: +%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 ||: + %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc Macaulay2/README Macaulay2/CHANGES %{_bindir}/M2 %{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/*.png +%{_datadir}/icons/hicolor/*/*/* %dir %{m2home} -%{m2home}/cache -%{m2home}/libexec -%{m2home}/m2 -%{m2home}/packages -# Not needed/wanted -%exclude %{m2home}/setup - -%files emacs -%defattr(-,root,root) -%dir %{m2home}/emacs -%doc %{m2home}/emacs/*.m2 -%doc %{m2home}/emacs/*.txt -%doc %{m2home}/emacs/README -%{m2home}/emacs/*.el -%{_datadir}/emacs/site-lisp/*.el +%{m2home}/cache/ +%{m2home}/libexec/ +%{m2home}/m2/ +%{m2home}/packages/ +# emacs bits +%{m2home}/emacs/ +%{_datadir}/emacs/site-lisp/ %files doc -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/M2-help -%{m2home}/html -%{m2home}/tutorial +%{m2home}/html/ +%{m2home}/tutorial/ %changelog +* Thu Mar 30 2006 Rex Dieter 0.9.2-21 +- *really* disable %%check (fails on fc5+ anyway) + +* Fri Jan 20 2006 Rex Dieter 0.9.2-20 +- .desktop: drop Category=Development +- app icon: follow icon spec +- drop -emacs subpkg (in main now) + +* Fri Sep 16 2005 Rex Dieter - 0.9.2-19 +- disable 'make check' (fc5/buildsystem error), besides, we get a + good consistency check when M2 builds all the doc examples. + * Wed Sep 14 2005 Rex Dieter - 0.9.2-18 - rebuild against gc-6.6 From fedora-extras-commits at redhat.com Fri Mar 31 13:18:42 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 06:18:42 -0700 Subject: rpms/wxPython/devel wxPython.spec,1.6,1.7 Message-ID: <200603311318.k2VDIiPv002956@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2937 Modified Files: wxPython.spec Log Message: buildrequires mesa-libGLU-devel Index: wxPython.spec =================================================================== RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wxPython.spec 31 Mar 2006 02:23:27 -0000 1.6 +++ wxPython.spec 31 Mar 2006 13:18:42 -0000 1.7 @@ -4,7 +4,7 @@ Name: wxPython Version: 2.6.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI toolkit for the Python programming language @@ -16,6 +16,7 @@ BuildRequires: wxGTK-devel = 2.6.3, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel +BuildRequires: mesa-libGLU-devel BuildRequires: python-devel, wxGTK-gl # packages should depend on "wxPython", not "wxPythonGTK2", but in case @@ -88,6 +89,9 @@ %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-2 +- buildrequires mesa-libGLU-devel + * Thu Mar 30 2006 Matthew Miller - 2.6.3.0-1 - update to 2.6.3.0 - wxGTK and wxPython versions are inexorably linked; make BuildRequires From fedora-extras-commits at redhat.com Fri Mar 31 14:02:06 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 07:02:06 -0700 Subject: rpms/php-extras/devel php-extras.spec,1.2,1.3 Message-ID: <200603311402.k2VE2g3L005095@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5078 Modified Files: php-extras.spec Log Message: Some guessing of troubles Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/php-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-extras.spec 30 Mar 2006 10:13:23 -0000 1.2 +++ php-extras.spec 31 Mar 2006 14:02:06 -0000 1.3 @@ -15,7 +15,7 @@ %define extdir %(php-config --extension-dir) -%define apiver %(echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) +%define apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) Name: php-extras From fedora-extras-commits at redhat.com Fri Mar 31 14:12:24 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 07:12:24 -0700 Subject: rpms/wxPython/devel wxPython.spec,1.7,1.8 Message-ID: <200603311412.k2VECQEh005277@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5260 Modified Files: wxPython.spec Log Message: Apparently wx.pth and wxversion.py don't belong in lib64. Index: wxPython.spec =================================================================== RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wxPython.spec 31 Mar 2006 13:18:42 -0000 1.7 +++ wxPython.spec 31 Mar 2006 14:12:24 -0000 1.8 @@ -1,10 +1,11 @@ +%{!?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)")} %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython Version: 2.6.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI toolkit for the Python programming language @@ -72,8 +73,8 @@ %defattr(-,root,root,-) %doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples %{_bindir}/* -%{python_sitearch}/wx.pth -%{python_sitearch}/wxversion.py* +%{python_sitelib}/wx.pth +%{python_sitelib}/wxversion.py* %dir %{python_sitearch}/wx-2.6-gtk2-unicode/ %{python_sitearch}/wx-2.6-gtk2-unicode/wx %{python_sitearch}/wx-2.6-gtk2-unicode/wxPython @@ -89,6 +90,9 @@ %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-3 +- oh yeah -- wxversion.py not lib64. + * Fri Mar 31 2006 Matthew Miller - 2.6.3.0-2 - buildrequires mesa-libGLU-devel From fedora-extras-commits at redhat.com Fri Mar 31 14:13:49 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 07:13:49 -0700 Subject: rpms/wxPython/devel wxPython.spec,1.8,1.9 Message-ID: <200603311413.k2VEDpK0005367@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5349 Modified Files: wxPython.spec Log Message: Rel number bump. Sorry for noise. Index: wxPython.spec =================================================================== RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- wxPython.spec 31 Mar 2006 14:12:24 -0000 1.8 +++ wxPython.spec 31 Mar 2006 14:13:49 -0000 1.9 @@ -5,7 +5,7 @@ Name: wxPython Version: 2.6.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI toolkit for the Python programming language @@ -90,6 +90,9 @@ %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-4 +- grr. bump relnumber. + * Fri Mar 31 2006 Matthew Miller - 2.6.3.0-3 - oh yeah -- wxversion.py not lib64. From fedora-extras-commits at redhat.com Fri Mar 31 14:29:14 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 07:29:14 -0700 Subject: rpms/php-extras/devel php-extras.spec,1.3,1.4 Message-ID: <200603311429.k2VETGMg005494@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5477 Modified Files: php-extras.spec Log Message: Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/php-extras.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-extras.spec 31 Mar 2006 14:02:06 -0000 1.3 +++ php-extras.spec 31 Mar 2006 14:29:13 -0000 1.4 @@ -22,7 +22,7 @@ Summary: Additional PHP modules from the standard PHP distribution #Version: %(php-config --version) Version: 5.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: The PHP License URL: http://www.php.net/ @@ -251,6 +251,9 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 5.1.2-3 +- ppc arch hack: change dir before %%apiver auto-detecting + * Sat Mar 25 2006 Dmitry Butskoy - 5.1.2-2 - Accepted for Fedora Extras (review by Tom "spot" Callaway ) From fedora-extras-commits at redhat.com Fri Mar 31 14:30:21 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 07:30:21 -0700 Subject: rpms/php-extras/FC-5 php-extras.spec,1.2,1.3 Message-ID: <200603311430.k2VEUNHb005569@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5552 Modified Files: php-extras.spec Log Message: Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/FC-5/php-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-extras.spec 30 Mar 2006 10:14:04 -0000 1.2 +++ php-extras.spec 31 Mar 2006 14:30:21 -0000 1.3 @@ -15,14 +15,14 @@ %define extdir %(php-config --extension-dir) -%define apiver %(echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) +%define apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) Name: php-extras Summary: Additional PHP modules from the standard PHP distribution #Version: %(php-config --version) Version: 5.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: The PHP License URL: http://www.php.net/ @@ -251,10 +251,13 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 5.1.2-3 +- ppc arch hack: change dir before %%apiver auto-detecting + * Sat Mar 25 2006 Dmitry Butskoy - 5.1.2-2 - Accepted for Fedora Extras (review by Tom "spot" Callaway ) - + * Wed Mar 1 2006 Dmitry Butskoy - 5.1.2-2 - more accurate Requires for the main php (using php-api, provided now by the Core php package). From fedora-extras-commits at redhat.com Fri Mar 31 14:50:31 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 31 Mar 2006 07:50:31 -0700 Subject: fedora-security/audit fc4,1.182,1.183 fc5,1.95,1.96 Message-ID: <200603311450.k2VEoVd4005694@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5672 Modified Files: fc4 fc5 Log Message: Mailman Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- fc4 31 Mar 2006 10:14:19 -0000 1.182 +++ fc4 31 Mar 2006 14:50:28 -0000 1.183 @@ -96,6 +96,7 @@ CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] patch-2.6.15.5 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-194] +CVE-2006-0052 VULNERABLE (mailman, fixed 2.1.6) bz#187421 CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0040 VULNERABLE (gtkhtml) CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- fc5 31 Mar 2006 10:14:19 -0000 1.95 +++ fc5 31 Mar 2006 14:50:28 -0000 1.96 @@ -98,6 +98,7 @@ CVE-2006-0095 backport (kernel) patch-2.6.16-rc6 CVE-2006-0082 version (ImageMagick, not 6.2.5.4) CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-193] +CVE-2006-0052 version (mailman, fixed 2.1.6) CVE-2006-0049 version (gnupg, fixed 1.4.2.2) CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 From fedora-extras-commits at redhat.com Fri Mar 31 14:52:20 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Fri, 31 Mar 2006 07:52:20 -0700 Subject: rpms/shorewall/devel .cvsignore, 1.12, 1.13 shorewall.spec, 1.18, 1.19 sources, 1.12, 1.13 Message-ID: <200603311452.k2VEqMl2005725@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5702 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Feb 2006 17:50:34 -0000 1.12 +++ .cvsignore 31 Mar 2006 14:52:20 -0000 1.13 @@ -1 +1 @@ -shorewall-3.0.5.tar.bz2 +shorewall-3.0.6.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- shorewall.spec 13 Feb 2006 17:50:34 -0000 1.18 +++ shorewall.spec 31 Mar 2006 14:52:20 -0000 1.19 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.0.5 +Version: 3.0.6 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -80,7 +80,10 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog -* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 +* Fri Mar 31 2006 Robert Marcano - 3.0.6-1 +- Update to upstream 3.0.6 + +* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 - Rebuild for Fedora Extras 5, Update to upstream 3.0.5 * Thu Jan 12 2006 Robert Marcano - 3.0.4-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2006 17:50:34 -0000 1.12 +++ sources 31 Mar 2006 14:52:20 -0000 1.13 @@ -1 +1 @@ -a732c8589c4bbf6a6e83a72ff6a8bf1e shorewall-3.0.5.tar.bz2 +6228a86219881f015e02cefe2a6310a8 shorewall-3.0.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 15:18:27 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:18:27 -0700 Subject: rpms/tetex-tex4ht/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tetex-tex4ht.spec, 1.3, 1.4 Message-ID: <200603311518.k2VFIT92007931@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/tetex-tex4ht/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7910 Modified Files: .cvsignore sources tetex-tex4ht.spec Log Message: * Fri Mar 31 2006 Patrice Dumas - 1.0.2006_03_27_1822-1 - update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2006 17:04:57 -0000 1.4 +++ .cvsignore 31 Mar 2006 15:18:26 -0000 1.5 @@ -1,2 +1,2 @@ -tex4ht-1.0.2006_02_15_1234.tar.gz +tex4ht-1.0.2006_03_27_1822.tar.gz tex4ht-all-20050228.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2006 17:04:57 -0000 1.4 +++ sources 31 Mar 2006 15:18:26 -0000 1.5 @@ -1,2 +1,2 @@ -b5924cd4da4faf6435d48d578d4023bd tex4ht-1.0.2006_02_15_1234.tar.gz +b43a5611e41d8049b4277fa48eafa141 tex4ht-1.0.2006_03_27_1822.tar.gz 26eb8df2d6631794b3df0d6fb87a0219 tex4ht-all-20050228.zip Index: tetex-tex4ht.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tetex-tex4ht.spec 17 Feb 2006 17:04:57 -0000 1.3 +++ tetex-tex4ht.spec 31 Mar 2006 15:18:26 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Translates TeX and LaTeX into HTML or XML+MathML Name: tetex-tex4ht -Version: 1.0.2006_02_15_1234 +Version: 1.0.2006_03_27_1822 Release: 1%{?dist} License: LaTeX Project Public License Group: Applications/Publishing @@ -103,6 +103,9 @@ texhash > /dev/null 2>&1 || : %changelog +* Fri Mar 31 2006 Patrice Dumas - 1.0.2006_03_27_1822-1 +- update + * Fri Feb 17 2006 Patrice Dumas - 1.0.2006_02_15_1234-1 - update From fedora-extras-commits at redhat.com Fri Mar 31 15:21:55 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:21:55 -0700 Subject: rpms/perl-Text-CHM import.log,1.1,1.2 Message-ID: <200603311522.k2VFMRrp008048@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/perl-Text-CHM In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8014 Modified Files: import.log Log Message: auto-import perl-Text-CHM-0.01-1 on branch devel from perl-Text-CHM-0.01-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CHM/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Mar 2006 15:09:52 -0000 1.1 +++ import.log 31 Mar 2006 15:21:55 -0000 1.2 @@ -0,0 +1 @@ +perl-Text-CHM-0_01-1:HEAD:perl-Text-CHM-0.01-1.src.rpm:1143822095 From fedora-extras-commits at redhat.com Fri Mar 31 15:21:55 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:21:55 -0700 Subject: rpms/perl-Text-CHM/devel perl-Text-CHM.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603311522.k2VFMSkl008052@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/perl-Text-CHM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8014/devel Modified Files: .cvsignore sources Added Files: perl-Text-CHM.spec Log Message: auto-import perl-Text-CHM-0.01-1 on branch devel from perl-Text-CHM-0.01-1.src.rpm --- NEW FILE perl-Text-CHM.spec --- Name: perl-Text-CHM Version: 0.01 Release: 1%{?dist} Summary: Perl extension for handling MS Compiled HtmlHelp Files Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Text-CHM Source0: http://www.cpan.org/modules/by-module/Text/Text-CHM-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: chmlib-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Text::CHM is a module that implements a (partial) support for handling MS Compiled HtmlHelp Files (chm files for short) via CHMLib. Text::CHM allows you to open chm files, get their filelist, get the content of each file and close them; at the moment, no write support is available. %prep %setup -q -n Text-CHM-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" 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 f -name '*.bs' -a -size 0 -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 README Changes %{perl_vendorarch}/auto/* %{perl_vendorarch}/Text/ %{_mandir}/man3/Text::CHM.3* %changelog * Sun Mar 12 2006 Patrice Dumas 0.01-1 - Fedora Extras submission Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CHM/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Mar 2006 15:09:52 -0000 1.1 +++ .cvsignore 31 Mar 2006 15:21:55 -0000 1.2 @@ -0,0 +1 @@ +Text-CHM-0.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CHM/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Mar 2006 15:09:52 -0000 1.1 +++ sources 31 Mar 2006 15:21:55 -0000 1.2 @@ -0,0 +1 @@ +33dd0a2d9a22025bf39727e7c589faaa Text-CHM-0.01.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 15:28:48 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Fri, 31 Mar 2006 08:28:48 -0700 Subject: rpms/shorewall/FC-4 .cvsignore, 1.6, 1.7 shorewall.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200603311528.k2VFSoGL008199@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8162/FC-4 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.0.6, backport to FC-4 and 5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Feb 2006 17:52:54 -0000 1.6 +++ .cvsignore 31 Mar 2006 15:28:48 -0000 1.7 @@ -1 +1 @@ -shorewall-3.0.5.tar.bz2 +shorewall-3.0.6.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- shorewall.spec 13 Feb 2006 17:52:54 -0000 1.13 +++ shorewall.spec 31 Mar 2006 15:28:48 -0000 1.14 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.0.5 +Version: 3.0.6 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -80,7 +80,10 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog -* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 +* Fri Mar 31 2006 Robert Marcano - 3.0.6-1 +- Update to upstream 3.0.6 + +* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 - Rebuild for Fedora Extras 5, Update to upstream 3.0.5 * Thu Jan 12 2006 Robert Marcano - 3.0.4-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Feb 2006 17:52:54 -0000 1.6 +++ sources 31 Mar 2006 15:28:48 -0000 1.7 @@ -1 +1 @@ -a732c8589c4bbf6a6e83a72ff6a8bf1e shorewall-3.0.5.tar.bz2 +6228a86219881f015e02cefe2a6310a8 shorewall-3.0.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 15:28:48 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Fri, 31 Mar 2006 08:28:48 -0700 Subject: rpms/shorewall/FC-5 .cvsignore, 1.12, 1.13 shorewall.spec, 1.18, 1.19 sources, 1.12, 1.13 Message-ID: <200603311528.k2VFSoun008205@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8162/FC-5 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.0.6, backport to FC-4 and 5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Feb 2006 17:50:34 -0000 1.12 +++ .cvsignore 31 Mar 2006 15:28:48 -0000 1.13 @@ -1 +1 @@ -shorewall-3.0.5.tar.bz2 +shorewall-3.0.6.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/shorewall.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- shorewall.spec 13 Feb 2006 17:50:34 -0000 1.18 +++ shorewall.spec 31 Mar 2006 15:28:48 -0000 1.19 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.0.5 +Version: 3.0.6 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -80,7 +80,10 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog -* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 +* Fri Mar 31 2006 Robert Marcano - 3.0.6-1 +- Update to upstream 3.0.6 + +* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 - Rebuild for Fedora Extras 5, Update to upstream 3.0.5 * Thu Jan 12 2006 Robert Marcano - 3.0.4-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2006 17:50:34 -0000 1.12 +++ sources 31 Mar 2006 15:28:48 -0000 1.13 @@ -1 +1 @@ -a732c8589c4bbf6a6e83a72ff6a8bf1e shorewall-3.0.5.tar.bz2 +6228a86219881f015e02cefe2a6310a8 shorewall-3.0.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 15:31:53 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 08:31:53 -0700 Subject: rpms/wxPythonGTK2/devel sources,1.2,NONE wxPython.spec,1.10,NONE Message-ID: <200603311531.k2VFVtlF008322@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPythonGTK2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8307 Removed Files: sources wxPython.spec Log Message: removed -- moving this back to 'wxPython'. --- sources DELETED --- --- wxPython.spec DELETED --- From fedora-extras-commits at redhat.com Fri Mar 31 15:33:50 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:33:50 -0700 Subject: rpms/tetex-tex4ht/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tetex-tex4ht.spec, 1.1, 1.2 Message-ID: <200603311533.k2VFXqS6008386@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/tetex-tex4ht/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8328/FC-3 Modified Files: .cvsignore sources tetex-tex4ht.spec Log Message: Sync to devel (update to latest version) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Nov 2005 23:21:46 -0000 1.2 +++ .cvsignore 31 Mar 2006 15:33:50 -0000 1.3 @@ -1,2 +1,2 @@ -tex4ht-1.0.2005_11_06_1516.tar.gz +tex4ht-1.0.2006_03_27_1822.tar.gz tex4ht-all-20050228.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Nov 2005 23:21:46 -0000 1.2 +++ sources 31 Mar 2006 15:33:50 -0000 1.3 @@ -1,2 +1,2 @@ -9e32056c20f02f39986aef5f7cdbff09 tex4ht-1.0.2005_11_06_1516.tar.gz +b43a5611e41d8049b4277fa48eafa141 tex4ht-1.0.2006_03_27_1822.tar.gz 26eb8df2d6631794b3df0d6fb87a0219 tex4ht-all-20050228.zip Index: tetex-tex4ht.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-3/tetex-tex4ht.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-tex4ht.spec 15 Nov 2005 23:21:46 -0000 1.1 +++ tetex-tex4ht.spec 31 Mar 2006 15:33:50 -0000 1.2 @@ -2,8 +2,8 @@ Summary: Translates TeX and LaTeX into HTML or XML+MathML Name: tetex-tex4ht -Version: 1.0.2005_11_06_1516 -Release: 3%{?dist} +Version: 1.0.2006_03_27_1822 +Release: 1%{?dist} License: LaTeX Project Public License Group: Applications/Publishing URL: http://www.cse.ohio-state.edu/~gurari/TeX4ht/ @@ -11,7 +11,7 @@ # Source1 is only used for documentation # renamed to tex4ht-all-YYYYMMDD.zip - based on last timestamp in directory Source1: tex4ht-all-20050228.zip -# unversioned upstream source +# 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 @@ -103,6 +103,15 @@ texhash > /dev/null 2>&1 || : %changelog +* Fri Mar 31 2006 Patrice Dumas - 1.0.2006_03_27_1822-1 +- update + +* Fri Feb 17 2006 Patrice Dumas - 1.0.2006_02_15_1234-1 +- update + +* Thu Dec 22 2005 Patrice Dumas - 1.0.2005_12_21_0412-1 +- update + * Mon Nov 14 2005 Patrice Dumas - 1.0.2005_11_06_1516-3 - add Requires for ImageMagick From fedora-extras-commits at redhat.com Fri Mar 31 15:33:51 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:33:51 -0700 Subject: rpms/tetex-tex4ht/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tetex-tex4ht.spec, 1.1, 1.2 Message-ID: <200603311533.k2VFXrIA008390@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/tetex-tex4ht/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8328/FC-4 Modified Files: .cvsignore sources tetex-tex4ht.spec Log Message: Sync to devel (update to latest version) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Nov 2005 23:21:46 -0000 1.2 +++ .cvsignore 31 Mar 2006 15:33:51 -0000 1.3 @@ -1,2 +1,2 @@ -tex4ht-1.0.2005_11_06_1516.tar.gz +tex4ht-1.0.2006_03_27_1822.tar.gz tex4ht-all-20050228.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Nov 2005 23:21:46 -0000 1.2 +++ sources 31 Mar 2006 15:33:51 -0000 1.3 @@ -1,2 +1,2 @@ -9e32056c20f02f39986aef5f7cdbff09 tex4ht-1.0.2005_11_06_1516.tar.gz +b43a5611e41d8049b4277fa48eafa141 tex4ht-1.0.2006_03_27_1822.tar.gz 26eb8df2d6631794b3df0d6fb87a0219 tex4ht-all-20050228.zip Index: tetex-tex4ht.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-4/tetex-tex4ht.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-tex4ht.spec 15 Nov 2005 23:21:46 -0000 1.1 +++ tetex-tex4ht.spec 31 Mar 2006 15:33:51 -0000 1.2 @@ -2,8 +2,8 @@ Summary: Translates TeX and LaTeX into HTML or XML+MathML Name: tetex-tex4ht -Version: 1.0.2005_11_06_1516 -Release: 3%{?dist} +Version: 1.0.2006_03_27_1822 +Release: 1%{?dist} License: LaTeX Project Public License Group: Applications/Publishing URL: http://www.cse.ohio-state.edu/~gurari/TeX4ht/ @@ -11,7 +11,7 @@ # Source1 is only used for documentation # renamed to tex4ht-all-YYYYMMDD.zip - based on last timestamp in directory Source1: tex4ht-all-20050228.zip -# unversioned upstream source +# 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 @@ -103,6 +103,15 @@ texhash > /dev/null 2>&1 || : %changelog +* Fri Mar 31 2006 Patrice Dumas - 1.0.2006_03_27_1822-1 +- update + +* Fri Feb 17 2006 Patrice Dumas - 1.0.2006_02_15_1234-1 +- update + +* Thu Dec 22 2005 Patrice Dumas - 1.0.2005_12_21_0412-1 +- update + * Mon Nov 14 2005 Patrice Dumas - 1.0.2005_11_06_1516-3 - add Requires for ImageMagick From fedora-extras-commits at redhat.com Fri Mar 31 15:33:52 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:33:52 -0700 Subject: rpms/tetex-tex4ht/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tetex-tex4ht.spec, 1.3, 1.4 Message-ID: <200603311533.k2VFXswi008398@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/tetex-tex4ht/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8328/FC-5 Modified Files: .cvsignore sources tetex-tex4ht.spec Log Message: Sync to devel (update to latest version) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2006 17:04:57 -0000 1.4 +++ .cvsignore 31 Mar 2006 15:33:51 -0000 1.5 @@ -1,2 +1,2 @@ -tex4ht-1.0.2006_02_15_1234.tar.gz +tex4ht-1.0.2006_03_27_1822.tar.gz tex4ht-all-20050228.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2006 17:04:57 -0000 1.4 +++ sources 31 Mar 2006 15:33:51 -0000 1.5 @@ -1,2 +1,2 @@ -b5924cd4da4faf6435d48d578d4023bd tex4ht-1.0.2006_02_15_1234.tar.gz +b43a5611e41d8049b4277fa48eafa141 tex4ht-1.0.2006_03_27_1822.tar.gz 26eb8df2d6631794b3df0d6fb87a0219 tex4ht-all-20050228.zip Index: tetex-tex4ht.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-5/tetex-tex4ht.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tetex-tex4ht.spec 17 Feb 2006 17:04:57 -0000 1.3 +++ tetex-tex4ht.spec 31 Mar 2006 15:33:51 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Translates TeX and LaTeX into HTML or XML+MathML Name: tetex-tex4ht -Version: 1.0.2006_02_15_1234 +Version: 1.0.2006_03_27_1822 Release: 1%{?dist} License: LaTeX Project Public License Group: Applications/Publishing @@ -103,6 +103,9 @@ texhash > /dev/null 2>&1 || : %changelog +* Fri Mar 31 2006 Patrice Dumas - 1.0.2006_03_27_1822-1 +- update + * Fri Feb 17 2006 Patrice Dumas - 1.0.2006_02_15_1234-1 - update From fedora-extras-commits at redhat.com Fri Mar 31 16:28:27 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Fri, 31 Mar 2006 09:28:27 -0700 Subject: rpms/denyhosts/devel denyhosts.spec,1.29,1.30 Message-ID: <200603311628.k2VGSTKg011589@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11572 Modified Files: denyhosts.spec Log Message: * Fri Mar 31 2006 Jason L Tibbitts III - 2.2-4 - Fix permissions on plugins. Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- denyhosts.spec 31 Mar 2006 02:59:32 -0000 1.29 +++ denyhosts.spec 31 Mar 2006 16:28:27 -0000 1.30 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -47,6 +47,9 @@ # can include it as documentation. mv plugins/README.contrib . +# And the permissions are off as well +chmod +x plugins/* + %build %{__python} setup.py build @@ -144,6 +147,9 @@ %changelog +* Fri Mar 31 2006 Jason L Tibbitts III - 2.2-4 +- Fix permissions on plugins. + * Thu Mar 30 2006 Jason L Tibbitts III - 2.2-3 - Switch from $RPM_BUILD_ROOT to %{buildroot} (looks cleaner). - Rename the main executable from denyhosts.py to denyhosts. From fedora-extras-commits at redhat.com Fri Mar 31 16:52:18 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 31 Mar 2006 09:52:18 -0700 Subject: rpms/perl-Text-WikiFormat/FC-4 .cvsignore, 1.3, 1.4 perl-Text-WikiFormat.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603311652.k2VGqKXR011829@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11776/FC-4 Modified Files: .cvsignore perl-Text-WikiFormat.spec sources Log Message: Update to 0.78. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Dec 2005 02:08:10 -0000 1.3 +++ .cvsignore 31 Mar 2006 16:52:18 -0000 1.4 @@ -1 +1 @@ -Text-WikiFormat-0.77.tar.gz +Text-WikiFormat-0.78.tar.gz Index: perl-Text-WikiFormat.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/perl-Text-WikiFormat.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Text-WikiFormat.spec 29 Dec 2005 02:08:10 -0000 1.2 +++ perl-Text-WikiFormat.spec 31 Mar 2006 16:52:18 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Text-WikiFormat -Version: 0.77 +Version: 0.78 Release: 1%{?dist} Summary: Translate Wiki formatted text into other formats @@ -13,8 +13,9 @@ BuildRequires: perl BuildRequires: perl(Module::Build) BuildRequires: perl(URI::Escape) +BuildRequires: perl(Scalar::Util) >= 1.14 BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The original Wiki web site had a very simple interface to edit and to @@ -40,8 +41,8 @@ %check -mv t/0-signature.t t/0.signature.t.skip -./Build test +mv t/developer/0-signature.t t/developer/0-signature.t.disable +PERL_RUN_ALL_TESTS=1 ./Build test %clean @@ -56,6 +57,12 @@ %changelog +* Fri Mar 31 2006 Jose Pedro Oliveira - 0.78-1 +- Update to 0.78. + +* Mon Feb 20 2006 Jose Pedro Oliveira - 0.77-2 +- Rebuild for FC5 (perl 5.8.8). + * Thu Dec 29 2005 Jose Pedro Oliveira - 0.77-1 - Update to 0.77. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Dec 2005 02:08:10 -0000 1.3 +++ sources 31 Mar 2006 16:52:18 -0000 1.4 @@ -1 +1 @@ -1264c90c76320a51ba61089b6a201e03 Text-WikiFormat-0.77.tar.gz +646c0ea411247a0293eb69a216451beb Text-WikiFormat-0.78.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 16:52:18 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 31 Mar 2006 09:52:18 -0700 Subject: rpms/perl-Text-WikiFormat/FC-5 .cvsignore, 1.3, 1.4 perl-Text-WikiFormat.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603311652.k2VGqLRo011835@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11776/FC-5 Modified Files: .cvsignore perl-Text-WikiFormat.spec sources Log Message: Update to 0.78. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Dec 2005 02:08:34 -0000 1.3 +++ .cvsignore 31 Mar 2006 16:52:18 -0000 1.4 @@ -1 +1 @@ -Text-WikiFormat-0.77.tar.gz +Text-WikiFormat-0.78.tar.gz Index: perl-Text-WikiFormat.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-5/perl-Text-WikiFormat.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Text-WikiFormat.spec 20 Feb 2006 19:32:32 -0000 1.3 +++ perl-Text-WikiFormat.spec 31 Mar 2006 16:52:18 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Text-WikiFormat -Version: 0.77 -Release: 2%{?dist} +Version: 0.78 +Release: 1%{?dist} Summary: Translate Wiki formatted text into other formats Group: Development/Libraries @@ -13,6 +13,7 @@ BuildRequires: perl BuildRequires: perl(Module::Build) BuildRequires: perl(URI::Escape) +BuildRequires: perl(Scalar::Util) >= 1.14 BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -40,8 +41,8 @@ %check -mv t/0-signature.t t/0.signature.t.skip -./Build test +mv t/developer/0-signature.t t/developer/0-signature.t.disable +PERL_RUN_ALL_TESTS=1 ./Build test %clean @@ -56,6 +57,9 @@ %changelog +* Fri Mar 31 2006 Jose Pedro Oliveira - 0.78-1 +- Update to 0.78. + * Mon Feb 20 2006 Jose Pedro Oliveira - 0.77-2 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Dec 2005 02:08:34 -0000 1.3 +++ sources 31 Mar 2006 16:52:18 -0000 1.4 @@ -1 +1 @@ -1264c90c76320a51ba61089b6a201e03 Text-WikiFormat-0.77.tar.gz +646c0ea411247a0293eb69a216451beb Text-WikiFormat-0.78.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 16:52:19 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 31 Mar 2006 09:52:19 -0700 Subject: rpms/perl-Text-WikiFormat/devel .cvsignore, 1.3, 1.4 perl-Text-WikiFormat.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603311652.k2VGqLkM011841@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11776/devel Modified Files: .cvsignore perl-Text-WikiFormat.spec sources Log Message: Update to 0.78. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Dec 2005 02:08:34 -0000 1.3 +++ .cvsignore 31 Mar 2006 16:52:19 -0000 1.4 @@ -1 +1 @@ -Text-WikiFormat-0.77.tar.gz +Text-WikiFormat-0.78.tar.gz Index: perl-Text-WikiFormat.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/perl-Text-WikiFormat.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Text-WikiFormat.spec 20 Feb 2006 19:32:32 -0000 1.3 +++ perl-Text-WikiFormat.spec 31 Mar 2006 16:52:19 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Text-WikiFormat -Version: 0.77 -Release: 2%{?dist} +Version: 0.78 +Release: 1%{?dist} Summary: Translate Wiki formatted text into other formats Group: Development/Libraries @@ -13,6 +13,7 @@ BuildRequires: perl BuildRequires: perl(Module::Build) BuildRequires: perl(URI::Escape) +BuildRequires: perl(Scalar::Util) >= 1.14 BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -40,8 +41,8 @@ %check -mv t/0-signature.t t/0.signature.t.skip -./Build test +mv t/developer/0-signature.t t/developer/0-signature.t.disable +PERL_RUN_ALL_TESTS=1 ./Build test %clean @@ -56,6 +57,9 @@ %changelog +* Fri Mar 31 2006 Jose Pedro Oliveira - 0.78-1 +- Update to 0.78. + * Mon Feb 20 2006 Jose Pedro Oliveira - 0.77-2 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Dec 2005 02:08:34 -0000 1.3 +++ sources 31 Mar 2006 16:52:19 -0000 1.4 @@ -1 +1 @@ -1264c90c76320a51ba61089b6a201e03 Text-WikiFormat-0.77.tar.gz +646c0ea411247a0293eb69a216451beb Text-WikiFormat-0.78.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 18:01:08 2006 From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs)) Date: Fri, 31 Mar 2006 11:01:08 -0700 Subject: rpms/perl-X11-Protocol/FC-3 .cvsignore, 1.2, 1.3 perl-X11-Protocol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603311801.k2VI1eKr016134@cvs-int.fedora.redhat.com> Author: duncs Update of /cvs/extras/rpms/perl-X11-Protocol/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16079 Modified Files: .cvsignore perl-X11-Protocol.spec sources Log Message: Updated to 0.55 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Sep 2005 10:29:51 -0000 1.2 +++ .cvsignore 31 Mar 2006 18:01:07 -0000 1.3 @@ -1 +1 @@ -X11-Protocol-0.54.tar.gz +X11-Protocol-0.55.tar.gz Index: perl-X11-Protocol.spec =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-3/perl-X11-Protocol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-X11-Protocol.spec 10 Sep 2005 10:29:51 -0000 1.1 +++ perl-X11-Protocol.spec 31 Mar 2006 18:01:07 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-X11-Protocol -Version: 0.54 -Release: 2%{?dist} +Version: 0.55 +Release: 1%{?dist} Summary: X11-Protocol - Raw interface to X Window System servers Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/X11-Protocol/ -Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.54.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.55.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -69,6 +69,9 @@ %changelog +* Fri Mar 31 2006 Duncan Ferguson 0.55-1 +- Update to new version of X11::Protocol + * Fri Aug 26 2005 Paul Howarth 0.54-2 - remove redundant BR: perl - remove compiler optimization flags, redundant for noarch package Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2005 10:29:51 -0000 1.2 +++ sources 31 Mar 2006 18:01:07 -0000 1.3 @@ -1 +1 @@ -b2ad4dc41755f2b08f9cd2899636346c X11-Protocol-0.54.tar.gz +3d914cb8945105a8b96ec1497dee47e2 X11-Protocol-0.55.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 18:04:06 2006 From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs)) Date: Fri, 31 Mar 2006 11:04:06 -0700 Subject: rpms/perl-X11-Protocol/FC-4 .cvsignore, 1.2, 1.3 perl-X11-Protocol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603311804.k2VI48YC016255@cvs-int.fedora.redhat.com> Author: duncs Update of /cvs/extras/rpms/perl-X11-Protocol/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16234 Modified Files: .cvsignore perl-X11-Protocol.spec sources Log Message: Updated to 0.55 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Sep 2005 10:29:51 -0000 1.2 +++ .cvsignore 31 Mar 2006 18:04:06 -0000 1.3 @@ -1 +1 @@ -X11-Protocol-0.54.tar.gz +X11-Protocol-0.55.tar.gz Index: perl-X11-Protocol.spec =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-4/perl-X11-Protocol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-X11-Protocol.spec 10 Sep 2005 10:29:51 -0000 1.1 +++ perl-X11-Protocol.spec 31 Mar 2006 18:04:06 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-X11-Protocol -Version: 0.54 -Release: 2%{?dist} +Version: 0.55 +Release: 1%{?dist} Summary: X11-Protocol - Raw interface to X Window System servers Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/X11-Protocol/ -Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.54.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.55.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -69,6 +69,9 @@ %changelog +* Fri Mar 31 2006 Duncan Ferguson 0.55-1 +- Update to new version of X11::Protocol + * Fri Aug 26 2005 Paul Howarth 0.54-2 - remove redundant BR: perl - remove compiler optimization flags, redundant for noarch package Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2005 10:29:51 -0000 1.2 +++ sources 31 Mar 2006 18:04:06 -0000 1.3 @@ -1 +1 @@ -b2ad4dc41755f2b08f9cd2899636346c X11-Protocol-0.54.tar.gz +3d914cb8945105a8b96ec1497dee47e2 X11-Protocol-0.55.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 18:07:02 2006 From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs)) Date: Fri, 31 Mar 2006 11:07:02 -0700 Subject: rpms/perl-X11-Protocol/devel .cvsignore, 1.2, 1.3 perl-X11-Protocol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603311807.k2VI74fM016370@cvs-int.fedora.redhat.com> Author: duncs Update of /cvs/extras/rpms/perl-X11-Protocol/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16349 Modified Files: .cvsignore perl-X11-Protocol.spec sources Log Message: Updated to 0.55 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Sep 2005 10:29:51 -0000 1.2 +++ .cvsignore 31 Mar 2006 18:07:02 -0000 1.3 @@ -1 +1 @@ -X11-Protocol-0.54.tar.gz +X11-Protocol-0.55.tar.gz Index: perl-X11-Protocol.spec =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/perl-X11-Protocol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-X11-Protocol.spec 10 Sep 2005 10:29:51 -0000 1.1 +++ perl-X11-Protocol.spec 31 Mar 2006 18:07:02 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-X11-Protocol -Version: 0.54 -Release: 2%{?dist} +Version: 0.55 +Release: 1%{?dist} Summary: X11-Protocol - Raw interface to X Window System servers Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/X11-Protocol/ -Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.54.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.55.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -69,6 +69,9 @@ %changelog +* Fri Mar 31 2006 Duncan Ferguson 0.55-1 +- Update to new version of X11::Protocol + * Fri Aug 26 2005 Paul Howarth 0.54-2 - remove redundant BR: perl - remove compiler optimization flags, redundant for noarch package Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2005 10:29:51 -0000 1.2 +++ sources 31 Mar 2006 18:07:02 -0000 1.3 @@ -1 +1 @@ -b2ad4dc41755f2b08f9cd2899636346c X11-Protocol-0.54.tar.gz +3d914cb8945105a8b96ec1497dee47e2 X11-Protocol-0.55.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 18:15:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 11:15:44 -0700 Subject: rpms/dia/devel dia-0.95-pre6-help.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 dia.spec, 1.6, 1.7 sources, 1.1, 1.2 dia-0.94-gcc4.patch, 1.1, NONE dia-0.94-gnomeflags.patch, 1.1, NONE dia-0.94-help.patch, 1.2, NONE dia-0.94-rh165337.patch, 1.1, NONE dia-0.94-svgimport-fix.patch, 1.1, NONE Message-ID: <200603311815.k2VIFkvR016470@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16446 Modified Files: .cvsignore dia.spec sources Added Files: dia-0.95-pre6-help.patch Removed Files: dia-0.94-gcc4.patch dia-0.94-gnomeflags.patch dia-0.94-help.patch dia-0.94-rh165337.patch dia-0.94-svgimport-fix.patch Log Message: * Fri Mar 31 2006 Hans de Goede 1:0.95-0.pre7.1 - Taking over as FE maintainer (bz 185886) - Cleanup spec to match FE packaging guidelines - Bump to upstream 0.95-pre7 (bz 184548) - Enable python plugin dia-0.95-pre6-help.patch: --- NEW FILE dia-0.95-pre6-help.patch --- --- dia-0.95-pre6/app/commands.c.help 2006-01-27 18:48:45.000000000 +0100 +++ dia-0.95-pre6/app/commands.c 2006-03-22 16:37:25.000000000 +0100 @@ -526,7 +526,7 @@ const char *dentry; GError *error = NULL; - helpdir = dia_get_data_directory("help"); + helpdir = g_strdup ("/usr/share/gnome/help/dia"); if (!helpdir) { message_warning(_("Could not find help directory")); return; @@ -554,11 +554,11 @@ G_DIR_SEPARATOR_S "dia-manual.chm", NULL); if (!g_file_test(helpindex, G_FILE_TEST_EXISTS)) { helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry, - G_DIR_SEPARATOR_S "index.html", NULL); + G_DIR_SEPARATOR_S "dia.xml", NULL); } #else helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry, - G_DIR_SEPARATOR_S "index.html", NULL); + G_DIR_SEPARATOR_S "dia.xml", NULL); #endif bestscore = score; } @@ -575,7 +575,7 @@ ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL); #else command = getenv("BROWSER"); - command = g_strdup_printf("%s 'file://%s' &", command ? command : "gnome-open", helpindex); + command = g_strdup_printf("%s '%s' &", command ? command : "yelp", helpindex); system(command); g_free(command); #endif --- dia-0.95-pre6/doc/en/dia.xml.help 2006-03-22 16:33:12.000000000 +0100 +++ dia-0.95-pre6/doc/en/dia.xml 2006-03-22 16:33:13.000000000 +0100 @@ -5,7 +5,7 @@ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dia/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Oct 2005 10:54:39 -0000 1.1 +++ .cvsignore 31 Mar 2006 18:15:44 -0000 1.2 @@ -1 +1 @@ -dia-0.94.tar.bz2 +dia-0.95-pre7.tar.bz2 Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dia.spec 3 Jan 2006 14:17:55 -0000 1.6 +++ dia.spec 31 Mar 2006 18:15:44 -0000 1.7 @@ -1,40 +1,23 @@ -%define pango_version 1.1.5 -%define freetype_version 2.0.9 -%define libxml2_version 2.3.9 - Name: dia -Summary: A diagram drawing program. -Version: 0.94 -Release: 19 +Version: 0.95 +%define pre pre7 +Release: 0.%{pre}.1%{?dist} Epoch: 1 -Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2 +Summary: A diagram drawing program. Group: Applications/Multimedia License: GPL -URL: http://www.lysator.liu.se/~alla/dia/ +URL: http://www.gnome.org/projects/dia/ +Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}-%{pre}.tar.bz2 +Patch1: dia-0.92.2-dtd.patch +Patch2: dia-0.95-pre6-help.patch +Patch3: dia-0.94-fallbacktoxpmicons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: libxml2 >= %{libxml2_version}, pango >= %{pango_version} -Requires: glib2, gtk2, libgnome, libgnomeui, libart_lgpl, libxslt -Requires: scrollkeeper, freetype >= %{freetype_version} +BuildRequires: intltool libgnomeui-devel python-devel pygtk2-devel +BuildRequires: docbook-utils docbook-style-dsssl docbook-style-xsl Requires: /usr/share/desktop-menu-patches/redhat-diagrams.desktop Requires(post): /usr/bin/scrollkeeper-update Requires(postun): /usr/bin/scrollkeeper-update -BuildRequires: libxml2-devel >= %{libxml2_version}, intltool > 0.21 -BuildRequires: pango-devel >= %{pango_version} -BuildRequires: freetype-devel >= %{freetype_version} -BuildRequires: glib2-devel, gtk2-devel, libgnome-devel, libgnomeui-devel -BuildRequires: docbook-utils docbook-dtds docbook-style-dsssl docbook-style-xsl -BuildRequires: openjade, libpng-devel, automake17, libart_lgpl-devel, -BuildRequires: libxslt-devel, libgnome-devel - -Patch0: dia-0.94-svgimport-fix.patch -Patch1: dia-0.92.2-dtd.patch -Patch2: dia-0.94-help.patch -Patch3: dia-0.94-gcc4.patch -Patch4: dia-0.94-fallbacktoxpmicons.patch -Patch5: dia-0.94-rh165337.patch -Patch6: dia-0.94-gnomeflags.patch - %description The Dia drawing program is designed to be like the Windows(TM) Visio program. Dia can be used to draw different types of diagrams, and @@ -43,29 +26,20 @@ save diagrams to a custom file format, can load and save in .xml format, and can export to PostScript(TM). -%prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -b .svgimportfix +%prep +%setup -q -n %{name}-%{version}-%{pre} %patch1 -p1 -b .dtd %patch2 -p1 -b .help -%patch3 -p1 -b .gcc4 -%patch4 -p1 -b .fallbacktoxpmicons -%patch5 -p1 -b .rh165337 -%patch6 -p1 -b .gnomeflags +%patch3 -p1 -b .fallbacktoxpmicons +#rm doc/*/dia.1 + %build -rm doc/*/dia.1 -aclocal-1.7 -libtoolize --force -automake-1.7 -autoconf -%configure --enable-gnome --enable-db2html --with-cairo=no - -export GNOME_CFLAGS=`pkg-config --cflags libgnomeui-2.0 libgnome-2.0` -export GNOME_LIBS=`pkg-config --libs libgnomeui-2.0 libgnome-2.0` -CFLAGS=$RPM_OPT_FLAGS make +%configure --enable-gnome --enable-db2html --with-python +make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT %makeinstall @@ -94,15 +68,18 @@ # kill the plugin rm -f $RPM_BUILD_ROOT%{_libdir}/dia/libcairo* + %post scrollkeeper-update %postun scrollkeeper-update + %clean rm -fr $RPM_BUILD_ROOT + %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog KNOWN_BUGS INSTALL NEWS README TODO THANKS doc/custom-shapes doc/diagram.dtd doc/shape.dtd doc/sheet.dtd @@ -116,7 +93,14 @@ %{_datadir}/mime-info/* %{_datadir}/pixmaps/* + %changelog +* Fri Mar 31 2006 Hans de Goede 1:0.95-0.pre7.1 +- Taking over as FE maintainer (bz 185886) +- Cleanup spec to match FE packaging guidelines +- Bump to upstream 0.95-pre7 (bz 184548) +- Enable python plugin + * Tue Jan 03 2006 Caolan McNamara 1:0.94-19 - make buildable @@ -312,6 +296,3 @@ * Wed Apr 28 1999 Preston Brown - initial build for Powertools 6.0 - - - Index: sources =================================================================== RCS file: /cvs/extras/rpms/dia/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Oct 2005 10:54:39 -0000 1.1 +++ sources 31 Mar 2006 18:15:44 -0000 1.2 @@ -1 +1 @@ -63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 +c0b982162764933da17fdbfa9695408b dia-0.95-pre7.tar.bz2 --- dia-0.94-gcc4.patch DELETED --- --- dia-0.94-gnomeflags.patch DELETED --- --- dia-0.94-help.patch DELETED --- --- dia-0.94-rh165337.patch DELETED --- --- dia-0.94-svgimport-fix.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 31 18:44:56 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 11:44:56 -0700 Subject: rpms/wxGTK/devel wxGTK.spec,1.18,1.19 Message-ID: <200603311844.k2VIiwFj016573@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxGTK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16556/devel Modified Files: wxGTK.spec Log Message: mesa-*-devel -> just *-devel Index: wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- wxGTK.spec 29 Mar 2006 20:59:01 -0000 1.18 +++ wxGTK.spec 31 Mar 2006 18:44:56 -0000 1.19 @@ -6,7 +6,7 @@ Name: wxGTK Version: 2.6.3 -Release: 0%{?dist} +Release: 1%{?dist} Summary: GTK2 port of the wxWidgets GUI library # The wxWindows licence is the LGPL with a specific exemption allowing # distribution of derived binaries under any terms. (This will eventually @@ -20,7 +20,7 @@ BuildRequires: gtk2-devel, zlib-devel >= 1.1.4 BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: expat-devel, SDL-devel, libgnomeprintui22-devel -BuildRequires: mesa-libGL-devel, mesa-libGLU-devel +BuildRequires: libGL-devel, libGLU-devel %if %{withodbc} BuildRequires: unixODBC-devel %endif @@ -190,7 +190,11 @@ %endif %changelog -* Sat Mar 25 2006 Matthew Miller - 2.6.3-1 +* Fri May 31 2006 Matthwe Miller - 2.6.3-1 +- mesa-*-devel buildrequires to just *-devel, for building on FC4 and + for The Future + +* Sat Mar 25 2006 Matthew Miller - 2.6.3-0 - 2.6.3 final - remove the locale_install thing -- that was just an issue with using the release candidate. From fedora-extras-commits at redhat.com Fri Mar 31 18:46:12 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 11:46:12 -0700 Subject: rpms/wxPython/devel wxPython.spec,1.9,1.10 Message-ID: <200603311846.k2VIkEeB016606@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16589 Modified Files: wxPython.spec Log Message: mesa-*-devel -> just *-devel Index: wxPython.spec =================================================================== RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wxPython.spec 31 Mar 2006 14:13:49 -0000 1.9 +++ wxPython.spec 31 Mar 2006 18:46:12 -0000 1.10 @@ -5,7 +5,7 @@ Name: wxPython Version: 2.6.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GUI toolkit for the Python programming language @@ -17,7 +17,7 @@ BuildRequires: wxGTK-devel = 2.6.3, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel -BuildRequires: mesa-libGLU-devel +BuildRequires: libGLU-devel BuildRequires: python-devel, wxGTK-gl # packages should depend on "wxPython", not "wxPythonGTK2", but in case @@ -90,6 +90,9 @@ %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-5 +- mesa-libGLU-devel -> libGLU-devel, for FC4 and for The Future + * Fri Mar 31 2006 Matthew Miller - 2.6.3.0-4 - grr. bump relnumber. From fedora-extras-commits at redhat.com Fri Mar 31 18:58:02 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 11:58:02 -0700 Subject: rpms/dia/FC-5 dia.spec,1.6,1.7 Message-ID: <200603311858.k2VIw5rj016677@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16660 Modified Files: dia.spec Log Message: * Fri Mar 31 2006 Hans de Goede 1:0.94-20 - Taking over as new FE maintainer - Rebuild for bz 185886 Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dia.spec 3 Jan 2006 14:17:55 -0000 1.6 +++ dia.spec 31 Mar 2006 18:58:02 -0000 1.7 @@ -5,7 +5,7 @@ Name: dia Summary: A diagram drawing program. Version: 0.94 -Release: 19 +Release: 20 Epoch: 1 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2 Group: Applications/Multimedia @@ -117,6 +117,10 @@ %{_datadir}/pixmaps/* %changelog +* Fri Mar 31 2006 Hans de Goede 1:0.94-20 +- Taking over as new FE maintainer +- Rebuild for bz 185886 + * Tue Jan 03 2006 Caolan McNamara 1:0.94-19 - make buildable From fedora-extras-commits at redhat.com Fri Mar 31 19:47:01 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Fri, 31 Mar 2006 12:47:01 -0700 Subject: rpms/denyhosts/devel denyhosts-2.2-daemon-control.patch, 1.1, 1.2 denyhosts.spec, 1.30, 1.31 Message-ID: <200603311947.k2VJl3Tc018880@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18858 Modified Files: denyhosts-2.2-daemon-control.patch denyhosts.spec Log Message: * Fri Mar 31 2006 Jason L Tibbitts III - 2.2-5 - Revert renaming of the denyhosts.py script denyhosts-2.2-daemon-control.patch: Index: denyhosts-2.2-daemon-control.patch =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts-2.2-daemon-control.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts-2.2-daemon-control.patch 31 Mar 2006 02:59:32 -0000 1.1 +++ denyhosts-2.2-daemon-control.patch 31 Mar 2006 19:47:01 -0000 1.2 @@ -1,23 +1,11 @@ --- daemon-control-dist.daemon-control 2006-02-07 21:37:51.000000000 -0600 -+++ daemon-control-dist 2006-03-30 19:49:23.200435174 -0600 -@@ -11,9 +11,9 @@ - #### Edit these to suit your configuration #### - ############################################### ++++ daemon-control-dist 2006-03-31 11:14:51.816095607 -0600 +@@ -13,7 +13,7 @@ --DENYHOSTS_BIN = "/usr/bin/denyhosts.py" -+DENYHOSTS_BIN = "/usr/bin/denyhosts" + DENYHOSTS_BIN = "/usr/bin/denyhosts.py" DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts" -DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg" +DENYHOSTS_CFG = "/etc/denyhosts.conf" ############################################### -@@ -35,7 +35,7 @@ - print "Usage: %s {start [args...] | stop | restart [args...] | status | debug | condrestart [args...] }" % sys.argv[0] - print - print "For a list of valid 'args' refer to:" -- print "$ denyhosts.py --help" -+ print "$ denyhosts --help" - print - sys.exit(0) - Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- denyhosts.spec 31 Mar 2006 16:28:27 -0000 1.30 +++ denyhosts.spec 31 Mar 2006 19:47:01 -0000 1.31 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -85,9 +85,11 @@ touch %{buildroot}/%{_localstatedir}/lib/denyhosts/$i done -# RPM will byte-compile this for us if we leave the .py extension. It -# looks cleaner without it, so we'll rename it. -mv %{buildroot}/%{_bindir}/denyhosts.py %{buildroot}/%{_bindir}/denyhosts +# FC-4 and earlier won't create these automatically; create them here +# so that the %exclude below doesn't fail +touch %{buildroot}/%{_bindir}/denyhosts.pyc +touch %{buildroot}/%{_bindir}/denyhosts.pyo + %clean rm -rf %{buildroot} @@ -114,7 +116,8 @@ %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt %doc README.fedora README.txt setup.py README.contrib -%{_bindir}/denyhosts +%{_bindir}/denyhosts.py +%exclude %{_bindir}/denyhosts.py[co] %{_bindir}/denyhosts-control %{_datadir}/denyhosts @@ -147,6 +150,9 @@ %changelog +* Fri Mar 31 2006 Jason L Tibbitts III - 2.2-5 +- Revert renaming of the denyhosts.py script + * Fri Mar 31 2006 Jason L Tibbitts III - 2.2-4 - Fix permissions on plugins. From fedora-extras-commits at redhat.com Fri Mar 31 19:53:29 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 12:53:29 -0700 Subject: rpms/perl-Class-Accessor/FC-3 perl-Class-Accessor.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603311954.k2VJs1Hm019005@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18936/FC-3 Modified Files: perl-Class-Accessor.spec sources Log Message: Bump to 0.25 Index: perl-Class-Accessor.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-3/perl-Class-Accessor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Accessor.spec 9 Jan 2006 18:17:56 -0000 1.2 +++ perl-Class-Accessor.spec 31 Mar 2006 19:53:29 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Class-Accessor -Version: 0.22 +Version: 0.25 Release: 1%{?dist} Summary: Automated accessor generation Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.25-1 +- bump to 0.25 + * Mon Jan 9 2006 Tom "spot" Callaway 0.22-1 - bump to 0.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2006 18:17:56 -0000 1.3 +++ sources 31 Mar 2006 19:53:29 -0000 1.4 @@ -1 +1 @@ -6259a41d8a0cb44742f0d9a772df3156 Class-Accessor-0.22.tar.gz +c2eac6eb3678f8dcd8c16fbfd622df88 Class-Accessor-0.25.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 19:53:30 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 12:53:30 -0700 Subject: rpms/perl-Class-Accessor/FC-4 perl-Class-Accessor.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603311954.k2VJs2e2019009@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18936/FC-4 Modified Files: perl-Class-Accessor.spec sources Log Message: Bump to 0.25 Index: perl-Class-Accessor.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-4/perl-Class-Accessor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Accessor.spec 9 Jan 2006 18:18:03 -0000 1.2 +++ perl-Class-Accessor.spec 31 Mar 2006 19:53:30 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Class-Accessor -Version: 0.22 +Version: 0.25 Release: 1%{?dist} Summary: Automated accessor generation Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.25-1 +- bump to 0.25 + * Mon Jan 9 2006 Tom "spot" Callaway 0.22-1 - bump to 0.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2006 18:18:03 -0000 1.3 +++ sources 31 Mar 2006 19:53:30 -0000 1.4 @@ -1 +1 @@ -6259a41d8a0cb44742f0d9a772df3156 Class-Accessor-0.22.tar.gz +c2eac6eb3678f8dcd8c16fbfd622df88 Class-Accessor-0.25.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 19:53:30 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 12:53:30 -0700 Subject: rpms/perl-Class-Accessor/FC-5 perl-Class-Accessor.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603311954.k2VJs2e5019011@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18936/FC-5 Modified Files: perl-Class-Accessor.spec sources Log Message: Bump to 0.25 Index: perl-Class-Accessor.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-5/perl-Class-Accessor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Accessor.spec 9 Jan 2006 18:18:09 -0000 1.2 +++ perl-Class-Accessor.spec 31 Mar 2006 19:53:30 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Class-Accessor -Version: 0.22 +Version: 0.25 Release: 1%{?dist} Summary: Automated accessor generation Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.25-1 +- bump to 0.25 + * Mon Jan 9 2006 Tom "spot" Callaway 0.22-1 - bump to 0.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2006 18:18:09 -0000 1.3 +++ sources 31 Mar 2006 19:53:30 -0000 1.4 @@ -1 +1 @@ -6259a41d8a0cb44742f0d9a772df3156 Class-Accessor-0.22.tar.gz +c2eac6eb3678f8dcd8c16fbfd622df88 Class-Accessor-0.25.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 19:53:31 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 12:53:31 -0700 Subject: rpms/perl-Class-Accessor/devel .cvsignore, 1.3, 1.4 perl-Class-Accessor.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603311954.k2VJs3DD019016@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18936/devel Modified Files: .cvsignore perl-Class-Accessor.spec sources Log Message: Bump to 0.25 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jan 2006 18:18:09 -0000 1.3 +++ .cvsignore 31 Mar 2006 19:53:31 -0000 1.4 @@ -1,2 +1,3 @@ Class-Accessor-0.19.tar.gz Class-Accessor-0.22.tar.gz +Class-Accessor-0.25.tar.gz Index: perl-Class-Accessor.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/perl-Class-Accessor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Accessor.spec 9 Jan 2006 18:18:09 -0000 1.2 +++ perl-Class-Accessor.spec 31 Mar 2006 19:53:31 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Class-Accessor -Version: 0.22 +Version: 0.25 Release: 1%{?dist} Summary: Automated accessor generation Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.25-1 +- bump to 0.25 + * Mon Jan 9 2006 Tom "spot" Callaway 0.22-1 - bump to 0.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2006 18:18:09 -0000 1.3 +++ sources 31 Mar 2006 19:53:31 -0000 1.4 @@ -1 +1 @@ -6259a41d8a0cb44742f0d9a772df3156 Class-Accessor-0.22.tar.gz +c2eac6eb3678f8dcd8c16fbfd622df88 Class-Accessor-0.25.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:08:17 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:08:17 -0700 Subject: rpms/perl-Class-DBI-Pg/FC-3 perl-Class-DBI-Pg.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603312008.k2VK8nKM021291@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Pg/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21220/FC-3 Modified Files: perl-Class-DBI-Pg.spec sources Log Message: Bump to 0.08 Index: perl-Class-DBI-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-3/perl-Class-DBI-Pg.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-DBI-Pg.spec 8 Sep 2005 18:30:12 -0000 1.1 +++ perl-Class-DBI-Pg.spec 31 Mar 2006 20:08:17 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-Pg -Version: 0.06 -Release: 3%{?dist} +Version: 0.08 +Release: 1%{?dist} Summary: Class::DBI extension for PostgreSQL Group: Development/Libraries License: GPL or Artistic @@ -46,6 +46,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.08-1 +- bump to 0.08 + * Fri Sep 2 2005 Paul Howarth 0.06-3 - remove redundant BR: perl - honor %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Sep 2005 18:30:12 -0000 1.2 +++ sources 31 Mar 2006 20:08:17 -0000 1.3 @@ -1 +1 @@ -c68f3de33841ecb4c8a577fb63d4ff1e Class-DBI-Pg-0.06.tar.gz +e6247928d20ec094a1052a534295bc5a Class-DBI-Pg-0.08.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:08:18 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:08:18 -0700 Subject: rpms/perl-Class-DBI-Pg/FC-4 perl-Class-DBI-Pg.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603312008.k2VK8oQP021295@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Pg/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21220/FC-4 Modified Files: perl-Class-DBI-Pg.spec sources Log Message: Bump to 0.08 Index: perl-Class-DBI-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-4/perl-Class-DBI-Pg.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-DBI-Pg.spec 8 Sep 2005 18:30:12 -0000 1.1 +++ perl-Class-DBI-Pg.spec 31 Mar 2006 20:08:18 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-Pg -Version: 0.06 -Release: 3%{?dist} +Version: 0.08 +Release: 1%{?dist} Summary: Class::DBI extension for PostgreSQL Group: Development/Libraries License: GPL or Artistic @@ -46,6 +46,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.08-1 +- bump to 0.08 + * Fri Sep 2 2005 Paul Howarth 0.06-3 - remove redundant BR: perl - honor %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Sep 2005 18:30:12 -0000 1.2 +++ sources 31 Mar 2006 20:08:18 -0000 1.3 @@ -1 +1 @@ -c68f3de33841ecb4c8a577fb63d4ff1e Class-DBI-Pg-0.06.tar.gz +e6247928d20ec094a1052a534295bc5a Class-DBI-Pg-0.08.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:08:23 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:08:23 -0700 Subject: rpms/perl-Class-DBI-Pg/FC-5 perl-Class-DBI-Pg.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603312008.k2VK8tTp021299@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Pg/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21220/FC-5 Modified Files: perl-Class-DBI-Pg.spec sources Log Message: Bump to 0.08 Index: perl-Class-DBI-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-5/perl-Class-DBI-Pg.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-DBI-Pg.spec 8 Sep 2005 18:30:12 -0000 1.1 +++ perl-Class-DBI-Pg.spec 31 Mar 2006 20:08:23 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-Pg -Version: 0.06 -Release: 3%{?dist} +Version: 0.08 +Release: 1%{?dist} Summary: Class::DBI extension for PostgreSQL Group: Development/Libraries License: GPL or Artistic @@ -46,6 +46,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.08-1 +- bump to 0.08 + * Fri Sep 2 2005 Paul Howarth 0.06-3 - remove redundant BR: perl - honor %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Sep 2005 18:30:12 -0000 1.2 +++ sources 31 Mar 2006 20:08:23 -0000 1.3 @@ -1 +1 @@ -c68f3de33841ecb4c8a577fb63d4ff1e Class-DBI-Pg-0.06.tar.gz +e6247928d20ec094a1052a534295bc5a Class-DBI-Pg-0.08.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:08:24 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:08:24 -0700 Subject: rpms/perl-Class-DBI-Pg/devel .cvsignore, 1.2, 1.3 perl-Class-DBI-Pg.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603312009.k2VK8uCp021304@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Pg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21220/devel Modified Files: .cvsignore perl-Class-DBI-Pg.spec sources Log Message: Bump to 0.08 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Sep 2005 18:30:12 -0000 1.2 +++ .cvsignore 31 Mar 2006 20:08:24 -0000 1.3 @@ -1 +1,2 @@ Class-DBI-Pg-0.06.tar.gz +Class-DBI-Pg-0.08.tar.gz Index: perl-Class-DBI-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/devel/perl-Class-DBI-Pg.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-DBI-Pg.spec 8 Sep 2005 18:30:12 -0000 1.1 +++ perl-Class-DBI-Pg.spec 31 Mar 2006 20:08:24 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-Pg -Version: 0.06 -Release: 3%{?dist} +Version: 0.08 +Release: 1%{?dist} Summary: Class::DBI extension for PostgreSQL Group: Development/Libraries License: GPL or Artistic @@ -46,6 +46,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.08-1 +- bump to 0.08 + * Fri Sep 2 2005 Paul Howarth 0.06-3 - remove redundant BR: perl - honor %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Sep 2005 18:30:12 -0000 1.2 +++ sources 31 Mar 2006 20:08:24 -0000 1.3 @@ -1 +1 @@ -c68f3de33841ecb4c8a577fb63d4ff1e Class-DBI-Pg-0.06.tar.gz +e6247928d20ec094a1052a534295bc5a Class-DBI-Pg-0.08.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:21:56 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:21:56 -0700 Subject: rpms/perl-Image-ExifTool/FC-5 perl-Image-ExifTool.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312021.k2VKLwPQ021607@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21533/FC-5 Modified Files: perl-Image-ExifTool.spec sources Log Message: Bump to 6.09 Index: perl-Image-ExifTool.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-5/perl-Image-ExifTool.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Image-ExifTool.spec 10 Jan 2006 15:53:08 -0000 1.2 +++ perl-Image-ExifTool.spec 31 Mar 2006 20:21:56 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Image-ExifTool -Version: 5.89 +Version: 6.09 Release: 1%{?dist} License: GPL or Artistic Group: Applications/Multimedia @@ -49,6 +49,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 6.09-1 +- bump to 6.09 + * Tue Jan 10 2006 Tom "spot" Callaway 5.89-1 - bump to 5.89 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Jan 2006 15:53:08 -0000 1.3 +++ sources 31 Mar 2006 20:21:56 -0000 1.4 @@ -1 +1 @@ -93c9a877256b0a2c2847346528bb18ca Image-ExifTool-5.89.tar.gz +66dc6aa550799a879c66f4ceba348d6d Image-ExifTool-6.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:21:55 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:21:55 -0700 Subject: rpms/perl-Image-ExifTool/FC-4 perl-Image-ExifTool.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312022.k2VKLvPX021604@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21533/FC-4 Modified Files: perl-Image-ExifTool.spec sources Log Message: Bump to 6.09 Index: perl-Image-ExifTool.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/perl-Image-ExifTool.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Image-ExifTool.spec 10 Jan 2006 15:53:02 -0000 1.2 +++ perl-Image-ExifTool.spec 31 Mar 2006 20:21:55 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Image-ExifTool -Version: 5.89 +Version: 6.09 Release: 1%{?dist} License: GPL or Artistic Group: Applications/Multimedia @@ -49,6 +49,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 6.09-1 +- bump to 6.09 + * Tue Jan 10 2006 Tom "spot" Callaway 5.89-1 - bump to 5.89 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Jan 2006 15:53:02 -0000 1.3 +++ sources 31 Mar 2006 20:21:55 -0000 1.4 @@ -1 +1 @@ -93c9a877256b0a2c2847346528bb18ca Image-ExifTool-5.89.tar.gz +66dc6aa550799a879c66f4ceba348d6d Image-ExifTool-6.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:21:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:21:57 -0700 Subject: rpms/perl-Image-ExifTool/devel .cvsignore, 1.3, 1.4 perl-Image-ExifTool.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312021.k2VKLxJ8021613@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21533/devel Modified Files: .cvsignore perl-Image-ExifTool.spec sources Log Message: Bump to 6.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Jan 2006 15:53:08 -0000 1.3 +++ .cvsignore 31 Mar 2006 20:21:56 -0000 1.4 @@ -1,2 +1,3 @@ Image-ExifTool-5.53.tar.gz Image-ExifTool-5.89.tar.gz +Image-ExifTool-6.09.tar.gz Index: perl-Image-ExifTool.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/perl-Image-ExifTool.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Image-ExifTool.spec 10 Jan 2006 15:53:08 -0000 1.2 +++ perl-Image-ExifTool.spec 31 Mar 2006 20:21:56 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Image-ExifTool -Version: 5.89 +Version: 6.09 Release: 1%{?dist} License: GPL or Artistic Group: Applications/Multimedia @@ -49,6 +49,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 6.09-1 +- bump to 6.09 + * Tue Jan 10 2006 Tom "spot" Callaway 5.89-1 - bump to 5.89 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Jan 2006 15:53:08 -0000 1.3 +++ sources 31 Mar 2006 20:21:56 -0000 1.4 @@ -1 +1 @@ -93c9a877256b0a2c2847346528bb18ca Image-ExifTool-5.89.tar.gz +66dc6aa550799a879c66f4ceba348d6d Image-ExifTool-6.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:21:55 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:21:55 -0700 Subject: rpms/perl-Image-ExifTool/FC-3 perl-Image-ExifTool.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312022.k2VKMR09021619@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21533/FC-3 Modified Files: perl-Image-ExifTool.spec sources Log Message: Bump to 6.09 Index: perl-Image-ExifTool.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/perl-Image-ExifTool.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Image-ExifTool.spec 10 Jan 2006 15:52:56 -0000 1.2 +++ perl-Image-ExifTool.spec 31 Mar 2006 20:21:54 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Image-ExifTool -Version: 5.89 +Version: 6.09 Release: 1%{?dist} License: GPL or Artistic Group: Applications/Multimedia @@ -49,6 +49,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 6.09-1 +- bump to 6.09 + * Tue Jan 10 2006 Tom "spot" Callaway 5.89-1 - bump to 5.89 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Jan 2006 15:52:56 -0000 1.3 +++ sources 31 Mar 2006 20:21:54 -0000 1.4 @@ -1 +1 @@ -93c9a877256b0a2c2847346528bb18ca Image-ExifTool-5.89.tar.gz +66dc6aa550799a879c66f4ceba348d6d Image-ExifTool-6.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:29:37 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:29:37 -0700 Subject: rpms/perl-SQL-Abstract/FC-3 perl-SQL-Abstract.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312030.k2VKU9xh021911@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21841/FC-3 Modified Files: perl-SQL-Abstract.spec sources Log Message: Bump to 1.21 Index: perl-SQL-Abstract.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-3/perl-SQL-Abstract.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SQL-Abstract.spec 5 Jan 2006 17:35:13 -0000 1.2 +++ perl-SQL-Abstract.spec 31 Mar 2006 20:29:37 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-SQL-Abstract -Version: 1.20 +Version: 1.21 Release: 1%{?dist} Summary: Generate SQL from Perl data structures Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 1.21-1 +- bump to 1.21 + * Thu Jan 5 2006 Tom "spot" Callaway 1.20-1 - bump to 1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 17:35:13 -0000 1.3 +++ sources 31 Mar 2006 20:29:37 -0000 1.4 @@ -1 +1 @@ -0a6fd0dab5d69f5ae800c4f39caa5cbf SQL-Abstract-1.20.tar.gz +a77ef9ee19ce095681189aa259db920a SQL-Abstract-1.21.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:29:38 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:29:38 -0700 Subject: rpms/perl-SQL-Abstract/FC-5 perl-SQL-Abstract.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312030.k2VKUAxs021917@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21841/FC-5 Modified Files: perl-SQL-Abstract.spec sources Log Message: Bump to 1.21 Index: perl-SQL-Abstract.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-5/perl-SQL-Abstract.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SQL-Abstract.spec 5 Jan 2006 17:35:25 -0000 1.2 +++ perl-SQL-Abstract.spec 31 Mar 2006 20:29:38 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-SQL-Abstract -Version: 1.20 +Version: 1.21 Release: 1%{?dist} Summary: Generate SQL from Perl data structures Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 1.21-1 +- bump to 1.21 + * Thu Jan 5 2006 Tom "spot" Callaway 1.20-1 - bump to 1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 17:35:25 -0000 1.3 +++ sources 31 Mar 2006 20:29:38 -0000 1.4 @@ -1 +1 @@ -0a6fd0dab5d69f5ae800c4f39caa5cbf SQL-Abstract-1.20.tar.gz +a77ef9ee19ce095681189aa259db920a SQL-Abstract-1.21.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:29:39 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:29:39 -0700 Subject: rpms/perl-SQL-Abstract/devel .cvsignore, 1.3, 1.4 perl-SQL-Abstract.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312030.k2VKUBlO021922@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21841/devel Modified Files: .cvsignore perl-SQL-Abstract.spec sources Log Message: Bump to 1.21 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jan 2006 17:35:25 -0000 1.3 +++ .cvsignore 31 Mar 2006 20:29:39 -0000 1.4 @@ -1,2 +1,3 @@ SQL-Abstract-1.19.tar.gz SQL-Abstract-1.20.tar.gz +SQL-Abstract-1.21.tar.gz Index: perl-SQL-Abstract.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/perl-SQL-Abstract.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SQL-Abstract.spec 5 Jan 2006 17:35:25 -0000 1.2 +++ perl-SQL-Abstract.spec 31 Mar 2006 20:29:39 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-SQL-Abstract -Version: 1.20 +Version: 1.21 Release: 1%{?dist} Summary: Generate SQL from Perl data structures Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 1.21-1 +- bump to 1.21 + * Thu Jan 5 2006 Tom "spot" Callaway 1.20-1 - bump to 1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 17:35:25 -0000 1.3 +++ sources 31 Mar 2006 20:29:39 -0000 1.4 @@ -1 +1 @@ -0a6fd0dab5d69f5ae800c4f39caa5cbf SQL-Abstract-1.20.tar.gz +a77ef9ee19ce095681189aa259db920a SQL-Abstract-1.21.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:29:38 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:29:38 -0700 Subject: rpms/perl-SQL-Abstract/FC-4 perl-SQL-Abstract.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312030.k2VKUAbj021915@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21841/FC-4 Modified Files: perl-SQL-Abstract.spec sources Log Message: Bump to 1.21 Index: perl-SQL-Abstract.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-4/perl-SQL-Abstract.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SQL-Abstract.spec 5 Jan 2006 17:35:19 -0000 1.2 +++ perl-SQL-Abstract.spec 31 Mar 2006 20:29:38 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-SQL-Abstract -Version: 1.20 +Version: 1.21 Release: 1%{?dist} Summary: Generate SQL from Perl data structures Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 1.21-1 +- bump to 1.21 + * Thu Jan 5 2006 Tom "spot" Callaway 1.20-1 - bump to 1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 17:35:19 -0000 1.3 +++ sources 31 Mar 2006 20:29:38 -0000 1.4 @@ -1 +1 @@ -0a6fd0dab5d69f5ae800c4f39caa5cbf SQL-Abstract-1.20.tar.gz +a77ef9ee19ce095681189aa259db920a SQL-Abstract-1.21.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:35:19 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:35:19 -0700 Subject: rpms/perl-Spreadsheet-WriteExcel/FC-5 perl-Spreadsheet-WriteExcel.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603312035.k2VKZLSJ022158@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22089/FC-5 Modified Files: perl-Spreadsheet-WriteExcel.spec sources Log Message: Bump to 2.16 Index: perl-Spreadsheet-WriteExcel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-5/perl-Spreadsheet-WriteExcel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Spreadsheet-WriteExcel.spec 10 Jan 2006 18:15:33 -0000 1.8 +++ perl-Spreadsheet-WriteExcel.spec 31 Mar 2006 20:35:19 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Spreadsheet-WriteExcel -Version: 2.15 +Version: 2.16 Release: 1%{?dist} Summary: Write formatted text and numbers to a cross-platform Excel binary file @@ -63,6 +63,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 2.16-1 +- bump to 2.16 + * Tue Jan 10 2006 Tom "spot" Callaway 2.15-1 - bump to 2.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Jan 2006 18:15:33 -0000 1.5 +++ sources 31 Mar 2006 20:35:19 -0000 1.6 @@ -1 +1 @@ -abcb3c39fc48febbbc2a3094bb2933c9 Spreadsheet-WriteExcel-2.15.tar.gz +c5609e4f001fee7164d6d20b4e28ac1d Spreadsheet-WriteExcel-2.16.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:35:19 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:35:19 -0700 Subject: rpms/perl-Spreadsheet-WriteExcel/devel .cvsignore, 1.5, 1.6 perl-Spreadsheet-WriteExcel.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603312035.k2VKZLhx022164@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22089/devel Modified Files: .cvsignore perl-Spreadsheet-WriteExcel.spec sources Log Message: Bump to 2.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Jan 2006 18:15:33 -0000 1.5 +++ .cvsignore 31 Mar 2006 20:35:19 -0000 1.6 @@ -1,2 +1,3 @@ Spreadsheet-WriteExcel-2.14.tar.gz Spreadsheet-WriteExcel-2.15.tar.gz +Spreadsheet-WriteExcel-2.16.tar.gz Index: perl-Spreadsheet-WriteExcel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/perl-Spreadsheet-WriteExcel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Spreadsheet-WriteExcel.spec 10 Jan 2006 18:15:33 -0000 1.8 +++ perl-Spreadsheet-WriteExcel.spec 31 Mar 2006 20:35:19 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Spreadsheet-WriteExcel -Version: 2.15 +Version: 2.16 Release: 1%{?dist} Summary: Write formatted text and numbers to a cross-platform Excel binary file @@ -63,6 +63,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 2.16-1 +- bump to 2.16 + * Tue Jan 10 2006 Tom "spot" Callaway 2.15-1 - bump to 2.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Jan 2006 18:15:33 -0000 1.5 +++ sources 31 Mar 2006 20:35:19 -0000 1.6 @@ -1 +1 @@ -abcb3c39fc48febbbc2a3094bb2933c9 Spreadsheet-WriteExcel-2.15.tar.gz +c5609e4f001fee7164d6d20b4e28ac1d Spreadsheet-WriteExcel-2.16.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:35:18 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:35:18 -0700 Subject: rpms/perl-Spreadsheet-WriteExcel/FC-4 perl-Spreadsheet-WriteExcel.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603312035.k2VKZK5H022155@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22089/FC-4 Modified Files: perl-Spreadsheet-WriteExcel.spec sources Log Message: Bump to 2.16 Index: perl-Spreadsheet-WriteExcel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4/perl-Spreadsheet-WriteExcel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Spreadsheet-WriteExcel.spec 10 Jan 2006 18:15:27 -0000 1.8 +++ perl-Spreadsheet-WriteExcel.spec 31 Mar 2006 20:35:18 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Spreadsheet-WriteExcel -Version: 2.15 +Version: 2.16 Release: 1%{?dist} Summary: Write formatted text and numbers to a cross-platform Excel binary file @@ -63,6 +63,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 2.16-1 +- bump to 2.16 + * Tue Jan 10 2006 Tom "spot" Callaway 2.15-1 - bump to 2.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Jan 2006 18:15:27 -0000 1.5 +++ sources 31 Mar 2006 20:35:18 -0000 1.6 @@ -1 +1 @@ -abcb3c39fc48febbbc2a3094bb2933c9 Spreadsheet-WriteExcel-2.15.tar.gz +c5609e4f001fee7164d6d20b4e28ac1d Spreadsheet-WriteExcel-2.16.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:35:17 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:35:17 -0700 Subject: rpms/perl-Spreadsheet-WriteExcel/FC-3 perl-Spreadsheet-WriteExcel.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200603312035.k2VKZnw6022179@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22089/FC-3 Modified Files: perl-Spreadsheet-WriteExcel.spec sources Log Message: Bump to 2.16 Index: perl-Spreadsheet-WriteExcel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3/perl-Spreadsheet-WriteExcel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Spreadsheet-WriteExcel.spec 10 Jan 2006 18:15:08 -0000 1.8 +++ perl-Spreadsheet-WriteExcel.spec 31 Mar 2006 20:35:17 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Spreadsheet-WriteExcel -Version: 2.15 +Version: 2.16 Release: 1%{?dist} Summary: Write formatted text and numbers to a cross-platform Excel binary file @@ -63,6 +63,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 2.16-1 +- bump to 2.16 + * Tue Jan 10 2006 Tom "spot" Callaway 2.15-1 - bump to 2.15 @@ -71,7 +74,6 @@ - Add a complete URL for Source0 - Beautifying (fix identations and make it look more like the spectemplate-perl.spec) -- Merge with devel branch * Tue May 10 2005 Tom "spot" Callaway 2.13-3 - more spec cleanups Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Jan 2006 18:15:08 -0000 1.4 +++ sources 31 Mar 2006 20:35:17 -0000 1.5 @@ -1 +1 @@ -abcb3c39fc48febbbc2a3094bb2933c9 Spreadsheet-WriteExcel-2.15.tar.gz +c5609e4f001fee7164d6d20b4e28ac1d Spreadsheet-WriteExcel-2.16.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:39:07 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:39:07 -0700 Subject: rpms/perl-version/FC-5 perl-version.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200603312039.k2VKd9Rj022420@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-version/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353/FC-5 Modified Files: perl-version.spec sources Log Message: Bump to 0.59 Index: perl-version.spec =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-5/perl-version.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-version.spec 28 Feb 2006 23:47:09 -0000 1.2 +++ perl-version.spec 31 Mar 2006 20:39:07 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-version -Version: 0.57 +Version: 0.59 Release: 1%{?dist} Summary: Perl extension for Version Objects Group: Development/Libraries @@ -48,6 +48,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.59-1 +- bump to 0.59 + * Tue Feb 28 2006 Tom "spot" Callaway 0.57-1 - bump to 0.57 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Feb 2006 23:47:09 -0000 1.3 +++ sources 31 Mar 2006 20:39:07 -0000 1.4 @@ -1 +1,2 @@ 93f3ced0c0036370d6aafd3273fb9091 version-0.57.tar.gz +4f5011ef5cae442dd972ce39e3c03a33 version-0.59.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:39:07 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:39:07 -0700 Subject: rpms/perl-version/devel .cvsignore, 1.3, 1.4 perl-version.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312039.k2VKd9fs022426@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-version/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353/devel Modified Files: .cvsignore perl-version.spec sources Log Message: Bump to 0.59 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-version/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Feb 2006 23:47:09 -0000 1.3 +++ .cvsignore 31 Mar 2006 20:39:07 -0000 1.4 @@ -1,2 +1,3 @@ version-0.51.tar.gz version-0.57.tar.gz +version-0.59.tar.gz Index: perl-version.spec =================================================================== RCS file: /cvs/extras/rpms/perl-version/devel/perl-version.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-version.spec 28 Feb 2006 23:47:09 -0000 1.2 +++ perl-version.spec 31 Mar 2006 20:39:07 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-version -Version: 0.57 +Version: 0.59 Release: 1%{?dist} Summary: Perl extension for Version Objects Group: Development/Libraries @@ -48,6 +48,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.59-1 +- bump to 0.59 + * Tue Feb 28 2006 Tom "spot" Callaway 0.57-1 - bump to 0.57 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-version/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Feb 2006 23:47:09 -0000 1.3 +++ sources 31 Mar 2006 20:39:07 -0000 1.4 @@ -1 +1,2 @@ 93f3ced0c0036370d6aafd3273fb9091 version-0.57.tar.gz +4f5011ef5cae442dd972ce39e3c03a33 version-0.59.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:39:00 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:39:00 -0700 Subject: rpms/perl-version/FC-3 perl-version.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200603312039.k2VKdWKW022430@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-version/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353/FC-3 Modified Files: perl-version.spec sources Log Message: Bump to 0.59 Index: perl-version.spec =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-3/perl-version.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-version.spec 28 Feb 2006 23:46:57 -0000 1.2 +++ perl-version.spec 31 Mar 2006 20:39:00 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-version -Version: 0.57 +Version: 0.59 Release: 1%{?dist} Summary: Perl extension for Version Objects Group: Development/Libraries @@ -48,6 +48,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.59-1 +- bump to 0.59 + * Tue Feb 28 2006 Tom "spot" Callaway 0.57-1 - bump to 0.57 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Feb 2006 23:46:57 -0000 1.3 +++ sources 31 Mar 2006 20:39:00 -0000 1.4 @@ -1 +1,2 @@ 93f3ced0c0036370d6aafd3273fb9091 version-0.57.tar.gz +4f5011ef5cae442dd972ce39e3c03a33 version-0.59.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:39:01 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:39:01 -0700 Subject: rpms/perl-version/FC-4 perl-version.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200603312039.k2VKdXVv022434@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-version/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353/FC-4 Modified Files: perl-version.spec sources Log Message: Bump to 0.59 Index: perl-version.spec =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-4/perl-version.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-version.spec 28 Feb 2006 23:47:03 -0000 1.2 +++ perl-version.spec 31 Mar 2006 20:39:01 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-version -Version: 0.57 +Version: 0.59 Release: 1%{?dist} Summary: Perl extension for Version Objects Group: Development/Libraries @@ -48,6 +48,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.59-1 +- bump to 0.59 + * Tue Feb 28 2006 Tom "spot" Callaway 0.57-1 - bump to 0.57 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Feb 2006 23:47:03 -0000 1.3 +++ sources 31 Mar 2006 20:39:01 -0000 1.4 @@ -1 +1,2 @@ 93f3ced0c0036370d6aafd3273fb9091 version-0.57.tar.gz +4f5011ef5cae442dd972ce39e3c03a33 version-0.59.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:44:46 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 13:44:46 -0700 Subject: rpms/gtkterm/devel gtkterm-0.99.5-fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gtkterm.desktop, 1.1, 1.2 gtkterm.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200603312044.k2VKimoM022638@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gtkterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22611 Modified Files: .cvsignore gtkterm.desktop gtkterm.spec sources Added Files: gtkterm-0.99.5-fixes.patch Log Message: * Fri Mar 31 2006 Hans de Goede 0.99.5-1 - Taking over as new FE maintainer - Bump to new upstream 0.99.5 gtkterm-0.99.5-fixes.patch: --- NEW FILE gtkterm-0.99.5-fixes.patch --- --- gtkterm-0.99.5/src/macros.c~ 2006-03-31 22:04:21.000000000 +0200 +++ gtkterm-0.99.5/src/macros.c 2006-03-31 22:04:21.000000000 +0200 @@ -59,7 +59,7 @@ guchar a; guint val_read; - string = macros[(gint)number].action; + string = macros[(long)number].action; length = strlen(string); for(i = 0; i < length; i++) @@ -140,7 +140,7 @@ } } - str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(gint)number].shortcut); + str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(long)number].shortcut); Put_temp_message(str, 800); g_free(str); } @@ -160,7 +160,7 @@ void add_shortcuts(void) { - gint i = 0; + long i = 0; guint acc_key; GdkModifierType mod; --- gtkterm-0.99.5/src/fichier.c~ 2006-03-31 22:02:49.000000000 +0200 +++ gtkterm-0.99.5/src/fichier.c 2006-03-31 22:02:49.000000000 +0200 @@ -153,7 +153,7 @@ else { g_free(str); - str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror(errno)); show_message(str, MSG_ERR); } return FALSE; @@ -202,7 +202,7 @@ { /* Problem while writing, stop file transfer */ g_free(str); - str = g_strdup_printf(_("Cannot write file %s\n"), strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot write file %s\n"), strerror(errno)); show_message(str, MSG_ERR); close_all(); return; @@ -298,7 +298,7 @@ if(Fic == NULL) { g_free(str); - str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror(errno)); show_message(str, MSG_ERR); } else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:31:34 -0000 1.2 +++ .cvsignore 31 Mar 2006 20:44:46 -0000 1.3 @@ -1 +1,2 @@ -gtkterm-0.99.4.tar.gz +gtkterm-0.99.5.tar.gz +gtkterm.png Index: gtkterm.desktop =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/gtkterm.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtkterm.desktop 8 Nov 2004 04:31:34 -0000 1.1 +++ gtkterm.desktop 31 Mar 2006 20:44:46 -0000 1.2 @@ -1,7 +1,12 @@ [Desktop Entry] +Encoding=UTF-8 Name=GTKTerm -Comment=Serial port terminal +GenericName=Serial port terminalemulator +Comment=Targeted at developers, with hexview, etc. Exec=gtkterm +Icon=gtkterm.png Terminal=false +StartupNotify=false Type=Application -Categories=Utility;Application; +Categories=Application;Utility; +Version=0.99.5 Index: gtkterm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/gtkterm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtkterm.spec 2 Mar 2006 21:30:15 -0000 1.7 +++ gtkterm.spec 31 Mar 2006 20:44:46 -0000 1.8 @@ -1,59 +1,81 @@ Name: gtkterm -Version: 0.99.4 -Release: 4 - +Version: 0.99.5 +Release: 1%{?dist} Summary: Serial port terminal - Group: Applications/Communications License: GPL URL: http://www.jls-info.com/julien/linux -Source0: http://www.jls-info.com/julien/linux/gtkterm-0.99.4.tar.gz +Source0: http://www.jls-info.com/julien/linux/%{name}-%{version}.tar.gz Source1: gtkterm.desktop +Source2: gtkterm.png +Patch0: gtkterm-0.99.5-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: gtk2-devel gettext bison desktop-file-utils vte-devel zlib-devel ncurses-devel +BuildRequires: gtk2-devel gettext bison desktop-file-utils vte-devel +BuildRequires: zlib-devel ncurses-devel %description Simple GUI terminal used to communicate with the serial port. Similar to minicom or hyperterminal. -%prep -cat< 0.99.5-1 +- Taking over as new FE maintainer +- Bump to new upstream 0.99.5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:31:34 -0000 1.2 +++ sources 31 Mar 2006 20:44:46 -0000 1.3 @@ -1 +1,2 @@ -5539c7e2aaf56bfd551a72552f1ff146 gtkterm-0.99.4.tar.gz +007ce7810466396b6452dea9c57c5f02 gtkterm-0.99.5.tar.gz +9e25fa8914f415a1d9f6d60801752b6a gtkterm.png From fedora-extras-commits at redhat.com Fri Mar 31 20:47:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 13:47:33 -0700 Subject: owners owners.list,1.784,1.785 Message-ID: <200603312047.k2VKlZoG022787@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22770/owners Modified Files: owners.list Log Message: Taking ownership of gtkterm Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.784 retrieving revision 1.785 diff -u -r1.784 -r1.785 --- owners.list 31 Mar 2006 08:31:46 -0000 1.784 +++ owners.list 31 Mar 2006 20:47:33 -0000 1.785 @@ -412,7 +412,7 @@ Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|gtkterm|Serial port terminal|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +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|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|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| From fedora-extras-commits at redhat.com Fri Mar 31 20:49:41 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 13:49:41 -0700 Subject: rpms/gtkterm/FC-5 gtkterm-0.99.5-fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gtkterm.desktop, 1.1, 1.2 gtkterm.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200603312049.k2VKnhEw022833@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gtkterm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22807 Modified Files: .cvsignore gtkterm.desktop gtkterm.spec sources Added Files: gtkterm-0.99.5-fixes.patch Log Message: * Fri Mar 31 2006 Hans de Goede 0.99.5-1 - Taking over as new FE maintainer - Bump to new upstream 0.99.5 gtkterm-0.99.5-fixes.patch: --- NEW FILE gtkterm-0.99.5-fixes.patch --- --- gtkterm-0.99.5/src/macros.c~ 2006-03-31 22:04:21.000000000 +0200 +++ gtkterm-0.99.5/src/macros.c 2006-03-31 22:04:21.000000000 +0200 @@ -59,7 +59,7 @@ guchar a; guint val_read; - string = macros[(gint)number].action; + string = macros[(long)number].action; length = strlen(string); for(i = 0; i < length; i++) @@ -140,7 +140,7 @@ } } - str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(gint)number].shortcut); + str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(long)number].shortcut); Put_temp_message(str, 800); g_free(str); } @@ -160,7 +160,7 @@ void add_shortcuts(void) { - gint i = 0; + long i = 0; guint acc_key; GdkModifierType mod; --- gtkterm-0.99.5/src/fichier.c~ 2006-03-31 22:02:49.000000000 +0200 +++ gtkterm-0.99.5/src/fichier.c 2006-03-31 22:02:49.000000000 +0200 @@ -153,7 +153,7 @@ else { g_free(str); - str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror(errno)); show_message(str, MSG_ERR); } return FALSE; @@ -202,7 +202,7 @@ { /* Problem while writing, stop file transfer */ g_free(str); - str = g_strdup_printf(_("Cannot write file %s\n"), strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot write file %s\n"), strerror(errno)); show_message(str, MSG_ERR); close_all(); return; @@ -298,7 +298,7 @@ if(Fic == NULL) { g_free(str); - str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror(errno)); show_message(str, MSG_ERR); } else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkterm/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:31:34 -0000 1.2 +++ .cvsignore 31 Mar 2006 20:49:41 -0000 1.3 @@ -1 +1,2 @@ -gtkterm-0.99.4.tar.gz +gtkterm-0.99.5.tar.gz +gtkterm.png Index: gtkterm.desktop =================================================================== RCS file: /cvs/extras/rpms/gtkterm/FC-5/gtkterm.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtkterm.desktop 8 Nov 2004 04:31:34 -0000 1.1 +++ gtkterm.desktop 31 Mar 2006 20:49:41 -0000 1.2 @@ -1,7 +1,12 @@ [Desktop Entry] +Encoding=UTF-8 Name=GTKTerm -Comment=Serial port terminal +GenericName=Serial port terminalemulator +Comment=Targeted at developers, with hexview, etc. Exec=gtkterm +Icon=gtkterm.png Terminal=false +StartupNotify=false Type=Application -Categories=Utility;Application; +Categories=Application;Utility; +Version=0.99.5 Index: gtkterm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkterm/FC-5/gtkterm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtkterm.spec 2 Mar 2006 21:30:15 -0000 1.7 +++ gtkterm.spec 31 Mar 2006 20:49:41 -0000 1.8 @@ -1,59 +1,81 @@ Name: gtkterm -Version: 0.99.4 -Release: 4 - +Version: 0.99.5 +Release: 1%{?dist} Summary: Serial port terminal - Group: Applications/Communications License: GPL URL: http://www.jls-info.com/julien/linux -Source0: http://www.jls-info.com/julien/linux/gtkterm-0.99.4.tar.gz +Source0: http://www.jls-info.com/julien/linux/%{name}-%{version}.tar.gz Source1: gtkterm.desktop +Source2: gtkterm.png +Patch0: gtkterm-0.99.5-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: gtk2-devel gettext bison desktop-file-utils vte-devel zlib-devel ncurses-devel +BuildRequires: gtk2-devel gettext bison desktop-file-utils vte-devel +BuildRequires: zlib-devel ncurses-devel %description Simple GUI terminal used to communicate with the serial port. Similar to minicom or hyperterminal. -%prep -cat< 0.99.5-1 +- Taking over as new FE maintainer +- Bump to new upstream 0.99.5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkterm/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:31:34 -0000 1.2 +++ sources 31 Mar 2006 20:49:41 -0000 1.3 @@ -1 +1,2 @@ -5539c7e2aaf56bfd551a72552f1ff146 gtkterm-0.99.4.tar.gz +007ce7810466396b6452dea9c57c5f02 gtkterm-0.99.5.tar.gz +9e25fa8914f415a1d9f6d60801752b6a gtkterm.png From fedora-extras-commits at redhat.com Fri Mar 31 21:00:08 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 31 Mar 2006 14:00:08 -0700 Subject: rpms/apmud/devel apmud.spec,1.4,1.5 Message-ID: <200603312100.k2VL0Apw022944@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/apmud/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22927 Modified Files: apmud.spec Log Message: fix buildrequires Index: apmud.spec =================================================================== RCS file: /cvs/extras/rpms/apmud/devel/apmud.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apmud.spec 1 May 2005 10:06:44 -0000 1.4 +++ apmud.spec 31 Mar 2006 21:00:08 -0000 1.5 @@ -15,7 +15,7 @@ License: GPL Group: Utilities/System BuildRoot: %{_tmppath}/pmud-%{version}-buildroot -BuildRequires: xorg-x11-devel +BuildRequires: libX11-devel Prereq: chkconfig Obsoletes: trackpad, pmud ExclusiveArch: ppc @@ -95,6 +95,9 @@ %{_prefix}/share/man/man8/* %changelog +* Fri Mar 31 2006 David Woodhouse 1.0.0-4 +- BR libX11-devel + * Sun May 1 2005 David Woodhouse 1.0.0-3 - BR xorg-x11-devel From fedora-extras-commits at redhat.com Fri Mar 31 21:02:37 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 31 Mar 2006 14:02:37 -0700 Subject: rpms/apmud/FC-5 apmud.spec,1.4,1.5 Message-ID: <200603312103.k2VL3BZY024981@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/apmud/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24930 Modified Files: apmud.spec Log Message: fix release Index: apmud.spec =================================================================== RCS file: /cvs/extras/rpms/apmud/FC-5/apmud.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apmud.spec 1 May 2005 10:06:44 -0000 1.4 +++ apmud.spec 31 Mar 2006 21:02:37 -0000 1.5 @@ -2,7 +2,7 @@ Name: apmud Version: 1.0.0 -Release: 3 +Release: 4%{?dist} Summary: Power management daemon for Apple laptops Source0: http://linuxppc.jvc.nl/apmud-%{version}.tgz @@ -15,7 +15,7 @@ License: GPL Group: Utilities/System BuildRoot: %{_tmppath}/pmud-%{version}-buildroot -BuildRequires: xorg-x11-devel +BuildRequires: libX11-devel Prereq: chkconfig Obsoletes: trackpad, pmud ExclusiveArch: ppc @@ -95,6 +95,9 @@ %{_prefix}/share/man/man8/* %changelog +* Fri Mar 31 2006 David Woodhouse 1.0.0-4 +- BR libX11-devel + * Sun May 1 2005 David Woodhouse 1.0.0-3 - BR xorg-x11-devel From fedora-extras-commits at redhat.com Fri Mar 31 21:03:21 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 31 Mar 2006 14:03:21 -0700 Subject: rpms/apmud/devel apmud.spec,1.5,1.6 Message-ID: <200603312103.k2VL3N5P025001@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/apmud/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24984 Modified Files: apmud.spec Log Message: fix release Index: apmud.spec =================================================================== RCS file: /cvs/extras/rpms/apmud/devel/apmud.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apmud.spec 31 Mar 2006 21:00:08 -0000 1.5 +++ apmud.spec 31 Mar 2006 21:03:21 -0000 1.6 @@ -2,7 +2,7 @@ Name: apmud Version: 1.0.0 -Release: 3 +Release: 4%{?dist} Summary: Power management daemon for Apple laptops Source0: http://linuxppc.jvc.nl/apmud-%{version}.tgz From fedora-extras-commits at redhat.com Fri Mar 31 21:03:44 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 31 Mar 2006 14:03:44 -0700 Subject: kadischi/post_install_scripts 03fstab.py, 1.2, 1.3 05fsclean.py, 1.2, 1.3 06sysconfig.py, 1.2, 1.3 Message-ID: <200603312103.k2VL3iYT025059@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25007/kadischi/post_install_scripts Modified Files: 03fstab.py 05fsclean.py 06sysconfig.py Log Message: Contributor: Toshio Kuratomi (Consistency between spaces vs. tabs), commit Index: 03fstab.py =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/03fstab.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 03fstab.py 13 Oct 2005 01:05:55 -0000 1.2 +++ 03fstab.py 31 Mar 2006 21:03:41 -0000 1.3 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys @@ -9,12 +9,12 @@ list = [] fstab = open (normalize_path ([sysdir,'/etc/fstab']) , 'r') for line in fstab: - if (line[0] != '#') and (line != '\n') and (line.find('swap') == -1) and (line.split() [1] != '/'): - list.append (line) + if (line[0] != '#') and (line != '\n') and (line.find('swap') == -1) and (line.split() [1] != '/'): + list.append (line) fstab.close() list[:0] = '/dev/loop1\t\t/\t\t\text2\tdefaults\t1 1\n' fstab = open (normalize_path ([sysdir,'/etc/fstab']) , 'w') fstab.writelines (list) -fstab.close() \ No newline at end of file +fstab.close() Index: 05fsclean.py =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/05fsclean.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 05fsclean.py 30 Mar 2006 04:29:22 -0000 1.2 +++ 05fsclean.py 31 Mar 2006 21:03:41 -0000 1.3 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys @@ -7,58 +7,58 @@ # Directories that we want to empty but not delete directories_to_be_emptied = [ - '/root', - '/proc', - '/lost+found', - '/var/gdm', - '/dev', - '/tmp', - '/var/tmp', - '/var/cache/yum', - '/mnt', - '/media', - '/boot/isolinux' - ] + '/root', + '/proc', + '/lost+found', + '/var/gdm', + '/dev', + '/tmp', + '/var/tmp', + '/var/cache/yum', + '/mnt', + '/media', + '/boot/isolinux' + ] # Directories that we want to empty of files directories_to_be_cleaned = [ - '/var/log', ## FIXME: Think this through - ] + '/var/log', ## FIXME: Think this through + ] # files that need removing files_to_be_removed = [ - '/.autofsck', - ] + '/.autofsck', + ] def clean_up_directories (rootdir, to_empty, to_clean, to_remove): - for d in to_empty: - path = os.path.normpath (rootdir + '/' + d) - if not os.path.isdir (path): - continue - clean_directory (path, False) - - for d in to_clean: - path = os.path.normpath (rootdir + '/' + d) - if not os.path.isdir (path): - continue - clean_directory (path, False, True) - - for f in to_remove: - path = os.path.join (rootdir, f) - if not os.path.isfile (path): - continue - os.remove (path) - + for d in to_empty: + path = os.path.normpath (rootdir + '/' + d) + if not os.path.isdir (path): + continue + clean_directory (path, False) + + for d in to_clean: + path = os.path.normpath (rootdir + '/' + d) + if not os.path.isdir (path): + continue + clean_directory (path, False, True) + + for f in to_remove: + path = os.path.join (rootdir, f) + if not os.path.isfile (path): + continue + os.remove (path) + def clean_up_root (rootdir): - # FIXME: Do this nicer at some point - os.system ("chroot %s /usr/bin/rsync -a /etc/skel/ /root/" % rootdir) - os.chmod (rootdir + '/root', 0750) + # FIXME: Do this nicer at some point + os.system ("chroot %s /usr/bin/rsync -a /etc/skel/ /root/" % rootdir) + os.chmod (rootdir + '/root', 0750) rootdir = sys.argv[1] clear_rpm_db_files (rootdir) clean_up_directories (rootdir, - directories_to_be_emptied, - directories_to_be_cleaned, - files_to_be_removed) + directories_to_be_emptied, + directories_to_be_cleaned, + files_to_be_removed) clean_up_root (rootdir) Index: 06sysconfig.py =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/06sysconfig.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 06sysconfig.py 30 Aug 2005 01:56:22 -0000 1.2 +++ 06sysconfig.py 31 Mar 2006 21:03:41 -0000 1.3 @@ -1,54 +1,54 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys from functions import * def tweak_readonly_root_config (rootdir): - # create symlink to rc.readonly-livecd - os.symlink ('rc.d/rc.readonly-livecd', normalize_path (['etc/rc.readonly'], rootdir)) - os.symlink ('../init.d/readonly-halt', normalize_path (['etc/rc0.d/S00readonly-halt'], rootdir)) - os.symlink ('../init.d/readonly-halt', normalize_path (['etc/rc6.d/S00readonly-halt'], rootdir)) - # create dirs for fedora-livecd files - os.mkdir (normalize_path (['/livecd'], rootdir)) - os.mkdir (normalize_path (['/livecd/tmpfs'], rootdir)) - os.mkdir (normalize_path (['/livecd/ramfs'], rootdir)) - os.mkdir (normalize_path (['/livecd/moved'], rootdir)) - # enable readonly-root - shf = sysconfig_file (rootdir, "readonly-root") - # run rc.readonly - shf["READONLY"] = "yes" - shf.write () - + # create symlink to rc.readonly-livecd + os.symlink ('rc.d/rc.readonly-livecd', normalize_path (['etc/rc.readonly'], rootdir)) + os.symlink ('../init.d/readonly-halt', normalize_path (['etc/rc0.d/S00readonly-halt'], rootdir)) + os.symlink ('../init.d/readonly-halt', normalize_path (['etc/rc6.d/S00readonly-halt'], rootdir)) + # create dirs for fedora-livecd files + os.mkdir (normalize_path (['/livecd'], rootdir)) + os.mkdir (normalize_path (['/livecd/tmpfs'], rootdir)) + os.mkdir (normalize_path (['/livecd/ramfs'], rootdir)) + os.mkdir (normalize_path (['/livecd/moved'], rootdir)) + # enable readonly-root + shf = sysconfig_file (rootdir, "readonly-root") + # run rc.readonly + shf["READONLY"] = "yes" + shf.write () + def tweak_udev_config (rootdir): - shf = sysconfig_file (rootdir, "udev") - # Mount a ramfs over /dev - shf["UDEV_RAMFS"] = "yes" - # We aren't using an initrd - shf["UDEV_INITRD"] = "no" - # Don't keep the ramfs from the initrd - shf["UDEV_KEEP_DEV"] = "no" - shf.write () - + shf = sysconfig_file (rootdir, "udev") + # Mount a ramfs over /dev + shf["UDEV_RAMFS"] = "yes" + # We aren't using an initrd + shf["UDEV_INITRD"] = "no" + # Don't keep the ramfs from the initrd + shf["UDEV_KEEP_DEV"] = "no" + shf.write () + def tweak_firstboot_config (rootdir): - shf = sysconfig_file (rootdir, "firstboot") - shf["RUN_FIRSTBOOT"] = "YES" - shf.write () + shf = sysconfig_file (rootdir, "firstboot") + shf["RUN_FIRSTBOOT"] = "YES" + shf.write () def tweak_kudzu_config (rootdir): - shf = sysconfig_file (rootdir, "kudzu") - # Take default actions without prompting - shf["KUDZU_ARGS"] = "-q" - shf.write () - + shf = sysconfig_file (rootdir, "kudzu") + # Take default actions without prompting + shf["KUDZU_ARGS"] = "-q" + shf.write () + def tweak_livecd (rootdir): - file = open (normalize_path (['.livecd'], rootdir) , 'w') - file.close() - + file = open (normalize_path (['.livecd'], rootdir) , 'w') + file.close() + rootdir = sys.argv[1] tweak_readonly_root_config (rootdir) tweak_udev_config (rootdir) tweak_firstboot_config (rootdir) #tweak_kudzu_config (rootdir) -tweak_livecd (rootdir) \ No newline at end of file +tweak_livecd (rootdir) From fedora-extras-commits at redhat.com Fri Mar 31 21:03:38 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 31 Mar 2006 14:03:38 -0700 Subject: kadischi/lib functions.py,1.5,1.6 Message-ID: <200603312104.k2VL484g025069@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25007/kadischi/lib Modified Files: functions.py Log Message: Contributor: Toshio Kuratomi (Consistency between spaces vs. tabs), commit Index: functions.py =================================================================== RCS file: /cvs/devel/kadischi/lib/functions.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- functions.py 30 Mar 2006 04:29:21 -0000 1.5 +++ functions.py 31 Mar 2006 21:03:36 -0000 1.6 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys @@ -12,125 +12,125 @@ import isys def normalize_path (parts, rootpath = None): - if rootpath == None: - rootpath = '/' - path = rootpath - for part in parts: - path = '/'.join([path, part]) - return os.path.normpath (path) + if rootpath == None: + rootpath = '/' + path = rootpath + for part in parts: + path = '/'.join([path, part]) + return os.path.normpath (path) def path_exists (path, quiet = False): - if os.path.exists (path): - if not quiet: - flc_log ('Path %s exists. OK' % path) - return True - else: - if not quiet: - flc_log ('Error - path %s doesn`t exist.' % path) - return False + if os.path.exists (path): + if not quiet: + flc_log ('Path %s exists. OK' % path) + return True + else: + if not quiet: + flc_log ('Error - path %s doesn`t exist.' % path) + return False def url_exists (url, quiet = False): - try: - u = grabber.urlopen (url, retry = 5) - if not quiet: - flc_log ('URL %s contacted. OK' % url) - u.close () - return True - except grabber.URLGrabError, e: - if not quiet: - flc_log ("An error occurred contacting %s." % url) - flc_log ("URLGrabError:\n %s" % e.strerror) - return False + try: + u = grabber.urlopen (url, retry = 5) + if not quiet: + flc_log ('URL %s contacted. OK' % url) + u.close () + return True + except grabber.URLGrabError, e: + if not quiet: + flc_log ("An error occurred contacting %s." % url) + flc_log ("URLGrabError:\n %s" % e.strerror) + return False def clear_rpm_db_files (rootdir): - """Removes rpm database files in the destination if they exist""" - def rmpath (p): - try: os.remove (p) - except OSError: pass - rmpath (normalize_path ('var/lib/rpm/__db.001', rootdir)) - rmpath (normalize_path ('var/lib/rpm/__db.002', rootdir)) - rmpath (normalize_path ('var/lib/rpm/__db.003', rootdir)) - + """Removes rpm database files in the destination if they exist""" + def rmpath (p): + try: os.remove (p) + except OSError: pass + rmpath (normalize_path ('var/lib/rpm/__db.001', rootdir)) + rmpath (normalize_path ('var/lib/rpm/__db.002', rootdir)) + rmpath (normalize_path ('var/lib/rpm/__db.003', rootdir)) + def check_installed_rpms (rootdir, required_rpms, clear_db = True): - """Sanity check the target system for required RPMs""" - # By default, clears out the db files before and after doing any operations - missing_rpms = [] - if clear_db: - clear_rpm_db_files (rootdir) - ts = rpm.TransactionSet (rootdir) - for package in required_rpms: - mi = ts.dbMatch ('name', package) - if mi.count () == 0: - missing_rpms.append (package) - if clear_db: - clear_rpm_db_files (rootdir) - return missing_rpms + """Sanity check the target system for required RPMs""" + # By default, clears out the db files before and after doing any operations + missing_rpms = [] + if clear_db: + clear_rpm_db_files (rootdir) + ts = rpm.TransactionSet (rootdir) + for package in required_rpms: + mi = ts.dbMatch ('name', package) + if mi.count () == 0: + missing_rpms.append (package) + if clear_db: + clear_rpm_db_files (rootdir) + return missing_rpms def get_kernel_version (rootdir): - kernel_version = None - clear_rpm_db_files (rootdir) - ts = rpm.TransactionSet (rootdir) - while kernel_version == None: - if isys.smpAvailable() or isys.htavailable(): - for mi in ts.dbMatch ('name', 'kernel-xen0'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' - clear_rpm_db_files (rootdir) - for mi in ts.dbMatch ('name', 'kernel-smp'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp' - clear_rpm_db_files (rootdir) - else: - for mi in ts.dbMatch ('name', 'kernel-xen0'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' - clear_rpm_db_files (rootdir) - for mi in ts.dbMatch ('name', 'kernel'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) - clear_rpm_db_files (rootdir) - return kernel_version + kernel_version = None + clear_rpm_db_files (rootdir) + ts = rpm.TransactionSet (rootdir) + while kernel_version == None: + if isys.smpAvailable() or isys.htavailable(): + for mi in ts.dbMatch ('name', 'kernel-xen0'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' + clear_rpm_db_files (rootdir) + for mi in ts.dbMatch ('name', 'kernel-smp'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp' + clear_rpm_db_files (rootdir) + else: + for mi in ts.dbMatch ('name', 'kernel-xen0'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' + clear_rpm_db_files (rootdir) + for mi in ts.dbMatch ('name', 'kernel'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + clear_rpm_db_files (rootdir) + return kernel_version def clean_directory (dir, remove_when_done=True, keep_child_directories=False): - """Removes all files in a directory, optionally removing the directory afterwards""" - assert os.path.isdir and not os.path.islink (dir) - file_list = os.listdir (dir) - - for f in file_list: - path = os.path.join (dir, f) - if os.path.isdir (path) and not os.path.islink (path): - clean_directory (path, - not keep_child_directories, - keep_child_directories) - else: - os.remove (path) + """Removes all files in a directory, optionally removing the directory afterwards""" + assert os.path.isdir and not os.path.islink (dir) + file_list = os.listdir (dir) + + for f in file_list: + path = os.path.join (dir, f) + if os.path.isdir (path) and not os.path.islink (path): + clean_directory (path, + not keep_child_directories, + keep_child_directories) + else: + os.remove (path) - if remove_when_done: - os.rmdir (dir) + if remove_when_done: + os.rmdir (dir) def sysconfig_file (rootdir, name): - path = normalize_path(['/etc/sysconfig/', name], rootdir) - return shvar.shvarFile (path) + path = normalize_path(['/etc/sysconfig/', name], rootdir) + return shvar.shvarFile (path) def flc_log (msg): - sys.stdout.write (msg + '\n') + sys.stdout.write (msg + '\n') def cleanup (builddir): - os.system ("umount %s 2>/dev/null" % normalize_path(['/system/proc'],builddir)) - if os.path.exists (normalize_path([builddir,'product'])): - clean_directory ('/tmp/product') - shutil.move (normalize_path([builddir,'product']), '/tmp/product') - elif os.path.exists (normalize_path([builddir,'.buildstamp'])): - os.unlink ('/tmp/product/.buildstamp') - shutil.move (normalize_path([builddir,'.buildstamp']), '/tmp/product/.buildstamp') - else: - os.unlink ('/tmp/product/.buildstamp') - clean_directory (builddir) - + os.system ("umount %s 2>/dev/null" % normalize_path(['/system/proc'],builddir)) + if os.path.exists (normalize_path([builddir,'product'])): + clean_directory ('/tmp/product') + shutil.move (normalize_path([builddir,'product']), '/tmp/product') + elif os.path.exists (normalize_path([builddir,'.buildstamp'])): + os.unlink ('/tmp/product/.buildstamp') + shutil.move (normalize_path([builddir,'.buildstamp']), '/tmp/product/.buildstamp') + else: + os.unlink ('/tmp/product/.buildstamp') + clean_directory (builddir) + def run (command, builddir = None): - rc = os.system (command) - if rc != 0: - flc_log ('\n *** Fatal error: %s returned non zero (%s) exit code. Aborting execution.\n' % (command.rsplit() [0], rc)) - if builddir != None: - flc_log ('Cleaning up temporary files...') - cleanup (builddir) - flc_log ('Done.') - else: - flc_log ('You should clean temporary files.') - sys.exit (1) + rc = os.system (command) + if rc != 0: + flc_log ('\n *** Fatal error: %s returned non zero (%s) exit code. Aborting execution.\n' % (command.rsplit() [0], rc)) + if builddir != None: + flc_log ('Cleaning up temporary files...') + cleanup (builddir) + flc_log ('Done.') + else: + flc_log ('You should clean temporary files.') + sys.exit (1) From fedora-extras-commits at redhat.com Fri Mar 31 21:03:38 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 31 Mar 2006 14:03:38 -0700 Subject: kadischi/livecd_generator kadischi.py, 1.7, 1.8 movefiles.py, 1.1.1.1, 1.2 Message-ID: <200603312104.k2VL482D025072@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25007/kadischi/livecd_generator Modified Files: kadischi.py movefiles.py Log Message: Contributor: Toshio Kuratomi (Consistency between spaces vs. tabs), commit Index: kadischi.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kadischi.py 30 Mar 2006 05:46:06 -0000 1.7 +++ kadischi.py 31 Mar 2006 21:03:36 -0000 1.8 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys @@ -56,23 +56,23 @@ force = options.force if options.ksfile != None: - anaconda_args = anaconda_args + ' --kickstart=' + options.ksfile + anaconda_args = anaconda_args + ' --kickstart=' + options.ksfile if options.buildstamp != None: - buildstamp = options.buildstamp + buildstamp = options.buildstamp else: - buildstamp = normalize_path ([confdir, 'buildstamp']) + buildstamp = normalize_path ([confdir, 'buildstamp']) # set display mode display_mode = '' if options.graphical: - display_mode = ' --graphical' + display_mode = ' --graphical' if options.text: - display_mode = ' -T' + display_mode = ' -T' if options.cmdline: - display_mode = ' -C' + display_mode = ' -C' anaconda_args = display_mode + anaconda_args @@ -81,12 +81,12 @@ # checking arguments if len (args) < 2: - flc_log ('Not enough arguments.\n') - parser.parse_args (['-h']) - + flc_log ('Not enough arguments.\n') + parser.parse_args (['-h']) + if len (args) > 2: - flc_log ('Too many arguments.\n') - parser.parse_args (['-h']) + flc_log ('Too many arguments.\n') + parser.parse_args (['-h']) method = args [0] isoimage = normalize_path ([args [1]]) @@ -96,14 +96,14 @@ flc_log ('Checking UID') if os.getuid () != 0: - flc_log ('You have to be root to run this application. Please restart with root permissions.\n') - sys.exit (1) + flc_log ('You have to be root to run this application. Please restart with root permissions.\n') + sys.exit (1) # check if we can open buildstamp file if not os.access(buildstamp, os.R_OK): - flc_log ('Can`t open buildstamp file %s. ' % buildstamp) - sys.exit (1) + flc_log ('Can`t open buildstamp file %s. ' % buildstamp) + sys.exit (1) # loading productPath from buildstamp @@ -112,11 +112,11 @@ f = open(buildstamp, "r") lines = f.readlines() if len(lines) >= 4: - product_path = lines[3][:-1] - flc_log ('Product path set to %s. ' % product_path) + product_path = lines[3][:-1] + flc_log ('Product path set to %s. ' % product_path) else: - flc_log ('Product path can`t be found in buildstamp file %s (Product path should be on the 4th line of the file)' % buildstamp) - sys.exit (1) + flc_log ('Product path can`t be found in buildstamp file %s (Product path should be on the 4th line of the file)' % buildstamp) + sys.exit (1) # validating the repository @@ -125,34 +125,34 @@ valid = True if method.find (':') == -1: - method = normalize_path ([method]) - valid = path_exists (method) and path_exists (method + '/' + product_path) and path_exists (method + '/' + product_path + '/' + 'base') and path_exists (method + '/' + product_path + '/' + 'RPMS') + method = normalize_path ([method]) + valid = path_exists (method) and path_exists (method + '/' + product_path) and path_exists (method + '/' + product_path + '/' + 'base') and path_exists (method + '/' + product_path + '/' + 'RPMS') elif method.find ('http') == 0 or method.find ('ftp') == 0: - method = method.rstrip('/') - valid = url_exists (method) and url_exists (method + '/' + product_path) and url_exists (method + '/' + product_path + '/' + 'base') and url_exists (method + '/' + product_path + '/' + 'RPMS') + method = method.rstrip('/') + valid = url_exists (method) and url_exists (method + '/' + product_path) and url_exists (method + '/' + product_path + '/' + 'base') and url_exists (method + '/' + product_path + '/' + 'RPMS') if valid: - flc_log ('Repository seems to be OK.') + flc_log ('Repository seems to be OK.') else: - flc_log ('Repository validation failed. Aborting execution.') - sys.exit (1) + flc_log ('Repository validation failed. Aborting execution.') + sys.exit (1) # format method string the way anaconda likes it if method.find (':') == -1: - method = 'nfs:/' + method - + method = 'nfs:/' + method + # checking if everything is OK with destination (iso image) file if os.path.isfile (isoimage): - flc_log ('File %s already exists. ' % isoimage) - if force: - flc_log ('It will be overwritten.') - else: - flc_log ('Please choose some other file name, or use -f option to overwrite the existing file.') - sys.exit (1) + flc_log ('File %s already exists. ' % isoimage) + if force: + flc_log ('It will be overwritten.') + else: + flc_log ('Please choose some other file name, or use -f option to overwrite the existing file.') + sys.exit (1) elif not os.path.isdir (os.path.dirname (isoimage)): - os.makedirs (os.path.dirname (isoimage)) + os.makedirs (os.path.dirname (isoimage)) # check for installed rpms @@ -169,19 +169,19 @@ missing_rpms = check_installed_rpms ('/', required_rpms, False) if len (missing_rpms) != 0: - flc_log ('Required packages:') - for rpm in missing_rpms: - flc_log (' %s' % rpm) - flc_log ('are missing. Aborting execution.') - sys.exit (1) + flc_log ('Required packages:') + for rpm in missing_rpms: + flc_log (' %s' % rpm) + flc_log ('are missing. Aborting execution.') + sys.exit (1) # check for the config file flc_log ('Looking for config file') if not os.path.isfile (normalize_path([confdir, 'kadischi.conf'])): - flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'kadischi.conf'])) - sys.exit (1) + flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'kadischi.conf'])) + sys.exit (1) # load config file options @@ -195,8 +195,8 @@ buildconf.write () if builddir == '' or builddir == None: - flc_log ('No build dir defined. Please, edit config file option BUILDDIR.') - sys.exit(1) + flc_log ('No build dir defined. Please, edit config file option BUILDDIR.') + sys.exit(1) # prepare dirs @@ -214,14 +214,14 @@ # Moving the buildstamp file to /tmp/product/.buildstamp so anaconda can find it if not os.path.exists ('/tmp/product'): - os.makedirs ('/tmp/product') + os.makedirs ('/tmp/product') elif not os.path.isdir ('/tmp/product'): - flc_log ('Path /tmp/product is not a directory, temporarly moving to %s' % normalize_path([builddir, 'product'])) - shutil.move ('/tmp/product', normalize_path([builddir, 'product'])) - os.makedirs ('/tmp/product') + flc_log ('Path /tmp/product is not a directory, temporarly moving to %s' % normalize_path([builddir, 'product'])) + shutil.move ('/tmp/product', normalize_path([builddir, 'product'])) + os.makedirs ('/tmp/product') elif os.path.exists ('/tmp/product/.buildstamp'): - flc_log ('Path /tmp/product/.buildstamp already exists, temporarly moving to %s' % normalize_path([builddir, '.buildstamp'])) - shutil.move ('/tmp/product/.buildstamp', normalize_path([builddir, '.buildstamp'])) + flc_log ('Path /tmp/product/.buildstamp already exists, temporarly moving to %s' % normalize_path([builddir, '.buildstamp'])) + shutil.move ('/tmp/product/.buildstamp', normalize_path([builddir, '.buildstamp'])) shutil.copy2 (buildstamp, '/tmp/product/.buildstamp') @@ -244,16 +244,16 @@ scripts = [] for root, dirs, files in os.walk (normalize_path([bindir, 'post_install_scripts'])): - for filename in files: - filename = normalize_path([bindir, 'post_install_scripts', filename]) - if os.access(filename, 1): - scripts.append (filename) + for filename in files: + filename = normalize_path([bindir, 'post_install_scripts', filename]) + if os.access(filename, 1): + scripts.append (filename) scripts.sort() for script in scripts: - flc_log ('%s' % script) - run ("%s %s" % (script, sysdir), builddir) + flc_log ('%s' % script) + run ("%s %s" % (script, sysdir), builddir) # make initrd image @@ -272,18 +272,18 @@ flc_log ('compressing the tree (order a pizza `cause this will take a while)') if options.filesystem == 'squashfs': - # zisofs has a tree which can be seen; squashfs is a file that we mount - # loopback. So we need to create supporting files and directories - # seperately. - os.makedirs (os.path.join(csysdir, 'boot/isolinux')) - os.makedirs(normalize_path([csysdir, '/livecd'])) - touch = file(normalize_path([csysdir, '.livecd']), 'w') - touch.close() - # compress a squashfs tree - run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh']))) + # zisofs has a tree which can be seen; squashfs is a file that we mount + # loopback. So we need to create supporting files and directories + # separately. + os.makedirs (os.path.join(csysdir, 'boot/isolinux')) + os.makedirs(normalize_path([csysdir, '/livecd'])) + touch = file(normalize_path([csysdir, '.livecd']), 'w') + touch.close() + # compress a squashfs tree + run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh']))) else: - # compress a zisofs tree - run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir) + # compress a zisofs tree + run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir) # install boot & conf files in compressed tree (they shoudn`t be compressed) @@ -304,9 +304,9 @@ flc_log ('creating iso image %s' % isoimage) if options.filesystem == 'squashfs': - mkisoflags='' + mkisoflags='' else: - mkisoflags='MKISOFSOPTION=-z ' + mkisoflags='MKISOFSOPTION=-z ' run ("%s%s %s %s" % (mkisoflags, normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir) # delete builddir Index: movefiles.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/movefiles.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- movefiles.py 21 Aug 2005 17:09:00 -0000 1.1.1.1 +++ movefiles.py 31 Mar 2006 21:03:36 -0000 1.2 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys @@ -8,16 +8,16 @@ # Files that we want to be moved to tmpfs # and mounted back to original locations files_to_be_writable = [ - '/var', - '/tmp', - '/etc', - '/home', - '/root', - '/opt', - '/mnt', - '/media', - ] - + '/var', + '/tmp', + '/etc', + '/home', + '/root', + '/opt', + '/mnt', + '/media', + ] + # Files that we don`t want to be on tmpfs, # but they are in dirs that are on tmpfs. # These files will be moved to /moved, and @@ -25,56 +25,56 @@ # The reason we don`t want then on tmpfs is that # they are big and we don`t need them to be writable files_to_be_moved = [ - '/var/lib/rpm', - ] + '/var/lib/rpm', + ] # Files that we need to stay in their original # locations cause we need them before rc.readonly # or during init.d/halt files_to_stay = [ - '/etc/inittab', - '/etc/init.d', - '/etc/initlog.conf', - '/etc/rc', - '/etc/rc.d', - '/etc/rc.local', - '/etc/rc.readonly', - '/etc/passwd', - '/etc/shadow', - '/etc/group', - '/etc/fstab', - '/etc/mtab', - '/etc/makedev.d', - ] + '/etc/inittab', + '/etc/init.d', + '/etc/initlog.conf', + '/etc/rc', + '/etc/rc.d', + '/etc/rc.local', + '/etc/rc.readonly', + '/etc/passwd', + '/etc/shadow', + '/etc/group', + '/etc/fstab', + '/etc/mtab', + '/etc/makedev.d', + ] rootdir = sys.argv[1] for file in files_to_be_moved: - src = normalize_path ([file],rootdir) - dst = normalize_path (['/livecd/moved',file],rootdir) - os.renames (src, dst) - if os.path.isfile (dst): - os.system ("touch %s" % src) - else: - os.makedirs (src) - + src = normalize_path ([file],rootdir) + dst = normalize_path (['/livecd/moved',file],rootdir) + os.renames (src, dst) + if os.path.isfile (dst): + os.system ("touch %s" % src) + else: + os.makedirs (src) + for file in files_to_be_writable: - src = normalize_path ([file],rootdir) - dst = normalize_path (['/livecd/tmpfs',file],rootdir) - os.renames (src, dst) - if os.path.isfile (dst): - os.system ("touch %s" % src) - else: - os.makedirs (src) + src = normalize_path ([file],rootdir) + dst = normalize_path (['/livecd/tmpfs',file],rootdir) + os.renames (src, dst) + if os.path.isfile (dst): + os.system ("touch %s" % src) + else: + os.makedirs (src) for file in files_to_stay: - src = normalize_path (['/livecd/tmpfs',file],rootdir) - dst = normalize_path ([file],rootdir) - if os.path.isfile (src): - shutil.copy2 (src, dst) - else: - shutil.copytree (src, dst) - + src = normalize_path (['/livecd/tmpfs',file],rootdir) + dst = normalize_path ([file],rootdir) + if os.path.isfile (src): + shutil.copy2 (src, dst) + else: + shutil.copytree (src, dst) + run ("cd %s/livecd/tmpfs; tar -czf %s/livecd/kadischi.tar.gz *" % (rootdir, rootdir)) -clean_directory (normalize_path (['/livecd/tmpfs'],rootdir), False) \ No newline at end of file +clean_directory (normalize_path (['/livecd/tmpfs'],rootdir), False) From fedora-extras-commits at redhat.com Fri Mar 31 21:05:05 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Fri, 31 Mar 2006 14:05:05 -0700 Subject: rpms/denyhosts/devel README.fedora, 1.4, 1.5 denyhosts.cron, 1.6, 1.7 denyhosts.spec, 1.31, 1.32 Message-ID: <200603312105.k2VL578b025105@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25084 Modified Files: README.fedora denyhosts.cron denyhosts.spec Log Message: * Fri Mar 31 2006 Jason L Tibbitts III - 2.2-6 - More reversion of the name change. Index: README.fedora =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/README.fedora,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README.fedora 31 Mar 2006 02:59:32 -0000 1.4 +++ README.fedora 31 Mar 2006 21:05:05 -0000 1.5 @@ -29,7 +29,7 @@ If you want to incorporate an old logfile (in this example, /var/log/secure.1) , you can run - denyhosts -c /etc/denyhosts.conf /var/log/secure.1 + denyhosts.py -c /etc/denyhosts.conf /var/log/secure.1 DenyHosts can also handle logs compressed with gzip or bzip2. Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.cron,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- denyhosts.cron 31 Mar 2006 02:59:32 -0000 1.6 +++ denyhosts.cron 31 Mar 2006 21:05:05 -0000 1.7 @@ -4,9 +4,9 @@ # "service" and set it to run at boot if necessary.) # # Run denyhosts occasionally; adjust the time span to your liking -#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts -c /etc/denyhosts.conf +#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf # # Automatically purge old entries early in the morning. Note that you must # edit /etc/denyhosts.conf and set PURGE_DENY to something reasonable, as the # default value purge time is set very high. -#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts -c /etc/denyhosts.conf --purge +#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf --purge Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- denyhosts.spec 31 Mar 2006 19:47:01 -0000 1.31 +++ denyhosts.spec 31 Mar 2006 21:05:05 -0000 1.32 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -150,6 +150,9 @@ %changelog +* Fri Mar 31 2006 Jason L Tibbitts III - 2.2-6 +- More reversion of the name change. + * Fri Mar 31 2006 Jason L Tibbitts III - 2.2-5 - Revert renaming of the denyhosts.py script From fedora-extras-commits at redhat.com Fri Mar 31 21:52:11 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 14:52:11 -0700 Subject: rpms/dia/FC-5 dia-0.94-CVE-2006-1550.patch, NONE, 1.1 dia.spec, 1.7, 1.8 Message-ID: <200603312152.k2VLqDmr025373@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25353 Modified Files: dia.spec Added Files: dia-0.94-CVE-2006-1550.patch Log Message: * Fri Mar 31 2006 Hans de Goede 1:0.94-21 - Fix CVE-2006-1550 (bz 187556) dia-0.94-CVE-2006-1550.patch: --- NEW FILE dia-0.94-CVE-2006-1550.patch --- --- dia-0.94/plug-ins/xfig/xfig-import.c.cve 2006-03-31 23:36:33.000000000 +0200 +++ dia-0.94/plug-ins/xfig/xfig-import.c 2006-03-31 23:36:40.000000000 +0200 @@ -441,11 +441,17 @@ static Color fig_color(int color_index) { - if (color_index == -1) + if (color_index <= -1) return color_black; /* Default color */ - if (color_index < FIG_MAX_DEFAULT_COLORS) + else if (color_index < FIG_MAX_DEFAULT_COLORS) return fig_default_colors[color_index]; - else return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; + else if (color_index < FIG_MAX_USER_COLORS) + return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; + else { + message_error(_("Color index %d too high, only 512 colors allowed. Using black instead."), + color_index); + return color_black; + } } static Color @@ -563,23 +569,25 @@ static int fig_read_n_points(FILE *file, int n, Point **points) { int i; - Point *new_points; - - new_points = (Point*)g_malloc(sizeof(Point)*n); + GArray *points_list = g_array_sized_new(FALSE, FALSE, sizeof(Point), n); for (i = 0; i < n; i++) { int x,y; + Point p; if (fscanf(file, " %d %d ", &x, &y) != 2) { message_error(_("Error while reading %dth of %d points: %s\n"), i, n, strerror(errno)); - free(new_points); + g_array_free(points_list, TRUE); return FALSE; } - new_points[i].x = x/FIG_UNIT; - new_points[i].y = y/FIG_UNIT; + p.x = x/FIG_UNIT; + p.y = y/FIG_UNIT; + g_array_append_val(points_list, p); } fscanf(file, "\n"); - *points = new_points; + + *points = (Point *)points_list->data; + g_array_free(points_list, FALSE); return TRUE; } @@ -683,7 +691,7 @@ return text_buf; } -static GList *depths[1000]; +static GList *depths[FIG_MAX_DEPTHS]; /* If there's something in the compound stack, we ignore the depth field, as it will be determined by the group anyway */ @@ -693,6 +701,26 @@ level. Best we can do now. */ static int compound_depth; +/** Add an object at a given depth. This function checks for depth limits + * and updates the compound depth if needed. + * + * @param newobj An object to add. If we're inside a compound, this + * doesn't really add the object. + * @param depth A depth as in the Fig format, max 999 + */ +static void +add_at_depth(DiaObject *newobj, int depth) { + if (depth < 0 || depth >= FIG_MAX_DEPTHS) { + message_error(_("Depth %d of of range, only 0-%d allowed.\n"), + depth, FIG_MAX_DEPTHS-1); + depth = FIG_MAX_DEPTHS - 1; + } + if (compound_stack == NULL) + depths[depth] = g_list_append(depths[depth], newobj); + else + if (compound_depth > depth) compound_depth = depth; +} + static DiaObject * fig_read_ellipse(FILE *file, DiagramData *dia) { int sub_type; @@ -749,10 +777,7 @@ /* Angle -- can't rotate yet */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); return newobj; } @@ -885,10 +910,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: prop_list_free(props); g_free(forward_arrow_info); @@ -1111,10 +1133,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: prop_list_free(props); g_free(forward_arrow_info); @@ -1202,10 +1221,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: g_free(forward_arrow_info); @@ -1298,10 +1314,7 @@ newobj->ops->set_props(newobj, props); /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: if (text_buf != NULL) free(text_buf); @@ -1347,6 +1360,12 @@ return FALSE; } + if (colornumber < 32 || colornumber > FIG_MAX_USER_COLORS) { + message_error(_("Color number %d out of range 0..%d. Discarding color.\n"), + colornumber, FIG_MAX_USER_COLORS); + return FALSE; + } + color.red = ((colorvalues & 0x00ff0000)>>16) / 255.0; color.green = ((colorvalues & 0x0000ff00)>>8) / 255.0; color.blue = (colorvalues & 0x000000ff) / 255.0; @@ -1393,7 +1412,7 @@ } /* Group extends don't really matter */ if (compound_stack == NULL) - compound_depth = 999; + compound_depth = FIG_MAX_DEPTHS - 1; compound_stack = g_slist_append(compound_stack, NULL); return TRUE; break; @@ -1551,7 +1570,7 @@ for (i = 0; i < FIG_MAX_USER_COLORS; i++) { fig_colors[i] = color_black; } - for (i = 0; i < 1000; i++) { + for (i = 0; i < FIG_MAX_DEPTHS; i++) { depths[i] = NULL; } @@ -1606,7 +1625,7 @@ } while (TRUE); /* Now we can reorder for the depth fields */ - for (i = 0; i < 1000; i++) { + for (i = 0; i < FIG_MAX_DEPTHS; i++) { if (depths[i] != NULL) layer_add_objects_first(dia->active_layer, depths[i]); } --- dia-0.94/plug-ins/xfig/xfig.h.cve 2006-03-31 23:36:33.000000000 +0200 +++ dia-0.94/plug-ins/xfig/xfig.h 2006-03-31 23:36:40.000000000 +0200 @@ -6,6 +6,7 @@ #define FIG_MAX_DEFAULT_COLORS 32 #define FIG_MAX_USER_COLORS 512 +#define FIG_MAX_DEPTHS 1000 /* 1200 PPI */ #define FIG_UNIT 472.440944881889763779527559055118 /* 1/80 inch */ Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dia.spec 31 Mar 2006 18:58:02 -0000 1.7 +++ dia.spec 31 Mar 2006 21:52:11 -0000 1.8 @@ -5,7 +5,7 @@ Name: dia Summary: A diagram drawing program. Version: 0.94 -Release: 20 +Release: 21 Epoch: 1 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2 Group: Applications/Multimedia @@ -34,6 +34,7 @@ Patch4: dia-0.94-fallbacktoxpmicons.patch Patch5: dia-0.94-rh165337.patch Patch6: dia-0.94-gnomeflags.patch +Patch7: dia-0.94-CVE-2006-1550.patch %description The Dia drawing program is designed to be like the Windows(TM) Visio @@ -53,6 +54,7 @@ %patch4 -p1 -b .fallbacktoxpmicons %patch5 -p1 -b .rh165337 %patch6 -p1 -b .gnomeflags +%patch7 -p1 -b .cve %build rm doc/*/dia.1 @@ -117,6 +119,9 @@ %{_datadir}/pixmaps/* %changelog +* Fri Mar 31 2006 Hans de Goede 1:0.94-21 +- Fix CVE-2006-1550 (bz 187556) + * Fri Mar 31 2006 Hans de Goede 1:0.94-20 - Taking over as new FE maintainer - Rebuild for bz 185886 From fedora-extras-commits at redhat.com Fri Mar 31 21:57:54 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 31 Mar 2006 14:57:54 -0700 Subject: rpms/xfce4-xkb-plugin/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce4-xkb-plugin.spec, 1.5, 1.6 Message-ID: <200603312157.k2VLvuqk025477@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25456 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Mar 2006 13:51:45 -0000 1.4 +++ .cvsignore 31 Mar 2006 21:57:54 -0000 1.5 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.4.tar.gz +xfce4-xkb-plugin-0.3.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Mar 2006 13:51:45 -0000 1.4 +++ sources 31 Mar 2006 21:57:54 -0000 1.5 @@ -1 +1 @@ -06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz +0c92dd17579e102b40289c4bc83c5505 xfce4-xkb-plugin-0.3.5.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xfce4-xkb-plugin.spec 17 Mar 2006 13:51:45 -0000 1.5 +++ xfce4-xkb-plugin.spec 31 Mar 2006 21:57:54 -0000 1.6 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.4 +Version: 0.3.5 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -46,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 31 2006 Christoph Wickert - 0.3.5-1 +- Update to 0.3.5. + * Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 - Update to 0.3.4. From fedora-extras-commits at redhat.com Fri Mar 31 22:01:47 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 31 Mar 2006 15:01:47 -0700 Subject: rpms/xfce4-xkb-plugin/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce4-xkb-plugin.spec, 1.5, 1.6 Message-ID: <200603312202.k2VM2LGL027535@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27514 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Mar 2006 13:53:57 -0000 1.4 +++ .cvsignore 31 Mar 2006 22:01:47 -0000 1.5 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.4.tar.gz +xfce4-xkb-plugin-0.3.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Mar 2006 13:53:57 -0000 1.4 +++ sources 31 Mar 2006 22:01:47 -0000 1.5 @@ -1 +1 @@ -06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz +0c92dd17579e102b40289c4bc83c5505 xfce4-xkb-plugin-0.3.5.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/xfce4-xkb-plugin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xfce4-xkb-plugin.spec 17 Mar 2006 13:53:57 -0000 1.5 +++ xfce4-xkb-plugin.spec 31 Mar 2006 22:01:47 -0000 1.6 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.4 +Version: 0.3.5 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -46,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 31 2006 Christoph Wickert - 0.3.5-1 +- Update to 0.3.5. + * Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 - Update to 0.3.4. From fedora-extras-commits at redhat.com Fri Mar 31 22:08:27 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 31 Mar 2006 15:08:27 -0700 Subject: rpms/xfce4-xkb-plugin/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce4-xkb-plugin.spec, 1.3, 1.4 Message-ID: <200603312208.k2VM8T5o027656@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27635 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Mar 2006 13:55:15 -0000 1.4 +++ .cvsignore 31 Mar 2006 22:08:27 -0000 1.5 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.4.tar.gz +xfce4-xkb-plugin-0.3.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Mar 2006 13:55:15 -0000 1.4 +++ sources 31 Mar 2006 22:08:27 -0000 1.5 @@ -1 +1 @@ -06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz +0c92dd17579e102b40289c4bc83c5505 xfce4-xkb-plugin-0.3.5.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/xfce4-xkb-plugin.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xfce4-xkb-plugin.spec 17 Mar 2006 13:55:15 -0000 1.3 +++ xfce4-xkb-plugin.spec 31 Mar 2006 22:08:27 -0000 1.4 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.4 +Version: 0.3.5 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -46,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 31 2006 Christoph Wickert - 0.3.5-1 +- Update to 0.3.5. + * Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 - Update to 0.3.4. From fedora-extras-commits at redhat.com Fri Mar 31 22:40:27 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:40:27 -0700 Subject: rpms/perl-Taint-Runtime - New directory Message-ID: <200603312240.k2VMeTdZ027850@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27829/perl-Taint-Runtime Log Message: Directory /cvs/extras/rpms/perl-Taint-Runtime added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 22:40:27 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:40:27 -0700 Subject: rpms/perl-Taint-Runtime/devel - New directory Message-ID: <200603312240.k2VMeTJx027853@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27829/perl-Taint-Runtime/devel Log Message: Directory /cvs/extras/rpms/perl-Taint-Runtime/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 22:40:42 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:40:42 -0700 Subject: rpms/perl-Taint-Runtime Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603312240.k2VMeix6027907@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27874 Added Files: Makefile import.log Log Message: Setup of module perl-Taint-Runtime --- NEW FILE Makefile --- # Top level Makefile for module perl-Taint-Runtime all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 31 22:40:42 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:40:42 -0700 Subject: rpms/perl-Taint-Runtime/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603312240.k2VMei7T027910@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27874/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Taint-Runtime --- NEW 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 Mar 31 22:41:04 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:41:04 -0700 Subject: rpms/perl-Taint-Runtime import.log,1.1,1.2 Message-ID: <200603312241.k2VMf67H027971@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938 Modified Files: import.log Log Message: auto-import perl-Taint-Runtime-0.02-1 on branch devel from perl-Taint-Runtime-0.02-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Taint-Runtime/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 Mar 2006 22:40:41 -0000 1.1 +++ import.log 31 Mar 2006 22:41:04 -0000 1.2 @@ -0,0 +1 @@ +perl-Taint-Runtime-0_02-1:HEAD:perl-Taint-Runtime-0.02-1.src.rpm:1143844858 From fedora-extras-commits at redhat.com Fri Mar 31 22:41:04 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:41:04 -0700 Subject: rpms/perl-Taint-Runtime/devel perl-Taint-Runtime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603312241.k2VMf6QB027976@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938/devel Modified Files: .cvsignore sources Added Files: perl-Taint-Runtime.spec Log Message: auto-import perl-Taint-Runtime-0.02-1 on branch devel from perl-Taint-Runtime-0.02-1.src.rpm --- NEW FILE perl-Taint-Runtime.spec --- Name: perl-Taint-Runtime Version: 0.02 Release: 1%{?dist} Summary: Runtime enable taint checking Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Taint-Runtime Source0: http://search.cpan.org/CPAN/authors/id/R/RH/RHANDOM/Taint-Runtime-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module enables runtime taint checking, for cases where the -T switch on the commandline is not appropriate or viable. There are a somewhat limited number of legitimate use cases where you should use this module instead of the -T switch. Unless you have a specific and good reason for not using the -T option, you should use the -T option. %prep %setup -q -n Taint-Runtime-%{version} chmod +x is_taint_bench.pl %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" 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 f -name '*.bs' -a -size 0 -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 Changes %{perl_vendorarch}/auto/Taint/ %{perl_vendorarch}/Taint/ %{_mandir}/man3/*.3* %changelog * Fri Mar 31 2006 Tom "spot" Callaway 0.02-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Taint-Runtime/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Mar 2006 22:40:42 -0000 1.1 +++ .cvsignore 31 Mar 2006 22:41:04 -0000 1.2 @@ -0,0 +1 @@ +Taint-Runtime-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Taint-Runtime/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Mar 2006 22:40:42 -0000 1.1 +++ sources 31 Mar 2006 22:41:04 -0000 1.2 @@ -0,0 +1 @@ +f956b5abaae6925beb0c6fc335f214de Taint-Runtime-0.02.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 22:43:03 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:03 -0700 Subject: rpms/pitivi - New directory Message-ID: <200603312243.k2VMh5Ho028345@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28319/pitivi Log Message: Directory /cvs/extras/rpms/pitivi added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 22:43:04 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:04 -0700 Subject: rpms/pitivi/devel - New directory Message-ID: <200603312243.k2VMh6E5028348@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28319/pitivi/devel Log Message: Directory /cvs/extras/rpms/pitivi/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 22:43:16 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:43:16 -0700 Subject: owners owners.list,1.785,1.786 Message-ID: <200603312243.k2VMhIre028378@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28312 Modified Files: owners.list Log Message: perl-Taint-Runtime Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.785 retrieving revision 1.786 diff -u -r1.785 -r1.786 --- owners.list 31 Mar 2006 20:47:33 -0000 1.785 +++ owners.list 31 Mar 2006 22:43:15 -0000 1.786 @@ -1046,6 +1046,7 @@ Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Taint-Runtime|Runtime enable taint checking|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 31 22:43:19 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:19 -0700 Subject: rpms/pitivi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603312243.k2VMhLcp028416@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28383 Added Files: Makefile import.log Log Message: Setup of module pitivi --- NEW FILE Makefile --- # Top level Makefile for module pitivi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 31 22:43:20 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:20 -0700 Subject: rpms/pitivi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603312243.k2VMhMHO028419@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28383/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pitivi --- NEW 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 Mar 31 22:43:48 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:48 -0700 Subject: rpms/pitivi import.log,1.1,1.2 Message-ID: <200603312243.k2VMhosq028489@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28452 Modified Files: import.log Log Message: auto-import pitivi-0.9.9.2-3 on branch devel from pitivi-0.9.9.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pitivi/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 Mar 2006 22:43:19 -0000 1.1 +++ import.log 31 Mar 2006 22:43:47 -0000 1.2 @@ -0,0 +1 @@ +pitivi-0_9_9_2-3:HEAD:pitivi-0.9.9.2-3.src.rpm:1143845025 From fedora-extras-commits at redhat.com Fri Mar 31 22:43:48 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:48 -0700 Subject: rpms/pitivi/devel pitivi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603312243.k2VMhovl028519@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28452/devel Modified Files: .cvsignore sources Added Files: pitivi.spec Log Message: auto-import pitivi-0.9.9.2-3 on branch devel from pitivi-0.9.9.2-3.src.rpm --- NEW FILE pitivi.spec --- Name: pitivi Version: 0.9.9.2 Release: 3 Summary: Non-linear video editor Group: Applications/Multimedia License: GPL URL: http://www.pitivi.org/ Source: http://download.sf.net/pitivi/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gnonlin BuildRequires: gstreamer-devel >= 0.10.2 BuildRequires: gstreamer-plugins-base-devel >= 0.10.2 BuildRequires: gstreamer-python BuildRequires: GConf2-devel BuildRequires: gtk2-devel >= 2.8 BuildRequires: pygtk2-devel BuildRequires: gtk-doc BuildRequires: pkgconfig BuildRequires: gnonlin-devel BuildRequires: desktop-file-utils BuildRequires: gnome-python2 %description Pitivi is an application using the GStreamer multimedia framework to manipulate a large set of multimedia sources. At this level of development it can be compared to a classic video editing program. %prep %setup %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ pitivi.desktop # Clean out files that should not be part of the rpm. rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%find_lang pitivi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/pitivi %dir %{_libdir}/pitivi %dir %{_libdir}/pitivi/python %dir %{_libdir}/pitivi/python/pitivi %{_libdir}/pitivi/python/pitivi/*.py %{_libdir}/pitivi/python/pitivi/*.pyc %ghost %{_libdir}/pitivi/python/pitivi/*.pyo %dir %{_libdir}/pitivi/python/pitivi/ui %{_libdir}/pitivi/python/pitivi/ui/*.py %{_libdir}/pitivi/python/pitivi/ui/*.pyc %{_libdir}/pitivi/python/pitivi/ui/actions.xml %{_libdir}/pitivi/python/pitivi/ui/*.glade %ghost %{_libdir}/pitivi/python/pitivi/ui/*.pyo %{_datadir}/pitivi %{_datadir}/applications/fedora-pitivi.desktop %changelog * Wed Feb 08 2006 W. Michael Petullo 0.9.9.2-3 - add BuildRequires - add %%{_libdir}/pitivi/python/pitivi/ui/*.glade * Tue Feb 07 2006 W. Michael Petullo 0.9.9.2-2 - remove several %%defines. - avoid %%makeinstall. - BuildRequire: gnonlin-devel and Require: gnonlin. - use desktop-file-install. - BuildArch: noarch. - %%ghost *.pyo. * Mon Jan 23 2006 W. Michael Petullo - 0.9.9.2: updated to new version and gstreamer-0.10. * Mon Dec 20 2004 Thomas Vander Stichele - 0.1.1-0.fdr.1: initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Mar 2006 22:43:20 -0000 1.1 +++ .cvsignore 31 Mar 2006 22:43:48 -0000 1.2 @@ -0,0 +1 @@ +pitivi-0.9.9.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Mar 2006 22:43:20 -0000 1.1 +++ sources 31 Mar 2006 22:43:48 -0000 1.2 @@ -0,0 +1 @@ +de6076064893eda1d7bbd70b2b64b8f0 pitivi-0.9.9.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 22:45:51 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:45:51 -0700 Subject: owners owners.list,1.786,1.787 Message-ID: <200603312245.k2VMjrlF028702@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28681 Modified Files: owners.list Log Message: Add entry for pitivi. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.786 retrieving revision 1.787 diff -u -r1.786 -r1.787 --- owners.list 31 Mar 2006 22:43:15 -0000 1.786 +++ owners.list 31 Mar 2006 22:45:51 -0000 1.787 @@ -1130,6 +1130,7 @@ Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.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| Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|pitivi|Non-linear video editor|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org| Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 1 00:03:15 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:03:15 -0500 Subject: rpms/rekall/FC-3 rekall.spec,1.8,1.9 Message-ID: <200603010004.k21043ZG012458@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12373/FC-3 Modified Files: rekall.spec Log Message: Bump for FC-5 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rekall.spec 12 Jan 2006 06:17:01 -0000 1.8 +++ rekall.spec 1 Mar 2006 00:03:15 -0000 1.9 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -309,6 +309,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 +- bump for FC-5 + * Tue Jan 10 2006 Tom "spot" Callaway 2.4.0-1 - bump to 2.4.0 From fedora-extras-commits at redhat.com Wed Mar 1 00:03:34 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:03:34 -0500 Subject: rpms/rekall/FC-4 rekall.spec,1.8,1.9 Message-ID: <200603010004.k21046Z9012471@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12373/FC-4 Modified Files: rekall.spec Log Message: Bump for FC-5 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rekall.spec 12 Jan 2006 06:17:07 -0000 1.8 +++ rekall.spec 1 Mar 2006 00:03:34 -0000 1.9 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -309,6 +309,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 +- bump for FC-5 + * Tue Jan 10 2006 Tom "spot" Callaway 2.4.0-1 - bump to 2.4.0 From fedora-extras-commits at redhat.com Wed Mar 1 00:03:41 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:03:41 -0500 Subject: rpms/rekall/devel rekall.spec,1.8,1.9 Message-ID: <200603010004.k2104DN0012474@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12373/devel Modified Files: rekall.spec Log Message: Bump for FC-5 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rekall.spec 12 Jan 2006 06:17:13 -0000 1.8 +++ rekall.spec 1 Mar 2006 00:03:41 -0000 1.9 @@ -309,6 +309,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 +- bump for FC-5 + * Tue Jan 10 2006 Tom "spot" Callaway 2.4.0-1 - bump to 2.4.0 From fedora-extras-commits at redhat.com Wed Mar 1 00:04:53 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:04:53 -0500 Subject: rpms/rekall/devel rekall.spec,1.9,1.10 Message-ID: <200603010005.k2105PgJ012595@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12568/devel Modified Files: rekall.spec Log Message: typo Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rekall.spec 1 Mar 2006 00:03:41 -0000 1.9 +++ rekall.spec 1 Mar 2006 00:04:52 -0000 1.10 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ From fedora-extras-commits at redhat.com Wed Mar 1 00:14:39 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:14:39 -0500 Subject: rpms/R-gnomeGUI/FC-4 R-gnomeGUI.spec,1.5,1.6 Message-ID: <200603010015.k210FBc0012772@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-gnomeGUI/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12721/FC-4 Modified Files: R-gnomeGUI.spec Log Message: Bump for FC-5 Index: R-gnomeGUI.spec =================================================================== RCS file: /cvs/extras/rpms/R-gnomeGUI/FC-4/R-gnomeGUI.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- R-gnomeGUI.spec 9 May 2005 20:10:18 -0000 1.5 +++ R-gnomeGUI.spec 1 Mar 2006 00:14:39 -0000 1.6 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 2.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz License: GPL version 2 or later. URL: http://cran.r-project.org/contrib @@ -53,6 +53,9 @@ %{_libdir}/R/share/glade/*.glade %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.1.0-5 +- bump for FC-5 + * Mon May 9 2005 Tom "spot" Callaway 2.1.0-4 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Wed Mar 1 00:14:46 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:14:46 -0500 Subject: rpms/R-gnomeGUI/devel R-gnomeGUI.spec,1.5,1.6 Message-ID: <200603010015.k210FYut012775@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-gnomeGUI/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12721/devel Modified Files: R-gnomeGUI.spec Log Message: Bump for FC-5 Index: R-gnomeGUI.spec =================================================================== RCS file: /cvs/extras/rpms/R-gnomeGUI/devel/R-gnomeGUI.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- R-gnomeGUI.spec 9 May 2005 20:10:18 -0000 1.5 +++ R-gnomeGUI.spec 1 Mar 2006 00:14:45 -0000 1.6 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 2.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz License: GPL version 2 or later. URL: http://cran.r-project.org/contrib @@ -53,6 +53,9 @@ %{_libdir}/R/share/glade/*.glade %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.1.0-5 +- bump for FC-5 + * Mon May 9 2005 Tom "spot" Callaway 2.1.0-4 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Wed Mar 1 00:14:32 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:14:32 -0500 Subject: rpms/R-gnomeGUI/FC-3 R-gnomeGUI.spec,1.3,1.4 Message-ID: <200603010015.k210FYLl012776@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-gnomeGUI/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12721/FC-3 Modified Files: R-gnomeGUI.spec Log Message: Bump for FC-5 Index: R-gnomeGUI.spec =================================================================== RCS file: /cvs/extras/rpms/R-gnomeGUI/FC-3/R-gnomeGUI.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- R-gnomeGUI.spec 9 May 2005 19:57:55 -0000 1.3 +++ R-gnomeGUI.spec 1 Mar 2006 00:14:31 -0000 1.4 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 2.1.0 -Release: 4%{?dist} +Release: 5%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz License: GPL version 2 or later. URL: http://cran.r-project.org/contrib @@ -53,6 +53,9 @@ %{_libdir}/R/share/glade/*.glade %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.1.0-5 +- bump for FC-5 + * Mon May 9 2005 Tom "spot" Callaway 2.1.0-4 - remove hardcoded dist tags From fedora-extras-commits at redhat.com Wed Mar 1 00:22:50 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:22:50 -0500 Subject: rpms/scalapack/FC-3 scalapack-1.7-64bitlibs.patch, 1.1, 1.2 scalapack-1.7-fedora3.patch, 1.1, 1.2 scalapack.spec, 1.8, 1.9 Message-ID: <200603010023.k210NNOk012891@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/FC-3 Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora3.patch scalapack.spec Log Message: Big rework of scalapack, now with shared libs scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalapack-1.7-64bitlibs.patch 15 May 2005 18:40:34 -0000 1.1 +++ scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:22:49 -0000 1.2 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-05-15 01:31:17.366972464 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-05-15 01:31:53.333504720 -0500 -@@ -29,13 +29,13 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 +@@ -29,7 +29,7 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,22 +9,3 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM - # - USEMPI = -DUsingMpiBlacs --SMPLIB = /usr/lib/libmpi.a -+SMPLIB = /usr/lib64/libmpi.a - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSLIB = $(BLACSdir)/libmpiblacs.a -@@ -94,9 +94,9 @@ - # The name of the libraries to be created/linked to - # - SCALAPACKLIB = $(home)/libscalapack.a --BLASLIB = /usr/lib/libblas.a -+BLASLIB = /usr/lib64/libblas.a - # --LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+LAMLIBS = /usr/lib64/liblam.a /usr/lib64/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi - - PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora3.patch: Index: scalapack-1.7-fedora3.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-fedora3.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalapack-1.7-fedora3.patch 9 May 2005 03:40:40 -0000 1.1 +++ scalapack-1.7-fedora3.patch 1 Mar 2006 00:22:49 -0000 1.2 @@ -1,5 +1,5 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.orig 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-05-08 22:38:39.000000000 -0500 +--- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -24,10 +24,10 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = /usr/lib/libmpi.a -+BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a -+BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a -+BLACSLIB = $(BLACSdir)/libmpiblacs.a ++SMPLIB = -lmpi ++BLACSFINIT = -lmpiblacsF77init ++BLACSCINIT = -lmpiblacsCinit ++BLACSLIB = -lmpiblacs TESTINGdir = $(home)/TESTING # @@ -37,25 +37,44 @@ NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -+CCFLAGS = $(RPM_OPT_FLAGS) ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC ++CCFLAGS = $(RPM_OPT_FLAGS) -fPIC SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) -@@ -94,9 +94,12 @@ +@@ -94,9 +94,13 @@ # The name of the libraries to be created/linked to # SCALAPACKLIB = $(home)/libscalapack.a -BLASLIB = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a -+BLASLIB = /usr/lib/libblas.a ++SCALAPACKSLIB = -L$(home) -lscalapack ++BLASLIB = -lblas # -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi ++LAMLIBS = -llam -lmpi -llamf77mpi ++EXTRALIBS = -ldl -lpthread -lutil + -+PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) +--- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 +@@ -49,7 +49,7 @@ + all: lib + #all: lib exe + +-lib: toolslib pblaslib redistlib scalapacklib ++lib: toolslib pblaslib redistlib scalapacklib shared + + exe: pblasexe redistexe scalapackexe + +@@ -90,3 +90,6 @@ + ( cd $(SRCdir); $(MAKE) clean ) + ( cd $(TOOLSdir); $(MAKE) clean ) + ( cd $(REDISTdir)/SRC; $(MAKE) clean ) ++ ++shared: scalapacklib ++ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scalapack.spec 9 Jan 2006 20:51:25 -0000 1.8 +++ scalapack.spec 1 Mar 2006 00:22:49 -0000 1.9 @@ -1,14 +1,14 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 9%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html Source0: http://www.netlib.org/scalapack/scalapack.tgz -BuildRequires: lapack, blas, lam, blacs-devel -BuildRequires: gcc-g77 -Requires: lapack, blas, lam, blacs +BuildRequires: lapack-devel, blas-devel, lam, blacs-devel +BuildRequires: gcc-g77, glibc-devel +Requires: lapack, blas-devel, lam, blacs-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: scalapack-1.7-fedora3.patch Patch1: scalapack-1.7-64bitlibs.patch @@ -39,6 +39,14 @@ BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK routines resemble their LAPACK equivalents as much as possible. +%package devel +Summary: Development libraries for scalapack +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for scalapack. + %prep %setup -q -c -n %{name}-%{version} %patch0 -p1 @@ -60,8 +68,18 @@ cp -f INSTALL/scalapack_install.ps ../ cp -f README ../ cp -f libscalapack.a ${RPM_BUILD_ROOT}%{_libdir} +cp -f libscalapack.so* ${RPM_BUILD_ROOT}%{_libdir} cp -f TESTING/x* ${RPM_BUILD_ROOT}%{_bindir} +cd ${RPM_BUILD_ROOT}%{_libdir} +ln -fs libscalapack.so.1.0.0 libscalapack.so.1 +ln -s libscalapack.so.1.0.0 libscalapack.so +cd .. + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %clean rm -fr ${RPM_BUILD_ROOT} @@ -69,9 +87,22 @@ %defattr(-,root,root) %doc scalapack_install.ps README %{_bindir}/x* +%{_libdir}/libscalapack.so.* + +%files devel +%defattr(-,root,root) %{_libdir}/libscalapack.a +%{_libdir}/libscalapack.so %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 +- fix 64 bit builds +- enable shared libraries +- split package into base and devel + +* Tue Feb 14 2006 Tom "spot" Callaway 1.7-10 +- Incorporate Andrew Gormanly's fixes + * Mon Jan 9 2006 Tom "spot" Callaway 1.7-9 - fix BR @@ -81,7 +112,7 @@ * Sun May 15 2005 Tom "spot" Callaway 1.7-7 - 64 bit library fix -* Mon May 9 2005 Tom "spot" Callaway 1.7-5 +* Mon May 9 2005 Tom "spot" Callaway 1.7-6 - remove hardcoded dist tags * Sun May 8 2005 Tom "spot" Callaway 1.7-4 From fedora-extras-commits at redhat.com Wed Mar 1 00:22:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:22:57 -0500 Subject: rpms/scalapack/FC-4 scalapack-1.7-64bitlibs.patch, 1.1, 1.2 scalapack-1.7-fedora.patch, 1.1, 1.2 scalapack.spec, 1.10, 1.11 Message-ID: <200603010023.k210NTxq012899@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/FC-4 Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora.patch scalapack.spec Log Message: Big rework of scalapack, now with shared libs scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalapack-1.7-64bitlibs.patch 15 May 2005 18:40:34 -0000 1.1 +++ scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:22:56 -0000 1.2 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-05-15 01:31:17.366972464 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-05-15 01:31:53.333504720 -0500 -@@ -29,13 +29,13 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 +@@ -29,7 +29,7 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,22 +9,3 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM - # - USEMPI = -DUsingMpiBlacs --SMPLIB = /usr/lib/libmpi.a -+SMPLIB = /usr/lib64/libmpi.a - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSLIB = $(BLACSdir)/libmpiblacs.a -@@ -94,9 +94,9 @@ - # The name of the libraries to be created/linked to - # - SCALAPACKLIB = $(home)/libscalapack.a --BLASLIB = /usr/lib/libblas.a -+BLASLIB = /usr/lib64/libblas.a - # --LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+LAMLIBS = /usr/lib64/liblam.a /usr/lib64/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi - - PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-fedora.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalapack-1.7-fedora.patch 24 Apr 2005 17:46:32 -0000 1.1 +++ scalapack-1.7-fedora.patch 1 Mar 2006 00:22:56 -0000 1.2 @@ -1,5 +1,14 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-04-18 16:22:41.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-04-18 16:34:42.000000000 -0500 +--- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 +@@ -19,7 +19,7 @@ + # The complete path to the top level of ScaLAPACK directory, usually + # $(HOME)/SCALAPACK + # +-home = $(HOME)/SCALAPACK ++home = $(RPM_BUILD_DIR)/scalapack-1.7/SCALAPACK + # + # The platform identifier to suffix to the end of library names + # @@ -29,16 +29,16 @@ # and the directory where the BLACS libraries are # @@ -15,10 +24,10 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = /usr/lib/libmpi.a -+BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a -+BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a -+BLACSLIB = $(BLACSdir)/libmpiblacs.a ++SMPLIB = -lmpi ++BLACSFINIT = -lmpiblacsF77init ++BLACSCINIT = -lmpiblacsCinit ++BLACSLIB = -lmpiblacs TESTINGdir = $(home)/TESTING # @@ -33,44 +42,53 @@ NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -+CCFLAGS = $(RPM_OPT_FLAGS) ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC ++CCFLAGS = $(RPM_OPT_FLAGS) -fPIC SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) -@@ -94,7 +94,7 @@ +@@ -82,7 +82,7 @@ + # C preprocessor defs for compilation + # (-DNoChange, -DAdd_, -DUpCase, or -Df77IsF2C) + # +-CDEFS = -Df77IsF2C -DNO_IEEE $(USEMPI) ++CDEFS = -DAdd_ -DNO_IEEE $(USEMPI) + # + # The archiver and the flag(s) to use when building archive (library) + # Also the ranlib routine. If your system has no ranlib, set RANLIB = echo +@@ -94,9 +94,13 @@ # The name of the libraries to be created/linked to # SCALAPACKLIB = $(home)/libscalapack.a -BLASLIB = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a -+BLASLIB = /usr/lib/libblas.a - # - PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) - PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-04-18 16:59:45.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-04-18 16:59:59.000000000 -0500 -@@ -19,7 +19,7 @@ - # The complete path to the top level of ScaLAPACK directory, usually - # $(HOME)/SCALAPACK - # --home = $(HOME)/SCALAPACK -+home = $(RPM_BUILD_DIR)/scalapack-1.7/SCALAPACK - # - # The platform identifier to suffix to the end of library names - # ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-04-18 17:17:04.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-04-18 17:20:06.000000000 -0500 -@@ -96,7 +96,10 @@ - SCALAPACKLIB = $(home)/libscalapack.a - BLASLIB = /usr/lib/libblas.a ++SCALAPACKSLIB = -L$(home) -lscalapack ++BLASLIB = -lblas # -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi ++LAMLIBS = -llam -lmpi -llamf77mpi ++EXTRALIBS = -ldl -lpthread -lutil + -+PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) +--- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 +@@ -49,7 +49,7 @@ + all: lib + #all: lib exe + +-lib: toolslib pblaslib redistlib scalapacklib ++lib: toolslib pblaslib redistlib scalapacklib shared + + exe: pblasexe redistexe scalapackexe + +@@ -90,3 +90,6 @@ + ( cd $(SRCdir); $(MAKE) clean ) + ( cd $(TOOLSdir); $(MAKE) clean ) + ( cd $(REDISTdir)/SRC; $(MAKE) clean ) ++ ++shared: scalapacklib ++ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scalapack.spec 9 Jan 2006 20:51:30 -0000 1.10 +++ scalapack.spec 1 Mar 2006 00:22:56 -0000 1.11 @@ -1,14 +1,14 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 9%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html Source0: http://www.netlib.org/scalapack/scalapack.tgz BuildRequires: lapack-devel, blas-devel, lam, blacs-devel -BuildRequires: gcc-gfortran -Requires: lapack, blas, lam, blacs +BuildRequires: gcc-gfortran, glibc-devel +Requires: lapack, blas-devel, lam, blacs-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: scalapack-1.7-fedora.patch Patch1: scalapack-1.7-64bitlibs.patch @@ -39,6 +39,14 @@ BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK routines resemble their LAPACK equivalents as much as possible. +%package devel +Summary: Development libraries for scalapack +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for scalapack. + %prep %setup -q -c -n %{name}-%{version} %patch0 -p1 @@ -60,8 +68,18 @@ cp -f INSTALL/scalapack_install.ps ../ cp -f README ../ cp -f libscalapack.a ${RPM_BUILD_ROOT}%{_libdir} +cp -f libscalapack.so* ${RPM_BUILD_ROOT}%{_libdir} cp -f TESTING/x* ${RPM_BUILD_ROOT}%{_bindir} +cd ${RPM_BUILD_ROOT}%{_libdir} +ln -fs libscalapack.so.1.0.0 libscalapack.so.1 +ln -s libscalapack.so.1.0.0 libscalapack.so +cd .. + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %clean rm -fr ${RPM_BUILD_ROOT} @@ -69,9 +87,22 @@ %defattr(-,root,root) %doc scalapack_install.ps README %{_bindir}/x* +%{_libdir}/libscalapack.so.* + +%files devel +%defattr(-,root,root) %{_libdir}/libscalapack.a +%{_libdir}/libscalapack.so %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 +- fix 64 bit builds +- enable shared libraries +- split package into base and devel + +* Tue Feb 14 2006 Tom "spot" Callaway 1.7-10 +- Incorporate Andrew Gormanly's fixes + * Mon Jan 9 2006 Tom "spot" Callaway 1.7-9 - fix BR From fedora-extras-commits at redhat.com Wed Mar 1 00:23:03 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:23:03 -0500 Subject: rpms/scalapack/devel scalapack-1.7-64bitlibs.patch, 1.1, 1.2 scalapack-1.7-fedora.patch, 1.2, 1.3 scalapack.spec, 1.11, 1.12 Message-ID: <200603010023.k210NZWS012908@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12811/devel Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora.patch scalapack.spec Log Message: Big rework of scalapack, now with shared libs scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scalapack-1.7-64bitlibs.patch 15 May 2005 18:40:34 -0000 1.1 +++ scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:23:02 -0000 1.2 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2005-05-15 01:31:17.366972464 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2005-05-15 01:31:53.333504720 -0500 -@@ -29,13 +29,13 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 +@@ -29,7 +29,7 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,22 +9,3 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM - # - USEMPI = -DUsingMpiBlacs --SMPLIB = /usr/lib/libmpi.a -+SMPLIB = /usr/lib64/libmpi.a - BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a - BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a - BLACSLIB = $(BLACSdir)/libmpiblacs.a -@@ -94,9 +94,9 @@ - # The name of the libraries to be created/linked to - # - SCALAPACKLIB = $(home)/libscalapack.a --BLASLIB = /usr/lib/libblas.a -+BLASLIB = /usr/lib64/libblas.a - # --LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+LAMLIBS = /usr/lib64/liblam.a /usr/lib64/liblamf77mpi.a - EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi - - PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-fedora.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-fedora.patch 14 Feb 2006 14:47:18 -0000 1.2 +++ scalapack-1.7-fedora.patch 1 Mar 2006 00:23:02 -0000 1.3 @@ -1,5 +1,5 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2001-08-09 03:59:50.000000000 +0100 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-10 13:05:56.000000000 +0000 +--- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -24,10 +24,10 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = /usr/lib/libmpi.a -+BLACSFINIT = $(BLACSdir)/libmpiblacsF77init.a -+BLACSCINIT = $(BLACSdir)/libmpiblacsCinit.a -+BLACSLIB = $(BLACSdir)/libmpiblacs.a ++SMPLIB = -lmpi ++BLACSFINIT = -lmpiblacsF77init ++BLACSCINIT = -lmpiblacsCinit ++BLACSLIB = -lmpiblacs TESTINGdir = $(home)/TESTING # @@ -42,8 +42,8 @@ NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -+CCFLAGS = $(RPM_OPT_FLAGS) ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC ++CCFLAGS = $(RPM_OPT_FLAGS) -fPIC SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) @@ -56,20 +56,39 @@ # # The archiver and the flag(s) to use when building archive (library) # Also the ranlib routine. If your system has no ranlib, set RANLIB = echo -@@ -94,9 +94,12 @@ +@@ -94,9 +94,13 @@ # The name of the libraries to be created/linked to # SCALAPACKLIB = $(home)/libscalapack.a -BLASLIB = /usr/local/lib/libf77blas.a /usr/local/lib/libatlas.a -+BLASLIB = /usr/lib/libblas.a ++SCALAPACKSLIB = -L$(home) -lscalapack ++BLASLIB = -lblas # -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = /usr/lib/liblam.a /usr/lib/liblamf77mpi.a -+EXTRALIBS = -ldl -lpthread -llam -lmpi -llamf77mpi -lutil ++LAMLIBS = -llam -lmpi -llamf77mpi ++EXTRALIBS = -ldl -lpthread -lutil + -+PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) -+RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) ++RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) +--- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 +@@ -49,7 +49,7 @@ + all: lib + #all: lib exe + +-lib: toolslib pblaslib redistlib scalapacklib ++lib: toolslib pblaslib redistlib scalapacklib shared + + exe: pblasexe redistexe scalapackexe + +@@ -90,3 +90,6 @@ + ( cd $(SRCdir); $(MAKE) clean ) + ( cd $(TOOLSdir); $(MAKE) clean ) + ( cd $(REDISTdir)/SRC; $(MAKE) clean ) ++ ++shared: scalapacklib ++ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scalapack.spec 14 Feb 2006 14:47:18 -0000 1.11 +++ scalapack.spec 1 Mar 2006 00:23:02 -0000 1.12 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 10%{?dist} +Release: 11%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -39,6 +39,14 @@ BLACS. One of the design goals of ScaLAPACK was to have the ScaLAPACK routines resemble their LAPACK equivalents as much as possible. +%package devel +Summary: Development libraries for scalapack +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains development libraries for scalapack. + %prep %setup -q -c -n %{name}-%{version} %patch0 -p1 @@ -60,8 +68,18 @@ cp -f INSTALL/scalapack_install.ps ../ cp -f README ../ cp -f libscalapack.a ${RPM_BUILD_ROOT}%{_libdir} +cp -f libscalapack.so* ${RPM_BUILD_ROOT}%{_libdir} cp -f TESTING/x* ${RPM_BUILD_ROOT}%{_bindir} +cd ${RPM_BUILD_ROOT}%{_libdir} +ln -fs libscalapack.so.1.0.0 libscalapack.so.1 +ln -s libscalapack.so.1.0.0 libscalapack.so +cd .. + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %clean rm -fr ${RPM_BUILD_ROOT} @@ -69,9 +87,19 @@ %defattr(-,root,root) %doc scalapack_install.ps README %{_bindir}/x* +%{_libdir}/libscalapack.so.* + +%files devel +%defattr(-,root,root) %{_libdir}/libscalapack.a +%{_libdir}/libscalapack.so %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 +- fix 64 bit builds +- enable shared libraries +- split package into base and devel + * Tue Feb 14 2006 Tom "spot" Callaway 1.7-10 - Incorporate Andrew Gormanly's fixes From fedora-extras-commits at redhat.com Wed Mar 1 00:35:44 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:35:44 -0500 Subject: rpms/rootsh/FC-3 rootsh.spec,1.1,1.2 Message-ID: <200603010036.k210aGod013222@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rootsh/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13173/FC-3 Modified Files: rootsh.spec Log Message: Bump for FC-6... gotcha! Index: rootsh.spec =================================================================== RCS file: /cvs/extras/rpms/rootsh/FC-3/rootsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rootsh.spec 8 Jan 2006 17:23:35 -0000 1.1 +++ rootsh.spec 1 Mar 2006 00:35:44 -0000 1.2 @@ -1,7 +1,7 @@ Name: rootsh Summary: Shell wrapper for auditing Version: 1.5.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: http://download.sourceforge.net/rootsh/%{name}-%{version}.tar.gz @@ -35,6 +35,9 @@ %{_mandir}/man1/rootsh.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.5.2-3 +- bump for FC-5 + * Sat Jan 7 2006 Tom "spot" Callaway 1.5.2-2 - forgot to include COPYING From fedora-extras-commits at redhat.com Wed Mar 1 00:35:50 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:35:50 -0500 Subject: rpms/rootsh/FC-4 rootsh.spec,1.1,1.2 Message-ID: <200603010036.k210aM2O013225@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rootsh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13173/FC-4 Modified Files: rootsh.spec Log Message: Bump for FC-6... gotcha! Index: rootsh.spec =================================================================== RCS file: /cvs/extras/rpms/rootsh/FC-4/rootsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rootsh.spec 8 Jan 2006 17:23:35 -0000 1.1 +++ rootsh.spec 1 Mar 2006 00:35:50 -0000 1.2 @@ -1,7 +1,7 @@ Name: rootsh Summary: Shell wrapper for auditing Version: 1.5.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: http://download.sourceforge.net/rootsh/%{name}-%{version}.tar.gz @@ -35,6 +35,9 @@ %{_mandir}/man1/rootsh.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.5.2-3 +- bump for FC-5 + * Sat Jan 7 2006 Tom "spot" Callaway 1.5.2-2 - forgot to include COPYING From fedora-extras-commits at redhat.com Wed Mar 1 00:35:56 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:35:56 -0500 Subject: rpms/rootsh/devel rootsh.spec,1.1,1.2 Message-ID: <200603010036.k210aSKh013228@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rootsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13173/devel Modified Files: rootsh.spec Log Message: Bump for FC-6... gotcha! Index: rootsh.spec =================================================================== RCS file: /cvs/extras/rpms/rootsh/devel/rootsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rootsh.spec 8 Jan 2006 17:23:35 -0000 1.1 +++ rootsh.spec 1 Mar 2006 00:35:56 -0000 1.2 @@ -1,7 +1,7 @@ Name: rootsh Summary: Shell wrapper for auditing Version: 1.5.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System Source0: http://download.sourceforge.net/rootsh/%{name}-%{version}.tar.gz @@ -35,6 +35,9 @@ %{_mandir}/man1/rootsh.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.5.2-3 +- bump for FC-5 + * Sat Jan 7 2006 Tom "spot" Callaway 1.5.2-2 - forgot to include COPYING From fedora-extras-commits at redhat.com Wed Mar 1 00:38:26 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:38:26 -0500 Subject: rpms/rocksndiamonds/FC-3 rocksndiamonds.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603010038.k210cwsp013410@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13234/FC-3 Modified Files: rocksndiamonds.spec sources Log Message: Bump to 3.1.2 Index: rocksndiamonds.spec =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/FC-3/rocksndiamonds.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rocksndiamonds.spec 23 Sep 2005 14:46:17 -0000 1.1 +++ rocksndiamonds.spec 1 Mar 2006 00:38:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: rocksndiamonds -Version: 3.1.1 -Release: 2%{?dist} +Version: 3.1.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games Summary: Underground digging game @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 3.1.2-1 +- bump to 3.1.2 + * Thu Sep 22 2005 Tom "spot" Callaway 3.1.1-2 - add missing BR: SDL_net-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Sep 2005 14:46:17 -0000 1.2 +++ sources 1 Mar 2006 00:38:25 -0000 1.3 @@ -1 +1 @@ -6a6e0397f043314e3df8ee85c03590b5 rocksndiamonds-3.1.1.tar.gz +489d1c1401ef1fe1bd218ba465b05594 rocksndiamonds-3.1.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 00:38:45 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:38:45 -0500 Subject: rpms/rocksndiamonds/FC-4 rocksndiamonds.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603010039.k210dHN9013418@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13234/FC-4 Modified Files: rocksndiamonds.spec sources Log Message: Bump to 3.1.2 Index: rocksndiamonds.spec =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/FC-4/rocksndiamonds.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rocksndiamonds.spec 23 Sep 2005 14:46:17 -0000 1.1 +++ rocksndiamonds.spec 1 Mar 2006 00:38:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: rocksndiamonds -Version: 3.1.1 -Release: 2%{?dist} +Version: 3.1.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games Summary: Underground digging game @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 3.1.2-1 +- bump to 3.1.2 + * Thu Sep 22 2005 Tom "spot" Callaway 3.1.1-2 - add missing BR: SDL_net-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Sep 2005 14:46:17 -0000 1.2 +++ sources 1 Mar 2006 00:38:45 -0000 1.3 @@ -1 +1 @@ -6a6e0397f043314e3df8ee85c03590b5 rocksndiamonds-3.1.1.tar.gz +489d1c1401ef1fe1bd218ba465b05594 rocksndiamonds-3.1.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 00:38:51 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:38:51 -0500 Subject: rpms/rocksndiamonds/devel .cvsignore, 1.2, 1.3 rocksndiamonds.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603010039.k210dN2l013424@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rocksndiamonds/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13234/devel Modified Files: .cvsignore rocksndiamonds.spec sources Log Message: Bump to 3.1.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 23 Sep 2005 14:46:17 -0000 1.2 +++ .cvsignore 1 Mar 2006 00:38:51 -0000 1.3 @@ -1 +1,2 @@ rocksndiamonds-3.1.1.tar.gz +rocksndiamonds-3.1.2.tar.gz Index: rocksndiamonds.spec =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/devel/rocksndiamonds.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rocksndiamonds.spec 23 Sep 2005 14:46:17 -0000 1.1 +++ rocksndiamonds.spec 1 Mar 2006 00:38:51 -0000 1.2 @@ -1,6 +1,6 @@ Name: rocksndiamonds -Version: 3.1.1 -Release: 2%{?dist} +Version: 3.1.2 +Release: 1%{?dist} License: GPL Group: Amusements/Games Summary: Underground digging game @@ -10,7 +10,7 @@ Source2: rocksndiamonds.png Patch0: rocksndiamonds-3.1.1-nosmpeg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel, xorg-x11-devel, desktop-file-utils +BuildRequires: SDL-devel, libX11-devel, desktop-file-utils, xorg-x11-proto-devel BuildRequires: SDL_image-devel, SDL_mixer-devel, SDL_net-devel %description @@ -61,6 +61,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 3.1.2-1 +- bump to 3.1.2 + * Thu Sep 22 2005 Tom "spot" Callaway 3.1.1-2 - add missing BR: SDL_net-devel Index: sources =================================================================== RCS file: /cvs/extras/rpms/rocksndiamonds/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 23 Sep 2005 14:46:17 -0000 1.2 +++ sources 1 Mar 2006 00:38:51 -0000 1.3 @@ -1 +1 @@ -6a6e0397f043314e3df8ee85c03590b5 rocksndiamonds-3.1.1.tar.gz +489d1c1401ef1fe1bd218ba465b05594 rocksndiamonds-3.1.2.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 00:41:48 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:41:48 -0500 Subject: rpms/udunits/FC-3 udunits.spec,1.7,1.8 Message-ID: <200603010042.k210gKGc013606@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/udunits/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13472/FC-3 Modified Files: udunits.spec Log Message: baby got bump! Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/FC-3/udunits.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- udunits.spec 9 Jul 2005 21:38:57 -0000 1.7 +++ udunits.spec 1 Mar 2006 00:41:48 -0000 1.8 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -105,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.12.4-10 +- bump for FC-5 + * Sat Jul 9 2005 Ed Hill 1.12.4-9 - use -fPIC for all arches and remove redundant man3f entry From fedora-extras-commits at redhat.com Wed Mar 1 00:41:54 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:41:54 -0500 Subject: rpms/udunits/FC-4 udunits.spec,1.7,1.8 Message-ID: <200603010042.k210gQYU013609@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/udunits/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13472/FC-4 Modified Files: udunits.spec Log Message: baby got bump! Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/FC-4/udunits.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- udunits.spec 9 Jul 2005 21:38:57 -0000 1.7 +++ udunits.spec 1 Mar 2006 00:41:53 -0000 1.8 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -105,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.12.4-10 +- bump for FC-5 + * Sat Jul 9 2005 Ed Hill 1.12.4-9 - use -fPIC for all arches and remove redundant man3f entry From fedora-extras-commits at redhat.com Wed Mar 1 00:41:59 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:41:59 -0500 Subject: rpms/udunits/devel udunits.spec,1.7,1.8 Message-ID: <200603010042.k210gWsd013612@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/udunits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13472/devel Modified Files: udunits.spec Log Message: baby got bump! Index: udunits.spec =================================================================== RCS file: /cvs/extras/rpms/udunits/devel/udunits.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- udunits.spec 9 Jul 2005 21:39:03 -0000 1.7 +++ udunits.spec 1 Mar 2006 00:41:59 -0000 1.8 @@ -1,6 +1,6 @@ Name: udunits Version: 1.12.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A library for manipulating units of physical quantities License: Freely distributable (BSD-like) Group: System Environment/Libraries @@ -105,6 +105,9 @@ %{_mandir}/man1/udunitsperl.1.gz %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.12.4-10 +- bump for FC-5 + * Sat Jul 9 2005 Ed Hill 1.12.4-9 - use -fPIC for all arches and remove redundant man3f entry From fedora-extras-commits at redhat.com Wed Mar 1 00:50:16 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:50:16 -0500 Subject: rpms/xbsql/FC-3 xbsql.spec,1.2,1.3 Message-ID: <200603010050.k210onMZ013861@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13802/FC-3 Modified Files: xbsql.spec Log Message: bump for eff sea fi Index: xbsql.spec =================================================================== RCS file: /cvs/extras/rpms/xbsql/FC-3/xbsql.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbsql.spec 18 Aug 2005 15:37:59 -0000 1.2 +++ xbsql.spec 1 Mar 2006 00:50:16 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbsql Summary: A SQL wrapper for xbase Version: 0.11 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Libraries License: LGPL URL: http://www.quaking.demon.co.uk/xbsql/ @@ -56,6 +56,9 @@ %{_libdir}/*.a %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.11-6 +- bump for FC-5 + * Thu Aug 18 2005 Tom "spot" Callaway 0.11-5 - fix 64 bit ncurses detection From fedora-extras-commits at redhat.com Wed Mar 1 00:50:22 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:50:22 -0500 Subject: rpms/xbsql/FC-4 xbsql.spec,1.2,1.3 Message-ID: <200603010050.k210osVm013864@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13802/FC-4 Modified Files: xbsql.spec Log Message: bump for eff sea fi Index: xbsql.spec =================================================================== RCS file: /cvs/extras/rpms/xbsql/FC-4/xbsql.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbsql.spec 18 Aug 2005 15:38:00 -0000 1.2 +++ xbsql.spec 1 Mar 2006 00:50:22 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbsql Summary: A SQL wrapper for xbase Version: 0.11 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Libraries License: LGPL URL: http://www.quaking.demon.co.uk/xbsql/ @@ -56,6 +56,9 @@ %{_libdir}/*.a %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.11-6 +- bump for FC-5 + * Thu Aug 18 2005 Tom "spot" Callaway 0.11-5 - fix 64 bit ncurses detection From fedora-extras-commits at redhat.com Wed Mar 1 00:50:28 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 19:50:28 -0500 Subject: rpms/xbsql/devel xbsql.spec,1.2,1.3 Message-ID: <200603010051.k210p0v3013867@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbsql/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13802/devel Modified Files: xbsql.spec Log Message: bump for eff sea fi Index: xbsql.spec =================================================================== RCS file: /cvs/extras/rpms/xbsql/devel/xbsql.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbsql.spec 18 Aug 2005 15:38:00 -0000 1.2 +++ xbsql.spec 1 Mar 2006 00:50:28 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbsql Summary: A SQL wrapper for xbase Version: 0.11 -Release: 5%{?dist} +Release: 6%{?dist} Group: Development/Libraries License: LGPL URL: http://www.quaking.demon.co.uk/xbsql/ @@ -56,6 +56,9 @@ %{_libdir}/*.a %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.11-6 +- bump for FC-5 + * Thu Aug 18 2005 Tom "spot" Callaway 0.11-5 - fix 64 bit ncurses detection From fedora-extras-commits at redhat.com Wed Mar 1 01:04:32 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 28 Feb 2006 20:04:32 -0500 Subject: rpms/libglademm24/devel .cvsignore, 1.4, 1.5 libglademm.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200603010105.k21156PH016011@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libglademm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15976 Modified Files: .cvsignore libglademm.spec sources Log Message: Update to version 2.6.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Sep 2005 07:22:58 -0000 1.4 +++ .cvsignore 1 Mar 2006 01:04:32 -0000 1.5 @@ -1 +1 @@ -libglademm-2.6.1.tar.bz2 +libglademm-2.6.2.tar.bz2 Index: libglademm.spec =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/libglademm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libglademm.spec 26 Nov 2005 10:54:59 -0000 1.8 +++ libglademm.spec 1 Mar 2006 01:04:32 -0000 1.9 @@ -1,6 +1,6 @@ Name: libglademm24 -Version: 2.6.1 -Release: 2 +Version: 2.6.2 +Release: 1 Summary: C++ wrapper for libglade @@ -78,6 +78,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Feb 28 2006 Denis Leroy - 2.6.2-1 +- Update to version 2.6.2 + * Fri Nov 25 2005 Denis Leroy - 2.6.1-2 - Disable static libraries Index: sources =================================================================== RCS file: /cvs/extras/rpms/libglademm24/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Sep 2005 07:22:58 -0000 1.4 +++ sources 1 Mar 2006 01:04:32 -0000 1.5 @@ -1 +1 @@ -0e9dd1e7b0e3170b56c50e5c4630fe95 libglademm-2.6.1.tar.bz2 +431a7d04514cabe26fcaedd7767b6a93 libglademm-2.6.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 01:11:31 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:11:31 -0500 Subject: rpms/wlassistant/devel wlassistant-0.5.5-rpath.patch, NONE, 1.1 sources, 1.2, 1.3 wlassistant.spec, 1.2, 1.3 Message-ID: <200603010111.k211BmES016253@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/wlassistant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16179/devel Modified Files: sources wlassistant.spec Added Files: wlassistant-0.5.5-rpath.patch Log Message: scons annoys me. bumping to 0.5.5 wlassistant-0.5.5-rpath.patch: --- NEW FILE wlassistant-0.5.5-rpath.patch --- --- wlassistant-0.5.5/bksys/kde.py.BAD 2006-02-28 19:00:25.000000000 -0600 +++ wlassistant-0.5.5/bksys/kde.py 2006-02-28 19:01:14.000000000 -0600 @@ -25,10 +25,7 @@ lenv.Append( CPPFLAGS = '-DQT_NO_TRANSLATION' ) if 'rpath' in _flags: ## Use this to set rpath - this may cause trouble if folders are moved (chrpath) - kdelibpaths=[] - if lenv['KDELIBPATH'] == lenv['KDELIB']: kdelibpaths = [lenv['KDELIB']] - else: kdelibpaths = [lenv['KDELIBPATH'], lenv['KDELIB']] - lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']]+kdelibpaths ) + lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']] ) if 'thread' in _flags: ## Uncomment the following if you need threading support lenv.KDEaddflags_cxx( ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] ) Index: sources =================================================================== RCS file: /cvs/extras/rpms/wlassistant/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Sep 2005 20:52:54 -0000 1.2 +++ sources 1 Mar 2006 01:11:30 -0000 1.3 @@ -1 +1 @@ -4836d595a27f34c24784cdf9c2a9d5a8 wlassistant-0.5.4a.tar.bz2 +1f30f1384b03662a9a0b75fa777f21d6 wlassistant-0.5.5.tar.bz2 Index: wlassistant.spec =================================================================== RCS file: /cvs/extras/rpms/wlassistant/devel/wlassistant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wlassistant.spec 17 Sep 2005 21:31:56 -0000 1.2 +++ wlassistant.spec 1 Mar 2006 01:11:30 -0000 1.3 @@ -1,6 +1,6 @@ Name: wlassistant -Version: 0.5.4a -Release: 3%{?dist} +Version: 0.5.5 +Release: 1%{?dist} License: GPL Group: Applications/System Summary: Wireless network management tool @@ -10,11 +10,12 @@ Source2: wlassistant.pamd Source3: wlassistant.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools +BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools, scons +BuildRequires: qt-devel Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: usermode, wireless-tools, net-tools, dhclient -Patch0: wlassistant-0.5.4a-rpath.patch +Patch0: wlassistant-0.5.5-rpath.patch %description Wireless Assistant (wlassistant) is a small application that allows you to @@ -32,7 +33,9 @@ %patch0 -p1 %build -%configure +PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` +sed -i "s|'-O2'|[$PARSED_OPT_FLAGS]|" bksys/generic.py +./configure make %{?_smp_mflags} %install @@ -71,7 +74,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README NEWS ChangeLog +%doc doc/AUTHORS doc/COPYING doc/README doc/NEWS doc/TODO ChangeLog %config(noreplace) %{_sysconfdir}/pam.d/wlassistant %config(noreplace) %{_sysconfdir}/security/console.apps/wlassistant %{_bindir}/wlassistant @@ -81,6 +84,9 @@ %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.5.5-1 +- bump to 0.5.5 + * Sat Sep 17 2005 Tom "spot" Callaway 0.5.4a-3 - use .desktop file as SOURCE3 rather than screwing around with dos2unix From fedora-extras-commits at redhat.com Wed Mar 1 01:11:18 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:11:18 -0500 Subject: rpms/wlassistant/FC-3 wlassistant-0.5.5-rpath.patch, NONE, 1.1 sources, 1.2, 1.3 wlassistant.spec, 1.2, 1.3 Message-ID: <200603010111.k211Bpx3016262@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/wlassistant/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16179/FC-3 Modified Files: sources wlassistant.spec Added Files: wlassistant-0.5.5-rpath.patch Log Message: scons annoys me. bumping to 0.5.5 wlassistant-0.5.5-rpath.patch: --- NEW FILE wlassistant-0.5.5-rpath.patch --- --- wlassistant-0.5.5/bksys/kde.py.BAD 2006-02-28 19:00:25.000000000 -0600 +++ wlassistant-0.5.5/bksys/kde.py 2006-02-28 19:01:14.000000000 -0600 @@ -25,10 +25,7 @@ lenv.Append( CPPFLAGS = '-DQT_NO_TRANSLATION' ) if 'rpath' in _flags: ## Use this to set rpath - this may cause trouble if folders are moved (chrpath) - kdelibpaths=[] - if lenv['KDELIBPATH'] == lenv['KDELIB']: kdelibpaths = [lenv['KDELIB']] - else: kdelibpaths = [lenv['KDELIBPATH'], lenv['KDELIB']] - lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']]+kdelibpaths ) + lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']] ) if 'thread' in _flags: ## Uncomment the following if you need threading support lenv.KDEaddflags_cxx( ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] ) Index: sources =================================================================== RCS file: /cvs/extras/rpms/wlassistant/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Sep 2005 20:52:54 -0000 1.2 +++ sources 1 Mar 2006 01:11:18 -0000 1.3 @@ -1 +1 @@ -4836d595a27f34c24784cdf9c2a9d5a8 wlassistant-0.5.4a.tar.bz2 +1f30f1384b03662a9a0b75fa777f21d6 wlassistant-0.5.5.tar.bz2 Index: wlassistant.spec =================================================================== RCS file: /cvs/extras/rpms/wlassistant/FC-3/wlassistant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wlassistant.spec 17 Sep 2005 21:31:55 -0000 1.2 +++ wlassistant.spec 1 Mar 2006 01:11:18 -0000 1.3 @@ -1,6 +1,6 @@ Name: wlassistant -Version: 0.5.4a -Release: 3%{?dist} +Version: 0.5.5 +Release: 1%{?dist} License: GPL Group: Applications/System Summary: Wireless network management tool @@ -10,11 +10,12 @@ Source2: wlassistant.pamd Source3: wlassistant.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools +BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools, scons +BuildRequires: qt-devel Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: usermode, wireless-tools, net-tools, dhclient -Patch0: wlassistant-0.5.4a-rpath.patch +Patch0: wlassistant-0.5.5-rpath.patch %description Wireless Assistant (wlassistant) is a small application that allows you to @@ -32,7 +33,9 @@ %patch0 -p1 %build -%configure +PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` +sed -i "s|'-O2'|[$PARSED_OPT_FLAGS]|" bksys/generic.py +./configure make %{?_smp_mflags} %install @@ -71,7 +74,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README NEWS ChangeLog +%doc doc/AUTHORS doc/COPYING doc/README doc/NEWS doc/TODO ChangeLog %config(noreplace) %{_sysconfdir}/pam.d/wlassistant %config(noreplace) %{_sysconfdir}/security/console.apps/wlassistant %{_bindir}/wlassistant @@ -81,6 +84,9 @@ %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.5.5-1 +- bump to 0.5.5 + * Sat Sep 17 2005 Tom "spot" Callaway 0.5.4a-3 - use .desktop file as SOURCE3 rather than screwing around with dos2unix From fedora-extras-commits at redhat.com Wed Mar 1 01:11:25 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:11:25 -0500 Subject: rpms/wlassistant/FC-4 wlassistant-0.5.5-rpath.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 wlassistant.spec, 1.2, 1.3 Message-ID: <200603010111.k211BvTA016272@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/wlassistant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16179/FC-4 Modified Files: .cvsignore sources wlassistant.spec Added Files: wlassistant-0.5.5-rpath.patch Log Message: scons annoys me. bumping to 0.5.5 wlassistant-0.5.5-rpath.patch: --- NEW FILE wlassistant-0.5.5-rpath.patch --- --- wlassistant-0.5.5/bksys/kde.py.BAD 2006-02-28 19:00:25.000000000 -0600 +++ wlassistant-0.5.5/bksys/kde.py 2006-02-28 19:01:14.000000000 -0600 @@ -25,10 +25,7 @@ lenv.Append( CPPFLAGS = '-DQT_NO_TRANSLATION' ) if 'rpath' in _flags: ## Use this to set rpath - this may cause trouble if folders are moved (chrpath) - kdelibpaths=[] - if lenv['KDELIBPATH'] == lenv['KDELIB']: kdelibpaths = [lenv['KDELIB']] - else: kdelibpaths = [lenv['KDELIBPATH'], lenv['KDELIB']] - lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']]+kdelibpaths ) + lenv.Append( RPATH = [lenv['QTLIBPATH'], lenv['KDEMODULE']] ) if 'thread' in _flags: ## Uncomment the following if you need threading support lenv.KDEaddflags_cxx( ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] ) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wlassistant/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Sep 2005 20:52:54 -0000 1.2 +++ .cvsignore 1 Mar 2006 01:11:24 -0000 1.3 @@ -1 +1,2 @@ wlassistant-0.5.4a.tar.bz2 +wlassistant-0.5.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wlassistant/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Sep 2005 20:52:54 -0000 1.2 +++ sources 1 Mar 2006 01:11:24 -0000 1.3 @@ -1 +1 @@ -4836d595a27f34c24784cdf9c2a9d5a8 wlassistant-0.5.4a.tar.bz2 +1f30f1384b03662a9a0b75fa777f21d6 wlassistant-0.5.5.tar.bz2 Index: wlassistant.spec =================================================================== RCS file: /cvs/extras/rpms/wlassistant/FC-4/wlassistant.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- wlassistant.spec 17 Sep 2005 21:31:55 -0000 1.2 +++ wlassistant.spec 1 Mar 2006 01:11:24 -0000 1.3 @@ -1,6 +1,6 @@ Name: wlassistant -Version: 0.5.4a -Release: 3%{?dist} +Version: 0.5.5 +Release: 1%{?dist} License: GPL Group: Applications/System Summary: Wireless network management tool @@ -10,11 +10,12 @@ Source2: wlassistant.pamd Source3: wlassistant.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools +BuildRequires: kdebase-devel, desktop-file-utils, wireless-tools, scons +BuildRequires: qt-devel Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: usermode, wireless-tools, net-tools, dhclient -Patch0: wlassistant-0.5.4a-rpath.patch +Patch0: wlassistant-0.5.5-rpath.patch %description Wireless Assistant (wlassistant) is a small application that allows you to @@ -32,7 +33,9 @@ %patch0 -p1 %build -%configure +PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` +sed -i "s|'-O2'|[$PARSED_OPT_FLAGS]|" bksys/generic.py +./configure make %{?_smp_mflags} %install @@ -71,7 +74,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING README NEWS ChangeLog +%doc doc/AUTHORS doc/COPYING doc/README doc/NEWS doc/TODO ChangeLog %config(noreplace) %{_sysconfdir}/pam.d/wlassistant %config(noreplace) %{_sysconfdir}/security/console.apps/wlassistant %{_bindir}/wlassistant @@ -81,6 +84,9 @@ %{_datadir}/icons/hicolor/32x32/apps/wlassistant.png %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 0.5.5-1 +- bump to 0.5.5 + * Sat Sep 17 2005 Tom "spot" Callaway 0.5.4a-3 - use .desktop file as SOURCE3 rather than screwing around with dos2unix From fedora-extras-commits at redhat.com Wed Mar 1 01:11:59 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 28 Feb 2006 20:11:59 -0500 Subject: rpms/libgnomecanvasmm26/devel libgnomecanvasmm.spec,1.8,1.9 Message-ID: <200603010112.k211CVn0016300@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomecanvasmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16278 Modified Files: libgnomecanvasmm.spec Log Message: Rebuild Index: libgnomecanvasmm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libgnomecanvasmm.spec 26 Nov 2005 10:57:22 -0000 1.8 +++ libgnomecanvasmm.spec 1 Mar 2006 01:11:59 -0000 1.9 @@ -1,6 +1,6 @@ Name: libgnomecanvasmm26 Version: 2.12.0 -Release: 2 +Release: 3 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -74,6 +74,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Feb 28 2006 Denis Leroy - 2.12.0-3 +- Rebuild + * Fri Nov 25 2005 Denis Leroy - 2.12.0-2 - Disabled static libraries From fedora-extras-commits at redhat.com Wed Mar 1 01:14:30 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:14:30 -0500 Subject: rpms/xbase/FC-3 xbase.spec,1.2,1.3 Message-ID: <200603010115.k211F29k016565@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16356/FC-3 Modified Files: xbase.spec Log Message: Bump for FC-5 Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/FC-3/xbase.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbase.spec 10 Jul 2005 13:49:13 -0000 1.2 +++ xbase.spec 1 Mar 2006 01:14:30 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ @@ -74,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.0.0-4 +- bump for FC-5 + * Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 - fix xbase-config --ld (bugzilla 162845) From fedora-extras-commits at redhat.com Wed Mar 1 01:14:36 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:14:36 -0500 Subject: rpms/xbase/FC-4 xbase.spec,1.2,1.3 Message-ID: <200603010115.k211F83A016575@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16356/FC-4 Modified Files: xbase.spec Log Message: Bump for FC-5 Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/FC-4/xbase.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbase.spec 10 Jul 2005 13:49:13 -0000 1.2 +++ xbase.spec 1 Mar 2006 01:14:36 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ @@ -74,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.0.0-4 +- bump for FC-5 + * Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 - fix xbase-config --ld (bugzilla 162845) From fedora-extras-commits at redhat.com Wed Mar 1 01:14:42 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:14:42 -0500 Subject: rpms/xbase/devel xbase.spec,1.2,1.3 Message-ID: <200603010115.k211FF9w016586@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xbase/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16356/devel Modified Files: xbase.spec Log Message: Bump for FC-5 Index: xbase.spec =================================================================== RCS file: /cvs/extras/rpms/xbase/devel/xbase.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xbase.spec 10 Jul 2005 13:49:18 -0000 1.2 +++ xbase.spec 1 Mar 2006 01:14:42 -0000 1.3 @@ -1,7 +1,7 @@ Name: xbase Summary: XBase compatible database library and tools Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL (binaries GPL) Group: Development/Libraries URL: http://linux.techass.com/projects/xdb/ @@ -74,6 +74,9 @@ %{_libdir}/libxbase.so %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.0.0-4 +- bump for FC-5 + * Sun Jul 10 2005 Tom "spot" Callaway 2.0.0-3 - fix xbase-config --ld (bugzilla 162845) From fedora-extras-commits at redhat.com Wed Mar 1 01:16:43 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 28 Feb 2006 20:16:43 -0500 Subject: rpms/libgnomemm26/devel .cvsignore, 1.5, 1.6 libgnomemm.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200603010117.k211HFZF016797@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomemm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16776 Modified Files: .cvsignore libgnomemm.spec sources Log Message: Update to 2.12.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 Nov 2005 11:01:21 -0000 1.5 +++ .cvsignore 1 Mar 2006 01:16:43 -0000 1.6 @@ -1 +1 @@ -libgnomemm-2.12.1.tar.bz2 +libgnomemm-2.12.2.tar.bz2 Index: libgnomemm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libgnomemm.spec 26 Nov 2005 11:01:21 -0000 1.9 +++ libgnomemm.spec 1 Mar 2006 01:16:43 -0000 1.10 @@ -1,5 +1,5 @@ Name: libgnomemm26 -Version: 2.12.1 +Version: 2.12.2 Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Feb 28 2006 Denis Leroy - 2.12.2-1 +- Update to 2.12.2 + * Fri Nov 25 2005 Denis Leroy - 2.12.1-1 - Update to 2.12.1 - Disabled static libraries Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 26 Nov 2005 11:01:21 -0000 1.6 +++ sources 1 Mar 2006 01:16:43 -0000 1.7 @@ -1 +1 @@ -00882f5aba3f4c7c37c17497628d5eeb libgnomemm-2.12.1.tar.bz2 +c43421c77999f1c225ec5a39c6c64dff libgnomemm-2.12.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 01:18:03 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:18:03 -0500 Subject: rpms/xkeycaps/FC-3 xkeycaps.spec,1.4,1.5 Message-ID: <200603010118.k211IZeS016916@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xkeycaps/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16851/FC-3 Modified Files: xkeycaps.spec Log Message: bump for fc5 Index: xkeycaps.spec =================================================================== RCS file: /cvs/extras/rpms/xkeycaps/FC-3/xkeycaps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xkeycaps.spec 17 Jan 2006 05:17:18 -0000 1.4 +++ xkeycaps.spec 1 Mar 2006 01:18:03 -0000 1.5 @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-ish Group: Applications/System Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z @@ -54,6 +54,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.46-4 +- bump for FC-5 + * Mon Jan 16 2006 Tom "spot" Callaway 2.46-3 - fix FC-3/FC-4 From fedora-extras-commits at redhat.com Wed Mar 1 01:18:09 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:18:09 -0500 Subject: rpms/xkeycaps/FC-4 xkeycaps.spec,1.4,1.5 Message-ID: <200603010118.k211If0O016919@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xkeycaps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16851/FC-4 Modified Files: xkeycaps.spec Log Message: bump for fc5 Index: xkeycaps.spec =================================================================== RCS file: /cvs/extras/rpms/xkeycaps/FC-4/xkeycaps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xkeycaps.spec 17 Jan 2006 05:17:24 -0000 1.4 +++ xkeycaps.spec 1 Mar 2006 01:18:09 -0000 1.5 @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-ish Group: Applications/System Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z @@ -54,6 +54,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.46-4 +- bump for FC-5 + * Mon Jan 16 2006 Tom "spot" Callaway 2.46-3 - fix FC-3/FC-4 From fedora-extras-commits at redhat.com Wed Mar 1 01:18:14 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 20:18:14 -0500 Subject: rpms/xkeycaps/devel xkeycaps.spec,1.2,1.3 Message-ID: <200603010118.k211Ilvn016922@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xkeycaps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16851/devel Modified Files: xkeycaps.spec Log Message: bump for fc5 Index: xkeycaps.spec =================================================================== RCS file: /cvs/extras/rpms/xkeycaps/devel/xkeycaps.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xkeycaps.spec 17 Jan 2006 05:17:30 -0000 1.2 +++ xkeycaps.spec 1 Mar 2006 01:18:14 -0000 1.3 @@ -3,7 +3,7 @@ Name: xkeycaps Summary: Graphical front end to xmodmap Version: 2.46 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD-ish Group: Applications/System Source0: http://www.jwz.org/xkeycaps/%{name}-%{version}.tar.Z @@ -56,6 +56,9 @@ %{_mandir}/man1/* %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 2.46-4 +- bump for FC-5 + * Mon Jan 16 2006 Tom "spot" Callaway 2.46-3 - fix FC-3/FC-4 From fedora-extras-commits at redhat.com Wed Mar 1 01:27:29 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 28 Feb 2006 20:27:29 -0500 Subject: rpms/libgnomeuimm26/devel libgnomeuimm.spec,1.9,1.10 Message-ID: <200603010128.k211S2gi017133@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomeuimm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17116 Modified Files: libgnomeuimm.spec Log Message: Rebuild Index: libgnomeuimm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libgnomeuimm.spec 28 Nov 2005 00:15:35 -0000 1.9 +++ libgnomeuimm.spec 1 Mar 2006 01:27:29 -0000 1.10 @@ -1,6 +1,6 @@ Name: libgnomeuimm26 Version: 2.12.0 -Release: 2 +Release: 3 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -82,6 +82,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Tue Feb 28 2006 Denis Leroy - 2.12.0-3 +- Rebuild + * Fri Nov 25 2005 Denis Leroy - 2.12.0-2 - Disabled static libraries From fedora-extras-commits at redhat.com Wed Mar 1 01:57:32 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Tue, 28 Feb 2006 20:57:32 -0500 Subject: rpms/inkscape/devel inkscape.spec,1.25,1.26 Message-ID: <200603010158.k211w5dW017366@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/inkscape/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17349 Modified Files: inkscape.spec Log Message: Rebuild Index: inkscape.spec =================================================================== RCS file: /cvs/extras/rpms/inkscape/devel/inkscape.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- inkscape.spec 17 Jan 2006 00:40:50 -0000 1.25 +++ inkscape.spec 1 Mar 2006 01:57:32 -0000 1.26 @@ -1,6 +1,6 @@ Name: inkscape Version: 0.43 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Vector-based drawing program using SVG Group: Applications/Productivity @@ -106,6 +106,9 @@ %changelog +* Tue Feb 28 2006 Denis Leroy - 0.43-3 +- Rebuild + * Mon Jan 16 2006 Denis Leroy - 0.43-2 - Updated GC patch, bug 171791 From fedora-extras-commits at redhat.com Wed Mar 1 02:11:38 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 21:11:38 -0500 Subject: rpms/xsupplicant/FC-4 v19wireless.h, NONE, 1.1 sources, 1.5, 1.6 xsupplicant.spec, 1.14, 1.15 Message-ID: <200603010212.k212CBRF019321@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19280/FC-4 Modified Files: sources xsupplicant.spec Added Files: v19wireless.h Log Message: Bump xsupplicant to 1.2.3 on FC-4 and devel (FC-3 is too old now). --- NEW FILE v19wireless.h --- /* * This file define a set of standard wireless extensions * * Version : 19 18.3.05 * * Authors : Jean Tourrilhes - HPL - * Copyright (c) 1997-2005 Jean Tourrilhes, All Rights Reserved. */ #ifndef _LINUX_WIRELESS_H #define _LINUX_WIRELESS_H /************************** DOCUMENTATION **************************/ /* * Initial APIs (1996 -> onward) : * ----------------------------- * Basically, the wireless extensions are for now a set of standard ioctl * call + /proc/net/wireless * * The entry /proc/net/wireless give statistics and information on the * driver. * This is better than having each driver having its entry because * its centralised and we may remove the driver module safely. * * Ioctl are used to configure the driver and issue commands. This is * better than command line options of insmod because we may want to * change dynamically (while the driver is running) some parameters. * * The ioctl mechanimsm are copied from standard devices ioctl. * We have the list of command plus a structure descibing the * data exchanged... * Note that to add these ioctl, I was obliged to modify : * # net/core/dev.c (two place + add include) * # net/ipv4/af_inet.c (one place + add include) * * /proc/net/wireless is a copy of /proc/net/dev. * We have a structure for data passed from the driver to /proc/net/wireless * Too add this, I've modified : * # net/core/dev.c (two other places) * # include/linux/netdevice.h (one place) * # include/linux/proc_fs.h (one place) * * New driver API (2002 -> onward) : * ------------------------------- * This file is only concerned with the user space API and common definitions. * The new driver API is defined and documented in : * # include/net/iw_handler.h * * Note as well that /proc/net/wireless implementation has now moved in : * # net/core/wireless.c * * Wireless Events (2002 -> onward) : * -------------------------------- * Events are defined at the end of this file, and implemented in : * # net/core/wireless.c * * Other comments : * -------------- * Do not add here things that are redundant with other mechanisms * (drivers init, ifconfig, /proc/net/dev, ...) and with are not * wireless specific. * * These wireless extensions are not magic : each driver has to provide * support for them... * * IMPORTANT NOTE : As everything in the kernel, this is very much a * work in progress. Contact me if you have ideas of improvements... */ /***************************** INCLUDES *****************************/ #include /* for "caddr_t" et al */ #include /* for "struct sockaddr" et al */ #include /* for IFNAMSIZ and co... */ /***************************** VERSION *****************************/ /* * This constant is used to know the availability of the wireless * extensions and to know which version of wireless extensions it is * (there is some stuff that will be added in the future...) * I just plan to increment with each new version. */ #define WIRELESS_EXT 19 /* * Changes : * * V2 to V3 * -------- * Alan Cox start some incompatibles changes. I've integrated a bit more. * - Encryption renamed to Encode to avoid US regulation problems * - Frequency changed from float to struct to avoid problems on old 386 * * V3 to V4 * -------- * - Add sensitivity * * V4 to V5 * -------- * - Missing encoding definitions in range * - Access points stuff * * V5 to V6 * -------- * - 802.11 support (ESSID ioctls) * * V6 to V7 * -------- * - define IW_ESSID_MAX_SIZE and IW_MAX_AP * * V7 to V8 * -------- * - Changed my e-mail address * - More 802.11 support (nickname, rate, rts, frag) * - List index in frequencies * * V8 to V9 * -------- * - Support for 'mode of operation' (ad-hoc, managed...) * - Support for unicast and multicast power saving * - Change encoding to support larger tokens (>64 bits) * - Updated iw_params (disable, flags) and use it for NWID * - Extracted iw_point from iwreq for clarity * * V9 to V10 * --------- * - Add PM capability to range structure * - Add PM modifier : MAX/MIN/RELATIVE * - Add encoding option : IW_ENCODE_NOKEY * - Add TxPower ioctls (work like TxRate) * * V10 to V11 * ---------- * - Add WE version in range (help backward/forward compatibility) * - Add retry ioctls (work like PM) * * V11 to V12 * ---------- * - Add SIOCSIWSTATS to get /proc/net/wireless programatically * - Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space * - Add new statistics (frag, retry, beacon) * - Add average quality (for user space calibration) * * V12 to V13 * ---------- * - Document creation of new driver API. * - Extract union iwreq_data from struct iwreq (for new driver API). * - Rename SIOCSIWNAME as SIOCSIWCOMMIT * * V13 to V14 * ---------- * - Wireless Events support : define struct iw_event * - Define additional specific event numbers * - Add "addr" and "param" fields in union iwreq_data * - AP scanning stuff (SIOCSIWSCAN and friends) * * V14 to V15 * ---------- * - Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg * - Make struct iw_freq signed (both m & e), add explicit padding * - Add IWEVCUSTOM for driver specific event/scanning token * - Add IW_MAX_GET_SPY for driver returning a lot of addresses * - Add IW_TXPOW_RANGE for range of Tx Powers * - Add IWEVREGISTERED & IWEVEXPIRED events for Access Points * - Add IW_MODE_MONITOR for passive monitor * * V15 to V16 * ---------- * - Increase the number of bitrates in iw_range to 32 (for 802.11g) * - Increase the number of frequencies in iw_range to 32 (for 802.11b+a) * - Reshuffle struct iw_range for increases, add filler * - Increase IW_MAX_AP to 64 for driver returning a lot of addresses * - Remove IW_MAX_GET_SPY because conflict with enhanced spy support * - Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy" * - Add IW_ENCODE_TEMP and iw_range->encoding_login_index * * V16 to V17 * ---------- * - Add flags to frequency -> auto/fixed * - Document (struct iw_quality *)->updated, add new flags (INVALID) * - Wireless Event capability in struct iw_range * - Add support for relative TxPower (yick !) * * V17 to V18 (From Jouni Malinen ) * ---------- * - Add support for WPA/WPA2 * - Add extended encoding configuration (SIOCSIWENCODEEXT and * SIOCGIWENCODEEXT) * - Add SIOCSIWGENIE/SIOCGIWGENIE * - Add SIOCSIWMLME * - Add SIOCSIWPMKSA * - Add struct iw_range bit field for supported encoding capabilities * - Add optional scan request parameters for SIOCSIWSCAN * - Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA * related parameters (extensible up to 4096 parameter values) * - Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE, * IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND * * V18 to V19 * ---------- * - Remove (struct iw_point *)->pointer from events and streams * - Remove header includes to help user space * - Increase IW_ENCODING_TOKEN_MAX from 32 to 64 * - Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros * - Add explicit flag to tell stats are in dBm : IW_QUAL_DBM * - Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros */ /**************************** CONSTANTS ****************************/ /* -------------------------- IOCTL LIST -------------------------- */ /* Wireless Identification */ #define SIOCSIWCOMMIT 0x8B00 /* Commit pending changes to driver */ #define SIOCGIWNAME 0x8B01 /* get name == wireless protocol */ /* SIOCGIWNAME is used to verify the presence of Wireless Extensions. * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"... * Don't put the name of your driver there, it's useless. */ /* Basic operations */ #define SIOCSIWNWID 0x8B02 /* set network id (pre-802.11) */ #define SIOCGIWNWID 0x8B03 /* get network id (the cell) */ #define SIOCSIWFREQ 0x8B04 /* set channel/frequency (Hz) */ #define SIOCGIWFREQ 0x8B05 /* get channel/frequency (Hz) */ #define SIOCSIWMODE 0x8B06 /* set operation mode */ #define SIOCGIWMODE 0x8B07 /* get operation mode */ #define SIOCSIWSENS 0x8B08 /* set sensitivity (dBm) */ #define SIOCGIWSENS 0x8B09 /* get sensitivity (dBm) */ /* Informative stuff */ #define SIOCSIWRANGE 0x8B0A /* Unused */ #define SIOCGIWRANGE 0x8B0B /* Get range of parameters */ #define SIOCSIWPRIV 0x8B0C /* Unused */ #define SIOCGIWPRIV 0x8B0D /* get private ioctl interface info */ #define SIOCSIWSTATS 0x8B0E /* Unused */ #define SIOCGIWSTATS 0x8B0F /* Get /proc/net/wireless stats */ /* SIOCGIWSTATS is strictly used between user space and the kernel, and * is never passed to the driver (i.e. the driver will never see it). */ /* Spy support (statistics per MAC address - used for Mobile IP support) */ #define SIOCSIWSPY 0x8B10 /* set spy addresses */ #define SIOCGIWSPY 0x8B11 /* get spy info (quality of link) */ #define SIOCSIWTHRSPY 0x8B12 /* set spy threshold (spy event) */ #define SIOCGIWTHRSPY 0x8B13 /* get spy threshold */ /* Access Point manipulation */ #define SIOCSIWAP 0x8B14 /* set access point MAC addresses */ #define SIOCGIWAP 0x8B15 /* get access point MAC addresses */ #define SIOCGIWAPLIST 0x8B17 /* Deprecated in favor of scanning */ #define SIOCSIWSCAN 0x8B18 /* trigger scanning (list cells) */ #define SIOCGIWSCAN 0x8B19 /* get scanning results */ /* 802.11 specific support */ #define SIOCSIWESSID 0x8B1A /* set ESSID (network name) */ #define SIOCGIWESSID 0x8B1B /* get ESSID */ #define SIOCSIWNICKN 0x8B1C /* set node name/nickname */ #define SIOCGIWNICKN 0x8B1D /* get node name/nickname */ /* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit * within the 'iwreq' structure, so we need to use the 'data' member to * point to a string in user space, like it is done for RANGE... */ /* Other parameters useful in 802.11 and some other devices */ #define SIOCSIWRATE 0x8B20 /* set default bit rate (bps) */ #define SIOCGIWRATE 0x8B21 /* get default bit rate (bps) */ #define SIOCSIWRTS 0x8B22 /* set RTS/CTS threshold (bytes) */ #define SIOCGIWRTS 0x8B23 /* get RTS/CTS threshold (bytes) */ #define SIOCSIWFRAG 0x8B24 /* set fragmentation thr (bytes) */ #define SIOCGIWFRAG 0x8B25 /* get fragmentation thr (bytes) */ #define SIOCSIWTXPOW 0x8B26 /* set transmit power (dBm) */ #define SIOCGIWTXPOW 0x8B27 /* get transmit power (dBm) */ #define SIOCSIWRETRY 0x8B28 /* set retry limits and lifetime */ #define SIOCGIWRETRY 0x8B29 /* get retry limits and lifetime */ /* Encoding stuff (scrambling, hardware security, WEP...) */ #define SIOCSIWENCODE 0x8B2A /* set encoding token & mode */ #define SIOCGIWENCODE 0x8B2B /* get encoding token & mode */ /* Power saving stuff (power management, unicast and multicast) */ #define SIOCSIWPOWER 0x8B2C /* set Power Management settings */ #define SIOCGIWPOWER 0x8B2D /* get Power Management settings */ /* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM). * This ioctl uses struct iw_point and data buffer that includes IE id and len * fields. More than one IE may be included in the request. Setting the generic * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers * are required to report the used IE as a wireless event, e.g., when * associating with an AP. */ #define SIOCSIWGENIE 0x8B30 /* set generic IE */ #define SIOCGIWGENIE 0x8B31 /* get generic IE */ /* WPA : IEEE 802.11 MLME requests */ #define SIOCSIWMLME 0x8B16 /* request MLME operation; uses * struct iw_mlme */ /* WPA : Authentication mode parameters */ #define SIOCSIWAUTH 0x8B32 /* set authentication mode params */ #define SIOCGIWAUTH 0x8B33 /* get authentication mode params */ /* WPA : Extended version of encoding configuration */ #define SIOCSIWENCODEEXT 0x8B34 /* set encoding token & mode */ #define SIOCGIWENCODEEXT 0x8B35 /* get encoding token & mode */ /* WPA2 : PMKSA cache management */ #define SIOCSIWPMKSA 0x8B36 /* PMKSA cache operation */ /* -------------------- DEV PRIVATE IOCTL LIST -------------------- */ /* These 32 ioctl are wireless device private, for 16 commands. * Each driver is free to use them for whatever purpose it chooses, * however the driver *must* export the description of those ioctls * with SIOCGIWPRIV and *must* use arguments as defined below. * If you don't follow those rules, DaveM is going to hate you (reason : * it make mixed 32/64bit operation impossible). */ #define SIOCIWFIRSTPRIV 0x8BE0 #define SIOCIWLASTPRIV 0x8BFF /* Previously, we were using SIOCDEVPRIVATE, but we now have our * separate range because of collisions with other tools such as * 'mii-tool'. * We now have 32 commands, so a bit more space ;-). * Also, all 'odd' commands are only usable by root and don't return the * content of ifr/iwr to user (but you are not obliged to use the set/get * convention, just use every other two command). More details in iwpriv.c. * And I repeat : you are not forced to use them with iwpriv, but you * must be compliant with it. */ /* ------------------------- IOCTL STUFF ------------------------- */ /* The first and the last (range) */ #define SIOCIWFIRST 0x8B00 #define SIOCIWLAST SIOCIWLASTPRIV /* 0x8BFF */ #define IW_IOCTL_IDX(cmd) ((cmd) - SIOCIWFIRST) /* Even : get (world access), odd : set (root access) */ #define IW_IS_SET(cmd) (!((cmd) & 0x1)) #define IW_IS_GET(cmd) ((cmd) & 0x1) /* ----------------------- WIRELESS EVENTS ----------------------- */ /* Those are *NOT* ioctls, do not issue request on them !!! */ /* Most events use the same identifier as ioctl requests */ #define IWEVTXDROP 0x8C00 /* Packet dropped to excessive retry */ #define IWEVQUAL 0x8C01 /* Quality part of statistics (scan) */ #define IWEVCUSTOM 0x8C02 /* Driver specific ascii string */ #define IWEVREGISTERED 0x8C03 /* Discovered a new node (AP mode) */ #define IWEVEXPIRED 0x8C04 /* Expired a node (AP mode) */ #define IWEVGENIE 0x8C05 /* Generic IE (WPA, RSN, WMM, ..) * (scan results); This includes id and * length fields. One IWEVGENIE may * contain more than one IE. Scan * results may contain one or more * IWEVGENIE events. */ #define IWEVMICHAELMICFAILURE 0x8C06 /* Michael MIC failure * (struct iw_michaelmicfailure) */ #define IWEVASSOCREQIE 0x8C07 /* IEs used in (Re)Association Request. * The data includes id and length * fields and may contain more than one * IE. This event is required in * Managed mode if the driver * generates its own WPA/RSN IE. This * should be sent just before * IWEVREGISTERED event for the * association. */ #define IWEVASSOCRESPIE 0x8C08 /* IEs used in (Re)Association * Response. The data includes id and * length fields and may contain more * than one IE. This may be sent * between IWEVASSOCREQIE and * IWEVREGISTERED events for the * association. */ #define IWEVPMKIDCAND 0x8C09 /* PMKID candidate for RSN * pre-authentication * (struct iw_pmkid_cand) */ #define IWEVFIRST 0x8C00 #define IW_EVENT_IDX(cmd) ((cmd) - IWEVFIRST) /* ------------------------- PRIVATE INFO ------------------------- */ /* * The following is used with SIOCGIWPRIV. It allow a driver to define * the interface (name, type of data) for its private ioctl. * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV */ #define IW_PRIV_TYPE_MASK 0x7000 /* Type of arguments */ #define IW_PRIV_TYPE_NONE 0x0000 #define IW_PRIV_TYPE_BYTE 0x1000 /* Char as number */ #define IW_PRIV_TYPE_CHAR 0x2000 /* Char as character */ #define IW_PRIV_TYPE_INT 0x4000 /* 32 bits int */ #define IW_PRIV_TYPE_FLOAT 0x5000 /* struct iw_freq */ #define IW_PRIV_TYPE_ADDR 0x6000 /* struct sockaddr */ #define IW_PRIV_SIZE_FIXED 0x0800 /* Variable or fixed number of args */ #define IW_PRIV_SIZE_MASK 0x07FF /* Max number of those args */ /* * Note : if the number of args is fixed and the size < 16 octets, * instead of passing a pointer we will put args in the iwreq struct... */ /* ----------------------- OTHER CONSTANTS ----------------------- */ /* Maximum frequencies in the range struct */ #define IW_MAX_FREQUENCIES 32 /* Note : if you have something like 80 frequencies, * don't increase this constant and don't fill the frequency list. * The user will be able to set by channel anyway... */ /* Maximum bit rates in the range struct */ #define IW_MAX_BITRATES 32 /* Maximum tx powers in the range struct */ #define IW_MAX_TXPOWER 8 /* Note : if you more than 8 TXPowers, just set the max and min or * a few of them in the struct iw_range. */ /* Maximum of address that you may set with SPY */ #define IW_MAX_SPY 8 /* Maximum of address that you may get in the list of access points in range */ #define IW_MAX_AP 64 /* Maximum size of the ESSID and NICKN strings */ #define IW_ESSID_MAX_SIZE 32 /* Modes of operation */ #define IW_MODE_AUTO 0 /* Let the driver decides */ #define IW_MODE_ADHOC 1 /* Single cell network */ #define IW_MODE_INFRA 2 /* Multi cell network, roaming, ... */ #define IW_MODE_MASTER 3 /* Synchronisation master or Access Point */ #define IW_MODE_REPEAT 4 /* Wireless Repeater (forwarder) */ #define IW_MODE_SECOND 5 /* Secondary master/repeater (backup) */ #define IW_MODE_MONITOR 6 /* Passive monitor (listen only) */ /* Statistics flags (bitmask in updated) */ #define IW_QUAL_QUAL_UPDATED 0x01 /* Value was updated since last read */ #define IW_QUAL_LEVEL_UPDATED 0x02 #define IW_QUAL_NOISE_UPDATED 0x04 #define IW_QUAL_ALL_UPDATED 0x07 #define IW_QUAL_DBM 0x08 /* Level + Noise are dBm */ #define IW_QUAL_QUAL_INVALID 0x10 /* Driver doesn't provide value */ #define IW_QUAL_LEVEL_INVALID 0x20 #define IW_QUAL_NOISE_INVALID 0x40 #define IW_QUAL_ALL_INVALID 0x70 /* Frequency flags */ #define IW_FREQ_AUTO 0x00 /* Let the driver decides */ #define IW_FREQ_FIXED 0x01 /* Force a specific value */ /* Maximum number of size of encoding token available * they are listed in the range structure */ #define IW_MAX_ENCODING_SIZES 8 /* Maximum size of the encoding token in bytes */ #define IW_ENCODING_TOKEN_MAX 64 /* 512 bits (for now) */ /* Flags for encoding (along with the token) */ #define IW_ENCODE_INDEX 0x00FF /* Token index (if needed) */ #define IW_ENCODE_FLAGS 0xFF00 /* Flags defined below */ #define IW_ENCODE_MODE 0xF000 /* Modes defined below */ #define IW_ENCODE_DISABLED 0x8000 /* Encoding disabled */ #define IW_ENCODE_ENABLED 0x0000 /* Encoding enabled */ #define IW_ENCODE_RESTRICTED 0x4000 /* Refuse non-encoded packets */ #define IW_ENCODE_OPEN 0x2000 /* Accept non-encoded packets */ #define IW_ENCODE_NOKEY 0x0800 /* Key is write only, so not present */ #define IW_ENCODE_TEMP 0x0400 /* Temporary key */ /* Power management flags available (along with the value, if any) */ #define IW_POWER_ON 0x0000 /* No details... */ #define IW_POWER_TYPE 0xF000 /* Type of parameter */ #define IW_POWER_PERIOD 0x1000 /* Value is a period/duration of */ #define IW_POWER_TIMEOUT 0x2000 /* Value is a timeout (to go asleep) */ #define IW_POWER_MODE 0x0F00 /* Power Management mode */ #define IW_POWER_UNICAST_R 0x0100 /* Receive only unicast messages */ #define IW_POWER_MULTICAST_R 0x0200 /* Receive only multicast messages */ #define IW_POWER_ALL_R 0x0300 /* Receive all messages though PM */ #define IW_POWER_FORCE_S 0x0400 /* Force PM procedure for sending unicast */ #define IW_POWER_REPEATER 0x0800 /* Repeat broadcast messages in PM period */ #define IW_POWER_MODIFIER 0x000F /* Modify a parameter */ #define IW_POWER_MIN 0x0001 /* Value is a minimum */ #define IW_POWER_MAX 0x0002 /* Value is a maximum */ #define IW_POWER_RELATIVE 0x0004 /* Value is not in seconds/ms/us */ /* Transmit Power flags available */ #define IW_TXPOW_TYPE 0x00FF /* Type of value */ #define IW_TXPOW_DBM 0x0000 /* Value is in dBm */ #define IW_TXPOW_MWATT 0x0001 /* Value is in mW */ #define IW_TXPOW_RELATIVE 0x0002 /* Value is in arbitrary units */ #define IW_TXPOW_RANGE 0x1000 /* Range of value between min/max */ /* Retry limits and lifetime flags available */ #define IW_RETRY_ON 0x0000 /* No details... */ #define IW_RETRY_TYPE 0xF000 /* Type of parameter */ #define IW_RETRY_LIMIT 0x1000 /* Maximum number of retries*/ #define IW_RETRY_LIFETIME 0x2000 /* Maximum duration of retries in us */ #define IW_RETRY_MODIFIER 0x000F /* Modify a parameter */ #define IW_RETRY_MIN 0x0001 /* Value is a minimum */ #define IW_RETRY_MAX 0x0002 /* Value is a maximum */ #define IW_RETRY_RELATIVE 0x0004 /* Value is not in seconds/ms/us */ /* Scanning request flags */ #define IW_SCAN_DEFAULT 0x0000 /* Default scan of the driver */ #define IW_SCAN_ALL_ESSID 0x0001 /* Scan all ESSIDs */ #define IW_SCAN_THIS_ESSID 0x0002 /* Scan only this ESSID */ #define IW_SCAN_ALL_FREQ 0x0004 /* Scan all Frequencies */ #define IW_SCAN_THIS_FREQ 0x0008 /* Scan only this Frequency */ #define IW_SCAN_ALL_MODE 0x0010 /* Scan all Modes */ #define IW_SCAN_THIS_MODE 0x0020 /* Scan only this Mode */ #define IW_SCAN_ALL_RATE 0x0040 /* Scan all Bit-Rates */ #define IW_SCAN_THIS_RATE 0x0080 /* Scan only this Bit-Rate */ /* struct iw_scan_req scan_type */ #define IW_SCAN_TYPE_ACTIVE 0 #define IW_SCAN_TYPE_PASSIVE 1 /* Maximum size of returned data */ #define IW_SCAN_MAX_DATA 4096 /* In bytes */ /* Max number of char in custom event - use multiple of them if needed */ #define IW_CUSTOM_MAX 256 /* In bytes */ /* Generic information element */ #define IW_GENERIC_IE_MAX 1024 /* MLME requests (SIOCSIWMLME / struct iw_mlme) */ #define IW_MLME_DEAUTH 0 #define IW_MLME_DISASSOC 1 /* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */ #define IW_AUTH_INDEX 0x0FFF #define IW_AUTH_FLAGS 0xF000 /* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095) * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the * parameter that is being set/get to; value will be read/written to * struct iw_param value field) */ #define IW_AUTH_WPA_VERSION 0 #define IW_AUTH_CIPHER_PAIRWISE 1 #define IW_AUTH_CIPHER_GROUP 2 #define IW_AUTH_KEY_MGMT 3 #define IW_AUTH_TKIP_COUNTERMEASURES 4 #define IW_AUTH_DROP_UNENCRYPTED 5 #define IW_AUTH_80211_AUTH_ALG 6 #define IW_AUTH_WPA_ENABLED 7 #define IW_AUTH_RX_UNENCRYPTED_EAPOL 8 #define IW_AUTH_ROAMING_CONTROL 9 #define IW_AUTH_PRIVACY_INVOKED 10 /* IW_AUTH_WPA_VERSION values (bit field) */ #define IW_AUTH_WPA_VERSION_DISABLED 0x00000001 #define IW_AUTH_WPA_VERSION_WPA 0x00000002 #define IW_AUTH_WPA_VERSION_WPA2 0x00000004 /* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */ #define IW_AUTH_CIPHER_NONE 0x00000001 #define IW_AUTH_CIPHER_WEP40 0x00000002 #define IW_AUTH_CIPHER_TKIP 0x00000004 #define IW_AUTH_CIPHER_CCMP 0x00000008 #define IW_AUTH_CIPHER_WEP104 0x00000010 /* IW_AUTH_KEY_MGMT values (bit field) */ #define IW_AUTH_KEY_MGMT_802_1X 1 #define IW_AUTH_KEY_MGMT_PSK 2 /* IW_AUTH_80211_AUTH_ALG values (bit field) */ #define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001 #define IW_AUTH_ALG_SHARED_KEY 0x00000002 #define IW_AUTH_ALG_LEAP 0x00000004 /* IW_AUTH_ROAMING_CONTROL values */ #define IW_AUTH_ROAMING_ENABLE 0 /* driver/firmware based roaming */ #define IW_AUTH_ROAMING_DISABLE 1 /* user space program used for roaming * control */ /* SIOCSIWENCODEEXT definitions */ #define IW_ENCODE_SEQ_MAX_SIZE 8 /* struct iw_encode_ext ->alg */ #define IW_ENCODE_ALG_NONE 0 #define IW_ENCODE_ALG_WEP 1 #define IW_ENCODE_ALG_TKIP 2 #define IW_ENCODE_ALG_CCMP 3 /* struct iw_encode_ext ->ext_flags */ #define IW_ENCODE_EXT_TX_SEQ_VALID 0x00000001 #define IW_ENCODE_EXT_RX_SEQ_VALID 0x00000002 #define IW_ENCODE_EXT_GROUP_KEY 0x00000004 #define IW_ENCODE_EXT_SET_TX_KEY 0x00000008 /* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */ #define IW_MICFAILURE_KEY_ID 0x00000003 /* Key ID 0..3 */ #define IW_MICFAILURE_GROUP 0x00000004 #define IW_MICFAILURE_PAIRWISE 0x00000008 #define IW_MICFAILURE_STAKEY 0x00000010 #define IW_MICFAILURE_COUNT 0x00000060 /* 1 or 2 (0 = count not supported) */ /* Bit field values for enc_capa in struct iw_range */ #define IW_ENC_CAPA_WPA 0x00000001 #define IW_ENC_CAPA_WPA2 0x00000002 #define IW_ENC_CAPA_CIPHER_TKIP 0x00000004 #define IW_ENC_CAPA_CIPHER_CCMP 0x00000008 /* Event capability macros - in (struct iw_range *)->event_capa * Because we have more than 32 possible events, we use an array of * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */ #define IW_EVENT_CAPA_BASE(cmd) ((cmd >= SIOCIWFIRSTPRIV) ? \ (cmd - SIOCIWFIRSTPRIV + 0x60) : \ (cmd - SIOCSIWCOMMIT)) #define IW_EVENT_CAPA_INDEX(cmd) (IW_EVENT_CAPA_BASE(cmd) >> 5) #define IW_EVENT_CAPA_MASK(cmd) (1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F)) /* Event capability constants - event autogenerated by the kernel * This list is valid for most 802.11 devices, customise as needed... */ #define IW_EVENT_CAPA_K_0 (IW_EVENT_CAPA_MASK(0x8B04) | \ IW_EVENT_CAPA_MASK(0x8B06) | \ IW_EVENT_CAPA_MASK(0x8B1A)) #define IW_EVENT_CAPA_K_1 (IW_EVENT_CAPA_MASK(0x8B2A)) /* "Easy" macro to set events in iw_range (less efficient) */ #define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd)) #define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; } /****************************** TYPES ******************************/ /* --------------------------- SUBTYPES --------------------------- */ /* * Generic format for most parameters that fit in an int */ struct iw_param { __s32 value; /* The value of the parameter itself */ __u8 fixed; /* Hardware should not use auto select */ __u8 disabled; /* Disable the feature */ __u16 flags; /* Various specifc flags (if any) */ }; /* * For all data larger than 16 octets, we need to use a * pointer to memory allocated in user space. */ struct iw_point { void *pointer; /* Pointer to the data (in user space) */ __u16 length; /* number of fields or size in bytes */ __u16 flags; /* Optional params */ }; /* * A frequency * For numbers lower than 10^9, we encode the number in 'm' and * set 'e' to 0 * For number greater than 10^9, we divide it by the lowest power * of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')... * The power of 10 is in 'e', the result of the division is in 'm'. */ struct iw_freq { __s32 m; /* Mantissa */ __s16 e; /* Exponent */ __u8 i; /* List index (when in range struct) */ __u8 flags; /* Flags (fixed/auto) */ }; /* * Quality of the link */ struct iw_quality { __u8 qual; /* link quality (%retries, SNR, %missed beacons or better...) */ __u8 level; /* signal level (dBm) */ __u8 noise; /* noise level (dBm) */ __u8 updated; /* Flags to know if updated */ }; /* * Packet discarded in the wireless adapter due to * "wireless" specific problems... * Note : the list of counter and statistics in net_device_stats * is already pretty exhaustive, and you should use that first. * This is only additional stats... */ struct iw_discarded { __u32 nwid; /* Rx : Wrong nwid/essid */ __u32 code; /* Rx : Unable to code/decode (WEP) */ __u32 fragment; /* Rx : Can't perform MAC reassembly */ __u32 retries; /* Tx : Max MAC retries num reached */ __u32 misc; /* Others cases */ }; /* * Packet/Time period missed in the wireless adapter due to * "wireless" specific problems... */ struct iw_missed { __u32 beacon; /* Missed beacons/superframe */ }; /* * Quality range (for spy threshold) */ struct iw_thrspy { struct sockaddr addr; /* Source address (hw/mac) */ struct iw_quality qual; /* Quality of the link */ struct iw_quality low; /* Low threshold */ struct iw_quality high; /* High threshold */ }; /* * Optional data for scan request * * Note: these optional parameters are controlling parameters for the * scanning behavior, these do not apply to getting scan results * (SIOCGIWSCAN). Drivers are expected to keep a local BSS table and * provide a merged results with all BSSes even if the previous scan * request limited scanning to a subset, e.g., by specifying an SSID. * Especially, scan results are required to include an entry for the * current BSS if the driver is in Managed mode and associated with an AP. */ struct iw_scan_req { __u8 scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */ __u8 essid_len; __u8 num_channels; /* num entries in channel_list; * 0 = scan all allowed channels */ __u8 flags; /* reserved as padding; use zero, this may * be used in the future for adding flags * to request different scan behavior */ struct sockaddr bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or * individual address of a specific BSS */ /* * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using * the current ESSID. This allows scan requests for specific ESSID * without having to change the current ESSID and potentially breaking * the current association. */ __u8 essid[IW_ESSID_MAX_SIZE]; /* * Optional parameters for changing the default scanning behavior. * These are based on the MLME-SCAN.request from IEEE Std 802.11. * TU is 1.024 ms. If these are set to 0, driver is expected to use * reasonable default values. min_channel_time defines the time that * will be used to wait for the first reply on each channel. If no * replies are received, next channel will be scanned after this. If * replies are received, total time waited on the channel is defined by * max_channel_time. */ __u32 min_channel_time; /* in TU */ __u32 max_channel_time; /* in TU */ struct iw_freq channel_list[IW_MAX_FREQUENCIES]; }; /* ------------------------- WPA SUPPORT ------------------------- */ /* * Extended data structure for get/set encoding (this is used with * SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_* * flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and * only the data contents changes (key data -> this structure, including * key data). * * If the new key is the first group key, it will be set as the default * TX key. Otherwise, default TX key index is only changed if * IW_ENCODE_EXT_SET_TX_KEY flag is set. * * Key will be changed with SIOCSIWENCODEEXT in all cases except for * special "change TX key index" operation which is indicated by setting * key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY. * * tx_seq/rx_seq are only used when respective * IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal * TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start * TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally * used only by an Authenticator (AP or an IBSS station) to get the * current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and * RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for * debugging/testing. */ struct iw_encode_ext { __u32 ext_flags; /* IW_ENCODE_EXT_* */ __u8 tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ __u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ struct sockaddr addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast * (group) keys or unicast address for * individual keys */ __u16 alg; /* IW_ENCODE_ALG_* */ __u16 key_len; __u8 key[0]; }; /* SIOCSIWMLME data */ struct iw_mlme { __u16 cmd; /* IW_MLME_* */ __u16 reason_code; struct sockaddr addr; }; /* SIOCSIWPMKSA data */ #define IW_PMKSA_ADD 1 #define IW_PMKSA_REMOVE 2 #define IW_PMKSA_FLUSH 3 #define IW_PMKID_LEN 16 struct iw_pmksa { __u32 cmd; /* IW_PMKSA_* */ struct sockaddr bssid; __u8 pmkid[IW_PMKID_LEN]; }; /* IWEVMICHAELMICFAILURE data */ struct iw_michaelmicfailure { __u32 flags; struct sockaddr src_addr; __u8 tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ }; /* IWEVPMKIDCAND data */ #define IW_PMKID_CAND_PREAUTH 0x00000001 /* RNS pre-authentication enabled */ struct iw_pmkid_cand { __u32 flags; /* IW_PMKID_CAND_* */ __u32 index; /* the smaller the index, the higher the * priority */ struct sockaddr bssid; }; /* ------------------------ WIRELESS STATS ------------------------ */ /* * Wireless statistics (used for /proc/net/wireless) */ struct iw_statistics { __u16 status; /* Status * - device dependent for now */ struct iw_quality qual; /* Quality of the link * (instant/mean/max) */ struct iw_discarded discard; /* Packet discarded counts */ struct iw_missed miss; /* Packet missed counts */ }; /* ------------------------ IOCTL REQUEST ------------------------ */ /* * This structure defines the payload of an ioctl, and is used * below. * * Note that this structure should fit on the memory footprint * of iwreq (which is the same as ifreq), which mean a max size of * 16 octets = 128 bits. Warning, pointers might be 64 bits wide... * You should check this when increasing the structures defined * above in this file... */ union iwreq_data { /* Config - generic */ char name[IFNAMSIZ]; /* Name : used to verify the presence of wireless extensions. * Name of the protocol/provider... */ struct iw_point essid; /* Extended network name */ struct iw_param nwid; /* network id (or domain - the cell) */ struct iw_freq freq; /* frequency or channel : * 0-1000 = channel * > 1000 = frequency in Hz */ struct iw_param sens; /* signal level threshold */ struct iw_param bitrate; /* default bit rate */ struct iw_param txpower; /* default transmit power */ struct iw_param rts; /* RTS threshold threshold */ struct iw_param frag; /* Fragmentation threshold */ __u32 mode; /* Operation mode */ struct iw_param retry; /* Retry limits & lifetime */ struct iw_point encoding; /* Encoding stuff : tokens */ struct iw_param power; /* PM duration/timeout */ struct iw_quality qual; /* Quality part of statistics */ struct sockaddr ap_addr; /* Access point address */ struct sockaddr addr; /* Destination address (hw/mac) */ struct iw_param param; /* Other small parameters */ struct iw_point data; /* Other large parameters */ }; /* * The structure to exchange data for ioctl. * This structure is the same as 'struct ifreq', but (re)defined for * convenience... * Do I need to remind you about structure size (32 octets) ? */ struct iwreq { union { char ifrn_name[IFNAMSIZ]; /* if name, e.g. "eth0" */ } ifr_ifrn; /* Data part (defined just above) */ union iwreq_data u; }; /* -------------------------- IOCTL DATA -------------------------- */ /* * For those ioctl which want to exchange mode data that what could * fit in the above structure... */ /* * Range of parameters */ struct iw_range { /* Informative stuff (to choose between different interface) */ __u32 throughput; /* To give an idea... */ /* In theory this value should be the maximum benchmarked * TCP/IP throughput, because with most of these devices the * bit rate is meaningless (overhead an co) to estimate how * fast the connection will go and pick the fastest one. * I suggest people to play with Netperf or any benchmark... */ /* NWID (or domain id) */ __u32 min_nwid; /* Minimal NWID we are able to set */ __u32 max_nwid; /* Maximal NWID we are able to set */ /* Old Frequency (backward compat - moved lower ) */ __u16 old_num_channels; __u8 old_num_frequency; /* Wireless event capability bitmasks */ __u32 event_capa[6]; /* signal level threshold range */ __s32 sensitivity; /* Quality of link & SNR stuff */ /* Quality range (link, level, noise) * If the quality is absolute, it will be in the range [0 ; max_qual], * if the quality is dBm, it will be in the range [max_qual ; 0]. * Don't forget that we use 8 bit arithmetics... */ struct iw_quality max_qual; /* Quality of the link */ /* This should contain the average/typical values of the quality * indicator. This should be the threshold between a "good" and * a "bad" link (example : monitor going from green to orange). * Currently, user space apps like quality monitors don't have any * way to calibrate the measurement. With this, they can split * the range between 0 and max_qual in different quality level * (using a geometric subdivision centered on the average). * I expect that people doing the user space apps will feedback * us on which value we need to put in each driver... */ struct iw_quality avg_qual; /* Quality of the link */ /* Rates */ __u8 num_bitrates; /* Number of entries in the list */ __s32 bitrate[IW_MAX_BITRATES]; /* list, in bps */ /* RTS threshold */ __s32 min_rts; /* Minimal RTS threshold */ __s32 max_rts; /* Maximal RTS threshold */ /* Frag threshold */ __s32 min_frag; /* Minimal frag threshold */ __s32 max_frag; /* Maximal frag threshold */ /* Power Management duration & timeout */ __s32 min_pmp; /* Minimal PM period */ __s32 max_pmp; /* Maximal PM period */ __s32 min_pmt; /* Minimal PM timeout */ __s32 max_pmt; /* Maximal PM timeout */ __u16 pmp_flags; /* How to decode max/min PM period */ __u16 pmt_flags; /* How to decode max/min PM timeout */ __u16 pm_capa; /* What PM options are supported */ /* Encoder stuff */ __u16 encoding_size[IW_MAX_ENCODING_SIZES]; /* Different token sizes */ __u8 num_encoding_sizes; /* Number of entry in the list */ __u8 max_encoding_tokens; /* Max number of tokens */ /* For drivers that need a "login/passwd" form */ __u8 encoding_login_index; /* token index for login token */ /* Transmit power */ __u16 txpower_capa; /* What options are supported */ __u8 num_txpower; /* Number of entries in the list */ __s32 txpower[IW_MAX_TXPOWER]; /* list, in bps */ /* Wireless Extension version info */ __u8 we_version_compiled; /* Must be WIRELESS_EXT */ __u8 we_version_source; /* Last update of source */ /* Retry limits and lifetime */ __u16 retry_capa; /* What retry options are supported */ __u16 retry_flags; /* How to decode max/min retry limit */ __u16 r_time_flags; /* How to decode max/min retry life */ __s32 min_retry; /* Minimal number of retries */ __s32 max_retry; /* Maximal number of retries */ __s32 min_r_time; /* Minimal retry lifetime */ __s32 max_r_time; /* Maximal retry lifetime */ /* Frequency */ __u16 num_channels; /* Number of channels [0; num - 1] */ __u8 num_frequency; /* Number of entry in the list */ struct iw_freq freq[IW_MAX_FREQUENCIES]; /* list */ /* Note : this frequency list doesn't need to fit channel numbers, * because each entry contain its channel index */ __u32 enc_capa; /* IW_ENC_CAPA_* bit field */ }; /* * Private ioctl interface information */ struct iw_priv_args { __u32 cmd; /* Number of the ioctl to issue */ __u16 set_args; /* Type and number of args */ __u16 get_args; /* Type and number of args */ char name[IFNAMSIZ]; /* Name of the extension */ }; /* ----------------------- WIRELESS EVENTS ----------------------- */ /* * Wireless events are carried through the rtnetlink socket to user * space. They are encapsulated in the IFLA_WIRELESS field of * a RTM_NEWLINK message. */ /* * A Wireless Event. Contains basically the same data as the ioctl... */ struct iw_event { __u16 len; /* Real lenght of this stuff */ __u16 cmd; /* Wireless IOCTL */ union iwreq_data u; /* IOCTL fixed payload */ }; /* Size of the Event prefix (including padding and alignement junk) */ #define IW_EV_LCP_LEN (sizeof(struct iw_event) - sizeof(union iwreq_data)) /* Size of the various events */ #define IW_EV_CHAR_LEN (IW_EV_LCP_LEN + IFNAMSIZ) #define IW_EV_UINT_LEN (IW_EV_LCP_LEN + sizeof(__u32)) #define IW_EV_FREQ_LEN (IW_EV_LCP_LEN + sizeof(struct iw_freq)) #define IW_EV_PARAM_LEN (IW_EV_LCP_LEN + sizeof(struct iw_param)) #define IW_EV_ADDR_LEN (IW_EV_LCP_LEN + sizeof(struct sockaddr)) #define IW_EV_QUAL_LEN (IW_EV_LCP_LEN + sizeof(struct iw_quality)) /* iw_point events are special. First, the payload (extra data) come at * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second, * we omit the pointer, so start at an offset. */ #define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \ (char *) NULL) #define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - \ IW_EV_POINT_OFF) #endif /* _LINUX_WIRELESS_H */ Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Oct 2005 14:20:21 -0000 1.5 +++ sources 1 Mar 2006 02:11:38 -0000 1.6 @@ -1 +1 @@ -0e9aaf83a11f8eaff7c6564a53c25d8e xsupplicant-1.2.2.tar.gz +f583f13d5bb91f98dab106d3610a677f xsupplicant-1.2.3.tar.gz Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- xsupplicant.spec 3 Jan 2006 14:52:38 -0000 1.14 +++ xsupplicant.spec 1 Mar 2006 02:11:38 -0000 1.15 @@ -1,17 +1,17 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 1.2.2 -Release: 7%{?dist} +Version: 1.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz +Source1: v19wireless.h BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex, openjade, lynx, jadetex BuildRequires: docbook-dtds, docbook-style-dsssl, wireless-tools Patch0: xsupplicant-1.2.1-docsfix.patch -Patch1: xsupplicant-1.2.2-compilefix.patch -Patch2: xsupplicant-1.2.2-buf.patch +Patch1: xsupplicant-1.2.3-fixincludes.patch %description This software allows a GNU/Linux or BSD workstation to authenticate with @@ -19,17 +19,30 @@ use is for computers with wireless LAN connections to complete a strong authentication before joining the network. +%package devel +Summary: Development files for xsupplicant +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development libraries and headers for xsupplicant. + %prep %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 + +# Fedora Core 4 and 5 ship with old headers, but V19 in the kernel +# So, we need to put the right headers in place. This is the simplest +# hack to solve this issue. +cp %{SOURCE1} src/ perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* %build %configure -make %{?_smp_mflags} +# _smp_mflags makes this app go BOOM +make cd doc ./builddocs.sh cd .. @@ -49,11 +62,24 @@ %config(noreplace) %{_sysconfdir}/xsupplicant.conf %{_bindir}/config-parser %{_bindir}/xsup_monitor +%{_bindir}/xsup_ntpwdhash %{_bindir}/xsup_set_pwd %{_bindir}/xsup_get_state %{_sbindir}/xsupplicant +%files devel +%defattr(-,root,root,-) +%{_includedir}/xsupconfcheck.h +%{_includedir}/xsupconfig.h +%{_includedir}/xsupconfwrite.h +%{_includedir}/xsupgui.h +%{_libdir}/libxsup*.a + %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-1 +- bump to 1.2.3 +- split package into main and devel + * Tue Jan 3 2006 Hans de Goede 1.2.2-7 - fix a possible bufferoverflow bz 170045 From fedora-extras-commits at redhat.com Wed Mar 1 02:11:46 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 21:11:46 -0500 Subject: rpms/xsupplicant/devel v19wireless.h, NONE, 1.1 xsupplicant-1.2.3-fixincludes.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 sources, 1.5, 1.6 xsupplicant.spec, 1.15, 1.16 Message-ID: <200603010212.k212CJFv019326@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19280/devel Modified Files: .cvsignore sources xsupplicant.spec Added Files: v19wireless.h xsupplicant-1.2.3-fixincludes.patch Log Message: Bump xsupplicant to 1.2.3 on FC-4 and devel (FC-3 is too old now). --- NEW FILE v19wireless.h --- /* * This file define a set of standard wireless extensions * * Version : 19 18.3.05 * * Authors : Jean Tourrilhes - HPL - * Copyright (c) 1997-2005 Jean Tourrilhes, All Rights Reserved. */ #ifndef _LINUX_WIRELESS_H #define _LINUX_WIRELESS_H /************************** DOCUMENTATION **************************/ /* * Initial APIs (1996 -> onward) : * ----------------------------- * Basically, the wireless extensions are for now a set of standard ioctl * call + /proc/net/wireless * * The entry /proc/net/wireless give statistics and information on the * driver. * This is better than having each driver having its entry because * its centralised and we may remove the driver module safely. * * Ioctl are used to configure the driver and issue commands. This is * better than command line options of insmod because we may want to * change dynamically (while the driver is running) some parameters. * * The ioctl mechanimsm are copied from standard devices ioctl. * We have the list of command plus a structure descibing the * data exchanged... * Note that to add these ioctl, I was obliged to modify : * # net/core/dev.c (two place + add include) * # net/ipv4/af_inet.c (one place + add include) * * /proc/net/wireless is a copy of /proc/net/dev. * We have a structure for data passed from the driver to /proc/net/wireless * Too add this, I've modified : * # net/core/dev.c (two other places) * # include/linux/netdevice.h (one place) * # include/linux/proc_fs.h (one place) * * New driver API (2002 -> onward) : * ------------------------------- * This file is only concerned with the user space API and common definitions. * The new driver API is defined and documented in : * # include/net/iw_handler.h * * Note as well that /proc/net/wireless implementation has now moved in : * # net/core/wireless.c * * Wireless Events (2002 -> onward) : * -------------------------------- * Events are defined at the end of this file, and implemented in : * # net/core/wireless.c * * Other comments : * -------------- * Do not add here things that are redundant with other mechanisms * (drivers init, ifconfig, /proc/net/dev, ...) and with are not * wireless specific. * * These wireless extensions are not magic : each driver has to provide * support for them... * * IMPORTANT NOTE : As everything in the kernel, this is very much a * work in progress. Contact me if you have ideas of improvements... */ /***************************** INCLUDES *****************************/ #include /* for "caddr_t" et al */ #include /* for "struct sockaddr" et al */ #include /* for IFNAMSIZ and co... */ /***************************** VERSION *****************************/ /* * This constant is used to know the availability of the wireless * extensions and to know which version of wireless extensions it is * (there is some stuff that will be added in the future...) * I just plan to increment with each new version. */ #define WIRELESS_EXT 19 /* * Changes : * * V2 to V3 * -------- * Alan Cox start some incompatibles changes. I've integrated a bit more. * - Encryption renamed to Encode to avoid US regulation problems * - Frequency changed from float to struct to avoid problems on old 386 * * V3 to V4 * -------- * - Add sensitivity * * V4 to V5 * -------- * - Missing encoding definitions in range * - Access points stuff * * V5 to V6 * -------- * - 802.11 support (ESSID ioctls) * * V6 to V7 * -------- * - define IW_ESSID_MAX_SIZE and IW_MAX_AP * * V7 to V8 * -------- * - Changed my e-mail address * - More 802.11 support (nickname, rate, rts, frag) * - List index in frequencies * * V8 to V9 * -------- * - Support for 'mode of operation' (ad-hoc, managed...) * - Support for unicast and multicast power saving * - Change encoding to support larger tokens (>64 bits) * - Updated iw_params (disable, flags) and use it for NWID * - Extracted iw_point from iwreq for clarity * * V9 to V10 * --------- * - Add PM capability to range structure * - Add PM modifier : MAX/MIN/RELATIVE * - Add encoding option : IW_ENCODE_NOKEY * - Add TxPower ioctls (work like TxRate) * * V10 to V11 * ---------- * - Add WE version in range (help backward/forward compatibility) * - Add retry ioctls (work like PM) * * V11 to V12 * ---------- * - Add SIOCSIWSTATS to get /proc/net/wireless programatically * - Add DEV PRIVATE IOCTL to avoid collisions in SIOCDEVPRIVATE space * - Add new statistics (frag, retry, beacon) * - Add average quality (for user space calibration) * * V12 to V13 * ---------- * - Document creation of new driver API. * - Extract union iwreq_data from struct iwreq (for new driver API). * - Rename SIOCSIWNAME as SIOCSIWCOMMIT * * V13 to V14 * ---------- * - Wireless Events support : define struct iw_event * - Define additional specific event numbers * - Add "addr" and "param" fields in union iwreq_data * - AP scanning stuff (SIOCSIWSCAN and friends) * * V14 to V15 * ---------- * - Add IW_PRIV_TYPE_ADDR for struct sockaddr private arg * - Make struct iw_freq signed (both m & e), add explicit padding * - Add IWEVCUSTOM for driver specific event/scanning token * - Add IW_MAX_GET_SPY for driver returning a lot of addresses * - Add IW_TXPOW_RANGE for range of Tx Powers * - Add IWEVREGISTERED & IWEVEXPIRED events for Access Points * - Add IW_MODE_MONITOR for passive monitor * * V15 to V16 * ---------- * - Increase the number of bitrates in iw_range to 32 (for 802.11g) * - Increase the number of frequencies in iw_range to 32 (for 802.11b+a) * - Reshuffle struct iw_range for increases, add filler * - Increase IW_MAX_AP to 64 for driver returning a lot of addresses * - Remove IW_MAX_GET_SPY because conflict with enhanced spy support * - Add SIOCSIWTHRSPY/SIOCGIWTHRSPY and "struct iw_thrspy" * - Add IW_ENCODE_TEMP and iw_range->encoding_login_index * * V16 to V17 * ---------- * - Add flags to frequency -> auto/fixed * - Document (struct iw_quality *)->updated, add new flags (INVALID) * - Wireless Event capability in struct iw_range * - Add support for relative TxPower (yick !) * * V17 to V18 (From Jouni Malinen ) * ---------- * - Add support for WPA/WPA2 * - Add extended encoding configuration (SIOCSIWENCODEEXT and * SIOCGIWENCODEEXT) * - Add SIOCSIWGENIE/SIOCGIWGENIE * - Add SIOCSIWMLME * - Add SIOCSIWPMKSA * - Add struct iw_range bit field for supported encoding capabilities * - Add optional scan request parameters for SIOCSIWSCAN * - Add SIOCSIWAUTH/SIOCGIWAUTH for setting authentication and WPA * related parameters (extensible up to 4096 parameter values) * - Add wireless events: IWEVGENIE, IWEVMICHAELMICFAILURE, * IWEVASSOCREQIE, IWEVASSOCRESPIE, IWEVPMKIDCAND * * V18 to V19 * ---------- * - Remove (struct iw_point *)->pointer from events and streams * - Remove header includes to help user space * - Increase IW_ENCODING_TOKEN_MAX from 32 to 64 * - Add IW_QUAL_ALL_UPDATED and IW_QUAL_ALL_INVALID macros * - Add explicit flag to tell stats are in dBm : IW_QUAL_DBM * - Add IW_IOCTL_IDX() and IW_EVENT_IDX() macros */ /**************************** CONSTANTS ****************************/ /* -------------------------- IOCTL LIST -------------------------- */ /* Wireless Identification */ #define SIOCSIWCOMMIT 0x8B00 /* Commit pending changes to driver */ #define SIOCGIWNAME 0x8B01 /* get name == wireless protocol */ /* SIOCGIWNAME is used to verify the presence of Wireless Extensions. * Common values : "IEEE 802.11-DS", "IEEE 802.11-FH", "IEEE 802.11b"... * Don't put the name of your driver there, it's useless. */ /* Basic operations */ #define SIOCSIWNWID 0x8B02 /* set network id (pre-802.11) */ #define SIOCGIWNWID 0x8B03 /* get network id (the cell) */ #define SIOCSIWFREQ 0x8B04 /* set channel/frequency (Hz) */ #define SIOCGIWFREQ 0x8B05 /* get channel/frequency (Hz) */ #define SIOCSIWMODE 0x8B06 /* set operation mode */ #define SIOCGIWMODE 0x8B07 /* get operation mode */ #define SIOCSIWSENS 0x8B08 /* set sensitivity (dBm) */ #define SIOCGIWSENS 0x8B09 /* get sensitivity (dBm) */ /* Informative stuff */ #define SIOCSIWRANGE 0x8B0A /* Unused */ #define SIOCGIWRANGE 0x8B0B /* Get range of parameters */ #define SIOCSIWPRIV 0x8B0C /* Unused */ #define SIOCGIWPRIV 0x8B0D /* get private ioctl interface info */ #define SIOCSIWSTATS 0x8B0E /* Unused */ #define SIOCGIWSTATS 0x8B0F /* Get /proc/net/wireless stats */ /* SIOCGIWSTATS is strictly used between user space and the kernel, and * is never passed to the driver (i.e. the driver will never see it). */ /* Spy support (statistics per MAC address - used for Mobile IP support) */ #define SIOCSIWSPY 0x8B10 /* set spy addresses */ #define SIOCGIWSPY 0x8B11 /* get spy info (quality of link) */ #define SIOCSIWTHRSPY 0x8B12 /* set spy threshold (spy event) */ #define SIOCGIWTHRSPY 0x8B13 /* get spy threshold */ /* Access Point manipulation */ #define SIOCSIWAP 0x8B14 /* set access point MAC addresses */ #define SIOCGIWAP 0x8B15 /* get access point MAC addresses */ #define SIOCGIWAPLIST 0x8B17 /* Deprecated in favor of scanning */ #define SIOCSIWSCAN 0x8B18 /* trigger scanning (list cells) */ #define SIOCGIWSCAN 0x8B19 /* get scanning results */ /* 802.11 specific support */ #define SIOCSIWESSID 0x8B1A /* set ESSID (network name) */ #define SIOCGIWESSID 0x8B1B /* get ESSID */ #define SIOCSIWNICKN 0x8B1C /* set node name/nickname */ #define SIOCGIWNICKN 0x8B1D /* get node name/nickname */ /* As the ESSID and NICKN are strings up to 32 bytes long, it doesn't fit * within the 'iwreq' structure, so we need to use the 'data' member to * point to a string in user space, like it is done for RANGE... */ /* Other parameters useful in 802.11 and some other devices */ #define SIOCSIWRATE 0x8B20 /* set default bit rate (bps) */ #define SIOCGIWRATE 0x8B21 /* get default bit rate (bps) */ #define SIOCSIWRTS 0x8B22 /* set RTS/CTS threshold (bytes) */ #define SIOCGIWRTS 0x8B23 /* get RTS/CTS threshold (bytes) */ #define SIOCSIWFRAG 0x8B24 /* set fragmentation thr (bytes) */ #define SIOCGIWFRAG 0x8B25 /* get fragmentation thr (bytes) */ #define SIOCSIWTXPOW 0x8B26 /* set transmit power (dBm) */ #define SIOCGIWTXPOW 0x8B27 /* get transmit power (dBm) */ #define SIOCSIWRETRY 0x8B28 /* set retry limits and lifetime */ #define SIOCGIWRETRY 0x8B29 /* get retry limits and lifetime */ /* Encoding stuff (scrambling, hardware security, WEP...) */ #define SIOCSIWENCODE 0x8B2A /* set encoding token & mode */ #define SIOCGIWENCODE 0x8B2B /* get encoding token & mode */ /* Power saving stuff (power management, unicast and multicast) */ #define SIOCSIWPOWER 0x8B2C /* set Power Management settings */ #define SIOCGIWPOWER 0x8B2D /* get Power Management settings */ /* WPA : Generic IEEE 802.11 informatiom element (e.g., for WPA/RSN/WMM). * This ioctl uses struct iw_point and data buffer that includes IE id and len * fields. More than one IE may be included in the request. Setting the generic * IE to empty buffer (len=0) removes the generic IE from the driver. Drivers * are allowed to generate their own WPA/RSN IEs, but in these cases, drivers * are required to report the used IE as a wireless event, e.g., when * associating with an AP. */ #define SIOCSIWGENIE 0x8B30 /* set generic IE */ #define SIOCGIWGENIE 0x8B31 /* get generic IE */ /* WPA : IEEE 802.11 MLME requests */ #define SIOCSIWMLME 0x8B16 /* request MLME operation; uses * struct iw_mlme */ /* WPA : Authentication mode parameters */ #define SIOCSIWAUTH 0x8B32 /* set authentication mode params */ #define SIOCGIWAUTH 0x8B33 /* get authentication mode params */ /* WPA : Extended version of encoding configuration */ #define SIOCSIWENCODEEXT 0x8B34 /* set encoding token & mode */ #define SIOCGIWENCODEEXT 0x8B35 /* get encoding token & mode */ /* WPA2 : PMKSA cache management */ #define SIOCSIWPMKSA 0x8B36 /* PMKSA cache operation */ /* -------------------- DEV PRIVATE IOCTL LIST -------------------- */ /* These 32 ioctl are wireless device private, for 16 commands. * Each driver is free to use them for whatever purpose it chooses, * however the driver *must* export the description of those ioctls * with SIOCGIWPRIV and *must* use arguments as defined below. * If you don't follow those rules, DaveM is going to hate you (reason : * it make mixed 32/64bit operation impossible). */ #define SIOCIWFIRSTPRIV 0x8BE0 #define SIOCIWLASTPRIV 0x8BFF /* Previously, we were using SIOCDEVPRIVATE, but we now have our * separate range because of collisions with other tools such as * 'mii-tool'. * We now have 32 commands, so a bit more space ;-). * Also, all 'odd' commands are only usable by root and don't return the * content of ifr/iwr to user (but you are not obliged to use the set/get * convention, just use every other two command). More details in iwpriv.c. * And I repeat : you are not forced to use them with iwpriv, but you * must be compliant with it. */ /* ------------------------- IOCTL STUFF ------------------------- */ /* The first and the last (range) */ #define SIOCIWFIRST 0x8B00 #define SIOCIWLAST SIOCIWLASTPRIV /* 0x8BFF */ #define IW_IOCTL_IDX(cmd) ((cmd) - SIOCIWFIRST) /* Even : get (world access), odd : set (root access) */ #define IW_IS_SET(cmd) (!((cmd) & 0x1)) #define IW_IS_GET(cmd) ((cmd) & 0x1) /* ----------------------- WIRELESS EVENTS ----------------------- */ /* Those are *NOT* ioctls, do not issue request on them !!! */ /* Most events use the same identifier as ioctl requests */ #define IWEVTXDROP 0x8C00 /* Packet dropped to excessive retry */ #define IWEVQUAL 0x8C01 /* Quality part of statistics (scan) */ #define IWEVCUSTOM 0x8C02 /* Driver specific ascii string */ #define IWEVREGISTERED 0x8C03 /* Discovered a new node (AP mode) */ #define IWEVEXPIRED 0x8C04 /* Expired a node (AP mode) */ #define IWEVGENIE 0x8C05 /* Generic IE (WPA, RSN, WMM, ..) * (scan results); This includes id and * length fields. One IWEVGENIE may * contain more than one IE. Scan * results may contain one or more * IWEVGENIE events. */ #define IWEVMICHAELMICFAILURE 0x8C06 /* Michael MIC failure * (struct iw_michaelmicfailure) */ #define IWEVASSOCREQIE 0x8C07 /* IEs used in (Re)Association Request. * The data includes id and length * fields and may contain more than one * IE. This event is required in * Managed mode if the driver * generates its own WPA/RSN IE. This * should be sent just before * IWEVREGISTERED event for the * association. */ #define IWEVASSOCRESPIE 0x8C08 /* IEs used in (Re)Association * Response. The data includes id and * length fields and may contain more * than one IE. This may be sent * between IWEVASSOCREQIE and * IWEVREGISTERED events for the * association. */ #define IWEVPMKIDCAND 0x8C09 /* PMKID candidate for RSN * pre-authentication * (struct iw_pmkid_cand) */ #define IWEVFIRST 0x8C00 #define IW_EVENT_IDX(cmd) ((cmd) - IWEVFIRST) /* ------------------------- PRIVATE INFO ------------------------- */ /* * The following is used with SIOCGIWPRIV. It allow a driver to define * the interface (name, type of data) for its private ioctl. * Privates ioctl are SIOCIWFIRSTPRIV -> SIOCIWLASTPRIV */ #define IW_PRIV_TYPE_MASK 0x7000 /* Type of arguments */ #define IW_PRIV_TYPE_NONE 0x0000 #define IW_PRIV_TYPE_BYTE 0x1000 /* Char as number */ #define IW_PRIV_TYPE_CHAR 0x2000 /* Char as character */ #define IW_PRIV_TYPE_INT 0x4000 /* 32 bits int */ #define IW_PRIV_TYPE_FLOAT 0x5000 /* struct iw_freq */ #define IW_PRIV_TYPE_ADDR 0x6000 /* struct sockaddr */ #define IW_PRIV_SIZE_FIXED 0x0800 /* Variable or fixed number of args */ #define IW_PRIV_SIZE_MASK 0x07FF /* Max number of those args */ /* * Note : if the number of args is fixed and the size < 16 octets, * instead of passing a pointer we will put args in the iwreq struct... */ /* ----------------------- OTHER CONSTANTS ----------------------- */ /* Maximum frequencies in the range struct */ #define IW_MAX_FREQUENCIES 32 /* Note : if you have something like 80 frequencies, * don't increase this constant and don't fill the frequency list. * The user will be able to set by channel anyway... */ /* Maximum bit rates in the range struct */ #define IW_MAX_BITRATES 32 /* Maximum tx powers in the range struct */ #define IW_MAX_TXPOWER 8 /* Note : if you more than 8 TXPowers, just set the max and min or * a few of them in the struct iw_range. */ /* Maximum of address that you may set with SPY */ #define IW_MAX_SPY 8 /* Maximum of address that you may get in the list of access points in range */ #define IW_MAX_AP 64 /* Maximum size of the ESSID and NICKN strings */ #define IW_ESSID_MAX_SIZE 32 /* Modes of operation */ #define IW_MODE_AUTO 0 /* Let the driver decides */ #define IW_MODE_ADHOC 1 /* Single cell network */ #define IW_MODE_INFRA 2 /* Multi cell network, roaming, ... */ #define IW_MODE_MASTER 3 /* Synchronisation master or Access Point */ #define IW_MODE_REPEAT 4 /* Wireless Repeater (forwarder) */ #define IW_MODE_SECOND 5 /* Secondary master/repeater (backup) */ #define IW_MODE_MONITOR 6 /* Passive monitor (listen only) */ /* Statistics flags (bitmask in updated) */ #define IW_QUAL_QUAL_UPDATED 0x01 /* Value was updated since last read */ #define IW_QUAL_LEVEL_UPDATED 0x02 #define IW_QUAL_NOISE_UPDATED 0x04 #define IW_QUAL_ALL_UPDATED 0x07 #define IW_QUAL_DBM 0x08 /* Level + Noise are dBm */ #define IW_QUAL_QUAL_INVALID 0x10 /* Driver doesn't provide value */ #define IW_QUAL_LEVEL_INVALID 0x20 #define IW_QUAL_NOISE_INVALID 0x40 #define IW_QUAL_ALL_INVALID 0x70 /* Frequency flags */ #define IW_FREQ_AUTO 0x00 /* Let the driver decides */ #define IW_FREQ_FIXED 0x01 /* Force a specific value */ /* Maximum number of size of encoding token available * they are listed in the range structure */ #define IW_MAX_ENCODING_SIZES 8 /* Maximum size of the encoding token in bytes */ #define IW_ENCODING_TOKEN_MAX 64 /* 512 bits (for now) */ /* Flags for encoding (along with the token) */ #define IW_ENCODE_INDEX 0x00FF /* Token index (if needed) */ #define IW_ENCODE_FLAGS 0xFF00 /* Flags defined below */ #define IW_ENCODE_MODE 0xF000 /* Modes defined below */ #define IW_ENCODE_DISABLED 0x8000 /* Encoding disabled */ #define IW_ENCODE_ENABLED 0x0000 /* Encoding enabled */ #define IW_ENCODE_RESTRICTED 0x4000 /* Refuse non-encoded packets */ #define IW_ENCODE_OPEN 0x2000 /* Accept non-encoded packets */ #define IW_ENCODE_NOKEY 0x0800 /* Key is write only, so not present */ #define IW_ENCODE_TEMP 0x0400 /* Temporary key */ /* Power management flags available (along with the value, if any) */ #define IW_POWER_ON 0x0000 /* No details... */ #define IW_POWER_TYPE 0xF000 /* Type of parameter */ #define IW_POWER_PERIOD 0x1000 /* Value is a period/duration of */ #define IW_POWER_TIMEOUT 0x2000 /* Value is a timeout (to go asleep) */ #define IW_POWER_MODE 0x0F00 /* Power Management mode */ #define IW_POWER_UNICAST_R 0x0100 /* Receive only unicast messages */ #define IW_POWER_MULTICAST_R 0x0200 /* Receive only multicast messages */ #define IW_POWER_ALL_R 0x0300 /* Receive all messages though PM */ #define IW_POWER_FORCE_S 0x0400 /* Force PM procedure for sending unicast */ #define IW_POWER_REPEATER 0x0800 /* Repeat broadcast messages in PM period */ #define IW_POWER_MODIFIER 0x000F /* Modify a parameter */ #define IW_POWER_MIN 0x0001 /* Value is a minimum */ #define IW_POWER_MAX 0x0002 /* Value is a maximum */ #define IW_POWER_RELATIVE 0x0004 /* Value is not in seconds/ms/us */ /* Transmit Power flags available */ #define IW_TXPOW_TYPE 0x00FF /* Type of value */ #define IW_TXPOW_DBM 0x0000 /* Value is in dBm */ #define IW_TXPOW_MWATT 0x0001 /* Value is in mW */ #define IW_TXPOW_RELATIVE 0x0002 /* Value is in arbitrary units */ #define IW_TXPOW_RANGE 0x1000 /* Range of value between min/max */ /* Retry limits and lifetime flags available */ #define IW_RETRY_ON 0x0000 /* No details... */ #define IW_RETRY_TYPE 0xF000 /* Type of parameter */ #define IW_RETRY_LIMIT 0x1000 /* Maximum number of retries*/ #define IW_RETRY_LIFETIME 0x2000 /* Maximum duration of retries in us */ #define IW_RETRY_MODIFIER 0x000F /* Modify a parameter */ #define IW_RETRY_MIN 0x0001 /* Value is a minimum */ #define IW_RETRY_MAX 0x0002 /* Value is a maximum */ #define IW_RETRY_RELATIVE 0x0004 /* Value is not in seconds/ms/us */ /* Scanning request flags */ #define IW_SCAN_DEFAULT 0x0000 /* Default scan of the driver */ #define IW_SCAN_ALL_ESSID 0x0001 /* Scan all ESSIDs */ #define IW_SCAN_THIS_ESSID 0x0002 /* Scan only this ESSID */ #define IW_SCAN_ALL_FREQ 0x0004 /* Scan all Frequencies */ #define IW_SCAN_THIS_FREQ 0x0008 /* Scan only this Frequency */ #define IW_SCAN_ALL_MODE 0x0010 /* Scan all Modes */ #define IW_SCAN_THIS_MODE 0x0020 /* Scan only this Mode */ #define IW_SCAN_ALL_RATE 0x0040 /* Scan all Bit-Rates */ #define IW_SCAN_THIS_RATE 0x0080 /* Scan only this Bit-Rate */ /* struct iw_scan_req scan_type */ #define IW_SCAN_TYPE_ACTIVE 0 #define IW_SCAN_TYPE_PASSIVE 1 /* Maximum size of returned data */ #define IW_SCAN_MAX_DATA 4096 /* In bytes */ /* Max number of char in custom event - use multiple of them if needed */ #define IW_CUSTOM_MAX 256 /* In bytes */ /* Generic information element */ #define IW_GENERIC_IE_MAX 1024 /* MLME requests (SIOCSIWMLME / struct iw_mlme) */ #define IW_MLME_DEAUTH 0 #define IW_MLME_DISASSOC 1 /* SIOCSIWAUTH/SIOCGIWAUTH struct iw_param flags */ #define IW_AUTH_INDEX 0x0FFF #define IW_AUTH_FLAGS 0xF000 /* SIOCSIWAUTH/SIOCGIWAUTH parameters (0 .. 4095) * (IW_AUTH_INDEX mask in struct iw_param flags; this is the index of the * parameter that is being set/get to; value will be read/written to * struct iw_param value field) */ #define IW_AUTH_WPA_VERSION 0 #define IW_AUTH_CIPHER_PAIRWISE 1 #define IW_AUTH_CIPHER_GROUP 2 #define IW_AUTH_KEY_MGMT 3 #define IW_AUTH_TKIP_COUNTERMEASURES 4 #define IW_AUTH_DROP_UNENCRYPTED 5 #define IW_AUTH_80211_AUTH_ALG 6 #define IW_AUTH_WPA_ENABLED 7 #define IW_AUTH_RX_UNENCRYPTED_EAPOL 8 #define IW_AUTH_ROAMING_CONTROL 9 #define IW_AUTH_PRIVACY_INVOKED 10 /* IW_AUTH_WPA_VERSION values (bit field) */ #define IW_AUTH_WPA_VERSION_DISABLED 0x00000001 #define IW_AUTH_WPA_VERSION_WPA 0x00000002 #define IW_AUTH_WPA_VERSION_WPA2 0x00000004 /* IW_AUTH_PAIRWISE_CIPHER and IW_AUTH_GROUP_CIPHER values (bit field) */ #define IW_AUTH_CIPHER_NONE 0x00000001 #define IW_AUTH_CIPHER_WEP40 0x00000002 #define IW_AUTH_CIPHER_TKIP 0x00000004 #define IW_AUTH_CIPHER_CCMP 0x00000008 #define IW_AUTH_CIPHER_WEP104 0x00000010 /* IW_AUTH_KEY_MGMT values (bit field) */ #define IW_AUTH_KEY_MGMT_802_1X 1 #define IW_AUTH_KEY_MGMT_PSK 2 /* IW_AUTH_80211_AUTH_ALG values (bit field) */ #define IW_AUTH_ALG_OPEN_SYSTEM 0x00000001 #define IW_AUTH_ALG_SHARED_KEY 0x00000002 #define IW_AUTH_ALG_LEAP 0x00000004 /* IW_AUTH_ROAMING_CONTROL values */ #define IW_AUTH_ROAMING_ENABLE 0 /* driver/firmware based roaming */ #define IW_AUTH_ROAMING_DISABLE 1 /* user space program used for roaming * control */ /* SIOCSIWENCODEEXT definitions */ #define IW_ENCODE_SEQ_MAX_SIZE 8 /* struct iw_encode_ext ->alg */ #define IW_ENCODE_ALG_NONE 0 #define IW_ENCODE_ALG_WEP 1 #define IW_ENCODE_ALG_TKIP 2 #define IW_ENCODE_ALG_CCMP 3 /* struct iw_encode_ext ->ext_flags */ #define IW_ENCODE_EXT_TX_SEQ_VALID 0x00000001 #define IW_ENCODE_EXT_RX_SEQ_VALID 0x00000002 #define IW_ENCODE_EXT_GROUP_KEY 0x00000004 #define IW_ENCODE_EXT_SET_TX_KEY 0x00000008 /* IWEVMICHAELMICFAILURE : struct iw_michaelmicfailure ->flags */ #define IW_MICFAILURE_KEY_ID 0x00000003 /* Key ID 0..3 */ #define IW_MICFAILURE_GROUP 0x00000004 #define IW_MICFAILURE_PAIRWISE 0x00000008 #define IW_MICFAILURE_STAKEY 0x00000010 #define IW_MICFAILURE_COUNT 0x00000060 /* 1 or 2 (0 = count not supported) */ /* Bit field values for enc_capa in struct iw_range */ #define IW_ENC_CAPA_WPA 0x00000001 #define IW_ENC_CAPA_WPA2 0x00000002 #define IW_ENC_CAPA_CIPHER_TKIP 0x00000004 #define IW_ENC_CAPA_CIPHER_CCMP 0x00000008 /* Event capability macros - in (struct iw_range *)->event_capa * Because we have more than 32 possible events, we use an array of * 32 bit bitmasks. Note : 32 bits = 0x20 = 2^5. */ #define IW_EVENT_CAPA_BASE(cmd) ((cmd >= SIOCIWFIRSTPRIV) ? \ (cmd - SIOCIWFIRSTPRIV + 0x60) : \ (cmd - SIOCSIWCOMMIT)) #define IW_EVENT_CAPA_INDEX(cmd) (IW_EVENT_CAPA_BASE(cmd) >> 5) #define IW_EVENT_CAPA_MASK(cmd) (1 << (IW_EVENT_CAPA_BASE(cmd) & 0x1F)) /* Event capability constants - event autogenerated by the kernel * This list is valid for most 802.11 devices, customise as needed... */ #define IW_EVENT_CAPA_K_0 (IW_EVENT_CAPA_MASK(0x8B04) | \ IW_EVENT_CAPA_MASK(0x8B06) | \ IW_EVENT_CAPA_MASK(0x8B1A)) #define IW_EVENT_CAPA_K_1 (IW_EVENT_CAPA_MASK(0x8B2A)) /* "Easy" macro to set events in iw_range (less efficient) */ #define IW_EVENT_CAPA_SET(event_capa, cmd) (event_capa[IW_EVENT_CAPA_INDEX(cmd)] |= IW_EVENT_CAPA_MASK(cmd)) #define IW_EVENT_CAPA_SET_KERNEL(event_capa) {event_capa[0] |= IW_EVENT_CAPA_K_0; event_capa[1] |= IW_EVENT_CAPA_K_1; } /****************************** TYPES ******************************/ /* --------------------------- SUBTYPES --------------------------- */ /* * Generic format for most parameters that fit in an int */ struct iw_param { __s32 value; /* The value of the parameter itself */ __u8 fixed; /* Hardware should not use auto select */ __u8 disabled; /* Disable the feature */ __u16 flags; /* Various specifc flags (if any) */ }; /* * For all data larger than 16 octets, we need to use a * pointer to memory allocated in user space. */ struct iw_point { void *pointer; /* Pointer to the data (in user space) */ __u16 length; /* number of fields or size in bytes */ __u16 flags; /* Optional params */ }; /* * A frequency * For numbers lower than 10^9, we encode the number in 'm' and * set 'e' to 0 * For number greater than 10^9, we divide it by the lowest power * of 10 to get 'm' lower than 10^9, with 'm'= f / (10^'e')... * The power of 10 is in 'e', the result of the division is in 'm'. */ struct iw_freq { __s32 m; /* Mantissa */ __s16 e; /* Exponent */ __u8 i; /* List index (when in range struct) */ __u8 flags; /* Flags (fixed/auto) */ }; /* * Quality of the link */ struct iw_quality { __u8 qual; /* link quality (%retries, SNR, %missed beacons or better...) */ __u8 level; /* signal level (dBm) */ __u8 noise; /* noise level (dBm) */ __u8 updated; /* Flags to know if updated */ }; /* * Packet discarded in the wireless adapter due to * "wireless" specific problems... * Note : the list of counter and statistics in net_device_stats * is already pretty exhaustive, and you should use that first. * This is only additional stats... */ struct iw_discarded { __u32 nwid; /* Rx : Wrong nwid/essid */ __u32 code; /* Rx : Unable to code/decode (WEP) */ __u32 fragment; /* Rx : Can't perform MAC reassembly */ __u32 retries; /* Tx : Max MAC retries num reached */ __u32 misc; /* Others cases */ }; /* * Packet/Time period missed in the wireless adapter due to * "wireless" specific problems... */ struct iw_missed { __u32 beacon; /* Missed beacons/superframe */ }; /* * Quality range (for spy threshold) */ struct iw_thrspy { struct sockaddr addr; /* Source address (hw/mac) */ struct iw_quality qual; /* Quality of the link */ struct iw_quality low; /* Low threshold */ struct iw_quality high; /* High threshold */ }; /* * Optional data for scan request * * Note: these optional parameters are controlling parameters for the * scanning behavior, these do not apply to getting scan results * (SIOCGIWSCAN). Drivers are expected to keep a local BSS table and * provide a merged results with all BSSes even if the previous scan * request limited scanning to a subset, e.g., by specifying an SSID. * Especially, scan results are required to include an entry for the * current BSS if the driver is in Managed mode and associated with an AP. */ struct iw_scan_req { __u8 scan_type; /* IW_SCAN_TYPE_{ACTIVE,PASSIVE} */ __u8 essid_len; __u8 num_channels; /* num entries in channel_list; * 0 = scan all allowed channels */ __u8 flags; /* reserved as padding; use zero, this may * be used in the future for adding flags * to request different scan behavior */ struct sockaddr bssid; /* ff:ff:ff:ff:ff:ff for broadcast BSSID or * individual address of a specific BSS */ /* * Use this ESSID if IW_SCAN_THIS_ESSID flag is used instead of using * the current ESSID. This allows scan requests for specific ESSID * without having to change the current ESSID and potentially breaking * the current association. */ __u8 essid[IW_ESSID_MAX_SIZE]; /* * Optional parameters for changing the default scanning behavior. * These are based on the MLME-SCAN.request from IEEE Std 802.11. * TU is 1.024 ms. If these are set to 0, driver is expected to use * reasonable default values. min_channel_time defines the time that * will be used to wait for the first reply on each channel. If no * replies are received, next channel will be scanned after this. If * replies are received, total time waited on the channel is defined by * max_channel_time. */ __u32 min_channel_time; /* in TU */ __u32 max_channel_time; /* in TU */ struct iw_freq channel_list[IW_MAX_FREQUENCIES]; }; /* ------------------------- WPA SUPPORT ------------------------- */ /* * Extended data structure for get/set encoding (this is used with * SIOCSIWENCODEEXT/SIOCGIWENCODEEXT. struct iw_point and IW_ENCODE_* * flags are used in the same way as with SIOCSIWENCODE/SIOCGIWENCODE and * only the data contents changes (key data -> this structure, including * key data). * * If the new key is the first group key, it will be set as the default * TX key. Otherwise, default TX key index is only changed if * IW_ENCODE_EXT_SET_TX_KEY flag is set. * * Key will be changed with SIOCSIWENCODEEXT in all cases except for * special "change TX key index" operation which is indicated by setting * key_len = 0 and ext_flags |= IW_ENCODE_EXT_SET_TX_KEY. * * tx_seq/rx_seq are only used when respective * IW_ENCODE_EXT_{TX,RX}_SEQ_VALID flag is set in ext_flags. Normal * TKIP/CCMP operation is to set RX seq with SIOCSIWENCODEEXT and start * TX seq from zero whenever key is changed. SIOCGIWENCODEEXT is normally * used only by an Authenticator (AP or an IBSS station) to get the * current TX sequence number. Using TX_SEQ_VALID for SIOCSIWENCODEEXT and * RX_SEQ_VALID for SIOCGIWENCODEEXT are optional, but can be useful for * debugging/testing. */ struct iw_encode_ext { __u32 ext_flags; /* IW_ENCODE_EXT_* */ __u8 tx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ __u8 rx_seq[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ struct sockaddr addr; /* ff:ff:ff:ff:ff:ff for broadcast/multicast * (group) keys or unicast address for * individual keys */ __u16 alg; /* IW_ENCODE_ALG_* */ __u16 key_len; __u8 key[0]; }; /* SIOCSIWMLME data */ struct iw_mlme { __u16 cmd; /* IW_MLME_* */ __u16 reason_code; struct sockaddr addr; }; /* SIOCSIWPMKSA data */ #define IW_PMKSA_ADD 1 #define IW_PMKSA_REMOVE 2 #define IW_PMKSA_FLUSH 3 #define IW_PMKID_LEN 16 struct iw_pmksa { __u32 cmd; /* IW_PMKSA_* */ struct sockaddr bssid; __u8 pmkid[IW_PMKID_LEN]; }; /* IWEVMICHAELMICFAILURE data */ struct iw_michaelmicfailure { __u32 flags; struct sockaddr src_addr; __u8 tsc[IW_ENCODE_SEQ_MAX_SIZE]; /* LSB first */ }; /* IWEVPMKIDCAND data */ #define IW_PMKID_CAND_PREAUTH 0x00000001 /* RNS pre-authentication enabled */ struct iw_pmkid_cand { __u32 flags; /* IW_PMKID_CAND_* */ __u32 index; /* the smaller the index, the higher the * priority */ struct sockaddr bssid; }; /* ------------------------ WIRELESS STATS ------------------------ */ /* * Wireless statistics (used for /proc/net/wireless) */ struct iw_statistics { __u16 status; /* Status * - device dependent for now */ struct iw_quality qual; /* Quality of the link * (instant/mean/max) */ struct iw_discarded discard; /* Packet discarded counts */ struct iw_missed miss; /* Packet missed counts */ }; /* ------------------------ IOCTL REQUEST ------------------------ */ /* * This structure defines the payload of an ioctl, and is used * below. * * Note that this structure should fit on the memory footprint * of iwreq (which is the same as ifreq), which mean a max size of * 16 octets = 128 bits. Warning, pointers might be 64 bits wide... * You should check this when increasing the structures defined * above in this file... */ union iwreq_data { /* Config - generic */ char name[IFNAMSIZ]; /* Name : used to verify the presence of wireless extensions. * Name of the protocol/provider... */ struct iw_point essid; /* Extended network name */ struct iw_param nwid; /* network id (or domain - the cell) */ struct iw_freq freq; /* frequency or channel : * 0-1000 = channel * > 1000 = frequency in Hz */ struct iw_param sens; /* signal level threshold */ struct iw_param bitrate; /* default bit rate */ struct iw_param txpower; /* default transmit power */ struct iw_param rts; /* RTS threshold threshold */ struct iw_param frag; /* Fragmentation threshold */ __u32 mode; /* Operation mode */ struct iw_param retry; /* Retry limits & lifetime */ struct iw_point encoding; /* Encoding stuff : tokens */ struct iw_param power; /* PM duration/timeout */ struct iw_quality qual; /* Quality part of statistics */ struct sockaddr ap_addr; /* Access point address */ struct sockaddr addr; /* Destination address (hw/mac) */ struct iw_param param; /* Other small parameters */ struct iw_point data; /* Other large parameters */ }; /* * The structure to exchange data for ioctl. * This structure is the same as 'struct ifreq', but (re)defined for * convenience... * Do I need to remind you about structure size (32 octets) ? */ struct iwreq { union { char ifrn_name[IFNAMSIZ]; /* if name, e.g. "eth0" */ } ifr_ifrn; /* Data part (defined just above) */ union iwreq_data u; }; /* -------------------------- IOCTL DATA -------------------------- */ /* * For those ioctl which want to exchange mode data that what could * fit in the above structure... */ /* * Range of parameters */ struct iw_range { /* Informative stuff (to choose between different interface) */ __u32 throughput; /* To give an idea... */ /* In theory this value should be the maximum benchmarked * TCP/IP throughput, because with most of these devices the * bit rate is meaningless (overhead an co) to estimate how * fast the connection will go and pick the fastest one. * I suggest people to play with Netperf or any benchmark... */ /* NWID (or domain id) */ __u32 min_nwid; /* Minimal NWID we are able to set */ __u32 max_nwid; /* Maximal NWID we are able to set */ /* Old Frequency (backward compat - moved lower ) */ __u16 old_num_channels; __u8 old_num_frequency; /* Wireless event capability bitmasks */ __u32 event_capa[6]; /* signal level threshold range */ __s32 sensitivity; /* Quality of link & SNR stuff */ /* Quality range (link, level, noise) * If the quality is absolute, it will be in the range [0 ; max_qual], * if the quality is dBm, it will be in the range [max_qual ; 0]. * Don't forget that we use 8 bit arithmetics... */ struct iw_quality max_qual; /* Quality of the link */ /* This should contain the average/typical values of the quality * indicator. This should be the threshold between a "good" and * a "bad" link (example : monitor going from green to orange). * Currently, user space apps like quality monitors don't have any * way to calibrate the measurement. With this, they can split * the range between 0 and max_qual in different quality level * (using a geometric subdivision centered on the average). * I expect that people doing the user space apps will feedback * us on which value we need to put in each driver... */ struct iw_quality avg_qual; /* Quality of the link */ /* Rates */ __u8 num_bitrates; /* Number of entries in the list */ __s32 bitrate[IW_MAX_BITRATES]; /* list, in bps */ /* RTS threshold */ __s32 min_rts; /* Minimal RTS threshold */ __s32 max_rts; /* Maximal RTS threshold */ /* Frag threshold */ __s32 min_frag; /* Minimal frag threshold */ __s32 max_frag; /* Maximal frag threshold */ /* Power Management duration & timeout */ __s32 min_pmp; /* Minimal PM period */ __s32 max_pmp; /* Maximal PM period */ __s32 min_pmt; /* Minimal PM timeout */ __s32 max_pmt; /* Maximal PM timeout */ __u16 pmp_flags; /* How to decode max/min PM period */ __u16 pmt_flags; /* How to decode max/min PM timeout */ __u16 pm_capa; /* What PM options are supported */ /* Encoder stuff */ __u16 encoding_size[IW_MAX_ENCODING_SIZES]; /* Different token sizes */ __u8 num_encoding_sizes; /* Number of entry in the list */ __u8 max_encoding_tokens; /* Max number of tokens */ /* For drivers that need a "login/passwd" form */ __u8 encoding_login_index; /* token index for login token */ /* Transmit power */ __u16 txpower_capa; /* What options are supported */ __u8 num_txpower; /* Number of entries in the list */ __s32 txpower[IW_MAX_TXPOWER]; /* list, in bps */ /* Wireless Extension version info */ __u8 we_version_compiled; /* Must be WIRELESS_EXT */ __u8 we_version_source; /* Last update of source */ /* Retry limits and lifetime */ __u16 retry_capa; /* What retry options are supported */ __u16 retry_flags; /* How to decode max/min retry limit */ __u16 r_time_flags; /* How to decode max/min retry life */ __s32 min_retry; /* Minimal number of retries */ __s32 max_retry; /* Maximal number of retries */ __s32 min_r_time; /* Minimal retry lifetime */ __s32 max_r_time; /* Maximal retry lifetime */ /* Frequency */ __u16 num_channels; /* Number of channels [0; num - 1] */ __u8 num_frequency; /* Number of entry in the list */ struct iw_freq freq[IW_MAX_FREQUENCIES]; /* list */ /* Note : this frequency list doesn't need to fit channel numbers, * because each entry contain its channel index */ __u32 enc_capa; /* IW_ENC_CAPA_* bit field */ }; /* * Private ioctl interface information */ struct iw_priv_args { __u32 cmd; /* Number of the ioctl to issue */ __u16 set_args; /* Type and number of args */ __u16 get_args; /* Type and number of args */ char name[IFNAMSIZ]; /* Name of the extension */ }; /* ----------------------- WIRELESS EVENTS ----------------------- */ /* * Wireless events are carried through the rtnetlink socket to user * space. They are encapsulated in the IFLA_WIRELESS field of * a RTM_NEWLINK message. */ /* * A Wireless Event. Contains basically the same data as the ioctl... */ struct iw_event { __u16 len; /* Real lenght of this stuff */ __u16 cmd; /* Wireless IOCTL */ union iwreq_data u; /* IOCTL fixed payload */ }; /* Size of the Event prefix (including padding and alignement junk) */ #define IW_EV_LCP_LEN (sizeof(struct iw_event) - sizeof(union iwreq_data)) /* Size of the various events */ #define IW_EV_CHAR_LEN (IW_EV_LCP_LEN + IFNAMSIZ) #define IW_EV_UINT_LEN (IW_EV_LCP_LEN + sizeof(__u32)) #define IW_EV_FREQ_LEN (IW_EV_LCP_LEN + sizeof(struct iw_freq)) #define IW_EV_PARAM_LEN (IW_EV_LCP_LEN + sizeof(struct iw_param)) #define IW_EV_ADDR_LEN (IW_EV_LCP_LEN + sizeof(struct sockaddr)) #define IW_EV_QUAL_LEN (IW_EV_LCP_LEN + sizeof(struct iw_quality)) /* iw_point events are special. First, the payload (extra data) come at * the end of the event, so they are bigger than IW_EV_POINT_LEN. Second, * we omit the pointer, so start at an offset. */ #define IW_EV_POINT_OFF (((char *) &(((struct iw_point *) NULL)->length)) - \ (char *) NULL) #define IW_EV_POINT_LEN (IW_EV_LCP_LEN + sizeof(struct iw_point) - \ IW_EV_POINT_OFF) #endif /* _LINUX_WIRELESS_H */ xsupplicant-1.2.3-fixincludes.patch: --- NEW FILE xsupplicant-1.2.3-fixincludes.patch --- --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux_wext.c.BAD 2006-02-28 19:52:32.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux_wext.c 2006-02-28 19:52:40.000000000 -0600 @@ -91,7 +91,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux.c.BAD 2006-02-28 19:52:16.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux.c 2006-02-28 19:52:26.000000000 -0600 @@ -102,7 +102,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_atmel_driver.c.BAD 2006-02-28 19:51:18.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_atmel_driver.c 2006-02-28 19:51:32.000000000 -0600 @@ -74,7 +74,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux_rtnetlink.c.BAD 2006-02-28 19:52:54.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux_rtnetlink.c 2006-02-28 19:53:03.000000000 -0600 @@ -119,7 +119,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_madwifi_driver.c.BAD 2006-02-28 19:52:01.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_madwifi_driver.c 2006-02-28 19:52:08.000000000 -0600 @@ -81,7 +81,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am.BAD 2006-02-28 20:00:00.000000000 -0600 +++ xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am 2006-02-28 20:00:13.000000000 -0600 @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS=foreign no-dependencies -INCLUDES = -I ${top_srcdir}/src +INCLUDES = -I ${top_srcdir}/src -I ${top_srcdir}/lib/libxsupconfig include_HEADERS = xsupconfcheck.h lib_LIBRARIES = libxsupconfcheck.a libxsupconfcheck_a_SOURCES = xsupconfcheck.c Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 24 Oct 2005 14:20:22 -0000 1.3 +++ .cvsignore 1 Mar 2006 02:11:46 -0000 1.4 @@ -1,2 +1,3 @@ xsupplicant-1.2.tar.gz xsupplicant-1.2.2.tar.gz +xsupplicant-1.2.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 24 Oct 2005 14:20:22 -0000 1.5 +++ sources 1 Mar 2006 02:11:46 -0000 1.6 @@ -1 +1 @@ -0e9aaf83a11f8eaff7c6564a53c25d8e xsupplicant-1.2.2.tar.gz +f583f13d5bb91f98dab106d3610a677f xsupplicant-1.2.3.tar.gz Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xsupplicant.spec 3 Jan 2006 15:09:52 -0000 1.15 +++ xsupplicant.spec 1 Mar 2006 02:11:46 -0000 1.16 @@ -1,17 +1,17 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x -Version: 1.2.2 -Release: 7%{?dist} +Version: 1.2.3 +Release: 1%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ Source0: http://download.sourceforge.net/open1x/xsupplicant-%{version}.tar.gz +Source1: v19wireless.h BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel, bison, flex, openjade, lynx, jadetex BuildRequires: docbook-dtds, docbook-style-dsssl, wireless-tools Patch0: xsupplicant-1.2.2-docsfix.patch -Patch1: xsupplicant-1.2.2-compilefix.patch -Patch2: xsupplicant-1.2.2-buf.patch +Patch1: xsupplicant-1.2.3-fixincludes.patch %description This software allows a GNU/Linux or BSD workstation to authenticate with @@ -19,17 +19,30 @@ use is for computers with wireless LAN connections to complete a strong authentication before joining the network. +%package devel +Summary: Development files for xsupplicant +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Development libraries and headers for xsupplicant. + %prep %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 + +# Fedora Core 4 and 5 ship with old headers, but V19 in the kernel +# So, we need to put the right headers in place. This is the simplest +# hack to solve this issue. +cp %{SOURCE1} src/ perl -pi.orig -e 's|/lib\b|/%{_lib}|g' configure* %build %configure -make %{?_smp_mflags} +# _smp_mflags makes this app go BOOM +make cd doc ./builddocs.sh cd .. @@ -49,11 +62,24 @@ %config(noreplace) %{_sysconfdir}/xsupplicant.conf %{_bindir}/config-parser %{_bindir}/xsup_monitor +%{_bindir}/xsup_ntpwdhash %{_bindir}/xsup_set_pwd %{_bindir}/xsup_get_state %{_sbindir}/xsupplicant +%files devel +%defattr(-,root,root,-) +%{_includedir}/xsupconfcheck.h +%{_includedir}/xsupconfig.h +%{_includedir}/xsupconfwrite.h +%{_includedir}/xsupgui.h +%{_libdir}/libxsup*.a + %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-1 +- bump to 1.2.3 +- split package into main and devel + * Tue Jan 3 2006 Hans de Goede 1.2.2-7 - fix a possible bufferoverflow bz 170045 From fedora-extras-commits at redhat.com Wed Mar 1 02:13:49 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 21:13:49 -0500 Subject: rpms/xsupplicant/FC-4 xsupplicant-1.2.3-fixincludes.patch,NONE,1.1 Message-ID: <200603010213.k212DpJE019418@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19405 Added Files: xsupplicant-1.2.3-fixincludes.patch Log Message: Whoops. xsupplicant-1.2.3-fixincludes.patch: --- NEW FILE xsupplicant-1.2.3-fixincludes.patch --- --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux_wext.c.BAD 2006-02-28 19:52:32.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux_wext.c 2006-02-28 19:52:40.000000000 -0600 @@ -91,7 +91,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux.c.BAD 2006-02-28 19:52:16.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux.c 2006-02-28 19:52:26.000000000 -0600 @@ -102,7 +102,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_atmel_driver.c.BAD 2006-02-28 19:51:18.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_atmel_driver.c 2006-02-28 19:51:32.000000000 -0600 @@ -74,7 +74,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_linux_rtnetlink.c.BAD 2006-02-28 19:52:54.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_linux_rtnetlink.c 2006-02-28 19:53:03.000000000 -0600 @@ -119,7 +119,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/src/cardif/linux/cardif_madwifi_driver.c.BAD 2006-02-28 19:52:01.000000000 -0600 +++ xsupplicant-1.2.3/src/cardif/linux/cardif_madwifi_driver.c 2006-02-28 19:52:08.000000000 -0600 @@ -81,7 +81,7 @@ #include #include #include -#include +#include "v19wireless.h" #include #include #include --- xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am.BAD 2006-02-28 20:00:00.000000000 -0600 +++ xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am 2006-02-28 20:00:13.000000000 -0600 @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS=foreign no-dependencies -INCLUDES = -I ${top_srcdir}/src +INCLUDES = -I ${top_srcdir}/src -I ${top_srcdir}/lib/libxsupconfig include_HEADERS = xsupconfcheck.h lib_LIBRARIES = libxsupconfcheck.a libxsupconfcheck_a_SOURCES = xsupconfcheck.c From fedora-extras-commits at redhat.com Wed Mar 1 02:15:46 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 21:15:46 -0500 Subject: rpms/xsupplicant/FC-4 xsupplicant.spec,1.15,1.16 Message-ID: <200603010216.k212GJwY019493@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19461/FC-4 Modified Files: xsupplicant.spec Log Message: Bump spec because of my mistake. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- xsupplicant.spec 1 Mar 2006 02:11:38 -0000 1.15 +++ xsupplicant.spec 1 Mar 2006 02:15:46 -0000 1.16 @@ -1,7 +1,7 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ @@ -76,6 +76,9 @@ %{_libdir}/libxsup*.a %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-2 +- whoops. missed a file. + * Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-1 - bump to 1.2.3 - split package into main and devel From fedora-extras-commits at redhat.com Wed Mar 1 02:16:06 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 28 Feb 2006 21:16:06 -0500 Subject: rpms/xsupplicant/devel xsupplicant.spec,1.16,1.17 Message-ID: <200603010216.k212GcDh019496@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/xsupplicant/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19461/devel Modified Files: xsupplicant.spec Log Message: Bump spec because of my mistake. Index: xsupplicant.spec =================================================================== RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xsupplicant.spec 1 Mar 2006 02:11:46 -0000 1.16 +++ xsupplicant.spec 1 Mar 2006 02:16:06 -0000 1.17 @@ -1,7 +1,7 @@ Name: xsupplicant Summary: Open Source Implementation of IEEE 802.1x Version: 1.2.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://www.open1x.org/ @@ -76,6 +76,9 @@ %{_libdir}/libxsup*.a %changelog +* Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-2 +- whoops. missed a file. + * Tue Feb 28 2006 Tom "spot" Callaway 1.2.3-1 - bump to 1.2.3 - split package into main and devel From fedora-extras-commits at redhat.com Wed Mar 1 02:39:03 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 28 Feb 2006 21:39:03 -0500 Subject: rpms/sqlite2/devel - New directory Message-ID: <200603010239.k212d5Os019688@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/sqlite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19680/devel Log Message: Directory /cvs/extras/rpms/sqlite2/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 02:41:14 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 28 Feb 2006 21:41:14 -0500 Subject: rpms/sqlite2/devel Makefile,NONE,1.1 Message-ID: <200603010241.k212fGjs019772@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/sqlite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19762 Added Files: Makefile Log Message: Trying to reimport... ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' From fedora-extras-commits at redhat.com Wed Mar 1 02:46:26 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:46:26 -0500 Subject: rpms/jthread - New directory Message-ID: <200603010246.k212kS18019918@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19908/jthread Log Message: Directory /cvs/extras/rpms/jthread added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 02:46:31 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:46:31 -0500 Subject: rpms/jthread/devel - New directory Message-ID: <200603010246.k212kXTD019933@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19908/jthread/devel Log Message: Directory /cvs/extras/rpms/jthread/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 02:47:03 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:47:03 -0500 Subject: rpms/jthread Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603010247.k212l553019971@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19959 Added Files: Makefile import.log Log Message: Setup of module jthread --- NEW FILE Makefile --- # Top level Makefile for module jthread all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 1 02:47:08 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:47:08 -0500 Subject: rpms/jthread/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603010247.k212lA6H019991@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19959/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jthread --- NEW 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 Mar 1 02:48:24 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:48:24 -0500 Subject: rpms/jthread import.log,1.1,1.2 Message-ID: <200603010248.k212muZf020069@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20035 Modified Files: import.log Log Message: auto-import jthread-1.1.2-1 on branch devel from jthread-1.1.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/jthread/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Mar 2006 02:47:02 -0000 1.1 +++ import.log 1 Mar 2006 02:48:24 -0000 1.2 @@ -0,0 +1 @@ +jthread-1_1_2-1:HEAD:jthread-1.1.2-1.src.rpm:1141181290 From fedora-extras-commits at redhat.com Wed Mar 1 02:48:30 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Tue, 28 Feb 2006 21:48:30 -0500 Subject: rpms/jthread/devel jthread.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603010249.k212n2TY020073@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20035/devel Modified Files: .cvsignore sources Added Files: jthread.spec Log Message: auto-import jthread-1.1.2-1 on branch devel from jthread-1.1.2-1.src.rpm --- NEW FILE jthread.spec --- Summary: JThread provides classes to make use of threads easy on different platforms Name: jthread Version: 1.1.2 Release: 1 License: MIT Group: System Environment/Libraries URL: http://research.edm.luc.ac.be/jori/jthread/jthread.html Source0: http://research.edm.luc.ac.be/jori/jthread/jthread-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: /usr/bin/pdflatex %description JThread provides some classes to make use of threads easy on different platforms. The classes are actually rather simple wrappers around existing thread implementations. %package devel Summary: Development files for JThread Group: Development/Libraries Requires: jthread = %{version}-%{release} %description devel Development files for JThread %prep %setup -q %build %configure --disable-static make %{_smp_mflags} pushd doc pdflatex manual.tex pdflatex manual.tex popd %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install rm -f %{buildroot}%{_libdir}/libjthread.la %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc ChangeLog LICENSE.MIT README.TXT TODO %{_libdir}/libjthread-%{version}.so %files devel %defattr(-,root,root,-) %doc doc/manual.pdf doc/manual.tex %{_includedir}/jthread %{_libdir}/libjthread.so %changelog * Sat Jan 7 2006 Jeffrey C. Ollie - 1.1.2-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jthread/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2006 02:47:08 -0000 1.1 +++ .cvsignore 1 Mar 2006 02:48:30 -0000 1.2 @@ -0,0 +1 @@ +jthread-1.1.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jthread/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2006 02:47:08 -0000 1.1 +++ sources 1 Mar 2006 02:48:30 -0000 1.2 @@ -0,0 +1 @@ +bdbfcf50861abc7d2b60d8bf8fe0b6c6 jthread-1.1.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 02:50:18 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 28 Feb 2006 21:50:18 -0500 Subject: rpms/sqlite2/devel sources, NONE, 1.1 sqlite-2.8.15-arch-double-differences.patch, NONE, 1.1 sqlite-2.8.15-makefile.patch, NONE, 1.1 sqlite-2.8.15.rpath.patch, NONE, 1.1 sqlite-2.8.3.test.rh9.patch, NONE, 1.1 sqlite-64bit-fixes.patch, NONE, 1.1 sqlite2.spec, NONE, 1.1 Message-ID: <200603010250.k212oKLI020209@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/sqlite2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20168/devel Added Files: sources sqlite-2.8.15-arch-double-differences.patch sqlite-2.8.15-makefile.patch sqlite-2.8.15.rpath.patch sqlite-2.8.3.test.rh9.patch sqlite-64bit-fixes.patch sqlite2.spec Log Message: auto-import sqlite2-2.8.16-3 on branch devel from sqlite2-2.8.16-3.src.rpm --- NEW FILE sources --- 9c79b461ff30240a6f9d70dd67f8faea sqlite-2.8.16.tar.gz sqlite-2.8.15-arch-double-differences.patch: --- NEW FILE sqlite-2.8.15-arch-double-differences.patch --- --- sqlite/test/format3.test.bak 2003-12-23 03:17:35.000000000 +0100 +++ sqlite/test/format3.test 2005-01-28 18:06:35.066538463 +0100 @@ -686,7 +686,7 @@ execsql {SELECT '0'==0.0} } {1} do_test format3-11.3 { - execsql {SELECT '123456789012345678901'=='123456789012345678900'} + execsql {SELECT '1234567890123456789012'=='1234567890123456789011'} } {1} do_test format3-11.4 { execsql { --- sqlite/test/misc1.test.bak 2003-08-05 15:13:39.000000000 +0200 +++ sqlite/test/misc1.test 2005-01-28 18:07:26.976971054 +0100 @@ -335,7 +335,7 @@ execsql {SELECT '0'==0.0} } {1} do_test misc1-12.3 { - execsql {SELECT '12345678901234567890'=='12345678901234567891'} + execsql {SELECT '1234567890123456789012'=='1234567890123456789011'} } {0} do_test misc1-12.4 { execsql { sqlite-2.8.15-makefile.patch: --- NEW FILE sqlite-2.8.15-makefile.patch --- diff -Nur sqlite-2.8.15-orig/Makefile.in sqlite-2.8.15/Makefile.in --- sqlite-2.8.15-orig/Makefile.in 2004-03-27 00:16:32.000000000 +0100 +++ sqlite-2.8.15/Makefile.in 2005-01-23 18:20:37.034194768 +0100 @@ -465,14 +465,16 @@ mv $(DOC) doc install: sqlite libsqlite.la sqlite.h - $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib - $(LTINSTALL) libsqlite.la $(DESTDIR)$(exec_prefix)/lib + $(INSTALL) -d $(DESTDIR)$(libdir) + $(LTINSTALL) libsqlite.la $(DESTDIR)$(libdir) + $(LTINSTALL) libtclsqlite.la $(DESTDIR)$(libdir)/sqlite-__VERSION__ $(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin $(LTINSTALL) sqlite $(DESTDIR)$(exec_prefix)/bin + $(LTINSTALL) tclsqlite $(DESTDIR)$(exec_prefix)/bin $(INSTALL) -d $(DESTDIR)$(prefix)/include $(INSTALL) -m 0644 sqlite.h $(DESTDIR)$(prefix)/include - $(INSTALL) -d $(DESTDIR)$(exec_prefix)/lib/pkgconfig; - $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(exec_prefix)/lib/pkgconfig; + $(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; + $(INSTALL) -m 0644 sqlite.pc $(DESTDIR)$(libdir)/pkgconfig; clean: rm -f *.lo *.la *.o sqlite at TARGET_EXEEXT@ libsqlite.la sqlite.h opcodes.* sqlite-2.8.15.rpath.patch: --- NEW FILE sqlite-2.8.15.rpath.patch --- --- sqlite/Makefile.in.nos 2004-06-18 14:13:40.127066236 +0200 +++ sqlite/Makefile.in 2004-06-18 14:13:56.241098295 +0200 @@ -192,7 +192,7 @@ libtclsqlite.la: tclsqlite.lo libsqlite.la $(LTLINK) -o libtclsqlite.la tclsqlite.lo \ - libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite \ + libsqlite.la $(LIBTCL) -rpath @exec_prefix@/lib/sqlite-__VERSION__ \ -version-info "8:6:8" sqlite at TARGET_EXEEXT@: $(TOP)/src/shell.c libsqlite.la sqlite.h sqlite-2.8.3.test.rh9.patch: --- NEW FILE sqlite-2.8.3.test.rh9.patch --- diff -Naur sqlite-orig/test/tester.tcl sqlite/test/tester.tcl --- sqlite-orig/test/tester.tcl 2003-03-01 20:45:35.000000000 +0100 +++ sqlite/test/tester.tcl 2003-06-28 02:14:03.000000000 +0200 @@ -43,8 +43,10 @@ # Create a test database # catch {db close} -file delete -force test.db -file delete -force test.db-journal +#file delete -force test.db +#file delete -force test.db-journal +exec rm -fr test.db +exec rm -fr test.db-journal sqlite db ./test.db if {[info exists ::SETUP_SQL]} { db eval $::SETUP_SQL sqlite-64bit-fixes.patch: --- NEW FILE sqlite-64bit-fixes.patch --- --- sqlite/src/test3.c.64bit-fixes 2004-09-29 10:09:56.249551000 -0400 +++ sqlite/src/test3.c 2004-09-29 11:34:51.314336091 -0400 @@ -19,9 +19,11 @@ #include "pager.h" #include "btree.h" #include "tcl.h" +#include "test-util.h" #include #include + /* ** Interpret an SQLite error number */ @@ -98,7 +100,7 @@ static int btree_close( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeClose(pBt); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -125,7 +127,7 @@ static int btree_begin_transaction( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeBeginTrans(pBt); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -152,7 +154,7 @@ static int btree_rollback( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeRollback(pBt); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -179,7 +181,7 @@ static int btree_commit( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeCommit(pBt); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -207,7 +209,7 @@ static int btree_create_table( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeCreateTable(pBt, &iTable); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -237,7 +239,7 @@ static int btree_drop_table( " ID TABLENUM\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR; rc = sqliteBtreeDropTable(pBt, iTable); if( rc!=SQLITE_OK ){ @@ -266,7 +268,7 @@ static int btree_clear_table( " ID TABLENUM\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); if( Tcl_GetInt(interp, argv[2], &iTable) ) return TCL_ERROR; rc = sqliteBtreeClearTable(pBt, iTable); if( rc!=SQLITE_OK ){ @@ -296,7 +298,7 @@ static int btree_get_meta( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); rc = sqliteBtreeGetMeta(pBt, aMeta); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -333,7 +335,7 @@ static int btree_update_meta( " ID METADATA...\" (METADATA is ", zBuf, " integers)", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pBt) ) return TCL_ERROR; + pBt = sqliteTextToPtr(argv[1]); for(i=0; i #include @@ -104,7 +105,7 @@ static int pager_close( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_close(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -131,7 +132,7 @@ static int pager_rollback( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_rollback(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -158,7 +159,7 @@ static int pager_commit( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_commit(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -185,7 +186,7 @@ static int pager_ckpt_begin( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_ckpt_begin(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -212,7 +213,7 @@ static int pager_ckpt_rollback( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_ckpt_rollback(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -239,7 +240,7 @@ static int pager_ckpt_commit( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); rc = sqlitepager_ckpt_commit(pPager); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -266,7 +267,7 @@ static int pager_stats( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); a = sqlitepager_stats(pPager); for(i=0; i<9; i++){ static char *zName[] = { @@ -299,7 +300,7 @@ static int pager_pagecount( " ID\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); sprintf(zBuf,"%d",sqlitepager_pagecount(pPager)); Tcl_AppendResult(interp, zBuf, 0); return TCL_OK; @@ -326,7 +327,7 @@ static int page_get( " ID PGNO\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); if( Tcl_GetInt(interp, argv[2], &pgno) ) return TCL_ERROR; rc = sqlitepager_get(pPager, pgno, &pPage); if( rc!=SQLITE_OK ){ @@ -359,7 +360,7 @@ static int page_lookup( " ID PGNO\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPager) ) return TCL_ERROR; + pPager = sqliteTextToPtr(argv[1]); if( Tcl_GetInt(interp, argv[2], &pgno) ) return TCL_ERROR; pPage = sqlitepager_lookup(pPager, pgno); if( pPage ){ @@ -387,7 +388,7 @@ static int page_unref( " PAGE\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR; + pPage = sqliteTextToPtr(argv[1]); rc = sqlitepager_unref(pPage); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); @@ -414,7 +415,7 @@ static int page_read( " PAGE\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR; + pPage = sqliteTextToPtr(argv[1]); memcpy(zBuf, pPage, sizeof(zBuf)); Tcl_AppendResult(interp, zBuf, 0); return TCL_OK; @@ -438,7 +439,7 @@ static int page_number( " PAGE\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR; + pPage = sqliteTextToPtr(argv[1]); sprintf(zBuf, "%d", sqlitepager_pagenumber(pPage)); Tcl_AppendResult(interp, zBuf, 0); return TCL_OK; @@ -462,7 +463,7 @@ static int page_write( " PAGE DATA\"", 0); return TCL_ERROR; } - if( Tcl_GetInt(interp, argv[1], (int*)&pPage) ) return TCL_ERROR; + pPage = sqliteTextToPtr(argv[1]); rc = sqlitepager_write(pPage); if( rc!=SQLITE_OK ){ Tcl_AppendResult(interp, errorName(rc), 0); --- sqlite/src/test-util.c.64bit-fixes 2004-09-29 11:33:18.838681763 -0400 +++ sqlite/src/test-util.c 2004-09-29 11:35:32.332610359 -0400 @@ -0,0 +1,47 @@ +#include +#include +#include "test-util.h" + +/* +** Translate a single byte of Hex into an integer. +*/ +static int hexToInt(int h){ + if( h>='0' && h<='9' ){ + return h - '0'; + }else if( h>='a' && h<='f' ){ + return h - 'a' + 10; + }else if( h>='A' && h<='F' ){ + return h - 'A' + 10; + }else{ + return 0; + } +} + +#if defined(SQLITE_TEST) +/* +** Convert text generated by the "%p" conversion format back into +** a pointer. +*/ +void *sqliteTextToPtr(const char *z){ + void *p; + uint64_t v; + uint32_t v2; + if( z[0]=='0' && z[1]=='x' ){ + z += 2; + } + v = 0; + while( *z ){ + v = (v<<4) + hexToInt(*z); + z++; + } + if( sizeof(p)==sizeof(v) ){ + p = *(void**)&v; + }else{ + assert( sizeof(p)==sizeof(v2) ); + v2 = (uint32_t)v; + p = *(void**)&v2; + } + return p; +} +#endif + --- sqlite/src/test-util.h.64bit-fixes 2004-09-29 11:33:23.513624799 -0400 +++ sqlite/src/test-util.h 2004-09-29 11:34:35.012047569 -0400 @@ -0,0 +1,6 @@ +#ifndef TEST_UTIL_H +#define TEST_UTIL_H + +extern void *sqliteTextToPtr(const char *z); + +#endif /* TEST_UTIL_H */ --- sqlite/Makefile.in.64bit-fixes 2004-09-29 09:41:08.011929000 -0400 +++ sqlite/Makefile.in 2004-09-29 11:32:59.441768988 -0400 @@ -142,6 +142,7 @@ SRC = \ # Source code to the test files. # TESTSRC = \ + $(TOP)/src/test-util.c \ $(TOP)/src/btree.c \ $(TOP)/src/func.c \ $(TOP)/src/os.c \ --- NEW FILE sqlite2.spec --- Name: sqlite2 Version: 2.8.16 Release: 3%{?dist} Summary: Embeddable SQL engine in a C library Group: System Environment/Libraries License: Public Domain URL: http://www.sqlite.org/ Source0: http://www.sqlite.org/sqlite-%{version}.tar.gz Patch1: sqlite-2.8.15.rpath.patch Patch2: sqlite-2.8.15-makefile.patch Patch3: sqlite-2.8.3.test.rh9.patch Patch4: sqlite-64bit-fixes.patch Patch5: sqlite-2.8.15-arch-double-differences.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel readline-devel %{_includedir}/tcl.h Obsoletes: sqlite < 3 %description SQLite is a small, fast, embeddable SQL database engine that supports most of SQL92, including transactions with atomic commit and rollback, subqueries, compound queries, triggers, and views. A complete database is stored in a single cross-platform disk file. The native C/C++ API is simple and easy to use. Bindings for other languages are also available. %package devel Summary: Development files for SQLite Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig Obsoletes: sqlite-devel < 3 %description devel SQLite is a small, fast, embeddable SQL database engine that supports most of SQL92, including transactions with atomic commit and rollback, subqueries, compound queries, triggers, and views. This package contains static library and header files for developing applications using sqlite. %package tcl Summary: Tcl bindings for sqlite Group: System Environment/Libraries Requires: tcl >= 8.3.3, %{name} = %{version}-%{release} Obsoletes: sqlite-tcl < 3 %description tcl SQLite is a small, fast, embeddable SQL database engine that supports most of SQL92, including transactions with atomic commit and rollback, subqueries, compound queries, triggers, and views. This package contains tcl bindings for sqlite. %prep %setup -q -n sqlite-%{version} %patch1 -p1 -b .rpath %patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p1 sed -i.rpath 's!__VERSION__!%{version}!g' Makefile.in # Patch additional /usr/lib locations where we don't have $(libdir) # to substitute with. sed -i.lib 's!@exec_prefix@/lib!%{_libdir}!g' Makefile.in %build CFLAGS="$RPM_OPT_FLAGS -DNDEBUG=1" %configure --enable-utf8 --disable-static make make tclsqlite libtclsqlite.la doc #obs. make test doesn't like root make test %install rm -rf $RPM_BUILD_ROOT DIRECTORY=$RPM_BUILD_ROOT%{_libdir}/sqlite-%version install -d $DIRECTORY echo 'package ifneeded sqlite 2 [list load [file join $dir libtclsqlite.so]]' > $DIRECTORY/pkgIndex.tcl %makeinstall install -D -m 0644 sqlite.1 $RPM_BUILD_ROOT%{_mandir}/man1/sqlite.1 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %{_bindir}/sql* %{_libdir}/libsql*.so.* %{_mandir}/man1/* %files devel %defattr(-,root,root,-) %doc README doc/* %{_libdir}/libsql*.so %{_includedir}/* %{_libdir}/pkgconfig/* %files tcl %defattr(-,root,root,-) %doc doc/tclsqlite.html %exclude %{_bindir}/tclsqlite %{_libdir}/sqlite-%version %changelog * Tue Feb 28 2006 Ignacio Vazquez-Abrams 2.8.16-3 - Rebuild for Fedora Extras 5 * Sat Nov 26 2005 Ignacio Vazquez-Abrams 2.8.16-2 - Disable static libs * Fri May 20 2005 Ignacio Vazquez-Abrams 2.8.16-1 - Name change to sqlite2 - Dropped Epoch - Added Obsoletes to all subpackages - Minor cosmetic changes * Wed Feb 16 2005 Michael Schwendt - 0:2.8.16-1 - Update to 2.8.16 bug-fix release + update patches. * Tue Feb 15 2005 Thorsten Leemhuis - 2.8.15-2 - add sqlite-64bit-fixes.patch and sqlite-2.8.15-arch-double-differences.patch fixes x86_64; Both were found in a mandrake srpm - remove exclusive arch ix86; hopefully this fixes ppc also * Sun Jan 23 2005 Michael Schwendt - 0:2.8.15-1 - Add exclusive arch ix86 for now (make test segfaults on x86_64). - Update makefile patch, $(exec_prefix)/lib -> $(libdir), and substitute additional /usr/lib locations in %%prep for multilib people to play with. * Sun Sep 26 2004 Adrian Reber - 0:2.8.15-0.fdr.1 - Update to 2.8.15 - Update patches * Fri Jun 19 2004 Nils O. Sel??sdal - 0:2.8.14-0.fdr.1 - Update to 2.8.14 - Update patches - --enable-releasemode - small spec file tweaks * Sat Dec 27 2003 Jean-Luc Fontaine - 0:2.8.6-0.fdr.6 - in tcl rpm, removed tclsqlite, moved shared library in own sqlite sub-directory add added pkgIndex.tcl file to make package dynamically loadable in a Tcl interpreter - in build requirements, work around tcl-devel and tk-devel packages non existence in RH 8.0 and 9 - in tcl rpm, added tcl package requirement - in tcl rpm, post ldconfig is not necessary * Wed Nov 12 2003 Nils O. Sel??sdal - 0:2.8.6-0.fdr.5 - BuildRequires tcl-devel - small .spec tweaks * Tue Oct 28 2003 Nils O. Sel??sdal - 0:2.8.6-0.fdr.4 - exclude libtclsqlite.a * Mon Oct 27 2003 Nils O. Sel??sdal - 0:2.8.6-0.fdr.3 - Fix readme -> README * Mon Oct 27 2003 Nils O. Sel??sdal - 0:2.8.6-0.fdr.2 - Better summary/description - Add patch for not using rpath - Add patch that builds tclsqlite (From Anvil's package) - Add patch that fixes the tests (From Anvil's package) - New tcl subpackage - Also make the tests during build - Build docs, and include them in -devel * Fri Oct 10 2003 Nils O. Sel??sdal - 0:2.8.6-0.fdr.1 - Initial RPM release. From fedora-extras-commits at redhat.com Wed Mar 1 02:50:12 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 28 Feb 2006 21:50:12 -0500 Subject: rpms/sqlite2 import.log,1.2,1.3 Message-ID: <200603010250.k212oict020218@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/sqlite2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20168 Modified Files: import.log Log Message: auto-import sqlite2-2.8.16-3 on branch devel from sqlite2-2.8.16-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/sqlite2/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 20 May 2005 14:57:31 -0000 1.2 +++ import.log 1 Mar 2006 02:50:12 -0000 1.3 @@ -1 +1,2 @@ sqlite2-2_8_16-1:HEAD:sqlite2-2.8.16-1.src.rpm:1116601057 +sqlite2-2_8_16-3:HEAD:sqlite2-2.8.16-3.src.rpm:1141181404 From fedora-extras-commits at redhat.com Wed Mar 1 03:46:33 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:46:33 -0500 Subject: rpms/libtomoe-gtk - New directory Message-ID: <200603010346.k213kZEc022367@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22359/libtomoe-gtk Log Message: Directory /cvs/extras/rpms/libtomoe-gtk added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 03:46:40 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:46:40 -0500 Subject: rpms/libtomoe-gtk/devel - New directory Message-ID: <200603010346.k213kgD2022382@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22359/libtomoe-gtk/devel Log Message: Directory /cvs/extras/rpms/libtomoe-gtk/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 03:47:09 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:47:09 -0500 Subject: rpms/libtomoe-gtk Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603010347.k213lBvt022416@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22404 Added Files: Makefile import.log Log Message: Setup of module libtomoe-gtk --- NEW FILE Makefile --- # Top level Makefile for module libtomoe-gtk all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 1 03:47:14 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:47:14 -0500 Subject: rpms/libtomoe-gtk/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603010347.k213lGML022436@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22404/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libtomoe-gtk --- NEW 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 Mar 1 03:48:06 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:48:06 -0500 Subject: rpms/libtomoe-gtk import.log,1.1,1.2 Message-ID: <200603010348.k213mdcZ022504@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22470 Modified Files: import.log Log Message: auto-import libtomoe-gtk-0.1.0-5 on branch devel from libtomoe-gtk-0.1.0-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libtomoe-gtk/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Mar 2006 03:47:08 -0000 1.1 +++ import.log 1 Mar 2006 03:48:06 -0000 1.2 @@ -0,0 +1 @@ +libtomoe-gtk-0_1_0-5:HEAD:libtomoe-gtk-0.1.0-5.src.rpm:1141184876 From fedora-extras-commits at redhat.com Wed Mar 1 03:48:12 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Tue, 28 Feb 2006 22:48:12 -0500 Subject: rpms/libtomoe-gtk/devel libtomoe-gtk.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603010348.k213mj3X022508@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22470/devel Modified Files: .cvsignore sources Added Files: libtomoe-gtk.spec Log Message: auto-import libtomoe-gtk-0.1.0-5 on branch devel from libtomoe-gtk-0.1.0-5.src.rpm --- NEW FILE libtomoe-gtk.spec --- Name: libtomoe-gtk Version: 0.1.0 Release: 5%{?dist} Summary: Gtk library for tomoe Japanese handwritten input Group: System Environment/Libraries License: GPL URL: http://scim-imengine.sourceforge.jp/ Source0: http://dl.sourceforge.jp/tomoe/17171/libtomoe-gtk-0.1.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: tomoe-devel, gtk2-devel %description Gtk library for tomoe Japanese handwritten input. This package is used by scim-tomoe, or uim-tomoe. %package devel Summary: Gtk library for tomoe Japanese handwritten input Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: gtk2-devel %description devel The libtomoe-devel package includes the header files for the libtomoe-gtk. Install this if you want to develop programs which will use libtomoe-gtk. %prep %setup -q %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post devel -p /sbin/ldconfig %postun devel -p /sbin/ldconfig %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_libdir}/libtomoe-gtk.so.* %files devel %defattr(-,root,root,-) %{_libdir}/pkgconfig/libtomoe-gtk.pc %{_libdir}/libtomoe-gtk.so %{_includedir}/tomoe/* %changelog * Tue Feb 28 2006 Ryo Dairiki - 0.1.0-5 - add "ldconfig" for the devel subpackage (Thanks, John Mahowald) * Fri Jan 27 2006 Ryo Dairiki - 0.1.0-4 - modify "ldconfig" in the "post" section (Thanks, John Mahowald) * Fri Dec 30 2005 Ryo Dairiki - 0.1.0-3 - a bit more cleanup * Fri Dec 23 2005 Ryo Dairiki - 0.1.0-2 - add gtk2-devel in the build requirements (Thanks, John Mahowald) * Wed Dec 3 2005 Ryo Dairiki - 0.1.0-1 - initial packaging for fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtomoe-gtk/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2006 03:47:14 -0000 1.1 +++ .cvsignore 1 Mar 2006 03:48:12 -0000 1.2 @@ -0,0 +1 @@ +libtomoe-gtk-0.1.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtomoe-gtk/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2006 03:47:14 -0000 1.1 +++ sources 1 Mar 2006 03:48:12 -0000 1.2 @@ -0,0 +1 @@ +e9b887189ee408902a0f85d9b1cde06f libtomoe-gtk-0.1.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 04:43:00 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 28 Feb 2006 23:43:00 -0500 Subject: rpms/xpilot-ng/devel xpilot-ng-sdl.desktop, 1.1, 1.2 xpilot-ng-x11.desktop, 1.1, 1.2 Message-ID: <200603010443.k214hWP7024825@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24806 Modified Files: xpilot-ng-sdl.desktop xpilot-ng-x11.desktop Log Message: Add missing semicolon. Index: xpilot-ng-sdl.desktop =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/xpilot-ng-sdl.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng-sdl.desktop 6 Feb 2006 17:30:58 -0000 1.1 +++ xpilot-ng-sdl.desktop 1 Mar 2006 04:42:59 -0000 1.2 @@ -7,5 +7,5 @@ Icon=xpilot-ng.png Terminal=false Type=Application -Categories=Application;Game +Categories=Application;Game; Version=4.7.2 Index: xpilot-ng-x11.desktop =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/xpilot-ng-x11.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng-x11.desktop 6 Feb 2006 17:30:58 -0000 1.1 +++ xpilot-ng-x11.desktop 1 Mar 2006 04:42:59 -0000 1.2 @@ -7,5 +7,5 @@ Icon=xpilot-ng.png Terminal=false Type=Application -Categories=Application;Game +Categories=Application;Game; Version=4.7.2 From fedora-extras-commits at redhat.com Wed Mar 1 04:43:54 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 28 Feb 2006 23:43:54 -0500 Subject: rpms/xpilot-ng/FC-4 xpilot-ng-sdl.desktop, 1.1, 1.2 xpilot-ng-x11.desktop, 1.1, 1.2 Message-ID: <200603010444.k214iRM3024850@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24831 Modified Files: xpilot-ng-sdl.desktop xpilot-ng-x11.desktop Log Message: Add missing semicolon. Index: xpilot-ng-sdl.desktop =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng-sdl.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng-sdl.desktop 6 Feb 2006 17:30:58 -0000 1.1 +++ xpilot-ng-sdl.desktop 1 Mar 2006 04:43:54 -0000 1.2 @@ -7,5 +7,5 @@ Icon=xpilot-ng.png Terminal=false Type=Application -Categories=Application;Game +Categories=Application;Game; Version=4.7.2 Index: xpilot-ng-x11.desktop =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng-x11.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng-x11.desktop 6 Feb 2006 17:30:58 -0000 1.1 +++ xpilot-ng-x11.desktop 1 Mar 2006 04:43:54 -0000 1.2 @@ -7,5 +7,5 @@ Icon=xpilot-ng.png Terminal=false Type=Application -Categories=Application;Game +Categories=Application;Game; Version=4.7.2 From fedora-extras-commits at redhat.com Wed Mar 1 04:46:10 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 28 Feb 2006 23:46:10 -0500 Subject: rpms/xpilot-ng/devel xpilot-ng-server.init, NONE, 1.1 xpilot-ng.logrotate, NONE, 1.1 xpilot-ng.sysconfig, NONE, 1.1 xpilot-ng.spec, 1.2, 1.3 Message-ID: <200603010446.k214kgfU024883@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24858 Modified Files: xpilot-ng.spec Added Files: xpilot-ng-server.init xpilot-ng.logrotate xpilot-ng.sysconfig Log Message: Add init startup script with associated support files (logrotate, sysconfig) Add RPM_OPT_FLAGS to compile line More readable spacing in changelog --- NEW FILE xpilot-ng-server.init --- #!/bin/sh # # xpilot-ng-server This shell script takes care of starting and stopping # the xpilot-ng game server. # # chkconfig: - 15 85 # description: The xpilot-ng server supports playing networked \ # multi-player games. # processname: xpilot-ng-server # config: /etc/sysconfig/xpilot-ng-server # pidfile: /var/run/xpilot-ng-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/xpilot-ng-server" prog=$(basename $exec) pidfile=/var/run/$prog.pid [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { echo -n $"Starting Xpilot 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 games $exec $XPILOTD_OPTIONS >>/var/log/xpilot.log 2>&1 & retval=$? if [ $retval -eq 0 ]; then success touch $lockfile pidofproc $prog > $pidfile else failure fi echo return $retval } stop() { echo -n $"Stopping Xpilot 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 xpilot-ng.logrotate --- /var/log/xpilotd.log { copytruncate notifempty missingok endscript } --- NEW FILE xpilot-ng.sysconfig --- # # xpilot-ng-server(6) options. Pick a custom port here if needed, for example. # # This option activates a public server. This will advertise your # xpilot server to the public xpilot metadirectory and keep xpilot # running continuosly. # The following two lines have the same effect: #XPILOTD_OPTIONS="-expand PublicSettings" #XPILOTD_OPTIONS="-idleRun -noQuit +reportToMetaServer" # Normally xpilot will look in /usr/share/xpilot-ng for the # configuration files. This is fine for user-initiated servers. # But for the system xpilot server we want to allow a different set # of defaults. XPILOTD_OPTIONS="-noQuit \ -defaultsFileName /etc/xpilot-ng/defaults.txt \ -passwordFileName /etc/xpilot-ng/password.txt" Index: xpilot-ng.spec =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/xpilot-ng.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xpilot-ng.spec 21 Feb 2006 20:17:24 -0000 1.2 +++ xpilot-ng.spec 1 Mar 2006 04:46:09 -0000 1.3 @@ -1,6 +1,6 @@ Name: xpilot-ng Version: 4.7.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -10,12 +10,19 @@ Source1: xpilot-ng.png Source2: xpilot-ng-x11.desktop Source3: xpilot-ng-sdl.desktop +Source4: xpilot-ng-server.init +Source5: xpilot-ng.sysconfig +Source6: xpilot-ng.logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel # The following BR are not needed for FC-4 BuildRequires: libXt-devel mesa-libGLU-devel libXxf86misc-devel +Requires(post): /sbin/chkconfig +Requires(post): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service %description A highly addictive, infinitely configurable multiplayer space @@ -43,7 +50,7 @@ %build -%configure +CFLAGS="$RPM_OPT_FLAGS" %configure make %{?_smp_mflags} @@ -64,6 +71,19 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +install -p -D -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initrddir}/%{name}-server + +install -p -D -m 644 %{SOURCE5} \ + $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}-server + +install -p -D -m 644 %{SOURCE6} \ + $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server + +# Copy certain configuration files to /etc so that they can be properly managed +# as config files. +install -p -D -m 644 lib/defaults.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/defaults.txt +install -p -D -m 600 lib/password.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/password.txt + %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -76,6 +96,20 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%post server +/sbin/chkconfig --add xpilot-ng-server + +%preun server +if [ "$1" = "0" ]; then + /sbin/service xpilot-ng-server stop > /dev/null 2>&1 + /sbin/chkconfig --del xpilot-ng-server +fi + +%postun server +if [ "$1" -ge "1" ]; then + /sbin/service xpilot-ng-server restart >/dev/null 2>&1 +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -99,6 +133,9 @@ %defattr(-,root,root,-) %{_bindir}/xpilot-ng-xp-mapedit %{_bindir}/xpilot-ng-server +%{_initrddir}/xpilot-ng-server +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server %dir %{_datadir}/%{name} %{_datadir}/%{name}/defaults.txt %{_datadir}/%{name}/password.txt @@ -106,6 +143,9 @@ %{_datadir}/%{name}/shipshapes.txt %{_datadir}/%{name}/mapconvert.py %{_datadir}/%{name}/maps +%dir %{_sysconfdir}/%{name} +%config(noreplace) %attr(0600,games,games) %{_sysconfdir}/%{name}/password.txt +%config(noreplace) %{_sysconfdir}/%{name}/defaults.txt %{_mandir}/man6/xpilot-ng-server.6.gz %{_mandir}/man6/xpilot-ng-xp-mapedit.6.gz %doc README COPYING @@ -114,17 +154,28 @@ %ghost %{_datadir}/%{name}/mapconvert.pyo %changelog +* Tue Feb 28 2006 Wart 4.7.2-6 +- Added sysconfig and initrd files for starting xpilot server at boot time +- Add copies of customizable configuration files to /etc/xpilot +- More readable spacing in changelog +- Add missing ; in desktop file +- Added RPM_OPT_FLAGS to compile line + * Thu Feb 16 2006 Wart 4.7.2-5 - Rebuild for FC-5 + * Mon Feb 6 2006 Wart 4.7.2-4 - Don't make duplicates of the doc files for the subpackage. - Use version macro is source path - Preserve timestamps when installing icons. + * Fri Feb 3 2006 Wart 4.7.2-3 - Add readme and license files to the server subpackage - Set default file attributes for the server subpackage + * Fri Feb 3 2006 Wart 4.7.2-2 - Allow both packages to 0wn datadir/xpilot-ng - Clean up non-utf8 man pages + * Thu Feb 2 2006 Wart 4.7.2-1 - Initial submission to Fedora Extras From fedora-extras-commits at redhat.com Wed Mar 1 04:51:17 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 28 Feb 2006 23:51:17 -0500 Subject: rpms/xpilot-ng/FC-4 xpilot-ng-server.init, NONE, 1.1 xpilot-ng.logrotate, NONE, 1.1 xpilot-ng.sysconfig, NONE, 1.1 xpilot-ng.spec, 1.2, 1.3 Message-ID: <200603010451.k214pn7B025009@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24977 Modified Files: xpilot-ng.spec Added Files: xpilot-ng-server.init xpilot-ng.logrotate xpilot-ng.sysconfig Log Message: Add init startup script with associated support files (logrotate, sysconfig) Add RPM_OPT_FLAGS to compile line More readable spacing in changelog --- NEW FILE xpilot-ng-server.init --- #!/bin/sh # # xpilot-ng-server This shell script takes care of starting and stopping # the xpilot-ng game server. # # chkconfig: - 15 85 # description: The xpilot-ng server supports playing networked \ # multi-player games. # processname: xpilot-ng-server # config: /etc/sysconfig/xpilot-ng-server # pidfile: /var/run/xpilot-ng-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/xpilot-ng-server" prog=$(basename $exec) pidfile=/var/run/$prog.pid [ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog lockfile=/var/lock/subsys/$prog start() { echo -n $"Starting Xpilot 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 games $exec $XPILOTD_OPTIONS >>/var/log/xpilot.log 2>&1 & retval=$? if [ $retval -eq 0 ]; then success touch $lockfile pidofproc $prog > $pidfile else failure fi echo return $retval } stop() { echo -n $"Stopping Xpilot 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 xpilot-ng.logrotate --- /var/log/xpilotd.log { copytruncate notifempty missingok } --- NEW FILE xpilot-ng.sysconfig --- # # xpilot-ng-server(6) options. Pick a custom port here if needed, for example. # # This option activates a public server. This will advertise your # xpilot server to the public xpilot metadirectory and keep xpilot # running continuosly. # The following two lines have the same effect: #XPILOTD_OPTIONS="-expand PublicSettings" #XPILOTD_OPTIONS="-idleRun -noQuit +reportToMetaServer" # Normally xpilot will look in /usr/share/xpilot-ng for the # configuration files. This is fine for user-initiated servers. # But for the system xpilot server we want to allow a different set # of defaults. XPILOTD_OPTIONS="-noQuit \ -defaultsFileName /etc/xpilot-ng/defaults.txt \ -passwordFileName /etc/xpilot-ng/password.txt" Index: xpilot-ng.spec =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xpilot-ng.spec 8 Feb 2006 02:19:35 -0000 1.2 +++ xpilot-ng.spec 1 Mar 2006 04:51:17 -0000 1.3 @@ -1,6 +1,6 @@ Name: xpilot-ng Version: 4.7.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -10,12 +10,19 @@ Source1: xpilot-ng.png Source2: xpilot-ng-x11.desktop Source3: xpilot-ng-sdl.desktop +Source4: xpilot-ng-server.init +Source5: xpilot-ng.sysconfig +Source6: xpilot-ng.logrotate BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: expat-devel SDL_ttf-devel SDL_image-devel zlib-devel # The following BR are not needed for FC-4 #BuildRequires: libXt-devel mesa-libGLU-devel libXxf86misc-devel +Requires(post): /sbin/chkconfig +Requires(post): /sbin/service +Requires(preun): /sbin/chkconfig +Requires(preun): /sbin/service %description A highly addictive, infinitely configurable multiplayer space @@ -41,12 +48,10 @@ mv xpilot-ng-x11.man.new xpilot-ng-x11.man popd - %build -%configure +CFLAGS="$RPM_OPT_FLAGS" %configure make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -64,6 +69,19 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ +install -p -D -m 755 %{SOURCE4} $RPM_BUILD_ROOT/%{_initrddir}/%{name}-server + +install -p -D -m 644 %{SOURCE5} \ + $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/%{name}-server + +install -p -D -m 644 %{SOURCE6} \ + $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/%{name}-server + +# Copy certain configuration files to /etc so that they can be properly managed +# as config files. +install -p -D -m 644 lib/defaults.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/defaults.txt +install -p -D -m 600 lib/password.txt $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/password.txt + %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -76,6 +94,20 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%post server +/sbin/chkconfig --add xpilot-ng-server + +%preun server +if [ "$1" = "0" ]; then + /sbin/service xpilot-ng-server stop > /dev/null 2>&1 + /sbin/chkconfig --del xpilot-ng-server +fi + +%postun server +if [ "$1" -ge "1" ]; then + /sbin/service xpilot-ng-server restart >/dev/null 2>&1 +fi + %clean rm -rf $RPM_BUILD_ROOT @@ -99,6 +131,9 @@ %defattr(-,root,root,-) %{_bindir}/xpilot-ng-xp-mapedit %{_bindir}/xpilot-ng-server +%{_initrddir}/xpilot-ng-server +%config(noreplace) %{_sysconfdir}/sysconfig/%{name}-server +%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}-server %dir %{_datadir}/%{name} %{_datadir}/%{name}/defaults.txt %{_datadir}/%{name}/password.txt @@ -106,6 +141,9 @@ %{_datadir}/%{name}/shipshapes.txt %{_datadir}/%{name}/mapconvert.py %{_datadir}/%{name}/maps +%dir %{_sysconfdir}/%{name} +%config(noreplace) %attr(0600,games,games) %{_sysconfdir}/%{name}/password.txt +%config(noreplace) %{_sysconfdir}/%{name}/defaults.txt %{_mandir}/man6/xpilot-ng-server.6.gz %{_mandir}/man6/xpilot-ng-xp-mapedit.6.gz %doc README COPYING @@ -114,15 +152,25 @@ #%ghost %{_datadir}/%{name}/mapconvert.pyo %changelog +* Tue Feb 28 2006 Wart 4.7.2-5 +- Added sysconfig and initrd files for starting xpilot server at boot time +- Add copies of customizable configuration files to /etc/xpilot +- More readable spacing in changelog +- Add missing ; in desktop file +- Added RPM_OPT_FLAGS to compile line + * Mon Feb 6 2006 Wart 4.7.2-4 - Don't make duplicates of the doc files for the subpackage. - Use version macro is source path - Preserve timestamps when installing icons. + * Fri Feb 3 2006 Wart 4.7.2-3 - Add readme and license files to the server subpackage - Set default file attributes for the server subpackage + * Fri Feb 3 2006 Wart 4.7.2-2 - Allow both packages to 0wn datadir/xpilot-ng - Clean up non-utf8 man pages + * Thu Feb 2 2006 Wart 4.7.2-1 - Initial submission to Fedora Extras From fedora-extras-commits at redhat.com Wed Mar 1 05:29:56 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 00:29:56 -0500 Subject: rpms/scim-skk/FC-4 scim-skk.spec,1.9,1.10 Message-ID: <200603010530.k215US7f027123@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27095 Modified Files: scim-skk.spec Log Message: update fileslist since moduledir is now api-versioned Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim-skk.spec 25 Jan 2006 05:38:27 -0000 1.9 +++ scim-skk.spec 1 Mar 2006 05:29:56 -0000 1.10 @@ -1,6 +1,6 @@ Name: scim-skk Version: 0.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine module for skk Group: System Environment/Libraries @@ -29,7 +29,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la %find_lang %{name} @@ -41,15 +41,16 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog -%dir %{_libdir}/scim-1.0/IMEngine -%{_libdir}/scim-1.0/IMEngine/skk.so -%dir %{_libdir}/scim-1.0/SetupUI -%{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so +%{_libdir}/scim-1.0/*/IMEngine/skk.so +%{_libdir}/scim-1.0/*/SetupUI/skk-imengine-setup.so %{_datadir}/scim/icons/scim-skk.png %{_datadir}/scim/icons/scim-skk.png %changelog +* Wed Mar 1 2006 Ryo Diairki - 0.5.2-2 +- update filelist since moduledir is now api-versioned + * Wed Jan 25 2006 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 From fedora-extras-commits at redhat.com Wed Mar 1 05:30:42 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 00:30:42 -0500 Subject: rpms/scim-skk/FC-4 scim-skk.spec,1.10,1.11 Message-ID: <200603010531.k215VFKh027175@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27158 Modified Files: scim-skk.spec Log Message: update fileslist since moduledir is now api-versioned Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-4/scim-skk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim-skk.spec 1 Mar 2006 05:29:56 -0000 1.10 +++ scim-skk.spec 1 Mar 2006 05:30:42 -0000 1.11 @@ -29,7 +29,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la %find_lang %{name} From fedora-extras-commits at redhat.com Wed Mar 1 05:33:48 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 00:33:48 -0500 Subject: rpms/scim-skk/FC-3 scim-skk.spec,1.10,1.11 Message-ID: <200603010534.k215YMIc027299@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-skk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27277 Modified Files: scim-skk.spec Log Message: the same as FC4 Index: scim-skk.spec =================================================================== RCS file: /cvs/extras/rpms/scim-skk/FC-3/scim-skk.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scim-skk.spec 25 Jan 2006 05:43:59 -0000 1.10 +++ scim-skk.spec 1 Mar 2006 05:33:48 -0000 1.11 @@ -1,6 +1,6 @@ Name: scim-skk Version: 0.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SCIM IMEngine module for skk Group: System Environment/Libraries @@ -32,7 +32,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la +rm -f $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/*.la %find_lang %{name} @@ -44,15 +44,16 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README ChangeLog -%dir %{_libdir}/scim-1.0/IMEngine -%{_libdir}/scim-1.0/IMEngine/skk.so -%dir %{_libdir}/scim-1.0/SetupUI -%{_libdir}/scim-1.0/SetupUI/skk-imengine-setup.so +%{_libdir}/scim-1.0/*/IMEngine/skk.so +%{_libdir}/scim-1.0/*/SetupUI/skk-imengine-setup.so %{_datadir}/scim/icons/scim-skk.png %{_datadir}/scim/icons/scim-skk.png %changelog +* Wed Mar 1 2006 Ryo Diairki - 0.5.2-2 +- update filelist since moduledir is now api-versioned + * Wed Jan 25 2006 Ryo Dairiki - 0.5.2-1 - update to 0.5.2 From fedora-extras-commits at redhat.com Wed Mar 1 05:51:29 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 00:51:29 -0500 Subject: rpms/scim-tomoe/FC-4 scim-tomoe-moduledir.patch, NONE, 1.1 scim-tomoe.spec, 1.2, 1.3 Message-ID: <200603010552.k215q1Qq027381@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27361 Modified Files: scim-tomoe.spec Added Files: scim-tomoe-moduledir.patch Log Message: scim-tomoe-moduledir.patch: --- NEW FILE scim-tomoe-moduledir.patch --- --- src/Makefile.am 2006-03-01 14:35:56.000000000 +0900 +++ src/Makefile.am.new 2006-03-01 14:36:07.000000000 +0900 @@ -12,7 +12,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ --- src/Makefile.in 2006-03-01 14:44:48.000000000 +0900 +++ src/Makefile.in.new 2006-03-01 14:45:30.000000000 +0900 @@ -257,7 +257,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ scim_tomoe.cpp \ Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/scim-tomoe.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-tomoe.spec 7 Oct 2005 09:53:41 -0000 1.2 +++ scim-tomoe.spec 1 Mar 2006 05:51:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-tomoe -Version: 0.1.0 -Release: 2%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -9,6 +9,8 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: scim-tomoe-moduledir.patch + Requires: scim BuildRequires: scim-devel, tomoe-devel @@ -18,6 +20,7 @@ %prep %setup -q +%patch0 -p0 %build @@ -29,7 +32,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/Helper/tomoe.la %find_lang %{name} @@ -40,12 +43,15 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog -%{_libdir}/scim-1.0 +%doc AUTHORS COPYING ChangeLog README +%{_libdir}/scim-1.0/*/Helper/tomoe.so %{_datadir}/scim/icons/scim-tomoe.png %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +- update to 0.2 + * Fri Oct 7 2005 Ryo Dairiki - 0.1-2 - add scim into the requirement From fedora-extras-commits at redhat.com Wed Mar 1 06:03:51 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:03:51 -0500 Subject: rpms/scim-tomoe/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200603010604.k2164NQQ029344@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29324 Modified Files: .cvsignore sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Sep 2005 09:21:38 -0000 1.2 +++ .cvsignore 1 Mar 2006 06:03:51 -0000 1.3 @@ -1 +1 @@ -scim-tomoe-0.1.0.tar.gz +scim-tomoe-0.2.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Sep 2005 09:21:38 -0000 1.2 +++ sources 1 Mar 2006 06:03:51 -0000 1.3 @@ -1 +1 @@ -1c39c1e03069a4a6e15fcf5501cb981f scim-tomoe-0.1.0.tar.gz +55bc028af137ed5f99bab4ca042219cf scim-tomoe-0.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 06:07:21 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:07:21 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe-moduledir.patch, NONE, 1.1 scim-tomoe.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603010607.k2167ror029388@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29356 Modified Files: scim-tomoe.spec sources Added Files: scim-tomoe-moduledir.patch Log Message: update to 0.2.0 scim-tomoe-moduledir.patch: --- NEW FILE scim-tomoe-moduledir.patch --- --- src/Makefile.am 2006-03-01 14:35:56.000000000 +0900 +++ src/Makefile.am.new 2006-03-01 14:36:07.000000000 +0900 @@ -12,7 +12,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ --- src/Makefile.in 2006-03-01 14:44:48.000000000 +0900 +++ src/Makefile.in.new 2006-03-01 14:45:30.000000000 +0900 @@ -257,7 +257,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ scim_tomoe.cpp \ Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-tomoe.spec 13 Feb 2006 06:42:32 -0000 1.3 +++ scim-tomoe.spec 1 Mar 2006 06:07:21 -0000 1.4 @@ -1,8 +1,8 @@ %define with_libstdc_preview 1 Name: scim-tomoe -Version: 0.1.0 -Release: 3%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -17,12 +17,15 @@ %endif Requires: scim +Patch0: scim-tomoe-moduledir.patch + %description Scim-tomoe allows Japanese handwritten input of characters using SCIM. %prep %setup -q +%patch0 -p0 %build @@ -62,6 +65,9 @@ %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +- update to 0.2 + * Mon Feb 13 2006 Jens Petersen - 0.1.0-3 - build conditionally with libstdc++so7 preview library (#166041) - add with_libstdc_preview switch and tweak libtool to link against it Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Sep 2005 09:21:38 -0000 1.2 +++ sources 1 Mar 2006 06:07:21 -0000 1.3 @@ -1 +1 @@ -1c39c1e03069a4a6e15fcf5501cb981f scim-tomoe-0.1.0.tar.gz +55bc028af137ed5f99bab4ca042219cf scim-tomoe-0.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 06:20:08 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:20:08 -0500 Subject: rpms/tomoe/devel tomoe.spec,1.2,1.3 Message-ID: <200603010620.k216KfZB029499@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29461 Modified Files: tomoe.spec Log Message: sync with libtomoe-gtk Index: tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/tomoe/devel/tomoe.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomoe.spec 9 Sep 2005 12:39:30 -0000 1.2 +++ tomoe.spec 1 Mar 2006 06:20:08 -0000 1.3 @@ -1,6 +1,6 @@ Name: tomoe Version: 0.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -63,6 +63,9 @@ %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2.1-4 +- sync with libtomoe-gtk + * Sat Sep 3 2005 Warren Togami - 0.2.1-3 - some spec cleanup From fedora-extras-commits at redhat.com Wed Mar 1 06:36:35 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:36:35 -0500 Subject: rpms/tomoe/FC-4 tomoe.spec,1.2,1.3 Message-ID: <200603010637.k216b8R3029682@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/tomoe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29665 Modified Files: tomoe.spec Log Message: Index: tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/tomoe/FC-4/tomoe.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomoe.spec 9 Sep 2005 12:39:29 -0000 1.2 +++ tomoe.spec 1 Mar 2006 06:36:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: tomoe Version: 0.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -63,6 +63,9 @@ %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2.1-4 +- sync with libtomoe-gtk + * Sat Sep 3 2005 Warren Togami - 0.2.1-3 - some spec cleanup From fedora-extras-commits at redhat.com Wed Mar 1 06:37:30 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:37:30 -0500 Subject: rpms/tomoe/FC-3 tomoe.spec,1.2,1.3 Message-ID: <200603010638.k216c2eD029705@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/tomoe/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29688 Modified Files: tomoe.spec Log Message: Index: tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/tomoe/FC-3/tomoe.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tomoe.spec 9 Sep 2005 12:39:11 -0000 1.2 +++ tomoe.spec 1 Mar 2006 06:37:29 -0000 1.3 @@ -1,6 +1,6 @@ Name: tomoe Version: 0.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Japanese handwritten input system Group: System Environment/Libraries @@ -63,6 +63,9 @@ %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2.1-4 +- sync with libtomoe-gtk + * Sat Sep 3 2005 Warren Togami - 0.2.1-3 - some spec cleanup From fedora-extras-commits at redhat.com Wed Mar 1 06:39:02 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 01:39:02 -0500 Subject: rpms/scim-tomoe/FC-3 scim-tomoe.spec,1.2,1.3 sources,1.2,1.3 Message-ID: <200603010639.k216dZSn029734@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29715 Modified Files: scim-tomoe.spec sources Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-3/scim-tomoe.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scim-tomoe.spec 7 Oct 2005 09:14:51 -0000 1.2 +++ scim-tomoe.spec 1 Mar 2006 06:39:02 -0000 1.3 @@ -1,6 +1,6 @@ Name: scim-tomoe -Version: 0.1.0 -Release: 2%{?dist} +Version: 0.2.0 +Release: 1%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -9,6 +9,8 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: scim-tomoe-moduledir.patch + Requires: scim BuildRequires: scim-devel, tomoe-devel @@ -18,6 +20,7 @@ %prep %setup -q +%patch0 -p0 %build @@ -29,7 +32,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/Helper/tomoe.la %find_lang %{name} @@ -40,12 +43,15 @@ %files -f %{name}.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog -%{_libdir}/scim-1.0 +%doc AUTHORS COPYING ChangeLog README +%{_libdir}/scim-1.0/*/Helper/tomoe.so %{_datadir}/scim/icons/scim-tomoe.png %changelog +* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +- update to 0.2 + * Fri Oct 7 2005 Ryo Dairiki - 0.1-2 - add scim into the requirement Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Sep 2005 09:21:38 -0000 1.2 +++ sources 1 Mar 2006 06:39:02 -0000 1.3 @@ -1 +1 @@ -1c39c1e03069a4a6e15fcf5501cb981f scim-tomoe-0.1.0.tar.gz +55bc028af137ed5f99bab4ca042219cf scim-tomoe-0.2.0.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 06:57:28 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 1 Mar 2006 01:57:28 -0500 Subject: rpms/gcdmaster/devel gcdmaster-1.2.1-qualification.patch, NONE, 1.1 gcdmaster.spec, 1.1, 1.2 Message-ID: <200603010658.k216w0PK029820@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gcdmaster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29800 Modified Files: gcdmaster.spec Added Files: gcdmaster-1.2.1-qualification.patch Log Message: Added patch to fix g++4 compile problem gcdmaster-1.2.1-qualification.patch: --- NEW FILE gcdmaster-1.2.1-qualification.patch --- --- cdrdao-1.2.1.orig/xdao/ProgressDialog.h 2006-02-10 21:04:51.000000000 -0800 +++ cdrdao-1.2.1/xdao/ProgressDialog.h 2006-02-10 21:13:18.000000000 -0800 @@ -62,7 +62,7 @@ bool leadTimeFilled_; struct timeval time_; - bool ProgressDialog::time(); + bool time(); Gtk::Button *cancelButton_; Gtk::Button *closeButton_; Index: gcdmaster.spec =================================================================== RCS file: /cvs/extras/rpms/gcdmaster/devel/gcdmaster.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcdmaster.spec 18 Dec 2005 20:12:52 -0000 1.1 +++ gcdmaster.spec 1 Mar 2006 06:57:27 -0000 1.2 @@ -1,6 +1,6 @@ Name: gcdmaster Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Gnome2 Disk-At-Once (DAO) Audio CD writer Group: Applications/Multimedia @@ -8,6 +8,7 @@ URL: http://cdrdao.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: http://easynews.dl.sourceforge.net/sourceforge/cdrdao/cdrdao-%{version}.tar.bz2 +Patch0: gcdmaster-1.2.1-qualification.patch Requires: cdrdao BuildRequires: gtkmm24-devel BuildRequires: libgnomeuimm26-devel @@ -28,7 +29,7 @@ %prep %setup -q -n cdrdao-%{version} - +%patch0 -p1 -b .qualification %build %configure --with-scglib=sys %{!?_with_mp3: --without-mp3-support} @@ -81,6 +82,9 @@ %{_mandir}/man1/gcdmaster* %changelog +* Tue Feb 28 2006 Denis Leroy - 1.2.1-4 +- Added patch to fix g++4 compile problem + * Sat Dec 17 2005 Denis Leroy - 1.2.1-3 - Added user macro to enable mp3 support @@ -90,4 +94,3 @@ * Sat Nov 26 2005 Denis Leroy - 1.2.1-1 - Initial version - From fedora-extras-commits at redhat.com Wed Mar 1 07:33:31 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 02:33:31 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.4,1.5 Message-ID: <200603010734.k217Y3eN031865@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31843 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-tomoe.spec 1 Mar 2006 06:07:21 -0000 1.4 +++ scim-tomoe.spec 1 Mar 2006 07:33:31 -0000 1.5 @@ -2,7 +2,7 @@ Name: scim-tomoe Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -11,7 +11,7 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: scim-devel, tomoe-devel +BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk %if %{with_libstdc_preview} Buildrequires: libstdc++so7-devel %endif @@ -65,7 +65,7 @@ %changelog -* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +* Wed Mar 1 2006 Ryo Dairiki - 0.2-2 - update to 0.2 * Mon Feb 13 2006 Jens Petersen - 0.1.0-3 From fedora-extras-commits at redhat.com Wed Mar 1 07:35:16 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 02:35:16 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.5,1.6 Message-ID: <200603010735.k217ZmWL031921@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31900 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- scim-tomoe.spec 1 Mar 2006 07:33:31 -0000 1.5 +++ scim-tomoe.spec 1 Mar 2006 07:35:16 -0000 1.6 @@ -11,7 +11,7 @@ Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk +BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk-devel %if %{with_libstdc_preview} Buildrequires: libstdc++so7-devel %endif From fedora-extras-commits at redhat.com Wed Mar 1 07:36:37 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 1 Mar 2006 02:36:37 -0500 Subject: rpms/abcde/devel .cvsignore, 1.8, 1.9 abcde.spec, 1.9, 1.10 sources, 1.8, 1.9 Message-ID: <200603010737.k217b9iS032008@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/abcde/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31966 Modified Files: .cvsignore abcde.spec sources Log Message: * Wed Mar 1 2006 Ville Skytt?? - 2.3.99.5-1 - 2.3.99.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 14 Dec 2005 16:12:39 -0000 1.8 +++ .cvsignore 1 Mar 2006 07:36:36 -0000 1.9 @@ -1 +1 @@ -abcde_2.3.99.2-1.tar.gz +abcde_2.3.99.5.orig.tar.gz Index: abcde.spec =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/abcde.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- abcde.spec 14 Dec 2005 16:12:39 -0000 1.9 +++ abcde.spec 1 Mar 2006 07:36:37 -0000 1.10 @@ -1,12 +1,12 @@ Name: abcde -Version: 2.3.99.2 +Version: 2.3.99.5 Release: 1%{?dist} Summary: A Better CD Encoder Group: Applications/Multimedia License: GPL or Artistic URL: http://www.hispalinux.es/~data/abcde.php -Source0: http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}-1.tar.gz +Source0: http://ftp.debian.org/debian/pool/main/a/abcde/%{name}_%{version}.orig.tar.gz Patch0: %{name}-2.1.19-inst.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -29,6 +29,7 @@ %patch0 -p1 sed -i -e 's/normalize-audio/normalize/g' abcde* sed -i -e 's/^#NOGAP$/#NOGAP=y/' abcde.conf +mv examples/cue2discid . %install @@ -36,6 +37,7 @@ %makeinstall \ etcdir=$RPM_BUILD_ROOT%{_sysconfdir} \ mandir=$RPM_BUILD_ROOT%{_mandir}/man1 +install -pm 755 cue2discid $RPM_BUILD_ROOT%{_bindir} %clean @@ -44,15 +46,19 @@ %files %defattr(-,root,root,-) -%doc COPYING FAQ README TODO USEPIPES debian/changelog examples/ +%doc COPYING FAQ README TODO USEPIPES changelog examples/ %config(noreplace) %{_sysconfdir}/abcde.conf %{_bindir}/abcde %{_bindir}/cddb-tool +%{_bindir}/cue2discid %{_mandir}/man1/abcde.1* %{_mandir}/man1/cddb-tool.1* %changelog +* Wed Mar 1 2006 Ville Skytt?? - 2.3.99.5-1 +- 2.3.99.5. + * Wed Dec 14 2005 Ville Skytt?? - 2.3.99.2-1 - 2.3.99.2, config file fixes mostly applied upstream. Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcde/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 14 Dec 2005 16:12:39 -0000 1.8 +++ sources 1 Mar 2006 07:36:37 -0000 1.9 @@ -1 +1 @@ -c76a00786096f89d6b0aa6c052410f67 abcde_2.3.99.2-1.tar.gz +d04f8d0f526f626e8d4741c3938a644e abcde_2.3.99.5.orig.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 07:36:53 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:36:53 -0500 Subject: owners owners.list,1.688,1.689 Message-ID: <200603010737.k217bP0U032011@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31983 Modified Files: owners.list Log Message: Added linux-libertine-fonts. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.688 retrieving revision 1.689 diff -u -r1.688 -r1.689 --- owners.list 28 Feb 2006 19:35:00 -0000 1.688 +++ owners.list 1 Mar 2006 07:36:52 -0000 1.689 @@ -624,6 +624,7 @@ Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org| 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|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 1 07:39:29 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 1 Mar 2006 02:39:29 -0500 Subject: rpms/xemacs/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xemacs-sitestart.el, 1.1, 1.2 xemacs.spec, 1.4, 1.5 Message-ID: <200603010740.k217e1dI032098@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32075 Modified Files: .cvsignore sources xemacs-sitestart.el xemacs.spec Log Message: * Wed Mar 1 2006 Ville Skytt?? - 21.4.19-1 - 21.4.19. - Don't set Info-directory-list in site-start.el to fix honoring INFOPATH from the environment (Geert Kloosterman). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Dec 2005 17:30:55 -0000 1.3 +++ .cvsignore 1 Mar 2006 07:39:29 -0000 1.4 @@ -1 +1 @@ -xemacs-21.4.18.tar.bz2 +xemacs-21.4.19.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Dec 2005 17:30:55 -0000 1.3 +++ sources 1 Mar 2006 07:39:29 -0000 1.4 @@ -1 +1 @@ -08c99ff915564a122a3a44df2264669c xemacs-21.4.18.tar.bz2 +0d2d255e2b362064959f329d522b137b xemacs-21.4.19.tar.bz2 Index: xemacs-sitestart.el =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/xemacs-sitestart.el,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xemacs-sitestart.el 1 Mar 2005 22:11:36 -0000 1.1 +++ xemacs-sitestart.el 1 Mar 2006 07:39:29 -0000 1.2 @@ -2,11 +2,6 @@ ;;; ;;; The "-no-site-file" option to xemacs prevents this file from being loaded. -;; fix default info path -(setq Info-directory-list '("/usr/share/info/" - "/usr/share/xemacs/xemacs-packages/info/" - "/usr/share/xemacs/mule-packages/info/")) - ;;; psgml catalog list (setq sgml-catalog-files (if (getenv "SGML_CATALOG_FILES") Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-4/xemacs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xemacs.spec 5 Dec 2005 17:30:55 -0000 1.4 +++ xemacs.spec 1 Mar 2006 07:39:29 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Different version of Emacs Name: xemacs -Version: 21.4.18 +Version: 21.4.19 Release: 1%{?dist} License: GPL Group: Applications/Editors @@ -113,6 +113,8 @@ %prep %setup -q +find . -type f -name "*.elc" -o -name "*.info*" | xargs rm -f + ## Lisp patches ## # make find-paths.el look in datadir %patch10 -p1 @@ -380,6 +382,11 @@ %changelog +* Wed Mar 1 2006 Ville Skytt?? - 21.4.19-1 +- 21.4.19. +- Don't set Info-directory-list in site-start.el to fix honoring INFOPATH + from the environment (Geert Kloosterman). + * Mon Dec 5 2005 Ville Skytt?? - 21.4.18-1 - 21.4.18, innerbuf and cursor patches applied upstream. - Move icon to icons/hicolor and to the main package. From fedora-extras-commits at redhat.com Wed Mar 1 07:42:05 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:42:05 -0500 Subject: rpms/linux-libertine-fonts - New directory Message-ID: <200603010742.k217g7Zu032200@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32192/linux-libertine-fonts Log Message: Directory /cvs/extras/rpms/linux-libertine-fonts added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 07:42:10 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:42:10 -0500 Subject: rpms/linux-libertine-fonts/devel - New directory Message-ID: <200603010742.k217gC8M032215@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32192/linux-libertine-fonts/devel Log Message: Directory /cvs/extras/rpms/linux-libertine-fonts/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 1 07:42:36 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:42:36 -0500 Subject: rpms/linux-libertine-fonts Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603010742.k217gcMI032249@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32237 Added Files: Makefile import.log Log Message: Setup of module linux-libertine-fonts --- NEW FILE Makefile --- # Top level Makefile for module linux-libertine-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 Wed Mar 1 07:42:42 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:42:42 -0500 Subject: rpms/linux-libertine-fonts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603010742.k217giF9032269@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32237/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module linux-libertine-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 Wed Mar 1 07:45:36 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:45:36 -0500 Subject: rpms/linux-libertine-fonts import.log,1.1,1.2 Message-ID: <200603010746.k217k9p4032343@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32309 Modified Files: import.log Log Message: auto-import linux-libertine-fonts-2.0.4-2 on branch devel from linux-libertine-fonts-2.0.4-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/linux-libertine-fonts/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 1 Mar 2006 07:42:36 -0000 1.1 +++ import.log 1 Mar 2006 07:45:36 -0000 1.2 @@ -0,0 +1 @@ +linux-libertine-fonts-2_0_4-2:HEAD:linux-libertine-fonts-2.0.4-2.src.rpm:1141199124 From fedora-extras-commits at redhat.com Wed Mar 1 07:45:42 2006 From: fedora-extras-commits at redhat.com (Frank Arnold (farnold)) Date: Wed, 1 Mar 2006 02:45:42 -0500 Subject: rpms/linux-libertine-fonts/devel linux-libertine-fonts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603010746.k217kFvO032347@cvs-int.fedora.redhat.com> Author: farnold Update of /cvs/extras/rpms/linux-libertine-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32309/devel Modified Files: .cvsignore sources Added Files: linux-libertine-fonts.spec Log Message: auto-import linux-libertine-fonts-2.0.4-2 on branch devel from linux-libertine-fonts-2.0.4-2.src.rpm --- NEW FILE linux-libertine-fonts.spec --- %define archivename LinLibertineSRC %define fontdir %{_datadir}/fonts/linux-libertine Name: linux-libertine-fonts Version: 2.0.4 Release: 2%{?dist} Summary: Linux Libertine Open Fonts Group: User Interface/X License: GPL URL: http://linuxlibertine.sf.net Source: http://dl.sf.net/linuxlibertine/%{archivename}-%{version}-6.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: fontforge %description The Linux Libertine Open Fonts are a TrueType font family for practical use in documents. They were created to provide a free alternative to proprietary standard fonts. %prep %setup -q -n %{archivename} %build fontforge -script "-" *.sfd < 2.0.4-2 - Named back to linux-libertine-fonts * Wed Feb 13 2006 Frank Arnold 2.0.4-1 - Updated to 2.0.4 - Removed handling of fonts.cache-2 * Wed Feb 01 2006 Frank Arnold 2.0.1-3 - Nuked separate fontforge build script, now in %%build section * Tue Jan 31 2006 Frank Arnold 2.0.1-2 - Fixed the following issues addressed by Ignacio Vazquez-Abrams - Package renaming to font-linux-libertine - Generate fonts from sources - Sample sheets for each font in PDF format * Mon Jan 30 2006 Frank Arnold 2.0.1-1 - Initial RPM release - Spec derived from other font packages Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Mar 2006 07:42:42 -0000 1.1 +++ .cvsignore 1 Mar 2006 07:45:42 -0000 1.2 @@ -0,0 +1 @@ +LinLibertineSRC-2.0.4-6.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/linux-libertine-fonts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Mar 2006 07:42:42 -0000 1.1 +++ sources 1 Mar 2006 07:45:42 -0000 1.2 @@ -0,0 +1 @@ +d0fcc8c7b01f5b587592840a3f7564a0 LinLibertineSRC-2.0.4-6.tgz From fedora-extras-commits at redhat.com Wed Mar 1 08:01:13 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 03:01:13 -0500 Subject: rpms/centericq/FC-4 centericq-ncursesw.patch, NONE, 1.1 centericq.spec, 1.20, 1.21 Message-ID: <200603010801.k2181jjE001912@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32515/FC-4 Modified Files: centericq.spec Added Files: centericq-ncursesw.patch Log Message: - improve utf8 handling centericq-ncursesw.patch: --- NEW FILE centericq-ncursesw.patch --- --- centericq-4.21.0/configure.in.utf 2006-01-06 19:12:07.000000000 +0200 +++ centericq-4.21.0/configure.in 2006-01-06 19:14:05.000000000 +0200 @@ -109,8 +109,9 @@ LIBS="$LIBS $LIBICONV" AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(nsl, gethostbyname) -AC_CHECK_LIB(ncurses, initscr,, - [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))]) +AC_CHECK_LIB(ncursesw, initscr,, + [AC_CHECK_LIB(ncurses, initscr,, + [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))])]) AC_TRY_COMPILE([ #include Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-4/centericq.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- centericq.spec 3 Jan 2006 10:03:19 -0000 1.20 +++ centericq.spec 1 Mar 2006 08:01:13 -0000 1.21 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Text mode menu- and window-driven IM @@ -22,14 +22,17 @@ Patch6: centericq-4.21.0-kkstrtext.patch # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch +# improve utf8 handling +Patch200: centericq-ncursesw.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel BuildRequires: libidn-devel BuildRequires: curl-devel BuildRequires: ncurses-devel -BuildRequires: gettext +BuildRequires: gettext-devel BuildRequires: gpgme-devel +BuildRequires: automake %description Centericq is a text mode menu- and window-driven IM interface that supports the @@ -45,6 +48,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch200 -p1 +aclocal +autoconf +automake %build CFLAGS="$RPM_OPT_FLAGS" \ @@ -75,6 +82,10 @@ # we don't want that %exclude %{_includedir}/msn %changelog +* Wed Mar 01 2006 Andreas Bierfert +4.21.0-4 +- improve utf8 support + * Tue Jan 03 2006 Andreas Bierfert 4.21.0-3 - Fix more security related stuff From fedora-extras-commits at redhat.com Wed Mar 1 08:01:21 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 03:01:21 -0500 Subject: rpms/centericq/devel centericq-ncursesw.patch, NONE, 1.1 centericq.spec, 1.22, 1.23 Message-ID: <200603010801.k2181rEM001915@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32515/devel Modified Files: centericq.spec Added Files: centericq-ncursesw.patch Log Message: - improve utf8 handling centericq-ncursesw.patch: --- NEW FILE centericq-ncursesw.patch --- --- centericq-4.21.0/configure.in.utf 2006-01-06 19:12:07.000000000 +0200 +++ centericq-4.21.0/configure.in 2006-01-06 19:14:05.000000000 +0200 @@ -109,8 +109,9 @@ LIBS="$LIBS $LIBICONV" AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(nsl, gethostbyname) -AC_CHECK_LIB(ncurses, initscr,, - [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))]) +AC_CHECK_LIB(ncursesw, initscr,, + [AC_CHECK_LIB(ncurses, initscr,, + [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))])]) AC_TRY_COMPILE([ #include Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- centericq.spec 15 Feb 2006 08:33:53 -0000 1.22 +++ centericq.spec 1 Mar 2006 08:01:20 -0000 1.23 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Text mode menu- and window-driven IM @@ -22,15 +22,17 @@ Patch6: centericq-4.21.0-kkstrtext.patch # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch - +# improve utf8 handling +Patch200: centericq-ncursesw.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel BuildRequires: libidn-devel BuildRequires: curl-devel BuildRequires: ncurses-devel -BuildRequires: gettext +BuildRequires: gettext-devel BuildRequires: gpgme-devel +BuildRequires: automake %description Centericq is a text mode menu- and window-driven IM interface that supports the @@ -46,6 +48,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch200 -p1 +aclocal +autoconf +automake %build CFLAGS="$RPM_OPT_FLAGS" \ @@ -77,6 +83,10 @@ %exclude %{_includedir}/msn %changelog +* Wed Mar 01 2006 Andreas Bierfert +4.21.0-6 +- improve utf8 support + * Tue Feb 14 2006 Andreas Bierfert 4.21.0-5 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed Mar 1 08:01:07 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 03:01:07 -0500 Subject: rpms/centericq/FC-3 centericq-ncursesw.patch, NONE, 1.1 centericq.spec, 1.10, 1.11 Message-ID: <200603010802.k2182Ngk001918@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32515/FC-3 Modified Files: centericq.spec Added Files: centericq-ncursesw.patch Log Message: - improve utf8 handling centericq-ncursesw.patch: --- NEW FILE centericq-ncursesw.patch --- --- centericq-4.21.0/configure.in.utf 2006-01-06 19:12:07.000000000 +0200 +++ centericq-4.21.0/configure.in 2006-01-06 19:14:05.000000000 +0200 @@ -109,8 +109,9 @@ LIBS="$LIBS $LIBICONV" AC_CHECK_LIB(socket, socket) AC_CHECK_LIB(nsl, gethostbyname) -AC_CHECK_LIB(ncurses, initscr,, - [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))]) +AC_CHECK_LIB(ncursesw, initscr,, + [AC_CHECK_LIB(ncurses, initscr,, + [AC_CHECK_LIB(curses, initscr,, AC_MSG_ERROR(The ncurses terminal library is required in order to build the program))])]) AC_TRY_COMPILE([ #include Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-3/centericq.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- centericq.spec 3 Jan 2006 10:02:58 -0000 1.10 +++ centericq.spec 1 Mar 2006 08:01:07 -0000 1.11 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Text mode menu- and window-driven IM @@ -22,14 +22,17 @@ Patch6: centericq-4.21.0-kkstrtext.patch # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch +# improve utf8 handling +Patch200: centericq-ncursesw.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel BuildRequires: libidn-devel BuildRequires: curl-devel BuildRequires: ncurses-devel -BuildRequires: gettext +BuildRequires: gettext-devel BuildRequires: gpgme-devel +BuildRequires: automake %description Centericq is a text mode menu- and window-driven IM interface that supports the @@ -45,6 +48,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch200 -p1 +aclocal +autoconf +automake %build CFLAGS="$RPM_OPT_FLAGS" \ @@ -75,6 +82,10 @@ # we don't want that %exclude %{_includedir}/msn %changelog +* Wed Mar 01 2006 Andreas Bierfert +4.21.0-4 +- improve utf8 support + * Tue Jan 03 2006 Andreas Bierfert 4.21.0-3 - Fix more security related stuff From fedora-extras-commits at redhat.com Wed Mar 1 08:02:54 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Wed, 1 Mar 2006 03:02:54 -0500 Subject: rpms/jogl/devel jogl.spec,1.14,1.15 Message-ID: <200603010803.k2183AsC001944@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/jogl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1924 Modified Files: jogl.spec Log Message: Rebuild with new compiler Index: jogl.spec =================================================================== RCS file: /cvs/extras/rpms/jogl/devel/jogl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jogl.spec 9 Feb 2006 18:47:53 -0000 1.14 +++ jogl.spec 1 Mar 2006 08:02:54 -0000 1.15 @@ -2,7 +2,7 @@ Name: jogl Version: 1.1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Java bindings for the OpenGL API Group: System Environment/Libraries @@ -107,6 +107,9 @@ %doc %{_javadocdir}/%{name} %changelog +* Wed Mar 1 2006 Anthony Green - 0:1.1.1-14 +- Rebuild again with another new compiler. + * Thu Feb 9 2006 Anthony Green - 0:1.1.1-13 - Rebuild with new 4.1 compiler (post ABI change). From fedora-extras-commits at redhat.com Wed Mar 1 08:13:33 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 1 Mar 2006 03:13:33 -0500 Subject: rpms/galeon/devel .cvsignore, 1.6, 1.7 galeon.spec, 1.14, 1.15 sources, 1.7, 1.8 Message-ID: <200603010814.k218E5U8002077@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2056 Modified Files: .cvsignore galeon.spec sources Log Message: Update to 2.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/galeon/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Nov 2005 22:39:01 -0000 1.6 +++ .cvsignore 1 Mar 2006 08:13:33 -0000 1.7 @@ -1 +1 @@ -galeon-2.0.0.tar.bz2 +galeon-2.0.1.tar.bz2 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/devel/galeon.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- galeon.spec 5 Dec 2005 04:53:20 -0000 1.14 +++ galeon.spec 1 Mar 2006 08:13:33 -0000 1.15 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon -Version: 2.0.0 -Release: 2%{?dist} +Version: 2.0.1 +Release: 1%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -113,6 +113,9 @@ %changelog +* Tue Feb 28 2006 Denis Leroy - 2.0.1-1 +- Update to 2.0.1 + * Sun Dec 4 2005 Denis Leroy - 2.0.0-2 - Fixed preun script, was removing schemas after update. - Removed galeon-config-tool. Now using well-known Fedora scriptlets. Index: sources =================================================================== RCS file: /cvs/extras/rpms/galeon/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Nov 2005 22:39:01 -0000 1.7 +++ sources 1 Mar 2006 08:13:33 -0000 1.8 @@ -1 +1 @@ -e1f1e46d40c9e2345c1ea5e9bc788244 galeon-2.0.0.tar.bz2 +34d6e3a6ee78f9e4d12736e5d81b462b galeon-2.0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 08:30:08 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 1 Mar 2006 03:30:08 -0500 Subject: rpms/graphviz/devel graphviz.spec,1.25,1.26 Message-ID: <200603010830.k218UecU002402@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/graphviz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2384 Modified Files: graphviz.spec Log Message: * Wed Mar 01 2006 Oliver Falk - 2.8-3 - Add libtool-ltdl, libtool-ltdl-devel - Fix fixes Index: graphviz.spec =================================================================== RCS file: /cvs/extras/rpms/graphviz/devel/graphviz.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- graphviz.spec 24 Feb 2006 07:14:16 -0000 1.25 +++ graphviz.spec 1 Mar 2006 08:30:07 -0000 1.26 @@ -45,7 +45,7 @@ Summary: Graph Visualization Tools Name: graphviz Version: 2.8 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Multimedia License: CPL URL: http://www.graphviz.org/ @@ -59,9 +59,10 @@ BuildRequires: zlib-devel libpng-devel libjpeg-devel expat-devel freetype-devel >= 2 BuildRequires: /bin/ksh bison m4 flex tk tcl >= 8.3 swig BuildRequires: tcl-devel tk-devel -%{?fc5:BuildRequires: fontconfig-devel libtool-ltdl-devel} +BuildRequires: libtool-ltdl-devel libtool-ltdl +%{?fc5:BuildRequires: fontconfig-devel} %{?fc5:BuildRequires: libXaw-devel libSM-devel libICE-devel libXpm-devel libXt-devel libXmu-devel libXext-devel libX11-devel} -%{?fc4:BuildRequires: fontconfig-devel xorg-x11-devel libtool-ltdl-devel} +%{?fc4:BuildRequires: fontconfig-devel xorg-x11-devel} %{?fc3:BuildRequires: fontconfig-devel xorg-x11-devel} %description @@ -307,7 +308,7 @@ %setup -q %build -%configure +%configure --disable-static --with-mylibgd %__make %{?_smp_mflags} %install @@ -318,15 +319,11 @@ pkgconfigdir=%{_libdir}/pkgconfig \ install find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' -find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';' +#find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';' chmod -x $RPM_BUILD_ROOT%{_datadir}/%{name}/lefty/* cp -a $RPM_BUILD_ROOT%{_datadir}/%{name}/doc __doc rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/doc -# There files are crated on x86_64 for what reason? I don't know... -rm -f %{_includedir}/ltdl.h -rm -f %{_libdir}/libltdl* - %clean rm -rf $RPM_BUILD_ROOT @@ -339,6 +336,10 @@ if ! test -x %{_bindir}/dot; then rm -f %{_libdir}/%{name}/config; fi %changelog +* Wed Mar 01 2006 Oliver Falk - 2.8-3 +- Add libtool-ltdl, libtool-ltdl-devel +- Fix fixes + * Fri Feb 24 2006 Oliver Falk - 2.8-2 - Fix unpackaged files on x86_64 From fedora-extras-commits at redhat.com Wed Mar 1 08:31:34 2006 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Wed, 1 Mar 2006 03:31:34 -0500 Subject: rpms/Sprog/FC-4 Sprog.spec,1.3,1.4 Message-ID: <200603010832.k218W6ke002465@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/Sprog/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2448 Modified Files: Sprog.spec Log Message: Removed perl(Imager) Index: Sprog.spec =================================================================== RCS file: /cvs/extras/rpms/Sprog/FC-4/Sprog.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Sprog.spec 26 Feb 2006 23:14:58 -0000 1.3 +++ Sprog.spec 1 Mar 2006 08:31:34 -0000 1.4 @@ -1,6 +1,6 @@ Name: Sprog Version: 0.14 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A graphical tool to build programs by plugging parts together Group: Applications/System @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: perl(Glib), perl(Gtk2), perl(Gnome2::Canvas), perl(Gtk2::GladeXML), perl(YAML) -BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template), perl(Imager) +BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template) BuildRequires: perl(Apache::LogRegex), perl(XML::LibXML), perl(Time::HiRes) BuildRequires: desktop-file-utils Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -86,6 +86,9 @@ %{_datadir}/applications/fedora-Sprog.desktop %changelog +* Wed Mar 01 2006 Gavin Henry - 0.14-10 +- Removed perl(Imager). + * Sun Feb 26 2006 Gavin Henry - 0.14-9 - Changes BuildRequires to perl(Time::HiRes) and perl(Imager). Added perl(main) work around. See Bugzilla 183099 From fedora-extras-commits at redhat.com Wed Mar 1 10:05:08 2006 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 1 Mar 2006 05:05:08 -0500 Subject: rpms/fpc/devel fpc.spec,1.7,1.8 Message-ID: <200603011005.k21A5eZe006940@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6923/devel Modified Files: fpc.spec Log Message: Rebuild for Fedora Extras 5 Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fpc.spec 21 Dec 2005 14:41:57 -0000 1.7 +++ fpc.spec 1 Mar 2006 10:05:07 -0000 1.8 @@ -1,6 +1,6 @@ Name: fpc Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Free Pascal Compiler Group: Development/Languages @@ -159,6 +159,9 @@ %{_datadir}/fpcsrc %changelog +* Wed Mar 1 2005 Joost van der Sluis 2.0.2-4 +- Rebuild for Fedora Extras 5 + * Tue Dec 20 2005 Joost van der Sluis 2.0.2-3 - Disabled smart-linking for ppc From fedora-extras-commits at redhat.com Wed Mar 1 10:07:29 2006 From: fedora-extras-commits at redhat.com (Joost van der Sluis (joost)) Date: Wed, 1 Mar 2006 05:07:29 -0500 Subject: rpms/fpc/devel fpc.spec,1.8,1.9 Message-ID: <200603011008.k21A8165006993@cvs-int.fedora.redhat.com> Author: joost Update of /cvs/extras/rpms/fpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6966 Modified Files: fpc.spec Log Message: Corrected changelog for rebuild Index: fpc.spec =================================================================== RCS file: /cvs/extras/rpms/fpc/devel/fpc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fpc.spec 1 Mar 2006 10:05:07 -0000 1.8 +++ fpc.spec 1 Mar 2006 10:07:28 -0000 1.9 @@ -159,7 +159,7 @@ %{_datadir}/fpcsrc %changelog -* Wed Mar 1 2005 Joost van der Sluis 2.0.2-4 +* Wed Mar 1 2006 Joost van der Sluis 2.0.2-4 - Rebuild for Fedora Extras 5 * Tue Dec 20 2005 Joost van der Sluis 2.0.2-3 From fedora-extras-commits at redhat.com Wed Mar 1 10:54:43 2006 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Wed, 1 Mar 2006 05:54:43 -0500 Subject: rpms/Sprog/FC-4 Sprog.spec,1.4,1.5 Message-ID: <200603011055.k21AtFsh007177@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/Sprog/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7160 Modified Files: Sprog.spec Log Message: Added perl(Imager) again. Index: Sprog.spec =================================================================== RCS file: /cvs/extras/rpms/Sprog/FC-4/Sprog.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Sprog.spec 1 Mar 2006 08:31:34 -0000 1.4 +++ Sprog.spec 1 Mar 2006 10:54:42 -0000 1.5 @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: perl(Glib), perl(Gtk2), perl(Gnome2::Canvas), perl(Gtk2::GladeXML), perl(YAML) -BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template) +BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template), perl(Imager) BuildRequires: perl(Apache::LogRegex), perl(XML::LibXML), perl(Time::HiRes) BuildRequires: desktop-file-utils Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) From fedora-extras-commits at redhat.com Wed Mar 1 10:55:29 2006 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Wed, 1 Mar 2006 05:55:29 -0500 Subject: rpms/Sprog/devel Sprog.spec,1.5,1.6 Message-ID: <200603011056.k21Au2dR007204@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/Sprog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7183 Modified Files: Sprog.spec Log Message: Added perl(Imager) Index: Sprog.spec =================================================================== RCS file: /cvs/extras/rpms/Sprog/devel/Sprog.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Sprog.spec 27 Feb 2006 10:30:23 -0000 1.5 +++ Sprog.spec 1 Mar 2006 10:55:29 -0000 1.6 @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: perl(Glib), perl(Gtk2), perl(Gnome2::Canvas), perl(Gtk2::GladeXML), perl(YAML) -BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template) +BuildRequires: perl(MIME::Base64), perl(Pod::Simple), perl(LWP), perl(Template), perl(Imager) BuildRequires: perl(Apache::LogRegex), perl(XML::LibXML), perl(Time::HiRes) BuildRequires: desktop-file-utils Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) From fedora-extras-commits at redhat.com Wed Mar 1 10:56:05 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 1 Mar 2006 05:56:05 -0500 Subject: rpms/xmms/devel xmms-1.2.10-extra_libs.patch, NONE, 1.1 xmms.spec, 1.16, 1.17 Message-ID: <200603011056.k21AubL3007256@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7203 Modified Files: xmms.spec Added Files: xmms-1.2.10-extra_libs.patch Log Message: Clean xmms-config output (#182267). xmms-1.2.10-extra_libs.patch: --- NEW FILE xmms-1.2.10-extra_libs.patch --- --- xmms-1.2.10/xmms-config.in.extra_libs 2001-04-05 19:35:49.000000000 -0500 +++ xmms-1.2.10/xmms-config.in 2005-12-13 07:20:44.000000000 -0600 @@ -23,10 +23,10 @@ lib_dir="@libdir@" if ( (gtk-config --version) > /dev/null 2>&1) then - gtk_libs=`gtk-config --libs` + #gtk_libs=`gtk-config --libs` gtk_cflags=`gtk-config --cflags` else - gtk_libs="@GTK_LIBS@" + #gtk_libs="@GTK_LIBS@" gtk_cflags="@GTK_CFLAGS@" fi Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xmms.spec 13 Feb 2006 13:45:25 -0000 1.16 +++ xmms.spec 1 Mar 2006 10:56:05 -0000 1.17 @@ -1,7 +1,7 @@ Summary: The X MultiMedia System, a media player Name: xmms Version: 1.2.10 -Release: 20%{?dist} +Release: 21%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -21,6 +21,7 @@ Patch10: xmms-alsa-backport.patch Patch11: xmms-1.2.10-gcc4.patch Patch12: xmms-1.2.10-crossfade-0.3.9.patch +Patch13: xmms-1.2.10-extra_libs.patch Requires: unzip # the desktop file and redhat-menus are redundant requires really @@ -29,8 +30,13 @@ BuildRequires: gtk+-devel, esound-devel, arts-devel, alsa-lib-devel BuildRequires: libogg-devel, libvorbis-devel, mikmod-devel -BuildRequires: libXt-devel, libSM-devel, libXxf86vm-devel, mesa-libGL-devel -BuildRequires: gettext-devel, zlib-devel +BuildRequires: gettext-devel, zlib-devel, libGL-devel +# Use monolithic X up to FC4, and modular X for FC5+ +%if 0%{?fedora} < 5 +BuildRequires: xorg-x11-devel +%else +BuildRequires: libXt-devel, libSM-devel, libXxf86vm-devel +%endif Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -79,6 +85,8 @@ %patch11 -p1 -b .gcc4 # Fix for crossfade >= 0.3.9 to work properly %patch12 -p1 -b .crossfade +# Remove extra libs from xmms-config output (was only needed for static linking) +%patch13 -p1 -b .extra_libs %build @@ -87,7 +95,8 @@ --enable-kanji \ --enable-texthack \ --enable-ipv6 \ - --with-pic + --with-pic \ + --disable-static # Hack around old libtool and x86_64 issue for i in `find . -name Makefile`; do cat $i | sed s/-lpthread//g > $i.tmp @@ -160,13 +169,18 @@ %defattr(-,root,root,0755) %{_bindir}/xmms-config %{_includedir}/xmms/ -%exclude %{_libdir}/*.a %exclude %{_libdir}/*.la %{_libdir}/*.so %{_datadir}/aclocal/xmms.m4 %changelog +* Mon Feb 13 2006 Matthias Saou 1:1.2.10-21 +- Remove gtk libs from xmms-config output, as they are only really needed for + static linking, which we no longer support (#182267). +- Disable static in %%configure instead of excluding the built file. +- Add conditional modular X build requirements. + * Mon Feb 13 2006 Matthias Saou 1:1.2.10-20 - Spec file cleanup. - Include crossfade 0.3.9 patch. From fedora-extras-commits at redhat.com Wed Mar 1 10:56:10 2006 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Wed, 1 Mar 2006 05:56:10 -0500 Subject: rpms/Sprog/FC-4 Sprog.spec,1.5,1.6 Message-ID: <200603011056.k21AugKv007289@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/Sprog/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7223 Modified Files: Sprog.spec Log Message: Added perl(Imager) again. Index: Sprog.spec =================================================================== RCS file: /cvs/extras/rpms/Sprog/FC-4/Sprog.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- Sprog.spec 1 Mar 2006 10:54:42 -0000 1.5 +++ Sprog.spec 1 Mar 2006 10:56:10 -0000 1.6 @@ -1,6 +1,6 @@ Name: Sprog Version: 0.14 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A graphical tool to build programs by plugging parts together Group: Applications/System @@ -86,6 +86,9 @@ %{_datadir}/applications/fedora-Sprog.desktop %changelog +* Wed Mar 01 2006 Gavin Henry - 0.14-11 +- Added perl(Imager)!! + * Wed Mar 01 2006 Gavin Henry - 0.14-10 - Removed perl(Imager). From fedora-extras-commits at redhat.com Wed Mar 1 10:57:55 2006 From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry)) Date: Wed, 1 Mar 2006 05:57:55 -0500 Subject: rpms/Sprog/devel Sprog.spec,1.6,1.7 Message-ID: <200603011058.k21AwSao007375@cvs-int.fedora.redhat.com> Author: ghenry Update of /cvs/extras/rpms/Sprog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7311 Modified Files: Sprog.spec Log Message: Added perl(Imager) Index: Sprog.spec =================================================================== RCS file: /cvs/extras/rpms/Sprog/devel/Sprog.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Sprog.spec 1 Mar 2006 10:55:29 -0000 1.6 +++ Sprog.spec 1 Mar 2006 10:57:55 -0000 1.7 @@ -1,6 +1,6 @@ Name: Sprog Version: 0.14 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A graphical tool to build programs by plugging parts together Group: Applications/System @@ -78,6 +78,9 @@ %{_datadir}/applications/fedora-Sprog.desktop %changelog +* Wed Mar 01 2006 Gavin Henry - 0.14-11 +- Added perl(Imager) + * Sun Feb 26 2006 Gavin Henry - 0.14-10 - Removed perl(Imager) From fedora-extras-commits at redhat.com Wed Mar 1 12:16:34 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 1 Mar 2006 07:16:34 -0500 Subject: rpms/xmms/FC-4 xmms-1.2.10-crossfade-0.3.9.patch, NONE, 1.1 xmms-1.2.10-extra_libs.patch, NONE, 1.1 xmms.spec, 1.12, 1.13 Message-ID: <200603011217.k21CHERS011371@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11347 Modified Files: xmms.spec Added Files: xmms-1.2.10-crossfade-0.3.9.patch xmms-1.2.10-extra_libs.patch Log Message: Clean xmms-config output (#182267). xmms-1.2.10-crossfade-0.3.9.patch: --- NEW FILE xmms-1.2.10-crossfade-0.3.9.patch --- diff -ur xmms-1.2.10/xmms/input.c xmms-1.2.10.patched/xmms/input.c --- xmms-1.2.10/xmms/input.c 2003-08-08 19:10:44.000000000 +0200 +++ xmms-1.2.10.patched/xmms/input.c 2005-11-25 00:12:36.000000000 +0100 @@ -285,6 +285,14 @@ } } +gboolean input_stopped_for_restart = FALSE; /* crossfade */ +void input_stop_for_restart() /* crossfade */ +{ + input_stopped_for_restart = TRUE; + input_stop(); + input_stopped_for_restart = FALSE; +} + void input_stop(void) { if (ip_data->playing && get_current_input_plugin()) diff -ur xmms-1.2.10/xmms/input.h xmms-1.2.10.patched/xmms/input.h --- xmms-1.2.10/xmms/input.h 2000-02-16 22:05:57.000000000 +0100 +++ xmms-1.2.10.patched/xmms/input.h 2005-11-25 00:12:36.000000000 +0100 @@ -34,6 +34,7 @@ gboolean input_check_file(gchar * filename); void input_play(char *filename); void input_stop(void); +void input_stop_for_restart(void); void input_pause(void); int input_get_time(void); void input_set_eq(int on, float preamp, float *bands); diff -ur xmms-1.2.10/xmms/main.c xmms-1.2.10.patched/xmms/main.c --- xmms-1.2.10/xmms/main.c 2004-02-23 21:31:43.000000000 +0100 +++ xmms-1.2.10.patched/xmms/main.c 2005-11-25 00:12:36.000000000 +0100 @@ -881,8 +881,10 @@ mainwin_set_shade(!cfg.player_shaded); } +gboolean is_quitting = FALSE; /* crossfade */ void mainwin_quit_cb(void) { + is_quitting = TRUE; /* crossfade */ input_stop(); gtk_widget_hide(equalizerwin); gtk_widget_hide(playlistwin); @@ -1523,7 +1525,8 @@ int *pos; if (get_input_playing()) - input_stop(); + input_stop_for_restart(); + pos = gtk_clist_get_row_data(clist, GPOINTER_TO_INT(clist->selection->data)); playlist_set_position(*pos); playlist_play(); diff -ur xmms-1.2.10/xmms/playlist.c xmms-1.2.10.patched/xmms/playlist.c --- xmms-1.2.10/xmms/playlist.c 2004-02-23 21:31:43.000000000 +0100 +++ xmms-1.2.10.patched/xmms/playlist.c 2005-11-25 00:12:36.000000000 +0100 @@ -124,7 +124,7 @@ if (get_input_playing()) { PL_UNLOCK(); - input_stop(); + input_stop_for_restart(); PL_LOCK(); *restart_playing = TRUE; } @@ -570,7 +570,7 @@ } if (get_input_playing()) - input_stop(); + input_stop_for_restart(); vis_clear_data(mainwin_vis); vis_clear_data(playlistwin_vis); @@ -668,7 +668,7 @@ { /* We need to stop before changing playlist_position */ PL_UNLOCK(); - input_stop(); + input_stop_for_restart(); PL_LOCK(); restart_playing = TRUE; } @@ -723,7 +723,7 @@ { /* We need to stop before changing playlist_position */ PL_UNLOCK(); - input_stop(); + input_stop_for_restart(); PL_LOCK(); restart_playing = TRUE; } @@ -852,7 +852,7 @@ { /* We need to stop before changing playlist_position */ PL_UNLOCK(); - input_stop(); + input_stop_for_restart(); PL_LOCK(); restart_playing = TRUE; } xmms-1.2.10-extra_libs.patch: --- NEW FILE xmms-1.2.10-extra_libs.patch --- --- xmms-1.2.10/xmms-config.in.extra_libs 2001-04-05 19:35:49.000000000 -0500 +++ xmms-1.2.10/xmms-config.in 2005-12-13 07:20:44.000000000 -0600 @@ -23,10 +23,10 @@ lib_dir="@libdir@" if ( (gtk-config --version) > /dev/null 2>&1) then - gtk_libs=`gtk-config --libs` + #gtk_libs=`gtk-config --libs` gtk_cflags=`gtk-config --cflags` else - gtk_libs="@GTK_LIBS@" + #gtk_libs="@GTK_LIBS@" gtk_cflags="@GTK_CFLAGS@" fi Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/FC-4/xmms.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- xmms.spec 28 Dec 2005 14:27:52 -0000 1.12 +++ xmms.spec 1 Mar 2006 12:16:33 -0000 1.13 @@ -1,7 +1,7 @@ Summary: The X MultiMedia System, a media player Name: xmms Version: 1.2.10 -Release: 19%{?dist} +Release: 21%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -20,18 +20,29 @@ Patch9: xmms-underquoted.patch Patch10: xmms-alsa-backport.patch Patch11: xmms-1.2.10-gcc4.patch +Patch12: xmms-1.2.10-crossfade-0.3.9.patch +Patch13: xmms-1.2.10-extra_libs.patch Requires: unzip # the desktop file and redhat-menus are redundant requires really Requires: /usr/share/desktop-menu-patches/redhat-audio-player.desktop Requires: redhat-menus >= 0.11 -BuildRequires: gtk+-devel esound-devel arts-devel alsa-lib-devel -BuildRequires: libvorbis-devel mikmod-devel -Requires(pre): desktop-file-utils >= 0.9 +BuildRequires: gtk+-devel, esound-devel, arts-devel, alsa-lib-devel +BuildRequires: libogg-devel, libvorbis-devel, mikmod-devel +BuildRequires: gettext-devel, zlib-devel, libGL-devel +# Use monolithic X up to FC4, and modular X for FC5+ +%if 0%{?fedora} < 5 +BuildRequires: xorg-x11-devel +%else +BuildRequires: libXt-devel, libSM-devel, libXxf86vm-devel +%endif +Requires(post): desktop-file-utils >= 0.9 +Requires(postun): desktop-file-utils >= 0.9 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Obsoletes: x11amp0.7-1-1 x11amp xmms-esd xmms-gl xmms-mikmod xmms-gnome +Obsoletes: xmms-esd xmms-gl xmms-mikmod xmms-gnome +# This is to avoid requiring all of arts, esound, alsa... %define _use_internal_dependency_generator 0 %define __find_requires %{SOURCE2} @@ -40,15 +51,15 @@ an interface similar to Winamp's. Xmms supports playlists and streaming content and has a configurable interface. + %package devel -Summary: Static libraries and header files for Xmms plug-in development. +Summary: Files required for XMMS plug-in development Group: Development/Libraries -Obsoletes: x11amp-devel -Requires: %{name} = %{epoch}:%{version} gtk+-devel +Requires: %{name} = %{epoch}:%{version}, gtk+-devel %description devel -The static libraries and header files needed for building plug-ins for -the Xmms multimedia player. +Files needed for building plug-ins for the X MultiMedia System. + %prep %setup -q @@ -72,52 +83,55 @@ %patch10 -p0 -b .alsa-backport # Fix compilation with gcc4 %patch11 -p1 -b .gcc4 +# Fix for crossfade >= 0.3.9 to work properly +%patch12 -p1 -b .crossfade +# Remove extra libs from xmms-config output (was only needed for static linking) +%patch13 -p1 -b .extra_libs + %build %configure \ - --disable-dependency-tracking \ - --enable-kanji \ - --enable-texthack \ - --enable-ipv6 \ - --with-pic + --disable-dependency-tracking \ + --enable-kanji \ + --enable-texthack \ + --enable-ipv6 \ + --with-pic \ + --disable-static +# Hack around old libtool and x86_64 issue for i in `find . -name Makefile`; do - cat $i | sed s/-lpthread//g > $i.tmp - mv $i.tmp $i + cat $i | sed s/-lpthread//g > $i.tmp + mv $i.tmp $i done -make +%{__make} %{?_smp_mflags} -gcc -fPIC $RPM_OPT_FLAGS -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \ - %{SOURCE5} -I. `gtk-config --cflags gtk` +# Compile the default mp3 "warning dialog" plugin +%{__cc} %{optflags} -fPIC -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \ + -I. `gtk-config --cflags gtk` %{SOURCE5} -%install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%install +%{__rm} -rf %{buildroot} +%{__make} install DESTDIR=%{buildroot} +%find_lang %{name} -install -m 755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input +# Install default mp3 "warning dialog" plugin +%{__install} -m 0755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input/ -mkdir -pv %{buildroot}%{_datadir}/applications -(cd $RPM_BUILD_ROOT%{_datadir}/applications && ln -sf \ - %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop) +# Link to the desktop menu entry included in redhat-menus +%{__mkdir_p} %{buildroot}%{_datadir}/applications +%{__ln_s} %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop \ + %{buildroot}%{_datadir}/applications/ -mkdir -p %{buildroot}%{_datadir}/pixmaps/mini -install -m 644 xmms/xmms_logo.xpm %{buildroot}%{_datadir}/pixmaps/ -install -m 644 xmms/xmms_mini.xpm %{buildroot}%{_datadir}/pixmaps/mini/ -install -m 644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/ +# Install xmms.xpm, the Icon= from the menu entry +%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/xmms.xpm -# create empty skins directory to be included -mkdir -p %{buildroot}%{_datadir}/xmms/Skins +# Create empty Skins directory to be included +%{__mkdir_p} %{buildroot}%{_datadir}/xmms/Skins/ -# unpackaged files -rm -f %{buildroot}/%{_datadir}/xmms/*/lib*.{a,la} \ - %{buildroot}/%{_libdir}/libxmms.la \ - %{buildroot}/%{_libdir}/xmms/*/*.la \ - %{buildroot}/%{_mandir}/man1/gnomexmms* - -%find_lang %{name} %clean -rm -rf %{buildroot} +%{__rm} -rf %{buildroot} + %post /sbin/ldconfig @@ -127,32 +141,66 @@ /sbin/ldconfig update-desktop-database -q || : + %files -f %{name}.lang %defattr(-,root,root,0755) -%doc AUTHORS COPYING ChangeLog FAQ NEWS TODO README +%doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README %{_bindir}/xmms %{_bindir}/wmxmms -%{_libdir}/libxmms.so.1* -%{_libdir}/xmms/ -%{_datadir}/applications/* +%{_libdir}/libxmms.so.* +%dir %{_libdir}/xmms/ +%dir %{_libdir}/xmms/Effect/ +%dir %{_libdir}/xmms/General/ +%dir %{_libdir}/xmms/Input/ +%dir %{_libdir}/xmms/Output/ +%dir %{_libdir}/xmms/Visualization/ +%{_libdir}/xmms/Effect/*.so +%{_libdir}/xmms/General/*.so +%{_libdir}/xmms/Input/*.so +%{_libdir}/xmms/Output/*.so +%{_libdir}/xmms/Visualization/*.so +%exclude %{_libdir}/xmms/*/*.la +%{_datadir}/applications/*.desktop %{_datadir}/pixmaps/xmms.xpm -%{_datadir}/pixmaps/xmms_logo.xpm -%{_datadir}/pixmaps/mini/xmms_mini.xpm %{_datadir}/xmms/ -%{_mandir}/man1/[wx]* +%{_mandir}/man1/* %files devel %defattr(-,root,root,0755) %{_bindir}/xmms-config %{_includedir}/xmms/ -%{_libdir}/lib*.a -%{_libdir}/lib*.so +%exclude %{_libdir}/*.la +%{_libdir}/*.so %{_datadir}/aclocal/xmms.m4 + %changelog +* Mon Feb 13 2006 Matthias Saou 1:1.2.10-21 +- Remove gtk libs from xmms-config output, as they are only really needed for + static linking, which we no longer support (#182267). +- Disable static in %%configure instead of excluding the built file. +- Add conditional modular X build requirements. + +* Mon Feb 13 2006 Matthias Saou 1:1.2.10-20 +- Spec file cleanup. +- Include crossfade 0.3.9 patch. +- Remove very old x11amp obsoletes. +- Exclude static libraries, update devel summary and description for it. +- List all plugins directories in order to be aware of breakage if the + libtool problem ever happens again. +- Fix post/postun scriplets. +- Remove xmms_logo.xpm and xmms_mini.xpm, they should be unused. +- Add libXt-devel to fullfill the "checking for X..." configure check. +- Add gettext-devel to make more configure checks happy. + * Wed Dec 28 2005 Hans de Goede 1:1.2.10-19 - Remove -lpthread from all LDFLAGS as this confuses the old libtool used by xmms on x86_64 (FE-bug #175493) +- Add missing modular Xorg BuildReqs, this (re)enables session managment + support and the openGL plugins. + +* Tue Dec 20 2005 Matthias Saou 1:1.2.10-18.1 +- Update gcc4 patch to include fix for xmms.org bug #1730, fixes FC5 build. * Sat May 28 2005 Matthias Saou 1:1.2.10-18 - Build with explicit --with-pic to fix compilation of flac plugin on From fedora-extras-commits at redhat.com Wed Mar 1 12:48:12 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 07:48:12 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.6,1.7 Message-ID: <200603011248.k21Cmiov011506@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11487 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scim-tomoe.spec 1 Mar 2006 07:35:16 -0000 1.6 +++ scim-tomoe.spec 1 Mar 2006 12:48:11 -0000 1.7 @@ -60,7 +60,6 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog %{_libdir}/scim-1.0/*/Helper/tomoe.so -%{_libdir}/scim-1.0/*/SetupUI/tomoe-setup.so %{_datadir}/scim/icons/scim-tomoe.png From fedora-extras-commits at redhat.com Wed Mar 1 12:57:32 2006 From: fedora-extras-commits at redhat.com (Christian Nolte (noltec)) Date: Wed, 1 Mar 2006 07:57:32 -0500 Subject: rpms/kbibtex/devel kbibtex.spec,1.1,1.2 Message-ID: <200603011258.k21Cw4PG011625@cvs-int.fedora.redhat.com> Author: noltec Update of /cvs/extras/rpms/kbibtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11608 Modified Files: kbibtex.spec Log Message: Rebuild for Fedora Extras 5 Index: kbibtex.spec =================================================================== RCS file: /cvs/extras/rpms/kbibtex/devel/kbibtex.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kbibtex.spec 12 Jan 2006 08:03:21 -0000 1.1 +++ kbibtex.spec 1 Mar 2006 12:57:32 -0000 1.2 @@ -1,6 +1,6 @@ Name: kbibtex Version: 0.1.3 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A BibTeX editor for KDE Group: Applications/Editors @@ -116,6 +116,9 @@ %{_datadir}/applications/fedora-kbibtex_part.desktop %changelog +* Wed Mar 01 2005 Christian Nolte - 0.1.3-4 +- Rebuild for Fedora Extras 5 + * Fri Dec 23 2005 Christian Nolte - 0.1.3-3 - Patch to resolve an error when this package is compiled with gcc 4.1.0 From fedora-extras-commits at redhat.com Wed Mar 1 12:59:06 2006 From: fedora-extras-commits at redhat.com (Christian Nolte (noltec)) Date: Wed, 1 Mar 2006 07:59:06 -0500 Subject: rpms/kbibtex/devel kbibtex.spec,1.2,1.3 Message-ID: <200603011259.k21Cxd16011668@cvs-int.fedora.redhat.com> Author: noltec Update of /cvs/extras/rpms/kbibtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11651 Modified Files: kbibtex.spec Log Message: Corrected wrong year in Changelog Index: kbibtex.spec =================================================================== RCS file: /cvs/extras/rpms/kbibtex/devel/kbibtex.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kbibtex.spec 1 Mar 2006 12:57:32 -0000 1.2 +++ kbibtex.spec 1 Mar 2006 12:59:06 -0000 1.3 @@ -116,7 +116,7 @@ %{_datadir}/applications/fedora-kbibtex_part.desktop %changelog -* Wed Mar 01 2005 Christian Nolte - 0.1.3-4 +* Wed Mar 01 2006 Christian Nolte - 0.1.3-4 - Rebuild for Fedora Extras 5 * Fri Dec 23 2005 Christian Nolte - 0.1.3-3 From fedora-extras-commits at redhat.com Wed Mar 1 14:05:42 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 09:05:42 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.7,1.8 Message-ID: <200603011406.k21E6Igb015834@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15816 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scim-tomoe.spec 1 Mar 2006 12:48:11 -0000 1.7 +++ scim-tomoe.spec 1 Mar 2006 14:05:41 -0000 1.8 @@ -8,7 +8,7 @@ Group: System Environment/Libraries License: GPL URL: http://scim-imengine.sourceforge.jp/ -Source0: %{name}-%{version}.tar.gz +Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk-devel From fedora-extras-commits at redhat.com Wed Mar 1 14:41:15 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 09:41:15 -0500 Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.8,1.9 Message-ID: <200603011441.k21Efmd4016032@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16014 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-tomoe.spec 1 Mar 2006 14:05:41 -0000 1.8 +++ scim-tomoe.spec 1 Mar 2006 14:41:15 -0000 1.9 @@ -2,7 +2,7 @@ Name: scim-tomoe Version: 0.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -64,7 +64,7 @@ %changelog -* Wed Mar 1 2006 Ryo Dairiki - 0.2-2 +* Wed Mar 1 2006 Ryo Dairiki - 0.2-3 - update to 0.2 * Mon Feb 13 2006 Jens Petersen - 0.1.0-3 From fedora-extras-commits at redhat.com Wed Mar 1 15:48:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:48:21 -0500 Subject: rpms/kipi-plugins/devel kipi-plugins.spec,1.11,1.12 Message-ID: <200603011548.k21FmsiG018521@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kipi-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18486 Modified Files: kipi-plugins.spec Log Message: - fc5: workaround gphoto2 bug (#183367) Index: kipi-plugins.spec =================================================================== RCS file: /cvs/extras/rpms/kipi-plugins/devel/kipi-plugins.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- kipi-plugins.spec 10 Feb 2006 14:40:46 -0000 1.11 +++ kipi-plugins.spec 1 Mar 2006 15:48:21 -0000 1.12 @@ -4,7 +4,7 @@ Name: kipi-plugins Summary: Plugins to use with Kipi Version: 0.1.0 -Release: 0.6.%{beta}%{?dist} +Release: 0.6.%{beta}%{?dist}.1 License: LGPL Group: Applications/Multimedia @@ -15,10 +15,14 @@ BuildRequires: gettext BuildRequires: libkipi-devel >= 0.1.2 BuildRequires: libkexif-devel >= 0.2.1 -BuildRequires: gphoto2-devel >= 2.0.0 BuildRequires: imlib2-devel >= 1.1.0 BuildRequires: kdelibs-devel >= 6:3.4 BuildRequires: libGL-devel +BuildRequires: gphoto2-devel +# Workaround gphoto2 dep bug (#183367) +%if "%{?fedora}" > "4" +BuildRequires: libtool-ltdl-devel +%endif ## (mostly) Essential Requires: ImageMagick @@ -135,6 +139,7 @@ * Fri Feb 10 2006 Rex Dieter 0.1.1-0.6.rc1 - BR: libGL-devel - fc5: gcc/glibc respin +- fc5: workaround gphoto2 bug (#183367) * Thu Nov 10 2005 Rex Dieter 0.1.1-0.5.rc1 - fix symlinks From fedora-extras-commits at redhat.com Wed Mar 1 15:52:51 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:52:51 -0500 Subject: rpms/uw-imap/devel uw-imap.spec,1.7,1.8 Message-ID: <200603011553.k21FrN68018591@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/uw-imap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18574 Modified Files: uw-imap.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: uw-imap.spec =================================================================== RCS file: /cvs/extras/rpms/uw-imap/devel/uw-imap.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- uw-imap.spec 10 Feb 2006 13:05:16 -0000 1.7 +++ uw-imap.spec 1 Mar 2006 15:52:51 -0000 1.8 @@ -6,7 +6,7 @@ Summary: UW Server daemons for IMAP and POP network mail protocols Name: uw-imap Version: 2004g -Release: 4%{?dist}.1 +Release: 4%{?dist}.2 License: University of Washington Free-Fork License Group: System Environment/Daemons @@ -271,7 +271,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 17 2005 Rex Dieter 2004g-4 From fedora-extras-commits at redhat.com Wed Mar 1 15:54:10 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:54:10 -0500 Subject: rpms/gc/devel gc.spec,1.16,1.17 Message-ID: <200603011554.k21Fsgec018652@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18635 Modified Files: gc.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gc.spec 10 Feb 2006 13:15:41 -0000 1.16 +++ gc.spec 1 Mar 2006 15:54:09 -0000 1.17 @@ -3,7 +3,7 @@ Name: gc Version: 6.6 -Release: 5%{?dist} +Release: 5%{?dist}.1 Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ @@ -101,6 +101,9 @@ %changelog +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + * Fri Feb 10 2006 Rex Dieter 6.6-5 - gcc(4.1) patch From fedora-extras-commits at redhat.com Wed Mar 1 15:55:08 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:55:08 -0500 Subject: rpms/xforms/devel xforms.spec,1.16,1.17 Message-ID: <200603011555.k21FtfKU018713@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/xforms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18696 Modified Files: xforms.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: xforms.spec =================================================================== RCS file: /cvs/extras/rpms/xforms/devel/xforms.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xforms.spec 10 Feb 2006 13:07:28 -0000 1.16 +++ xforms.spec 1 Mar 2006 15:55:08 -0000 1.17 @@ -2,7 +2,7 @@ Name: xforms Summary: XForms toolkit library Version: 1.0.90 -Release: 6%{?dist}.1 +Release: 6%{?dist}.2 License: LGPL Group: System Environment/Libraries @@ -95,7 +95,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Fri Jan 20 2006 Rex Dieter 1.0.90-6 From fedora-extras-commits at redhat.com Wed Mar 1 15:56:04 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:56:04 -0500 Subject: rpms/pinentry/devel pinentry.spec,1.9,1.10 Message-ID: <200603011556.k21FuapN018774@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/pinentry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18757 Modified Files: pinentry.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: pinentry.spec =================================================================== RCS file: /cvs/extras/rpms/pinentry/devel/pinentry.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- pinentry.spec 10 Feb 2006 13:24:58 -0000 1.9 +++ pinentry.spec 1 Mar 2006 15:56:04 -0000 1.10 @@ -1,7 +1,7 @@ Name: pinentry Version: 0.7.2 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 Summary: Collection of simple PIN or passphrase entry dialogs Group: Applications/System @@ -149,7 +149,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Tue Oct 18 2005 Ville Skytt?? - 0.7.2-1 From fedora-extras-commits at redhat.com Wed Mar 1 15:57:05 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:57:05 -0500 Subject: rpms/openslp/devel openslp.spec,1.12,1.13 Message-ID: <200603011557.k21FvbYo018835@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/openslp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18818 Modified Files: openslp.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: openslp.spec =================================================================== RCS file: /cvs/extras/rpms/openslp/devel/openslp.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- openslp.spec 10 Feb 2006 13:30:19 -0000 1.12 +++ openslp.spec 1 Mar 2006 15:57:04 -0000 1.13 @@ -2,7 +2,7 @@ Summary: Open implementation of Service Location Protocol V2 Name: openslp Version: 1.2.1 -Release: 4%{?dist}.1 +Release: 4%{?dist}.2 Group: System Environment/Libraries License: BSD @@ -140,7 +140,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Dec 19 2005 Rex Dieter 1.2.1-4 From fedora-extras-commits at redhat.com Wed Mar 1 15:59:01 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 10:59:01 -0500 Subject: rpms/tidy/devel tidy.spec,1.16,1.17 Message-ID: <200603011559.k21FxXat018898@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/tidy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18879 Modified Files: tidy.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: tidy.spec =================================================================== RCS file: /cvs/extras/rpms/tidy/devel/tidy.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tidy.spec 15 Feb 2006 15:26:54 -0000 1.16 +++ tidy.spec 1 Mar 2006 15:59:01 -0000 1.17 @@ -4,7 +4,7 @@ Name: tidy Summary: Utility to clean up and pretty print HTML/XHTML/XML Version: 0.99.0 -Release: 9.20051025%{?dist}.2 +Release: 9.20051025%{?dist}.3 Group: Applications/Text License: W3C Software License @@ -112,7 +112,7 @@ %changelog -* Wed Feb 15 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Fri Jan 20 2006 Rex Dieter 0.99.0-9.20051025 From fedora-extras-commits at redhat.com Wed Mar 1 16:00:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:00:06 -0500 Subject: rpms/libsigsegv/devel libsigsegv.spec,1.8,1.9 Message-ID: <200603011600.k21G0cO5018980@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libsigsegv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18963 Modified Files: libsigsegv.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: libsigsegv.spec =================================================================== RCS file: /cvs/extras/rpms/libsigsegv/devel/libsigsegv.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libsigsegv.spec 10 Feb 2006 13:33:04 -0000 1.8 +++ libsigsegv.spec 1 Mar 2006 16:00:06 -0000 1.9 @@ -2,7 +2,7 @@ Summary: Library for handling page faults in user mode Name: libsigsegv Version: 2.2 -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 License: GPL URL: http://libsigsegv.sourceforge.net/ @@ -76,7 +76,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Oct 06 2005 Rex Dieter - 2.2-1 From fedora-extras-commits at redhat.com Wed Mar 1 16:01:04 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:01:04 -0500 Subject: rpms/libksba/devel libksba.spec,1.17,1.18 Message-ID: <200603011601.k21G1bZm020849@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libksba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20539 Modified Files: libksba.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: libksba.spec =================================================================== RCS file: /cvs/extras/rpms/libksba/devel/libksba.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- libksba.spec 10 Feb 2006 13:34:15 -0000 1.17 +++ libksba.spec 1 Mar 2006 16:01:04 -0000 1.18 @@ -1,7 +1,7 @@ Summary: X.509 library Name: libksba Version: 0.9.13 -Release: 2%{?dist}.1 +Release: 2%{?dist}.2 License: GPL Group: System Environment/Libraries URL: http://www.gnupg.org/ @@ -83,7 +83,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Wed Nov 30 2005 Rex Dieter 0.9.13-2 From fedora-extras-commits at redhat.com Wed Mar 1 16:02:10 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:02:10 -0500 Subject: rpms/kdocker/devel kdocker.spec,1.5,1.6 Message-ID: <200603011602.k21G2hMb020922@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdocker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20905 Modified Files: kdocker.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kdocker.spec =================================================================== RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kdocker.spec 10 Feb 2006 13:52:30 -0000 1.5 +++ kdocker.spec 1 Mar 2006 16:02:10 -0000 1.6 @@ -2,7 +2,7 @@ Name: kdocker Summary: Dock any application in the system tray Version: 1.3 -Release: 4%{?dist}.3 +Release: 4%{?dist}.4 Group: User Interface/Desktops License: GPL @@ -104,7 +104,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Sat Jan 21 2006 Rex Dieter 1.3-4 From fedora-extras-commits at redhat.com Wed Mar 1 16:18:05 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:18:05 -0500 Subject: rpms/libtunepimp/devel libtunepimp.spec,1.5,1.6 Message-ID: <200603011618.k21GIbpK021066@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libtunepimp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21049 Modified Files: libtunepimp.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: libtunepimp.spec =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libtunepimp.spec 10 Feb 2006 13:31:36 -0000 1.5 +++ libtunepimp.spec 1 Mar 2006 16:18:04 -0000 1.6 @@ -2,7 +2,7 @@ Summary: A library for creating MusicBrainz enabled tagging applications Name: libtunepimp Version: 0.4.0 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 # README.LGPL implies that it's not completely lgpl, yet. License: GPL Group: System Environment/Libraries @@ -95,7 +95,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Dec 19 2005 Rex Dieter 0.4.0-5 From fedora-extras-commits at redhat.com Wed Mar 1 16:20:55 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:20:55 -0500 Subject: rpms/kxdocker/devel kxdocker.spec,1.4,1.5 Message-ID: <200603011621.k21GLSqt021127@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kxdocker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21110 Modified Files: kxdocker.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kxdocker.spec =================================================================== RCS file: /cvs/extras/rpms/kxdocker/devel/kxdocker.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kxdocker.spec 10 Feb 2006 13:37:58 -0000 1.4 +++ kxdocker.spec 1 Mar 2006 16:20:55 -0000 1.5 @@ -2,7 +2,7 @@ Name: kxdocker Summary: A Mac OSX style docker Version: 0.39 -Release: 3%{?dist}.1 +Release: 3%{?dist}.2 License: GPL Group: User Interface/Desktops @@ -48,8 +48,9 @@ make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --vendor fedora \ --add-category X-Fedora \ --add-category Utility \ --add-category KDE \ @@ -97,13 +98,13 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{_bindir}/* +%{_datadir}/apps/kxdocker/ %{_datadir}/applications/*.desktop -%{_datadir}/apps/kxdocker -%{_datadir}/icons/hicolor/*/*/ +%{_datadir}/icons/hicolor/*/*/* %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 10 2005 Rex Dieter 0.39-3 From fedora-extras-commits at redhat.com Wed Mar 1 16:22:27 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:22:27 -0500 Subject: rpms/kiosktool/devel kiosktool.spec,1.5,1.6 Message-ID: <200603011622.k21GMxsZ021188@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kiosktool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21171 Modified Files: kiosktool.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kiosktool.spec =================================================================== RCS file: /cvs/extras/rpms/kiosktool/devel/kiosktool.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kiosktool.spec 10 Feb 2006 13:43:08 -0000 1.5 +++ kiosktool.spec 1 Mar 2006 16:22:27 -0000 1.6 @@ -2,7 +2,7 @@ Summary: KIOSK administration tool for KDE Name: kiosktool Version: 1.0 -Release: 5%{?dist}.1 +Release: 5%{?dist}.2 License: GPL Group: System Environment/Base @@ -45,8 +45,9 @@ make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ + --vendor fedora \ --add-category X-Fedora \ --add-category Application \ --delete-original \ @@ -84,16 +85,16 @@ %post -touch --no-create %{_datadir}/icons/crystalsvg ||: +touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||: %postun -touch --no-create %{_datadir}/icons/crystalsvg ||: +touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/crystalsvg 2> /dev/null ||: %files -f %{name}.lang -%defattr(-,root,root) +%defattr(-,root,root,-) %doc ChangeLog COPYING README #attr(0511,root,root) %{_bindir}/kiosktool* %{_bindir}/kiosktool* @@ -105,7 +106,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 10 2005 Rex Dieter 1.0-5 From fedora-extras-commits at redhat.com Wed Mar 1 16:24:17 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:24:17 -0500 Subject: rpms/libassuan/devel libassuan.spec,1.12,1.13 Message-ID: <200603011624.k21GOn9e021256@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libassuan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21239 Modified Files: libassuan.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: libassuan.spec =================================================================== RCS file: /cvs/extras/rpms/libassuan/devel/libassuan.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libassuan.spec 10 Feb 2006 13:35:50 -0000 1.12 +++ libassuan.spec 1 Mar 2006 16:24:17 -0000 1.13 @@ -2,7 +2,7 @@ Name: libassuan Summary: GnuPG IPC library Version: 0.6.10 -Release: 2%{?dist}.1 +Release: 2%{?dist}.2 License: LGPL Source0: ftp://ftp.gnupg.org/gcrypt/alpha/libassuan/libassuan-%{version}.tar.gz @@ -76,7 +76,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Jul 4 2005 Michael Schwendt - 0.6.10-2 From fedora-extras-commits at redhat.com Wed Mar 1 16:26:07 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:26:07 -0500 Subject: rpms/kasablanca/devel kasablanca.spec,1.13,1.14 Message-ID: <200603011626.k21GQevO021317@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kasablanca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21300 Modified Files: kasablanca.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kasablanca.spec =================================================================== RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- kasablanca.spec 10 Feb 2006 13:54:44 -0000 1.13 +++ kasablanca.spec 1 Mar 2006 16:26:07 -0000 1.14 @@ -56,13 +56,14 @@ make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --delete-original --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --vendor fedora \ --add-category "X-Fedora" \ --add-category "Network" \ --add-category "Application" \ --add-category "KDE" \ + --delete-original \ $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop ## File lists @@ -115,7 +116,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Jan 19 2006 Rex Dieter 0.4.0.2-7 From fedora-extras-commits at redhat.com Wed Mar 1 16:27:16 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:27:16 -0500 Subject: rpms/kasablanca/devel kasablanca.spec,1.14,1.15 Message-ID: <200603011627.k21GRmML021380@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kasablanca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21358 Modified Files: kasablanca.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kasablanca.spec =================================================================== RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kasablanca.spec 1 Mar 2006 16:26:07 -0000 1.14 +++ kasablanca.spec 1 Mar 2006 16:27:16 -0000 1.15 @@ -2,7 +2,7 @@ Name: kasablanca Summary: Graphical FTP client Version: 0.4.0.2 -Release: 7%{?dist}.2 +Release: 7%{?dist}.3 License: GPL Url: http://kasablanca.berlios.de/ From fedora-extras-commits at redhat.com Wed Mar 1 16:30:23 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:30:23 -0500 Subject: rpms/jasper/devel jasper-1.701.0-GL.patch, 1.2, 1.3 jasper.spec, 1.10, 1.11 Message-ID: <200603011630.k21GUtVv021462@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/jasper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21436 Modified Files: jasper-1.701.0-GL.patch jasper.spec Log Message: * Wed Mar 1 2006 Rex Dieter 1.701.0-10 - support/use geojasper (optional, default no) - fc5: gcc/glibc respin jasper-1.701.0-GL.patch: Index: jasper-1.701.0-GL.patch =================================================================== RCS file: /cvs/extras/rpms/jasper/devel/jasper-1.701.0-GL.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jasper-1.701.0-GL.patch 31 Jan 2006 16:11:35 -0000 1.2 +++ jasper-1.701.0-GL.patch 1 Mar 2006 16:30:23 -0000 1.3 @@ -1,6 +1,6 @@ ---- jasper-1.701.0/configure.GL 2004-02-08 19:44:12.000000000 -0600 -+++ jasper-1.701.0/configure 2005-10-18 08:09:38.000000000 -0500 -@@ -9465,7 +9465,7 @@ +--- jasper-1.701.0.GEO/configure.GL 2006-02-20 20:01:30.000000000 -0600 ++++ jasper-1.701.0.GEO/configure 2006-02-24 07:40:46.000000000 -0600 +@@ -9464,7 +9464,7 @@ OPENGL_LIBS="" if test $ENABLE_OPENGL = yes; then if test $HAVE_OPENGL = no; then @@ -9,3 +9,14 @@ echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 if test "${ac_cv_lib_glut_glutInit+set}" = set; then +--- jasper-1.701.0.GEO/configure.ac.GL 2006-02-20 19:58:02.000000000 -0600 ++++ jasper-1.701.0.GEO/configure.ac 2006-02-24 07:40:38.000000000 -0600 +@@ -242,7 +242,7 @@ + OPENGL_LIBS="" + if test $ENABLE_OPENGL = yes; then + if test $HAVE_OPENGL = no; then +- TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS" ++ TMPLIBS="-lglut" + AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes; + OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS) + fi Index: jasper.spec =================================================================== RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jasper.spec 10 Feb 2006 13:56:56 -0000 1.10 +++ jasper.spec 1 Mar 2006 16:30:23 -0000 1.11 @@ -5,19 +5,30 @@ # koffice # netpbm +# define to use GeoJasper +#define geo 1 + Summary: Implementation of the JPEG-2000 standard, Part 1 Name: jasper Group: System Environment/Libraries Version: 1.701.0 -Release: 9%{?dist}.1 +Release: 10%{?dist} License: JasPer License Version 2.0 +%if "%{?geo:1}" == "1" +%define geojasper_ver 1.2.9 +URL: http://www.dimin.net/software/utils.html +Source: http://dimin.m6.net/software/utils/geojasper_src.zip +Provides: geojasper = %{geojasper_ver} +%else URL: http://www.ece.uvic.ca/~mdadams/jasper/ Source: http://www.ece.uvic.ca/~mdadams/jasper/software/jasper-1.701.0.zip +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: jasper-1.701.0-GL.patch +BuildRequires: automake BuildRequires: libjpeg-devel BuildRequires: freeglut-devel # workaround: @@ -40,12 +51,22 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}%{?geo:.GEO} %patch1 -p1 -b .GL +%if "%{?geo:1}" == "1" +chmod +x configure configure.ac +libtoolize --force +aclocal +autoconf +autoheader +automake -a +%endif + %build + %configure \ --enable-shared \ --disable-static @@ -67,10 +88,6 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/%{_target_platform}* rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la -# avoid conflict(s) with tomcat -# not needed anymore, see bz #176773 -# mv $RPM_BUILD_ROOT%{_bindir}/jasper $RPM_BUILD_ROOT%{_bindir}/jaspertool - %files %defattr(-,root,root) @@ -78,13 +95,13 @@ %{_bindir}/imgcmp %{_bindir}/jiv %{_bindir}/imginfo -%{_bindir}/jasper* +%{_bindir}/*jasper* %{_libdir}/lib*.so.* %files devel %defattr(-,root,root) %doc doc/* -%{_includedir}/* +%{_includedir}/jasper/ %{_libdir}/lib*.so @@ -98,6 +115,10 @@ %changelog +* Wed Mar 1 2006 Rex Dieter 1.701.0-10 +- support/use geojasper (optional, default no) +- fc5: gcc/glibc respin + * Fri Feb 10 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Wed Mar 1 16:35:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:35:06 -0500 Subject: rpms/kickpim/devel kickpim.spec,1.14,1.15 Message-ID: <200603011635.k21GZdpS021595@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kickpim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21577 Modified Files: kickpim.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kickpim.spec =================================================================== RCS file: /cvs/extras/rpms/kickpim/devel/kickpim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- kickpim.spec 10 Feb 2006 13:50:59 -0000 1.14 +++ kickpim.spec 1 Mar 2006 16:35:06 -0000 1.15 @@ -2,7 +2,7 @@ Name: kickpim Summary: KDE kicker applet to access addressbook Version: 0.5.3 -Release: 9%{?dist}.2 +Release: 9%{?dist}.3 License: GPL Group: Applications/Productivity @@ -90,7 +90,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Fri Nov 04 2005 Rex Dieter 0.5.3-9 From fedora-extras-commits at redhat.com Wed Mar 1 16:36:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:36:24 -0500 Subject: rpms/gift-openft/devel gift-openft.spec,1.2,1.3 Message-ID: <200603011636.k21Gau7s021658@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gift-openft/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21640 Modified Files: gift-openft.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: gift-openft.spec =================================================================== RCS file: /cvs/extras/rpms/gift-openft/devel/gift-openft.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gift-openft.spec 10 Feb 2006 14:04:16 -0000 1.2 +++ gift-openft.spec 1 Mar 2006 16:36:23 -0000 1.3 @@ -2,7 +2,7 @@ Summary: Openft plugin for giFT Name: gift-openft Version: 0.2.1.6 -Release: 2%{?dist}.1 +Release: 2%{?dist}.2 License: GPL Group: System Environment/Libraries @@ -50,7 +50,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Dec 19 2005 Rex Dieter Author: rdieter Update of /cvs/extras/rpms/kile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21705 Modified Files: kile.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kile.spec =================================================================== RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- kile.spec 10 Feb 2006 13:46:21 -0000 1.23 +++ kile.spec 1 Mar 2006 16:37:43 -0000 1.24 @@ -2,7 +2,7 @@ Name: kile Summary: (La)TeX source editor and TeX shell Version: 1.8.1 -Release: 7%{?dist}.1 +Release: 7%{?dist}.2 License: GPL Group: Applications/Publishing @@ -125,7 +125,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 10 2005 Rex Dieter 1.8.3-7 From fedora-extras-commits at redhat.com Wed Mar 1 16:39:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:39:03 -0500 Subject: rpms/dxpc/devel dxpc.spec,1.9,1.10 Message-ID: <200603011639.k21GdZU6021795@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/dxpc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21777 Modified Files: dxpc.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: dxpc.spec =================================================================== RCS file: /cvs/extras/rpms/dxpc/devel/dxpc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dxpc.spec 10 Feb 2006 14:14:03 -0000 1.9 +++ dxpc.spec 1 Mar 2006 16:39:03 -0000 1.10 @@ -2,7 +2,7 @@ Summary: Differential X Protocol Compressor Name: dxpc Version: 3.8.2 -Release: 3%{?dist}.1 +Release: 3%{?dist}.2 License: BSD Group: User Interface/X @@ -54,7 +54,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Jan 30 2006 Rex Dieter 3.8.2-3 From fedora-extras-commits at redhat.com Wed Mar 1 16:40:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:40:36 -0500 Subject: rpms/gift/devel gift.spec,1.3,1.4 Message-ID: <200603011641.k21Gf8Nm021858@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gift/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21841 Modified Files: gift.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: gift.spec =================================================================== RCS file: /cvs/extras/rpms/gift/devel/gift.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gift.spec 10 Feb 2006 14:02:30 -0000 1.3 +++ gift.spec 1 Mar 2006 16:40:36 -0000 1.4 @@ -10,7 +10,7 @@ Name: gift Summary: Daemon for communicating with filesharing protocols Version: 0.11.8.1 -Release: 4%{?dist}.1 +Release: 4%{?dist}.2 License: GPL Group: System Environment/Daemons @@ -24,7 +24,7 @@ Source1: giftd.sh BuildRequires: libtool -%if "%{?fedora}" >= "4" +%if "%{?fedora}" > "3" BuildRequires: libtool-ltdl-devel %endif BuildRequires: libvorbis-devel @@ -101,7 +101,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Fri Jan 06 2006 Rex Dieter 0.11.8.1-4 From fedora-extras-commits at redhat.com Wed Mar 1 16:42:07 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:42:07 -0500 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.18,1.19 Message-ID: <200603011642.k21Ggegn021931@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21909 Modified Files: gtk-qt-engine.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gtk-qt-engine.spec 10 Feb 2006 13:58:16 -0000 1.18 +++ gtk-qt-engine.spec 1 Mar 2006 16:42:07 -0000 1.19 @@ -6,7 +6,7 @@ Name: gtk-qt-engine Group: User Interface/Desktops Version: 0.60 -Release: 7%{?dist}.1 +Release: 7%{?dist}.2 License: GPL URL: http://www.freedesktop.org/Software/gtk-qt @@ -109,7 +109,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Mon Jan 23 2006 Rex Dieter 0.60-7 From fedora-extras-commits at redhat.com Wed Mar 1 16:43:57 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:43:57 -0500 Subject: rpms/apollon/devel apollon.spec,1.3,1.4 Message-ID: <200603011644.k21GiTtd022007@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/apollon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21989 Modified Files: apollon.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: apollon.spec =================================================================== RCS file: /cvs/extras/rpms/apollon/devel/apollon.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- apollon.spec 10 Feb 2006 14:24:02 -0000 1.3 +++ apollon.spec 1 Mar 2006 16:43:57 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Filesharing client Name: apollon Version: 1.0.1 -Release: 4%{?dist}.1 +Release: 4%{?dist}.2 License: GPL Group: Applications/Internet @@ -110,7 +110,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Jan 26 2006 Rex Dieter 1.0.1-4 From fedora-extras-commits at redhat.com Wed Mar 1 16:45:29 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:45:29 -0500 Subject: rpms/geomview/devel geomview.spec,1.7,1.8 Message-ID: <200603011646.k21Gk1RE022076@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/geomview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22059 Modified Files: geomview.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: geomview.spec =================================================================== RCS file: /cvs/extras/rpms/geomview/devel/geomview.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- geomview.spec 10 Feb 2006 14:06:29 -0000 1.7 +++ geomview.spec 1 Mar 2006 16:45:28 -0000 1.8 @@ -9,7 +9,7 @@ Name: geomview Summary: Interactive 3D viewing program Version: 1.8.2 -Release: 0.2.cvs%{cvs}%{?dist}.2 +Release: 0.2.cvs%{cvs}%{?dist}.3 License: LGPL Url: http://www.geomview.org/ @@ -249,7 +249,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Tue Jan 03 2006 Rex Dieter 1.8.2-0.2.cvs20040221 From fedora-extras-commits at redhat.com Wed Mar 1 16:46:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:46:28 -0500 Subject: rpms/gpgme/devel gpgme.spec,1.13,1.14 Message-ID: <200603011647.k21Gl0Qe022137@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22120 Modified Files: gpgme.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gpgme.spec 10 Feb 2006 14:25:12 -0000 1.13 +++ gpgme.spec 1 Mar 2006 16:46:28 -0000 1.14 @@ -2,7 +2,7 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API Version: 1.1.0 -Release: 3%{?dist}.1 +Release: 3%{?dist}.2 License: LGPL Group: Applications/System @@ -99,7 +99,7 @@ %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Wed Nov 30 2005 Rex Dieter - 1.1.0-3 From fedora-extras-commits at redhat.com Wed Mar 1 16:49:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 11:49:03 -0500 Subject: rpms/kimdaba/devel kimdaba.spec,1.5,1.6 Message-ID: <200603011649.k21GnZaP022206@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kimdaba/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22183 Modified Files: kimdaba.spec Log Message: * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: kimdaba.spec =================================================================== RCS file: /cvs/extras/rpms/kimdaba/devel/kimdaba.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kimdaba.spec 10 Feb 2006 13:45:23 -0000 1.5 +++ kimdaba.spec 1 Mar 2006 16:49:02 -0000 1.6 @@ -2,7 +2,7 @@ Summary: KDE Image Database Name: kimdaba Version: 2.1 -Release: 6%{?dist}.1 +Release: 6%{?dist}.2 License: GPL Group: Applications/Multimedia @@ -101,14 +101,14 @@ %defattr(-,root,root) %doc ChangeLog COPYING README TODO %{_bindir}/* +%{_datadir}/apps/kimdaba/ %{_datadir}/applications/*.desktop -%{_datadir}/apps/%{name} %{_datadir}/icons/hicolor/*/*/* %{_datadir}/mimelnk/*/*.desktop %changelog -* Fri Feb 10 2006 Rex Dieter +* Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin * Thu Nov 10 2005 Rex Dieter 2.1-6 From fedora-extras-commits at redhat.com Wed Mar 1 17:04:56 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Wed, 1 Mar 2006 12:04:56 -0500 Subject: owners owners.list,1.689,1.690 Message-ID: <200603011705.k21H5SZ1024252@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24230 Modified Files: owners.list Log Message: ownership of xmms-cdread to fedora_AT_soeterbroek.com Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.689 retrieving revision 1.690 diff -u -r1.689 -r1.690 --- owners.list 1 Mar 2006 07:36:52 -0000 1.689 +++ owners.list 1 Mar 2006 17:04:55 -0000 1.690 @@ -1470,7 +1470,7 @@ 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-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|extras-orphan at fedoraproject.org|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-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 Wed Mar 1 17:07:38 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Wed, 1 Mar 2006 12:07:38 -0500 Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.7,1.8 Message-ID: <200603011708.k21H8BK5024328@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24297 Modified Files: xmms-cdread.spec Log Message: Rebuild for Fedora Extras 5 Index: xmms-cdread.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xmms-cdread.spec 22 May 2005 23:53:12 -0000 1.7 +++ xmms-cdread.spec 1 Mar 2006 17:07:38 -0000 1.8 @@ -4,7 +4,7 @@ Summary: Digital audio CD input plugin for XMMS Name: xmms-cdread Version: 0.14 -Release: 6.a +Release: 7 License: GPL Group: Applications/Multimedia @@ -54,6 +54,9 @@ %changelog +* Wed Mar 1 2006 Joost Soeterbroek - 0.14-7 +- Rebuild for Fedora Extras 5 + * Sun May 22 2005 Jeremy Katz - 0.14-6.a - rebuild on all arches From fedora-extras-commits at redhat.com Wed Mar 1 17:23:33 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Wed, 1 Mar 2006 12:23:33 -0500 Subject: rpms/tktable/devel tktable.spec,1.16,1.17 Message-ID: <200603011724.k21HO50T024597@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/tktable/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24575 Modified Files: tktable.spec Log Message: fixed problem in configuration stage Index: tktable.spec =================================================================== RCS file: /cvs/extras/rpms/tktable/devel/tktable.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tktable.spec 28 Feb 2006 21:03:38 -0000 1.16 +++ tktable.spec 1 Mar 2006 17:23:33 -0000 1.17 @@ -1,7 +1,7 @@ Summary: Table/matrix widget extension to Tcl/Tk Name: tktable Version: 2.9 -Release: 8%{?dist} +Release: 9%{?dist} License: BSD-like Group: Development/Libraries Source: http://download.sourceforge.net/tktable/Tktable2.9.tar.gz @@ -22,6 +22,10 @@ %setup -q -n Tktable%version %build +# fix problem with the tcl.m4 file that came with earlier versions +# of Tcl (quoting bug in the file that was not exposed until bash +# 3.1 was packaged with FC5) +sed -i -e "s,relid',relid," configure %configure --with-tcl=%_libdir --with-tk=%_libdir --x-libraries=%_libdir --x-includes=%_includedir/X11 make %{?_smp_mflags} @@ -45,6 +49,9 @@ %changelog +* Tue Mar 1 2006 Jean-Luc Fontaine 2.9-9 +- fixed problem in configuration stage + * Tue Feb 28 2006 Jean-Luc Fontaine 2.9-8 - specified X11 includes path in configuration From fedora-extras-commits at redhat.com Wed Mar 1 18:12:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 13:12:28 -0500 Subject: rpms/jasper/devel jasper-1.701.0-GL.patch, 1.3, 1.4 jasper.spec, 1.11, 1.12 Message-ID: <200603011813.k21IDQae026952@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/jasper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26928 Modified Files: jasper-1.701.0-GL.patch jasper.spec Log Message: * Wed Mar 1 2006 Rex Dieter 1.701.0-11 - fixup build issues introduced by geojasper integration jasper-1.701.0-GL.patch: Index: jasper-1.701.0-GL.patch =================================================================== RCS file: /cvs/extras/rpms/jasper/devel/jasper-1.701.0-GL.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- jasper-1.701.0-GL.patch 1 Mar 2006 16:30:23 -0000 1.3 +++ jasper-1.701.0-GL.patch 1 Mar 2006 18:12:26 -0000 1.4 @@ -9,14 +9,3 @@ echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5 echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6 if test "${ac_cv_lib_glut_glutInit+set}" = set; then ---- jasper-1.701.0.GEO/configure.ac.GL 2006-02-20 19:58:02.000000000 -0600 -+++ jasper-1.701.0.GEO/configure.ac 2006-02-24 07:40:38.000000000 -0600 -@@ -242,7 +242,7 @@ - OPENGL_LIBS="" - if test $ENABLE_OPENGL = yes; then - if test $HAVE_OPENGL = no; then -- TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS" -+ TMPLIBS="-lglut" - AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes; - OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS) - fi Index: jasper.spec =================================================================== RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- jasper.spec 1 Mar 2006 16:30:23 -0000 1.11 +++ jasper.spec 1 Mar 2006 18:12:26 -0000 1.12 @@ -12,7 +12,7 @@ Name: jasper Group: System Environment/Libraries Version: 1.701.0 -Release: 10%{?dist} +Release: 11%{?dist} License: JasPer License Version 2.0 %if "%{?geo:1}" == "1" @@ -27,6 +27,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: jasper-1.701.0-GL.patch +# autoconf/automake bits of patch1 +Patch2: jasper-1.701.0-GL-ac.patch BuildRequires: automake BuildRequires: libjpeg-devel @@ -57,6 +59,7 @@ %if "%{?geo:1}" == "1" chmod +x configure configure.ac +%patch2 -p1 -b .GL-ac libtoolize --force aclocal autoconf @@ -115,6 +118,9 @@ %changelog +* Wed Mar 1 2006 Rex Dieter 1.701.0-11 +- fixup build issues introduced by geojasper integration + * Wed Mar 1 2006 Rex Dieter 1.701.0-10 - support/use geojasper (optional, default no) - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Wed Mar 1 18:16:10 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 13:16:10 -0500 Subject: rpms/jasper/devel jasper-1.701.0-GL-ac.patch, NONE, 1.1 jasper.spec, 1.12, 1.13 Message-ID: <200603011816.k21IGhR1027032@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/jasper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27007 Modified Files: jasper.spec Added Files: jasper-1.701.0-GL-ac.patch Log Message: add missing patch, Release++ jasper-1.701.0-GL-ac.patch: --- NEW FILE jasper-1.701.0-GL-ac.patch --- --- jasper-1.701.0.GEO/configure.ac.GL 2006-02-20 19:58:02.000000000 -0600 +++ jasper-1.701.0.GEO/configure.ac 2006-02-24 07:40:38.000000000 -0600 @@ -242,7 +242,7 @@ OPENGL_LIBS="" if test $ENABLE_OPENGL = yes; then if test $HAVE_OPENGL = no; then - TMPLIBS="-lglut -lGL -lGLU $X_PRE_LIBS -lX11 -lXmu -lXi -lXext -lXt $X_EXTRA_LIBS $X_LIBS" + TMPLIBS="-lglut" AC_CHECK_LIB(glut, glutInit, [HAVE_OPENGL=yes; OPENGL_LIBS=$TMPLIBS], HAVE_OPENGL=no, $TMPLIBS) fi Index: jasper.spec =================================================================== RCS file: /cvs/extras/rpms/jasper/devel/jasper.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- jasper.spec 1 Mar 2006 18:12:26 -0000 1.12 +++ jasper.spec 1 Mar 2006 18:16:10 -0000 1.13 @@ -12,7 +12,7 @@ Name: jasper Group: System Environment/Libraries Version: 1.701.0 -Release: 11%{?dist} +Release: 12%{?dist} License: JasPer License Version 2.0 %if "%{?geo:1}" == "1" @@ -118,7 +118,7 @@ %changelog -* Wed Mar 1 2006 Rex Dieter 1.701.0-11 +* Wed Mar 1 2006 Rex Dieter 1.701.0-12 - fixup build issues introduced by geojasper integration * Wed Mar 1 2006 Rex Dieter 1.701.0-10 From fedora-extras-commits at redhat.com Wed Mar 1 18:49:01 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 1 Mar 2006 13:49:01 -0500 Subject: rpms/galeon/FC-4 .cvsignore, 1.5, 1.6 galeon.spec, 1.19, 1.20 sources, 1.7, 1.8 Message-ID: <200603011849.k21InXkV027294@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27265 Modified Files: .cvsignore galeon.spec sources Log Message: Update to 2.0.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Nov 2005 22:43:13 -0000 1.5 +++ .cvsignore 1 Mar 2006 18:49:01 -0000 1.6 @@ -1 +1 @@ -galeon-2.0.0.tar.bz2 +galeon-2.0.1.tar.bz2 Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- galeon.spec 28 Nov 2005 22:43:13 -0000 1.19 +++ galeon.spec 1 Mar 2006 18:49:01 -0000 1.20 @@ -1,6 +1,6 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon -Version: 2.0.0 +Version: 2.0.1 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -101,6 +101,9 @@ %changelog +* Wed Mar 1 2006 Denis Leroy - 2.0.1-1 +- Update to 2.0.1 + * Mon Nov 28 2005 Denis Leroy - 2.0.0-1 - Update to 2.0.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Nov 2005 22:43:13 -0000 1.7 +++ sources 1 Mar 2006 18:49:01 -0000 1.8 @@ -1 +1 @@ -e1f1e46d40c9e2345c1ea5e9bc788244 galeon-2.0.0.tar.bz2 +34d6e3a6ee78f9e4d12736e5d81b462b galeon-2.0.1.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 19:21:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 1 Mar 2006 14:21:03 -0500 Subject: rpms/gtk-qt-engine/devel gtk-qt-engine.spec,1.19,1.20 Message-ID: <200603011921.k21JLZQp029535@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gtk-qt-engine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29518 Modified Files: gtk-qt-engine.spec Log Message: * Wed Mar 1 2006 Rex Dieter 0.60-8 - Unpackaged file %_libdir/menu -> %_prefix/lib/menu Index: gtk-qt-engine.spec =================================================================== RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- gtk-qt-engine.spec 1 Mar 2006 16:42:07 -0000 1.19 +++ gtk-qt-engine.spec 1 Mar 2006 19:21:02 -0000 1.20 @@ -6,7 +6,7 @@ Name: gtk-qt-engine Group: User Interface/Desktops Version: 0.60 -Release: 7%{?dist}.2 +Release: 8%{?dist} License: GPL URL: http://www.freedesktop.org/Software/gtk-qt @@ -90,8 +90,7 @@ %find_lang gtkqtengine || touch gtkqtengine.lang # Unpackaged files -rm -rf $RPM_BUILD_ROOT%{_libdir}/menu - +rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/menu %clean rm -rf $RPM_BUILD_ROOT @@ -109,6 +108,9 @@ %changelog +* Wed Mar 1 2006 Rex Dieter 0.60-8 +- Unpackaged file %%_libdir/menu -> %%_prefix/lib/menu + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Wed Mar 1 20:14:17 2006 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Wed, 1 Mar 2006 15:14:17 -0500 Subject: rpms/libesmtp/devel libesmtp.spec,1.5,1.6 Message-ID: <200603012014.k21KEoFI031668@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/libesmtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31647 Modified Files: libesmtp.spec Log Message: - rebuild for FE 5. Index: libesmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/libesmtp.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libesmtp.spec 4 Dec 2005 12:45:56 -0000 1.5 +++ libesmtp.spec 1 Mar 2006 20:14:16 -0000 1.6 @@ -3,7 +3,7 @@ Summary: SMTP client library Name: libesmtp Version: 1.0.3r1 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2 @@ -87,6 +87,9 @@ %{_libdir}/libesmtp.a %changelog +* Wed Mar 1 2006 Pawel Salek - 1.0.3r1-8 +- Rebuild for Fedora Extras 5 + * Sun Dec 4 2005 Pawel Salek - 1.0.3r1-7 - Fix bug 173332 completely, including licence issues. From fedora-extras-commits at redhat.com Wed Mar 1 20:29:04 2006 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Wed, 1 Mar 2006 15:29:04 -0500 Subject: rpms/balsa/devel .cvsignore, 1.11, 1.12 balsa.spec, 1.14, 1.15 sources, 1.11, 1.12 Message-ID: <200603012029.k21KTblo031874@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/balsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31848 Modified Files: .cvsignore balsa.spec sources Log Message: - update to upstream version 2.3.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 29 Jan 2006 13:45:29 -0000 1.11 +++ .cvsignore 1 Mar 2006 20:29:04 -0000 1.12 @@ -1,2 +1,2 @@ +balsa-2.3.11.tar.bz2 gmime-2.1.17.tar.bz2 -balsa-2.3.10.tar.bz2 Index: balsa.spec =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- balsa.spec 29 Jan 2006 13:45:29 -0000 1.14 +++ balsa.spec 1 Mar 2006 20:29:04 -0000 1.15 @@ -1,8 +1,7 @@ -%define gmimever 2.1.17 %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell Name: balsa -Version: 2.3.10 +Version: 2.3.11 Release: 1%{?dist} Summary: Mail Client @@ -10,13 +9,13 @@ License: GPL URL: http://balsa.gnome.org/ Source0: http://balsa.gnome.org/%{name}-%{version}.tar.bz2 -Source1: http://balsa.gnome.org/gmime-%{gmimever}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: libesmtp >= 1.0.3 Requires: scrollkeeper BuildRequires: aspell-devel BuildRequires: desktop-file-utils +BuildRequires: gmime-devel BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel BuildRequires: gtkhtml2-devel @@ -39,13 +38,10 @@ and printing messages. %prep -%setup -q -D -a 1 +%setup -q %build -dir=`pwd`; cd gmime-%{gmimever} && ./configure --prefix=`pwd` --disable-gtk-doc --disable-shared && make install; cd $dir -export PKG_CONFIG_PATH="gmime-%{gmimever}:$PKG_CONFIG_PATH" - %configure %{config_opts} make %{?_smp_mflags} @@ -103,6 +99,9 @@ %changelog +* Wed Mar 1 2006 Pawel Salek - 2.3.11-1 +- update to upstream version 2.3.11. + * Sun Jan 29 2006 Pawel Salek - 2.3.10-1 - update to upstream 2.3.10 @@ -121,7 +120,7 @@ * Wed Oct 19 2005 Pawel Salek - 2.3.5 - update to upstream version 2.3.5 -* Tue Jul 5 2005 Pawel Salek - 2.3.4 +* Tue Jul 5 2005 Pawel Salek - 2.3.4 - update to upstream version 2.3.4 * Tue Jun 14 2005 Pawel Salek - 2.3.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 29 Jan 2006 13:45:29 -0000 1.11 +++ sources 1 Mar 2006 20:29:04 -0000 1.12 @@ -1,2 +1,2 @@ +a00f9d235b1ae9e7736fb0a0f4a38e82 balsa-2.3.11.tar.bz2 4be55ee55e4b3966bd51fadbf5fb323b gmime-2.1.17.tar.bz2 -55900922195886be867cd5060548ff7f balsa-2.3.10.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 1 22:00:32 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Wed, 1 Mar 2006 17:00:32 -0500 Subject: rpms/fetchlog/devel .cvsignore,1.5,1.6 sources,1.6,1.7 Message-ID: <200603012201.k21M14bg001944@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1910 Modified Files: .cvsignore sources Log Message: sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Feb 2006 20:28:11 -0000 1.5 +++ .cvsignore 1 Mar 2006 22:00:31 -0000 1.6 @@ -1 +1,2 @@ fetchlog-1.0.tar.gz +fetchlog-build.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 20 Feb 2006 20:28:11 -0000 1.6 +++ sources 1 Mar 2006 22:00:31 -0000 1.7 @@ -1 +1,2 @@ e2ef0a076d1901c489c953fe48e1b2a9 fetchlog-1.0.tar.gz +99228569b122b994b1ab83148a3bd261 fetchlog-build.patch From fedora-extras-commits at redhat.com Wed Mar 1 22:25:44 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 1 Mar 2006 17:25:44 -0500 Subject: rpms/xpilot-ng/FC-4 xpilot-ng.logrotate,1.1,1.2 Message-ID: <200603012226.k21MQGH1003980@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3954 Modified Files: xpilot-ng.logrotate Log Message: Fix typo. Index: xpilot-ng.logrotate =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng.logrotate,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng.logrotate 1 Mar 2006 04:51:17 -0000 1.1 +++ xpilot-ng.logrotate 1 Mar 2006 22:25:43 -0000 1.2 @@ -1,4 +1,4 @@ -/var/log/xpilotd.log { +/var/log/xpilot.log { copytruncate notifempty missingok From fedora-extras-commits at redhat.com Wed Mar 1 23:15:07 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Mar 2006 18:15:07 -0500 Subject: rpms/rekall/FC-3 rekall.spec,1.9,1.10 Message-ID: <200603012315.k21NFgaF006019@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5970/FC-3 Modified Files: rekall.spec Log Message: Fix x86_64 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rekall.spec 1 Mar 2006 00:03:15 -0000 1.9 +++ rekall.spec 1 Mar 2006 23:15:06 -0000 1.10 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -108,6 +108,8 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -309,6 +311,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 +- fix x86_64 + * Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 - bump for FC-5 From fedora-extras-commits at redhat.com Wed Mar 1 23:15:13 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Mar 2006 18:15:13 -0500 Subject: rpms/rekall/FC-4 rekall.spec,1.9,1.10 Message-ID: <200603012315.k21NFjgc006022@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5970/FC-4 Modified Files: rekall.spec Log Message: Fix x86_64 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rekall.spec 1 Mar 2006 00:03:34 -0000 1.9 +++ rekall.spec 1 Mar 2006 23:15:13 -0000 1.10 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -108,6 +108,8 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -309,6 +311,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 +- fix x86_64 + * Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 - bump for FC-5 From fedora-extras-commits at redhat.com Wed Mar 1 23:15:19 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 1 Mar 2006 18:15:19 -0500 Subject: rpms/rekall/devel rekall.spec,1.10,1.11 Message-ID: <200603012315.k21NFpKa006025@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5970/devel Modified Files: rekall.spec Log Message: Fix x86_64 Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rekall.spec 1 Mar 2006 00:04:52 -0000 1.10 +++ rekall.spec 1 Mar 2006 23:15:19 -0000 1.11 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -108,6 +108,8 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -309,6 +311,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 +- fix x86_64 + * Tue Feb 28 2006 Tom "spot" Callaway 2.4.0-2 - bump for FC-5 From fedora-extras-commits at redhat.com Wed Mar 1 23:19:33 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 1 Mar 2006 18:19:33 -0500 Subject: rpms/xpilot-ng/devel xpilot-ng.logrotate,1.1,1.2 Message-ID: <200603012320.k21NK5UA006192@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6088 Modified Files: xpilot-ng.logrotate Log Message: Fix typo in log file name Index: xpilot-ng.logrotate =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/xpilot-ng.logrotate,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng.logrotate 1 Mar 2006 04:46:09 -0000 1.1 +++ xpilot-ng.logrotate 1 Mar 2006 23:19:32 -0000 1.2 @@ -1,6 +1,5 @@ -/var/log/xpilotd.log { +/var/log/xpilot.log { copytruncate notifempty missingok - endscript } From fedora-extras-commits at redhat.com Wed Mar 1 23:21:19 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 1 Mar 2006 18:21:19 -0500 Subject: rpms/xpilot-ng/devel xpilot-ng.spec,1.3,1.4 Message-ID: <200603012321.k21NLpfh006215@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6198 Modified Files: xpilot-ng.spec Log Message: Create a special xpilot user to run the server daemon. Index: xpilot-ng.spec =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/devel/xpilot-ng.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xpilot-ng.spec 1 Mar 2006 04:46:09 -0000 1.3 +++ xpilot-ng.spec 1 Mar 2006 23:21:18 -0000 1.4 @@ -1,6 +1,6 @@ Name: xpilot-ng Version: 4.7.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -23,6 +23,9 @@ Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service +Requires(postun): /sbin/service +Requires(pre): fedora-usermgmt +Requires(postun): fedora-usermgmt %description A highly addictive, infinitely configurable multiplayer space @@ -48,12 +51,10 @@ mv xpilot-ng-x11.man.new xpilot-ng-x11.man popd - %build CFLAGS="$RPM_OPT_FLAGS" %configure make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -96,6 +97,11 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%pre server +/usr/sbin/fedora-groupadd 25 -r xpilot &>/dev/null || : +/usr/sbin/fedora-useradd 25 -r -s /sbin/nologin -d /usr/share/xpilot-ng -M \ + -c 'XPilot Server' -g xpilot xpilot >/dev/null || : + %post server /sbin/chkconfig --add xpilot-ng-server @@ -109,6 +115,8 @@ if [ "$1" -ge "1" ]; then /sbin/service xpilot-ng-server restart >/dev/null 2>&1 fi +test "$1" != 0 || /usr/sbin/fedora-userdel xpilot &>/dev/null || : +test "$1" != 0 || /usr/sbin/fedora-groupdel xpilot &>/dev/null || : %clean rm -rf $RPM_BUILD_ROOT @@ -154,6 +162,10 @@ %ghost %{_datadir}/%{name}/mapconvert.pyo %changelog +* Wed Mar 1 2006 Wart 4.7.2-7 +- Create an xpilot user for running the server daemon +- Fix typo in logrotate configuration file. + * Tue Feb 28 2006 Wart 4.7.2-6 - Added sysconfig and initrd files for starting xpilot server at boot time - Add copies of customizable configuration files to /etc/xpilot From fedora-extras-commits at redhat.com Wed Mar 1 23:24:05 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 1 Mar 2006 18:24:05 -0500 Subject: rpms/xpilot-ng/FC-4 xpilot-ng-server.init, 1.1, 1.2 xpilot-ng.spec, 1.3, 1.4 Message-ID: <200603012324.k21NObre006274@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/xpilot-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6255 Modified Files: xpilot-ng-server.init xpilot-ng.spec Log Message: Create a xpilot user for running the game server daemon. Index: xpilot-ng-server.init =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng-server.init,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xpilot-ng-server.init 1 Mar 2006 04:51:17 -0000 1.1 +++ xpilot-ng-server.init 1 Mar 2006 23:24:05 -0000 1.2 @@ -36,7 +36,7 @@ return 1 fi # This doesn't properly detect startup failures - daemon --user games $exec $XPILOTD_OPTIONS >>/var/log/xpilot.log 2>&1 & + daemon --user xpilot $exec $XPILOTD_OPTIONS >>/var/log/xpilot.log 2>&1 & retval=$? if [ $retval -eq 0 ]; then success Index: xpilot-ng.spec =================================================================== RCS file: /cvs/extras/rpms/xpilot-ng/FC-4/xpilot-ng.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xpilot-ng.spec 1 Mar 2006 04:51:17 -0000 1.3 +++ xpilot-ng.spec 1 Mar 2006 23:24:05 -0000 1.4 @@ -1,6 +1,6 @@ Name: xpilot-ng Version: 4.7.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Multiplayer space arcade game Group: Amusements/Games @@ -23,6 +23,9 @@ Requires(post): /sbin/service Requires(preun): /sbin/chkconfig Requires(preun): /sbin/service +Requires(postun): /sbin/service +Requires(pre): fedora-usermgmt +Requires(postun): fedora-usermgmt %description A highly addictive, infinitely configurable multiplayer space @@ -94,6 +97,11 @@ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%pre server +/usr/sbin/fedora-groupadd 25 -r xpilot &>/dev/null || : +/usr/sbin/fedora-useradd 25 -r -s /sbin/nologin -d /usr/share/xpilot-ng -M \ + -c 'XPilot Server' -g xpilot xpilot >/dev/null || : + %post server /sbin/chkconfig --add xpilot-ng-server @@ -107,6 +115,8 @@ if [ "$1" -ge "1" ]; then /sbin/service xpilot-ng-server restart >/dev/null 2>&1 fi +test "$1" != 0 || /usr/sbin/fedora-userdel xpilot &>/dev/null || : +test "$1" != 0 || /usr/sbin/fedora-groupdel xpilot &>/dev/null || : %clean rm -rf $RPM_BUILD_ROOT @@ -152,6 +162,10 @@ #%ghost %{_datadir}/%{name}/mapconvert.pyo %changelog +* Wed Mar 1 2006 Wart 4.7.2-6 +- Create an xpilot user for running the server daemon +- Fix typo in logrotate configuration file. + * Tue Feb 28 2006 Wart 4.7.2-5 - Added sysconfig and initrd files for starting xpilot server at boot time - Add copies of customizable configuration files to /etc/xpilot From fedora-extras-commits at redhat.com Wed Mar 1 23:46:31 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Mar 2006 18:46:31 -0500 Subject: rpms/perl-Net-Patricia/FC-4 .cvsignore, 1.2, 1.3 perl-Net-Patricia.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603012347.k21Nl3jO006580@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/perl-Net-Patricia/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6559 Modified Files: .cvsignore perl-Net-Patricia.spec sources Log Message: Update to 1.014 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-Patricia/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Oct 2005 15:11:40 -0000 1.2 +++ .cvsignore 1 Mar 2006 23:46:31 -0000 1.3 @@ -1 +1 @@ -Net-Patricia-1.010.tar.gz +Net-Patricia-1.014.tar.gz Index: perl-Net-Patricia.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-Patricia/FC-4/perl-Net-Patricia.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Net-Patricia.spec 24 Oct 2005 15:11:40 -0000 1.1 +++ perl-Net-Patricia.spec 1 Mar 2006 23:46:31 -0000 1.2 @@ -1,5 +1,5 @@ Name: perl-Net-Patricia -Version: 1.010 +Version: 1.014 Release: 1%{?dist} Summary: Patricia Trie perl module for fast IP address lookups License: GPL @@ -53,5 +53,8 @@ %{_mandir}/man3/* %changelog +* Wed Feb 1 2006 Orion Poplawski 1.014-1 +- Update to 1.014 + * Tue Oct 11 2005 Orion Poplawski 1.010-1 - Initial Fedora Extras release Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-Patricia/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Oct 2005 15:11:40 -0000 1.2 +++ sources 1 Mar 2006 23:46:31 -0000 1.3 @@ -1 +1 @@ -19f0c6944769daba64694ee3c72cf286 Net-Patricia-1.010.tar.gz +16ec73b5b514dbe4275e349fca236c49 Net-Patricia-1.014.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 23:50:05 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Mar 2006 18:50:05 -0500 Subject: rpms/python-basemap-data/FC-4 .cvsignore, 1.2, 1.3 python-basemap-data.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603012350.k21NobON006667@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-basemap-data/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6642 Modified Files: .cvsignore python-basemap-data.spec sources Log Message: Update to 0.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-basemap-data/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Jan 2006 17:51:47 -0000 1.2 +++ .cvsignore 1 Mar 2006 23:50:05 -0000 1.3 @@ -1 +1 @@ -basemap-data-0.7.tar.gz +basemap-data-0.8.tar.gz Index: python-basemap-data.spec =================================================================== RCS file: /cvs/extras/rpms/python-basemap-data/FC-4/python-basemap-data.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-basemap-data.spec 5 Jan 2006 17:53:12 -0000 1.2 +++ python-basemap-data.spec 1 Mar 2006 23:50:05 -0000 1.3 @@ -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-data -Version: 0.7 +Version: 0.8 Release: 1 Summary: Data for python-basemap Group: Development/Libraries @@ -39,5 +39,8 @@ %changelog +* Wed Mar 1 2006 Orion Poplawski 0.8-1 +- Update to 0.8 + * Sun Nov 20 2005 Orion Poplawski 0.7-1 - Initial package for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-basemap-data/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Jan 2006 17:51:47 -0000 1.2 +++ sources 1 Mar 2006 23:50:05 -0000 1.3 @@ -1 +1 @@ -8f745d4575e996348e3b315859b354e0 basemap-data-0.7.tar.gz +b3cbcb405b70a1dfc2abbaf979fe1d89 basemap-data-0.8.tar.gz From fedora-extras-commits at redhat.com Wed Mar 1 23:51:35 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Mar 2006 18:51:35 -0500 Subject: rpms/python-basemap-data/FC-4 python-basemap-data.spec,1.3,1.4 Message-ID: <200603012352.k21Nq8QT006721@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-basemap-data/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6704 Modified Files: python-basemap-data.spec Log Message: Add dist tag Index: python-basemap-data.spec =================================================================== RCS file: /cvs/extras/rpms/python-basemap-data/FC-4/python-basemap-data.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-basemap-data.spec 1 Mar 2006 23:50:05 -0000 1.3 +++ python-basemap-data.spec 1 Mar 2006 23:51:35 -0000 1.4 @@ -2,7 +2,7 @@ Name: python-basemap-data Version: 0.8 -Release: 1 +Release: 1%{?dist} Summary: Data for python-basemap Group: Development/Libraries License: GPL From fedora-extras-commits at redhat.com Wed Mar 1 23:53:12 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 1 Mar 2006 18:53:12 -0500 Subject: rpms/python-basemap-data/devel python-basemap-data.spec,1.3,1.4 Message-ID: <200603012353.k21NrlJJ006791@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-basemap-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6774 Modified Files: python-basemap-data.spec Log Message: Add dist tag Index: python-basemap-data.spec =================================================================== RCS file: /cvs/extras/rpms/python-basemap-data/devel/python-basemap-data.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-basemap-data.spec 28 Feb 2006 20:40:50 -0000 1.3 +++ python-basemap-data.spec 1 Mar 2006 23:53:12 -0000 1.4 @@ -2,7 +2,7 @@ Name: python-basemap-data Version: 0.8 -Release: 1 +Release: 1%{?dist} Summary: Data for python-basemap Group: Development/Libraries License: GPL From fedora-extras-commits at redhat.com Thu Mar 2 00:09:07 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 19:09:07 -0500 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.desktop, 1.1, 1.2 sylpheed-claws.spec, 1.26, 1.27 Message-ID: <200603020009.k2209ia6008762@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-serv8719/FC-4 Modified Files: sylpheed-claws.desktop sylpheed-claws.spec Log Message: - fix .desktop Index: sylpheed-claws.desktop =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sylpheed-claws.desktop 5 Mar 2005 07:08:21 -0000 1.1 +++ sylpheed-claws.desktop 2 Mar 2006 00:09:07 -0000 1.2 @@ -1,10 +1,9 @@ [Desktop Entry] Name=Sylpheed Claws -Name[ja]=Sylpheed Claws Comment=E-Mail client -Comment[ja]=?????????????????????? Exec=sylpheed-claws Icon=sylpheed-claws.png Terminal=false Type=Application +Encoding=UTF-8 Categories=Application;Network; Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sylpheed-claws.spec 3 Feb 2006 09:03:41 -0000 1.26 +++ sylpheed-claws.spec 2 Mar 2006 00:09:07 -0000 1.27 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 2.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL @@ -113,6 +113,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Thu Mar 02 2006 Andreas Bierfert +2.0.0-2 +- fix .desktop + * Fri Feb 03 2006 Andreas Bierfert 2.0.0-1 - version upgrade From fedora-extras-commits at redhat.com Thu Mar 2 00:09:15 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 19:09:15 -0500 Subject: rpms/sylpheed-claws/devel sylpheed-claws.desktop, 1.1, 1.2 sylpheed-claws.spec, 1.36, 1.37 Message-ID: <200603020009.k2209liM008767@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8719/devel Modified Files: sylpheed-claws.desktop sylpheed-claws.spec Log Message: - fix .desktop Index: sylpheed-claws.desktop =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sylpheed-claws.desktop 5 Mar 2005 07:08:21 -0000 1.1 +++ sylpheed-claws.desktop 2 Mar 2006 00:09:15 -0000 1.2 @@ -1,10 +1,9 @@ [Desktop Entry] Name=Sylpheed Claws -Name[ja]=Sylpheed Claws Comment=E-Mail client -Comment[ja]=?????????????????????? Exec=sylpheed-claws Icon=sylpheed-claws.png Terminal=false Type=Application +Encoding=UTF-8 Categories=Application;Network; Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- sylpheed-claws.spec 16 Feb 2006 23:02:21 -0000 1.36 +++ sylpheed-claws.spec 2 Mar 2006 00:09:15 -0000 1.37 @@ -1,6 +1,6 @@ Name: sylpheed-claws Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL @@ -67,7 +67,7 @@ --vendor=fedora \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category=X-Fedora \ - %{SOURCE1} + %{SOURCE1} %{__rm} -f ${RPM_BUILD_ROOT}%{_infodir}/dir %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome @@ -93,8 +93,7 @@ %{_libdir}/sylpheed-claws/plugins/*.so %exclude %{_libdir}/sylpheed-claws/plugins/*.a %{_datadir}/pixmaps/* -#%dir %{_datadir}/sylpheed-claws/ -#%{_datadir}/sylpheed-claws/* +%{_datadir}/sylpheed-claws %{_mandir}/man1/* %{_datadir}/applications/* #%{_datadir}/icons/* @@ -107,6 +106,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Thu Mar 02 2006 Andreas Bierfert +2.0.0-3 +- Fix .desktop + * Thu Feb 16 2006 Andreas Bierfert 2.0.0-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Thu Mar 2 00:31:38 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 19:31:38 -0500 Subject: rpms/fluxbox/devel fluxbox-gcc41.patch, NONE, 1.1 fluxbox.spec, 1.14, 1.15 Message-ID: <200603020032.k220WAaV008949@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fluxbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8907 Modified Files: fluxbox.spec Added Files: fluxbox-gcc41.patch Log Message: - write and add gcc41 patch fluxbox-gcc41.patch: --- NEW FILE fluxbox-gcc41.patch --- diff -uhr fluxbox-0.9.14.orig/src/ClockTool.cc fluxbox-0.9.14/src/ClockTool.cc --- fluxbox-0.9.14.orig/src/ClockTool.cc 2005-07-03 14:28:08.000000000 +0200 +++ fluxbox-0.9.14/src/ClockTool.cc 2006-03-02 01:14:45.000000000 +0100 @@ -50,7 +50,7 @@ class ClockMenuItem: public FbTk::MenuItem { public: - explicit ClockMenuItem::ClockMenuItem(ClockTool &tool): + explicit ClockMenuItem(ClockTool &tool): FbTk::MenuItem(""), m_tool(tool) { // determine 12/24 hour format _FB_USES_NLS; Only in fluxbox-0.9.14/src: defaults.cc diff -uhr fluxbox-0.9.14.orig/src/IconbarTool.cc fluxbox-0.9.14/src/IconbarTool.cc --- fluxbox-0.9.14.orig/src/IconbarTool.cc 2005-07-04 20:18:25.000000000 +0200 +++ fluxbox-0.9.14/src/IconbarTool.cc 2006-03-02 01:15:27.000000000 +0100 @@ -49,6 +49,8 @@ #include using namespace std; +namespace FbTk { + template<> void FbTk::Resource::setFromString(const char *strval) { if (strcasecmp(strval, "None") == 0) @@ -190,7 +192,7 @@ // default string return string("Icons"); } - +} // end namespace FbTk namespace { class ToolbarModeMenuItem : public FbTk::MenuItem { Only in fluxbox-0.9.14/src: .IconbarTool.cc.swp diff -uhr fluxbox-0.9.14.orig/src/MenuTheme.cc fluxbox-0.9.14/src/MenuTheme.cc --- fluxbox-0.9.14.orig/src/MenuTheme.cc 2005-01-24 19:57:02.000000000 +0100 +++ fluxbox-0.9.14/src/MenuTheme.cc 2006-03-02 01:11:36.000000000 +0100 @@ -26,6 +26,8 @@ #include using namespace std; +namespace FbTk { + template <> void FbTk::ThemeItem::load(const std::string *name, const std::string *altname) { } @@ -49,6 +51,7 @@ *(*this) = static_cast(places); } +} // end namespace FbTk MenuTheme::MenuTheme(int screen_num):FbTk::MenuTheme(screen_num), m_shapeplace(*this, "menu.roundCorners", "Menu.RoundCorners") { diff -uhr fluxbox-0.9.14.orig/src/Resources.cc fluxbox-0.9.14/src/Resources.cc --- fluxbox-0.9.14.orig/src/Resources.cc 2005-05-07 00:00:29.000000000 +0200 +++ fluxbox-0.9.14/src/Resources.cc 2006-03-02 01:12:54.000000000 +0100 @@ -37,6 +37,8 @@ //---- accessors for int, bool, and some enums with Resource ------ //----------------------------------------------------------------- +namespace FbTk { + template<> void FbTk::Resource:: setFromString(const char* strval) { @@ -250,3 +252,4 @@ sprintf(tmpstr, "%ld", m_value); return string(tmpstr); } +} // end namespace FbTk diff -uhr fluxbox-0.9.14.orig/src/ScreenResources.cc fluxbox-0.9.14/src/ScreenResources.cc --- fluxbox-0.9.14.orig/src/ScreenResources.cc 2005-07-26 19:34:45.000000000 +0200 +++ fluxbox-0.9.14/src/ScreenResources.cc 2006-03-02 01:08:37.000000000 +0100 @@ -29,6 +29,8 @@ #include using namespace std; +namespace FbTk { + template <> void FbTk::Resource::setDefaultValue() { *(*this) = BScreen::ROWSMARTPLACEMENT; @@ -357,4 +359,4 @@ else setDefaultValue(); } - +} // end namespace FbTk diff -uhr fluxbox-0.9.14.orig/src/Slit.cc fluxbox-0.9.14/src/Slit.cc --- fluxbox-0.9.14.orig/src/Slit.cc 2005-06-23 05:09:15.000000000 +0200 +++ fluxbox-0.9.14/src/Slit.cc 2006-03-02 01:09:46.000000000 +0100 @@ -80,6 +80,8 @@ #include using namespace std; +namespace FbTk { + template<> void FbTk::Resource::setFromString(const char *strval) { if (strcasecmp(strval, "TopLeft")==0) @@ -159,7 +161,7 @@ // default string return string("Vertical"); } - +} // end namespace FbTk namespace { class SlitClientMenuItem: public FbTk::MenuItem{ diff -uhr fluxbox-0.9.14.orig/src/Toolbar.cc fluxbox-0.9.14/src/Toolbar.cc --- fluxbox-0.9.14.orig/src/Toolbar.cc 2005-07-03 14:28:08.000000000 +0200 +++ fluxbox-0.9.14/src/Toolbar.cc 2006-03-02 01:14:05.000000000 +0100 @@ -73,6 +73,8 @@ using namespace std; +namespace FbTk { + template<> void FbTk::Resource:: setFromString(const char *strval) { @@ -148,7 +150,7 @@ //default string return string("BottomCenter"); } - +} // end namespace FbTk namespace { class SetToolbarPlacementCmd: public FbTk::Command { Only in fluxbox-0.9.14.orig/util: Makefile.in Index: fluxbox.spec =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fluxbox.spec 29 Nov 2005 15:56:10 -0000 1.14 +++ fluxbox.spec 2 Mar 2006 00:31:36 -0000 1.15 @@ -13,6 +13,7 @@ Source2: FluxBox Source3: fluxbox.desktop Source4: fluxbox-xdg-menu.py +Patch0: fluxbox-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot BuildRequires: imlib2-devel @@ -26,6 +27,7 @@ BuildRequires: libXpm-devel BuildRequires: libXrandr-devel BuildRequires: libXrender-devel +BuildRequires: fontconfig-devel Requires(post): python Requires: artwiz-aleczapka-fonts @@ -42,6 +44,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --enable-xft \ @@ -49,7 +52,9 @@ --enable-kde \ --enable-xinerama \ --enable-imlib2 \ - --enable-nls + --enable-nls \ + --x-includes=%{_includedir} \ + --x-libraries=%{_libdir} make %{?_smp_mflags} @@ -90,8 +95,11 @@ %{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop %changelog -* Thu Nov 10 2005 Andreas Bierfert +* Thu Mar 02 2006 Andreas Bierfert 0.9.14-2 +- fix build on gcc41 + +* Thu Nov 10 2005 Andreas Bierfert - enable nls and imlib2 - require artwizaleczepka instead of providing it... - add menu script from Rudolf Kastel From fedora-extras-commits at redhat.com Thu Mar 2 00:35:09 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 1 Mar 2006 19:35:09 -0500 Subject: rpms/fbdesk/devel fbdesk-gcc41.patch, NONE, 1.1 fbdesk.spec, 1.13, 1.14 Message-ID: <200603020035.k220ZgMs009102@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9075 Modified Files: fbdesk.spec Added Files: fbdesk-gcc41.patch Log Message: - write and add gcc41 patch fbdesk-gcc41.patch: --- NEW FILE fbdesk-gcc41.patch --- --- src/FbDesk.cc.orig 2006-03-02 01:24:43.000000000 +0100 +++ src/FbDesk.cc 2006-03-02 01:23:52.000000000 +0100 @@ -43,6 +43,8 @@ using namespace std; using namespace FbTk; +namespace FbTk { + template <> void Resource::setFromString(const char *str) { sscanf(str, "%d", &*(*this)); @@ -96,6 +98,7 @@ else *(*this) = FbDesk::Icon::TEXTPLACE_BOTTOM; } +} //end namespace FbTk namespace FbDesk { Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- fbdesk.spec 2 Feb 2006 10:45:54 -0000 1.13 +++ fbdesk.spec 2 Mar 2006 00:35:09 -0000 1.14 @@ -8,6 +8,7 @@ License: MIT URL: http://fluxbox.sourceforge.net/fbdesk/ Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz +Patch0: fbdesk-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: freetype-devel BuildRequires: libpng-devel @@ -24,7 +25,7 @@ %prep %setup -q - +%patch0 %build %configure --x-includes=%{_includedir} --x-libraries=%{_libdir} @@ -49,8 +50,11 @@ %changelog -* Sun Jan 29 2006 Andreas Bierfert +* Thu Mar 02 2006 Andreas Bierfert 1.2.1-3 +- add gcc4.1 patch + +* Sun Jan 29 2006 Andreas Bierfert - modular X * Fri Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Thu Mar 2 01:19:46 2006 From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme)) Date: Wed, 1 Mar 2006 20:19:46 -0500 Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.19,1.20 Message-ID: <200603020120.k221KIsB011528@cvs-int.fedora.redhat.com> Author: meme Update of /cvs/extras/rpms/nethack-vultures/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11505 Modified Files: nethack-vultures.spec Log Message: Ready for FC5 Index: nethack-vultures.spec =================================================================== RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- nethack-vultures.spec 2 Feb 2006 17:30:37 -0000 1.19 +++ nethack-vultures.spec 2 Mar 2006 01:19:46 -0000 1.20 @@ -1,6 +1,6 @@ Name: nethack-vultures Version: 1.11.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: NetHack - Vulture's Eye and Vulture's Claw Group: Amusements/Games @@ -164,6 +164,9 @@ %changelog +* Sun Mar 01 2006 Karen Pease - 1.11.2-5 +- Rebuilt for FC5 + * Sun Feb 02 2006 Frank Arnold - 1.11.2-4 - Got a working plague build by working around util-linux bug #176441. From fedora-extras-commits at redhat.com Thu Mar 2 01:20:46 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 20:20:46 -0500 Subject: rpms/scim-tomoe/FC-4 scim-tomoe.spec,1.3,1.4 Message-ID: <200603020121.k221LIKM011616@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11561 Modified Files: scim-tomoe.spec Log Message: Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/scim-tomoe.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-tomoe.spec 1 Mar 2006 05:51:29 -0000 1.3 +++ scim-tomoe.spec 2 Mar 2006 01:20:46 -0000 1.4 @@ -1,6 +1,6 @@ Name: scim-tomoe Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -12,7 +12,7 @@ Patch0: scim-tomoe-moduledir.patch Requires: scim -BuildRequires: scim-devel, tomoe-devel +BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk-devel %description Scim-tomoe allows Japanese handwritten input of characters using SCIM. @@ -49,7 +49,7 @@ %changelog -* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +* Wed Mar 1 2006 Ryo Dairiki - 0.2-2 - update to 0.2 * Fri Oct 7 2005 Ryo Dairiki - 0.1-2 From fedora-extras-commits at redhat.com Thu Mar 2 01:27:36 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 20:27:36 -0500 Subject: rpms/libtomoe-gtk/FC-4 .cvsignore, 1.2, 1.3 Makefile, 1.1, 1.2 branch, 1.1, 1.2 libtomoe-gtk.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603020128.k221S8Fq011804@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/libtomoe-gtk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11779 Modified Files: .cvsignore Makefile branch libtomoe-gtk.spec sources Log Message: From fedora-extras-commits at redhat.com Thu Mar 2 01:34:01 2006 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Wed, 1 Mar 2006 20:34:01 -0500 Subject: rpms/frotz/devel frotz.spec,1.1,1.2 Message-ID: <200603020134.k221YXYJ011904@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/frotz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11887 Modified Files: frotz.spec Log Message: Rebuild for FC-5 Index: frotz.spec =================================================================== RCS file: /cvs/extras/rpms/frotz/devel/frotz.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- frotz.spec 5 Aug 2005 05:41:58 -0000 1.1 +++ frotz.spec 2 Mar 2006 01:34:00 -0000 1.2 @@ -1,6 +1,6 @@ Name: frotz Version: 2.43 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Interpreter for Infocom and other Z-machine games Group: Amusements/Games @@ -57,6 +57,9 @@ %changelog +* Wed Mar 01 2006 Chris Grau 2.43-4 +- Rebuild for FC-5. + * Tue Jul 19 2005 Chris Grau 2.43-3 - Changed sed command to edit Makefile in place (Michael Schwendt). - Removed compression of the man page (Michael Schwendt). From fedora-extras-commits at redhat.com Thu Mar 2 01:41:25 2006 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Wed, 1 Mar 2006 20:41:25 -0500 Subject: rpms/ifm/devel ifm.spec,1.1,1.2 Message-ID: <200603020141.k221fvbG012002@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/ifm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11985 Modified Files: ifm.spec Log Message: Rebuild for FC-5 Index: ifm.spec =================================================================== RCS file: /cvs/extras/rpms/ifm/devel/ifm.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ifm.spec 4 Oct 2005 21:17:50 -0000 1.1 +++ ifm.spec 2 Mar 2006 01:41:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: ifm Version: 5.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Interactive Fiction Mapper Group: Amusements/Games @@ -62,6 +62,9 @@ %changelog +* Wed Mar 01 2006 Chris Grau 5.1-3 +- Rebuild for FC-5. + * Mon Sep 26 2005 Chris Grau 5.1-2 - Added tk as a BR for the wish requirement in configure. - Fixed paths in man page to point to proper documentation. From fedora-extras-commits at redhat.com Thu Mar 2 01:51:26 2006 From: fedora-extras-commits at redhat.com (Christopher Grau (cgrau)) Date: Wed, 1 Mar 2006 20:51:26 -0500 Subject: rpms/perl-Time-Piece/devel perl-Time-Piece.spec,1.1,1.2 Message-ID: <200603020151.k221pxdk012228@cvs-int.fedora.redhat.com> Author: cgrau Update of /cvs/extras/rpms/perl-Time-Piece/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12170 Modified Files: perl-Time-Piece.spec Log Message: - Rebuild for FC-5. - Removed license texts that are not included in distribution. Index: perl-Time-Piece.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Time-Piece/devel/perl-Time-Piece.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Time-Piece.spec 24 Aug 2005 21:36:53 -0000 1.1 +++ perl-Time-Piece.spec 2 Mar 2006 01:51:26 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Time-Piece Version: 1.08 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Time objects from localtime and gmtime Group: Development/Libraries @@ -20,8 +20,6 @@ %prep %setup -q -n Time-Piece-%{version} -perldoc -t perlartistic > Artistic -perldoc -t perlgpl > COPYING %build @@ -48,13 +46,17 @@ %files %defattr(-,root,root,-) -%doc Artistic COPYING Changes README +%doc Changes README %{perl_vendorarch}/auto/Time/ %{perl_vendorarch}/Time/ %{_mandir}/man3/*.3* %changelog +* Wed Mar 01 2006 Chris Grau 1.08-3 +- Rebuild for FC-5. +- Removed license texts that are not included in distribution. + * Wed Aug 24 2005 Chris Grau 1.08-2 - Removed redundant perl BR. - Added license texts. From fedora-extras-commits at redhat.com Thu Mar 2 02:19:10 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 21:19:10 -0500 Subject: rpms/scim-tomoe/FC-4 scim-tomoe.spec,1.4,1.5 Message-ID: <200603020219.k222JCho014189@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14153 Modified Files: scim-tomoe.spec Log Message: update to 0.2.0 Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-4/scim-tomoe.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scim-tomoe.spec 2 Mar 2006 01:20:46 -0000 1.4 +++ scim-tomoe.spec 2 Mar 2006 02:19:08 -0000 1.5 @@ -1,6 +1,6 @@ Name: scim-tomoe Version: 0.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -49,7 +49,7 @@ %changelog -* Wed Mar 1 2006 Ryo Dairiki - 0.2-2 +* Wed Mar 1 2006 Ryo Dairiki - 0.2-3 - update to 0.2 * Fri Oct 7 2005 Ryo Dairiki - 0.1-2 From fedora-extras-commits at redhat.com Thu Mar 2 02:19:10 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 21:19:10 -0500 Subject: rpms/scim-tomoe/FC-3 scim-tomoe.spec,1.3,1.4 Message-ID: <200603020219.k222JCu6014190@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14154 Modified Files: scim-tomoe.spec Log Message: update to 0.2.0 Index: scim-tomoe.spec =================================================================== RCS file: /cvs/extras/rpms/scim-tomoe/FC-3/scim-tomoe.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-tomoe.spec 1 Mar 2006 06:39:02 -0000 1.3 +++ scim-tomoe.spec 2 Mar 2006 02:19:08 -0000 1.4 @@ -1,6 +1,6 @@ Name: scim-tomoe Version: 0.2.0 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Tomoe module for SCIM for Japanese handwritten input Group: System Environment/Libraries @@ -12,7 +12,7 @@ Patch0: scim-tomoe-moduledir.patch Requires: scim -BuildRequires: scim-devel, tomoe-devel +BuildRequires: scim-devel, tomoe-devel, libtomoe-gtk-devel %description Scim-tomoe allows Japanese handwritten input of characters using SCIM. @@ -49,7 +49,7 @@ %changelog -* Wed Mar 1 2006 Ryo Dairiki - 0.2-1 +* Wed Mar 1 2006 Ryo Dairiki - 0.2-3 - update to 0.2 * Fri Oct 7 2005 Ryo Dairiki - 0.1-2 From fedora-extras-commits at redhat.com Thu Mar 2 02:24:39 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 21:24:39 -0500 Subject: rpms/scim-tomoe/FC-3 .cvsignore, 1.2, 1.3 Makefile, 1.1, 1.2 branch, 1.1, 1.2 scim-tomoe.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603020225.k222PBv5014347@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14321 Modified Files: .cvsignore Makefile branch scim-tomoe.spec sources Log Message: update to 0.2.0 From fedora-extras-commits at redhat.com Thu Mar 2 02:39:27 2006 From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo)) Date: Wed, 1 Mar 2006 21:39:27 -0500 Subject: rpms/scim-tomoe/FC-3 scim-tomoe-moduledir.patch,NONE,1.1 Message-ID: <200603020239.k222dTpG014431@cvs-int.fedora.redhat.com> Author: ryo Update of /cvs/extras/rpms/scim-tomoe/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14419 Added Files: scim-tomoe-moduledir.patch Log Message: scim-tomoe-moduledir.patch: --- NEW FILE scim-tomoe-moduledir.patch --- --- src/Makefile.am 2006-03-01 14:35:56.000000000 +0900 +++ src/Makefile.am.new 2006-03-01 14:36:07.000000000 +0900 @@ -12,7 +12,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ --- src/Makefile.in 2006-03-01 14:44:48.000000000 +0900 +++ src/Makefile.in.new 2006-03-01 14:45:30.000000000 +0900 @@ -257,7 +257,7 @@ scim_tomoe_prefs.h \ scim_tomoe_prefs_win.h -moduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +moduledir = @SCIM_MODULEDIR@/Helper module_LTLIBRARIES = tomoe.la tomoe_la_SOURCES = \ scim_tomoe.cpp \ From fedora-extras-commits at redhat.com Thu Mar 2 02:48:54 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 1 Mar 2006 21:48:54 -0500 Subject: rpms/gnugo/devel gnugo.spec,1.9,1.10 Message-ID: <200603020249.k222nQ6C014513@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/gnugo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14496 Modified Files: gnugo.spec Log Message: rebuild for FE5 Index: gnugo.spec =================================================================== RCS file: /cvs/extras/rpms/gnugo/devel/gnugo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnugo.spec 6 Apr 2005 22:11:38 -0000 1.9 +++ gnugo.spec 2 Mar 2006 02:48:54 -0000 1.10 @@ -1,6 +1,6 @@ Name: gnugo Version: 3.6 -Release: 3 +Release: 4%{?dist} Summary: Text based go program @@ -60,6 +60,10 @@ %changelog +* Wed Mar 1 2006 Chris Ricker 3.6-4 +- rebuild for FE 5 +- add dist tag + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Mar 2 02:54:51 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 1 Mar 2006 21:54:51 -0500 Subject: rpms/kakasi/devel kakasi.spec,1.2,1.3 Message-ID: <200603020255.k222tOrg014613@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kakasi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14596 Modified Files: kakasi.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 2.3.4-21 - rebuilt. Index: kakasi.spec =================================================================== RCS file: /cvs/extras/rpms/kakasi/devel/kakasi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kakasi.spec 30 May 2005 02:17:47 -0000 1.2 +++ kakasi.spec 2 Mar 2006 02:54:51 -0000 1.3 @@ -1,9 +1,9 @@ Name: kakasi Version: 2.3.4 -Release: 20 +Release: 21%{?dist} URL: http://kakasi.namazu.org/ License: GPL -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ## re-compressed with bzip2 instead of gzip #Source: ftp://kakasi.namazu.org/pub/kakasi/%{name}-%{version}.tar.gz @@ -75,7 +75,8 @@ %files %defattr(-, root, root) -%doc AUTHORS ChangeLog COPYING NEWS README README-ja +%doc AUTHORS ChangeLog COPYING NEWS README +%lang(ja) %doc README-ja %dir %{_datadir}/kakasi %{_bindir}/* %{_libdir}/libkakasi.so.* @@ -95,6 +96,9 @@ %changelog +* Thu Mar 2 2006 Akira TAGOH - 2.3.4-21 +- rebuilt. + * Mon May 30 2005 Akira TAGOH - 2.3.4-20 - import to Fedora Extras. From fedora-extras-commits at redhat.com Thu Mar 2 02:57:34 2006 From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom)) Date: Wed, 1 Mar 2006 21:57:34 -0500 Subject: rpms/cgoban/devel cgoban.spec,1.8,1.9 Message-ID: <200603020258.k222w6EV014767@cvs-int.fedora.redhat.com> Author: kaboom Update of /cvs/extras/rpms/cgoban/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14715 Modified Files: cgoban.spec Log Message: rebuild for FE5 Index: cgoban.spec =================================================================== RCS file: /cvs/extras/rpms/cgoban/devel/cgoban.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cgoban.spec 23 Jul 2005 16:11:25 -0000 1.8 +++ cgoban.spec 2 Mar 2006 02:57:34 -0000 1.9 @@ -1,6 +1,6 @@ Name: cgoban Version: 1.9.14 -Release: 5 +Release: 6%{?dist} Summary: X board for playing go @@ -12,7 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils -BuildRequires: xorg-x11-devel +BuildRequires: libICE-devel, libXmu-devel, libSM-devel, xorg-x11-proto-devel +BuildRequires: libXext-devel, libXaw-devel, libXt-devel %description CGoban (Complete Goban) is for Unix systems with X11. It has the ability @@ -57,6 +58,10 @@ %changelog +* Wed Mar 1 2006 Chris Ricker 1.9.14-6 +- Rebuild for FE5 +- add dist tag + * Sat Jun 25 2005 Colin Charles 1.9.14-5 - Fix download URL From fedora-extras-commits at redhat.com Thu Mar 2 05:31:46 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 00:31:46 -0500 Subject: rpms/mew/devel mew.spec,1.2,1.3 Message-ID: <200603020532.k225WIjT021019@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/mew/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21002 Modified Files: mew.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 4.2-2 - rebuilt. Index: mew.spec =================================================================== RCS file: /cvs/extras/rpms/mew/devel/mew.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mew.spec 30 May 2005 03:38:49 -0000 1.2 +++ mew.spec 2 Mar 2006 05:31:46 -0000 1.3 @@ -5,10 +5,10 @@ Name: mew Version: 4.2 -Release: 1 +Release: 2%{?dist} License: BSD-like URL: http://www.mew.org/ -BuildRoot: %{_tmppath}/%{name}-%{version} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildPrereq: emacs >= %{emacsver} BuildPrereq: xemacs >= %{xemacsver} BuildRequires: emacs >= %{emacsver} @@ -185,6 +185,9 @@ %changelog +* Thu Mar 2 2006 Akira TAGOH - 4.2-2 +- rebuilt. + * Mon May 30 2005 Akira TAGOH - 4.2-1 - Updates to 4.2. - import into Extras. From fedora-extras-commits at redhat.com Thu Mar 2 05:41:19 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 00:41:19 -0500 Subject: owners owners.list,1.690,1.691 Message-ID: <200603020541.k225fq7Q021157@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21138 Modified Files: owners.list Log Message: Taking ownership of neverball Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.690 retrieving revision 1.691 diff -u -r1.690 -r1.691 --- owners.list 1 Mar 2006 17:04:55 -0000 1.690 +++ owners.list 2 Mar 2006 05:41:19 -0000 1.691 @@ -714,7 +714,7 @@ Fedora Extras|nethack-vultures|NetHack - Vulture's Eye/Claw|meme at daughtersoftiresias.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|NetworkManager-vpnc|NetworkManager VPN integration for vpnc|davidz at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|neverball|Roll a ball through an obstacle course|nos at utelsystems.com|extras-qa at fedoraproject.org| +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|redhat at flyn.org|extras-qa at fedoraproject.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| From fedora-extras-commits at redhat.com Thu Mar 2 05:50:56 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:50:56 -0500 Subject: rpms/planet - New directory Message-ID: <200603020550.k225owmm021261@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253/planet Log Message: Directory /cvs/extras/rpms/planet added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 05:51:01 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:51:01 -0500 Subject: rpms/planet/devel - New directory Message-ID: <200603020551.k225p3dG021276@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21253/planet/devel Log Message: Directory /cvs/extras/rpms/planet/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 05:51:32 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:51:32 -0500 Subject: rpms/planet Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603020551.k225pYxP021323@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21300 Added Files: Makefile import.log Log Message: Setup of module planet --- NEW FILE Makefile --- # Top level Makefile for module planet all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 2 05:51:37 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:51:37 -0500 Subject: rpms/planet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603020551.k225peI0021353@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21300/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module planet --- NEW 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 Mar 2 05:51:33 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 00:51:33 -0500 Subject: rpms/neverball/devel neverball.spec,1.9,1.10 Message-ID: <200603020552.k225q5pV021377@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/neverball/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21225 Modified Files: neverball.spec Log Message: Modular xorg fix for BuildRequires. Index: neverball.spec =================================================================== RCS file: /cvs/extras/rpms/neverball/devel/neverball.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- neverball.spec 23 May 2005 00:24:05 -0000 1.9 +++ neverball.spec 2 Mar 2006 05:51:33 -0000 1.10 @@ -1,6 +1,6 @@ Name: neverball Version: 1.4.0 -Release: 4 +Release: 5 Summary: Roll a ball through an obstacle course @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_image-devel, SDL_ttf-devel, SDL_mixer-devel BuildRequires: freetype-devel, desktop-file-utils, zlib-devel +BuildRequires: mesa-libGL-devel %description Tilt the floor to roll a ball through an obstacle course within the @@ -25,18 +26,21 @@ %prep %setup -q %patch0 +# Remove some execute bits to prevent rpmlint warnings in the debuginfo +# package. +find data putt share -type f -exec chmod a-x {} \; %build -make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`" +make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -p -D -m0755 neverball $RPM_BUILD_ROOT/%{_bindir}/neverball install -p -D -m0755 neverputt $RPM_BUILD_ROOT/%{_bindir}/neverputt -install -p -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/neverball/ +install -p -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/ install -p -D -m0644 icon/neverball.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverball.png install -p -D -m0644 icon/neverputt.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverputt.png -cp -ap data/* $RPM_BUILD_ROOT/%{_datadir}/neverball/ +cp -ap data/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/ desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ @@ -60,6 +64,10 @@ %{_datadir}/applications/* %changelog +* Mon Feb 27 2006 Wart - 1.4.0-5 +- Added BR: mesa-libGL-devel for modular xorg +- Added smp_mflags to compile line to speed up build on smp machines + * Sun May 22 2005 Jeremy Katz - 1.4.0-4 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Mar 2 05:52:53 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:52:53 -0500 Subject: rpms/planet import.log,1.1,1.2 Message-ID: <200603020553.k225rPUK021470@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21431 Modified Files: import.log Log Message: auto-import planet-1.0-0.5.20060218pre on branch devel from planet-1.0-0.5.20060218pre.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/planet/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Mar 2006 05:51:32 -0000 1.1 +++ import.log 2 Mar 2006 05:52:53 -0000 1.2 @@ -0,0 +1 @@ +planet-1_0-0_5_20060218pre:HEAD:planet-1.0-0.5.20060218pre.src.rpm:1141278756 From fedora-extras-commits at redhat.com Thu Mar 2 05:52:59 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:52:59 -0500 Subject: rpms/planet/devel planet-1.0-no-shebang.patch, NONE, 1.1 planet.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603020553.k225rVtC021474@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21431/devel Modified Files: .cvsignore sources Added Files: planet-1.0-no-shebang.patch planet.spec Log Message: auto-import planet-1.0-0.5.20060218pre on branch devel from planet-1.0-0.5.20060218pre.src.rpm planet-1.0-no-shebang.patch: --- NEW FILE planet-1.0-no-shebang.patch --- diff -pur planet-1.0~pre1.orig/planet/cache.py planet-1.0~pre1/planet/cache.py --- planet-1.0~pre1.orig/planet/cache.py 2005-11-15 09:35:07.000000000 +0000 +++ planet-1.0~pre1/planet/cache.py 2005-11-16 18:50:41.000000000 +0000 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: UTF-8 -*- """Item cache. Only in planet-1.0~pre1/planet: cache.py~ diff -pur planet-1.0~pre1.orig/planet/feedparser.py planet-1.0~pre1/planet/feedparser.py --- planet-1.0~pre1.orig/planet/feedparser.py 2005-11-15 09:35:11.000000000 +0000 +++ planet-1.0~pre1/planet/feedparser.py 2005-11-16 18:50:39.000000000 +0000 @@ -1,4 +1,3 @@ -#!/usr/bin/env python """Universal feed parser Handles RSS 0.9x, RSS 1.0, RSS 2.0, CDF, Atom feeds Only in planet-1.0~pre1/planet: feedparser.py~ diff -pur planet-1.0~pre1.orig/planet/__init__.py planet-1.0~pre1/planet/__init__.py --- planet-1.0~pre1.orig/planet/__init__.py 2005-11-15 09:35:13.000000000 +0000 +++ planet-1.0~pre1/planet/__init__.py 2005-11-16 18:50:36.000000000 +0000 @@ -1,4 +1,3 @@ -#!/usr/bin/env python # -*- coding: UTF-8 -*- """Planet aggregator library. Only in planet-1.0~pre1/planet: __init__.py~ --- NEW FILE planet.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %define tarname planet-1.0-20060218pre %define bazver planet--devel--1.0--patch-20 Name: planet Version: 1.0 Release: 0.5.20060218pre Summary: Flexible RDF/RSS/Atom feed aggregator Group: Applications/Internet License: Python Software Foundation License URL: http://www.planetplanet.org/ Source0: %{tarname}.tar.gz Patch1: planet-1.0-no-shebang.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description Planet is a flexible feed aggregator, this means that it downloads feeds and aggregates their content together into a single combined feed with the latest news first. It uses Mark Pilgrim's Ultra-liberal feed parser so can read from RDF, RSS and Atom feeds and Tomas Styblo's template library to output static files in unlimited formats based on a series of templates. %prep %setup -n %{bazver} %patch1 -p1 # Fix line endings. %{__sed} -i 's/\r//' LICENCE %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 # Remove .py from install scripts, e.g. planet.py -> planet. REGEXP='s:%{_bindir}/\(.*\).py:%{_bindir}/\1:' for i in $RPM_BUILD_ROOT%{_bindir}/*.py; do mv -v $i $(echo $i | sed -e $REGEXP) done %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS INSTALL LICENCE NEWS THANKS README examples %{_bindir}/* %dir %{python_sitelib}/planet %{python_sitelib}/planet/*.py %{python_sitelib}/planet/*.pyc %ghost %{python_sitelib}/planet/*.pyo %dir %{python_sitelib}/planet/compat_logging %{python_sitelib}/planet/compat_logging/*.py %{python_sitelib}/planet/compat_logging/*.pyc %ghost %{python_sitelib}/planet/compat_logging/*.pyo %changelog * Sat Feb 18 2006 Richard Dawe - 1.0-0.5.20060218pre - Update to planet--devel--1.0--patch-20. This is no different than the previous release. This is purely to use a known, source-controlled version. * Sun Feb 06 2006 Richard Dawe - 1.0-0.4.20060206pre - Update to the nearly-final 1.0 release on 20060206. * Fri Dec 09 2005 Richard Dawe - 1.0-0.3.20051115arch - Rename to planet from planetplanet. - Include INSTALL document. - Own planet Python sitelib subdirectories. * Wed Nov 16 2005 Richard Dawe - 1.0-0.2.20051115arch - Correct License tag. - Remove shebang lines from planet module code. - Bring spec in line with Fedora's Python spec template. * Wed Nov 16 2005 Richard Dawe - 1.0-0.1.20051115arch - Initial packaging. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/planet/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2006 05:51:37 -0000 1.1 +++ .cvsignore 2 Mar 2006 05:52:59 -0000 1.2 @@ -0,0 +1 @@ +planet-1.0-20060218pre.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/planet/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2006 05:51:37 -0000 1.1 +++ sources 2 Mar 2006 05:52:59 -0000 1.2 @@ -0,0 +1 @@ +c5b59fe0023554ce31d2f2e32559d6c5 planet-1.0-20060218pre.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 05:56:50 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Thu, 2 Mar 2006 00:56:50 -0500 Subject: owners owners.list,1.691,1.692 Message-ID: <200603020557.k225vNYR021545@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21528/owners Modified Files: owners.list Log Message: Take ownership of planet Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.691 retrieving revision 1.692 diff -u -r1.691 -r1.692 --- owners.list 2 Mar 2006 05:41:19 -0000 1.691 +++ owners.list 2 Mar 2006 05:56:50 -0000 1.692 @@ -1068,6 +1068,7 @@ Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org| Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|plib|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 06:23:30 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Thu, 2 Mar 2006 01:23:30 -0500 Subject: rpms/mock/devel mock.spec,1.11,1.12 Message-ID: <200603020624.k226O2H4023543@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23526 Modified Files: mock.spec Log Message: checking in to rebuild Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mock.spec 24 Jan 2006 17:16:33 -0000 1.11 +++ mock.spec 2 Mar 2006 06:23:30 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -68,6 +68,9 @@ %changelog +* Thu Mar 2 2006 Seth Vidal - 0.4-6 +- iterate for gcc rebuild and fc5 final + * Tue Jan 24 2006 Dan Williams - 0.4-5 - Back out setpgrp patch, found a better way to do it in plague From fedora-extras-commits at redhat.com Thu Mar 2 06:39:24 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:39:24 -0500 Subject: rpms/heartbeat - New directory Message-ID: <200603020639.k226dQRe023659@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23651/heartbeat Log Message: Directory /cvs/extras/rpms/heartbeat added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 06:39:29 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:39:29 -0500 Subject: rpms/heartbeat/devel - New directory Message-ID: <200603020639.k226dVd9023674@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23651/heartbeat/devel Log Message: Directory /cvs/extras/rpms/heartbeat/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 06:39:52 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:39:52 -0500 Subject: rpms/heartbeat Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603020639.k226dsh7023708@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696 Added Files: Makefile import.log Log Message: Setup of module heartbeat --- NEW FILE Makefile --- # Top level Makefile for module heartbeat all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 2 06:39:58 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:39:58 -0500 Subject: rpms/heartbeat/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603020640.k226e07P023728@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module heartbeat --- NEW 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 Mar 2 06:41:33 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:41:33 -0500 Subject: rpms/heartbeat import.log,1.1,1.2 Message-ID: <200603020642.k226g6Te023839@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23791 Modified Files: import.log Log Message: auto-import heartbeat-2.0.3-9 on branch devel from heartbeat-2.0.3-9.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/heartbeat/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Mar 2006 06:39:52 -0000 1.1 +++ import.log 2 Mar 2006 06:41:33 -0000 1.2 @@ -0,0 +1 @@ +heartbeat-2_0_3-9:HEAD:heartbeat-2.0.3-9.src.rpm:1141281682 From fedora-extras-commits at redhat.com Thu Mar 2 06:41:39 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:41:39 -0500 Subject: rpms/heartbeat/devel heartbeat-2.0.3-fedora-ccmuser.patch, NONE, 1.1 heartbeat-2.0.3-fedora-chkconfig.patch, NONE, 1.1 heartbeat-2.0.3-fedora-pam.patch, NONE, 1.1 heartbeat.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603020642.k226gBlt023843@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23791/devel Modified Files: .cvsignore sources Added Files: heartbeat-2.0.3-fedora-ccmuser.patch heartbeat-2.0.3-fedora-chkconfig.patch heartbeat-2.0.3-fedora-pam.patch heartbeat.spec Log Message: auto-import heartbeat-2.0.3-9 on branch devel from heartbeat-2.0.3-9.src.rpm heartbeat-2.0.3-fedora-ccmuser.patch: --- NEW FILE heartbeat-2.0.3-fedora-ccmuser.patch --- diff -Nur heartbeat-2.0.3.orig/cts/CM_LinuxHAv2.py.in heartbeat-2.0.3/cts/CM_LinuxHAv2.py.in --- heartbeat-2.0.3.orig/cts/CM_LinuxHAv2.py.in 2006-02-08 22:58:57.000000000 +0100 +++ heartbeat-2.0.3/cts/CM_LinuxHAv2.py.in 2006-03-01 20:09:19.000000000 +0100 @@ -325,7 +325,7 @@ "root@" + (self["CIBfile"]%node)): raise ValueError("Can not scp file to %s "%node) - self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUID@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") + self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUSER@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") def prepare(self): '''Finish the Initialization process. Prepare to test...''' heartbeat-2.0.3-fedora-chkconfig.patch: --- NEW FILE heartbeat-2.0.3-fedora-chkconfig.patch --- diff -Nur heartbeat-2.0.3.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.3/heartbeat/init.d/heartbeat.in --- heartbeat-2.0.3.orig/heartbeat/init.d/heartbeat.in 2005-09-10 23:46:23.000000000 +0200 +++ heartbeat-2.0.3/heartbeat/init.d/heartbeat.in 2006-02-28 22:07:00.000000000 +0100 @@ -13,7 +13,7 @@ # We don't hate anyone, and like for everyone to use # our software, no matter what OS or distribution you're using. # -# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ +# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ # description: Startup script high-availability services. # processname: heartbeat # pidfile: @localstatedir@/run/heartbeat.pid @@ -51,18 +51,6 @@ RUNDIR=@localstatedir@/run if - [ -r /etc/SuSE-release ] -then - # rc.status is new since SuSE 7.0 - [ -r /etc/rc.status ] && . /etc/rc.status - [ -r /etc/rc.config ] && . /etc/rc.config - - # Determine the base and follow a runlevel link name. - base=${0##*/} - link=${base#*[SK][0-9][0-9]} - -fi -if [ -z "$rc_done" ] then rc_done="Done." @@ -391,12 +379,7 @@ StartHA RC=$? Echo - if - [ $RC -eq 0 ] - then - [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR - touch $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && touch /var/lock/subsys/heartbeat RunStartStop post-start $RC ;; @@ -413,11 +396,7 @@ StopHA RC=$? Echo - if - [ $RC -eq 0 ] - then - rm -f $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && rm -f /var/lock/subsys/heartbeat RunStartStop post-stop $RC StopLogd ;; diff -Nur heartbeat-2.0.3.orig/ldirectord/init.d/ldirectord heartbeat-2.0.3/ldirectord/init.d/ldirectord --- heartbeat-2.0.3.orig/ldirectord/init.d/ldirectord 2005-10-17 14:49:21.000000000 +0200 +++ heartbeat-2.0.3/ldirectord/init.d/ldirectord 2006-02-25 22:57:16.000000000 +0100 @@ -2,7 +2,7 @@ # # ldirectord Linux Director Daemon # -# chkconfig: 2345 92 40 +# chkconfig: - 92 40 # description: Start and stop ldirectord on non-heartbeat systems # Using the config file /etc/ha.d/ldirectord.cf # @@ -59,9 +59,11 @@ case "$1" in start) action "Starting ldirectord" $DAEMON start + touch /var/lock/subsys/ldirectord ;; stop) action "Stopping ldirectord" $DAEMON stop + rm -f /var/lock/subsys/ldirectord ;; restart) action "Restarting ldirectord" $DAEMON restart heartbeat-2.0.3-fedora-pam.patch: --- NEW FILE heartbeat-2.0.3-fedora-pam.patch --- diff -Nur heartbeat-2.0.3.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.3/mgmt/daemon/mgmtd.pam --- heartbeat-2.0.3.orig/mgmt/daemon/mgmtd.pam 2005-12-30 09:35:27.000000000 +0100 +++ heartbeat-2.0.3/mgmt/daemon/mgmtd.pam 2006-02-12 17:12:13.000000000 +0100 @@ -1,3 +1,8 @@ -auth required pam_unix.so -account required pam_unix.so - +#%PAM-1.0 +auth sufficient pam_rootok.so +auth sufficient pam_timestamp.so +auth required pam_stack.so service=system-auth +session required pam_permit.so +session optional pam_xauth.so +session optional pam_timestamp.so +account required pam_permit.so --- NEW FILE heartbeat.spec --- %define ENABLE_SNMP_SUBAGENT 0 %define ENABLE_MGMT 1 %define uid 24 %define gname haclient %define uname hacluster Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat Version: 2.0.3 Release: 9%{?dist} License: GPL/LGPL URL: http://linux-ha.org/ Group: System Environment/Daemons Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz Patch0: heartbeat-2.0.3-fedora-pam.patch Patch1: heartbeat-2.0.3-fedora-chkconfig.patch Patch2: heartbeat-2.0.3-fedora-ccmuser.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel BuildRequires: iputils BuildRequires: openssl-devel BuildRequires: libnet-devel BuildRequires: libtool-ltdl-devel #BuildRequires: fedora-usermgmt BuildRequires: net-snmp-devel BuildRequires: bzip2-devel %if %{ENABLE_MGMT} BuildRequires: gnutls-devel BuildRequires: pam-devel BuildRequires: python-devel BuildRequires: swig %endif Requires: stonith = %{version}-%{release} Requires: pils = %{version}-%{release} Requires: ldirectord = %{version}-%{release} Requires: pygtk2 >= 2.4 Requires(pre): fedora-usermgmt Requires(postun): fedora-usermgmt Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig %if %{ENABLE_MGMT} Requires: gettext %endif %description heartbeat is a basic high-availability subsystem for Linux-HA. It will run scripts at initialization, and when machines go up or down. This version will also perform IP address takeover using gratuitous ARPs. It supports "n-node" clusters with significant capabilities for managing resources and dependencies. In addition it continues to support the older release 1 style of 2-node clustering. It implements the following kinds of heartbeats: - Serial ports - UDP/IP multicast (ethernet, etc) - UDP/IP broadcast (ethernet, etc) - UDP/IP heartbeats - "ping" heartbeats (for routers, switches, etc.) (to be used for breaking ties in 2-node systems) %package -n ldirectord Summary: Monitor daemon for maintaining high availability resources Group: System Environment/Daemons Requires: ipvsadm Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig %description -n ldirectord ldirectord is a stand-alone daemon to monitor services of real for virtual services provided by The Linux Virtual Server (http://www.linuxvirtualserver.org/). It is simple to install and works with the heartbeat code (http://www.linux-ha.org/). %package -n stonith Requires: pils = %{version}-%{release} Summary: Provides an interface to Shoot The Other Node In The Head Group: System Environment/Daemons %description -n stonith The STONITH module (a.k.a. STOMITH) provides an extensible interface for remotely powering down a node in the cluster. The idea is quite simple: When the software running on one machine wants to make sure another machine in the cluster is not using a resource, pull the plug on the other machine. It's simple and reliable, albeit admittedly brutal. %package -n pils Summary: Provides a general plugin and interface loading library Group: System Environment/Daemons %description -n pils PILS is an generalized and portable open source Plugin and Interface Loading System. PILS was developed as part of the Open Cluster Framework reference implementation, and is designed to be directly usable by a wide variety of other applications. PILS manages both plugins (loadable objects), and the interfaces these plugins implement. PILS is designed to support any number of plugins implementing any number of interfaces. %package devel Summary: Heartbeat development package Group: System Environment/Daemons Requires: heartbeat = %{version}-%{release} %description devel Heartbeat development package %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %build # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness' CFLAGS=${RPM_OPT_FLAGS} \ %configure \ --disable-fatal-warnings \ --disable-static \ %if %{ENABLE_MGMT} --enable-mgmt %else --disable-mgmt %endif make %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install ( cd $RPM_BUILD_ROOT/etc/ha.d/resource.d ln -s /usr/sbin/ldirectord ldirectord ) # cleanup [ -d $RPM_BUILD_ROOT/usr/man ] && rm -rf $RPM_BUILD_ROOT/usr/man [ -d $RPM_BUILD_ROOT/usr/share/libtool ] && rm -rf $RPM_BUILD_ROOT/usr/share/libtool find $RPM_BUILD_ROOT -type f -name *.la -exec rm -f {} ';' sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crmtest/helper.sh chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/pymgmt.py %clean if [ -n "${RPM_BUILD_ROOT}" -a "${RPM_BUILD_ROOT}" != "/" ]; then rm -rf $RPM_BUILD_ROOT fi rm -rf $RPM_BUILD_DIR/heartbeat-%{version} %pre /usr/sbin/fedora-groupadd %{uid} -r %{gname} &>/dev/null || : /usr/sbin/fedora-useradd %{uid} -r -s /sbin/nologin -d /var/lib/heartbeat/cores/hacluster -M \ -c 'heartbeat user' -g %{gname} %{uname} &>/dev/null || : %post /sbin/ldconfig /sbin/chkconfig --add heartbeat %preun /sbin/chkconfig --del heartbeat %postun /sbin/ldconfig test "$1" != 0 || /usr/sbin/fedora-userdel %{uname} &>/dev/null || : test "$1" != 0 || /usr/sbin/fedora-groupdel %{gname} &>/dev/null || : %post -n ldirectord /sbin/chkconfig --add ldirectord %preun -n ldirectord /sbin/chkconfig --del ldirectord %post -n stonith -p /sbin/ldconfig %postun -n stonith -p /sbin/ldconfig %files %doc %{_datadir}/doc/%{name}-%{version} %defattr(-,root,root) %dir %{_sysconfdir}/ha.d %{_sysconfdir}/ha.d/harc %config(noreplace) %{_sysconfdir}/ha.d/shellfuncs %{_sysconfdir}/ha.d/rc.d %config(noreplace) %{_sysconfdir}/ha.d/README.config %{_libdir}/heartbeat %{_libdir}/libapphb.so.* %{_libdir}/libccmclient.so.* %{_libdir}/libcib.so.* %{_libdir}/libclm.so.* %{_libdir}/libcrmcommon.so.* %{_libdir}/libhbclient.so.* %{_libdir}/liblrm.so.* %{_libdir}/libpengine.so.* %{_libdir}/libplumb.so.* %{_libdir}/libplumbgpl.so.* %{_libdir}/librecoverymgr.so.* %{_libdir}/libstonithd.so.* %{_prefix}/lib/ocf %{_sysconfdir}/ha.d/resource.d/ %exclude %{_sysconfdir}/ha.d/resource.d/ldirectord %{_sysconfdir}/init.d/heartbeat %config(noreplace) %{_sysconfdir}/logrotate.d/heartbeat %dir %{_var}/lib/heartbeat %dir %{_var}/lib/heartbeat/cores %dir %attr (0755, root, root) %{_var}/lib/heartbeat/cores/root %dir %attr (0755, nobody, nobody) %{_var}/lib/heartbeat/cores/nobody %dir %attr (0755, hacluster, haclient) %{_var}/lib/heartbeat/cores/hacluster %dir %{_var}/run/heartbeat %attr (0755, hacluster, haclient) %{_bindir}/cl_status %{_bindir}/cl_respawn %{_sbindir}/crmadmin %{_sbindir}/cibadmin %{_sbindir}/ccm_tool %{_sbindir}/crm_diff %{_sbindir}/crm_uuid %{_sbindir}/crm_mon %{_sbindir}/iso8601 %{_sbindir}/crm_master %{_sbindir}/crm_standby %{_sbindir}/crm_attribute %{_sbindir}/crm_resource %{_sbindir}/crm_verify %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm %dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm %{_mandir}/man1/cl_status.1* %{_mandir}/man1/ha_logger.1* %{_mandir}/man1/hb_standby.1* %{_mandir}/man1/hb_takeover.1* %{_mandir}/man1/hb_addnode.1* %{_mandir}/man1/hb_delnode.1* %{_mandir}/man8/heartbeat.8* %{_mandir}/man8/apphbd.8* %{_mandir}/man8/ha_logd.8* %if %{ENABLE_SNMP_SUBAGENT} /LINUX-HA-MIB.mib %endif %if %{ENABLE_MGMT} %{_libdir}/libhbmgmt.so.* %{_libdir}/libhbmgmtclient.so.* %{_libdir}/libhbmgmtcommon.so.* %{_libdir}/libhbmgmttls.so.* %config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd %{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo %endif %files -n ldirectord %doc doc/COPYING %doc doc/README %doc ldirectord/ldirectord.cf %defattr(-,root,root) %{_sysconfdir}/ha.d/conf %{_sbindir}/ldirectord %{_sbindir}/supervise-ldirectord-config %config(noreplace) %{_sysconfdir}/logrotate.d/ldirectord %{_sysconfdir}/init.d/ldirectord %{_sysconfdir}/ha.d/resource.d/ldirectord %{_mandir}/man8/ldirectord.8* %{_mandir}/man8/supervise-ldirectord-config.8* %files -n stonith %doc doc/COPYING %doc doc/README %defattr(-,root,root) %{_libdir}/*.so.* %{_libdir}/stonith/ %{_sbindir}/stonith %{_sbindir}/meatclient %{_mandir}/man8/stonith.8* %{_mandir}/man8/meatclient.8* %files -n pils %doc doc/COPYING %doc doc/README %defattr(-,root,root) %{_libdir}/pils/ %files devel %doc %{_datadir}/doc/%{name}-%{version} %defattr(-,root,root) %{_includedir}/heartbeat/ %{_includedir}/clplumbing/ %{_includedir}/saf/ %{_includedir}/ocf/ %{_includedir}/stonith/ %{_includedir}/pils/ %{_libdir}/*.so %changelog * Wed Mar 1 2006 Joost Soeterbroek - 2.0.3-9 - changed user creation - added patch2 heartbeat-2.0.3-fedora-ccmuser.patch * Wed Mar 1 2006 Joost Soeterbroek - 2.0.3-8 - specifically excluded ldirectord symlink from heartbeat package - removed user and group deletion in postun - renamed subpackages ldirectord, pils and stonith to lose prefix heartbeat by using -n * Tue Feb 28 2006 Joost Soeterbroek - 2.0.3-7 - fixed more rpmlint errors and warnings * Sat Feb 25 2006 Joost Soeterbroek - 2.0.3-6 - fixed number of rpmlint warnings and errors (still ignores some..) - generate 'predictable' uid and gid with fedora-usermgmt to use with configure flag -with-ccmuser-id and groupadd, useradd - added Buildreq's: libtool-ltdl-devel, fedora-usermgmt-setup net-snmp-devel, bzip2-devel - removed *.so duplication in heartbeat and heartbeat-devel - changed file sections * Fri Feb 24 2006 Joost Soeterbroek - 2.0.3-5 - useradd with fedora-usermgmt - added *.so file to -devel sub-package * Sat Feb 18 2006 Joost Soeterbroek - 2.0.3-4 - removed all perl requires; should be picked up by rpmbuild automagically - changed system user creation hacluster part to use baseid: (http://fedoraproject.org/wiki/Packaging/UserCreation) * Thu Feb 16 2006 Joost Soeterbroek - 2.0.3-3 - removed Requires: python and gnutls - changed _libdir/ocf -> _prefix/lib/ocf - reversed subpackages depend on basepackage - removed Req swig (kept BuildReq) - added Req pygtk2 * Wed Feb 15 2006 Joost Soeterbroek - 2.0.3-2 - fixes for various rpmlint errors and warnings - fixed setup -q - make subpackages depend on basepackage, not reverse - clean buildroot at beginning of install - replaced a number of hardcoded paths with RPM macros - Changed Group from Networking/Daemons to System Environment/Daemons - enable mgmt option * Sun Feb 12 2006 Joost Soeterbroek - 2.0.3-1 - rebuilt for Fedora Extras * Fri Feb 10 2006 Alan Robertson (see doc/AUTHORS file) + Version 2.0.3 - Bug fixes and significant new features. + Management Daemon/Library and GUI client + provide a management library for manamgement daemon and CIM provider + provide a management daemon and a basic GUI management tool + CIM enablement + CIM (Common Information Model) enablement - works with sblim-sfcb, OpenWBEM, and Pegasus CIMOMs - not yet compiled into our binary RPMs because of dependencies + CRM (Cluster Resource Manager) General + All shutdowns go via the PE/TE - preserves inter-resource ordering + Support for future changes to the CIB (depreciation of cib_fragment) + Overhaul of IPC and HA channel callback logic + Many improvments to the quality and quantity (reduced) of logging + CRMd + Timerless elections - when everyone has voted we're done + Use the replace notification from the CIB to re-update our copy with our view of our peers. + Reliably detect if the LRM connection is still active. + Elections + newer versions defer to older ones in DC elections (opposite of current behavior) + this means that only once the complete cluster has been upgraded will we start acting like the new version and accept new config options + it also means newer PE's and TE's (the most complex pieces) don't need "act like the old version" options and can rely on all slaves being at least as up-to-date as they are + people can run mixed clusters as long as they want (until they want the new PE features) + new DCs only update the version number in the CIB if they have a higher value + nodes that start and have a lower version than that stored in the CIB shut themselves down (the CRM part anyway) + this prevents an admin from introducing old nodes back into an upgraded cluster. It probably doesn't fully understand the config and may not support the actions the PE/TE requires. + CIB (Common Information Base daemon) + Make sure "query only" connections cant modify the CIB + Periodically dump some stats about what the CIB has been doing. + Verify there are no memory leaks + Performance enhancements + Prevent a single CIB client from blocking everyone else + Clients Can be notified of full CIB replacements + record_config_changes option in ha.cf for those worried about the amount of logging. Defaults to "on". + suppress_cib_writes CIB option replaced with in enable_config_writes ha.cf (enable_config_writes to be removed in 2.0.4) + Never write the status section to disk + Check permissions for the on-disk CIB at startup + Dont trash unreadable on-disk CIBs + Fix for updates made against the whole CIB (not just one section) + PEngine (Policy Engine) + Many improvements to the handling of resource groups + Support "anonymous" clones + Fix stonith ordering + Order DC shutdowns after everyone else's + Support short resource names (for group and clone resources) + The ordering and colocation of grouped resources is now optional + Support probing new nodes for active resources. + All "probe" actions are controlled by the PE. + No resource may be started until the probing is complete. + Do not probe for resources we know to be active on unprobed nodes + When looking for monitor ops, only mark it optional if it was already active on the node we're interested in. + Detect changes to class/type/provider/parameters and force a restart of the resource + New record_pengine_inputs option in ha.cf for those worried about the amount of logging. Defaults to "on". + Differentiate between config and processing errors + reduces the frequency that we need to log the complete CIB + Make notify for master/slave work + New CIB option: stop_orphan_actions (boolean) If a resource is no longer defined, we can optionally stop it + New CIB option: stop_orphan_actions (boolean) If a monitor op for a given interval is no longer defined, we can optionally stop it + Add support for time and phase-of-the-moon based constraints + Improved failure handling: avoiding false positives + Always create orphaned resources - so they show up in crm_mon + Do not require sequential clone numbers starting at 0 + TEngine (transition engine) + Detect old stonith ops + CLIs (Command Line interfaces) + Create a --one-shot option for crm_mon + Switch a number of CLI tools to use the new syncronous connections + Log errors to stderr where they will be seen and therefore useful + Support migration and un-migration of resources and resource groups + Create crm_verify for checking configuration validity + Simplify the passing of XML to cibadmin + Known open bugs worth mentioning: + 1075, 1080, 1081, 1084, 1085, 1064, 1069, 756, 984 + 1050, 1082, 1037, 1079 * Thu Sep 22 2005 Alan Robertson (see doc/AUTHORS file) + Version 2.0.2 - small bug fix only release + Fixed a bug in ping directive - it works again + Added a check to BasicSanityCheck to check ping and ping_group directives + fixed cl_status nodestatus to return 0 if a node has status "ping" + fixed a memory leak in the CRM's LRM interface code + fixed code which deterimines which version of the CRM becomes the DC when basic CIB schema versions differ. It now prefers the older version to be DC instead of the newer version. * Wed Sep 14 2005 Alan Robertson (see doc/AUTHORS file) + Version 2.0.1 - + Communication Layer + netstring encoding format is changed to be more efficient + add compression capability for big messages + Add man pages for hb_standby/hb_takeover + The assert triggered by 2.0.0 has been fixed + CIB can now contain XML comments and/or be in DOS format + Includes implementation of the ISO8601 date format + New CLI tools for changing cluster preferences, node attributes and node standby + Improved recovery and placement of group resources + Detection of failed nodes by the Policy Engine is fixed + New Policy Engine features http://www.linux-ha.org/ClusterResourceManager/DTD1.0/Annotated : sections 1.5.[8,9,10,12] + Constraints and instance attributes can now be active conditionally + Rules can now contain other rules + Date/Time based expressions are supported + Cloned resources can now optionally be notified before and after any of its peers are stopped or started. + The cluster can re-evaluate the configuration automatically after a defined interval of idleness + Removed a flow control message which was very annoying when operating in a mixed 1.x/2.x environment -- Known Bugs :-( -- - Bug 859 - FSA took too long to complete action - fully recovered from - Bug 882 - IPC channel not connected during shutdown - harmless - Bug 879 - Failed actions cause extra election - harmless Each of these occurs about once or twice in 5000 test iterations - This is probably > 10K failovers - rsc_location constraints cannot have rules that contain other rules (fixed in CVS after release) * Fri Jul 29 2005 Alan Robertson (see doc/AUTHORS file) + Version 2.0.0 - First stable release of the next generation of the Linux-HA project + Basic Characteristics described here: http://linux-ha.org/FactSheetv2 + Core infrastructure improvments: + Messaging (message acknowledging and flow control) + Logging (logging daemon) + Release 1.x style (2-node) clusters fully supported + Multi-node support (so far up to 16-node clusters tested) See http://linux-ha.org/GettingStartedV2 for more information + New components: + Cluster Information Base (replicated resource configuration) + Cluster Resource Manager (supporting 1->N nodes) + Modular Policy Engine (controlling resource placement) + Local Resource Manager (policy free, not cluster aware) + Stonith Daemon (stand-alone fencing subsytem) + Support for OCF and LSB resource agents + Support for composite resource types (groups, clones) + Support for a rich set of resource location and ordering constraints + Conversion tool for existing haresources + Resources monitored by request + Resource "maintenance" mode + Several failback, failure and "No Quorum" behaviours to choose from (global defaults and per action or resource) + Sample cluster state and configuration monitoring tools Known issues in 2.0.0: - Under some rare circumstances the cluster manager will time out while stabilizing a new cluster state. This appears to be otherwise harmless - the cluster is actually fine. http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=770 - Under some rare circumstances, a dev assert will be triggered in unpack.c. This results in the pengine getting restarted. This is annoying, but not a disaster. http://www.osdl.org/developer_bugzilla/show_bug.cgi?id=797 * Tue May 23 2005 Alan Robertson (see doc/AUTHORS file) + Version 1.99.5 - Near-final beta of 2.0.0 release + many bug fixes - code looks very stable at this point -- well tested at this point on 4 and 8 node clusters. * Thu Apr 07 2005 Alan Robertson (see doc/AUTHORS file) + Version 1.99.4 - Near-final beta of 2.0.0 release + many bug fixes since 1.99.1 + new external STONITH model - fully supports scripting interface + tested through 12 node clusters successfully + No serious defects found in testing + Easier-to-understand locational constraints model + Many bug fixes of many kinds + Important bug fixes to OCF IPaddr resource agent + Resources are monitored only on request + See http://wiki.linux-ha.org/ClusterResourceManager/Setup for basic ideas about getting started. + Release 1 style (2-node) clusters still fully supported + Release 2 style clusters support 1-N node clusters (where N is probably something like 8-32) * Tue Mar 20 2005 Alan Robertson (see doc/AUTHORS file) + Version 1.99.3 - Near-final beta "technology preview" of 2.0.0 release + many bug fixes since 1.99.1 + tested through 12 node clusters with reasonable success + new STONITH API * Sun Feb 20 2005 Alan Robertson (see doc/AUTHORS file) + Version 1.99.2 - Near-final beta "technology preview" of 2.0.0 release + Many many many changes. Far too many to describe here. + See http://wiki.linux-ha.org/ClusterResourceManager/Setup for certain basic ideas about getting started. * Mon Oct 11 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.99.1 - *early* beta series - preparing for 2.0.0 + Andrew provided a number of fixes to the CRM and 2.0 features + Fixed a problem with retrying failed STONITH operations * Mon Oct 11 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.99.0 - *early* beta series - preparing for 2.0.0 + All STABLE changes noted below have been ported to this branch + Included in this release is a beta of the next generation of Heartbeat resource manager developed by Andrew Beekhof. http://linuxha.trick.ca/NewHeartbeatDesign is a good place to learn more about this effort. Please examine crm/README, crm/test/README and crm/crm-1.0.dtd for example usage and configuration. + Also included is the L(ocal) R(esource) M(anager) developed by IBM China which is an integral part of the NewHeartbeatDesign. + Known caveats: - STONITH as a whole has seen a code cleanup and should be tested carefully. - The external STONITH plug-in has undergone major surgery and probably doesn't work yet. - the new CRM is not perfectly stable with 3 nodes yet. + PLEASE see http://osdl.org/developer_bugzilla/enter_bug.cgi?product=Linux-HA and use it to report quirks and issues you find! * Sat Sep 18 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.2.3 (stable) + fixed a serious error which causes heartbeat to misbehave after about 10 months of continuous operation + Made our ARP packets more RFC compliant + Extended apcmastersnmp code to deal with new devices + fixed a bug concerning simultaneous stops of both machines causing one of them to not shut down. + added an option to suppress reporting on packet corruption + fixed it so that we don't create the FIFO by the RPM + made cl_status setgid so anyone can run it, and fixed exit codes + eliminated a serious memory leak associated with client code + packaged doc files which had been missed before + fixed many many small bugs and memory leaks detected by BEAM + added several new test cases + fixed longstanding bug in plugin unloading + fixed a shutdown hang problem + several fixes for Solaris, FreeBSD + Solaris packaging now included in base + fixed a bug related to the apache resource agent not handling quoted parameters + added use_apphbd parameter to have heartbeat register with apphbd instead of watchdog device when desired + changed apphbd to default its config file to /etc + added snmp subagent code + added hbaping communications plugin + added external STONITH plugin + ldirectord: fixed a bug where real servers that were are present in multiple virtual services will only be added to one virtual service. * Mon May 11 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.2.2 (stable) + Fixed several format string errors in communication plugins + Fixed a bug which kept us from diagnosing errors in non-aliased interfaces + Fixed a bug in ipaddr which caused an infinite loop when auto_failback on + Updated Debian things... + Added IPv6addr resource agent + Added ibmhmc STONITH plugin + Added cl_status command + Fixed a bug regarding restarts when auto_failback is on... + Fixed a couple of bugs in sha1 authentication method for very long keys + Fixed a bug in the portblock resource agent so that it no longer blocks ports on the loopback interface + Increased the time allowed for split brain test before it declares failure + Version 1.2.1 (stable) + Netstrings can now be used for our on-the-wire data format + Perl/SWIG bindings added for some heartbeat libraries + Significant improvements to SAF data checkpointing API + Implemented unbuffered ipcsocket code for SAF APIs + Many Solaris fixes -- except for ipfail, Solaris works + Significant library restructuring + Watchdog device NOWAYOUT is now overridded if defaulted + Watchdog device now kills machine instantly after deadtime instead of after one minute + Hostnames should now be treated case-independently... + Added new client status APIs - client_status() and cstatus_callback() + Fixed bug with auto_failback and quick full restarts + We now automatically reboot when resources fail to stop correctly... + We now check the status of the configured STONITH device hourly... + STONITH operations repeat after a 5 second delay, not immediately... + Added hb_takeover command - complement to hb_standby + Added documentation on how to use evlog/TCP to enable testing to take place without losing messages due to UDP message forwarding + Several new tests from Mi, Jun - split brain, bandwidth, failure detection time. + Fix to LVM resource from Harald Milz + Fixed FreeBSD authentication problems breaking ipfail + Fixed .so loading on Debian + Fixed false complaints about resource scripts (from Jens Schmalzing) + Fixed false stop failure from LinuxSCSI (from Jens Schmalzing ) * Thu Apr 15 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.3.0 - beta series + Netstrings can now be used for our on-the-wire data format + Perl/SWIG bindings added for some heartbeat libraries + Significant improvements to SAF data checkpointing API + Implemented unbuffered ipcsocket code for SAF APIs + Many Solaris fixes -- except for ipfail, Solaris works + Significant library restructuring + Watchdog device NOWAYOUT is now overridded if defaulted + Watchdog device now kills machine instantly after deadtime instead of after one minute + Hostnames should now be treated case-independently... + Added new client status APIs - client_status() and cstatus_callback() + Fixed bug with auto_failback and quick full restarts + We now automatically reboot when resources fail to stop correctly... + We now check the status of the configured STONITH device hourly... + STONITH operations repeat after a 5 second delay, not immediately... + Added hb_takeover command - complement to hb_standby + Added documentation on how to use evlog/TCP to enable testing to take place without losing messages due to UDP message forwarding + Several new tests from Mi, Jun - split brain, bandwidth, failure detection time. + Fix to LVM resource from Harald Milz * Tue Feb 16 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.2.0 + Replaced the nice_failback option with the auto_failback option. THIS OBSOLETES THE NICE_FAILBACK OPTION. READ THE DOCS FOR HOW TO UPGRADE SMOOTHLY. + Added a new feature to hb_standby which allows you to give up any specific category of resources: local, foreign, or all. The old behavior is "all" which is the default. This allows you to put a auto_failback no cluster into an active/active configuration on demand. + ipfail now works properly with auto_failback on (active/active) + ipfail now has "hysteresis" so that it doesn't respond immediately to a network failure, but waits a little while so that the damage can be properly assessed and extraneous takeovers avoided + Added new ping node timeout directive "deadping" + Made sure heartbeat preallocated stack and heap, and printed a message if we allocate heap once we're started up... + IPMILan STONITH plugin added to CVS + Added IPaddr2 resource script + Made the APC smart UPS ups code compatible with more UPSes + Added a (preliminary?) ordered messaging facility from Yi Zhu + Changed IPaddr's method of doing ARPs in background so that certain timing windows were closed. + Added OCF (wrapper) resource script + Allow respawn programs to take arguments + Added pinggroups (where any node being up is OK) + SIGNIFICANT amount of internal rearchitecture. + Many bug fixes. + Several documentation updates. * Tue Feb 10 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.1.5 + ipfail now has "hysteresis" so that it doesn't respond immediately to a network failure, but waits a little while so that the damage can be properly assessed and extraneous takeovers avoided + Several fixes to cl_poll() + More fixes to the IPC code - especially handling data reception after EOF + removed some unclean code from GSource for treating EOF conditions + Several bugs concerning hanging when shutting down early during startup + A few BasicSanityCheck bug fixes + CTS now allows a single machine to be able to monitor several clusters + Most former CTS options are now either unneeded or on the command line + Increased number of ARPs and how long they're being sent out + Fixed uncommon (authorization) memory leak + Some Solaris portability fixes. + Made init script handle standby correctly for new config files + Improved the fast failure detection test + Added some backwards compatibility for nice_failback and some default authentication directives + Corrected the 1.1.4 change log * Fri Jan 22 2004 Alan Robertson (see doc/AUTHORS file) + Version 1.1.4 + ipfail now works properly with auto_failback on (active/active) + Changed the API to use sockets (IPC library) instead of FIFOs. + Added new apiauth directives to provide authorization information formerly provided by the FIFO permissions. + Added Intel's implementation of the SAF data checkpointing API and daemon + Added a cleanup suggested by Emily Ratliff. + IPMILan STONITH plugin added to CVS + Added IPaddr2 resource script + Various cleanups due to horms. + Fixed authentication to work on 64-bit platforms(!) + Fixed the cl_poll() code to handle corner cases better + Made heartbeat close watchdog device before re-execing itself + New CTS improvements from Mi, Jun + Various minor bug fixes. . Several shutdown bugs addressed . fixed sendarp to make a pid file, so we can shut it down when we shut everything else down in case it's still running. . Lots of minor bug fixes to IPC code . Lots of minor bug fixes to ipctest program . made BasicSanityCheck more tolerant of delays . Fixed IPC code to authenticate based on ints, not int*s. . Check properly for strnlen instead of strlen... . Several signed/unsigned fixes . A few uninitialized vars now are inited . Switched to compiling lex/yacc sources the automake way . Lots of minor CTS fixes... + ldirectord bug fixes: . When new real servers are added on initialisation or when the configuration file is reread they are marked with status of -1 (uninitialised) so they will be checked and inserted into the virtual service as required . All checks use the checkport if set, otherwise the port set for the individual real server. This was the case for http and connect checks, but others had variations on this theme. . When the configuration file is reread because it changed on disk and autoreload is set, check the real servers immediately rather than waiting for checkinterval to expire . Already running message sent to stderr instead of stdout . Support alternate server in real-server specific URL . Treat the same real server with different weights as a different real server. Fixes bug reported by Philip Hayward whereby the same real-server would always have the same weight, regardless of the ldirectord.cf * Fri Sep 26 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.1.3 + Bugfix for heartbeat starting resources twice concurrently if auto_failback was set to "legacy". + Bugfix for messages getting lost if messages were sent in quick succession. (Kurosawa Takahiro) + Bugfix for Filesystem resource checking for presence of filesystem support before loading the module. + BasicSanityCheck extended to cover more basic tests. + Bugfix for findif not working correctly for CIDR netmasks. + Minor bugfix for ldirectord recognizing new schedulers correctly and timeout settings are now being honoured. + Enhanced the message giving a better explanation of how to set up node names properly when current node not found in the ha.cf file + Send a message to the cluster whenever we have a node which doesn't need STONITHing - even though it's gone down. This fix needed by CCM, which is in turn needed by EVMS. + Enhanced the messages for missing ha.cf and missing haresources files explaining that sample config files are found in the documentation. + Fix for memory leak from Forrest Zhao + Added a (preliminary?) ordered messaging facility from Yi Zhu + FAQ updates + Added Xinetd resource script + Added OCF (wrapper) resource script + Allow respawn programs to take arguments + Added pinggroups (where any node being up is OK) + fixed ldirectord negotiatetimeout for HTTP + fixed a bug which caused -d flag to be ignored + failing resource scripts are now ERRORs not WARNings + now shuts down correctly when auto_failback == legacy * Mon Jul 13 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.1.2 + Replaced the nice_failback option with the auto_failback option. THIS OBSOLETES THE NICE_FAILBACK OPTION. READ THE DOCS FOR HOW TO UPGRADE SMOOTHLY. + Changed IPaddr to not do ARPs in background, and shortened time between ARPs. Also made these things tunable... + changed our comm ttys to not become our controlling TTYs + Enhanced the ServeRAID script to fix a critical bug by using a new feature + Added a new DirectoryMap to CVS - tells where everything is... + significantly enhanced the BasicSanityCheck script, and the tests it calls. + added a new option to use a replacement poll function for improved real-time performance. + added the ability to have a cluster node's name be different from it's uname -n + Moved where CTS gets installed to /usr/lib/heartbeat/cts + Big improvements to the CTS README from IBM test labs in Austin. + bug fixes to the WTI NPS power switch + new client API calls: return arbitrary configuration parameters return current resource status + Added a new clplumbing function: mssleep() + added new capabilities for supporting pseudo-resources + added new messages which come out after initial takeover is done (improves CTS results) + LOTS of documentation updates. + fixed a security vulnerability + fixed a bug where heartbeat would shut down while in the middle of processing resource movement requests. + changed compilation flags to eliminate similar future security issues + went to even-more-strict gcc flags + fixed several "reload" bugs. Now reload works ;-) + fixed STONITH bug when other node never heard from. + Minor bug fixes (cleaned up corrupted message) + Two different client API bugs fixed. + changed the configure script to test which warning flags are supported by the current gcc. + enhanced the API test program to test new capabilities... * Wed May 21 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.1.1 + Significant restructuring of the processes in heartbeat + Added a new feature to hb_standby which allows you to give up any specific category of resources: local, foreign, or all. The old behavior is "all" which is the default. This allows you to put a nice_failback cluster into an active/active configuration + Enhancements to the ServeRAID code to make it work with the new (supported) version of IPSSEND from the ServeRAID folks... + Added STONITH code for the Dell remote access controller + Fixed a major bug which kept it from taking over correctly after 246 days or so + Fixed a major bug where heartbeat didn't lock itself into memory properly + Added new ping node timeout directive "deadping" + Made sure heartbeat preallocated stack and heap, and printed a message if we allocate heap once we're started up... + Minor heartbeat API bug fixes + Minor documentation fixes + Minor fix to allow IP addresses with /32 masks... + Fixed a timing window for !nice_failback resource acquisition + Added several CCM bug fixes + Made the APC smart UPS ups code compatible with more UPSes + Fixed a bug in respawn + Enhanced internal checking for malloc errors... + Added IP alias search optimization from Sean Reifscheneider * Wed Mar 19 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.0.2: + Fixed comment errors in heartbeat init script to allow it to run on RH 8.0 + Changed apphbd to use poll(2) instead of sigtimedwait(2) + Put missing files into tarball + Documentation improvements for IPaddr and other things + Fixed an error in hb_standby which kept it from working if releasing resources takes more than 10 seconds + Added a fix to allow heartbeat to run on systems without writable disk (like routers booting from CD-ROM) + Added configuration file for apphbd + Added fix from Adam Li to keep recoverymgr stop looping at high priority + Added fix to ServeRAID resource to make it work with (new) supported hardware + Added Delay resource script + Added fix to Filesystem to allow it to support NFS mounts and allow user to specify mount options + Added fix to IPaddr to make tmp directory for restoring loopback device + Added fix to ipcsocket code to deal correctly with EAGAIN when sending message body * Mon Feb 17 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.0.1: + Fixed some compile errors on different platforms, and library versions + Disable ccm from running on 'ping' nodes + Put in Steve Snodgrass' fix to send_arp to make it work on non-primary interfaces. * Thu Feb 13 2003 Alan Robertson (see doc/AUTHORS file) + Version 1.0.1 beta series 0.4.9g: + Changed default deadtime, warntime, and heartbeat interval + Auto* tool updates + VIP loopback fixes for IP address takeover + Various Solaris and FreeBSD fixes + added SNMP agent + Several CCM bug fixes + two new heartbeat API calls + various documentation fixes, including documentation for ipfail + Numerous minor cleanups. + Fixed a few bugs in the IPC code. + Fixed the (IPC) bug which caused apphbd to hang the whole machine. + Added a new IPC call (waitout) + Wrote a simple IPC test program. + Clarified several log messages. + Cleaned up the ucast communications plugin + Cleaned up for new C compilers + Fixed permissions bug in IPC which caused apphbd to not be usable by all + Added a new rtprio option to the heartbeat config file + updated apphbtest program + Changed ipfail to log things at same level heartbeat does * Sat Nov 30 2002 Alan Robertson (see doc/AUTHORS file) + Version 0.5 beta series (now renamed to 1.0.1 beta series). 0.4.9f: + Added pre-start, pre-stop, post-stop and pre-stop constructs in init script + various IPC fixes + Fix to STONITH behavior: STONITH unresponsive node right after we reboot + Fixed extreme latency in IPC code + various configure.in cleanups + Fixed memory leak in IPC socket code + Added streamlined mainloop/IPC integration code + Moved more heartbeat internal communication to IPC library + Added further support for ipfail + Added supplementary groups to the respawn-ed clients + Added standby to init script actions + Lots of minor CCM fixes + Split (most) resource management code into a separate file. + Fixes to accommodate different versions of libraries + Heartbeat API client headers fixup + Added new API calls + Simplified (and fixed) handling of local status. This would sometimes cause obscure failures on startup. + Added new IPsrcaddr resource script KNOWN BUGS: + apphbd goes into an infinite loop on some platforms * Wed Oct 9 2002 Alan Robertson (see doc/AUTHORS file) 0.4.9e: + Changed client code to keep write file descriptor open at all times (realtime improvement) + Added a "poll replacement" function based on sigtimedwait(2), which should be faster for those cases that can use it. + Added a hb_warntime() call to the application heartbeat API. + Changed all times in the configuration file to be in milliseconds if specified with "ms" at the end. (seconds is still the default). + Fixes to serious security issue due to Nathan Wallwork + Changed read/write child processes to run as nobody. + Fixed a bug where ping packets are printed incorrectly when debugging. + Changed heartbeat code to preallocate a some heap space. + CCM daemon API restructuring + Added ipc_channel_pair() function to the IPC library. + Changed everything to use longclock_t instead of clock_t + Fixed a bug concerning the ifwalk() call on ping nodes in the API + Made apphbd run at high priority and locked into memory + Made a library for setting priority up. + Made ucast comm module at least be configurable and loadable. + Fixed a startup/shutdown timing problem. 0.4.9d: + removed an "open" call for /proc/loadavg (improve realtime behavior) + changed API code to not 1-char reads from clients + Ignored certain error conditions from API clients + fixed an obscure error message about trying to retransmit a packet which we haven't sent yet. This happens after restarts. + made the PILS libraries available in a separate package + moved the stonith headers to stonith/... when installed + improved debugging for NV failure cases... + updated AUTHORS file and simplified the changelog authorship (look in AUTHORS for the real story) + Added Ram Pai's CCM membership code + Added the application heartbeat code + Added the Kevin Dwyer's ipfail client code to the distribution + Many fixes for various tool versions and OS combinations. + Fixed a few bugs related to clients disconnecting. + Fixed some bugs in the CTS test code. + Added BasicSanityCheck script to tell if built objects look good. + Added PATH-like capabilities to PILS + Changed STONITH to use the new plugin system. + *Significantly* improved STONITH usage message (from Lorn Kay) + Fixed some bugs related to restarting. + Made exit codes more LSB-compliant. + Fixed various things so that ping nodes don't break takeovers. 0.4.9c and before: + Cluster partitioning now handled correctly (really!) + Complete rearchitecture of plugin system + Complete restructure of build system to use automake and port things to AIX, FreeBSD and solaris. + Added Lclaudio's "standby" capability to put a node into standby mode on demand. + Added code to send out gratuitous ARP requests as well as gratuitous arp replies during IP address takeover. + Suppress stonith operations for nodes which went down gracefully. + Significantly improved real-time performance + Added new unicast heartbeat type. + Added code to make serial ports flush stale data on new connections. + The Famous CLK_TCK compile time fixes (really!) + Added a document which describes the heartbeat API + Changed the code which makes FIFOs to not try and make the FIFOs for named clients, and several other minor API client changes. + Fixed a fairly rare client API bug where it would shut down the client for no apparent reason. + Added stonith plugins for: apcmaster, apcmastersnmp switches, and ssh module (for test environments only) + Integrated support for the Baytech RPC-3 switch into baytech module + Fixes to APC UPS plugin + Got rid of "control_process: NULL message" message + Got rid of the "controlfifo2msg: cannot create message" message + Added -h option to give usage message for stonith command... + Wait for successful STONITH completion, and retry if its configured. + Sped up takeover code. + Several potential timing problems eliminated. + Cleaned up the shutdown (exit) code considerably. + Detect the death of our core child processes. + Changed where usage messages go depending on exit status from usage(). + Made some more functions static. + Real-time performance improvement changes + Updated the faqntips document + Added a feature to heartbeat.h so that log messages get checked as printf-style messages on GNU C compilers + Changed several log messages to have the right parameters (discovered as a result of the change above) + Numerous FreeBSD, Solaris and OpenBSD fixes. + Added backwards compatibility kludge for udp (versus bcast) + Queued messages to API clients instead of throwing them away. + Added code to send out messages when clients join, leave. + Added support for spawning and monitoring child clients. + Cleaned up error messages. + Added support for DB2, ServeRAID and WAS, LVM, and Apache (IBMhttp too), also ICP Vortex controller. + Added locking when creating new IP aliases. + Added a "unicast" media option. + Added a new SimulStart and standby test case. + Diddled init levels around... + Added an application-level heartbeat API. + Added several new "plumbing" subsystems (IPC, longclock_t, proctrack, etc.) + Added a new "contrib" directory. + Fixed serious (but trivial) bug in the process tracking code which caused it to exit heartbeat - this occured repeatably for STONITH operations. + Write a 'v' to the watchdog device to tell it not to reboot us when we close the device. + Various ldirectord fixes due to Horms + Minor patch from Lorn Kay to deal with loopback interfaces which might have been put in by LVS direct routing + Updated AUTHORS file and moved list of authors over * Fri Mar 16 2001 Alan Robertson + Version 0.4.9 + Split into 3 rpms - heartbeat, heartbeat-stonith heartbeat-ldirectord + Made media modules and authentication modules and stonith modules dynamically loadable. + Added Multicast media support + Added ping node/membership/link type for tiebreaking. This will be useful when implementing quorum on 2-node systems. (not yet compatible with nice_failback(?)) + Removed ppp support + Heartbeat client API support + Added STONITH API library + support for the Baytech RPC-3A power switch + support for the APCsmart UPS + support for the VACM cluster management tool + support for WTI RPS10 + support for Night/Ware RPC100S + support for "Meatware" (human intervention) module + support for "null" (testing only) module + Fixed startup timing bugs + Fixed shutdown sequence bugs: takeover occured before resources were released by other system + Fixed various logging bugs + Closed holes in protection against replay attacks + Added checks that complain if all resources aren't idle on startup. + IP address takeover fixes + Endian fixes + Removed the 8-alias limitation + Takeovers now occur faster (ARPs occur asynchronously) + Port number changes + Use our IANA port number (694) by default + Recognize our IANA port number ("ha-cluster") if it's in /etc/services + Moved several files, etc. from /var/run to /var/lib/heartbeat + Incorporated new ldirectord version + Added late heartbeat warning for late-arriving heartbeats + Added detection of and partial recovery from cluster partitions + Accept multiple arguments for resource scripts + Added Raid1 and Filesystem resource scripts + Added man pages + Added debian package support * Fri Jun 30 2000 Alan Robertson + Version 0.4.8 + Incorporated ldirectord version 1.9 (fixes memory leak) + Made the order of resource takeover more rational: Takeover is now left-to-right, and giveup is right-to-left + Changed the default port number to our official IANA port number (694) + Regularized more messages, eliminated some redundant ones. + Print the version of heartbeat when starting. + Print exhaustive version info when starting with debug on. + Hosts now have 3 statuses {down, up, active} active means that it knows that all its links are operational, and it's safe to send cluster messages + Significant revisions to nice_failback (mainly due to lclaudio) + More SuSE-compatibility. Thanks to Friedrich Lobenstock + Tidied up logging so it can be to files, to syslog or both (Horms) + Tidied up build process (Horms) + Updated ldirectord to produce and install a man page and be compatible with the fwmark options to The Linux Virtual Server (Horms) + Added log rotation for ldirectord and heartbeat using logrotate if it is installed + Added Audible Alarm resource by Kirk Lawson and myself (Horms) + Added init script for ldirectord so it can be run independently of heartbeat (Horms) + Added sample config file for ldirectord (Horms) + An empty /etc/ha.d/conf/ is now part of the rpm distribution as this is where ldirectord's configuration belongs (Horms) + Minor startup script tweaks. Hopefully, we should be able to make core files should we crash in the future. Thanks to Holger Kiehl for diagnosing the problem! + Fixed a bug which kept the "logfile" option from ever working. + Added a TestCluster test utility. Pretty primitive so far... + Fixed the serial locking code so that it unlocks when it shuts down. + Lock heartbeat into memory, and raise our priority + Minor, but important fix from lclaudio to init uninited variable. * Sat Dec 25 1999 Alan Robertson + Version 0.4.7 + Added the nice_failback feature. If the cluster is running when the primary starts it acts as a secondary. (Luis Claudio Goncalves) + Put in lots of code to make lost packet retransmission happen + Stopped trying to use the /proc/ha interface + Finished the error recovery in the heartbeat protocol (and got it to work) + Added test code for the heartbeat protocol + Raised the maximum length of a node name + Added Jacob Rief's ldirectord resource type + Added Stefan Salzer's fix for a 'grep' in IPaddr which wasn't specific enough and would sometimes get IPaddr confused on IP addresses that prefix-matched. + Added Lars Marowsky-Bree's suggestion to make the code almost completely robust with respect to jumping the clock backwards and forwards + Added code from Michael Moerz to keep findif from core dumping if /proc/route can't be read. * Mon Nov 22 1999 Alan Robertson + Version 0.4.6 + Fixed timing problem in "heartbeat restart" so it's reliable now + Made start/stop status compatible with SuSE expectations + Made resource status detection compatible with SuSE start/stop expectations + Fixed a bug relating to serial and ppp-udp authentication (it never worked) + added a little more substance to the error recovery for the HB protocol. + Fixed a bug for logging from shell scripts + Added a little logging for initial resource acquisition + Added #!/bin/sh to the front of shell scripts + Fixed Makefile, so that the build root wasn't compiled into pathnames + Turned on CTSRTS, enabling for flow control for serial ports. + Fixed a bug which kept it from working in non-English environments * Wed Oct 13 1999 Alan Robertson + Version 0.4.5 + Mijta Sarp added a new feature to authenticate heartbeat packets using a variety of strong authentication techniques + Changed resource acquisition and relinquishment to occur in heartbeat, instead of in the start/stop script. This means you don't *really* have to use the start/stop script if you don't want to. + Added -k option to gracefully shut down current heartbeat instance + Added -r option to cause currently running heartbeat to reread config files + Added -s option to report on operational status of "heartbeat" + Sped up resource acquisition on master restart. + Added validation of ipresources file at startup time. + Added code to allow the IPaddr takeover script to be given the interface to take over, instead of inferring it. This was requested by Lars Marowsky-Bree + Incorporated patch from Guenther Thomsen to implement locking for serial ports used for heartbeats + Incorporated patch from Guenther Thomsen to clean up logging. (you can now use syslog and/or file logs) + Improved FreeBSD compatibility. + Fixed a bug where the FIFO doesn't get created correctly. + Fixed a couple of uninitialized variables in heartbeat and /proc/ha code + Fixed longstanding crash bug related to getting a SIGALRM while in malloc or free. + Implemented new memory management scheme, including memory stats * Thu Sep 16 1999 Alan Robertson + Version 0.4.4 + Fixed a stupid error in handling CIDR addresses in IPaddr. + Updated the documentation with the latest from Rudy. * Wed Sep 15 1999 Alan Robertson + Version 0.4.3 + Changed startup scripts to create /dev/watchdog if needed + Turned off loading of /proc/ha module by default. + Incorporated bug fix from Thomas Hepper to IPaddr for PPP configurations + Put in a fix from Gregor Howey where Gregor found that I had stripped off the ::resourceid part of the string in ResourceManager resulting in some bad calls later on. + Made it compliant with the FHS (filesystem hierarchy standard) + Fixed IP address takeover so we can take over on non-eth0 interface + Fixed IP takeover code so we can specify netmasks and broadcast addrs, or default them at the user's option. + Added code to report on message buffer usage on SIGUSR[12] + Made SIGUSR1 increment debug level, and SIGUSR2 decrement it. + Incorporated Rudy's latest "Getting Started" document + Made it largely Debian-compliant. Thanks to Guenther Thomsen, Thomas Hepper, I??aki Fern??ndez Villanueva and others. + Made changes to work better with Red Hat 6.1, and SMP code. + Sometimes it seems that the Master Control Process dies :-( * Sat Aug 14 1999 Alan Robertson + Version 0.4.2 + Implemented simple resource groups + Implemented application notification for groups starting/stopping + Eliminated restriction on floating IPs only being associated with eth0 + Added a uniform resource model, with IP resources being only one kind. (Thanks to Lars Marowsky-Bree for a good suggestion) + Largely rewrote the IP address takeover code, making it clearer, fit into the uniform resource model, and removing some restrictions. + Preliminary "Getting Started" document by Rudy Pawul + Improved the /proc/ha code + Fixed memory leak associated with serial ports, and problem with return of control to the "master" node. (Thanks to Holger Kiehl for reporting them, and testing fixes!) * Tue Jul 6 1999 Alan Robertson + Version 0.4.1 + Fixed major memory leak in 0.4.0 (oops!) + Added code to eliminate duplicate packets and log lost ones + Tightened up PPP/UDP startup/shutdown code + Made PPP/UDP peacefully coexist with "normal" udp + Made logs more uniform and neater + Fixed several other minor bugs + Added very preliminary kernel code for monitoring and controlling heartbeat via /proc/ha. Very cool, but not really done yet. * Wed Jun 30 1999 Alan Robertson + Version 0.4.0 + Changed packet format from single line positional parameter style to a collection of {name,value} pairs. A vital change for the future. + Fixed some bugs with regard to forwarding data around rings + We now modify /etc/ppp/ip-up.local, so PPP-udp works out of the box (at least for Red Hat) + Includes the first version of Volker Wiegand's Hardware Installation Guide (it's pretty good for a first version!) * Wed Jun 09 1999 Alan Robertson + Version 0.3.2 + Added UDP/PPP bidirectional serial ring heartbeat (PPP ensures data integrity on the serial links) + fixed a stupid bug which caused shutdown to give unpredictable results + added timestamps to /var/log/ha-log messages + fixed a couple of other minor oversights. * Sun May 10 1999 Alan Robertson + Version 0.3.1 + Make ChangeLog file from RPM specfile + Made ipresources only install in the DOC directory as a sample * Sun May 09 1999 Alan Robertson + Version 0.3.0 + Added UDP broadcast heartbeat (courtesy of Tom Vogt) + Significantly restructured code making it easier to add heartbeat media + added new directives to config file: + udp interface-name + udpport port-number + baud serial-baud-rate + made manual daemon shutdown easier (only need to kill one) + moved the sample ha.cf file to the Doc directory * Sat Mar 27 1999 Alan Robertson + Version 0.2.0 + Make an RPM out of it + Integrated IP address takeover gotten from Horms + Added support to tickle a watchdog timer whenever our heart beats + Integrated enough basic code to allow a 2-node demo to occur + Integrated patches from Andrew Hildebrand to allow it to run under IRIX. - Known Bugs - Only supports 2-node clusters - Only supports a single IP interface per node in the cluster - Doesn't yet include Tom Vogt's ethernet heartbeat code - No documentation - Not very useful yet :-) ########################################################### Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/heartbeat/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2006 06:39:58 -0000 1.1 +++ .cvsignore 2 Mar 2006 06:41:39 -0000 1.2 @@ -0,0 +1 @@ +heartbeat-2.0.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/heartbeat/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2006 06:39:58 -0000 1.1 +++ sources 2 Mar 2006 06:41:39 -0000 1.2 @@ -0,0 +1 @@ +ef926928325e7f4c1aaa51b93dffdcf4 heartbeat-2.0.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 06:45:28 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 2 Mar 2006 01:45:28 -0500 Subject: owners owners.list,1.692,1.693 Message-ID: <200603020646.k226k0xU023927@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23898/owners Modified Files: owners.list Log Message: added heartbeat - Heartbeat subsystem for High-Availability Linux, fedora_AT_soeterbroek.com Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.692 retrieving revision 1.693 diff -u -r1.692 -r1.693 --- owners.list 2 Mar 2006 05:56:50 -0000 1.692 +++ owners.list 2 Mar 2006 06:45:28 -0000 1.693 @@ -412,6 +412,7 @@ Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org| 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|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|heartbeat|Heartbeat subsystem for High-Availability Linux|fedora at soeterbroek.com|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| Fedora Extras|Hermes|HERMES pixel format conversion library|thomas at apestaart.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 06:45:58 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 2 Mar 2006 01:45:58 -0500 Subject: rpms/git-core/devel .cvsignore, 1.21, 1.22 git.spec, 1.9, 1.10 sources, 1.21, 1.22 Message-ID: <200603020646.k226kVVq023939@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23896 Modified Files: .cvsignore git.spec sources Log Message: Update git to 1.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 23 Feb 2006 02:28:48 -0000 1.21 +++ .cvsignore 2 Mar 2006 06:45:58 -0000 1.22 @@ -1 +1 @@ -git-1.2.3.tar.gz +git-1.2.4.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/git.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- git.spec 23 Feb 2006 02:28:48 -0000 1.9 +++ git.spec 2 Mar 2006 06:45:58 -0000 1.10 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Mar 1 2006 Chris Wright 1.2.4-1 +- git-1.2.4 + * Wed Feb 22 2006 Chris Wright 1.2.3-1 - git-1.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 23 Feb 2006 02:28:48 -0000 1.21 +++ sources 2 Mar 2006 06:45:58 -0000 1.22 @@ -1 +1 @@ -8d03a39d4e2dea1339204b2d3cc41716 git-1.2.3.tar.gz +04b24119a7e3a0a6e322cd9cfc9b08ad git-1.2.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 06:47:51 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 2 Mar 2006 01:47:51 -0500 Subject: rpms/git-core/FC-4 .cvsignore, 1.21, 1.22 git.spec, 1.9, 1.10 sources, 1.21, 1.22 Message-ID: <200603020648.k226mOOo024036@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24011 Modified Files: .cvsignore git.spec sources Log Message: Update git to 1.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 23 Feb 2006 02:30:18 -0000 1.21 +++ .cvsignore 2 Mar 2006 06:47:51 -0000 1.22 @@ -1 +1 @@ -git-1.2.3.tar.gz +git-1.2.4.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/git.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- git.spec 23 Feb 2006 02:30:18 -0000 1.9 +++ git.spec 2 Mar 2006 06:47:51 -0000 1.10 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Mar 1 2006 Chris Wright 1.2.4-1 +- git-1.2.4 + * Wed Feb 22 2006 Chris Wright 1.2.3-1 - git-1.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-4/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 23 Feb 2006 02:30:18 -0000 1.21 +++ sources 2 Mar 2006 06:47:51 -0000 1.22 @@ -1 +1 @@ -8d03a39d4e2dea1339204b2d3cc41716 git-1.2.3.tar.gz +04b24119a7e3a0a6e322cd9cfc9b08ad git-1.2.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 06:50:14 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 2 Mar 2006 01:50:14 -0500 Subject: rpms/git-core/FC-3 .cvsignore, 1.21, 1.22 git.spec, 1.9, 1.10 sources, 1.21, 1.22 Message-ID: <200603020650.k226okNw024154@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/git-core/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24130 Modified Files: .cvsignore git.spec sources Log Message: Update git to 1.2.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 23 Feb 2006 02:31:33 -0000 1.21 +++ .cvsignore 2 Mar 2006 06:50:14 -0000 1.22 @@ -1 +1 @@ -git-1.2.3.tar.gz +git-1.2.4.tar.gz Index: git.spec =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/git.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- git.spec 23 Feb 2006 02:31:33 -0000 1.9 +++ git.spec 2 Mar 2006 06:50:14 -0000 1.10 @@ -1,7 +1,7 @@ # Pass --without docs to rpmbuild if you don't want the documentation # Pass --with email to rpmbuild if you want git-email (more perl dependencies) Name: git -Version: 1.2.3 +Version: 1.2.4 Release: 1%{?dist} Summary: Git core and tools License: GPL @@ -141,6 +141,9 @@ %{!?_without_docs: %doc Documentation/*.html } %changelog +* Wed Mar 1 2006 Chris Wright 1.2.4-1 +- git-1.2.4 + * Wed Feb 22 2006 Chris Wright 1.2.3-1 - git-1.2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/git-core/FC-3/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 23 Feb 2006 02:31:33 -0000 1.21 +++ sources 2 Mar 2006 06:50:14 -0000 1.22 @@ -1 +1 @@ -8d03a39d4e2dea1339204b2d3cc41716 git-1.2.3.tar.gz +04b24119a7e3a0a6e322cd9cfc9b08ad git-1.2.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 06:56:42 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 01:56:42 -0500 Subject: rpms/namazu/devel .cvsignore, 1.2, 1.3 namazu-fixinutf8.patch, 1.1, 1.2 namazu.spec, 1.2, 1.3 sources, 1.2, 1.3 namazu-2.0.13-de.patch, 1.1, NONE Message-ID: <200603020657.k226vFpc024241@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24215 Modified Files: .cvsignore namazu-fixinutf8.patch namazu.spec sources Removed Files: namazu-2.0.13-de.patch Log Message: * Thu Mar 2 2006 Akira TAGOH - 2.0.15-1 - New upstream release. - namazu-2.0.13-de.patch: removed. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 30 May 2005 02:23:25 -0000 1.2 +++ .cvsignore 2 Mar 2006 06:56:42 -0000 1.3 @@ -1 +1,2 @@ namazu-2.0.14.tar.gz +namazu-2.0.15.tar.gz namazu-fixinutf8.patch: Index: namazu-fixinutf8.patch =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/namazu-fixinutf8.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- namazu-fixinutf8.patch 30 May 2005 02:23:25 -0000 1.1 +++ namazu-fixinutf8.patch 2 Mar 2006 06:56:42 -0000 1.2 @@ -1,6 +1,6 @@ -diff -uNr namazu-2.0.13/filter/Makefile.am utf8.namazu-2.0.13/filter/Makefile.am ---- namazu-2.0.13/filter/Makefile.am 2003-08-24 19:41:55.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/Makefile.am 2004-04-15 16:12:10.000000000 +0900 +diff -ruN namazu-2.0.15.orig/filter/Makefile.am namazu-2.0.15/filter/Makefile.am +--- namazu-2.0.15.orig/filter/Makefile.am 2004-09-18 14:03:02.000000000 +0900 ++++ namazu-2.0.15/filter/Makefile.am 2006-03-02 15:40:59.000000000 +0900 @@ -20,6 +20,8 @@ hnf.pl \ html.pl \ @@ -10,24 +10,10 @@ man.pl \ mhonarc.pl \ msword.pl \ -diff -uNr namazu-2.0.13/filter/Makefile.in utf8.namazu-2.0.13/filter/Makefile.in ---- namazu-2.0.13/filter/Makefile.in 2004-04-14 03:09:02.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/Makefile.in 2004-04-15 16:13:32.000000000 +0900 -@@ -167,7 +167,9 @@ - rtf.pl \ - apachecache.pl \ - macbinary.pl \ -- mp3.pl -+ mp3.pl \ -+ langspec.txt \ -+ langspec.txt.utf8 - - - EXTRA_DIST = $(filter_DATA) -diff -uNr namazu-2.0.13/filter/hnf.pl utf8.namazu-2.0.13/filter/hnf.pl ---- namazu-2.0.13/filter/hnf.pl 2001-11-29 18:31:43.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/hnf.pl 2004-04-15 16:12:10.000000000 +0900 -@@ -69,8 +69,10 @@ +diff -ruN namazu-2.0.15.orig/filter/hnf.pl namazu-2.0.15/filter/hnf.pl +--- namazu-2.0.15.orig/filter/hnf.pl 2005-06-06 15:13:35.000000000 +0900 ++++ namazu-2.0.15/filter/hnf.pl 2006-03-02 15:40:59.000000000 +0900 +@@ -72,8 +72,10 @@ my $mark = "# "; my $end = "--"; @@ -40,9 +26,9 @@ get_uri($cfile, $fields); hnf_filter($contref, $weighted_str, $fields, $headings, $cfile, -diff -uNr namazu-2.0.13/filter/langspec.txt utf8.namazu-2.0.13/filter/langspec.txt ---- namazu-2.0.13/filter/langspec.txt 1970-01-01 09:00:00.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/langspec.txt 2004-04-15 16:12:10.000000000 +0900 +diff -ruN namazu-2.0.15.orig/filter/langspec.txt namazu-2.0.15/filter/langspec.txt +--- namazu-2.0.15.orig/filter/langspec.txt 1970-01-01 09:00:00.000000000 +0900 ++++ namazu-2.0.15/filter/langspec.txt 2006-03-02 15:40:59.000000000 +0900 @@ -0,0 +1,8 @@ +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(??|??|\.|??|,|??|\@|??|??)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(????|??????????|????????????|??????????)(.{0,2})?\s*$) +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|????|??????|????))|(^.+(????????|reply\s*????|????|??????|??????????|??????????|????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>) @@ -52,9 +38,9 @@ +hnf.pl_filter_2: ?? +gfilter.pl_line_adjust_filter: (??|??)$ +wakati.pl_wakatize_japanese: (.+ )???? -diff -uNr namazu-2.0.13/filter/langspec.txt.utf8 utf8.namazu-2.0.13/filter/langspec.txt.utf8 ---- namazu-2.0.13/filter/langspec.txt.utf8 1970-01-01 09:00:00.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/langspec.txt.utf8 2004-04-15 16:12:10.000000000 +0900 +diff -ruN namazu-2.0.15.orig/filter/langspec.txt.utf8 namazu-2.0.15/filter/langspec.txt.utf8 +--- namazu-2.0.15.orig/filter/langspec.txt.utf8 1970-01-01 09:00:00.000000000 +0900 ++++ namazu-2.0.15/filter/langspec.txt.utf8 2006-03-02 15:40:59.000000000 +0900 @@ -0,0 +1,8 @@ +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(???|???|\.|???|,|???|\@|???|???)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(??????|???????????????|??????????????????|???????????????)(.{0,2})?\s*$) +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|??????|?????????|??????))|(^.+(????????????|reply\s*??????|??????|?????????|???????????????|???????????????|??????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>) @@ -64,10 +50,10 @@ +hnf.pl_filter_2: ??? +gfilter.pl_line_adjust_filter: (???|???)$ +wakati.pl_wakatize_japanese: (.+ )?????? -diff -uNr namazu-2.0.13/filter/mailnews.pl utf8.namazu-2.0.13/filter/mailnews.pl ---- namazu-2.0.13/filter/mailnews.pl 2004-03-21 00:48:30.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/mailnews.pl 2004-04-15 16:12:10.000000000 +0900 -@@ -182,13 +182,23 @@ +diff -ruN namazu-2.0.15.orig/filter/mailnews.pl namazu-2.0.15/filter/mailnews.pl +--- namazu-2.0.15.orig/filter/mailnews.pl 2006-01-29 22:26:44.000000000 +0900 ++++ namazu-2.0.15/filter/mailnews.pl 2006-03-02 15:46:33.000000000 +0900 +@@ -246,13 +246,23 @@ $$contref = ""; # Greeting at the beginning (first one or two lines) @@ -97,11 +83,11 @@ } # Isolate citation parts. -@@ -213,11 +223,22 @@ +@@ -277,11 +287,22 @@ # Process only first five paragrahs. # And don't handle the paragrah which has five or longer lines. # Hmm, this regex looks very hairly. -- if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:|????|??????|????))|(^.+(????????|reply\s*????|????|??????|??????????|??????????|????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)/im) { +- if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:|????|??????|????))|(^.+(????????|reply\s*????|????|??????|??????????|??????????|????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|<\S+\@[\w\-\.]+?\.\w+>/im) { - util::dprint("\n\n<<<<$line>>>>\n\n"); - $omake .= $line . "\n"; - $line = ""; @@ -109,13 +95,13 @@ + $regexp = util::read_langspec_char_from_file ("./langspec.txt", "mailnews.pl_mailnews_citation_filter_2"); + + if ($regexp eq "") { -+ if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:))|(^.+(wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>)/im) { ++ if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /(^\s*(Date:|Subject:|Message-ID:|From:))|(^.+(wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|<\S+\@[\w\-\.]+?\.\w+>/im) { + util::dprint("\n\n<<<<$line>>>>\n\n"); + $omake .= $line . "\n"; + $line = ""; + next; + } -+ } else { ++ } else { + if ($i < 5 && ($line =~ tr/\n/\n/) <= 5 && $line =~ /$regexp/im) { + util::dprint("\n\n<<<<$line>>>>\n\n"); + $omake .= $line . "\n"; @@ -125,10 +111,10 @@ } $$contref .= $line. "\n\n"; $i++; -diff -uNr namazu-2.0.13/filter/man.pl utf8.namazu-2.0.13/filter/man.pl ---- namazu-2.0.13/filter/man.pl 2002-02-13 16:39:14.000000000 +0900 -+++ utf8.namazu-2.0.13/filter/man.pl 2004-04-15 16:12:10.000000000 +0900 -@@ -140,17 +140,36 @@ +diff -ruN namazu-2.0.15.orig/filter/man.pl namazu-2.0.15/filter/man.pl +--- namazu-2.0.15.orig/filter/man.pl 2005-06-06 15:13:35.000000000 +0900 ++++ namazu-2.0.15/filter/man.pl 2006-03-02 15:40:59.000000000 +0900 +@@ -171,17 +171,36 @@ my $weight = $conf::Weight{'html'}->{'title'}; $$weighted_str .= "\x7f$weight\x7f$title\x7f/$weight\x7f\n"; @@ -174,10 +160,10 @@ } } -diff -uNr namazu-2.0.13/pl/gfilter.pl utf8.namazu-2.0.13/pl/gfilter.pl ---- namazu-2.0.13/pl/gfilter.pl 2004-01-31 03:28:19.000000000 +0900 -+++ utf8.namazu-2.0.13/pl/gfilter.pl 2004-04-15 16:12:10.000000000 +0900 -@@ -90,13 +90,14 @@ +diff -ruN namazu-2.0.15.orig/pl/gfilter.pl namazu-2.0.15/pl/gfilter.pl +--- namazu-2.0.15.orig/pl/gfilter.pl 2004-11-01 21:56:44.000000000 +0900 ++++ namazu-2.0.15/pl/gfilter.pl 2006-03-02 15:40:59.000000000 +0900 +@@ -92,13 +92,14 @@ return undef unless defined($$text); my @tmp = split(/\n/, $$text); @@ -193,10 +179,10 @@ $line =~ s/([a-z])-\n/$1/; # for hyphenation. } $$text = join('', @tmp); -diff -uNr namazu-2.0.13/pl/util.pl utf8.namazu-2.0.13/pl/util.pl ---- namazu-2.0.13/pl/util.pl 2004-03-19 00:54:09.000000000 +0900 -+++ utf8.namazu-2.0.13/pl/util.pl 2004-04-15 16:12:10.000000000 +0900 -@@ -331,4 +331,36 @@ +diff -ruN namazu-2.0.15.orig/pl/util.pl namazu-2.0.15/pl/util.pl +--- namazu-2.0.15.orig/pl/util.pl 2006-03-02 15:38:01.000000000 +0900 ++++ namazu-2.0.15/pl/util.pl 2006-03-02 15:40:59.000000000 +0900 +@@ -562,4 +562,36 @@ } } @@ -233,9 +219,9 @@ +} + 1; -diff -uNr namazu-2.0.13/pl/wakati.pl utf8.namazu-2.0.13/pl/wakati.pl ---- namazu-2.0.13/pl/wakati.pl 2004-03-04 16:25:57.000000000 +0900 -+++ utf8.namazu-2.0.13/pl/wakati.pl 2004-04-15 16:12:48.000000000 +0900 +diff -ruN namazu-2.0.15.orig/pl/wakati.pl namazu-2.0.15/pl/wakati.pl +--- namazu-2.0.15.orig/pl/wakati.pl 2006-01-23 18:18:24.000000000 +0900 ++++ namazu-2.0.15/pl/wakati.pl 2006-03-02 15:40:59.000000000 +0900 @@ -53,8 +53,10 @@ # Collect only noun words when -m option is specified. if ($var::Opt{'noun'}) { Index: namazu.spec =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/namazu.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- namazu.spec 30 May 2005 02:51:38 -0000 1.2 +++ namazu.spec 2 Mar 2006 06:56:42 -0000 1.3 @@ -6,14 +6,14 @@ Summary: Namazu is a full-text search engine Name: namazu -Version: 2.0.14 -Release: 3 +Version: 2.0.15 +Release: 1%{?dist} License: GPL Group: Applications/Text URL: http://www.namazu.org/ BuildRequires: perl >= 5.6.0, perl-NKF >= 1.70, perl-Text-Kakasi >= 1.00 BuildPreReq: perl-File-MMagic >= 1.12 -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl >= 5.6.0, perl-File-MMagic >= 1.12, perl-NKF >= 1.70 Requires: kakasi >= 2.3.0, perl-Text-Kakasi >= 1.00 @@ -24,7 +24,6 @@ Patch0: namazu-linguas.patch Patch1: namazu-2.0.6-newgettext3.patch Patch2: namazu-fixinutf8.patch -Patch3: namazu-2.0.13-de.patch Source1: filter-requires-namazu.sh %define __find_requires %{SOURCE1} @@ -60,7 +59,6 @@ %patch0 -p1 -b .linguas %patch1 -p1 -b .newgettext %patch2 -p1 -b .fixinutf8 -%patch3 -p1 -b .fixde %build %configure @@ -117,6 +115,8 @@ %{_bindir}/mailutime %{_bindir}/nmzgrep %{_bindir}/nmzmerge +%{_bindir}/nmzcat +%{_bindir}/nmzegrep %{_libdir}/*.so.* %{_mandir}/man1/* %{_datadir}/namazu/filter/* @@ -139,6 +139,10 @@ %changelog +* Thu Mar 2 2006 Akira TAGOH - 2.0.15-1 +- New upstream release. +- namazu-2.0.13-de.patch: removed. + * Mon May 30 2005 Akira TAGOH - 2.0.14-3 - rebuilt to import into Extras. Index: sources =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 30 May 2005 02:23:25 -0000 1.2 +++ sources 2 Mar 2006 06:56:42 -0000 1.3 @@ -1 +1 @@ -17d7253ec58241a95c0b80d469be63b2 namazu-2.0.14.tar.gz +8093ad48dfa5ec2d314881d6ff6d88a9 namazu-2.0.15.tar.gz --- namazu-2.0.13-de.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 07:30:38 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 02:30:38 -0500 Subject: rpms/namazu/devel namazu-fixinutf8.patch, 1.2, 1.3 namazu.spec, 1.3, 1.4 Message-ID: <200603020731.k227VBGd026224@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26202 Modified Files: namazu-fixinutf8.patch namazu.spec Log Message: namazu-fixinutf8.patch: Index: namazu-fixinutf8.patch =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/namazu-fixinutf8.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- namazu-fixinutf8.patch 2 Mar 2006 06:56:42 -0000 1.2 +++ namazu-fixinutf8.patch 2 Mar 2006 07:30:38 -0000 1.3 @@ -1,6 +1,6 @@ diff -ruN namazu-2.0.15.orig/filter/Makefile.am namazu-2.0.15/filter/Makefile.am --- namazu-2.0.15.orig/filter/Makefile.am 2004-09-18 14:03:02.000000000 +0900 -+++ namazu-2.0.15/filter/Makefile.am 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/filter/Makefile.am 2006-03-02 16:25:25.000000000 +0900 @@ -20,6 +20,8 @@ hnf.pl \ html.pl \ @@ -10,9 +10,21 @@ man.pl \ mhonarc.pl \ msword.pl \ +diff -ruN namazu-2.0.15.orig/filter/Makefile.in namazu-2.0.15/filter/Makefile.in +--- namazu-2.0.15.orig/filter/Makefile.in 2006-01-29 22:58:27.000000000 +0900 ++++ namazu-2.0.15/filter/Makefile.in 2006-03-02 16:25:55.000000000 +0900 +@@ -151,6 +151,8 @@ + hnf.pl \ + html.pl \ + mailnews.pl \ ++ langspec.txt \ ++ langspec.txt.utf8 \ + man.pl \ + mhonarc.pl \ + msword.pl \ diff -ruN namazu-2.0.15.orig/filter/hnf.pl namazu-2.0.15/filter/hnf.pl --- namazu-2.0.15.orig/filter/hnf.pl 2005-06-06 15:13:35.000000000 +0900 -+++ namazu-2.0.15/filter/hnf.pl 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/filter/hnf.pl 2006-03-02 16:25:25.000000000 +0900 @@ -72,8 +72,10 @@ my $mark = "# "; @@ -28,7 +40,7 @@ hnf_filter($contref, $weighted_str, $fields, $headings, $cfile, diff -ruN namazu-2.0.15.orig/filter/langspec.txt namazu-2.0.15/filter/langspec.txt --- namazu-2.0.15.orig/filter/langspec.txt 1970-01-01 09:00:00.000000000 +0900 -+++ namazu-2.0.15/filter/langspec.txt 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/filter/langspec.txt 2006-03-02 16:25:25.000000000 +0900 @@ -0,0 +1,8 @@ +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(??|??|\.|??|,|??|\@|??|??)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(????|??????????|????????????|??????????)(.{0,2})?\s*$) +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|????|??????|????))|(^.+(????????|reply\s*????|????|??????|??????????|??????????|????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>) @@ -40,7 +52,7 @@ +wakati.pl_wakatize_japanese: (.+ )???? diff -ruN namazu-2.0.15.orig/filter/langspec.txt.utf8 namazu-2.0.15/filter/langspec.txt.utf8 --- namazu-2.0.15.orig/filter/langspec.txt.utf8 1970-01-01 09:00:00.000000000 +0900 -+++ namazu-2.0.15/filter/langspec.txt.utf8 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/filter/langspec.txt.utf8 2006-03-02 16:25:25.000000000 +0900 @@ -0,0 +1,8 @@ +mailnews.pl_mailnews_citation_filter_1: (^\s*((([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(???|???|\.|???|,|???|\@|???|???)\s*){0,2}\s*(([\xa1-\xfe][\xa1-\xfe]){1,8}|([\x21-\x7e]{1,16}))\s*(??????|???????????????|??????????????????|???????????????)(.{0,2})?\s*$) +mailnews.pl_mailnews_citation_filter_2: (^\s*(Date:|Subject:|Message-ID:|From:|??????|?????????|??????))|(^.+(????????????|reply\s*??????|??????|?????????|???????????????|???????????????|??????|wrote|said|writes|says)(.{0,2})?\s*$)|(^.*In .*(article|message))|(<\S+\@([\w\-.]\.)+\w+>) @@ -52,7 +64,7 @@ +wakati.pl_wakatize_japanese: (.+ )?????? diff -ruN namazu-2.0.15.orig/filter/mailnews.pl namazu-2.0.15/filter/mailnews.pl --- namazu-2.0.15.orig/filter/mailnews.pl 2006-01-29 22:26:44.000000000 +0900 -+++ namazu-2.0.15/filter/mailnews.pl 2006-03-02 15:46:33.000000000 +0900 ++++ namazu-2.0.15/filter/mailnews.pl 2006-03-02 16:25:25.000000000 +0900 @@ -246,13 +246,23 @@ $$contref = ""; @@ -113,7 +125,7 @@ $i++; diff -ruN namazu-2.0.15.orig/filter/man.pl namazu-2.0.15/filter/man.pl --- namazu-2.0.15.orig/filter/man.pl 2005-06-06 15:13:35.000000000 +0900 -+++ namazu-2.0.15/filter/man.pl 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/filter/man.pl 2006-03-02 16:25:25.000000000 +0900 @@ -171,17 +171,36 @@ my $weight = $conf::Weight{'html'}->{'title'}; $$weighted_str .= "\x7f$weight\x7f$title\x7f/$weight\x7f\n"; @@ -162,7 +174,7 @@ diff -ruN namazu-2.0.15.orig/pl/gfilter.pl namazu-2.0.15/pl/gfilter.pl --- namazu-2.0.15.orig/pl/gfilter.pl 2004-11-01 21:56:44.000000000 +0900 -+++ namazu-2.0.15/pl/gfilter.pl 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/pl/gfilter.pl 2006-03-02 16:25:25.000000000 +0900 @@ -92,13 +92,14 @@ return undef unless defined($$text); @@ -180,8 +192,8 @@ } $$text = join('', @tmp); diff -ruN namazu-2.0.15.orig/pl/util.pl namazu-2.0.15/pl/util.pl ---- namazu-2.0.15.orig/pl/util.pl 2006-03-02 15:38:01.000000000 +0900 -+++ namazu-2.0.15/pl/util.pl 2006-03-02 15:40:59.000000000 +0900 +--- namazu-2.0.15.orig/pl/util.pl 2006-03-02 16:24:57.000000000 +0900 ++++ namazu-2.0.15/pl/util.pl 2006-03-02 16:25:25.000000000 +0900 @@ -562,4 +562,36 @@ } } @@ -221,7 +233,7 @@ 1; diff -ruN namazu-2.0.15.orig/pl/wakati.pl namazu-2.0.15/pl/wakati.pl --- namazu-2.0.15.orig/pl/wakati.pl 2006-01-23 18:18:24.000000000 +0900 -+++ namazu-2.0.15/pl/wakati.pl 2006-03-02 15:40:59.000000000 +0900 ++++ namazu-2.0.15/pl/wakati.pl 2006-03-02 16:25:25.000000000 +0900 @@ -53,8 +53,10 @@ # Collect only noun words when -m option is specified. if ($var::Opt{'noun'}) { Index: namazu.spec =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/namazu.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- namazu.spec 2 Mar 2006 06:56:42 -0000 1.3 +++ namazu.spec 2 Mar 2006 07:30:38 -0000 1.4 @@ -7,7 +7,7 @@ Summary: Namazu is a full-text search engine Name: namazu Version: 2.0.15 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Text URL: http://www.namazu.org/ @@ -139,9 +139,10 @@ %changelog -* Thu Mar 2 2006 Akira TAGOH - 2.0.15-1 +* Thu Mar 2 2006 Akira TAGOH - 2.0.15-2 - New upstream release. - namazu-2.0.13-de.patch: removed. +- namazu-fixinutf8.patch: updated. * Mon May 30 2005 Akira TAGOH - 2.0.14-3 - rebuilt to import into Extras. From fedora-extras-commits at redhat.com Thu Mar 2 07:33:00 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 02:33:00 -0500 Subject: rpms/paps/devel paps.spec,1.5,1.6 Message-ID: <200603020733.k227XWjc026299@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26278 Modified Files: paps.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 0.6.3-2 - rebuilt. Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- paps.spec 11 Jan 2006 06:13:52 -0000 1.5 +++ paps.spec 2 Mar 2006 07:32:59 -0000 1.6 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -44,6 +44,9 @@ %changelog +* Thu Mar 2 2006 Akira TAGOH - 0.6.3-2 +- rebuilt. + * Wed Jan 11 2006 Akira TAGOH - 0.6.3-1 - New upstream release. - paps-0.6.2-fix-bufferoverflow.patch: removed. From fedora-extras-commits at redhat.com Thu Mar 2 07:38:23 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 02:38:23 -0500 Subject: rpms/perl-Text-Kakasi/devel perl-Text-Kakasi.spec,1.2,1.3 Message-ID: <200603020738.k227ctr3026403@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/perl-Text-Kakasi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26379 Modified Files: perl-Text-Kakasi.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 2.04-2 - rebuilt. Index: perl-Text-Kakasi.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-Kakasi/devel/perl-Text-Kakasi.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Text-Kakasi.spec 30 May 2005 02:48:16 -0000 1.2 +++ perl-Text-Kakasi.spec 2 Mar 2006 07:38:23 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Text-Kakasi Version: 2.04 -Release: 1 +Release: 2%{?dist} Summary: Kakasi library module for perl Group: Development/Libraries @@ -59,6 +59,9 @@ %changelog +* Thu Mar 2 2006 Akira TAGOH - 2.04-2 +- rebuilt. + * Mon May 30 2005 Akira TAGOH - 2.04-1 - Updates to 2.04. - import to Extras. From fedora-extras-commits at redhat.com Thu Mar 2 07:40:47 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 2 Mar 2006 02:40:47 -0500 Subject: rpms/scim-fcitx/devel scim-fcitx.spec,1.3,1.4 Message-ID: <200603020741.k227fJoC026486@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-fcitx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26460 Modified Files: scim-fcitx.spec Log Message: rebuild for FE5 Index: scim-fcitx.spec =================================================================== RCS file: /cvs/extras/rpms/scim-fcitx/devel/scim-fcitx.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scim-fcitx.spec 13 Feb 2006 05:53:43 -0000 1.3 +++ scim-fcitx.spec 2 Mar 2006 07:40:47 -0000 1.4 @@ -2,7 +2,7 @@ Name: scim-fcitx Version: 3.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: FCITX Input Method Engine for SCIM Group: System Environment/Libraries @@ -75,6 +75,9 @@ %changelog +* Thu Mar 2 2006 Jens Petersen - 3.1.1-4 +- rebuild for FE5 + * Mon Feb 13 2006 Jens Petersen - 3.1.1-3 - build conditionally with libstdc++so7 preview library (#166041) - add with_libstdc_preview switch and tweak libtool to link against it From fedora-extras-commits at redhat.com Thu Mar 2 07:46:14 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 02:46:14 -0500 Subject: rpms/w3m-el/devel w3m-el.spec,1.2,1.3 Message-ID: <200603020746.k227klJq026590@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/w3m-el/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26568 Modified Files: w3m-el.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 1.4.2-2 - rebuilt Index: w3m-el.spec =================================================================== RCS file: /cvs/extras/rpms/w3m-el/devel/w3m-el.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- w3m-el.spec 30 May 2005 10:52:45 -0000 1.2 +++ w3m-el.spec 2 Mar 2006 07:46:14 -0000 1.3 @@ -2,10 +2,10 @@ Name: w3m-el Version: 1.4.4 -Release: 1 +Release: 2%{?dist} License: BSD URL: http://emacs-w3m.namazu.org/ -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildPreReq: emacs BuildPreReq: xemacs >= %{xemacsver}, flim-xemacs BuildPreReq: flim @@ -60,7 +60,7 @@ %install -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d @@ -90,7 +90,7 @@ rm -rf $RPM_BUILD_ROOT%{_infodir}/dir %clean -[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post common @@ -109,26 +109,32 @@ %files %defattr (-, root, root) -%doc COPYING ChangeLog ChangeLog.1 README README.ja +%doc COPYING ChangeLog ChangeLog.1 README +%lang(ja) %doc README.ja %dir %{_datadir}/emacs/site-lisp/w3m %{_datadir}/emacs/site-lisp/w3m/* %{_datadir}/emacs/site-lisp/site-start.d/w3m-init.el %files xemacs %defattr (-, root, root) -%doc COPYING ChangeLog ChangeLog.1 README README.ja +%doc COPYING ChangeLog ChangeLog.1 README +%lang(ja) %doc README.ja %dir %{_datadir}/xemacs/xemacs-packages/lisp/w3m %{_datadir}/xemacs/xemacs-packages/lisp/w3m/* %{_datadir}/xemacs/site-packages/lisp/site-start.d/w3m-init.el %files common %defattr (-, root, root) -%doc COPYING ChangeLog ChangeLog.1 README README.ja +%doc COPYING ChangeLog ChangeLog.1 README +%lang(ja) %doc README.ja %dir %{_datadir}/pixmaps/w3m-el %{_datadir}/pixmaps/w3m-el/* %{_infodir}/* %changelog +* Thu Mar 2 2006 Akira TAGOH - 1.4.2-2 +- rebuilt + * Mon May 9 2005 Akira TAGOH - 1.4.4-1 - Updates to 1.4.4. - import into Extras. From fedora-extras-commits at redhat.com Thu Mar 2 07:54:16 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 2 Mar 2006 02:54:16 -0500 Subject: rpms/uim/devel uim.spec,1.25,1.26 Message-ID: <200603020754.k227snQq026687@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/uim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26670 Modified Files: uim.spec Log Message: * Thu Mar 2 2006 Akira TAGOH - 1.0.1-2 - rebuilt. Index: uim.spec =================================================================== RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- uim.spec 27 Dec 2005 04:50:32 -0000 1.25 +++ uim.spec 2 Mar 2006 07:54:16 -0000 1.26 @@ -4,7 +4,7 @@ Name: uim Version: 1.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/BSD URL: http://uim.freedesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -343,6 +343,9 @@ %{_datadir}/uim/m17nlib.scm %changelog +* Thu Mar 2 2006 Akira TAGOH - 1.0.1-2 +- rebuilt. + * Tue Dec 27 2005 Akira TAGOH - 1.0.1-1 - New upstream release. From fedora-extras-commits at redhat.com Thu Mar 2 07:58:18 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 2 Mar 2006 02:58:18 -0500 Subject: rpms/FreeWnn/devel FreeWnn.spec,1.2,1.3 Message-ID: <200603020758.k227woQv026759@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/FreeWnn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26736 Modified Files: FreeWnn.spec Log Message: rebuild for FE5 Index: FreeWnn.spec =================================================================== RCS file: /cvs/extras/rpms/FreeWnn/devel/FreeWnn.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- FreeWnn.spec 13 Jun 2005 13:33:13 -0000 1.2 +++ FreeWnn.spec 2 Mar 2006 07:58:18 -0000 1.3 @@ -5,7 +5,7 @@ Summary: A Japanese character set conversion system. Name: FreeWnn Version: %{tarballversion}pl%{patchlevel} -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Group: Applications/System License: Distributable @@ -242,6 +242,12 @@ %attr(755,root,root) %{_libdir}/libwnn.so.0.0.0 %changelog +* Thu Mar 2 2006 Jens Petersen - 1:1.10pl020-7 +- rebuild for FE5 + +* Thu Jun 30 2005 Jens Petersen - 1:1.10pl020-6 +- import to Extras + * Fri Oct 29 2004 Jens Petersen - 1:1.10pl020-5 - before upgrading modify the wnn user and group (in the same way mailman does) rather than deleting and recreating them to really fix the upgrade failure From fedora-extras-commits at redhat.com Thu Mar 2 08:40:16 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 2 Mar 2006 03:40:16 -0500 Subject: rpms/ghc/devel ghc.spec,1.10,1.11 Message-ID: <200603020840.k228em96028825@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28779 Modified Files: ghc.spec Log Message: - buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024) - make ghc-doc require ghc (Michel Salim, #180449) Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ghc.spec 11 Oct 2005 03:05:07 -0000 1.10 +++ ghc.spec 2 Mar 2006 08:40:15 -0000 1.11 @@ -6,7 +6,7 @@ Name: ghc Version: 6.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -15,7 +15,7 @@ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ghc, sed -Buildrequires: gmp-devel, readline-devel, xorg-x11-devel, freeglut-devel, openal-devel +Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel %if %{build_doc} # haddock generates libraries/ docs Buildrequires: libxslt, docbook-style-xsl, haddock @@ -65,6 +65,7 @@ %package doc Summary: Documentation for GHC Group: Development/Languages +Requires: %{name} %description doc Preformatted documentation for the Glorious Glasgow Haskell @@ -155,6 +156,10 @@ %endif %changelog +* Thu Mar 2 2006 Jens Petersen - 6.4.1-3 +- buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024) +- make ghc-doc require ghc (Michel Salim, #180449) + * Tue Oct 11 2005 Jens Petersen - 6.4.1-2 - turn on build_doc since haddock is now in Extras - no longer specify ghc version to build with (Ville Skytt??, #170176) From fedora-extras-commits at redhat.com Thu Mar 2 09:25:23 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Thu, 2 Mar 2006 04:25:23 -0500 Subject: rpms/darcs/devel .cvsignore, 1.4, 1.5 darcs.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200603020925.k229PtKh031488@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31457 Modified Files: .cvsignore darcs.spec sources Log Message: - update to 1.0.6 - darcs-createrepo is gone Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Dec 2005 02:17:18 -0000 1.4 +++ .cvsignore 2 Mar 2006 09:25:22 -0000 1.5 @@ -1 +1 @@ -darcs-1.0.5.tar.gz +darcs-1.0.6.tar.gz Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/darcs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- darcs.spec 8 Dec 2005 05:34:21 -0000 1.7 +++ darcs.spec 2 Mar 2006 09:25:22 -0000 1.8 @@ -1,5 +1,5 @@ Name: darcs -Version: 1.0.5 +Version: 1.0.6 Release: 1%{?dist} Summary: David's advanced revision control system @@ -79,12 +79,15 @@ %files server %defattr(-,root,root,-) %{_localstatedir}/www/cgi-bin -%{_sbindir}/darcs-createrepo %{_sysconfdir}/darcs %{_datadir}/darcs %changelog +* Thu Mar 2 2006 Jens Petersen - 1.0.6-1 +- update to 1.0.6 + - darcs-createrepo is gone + * Thu Dec 8 2005 Jens Petersen - 1.0.5-1 - 1.0.5 bugfix release Index: sources =================================================================== RCS file: /cvs/extras/rpms/darcs/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Dec 2005 02:17:18 -0000 1.4 +++ sources 2 Mar 2006 09:25:22 -0000 1.5 @@ -1 +1 @@ -9a9a4f84ed5b6258f7ab321713adf20b darcs-1.0.5.tar.gz +8f3a1ee21b7bfbcca11bf4f9f0042cfd darcs-1.0.6.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 09:44:36 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 2 Mar 2006 04:44:36 -0500 Subject: rpms/xmms/devel xmms.spec,1.17,1.18 Message-ID: <200603020945.k229jA2d031594@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31575 Modified Files: xmms.spec Log Message: Workaround for FC5. Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- xmms.spec 1 Mar 2006 10:56:05 -0000 1.17 +++ xmms.spec 2 Mar 2006 09:44:36 -0000 1.18 @@ -1,7 +1,7 @@ Summary: The X MultiMedia System, a media player Name: xmms Version: 1.2.10 -Release: 21%{?dist} +Release: 22%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -128,6 +128,9 @@ # Create empty Skins directory to be included %{__mkdir_p} %{buildroot}%{_datadir}/xmms/Skins/ +# On FC5 x86_64, this gets created even though we pass --disable-static +%{__rm} -f %{buildroot}%{_libdir}/xmms/General/libsong_change.a + %clean %{__rm} -rf %{buildroot} @@ -175,6 +178,9 @@ %changelog +* Thu Mar 2 2006 Matthias Saou 1:1.2.10-22 +- Remove /usr/lib64/xmms/General/libsong_change.a (fix for FC5 x86_64...). + * Mon Feb 13 2006 Matthias Saou 1:1.2.10-21 - Remove gtk libs from xmms-config output, as they are only really needed for static linking, which we no longer support (#182267). From fedora-extras-commits at redhat.com Thu Mar 2 10:09:40 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Thu, 2 Mar 2006 05:09:40 -0500 Subject: rpms/yumex/devel .cvsignore, 1.15, 1.16 sources, 1.18, 1.19 yumex.spec, 1.19, 1.20 Message-ID: <200603021010.k22AAG5V001037@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1013 Modified Files: .cvsignore sources yumex.spec Log Message: Release 0.99.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 15 Feb 2006 16:56:41 -0000 1.15 +++ .cvsignore 2 Mar 2006 10:09:39 -0000 1.16 @@ -1 +1 @@ -yumex-0.99.9.tar.gz +yumex-0.99.11.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sources 15 Feb 2006 16:56:41 -0000 1.18 +++ sources 2 Mar 2006 10:09:39 -0000 1.19 @@ -1 +1 @@ -6042cccf70692e2b96ae76046d2c175c yumex-0.99.9.tar.gz +cad44f4f35d0df846a25cb56a08ecad5 yumex-0.99.11.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- yumex.spec 15 Feb 2006 16:56:41 -0000 1.19 +++ yumex.spec 2 Mar 2006 10:09:39 -0000 1.20 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.9 +Version: 0.99.11 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,10 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Tue Feb 28 2006 Tim Lauridsen - 0.99.11-1.0 +- Development Release 0.99.11-1.0 +* Tue Feb 15 2006 Tim Lauridsen - 0.99.10-1.0 +- Development Release 0.99.10-1.0 * Tue Feb 14 2006 Tim Lauridsen - 0.99.9-1.0 - Development Release 0.99.9-1.0 * Tue Feb 14 2006 Tim Lauridsen - 0.99.8-1.0 From fedora-extras-commits at redhat.com Thu Mar 2 10:42:29 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Thu, 2 Mar 2006 05:42:29 -0500 Subject: rpms/xmms/devel xmms.spec,1.18,1.19 Message-ID: <200603021043.k22Ah1FH001240@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xmms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1223 Modified Files: xmms.spec Log Message: Something strange with FC5 and static plugin libs it seems... Index: xmms.spec =================================================================== RCS file: /cvs/extras/rpms/xmms/devel/xmms.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- xmms.spec 2 Mar 2006 09:44:36 -0000 1.18 +++ xmms.spec 2 Mar 2006 10:42:28 -0000 1.19 @@ -128,8 +128,8 @@ # Create empty Skins directory to be included %{__mkdir_p} %{buildroot}%{_datadir}/xmms/Skins/ -# On FC5 x86_64, this gets created even though we pass --disable-static -%{__rm} -f %{buildroot}%{_libdir}/xmms/General/libsong_change.a +# On FC5 x86_64, some get created even though we pass --disable-static +%{__rm} -f %{buildroot}%{_libdir}/xmms/*/*.a %clean From fedora-extras-commits at redhat.com Thu Mar 2 11:34:16 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 06:34:16 -0500 Subject: rpms/aide/FC-4 aide-0.10-no-static.patch, NONE, 1.1 aide.spec, 1.7, 1.8 Message-ID: <200603021134.k22BYmte003331@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/aide/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3305 Modified Files: aide.spec Added Files: aide-0.10-no-static.patch Log Message: sync with no-static change in devel, but only commit this to test-build this old version with devel flex aide-0.10-no-static.patch: --- NEW FILE aide-0.10-no-static.patch --- diff -Nur aide-0.10-orig/configure aide-0.10/configure --- aide-0.10-orig/configure 2003-11-28 16:14:08.000000000 +0100 +++ aide-0.10/configure 2006-03-02 12:30:37.000000000 +0100 @@ -1720,8 +1720,8 @@ esac fi -CFLAGS="$CFLAGS $LD_STATIC_FLAG" -CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG" +#CFLAGS="$CFLAGS $LD_STATIC_FLAG" +#CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG" @@ -3022,7 +3022,7 @@ done save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $LD_STATIC_FLAG" + #LDFLAGS="$LDFLAGS $LD_STATIC_FLAG" echo $ac_n "checking for gzdopen in -lz""... $ac_c" 1>&6 echo "configure:3028: checking for gzdopen in -lz" >&5 ac_lib_var=`echo z'_'gzdopen | sed 'y%./+-%__p_%'` @@ -3798,7 +3798,7 @@ s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g -s%@LD_STATIC_FLAG@%$LD_STATIC_FLAG%g +s%@LD_STATIC_FLAG@%%g s%@AIDE_USE_LOCALE@%$AIDE_USE_LOCALE%g s%@ACLLIB@%$ACLLIB%g s%@CRYPTLIB@%$CRYPTLIB%g Index: aide.spec =================================================================== RCS file: /cvs/extras/rpms/aide/FC-4/aide.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- aide.spec 6 Apr 2005 22:10:48 -0000 1.7 +++ aide.spec 2 Mar 2006 11:34:15 -0000 1.8 @@ -1,14 +1,17 @@ +%{?_with_static: %define nostatic 0} +%{!?_with_static: %define nostatic 1} + Summary: Intrusion detection environment Name: aide Version: 0.10 -Release: 2 - +Release: 3 URL: http://sourceforge.net/projects/aide License: GPL Group: Applications/System Source: http://download.sourceforge.net/aide/aide-0.10.tar.gz Source1: aide.conf Source2: README.quickstart +Patch0: aide-0.10-no-static.patch Patch1: aide-useless-includes.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Buildrequires: mhash-devel zlib-devel @@ -25,7 +28,9 @@ %prep %setup -q -n aide-0.10 - +%if 0%{nostatic} +%patch0 -p1 -b .no-static +%endif %patch1 -p1 %build @@ -75,6 +80,9 @@ %changelog +* Thu Mar 2 2006 Michael Schwendt - 0.10-3 +- disable static linking. + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Mar 2 12:15:10 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 2 Mar 2006 07:15:10 -0500 Subject: fedora-security/audit fc4,1.163,1.164 fc5,1.71,1.72 Message-ID: <200603021215.k22CFAk3005534@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5510 Modified Files: fc4 fc5 Log Message: Updates from last couple of days emails Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.163 retrieving revision 1.164 diff -u -r1.163 -r1.164 --- fc4 28 Feb 2006 09:29:30 -0000 1.163 +++ fc4 2 Mar 2006 12:14:58 -0000 1.164 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060227 -Up to date FC4 as of 20060227 +Up to date CVE as of CVE email 20060301 +Up to date FC4 as of 20060301 ** are items that need attention @@ -155,6 +155,7 @@ CVE-2005-3390 backport (php) [since FEDORA-2005-1062] CVE-2005-3389 backport (php) [since FEDORA-2005-1062] CVE-2005-3388 backport (php) [since FEDORA-2005-1062] +CVE-2005-3359 version (kernel, fixed 2.6.14) [since FEDORA-2005-1067] CVE-2005-3358 version (kernel, fixed 2.6.11) CVE-2005-3357 backport (httpd, fixed 2.0.56) [since FEDORA-2006-052] CVE-2005-3356 backport (kernel) [since FEDORA-2006-077] @@ -1158,6 +1159,7 @@ CVE-2003-0963 version (lftp, fixed after 2.6.9) CVE-2003-0962 version (rsync, fixed 2.5.7) CVE-2003-0961 version (kernel, fixed 2.4.23) +CVE-2003-0959 version (kernel, fixed 2.4.21) CVE-2003-0956 version (kernel, fixed 2.4.22) CVE-2003-0935 version (netsnmp, fixed 5.0.9) CVE-2003-0927 version (ethereal, fixed 0.9.16) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- fc5 28 Feb 2006 09:29:30 -0000 1.71 +++ fc5 2 Mar 2006 12:14:58 -0000 1.72 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060227 +Up to date CVE as of CVE email 20060301 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -169,6 +169,7 @@ CVE-2005-3390 version (php, fixed 5.1.0) CVE-2005-3389 version (php, fixed 5.1.1) CVE-2005-3388 version (php, fixed 5.1.1) +CVE-2005-3359 version (kernel, fixed 2.6.14) CVE-2005-3358 version (kernel, fixed 2.6.11) CVE-2005-3357 backport (httpd, affects 2.2.0) CVE-2005-3356 backport (kernel) patch-2.6.16-rc3 @@ -1216,6 +1217,7 @@ CVE-2003-0963 version (lftp, fixed after 2.6.9) CVE-2003-0962 version (rsync, fixed 2.5.7) CVE-2003-0961 version (kernel, fixed 2.4.23) +CVE-2003-0959 version (kernel, fixed 2.4.21) CVE-2003-0956 version (kernel, fixed 2.4.22) CVE-2003-0935 version (netsnmp, fixed 5.0.9) CVE-2003-0927 version (ethereal, fixed 0.9.16) From fedora-extras-commits at redhat.com Thu Mar 2 12:22:20 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 07:22:20 -0500 Subject: rpms/aide import.log,1.7,1.8 Message-ID: <200603021222.k22CMqm5005716@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/aide In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5659 Modified Files: import.log Log Message: auto-import aide-0.10-3 on branch devel from aide-0.10-3.src.rpm temporarily revert devel to FE4 aide for flex devel build test Index: import.log =================================================================== RCS file: /cvs/extras/rpms/aide/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 25 Feb 2006 21:45:25 -0000 1.7 +++ import.log 2 Mar 2006 12:22:19 -0000 1.8 @@ -4,3 +4,4 @@ aide-0_10-0_fdr_1_1:HEAD:aide-0.10-0.fdr.1.1.src.rpm:1099886473 aide-0_10-0_fdr_1_2:HEAD:aide-0.10-0.fdr.1.2.src.rpm:1099886479 aide-0_11-1:HEAD:aide-0.11-1.src.rpm:1140903967 +aide-0_10-3:HEAD:aide-0.10-3.src.rpm:1141302191 From fedora-extras-commits at redhat.com Thu Mar 2 12:22:26 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 07:22:26 -0500 Subject: rpms/aide/devel aide-0.10-no-static.patch, NONE, 1.1 aide-useless-includes.patch, 1.2, 1.3 .cvsignore, 1.5, 1.6 aide.spec, 1.9, 1.10 sources, 1.5, 1.6 aide-0.11-man-page.patch, 1.1, NONE aide-0.11-no-static.patch, 1.1, NONE Message-ID: <200603021222.k22CMwOP005726@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/aide/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5659/devel Modified Files: .cvsignore aide.spec sources Added Files: aide-0.10-no-static.patch aide-useless-includes.patch Removed Files: aide-0.11-man-page.patch aide-0.11-no-static.patch Log Message: auto-import aide-0.10-3 on branch devel from aide-0.10-3.src.rpm temporarily revert devel to FE4 aide for flex devel build test aide-0.10-no-static.patch: --- NEW FILE aide-0.10-no-static.patch --- diff -Nur aide-0.10-orig/configure aide-0.10/configure --- aide-0.10-orig/configure 2003-11-28 16:14:08.000000000 +0100 +++ aide-0.10/configure 2006-03-02 12:30:37.000000000 +0100 @@ -1720,8 +1720,8 @@ esac fi -CFLAGS="$CFLAGS $LD_STATIC_FLAG" -CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG" +#CFLAGS="$CFLAGS $LD_STATIC_FLAG" +#CPPFLAGS="$CPPFLAGS $LD_STATIC_FLAG" @@ -3022,7 +3022,7 @@ done save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS $LD_STATIC_FLAG" + #LDFLAGS="$LDFLAGS $LD_STATIC_FLAG" echo $ac_n "checking for gzdopen in -lz""... $ac_c" 1>&6 echo "configure:3028: checking for gzdopen in -lz" >&5 ac_lib_var=`echo z'_'gzdopen | sed 'y%./+-%__p_%'` @@ -3798,7 +3798,7 @@ s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g s%@MAINT@%$MAINT%g -s%@LD_STATIC_FLAG@%$LD_STATIC_FLAG%g +s%@LD_STATIC_FLAG@%%g s%@AIDE_USE_LOCALE@%$AIDE_USE_LOCALE%g s%@ACLLIB@%$ACLLIB%g s%@CRYPTLIB@%$CRYPTLIB%g aide-useless-includes.patch: Index: aide-useless-includes.patch =================================================================== RCS file: aide-useless-includes.patch diff -N aide-useless-includes.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ aide-useless-includes.patch 2 Mar 2006 12:22:25 -0000 1.3 @@ -0,0 +1,11 @@ +--- aide-0.9/src/Makefile.in.orig 2002-06-06 11:08:32.000000000 +0200 ++++ aide-0.9/src/Makefile.in 2002-06-06 11:08:48.000000000 +0200 +@@ -98,7 +98,7 @@ + aide_SOURCES = conf_yacc.y conf_lex.l getopt.c getopt1.c gnu_regex.c error.c md.c db.c commandconf.c db_file.c db_disk.c db_lex.l db_sql.c gen_list.c list.c do_md.c base64.c symboltable.c compare_db.c be.c util.c aide.c + + +-INCLUDES = -I$(prefix)/include -I$(top_srcdir)/include ++INCLUDES = -I$(top_srcdir)/include + + LDADD = @CRYPTLIB@ @ACLLIB@ + Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/aide/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 Feb 2006 12:55:39 -0000 1.5 +++ .cvsignore 2 Mar 2006 12:22:25 -0000 1.6 @@ -1,2 +1 @@ -aide-0.11.tar.gz -aide-0.11.tar.gz.asc +aide-0.10.tar.gz Index: aide.spec =================================================================== RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- aide.spec 26 Feb 2006 12:55:39 -0000 1.9 +++ aide.spec 2 Mar 2006 12:22:25 -0000 1.10 @@ -3,21 +3,23 @@ Summary: Intrusion detection environment Name: aide -Version: 0.11 -Release: 1 +Version: 0.10 +Release: 3 URL: http://sourceforge.net/projects/aide License: GPL Group: Applications/System -Source0: http://download.sourceforge.net/aide/aide-%{version}.tar.gz +Source: http://download.sourceforge.net/aide/aide-0.10.tar.gz Source1: aide.conf Source2: README.quickstart -Patch0: aide-0.11-no-static.patch -Patch1: aide-0.11-man-page.patch +Patch0: aide-0.10-no-static.patch +Patch1: aide-useless-includes.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) Buildrequires: mhash-devel zlib-devel Buildrequires: flex bison -#Buildrequires: postgresql-devel libgcrypt-devel -#(needs --with-psql and -lgcrypt in src/Makefile.in) +# Red Hat bug #108655, bison requires m4 +Buildrequires: m4 +# Postgresql support doesn't build. +Buildconflicts: postgresql-devel %description AIDE (Advanced Intrusion Detection Environment) is a file integrity @@ -25,14 +27,17 @@ %prep -%setup -q +%setup -q -n aide-0.10 %if 0%{nostatic} %patch0 -p1 -b .no-static %endif -%patch1 -p1 -b .man-page - +%patch1 -p1 %build +# Apply RPM_OPT_FLAGS. +perl -pi -e 's/^CFLAGS="\$LD_STATIC_FLAG\"//' configure +perl -pi -e 's/^CPPFLAGS="\$LD_STATIC_FLAG\"//' configure + %configure --with-config_file=%{_sysconfdir}/aide.conf \ --with-zlib \ --with-mhash --enable-mhash @@ -54,7 +59,8 @@ mkdir -p -m0700 $RPM_BUILD_ROOT%{_localstatedir}/lib/aide install -p %{SOURCE2} README.quickstart mkdir -p -m0755 $RPM_BUILD_ROOT%{_mandir}/ru/man{1,5} - +install -p -m0644 doc/aide.1.ru $RPM_BUILD_ROOT%{_mandir}/ru/man1/aide.1 +install -p -m0644 doc/aide.conf.5.ru $RPM_BUILD_ROOT%{_mandir}/ru/man5/aide.conf.5 %clean rm -rf $RPM_BUILD_ROOT @@ -62,23 +68,19 @@ %files %defattr(0644,root,root,0755) -%doc AUTHORS COPYING ChangeLog NEWS README doc/manual.html contrib/ +%doc AUTHORS COPYING ChangeLog NEWS README ./doc/manual.html %doc README.quickstart %attr(0700,root,root) %{_sbindir}/aide %{_mandir}/man1/* %{_mandir}/man5/* +%lang(ru) %{_mandir}/ru/man1/aide.1* +%lang(ru) %{_mandir}/ru/man5/aide.conf.5* %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/aide.conf %dir %attr(0700,root,root) %{_localstatedir}/lib/aide %changelog -* Sun Feb 26 2006 Michael Schwendt -- Fix wrong paths in manual page. - -* Sun Feb 19 2006 Michael Schwendt - 0.11-1 -- Update to 0.11 release. -- useless-includes patch merged upstream. -- old Russian man pages not available anymore. +* Thu Mar 2 2006 Michael Schwendt - 0.10-3 - disable static linking. * Fri Apr 7 2005 Michael Schwendt Index: sources =================================================================== RCS file: /cvs/extras/rpms/aide/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 26 Feb 2006 12:55:39 -0000 1.5 +++ sources 2 Mar 2006 12:22:25 -0000 1.6 @@ -1,2 +1 @@ -9a44e5386b0355ef57c60f627ff4d085 aide-0.11.tar.gz -866e2aa9f694c0822ddba3a5375c0f7c aide-0.11.tar.gz.asc +39eb7d21064cac7b409c45d038b86cd8 aide-0.10.tar.gz --- aide-0.11-man-page.patch DELETED --- --- aide-0.11-no-static.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 12:24:24 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 07:24:24 -0500 Subject: rpms/aide/devel aide.spec,1.10,1.11 Message-ID: <200603021224.k22COvAS005867@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/aide/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5839 Modified Files: aide.spec Log Message: Index: aide.spec =================================================================== RCS file: /cvs/extras/rpms/aide/devel/aide.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- aide.spec 2 Mar 2006 12:22:25 -0000 1.10 +++ aide.spec 2 Mar 2006 12:24:24 -0000 1.11 @@ -4,7 +4,7 @@ Summary: Intrusion detection environment Name: aide Version: 0.10 -Release: 3 +Release: 3.fc5 URL: http://sourceforge.net/projects/aide License: GPL Group: Applications/System From fedora-extras-commits at redhat.com Thu Mar 2 14:16:28 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 09:16:28 -0500 Subject: rpms/WindowMaker/devel WPrefs-uk.po, NONE, 1.1 WindowMaker-0.80.2-cvs-alt-textfield.patch, NONE, 1.1 WindowMaker-0.91.0-alt-adialog.patch, NONE, 1.1 WindowMaker-0.91.0-alt-clipnotext.patch, NONE, 1.1 WindowMaker-0.91.0-alt-dockhotkeys.patch, NONE, 1.1 WindowMaker-0.91.0-alt-focus.patch, NONE, 1.1 WindowMaker-0.91.0-alt-menutrans.patch, NONE, 1.1 WindowMaker-0.91.0-alt-mmx.patch, NONE, 1.1 WindowMaker-0.91.0-alt-restartscrpt.patch, NONE, 1.1 WindowMaker-0.91.0-alt-session.patch, NONE, 1.1 WindowMaker-0.91.0-alt-sowings.patch, NONE, 1.1 WindowMaker-0.91.0-alt-titlebar.patch, NONE, 1.1 WindowMaker-0.91.0-alt-vlaad-newbuttons.patch, NONE, 1.1 WindowMaker-0.91.0-alt-vlaad-trance.patch, NONE, 1.1 WindowMaker-0.91.0-hmepas-minimizeall.patch, NONE, 1.1 WindowMaker-0.91.0-hmepas-swmenu_rclick.patch, NONE, 1.1 WindowMaker-0.91.0-peter-appicon-bouncer2.patch, NONE, 1.1 WindowMaker-0.91.0-peter-mouse-placement.patch, NONE, 1.1 WindowMaker-0.91.0-peter-newappicon.patch, NONE, 1.1 WindowMaker-0.91.0-sga-moving-add.patch, NONE, 1.1 WindowMaker-0.91.0-sga-swpanel-customization.patch, NONE, 1.1 WindowMaker-0.91.0-wmcontrib-singleclick.patch, NONE, 1.1 WindowMaker-0.92.0-alt-newpo.patch, NONE, 1.1 WindowMaker-0.92.0-cvs20060123.patch, NONE, 1.1 WindowMaker-README.newbuttons, NONE, 1.1 WindowMaker-gcc41.patch, NONE, 1.1 WindowMaker-newbuttons.nextstyle.tiff, NONE, 1.1 WindowMaker-newbuttons.nextstyle.xpm, NONE, 1.1 WindowMaker-newbuttons.oldstyle.tiff, NONE, 1.1 WindowMaker-uk.po, NONE, 1.1 .cvsignore, 1.4, 1.5 WindowMaker.spec, 1.16, 1.17 sources, 1.4, 1.5 windowmaker-gcc4-x86_64.patch, 1.2, NONE Message-ID: <200603021417.k22EH0Cj010216@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/WindowMaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10102 Modified Files: .cvsignore WindowMaker.spec sources Added Files: WPrefs-uk.po WindowMaker-0.80.2-cvs-alt-textfield.patch WindowMaker-0.91.0-alt-adialog.patch WindowMaker-0.91.0-alt-clipnotext.patch WindowMaker-0.91.0-alt-dockhotkeys.patch WindowMaker-0.91.0-alt-focus.patch WindowMaker-0.91.0-alt-menutrans.patch WindowMaker-0.91.0-alt-mmx.patch WindowMaker-0.91.0-alt-restartscrpt.patch WindowMaker-0.91.0-alt-session.patch WindowMaker-0.91.0-alt-sowings.patch WindowMaker-0.91.0-alt-titlebar.patch WindowMaker-0.91.0-alt-vlaad-newbuttons.patch WindowMaker-0.91.0-alt-vlaad-trance.patch WindowMaker-0.91.0-hmepas-minimizeall.patch WindowMaker-0.91.0-hmepas-swmenu_rclick.patch WindowMaker-0.91.0-peter-appicon-bouncer2.patch WindowMaker-0.91.0-peter-mouse-placement.patch WindowMaker-0.91.0-peter-newappicon.patch WindowMaker-0.91.0-sga-moving-add.patch WindowMaker-0.91.0-sga-swpanel-customization.patch WindowMaker-0.91.0-wmcontrib-singleclick.patch WindowMaker-0.92.0-alt-newpo.patch WindowMaker-0.92.0-cvs20060123.patch WindowMaker-README.newbuttons WindowMaker-gcc41.patch WindowMaker-newbuttons.nextstyle.tiff WindowMaker-newbuttons.nextstyle.xpm WindowMaker-newbuttons.oldstyle.tiff WindowMaker-uk.po Removed Files: windowmaker-gcc4-x86_64.patch Log Message: - fix #181981 - go to new cvs snapshot (which includes qt fix) - add patches from altlinuxs rpm (suggested by Andrew Zabolotny) - get rid of static libs (finally) - tune configure - add uk translation - finally add extras source - fix stack-smash while reading workspace names --- NEW FILE WPrefs-uk.po --- msgid "" msgstr "" "Project-Id-Version: WPrefs.app 0.80.1\n" "POT-Creation-Date: 2002-02-18 10:15+0200\n" "PO-Revision-Date: 2004-09-06 21:42+4000\n" "Last-Translator: Victor Forsyuk \n" "Language-Team: KSI Linux Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-u\n" "Content-Transfer-Encoding: 8bit\n" "Date: 1999-05-31 19:29:53+0400\n" "From: Victor Forsyuk,,,\n" "Xgettext-Options: --default-domain=WPrefs --add-comments --keyword=_\n" "Files: ../../WPrefs.app/main.c ../../WPrefs.app/WPrefs.c " "../../WPrefs.app/Appearance.c ../../WPrefs.app/Configurations.c " "../../WPrefs.app/Expert.c ../../WPrefs.app/Focus.c ../../WPrefs.app/Icons.c " "../../WPrefs.app/KeyboardSettings.c ../../WPrefs.app/KeyboardShortcuts.c " "../../WPrefs.app/Menu.c ../../WPrefs.app/MenuPreferences.c " "../../WPrefs.app/MouseSettings.c ../../WPrefs.app/NoMenuAlert.c " "../../WPrefs.app/Paths.c ../../WPrefs.app/Preferences.c " "../../WPrefs.app/Text.c ../../WPrefs.app/TexturePanel.c " "../../WPrefs.app/Themes.c ../../WPrefs.app/WindowHandling.c " "../../WPrefs.app/Workspace.c ../../WPrefs.app/double.c " "../../WPrefs.app/editmenu.c ../../WPrefs.app/MenuGuru.c " "../../WPrefs.app/xmodifier.c\n" #: ../../WPrefs.app/Appearance.c:1131 msgid "Select File" msgstr "???????? ????" #: ../../WPrefs.app/Appearance.c:1533 msgid "Focused Window" msgstr "??????? ?????" #: ../../WPrefs.app/Appearance.c:1537 msgid "Unfocused Window" msgstr "????????? ?????" #: ../../WPrefs.app/Appearance.c:1541 msgid "Owner of Focused Window" msgstr "??????? ????????? ?????" #: ../../WPrefs.app/Appearance.c:1545 ../../WPrefs.app/Appearance.c:1862 msgid "Menu Title" msgstr "????? ????" #: ../../WPrefs.app/Appearance.c:1549 ../../WPrefs.app/Appearance.c:1551 msgid "Normal Item" msgstr "????. ?????" #: ../../WPrefs.app/Appearance.c:1555 msgid "Disabled Item" msgstr "???????????" #: ../../WPrefs.app/Appearance.c:1564 msgid "Highlighted" msgstr "???????????" #: ../../WPrefs.app/Appearance.c:1755 msgid "Texture" msgstr "????????" #: ../../WPrefs.app/Appearance.c:1763 msgid "Titlebar of Focused Window" msgstr "????????? ????????? ?????" #: ../../WPrefs.app/Appearance.c:1764 msgid "Titlebar of Unfocused Windows" msgstr "????????? ?????????? ?????" #: ../../WPrefs.app/Appearance.c:1765 msgid "Titlebar of Focused Window's Owner" msgstr "????????? ???????? ????????? ?????" #: ../../WPrefs.app/Appearance.c:1766 msgid "Window Resizebar" msgstr "?????? ????? ??????? ?????" #: ../../WPrefs.app/Appearance.c:1767 msgid "Titlebar of Menus" msgstr "????????? ????" #: ../../WPrefs.app/Appearance.c:1768 msgid "Menu Items" msgstr "?????? ????" #: ../../WPrefs.app/Appearance.c:1769 msgid "Icon Background" msgstr "??? ??????" #: ../../WPrefs.app/Appearance.c:1784 msgid "" "Double click in the texture you want to use\n" "for the selected item." msgstr "" "??????? ????????? ???? ?? ????????, ????? ??????\n" "??????????? ??? ????????? ????????." #: ../../WPrefs.app/Appearance.c:1798 msgid "New" msgstr "????" #: ../../WPrefs.app/Appearance.c:1802 msgid "Create a new texture." msgstr "????????? ????? ????????." #: ../../WPrefs.app/Appearance.c:1810 msgid "Extract..." msgstr "???????..." #: ../../WPrefs.app/Appearance.c:1814 msgid "Extract texture(s) from a theme or a style file." msgstr "????????? ???????(?) ? ???? ?? ?????????? ?????." #: ../../WPrefs.app/Appearance.c:1824 msgid "Edit" msgstr "???????" #: ../../WPrefs.app/Appearance.c:1827 msgid "Edit the highlighted texture." msgstr "??????????? ??????????? ????????." #: ../../WPrefs.app/Appearance.c:1835 ../../WPrefs.app/TexturePanel.c:1316 msgid "Delete" msgstr "????????" #: ../../WPrefs.app/Appearance.c:1839 msgid "Delete the highlighted texture." msgstr "????????? ??????????? ????????." #: ../../WPrefs.app/Appearance.c:1852 msgid "Color" msgstr "?????" #: ../../WPrefs.app/Appearance.c:1859 msgid "Focused Window Title" msgstr "????????? ????????? ?????" #: ../../WPrefs.app/Appearance.c:1860 msgid "Unfocused Window Title" msgstr "????????? ?????????? ?????" #: ../../WPrefs.app/Appearance.c:1861 msgid "Owner of Focused Window Title" msgstr "????????? ???????? ????????? ?????" #: ../../WPrefs.app/Appearance.c:1863 msgid "Menu Item Text" msgstr "????? ?????? ????" #: ../../WPrefs.app/Appearance.c:1864 msgid "Disabled Menu Item Text" msgstr "????? ???????????? ?????? ????" #: ../../WPrefs.app/Appearance.c:1865 msgid "Menu Highlight Color" msgstr "????? ????????? ?????? ????" #: ../../WPrefs.app/Appearance.c:1866 msgid "Highlighted Menu Text Color" msgstr "????? ?????? ???????????? ??????" #: ../../WPrefs.app/Appearance.c:1905 msgid "Background" msgstr "???" #: ../../WPrefs.app/Appearance.c:1917 ../../WPrefs.app/TexturePanel.c:1503 msgid "Browse..." msgstr "???????..." #: ../../WPrefs.app/Appearance.c:1930 msgid "Options" msgstr "?????:" #: ../../WPrefs.app/Appearance.c:1937 msgid "Menu Style" msgstr "????? ????" #: ../../WPrefs.app/Appearance.c:1965 ../../WPrefs.app/Configurations.c:242 #: ../../WPrefs.app/Configurations.c:254 ../../WPrefs.app/Focus.c:288 #: ../../WPrefs.app/Focus.c:299 ../../WPrefs.app/MenuPreferences.c:134 #: ../../WPrefs.app/MenuPreferences.c:145 #: ../../WPrefs.app/MenuPreferences.c:173 #: ../../WPrefs.app/MenuPreferences.c:188 ../../WPrefs.app/MouseSettings.c:560 #: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:558 #: ../../WPrefs.app/WPrefs.c:583 #, c-format msgid "could not load icon file %s" msgstr "?? ???????? ??????????? ???? ?????? %s" #: ../../WPrefs.app/Appearance.c:1979 msgid "Title Alignment" msgstr "?????????" #: ../../WPrefs.app/Appearance.c:1986 msgid "Left" msgstr "???????" #: ../../WPrefs.app/Appearance.c:1989 ../../WPrefs.app/TexturePanel.c:1517 [...1734 lines suppressed...] msgid "Opaque Move" msgstr "?????????? ????" #: ../../WPrefs.app/WindowHandling.c:322 msgid "" "Whether the window contents should be moved\n" "when dragging windows aroung or if only a\n" "frame should be displayed.\n" msgstr "" "?????????? ????? ????? ??? ??????????\n" "????? ?? ?????????? ?????? ?????.\n" #: ../../WPrefs.app/WindowHandling.c:361 msgid "When maximizing..." msgstr "??? ????????????..." #: ../../WPrefs.app/WindowHandling.c:366 msgid "...do not cover icons" msgstr "...?? ????????? ??????" #: ../../WPrefs.app/WindowHandling.c:372 msgid "...do not cover dock" msgstr "...?? ????????? ???" #: ../../WPrefs.app/WindowHandling.c:381 msgid "Edge Resistance" msgstr "???? ?????" #: ../../WPrefs.app/WindowHandling.c:383 msgid "" "Edge resistance will make windows `resist'\n" "being moved further for the defined threshold\n" "when moved against other windows or the edges\n" "of the screen." msgstr "" "?? ??????? `????' ????? ???????????\n" "?? ?????? ????? ??? ??????????? ??????\n" "????? ????? ?? ?? ???? ??????." #: ../../WPrefs.app/WindowHandling.c:402 msgid "Resist" msgstr "????" #: ../../WPrefs.app/WindowHandling.c:407 msgid "Attract" msgstr "??????" #: ../../WPrefs.app/WindowHandling.c:423 msgid "" "Open dialogs in same workspace\n" "as their owners" msgstr "" "?????????? ??????? ?? ?????? ???????? ????? ? ?? \"????????????\" ??????" #: ../../WPrefs.app/WindowHandling.c:450 msgid "Window Handling Preferences" msgstr "????????? ????????? ?????? ? ???????" #: ../../WPrefs.app/WindowHandling.c:452 msgid "" "Window handling options. Initial placement style\n" "edge resistance, opaque move etc." msgstr "" "????? ?????? ? ???????. ????? ??????????? ??????????,\n" "???? ?????, ?????????? ??????????? ? ???? ???????." #: ../../WPrefs.app/Workspace.c:176 msgid "Workspace Navigation" msgstr "????????? ?? ??????? ??????" #: ../../WPrefs.app/Workspace.c:183 msgid "" "wrap to the first workspace after the\n" "last workspace." msgstr "" "?????????? ?? ?????? ??????? ???? ???\n??????????? ?? ????????." #: ../../WPrefs.app/Workspace.c:205 msgid "switch workspaces while dragging windows." msgstr "?????????? ?????? ????? ??? ?????????????\n??? ???? ?????." #: ../../WPrefs.app/Workspace.c:227 msgid "automatically create new workspaces." msgstr "??????????? ?????????? ???? ?????? ?????." #: ../../WPrefs.app/Workspace.c:250 msgid "" "Position of workspace\n" "name display" msgstr "" "??????? ?????? ?????\n" "???????? ?????" #: ../../WPrefs.app/Workspace.c:269 msgid "Disable" msgstr "?? ??????????" #: ../../WPrefs.app/Workspace.c:271 msgid "Top" msgstr "??????" #: ../../WPrefs.app/Workspace.c:272 msgid "Bottom" msgstr "?????" #: ../../WPrefs.app/Workspace.c:273 msgid "Top/Left" msgstr "??????/???????" #: ../../WPrefs.app/Workspace.c:274 msgid "Top/Right" msgstr "??????/????????" #: ../../WPrefs.app/Workspace.c:275 msgid "Bottom/Left" msgstr "?????/???????" #: ../../WPrefs.app/Workspace.c:276 msgid "Bottom/Right" msgstr "????/?????????" #: ../../WPrefs.app/Workspace.c:284 msgid "Dock/Clip" msgstr "???/???????" #: ../../WPrefs.app/Workspace.c:303 msgid "" "Disable/enable the application Dock (the\n" "vertical icon bar in the side of the screen)." msgstr "" "??????????/????????? ??? ??? ???????\n" "(??????????? ?????? ?????? ????? ??????)." #: ../../WPrefs.app/Workspace.c:324 msgid "" "Disable/enable the Clip (that thing with\n" "a paper clip icon)." msgstr "" "??????????/????????? ??????? (????????? ? ???????\n" "??????? ??? ??????? ;)." #: ../../WPrefs.app/Workspace.c:364 msgid "Workspace Preferences" msgstr "????????? ????????? ??? ???????? ?????" #: ../../WPrefs.app/Workspace.c:366 msgid "" "Workspace navigation features.\n" "You can also enable/disable the Dock and Clip here." msgstr "" "????????? ?? ??????? ??????.\n" "??? ????? ????? ?????????/?????????? ??? ?? ???????." #: ../../WPrefs.app/imagebrowser.c:95 msgid "View" msgstr "" #: ../../WPrefs.app/main.c:59 #, c-format msgid "usage: %s [options]\n" msgstr "??????: %s [?????????]\n" #: ../../WPrefs.app/main.c:60 msgid "options:" msgstr "?????????:" #: ../../WPrefs.app/main.c:61 msgid " -display \tdisplay to be used" msgstr " -display \tX ??????? ??? ????????????" #: ../../WPrefs.app/main.c:62 msgid " --version\t\tprint version number and exit" msgstr " --version\t\t???????? ????? ?????? ?? ?????" #: ../../WPrefs.app/main.c:63 msgid " --help\t\tprint this message and exit" msgstr " --help\t\t???????? ?? ???????????? ?? ?????" #: ../../WPrefs.app/main.c:122 #, c-format msgid "too few arguments for %s" msgstr "????? ???? ?????????? ??? %s" #: ../../WPrefs.app/main.c:141 msgid "X server does not support locale" msgstr "X ?????? ?? ????????? locale" #: ../../WPrefs.app/main.c:144 msgid "cannot set locale modifiers" msgstr "?? ???????? ?????????? ???????????? ???????????" #: ../../WPrefs.app/main.c:150 #, c-format msgid "could not open display %s" msgstr "?? ???????? ???????? ??????? %s" #: ../../WPrefs.app/main.c:158 msgid "could not initialize application" msgstr "?? ???????? ?????????????? ????????" WindowMaker-0.80.2-cvs-alt-textfield.patch: --- NEW FILE WindowMaker-0.80.2-cvs-alt-textfield.patch --- --- WindowMaker-0.80.2/WINGs/WINGs/WINGs.h.textfield 2003-10-20 23:57:14 +0400 +++ WindowMaker-0.80.2/WINGs/WINGs/WINGs.h 2003-10-22 09:21:11 +0400 @@ -1154,6 +1154,8 @@ void WMSetTextFieldCursorPosition(WMTextField *tPtr, unsigned int position); +unsigned WMGetTextFieldCursorPosition(WMTextField *tPtr); + void WMSetTextFieldNextTextField(WMTextField *tPtr, WMTextField *next); void WMSetTextFieldPrevTextField(WMTextField *tPtr, WMTextField *prev); --- WindowMaker-0.80.2/WINGs/wtextfield.c.textfield 2003-10-20 23:57:14 +0400 +++ WindowMaker-0.80.2/WINGs/wtextfield.c 2003-10-22 09:20:31 +0400 @@ -617,6 +617,14 @@ } } +unsigned +WMGetTextFieldCursorPosition(WMTextField *tPtr) +{ + CHECK_CLASS(tPtr, WC_TextField); + + return tPtr->cursorPosition; +} + void WMSetTextFieldNextTextField(WMTextField *tPtr, WMTextField *next) WindowMaker-0.91.0-alt-adialog.patch: --- NEW FILE WindowMaker-0.91.0-alt-adialog.patch --- --- WindowMaker-0.91.0/src/misc.c.vns 2005-05-18 18:08:11 +0400 +++ WindowMaker-0.91.0/src/misc.c 2005-05-18 18:11:20 +0400 @@ -607,96 +607,59 @@ static char* -getuserinput(WScreen *scr, char *line, int *ptr) +parseuserinputpart(char *line, int *ptr, char *endchars) { - char *ret; - char *title; - char *prompt; - int j, state; - int begin = 0; -#define BUFSIZE 512 - char tbuffer[BUFSIZE], pbuffer[BUFSIZE]; - - - title = _("Program Arguments"); - prompt = _("Enter command arguments:"); - ret = NULL; - -#define _STARTING 0 -#define _TITLE 1 -#define _PROMPT 2 -#define _DONE 3 - - state = _STARTING; - j = 0; - for (; line[*ptr]!=0 && state!=_DONE; (*ptr)++) { - switch (state) { - case _STARTING: - if (line[*ptr]=='(') { - state = _TITLE; - begin = *ptr+1; - } else { - state = _DONE; - } - break; - - case _TITLE: - if (j <= 0 && line[*ptr]==',') { - - j = 0; - if (*ptr > begin) { - strncpy(tbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE)); - tbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0; - title = (char*)tbuffer; - } - begin = *ptr+1; - state = _PROMPT; - - } else if (j <= 0 && line[*ptr]==')') { - - if (*ptr > begin) { - strncpy(tbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE)); - tbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0; - title = (char*)tbuffer; - } - state = _DONE; - - } else if (line[*ptr]=='(') { - j++; - } else if (line[*ptr]==')') { - j--; - } - - break; + int depth = 0, begin; + char *value = NULL; + begin = ++*ptr; + + while(line[*ptr] != '\0') { + if(line[*ptr] == '(') { + ++depth; + } else if(depth > 0 && line[*ptr] == ')') { + --depth; + } else if(depth == 0 && strchr(endchars, line[*ptr]) != NULL) { + value = wmalloc(*ptr - begin + 1); + strncpy(value, line + begin, *ptr - begin); + value[*ptr - begin] = '\0'; + break; + } + ++*ptr; + } - case _PROMPT: - if (line[*ptr]==')' && j==0) { + return value; +} - if (*ptr-begin > 1) { - strncpy(pbuffer, &line[begin], WMIN(*ptr-begin, BUFSIZE)); - pbuffer[WMIN(*ptr-begin, BUFSIZE)] = 0; - prompt = (char*)pbuffer; - } - state = _DONE; - } else if (line[*ptr]=='(') - j++; - else if (line[*ptr]==')') - j--; - break; - } - } - (*ptr)--; -#undef _STARTING -#undef _TITLE -#undef _PROMPT -#undef _DONE +static char* +getuserinput(WScreen *scr, char *line, int *ptr, Bool advanced) +{ + char *ret = NULL, *title = NULL, *prompt = NULL, *name = NULL; + int rv; - if (!wInputDialog(scr, title, prompt, &ret)) - return NULL; + if(line[*ptr] == '(') + title = parseuserinputpart(line, ptr, ",)"); + if(title != NULL && line[*ptr] == ',') + prompt = parseuserinputpart(line, ptr, ",)"); + if(prompt != NULL && line[*ptr] == ',') + name = parseuserinputpart(line, ptr, ")"); + + if(advanced) + rv = wAdvancedInputDialog(scr, + title ? gettext(title):_("Program Arguments"), + prompt ? gettext(prompt):_("Enter command arguments:"), + name, &ret); else - return ret; -} + rv = wInputDialog(scr, + title ? gettext(title):_("Program Arguments"), + prompt ? gettext(prompt):_("Enter command arguments:"), + &ret); + + if(title) wfree(title); + if(prompt) wfree(prompt); + if(name) wfree(name); + return rv ? ret : NULL; +} #define S_NORMAL 0 #define S_ESCAPE 1 @@ -814,8 +777,9 @@ break; case 'a': + case 'A': ptr++; - user_input = getuserinput(scr, cmdline, &ptr); + user_input = getuserinput(scr, cmdline, &ptr, cmdline[ptr-1] == 'A'); if (user_input) { slen = strlen(user_input); olen += slen; --- WindowMaker-0.91.0/src/dialog.c.vns 2005-05-18 18:08:11 +0400 +++ WindowMaker-0.91.0/src/dialog.c 2005-05-18 18:08:11 +0400 @@ -178,6 +178,328 @@ return result; } +typedef struct _WMInputPanelWithHistory +{ + WMInputPanel *panel; + WMArray *history; + int histpos; + char *prefix; + char *suffix; + char *rest; + WMArray *variants; + int varpos; +} WMInputPanelWithHistory; + +static char * +HistoryFileName(char *name) +{ + char *filename = NULL; + + filename = wstrdup(wusergnusteppath()); + filename = wstrappend(filename, "/.AppInfo/WindowMaker/History"); + if(name && strlen(name)) { + filename = wstrappend(filename, "."); + filename = wstrappend(filename, name); + } + return filename; +} + +static int +matchString(void *str1, void *str2) +{ + return (strcmp((char*)str1, (char*)str2)==0 ? 1 : 0); +} + +static WMArray * +LoadHistory(char *filename, int max) +{ + WMPropList *plhistory; + WMPropList *plitem; + WMArray *history; + int i, num; + + history = WMCreateArrayWithDestructor(1, wfree); + WMAddToArray(history, wstrdup("")); + + plhistory = WMReadPropListFromFile((char*)filename); + + if(plhistory && WMIsPLArray(plhistory)) { + num = WMGetPropListItemCount(plhistory); + if(num > max) num = max; + + for(i = 0; i < num; ++i) { + plitem = WMGetFromPLArray(plhistory, i); + if(WMIsPLString(plitem) && WMFindInArray(history, matchString, + WMGetFromPLString(plitem)) == WANotFound) + WMAddToArray(history, WMGetFromPLString(plitem)); + } + } + + return history; +} + +static void +SaveHistory(WMArray *history, char *filename) +{ + int i; + WMPropList *plhistory; + + plhistory = WMCreatePLArray(NULL); + + for(i = 0; i < WMGetArrayItemCount(history); ++i) + WMAddToPLArray(plhistory, + WMCreatePLString(WMGetFromArray(history, i))); + + WMWritePropListToFile(plhistory, (char*)filename, False); + WMReleasePropList(plhistory); +} + +static int +strmatch(const char *str1, const char *str2) +{ + return !strcmp(str1, str2); +} + +static int +pstrcmp(const char **str1, const char **str2) +{ + return strcmp(*str1, *str2); +} + +static void +ScanFiles(const char *dir, const char *prefix, unsigned acceptmask, + unsigned declinemask, WMArray *result) +{ + int prefixlen; + DIR *d; + struct dirent *de; + struct stat sb; + char *fullfilename, *suffix; + + prefixlen = strlen(prefix); + if((d = opendir(dir)) != NULL) { + while((de = readdir(d)) != NULL) { + if(strlen(de->d_name) > prefixlen && + !strncmp(prefix, de->d_name, prefixlen) && + strcmp(de->d_name, ".") != 0 && + strcmp(de->d_name, "..")) { + fullfilename = wstrconcat((char*)dir, "/"); + fullfilename = wstrappend(fullfilename, de->d_name); + + if(stat(fullfilename, &sb) == 0 && + (sb.st_mode & acceptmask) && + !(sb.st_mode & declinemask) && + WMFindInArray(result, (WMMatchDataProc*)strmatch, + de->d_name + prefixlen) == WANotFound) { + suffix = wstrdup(de->d_name + prefixlen); + WMAddToArray(result, suffix); + } + wfree(fullfilename); + } + } + closedir(d); + } +} + +static WMArray * +GenerateVariants(const char * complete) +{ + Bool firstWord = True; + WMArray *variants = NULL; + char *pos = NULL, *path = NULL, *tmp = NULL, *dir = NULL, *prefix = NULL; + + variants = WMCreateArrayWithDestructor(0, wfree); + + while(*complete == ' ') ++complete; + + if((pos = strrchr(complete, ' ')) != NULL) { + complete = pos + 1; + firstWord = False; + } + + if((pos = strrchr(complete, '/')) != NULL) { + tmp = wstrndup((char*)complete, pos - complete + 1); + if(*tmp == '~' && *(tmp+1) == '/' && getenv("HOME")) { + dir = wstrdup(getenv("HOME")); + dir = wstrappend(dir, tmp + 1); + wfree(tmp); + } else { + dir = tmp; + } + prefix = wstrdup(pos + 1); + ScanFiles(dir, prefix, (unsigned)-1, 0, variants); + wfree(dir); + wfree(prefix); + } else if(*complete == '~') { + WMAddToArray(variants, wstrdup("/")); + } else if(firstWord) { + path = getenv("PATH"); + while(path) { + pos = strchr(path, ':'); + if(pos) { + tmp = wstrndup(path, pos - path); + path = pos + 1; + } else if(*path != '\0') { + tmp = wstrdup(path); + path = NULL; + } else break; + ScanFiles(tmp, complete, + S_IXOTH | S_IXGRP | S_IXUSR, S_IFDIR, variants); + wfree(tmp); + } + } + + WMSortArray(variants, (WMCompareDataProc*)pstrcmp); + return variants; +} + +static void +handleHistoryKeyPress(XEvent *event, void *clientData) +{ + char *text; + unsigned pos; + WMInputPanelWithHistory *p = (WMInputPanelWithHistory*)clientData; + KeySym ksym; + + ksym = XLookupKeysym(&event->xkey, 0); + + switch(ksym) + { + case XK_Up: + if(p->histpos < WMGetArrayItemCount(p->history) - 1) { + if(p->histpos == 0) + wfree(WMReplaceInArray(p->history, + 0, WMGetTextFieldText(p->panel->text))); + p->histpos++; + WMSetTextFieldText(p->panel->text, + WMGetFromArray(p->history, p->histpos)); + } + break; + case XK_Down: + if(p->histpos > 0) { + p->histpos--; + WMSetTextFieldText(p->panel->text, + WMGetFromArray(p->history, p->histpos)); + } + break; + case XK_Tab: + if(!p->variants) { + text = WMGetTextFieldText(p->panel->text); + pos = WMGetTextFieldCursorPosition(p->panel->text); + p->prefix = wstrndup(text, pos); + p->suffix = wstrdup(text + pos); + wfree(text); + p->variants = GenerateVariants(p->prefix); + p->varpos = 0; + if(!p->variants) { + wfree(p->prefix); + wfree(p->suffix); + p->prefix = NULL; + p->suffix = NULL; + } + } + if(p->variants && p->prefix && p->suffix) { + p->varpos++; + if(p->varpos > WMGetArrayItemCount(p->variants)) + p->varpos = 0; + if(p->varpos > 0) + text = wstrconcat(p->prefix, + WMGetFromArray(p->variants, p->varpos - 1)); + else + text = wstrdup(p->prefix); + pos = strlen(text); + text = wstrappend(text, p->suffix); + WMSetTextFieldText(p->panel->text, text); + WMSetTextFieldCursorPosition(p->panel->text, pos); + wfree(text); + } + break; + } + if(ksym != XK_Tab) { + if(p->prefix) { + wfree(p->prefix); + p->prefix = NULL; + } + if(p->suffix) { + wfree(p->suffix); + p->suffix = NULL; + } + if(p->variants) { + WMFreeArray(p->variants); + p->variants = NULL; + } + } +} + +int +wAdvancedInputDialog(WScreen *scr, char *title, char *message, + char *name, char **text) +{ + WWindow *wwin; + Window parent; + char *result; + WMPoint center; + WMInputPanelWithHistory *p; + char *filename; + + filename = HistoryFileName(name); + p = wmalloc(sizeof(WMInputPanelWithHistory)); + p->panel = WMCreateInputPanel(scr->wmscreen, NULL, title, message, *text, + _("OK"), _("Cancel")); + p->history = LoadHistory(filename, wPreferences.history_lines); + p->histpos = 0; + p->prefix = NULL; + p->suffix = NULL; + p->rest = NULL; + p->variants = NULL; + p->varpos = 0; + WMCreateEventHandler(WMWidgetView(p->panel->text), KeyPressMask, + handleHistoryKeyPress, p); + + parent = XCreateSimpleWindow(dpy, scr->root_win, 0, 0, 320, 160, 0, 0, 0); + XSelectInput(dpy, parent, KeyPressMask|KeyReleaseMask); + + XReparentWindow(dpy, WMWidgetXID(p->panel->win), parent, 0, 0); + + center = getCenter(scr, 320, 160); + wwin = wManageInternalWindow(scr, parent, None, NULL, center.x, center.y, + 320, 160); + + wwin->client_leader = WMWidgetXID(p->panel->win); + + WMMapWidget(p->panel->win); + + wWindowMap(wwin); + + WMRunModalLoop(WMWidgetScreen(p->panel->win), WMWidgetView(p->panel->win)); + + if (p->panel->result == WAPRDefault) { + result = WMGetTextFieldText(p->panel->text); + wfree(WMReplaceInArray(p->history, 0, wstrdup(result))); + SaveHistory(p->history, filename); + } + else + result = NULL; + + wUnmanageWindow(wwin, False, False); + + WMDestroyInputPanel(p->panel); + WMFreeArray(p->history); + wfree(p); + wfree(filename); + + XDestroyWindow(dpy, parent); + + if (result==NULL) + return False; + else { + if (*text) + wfree(*text); + *text = result; + + return True; + } +} int wInputDialog(WScreen *scr, char *title, char *message, char **text) --- WindowMaker-0.91.0/src/dialog.h.vns 2004-10-12 21:54:37 +0400 +++ WindowMaker-0.91.0/src/dialog.h 2005-05-18 18:11:54 +0400 @@ -33,6 +33,7 @@ int wMessageDialog(WScreen *scr, char *title, char *message, char *defBtn, char *altBtn, char *othBtn); +int wAdvancedInputDialog(WScreen *scr, char *title, char *message, char *name, char **text); int wInputDialog(WScreen *scr, char *title, char *message, char **text); int wExitDialog(WScreen *scr, char *title, char *message, char *defBtn, --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 18:08:11 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 18:08:11 +0400 @@ -894,6 +894,9 @@ }, {"SelectCursor", "(builtin, cross)", (void*)WCUR_SELECT, NULL, getCursor, setCursor + }, + {"DialogHistoryLines", "500", NULL, + &wPreferences.history_lines, getInt, NULL } }; --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 18:08:11 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 18:08:11 +0400 @@ -491,6 +491,7 @@ char single_click; int show_clip_title; + int history_lines; struct { unsigned int nodock:1; /* don't display the dock */ WindowMaker-0.91.0-alt-clipnotext.patch: --- NEW FILE WindowMaker-0.91.0-alt-clipnotext.patch --- --- WindowMaker-0.91.0/src/dock.c.vns 2005-05-18 16:29:46 +0400 +++ WindowMaker-0.91.0/src/dock.c 2005-05-18 16:31:23 +0400 @@ -1295,8 +1295,9 @@ tx = CLIP_BUTTON_SIZE*ICON_SIZE/64; - WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, tx, - ty, ws_name, length); + if(wPreferences.show_clip_title) + WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, tx, + ty, ws_name, length); /*WMDrawString(scr->wmscreen, win, color, scr->clip_title_font, 4, 2, ws_name, length);*/ --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 16:29:46 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 16:29:46 +0400 @@ -633,6 +633,9 @@ {"ClipTitleFont", DEF_CLIP_TITLE_FONT, NULL, NULL, getFont, setClipTitleFont }, + {"ShowClipTitle", "YES", NULL, + &wPreferences.show_clip_title, getBool, NULL + }, {"LargeDisplayFont",DEF_WORKSPACE_NAME_FONT, NULL, NULL, getFont, setLargeDisplayFont }, --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 16:29:46 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 16:29:46 +0400 @@ -490,6 +490,8 @@ /* single click to lauch applications */ char single_click; + int show_clip_title; + struct { unsigned int nodock:1; /* don't display the dock */ unsigned int noclip:1; /* don't display the clip */ WindowMaker-0.91.0-alt-dockhotkeys.patch: --- NEW FILE WindowMaker-0.91.0-alt-dockhotkeys.patch --- --- WindowMaker-0.91.0/src/dock.c.vns 2005-05-18 11:49:00 +0400 +++ WindowMaker-0.91.0/src/dock.c 2005-05-18 12:01:06 +0400 @@ -96,6 +96,7 @@ #ifdef XDND /* XXX was OFFIX */ static WMPropList *dDropCommand=NULL; #endif +static WMPropList *dKeyboardShortcut=NULL; static WMPropList *dAutoLaunch, *dLock; static WMPropList *dName, *dForced, *dBuggyApplication, *dYes, *dNo; static WMPropList *dHost, *dDock, *dClip; @@ -151,6 +152,7 @@ #ifdef XDND dDropCommand = WMRetainPropList(WMCreatePLString("DropCommand")); #endif + dKeyboardShortcut = WMRetainPropList(WMCreatePLString("Shortcut")); dLock = WMRetainPropList(WMCreatePLString("Lock")); dAutoLaunch = WMRetainPropList(WMCreatePLString("AutoLaunch")); dName = WMRetainPropList(WMCreatePLString("Name")); @@ -1398,6 +1400,12 @@ WMReleasePropList(command); } + if (btn->keyboard_shortcut) { + command = WMCreatePLString(btn->keyboard_shortcut); + WMPutInPLDictionary(node, dKeyboardShortcut, command); + WMReleasePropList(command); + } + if (btn->client_machine && btn->remote_start) { host = WMCreatePLString(btn->client_machine); WMPutInPLDictionary(node, dHost, host); @@ -1613,6 +1621,12 @@ aicon->dnd_command = wstrdup(WMGetFromPLString(cmd)); #endif + cmd = WMGetFromPLDictionary(info, dKeyboardShortcut); + if (cmd) { + if(addDockShortcut(WMGetFromPLString(cmd), aicon)) + aicon->keyboard_shortcut = wstrdup(WMGetFromPLString(cmd)); + } + cmd = WMGetFromPLDictionary(info, dPasteCommand); if (cmd) aicon->paste_command = wstrdup(WMGetFromPLString(cmd)); @@ -1918,6 +1932,8 @@ if (type == WM_DOCK) dock->icon_count = 0; + dock->screen_ptr->flags.dock_changed_shortcuts = 0; + for (i=0; iicon_count >= dock->max_icons) { wwarning(_("there are too many icons stored in dock. Ignoring what doesn't fit")); @@ -1950,6 +1966,11 @@ } else if (dock->icon_count==0 && type==WM_DOCK) dock->icon_count++; } + if(dock->screen_ptr->flags.dock_changed_shortcuts) + { + rebindKeygrabs(dock->screen_ptr); + dock->screen_ptr->flags.dock_changed_shortcuts = 0; + } /* if the first icon is not defined, use the default */ if (dock->icon_array[0]==NULL) { @@ -4479,3 +4500,125 @@ return status; } +Bool +addDockShortcut(char *shortcutDefinition, WAppIcon *icon) +{ + int modifier = 0; + KeyCode keycode; + KeySym ksym; + char *k; + char buf[128], *b; + + strcpy(buf, shortcutDefinition); + b = (char*)buf; + + /* get modifiers */ + while((k = strchr(b, '+'))!=NULL) { + int mod; + + *k = 0; + mod = wXModifierFromKey(b); + if(mod < 0) { + wwarning(_("invalid key modifier \"%s\""), b); + return False; + } + modifier |= mod; + + b = k+1; + } + + /* get key */ + ksym = XStringToKeysym(b); + + if (ksym==NoSymbol) { + wwarning(_("invalid kbd shortcut specification \"%s\""), shortcutDefinition); + return False; + } + + keycode = XKeysymToKeycode(dpy, ksym); + if (keycode==0) { + wwarning(_("invalid key in shortcut \"%s\""), shortcutDefinition); + return False; + } + icon->modifier = modifier; + icon->keycode = keycode; + if(icon->dock && icon->dock->screen_ptr) + icon->dock->screen_ptr->flags.dock_changed_shortcuts = 1; + return True; +} + +static Bool +wDockPerformShortcut(WDock *dock, XEvent *event) +{ + int i; + int modifiers; + int done = 0; + + if(!dock) return done; + modifiers = event->xkey.state & ValidModMask; + for(i=(dock->type==WM_DOCK ? 0 : 1); imax_icons; i++) { + WAppIcon *btn = dock->icon_array[i]; + + if(!btn || btn->attracted) + continue; + + if(btn->keycode==event->xkey.keycode && (btn->modifier==modifiers)) { + launchDockedApplication(btn, False); + done = True; + break; + } + + } + return done; +} + +Bool +wDockAndClipPerformShortcut(WScreen *scr, XEvent *event) +{ + int done = 0; + int i; + if(!(done = wDockPerformShortcut(scr->dock, event))) { + for(i=0; i < scr->workspace_count; i++) { + if(done = wDockPerformShortcut(scr->workspaces[i]->clip, event)) break; + } + } + return done; +} + +static void +wDockBindShortcuts(Window window, WDock* dock) +{ + int i; + if(!dock) return; + for(i=(dock->type==WM_DOCK ? 0 : 1); imax_icons; i++) { + WAppIcon *btn = dock->icon_array[i]; + + if(!btn || btn->attracted) + continue; + + if(btn->keyboard_shortcut) + { + if(btn->keyboard_shortcut && btn->modifier!=AnyModifier) { + XGrabKey(dpy, btn->keycode, btn->modifier|LockMask, + window, True, GrabModeAsync, GrabModeAsync); +#ifdef NUMLOCK_HACK + wHackedGrabKey(btn->keycode, btn->modifier, + window, True, GrabModeAsync, GrabModeAsync); +#endif + } + XGrabKey(dpy, btn->keycode, btn->modifier, window, True, + GrabModeAsync, GrabModeAsync); + } + } +} + +void +wDockAndClipBindShortcuts(Window window, WScreen *scr) +{ + int i; + wDockBindShortcuts(window, scr->dock); + for(i=0; i < scr->workspace_count; i++ ) { + wDockBindShortcuts(window, scr->workspaces[i]->clip); + } +} + --- WindowMaker-0.91.0/src/appicon.c.vns 2005-05-18 11:49:00 +0400 +++ WindowMaker-0.91.0/src/appicon.c 2005-05-18 11:49:00 +0400 @@ -197,6 +197,8 @@ if (aicon->dnd_command) wfree(aicon->dnd_command); #endif + if (aicon->keyboard_shortcut) + wfree(aicon->keyboard_shortcut); if (aicon->wm_instance) wfree(aicon->wm_instance); if (aicon->wm_class) --- WindowMaker-0.91.0/src/appicon.h.vns 2004-10-14 21:31:49 +0400 +++ WindowMaker-0.91.0/src/appicon.h 2005-05-18 11:50:01 +0400 @@ -52,6 +52,10 @@ char *paste_command; /* command to run when something is pasted */ + char *keyboard_shortcut; /* keyboard shortcut to launch app */ + int modifier; + KeyCode keycode; + char *wm_class; char *wm_instance; pid_t pid; /* for apps launched from the dock */ --- WindowMaker-0.91.0/src/dockedapp.c.vns 2004-10-14 21:31:49 +0400 +++ WindowMaker-0.91.0/src/dockedapp.c 2005-05-18 11:56:22 +0400 @@ -25,6 +25,7 @@ #include #include +#include #include #include @@ -66,6 +67,10 @@ WMTextField *pasteCommandField; WMLabel *pasteCommandLabel; + WMFrame *keyboardShortcutFrame; + WMTextField *keyboardShortcutField; + WMButton *keyboardShortcutCaptureBtn; + WMFrame *iconFrame; WMTextField *iconField; WMButton *browseBtn; @@ -81,6 +86,7 @@ /* kluge */ unsigned int destroyed:1; unsigned int choosingIcon:1; + unsigned int capturing:1; } AppSettingsPanel; @@ -117,6 +123,43 @@ icon->paste_command = command; } +static char* +trimstr(char *str) +{ + char *p = str; + int i; + + while (isspace(*p)) p++; + p = wstrdup(p); + i = strlen(p); + while (isspace(p[i]) && i>0) { + p[i]=0; + i--; + } + + return p; +} + +static void +updateKeyboardShortcut(WAppIcon *icon, char *shortcut) +{ + char *str = NULL; + if(icon->keyboard_shortcut) + wfree(icon->keyboard_shortcut); + if(shortcut) { + str = trimstr(shortcut); + if(!strlen(str)) { + wfree(str); + str = NULL; + } + } + icon->keyboard_shortcut = str; + icon->modifier = 0; + icon->keycode = 0; + if(str) addDockShortcut(str, icon); + rebindKeygrabs(icon->dock->screen_ptr); +} + #ifdef XDND @@ -267,6 +310,8 @@ text = WMGetTextFieldText(panel->pasteCommandField); updatePasteCommand(panel->editedIcon, text); + text = WMGetTextFieldText(panel->keyboardShortcutField); + updateKeyboardShortcut(panel->editedIcon, text); panel->editedIcon->auto_launch = WMGetButtonSelected(panel->autoLaunchBtn); @@ -279,9 +324,83 @@ DestroyDockAppSettingsPanel(panel); } +static char* +captureShortcut(Display *dpy, AppSettingsPanel *panel) +{ + XEvent ev; + KeySym ksym, lksym, uksym; + char buffer[64]; + char *key = NULL; + + while (panel->capturing) { + XAllowEvents(dpy, AsyncKeyboard, CurrentTime); + WMNextEvent(dpy, &ev); + if (ev.type==KeyPress && ev.xkey.keycode!=0) { + ksym = XKeycodeToKeysym(dpy, ev.xkey.keycode, 0); + if (!IsModifierKey(ksym)) { + XConvertCase(ksym, &lksym, &uksym); + key=XKeysymToString(uksym); + panel->capturing = 0; + break; + } + } + WMHandleEvent(&ev); + } + if (!key) + return NULL; + + buffer[0] = 0; + if (ev.xkey.state & ControlMask) { + strcat(buffer, "Control+"); + } + if (ev.xkey.state & ShiftMask) { + strcat(buffer, "Shift+"); + } + if (ev.xkey.state & Mod1Mask) { + strcat(buffer, "Mod1+"); + } + if (ev.xkey.state & Mod2Mask) { + strcat(buffer, "Mod2+"); + } + if (ev.xkey.state & Mod3Mask) { + strcat(buffer, "Mod3+"); + } + if (ev.xkey.state & Mod4Mask) { + strcat(buffer, "Mod4+"); + } + if (ev.xkey.state & Mod5Mask) { + strcat(buffer, "Mod5+"); + } + strcat(buffer, key); + + return wstrdup(buffer); +} + +static void +captureClick(WMWidget *w, void *data) +{ + AppSettingsPanel *panel = (AppSettingsPanel*)data; + char *shortcut; + + if(!panel->capturing) { + panel->capturing = 1; + WMSetButtonText(w, _("Cancel")); + XGrabKeyboard(dpy, WMWidgetXID(panel->win), True, GrabModeAsync, + GrabModeAsync, CurrentTime); + shortcut = captureShortcut(dpy, panel); + if (shortcut) { + WMSetTextFieldText(panel->keyboardShortcutField, shortcut); + wfree(shortcut); + } + } + panel->capturing = 0; + WMSetButtonText(w, _("Capture")); + XUngrabKeyboard(dpy, CurrentTime); +} + #define PWIDTH 295 -#define PHEIGHT 430 +#define PHEIGHT 490 void @@ -396,6 +515,21 @@ #endif WMMapSubwidgets(panel->dndCommandFrame); + panel->keyboardShortcutFrame = WMCreateFrame(vbox); + WMSetFrameTitle(panel->keyboardShortcutFrame, _("Keyboard shortcut")); + WMAddBoxSubview(vbox, WMWidgetView(panel->keyboardShortcutFrame), False, True, + 50, 50, 10); + panel->keyboardShortcutField = WMCreateTextField(panel->keyboardShortcutFrame); + WMResizeWidget(panel->keyboardShortcutField, 176, 20); + WMMoveWidget(panel->keyboardShortcutField, 10, 20); + WMSetTextFieldText(panel->keyboardShortcutField, aicon->keyboard_shortcut); + panel->keyboardShortcutCaptureBtn = WMCreateCommandButton(panel->keyboardShortcutFrame); + WMSetButtonText(panel->keyboardShortcutCaptureBtn, _("Capture")); + WMResizeWidget(panel->keyboardShortcutCaptureBtn, 70, 24); + WMMoveWidget(panel->keyboardShortcutCaptureBtn, 195, 18); + WMSetButtonAction(panel->keyboardShortcutCaptureBtn, captureClick, panel); + WMMapSubwidgets(panel->keyboardShortcutFrame); + panel->iconFrame = WMCreateFrame(vbox); WMSetFrameTitle(panel->iconFrame, _("Icon Image")); WMAddBoxSubview(vbox, WMWidgetView(panel->iconFrame), False, True, --- WindowMaker-0.91.0/src/event.c.vns 2004-10-24 23:19:50 +0400 +++ WindowMaker-0.91.0/src/event.c 2005-05-18 11:57:21 +0400 @@ -1364,7 +1364,7 @@ } #endif #else - if (!wRootMenuPerformShortcut(event)) { + if (!wRootMenuPerformShortcut(event) && !wDockAndClipPerformShortcut(scr, event)) { #endif static int dontLoop = 0; --- WindowMaker-0.91.0/src/rootmenu.c.vns 2005-05-18 11:49:00 +0400 +++ WindowMaker-0.91.0/src/rootmenu.c 2005-05-18 11:49:00 +0400 @@ -466,7 +466,7 @@ } -static void +void rebindKeygrabs(WScreen *scr) { WWindow *wwin; --- WindowMaker-0.91.0/src/screen.h.vns 2004-10-23 03:58:59 +0400 +++ WindowMaker-0.91.0/src/screen.h 2005-05-18 11:58:11 +0400 @@ -307,6 +307,7 @@ unsigned int regenerate_icon_textures:1; unsigned int dnd_data_convertion_status:1; unsigned int root_menu_changed_shortcuts:1; + unsigned int dock_changed_shortcuts:1; unsigned int added_workspace_menu:1; unsigned int added_windows_menu:1; unsigned int startup2:1; /* startup phase 2 */ --- WindowMaker-0.91.0/src/window.c.vns 2005-05-18 11:49:00 +0400 +++ WindowMaker-0.91.0/src/window.c 2005-05-18 11:49:00 +0400 @@ -2820,6 +2820,7 @@ #ifndef LITE wRootMenuBindShortcuts(wwin->frame->core->window); + wDockAndClipBindShortcuts(wwin->frame->core->window, wwin->screen_ptr); #endif } WindowMaker-0.91.0-alt-focus.patch: --- NEW FILE WindowMaker-0.91.0-alt-focus.patch --- --- WindowMaker-0.91.0/src/actions.c.vns 2005-05-18 22:16:13 +0400 +++ WindowMaker-0.91.0/src/actions.c 2005-05-18 22:17:23 +0400 @@ -1251,6 +1251,9 @@ /* In case we were shaded and iconified, also unshade */ if (!netwm_hidden) wUnshadeWindow(wwin); + + if (wwin->flags.focused) + wSetFocusTo(wwin->screen_ptr, wwin); } WindowMaker-0.91.0-alt-menutrans.patch: --- NEW FILE WindowMaker-0.91.0-alt-menutrans.patch --- --- WindowMaker-0.91.0/src/rootmenu.c.vns 2005-05-18 14:12:23 +0400 +++ WindowMaker-0.91.0/src/rootmenu.c 2005-05-18 14:12:23 +0400 @@ -355,6 +355,17 @@ wShowLegalPanel(menu->frame->screen_ptr); } +/************ translate menu item on the fly *************/ +#define NOTRANSLATE_PREFIX "notranslate " +static char* +translateMenuTitle(char* title) +{ + if(!strncmp(NOTRANSLATE_PREFIX, title, strlen(NOTRANSLATE_PREFIX))) + return title + strlen(NOTRANSLATE_PREFIX); + if(wPreferences.translate_menu) + return dgettext("menu-messages", title); + return title; +} /********************************************************************/ @@ -1146,13 +1157,13 @@ /* start submenu */ - cascade = wMenuCreate(scr, title, False); + cascade = wMenuCreate(scr, translateMenuTitle(title), False); cascade->on_destroy = removeShortcutsForMenu; if (parseCascade(scr, cascade, file, file_name)==NULL) { wMenuDestroy(cascade, True); } else { wMenuEntrySetCascade(menu, - wMenuAddCallback(menu, title, NULL, NULL), + wMenuAddCallback(menu, translateMenuTitle(title), NULL, NULL), cascade); } } else if (strcasecmp(command, "END")==0) { @@ -1161,7 +1172,7 @@ } else { /* normal items */ - addMenuEntry(menu, title, shortcut[0] ? shortcut : NULL, command, + addMenuEntry(menu, translateMenuTitle(title), shortcut[0] ? shortcut : NULL, command, params[0] ? params : NULL, file_name); } } @@ -1534,7 +1545,7 @@ strcat(buffer, command); } - addMenuEntry(menu, data->name, NULL, "OPEN_MENU", buffer, path[data->index]); + addMenuEntry(menu, translateMenuTitle(data->name), NULL, "OPEN_MENU", buffer, path[data->index]); wfree(buffer); if (data->name) @@ -1582,7 +1593,7 @@ if (ptr && ptr!=data->name) *ptr = 0; } - addMenuEntry(menu, data->name, NULL, "SHEXEC", buffer, path[data->index]); + addMenuEntry(menu, translateMenuTitle(data->name), NULL, "SHEXEC", buffer, path[data->index]); wfree(buffer); if (data->name) @@ -1701,7 +1712,7 @@ } mtitle = WMGetFromPLString(elem); - menu = wMenuCreate(scr, mtitle, False); + menu = wMenuCreate(scr, translateMenuTitle(mtitle), False); menu->on_destroy = removeShortcutsForMenu; #ifdef GLOBAL_SUBMENU_FILE @@ -1738,7 +1749,7 @@ /* submenu */ submenu = configureMenu(scr, elem); if (submenu) { - mentry = wMenuAddCallback(menu, submenu->frame->title, NULL, + mentry = wMenuAddCallback(menu, translateMenuTitle(submenu->frame->title), NULL, NULL); wMenuEntrySetCascade(menu, mentry, submenu); } @@ -1761,7 +1772,7 @@ if (!title || !command) goto error; - addMenuEntry(menu, WMGetFromPLString(title), + addMenuEntry(menu, translateMenuTitle(WMGetFromPLString(title)), shortcut ? WMGetFromPLString(shortcut) : NULL, WMGetFromPLString(command), params ? WMGetFromPLString(params) : NULL, "WMRootMenu"); --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 14:12:23 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 14:12:23 +0400 @@ -556,6 +556,9 @@ {"SingleClickLaunch", "NO", NULL, &wPreferences.single_click, getBool, NULL }, + {"TranslateMenu", "YES", NULL, + &wPreferences.translate_menu, getBool, NULL + }, /* style options */ {"MenuStyle", "normal", seMenuStyles, &wPreferences.menu_style, getEnum, setMenuStyle --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 14:12:23 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 14:12:23 +0400 @@ -466,6 +466,8 @@ /* shading animation */ signed char shade_speed; + int translate_menu; + int edge_resistance; char attract; --- WindowMaker-0.91.0/src/workspace.c.vns 2004-10-26 07:17:12 +0400 +++ WindowMaker-0.91.0/src/workspace.c 2005-05-18 14:12:23 +0400 @@ -1349,7 +1349,10 @@ { WMenu *wsmenu; - wsmenu = wMenuCreate(scr, titled ? _("Workspaces") : NULL, False); + if(wPreferences.translate_menu) + wsmenu = wMenuCreate(scr, titled ? _("Workspaces") : NULL, False); + else + wsmenu = wMenuCreate(scr, titled ? "Workspaces" : NULL, False); if (!wsmenu) { wwarning(_("could not create Workspace menu")); return NULL; @@ -1358,8 +1361,17 @@ /* callback to be called when an entry is edited */ wsmenu->on_edit = onMenuEntryEdited; - wMenuAddCallback(wsmenu, _("New"), newWSCommand, NULL); - wMenuAddCallback(wsmenu, _("Destroy Last"), deleteWSCommand, NULL); + + if(wPreferences.translate_menu) + { + wMenuAddCallback(wsmenu, _("New"), newWSCommand, NULL); + wMenuAddCallback(wsmenu, _("Destroy Last"), deleteWSCommand, NULL); + } + else + { + wMenuAddCallback(wsmenu, "New", newWSCommand, NULL); + wMenuAddCallback(wsmenu, "Destroy Last", deleteWSCommand, NULL); + } return wsmenu; } --- WindowMaker-0.91.0/src/main.c.vns 2004-10-25 05:32:51 +0400 +++ WindowMaker-0.91.0/src/main.c 2005-05-18 14:14:26 +0400 @@ -791,11 +791,15 @@ if (!Locale || strcmp(Locale, "C")==0 || strcmp(Locale, "POSIX")==0) Locale = NULL; #ifdef I18N - if (getenv("NLSPATH")) + if (getenv("NLSPATH")) { bindtextdomain("WindowMaker", getenv("NLSPATH")); - else + bindtextdomain("menu-messages", getenv("NLSPATH")); + } else { bindtextdomain("WindowMaker", LOCALEDIR); + bindtextdomain("menu-messages", LOCALEDIR); + } bind_textdomain_codeset("WindowMaker", "UTF-8"); + bind_textdomain_codeset("menu-messages", "UTF-8"); textdomain("WindowMaker"); if (!XSupportsLocale()) { WindowMaker-0.91.0-alt-mmx.patch: --- NEW FILE WindowMaker-0.91.0-alt-mmx.patch --- --- WindowMaker-0.91.0/configure.ac.vns 2005-05-18 17:38:01 +0400 +++ WindowMaker-0.91.0/configure.ac 2005-05-18 17:47:55 +0400 @@ -190,7 +190,15 @@ # until we fix it, leave it disabled asm_support=no mmx_support=no -if test "$ac_cv_prog_gcc" = yes; then + +check_for_mmx_support=yes +AC_ARG_ENABLE(mmx, + [ --disable-mmx disable compilation of MMX inline assembly ], + [if test x$enableval != xyes; then + check_for_mmx_support=no + fi]) + +if test "$ac_cv_prog_gcc" = yes -a "$check_for_mmx_support" = yes; then # gcc-3.3 or newer complains about some of our stuff without this NOSTRICTALIASING="-fno-strict-aliasing" WindowMaker-0.91.0-alt-restartscrpt.patch: --- NEW FILE WindowMaker-0.91.0-alt-restartscrpt.patch --- --- WindowMaker-0.91.0/src/shutdown.c.vns 2005-05-18 12:49:09 +0400 +++ WindowMaker-0.91.0/src/shutdown.c 2005-05-18 12:50:35 +0400 @@ -123,6 +123,7 @@ RestoreDesktop(scr); } } + ExecExitScript(); break; } } WindowMaker-0.91.0-alt-session.patch: --- NEW FILE WindowMaker-0.91.0-alt-session.patch --- --- WindowMaker-0.91.0/src/session.c.vns 2005-05-18 12:44:44 +0400 +++ WindowMaker-0.91.0/src/session.c 2005-05-18 12:46:21 +0400 @@ -331,7 +331,8 @@ if ((wwin->transient_for==None || wwin->transient_for==wwin->screen_ptr->root_win) - && WMGetFirstInArray(wapp_list, (void*)appId)==WANotFound + && (WMGetFirstInArray(wapp_list, (void*)appId)==WANotFound + || WFLAGP(wwin, shared_appicon)) && !WFLAGP(wwin, dont_save_session)) { /* A entry for this application was not yet saved. Save one. */ if ((win_info = makeWindowState(wwin, wapp))!=NULL) { WindowMaker-0.91.0-alt-sowings.patch: --- NEW FILE WindowMaker-0.91.0-alt-sowings.patch --- --- WindowMaker-0.91.0/WINGs/Examples/Makefile.am.vns 2004-08-25 00:56:43 +0400 +++ WindowMaker-0.91.0/WINGs/Examples/Makefile.am 2005-05-18 17:04:02 +0400 @@ -6,23 +6,24 @@ noinst_PROGRAMS = connect server fontl puzzle colorpick -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ + $(top_builddir)/WINGs/libWUtil.la \ @XFTLIBS@ @INTLIBS@ -colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a +colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la -fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a +fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la -puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a +puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la -connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a +connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la -connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ +connect_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \ @NETLIBS@ @INTLIBS@ -server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a +server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.la -server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ \ +server_LDADD = $(top_builddir)/WINGs/libWUtil.la @LIBRARY_SEARCH_PATH@ \ @NETLIBS@ @INTLIBS@ --- WindowMaker-0.91.0/WINGs/Extras/Makefile.am.vns 2004-10-12 06:31:26 +0400 +++ WindowMaker-0.91.0/WINGs/Extras/Makefile.am 2005-05-18 17:04:02 +0400 @@ -10,13 +10,13 @@ include_HEADERS = wtableview.h wtabledelegates.h -lib_LIBRARIES = libExtraWINGs.a +lib_LTLIBRARIES = libExtraWINGs.la noinst_PROGRAMS = test EXTRA_DIST = -libExtraWINGs_a_SOURCES = \ +libExtraWINGs_la_SOURCES = \ wtableview.c \ wtabledelegates.c \ wtableview.h \ @@ -27,7 +27,8 @@ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs \ -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ + $(top_builddir)/WINGs/libWUtil.la \ @XFTLIBS@ @INTLIBS@ test_LDADD = wtableview.o wtabledelegates.o $(LDADD) --- WindowMaker-0.91.0/WINGs/Tests/Makefile.am.vns 2004-04-07 03:55:21 +0400 +++ WindowMaker-0.91.0/WINGs/Tests/Makefile.am 2005-05-18 17:04:02 +0400 @@ -4,13 +4,14 @@ noinst_PROGRAMS = wtest wmquery wmfile testmywidget -LDADD= $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la \ +LDADD= $(top_builddir)/WINGs/libWINGs.la $(top_builddir)/wrlib/libwraster.la \ + $(top_builddir)/WINGs/libWUtil.la \ @XFTLIBS@ @INTLIBS@ testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h -wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a +wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png --- WindowMaker-0.91.0/WINGs/Makefile.am.vns 2004-10-12 06:31:26 +0400 +++ WindowMaker-0.91.0/WINGs/Makefile.am 2005-05-18 17:08:21 +0400 @@ -6,14 +6,15 @@ -#libWINGs_la_LDFLAGS = -version-info 1:1:0 +libWINGs_la_LDFLAGS = -version-info 2:1:0 +libWUtil_la_LDFLAGS = -version-info 1:2:0 bin_SCRIPTS = get-wings-flags get-wutil-flags -lib_LIBRARIES = libWINGs.a libWUtil.a +lib_LTLIBRARIES = libWINGs.la libWUtil.la -LDADD= libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@ +LDADD= libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@ EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i \ @@ -21,32 +22,12 @@ # wbutton.c -libWINGs_a_SOURCES = \ - array.c \ - bagtree.c \ +libWINGs_la_SOURCES = \ configuration.c \ - connection.c \ - data.c \ dragcommon.c \ dragdestination.c \ dragsource.c \ - error.c \ - findfile.c \ - handlers.c \ - hashtable.c \ - host.c \ - international.c \ - memory.c \ - misc.c \ - notification.c \ - proplist.c \ selection.c \ - snprintf.c \ - string.c \ - tree.c \ - userdefaults.c \ - usleep.c \ - wapplication.c \ wappresource.c \ wballoon.c \ wbox.c \ @@ -82,8 +63,7 @@ wview.c \ wwindow.c - -libWUtil_a_SOURCES = \ +libWUtil_la_SOURCES = \ array.c \ bagtree.c \ connection.c \ --- WindowMaker-0.91.0/src/Makefile.am.vns 2005-05-18 17:04:02 +0400 +++ WindowMaker-0.91.0/src/Makefile.am 2005-05-18 17:04:02 +0400 @@ -117,7 +117,8 @@ wmaker_LDADD = \ - $(top_builddir)/WINGs/libWINGs.a\ + $(top_builddir)/WINGs/libWINGs.la\ + $(top_builddir)/WINGs/libWUtil.la\ $(top_builddir)/wrlib/libwraster.la\ @XFTLIBS@ \ @XLIBS@ \ --- WindowMaker-0.91.0/util/Makefile.am.vns 2004-10-24 01:27:48 +0400 +++ WindowMaker-0.91.0/util/Makefile.am 2005-05-18 17:08:49 +0400 @@ -16,44 +16,47 @@ liblist= @LIBRARY_SEARCH_PATH@ @INTLIBS@ -wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) +wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) -wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) +wdread_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) wxcopy_LDADD = @XLFLAGS@ @XLIBS@ wxpaste_LDADD = @XLFLAGS@ @XLIBS@ -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) +getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) getstyle_SOURCES = getstyle.c fontconv.c setstyle_LDADD = \ - $(top_builddir)/WINGs/libWUtil.a \ + $(top_builddir)/WINGs/libWUtil.la \ @XLFLAGS@ @XLIBS@ $(liblist) setstyle_SOURCES = setstyle.c fontconv.c -convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) +convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.la $(liblist) convertfonts_SOURCES = convertfonts.c fontconv.c -seticons_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist) +seticons_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist) -geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.a $(liblist) +geticonset_LDADD= $(top_builddir)/WINGs/libWUtil.la $(liblist) wmagnify_LDADD = \ - $(top_builddir)/WINGs/libWINGs.a \ + $(top_builddir)/WINGs/libWINGs.la \ + $(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/wrlib/libwraster.la \ @XFTLIBS@ @INTLIBS@ @DLLIBS@ wmsetup_LDADD = \ - $(top_builddir)/WINGs/libWINGs.a \ + $(top_builddir)/WINGs/libWINGs.la \ + $(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/wrlib/libwraster.la \ @XFTLIBS@ @INTLIBS@ @DLLIBS@ wmsetbg_LDADD = \ - $(top_builddir)/WINGs/libWINGs.a \ + $(top_builddir)/WINGs/libWINGs.la \ + $(top_builddir)/WINGs/libWUtil.la \ $(top_builddir)/wrlib/libwraster.la \ @XLIBS@ @XFTLIBS@ @INTLIBS@ @DLLIBS@ --- WindowMaker-0.91.0/wmlib/Makefile.am.vns 2003-04-18 04:53:39 +0400 +++ WindowMaker-0.91.0/wmlib/Makefile.am 2005-05-18 17:04:02 +0400 @@ -1,13 +1,14 @@ AUTOMAKE_OPTIONS = no-dependencies -lib_LIBRARIES = libWMaker.a +libWMaker_la_LDFLAGS = -version-info 1:1:0 +lib_LTLIBRARIES = libWMaker.la include_HEADERS = WMaker.h INCLUDES = $(DFLAGS) @XCFLAGS@ -libWMaker_a_SOURCES = \ +libWMaker_la_SOURCES = \ menu.c \ app.c \ event.c \ --- WindowMaker-0.91.0/test/Makefile.am.vns 1999-10-03 01:16:11 +0400 +++ WindowMaker-0.91.0/test/Makefile.am 2005-05-18 17:04:02 +0400 @@ -8,7 +8,7 @@ wtest_SOURCES = wtest.c -wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@ +wtest_LDADD = $(top_builddir)/wmlib/libWMaker.la @XLFLAGS@ @XLIBS@ INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib --- WindowMaker-0.91.0/WPrefs.app/Makefile.am.vns 2005-05-18 17:04:02 +0400 +++ WindowMaker-0.91.0/WPrefs.app/Makefile.am 2005-05-18 17:04:02 +0400 @@ -48,10 +48,11 @@ INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ -WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a +WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la WPrefs_LDADD = \ - $(top_builddir)/WINGs/libWINGs.a\ + $(top_builddir)/WINGs/libWINGs.la\ + $(top_builddir)/WINGs/libWUtil.la\ $(top_builddir)/wrlib/libwraster.la \ @XFTLIBS@ \ @INTLIBS@ --- WindowMaker-0.91.0/configure.ac.vns 2005-05-18 17:04:01 +0400 +++ WindowMaker-0.91.0/configure.ac 2005-05-18 17:04:02 +0400 @@ -969,7 +969,7 @@ WCFLAGS="$inc_search_path" WLFLAGS="$lib_search_path" -WLIBS="-lWINGs -lwraster $GFXLIBS $XFTLIBS $XLIBS -lm $NETLIBS $INTLIBS" +WLIBS="-lWINGs -lWUtil -lwraster $GFXLIBS $XFTLIBS $XLIBS -lm $NETLIBS $INTLIBS" usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" WindowMaker-0.91.0-alt-titlebar.patch: --- NEW FILE WindowMaker-0.91.0-alt-titlebar.patch --- --- WindowMaker-0.91.0/src/window.c.vns 2005-05-18 15:51:45 +0400 +++ WindowMaker-0.91.0/src/window.c 2005-05-18 15:55:55 +0400 @@ -1293,7 +1293,10 @@ wwin->frame = wFrameWindowCreate(scr, window_level, x, y, width, height, - &wPreferences.window_title_clearance, foo, + &wPreferences.window_title_clearance, + &wPreferences.window_title_min_height, + &wPreferences.window_title_max_height, + foo, scr->window_title_texture, scr->resizebar_texture, scr->window_title_color, @@ -1630,7 +1633,10 @@ wwin->frame = wFrameWindowCreate(scr, WMFloatingLevel, wwin->frame_x, wwin->frame_y, width, height, - &wPreferences.window_title_clearance, foo, + &wPreferences.window_title_clearance, + &wPreferences.window_title_min_height, + &wPreferences.window_title_max_height, + foo, scr->window_title_texture, scr->resizebar_texture, scr->window_title_color, --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 15:51:45 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 15:51:45 +0400 @@ -376,6 +376,8 @@ }; +#define NUM2STRING_(x) #x +#define NUM2STRING(x) NUM2STRING_(x) WDefaultEntry optionList[] = { /* dynamic options */ @@ -601,9 +603,21 @@ {"WindowTitleExtendSpace", DEF_WINDOW_TITLE_EXTEND_SPACE, NULL, &wPreferences.window_title_clearance, getInt, setClearance }, + {"WindowTitleMinHeight", "0", NULL, + &wPreferences.window_title_min_height, getInt, setClearance + }, + {"WindowTitleMaxHeight", NUM2STRING(INT_MAX), NULL, + &wPreferences.window_title_max_height, getInt, setClearance + }, {"MenuTitleExtendSpace", DEF_MENU_TITLE_EXTEND_SPACE, NULL, &wPreferences.menu_title_clearance, getInt, setClearance }, + {"MenuTitleMinHeight", "0", NULL, + &wPreferences.menu_title_min_height, getInt, setClearance + }, + {"MenuTitleMaxHeight", NUM2STRING(INT_MAX), NULL, + &wPreferences.menu_title_max_height, getInt, setClearance + }, {"MenuTextExtendSpace", DEF_MENU_TEXT_EXTEND_SPACE, NULL, &wPreferences.menu_text_clearance, getInt, setClearance }, --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 15:51:45 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 15:51:45 +0400 @@ -371,7 +371,11 @@ signed char title_justification; /* titlebar text alignment */ int window_title_clearance; + int window_title_min_height; + int window_title_max_height; int menu_title_clearance; + int menu_title_min_height; + int menu_title_max_height; int menu_text_clearance; char multi_byte_text; --- WindowMaker-0.91.0/src/framewin.c.vns 2005-05-18 15:51:45 +0400 +++ WindowMaker-0.91.0/src/framewin.c 2005-05-18 15:54:16 +0400 @@ -63,7 +63,8 @@ WFrameWindow* wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y, - int width, int height, int *clearance, int flags, + int width, int height, int *clearance, + int *title_min, int *title_max, int flags, WTexture **title_texture, WTexture **resize_texture, WMColor **color, WMFont **font) { @@ -80,6 +81,8 @@ fwin->resizebar_texture = resize_texture; fwin->title_color = color; fwin->title_clearance = clearance; + fwin->title_min_height = title_min; + fwin->title_max_height = title_max; fwin->font = font; #ifdef KEEP_XKB_LOCK_STATUS fwin->languagemode = XkbGroup1Index; @@ -130,7 +133,11 @@ height = fwin->core->height - fwin->top_width - fwin->bottom_width; if (flags & WFF_TITLEBAR) - theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + { + theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(theight > *fwin->title_max_height) theight = *fwin->title_max_height; + if(theight < *fwin->title_min_height) theight = *fwin->title_min_height; + } else theight = 0; @@ -490,6 +497,8 @@ int theight; theight = WMFontHeight(*fwin->font) + (*fwin->title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(theight > *fwin->title_max_height) theight = *fwin->title_max_height; + if(theight < *fwin->title_min_height) theight = *fwin->title_min_height; x = 0; w = fwin->core->width + 1; @@ -1097,8 +1106,11 @@ break; } + y = *fwin->title_clearance + TITLEBAR_EXTEND_SPACE; h = WMFontHeight(*fwin->font); + if(y*2 + h > *fwin->title_max_height) y = (*fwin->title_max_height - h)/2; + if(y*2 + h < *fwin->title_min_height) y = (*fwin->title_min_height - h)/2; /* We use a w+2 buffer to have an extra pixel on the left and * another one on the right. This is because for some odd reason, --- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 15:51:45 +0400 +++ WindowMaker-0.91.0/src/menu.c 2005-05-18 15:51:45 +0400 @@ -180,7 +180,10 @@ menu->flags.titled = 1; } menu->frame = - wFrameWindowCreate(screen, tmp, 8, 2, 1, 1, &wPreferences.menu_title_clearance, flags, + wFrameWindowCreate(screen, tmp, 8, 2, 1, 1, &wPreferences.menu_title_clearance, + &wPreferences.menu_title_min_height, + &wPreferences.menu_title_max_height, + flags, screen->menu_title_texture, NULL, screen->menu_title_color, &screen->menu_title_font); --- WindowMaker-0.91.0/src/framewin.h.vns 2004-10-15 01:24:06 +0400 +++ WindowMaker-0.91.0/src/framewin.h 2005-05-18 15:56:27 +0400 @@ -59,6 +59,8 @@ short top_width; int *title_clearance; + int *title_min_height; + int *title_max_height; short bottom_width; short resizebar_corner_width; @@ -149,7 +151,8 @@ WFrameWindow* wFrameWindowCreate(WScreen *scr, int wlevel, int x, int y, - int width, int height, int *clearance, int flags, + int width, int height, int *clearance, + int *title_min, int *title_max, int flags, union WTexture **title_texture, union WTexture **resize_texture, WMColor **color, WMFont **font); --- WindowMaker-0.91.0/src/moveres.c.vns 2004-10-24 23:36:09 +0400 +++ WindowMaker-0.91.0/src/moveres.c 2005-05-18 15:51:45 +0400 @@ -497,6 +497,8 @@ if (HAS_TITLEBAR(wwin) && !wwin->flags.shaded) { h = WMFontHeight(wwin->screen_ptr->title_font) + (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(h > wPreferences.window_title_max_height) h = wPreferences.window_title_max_height; + if(h < wPreferences.window_title_min_height) h = wPreferences.window_title_min_height; } if (HAS_RESIZEBAR(wwin) && !wwin->flags.shaded) { /* Can't use wwin-frame->bottom_width because, in some cases --- WindowMaker-0.91.0/src/placement.c.vns 2004-10-23 03:58:59 +0400 +++ WindowMaker-0.91.0/src/placement.c 2005-05-18 15:57:35 +0400 @@ -594,6 +594,9 @@ { WScreen *scr = wwin->screen_ptr; int h = WMFontHeight(scr->title_font) + (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE) * 2; + if(h > wPreferences.window_title_max_height) h = wPreferences.window_title_max_height; + if(h < wPreferences.window_title_min_height) h = wPreferences.window_title_min_height; + WArea usableArea = wGetUsableAreaForHead(scr, wGetHeadForPointerLocation(scr), NULL, True); WindowMaker-0.91.0-alt-vlaad-newbuttons.patch: --- NEW FILE WindowMaker-0.91.0-alt-vlaad-newbuttons.patch --- --- WindowMaker-0.91.0/src/screen.c.vns 2004-10-25 02:23:48 +0400 +++ WindowMaker-0.91.0/src/screen.c 2005-05-18 15:08:52 +0400 @@ -162,41 +162,73 @@ WPixmap *pix; /* create predefined pixmaps */ - pix = wPixmapCreateFromXPMData(scr, PRED_CLOSE_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_CLOSE_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_CLOSE_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_CLOSE] = pix; - pix = wPixmapCreateFromXPMData(scr, PRED_BROKEN_CLOSE_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_BROKEN_CLOSE_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_BROKEN_CLOSE_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_BROKENCLOSE] = pix; - pix = wPixmapCreateFromXPMData(scr, PRED_ICONIFY_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_ICONIFY_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_ICONIFY_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_ICONIFY] = pix; #ifdef XKB_BUTTON_HINT - pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP1_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP1_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP1_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_XKBGROUP1] = pix; - pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP2_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP2_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP2_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_XKBGROUP2] = pix; - pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP3_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP3_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP3_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_XKBGROUP3] = pix; - pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP4_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_XKBGROUP4_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_XKBGROUP4_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_XKBGROUP4] = pix; #endif - pix = wPixmapCreateFromXPMData(scr, PRED_KILL_XPM); + if (wPreferences.new_style == TS_NEXT) { + pix = wPixmapCreateFromXPMData(scr, NEXT_KILL_XPM); + } else { + pix = wPixmapCreateFromXPMData(scr, PRED_KILL_XPM); + } if (pix) pix->shared = 1; scr->b_pixmaps[WBUT_KILL] = pix; --- WindowMaker-0.91.0/src/texture.c.vns 2004-10-12 21:47:39 +0400 +++ WindowMaker-0.91.0/src/texture.c 2005-05-18 15:05:55 +0400 @@ -707,20 +707,32 @@ segs[1].y1 = 1; segs[1].x2 = width - 2; segs[1].y2 = height - 2; - XDrawSegments(dpy, d, dim, segs, 2); + if (wPreferences.new_style == TS_NEXT) { + XDrawSegments(dpy, d, dark, segs, 2); + } else { + XDrawSegments(dpy, d, dim, segs, 2); + } segs[0].x1 = 0; segs[0].x2 = width - 1; segs[0].y2 = segs[0].y1 = height - 1; segs[1].x1 = segs[1].x2 = width - 1; segs[1].y1 = 0; segs[1].y2 = height - 1; - XDrawSegments(dpy, d, dark, segs, 2); + if (wPreferences.new_style == TS_NEXT) { + XDrawSegments(dpy, d, light, segs, 2); + } else { + XDrawSegments(dpy, d, dark, segs, 2); + } segs[0].x1 = segs[0].y1 = segs[0].y2 = 0; segs[0].x2 = width - 2; segs[1].x1 = segs[1].y1 = 0; segs[1].x2 = 0; segs[1].y2 = height - 2; - XDrawSegments(dpy, d, light, segs, 2); + if (wPreferences.new_style == TS_NEXT) { + XDrawSegments(dpy, d, dark, segs, 2); + } else { + XDrawSegments(dpy, d, light, segs, 2); + } if (relief==WREL_ICON) { segs[0].x1 = segs[0].y1 = segs[0].y2 = 1; segs[0].x2 = width - 2; --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 14:57:22 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 14:57:22 +0400 @@ -221,6 +221,11 @@ {NULL, 0, 0} }; +static WOptionEnumeration seTitlebarModes[] = { + {"new", TS_NEW, 0}, {"old", TS_OLD, 0}, + {"next", TS_NEXT, 0}, {NULL, 0, 0} +}; + static WOptionEnumeration seColormapModes[] = { {"Manual", WCM_CLICK, 0}, {"ClickToFocus", WCM_CLICK, 1}, {"Auto", WCM_POINTER, 0}, {"FocusFollowMouse", WCM_POINTER, 1}, @@ -356,8 +361,8 @@ {"FocusMode", "manual", seFocusModes, &wPreferences.focus_mode, getEnum, NULL }, /* have a problem when switching from manual to sloppy without restart */ - {"NewStyle", "NO", NULL, - &wPreferences.new_style, getBool, NULL + {"NewStyle", "new", seTitlebarModes, + &wPreferences.new_style, getEnum, NULL }, {"DisableDock", "NO", (void*) WM_DOCK, NULL, getBool, setIfDockPresent --- WindowMaker-0.91.0/src/extend_pixmaps.h.vns 2004-10-12 21:55:09 +0400 +++ WindowMaker-0.91.0/src/extend_pixmaps.h 2005-05-18 14:57:22 +0400 @@ -113,5 +113,79 @@ }; +static char *NEXT_XKBGROUP1_XPM[] = { +"10 10 6 1", +" c None", +". c #E0E0E0", +"+ c #7D7D7D", +"@ c #363636", +"# c #080808", +"$ c #BDBDBD", +".........+", +"..@@@@@@++", +"..@####+++", +"..#+$$$$++", +"..###+.$++", +"..#++..$++", +"..#$.$$$++", +"..#@@@@+++", +".$+#####@@", +"+++++++@@@"}; +static char *NEXT_XKBGROUP2_XPM[] = { +"10 10 6 1", +" c None", +". c #E0E0E0", +"+ c #7D7D7D", +"@ c #BDBDBD", +"# c #080808", +"$ c #363636", +".........+", +".@##@@$#++", +".#.+#+###+", +".#+######+", +".########+", +"..######++", +"..@####+++", +".@@@#$++++", +". at ++#$++$$", +"+++++++$$$"}; + +static char *NEXT_XKBGROUP3_XPM[] = { +"10 10 6 1", +" c None", +". c #E0E0E0", +"+ c #7D7D7D", +"@ c #BDBDBD", +"# c #080808", +"$ c #363636", +".........+", +"..@####.++", +".@######.+", +".#.+##.+#+", +".#++##++#+", +".########+", +".##@##@##+", +".+##@@##$+", +". at +####$$$", +"+++++++$$$"}; + +static char *NEXT_XKBGROUP4_XPM[] = { +"10 10 6 1", +" c None", +". c #E0E0E0", +"+ c #7D7D7D", +"@ c #BDBDBD", +"# c #080808", +"$ c #363636", +".........+", +"..@####.++", +".@#@@@@#.+", +".##$@@#$#+", +".#$$@@$$#+", +".#@@@@++#+", +".#+#++#.#+", +".+#+##$#$+", +". at +####$$$", +"+++++++$$$"}; --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 14:57:22 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 14:57:22 +0400 @@ -239,6 +239,10 @@ #define WD_BOTTOMLEFT 6 #define WD_BOTTOMRIGHT 7 +/* titlebar style */ +#define TS_NEW 0 +#define TS_OLD 1 +#define TS_NEXT 2 /* workspace border position */ #define WB_NONE 0 --- WindowMaker-0.91.0/src/framewin.c.vns 2004-10-15 02:55:15 +0400 +++ WindowMaker-0.91.0/src/framewin.c 2005-05-18 15:23:34 +0400 @@ -134,10 +134,12 @@ else theight = 0; - if (wPreferences.new_style) { - bsize = theight; + if (wPreferences.new_style == TS_NEW) { + bsize = theight; + } else if (wPreferences.new_style == TS_OLD) { + bsize = theight - 7; } else { - bsize = theight - 7; + bsize = theight - 8; } if (fwin->titlebar) { @@ -148,7 +150,7 @@ fwin->flags.need_texture_remake = 1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (fwin->left_button) { wCoreConfigure(fwin->left_button, 0, 0, bsize, bsize); } @@ -190,7 +192,7 @@ /* we had a titlebar, but now we don't need it anymore */ for (i=0; i < (fwin->flags.single_texture ? 1 : 3); i++) { FREE_PIXMAP(fwin->title_back[i]); - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { FREE_PIXMAP(fwin->lbutton_back[i]); FREE_PIXMAP(fwin->rbutton_back[i]); #ifdef XKB_BUTTON_HINT @@ -228,7 +230,7 @@ if (flags & WFF_LEFT_BUTTON) { fwin->flags.left_button = 1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { fwin->left_button = wCoreCreate(fwin->core, 0, 0, bsize, bsize); if (width < theight*4) { @@ -236,7 +238,7 @@ } else { XMapRaised(dpy, fwin->left_button->window); } - } else { + } else if (wPreferences.new_style == TS_OLD) { fwin->left_button = wCoreCreate(fwin->titlebar, 3, (theight-bsize)/2, bsize, bsize); @@ -249,13 +251,26 @@ } else { XMapRaised(dpy, fwin->left_button->window); } + } else { + fwin->left_button = + wCoreCreate(fwin->titlebar, 3, (theight-bsize)/2, + bsize, bsize); + + XSetWindowBackground(dpy, fwin->left_button->window, + scr->widget_texture->dark.pixel); + + if (width < theight*3) { + fwin->flags.lbutton_dont_fit = 1; + } else { + XMapRaised(dpy, fwin->left_button->window); + } } } #ifdef XKB_BUTTON_HINT if (flags & WFF_LANGUAGE_BUTTON) { fwin->flags.language_button = 1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { fwin->language_button = wCoreCreate(fwin->core, bsize, 0, bsize, bsize); @@ -283,17 +298,23 @@ if (flags & WFF_RIGHT_BUTTON) { fwin->flags.right_button = 1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { fwin->right_button = wCoreCreate(fwin->core, width-bsize+1, 0, bsize, bsize); - } else { + } else if (wPreferences.new_style == TS_OLD) { fwin->right_button = wCoreCreate(fwin->titlebar, width-bsize-3, (theight-bsize)/2, bsize, bsize); XSetWindowBackground(dpy, fwin->right_button->window, scr->widget_texture->normal.pixel); - } + } else { + fwin->right_button = + wCoreCreate(fwin->titlebar, width-bsize-3, + (theight-bsize)/2, bsize, bsize); + XSetWindowBackground(dpy, fwin->right_button->window, + scr->widget_texture->dark.pixel); + } if (width < theight*2) { fwin->flags.rbutton_dont_fit = 1; @@ -302,7 +323,7 @@ } } - if (wPreferences.new_style) + if (wPreferences.new_style == TS_NEW) updateTitlebar(fwin); XMapRaised(dpy, fwin->titlebar->window); @@ -436,7 +457,7 @@ for (i=0; i < (fwin->flags.single_texture ? 1 : 3); i++) { FREE_PIXMAP(fwin->title_back[i]); - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { FREE_PIXMAP(fwin->lbutton_back[i]); #ifdef XKB_BUTTON_HINT FREE_PIXMAP(fwin->languagebutton_back[i]); @@ -473,7 +494,7 @@ x = 0; w = fwin->core->width + 1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (fwin->flags.hide_left_button || !fwin->left_button || fwin->flags.lbutton_dont_fit) { x = 0; @@ -522,14 +543,14 @@ } #endif - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (!fwin->flags.hide_right_button && fwin->right_button && !fwin->flags.rbutton_dont_fit) { w -= fwin->right_button->width; } } - if (wPreferences.new_style || fwin->titlebar->width!=w) + if (wPreferences.new_style == TS_NEW || fwin->titlebar->width!=w) fwin->flags.need_texture_remake = 1; wCoreConfigure(fwin->titlebar, x, 0, w, theight); @@ -557,7 +578,7 @@ #endif if (fwin->titlebar) { - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { updateTitlebar(fwin); } else { #ifdef XKB_BUTTON_HINT @@ -606,7 +627,7 @@ if (fwin->titlebar) { - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { updateTitlebar(fwin); } else { XClearWindow(dpy, fwin->titlebar->window); @@ -648,7 +669,7 @@ return; } - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (left) { limg = RGetSubImage(img, 0, 0, bwidth, bheight); } else @@ -791,7 +812,7 @@ if (fwin->title_texture[i]->any.type!=WTEX_SOLID) { XSetWindowBackgroundPixmap(dpy, fwin->titlebar->window, fwin->title_back[i]); - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (fwin->left_button && fwin->lbutton_back[i]) XSetWindowBackgroundPixmap(dpy, fwin->left_button->window, fwin->lbutton_back[i]); @@ -810,7 +831,7 @@ } else { pixel = fwin->title_texture[i]->solid.normal.pixel; XSetWindowBackground(dpy, fwin->titlebar->window, pixel); - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (fwin->left_button) XSetWindowBackground(dpy, fwin->left_button->window, pixel); @@ -855,7 +876,7 @@ if (fwin->title_texture[state] && fwin->titlebar) { FREE_PIXMAP(fwin->title_back[state]); - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { FREE_PIXMAP(fwin->lbutton_back[state]); FREE_PIXMAP(fwin->rbutton_back[state]); #ifdef XKB_BUTTON_HINT @@ -895,7 +916,7 @@ #endif fwin->title_back[state] = pmap; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { fwin->lbutton_back[state] = lpmap; fwin->rbutton_back[state] = rpmap; #ifdef XKB_BUTTON_HINT @@ -1023,7 +1044,7 @@ int allButtons = 1; - if (!wPreferences.new_style) { + if (!wPreferences.new_style == TS_NEW) { if (fwin->left_button && !fwin->flags.hide_left_button && !fwin->flags.lbutton_dont_fit) lofs += fwin->left_button->width + 3; @@ -1128,7 +1149,7 @@ reconfigure(WFrameWindow *fwin, int x, int y, int width, int height, Bool dontMove) { - int k = (wPreferences.new_style ? 4 : 3); + int k = (wPreferences.new_style == TS_NEW ? 4 : 3); int resizedHorizontally = 0; if (dontMove) @@ -1203,7 +1224,7 @@ } } - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (fwin->right_button) XMoveWindow(dpy, fwin->right_button->window, width - fwin->right_button->width + 1, 0); @@ -1318,7 +1339,7 @@ width = fwin->titlebar->width - 6 - 6; } - if (!wPreferences.new_style) { + if (!wPreferences.new_style == TS_NEW) { if (fwin->left_button && !fwin->flags.hide_left_button && !fwin->flags.lbutton_dont_fit) width -= fwin->left_button->width + 3; @@ -1363,20 +1384,30 @@ } } XSetClipMask(dpy, copy_gc, None); - XSetForeground(dpy, copy_gc, scr->white_pixel); + if (wPreferences.new_style == TS_NEXT) { + XSetForeground(dpy, copy_gc, scr->black_pixel); + } else { + XSetForeground(dpy, copy_gc, scr->white_pixel); + } d=1; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { XFillRectangle(dpy, button->window, copy_gc, 0, 0, button->width-1, button->height-1); XSetForeground(dpy, copy_gc, scr->black_pixel); XDrawRectangle(dpy, button->window, copy_gc, 0, 0, button->width-1, button->height-1); - } else { + } else if (wPreferences.new_style == TS_OLD) { XFillRectangle(dpy, button->window, copy_gc, 0, 0, button->width, button->height); XSetForeground(dpy, copy_gc, scr->black_pixel); XDrawRectangle(dpy, button->window, copy_gc, 0, 0, button->width, button->height); + } else { + XFillRectangle(dpy, button->window, copy_gc, 0, 0, + button->width-3, button->height-3); + XSetForeground(dpy, copy_gc, scr->black_pixel); + XDrawRectangle(dpy, button->window, copy_gc, 0, 0, + button->width-3, button->height-3); } } else { XClearWindow(dpy, button->window); @@ -1389,7 +1420,7 @@ } d=0; - if (wPreferences.new_style) { + if (wPreferences.new_style == TS_NEW) { if (texture->any.type==WTEX_SOLID || pushed) { wDrawBevel(button->window, button->width, button->height, (WTexSolid*)texture, WREL_RAISED); @@ -1406,7 +1437,7 @@ x = (button->width - width)/2 + d; y = (button->height - image->height)/2 + d; XSetClipOrigin(dpy, copy_gc, x-left, y); - if (!wPreferences.new_style) { + if (!(wPreferences.new_style == TS_NEW)) { XSetForeground(dpy, copy_gc, scr->black_pixel); if (!pushed) { if (image->depth==1) @@ -1416,9 +1447,15 @@ XCopyArea(dpy, image->image, button->window, copy_gc, left, 0, width, image->height, x, y); } else { - XSetForeground(dpy, copy_gc, scr->dark_pixel); - XFillRectangle(dpy, button->window, copy_gc, 0, 0, - button->width, button->height); + if (wPreferences.new_style == TS_OLD) { + XSetForeground(dpy, copy_gc, scr->dark_pixel); + XFillRectangle(dpy, button->window, copy_gc, 0, 0, + button->width, button->height); + } else { + XSetForeground(dpy, copy_gc, scr->black_pixel); + XCopyArea(dpy, image->image, button->window, copy_gc, + left, 0, width, image->height, x, y); + } } } else { if (pushed) { --- WindowMaker-0.91.0/src/def_pixmaps.h.vns 2004-10-12 21:54:26 +0400 +++ WindowMaker-0.91.0/src/def_pixmaps.h 2005-05-18 14:57:22 +0400 @@ -97,6 +97,272 @@ ".........." }; +static char *NEXT_CLOSE_XPM[] = { +"10 10 69 1", +" c None", +". c #FBFBFB", +"+ c #F9F9F9", +"@ c #F7F7F7", +"# c #F4F4F4", +"$ c #F0F0F0", +"% c #EDEDED", +"& c #E8E8E8", +"* c #AFAFAF", +"= c #FCFCFC", +"- c #8B8B8B", +"; c #DEDEDE", +"> c #E0E0E0", +", c #C7C7C7", +"' c #999999", +") c #2B2B2B", +"! c #878787", +"~ c #F1F1F1", +"{ c #222222", +"] c #C2C2C2", +"^ c #EBEBEB", +"/ c #DCDCDC", +"( c #9F9F9F", +"_ c #363636", +": c #FEFEFE", +"< c #C1C1C1", +"[ c #232323", +"} c #CFCFCF", +"| c #282828", +"1 c #D5D5D5", +"2 c #FAFAFA", +"3 c #F6F6F6", +"4 c #D3D3D3", +"5 c #121212", +"6 c #BEBEBE", +"7 c #898989", +"8 c #838383", +"9 c #EEEEEE", +"0 c #E9E9E9", +"a c #CDCDCD", +"b c #080808", +"c c #131313", +"d c #A1A1A1", +"e c #7F7F7F", +"f c #808080", +"g c #D9D9D9", +"h c #8D8D8D", +"i c #1D1D1D", +"j c #C9C9C9", +"k c #B4B4B4", +"l c #191919", +"m c #6A6A6A", +"n c #6C6C6C", +"o c #7A7A7A", +"p c #B1B1B1", +"q c #202020", +"r c #BBBBBB", +"s c #D4D4D4", +"t c #151515", +"u c #515151", +"v c #747474", +"w c #3A3A3A", +"x c #CCCCCC", +"y c #B3B3B3", +"z c #939393", +"A c #A3A3A3", +"B c #919191", +"C c #858585", +"D c #7C7C7C", +"...+@#$%&*", +"=-;#%>,')!", +"=~{]^/(_!!", +"=:<[}*|1(!", +"2 at 345[>678", +"@90abc6def", +"#ghijklmno", +"~pqrgs(tuv", +"%wxx'-p8tn", +"yzAB7C8enD"}; + + +static char * NEXT_BROKEN_CLOSE_XPM[] = { +"10 10 8 1", +" c None", +". c #E0E0E0", +"+ c #7D7D7D", +"@ c #DBDBDB", +"# c #BDBDBD", +"$ c #080808", +"% c #363636", +"& c #D4D4D4", +".........+", +".+ at ...#+$+", +"..$#. at +%++", +"..###++&++", +"...&...#++", +"...&..#+++", +". at +##+%%%+", +".+$#@&+$%%", +".%##++++$%", +"++++++++%+"}; + +static char *NEXT_KILL_XPM[] = { +"10 10 64 1", +" c None", +". c #FBFBFB", +"+ c #FAFAFA", +"@ c #F7F7F7", +"# c #F5F5F5", +"$ c #F6F6F6", +"% c #EEEEEE", +"& c #B3B3B3", +"* c #FCFCFC", +"= c #8B8B8B", +"- c #E3E3E3", +"; c #F4F4F4", +"> c #ECECEC", +", c #EAEAEA", +"' c #BFBFBF", +") c #474747", +"! c #A5A5A5", +"~ c #EFEFEF", +"{ c #262626", +"] c #B6B6B6", +"^ c #B4B4B4", +"/ c #282828", +"( c #A3A3A3", +"_ c #FEFEFE", +": c #E0E0E0", +"< c #B8B8B8", +"[ c #C5C5C5", +"} c #DCDCDC", +"| c #D3D3D3", +"1 c #E4E4E4", +"2 c #B1B1B1", +"3 c #878787", +"4 c #D5D5D5", +"5 c #202020", +"6 c #222222", +"7 c #F1F1F1", +"8 c #959595", +"9 c #838383", +"0 c #DBDBDB", +"a c #252525", +"b c #E9E9E9", +"c c #F0F0F0", +"d c #999999", +"e c #808080", +"f c #9B9B9B", +"g c #C2C2C2", +"h c #7C7C7C", +"i c #7A7A7A", +"j c #232323", +"k c #CCCCCC", +"l c #C1C1C1", +"m c #181818", +"n c #404040", +"o c #747474", +"p c #E7E7E7", +"q c #303030", +"r c #C9C9C9", +"s c #ACACAC", +"t c #787878", +"u c #141414", +"v c #6C6C6C", +"w c #8F8F8F", +"x c #858585", +"y c #7F7F7F", +"...+@#$$%&", +"*=-+;>,')!", +"*~{];#^/((", +"*_:<[}|123", +"+ at +456;789", +"@~706abcde", +"#0fg#$3ehi", +"c=jk>%lmno", +"pqr}s(^tuv", +"2w!d=x9yvh"}; + +static char *NEXT_ICONIFY_XPM[] = { +"10 10 72 1", +" c None", +". c #FCFCFC", +"+ c #FAFAFA", +"@ c #F8F8F8", +"# c #F6F6F6", +"$ c #F2F2F2", +"% c #EFEFEF", +"& c #EAEAEA", +"* c #A6A6A6", +"= c #FEFEFE", +"- c #FDFDFD", +"; c #F9F9F9", +"> c #E2E2E2", +", c #CBCBCB", +"' c #AFAFAF", +") c #808080", +"! c #717171", +"~ c #FFFFFF", +"{ c #FBFBFB", +"] c #F1F1F1", +"^ c #E5E5E5", +"/ c #CCCCCC", +"( c #838383", +"_ c #A0A0A0", +": c #989898", +"< c #8B8B8B", +"[ c #7F7F7F", +"} c #E8E8E8", +"| c #ADADAD", +"1 c #181818", +"2 c #171717", +"3 c #161616", +"4 c #141414", +"5 c #0A0A0A", +"6 c #000000", +"7 c #A2A2A2", +"8 c #747474", +"9 c #6C6C6C", +"0 c #F0F0F0", +"a c #B9B9B9", +"b c #B7B7B7", +"c c #B1B1B1", +"d c #868686", +"e c #020202", +"f c #EDEDED", +"g c #939393", +"h c #676767", +"i c #696969", +"j c #8E8E8E", +"k c #787878", +"l c #757575", +"m c #777777", +"n c #767676", +"o c #EBEBEB", +"p c #525252", +"q c #626262", +"r c #F3F3F3", +"s c #E1E1E1", +"t c #B5B5B5", +"u c #5F5F5F", +"v c #424242", +"w c #5B5B5B", +"x c #9D9D9D", +"y c #969696", +"z c #E4E4E4", +"A c #444444", +"B c #2E2E2E", +"C c #A9A9A9", +"D c #7C7C7C", +"E c #797979", +"F c #5D5D5D", +"G c #646464", +"...+@#$%&*", +".=-;%>,')!", +"-~={]^/'(!", +"_'*:<[}|)!", +"123456%789", +"0abcdefghi", +"jklmneonpq", +"rs^>te}uvw", +"f_xy9ezABp", +"CDDEue7FpG"}; + #ifdef XKB_BUTTON_HINT #include "extend_pixmaps.h" #endif /* XKB_BUTTON_HINT */ --- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 14:57:22 +0400 +++ WindowMaker-0.91.0/src/menu.c 2005-05-18 14:57:22 +0400 @@ -672,7 +672,7 @@ twidth = WMWidthOfString(scr->menu_title_font, menu->frame->title, strlen(menu->frame->title)); theight = menu->frame->top_width; - twidth += theight + (wPreferences.new_style ? 16 : 8); + twidth += theight + (wPreferences.new_style == TS_NEW ? 16 : 8); } else { twidth = 0; theight = 0; --- WindowMaker-0.91.0/WPrefs.app/xpm/Makefile.am.vns 2005-05-18 14:57:22 +0400 +++ WindowMaker-0.91.0/WPrefs.app/xpm/Makefile.am 2005-05-18 14:57:22 +0400 @@ -28,6 +28,7 @@ msty2.xpm \ msty3.xpm \ newstyle.xpm \ + nextstyle.xpm \ nonopaque.xpm \ oldstyle.xpm \ opaque.xpm \ --- WindowMaker-0.91.0/WPrefs.app/xpm/oldstyle.xpm.vns 1999-05-01 21:44:44 +0400 +++ WindowMaker-0.91.0/WPrefs.app/xpm/oldstyle.xpm 2005-05-18 14:57:22 +0400 @@ -1,45 +1,51 @@ /* XPM */ -static char * image_name[] = { -"38 33 9 1", -" c #739C739C739C", -". c #000000000000", -"X c #210821082108", -"o c #294A294A294A", -"O c #FFFFFFFFFFFF", -"+ c #084208420842", -"@ c #A528A528A528", -"# c #529452945294", -"$ c #AD6AAD6AAD6A", -" .", -"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.", -"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.", -"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo.", -"XXXXXXXXXXXXXXXXXXXoOOOOOOOOOOOOOOooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO at .#@@@@@@#.@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@@#..#@@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@#.##.#@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@#.#@@#.#@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@#.#@@@@#.#@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO at .#@@@@@@#.@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO@@@@@@@@@@@@#ooo+", -"XXXXXXXXXXXXXXXXXXXoO#############ooo+", -"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+", -"XXXXXXXXXXXXXXXXXXXoooooooooooooooooo+", -"+++++++++++++++++++++++++++++++++++++.", -"......................................", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", -"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$.", -"##################################O$$.", -".................................$O$$.", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$.", -"OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO$O$$."}; +static char * oldstyle_xpm[] = { +"37 33 15 1", +" c None", +". c #747474", +"+ c #757575", +"@ c #000000", +"# c #222222", +"$ c #262626", +"% c #282828", +"& c #FFFFFF", +"* c #080808", +"= c #A5A5A5", +"- c #535353", +"; c #060606", +"> c #070707", +", c #030303", +"' c #ABABAB", +"..................+++++++...........@", +"##################$$$$$$$%$%$$$$$$$$@", +"##################$$$$$$$$%%%%%%%%%%@", +"##################$$$$$$$%$%%%%%%%%%@", +"##################$&&&&&&&&&&&&&&%%%*", +"##################$&============-%%%*", +"##################$&=@-======-@=-%%%*", +"##################$&=- at -====- at -=-%%%*", +"##################$&==- at -==- at -==-%%%*", +"##################$&===- at --@-===-%%%*", +"##################$&====-@@-====-%%%*", +"##################$&====-@@-====-%%%*", +"##################$&===- at --@-===-%%%*", +"##################$&==- at -==- at -==-%%%*", +"##################$&=- at -====- at -=-%%%*", +"##################$&=@-======-@=-%%%*", +"##################$&============-%%%*", +"##################$&-------------%%%*", +"##################$$$$$$$$$%%%%%%%%%*", +"##################$$$$$$$%$%%%%%%%%%*", +";;;;;;;;;;;;;;;;;;>>>>>>>>>>>>>*****,", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", +"''''''''''''''''''''''''''''''''''''@", +"''''''''''''''''''''''''''''''''''''@", +"''''''''''''''''''''''''''''''''''''@", +"''''''''''''''''''''''''''''''''''''@", +"---------------------------------&''@", +"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@'&''@", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@", +"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&'&''@"}; --- WindowMaker-0.91.0/WPrefs.app/tiff/Makefile.am.vns 2005-05-18 14:57:22 +0400 +++ WindowMaker-0.91.0/WPrefs.app/tiff/Makefile.am 2005-05-18 14:57:22 +0400 @@ -27,6 +27,7 @@ msty2.tiff \ msty3.tiff \ newstyle.tiff \ + nextstyle.tiff \ nonopaque.tiff \ oldstyle.tiff \ opaque.tiff \ --- WindowMaker-0.91.0/WPrefs.app/Configurations.c.vns 2004-10-23 07:03:35 +0400 +++ WindowMaker-0.91.0/WPrefs.app/Configurations.c 2005-05-18 15:26:38 +0400 @@ -42,6 +42,7 @@ WMFrame *titlF; WMButton *oldsB; WMButton *newsB; + WMButton *nextB; WMFrame *animF; WMButton *animB; @@ -68,6 +69,7 @@ #define OLDS_IMAGE "oldstyle" #define NEWS_IMAGE "newstyle" +#define NEXT_IMAGE "nextstyle" #define ANIM_IMAGE "animations" #define SUPERF_IMAGE "moreanim" @@ -86,16 +88,21 @@ static void showData(_Panel *panel) { + char *str; + WMPerformButtonClick(panel->icoB[GetSpeedForKey("IconSlideSpeed")]); WMPerformButtonClick(panel->shaB[GetSpeedForKey("ShadeSpeed")]); - if (GetBoolForKey("NewStyle")) { - WMPerformButtonClick(panel->newsB); + str = GetStringForKey("Newstyle"); + if (str && strcasecmp(str, "next") == 0) { + WMPerformButtonClick(panel->nextB); + } else if(str && strcasecmp(str, "old") == 0) { + WMPerformButtonClick(panel->oldsB); } else { - WMPerformButtonClick(panel->oldsB); + WMPerformButtonClick(panel->newsB); } - + WMSetButtonSelected(panel->animB, !GetBoolForKey("DisableAnimations")); WMSetButtonSelected(panel->supB, GetBoolForKey("Superfluous")); @@ -325,20 +332,34 @@ } panel->oldsB = WMCreateButton(panel->titlF, WBTOnOff); - WMResizeWidget(panel->oldsB, 74, 40); + WMResizeWidget(panel->oldsB, 37, 40); WMMoveWidget(panel->oldsB, 15, 60); WMSetButtonImagePosition(panel->oldsB, WIPImageOnly); path = LocateImage(OLDS_IMAGE); if (path) { - icon = WMCreatePixmapFromFile(scr, path); - if (icon) { - WMSetButtonImage(panel->oldsB, icon); - WMReleasePixmap(icon); - } - wfree(path); + icon = WMCreatePixmapFromFile(scr, path); + if (icon) { + WMSetButtonImage(panel->oldsB, icon); + WMReleasePixmap(icon); + } + } + + panel->nextB = WMCreateButton(panel->titlF, WBTOnOff); + WMResizeWidget(panel->nextB, 37, 40); + WMMoveWidget(panel->nextB, 52, 60); + WMSetButtonImagePosition(panel->nextB, WIPImageOnly); + path = LocateImage(NEXT_IMAGE); + if (path) { + icon = WMCreatePixmapFromFile(scr, path); + if (icon) { + WMSetButtonImage(panel->nextB, icon); + WMReleasePixmap(icon); + } + wfree(path); } WMGroupButtons(panel->newsB, panel->oldsB); + WMGroupButtons(panel->newsB, panel->nextB); WMMapSubwidgets(panel->titlF); @@ -495,7 +516,13 @@ } SetSpeedForKey(i, "ShadeSpeed"); - SetBoolForKey(WMGetButtonSelected(panel->newsB), "NewStyle"); + if (WMGetButtonSelected(panel->newsB)) { + SetStringForKey("new", "NewStyle"); + } else if (WMGetButtonSelected(panel->oldsB)) { + SetStringForKey("old", "NewStyle"); + } else { + SetStringForKey("next", "NewStyle"); + } SetBoolForKey(!WMGetButtonSelected(panel->animB), "DisableAnimations"); SetBoolForKey(WMGetButtonSelected(panel->supB), "Superfluous"); WindowMaker-0.91.0-alt-vlaad-trance.patch: --- NEW FILE WindowMaker-0.91.0-alt-vlaad-trance.patch --- --- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 14:44:22 +0400 +++ WindowMaker-0.91.0/src/menu.c 2005-05-18 14:44:23 +0400 @@ -93,6 +93,7 @@ static void menuCloseClick(WCoreWindow *sender, void *data, XEvent *event); static void updateTexture(WMenu *menu); +static void clipDimensionsToScreen(WMenu *menu, int *x, int *y, int *width, int *height); #ifndef LITE static int saveMenuRecurs(WMPropList *menus, WScreen *scr, WMenu *menu); @@ -498,6 +499,119 @@ static void +clipDimensionsToScreen(WMenu *menu, int *x, int *y, int *width, int *height) +{ + int sw, sh; + int fx, fy; + + sw = menu->menu->screen_ptr->scr_width; + sh = menu->menu->screen_ptr->scr_height; + + fx = *x + *width; + fy = *y + *height; + + /* CLAMP everything */ + if (*x > sw) { *x = sw; } else if (*x < 0) { *x = 0; } + if (*y > sh) { *y = sh; } else if (*y < 0) { *y = 0; } + if (fx > sw) { fx = sw; } else if (fx < 0) { fx = 0; } + if (fy > sh) { fy = sh; } else if (fy < 0) { fy = 0; } + + /* Make sure that height and width are positive */ + if (fx < *x) { *width = 0; } else { *width = fx - *x; } + if (fy < *y) { *height = 0; } else { *height = fy - *y; } +} + +static Pixmap +tranceMenu(WMenu *menu) +{ + WScreen *scr = menu->menu->screen_ptr; + + XImage *back, *front; + RImage *trance, *menu_image, *msnormal; + Pixmap original, result; + + int mw, mh, dx, dy; /* these correspond to the menu proper */ + int gx, gy, gw, gh; /* these correspond to what we grab from the root window */ + int tamount; + unsigned long red_mask, green_mask, blue_mask; + + unsigned int w, h, bar; + int foo; + Window baz; + + mw = gw = menu->menu->width; + mh = gh = menu->menu->height; + dx = gx = menu->frame_x + 1; + dy = gy = menu->frame_y + menu->frame->top_width + 1; + + tamount = wPreferences.trance_amount; + clipDimensionsToScreen(menu, &gx, &gy, &gw, &gh); + back = XGetImage(dpy, scr->root_win, gx, gy, gw, gh, + AllPlanes, ZPixmap); + if (!back) { + wwarning(_("error capturing \"back\" image"),RMessageForError(RErrorCode)); + return None; + } else { + red_mask = back->red_mask; + green_mask = back->green_mask; + blue_mask = back->blue_mask; + + trance = RCreateImageFromXImage(scr->rcontext, back, NULL); + XDestroyImage(back); + if (!trance) { + wwarning(_("error rendering \"trance\" image"), + RMessageForError(RErrorCode)); + return None; + } else { + /************************************************************/ + original = renderTexture(menu); + + XGetGeometry(dpy, original, &baz, &foo, + &foo, &w, &h, &bar, &bar); + front = XGetImage(dpy, original, 0, 0, w, h, + AllPlanes, ZPixmap); + if (!front) { + wwarning(_("error capturing \"front\" image"), + RMessageForError(RErrorCode)); + return None; + } + front->red_mask = red_mask; + front->green_mask = green_mask; + front->blue_mask = blue_mask; + + menu_image=RCreateImageFromXImage(scr->rcontext,front,NULL); + + XDestroyImage(front); + /************************************************************/ + if (original) { + FREE_PIXMAP(original); + } + if (!menu_image) { + wwarning(_("error rendering \"menu_image\""), + RMessageForError(RErrorCode)); + return None; + } else { + if (wPreferences.menu_style == MS_NORMAL) { + msnormal = RMakeTiledImage(menu_image, mw, mh); + RCombineAreaWithOpaqueness(trance, msnormal,0,0,gw,gh, + gx - dx,gy - dy,256*tamount/10); + RReleaseImage(menu_image); + RReleaseImage(msnormal); + } else { + RCombineAreaWithOpaqueness(trance, menu_image,0,0,gw,gh, + gx - dx,gy - dy,256*tamount/10); + RReleaseImage(menu_image); + } + RConvertImage(scr->rcontext, trance, + &result); + } + RReleaseImage(trance); + } + } + return result; +} + +static void updateTexture(WMenu *menu) { WScreen *scr = menu->menu->screen_ptr; @@ -507,7 +621,14 @@ if (!menu->flags.brother) { FREE_PIXMAP(menu->menu_texture_data); - menu->menu_texture_data = renderTexture(menu); + if (wPreferences.menu_trance) { + if((menu->menu_texture_data = tranceMenu(menu))==NULL) + { + menu->menu_texture_data = renderTexture(menu); + } + } else { + menu->menu_texture_data = renderTexture(menu); + } XSetWindowBackgroundPixmap(dpy, menu->menu->window, menu->menu_texture_data); @@ -1166,6 +1287,11 @@ XMoveWindow(dpy, menu->frame->core->window, x, y); menu->frame_x = x; menu->frame_y = y; + /* FIXME: needs an if */ + if (wPreferences.menu_trance) { + updateTexture(menu); + } + /* */ XMapWindow(dpy, menu->frame->core->window); wRaiseFrame(menu->frame->core); menu->flags.mapped = 1; @@ -1190,6 +1316,11 @@ menu->frame_y = menu->frame->screen_ptr->app_menu_y; XMoveWindow(dpy, menu->frame->core->window, menu->frame_x, menu->frame_y); } + /* FIXME: needs an if */ + if (wPreferences.menu_trance) { + updateTexture(menu); + } + /* */ XMapWindow(dpy, menu->frame->core->window); wRaiseFrame(menu->frame->core); menu->flags.mapped = 1; --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-18 14:44:23 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-18 14:44:23 +0400 @@ -339,6 +339,8 @@ char opaque_move; /* update window position during */ /* move */ + char menu_trance; /* whether menu should be translucent */ + int trance_amount; /* percentage of translucency */ char wrap_menus; /* wrap menus at edge of screen */ char scrollable_menus; /* let them be scrolled */ char align_menus; /* align menu with their parents */ --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 14:44:23 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 14:44:23 +0400 @@ -499,6 +499,12 @@ {"UseSaveUnders", "NO", NULL, &wPreferences.use_saveunders, getBool, NULL }, + {"MenuTrance", "NO", NULL, + &wPreferences.menu_trance, getBool, NULL + }, + {"TranceAmount", "30", NULL, + &wPreferences.trance_amount, getInt, NULL + }, {"OpaqueMove", "NO", NULL, &wPreferences.opaque_move, getBool, NULL }, --- WindowMaker-0.91.0/WPrefs.app/Appearance.c.vns 2005-05-18 14:44:23 +0400 +++ WindowMaker-0.91.0/WPrefs.app/Appearance.c 2005-05-18 14:51:21 +0400 @@ -82,6 +82,11 @@ WMFrame *taliF; WMButton *taliB[3]; + WMFrame *tranceF; + WMButton *tranceB; + WMSlider *tranceSl; + WMLabel *tranceL; + /* root bg */ WMFrame *bgF; @@ -1714,6 +1719,23 @@ } } +static void +tranceCallback(WMWidget *self, void *data) +{ + _Panel *panel = (_Panel*)data; + char buffer[5]; + int i; + + i = WMGetSliderValue(panel->tranceSl); + i = 10*(10-i); + + if (i == 0) { + WMSetLabelText(panel->tranceL, "OFF"); + } else { + sprintf(buffer, "%i%%", i); + WMSetLabelText(panel->tranceL, buffer); + } +} static void createPanel(Panel *p) @@ -2005,7 +2027,7 @@ panel->taliF = WMCreateFrame(panel->optF); - WMResizeWidget(panel->taliF, 110, 80); + WMResizeWidget(panel->taliF, 105, 80); WMMoveWidget(panel->taliF, 15, 100); WMSetFrameTitle(panel->taliF, _("Title Alignment")); @@ -2023,7 +2045,7 @@ WMSetButtonText(panel->taliB[i], _("Right")); break; } - WMResizeWidget(panel->taliB[i], 90, 18); + WMResizeWidget(panel->taliB[i], 85, 18); WMMoveWidget(panel->taliB[i], 10, 15 + 20*i); } WMGroupButtons(panel->taliB[0], panel->taliB[1]); @@ -2031,6 +2053,36 @@ WMMapSubwidgets(panel->taliF); + panel->tranceF = WMCreateFrame(panel->optF); + WMResizeWidget(panel->tranceF, 105,80); + WMMoveWidget(panel->tranceF, 125, 100); + WMSetFrameTitle(panel->tranceF,_("Transparency")); + + WMSetBalloonTextForView(_(" i love windowmaker\n" + " get some fresh sand-wich-es\n" + " heh\n" + " transparency\n" + " moo\n" + " :P\n"), WMWidgetView(panel->tranceF)); + + panel->tranceB = WMCreateSwitchButton(panel->tranceF); + WMSetButtonText(panel->tranceB, _("Menu")); + WMResizeWidget(panel->tranceB,85,18); + WMMoveWidget(panel->tranceB, 10, 15); + + panel->tranceSl = WMCreateSlider(panel->tranceF); + WMResizeWidget(panel->tranceSl, 70, 18); + WMMoveWidget(panel->tranceSl, 17, 15 + 20*2); + WMSetSliderMinValue(panel->tranceSl, 0); + WMSetSliderMaxValue(panel->tranceSl, 10); + WMSetSliderAction(panel->tranceSl, tranceCallback, panel); + + panel->tranceL = WMCreateLabel(panel->tranceF); + WMResizeWidget(panel->tranceL, 27, 18); + WMMoveWidget(panel->tranceL, 40, 35); + + WMMapSubwidgets(panel->tranceF); + WMMapSubwidgets(panel->optF); /**/ @@ -2089,6 +2141,7 @@ static void showData(_Panel *panel) { + int x; int i; char *str; @@ -2134,6 +2187,13 @@ WMSetButtonSelected(panel->mstyB[panel->menuStyle], True); WMSetButtonSelected(panel->taliB[panel->titleAlignment], True); + + + WMSetButtonSelected(panel->tranceB, GetBoolForKey("MenuTrance")); + + x = GetIntegerForKey("TranceAmount"); + WMSetSliderValue(panel->tranceSl, x); + tranceCallback(NULL, panel); } @@ -2185,6 +2245,9 @@ SetStringForKey("center", "TitleJustify"); break; } + + SetBoolForKey(WMGetButtonSelected(panel->tranceB), "MenuTrance"); + SetIntegerForKey(WMGetSliderValue(panel->tranceSl), "TranceAmount"); } WindowMaker-0.91.0-hmepas-minimizeall.patch: --- NEW FILE WindowMaker-0.91.0-hmepas-minimizeall.patch --- --- WindowMaker-0.91.0/src/event.c.vns 2005-05-18 21:40:15 +0400 +++ WindowMaker-0.91.0/src/event.c 2005-05-18 21:42:02 +0400 @@ -1410,6 +1410,10 @@ OpenWindowMenu(wwin, wwin->frame_x, wwin->frame_y+wwin->frame->top_width, True); break; + case WKBD_ALLMINIMIZE: + CloseWindowMenu(scr); + wHideAll(scr); + break; case WKBD_MINIATURIZE: if (ISMAPPED(wwin) && ISFOCUSED(wwin) && !WFLAGP(wwin, no_miniaturizable)) { --- WindowMaker-0.91.0/src/actions.c.vns 2005-05-18 21:40:15 +0400 +++ WindowMaker-0.91.0/src/actions.c 2005-05-18 21:40:16 +0400 @@ -1295,6 +1295,57 @@ +// ADDED BY HMEPAS +void wHideAll(WScreen *scr) +{ + WWindow *wwin; + WWindow **windows; + Window FocusedWin; + WMenu *menu; + unsigned int wcount = 0; + int FocusState; + int i; + + if (!scr) + return; + + menu = scr->switch_menu; + + windows = malloc( sizeof(WWindow *) ); + + if (menu != NULL) { + for(i=0;ientry_no;i++) { + windows[wcount] = (WWindow *) menu->entries[i]->clientdata; + wcount++; + windows = realloc(windows, sizeof(WWindow *) * (wcount+1) ); + } + } else { + wwin = scr->focused_window; + + while(wwin) { + windows[wcount] = wwin; + wcount++; + windows = realloc(windows, sizeof(WWindow *) * (wcount+1) ); + wwin = wwin->prev; + + } + } + + for(i=0;i < wcount; i++) { + wwin = windows[i]; + if (wwin->frame->workspace == scr->current_workspace + && !(wwin->flags.miniaturized||wwin->flags.hidden) + && !wwin->flags.internal_window + && !WFLAGP(wwin, no_miniaturizable) + ) + { + wwin->flags.skip_next_animation = 1; + wIconifyWindow(wwin); + } + } +} + + void wHideOtherApplications(WWindow *awin) { --- WindowMaker-0.91.0/src/actions.h.vns 2004-10-12 21:53:07 +0400 +++ WindowMaker-0.91.0/src/actions.h 2005-05-18 21:40:16 +0400 @@ -69,5 +69,8 @@ void wUnfullscreenWindow(WWindow *wwin); +// ADDED BY HMEPAS TO MINIMIZE ALL WINDOWS ON CURRENT WORKSPACE +void wHideAll(WScreen *src); + #endif --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 21:40:16 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 21:40:16 +0400 @@ -705,6 +705,9 @@ NULL, getKeybind, setKeyGrab }, #endif /* LITE */ + {"AllMinimizeKey", "None", (void*)WKBD_ALLMINIMIZE, + NULL, getKeybind, setKeyGrab + }, {"WindowMenuKey", "None", (void*)WKBD_WINDOWMENU, NULL, getKeybind, setKeyGrab }, --- WindowMaker-0.91.0/src/keybind.h.vns 2004-10-12 21:55:38 +0400 +++ WindowMaker-0.91.0/src/keybind.h 2005-05-18 21:43:50 +0400 @@ -77,12 +77,13 @@ #define WKBD_WINDOW10 44 #define WKBD_SWITCH_SCREEN 45 +#define WKBD_ALLMINIMIZE 46 #ifdef KEEP_XKB_LOCK_STATUS -# define WKBD_TOGGLE 46 -# define WKBD_TMP 47 +# define WKBD_TOGGLE 47 +# define WKBD_TMP 48 #else -# define WKBD_TMP 46 +# define WKBD_TMP 47 #endif #ifdef VIRTUAL_DESKTOP WindowMaker-0.91.0-hmepas-swmenu_rclick.patch: --- NEW FILE WindowMaker-0.91.0-hmepas-swmenu_rclick.patch --- --- WindowMaker-0.91.0/src/menu.c.vns 2005-05-18 21:46:03 +0400 +++ WindowMaker-0.91.0/src/menu.c 2005-05-18 21:46:03 +0400 @@ -2077,6 +2077,7 @@ static void menuMouseDown(WObjDescriptor *desc, XEvent *event) { + WWindow *wwin; // ADDED BY HMEPAS FOR sw_rclick XButtonEvent *bev = &event->xbutton; WMenu *menu = desc->parent; WMenu *smenu; @@ -2160,7 +2161,27 @@ } } else if (!delayed_select) { - selectEntry(menu, entry_no); + // ADDED BY HMEPAS + // FOR WindowMenu open by right click on + // switchmenu entry + if( menu == scr->switch_menu && event->xbutton.button == Button3 ) { + selectEntry(menu, entry_no); + OpenWindowMenu2( (WWindow*)entry->clientdata, + event->xbutton.x_root, + event->xbutton.y_root, False); + wwin = (WWindow*)entry->clientdata; + desc = &wwin->screen_ptr->window_menu->menu->descriptor; + event->xany.send_event = True; + (*desc->handle_mousedown)(desc, event); + + XUngrabPointer(dpy, CurrentTime); + selectEntry(menu, -1); + return; + } + else { + selectEntry(menu, entry_no); + } + // END OF HMEPAS PATCH } if (!wPreferences.wrap_menus && !wPreferences.scrollable_menus) { --- WindowMaker-0.91.0/src/funcs.h.vns 2004-10-14 22:03:28 +0400 +++ WindowMaker-0.91.0/src/funcs.h 2005-05-18 21:46:03 +0400 @@ -65,6 +65,13 @@ void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard); +// THIS IS NEED FOR MY SW_RIGHT CLICK PATCH +// (FOR MOVING WINDOW FROM ANOTHER WORKSPACE TO +// CURRENT) ON NATIVE FUNCTION MOVE TO CURRENT +// WORKSPACE IS DISABLED +// HMEPAS +void OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard); + void OpenMiniwindowMenu(WWindow *wwin, int x, int y); void OpenWorkspaceMenu(WScreen *scr, int x, int y); --- WindowMaker-0.91.0/src/winmenu.c.vns 2004-10-21 07:21:16 +0400 +++ WindowMaker-0.91.0/src/winmenu.c 2005-05-18 21:52:50 +0400 @@ -619,7 +619,6 @@ wMenuRealize(menu); } - void OpenWindowMenu(WWindow *wwin, int x, int y, int keyboard) { @@ -650,10 +649,46 @@ updateMenuForWindow(menu, wwin); x -= menu->frame->core->width/2; - if (x + menu->frame->core->width > wwin->frame_x+wwin->frame->core->width) - x = wwin->frame_x+wwin->frame->core->width - menu->frame->core->width; - if (x < wwin->frame_x) - x = wwin->frame_x; + if (!wwin->flags.internal_window) + wMenuMapAt(menu, x, y, keyboard); +} + +void +OpenWindowMenu2(WWindow *wwin, int x, int y, int keyboard) +{ + int i; + WMenu *menu; + WScreen *scr = wwin->screen_ptr; + + wwin->flags.menu_open_for_me = 1; + + if (!scr->window_menu) { + scr->window_menu = createWindowMenu(scr); + + /* hack to save some memory allocation/deallocation */ + wfree(scr->window_menu->entries[MC_MINIATURIZE]->text); + wfree(scr->window_menu->entries[MC_MAXIMIZE]->text); + wfree(scr->window_menu->entries[MC_SHADE]->text); + } else { + updateWorkspaceMenu(scr->workspace_submenu); + } + + menu = scr->window_menu; + if (menu->flags.mapped) { + wMenuUnmap(menu); + if (menu->entries[0]->clientdata==wwin) { + return; + } + } + + updateMenuForWindow(menu, wwin); + + for (i = 0; i < scr->workspace_submenu->entry_no; i++) { + scr->workspace_submenu->entries[i]->clientdata = wwin; + wMenuSetEnabled(scr->workspace_submenu, i, True); + } + + x -= menu->frame->core->width/2; if (!wwin->flags.internal_window) wMenuMapAt(menu, x, y, keyboard); WindowMaker-0.91.0-peter-appicon-bouncer2.patch: --- NEW FILE WindowMaker-0.91.0-peter-appicon-bouncer2.patch --- --- 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 @@ if (wapp->refcount>0) return; +#ifdef BOUNCE_APP + if (wapp->flags.bouncing) + { + /* event.c:handleDestroyNotify forced this destroy + and thereby overlooked the bounce callback */ + wapp->refcount = 1; + return; + } +#endif + scr = wapp->main_window_desc->screen_ptr; main_window = wapp->main_window; --- WindowMaker-0.91.0/src/application.h.vns 2005-05-19 12:42:35 +0400 +++ WindowMaker-0.91.0/src/application.h 2005-05-19 12:44:51 +0400 @@ -46,6 +46,9 @@ unsigned int skip_next_animation:1; unsigned int hidden:1; unsigned int emulated:1; +#ifdef BOUNCE_APP + unsigned int bouncing:1; +#endif } flags; } WApplication; @@ -58,6 +61,8 @@ void wApplicationExtractDirPackIcon(WScreen *scr,char *path, char *wm_instance, char *wm_class); +void wAppBounce(WApplication *); + #ifdef NEWAPPICON #define wApplicationActivate(wapp) do { \ --- WindowMaker-0.91.0/src/superfluous.c.vns 2004-10-12 21:46:38 +0400 +++ WindowMaker-0.91.0/src/superfluous.c 2005-05-19 12:42:35 +0400 @@ -41,6 +41,7 @@ #include "window.h" #include "icon.h" #include "appicon.h" +#include "xinerama.h" extern WPreferences wPreferences; @@ -810,3 +811,164 @@ #endif /* GHOST_WINDOW_MOVE */ +#ifdef BOUNCE_APP + +#define BOUNCE_HZ 25 +#define BOUNCE_DELAY (1000/BOUNCE_HZ) +#define BOUNCE_HEIGHT 24 +#define BOUNCE_LENGTH 0.3 +#define BOUNCE_DAMP 0.6 + +typedef struct AppBouncerData { + WApplication *wapp; + int count; + int pow; + int dir; + WMHandlerID *timer; +} AppBouncerData; + +static void +doAppBounce(void *arg) +{ + AppBouncerData *data = (AppBouncerData*)arg; + WAppIcon *aicon = data->wapp->app_icon; + +reinit: + if (aicon && data->wapp->refcount > 1) + { + const double ticks = BOUNCE_HZ*BOUNCE_LENGTH; + const double s = sqrt(BOUNCE_HEIGHT)/(ticks/2); + double h = BOUNCE_HEIGHT*pow(BOUNCE_DAMP, data->pow); + double sqrt_h = sqrt(h); + if (h > 3) + { + double offset, x = s * data->count - sqrt_h; + if (x > sqrt_h) + { + ++data->pow; + data->count = 0; + goto reinit; + } else ++data->count; + offset = h - x*x; + + switch(data->dir) + { + case 0: /* left, bounce to right */ + XMoveWindow(dpy, aicon->icon->core->window, + aicon->x_pos + (int)offset, aicon->y_pos); + break; + case 1: /* right, bounce to left */ + XMoveWindow(dpy, aicon->icon->core->window, + aicon->x_pos - (int)offset, aicon->y_pos); + break; + case 2: /* top, bounce down */ + XMoveWindow(dpy, aicon->icon->core->window, + aicon->x_pos, aicon->y_pos + (int)offset); + break; + case 3: /* bottom, bounce up */ + XMoveWindow(dpy, aicon->icon->core->window, + aicon->x_pos, aicon->y_pos - (int)offset); + break; + } + return; + } + XMoveWindow(dpy, aicon->icon->core->window, + aicon->x_pos, aicon->y_pos); + } + + data->wapp->flags.bouncing = 0; + WMDeleteTimerHandler(data->timer); + wApplicationDestroy(data->wapp); + free(data); +} + +static int +bounceDirection(WAppIcon *aicon) +{ + enum { left_e = 1, right_e = 2, top_e = 4, bottom_e = 8 }; + + WScreen *scr = aicon->icon->core->screen_ptr; + WMRect rr, sr; + int l,r,t,b, h,v; + int dir = 0; + + rr.pos.x = aicon->x_pos; + rr.pos.y = aicon->y_pos; + rr.size.width = rr.size.height = 64; + + sr = wGetRectForHead(scr, wGetHeadForRect(scr, rr)); + + l = rr.pos.x - sr.pos.x; + r = sr.pos.x + sr.size.width - rr.pos.x - rr.size.width; + t = rr.pos.y - sr.pos.y; + b = sr.pos.y + sr.size.height - rr.pos.y - rr.size.height; + + if (l < r) { + dir |= left_e; + h = l; + } else { + dir |= right_e; + h = r; + } + + if (t < b) { + dir |= top_e; + v = t; + } else { + dir |= bottom_e; + v = b; + } + + if (h < v) dir &= ~(top_e | bottom_e); + else dir &= ~(left_e | right_e); + + switch(dir) + { + case left_e: + dir = 0; + break; + + case right_e: + dir = 1; + break; + + case top_e: + dir = 2; + break; + + case bottom_e: + dir = 3; + break; + + default: + wwarning(_("impossible direction: %d\n"), dir); + dir = 3; + break; + } + + return dir; +} + +void +wAppBounce(WApplication * wapp) +{ + if (wapp->app_icon && !wapp->flags.bouncing) + { + ++wapp->refcount; + wapp->flags.bouncing = 1; + + AppBouncerData *data = + (AppBouncerData*)malloc(sizeof(AppBouncerData)); + data->wapp = wapp; + data->count = data->pow = 0; + data->dir = bounceDirection(wapp->app_icon); + data->timer = WMAddPersistentTimerHandler(BOUNCE_DELAY, doAppBounce, data); + } +} + +#else +void +wAppBounce(WApplication * wapp) +{ +} +#endif WindowMaker-0.91.0-peter-mouse-placement.patch: --- NEW FILE WindowMaker-0.91.0-peter-mouse-placement.patch --- --- WindowMaker-0.91.0/src/WindowMaker.h.vns 2005-05-19 12:29:12 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-19 12:29:12 +0400 @@ -169,6 +169,8 @@ #define WPM_SMART 2 #define WPM_RANDOM 3 #define WPM_AUTO 4 +#define WPM_SMARTMOUSE 5 +#define WPM_MOUSE 6 /* text justification */ #define WTJ_CENTER 0 --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-19 12:29:12 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-19 12:29:12 +0400 @@ -238,6 +238,8 @@ {"Cascade", WPM_CASCADE, 0}, {"Random", WPM_RANDOM, 0}, {"Manual", WPM_MANUAL, 0}, + {"SmartMouse", WPM_SMARTMOUSE, 0}, + {"Mouse", WPM_MOUSE, 0}, {NULL, 0, 0} }; --- WindowMaker-0.91.0/src/placement.c.vns 2005-05-19 12:29:11 +0400 +++ WindowMaker-0.91.0/src/placement.c 2005-05-19 12:31:22 +0400 @@ -416,6 +416,127 @@ *y_ret = min_isect_y; } +static void +smartmousePlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, + unsigned int width, unsigned int height, + WArea usableArea) +{ + WScreen *scr = wwin->screen_ptr; + int test_x = 0, test_y = usableArea.y1; + int from_x, to_x, from_y, to_y; + int pointer_x, pointer_y; + double rad, min_rad = INT_MAX; + int sx; + int min_isect, min_isect_x, min_isect_y; + int sum_isect; + + if (wwin->frame) { + height += wwin->frame->top_width + wwin->frame->bottom_width; + } else { + if (HAS_TITLEBAR(wwin)) height += 18; + if (HAS_RESIZEBAR(wwin)) height += 8; + } + if (HAS_BORDER(wwin)) { + height += 2; + width += 2; + } + + sx = usableArea.x1; + + min_isect = INT_MAX; + min_isect_x = sx; + min_isect_y = test_y; + + { + Window win; + int tint; + unsigned int tuint; + + XQueryPointer(dpy, scr->root_win, &win, &win, + &pointer_x, &pointer_y, + &tint, &tint, &tuint); + } + +#define SQ(x) ((x)*(x)) +#define RAD() sqrt( SQ(test_x + width/2 - pointer_x) + \ + SQ(test_y + height/2 - pointer_y)) + + while (((test_y + height) < usableArea.y2)) { + test_x = sx; + while ((test_x + width) < usableArea.x2) { + sum_isect = calcSumOfCoveredAreas(wwin, test_x, test_y, + width, height); + rad = RAD(); + if ( sum_isect < min_isect || + (sum_isect == min_isect && rad < min_rad)) { + min_rad = rad; + min_isect = sum_isect; + min_isect_x = test_x; + min_isect_y = test_y; + } + + test_x += PLACETEST_HSTEP; + } + test_y += PLACETEST_VSTEP; + } + + from_x = min_isect_x - PLACETEST_HSTEP + 1; + from_x = WMAX(from_x, usableArea.x1); + to_x = min_isect_x + PLACETEST_HSTEP; + if (to_x + width > usableArea.x2) + to_x = usableArea.x2 - width; + + from_y = min_isect_y - PLACETEST_VSTEP + 1; + from_y = WMAX(from_y, usableArea.y1); + to_y = min_isect_y + PLACETEST_VSTEP; + if (to_y + height > usableArea.y2) + to_y = usableArea.y2 - height; + + for (test_x = from_x; test_x < to_x; test_x++) { + for (test_y = from_y; test_y < to_y; test_y++) { + sum_isect = calcSumOfCoveredAreas(wwin, test_x, test_y, + width, height); + rad = RAD(); + if ( sum_isect < min_isect || + (sum_isect == min_isect && rad < min_rad)) { + min_rad = rad; + min_isect = sum_isect; + min_isect_x = test_x; + min_isect_y = test_y; + } + } + } + + *x_ret = min_isect_x; + *y_ret = min_isect_y; +} + +static void +mousePlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, + unsigned int width, unsigned int height, WArea usableArea) +{ + WScreen *scr = wwin->screen_ptr; + int pointer_x, pointer_y; + + { + Window win; + int tint; + unsigned int tuint; + + XQueryPointer(dpy, scr->root_win, &win, &win, + &pointer_x, &pointer_y, + &tint, &tint, &tuint); + } + + *x_ret = pointer_x - width/2; + *y_ret = pointer_y - height/2; + + if ( *x_ret < usableArea.x1) *x_ret = usableArea.x1; + else if ( *x_ret + width > usableArea.x2) *x_ret = usableArea.x2 - width; + + if ( *y_ret < usableArea.y1) *y_ret = usableArea.y1; + else if ( *y_ret + height > usableArea.y2) *y_ret = usableArea.y2 - height; +} static Bool autoPlaceWindow(WWindow *wwin, int *x_ret, int *y_ret, @@ -610,6 +731,14 @@ smartPlaceWindow(wwin, x_ret, y_ret, width, height, usableArea); break; + case WPM_SMARTMOUSE: + smartmousePlaceWindow(wwin, x_ret, y_ret, width, height, usableArea); + break; + + case WPM_MOUSE: + mousePlaceWindow(wwin, x_ret, y_ret, width, height, usableArea); + break; + case WPM_AUTO: if (autoPlaceWindow(wwin, x_ret, y_ret, width, height, 0, usableArea)) { --- WindowMaker-0.91.0/WPrefs.app/WindowHandling.c.vns 2004-10-13 00:19:34 +0400 +++ WindowMaker-0.91.0/WPrefs.app/WindowHandling.c 2005-05-19 12:32:39 +0400 @@ -77,7 +77,9 @@ "random", "manual", "cascade", - "smart" + "smart", + "smartmouse", + "mouse" }; @@ -137,6 +139,10 @@ return 3; else if (strcasecmp(str, "smart")==0) return 4; + else if (strcasecmp(str, "smartmouse")==0) + return 5; + else if (strcasecmp(str, "mouse")==0) + return 6; else wwarning(_("bad option value %s in WindowPlacement. Using default value"), str); @@ -252,6 +258,8 @@ WMAddPopUpButtonItem(panel->placP, _("Manual")); WMAddPopUpButtonItem(panel->placP, _("Cascade")); WMAddPopUpButtonItem(panel->placP, _("Smart")); + WMAddPopUpButtonItem(panel->placP, _("SmartMouse")); + WMAddPopUpButtonItem(panel->placP, _("Mouse")); panel->porigL = WMCreateLabel(panel->placF); WMResizeWidget(panel->porigL, 120, 32); WindowMaker-0.91.0-peter-newappicon.patch: --- NEW FILE WindowMaker-0.91.0-peter-newappicon.patch --- --- WindowMaker-0.91.0/wrlib/misc.c.vns 2004-10-12 22:21:39 +0400 +++ WindowMaker-0.91.0/wrlib/misc.c 2005-05-19 11:42:54 +0400 @@ -152,7 +152,7 @@ } } else { int bytes = image->width*image->height; - int alpha, nalpha, r, g, b; + int alpha, nalpha, r, g, b, s; alpha = color->alpha; r = color->red * alpha; @@ -160,17 +160,53 @@ b = color->blue * alpha; nalpha = 255 - alpha; - for (i=0; iformat == RRGBAFormat) { - d++; - } + s = (image->format == RRGBAFormat) ? 4 : 3; + + for (i=0; i 255) c=255; + return (unsigned char)c; +} + +void +RLightImage(RImage *image, RColor *color) +{ + unsigned char *d = image->data; + unsigned char *dd; + int alpha, r, g, b, s; + + s = (image->format == RRGBAFormat) ? 4 : 3; + dd = d + s*image->width*image->height; + + r = color->red; + g = color->green; + b = color->blue; + + alpha = color->alpha; + + if (r == 0 && g == 0 && b == 0) { + for (; drcontext, tile, &pixmap)) { wwarning(_("error rendering image:%s"), RMessageForError(RErrorCode)); @@ -597,6 +604,7 @@ } icon->highlighted = flag; + icon->force_paint = True; wIconPaint(icon); } @@ -766,7 +774,7 @@ if (icon->image) { icon->pixmap = makeIcon(scr, icon->image, icon->show_title, - icon->shadowed, icon->tile_type); + icon->shadowed, icon->tile_type, icon->highlighted); } else { /* make default icons */ @@ -794,9 +802,9 @@ image = wIconValidateIconSize(scr, image); scr->def_icon_pixmap = makeIcon(scr, image, False, False, - icon->tile_type); + icon->tile_type, icon->highlighted); scr->def_ticon_pixmap = makeIcon(scr, image, True, False, - icon->tile_type); + icon->tile_type, icon->highlighted); if (image) RReleaseImage(image); } --- WindowMaker-0.91.0/src/appicon.c.vns 2005-05-19 11:42:53 +0400 +++ WindowMaker-0.91.0/src/appicon.c 2005-05-19 11:42:54 +0400 @@ -222,7 +222,7 @@ -#ifdef NEWAPPICON +#if 0 static void drawCorner(WIcon *icon, WWindow *wwin, int active) { --- WindowMaker-0.91.0/src/application.c.vns 2005-05-19 11:42:53 +0400 +++ WindowMaker-0.91.0/src/application.c 2005-05-19 11:42:54 +0400 @@ -465,6 +465,9 @@ XDeleteContext(dpy, wapp->main_window, wAppWinContext); wAppMenuDestroy(wapp->menu); +#ifdef NEWAPPICON + wApplicationDeactivate(wapp); +#endif if (wapp->app_icon) { if (wapp->app_icon->docked && !wapp->app_icon->attracted) { wapp->app_icon->running = 0; --- WindowMaker-0.91.0/src/application.h.vns 2004-10-12 21:53:54 +0400 +++ WindowMaker-0.91.0/src/application.h 2005-05-19 11:47:21 +0400 @@ -60,15 +60,21 @@ #ifdef NEWAPPICON -# define wApplicationActivate(wapp) {\ - wapp->main_window_desc->flags.focused=1; \ - wAppIconPaint(wapp->app_icon);\ - } -#define wApplicationDeactivate(wapp) {\ - wapp->main_window_desc->flags.focused=0;\ - wAppIconPaint(wapp->app_icon);\ - } -#endif +#define wApplicationActivate(wapp) do { \ + if (wapp->app_icon) { \ + wIconSetHighlited(wapp->app_icon->icon, True); \ + wAppIconPaint(wapp->app_icon);\ + } \ + } while (0) + +#define wApplicationDeactivate(wapp) do { \ + if (wapp->app_icon) { \ + wIconSetHighlited(wapp->app_icon->icon, False); \ + wAppIconPaint(wapp->app_icon);\ + } \ + } while (0) + #endif +#endif WindowMaker-0.91.0-sga-moving-add.patch: --- NEW FILE WindowMaker-0.91.0-sga-moving-add.patch --- --- WindowMaker-0.91.0/src/event.c.vns 2005-05-18 22:00:15 +0400 +++ WindowMaker-0.91.0/src/event.c 2005-05-18 22:01:18 +0400 @@ -1405,6 +1405,21 @@ } break; #endif /* !LITE */ + case WKBD_MOVELEFTBOTTOM: + case WKBD_MOVEBOTTOM: + case WKBD_MOVERIGHTBOTTOM: + case WKBD_MOVELEFT: + case WKBD_MOVECENTER: + case WKBD_MOVERIGHT: + case WKBD_MOVELEFTTOP: + case WKBD_MOVETOP: + case WKBD_MOVERIGHTTOP: + if (ISMAPPED(wwin) && ISFOCUSED(wwin) && + (!WFLAGP(wwin, no_resizable) || !WFLAGP(wwin, no_movable))) { + CloseWindowMenu(scr); + wKeyboardMoveWindowAdditional(wwin, command); + } + break; case WKBD_WINDOWMENU: if (ISMAPPED(wwin) && ISFOCUSED(wwin)) OpenWindowMenu(wwin, wwin->frame_x, --- WindowMaker-0.91.0/src/defaults.c.vns 2005-05-18 22:00:15 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-18 22:00:15 +0400 @@ -705,6 +705,33 @@ NULL, getKeybind, setKeyGrab }, #endif /* LITE */ + {"MoveLeftBottomKey", "None", (void*)WKBD_MOVELEFTBOTTOM, + NULL, getKeybind, setKeyGrab + }, + {"MoveBottomKey", "None", (void*)WKBD_MOVEBOTTOM, + NULL, getKeybind, setKeyGrab + }, + {"MoveRightBottomKey", "None", (void*)WKBD_MOVERIGHTBOTTOM, + NULL, getKeybind, setKeyGrab + }, + {"MoveLeftKey", "None", (void*)WKBD_MOVELEFT, + NULL, getKeybind, setKeyGrab + }, + {"MoveCenterKey", "None", (void*)WKBD_MOVECENTER, + NULL, getKeybind, setKeyGrab + }, + {"MoveRightKey", "None", (void*)WKBD_MOVERIGHT, + NULL, getKeybind, setKeyGrab + }, + {"MoveLeftTopKey", "None", (void*)WKBD_MOVELEFTTOP, + NULL, getKeybind, setKeyGrab + }, + {"MoveTopKey", "None", (void*)WKBD_MOVETOP, + NULL, getKeybind, setKeyGrab + }, + {"MoveRightTopKey", "None", (void*)WKBD_MOVERIGHTTOP, + NULL, getKeybind, setKeyGrab + }, {"AllMinimizeKey", "None", (void*)WKBD_ALLMINIMIZE, NULL, getKeybind, setKeyGrab }, --- WindowMaker-0.91.0/src/keybind.h.vns 2005-05-18 22:00:15 +0400 +++ WindowMaker-0.91.0/src/keybind.h 2005-05-18 22:02:39 +0400 @@ -78,12 +78,21 @@ #define WKBD_SWITCH_SCREEN 45 #define WKBD_ALLMINIMIZE 46 +#define WKBD_MOVELEFTBOTTOM 47 +#define WKBD_MOVEBOTTOM 48 +#define WKBD_MOVERIGHTBOTTOM 49 +#define WKBD_MOVELEFT 50 +#define WKBD_MOVECENTER 51 +#define WKBD_MOVERIGHT 52 +#define WKBD_MOVELEFTTOP 53 +#define WKBD_MOVETOP 54 +#define WKBD_MOVERIGHTTOP 55 #ifdef KEEP_XKB_LOCK_STATUS -# define WKBD_TOGGLE 47 -# define WKBD_TMP 48 +# define WKBD_TOGGLE 56 +# define WKBD_TMP 57 #else -# define WKBD_TMP 47 +# define WKBD_TMP 56 #endif #ifdef VIRTUAL_DESKTOP --- WindowMaker-0.91.0/src/moveres.c.vns 2005-05-18 22:00:15 +0400 +++ WindowMaker-0.91.0/src/moveres.c 2005-05-18 22:03:33 +0400 @@ -44,6 +44,8 @@ #include "screen.h" #include "xinerama.h" +#include "keybind.h" + #include @@ -1415,10 +1417,15 @@ case XK_Escape: done=1; break; - case XK_Up: #ifdef XK_KP_Up case XK_KP_Up: #endif + case XK_8: + if (!ctrlmode){ + off_y=-src_y; + } + break; + case XK_Up: case XK_k: if (ctrlmode){ if (moment != UP) @@ -1429,10 +1436,15 @@ } else off_y-=kspeed; break; - case XK_Down: #ifdef XK_KP_Down case XK_KP_Down: #endif + case XK_2: + if (!ctrlmode){ + off_y=-src_y+scr_height-wh; + } + break; + case XK_Down: case XK_j: if (ctrlmode){ if (moment != DOWN) @@ -1442,10 +1454,15 @@ } else off_y+=kspeed; break; - case XK_Left: #ifdef XK_KP_Left case XK_KP_Left: #endif + case XK_4: + if (!ctrlmode){ + off_x=-src_x; + } + break; + case XK_Left: case XK_h: if (ctrlmode) { if (moment != LEFT) @@ -1456,10 +1473,15 @@ } else off_x-=kspeed; break; - case XK_Right: #ifdef XK_KP_Right case XK_KP_Right: #endif + case XK_6: + if (!ctrlmode){ + off_x=-src_x+scr_width-ww; + } + break; + case XK_Right: case XK_l: if (ctrlmode) { if (moment != RIGHT) @@ -1469,6 +1491,51 @@ } else off_x+=kspeed; break; +#ifdef XK_KP_Home + case XK_KP_Home: +#endif + case XK_7: + if (!ctrlmode){ + off_x=-src_x; + off_y=-src_y; + } + break; +#ifdef XK_KP_Prior + case XK_KP_Prior: +#endif + case XK_9: + if (!ctrlmode){ + off_y=-src_y; + off_x=-src_x+scr_width-ww; + } + break; +#ifdef XK_KP_Next + case XK_KP_Next: +#endif + case XK_3: + if (!ctrlmode){ + off_y=-src_y+scr_height-wh; + off_x=-src_x+scr_width-ww; + } + break; +#ifdef XK_KP_End + case XK_KP_End: +#endif + case XK_1: + if (!ctrlmode){ + off_y=-src_y+scr_height-wh; + off_x=-src_x; + } + break; +#ifdef XK_KP_Begin + case XK_KP_Begin: +#endif + case XK_5: + if (!ctrlmode){ + off_y=-src_y+(scr_height-wh)/2; + off_x=-src_x+(scr_width-ww)/2; + } + break; } ww=w;wh=h; @@ -2426,3 +2493,59 @@ } } +int +wKeyboardMoveWindowAdditional(WWindow *wwin, int command) +{ + WScreen *scr = wwin->screen_ptr; + int w = wwin->frame->core->width; + int h = wwin->frame->core->height; + int scr_width = wwin->screen_ptr->scr_width; + int scr_height = wwin->screen_ptr->scr_height; + int src_x = wwin->frame_x; + int src_y = wwin->frame_y; + int rc = scr_width - w; + int bc = scr_height - h; + int new_x = src_x; + int new_y = src_y; + + switch (command) { + case WKBD_MOVELEFTBOTTOM: + new_x = 0; + new_y = bc; + break; + case WKBD_MOVEBOTTOM: + new_y = bc; + break; + case WKBD_MOVERIGHTBOTTOM: + new_x = rc; + new_y = bc; + break; + case WKBD_MOVELEFT: + new_x = 0; + break; + case WKBD_MOVECENTER: + new_x = rc/2; + new_y = bc/2; + break; + case WKBD_MOVERIGHT: + new_x = rc; + break; + case WKBD_MOVELEFTTOP: + new_x = 0; + new_y = 0; + break; + case WKBD_MOVETOP: + new_y = 0; + break; + case WKBD_MOVERIGHTTOP: + new_x = rc; + new_y = 0; + } + + if (!scr->selected_windows) { + wWindowMove(wwin, new_x, new_y); + wWindowSynthConfigureNotify(wwin); + } + return 1; +} + WindowMaker-0.91.0-sga-swpanel-customization.patch: --- NEW FILE WindowMaker-0.91.0-sga-swpanel-customization.patch --- diff -Naur WindowMaker-0.91.0/src/cycling.c WindowMaker-0.91.0.me/src/cycling.c --- WindowMaker-0.91.0/src/cycling.c 2005-06-03 12:10:33 +0300 +++ WindowMaker-0.91.0.me/src/cycling.c 2005-06-03 12:06:40 +0300 @@ -107,6 +107,10 @@ scr->flags.doing_alt_tab = 1; swpanel = wInitSwitchPanel(scr, wwin, scr->current_workspace); + if (swpanel == NULL) { + newFocused = NULL; + goto exiting; + } oldFocused = wwin; if (swpanel) { @@ -237,6 +241,9 @@ break; } } + +exiting: + if (keymap) XFreeModifiermap(keymap); diff -Naur WindowMaker-0.91.0/src/defaults.c WindowMaker-0.91.0.me/src/defaults.c --- WindowMaker-0.91.0/src/defaults.c 2005-06-03 12:10:33 +0300 +++ WindowMaker-0.91.0.me/src/defaults.c 2005-06-03 12:09:09 +0300 @@ -419,6 +419,12 @@ {"CirculateRaise", "NO", NULL, &wPreferences.circ_raise, getBool, NULL }, + {"ShowMiniaturized","YES", NULL, + &wPreferences.show_miniaturized, getBool, NULL + }, + {"ShowHidden", "YES", NULL, + &wPreferences.show_hidden, getBool, NULL + }, {"Superfluous", "NO", NULL, &wPreferences.superfluous, getBool, NULL }, diff -Naur WindowMaker-0.91.0/src/switchpanel.c WindowMaker-0.91.0.me/src/switchpanel.c --- WindowMaker-0.91.0/src/switchpanel.c 2005-06-03 12:10:33 +0300 +++ WindowMaker-0.91.0.me/src/switchpanel.c 2005-06-03 12:12:39 +0300 @@ -409,7 +409,9 @@ for (wwin= curwin; wwin; wwin= wwin->prev) { if (((!fl && canReceiveFocus(wwin) > 0) || (fl && canReceiveFocus(wwin) < 0)) && (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window) && - (wwin->flags.mapped || include_unmapped)) { + (wwin->flags.mapped || include_unmapped) && + (wPreferences.show_miniaturized || !wwin->flags.miniaturized ) && + (wPreferences.show_hidden || !wwin->flags.hidden)) { WMAddToArray(windows, wwin); } } @@ -421,7 +423,9 @@ for (wwin= curwin; wwin && wwin != curwin; wwin= wwin->prev) { if (((!fl && canReceiveFocus(wwin) > 0) || (fl && canReceiveFocus(wwin) < 0)) && (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window) && - (wwin->flags.mapped || include_unmapped)) { + (wwin->flags.mapped || include_unmapped) && + (wPreferences.show_miniaturized || !wwin->flags.miniaturized ) && + (wPreferences.show_hidden || !wwin->flags.hidden)) { WMAddToArray(windows, wwin); } } diff -Naur WindowMaker-0.91.0/src/WindowMaker.h WindowMaker-0.91.0.me/src/WindowMaker.h --- WindowMaker-0.91.0/src/WindowMaker.h 2005-06-03 12:10:33 +0300 +++ WindowMaker-0.91.0.me/src/WindowMaker.h 2005-06-03 11:16:49 +0300 @@ -365,6 +365,8 @@ char windows_cycling; /* windoze cycling */ char circ_raise; /* raise window after Alt-tabbing */ + char show_miniaturized; /* show miniaturized windows in Alt-tabbing panel */ + char show_hidden; /* show hidden windows in Alt-tabbing panel */ char ignore_focus_click; WindowMaker-0.91.0-wmcontrib-singleclick.patch: --- NEW FILE WindowMaker-0.91.0-wmcontrib-singleclick.patch --- --- WindowMaker-0.91.0/src/appicon.c.sc 2004-10-14 21:31:49 +0400 +++ WindowMaker-0.91.0/src/appicon.c 2005-05-17 23:37:26 +0400 @@ -590,6 +590,7 @@ Bool movingSingle = False; int oldX = x; int oldY = y; + Bool hasMoved = False; if (aicon->editing || WCHECK_STATE(WSTATE_MODAL)) return; @@ -665,6 +666,7 @@ break; case MotionNotify: + hasMoved = True; if (!grabbed) { if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -802,6 +804,9 @@ if (wPreferences.auto_arrange_icons) wArrangeIcons(scr, True); + if (wPreferences.single_click && !hasMoved) + iconDblClick(desc, event); + done = 1; break; } --- WindowMaker-0.91.0/src/WindowMaker.h.sc 2004-10-25 05:48:39 +0400 +++ WindowMaker-0.91.0/src/WindowMaker.h 2005-05-17 23:37:26 +0400 @@ -475,6 +475,9 @@ RImage *swtileImage; RImage *swbackImage[9]; + /* single click to lauch applications */ + char single_click; + struct { unsigned int nodock:1; /* don't display the dock */ unsigned int noclip:1; /* don't display the clip */ --- WindowMaker-0.91.0/src/defaults.c.sc 2005-05-17 23:37:09 +0400 +++ WindowMaker-0.91.0/src/defaults.c 2005-05-17 23:37:26 +0400 @@ -553,6 +553,9 @@ {"DisableBlinking", "NO", NULL, &wPreferences.dont_blink, getBool, NULL }, + {"SingleClickLaunch", "NO", NULL, + &wPreferences.single_click, getBool, NULL + }, /* style options */ {"MenuStyle", "normal", seMenuStyles, &wPreferences.menu_style, getEnum, setMenuStyle --- WindowMaker-0.91.0/src/dock.c.sc 2004-10-23 07:10:40 +0400 +++ WindowMaker-0.91.0/src/dock.c 2005-05-17 23:37:26 +0400 @@ -3758,7 +3758,7 @@ -static void +static Bool handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event) { WScreen *scr = dock->screen_ptr; @@ -3776,6 +3776,7 @@ Bool docked; int superfluous = wPreferences.superfluous; /* we catch it to avoid problems */ int omnipresent = aicon->omnipresent; /* this must be cached!!! */ + Bool hasMoved = False; if (wPreferences.flags.noupdates) @@ -3828,6 +3829,7 @@ break; case MotionNotify: + hasMoved = True; if (!grabbed) { if (abs(ofs_x-ev.xmotion.x)>=MOVE_THRESHOLD || abs(ofs_y-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -3977,9 +3979,11 @@ #ifdef DEBUG puts("End icon move"); #endif - return; + return hasMoved; } } + + return False; /* never reached */ } @@ -4116,8 +4120,11 @@ handleClipChangeWorkspace(scr, event); else handleDockMove(dock, aicon, event); - } else - handleIconMove(dock, aicon, event); + } else { + Bool hasMoved = handleIconMove(dock, aicon, event); + if (wPreferences.single_click && !hasMoved) + iconDblClick(desc, event); + } } else if (event->xbutton.button==Button2 && dock->type==WM_CLIP && aicon==scr->clip_icon) { --- WindowMaker-0.91.0/src/icon.c.sc 2005-05-17 23:37:09 +0400 +++ WindowMaker-0.91.0/src/icon.c 2005-05-17 23:37:26 +0400 @@ -891,6 +891,7 @@ int dx=event->xbutton.x, dy=event->xbutton.y; int grabbed=0; int clickButton=event->xbutton.button; + Bool hasMoved = False; if (WCHECK_STATE(WSTATE_MODAL)) return; @@ -942,6 +943,7 @@ break; case MotionNotify: + hasMoved = True; if (!grabbed) { if (abs(dx-ev.xmotion.x)>=MOVE_THRESHOLD || abs(dy-ev.xmotion.y)>=MOVE_THRESHOLD) { @@ -979,6 +981,8 @@ if (wPreferences.auto_arrange_icons) wArrangeIcons(wwin->screen_ptr, True); + if (wPreferences.single_click && !hasMoved) + miniwindowDblClick(desc, event); return; } --- WindowMaker-0.91.0/WPrefs.app/Expert.c.sc 2004-10-23 07:04:38 +0400 +++ WindowMaker-0.91.0/WPrefs.app/Expert.c 2005-05-17 23:37:26 +0400 @@ -54,6 +54,7 @@ WMSetButtonSelected(panel->swi[4], GetBoolForKey("DontConfirmKill")); WMSetButtonSelected(panel->swi[5], GetBoolForKey("DisableBlinking")); WMSetButtonSelected(panel->swi[6], GetBoolForKey("AntialiasedText")); + WMSetButtonSelected(panel->swi[7], GetBoolForKey("SingleClickLaunch")); } @@ -66,7 +67,7 @@ panel->box = WMCreateBox(panel->parent); WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2); - for (i=0; i<7; i++) { + for (i=0; i<8; i++) { panel->swi[i] = WMCreateSwitchButton(panel->box); WMResizeWidget(panel->swi[i], FRAME_WIDTH-40, 25); WMMoveWidget(panel->swi[i], 20, 20+i*25); @@ -79,6 +80,7 @@ WMSetButtonText(panel->swi[4], _("Disable confirmation panel for the Kill command.")); WMSetButtonText(panel->swi[5], _("Disable selection animation for selected icons.")); WMSetButtonText(panel->swi[6], _("Smooth font edges (needs restart).")); + WMSetButtonText(panel->swi[7], _("Launch applications and restore windows with a single click.")); WMSetButtonEnabled(panel->swi[6], True); @@ -103,6 +105,7 @@ SetBoolForKey(WMGetButtonSelected(panel->swi[4]), "DontConfirmKill"); SetBoolForKey(WMGetButtonSelected(panel->swi[5]), "DisableBlinking"); SetBoolForKey(WMGetButtonSelected(panel->swi[6]), "AntialiasedText"); + SetBoolForKey(WMGetButtonSelected(panel->swi[7]), "SingleClickLaunch"); } WindowMaker-0.92.0-alt-newpo.patch: --- NEW FILE WindowMaker-0.92.0-alt-newpo.patch --- --- WindowMaker-0.92.0/po/Makefile.am.vns 2004-10-27 01:03:42 +0400 +++ WindowMaker-0.92.0/po/Makefile.am 2005-09-06 08:55:14 +0400 @@ -7,7 +7,7 @@ # Please keep this sorted in alphabetic order! EXTRA_DIST = be.po bg.po bs.po ca.po cs.po da.po de.po el.po es.po et.po \ fi.po fr.po gl.po hr.po hu.po it.po ja.po ko.po ms.po nl.po no.po \ - pl.po pt.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po + pl.po pt.po ro.po ru.po sk.po sv.po tr.po uk.po zh_CN.po zh_TW.po POTFILES = \ $(top_builddir)/src/appicon.c \ --- WindowMaker-0.92.0/configure.ac.vns 2005-09-06 08:55:13 +0400 +++ WindowMaker-0.92.0/configure.ac 2005-09-06 08:57:02 +0400 @@ -289,8 +289,8 @@ dnl List of supported locales dnl ------------------------- -supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW" -supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW" +supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr uk zh_CN zh_TW" +supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk uk zh_CN zh_TW" supported_wings_locales="bg ca cs de fr sk" for lang in $LINGUAS; do WindowMaker-0.92.0-cvs20060123.patch: --- NEW FILE WindowMaker-0.92.0-cvs20060123.patch --- diff -uhrN WindowMaker-0.92.0/aclocal.m4 WindowMaker-CVS-20060123/aclocal.m4 --- WindowMaker-0.92.0/aclocal.m4 2005-06-19 05:22:57.000000000 +0200 +++ WindowMaker-CVS-20060123/aclocal.m4 2006-01-22 21:33:50.000000000 +0100 @@ -1217,8 +1217,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# serial 47 AC_PROG_LIBTOOL -# Debian $Rev: 214 $ +# serial 48 Debian 1.5.22-2 AC_PROG_LIBTOOL # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) @@ -1328,7 +1327,7 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' +Xsed='sed -e 1s/^X//' [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] # Same as above, but do not quote variable references. @@ -1348,7 +1347,7 @@ default_ofile=libtool can_build_shared=yes -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a ltmain="$ac_aux_dir/ltmain.sh" @@ -1368,6 +1367,7 @@ 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" @@ -1387,15 +1387,17 @@ if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ;; *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ;; esac old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" fi +_LT_CC_BASENAME([$compiler]) + # Only perform the check for file, if the check method requires it case $deplibs_check_method in file_magic*) @@ -1436,11 +1438,56 @@ # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} +# If no C compiler flags were specified, use CFLAGS. +LTCFLAGS=${LTCFLAGS-"$CFLAGS"} + # Allow CC to be a program name with arguments. compiler=$CC ])# _LT_AC_SYS_COMPILER +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + +# _LT_COMPILER_BOILERPLATE +# ------------------------ +# Check for compiler boilerplate output or warnings with +# the simple compiler test code. +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_compiler_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_COMPILER_BOILERPLATE + + +# _LT_LINKER_BOILERPLATE +# ---------------------- +# Check for linker boilerplate output or warnings with +# the simple link test code. +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err +_lt_linker_boilerplate=`cat conftest.err` +$rm conftest* +])# _LT_LINKER_BOILERPLATE + + # _LT_AC_SYS_LIBPATH_AIX # ---------------------- # Links a minimal program and checks the executable @@ -1513,15 +1560,15 @@ # The HP-UX ksh and POSIX shell print the target directory to stdout # if CDPATH is set. -if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH if test -z "$ECHO"; then if test "X${echo_test_string+set}" != Xset; then # find a string as large as possible, as long as the shell can cope with it for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if (echo_test_string="`eval $cmd`") 2>/dev/null && - echo_test_string="`eval $cmd`" && + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null then break @@ -1690,7 +1737,7 @@ # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in + case `/usr/bin/file conftest.o` in *32-bit*) case $host in x86_64-*linux*) @@ -1741,6 +1788,22 @@ CFLAGS="$SAVE_CFLAGS" fi ;; +sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if AC_TRY_EVAL(ac_compile); then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in + yes*) LD="${LD-ld} -m elf64_sparc" ;; + *) LD="${LD-ld} -64" ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], [*-*-cygwin* | *-*-mingw* | *-*-pw32*) AC_CHECK_TOOL(DLLTOOL, dlltool, false) @@ -1772,7 +1835,7 @@ # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -1782,8 +1845,10 @@ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings - if test ! -s conftest.err; then + # So say no if there are warnings other than the usual output. + $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp + $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 + if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then $2=yes fi fi @@ -1809,11 +1874,16 @@ LDFLAGS="$LDFLAGS $3" printf "$lt_simple_link_test_code" > conftest.$ac_ext if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then - # The compiler can only warn and ignore the option if not recognized + # The linker can only warn and ignore the option if not recognized # So say no if there are warnings if test -s conftest.err; then # Append any errors to the config.log. cat conftest.err 1>&AS_MESSAGE_LOG_FD [...25986 lines suppressed...] diff -uhrN WindowMaker-0.92.0/wrlib/tests/Makefile.in WindowMaker-CVS-20060123/wrlib/tests/Makefile.in --- WindowMaker-0.92.0/wrlib/tests/Makefile.in 2005-06-19 05:23:01.000000000 +0200 +++ WindowMaker-CVS-20060123/wrlib/tests/Makefile.in 2006-01-22 21:33:54.000000000 +0100 @@ -118,7 +118,7 @@ EXTRA_DIST = test.png tile.xpm ballot_box.xpm -INCLUDES = -I.. $(DFLAGS) @HEADER_SEARCH_PATH@ +INCLUDES = -I$(srcdir)/.. $(DFLAGS) @HEADER_SEARCH_PATH@ LIBLIST = $(top_builddir)/wrlib/libwraster.la diff -uhrN WindowMaker-0.92.0/wrlib/x86_specific.c WindowMaker-CVS-20060123/wrlib/x86_specific.c --- WindowMaker-0.92.0/wrlib/x86_specific.c 2004-10-31 02:44:01.000000000 +0100 +++ WindowMaker-CVS-20060123/wrlib/x86_specific.c 2005-08-23 00:05:43.000000000 +0200 @@ -85,9 +85,9 @@ unsigned short *ximage, short *err, short *nerr, - short *rtable, - short *gtable, - short *btable, + unsigned short *rtable, + unsigned short *gtable, + unsigned short *btable, int dr, int dg, int db, @@ -98,15 +98,27 @@ int height, int line_offset) { - long long rrggbbaa; - long long pixel; + union { + long long rrggbbaa; + struct { + short int rr, gg, bb, aa; + } words; + } rrggbbaa; + + union { + long long pixel; + struct { + short int rr, gg, bb, aa; + } words; + } pixel; + short *tmp_err; short *tmp_nerr; int x; asm volatile ( - "pushal \n\t" + "pushl %%ebx \n\t" // pack dr, dg and db into mm6 "movl %7, %%eax \n\t" @@ -219,7 +231,7 @@ "movq %%mm0, %%mm1 \n\t" "pmullw %%mm5, %%mm1 \n\t" // mm1 = mm1*7 "psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16 - "paddw 8(%%ebx), %%mm1 \n\t" + "paddw 8(%%ebx), %%mm1 \n\t" "movq %%mm1, 8(%%ebx) \n\t" // err[x+1,y] = rer*7/16 @@ -228,7 +240,7 @@ "movq %%mm0, %%mm1 \n\t" "pmullw %%mm4, %%mm1 \n\t" // mm1 = mm1*5 "psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16 - "paddw -8(%%ebx), %%mm1 \n\t" + "paddw -8(%%ebx), %%mm1 \n\t" "movq %%mm1, -8(%%ebx) \n\t" // err[x-1,y+1] += rer*3/16 "movq %%mm0, %%mm1 \n\t" @@ -274,7 +286,7 @@ // because, punpcklbw is used (which reads 8 bytes) and the last // pixel is only 4 bytes. This is no problem because the image data // was allocated with extra 4 bytes when created. - "addl $4, %%esi \n\t" // image->data += 4 + "addl $4, %%esi \n\t" // image->data += 4 "decl %26 \n\t" // x-- @@ -290,7 +302,7 @@ ".Enda: \n\t" // THE END "emms \n\t" - "popal \n\t" + "popl %%ebx \n\t" : : "m" (image), // %0 @@ -309,17 +321,18 @@ "m" (width), // %13 "m" (height), // %14 "m" (line_offset), // %15 - "m" (rrggbbaa), // %16 (access to rr) - "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) - "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) - "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) - "m" (pixel), // %20 (access to pixel.r) - "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) - "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) - "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) + "m" (rrggbbaa.words.rr), // %16 (access to rr) + "m" (rrggbbaa.words.gg), // %17 (access to gg) + "m" (rrggbbaa.words.bb), // %18 (access to bb) + "m" (rrggbbaa.words.aa), // %19 (access to aa) + "m" (pixel.words.rr), // %20 (access to pixel.r) + "m" (pixel.words.gg), // %21 (access to pixel.g) + "m" (pixel.words.bb), // %22 (access to pixel.b) + "m" (pixel.words.aa), // %23 (access to pixel.a) "m" (tmp_err), // %24 "m" (tmp_nerr), // %25 "m" (x) // %26 + : "eax", "ecx", "edx", "esi", "edi" ); } @@ -342,8 +355,19 @@ int height, int line_offset) { - long long rrggbbaa; - long long pixel; + union { + long long rrggbbaa; + struct { + short int rr, gg, bb, aa; + } words; + } rrggbbaa; + + union { + long long pixel; + struct { + short int rr, gg, bb, aa; + } words; + } pixel; short *tmp_err; short *tmp_nerr; @@ -354,7 +378,7 @@ asm volatile ( - "pushal \n\t" + "pushl %%ebx \n\t" "movl %13, %%eax \n\t" // eax = width "movl %%eax, %%ebx \n\t" @@ -424,7 +448,7 @@ ".Endc: \n\t" // THE END "emms \n\t" - "popal \n\t" + "popl %%ebx \n\t" : : "m" (image), // %0 @@ -443,19 +467,20 @@ "m" (width), // %13 "m" (height), // %14 "m" (line_offset), // %15 - "m" (rrggbbaa), // %16 (access to rr) - "m" ((*((short*)(&rrggbbaa)+1))), // %17 (access to gg) - "m" ((*((short*)(&rrggbbaa)+2))), // %18 (access to bb) - "m" ((*((short*)(&rrggbbaa)+3))), // %19 (access to aa) - "m" (pixel), // %20 (access to pixel.r) - "m" ((*((short*)(&pixel)+1))), // %21 (access to pixel.g) - "m" ((*((short*)(&pixel)+2))), // %22 (access to pixel.b) - "m" ((*((short*)(&pixel)+3))), // %23 (access to pixel.a) + "m" (rrggbbaa.words.rr), // %16 (access to rr) + "m" (rrggbbaa.words.gg), // %17 (access to gg) + "m" (rrggbbaa.words.bb), // %18 (access to bb) + "m" (rrggbbaa.words.aa), // %19 (access to aa) + "m" (pixel.words.rr), // %20 (access to pixel.r) + "m" (pixel.words.gg), // %21 (access to pixel.g) + "m" (pixel.words.bb), // %22 (access to pixel.b) + "m" (pixel.words.aa), // %23 (access to pixel.a) "m" (tmp_err), // %24 "m" (tmp_nerr), // %25 "m" (x), // %26 "m" (w1), // %27 "m" (w2) // %28 + : "eax", "ecx", "edx", "esi", "edi" ); } @@ -653,7 +678,7 @@ "movw $0xff, %%dx \n\t" // pixel.blu > 255 "jmp .OKBb \n" ".NEGBb: \n\t" - "xorw %%dx, %%dx \n" + "xorw %%dx, %%dx \n" ".OKBb: \n\t" //partial reg "leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.blu] --- NEW FILE WindowMaker-README.newbuttons --- INSTALLATIONS Heres what you do, real simple like. On your favorite console/term, Repeat after me: cp *.xpm to YourWM-0.80.0Source/WPrefs.app/xpm cp *.tiff to YourWM-0.80.0Source/WPrefs.app/tiff cd YouWM-0.80.0Source patch -p1 < Path/To/Patch/newbuttons.patch then ./configure make make install And Restart WindowMaker You should now have three buttons in WPrefs.App->Other Confiugrations->Titlebar Style CREDITS May 2, 2002 Originally the patch was written by TDF (The Dixie Flatline) on Efnet and given to ]d for the fun patch It can be found at ftp://ftp.windowmaker.org/pub/source/patches/unsupported/id/ Carlos Torres aka vlaad (vlaadbrain at operamail.com) modified it for WindowMaker 0.80.0 and Todd Goyen aka wettoad (wettoad at knighthoodofbuh.org) fixed it so that it didn't screw the other two titlebar styles Now you can have all three w00t! WindowMaker-gcc41.patch: --- NEW FILE WindowMaker-gcc41.patch --- --- src/wmspec.c.orig 2006-02-28 00:53:02.000000000 +0100 +++ src/wmspec.c 2006-03-02 14:59:07.000000000 +0100 @@ -827,19 +827,27 @@ updateWorkspaceNames(WScreen *scr) { char buf[1024], *pos; - unsigned int i, len, curr_size; - - pos = buf; + unsigned int i, len, curr_size; len = 0; + + pos = memset(buf,'\0',sizeof(buf)); + for(i = 0; i < scr->workspace_count; i++) { - curr_size = strlen(scr->workspaces[i]->name); - strcpy(pos, scr->workspaces[i]->name); - pos += (curr_size+1); + + curr_size = strlen(scr->workspaces[i]->name); + + if(len + curr_size + 1 > sizeof(buf)) { + break; + } + + strncpy(pos, scr->workspaces[i]->name,sizeof(buf) - len); + + pos += (curr_size+1); len += (curr_size+1); } XChangeProperty(dpy, scr->root_win, net_desktop_names, utf8_string, 8, - PropModeReplace, (unsigned char *)buf, len); + PropModeReplace, (unsigned char *)buf, strlen(buf)); } --- NEW FILE WindowMaker-newbuttons.nextstyle.xpm --- /* XPM */ static char * nextstyle_xpm[] = { "37 33 84 1", " c None", ". c #747474", "+ c #757575", "@ c #000000", "# c #222222", "$ c #262626", "% c #282828", "& c #080808", "* c #FFFFFF", "= c #FFFAFF", "- c #FFFFF6", "; c #F6F6F6", "> c #F6F2F6", ", c #EEEEEE", "' c #B4B6B4", ") c #8B8D94", "! c #DEE6E6", "~ c #E6E6EE", "{ c #CDD2CD", "] c #A4A1A4", "^ c #313431", "/ c #94918B", "( c #EEF6F6", "_ c #292829", ": c #C5CACD", "< c #E6E6E6", "[ c #A4A5AC", "} c #414039", "| c #948D8B", "1 c #8B8D8B", "2 c #292C29", "3 c #D5D6D5", "4 c #B4BAB4", "5 c #313029", "6 c #DEDADE", "7 c #A4A5A4", "8 c #8B898B", "9 c #F6FAFF", "0 c #F6FFFF", "a c #DEDEDE", "b c #181818", "c c #E6EAE6", "d c #C5C6C5", "e c #8B8983", "f c #EEF2F6", "g c #EEEEF6", "h c #101010", "i c #201818", "j c #838183", "k c #838983", "l c #949594", "m c #202420", "n c #CDCECD", "o c #BDBABD", "p c #202018", "q c #736D73", "r c #6A7573", "s c #83817B", "t c #B4B2B4", "u c #202829", "v c #C5C2C5", "w c #201C18", "x c #5A5552", "y c #7B757B", "z c #393C41", "A c #CDD2D5", "B c #D5D2D5", "C c #9CA1A4", "D c #BDBAB4", "E c #8B8583", "F c #6A6D6A", "G c #949994", "H c #A4AAAC", "I c #94999C", "J c #94958B", "K c #94898B", "L c #83818B", "M c #73756A", "N c #837D83", "O c #060606", "P c #070707", "Q c #030303", "R c #ABABAB", "S c #535353", "..................+++++++...........@", "##################$$$$$$$%$%$$$$$$$$@", "##################$$$$$$$$%%%%%%%%%%@", "###################################%@", "###################################%&", "####################@@@@@@@@@@@@*%%%&", "####################@=****-;>,'@*%%%&", "####################@*)!=;~{]^/@*%%%&", "####################@*(_:><[}|1@*%%%&", "####################@**:2345678@*%%%&", "####################@*90ab_cd/e@*%%%&", "####################@9fg3hid7jk@*%%%&", "####################@;almnopqrs@*%%%&", "####################@>tuva67wxy@*%%%&", "####################@,zABClDEbF@*%%%&", "####################@'GHIJKeLMN@*%%%&", "####################@@@@@@@@@@@@*%%%&", "####################*************%%%&", "##################$$$$$$$$$%%%%%%%%%&", "##################$$$$$$$%$%%%%%%%%%&", "OOOOOOOOOOOOOOOOOOPPPPPPPPPPPPP&&&&&Q", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", "RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRR@", "SSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSSS*RR@", "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@R*RR@", "********************************R*RR@", "********************************R*RR@", "********************************R*RR@", "********************************R*RR@", "********************************R*RR@"}; --- NEW FILE WindowMaker-uk.po --- msgid "" msgstr "" "Project-Id-Version: WindowMaker 0.80.1\n" "POT-Creation-Date: 2002-02-15 15:50+0200\n" "PO-Revision-Date: 2005-09-06 08:56+0300\n" "Last-Translator: Victor Forsyuk \n" "Language-Team: KSI Linux Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-u\n" "Content-Transfer-Encoding: 8bit\n" #: ../src/appicon.c:426 ../src/dialog.c:282 ../src/dock.c:3325 #: ../src/dockedapp.c:230 ../src/main.c:273 ../src/rootmenu.c:1853 #: ../src/winspector.c:389 ../src/winspector.c:406 msgid "Error" msgstr "???????" #: ../src/appicon.c:427 msgid "Could not open specified icon file" msgstr "????????? ???????? ???????? ???? ??????" #: ../src/appicon.c:428 ../src/dialog.c:179 ../src/dialog.c:282 #: ../src/dialog.c:729 ../src/dialog.c:1818 ../src/dock.c:526 #: ../src/dock.c:534 ../src/dock.c:558 ../src/dock.c:3326 #: ../src/dockedapp.c:231 ../src/dockedapp.c:426 ../src/main.c:273 #: ../src/rootmenu.c:1857 ../src/winspector.c:390 ../src/winspector.c:407 msgid "OK" msgstr "OK" #: ../src/appicon.c:456 ../src/dock.c:264 msgid "" " will be forcibly closed.\n" "Any unsaved changes will be lost.\n" "Please confirm." msgstr "" " ????????? ???????????.\n" "??? ??????????? ????? ?????? ????????.\n" "???? ?????, ???????????." # #: ../src/appicon.c:464 ../src/dock.c:283 ../src/winmenu.c:125 msgid "Kill Application" msgstr "????????? ??????????" #: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:127 msgid "Yes" msgstr "???" #: ../src/appicon.c:465 ../src/dock.c:284 ../src/winmenu.c:127 msgid "No" msgstr "??" #: ../src/appicon.c:495 ../src/dock.c:1177 ../src/dock.c:3491 msgid "Unhide Here" msgstr "???????? ???" #: ../src/appicon.c:496 ../src/appicon.c:521 ../src/dock.c:1179 #: ../src/dock.c:1181 ../src/dock.c:3503 ../src/winmenu.c:465 msgid "Hide" msgstr "?????????" #: ../src/appicon.c:497 msgid "Set Icon..." msgstr "?????????? ??????..." #: ../src/appicon.c:498 ../src/dock.c:1185 ../src/rootmenu.c:248 #: ../src/rootmenu.c:264 ../src/winmenu.c:520 msgid "Kill" msgstr "?????" #: ../src/appicon.c:519 ../src/dock.c:3501 msgid "Unhide" msgstr "????????" #: ../src/application.c:398 #, c-format msgid "recreating missing icon '%s'" msgstr "" #: ../src/defaults.c:922 ../src/defaults.c:1011 #, c-format msgid "Domain %s (%s) of global defaults database is corrupted!" msgstr "????? %s (%s) ? ?????????? ???? ???????? ???????????!" #: ../src/defaults.c:927 #, c-format msgid "could not load domain %s from global defaults database" msgstr "?? ??????? ??????????? ????? %s ? ?????????? ???? ????????" #: ../src/defaults.c:949 ../src/startup.c:884 ../src/startup.c:902 #: ../src/startup.c:908 #, c-format msgid "could not read domain \"%s\" from defaults database" msgstr "?? ??????? ????????? ????? \"%s\" ? ???? ????? ????????" #: ../src/defaults.c:995 ../src/defaults.c:1099 ../src/defaults.c:1140 #: ../src/defaults.c:1196 #, c-format msgid "Domain %s (%s) of defaults database is corrupted!" msgstr "????? %s (%s) ? ???? ????? ???????? ???????????!" #: ../src/defaults.c:1000 ../src/defaults.c:1119 ../src/defaults.c:1176 #: ../src/defaults.c:1205 ../src/menureader.c:397 #, c-format msgid "could not load domain %s from user defaults database" msgstr "?? ??????? ??????????? ????? \"%s\" ? ???? ???????? ???????????" #: ../src/defaults.c:1030 #, c-format msgid "could not load domain %s from global defaults database (%s)" msgstr "?? ??????? ??????????? ????? %s ? ?????????? ???? ???????? (%s)" #: ../src/defaults.c:1166 ../src/screen.c:458 #, c-format msgid "could not load logo image for panels: %s" msgstr "?? ??????? ??????????? ???????? ??? ???????: %s" #: ../src/defaults.c:1447 #, c-format msgid "wrong option value for key \"%s\". Should be one of %s" msgstr "??????????? ???????? ??? ????? \"%s\". ??? ???? ???? ? %s." #: ../src/defaults.c:1492 #, c-format msgid "can't convert \"%s\" to boolean for key \"%s\"" msgstr "?? ??????? ??????????? \"%s\" ? ????????? ???????? ??? ????? \"%s\"" #: ../src/defaults.c:1497 ../src/defaults.c:1529 ../src/defaults.c:1561 #: ../src/defaults.c:1574 ../src/defaults.c:1589 ../src/defaults.c:1603 #: ../src/defaults.c:1673 ../src/defaults.c:1685 ../src/defaults.c:2152 #: ../src/defaults.c:2169 ../src/defaults.c:2182 ../src/defaults.c:2214 #: ../src/defaults.c:2230 ../src/defaults.c:2261 ../src/defaults.c:2348 #: ../src/defaults.c:2734 ../src/defaults.c:2745 #, c-format msgid "using default \"%s\" instead" msgstr "?????????????? ???????? ?? ?????????? (%s)" #: ../src/defaults.c:1526 #, c-format msgid "can't convert \"%s\" to integer for key \"%s\"" msgstr "????????? ??????????? \"%s\" ? ???? ???????? ??? ????? \"%s\"" #: ../src/defaults.c:1556 ../src/defaults.c:1668 ../src/defaults.c:2147 #: ../src/defaults.c:2164 ../src/defaults.c:2209 ../src/defaults.c:2256 #: ../src/defaults.c:2729 ../src/wdefaults.c:571 ../src/wdefaults.c:607 #, c-format msgid "Wrong option format for key \"%s\". Should be %s." msgstr "???????????? ?????? ????????? ??? ????? \"%s\". ??? ???? %s." #: ../src/defaults.c:1569 #, c-format msgid "Incorrect number of elements in array for key \"%s\"." msgstr "?????????? ????????? ????????? ? ?????? ??? ????? \"%s\"." #: ../src/defaults.c:1584 #, c-format msgid "Wrong value for key \"%s\". Should be Coordinate." msgstr "??????????? ???????? ????????? ??? ????? \"%s\". ??? ???? Coordinate." #: ../src/defaults.c:1599 #, c-format msgid "can't convert array to integers for \"%s\"." msgstr "?? ??????? ??????????? ????? ? ???? ???????? ??? \"%s\"." #: ../src/defaults.c:1797 ../src/defaults.c:1829 ../src/defaults.c:1845 #: ../src/defaults.c:1874 ../src/defaults.c:1897 ../src/defaults.c:1950 #: ../src/defaults.c:1990 ../src/defaults.c:2028 ../src/defaults.c:2044 #, c-format msgid "\"%s\" is not a valid color name" msgstr "\"%s\" ?? ? ??????? ?????? ???????" #: ../src/defaults.c:1810 ../src/defaults.c:1862 msgid "bad number of arguments in gradient specification" msgstr "??????????? ????????? ?????????? ? ?????????? ?????????" #: ../src/defaults.c:1923 msgid "too few arguments in multicolor gradient specification" msgstr "????? ???? ?????????? ? ?????????? ??????????????? ?????????" #: ../src/defaults.c:2017 msgid "bad number of arguments in textured gradient specification" msgstr "??????????? ????????? ?????????? ? ?????????? ????????? ? ?????????" #: ../src/defaults.c:2060 #, c-format msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]" msgstr "" "??????????? ???????? ?????????? ??? t-????????? ? ????????? \"%s\"; ??? ???? " "[0..255]" #: ../src/defaults.c:2120 #, c-format msgid "could not initialize library %s" msgstr "?? ??????? ?????????????? ?????????? %s" #: ../src/defaults.c:2123 #, c-format msgid "could not find function %s::%s" msgstr "?? ??????? ?????? ??????? %s::%s" #: ../src/defaults.c:2130 #, c-format msgid "invalid texture type %s" msgstr "???????????? ??? ???????? (%s)" #: ../src/defaults.c:2177 #, c-format msgid "Error in texture specification for key \"%s\"" msgstr "??????? ? ?????????? ???????? ??? ????? \"%s\"" #: ../src/defaults.c:2226 msgid "Wrong type for workspace background. Should be a texture type." msgstr "" "???????????? ??? ??? ???? ???????? ?????; ??? ???? ???????? ???? " "\"????????\"." #: ../src/defaults.c:2274 #, c-format msgid "Wrong type for background of workspace %i. Should be a texture." msgstr "" "???????????? ??? ??? ???? ???????? ????? %i; ??? ???? ???????? ???? " "\"????????\"." #: ../src/defaults.c:2316 msgid "could not load any usable font!!!" msgstr "?? ??????? ??????????? ?????!!!" #: ../src/defaults.c:2343 #, c-format msgid "could not get color for key \"%s\"" msgstr "?? ??????? ????????? ????? ??? ????? \"%s\"" #: ../src/defaults.c:2401 ../src/rootmenu.c:526 #, c-format msgid "%s:invalid key modifier \"%s\"" msgstr "%s:???????????? ??????????? ??????? \"%s\"" # #: ../src/defaults.c:2413 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\"" msgstr "%s:??????????? ?????????? ?????????? ?????? \"%s\"" # #: ../src/defaults.c:2420 #, c-format msgid "%s:invalid key in shortcut \"%s\"" msgstr "%s:??????????? ??????? ? ?????????? \"%s\"" #: ../src/defaults.c:2445 #, c-format msgid "%s: modifier key %s is not valid" msgstr "%s: ??????????? %s ????????????" #: ../src/defaults.c:2477 #, c-format msgid "could not load image in option %s: %s" msgstr "?? ??????? ??????????? ?????????? ??? ????????? %s: %s" # #: ../src/defaults.c:2594 #, c-format msgid "failed to open bitmap file \"%s\"" msgstr "?? ??????? ???????? ????????? ???? \"%s\"" #: ../src/defaults.c:2597 #, c-format msgid "\"%s\" is not a valid bitmap file" msgstr "\"%s\" ?? ? ????????? ????????? ??????" #: ../src/defaults.c:2600 #, c-format msgid "out of memory reading bitmap file \"%s\"" msgstr "????????? ???'??? ??? ??? ??????? ?????????? ????? \"%s\"" #: ../src/defaults.c:2639 ../src/defaults.c:2672 msgid "bad number of arguments in cursor specification" msgstr "??????????? ????????? ?????????? ? ?????????? ???????" #: ../src/defaults.c:2655 #, c-format msgid "unknown builtin cursor name \"%s\"" msgstr "" #: ../src/defaults.c:2682 ../src/defaults.c:2694 #, c-format msgid "could not find cursor bitmap file \"%s\"" msgstr "?? ??????? ?????? ????????? ???? ??????? \"%s\"" #: ../src/defaults.c:2741 #, c-format msgid "Error in cursor specification for key \"%s\"" msgstr "??????? ? ?????????? ??????? ??? ????? \"%s\"" #: ../src/defaults.c:2826 msgid "could not render texture for icon background" msgstr "?? ??????? ??????????? ???????? ??? ???? ??????" # #: ../src/dialog.c:135 msgid "Save workspace state" msgstr "???????? ???? ???????? ?????" #: ../src/dialog.c:179 ../src/dialog.c:736 ../src/dock.c:558 #: ../src/dockedapp.c:431 ../src/rootmenu.c:198 ../src/rootmenu.c:248 #: ../src/rootmenu.c:264 msgid "Cancel" msgstr "???????" # #: ../src/dialog.c:277 msgid "Could not open directory " msgstr "????????? ???????? ??????? " #: ../src/dialog.c:332 msgid "Could not load image file " msgstr "????????? ??????????? ???? ?????????? " #: ../src/dialog.c:663 msgid "Directories" msgstr "????????" #: ../src/dialog.c:672 msgid "Icons" msgstr "??????" #: ../src/dialog.c:705 msgid "Preview" msgstr "" # #: ../src/dialog.c:718 msgid "File Name:" msgstr "??'? ?????:" #: ../src/dialog.c:742 msgid "Choose File" msgstr "???????? ????" #: ../src/dialog.c:760 ../src/dialog.c:762 msgid "Icon Chooser" msgstr "????? ??????" #: ../src/dialog.c:1241 ../src/dialog.c:1351 #, c-format msgid "Version %s" msgstr "?????? %s" #: ../src/dialog.c:1348 msgid "Window Manager for X" msgstr "???????? ????? ??? X" #: ../src/dialog.c:1373 #, c-format msgid "Using visual 0x%x: %s %ibpp " msgstr "" #: ../src/dialog.c:1381 msgid "(32 thousand colors)\n" msgstr "(32 ?????? ????????)\n" #: ../src/dialog.c:1384 msgid "(64 thousand colors)\n" msgstr "(64 ?????? ????????)\n" #: ../src/dialog.c:1388 msgid "(16 million colors)\n" msgstr "(16 ????????? ????????)\n" #: ../src/dialog.c:1391 #, c-format msgid "(%d colors)\n" msgstr "(%d ????????)\n" #: ../src/dialog.c:1401 #, c-format msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n" msgstr "?????? ???????? ???'???: %i kB. ?????? ??????????? ???'???: %i kB.\n" #: ../src/dialog.c:1408 msgid "Supported image formats: " msgstr "????????????? ??????? ?????????: " #: ../src/dialog.c:1415 msgid "" "\n" "Additional support for: " msgstr "" "\n" "????????? ????????? ???: " #: ../src/dialog.c:1438 msgid " and " msgstr " ?? " #: ../src/dialog.c:1448 msgid "" "\n" "Sound disabled" msgstr "" "\n" "????????? ????? ????????" #: ../src/dialog.c:1450 msgid "" "\n" "Sound enabled" msgstr "" "\n" "????????? ????? ?????????" #: ../src/dialog.c:1476 msgid "Info" msgstr "??????????" #: ../src/dialog.c:1499 msgid "Merry Christmas!" msgstr "????????? ??????!" #: ../src/dialog.c:1569 msgid "" " Window Maker is free software; you can redistribute it and/or\n" "modify it under the terms of the GNU General Public License as\n" "published by the Free Software Foundation; either version 2 of the\n" "License, or (at your option) any later version.\n" "\n" " Window Maker is distributed in the hope that it will be useful,\n" "but WITHOUT ANY WARRANTY; without even the implied warranty\n" "of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "See the GNU General Public License for more details.\n" "\n" " You should have received a copy of the GNU General Public\n" "License along with this program; if not, write to the Free Software\n" "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA\n" "02111-1307, USA." msgstr "" " Window Maker ? ??????? ?????????? ?????????????; ?? ??????\n" "??????????????? ??/??? ???????????? ???? ? ????????????? ? ???????\n" "???????? GNU General Public License (GPL) ????????????? ????????????\n" "Free Software Foundation; ?????? 2 ???? ????????, ?? (?? ??? ?????)\n" "????-???? ????????? ??????.\n" "\n" " Window Maker ???????????????? ? ?????? ?? ??, ?? ??? ????\n" "????????, ??? ??? ????-???? ????????; ?????? ??? ??????? ????????\n" "??????????? ???????? ?? ??????????? ??? ??????? ????????????.\n" "???????? GNU General Public License ?? ?????????? ???????????.\n" "\n" " ?? ???? ???????? ????? GNU General Public License ????? ? ????\n" "?????????; ???? ?? - ???????? ?? Free Software Foundation, Inc.,\n" "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." #: ../src/dialog.c:1590 msgid "Legal" msgstr "??????? ??????????" #: ../src/dialog.c:1741 ../src/startup.c:394 msgid "cannot open connection for crashing dialog panel. Aborting." msgstr "" "?? ??????? ???????? ?'??????? ??? ?????? ?????????? ???????. ?????????? " "??????." #: ../src/dialog.c:1767 msgid "Fatal error" msgstr "???????? ???????" #: ../src/dialog.c:1778 #, c-format msgid "" "Window Maker received signal %i\n" "(%s)." msgstr "" "Window Maker: ???????? ?????? %i\n" "(%s)." #: ../src/dialog.c:1781 #, c-format msgid "Window Maker received signal %i." msgstr "Window Maker: ???????? ?????? %i." #: ../src/dialog.c:1790 msgid "" " This fatal error occured probably due to a bug. Please fill the included " "BUGFORM and report it to bugs at windowmaker.org." msgstr "" " ?? ???????? ???????, ???????, ? ??????????? ??????? ? ????????. ???? ?????, " "????????? ????? BUGFORM ? ????????? ?? ?? ??????? bugs at windowmaker.org." #: ../src/dialog.c:1799 msgid "What do you want to do now?" msgstr "?? ???????" #: ../src/dialog.c:1805 msgid "Select action" msgstr "???????? ???" #: ../src/dialog.c:1806 msgid "Abort and leave a core file" msgstr "????????? ??????, ????????? ???? core" #: ../src/dialog.c:1807 msgid "Restart Window Maker" msgstr "????????????? Window Maker" #: ../src/dialog.c:1808 msgid "Start alternate window manager" msgstr "????????? ?????????????? ???????? ?????" #: ../src/dialog.c:1986 msgid "" "Window Maker is part of the GNUstep project.\n" "The GNUstep project aims to create a free\n" "implementation of the OpenStep(tm) specification\n" "which is a object-oriented framework for\n" "creating advanced graphical, multi-platform\n" "applications. Additionally, a development and\n" "user desktop enviroment will be created on top\n" "of the framework. For more information about\n" "GNUstep, please visit: www.gnustep.org" msgstr "" "Window Maker - ?? ??????? ??????? GNUstep.\n" "?????? GNUstep ??? ?? ???? ???????? ??????\n" "?????????? ???????????? OpenStep(tm), ??? ?\n" "??'?????-???????????? ??????? ??? ?????????\n" "????????????? ????????? ?????????? ??? ?????????\n" "?????????? ???????. ?? ??? ?????? ???? ????????\n" "?????????? ???????? ?? ?????????? ???????? ?????\n" "???????????. ?? ??????????? ??????????? ????\n" "GNUstep, ???? ?????, ??????????: www.gnustep.org" #: ../src/dialog.c:2006 msgid "About GNUstep" msgstr "??? GNUstep" #: ../src/dock.c:213 #, c-format msgid "Type the name for workspace %i:" msgstr "??????? ??'? ??? %i-?? ???????? ?????:" # #: ../src/dock.c:214 ../src/dock.c:1141 ../src/dock.c:1144 ../src/dock.c:3409 msgid "Rename Workspace" msgstr "????????????? ????" #: ../src/dock.c:520 ../src/dock.c:528 msgid "Warning" msgstr "????????????" #: ../src/dock.c:521 msgid "" "Some icons cannot be made omnipresent. Please make sure that no other icon " "is docked in the same positions on the other workspaces and the Clip is not " "full in some workspace." msgstr "" "????? ?????? ????????? ??????? ?????????? ?? ???? ??????? ??????. " "??????????, ?? ?? ??? ?? ??????? ?? ????? ??????? ?????? ?? ??????????? ???? " "?????? ? ?? ? ??????? ? ????? ??? ????? ?????? ?? ???? ??????? ??????." #: ../src/dock.c:529 msgid "" "Icon cannot be made omnipresent. Please make sure that no other icon is " "docked in the same position on the other workspaces and the Clip is not full " "in some workspace." msgstr "" "?????? ????????? ??????? ?????????? ?? ???? ??????? ??????. ??????????, ?? " "?? ??? ?? ??????? ?? ????? ??????? ?????? ?? ??????????? ???? ?????? ? ?? ? " "??????? ? ????? ??? ????? ?????? ?? ???? ??????? ??????." #: ../src/dock.c:556 msgid "Workspace Clip" msgstr "??????? ???????? ?????" #: ../src/dock.c:557 msgid "All selected icons will be removed!" msgstr "??? ??????? ?????? ?????? ????????!" #: ../src/dock.c:608 ../src/dock.c:1156 ../src/dock.c:1158 ../src/dock.c:3445 msgid "Keep Icon" msgstr "?????????? ??????" # #: ../src/dock.c:609 ../src/dock.c:2137 ../src/dock.c:2278 msgid "Type the command used to launch the application" msgstr "??????? ???????, ?? ???????????????? ??? ??????? ????????" # #: ../src/dock.c:965 #, c-format msgid "could not launch application %s\n" msgstr "?? ??????? ????????? ???????? %s\n" #: ../src/dock.c:1020 msgid "could not create workspace submenu for Clip menu" msgstr "?? ??????? ???????? ??????? ??????? ????? ??? ???? ???????" #: ../src/dock.c:1078 msgid "could not create options submenu for Clip menu" msgstr "?? ??????? ???????? ??????? ?????????? ??? ???? ???????" #: ../src/dock.c:1082 ../src/dock.c:1130 msgid "Keep on Top" msgstr "?????? ?? ?????" #: ../src/dock.c:1088 msgid "Collapsed" msgstr "????????" #: ../src/dock.c:1094 msgid "Autocollapse" msgstr "????????????" #: ../src/dock.c:1100 msgid "Autoraise" msgstr "?????????????" #: ../src/dock.c:1106 msgid "Autoattract Icons" msgstr "????????????? ??????" #: ../src/dock.c:1136 msgid "Clip Options" msgstr "????????? ???????" #: ../src/dock.c:1146 msgid "Selected" msgstr "???????" #: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3436 msgid "Select All Icons" msgstr "????? ???? ??????" #: ../src/dock.c:1160 ../src/dock.c:1162 ../src/dock.c:3453 msgid "Move Icon To" msgstr "??????????? ?????? ??..." #: ../src/dock.c:1167 ../src/dock.c:1170 ../src/dock.c:3464 msgid "Remove Icon" msgstr "???????? ??????" #: ../src/dock.c:1172 msgid "Attract Icons" msgstr "????????? ??????" #: ../src/dock.c:1175 msgid "Launch" msgstr "??????" #: ../src/dock.c:1183 msgid "Settings..." msgstr "?????????..." #: ../src/dock.c:1548 ../src/dock.c:1655 #, c-format msgid "bad value in docked icon state info %s" msgstr "????????? ???????? ? ????? ???????????? ?????? -- %s" #: ../src/dock.c:1663 #, c-format msgid "bad value in docked icon position %i,%i" msgstr "????????? ???????? ? ??????? ???????????? ?????? %i,%i" #: ../src/dock.c:1919 msgid "there are too many icons stored in dock. Ignoring what doesn't fit" msgstr "??????????? ????? ?????? ??????. ????? ?????? ?????????????" #. icon->forced_dock = 1; #: ../src/dock.c:2136 ../src/dock.c:2277 msgid "Dock Icon" msgstr "?????? ????" #: ../src/dock.c:3323 #, c-format msgid "Could not execute command \"%s\"" msgstr "????????? ???????? ??????? \"%s\"" #: ../src/dock.c:3415 msgid "Toggle Omnipresent" msgstr "??????????? ?? ???? ??????" #: ../src/dock.c:3420 ../src/kwm.c:637 ../src/winmenu.c:418 #: ../src/winspector.c:1377 msgid "Omnipresent" msgstr "?? ???? ??????" #: ../src/dock.c:3434 msgid "Unselect All Icons" msgstr "?????? ?????? ???? ??????" #: ../src/dock.c:3443 msgid "Keep Icons" msgstr "?????????? ??????" #: ../src/dock.c:3451 msgid "Move Icons To" msgstr "??????????? ?????? ??..." #: ../src/dock.c:3462 msgid "Remove Icons" msgstr "???????? ??????" #: ../src/dock.c:3493 ../src/kwm.c:643 msgid "Bring Here" msgstr "???????? ????" #: ../src/dockedapp.c:149 #, c-format msgid "could not find icon %s, used in a docked application" msgstr "?? ??????? ?????? ?????? %s, ??????????? ? ?????????????? ????????" # #: ../src/dockedapp.c:229 #, c-format msgid "Could not open specified icon file: %s" msgstr "?? ??????? ???????? ???????? ???? ??????: %s" #: ../src/dockedapp.c:231 msgid "Ignore" msgstr "??????????" #: ../src/dockedapp.c:333 msgid "Start when Window Maker is started" msgstr "????????? ??? ??????? WindowMaker'?" #: ../src/dockedapp.c:340 msgid "Lock (prevent accidental removal)" msgstr "??????????? (??????????? ??????????? ?????????)" # #: ../src/dockedapp.c:344 msgid "Application path and arguments" msgstr "???? ?? ???????? ? ?????????" #: ../src/dockedapp.c:357 msgid "Command for middle-click launch" msgstr "??????? ??? ??????? ?? ???????? ?????? ????" #: ../src/dockedapp.c:371 #, c-format msgid "%s will be replaced with current selection" msgstr "%s ???? ???????? ?? ??????? ?????????" #: ../src/dockedapp.c:376 msgid "Command for files dropped with DND" msgstr "??????? ??? \"????????????\" ??????" #: ../src/dockedapp.c:390 #, c-format msgid "%d will be replaced with the file name" msgstr "%d ???? ???????? ?? ??'? ?????" #: ../src/dockedapp.c:394 msgid "DND support was not compiled in" msgstr "????????? ????????????? ????? ?? ???? ???????? ??? ??????????" #: ../src/dockedapp.c:399 msgid "Icon Image" msgstr "?????????? ??????" #: ../src/dockedapp.c:413 ../src/winspector.c:1515 msgid "Browse..." msgstr "???????..." # #: ../src/dockedapp.c:466 msgid "Docked Application Settings" msgstr "????????? ?????????????? ????????" #: ../src/framewin.c:649 ../src/framewin.c:744 ../src/menu.c:456 #: ../src/texture.c:594 #, c-format msgid "could not render texture: %s" msgstr "?? ??????? ??????????? ????????: %s" #: ../src/framewin.c:672 ../src/framewin.c:683 ../src/framewin.c:699 #: ../src/framewin.c:710 ../src/framewin.c:717 ../src/framewin.c:724 #: ../src/icon.c:350 ../src/menu.c:485 #, c-format msgid "error rendering image:%s" msgstr "??????? ??? ?????????? ??????????:%s" #: ../src/framewin.c:777 #, c-format msgid "error rendering image: %s" msgstr "??????? ??? ?????????? ??????????: %s" #: ../src/gnome.c:216 ../src/gnome.c:343 ../src/gnome.c:401 msgid "out of memory while updating GNOME hints" msgstr "????????? ???'??? ??? ????????? GNOME hints" #: ../src/icon.c:229 ../src/wdefaults.c:443 #, c-format msgid "error loading image file \"%s\"" msgstr "??????? ???????????? ????? ?????????? \"%s\"" # #: ../src/icon.c:491 ../src/icon.c:500 #, c-format msgid "could not create directory %s" msgstr "?? ??????? ???????? ??????? %s" #: ../src/icon.c:767 #, c-format msgid "could not find default icon \"%s\"" msgstr "?? ??????? ?????? ?????? ?? ?????????? \"%s\"" #: ../src/icon.c:773 #, c-format msgid "could not load default icon \"%s\":%s" msgstr "?? ??????? ??????????? ?????? ?? ?????????? \"%s\":%s" #. #. * Warning: If you make some change that affects the order of the #. * entries, you must update the command #defines in the top of #. * this file. #. #: ../src/kwm.c:633 ../src/winmenu.c:441 ../src/winmenu.c:583 msgid "Maximize" msgstr "?????????????" #: ../src/kwm.c:634 ../src/winmenu.c:578 msgid "Unmaximize" msgstr "???????????????" #: ../src/kwm.c:635 ../src/winmenu.c:449 ../src/winmenu.c:569 msgid "Miniaturize" msgstr "????????????" #: ../src/kwm.c:636 ../src/winmenu.c:564 msgid "Deminiaturize" msgstr "??????????????" #: ../src/kwm.c:638 msgid "Not Omnipresent" msgstr "?? ?? ???? ??????" #: ../src/kwm.c:639 msgid "Move" msgstr "???????????" #: ../src/kwm.c:640 msgid "Resize" msgstr "??????? ??????" #. #. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); #. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); #. #: ../src/kwm.c:641 ../src/rootmenu.c:248 ../src/winmenu.c:513 msgid "Close" msgstr "???????" #: ../src/kwm.c:642 ../src/winmenu.c:497 msgid "Move To" msgstr "??????????? ??..." #: ../src/kwm.c:1096 msgid "%a(Run Command,Type the command to run:)" msgstr "%a(????????? ???????,??????? ???????:)" #: ../src/main.c:222 msgid "failed to restart Window Maker." msgstr "?? ??????? ????????????? Window Maker." #: ../src/main.c:225 #, c-format msgid "could not exec %s" msgstr "?? ??????? ???????? %s" #: ../src/main.c:271 msgid "Could not execute command: " msgstr "????????? ???????? ???????: " #: ../src/main.c:428 #, c-format msgid "%s aborted.\n" msgstr "%s ?????????.\n" #: ../src/main.c:439 #, c-format msgid "Usage: %s [options]\n" msgstr "??????: %s [?????????]\n" #: ../src/main.c:440 msgid "The Window Maker window manager for the X window system" msgstr "???????? ????? Window Maker ??? ???????? ??????? X Window" #: ../src/main.c:442 msgid " -display host:dpy\tdisplay to use" msgstr " -display ????:???????\t??????????????? ???????? ???????" #: ../src/main.c:444 msgid " --no-cpp \t\tdisable preprocessing of configuration files" msgstr " --no-cpp \t\t?????????? ????????? ??????? ?????? ????????????" #: ../src/main.c:446 msgid " --no-dock\t\tdo not open the application Dock" msgstr " --no-dock\t\t?? ?????????? ??? ???????" #: ../src/main.c:447 msgid " --no-clip\t\tdo not open the workspace Clip" msgstr " --no-clip\t\t?? ?????????? ???????" # #: ../src/main.c:448 msgid " --no-autolaunch\tdo not autolaunch applications" msgstr " --no-autolaunch\t?? ?????????? ?????????? ???????" #: ../src/main.c:449 msgid " --dont-restore\t\tdo not restore saved session" msgstr " --dont-restore\t\t?? ???????????? ????????? ??????" #: ../src/main.c:451 msgid " --locale locale\tlocale to use" msgstr " --locale locale\t??????????????? ?????? locale" #: ../src/main.c:453 msgid "" " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals" msgstr "" " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals" #: ../src/main.c:454 msgid " --visual-id visualid\tvisual id of visual to use" msgstr "" " --visual-id visualid\t??????????????? ???????? ?????????? ???? ????????????" #: ../src/main.c:455 msgid " --static\t\tdo not update or save configurations" msgstr " --static\t\t?? ????????? ????????? ?? ?????????? ????????????" #: ../src/main.c:456 msgid " --no-polling\t\tdo not periodically check for configuration updates" msgstr " --no-polling\t\t?? ?????? ??????????? ????????? ???? ????????????" #: ../src/main.c:458 msgid " --synchronous\t\tturn on synchronous display mode" msgstr " --synchronous\t\t???????? ?????????? ????? ??????" #: ../src/main.c:460 msgid " --version\t\tprint version and exit" msgstr " --version\t\t??????? ????? ?????? ?? ?????" #: ../src/main.c:461 msgid " --help\t\t\tshow this message" msgstr " --help\t\t\t??????? ??? ?????" #: ../src/main.c:474 #, c-format msgid "" "could not find user GNUstep directory (%s).\n" "Make sure you have installed Window Maker correctly and run wmaker.inst" msgstr "" "?? ??????? ?????? ??????? GNUstep ??????????? (%s).\n" "??????????, ?? WindowMaker ??????????? ????????? ? ????????? wmaker.inst" # #: ../src/main.c:479 #, c-format msgid "could not find user GNUstep directory (%s)." msgstr "?? ??????? ?????? ??????? GNUstep ??????????? (%s)." #: ../src/main.c:482 msgid "" "There was an error while creating GNUstep directory, please make sure you " "have installed Window Maker correctly and run wmaker.inst" msgstr "" "??????? ??? ????????? ???????? GNUstep, ??????????, ?? WindowMaker " "??????????? ????????? ? ????????? wmaker.inst" #: ../src/main.c:485 #, c-format msgid "%s directory created with default configuration." msgstr "??????? %s ???????? ? ????????????? ?? ??????????." #: ../src/main.c:505 ../src/main.c:510 #, c-format msgid "%s:could not execute initialization script" msgstr "%s:?? ??????? ???????? ???????? ?????????????" #: ../src/main.c:530 ../src/main.c:535 #, c-format msgid "%s:could not execute exit script" msgstr "%s:?? ??????? ???????? ???????? ?????????? ??????" #: ../src/main.c:663 ../src/main.c:671 ../src/main.c:679 ../src/main.c:699 #, c-format msgid "too few arguments for %s" msgstr "????? ???? ?????????? ??? %s" #: ../src/main.c:683 #, c-format msgid "bad value for visualid: \"%s\"" msgstr "????????? ???????? ??? visualid: \"%s\"" # #: ../src/main.c:707 #, c-format msgid "%s: invalid argument '%s'\n" msgstr "%s: ???????????? ???????? '%s'\n" #: ../src/main.c:708 #, c-format msgid "Try '%s --help' for more information\n" msgstr "????????? '%s --help' ??? ????????? ?????????? ??????????\n" #: ../src/main.c:736 msgid "X server does not support locale" msgstr "X ?????? ?? ????????? ???????????" #: ../src/main.c:740 msgid "cannot set locale modifiers" msgstr "?? ??????? ?????????? ????????? ???????????" #: ../src/main.c:756 #, c-format msgid "could not open display \"%s\"" msgstr "?? ??????? ???????? ??????? \"%s\"" # #: ../src/menu.c:1255 msgid "could not grab keyboard" msgstr "?? ??????? ???????? ??????????" #: ../src/menureader.c:264 ../src/rootmenu.c:733 #, c-format msgid "%s:could not stat menu" msgstr "%s:?? ??????? ???????? ????" #: ../src/menureader.c:341 ../src/menureader.c:380 #, c-format msgid "could not stat() menu file '%s'" msgstr "?? ??????? ???????? ???? ???? '%s'" #: ../src/menureader.c:416 #, c-format msgid "could not find menu file '%s' referenced in WMRootMenu" msgstr "?? ??????? ?????? ???? ???? '%s' ???????? ? WMRootMenu" #: ../src/menureader.c:423 #, c-format msgid "could not find any usable menu files. Please check '%s'" msgstr "?? ??????? ?????? ?????? ????. ???? ?????, ????????? '%s'" #: ../src/menureader.c:438 ../src/rootmenu.c:1667 #, c-format msgid "" "using default menu file \"%s\" as the menu referenced in WMRootMenu could " "not be found " msgstr "" "???????????????? ???? ?? ?????????? \"%s\", ???? ?? ????, ??????? ? ????? " "WMRootMenu, ?? ??????? ?????? " #: ../src/menureader.c:457 #, c-format msgid "" "invalid content in menu file '%s'.\n" "It should either be a property list menu or the path to the file, enclosed " "in \"." msgstr "" "?????????? ?????????? ? ????? ???? '%s'.\n" "?? ??? ???? ??? ???? ? ??????? property list, ??? ???? ?? ?????, ?????? " "? \"." #: ../src/misc.c:71 #, c-format msgid "could not define value for %s for cpp" msgstr "?? ??????? ????????? ???????? ??? %s ??? cpp" #: ../src/misc.c:101 #, c-format msgid "could not get password entry for UID %i" msgstr "?? ??????? ???????? ?????????? ??? ??????????? ??? UID %i" #: ../src/misc.c:126 #, c-format msgid "your machine is misconfigured. HOSTNAME is set to %s" msgstr "???? ??????? ?????? ??????????????. ?????? HOSTNAME ??????????? ? %s" #: ../src/misc.c:132 #, c-format msgid "your machine is misconfigured. HOST is set to %s" msgstr "???? ??????? ?????? ??????????????. ?????? HOST ??????????? ? %s" #: ../src/misc.c:630 msgid "Program Arguments" msgstr "????????? ????????" #: ../src/misc.c:631 msgid "Enter command arguments:" msgstr "??????? ????????? ???????:" #: ../src/misc.c:724 msgid "unable to get dropped data from DND drop" msgstr "?? ??????? ???????? ??? DND drop ??????????? ????" #: ../src/misc.c:732 msgid "error getting dropped data from DND drop" msgstr "??????? ??? ????????? ????? ??? DND drop" #: ../src/misc.c:738 msgid "out of memory while getting data from DND drop" msgstr "????????? ???'??? ??? ????????? ????? ??? DND drop" #: ../src/misc.c:783 ../src/misc.c:923 #, c-format msgid "out of memory during expansion of \"%s\"" msgstr "????????? ???'??? ??? ??? ?????????? \"%s\"" #: ../src/misc.c:837 msgid "out of memory during expansion of \"%w\"" msgstr "????????? ???'??? ??? ??? ?????????? \"%w\"" #: ../src/misc.c:855 msgid "out of memory during expansion of \"%W\"" msgstr "????????? ???'??? ??? ??? ?????????? \"%W\"" #: ../src/misc.c:871 msgid "out of memory during expansion of \"%a\"" msgstr "????????? ???'??? ??? ??? ?????????? \"%a\"" #: ../src/misc.c:902 #, c-format msgid "out of memory during expansion of \"%d\"" msgstr "????????? ???'??? ??? ??? ?????????? \"%d\"" #: ../src/misc.c:916 msgid "selection not available" msgstr "?????????? ?????????" #: ../src/misc.c:972 ../src/misc.c:978 #, c-format msgid "bad window name value in %s state info" msgstr "????????? ???????? ????? ????? ? ?????????? ??? ???? ??? %s" #: ../src/misc.c:1235 msgid "could not send message to background image helper" msgstr "?? ??????? ??????? ???????????? ???????? ???????? ??????????" #: ../src/pixmap.c:235 #, c-format msgid "could not load mask bitmap file \"%s\". Won't use mask" msgstr "" "?? ??????? ??????????? ????????? ???? ????? \"%s\". ????? ?? ???? ???????????." #: ../src/resources.c:44 #, c-format msgid "could not parse color \"%s\"" msgstr "?? ??????? ????????? ????? \"%s\"" #: ../src/resources.c:48 #, c-format msgid "could not allocate color \"%s\"" msgstr "?? ??????? ????????????? ????? \"%s\"" #: ../src/rootmenu.c:196 ../src/rootmenu.c:198 msgid "Exit" msgstr "?????" #: ../src/rootmenu.c:197 msgid "Exit window manager?" msgstr "????? ? ????????? ??????" #: ../src/rootmenu.c:245 msgid "Close X session" msgstr "????????? ????? ??????" #: ../src/rootmenu.c:246 msgid "" "Close Window System session?\n" "Kill might close applications with unsaved data." msgstr "" "??????? ????? ???????? ????????\n" "?? ???? ????????? ???????? ? ????????????? ??????." #: ../src/rootmenu.c:261 msgid "Kill X session" msgstr "???????? ?????????? ?????? ??????" #: ../src/rootmenu.c:262 msgid "" "Kill Window System session?\n" "(all applications will be closed)" msgstr "" "??????? ????? ???????? ????????\n" "(??? ???????? ?????? ?????????)" #: ../src/rootmenu.c:539 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" msgstr "%s:????????? ??????? ?????????? ?????? \"%s\" ??? ?????? %s" #: ../src/rootmenu.c:547 #, c-format msgid "%s:invalid key in shortcut \"%s\" for entry %s" msgstr "%s:????????? ??????? ? ?????????? \"%s\" ??? ?????? %s" #: ../src/rootmenu.c:600 #, c-format msgid "%s: unmatched '\"' in menu file" msgstr "%s: ??????? '\"' ? ????? ????" #: ../src/rootmenu.c:650 #, c-format msgid "%s: missing command" msgstr "%s: ???????? ???????" #: ../src/rootmenu.c:682 #, c-format msgid "invalid OPEN_MENU specification: %s" msgstr "????????? ???????????? OPEN_MENU: %s" #: ../src/rootmenu.c:741 #, c-format msgid "%s:could not stat menu:%s" msgstr "%s:?? ??????? ???????? ????:%s" #: ../src/rootmenu.c:759 #, c-format msgid "too many parameters in OPEN_MENU: %s" msgstr "????? ?????? ?????????? ? OPEN_MENU: %s" #: ../src/rootmenu.c:803 msgid "" "There are more than one WORKSPACE_MENU commands in the applications menu. " "Only one is allowed." msgstr "" "? ????????? ???? ??????? ?????? ?????? ??????? WORKSPACE_MENU. ????????? " "???? ????" #: ../src/rootmenu.c:837 msgid "" "There are more than one WINDOWS_MENU commands in the applications menu. Only " "one is allowed." msgstr "" "? ????????? ???? ??????? ?????? ?????? ??????? WINDOWS_MENU. ????????? " "???? ????" #: ../src/rootmenu.c:842 msgid "Window List" msgstr "?????? ?????" #: ../src/rootmenu.c:871 ../src/rootmenu.c:889 ../src/rootmenu.c:899 #, c-format msgid "%s:missing parameter for menu command \"%s\"" msgstr "%s:????????? ???????? ??? ??????? ???? \"%s\"" #: ../src/rootmenu.c:967 #, c-format msgid "%s:unknown command \"%s\" in menu config." msgstr "%s:???????? ??????? \"%s\" ? ???????????? ????" #: ../src/rootmenu.c:975 #, c-format msgid "%s:can't add shortcut for entry \"%s\"" msgstr "%s:?? ??????? ?????? ?????????? ?????? ??? ??????? \"%s\"" #: ../src/rootmenu.c:1112 #, c-format msgid "%s:maximal line size exceeded in menu config: %s" msgstr "%s:?????????? ???????????? ?????? ????? ? ???????????? ????: %s" #: ../src/rootmenu.c:1134 ../src/rootmenu.c:1227 ../src/rootmenu.c:1329 #, c-format msgid "%s:missing command in menu config: %s" msgstr "%s:???????? ??????? ? ???????????? ????: %s" #: ../src/rootmenu.c:1164 #, c-format msgid "%s:syntax error in menu file:END declaration missing" msgstr "%s:??????????? ??????? ? ????? ????: ???????? END" #: ../src/rootmenu.c:1193 ../src/rootmenu.c:1293 msgid "could not make arguments for menu file preprocessor" msgstr "?? ??????? ?????????? ????????? ??? ???????????? ????? ????" #: ../src/rootmenu.c:1200 ../src/rootmenu.c:1301 #, c-format msgid "%s:could not open/preprocess menu file" msgstr "%s:?? ??????? ????????/???????? ???? ????" #: ../src/rootmenu.c:1212 ../src/rootmenu.c:1314 #, c-format msgid "%s:could not open menu file" msgstr "%s:?? ??????? ???????? ???? ????" #: ../src/rootmenu.c:1239 #, c-format msgid "%s:invalid menu file. MENU command is missing" msgstr "%s:???? ???? ??????????. ???????? ??????? MENU" #: ../src/rootmenu.c:1248 msgid "error reading preprocessed menu data" msgstr "??????? ??????? ?????????? ????? ????" #: ../src/rootmenu.c:1341 #, c-format msgid "%s:no title given for the root menu" msgstr "%s: ?? ??????? ????????? ?????????? ????" #: ../src/rootmenu.c:1432 ../src/rootmenu.c:1505 ../src/rootmenu.c:1546 #, c-format msgid "out of memory while constructing directory menu %s" msgstr "????????? ???'??? ??? ???????? ???? ???????? %s" #: ../src/rootmenu.c:1442 #, c-format msgid "%s:could not stat file \"%s\" in menu directory" msgstr "%s:?? ??????????? ???? \"%s\" ? ???????? ????" #: ../src/rootmenu.c:1600 msgid "Commands" msgstr "???????" #: ../src/rootmenu.c:1603 msgid "Restart" msgstr "??????????" #: ../src/rootmenu.c:1604 msgid "Exit..." msgstr "?????..." #: ../src/rootmenu.c:1649 #, c-format msgid "could not find menu file \"%s\" referenced in WMRootMenu" msgstr "?? ??????? ?????? ???? ???? \"%s\", ???????? ? WMRootMenu" #: ../src/rootmenu.c:1656 #, c-format msgid "could not access menu \"%s\" referenced in WMRootMenu" msgstr "?? ??????? ????????? ???? \"%s\", ??????? ? WMRootMenu" #: ../src/rootmenu.c:1690 ../src/rootmenu.c:1766 #, c-format msgid "%s:format error in root menu configuration \"%s\"" msgstr "%s:??????? ??????? ? ???????????? ?????????? ???? \"%s\"" #: ../src/rootmenu.c:1854 msgid "" "The applications menu could not be loaded. Look at the console output for a " "detailed description of the errors." msgstr "" "?? ??????? ??????????? ???? ???????. ???????????? ?? ??????? ??????? ??????? " "????????? ???? ????????." #: ../src/screen.c:740 #, c-format msgid "could not initialize graphics library context: %s" msgstr "?? ??????? ?????????????? ???????? ??????????: %s" #: ../src/screen.c:771 msgid "could not do initialization of WINGs widget set" msgstr "?? ??????? ?????????????? ????? ???????? WINGs" #: ../src/screen.c:1137 #, c-format msgid "could not save session state in %s" msgstr "?? ??????? ???????? ???? ?????? ? %s" #: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:454 #, c-format msgid "can't convert \"%s\" to boolean" msgstr "?? ??????? ??????????? \"%s\" ? ????????? ????????" #: ../src/session.c:1023 msgid "out of memory while saving session state" msgstr "????????? ???'??? ??? ?????????? ????? ??????" #: ../src/session.c:1106 msgid "end of memory while saving session state" msgstr "????????? ???'??? ??? ?????????? ????? ??????" #. This is not fatal but can mean the session manager exited. #. * If the session manager exited normally we would get a #. * Die message, so this probably means an abnormal exit. #. * If the sm was the last client of session, then we'll die #. * anyway, otherwise we can continue doing our stuff. #. #: ../src/session.c:1244 msgid "connection to the session manager was lost" msgstr "???????? ?'??????? ? ?????????? ???????" #: ../src/stacking.c:79 msgid "could not get window list!!" msgstr "?? ??????? ???????? ?????? ?????!!" #: ../src/startup.c:202 #, c-format msgid "internal X error: %s\n" msgstr "????????? ??????? X ???????: %s\n" #: ../src/startup.c:260 #, c-format msgid "got signal %i (%s) - restarting\n" msgstr "???????? ?????? %i (%s) -- ??????????\n" #: ../src/startup.c:262 #, c-format msgid "got signal %i - restarting\n" msgstr "???????? ?????? %i - ??????????\n" #: ../src/startup.c:272 #, c-format msgid "got signal %i (%s) - rereading defaults\n" msgstr "???????? ?????? %i (%s) -- ????????????? ????????\n" #: ../src/startup.c:274 #, c-format msgid "got signal %i - rereading defaults\n" msgstr "???????? ?????? %i - ????????????? ????????\n" #: ../src/startup.c:284 #, c-format msgid "got signal %i (%s) - exiting...\n" msgstr "???????? ?????? %i (%s) -- ?????????? ??????...\n" #: ../src/startup.c:286 #, c-format msgid "got signal %i - exiting...\n" msgstr "???????? ?????? %i -- ?????????? ??????...\n" #: ../src/startup.c:329 #, c-format msgid "got signal %i (%s)\n" msgstr "???????? ?????? %i (%s)\n" #: ../src/startup.c:331 #, c-format msgid "got signal %i\n" msgstr "???????? ?????? %i\n" #: ../src/startup.c:342 msgid "" "crashed while trying to do some post-crash cleanup. Aborting immediatelly." msgstr "" "???????? ??????? ??? ??? ??????????? ????? ????. ??????? ?????????? ??????." #. we try to restart Window Maker #: ../src/startup.c:406 msgid "trying to restart Window Maker..." msgstr "?????? ????????????? Window Maker..." #: ../src/startup.c:411 msgid "trying to start alternate window manager..." msgstr "?????? ??????? ??????????????? ????????? ?????..." #: ../src/startup.c:417 msgid "failed to start alternate window manager. Aborting." msgstr "?? ??????? ????????? ?????????????? ???????? ?????. ??????????." #: ../src/startup.c:419 msgid "" "a fatal error has occured, probably due to a bug. Please fill the included " "BUGFORM and report it." msgstr "" "??????? ???????? ???????. ???????, ?? ????????? ??????? ? ????????. ???? " "?????, ????????? ????? BUGFORM ? ????????? ??????." #: ../src/startup.c:894 #, c-format msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" msgstr "?????? ?????? ??????????? ? %i, ?? ????? ????. ???????????????? 16.\n" #: ../src/startup.c:922 msgid "XKB is not supported. KbdModeLock is automatically disabled." msgstr "XKB ?? ?????????????. KbdModeLock ??????????? ??????????." #: ../src/startup.c:941 msgid "it seems that there is already a window manager running" msgstr "?????, ?? ??? ?????? ????? ???????? ?????" #: ../src/startup.c:947 #, c-format msgid "could not manage screen %i" msgstr "?? ???????? ???????? ??????? %i" #: ../src/startup.c:1015 msgid "could not manage any screen" msgstr "?? ???????? ???????? ?????? ???????" #: ../src/switchmenu.c:137 msgid "Windows" msgstr "?????" #: ../src/texture.c:329 ../src/texture.c:371 #, c-format msgid "image file \"%s\" used as texture could not be found." msgstr "???? ?????????? ???????? \"%s\" ?? ????????." #: ../src/texture.c:335 ../src/texture.c:377 #, c-format msgid "could not load texture pixmap \"%s\":%s" msgstr "?? ??????? ??????????? ???????? ?????????? ? ????????? \"%s\":%s" #: ../src/texture.c:437 #, c-format msgid "library \"%s\" cound not be opened." msgstr "?? ??????? ???????? ?????????? \"%s\"." #: ../src/texture.c:446 #, c-format msgid "function \"%s\" not found in library \"%s\"" msgstr "??????? \"%s\" ?? ???????? ? ?????????? \"%s\"" #: ../src/texture.c:453 msgid "function textures not supported on this system, sorry." msgstr "????????????? ???????? ?? ????????????? ???? ????????." #: ../src/texture.c:598 msgid "could not allocate image buffer" msgstr "?? ??????? ???????? ????? ??? ?????????? " #: ../src/wdefaults.c:437 #, c-format msgid "could not find icon file \"%s\"" msgstr "?? ??????? ?????? ???? ?????? \"%s\"" #: ../src/window.c:2934 ../src/window.c:3073 msgid "" "the NumLock, ScrollLock or similar key seems to be turned on.\n" "Turn it off or some mouse actions and keyboard shortcuts will not work." msgstr "" "?????, ?? NumLock, ScrollLock ?? ?????????? ??????? ?????????.\n" "??????????? ?? ??? ? ????? ???????? ????? ? ?????????? ?????? ?? ?????? " "?????????." #: ../src/winmenu.c:126 msgid "" "This will kill the application.\n" "Any unsaved changes will be lost.\n" "Please confirm." msgstr "" "?? ????????? ????????? ????????.\n" "??? ??????????? ????? ?????? ????????.\n" "???? ?????, ???????????." #: ../src/winmenu.c:272 ../src/winmenu.c:281 msgid "Set Shortcut" msgstr "?????????? ?????????? ??????" #: ../src/winmenu.c:359 ../src/winmenu.c:404 msgid "could not create submenu for window menu" msgstr "?? ??????? ???????? ??????? ??? ???? ?????" #: ../src/winmenu.c:408 msgid "Keep on top" msgstr "??????? ??? ???????" #: ../src/winmenu.c:413 msgid "Keep at bottom" msgstr "??????? ??? ???????" #: ../src/winmenu.c:457 ../src/winmenu.c:600 msgid "Shade" msgstr "???????? ? ??????" #: ../src/winmenu.c:473 msgid "Hide Others" msgstr "????????? ????" #: ../src/winmenu.c:481 msgid "Resize/Move" msgstr "??????? ??????/???????????" #: ../src/winmenu.c:489 msgid "Select" msgstr "???????" #: ../src/winmenu.c:502 msgid "Attributes..." msgstr "????????..." #: ../src/winmenu.c:504 msgid "Options" msgstr "?????" #: ../src/winmenu.c:595 msgid "Unshade" msgstr "??????? ?? ??????" #: ../src/winspector.c:387 #, c-format msgid "Could not find icon \"%s\" specified for this window" msgstr "????????? ?????? ?????? \"%s\", ??????? ??? ????? ?????" #: ../src/winspector.c:404 #, c-format msgid "Could not open specified icon \"%s\":%s" msgstr "????????? ???????? ???????? ???? ?????? \"%s\":%s" #: ../src/winspector.c:1123 #, c-format msgid "Inspecting %s.%s" msgstr "????????????? %s.%s" #: ../src/winspector.c:1149 msgid "Click in the window you wish to inspect." msgstr "????????? ?? ?????, ??? ?????? ???????????????." #: ../src/winspector.c:1188 msgid "" "The configuration will apply to all\n" "windows that have their WM_CLASS\n" "property set to the above selected\n" "name, when saved." msgstr "" "??? ?????????? ???????????? ???? ???????????\n" "?? ???? ?????, ? ???? WM_CLASS ??????????? ?\n" "??????? ????????." #: ../src/winspector.c:1217 msgid "Save" msgstr "????????" #: ../src/winspector.c:1225 msgid "Apply" msgstr "???????????" #: ../src/winspector.c:1231 msgid "Reload" msgstr "??????????" #: ../src/winspector.c:1240 ../src/winspector.c:1250 msgid "Window Specification" msgstr "???????????? ?????" #: ../src/winspector.c:1241 msgid "Window Attributes" msgstr "???????? ?????" #: ../src/winspector.c:1242 msgid "Advanced Options" msgstr "????????? ?????" #: ../src/winspector.c:1243 msgid "Icon and Initial Workspace" msgstr "?????? ? ?????????? ????" #: ../src/winspector.c:1244 msgid "Application Specific" msgstr "??????????? ????????" #: ../src/winspector.c:1258 msgid "Defaults for all windows" msgstr "????????? ??? ???? ?????" #: ../src/winspector.c:1312 msgid "Select window" msgstr "???????? ?????" #: ../src/winspector.c:1326 msgid "Attributes" msgstr "????????" #: ../src/winspector.c:1337 msgid "Disable titlebar" msgstr "???????? ????? ?????" #: ../src/winspector.c:1339 msgid "" "Remove the titlebar of this window.\n" "To access the window commands menu of a window\n" "without it's titlebar, press Control+Esc (or the\n" "equivalent shortcut, if you changed the default\n" "settings)." msgstr "" "???????? ?????? ????????? ????? ?????.\n" "??? ??????? ?? ???? ?????? ????? ??? ???????????\n" "???? ?????, ????????? Control+Esc (?? ????????????\n" "??????????, ???? ?? ??????? ????????? ??\n" "??????????)." #: ../src/winspector.c:1346 msgid "Disable resizebar" msgstr "???????? ?????? ????? ???????" #: ../src/winspector.c:1348 msgid "Remove the resizebar of this window." msgstr "???????? ?????? ????? ??????? ????? ?????." #: ../src/winspector.c:1351 msgid "Disable close button" msgstr "???????? ?????? ????????" #: ../src/winspector.c:1353 msgid "Remove the `close window' button of this window." msgstr "???????? ?????? ???????? ??? ????? ?????." #: ../src/winspector.c:1356 msgid "Disable miniaturize button" msgstr "???????? ?????? ???????????" #: ../src/winspector.c:1358 msgid "Remove the `miniaturize window' button of the window." msgstr "???????? ?????? ??????????? ??? ????? ?????." #: ../src/winspector.c:1361 msgid "Disable border" msgstr "???????? ?????? ?????" #: ../src/winspector.c:1363 msgid "Remove the 1 pixel black border around the window." msgstr "???????? 1-?????????? ?????? ?????? ??????? ?????." #: ../src/winspector.c:1366 msgid "Keep on top (floating)" msgstr "?????? ?????? (????????)" #: ../src/winspector.c:1368 msgid "" "Keep the window over other windows, not allowing\n" "them to cover it." msgstr "" "?????????? ????? ?????? ????? ?????, ?? ??????????\n" "?? ????????? ?? ?????." #: ../src/winspector.c:1372 msgid "Keep at bottom (sunken)" msgstr "?????? ????? (????????)" #: ../src/winspector.c:1374 msgid "Keep the window under all other windows." msgstr "?????????? ????? ???????? ?????? ?????????????? ???????." #: ../src/winspector.c:1379 msgid "Make window present in all workspaces." msgstr "??????? ????? ????????? ?? ???? ??????? ??????." #: ../src/winspector.c:1382 msgid "Start miniaturized" msgstr "?????? ?????????????" #: ../src/winspector.c:1384 msgid "" "Make the window be automatically miniaturized when it's\n" "first shown." msgstr "" "??????? ????? ??????????? ?????????????? ???\n" "??????????? ??????????." #: ../src/winspector.c:1388 msgid "Start maximized" msgstr "?????? ??????????????" #: ../src/winspector.c:1390 msgid "" "Make the window be automatically maximized when it's\n" "first shown." msgstr "" "??????? ????? ??????????? ??????????????? ???\n" "??????????? ??????????." #: ../src/winspector.c:1394 msgid "Full screen maximization" msgstr "????????????? ?? ???? ?????" #: ../src/winspector.c:1396 msgid "" "Make the window use the whole screen space when it's\n" "maximized. The titlebar and resizebar will be moved\n" "to outside the screen." msgstr "" "??????? ?? ????? ????????? ????? ??????? ?????? ???\n" "????????????. ?????? ????????? ? ????? ??????? ??????\n" "??????? ?? ???? ??????." #: ../src/winspector.c:1413 msgid "Advanced" msgstr "?????????" #: ../src/winspector.c:1430 msgid "Do not bind keyboard shortcuts" msgstr "?? ????'??????? ?????????? ??????" #: ../src/winspector.c:1432 msgid "" "Do not bind keyboard shortcuts from Window Maker\n" "when this window is focused. This will allow the\n" "window to receive all key combinations regardless\n" "of your shortcut configuration." msgstr "" "?? ????'??????? ?????????? ?????? Window Maker'?\n" "??? ????????? ??? ?????? ?????? ?????. ?? ?????????\n" "????? ?????????? ??? ?????????? ??????, ?????????\n" "??? ???????????? ?? ????'????." #: ../src/winspector.c:1438 msgid "Do not bind mouse clicks" msgstr "?? ????'??????? ?????????? ????" #: ../src/winspector.c:1440 msgid "" "Do not bind mouse actions, such as `Alt'+drag\n" "in the window (when alt is the modifier you haveconfigured)." msgstr "" "?? ????'??????? ??? ????, ???? ?? `Alt'+????????????\n" "? ????? (??? ????????????? ???????????? `Alt')." #: ../src/winspector.c:1445 msgid "Do not show in the window list" msgstr "?? ?????????? ????? ? ?????? ?????." #: ../src/winspector.c:1447 msgid "Do not list the window in the window list menu." msgstr "?? ?????????? ?? ????? ? ???? ?????? ?????." #: ../src/winspector.c:1450 msgid "Do not let it take focus" msgstr "?? ?????????? ????? ?????" #: ../src/winspector.c:1452 msgid "" "Do not let the window take keyboard focus when you\n" "click on it." msgstr "" "?? ?????? ????? ?????????? ????? ????? ? ??????????\n" "??? ?????????? ?? ????? ?????." #: ../src/winspector.c:1456 msgid "Keep inside screen" msgstr "?????? ????????? ??????" #: ../src/winspector.c:1458 msgid "" "Do not allow the window to move itself completely\n" "outside the screen. For bug compatibility.\n" msgstr "" "?? ????????? ????? ???????? ?????????????\n" "?? ???? ??????.\n" #: ../src/winspector.c:1462 msgid "Ignore 'Hide Others'" msgstr "?????????? '????????? ????'" #: ../src/winspector.c:1464 msgid "" "Do not hide the window when issuing the\n" "`HideOthers' command." msgstr "" "?? ??????????? ?? ????? ??? ?????????\n" "??????? `????????? ????'." #: ../src/winspector.c:1468 msgid "Ignore 'Save Session'" msgstr "?????????? '???????? ?????'" #: ../src/winspector.c:1470 msgid "" "Do not save the associated application in the\n" "session's state, so that it won't be restarted\n" "together with other applications when Window Maker\n" "starts." msgstr "" "?? ????????? ??????????? ???????? ?\n" "????? ??????, ??? ?? ???? ?? ????\n" "???????????? ????? ? ?????? ??????????\n" "??? ??????? Window Maker'?." # #: ../src/winspector.c:1476 msgid "Emulate application icon" msgstr "????????? ?????? ????????" #: ../src/winspector.c:1478 msgid "" "Make this window act as an application that provides\n" "enough information to Window Maker for a dockable\n" "application icon to be created." msgstr "" "??????? ?? ????? ??????? ???? ?? ????????, ??\n" "????? ????????? ?????????? Window Maker'? ???\n" "????????? ?????? ????????, ??? ?????????? ? ???." #: ../src/winspector.c:1484 msgid "Disable language button" msgstr "???????? ?????? ????" #: ../src/winspector.c:1486 msgid "Remove the `toggle language' button of the window." msgstr "???????? ?????? ??????????? ???? ?????????? ??? ?????." #: ../src/winspector.c:1503 msgid "Miniwindow Image" msgstr "?????????? ??????????" #: ../src/winspector.c:1530 msgid "Icon filename:" msgstr "??'? ????? ??????:" #: ../src/winspector.c:1543 msgid "Ignore client supplied icon" msgstr "?????????? ?????? ???????" #: ../src/winspector.c:1550 msgid "Initial Workspace" msgstr "?????????? ??????? ????" #: ../src/winspector.c:1552 msgid "The workspace to place the window when it'sfirst shown." msgstr "??????? ????, ???? ????????? ????? ??? ?????????? ???? ?????." #: ../src/winspector.c:1558 msgid "Nowhere in particular" msgstr "?? ?????????" #: ../src/winspector.c:1576 msgid "Application Attributes" msgstr "??????????? ?? ????????" #: ../src/winspector.c:1587 msgid "Start hidden" msgstr "????????? ??????????" #: ../src/winspector.c:1589 msgid "Automatically hide application when it's started." msgstr "??????????? ??????????? ???????? ??? ?? ???????." #: ../src/winspector.c:1592 msgid "No application icon" msgstr "?? ?????????? ??????" #: ../src/winspector.c:1594 msgid "" "Disable the application icon for the application.\n" "Note that you won't be able to dock it anymore,\n" "and any icons that are already docked will stop\n" "working correctly." msgstr "" "?????????? ?????? ???????? ??? ???? ????????.\n" "?????: ?? ?? ??????? ????? ????? ????????? ?? ? ???,\n" "? ??? ?? ??????, ?? ??? ? ????? ???????????, ?????????\n" "???????? ?????????." # #: ../src/winspector.c:1600 msgid "Shared application icon" msgstr "??????? ?????? ????????" #: ../src/winspector.c:1602 msgid "" "Use a single shared application icon for all of\n" "the instances of this application.\n" msgstr "" "??????????????? ????? ??????? ?????? ???????? ???\n" "???? ??????????? ???? ????????.\n" #: ../src/wmspec.c:277 msgid "out of memory while updating wm hints" msgstr "????????? ???'??? ??? ????????? wm hints" #: ../src/workspace.c:107 ../src/workspace.c:108 ../src/workspace.c:893 #, c-format msgid "Workspace %i" msgstr "??????? ???? %i" #: ../src/workspace.c:943 msgid "Workspaces" msgstr "?????? ?????" #: ../src/workspace.c:945 msgid "could not create Workspace menu" msgstr "?? ???????? ???????? ???? ??????? ??????" #: ../src/workspace.c:952 msgid "New" msgstr "????????" #: ../src/workspace.c:953 msgid "Destroy Last" msgstr "??????? ????????" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Aug 2005 01:29:26 -0000 1.4 +++ .cvsignore 2 Mar 2006 14:16:26 -0000 1.5 @@ -1 +1,2 @@ WindowMaker-0.92.0.tar.bz2 +WindowMaker-extra-0.1.tar.gz Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- WindowMaker.spec 16 Feb 2006 23:09:01 -0000 1.16 +++ WindowMaker.spec 2 Mar 2006 14:16:26 -0000 1.17 @@ -1,7 +1,7 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.92.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: User Interface/Desktops @@ -9,7 +9,45 @@ Source0: ftp://windowmaker.org/pub/source/release/WindowMaker-0.92.0.tar.bz2 Source1: WindowMaker.xsession Source2: WindowMaker.desktop -Patch0: windowmaker-gcc4-x86_64.patch +Source3: WindowMaker-uk.po +Source4: WPrefs-uk.po +Source5: WindowMaker-README.newbuttons +Source6: WindowMaker-newbuttons.nextstyle.tiff +Source7: WindowMaker-newbuttons.nextstyle.xpm +Source8: WindowMaker-newbuttons.oldstyle.tiff + +Source10: ftp://windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz + +# cvs snapshot +Patch0: WindowMaker-0.92.0-cvs20060123.patch +Patch1: WindowMaker-gcc41.patch + +#patches from altlinux +Patch101: WindowMaker-0.91.0-alt-sowings.patch +Patch102: WindowMaker-0.91.0-alt-session.patch +Patch103: WindowMaker-0.91.0-alt-restartscrpt.patch +Patch104: WindowMaker-0.91.0-alt-menutrans.patch +Patch105: WindowMaker-0.91.0-alt-titlebar.patch +Patch106: WindowMaker-0.91.0-alt-clipnotext.patch +Patch107: WindowMaker-0.91.0-alt-mmx.patch +Patch108: WindowMaker-0.80.2-cvs-alt-textfield.patch +Patch109: WindowMaker-0.91.0-alt-focus.patch + +#add new features as well (sound good) +Patch200: WindowMaker-0.91.0-wmcontrib-singleclick.patch +Patch201: WindowMaker-0.91.0-alt-dockhotkeys.patch +Patch202: WindowMaker-0.91.0-alt-vlaad-trance.patch +Patch203: WindowMaker-0.91.0-alt-vlaad-newbuttons.patch +Patch204: WindowMaker-0.91.0-alt-adialog.patch +Patch205: WindowMaker-0.91.0-hmepas-minimizeall.patch +Patch206: WindowMaker-0.91.0-hmepas-swmenu_rclick.patch +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 +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 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: libpng-devel libjpeg-devel libungif-devel BuildRequires: libtiff-devel zlib-devel gettext-devel @@ -47,8 +85,41 @@ %prep -%setup -q -%patch0 +%setup -q -a10 + +%patch0 -p1 +%patch1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 +%patch105 -p1 +%patch106 -p1 +%patch107 -p1 +%patch108 -p1 +%patch109 -p1 +%patch200 -p1 +%patch201 -p1 +%patch202 -p1 +%patch203 -p1 +%patch204 -p1 +%patch205 -p1 +%patch206 -p1 +%patch207 -p1 +%patch208 -p1 +%patch209 -p1 +%patch210 -p1 +%patch211 -p1 +%patch212 -p1 -b .vns + +cp %{SOURCE3} po/uk.po +cp %{SOURCE4} WPrefs.app/po/uk.po +cp %{SOURCE5} README.newbuttons + +cp %{SOURCE6} WPrefs.app/tiff/nextstyle.tiff +cp %{SOURCE7} WPrefs.app/xpm/nextstyle.xpm +cp %{SOURCE8} WPrefs.app/tiff/oldstyle.tiff + ###### menu fix from Rudolf Kastel for i in WindowMaker/*menu* ; do echo $i @@ -58,17 +129,25 @@ sed -e 's/\/home\/mawa/$(HOME)/g' $i.old >$i done +autoreconf -sif + %build +# enable new features +CFLAGS="$RPM_OPT_FLAGS -DBOUNCE_APP -DNEWAPPICON -DVIRTUAL_DESKTOP" LINGUAS=`(cd po ; echo *.po|sed 's/zh_TW.Big5.po//g;s/.po//g')` GNUSTEP_LOCAL_ROOT='%{_libdir}/GNUstep' NLSDIR="%{_datadir}/locale" -export LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT +export CFLAGS LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT %configure --enable-gnome --enable-kde --enable-usermenu --enable-xinerama \ --enable-fast-install --enable-modelock --x-includes=%{_includedir} \ ---x-libraries=%{_libdir} - -make %{?_smp_mflags} - +--x-libraries=%{_libdir} --disable-mmx --disable-static --enable-shared +#smp_mflags are broken atm +make #%{?_smp_mflags} + +# do extras stuff +cd WindowMaker-extra-0.1 +%configure --x-libraries=%{_libdir} --x-includes=%{_includedir} +cd .. %install rm -rf $RPM_BUILD_ROOT @@ -76,13 +155,16 @@ %find_lang '\(WPrefs\|%{name}\|WINGs\)' -rm -f $RPM_BUILD_ROOT%{_libdir}/libwraster.la - install -D -m0755 %{SOURCE1} \ %{buildroot}%{_sysconfdir}/X11/gdm/Sessions/WindowMaker install -D -m0644 %{SOURCE2} \ %{buildroot}%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop +find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' + +# now install extras stuff +make -C WindowMaker-extra-0.1 install DESTDIR=$RPM_BUILD_ROOT + %clean rm -rf $RPM_BUILD_ROOT @@ -97,7 +179,7 @@ %{_datadir}/%{name} %{_datadir}/WINGs %{_libdir}/GNUstep -%{_libdir}/libwraster.so.* +%{_libdir}/*.so.* %{_mandir}/man1/*.1x* %{_mandir}/sk/man1/*.1x* %exclude %{_bindir}/get-*-flags @@ -110,12 +192,22 @@ %{_includedir}/WINGs %{_includedir}/WMaker.h %{_includedir}/wraster.h -%{_libdir}/lib*.a -%{_libdir}/libwraster.so +%{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %changelog +* Sun Feb 26 2006 Andreas Bierfert +0.92.0-7 +- fix #181981 +- go to new cvs snapshot (which includes qt fix) +- add patches from altlinuxs rpm (suggested by Andrew Zabolotny) +- get rid of static libs (finally) +- tune configure +- add uk translation +- finally add extras source +- fix stack-smash while reading workspace names + * Thu Feb 16 2006 Andreas Bierfert 0.92.0-6 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Aug 2005 01:29:26 -0000 1.4 +++ sources 2 Mar 2006 14:16:26 -0000 1.5 @@ -1 +1,2 @@ aaac5421b686ed2d3e6ab65229c98097 WindowMaker-0.92.0.tar.bz2 +07c7700daaaf232bc490f5abaabef085 WindowMaker-extra-0.1.tar.gz --- windowmaker-gcc4-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 14:40:02 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Mar 2006 09:40:02 -0500 Subject: rpms/gai/devel gai.spec,1.18,1.19 Message-ID: <200603021440.k22EeYx7010418@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gai/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10389 Modified Files: gai.spec Log Message: Update for FC5 rebuild Index: gai.spec =================================================================== RCS file: /cvs/extras/rpms/gai/devel/gai.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gai.spec 12 Feb 2006 21:29:05 -0000 1.18 +++ gai.spec 2 Mar 2006 14:40:02 -0000 1.19 @@ -1,6 +1,6 @@ Name: gai Version: 0.5.10 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Generic Applet Interface Group: User Interface/Desktops @@ -73,7 +73,10 @@ %{_libdir}/libgai.so %changelog -* Mon Jan 30 2006 Michel Salim - 0.5.10-5 +* Thu Mar 2 2006 Michel Salim - 0.5.10-6 +- Rebuild for Fedora Extras 5 + +* Mon Jan 30 2006 Michel Salim - 0.5.10-5 - regenerate configure to account for modular xorg's location change - BuildReq changes: removed implicit dependencies, added xorg-x11-proto-devel and mesa-libGLU-devel that are now no longer pulled in From fedora-extras-commits at redhat.com Thu Mar 2 14:48:08 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Mar 2006 09:48:08 -0500 Subject: rpms/quarry/devel quarry.spec,1.1,1.2 Message-ID: <200603021448.k22EmeOO010574@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/quarry/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10556 Modified Files: quarry.spec Log Message: Update for Fedora Extras 5 rebuild Index: quarry.spec =================================================================== RCS file: /cvs/extras/rpms/quarry/devel/quarry.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- quarry.spec 17 Nov 2005 03:14:16 -0000 1.1 +++ quarry.spec 2 Mar 2006 14:48:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: quarry Version: 0.1.16 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A multi-purpose board game GUI Group: Amusements/Games @@ -70,7 +70,10 @@ %changelog -* Sun Nov 13 2005 Michel Salim - 0.1.16-1 +* Thu Mar 2 2006 Michel Salim - 0.1.16-2 +- Rebuild for Fedora Extras 5 + +* Sun Nov 13 2005 Michel Salim - 0.1.16-1 - New upstream version * Sun Sep 4 2005 Michel Salim - 0.1.15-5 From fedora-extras-commits at redhat.com Thu Mar 2 14:55:55 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Mar 2006 09:55:55 -0500 Subject: owners owners.list,1.693,1.694 Message-ID: <200603021456.k22EuRPj010658@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10641 Modified Files: owners.list Log Message: Transferring gnugo to michel.salim at gmail.com Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.693 retrieving revision 1.694 diff -u -r1.693 -r1.694 --- owners.list 2 Mar 2006 06:45:28 -0000 1.693 +++ owners.list 2 Mar 2006 14:55:55 -0000 1.694 @@ -351,7 +351,7 @@ Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org| -Fedora Extras|gnugo|Text based go program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gnugo|Text based go program|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|gnumeric|A spreadsheet program for GNOME|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|gnupg2|GNU utility for secure communication and data storage|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gobby|A free collaborative editor|lmacken at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 15:16:59 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Thu, 2 Mar 2006 10:16:59 -0500 Subject: rpms/grhino/devel grhino.spec,1.3,1.4 Message-ID: <200603021517.k22FHYkx012716@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/grhino/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12699 Modified Files: grhino.spec Log Message: Update for FE5 rebuild Index: grhino.spec =================================================================== RCS file: /cvs/extras/rpms/grhino/devel/grhino.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- grhino.spec 17 Nov 2005 03:27:43 -0000 1.3 +++ grhino.spec 2 Mar 2006 15:16:57 -0000 1.4 @@ -1,6 +1,6 @@ Name: grhino Version: 0.15.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Reversi game for GNOME, supporting the Go/Game Text Protocol Group: Amusements/Games @@ -85,6 +85,9 @@ %changelog +* Thu Mar 2 2006 Michel Salim - 0.15.0-5 +- Rebuild for Fedora Extras 5 + * Sun Nov 13 2005 Michel Salim - 0.15.0-4 - Reverted game name used in GTP protocol From fedora-extras-commits at redhat.com Thu Mar 2 15:47:51 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 10:47:51 -0500 Subject: rpms/abicheck/devel abicheck.spec,1.23,1.24 Message-ID: <200603021548.k22FmNKu013022@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12995 Modified Files: abicheck.spec Log Message: * Thu Mar 2 2006 Michael Schwendt - 1.2-10 - rebuilt for FC5 only to run the %check section Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- abicheck.spec 16 Aug 2005 22:05:50 -0000 1.23 +++ abicheck.spec 2 Mar 2006 15:47:51 -0000 1.24 @@ -3,7 +3,7 @@ Summary: ABI checking tool Name: abicheck Version: 1.2 -Release: 9 +Release: 10 License: LGPL Group: Applications/File URL: http://abicheck.sourceforge.net/ @@ -62,6 +62,9 @@ %changelog +* Thu Mar 2 2006 Michael Schwendt - 1.2-10 +- rebuilt for FC5 only to run the %%check section + * Tue Aug 16 2005 Michael Schwendt - 1.2-9 - Patch abicheck to run dynamic linker directly instead of using ldd and receiving its intermixed lines. From fedora-extras-commits at redhat.com Thu Mar 2 15:52:19 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 10:52:19 -0500 Subject: rpms/neverball/FC-4 neverball-rpath.patch, NONE, 1.1 neverball.spec, 1.9, 1.10 Message-ID: <200603021552.k22FqpLp013091@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/neverball/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13066 Modified Files: neverball.spec Added Files: neverball-rpath.patch Log Message: Remove rpath from x86_64 binary (bz #173819) neverball-rpath.patch: --- NEW FILE neverball-rpath.patch --- --- Makefile 2004-09-08 13:31:40.000000000 -0700 +++ ../neverball-1.4.0.new/Makefile 2006-02-27 13:25:50.000000000 -0800 @@ -16,7 +16,7 @@ #CFLAGS= -Wall -pg -ansi $(shell sdl-config --cflags) SDL_LIBS= $(shell sdl-config --libs) -FT2_LIBS= $(shell freetype-config --libs) +FT2_LIBS= $(shell freetype-config --libs | sed 's|-Wl,--rpath -Wl,/usr/lib64 ||') MAPC_TARG= mapc BALL_TARG= neverball Index: neverball.spec =================================================================== RCS file: /cvs/extras/rpms/neverball/FC-4/neverball.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- neverball.spec 23 May 2005 00:24:05 -0000 1.9 +++ neverball.spec 2 Mar 2006 15:52:19 -0000 1.10 @@ -1,6 +1,6 @@ Name: neverball Version: 1.4.0 -Release: 4 +Release: 5 Summary: Roll a ball through an obstacle course @@ -9,6 +9,7 @@ URL: http://icculus.org/neverball/ Source0: http://icculus.org/neverball/neverball-%{version}.tar.gz Patch0: neverball-datadir.patch +Patch1: neverball-rpath.patch Source1: neverball.desktop Source2: neverputt.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -25,18 +26,22 @@ %prep %setup -q %patch0 +%patch1 +# Remove some execute bits to prevent rpmlint warnings in the debuginfo +# package. +find data putt share -type f -exec chmod a-x {} \; %build -make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`" +make CFLAGS="$RPM_OPT_FLAGS -ansi `sdl-config --cflags`" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -p -D -m0755 neverball $RPM_BUILD_ROOT/%{_bindir}/neverball install -p -D -m0755 neverputt $RPM_BUILD_ROOT/%{_bindir}/neverputt -install -p -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/neverball/ +install -p -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/%{name}/ install -p -D -m0644 icon/neverball.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverball.png install -p -D -m0644 icon/neverputt.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps/neverputt.png -cp -ap data/* $RPM_BUILD_ROOT/%{_datadir}/neverball/ +cp -ap data/* $RPM_BUILD_ROOT/%{_datadir}/%{name}/ desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ @@ -60,6 +65,10 @@ %{_datadir}/applications/* %changelog +* Mon Feb 27 2006 Wart - 1.4.0-5 +- Added smp_mflags to compile line to speed up build on smp machines +- Added patch to remove rpath on FC4 + * Sun May 22 2005 Jeremy Katz - 1.4.0-4 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Mar 2 15:55:00 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 10:55:00 -0500 Subject: rpms/neverball/FC-4 neverball.spec,1.10,1.11 Message-ID: <200603021555.k22FtWHi013144@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/neverball/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13127 Modified Files: neverball.spec Log Message: Added dist tag to release. Index: neverball.spec =================================================================== RCS file: /cvs/extras/rpms/neverball/FC-4/neverball.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- neverball.spec 2 Mar 2006 15:52:19 -0000 1.10 +++ neverball.spec 2 Mar 2006 15:55:00 -0000 1.11 @@ -1,6 +1,6 @@ Name: neverball Version: 1.4.0 -Release: 5 +Release: 5%{?dist} Summary: Roll a ball through an obstacle course @@ -65,9 +65,10 @@ %{_datadir}/applications/* %changelog -* Mon Feb 27 2006 Wart - 1.4.0-5 +* Thu Mar 2 2006 Wart - 1.4.0-5 - Added smp_mflags to compile line to speed up build on smp machines - Added patch to remove rpath on FC4 +- Added dist tag to release * Sun May 22 2005 Jeremy Katz - 1.4.0-4 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Mar 2 16:01:08 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 11:01:08 -0500 Subject: rpms/neverball/devel neverball.spec,1.10,1.11 Message-ID: <200603021601.k22G1eMb015034@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/neverball/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13201 Modified Files: neverball.spec Log Message: Add dist to release tag Index: neverball.spec =================================================================== RCS file: /cvs/extras/rpms/neverball/devel/neverball.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- neverball.spec 2 Mar 2006 05:51:33 -0000 1.10 +++ neverball.spec 2 Mar 2006 16:01:07 -0000 1.11 @@ -1,6 +1,6 @@ Name: neverball Version: 1.4.0 -Release: 5 +Release: 6%{?dist} Summary: Roll a ball through an obstacle course @@ -64,6 +64,9 @@ %{_datadir}/applications/* %changelog +* Thu Mar 2 2006 Wart - 1.4.0-6 +- Add dist tag now that spec files are different between releases + * Mon Feb 27 2006 Wart - 1.4.0-5 - Added BR: mesa-libGL-devel for modular xorg - Added smp_mflags to compile line to speed up build on smp machines From fedora-extras-commits at redhat.com Thu Mar 2 16:52:57 2006 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Thu, 2 Mar 2006 11:52:57 -0500 Subject: owners owners.list,1.694,1.695 Message-ID: <200603021653.k22GrT3e019498@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19293 Modified Files: owners.list Log Message: fix e-mail address Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.694 retrieving revision 1.695 diff -u -r1.694 -r1.695 --- owners.list 2 Mar 2006 14:55:55 -0000 1.694 +++ owners.list 2 Mar 2006 16:52:55 -0000 1.695 @@ -18,7 +18,7 @@ Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|acpitool|A command line ACPI client for Linux|pertusus at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|colin at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|aiksaurus|A thesaurus library|uwog at uwog.net|extras-qa at fedoraproject.org| @@ -269,7 +269,7 @@ 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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org| -Fedora Extras|gaim-guifications|Guifications plugin for GAIM|colin at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gaim-guifications|Guifications plugin for GAIM|byte at fedoraproject.org|extras-qa at fedoraproject.org| 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 xtdnet.nl|extras-qa at fedoraproject.org| Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org| @@ -647,7 +647,7 @@ 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| Fedora Extras|Maelstrom|A space combat game.|notting at redhat.com|extras-qa at fedoraproject.org| -Fedora Extras|MagicPoint|X based presentation software|colin at fedoraproject.org|extras-qa at fedoraproject.org|rms at 1407.org +Fedora Extras|MagicPoint|X based presentation software|byte at fedoraproject.org|extras-qa at fedoraproject.org|rms at 1407.org Fedora Extras|mail-notification|Mail Notification is a status icon that informs you if you have new mail|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|makebootfat|Utility for creation bootable FAT disk|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|manedit|GUI editor for creating man pages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| @@ -1103,7 +1103,7 @@ Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|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| 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|colin at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|python-adns|Python interface for the GNU adns library|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-astng|Python Abstract Syntax Tree New Generation|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|python-basemap|Plots data on map projections (with continental and political boundaries)|orion at cora.nwra.com|extras-qa at fedoraproject.org| @@ -1270,7 +1270,7 @@ Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|stellarium|A photo-realistic nightsky renderer|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org| -Fedora Extras|straw|GNOME desktop news aggregator|colin at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|straw|GNOME desktop news aggregator|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org| Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|suck|Suck - download news from remote NNTP server|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 17:15:17 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Thu, 2 Mar 2006 12:15:17 -0500 Subject: fedora-release fedora-development.repo,1.1,1.2 Message-ID: <200603021715.k22HFHMN024175@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24150 Modified Files: fedora-development.repo Log Message: add link (#183603) Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-development.repo 15 Feb 2006 20:01:52 -0000 1.1 +++ fedora-development.repo 2 Mar 2006 17:15:07 -0000 1.2 @@ -15,7 +15,11 @@ # testing and troubleshooting for development packages in conjunction # with developing new releases. # -# Reproducible and reportable issues should be filed at http://bugzilla.redhat.com/ +# More information is available at http://fedoraproject.org/wiki/Testing +# +# Reproducible and reportable issues should be filed at +# http://bugzilla.redhat.com/. +# # Product: Fedora Core # Version: devel From fedora-extras-commits at redhat.com Thu Mar 2 17:18:43 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 12:18:43 -0500 Subject: rpms/libopensync-plugin-kdepim - New directory Message-ID: <200603021718.k22HIjSh024249@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24239/libopensync-plugin-kdepim Log Message: Directory /cvs/extras/rpms/libopensync-plugin-kdepim added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 17:18:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 12:18:49 -0500 Subject: rpms/libopensync-plugin-kdepim/devel - New directory Message-ID: <200603021718.k22HIpc4024266@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24239/libopensync-plugin-kdepim/devel Log Message: Directory /cvs/extras/rpms/libopensync-plugin-kdepim/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 2 17:20:04 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 12:20:04 -0500 Subject: rpms/libopensync-plugin-kdepim Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200603021720.k22HK6JK024320@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305 Added Files: Makefile import.log Log Message: Setup of module libopensync-plugin-kdepim --- NEW FILE Makefile --- # Top level Makefile for module libopensync-plugin-kdepim all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 2 17:20:22 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 12:20:22 -0500 Subject: rpms/libopensync-plugin-kdepim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603021720.k22HKOuh024349@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libopensync-plugin-kdepim --- NEW 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 Mar 2 17:26:44 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 12:26:44 -0500 Subject: rpms/abicheck/devel abicheck.spec,1.24,1.25 Message-ID: <200603021727.k22HRGid024398@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24379 Modified Files: abicheck.spec Log Message: changes in ppc Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- abicheck.spec 2 Mar 2006 15:47:51 -0000 1.24 +++ abicheck.spec 2 Mar 2006 17:26:43 -0000 1.25 @@ -47,7 +47,15 @@ %check -make test +cd test +make public1 private1 libc_a +file public1 private1 +LD_DEBUG=files,bindings ldd -r ./public1 > output.txt 2>&1 || : +cat output.txt +LD_DEBUG=files,bindings ldd -r ./private1 > output.txt 2>&1 || : +cat output.txt +make +#make test %clean From fedora-extras-commits at redhat.com Thu Mar 2 17:41:50 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 2 Mar 2006 12:41:50 -0500 Subject: rpms/phpldapadmin/devel .cvsignore, 1.4, 1.5 phpldapadmin.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603021742.k22HgM5k024589@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24564 Modified Files: .cvsignore phpldapadmin.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 15 Nov 2005 16:36:04 -0000 1.4 +++ .cvsignore 2 Mar 2006 17:41:50 -0000 1.5 @@ -1 +1 @@ -phpldapadmin-0.9.7.2.tar.gz +phpldapadmin-0.9.8.1.tar.gz Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- phpldapadmin.spec 15 Feb 2006 12:24:37 -0000 1.8 +++ phpldapadmin.spec 2 Mar 2006 17:41:50 -0000 1.9 @@ -1,7 +1,7 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.7.2 -Release: 3 +Version: 0.9.8.1 +Release: 1%{?dist} Group: Applications/Internet License: GPL URL: http://phpldapadmin.sourceforge.net @@ -54,8 +54,11 @@ install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name} + pushd $RPM_BUILD_ROOT%{_datadir}/%{name} rm -rf doc/ INSTALL LICENSE +rm -rf tools/ +find locale -name "*.po" -print0 | xargs -0 rm -f popd @@ -67,11 +70,6 @@ ln -s ../../../..%{_sysconfdir}/%{name} \ $RPM_BUILD_ROOT%{_datadir}/%{name}/config -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php \ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -ln -s ../../../..%{_sysconfdir}/%{name}/template_config.php \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php - cat <%{name}.conf # # %{summary} @@ -110,12 +108,13 @@ %{_sysconfdir}/%{name}/*.example %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %{_datadir}/%{name} -%doc INSTALL LICENSE doc/CREDITS doc/ChangeLog doc/hooks.sgml +%doc INSTALL LICENSE %changelog -* Wed Feb 15 2006 Dmitry Butskoy - 0.9.7.2-3 -- rebuild for FC5 +* Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 +- upgrade to 0.9.8.1 +- remove unneeded tools dir *.po files in locale dir * Fri Nov 18 2005 Dmitry Butskoy - 0.9.7.2-2 - update upstream's tarball (was changed without version increment) Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Nov 2005 12:24:00 -0000 1.5 +++ sources 2 Mar 2006 17:41:50 -0000 1.6 @@ -1 +1 @@ -ac9923e37bbc232b9ca537cfd9282691 phpldapadmin-0.9.7.2.tar.gz +6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 17:43:05 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 2 Mar 2006 12:43:05 -0500 Subject: rpms/phpldapadmin/FC-4 phpldapadmin.spec,1.9,1.10 sources,1.4,1.5 Message-ID: <200603021743.k22Hhcgj024652@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24633 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/phpldapadmin.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- phpldapadmin.spec 23 Dec 2005 16:32:04 -0000 1.9 +++ phpldapadmin.spec 2 Mar 2006 17:43:05 -0000 1.10 @@ -1,7 +1,7 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.7.2 -Release: 2%{?dist} +Version: 0.9.8.1 +Release: 1%{?dist} Group: Applications/Internet License: GPL URL: http://phpldapadmin.sourceforge.net @@ -54,8 +54,11 @@ install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name} + pushd $RPM_BUILD_ROOT%{_datadir}/%{name} rm -rf doc/ INSTALL LICENSE +rm -rf tools/ +find locale -name "*.po" -print0 | xargs -0 rm -f popd @@ -67,11 +70,6 @@ ln -s ../../../..%{_sysconfdir}/%{name} \ $RPM_BUILD_ROOT%{_datadir}/%{name}/config -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php \ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -ln -s ../../../..%{_sysconfdir}/%{name}/template_config.php \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php - cat <%{name}.conf # # %{summary} @@ -110,10 +108,14 @@ %{_sysconfdir}/%{name}/*.example %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %{_datadir}/%{name} -%doc INSTALL LICENSE doc/CREDITS doc/ChangeLog doc/hooks.sgml +%doc INSTALL LICENSE %changelog +* Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 +- upgrade to 0.9.8.1 +- remove unneeded tools dir *.po files in locale dir + * Fri Nov 18 2005 Dmitry Butskoy - 0.9.7.2-2 - update upstream's tarball (was changed without version increment) - don't treat VERSION as doc file (#173513) Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Dec 2005 16:30:51 -0000 1.4 +++ sources 2 Mar 2006 17:43:05 -0000 1.5 @@ -1 +1 @@ -ac9923e37bbc232b9ca537cfd9282691 phpldapadmin-0.9.7.2.tar.gz +6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 17:44:40 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 2 Mar 2006 12:44:40 -0500 Subject: rpms/phpldapadmin/FC-3 phpldapadmin.spec,1.8,1.9 sources,1.4,1.5 Message-ID: <200603021745.k22HjCO6024679@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24658 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/phpldapadmin.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- phpldapadmin.spec 23 Dec 2005 16:34:03 -0000 1.8 +++ phpldapadmin.spec 2 Mar 2006 17:44:39 -0000 1.9 @@ -1,7 +1,7 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.7.2 -Release: 2%{?dist} +Version: 0.9.8.1 +Release: 1%{?dist} Group: Applications/Internet License: GPL URL: http://phpldapadmin.sourceforge.net @@ -54,8 +54,11 @@ install -d -m755 $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a * $RPM_BUILD_ROOT%{_datadir}/%{name} + pushd $RPM_BUILD_ROOT%{_datadir}/%{name} rm -rf doc/ INSTALL LICENSE +rm -rf tools/ +find locale -name "*.po" -print0 | xargs -0 rm -f popd @@ -67,11 +70,6 @@ ln -s ../../../..%{_sysconfdir}/%{name} \ $RPM_BUILD_ROOT%{_datadir}/%{name}/config -mv $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php \ - $RPM_BUILD_ROOT%{_sysconfdir}/%{name} -ln -s ../../../..%{_sysconfdir}/%{name}/template_config.php \ - $RPM_BUILD_ROOT%{_datadir}/%{name}/templates/template_config.php - cat <%{name}.conf # # %{summary} @@ -110,10 +108,14 @@ %{_sysconfdir}/%{name}/*.example %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %{_datadir}/%{name} -%doc INSTALL LICENSE doc/CREDITS doc/ChangeLog doc/hooks.sgml +%doc INSTALL LICENSE %changelog +* Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 +- upgrade to 0.9.8.1 +- remove unneeded tools dir *.po files in locale dir + * Fri Nov 18 2005 Dmitry Butskoy - 0.9.7.2-2 - update upstream's tarball (was changed without version increment) - don't treat VERSION as doc file (#173513) Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Dec 2005 16:34:03 -0000 1.4 +++ sources 2 Mar 2006 17:44:39 -0000 1.5 @@ -1 +1 @@ -ac9923e37bbc232b9ca537cfd9282691 phpldapadmin-0.9.7.2.tar.gz +6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 17:47:53 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 12:47:53 -0500 Subject: rpms/abicheck/devel abicheck.spec,1.25,1.26 Message-ID: <200603021748.k22HmPCS024702@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24685 Modified Files: abicheck.spec Log Message: Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- abicheck.spec 2 Mar 2006 17:26:43 -0000 1.25 +++ abicheck.spec 2 Mar 2006 17:47:52 -0000 1.26 @@ -50,9 +50,10 @@ cd test make public1 private1 libc_a file public1 private1 -LD_DEBUG=files,bindings ldd -r ./public1 > output.txt 2>&1 || : +ldd public1 private1 +LD_DEBUG=files,bindings LD_VERBOSE=yes LD_WARN=yes LD_BIND_NOW=yes LD_TRACE_LOADED_OBJECTS=1 /lib/ld-linux.so.2 -r ./public1 > output.txt 2>&1 || : cat output.txt -LD_DEBUG=files,bindings ldd -r ./private1 > output.txt 2>&1 || : +LD_DEBUG=files,bindings LD_VERBOSE=yes LD_WARN=yes LD_BIND_NOW=yes LD_TRACE_LOADED_OBJECTS=1 /lib/ld-linux.so.2 -r ./private1 > output.txt 2>&1 || : cat output.txt make #make test From fedora-extras-commits at redhat.com Thu Mar 2 18:12:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 13:12:34 -0500 Subject: rpms/abicheck/devel abicheck-1.2-ldlinux.patch, 1.1, 1.2 abicheck.spec, 1.26, 1.27 Message-ID: <200603021813.k22ID7RU026808@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abicheck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26784 Modified Files: abicheck-1.2-ldlinux.patch abicheck.spec Log Message: update dynamic linker patch abicheck-1.2-ldlinux.patch: Index: abicheck-1.2-ldlinux.patch =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck-1.2-ldlinux.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- abicheck-1.2-ldlinux.patch 16 Aug 2005 20:51:30 -0000 1.1 +++ abicheck-1.2-ldlinux.patch 2 Mar 2006 18:12:33 -0000 1.2 @@ -30,7 +30,7 @@ + my $ldlinux = ''; + open(DLFIND,"ldd $file0 |") or die "open: ldd: $!"; + while () { -+ /ld-linux/ and /(\S+)/ and $ldlinux = $1; ++ /(ld(-linux)*.so.\d+)/ and /(\S+)/ and $ldlinux = $1; + } + close(DLFIND); + if ( $ldlinux =~ /^$/ ) { Index: abicheck.spec =================================================================== RCS file: /cvs/extras/rpms/abicheck/devel/abicheck.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- abicheck.spec 2 Mar 2006 17:47:52 -0000 1.26 +++ abicheck.spec 2 Mar 2006 18:12:33 -0000 1.27 @@ -47,16 +47,7 @@ %check -cd test -make public1 private1 libc_a -file public1 private1 -ldd public1 private1 -LD_DEBUG=files,bindings LD_VERBOSE=yes LD_WARN=yes LD_BIND_NOW=yes LD_TRACE_LOADED_OBJECTS=1 /lib/ld-linux.so.2 -r ./public1 > output.txt 2>&1 || : -cat output.txt -LD_DEBUG=files,bindings LD_VERBOSE=yes LD_WARN=yes LD_BIND_NOW=yes LD_TRACE_LOADED_OBJECTS=1 /lib/ld-linux.so.2 -r ./private1 > output.txt 2>&1 || : -cat output.txt -make -#make test +make test %clean From fedora-extras-commits at redhat.com Thu Mar 2 18:34:27 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 2 Mar 2006 13:34:27 -0500 Subject: rpms/rekall/FC-3 rekall-2.4.0-lib64.patch, NONE, 1.1 rekall-2.4.0-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.10, 1.11 Message-ID: <200603021835.k22IZ0ML027135@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27064/FC-3 Modified Files: rekall-2.4.0-64bitfix.patch rekall.spec Added Files: rekall-2.4.0-lib64.patch Log Message: real x86_64 fix rekall-2.4.0-lib64.patch: --- NEW FILE rekall-2.4.0-lib64.patch --- --- rekall-2.4.0/scons/rkBuilder.py.BAD 2006-03-02 11:48:44.000000000 -0600 +++ rekall-2.4.0/scons/rkBuilder.py 2006-03-02 11:49:02.000000000 -0600 @@ -49,8 +49,8 @@ if rkConfig.mode in [ 'qt3' ] : instDir = rkConfig.prefix binDir = destDir + os.path.join (instDir, 'bin') - libDir = destDir + os.path.join (instDir, 'lib') - pluginDir = destDir + os.path.join (instDir, 'lib') + libDir = destDir + os.path.join (instDir, 'lib64') + pluginDir = destDir + os.path.join (instDir, 'lib64') appDir = destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName) docDir = destDir + os.path.join (instDir, 'share', 'doc', 'HTML', 'en') rekallServicesDir = os.path.join (appDir, 'services') rekall-2.4.0-64bitfix.patch: Index: rekall-2.4.0-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall-2.4.0-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.4.0-64bitfix.patch 12 Jan 2006 06:17:01 -0000 1.1 +++ rekall-2.4.0-64bitfix.patch 2 Mar 2006 18:34:27 -0000 1.2 @@ -107,3 +107,57 @@ tracePoints.remove (tp) ; delete tp ; disable () ; +--- rekall-2.4.0/libs/kbase/kb_object_full.cpp.BAD 2006-03-02 10:22:13.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_object_full.cpp 2006-03-02 10:22:26.000000000 -0600 +@@ -194,11 +194,11 @@ + } + + /* Not a special case, call the ::newNode with the */ +- /* specification. The (int) cast is is there because */ ++ /* specification. The (long) cast is is there because */ + /* ::newNode is a slot which the popup menu system */ + /* invokes, whence the arguement is really a NodeSpec */ + /* structure. */ +- newNode ((int)spec) ; ++ newNode ((long)spec) ; + return true ; + } + +--- rekall-2.4.0/libs/kbase/kb_tree.cpp.BAD 2006-03-02 10:46:41.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_tree.cpp 2006-03-02 10:46:54.000000000 -0600 +@@ -365,21 +365,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + tp->insertItem + ( TR("Query tree"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + tp->insertItem + ( TR("SQL tree" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + *dflt = &nodeSpecTable ; +--- rekall-2.4.0/libs/kbase/kb_stack.cpp.BAD 2006-03-02 11:10:53.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_stack.cpp 2006-03-02 11:10:57.000000000 -0600 +@@ -431,7 +431,7 @@ + this, + SLOT (setCurrentPage(int)), + 0, +- (int)p ++ (long)p + ) ; + + ) Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-3/rekall.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rekall.spec 1 Mar 2006 23:15:06 -0000 1.10 +++ rekall.spec 2 Mar 2006 18:34:27 -0000 1.11 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -10,10 +10,11 @@ Patch2: rekall-2.4.0-gcc4.patch Patch3: rekall-2.4.0-qtfix.patch Patch4: rekall-2.4.0-noldconfig.patch +Patch5: rekall-2.4.0-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, mysql-devel, postgresql-devel BuildRequires: kdelibs-devel, desktop-file-utils, libacl-devel -BuildRequires: scons +BuildRequires: scons, flex, bison Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: rekall-common = %{version}-%{release} @@ -101,6 +102,9 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%ifarch sparc64 alpha x86_64 ia64 +%patch5 -p1 +%endif rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig %build @@ -108,8 +112,11 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-mysql-libraries=%{_libdir}/mysql" >> scons/settings.qt3 echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-qt-includes=%{_libdir}/qt-3.3/include" >> scons/settings.qt3 +echo "with-qt-libraries=%{_libdir}/qt-3.3/lib" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -311,6 +318,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Thu Mar 2 2006 Tom "spot" Callaway 2.4.0-4 +- really fix 64bit arches + * Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 - fix x86_64 From fedora-extras-commits at redhat.com Thu Mar 2 18:34:34 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 2 Mar 2006 13:34:34 -0500 Subject: rpms/rekall/FC-4 rekall-2.4.0-lib64.patch, NONE, 1.1 rekall-2.4.0-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.10, 1.11 Message-ID: <200603021835.k22IZ6GU027139@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27064/FC-4 Modified Files: rekall-2.4.0-64bitfix.patch rekall.spec Added Files: rekall-2.4.0-lib64.patch Log Message: real x86_64 fix rekall-2.4.0-lib64.patch: --- NEW FILE rekall-2.4.0-lib64.patch --- --- rekall-2.4.0/scons/rkBuilder.py.BAD 2006-03-02 11:48:44.000000000 -0600 +++ rekall-2.4.0/scons/rkBuilder.py 2006-03-02 11:49:02.000000000 -0600 @@ -49,8 +49,8 @@ if rkConfig.mode in [ 'qt3' ] : instDir = rkConfig.prefix binDir = destDir + os.path.join (instDir, 'bin') - libDir = destDir + os.path.join (instDir, 'lib') - pluginDir = destDir + os.path.join (instDir, 'lib') + libDir = destDir + os.path.join (instDir, 'lib64') + pluginDir = destDir + os.path.join (instDir, 'lib64') appDir = destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName) docDir = destDir + os.path.join (instDir, 'share', 'doc', 'HTML', 'en') rekallServicesDir = os.path.join (appDir, 'services') rekall-2.4.0-64bitfix.patch: Index: rekall-2.4.0-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall-2.4.0-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.4.0-64bitfix.patch 12 Jan 2006 06:17:07 -0000 1.1 +++ rekall-2.4.0-64bitfix.patch 2 Mar 2006 18:34:33 -0000 1.2 @@ -107,3 +107,57 @@ tracePoints.remove (tp) ; delete tp ; disable () ; +--- rekall-2.4.0/libs/kbase/kb_object_full.cpp.BAD 2006-03-02 10:22:13.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_object_full.cpp 2006-03-02 10:22:26.000000000 -0600 +@@ -194,11 +194,11 @@ + } + + /* Not a special case, call the ::newNode with the */ +- /* specification. The (int) cast is is there because */ ++ /* specification. The (long) cast is is there because */ + /* ::newNode is a slot which the popup menu system */ + /* invokes, whence the arguement is really a NodeSpec */ + /* structure. */ +- newNode ((int)spec) ; ++ newNode ((long)spec) ; + return true ; + } + +--- rekall-2.4.0/libs/kbase/kb_tree.cpp.BAD 2006-03-02 10:46:41.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_tree.cpp 2006-03-02 10:46:54.000000000 -0600 +@@ -365,21 +365,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + tp->insertItem + ( TR("Query tree"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + tp->insertItem + ( TR("SQL tree" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + *dflt = &nodeSpecTable ; +--- rekall-2.4.0/libs/kbase/kb_stack.cpp.BAD 2006-03-02 11:10:53.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_stack.cpp 2006-03-02 11:10:57.000000000 -0600 +@@ -431,7 +431,7 @@ + this, + SLOT (setCurrentPage(int)), + 0, +- (int)p ++ (long)p + ) ; + + ) Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/FC-4/rekall.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- rekall.spec 1 Mar 2006 23:15:13 -0000 1.10 +++ rekall.spec 2 Mar 2006 18:34:33 -0000 1.11 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -10,10 +10,11 @@ Patch2: rekall-2.4.0-gcc4.patch Patch3: rekall-2.4.0-qtfix.patch Patch4: rekall-2.4.0-noldconfig.patch +Patch5: rekall-2.4.0-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, mysql-devel, postgresql-devel BuildRequires: kdelibs-devel, desktop-file-utils, libacl-devel -BuildRequires: scons +BuildRequires: scons, flex, bison Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: rekall-common = %{version}-%{release} @@ -101,6 +102,9 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%ifarch sparc64 alpha x86_64 ia64 +%patch5 -p1 +%endif rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig %build @@ -108,8 +112,11 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-mysql-libraries=%{_libdir}/mysql" >> scons/settings.qt3 echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-qt-includes=%{_libdir}/qt-3.3/include" >> scons/settings.qt3 +echo "with-qt-libraries=%{_libdir}/qt-3.3/lib" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -311,6 +318,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Thu Mar 2 2006 Tom "spot" Callaway 2.4.0-4 +- really fix 64bit arches + * Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 - fix x86_64 From fedora-extras-commits at redhat.com Thu Mar 2 18:34:39 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 2 Mar 2006 13:34:39 -0500 Subject: rpms/rekall/devel rekall-2.4.0-lib64.patch, NONE, 1.1 rekall-2.4.0-64bitfix.patch, 1.1, 1.2 rekall.spec, 1.11, 1.12 Message-ID: <200603021835.k22IZCaD027143@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/rekall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27064/devel Modified Files: rekall-2.4.0-64bitfix.patch rekall.spec Added Files: rekall-2.4.0-lib64.patch Log Message: real x86_64 fix rekall-2.4.0-lib64.patch: --- NEW FILE rekall-2.4.0-lib64.patch --- --- rekall-2.4.0/scons/rkBuilder.py.BAD 2006-03-02 11:48:44.000000000 -0600 +++ rekall-2.4.0/scons/rkBuilder.py 2006-03-02 11:49:02.000000000 -0600 @@ -49,8 +49,8 @@ if rkConfig.mode in [ 'qt3' ] : instDir = rkConfig.prefix binDir = destDir + os.path.join (instDir, 'bin') - libDir = destDir + os.path.join (instDir, 'lib') - pluginDir = destDir + os.path.join (instDir, 'lib') + libDir = destDir + os.path.join (instDir, 'lib64') + pluginDir = destDir + os.path.join (instDir, 'lib64') appDir = destDir + os.path.join (instDir, 'share', 'apps', rkConfig.appName) docDir = destDir + os.path.join (instDir, 'share', 'doc', 'HTML', 'en') rekallServicesDir = os.path.join (appDir, 'services') rekall-2.4.0-64bitfix.patch: Index: rekall-2.4.0-64bitfix.patch =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall-2.4.0-64bitfix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rekall-2.4.0-64bitfix.patch 12 Jan 2006 06:17:13 -0000 1.1 +++ rekall-2.4.0-64bitfix.patch 2 Mar 2006 18:34:39 -0000 1.2 @@ -107,3 +107,57 @@ tracePoints.remove (tp) ; delete tp ; disable () ; +--- rekall-2.4.0/libs/kbase/kb_object_full.cpp.BAD 2006-03-02 10:22:13.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_object_full.cpp 2006-03-02 10:22:26.000000000 -0600 +@@ -194,11 +194,11 @@ + } + + /* Not a special case, call the ::newNode with the */ +- /* specification. The (int) cast is is there because */ ++ /* specification. The (long) cast is is there because */ + /* ::newNode is a slot which the popup menu system */ + /* invokes, whence the arguement is really a NodeSpec */ + /* structure. */ +- newNode ((int)spec) ; ++ newNode ((long)spec) ; + return true ; + } + +--- rekall-2.4.0/libs/kbase/kb_tree.cpp.BAD 2006-03-02 10:46:41.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_tree.cpp 2006-03-02 10:46:54.000000000 -0600 +@@ -365,21 +365,21 @@ + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecTable ++ (long)&nodeSpecTable + ) ; + tp->insertItem + ( TR("Query tree"), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecQuery ++ (long)&nodeSpecQuery + ) ; + tp->insertItem + ( TR("SQL tree" ), + receiver, + SLOT(newNode(int)), + 0, +- (int)&nodeSpecSQL ++ (long)&nodeSpecSQL + ) ; + + *dflt = &nodeSpecTable ; +--- rekall-2.4.0/libs/kbase/kb_stack.cpp.BAD 2006-03-02 11:10:53.000000000 -0600 ++++ rekall-2.4.0/libs/kbase/kb_stack.cpp 2006-03-02 11:10:57.000000000 -0600 +@@ -431,7 +431,7 @@ + this, + SLOT (setCurrentPage(int)), + 0, +- (int)p ++ (long)p + ) ; + + ) Index: rekall.spec =================================================================== RCS file: /cvs/extras/rpms/rekall/devel/rekall.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- rekall.spec 1 Mar 2006 23:15:19 -0000 1.11 +++ rekall.spec 2 Mar 2006 18:34:39 -0000 1.12 @@ -1,7 +1,7 @@ Name: rekall Summary: A KDE database front-end application Version: 2.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Group: Development/Tools License: GPL URL: http://www.rekallrevealed.org/ @@ -10,10 +10,11 @@ Patch2: rekall-2.4.0-gcc4.patch Patch3: rekall-2.4.0-qtfix.patch Patch4: rekall-2.4.0-noldconfig.patch +Patch5: rekall-2.4.0-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, mysql-devel, postgresql-devel BuildRequires: kdelibs-devel, desktop-file-utils, libacl-devel -BuildRequires: scons +BuildRequires: scons, flex, bison Requires(post): desktop-file-utils Requires(postun): desktop-file-utils Requires: rekall-common = %{version}-%{release} @@ -101,6 +102,9 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%ifarch sparc64 alpha x86_64 ia64 +%patch5 -p1 +%endif rm -rf libs/el32/hash.cpp.orig libs/kbase/kb_parse.cpp.orig libs/kbase/kb_link.cpp.orig %build @@ -108,8 +112,11 @@ PARSED_OPT_FLAGS=`echo \'$RPM_OPT_FLAGS\' | sed "s/ /',/g" | sed "s/',/', '/g"` sed -i "s|'-Wall'|[$PARSED_OPT_FLAGS]|" scons/rkBuilder.py echo "prefix=%{_prefix}" >> scons/settings.qt3 +echo "with-mysql-libraries=%{_libdir}/mysql" >> scons/settings.qt3 echo "with-pgsql-libraries=%{_libdir}" >> scons/settings.qt3 echo "with-python-libraries=%{_libdir}" >> scons/settings.qt3 +echo "with-qt-includes=%{_libdir}/qt-3.3/include" >> scons/settings.qt3 +echo "with-qt-libraries=%{_libdir}/qt-3.3/lib" >> scons/settings.qt3 cp scons/settings.qt3 settings cp scons/Makefile . @@ -311,6 +318,9 @@ %{_libdir}/librekallqtrt_tableview.so %changelog +* Thu Mar 2 2006 Tom "spot" Callaway 2.4.0-4 +- really fix 64bit arches + * Wed Mar 1 2006 Tom "spot" Callaway 2.4.0-3 - fix x86_64 From fedora-extras-commits at redhat.com Thu Mar 2 19:12:21 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 2 Mar 2006 14:12:21 -0500 Subject: owners owners.list,1.695,1.696 Message-ID: <200603021912.k22JCsn2029228@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29211 Modified Files: owners.list Log Message: Take ownership of wesnoth Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.695 retrieving revision 1.696 diff -u -r1.695 -r1.696 --- owners.list 2 Mar 2006 16:52:55 -0000 1.695 +++ owners.list 2 Mar 2006 19:12:21 -0000 1.696 @@ -1388,7 +1388,7 @@ Fedora Extras|w3m-el|W3m interface for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|wavpack|A completely open audiocodec|lemenkov at newmail.ru|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|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|bugs.michael at gmx.net +Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org| Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 19:35:24 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 2 Mar 2006 14:35:24 -0500 Subject: rpms/perl-Test-WWW-Mechanize/devel perl-Test-WWW-Mechanize.spec, 1.2, 1.3 Message-ID: <200603021935.k22JZuJG029395@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29376 Modified Files: perl-Test-WWW-Mechanize.spec Log Message: Rebuild for FC5 (perl 5.8.8). Index: perl-Test-WWW-Mechanize.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-WWW-Mechanize/devel/perl-Test-WWW-Mechanize.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Test-WWW-Mechanize.spec 22 Nov 2005 14:00:41 -0000 1.2 +++ perl-Test-WWW-Mechanize.spec 2 Mar 2006 19:35:24 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Test-WWW-Mechanize Version: 1.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Testing-specific WWW::Mechanize subclass Group: Development/Libraries @@ -14,7 +14,7 @@ BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) BuildRequires: perl(URI::file), perl(WWW::Mechanize) BuildRequires: perl(Carp::Assert::More), perl(HTTP::Server::Simple) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Test::WWW::Mechanize is a subclass of WWW::Mechanize that incorporates @@ -54,6 +54,9 @@ %changelog +* Thu Mar 2 2006 Jose Pedro Oliveira - 1.08-2 +- Rebuild for FC5 (perl 5.8.8). + * Tue Nov 22 2005 Jose Pedro Oliveira - 1.08-1 - Update to 1.08. From fedora-extras-commits at redhat.com Thu Mar 2 19:52:43 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 2 Mar 2006 14:52:43 -0500 Subject: owners owners.list,1.696,1.697 Message-ID: <200603021953.k22JrGId029597@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29559 Modified Files: owners.list Log Message: Orphaning dillo, gkterm, gktools, and whowatch per previous maintainers request. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.696 retrieving revision 1.697 diff -u -r1.696 -r1.697 --- owners.list 2 Mar 2006 19:12:21 -0000 1.696 +++ owners.list 2 Mar 2006 19:52:43 -0000 1.697 @@ -177,7 +177,7 @@ Fedora Extras|dietlibc|Small libc implementation|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|digikam|A digital camera accessing & photo management application|mgarski at post.pl|extras-qa at fedoraproject.org| Fedora Extras|digikamimageplugins|Plugins for Digikam|rdieter at math.unl.edu|extras-qa at fedoraproject.org| -Fedora Extras|dillo|Very small and fast GUI web browser|nos at utelsystems.com|extras-qa at fedoraproject.org| +Fedora Extras|dillo|Very small and fast GUI web browser|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|diradmin|User control management tool for LDAP directories|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org| @@ -315,7 +315,7 @@ Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|extras-orphan at fedoraproject.org|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|gktools|GUI utilities for KerberosV tickets|nos at utelsystems.com|extras-qa at fedoraproject.org| +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|jspaleta at gmail.com|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| @@ -394,7 +394,7 @@ Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|gtkterm|Serial port terminal|nos at utelsystems.com|extras-qa at fedoraproject.org| +Fedora Extras|gtkterm|Serial port terminal|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|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| @@ -1389,7 +1389,7 @@ Fedora Extras|wavpack|A completely open audiocodec|lemenkov at newmail.ru|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|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| -Fedora Extras|whowatch|Displays informations about the users currently logged in|nos at utelsystems.com|extras-qa at fedoraproject.org| +Fedora Extras|whowatch|Displays informations about the users currently logged in|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wine-docs|Documentation for wine|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 19:57:00 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 2 Mar 2006 14:57:00 -0500 Subject: rpms/perl-Module-CoreList/devel perl-Module-CoreList.spec,1.9,1.10 Message-ID: <200603021957.k22JvWXi029667@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Module-CoreList/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29650 Modified Files: perl-Module-CoreList.spec Log Message: Rebuild for FC5 (perl 5.8.8). Index: perl-Module-CoreList.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-CoreList/devel/perl-Module-CoreList.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Module-CoreList.spec 2 Feb 2006 14:55:56 -0000 1.9 +++ perl-Module-CoreList.spec 2 Mar 2006 19:57:00 -0000 1.10 @@ -1,6 +1,6 @@ Name: perl-Module-CoreList Version: 2.04 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl core modules indexed by perl versions Group: Development/Libraries @@ -57,6 +57,9 @@ %changelog +* Thu Mar 2 2006 Jose Pedro Oliveira - 2.04-2 +- Rebuild for FC5 (perl 5.8.8). + * Thu Feb 2 2006 Jose Pedro Oliveira - 2.04-1 - Update to 2.04. From fedora-extras-commits at redhat.com Thu Mar 2 19:59:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 2 Mar 2006 14:59:52 -0500 Subject: rpms/swatch/devel swatch.spec,1.9,1.10 Message-ID: <200603022000.k22K0OLE029753@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/swatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29726 Modified Files: swatch.spec Log Message: Rebuild for FC5 (perl 5.8.8). Index: swatch.spec =================================================================== RCS file: /cvs/extras/rpms/swatch/devel/swatch.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- swatch.spec 5 Jan 2006 16:32:46 -0000 1.9 +++ swatch.spec 2 Mar 2006 19:59:52 -0000 1.10 @@ -1,6 +1,6 @@ Name: swatch Version: 3.1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Tool for actively monitoring log files Group: Applications/File @@ -14,7 +14,7 @@ BuildRequires: perl >= 1:5.6.1 BuildRequires: perl(Date::Calc), perl(Date::Format) BuildRequires: perl(File::Tail), perl(Time::HiRes) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The Simple WATCHer is an automated monitoring tool that is capable @@ -60,6 +60,9 @@ %changelog +* Thu Mar 2 2006 Jose Pedro Oliveira - 3.1.1-5 +- Rebuild for FC5 (perl 5.8.8). + * Thu Jan 5 2006 Jose Pedro Oliveira - 3.1.1-4 - Patch supplied by John Horne: doc updates and $0 handling (#160817). From fedora-extras-commits at redhat.com Thu Mar 2 20:27:46 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Thu, 2 Mar 2006 15:27:46 -0500 Subject: rpms/R-mAr/FC-4 R-mAr.spec,1.2,1.3 Message-ID: <200603022028.k22KSJ1V031885@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-mAr/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31865 Modified Files: R-mAr.spec Log Message: * Thu Mar 2 2006 Jos?? Matos - 1.1-4 - Disable building of debugging package. Index: R-mAr.spec =================================================================== RCS file: /cvs/extras/rpms/R-mAr/FC-4/R-mAr.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- R-mAr.spec 11 Oct 2005 16:56:53 -0000 1.2 +++ R-mAr.spec 2 Mar 2006 20:27:45 -0000 1.3 @@ -3,7 +3,7 @@ Summary: R module to evaluate functions for multivariate AutoRegressive analysis Name: R-%{packname} Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL version 2 or newer Group: Applications/Engineering Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz @@ -13,6 +13,8 @@ BuildRequires: R, tetex-latex BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define debug_package %{nil} + %description R package: An R add-on package for estimation of multivariate AR models through a @@ -51,11 +53,15 @@ %changelog -* Tue Oct 11 2005 Jose' Matos - 1.1-3 +* Thu Mar 2 2006 Jos?? Matos - 1.1-4 +- Disable building of debugging package. + +* Tue Oct 11 2005 Jos?? Matos - 1.1-3 - Remove html index generation as it is now automatic. * Thu Oct 6 2005 Jos?? Matos - 1.1-2 -- Add check section, add tetex-latex to BulidRequires, and remove docs as they are packaged already. +- Add check section, add tetex-latex to BulidRequires, and remove docs + as they are packaged already. * Sun Aug 21 2005 Jos?? Matos - 1.1-1 - Prepare for FE inclusion. From fedora-extras-commits at redhat.com Thu Mar 2 20:58:37 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 15:58:37 -0500 Subject: rpms/libopensync-plugin-kdepim import.log,1.1,1.2 Message-ID: <200603022059.k22Kx9UB032238@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32204 Modified Files: import.log Log Message: auto-import libopensync-plugin-kdepim-0.18-1 on branch devel from libopensync-plugin-kdepim-0.18-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 2 Mar 2006 17:20:03 -0000 1.1 +++ import.log 2 Mar 2006 20:58:37 -0000 1.2 @@ -0,0 +1 @@ +libopensync-plugin-kdepim-0_18-1:HEAD:libopensync-plugin-kdepim-0.18-1.src.rpm:1141333108 From fedora-extras-commits at redhat.com Thu Mar 2 20:58:43 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 15:58:43 -0500 Subject: rpms/libopensync-plugin-kdepim/devel libopensync-plugin-kdepim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603022059.k22KxFiD032242@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32204/devel Modified Files: .cvsignore sources Added Files: libopensync-plugin-kdepim.spec Log Message: auto-import libopensync-plugin-kdepim-0.18-1 on branch devel from libopensync-plugin-kdepim-0.18-1.src.rpm --- NEW FILE libopensync-plugin-kdepim.spec --- Name: libopensync-plugin-kdepim Version: 0.18 Release: 1 Summary: KDE plugin for libopensync Group: System Environment/Libraries License: GPL URL: http://www.opensync.org # see http://www.opensync.org/wiki/download Source0: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel BuildRequires: libstdc++-devel BuildRequires: kdepim-devel BuildRequires: kdelibs-devel %description %{summary} %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libopensync-devel %description devel The %{name}-devel package contains the files needed for development with %{name}. %prep %setup -q %build %configure --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm $RPM_BUILD_ROOT/%{_libdir}/opensync/plugins/kdepim_lib.la rm $RPM_BUILD_ROOT/%{_libdir}/opensync/plugins/kdepim_sync.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README %{_libdir}/opensync/plugins/kdepim*.so %changelog * Fri Nov 25 2005 Andreas Bierfert 0.18-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 2 Mar 2006 17:20:09 -0000 1.1 +++ .cvsignore 2 Mar 2006 20:58:42 -0000 1.2 @@ -0,0 +1 @@ +libopensync-plugin-kdepim-0.18.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 2 Mar 2006 17:20:09 -0000 1.1 +++ sources 2 Mar 2006 20:58:42 -0000 1.2 @@ -0,0 +1 @@ +96c43911a0fbdaff4920bbc0f4cd3816 libopensync-plugin-kdepim-0.18.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 21:06:59 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Thu, 2 Mar 2006 16:06:59 -0500 Subject: rpms/R-mAr/devel R-mAr.spec,1.2,1.3 Message-ID: <200603022107.k22L7VJ7001733@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-mAr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1704 Modified Files: R-mAr.spec Log Message: * Thu Mar 2 2006 Jos?? Matos - 1.1-4 - Disable building of debugging package. Index: R-mAr.spec =================================================================== RCS file: /cvs/extras/rpms/R-mAr/devel/R-mAr.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- R-mAr.spec 11 Oct 2005 16:56:12 -0000 1.2 +++ R-mAr.spec 2 Mar 2006 21:06:58 -0000 1.3 @@ -3,7 +3,7 @@ Summary: R module to evaluate functions for multivariate AutoRegressive analysis Name: R-%{packname} Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL version 2 or newer Group: Applications/Engineering Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz @@ -13,6 +13,8 @@ BuildRequires: R, tetex-latex BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +%define debug_package %{nil} + %description R package: An R add-on package for estimation of multivariate AR models through a @@ -51,11 +53,15 @@ %changelog -* Tue Oct 11 2005 Jose' Matos - 1.1-3 +* Thu Mar 2 2006 Jos?? Matos - 1.1-4 +- Disable building of debugging package. + +* Tue Oct 11 2005 Jos?? Matos - 1.1-3 - Remove html index generation as it is now automatic. * Thu Oct 6 2005 Jos?? Matos - 1.1-2 -- Add check section, add tetex-latex to BulidRequires, and remove docs as they are packaged already. +- Add check section, add tetex-latex to BulidRequires, and remove docs + as they are packaged already. * Sun Aug 21 2005 Jos?? Matos - 1.1-1 - Prepare for FE inclusion. From fedora-extras-commits at redhat.com Thu Mar 2 21:12:27 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 2 Mar 2006 16:12:27 -0500 Subject: rpms/bash-completion/devel .cvsignore, 1.9, 1.10 bash-completion.spec, 1.15, 1.16 sources, 1.9, 1.10 bash-completion-20050721-bash31quoting.patch, 1.1, NONE bash-completion-20050721-cvs-stat.patch, 1.1, NONE bash-completion-20050721-mtr.patch, 1.1, NONE bash-completion.profile, 1.4, NONE Message-ID: <200603022113.k22LD7Rm001887@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1818 Modified Files: .cvsignore bash-completion.spec sources Removed Files: bash-completion-20050721-bash31quoting.patch bash-completion-20050721-cvs-stat.patch bash-completion-20050721-mtr.patch bash-completion.profile Log Message: * Thu Mar 2 2006 Ville Skytt?? - 20060301-1 - 20060301, patches and profile.d scriptlet applied/included upstream. - Convert docs to UTF-8. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 22 Jul 2005 06:51:53 -0000 1.9 +++ .cvsignore 2 Mar 2006 21:12:24 -0000 1.10 @@ -1 +1 @@ -bash-completion-20050721.tar.bz2 +bash-completion-20060301.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/bash-completion.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- bash-completion.spec 8 Feb 2006 16:55:38 -0000 1.15 +++ bash-completion.spec 2 Mar 2006 21:12:24 -0000 1.16 @@ -1,19 +1,15 @@ Name: bash-completion -Version: 20050721 -Release: 4%{?dist} +Version: 20060301 +Release: 1%{?dist} Summary: Programmable completion for Bash Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 -Source1: %{name}.profile Source2: %{name}-mock Source3: %{name}-repomanage Source4: %{name}-plague-client -Patch0: %{name}-20050721-cvs-stat.patch -Patch1: %{name}-20050721-bash31quoting.patch -Patch2: %{name}-20050721-mtr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,9 +22,7 @@ %prep %setup -q -n bash_completion -%patch0 -%patch1 -p1 -%patch2 +f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f install -pm 644 %{SOURCE2} contrib/mock install -pm 644 %{SOURCE3} contrib/plague-client install -pm 644 %{SOURCE3} contrib/repomanage @@ -41,8 +35,7 @@ rm -rf $RPM_BUILD_ROOT %{name}-ghosts.list install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -pm 644 bash_completion $RPM_BUILD_ROOT%{_sysconfdir} -install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/bash_completion.sh +install -pm 644 bash_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name} install -pm 644 contrib/* $RPM_BUILD_ROOT%{_datadir}/%{name} install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d @@ -81,7 +74,6 @@ %bashcomp_trigger ruby-ri ri %bashcomp_trigger sbcl %bashcomp_trigger snownews -%bashcomp_trigger subversion %bashcomp_trigger unace %bashcomp_trigger unixODBC isql %bashcomp_trigger unrar @@ -98,6 +90,10 @@ %changelog +* Thu Mar 2 2006 Ville Skytt?? - 20060301-1 +- 20060301, patches and profile.d scriptlet applied/included upstream. +- Convert docs to UTF-8. + * Wed Feb 8 2006 Ville Skytt?? - 20050721-4 - Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod). - Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Jul 2005 06:51:53 -0000 1.9 +++ sources 2 Mar 2006 21:12:24 -0000 1.10 @@ -1 +1 @@ -4de9f0dee0663f08b5e24f64490e642e bash-completion-20050721.tar.bz2 +ed95a89f57357a42b8e4eb95487bf9d0 bash-completion-20060301.tar.bz2 --- bash-completion-20050721-bash31quoting.patch DELETED --- --- bash-completion-20050721-cvs-stat.patch DELETED --- --- bash-completion-20050721-mtr.patch DELETED --- --- bash-completion.profile DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 21:15:59 2006 From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh)) Date: Thu, 2 Mar 2006 16:15:59 -0500 Subject: rpms/mediawiki/devel .cvsignore, 1.2, 1.3 mediawiki.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603022116.k22LGVWu001972@cvs-int.fedora.redhat.com> Author: roozbeh Update of /cvs/extras/rpms/mediawiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1949 Modified Files: .cvsignore mediawiki.spec sources Log Message: * Thu Mar 02 2006 Roozbeh Pournader - 1.5.7-1 - Update to upstream 1.5.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Feb 2006 09:00:43 -0000 1.2 +++ .cvsignore 2 Mar 2006 21:15:59 -0000 1.3 @@ -1 +1 @@ -mediawiki-1.5.6.tar.gz +mediawiki-1.5.7.tar.gz Index: mediawiki.spec =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mediawiki.spec 13 Feb 2006 19:08:06 -0000 1.3 +++ mediawiki.spec 2 Mar 2006 21:15:59 -0000 1.4 @@ -1,8 +1,8 @@ %define wikidir %{_var}/www/mediawiki Name: mediawiki -Version: 1.5.6 -Release: 6%{?dist} +Version: 1.5.7 +Release: 1%{?dist} Summary: The PHP-based wiki software behind Wikipedia Group: Applications/Internet @@ -89,6 +89,9 @@ %changelog +* Thu Mar 02 2006 Roozbeh Pournader - 1.5.7-1 +- Update to upstream 1.5.7 + * Mon Feb 13 2006 Roozbeh Pournader - 1.5.6-6 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Feb 2006 09:00:43 -0000 1.2 +++ sources 2 Mar 2006 21:15:59 -0000 1.3 @@ -1 +1 @@ -adcb318d812af2d2637374a8aadc79c1 mediawiki-1.5.6.tar.gz +0a2347e2422006d8f75479b06c1963d8 mediawiki-1.5.7.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 21:29:22 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 2 Mar 2006 16:29:22 -0500 Subject: rpms/thinkpad-kmod-common/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 thinkpad-kmod-common.spec, 1.1, 1.2 Message-ID: <200603022129.k22LTuk9002356@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2294 Modified Files: .cvsignore sources thinkpad-kmod-common.spec Log Message: * Sat Feb 25 2006 Ville Skytt?? - 5.9-1 - 5.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jan 2006 22:14:12 -0000 1.2 +++ .cvsignore 2 Mar 2006 21:29:22 -0000 1.3 @@ -1 +1 @@ -thinkpad_5.8.tar.gz +thinkpad-5.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jan 2006 22:14:12 -0000 1.2 +++ sources 2 Mar 2006 21:29:22 -0000 1.3 @@ -1 +1 @@ -288ab19587bb3a8a4d6097448059b4c6 thinkpad_5.8.tar.gz +9cd4e86277bb7baeca97e93f57f49e87 thinkpad-5.9.tar.gz Index: thinkpad-kmod-common.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/thinkpad-kmod-common.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- thinkpad-kmod-common.spec 26 Jan 2006 22:14:12 -0000 1.1 +++ thinkpad-kmod-common.spec 2 Mar 2006 21:29:22 -0000 1.2 @@ -2,14 +2,14 @@ %define kmod_name thinkpad Name: %{kmod_name}-kmod-common -Version: 5.8 -Release: 5%{?dist} -Summary: Supplemental kernel modules for ThinkPad?? laptop computers +Version: 5.9 +Release: 1%{?dist} +Summary: Common files for supplemental ThinkPad?? kernel modules License: GPL Group: System Environment/Kernel URL: http://tpctl.sourceforge.net/ -Source0: http://download.sf.net/tpctl/%{kmod_name}_%{version}.tar.gz +Source0: http://download.sf.net/tpctl/%{kmod_name}-%{version}.tar.gz Source1: %{name}-console.perms Source2: %{name}.modules BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -55,6 +55,9 @@ %changelog +* Sat Feb 25 2006 Ville Skytt?? - 5.9-1 +- 5.9. + * Tue Dec 27 2005 Ville Skytt?? - 5.8-5 - Rename to thinkpad-kmod-common. From fedora-extras-commits at redhat.com Thu Mar 2 21:31:19 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 16:31:19 -0500 Subject: rpms/libopensync-plugin-kdepim/devel libopensync-plugin-kdepim.spec, 1.1, 1.2 Message-ID: <200603022131.k22LVpOM002676@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2394 Modified Files: libopensync-plugin-kdepim.spec Log Message: - add dist Index: libopensync-plugin-kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libopensync-plugin-kdepim.spec 2 Mar 2006 20:58:42 -0000 1.1 +++ libopensync-plugin-kdepim.spec 2 Mar 2006 21:31:18 -0000 1.2 @@ -1,6 +1,6 @@ Name: libopensync-plugin-kdepim Version: 0.18 -Release: 1 +Release: 1%{?dist} Summary: KDE plugin for libopensync Group: System Environment/Libraries @@ -56,5 +56,8 @@ %{_libdir}/opensync/plugins/kdepim*.so %changelog +* Thu Mar 02 2006 Andreas Bierfert +- add dist + * Fri Nov 25 2005 Andreas Bierfert 0.18-1 - initial version From fedora-extras-commits at redhat.com Thu Mar 2 21:29:34 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 16:29:34 -0500 Subject: rpms/gnome-telnet/devel gnome-telnet.spec,1.6,1.7 Message-ID: <200603022132.k22LWauB002787@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/gnome-telnet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gnome-telnet/devel Modified Files: gnome-telnet.spec Log Message: Build disabled. Package is without maintainer. Index: gnome-telnet.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-telnet/devel/gnome-telnet.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnome-telnet.spec 6 Apr 2005 22:11:38 -0000 1.6 +++ gnome-telnet.spec 2 Mar 2006 21:29:33 -0000 1.7 @@ -19,6 +19,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/tetex-armtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/tetex-armtex/devel Modified Files: tetex-armtex.spec Log Message: Build disabled. Package is without maintainer. Index: tetex-armtex.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-armtex/devel/tetex-armtex.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tetex-armtex.spec 6 Apr 2005 22:13:32 -0000 1.4 +++ tetex-armtex.spec 2 Mar 2006 21:32:06 -0000 1.5 @@ -31,6 +31,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/rpmproc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/rpmproc/devel Modified Files: rpmproc.spec Log Message: Build disabled. Package is without maintainer. Index: rpmproc.spec =================================================================== RCS file: /cvs/extras/rpms/rpmproc/devel/rpmproc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rpmproc.spec 6 Apr 2005 22:13:31 -0000 1.4 +++ rpmproc.spec 2 Mar 2006 21:31:37 -0000 1.5 @@ -25,6 +25,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gonvert/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gonvert/devel Modified Files: gonvert.spec Log Message: Build disabled. Package is without maintainer. Index: gonvert.spec =================================================================== RCS file: /cvs/extras/rpms/gonvert/devel/gonvert.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gonvert.spec 6 Apr 2005 22:11:38 -0000 1.6 +++ gonvert.spec 2 Mar 2006 21:30:03 -0000 1.7 @@ -25,6 +25,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/freedroidrpg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/freedroidrpg/devel Modified Files: freedroidrpg.spec Log Message: Build disabled. Package is without maintainer. Index: freedroidrpg.spec =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- freedroidrpg.spec 22 Sep 2005 21:17:13 -0000 1.11 +++ freedroidrpg.spec 2 Mar 2006 21:29:04 -0000 1.12 @@ -26,6 +26,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/cvsup/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/cvsup/devel Modified Files: cvsup.spec Log Message: Build disabled. Package is without maintainer. Index: cvsup.spec =================================================================== RCS file: /cvs/extras/rpms/cvsup/devel/cvsup.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cvsup.spec 23 Jan 2006 21:23:05 -0000 1.9 +++ cvsup.spec 2 Mar 2006 21:28:35 -0000 1.10 @@ -83,6 +83,13 @@ This package contains the cvsupd server program. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/screem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/screem/devel Modified Files: screem.spec Log Message: Build disabled. Package is without maintainer. Index: screem.spec =================================================================== RCS file: /cvs/extras/rpms/screem/devel/screem.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- screem.spec 7 Jul 2005 20:57:33 -0000 1.5 +++ screem.spec 2 Mar 2006 21:31:43 -0000 1.6 @@ -40,6 +40,13 @@ parsing, page templates and publishing of files are also supported. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/nget/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/nget/devel Modified Files: nget.spec Log Message: Build disabled. Package is without maintainer. Index: nget.spec =================================================================== RCS file: /cvs/extras/rpms/nget/devel/nget.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- nget.spec 22 May 2005 22:53:46 -0000 1.7 +++ nget.spec 2 Mar 2006 21:31:08 -0000 1.8 @@ -22,6 +22,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gtkglarea2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gtkglarea2/devel Modified Files: gtkglarea2.spec Log Message: Build disabled. Package is without maintainer. Index: gtkglarea2.spec =================================================================== RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gtkglarea2.spec 17 Feb 2006 21:33:55 -0000 1.12 +++ gtkglarea2.spec 2 Mar 2006 21:30:09 -0000 1.13 @@ -33,6 +33,13 @@ software development. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/tetex-font-tipa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/tetex-font-tipa/devel Modified Files: tetex-font-tipa.spec Log Message: Build disabled. Package is without maintainer. Index: tetex-font-tipa.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-font-tipa/devel/tetex-font-tipa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tetex-font-tipa.spec 12 Nov 2005 20:11:32 -0000 1.7 +++ tetex-font-tipa.spec 2 Mar 2006 21:32:12 -0000 1.8 @@ -35,6 +35,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/dillo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/dillo/devel Modified Files: dillo.spec Log Message: Build disabled. Package is without maintainer. Index: dillo.spec =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/dillo.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dillo.spec 6 Apr 2005 22:11:36 -0000 1.8 +++ dillo.spec 2 Mar 2006 21:28:41 -0000 1.9 @@ -27,6 +27,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/parchive/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/parchive/devel Modified Files: parchive.spec Log Message: Build disabled. Package is without maintainer. Index: parchive.spec =================================================================== RCS file: /cvs/extras/rpms/parchive/devel/parchive.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- parchive.spec 23 May 2005 00:03:36 -0000 1.8 +++ parchive.spec 2 Mar 2006 21:31:14 -0000 1.9 @@ -17,6 +17,13 @@ recovery of any 'X' volumes for 'X' parity volumes present. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gtkterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gtkterm/devel Modified Files: gtkterm.spec Log Message: Build disabled. Package is without maintainer. Index: gtkterm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/gtkterm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gtkterm.spec 6 Apr 2005 22:12:00 -0000 1.6 +++ gtkterm.spec 2 Mar 2006 21:30:15 -0000 1.7 @@ -18,6 +18,13 @@ Similar to minicom or hyperterminal. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gurlchecker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gurlchecker/devel Modified Files: gurlchecker.spec Log Message: Build disabled. Package is without maintainer. Index: gurlchecker.spec =================================================================== RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gurlchecker.spec 25 May 2005 21:39:31 -0000 1.7 +++ gurlchecker.spec 2 Mar 2006 21:30:20 -0000 1.8 @@ -23,6 +23,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gkrellm-themes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gkrellm-themes/devel Modified Files: gkrellm-themes.spec Log Message: Build disabled. Package is without maintainer. Index: gkrellm-themes.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-themes/devel/gkrellm-themes.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gkrellm-themes.spec 17 Jan 2006 18:35:40 -0000 1.7 +++ gkrellm-themes.spec 2 Mar 2006 21:29:16 -0000 1.8 @@ -23,6 +23,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/arc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/arc/devel Modified Files: arc.spec Log Message: Build disabled. Package is without maintainer. Index: arc.spec =================================================================== RCS file: /cvs/extras/rpms/arc/devel/arc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- arc.spec 13 Oct 2005 19:10:30 -0000 1.12 +++ arc.spec 2 Mar 2006 21:28:17 -0000 1.13 @@ -15,6 +15,13 @@ but useful if you have old .arc files you need to unpack. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/tetex-lgrind/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/tetex-lgrind/devel Modified Files: tetex-lgrind.spec Log Message: Build disabled. Package is without maintainer. Index: tetex-lgrind.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-lgrind/devel/tetex-lgrind.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- tetex-lgrind.spec 23 Aug 2005 13:21:32 -0000 1.13 +++ tetex-lgrind.spec 2 Mar 2006 21:32:18 -0000 1.14 @@ -34,6 +34,13 @@ MODEL, MatLab, and Russell. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/perl-Net-SCP/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/perl-Net-SCP/devel Modified Files: perl-Net-SCP.spec Log Message: Build disabled. Package is without maintainer. Index: perl-Net-SCP.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SCP/devel/perl-Net-SCP.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Net-SCP.spec 6 Apr 2005 22:13:07 -0000 1.6 +++ perl-Net-SCP.spec 2 Mar 2006 21:31:19 -0000 1.7 @@ -21,6 +21,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/manedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/manedit/devel Modified Files: manedit.spec Log Message: Build disabled. Package is without maintainer. Index: manedit.spec =================================================================== RCS file: /cvs/extras/rpms/manedit/devel/manedit.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- manedit.spec 14 Apr 2005 13:29:12 -0000 1.11 +++ manedit.spec 2 Mar 2006 21:30:45 -0000 1.12 @@ -24,6 +24,13 @@ and requires the X Window Systems. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gnome-themes-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gnome-themes-extras/devel Modified Files: gnome-themes-extras.spec Log Message: Build disabled. Package is without maintainer. Index: gnome-themes-extras.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/gnome-themes-extras.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- gnome-themes-extras.spec 13 Apr 2005 21:50:00 -0000 1.11 +++ gnome-themes-extras.spec 2 Mar 2006 21:29:57 -0000 1.12 @@ -26,6 +26,13 @@ an extra set of themes that are not only functional, but also eye catching. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/cgoban/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/cgoban/devel Modified Files: cgoban.spec Log Message: Build disabled. Package is without maintainer. Index: cgoban.spec =================================================================== RCS file: /cvs/extras/rpms/cgoban/devel/cgoban.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cgoban.spec 2 Mar 2006 02:57:34 -0000 1.9 +++ cgoban.spec 2 Mar 2006 21:28:23 -0000 1.10 @@ -22,6 +22,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/sirius/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/sirius/devel Modified Files: sirius.spec Log Message: Build disabled. Package is without maintainer. Index: sirius.spec =================================================================== RCS file: /cvs/extras/rpms/sirius/devel/sirius.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sirius.spec 23 May 2005 00:12:04 -0000 1.9 +++ sirius.spec 2 Mar 2006 21:31:49 -0000 1.10 @@ -33,6 +33,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gdeskcal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gdeskcal/devel Modified Files: gdeskcal.spec Log Message: Build disabled. Package is without maintainer. Index: gdeskcal.spec =================================================================== RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gdeskcal.spec 6 Apr 2005 22:11:38 -0000 1.7 +++ gdeskcal.spec 2 Mar 2006 21:29:10 -0000 1.8 @@ -26,6 +26,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/cksfv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/cksfv/devel Modified Files: cksfv.spec Log Message: Build disabled. Package is without maintainer. Index: cksfv.spec =================================================================== RCS file: /cvs/extras/rpms/cksfv/devel/cksfv.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cksfv.spec 23 Jul 2005 17:12:03 -0000 1.8 +++ cksfv.spec 2 Mar 2006 21:28:29 -0000 1.9 @@ -16,6 +16,13 @@ checksums. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/tetex-arabtex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/tetex-arabtex/devel Modified Files: tetex-arabtex.spec Log Message: Build disabled. Package is without maintainer. Index: tetex-arabtex.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-arabtex/devel/tetex-arabtex.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tetex-arabtex.spec 12 Nov 2005 20:23:12 -0000 1.6 +++ tetex-arabtex.spec 2 Mar 2006 21:32:00 -0000 1.7 @@ -33,6 +33,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/mknbi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/mknbi/devel Modified Files: mknbi.spec Log Message: Build disabled. Package is without maintainer. Index: mknbi.spec =================================================================== RCS file: /cvs/extras/rpms/mknbi/devel/mknbi.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mknbi.spec 4 May 2005 04:06:16 -0000 1.9 +++ mknbi.spec 2 Mar 2006 21:30:51 -0000 1.10 @@ -19,6 +19,13 @@ images, Linux kernels, FreeDOS and DOS bootable floppy images. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/monkey-bubble/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/monkey-bubble/devel Modified Files: monkey-bubble.spec Log Message: Build disabled. Package is without maintainer. Index: monkey-bubble.spec =================================================================== RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- monkey-bubble.spec 3 Mar 2005 23:01:24 -0000 1.2 +++ monkey-bubble.spec 2 Mar 2006 21:30:57 -0000 1.3 @@ -26,6 +26,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gktools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gktools/devel Modified Files: gktools.spec Log Message: Build disabled. Package is without maintainer. Index: gktools.spec =================================================================== RCS file: /cvs/extras/rpms/gktools/devel/gktools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gktools.spec 6 Apr 2005 22:11:38 -0000 1.5 +++ gktools.spec 2 Mar 2006 21:29:21 -0000 1.6 @@ -19,6 +19,13 @@ gktickets - GUI version of klist for listing and tracking kerberos tickets %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/elmo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/elmo/devel Modified Files: elmo.spec Log Message: Build disabled. Package is without maintainer. Index: elmo.spec =================================================================== RCS file: /cvs/extras/rpms/elmo/devel/elmo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- elmo.spec 13 Nov 2005 17:09:51 -0000 1.7 +++ elmo.spec 2 Mar 2006 21:28:58 -0000 1.8 @@ -20,6 +20,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/themes-backgrounds-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/themes-backgrounds-gnome/devel Modified Files: themes-backgrounds-gnome.spec Log Message: Build disabled. Package is without maintainer. Index: themes-backgrounds-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/themes-backgrounds-gnome/devel/themes-backgrounds-gnome.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- themes-backgrounds-gnome.spec 14 Feb 2006 09:07:49 -0000 1.10 +++ themes-backgrounds-gnome.spec 2 Mar 2006 21:32:24 -0000 1.11 @@ -14,6 +14,13 @@ Assorted Backgrounds from art.gnome.org. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/perl-Net-SSH/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/perl-Net-SSH/devel Modified Files: perl-Net-SSH.spec Log Message: Build disabled. Package is without maintainer. Index: perl-Net-SSH.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-SSH/devel/perl-Net-SSH.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Net-SSH.spec 6 Apr 2005 22:13:07 -0000 1.7 +++ perl-Net-SSH.spec 2 Mar 2006 21:31:25 -0000 1.8 @@ -25,6 +25,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/hping2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/hping2/devel Modified Files: hping2.spec Log Message: Build disabled. Package is without maintainer. Index: hping2.spec =================================================================== RCS file: /cvs/extras/rpms/hping2/devel/hping2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hping2.spec 8 Feb 2006 14:47:29 -0000 1.8 +++ hping2.spec 2 Mar 2006 21:30:26 -0000 1.9 @@ -21,6 +21,13 @@ in order to transfer files under supported protocols. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/prozilla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/prozilla/devel Modified Files: prozilla.spec Log Message: Build disabled. Package is without maintainer. Index: prozilla.spec =================================================================== RCS file: /cvs/extras/rpms/prozilla/devel/prozilla.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- prozilla.spec 20 Jan 2006 10:00:32 -0000 1.12 +++ prozilla.spec 2 Mar 2006 21:31:31 -0000 1.13 @@ -27,6 +27,13 @@ fastest ping times. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/libzvt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/libzvt/devel Modified Files: libzvt.spec Log Message: Build disabled. Package is without maintainer. Index: libzvt.spec =================================================================== RCS file: /cvs/extras/rpms/libzvt/devel/libzvt.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libzvt.spec 22 May 2005 23:54:31 -0000 1.7 +++ libzvt.spec 2 Mar 2006 21:30:32 -0000 1.8 @@ -40,6 +40,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gnome-password-generator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/gnome-password-generator/devel Modified Files: gnome-password-generator.spec Log Message: Build disabled. Package is without maintainer. Index: gnome-password-generator.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-password-generator/devel/gnome-password-generator.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnome-password-generator.spec 6 Apr 2005 22:11:38 -0000 1.5 +++ gnome-password-generator.spec 2 Mar 2006 21:29:27 -0000 1.6 @@ -27,6 +27,13 @@ %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/whowatch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/whowatch/devel Modified Files: whowatch.spec Log Message: Build disabled. Package is without maintainer. Index: whowatch.spec =================================================================== RCS file: /cvs/extras/rpms/whowatch/devel/whowatch.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- whowatch.spec 8 Apr 2005 06:44:32 -0000 1.8 +++ whowatch.spec 2 Mar 2006 21:32:29 -0000 1.9 @@ -22,6 +22,13 @@ selected process. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/tdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/tdl/devel Modified Files: tdl.spec Log Message: Build disabled. Package is without maintainer. Index: tdl.spec =================================================================== RCS file: /cvs/extras/rpms/tdl/devel/tdl.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- tdl.spec 23 May 2005 00:15:08 -0000 1.9 +++ tdl.spec 2 Mar 2006 21:31:55 -0000 1.10 @@ -19,6 +19,13 @@ the command line, or enter an interactive mode which uses the readline library. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/netdiag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2108/netdiag/devel Modified Files: netdiag.spec Log Message: Build disabled. Package is without maintainer. Index: netdiag.spec =================================================================== RCS file: /cvs/extras/rpms/netdiag/devel/netdiag.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- netdiag.spec 26 May 2005 15:44:35 -0000 1.9 +++ netdiag.spec 2 Mar 2006 21:31:02 -0000 1.10 @@ -22,6 +22,13 @@ %prep +cat< Author: roozbeh Update of /cvs/extras/rpms/mediawiki/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2078 Modified Files: .cvsignore mediawiki.spec sources Log Message: * Thu Mar 02 2006 Roozbeh Pournader - 1.5.7-1 - Update to upstream 1.5.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mediawiki/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Feb 2006 09:00:43 -0000 1.2 +++ .cvsignore 2 Mar 2006 21:33:16 -0000 1.3 @@ -1 +1 @@ -mediawiki-1.5.6.tar.gz +mediawiki-1.5.7.tar.gz Index: mediawiki.spec =================================================================== RCS file: /cvs/extras/rpms/mediawiki/FC-4/mediawiki.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mediawiki.spec 6 Feb 2006 17:31:08 -0000 1.2 +++ mediawiki.spec 2 Mar 2006 21:33:16 -0000 1.3 @@ -1,8 +1,8 @@ %define wikidir %{_var}/www/mediawiki Name: mediawiki -Version: 1.5.6 -Release: 5%{?dist} +Version: 1.5.7 +Release: 1%{?dist} Summary: The PHP-based wiki software behind Wikipedia Group: Applications/Internet @@ -89,6 +89,12 @@ %changelog +* Thu Mar 02 2006 Roozbeh Pournader - 1.5.7-1 +- Update to upstream 1.5.7 + +* Mon Feb 13 2006 Roozbeh Pournader - 1.5.6-6 +- Rebuild for Fedora Extras 5 + * Mon Feb 06 2006 Roozbeh Pournader - 1.5.6-5 - Put internal doc files in the right directory, renaming it back to docs (#180177) Index: sources =================================================================== RCS file: /cvs/extras/rpms/mediawiki/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Feb 2006 09:00:43 -0000 1.2 +++ sources 2 Mar 2006 21:33:16 -0000 1.3 @@ -1 +1 @@ -adcb318d812af2d2637374a8aadc79c1 mediawiki-1.5.6.tar.gz +0a2347e2422006d8f75479b06c1963d8 mediawiki-1.5.7.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 21:36:45 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Mar 2006 16:36:45 -0500 Subject: rpms/hdf5/FC-3 hdf5-1.6.5-h5diff_attr.patch, NONE, 1.1 hdf5-1.6.4-h5diff_attr.patch, 1.1, NONE Message-ID: <200603022136.k22LalX2002980@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2967 Added Files: hdf5-1.6.5-h5diff_attr.patch Removed Files: hdf5-1.6.4-h5diff_attr.patch Log Message: Update patch to fix h5diff_attr.c to 1.6.5 hdf5-1.6.5-h5diff_attr.patch: --- NEW FILE hdf5-1.6.5-h5diff_attr.patch --- --- hdf5-1.6.5/tools/lib/h5diff_attr.c.orig 2005-12-21 12:08:45.000000000 -0700 +++ hdf5-1.6.5/tools/lib/h5diff_attr.c 2005-12-21 12:11:17.000000000 -0700 @@ -61,8 +61,8 @@ int rank2; /* rank of dataset */ hsize_t dims1[H5S_MAX_RANK];/* dimensions of dataset */ hsize_t dims2[H5S_MAX_RANK];/* dimensions of dataset */ - char name1[255]; - char name2[255]; + char name1[255],np1[512]; + char name2[255],np2[512]; int n1, n2, i, j; int ret=0; hsize_t nfound; @@ -196,21 +196,21 @@ * array compare *------------------------------------------------------------------------- */ - sprintf(name1,"%s of <%s>",name1,path1); - sprintf(name2,"%s of <%s>",name2,path2); + snprintf(np1,sizeof(np1),"%s of <%s>",name1,path1); + snprintf(np2,sizeof(np2),"%s of <%s>",name2,path2); /* always print name */ if (options->m_verbose) { - printf( "Attribute: <%s> and <%s>\n",name1,name2); + printf( "Attribute: <%s> and <%s>\n",np1,np2); nfound = diff_array(buf1, buf2, nelmts1, rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -230,8 +230,8 @@ rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -239,15 +239,15 @@ options->m_quiet=0; if (nfound) { - printf( "Attribute: <%s> and <%s>\n",name1,name2); + printf( "Attribute: <%s> and <%s>\n",np1,np2); nfound = diff_array(buf1, buf2, nelmts1, rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); @@ -263,8 +263,8 @@ rank1, dims1, options, - name1, - name2, + np1, + np2, mtype1_id, attr1_id, attr2_id); --- hdf5-1.6.4-h5diff_attr.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 21:37:24 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 2 Mar 2006 16:37:24 -0500 Subject: rpms/thinkpad-kmod/devel thinkpad-kmod-5.9-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 thinkpad-kmod.spec, 1.2, 1.3 thinkpad-kmod-2615pm.patch, 1.1, NONE thinkpad-kmod-percpu.patch, 1.1, NONE Message-ID: <200603022137.k22LbvWY003036@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3007 Modified Files: .cvsignore sources thinkpad-kmod.spec Added Files: thinkpad-kmod-5.9-build.patch Removed Files: thinkpad-kmod-2615pm.patch thinkpad-kmod-percpu.patch Log Message: * Sat Feb 25 2006 Ville Skytt?? - 5.9-1 - 5.9. thinkpad-kmod-5.9-build.patch: --- NEW FILE thinkpad-kmod-5.9-build.patch --- --- thinkpad-5.9/2.6/drivers/Makefile~ 2005-12-22 14:23:16.000000000 +0200 +++ thinkpad-5.9/2.6/drivers/Makefile 2006-02-25 17:41:12.000000000 +0200 @@ -7,7 +7,7 @@ endif ifndef EXTRA_CFLAGS -EXTRA_CFLAGS := -Wall -Wcast-align -Wstrict-prototypes -O2 -DLINUX -I$(SUBDIRS)/../include +EXTRA_CFLAGS := -Wall -Wcast-align -Wstrict-prototypes -DLINUX -I$(SUBDIRS)/../include endif obj-m := thinkpad.o smapi.o superio.o rtcmosram.o @@ -28,10 +28,9 @@ install: if [ ! -d $(MODULESROOT)/thinkpad ]; then mkdir -p -m 755 $(MODULESROOT)/thinkpad ; fi - install -m 444 -o 0 -g 0 thinkpad.ko $(MODULESROOT)/thinkpad/thinkpad.ko - install -m 444 -o 0 -g 0 smapi.ko $(MODULESROOT)/thinkpad/smapi.ko - install -m 444 -o 0 -g 0 superio.ko $(MODULESROOT)/thinkpad/superio.ko - install -m 444 -o 0 -g 0 rtcmosram.ko $(MODULESROOT)/thinkpad/rtcmosram.ko - depmod -a + install -m 744 thinkpad.ko $(MODULESROOT)/thinkpad/thinkpad.ko + install -m 744 smapi.ko $(MODULESROOT)/thinkpad/smapi.ko + install -m 744 superio.ko $(MODULESROOT)/thinkpad/superio.ko + install -m 744 rtcmosram.ko $(MODULESROOT)/thinkpad/rtcmosram.ko .PHONY: default clean install Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Jan 2006 22:21:45 -0000 1.2 +++ .cvsignore 2 Mar 2006 21:37:24 -0000 1.3 @@ -1 +1 @@ -thinkpad_5.8.tar.gz +thinkpad-5.9.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Jan 2006 22:21:45 -0000 1.2 +++ sources 2 Mar 2006 21:37:24 -0000 1.3 @@ -1 +1 @@ -288ab19587bb3a8a4d6097448059b4c6 thinkpad_5.8.tar.gz +9cd4e86277bb7baeca97e93f57f49e87 thinkpad-5.9.tar.gz Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- thinkpad-kmod.spec 28 Jan 2006 12:51:08 -0000 1.2 +++ thinkpad-kmod.spec 2 Mar 2006 21:37:24 -0000 1.3 @@ -9,13 +9,12 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules -Version: 5.8 -Release: 10.%(echo %{kverrel} | tr - _) +Version: 5.9 +Release: 1.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ -Source0: http://download.sf.net/tpctl/thinkpad_%{version}.tar.gz -Patch0: %{name}-percpu.patch -Patch1: %{name}-2615pm.patch +Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz +Patch0: %{name}-5.9-build.patch License: GPL Group: System Environment/Kernel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -35,12 +34,8 @@ #sleep 5 %setup -q -T -c -a 0 -cd %{kmod_name}-%{version} -%{__perl} -pi -e 's|-O2\s+||' 2.6/drivers/Makefile -sed -i 's|depmod -a|echo depmod -a disabled|' 2.6/drivers/Makefile %patch0 -p0 -%patch1 -p0 -cd .. +sed -i /enable_thinkpadpm/d %{kmod_name}-%{version}/2.6/drivers/thinkpad.c for kvariant in %{kvariants} ; do cp -a %{kmod_name}-%{version}* _kmod_build_$kvariant done @@ -59,7 +54,6 @@ make -C _kmod_build_$kvariant/2.6/drivers install \ MODULESROOT=$RPM_BUILD_ROOT/lib/modules/%{kverrel}$kvariant/extra done -chmod u+x $RPM_BUILD_ROOT/lib/modules/*/extra/%{kmod_name}/* %clean @@ -67,6 +61,9 @@ %changelog +* Sat Feb 25 2006 Ville Skytt?? - 5.9-1 +- 5.9. + * Sat Jan 28 2006 Ville Skytt?? - 5.8-10 - Update kmodtool to 0.10.4, fixes support for non-UP FC kernels. --- thinkpad-kmod-2615pm.patch DELETED --- --- thinkpad-kmod-percpu.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 21:38:44 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 2 Mar 2006 16:38:44 -0500 Subject: rpms/hdf5/FC-3 .cvsignore, 1.2, 1.3 hdf5.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603022139.k22LdGoa003148@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3063 Modified Files: .cvsignore hdf5.spec sources Log Message: Update to 1.6.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 5 Jul 2005 20:20:17 -0000 1.2 +++ .cvsignore 2 Mar 2006 21:38:43 -0000 1.3 @@ -1 +1 @@ -hdf5-1.6.4.tar.gz +hdf5-1.6.5.tar.gz Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/hdf5.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf5.spec 5 Jul 2005 20:20:17 -0000 1.1 +++ hdf5.spec 2 Mar 2006 21:38:43 -0000 1.2 @@ -1,6 +1,6 @@ Name: hdf5 -Version: 1.6.4 -Release: 4%{?dist} +Version: 1.6.5 +Release: 1%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -10,9 +10,9 @@ Patch1: hdf5-1.6.4-destdir.patch Patch2: hdf5-1.6.4-norpath.patch Patch3: hdf5-1.6.4-testh5repack.patch -Patch4: hdf5-1.6.4-h5diff_attr.patch +Patch4: hdf5-1.6.5-h5diff_attr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: krb5-devel, openssl-devel, zlib-devel +BuildRequires: krb5-devel, openssl-devel, zlib-devel, time %description HDF5 is a general purpose library and file format for storing scientific data. @@ -51,6 +51,8 @@ find doc/html -name '*.sh*' | xargs chmod +x %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir} rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings +# Don't instal h5perf until h5test.so.0 issues is sorted out +rm $RPM_BUILD_ROOT/%{_bindir}/h5perf %check make check @@ -68,15 +70,12 @@ %doc release_docs/HISTORY.txt doc/html %{_bindir}/gif2h5 %{_bindir}/h52gif -%{_bindir}/h5c++ -%{_bindir}/h5cc %{_bindir}/h5debug %{_bindir}/h5diff %{_bindir}/h5dump %{_bindir}/h5import %{_bindir}/h5jam %{_bindir}/h5ls -%{_bindir}/h5redeploy %{_bindir}/h5repack %{_bindir}/h5repart %{_bindir}/h5unjam @@ -84,13 +83,18 @@ %files devel %defattr(-,root,root,0755) -%{_docdir}/%{name}/examples/c++ -%{_docdir}/%{name}/examples/c +%{_bindir}/h5c++ +%{_bindir}/h5cc +%{_bindir}/h5redeploy +%{_docdir}/%{name}/examples/ %{_includedir}/*.h %{_libdir}/*.a %{_libdir}/*.so %changelog +* Thu Mar 02 2006 Orion Poplawski 1.6.5-1 +- Update to 1.6.5 + * Tue Jul 05 2005 Orion Poplawski 1.6.4-4 - Make example scripts executable Index: sources =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 5 Jul 2005 20:20:17 -0000 1.2 +++ sources 2 Mar 2006 21:38:43 -0000 1.3 @@ -1 +1 @@ -a837391b633fc4c6681905d89047c032 hdf5-1.6.4.tar.gz +67187b3253b89f1f41756b7fd4396ecf hdf5-1.6.5.tar.gz From fedora-extras-commits at redhat.com Thu Mar 2 21:43:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 2 Mar 2006 16:43:45 -0500 Subject: rpms/thinkpad-kmod/devel thinkpad-kmod.spec,1.3,1.4 Message-ID: <200603022144.k22LiHlH003292@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3268 Modified Files: thinkpad-kmod.spec Log Message: * Thu Mar 2 2006 Ville Skytt?? - 5.9-2 - Hardcode kernel version and variants for a test build. Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- thinkpad-kmod.spec 2 Mar 2006 21:37:24 -0000 1.3 +++ thinkpad-kmod.spec 2 Mar 2006 21:43:44 -0000 1.4 @@ -3,6 +3,10 @@ %define kmodtool sh %{SOURCE10} # end stuff to be ... +# temporarily hardcoded: +%define kver 2.6.15-1.1996_FC5 +%define kvariants "" + %define kmod_name thinkpad %define kverrel %(%{kmodtool} verrel %{?kver} 2>/dev/null) %{!?kvariants: %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)} @@ -10,7 +14,7 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules Version: 5.9 -Release: 1.%(echo %{kverrel} | tr - _) +Release: 2.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz @@ -61,6 +65,9 @@ %changelog +* Thu Mar 2 2006 Ville Skytt?? - 5.9-2 +- Hardcode kernel version and variants for a test build. + * Sat Feb 25 2006 Ville Skytt?? - 5.9-1 - 5.9. From fedora-extras-commits at redhat.com Thu Mar 2 21:47:35 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 16:47:35 -0500 Subject: rpms/centericq/FC-3 centericq-4.20.0-ljtags.patch, NONE, 1.1 centericq-ljtypo.patch, NONE, 1.1 centericq-quitask.patch, NONE, 1.1 centericq.spec, 1.11, 1.12 Message-ID: <200603022148.k22Lm8Fu003466@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3387/FC-3 Modified Files: centericq.spec Added Files: centericq-4.20.0-ljtags.patch centericq-ljtypo.patch centericq-quitask.patch Log Message: - fix #183623: ask before quit - fix #183625, #183626: fixes lj hook centericq-4.20.0-ljtags.patch: --- NEW FILE centericq-4.20.0-ljtags.patch --- diff -ur centericq-4.20.0/src/hooks/ljhook.cc centericq-4.20.0.kad/src/hooks/ljhook.cc --- centericq-4.20.0/src/hooks/ljhook.cc 2005-01-07 03:27:04.000000000 +0200 +++ centericq-4.20.0.kad/src/hooks/ljhook.cc 2005-09-22 22:00:22.000000000 +0300 @@ -266,6 +266,7 @@ if(!m->field_empty("subject")) ev->addParam("subject", rusconv("ku", m->getfield("subject"))); if(!m->field_empty("mood")) ev->addParam("prop_current_mood", rusconv("ku", m->getfield("mood"))); if(!m->field_empty("music")) ev->addParam("prop_current_music", rusconv("ku", m->getfield("music"))); + if(!m->field_empty("taglist")) ev->addParam("prop_taglist", rusconv("ku", m->getfield("taglist"))); if(!m->field_empty("picture")) ev->addParam("prop_picture_keyword", m->getfield("picture")); if(!m->field_empty("preformatted")) ev->addParam("prop_opt_preformatted", "1"); diff -ur centericq-4.20.0/src/icqdialogs.cc centericq-4.20.0.kad/src/icqdialogs.cc --- centericq-4.20.0/src/icqdialogs.cc 2005-09-22 22:09:13.000000000 +0300 +++ centericq-4.20.0.kad/src/icqdialogs.cc 2005-09-22 22:08:32.000000000 +0300 @@ -1878,6 +1879,8 @@ svalues.push_back("usemask"); } + ev->setfield("taglist", ""); + textwindow w(0, 0, sizeDlg.width, sizeDlg.height, conf.getcolor(cp_dialog_frame), TW_CENTERED); w.set_title(conf.getcolor(cp_dialog_highlight), _(" LiveJournal posting: attributes ")); db.setwindow(&w, false); @@ -1915,6 +1915,7 @@ t.addleaff(i, 0, 21, _(" Music : %s "), ev->getfield("music").c_str()); t.addleaff(i, 0, 22, _(" Picture : %s "), ev->getfield("picture").empty() ? _("(default)") : ev->getfield("picture").c_str()); + t.addleaff(i, 0, 25, _(" Tags : %s "), ev->getfield("taglist").c_str()); i = t.addnode(_(" Options ")); t.addleaff(i, 0, 30, _(" Disable auto-formatting : %s "), stryesno(ev->getfield("preformatted") == "1")); @@ -1940,6 +1941,7 @@ case 21: LJP_STR("music", _("Currently playing: ")); break; case 22: LJP_LIST("picture", pictures, _("(default)")); break; case 23: LJP_STR("mood", _("Current mood: ")); break; + case 25: LJP_STR("taglist", _("Tags for the entry: ")); break; case 30: LJP_BOOL("preformatted"); break; case 31: LJP_BOOL("noemail"); break; case 32: LJP_BOOL("nocomments"); break; centericq-ljtypo.patch: --- NEW FILE centericq-ljtypo.patch --- --- centericq-4.20.0/src/accountmanager.cc.ljfriends 2005-01-27 01:52:46.000000000 +0200 +++ centericq-4.20.0/src/accountmanager.cc 2005-02-04 17:03:07.908358392 +0200 @@ -241,7 +241,7 @@ void accountmanager::exec() { case 11: a.additional["importfriends"] = - (a.additional["importfriends"] == "") ? "1" : "0"; + (a.additional["importfriends"] == "1") ? "0" : "1"; break; case 12: centericq-quitask.patch: --- NEW FILE centericq-quitask.patch --- --- centericq-4.21.0/src/icqconf.cc.askquit 2005-09-01 18:10:01.000000000 +0300 +++ centericq-4.21.0/src/icqconf.cc 2005-09-05 12:22:04.000000000 +0300 @@ -460,6 +460,7 @@ void icqconf::loadmainconfig() { if(param == "russian" || param == "convert") initmultiproto(cpconvert, buf, false); else if(param == "nobidi") setbidi(false); else if(param == "askaway") askaway = true; else + if(param == "askquit") askquit = true; else if(param == "logtimestamps") logtimestamps = true; else if(param == "logonline") logonline = true; else if(param == "fromcharset") fromcharset = buf; else @@ -548,6 +549,7 @@ void icqconf::save() { f << "tocharset\t" << tocharset << endl; if(!getbidi()) f << "nobidi" << endl; + if(getaskquit()) f << "askquit" << endl; if(logtimestamps) f << "logtimestamps" << endl; if(logonline) f << "logonline" << endl; @@ -895,6 +897,9 @@ void icqconf::getauto(int &away, int &na void icqconf::setquote(bool use) { quote = use; } +void icqconf::setaskquit(bool faskquit) { + askquit = faskquit; +} void icqconf::setsockshost(const string &nsockshost) { int pos; --- centericq-4.21.0/src/icqconf.h.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqconf.h 2005-09-05 12:24:28.000000000 +0300 @@ -137,6 +137,7 @@ class icqconf { bool hideoffline, quote, savepwd, antispam, mailcheck, makelog, fenoughdiskspace, askaway, bidi, logtimestamps, + askquit, logonline, emacs, proxyconnect, proxyssl, notitles, debug; bool startoffline; @@ -241,6 +242,9 @@ class icqconf { bool getchatmode(protocolname pname); void setchatmode(protocolname pname, bool fchatmode); + + bool getaskquit() const { return askquit; } + void setaskquit(bool faskquit); bool getentersends(protocolname pname); void setentersends(protocolname pname, bool fentersends); --- centericq-4.21.0/src/icqdialogs.cc.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqdialogs.cc 2005-09-05 13:11:16.000000000 +0300 @@ -1100,6 +1100,7 @@ bool icqface::updateconf(icqconf::regsou bool makelog = conf.getmakelog(); bool askaway = conf.getaskaway(); bool bidi = conf.getbidi(); + bool askquit = conf.getaskquit(); bool emacs = conf.getemacs(); bool proxyconnect = conf.getproxyconnect(); @@ -1183,6 +1184,7 @@ bool icqface::updateconf(icqconf::regsou t.addleaff(i, 0, 20, _( " Enable bidirectional languages support : %s "), stryesno(bidi)); #endif t.addleaff(i, 0, 23, _(" Enable emacs bindings in text editor : %s "), stryesno(emacs)); + t.addleaff(i, 0, 31, _(" Ask before quit : %s "), stryesno(askquit)); i = t.addnode(_(" Codepages conversion ")); @@ -1377,6 +1379,10 @@ bool icqface::updateconf(icqconf::regsou break; case 30: cm = (cm == icqconf::cmproto ? icqconf::cmstatus : icqconf::cmproto ); + break; + case 31: + askquit = !askquit; + break; } break; case 1: @@ -1403,6 +1409,7 @@ bool icqface::updateconf(icqconf::regsou } conf.setbidi(bidi); + conf.setaskquit(askquit); conf.setlogoptions(logtimestamps, logonline); if(ptp) conf.setpeertopeer(ptpmin, ptpmax); --- centericq-4.21.0/src/icqface.cc.askquit 2005-08-28 04:33:21.000000000 +0300 +++ centericq-4.21.0/src/icqface.cc 2005-09-05 12:22:04.000000000 +0300 @@ -3237,6 +3237,9 @@ int icqface::contactskeys(verticalmenu & break; case key_quit: + if (conf.getaskquit()) + if(face.ask("Really Quit?", ASK_YES | ASK_NO, ASK_NO) == ASK_NO) + break; face.extk = ACT_QUIT; break; Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-3/centericq.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- centericq.spec 1 Mar 2006 08:01:07 -0000 1.11 +++ centericq.spec 2 Mar 2006 21:47:35 -0000 1.12 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Text mode menu- and window-driven IM @@ -20,10 +20,20 @@ # and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml # and redhat bugzilla #176451 Patch6: centericq-4.21.0-kkstrtext.patch + +## feature fixes # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch +# Fix ljhook +Patch101: http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch +Patch102: centericq-ljtypo.patch + +## feature enh # improve utf8 handling Patch200: centericq-ncursesw.patch +# provided by Andy Shevchenko... will ask before quit +Patch201: centericq-quitask.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel @@ -48,7 +58,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch101 -p1 +%patch102 -p1 %patch200 -p1 +%patch201 -p1 aclocal autoconf automake @@ -82,6 +95,11 @@ # we don't want that %exclude %{_includedir}/msn %changelog +* Thu Mar 02 2006 Andreas Bierfert +4.21.0-5 +- fix #183623: ask before quit +- fix #183625, #183626: fixes lj hook + * Wed Mar 01 2006 Andreas Bierfert 4.21.0-4 - improve utf8 support From fedora-extras-commits at redhat.com Thu Mar 2 21:47:41 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 16:47:41 -0500 Subject: rpms/centericq/FC-4 centericq-4.20.0-ljtags.patch, NONE, 1.1 centericq-ljtypo.patch, NONE, 1.1 centericq-quitask.patch, NONE, 1.1 centericq.spec, 1.21, 1.22 Message-ID: <200603022148.k22LmEX2003471@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3387/FC-4 Modified Files: centericq.spec Added Files: centericq-4.20.0-ljtags.patch centericq-ljtypo.patch centericq-quitask.patch Log Message: - fix #183623: ask before quit - fix #183625, #183626: fixes lj hook centericq-4.20.0-ljtags.patch: --- NEW FILE centericq-4.20.0-ljtags.patch --- diff -ur centericq-4.20.0/src/hooks/ljhook.cc centericq-4.20.0.kad/src/hooks/ljhook.cc --- centericq-4.20.0/src/hooks/ljhook.cc 2005-01-07 03:27:04.000000000 +0200 +++ centericq-4.20.0.kad/src/hooks/ljhook.cc 2005-09-22 22:00:22.000000000 +0300 @@ -266,6 +266,7 @@ if(!m->field_empty("subject")) ev->addParam("subject", rusconv("ku", m->getfield("subject"))); if(!m->field_empty("mood")) ev->addParam("prop_current_mood", rusconv("ku", m->getfield("mood"))); if(!m->field_empty("music")) ev->addParam("prop_current_music", rusconv("ku", m->getfield("music"))); + if(!m->field_empty("taglist")) ev->addParam("prop_taglist", rusconv("ku", m->getfield("taglist"))); if(!m->field_empty("picture")) ev->addParam("prop_picture_keyword", m->getfield("picture")); if(!m->field_empty("preformatted")) ev->addParam("prop_opt_preformatted", "1"); diff -ur centericq-4.20.0/src/icqdialogs.cc centericq-4.20.0.kad/src/icqdialogs.cc --- centericq-4.20.0/src/icqdialogs.cc 2005-09-22 22:09:13.000000000 +0300 +++ centericq-4.20.0.kad/src/icqdialogs.cc 2005-09-22 22:08:32.000000000 +0300 @@ -1878,6 +1879,8 @@ svalues.push_back("usemask"); } + ev->setfield("taglist", ""); + textwindow w(0, 0, sizeDlg.width, sizeDlg.height, conf.getcolor(cp_dialog_frame), TW_CENTERED); w.set_title(conf.getcolor(cp_dialog_highlight), _(" LiveJournal posting: attributes ")); db.setwindow(&w, false); @@ -1915,6 +1915,7 @@ t.addleaff(i, 0, 21, _(" Music : %s "), ev->getfield("music").c_str()); t.addleaff(i, 0, 22, _(" Picture : %s "), ev->getfield("picture").empty() ? _("(default)") : ev->getfield("picture").c_str()); + t.addleaff(i, 0, 25, _(" Tags : %s "), ev->getfield("taglist").c_str()); i = t.addnode(_(" Options ")); t.addleaff(i, 0, 30, _(" Disable auto-formatting : %s "), stryesno(ev->getfield("preformatted") == "1")); @@ -1940,6 +1941,7 @@ case 21: LJP_STR("music", _("Currently playing: ")); break; case 22: LJP_LIST("picture", pictures, _("(default)")); break; case 23: LJP_STR("mood", _("Current mood: ")); break; + case 25: LJP_STR("taglist", _("Tags for the entry: ")); break; case 30: LJP_BOOL("preformatted"); break; case 31: LJP_BOOL("noemail"); break; case 32: LJP_BOOL("nocomments"); break; centericq-ljtypo.patch: --- NEW FILE centericq-ljtypo.patch --- --- centericq-4.20.0/src/accountmanager.cc.ljfriends 2005-01-27 01:52:46.000000000 +0200 +++ centericq-4.20.0/src/accountmanager.cc 2005-02-04 17:03:07.908358392 +0200 @@ -241,7 +241,7 @@ void accountmanager::exec() { case 11: a.additional["importfriends"] = - (a.additional["importfriends"] == "") ? "1" : "0"; + (a.additional["importfriends"] == "1") ? "0" : "1"; break; case 12: centericq-quitask.patch: --- NEW FILE centericq-quitask.patch --- --- centericq-4.21.0/src/icqconf.cc.askquit 2005-09-01 18:10:01.000000000 +0300 +++ centericq-4.21.0/src/icqconf.cc 2005-09-05 12:22:04.000000000 +0300 @@ -460,6 +460,7 @@ void icqconf::loadmainconfig() { if(param == "russian" || param == "convert") initmultiproto(cpconvert, buf, false); else if(param == "nobidi") setbidi(false); else if(param == "askaway") askaway = true; else + if(param == "askquit") askquit = true; else if(param == "logtimestamps") logtimestamps = true; else if(param == "logonline") logonline = true; else if(param == "fromcharset") fromcharset = buf; else @@ -548,6 +549,7 @@ void icqconf::save() { f << "tocharset\t" << tocharset << endl; if(!getbidi()) f << "nobidi" << endl; + if(getaskquit()) f << "askquit" << endl; if(logtimestamps) f << "logtimestamps" << endl; if(logonline) f << "logonline" << endl; @@ -895,6 +897,9 @@ void icqconf::getauto(int &away, int &na void icqconf::setquote(bool use) { quote = use; } +void icqconf::setaskquit(bool faskquit) { + askquit = faskquit; +} void icqconf::setsockshost(const string &nsockshost) { int pos; --- centericq-4.21.0/src/icqconf.h.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqconf.h 2005-09-05 12:24:28.000000000 +0300 @@ -137,6 +137,7 @@ class icqconf { bool hideoffline, quote, savepwd, antispam, mailcheck, makelog, fenoughdiskspace, askaway, bidi, logtimestamps, + askquit, logonline, emacs, proxyconnect, proxyssl, notitles, debug; bool startoffline; @@ -241,6 +242,9 @@ class icqconf { bool getchatmode(protocolname pname); void setchatmode(protocolname pname, bool fchatmode); + + bool getaskquit() const { return askquit; } + void setaskquit(bool faskquit); bool getentersends(protocolname pname); void setentersends(protocolname pname, bool fentersends); --- centericq-4.21.0/src/icqdialogs.cc.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqdialogs.cc 2005-09-05 13:11:16.000000000 +0300 @@ -1100,6 +1100,7 @@ bool icqface::updateconf(icqconf::regsou bool makelog = conf.getmakelog(); bool askaway = conf.getaskaway(); bool bidi = conf.getbidi(); + bool askquit = conf.getaskquit(); bool emacs = conf.getemacs(); bool proxyconnect = conf.getproxyconnect(); @@ -1183,6 +1184,7 @@ bool icqface::updateconf(icqconf::regsou t.addleaff(i, 0, 20, _( " Enable bidirectional languages support : %s "), stryesno(bidi)); #endif t.addleaff(i, 0, 23, _(" Enable emacs bindings in text editor : %s "), stryesno(emacs)); + t.addleaff(i, 0, 31, _(" Ask before quit : %s "), stryesno(askquit)); i = t.addnode(_(" Codepages conversion ")); @@ -1377,6 +1379,10 @@ bool icqface::updateconf(icqconf::regsou break; case 30: cm = (cm == icqconf::cmproto ? icqconf::cmstatus : icqconf::cmproto ); + break; + case 31: + askquit = !askquit; + break; } break; case 1: @@ -1403,6 +1409,7 @@ bool icqface::updateconf(icqconf::regsou } conf.setbidi(bidi); + conf.setaskquit(askquit); conf.setlogoptions(logtimestamps, logonline); if(ptp) conf.setpeertopeer(ptpmin, ptpmax); --- centericq-4.21.0/src/icqface.cc.askquit 2005-08-28 04:33:21.000000000 +0300 +++ centericq-4.21.0/src/icqface.cc 2005-09-05 12:22:04.000000000 +0300 @@ -3237,6 +3237,9 @@ int icqface::contactskeys(verticalmenu & break; case key_quit: + if (conf.getaskquit()) + if(face.ask("Really Quit?", ASK_YES | ASK_NO, ASK_NO) == ASK_NO) + break; face.extk = ACT_QUIT; break; Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/FC-4/centericq.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- centericq.spec 1 Mar 2006 08:01:13 -0000 1.21 +++ centericq.spec 2 Mar 2006 21:47:41 -0000 1.22 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Text mode menu- and window-driven IM @@ -20,10 +20,20 @@ # and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml # and redhat bugzilla #176451 Patch6: centericq-4.21.0-kkstrtext.patch + +## feature fixes # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch +# Fix ljhook +Patch101: http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch +Patch102: centericq-ljtypo.patch + +## feature enh # improve utf8 handling Patch200: centericq-ncursesw.patch +# provided by Andy Shevchenko... will ask before quit +Patch201: centericq-quitask.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel @@ -48,7 +58,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch101 -p1 +%patch102 -p1 %patch200 -p1 +%patch201 -p1 aclocal autoconf automake @@ -82,6 +95,11 @@ # we don't want that %exclude %{_includedir}/msn %changelog +* Thu Mar 02 2006 Andreas Bierfert +4.21.0-5 +- fix #183623: ask before quit +- fix #183625, #183626: fixes lj hook + * Wed Mar 01 2006 Andreas Bierfert 4.21.0-4 - improve utf8 support From fedora-extras-commits at redhat.com Thu Mar 2 21:47:47 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 16:47:47 -0500 Subject: rpms/centericq/devel centericq-4.20.0-ljtags.patch, NONE, 1.1 centericq-quitask.patch, NONE, 1.1 centericq.spec, 1.23, 1.24 Message-ID: <200603022148.k22LmJIm003476@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3387/devel Modified Files: centericq.spec Added Files: centericq-4.20.0-ljtags.patch centericq-quitask.patch Log Message: - fix #183623: ask before quit - fix #183625, #183626: fixes lj hook centericq-4.20.0-ljtags.patch: --- NEW FILE centericq-4.20.0-ljtags.patch --- diff -ur centericq-4.20.0/src/hooks/ljhook.cc centericq-4.20.0.kad/src/hooks/ljhook.cc --- centericq-4.20.0/src/hooks/ljhook.cc 2005-01-07 03:27:04.000000000 +0200 +++ centericq-4.20.0.kad/src/hooks/ljhook.cc 2005-09-22 22:00:22.000000000 +0300 @@ -266,6 +266,7 @@ if(!m->field_empty("subject")) ev->addParam("subject", rusconv("ku", m->getfield("subject"))); if(!m->field_empty("mood")) ev->addParam("prop_current_mood", rusconv("ku", m->getfield("mood"))); if(!m->field_empty("music")) ev->addParam("prop_current_music", rusconv("ku", m->getfield("music"))); + if(!m->field_empty("taglist")) ev->addParam("prop_taglist", rusconv("ku", m->getfield("taglist"))); if(!m->field_empty("picture")) ev->addParam("prop_picture_keyword", m->getfield("picture")); if(!m->field_empty("preformatted")) ev->addParam("prop_opt_preformatted", "1"); diff -ur centericq-4.20.0/src/icqdialogs.cc centericq-4.20.0.kad/src/icqdialogs.cc --- centericq-4.20.0/src/icqdialogs.cc 2005-09-22 22:09:13.000000000 +0300 +++ centericq-4.20.0.kad/src/icqdialogs.cc 2005-09-22 22:08:32.000000000 +0300 @@ -1878,6 +1879,8 @@ svalues.push_back("usemask"); } + ev->setfield("taglist", ""); + textwindow w(0, 0, sizeDlg.width, sizeDlg.height, conf.getcolor(cp_dialog_frame), TW_CENTERED); w.set_title(conf.getcolor(cp_dialog_highlight), _(" LiveJournal posting: attributes ")); db.setwindow(&w, false); @@ -1915,6 +1915,7 @@ t.addleaff(i, 0, 21, _(" Music : %s "), ev->getfield("music").c_str()); t.addleaff(i, 0, 22, _(" Picture : %s "), ev->getfield("picture").empty() ? _("(default)") : ev->getfield("picture").c_str()); + t.addleaff(i, 0, 25, _(" Tags : %s "), ev->getfield("taglist").c_str()); i = t.addnode(_(" Options ")); t.addleaff(i, 0, 30, _(" Disable auto-formatting : %s "), stryesno(ev->getfield("preformatted") == "1")); @@ -1940,6 +1941,7 @@ case 21: LJP_STR("music", _("Currently playing: ")); break; case 22: LJP_LIST("picture", pictures, _("(default)")); break; case 23: LJP_STR("mood", _("Current mood: ")); break; + case 25: LJP_STR("taglist", _("Tags for the entry: ")); break; case 30: LJP_BOOL("preformatted"); break; case 31: LJP_BOOL("noemail"); break; case 32: LJP_BOOL("nocomments"); break; centericq-quitask.patch: --- NEW FILE centericq-quitask.patch --- --- centericq-4.21.0/src/icqconf.cc.askquit 2005-09-01 18:10:01.000000000 +0300 +++ centericq-4.21.0/src/icqconf.cc 2005-09-05 12:22:04.000000000 +0300 @@ -460,6 +460,7 @@ void icqconf::loadmainconfig() { if(param == "russian" || param == "convert") initmultiproto(cpconvert, buf, false); else if(param == "nobidi") setbidi(false); else if(param == "askaway") askaway = true; else + if(param == "askquit") askquit = true; else if(param == "logtimestamps") logtimestamps = true; else if(param == "logonline") logonline = true; else if(param == "fromcharset") fromcharset = buf; else @@ -548,6 +549,7 @@ void icqconf::save() { f << "tocharset\t" << tocharset << endl; if(!getbidi()) f << "nobidi" << endl; + if(getaskquit()) f << "askquit" << endl; if(logtimestamps) f << "logtimestamps" << endl; if(logonline) f << "logonline" << endl; @@ -895,6 +897,9 @@ void icqconf::getauto(int &away, int &na void icqconf::setquote(bool use) { quote = use; } +void icqconf::setaskquit(bool faskquit) { + askquit = faskquit; +} void icqconf::setsockshost(const string &nsockshost) { int pos; --- centericq-4.21.0/src/icqconf.h.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqconf.h 2005-09-05 12:24:28.000000000 +0300 @@ -137,6 +137,7 @@ class icqconf { bool hideoffline, quote, savepwd, antispam, mailcheck, makelog, fenoughdiskspace, askaway, bidi, logtimestamps, + askquit, logonline, emacs, proxyconnect, proxyssl, notitles, debug; bool startoffline; @@ -241,6 +242,9 @@ class icqconf { bool getchatmode(protocolname pname); void setchatmode(protocolname pname, bool fchatmode); + + bool getaskquit() const { return askquit; } + void setaskquit(bool faskquit); bool getentersends(protocolname pname); void setentersends(protocolname pname, bool fentersends); --- centericq-4.21.0/src/icqdialogs.cc.askquit 2005-05-24 00:16:52.000000000 +0300 +++ centericq-4.21.0/src/icqdialogs.cc 2005-09-05 13:11:16.000000000 +0300 @@ -1100,6 +1100,7 @@ bool icqface::updateconf(icqconf::regsou bool makelog = conf.getmakelog(); bool askaway = conf.getaskaway(); bool bidi = conf.getbidi(); + bool askquit = conf.getaskquit(); bool emacs = conf.getemacs(); bool proxyconnect = conf.getproxyconnect(); @@ -1183,6 +1184,7 @@ bool icqface::updateconf(icqconf::regsou t.addleaff(i, 0, 20, _( " Enable bidirectional languages support : %s "), stryesno(bidi)); #endif t.addleaff(i, 0, 23, _(" Enable emacs bindings in text editor : %s "), stryesno(emacs)); + t.addleaff(i, 0, 31, _(" Ask before quit : %s "), stryesno(askquit)); i = t.addnode(_(" Codepages conversion ")); @@ -1377,6 +1379,10 @@ bool icqface::updateconf(icqconf::regsou break; case 30: cm = (cm == icqconf::cmproto ? icqconf::cmstatus : icqconf::cmproto ); + break; + case 31: + askquit = !askquit; + break; } break; case 1: @@ -1403,6 +1409,7 @@ bool icqface::updateconf(icqconf::regsou } conf.setbidi(bidi); + conf.setaskquit(askquit); conf.setlogoptions(logtimestamps, logonline); if(ptp) conf.setpeertopeer(ptpmin, ptpmax); --- centericq-4.21.0/src/icqface.cc.askquit 2005-08-28 04:33:21.000000000 +0300 +++ centericq-4.21.0/src/icqface.cc 2005-09-05 12:22:04.000000000 +0300 @@ -3237,6 +3237,9 @@ int icqface::contactskeys(verticalmenu & break; case key_quit: + if (conf.getaskquit()) + if(face.ask("Really Quit?", ASK_YES | ASK_NO, ASK_NO) == ASK_NO) + break; face.extk = ACT_QUIT; break; Index: centericq.spec =================================================================== RCS file: /cvs/extras/rpms/centericq/devel/centericq.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- centericq.spec 1 Mar 2006 08:01:20 -0000 1.23 +++ centericq.spec 2 Mar 2006 21:47:47 -0000 1.24 @@ -1,6 +1,6 @@ Name: centericq Version: 4.21.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Text mode menu- and window-driven IM @@ -8,6 +8,7 @@ License: GPL URL: http://konst.org.ua/centericq/ Source0: http://konst.org.ua/download/centericq-4.21.0.tar.bz2 + Patch0: centericq-libyahoo.patch Patch1: centericq-kkconsui.patch Patch2: centericq-kkstrtext.patch @@ -20,10 +21,20 @@ # and see http://www.gentoo.org/security/en/glsa/glsa-200512-11.xml # and redhat bugzilla #176451 Patch6: centericq-4.21.0-kkstrtext.patch + +## feature fixes # Fix libmsn Patch100: http://centericq.de/archive/contrib/patches/centericq-4.21.0.msn.patch +# Fix ljhook +Patch101: http://www.crystalowl.net/patches/centericq-4.20.0-ljtags.patch +Patch102: centericq-ljtypo.patch + +## feature enh # improve utf8 handling Patch200: centericq-ncursesw.patch +# provided by Andy Shevchenko... will ask before quit +Patch201: centericq-quitask.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: krb5-devel @@ -48,7 +59,10 @@ %patch5 -p1 %patch6 -p1 %patch100 -p1 +%patch101 -p1 +%patch102 -p1 %patch200 -p1 +%patch201 -p1 aclocal autoconf automake @@ -83,6 +97,11 @@ %exclude %{_includedir}/msn %changelog +* Thu Mar 02 2006 Andreas Bierfert +4.21.0-7 +- fix #183623: ask before quit +- fix #183625, #183626: fixes lj hook + * Wed Mar 01 2006 Andreas Bierfert 4.21.0-6 - improve utf8 support From fedora-extras-commits at redhat.com Thu Mar 2 21:55:56 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 16:55:56 -0500 Subject: rpms/centericq/devel centericq-ljtypo.patch,NONE,1.1 Message-ID: <200603022155.k22Ltw06003674@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/centericq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3662 Added Files: centericq-ljtypo.patch Log Message: - forgot patch centericq-ljtypo.patch: --- NEW FILE centericq-ljtypo.patch --- --- centericq-4.20.0/src/accountmanager.cc.ljfriends 2005-01-27 01:52:46.000000000 +0200 +++ centericq-4.20.0/src/accountmanager.cc 2005-02-04 17:03:07.908358392 +0200 @@ -241,7 +241,7 @@ void accountmanager::exec() { case 11: a.additional["importfriends"] = - (a.additional["importfriends"] == "") ? "1" : "0"; + (a.additional["importfriends"] == "1") ? "0" : "1"; break; case 12: From fedora-extras-commits at redhat.com Thu Mar 2 22:17:12 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 2 Mar 2006 17:17:12 -0500 Subject: rpms/hula/devel hula.spec,1.5,1.6 Message-ID: <200603022217.k22MHl7E005720@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/hula/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5679/hula/devel Modified Files: hula.spec Log Message: There is no binary of Hula in the repository. Not 3, not 4, not development. Has this thing ever been built? Index: hula.spec =================================================================== RCS file: /cvs/extras/rpms/hula/devel/hula.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hula.spec 22 Jul 2005 05:23:35 -0000 1.5 +++ hula.spec 2 Mar 2006 22:17:11 -0000 1.6 @@ -29,6 +29,13 @@ for hula. %prep +cat< Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-kdepim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5742 Modified Files: libopensync-plugin-kdepim.spec Added Files: libopensync-plugin-kdepim-gcc41.patch Log Message: - add gcc41 patch - disable smp flags libopensync-plugin-kdepim-gcc41.patch: --- NEW FILE libopensync-plugin-kdepim-gcc41.patch --- --- src/kcal.h.orig 2006-03-02 23:07:46.000000000 +0100 +++ src/kcal.h 2006-03-02 23:08:35.000000000 +0100 @@ -49,7 +49,7 @@ * operations */ bool __access(OSyncContext *ctx, OSyncChange *chg); - bool KCalDataSource::report_incidence(OSyncContext *ctx, KCal::Incidence *e, + bool report_incidence(OSyncContext *ctx, KCal::Incidence *e, const char *objtype, const char *objformat); public: KCalDataSource(OSyncMember *member, OSyncHashTable *hashtable); Index: libopensync-plugin-kdepim.spec =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-kdepim/devel/libopensync-plugin-kdepim.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libopensync-plugin-kdepim.spec 2 Mar 2006 21:31:18 -0000 1.2 +++ libopensync-plugin-kdepim.spec 2 Mar 2006 22:21:15 -0000 1.3 @@ -1,6 +1,6 @@ Name: libopensync-plugin-kdepim Version: 0.18 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE plugin for libopensync Group: System Environment/Libraries @@ -8,6 +8,7 @@ URL: http://www.opensync.org # see http://www.opensync.org/wiki/download Source0: %{name}-%{version}.tar.gz +Patch0: libopensync-plugin-kdepim-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel @@ -30,11 +31,12 @@ %prep %setup -q - +%patch0 %build %configure --disable-rpath -make %{?_smp_mflags} +# smpflags sometimes screw up the build +make %install @@ -56,8 +58,10 @@ %{_libdir}/opensync/plugins/kdepim*.so %changelog -* Thu Mar 02 2006 Andreas Bierfert +* Thu Mar 02 2006 Andreas Bierfert 0.18-2 - add dist +- add gcc4.1 fixes +- get rid of smpflags * Fri Nov 25 2005 Andreas Bierfert 0.18-1 - initial version From fedora-extras-commits at redhat.com Thu Mar 2 22:43:54 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 17:43:54 -0500 Subject: owners owners.list,1.697,1.698 Message-ID: <200603022244.k22MiQxn006026@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6009 Modified Files: owners.list Log Message: - add libopensync-plugin-kdepim Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.697 retrieving revision 1.698 diff -u -r1.697 -r1.698 --- owners.list 2 Mar 2006 19:52:43 -0000 1.697 +++ owners.list 2 Mar 2006 22:43:53 -0000 1.698 @@ -580,6 +580,7 @@ Fedora Extras|libopensync-plugin-file|File plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-gpe|GPE plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libopensync-plugin-irmc|Irmc plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| +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|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 2 22:57:20 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 17:57:20 -0500 Subject: rpms/WindowMaker/devel WindowMaker.spec, 1.17, 1.18 WindowMaker.xsession, 1.1, NONE Message-ID: <200603022257.k22Mvq4r006391@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/WindowMaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6254 Modified Files: WindowMaker.spec Removed Files: WindowMaker.xsession Log Message: - fix gdm detection Index: WindowMaker.spec =================================================================== RCS file: /cvs/extras/rpms/WindowMaker/devel/WindowMaker.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- WindowMaker.spec 2 Mar 2006 14:16:26 -0000 1.17 +++ WindowMaker.spec 2 Mar 2006 22:57:20 -0000 1.18 @@ -1,13 +1,12 @@ Summary: A fast, feature rich Window Manager Name: WindowMaker Version: 0.92.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: User Interface/Desktops URL: http://www.windowmaker.org/ Source0: ftp://windowmaker.org/pub/source/release/WindowMaker-0.92.0.tar.bz2 -Source1: WindowMaker.xsession Source2: WindowMaker.desktop Source3: WindowMaker-uk.po Source4: WPrefs-uk.po @@ -155,10 +154,8 @@ %find_lang '\(WPrefs\|%{name}\|WINGs\)' -install -D -m0755 %{SOURCE1} \ -%{buildroot}%{_sysconfdir}/X11/gdm/Sessions/WindowMaker -install -D -m0644 %{SOURCE2} \ -%{buildroot}%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop +install -D -m0644 -p %{SOURCE2} \ +%{buildroot}%{_datadir}/xsessions/WindowMaker.desktop find %{buildroot} -type f -name "*.la" -exec rm -f {} ';' @@ -173,8 +170,7 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog NEWS FAQ* README* COPYING* %config %{_sysconfdir}/%{name} -%{_sysconfdir}/X11/gdm/Sessions/WindowMaker -%{_sysconfdir}/X11/dm/Sessions/WindowMaker.desktop +%{_datadir}/xsessions/WindowMaker.desktop %{_bindir}/* %{_datadir}/%{name} %{_datadir}/WINGs @@ -197,6 +193,10 @@ %changelog +* Thu Mar 02 2006 Andreas Bierfert +0.92.0-8 +- fix gdm detection + * Sun Feb 26 2006 Andreas Bierfert 0.92.0-7 - fix #181981 --- WindowMaker.xsession DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 22:57:50 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 17:57:50 -0500 Subject: rpms/fluxbox/devel fluxbox-menu.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 fluxbox.spec, 1.15, 1.16 sources, 1.5, 1.6 FluxBox, 1.1, NONE Xclients.fluxbox, 1.3, NONE Message-ID: <200603022258.k22MwMp9006407@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fluxbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6358 Modified Files: .cvsignore fluxbox.spec sources Added Files: fluxbox-menu.patch Removed Files: FluxBox Xclients.fluxbox Log Message: - fix gdm detection - fix menu generation fluxbox-menu.patch: --- NEW FILE fluxbox-menu.patch --- --- util/startfluxbox.in.orig 2006-03-02 16:10:01.000000000 +0100 +++ util/startfluxbox.in 2006-03-02 16:11:29.000000000 +0100 @@ -76,6 +76,10 @@ # wmsmixer -w & # idesk & +if [ -x /usr/bin/fluxbox-xdg-menu.py ]; then + /usr/bin/fluxbox-generate_menu --with-icons & +fi + # And last but not least we start fluxbox. # Because it is the last app you have to run it with ''exec'' before it. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 17 Sep 2005 07:38:59 -0000 1.5 +++ .cvsignore 2 Mar 2006 22:57:50 -0000 1.6 @@ -1,2 +1 @@ fluxbox-0.9.14.tar.bz2 -artwiz-aleczapka.tar.bz2 Index: fluxbox.spec =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fluxbox.spec 2 Mar 2006 00:31:36 -0000 1.15 +++ fluxbox.spec 2 Mar 2006 22:57:50 -0000 1.16 @@ -1,6 +1,6 @@ Name: fluxbox Version: 0.9.14 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Window Manager based on Blackbox @@ -9,11 +9,10 @@ URL: http://fluxbox.sourceforge.net Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2 -Source1: Xclients.%{name} -Source2: FluxBox Source3: fluxbox.desktop Source4: fluxbox-xdg-menu.py Patch0: fluxbox-gcc41.patch +Patch1: fluxbox-menu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot BuildRequires: imlib2-devel @@ -29,7 +28,7 @@ BuildRequires: libXrender-devel BuildRequires: fontconfig-devel -Requires(post): python +Requires: pyxdg Requires: artwiz-aleczapka-fonts %description @@ -45,6 +44,7 @@ %prep %setup -q %patch0 -p1 +%patch1 %build %configure --enable-xft \ @@ -63,23 +63,11 @@ make install DESTDIR=$RPM_BUILD_ROOT -# make gdm users happy -mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/ -install -m 0755 -p %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/apps/switchdesk/ - -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions -install -m 0755 -p %SOURCE2 $RPM_BUILD_ROOT%{_sysconfdir}/X11/gdm/Sessions/ - # this is for Fedora Core -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions -install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_sysconfdir}/X11/dm/Sessions/ - +mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/ +install -m 0755 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/ install -m 0755 -p %SOURCE4 $RPM_BUILD_ROOT%{_bindir}/fluxbox-xdg-menu -%post -# New menu-system -%{_bindir}/fluxbox-xdg-menu --with-icons - %clean rm -rf $RPM_BUILD_ROOT @@ -89,20 +77,23 @@ %{_bindir}/* %{_mandir}/man1/* %{_datadir}/%{name} -%{_datadir}/apps/switchdesk/Xclients.fluxbox - -%{_sysconfdir}/X11/gdm/Sessions/FluxBox -%{_sysconfdir}/X11/dm/Sessions/fluxbox.desktop +%{_datadir}/xsessions/fluxbox.desktop %changelog * Thu Mar 02 2006 Andreas Bierfert +0.9.14-3 +- fix Requires +- patch startfluxbox to generate user menu +- fix gdm detection + +* Thu Mar 02 2006 Andreas Bierfert 0.9.14-2 - fix build on gcc41 * Thu Nov 10 2005 Andreas Bierfert - enable nls and imlib2 - require artwizaleczepka instead of providing it... -- add menu script from Rudolf Kastel +- add menu script from Rudolf Kastl * Thu Sep 15 2005 Andreas Bierfert 0.9.14-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 17 Sep 2005 07:38:59 -0000 1.5 +++ sources 2 Mar 2006 22:57:50 -0000 1.6 @@ -1,2 +1 @@ 7641aaea532841e103e9705bb5b98f62 fluxbox-0.9.14.tar.bz2 -3c7da9a10a84d517e6846b2031950380 artwiz-aleczapka.tar.bz2 --- FluxBox DELETED --- --- Xclients.fluxbox DELETED --- From fedora-extras-commits at redhat.com Thu Mar 2 23:26:12 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 18:26:12 -0500 Subject: rpms/wine-docs/FC-3 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wine-docs.spec, 1.5, 1.6 Message-ID: <200603022326.k22NQih1008555@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8491/FC-3 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Feb 2006 22:43:18 -0000 1.5 +++ .cvsignore 2 Mar 2006 23:26:11 -0000 1.6 @@ -1 +1 @@ -wine-docs-0.9.8.tar.bz2 +wine-docs-0.9.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Feb 2006 22:43:18 -0000 1.5 +++ sources 2 Mar 2006 23:26:11 -0000 1.6 @@ -1 +1 @@ -13e916ae7df5e31a425eea89982792af wine-docs-0.9.8.tar.bz2 +dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wine-docs.spec 16 Feb 2006 22:43:18 -0000 1.5 +++ wine-docs.spec 2 Mar 2006 23:26:11 -0000 1.6 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.8.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 - version upgrade From fedora-extras-commits at redhat.com Thu Mar 2 23:26:18 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 18:26:18 -0500 Subject: rpms/wine-docs/FC-4 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wine-docs.spec, 1.6, 1.7 Message-ID: <200603022326.k22NQpT3008560@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8491/FC-4 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Feb 2006 22:43:24 -0000 1.5 +++ .cvsignore 2 Mar 2006 23:26:17 -0000 1.6 @@ -1 +1 @@ -wine-docs-0.9.8.tar.bz2 +wine-docs-0.9.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Feb 2006 22:43:24 -0000 1.5 +++ sources 2 Mar 2006 23:26:17 -0000 1.6 @@ -1 +1 @@ -13e916ae7df5e31a425eea89982792af wine-docs-0.9.8.tar.bz2 +dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wine-docs.spec 16 Feb 2006 22:43:24 -0000 1.6 +++ wine-docs.spec 2 Mar 2006 23:26:17 -0000 1.7 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.8.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 - version upgrade From fedora-extras-commits at redhat.com Thu Mar 2 23:26:23 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 18:26:23 -0500 Subject: rpms/wine-docs/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 wine-docs.spec, 1.5, 1.6 Message-ID: <200603022326.k22NQuVD008566@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8491/devel Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 16 Feb 2006 22:43:29 -0000 1.5 +++ .cvsignore 2 Mar 2006 23:26:23 -0000 1.6 @@ -1 +1 @@ -wine-docs-0.9.8.tar.bz2 +wine-docs-0.9.9.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 16 Feb 2006 22:43:29 -0000 1.5 +++ sources 2 Mar 2006 23:26:23 -0000 1.6 @@ -1 +1 @@ -13e916ae7df5e31a425eea89982792af wine-docs-0.9.8.tar.bz2 +dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wine-docs.spec 16 Feb 2006 22:43:29 -0000 1.5 +++ wine-docs.spec 2 Mar 2006 23:26:23 -0000 1.6 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.8.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 - version upgrade From fedora-extras-commits at redhat.com Fri Mar 3 00:18:33 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 2 Mar 2006 19:18:33 -0500 Subject: rpms/libdap/FC-4 .cvsignore, 1.2, 1.3 libdap.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603030019.k230JBka010794@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libdap/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730/FC-4 Modified Files: .cvsignore libdap.spec sources Log Message: new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Nov 2005 21:52:24 -0000 1.2 +++ .cvsignore 3 Mar 2006 00:18:32 -0000 1.3 @@ -1 +1 @@ -libdap-3.5.3.tar.gz +libdap-3.6.0.tar.gz Index: libdap.spec =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-4/libdap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libdap.spec 21 Nov 2005 22:01:19 -0000 1.2 +++ libdap.spec 3 Mar 2006 00:18:32 -0000 1.3 @@ -1,8 +1,8 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.5.3 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} #Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz @@ -74,6 +74,9 @@ %{_datadir}/aclocal/* %changelog +* Mon Feb 27 2006 James Gallagher - 3.6.0-1 +- new release + * Mon Nov 21 2005 Patrice Dumas - 3.5.3-2 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Nov 2005 21:52:24 -0000 1.2 +++ sources 3 Mar 2006 00:18:32 -0000 1.3 @@ -1 +1 @@ -62579a9814ccb39579796cdcc1560067 libdap-3.5.3.tar.gz +c2586c2f7225eb9af8d557b36c55c661 libdap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 00:18:40 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 2 Mar 2006 19:18:40 -0500 Subject: rpms/libdap/devel .cvsignore, 1.2, 1.3 libdap.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603030019.k230JCGf010800@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libdap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730/devel Modified Files: .cvsignore libdap.spec sources Log Message: new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libdap/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Nov 2005 21:52:24 -0000 1.2 +++ .cvsignore 3 Mar 2006 00:18:39 -0000 1.3 @@ -1 +1 @@ -libdap-3.5.3.tar.gz +libdap-3.6.0.tar.gz Index: libdap.spec =================================================================== RCS file: /cvs/extras/rpms/libdap/devel/libdap.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libdap.spec 22 Dec 2005 08:10:00 -0000 1.3 +++ libdap.spec 3 Mar 2006 00:18:39 -0000 1.4 @@ -1,8 +1,8 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.5.3 -Release: 3%{?dist} +Version: 3.6.0 +Release: 1%{?dist} #Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz @@ -74,8 +74,8 @@ %{_datadir}/aclocal/* %changelog -* Thu Dec 22 2005 Patrice Dumas - 3.5.3-3 -- rebuild +* Mon Feb 27 2006 James Gallagher - 3.6.0-1 +- new release * Mon Nov 21 2005 Patrice Dumas - 3.5.3-2 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libdap/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Nov 2005 21:52:24 -0000 1.2 +++ sources 3 Mar 2006 00:18:39 -0000 1.3 @@ -1 +1 @@ -62579a9814ccb39579796cdcc1560067 libdap-3.5.3.tar.gz +c2586c2f7225eb9af8d557b36c55c661 libdap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 00:18:11 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Thu, 2 Mar 2006 19:18:11 -0500 Subject: rpms/libdap/FC-3 .cvsignore, 1.2, 1.3 libdap.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603030019.k230JEEr010805@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libdap/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10730/FC-3 Modified Files: .cvsignore libdap.spec sources Log Message: new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Nov 2005 21:52:24 -0000 1.2 +++ .cvsignore 3 Mar 2006 00:18:11 -0000 1.3 @@ -1 +1 @@ -libdap-3.5.3.tar.gz +libdap-3.6.0.tar.gz Index: libdap.spec =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-3/libdap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libdap.spec 21 Nov 2005 22:01:19 -0000 1.2 +++ libdap.spec 3 Mar 2006 00:18:11 -0000 1.3 @@ -1,8 +1,8 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.5.3 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} #Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz @@ -74,6 +74,9 @@ %{_datadir}/aclocal/* %changelog +* Mon Feb 27 2006 James Gallagher - 3.6.0-1 +- new release + * Mon Nov 21 2005 Patrice Dumas - 3.5.3-2 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libdap/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Nov 2005 21:52:24 -0000 1.2 +++ sources 3 Mar 2006 00:18:11 -0000 1.3 @@ -1 +1 @@ -62579a9814ccb39579796cdcc1560067 libdap-3.5.3.tar.gz +c2586c2f7225eb9af8d557b36c55c661 libdap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 00:28:44 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 2 Mar 2006 19:28:44 -0500 Subject: rpms/wine/devel .cvsignore, 1.9, 1.10 sources, 1.10, 1.11 wine.spec, 1.17, 1.18 Message-ID: <200603030029.k230THFD010909@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10877 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Feb 2006 22:38:34 -0000 1.9 +++ .cvsignore 3 Mar 2006 00:28:43 -0000 1.10 @@ -1,2 +1,2 @@ wine-fonts-20050524.tar.gz -wine-0.9.8-fe.tar.bz2 +wine-0.9.9-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 16 Feb 2006 22:38:34 -0000 1.10 +++ sources 3 Mar 2006 00:28:43 -0000 1.11 @@ -1,2 +1,2 @@ fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -8a3bc8c46a240a250cb2770147e37efb wine-0.9.8-fe.tar.bz2 +a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- wine.spec 21 Feb 2006 12:22:21 -0000 1.17 +++ wine.spec 3 Mar 2006 00:28:43 -0000 1.18 @@ -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.8 +Version: 0.9.9 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.8-fe.tar.bz2 +Source0: wine-0.9.9-fe.tar.bz2 Source1: wine.init Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora @@ -351,7 +351,7 @@ %{_libdir}/wine/atl.dll.so %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so -%{_libdir}/wine/avifile.dll.so +%{_libdir}/wine/avifile.dll16 %{_libdir}/wine/aviinfo.exe.so %{_libdir}/wine/aviplay.exe.so %{_libdir}/wine/cabinet.dll.so @@ -361,27 +361,27 @@ %{_libdir}/wine/comcat.dll.so %{_libdir}/wine/comctl32.dll.so %{_libdir}/wine/comdlg32.dll.so -%{_libdir}/wine/comm.drv.so +%{_libdir}/wine/comm.drv16 %{_libdir}/wine/commdlg.dll.so -%{_libdir}/wine/compobj.dll.so +%{_libdir}/wine/compobj.dll16 %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so %{_libdir}/wine/cryptdll.dll.so -%{_libdir}/wine/ctl3d.dll.so +%{_libdir}/wine/ctl3d.dll16 %{_libdir}/wine/ctl3d32.dll.so -%{_libdir}/wine/ctl3dv2.dll.so +%{_libdir}/wine/ctl3dv2.dll16 %{_libdir}/wine/d3dim.dll.so %{_libdir}/wine/d3drm.dll.so %{_libdir}/wine/d3dxof.dll.so %{_libdir}/wine/dbghelp.dll.so %{_libdir}/wine/dciman32.dll.so -%{_libdir}/wine/ddeml.dll.so +%{_libdir}/wine/ddeml.dll16 %{_libdir}/wine/ddraw.dll.so %{_libdir}/wine/devenum.dll.so %{_libdir}/wine/dinput.dll.so %{_libdir}/wine/dinput8.dll.so -%{_libdir}/wine/dispdib.dll.so -%{_libdir}/wine/display.drv.so +%{_libdir}/wine/dispdib.dll16 +%{_libdir}/wine/display.drv16 %{_libdir}/wine/dmband.dll.so %{_libdir}/wine/dmcompos.dll.so %{_libdir}/wine/dmime.dll.so @@ -399,7 +399,7 @@ %{_libdir}/wine/dswave.dll.so %{_libdir}/wine/dxdiagn.dll.so %{_libdir}/wine/eject.exe.so -%{_libdir}/wine/gdi.exe.so +%{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so @@ -409,16 +409,16 @@ %{_libdir}/wine/ifsmgr.vxd.so %{_libdir}/wine/imaadp32.acm.so %{_libdir}/wine/imagehlp.dll.so -%{_libdir}/wine/imm.dll.so +%{_libdir}/wine/imm.dll16 %{_libdir}/wine/imm32.dll.so %{_libdir}/wine/iphlpapi.dll.so %{_libdir}/wine/itss.dll.so %{_libdir}/wine/joystick.drv.so %{_libdir}/wine/kernel32.dll.so -%{_libdir}/wine/keyboard.drv.so -%{_libdir}/wine/krnl386.exe.so +%{_libdir}/wine/keyboard.drv16 +%{_libdir}/wine/krnl386.exe16 %{_libdir}/wine/lz32.dll.so -%{_libdir}/wine/lzexpand.dll.so +%{_libdir}/wine/lzexpand.dll16 %{_libdir}/wine/mapi32.dll.so %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so @@ -427,15 +427,16 @@ %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so -%{_libdir}/wine/mmsystem.dll.so +%{_libdir}/wine/mmsystem.dll16 %{_libdir}/wine/monodebg.vxd.so -%{_libdir}/wine/mouse.drv.so +%{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so -%{_libdir}/wine/msacm.dll.so +%{_libdir}/wine/msacm.dll16 %{_libdir}/wine/msacm.drv.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so +%{_libdir}/wine/msftedit.dll.so %{_libdir}/wine/msg711.acm.so %{_libdir}/wine/mshtml.dll.so %{_libdir}/wine/msi.dll.so @@ -449,7 +450,7 @@ %{_libdir}/wine/msvcrtd.dll.so %{_libdir}/wine/msvfw32.dll.so %{_libdir}/wine/msvidc32.dll.so -%{_libdir}/wine/msvideo.dll.so +%{_libdir}/wine/msvideo.dll16 %{_libdir}/wine/mswsock.dll.so %{_libdir}/wine/msxml3.dll.so %{_libdir}/wine/netapi32.dll.so @@ -458,26 +459,26 @@ %{_libdir}/wine/objsel.dll.so %{_libdir}/wine/odbc32.dll.so %{_libdir}/wine/odbccp32.dll.so -%{_libdir}/wine/ole2.dll.so -%{_libdir}/wine/ole2conv.dll.so -%{_libdir}/wine/ole2disp.dll.so -%{_libdir}/wine/ole2nls.dll.so -%{_libdir}/wine/ole2prox.dll.so -%{_libdir}/wine/ole2thk.dll.so +%{_libdir}/wine/ole2.dll16 +%{_libdir}/wine/ole2conv.dll16 +%{_libdir}/wine/ole2disp.dll16 +%{_libdir}/wine/ole2nls.dll16 +%{_libdir}/wine/ole2prox.dll16 +%{_libdir}/wine/ole2thk.dll16 %{_libdir}/wine/ole32.dll.so %{_libdir}/wine/oleacc.dll.so %{_libdir}/wine/oleaut32.dll.so -%{_libdir}/wine/olecli.dll.so +%{_libdir}/wine/olecli.dll16 %{_libdir}/wine/olecli32.dll.so %{_libdir}/wine/oledlg.dll.so %{_libdir}/wine/olepro32.dll.so -%{_libdir}/wine/olesvr.dll.so +%{_libdir}/wine/olesvr.dll16 %{_libdir}/wine/olesvr32.dll.so %{_libdir}/wine/powrprof.dll.so %{_libdir}/wine/psapi.dll.so %{_libdir}/wine/qcap.dll.so %{_libdir}/wine/quartz.dll.so -%{_libdir}/wine/rasapi16.dll.so +%{_libdir}/wine/rasapi16.dll16 %{_libdir}/wine/rasapi32.dll.so %{_libdir}/wine/riched20.dll.so %{_libdir}/wine/riched32.dll.so @@ -488,33 +489,33 @@ %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so %{_libdir}/wine/setupapi.dll.so -%{_libdir}/wine/setupx.dll.so +%{_libdir}/wine/setupx.dll16 %{_libdir}/wine/shdocvw.dll.so -%{_libdir}/wine/shell.dll.so +%{_libdir}/wine/shell.dll16 %{_libdir}/wine/shell32.dll.so %{_libdir}/wine/shfolder.dll.so %{_libdir}/wine/shlwapi.dll.so %{_libdir}/wine/snmpapi.dll.so -%{_libdir}/wine/sound.drv.so +%{_libdir}/wine/sound.drv16 %{_libdir}/wine/stdole2.tlb.so %{_libdir}/wine/stdole32.tlb.so %{_libdir}/wine/sti.dll.so -%{_libdir}/wine/storage.dll.so -%{_libdir}/wine/stress.dll.so -%{_libdir}/wine/system.drv.so +%{_libdir}/wine/storage.dll16 +%{_libdir}/wine/stress.dll16 +%{_libdir}/wine/system.drv16 %{_libdir}/wine/tapi32.dll.so -%{_libdir}/wine/toolhelp.dll.so -%{_libdir}/wine/typelib.dll.so +%{_libdir}/wine/toolhelp.dll16 +%{_libdir}/wine/typelib.dll16 %{_libdir}/wine/unicows.dll.so %{_libdir}/wine/url.dll.so %{_libdir}/wine/urlmon.dll.so -%{_libdir}/wine/user.exe.so +%{_libdir}/wine/user.exe16 %{_libdir}/wine/user32.dll.so %{_libdir}/wine/usp10.dll.so %{_libdir}/wine/uxtheme.dll.so %{_libdir}/wine/vdhcp.vxd.so %{_libdir}/wine/vdmdbg.dll.so -%{_libdir}/wine/ver.dll.so +%{_libdir}/wine/ver.dll16 %{_libdir}/wine/version.dll.so %{_libdir}/wine/vmm.vxd.so %{_libdir}/wine/vnbt.vxd.so @@ -522,28 +523,28 @@ %{_libdir}/wine/vtdapi.vxd.so %{_libdir}/wine/vwin32.vxd.so %{_libdir}/wine/w32skrnl.dll.so -%{_libdir}/wine/w32sys.dll.so -%{_libdir}/wine/win32s16.dll.so -%{_libdir}/wine/win87em.dll.so -%{_libdir}/wine/winaspi.dll.so -%{_libdir}/wine/windebug.dll.so +%{_libdir}/wine/w32sys.dll16 +%{_libdir}/wine/win32s16.dll16 +%{_libdir}/wine/win87em.dll16 +%{_libdir}/wine/winaspi.dll16 +%{_libdir}/wine/windebug.dll16 %{_libdir}/wine/wineaudioio.drv.so %{_libdir}/wine/winedos.dll.so %{_libdir}/wine/wineoss.drv.so %{_libdir}/wine/winex11.drv.so -%{_libdir}/wine/wing.dll.so +%{_libdir}/wine/wing.dll16 %{_libdir}/wine/wininet.dll.so %{_libdir}/wine/winmm.dll.so -%{_libdir}/wine/winnls.dll.so +%{_libdir}/wine/winnls.dll16 %{_libdir}/wine/winnls32.dll.so -%{_libdir}/wine/winsock.dll.so +%{_libdir}/wine/winsock.dll16 %{_libdir}/wine/winspool.drv.so -%{_libdir}/wine/wintab.dll.so +%{_libdir}/wine/wintab.dll16 %{_libdir}/wine/wintab32.dll.so %{_libdir}/wine/wintrust.dll.so %{_libdir}/wine/wnaspi32.dll.so %{_libdir}/wine/wow32.dll.so -%{_libdir}/wine/wprocs.dll.so +%{_libdir}/wine/wprocs.dll16 %{_libdir}/wine/ws2_32.dll.so %{_libdir}/wine/wsock32.dll.so %{_libdir}/wine/wtsapi32.dll.so @@ -593,7 +594,7 @@ %{_datadir}/fonts/wine/vgasyst.fon %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so -%{_libdir}/wine/wineps16.drv.so +%{_libdir}/wine/wineps16.drv16 %{_libdir}/wine/d3d8.dll.so %{_libdir}/wine/d3d9.dll.so %{_libdir}/wine/d3dx8.dll.so @@ -659,7 +660,7 @@ %files twain %defattr(-,root,root,-) -%{_libdir}/wine/twain.dll.so +%{_libdir}/wine/twain.dll16 %{_libdir}/wine/twain_32.dll.so %files capi @@ -695,6 +696,10 @@ %{_libdir}/wine/*.def %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 - version upgrade From fedora-extras-commits at redhat.com Fri Mar 3 00:41:13 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:41:13 -0500 Subject: rpms/libipoddevice - New directory Message-ID: <200603030041.k230fFSN011013@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/libipoddevice Log Message: Directory /cvs/extras/rpms/libipoddevice added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 00:41:19 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:41:19 -0500 Subject: rpms/libipoddevice/devel - New directory Message-ID: <200603030041.k230fLId011028@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11005/libipoddevice/devel Log Message: Directory /cvs/extras/rpms/libipoddevice/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 00:41:36 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:41:36 -0500 Subject: rpms/libipoddevice Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603030041.k230fcPZ011062@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11050 Added Files: Makefile import.log Log Message: Setup of module libipoddevice --- NEW FILE Makefile --- # Top level Makefile for module libipoddevice all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 3 00:41:42 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:41:42 -0500 Subject: rpms/libipoddevice/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603030041.k230fi8a011082@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11050/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libipoddevice --- NEW 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 Mar 3 00:42:21 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:42:21 -0500 Subject: rpms/libipoddevice import.log,1.1,1.2 Message-ID: <200603030042.k230grvE011150@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11116 Modified Files: import.log Log Message: auto-import libipoddevice-0.4.1-1 on branch devel from libipoddevice-0.4.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Mar 2006 00:41:36 -0000 1.1 +++ import.log 3 Mar 2006 00:42:21 -0000 1.2 @@ -0,0 +1 @@ +libipoddevice-0_4_1-1:HEAD:libipoddevice-0.4.1-1.src.rpm:1141346553 From fedora-extras-commits at redhat.com Fri Mar 3 00:42:27 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 2 Mar 2006 19:42:27 -0500 Subject: rpms/libipoddevice/devel libipoddevice.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603030042.k230gx7Y011157@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/libipoddevice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11116/devel Modified Files: .cvsignore sources Added Files: libipoddevice.spec Log Message: auto-import libipoddevice-0.4.1-1 on branch devel from libipoddevice-0.4.1-1.src.rpm --- NEW FILE libipoddevice.spec --- %define libgtop_ver 2.12.0 %define hal_ver 0.5.2 Name: libipoddevice Version: 0.4.1 Release: 1 Summary: Device-specific layer for the Apple iPod Group: Development/Libraries License: LGPL URL: http://banshee-project.org/Subprojects/Libipoddevice Source0: http://banshee-project.org/files/banshee/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: hal-devel >= %{hal_ver} BuildRequires: libgtop2-devel >= %{libgtop_ver} BuildRequires: udev %description libipoddevice is a device-specific layer for the Apple iPod (http://www.apple.com/ipod). libipoddevice provides iPod-specific HAL event notification to applications, and along with objects representing an iPod, which gives the application access to properties and features of an iPod. %package devel Summary: Libraries and headers for using libipoddevice Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: hal-devel >= %{hal_ver} Requires: libgtop2-devel >= %{libgtop_ver} Requires: udev %description devel This package contains various headers for using libipoddevice %prep %setup -q %build %configure make %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT %makeinstall %clean %{__rm} -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING %{_bindir}/ipod %{_libdir}/libipoddevice.so.* %files devel %{_libdir}/libipoddevice.so %{_libdir}/pkgconfig/ipoddevice.pc %{_includedir}/ipoddevice/ipod-device.h %{_includedir}/ipoddevice/ipod-device-event-listener.h %exclude %{_libdir}/libipoddevice.a %exclude %{_libdir}/libipoddevice.la %changelog * Tue Feb 21 2006 Christopher Aillon 0.4.1-1 - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2006 00:41:41 -0000 1.1 +++ .cvsignore 3 Mar 2006 00:42:27 -0000 1.2 @@ -0,0 +1 @@ +libipoddevice-0.4.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libipoddevice/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2006 00:41:41 -0000 1.1 +++ sources 3 Mar 2006 00:42:27 -0000 1.2 @@ -0,0 +1 @@ +000b3c7b82026bf052a16811ba34c515 libipoddevice-0.4.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 01:12:00 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Thu, 2 Mar 2006 20:12:00 -0500 Subject: rpms/l2tpd/devel sources,1.5,1.6 .cvsignore,1.3,1.4 Message-ID: <200603030112.k231CX9F013234@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/l2tpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13215 Modified Files: sources .cvsignore Log Message: update sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/l2tpd/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 21 Feb 2006 06:50:15 -0000 1.5 +++ sources 3 Mar 2006 01:12:00 -0000 1.6 @@ -1,17 +1,3 @@ +ce0b777c5301144bc03d205072a8ea43 l2tpd.init 36144b856b70d58bdb4ac4805cb71bb2 l2tpd-0.69.20051030.tar.gz -6ed1d2dc758627426015de8f87654a03 l2tpd-MSL2TP-StopCCN.patch -15cd18cdc1c1d8a033bc753f0f5e7009 l2tpd-async-sync.patch -a3dc0d257f31f2b8df3a282ddeaf31e7 l2tpd-moredebug.patch -af1572e8653e8f2570323712898c8730 l2tpd-solaris.patch -3c43857ad98b067de1b07ed01a7bdeec l2tpd-changelog.patch -5f40d5ef85560bf3c4a38f3ec1f70b45 l2tpd-move-pty-logic.patch -8d1be89b09d4786d087e2315ccc35d22 l2tpd-stopccn.patch -a39c275369a5696f1d8caf908553876d l2tpd-gcc4-fixes.patch -bc5c2580b888c9bf3fc7da95f486a9cc l2tpd-uaddr.patch -e7a83525c08b73fcf6121c76821281f8 l2tpd-log.patch -cef234d7fd79cfb1d48c946f22cfcb0e l2tpd-nodebug-default.patch -68fbfaf8556c8d5ef211d3481fd35e39 l2tpd-version.patch -64d7cbe5fd2c60b133f9b70f29a73674 l2tpd-log-strerr.patch -123ff5faaf6b71696f188f764f5695b4 l2tpd-patents.patch -6ad9954aea9b0ee5f2136fb93f2b1dca l2tpd-max-retries.patch -49b6937aa97e304a088562a235a52c3f l2tpd-socket.patch +fcf5f822027a8f0f855245d366020a66 l2tpd.conf Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/l2tpd/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Feb 2006 06:15:20 -0000 1.3 +++ .cvsignore 3 Mar 2006 01:12:00 -0000 1.4 @@ -1 +1,3 @@ -l2tpd-MSL2TP-StopCCN.patch +l2tpd.init +l2tpd-0.69.20051030.tar.gz +l2tpd.conf From fedora-extras-commits at redhat.com Fri Mar 3 01:21:19 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:21:19 -0500 Subject: rpms/perl-IO-All - New directory Message-ID: <200603030121.k231LLsL013338@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13330/perl-IO-All Log Message: Directory /cvs/extras/rpms/perl-IO-All added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 01:21:25 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:21:25 -0500 Subject: rpms/perl-IO-All/devel - New directory Message-ID: <200603030121.k231LRHt013353@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13330/perl-IO-All/devel Log Message: Directory /cvs/extras/rpms/perl-IO-All/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 01:21:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:21:42 -0500 Subject: rpms/perl-IO-All Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603030121.k231LiWb013387@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13375 Added Files: Makefile import.log Log Message: Setup of module perl-IO-All --- NEW FILE Makefile --- # Top level Makefile for module perl-IO-All all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 3 01:21:48 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:21:48 -0500 Subject: rpms/perl-IO-All/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603030121.k231LoXc013407@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13375/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-IO-All --- NEW 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 Mar 3 01:22:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:22:16 -0500 Subject: rpms/perl-IO-All import.log,1.1,1.2 Message-ID: <200603030122.k231MmMi013480@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13443 Modified Files: import.log Log Message: auto-import perl-IO-All-0.33-2 on branch devel from perl-IO-All-0.33-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Mar 2006 01:21:42 -0000 1.1 +++ import.log 3 Mar 2006 01:22:16 -0000 1.2 @@ -0,0 +1 @@ +perl-IO-All-0_33-2:HEAD:perl-IO-All-0.33-2.src.rpm:1141348929 From fedora-extras-commits at redhat.com Fri Mar 3 01:22:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:22:22 -0500 Subject: rpms/perl-IO-All/devel perl-IO-All.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603030122.k231MsFi013484@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13443/devel Modified Files: .cvsignore sources Added Files: perl-IO-All.spec Log Message: auto-import perl-IO-All-0.33-2 on branch devel from perl-IO-All-0.33-2.src.rpm --- NEW FILE perl-IO-All.spec --- Name: perl-IO-All Version: 0.33 Release: 2%{?dist} Summary: IO::All Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-All/ Source0: http://www.cpan.org/modules/by-module/IO/IO-All-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Spiffy) >= 0.21 Requires: perl(Spiffy) >= 0.21 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The IO::All object is a proxy for IO::File, IO::Dir, IO::Socket, IO::String, Tie::File, File::Spec, File::Path and File::ReadBackwards; as well as all the DBM and MLDBM modules. You can use most of the methods found in these classes and in IO::Handle (which they inherit from). IO::All adds dozens of other helpful idiomatic methods including file stat and manipulation functions. %prep %setup -q -n IO-All-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check %{?_with_check:make test} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.33-2 - Filter Requires: perl(mixin). - Turn off "make test" for now. - Drop explict BR: perl. * Wed Dec 28 2005 Steven Pritchard 0.33-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2006 01:21:48 -0000 1.1 +++ .cvsignore 3 Mar 2006 01:22:22 -0000 1.2 @@ -0,0 +1 @@ +IO-All-0.33.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2006 01:21:48 -0000 1.1 +++ sources 3 Mar 2006 01:22:22 -0000 1.2 @@ -0,0 +1 @@ +7e9e83dc8ec4404d79ee73af08f6421f IO-All-0.33.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 01:24:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:24:21 -0500 Subject: owners owners.list,1.698,1.699 Message-ID: <200603030124.k231Os06013551@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13533 Modified Files: owners.list Log Message: Add perl-IO-All. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.698 retrieving revision 1.699 diff -u -r1.698 -r1.699 --- owners.list 2 Mar 2006 22:43:53 -0000 1.698 +++ owners.list 3 Mar 2006 01:24:21 -0000 1.699 @@ -912,6 +912,7 @@ Fedora Extras|perl-Image-Size|Determine the size of images in several common formats in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Xbm|Load, create, manipulate and save xbm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Image-Xpm|Load, create, manipulate and save xpm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-IO-All|IO::All Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 3 01:28:32 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:28:32 -0500 Subject: rpms/perl-Spoon - New directory Message-ID: <200603030128.k231SYi5013629@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13621/perl-Spoon Log Message: Directory /cvs/extras/rpms/perl-Spoon added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 01:28:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:28:39 -0500 Subject: rpms/perl-Spoon/devel - New directory Message-ID: <200603030128.k231Sf0d013644@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13621/perl-Spoon/devel Log Message: Directory /cvs/extras/rpms/perl-Spoon/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 01:29:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:29:27 -0500 Subject: rpms/perl-Spoon Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603030129.k231TTHv013679@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13666 Added Files: Makefile import.log Log Message: Setup of module perl-Spoon --- NEW FILE Makefile --- # Top level Makefile for module perl-Spoon all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 3 01:29:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:29:33 -0500 Subject: rpms/perl-Spoon/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603030129.k231TZoT013697@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13666/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Spoon --- NEW 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 Mar 3 01:30:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:30:27 -0500 Subject: rpms/perl-Spoon import.log,1.1,1.2 Message-ID: <200603030130.k231UxHW013774@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13738 Modified Files: import.log Log Message: auto-import perl-Spoon-0.23-2 on branch devel from perl-Spoon-0.23-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Spoon/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Mar 2006 01:29:27 -0000 1.1 +++ import.log 3 Mar 2006 01:30:26 -0000 1.2 @@ -0,0 +1 @@ +perl-Spoon-0_23-2:HEAD:perl-Spoon-0.23-2.src.rpm:1141349418 From fedora-extras-commits at redhat.com Fri Mar 3 01:30:37 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 20:30:37 -0500 Subject: rpms/perl-Spoon/devel filter-provides.sh, NONE, 1.1 perl-Spoon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603030131.k231VAkw013778@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13738/devel Modified Files: .cvsignore sources Added Files: filter-provides.sh perl-Spoon.spec Log Message: auto-import perl-Spoon-0.23-2 on branch devel from perl-Spoon-0.23-2.src.rpm --- NEW FILE filter-provides.sh --- #!/bin/sh if [ -x /usr/lib/rpm/redhat/find-provides ]; then FINDREQ=/usr/lib/rpm/redhat/find-provides else FINDREQ=/usr/lib/rpm/find-provides fi $FINDREQ $* | grep -v 'perl(IO::All)' --- NEW FILE perl-Spoon.spec --- Name: perl-Spoon Version: 0.23 Release: 2%{?dist} Summary: Spoon Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Spoon/ Source0: http://www.cpan.org/modules/by-module/Spoon/Spoon-%{version}.tar.gz Source1: filter-provides.sh %define _use_internal_dependency_generator 0 %define __find_provides %{SOURCE1} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(IO::All) >= 0.32 BuildRequires: perl(Spiffy) >= 0.22 BuildRequires: perl(Template) >= 2.10 BuildRequires: perl(Test::Memory::Cycle) BuildRequires: perl(Time::HiRes) Requires: perl(IO::All) >= 0.32 Requires: perl(Spiffy) >= 0.22 Requires: perl(Template) >= 2.10 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Spoon is an Application Framework that is designed primarily for building Social Software web applications. The Kwiki wiki software is built on top of Spoon. %prep %setup -q -n Spoon-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.23-2 - Drop explicit BR: perl. * Wed Dec 28 2005 Steven Pritchard 0.23-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Spoon/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2006 01:29:33 -0000 1.1 +++ .cvsignore 3 Mar 2006 01:30:36 -0000 1.2 @@ -0,0 +1 @@ +Spoon-0.23.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Spoon/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2006 01:29:33 -0000 1.1 +++ sources 3 Mar 2006 01:30:36 -0000 1.2 @@ -0,0 +1 @@ +96acf017b3aa492e62afb1f826d3d9bd Spoon-0.23.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 02:06:15 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 21:06:15 -0500 Subject: rpms/perl-Spoon/devel filter-provides.sh, 1.1, 1.2 perl-Spoon.spec, 1.1, 1.2 Message-ID: <200603030206.k2326p3M015792@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Spoon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15770 Modified Files: filter-provides.sh perl-Spoon.spec Log Message: Improve Summary. Fix Source0. Index: filter-provides.sh =================================================================== RCS file: /cvs/extras/rpms/perl-Spoon/devel/filter-provides.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- filter-provides.sh 3 Mar 2006 01:30:36 -0000 1.1 +++ filter-provides.sh 3 Mar 2006 02:06:05 -0000 1.2 @@ -1,9 +1,9 @@ #!/bin/sh if [ -x /usr/lib/rpm/redhat/find-provides ]; then - FINDREQ=/usr/lib/rpm/redhat/find-provides + FINDPROV=/usr/lib/rpm/redhat/find-provides else - FINDREQ=/usr/lib/rpm/find-provides + FINDPROV=/usr/lib/rpm/find-provides fi -$FINDREQ $* | grep -v 'perl(IO::All)' +$FINDPROV $* | grep -v 'perl(IO::All)' Index: perl-Spoon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Spoon/devel/perl-Spoon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Spoon.spec 3 Mar 2006 01:30:36 -0000 1.1 +++ perl-Spoon.spec 3 Mar 2006 02:06:05 -0000 1.2 @@ -1,11 +1,11 @@ Name: perl-Spoon Version: 0.23 -Release: 2%{?dist} -Summary: Spoon Perl module +Release: 3%{?dist} +Summary: Spiffy application framework License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Spoon/ -Source0: http://www.cpan.org/modules/by-module/Spoon/Spoon-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Spoon-%{version}.tar.gz Source1: filter-provides.sh %define _use_internal_dependency_generator 0 %define __find_provides %{SOURCE1} @@ -59,6 +59,10 @@ %{_mandir}/man3/* %changelog +* Thu Mar 02 2006 Steven Pritchard 0.23-3 +- Improve Summary. +- Fix Source0. + * Mon Feb 27 2006 Steven Pritchard 0.23-2 - Drop explicit BR: perl. From fedora-extras-commits at redhat.com Fri Mar 3 02:07:32 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Thu, 2 Mar 2006 21:07:32 -0500 Subject: owners owners.list,1.699,1.700 Message-ID: <200603030208.k23284i0015879@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15843 Modified Files: owners.list Log Message: Add perl-Spoon. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.699 retrieving revision 1.700 diff -u -r1.699 -r1.700 --- owners.list 3 Mar 2006 01:24:21 -0000 1.699 +++ owners.list 3 Mar 2006 02:07:32 -0000 1.700 @@ -982,6 +982,7 @@ Fedora Extras|perl-SOAP-Lite|Provides the Simple Object Access Protocol (SOAP)|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spiffy|Framework for doing object oriented (OO) programming in Perl|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spreadsheet-WriteExcel|Write formatted text and numbers to a cross-platform Excel binary file|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SQL-Abstract|Generate SQL from Perl data structures|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com 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 From fedora-extras-commits at redhat.com Fri Mar 3 05:50:27 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:50:27 -0500 Subject: rpms/ipod-sharp - New directory Message-ID: <200603030550.k235oTrD022051@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/ipod-sharp Log Message: Directory /cvs/extras/rpms/ipod-sharp added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 05:50:32 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:50:32 -0500 Subject: rpms/ipod-sharp/devel - New directory Message-ID: <200603030550.k235oYMb022066@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/ipod-sharp/devel Log Message: Directory /cvs/extras/rpms/ipod-sharp/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 05:50:49 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:50:49 -0500 Subject: rpms/ipod-sharp Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603030550.k235op1n022100@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22088 Added Files: Makefile import.log Log Message: Setup of module ipod-sharp --- NEW FILE Makefile --- # Top level Makefile for module ipod-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 Fri Mar 3 05:50:55 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:50:55 -0500 Subject: rpms/ipod-sharp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603030550.k235ovmA022120@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22088/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ipod-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 Fri Mar 3 05:51:53 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:51:53 -0500 Subject: rpms/ipod-sharp import.log,1.1,1.2 Message-ID: <200603030552.k235qPqP022192@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22158 Modified Files: import.log Log Message: auto-import ipod-sharp-0.5.15-1 on branch devel from ipod-sharp-0.5.15-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ipod-sharp/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Mar 2006 05:50:49 -0000 1.1 +++ import.log 3 Mar 2006 05:51:52 -0000 1.2 @@ -0,0 +1 @@ +ipod-sharp-0_5_15-1:HEAD:ipod-sharp-0.5.15-1.src.rpm:1141365124 From fedora-extras-commits at redhat.com Fri Mar 3 05:51:58 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 00:51:58 -0500 Subject: rpms/ipod-sharp/devel ipod-sharp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603030552.k235qVt1022196@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22158/devel Modified Files: .cvsignore sources Added Files: ipod-sharp.spec Log Message: auto-import ipod-sharp-0.5.15-1 on branch devel from ipod-sharp-0.5.15-1.src.rpm --- NEW FILE ipod-sharp.spec --- Name: ipod-sharp Version: 0.5.15 Release: 1 Summary: Support for high level features of Apple's iPod Group: Development/Libraries License: LGPL URL: http://banshee-project.org/Subprojects/Ipod-sharp Source0: http://banshee-project.org/files/ipod-sharp/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libipoddevice-devel BuildRequires: mono-devel BuildRequires: gtk-sharp2 %description ipod-sharp provies support for high level features of Apple's iPod, like support for audio content, including reading and writing of the iTunes/iPod database, and syncing music. ipod-sharp also provides a CIL wrapper for libipoddevice. %prep %setup -q %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure --disable-docs make %{?_smp_mflags} %install %{__rm} -rf ${RPM_BUILD_ROOT} export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} make install DESTDIR=${RPM_BUILD_ROOT} GACUTIL_FLAGS="/package ipod-sharp /gacdir %{_prefix}/lib /root ${RPM_BUILD_ROOT}%{_prefix}/lib" %clean %{__rm} -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root,-) %doc COPYING %{_libdir}/pkgconfig/ipod-sharp.pc %{_libdir}/pkgconfig/ipod-sharp-ui.pc %dir %{_libdir}/ipod-sharp %{_libdir}/ipod-sharp/ipod-sharp.dll %{_libdir}/ipod-sharp/ipod-sharp-ui.dll %changelog * Tue Feb 21 2006 Christopher Aillon 0.5.15-1 - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ipod-sharp/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2006 05:50:55 -0000 1.1 +++ .cvsignore 3 Mar 2006 05:51:58 -0000 1.2 @@ -0,0 +1 @@ +ipod-sharp-0.5.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ipod-sharp/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2006 05:50:55 -0000 1.1 +++ sources 3 Mar 2006 05:51:58 -0000 1.2 @@ -0,0 +1 @@ +734956f3505f776c6920d4ae687f4bee ipod-sharp-0.5.15.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 06:05:12 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Fri, 3 Mar 2006 01:05:12 -0500 Subject: rpms/ipod-sharp/devel ipod-sharp.spec,1.1,1.2 Message-ID: <200603030605.k2365Tp0024140@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/ipod-sharp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24123 Modified Files: ipod-sharp.spec Log Message: * Fri Mar 3 2006 Christopher Aillon 0.5.15-2 - Build on 64bit platforms Index: ipod-sharp.spec =================================================================== RCS file: /cvs/extras/rpms/ipod-sharp/devel/ipod-sharp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ipod-sharp.spec 3 Mar 2006 05:51:58 -0000 1.1 +++ ipod-sharp.spec 3 Mar 2006 06:05:11 -0000 1.2 @@ -1,6 +1,6 @@ Name: ipod-sharp Version: 0.5.15 -Release: 1 +Release: 2 Summary: Support for high level features of Apple's iPod Group: Development/Libraries @@ -40,10 +40,13 @@ %doc COPYING %{_libdir}/pkgconfig/ipod-sharp.pc %{_libdir}/pkgconfig/ipod-sharp-ui.pc -%dir %{_libdir}/ipod-sharp -%{_libdir}/ipod-sharp/ipod-sharp.dll -%{_libdir}/ipod-sharp/ipod-sharp-ui.dll +%dir %{_prefix}/lib/ipod-sharp +%{_prefix}/lib/ipod-sharp/ipod-sharp.dll +%{_prefix}/lib/ipod-sharp/ipod-sharp-ui.dll %changelog +* Fri Mar 3 2006 Christopher Aillon 0.5.15-2 +- Build on 64bit platforms + * Tue Feb 21 2006 Christopher Aillon 0.5.15-1 - Initial RPM From fedora-extras-commits at redhat.com Fri Mar 3 07:36:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Mar 2006 02:36:30 -0500 Subject: rpms/wine/devel wine.spec,1.18,1.19 Message-ID: <200603030737.k237b2Ju026308@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26291 Modified Files: wine.spec Log Message: - fix another dll Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- wine.spec 3 Mar 2006 00:28:43 -0000 1.18 +++ wine.spec 3 Mar 2006 07:36:29 -0000 1.19 @@ -362,7 +362,7 @@ %{_libdir}/wine/comctl32.dll.so %{_libdir}/wine/comdlg32.dll.so %{_libdir}/wine/comm.drv16 -%{_libdir}/wine/commdlg.dll.so +%{_libdir}/wine/commdlg.dll16 %{_libdir}/wine/compobj.dll16 %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so From fedora-extras-commits at redhat.com Fri Mar 3 08:05:05 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 03:05:05 -0500 Subject: rpms/libnc-dap/FC-3 .cvsignore, 1.2, 1.3 libnc-dap.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603030805.k2385btS028379@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libnc-dap/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28323/FC-3 Modified Files: .cvsignore libnc-dap.spec sources Log Message: * Tue Feb 28 2006 James Gallagher - 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Nov 2005 08:25:41 -0000 1.2 +++ .cvsignore 3 Mar 2006 08:05:05 -0000 1.3 @@ -1 +1 @@ -libnc-dap-3.5.2.tar.gz +libnc-dap-3.6.0.tar.gz Index: libnc-dap.spec =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-3/libnc-dap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnc-dap.spec 22 Nov 2005 08:30:20 -0000 1.2 +++ libnc-dap.spec 3 Mar 2006 08:05:05 -0000 1.3 @@ -1,7 +1,7 @@ Name: libnc-dap Summary: The NetCDF interface to DAP-2 from OPeNDAP -Version: 3.5.2 -Release: 5%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz URL: http://www.opendap.org/ @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL/BSD # Mandrake and Fedora -BuildRequires: libdap-devel >= 3.5.2 +BuildRequires: libdap-devel >= 3.6.0 %description The libnc-dap library is a call-for-call replacement for netcdf 3.5 (and @@ -26,8 +26,8 @@ Summary: Static libraries and header files from libnc-dap Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libdap-devel >= 3.5.2 -# +Requires: libdap-devel >= 3.6.0 + %description devel This package contains all the files needed to develop applications that will use libnc-dap. @@ -68,6 +68,9 @@ %changelog +* Tue Feb 28 2006 James Gallagher - 3.6.0-1 +- new release + * Mon Nov 21 2005 Patrice Dumas - 3.5.2-5 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Nov 2005 08:25:41 -0000 1.2 +++ sources 3 Mar 2006 08:05:05 -0000 1.3 @@ -1 +1 @@ -2ac95dc2e48303fe0ecfc48c08fa0d63 libnc-dap-3.5.2.tar.gz +95f3940476e0d3f019bd58ad7523a5dd libnc-dap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 08:05:19 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 03:05:19 -0500 Subject: rpms/libnc-dap/FC-4 .cvsignore, 1.2, 1.3 libnc-dap.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603030805.k2385rE3028384@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libnc-dap/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28323/FC-4 Modified Files: .cvsignore libnc-dap.spec sources Log Message: * Tue Feb 28 2006 James Gallagher - 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Nov 2005 08:25:41 -0000 1.2 +++ .cvsignore 3 Mar 2006 08:05:19 -0000 1.3 @@ -1 +1 @@ -libnc-dap-3.5.2.tar.gz +libnc-dap-3.6.0.tar.gz Index: libnc-dap.spec =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-4/libnc-dap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnc-dap.spec 22 Nov 2005 08:30:20 -0000 1.2 +++ libnc-dap.spec 3 Mar 2006 08:05:19 -0000 1.3 @@ -1,7 +1,7 @@ Name: libnc-dap Summary: The NetCDF interface to DAP-2 from OPeNDAP -Version: 3.5.2 -Release: 5%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz URL: http://www.opendap.org/ @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL/BSD # Mandrake and Fedora -BuildRequires: libdap-devel >= 3.5.2 +BuildRequires: libdap-devel >= 3.6.0 %description The libnc-dap library is a call-for-call replacement for netcdf 3.5 (and @@ -26,8 +26,8 @@ Summary: Static libraries and header files from libnc-dap Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libdap-devel >= 3.5.2 -# +Requires: libdap-devel >= 3.6.0 + %description devel This package contains all the files needed to develop applications that will use libnc-dap. @@ -68,6 +68,9 @@ %changelog +* Tue Feb 28 2006 James Gallagher - 3.6.0-1 +- new release + * Mon Nov 21 2005 Patrice Dumas - 3.5.2-5 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Nov 2005 08:25:41 -0000 1.2 +++ sources 3 Mar 2006 08:05:19 -0000 1.3 @@ -1 +1 @@ -2ac95dc2e48303fe0ecfc48c08fa0d63 libnc-dap-3.5.2.tar.gz +95f3940476e0d3f019bd58ad7523a5dd libnc-dap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 08:05:26 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 03:05:26 -0500 Subject: rpms/libnc-dap/devel .cvsignore, 1.2, 1.3 libnc-dap.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603030805.k2385wjH028389@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libnc-dap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28323/devel Modified Files: .cvsignore libnc-dap.spec sources Log Message: * Tue Feb 28 2006 James Gallagher - 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Nov 2005 08:25:41 -0000 1.2 +++ .cvsignore 3 Mar 2006 08:05:26 -0000 1.3 @@ -1 +1 @@ -libnc-dap-3.5.2.tar.gz +libnc-dap-3.6.0.tar.gz Index: libnc-dap.spec =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/devel/libnc-dap.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libnc-dap.spec 22 Nov 2005 08:30:20 -0000 1.2 +++ libnc-dap.spec 3 Mar 2006 08:05:26 -0000 1.3 @@ -1,7 +1,7 @@ Name: libnc-dap Summary: The NetCDF interface to DAP-2 from OPeNDAP -Version: 3.5.2 -Release: 5%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz URL: http://www.opendap.org/ @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: LGPL/BSD # Mandrake and Fedora -BuildRequires: libdap-devel >= 3.5.2 +BuildRequires: libdap-devel >= 3.6.0 %description The libnc-dap library is a call-for-call replacement for netcdf 3.5 (and @@ -26,8 +26,8 @@ Summary: Static libraries and header files from libnc-dap Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: libdap-devel >= 3.5.2 -# +Requires: libdap-devel >= 3.6.0 + %description devel This package contains all the files needed to develop applications that will use libnc-dap. @@ -68,6 +68,9 @@ %changelog +* Tue Feb 28 2006 James Gallagher - 3.6.0-1 +- new release + * Mon Nov 21 2005 Patrice Dumas - 3.5.2-5 - fix Source0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Nov 2005 08:25:41 -0000 1.2 +++ sources 3 Mar 2006 08:05:26 -0000 1.3 @@ -1 +1 @@ -2ac95dc2e48303fe0ecfc48c08fa0d63 libnc-dap-3.5.2.tar.gz +95f3940476e0d3f019bd58ad7523a5dd libnc-dap-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 08:21:14 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 03:21:14 -0500 Subject: rpms/libnc-dap/devel libnc-dap.spec,1.3,1.4 Message-ID: <200603030821.k238Lk7s028546@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/libnc-dap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28529 Modified Files: libnc-dap.spec Log Message: bump release Index: libnc-dap.spec =================================================================== RCS file: /cvs/extras/rpms/libnc-dap/devel/libnc-dap.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libnc-dap.spec 3 Mar 2006 08:05:26 -0000 1.3 +++ libnc-dap.spec 3 Mar 2006 08:21:13 -0000 1.4 @@ -1,7 +1,7 @@ Name: libnc-dap Summary: The NetCDF interface to DAP-2 from OPeNDAP Version: 3.6.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz URL: http://www.opendap.org/ @@ -68,7 +68,7 @@ %changelog -* Tue Feb 28 2006 James Gallagher - 3.6.0-1 +* Tue Feb 28 2006 James Gallagher - 3.6.0-1.1 - new release * Mon Nov 21 2005 Patrice Dumas - 3.5.2-5 From fedora-extras-commits at redhat.com Fri Mar 3 09:16:35 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Mar 2006 04:16:35 -0500 Subject: rpms/wine/FC-4 .cvsignore, 1.9, 1.10 sources, 1.10, 1.11 wine.spec, 1.14, 1.15 Message-ID: <200603030917.k239H8Tb031144@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31106/FC-4 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 16 Feb 2006 22:38:28 -0000 1.9 +++ .cvsignore 3 Mar 2006 09:16:35 -0000 1.10 @@ -1,2 +1,2 @@ wine-fonts-20050524.tar.gz -wine-0.9.8-fe.tar.bz2 +wine-0.9.9-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 16 Feb 2006 22:38:28 -0000 1.10 +++ sources 3 Mar 2006 09:16:35 -0000 1.11 @@ -1,2 +1,2 @@ fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -8a3bc8c46a240a250cb2770147e37efb wine-0.9.8-fe.tar.bz2 +a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- wine.spec 21 Feb 2006 12:22:15 -0000 1.14 +++ wine.spec 3 Mar 2006 09:16:35 -0000 1.15 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.8-fe.tar.bz2 +Source0: wine-0.9.9-fe.tar.bz2 Source1: wine.init Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora @@ -338,7 +338,7 @@ %{_libdir}/wine/atl.dll.so %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so -%{_libdir}/wine/avifile.dll.so +%{_libdir}/wine/avifile.dll16 %{_libdir}/wine/aviinfo.exe.so %{_libdir}/wine/aviplay.exe.so %{_libdir}/wine/cabinet.dll.so @@ -348,27 +348,27 @@ %{_libdir}/wine/comcat.dll.so %{_libdir}/wine/comctl32.dll.so %{_libdir}/wine/comdlg32.dll.so -%{_libdir}/wine/comm.drv.so -%{_libdir}/wine/commdlg.dll.so -%{_libdir}/wine/compobj.dll.so +%{_libdir}/wine/comm.drv16 +%{_libdir}/wine/commdlg.dll16 +%{_libdir}/wine/compobj.dll16 %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so %{_libdir}/wine/cryptdll.dll.so -%{_libdir}/wine/ctl3d.dll.so +%{_libdir}/wine/ctl3d.dll16 %{_libdir}/wine/ctl3d32.dll.so -%{_libdir}/wine/ctl3dv2.dll.so +%{_libdir}/wine/ctl3dv2.dll16 %{_libdir}/wine/d3dim.dll.so %{_libdir}/wine/d3drm.dll.so %{_libdir}/wine/d3dxof.dll.so %{_libdir}/wine/dbghelp.dll.so %{_libdir}/wine/dciman32.dll.so -%{_libdir}/wine/ddeml.dll.so +%{_libdir}/wine/ddeml.dll16 %{_libdir}/wine/ddraw.dll.so %{_libdir}/wine/devenum.dll.so %{_libdir}/wine/dinput.dll.so %{_libdir}/wine/dinput8.dll.so -%{_libdir}/wine/dispdib.dll.so -%{_libdir}/wine/display.drv.so +%{_libdir}/wine/dispdib.dll16 +%{_libdir}/wine/display.drv16 %{_libdir}/wine/dmband.dll.so %{_libdir}/wine/dmcompos.dll.so %{_libdir}/wine/dmime.dll.so @@ -386,7 +386,7 @@ %{_libdir}/wine/dswave.dll.so %{_libdir}/wine/dxdiagn.dll.so %{_libdir}/wine/eject.exe.so -%{_libdir}/wine/gdi.exe.so +%{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so @@ -396,16 +396,16 @@ %{_libdir}/wine/ifsmgr.vxd.so %{_libdir}/wine/imaadp32.acm.so %{_libdir}/wine/imagehlp.dll.so -%{_libdir}/wine/imm.dll.so +%{_libdir}/wine/imm.dll16 %{_libdir}/wine/imm32.dll.so %{_libdir}/wine/iphlpapi.dll.so %{_libdir}/wine/itss.dll.so %{_libdir}/wine/joystick.drv.so %{_libdir}/wine/kernel32.dll.so -%{_libdir}/wine/keyboard.drv.so -%{_libdir}/wine/krnl386.exe.so +%{_libdir}/wine/keyboard.drv16 +%{_libdir}/wine/krnl386.exe16 %{_libdir}/wine/lz32.dll.so -%{_libdir}/wine/lzexpand.dll.so +%{_libdir}/wine/lzexpand.dll16 %{_libdir}/wine/mapi32.dll.so %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so @@ -414,15 +414,16 @@ %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so -%{_libdir}/wine/mmsystem.dll.so +%{_libdir}/wine/mmsystem.dll16 %{_libdir}/wine/monodebg.vxd.so -%{_libdir}/wine/mouse.drv.so +%{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so -%{_libdir}/wine/msacm.dll.so +%{_libdir}/wine/msacm.dll16 %{_libdir}/wine/msacm.drv.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so +%{_libdir}/wine/msftedit.dll.so %{_libdir}/wine/msg711.acm.so %{_libdir}/wine/mshtml.dll.so %{_libdir}/wine/msi.dll.so @@ -436,7 +437,7 @@ %{_libdir}/wine/msvcrtd.dll.so %{_libdir}/wine/msvfw32.dll.so %{_libdir}/wine/msvidc32.dll.so -%{_libdir}/wine/msvideo.dll.so +%{_libdir}/wine/msvideo.dll16 %{_libdir}/wine/mswsock.dll.so %{_libdir}/wine/msxml3.dll.so %{_libdir}/wine/netapi32.dll.so @@ -445,26 +446,26 @@ %{_libdir}/wine/objsel.dll.so %{_libdir}/wine/odbc32.dll.so %{_libdir}/wine/odbccp32.dll.so -%{_libdir}/wine/ole2.dll.so -%{_libdir}/wine/ole2conv.dll.so -%{_libdir}/wine/ole2disp.dll.so -%{_libdir}/wine/ole2nls.dll.so -%{_libdir}/wine/ole2prox.dll.so -%{_libdir}/wine/ole2thk.dll.so +%{_libdir}/wine/ole2.dll16 +%{_libdir}/wine/ole2conv.dll16 +%{_libdir}/wine/ole2disp.dll16 +%{_libdir}/wine/ole2nls.dll16 +%{_libdir}/wine/ole2prox.dll16 +%{_libdir}/wine/ole2thk.dll16 %{_libdir}/wine/ole32.dll.so %{_libdir}/wine/oleacc.dll.so %{_libdir}/wine/oleaut32.dll.so -%{_libdir}/wine/olecli.dll.so +%{_libdir}/wine/olecli.dll16 %{_libdir}/wine/olecli32.dll.so %{_libdir}/wine/oledlg.dll.so %{_libdir}/wine/olepro32.dll.so -%{_libdir}/wine/olesvr.dll.so +%{_libdir}/wine/olesvr.dll16 %{_libdir}/wine/olesvr32.dll.so %{_libdir}/wine/powrprof.dll.so %{_libdir}/wine/psapi.dll.so %{_libdir}/wine/qcap.dll.so %{_libdir}/wine/quartz.dll.so -%{_libdir}/wine/rasapi16.dll.so +%{_libdir}/wine/rasapi16.dll16 %{_libdir}/wine/rasapi32.dll.so %{_libdir}/wine/riched20.dll.so %{_libdir}/wine/riched32.dll.so @@ -475,33 +476,33 @@ %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so %{_libdir}/wine/setupapi.dll.so -%{_libdir}/wine/setupx.dll.so +%{_libdir}/wine/setupx.dll16 %{_libdir}/wine/shdocvw.dll.so -%{_libdir}/wine/shell.dll.so +%{_libdir}/wine/shell.dll16 %{_libdir}/wine/shell32.dll.so %{_libdir}/wine/shfolder.dll.so %{_libdir}/wine/shlwapi.dll.so %{_libdir}/wine/snmpapi.dll.so -%{_libdir}/wine/sound.drv.so +%{_libdir}/wine/sound.drv16 %{_libdir}/wine/stdole2.tlb.so %{_libdir}/wine/stdole32.tlb.so %{_libdir}/wine/sti.dll.so -%{_libdir}/wine/storage.dll.so -%{_libdir}/wine/stress.dll.so -%{_libdir}/wine/system.drv.so +%{_libdir}/wine/storage.dll16 +%{_libdir}/wine/stress.dll16 +%{_libdir}/wine/system.drv16 %{_libdir}/wine/tapi32.dll.so -%{_libdir}/wine/toolhelp.dll.so -%{_libdir}/wine/typelib.dll.so +%{_libdir}/wine/toolhelp.dll16 +%{_libdir}/wine/typelib.dll16 %{_libdir}/wine/unicows.dll.so %{_libdir}/wine/url.dll.so %{_libdir}/wine/urlmon.dll.so -%{_libdir}/wine/user.exe.so +%{_libdir}/wine/user.exe16 %{_libdir}/wine/user32.dll.so %{_libdir}/wine/usp10.dll.so %{_libdir}/wine/uxtheme.dll.so %{_libdir}/wine/vdhcp.vxd.so %{_libdir}/wine/vdmdbg.dll.so -%{_libdir}/wine/ver.dll.so +%{_libdir}/wine/ver.dll16 %{_libdir}/wine/version.dll.so %{_libdir}/wine/vmm.vxd.so %{_libdir}/wine/vnbt.vxd.so @@ -509,28 +510,28 @@ %{_libdir}/wine/vtdapi.vxd.so %{_libdir}/wine/vwin32.vxd.so %{_libdir}/wine/w32skrnl.dll.so -%{_libdir}/wine/w32sys.dll.so -%{_libdir}/wine/win32s16.dll.so -%{_libdir}/wine/win87em.dll.so -%{_libdir}/wine/winaspi.dll.so -%{_libdir}/wine/windebug.dll.so +%{_libdir}/wine/w32sys.dll16 +%{_libdir}/wine/win32s16.dll16 +%{_libdir}/wine/win87em.dll16 +%{_libdir}/wine/winaspi.dll16 +%{_libdir}/wine/windebug.dll16 %{_libdir}/wine/wineaudioio.drv.so %{_libdir}/wine/winedos.dll.so %{_libdir}/wine/wineoss.drv.so %{_libdir}/wine/winex11.drv.so -%{_libdir}/wine/wing.dll.so +%{_libdir}/wine/wing.dll16 %{_libdir}/wine/wininet.dll.so %{_libdir}/wine/winmm.dll.so -%{_libdir}/wine/winnls.dll.so +%{_libdir}/wine/winnls.dll16 %{_libdir}/wine/winnls32.dll.so -%{_libdir}/wine/winsock.dll.so +%{_libdir}/wine/winsock.dll16 %{_libdir}/wine/winspool.drv.so -%{_libdir}/wine/wintab.dll.so +%{_libdir}/wine/wintab.dll16 %{_libdir}/wine/wintab32.dll.so %{_libdir}/wine/wintrust.dll.so %{_libdir}/wine/wnaspi32.dll.so %{_libdir}/wine/wow32.dll.so -%{_libdir}/wine/wprocs.dll.so +%{_libdir}/wine/wprocs.dll16 %{_libdir}/wine/ws2_32.dll.so %{_libdir}/wine/wsock32.dll.so %{_libdir}/wine/wtsapi32.dll.so @@ -580,7 +581,7 @@ %{_datadir}/fonts/wine/vgasyst.fon %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so -%{_libdir}/wine/wineps16.drv.so +%{_libdir}/wine/wineps16.drv16 %{_libdir}/wine/d3d8.dll.so %{_libdir}/wine/d3d9.dll.so %{_libdir}/wine/d3dx8.dll.so @@ -646,7 +647,7 @@ %files twain %defattr(-,root,root,-) -%{_libdir}/wine/twain.dll.so +%{_libdir}/wine/twain.dll16 %{_libdir}/wine/twain_32.dll.so %files capi @@ -682,9 +683,13 @@ %{_libdir}/wine/*.def %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 -- Version upgrade +- version upgrade * Thu Feb 09 2006 Andreas Bierfert 0.9.7-3 From fedora-extras-commits at redhat.com Fri Mar 3 09:16:28 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 3 Mar 2006 04:16:28 -0500 Subject: rpms/wine/FC-3 .cvsignore, 1.8, 1.9 sources, 1.9, 1.10 wine.spec, 1.12, 1.13 Message-ID: <200603030917.k239HWde031149@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31106/FC-3 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 16 Feb 2006 22:38:22 -0000 1.8 +++ .cvsignore 3 Mar 2006 09:16:26 -0000 1.9 @@ -1,2 +1,2 @@ wine-fonts-20050524.tar.gz -wine-0.9.8-fe.tar.bz2 +wine-0.9.9-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 16 Feb 2006 22:38:22 -0000 1.9 +++ sources 3 Mar 2006 09:16:26 -0000 1.10 @@ -1,2 +1,2 @@ fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -8a3bc8c46a240a250cb2770147e37efb wine-0.9.8-fe.tar.bz2 +a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- wine.spec 21 Feb 2006 12:22:09 -0000 1.12 +++ wine.spec 3 Mar 2006 09:16:26 -0000 1.13 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.8 +Version: 0.9.9 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.8-fe.tar.bz2 +Source0: wine-0.9.9-fe.tar.bz2 Source1: wine.init Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora @@ -338,7 +338,7 @@ %{_libdir}/wine/atl.dll.so %{_libdir}/wine/avicap32.dll.so %{_libdir}/wine/avifil32.dll.so -%{_libdir}/wine/avifile.dll.so +%{_libdir}/wine/avifile.dll16 %{_libdir}/wine/aviinfo.exe.so %{_libdir}/wine/aviplay.exe.so %{_libdir}/wine/cabinet.dll.so @@ -348,27 +348,27 @@ %{_libdir}/wine/comcat.dll.so %{_libdir}/wine/comctl32.dll.so %{_libdir}/wine/comdlg32.dll.so -%{_libdir}/wine/comm.drv.so -%{_libdir}/wine/commdlg.dll.so -%{_libdir}/wine/compobj.dll.so +%{_libdir}/wine/comm.drv16 +%{_libdir}/wine/commdlg.dll16 +%{_libdir}/wine/compobj.dll16 %{_libdir}/wine/crtdll.dll.so %{_libdir}/wine/crypt32.dll.so %{_libdir}/wine/cryptdll.dll.so -%{_libdir}/wine/ctl3d.dll.so +%{_libdir}/wine/ctl3d.dll16 %{_libdir}/wine/ctl3d32.dll.so -%{_libdir}/wine/ctl3dv2.dll.so +%{_libdir}/wine/ctl3dv2.dll16 %{_libdir}/wine/d3dim.dll.so %{_libdir}/wine/d3drm.dll.so %{_libdir}/wine/d3dxof.dll.so %{_libdir}/wine/dbghelp.dll.so %{_libdir}/wine/dciman32.dll.so -%{_libdir}/wine/ddeml.dll.so +%{_libdir}/wine/ddeml.dll16 %{_libdir}/wine/ddraw.dll.so %{_libdir}/wine/devenum.dll.so %{_libdir}/wine/dinput.dll.so %{_libdir}/wine/dinput8.dll.so -%{_libdir}/wine/dispdib.dll.so -%{_libdir}/wine/display.drv.so +%{_libdir}/wine/dispdib.dll16 +%{_libdir}/wine/display.drv16 %{_libdir}/wine/dmband.dll.so %{_libdir}/wine/dmcompos.dll.so %{_libdir}/wine/dmime.dll.so @@ -386,7 +386,7 @@ %{_libdir}/wine/dswave.dll.so %{_libdir}/wine/dxdiagn.dll.so %{_libdir}/wine/eject.exe.so -%{_libdir}/wine/gdi.exe.so +%{_libdir}/wine/gdi.exe16 %{_libdir}/wine/gdi32.dll.so %{_libdir}/wine/hh.exe.so %{_libdir}/wine/hhctrl.ocx.so @@ -396,16 +396,16 @@ %{_libdir}/wine/ifsmgr.vxd.so %{_libdir}/wine/imaadp32.acm.so %{_libdir}/wine/imagehlp.dll.so -%{_libdir}/wine/imm.dll.so +%{_libdir}/wine/imm.dll16 %{_libdir}/wine/imm32.dll.so %{_libdir}/wine/iphlpapi.dll.so %{_libdir}/wine/itss.dll.so %{_libdir}/wine/joystick.drv.so %{_libdir}/wine/kernel32.dll.so -%{_libdir}/wine/keyboard.drv.so -%{_libdir}/wine/krnl386.exe.so +%{_libdir}/wine/keyboard.drv16 +%{_libdir}/wine/krnl386.exe16 %{_libdir}/wine/lz32.dll.so -%{_libdir}/wine/lzexpand.dll.so +%{_libdir}/wine/lzexpand.dll16 %{_libdir}/wine/mapi32.dll.so %{_libdir}/wine/mciavi32.dll.so %{_libdir}/wine/mcicda.dll.so @@ -414,15 +414,16 @@ %{_libdir}/wine/midimap.dll.so %{_libdir}/wine/mlang.dll.so %{_libdir}/wine/mmdevldr.vxd.so -%{_libdir}/wine/mmsystem.dll.so +%{_libdir}/wine/mmsystem.dll16 %{_libdir}/wine/monodebg.vxd.so -%{_libdir}/wine/mouse.drv.so +%{_libdir}/wine/mouse.drv16 %{_libdir}/wine/mpr.dll.so -%{_libdir}/wine/msacm.dll.so +%{_libdir}/wine/msacm.dll16 %{_libdir}/wine/msacm.drv.so %{_libdir}/wine/msacm32.dll.so %{_libdir}/wine/msadp32.acm.so %{_libdir}/wine/msdmo.dll.so +%{_libdir}/wine/msftedit.dll.so %{_libdir}/wine/msg711.acm.so %{_libdir}/wine/mshtml.dll.so %{_libdir}/wine/msi.dll.so @@ -436,7 +437,7 @@ %{_libdir}/wine/msvcrtd.dll.so %{_libdir}/wine/msvfw32.dll.so %{_libdir}/wine/msvidc32.dll.so -%{_libdir}/wine/msvideo.dll.so +%{_libdir}/wine/msvideo.dll16 %{_libdir}/wine/mswsock.dll.so %{_libdir}/wine/msxml3.dll.so %{_libdir}/wine/netapi32.dll.so @@ -445,26 +446,26 @@ %{_libdir}/wine/objsel.dll.so %{_libdir}/wine/odbc32.dll.so %{_libdir}/wine/odbccp32.dll.so -%{_libdir}/wine/ole2.dll.so -%{_libdir}/wine/ole2conv.dll.so -%{_libdir}/wine/ole2disp.dll.so -%{_libdir}/wine/ole2nls.dll.so -%{_libdir}/wine/ole2prox.dll.so -%{_libdir}/wine/ole2thk.dll.so +%{_libdir}/wine/ole2.dll16 +%{_libdir}/wine/ole2conv.dll16 +%{_libdir}/wine/ole2disp.dll16 +%{_libdir}/wine/ole2nls.dll16 +%{_libdir}/wine/ole2prox.dll16 +%{_libdir}/wine/ole2thk.dll16 %{_libdir}/wine/ole32.dll.so %{_libdir}/wine/oleacc.dll.so %{_libdir}/wine/oleaut32.dll.so -%{_libdir}/wine/olecli.dll.so +%{_libdir}/wine/olecli.dll16 %{_libdir}/wine/olecli32.dll.so %{_libdir}/wine/oledlg.dll.so %{_libdir}/wine/olepro32.dll.so -%{_libdir}/wine/olesvr.dll.so +%{_libdir}/wine/olesvr.dll16 %{_libdir}/wine/olesvr32.dll.so %{_libdir}/wine/powrprof.dll.so %{_libdir}/wine/psapi.dll.so %{_libdir}/wine/qcap.dll.so %{_libdir}/wine/quartz.dll.so -%{_libdir}/wine/rasapi16.dll.so +%{_libdir}/wine/rasapi16.dll16 %{_libdir}/wine/rasapi32.dll.so %{_libdir}/wine/riched20.dll.so %{_libdir}/wine/riched32.dll.so @@ -475,33 +476,33 @@ %{_libdir}/wine/sensapi.dll.so %{_libdir}/wine/serialui.dll.so %{_libdir}/wine/setupapi.dll.so -%{_libdir}/wine/setupx.dll.so +%{_libdir}/wine/setupx.dll16 %{_libdir}/wine/shdocvw.dll.so -%{_libdir}/wine/shell.dll.so +%{_libdir}/wine/shell.dll16 %{_libdir}/wine/shell32.dll.so %{_libdir}/wine/shfolder.dll.so %{_libdir}/wine/shlwapi.dll.so %{_libdir}/wine/snmpapi.dll.so -%{_libdir}/wine/sound.drv.so +%{_libdir}/wine/sound.drv16 %{_libdir}/wine/stdole2.tlb.so %{_libdir}/wine/stdole32.tlb.so %{_libdir}/wine/sti.dll.so -%{_libdir}/wine/storage.dll.so -%{_libdir}/wine/stress.dll.so -%{_libdir}/wine/system.drv.so +%{_libdir}/wine/storage.dll16 +%{_libdir}/wine/stress.dll16 +%{_libdir}/wine/system.drv16 %{_libdir}/wine/tapi32.dll.so -%{_libdir}/wine/toolhelp.dll.so -%{_libdir}/wine/typelib.dll.so +%{_libdir}/wine/toolhelp.dll16 +%{_libdir}/wine/typelib.dll16 %{_libdir}/wine/unicows.dll.so %{_libdir}/wine/url.dll.so %{_libdir}/wine/urlmon.dll.so -%{_libdir}/wine/user.exe.so +%{_libdir}/wine/user.exe16 %{_libdir}/wine/user32.dll.so %{_libdir}/wine/usp10.dll.so %{_libdir}/wine/uxtheme.dll.so %{_libdir}/wine/vdhcp.vxd.so %{_libdir}/wine/vdmdbg.dll.so -%{_libdir}/wine/ver.dll.so +%{_libdir}/wine/ver.dll16 %{_libdir}/wine/version.dll.so %{_libdir}/wine/vmm.vxd.so %{_libdir}/wine/vnbt.vxd.so @@ -509,28 +510,28 @@ %{_libdir}/wine/vtdapi.vxd.so %{_libdir}/wine/vwin32.vxd.so %{_libdir}/wine/w32skrnl.dll.so -%{_libdir}/wine/w32sys.dll.so -%{_libdir}/wine/win32s16.dll.so -%{_libdir}/wine/win87em.dll.so -%{_libdir}/wine/winaspi.dll.so -%{_libdir}/wine/windebug.dll.so +%{_libdir}/wine/w32sys.dll16 +%{_libdir}/wine/win32s16.dll16 +%{_libdir}/wine/win87em.dll16 +%{_libdir}/wine/winaspi.dll16 +%{_libdir}/wine/windebug.dll16 %{_libdir}/wine/wineaudioio.drv.so %{_libdir}/wine/winedos.dll.so %{_libdir}/wine/wineoss.drv.so %{_libdir}/wine/winex11.drv.so -%{_libdir}/wine/wing.dll.so +%{_libdir}/wine/wing.dll16 %{_libdir}/wine/wininet.dll.so %{_libdir}/wine/winmm.dll.so -%{_libdir}/wine/winnls.dll.so +%{_libdir}/wine/winnls.dll16 %{_libdir}/wine/winnls32.dll.so -%{_libdir}/wine/winsock.dll.so +%{_libdir}/wine/winsock.dll16 %{_libdir}/wine/winspool.drv.so -%{_libdir}/wine/wintab.dll.so +%{_libdir}/wine/wintab.dll16 %{_libdir}/wine/wintab32.dll.so %{_libdir}/wine/wintrust.dll.so %{_libdir}/wine/wnaspi32.dll.so %{_libdir}/wine/wow32.dll.so -%{_libdir}/wine/wprocs.dll.so +%{_libdir}/wine/wprocs.dll16 %{_libdir}/wine/ws2_32.dll.so %{_libdir}/wine/wsock32.dll.so %{_libdir}/wine/wtsapi32.dll.so @@ -580,7 +581,7 @@ %{_datadir}/fonts/wine/vgasyst.fon %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so -%{_libdir}/wine/wineps16.drv.so +%{_libdir}/wine/wineps16.drv16 %{_libdir}/wine/d3d8.dll.so %{_libdir}/wine/d3d9.dll.so %{_libdir}/wine/d3dx8.dll.so @@ -646,7 +647,7 @@ %files twain %defattr(-,root,root,-) -%{_libdir}/wine/twain.dll.so +%{_libdir}/wine/twain.dll16 %{_libdir}/wine/twain_32.dll.so %files capi @@ -682,9 +683,13 @@ %{_libdir}/wine/*.def %changelog +* Fri Mar 03 2006 Andreas Bierfert +0.9.9-1 +- version upgrade + * Thu Feb 16 2006 Andreas Bierfert 0.9.8-1 -- Version upgrade +- version upgrade * Thu Feb 09 2006 Andreas Bierfert 0.9.7-3 From fedora-extras-commits at redhat.com Fri Mar 3 11:26:01 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 3 Mar 2006 06:26:01 -0500 Subject: rpms/wine-docs/FC-4 wine-docs.spec,1.7,1.8 Message-ID: <200603031126.k23BQYVB002919@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2894 Modified Files: wine-docs.spec Log Message: examine ELinks error Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wine-docs.spec 2 Mar 2006 23:26:17 -0000 1.7 +++ wine-docs.spec 3 Mar 2006 11:26:00 -0000 1.8 @@ -22,6 +22,15 @@ %build ./configure + +cat< docbook2txt +#!/bin/sh +strace -f /usr/bin/docbook2txt \$* +ls -la +EOT +chmod +x docbook2txt +PATH=$(pwd):$PATH make + make From fedora-extras-commits at redhat.com Fri Mar 3 11:35:42 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 3 Mar 2006 06:35:42 -0500 Subject: rpms/wine-docs/FC-4 wine-docs.spec,1.8,1.9 Message-ID: <200603031136.k23BaEeo003003@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2986 Modified Files: wine-docs.spec Log Message: take out the debug code again Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- wine-docs.spec 3 Mar 2006 11:26:00 -0000 1.8 +++ wine-docs.spec 3 Mar 2006 11:35:42 -0000 1.9 @@ -22,15 +22,6 @@ %build ./configure - -cat< docbook2txt -#!/bin/sh -strace -f /usr/bin/docbook2txt \$* -ls -la -EOT -chmod +x docbook2txt -PATH=$(pwd):$PATH make - make From fedora-extras-commits at redhat.com Fri Mar 3 11:51:04 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 06:51:04 -0500 Subject: rpms/dap-server/devel .cvsignore, 1.2, 1.3 dap-server.spec, 1.7, 1.8 sources, 1.2, 1.3 dap-server-with_in_configure.patch, 1.1, NONE Message-ID: <200603031151.k23BpbJZ003140@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3115 Modified Files: .cvsignore dap-server.spec sources Removed Files: dap-server-with_in_configure.patch Log Message: * Fri Mar 3 2006 Patrice Dumas 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2006 22:54:58 -0000 1.2 +++ .cvsignore 3 Mar 2006 11:51:04 -0000 1.3 @@ -1 +1 @@ -dap-server-3.5.3.tar.gz +dap-server-3.6.0.tar.gz Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dap-server.spec 27 Feb 2006 00:54:24 -0000 1.7 +++ dap-server.spec 3 Mar 2006 11:51:04 -0000 1.8 @@ -6,18 +6,17 @@ Summary: Basic request handling for DAP servers Name: dap-server -Version: 3.5.3 -Release: 1%{?dist}.2 +Version: 3.6.0 +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ -Patch0: dap-server-with_in_configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver -Requires: perl +Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) %description This is base software for our workhorse server. Written using the DAP++ C++ @@ -35,7 +34,6 @@ Summary: A CGI interface for the DAP server Requires: %{name} = %{version}-%{release} Requires: dap-freeform_handler dap-netcdf_handler dap-hdf4_handler -Requires: perl Group: System Environment/Daemons %description cgi @@ -43,7 +41,6 @@ %prep %setup -q -%patch %build %configure --with-cgidir=%{dap_cgidir} @@ -95,6 +92,9 @@ %changelog +* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +- new release + * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 - Small fix for Perl provides Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2006 22:54:58 -0000 1.2 +++ sources 3 Mar 2006 11:51:04 -0000 1.3 @@ -1 +1 @@ -fca821446b18f36f883b85a049d34876 dap-server-3.5.3.tar.gz +4d4665e01b9cae25535094d02987a07e dap-server-3.6.0.tar.gz --- dap-server-with_in_configure.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 12:12:02 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:12:02 -0500 Subject: rpms/dap-server/devel dap-server.spec,1.8,1.9 Message-ID: <200603031212.k23CCYxn005082@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5065 Modified Files: dap-server.spec Log Message: minor update of description Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dap-server.spec 3 Mar 2006 11:51:04 -0000 1.8 +++ dap-server.spec 3 Mar 2006 12:12:01 -0000 1.9 @@ -4,10 +4,10 @@ %define __perl_provides %{nil} %define __perl_requires %{nil} -Summary: Basic request handling for DAP servers +Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 1%{?dist} +Release: 1%{?dist}.1 License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz @@ -19,11 +19,12 @@ Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) %description -This is base software for our workhorse server. Written using the DAP++ C++ -library and Perl, this handles processing compressed files and arranging for -the correct server module to process the file. The base software also -provides support for the ASCII response and HTML data-request form. Use this -in combination with one or more of the format-specific handlers. +This is base software for the OPeNDAP (Open-source Project for a Network +Data Access Protocol). Written using the DAP++ C++ library and Perl, this +handles processing compressed files and arranging for the correct server +module to process the file. The base software also provides support for +the ASCII response and HTML data-request form. Use this in combination +with one or more of the format-specific handlers. This package contains all the executable and perl modules. The scripts and config files that should be installed in a cgi directory are in the @@ -92,7 +93,7 @@ %changelog -* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +* Fri Mar 3 2006 Patrice Dumas 3.6.0-1.1 - new release * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 From fedora-extras-commits at redhat.com Fri Mar 3 12:15:03 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 3 Mar 2006 07:15:03 -0500 Subject: rpms/wine-docs/FC-3 wine-docs.spec,1.6,1.7 Message-ID: <200603031215.k23CFaxT005155@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5131 Modified Files: wine-docs.spec Log Message: examine ELinks error for FC-4 on FC-3 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wine-docs.spec 2 Mar 2006 23:26:11 -0000 1.6 +++ wine-docs.spec 3 Mar 2006 12:15:03 -0000 1.7 @@ -22,6 +22,16 @@ %build ./configure + +cat< docbook2txt +#!/bin/sh +strace -f /usr/bin/docbook2txt \$* +ls -la +EOT +chmod +x docbook2txt +PATH=$(pwd):$PATH make +exit 1 + make From fedora-extras-commits at redhat.com Fri Mar 3 12:16:36 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 3 Mar 2006 07:16:36 -0500 Subject: rpms/wine-docs/FC-3 wine-docs.spec,1.7,1.8 Message-ID: <200603031217.k23CH8eo005218@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5191 Modified Files: wine-docs.spec Log Message: Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wine-docs.spec 3 Mar 2006 12:15:03 -0000 1.7 +++ wine-docs.spec 3 Mar 2006 12:16:36 -0000 1.8 @@ -1,6 +1,6 @@ Name: wine-docs Version: 0.9.9 -Release: 1%{?dist} +Release: 0.1%{?dist} Summary: Documentation for wine Group: Documentation From fedora-extras-commits at redhat.com Fri Mar 3 12:19:27 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:19:27 -0500 Subject: rpms/dap-server/devel dap-server.spec,1.9,1.10 Message-ID: <200603031219.k23CJxmP005327@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5305 Modified Files: dap-server.spec Log Message: add a missing word in the description Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dap-server.spec 3 Mar 2006 12:12:01 -0000 1.9 +++ dap-server.spec 3 Mar 2006 12:19:27 -0000 1.10 @@ -7,7 +7,7 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 1%{?dist}.1 +Release: 2%{?dist}.2 License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz @@ -20,10 +20,10 @@ %description This is base software for the OPeNDAP (Open-source Project for a Network -Data Access Protocol). Written using the DAP++ C++ library and Perl, this -handles processing compressed files and arranging for the correct server -module to process the file. The base software also provides support for -the ASCII response and HTML data-request form. Use this in combination +Data Access Protocol) server. Written using the DAP++ C++ library and Perl, +this handles processing compressed files and arranging for the correct +server module to process the file. The base software also provides support +for the ASCII response and HTML data-request form. Use this in combination with one or more of the format-specific handlers. This package contains all the executable and perl modules. The scripts @@ -93,7 +93,7 @@ %changelog -* Fri Mar 3 2006 Patrice Dumas 3.6.0-1.1 +* Fri Mar 3 2006 Patrice Dumas 3.6.0-1.2 - new release * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 From fedora-extras-commits at redhat.com Fri Mar 3 12:22:08 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:22:08 -0500 Subject: rpms/dap-server/FC-3 .cvsignore, 1.2, 1.3 dap-server.spec, 1.7, 1.8 sources, 1.2, 1.3 dap-server-with_in_configure.patch, 1.1, NONE Message-ID: <200603031222.k23CMeTf005381@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5339/FC-3 Modified Files: .cvsignore dap-server.spec sources Removed Files: dap-server-with_in_configure.patch Log Message: * Fri Mar 3 2006 Patrice Dumas 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2006 22:54:58 -0000 1.2 +++ .cvsignore 3 Mar 2006 12:22:08 -0000 1.3 @@ -1 +1 @@ -dap-server-3.5.3.tar.gz +dap-server-3.6.0.tar.gz Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-3/dap-server.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dap-server.spec 27 Feb 2006 00:54:12 -0000 1.7 +++ dap-server.spec 3 Mar 2006 12:22:08 -0000 1.8 @@ -4,27 +4,27 @@ %define __perl_provides %{nil} %define __perl_requires %{nil} -Summary: Basic request handling for DAP servers +Summary: Basic request handling for OPeNDAP servers Name: dap-server -Version: 3.5.3 -Release: 1%{?dist}.2 +Version: 3.6.0 +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ -Patch0: dap-server-with_in_configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver -Requires: perl +Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) %description -This is base software for our workhorse server. Written using the DAP++ C++ -library and Perl, this handles processing compressed files and arranging for -the correct server module to process the file. The base software also -provides support for the ASCII response and HTML data-request form. Use this -in combination with one or more of the format-specific handlers. +This is base software for the OPeNDAP (Open-source Project for a Network +Data Access Protocol) server. Written using the DAP++ C++ library and Perl, +this handles processing compressed files and arranging for the correct +server module to process the file. The base software also provides support +for the ASCII response and HTML data-request form. Use this in combination +with one or more of the format-specific handlers. This package contains all the executable and perl modules. The scripts and config files that should be installed in a cgi directory are in the @@ -35,7 +35,6 @@ Summary: A CGI interface for the DAP server Requires: %{name} = %{version}-%{release} Requires: dap-freeform_handler dap-netcdf_handler dap-hdf4_handler -Requires: perl Group: System Environment/Daemons %description cgi @@ -43,7 +42,6 @@ %prep %setup -q -%patch %build %configure --with-cgidir=%{dap_cgidir} @@ -95,6 +93,9 @@ %changelog +* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +- new release + * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 - Small fix for Perl provides Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2006 22:54:58 -0000 1.2 +++ sources 3 Mar 2006 12:22:08 -0000 1.3 @@ -1 +1 @@ -fca821446b18f36f883b85a049d34876 dap-server-3.5.3.tar.gz +4d4665e01b9cae25535094d02987a07e dap-server-3.6.0.tar.gz --- dap-server-with_in_configure.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 12:22:14 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:22:14 -0500 Subject: rpms/dap-server/FC-4 .cvsignore, 1.2, 1.3 dap-server.spec, 1.7, 1.8 sources, 1.2, 1.3 dap-server-with_in_configure.patch, 1.1, NONE Message-ID: <200603031222.k23CMkCx005386@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5339/FC-4 Modified Files: .cvsignore dap-server.spec sources Removed Files: dap-server-with_in_configure.patch Log Message: * Fri Mar 3 2006 Patrice Dumas 3.6.0-1 - new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 19 Feb 2006 22:54:58 -0000 1.2 +++ .cvsignore 3 Mar 2006 12:22:14 -0000 1.3 @@ -1 +1 @@ -dap-server-3.5.3.tar.gz +dap-server-3.6.0.tar.gz Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-4/dap-server.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dap-server.spec 27 Feb 2006 00:54:18 -0000 1.7 +++ dap-server.spec 3 Mar 2006 12:22:14 -0000 1.8 @@ -4,27 +4,27 @@ %define __perl_provides %{nil} %define __perl_requires %{nil} -Summary: Basic request handling for DAP servers +Summary: Basic request handling for OPeNDAP servers Name: dap-server -Version: 3.5.3 -Release: 1%{?dist}.2 +Version: 3.6.0 +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ -Patch0: dap-server-with_in_configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver -Requires: perl +Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) %description -This is base software for our workhorse server. Written using the DAP++ C++ -library and Perl, this handles processing compressed files and arranging for -the correct server module to process the file. The base software also -provides support for the ASCII response and HTML data-request form. Use this -in combination with one or more of the format-specific handlers. +This is base software for the OPeNDAP (Open-source Project for a Network +Data Access Protocol) server. Written using the DAP++ C++ library and Perl, +this handles processing compressed files and arranging for the correct +server module to process the file. The base software also provides support +for the ASCII response and HTML data-request form. Use this in combination +with one or more of the format-specific handlers. This package contains all the executable and perl modules. The scripts and config files that should be installed in a cgi directory are in the @@ -35,7 +35,6 @@ Summary: A CGI interface for the DAP server Requires: %{name} = %{version}-%{release} Requires: dap-freeform_handler dap-netcdf_handler dap-hdf4_handler -Requires: perl Group: System Environment/Daemons %description cgi @@ -43,7 +42,6 @@ %prep %setup -q -%patch %build %configure --with-cgidir=%{dap_cgidir} @@ -95,6 +93,9 @@ %changelog +* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +- new release + * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 - Small fix for Perl provides Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 19 Feb 2006 22:54:58 -0000 1.2 +++ sources 3 Mar 2006 12:22:14 -0000 1.3 @@ -1 +1 @@ -fca821446b18f36f883b85a049d34876 dap-server-3.5.3.tar.gz +4d4665e01b9cae25535094d02987a07e dap-server-3.6.0.tar.gz --- dap-server-with_in_configure.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 12:24:03 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:24:03 -0500 Subject: rpms/dap-server/devel dap-server.spec,1.10,1.11 Message-ID: <200603031224.k23COZqd005416@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5399 Modified Files: dap-server.spec Log Message: Correct error on release tag Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dap-server.spec 3 Mar 2006 12:19:27 -0000 1.10 +++ dap-server.spec 3 Mar 2006 12:24:02 -0000 1.11 @@ -7,7 +7,7 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 2%{?dist}.2 +Release: 1%{?dist}.2 License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 12:25:33 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:25:33 -0500 Subject: rpms/dap-server/FC-3 dap-server.spec,1.8,1.9 Message-ID: <200603031226.k23CQ5Yu005460@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5427/FC-3 Modified Files: dap-server.spec Log Message: correct error on release tag Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-3/dap-server.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dap-server.spec 3 Mar 2006 12:22:08 -0000 1.8 +++ dap-server.spec 3 Mar 2006 12:25:33 -0000 1.9 @@ -7,7 +7,7 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 2%{?dist} +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 12:25:39 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:25:39 -0500 Subject: rpms/dap-server/FC-4 dap-server.spec,1.8,1.9 Message-ID: <200603031226.k23CQBDS005463@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5427/FC-4 Modified Files: dap-server.spec Log Message: correct error on release tag Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-4/dap-server.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dap-server.spec 3 Mar 2006 12:22:14 -0000 1.8 +++ dap-server.spec 3 Mar 2006 12:25:39 -0000 1.9 @@ -7,7 +7,7 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 2%{?dist} +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 12:27:53 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 3 Mar 2006 07:27:53 -0500 Subject: rpms/wine-docs/FC-3 wine-docs.spec,1.8,1.9 Message-ID: <200603031228.k23CSQ5K005489@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5472 Modified Files: wine-docs.spec Log Message: Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- wine-docs.spec 3 Mar 2006 12:16:36 -0000 1.8 +++ wine-docs.spec 3 Mar 2006 12:27:53 -0000 1.9 @@ -1,6 +1,6 @@ Name: wine-docs Version: 0.9.9 -Release: 0.1%{?dist} +Release: 1%{?dist} Summary: Documentation for wine Group: Documentation @@ -22,16 +22,6 @@ %build ./configure - -cat< docbook2txt -#!/bin/sh -strace -f /usr/bin/docbook2txt \$* -ls -la -EOT -chmod +x docbook2txt -PATH=$(pwd):$PATH make -exit 1 - make From fedora-extras-commits at redhat.com Fri Mar 3 12:34:20 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:34:20 -0500 Subject: rpms/dap-server/FC-3 dap-server.spec,1.9,1.10 Message-ID: <200603031234.k23CYqtl005632@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5585/FC-3 Modified Files: dap-server.spec Log Message: Bump release Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-3/dap-server.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dap-server.spec 3 Mar 2006 12:25:33 -0000 1.9 +++ dap-server.spec 3 Mar 2006 12:34:20 -0000 1.10 @@ -7,14 +7,14 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel >= 3.6.0 +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) @@ -93,7 +93,7 @@ %changelog -* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +* Fri Mar 3 2006 Patrice Dumas 3.6.0-2 - new release * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 From fedora-extras-commits at redhat.com Fri Mar 3 12:34:26 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:34:26 -0500 Subject: rpms/dap-server/FC-4 dap-server.spec,1.9,1.10 Message-ID: <200603031234.k23CYwY6005635@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5585/FC-4 Modified Files: dap-server.spec Log Message: Bump release Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/FC-4/dap-server.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dap-server.spec 3 Mar 2006 12:25:39 -0000 1.9 +++ dap-server.spec 3 Mar 2006 12:34:26 -0000 1.10 @@ -7,14 +7,14 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel >= 3.6.0 +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) @@ -93,7 +93,7 @@ %changelog -* Fri Mar 3 2006 Patrice Dumas 3.6.0-1 +* Fri Mar 3 2006 Patrice Dumas 3.6.0-2 - new release * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 From fedora-extras-commits at redhat.com Fri Mar 3 12:34:32 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:34:32 -0500 Subject: rpms/dap-server/devel dap-server.spec,1.11,1.12 Message-ID: <200603031235.k23CZ4TI005638@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-server/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5585/devel Modified Files: dap-server.spec Log Message: Bump release Index: dap-server.spec =================================================================== RCS file: /cvs/extras/rpms/dap-server/devel/dap-server.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dap-server.spec 3 Mar 2006 12:24:02 -0000 1.11 +++ dap-server.spec 3 Mar 2006 12:34:31 -0000 1.12 @@ -7,14 +7,14 @@ Summary: Basic request handling for OPeNDAP servers Name: dap-server Version: 3.6.0 -Release: 1%{?dist}.2 +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/%{name}-%{version}.tar.gz URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: curl libdap-devel >= 3.6.0 +BuildRequires: curl libdap-devel >= 3.6.0 Requires: curl webserver Requires: perl perl(HTML::Filter) perl(Time::Local) perl(POSIX) @@ -93,7 +93,7 @@ %changelog -* Fri Mar 3 2006 Patrice Dumas 3.6.0-1.2 +* Fri Mar 3 2006 Patrice Dumas 3.6.0-2 - new release * Wed Feb 22 2006 Ignacio Vazquez-Abrams 3.5.3-1.2 From fedora-extras-commits at redhat.com Fri Mar 3 12:59:19 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 07:59:19 -0500 Subject: rpms/dap-netcdf_handler/devel .cvsignore, 1.2, 1.3 dap-netcdf_handler.spec, 1.3, 1.4 sources, 1.2, 1.3 dap-netcdf_handler-add_lib64.diff, 1.1, NONE Message-ID: <200603031259.k23Cxp9c005923@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-netcdf_handler/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5897 Modified Files: .cvsignore dap-netcdf_handler.spec sources Removed Files: dap-netcdf_handler-add_lib64.diff Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 - new release - remove upstreamed patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 10:17:25 -0000 1.2 +++ .cvsignore 3 Mar 2006 12:59:18 -0000 1.3 @@ -1 +1 @@ -netcdf_handler-3.5.2.tar.gz +netcdf_handler-3.6.0.tar.gz Index: dap-netcdf_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/dap-netcdf_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-netcdf_handler.spec 20 Feb 2006 11:50:00 -0000 1.3 +++ dap-netcdf_handler.spec 3 Mar 2006 12:59:18 -0000 1.4 @@ -1,15 +1,14 @@ Summary: NetCDF 3 data handler for the OPeNDAP Data server Name: dap-netcdf_handler -Version: 3.5.2 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/netcdf_handler-%{version}.tar.gz -Patch0: dap-netcdf_handler-add_lib64.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel netcdf-devel +BuildRequires: libdap-devel >= 3.6.0 netcdf-devel # Don't require dap-server as dap_nc_handler works without dap-server, # however dap_nc_handler should be of use only with dap-server in most cases. #Requires: dap-server @@ -17,11 +16,10 @@ %description This is the netcdf data handler for our data server. It reads netcdf 3 files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n netcdf_handler-%{version} -%patch0 %build %configure @@ -41,6 +39,10 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- new release +- remove upstreamed patch + * Mon Feb 20 2006 Patrice Dumas - 3.5.2-2 - add a patch for netcdf detection in lib64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 10:17:25 -0000 1.2 +++ sources 3 Mar 2006 12:59:18 -0000 1.3 @@ -1 +1 @@ -ee5f6832511339ad3348a673e4185968 netcdf_handler-3.5.2.tar.gz +1f5c2c485d058e2f3ae55d8ed956afd5 netcdf_handler-3.6.0.tar.gz --- dap-netcdf_handler-add_lib64.diff DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:00:38 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 3 Mar 2006 08:00:38 -0500 Subject: rpms/gpgme/devel .cvsignore, 1.5, 1.6 gpgme.spec, 1.14, 1.15 sources, 1.5, 1.6 gpgme-1.1.0-tests.patch, 1.1, NONE Message-ID: <200603031301.k23D1Bhi006830@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpgme/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5948 Modified Files: .cvsignore gpgme.spec sources Removed Files: gpgme-1.1.0-tests.patch Log Message: * Fri Mar 3 2006 Rex Dieter 1.1.2-1 - 1.1.2 - drop upstreamed gpgme-1.1.0-tests.patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Oct 2005 15:23:57 -0000 1.5 +++ .cvsignore 3 Mar 2006 13:00:38 -0000 1.6 @@ -1,2 +1,2 @@ -gpgme-1.1.0.tar.bz2 -gpgme-1.1.0.tar.bz2.sig +gpgme-1.1.2.tar.bz2 +gpgme-1.1.2.tar.bz2.sig Index: gpgme.spec =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/gpgme.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- gpgme.spec 1 Mar 2006 16:46:28 -0000 1.14 +++ gpgme.spec 3 Mar 2006 13:00:38 -0000 1.15 @@ -1,8 +1,8 @@ Name: gpgme Summary: GnuPG Made Easy - high level crypto API -Version: 1.1.0 -Release: 3%{?dist}.2 +Version: 1.1.2 +Release: 1%{?dist} License: LGPL Group: Applications/System @@ -11,8 +11,6 @@ Source1: ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-%{version}.tar.bz2.sig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: gpgme-1.1.0-tests.patch - BuildRequires: gnupg >= 1.2.2 BuildRequires: gnupg2 >= 1.9.6 BuildRequires: libgpg-error-devel >= 0.5 @@ -43,8 +41,6 @@ %prep %setup -q -%patch1 -p1 -b .tests - %build %configure \ @@ -99,6 +95,10 @@ %changelog +* Fri Mar 3 2006 Rex Dieter 1.1.2-1 +- 1.1.2 +- drop upstreamed gpgme-1.1.0-tests.patch + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpgme/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Oct 2005 15:23:57 -0000 1.5 +++ sources 3 Mar 2006 13:00:38 -0000 1.6 @@ -1,2 +1,2 @@ -9d75ad0d604918bbf8e1ca5ed11ab195 gpgme-1.1.0.tar.bz2 -b0af886d384bacfee4af6fa835f27b5b gpgme-1.1.0.tar.bz2.sig +7c2333679035a5f37e99630a156a40ca gpgme-1.1.2.tar.bz2 +5b786d78d322ea0778eea5ae67c087b4 gpgme-1.1.2.tar.bz2.sig --- gpgme-1.1.0-tests.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:12:27 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Fri, 3 Mar 2006 08:12:27 -0500 Subject: rpms/cfengine/devel .cvsignore, 1.9, 1.10 cfengine.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200603031313.k23DD0DP007945@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7922 Modified Files: .cvsignore cfengine.spec sources Log Message: Update to upstream 2.1.19p1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 30 Dec 2005 13:11:50 -0000 1.9 +++ .cvsignore 3 Mar 2006 13:12:26 -0000 1.10 @@ -1,4 +1,4 @@ -cfengine-2.1.18.tar.gz +cfengine-2.1.19p1.tar.gz cfenvd cfexecd cfservd Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- cfengine.spec 17 Feb 2006 21:21:31 -0000 1.15 +++ cfengine.spec 3 Mar 2006 13:12:26 -0000 1.16 @@ -1,10 +1,10 @@ Summary: A systems administration tool for networks Name: cfengine -Version: 2.1.18 -Release: 2%{?dist} +Version: 2.1.19p1 +Release: 1%{?dist} License: GPL Group: Applications/System -Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz +Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd @@ -118,6 +118,9 @@ %changelog +* Thu Mar 2 2006 Jeff Sheltren - 2.1.19p1-1 +- Update to upstream 2.1.19p1 + * Fri Feb 17 2006 Jeff Sheltren - 2.1.18-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 30 Dec 2005 13:11:50 -0000 1.9 +++ sources 3 Mar 2006 13:12:26 -0000 1.10 @@ -1,4 +1,4 @@ -7703780f987facc537cf239b04d2b2e8 cfengine-2.1.18.tar.gz +0524e0bcbf947d021c78f8c37461c323 cfengine-2.1.19p1.tar.gz 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd From fedora-extras-commits at redhat.com Fri Mar 3 13:14:40 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Fri, 3 Mar 2006 08:14:40 -0500 Subject: rpms/cfengine/FC-4 .cvsignore, 1.9, 1.10 cfengine.spec, 1.13, 1.14 sources, 1.9, 1.10 Message-ID: <200603031315.k23DFCwa007988@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7965 Modified Files: .cvsignore cfengine.spec sources Log Message: Update to upstream 2.1.19p1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 30 Dec 2005 13:12:56 -0000 1.9 +++ .cvsignore 3 Mar 2006 13:14:40 -0000 1.10 @@ -1,4 +1,4 @@ -cfengine-2.1.18.tar.gz +cfengine-2.1.19p1.tar.gz cfenvd cfexecd cfservd Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/cfengine.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- cfengine.spec 30 Dec 2005 13:12:56 -0000 1.13 +++ cfengine.spec 3 Mar 2006 13:14:40 -0000 1.14 @@ -1,10 +1,10 @@ Summary: A systems administration tool for networks Name: cfengine -Version: 2.1.18 +Version: 2.1.19p1 Release: 1%{?dist} License: GPL Group: Applications/System -Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz +Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd @@ -118,6 +118,12 @@ %changelog +* Thu Mar 2 2006 Jeff Sheltren - 2.1.19p1-1 +- Update to upstream 2.1.19p1 + +* Fri Feb 17 2006 Jeff Sheltren - 2.1.18-2 +- Rebuild for Fedora Extras 5 + * Fri Dec 30 2005 Jeff Sheltren - 2.1.18-1 - Update to upstream 2.1.18 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 30 Dec 2005 13:12:56 -0000 1.9 +++ sources 3 Mar 2006 13:14:40 -0000 1.10 @@ -1,4 +1,4 @@ -7703780f987facc537cf239b04d2b2e8 cfengine-2.1.18.tar.gz +0524e0bcbf947d021c78f8c37461c323 cfengine-2.1.19p1.tar.gz 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd From fedora-extras-commits at redhat.com Fri Mar 3 13:16:15 2006 From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren)) Date: Fri, 3 Mar 2006 08:16:15 -0500 Subject: rpms/cfengine/FC-3 .cvsignore, 1.10, 1.11 cfengine.spec, 1.12, 1.13 sources, 1.10, 1.11 Message-ID: <200603031316.k23DGmZN008029@cvs-int.fedora.redhat.com> Author: sheltren Update of /cvs/extras/rpms/cfengine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8008 Modified Files: .cvsignore cfengine.spec sources Log Message: Update to upstream 2.1.19p1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 30 Dec 2005 13:13:38 -0000 1.10 +++ .cvsignore 3 Mar 2006 13:16:15 -0000 1.11 @@ -1,4 +1,4 @@ -cfengine-2.1.18.tar.gz +cfengine-2.1.19p1.tar.gz cfenvd cfexecd cfservd Index: cfengine.spec =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/cfengine.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cfengine.spec 30 Dec 2005 13:13:38 -0000 1.12 +++ cfengine.spec 3 Mar 2006 13:16:15 -0000 1.13 @@ -1,10 +1,10 @@ Summary: A systems administration tool for networks Name: cfengine -Version: 2.1.18 +Version: 2.1.19p1 Release: 1%{?dist} License: GPL Group: Applications/System -Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.18.tar.gz +Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz Source1: cfexecd Source2: cfservd Source3: cfenvd @@ -118,6 +118,12 @@ %changelog +* Thu Mar 2 2006 Jeff Sheltren - 2.1.19p1-1 +- Update to upstream 2.1.19p1 + +* Fri Feb 17 2006 Jeff Sheltren - 2.1.18-2 +- Rebuild for Fedora Extras 5 + * Fri Dec 30 2005 Jeff Sheltren - 2.1.18-1 - Update to upstream 2.1.18 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cfengine/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 30 Dec 2005 13:13:38 -0000 1.10 +++ sources 3 Mar 2006 13:16:15 -0000 1.11 @@ -1,4 +1,4 @@ -7703780f987facc537cf239b04d2b2e8 cfengine-2.1.18.tar.gz +0524e0bcbf947d021c78f8c37461c323 cfengine-2.1.19p1.tar.gz 37c565f98d2b252c9c6cf1c88d654e02 cfenvd 19f07f0d576abf8bf8cb875ab6ad66c6 cfexecd fe6c086a41f428d47bde30646e0310c4 cfservd From fedora-extras-commits at redhat.com Fri Mar 3 13:18:56 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 3 Mar 2006 08:18:56 -0500 Subject: rpms/tla/devel tla.spec, 1.25, 1.26 tla-ppc32-fix-alignment.patch, 1.1, NONE Message-ID: <200603031319.k23DJSAK008213@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8148 Modified Files: tla.spec Removed Files: tla-ppc32-fix-alignment.patch Log Message: Revert patch. Real issue was a glibc bug Index: tla.spec =================================================================== RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- tla.spec 27 Feb 2006 14:49:11 -0000 1.25 +++ tla.spec 3 Mar 2006 13:18:56 -0000 1.26 @@ -1,6 +1,6 @@ Name: tla Version: 1.3.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GNU arch revision control system Group: Development/Tools @@ -12,7 +12,6 @@ Patch0: %{name}-1.2pre0-posix.patch # Patch1 and Source2 from Debian's 1.3.3-3, the latter updated for 1.3.4. Patch1: %{name}-1.3.3-sysneon.patch -Patch2: %{name}-ppc32-fix-alignment.patch Source2: %{name}-generate-manpage.pl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -40,7 +39,6 @@ rm -rf src/libneon rm -rf src/expat %patch1 -p1 -%patch2 -p1 %build mkdir src/=build @@ -79,6 +77,9 @@ %{_mandir}/man1/tla.1* %changelog +* Fri Mar 3 2006 Josh Boyer - 1.3.4-3 +- Remove ppc alignment patch now that glibc is fixed + * Mon Feb 27 2006 Josh Boyer - 1.3.4-2 - Add patch to allow building on PPC for now --- tla-ppc32-fix-alignment.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:24:32 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:24:32 -0500 Subject: rpms/dap-hdf4_handler/devel .cvsignore, 1.2, 1.3 dap-hdf4_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603031325.k23DP430008333@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-serv8291 Modified Files: .cvsignore dap-hdf4_handler.spec sources Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 - Update to 3.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:19:07 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:24:31 -0000 1.3 @@ -1 +1 @@ -hdf4_handler-3.5.0.tar.gz +hdf4_handler-3.6.0.tar.gz Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-hdf4_handler.spec 20 Feb 2006 14:21:32 -0000 1.2 +++ dap-hdf4_handler.spec 3 Mar 2006 13:24:31 -0000 1.3 @@ -1,6 +1,6 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler -Version: 3.5.0 +Version: 3.6.0 Release: 1%{?dist} License: LGPL Group: System Environment/Daemons @@ -14,13 +14,13 @@ %description This is the hdf4 data handler for our data server. It reads HDF4 and HDF-EOS files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n hdf4_handler-%{version} %build -%configure --with-hdf4-libdir=%{_libdir}/hdf --with-hdf4-include=%{_includedir}/hdf +%configure make %{?_smp_mflags} %install @@ -37,5 +37,8 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:19:07 -0000 1.2 +++ sources 3 Mar 2006 13:24:31 -0000 1.3 @@ -1 +1 @@ -0b3d3ab80d85428a9a9f898dacc4d53e hdf4_handler-3.5.0.tar.gz +8aebe63dc38dfbc35f853807b37c070e hdf4_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 13:25:01 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:25:01 -0500 Subject: rpms/dap-freeform_handler/devel .cvsignore, 1.2, 1.3 dap-freeform_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603031325.k23DPXqW008382@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-serv8318 Modified Files: .cvsignore dap-freeform_handler.spec sources Log Message: update to 3.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:21:51 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:25:01 -0000 1.3 @@ -1 +1 @@ -freeform_handler-3.5.0.tar.gz +freeform_handler-3.6.0.tar.gz Index: dap-freeform_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/dap-freeform_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-freeform_handler.spec 20 Feb 2006 14:25:36 -0000 1.2 +++ dap-freeform_handler.spec 3 Mar 2006 13:25:01 -0000 1.3 @@ -1,6 +1,6 @@ Summary: FreeForm data handler for the OPeNDAP Data server Name: dap-freeform_handler -Version: 3.5.0 +Version: 3.6.0 Release: 1%{?dist} License: LGPL Group: System Environment/Daemons @@ -8,7 +8,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel +BuildRequires: libdap-devel >= 3.6.0 #Requires: dap-server %description @@ -36,5 +36,8 @@ %doc COPYING COPYRIGHT NEWS README %changelog +* Mon Feb 27 2006 James Gallagher 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:21:51 -0000 1.2 +++ sources 3 Mar 2006 13:25:01 -0000 1.3 @@ -1 +1 @@ -b2cf59473e879651135e88c14d1b5bb5 freeform_handler-3.5.0.tar.gz +a0d2754055df574f0683c7a6d7100c11 freeform_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 13:30:54 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Fri, 3 Mar 2006 08:30:54 -0500 Subject: rpms/lock-keys-applet/devel lock-keys-applet.spec, 1.13, 1.14 lock-keys-applet-1.0-autotools.patch, 1.1, NONE Message-ID: <200603031331.k23DVQ7Y008461@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/lock-keys-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8444 Modified Files: lock-keys-applet.spec Removed Files: lock-keys-applet-1.0-autotools.patch Log Message: Let's try this... Index: lock-keys-applet.spec =================================================================== RCS file: /cvs/extras/rpms/lock-keys-applet/devel/lock-keys-applet.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- lock-keys-applet.spec 14 Feb 2006 22:53:50 -0000 1.13 +++ lock-keys-applet.spec 3 Mar 2006 13:30:53 -0000 1.14 @@ -7,7 +7,6 @@ License: GPL URL: http://mfcn.ilo.de/led_applet/ Source0: http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz -Patch: lock-keys-applet-1.0-autotools.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgnomeui-devel gnome-panel-devel scrollkeeper libtool automake autoconf Requires(post): scrollkeeper @@ -22,10 +21,9 @@ %prep %setup -q -%patch -p 1 -b .autotools %build -%ifnarch %{ix86} +%ifarch x86_64 libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf %endif %configure --- lock-keys-applet-1.0-autotools.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:40:19 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:40:19 -0500 Subject: rpms/dap-netcdf_handler/FC-3 .cvsignore, 1.2, 1.3 dap-netcdf_handler.spec, 1.3, 1.4 sources, 1.2, 1.3 dap-netcdf_handler-add_lib64.diff, 1.1, NONE Message-ID: <200603031340.k23DeqRV008585@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-netcdf_handler/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540/FC-3 Modified Files: .cvsignore dap-netcdf_handler.spec sources Removed Files: dap-netcdf_handler-add_lib64.diff Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 - new release - remove upstreamed patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 10:17:25 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:40:19 -0000 1.3 @@ -1 +1 @@ -netcdf_handler-3.5.2.tar.gz +netcdf_handler-3.6.0.tar.gz Index: dap-netcdf_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-3/dap-netcdf_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-netcdf_handler.spec 20 Feb 2006 11:50:00 -0000 1.3 +++ dap-netcdf_handler.spec 3 Mar 2006 13:40:19 -0000 1.4 @@ -1,15 +1,14 @@ Summary: NetCDF 3 data handler for the OPeNDAP Data server Name: dap-netcdf_handler -Version: 3.5.2 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/netcdf_handler-%{version}.tar.gz -Patch0: dap-netcdf_handler-add_lib64.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel netcdf-devel +BuildRequires: libdap-devel >= 3.6.0 netcdf-devel # Don't require dap-server as dap_nc_handler works without dap-server, # however dap_nc_handler should be of use only with dap-server in most cases. #Requires: dap-server @@ -17,11 +16,10 @@ %description This is the netcdf data handler for our data server. It reads netcdf 3 files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n netcdf_handler-%{version} -%patch0 %build %configure @@ -41,6 +39,10 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- new release +- remove upstreamed patch + * Mon Feb 20 2006 Patrice Dumas - 3.5.2-2 - add a patch for netcdf detection in lib64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 10:17:25 -0000 1.2 +++ sources 3 Mar 2006 13:40:19 -0000 1.3 @@ -1 +1 @@ -ee5f6832511339ad3348a673e4185968 netcdf_handler-3.5.2.tar.gz +1f5c2c485d058e2f3ae55d8ed956afd5 netcdf_handler-3.6.0.tar.gz --- dap-netcdf_handler-add_lib64.diff DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:40:25 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:40:25 -0500 Subject: rpms/dap-netcdf_handler/FC-4 .cvsignore, 1.2, 1.3 dap-netcdf_handler.spec, 1.3, 1.4 sources, 1.2, 1.3 dap-netcdf_handler-add_lib64.diff, 1.1, NONE Message-ID: <200603031340.k23DevKd008590@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-netcdf_handler/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540/FC-4 Modified Files: .cvsignore dap-netcdf_handler.spec sources Removed Files: dap-netcdf_handler-add_lib64.diff Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 - new release - remove upstreamed patch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 10:17:25 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:40:25 -0000 1.3 @@ -1 +1 @@ -netcdf_handler-3.5.2.tar.gz +netcdf_handler-3.6.0.tar.gz Index: dap-netcdf_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-4/dap-netcdf_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-netcdf_handler.spec 20 Feb 2006 11:50:00 -0000 1.3 +++ dap-netcdf_handler.spec 3 Mar 2006 13:40:25 -0000 1.4 @@ -1,15 +1,14 @@ Summary: NetCDF 3 data handler for the OPeNDAP Data server Name: dap-netcdf_handler -Version: 3.5.2 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/netcdf_handler-%{version}.tar.gz -Patch0: dap-netcdf_handler-add_lib64.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel netcdf-devel +BuildRequires: libdap-devel >= 3.6.0 netcdf-devel # Don't require dap-server as dap_nc_handler works without dap-server, # however dap_nc_handler should be of use only with dap-server in most cases. #Requires: dap-server @@ -17,11 +16,10 @@ %description This is the netcdf data handler for our data server. It reads netcdf 3 files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n netcdf_handler-%{version} -%patch0 %build %configure @@ -41,6 +39,10 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- new release +- remove upstreamed patch + * Mon Feb 20 2006 Patrice Dumas - 3.5.2-2 - add a patch for netcdf detection in lib64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-netcdf_handler/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 10:17:25 -0000 1.2 +++ sources 3 Mar 2006 13:40:25 -0000 1.3 @@ -1 +1 @@ -ee5f6832511339ad3348a673e4185968 netcdf_handler-3.5.2.tar.gz +1f5c2c485d058e2f3ae55d8ed956afd5 netcdf_handler-3.6.0.tar.gz --- dap-netcdf_handler-add_lib64.diff DELETED --- From fedora-extras-commits at redhat.com Fri Mar 3 13:47:37 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:47:37 -0500 Subject: rpms/dap-hdf4_handler/devel dap-hdf4_handler-gcc41.diff, NONE, 1.1 dap-hdf4_handler.spec, 1.3, 1.4 Message-ID: <200603031348.k23Dm9gK008640@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-serv8620 Modified Files: dap-hdf4_handler.spec Added Files: dap-hdf4_handler-gcc41.diff Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 - add patch for gcc 4.1 dap-hdf4_handler-gcc41.diff: --- NEW FILE dap-hdf4_handler-gcc41.diff --- diff -u --recursive hdf4_handler-3.6.0-orig/hdfclass/hcstream.h hdf4_handler-3.6.0/hdfclass/hcstream.h --- hdf4_handler-3.6.0-orig/hdfclass/hcstream.h 2005-10-13 11:23:29.000000000 +0200 +++ hdf4_handler-3.6.0/hdfclass/hcstream.h 2006-03-03 14:42:02.000000000 +0100 @@ -96,11 +96,11 @@ bool reduce_rank = false); void setslab(int *start, int *edge, int *stride, bool reduce_rank = false); void unsetslab(void) { _slab.set = _slab.reduce_rank = false; } - void hdfistream_sds::set_map_ce(const vector &a_ce) { + void set_map_ce(const vector &a_ce) { _map_ce_set = true; _map_ce_vec = a_ce; } - vector hdfistream_sds::get_map_ce() { + vector get_map_ce() { return _map_ce_vec; } bool is_map_ce_set() { Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-hdf4_handler.spec 3 Mar 2006 13:24:31 -0000 1.3 +++ dap-hdf4_handler.spec 3 Mar 2006 13:47:37 -0000 1.4 @@ -1,10 +1,11 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz +Patch: dap-hdf4_handler-gcc41.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,6 +19,7 @@ %prep %setup -q -n hdf4_handler-%{version} +%patch -p1 %build %configure @@ -37,6 +39,9 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 +- add patch for gcc 4.1 + * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 - Update to 3.6.0 From fedora-extras-commits at redhat.com Fri Mar 3 13:54:55 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:54:55 -0500 Subject: rpms/dap-freeform_handler/FC-3 .cvsignore, 1.2, 1.3 dap-freeform_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603031355.k23DtRPe008838@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-freeform_handler/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8798/FC-3 Modified Files: .cvsignore dap-freeform_handler.spec sources Log Message: Update to 3.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:21:51 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:54:55 -0000 1.3 @@ -1 +1 @@ -freeform_handler-3.5.0.tar.gz +freeform_handler-3.6.0.tar.gz Index: dap-freeform_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-3/dap-freeform_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-freeform_handler.spec 20 Feb 2006 14:25:36 -0000 1.2 +++ dap-freeform_handler.spec 3 Mar 2006 13:54:55 -0000 1.3 @@ -1,6 +1,6 @@ Summary: FreeForm data handler for the OPeNDAP Data server Name: dap-freeform_handler -Version: 3.5.0 +Version: 3.6.0 Release: 1%{?dist} License: LGPL Group: System Environment/Daemons @@ -8,7 +8,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel +BuildRequires: libdap-devel >= 3.6.0 #Requires: dap-server %description @@ -36,5 +36,8 @@ %doc COPYING COPYRIGHT NEWS README %changelog +* Mon Feb 27 2006 James Gallagher 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:21:51 -0000 1.2 +++ sources 3 Mar 2006 13:54:55 -0000 1.3 @@ -1 +1 @@ -b2cf59473e879651135e88c14d1b5bb5 freeform_handler-3.5.0.tar.gz +a0d2754055df574f0683c7a6d7100c11 freeform_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 13:55:01 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:55:01 -0500 Subject: rpms/dap-freeform_handler/FC-4 .cvsignore, 1.2, 1.3 dap-freeform_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603031355.k23DtXIW008843@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-freeform_handler/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8798/FC-4 Modified Files: .cvsignore dap-freeform_handler.spec sources Log Message: Update to 3.6.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:21:51 -0000 1.2 +++ .cvsignore 3 Mar 2006 13:55:00 -0000 1.3 @@ -1 +1 @@ -freeform_handler-3.5.0.tar.gz +freeform_handler-3.6.0.tar.gz Index: dap-freeform_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-4/dap-freeform_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-freeform_handler.spec 20 Feb 2006 14:25:36 -0000 1.2 +++ dap-freeform_handler.spec 3 Mar 2006 13:55:00 -0000 1.3 @@ -1,6 +1,6 @@ Summary: FreeForm data handler for the OPeNDAP Data server Name: dap-freeform_handler -Version: 3.5.0 +Version: 3.6.0 Release: 1%{?dist} License: LGPL Group: System Environment/Daemons @@ -8,7 +8,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel +BuildRequires: libdap-devel >= 3.6.0 #Requires: dap-server %description @@ -36,5 +36,8 @@ %doc COPYING COPYRIGHT NEWS README %changelog +* Mon Feb 27 2006 James Gallagher 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-freeform_handler/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:21:51 -0000 1.2 +++ sources 3 Mar 2006 13:55:00 -0000 1.3 @@ -1 +1 @@ -b2cf59473e879651135e88c14d1b5bb5 freeform_handler-3.5.0.tar.gz +a0d2754055df574f0683c7a6d7100c11 freeform_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 13:58:28 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 08:58:28 -0500 Subject: rpms/dap-hdf4_handler/devel dap-hdf4_handler-gcc41.diff, 1.1, 1.2 dap-hdf4_handler.spec, 1.4, 1.5 Message-ID: <200603031359.k23Dx0N5008957@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-serv8887 Modified Files: dap-hdf4_handler-gcc41.diff dap-hdf4_handler.spec Log Message: update gcc41 patch dap-hdf4_handler-gcc41.diff: Index: dap-hdf4_handler-gcc41.diff =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler-gcc41.diff,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dap-hdf4_handler-gcc41.diff 3 Mar 2006 13:47:37 -0000 1.1 +++ dap-hdf4_handler-gcc41.diff 3 Mar 2006 13:58:28 -0000 1.2 @@ -15,3 +15,15 @@ return _map_ce_vec; } bool is_map_ce_set() { +diff -u --recursive hdf4_handler-3.6.0-orig/HDFGrid.h hdf4_handler-3.6.0/HDFGrid.h +--- hdf4_handler-3.6.0-orig/HDFGrid.h 2005-10-10 21:22:29.000000000 +0200 ++++ hdf4_handler-3.6.0/HDFGrid.h 2006-03-03 14:55:23.000000000 +0100 +@@ -58,7 +58,7 @@ + virtual ~HDFGrid(); + virtual BaseType *ptr_duplicate(); + virtual bool read(const string &dataset); +- virtual vector HDFGrid::get_map_constraints(); ++ virtual vector get_map_constraints(); + virtual bool read_tagref(const string &dataset, int32 tag, int32 ref, int &error); + }; + Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- dap-hdf4_handler.spec 3 Mar 2006 13:47:37 -0000 1.4 +++ dap-hdf4_handler.spec 3 Mar 2006 13:58:28 -0000 1.5 @@ -1,7 +1,7 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler Version: 3.6.0 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz @@ -39,7 +39,7 @@ %doc README %changelog -* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2.1 - add patch for gcc 4.1 * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 From fedora-extras-commits at redhat.com Fri Mar 3 14:58:20 2006 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Fri, 3 Mar 2006 09:58:20 -0500 Subject: rpms/licq/devel licq.spec,1.5,1.6 Message-ID: <200603031458.k23Ewre9011626@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/licq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11603 Modified Files: licq.spec Log Message: use correct lib-path for plugins on x86-64 (#182733) Index: licq.spec =================================================================== RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- licq.spec 27 Feb 2006 14:17:13 -0000 1.5 +++ licq.spec 3 Mar 2006 14:58:20 -0000 1.6 @@ -1,6 +1,6 @@ Name: licq Version: 1.3.2 -Release: 5 +Release: 6 License: GPL Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2 URL: http://www.licq.org/ @@ -50,6 +50,8 @@ rm -rf `find . -name CVS` %build +export CFLAGS="$RPM_OPT_FLAGS" +sed -i s/lib/%{_lib}/ include/licq_constants.h %configure make cd plugins @@ -108,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la #remove licq.desktop installed by makefile -rm -f $RPM_BUILD_ROOT/%{_libdir}/share/applnk/Internet/licq.desktop +rm -rf $RPM_BUILD_ROOT/usr/share/applnk/Internet/licq.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -157,6 +159,9 @@ %doc plugins/osd*/{AUTHORS,TODO,README,changelog} %changelog +* Fri Mar 03 2006 Peter Vrabec 1.3.2-6 +- use correct lib-path for plugins on x86-64 (#182733) + * Mon Feb 27 2006 Peter Vrabec 1.3.2-5 - rebuild From fedora-extras-commits at redhat.com Fri Mar 3 15:07:53 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:07:53 -0500 Subject: rpms/l2tpd/devel l2tpd.spec,1.4,1.5 Message-ID: <200603031508.k23F8QOn013571@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/l2tpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13524 Modified Files: l2tpd.spec Log Message: bumped version Index: l2tpd.spec =================================================================== RCS file: /cvs/extras/rpms/l2tpd/devel/l2tpd.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- l2tpd.spec 21 Feb 2006 06:36:30 -0000 1.4 +++ l2tpd.spec 3 Mar 2006 15:07:53 -0000 1.5 @@ -3,7 +3,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: l2tpd Version: 0.69 -Release: 0.3.%{cvs}%{?dist} +Release: 0.4.%{cvs}%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Group: System Environment/Daemons @@ -127,6 +127,9 @@ %changelog +* Tue Mar 3 2006 Paul Wouters 0.69-0.4.20051030 +- Bumped version + * Tue Feb 21 2006 Paul Wouters 0.69-0.3.20051030 - Incorporated Jacco de Leeuw's fixes for Microsoft's Win98 l2tp client From fedora-extras-commits at redhat.com Fri Mar 3 15:33:11 2006 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Fri, 3 Mar 2006 10:33:11 -0500 Subject: rpms/licq/FC-4 licq.spec,1.4,1.5 Message-ID: <200603031533.k23FXhRG013781@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/licq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13737 Modified Files: licq.spec Log Message: use correct lib-path for plugins on x86-64 (#182733) Index: licq.spec =================================================================== RCS file: /cvs/extras/rpms/licq/FC-4/licq.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- licq.spec 16 Jan 2006 11:17:21 -0000 1.4 +++ licq.spec 3 Mar 2006 15:33:11 -0000 1.5 @@ -1,6 +1,6 @@ Name: licq Version: 1.3.2 -Release: 4 +Release: 5 License: GPL Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2 URL: http://www.licq.org/ @@ -50,6 +50,8 @@ rm -rf `find . -name CVS` %build +export CFLAGS="$RPM_OPT_FLAGS" +sed -i s/lib/%{_lib}/ include/licq_constants.h %configure make cd plugins @@ -99,7 +101,7 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/licq rm -rf $RPM_BUILD_ROOT/%{_libdir}/licq/*.la #remove licq.desktop installed by makefile -rm -f $RPM_BUILD_ROOT/%{_libdir}/share/applnk/Internet/licq.desktop +rm -rf $RPM_BUILD_ROOT/usr/share/applnk/Internet/licq.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -148,6 +150,9 @@ %doc plugins/osd*/{AUTHORS,TODO,README,changelog} %changelog +* Fri Mar 03 2006 Peter Vrabec 1.3.2-5.FC4 +- use correct lib-path for plugins on x86-64 (#182733) + * Mon Jan 16 2006 Peter Vrabec 1.3.2-4 - compile on x86-64 From fedora-extras-commits at redhat.com Fri Mar 3 15:33:12 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:33:12 -0500 Subject: rpms/fetchlog/devel .cvsignore,1.6,1.7 sources,1.7,1.8 Message-ID: <200603031533.k23FXiA3013785@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13739 Modified Files: .cvsignore sources Log Message: new sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Mar 2006 22:00:31 -0000 1.6 +++ .cvsignore 3 Mar 2006 15:33:12 -0000 1.7 @@ -1,2 +1 @@ fetchlog-1.0.tar.gz -fetchlog-build.patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Mar 2006 22:00:31 -0000 1.7 +++ sources 3 Mar 2006 15:33:12 -0000 1.8 @@ -1,2 +1 @@ e2ef0a076d1901c489c953fe48e1b2a9 fetchlog-1.0.tar.gz -99228569b122b994b1ab83148a3bd261 fetchlog-build.patch From fedora-extras-commits at redhat.com Fri Mar 3 15:35:21 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:35:21 -0500 Subject: rpms/fetchlog/devel fetchlog.spec,1.3,1.4 Message-ID: <200603031535.k23FZruI013860@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13825 Modified Files: fetchlog.spec Log Message: * Mon Mar 3 2006 Paul Wouters 1.0-4 - Bump version for build system Index: fetchlog.spec =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/fetchlog.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fetchlog.spec 6 Feb 2006 23:36:19 -0000 1.3 +++ fetchlog.spec 3 Mar 2006 15:35:21 -0000 1.4 @@ -1,7 +1,7 @@ Summary: The fetchlog utility displays the last new messages of a logfile Name: fetchlog Version: 1.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Source: http://dl.sf.net/sourceforge/fetchlog/%{name}-%{version}.tar.gz @@ -42,6 +42,9 @@ %{_mandir}/*/* %changelog +* Mon Mar 3 2006 Paul Wouters 1.0-4 +- Bump version for build system + * Mon Feb 6 2006 Paul Wouters 1.0-3 - Bump version due to make tag error From fedora-extras-commits at redhat.com Fri Mar 3 15:35:22 2006 From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec)) Date: Fri, 3 Mar 2006 10:35:22 -0500 Subject: rpms/licq/FC-4 licq.spec,1.5,1.6 Message-ID: <200603031535.k23FZs6x013863@cvs-int.fedora.redhat.com> Author: pvrabec Update of /cvs/extras/rpms/licq/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13821 Modified Files: licq.spec Log Message: fix release number Index: licq.spec =================================================================== RCS file: /cvs/extras/rpms/licq/FC-4/licq.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- licq.spec 3 Mar 2006 15:33:11 -0000 1.5 +++ licq.spec 3 Mar 2006 15:35:22 -0000 1.6 @@ -1,6 +1,6 @@ Name: licq Version: 1.3.2 -Release: 5 +Release: 5.FC4 License: GPL Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2 URL: http://www.licq.org/ From fedora-extras-commits at redhat.com Fri Mar 3 15:37:30 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:37:30 -0500 Subject: rpms/fetchlog/devel fetchlog-build.patch,NONE,1.1 Message-ID: <200603031537.k23FbWG6013929@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13917 Added Files: fetchlog-build.patch Log Message: honour RPM_OPT_FLAGS fetchlog-build.patch: --- NEW FILE fetchlog-build.patch --- --- Makefile~ 2004-03-26 21:47:58.000000000 +0200 +++ Makefile 2006-02-05 23:06:15.000000000 +0200 @@ -24,7 +24,7 @@ ### gcc CC=gcc -CFLAGS= -O -Wall -Wcast-qual -Wstrict-prototypes \ +CFLAGS= $(RPM_OPT_FLAGS) -Wall -Wcast-qual -Wstrict-prototypes \ -Wmissing-prototypes -Wmissing-declarations -Winline -Wcast-align ### cc #CC=cc From fedora-extras-commits at redhat.com Fri Mar 3 15:38:51 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:38:51 -0500 Subject: rpms/fetchlog/devel fetchlog.spec,1.4,1.5 Message-ID: <200603031539.k23FdNTs013999@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13972 Modified Files: fetchlog.spec Log Message: changelog fix Index: fetchlog.spec =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/fetchlog.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fetchlog.spec 3 Mar 2006 15:35:21 -0000 1.4 +++ fetchlog.spec 3 Mar 2006 15:38:51 -0000 1.5 @@ -42,10 +42,10 @@ %{_mandir}/*/* %changelog -* Mon Mar 3 2006 Paul Wouters 1.0-4 +* Mon Mar 3 2006 Paul Wouters 1.0-5 - Bump version for build system -* Mon Feb 6 2006 Paul Wouters 1.0-3 +* Mon Feb 6 2006 Paul Wouters 1.0-4 - Bump version due to make tag error * Mon Feb 6 2006 Paul Wouters 1.0-3 From fedora-extras-commits at redhat.com Fri Mar 3 15:46:26 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 10:46:26 -0500 Subject: rpms/fetchlog/devel sources,1.8,1.9 Message-ID: <200603031546.k23FkwBL014054@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14037 Modified Files: sources Log Message: patch isnt found though it is in cvs. try it as 'source' Index: sources =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 3 Mar 2006 15:33:12 -0000 1.8 +++ sources 3 Mar 2006 15:46:25 -0000 1.9 @@ -1 +1,2 @@ e2ef0a076d1901c489c953fe48e1b2a9 fetchlog-1.0.tar.gz +99228569b122b994b1ab83148a3bd261 fetchlog-build.patch From fedora-extras-commits at redhat.com Fri Mar 3 16:46:05 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 11:46:05 -0500 Subject: rpms/fetchlog/devel fetchlog.spec,1.5,1.6 Message-ID: <200603031646.k23GkcoT016425@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16408 Modified Files: fetchlog.spec Log Message: bumped version Index: fetchlog.spec =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/fetchlog.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fetchlog.spec 3 Mar 2006 15:38:51 -0000 1.5 +++ fetchlog.spec 3 Mar 2006 16:46:05 -0000 1.6 @@ -1,7 +1,7 @@ Summary: The fetchlog utility displays the last new messages of a logfile Name: fetchlog Version: 1.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Source: http://dl.sf.net/sourceforge/fetchlog/%{name}-%{version}.tar.gz @@ -42,6 +42,9 @@ %{_mandir}/*/* %changelog +* Mon Mar 3 2006 Paul Wouters 1.0-6 +- Bump version again :( + * Mon Mar 3 2006 Paul Wouters 1.0-5 - Bump version for build system From fedora-extras-commits at redhat.com Fri Mar 3 16:49:09 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 11:49:09 -0500 Subject: rpms/fetchlog/devel .cvsignore,1.7,1.8 Message-ID: <200603031649.k23GngIT016523@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16504 Modified Files: .cvsignore Log Message: cvsignore Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Mar 2006 15:33:12 -0000 1.7 +++ .cvsignore 3 Mar 2006 16:49:09 -0000 1.8 @@ -1 +1,2 @@ fetchlog-1.0.tar.gz +fetchlog-build.patch From fedora-extras-commits at redhat.com Fri Mar 3 16:50:45 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Fri, 3 Mar 2006 11:50:45 -0500 Subject: rpms/fetchlog/devel fetchlog.spec,1.6,1.7 Message-ID: <200603031651.k23GpHqT016585@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/fetchlog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16568 Modified Files: fetchlog.spec Log Message: bump version Index: fetchlog.spec =================================================================== RCS file: /cvs/extras/rpms/fetchlog/devel/fetchlog.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fetchlog.spec 3 Mar 2006 16:46:05 -0000 1.6 +++ fetchlog.spec 3 Mar 2006 16:50:45 -0000 1.7 @@ -1,7 +1,7 @@ Summary: The fetchlog utility displays the last new messages of a logfile Name: fetchlog Version: 1.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Source: http://dl.sf.net/sourceforge/fetchlog/%{name}-%{version}.tar.gz @@ -42,6 +42,9 @@ %{_mandir}/*/* %changelog +* Mon Mar 3 2006 Paul Wouters 1.0-7 +- Bump version. this time cause of old .cvsignore + * Mon Mar 3 2006 Paul Wouters 1.0-6 - Bump version again :( From fedora-extras-commits at redhat.com Fri Mar 3 17:01:51 2006 From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith)) Date: Fri, 3 Mar 2006 12:01:51 -0500 Subject: rpms/mercurial/FC-3 mercurial.spec,1.3,1.4 sources,1.4,1.5 Message-ID: <200603031702.k23H2OcS018529@cvs-int.fedora.redhat.com> Author: sopwith Update of /cvs/extras/rpms/mercurial/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18496 Modified Files: mercurial.spec sources Log Message: build for FC3 Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/mercurial.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mercurial.spec 20 Sep 2005 21:36:43 -0000 1.3 +++ mercurial.spec 3 Mar 2006 17:01:50 -0000 1.4 @@ -1,6 +1,6 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial -Version: 0.7 +Version: 0.8 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -30,10 +30,16 @@ %files -f %{name}.files %defattr(-,root,root,-) -%doc README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt +%doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt %changelog +* Mon Jan 30 2006 Jeremy Katz - 0.8-1 +- update to 0.8 + +* Thu Sep 22 2005 Jeremy Katz +- add contributors to %%doc + * Tue Sep 20 2005 Jeremy Katz - 0.7 - update to 0.7 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Sep 2005 21:36:43 -0000 1.4 +++ sources 3 Mar 2006 17:01:50 -0000 1.5 @@ -1 +1 @@ -c024ca9ed3ef35af8c5618316b6ab00a mercurial-0.7.tar.gz +4d418e96dd232d804799fca3458ba2b6 mercurial-0.8.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 19:27:04 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 3 Mar 2006 14:27:04 -0500 Subject: rpms/lyx/devel .cvsignore, 1.7, 1.8 lyx.spec, 1.24, 1.25 sources, 1.8, 1.9 Message-ID: <200603031927.k23JRbk3024377@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24356 Modified Files: .cvsignore lyx.spec sources Log Message: * Fri Mar 03 2006 Rex Dieter 1.4.0-0.11.pre6 - 1.4.0pre6 - --disable-stdlib-debug --disable-assertions --disable-concept-checks - don't use --without-included-boost (for now) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 13 Feb 2006 16:15:28 -0000 1.7 +++ .cvsignore 3 Mar 2006 19:27:04 -0000 1.8 @@ -1 +1 @@ -lyx-1.4.0pre5.tar.bz2 +lyx-1.4.0pre6.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- lyx.spec 20 Feb 2006 13:25:20 -0000 1.24 +++ lyx.spec 3 Mar 2006 19:27:04 -0000 1.25 @@ -2,15 +2,15 @@ ## avoid on fc4/gcc-4.0.2, due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24389 ## (fixed in gcc-4.0.3) %if "%{?fedora}" != "4" -%define _without_included_boost --without-included-boost +#define _without_included_boost --without-included-boost %endif -%define beta pre5 +%define beta pre6 Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 0.10.%{beta}%{?dist} +Release: 0.11.%{beta}%{?dist} License: GPL Group: Applications/Publishing @@ -103,10 +103,8 @@ %patch1 -p1 -b .helpers %patch2 -p1 -b .boost -# possibly questionable patch, leave it for gcc-4.1 platform(s) only -%if "%{?fedora}" > "4" -%patch3 -p0 -b .gcc41 -%endif +# possibly questionable patch, leave out for now -- Rex +#patch3 -p0 -b .gcc41 # ./autogen.sh @@ -115,7 +113,7 @@ # QT unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include # drop -fexceptions from RPM_OPT_FLAGS (suggested by lyx devs) export CFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )" @@ -130,7 +128,8 @@ --enable-optimization="$RPM_OPT_FLAGS" \ --with-aiksaurus \ --with-aspell \ - --without-warnings --disable-debug --disable-dependency-tracking \ + --without-warnings --disable-dependency-tracking \ + --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ %{?_without_included_boost} # Intermediate cleanup @@ -170,21 +169,21 @@ %post update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: texhash > /dev/null 2>&1 ||: -cd %{_datadir}/lyx && ./configure +cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: %postun update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: -texhash >& /dev/null ||: +texhash > /dev/null 2>&1 ||: # Catch installed/uninstalled helpers %triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then -cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: fi %triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then -cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: fi @@ -217,6 +216,11 @@ %changelog +* Fri Mar 03 2006 Rex Dieter 1.4.0-0.11.pre6 +- 1.4.0pre6 +- --disable-stdlib-debug --disable-assertions --disable-concept-checks +- don't use --without-included-boost (for now) + * Mon Feb 20 2006 Rex Dieter 1.4.0-0.10.pre5 - gcc41 patch - document boost/gcc41 patches Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 13 Feb 2006 16:15:28 -0000 1.8 +++ sources 3 Mar 2006 19:27:04 -0000 1.9 @@ -1 +1 @@ -dd137748afafc7e79cd76056882d5f05 lyx-1.4.0pre5.tar.bz2 +bcc2e2b301a4e30e9bf7556afccae060 lyx-1.4.0pre6.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 3 21:26:42 2006 From: fedora-extras-commits at redhat.com (Richard Dawe (richdawe)) Date: Fri, 3 Mar 2006 16:26:42 -0500 Subject: rpms/planet/devel planet.spec,1.1,1.2 Message-ID: <200603032127.k23LRFDK029188@cvs-int.fedora.redhat.com> Author: richdawe Update of /cvs/extras/rpms/planet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29168 Modified Files: planet.spec Log Message: Rebuild for FC-5. Index: planet.spec =================================================================== RCS file: /cvs/extras/rpms/planet/devel/planet.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- planet.spec 2 Mar 2006 05:52:59 -0000 1.1 +++ planet.spec 3 Mar 2006 21:26:40 -0000 1.2 @@ -5,7 +5,7 @@ Name: planet Version: 1.0 -Release: 0.5.20060218pre +Release: 0.6.20060218pre Summary: Flexible RDF/RSS/Atom feed aggregator Group: Applications/Internet @@ -71,6 +71,9 @@ %changelog +* Fri Mar 03 2006 Richard Dawe - 1.0-0.6.20060218pre +- Rebuild for FC-5. + * Sat Feb 18 2006 Richard Dawe - 1.0-0.5.20060218pre - Update to planet--devel--1.0--patch-20. This is no different than the previous release. This is purely to use a known, From fedora-extras-commits at redhat.com Fri Mar 3 21:31:28 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:31:28 -0500 Subject: rpms/qgit - New directory Message-ID: <200603032131.k23LVU4Y029321@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29313/qgit Log Message: Directory /cvs/extras/rpms/qgit added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 21:31:34 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:31:34 -0500 Subject: rpms/qgit/devel - New directory Message-ID: <200603032131.k23LVaAh029336@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29313/qgit/devel Log Message: Directory /cvs/extras/rpms/qgit/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 3 21:32:19 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:32:19 -0500 Subject: rpms/qgit Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603032132.k23LWLSE029370@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29358 Added Files: Makefile import.log Log Message: Setup of module qgit --- NEW FILE Makefile --- # Top level Makefile for module qgit all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 3 21:32:26 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:32:26 -0500 Subject: rpms/qgit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603032132.k23LWSaD029390@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29358/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module qgit --- NEW 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 Mar 3 21:33:55 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:33:55 -0500 Subject: rpms/qgit import.log,1.1,1.2 Message-ID: <200603032134.k23LYR7V029464@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29429 Modified Files: import.log Log Message: auto-import qgit-1.1-1 on branch devel from qgit-1.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/qgit/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 3 Mar 2006 21:32:19 -0000 1.1 +++ import.log 3 Mar 2006 21:33:55 -0000 1.2 @@ -0,0 +1 @@ +qgit-1_1-1:HEAD:qgit-1.1-1.src.rpm:1141421613 From fedora-extras-commits at redhat.com Fri Mar 3 21:34:01 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:34:01 -0500 Subject: rpms/qgit/devel qgit.desktop, NONE, 1.1 qgit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603032134.k23LYX0e029468@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29429/devel Modified Files: .cvsignore sources Added Files: qgit.desktop qgit.spec Log Message: auto-import qgit-1.1-1 on branch devel from qgit-1.1-1.src.rpm --- NEW FILE qgit.desktop --- [Desktop Entry] Encoding=UTF-8 Name=QGit GenericName=QGit Comment=git repository browser Exec=qgit StartupNotify=true Terminal=false Type=Application Categories=Application;Development;X-Fedora; Version=1.0 X-Desktop-File-Install-Version=0.4 --- NEW FILE qgit.spec --- Name: qgit Version: 1.1 Release: 1%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools License: GPL URL: http://digilander.libero.it/mcostalba/ Source0: http://dl.sourceforge.net/qgit/%{name}-%{version}.tar.bz2 Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, qt-devel Requires: git >= 1.2.0 %description With qgit you are able to browse revisions history, view patch content and changed files, graphically following different development branches. %prep %setup -q -n %{name}-%{version} %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ %{SOURCE1} %clean rm -rf $RPM_BUILD_ROOT %files %doc COPYING README ChangeLog %defattr(-,root,root,-) %{_bindir}/qgit %{_datadir}/applications/*.desktop %changelog * Sun Feb 19 2005 Dan Horak 1.1-1 - updated to upstream version 1.1 - fixed download URL for Source0 from sourceforge.net - requires git >= 1.2.0 * Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.3 - added docs * Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.2 - added desktop file * Wed Feb 8 2005 Dan Horak 1.1-0.1.rc3.1 - first version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Mar 2006 21:32:25 -0000 1.1 +++ .cvsignore 3 Mar 2006 21:34:00 -0000 1.2 @@ -0,0 +1 @@ +qgit-1.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Mar 2006 21:32:25 -0000 1.1 +++ sources 3 Mar 2006 21:34:00 -0000 1.2 @@ -0,0 +1 @@ +add6add14f3dd0602a3607a0acd5e983 qgit-1.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 3 21:36:29 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Fri, 3 Mar 2006 16:36:29 -0500 Subject: owners owners.list,1.700,1.701 Message-ID: <200603032137.k23Lb1xN029528@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29510 Modified Files: owners.list Log Message: - added qgit package Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.700 retrieving revision 1.701 diff -u -r1.700 -r1.701 --- owners.list 3 Mar 2006 02:07:32 -0000 1.700 +++ owners.list 3 Mar 2006 21:36:28 -0000 1.701 @@ -1163,6 +1163,7 @@ Fedora Extras|qca|Qt Cryptographic Architecture|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|qca-tls|Qt Cryptographic Architecture, TLS plugin|gauret at free.fr|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|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| Fedora Extras|qiv|Quick Image Viewer|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 3 21:39:44 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Fri, 3 Mar 2006 16:39:44 -0500 Subject: fedora-security/audit fc4,1.164,1.165 Message-ID: <200603032139.k23Ldi2i029558@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29540 Modified Files: fc4 Log Message: Note the squirrelmail update. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.164 retrieving revision 1.165 diff -u -r1.164 -r1.165 --- fc4 2 Mar 2006 12:14:58 -0000 1.164 +++ fc4 3 Mar 2006 21:39:36 -0000 1.165 @@ -20,7 +20,7 @@ CVE-2006-0455 version (gnupg, fixed 1.4.2.1) [since FEDORA-2006-116] CVE-2006-0454 backport (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3 CVE-2006-0405 version (libtiff, 3.8.0 only) -CVE-2006-0377 VULNERABLE (squirrelmail) bz#182585 +CVE-2006-0377 version (squirrelmail, fixed 1.4.6) bz#182585 [since FEDORA-2006-133] CVE-2006-0369 ignore (mysql) this is not a security issue CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104] @@ -58,8 +58,8 @@ CVE-2006-0207 VULNERABLE (php) bz#178044 CVE-2006-0200 version (php, 5.1.0 5.1.1 only) CVE-2006-0197 ** xorg-x11 -CVE-2006-0195 VULNERABLE (squirrelmail) bz#182582 -CVE-2006-0188 VULNERABLE (squirrelmail) bz#182580 +CVE-2006-0195 version (squirrelmail, fixed 1.4.6) bz#182582 [since FEDORA-2006-133] +CVE-2006-0188 version (squirrelmail, fixed 1.4.6) bz#182580 [since FEDORA-2006-133] CVE-2006-0097 ignore (php) Windows only CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] linux-2.6-dm-crypt-zero-key-before-free.patch From fedora-extras-commits at redhat.com Fri Mar 3 22:24:34 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 17:24:34 -0500 Subject: rpms/dap-hdf4_handler/FC-3 dap-hdf4_handler-gcc41.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 dap-hdf4_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603032225.k23MP74a031630@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-hdf4_handler/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31582/FC-3 Modified Files: .cvsignore dap-hdf4_handler.spec sources Added Files: dap-hdf4_handler-gcc41.diff Log Message: - add patch for gcc 4.1 - Update to 3.6.0 dap-hdf4_handler-gcc41.diff: --- NEW FILE dap-hdf4_handler-gcc41.diff --- diff -u --recursive hdf4_handler-3.6.0-orig/hdfclass/hcstream.h hdf4_handler-3.6.0/hdfclass/hcstream.h --- hdf4_handler-3.6.0-orig/hdfclass/hcstream.h 2005-10-13 11:23:29.000000000 +0200 +++ hdf4_handler-3.6.0/hdfclass/hcstream.h 2006-03-03 14:42:02.000000000 +0100 @@ -96,11 +96,11 @@ bool reduce_rank = false); void setslab(int *start, int *edge, int *stride, bool reduce_rank = false); void unsetslab(void) { _slab.set = _slab.reduce_rank = false; } - void hdfistream_sds::set_map_ce(const vector &a_ce) { + void set_map_ce(const vector &a_ce) { _map_ce_set = true; _map_ce_vec = a_ce; } - vector hdfistream_sds::get_map_ce() { + vector get_map_ce() { return _map_ce_vec; } bool is_map_ce_set() { diff -u --recursive hdf4_handler-3.6.0-orig/HDFGrid.h hdf4_handler-3.6.0/HDFGrid.h --- hdf4_handler-3.6.0-orig/HDFGrid.h 2005-10-10 21:22:29.000000000 +0200 +++ hdf4_handler-3.6.0/HDFGrid.h 2006-03-03 14:55:23.000000000 +0100 @@ -58,7 +58,7 @@ virtual ~HDFGrid(); virtual BaseType *ptr_duplicate(); virtual bool read(const string &dataset); - virtual vector HDFGrid::get_map_constraints(); + virtual vector get_map_constraints(); virtual bool read_tagref(const string &dataset, int32 tag, int32 ref, int &error); }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:19:07 -0000 1.2 +++ .cvsignore 3 Mar 2006 22:24:34 -0000 1.3 @@ -1 +1 @@ -hdf4_handler-3.5.0.tar.gz +hdf4_handler-3.6.0.tar.gz Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-3/dap-hdf4_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-hdf4_handler.spec 20 Feb 2006 14:21:32 -0000 1.2 +++ dap-hdf4_handler.spec 3 Mar 2006 22:24:34 -0000 1.3 @@ -1,10 +1,11 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler -Version: 3.5.0 -Release: 1%{?dist} +Version: 3.6.0 +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz +Patch: dap-hdf4_handler-gcc41.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -14,13 +15,14 @@ %description This is the hdf4 data handler for our data server. It reads HDF4 and HDF-EOS files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n hdf4_handler-%{version} +%patch -p1 %build -%configure --with-hdf4-libdir=%{_libdir}/hdf --with-hdf4-include=%{_includedir}/hdf +%configure make %{?_smp_mflags} %install @@ -37,5 +39,11 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 +- add patch for gcc 4.1 + +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:19:07 -0000 1.2 +++ sources 3 Mar 2006 22:24:34 -0000 1.3 @@ -1 +1 @@ -0b3d3ab80d85428a9a9f898dacc4d53e hdf4_handler-3.5.0.tar.gz +8aebe63dc38dfbc35f853807b37c070e hdf4_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 22:24:40 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 17:24:40 -0500 Subject: rpms/dap-hdf4_handler/FC-4 dap-hdf4_handler-gcc41.diff, NONE, 1.1 .cvsignore, 1.2, 1.3 dap-hdf4_handler.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603032225.k23MPCj9031635@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-hdf4_handler/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31582/FC-4 Modified Files: .cvsignore dap-hdf4_handler.spec sources Added Files: dap-hdf4_handler-gcc41.diff Log Message: - add patch for gcc 4.1 - Update to 3.6.0 dap-hdf4_handler-gcc41.diff: --- NEW FILE dap-hdf4_handler-gcc41.diff --- diff -u --recursive hdf4_handler-3.6.0-orig/hdfclass/hcstream.h hdf4_handler-3.6.0/hdfclass/hcstream.h --- hdf4_handler-3.6.0-orig/hdfclass/hcstream.h 2005-10-13 11:23:29.000000000 +0200 +++ hdf4_handler-3.6.0/hdfclass/hcstream.h 2006-03-03 14:42:02.000000000 +0100 @@ -96,11 +96,11 @@ bool reduce_rank = false); void setslab(int *start, int *edge, int *stride, bool reduce_rank = false); void unsetslab(void) { _slab.set = _slab.reduce_rank = false; } - void hdfistream_sds::set_map_ce(const vector &a_ce) { + void set_map_ce(const vector &a_ce) { _map_ce_set = true; _map_ce_vec = a_ce; } - vector hdfistream_sds::get_map_ce() { + vector get_map_ce() { return _map_ce_vec; } bool is_map_ce_set() { diff -u --recursive hdf4_handler-3.6.0-orig/HDFGrid.h hdf4_handler-3.6.0/HDFGrid.h --- hdf4_handler-3.6.0-orig/HDFGrid.h 2005-10-10 21:22:29.000000000 +0200 +++ hdf4_handler-3.6.0/HDFGrid.h 2006-03-03 14:55:23.000000000 +0100 @@ -58,7 +58,7 @@ virtual ~HDFGrid(); virtual BaseType *ptr_duplicate(); virtual bool read(const string &dataset); - virtual vector HDFGrid::get_map_constraints(); + virtual vector get_map_constraints(); virtual bool read_tagref(const string &dataset, int32 tag, int32 ref, int &error); }; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Feb 2006 14:19:07 -0000 1.2 +++ .cvsignore 3 Mar 2006 22:24:40 -0000 1.3 @@ -1 +1 @@ -hdf4_handler-3.5.0.tar.gz +hdf4_handler-3.6.0.tar.gz Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-4/dap-hdf4_handler.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- dap-hdf4_handler.spec 20 Feb 2006 14:21:32 -0000 1.2 +++ dap-hdf4_handler.spec 3 Mar 2006 22:24:40 -0000 1.3 @@ -1,10 +1,11 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler -Version: 3.5.0 -Release: 1%{?dist} +Version: 3.6.0 +Release: 2%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz +Patch: dap-hdf4_handler-gcc41.diff URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -14,13 +15,14 @@ %description This is the hdf4 data handler for our data server. It reads HDF4 and HDF-EOS files and returns DAP responses that are compatible with DAP2 and the -dap-server 3.5 software. +dap-server software. %prep %setup -q -n hdf4_handler-%{version} +%patch -p1 %build -%configure --with-hdf4-libdir=%{_libdir}/hdf --with-hdf4-include=%{_includedir}/hdf +%configure make %{?_smp_mflags} %install @@ -37,5 +39,11 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 +- add patch for gcc 4.1 + +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 +- Update to 3.6.0 + * Thu Sep 21 2005 James Gallagher 3.5.0-1 - initial release Index: sources =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Feb 2006 14:19:07 -0000 1.2 +++ sources 3 Mar 2006 22:24:40 -0000 1.3 @@ -1 +1 @@ -0b3d3ab80d85428a9a9f898dacc4d53e hdf4_handler-3.5.0.tar.gz +8aebe63dc38dfbc35f853807b37c070e hdf4_handler-3.6.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 3 22:58:30 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 17:58:30 -0500 Subject: rpms/dap-hdf4_handler/devel dap-hdf4_handler.spec,1.5,1.6 Message-ID: <200603032259.k23Mx2ZZ031818@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-serv31801 Modified Files: dap-hdf4_handler.spec Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 - BuildRequires libdap-devel above 3.6.0 Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/devel/dap-hdf4_handler.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- dap-hdf4_handler.spec 3 Mar 2006 13:58:28 -0000 1.5 +++ dap-hdf4_handler.spec 3 Mar 2006 22:58:30 -0000 1.6 @@ -1,7 +1,7 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler Version: 3.6.0 -Release: 2%{?dist}.1 +Release: 3%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz @@ -9,7 +9,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel hdf-devel +BuildRequires: libdap-devel >= 3.6.0 hdf-devel #Requires: dap-server %description @@ -39,7 +39,10 @@ %doc README %changelog -* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2.1 +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 +- BuildRequires libdap-devel above 3.6.0 + +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 - add patch for gcc 4.1 * Fri Mar 3 2006 Patrice Dumas - 3.6.0-1 From fedora-extras-commits at redhat.com Fri Mar 3 23:00:10 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 18:00:10 -0500 Subject: rpms/dap-hdf4_handler/FC-3 dap-hdf4_handler.spec,1.3,1.4 Message-ID: <200603032300.k23N0hMS031914@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-hdf4_handler/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31875/FC-3 Modified Files: dap-hdf4_handler.spec Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 - BuildRequires libdap-devel above 3.6.0 Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-3/dap-hdf4_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-hdf4_handler.spec 3 Mar 2006 22:24:34 -0000 1.3 +++ dap-hdf4_handler.spec 3 Mar 2006 23:00:10 -0000 1.4 @@ -1,7 +1,7 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler Version: 3.6.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz @@ -9,7 +9,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel hdf-devel +BuildRequires: libdap-devel >= 3.6.0 hdf-devel #Requires: dap-server %description @@ -39,6 +39,9 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 +- BuildRequires libdap-devel above 3.6.0 + * Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 - add patch for gcc 4.1 From fedora-extras-commits at redhat.com Fri Mar 3 23:00:16 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 3 Mar 2006 18:00:16 -0500 Subject: rpms/dap-hdf4_handler/FC-4 dap-hdf4_handler.spec,1.3,1.4 Message-ID: <200603032300.k23N0mEX031917@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/dap-hdf4_handler/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31875/FC-4 Modified Files: dap-hdf4_handler.spec Log Message: * Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 - BuildRequires libdap-devel above 3.6.0 Index: dap-hdf4_handler.spec =================================================================== RCS file: /cvs/extras/rpms/dap-hdf4_handler/FC-4/dap-hdf4_handler.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- dap-hdf4_handler.spec 3 Mar 2006 22:24:40 -0000 1.3 +++ dap-hdf4_handler.spec 3 Mar 2006 23:00:16 -0000 1.4 @@ -1,7 +1,7 @@ Summary: HDF4 data handler for the OPeNDAP Data server Name: dap-hdf4_handler Version: 3.6.0 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Daemons Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/hdf4_handler-%{version}.tar.gz @@ -9,7 +9,7 @@ URL: http://www.opendap.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libdap-devel hdf-devel +BuildRequires: libdap-devel >= 3.6.0 hdf-devel #Requires: dap-server %description @@ -39,6 +39,9 @@ %doc README %changelog +* Fri Mar 3 2006 Patrice Dumas - 3.6.0-3 +- BuildRequires libdap-devel above 3.6.0 + * Fri Mar 3 2006 Patrice Dumas - 3.6.0-2 - add patch for gcc 4.1 From fedora-extras-commits at redhat.com Fri Mar 3 23:42:03 2006 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Fri, 3 Mar 2006 18:42:03 -0500 Subject: rpms/balsa/devel .cvsignore, 1.12, 1.13 balsa.spec, 1.15, 1.16 sources, 1.12, 1.13 Message-ID: <200603032342.k23NgZ9P001675@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/balsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1654 Modified Files: .cvsignore balsa.spec sources Log Message: -update to upstream version 2.3.12. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 1 Mar 2006 20:29:04 -0000 1.12 +++ .cvsignore 3 Mar 2006 23:42:03 -0000 1.13 @@ -1,2 +1,2 @@ -balsa-2.3.11.tar.bz2 +balsa-2.3.12.tar.bz2 gmime-2.1.17.tar.bz2 Index: balsa.spec =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/balsa.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- balsa.spec 1 Mar 2006 20:29:04 -0000 1.15 +++ balsa.spec 3 Mar 2006 23:42:03 -0000 1.16 @@ -1,7 +1,7 @@ %define config_opts --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --mandir=%{_mandir} --libdir=%{_libdir} --bindir=%{_bindir} --includedir=%{_includedir} --datadir=%{_datadir} --disable-more-warnings --with-ssl --with-gss --with-gtkspell Name: balsa -Version: 2.3.11 +Version: 2.3.12 Release: 1%{?dist} Summary: Mail Client @@ -99,6 +99,9 @@ %changelog +* Sat Mar 4 2006 Pawel Salek - 2.3.12-1 +- update to upstream version 2.3.12. + * Wed Mar 1 2006 Pawel Salek - 2.3.11-1 - update to upstream version 2.3.11. Index: sources =================================================================== RCS file: /cvs/extras/rpms/balsa/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 1 Mar 2006 20:29:04 -0000 1.12 +++ sources 3 Mar 2006 23:42:03 -0000 1.13 @@ -1,2 +1,2 @@ -a00f9d235b1ae9e7736fb0a0f4a38e82 balsa-2.3.11.tar.bz2 +3792d22cde7aceeae37108ed09477711 balsa-2.3.12.tar.bz2 4be55ee55e4b3966bd51fadbf5fb323b gmime-2.1.17.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 4 03:41:45 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Fri, 3 Mar 2006 22:41:45 -0500 Subject: owners owners.list,1.701,1.702 Message-ID: <200603040342.k243gIHE009927@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9907 Modified Files: owners.list Log Message: Add myself to gtkglarea2's CC-list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.701 retrieving revision 1.702 diff -u -r1.701 -r1.702 --- owners.list 3 Mar 2006 21:36:28 -0000 1.701 +++ owners.list 4 Mar 2006 03:41:45 -0000 1.702 @@ -385,7 +385,7 @@ Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|gtk+extra|A library of gtk+ widgets|aportal at univ-montp2.fr|extras-qa at fedoraproject.org| -Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 4 04:59:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 3 Mar 2006 23:59:22 -0500 Subject: rpms/gc/devel gc-6.7-no-undefined.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gc.spec, 1.17, 1.18 sources, 1.6, 1.7 gc-6.6-gcc41.patch, 1.1, NONE gc-6.6-no-undefined.patch, 1.1, NONE Message-ID: <200603040459.k244xs7h011938@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11908 Modified Files: .cvsignore gc.spec sources Added Files: gc-6.7-no-undefined.patch Removed Files: gc-6.6-gcc41.patch gc-6.6-no-undefined.patch Log Message: * Fri Mar 03 2006 Rex Dieter 6.7-1 - 6.7 gc-6.7-no-undefined.patch: --- NEW FILE gc-6.7-no-undefined.patch --- --- gc6.7/Makefile.am.no-undefined 2006-02-18 18:50:37.000000000 -0600 +++ gc6.7/Makefile.am 2006-03-03 22:51:58.000000000 -0600 @@ -57,7 +57,7 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ @@ -65,8 +65,8 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S @@ -91,9 +91,9 @@ ## are included in the distribution # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) --- gc6.7/Makefile.in.no-undefined 2006-02-18 18:50:57.000000000 -0600 +++ gc6.7/Makefile.in 2006-03-03 22:54:41.000000000 -0600 @@ -340,15 +340,15 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined AM_CXXFLAGS = @GC_CFLAGS@ AM_CFLAGS = @GC_CFLAGS@ @CPLUSPLUS_FALSE at extra_checks = @@ -356,9 +356,9 @@ # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) all_objs = @addobjs@ $(libgc_la_OBJECTS) @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gc/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Sep 2005 19:29:11 -0000 1.6 +++ .cvsignore 4 Mar 2006 04:59:22 -0000 1.7 @@ -1 +1 @@ -gc6.6.tar.gz +gc6.7.tar.gz Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/devel/gc.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gc.spec 1 Mar 2006 15:54:09 -0000 1.17 +++ gc.spec 4 Mar 2006 04:59:22 -0000 1.18 @@ -1,9 +1,9 @@ Summary: C++ Garbage Collector Name: gc -Version: 6.6 +Version: 6.7 -Release: 5%{?dist}.1 +Release: 1%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ @@ -11,9 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) -Patch1: gc-6.6-no-undefined.patch -# gcc(4.1) patch -Patch2: gc-6.6-gcc41.patch +Patch1: gc-6.7-no-undefined.patch BuildRequires: libtool BuildRequires: automake @@ -38,7 +36,6 @@ %setup -q -n %{name}%{version} %patch1 -p1 -b .no-undefined -%patch2 -p1 -b .gcc41 cp -f %{_datadir}/aclocal/libtool.m4 . libtoolize --copy --force @@ -101,6 +98,9 @@ %changelog +* Fri Mar 03 2006 Rex Dieter 6.7-1 +- 6.7 + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/gc/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Sep 2005 19:29:11 -0000 1.6 +++ sources 4 Mar 2006 04:59:22 -0000 1.7 @@ -1 +1 @@ -c7c301e8fab8ce152c908b05bc8d452c gc6.6.tar.gz +be780413a0360306ad3b701e45fa8871 gc6.7.tar.gz --- gc-6.6-gcc41.patch DELETED --- --- gc-6.6-no-undefined.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 05:01:10 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 4 Mar 2006 00:01:10 -0500 Subject: rpms/gtkglarea2/devel gtkglarea2.spec,1.13,1.14 Message-ID: <200603040501.k2451hkK013835@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/gtkglarea2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13518 Modified Files: gtkglarea2.spec Log Message: * Sat Mar 04 2006 Ralf Cors??pius - 1.99.0-6 - Re-enable building. - disable static libs. - disable dep-tracking. - BR|R: libGL-devel, libGLU-devel. Index: gtkglarea2.spec =================================================================== RCS file: /cvs/extras/rpms/gtkglarea2/devel/gtkglarea2.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gtkglarea2.spec 2 Mar 2006 21:30:09 -0000 1.13 +++ gtkglarea2.spec 4 Mar 2006 05:01:10 -0000 1.14 @@ -1,26 +1,26 @@ Summary: OpenGL GTK widget Name: gtkglarea2 Version: 1.99.0 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: System Environment/Libraries URL: ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea # ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/ Source0: ftp://ftp.gnome.org/pub/gnome/sources/gtkglarea/1.99/gtkglarea-1.99.0.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig BuildRequires: gtk2-devel -BuildRequires: mesa-libGL-devel -BuildRequires: mesa-libGLU-devel +BuildRequires: libGL-devel +BuildRequires: libGLU-devel %package devel Summary: Development package for gtkglarea2 Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: gtk2-devel -Requires: mesa-libGL-devel -Requires: mesa-libGLU-devel +Requires: libGL-devel +Requires: libGLU-devel %description GtkGLArea is a GTK widget that makes it easy to use OpenGL or Mesa @@ -33,17 +33,10 @@ software development. %prep -cat< - 1.99.0-6 +- Re-enable building. +- disable static libs. +- disable dep-tracking. +- BR|R: libGL-devel, libGLU-devel. + * Fri Feb 17 2006 Gerard Milmeister - 1.99.0-5 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sat Mar 4 05:12:08 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 4 Mar 2006 00:12:08 -0500 Subject: rpms/gc/FC-3 gc-6.7-no-undefined.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gc.spec, 1.12, 1.13 sources, 1.6, 1.7 gc-6.6-no-undefined.patch, 1.1, NONE Message-ID: <200603040512.k245Cej2013954@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13930 Modified Files: .cvsignore gc.spec sources Added Files: gc-6.7-no-undefined.patch Removed Files: gc-6.6-no-undefined.patch Log Message: * Fri Mar 03 2006 Rex Dieter 6.7-1 - 6.7 gc-6.7-no-undefined.patch: --- NEW FILE gc-6.7-no-undefined.patch --- --- gc6.7/Makefile.am.no-undefined 2006-02-18 18:50:37.000000000 -0600 +++ gc6.7/Makefile.am 2006-03-03 22:51:58.000000000 -0600 @@ -57,7 +57,7 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ @@ -65,8 +65,8 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S @@ -91,9 +91,9 @@ ## are included in the distribution # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) --- gc6.7/Makefile.in.no-undefined 2006-02-18 18:50:57.000000000 -0600 +++ gc6.7/Makefile.in 2006-03-03 22:54:41.000000000 -0600 @@ -340,15 +340,15 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined AM_CXXFLAGS = @GC_CFLAGS@ AM_CFLAGS = @GC_CFLAGS@ @CPLUSPLUS_FALSE at extra_checks = @@ -356,9 +356,9 @@ # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) all_objs = @addobjs@ $(libgc_la_OBJECTS) @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gc/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Sep 2005 18:45:11 -0000 1.6 +++ .cvsignore 4 Mar 2006 05:12:08 -0000 1.7 @@ -1 +1 @@ -gc6.6.tar.gz +gc6.7.tar.gz Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/FC-3/gc.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gc.spec 1 Dec 2005 15:10:03 -0000 1.12 +++ gc.spec 4 Mar 2006 05:12:08 -0000 1.13 @@ -1,9 +1,9 @@ Summary: C++ Garbage Collector Name: gc -Version: 6.6 +Version: 6.7 -Release: 4%{?dist} +Release: 1%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ @@ -11,7 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) -Patch1: gc-6.6-no-undefined.patch +Patch1: gc-6.7-no-undefined.patch + BuildRequires: libtool BuildRequires: automake @@ -97,6 +98,15 @@ %changelog +* Fri Mar 03 2006 Rex Dieter 6.7-1 +- 6.7 + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Fri Feb 10 2006 Rex Dieter 6.6-5 +- gcc(4.1) patch + * Thu Dec 01 2005 Rex Dieter 6.6-4 - Provides: libgc(-devel) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gc/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Sep 2005 18:45:12 -0000 1.6 +++ sources 4 Mar 2006 05:12:08 -0000 1.7 @@ -1 +1 @@ -c7c301e8fab8ce152c908b05bc8d452c gc6.6.tar.gz +be780413a0360306ad3b701e45fa8871 gc6.7.tar.gz --- gc-6.6-no-undefined.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 05:13:34 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Sat, 4 Mar 2006 00:13:34 -0500 Subject: rpms/gc/FC-4 gc-6.7-no-undefined.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gc.spec, 1.13, 1.14 sources, 1.6, 1.7 gc-6.6-no-undefined.patch, 1.1, NONE Message-ID: <200603040514.k245E77U014025@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gc/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14001 Modified Files: .cvsignore gc.spec sources Added Files: gc-6.7-no-undefined.patch Removed Files: gc-6.6-no-undefined.patch Log Message: * Fri Mar 03 2006 Rex Dieter 6.7-1 - 6.7 gc-6.7-no-undefined.patch: --- NEW FILE gc-6.7-no-undefined.patch --- --- gc6.7/Makefile.am.no-undefined 2006-02-18 18:50:37.000000000 -0600 +++ gc6.7/Makefile.am 2006-03-03 22:51:58.000000000 -0600 @@ -57,7 +57,7 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ @@ -65,8 +65,8 @@ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.s sparc_mach_dep.S @@ -91,9 +91,9 @@ ## are included in the distribution # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) --- gc6.7/Makefile.in.no-undefined 2006-02-18 18:50:57.000000000 -0600 +++ gc6.7/Makefile.in 2006-03-03 22:54:41.000000000 -0600 @@ -340,15 +340,15 @@ # linuxthread semaphore functions get linked: libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) libgc_la_DEPENDENCIES = @addobjs@ -libgc_la_LDFLAGS = -version-info 1:2:0 +libgc_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \ mips_sgi_mach_dep.s mips_ultrix_mach_dep.s powerpc_darwin_mach_dep.s \ rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgccpp_la_SOURCES = gc_cpp.cc -libgccpp_la_LIBADD = $(THREADDLLIBS) $(UNWINDLIBS) -libgccpp_la_LDFLAGS = -version-info 1:2:0 +libgccpp_la_LIBADD = ./libgc.la +libgccpp_la_LDFLAGS = -version-info 1:2:0 -no-undefined -Wl,--no-undefined AM_CXXFLAGS = @GC_CFLAGS@ AM_CFLAGS = @GC_CFLAGS@ @CPLUSPLUS_FALSE at extra_checks = @@ -356,9 +356,9 @@ # gctest_OBJECTS = test.o gctest_SOURCES = tests/test.c -gctest_LDADD = ./libgc.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +gctest_LDADD = ./libgc.la $(EXTRA_TEST_LIBS) test_cpp_SOURCES = tests/test_cpp.cc -test_cpp_LDADD = ./libgc.la ./libgccpp.la $(THREADDLLIBS) $(UNWINDLIBS) $(EXTRA_TEST_LIBS) +test_cpp_LDADD = ./libgccpp.la $(EXTRA_TEST_LIBS) TESTS = $(check_PROGRAMS) all_objs = @addobjs@ $(libgc_la_OBJECTS) @COMPILER_XLC_FALSE at ASM_CPP_OPTIONS = -Wp,-P -x assembler-with-cpp Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gc/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Sep 2005 18:45:12 -0000 1.6 +++ .cvsignore 4 Mar 2006 05:13:34 -0000 1.7 @@ -1 +1 @@ -gc6.6.tar.gz +gc6.7.tar.gz Index: gc.spec =================================================================== RCS file: /cvs/extras/rpms/gc/FC-4/gc.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gc.spec 1 Dec 2005 15:10:29 -0000 1.13 +++ gc.spec 4 Mar 2006 05:13:34 -0000 1.14 @@ -1,9 +1,9 @@ Summary: C++ Garbage Collector Name: gc -Version: 6.6 +Version: 6.7 -Release: 4%{?dist} +Release: 1%{?dist} Group: System Environment/Libraries License: BSD Url: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ @@ -11,7 +11,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # force no undefined symbols (#166344) -Patch1: gc-6.6-no-undefined.patch +Patch1: gc-6.7-no-undefined.patch + BuildRequires: libtool BuildRequires: automake @@ -97,6 +98,15 @@ %changelog +* Fri Mar 03 2006 Rex Dieter 6.7-1 +- 6.7 + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Fri Feb 10 2006 Rex Dieter 6.6-5 +- gcc(4.1) patch + * Thu Dec 01 2005 Rex Dieter 6.6-4 - Provides: libgc(-devel) Index: sources =================================================================== RCS file: /cvs/extras/rpms/gc/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Sep 2005 18:45:12 -0000 1.6 +++ sources 4 Mar 2006 05:13:34 -0000 1.7 @@ -1 +1 @@ -c7c301e8fab8ce152c908b05bc8d452c gc6.6.tar.gz +be780413a0360306ad3b701e45fa8871 gc6.7.tar.gz --- gc-6.6-no-undefined.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 08:20:27 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Mar 2006 03:20:27 -0500 Subject: rpms/dillo/FC-3 .cvsignore, 1.4, 1.5 dillo.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603040820.k248KxKk020382@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dillo/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/FC-3 Modified Files: .cvsignore dillo.spec sources Log Message: - reenable build - add dist - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:54:15 -0000 1.4 +++ .cvsignore 4 Mar 2006 08:20:26 -0000 1.5 @@ -1 +1 @@ -dillo-0.8.4.tar.bz2 +dillo-0.8.5.tar.bz2 Index: dillo.spec =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-3/dillo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dillo.spec 9 Feb 2005 23:44:00 -0000 1.6 +++ dillo.spec 4 Mar 2006 08:20:26 -0000 1.7 @@ -1,38 +1,41 @@ Name: dillo -Version: 0.8.4 -Release: 2 -Epoch: 0 +Version: 0.8.5 +Release: 1%{?dist} + Summary: Very small and fast GUI web browser Group: Applications/Internet License: GPL URL: http://www.dillo.org/ -Source0: http://www.dillo.org/download/dillo-0.8.4.tar.bz2 +Source0: http://www.dillo.org/download/dillo-0.8.5.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png -Patch0: dillo-0.8.0-nodebug.patch +Patch0: dillo-0.8.0-nodebug.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk+-devel +BuildRequires: gtk+-devel BuildRequires: zlib-devel BuildRequires: desktop-file-utils -BuildRequires: libpng-devel >= 0:1.2.0 -BuildRequires: libjpeg-devel = 0:6b -Requires: wget -Provides: webclient +BuildRequires: libpng-devel >= 1.2.0 +BuildRequires: libjpeg-devel = 6b +Requires: wget +Provides: webclient %description Dillo is a very small and fast web browser using GTK. Currently: no frames,https,javascript. + %prep %setup -q %patch0 + %build %configure --disable-dependency-tracking --enable-ipv6 make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT @@ -40,8 +43,8 @@ rm -f doc/Makefile* %{__install} -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications -desktop-file-install --vendor fedora \ - --add-category X-Fedora \ +desktop-file-install --vendor fedora \ + --add-category X-Fedora \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ %{SOURCE1} %{__install} -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/pixmaps/dillo.png @@ -51,10 +54,10 @@ rm -rf $RPM_BUILD_ROOT -%files +%files %defattr(-,root,root,-) %doc AUTHORS COPYING README ChangeLog doc -%config(noreplace) %{_sysconfdir}/* +%config(noreplace) %{_sysconfdir}/* %{_bindir}/* %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/dillo.png @@ -62,6 +65,12 @@ %changelog +* Sat Mar 04 2006 Andreas Bierfert +0.8.5-1 +- reenable build +- version upgrade +- add dist + * Thu Feb 3 2005 Ville Skytt?? - 0:0.8.4-2 - Add icon, thanks to Robin Humble. Index: sources =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:54:15 -0000 1.4 +++ sources 4 Mar 2006 08:20:26 -0000 1.5 @@ -1 +1 @@ -ebf17d6cca1fccc8bc80acdf05e736a3 dillo-0.8.4.tar.bz2 +d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 4 08:20:33 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Mar 2006 03:20:33 -0500 Subject: rpms/dillo/FC-4 .cvsignore, 1.4, 1.5 dillo.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200603040821.k248L5jS020387@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dillo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/FC-4 Modified Files: .cvsignore dillo.spec sources Log Message: - reenable build - add dist - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:54:15 -0000 1.4 +++ .cvsignore 4 Mar 2006 08:20:33 -0000 1.5 @@ -1 +1 @@ -dillo-0.8.4.tar.bz2 +dillo-0.8.5.tar.bz2 Index: dillo.spec =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-4/dillo.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dillo.spec 6 Apr 2005 22:11:36 -0000 1.8 +++ dillo.spec 4 Mar 2006 08:20:33 -0000 1.9 @@ -1,13 +1,13 @@ Name: dillo -Version: 0.8.4 -Release: 3 +Version: 0.8.5 +Release: 1%{?dist} Summary: Very small and fast GUI web browser Group: Applications/Internet License: GPL URL: http://www.dillo.org/ -Source0: http://www.dillo.org/download/dillo-0.8.4.tar.bz2 +Source0: http://www.dillo.org/download/dillo-0.8.5.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png Patch0: dillo-0.8.0-nodebug.patch @@ -65,6 +65,12 @@ %changelog +* Sat Mar 04 2006 Andreas Bierfert +0.8.5-1 +- reenable build +- version upgrade +- add dist + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/dillo/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:54:15 -0000 1.4 +++ sources 4 Mar 2006 08:20:33 -0000 1.5 @@ -1 +1 @@ -ebf17d6cca1fccc8bc80acdf05e736a3 dillo-0.8.4.tar.bz2 +d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 4 08:20:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Mar 2006 03:20:39 -0500 Subject: rpms/dillo/devel .cvsignore, 1.4, 1.5 dillo.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200603040821.k248LBE8020392@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dillo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/devel Modified Files: .cvsignore dillo.spec sources Log Message: - reenable build - add dist - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Jan 2005 18:54:15 -0000 1.4 +++ .cvsignore 4 Mar 2006 08:20:39 -0000 1.5 @@ -1 +1 @@ -dillo-0.8.4.tar.bz2 +dillo-0.8.5.tar.bz2 Index: dillo.spec =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/dillo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dillo.spec 2 Mar 2006 21:28:41 -0000 1.9 +++ dillo.spec 4 Mar 2006 08:20:39 -0000 1.10 @@ -1,13 +1,13 @@ Name: dillo -Version: 0.8.4 -Release: 3 +Version: 0.8.5 +Release: 1%{?dist} Summary: Very small and fast GUI web browser Group: Applications/Internet License: GPL URL: http://www.dillo.org/ -Source0: http://www.dillo.org/download/dillo-0.8.4.tar.bz2 +Source0: http://www.dillo.org/download/dillo-0.8.5.tar.bz2 Source1: %{name}.desktop Source2: %{name}.png Patch0: dillo-0.8.0-nodebug.patch @@ -27,13 +27,6 @@ %prep -cat< +0.8.5-1 +- reenable build +- version upgrade +- add dist + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/dillo/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Jan 2005 18:54:15 -0000 1.4 +++ sources 4 Mar 2006 08:20:39 -0000 1.5 @@ -1 +1 @@ -ebf17d6cca1fccc8bc80acdf05e736a3 dillo-0.8.4.tar.bz2 +d0ab7fa1d40b310deb891388604188f8 dillo-0.8.5.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 4 08:25:23 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 4 Mar 2006 03:25:23 -0500 Subject: owners owners.list,1.702,1.703 Message-ID: <200603040825.k248Puhf020427@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20410 Modified Files: owners.list Log Message: - taking ownership of dillo Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.702 retrieving revision 1.703 diff -u -r1.702 -r1.703 --- owners.list 4 Mar 2006 03:41:45 -0000 1.702 +++ owners.list 4 Mar 2006 08:25:23 -0000 1.703 @@ -177,7 +177,7 @@ Fedora Extras|dietlibc|Small libc implementation|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| Fedora Extras|digikam|A digital camera accessing & photo management application|mgarski at post.pl|extras-qa at fedoraproject.org| Fedora Extras|digikamimageplugins|Plugins for Digikam|rdieter at math.unl.edu|extras-qa at fedoraproject.org| -Fedora Extras|dillo|Very small and fast GUI web browser|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|dillo|Very small and fast GUI web browser|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|diradmin|User control management tool for LDAP directories|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|djvulibre|DjVu viewers, encoders and utilities|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 4 08:31:00 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Mar 2006 03:31:00 -0500 Subject: rpms/perl-HTML-Template-Expr/FC-4 .cvsignore, 1.3, 1.4 perl-HTML-Template-Expr.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603040831.k248VXS9020484@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20445/FC-4 Modified Files: .cvsignore perl-HTML-Template-Expr.spec sources Log Message: * Sat Mar 4 2006 Ville Skytt?? - 0.06-1 - 0.06. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Dec 2005 15:24:06 -0000 1.3 +++ .cvsignore 4 Mar 2006 08:31:00 -0000 1.4 @@ -1 +1 @@ -HTML-Template-Expr-0.05.tar.gz +HTML-Template-Expr-0.06.tar.gz Index: perl-HTML-Template-Expr.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/perl-HTML-Template-Expr.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-HTML-Template-Expr.spec 22 Dec 2005 15:24:06 -0000 1.3 +++ perl-HTML-Template-Expr.spec 4 Mar 2006 08:31:00 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-HTML-Template-Expr -Version: 0.05 +Version: 0.06 Release: 1%{?dist} Summary: Expression support extension for HTML::Template @@ -56,6 +56,9 @@ %changelog +* Sat Mar 4 2006 Ville Skytt?? - 0.06-1 +- 0.06. + * Thu Dec 22 2005 Ville Skytt?? - 0.05-1 - 0.05. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Dec 2005 15:24:06 -0000 1.3 +++ sources 4 Mar 2006 08:31:00 -0000 1.4 @@ -1 +1 @@ -726e5bb49083cbf7d752767f7c3f29cf HTML-Template-Expr-0.05.tar.gz +1a7a6b908d00fc71567d9c57708a7633 HTML-Template-Expr-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Mar 4 08:31:06 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Mar 2006 03:31:06 -0500 Subject: rpms/perl-HTML-Template-Expr/devel .cvsignore, 1.3, 1.4 perl-HTML-Template-Expr.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603040831.k248VcT8020490@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20445/devel Modified Files: .cvsignore perl-HTML-Template-Expr.spec sources Log Message: * Sat Mar 4 2006 Ville Skytt?? - 0.06-1 - 0.06. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 22 Dec 2005 15:24:12 -0000 1.3 +++ .cvsignore 4 Mar 2006 08:31:06 -0000 1.4 @@ -1 +1 @@ -HTML-Template-Expr-0.05.tar.gz +HTML-Template-Expr-0.06.tar.gz Index: perl-HTML-Template-Expr.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/perl-HTML-Template-Expr.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-HTML-Template-Expr.spec 22 Dec 2005 15:24:12 -0000 1.3 +++ perl-HTML-Template-Expr.spec 4 Mar 2006 08:31:06 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-HTML-Template-Expr -Version: 0.05 +Version: 0.06 Release: 1%{?dist} Summary: Expression support extension for HTML::Template @@ -56,6 +56,9 @@ %changelog +* Sat Mar 4 2006 Ville Skytt?? - 0.06-1 +- 0.06. + * Thu Dec 22 2005 Ville Skytt?? - 0.05-1 - 0.05. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 22 Dec 2005 15:24:12 -0000 1.3 +++ sources 4 Mar 2006 08:31:06 -0000 1.4 @@ -1 +1 @@ -726e5bb49083cbf7d752767f7c3f29cf HTML-Template-Expr-0.05.tar.gz +1a7a6b908d00fc71567d9c57708a7633 HTML-Template-Expr-0.06.tar.gz From fedora-extras-commits at redhat.com Sat Mar 4 11:07:40 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:07:40 -0500 Subject: rpms/lcov - New directory Message-ID: <200603041107.k24B7gkb027208@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27200/lcov Log Message: Directory /cvs/extras/rpms/lcov added to the repository From fedora-extras-commits at redhat.com Sat Mar 4 11:07:46 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:07:46 -0500 Subject: rpms/lcov/devel - New directory Message-ID: <200603041107.k24B7mk7027223@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27200/lcov/devel Log Message: Directory /cvs/extras/rpms/lcov/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 4 11:08:11 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:08:11 -0500 Subject: rpms/lcov Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603041108.k24B8Dk7027257@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27245 Added Files: Makefile import.log Log Message: Setup of module lcov --- NEW FILE Makefile --- # Top level Makefile for module lcov all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 4 11:08:17 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:08:17 -0500 Subject: rpms/lcov/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603041108.k24B8Vrn027274@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27245/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module lcov --- NEW 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 Mar 4 11:09:27 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:09:27 -0500 Subject: rpms/lcov import.log,1.1,1.2 Message-ID: <200603041109.k24B9xfi027361@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27321 Modified Files: import.log Log Message: auto-import lcov-1.4-2.fc5 on branch devel from lcov-1.4-2.fc5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lcov/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Mar 2006 11:08:10 -0000 1.1 +++ import.log 4 Mar 2006 11:09:26 -0000 1.2 @@ -0,0 +1 @@ +lcov-1_4-2_fc5:HEAD:lcov-1.4-2.fc5.src.rpm:1141470560 From fedora-extras-commits at redhat.com Sat Mar 4 11:09:49 2006 From: fedora-extras-commits at redhat.com (Roland McGrath (roland)) Date: Sat, 4 Mar 2006 06:09:49 -0500 Subject: rpms/lcov/devel lcov-1.4-gcda-suffix.patch, NONE, 1.1 lcov-1.4-lcovrc.patch, NONE, 1.1 lcov.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603041110.k24BALM8027365@cvs-int.fedora.redhat.com> Author: roland Update of /cvs/extras/rpms/lcov/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27321/devel Modified Files: .cvsignore sources Added Files: lcov-1.4-gcda-suffix.patch lcov-1.4-lcovrc.patch lcov.spec Log Message: auto-import lcov-1.4-2.fc5 on branch devel from lcov-1.4-2.fc5.src.rpm lcov-1.4-gcda-suffix.patch: --- NEW FILE lcov-1.4-gcda-suffix.patch --- --- lcov-1.4/bin/lcov.~1~ 2005-03-02 08:24:50.000000000 -0800 +++ lcov-1.4/bin/lcov 2006-02-15 10:24:41.000000000 -0800 @@ -331,8 +331,8 @@ get coverage data for a user space progr -c, --capture Capture coverage data -t, --test-name NAME Specify test name to be stored with data -o, --output-file FILENAME Write data to FILENAME instead of stdout - -d, --directory DIR Use .da files in DIR instead of kernel - -f, --follow Follow links when searching .da files + -d, --directory DIR Use .da/.gcda files in DIR instead of kernel + -f, --follow Follow links when searching .da/.gcda files -k, --kernel-directory KDIR Capture kernel coverage data only from KDIR -a, --add-tracefile FILE Add contents of tracefiles -e, --extract FILE PATTERN Extract files matching PATTERN from FILE @@ -399,17 +399,17 @@ sub userspace_reset() foreach $current_dir (@directory) { - info("Deleting all .da files in $current_dir and ". + info("Deleting all .da and .gcda files in $current_dir and ". "subdirectories\n"); if ($follow) { @file_list = - `find $current_dir -follow -name \\*.da -type f 2>/dev/null`; + `find $current_dir -follow \\( -name \\*.gcda -o -name \\*.da \\) -type f 2>/dev/null`; } else { @file_list = - `find $current_dir -name \\*.da -type f 2>/dev/null`; + `find $current_dir \\( -name \\*.gcda -o -name \\*.da \\) -type f 2>/dev/null`; } chomp(@file_list); foreach (@file_list) lcov-1.4-lcovrc.patch: --- NEW FILE lcov-1.4-lcovrc.patch --- --- lcov-1.4/lcovrc.~1~ 2005-03-02 08:24:47.000000000 -0800 +++ lcov-1.4/lcovrc 2006-02-13 19:09:02.000000000 -0800 @@ -22,13 +22,13 @@ genhtml_overview_width = 80 # difference in lines between the position a user selected from the overview # and the position the source code window is scrolled to (used by --frames # option of genhtml) -genhtml_nav_resolution = 4; +genhtml_nav_resolution = 4 # Clicking a line in the overview image should show the source code view at # a position a bit further up so that the requested line is not the first # line in the window. This number specifies that offset in lines (used by # --frames option of genhtml) -genhtml_nav_offset = 10; +genhtml_nav_offset = 10 # Do not remove unused test descriptions if non-zero (same as # --keep-descriptions option of genhtml) --- NEW FILE lcov.spec --- Name: lcov Version: 1.4 Release: 2%{?dist} Summary: LTP GCOV extension code coverage tool Group: Development/Tools License: GPL URL: http://ltp.sourceforge.net/coverage/lcov.php Source0: http://dl.sourceforge.net/ltp/lcov-%{version}.tar.gz Patch1: lcov-1.4-lcovrc.patch Patch2: lcov-1.4-gcda-suffix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: /usr/bin/gcov Requires: perl(GD::Image) %description LCOV is an extension of GCOV, a GNU tool which provides information about what parts of a program are actually executed (i.e. "covered") while running a particular test case. The extension consists of a set of PERL scripts which build on the textual GCOV output to implement HTML output and support for large projects. %prep %setup -q %patch1 -p1 %patch2 -p1 %install rm -rf $RPM_BUILD_ROOT make install PREFIX=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man5/* %config(noreplace) %attr(0644,root,root) /etc/lcovrc %changelog * Mon Feb 20 2006 Roland McGrath - 1.4-2 - Fix lcov -z to look for .gcda (GCC >= 3.4) suffix as well as .da (old GCC). - Remove empty %%build from spec. - Fix URL for source tarball. * Mon Feb 13 2006 Roland McGrath - 1.4-1 - Initial build, some spec bits snarfed from upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lcov/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2006 11:08:17 -0000 1.1 +++ .cvsignore 4 Mar 2006 11:09:48 -0000 1.2 @@ -0,0 +1 @@ +lcov-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/lcov/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2006 11:08:17 -0000 1.1 +++ sources 4 Mar 2006 11:09:48 -0000 1.2 @@ -0,0 +1 @@ +9ae93c6619ee60a9e89bd2da0e49ae4a lcov-1.4.tar.gz From fedora-extras-commits at redhat.com Sat Mar 4 12:23:50 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 07:23:50 -0500 Subject: rpms/dejavu-fonts import.log,1.36,1.37 Message-ID: <200603041224.k24COMiW029538@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29503 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.3-2.fc5 on branch devel from dejavu-fonts-2.3-2.fc5.src.rpm register fontconfig aliases Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- import.log 20 Feb 2006 07:18:11 -0000 1.36 +++ import.log 4 Mar 2006 12:23:49 -0000 1.37 @@ -33,3 +33,4 @@ dejavu-fonts-2_2-6_fc5:HEAD:dejavu-fonts-2.2-6.fc5.src.rpm:1139868667 dejavu-fonts-2_2-4_fc4:FC-4:dejavu-fonts-2.2-4.fc4.src.rpm:1140271299 dejavu-fonts-2_3-1_fc5:HEAD:dejavu-fonts-2.3-1.fc5.src.rpm:1140419864 +dejavu-fonts-2_3-2_fc5:HEAD:dejavu-fonts-2.3-2.fc5.src.rpm:1141475016 From fedora-extras-commits at redhat.com Sat Mar 4 12:23:56 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 07:23:56 -0500 Subject: rpms/dejavu-fonts/devel dejavu-fonts-register.xsl, NONE, 1.1 dejavu-fonts.spec, 1.14, 1.15 Message-ID: <200603041224.k24COTGJ029542@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29503/devel Modified Files: dejavu-fonts.spec Added Files: dejavu-fonts-register.xsl Log Message: auto-import dejavu-fonts-2.3-2.fc5 on branch devel from dejavu-fonts-2.3-2.fc5.src.rpm register fontconfig aliases --- NEW FILE dejavu-fonts-register.xsl --- DejaVu Sans DejaVu Serif DejaVu Sans Mono DejaVu Serif DejaVu Serif DejaVu Sans DejaVu Sans DejaVu Sans Mono DejaVu Sans Mono DejaVu Sans DejaVu Serif DejaVu Sans Mono Bitstream Vera Sans Bitstream Vera Sans DejaVu Sans Bitstream Vera Serif Bitstream Vera Serif DejaVu Serif Bitstream Vera Sans Mono Bitstream Vera Sans Mono DejaVu Sans Mono Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dejavu-fonts.spec 20 Feb 2006 07:18:17 -0000 1.14 +++ dejavu-fonts.spec 4 Mar 2006 12:23:56 -0000 1.15 @@ -1,7 +1,8 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots %define archiveversion %{version}-1 -%define fontdir %{_datadir}/fonts/dejavu +%define fontdir %{_datadir}/fonts/%{name} +%define xsldir %{_datadir}/xml/%{name} # Let the perl Maintainer worry about Unicode.org data files (updates, licensing) %define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt @@ -9,30 +10,36 @@ Name: dejavu-fonts Version: 2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DejaVu Fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ Source: http://prdownloads.sourceforge.net/dejavu/%{archivename}-%{archiveversion}.tar.gz +Source1: dejavu-fonts-register.xsl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: fontforge # The CPAN sources do not declare perl(Font::TTF) BuildRequires: perl-Font-TTF # Needed to compute unicode coverage BuildRequires: %{Blocks} %{UnicodeData} +# Needed for fontconfig alias registration +Requires: %{_bindir}/xsltproc, /bin/mktemp BuildArch: noarch Conflicts: fontconfig < 2.3.93 + %description The DejaVu fonts are a font family based on the Bitstream Vera Fonts release 1.10. Its purpose is to provide a wider range of characters (see Current status page for more information) while maintaining the original look and feel through the process of collaborative develop + %prep %setup -q -n %{archivename}-%{version} + %build ./generate.sh ./status.pl %{version} status.txt *.sfd > status.txt.new @@ -42,11 +49,13 @@ DejaVuSerif.sfd Serif \ DejaVuMonoSans.sfd "Sans Mono" > unicover.txt + %check # Current upstream files are full of "problems" # Do not panic if the output is long ./problems.pl -l 3 *.sfd + %install /bin/rm -rf %{buildroot} @@ -54,6 +63,11 @@ install -d -m 0755 %{buildroot}%{fontdir} install -m 0644 generated/*.ttf %{buildroot}%{fontdir} +#xsl +install -d -m 755 %{buildroot}%{xsldir} +install -p -m 644 %{SOURCE1} %{buildroot}%{xsldir}/register-%{name}.xsl + + %clean /bin/rm -rf %{buildroot} @@ -63,6 +77,7 @@ %{_bindir}/fc-cache %{_datadir}/fonts fi + %postun if [ "$1" = "0" ]; then if [ -x %{_bindir}/fc-cache ]; then @@ -71,6 +86,16 @@ fi +%triggerin -- fontconfig, %{_sysconfdir}/fonts/fonts.conf + +if [ -x %{_sysconfdir}/fonts/fonts.conf ] ; then + TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \ + %{_bindir}/xsltproc --novalid --output $TMPFILE \ + %{xsldir}/register-%{name}.xsl %{_sysconfdir}/fonts/fonts.conf && \ + /bin/cat $TMPFILE > %{_sysconfdir}/fonts/fonts.conf && /bin/rm $TMPFILE +fi + + %files %defattr(0644,root,root,0755) %doc *.txt AUTHORS BUGS LICENSE NEWS README @@ -78,7 +103,14 @@ %dir %{fontdir} %{fontdir}/*.ttf +%dir %{xsldir} +%{xsldir}/register-%{name}.xsl + + %changelog +* Sat Mar 04 2006 Nicolas Mailhot - 2.3-2 +- register dejavu in fontconfig aliases + * Mon Feb 20 2006 Nicolas Mailhot - 2.3-1 - 2.3 From fedora-extras-commits at redhat.com Sat Mar 4 13:26:42 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sat, 4 Mar 2006 08:26:42 -0500 Subject: rpms/abe/devel abe.spec,1.8,1.9 Message-ID: <200603041327.k24DRENL031762@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/abe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31705/abe/devel Modified Files: abe.spec Log Message: Disable (and remove from repo) three more orphans which haven't been rebuilt by anyone yet. Index: abe.spec =================================================================== RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- abe.spec 12 Apr 2005 14:33:30 -0000 1.8 +++ abe.spec 4 Mar 2006 13:26:41 -0000 1.9 @@ -22,6 +22,13 @@ vaguely in the style of similar games for the Commodore+4. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/gnofract4d/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31705/gnofract4d/devel Modified Files: gnofract4d.spec Log Message: Disable (and remove from repo) three more orphans which haven't been rebuilt by anyone yet. Index: gnofract4d.spec =================================================================== RCS file: /cvs/extras/rpms/gnofract4d/devel/gnofract4d.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gnofract4d.spec 6 Apr 2005 22:11:38 -0000 1.6 +++ gnofract4d.spec 4 Mar 2006 13:26:48 -0000 1.7 @@ -24,6 +24,13 @@ the two sets and explore their inter-relationships. %prep +cat< Author: mschwendt Update of /cvs/extras/rpms/wbxml2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31705/wbxml2/devel Modified Files: wbxml2.spec Log Message: Disable (and remove from repo) three more orphans which haven't been rebuilt by anyone yet. Index: wbxml2.spec =================================================================== RCS file: /cvs/extras/rpms/wbxml2/devel/wbxml2.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wbxml2.spec 22 May 2005 22:29:02 -0000 1.6 +++ wbxml2.spec 4 Mar 2006 13:26:54 -0000 1.7 @@ -37,6 +37,13 @@ %prep +cat< Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31860 Modified Files: import.log Log Message: auto-import zoo-2.10-7.fc5 on branch devel from zoo-2.10-7.fc5.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 26 Feb 2006 22:44:35 -0000 1.9 +++ import.log 4 Mar 2006 13:30:14 -0000 1.10 @@ -6,3 +6,4 @@ zoo-2_10-6_fc5:HEAD:zoo-2.10-6.fc5.src.rpm:1140993664 zoo-2_10-6_fc4:FC-4:zoo-2.10-6.fc4.src.rpm:1140993767 zoo-2_10-6_fc3:FC-3:zoo-2.10-6.fc3.src.rpm:1140993865 +zoo-2_10-7_fc5:HEAD:zoo-2.10-7.fc5.src.rpm:1141479004 From fedora-extras-commits at redhat.com Sat Mar 4 13:30:20 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 08:30:20 -0500 Subject: rpms/zoo/devel zoo-2.10-CAN-2005-2349.patch, NONE, 1.1 zoo-2.10-febz-183426.patch, NONE, 1.1 zoo-gcc.patch, NONE, 1.1 zoo-return.patch, NONE, 1.1 zoo-security_pathsize.patch, NONE, 1.1 zoo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zoo.spec, 1.9, 1.10 zoo-2.10-pathsize-security.patch, 1.1, NONE zoo-gcc4.patch, 1.1, NONE Message-ID: <200603041330.k24DUrla031917@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31860/devel Modified Files: .cvsignore sources zoo.spec Added Files: zoo-2.10-CAN-2005-2349.patch zoo-2.10-febz-183426.patch zoo-gcc.patch zoo-return.patch zoo-security_pathsize.patch zoo.patch Removed Files: zoo-2.10-pathsize-security.patch zoo-gcc4.patch Log Message: auto-import zoo-2.10-7.fc5 on branch devel from zoo-2.10-7.fc5.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix zoo-2.10-CAN-2005-2349.patch: --- NEW FILE zoo-2.10-CAN-2005-2349.patch --- --- portable.c +++ portable.c @@ -364,6 +364,31 @@ show_dir(direntry); } #endif + char *p; + /* take off '../' */ + while ((p = strstr( direntry->dirname, "../" )) != NULL) { + while (*(p+3) != '\0') { + *p = *(p + 3); + p++; + } + *p = *(p+3); /* move last null */ + //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname); + } + /* take off '/' */ + if ( direntry->dirname[0] == '/' ) { + p = direntry->dirname; + while (*p != '\0') { + *p = *(p + 1); + p++; + } + *p = *(p+1); /* move last null */ + //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname); + } + /* take off '..' */ + if(!strcmp(direntry->dirname, "..")) + direntry->dirname[0] = '\0'; + /* direntry->dirlen = strlen(direntry->dirname); */ + return (0); } zoo-2.10-febz-183426.patch: --- NEW FILE zoo-2.10-febz-183426.patch --- diff -uNr zoo/parse.c zoo.new/parse.c --- zoo/parse.c 1991-07-11 21:07:34.000000000 +0200 +++ zoo.new/parse.c 2006-03-04 14:17:50.000000000 +0100 @@ -39,7 +39,7 @@ char *namep; /* points to relevant part of tempname */ char *p; - strcpy (tempname, fname); + strncpy(tempname, fname, LFNAMESIZE); #ifdef DEBUG printf ("parse: supplied name is [%s].\n", tempname); zoo-gcc.patch: --- NEW FILE zoo-gcc.patch --- diff -uNr zoo.orig/makefile zoo/makefile --- zoo.orig/makefile 1992-07-27 06:01:40.000000000 +0200 +++ zoo/makefile 2002-11-25 16:41:06.000000000 +0100 @@ -21,7 +21,7 @@ CC = cc CFLAGS = MODEL = -EXTRA = -DBIG_MEM -DNDEBUG +EXTRA = -DBIG_MEM -DNDEBUG -DANSI_PROTO LINTFLAGS = -DLINT OPTIM = -O DESTDIR = /usr/local/bin diff -uNr zoo.orig/options.h zoo/options.h --- zoo.orig/options.h 1991-07-11 21:07:32.000000000 +0200 +++ zoo/options.h 2002-11-25 16:41:30.000000000 +0100 @@ -104,7 +104,7 @@ #define GETTZ #define FATTR #define T_SIGNAL int -#define VARARGS +#define STDARG #define NEED_MEMMOVE #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY zoo-return.patch: --- NEW FILE zoo-return.patch --- --- ar.h +++ ar.h @@ -116,7 +116,9 @@ void move_left(); #else # define MOVE_LEFT memmove +# ifndef ANSI_HDRS extern VOIDPTR memmove(); +# endif #endif #if 0 --- bsd.c +++ bsd.c @@ -104,4 +104,5 @@ seekpos = lseek(fd, 0L, SEEK_CUR); if (seekpos >= 0) return ftruncate(fd, seekpos); + return 0; } --- mstime.i +++ mstime.i @@ -12,6 +12,7 @@ Function mstime() converts time in seconds since January 1 of BASEYEAR to MS-DOS format date and time. */ +void mstime(longtime, date, time) long longtime; /* input: seconds since Jan 1, BASEYEAR */ int *date, *time; /* output: MS-DOS format date and time */ --- nixtime.i +++ nixtime.i @@ -36,6 +36,7 @@ (tm->tm_hour << 11); } + return 0; } /***************** --- options.h +++ options.h @@ -157,11 +157,13 @@ #define GETTZ #define FATTR #define T_SIGNAL void +#define STDARG /* #define VARARGS */ /* #define NEED_MEMMOVE */ #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY /* #define NEED_VPRINTF */ +#define BSD4_3 /* for I/O definitions */ #endif /* BSD4_4 */ /***********************************************************************/ zoo-security_pathsize.patch: --- NEW FILE zoo-security_pathsize.patch --- --- misc.c +++ misc.c @@ -135,11 +135,17 @@ char *fullpath (direntry) struct direntry *direntry; { - static char result[PATHSIZE]; + static char result[PATHSIZE+LFNAMESIZE+12]; /* Room for enough space.*/ combine (result, direntry->dirlen != 0 ? direntry->dirname : "", (direntry->namlen != 0) ? direntry->lfname : direntry->fname ); + + if (strlen (result) >= PATHSIZE) { + prterror ('f', "Combined dirname and filename too long!\n"); + *result = '\0'; + } + return (result); } zoo.patch: --- NEW FILE zoo.patch --- --- basename.c +++ basename.c @@ -18,7 +18,7 @@ /* This function strips device/directory information from a pathname and returns just the plain filename */ -void basename (pathname, fname) +void my_basename (pathname, fname) char *pathname; char fname[]; { --- makefile +++ makefile @@ -18,13 +18,13 @@ MAKE = make # needed for some systems e.g. older BSD -CC = cc +CC = gcc CFLAGS = MODEL = EXTRA = -DBIG_MEM -DNDEBUG LINTFLAGS = -DLINT OPTIM = -O -DESTDIR = /usr/local/bin +DESTDIR = /usr/bin #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ @@ -107,10 +107,10 @@ convex: $(MAKE) CFLAGS="-c $(OPTIM) -DBSD4_3 -DANSI_HDRS" $(TARGETS) -# Linux 0.96c, gcc 2.2.2 +# Linux 2.0.0, gcc 2.7.2 linux: $(MAKE) \ - CFLAGS="-c -O2 -DBSD4_3 -DANSI_HDRS -DLINUX" \ + CFLAGS="-c $(OPTIM) -DBSD4_4 -DANSI_HDRS -DLINUX" \ $(TARGETS) # linux as above, static linked --- options.h +++ options.h @@ -89,7 +89,7 @@ /***********************************************************************/ #ifdef BSD4_3 -#define NOSTRCHR /* not really needed for 4.3BSD */ +/* #define NOSTRCHR */ /* not really needed for 4.3BSD */ #define FILTER #define IO_MACROS #define EXISTS(f) (access(f, 00) == 0) --- various.h +++ various.h @@ -26,6 +26,7 @@ #ifdef ANSI_HDRS /* if not defined in stdio.h */ # include # include +# include #else FILE *fdopen PARMS ((int, char *)); FILE *fopen PARMS ((char *, char *)); --- zooadd.c +++ zooadd.c @@ -132,7 +132,7 @@ if (zoo_file == NOFILE) prterror ('f', could_not_open, zoo_path); -basename(zoo_path, zoo_fname); /* get basename of archive */ +my_basename(zoo_path, zoo_fname); /* get basename of archive */ rootname (zoo_path, zoo_bak); /* name without extension */ strcat (zoo_bak, BACKUP_EXT); /* name of backup of this archive */ @@ -222,7 +222,7 @@ break; } - basename (this_path, this_fname); /* get just filename for later */ + my_basename (this_path, this_fname); /* get just filename for later */ this_file = zooopen(this_path, Z_READ); if (this_file == NOFILE) { --- zoofns.h +++ zoofns.h @@ -85,7 +85,7 @@ void addfname PARMS ((char *, long, unsigned int, unsigned int, unsigned, unsigned)); void add_version PARMS ((char *, struct direntry *)); -void basename PARMS ((char *, char [])); +void my_basename PARMS ((char *, char [])); void break_off PARMS ((void)); void close_file PARMS ((ZOOFILE)); void comment PARMS ((char *, char *)); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zoo/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:41 -0000 1.2 +++ .cvsignore 4 Mar 2006 13:30:20 -0000 1.3 @@ -1,2 +1 @@ -zoo_2.10-9.diff.gz -zoo_2.10.orig.tar.gz +zoo.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zoo/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:41 -0000 1.2 +++ sources 4 Mar 2006 13:30:20 -0000 1.3 @@ -1,2 +1 @@ -2dca488e015f6d6079fb3b2106bcbc5e zoo_2.10-9.diff.gz -dca5f2cf71379a51ea1e66b25f1e0294 zoo_2.10.orig.tar.gz +9419da66d2de4c59b405d5c59845a828 zoo.tar.gz Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/devel/zoo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- zoo.spec 26 Feb 2006 22:41:20 -0000 1.9 +++ zoo.spec 4 Mar 2006 13:30:20 -0000 1.10 @@ -1,33 +1,45 @@ Name: zoo Version: 2.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving License: Distributable -Source: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10.orig.tar.gz -Patch0: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10-9.diff.gz -Patch1: zoo-2.10-tempfile.patch -Patch2: zoo-gcc4.patch -Patch3: zoo-2.10-pathsize-security.patch +# There is no zoo upstream anymore so let's not pretend we have an authoritative source +# This zoo.tar.gz archive was taken from opensuse +Source: zoo.tar.gz +Patch0: zoo.patch +Patch1: zoo-%{version}-tempfile.patch +Patch2: zoo-gcc.patch +Patch3: zoo-%{version}-CAN-2005-2349.patch +Patch4: zoo-return.patch +Patch5: zoo-security_pathsize.patch +Patch6: zoo-%{version}-febz-183426.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %description zoo is a file archiving utility for maintaining collections of files. It uses Lempel-Ziv compression to provide space savings in the range of 20 to 80 percent depending on the type of data. Written by Rahul Dhesi, and posted to the USENET newsgroup comp.sources.misc. + %prep -%setup -n zoo-2.10.orig -%patch0 -p1 -b .debian -%patch1 -p1 -b .tempfile +%setup -q -n %{name} +%patch0 +%patch1 -p1 %patch2 -p1 -b .gcc4 -%patch3 -p1 -b .pathsize +%patch3 -b .can +%patch4 +%patch5 -b .pathsize +%patch6 -p1 -b .febz183426 + %build make %{?_smp_mflags} OPTIM="%{optflags}" linux + %install rm -fr %{buildroot} install -d -m 0755 %{buildroot}%{_bindir} \ @@ -36,15 +48,24 @@ install -m 0755 fiz zoo %{buildroot}%{_bindir}/ install -m 0644 fiz.1 zoo.1 %{buildroot}%{_mandir}/man1/ + %clean rm -fr %{buildroot} + %files %defattr(0644, root, root, 0755) %doc %{_mandir}/man1/* %attr(0755,root,root) %{_bindir}/* + %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 +- rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice + cleanups +- drop our fix to CVE-2006-0855 for the OpenSuse one +- add bug #183109 fix + * Sun Feb 26 2006 Nicolas Mailhot - 2.10-6 - apply preliminary patch for bug #183109 (just to be sure) --- zoo-2.10-pathsize-security.patch DELETED --- --- zoo-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 13:38:42 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 08:38:42 -0500 Subject: rpms/zoo import.log,1.10,1.11 Message-ID: <200603041339.k24DdE0p032104@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32052 Modified Files: import.log Log Message: auto-import zoo-2.10-7.fc4 on branch FC-4 from zoo-2.10-7.fc4.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- import.log 4 Mar 2006 13:30:14 -0000 1.10 +++ import.log 4 Mar 2006 13:38:42 -0000 1.11 @@ -7,3 +7,4 @@ zoo-2_10-6_fc4:FC-4:zoo-2.10-6.fc4.src.rpm:1140993767 zoo-2_10-6_fc3:FC-3:zoo-2.10-6.fc3.src.rpm:1140993865 zoo-2_10-7_fc5:HEAD:zoo-2.10-7.fc5.src.rpm:1141479004 +zoo-2_10-7_fc4:FC-4:zoo-2.10-7.fc4.src.rpm:1141479512 From fedora-extras-commits at redhat.com Sat Mar 4 13:38:49 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 08:38:49 -0500 Subject: rpms/zoo/FC-4 zoo-2.10-CAN-2005-2349.patch, NONE, 1.1 zoo-2.10-febz-183426.patch, NONE, 1.1 zoo-gcc.patch, NONE, 1.1 zoo-return.patch, NONE, 1.1 zoo-security_pathsize.patch, NONE, 1.1 zoo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zoo.spec, 1.7, 1.8 zoo-2.10-pathsize-security.patch, 1.1, NONE zoo-gcc4.patch, 1.1, NONE Message-ID: <200603041339.k24DdL1j032109@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32052/FC-4 Modified Files: .cvsignore sources zoo.spec Added Files: zoo-2.10-CAN-2005-2349.patch zoo-2.10-febz-183426.patch zoo-gcc.patch zoo-return.patch zoo-security_pathsize.patch zoo.patch Removed Files: zoo-2.10-pathsize-security.patch zoo-gcc4.patch Log Message: auto-import zoo-2.10-7.fc4 on branch FC-4 from zoo-2.10-7.fc4.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix zoo-2.10-CAN-2005-2349.patch: --- NEW FILE zoo-2.10-CAN-2005-2349.patch --- --- portable.c +++ portable.c @@ -364,6 +364,31 @@ show_dir(direntry); } #endif + char *p; + /* take off '../' */ + while ((p = strstr( direntry->dirname, "../" )) != NULL) { + while (*(p+3) != '\0') { + *p = *(p + 3); + p++; + } + *p = *(p+3); /* move last null */ + //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname); + } + /* take off '/' */ + if ( direntry->dirname[0] == '/' ) { + p = direntry->dirname; + while (*p != '\0') { + *p = *(p + 1); + p++; + } + *p = *(p+1); /* move last null */ + //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname); + } + /* take off '..' */ + if(!strcmp(direntry->dirname, "..")) + direntry->dirname[0] = '\0'; + /* direntry->dirlen = strlen(direntry->dirname); */ + return (0); } zoo-2.10-febz-183426.patch: --- NEW FILE zoo-2.10-febz-183426.patch --- diff -uNr zoo/parse.c zoo.new/parse.c --- zoo/parse.c 1991-07-11 21:07:34.000000000 +0200 +++ zoo.new/parse.c 2006-03-04 14:17:50.000000000 +0100 @@ -39,7 +39,7 @@ char *namep; /* points to relevant part of tempname */ char *p; - strcpy (tempname, fname); + strncpy(tempname, fname, LFNAMESIZE); #ifdef DEBUG printf ("parse: supplied name is [%s].\n", tempname); zoo-gcc.patch: --- NEW FILE zoo-gcc.patch --- diff -uNr zoo.orig/makefile zoo/makefile --- zoo.orig/makefile 1992-07-27 06:01:40.000000000 +0200 +++ zoo/makefile 2002-11-25 16:41:06.000000000 +0100 @@ -21,7 +21,7 @@ CC = cc CFLAGS = MODEL = -EXTRA = -DBIG_MEM -DNDEBUG +EXTRA = -DBIG_MEM -DNDEBUG -DANSI_PROTO LINTFLAGS = -DLINT OPTIM = -O DESTDIR = /usr/local/bin diff -uNr zoo.orig/options.h zoo/options.h --- zoo.orig/options.h 1991-07-11 21:07:32.000000000 +0200 +++ zoo/options.h 2002-11-25 16:41:30.000000000 +0100 @@ -104,7 +104,7 @@ #define GETTZ #define FATTR #define T_SIGNAL int -#define VARARGS +#define STDARG #define NEED_MEMMOVE #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY zoo-return.patch: --- NEW FILE zoo-return.patch --- --- ar.h +++ ar.h @@ -116,7 +116,9 @@ void move_left(); #else # define MOVE_LEFT memmove +# ifndef ANSI_HDRS extern VOIDPTR memmove(); +# endif #endif #if 0 --- bsd.c +++ bsd.c @@ -104,4 +104,5 @@ seekpos = lseek(fd, 0L, SEEK_CUR); if (seekpos >= 0) return ftruncate(fd, seekpos); + return 0; } --- mstime.i +++ mstime.i @@ -12,6 +12,7 @@ Function mstime() converts time in seconds since January 1 of BASEYEAR to MS-DOS format date and time. */ +void mstime(longtime, date, time) long longtime; /* input: seconds since Jan 1, BASEYEAR */ int *date, *time; /* output: MS-DOS format date and time */ --- nixtime.i +++ nixtime.i @@ -36,6 +36,7 @@ (tm->tm_hour << 11); } + return 0; } /***************** --- options.h +++ options.h @@ -157,11 +157,13 @@ #define GETTZ #define FATTR #define T_SIGNAL void +#define STDARG /* #define VARARGS */ /* #define NEED_MEMMOVE */ #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY /* #define NEED_VPRINTF */ +#define BSD4_3 /* for I/O definitions */ #endif /* BSD4_4 */ /***********************************************************************/ zoo-security_pathsize.patch: --- NEW FILE zoo-security_pathsize.patch --- --- misc.c +++ misc.c @@ -135,11 +135,17 @@ char *fullpath (direntry) struct direntry *direntry; { - static char result[PATHSIZE]; + static char result[PATHSIZE+LFNAMESIZE+12]; /* Room for enough space.*/ combine (result, direntry->dirlen != 0 ? direntry->dirname : "", (direntry->namlen != 0) ? direntry->lfname : direntry->fname ); + + if (strlen (result) >= PATHSIZE) { + prterror ('f', "Combined dirname and filename too long!\n"); + *result = '\0'; + } + return (result); } zoo.patch: --- NEW FILE zoo.patch --- --- basename.c +++ basename.c @@ -18,7 +18,7 @@ /* This function strips device/directory information from a pathname and returns just the plain filename */ -void basename (pathname, fname) +void my_basename (pathname, fname) char *pathname; char fname[]; { --- makefile +++ makefile @@ -18,13 +18,13 @@ MAKE = make # needed for some systems e.g. older BSD -CC = cc +CC = gcc CFLAGS = MODEL = EXTRA = -DBIG_MEM -DNDEBUG LINTFLAGS = -DLINT OPTIM = -O -DESTDIR = /usr/local/bin +DESTDIR = /usr/bin #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ @@ -107,10 +107,10 @@ convex: $(MAKE) CFLAGS="-c $(OPTIM) -DBSD4_3 -DANSI_HDRS" $(TARGETS) -# Linux 0.96c, gcc 2.2.2 +# Linux 2.0.0, gcc 2.7.2 linux: $(MAKE) \ - CFLAGS="-c -O2 -DBSD4_3 -DANSI_HDRS -DLINUX" \ + CFLAGS="-c $(OPTIM) -DBSD4_4 -DANSI_HDRS -DLINUX" \ $(TARGETS) # linux as above, static linked --- options.h +++ options.h @@ -89,7 +89,7 @@ /***********************************************************************/ #ifdef BSD4_3 -#define NOSTRCHR /* not really needed for 4.3BSD */ +/* #define NOSTRCHR */ /* not really needed for 4.3BSD */ #define FILTER #define IO_MACROS #define EXISTS(f) (access(f, 00) == 0) --- various.h +++ various.h @@ -26,6 +26,7 @@ #ifdef ANSI_HDRS /* if not defined in stdio.h */ # include # include +# include #else FILE *fdopen PARMS ((int, char *)); FILE *fopen PARMS ((char *, char *)); --- zooadd.c +++ zooadd.c @@ -132,7 +132,7 @@ if (zoo_file == NOFILE) prterror ('f', could_not_open, zoo_path); -basename(zoo_path, zoo_fname); /* get basename of archive */ +my_basename(zoo_path, zoo_fname); /* get basename of archive */ rootname (zoo_path, zoo_bak); /* name without extension */ strcat (zoo_bak, BACKUP_EXT); /* name of backup of this archive */ @@ -222,7 +222,7 @@ break; } - basename (this_path, this_fname); /* get just filename for later */ + my_basename (this_path, this_fname); /* get just filename for later */ this_file = zooopen(this_path, Z_READ); if (this_file == NOFILE) { --- zoofns.h +++ zoofns.h @@ -85,7 +85,7 @@ void addfname PARMS ((char *, long, unsigned int, unsigned int, unsigned, unsigned)); void add_version PARMS ((char *, struct direntry *)); -void basename PARMS ((char *, char [])); +void my_basename PARMS ((char *, char [])); void break_off PARMS ((void)); void close_file PARMS ((ZOOFILE)); void comment PARMS ((char *, char *)); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:41 -0000 1.2 +++ .cvsignore 4 Mar 2006 13:38:48 -0000 1.3 @@ -1,2 +1 @@ -zoo_2.10-9.diff.gz -zoo_2.10.orig.tar.gz +zoo.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:41 -0000 1.2 +++ sources 4 Mar 2006 13:38:48 -0000 1.3 @@ -1,2 +1 @@ -2dca488e015f6d6079fb3b2106bcbc5e zoo_2.10-9.diff.gz -dca5f2cf71379a51ea1e66b25f1e0294 zoo_2.10.orig.tar.gz +9419da66d2de4c59b405d5c59845a828 zoo.tar.gz Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-4/zoo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- zoo.spec 26 Feb 2006 22:43:03 -0000 1.7 +++ zoo.spec 4 Mar 2006 13:38:48 -0000 1.8 @@ -1,33 +1,45 @@ Name: zoo Version: 2.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving License: Distributable -Source: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10.orig.tar.gz -Patch0: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10-9.diff.gz -Patch1: zoo-2.10-tempfile.patch -Patch2: zoo-gcc4.patch -Patch3: zoo-2.10-pathsize-security.patch +# There is no zoo upstream anymore so let's not pretend we have an authoritative source +# This zoo.tar.gz archive was taken from opensuse +Source: zoo.tar.gz +Patch0: zoo.patch +Patch1: zoo-%{version}-tempfile.patch +Patch2: zoo-gcc.patch +Patch3: zoo-%{version}-CAN-2005-2349.patch +Patch4: zoo-return.patch +Patch5: zoo-security_pathsize.patch +Patch6: zoo-%{version}-febz-183426.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %description zoo is a file archiving utility for maintaining collections of files. It uses Lempel-Ziv compression to provide space savings in the range of 20 to 80 percent depending on the type of data. Written by Rahul Dhesi, and posted to the USENET newsgroup comp.sources.misc. + %prep -%setup -n zoo-2.10.orig -%patch0 -p1 -b .debian -%patch1 -p1 -b .tempfile +%setup -q -n %{name} +%patch0 +%patch1 -p1 %patch2 -p1 -b .gcc4 -%patch3 -p1 -b .pathsize +%patch3 -b .can +%patch4 +%patch5 -b .pathsize +%patch6 -p1 -b .febz183426 + %build make %{?_smp_mflags} OPTIM="%{optflags}" linux + %install rm -fr %{buildroot} install -d -m 0755 %{buildroot}%{_bindir} \ @@ -36,15 +48,24 @@ install -m 0755 fiz zoo %{buildroot}%{_bindir}/ install -m 0644 fiz.1 zoo.1 %{buildroot}%{_mandir}/man1/ + %clean rm -fr %{buildroot} + %files %defattr(0644, root, root, 0755) %doc %{_mandir}/man1/* %attr(0755,root,root) %{_bindir}/* + %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 +- rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice + cleanups +- drop our fix to CVE-2006-0855 for the OpenSuse one +- add bug #183109 fix + * Sun Feb 26 2006 Nicolas Mailhot - 2.10-6 - apply preliminary patch for bug #183109 (just to be sure) --- zoo-2.10-pathsize-security.patch DELETED --- --- zoo-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 13:42:08 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 08:42:08 -0500 Subject: rpms/zoo import.log,1.11,1.12 Message-ID: <200603041342.k24DgeF0032287@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32233 Modified Files: import.log Log Message: auto-import zoo-2.10-7.fc3 on branch FC-3 from zoo-2.10-7.fc3.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- import.log 4 Mar 2006 13:38:42 -0000 1.11 +++ import.log 4 Mar 2006 13:42:08 -0000 1.12 @@ -8,3 +8,4 @@ zoo-2_10-6_fc3:FC-3:zoo-2.10-6.fc3.src.rpm:1140993865 zoo-2_10-7_fc5:HEAD:zoo-2.10-7.fc5.src.rpm:1141479004 zoo-2_10-7_fc4:FC-4:zoo-2.10-7.fc4.src.rpm:1141479512 +zoo-2_10-7_fc3:FC-3:zoo-2.10-7.fc3.src.rpm:1141479718 From fedora-extras-commits at redhat.com Sat Mar 4 13:42:14 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 08:42:14 -0500 Subject: rpms/zoo/FC-3 zoo-2.10-CAN-2005-2349.patch, NONE, 1.1 zoo-2.10-febz-183426.patch, NONE, 1.1 zoo-gcc.patch, NONE, 1.1 zoo-return.patch, NONE, 1.1 zoo-security_pathsize.patch, NONE, 1.1 zoo.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 zoo.spec, 1.5, 1.6 zoo-2.10-pathsize-security.patch, 1.1, NONE zoo-gcc4.patch, 1.1, NONE Message-ID: <200603041342.k24DgkLp032294@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32233/FC-3 Modified Files: .cvsignore sources zoo.spec Added Files: zoo-2.10-CAN-2005-2349.patch zoo-2.10-febz-183426.patch zoo-gcc.patch zoo-return.patch zoo-security_pathsize.patch zoo.patch Removed Files: zoo-2.10-pathsize-security.patch zoo-gcc4.patch Log Message: auto-import zoo-2.10-7.fc3 on branch FC-3 from zoo-2.10-7.fc3.src.rpm rebase on opensuse package, CVE-2006-0855 fix #2, bz #183109 fix zoo-2.10-CAN-2005-2349.patch: --- NEW FILE zoo-2.10-CAN-2005-2349.patch --- --- portable.c +++ portable.c @@ -364,6 +364,31 @@ show_dir(direntry); } #endif + char *p; + /* take off '../' */ + while ((p = strstr( direntry->dirname, "../" )) != NULL) { + while (*(p+3) != '\0') { + *p = *(p + 3); + p++; + } + *p = *(p+3); /* move last null */ + //printf("zoo: skipped \"../\" path component in '%s'\n", direntry->dirname); + } + /* take off '/' */ + if ( direntry->dirname[0] == '/' ) { + p = direntry->dirname; + while (*p != '\0') { + *p = *(p + 1); + p++; + } + *p = *(p+1); /* move last null */ + //printf("zoo: skipped \"/\" path component in '%s'\n", direntry->dirname); + } + /* take off '..' */ + if(!strcmp(direntry->dirname, "..")) + direntry->dirname[0] = '\0'; + /* direntry->dirlen = strlen(direntry->dirname); */ + return (0); } zoo-2.10-febz-183426.patch: --- NEW FILE zoo-2.10-febz-183426.patch --- diff -uNr zoo/parse.c zoo.new/parse.c --- zoo/parse.c 1991-07-11 21:07:34.000000000 +0200 +++ zoo.new/parse.c 2006-03-04 14:17:50.000000000 +0100 @@ -39,7 +39,7 @@ char *namep; /* points to relevant part of tempname */ char *p; - strcpy (tempname, fname); + strncpy(tempname, fname, LFNAMESIZE); #ifdef DEBUG printf ("parse: supplied name is [%s].\n", tempname); zoo-gcc.patch: --- NEW FILE zoo-gcc.patch --- diff -uNr zoo.orig/makefile zoo/makefile --- zoo.orig/makefile 1992-07-27 06:01:40.000000000 +0200 +++ zoo/makefile 2002-11-25 16:41:06.000000000 +0100 @@ -21,7 +21,7 @@ CC = cc CFLAGS = MODEL = -EXTRA = -DBIG_MEM -DNDEBUG +EXTRA = -DBIG_MEM -DNDEBUG -DANSI_PROTO LINTFLAGS = -DLINT OPTIM = -O DESTDIR = /usr/local/bin diff -uNr zoo.orig/options.h zoo/options.h --- zoo.orig/options.h 1991-07-11 21:07:32.000000000 +0200 +++ zoo/options.h 2002-11-25 16:41:30.000000000 +0100 @@ -104,7 +104,7 @@ #define GETTZ #define FATTR #define T_SIGNAL int -#define VARARGS +#define STDARG #define NEED_MEMMOVE #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY zoo-return.patch: --- NEW FILE zoo-return.patch --- --- ar.h +++ ar.h @@ -116,7 +116,9 @@ void move_left(); #else # define MOVE_LEFT memmove +# ifndef ANSI_HDRS extern VOIDPTR memmove(); +# endif #endif #if 0 --- bsd.c +++ bsd.c @@ -104,4 +104,5 @@ seekpos = lseek(fd, 0L, SEEK_CUR); if (seekpos >= 0) return ftruncate(fd, seekpos); + return 0; } --- mstime.i +++ mstime.i @@ -12,6 +12,7 @@ Function mstime() converts time in seconds since January 1 of BASEYEAR to MS-DOS format date and time. */ +void mstime(longtime, date, time) long longtime; /* input: seconds since Jan 1, BASEYEAR */ int *date, *time; /* output: MS-DOS format date and time */ --- nixtime.i +++ nixtime.i @@ -36,6 +36,7 @@ (tm->tm_hour << 11); } + return 0; } /***************** --- options.h +++ options.h @@ -157,11 +157,13 @@ #define GETTZ #define FATTR #define T_SIGNAL void +#define STDARG /* #define VARARGS */ /* #define NEED_MEMMOVE */ #define T_UINT16 unsigned short /* must be 16 bit unsigned */ #define HAVE_ISATTY /* #define NEED_VPRINTF */ +#define BSD4_3 /* for I/O definitions */ #endif /* BSD4_4 */ /***********************************************************************/ zoo-security_pathsize.patch: --- NEW FILE zoo-security_pathsize.patch --- --- misc.c +++ misc.c @@ -135,11 +135,17 @@ char *fullpath (direntry) struct direntry *direntry; { - static char result[PATHSIZE]; + static char result[PATHSIZE+LFNAMESIZE+12]; /* Room for enough space.*/ combine (result, direntry->dirlen != 0 ? direntry->dirname : "", (direntry->namlen != 0) ? direntry->lfname : direntry->fname ); + + if (strlen (result) >= PATHSIZE) { + prterror ('f', "Combined dirname and filename too long!\n"); + *result = '\0'; + } + return (result); } zoo.patch: --- NEW FILE zoo.patch --- --- basename.c +++ basename.c @@ -18,7 +18,7 @@ /* This function strips device/directory information from a pathname and returns just the plain filename */ -void basename (pathname, fname) +void my_basename (pathname, fname) char *pathname; char fname[]; { --- makefile +++ makefile @@ -18,13 +18,13 @@ MAKE = make # needed for some systems e.g. older BSD -CC = cc +CC = gcc CFLAGS = MODEL = EXTRA = -DBIG_MEM -DNDEBUG LINTFLAGS = -DLINT OPTIM = -O -DESTDIR = /usr/local/bin +DESTDIR = /usr/bin #List of all object files created for Zoo ZOOOBJS = addbfcrc.o addfname.o basename.o comment.o crcdefs.o \ @@ -107,10 +107,10 @@ convex: $(MAKE) CFLAGS="-c $(OPTIM) -DBSD4_3 -DANSI_HDRS" $(TARGETS) -# Linux 0.96c, gcc 2.2.2 +# Linux 2.0.0, gcc 2.7.2 linux: $(MAKE) \ - CFLAGS="-c -O2 -DBSD4_3 -DANSI_HDRS -DLINUX" \ + CFLAGS="-c $(OPTIM) -DBSD4_4 -DANSI_HDRS -DLINUX" \ $(TARGETS) # linux as above, static linked --- options.h +++ options.h @@ -89,7 +89,7 @@ /***********************************************************************/ #ifdef BSD4_3 -#define NOSTRCHR /* not really needed for 4.3BSD */ +/* #define NOSTRCHR */ /* not really needed for 4.3BSD */ #define FILTER #define IO_MACROS #define EXISTS(f) (access(f, 00) == 0) --- various.h +++ various.h @@ -26,6 +26,7 @@ #ifdef ANSI_HDRS /* if not defined in stdio.h */ # include # include +# include #else FILE *fdopen PARMS ((int, char *)); FILE *fopen PARMS ((char *, char *)); --- zooadd.c +++ zooadd.c @@ -132,7 +132,7 @@ if (zoo_file == NOFILE) prterror ('f', could_not_open, zoo_path); -basename(zoo_path, zoo_fname); /* get basename of archive */ +my_basename(zoo_path, zoo_fname); /* get basename of archive */ rootname (zoo_path, zoo_bak); /* name without extension */ strcat (zoo_bak, BACKUP_EXT); /* name of backup of this archive */ @@ -222,7 +222,7 @@ break; } - basename (this_path, this_fname); /* get just filename for later */ + my_basename (this_path, this_fname); /* get just filename for later */ this_file = zooopen(this_path, Z_READ); if (this_file == NOFILE) { --- zoofns.h +++ zoofns.h @@ -85,7 +85,7 @@ void addfname PARMS ((char *, long, unsigned int, unsigned int, unsigned, unsigned)); void add_version PARMS ((char *, struct direntry *)); -void basename PARMS ((char *, char [])); +void my_basename PARMS ((char *, char [])); void break_off PARMS ((void)); void close_file PARMS ((ZOOFILE)); void comment PARMS ((char *, char *)); Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:36:41 -0000 1.2 +++ .cvsignore 4 Mar 2006 13:42:13 -0000 1.3 @@ -1,2 +1 @@ -zoo_2.10-9.diff.gz -zoo_2.10.orig.tar.gz +zoo.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:36:41 -0000 1.2 +++ sources 4 Mar 2006 13:42:13 -0000 1.3 @@ -1,2 +1 @@ -2dca488e015f6d6079fb3b2106bcbc5e zoo_2.10-9.diff.gz -dca5f2cf71379a51ea1e66b25f1e0294 zoo_2.10.orig.tar.gz +9419da66d2de4c59b405d5c59845a828 zoo.tar.gz Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-3/zoo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- zoo.spec 26 Feb 2006 22:44:41 -0000 1.5 +++ zoo.spec 4 Mar 2006 13:42:13 -0000 1.6 @@ -1,33 +1,45 @@ Name: zoo Version: 2.10 -Release: 6%{?dist} +Release: 7%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving License: Distributable -Source: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10.orig.tar.gz -Patch0: ftp://ftp.debian.org/debian/pool/non-free/z/zoo/zoo_2.10-9.diff.gz -Patch1: zoo-2.10-tempfile.patch -Patch2: zoo-gcc4.patch -Patch3: zoo-2.10-pathsize-security.patch +# There is no zoo upstream anymore so let's not pretend we have an authoritative source +# This zoo.tar.gz archive was taken from opensuse +Source: zoo.tar.gz +Patch0: zoo.patch +Patch1: zoo-%{version}-tempfile.patch +Patch2: zoo-gcc.patch +Patch3: zoo-%{version}-CAN-2005-2349.patch +Patch4: zoo-return.patch +Patch5: zoo-security_pathsize.patch +Patch6: zoo-%{version}-febz-183426.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + %description zoo is a file archiving utility for maintaining collections of files. It uses Lempel-Ziv compression to provide space savings in the range of 20 to 80 percent depending on the type of data. Written by Rahul Dhesi, and posted to the USENET newsgroup comp.sources.misc. + %prep -%setup -n zoo-2.10.orig -%patch0 -p1 -b .debian -%patch1 -p1 -b .tempfile +%setup -q -n %{name} +%patch0 +%patch1 -p1 %patch2 -p1 -b .gcc4 -%patch3 -p1 -b .pathsize +%patch3 -b .can +%patch4 +%patch5 -b .pathsize +%patch6 -p1 -b .febz183426 + %build make %{?_smp_mflags} OPTIM="%{optflags}" linux + %install rm -fr %{buildroot} install -d -m 0755 %{buildroot}%{_bindir} \ @@ -36,15 +48,24 @@ install -m 0755 fiz zoo %{buildroot}%{_bindir}/ install -m 0644 fiz.1 zoo.1 %{buildroot}%{_mandir}/man1/ + %clean rm -fr %{buildroot} + %files %defattr(0644, root, root, 0755) %doc %{_mandir}/man1/* %attr(0755,root,root) %{_bindir}/* + %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 +- rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice + cleanups +- drop our fix to CVE-2006-0855 for the OpenSuse one +- add bug #183109 fix + * Sun Feb 26 2006 Nicolas Mailhot - 2.10-6 - apply preliminary patch for bug #183109 (just to be sure) --- zoo-2.10-pathsize-security.patch DELETED --- --- zoo-gcc4.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 14:16:13 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:16:13 -0500 Subject: rpms/zoo import.log,1.12,1.13 Message-ID: <200603041416.k24EGjQd001975@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1926 Modified Files: import.log Log Message: auto-import zoo-2.10-8.fc3 on branch FC-3 from zoo-2.10-8.fc3.src.rpm use FORTIFY_SOURCE Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- import.log 4 Mar 2006 13:42:08 -0000 1.12 +++ import.log 4 Mar 2006 14:16:12 -0000 1.13 @@ -9,3 +9,4 @@ zoo-2_10-7_fc5:HEAD:zoo-2.10-7.fc5.src.rpm:1141479004 zoo-2_10-7_fc4:FC-4:zoo-2.10-7.fc4.src.rpm:1141479512 zoo-2_10-7_fc3:FC-3:zoo-2.10-7.fc3.src.rpm:1141479718 +zoo-2_10-8_fc3:FC-3:zoo-2.10-8.fc3.src.rpm:1141481750 From fedora-extras-commits at redhat.com Sat Mar 4 14:16:19 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:16:19 -0500 Subject: rpms/zoo/FC-3 zoo.spec,1.6,1.7 Message-ID: <200603041416.k24EGp9q001987@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1926/FC-3 Modified Files: zoo.spec Log Message: auto-import zoo-2.10-8.fc3 on branch FC-3 from zoo-2.10-8.fc3.src.rpm use FORTIFY_SOURCE Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-3/zoo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- zoo.spec 4 Mar 2006 13:42:13 -0000 1.6 +++ zoo.spec 4 Mar 2006 14:16:19 -0000 1.7 @@ -1,6 +1,6 @@ Name: zoo Version: 2.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving @@ -37,7 +37,7 @@ %build -make %{?_smp_mflags} OPTIM="%{optflags}" linux +make %{?_smp_mflags} OPTIM="%{optflags} -D__FORTIFY_SOURCE=2" linux %install @@ -60,6 +60,9 @@ %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-8 +- force FORTIFY_SOURCE use one FC3 + * Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 - rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice cleanups From fedora-extras-commits at redhat.com Sat Mar 4 14:20:18 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:20:18 -0500 Subject: rpms/zoo import.log,1.13,1.14 Message-ID: <200603041420.k24EKpwr002096@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2064 Modified Files: import.log Log Message: auto-import zoo-2.10-8.fc5 on branch devel from zoo-2.10-8.fc5.src.rpm use -fstack-protector-all Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- import.log 4 Mar 2006 14:16:12 -0000 1.13 +++ import.log 4 Mar 2006 14:20:18 -0000 1.14 @@ -10,3 +10,4 @@ zoo-2_10-7_fc4:FC-4:zoo-2.10-7.fc4.src.rpm:1141479512 zoo-2_10-7_fc3:FC-3:zoo-2.10-7.fc3.src.rpm:1141479718 zoo-2_10-8_fc3:FC-3:zoo-2.10-8.fc3.src.rpm:1141481750 +zoo-2_10-8_fc5:HEAD:zoo-2.10-8.fc5.src.rpm:1141482007 From fedora-extras-commits at redhat.com Sat Mar 4 14:20:24 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:20:24 -0500 Subject: rpms/zoo/devel zoo.spec,1.10,1.11 Message-ID: <200603041420.k24EKuxS002099@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2064/devel Modified Files: zoo.spec Log Message: auto-import zoo-2.10-8.fc5 on branch devel from zoo-2.10-8.fc5.src.rpm use -fstack-protector-all Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/devel/zoo.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- zoo.spec 4 Mar 2006 13:30:20 -0000 1.10 +++ zoo.spec 4 Mar 2006 14:20:24 -0000 1.11 @@ -1,6 +1,6 @@ Name: zoo Version: 2.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving @@ -37,7 +37,7 @@ %build -make %{?_smp_mflags} OPTIM="%{optflags}" linux +make %{?_smp_mflags} OPTIM="-fstack-protector-all %{optflags}" linux %install @@ -60,6 +60,9 @@ %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-8 +- use -fstack-protector-all + * Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 - rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice cleanups From fedora-extras-commits at redhat.com Sat Mar 4 14:22:18 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:22:18 -0500 Subject: rpms/zoo import.log,1.14,1.15 Message-ID: <200603041422.k24EMor9002187@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2154 Modified Files: import.log Log Message: auto-import zoo-2.10-8.fc4 on branch FC-4 from zoo-2.10-8.fc4.src.rpm noop Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zoo/import.log,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- import.log 4 Mar 2006 14:20:18 -0000 1.14 +++ import.log 4 Mar 2006 14:22:17 -0000 1.15 @@ -11,3 +11,4 @@ zoo-2_10-7_fc3:FC-3:zoo-2.10-7.fc3.src.rpm:1141479718 zoo-2_10-8_fc3:FC-3:zoo-2.10-8.fc3.src.rpm:1141481750 zoo-2_10-8_fc5:HEAD:zoo-2.10-8.fc5.src.rpm:1141482007 +zoo-2_10-8_fc4:FC-4:zoo-2.10-8.fc4.src.rpm:1141482127 From fedora-extras-commits at redhat.com Sat Mar 4 14:22:23 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 09:22:23 -0500 Subject: rpms/zoo/FC-4 zoo.spec,1.8,1.9 Message-ID: <200603041422.k24EMtWe002190@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/zoo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2154/FC-4 Modified Files: zoo.spec Log Message: auto-import zoo-2.10-8.fc4 on branch FC-4 from zoo-2.10-8.fc4.src.rpm noop Index: zoo.spec =================================================================== RCS file: /cvs/extras/rpms/zoo/FC-4/zoo.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- zoo.spec 4 Mar 2006 13:38:48 -0000 1.8 +++ zoo.spec 4 Mar 2006 14:22:23 -0000 1.9 @@ -1,6 +1,6 @@ Name: zoo Version: 2.10 -Release: 7%{?dist} +Release: 8%{?dist} Summary: File archiving utility with compression Group: Applications/Archiving @@ -60,6 +60,9 @@ %changelog +* Sat Mar 4 2006 Nicolas Mailhot - 2.10-8 +- bump release to follow FC-3 + * Sat Mar 4 2006 Nicolas Mailhot - 2.10-7 - rebase on OpenSuse 2.10-866 package as the OpenSuse team did some nice cleanups From fedora-extras-commits at redhat.com Sat Mar 4 14:38:30 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Sat, 4 Mar 2006 09:38:30 -0500 Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.8,1.9 Message-ID: <200603041439.k24Ed3bv002328@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2304 Modified Files: xmms-cdread.spec Log Message: added {%dist} after release and added libtool --finish Index: xmms-cdread.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xmms-cdread.spec 1 Mar 2006 17:07:38 -0000 1.8 +++ xmms-cdread.spec 4 Mar 2006 14:38:30 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Digital audio CD input plugin for XMMS Name: xmms-cdread Version: 0.14 -Release: 7 +Release: 8%{?dist} License: GPL Group: Applications/Multimedia @@ -35,12 +35,11 @@ perl -pi -e 's/^(CFLAGS.*)-O2(.*)/$1\$\(RPM_OPT_FLAGS\)$2/' Makefile make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - +libtool --finish $RPM_BUILD_ROOT/usr/lib64/xmms/Input %clean rm -rf $RPM_BUILD_ROOT @@ -54,6 +53,10 @@ %changelog +* Sat Mar 4 2006 Joost Soeterbroek - 0.14-8 +- added libtool --finish +- added dist after release + * Wed Mar 1 2006 Joost Soeterbroek - 0.14-7 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sat Mar 4 14:57:24 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Mar 2006 09:57:24 -0500 Subject: owners owners.list,1.703,1.704 Message-ID: <200603041457.k24EvuOe002436@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2419 Modified Files: owners.list Log Message: Taking gkrellm-themes. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.703 retrieving revision 1.704 diff -u -r1.703 -r1.704 --- owners.list 4 Mar 2006 08:25:23 -0000 1.703 +++ owners.list 4 Mar 2006 14:57:24 -0000 1.704 @@ -312,7 +312,7 @@ 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|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org| -Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|extras-orphan at fedoraproject.org|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|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 4 15:04:07 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 4 Mar 2006 10:04:07 -0500 Subject: rpms/gkrellm-themes/devel gkrellm-themes.spec,1.8,1.9 Message-ID: <200603041504.k24F4dnF004319@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/gkrellm-themes/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4302 Modified Files: gkrellm-themes.spec Log Message: * Sat Mar 4 2006 Ville Skytt?? - 2.1.9-4 - Rebuild, cosmetic specfile improvements. Index: gkrellm-themes.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-themes/devel/gkrellm-themes.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gkrellm-themes.spec 2 Mar 2006 21:29:16 -0000 1.8 +++ gkrellm-themes.spec 4 Mar 2006 15:04:06 -0000 1.9 @@ -1,15 +1,16 @@ -Summary: Some themes for the GNU Krell Monitor Name: gkrellm-themes Version: 2.1.9 -Release: 3 +Release: 4 +Summary: Themes for the GNU Krell Monitor -License: GPL Group: Applications/System -Source: http://muhri.net/gkrellm/GKrellM-Skins.tar.gz +License: GPL URL: http://muhri.net/gkrellm/ +Source0: http://muhri.net/gkrellm/GKrellM-Skins.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: gkrellm >= 2.0.0 + BuildArch: noarch +Requires: gkrellm >= 2.0.0 %description GKrellM charts SMP CPU, load, Disk, and all active net interfaces @@ -23,13 +24,6 @@ %prep -cat< - 2.1.9-4 +- Rebuild, cosmetic specfile improvements. + * Tue Jan 17 2006 Ville Skytt?? - 2.1.9-3 - Switch to latest (2003-01-29) muhri.net tarball. - Remove more backup etc junk from installed files. From fedora-extras-commits at redhat.com Sat Mar 4 15:27:57 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Sat, 4 Mar 2006 10:27:57 -0500 Subject: rpms/gai-pal/devel gai-pal.spec,1.12,1.13 Message-ID: <200603041528.k24FSYo7004473@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/gai-pal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4456 Modified Files: gai-pal.spec Log Message: Rebuild for FE 5 Index: gai-pal.spec =================================================================== RCS file: /cvs/extras/rpms/gai-pal/devel/gai-pal.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gai-pal.spec 12 Feb 2006 21:38:32 -0000 1.12 +++ gai-pal.spec 4 Mar 2006 15:27:56 -0000 1.13 @@ -3,7 +3,7 @@ Summary: GAI Pal applet Name: gai-pal Version: 0.7 -Release: 8 +Release: 9 Source0: %{name}-%{version}.tar.bz2 Patch0: gai-pal-0.7-xosd-empty-msg.patch Patch1: gai-pal-0.7-typo.patch @@ -48,6 +48,9 @@ %{_datadir}/pixmaps/* %changelog +* Sat Mar 4 2006 Michel Salim - 0.7-9 +- Rebuild for Fedora Extras 5 + * Sun Feb 12 2006 Michel Salim - 0.7-8 - rebuild against new gtk2 and gtkglext From fedora-extras-commits at redhat.com Sat Mar 4 15:42:18 2006 From: fedora-extras-commits at redhat.com (Matthias Haase (endur)) Date: Sat, 4 Mar 2006 10:42:18 -0500 Subject: rpms/streamtuner/devel streamtuner.spec,1.5,1.6 Message-ID: <200603041542.k24FgpBX004588@cvs-int.fedora.redhat.com> Author: endur Update of /cvs/extras/rpms/streamtuner/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4571 Modified Files: streamtuner.spec Log Message: Rebuild for Fedora Extras 5 Index: streamtuner.spec =================================================================== RCS file: /cvs/extras/rpms/streamtuner/devel/streamtuner.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- streamtuner.spec 18 Jan 2006 12:33:51 -0000 1.5 +++ streamtuner.spec 4 Mar 2006 15:42:18 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A stream directory browser Name: streamtuner Version: 0.99.99 -Release: 11%{?dist} +Release: 12%{?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 +* Sat Mar 4 2006 Matthias Haase - 0.99.99-12 +- Rebuild for Fedora Extras 5 + * Wed Jan 18 2006 Matthias Haase - 0.99.99-11 - only a sync of the version number with the increased one from FC3 From fedora-extras-commits at redhat.com Sat Mar 4 16:20:15 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:20:15 -0500 Subject: rpms/banshee - New directory Message-ID: <200603041620.k24GKHBB006745@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6737/banshee Log Message: Directory /cvs/extras/rpms/banshee added to the repository From fedora-extras-commits at redhat.com Sat Mar 4 16:20:21 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:20:21 -0500 Subject: rpms/banshee/devel - New directory Message-ID: <200603041620.k24GKNEc006760@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6737/banshee/devel Log Message: Directory /cvs/extras/rpms/banshee/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 4 16:20:47 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:20:47 -0500 Subject: rpms/banshee Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603041620.k24GKnJI006794@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6782 Added Files: Makefile import.log Log Message: Setup of module banshee --- NEW FILE Makefile --- # Top level Makefile for module banshee all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 4 16:20:53 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:20:53 -0500 Subject: rpms/banshee/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603041620.k24GKtBK006814@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6782/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module banshee --- NEW 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 Mar 4 16:22:20 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:22:20 -0500 Subject: rpms/banshee import.log,1.1,1.2 Message-ID: <200603041622.k24GMqJj006913@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6879 Modified Files: import.log Log Message: auto-import banshee-0.10.6-1 on branch devel from banshee-0.10.6-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/banshee/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 4 Mar 2006 16:20:47 -0000 1.1 +++ import.log 4 Mar 2006 16:22:20 -0000 1.2 @@ -0,0 +1 @@ +banshee-0_10_6-1:HEAD:banshee-0.10.6-1.src.rpm:1141489349 From fedora-extras-commits at redhat.com Sat Mar 4 16:22:26 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:22:26 -0500 Subject: rpms/banshee/devel banshee.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603041622.k24GMwpG006917@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6879/devel Modified Files: .cvsignore sources Added Files: banshee.spec Log Message: auto-import banshee-0.10.6-1 on branch devel from banshee-0.10.6-1.src.rpm --- NEW FILE banshee.spec --- Name: banshee Version: 0.10.6 Release: 1 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia License: MIT URL: http://banshee-project.org/ Source0: http://banshee-project.org/files/banshee/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ipod-sharp BuildRequires: avahi-sharp BuildRequires: libmusicbrainz-devel >= 2.1.1 BuildRequires: gtk-sharp2 BuildRequires: mono-devel >= 1.1.10 BuildRequires: mono-data BuildRequires: mono-data-sqlite BuildRequires: hal-devel BuildRequires: dbus-sharp >= 0.36.2 BuildRequires: sqlite-devel >= 3.3 BuildRequires: gstreamer-devel >= 0.10 BuildRequires: gstreamer-plugins-base-devel >= 0.10 BuildRequires: gnome-desktop-devel BuildRequires: nautilus-cd-burner-devel Requires(post): GConf2 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils %description Banshee allows you to import CDs, sync your music collection to an iPod, play music directly from an iPod, create playlists with songs from your library, and create audio and MP3 CDs from subsets of your library. %prep %setup -q %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure --disable-docs --with-gstreamer-0-10 make %{?_smp_mflags} %install %{__rm} -rf $RPM_BUILD_ROOT export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 %makeinstall desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ --add-only-show-in=GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/banshee.desktop %find_lang %name %clean %{__rm} -rf $RPM_BUILD_ROOT %post update-desktop-database %{_datadir}/applications export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` for schema in audioscrobbler.schemas banshee.schemas daap.schemas filesystemmonitor.schemas metadatasearch.schemas mmkeys.schemas; do gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$schema > /dev/null || : done 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 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 %files -f %{name}.lang %defattr(-,root,root,-) %doc COPYING %{_bindir}/banshee %{_libdir}/banshee %{_libdir}/pkgconfig/banshee.pc %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/* %{_datadir}/dbus-1/services/org.gnome.Banshee.service %{_sysconfdir}/gconf/schemas %exclude %{_libdir}/banshee/*.a %exclude %{_libdir}/banshee/*.la %changelog * Tue Feb 21 2006 Christopher Aillon 0.10.6-1 - Initial RPM Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 4 Mar 2006 16:20:53 -0000 1.1 +++ .cvsignore 4 Mar 2006 16:22:25 -0000 1.2 @@ -0,0 +1 @@ +banshee-0.10.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 4 Mar 2006 16:20:53 -0000 1.1 +++ sources 4 Mar 2006 16:22:25 -0000 1.2 @@ -0,0 +1 @@ +398b69c1818568b9d7a39c5e036de84b banshee-0.10.6.tar.gz From fedora-extras-commits at redhat.com Sat Mar 4 16:44:38 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:44:38 -0500 Subject: rpms/banshee/devel banshee.spec,1.1,1.2 Message-ID: <200603041645.k24GjAQ6007073@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7054 Modified Files: banshee.spec Log Message: * Sat Mar 4 2006 Christopher Aillon 0.10.6-2 - Rebuild Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- banshee.spec 4 Mar 2006 16:22:25 -0000 1.1 +++ banshee.spec 4 Mar 2006 16:44:37 -0000 1.2 @@ -1,6 +1,6 @@ Name: banshee Version: 0.10.6 -Release: 1 +Release: 2 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -94,5 +94,8 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Sat Mar 4 2006 Christopher Aillon 0.10.6-2 +- Rebuild + * Tue Feb 21 2006 Christopher Aillon 0.10.6-1 - Initial RPM From fedora-extras-commits at redhat.com Sat Mar 4 16:49:00 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Sat, 4 Mar 2006 11:49:00 -0500 Subject: owners owners.list,1.704,1.705 Message-ID: <200603041649.k24GnWtK007172@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7148 Modified Files: owners.list Log Message: updated hping2. took ownership Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.704 retrieving revision 1.705 diff -u -r1.704 -r1.705 --- owners.list 4 Mar 2006 14:57:24 -0000 1.704 +++ owners.list 4 Mar 2006 16:49:00 -0000 1.705 @@ -420,7 +420,7 @@ Fedora Extras|highlight|Universal source code to formatted text converter|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|hmmer|Profile HMM software for protein sequence analysis|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| Fedora Extras|hpic|Healpix manipulation binaries and library|matt at truch.net|extras-qa at fedoraproject.org| -Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|paul at xtdnet.nl|extras-qa at fedoraproject.org| Fedora Extras|hspell|A Hebrew spell checker|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| Fedora Extras|htb-util|Another tool to make your life easier with HTB|mihai at xcyb.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| From fedora-extras-commits at redhat.com Sat Mar 4 16:57:17 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Sat, 4 Mar 2006 11:57:17 -0500 Subject: owners owners.list,1.705,1.706 Message-ID: <200603041657.k24Gvov6007246@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7229 Modified Files: owners.list Log Message: New packages: banshee ipod-sharp libipoddevice Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.705 retrieving revision 1.706 diff -u -r1.705 -r1.706 --- owners.list 4 Mar 2006 16:49:00 -0000 1.705 +++ owners.list 4 Mar 2006 16:57:17 -0000 1.706 @@ -61,6 +61,7 @@ Fedora Extras|azureus|A BitTorrent Client|green at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org| Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org| +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| @@ -452,6 +453,7 @@ Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org| Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| +Fedora Extras|ipod-sharp|Provides high-level feature support for Apple's iPod and binds libipoddevice|caillon at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ipxripd|IPX RIP/SAP daemon - routing for IPX networks|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org| Fedora Extras|ircd-hybrid|Internet Relay Chat Server|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| @@ -560,6 +562,7 @@ 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|libifp|A general-purpose library-driver for iRiver's iFP portable audio players|ivazquez at ivazquez.net|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|libkexif|Allow Kipi plugins to extract EXIF information|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libkipi|Common plugin infrastructure for KDE image applications|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libksba|X.509 library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 4 17:05:51 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Sat, 4 Mar 2006 12:05:51 -0500 Subject: rpms/bin2iso/devel bin2iso.spec,1.7,1.8 Message-ID: <200603041706.k24H6PXa009115@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/bin2iso/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9098 Modified Files: bin2iso.spec Log Message: bin2iso/devel: release bump Index: bin2iso.spec =================================================================== RCS file: /cvs/extras/rpms/bin2iso/devel/bin2iso.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bin2iso.spec 6 Apr 2005 22:11:11 -0000 1.7 +++ bin2iso.spec 4 Mar 2006 17:05:50 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Convert ".bin" files into ISO or WAV Name: bin2iso Version: 1.9 -Release: 2.b +Release: 3.b%{dist} License: Distributable (Unknown) Group: Applications/File @@ -38,6 +38,9 @@ %changelog +* Sat Mar 4 2006 Dams - 1.9-3.b +- rebuilt for FC5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Sat Mar 4 19:34:50 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Mar 2006 14:34:50 -0500 Subject: owners owners.list,1.706,1.707 Message-ID: <200603041935.k24JZMxQ013569@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13552 Modified Files: owners.list Log Message: Taking ownership of abe Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.706 retrieving revision 1.707 diff -u -r1.706 -r1.707 --- owners.list 4 Mar 2006 16:57:17 -0000 1.706 +++ owners.list 4 Mar 2006 19:34:49 -0000 1.707 @@ -14,7 +14,7 @@ Fedora Extras|aalib|An ASCII art library|anvil at livna.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|abe|A scrolling, platform-jumping, ancient pyramid exploring game|extras-orphan at fedoraproject.org|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| Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|acpitool|A command line ACPI client for Linux|pertusus at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 4 19:55:24 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Mar 2006 14:55:24 -0500 Subject: rpms/abe/devel abe.spec,1.9,1.10 Message-ID: <200603041955.k24Jtu4a013674@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/abe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13655 Modified Files: abe.spec Log Message: Rebuild for FC5 Index: abe.spec =================================================================== RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- abe.spec 4 Mar 2006 13:26:41 -0000 1.9 +++ abe.spec 4 Mar 2006 19:55:24 -0000 1.10 @@ -1,6 +1,6 @@ Name: abe Version: 1.0 -Release: 5 +Release: 6%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games @@ -22,13 +22,6 @@ vaguely in the style of similar games for the Commodore+4. %prep -cat< 1.0-6 +- rebuild for FC5 + * Mon Apr 11 2005 Panu Matilainen 0:1.0-5 - fix build on gcc4 - patch to fix issues in #149362 From fedora-extras-commits at redhat.com Sat Mar 4 20:38:48 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 15:38:48 -0500 Subject: rpms/dejavu-fonts import.log,1.37,1.38 Message-ID: <200603042039.k24KdKXn015824@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15792 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.3-3.fc5 on branch devel from dejavu-fonts-2.3-3.fc5.src.rpm split fontconfig reg in separate package Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- import.log 4 Mar 2006 12:23:49 -0000 1.37 +++ import.log 4 Mar 2006 20:38:47 -0000 1.38 @@ -34,3 +34,4 @@ dejavu-fonts-2_2-4_fc4:FC-4:dejavu-fonts-2.2-4.fc4.src.rpm:1140271299 dejavu-fonts-2_3-1_fc5:HEAD:dejavu-fonts-2.3-1.fc5.src.rpm:1140419864 dejavu-fonts-2_3-2_fc5:HEAD:dejavu-fonts-2.3-2.fc5.src.rpm:1141475016 +dejavu-fonts-2_3-3_fc5:HEAD:dejavu-fonts-2.3-3.fc5.src.rpm:1141504717 From fedora-extras-commits at redhat.com Sat Mar 4 20:38:53 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Sat, 4 Mar 2006 15:38:53 -0500 Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.15,1.16 Message-ID: <200603042039.k24KdQ6s015827@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15792/devel Modified Files: dejavu-fonts.spec Log Message: auto-import dejavu-fonts-2.3-3.fc5 on branch devel from dejavu-fonts-2.3-3.fc5.src.rpm split fontconfig reg in separate package Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- dejavu-fonts.spec 4 Mar 2006 12:23:56 -0000 1.15 +++ dejavu-fonts.spec 4 Mar 2006 20:38:53 -0000 1.16 @@ -10,7 +10,7 @@ Name: dejavu-fonts Version: 2.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: DejaVu Fonts Group: User Interface/X License: Redistributable, with restrictions @@ -23,8 +23,6 @@ BuildRequires: perl-Font-TTF # Needed to compute unicode coverage BuildRequires: %{Blocks} %{UnicodeData} -# Needed for fontconfig alias registration -Requires: %{_bindir}/xsltproc, /bin/mktemp BuildArch: noarch Conflicts: fontconfig < 2.3.93 @@ -36,6 +34,18 @@ the process of collaborative develop +%package fontconfig +Group: User Interface/X +Summary: Files needed to register DejaVu fonts in fontconfig aliases +Requires: %{name} = %{version}-%{release} +# Needed for fontconfig alias registration +Requires: %{_bindir}/xsltproc, /bin/mktemp, %{_sysconfdir}/fonts/fonts.conf + + +%description fontconfig +This package will add DejaVu fonts to fontconfig aliases + + %prep %setup -q -n %{archivename}-%{version} @@ -86,7 +96,7 @@ fi -%triggerin -- fontconfig, %{_sysconfdir}/fonts/fonts.conf +%triggerin fontconfig -- fontconfig, %{_sysconfdir}/fonts/fonts.conf if [ -x %{_sysconfdir}/fonts/fonts.conf ] ; then TMPFILE=$(/bin/mktemp -q /tmp/fonts.conf.XXXXXX) && \ @@ -103,11 +113,17 @@ %dir %{fontdir} %{fontdir}/*.ttf + +%files fontconfig +%defattr(0644,root,root,0755) %dir %{xsldir} %{xsldir}/register-%{name}.xsl %changelog +* Sat Mar 04 2006 Nicolas Mailhot - 2.3-3 +- split fontconfig registration in subpackage + * Sat Mar 04 2006 Nicolas Mailhot - 2.3-2 - register dejavu in fontconfig aliases From fedora-extras-commits at redhat.com Sat Mar 4 21:24:50 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Mar 2006 16:24:50 -0500 Subject: rpms/abe/devel .cvsignore, 1.2, 1.3 abe.spec, 1.10, 1.11 sources, 1.2, 1.3 abe-1.0-datapath.patch, 1.1, NONE abe-1.0-gcc4.patch, 1.1, NONE abe-1.0-misc-fixes.patch, 1.1, NONE abe-1.0-tmppath.patch, 1.1, NONE Message-ID: <200603042125.k24LPMRK018144@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/abe/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18115 Modified Files: .cvsignore abe.spec sources Removed Files: abe-1.0-datapath.patch abe-1.0-gcc4.patch abe-1.0-misc-fixes.patch abe-1.0-tmppath.patch Log Message: Update to 1.1 which now includes the earlier 1.0 patches. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abe/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:01:10 -0000 1.2 +++ .cvsignore 4 Mar 2006 21:24:50 -0000 1.3 @@ -1 +1 @@ -abe-1_0.tar.gz +abe-1.1.tar.gz Index: abe.spec =================================================================== RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- abe.spec 4 Mar 2006 19:55:24 -0000 1.10 +++ abe.spec 4 Mar 2006 21:24:50 -0000 1.11 @@ -1,17 +1,13 @@ Name: abe -Version: 1.0 -Release: 6%{?dist} +Version: 1.1 +Release: 1%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games License: GPL URL: http://abe.sourceforge.net/ -Source0: http://download.sourceforge.net/abe/abe-1_0.tar.gz +Source0: http://dl.sourceforge.net/abe/abe-1.1.tar.gz Source1: %{name}.png -Patch0: %{name}-%{version}-datapath.patch -Patch1: %{name}-%{version}-tmppath.patch -Patch2: %{name}-%{version}-gcc4.patch -Patch3: %{name}-%{version}-misc-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3 @@ -22,29 +18,22 @@ vaguely in the style of similar games for the Commodore+4. %prep -%setup -q -n %{name}-1_0 -# Abe assumes it runs from its build directory and thus assumes everything -# is writable there etc.. ugh: -# Hardcode /usr/share/abe/ paths -%patch0 -p1 -b .datapath -# Write temporary image files into home directory, not data directory -%patch1 -p1 -b .tmppath -%patch2 -p1 -b .gcc4 -%patch3 -p1 -b .miscfix +%setup -q %build -%configure +%configure --with-data-dir=%{_datadir}/%{name} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + +# make install does not copy the game data files. mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ -mkdir -p $RPM_BUILD_ROOT/%{_bindir} cp -p -r images maps sounds $RPM_BUILD_ROOT/%{_datadir}/%{name} install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ -install -p -m 755 %{name} $RPM_BUILD_ROOT/%{_bindir}/ cat << EOF > %{name}.desktop [Desktop Entry] @@ -74,6 +63,9 @@ %{_datadir}/pixmaps/* %changelog +* Sat Mar 4 2006 Wart 1.1-1 +- Update to 1.1 + * Sat Mar 4 2006 Wart 1.0-6 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abe/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:01:10 -0000 1.2 +++ sources 4 Mar 2006 21:24:50 -0000 1.3 @@ -1 +1 @@ -a7e44d5e605b2d32fffdf46f019f7119 abe-1_0.tar.gz +5537920e1746708e1a631d84d3500f5c abe-1.1.tar.gz --- abe-1.0-datapath.patch DELETED --- --- abe-1.0-gcc4.patch DELETED --- --- abe-1.0-misc-fixes.patch DELETED --- --- abe-1.0-tmppath.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 4 23:10:56 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 4 Mar 2006 18:10:56 -0500 Subject: rpms/abe/FC-4 .cvsignore, 1.2, 1.3 abe.spec, 1.8, 1.9 sources, 1.2, 1.3 abe-1.0-datapath.patch, 1.1, NONE abe-1.0-gcc4.patch, 1.1, NONE abe-1.0-misc-fixes.patch, 1.1, NONE abe-1.0-tmppath.patch, 1.1, NONE Message-ID: <200603042311.k24NBSKC022460@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/abe/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22439 Modified Files: .cvsignore abe.spec sources Removed Files: abe-1.0-datapath.patch abe-1.0-gcc4.patch abe-1.0-misc-fixes.patch abe-1.0-tmppath.patch Log Message: Update to 1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abe/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:01:10 -0000 1.2 +++ .cvsignore 4 Mar 2006 23:10:55 -0000 1.3 @@ -1 +1 @@ -abe-1_0.tar.gz +abe-1.1.tar.gz Index: abe.spec =================================================================== RCS file: /cvs/extras/rpms/abe/FC-4/abe.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- abe.spec 12 Apr 2005 14:33:30 -0000 1.8 +++ abe.spec 4 Mar 2006 23:10:55 -0000 1.9 @@ -1,17 +1,13 @@ Name: abe -Version: 1.0 -Release: 5 +Version: 1.1 +Release: 1%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games License: GPL URL: http://abe.sourceforge.net/ -Source0: http://download.sourceforge.net/abe/abe-1_0.tar.gz +Source0: http://dl.sourceforge.net/abe/abe-1.1.tar.gz Source1: %{name}.png -Patch0: %{name}-%{version}-datapath.patch -Patch1: %{name}-%{version}-tmppath.patch -Patch2: %{name}-%{version}-gcc4.patch -Patch3: %{name}-%{version}-misc-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3 @@ -22,29 +18,22 @@ vaguely in the style of similar games for the Commodore+4. %prep -%setup -q -n %{name}-1_0 -# Abe assumes it runs from its build directory and thus assumes everything -# is writable there etc.. ugh: -# Hardcode /usr/share/abe/ paths -%patch0 -p1 -b .datapath -# Write temporary image files into home directory, not data directory -%patch1 -p1 -b .tmppath -%patch2 -p1 -b .gcc4 -%patch3 -p1 -b .miscfix +%setup -q %build -%configure +%configure --with-data-dir=%{_datadir}/%{name} make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install + +# make install does not copy the game data files. mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ -mkdir -p $RPM_BUILD_ROOT/%{_bindir} cp -p -r images maps sounds $RPM_BUILD_ROOT/%{_datadir}/%{name} install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ -install -p -m 755 %{name} $RPM_BUILD_ROOT/%{_bindir}/ cat << EOF > %{name}.desktop [Desktop Entry] @@ -74,6 +63,9 @@ %{_datadir}/pixmaps/* %changelog +* Sat Mar 4 2006 Wart 1.1-1 +- Update to 1.1 + * Mon Apr 11 2005 Panu Matilainen 0:1.0-5 - fix build on gcc4 - patch to fix issues in #149362 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abe/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:01:10 -0000 1.2 +++ sources 4 Mar 2006 23:10:55 -0000 1.3 @@ -1 +1 @@ -a7e44d5e605b2d32fffdf46f019f7119 abe-1_0.tar.gz +5537920e1746708e1a631d84d3500f5c abe-1.1.tar.gz --- abe-1.0-datapath.patch DELETED --- --- abe-1.0-gcc4.patch DELETED --- --- abe-1.0-misc-fixes.patch DELETED --- --- abe-1.0-tmppath.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 5 01:38:03 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 4 Mar 2006 20:38:03 -0500 Subject: rpms/proj/devel proj.spec,1.6,1.7 Message-ID: <200603050138.k251cZgN027194@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27177 Modified Files: proj.spec Log Message: Rebuild for Fedora Extras 5 Index: proj.spec =================================================================== RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- proj.spec 8 Jul 2005 05:23:35 -0000 1.6 +++ proj.spec 5 Mar 2006 01:38:02 -0000 1.7 @@ -1,6 +1,6 @@ Name: proj Version: 4.4.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering @@ -93,6 +93,9 @@ %{_datadir}/%{name} %changelog +* Sat Mar 4 2006 Shawn McCann - 4.4.9-2 +- Rebuild for Fedora Extras 5 + * Thu Jul 7 2005 Shawn McCann - 4.4.9-1 - Updated to proj-4.4.9 and to fix bugzilla reports 150013 and 161726. Patch2 can be removed once this package is upgraded to the next release of the source. From fedora-extras-commits at redhat.com Sun Mar 5 01:43:41 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 4 Mar 2006 20:43:41 -0500 Subject: rpms/proj/devel proj.spec,1.7,1.8 Message-ID: <200603050144.k251iDOx027254@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/proj/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27237 Modified Files: proj.spec Log Message: Rebuild for Fedora Extras 5 Index: proj.spec =================================================================== RCS file: /cvs/extras/rpms/proj/devel/proj.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- proj.spec 5 Mar 2006 01:38:02 -0000 1.7 +++ proj.spec 5 Mar 2006 01:43:40 -0000 1.8 @@ -1,6 +1,6 @@ Name: proj Version: 4.4.9 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Cartographic projection software (PROJ.4) Group: Applications/Engineering @@ -93,6 +93,9 @@ %{_datadir}/%{name} %changelog +* Sat Mar 4 2006 Shawn McCann - 4.4.9-3 +- Rebuild for Fedora Extras 5 + * Sat Mar 4 2006 Shawn McCann - 4.4.9-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sun Mar 5 01:47:29 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 4 Mar 2006 20:47:29 -0500 Subject: rpms/geos/devel geos.spec,1.4,1.5 Message-ID: <200603050148.k251m1c8027322@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/geos/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27303 Modified Files: geos.spec Log Message: Rebuild for Fedora Extras 5 Index: geos.spec =================================================================== RCS file: /cvs/extras/rpms/geos/devel/geos.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- geos.spec 14 Jan 2006 23:14:24 -0000 1.4 +++ geos.spec 5 Mar 2006 01:47:29 -0000 1.5 @@ -1,6 +1,6 @@ Name: geos Version: 2.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GEOS is a C++ port of the Java Topology Suite Group: Applications/Engineering @@ -73,6 +73,9 @@ %exclude %{_libdir}/*.la %changelog +* Sat Mar 4 2006 Shawn McCann - 2.2.1-4 +- Rebuild for Fedora Extras 5 + * Sat Jan 14 2006 Shawn McCann - 2.2.1-3 - Updated gcc4 patch From fedora-extras-commits at redhat.com Sun Mar 5 01:53:53 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sat, 4 Mar 2006 20:53:53 -0500 Subject: rpms/shapelib/devel shapelib.spec,1.6,1.7 Message-ID: <200603050154.k251sPXO027408@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/shapelib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27385 Modified Files: shapelib.spec Log Message: Rebuild for Fedora Extras 5 Index: shapelib.spec =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- shapelib.spec 11 Apr 2005 18:47:07 -0000 1.6 +++ shapelib.spec 5 Mar 2006 01:53:52 -0000 1.7 @@ -2,7 +2,7 @@ Summary: API in "C" for Shapefile handling Name: shapelib Version: 1.2.10 -Release: 8 +Release: 9 URL: http://shapelib.maptools.org/ Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz Patch0: shapelib-%{version}.patch @@ -73,6 +73,9 @@ %exclude %{_libdir}/libshp.la %changelog +* Sat Mar 4 2006 Shawn McCann - 1.2.10-9 +- Rebuild for Fedora Extras 5 + * Mon Apr 11 2005 Michael Schwendt - 1.2.10-8 - Fix "invalid lvalue in assignment" for GCC4. From fedora-extras-commits at redhat.com Sun Mar 5 09:58:33 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Sun, 5 Mar 2006 04:58:33 -0500 Subject: rpms/xmms-cdread/devel xmms-cdread-x86_64.patch,NONE,1.1 Message-ID: <200603050958.k259wZGt014969@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14957 Added Files: xmms-cdread-x86_64.patch Log Message: x86_64 fixes xmms-cdread-x86_64.patch: --- NEW FILE xmms-cdread-x86_64.patch --- diff -rubN xmms-cdread-0.14a.orig/Makefile.am xmms-cdread-0.14a/Makefile.am --- xmms-cdread-0.14a.orig/Makefile.am 2001-07-13 04:02:06.000000000 -0400 +++ xmms-cdread-0.14a/Makefile.am 2006-03-04 11:08:51.000000000 -0500 @@ -2,10 +2,10 @@ libcdread_la_LDFLAGS = -module -avoid-version -nostdlib -CFLAGS = -O2 -W -Wall -Wno-unused -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ +AM_CFLAGS = -O2 -W -Wall -Wno-unused -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ CCLD = "gcc -nostdlib" libcdread_la_SOURCES = cdread.c cdread.h \ cdconf.c cddb.c fileinfo.c server.c playlist.c playlist.h \ filter.c cdromlinux.h cdrombsd.h cdromsolaris.h -EXTRA_DIST = cddb.howto +EXTRA_DIST = cddb.howto depcomp diff -rubN xmms-cdread-0.14a.orig/aclocal.m4 xmms-cdread-0.14a/aclocal.m4 --- xmms-cdread-0.14a.orig/aclocal.m4 2001-08-18 07:09:02.000000000 -0400 +++ xmms-cdread-0.14a/aclocal.m4 2006-03-04 11:11:26.000000000 -0500 @@ -1,950 +1,7637 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p4 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# 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. -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# Configure paths for GLIB +# Owen Taylor 97-11-3 -dnl Some handy functions +dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or +dnl gthread is specified in MODULES, pass to glib-config +dnl +AC_DEFUN([AM_PATH_GLIB], +[dnl +dnl Get the cflags and libraries from the glib-config script +dnl +AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], + glib_config_prefix="$withval", glib_config_prefix="") +AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], + glib_config_exec_prefix="$withval", glib_config_exec_prefix="") +AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], + , enable_glibtest=yes) -dnl Try a list of directories, set the first one found -dnl Usage: AC_CHECK_DIRS(DIRECTORY..., ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + if test x$glib_config_exec_prefix != x ; then + glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config + fi + fi + if test x$glib_config_prefix != x ; then + glib_config_args="$glib_config_args --prefix=$glib_config_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_prefix/bin/glib-config + fi + fi -AC_DEFUN(AC_CHECK_DIRS, -[ -for ac_dir in $1 -do -AC_MSG_CHECKING([for directory ${ac_dir}]) -if test -d ${ac_dir} -then + for module in . $4 + do + case "$module" in + gmodule) + glib_config_args="$glib_config_args gmodule" + ;; + gthread) + glib_config_args="$glib_config_args gthread" + ;; + esac + done + + AC_PATH_PROG(GLIB_CONFIG, glib-config, no) + min_glib_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes + else + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of glib-config to some extent +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.glibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If glib-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); + printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the glib-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); + printf("*** correct copy of glib-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then AC_MSG_RESULT(yes) [...40470 lines suppressed...] + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac + + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} + case $ac_dest in + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`(dirname "$mf") 2>/dev/null || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`(dirname "$file") 2>/dev/null || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p $dirpart/$fdir + else + as_dir=$dirpart/$fdir + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; }; } + + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done + ;; + esac +done +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF + +{ (exit 0); exit 0; } +_ACEOF chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_clean_files=$ac_clean_files_save + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi From fedora-extras-commits at redhat.com Sun Mar 5 09:58:55 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Sun, 5 Mar 2006 04:58:55 -0500 Subject: rpms/xmms-cdread/FC-4 xmms-cdread-x86_64.patch,NONE,1.1 Message-ID: <200603050958.k259wvZ2014993@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14981 Added Files: xmms-cdread-x86_64.patch Log Message: x86_64 fixes xmms-cdread-x86_64.patch: --- NEW FILE xmms-cdread-x86_64.patch --- diff -rubN xmms-cdread-0.14a.orig/Makefile.am xmms-cdread-0.14a/Makefile.am --- xmms-cdread-0.14a.orig/Makefile.am 2001-07-13 04:02:06.000000000 -0400 +++ xmms-cdread-0.14a/Makefile.am 2006-03-04 11:08:51.000000000 -0500 @@ -2,10 +2,10 @@ libcdread_la_LDFLAGS = -module -avoid-version -nostdlib -CFLAGS = -O2 -W -Wall -Wno-unused -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ +AM_CFLAGS = -O2 -W -Wall -Wno-unused -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ CCLD = "gcc -nostdlib" libcdread_la_SOURCES = cdread.c cdread.h \ cdconf.c cddb.c fileinfo.c server.c playlist.c playlist.h \ filter.c cdromlinux.h cdrombsd.h cdromsolaris.h -EXTRA_DIST = cddb.howto +EXTRA_DIST = cddb.howto depcomp diff -rubN xmms-cdread-0.14a.orig/aclocal.m4 xmms-cdread-0.14a/aclocal.m4 --- xmms-cdread-0.14a.orig/aclocal.m4 2001-08-18 07:09:02.000000000 -0400 +++ xmms-cdread-0.14a/aclocal.m4 2006-03-04 11:11:26.000000000 -0500 @@ -1,950 +1,7637 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p4 +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# 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. -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# Configure paths for GLIB +# Owen Taylor 97-11-3 -dnl Some handy functions +dnl AM_PATH_GLIB([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or +dnl gthread is specified in MODULES, pass to glib-config +dnl +AC_DEFUN([AM_PATH_GLIB], +[dnl +dnl Get the cflags and libraries from the glib-config script +dnl +AC_ARG_WITH(glib-prefix,[ --with-glib-prefix=PFX Prefix where GLIB is installed (optional)], + glib_config_prefix="$withval", glib_config_prefix="") +AC_ARG_WITH(glib-exec-prefix,[ --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)], + glib_config_exec_prefix="$withval", glib_config_exec_prefix="") +AC_ARG_ENABLE(glibtest, [ --disable-glibtest Do not try to compile and run a test GLIB program], + , enable_glibtest=yes) -dnl Try a list of directories, set the first one found -dnl Usage: AC_CHECK_DIRS(DIRECTORY..., ACTION-IF-FOUND, ACTION-IF-NOT-FOUND) + if test x$glib_config_exec_prefix != x ; then + glib_config_args="$glib_config_args --exec-prefix=$glib_config_exec_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_exec_prefix/bin/glib-config + fi + fi + if test x$glib_config_prefix != x ; then + glib_config_args="$glib_config_args --prefix=$glib_config_prefix" + if test x${GLIB_CONFIG+set} != xset ; then + GLIB_CONFIG=$glib_config_prefix/bin/glib-config + fi + fi -AC_DEFUN(AC_CHECK_DIRS, -[ -for ac_dir in $1 -do -AC_MSG_CHECKING([for directory ${ac_dir}]) -if test -d ${ac_dir} -then + for module in . $4 + do + case "$module" in + gmodule) + glib_config_args="$glib_config_args gmodule" + ;; + gthread) + glib_config_args="$glib_config_args gthread" + ;; + esac + done + + AC_PATH_PROG(GLIB_CONFIG, glib-config, no) + min_glib_version=ifelse([$1], ,0.99.7,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + no_glib="" + if test "$GLIB_CONFIG" = "no" ; then + no_glib=yes + else + GLIB_CFLAGS=`$GLIB_CONFIG $glib_config_args --cflags` + GLIB_LIBS=`$GLIB_CONFIG $glib_config_args --libs` + glib_config_major_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$GLIB_CONFIG $glib_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of glib-config to some extent +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include + +int +main () +{ + int major, minor, micro; + char *tmp_version; + + system ("touch conf.glibtest"); + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = g_strdup("$min_glib_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'glib-config --version' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If glib-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLIB. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If glib-config was wrong, set the environment variable GLIB_CONFIG\n"); + printf("*** to point to the correct copy of glib-config, and remove the file config.cache\n"); + printf("*** before re-running configure\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%d.%d.%d) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %d.%d.%d. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the glib-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the GLIB_CONFIG environment to point to the\n"); + printf("*** correct copy of glib-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then AC_MSG_RESULT(yes) [...40470 lines suppressed...] + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac + + + { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 +echo "$as_me: executing $ac_dest commands" >&6;} + case $ac_dest in + depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # So let's grep whole file. + if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then + dirpart=`(dirname "$mf") 2>/dev/null || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$mf" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`(dirname "$file") 2>/dev/null || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p $dirpart/$fdir + else + as_dir=$dirpart/$fdir + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5 +echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;} + { (exit 1); exit 1; }; }; } + + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done + ;; + esac +done +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF + +{ (exit 0); exit 0; } +_ACEOF chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_clean_files=$ac_clean_files_save + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi From fedora-extras-commits at redhat.com Sun Mar 5 10:00:28 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Sun, 5 Mar 2006 05:00:28 -0500 Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.9,1.10 Message-ID: <200603051001.k25A10LG015031@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15014 Modified Files: xmms-cdread.spec Log Message: x86_64 fixes Index: xmms-cdread.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- xmms-cdread.spec 4 Mar 2006 14:38:30 -0000 1.9 +++ xmms-cdread.spec 5 Mar 2006 10:00:28 -0000 1.10 @@ -1,21 +1,19 @@ %define xmmsdep %(rpm -q --qf "%%{epoch}:%%{version}" xmms-devel) %define xmmsinputdir %(xmms-config --input-plugin-dir) - Summary: Digital audio CD input plugin for XMMS Name: xmms-cdread Version: 0.14 -Release: 8%{?dist} - +Release: 9%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ Source: ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz Patch1: xmms-cdread-shuffle.patch +Patch2: xmms-cdread-x86_64.patch Requires: xmms = %xmmsdep BuildRequires: gtk+-devel glib-devel xmms-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - %description XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System with an interface similar to Winamp's. XMMS supports playlists and @@ -24,11 +22,10 @@ This is the input plugin needed to play audio CDs digitally, i.e. without a connecting cable between the CD drive and sound card. - %prep %setup -q -n %{name}-%{version}a -%patch1 -p1 -b .shuffle - +%patch1 -p1 +%patch2 -p1 %build %configure --libdir=%{xmmsinputdir} @@ -39,20 +36,20 @@ rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -libtool --finish $RPM_BUILD_ROOT/usr/lib64/xmms/Input %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README TODO %{xmmsinputdir}/libcdread.so %exclude %{xmmsinputdir}/libcdread.la - %changelog +* Sun Mar 5 2006 Joost Soeterbroek - 0.14-9 +- x86_64 fixes + * Sat Mar 4 2006 Joost Soeterbroek - 0.14-8 - added libtool --finish - added dist after release From fedora-extras-commits at redhat.com Sun Mar 5 10:01:12 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Sun, 5 Mar 2006 05:01:12 -0500 Subject: rpms/xmms-cdread/FC-4 xmms-cdread.spec,1.7,1.8 Message-ID: <200603051001.k25A1iJu016877@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/xmms-cdread/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15453 Modified Files: xmms-cdread.spec Log Message: x86_64 fixes Index: xmms-cdread.spec =================================================================== RCS file: /cvs/extras/rpms/xmms-cdread/FC-4/xmms-cdread.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- xmms-cdread.spec 22 May 2005 23:53:12 -0000 1.7 +++ xmms-cdread.spec 5 Mar 2006 10:01:11 -0000 1.8 @@ -1,21 +1,19 @@ %define xmmsdep %(rpm -q --qf "%%{epoch}:%%{version}" xmms-devel) %define xmmsinputdir %(xmms-config --input-plugin-dir) - Summary: Digital audio CD input plugin for XMMS Name: xmms-cdread Version: 0.14 -Release: 6.a - +Release: 9%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.xmms.org/ Source: ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz Patch1: xmms-cdread-shuffle.patch +Patch2: xmms-cdread-x86_64.patch Requires: xmms = %xmmsdep BuildRequires: gtk+-devel glib-devel xmms-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root - %description XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System with an interface similar to Winamp's. XMMS supports playlists and @@ -24,36 +22,41 @@ This is the input plugin needed to play audio CDs digitally, i.e. without a connecting cable between the CD drive and sound card. - %prep %setup -q -n %{name}-%{version}a -%patch1 -p1 -b .shuffle - +%patch1 -p1 +%patch2 -p1 %build %configure --libdir=%{xmmsinputdir} perl -pi -e 's/^(CFLAGS.*)-O2(.*)/$1\$\(RPM_OPT_FLAGS\)$2/' Makefile make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT mkdir $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT - %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root) %doc AUTHORS COPYING NEWS README TODO %{xmmsinputdir}/libcdread.so %exclude %{xmmsinputdir}/libcdread.la - %changelog +* Sun Mar 5 2006 Joost Soeterbroek - 0.14-9 +- x86_64 fixes + +* Sat Mar 4 2006 Joost Soeterbroek - 0.14-8 +- added libtool --finish +- added dist after release + +* Wed Mar 1 2006 Joost Soeterbroek - 0.14-7 +- Rebuild for Fedora Extras 5 + * Sun May 22 2005 Jeremy Katz - 0.14-6.a - rebuild on all arches From fedora-extras-commits at redhat.com Sun Mar 5 10:02:10 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Sun, 5 Mar 2006 05:02:10 -0500 Subject: rpms/cproto/devel cproto.spec,1.4,1.5 Message-ID: <200603051002.k25A2hLH016912@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/cproto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16883 Modified Files: cproto.spec Log Message: * Sun Mar 5 2006 Jindrich Novy 4.7e-1 - update to 4.7e Index: cproto.spec =================================================================== RCS file: /cvs/extras/rpms/cproto/devel/cproto.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cproto.spec 29 Nov 2005 22:41:14 -0000 1.4 +++ cproto.spec 5 Mar 2006 10:02:09 -0000 1.5 @@ -1,10 +1,10 @@ Summary: Generates function prototypes and variable declarations from C code Name: cproto -Version: 4.7d -Release: 2 +Version: 4.7e +Release: 1%{?dist} License: Public Domain Group: Development/Tools -Source: ftp://invisible-island.net/cproto/cproto-4_7d.tgz +Source: ftp://invisible-island.net/cproto/cproto-4_7e.tgz URL: http://invisible-island.net/ BuildRequires: byacc, flex BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,7 +19,7 @@ definitions as much as other prototype generators. %prep -%setup -q -n cproto-4_7d +%setup -q -n cproto-4_7e %build export CPP="/lib/cpp" @@ -43,6 +43,9 @@ %{_mandir}/man1/cproto.* %changelog +* Sun Mar 5 2006 Jindrich Novy 4.7e-1 +- update to 4.7e + * Tue Nov 29 2005 Jindrich Novy 4.7d-2 - fix source, rebuild From fedora-extras-commits at redhat.com Sun Mar 5 10:04:38 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Sun, 5 Mar 2006 05:04:38 -0500 Subject: rpms/cproto/devel .cvsignore,1.3,1.4 sources,1.3,1.4 Message-ID: <200603051005.k25A5Ewu017020@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/cproto/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17000 Modified Files: .cvsignore sources Log Message: - upload the 4.7e source tarball Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cproto/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Nov 2005 12:45:23 -0000 1.3 +++ .cvsignore 5 Mar 2006 10:04:37 -0000 1.4 @@ -1 +1,2 @@ cproto-4_7d.tgz +cproto-4_7e.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/cproto/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Nov 2005 12:45:23 -0000 1.3 +++ sources 5 Mar 2006 10:04:37 -0000 1.4 @@ -1 +1 @@ -d8aa3698dcf762b9fee94c5b9f1c294d cproto-4_7d.tgz +fbbba31154ad42af9441d44fddd7e45f cproto-4_7e.tgz From fedora-extras-commits at redhat.com Sun Mar 5 10:09:13 2006 From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy)) Date: Sun, 5 Mar 2006 05:09:13 -0500 Subject: rpms/nedit/devel nedit.spec,1.5,1.6 Message-ID: <200603051009.k25A9jBm017106@cvs-int.fedora.redhat.com> Author: jnovy Update of /cvs/extras/rpms/nedit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17086 Modified Files: nedit.spec Log Message: * Sun Mar 5 2006 Jindrich Novy 5.5-7 - rebuild Index: nedit.spec =================================================================== RCS file: /cvs/extras/rpms/nedit/devel/nedit.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nedit.spec 16 Dec 2005 15:33:50 -0000 1.5 +++ nedit.spec 5 Mar 2006 10:09:07 -0000 1.6 @@ -5,7 +5,7 @@ Summary: A GUI text editor for systems with X and Motif. Name: nedit Version: 5.5 -Release: 6 +Release: 7%{?dist} Source: http://nedit.org/ftp/v5_5/nedit-%{version}-src.tar.bz2 Source1: nedit.desktop Source2: nedit-icon.png @@ -82,6 +82,9 @@ %endif %changelog +* Sun Mar 5 2006 Jindrich Novy 5.5-7 +- rebuild + * Thu Dec 16 2005 Jindrich Novy 5.5-6 - fix openmotif dependencies - build with modular X From fedora-extras-commits at redhat.com Sun Mar 5 11:15:37 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 5 Mar 2006 06:15:37 -0500 Subject: owners owners.list,1.707,1.708 Message-ID: <200603051116.k25BG9lB019499@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19482 Modified Files: owners.list Log Message: orphan htb-util, tripwire Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.707 retrieving revision 1.708 diff -u -r1.707 -r1.708 --- owners.list 4 Mar 2006 19:34:49 -0000 1.707 +++ owners.list 5 Mar 2006 11:15:36 -0000 1.708 @@ -423,7 +423,7 @@ Fedora Extras|hpic|Healpix manipulation binaries and library|matt at truch.net|extras-qa at fedoraproject.org| Fedora Extras|hping2|A software to do TCP/IP stack auditing and much more|paul at xtdnet.nl|extras-qa at fedoraproject.org| Fedora Extras|hspell|A Hebrew spell checker|danken at cs.technion.ac.il|extras-qa at fedoraproject.org| -Fedora Extras|htb-util|Another tool to make your life easier with HTB|mihai at xcyb.org|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|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| @@ -1358,7 +1358,7 @@ Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.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|treecc|Tree Compiler Compiler|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| -Fedora Extras|tripwire|An IDS (Intrusion Detection System)|tripwire-devel at genesis-x.nildram.co.uk|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|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 5 13:52:08 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 08:52:08 -0500 Subject: devel/directfb directfb.spec,1.9,1.10 Message-ID: <200603051352.k25DqelA024138@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/directfb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24121 Modified Files: directfb.spec Log Message: rebuild for FE5 Index: directfb.spec =================================================================== RCS file: /cvs/extras/devel/directfb/directfb.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- directfb.spec 25 Nov 2005 12:12:27 -0000 1.9 +++ directfb.spec 5 Mar 2006 13:52:07 -0000 1.10 @@ -1,6 +1,6 @@ Name: directfb Version: 0.9.24 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Graphics abstraction library for the Linux Framebuffer Device Group: System Environment/Libraries @@ -107,6 +107,9 @@ %{_libdir}/libfusion.so %changelog +* Sun Mar 05 2006 Thomas Vander Stichele 0.9.24-5 +- rebuild for fedora extras 5 + * Fri Nov 25 2005 Hans de Goede 0.9.24-4 - Merge FC-4 and devel specfiles for easier maintainance and consistence. - Incorperate improvements suggested by Ville Skytt?? in bug 162358. From fedora-extras-commits at redhat.com Sun Mar 5 14:17:25 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:17:25 -0500 Subject: devel/flumotion .cvsignore, 1.3, 1.4 flumotion.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603051417.k25EHwMC026177@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/flumotion In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26151 Modified Files: .cvsignore flumotion.spec sources Log Message: update to 0.2.0; rebuild for FE5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/flumotion/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 May 2005 13:45:56 -0000 1.3 +++ .cvsignore 5 Mar 2006 14:17:25 -0000 1.4 @@ -1 +1 @@ -flumotion-0.1.8.tar.bz2 +flumotion-0.2.0.tar.bz2 Index: flumotion.spec =================================================================== RCS file: /cvs/extras/devel/flumotion/flumotion.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- flumotion.spec 20 May 2005 13:48:47 -0000 1.3 +++ flumotion.spec 5 Mar 2006 14:17:25 -0000 1.4 @@ -1,6 +1,11 @@ +%define gst_minver 0.10.1 +%define gstpb_minver 0.10.1 +%define gstpy_minver 0.10.0 +%define gstreamer gstreamer + Name: flumotion -Version: 0.1.8 -Release: 1 +Version: 0.2.0 +Release: 1%{?dist} Summary: Flumotion - the Fluendo Streaming Server Group: Applications/Internet @@ -10,23 +15,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: python >= 2.3 -Requires: gstreamer >= 0.8.5 -Requires: gstreamer-python >= 0.8.0 +Requires: %{gstreamer} >= %{gst_minver} +Requires: %{gstreamer}-plugins-base >= %{gstpb_minver} +Requires: %{gstreamer}-python >= %{gstpy_minver} Requires: python-twisted >= 1.3.0 -Requires: pygtk2 >= 2.4.0 +Requires: pygtk2 >= 2.8.0 Requires: python-imaging # for make-dummy-cert to work Requires(post): openssl -BuildRequires: gstreamer-devel >= 0.8.5 -BuildRequires: gstreamer-python >= 0.8.0 +BuildRequires: %{gstreamer}-devel >= %{gst_minver} +BuildRequires: %{gstreamer}-python >= %{gstpy_minver} BuildRequires: python-twisted >= 1.3.0 BuildRequires: python-devel >= 2.3 -BuildRequires: pygtk2-devel >= 2.4.0 -BuildRequires: gtk2-devel - -BuildRequires: desktop-file-utils +BuildRequires: pygtk2-devel >= 2.8.0 +BuildRequires: gtk2-devel # docs BuildRequires: epydoc @@ -34,11 +38,13 @@ # sigh, libtool BuildRequires: gcc-c++ +BuildRequires: desktop-file-utils + # since we compile pytrayicon, we're no longer noarch -# BuildArch: noarch +# BuildArch: noarch %description -Fluendo Streaming Server. +Flumotion, the Fluendo Streaming Server. %prep %setup -q @@ -68,8 +74,8 @@ # install make-dummy-cert script install -d $RPM_BUILD_ROOT%{_datadir}/flumotion install -m 644 \ - doc/redhat/make-dummy-cert \ - $RPM_BUILD_ROOT%{_datadir}/flumotion + doc/redhat/make-dummy-cert \ + $RPM_BUILD_ROOT%{_datadir}/flumotion # install service files install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d @@ -87,6 +93,8 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/run/flumotion install -d $RPM_BUILD_ROOT%{_localstatedir}/cache/flumotion +%find_lang flumotion + %clean rm -rf $RPM_BUILD_ROOT @@ -115,6 +123,9 @@ localhost + %{_sysconfdir}/flumotion/workers/default.xml < + + + user test + + EOF @@ -164,7 +183,7 @@ # /sbin/service flumotion condrestart # fi -%files +%files -f flumotion.lang %defattr(-,root,root,-) %doc ChangeLog COPYING README AUTHORS %doc doc/reference/html @@ -172,22 +191,38 @@ %{_bindir}/flumotion-manager %{_bindir}/flumotion-worker %{_bindir}/flumotion-admin +%{_bindir}/flumotion-admin-text +%{_bindir}/flumotion-command %{_bindir}/flumotion-tester +%{_bindir}/flumotion-job +%{_bindir}/flumotion-inspect +%{_bindir}/flumotion-launch %{_sbindir}/flumotion + %{_libdir}/flumotion %{_libdir}/pkgconfig/flumotion.pc -%{_datadir}/flumotion + %{_datadir}/applications/*.desktop %{_datadir}/pixmaps/* +%{_mandir}/man1/flumotion*.1* + +%{_datadir}/flumotion/glade +%{_datadir}/flumotion/image +%{_datadir}/flumotion/make-dummy-cert +%{_datadir}/flumotion/*.xsl %dir %attr(750,flumotion,root) %{_datadir}/flumotion/.flumotion + %attr(750,flumotion,root) %{_sysconfdir}/flumotion %attr(750,flumotion,root) %{_localstatedir}/run/flumotion %attr(750,flumotion,root) %{_localstatedir}/log/flumotion %attr(750,flumotion,root) %{_localstatedir}/cache/flumotion %{_sysconfdir}/rc.d/init.d/flumotion -%{_datadir}/applications/fedora-flumotion-admin.desktop %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.2.0-1 +- new upstream release + * Fri May 20 2005 Thomas Vander Stichele - 0.1.8-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/devel/flumotion/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 May 2005 13:45:56 -0000 1.3 +++ sources 5 Mar 2006 14:17:25 -0000 1.4 @@ -1 +1 @@ -33367676b24fe3af328ae6cfca8b63ec flumotion-0.1.8.tar.bz2 +f674eb7286fb0cef687c372a0da1ebd1 flumotion-0.2.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 5 14:20:14 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:20:14 -0500 Subject: devel/Hermes Hermes.spec,1.9,1.10 Message-ID: <200603051420.k25EKknt026204@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/Hermes In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26187 Modified Files: Hermes.spec Log Message: rebuilt for FE5 Index: Hermes.spec =================================================================== RCS file: /cvs/extras/devel/Hermes/Hermes.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- Hermes.spec 22 May 2005 23:45:23 -0000 1.9 +++ Hermes.spec 5 Mar 2006 14:20:13 -0000 1.10 @@ -1,6 +1,6 @@ Name: Hermes Version: 1.3.3 -Release: 8 +Release: 9%{?dist} Summary: Pixel format conversion library @@ -73,6 +73,10 @@ %{_libdir}/libHermes.so %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 1.3.3-9 +- rebuilt for FE5 + * Sun May 22 2005 Jeremy Katz - 1.3.3-8 - rebuild on all arches From fedora-extras-commits at redhat.com Sun Mar 5 14:22:08 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:22:08 -0500 Subject: devel/ladspa ladspa.spec,1.9,1.10 Message-ID: <200603051422.k25EMf6q026274@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/ladspa In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26251 Modified Files: ladspa.spec Log Message: rebuilt for FE5 Index: ladspa.spec =================================================================== RCS file: /cvs/extras/devel/ladspa/ladspa.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ladspa.spec 23 May 2005 00:25:50 -0000 1.9 +++ ladspa.spec 5 Mar 2006 14:22:08 -0000 1.10 @@ -1,6 +1,6 @@ Name: ladspa Version: 1.12 -Release: 5 +Release: 6%{?dist} Summary: LADSPA SDK, example plug-ins and tools @@ -90,6 +90,10 @@ %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 1.12-6 +- rebuilt for FE5 + * Sun May 22 2005 Jeremy Katz - 1.12-5 - rebuild on all arches From fedora-extras-commits at redhat.com Sun Mar 5 14:31:36 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:31:36 -0500 Subject: devel/libannodex .cvsignore, 1.3, 1.4 libannodex.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603051432.k25EW9As026437@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libannodex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26398 Modified Files: .cvsignore libannodex.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/libannodex/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Nov 2005 17:37:19 -0000 1.3 +++ .cvsignore 5 Mar 2006 14:31:36 -0000 1.4 @@ -1 +1 @@ -libannodex-0.7.2.tar.gz +libannodex-0.7.3.tar.gz Index: libannodex.spec =================================================================== RCS file: /cvs/extras/devel/libannodex/libannodex.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libannodex.spec 13 Nov 2005 17:37:19 -0000 1.2 +++ libannodex.spec 5 Mar 2006 14:31:36 -0000 1.3 @@ -1,5 +1,5 @@ Name: libannodex -Version: 0.7.2 +Version: 0.7.3 Release: 1%{?dist} Summary: Library for annotating and indexing networked media @@ -58,7 +58,7 @@ %clean rm -rf $RPM_BUILD_ROOT - + %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README @@ -90,6 +90,11 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-1 +- new upstream release +- rebuilt for FE5 + * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release Index: sources =================================================================== RCS file: /cvs/extras/devel/libannodex/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Nov 2005 17:37:19 -0000 1.3 +++ sources 5 Mar 2006 14:31:36 -0000 1.4 @@ -1 +1 @@ -63440e4cabdcb1d03878d4adc453fc72 libannodex-0.7.2.tar.gz +504cf036cf04512260006a986926177f libannodex-0.7.3.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 14:32:49 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:32:49 -0500 Subject: rpms/libannodex/FC-3 .cvsignore, 1.3, 1.4 libannodex.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603051433.k25EXMvb026645@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26479 Modified Files: .cvsignore libannodex.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Nov 2005 17:37:19 -0000 1.3 +++ .cvsignore 5 Mar 2006 14:32:49 -0000 1.4 @@ -1 +1 @@ -libannodex-0.7.2.tar.gz +libannodex-0.7.3.tar.gz Index: libannodex.spec =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-3/libannodex.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libannodex.spec 13 Nov 2005 17:37:19 -0000 1.2 +++ libannodex.spec 5 Mar 2006 14:32:49 -0000 1.3 @@ -1,5 +1,5 @@ Name: libannodex -Version: 0.7.2 +Version: 0.7.3 Release: 1%{?dist} Summary: Library for annotating and indexing networked media @@ -90,6 +90,9 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-1: new upstream release + * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Nov 2005 17:37:19 -0000 1.3 +++ sources 5 Mar 2006 14:32:49 -0000 1.4 @@ -1 +1 @@ -63440e4cabdcb1d03878d4adc453fc72 libannodex-0.7.2.tar.gz +504cf036cf04512260006a986926177f libannodex-0.7.3.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 14:35:07 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:35:07 -0500 Subject: rpms/libannodex/FC-4 .cvsignore, 1.3, 1.4 libannodex.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603051435.k25EZdb3027413@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27229 Modified Files: .cvsignore libannodex.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Nov 2005 17:37:19 -0000 1.3 +++ .cvsignore 5 Mar 2006 14:35:07 -0000 1.4 @@ -1 +1 @@ -libannodex-0.7.2.tar.gz +libannodex-0.7.3.tar.gz Index: libannodex.spec =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-4/libannodex.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libannodex.spec 13 Nov 2005 17:37:19 -0000 1.2 +++ libannodex.spec 5 Mar 2006 14:35:07 -0000 1.3 @@ -1,5 +1,5 @@ Name: libannodex -Version: 0.7.2 +Version: 0.7.3 Release: 1%{?dist} Summary: Library for annotating and indexing networked media @@ -90,6 +90,9 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-1: new upstream release + * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Nov 2005 17:37:19 -0000 1.3 +++ sources 5 Mar 2006 14:35:07 -0000 1.4 @@ -1 +1 @@ -63440e4cabdcb1d03878d4adc453fc72 libannodex-0.7.2.tar.gz +504cf036cf04512260006a986926177f libannodex-0.7.3.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 14:40:14 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:40:14 -0500 Subject: rpms/gstreamer08 - New directory Message-ID: <200603051440.k25EeGL4027568@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27560/gstreamer08 Log Message: Directory /cvs/extras/rpms/gstreamer08 added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 14:40:20 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:40:20 -0500 Subject: rpms/gstreamer08/devel - New directory Message-ID: <200603051440.k25EeMKR027583@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27560/gstreamer08/devel Log Message: Directory /cvs/extras/rpms/gstreamer08/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 14:40:33 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:40:33 -0500 Subject: rpms/gstreamer08 Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603051440.k25EeZjN027617@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27605 Added Files: Makefile import.log Log Message: Setup of module gstreamer08 --- NEW FILE Makefile --- # Top level Makefile for module gstreamer08 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 5 14:40:38 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:40:38 -0500 Subject: rpms/gstreamer08/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603051440.k25Eeec3027637@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27605/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gstreamer08 --- NEW 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 Mar 5 14:41:33 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:41:33 -0500 Subject: rpms/gstreamer08 import.log,1.1,1.2 Message-ID: <200603051442.k25Eg69H027742@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27687 Modified Files: import.log Log Message: auto-import gstreamer08-0.8.12-3 on branch devel from gstreamer08-0.8.12-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gstreamer08/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Mar 2006 14:40:32 -0000 1.1 +++ import.log 5 Mar 2006 14:41:33 -0000 1.2 @@ -0,0 +1 @@ +gstreamer08-0_8_12-3:HEAD:gstreamer08-0.8.12-3.src.rpm:1141569689 From fedora-extras-commits at redhat.com Sun Mar 5 14:41:39 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 09:41:39 -0500 Subject: rpms/gstreamer08/devel gstreamer-0.7.5-nops.patch, NONE, 1.1 gstreamer-0.8.11-lib64.patch, NONE, 1.1 gstreamer-0.8.9-cast-fix.patch, NONE, 1.1 gstreamer08.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603051442.k25EgBfM027747@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27687/devel Modified Files: .cvsignore sources Added Files: gstreamer-0.7.5-nops.patch gstreamer-0.8.11-lib64.patch gstreamer-0.8.9-cast-fix.patch gstreamer08.spec Log Message: auto-import gstreamer08-0.8.12-3 on branch devel from gstreamer08-0.8.12-3.src.rpm gstreamer-0.7.5-nops.patch: --- NEW FILE gstreamer-0.7.5-nops.patch --- --- gstreamer-0.7.5/docs/manuals.mak.nops 2004-02-27 08:52:16.000000000 +0100 +++ gstreamer-0.7.5/docs/manuals.mak 2004-02-27 08:52:48.000000000 +0100 @@ -42,7 +42,7 @@ # can we generate PS ? if DOC_PS -PS_DAT = $(DOC).ps +PS_DAT = else #!DOC_PS PS_DAT = endif #DOC_PS @@ -50,7 +50,7 @@ # can we generate PDF ? if DOC_PDF -PDF_DAT = $(DOC).pdf +PDF_DAT = else #!DOC_PDF PDF_DAT = endif #DOC_PDF gstreamer-0.8.11-lib64.patch: --- NEW FILE gstreamer-0.8.11-lib64.patch --- Index: gstreamer/tools/Makefile.am =================================================================== --- gstreamer.orig/tools/Makefile.am +++ gstreamer/tools/Makefile.am @@ -2,9 +2,13 @@ if GST_DISABLE_REGISTRY GST_REGISTRY_SRC = GST_REGISTRY_SRC_V = +GST_REGISTRY_WRAPPER_SRC = +GST_REGISTRY_WRAPPER_SRC_V = else -GST_REGISTRY_SRC = gst-register -GST_REGISTRY_SRC_V = gst-register- at GST_MAJORMINOR@ +GST_REGISTRY_SRC = gst-register- at host_cpu@ +GST_REGISTRY_SRC_V = gst-register- at host_cpu@- at GST_MAJORMINOR@ +GST_REGISTRY_WRAPPER_SRC = gst-register +GST_REGISTRY_WRAPPER_SRC_V = gst-register- at GST_MAJORMINOR@ endif if GST_DISABLE_LOADSAVE @@ -34,18 +38,32 @@ GST_OTHER_SRC_V = \ ### so all of the programs we want to build bin_PROGRAMS = \ - $(GST_REGISTRY_SRC) $(GST_REGISTRY_SRC_V) \ $(GST_LOADSAVE_SRC) $(GST_LOADSAVE_SRC_V) \ $(GST_OTHER_SRC) $(GST_OTHER_SRC_V) -bin_SCRIPTS = gst-feedback- at GST_MAJORMINOR@ +bin_SCRIPTS = gst-feedback- at GST_MAJORMINOR@ \ + $(GST_REGISTRY_WRAPPER_SRC) $(GST_REGISTRY_WRAPPER_SRC_V) + +libexec_PROGRAMS = \ + $(GST_REGISTRY_SRC) $(GST_REGISTRY_SRC_V) noinst_HEADERS = tools.h # make sure each versioned tool has the right source file and flags if !GST_DISABLE_REGISTRY -gst_register_ at GST_MAJORMINOR@_SOURCES = gst-register.c -gst_register_ at GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) -gst_register_ at GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS) +edit = sed -e 's, at libexecdir\@,$(libexecdir),g' -e 's, at GST_MAJORMINOR\@, at GST_MAJORMINOR@,g' + +gst-register- at GST_MAJORMINOR@: Makefile $(srcdir)/gst-register.in + rm -f gst-register- at GST_MAJORMINOR@ gst-register- at GST_MAJORMINOR@.tmp + $(edit) $(srcdir)/gst-register.in >gst-register- at GST_MAJORMINOR@.tmp + mv gst-register- at GST_MAJORMINOR@.tmp gst-register- at GST_MAJORMINOR@ +gst-register: Makefile $(srcdir)/gst-register.in + rm -f gst-register gst-register.tmp + $(edit) $(srcdir)/gst-register.in >gst-register.tmp + mv gst-register.tmp gst-register +gst_register_ at host_cpu@_ at GST_MAJORMINOR@_SOURCES = gst-register.c +gst_register_ at host_cpu@_ at GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS) +gst_register_ at host_cpu@_ at GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS) + endif if !GST_DISABLE_LOADSAVE gst_complete_ at GST_MAJORMINOR@_SOURCES = gst-complete.c @@ -80,7 +98,7 @@ gst-feedback- at GST_MAJORMINOR@: gst-feedb # make sure each unversioned tool comes from gst-run.c if !GST_DISABLE_REGISTRY -gst_register_SOURCES = gst-run.c +gst_register_ at host_cpu@_SOURCES = gst-run.c endif if !GST_DISABLE_LOADSAVE gst_complete_SOURCES = gst-run.c Index: gstreamer/tools/gst-register.in =================================================================== --- /dev/null +++ gstreamer/tools/gst-register.in @@ -0,0 +1,5 @@ +#!/bin/sh +set -e +for x in @libexecdir@/gst-register*@GST_MAJORMINOR@; do + $x +done Index: gstreamer/docs/gst/gstreamer-sections.txt =================================================================== --- gstreamer.orig/docs/gst/gstreamer-sections.txt +++ gstreamer/docs/gst/gstreamer-sections.txt @@ -1347,10 +1347,14 @@ gst_real_pad_get_type GstRegistry GLOBAL_REGISTRY_DIR GLOBAL_REGISTRY_FILE +GLOBAL_ARCH_REGISTRY_FILE GLOBAL_REGISTRY_FILE_TMP +GLOBAL_ARCH_REGISTRY_FILE_TMP LOCAL_REGISTRY_DIR LOCAL_REGISTRY_FILE +LOCAL_ARCH_REGISTRY_FILE LOCAL_REGISTRY_FILE_TMP +LOCAL_ARCH_REGISTRY_FILE_TMP REGISTRY_DIR_PERMS REGISTRY_TMPFILE_PERMS REGISTRY_FILE_PERMS Index: gstreamer/gst/Makefile.am =================================================================== --- gstreamer.orig/gst/Makefile.am +++ gstreamer/gst/Makefile.am @@ -141,6 +141,7 @@ DISTCLEANFILES = $(built_header_configur libgstreamer_ at GST_MAJORMINOR@_la_CFLAGS = \ -D_GNU_SOURCE \ + -DHOSTCPU=\"$(host_cpu)\" \ $(GST_LIB_CFLAGS) \ -DGST_MAJORMINOR=\""$(GST_MAJORMINOR)"\" libgstreamer_ at GST_MAJORMINOR@_la_LIBADD = \ Index: gstreamer/gst/gstregistry.h =================================================================== --- gstreamer.orig/gst/gstregistry.h +++ gstreamer/gst/gstregistry.h @@ -29,10 +29,14 @@ #define GLOBAL_REGISTRY_DIR GST_CACHE_DIR #define GLOBAL_REGISTRY_FILE GLOBAL_REGISTRY_DIR"/registry.xml" #define GLOBAL_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.registry.xml.tmp" +#define GLOBAL_ARCH_REGISTRY_FILE GLOBAL_REGISTRY_DIR"/registry-" HOSTCPU ".xml" +#define GLOBAL_ARCH_REGISTRY_FILE_TMP GLOBAL_REGISTRY_DIR"/.registry-" HOSTCPU ".xml.tmp" #define LOCAL_REGISTRY_DIR ".gstreamer-"GST_MAJORMINOR #define LOCAL_REGISTRY_FILE LOCAL_REGISTRY_DIR"/registry.xml" #define LOCAL_REGISTRY_FILE_TMP LOCAL_REGISTRY_DIR"/.registry.xml.tmp" +#define LOCAL_ARCH_REGISTRY_FILE LOCAL_REGISTRY_DIR"/registry-" HOSTCPU ".xml" +#define LOCAL_ARCH_REGISTRY_FILE_TMP LOCAL_REGISTRY_DIR"/.registry-" HOSTCPU ".xml.tmp" /* compatibility for pre-POSIX defines */ #ifdef S_IRUSR Index: gstreamer/gst/gst.c =================================================================== --- gstreamer.orig/gst/gst.c +++ gstreamer/gst/gst.c @@ -497,7 +497,7 @@ init_pre (void) const gchar *homedir; _global_registry = - gst_xml_registry_new ("global_registry", GLOBAL_REGISTRY_FILE); + gst_xml_registry_new ("global_registry", GLOBAL_ARCH_REGISTRY_FILE); #ifdef PLUGINS_USE_BUILDDIR /* location libgstelements.so */ @@ -517,7 +517,7 @@ init_pre (void) user_reg = g_strdup (g_getenv ("GST_REGISTRY")); } else { homedir = g_get_home_dir (); - user_reg = g_strjoin ("/", homedir, LOCAL_REGISTRY_FILE, NULL); + user_reg = g_build_filename (homedir, LOCAL_ARCH_REGISTRY_FILE, NULL); } _user_registry = gst_xml_registry_new ("user_registry", user_reg); gstreamer-0.8.9-cast-fix.patch: --- NEW FILE gstreamer-0.8.9-cast-fix.patch --- --- gstreamer-0.8.9/gst/cothreads.c.cast-fix 2005-03-03 14:55:10.000000000 -0500 +++ gstreamer-0.8.9/gst/cothreads.c 2005-03-03 14:56:53.000000000 -0500 @@ -651,10 +651,14 @@ makecontext (&ucp, cothread_stub, 0); setcontext (&ucp); #else - GST_ARCH_SETUP_STACK ((char *) cothread->sp); - GST_ARCH_SET_SP (cothread->sp); - /* start it */ - GST_ARCH_CALL (cothread_stub); + { + char *charp_sp; + charp_sp = (char *) cothread->sp; + GST_ARCH_SETUP_STACK (charp_sp); + GST_ARCH_SET_SP (cothread->sp); + /* start it */ + GST_ARCH_CALL (cothread_stub); + } #endif GST_CAT_DEBUG (GST_CAT_COTHREADS, "exit thread "); --- NEW FILE gstreamer08.spec --- %define gstreamer gstreamer08 %define majmin 0.8 %define _glib2 2.3.0 %define _libxml2 2.4.9 %define po_package gstreamer-%{majmin} %define DOCBOOK_DTD_PATH `xmlcatalog /etc/xml/catalog "-//OASIS//DTD DocBook XML V4.2//EN" | sed -e "s#file://##g"` Name: %{gstreamer} Version: 0.8.12 Release: 3 Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia License: LGPL URL: http://gstreamer.freedesktop.org/ Source: http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-%{version}.tar.bz2 Patch0: gstreamer-0.8.11-lib64.patch # There was problems generating pdf and postscript: Patch1: gstreamer-0.7.5-nops.patch Patch2: gstreamer-0.8.9-cast-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel >= %_glib2 BuildRequires: libxml2-devel >= %_libxml2 BuildRequires: gtk-doc >= 1.1 BuildRequires: ghostscript BuildRequires: gettext-devel ### documentation requirements BuildRequires: xfig BuildRequires: python2 BuildRequires: netpbm-progs Requires: popt > 1.6 Requires(post): coreutils Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description GStreamer is a streaming-media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. Its plugin-based architecture means that new data types or processing capabilities can be added simply by installing new plugins. %package devel Summary: Libraries/include files for GStreamer streaming media framework Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: glib2-devel >= %_glib2 Requires: libxml2-devel >= %_libxml2 %description devel GStreamer is a streaming-media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. Its plugin-based architecture means that new data types or processing capabilities can be added simply by installing new plugins. This package contains the libraries and includes files necessary to develop applications and plugins for GStreamer. %prep %setup -q -n gstreamer-%{version} %patch0 -p1 -b .lib64 %patch1 -p1 -b .nops %patch2 -p1 -b .cast-fix # openjade doesn't support xml catalogs, so we have to patch in the right dtd reference find -name "*.xml" | xargs grep -l "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" | xargs perl -pi -e 's#http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd#/usr/share/sgml/docbook/xml-dtd-4.2-1.0-30/docbookx.dtd#g' # The nopdf patch touches automake makefile sources NOCONFIGURE=1 ./autogen.sh %build ## FIXME should re-enable the docs build when it works %configure --disable-plugin-builddir --disable-tests --disable-examples \ --with-cachedir=%{_localstatedir}/cache/gstreamer-%{majmin} \ --enable-docs-build --disable-docbook --disable-static \ --disable-rpath --enable-debug make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT # Install doc temporarily in order to be included later by rpm make DESTDIR=${RPM_BUILD_ROOT} docdir=/installed-doc install mv ${RPM_BUILD_ROOT}/installed-doc $(pwd)/installed-doc mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/gstreamer-%{majmin} rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majmin}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/libgstmedia-info*.so.0.0.0 # remove tools, provided by the 0.10 version now for a in launch inspect register xmllaunch complete compprep feedback md5sum typefind xmlinspect do rm $RPM_BUILD_ROOT%{_bindir}/gst-$a done # can't wildcard, will remove the -0.8 versions rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-i386 || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-i686 || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-x86_64 || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-ppc || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-powerpc || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-powerpc64 || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-s390 || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-s390x || true rm $RPM_BUILD_ROOT%{_libexecdir}/gst-register-ia64 || true %find_lang %{po_package} %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig env DISPLAY= %{_bindir}/gst-register-%{majmin} 1>/dev/null 2>&1 %postun -p /sbin/ldconfig %files -f %{po_package}.lang %defattr(-, root, root) %doc AUTHORS COPYING README TODO ABOUT-NLS REQUIREMENTS DOCBUILDING %dir %{_libdir}/gstreamer-%{majmin} %dir %{_localstatedir}/cache/gstreamer-%{majmin} %{_libdir}/gstreamer-%{majmin}/*.so* %{_libdir}/*.so.* %{_bindir}/*-%{majmin} %{_libexecdir}/*-%{majmin} %{_mandir}/man1/*-%{majmin}.1.gz %files devel %defattr(-, root, root) %doc installed-doc/* %dir %{_includedir}/gstreamer-%{majmin} %{_includedir}/gstreamer-%{majmin}/* %{_libdir}/libgstreamer-%{majmin}.so %{_libdir}/libgstcontrol-%{majmin}.so %{_libdir}/pkgconfig/gstreamer*.pc %{_datadir}/aclocal/* %{_datadir}/gtk-doc/html/* %changelog * Sat Mar 4 2006 Brian Pepple - 0.8.12-3 - Fix rpath issues (Thanks to Michael Schwendt). * Thu Feb 23 2006 Brian Pepple - 0.8.12-2 - Use --disable-rpath & --disable-static. - Drop period in devel summary. * Thu Feb 16 2006 Brian Pepple - 0.8.12-1 - Use preferred buildroot. - Update to 0.8.12. - Drop requires for glib2 & libxml2, devel sonames pull these in. - Remove unnecessary BR (zlib-devel, docbook-style-xsl, docbook-utils, cvs, docbook-dtds, openjade, docbook-style-dsssl, transfig, autoconf, automake, bison, flex, popt). * Tue Jan 10 2006 Bill Nottingham 0.8.11-3 - requires(pre) coreutils, since we call env * Wed Jan 04 2006 Warren Togami 0.8.11-2 - explicitly list archs to remove for gst-register - attempt to workaround openjade problem * Fri Dec 16 2005 Thomas Vander Stichele 0.8.11-1 - Update to upstream 0.8.11 * Tue May 03 2005 John (J5) Palmieri 0.8.10-1 - Update to upstream 0.8.10 * Thu Mar 17 2005 Colin Walters 0.8.9-4 - Rebuild to make it through beehive * Wed Mar 03 2005 John (J5) Palmieri 0.8.9-3 - add gstreamer-0.8.9-cast-fix.patch which casts the variable before sending it into the macro - update openjade hack to refrence xml-dtd-4.2-1.0-26 * Wed Mar 03 2005 John (J5) Palmieri 0.8.9-2 - rebuild with gcc 4.0 * Wed Feb 9 2005 Matthias Clasen 0.8.9-1 - Update to 0.8.9 * Mon Jan 10 2005 Colin Walters 0.8.8-2 - Updated gstreamer-0.8.8-lib64.patch which does not rename tools such as gst-launch to e.g. gst-launch-i686. * Mon Jan 03 2005 Colin Walters 0.8.8-1 - Update to 0.8.8 - Remove upstreamed escape-uris patch - Readd redirection of register output to /dev/null * Tue Nov 09 2004 Colin Walters 0.8.7-6 - Add initial lib64 patch. * Tue Oct 26 2004 Colin Walters 0.8.7-5 - Do not override docdir (126860) - Remove datadir/gstreamer-%{majmin}/doc from files list * Wed Oct 20 2004 Colin Walters 0.8.7-4 - Add URI escaping patch from Ronald (136507) * Wed Oct 13 2004 Colin Walters 0.8.7-3 - Quote %%configure in changelog (135412) * Thu Oct 07 2004 Colin Walters 0.8.7-2 - BuildRequire gettext-devel * Wed Oct 6 2004 Alexander Larsson - 0.8.7-1 - update to 0.8.7 * Tue Oct 5 2004 Alexander Larsson - 0.8.6-1 - update to 0.8.6 - Put the real lib .so symlinks in the -devel package - Do not put .so plugins in the -devel package - Correct docbook dtd version reference * Tue Sep 28 2004 Colin Walters 0.8.5-2 - Move .so symlinks to -devel package * Tue Aug 16 2004 Colin Walters 0.8.5-1 - Update to 0.8.5 * Tue Jul 26 2004 Colin Walters 0.8.4-1 - Update to 0.8.4 * Tue Jul 20 2004 Colin Walters 0.8.3.3-1 - Update * Tue Jul 05 2004 Colin Walters 0.8.3-3 - Another rebuild to placate beehive! * Tue Jul 05 2004 Colin Walters 0.8.3-2 - Rebuild to placate beehive * Wed Jun 23 2004 Colin Walters 0.8.3-1 - Update to 0.8.3, now that I am convinced it is safe. - Remove backported cpufix patch. - "cvs remove" a bunch of obsoleted patches. * Mon Jun 21 2004 Colin Walters 0.8.1-5 - BuildRequire gettext-devel * Mon Jun 21 2004 Colin Walters 0.8.1-4 - BuildRequire ghostscript * Mon Jun 21 2004 Colin Walters 0.8.1-3 - Apply register-clobbering patch from upstream CVS. * Tue Jun 15 2004 Elliot Lee 0.8.1-2 - rebuilt * Mon Apr 15 2004 Colin Walters 0.8.1-1 - Update to 0.8.1 - Delete registry patches which have been upstreamed - COPYING.LIB is gone * Mon Apr 05 2004 Colin Walters 0.8.0-4 - I have discovered that it is helpful, when adding patches to a package, to actually add the "%patchN" lines. * Mon Mar 22 2004 Colin Walters 0.8.0-3 - Add BuildRequires on flex - Add patch to avoid calling opendir() on files * Mon Mar 22 2004 Colin Walters 0.8.0-2 - Add patch to avoid setting mtime on registry * Tue Mar 16 2004 Alex Larsson 0.8.0-1 - update to 0.8.0 * Wed Mar 10 2004 Alexander Larsson 0.7.6-1 - update to 0.7.6 * Thu Mar 4 2004 Jeremy Katz - 0.7.5-2 - fix plugin dir with respect to %%_lib * Tue Mar 02 2004 Elliot Lee - rebuilt * Tue Feb 24 2004 Alexander Larsson 0.7.5-1 - update to 0.7.5 - clean up specfile some - enable docs * Fri Feb 13 2004 Elliot Lee - rebuilt * Wed Feb 4 2004 Bill Nottingham 0.7.3-4 - fix %%post * Wed Jan 28 2004 Alexander Larsson 0.7.3-3 - add s390 patch * Tue Jan 27 2004 Jonathan Blandford 0.7.3-1 - new version * Thu Sep 11 2003 Alexander Larsson 0.6.3-1 - Update to 0.6.3 (gnome 2.4 final) * Tue Aug 19 2003 Alexander Larsson 0.6.2-6 - 0.6.2 * Wed Jun 04 2003 Elliot Lee - rebuilt * Mon Feb 17 2003 Elliot Lee 0.6.0-5 - ppc64 patch * Wed Feb 12 2003 Bill Nottingham 0.6.0-4 - fix group * Tue Feb 11 2003 Bill Nottingham 0.6.0-3 - prereq, not require, gstreamer-tools * Tue Feb 11 2003 Jonathan Blandford 0.6.0-2 - unset the DISPLAY when running gst-register * Mon Feb 3 2003 Jonathan Blandford 0.6.0-1 - yes it is needed. Readding * Sat Feb 01 2003 Florian La Roche - remove "tools" sub-rpm, this is not needed at all * Thu Jan 30 2003 Jonathan Blandford 0.5.2-7 - stopped using %%configure so we need to pass in all the args * Mon Jan 27 2003 Jonathan Blandford - remove -Werror explicitly as the configure macro isn't working. * Wed Jan 22 2003 Tim Powers - rebuilt * Thu Dec 19 2002 Elliot Lee 0.5.0-10 - Add patch1 to fix C++ plugins on ia64 * Wed Dec 18 2002 Jonathan Blandford - %post -p was wrong * Tue Dec 17 2002 Jonathan Blandford 0.5.0-7 - explicitly add %{_libdir}/libgstreamer-{majmin}.so - explicitly add %{_libdir}/libgstcontrol-{majmin}.so * Mon Dec 16 2002 Jonathan Blandford - bump release * Fri Dec 13 2002 Jonathan Blandford - move .so files out of -devel * Tue Dec 10 2002 Jonathan Blandford - new version 0.5.0 - require docbook-style-xsl - add gstreamer-tools package too - New patch to use the right docbook prefix. * Tue Dec 10 2002 Jonathan Blandford - downgrade to a release candidate. Should work better on other arches - build without Werror * Mon Dec 9 2002 Jonathan Blandford - update to new version. Remove ExcludeArch * Tue Dec 3 2002 Havoc Pennington - excludearch some arches * Mon Dec 2 2002 Havoc Pennington - import into CVS and build "officially" - use smp_mflags - temporarily disable docs build, doesn't seem to work * Thu Nov 7 2002 Jeremy Katz - 0.4.2 * Mon Sep 23 2002 Jeremy Katz - 0.4.1 * Sun Sep 22 2002 Jeremy Katz - minor cleanups * Sat Jun 22 2002 Thomas Vander Stichele - moved header location * Mon Jun 17 2002 Thomas Vander Stichele - added popt - removed .la * Fri Jun 07 2002 Thomas Vander Stichele - added release of gstreamer to req of gstreamer-devel - changed location of API docs to be in gtk-doc like other gtk-doc stuff - reordered SPEC file * Mon Apr 29 2002 Thomas Vander Stichele - moved html docs to gtk-doc standard directory * Tue Mar 5 2002 Thomas Vander Stichele - move version defines of glib2 and libxml2 to configure.ac - add BuildRequires for these two libs * Sun Mar 3 2002 Thomas Vander Stichele - put html docs in canonical place, avoiding %doc erasure - added devhelp support, current install of it is hackish * Sat Mar 2 2002 Christian Schaller - Added documentation to build * Mon Feb 11 2002 Thomas Vander Stichele - added libgstbasicscheduler - renamed libgst to libgstreamer * Fri Jan 04 2002 Christian Schaller - Added configdir parameter as it seems the configdir gets weird otherwise * Thu Jan 03 2002 Thomas Vander Stichele - split off gstreamer-editor from core - removed gstreamer-gnome-apps * Sat Dec 29 2001 Rodney Dawes - Cleaned up the spec file for the gstreamer core/plug-ins split - Improve spec file * Sat Dec 15 2001 Christian Schaller - Split of more plugins from the core and put them into their own modules - Includes colorspace, xfree and wav - Improved package Require lines - Added mp3encode (lame based) to the SPEC * Wed Dec 12 2001 Christian Schaller - Thomas merged mpeg plugins into one * Sat Dec 08 2001 Christian Schaller - More minor cleanups including some fixed descriptions from Andrew Mitchell * Fri Dec 07 2001 Christian Schaller - Added logging to the make statement * Wed Dec 05 2001 Christian Schaller - Updated in preparation for 0.3.0 release * Fri Jun 29 2001 Christian Schaller - Updated for 0.2.1 release - Split out the GUI packages into their own RPM - added new plugins (FLAC, festival, quicktime etc.) * Sat Jun 09 2001 Christian Schaller - Visualisation plugins bundled out togheter - Moved files sections up close to their respective descriptions * Sat Jun 02 2001 Christian Schaller - Split the package into separate RPMS, putting most plugins out by themselves. * Fri Jun 01 2001 Christian Schaller - Updated with change suggestions from Dennis Bjorklund * Tue Jan 09 2001 Erik Walthinsen - updated to build -devel package as well * Sun Jan 30 2000 Erik Walthinsen - first draft of spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gstreamer08/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2006 14:40:38 -0000 1.1 +++ .cvsignore 5 Mar 2006 14:41:39 -0000 1.2 @@ -0,0 +1 @@ +gstreamer-0.8.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gstreamer08/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2006 14:40:38 -0000 1.1 +++ sources 5 Mar 2006 14:41:39 -0000 1.2 @@ -0,0 +1 @@ +80f3c4957ab3e254cc90016f87ba5482 gstreamer-0.8.12.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 5 14:54:00 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 09:54:00 -0500 Subject: devel/libcmml .cvsignore, 1.2, 1.3 libcmml.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603051454.k25EsWLZ028024@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libcmml In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27993 Modified Files: .cvsignore libcmml.spec sources Log Message: new release; rebuild for FE5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/libcmml/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jun 2005 18:15:19 -0000 1.2 +++ .cvsignore 5 Mar 2006 14:53:59 -0000 1.3 @@ -1 +1 @@ -libcmml-0.9.0.tar.gz +libcmml-0.9.1.tar.gz Index: libcmml.spec =================================================================== RCS file: /cvs/extras/devel/libcmml/libcmml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libcmml.spec 16 Jun 2005 19:06:23 -0000 1.2 +++ libcmml.spec 5 Mar 2006 14:53:59 -0000 1.3 @@ -1,6 +1,6 @@ Name: libcmml -Version: 0.9.0 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Library for handling Continuous Media Markup Language Group: System Environment/Libraries @@ -86,6 +86,10 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.1-1 +- new upstream release + * Thu Jun 16 2005 Thomas Vander Stichele - 0.9.0-2: suggestions from Ville Index: sources =================================================================== RCS file: /cvs/extras/devel/libcmml/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 18:15:19 -0000 1.2 +++ sources 5 Mar 2006 14:53:59 -0000 1.3 @@ -1 +1 @@ -1b994bf38ee4be6ad168047c3a8b2331 libcmml-0.9.0.tar.gz +f74413fd4f10b01cdce55752b1df2497 libcmml-0.9.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 15:04:00 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 10:04:00 -0500 Subject: rpms/gstreamer08/devel gstreamer08.spec,1.1,1.2 Message-ID: <200603051504.k25F4bNl030010@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29993 Modified Files: gstreamer08.spec Log Message: * Sun Mar 5 2006 Brian Pepple - 0.8.12-4 - Add dist tag. Index: gstreamer08.spec =================================================================== RCS file: /cvs/extras/rpms/gstreamer08/devel/gstreamer08.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gstreamer08.spec 5 Mar 2006 14:41:39 -0000 1.1 +++ gstreamer08.spec 5 Mar 2006 15:04:00 -0000 1.2 @@ -10,7 +10,7 @@ Name: %{gstreamer} Version: 0.8.12 -Release: 3 +Release: 4%{?dist} Summary: GStreamer streaming media framework runtime Group: Applications/Multimedia @@ -150,6 +150,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Sun Mar 5 2006 Brian Pepple - 0.8.12-4 +- Add dist tag. + * Sat Mar 4 2006 Brian Pepple - 0.8.12-3 - Fix rpath issues (Thanks to Michael Schwendt). From fedora-extras-commits at redhat.com Sun Mar 5 15:07:45 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 5 Mar 2006 10:07:45 -0500 Subject: owners owners.list,1.708,1.709 Message-ID: <200603051508.k25F8Sp6030103@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30086 Modified Files: owners.list Log Message: Add gstreamer08 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.708 retrieving revision 1.709 diff -u -r1.708 -r1.709 --- owners.list 5 Mar 2006 11:15:36 -0000 1.708 +++ owners.list 5 Mar 2006 15:07:39 -0000 1.709 @@ -381,6 +381,7 @@ Fedora Extras|grip|Front-end for CD rippers and Ogg Vorbis encoders|adrian at lisas.de|extras-qa at fedoraproject.org| Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gstreamer-python|Python bindings for GStreamer|thomas at apestaart.org|extras-qa at fedoraproject.org| +Fedora Extras|gstreamer08|GStreamer streaming media framework runtime|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gstreamer08-python|Python bindings for GStreamer 0.8|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 5 15:09:23 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:09:23 -0500 Subject: devel/libannodex libannodex.man.patch, NONE, 1.1 libannodex.spec, 1.3, 1.4 Message-ID: <200603051509.k25F9thC030143@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libannodex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30119 Modified Files: libannodex.spec Added Files: libannodex.man.patch Log Message: add patch libannodex.man.patch: --- NEW FILE libannodex.man.patch --- Index: configure.ac =================================================================== --- configure.ac (revision 2140) +++ configure.ac (working copy) @@ -38,8 +38,8 @@ fi # Check for docbook -AC_CHECK_PROG(HAVE_DOCBOOKTOMAN, docbook-to-man, true, false) -AM_CONDITIONAL(HAVE_DOCBOOKTOMAN,$HAVE_DOCBOOKTOMAN) +AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, false) +AM_CONDITIONAL(HAVE_DOCBOOKTOMAN, test "x$DOCBOOKTOMAN" != "xfalse") AC_CHECK_PROG(HAVE_DOCBOOK2HTML, docbook2html, true, false) AM_CONDITIONAL(HAVE_DOCBOOK2HTML,$HAVE_DOCBOOK2HTML) Index: doc/Makefile.am =================================================================== --- doc/Makefile.am (revision 2140) +++ doc/Makefile.am (working copy) @@ -64,7 +64,7 @@ if HAVE_DOCBOOKTOMAN %.1: %.1.sgml - docbook-to-man $< > $@ + $(DOCBOOKTOMAN) $< > $@ else %.1: %.1.sgml endif Index: libannodex.spec =================================================================== RCS file: /cvs/extras/devel/libannodex/libannodex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libannodex.spec 5 Mar 2006 14:31:36 -0000 1.3 +++ libannodex.spec 5 Mar 2006 15:09:22 -0000 1.4 @@ -1,12 +1,13 @@ Name: libannodex Version: 0.7.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Library for annotating and indexing networked media Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/libannodex/download/%{name}-%{version}.tar.gz +Patch: libannodex.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig @@ -17,6 +18,11 @@ BuildRequires: libcmml-devel >= 0.8 BuildRequires: libsndfile-devel +# because of patch +BuildRequires: libtool +BuildRequires: autoconf +BuildRequires: automake + # libtool BuildRequires: gcc-c++ @@ -40,6 +46,12 @@ %prep %setup -q -n %{name}-%{version} +%patch + +aclocal -I m4 +libtoolize +autoconf +automake %build %configure @@ -91,6 +103,10 @@ %changelog * Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-2 +- added patch for man pages + +* Sun Mar 05 2006 Thomas Vander Stichele - 0.7.3-1 - new upstream release - rebuilt for FE5 From fedora-extras-commits at redhat.com Sun Mar 5 15:12:18 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:12:18 -0500 Subject: rpms/libcmml/FC-4 .cvsignore, 1.2, 1.3 libcmml.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603051512.k25FCq4G030225@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libcmml/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30199 Modified Files: .cvsignore libcmml.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jun 2005 18:15:19 -0000 1.2 +++ .cvsignore 5 Mar 2006 15:12:18 -0000 1.3 @@ -1 +1 @@ -libcmml-0.9.0.tar.gz +libcmml-0.9.1.tar.gz Index: libcmml.spec =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-4/libcmml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libcmml.spec 16 Jun 2005 19:06:23 -0000 1.2 +++ libcmml.spec 5 Mar 2006 15:12:18 -0000 1.3 @@ -1,6 +1,6 @@ Name: libcmml -Version: 0.9.0 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Library for handling Continuous Media Markup Language Group: System Environment/Libraries @@ -86,6 +86,10 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.1-1 +- new upstream release + * Thu Jun 16 2005 Thomas Vander Stichele - 0.9.0-2: suggestions from Ville Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 18:15:19 -0000 1.2 +++ sources 5 Mar 2006 15:12:18 -0000 1.3 @@ -1 +1 @@ -1b994bf38ee4be6ad168047c3a8b2331 libcmml-0.9.0.tar.gz +f74413fd4f10b01cdce55752b1df2497 libcmml-0.9.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 15:13:35 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:13:35 -0500 Subject: rpms/libcmml/FC-3 .cvsignore, 1.2, 1.3 libcmml.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603051514.k25FE7Oh030291@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libcmml/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30267 Modified Files: .cvsignore libcmml.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Jun 2005 18:15:19 -0000 1.2 +++ .cvsignore 5 Mar 2006 15:13:34 -0000 1.3 @@ -1 +1 @@ -libcmml-0.9.0.tar.gz +libcmml-0.9.1.tar.gz Index: libcmml.spec =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-3/libcmml.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libcmml.spec 16 Jun 2005 19:06:23 -0000 1.2 +++ libcmml.spec 5 Mar 2006 15:13:34 -0000 1.3 @@ -1,6 +1,6 @@ Name: libcmml -Version: 0.9.0 -Release: 2%{?dist} +Version: 0.9.1 +Release: 1%{?dist} Summary: Library for handling Continuous Media Markup Language Group: System Environment/Libraries @@ -86,6 +86,10 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.1-1 +- new upstream release + * Thu Jun 16 2005 Thomas Vander Stichele - 0.9.0-2: suggestions from Ville Index: sources =================================================================== RCS file: /cvs/extras/rpms/libcmml/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Jun 2005 18:15:19 -0000 1.2 +++ sources 5 Mar 2006 15:13:34 -0000 1.3 @@ -1 +1 @@ -1b994bf38ee4be6ad168047c3a8b2331 libcmml-0.9.0.tar.gz +f74413fd4f10b01cdce55752b1df2497 libcmml-0.9.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 15:24:48 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:24:48 -0500 Subject: devel/libannodex libannodex.spec,1.4,1.5 Message-ID: <200603051525.k25FPKtw030418@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libannodex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30400 Modified Files: libannodex.spec Log Message: add buildrequires Index: libannodex.spec =================================================================== RCS file: /cvs/extras/devel/libannodex/libannodex.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libannodex.spec 5 Mar 2006 15:09:22 -0000 1.4 +++ libannodex.spec 5 Mar 2006 15:24:48 -0000 1.5 @@ -1,6 +1,6 @@ Name: libannodex Version: 0.7.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for annotating and indexing networked media Group: System Environment/Libraries @@ -13,6 +13,7 @@ Requires(post): /sbin/ldconfig BuildRequires: doxygen +BuildRequires: docbook-utils BuildRequires: libogg-devel >= 1.0 BuildRequires: liboggz-devel >= 0.9.1 BuildRequires: libcmml-devel >= 0.8 @@ -103,6 +104,10 @@ %changelog * Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-3 +- added docbook-utils, needed for man page build + +* Sun Mar 05 2006 Thomas Vander Stichele - 0.7.3-2 - added patch for man pages From fedora-extras-commits at redhat.com Sun Mar 5 15:44:04 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:44:04 -0500 Subject: rpms/libannodex/FC-4 libannodex.man.patch, NONE, 1.1 libannodex.spec, 1.3, 1.4 Message-ID: <200603051544.k25Fia7m030529@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30489 Modified Files: libannodex.spec Added Files: libannodex.man.patch Log Message: new version libannodex.man.patch: --- NEW FILE libannodex.man.patch --- Index: configure.ac =================================================================== --- configure.ac (revision 2140) +++ configure.ac (working copy) @@ -38,8 +38,8 @@ fi # Check for docbook -AC_CHECK_PROG(HAVE_DOCBOOKTOMAN, docbook-to-man, true, false) -AM_CONDITIONAL(HAVE_DOCBOOKTOMAN,$HAVE_DOCBOOKTOMAN) +AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, false) +AM_CONDITIONAL(HAVE_DOCBOOKTOMAN, test "x$DOCBOOKTOMAN" != "xfalse") AC_CHECK_PROG(HAVE_DOCBOOK2HTML, docbook2html, true, false) AM_CONDITIONAL(HAVE_DOCBOOK2HTML,$HAVE_DOCBOOK2HTML) Index: doc/Makefile.am =================================================================== --- doc/Makefile.am (revision 2140) +++ doc/Makefile.am (working copy) @@ -64,7 +64,7 @@ if HAVE_DOCBOOKTOMAN %.1: %.1.sgml - docbook-to-man $< > $@ + $(DOCBOOKTOMAN) $< > $@ else %.1: %.1.sgml endif Index: libannodex.spec =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-4/libannodex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libannodex.spec 5 Mar 2006 14:35:07 -0000 1.3 +++ libannodex.spec 5 Mar 2006 15:44:03 -0000 1.4 @@ -1,22 +1,29 @@ Name: libannodex Version: 0.7.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Library for annotating and indexing networked media Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/libannodex/download/%{name}-%{version}.tar.gz +Patch: libannodex.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig BuildRequires: doxygen +BuildRequires: docbook-utils BuildRequires: libogg-devel >= 1.0 BuildRequires: liboggz-devel >= 0.9.1 BuildRequires: libcmml-devel >= 0.8 BuildRequires: libsndfile-devel +# because of patch +BuildRequires: libtool +BuildRequires: autoconf +BuildRequires: automake + # libtool BuildRequires: gcc-c++ @@ -40,6 +47,12 @@ %prep %setup -q -n %{name}-%{version} +%patch + +aclocal -I m4 +libtoolize +autoconf +automake %build %configure @@ -58,7 +71,7 @@ %clean rm -rf $RPM_BUILD_ROOT - + %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README @@ -91,7 +104,16 @@ %changelog * Sun Mar 05 2006 Thomas Vander Stichele -- 0.7.3-1: new upstream release +- 0.7.3-3 +- added docbook-utils, needed for man page build + +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-2 +- added patch for man pages + +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-1 +- new upstream release * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release From fedora-extras-commits at redhat.com Sun Mar 5 15:44:19 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:44:19 -0500 Subject: devel/libannodex libannodex.spec,1.5,1.6 Message-ID: <200603051544.k25FipWt030565@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libannodex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30512 Modified Files: libannodex.spec Log Message: removed a line, easier to keep in sync between versions Index: libannodex.spec =================================================================== RCS file: /cvs/extras/devel/libannodex/libannodex.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- libannodex.spec 5 Mar 2006 15:24:48 -0000 1.5 +++ libannodex.spec 5 Mar 2006 15:44:19 -0000 1.6 @@ -114,7 +114,6 @@ * Sun Mar 05 2006 Thomas Vander Stichele - 0.7.3-1 - new upstream release -- rebuilt for FE5 * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release From fedora-extras-commits at redhat.com Sun Mar 5 15:45:30 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:45:30 -0500 Subject: rpms/libannodex/FC-3 libannodex.spec,1.3,1.4 Message-ID: <200603051546.k25Fk2gD030593@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30576 Modified Files: libannodex.spec Log Message: new version Index: libannodex.spec =================================================================== RCS file: /cvs/extras/rpms/libannodex/FC-3/libannodex.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libannodex.spec 5 Mar 2006 14:32:49 -0000 1.3 +++ libannodex.spec 5 Mar 2006 15:45:30 -0000 1.4 @@ -1,22 +1,29 @@ Name: libannodex Version: 0.7.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Library for annotating and indexing networked media Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/libannodex/download/%{name}-%{version}.tar.gz +Patch: libannodex.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig BuildRequires: doxygen +BuildRequires: docbook-utils BuildRequires: libogg-devel >= 1.0 BuildRequires: liboggz-devel >= 0.9.1 BuildRequires: libcmml-devel >= 0.8 BuildRequires: libsndfile-devel +# because of patch +BuildRequires: libtool +BuildRequires: autoconf +BuildRequires: automake + # libtool BuildRequires: gcc-c++ @@ -40,6 +47,12 @@ %prep %setup -q -n %{name}-%{version} +%patch + +aclocal -I m4 +libtoolize +autoconf +automake %build %configure @@ -58,7 +71,7 @@ %clean rm -rf $RPM_BUILD_ROOT - + %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING README @@ -91,7 +104,16 @@ %changelog * Sun Mar 05 2006 Thomas Vander Stichele -- 0.7.3-1: new upstream release +- 0.7.3-3 +- added docbook-utils, needed for man page build + +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-2 +- added patch for man pages + +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.7.3-1 +- new upstream release * Sun Nov 13 2005 Thomas Vander Stichele - 0.7.2-1: new upstream release From fedora-extras-commits at redhat.com Sun Mar 5 15:47:35 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:47:35 -0500 Subject: rpms/libannodex/FC-3 libannodex.man.patch,NONE,1.1 Message-ID: <200603051547.k25FlbeX030652@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30640 Added Files: libannodex.man.patch Log Message: add patch libannodex.man.patch: --- NEW FILE libannodex.man.patch --- Index: configure.ac =================================================================== --- configure.ac (revision 2140) +++ configure.ac (working copy) @@ -38,8 +38,8 @@ fi # Check for docbook -AC_CHECK_PROG(HAVE_DOCBOOKTOMAN, docbook-to-man, true, false) -AM_CONDITIONAL(HAVE_DOCBOOKTOMAN,$HAVE_DOCBOOKTOMAN) +AC_CHECK_PROGS(DOCBOOKTOMAN, docbook-to-man docbook2man, false) +AM_CONDITIONAL(HAVE_DOCBOOKTOMAN, test "x$DOCBOOKTOMAN" != "xfalse") AC_CHECK_PROG(HAVE_DOCBOOK2HTML, docbook2html, true, false) AM_CONDITIONAL(HAVE_DOCBOOK2HTML,$HAVE_DOCBOOK2HTML) Index: doc/Makefile.am =================================================================== --- doc/Makefile.am (revision 2140) +++ doc/Makefile.am (working copy) @@ -64,7 +64,7 @@ if HAVE_DOCBOOKTOMAN %.1: %.1.sgml - docbook-to-man $< > $@ + $(DOCBOOKTOMAN) $< > $@ else %.1: %.1.sgml endif From fedora-extras-commits at redhat.com Sun Mar 5 15:54:08 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:54:08 -0500 Subject: devel/liboggz .cvsignore, 1.4, 1.5 liboggz.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603051554.k25FsfSH030867@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/liboggz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30839 Modified Files: .cvsignore liboggz.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/devel/liboggz/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Nov 2005 10:49:01 -0000 1.4 +++ .cvsignore 5 Mar 2006 15:54:08 -0000 1.5 @@ -1 +1 @@ -liboggz-0.9.3.tar.gz +liboggz-0.9.4.tar.gz Index: liboggz.spec =================================================================== RCS file: /cvs/extras/devel/liboggz/liboggz.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liboggz.spec 13 Nov 2005 10:52:45 -0000 1.5 +++ liboggz.spec 5 Mar 2006 15:54:08 -0000 1.6 @@ -7,18 +7,12 @@ License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz -Patch: liboggz.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel >= 1.0 BuildRequires: doxygen BuildRequires: docbook-utils -# because of patch -BuildRequires: libtool -BuildRequires: autoconf -BuildRequires: automake - # libtool BuildRequires: gcc-c++ @@ -44,12 +38,6 @@ %prep %setup -q -n %{name}-%{version} -%patch - -aclocal -I m4 -libtoolize -autoconf -automake %build %configure @@ -90,6 +78,11 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.4-1 +- new upstream release +- removed patch, was applied upstream + * Sat Nov 12 2005 Thomas Vander Stichele - 0.9.3-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/devel/liboggz/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Nov 2005 10:49:01 -0000 1.4 +++ sources 5 Mar 2006 15:54:08 -0000 1.5 @@ -1 +1 @@ -0e0475196418c63ac20cd6e7a91531e6 liboggz-0.9.3.tar.gz +e46b4e8161e16a41f8035363fb1603dd liboggz-0.9.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 15:55:24 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:55:24 -0500 Subject: rpms/libannodex/FC-3 libannodex.autotools.patch, 1.1, NONE libannodex.cmml.patch, 1.1, NONE Message-ID: <200603051555.k25FtQvE030895@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30886 Removed Files: libannodex.autotools.patch libannodex.cmml.patch Log Message: remove old patches --- libannodex.autotools.patch DELETED --- --- libannodex.cmml.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 5 15:56:11 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:56:11 -0500 Subject: rpms/libannodex/FC-4 libannodex.autotools.patch, 1.1, NONE libannodex.cmml.patch, 1.1, NONE Message-ID: <200603051556.k25FuD4M030923@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libannodex/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30914 Removed Files: libannodex.autotools.patch libannodex.cmml.patch Log Message: remove old patches --- libannodex.autotools.patch DELETED --- --- libannodex.cmml.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 5 15:59:22 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 10:59:22 -0500 Subject: devel/liboggz liboggz.spec,1.6,1.7 Message-ID: <200603051559.k25Fxsrh031001@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/liboggz In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30979 Modified Files: liboggz.spec Log Message: new version Index: liboggz.spec =================================================================== RCS file: /cvs/extras/devel/liboggz/liboggz.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- liboggz.spec 5 Mar 2006 15:54:08 -0000 1.6 +++ liboggz.spec 5 Mar 2006 15:59:22 -0000 1.7 @@ -1,6 +1,6 @@ Name: liboggz -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.4 +Release: 1%{?dist} Summary: Simple programming interface for Ogg files and streams Group: System Environment/Libraries From fedora-extras-commits at redhat.com Sun Mar 5 16:00:57 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 11:00:57 -0500 Subject: rpms/liboggz/FC-4 .cvsignore, 1.4, 1.5 liboggz.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603051601.k25G1TTE000449@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/liboggz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31077 Modified Files: .cvsignore liboggz.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Nov 2005 10:49:01 -0000 1.4 +++ .cvsignore 5 Mar 2006 16:00:56 -0000 1.5 @@ -1 +1 @@ -liboggz-0.9.3.tar.gz +liboggz-0.9.4.tar.gz Index: liboggz.spec =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-4/liboggz.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liboggz.spec 13 Nov 2005 10:52:45 -0000 1.5 +++ liboggz.spec 5 Mar 2006 16:00:56 -0000 1.6 @@ -1,24 +1,18 @@ Name: liboggz -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.4 +Release: 1%{?dist} Summary: Simple programming interface for Ogg files and streams Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz -Patch: liboggz.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel >= 1.0 BuildRequires: doxygen BuildRequires: docbook-utils -# because of patch -BuildRequires: libtool -BuildRequires: autoconf -BuildRequires: automake - # libtool BuildRequires: gcc-c++ @@ -44,12 +38,6 @@ %prep %setup -q -n %{name}-%{version} -%patch - -aclocal -I m4 -libtoolize -autoconf -automake %build %configure @@ -90,6 +78,11 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.4-1 +- new upstream release +- removed patch, was applied upstream + * Sat Nov 12 2005 Thomas Vander Stichele - 0.9.3-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Nov 2005 10:49:01 -0000 1.4 +++ sources 5 Mar 2006 16:00:56 -0000 1.5 @@ -1 +1 @@ -0e0475196418c63ac20cd6e7a91531e6 liboggz-0.9.3.tar.gz +e46b4e8161e16a41f8035363fb1603dd liboggz-0.9.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 16:02:34 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 11:02:34 -0500 Subject: rpms/liboggz/FC-3 .cvsignore, 1.4, 1.5 liboggz.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603051603.k25G3BUm000524@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/liboggz/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv503 Modified Files: .cvsignore liboggz.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Nov 2005 10:49:01 -0000 1.4 +++ .cvsignore 5 Mar 2006 16:02:34 -0000 1.5 @@ -1 +1 @@ -liboggz-0.9.3.tar.gz +liboggz-0.9.4.tar.gz Index: liboggz.spec =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-3/liboggz.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- liboggz.spec 13 Nov 2005 10:52:45 -0000 1.5 +++ liboggz.spec 5 Mar 2006 16:02:34 -0000 1.6 @@ -1,24 +1,18 @@ Name: liboggz -Version: 0.9.3 -Release: 2%{?dist} +Version: 0.9.4 +Release: 1%{?dist} Summary: Simple programming interface for Ogg files and streams Group: System Environment/Libraries License: BSD URL: http://www.annodex.net/ Source: http://www.annodex.net/software/liboggz/download/%{name}-%{version}.tar.gz -Patch: liboggz.man.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libogg-devel >= 1.0 BuildRequires: doxygen BuildRequires: docbook-utils -# because of patch -BuildRequires: libtool -BuildRequires: autoconf -BuildRequires: automake - # libtool BuildRequires: gcc-c++ @@ -44,12 +38,6 @@ %prep %setup -q -n %{name}-%{version} -%patch - -aclocal -I m4 -libtoolize -autoconf -automake %build %configure @@ -90,6 +78,11 @@ %postun -p /sbin/ldconfig %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.9.4-1 +- new upstream release +- removed patch, was applied upstream + * Sat Nov 12 2005 Thomas Vander Stichele - 0.9.3-1 - new upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboggz/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Nov 2005 10:49:01 -0000 1.4 +++ sources 5 Mar 2006 16:02:34 -0000 1.5 @@ -1 +1 @@ -0e0475196418c63ac20cd6e7a91531e6 liboggz-0.9.3.tar.gz +e46b4e8161e16a41f8035363fb1603dd liboggz-0.9.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 16:03:49 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 11:03:49 -0500 Subject: devel/mod_annodex mod_annodex.spec,1.1,1.2 Message-ID: <200603051604.k25G4NHJ000583@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/mod_annodex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv566 Modified Files: mod_annodex.spec Log Message: rebuild for FE5 Index: mod_annodex.spec =================================================================== RCS file: /cvs/extras/devel/mod_annodex/mod_annodex.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_annodex.spec 13 Jun 2005 18:42:46 -0000 1.1 +++ mod_annodex.spec 5 Mar 2006 16:03:48 -0000 1.2 @@ -1,6 +1,6 @@ Name: mod_annodex Version: 0.2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Apache module for server-side support of annodex media Group: System Environment/Daemons @@ -71,6 +71,10 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/*.conf %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 0.2.2-3 +- rebuild + * Mon Jun 13 2005 Thomas Vander Stichele - 0.2.2-2: rpmlint fixes From fedora-extras-commits at redhat.com Sun Mar 5 16:34:30 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Sun, 5 Mar 2006 11:34:30 -0500 Subject: rpms/regexxer/devel regexxer.spec,1.4,1.5 Message-ID: <200603051635.k25GZ2P7000780@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/regexxer/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv763 Modified Files: regexxer.spec Log Message: 0.8-4: Fix #184001, #173869 and a typo Index: regexxer.spec =================================================================== RCS file: /cvs/extras/rpms/regexxer/devel/regexxer.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- regexxer.spec 15 Feb 2006 01:05:35 -0000 1.4 +++ regexxer.spec 5 Mar 2006 16:34:29 -0000 1.5 @@ -1,6 +1,6 @@ Name: regexxer Version: 0.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A nifty GUI search/replace tool Group: Applications/Text @@ -26,6 +26,10 @@ %build +# Workaround for libglade bug (#184038) +%if "%{?fedora}" > "4" +CXXFLAGS="${RPM_OPT_FLAGS} -Wl,--export-dynamic" +%endif %configure make %{?_smp_mflags} @@ -53,7 +57,6 @@ export 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 @@ -61,7 +64,6 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : -killall -HUP gconfd-2 || : %preun @@ -69,7 +71,6 @@ export 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 @@ -84,7 +85,12 @@ %changelog -* Wed Feb 15 2006 Christoph Wickert - 0.8.3 +* Sun Mar 05 2006 Christoph Wickert - 0.8-4 +- Compile with "-Wl,--export-dynamic" on Core 5 (#184001). +- Don't kill gconfd in %pre, %post and %preun any longer (#173869). +- Fix typo in %changelog. + +* Wed Feb 15 2006 Christoph Wickert - 0.8-3 - Rebuild for Fedora Extras 5. * Wed Sep 23 2005 Christoph Wickert - 0.8-2 From fedora-extras-commits at redhat.com Sun Mar 5 16:53:39 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sun, 5 Mar 2006 11:53:39 -0500 Subject: rpms/shapelib/devel shapelib-1.2.10-Makefile.patch, NONE, 1.1 shapelib-1.2.10-Makefile2.patch, NONE, 1.1 shapelib.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200603051654.k25GsBFp000947@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/shapelib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv918 Modified Files: shapelib.spec sources Added Files: shapelib-1.2.10-Makefile.patch shapelib-1.2.10-Makefile2.patch Log Message: Updated with current cvs snapshot shapelib-1.2.10-Makefile.patch: --- NEW FILE shapelib-1.2.10-Makefile.patch --- --- shapelib-1.2.11-orig/Makefile 2006-01-07 13:06:27.000000000 -0800 +++ shapelib-1.2.11/Makefile 2006-03-04 19:58:22.000000000 -0800 @@ -1,11 +1,12 @@ - -#LINKOPT = /usr/local/lib/libdbmalloc.a -#LINKOPT = /usr/local/lib/cpl.a -CFLAGS = -g -#CFLAGS = -g -DUSE_CPL INSTALL = /usr/bin/install LD = /usr/bin/ld -#CC = g++ + +bindir = /usr/local/bin +libdir = /usr/local/lib +includedir = /usr/local/include + +CC = gcc +CFLAGS = -g default: all @@ -100,25 +101,25 @@ # The following is contributed by Jan-Oliver Wagner, and should allow for # creating shared libraries on most platforms with gcc, and libtool installed. -SHPLIB_VERSION=1.2.9 +SHPLIB_VERSION=1.2.11 LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry lib: - /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shpopen.c -o .libs/shpopen.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o >/dev/null 2>&1 + /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shpopen.c + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c -fPIC -DPIC shpopen.c -o .libs/shpopen.lo + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shpopen.c -o shpopen.o >/dev/null 2>&1 mv -f .libs/shpopen.lo shpopen.lo - /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c + /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shptree.c rm -f .libs/shptree.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shptree.c -o .libs/shptree.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o >/dev/null 2>&1 + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c -fPIC -DPIC shptree.c -o .libs/shptree.lo + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c shptree.c -o shptree.o >/dev/null 2>&1 mv -f .libs/shptree.lo shptree.lo - /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c + /bin/sh ./libtool --mode=compile $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c dbfopen.c rm -f .libs/dbfopen.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo - gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o >/dev/null 2>&1 + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo + $(CC) -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1 -I. $(CFLAGS) $(LINKOPTS) -c dbfopen.c -o dbfopen.o >/dev/null 2>&1 mv -f .libs/dbfopen.lo dbfopen.lo - /bin/sh ./libtool --mode=link gcc -g -O2 -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo + /bin/sh ./libtool --mode=link $(CC) $(CFLAGS) $(LINKOPTS) -o libshp.la -rpath $(libdir) -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.* rm -fr .libs/libshp.lax mkdir .libs/libshp.lax @@ -133,15 +134,21 @@ lib_install: cp .libs/libshp.la .libs/libshp.lai - /bin/sh ./mkinstalldirs /usr/local/lib - /bin/sh ./libtool --mode=install $(INSTALL) -c libshp.la /usr/local/lib/libshp.la - $(INSTALL) -c .libs/libshp.so.$(LIBSHP_VERSION) /usr/local/lib/libshp.so.$(LIBSHP_VERSION) - (cd /usr/local/lib && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) - (cd /usr/local/lib && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) - chmod +x /usr/local/lib/libshp.so.$(LIBSHP_VERSION) - $(INSTALL) -c .libs/libshp.la /usr/local/lib/libshp.la - $(INSTALL) -c .libs/libshp.a /usr/local/lib/libshp.a - ranlib /usr/local/lib/libshp.a - chmod 644 /usr/local/lib/libshp.a - /bin/sh ./mkinstalldirs /usr/local/include/libshp - $(INSTALL) -c -m 644 shapefil.h /usr/local/include/libshp/shapefil.h + /bin/sh ./mkinstalldirs $(libdir) + /bin/sh ./libtool --mode=install $(INSTALL) -c libshp.la $(libdir)/libshp.la + $(INSTALL) -c .libs/libshp.so.$(LIBSHP_VERSION) $(libdir)/libshp.so.$(LIBSHP_VERSION) + (cd $(libdir) && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) + (cd $(libdir) && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) + chmod +x $(libdir)/libshp.so.$(LIBSHP_VERSION) + $(INSTALL) -c .libs/libshp.la $(libdir)/libshp.la + $(INSTALL) -c .libs/libshp.a $(libdir)/libshp.a + ranlib $(libdir)/libshp.a + chmod 644 $(libdir)/libshp.a + /bin/sh ./mkinstalldirs $(includedir)/libshp + $(INSTALL) -c -m 644 shapefil.h $(includedir)/libshp/shapefil.h + +bin_install: all + mkdir -p $(bindir) + install dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shptest $(bindir)/ + +install: bin_install lib_install shapelib-1.2.10-Makefile2.patch: --- NEW FILE shapelib-1.2.10-Makefile2.patch --- --- shapelib-1.2.11-orig/contrib/Makefile 2006-01-07 12:34:14.000000000 -0800 +++ shapelib-1.2.11/contrib/Makefile 2006-03-04 20:11:01.000000000 -0800 @@ -1,9 +1,10 @@ +bindir = /usr/local/bin #LINKOPT = /usr/local/lib/libdbmalloc.a #CFLAGS = -g # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN -ENDIAN = -D_LITTLE_ENDIAN +# ENDIAN = -D_LITTLE_ENDIAN CFLAGS = -g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 @@ -64,3 +65,7 @@ testproj: tests/shpproj.sh + +install: all + install dbfcat dbfinfo shpcat shpcentrd shpdata shpdxf shpfix shpinfo shpwkb shpproj \ + $(bindir) Index: shapelib.spec =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- shapelib.spec 5 Mar 2006 01:53:52 -0000 1.7 +++ shapelib.spec 5 Mar 2006 16:53:38 -0000 1.8 @@ -2,15 +2,14 @@ Summary: API in "C" for Shapefile handling Name: shapelib Version: 1.2.10 -Release: 9 +Release: 10.20060304cvs URL: http://shapelib.maptools.org/ Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz -Patch0: shapelib-%{version}.patch +Patch0: shapelib-1.2.10-Makefile.patch Patch1: shapelib-1.2.10-endian.patch -Patch2: shapelib-1.2.10-gcc4.patch +Patch2: shapelib-1.2.10-Makefile2.patch License: LGPL/MIT Group: Development/Libraries -Buildrequires: libtool BuildRequires: proj-devel >= 4.4.1 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -32,7 +31,7 @@ %setup -q -T -b 0 %patch -p1 -b .buildroot %patch1 -p1 -b .endian -%patch2 -p1 -b .gcc4 +%patch2 -p1 -b .buildroot %build make %{?_smp_mflags} libdir=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" lib @@ -61,7 +60,7 @@ %{_bindir}/* %{_libdir}/*.so.* -%doc LICENSE.LGPL README README.tree dbf_api.html shapelib.html shp_api.html +%doc LICENSE.LGPL README README.tree web/*.html %doc contrib/doc/shpproj.txt stream1.sh stream1.out stream2.sh %doc stream2.out makeshape.sh stream3.out ChangeLog @@ -73,6 +72,9 @@ %exclude %{_libdir}/libshp.la %changelog +* Sat Mar 4 2006 Shawn McCann - 1.2.10-10.20060304cvs +- Upgraded to cvs snapshot taken on March 4, 2006 + * Sat Mar 4 2006 Shawn McCann - 1.2.10-9 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Jan 2005 09:47:28 -0000 1.2 +++ sources 5 Mar 2006 16:53:38 -0000 1.3 @@ -1 +1 @@ -4d96bd926167193d27bf14d56e2d484e shapelib-1.2.10.tar.gz +1bec42cacea2792790530f6c5ec6664c shapelib-1.2.10.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 17:07:59 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 12:07:59 -0500 Subject: devel/libshout libshout.spec,1.8,1.9 Message-ID: <200603051708.k25H8WgH002891@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/libshout In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2874 Modified Files: libshout.spec Log Message: rebuild for FE5 Index: libshout.spec =================================================================== RCS file: /cvs/extras/devel/libshout/libshout.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libshout.spec 22 May 2005 23:50:52 -0000 1.8 +++ libshout.spec 5 Mar 2006 17:07:59 -0000 1.9 @@ -1,7 +1,7 @@ Name: libshout Version: 1.0.9 -Release: 4 -Summary: icecast source streaming library. +Release: 5%{?dist} +Summary: icecast source streaming library Group: Libraries/Multimedia License: LGPL @@ -62,9 +62,11 @@ %dir %{_includedir}/shout/ %{_includedir}/shout/shout.h -# ----------------------------------------------------------------------------- - %changelog +* Sun Mar 05 2006 Thomas Vander Stichele +- 1.0.9-5 +- rebuild + * Sun May 22 2005 Jeremy Katz - 1.0.9-4 - rebuild on all arches From fedora-extras-commits at redhat.com Sun Mar 5 17:09:36 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Sun, 5 Mar 2006 12:09:36 -0500 Subject: devel/python-twisted python-twisted.spec,1.4,1.5 Message-ID: <200603051710.k25HA9tI002949@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/devel/python-twisted In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2932 Modified Files: python-twisted.spec Log Message: rebuild for FE5 Index: python-twisted.spec =================================================================== RCS file: /cvs/extras/devel/python-twisted/python-twisted.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-twisted.spec 25 Jan 2006 15:58:08 -0000 1.4 +++ python-twisted.spec 5 Mar 2006 17:09:36 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Event-driven networking framework written in Python Name: python-twisted Version: 1.3.0 -Release: 4 +Release: 5%{?dist} License: LGPL Group: Applications/Internet From fedora-extras-commits at redhat.com Sun Mar 5 19:11:56 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:11:56 -0500 Subject: rpms/bakery - New directory Message-ID: <200603051911.k25JBw6s012417@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409/bakery Log Message: Directory /cvs/extras/rpms/bakery added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 19:12:18 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:12:18 -0500 Subject: rpms/bakery/devel - New directory Message-ID: <200603051912.k25JCKOR012432@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12409/bakery/devel Log Message: Directory /cvs/extras/rpms/bakery/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 19:12:29 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:12:29 -0500 Subject: rpms/bakery Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603051912.k25JCVkG012466@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12454 Added Files: Makefile import.log Log Message: Setup of module bakery --- NEW FILE Makefile --- # Top level Makefile for module bakery all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 5 19:12:37 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:12:37 -0500 Subject: rpms/bakery/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603051912.k25JCdIf012484@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12454/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bakery --- NEW 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 Mar 5 19:13:08 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:13:08 -0500 Subject: rpms/bakery import.log,1.1,1.2 Message-ID: <200603051913.k25JDe76012555@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12521 Modified Files: import.log Log Message: auto-import bakery-2.3.17-1 on branch devel from bakery-2.3.17-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bakery/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Mar 2006 19:12:28 -0000 1.1 +++ import.log 5 Mar 2006 19:13:08 -0000 1.2 @@ -0,0 +1 @@ +bakery-2_3_17-1:HEAD:bakery-2.3.17-1.src.rpm:1141585984 From fedora-extras-commits at redhat.com Sun Mar 5 19:13:25 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:13:25 -0500 Subject: rpms/bakery/devel bakery.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603051913.k25JDvQN012559@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/bakery/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12521/devel Modified Files: .cvsignore sources Added Files: bakery.spec Log Message: auto-import bakery-2.3.17-1 on branch devel from bakery-2.3.17-1.src.rpm --- NEW FILE bakery.spec --- %define major_version 2.3 %define minor_version 17 %define api_version 2.4 Name: bakery Version: %{major_version}.%{minor_version} Release: 1%{?dist} Summary: C++ framework for creating GNOME applications using gtkmm Group: System Environment/Libraries License: LGPL URL: http://bakery.sourceforge.net/ Source0: http://ftp.gnome.org/pub/GNOME/sources/bakery/%{major_version}/bakery-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel >= 2.6.0 BuildRequires: gconfmm26-devel >= 2.6.0 BuildRequires: libglademm24-devel >= 2.4.0 BuildRequires: libxml++-devel >= 2.8.0 BuildRequires: gnome-vfsmm26-devel >= 2.6.0 BuildRequires: doxygen graphviz gettext %description Bakery is a C++ Framework for creating GNOME applications using gtkmm. Bakery provides a Document/View architecture, but it doesn't force you to use the whole architecture. Bakery can use XML as a Document storage format, if you like. Bakery provides default functionality, which can be easily customized, makes it easy to start developing GNOME applications and gives your application structure. Bakery also contains a few utility classes. %package devel Summary: Headers for developing programs that will use %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: gtkmm24-devel Requires: gconfmm26-devel Requires: libglademm24-devel Requires: libxml++-devel Requires: gnome-vfsmm26-devel %description devel This package contains the header files needed for developing %{name} applications. %prep %setup -q %build %configure --disable-static --disable-dependency-tracking --enable-docs make %{?_smp_mflags} make -C docs/reference %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT docs-to-include %makeinstall find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %{__mkdir} docs-to-include %{__cp} docs/*.html docs-to-include/ %{__mkdir} docs-to-include/reference %{__cp} -r docs/reference/html docs-to-include/reference/ %{__rm} -f docs-to-include/reference/html/installdox %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING NEWS README %{_libdir}/*.so.* %files devel %defattr(-, root, root, -) %doc docs-to-include/* %{_includedir}/bakery-%{api_version} %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc %changelog * Sat Mar 4 2006 Denis Leroy - 2.3.17-1 - Update to 2.3.17 - Added gettext and graphviz BuildRequires * Wed Mar 1 2006 Denis Leroy - 2.3.15-3 - Removed deps to ldconfig * Mon Nov 28 2005 Denis Leroy - 2.3.15-1 - First version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bakery/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2006 19:12:36 -0000 1.1 +++ .cvsignore 5 Mar 2006 19:13:24 -0000 1.2 @@ -0,0 +1 @@ +bakery-2.3.17.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bakery/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2006 19:12:36 -0000 1.1 +++ sources 5 Mar 2006 19:13:24 -0000 1.2 @@ -0,0 +1 @@ +d1e78b0f520c125b21340ac73dc6aaab bakery-2.3.17.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 5 19:20:42 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 5 Mar 2006 14:20:42 -0500 Subject: rpms/xemacs-sumo/devel xemacs-sumo.spec,1.16,1.17 Message-ID: <200603051921.k25JLEXY012681@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12664 Modified Files: xemacs-sumo.spec Log Message: * Fri Mar 3 2006 Ville Skytt?? - 20051208-2 - Drop JDE; the full source for jde.jar doesn't seem to be available and even the included parts won't build with gcj eg. due to use of com.sun.* things. Additionally it requires third party jars which are not currently available in Fedora Core or Extras. So let's not inflict a crippled version of JDE on anyone; JDE users can install the upstream jde package using XEmacs package tools. (#180941) Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/devel/xemacs-sumo.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- xemacs-sumo.spec 14 Feb 2006 21:52:24 -0000 1.16 +++ xemacs-sumo.spec 5 Mar 2006 19:20:41 -0000 1.17 @@ -1,9 +1,10 @@ %define sumo 2005-12-08 %define pkgdir %{_datadir}/xemacs +%define xemacsb xemacs-nox -batch -vanilla Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 1 +Release: 2 Summary: XEmacs lisp packages Group: Applications/Editors @@ -20,7 +21,6 @@ Source15: Emacs.ad.ko_KR.UTF-8 Source16: Emacs.ad.zh_CN.UTF-8 Source17: Emacs.ad.zh_TW.UTF-8 -Source20: %{name}-jde-mktoc.pl Patch0: %{name}-20051208-hypb-posix.patch Patch1: %{name}-20051208-pydoc-path.patch Patch2: %{name}-20051208-latin-unity-kludge.patch @@ -30,8 +30,6 @@ Patch8: egg-wnn-host-unix-79826.patch Patch11: browse-url-htmlview-84262.patch Patch12: psgml-browsers-84262.patch -Patch13: jde-ug-rel-links.patch -Patch14: jde-ug-section-links-89499.patch Patch15: avoid-catch-error-65346.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -109,10 +107,6 @@ %patch11 -p0 # update psgml-html preview menu to modern browsers %patch12 -p0 -# fix relative links to elisp in user-guide html doc -%patch13 -p0 -# and section links in toc -%patch14 -p0 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el) %patch15 -p0 @@ -124,35 +118,29 @@ # remove game we shouldn't ship rm xemacs-packages/lisp/games/tetris.el* -# get rid of binary-only tli_rbl treeview applet + some cruft in jde docs -cd xemacs-packages/etc/jde/doc -for foo in jdebug jde ; do - %{__perl} %{SOURCE20} \ - html/$foo-ug/$foo-ug-toc.html tli_rbl/txt/$foo-ug-toc.txt \ - > html/$foo-ug/$foo-ug-toc.html.tmp - mv html/$foo-ug/$foo-ug-toc.html.tmp html/$foo-ug/$foo-ug-toc.html -done -rm -rf tli_rbl src -cd - - rm xemacs-packages/etc/xslt-process/java/{xslt.jar,xslt/*.class} +# not buildable from sources, all deps not met, see 2006-03-03 changelog entry +%{xemacsb} -l package-admin -eval \ + "(package-admin-delete-binary-package 'jde \"xemacs-packages\")" +rm -rf xemacs-packages/{etc,lisp}/jde -%build -export xemacs_batch="xemacs-nox -batch -vanilla" - -# mew is provided by mew-xemacs, and skk by ddskk-xemacs -$xemacs_batch -l package-admin -eval \ +# provided by mew-xemacs +%{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mew \"xemacs-packages\")" rmdir xemacs-packages/{etc,lisp,man}/mew -$xemacs_batch -l package-admin -eval \ + +# provided by ddskk-xemacs +%{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'skk \"mule-packages\")" rmdir mule-packages/{etc,lisp,man}/skk + +%build export EMACSPACKAGEPATH=`pwd` -$xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \ +%{xemacsb} -no-autoloads -eval "(setq make-backup-files nil)" \ -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* -$xemacs_batch -f batch-byte-recompile-directory \ +%{xemacsb} -f batch-byte-recompile-directory \ xemacs-packages/lisp mule-packages/lisp cd xemacs-packages/etc/xslt-process/java @@ -237,6 +225,14 @@ %changelog +* Fri Mar 3 2006 Ville Skytt?? - 20051208-2 +- Drop JDE; the full source for jde.jar doesn't seem to be available + and even the included parts won't build with gcj eg. due to use of + com.sun.* things. Additionally it requires third party jars which are + not currently available in Fedora Core or Extras. So let's not inflict + a crippled version of JDE on anyone; JDE users can install the upstream + jde package using XEmacs package tools. (#180941) + * Sun Feb 12 2006 Ville Skytt?? - Build xslt.jar ourselves (TrAX only), use TrAX by default in xslt-process. From fedora-extras-commits at redhat.com Sun Mar 5 19:23:31 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 5 Mar 2006 14:23:31 -0500 Subject: rpms/xemacs-sumo/devel jde-ug-rel-links.patch, 1.1, NONE jde-ug-section-links-89499.patch, 1.1, NONE xemacs-sumo-jde-mktoc.pl, 1.1, NONE Message-ID: <200603051923.k25JNX3S012733@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12724 Removed Files: jde-ug-rel-links.patch jde-ug-section-links-89499.patch xemacs-sumo-jde-mktoc.pl Log Message: Remove unused files. --- jde-ug-rel-links.patch DELETED --- --- jde-ug-section-links-89499.patch DELETED --- --- xemacs-sumo-jde-mktoc.pl DELETED --- From fedora-extras-commits at redhat.com Sun Mar 5 19:24:58 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 5 Mar 2006 14:24:58 -0500 Subject: owners owners.list,1.709,1.710 Message-ID: <200603051925.k25JPURu012781@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12756 Modified Files: owners.list Log Message: Added bakery Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.709 retrieving revision 1.710 diff -u -r1.709 -r1.710 --- owners.list 5 Mar 2006 15:07:39 -0000 1.709 +++ owners.list 5 Mar 2006 19:24:58 -0000 1.710 @@ -59,6 +59,7 @@ Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|roozbeh at farsiweb.info|extras-qa at fedoraproject.org| Fedora Extras|awstats|Advanced Web Statistics|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|azureus|A BitTorrent Client|green at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|bakery|C++ framework for creating Gnome apps|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|balsa|Balsa Mail Client|pawsa at theochem.kth.se|extras-qa at fedoraproject.org| Fedora Extras|banner|Prints a short string to the console in very large letters|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|banshee|Music tool to easily import, manage, and play selections from your iPod|caillon at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 5 19:29:38 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 5 Mar 2006 14:29:38 -0500 Subject: rpms/xemacs-sumo/FC-4 xemacs-sumo-20051208-trax.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xemacs-sumo.spec, 1.11, 1.12 jde-ug-rel-links.patch, 1.1, NONE jde-ug-section-links-89499.patch, 1.1, NONE Message-ID: <200603051930.k25JUAkL012900@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs-sumo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12874 Modified Files: .cvsignore sources xemacs-sumo.spec Added Files: xemacs-sumo-20051208-trax.patch Removed Files: jde-ug-rel-links.patch jde-ug-section-links-89499.patch Log Message: * Fri Mar 3 2006 Ville Skytt?? - 20051208-2 - Drop JDE; the full source for jde.jar doesn't seem to be available and even the included parts won't build with gcj eg. due to use of com.sun.* things. Additionally it requires third party jars which are not currently available in Fedora Core or Extras. So let's not inflict a crippled version of JDE on anyone; JDE users can install the upstream jde package using XEmacs package tools. (#180941) * Sun Feb 12 2006 Ville Skytt?? - Build xslt.jar ourselves (TrAX only), use TrAX by default in xslt-process. * Sat Feb 11 2006 Ville Skytt?? - Bundle upstream gnus package version 1.89 to fix #181011. - Get rid of tli_rbl binary only applet jar in jde's docs (first step of fixing #180941). xemacs-sumo-20051208-trax.patch: --- NEW FILE xemacs-sumo-20051208-trax.patch --- --- xemacs-packages/lisp/xslt-process/xslt-process.el~ 2001-05-01 08:41:45.000000000 +0300 +++ xemacs-packages/lisp/xslt-process/xslt-process.el 2006-02-12 23:57:32.000000000 +0200 @@ -49,3 +49,3 @@ -(defcustom xslt-process-default-processor (list 'Saxon) +(defcustom xslt-process-default-processor (list 'TrAX) "*The default XSLT processor to be applied to an XML document." Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 23 Dec 2005 21:22:18 -0000 1.7 +++ .cvsignore 5 Mar 2006 19:29:38 -0000 1.8 @@ -1,2 +1,3 @@ xemacs-mule-sumo-2005-12-08.tar.bz2 xemacs-sumo-2005-12-08.tar.bz2 +gnus-1.89-pkg.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 23 Dec 2005 21:22:18 -0000 1.7 +++ sources 5 Mar 2006 19:29:38 -0000 1.8 @@ -1,2 +1,3 @@ 553da38bc36b4365ab98e0565a0530b8 xemacs-mule-sumo-2005-12-08.tar.bz2 1927c40affd04ff7c10b979ef24548d0 xemacs-sumo-2005-12-08.tar.bz2 +e7707178416716eac643af29c437f619 gnus-1.89-pkg.tar.gz Index: xemacs-sumo.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs-sumo/FC-4/xemacs-sumo.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xemacs-sumo.spec 23 Dec 2005 21:22:18 -0000 1.11 +++ xemacs-sumo.spec 5 Mar 2006 19:29:38 -0000 1.12 @@ -1,9 +1,10 @@ %define sumo 2005-12-08 %define pkgdir %{_datadir}/xemacs +%define xemacsb xemacs-nox -batch -vanilla Name: xemacs-sumo Version: %(echo %{sumo} | tr -d -) -Release: 1 +Release: 2 Summary: XEmacs lisp packages Group: Applications/Editors @@ -11,6 +12,7 @@ URL: http://www.xemacs.org/Documentation/packageGuide.html#The_Sumo_Tarball Source0: ftp://ftp.xemacs.org/packages/xemacs-sumo-%{sumo}.tar.bz2 Source1: ftp://ftp.xemacs.org/packages/xemacs-mule-sumo-%{sumo}.tar.bz2 +Source2: ftp://ftp.xemacs.org/packages/gnus-1.89-pkg.tar.gz Source10: Emacs.ad.ja_JP.eucJP Source11: Emacs.ad.ko_KR.eucKR Source12: Emacs.ad.zh_CN.GB2312 @@ -22,13 +24,12 @@ Patch0: %{name}-20051208-hypb-posix.patch Patch1: %{name}-20051208-pydoc-path.patch Patch2: %{name}-20051208-latin-unity-kludge.patch +Patch3: %{name}-20051208-trax.patch Patch6: auctex-texsite-jlatex-detect-69129.patch Patch7: auctex-texjp-platex.patch Patch8: egg-wnn-host-unix-79826.patch Patch11: browse-url-htmlview-84262.patch Patch12: psgml-browsers-84262.patch -Patch13: jde-ug-rel-links.patch -Patch14: jde-ug-section-links-89499.patch Patch15: avoid-catch-error-65346.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -37,6 +38,8 @@ BuildRequires: sed >= 3.95 BuildRequires: /sbin/install-info BuildRequires: %{__python} +BuildRequires: %{__perl} +BuildRequires: java-devel Requires: xemacs-common # Fake release in this provision in order to avoid self-obsoletion (for now). Provides: apel-xemacs = 10.6-6 @@ -81,6 +84,8 @@ %prep %setup -q -c -a1 +tar zxf %{SOURCE2} -C xemacs-packages + # get rid of csh dependency %patch0 -p0 rm xemacs-packages/lisp/hyperbole/file-newer @@ -90,6 +95,8 @@ mv xemacs-packages/{lisp/python-modes/pydoc_lisp.py,etc/python-modes} # support write-region's kludge in latin-unity %patch2 -p0 +# use TrAX by default in xslt-process +%patch3 -p0 # fix jlatex autodetection %patch6 -p0 # use ptex rather jtex by default for Japanese @@ -100,10 +107,6 @@ %patch11 -p0 # update psgml-html preview menu to modern browsers %patch12 -p0 -# fix relative links to elisp in user-guide html doc -%patch13 -p0 -# and section links in toc -%patch14 -p0 # catch harmless errors in mouse-avoidance-too-close-p (avoid.el) %patch15 -p0 @@ -115,24 +118,35 @@ # remove game we shouldn't ship rm xemacs-packages/lisp/games/tetris.el* +rm xemacs-packages/etc/xslt-process/java/{xslt.jar,xslt/*.class} -%build -export xemacs_batch="xemacs-nox -batch -vanilla" +# not buildable from sources, all deps not met, see 2006-03-03 changelog entry +%{xemacsb} -l package-admin -eval \ + "(package-admin-delete-binary-package 'jde \"xemacs-packages\")" +rm -rf xemacs-packages/{etc,lisp}/jde -# mew is provided by mew-xemacs, and skk by ddskk-xemacs -$xemacs_batch -l package-admin -eval \ +# provided by mew-xemacs +%{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'mew \"xemacs-packages\")" rmdir xemacs-packages/{etc,lisp,man}/mew -$xemacs_batch -l package-admin -eval \ + +# provided by ddskk-xemacs +%{xemacsb} -l package-admin -eval \ "(package-admin-delete-binary-package 'skk \"mule-packages\")" rmdir mule-packages/{etc,lisp,man}/skk + +%build export EMACSPACKAGEPATH=`pwd` -$xemacs_batch -no-autoloads -eval "(setq make-backup-files nil)" \ +%{xemacsb} -no-autoloads -eval "(setq make-backup-files nil)" \ -f batch-update-directory xemacs-packages/lisp/* mule-packages/lisp/* -$xemacs_batch -f batch-byte-recompile-directory \ +%{xemacsb} -f batch-byte-recompile-directory \ xemacs-packages/lisp mule-packages/lisp +cd xemacs-packages/etc/xslt-process/java +javac xslt/TrAX.java && jar cvf xslt.jar xslt/*.class && rm xslt/*.class +cd - + %install rm -rf $RPM_BUILD_ROOT @@ -211,6 +225,22 @@ %changelog +* Fri Mar 3 2006 Ville Skytt?? - 20051208-2 +- Drop JDE; the full source for jde.jar doesn't seem to be available + and even the included parts won't build with gcj eg. due to use of + com.sun.* things. Additionally it requires third party jars which are + not currently available in Fedora Core or Extras. So let's not inflict + a crippled version of JDE on anyone; JDE users can install the upstream + jde package using XEmacs package tools. (#180941) + +* Sun Feb 12 2006 Ville Skytt?? +- Build xslt.jar ourselves (TrAX only), use TrAX by default in xslt-process. + +* Sat Feb 11 2006 Ville Skytt?? +- Bundle upstream gnus package version 1.89 to fix #181011. +- Get rid of tli_rbl binary only applet jar in jde's docs (first step + of fixing #180941). + * Sat Dec 17 2005 Ville Skytt?? - 20051208-1 - Patch to support write-region's kludge in latin-unity. --- jde-ug-rel-links.patch DELETED --- --- jde-ug-section-links-89499.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 5 19:39:38 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:39:38 -0500 Subject: rpms/opencv - New directory Message-ID: <200603051939.k25JdeDi013005@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12997/opencv Log Message: Directory /cvs/extras/rpms/opencv added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 19:39:44 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:39:44 -0500 Subject: rpms/opencv/devel - New directory Message-ID: <200603051939.k25JdkTd013020@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12997/opencv/devel Log Message: Directory /cvs/extras/rpms/opencv/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 19:40:01 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:40:01 -0500 Subject: rpms/opencv Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603051940.k25Je3El013055@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13042 Added Files: Makefile import.log Log Message: Setup of module opencv --- NEW FILE Makefile --- # Top level Makefile for module opencv all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 5 19:40:07 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:40:07 -0500 Subject: rpms/opencv/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603051940.k25Je92S013077@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13042/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module opencv --- NEW 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 Mar 5 19:45:51 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:45:51 -0500 Subject: rpms/opencv import.log,1.1,1.2 Message-ID: <200603051946.k25JkObY013159@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13124 Modified Files: import.log Log Message: auto-import opencv-0.9.7-3 on branch devel from opencv-0.9.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/opencv/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Mar 2006 19:40:01 -0000 1.1 +++ import.log 5 Mar 2006 19:45:51 -0000 1.2 @@ -0,0 +1 @@ +opencv-0_9_7-3:HEAD:opencv-0.9.7-3.src.rpm:1141587944 From fedora-extras-commits at redhat.com Sun Mar 5 19:45:57 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:45:57 -0500 Subject: rpms/opencv/devel opencv-samples-Makefile, NONE, 1.1 opencv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603051946.k25JkTYU013163@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13124/devel Modified Files: .cvsignore sources Added Files: opencv-samples-Makefile opencv.spec Log Message: auto-import opencv-0.9.7-3 on branch devel from opencv-0.9.7-3.src.rpm --- NEW FILE opencv-samples-Makefile --- CFLAGS := `pkg-config --cflags opencv` $(CFLAGS) LDFLAGS := `pkg-config --libs opencv` $(LDFLAGS) all: $(patsubst %.c,%,$(wildcard *.c)) --- NEW FILE opencv.spec --- %define with_ffmpeg 0 Name: opencv Version: 0.9.7 Release: 3 Summary: Collection of algorithms for computer vision Group: Development/Libraries License: Intel Open Source License URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: swig >= 1.3.24, zlib-devel, pkgconfig BuildRequires: python-devel %if %{with_ffmpeg} BuildRequires: ffmpeg-devel >= 0.4.9 %endif %description OpenCV means Intel?? Open Source Computer Vision Library. It is a collection of C functions and a few C++ classes that implement some popular Image Processing and Computer Vision algorithms. %package devel Summary: Development files for using the OpenCV library Group: Development/Libraries Requires: opencv = %{version}-%{release} %description devel This package contains the OpenCV C/C++ library and header files, as well as documentation. It should be installed if you want to develop programs that will use the OpenCV library. %package python Summary: Python bindings for apps which use OpenCV Group: Development/Libraries Requires: opencv = %{version}-%{release} Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`) %description python This package contains Python bindings for the OpenCV library. %prep %setup -q %{__sed} -i 's/\r//' interfaces/swig/python/*.py \ samples/python/*.py %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \ interfaces/swig/python/__init__.py %build %configure --disable-static --enable-python --with-apps make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/opencv/*.la \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/build_all.sh \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.dsp \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.vcproj \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/facedetect.cmd \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gcc \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/makefile.gen install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/Makefile %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post python -p /sbin/ldconfig %postun python -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING THANKS TODO %{_bindir}/opencv-* %{_libdir}/lib*.so.* %dir %{_datadir}/opencv %{_datadir}/opencv/haarcascades %{_datadir}/opencv/readme.txt %files devel %defattr(-,root,root,-) %{_includedir}/opencv %{_libdir}/lib*.so %{_libdir}/lib*.a %{_libdir}/pkgconfig/opencv.pc %doc %{_datadir}/opencv/doc %doc %{_datadir}/opencv/samples/c %files python %{_libdir}/python*/site-packages/opencv %doc %{_datadir}/opencv/samples/python %changelog * Sun Oct 16 2005 Simon Perreault - 0.9.7-3 - Removed useless sample compilation makefiles/project files and replaced them with one that works on Fedora Core. - Removed shellbang from Python modules. * Mon Oct 10 2005 Simon Perreault - 0.9.7-2 - Made FFMPEG dependency optional (needs to be disabled for inclusion in FE). * Mon Oct 10 2005 Simon Perreault - 0.9.7-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/opencv/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2006 19:40:07 -0000 1.1 +++ .cvsignore 5 Mar 2006 19:45:57 -0000 1.2 @@ -0,0 +1 @@ +opencv-0.9.7.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/opencv/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2006 19:40:07 -0000 1.1 +++ sources 5 Mar 2006 19:45:57 -0000 1.2 @@ -0,0 +1 @@ +39cdccd05edd12294db2c238f48ff2ab opencv-0.9.7.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 19:50:49 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 5 Mar 2006 14:50:49 -0500 Subject: owners owners.list,1.710,1.711 Message-ID: <200603051951.k25JpMNo013240@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13219 Modified Files: owners.list Log Message: Added opencv component. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.710 retrieving revision 1.711 diff -u -r1.710 -r1.711 --- owners.list 5 Mar 2006 19:24:58 -0000 1.710 +++ owners.list 5 Mar 2006 19:50:49 -0000 1.711 @@ -751,6 +751,7 @@ Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|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|opencv|Collection of algorithms for computer vision|nomis80 at nomis80.org|extras-qa at fedoraproject.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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 5 20:37:58 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 5 Mar 2006 15:37:58 -0500 Subject: rpms/kyum/FC-4 .cvsignore, 1.2, 1.3 kyum.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200603052038.k25KcUu2015396@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15366 Modified Files: .cvsignore kyum.spec sources Log Message: Bringing FC-4 in sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kyum/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Jun 2005 16:37:40 -0000 1.2 +++ .cvsignore 5 Mar 2006 20:37:57 -0000 1.3 @@ -1 +1 @@ -kyum-0.7.1.tar.gz +kyum-0.7.5.tar.gz Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/FC-4/kyum.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kyum.spec 8 Jul 2005 18:29:51 -0000 1.4 +++ kyum.spec 5 Mar 2006 20:37:57 -0000 1.5 @@ -1,13 +1,13 @@ Name: kyum -Version: 0.7.1 +Version: 0.7.5 Release: 2%{?dist} Summary: Graphical User Frontend (GUI) for yum License: GPL Group: Applications/System -URL: http://kde-apps.org/content/show.php?content=22185 -Source: http://www-users.rwth-aachen.de/Steffen.Offermann/Download/%{name}-%{version}.tar.gz +URL: http://www.sourceforge.net/projects/kyum +Source: http://dl.sourceforge.net/sourceforge/kyum/%{name}-%{version}.tar.gz Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -59,7 +59,7 @@ %{_bindir}/* %dir %{_datadir}/apps/kyum %{_datadir}/apps/kyum/*/* -%{_datadir}/apps/kyum/kyum_sysinfo.py +%{_datadir}/apps/kyum/kyum_sysinfo.p* %{_datadir}/apps/kyum/kyumui.rc %{_datadir}/icons/*/*/apps/kyum.png %{_datadir}/applications/kde/fedora-kyum.desktop @@ -67,6 +67,30 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Sun Feb 12 2006 Jochen Schmitt 0.7.5-2 +- Rebuilt for FC5 + +* Mon Jul 25 2005 Jochen Schmitt 0.7.5-1 +- New upstream release + +* Thu Jul 21 2005 Jochen Schmitt 0.7.3-2 +- Upstream author has moved the project to sourceforge.net + +* Tue Jul 19 2005 Jochen Schmitt 0.7.3-1 +- New upstream release + +* Thu Jul 14 2005 Jochen Schmitt 0.7.2-3 +- Patch DlgInfo.h to generate proper Makefiles (calling of moc) + +* Wed Jul 13 2005 Jochen Schmitt 0.7.2-2 +- Patch for missing DlgInfo.moc + +* Wed Jul 13 2005 Jochen Schmitt 0.7.2-1 +- Update to new upstream release + +* Tue Jun 21 2005 Jochen Schmitt 0.7.1-3 +- Add precompiled python files into package + * Thu Jun 16 2005 Jochen Schmitt 0.7.1-2 - Add libfam.la workaround becouse buildsys contains broken gamin Index: sources =================================================================== RCS file: /cvs/extras/rpms/kyum/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Jun 2005 16:37:40 -0000 1.2 +++ sources 5 Mar 2006 20:37:57 -0000 1.3 @@ -1 +1 @@ -2d12023542d55affa51d6312a761b70a kyum-0.7.1.tar.gz +b1ff5c4dfd14145535d344ef346bac74 kyum-0.7.5.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 23:09:10 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Sun, 5 Mar 2006 18:09:10 -0500 Subject: fedora-security/audit fc4,1.165,1.166 fc5,1.72,1.73 Message-ID: <200603052309.k25N9A6l021650@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21633 Modified Files: fc4 fc5 Log Message: Updates for kernel and other things Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.165 retrieving revision 1.166 diff -u -r1.165 -r1.166 --- fc4 3 Mar 2006 21:39:36 -0000 1.165 +++ fc4 5 Mar 2006 23:08:54 -0000 1.166 @@ -1,26 +1,30 @@ -Up to date CVE as of CVE email 20060301 -Up to date FC4 as of 20060301 +Up to date CVE as of CVE email 20060304 +Up to date FC4 as of 20060304 ** are items that need attention CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) +CVE-2006-0741 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 version (postgresql, 8.1 only) CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107] CVE-2006-0591 version (postgresql, fixed 8.0.6) [since FEDORA-2005-021] CVE-2006-0576 VULNERABLE (oprofile) +CVE-2006-0555 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 +CVE-2006-0554 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0553 version (postgresql, 8.1 only) CVE-2006-0528 version (evolution, 2.3 and above) CVE-2006-0496 VULNERABLE (mozilla) CVE-2006-0496 VULNERABLE (firefox) CVE-2006-0482 ignore (kernel) sparc only CVE-2006-0481 version (libpng, 1.2.7 only) +CVE-2006-0457 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0455 version (gnupg, fixed 1.4.2.1) [since FEDORA-2006-116] CVE-2006-0454 backport (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3 CVE-2006-0405 version (libtiff, 3.8.0 only) -CVE-2006-0377 version (squirrelmail, fixed 1.4.6) bz#182585 [since FEDORA-2006-133] +CVE-2006-0377 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133] CVE-2006-0369 ignore (mysql) this is not a security issue CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104] @@ -58,15 +62,15 @@ CVE-2006-0207 VULNERABLE (php) bz#178044 CVE-2006-0200 version (php, 5.1.0 5.1.1 only) CVE-2006-0197 ** xorg-x11 -CVE-2006-0195 version (squirrelmail, fixed 1.4.6) bz#182582 [since FEDORA-2006-133] -CVE-2006-0188 version (squirrelmail, fixed 1.4.6) bz#182580 [since FEDORA-2006-133] +CVE-2006-0195 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133] +CVE-2006-0188 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133] CVE-2006-0097 ignore (php) Windows only CVE-2006-0096 ignore (kernel) minor and requires root -CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] linux-2.6-dm-crypt-zero-key-before-free.patch +CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] patch-2.6.15.5 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) -CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.2 -CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.2 -CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.2 +CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 +CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 +CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050 CVE-2005-4720 VULNERABLE (mozilla) CVE-2005-4720 VULNERABLE (firefox) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.72 retrieving revision 1.73 diff -u -r1.72 -r1.73 --- fc5 2 Mar 2006 12:14:58 -0000 1.72 +++ fc5 5 Mar 2006 23:08:54 -0000 1.73 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060301 +Up to date CVE as of CVE email 20060304 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -72,7 +72,7 @@ CVE-2006-0207 version (php, fixed 5.1.2) CVE-2006-0200 version (php, fixed 5.1.2) CVE-2006-0197 ignore (xorg-x11) not an issue -CVE-2006-0195 version (php-pear, not 1.4.4) +CVE-2006-0195 version (squirrelmail, fixed 1.4.6) CVE-2006-0188 version (squirrelmail, fixed 1.4.6) CVE-2006-0144 version (php-pear, not 1.4.4) CVE-2006-0097 ignore (php) Windows only @@ -546,6 +546,7 @@ CVE-2005-0752 version (firefox, fixed 1.0.3) CVE-2005-0750 version (kernel, fixed 2.6.11.6) CVE-2005-0749 version (kernel, fixed 2.6.11.6) +CVE-2006-0741 VULNERABLE (kernel, fixed 2.6.15.5) CVE-2005-0739 version (ethereal, fixed after 0.10.9) CVE-2005-0736 version (kernel, fixed 2.6.11) CVE-2005-0718 version (squid, fixed 2.5.STABLE8) From fedora-extras-commits at redhat.com Sun Mar 5 23:23:11 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:23:11 -0500 Subject: owners owners.list,1.711,1.712 Message-ID: <200603052323.k25NNhEF021778@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21759/owners Modified Files: owners.list Log Message: Add webmin package Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.711 retrieving revision 1.712 diff -u -r1.711 -r1.712 --- owners.list 5 Mar 2006 19:50:49 -0000 1.711 +++ owners.list 5 Mar 2006 23:23:10 -0000 1.712 @@ -1397,6 +1397,7 @@ 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|wavpack|A completely open audiocodec|lemenkov at newmail.ru|extras-qa at fedoraproject.org| +Fedora Extras|webmin|A web-based administration interface for Unix systems.|jvdias at redhat.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|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|whowatch|Displays informations about the users currently logged in|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 5 23:25:25 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:25:25 -0500 Subject: rpms/webmin - New directory Message-ID: <200603052325.k25NPR7X021844@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21834/webmin Log Message: Directory /cvs/extras/rpms/webmin added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 23:25:31 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:25:31 -0500 Subject: rpms/webmin/devel - New directory Message-ID: <200603052325.k25NPXsw021860@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21834/webmin/devel Log Message: Directory /cvs/extras/rpms/webmin/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 23:25:54 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:25:54 -0500 Subject: rpms/webmin Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603052325.k25NPuuB021898@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21884 Added Files: Makefile import.log Log Message: Setup of module webmin --- NEW FILE Makefile --- # Top level Makefile for module webmin all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 5 23:26:00 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:26:00 -0500 Subject: rpms/webmin/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603052326.k25NQ2Tc021918@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21884/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module webmin --- NEW 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 Mar 5 23:35:54 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:35:54 -0500 Subject: rpms/webmin import.log,1.1,1.2 Message-ID: <200603052336.k25NaQiE022061@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22022 Modified Files: import.log Log Message: auto-import webmin-1.260-1.fe5 on branch devel from webmin-1.260-1.fe5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/webmin/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 5 Mar 2006 23:25:54 -0000 1.1 +++ import.log 5 Mar 2006 23:35:54 -0000 1.2 @@ -0,0 +1 @@ +webmin-1_260-1_fe5:HEAD:webmin-1.260-1.fe5.src.rpm:1141601746 From fedora-extras-commits at redhat.com Sun Mar 5 23:36:00 2006 From: fedora-extras-commits at redhat.com (Jason Vas Dias (jvdias)) Date: Sun, 5 Mar 2006 18:36:00 -0500 Subject: rpms/webmin/devel run-setup.sh, NONE, 1.1 webmin-1.260-initscript.patch, NONE, 1.1 webmin-uninstall.sh, NONE, 1.1 webmin.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603052336.k25NaWsl022065@cvs-int.fedora.redhat.com> Author: jvdias Update of /cvs/extras/rpms/webmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22022/devel Modified Files: .cvsignore sources Added Files: run-setup.sh webmin-1.260-initscript.patch webmin-uninstall.sh webmin.spec Log Message: auto-import webmin-1.260-1.fe5 on branch devel from webmin-1.260-1.fe5.src.rpm --- NEW FILE run-setup.sh --- #!/bin/sh perl </tmp/.webmin/$$.check </dev/null\` =~ /White\\s+Box\\s+Enterprise\\s+Linux\\s+release\\s+(\\S+)/i) { print "oscheck='Whitebox Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /Tao\\s+Linux\\s+release\\s+(\\S+)/i) { print "oscheck='Tao Linux'\\n"; } elsif (\`cat /etc/centos-release /etc/redhat-release 2>/dev/null\` =~ /CentOS\\s+release\\s+(\\S+)/i && \$1 < 4) { print "oscheck='CentOS Linux'\\n"; } elsif (\`cat /etc/centos-release /etc/redhat-release 2>/dev/null\` =~ /CentOS\\s+release\\s+(\\S+)/i && \$1 >= 4) { print "oscheck='CentOS Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /Scientific\\s+Linux.*\\s+release\\s+(\\S+)/i) { print "oscheck='Scientific Linux'\\n"; } elsif (\`cat /etc/redhtat-release 2>/dev/null\` =~ /Gralinux\\s+(ES|AS|WS)\\s+release\\s+(\\d+)/i) { print "oscheck='Gralinux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /(Advanced\\s+Server.*2\\.1)|(AS.*2\\.1)/i) { print "oscheck='Redhat Enterprise Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /ES.*2\\.1/) { print "oscheck='Redhat Enterprise Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /WS.*2\\.1/) { print "oscheck='Redhat Enterprise Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /(3\\.0AS)|(2\\.9\\.5AS)|(AS\\s+release\\s+3)/i) { print "oscheck='Redhat Enterprise Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /(ES|AS|WS)\\s+release\\s+(\\S+)/) { print "oscheck='Redhat Enterprise Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /Desktop\\s+release\\s+(\\S+)/i || \`cat /etc/redhat-release 2>/dev/null\` =~ /ES\\s+release\\s+(\\S+)/i) { print "oscheck='Redhat Linux Desktop'\\n"; } elsif (\`cat /etc/alphacore-release 2>/dev/null\` =~ /Alpha\\s*Core\\s+release\\s+(\\S+)\\s/i) { print "oscheck='AlphaCore Linux'\\n"; } elsif (\`cat /etc/redhat-release /etc/fedora-release 2>/dev/null\` =~ /X\\/OS.*release\\s(\\S+)\\s/i) { print "oscheck='X/OS Linux'\\n"; } elsif (\`cat /etc/release /etc/asianux-release 2>/dev/null\` =~ /Asianux\\s+release\\s+(\\S+)/i) { print "oscheck='Asianux'\\n"; } elsif (\`cat /etc/Haansoft-release 2>/dev/null\` =~ /Haansoft\\s+Linux\\s+OS\\s+release\\s+(\\S+)/i) { print "oscheck='Haansoft Linux'\\n"; } elsif (\`cat /etc/caos-release 2>/dev/null\` =~ /release\\s+(\\S+)/i) { print "oscheck='cAos Linux'\\n"; } elsif (\`cat /etc/redhat-release 2>/dev/null\` =~ /red.*hat.*release\\s+(\\S+)/i && \`cat /etc/redhat-release 2>/dev/null\` !~ /[eE]nterprise|AS|ES|WS|[aA]dvanced/) { print "oscheck='Redhat Linux'\\n"; } elsif (\`cat /etc/redhat-release /etc/fedora-release 2>/dev/null\` =~ /Fedora.*\\s([0-9\\.]+)\\s/i || \`cat /etc/redhat-release /etc/fedora-release 2>/dev/null\` =~ /Fedora.*\\sFC(\\S+)\\s/i) { print "oscheck='Redhat Linux'\\n"; } elsif (\`cat /tmp/wd/version 2>/dev/null\` =~ /2\\.1\\.0/) { print "oscheck='White Dwarf Linux'\\n"; } elsif (\`cat /etc/slackware-version 2>/dev/null\` =~ /([0-9\\.]+)/) { print "oscheck='Slackware Linux'\\n"; } elsif (\$etc_issue =~ /Xandros.*\\s2\\.0/i) { print "oscheck='Xandros Linux'\\n"; } elsif (\$etc_issue =~ /Xandros.*\\s3\\.0/i) { print "oscheck='Xandros Linux'\\n"; } elsif (\$etc_issue =~ /APLINUX.*1\\.3/i) { print "oscheck='APLINUX'\\n"; } elsif (\`cat /etc/bigblock-revision 2>/dev/null\` =~ /Version:\\s(1[0-9\\.-]+)\\s/i) { print "oscheck='BigBlock'\\n"; } elsif (\`cat /etc/bigblock-revision 2>/dev/null\` =~ /Version:\\s(2[0-9\\.-]+)\\s/i) { print "oscheck='BigBlock'\\n"; } elsif (\$etc_issue =~ /Debian.*\\s([0-9\\.]+)\\s/i) { print "oscheck='Debian Linux'\\n"; } elsif (\$etc_issue =~ /Debian.*\\stesting\\/unstable\\s/i) { print "oscheck='Debian Linux'\\n"; } elsif (\`cat /etc/SLOX-release 2>/dev/null\` =~ /VERSION\\s+=\\s+(\\S+)/i) { print "oscheck='SuSE OpenExchange Linux'\\n"; } elsif (\$etc_issue =~ /SuSE\\s+SLES-(\\S+)/i) { print "oscheck='SuSE SLES Linux'\\n"; } elsif (\`cat /etc/SuSE-release 2>/dev/null\` =~ /([0-9\\.]+)/ || \$etc_issue =~ /SuSE\\s+Linux\\s+(\\S+)\\s/i) { print "oscheck='SuSE Linux'\\n"; } elsif (\`cat /etc/UnitedLinux-release 2>/dev/null\` =~ /([0-9\\.]+)/) { print "oscheck='United Linux'\\n"; } elsif (\$etc_issue =~ /Corel\\s+LINUX\\s+(\\S+)/i) { print "oscheck='Corel Linux'\\n"; } elsif (\`cat /etc/turbolinux-release 2>/dev/null\` =~ /([0-9\\.]+)/i) { print "oscheck='TurboLinux'\\n"; } elsif (\$etc_issue =~ /Cobalt\\s+Linux\\s+release\\s+(\\S+)/i || \`cat /etc/cobalt-release 2>/dev/null\` =~ /([0-9\\.]+)/) { print "oscheck='Cobalt Linux'\\n"; } elsif (\`uname -r\` =~ /2.2.16/ && -r "/etc/cobalt-release") { print "oscheck='Cobalt Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+Corporate\\s+Server\\s+release\\s+1\\.0/i) { print "oscheck='Mandrake Linux Corporate Server'\\n"; } elsif (\`cat /etc/mandrake-release 2>/dev/null\` =~ /pclinuxos\\s+Linux\\s+release\\s+2005/i) { print "oscheck='pclinuxos Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+release\\s+5\\.3/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+release\\s+6\\.0/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+release\\s+6\\.1/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+release\\s+7\\.0/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\$etc_issue =~ /Mandrake\\s+release\\s+7\\.1/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\`cat /etc/mandrake-release 2>/dev/null\` =~ /Mandrake.*?([0-9\\.]+)/i || \$etc_issue =~ /Mandrake\\s+release\\s+([0-9\\.]+)/i || \$etc_issue =~ /Mandrakelinux\\s+release\\s+([0-9\\.]+)/i) { print "oscheck='Mandrake Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*3\\.0/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*4\\.0/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*4\\.1/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*4\\.2/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*5\\.0/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*5\\.1/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*6\\.0/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*7\\.0/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*\\s8/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*\\s9/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Conectiva.*Linux.*\\s10\\s/i) { print "oscheck='Conectiva Linux'\\n"; } elsif (\$etc_issue =~ /Thiz.*Linux.*\\s5\\.0/i) { print "oscheck='ThizLinux Desktop'\\n"; } elsif (\$etc_issue =~ /Thiz.*Linux.*\\s6\\.0/i) { print "oscheck='ThizLinux Desktop'\\n"; } elsif (\$etc_issue =~ /Thiz.*Linux.*\\s6\\.2/i) { print "oscheck='ThizLinux Desktop'\\n"; } elsif (\$etc_issue =~ /Thiz.*Linux.*\\s7\\.0/i) { print "oscheck='ThizLinux Desktop'\\n"; } elsif (\$etc_issue =~ /Thiz.*\\s?Server.*\\s4\\.3/i) { print "oscheck='ThizServer'\\n"; } elsif (\$etc_issue =~ /Thiz.*\\s?Server.*\\s6\\.0/i) { print "oscheck='ThizServer'\\n"; } elsif (\$etc_issue =~ /Thiz.*\\s?Server.*\\s7\\.0/i) { print "oscheck='ThizServer'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2001.*January/i || \$etc_issue =~ /2001.*January/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2001.*February/i || \$etc_issue =~ /2001.*February/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2001.*May/i || \$etc_issue =~ /2001.*May/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2001.*June/i || \$etc_issue =~ /2001.*June/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2001.*August/i || \$etc_issue =~ /2001.*August/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2002.*February/i || \$etc_issue =~ /2002.*February/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2002.*March/i || \$etc_issue =~ /2002.*March/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2002.*May/i || \$etc_issue =~ /2002.*May/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2002.*July/i || \$etc_issue =~ /2002.*July/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/msclinux-release 2>/dev/null\` =~ /2002.*Nov/i || \$etc_issue =~ /2002.*Nov/i) { print "oscheck='MSC Linux'\\n"; } elsif (\`cat /etc/scilinux-relase 2>/dev/null\` =~ /2003.*Summer/i) { print "oscheck='SCI Linux'\\n"; } elsif (\`cat /etc/scilinux-relase 2>/dev/null\` =~ /2004.*Summer/i) { print "oscheck='SCI Linux'\\n"; } elsif (\`cat /etc/scilinux-relase 2>/dev/null\` =~ /2005.*Summer/i) { print "oscheck='SCI Linux'\\n"; } elsif (\$etc_issue =~ /LinuxPPC\\s+2000/i) { print "oscheck='LinuxPPC'\\n"; } elsif (\$etc_issue =~ /Trustix.*Enterprise.*([0-9\\.]+)/i) { print "oscheck='Trustix SE'\\n"; } elsif (\$etc_issue =~ /Trustix.*1\\.1/i) { print "oscheck='Trustix'\\n"; } elsif (\$etc_issue =~ /Trustix.*1\\.2/i) { print "oscheck='Trustix'\\n"; } elsif (\$etc_issue =~ /Trustix.*1\\.5/i) { print "oscheck='Trustix'\\n"; } elsif (\$etc_issue =~ /Trustix.*\\s([0-9\\.]+)/i) { print "oscheck='Trustix'\\n"; } elsif (\$etc_issue =~ /Tawie\\s+Server\\s+Linux.*([0-9\\.]+)/i) { print "oscheck='Tawie Server Linux'\\n"; } elsif (\$etc_issue =~ /tinysofa.*release\\s+1\\.0/i) { print "oscheck='TinySofa Linux'\\n"; } elsif (\`cat /etc/tinysofa-release 2>/dev/null\` =~ /classic.*release\\s+2\\.0/i) { print "oscheck='TinySofa Linux'\\n"; } elsif (\`cat /etc/tinysofa-release 2>/dev/null\` =~ /enterprise.*release\\s+2\\.0/i) { print "oscheck='TinySofa Linux'\\n"; } elsif (\$etc_issue =~ /Cendio\\s*LBS.*\\s3\\.1/i || \`cat /etc/lbs-release 2>/dev/null\` =~ /3\\.1/) { print "oscheck='Cendio LBS Linux'\\n"; } elsif (\$etc_issue =~ /Cendio\\s*LBS.*\\s3\\.2/i || \`cat /etc/lbs-release 2>/dev/null\` =~ /3\\.2/) { print "oscheck='Cendio LBS Linux'\\n"; } elsif (\$etc_issue =~ /Cendio\\s*LBS.*\\s3\\.3/i || \`cat /etc/lbs-release 2>/dev/null\` =~ /3\\.3/) { print "oscheck='Cendio LBS Linux'\\n"; } elsif (\$etc_issue =~ /Cendio\\s*LBS.*\\s4\\.0/i || \`cat /etc/lbs-release 2>/dev/null\` =~ /4\\.0/) { print "oscheck='Cendio LBS Linux'\\n"; } elsif (\$etc_issue =~ /Cendio\\s*LBS.*\\s4\\.1/i || \`cat /etc/lbs-release 2>/dev/null\` =~ /4\\.1/) { print "oscheck='Cendio LBS Linux'\\n"; } elsif (\`cat /etc/ute-release 2>/dev/null\` =~ /Ute\\s+Linux\\s+release\\s+1\\.0/i) { print "oscheck='Ute Linux'\\n"; } elsif (\$etc_issue =~ /Lanthan\\s+Linux\\s+release\\s+1\\.0/i || \`cat /etc/lanthan-release 2>/dev/null\` =~ /1\\.0/) { print "oscheck='Lanthan Linux'\\n"; } elsif (\$etc_issue =~ /Lanthan\\s+Linux\\s+release\\s+2\\.0/i || \`cat /etc/lanthan-release 2>/dev/null\` =~ /2\\.0/) { print "oscheck='Lanthan Linux'\\n"; } elsif (\$etc_issue =~ /Lanthan\\s+Linux\\s+release\\s+3\\.0/i || \`cat /etc/lanthan-release 2>/dev/null\` =~ /3\\.0/) { print "oscheck='Lanthan Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.0\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.0\\s+/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.1\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.1\\s+/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.2\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.2\\s+/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.3\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+2\\.3\\s+/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+3\\.0\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+3\\.0\\s+/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\$etc_issue =~ /Yellow\\s+Dog\\s+Linux\\s+release\\s+4\\.0\\s+/i || \`cat /etc/yellowdog-release 2>/dev/null\` =~ /\\s4\\.0\\s/i) { print "oscheck='Yellow Dog Linux'\\n"; } elsif (\`cat /etc/latinux-release 2>/dev/null\` =~ /Latinux\\s+8\\s/i) { print "oscheck='Corvus Latinux'\\n"; } elsif (\$etc_issue =~ /Immunix.*\\s([0-9\\.]+)/i || \`cat /etc/immunix-release 2>/dev/null\` =~ /([0-9\\.]+)/) { print "oscheck='Immunix Linux'\\n"; } elsif (-d "/usr/portage") { print "oscheck='Gentoo Linux'\\n"; } elsif (\`cat /etc/securelinux-release 2>/dev/null\` =~ /SecureLinux.*1\\.0/i) { print "oscheck='Secure Linux'\\n"; } elsif (\`cat /etc/openna-release 2>/dev/null\` =~ /release\\s+1\\.0\\s/i) { print "oscheck='OpenNA Linux'\\n"; } elsif (\`cat /etc/openna-release 2>/dev/null\` =~ /release\\s+2\\.0\\s/i) { print "oscheck='OpenNA Linux'\\n"; } elsif (-r "/etc/antitachyon-distribution" && \`uname -r\` =~ /2\\.4\\./) { print "oscheck='SoL Linux'\\n"; } elsif (-r "/etc/antitachyon-distribution" && \`uname -r\` =~ /2\\.6\\./) { print "oscheck='SoL Linux'\\n"; } elsif (\$etc_issue =~ /coherent\\s*technology.*\\s([0-9\\.]+)/i || \`cat /etc/coherent-release 2>/dev/null\` =~ /([0-9\\.]+)/ ) { print "oscheck='Coherent Technology Linux'\\n"; } elsif (\$etc_issue =~ /PS2\\s+Linux\\s+release\\s+1.0/i) { print "oscheck='Playstation Linux'\\n"; } elsif (\`cat /etc/startcom-release 2>/dev/null\` =~ /([0-9\\.]+)/) { print "oscheck='StartCom Linux'\\n"; } elsif (\`cat /etc/yoper-release 2>/dev/null\` =~ /Yoper\\s+Linux\\s+2.0/i) { print "oscheck='Yoper Linux'\\n"; } elsif (\`cat /etc/yoper-release 2>/dev/null\` =~ /Yoper\\s+Linux\\s+2.1/i) { print "oscheck='Yoper Linux'\\n"; } elsif (\`cat /etc/yoper-release 2>/dev/null\` =~ /Yoper\\s+Linux\\s+2.2/i) { print "oscheck='Yoper Linux'\\n"; } elsif (\`cat /etc/CxM-release 2>/dev/null\` =~ /8\\.1/ || \$etc_issue =~ /Caixa\\s+8\\.1\\s/i) { print "oscheck='Caixa Magica'\\n"; } elsif (\`cat /etc/CxM-release 2>/dev/null\` =~ /10\\.0/ || \$etc_issue =~ /Caixa\\s+10\\.0\\s/i) { print "oscheck='Caixa Magica'\\n"; } elsif (\$uname =~ /FreeBSD.*?\\s([0-9\\.]+)/i) { print "oscheck='FreeBSD'\\n"; } elsif (\$uname =~ /DragonFly.*?\\s1\\.0A/i) { print "oscheck='DragonFly BSD'\\n"; } elsif (\$uname =~ /DragonFly.*?\\s1\\.2A/i) { print "oscheck='DragonFly BSD'\\n"; } elsif (\$uname =~ /OpenBSD.*?\\s([0-9\\.]+)/i) { print "oscheck='OpenBSD'\\n"; } elsif (\$uname =~ /NetBSD.*1\\.5/i) { print "oscheck='NetBSD'\\n"; } elsif (\$uname =~ /NetBSD.*1\\.6/i) { print "oscheck='NetBSD'\\n"; } elsif (\$uname =~ /NetBSD.*2\\.0/i) { print "oscheck='NetBSD'\\n"; } elsif (\$uname =~ /NetBSD.*3\\.0/i) { print "oscheck='NetBSD'\\n"; } elsif (\$uname =~ /BSDI.*\\s([0-9\\.]+)/i) { print "oscheck='BSDI'\\n"; } elsif (\$uname =~ /HP-UX.*(1[01]\\.[0-9\\.]+)/) { print "oscheck='HP/UX'\\n"; } elsif (\$uname =~ /IRIX.*([0-9\\.]+)/i) { print "oscheck='SGI Irix'\\n"; } elsif (\$uname =~ /OSF1.*4\\.0/) { print "oscheck='DEC/Compaq OSF/1'\\n"; } elsif (\$uname =~ /OSF1.*V5.1/) { print "oscheck='DEC/Compaq OSF/1'\\n"; } elsif (\$uname =~ /AIX\\s+\\S+\\s+(\\d+)\\s+(\\d+)\\s+/i) { print "oscheck='IBM AIX'\\n"; } elsif (\$uname =~ /SCO_SV.*\\s5\\./i) { print "oscheck='SCO OpenServer'\\n"; } elsif (\$uname =~ /SCO_SV.*\\s6\\./i) { print "oscheck='SCO OpenServer'\\n"; } elsif (\`sw_vers 2>/dev/null\` =~ /ProductVersion:\\s+10\\.0/i) { print "oscheck='Mac OS X'\\n"; } elsif (\`sw_vers 2>/dev/null\` =~ /ProductVersion:\\s+10\\.1/i) { print "oscheck='Mac OS X'\\n"; } elsif (\`sw_vers 2>/dev/null\` =~ /ProductVersion:\\s+10\\.2/i) { print "oscheck='Mac OS X'\\n"; } elsif (\`sw_vers 2>/dev/null\` =~ /ProductVersion:\\s+10\\.3/i) { print "oscheck='Mac OS X'\\n"; } elsif (\`sw_vers 2>/dev/null\` =~ /ProductVersion:\\s+10\\.4/i) { print "oscheck='Mac OS X'\\n"; } elsif (\$uname =~ /Darwin.*\\s([0-9\\.]+)/) { print "oscheck='Darwin'\\n"; } elsif (\`cat /etc/SuSE-release 2>/dev/null\` =~ /Java Desktop System.*\\nVERSION = 1\\.0/i) { print "oscheck='Sun Java Desktop System'\\n"; } elsif (\`cat /etc/SuSE-release 2>/dev/null\` =~ /Java Desktop System.*\\nVERSION = 2\\.0/i) { print "oscheck='Sun Java Desktop System'\\n"; } elsif (\`cat /etc/SuSE-release 2>/dev/null\` =~ /Java Desktop System.*\\nVERSION = 3\\.0/i) { print "oscheck='Sun Java Desktop System'\\n"; } elsif (\$uname =~ /SunOS.*\\s5\\.9\\s/i && \`cat /etc/sun-release 2>/dev/null\` =~ /Sun\\s+Java\\s+Desktop/) { print "oscheck='Sun Java Desktop System'\\n"; } elsif (\`uname -r\` =~ /2\\.0\\./) { print "oscheck='Generic Linux'\\n"; } elsif (\`uname -r\` =~ /2\\.2\\./) { print "oscheck='Generic Linux'\\n"; } elsif (\`uname -r\` =~ /2\\.4\\./) { print "oscheck='Generic Linux'\\n"; } elsif (\`uname -r\` =~ /2\\.4\\./) { print "oscheck='Generic Linux'\\n"; } elsif (\`uname -r\` =~ /2\\.6\\./) { print "oscheck='Generic Linux'\\n"; } elsif (\`uname -r\` =~ /2\\.7\\./) { print "oscheck='Generic Linux'\\n"; } elsif ((-d "c:/windows" || -d "c:/winnt") && \`ver\` =~ /XP/) { print "oscheck='Windows'\\n"; } elsif ((-d "c:/windows" || -d "c:/winnt") && \`ver\` =~ /2000/) { print "oscheck='Windows'\\n"; } elsif ((-d "c:/windows" || -d "c:/winnt") && \`ver\` =~ /2003/) { print "oscheck='Windows'\\n"; } EOD . /tmp/.webmin/$$.check rm -f /tmp/.webmin/$$.check cd /usr/libexec/webmin config_dir=/etc/webmin var_dir=/var/webmin perl=/usr/bin/perl autoos=3 if [ "$WEBMIN_PORT" != "" ]; then port=$WEBMIN_PORT else port=10000 fi login=root if [ -r /etc/shadow ]; then #crypt=`grep "^root:" /etc/shadow | cut -f 2 -d :` crypt=x else crypt=`grep "^root:" /etc/passwd | cut -f 2 -d :` fi host=`hostname` ssl=1 atboot=1 nochown=1 autothird=1 noperlpath=1 nouninstall=1 nostart=1 export config_dir var_dir perl autoos port login crypt host ssl nochown autothird noperlpath nouninstall nostart allow ./setup.sh >/tmp/.webmin/webmin-setup.out 2>&1 webmin-1.260-initscript.patch: --- NEW FILE webmin-1.260-initscript.patch --- --- webmin-1.260/webmin-init.initscript 2006-01-29 19:05:30.000000000 -0500 +++ webmin-1.260/webmin-init 2006-03-05 18:04:54.000000000 -0500 @@ -1,16 +1,16 @@ #!/bin/sh -# chkconfig: 235 99 10 +# chkconfig: - 99 10 # description: Start or stop the Webmin server # ### BEGIN INIT INFO # Provides: webmin # Required-Start: $network $syslog # Required-Stop: $network -# Default-Start: 2 3 5 -# Default-Stop: 0 1 6 # Description: Start or stop the Webmin server ### END INIT INFO +. /etc/rc.d/init.d/functions + start=/etc/webmin/start stop=/etc/webmin/stop lockfile=/var/lock/subsys/webmin @@ -20,18 +20,28 @@ case "$1" in 'start') + echo -n 'Starting the webmin daemon...' $start >/dev/null 2>&1 /dev/null 2>&1 + success; + else + failure; fi + echo ;; 'stop') - $stop + echo -n 'Stopping the webmin daemon...' + $stop >/dev/null 2>&1 RETVAL=$? if [ "$RETVAL" = "0" ]; then rm -f $lockfile + success; + else + failure; fi + echo ;; 'status') pidfile=`grep "^pidfile=" $confFile | sed -e 's/pidfile=//g'` @@ -42,16 +52,20 @@ pid=`cat $pidfile` kill -0 $pid >/dev/null 2>&1 if [ "$?" = "0" ]; then - echo "$name (pid $pid) is running" + echo -n "$name (pid $pid) is running" RETVAL=0 + success; else - echo "$name is stopped" + echo -n "$name is stopped" RETVAL=1 + failure; fi else - echo "$name is stopped" + echo -n "$name is stopped" RETVAL=1 + failure; fi + echo ;; 'restart') $stop && $start --- NEW FILE webmin-uninstall.sh --- #!/bin/sh printf "Are you sure you want to uninstall Webmin? (y/n) : " read answer printf "\n" if [ "\$answer" = "y" ]; then echo "Removing webmin RPM .." rpm -e --nodeps webmin echo "Done!" fi --- NEW FILE webmin.spec --- #%define BuildRoot /tmp/%{name}-%{version} %define __spec_install_post %{nil} Summary: A web-based administration interface for Unix systems. Name: webmin Version: 1.260 Release: 1.fe5 Provides: %{name}-%{version} PreReq: /bin/sh /usr/bin/perl Requires: /bin/sh /usr/bin/perl AutoReq: 0 License: Freeware Group: System/Tools URL: http://www.webmin.com/ Source: http://www.webmin.com/download/%{name}-%{version}.tar.gz Source1: run-setup.sh Source2: webmin-uninstall.sh Patch0: webmin-1.260-initscript.patch Vendor: Jamie Cameron BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description A web-based administration interface for Unix systems. Using Webmin you can configure DNS, DHCP, Samba, NFS, local/remote filesystems and more using your web browser. After installation, you can enable and start the webmin chkconfig(8) service and enter the URL http://localhost:10000/ into your browser and login as root with your root password. %prep %setup -q %patch0 -p1 %build (find . -name '*.cgi' ; find . -name '*.pl') | perl perlpath.pl /usr/bin/perl - rm -f mount/freebsd-mounts* rm -f mount/openbsd-mounts* rm -f mount/macos-mounts* rm -f webmin-gentoo-init rm -rf format bsdexports hpuxexports sgiexports zones rbac chmod -R og-w . %install mkdir -p %{buildroot}/usr/libexec/webmin mkdir -p %{buildroot}/etc/sysconfig/daemons mkdir -p %{buildroot}/etc/rc.d/{rc0.d,rc1.d,rc2.d,rc3.d,rc5.d,rc6.d} mkdir -p %{buildroot}/etc/init.d mkdir -p %{buildroot}/etc/pam.d mkdir -p %{buildroot}/etc/webmin cp -rp * %{buildroot}/usr/libexec/webmin cp webmin-daemon %{buildroot}/etc/sysconfig/daemons/webmin cp webmin-init %{buildroot}/etc/init.d/webmin cp webmin-pam %{buildroot}/etc/pam.d/webmin echo rpm >%{buildroot}/usr/libexec/webmin/install-type cp -fp %SOURCE1 %{buildroot}/usr/libexec/webmin cp -fp %SOURCE2 %{buildroot}/usr/libexec/webmin %clean [ "%{buildroot}" != "/" ] && rm -rf %{buildroot} %files %defattr(-,root,root) /usr/libexec/webmin /etc/init.d/webmin /etc/sysconfig/daemons /etc/webmin %config /etc/pam.d/webmin %pre # Save /etc/webmin in case the upgrade trashes it if [ "$1" -gt 1 ]; then rm -rf /etc/.webmin-backup cp -r /etc/webmin /etc/.webmin-backup fi :; %post if [ "$1" -eq 1 ]; then chkconfig --add webmin; fi if [ "$1" -ge 1 ]; then . /usr/libexec/webmin/run-setup.sh; fi if [ "$1" -gt 1 ]; then inetd=`grep "^inetd=" /etc/webmin/miniserv.conf 2>/dev/null | sed -e 's/inetd=//g'` # Upgrading the RPM, so stop the old webmin properly if [ "$inetd" != "1" ]; then if /etc/init.d/webmin status >/dev/null 2>&1; then /etc/init.d/webmin stop >/dev/null 2>&1 /dev/null 2>&1 /dev/null 2>&1 || :; grep root=/usr/libexec/webmin /etc/webmin/miniserv.conf >/dev/null 2>&1 if [ "$?" = 0 ]; then # RPM is being removed, and no new version of webmin # has taken it's place. Run uninstalls and stop the server echo "Running uninstall scripts .." (cd /usr/libexec/webmin ; WEBMIN_CONFIG=/etc/webmin WEBMIN_VAR=/var/webmin LANG= /usr/libexec/webmin/run-uninstalls.pl) /etc/init.d/webmin stop >/dev/null 2>&1 /dev/null 2>&1 /dev/null 2>&1 if [ "$?" = 0 ]; then # RPM is being removed, and no new version of webmin # has taken it's place. Delete the config files rm -rf /etc/webmin /var/webmin fi fi :; %triggerpostun -- webmin if [ ! -d /var/webmin -a "$1" = 2 ]; then echo Re-creating /var/webmin directory mkdir /var/webmin fi if [ ! -r /etc/webmin/miniserv.conf -a -d /etc/.webmin-backup -a "$1" = 2 ]; then echo Recovering /etc/webmin directory rm -rf /etc/.webmin-broken mv /etc/webmin /etc/.webmin-broken mv /etc/.webmin-backup /etc/webmin /etc/init.d/webmin stop >/dev/null 2>&1 /dev/null 2>&1 - 1.260-1.fe5 - imported into Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/webmin/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 5 Mar 2006 23:26:00 -0000 1.1 +++ .cvsignore 5 Mar 2006 23:35:59 -0000 1.2 @@ -0,0 +1 @@ +webmin-1.260.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/webmin/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 5 Mar 2006 23:26:00 -0000 1.1 +++ sources 5 Mar 2006 23:35:59 -0000 1.2 @@ -0,0 +1 @@ +c45fe387902405cb36a1a5c6a240ad0d webmin-1.260.tar.gz From fedora-extras-commits at redhat.com Sun Mar 5 23:53:58 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sun, 5 Mar 2006 18:53:58 -0500 Subject: rpms/mm - New directory Message-ID: <200603052354.k25Ns0s6022180@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22172/mm Log Message: Directory /cvs/extras/rpms/mm added to the repository From fedora-extras-commits at redhat.com Sun Mar 5 23:54:03 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sun, 5 Mar 2006 18:54:03 -0500 Subject: rpms/mm/devel - New directory Message-ID: <200603052354.k25Ns5PK022196@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22172/mm/devel Log Message: Directory /cvs/extras/rpms/mm/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 00:13:53 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sun, 5 Mar 2006 19:13:53 -0500 Subject: rpms/mm/devel Makefile,NONE,1.1 sources,NONE,1.1 Message-ID: <200603060013.k260DtGs024218@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24207 Added Files: Makefile sources Log Message: fixup for initial checkin ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' --- NEW FILE sources --- 393b0891a889a4e9f9481d18d976366c mm-1.4.0.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 01:31:13 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sun, 5 Mar 2006 20:31:13 -0500 Subject: rpms/python-imaging/devel .cvsignore, 1.2, 1.3 python-imaging.spec, 1.6, 1.7 sources, 1.2, 1.3 python-imaging-build.patch, 1.1, NONE python-imaging-ft2.patch, 1.1, NONE python-imaging-giftrans.patch, 1.1, NONE python-imaging-no-rexec.patch, 1.1, NONE python-imaging-olefileio.patch, 1.1, NONE python-imaging-png.patch, 1.1, NONE Message-ID: <200603060131.k261Vjqx026316@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-imaging/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26295 Modified Files: .cvsignore python-imaging.spec sources Removed Files: python-imaging-build.patch python-imaging-ft2.patch python-imaging-giftrans.patch python-imaging-no-rexec.patch python-imaging-olefileio.patch python-imaging-png.patch Log Message: * Sun Mar 5 2006 Jos?? Matos - 1.1.5-1 - Update to 1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-imaging/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:15:21 -0000 1.2 +++ .cvsignore 6 Mar 2006 01:31:12 -0000 1.3 @@ -1 +1 @@ -Imaging-1.1.4.tar.gz +Imaging-1.1.5.tar.gz Index: python-imaging.spec =================================================================== RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-imaging.spec 23 May 2005 00:04:27 -0000 1.6 +++ python-imaging.spec 6 Mar 2006 01:31:12 -0000 1.7 @@ -4,24 +4,24 @@ Summary: Python's own image processing library Name: python-imaging -Version: 1.1.4 -Release: 9 +Version: 1.1.5 +Release: 1%{?dist} License: Distributable Group: Development/Languages -Source0: http://effbot.org/downloads/Imaging-1.1.4.tar.gz -Patch0: %{name}-ft2.patch -Patch1: %{name}-build.patch -Patch2: %{name}-no-xv.patch -Patch3: %{name}-olefileio.patch -Patch4: %{name}-png.patch -Patch5: %{name}-no-rexec.patch -Patch6: %{name}-giftrans.patch +Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz +Patch0: %{name}-no-xv.patch URL: http://www.pythonware.com/products/pil/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python-devel, libjpeg-devel, zlib-devel, XFree86-devel -BuildRequires: tkinter, %{_includedir}/tcl.h, %{_includedir}/tk.h +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel +BuildRequires: tkinter, tk-devel + Requires: python-abi = %{pyver} +Requires: libjpeg +Requires: zlib +Requires: freetype +Requires: tkinter %description Python Imaging Library @@ -37,7 +37,9 @@ %package devel Summary: Development files for python-imaging. Group: Development/Languages -Requires: %{name} = %{version}-%{release}, python-devel, %{py_incdir} +Requires: %{name} = %{version}-%{release}, python-devel +Requires: libjpeg-devel +Requires: zlib-devel %description devel Development files for python-imaging. @@ -46,25 +48,23 @@ %prep %setup -q -n Imaging-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +# fix the interpreter path for Scripts/*.py +cd Scripts +for scr in *.py +do + sed -e "s|/usr/local/bin/python|%{_bindir}/python|" $scr > tmp.py + mv tmp.py $scr + chmod 755 $scr +done %build -cd libImaging -%configure -make \ -%ifarch x86_64 - CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \ -%endif - %{?_smp_mflags} +# Is this still relevant? (It was used in 1.1.4) +#%ifarch x86_64 +# CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \ +#%endif -cd .. -%{__python} setup.py build +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install @@ -73,6 +73,9 @@ install -m 644 libImaging/*.h $RPM_BUILD_ROOT/%{py_incdir}/Imaging %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +# There is no need to ship the binaries since they are already packaged +# in %doc +rm -rf $RPM_BUILD_ROOT%{_bindir} %check || : PYTHONPATH=$(ls -1d build/lib.linux*) %{__python} selftest.py @@ -84,7 +87,7 @@ %files %defattr (-,root,root) -%doc README CHANGES-114 +%doc README CHANGES-115 %{python_sitearch}/PIL.pth %dir %{python_sitearch}/PIL %{python_sitearch}/PIL/*.so @@ -95,10 +98,13 @@ %files devel %defattr (0644,root,root,755) %{py_incdir}/Imaging -%doc Doc Scripts Images Sane +%doc Docs Scripts Images Sane %changelog +* Sun Mar 5 2006 Jos?? Matos - 1.1.5-1 +- Update to 1.1.5 + * Sun May 22 2005 Jeremy Katz - 1.1.4-9 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-imaging/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:15:21 -0000 1.2 +++ sources 6 Mar 2006 01:31:12 -0000 1.3 @@ -1 +1 @@ -d2c03c25a9a0128832137dd536da88da Imaging-1.1.4.tar.gz +a64512e39469213ced0d091b9eba76c0 Imaging-1.1.5.tar.gz --- python-imaging-build.patch DELETED --- --- python-imaging-ft2.patch DELETED --- --- python-imaging-giftrans.patch DELETED --- --- python-imaging-no-rexec.patch DELETED --- --- python-imaging-olefileio.patch DELETED --- --- python-imaging-png.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 01:49:15 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Sun, 5 Mar 2006 20:49:15 -0500 Subject: rpms/python-imaging/FC-4 .cvsignore, 1.2, 1.3 python-imaging.spec, 1.6, 1.7 sources, 1.2, 1.3 python-imaging-build.patch, 1.1, NONE python-imaging-ft2.patch, 1.1, NONE python-imaging-giftrans.patch, 1.1, NONE python-imaging-no-rexec.patch, 1.1, NONE python-imaging-olefileio.patch, 1.1, NONE python-imaging-png.patch, 1.1, NONE Message-ID: <200603060149.k261nlXn026465@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/python-imaging/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444 Modified Files: .cvsignore python-imaging.spec sources Removed Files: python-imaging-build.patch python-imaging-ft2.patch python-imaging-giftrans.patch python-imaging-no-rexec.patch python-imaging-olefileio.patch python-imaging-png.patch Log Message: * Sun Mar 5 2006 Jos?? Matos - 1.1.5-1 - Update to 1.1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:15:21 -0000 1.2 +++ .cvsignore 6 Mar 2006 01:49:15 -0000 1.3 @@ -1 +1 @@ -Imaging-1.1.4.tar.gz +Imaging-1.1.5.tar.gz Index: python-imaging.spec =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-4/python-imaging.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-imaging.spec 23 May 2005 00:04:27 -0000 1.6 +++ python-imaging.spec 6 Mar 2006 01:49:15 -0000 1.7 @@ -4,24 +4,24 @@ Summary: Python's own image processing library Name: python-imaging -Version: 1.1.4 -Release: 9 +Version: 1.1.5 +Release: 1%{?dist} License: Distributable Group: Development/Languages -Source0: http://effbot.org/downloads/Imaging-1.1.4.tar.gz -Patch0: %{name}-ft2.patch -Patch1: %{name}-build.patch -Patch2: %{name}-no-xv.patch -Patch3: %{name}-olefileio.patch -Patch4: %{name}-png.patch -Patch5: %{name}-no-rexec.patch -Patch6: %{name}-giftrans.patch +Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz +Patch0: %{name}-no-xv.patch URL: http://www.pythonware.com/products/pil/ -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: python-devel, libjpeg-devel, zlib-devel, XFree86-devel -BuildRequires: tkinter, %{_includedir}/tcl.h, %{_includedir}/tk.h +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: python-devel, libjpeg-devel, zlib-devel, freetype-devel +BuildRequires: tkinter, tk-devel + Requires: python-abi = %{pyver} +Requires: libjpeg +Requires: zlib +Requires: freetype +Requires: tkinter %description Python Imaging Library @@ -37,7 +37,9 @@ %package devel Summary: Development files for python-imaging. Group: Development/Languages -Requires: %{name} = %{version}-%{release}, python-devel, %{py_incdir} +Requires: %{name} = %{version}-%{release}, python-devel +Requires: libjpeg-devel +Requires: zlib-devel %description devel Development files for python-imaging. @@ -46,25 +48,23 @@ %prep %setup -q -n Imaging-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 +# fix the interpreter path for Scripts/*.py +cd Scripts +for scr in *.py +do + sed -e "s|/usr/local/bin/python|%{_bindir}/python|" $scr > tmp.py + mv tmp.py $scr + chmod 755 $scr +done %build -cd libImaging -%configure -make \ -%ifarch x86_64 - CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \ -%endif - %{?_smp_mflags} +# Is this still relevant? (It was used in 1.1.4) +#%ifarch x86_64 +# CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" \ +#%endif -cd .. -%{__python} setup.py build +CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install @@ -73,6 +73,9 @@ install -m 644 libImaging/*.h $RPM_BUILD_ROOT/%{py_incdir}/Imaging %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT +# There is no need to ship the binaries since they are already packaged +# in %doc +rm -rf $RPM_BUILD_ROOT%{_bindir} %check || : PYTHONPATH=$(ls -1d build/lib.linux*) %{__python} selftest.py @@ -84,7 +87,7 @@ %files %defattr (-,root,root) -%doc README CHANGES-114 +%doc README CHANGES-115 %{python_sitearch}/PIL.pth %dir %{python_sitearch}/PIL %{python_sitearch}/PIL/*.so @@ -95,10 +98,13 @@ %files devel %defattr (0644,root,root,755) %{py_incdir}/Imaging -%doc Doc Scripts Images Sane +%doc Docs Scripts Images Sane %changelog +* Sun Mar 5 2006 Jos?? Matos - 1.1.5-1 +- Update to 1.1.5 + * Sun May 22 2005 Jeremy Katz - 1.1.4-9 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-imaging/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:15:21 -0000 1.2 +++ sources 6 Mar 2006 01:49:15 -0000 1.3 @@ -1 +1 @@ -d2c03c25a9a0128832137dd536da88da Imaging-1.1.4.tar.gz +a64512e39469213ced0d091b9eba76c0 Imaging-1.1.5.tar.gz --- python-imaging-build.patch DELETED --- --- python-imaging-ft2.patch DELETED --- --- python-imaging-giftrans.patch DELETED --- --- python-imaging-no-rexec.patch DELETED --- --- python-imaging-olefileio.patch DELETED --- --- python-imaging-png.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 03:38:39 2006 From: fedora-extras-commits at redhat.com (Callum Lerwick (seg)) Date: Sun, 5 Mar 2006 22:38:39 -0500 Subject: rpms/tinyfugue/FC-3 tinyfugue.spec,1.1,1.2 Message-ID: <200603060339.k263dBAl031004@cvs-int.fedora.redhat.com> Author: seg Update of /cvs/extras/rpms/tinyfugue/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30956/FC-3 Modified Files: tinyfugue.spec Log Message: * Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 - Added {?dist} to Release. Index: tinyfugue.spec =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/FC-3/tinyfugue.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyfugue.spec 28 Feb 2006 19:28:42 -0000 1.1 +++ tinyfugue.spec 6 Mar 2006 03:38:38 -0000 1.2 @@ -2,7 +2,7 @@ Name: tinyfugue Version: 5.0 -Release: 0.2.b7 +Release: 0.3.b7%{?dist} Summary: A MU* client Group: Applications/Internet @@ -44,6 +44,9 @@ %doc CHANGES COPYING CREDITS README %changelog +* Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 +- Added {?dist} to Release. + * Wed Feb 22 2006 Callum Lerwick - 5.0-0.2.b7 - Removed Epoch. From fedora-extras-commits at redhat.com Mon Mar 6 03:38:45 2006 From: fedora-extras-commits at redhat.com (Callum Lerwick (seg)) Date: Sun, 5 Mar 2006 22:38:45 -0500 Subject: rpms/tinyfugue/FC-4 tinyfugue.spec,1.1,1.2 Message-ID: <200603060339.k263dHwu031007@cvs-int.fedora.redhat.com> Author: seg Update of /cvs/extras/rpms/tinyfugue/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30956/FC-4 Modified Files: tinyfugue.spec Log Message: * Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 - Added {?dist} to Release. Index: tinyfugue.spec =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/FC-4/tinyfugue.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyfugue.spec 28 Feb 2006 19:28:42 -0000 1.1 +++ tinyfugue.spec 6 Mar 2006 03:38:45 -0000 1.2 @@ -2,7 +2,7 @@ Name: tinyfugue Version: 5.0 -Release: 0.2.b7 +Release: 0.3.b7%{?dist} Summary: A MU* client Group: Applications/Internet @@ -44,6 +44,9 @@ %doc CHANGES COPYING CREDITS README %changelog +* Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 +- Added {?dist} to Release. + * Wed Feb 22 2006 Callum Lerwick - 5.0-0.2.b7 - Removed Epoch. From fedora-extras-commits at redhat.com Mon Mar 6 03:38:51 2006 From: fedora-extras-commits at redhat.com (Callum Lerwick (seg)) Date: Sun, 5 Mar 2006 22:38:51 -0500 Subject: rpms/tinyfugue/devel tinyfugue.spec,1.1,1.2 Message-ID: <200603060339.k263dPia031011@cvs-int.fedora.redhat.com> Author: seg Update of /cvs/extras/rpms/tinyfugue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30956/devel Modified Files: tinyfugue.spec Log Message: * Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 - Added {?dist} to Release. Index: tinyfugue.spec =================================================================== RCS file: /cvs/extras/rpms/tinyfugue/devel/tinyfugue.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyfugue.spec 28 Feb 2006 19:28:42 -0000 1.1 +++ tinyfugue.spec 6 Mar 2006 03:38:50 -0000 1.2 @@ -2,7 +2,7 @@ Name: tinyfugue Version: 5.0 -Release: 0.2.b7 +Release: 0.3.b7%{?dist} Summary: A MU* client Group: Applications/Internet @@ -44,6 +44,9 @@ %doc CHANGES COPYING CREDITS README %changelog +* Sun Mar 05 2006 Callum Lerwick - 5.0-0.3.b7 +- Added {?dist} to Release. + * Wed Feb 22 2006 Callum Lerwick - 5.0-0.2.b7 - Removed Epoch. From fedora-extras-commits at redhat.com Mon Mar 6 04:18:18 2006 From: fedora-extras-commits at redhat.com (Shawn McCann (smccann)) Date: Sun, 5 Mar 2006 23:18:18 -0500 Subject: rpms/shapelib/devel shapelib-1.2.10-Makefile2.patch, 1.1, 1.2 shapelib.spec, 1.8, 1.9 Message-ID: <200603060418.k264Iod6000872@cvs-int.fedora.redhat.com> Author: smccann Update of /cvs/extras/rpms/shapelib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv845 Modified Files: shapelib-1.2.10-Makefile2.patch shapelib.spec Log Message: Updated makefile bug that affected parallel builds shapelib-1.2.10-Makefile2.patch: Index: shapelib-1.2.10-Makefile2.patch =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/shapelib-1.2.10-Makefile2.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- shapelib-1.2.10-Makefile2.patch 5 Mar 2006 16:53:38 -0000 1.1 +++ shapelib-1.2.10-Makefile2.patch 6 Mar 2006 04:18:17 -0000 1.2 @@ -1,5 +1,5 @@ --- shapelib-1.2.11-orig/contrib/Makefile 2006-01-07 12:34:14.000000000 -0800 -+++ shapelib-1.2.11/contrib/Makefile 2006-03-04 20:11:01.000000000 -0800 ++++ shapelib-1.2.11/contrib/Makefile 2006-03-05 20:09:06.000000000 -0800 @@ -1,9 +1,10 @@ +bindir = /usr/local/bin @@ -12,6 +12,15 @@ CFLAGS = -g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 +@@ -32,7 +33,7 @@ + shpdata: shpdata.c $(SHPGOBJ) + $(CC) $(CFLAGS) shpdata.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpdata + +-shpinfo: shpinfo.c $(SHPOBJ) ++shpinfo: shpinfo.c $(SHPGOBJ) + $(CC) $(CFLAGS) shpinfo.c ${SHPOBJ} $(LINKOPT) $(GEOOBJ) -o shpinfo + + shpfix: shpfix.c $(SHPOBJ) @@ -64,3 +65,7 @@ testproj: Index: shapelib.spec =================================================================== RCS file: /cvs/extras/rpms/shapelib/devel/shapelib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- shapelib.spec 5 Mar 2006 16:53:38 -0000 1.8 +++ shapelib.spec 6 Mar 2006 04:18:17 -0000 1.9 @@ -2,7 +2,7 @@ Summary: API in "C" for Shapefile handling Name: shapelib Version: 1.2.10 -Release: 10.20060304cvs +Release: 11.20060304cvs URL: http://shapelib.maptools.org/ Source: http://shapelib.maptools.org/dl/shapelib-%{version}.tar.gz Patch0: shapelib-1.2.10-Makefile.patch @@ -72,6 +72,9 @@ %exclude %{_libdir}/libshp.la %changelog +* Sun Mar 5 2006 Shawn McCann - 1.2.10-11.20060304cvs +- Fixed a makefile bug that messed up parallel builds + * Sat Mar 4 2006 Shawn McCann - 1.2.10-10.20060304cvs - Upgraded to cvs snapshot taken on March 4, 2006 From fedora-extras-commits at redhat.com Mon Mar 6 07:10:01 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:10:01 -0500 Subject: rpms/worminator-data - New directory Message-ID: <200603060710.k267A54I007083@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7075/worminator-data Log Message: Directory /cvs/extras/rpms/worminator-data added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 07:10:08 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:10:08 -0500 Subject: rpms/worminator-data/devel - New directory Message-ID: <200603060710.k267AAFI007098@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7075/worminator-data/devel Log Message: Directory /cvs/extras/rpms/worminator-data/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 07:09:43 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:09:43 -0500 Subject: rpms/lacewing/devel lacewing.desktop,1.1,1.2 Message-ID: <200603060710.k267AFpk007107@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lacewing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7035 Modified Files: lacewing.desktop Log Message: Small .desktop file cleanups Index: lacewing.desktop =================================================================== RCS file: /cvs/extras/rpms/lacewing/devel/lacewing.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lacewing.desktop 30 Jan 2006 21:34:11 -0000 1.1 +++ lacewing.desktop 6 Mar 2006 07:09:42 -0000 1.2 @@ -6,7 +6,7 @@ Exec=lacewing Icon=lacewing.png Terminal=false +StartupNotify=false Type=Application -Categories=Game;ArcadeGame +Categories=Application;Game;ArcadeGame; Version=1.10 - From fedora-extras-commits at redhat.com Mon Mar 6 07:10:41 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:10:41 -0500 Subject: rpms/worminator-data Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603060710.k267Ahfj007135@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7123 Added Files: Makefile import.log Log Message: Setup of module worminator-data --- NEW FILE Makefile --- # Top level Makefile for module worminator-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 Mar 6 07:10:47 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:10:47 -0500 Subject: rpms/worminator-data/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603060710.k267AnIh007153@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7123/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module worminator-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 Mar 6 07:15:36 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:15:36 -0500 Subject: rpms/overgod/devel overgod.desktop,1.1,1.2 Message-ID: <200603060716.k267G9IR007253@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/overgod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7197 Modified Files: overgod.desktop Log Message: Small .desktop file cleanups Index: overgod.desktop =================================================================== RCS file: /cvs/extras/rpms/overgod/devel/overgod.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- overgod.desktop 31 Jan 2006 21:17:33 -0000 1.1 +++ overgod.desktop 6 Mar 2006 07:15:36 -0000 1.2 @@ -6,6 +6,7 @@ Exec=overgod Icon=overgod.png Terminal=false +StartupNotify=false Type=Application -Categories=Game;ArcadeGame +Categories=Application;Game;ArcadeGame; Version=1.0 From fedora-extras-commits at redhat.com Mon Mar 6 07:16:01 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:16:01 -0500 Subject: rpms/worminator-data import.log,1.1,1.2 Message-ID: <200603060716.k267GYPx007272@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7224 Modified Files: import.log Log Message: auto-import worminator-data-3.0R2.1-1 on branch devel from worminator-data-3.0R2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/worminator-data/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Mar 2006 07:10:41 -0000 1.1 +++ import.log 6 Mar 2006 07:16:01 -0000 1.2 @@ -0,0 +1 @@ +worminator-data-3_0R2_1-1:HEAD:worminator-data-3.0R2.1-1.src.rpm:1141630259 From fedora-extras-commits at redhat.com Mon Mar 6 07:16:08 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:16:08 -0500 Subject: rpms/worminator-data/devel license-change.txt, NONE, 1.1 license.txt, NONE, 1.1 worminator-data.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603060716.k267GeWj007288@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7224/devel Modified Files: .cvsignore sources Added Files: license-change.txt license.txt worminator-data.spec Log Message: auto-import worminator-data-3.0R2.1-1 on branch devel from worminator-data-3.0R2.1-1.src.rpm --- NEW FILE license-change.txt --- As described in license.txt the Worminator 3 license has changed as result of an email exchange, and the permission for this change has been given by David Layne and Keith Palmer in this exchange. This file contains all mails of this exchange seperated by lines containing nothing but "###". ### Message-ID: <43CE2CA2.7060303 at hhs.nl> Date: Wed, 18 Jan 2006 12:55:14 +0100 From: Hans de Goede User-Agent: Mail/News 1.5 (X11/20060103) MIME-Version: 1.0 To: keith at uglyslug.com Subject: Worminator Source (for a Linux port) Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Note: I'm sending this to you and not to any of the other worminator team members as all their emall addresses cause failures. Please forward to David Layne adn the rest of the team, and your own opinion also is valued ofcourse. --- Hi, I was looking for a project to fill my spare time and I ended up with the idea of porting some (allegro) games to Linux. I'm a crazy guy who likes porting and then testing and then coding again more then just playing (although I sometimes enjoy just playing) as such I've not yet targeted a specific game to port I just want to expand the collection of games available for Linux and enjoy myself at the same time. For more on me see: http://home.versatel.nl/jwrdegoede/ I'm most famous for xmame the Unix port of MAME I guess. Worminator sounds like an excellent candidate for my next project. It looks like (I only have Linux so I haven't tried it yet) a very fun game! As I understand it (this is a bit unclear on the homepage) Worminator3 is win32 only and thus probably no longer uses allegro or? Anyways if possible I would like todo a Linux port. I've tried to download the version 1 source but I had to register for that. Can you send me a copy of the version 1 source or preferably the version 3 one? And just as important as having access to the source, under what conditions (license) can I use it? I've burned myself working on less then 100% free software before and I would like to avoid that this time. For the definition of freesoftware see: www.gnu.org Any free license will do for me. For the artwork and sounds you could use a more artwork and sounds oriented license like the Creative Commons licenses. Thanks & Regards, Hans ### Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 44060711 for j.w.r.degoede at hhs.nl; Wed, 18 Jan 2006 15:47:00 +0100 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.41) id 1EzEaS-0004d1-1f for j.w.r.degoede at hhs.nl; Wed, 18 Jan 2006 15:47:00 +0100 Received: from [64.20.44.2] (port=33655 helo=vps.uglyslug.com) by koko.hhs.nl with esmtp (Exim 4.41) id 1EzEaR-0004cp-L7 for j.w.r.degoede at hhs.nl; Wed, 18 Jan 2006 15:46:59 +0100 Received: by vps.uglyslug.com (Postfix, from userid 0) id 7D1BD102DE49E; Wed, 18 Jan 2006 09:46:50 -0500 (EST) From: keith at uglyslug.com Subject: Re: Worminator Source (for a Linux port) To: Hans de Goede Cc: X-Originating-IP: 69.177.133.6 X-Mailer: Usermin 1.250 Message-Id: <1137595610.27424 at vps.uglyslug.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="bound1137595610" Date: Wed, 18 Jan 2006 09:46:50 -0500 (EST) X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 18012006 #161284, status: clean This is a multi-part message in MIME format. --bound1137595610 Content-Type: text/plain Content-Transfer-Encoding: 7bit Hey Hans de Goede, aight so I still have to speak to Dave and the two other guys but... personally, I think it would be *super* cool to have you do a Linux port. I don't think we specifically plastered a license on the game, but we made the source code available and I don't think it'll be any problem to have you work on a Linux port. I believe even the latest version of the game still uses Allegro, just we never tried to compile on Linux/don't know if there are any compatibility issues/never put any time into trying to compile on Linux, and that's why its Win32 only :-) I'm not sure if there's actually any specific Win32 code. In any case, I'll email Dave today and forward him this, he did the programming. You might not get a response right away, we're both very busy with the beginning of the semester and I'll be out-of-town for the next week... but if you don't hear from either one of us within a week, make sure to email me again, I think it'd be really great for you to do a Linux port! - Keith Hans de Goede wrote .. > Note: I'm sending this to you and not to any of the other worminator ### > Hans --bound1137595610-- ### The above mail had a full quote of the first mail which has been removed and the lines have been wrapped at 80 chars, both for readability. ### Message-ID: <43CE6883.1040507 at hhs.nl> Date: Wed, 18 Jan 2006 17:10:43 +0100 From: Hans de Goede User-Agent: Mail/News 1.5 (X11/20060103) MIME-Version: 1.0 To: keith at uglyslug.com Subject: Re: Worminator Source (for a Linux port) References: <1137595610.27424 at vps.uglyslug.com> In-Reply-To: <1137595610.27424 at vps.uglyslug.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit keith at uglyslug.com wrote: > Hey Hans de Goede, aight so I still have to speak to Dave and the two other guys but... personally, I think it would be *super* cool to have you do a >Linux port. I don't think we specifically plastered a license on the game, but we made the source code available and I don't think it'll be any >problem to have you work on a Linux port. > First of all I'm very happy to hear that you like the idea, but I really must insist on slapping a clear License (say GPL for example) on the sources. I plan on providing Linux binaries, but its _really_ a show stopper for me if I can't distribute the sources and allow others to freely redistribute both binaries and sources including modified versions. I realise this is a _lot_ to ask, and I can only hope you (the team) are willing to release the source under such a license. For the artwork (and levels) the story is quite different. A license allowing free redistribution of those is enough. I can fully agree if you don't want others to (re)distribute modified versions of your artwork (and levels). > I believe even the latest version of the game still uses Allegro, just we never tried to compile on Linux/don't know if there are any compatibility >issues/never put any time into trying to compile on Linux, and that's why its Win32 only :-) I'm not sure if there's actually any specific Win32 code. > If thats true that would be great I'm pretty sure it won't compile out of the box, but its a good start. Otherwise if its all directx for example I might take a shot too, but it will be much harder to port. > > In any case, I'll email Dave today and forward him this, he did the programming. You might not get a response right away, we're both very busy with the > beginning of the semester and I'll be out-of-town for the next week... but if you don't hear from either one of us within a week, make sure to email > me again, I think it'd be really great for you to do a Linux port! I understand that an answer may take some time, thanks for the quick respons sofar. Thanks & Regards, Hans ### Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 44128777 for j.w.r.degoede at hhs.nl; Fri, 20 Jan 2006 17:29:24 +0100 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.41) id 1Ezz8e-0006VF-M4 for j.w.r.degoede at hhs.nl; Fri, 20 Jan 2006 17:29:24 +0100 Received: from [64.20.44.2] (port=49613 helo=vps.uglyslug.com) by koko.hhs.nl with esmtp (Exim 4.41) id 1Ezz8e-0006V9-3G for j.w.r.degoede at hhs.nl; Fri, 20 Jan 2006 17:29:24 +0100 Received: by vps.uglyslug.com (Postfix, from userid 0) id 1BD61102DE49E; Fri, 20 Jan 2006 11:29:17 -0500 (EST) From: keith at UglySlug.com Subject: Re: Worminator Source (for a Linux port) To: Hans de Goede Cc: dml1001 at yahoo.com X-Originating-IP: 67.101.106.61 X-Mailer: Usermin 1.250 Message-Id: <1137774557.14913 at vps.uglyslug.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="bound1137774557" Date: Fri, 20 Jan 2006 11:29:17 -0500 (EST) X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 20012006 #161616, status: clean This is a multi-part message in MIME format. --bound1137774557 Content-Type: text/plain Content-Transfer-Encoding: 7bit Awesome, I see no problem with GPL for everything, it doesn't bother me if people change artwork and we've already made the source code available for download so why not GPL? Just need to run that by Dave (hey Dave! thoughts? GPL OK with you?) You should be hearing from Dave if you havn't already, he said it might take him a few days to get the source code cleaned up and ready for you. - Keith Hans de Goede wrote .. > keith at uglyslug.com wrote: > > Hey Hans de Goede, aight so I still have to speak to Dave and the two ### > Thanks & Regards, > > Hans --bound1137774557-- ### The above mail had a full quote of the mail, to which it replied, which has been removed and the lines have been wrapped at 80 chars, both for readability. ### Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 44141865 for j.w.r.degoede at hhs.nl; Sun, 22 Jan 2006 10:23:07 +0100 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.41) id 1F0bRD-0004n8-9R for j.w.r.degoede at hhs.nl; Sun, 22 Jan 2006 10:23:07 +0100 Received: from [68.142.199.87] (port=31396 helo=web81007.mail.mud.yahoo.com) by koko.hhs.nl with smtp (Exim 4.41) id 1F0bRB-0004n2-Hp for j.w.r.degoede at hhs.nl; Sun, 22 Jan 2006 10:23:06 +0100 Received: (qmail 78252 invoked by uid 60001); 22 Jan 2006 09:23:04 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=BB2dO5A36cMMbqFo3Sx8DpuAEFMpg3/pkItl4yHWU/YB46FHtKyS79RX+XDl8jYOJ4SxSwohaz3JFh8oWNZE58RHVouNjAZ9ZyBNsNsHDy+ZtIb4G/HDT7aVUZc2OgerjEmYKycMe7Cn/0p9zwIZZNSw+KIFzwPW7oJr9yE3/GY= ; Message-ID: <20060122092304.78250.qmail at web81007.mail.mud.yahoo.com> Received: from [69.37.40.157] by web81007.mail.mud.yahoo.com via HTTP; Sun, 22 Jan 2006 01:23:04 PST Date: Sun, 22 Jan 2006 01:23:04 -0800 (PST) From: David Layne Subject: Re: Fwd: Worminator Source (for a Linux port) To: j.w.r.degoede at hhs.nl, keith at uglyslug.com In-Reply-To: <1137595678.3039 at vps.uglyslug.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-555987958-1137921784=:56237" Content-Transfer-Encoding: 8bit X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 21012006 #161851, status: clean --0-555987958-1137921784=:56237 Content-Type: multipart/alternative; boundary="0-1522450946-1137921784=:56237" --0-1522450946-1137921784=:56237 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Dear Hans, I understand that you are interested in creating a Linux port of Worminator 3. I have attatched the source code for the latest build I have of the game to this e-mail. In order to test it, you need to download the data file and the maps from our website (I couldn't send everything because the attatchment would have been around 8 megs). Once you compile the executable, make sure that the wormdata.dat file is present as well as the maps folder. If not, the game will probabaly crash. You are free to port this to linux and release it if you like, the game is freeware and I don't mind it being publically available. Good luck with your project, I hope you can make sense of this source code. I wrote it ages ago now, and there are quite a few poorly done portions. If you need any help, let me know. The game is still Allegro based, this new version just uses Winallegro. There shouldnt be alot that you have to change to get it running under Linux (hopefully). Keep me posted as to your progress. Good luck. -David Layne Hans de Goede wrote .. > Note: I'm sending this to you and not to any of the other worminator > team members as all their emall addresses cause failures. ### The above mail had a full quote of the first mail and an attachment containing the source which both been removed and the lines have been wrapped at 80 chars, both for readability (and size). ### Message-ID: <43D3748D.1030400 at hhs.nl> Date: Sun, 22 Jan 2006 13:03:25 +0100 From: Hans de Goede User-Agent: Thunderbird 1.5 (X11/20060112) MIME-Version: 1.0 To: David Layne Subject: Re: Fwd: Worminator Source (for a Linux port) References: <20060122092304.78250.qmail at web81007.mail.mud.yahoo.com> In-Reply-To: <20060122092304.78250.qmail at web81007.mail.mud.yahoo.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit David Layne wrote: > > Dear Hans, > > I understand that you are interested in creating a Linux port of > Worminator 3. I have attatched the source code for the latest build I > have of the game to this e-mail. In order to test it, you need to > download the data file and the maps from our website (I couldn't send > everything because the attatchment would have been around 8 megs). > Excellent, many thanks! > Once you compile the executable, make sure that the wormdata.dat file is > present as well as the maps folder. If not, the game will probabaly crash. > > You are free to port this to linux and release it if you like, the game > is freeware and I don't mind it being publically available. Making it publically available was the plan :) Could you ellaborate on the freeware part? I wonder did Keith forward my reply to him about the licensing? I'll include it below for reference. Anyways freeware is a bit of an ambigious term, software which is free to download, but comes without any source is often called freeware. Do you mean that the data files and the source are publicdomain, iow anyone can do with it what they want (including closed source commercial spinoffs) ? Public Domain would be fine with me, as that is a legally well defined term, a more restrictive but opensource License like GPL would be fine too. I'm sorry that I've keep nagging about the License part, but I've burned myself in the past by spending (lots of) freetime on projects without a proper license. > Good luck > with your project, I hope you can make sense of this source code. I > wrote it ages ago now, and there are quite a few poorly done portions. > If you need any help, let me know. The game is still Allegro based, > this new version just uses Winallegro. There shouldnt be alot that you > have to change to get it running under Linux (hopefully). > Good to hear that its all allegro, that should indeed make the port relativly easy. As for poorly done code I'm a computerscience teacher, I've seen my part of poorly done code. > Keep me posted as to your progress. Good luck. > I most certainly will, Thanks again, Hans -- the promised mail to Keith --- keith at uglyslug.com wrote: > Hey Hans de Goede, aight so I still have to speak to Dave and the two ### The above mail had a full quote of the mail to Keith about licensing which has been removed readability. The first alinea of the mail below is a reply to a technical??question which was asked in an omitted mail. This mail has been ommited because its not relevant to the license change. ### Return-Path: Received: from koko.hhs.nl ([145.52.2.16] verified) by hhs.nl (CommuniGate Pro SMTP 4.3.6) with ESMTP id 44209367 for j.w.r.degoede at hhs.nl; Tue, 24 Jan 2006 14:16:12 +0100 Received: from exim (helo=koko) by koko.hhs.nl with local-smtp (Exim 4.41) id 1F1O1r-0006hE-80 for j.w.r.degoede at hhs.nl; Tue, 24 Jan 2006 14:16:12 +0100 Received: from [68.142.199.82] (port=44806 helo=web81002.mail.mud.yahoo.com) by koko.hhs.nl with smtp (Exim 4.41) id 1F1O1V-0006fX-Nu for j.w.r.degoede at hhs.nl; Tue, 24 Jan 2006 14:16:07 +0100 Received: (qmail 9246 invoked by uid 60001); 24 Jan 2006 13:15:48 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=Message-ID:Received:Date:From:Subject:To:In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=o1EgPiH7GCNhWAem0DYFDJYGJVsRvMaCqa1ZJB/W/R/EoxmTjSYQyYj47QzyduHiHbyI+FkDLrPq5sAdw1XwOL5BpVQFAtagaf/9HrobvvZjSSBt8kXUCH74+hfOIaBIXiXM7szGBpRfUnhSoWvZveYIhQ0oGV1lTC8zV7FMsUk= ; Message-ID: <20060124131548.9244.qmail at web81002.mail.mud.yahoo.com> Received: from [69.37.40.157] by web81002.mail.mud.yahoo.com via HTTP; Tue, 24 Jan 2006 05:15:46 PST Date: Tue, 24 Jan 2006 05:15:46 -0800 (PST) From: David Layne Subject: Re: Fwd: Worminator Source (for a Linux port) To: Hans de Goede In-Reply-To: <43D5ECD5.6090704 at hhs.nl> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="0-1546335489-1138108546=:8366" Content-Transfer-Encoding: 8bit X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 24012006 #162313, status: clean --0-1546335489-1138108546=:8366 Content-Type: multipart/alternative; boundary="0-641554036-1138108546=:8366" --0-641554036-1138108546=:8366 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: 8bit Good call, thats my fault. I forgot that my latest build had some graphical changes in the data file. I'm attatching the newest data file. Glad the project is going well. I will release a new version of worminator 3 soon with the new data file included. The life essence things were added to make the game a little easier, alot of the weaker enemies drop them now and they heal you when you collect them. BTW, feel free to GPL the code, I was planning on publically releasing it anyway but I kept holding back because I was planning on adding a few more things to it and I just never got around to it. Just leave me listed as the original author of the code and yourself as the developer of the linux port and everything should be fine. Hans de Goede wrote: Hi David & Keith, ### The above mail had a full quote of the omitted mail and an attachment containing wormdata.dat which both been removed and the lines have been wrapped at 80 chars, both for readability (and size). --- NEW FILE license.txt --- Worminator 3 License info ------------------------- The original Worminator 3 readme.txt contained the following license text: "Note: This game, Worminator 3, is Copyright 2003 by David Layne. All artwork in this game is original and is either Copyright 2003 by Keith Palmer or Copyright 2003 by Jeff Nielson. All graphical content in this game is completely original, and you do not have permission to use any artwork from this game without permission from a member of the Worminator Team. See the end of this document for contact information. The sound used in this game was obtained off sites on the Internet (mostly meanrabbit sound archive) and a sound effects CD that I own. I believe that none of these sounds are copyrighted. If they are, please contact me ASAP and I will remove any copyrighted content immediately. All music in this game was composed by Garret Thomson, who holds the copyright on them. All programming in this game was done by David Layne, and only the Allegro library samples were used as a base. Worminator 3 was compiled with MSVC 6.0. WARNING, Disclaimer: This software is provided 'as is' with no warranty of any kind. No member of the Worminator 3 Team may be held in any way responsible for any damage caused by this program. Use this software at your own risk. WARNING: You may not sell Worminator 3 or anything created specifically for use with Worminator 3, nor may you profit directly or indirectly in any way from Worminator 3 without written permission from David Layne (DML1001 at cox.net) and Keith Palmer (Superwormy at hotmail.com). In addition: Worminator 3 is not officially rated by any game rating system, but it is the judgment of the Worminator 3 Team members that this game, Worminator 3, should probably not be played by those under 13 or those opposed to graphic violence. Use your own discretion while playing, and please don't try to hold us responsible if you have a problem with the game. Just don't play it! That said, however, compared to most computer games available today, the violence in Worminator 3 is mild and should not pose a problem to most players. DO NOT separate this ReadMe.txt file from the Worminator 3 package, or alter this file in any way!" --- This license however no longer applies to worminator, the license has been changed to GPL for both the content (graphics, sounds, music) and the sources with permission of David Layne and Keith Palmer. See the file license-change.txt for a copy of the email exchange leading to the change and for the permession notices for this change from both David and Keith. Thus Worminator 3 content, source and binaries are free software; you can redistribute them and/or modify them 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. Version 2 of the GNU GPL is included at the end of this file. You can write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA, to obtain a later version (if available). Notice that Worminator3 is still not rated in any game rating systems as describred in the old license text. This notice is just a warning and does not impose any restrictions on the recipients' exercise of the rights granted under the GNU General Public License. --- GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Library General Public License instead.) You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things. To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. The precise terms and conditions for copying, distribution and modification follow. GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. 1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. 4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. 6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. 7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. 10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) 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 Also add information on how to contact you by electronic and paper mail. If the program is interactive, make it output a short notice like this when it starts in an interactive mode: Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. , 1 April 1989 Ty Coon, President of Vice This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Library General Public License instead of this License. --- NEW FILE worminator-data.spec --- Name: worminator-data Version: 3.0R2.1 Release: 1%{?dist} Summary: Data for worminator the game Group: Amusements/Games License: GPL URL: http://sourceforge.net/projects/worminator/ Source0: http://download.sourceforge.net/worminator/%{name}-%{version}.tar.gz Source1: license.txt Source2: license-change.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %description Data for worminator the game where you play as The Worminator and fight your way through many levels of madness and mayhem. Worminator features nine unique weapons, visible character damage, full screen scrolling, sound and music, and much more! %prep #put the docs where %doc wants them install -p -m 0644 %{SOURCE1} %{SOURCE2} $RPM_BUILD_DIR %build #empty / notthing to build %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/games/worminator tar xzf %{SOURCE0} -C $RPM_BUILD_ROOT%{_datadir}/games/worminator rm $RPM_BUILD_ROOT%{_datadir}/games/worminator/ICON.ICO %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc license.txt license-change.txt %{_datadir}/games/worminator %changelog * Sat Mar 4 2006 Hans de Goede 3.0R2.1-1 - initial Fedora Extras package - loosely based on the SRPM from Cru: http://naturidentisch.de/packages/fc4/worminator/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/worminator-data/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Mar 2006 07:10:47 -0000 1.1 +++ .cvsignore 6 Mar 2006 07:16:07 -0000 1.2 @@ -0,0 +1 @@ +worminator-data-3.0R2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/worminator-data/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Mar 2006 07:10:47 -0000 1.1 +++ sources 6 Mar 2006 07:16:07 -0000 1.2 @@ -0,0 +1 @@ +3c7162423fa2971643c0562e3592a03f worminator-data-3.0R2.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 07:17:49 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:17:49 -0500 Subject: rpms/worminator - New directory Message-ID: <200603060717.k267HpMM007388@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7378/worminator Log Message: Directory /cvs/extras/rpms/worminator added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 07:17:55 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:17:55 -0500 Subject: rpms/worminator/devel - New directory Message-ID: <200603060717.k267Hvf2007406@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7378/worminator/devel Log Message: Directory /cvs/extras/rpms/worminator/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 07:18:13 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:18:13 -0500 Subject: rpms/worminator Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603060718.k267IFjK007475@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7462 Added Files: Makefile import.log Log Message: Setup of module worminator --- NEW FILE Makefile --- # Top level Makefile for module worminator all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 6 07:18:19 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:18:19 -0500 Subject: rpms/worminator/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603060718.k267ILkU007498@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7462/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module worminator --- NEW 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 Mar 6 07:19:03 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:19:03 -0500 Subject: rpms/worminator import.log,1.1,1.2 Message-ID: <200603060719.k267JZim007583@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7547 Modified Files: import.log Log Message: auto-import worminator-3.0R2.1-1 on branch devel from worminator-3.0R2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/worminator/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Mar 2006 07:18:13 -0000 1.1 +++ import.log 6 Mar 2006 07:19:03 -0000 1.2 @@ -0,0 +1 @@ +worminator-3_0R2_1-1:HEAD:worminator-3.0R2.1-1.src.rpm:1141630458 From fedora-extras-commits at redhat.com Mon Mar 6 07:19:09 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:19:09 -0500 Subject: rpms/worminator/devel worminator.desktop, NONE, 1.1 worminator.png, NONE, 1.1 worminator.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603060719.k267JfN5007587@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7547/devel Modified Files: .cvsignore sources Added Files: worminator.desktop worminator.png worminator.spec Log Message: auto-import worminator-3.0R2.1-1 on branch devel from worminator-3.0R2.1-1.src.rpm --- NEW FILE worminator.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Worminator GenericName=A sidescrolling action-game Comment=A jump, run and shoot action-game Exec=worminator Icon=worminator.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; Version=3.0R2.1 --- NEW FILE worminator.spec --- Name: worminator Version: 3.0R2.1 Release: 1%{?dist} Summary: Sidescrolling platform and shoot'em up action-game Group: Amusements/Games License: GPL URL: http://sourceforge.net/projects/worminator/ Source0: http://download.sourceforge.net/worminator/worminator-%{version}.tar.gz Source1: worminator.png Source2: worminator.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel, desktop-file-utils Requires: worminator-data = 3.0R2.1 %description You play as The Worminator and fight your way through many levels of madness and mayhem. Worminator features nine unique weapons, visible character damage, full screen scrolling, sound and music, and much more! %prep %setup -q %{__sed} -i 's/\r//' ReadMe.txt %build gcc $RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations \ -Wno-char-subscripts -DDATADIR=\"%{_datadir}/games/%{name}/\" -o %{name} \ Worminator.c `allegro-config --libs` %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 0755 %{name} $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} %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.txt changes.unix license.txt license-change.txt %{_bindir}/%{name} %{_datadir}/applications/*-worminator.desktop %{_datadir}/icons/hicolor/32x32/apps/worminator.png %changelog * Sat Mar 4 2006 Hans de Goede 3.0R2.1-1 - initial Fedora Extras package - loosely based on the SRPM from Cru: http://naturidentisch.de/packages/fc4/worminator/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/worminator/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Mar 2006 07:18:19 -0000 1.1 +++ .cvsignore 6 Mar 2006 07:19:09 -0000 1.2 @@ -0,0 +1 @@ +worminator-3.0R2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/worminator/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Mar 2006 07:18:19 -0000 1.1 +++ sources 6 Mar 2006 07:19:09 -0000 1.2 @@ -0,0 +1 @@ +2231742c1233b49c7744c7008fbf06c1 worminator-3.0R2.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 07:23:21 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 6 Mar 2006 02:23:21 -0500 Subject: owners owners.list,1.712,1.713 Message-ID: <200603060723.k267NscR007681@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7664/owners Modified Files: owners.list Log Message: add worminator and worminator-data Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.712 retrieving revision 1.713 diff -u -r1.712 -r1.713 --- owners.list 5 Mar 2006 23:23:10 -0000 1.712 +++ owners.list 6 Mar 2006 07:23:21 -0000 1.713 @@ -1411,6 +1411,8 @@ Fedora Extras|wmweather+|Weather status dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wmx|A really simple window manager for X|somlo at cmu.edu|extras-qa at fedoraproject.org| Fedora Extras|workrave|Recovery and prevention of RSI assistant|tmraz at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|worminator|Sidescrolling platform and shoot'em up action-game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| +Fedora Extras|worminator-data|Data for worminator the game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|wp_tray|A wallpaper-changing applet for GNOME|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|wv2|A library which allows access to Microsoft?? Word files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|wv|MSWord 6/7/8/9 binary file format to HTML converter|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 6 09:12:46 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Mar 2006 04:12:46 -0500 Subject: rpms/mm/devel .cvsignore,NONE,1.1 mm.spec,NONE,1.1 Message-ID: <200603060912.k269CmCf012199@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/mm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12185 Added Files: .cvsignore mm.spec Log Message: Fixup for broken import --- NEW FILE .cvsignore --- mm-1.4.0.tar.gz --- NEW FILE mm.spec --- Summary: Shared memory allocation library Name: mm Version: 1.4.0 Release: 3%{?dist} License: BSD Group: System Environment/Libraries Source0: ftp://ftp.ossp.org/pkg/lib/mm/mm-%{version}.tar.gz URL: http://www.ossp.org/pkg/lib/mm/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description OSSP mm is a 2-layer abstraction library which simplifies the usage of shared memory between forked (and this way strongly related) processes under Unix platforms. On the first layer it hides all platform dependent implementation details (allocation and locking) when dealing with shared memory segments and on the second layer it provides a high-level malloc(3)-style API for a convenient and well known way to work with data structures inside those shared memory segments. %package devel Summary: Header files and libraries for %{name} development Group: Development/Libraries Requires: %{name} = %{version} %description devel The %{name}-devel package contains the header files and libraries needed to develop programs that use the %{name} library. %prep %setup -q %build %configure --enable-debug %{__make} %{?_smp_mflags} %install rm -rf %{buildroot} %{__make} install DESTDIR=%{buildroot} find %{buildroot} -name "*.la" -exec rm -f {} \; find %{buildroot} -name "*.a" -exec rm -f {} \; # Fix permissions, so that find-debuginfo.sh picks up the libraries find %{buildroot} -name *.so.* -type f -exec chmod 755 {} \; %clean rm -rf %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc LICENSE THANKS README %{_libdir}/*.so.* %files devel %doc ChangeLog %defattr(-, root, root) %{_bindir}/mm-config %{_libdir}/*.so %{_includedir}/mm.h %{_mandir}/man1/mm-config.1* %{_mandir}/man3/mm.3* %changelog * Thu Mar 02 2006 Andreas Thienemann 1.4.0-3 - --enable-debug to finally fix the debuginfo package. * Tue Feb 21 2006 Andreas Thienemann 1.4.0-2 - Fix the debuginfo package. * Sat Sep 13 2005 Andreas Thienemann 1.4.0-1 - Initial spec. From fedora-extras-commits at redhat.com Mon Mar 6 09:16:26 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Mon, 6 Mar 2006 04:16:26 -0500 Subject: owners owners.list,1.713,1.714 Message-ID: <200603060916.k269GxfN012246@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12229 Modified Files: owners.list Log Message: Added mm Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.713 retrieving revision 1.714 diff -u -r1.713 -r1.714 --- owners.list 6 Mar 2006 07:23:21 -0000 1.713 +++ owners.list 6 Mar 2006 09:16:26 -0000 1.714 @@ -676,6 +676,7 @@ 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|mknbi|Utility for creating network bootable images|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|mlmmj|Mailserver-independent ezmlm-like mailing list manager|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| +Fedora Extras|mm|Shared memory allocation library|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|mmv|Move/copy/append/link multiple files|shishz at hotpop.com|extras-qa at fedoraproject.org| Fedora Extras|MochiKit|A lightweight JavaScript library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 6 10:12:29 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Mon, 6 Mar 2006 05:12:29 -0500 Subject: owners owners.list,1.714,1.715 Message-ID: <200603061013.k26AD147014373@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14356 Modified Files: owners.list Log Message: Take ownership of python-imaging as reported in fedora-extras mailing list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.714 retrieving revision 1.715 diff -u -r1.714 -r1.715 --- owners.list 6 Mar 2006 09:16:26 -0000 1.714 +++ owners.list 6 Mar 2006 10:12:28 -0000 1.715 @@ -1135,7 +1135,7 @@ 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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| -Fedora Extras|python-imaging|Python's own image processing library|jylitalo 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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-kid|A simple and pythonic XML template language|icon at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 6 11:15:37 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:15:37 -0500 Subject: rpms/libtasn1/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200603061116.k26BG9V1016406@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16382 Modified Files: .cvsignore sources Log Message: version 0.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:22 -0000 1.2 +++ .cvsignore 6 Mar 2006 11:15:36 -0000 1.3 @@ -1 +1,2 @@ -libtasn1-0.2.6.tar.gz +libtasn1-*.tar.gz +libtasn1-*.tar.gz.sig Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:49:22 -0000 1.2 +++ sources 6 Mar 2006 11:15:36 -0000 1.3 @@ -1 +1,2 @@ -2e9bdad5f6e4248927ec6da0a75a3428 libtasn1-0.2.6.tar.gz +e78a3fba867f6d956ead70d86815a2d7 libtasn1-0.3.0.tar.gz +0f8dc79aca78440e0c31dfef6ed5e571 libtasn1-0.3.0.tar.gz.sig From fedora-extras-commits at redhat.com Mon Mar 6 11:17:12 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:17:12 -0500 Subject: rpms/libtasn1/FC-4 libtasn1.spec,1.8,1.9 Message-ID: <200603061117.k26BHi2E016449@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16422 Modified Files: libtasn1.spec Log Message: - updated to 0.3.0 - removed unneeded curlies - created -devel subpackage Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/libtasn1.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libtasn1.spec 22 May 2005 23:57:05 -0000 1.8 +++ libtasn1.spec 6 Mar 2006 11:17:12 -0000 1.9 @@ -1,39 +1,61 @@ +## $Id$ + +%{!?release_func:%global release_func() %1%{?dist}} + Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.2.6 -Release: 3 +Version: 0.3.0 +Release: %release_func 1 License: LGPL Group: System Environment/Libraries URL: http://www.gnu.org/software/gnutls/download.html -Source0: ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Provides: %{name}-devel = %{version}-%{release} +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 +Provides: %name-devel = %version-%release BuildRequires: bison +%package devel +Summary: Files for development of applications which will use libtasn1 +Group: Development/Libraries +Requires: %name = %version-%release +Requires(pre): automake pkgconfig +Requires(postun): automake pkgconfig +Requires(post): /sbin/install-info +Requires(postun): /sbin/install-info + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org +%description devel +This is the ASN.1 library used in GNUTLS. More up to date information can +be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org + +This packages contains files for development of applications which +will use libtasn1. + %prep %setup -q %build -%configure -%{__make} %{?_smp_mflags} +%configure --disable-static +make %{?_smp_mflags} %install rm -rf "$RPM_BUILD_ROOT" -%{__make} DESTDIR="$RPM_BUILD_ROOT" install -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +make DESTDIR="$RPM_BUILD_ROOT" install + +rm -f $RPM_BUILD_ROOT{%_libdir/*.la,%_infodir/dir} %check -%{__make} check +%__make check %clean @@ -44,16 +66,38 @@ %postun -p /sbin/ldconfig +%post devel +/sbin/install-info --info-dir=%_infodir %_infodir/%name.info || : + +%preun devel +test "$1" != 0 || + /sbin/install-info --info-dir=%_infodir --delete %_infodir/%name.info || : + + %files %defattr(-,root,root,-) -%doc doc/TODO doc/*.ps +%doc doc/TODO doc/*.pdf %doc AUTHORS COPYING* ChangeLog NEWS README THANKS -%{_includedir}/* -%{_libdir}/*.a -%{_libdir}/*.so* +%_libdir/*.so.* + + +%files devel +%defattr(-,root,root,-) +%_bindir/*-config +%_libdir/*.so +%_libdir/pkgconfig/*.pc +%_includedir/* +%_datadir/aclocal/libtasn1.m4 +%_infodir/*.info.* +%_mandir/man3/*asn1* %changelog +* Mon Mar 6 2006 Enrico Scholz - 0.3.0-1 +- updated to 0.3.0 +- removed unneeded curlies +- created -devel subpackage + * Sun May 22 2005 Jeremy Katz - 0.2.6-3 - rebuild on all arches @@ -71,7 +115,3 @@ * Tue Jun 10 2003 Enrico Scholz 0:0.2.4-0.fdr.1 - Initial build. - -### Local Variables: -### compile-command: "cd .. && ./buildpkg libtasn1" -### End: From fedora-extras-commits at redhat.com Mon Mar 6 11:21:46 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:21:46 -0500 Subject: rpms/libtasn1/devel .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200603061122.k26BMIYa016521@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16502 Modified Files: .cvsignore sources Log Message: version 0.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:49:22 -0000 1.2 +++ .cvsignore 6 Mar 2006 11:21:46 -0000 1.3 @@ -1 +1,2 @@ -libtasn1-0.2.6.tar.gz +libtasn1-*.tar.gz +libtasn1-*.tar.gz.sig Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:49:22 -0000 1.2 +++ sources 6 Mar 2006 11:21:46 -0000 1.3 @@ -1 +1,2 @@ -2e9bdad5f6e4248927ec6da0a75a3428 libtasn1-0.2.6.tar.gz +e78a3fba867f6d956ead70d86815a2d7 libtasn1-0.3.0.tar.gz +0f8dc79aca78440e0c31dfef6ed5e571 libtasn1-0.3.0.tar.gz.sig From fedora-extras-commits at redhat.com Mon Mar 6 11:22:49 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:22:49 -0500 Subject: rpms/libtasn1/devel libtasn1.spec,1.8,1.9 Message-ID: <200603061123.k26BNLa2016556@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16532 Modified Files: libtasn1.spec Log Message: - updated to 0.3.0 - removed unneeded curlies - created -devel subpackage Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libtasn1.spec 22 May 2005 23:57:05 -0000 1.8 +++ libtasn1.spec 6 Mar 2006 11:22:49 -0000 1.9 @@ -1,39 +1,60 @@ +## $Id$ + +%{!?release_func:%global release_func() %1%{?dist}} + Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.2.6 -Release: 3 +Version: 0.3.0 +Release: %release_func 1 License: LGPL Group: System Environment/Libraries URL: http://www.gnu.org/software/gnutls/download.html -Source0: ftp://ftp.gnutls.org/pub/gnutls/libtasn1/%{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot -Provides: %{name}-devel = %{version}-%{release} +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 +%package devel +Summary: Files for development of applications which will use libtasn1 +Group: Development/Libraries +Requires: %name = %version-%release +Requires(pre): automake pkgconfig +Requires(postun): automake pkgconfig +Requires(post): /sbin/install-info +Requires(postun): /sbin/install-info + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org +%description devel +This is the ASN.1 library used in GNUTLS. More up to date information can +be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org + +This packages contains files for development of applications which +will use libtasn1. + %prep %setup -q %build -%configure -%{__make} %{?_smp_mflags} +%configure --disable-static +make %{?_smp_mflags} %install rm -rf "$RPM_BUILD_ROOT" -%{__make} DESTDIR="$RPM_BUILD_ROOT" install -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +make DESTDIR="$RPM_BUILD_ROOT" install + +rm -f $RPM_BUILD_ROOT{%_libdir/*.la,%_infodir/dir} %check -%{__make} check +%__make check %clean @@ -44,16 +65,38 @@ %postun -p /sbin/ldconfig +%post devel +/sbin/install-info --info-dir=%_infodir %_infodir/%name.info || : + +%preun devel +test "$1" != 0 || + /sbin/install-info --info-dir=%_infodir --delete %_infodir/%name.info || : + + %files %defattr(-,root,root,-) -%doc doc/TODO doc/*.ps +%doc doc/TODO doc/*.pdf %doc AUTHORS COPYING* ChangeLog NEWS README THANKS -%{_includedir}/* -%{_libdir}/*.a -%{_libdir}/*.so* +%_libdir/*.so.* + + +%files devel +%defattr(-,root,root,-) +%_bindir/*-config +%_libdir/*.so +%_libdir/pkgconfig/*.pc +%_includedir/* +%_datadir/aclocal/libtasn1.m4 +%_infodir/*.info.* +%_mandir/man3/*asn1* %changelog +* Mon Mar 6 2006 Enrico Scholz - 0.3.0-1 +- updated to 0.3.0 +- removed unneeded curlies +- created -devel subpackage + * Sun May 22 2005 Jeremy Katz - 0.2.6-3 - rebuild on all arches @@ -71,7 +114,3 @@ * Tue Jun 10 2003 Enrico Scholz 0:0.2.4-0.fdr.1 - Initial build. - -### Local Variables: -### compile-command: "cd .. && ./buildpkg libtasn1" -### End: From fedora-extras-commits at redhat.com Mon Mar 6 11:23:59 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:23:59 -0500 Subject: rpms/libtasn1/FC-4 libtasn1.spec,1.9,1.10 Message-ID: <200603061124.k26BOWKp016589@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16571 Modified Files: libtasn1.spec Log Message: removed an old 'Provides: %name-devel' Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/libtasn1.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libtasn1.spec 6 Mar 2006 11:17:12 -0000 1.9 +++ libtasn1.spec 6 Mar 2006 11:23:58 -0000 1.10 @@ -13,7 +13,6 @@ 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 -Provides: %name-devel = %version-%release BuildRequires: bison From fedora-extras-commits at redhat.com Mon Mar 6 11:29:07 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:29:07 -0500 Subject: rpms/libtasn1/FC-4 libtasn1.spec,1.10,1.11 Message-ID: <200603061129.k26BTd2x016654@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16622/FC-4 Modified Files: libtasn1.spec Log Message: minor cleanups Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/libtasn1.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libtasn1.spec 6 Mar 2006 11:23:58 -0000 1.10 +++ libtasn1.spec 6 Mar 2006 11:29:06 -0000 1.11 @@ -25,6 +25,7 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org @@ -54,7 +55,7 @@ %check -%__make check +make check %clean From fedora-extras-commits at redhat.com Mon Mar 6 11:29:12 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Mon, 6 Mar 2006 06:29:12 -0500 Subject: rpms/libtasn1/devel libtasn1.spec,1.9,1.10 Message-ID: <200603061129.k26BTjjM016657@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16622/devel Modified Files: libtasn1.spec Log Message: minor cleanups Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libtasn1.spec 6 Mar 2006 11:22:49 -0000 1.9 +++ libtasn1.spec 6 Mar 2006 11:29:12 -0000 1.10 @@ -25,6 +25,7 @@ Requires(post): /sbin/install-info Requires(postun): /sbin/install-info + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org @@ -54,7 +55,7 @@ %check -%__make check +make check %clean From fedora-extras-commits at redhat.com Mon Mar 6 14:50:42 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Mon, 6 Mar 2006 09:50:42 -0500 Subject: rpms/ghdl/devel ghdl-svn40.patch,NONE,1.1 ghdl.spec,1.9,1.10 Message-ID: <200603061451.k26EpGA6022804@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22784 Modified Files: ghdl.spec Added Files: ghdl-svn40.patch Log Message: update to svn40, to fix a constraint crash ghdl-svn40.patch: --- NEW FILE ghdl-svn40.patch --- diff -urN ghdl-0.21/vhdl/evaluation.adb ghdl-0.22dev/vhdl/evaluation.adb --- ghdl-0.21/vhdl/evaluation.adb 2005-12-11 16:32:03.000000000 +0100 +++ ghdl-0.22dev/vhdl/evaluation.adb 2006-03-06 14:10:30.000000000 +0100 @@ -836,6 +836,28 @@ return Build_Simple_Aggregate (Res_List, Orig, Res_Type); end Eval_Concatenation; + function Eval_Array_Equality (Left, Right : Iir) return Boolean + is + L_List : Iir_List; + R_List : Iir_List; + N : Natural; + begin + -- FIXME: the simple aggregates are lost. + L_List := Get_Simple_Aggregate_List (Eval_String_Literal (Left)); + R_List := Get_Simple_Aggregate_List (Eval_String_Literal (Right)); + N := Get_Nbr_Elements (L_List); + if N /= Get_Nbr_Elements (R_List) then + return False; + end if; + for I in 0 .. N - 1 loop + -- FIXME: this is wrong: (eg: evaluated lit) + if Get_Nth_Element (L_List, I) /= Get_Nth_Element (R_List, I) then + return False; + end if; + end loop; + return True; + end Eval_Array_Equality; + -- ORIG is either a dyadic operator or a function call. function Eval_Dyadic_Operator (Orig : Iir; Left, Right : Iir) return Iir @@ -1073,34 +1095,10 @@ (Get_Fp_Value (Left) / Iir_Fp64 (Get_Value (Right)), Orig); when Iir_Predefined_Array_Equality => - declare - L_List : Iir_List; - R_List : Iir_List; - R : Boolean; - N : Natural; - begin - -- FIXME: the simple aggregates are lost. - L_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Left)); - R_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Right)); - N := Get_Nbr_Elements (L_List); - if N /= Get_Nbr_Elements (R_List) then - R := False; - else - R := True; - for I in 0 .. N - 1 loop - -- FIXME: this is wrong: (eg: evaluated lit) - if Get_Nth_Element (L_List, I) - /= Get_Nth_Element (R_List, I) - then - R := False; - exit; - end if; - end loop; - end if; - return Build_Boolean (R, Orig); - end; + return Build_Boolean (Eval_Array_Equality (Left, Right), Orig); + + when Iir_Predefined_Array_Inequality => + return Build_Boolean (not Eval_Array_Equality (Left, Right), Orig); when Iir_Predefined_Array_Sll | Iir_Predefined_Array_Srl @@ -1111,8 +1109,7 @@ return Eval_Shift_Operator (Eval_String_Literal (Left), Right, Orig, Func); - when Iir_Predefined_Array_Inequality - | Iir_Predefined_Array_Less + when Iir_Predefined_Array_Less | Iir_Predefined_Array_Less_Equal | Iir_Predefined_Array_Greater | Iir_Predefined_Array_Greater_Equal diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi --- ghdl-0.21/vhdl/ghdl.texi 2005-12-12 03:21:55.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdl.texi 2006-03-06 14:10:12.000000000 +0100 @@ -4,10 +4,14 @@ @settitle GHDL guide @c %**end of header + at direntry +* ghdl: (ghdl). VHDL compiler. + at end direntry + @titlepage @title GHDL guide @subtitle GHDL, a VHDL compiler - at subtitle For GHDL version 0.21 (Sokcho edition) + at subtitle For GHDL version 0.22 (Sokcho edition) @author Tristan Gingold @c The following two commands start the copyright page. @page diff -urN ghdl-0.21/vhdl/grt/config/linux.c ghdl-0.22dev/vhdl/grt/config/linux.c --- ghdl-0.21/vhdl/grt/config/linux.c 2005-12-12 03:29:26.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/linux.c 2006-03-06 14:10:20.000000000 +0100 @@ -189,7 +189,12 @@ #endif /* Context for the main stack. */ -static __thread struct stack_context main_stack_context; +#ifdef USE_THREADS +#define THREAD __thread +#else +#define THREAD +#endif +static THREAD struct stack_context main_stack_context; extern void grt_set_main_stack (struct stack_context *stack); diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c --- ghdl-0.21/vhdl/grt/config/win32.c 2005-12-12 03:39:16.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/win32.c 2006-03-06 14:10:20.000000000 +0100 @@ -1,5 +1,5 @@ -/* GRT stack implementation for Win32 - Copyright (C) 2004, 2005 Felix Bertram. +/* GRT stack implementation for Win32 using fibers. + Copyright (C) 2005 Tristan Gingold. GHDL 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 @@ -16,139 +16,74 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -//----------------------------------------------------------------------------- -// Project: GHDL - VHDL Simulator -// Description: Win32 port of stacks package -// Note: Tristan's original i386/Linux used assembly-code -// to manually switch stacks for performance reasons. -// History: 2004feb09, FB, created. -//----------------------------------------------------------------------------- #include -//#include -//#include -//#include - - -//#define INFO printf -#define INFO (void) - -// GHDL names an endless loop calling FUNC with ARG a 'stack' -// at a given time, only one stack may be 'executed' -typedef struct -{ HANDLE thread; // stack's thread - HANDLE mutex; // mutex to suspend/resume thread - void (*Func)(void*); // stack's FUNC - void* Arg; // ARG passed to FUNC -} Stack_Type_t, *Stack_Type; +#include -Stack_Type_t main_stack_context; -extern Stack_Type grt_stack_main_stack; +struct stack_type +{ + LPVOID fiber; // Win fiber. + void (*func)(void *); // Function + void *arg; // Function argument. +}; + +static struct stack_type main_stack_context; +extern void grt_set_main_stack (struct stack_type *stack); -//------------------------------------------------------------------------------ void grt_stack_init(void) -// Initialize the stacks package. -// This may adjust stack sizes. -// Must be called after grt.options.decode. -// => procedure Stack_Init; -{ INFO("grt_stack_init\n"); - INFO(" main_stack_context=0x%08x\n", &main_stack_context); - - // create event. reset event, as we are currently running - main_stack_context.mutex = CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - grt_stack_main_stack= &main_stack_context; -} - -//------------------------------------------------------------------------------ -static unsigned long __stdcall grt_stack_loop(void* pv_myStack) -{ - Stack_Type myStack= (Stack_Type)pv_myStack; - - INFO("grt_stack_loop\n"); - - INFO(" myStack=0x%08x\n", myStack); - - // block until event becomes set again. - // this happens when this stack is enabled for the first time - WaitForSingleObject(myStack->mutex, INFINITE); - - // run stack's function in endless loop - while(1) - { INFO(" call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg); - myStack->Func(myStack->Arg); - } - - // we never get here... - return 0; -} - -//------------------------------------------------------------------------------ -Stack_Type grt_stack_create(void* Func, void* Arg) -// Create a new stack, which on first execution will call FUNC with -// an argument ARG. -// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type; -{ Stack_Type newStack; - DWORD m_IDThread; // Thread's ID (dummy) - - INFO("grt_stack_create\n"); - INFO(" call 0x%08x with 0x%08x\n", Func, Arg); - - newStack= malloc(sizeof(Stack_Type_t)); - - // init function and argument - newStack->Func= Func; - newStack->Arg= Arg; - - // create event. reset event, so that thread will blocked in grt_stack_loop - newStack->mutex= CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - INFO(" newStack=0x%08x\n", newStack); - - // create thread, which executes grt_stack_loop - newStack->thread= CreateThread(NULL, // lpsa - 0, // cbStack - grt_stack_loop, // lpStartAddr - newStack, // lpvThreadParm - 0, // fdwCreate - &m_IDThread); // lpIDThread - - return newStack; -} - -//------------------------------------------------------------------------------ -void grt_stack_switch(Stack_Type To, Stack_Type From) -// Resume stack TO and save the current context to the stack pointed by -// CUR. -// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); -{ INFO("grt_stack_switch\n"); - INFO(" from 0x%08x to 0x%08x\n", From, To); - - // set 'To' event. this will make the other thread either - // - start for first time in grt_stack_loop - // - resume at WaitForSingleObject below - SetEvent(To->mutex); - - // block until 'From' event becomes set again - // as we are running, our event is reset and we block here - // when stacks are switched, with above SetEvent, we may proceed - WaitForSingleObject(From->mutex, INFINITE); -} - -//------------------------------------------------------------------------------ -void grt_stack_delete(Stack_Type Stack) -// Delete stack STACK, which must not be currently executed. -// => procedure Stack_Delete (Stack : Stack_Type); -{ INFO("grt_stack_delete\n"); +{ + main_stack_context.fiber = ConvertThreadToFiber (NULL); + if (main_stack_context.fiber == NULL) + { + fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n", + GetLastError ()); + abort (); + } + grt_set_main_stack (&main_stack_context); +} + +static VOID __stdcall +grt_stack_loop (void *v_stack) +{ + struct stack_type *stack = (struct stack_type *)v_stack; + while (1) + { + (*stack->func)(stack->arg); + } +} + +struct stack_type * +grt_stack_create (void (*func)(void *), void *arg) +{ + struct stack_type *res; + + res = malloc (sizeof (struct stack_type)); + if (res == NULL) + return NULL; + res->func = func; + res->arg = arg; + res->fiber = CreateFiber (0, &grt_stack_loop, res); + if (res->fiber == NULL) + { + free (res); + return NULL; + } + return res; +} + +void +grt_stack_switch (struct stack_type *to, struct stack_type *from) +{ + SwitchToFiber (to->fiber); +} + +void +grt_stack_delete (struct stack_type *stack) +{ + DeleteFiber (stack->fiber); + stack->fiber = NULL; } -//---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME void __gnat_raise_storage_error(void) { @@ -161,6 +96,3 @@ } #endif -//---------------------------------------------------------------------------- -// end of file - diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c --- ghdl-0.21/vhdl/grt/ghwlib.c 2005-12-07 06:29:04.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.c 2006-03-06 14:10:21.000000000 +0100 @@ -1214,16 +1214,31 @@ return 0; } +static const char * +ghw_get_lit (union ghw_type *type, int e) +{ + if (e >= type->en.nbr || e < 0) + return "??"; + else + return type->en.lits[e]; +} + +static void +ghw_disp_lit (union ghw_type *type, int e) +{ + printf ("%s (%d)", ghw_get_lit (type, e), e); +} + void ghw_disp_value (union ghw_val *val, union ghw_type *type) { switch (ghw_get_base_type (type)->kind) { case ghdl_rtik_type_b2: - printf ("%s (%d)", type->en.lits[val->b2], val->b2); + ghw_disp_lit (type, val->b2); break; case ghdl_rtik_type_e8: - printf ("%s (%d)", type->en.lits[val->e8], val->e8); + ghw_disp_lit (type, val->e8); break; case ghdl_rtik_type_i32: printf ("%d", val->i32); @@ -1582,10 +1597,14 @@ } void -ghw_disp_range (union ghw_range *rng) +ghw_disp_range (union ghw_type *type, union ghw_range *rng) { switch (rng->kind) { + case ghdl_rtik_type_e8: + printf ("%s %s %s", ghw_get_lit (type, rng->e8.left), + ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right)); + break; case ghdl_rtik_type_i32: case ghdl_rtik_type_p32: printf ("%d %s %d", @@ -1657,7 +1676,7 @@ printf ("subtype %s is ", s->name); ghw_disp_typename (h, s->base); printf (" range "); - ghw_disp_range (s->rng); + ghw_disp_range (s->base, s->rng); printf (";\n"); } break; @@ -1692,7 +1711,7 @@ { if (i != 0) printf (", "); - ghw_disp_range (a->rngs[i]); + ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]); } printf (");\n"); } diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h --- ghdl-0.21/vhdl/grt/ghwlib.h 2005-12-07 06:27:09.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.h 2006-03-06 14:10:21.000000000 +0100 @@ -390,7 +390,8 @@ const char *ghw_get_dir (int is_downto); -void ghw_disp_range (union ghw_range *rng); +/* Note: TYPE must be a base type (used only to display literals). */ +void ghw_disp_range (union ghw_type *type, union ghw_range *rng); void ghw_disp_type (struct ghw_handler *h, union ghw_type *t); diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb --- ghdl-0.21/vhdl/grt/grt-signals.adb 2005-11-18 03:13:36.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-signals.adb 2006-03-06 14:10:21.000000000 +0100 @@ -1095,15 +1095,6 @@ when others => Internal_Error ("ghdl_create_signal_attribute"); end case; --- Sig_Instance_Name := new Ghdl_Instance_Name_Type' --- (Kind => Ghdl_Name_Signal, --- Name => null, --- Parent => null, --- Brother => null, --- Sig_Mode => Mode, --- Sig_Kind => Kind_Signal_No, --- Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last), --- Sig_Type_Desc => Sig_Type); -- Note: bit and boolean are both mode_b2. Res := Create_Signal (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True), diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb --- ghdl-0.21/vhdl/grt/grt-waves.adb 2005-12-07 05:50:07.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-waves.adb 2006-03-06 14:10:21.000000000 +0100 @@ -785,6 +785,15 @@ Nbr_Scope_Signals : Natural := 0; Nbr_Dumped_Signals : Natural := 0; + -- This is only valid during write_hierarchy. + function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural + is + function To_Integer_Address is new Ada.Unchecked_Conversion + (Ghdl_Signal_Ptr, Integer_Address); + begin + return Natural (To_Integer_Address (Sig.Alink)); + end Get_Signal_Number; + procedure Write_Signal_Number (Val_Addr : Address; Val_Name : Vstring; Val_Type : Ghdl_Rti_Access) @@ -792,20 +801,28 @@ pragma Unreferenced (Val_Name); pragma Unreferenced (Val_Type); - function To_Integer_Address is new Ada.Unchecked_Conversion - (Ghdl_Signal_Ptr, Integer_Address); + Num : Natural; + function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion (Source => Integer_Address, Target => Ghdl_Signal_Ptr); Sig : Ghdl_Signal_Ptr; begin + -- Convert to signal. Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all); - if not Sig.Flags.Is_Dumped then - Sig.Flags.Is_Dumped := True; + + -- Get signal number. + Num := Get_Signal_Number (Sig); + + -- If the signal number is 0, then assign a valid signal number. + if Num = 0 then Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1; - Sig.Flink := To_Ghdl_Signal_Ptr + Sig.Alink := To_Ghdl_Signal_Ptr (Integer_Address (Nbr_Dumped_Signals)); + Num := Nbr_Dumped_Signals; end if; - Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink))); + + -- Do the real job: write the signal number. + Wave_Put_ULEB128 (Ghdl_E32 (Num)); end Write_Signal_Number; procedure Foreach_Scalar_Signal_Number is new @@ -1370,13 +1387,18 @@ Table_Initial => 32, Table_Increment => 100); + function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is + begin + return Dump_Table.Table (N); + end Get_Dump_Entry; + procedure Write_Hierarchy (Root : VhpiHandleT) is N : Natural; begin - -- Check Flink is 0. + -- Check Alink is 0. for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flink /= null then + if Sig_Table.Table (I).Alink /= null then Internal_Error ("wave.write_hierarchy"); end if; end loop; @@ -1393,15 +1415,20 @@ Wave_Put_Byte (0); Dump_Table.Set_Last (Nbr_Dumped_Signals); + for I in Dump_Table.First .. Dump_Table.Last loop + Dump_Table.Table (I) := null; + end loop; -- Save and clear. - N := 0; for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flags.Is_Dumped then - N := N + 1; + N := Get_Signal_Number (Sig_Table.Table (I)); + if N /= 0 then + if Dump_Table.Table (N) /= null then + Internal_Error ("wave.write_hierarchy(2)"); + end if; Dump_Table.Table (N) := Sig_Table.Table (I); + Sig_Table.Table (I).Alink := null; end if; - Sig_Table.Table (I).Flink := null; end loop; end Write_Hierarchy; diff -urN ghdl-0.21/vhdl/Makefile.in ghdl-0.22dev/vhdl/Makefile.in --- ghdl-0.21/vhdl/Makefile.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Makefile.in 2006-03-06 14:26:21.000000000 +0100 @@ -480,6 +480,7 @@ #GRT_USE_PTHREADS=y ifeq ($(GRT_USE_PTHREADS),y) + GRT_CFLAGS+=-DUSE_THREADS GRT_ADD_OBJS+=grt-cthreads.o GRT_EXTRA_LIB+=-lpthread endif @@ -527,7 +528,7 @@ $(CC) -c $(GRT_FLAGS) -o $@ $< linux.o: $(GRTSRCDIR)/config/linux.c - $(CC) -c $(GRT_FLAGS) -o $@ $< + $(CC) -c $(GRT_FLAGS) $(GRT_CFLAGS) -o $@ $< win32.o: $(GRTSRCDIR)/config/win32.c $(CC) -c $(GRT_FLAGS) -o $@ $< diff -urN ghdl-0.21/vhdl/parse.adb ghdl-0.22dev/vhdl/parse.adb --- ghdl-0.21/vhdl/parse.adb 2005-12-17 07:18:00.000000000 +0100 +++ ghdl-0.22dev/vhdl/parse.adb 2006-03-06 14:10:30.000000000 +0100 @@ -3540,7 +3540,7 @@ Set_Location (Res); Set_Expression (Res, Parse_Expression); - Expect (Tok_Select, "after expression"); + Expect (Tok_Select, "'select' expected after expression"); Scan.Scan; if Current_Token = Tok_Left_Paren then Target := Parse_Aggregate; @@ -3556,13 +3556,13 @@ Build_Init (Last); loop Wf_Chain := Parse_Waveform; - Expect (Tok_When, "after waveform"); + Expect (Tok_When, "'when' expected after waveform"); Scan.Scan; Assoc := Parse_Choices (Null_Iir); Set_Associated (Assoc, Wf_Chain); Append_Subchain (Last, Res, Assoc); exit when Current_Token = Tok_Semi_Colon; - Expect (Tok_Comma, "after choice"); + Expect (Tok_Comma, "',' (comma) expected after choice"); Scan.Scan; end loop; return Res; diff -urN ghdl-0.21/vhdl/sem_assocs.adb ghdl-0.22dev/vhdl/sem_assocs.adb --- ghdl-0.21/vhdl/sem_assocs.adb 2005-10-08 14:45:00.000000000 +0200 +++ ghdl-0.22dev/vhdl/sem_assocs.adb 2006-03-06 14:10:30.000000000 +0100 @@ -551,7 +551,7 @@ exit when Index_Type = Null_Iir; Chain := Get_Individual_Association_Chain (Assoc); Sem_Choices_Range - (Chain, Index_Type, True, Get_Location (Assoc), Low, High); + (Chain, Index_Type, False, Get_Location (Assoc), Low, High); Set_Individual_Association_Chain (Assoc, Chain); end loop; end Finish_Individual_Assoc_Array_Subtype; diff -urN ghdl-0.21/vhdl/sem_expr.adb ghdl-0.22dev/vhdl/sem_expr.adb --- ghdl-0.21/vhdl/sem_expr.adb 2005-12-17 07:13:37.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_expr.adb 2006-03-06 14:10:30.000000000 +0100 @@ -2278,6 +2278,7 @@ Lb := Low; Hb := High; end if; + -- Checks all values between POS and POS_MAX are handled. Pos := Eval_Pos (Lb); Pos_Max := Eval_Pos (Hb); if Pos > Pos_Max then diff -urN ghdl-0.21/vhdl/sem_names.adb ghdl-0.22dev/vhdl/sem_names.adb --- ghdl-0.21/vhdl/sem_names.adb 2005-12-11 14:50:31.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_names.adb 2006-03-06 14:10:30.000000000 +0100 @@ -1974,7 +1974,8 @@ Error_Msg_Sem ("function name is a procedure", Name); when Iir_Kind_Process_Statement - | Iir_Kind_Component_Declaration => + | Iir_Kind_Component_Declaration + | Iir_Kind_Type_Conversion => Error_Msg_Sem (Disp_Node (Prefix) & " cannot be indexed or sliced", Name); Res := Null_Iir; diff -urN ghdl-0.21/vhdl/translation.adb ghdl-0.22dev/vhdl/translation.adb --- ghdl-0.21/vhdl/translation.adb 2005-12-10 12:11:41.000000000 +0100 +++ ghdl-0.22dev/vhdl/translation.adb 2006-03-06 14:10:22.000000000 +0100 @@ -1797,15 +1797,13 @@ -- Check bounds length of L match bounds length of R. -- If L_TYPE (resp. R_TYPE) is not a thin array, then L_NODE - -- (resp. R_NODE) are not used (and may be o_lnode_null). + -- (resp. R_NODE) are not used (and may be Mnode_Null). -- If L_TYPE (resp. T_TYPE) is a fat array, then L_NODE (resp. R_NODE) - -- must be a variable pointing to the array. + -- must designate the array. procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir); -- Create a subtype range to be stored into the location pointed by @@ -8412,10 +8410,19 @@ return True; end Need_Range_Check; - procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) + procedure Check_Range_Low (Value : O_Dnode; Atype : Iir) is If_Blk : O_If_Block; begin + Open_Temp; + Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); + Chap6.Gen_Bound_Error (Null_Iir); + Finish_If_Stmt (If_Blk); + Close_Temp; + end Check_Range_Low; + + procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) is + begin if not Need_Range_Check (Expr, Atype) then return; end if; @@ -8428,20 +8435,14 @@ Chap6.Gen_Bound_Error (Expr); end if; else - Open_Temp; - Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); - Chap6.Gen_Bound_Error (Null_Iir); - Finish_If_Stmt (If_Blk); - Close_Temp; + Check_Range_Low (Value, Atype); end if; end Check_Range; procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir) is L_Tinfo, R_Tinfo : Type_Info_Acc; @@ -8491,10 +8492,10 @@ exit when Index = Null_Iir; Sub_Cond := New_Compare_Op (ON_Neq, - Chap6.Get_Array_Ptr_Bound_Length (L_Node, L_Type, - I + 1, L_Mode), - Chap6.Get_Array_Ptr_Bound_Length (R_Node, R_Type, - I + 1, R_Mode), + M2E (Range_To_Length + (Get_Array_Range (L_Node, L_Type, I + 1))), + M2E (Range_To_Length + (Get_Array_Range (R_Node, R_Type, I + 1))), Ghdl_Bool_Type); if I = 0 then Cond := Sub_Cond; @@ -10081,8 +10082,8 @@ New_Assign_Stmt (Get_Var (Alias_Info.Alias_Var), New_Value (M2Lp (Chap3.Get_Array_Base (Name_Node)))); - Chap3.Check_Array_Match (Decl_Type, O_Lnode_Null, Kind, - Name_Type, M2Lp (Name_Node), Kind, + Chap3.Check_Array_Match (Decl_Type, T2M (Decl_Type, Kind), + Name_Type, Name_Node, Decl); Close_Temp; when Type_Mode_Scalar => @@ -11691,6 +11692,16 @@ end; end if; + if Get_Kind (Formal_Type) in Iir_Kinds_Array_Type_Definition + then + -- Check length matches. + Stabilize (Formal_Node); + Stabilize (Actual_Node); + Chap3.Check_Array_Match (Formal_Type, Formal_Node, + Actual_Type, Actual_Node, + Assoc); + end if; + Data := (Actual_Node => Actual_Node, Actual_Type => Actual_Type, Mode => Mode, @@ -14420,8 +14431,8 @@ E := Create_Temp_Init (T_Info.Ortho_Ptr_Type (Mode_Value), Val); Chap3.Check_Array_Match - (Target_Type, M2Lp (T), Mode_Value, - Get_Type (Expr), New_Obj (E), Mode_Value, + (Target_Type, T, + Get_Type (Expr), Dp2M (E, T_Info, Mode_Value), Null_Iir); Chap3.Translate_Object_Copy (T, New_Obj_Value (E), Target_Type); @@ -15169,9 +15180,10 @@ begin E := Create_Temp_Init (Expr_Info.Ortho_Ptr_Type (Mode_Value), Expr); - Chap3.Check_Array_Match (Res_Type, O_Lnode_Null, Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, T2M (Res_Type, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); return New_Convert_Ov (New_Value (Chap3.Get_Array_Ptr_Base_Ptr (New_Obj (E), Expr_Type, Mode_Value)), @@ -15199,9 +15211,10 @@ Chap3.Get_Array_Bounds_Ptr (O_Lnode_Null, Expr_Type, Mode_Value)); -- Check array match. - Chap3.Check_Array_Match (Res_Type, New_Obj (Res), Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, Dv2M (Res, Res_Info, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); Close_Temp; return New_Address (New_Obj (Res), Res_Info.Ortho_Ptr_Type (Mode_Value)); @@ -22283,19 +22296,58 @@ function Translate_Val_Attribute (Attr : Iir) return O_Enode is - T : O_Dnode; - Prefix : Iir; - Ttype : O_Tnode; + Val : O_Enode; + Attr_Type : Iir; + Res_Var : O_Dnode; + Res_Type : O_Tnode; begin - Prefix := Get_Type (Attr); - Ttype := Get_Ortho_Type (Prefix, Mode_Value); - T := Create_Temp (Ttype); - New_Assign_Stmt - (New_Obj (T), - New_Convert_Ov (Chap7.Translate_Expression (Get_Parameter (Attr)), - Ttype)); - Chap3.Check_Range (T, Attr, Get_Type (Get_Prefix (Attr))); - return New_Obj_Value (T); + Attr_Type := Get_Type (Attr); + Res_Type := Get_Ortho_Type (Attr_Type, Mode_Value); + Res_Var := Create_Temp (Res_Type); + Val := Chap7.Translate_Expression (Get_Parameter (Attr)); + + case Get_Kind (Attr_Type) is + when Iir_Kind_Enumeration_Type_Definition + | Iir_Kind_Enumeration_Subtype_Definition => + -- For enumeration, always check the value is in the enum + -- range. + declare + Val_Type : O_Tnode; + Val_Var : O_Dnode; + If_Blk : O_If_Block; + begin + Val_Type := Get_Ortho_Type (Get_Type (Get_Parameter (Attr)), + Mode_Value); + Val_Var := Create_Temp_Init (Val_Type, Val); + Start_If_Stmt + (If_Blk, + New_Dyadic_Op + (ON_Or, + New_Compare_Op (ON_Lt, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, 0)), + Ghdl_Bool_Type), + New_Compare_Op (ON_Ge, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, + Integer_64 + (Get_Nbr_Elements + (Get_Enumeration_Literal_List + (Attr_Type))))), + Ghdl_Bool_Type))); + Chap6.Gen_Bound_Error (Attr); + Finish_If_Stmt (If_Blk); + Val := New_Obj_Value (Val_Var); + end; + when others => + null; + end case; + + New_Assign_Stmt (New_Obj (Res_Var), New_Convert_Ov (Val, Res_Type)); + Chap3.Check_Range (Res_Var, Attr, Get_Type (Get_Prefix (Attr))); + return New_Obj_Value (Res_Var); end Translate_Val_Attribute; function Translate_Pos_Attribute (Attr : Iir; Res_Type : Iir) diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads --- ghdl-0.21/vhdl/version.ads 2005-12-18 14:07:38.000000000 +0100 +++ ghdl-0.22dev/vhdl/version.ads 2006-03-06 14:10:30.000000000 +0100 @@ -1,4 +1,4 @@ package Version is Ghdl_Version : constant String := - "GHDL 0.21 (20051218) [Sokcho edition]"; + "GHDL 0.22dev (20051220) [Sokcho edition]"; end Version; Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ghdl.spec 16 Feb 2006 01:25:59 -0000 1.9 +++ ghdl.spec 6 Mar 2006 14:50:41 -0000 1.10 @@ -4,7 +4,7 @@ Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.39svn.0%{?dist} +Release: 0.40svn.0%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -14,7 +14,7 @@ # ./dist.sh sources Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2 -Patch0: ghdl-svn39.patch +Patch0: ghdl-svn40.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo Requires(post): /sbin/install-info @@ -215,6 +215,10 @@ %{_libexecdir}/gcc/ %changelog +* Mon Mar 6 2006 Thomas Sailer - 0.22-0.40svn.0 +- update to svn40, to fix an array bounds checking bug apparently + introduced in svn39 + * Thu Feb 16 2006 Thomas Sailer - 0.22-0.39svn.0 - update to svn39, to fix some constant bugs From fedora-extras-commits at redhat.com Mon Mar 6 14:58:33 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 09:58:33 -0500 Subject: rpms/zziplib/devel zziplib.spec,1.5,1.6 Message-ID: <200603061459.k26Ex5Zr022898@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/zziplib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22881 Modified Files: zziplib.spec Log Message: FC5 rebuild. Index: zziplib.spec =================================================================== RCS file: /cvs/extras/rpms/zziplib/devel/zziplib.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- zziplib.spec 9 Feb 2006 19:27:48 -0000 1.5 +++ zziplib.spec 6 Mar 2006 14:58:32 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Lightweight library to easily extract data from zip files Name: zziplib Version: 0.13.45 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL/MPL Group: Applications/Archiving URL: http://zziplib.sourceforge.net/ @@ -75,6 +75,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.13.45-2 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.13.45-1 - Update to 0.13.45. - Exclude static library. From fedora-extras-commits at redhat.com Mon Mar 6 15:01:17 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:01:17 -0500 Subject: rpms/yasm/devel yasm.spec,1.6,1.7 Message-ID: <200603061501.k26F1oXc024804@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/yasm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23377 Modified Files: yasm.spec Log Message: FC5 rebuild. Index: yasm.spec =================================================================== RCS file: /cvs/extras/rpms/yasm/devel/yasm.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- yasm.spec 9 Feb 2006 19:24:42 -0000 1.6 +++ yasm.spec 6 Mar 2006 15:01:17 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Complete rewrite of the NASM assembler Name: yasm Version: 0.4.0 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: Development/Languages URL: http://www.tortall.net/projects/yasm/ @@ -81,6 +81,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.4.0-6 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.4.0-5 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:04:42 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:04:42 -0500 Subject: rpms/viruskiller/devel viruskiller.spec,1.7,1.8 Message-ID: <200603061505.k26F5EZY024877@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/viruskiller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24860 Modified Files: viruskiller.spec Log Message: FC5 rebuild. Index: viruskiller.spec =================================================================== RCS file: /cvs/extras/rpms/viruskiller/devel/viruskiller.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- viruskiller.spec 9 Feb 2006 19:14:58 -0000 1.7 +++ viruskiller.spec 6 Mar 2006 15:04:42 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Frantic shooting game where viruses invade your computer Name: viruskiller Version: 0.9 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Amusements/Games URL: http://www.parallelrealities.co.uk/virusKiller.php @@ -74,6 +74,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.9-7 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.9-6 - Rebuild for new gcc/glibc. - Remove old desktop file conditionals. From fedora-extras-commits at redhat.com Mon Mar 6 15:05:59 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:05:59 -0500 Subject: rpms/udftools/devel udftools.spec,1.6,1.7 Message-ID: <200603061506.k26F6ViJ024940@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/udftools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24918 Modified Files: udftools.spec Log Message: FC5 rebuild. Index: udftools.spec =================================================================== RCS file: /cvs/extras/rpms/udftools/devel/udftools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- udftools.spec 9 Feb 2006 19:09:46 -0000 1.6 +++ udftools.spec 6 Mar 2006 15:05:59 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Linux UDF Filesystem userspace utilities Name: udftools Version: 1.0.0b3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Archiving URL: http://sourceforge.net/projects/linux-udf/ @@ -47,6 +47,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.0.0b3-5 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.0.0b3-4 - Rebuild for new gcc/glibc. - Exclude the static library... there isn't even a header file. From fedora-extras-commits at redhat.com Mon Mar 6 15:07:21 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:07:21 -0500 Subject: rpms/ucarp/devel ucarp.spec,1.6,1.7 Message-ID: <200603061507.k26F7rf1024996@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ucarp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24946 Modified Files: ucarp.spec Log Message: FC5 rebuild. Index: ucarp.spec =================================================================== RCS file: /cvs/extras/rpms/ucarp/devel/ucarp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ucarp.spec 9 Feb 2006 19:07:30 -0000 1.6 +++ ucarp.spec 6 Mar 2006 15:07:21 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Common Address Redundancy Protocol (CARP) for Unix Name: ucarp Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.ucarp.org/ @@ -96,6 +96,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.1-5 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.1-4 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:07:45 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:07:45 -0500 Subject: rpms/thttpd/devel thttpd.spec,1.9,1.10 Message-ID: <200603061508.k26F8HKY024999@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/thttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24958 Modified Files: thttpd.spec Log Message: FC5 rebuild. Index: thttpd.spec =================================================================== RCS file: /cvs/extras/rpms/thttpd/devel/thttpd.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- thttpd.spec 9 Feb 2006 19:01:40 -0000 1.9 +++ thttpd.spec 6 Mar 2006 15:07:44 -0000 1.10 @@ -3,7 +3,7 @@ Summary: Tiny, turbo, throttleable lightweight http server Name: thttpd Version: 2.25b -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.acme.com/software/thttpd/ @@ -141,6 +141,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2.25b-10 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2.25b-9 - Rebuild for new gcc/glibc. - Remove prever stuff, 2.25b final has been around for while now. From fedora-extras-commits at redhat.com Mon Mar 6 15:09:38 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 10:09:38 -0500 Subject: rpms/liferea/devel .cvsignore, 1.22, 1.23 liferea.spec, 1.33, 1.34 sources, 1.23, 1.24 Message-ID: <200603061510.k26FABrQ025117@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25096 Modified Files: .cvsignore liferea.spec sources Log Message: * Mon Mar 6 2006 Brian Pepple - 1.0.7-2 - Update to 1.0.7. - Fix gconf scriptlets. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- .cvsignore 25 Feb 2006 15:43:24 -0000 1.22 +++ .cvsignore 6 Mar 2006 15:09:38 -0000 1.23 @@ -1 +1 @@ -liferea-1.0.6.tar.gz +liferea-1.0.7.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- liferea.spec 25 Feb 2006 15:43:24 -0000 1.33 +++ liferea.spec 6 Mar 2006 15:09:38 -0000 1.34 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.6 +Version: 1.0.7 Release: 2%{?dist} Summary: An RSS/RDF feed reader @@ -23,7 +23,8 @@ BuildRequires: dbus-devel %endif -Requires(post): GConf2 +Requires(pre): GConf2 +Requires(post): GConf2 Requires(preun): GConf2 @@ -51,10 +52,11 @@ %install rm -rf ${RPM_BUILD_ROOT} -make DESTDIR=${RPM_BUILD_ROOT} install +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 +make install DESTDIR=${RPM_BUILD_ROOT} %find_lang %{name} -rm -f $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop +rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ @@ -65,16 +67,26 @@ rm -rf ${RPM_BUILD_ROOT} +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : +fi + + %post -export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/liferea.schemas >/dev/null || : + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : %preun -export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) -gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/liferea.schemas >/dev/null || : +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : +fi %files -f %{name}.lang @@ -93,6 +105,10 @@ %changelog +* Mon Mar 6 2006 Brian Pepple - 1.0.7-2 +- Update to 1.0.7. +- Fix gconf scriptlets. + * Sat Feb 25 2006 Brian Pepple - 1.0.6-2 - Update to 1.0.6. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 25 Feb 2006 15:43:24 -0000 1.23 +++ sources 6 Mar 2006 15:09:38 -0000 1.24 @@ -1 +1 @@ -e8200bdd9a6a33468687cc8fb144e809 liferea-1.0.6.tar.gz +d75b2621d2e926695e833eaa2aed68c2 liferea-1.0.7.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 15:11:25 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:11:25 -0500 Subject: rpms/starfighter/devel starfighter.spec,1.7,1.8 Message-ID: <200603061511.k26FBvid025185@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/starfighter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25125 Modified Files: starfighter.spec Log Message: FC5 rebuild. Index: starfighter.spec =================================================================== RCS file: /cvs/extras/rpms/starfighter/devel/starfighter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- starfighter.spec 9 Feb 2006 18:39:11 -0000 1.7 +++ starfighter.spec 6 Mar 2006 15:11:24 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Project: Starfighter, a space arcade game Name: starfighter Version: 1.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Amusements/Games URL: http://www.parallelrealities.co.uk/starfighter.php @@ -76,6 +76,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.1-7 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.1-6 - Rebuild for new gcc/glibc. - Clean up spec file a little (desktop file conditional). From fedora-extras-commits at redhat.com Mon Mar 6 15:12:36 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:12:36 -0500 Subject: rpms/SDL_gfx/devel SDL_gfx.spec,1.4,1.5 Message-ID: <200603061513.k26FD8M2025246@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/SDL_gfx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25193 Modified Files: SDL_gfx.spec Log Message: FC5 rebuild. Index: SDL_gfx.spec =================================================================== RCS file: /cvs/extras/rpms/SDL_gfx/devel/SDL_gfx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- SDL_gfx.spec 9 Feb 2006 18:35:53 -0000 1.4 +++ SDL_gfx.spec 6 Mar 2006 15:12:35 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Graphic primitives, rotozoomer, framerate control and image filters Name: SDL_gfx Version: 2.0.13 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.ferzkopp.net/Software/SDL_gfx-2.0/ @@ -71,6 +71,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2.0.13-4 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2.0.13-3 - Rebuild for new gcc/glibc. - Update URLs. From fedora-extras-commits at redhat.com Mon Mar 6 15:13:39 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:13:39 -0500 Subject: rpms/proftpd/devel proftpd.spec,1.11,1.12 Message-ID: <200603061514.k26FEC7i025309@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25252 Modified Files: proftpd.spec Log Message: FC5 rebuild. Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- proftpd.spec 9 Feb 2006 18:30:16 -0000 1.11 +++ proftpd.spec 6 Mar 2006 15:13:37 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.3.0 -Release: 0.1.rc3%{?dist} +Release: 0.2.rc3%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ @@ -145,6 +145,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.3.0-0.2.rc3 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.3.0-0.1.rc3 - Update to 1.3.0rc3, which builds with the latest openssl. From fedora-extras-commits at redhat.com Mon Mar 6 15:16:01 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:16:01 -0500 Subject: rpms/powermanga/devel powermanga.spec,1.9,1.10 Message-ID: <200603061516.k26FGYwi025514@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/powermanga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25452 Modified Files: powermanga.spec Log Message: FC5 rebuild. Index: powermanga.spec =================================================================== RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- powermanga.spec 9 Feb 2006 18:25:23 -0000 1.9 +++ powermanga.spec 6 Mar 2006 15:16:01 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Arcade 2D shoot-them-up game Name: powermanga Version: 0.79 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Amusements/Games URL: http://linux.tlk.fr/games/Powermanga/ @@ -94,6 +94,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.79-8 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.79-7 - Rebuild for new gcc/glibc and modular X. From fedora-extras-commits at redhat.com Mon Mar 6 15:17:12 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:17:12 -0500 Subject: rpms/portaudio/devel portaudio.spec,1.7,1.8 Message-ID: <200603061517.k26FHiN4025580@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/portaudio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25525 Modified Files: portaudio.spec Log Message: FC5 rebuild. Index: portaudio.spec =================================================================== RCS file: /cvs/extras/rpms/portaudio/devel/portaudio.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- portaudio.spec 9 Feb 2006 18:13:58 -0000 1.7 +++ portaudio.spec 6 Mar 2006 15:17:12 -0000 1.8 @@ -3,7 +3,7 @@ Summary: Free, cross platform, open-source, audio I/O library Name: portaudio Version: 18.1 -Release: 6%{?dist} +Release: 7%{?dist} License: BSD-like Group: System Environment/Libraries URL: http://www.portaudio.com/ @@ -49,6 +49,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 18.1-7 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 18.1-6 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:18:42 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:18:42 -0500 Subject: rpms/plib16/devel plib16.spec,1.7,1.8 Message-ID: <200603061519.k26FJEaK025971@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/plib16/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25613 Modified Files: plib16.spec Log Message: FC5 rebuild. Index: plib16.spec =================================================================== RCS file: /cvs/extras/rpms/plib16/devel/plib16.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- plib16.spec 9 Feb 2006 18:06:41 -0000 1.7 +++ plib16.spec 6 Mar 2006 15:18:35 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Set of portable libraries especially useful for games Name: plib16 Version: 1.6.0 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL Group: System Environment/Libraries URL: http://plib.sourceforge.net/ @@ -64,6 +64,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.6.0-5 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.6.0-4 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:19:49 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:19:49 -0500 Subject: rpms/plib/devel plib.spec,1.9,1.10 Message-ID: <200603061520.k26FKLoL026043@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/plib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25986 Modified Files: plib.spec Log Message: FC5 rebuild. Index: plib.spec =================================================================== RCS file: /cvs/extras/rpms/plib/devel/plib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plib.spec 9 Feb 2006 18:06:59 -0000 1.9 +++ plib.spec 6 Mar 2006 15:19:49 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Set of portable libraries especially useful for games Name: plib Version: 1.8.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries URL: http://plib.sourceforge.net/ @@ -66,6 +66,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.8.4-3 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.8.4-2 - Rebuild for new gcc/glibc and modular X. - Include gcc 4.1 patch to fix extra qualification errors. From fedora-extras-commits at redhat.com Mon Mar 6 15:20:37 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:20:37 -0500 Subject: rpms/p7zip/devel p7zip.spec,1.8,1.9 Message-ID: <200603061521.k26FL9Kq026105@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/p7zip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26049 Modified Files: p7zip.spec Log Message: FC5 rebuild. Index: p7zip.spec =================================================================== RCS file: /cvs/extras/rpms/p7zip/devel/p7zip.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- p7zip.spec 9 Feb 2006 16:49:43 -0000 1.8 +++ p7zip.spec 6 Mar 2006 15:20:37 -0000 1.9 @@ -1,7 +1,7 @@ Summary: Very high compression ratio file archiver Name: p7zip Version: 4.30 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: Applications/Archiving URL: http://p7zip.sourceforge.net/ @@ -90,6 +90,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 4.30-3 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 4.30-2 - Rebuild for new gcc/glibc. - Include gcc 4.1 patch for extra qualification errors. From fedora-extras-commits at redhat.com Mon Mar 6 15:21:35 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:21:35 -0500 Subject: rpms/oidentd/devel oidentd.spec,1.9,1.10 Message-ID: <200603061522.k26FM7gs026171@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/oidentd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26111 Modified Files: oidentd.spec Log Message: FC5 rebuild. Index: oidentd.spec =================================================================== RCS file: /cvs/extras/rpms/oidentd/devel/oidentd.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- oidentd.spec 9 Feb 2006 16:15:45 -0000 1.9 +++ oidentd.spec 6 Mar 2006 15:21:35 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Implementation of the RFC1413 identification server Name: oidentd Version: 2.0.7 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: System Environment/Daemons URL: http://ojnk.sourceforge.net/ @@ -71,6 +71,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2.0.7-9 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2.0.7-8 - Remove obsolete identd.spoof and oidentd.users files (thanks to Apu). - Ghost new configuration files (oidentd.conf & oidentd_masq.conf), but From fedora-extras-commits at redhat.com Mon Mar 6 15:22:30 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:22:30 -0500 Subject: rpms/ncftp/devel ncftp.spec,1.6,1.7 Message-ID: <200603061523.k26FN2od026237@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/ncftp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26177 Modified Files: ncftp.spec Log Message: FC5 rebuild. Index: ncftp.spec =================================================================== RCS file: /cvs/extras/rpms/ncftp/devel/ncftp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ncftp.spec 9 Feb 2006 16:05:03 -0000 1.6 +++ ncftp.spec 6 Mar 2006 15:22:30 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Improved console FTP client Name: ncftp Version: 3.1.9 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 2 License: Distributable Group: Applications/Internet @@ -71,6 +71,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2:3.1.9-3 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2:3.1.9-2 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:23:20 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:23:20 -0500 Subject: rpms/metakit/devel metakit.spec,1.12,1.13 Message-ID: <200603061523.k26FNrDk026306@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/metakit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26243 Modified Files: metakit.spec Log Message: FC5 rebuild. Index: metakit.spec =================================================================== RCS file: /cvs/extras/rpms/metakit/devel/metakit.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- metakit.spec 9 Feb 2006 15:59:26 -0000 1.12 +++ metakit.spec 6 Mar 2006 15:23:19 -0000 1.13 @@ -3,7 +3,7 @@ Summary: Embeddable database Name: metakit Version: 2.4.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.equi4.com/metakit/ @@ -81,6 +81,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2.4.9.5-2 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2.4.9.5-1 - Update to 2.4.9.5. - Remove no longer nostrip patch. From fedora-extras-commits at redhat.com Mon Mar 6 15:24:23 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:24:23 -0500 Subject: rpms/lmarbles/devel lmarbles.spec,1.9,1.10 Message-ID: <200603061524.k26FOviZ026377@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lmarbles/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26354 Modified Files: lmarbles.spec Log Message: FC5 rebuild. Index: lmarbles.spec =================================================================== RCS file: /cvs/extras/rpms/lmarbles/devel/lmarbles.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lmarbles.spec 9 Feb 2006 15:48:35 -0000 1.9 +++ lmarbles.spec 6 Mar 2006 15:24:23 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Atomix clone where you create figures out of marbles Name: lmarbles Version: 1.0.7 -Release: 4 +Release: 5 License: GPL Group: Amusements/Games URL: http://lgames.sourceforge.net/ @@ -78,6 +78,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.0.7-5 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.0.7-4 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:25:08 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:25:08 -0500 Subject: rpms/linux_logo/devel linux_logo.spec,1.10,1.11 Message-ID: <200603061525.k26FPeXq026441@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/linux_logo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26384 Modified Files: linux_logo.spec Log Message: FC5 rebuild. Index: linux_logo.spec =================================================================== RCS file: /cvs/extras/rpms/linux_logo/devel/linux_logo.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- linux_logo.spec 9 Feb 2006 15:43:01 -0000 1.10 +++ linux_logo.spec 6 Mar 2006 15:25:08 -0000 1.11 @@ -1,7 +1,7 @@ Summary: The linux logo - a colorful console penguin logo Name: linux_logo Version: 4.13 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.deater.net/weave/vmwprod/linux_logo/ @@ -52,6 +52,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 4.13-2 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 4.13-1 - Update to 4.13. From fedora-extras-commits at redhat.com Mon Mar 6 15:26:26 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:26:26 -0500 Subject: rpms/lighttpd/devel lighttpd.spec,1.21,1.22 Message-ID: <200603061526.k26FQwlG026520@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/lighttpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26454 Modified Files: lighttpd.spec Log Message: FC5 rebuild. Index: lighttpd.spec =================================================================== RCS file: /cvs/extras/rpms/lighttpd/devel/lighttpd.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- lighttpd.spec 8 Feb 2006 15:00:23 -0000 1.21 +++ lighttpd.spec 6 Mar 2006 15:26:26 -0000 1.22 @@ -3,7 +3,7 @@ Summary: Lightning fast webserver with light system requirements Name: lighttpd Version: 1.4.10 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: System Environment/Daemons URL: http://www.lighttpd.net/ @@ -173,6 +173,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.4.10-2 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.4.10-1 - Update to 1.4.10. - Remove now included fix. From fedora-extras-commits at redhat.com Mon Mar 6 15:27:15 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 10:27:15 -0500 Subject: rpms/pcsc-lite/devel pcsc-lite-1.3.0-rpath64.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 pcsc-lite.spec, 1.7, 1.8 sources, 1.2, 1.3 pcsc-lite-1.2.0-rpath64.patch, 1.1, NONE pcsc-lite-pcscd.init, 1.1, NONE pcsc-lite-update-reader.conf, 1.1, NONE Message-ID: <200603061527.k26FRlb6026556@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26529 Modified Files: .cvsignore pcsc-lite.spec sources Added Files: pcsc-lite-1.3.0-rpath64.patch Removed Files: pcsc-lite-1.2.0-rpath64.patch pcsc-lite-pcscd.init pcsc-lite-update-reader.conf Log Message: * Sun Mar 5 2006 Ville Skytt?? - 1.3.0-1 - 1.3.0, init script and reader.conf updater included upstream. - Split developer docs into a -doc subpackage, include API docs. - libmusclecard no longer included, split into separate package upstream. pcsc-lite-1.3.0-rpath64.patch: --- NEW FILE pcsc-lite-1.3.0-rpath64.patch --- --- pcsc-lite-1.3.0/configure~ 2006-03-03 15:48:59.000000000 +0200 +++ pcsc-lite-1.3.0/configure 2006-03-05 23:40:48.000000000 +0200 @@ -9103,7 +9103,7 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" if test "$GCC" = yes; then sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then @@ -9480,7 +9480,7 @@ # Append ld.so.conf contents to the search path if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 19:57:18 -0000 1.2 +++ .cvsignore 6 Mar 2006 15:27:11 -0000 1.3 @@ -1 +1 @@ -pcsc-lite-1.2.0.tar.gz +pcsc-lite-1.3.0.tar.gz Index: pcsc-lite.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pcsc-lite.spec 13 Feb 2006 22:16:44 -0000 1.7 +++ pcsc-lite.spec 6 Mar 2006 15:27:15 -0000 1.8 @@ -1,21 +1,19 @@ Name: pcsc-lite -Version: 1.2.0 -Release: 14%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: PC/SC Lite smart card framework and applications Group: System Environment/Daemons License: BSD -URL: http://www.linuxnet.com/middle.html -Source0: https://alioth.debian.org/download.php/419/%{name}-%{version}.tar.gz -Source1: %{name}-pcscd.init -Source2: %{name}-update-reader.conf +URL: http://pcsclite.alioth.debian.org/ +Source0: https://alioth.debian.org/download.php/1472/%{name}-%{version}.tar.gz Patch0: %{name}-docinst.patch -Patch1: %{name}-1.2.0-rpath64.patch +Patch1: %{name}-1.3.0-rpath64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: %{__perl} -BuildRequires: flex -BuildRequires: libusb-devel >= 0.1.6 +BuildRequires: libusb-devel >= 0.1.7 +BuildRequires: doxygen +BuildRequires: graphviz Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig Requires: pcsc-ifd-handler @@ -33,7 +31,6 @@ Summary: PC/SC Lite libraries Group: System Environment/Libraries Provides: libpcsc-lite = %{version}-%{release} -Provides: libmusclecard = %{version}-%{release} %description libs PC/SC Lite libraries. @@ -44,28 +41,23 @@ Requires: %{name}-libs = %{version}-%{release} Requires: pkgconfig Provides: libpcsc-lite-devel = %{version}-%{release} -Provides: libmusclecard-devel = %{version}-%{release} %description devel PC/SC Lite development files. +%package doc +Summary: PC/SC Lite developer documentation +Group: Documentation + +%description doc +%{summary}. + %prep %setup -q %patch0 -p0 %patch1 -p1 -%{__perl} -pi -e 's|/etc/init\.d\b|%{_initrddir}|' doc/pcscd.8.in -%{__perl} -pe \ - 's|__LOCALSTATEDIR__|%{_localstatedir}|g ; - s|__SYSCONFDIR__|%{_sysconfdir}|g ; - s|__INITRDDIR__|%{_initrddir}|g ; - s|__SBINDIR__|%{_sbindir}|g' \ - %{SOURCE1} > pcscd.init -%{__perl} -pe \ - 's|__SYSCONFDIR__|%{_sysconfdir}| ; - s|__INITRDDIR__|%{_initrddir}| ; - s|__SBINDIR__|%{_sbindir}|' \ - %{SOURCE2} > update-reader.conf +sed -i -e 's/^\(HAVE_DOT\s*=\s*\)/\1 YES/' doc/doxygen.conf.in %build @@ -75,24 +67,26 @@ --enable-runpid=%{_localstatedir}/run/pcscd.pid \ --enable-confdir=%{_sysconfdir} \ --enable-ipcdir=%{_localstatedir}/run \ - --enable-muscledropdir=%{_libdir}/pcsc/services \ --enable-usbdropdir=%{_libdir}/pcsc/drivers make %{?_smp_mflags} +doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/{drivers,services} -install -Dpm 755 pcscd.init $RPM_BUILD_ROOT%{_initrddir}/pcscd -install -pm 644 src/ifdhandler.h $RPM_BUILD_ROOT%{_includedir}/ -install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d + +install -dm 755 $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers + +install -Dpm 755 etc/pcscd.init $RPM_BUILD_ROOT%{_initrddir}/pcscd + cat < $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/README All *.conf files in this directory are merged into %{_sysconfdir}/reader.conf by %{_sbindir}/update-reader.conf. EOF -install -pm 755 update-reader.conf $RPM_BUILD_ROOT%{_sbindir}/ -rm $RPM_BUILD_ROOT{%{_bindir}/pcsc_demo,%{_libdir}/lib*.la} + +rm $RPM_BUILD_ROOT{%{_sysconfdir}/reader.conf.d/reader.conf,%{_libdir}/lib*.la} +touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf %clean @@ -118,32 +112,41 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog* COPYING DRIVERS HELP NEWS README SECURITY +%doc AUTHORS ChangeLog* COPYING DRIVERS HELP README SECURITY TODO %dir %{_sysconfdir}/reader.conf.d/ %{_sysconfdir}/reader.conf.d/README %ghost %config %{_sysconfdir}/reader.conf %{_initrddir}/pcscd -%{_bindir}/bundleTool %{_bindir}/formaticc -%{_bindir}/installifd +%{_sbindir}/installifd %{_sbindir}/pcscd %{_sbindir}/update-reader.conf %{_libdir}/pcsc/ -%{_mandir}/man[18]/*.[18]* +%{_mandir}/man1/formaticc.1* +%{_mandir}/man5/reader.conf.5* +%{_mandir}/man8/pcscd.8* %files libs %defattr(-,root,root,-) -%{_libdir}/lib*.so.* +%{_libdir}/libpcsclite.so.* %files devel %defattr(-,root,root,-) -%doc doc/*.pdf doc/example/pcsc_demo.c -%{_includedir}/*.h -%{_libdir}/lib*.so -%{_libdir}/pkgconfig/lib*.pc +%{_includedir}/PCSC/ +%{_libdir}/libpcsclite.so +%{_libdir}/pkgconfig/libpcsclite.pc + +%files doc +%defattr(-,root,root,-) +%doc doc/api/ doc/*.pdf doc/example/pcsc_demo.c %changelog +* Sun Mar 5 2006 Ville Skytt?? - 1.3.0-1 +- 1.3.0, init script and reader.conf updater included upstream. +- Split developer docs into a -doc subpackage, include API docs. +- libmusclecard no longer included, split into separate package upstream. + * Mon Feb 13 2006 Ville Skytt?? - 1.2.0-14 - Avoid standard rpaths on multilib archs. - Fine tune dependencies. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-lite/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 19:57:18 -0000 1.2 +++ sources 6 Mar 2006 15:27:15 -0000 1.3 @@ -1 +1 @@ -98456d274b2f4bfe74c5ab59070f8d50 pcsc-lite-1.2.0.tar.gz +ccbb595be0e1d47c9f9f449f183bea6c pcsc-lite-1.3.0.tar.gz --- pcsc-lite-1.2.0-rpath64.patch DELETED --- --- pcsc-lite-pcscd.init DELETED --- --- pcsc-lite-update-reader.conf DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 15:28:29 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:28:29 -0500 Subject: rpms/liboil/devel liboil.spec,1.14,1.15 Message-ID: <200603061529.k26FT17v026662@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26600 Modified Files: liboil.spec Log Message: FC5 rebuild. Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/liboil.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- liboil.spec 9 Feb 2006 15:41:08 -0000 1.14 +++ liboil.spec 6 Mar 2006 15:28:29 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil Version: 0.3.7 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ @@ -77,6 +77,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.3.7-3 +- FC5 rebuild (well, try at least since PPC fixes are required). + * Thu Feb 9 2006 Matthias Saou 0.3.7-2 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:29:19 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:29:19 -0500 Subject: rpms/libcaca/devel libcaca.spec,1.10,1.11 Message-ID: <200603061529.k26FTtgd026724@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/libcaca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26668 Modified Files: libcaca.spec Log Message: FC5 rebuild. Index: libcaca.spec =================================================================== RCS file: /cvs/extras/rpms/libcaca/devel/libcaca.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libcaca.spec 9 Feb 2006 15:37:04 -0000 1.10 +++ libcaca.spec 6 Mar 2006 15:29:18 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Library for Colour AsCii Art, text mode graphics Name: libcaca Version: 0.9 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPL Group: System Environment/Libraries URL: http://sam.zoy.org/projects/libcaca/ @@ -106,6 +106,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.9-10 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.9-9 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:30:26 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:30:26 -0500 Subject: rpms/kannel/devel kannel.spec,1.9,1.10 Message-ID: <200603061530.k26FUxs0026787@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/kannel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26732 Modified Files: kannel.spec Log Message: FC5 rebuild. Index: kannel.spec =================================================================== RCS file: /cvs/extras/rpms/kannel/devel/kannel.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- kannel.spec 9 Feb 2006 15:28:02 -0000 1.9 +++ kannel.spec 6 Mar 2006 15:30:21 -0000 1.10 @@ -1,7 +1,7 @@ Summary: WAP and SMS gateway Name: kannel Version: 1.4.0 -Release: 7%{?dist} +Release: 8%{?dist} License: Kannel Group: System Environment/Daemons URL: http://www.kannel.org/ @@ -121,6 +121,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.4.0-8 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.4.0-7 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:31:18 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:31:18 -0500 Subject: rpms/js/devel js.spec,1.10,1.11 Message-ID: <200603061531.k26FVoMP026848@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/js/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26793 Modified Files: js.spec Log Message: FC5 rebuild. Index: js.spec =================================================================== RCS file: /cvs/extras/rpms/js/devel/js.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- js.spec 9 Feb 2006 15:25:02 -0000 1.10 +++ js.spec 6 Mar 2006 15:31:18 -0000 1.11 @@ -3,7 +3,7 @@ Summary: JavaScript interpreter and libraries Name: js Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} %if 0%{?_without_readline:1} License: MPL/GPL/LGPL %else @@ -130,6 +130,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.5-4 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.5-3 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:33:08 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:33:08 -0500 Subject: rpms/hackedbox/devel hackedbox.spec,1.6,1.7 Message-ID: <200603061533.k26FXeXU026919@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/hackedbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26859 Modified Files: hackedbox.spec Log Message: FC5 rebuild. Index: hackedbox.spec =================================================================== RCS file: /cvs/extras/rpms/hackedbox/devel/hackedbox.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hackedbox.spec 9 Feb 2006 15:01:59 -0000 1.6 +++ hackedbox.spec 6 Mar 2006 15:33:07 -0000 1.7 @@ -4,7 +4,7 @@ Summary: The bastard son of Blackbox, a small and fast Window Manager Name: hackedbox Version: 0.8.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: User Interface/Desktops URL: http://scrudgeware.org/projects/Hackedbox @@ -80,6 +80,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.8.4-6 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 0.8.4-5 - Rebuild for new gcc/glibc and modular X. From fedora-extras-commits at redhat.com Mon Mar 6 15:34:11 2006 From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie)) Date: Mon, 6 Mar 2006 10:34:11 -0500 Subject: rpms/jthread/devel jthread.spec,1.1,1.2 Message-ID: <200603061534.k26FYhbC027000@cvs-int.fedora.redhat.com> Author: jcollie Update of /cvs/extras/rpms/jthread/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26963 Modified Files: jthread.spec Log Message: Add dist tag to release. Index: jthread.spec =================================================================== RCS file: /cvs/extras/rpms/jthread/devel/jthread.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- jthread.spec 1 Mar 2006 02:48:30 -0000 1.1 +++ jthread.spec 6 Mar 2006 15:34:11 -0000 1.2 @@ -1,7 +1,7 @@ Summary: JThread provides classes to make use of threads easy on different platforms Name: jthread Version: 1.1.2 -Release: 1 +Release: 2%{?dist} License: MIT Group: System Environment/Libraries URL: http://research.edm.luc.ac.be/jori/jthread/jthread.html @@ -60,6 +60,9 @@ %{_libdir}/libjthread.so %changelog +* Mon Mar 6 2006 Jeffrey C. Ollie - 1.1.2-2 +- Add dist tag to release. + * Sat Jan 7 2006 Jeffrey C. Ollie - 1.1.2-1 - Initial build. From fedora-extras-commits at redhat.com Mon Mar 6 15:34:35 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:34:35 -0500 Subject: rpms/gtweakui/devel gtweakui.spec,1.6,1.7 Message-ID: <200603061535.k26FZ7TQ027037@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gtweakui/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26983 Modified Files: gtweakui.spec Log Message: FC5 rebuild. Index: gtweakui.spec =================================================================== RCS file: /cvs/extras/rpms/gtweakui/devel/gtweakui.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gtweakui.spec 9 Feb 2006 11:38:35 -0000 1.6 +++ gtweakui.spec 6 Mar 2006 15:34:35 -0000 1.7 @@ -3,7 +3,7 @@ Summary: Extra configuration dialogs for GNOME Name: gtweakui Version: 0.4.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: User Interface/Desktops URL: http://gtweakui.sourceforge.net/ @@ -87,7 +87,10 @@ %changelog -* Thu Feb 9 2006 Matthias Saou 0.4.0 +* Mon Mar 6 2006 Matthias Saou 0.4.0-2 +- FC5 rebuild. + +* Thu Feb 9 2006 Matthias Saou 0.4.0-1 - Update to 0.4.0 to sync with freshrpms. * Fri Apr 7 2005 Michael Schwendt From fedora-extras-commits at redhat.com Mon Mar 6 15:36:43 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:36:43 -0500 Subject: rpms/gkrellm-freq/devel gkrellm-freq.spec,1.3,1.4 Message-ID: <200603061537.k26FbFwd027110@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-freq/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27055 Modified Files: gkrellm-freq.spec Log Message: FC5 rebuild. Index: gkrellm-freq.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-freq/devel/gkrellm-freq.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gkrellm-freq.spec 8 Feb 2006 16:00:28 -0000 1.3 +++ gkrellm-freq.spec 6 Mar 2006 15:36:42 -0000 1.4 @@ -3,7 +3,7 @@ Summary: CPU frequency display plugin for GKrellM Name: gkrellm-freq Version: 1.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/System URL: http://www.peakunix.net/gkfreq/ @@ -46,6 +46,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.0-2 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.0-1 - Update to 1.0. - Update the rmasm patch. From fedora-extras-commits at redhat.com Mon Mar 6 15:37:40 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:37:40 -0500 Subject: rpms/gkrellm-aclock/devel gkrellm-aclock.spec,1.3,1.4 Message-ID: <200603061538.k26FcCoE027176@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gkrellm-aclock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27121 Modified Files: gkrellm-aclock.spec Log Message: FC5 rebuild. Index: gkrellm-aclock.spec =================================================================== RCS file: /cvs/extras/rpms/gkrellm-aclock/devel/gkrellm-aclock.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gkrellm-aclock.spec 8 Feb 2006 15:55:08 -0000 1.3 +++ gkrellm-aclock.spec 6 Mar 2006 15:37:39 -0000 1.4 @@ -3,7 +3,7 @@ Summary: Analog clock plugin for GKrellM Name: gkrellm-aclock Version: 0.3.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://www.geocities.com/m_muthukumar/gkrellaclock.html @@ -41,6 +41,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.3.3-4 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.3.3-3 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:38:50 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:38:50 -0500 Subject: rpms/giblib/devel giblib.spec,1.9,1.10 Message-ID: <200603061539.k26FdNpq027259@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/giblib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27182 Modified Files: giblib.spec Log Message: FC5 rebuild. Index: giblib.spec =================================================================== RCS file: /cvs/extras/rpms/giblib/devel/giblib.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- giblib.spec 8 Feb 2006 15:53:01 -0000 1.9 +++ giblib.spec 6 Mar 2006 15:38:50 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Simple library and a wrapper for imlib2 Name: giblib Version: 1.2.4 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Libraries URL: http://linuxbrit.co.uk/giblib/ @@ -67,6 +67,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.2.4-6 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.2.4-5 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:39:09 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 10:39:09 -0500 Subject: rpms/ccid/devel .cvsignore, 1.2, 1.3 ccid.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200603061539.k26Fdnht027274@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ccid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27240 Modified Files: .cvsignore ccid.spec sources Log Message: * Mon Mar 6 2006 Ville Skytt?? - 1.0.0-1 - 1.0.0, license changed to LGPL. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ccid/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Feb 2005 20:09:05 -0000 1.2 +++ .cvsignore 6 Mar 2006 15:39:09 -0000 1.3 @@ -1 +1 @@ -ccid-0.4.1.tar.gz +ccid-1.0.0.tar.gz Index: ccid.spec =================================================================== RCS file: /cvs/extras/rpms/ccid/devel/ccid.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ccid.spec 15 Feb 2006 07:16:54 -0000 1.5 +++ ccid.spec 6 Mar 2006 15:39:09 -0000 1.6 @@ -1,20 +1,20 @@ +%define dropdir %(pkg-config libpcsclite --variable usbdropdir) + Name: ccid -Version: 0.4.1 -Release: 7%{?dist} +Version: 1.0.0 +Release: 1%{?dist} Summary: Generic USB CCID smart card reader driver Group: System Environment/Libraries -License: GPL +License: LGPL URL: http://pcsclite.alioth.debian.org/ccid.html -Source0: https://alioth.debian.org/download.php/501/ccid-0.4.1.tar.gz +Source0: https://alioth.debian.org/download.php/1474/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: flex -BuildRequires: perl BuildRequires: libusb-devel >= 0.1.7 -BuildRequires: pcsc-lite-devel >= 1.2.0 +BuildRequires: pcsc-lite-devel >= 1.3.0 Requires: libusb >= 0.1.7 -Requires: pcsc-lite >= 1.2.0 +Requires: pcsc-lite >= 1.3.0 Provides: pcsc-ifd-handler %description @@ -29,9 +29,7 @@ %build -%configure --disable-dependency-tracking \ - --enable-usbdropdir=%{_libdir}/pcsc/drivers \ - --enable-ccidtwindir=%{_libdir}/pcsc/drivers/serial +%configure --disable-dependency-tracking --disable-static make %{?_smp_mflags} @@ -58,11 +56,14 @@ %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README GemPCTwin.reader.conf -%{_libdir}/pcsc/drivers/ifd-ccid.bundle/ -%{_libdir}/pcsc/drivers/serial/ +%{dropdir}/ifd-ccid.bundle/ +%{dropdir}/serial/ %changelog +* Mon Mar 6 2006 Ville Skytt?? - 1.0.0-1 +- 1.0.0, license changed to LGPL. + * Wed Feb 15 2006 Ville Skytt?? - 0.4.1-7 - Rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/ccid/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Feb 2005 20:09:05 -0000 1.2 +++ sources 6 Mar 2006 15:39:09 -0000 1.3 @@ -1 +1 @@ -dbe00b32b018a96e7eecb832cf6d1adf ccid-0.4.1.tar.gz +cae1d55c3361d6202adfdbea9d4e94d7 ccid-1.0.0.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 15:39:49 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:39:49 -0500 Subject: rpms/gentoo/devel gentoo.spec,1.5,1.6 Message-ID: <200603061540.k26FeMf6027363@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gentoo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27266 Modified Files: gentoo.spec Log Message: FC5 rebuild. Index: gentoo.spec =================================================================== RCS file: /cvs/extras/rpms/gentoo/devel/gentoo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gentoo.spec 8 Feb 2006 15:51:08 -0000 1.5 +++ gentoo.spec 6 Mar 2006 15:39:49 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Graphical file management program in GTK+ for Linux Name: gentoo Version: 0.11.55 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/File URL: http://www.obsession.se/gentoo/ @@ -74,6 +74,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.11.55-3 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.11.55-2 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:40:49 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:40:49 -0500 Subject: rpms/gcombust/devel gcombust.spec,1.9,1.10 Message-ID: <200603061541.k26FfLSN027429@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gcombust/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27372 Modified Files: gcombust.spec Log Message: FC5 rebuild. Index: gcombust.spec =================================================================== RCS file: /cvs/extras/rpms/gcombust/devel/gcombust.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gcombust.spec 8 Feb 2006 15:48:27 -0000 1.9 +++ gcombust.spec 6 Mar 2006 15:40:49 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Powerful GTK+ front-end for mkisofs and cdrecord Name: gcombust Version: 0.1.55 -Release: 7 +Release: 8 Epoch: 1 License: GPL Group: Applications/Archiving @@ -51,6 +51,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1:0.1.55-8 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1:0.1.55-7 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:41:33 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:41:33 -0500 Subject: rpms/fillets-ng/devel fillets-ng.spec,1.5,1.6 Message-ID: <200603061542.k26Fg6St027498@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/fillets-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27435 Modified Files: fillets-ng.spec Log Message: FC5 rebuild. Index: fillets-ng.spec =================================================================== RCS file: /cvs/extras/rpms/fillets-ng/devel/fillets-ng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fillets-ng.spec 8 Feb 2006 15:46:13 -0000 1.5 +++ fillets-ng.spec 6 Mar 2006 15:41:33 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Fish Fillets Next Generation, a puzzle game with 70 levels Name: fillets-ng Version: 0.7.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://fillets.sourceforge.net/ @@ -66,6 +66,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.7.3-3 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.7.3-2 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:42:30 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:42:30 -0500 Subject: rpms/easytag/devel easytag.spec,1.11,1.12 Message-ID: <200603061543.k26Fh2XY027564@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/easytag/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27504 Modified Files: easytag.spec Log Message: FC5 rebuild. Index: easytag.spec =================================================================== RCS file: /cvs/extras/rpms/easytag/devel/easytag.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- easytag.spec 8 Feb 2006 15:33:53 -0000 1.11 +++ easytag.spec 6 Mar 2006 15:42:29 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Tag editor for mp3, ogg, flac and other music files Name: easytag Version: 1.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://easytag.sourceforge.net/ @@ -45,6 +45,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.1-3 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.1-2 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:43:20 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 10:43:20 -0500 Subject: rpms/pcsc-perl/devel .cvsignore, 1.2, 1.3 pcsc-perl.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200603061543.k26FhqoG027649@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27576 Modified Files: .cvsignore pcsc-perl.spec sources Log Message: * Mon Mar 6 2006 Ville Skytt?? - 1.4.1-1 - 1.4.1. - Don't hardcode required pcsc-lite-libs version, use shared lib file instead. - Convert docs to UTF-8. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 7 Jan 2005 20:15:46 -0000 1.2 +++ .cvsignore 6 Mar 2006 15:43:20 -0000 1.3 @@ -1 +1 @@ -pcsc-perl-1.3.1.tar.gz +pcsc-perl-1.4.1.tar.gz Index: pcsc-perl.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/pcsc-perl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- pcsc-perl.spec 15 Feb 2006 07:09:32 -0000 1.7 +++ pcsc-perl.spec 6 Mar 2006 15:43:20 -0000 1.8 @@ -1,8 +1,9 @@ -%define pcscver 1.2.0 +%define pcscver 1.3.0 +%define pcsclib %{_libdir}/libpcsclite.so.1 Name: pcsc-perl -Version: 1.3.1 -Release: 8%{?dist} +Version: 1.4.1 +Release: 1%{?dist} Summary: Perl interface to the PC/SC smart card library Group: Development/Libraries @@ -12,8 +13,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl -BuildRequires: pcsc-lite-devel = %{pcscver} -Requires: pcsc-lite-libs = %{pcscver} +BuildRequires: pcsc-lite-devel >= %{pcscver} +Requires: %{pcsclib} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Provides: perl-pcsc = %{version}-%{release} @@ -25,11 +26,11 @@ %prep %setup -q chmod 644 examples/* # avoid dependencies +f=README ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" \ - DEFINE=-Wall INC= +%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" DEFINE=-Wall make %{?_smp_mflags} @@ -59,6 +60,11 @@ %changelog +* Mon Mar 6 2006 Ville Skytt?? - 1.4.1-1 +- 1.4.1. +- Don't hardcode required pcsc-lite-libs version, use shared lib file instead. +- Convert docs to UTF-8. + * Wed Feb 15 2006 Ville Skytt?? - 1.3.1-8 - Rebuild, cosmetics. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-perl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 7 Jan 2005 20:15:46 -0000 1.2 +++ sources 6 Mar 2006 15:43:20 -0000 1.3 @@ -1 +1 @@ -4c1869b5b726f7ab5b1bda88b390c821 pcsc-perl-1.3.1.tar.gz +0a432f4fd6414aa3122b53a091b47064 pcsc-perl-1.4.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 15:43:21 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:43:21 -0500 Subject: rpms/advancecomp/devel advancecomp.spec,1.13,1.14 Message-ID: <200603061543.k26Fhrnn027652@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/advancecomp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27572 Modified Files: advancecomp.spec Log Message: FC5 rebuild. Index: advancecomp.spec =================================================================== RCS file: /cvs/extras/rpms/advancecomp/devel/advancecomp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- advancecomp.spec 8 Feb 2006 14:42:30 -0000 1.13 +++ advancecomp.spec 6 Mar 2006 15:43:21 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Recompression utilities for .PNG, .MNG and .ZIP files Name: advancecomp Version: 1.15 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Emulators URL: http://advancemame.sourceforge.net/ @@ -42,6 +42,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.15-4 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.15-3 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:46:42 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:46:42 -0500 Subject: rpms/boa/devel boa.spec,1.8,1.9 Message-ID: <200603061547.k26FlEMb027753@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/boa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27698 Modified Files: boa.spec Log Message: FC5 rebuild. Index: boa.spec =================================================================== RCS file: /cvs/extras/rpms/boa/devel/boa.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- boa.spec 8 Feb 2006 14:54:44 -0000 1.8 +++ boa.spec 6 Mar 2006 15:46:42 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Single-tasking HTTP server Name: boa Version: 0.94.14 -Release: 0.3%{?rcver:.%{rcver}}%{?dist} +Release: 0.4%{?rcver:.%{rcver}}%{?dist} URL: http://www.boa.org/ License: GPL Group: System Environment/Daemons @@ -127,6 +127,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.94.14-0.4.rc21 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.94.14-0.3.rc21 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:47:33 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:47:33 -0500 Subject: rpms/camE/devel camE.spec,1.9,1.10 Message-ID: <200603061548.k26Fm5qF027814@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/camE/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27788 Modified Files: camE.spec Log Message: FC5 rebuild. Index: camE.spec =================================================================== RCS file: /cvs/extras/rpms/camE/devel/camE.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- camE.spec 8 Feb 2006 15:02:01 -0000 1.9 +++ camE.spec 6 Mar 2006 15:47:32 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Rewrite of the xawtv webcam app, which adds imlib2 support Name: camE Version: 1.9 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Daemons URL: http://linuxbrit.co.uk/camE/ @@ -39,6 +39,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.9-6 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 1.9-5 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 15:50:50 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 10:50:50 -0500 Subject: rpms/openct/devel openct.spec,1.8,1.9 Message-ID: <200603061551.k26FpNfg027878@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/openct/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27827 Modified Files: openct.spec Log Message: * Mon Mar 6 2006 Ville Skytt?? - 0.6.6-5 - Rebuild with new pcsc-lite. Index: openct.spec =================================================================== RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- openct.spec 15 Feb 2006 07:31:39 -0000 1.8 +++ openct.spec 6 Mar 2006 15:50:50 -0000 1.9 @@ -1,6 +1,8 @@ +%define dropdir %(pkg-config libpcsclite --variable=usbdropdir) + Name: openct Version: 0.6.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Middleware framework for smart card terminals Group: System Environment/Libraries @@ -14,7 +16,7 @@ Patch0: %{name}-0.6.6-rpath64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: pcsc-lite-devel +BuildRequires: pcsc-lite-devel >= 1.3.0 BuildRequires: libusb-devel BuildRequires: libtool-ltdl-devel BuildRequires: sed @@ -64,7 +66,7 @@ %configure \ --disable-dependency-tracking \ --disable-static \ - --with-bundle-dir=%{_libdir}/pcsc/drivers + --with-bundle-dir=%{dropdir} make %{?_smp_mflags} @@ -76,7 +78,7 @@ %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules ln -sf %{_libdir}/openct-ifd.so \ - $RPM_BUILD_ROOT%{_libdir}/pcsc/drivers/openct-ifd.bundle/Contents/*/ + $RPM_BUILD_ROOT%{dropdir}/openct-ifd.bundle/Contents/*/ install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct @@ -148,10 +150,13 @@ %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf %{_libdir}/openct-ifd.so -%{_libdir}/pcsc/drivers/openct-ifd.bundle/ +%{dropdir}/openct-ifd.bundle/ %changelog +* Mon Mar 6 2006 Ville Skytt?? - 0.6.6-5 +- Rebuild with new pcsc-lite. + * Wed Feb 15 2006 Ville Skytt?? - 0.6.6-4 - Avoid standard rpaths on lib64 archs. From fedora-extras-commits at redhat.com Mon Mar 6 15:51:09 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:51:09 -0500 Subject: rpms/djvulibre/devel .cvsignore, 1.5, 1.6 djvulibre.spec, 1.11, 1.12 sources, 1.5, 1.6 Message-ID: <200603061551.k26FpfDk027885@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27852 Modified Files: .cvsignore djvulibre.spec sources Log Message: FC5 rebuild. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 4 Aug 2005 18:10:10 -0000 1.5 +++ .cvsignore 6 Mar 2006 15:51:09 -0000 1.6 @@ -1 +1 @@ -djvulibre-3.5.15.tar.gz +djvulibre-3.5.16.tar.gz Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- djvulibre.spec 4 Aug 2005 19:38:52 -0000 1.11 +++ djvulibre.spec 6 Mar 2006 15:51:09 -0000 1.12 @@ -1,7 +1,7 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.15 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ @@ -96,6 +96,9 @@ %changelog +* Mon Mar 6 2005 Matthias Saou 3.5.15-3 +- FC5 rebuild. + * Thu Aug 4 2005 Matthias Saou 3.5.15-2 - Include djvulibre-3.5.15-gcc401.patch to fix compilation with gcc 4.0.1. - Add hicolor-icon-theme build req for /usr/share/icons/hicolor/48x48/mimetypes Index: sources =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Aug 2005 18:10:10 -0000 1.5 +++ sources 6 Mar 2006 15:51:09 -0000 1.6 @@ -1 +1 @@ -4a4c5a36799e73bd93afc4fa5d69b315 djvulibre-3.5.15.tar.gz +5591c99a50aed1613a796a5aa4978fc0 djvulibre-3.5.16.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 15:52:16 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:52:16 -0500 Subject: rpms/php-pecl-mailparse/devel php-pecl-mailparse.spec,1.8,1.9 Message-ID: <200603061552.k26FqmAd027982@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-mailparse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938 Modified Files: php-pecl-mailparse.spec Log Message: FC5 rebuild. Index: php-pecl-mailparse.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-mailparse/devel/php-pecl-mailparse.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- php-pecl-mailparse.spec 9 Feb 2006 17:16:15 -0000 1.8 +++ php-pecl-mailparse.spec 6 Mar 2006 15:52:16 -0000 1.9 @@ -3,7 +3,7 @@ Summary: PECL package for parsing and working with email messages Name: php-pecl-mailparse Version: 2.1.1 -Release: 2%{?dist} +Release: 3%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/mailparse @@ -60,6 +60,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 2.1.1-3 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 2.1.1-2 - Rebuild for new gcc/glibc and FC5's PHP 5.1. From fedora-extras-commits at redhat.com Mon Mar 6 15:53:08 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:53:08 -0500 Subject: rpms/djvulibre/devel djvulibre.spec,1.12,1.13 Message-ID: <200603061553.k26FreH2028070@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28017 Modified Files: djvulibre.spec Log Message: Fix date typo. Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- djvulibre.spec 6 Mar 2006 15:51:09 -0000 1.12 +++ djvulibre.spec 6 Mar 2006 15:53:08 -0000 1.13 @@ -96,7 +96,7 @@ %changelog -* Mon Mar 6 2005 Matthias Saou 3.5.15-3 +* Mon Mar 6 2006 Matthias Saou 3.5.15-3 - FC5 rebuild. * Thu Aug 4 2005 Matthias Saou 3.5.15-2 From fedora-extras-commits at redhat.com Mon Mar 6 15:54:11 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:54:11 -0500 Subject: rpms/php-pecl-pdo/devel php-pecl-pdo.spec,1.3,1.4 Message-ID: <200603061554.k26FshBM028125@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-pdo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28078 Modified Files: php-pecl-pdo.spec Log Message: FC5 rebuild. Index: php-pecl-pdo.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-pdo/devel/php-pecl-pdo.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-pecl-pdo.spec 9 Feb 2006 17:22:03 -0000 1.3 +++ php-pecl-pdo.spec 6 Mar 2006 15:54:11 -0000 1.4 @@ -3,7 +3,7 @@ Summary: PECL package for PHP Data Objects Interface Name: php-pecl-pdo Version: 1.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/PDO @@ -77,6 +77,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.0.2-2 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.0.2-1 - Update to 1.0.2. From fedora-extras-commits at redhat.com Mon Mar 6 15:55:50 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 10:55:50 -0500 Subject: rpms/php-pecl-pdo-sqlite/devel php-pecl-pdo-sqlite.spec,1.3,1.4 Message-ID: <200603061556.k26FuM4o028228@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-pecl-pdo-sqlite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28210 Modified Files: php-pecl-pdo-sqlite.spec Log Message: FC5 rebuild. Index: php-pecl-pdo-sqlite.spec =================================================================== RCS file: /cvs/extras/rpms/php-pecl-pdo-sqlite/devel/php-pecl-pdo-sqlite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-pecl-pdo-sqlite.spec 2 Jun 2005 15:12:20 -0000 1.3 +++ php-pecl-pdo-sqlite.spec 6 Mar 2006 15:55:50 -0000 1.4 @@ -3,7 +3,7 @@ Summary: PECL package for PHP Data Objects Interface to SQLite v3 Name: php-pecl-pdo-sqlite Version: 0.3 -Release: 3%{?dist} +Release: 4%{?dist} License: PHP Group: Development/Languages URL: http://pecl.php.net/package/PDO_SQLITE @@ -56,6 +56,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.3-4 +- FC5 rebuild. + * Thu Jun 2 2005 Matthias Saou 0.3-3 - Rebuild. From fedora-extras-commits at redhat.com Mon Mar 6 16:03:01 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 11:03:01 -0500 Subject: rpms/opensc/devel opensc.spec,1.9,1.10 Message-ID: <200603061603.k26G3sA5030188@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/opensc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30161 Modified Files: opensc.spec Log Message: * Mon Mar 6 2006 Ville Skytt?? - 0.10.1-3 - Rebuild. Index: opensc.spec =================================================================== RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- opensc.spec 15 Feb 2006 20:57:35 -0000 1.9 +++ opensc.spec 6 Mar 2006 16:03:01 -0000 1.10 @@ -2,7 +2,7 @@ Name: opensc Version: 0.10.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Smart card library and applications Group: System Environment/Libraries @@ -138,6 +138,9 @@ %changelog +* Mon Mar 6 2006 Ville Skytt?? - 0.10.1-3 +- Rebuild. + * Wed Feb 15 2006 Ville Skytt?? - 0.10.1-2 - Avoid standard rpaths on lib64 archs. From fedora-extras-commits at redhat.com Mon Mar 6 16:04:21 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 11:04:21 -0500 Subject: rpms/freeciv/devel .cvsignore, 1.10, 1.11 freeciv.spec, 1.20, 1.21 sources, 1.10, 1.11 Message-ID: <200603061604.k26G4rpw030215@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30194 Modified Files: .cvsignore freeciv.spec sources Log Message: * Mon Mar 6 2006 Brian Pepple - 2.0.8-2 - Update to 2.0.8. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Nov 2005 15:23:59 -0000 1.10 +++ .cvsignore 6 Mar 2006 16:04:20 -0000 1.11 @@ -1,2 +1,2 @@ -freeciv-2.0.7.tar.bz2 +freeciv-2.0.8.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/freeciv.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- freeciv.spec 16 Feb 2006 14:40:40 -0000 1.20 +++ freeciv.spec 6 Mar 2006 16:04:20 -0000 1.21 @@ -1,6 +1,6 @@ Name: freeciv -Version: 2.0.7 -Release: 6%{?dist} +Version: 2.0.8 +Release: 2%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -42,7 +42,6 @@ %install rm -rf $RPM_BUILD_ROOT - %makeinstall desktop-file-install --vendor fedora --delete-original \ @@ -81,13 +80,16 @@ %doc doc/README.graphics doc/README.sound %{_bindir}/civserver %{_bindir}/civclient -%{_datadir}/%{name} +%{_datadir}/%{name}/ %{_datadir}/pixmaps/%{name}.xpm %{_datadir}/applications/fedora-*.desktop %{_mandir}/man6/civserver.6.gz %{_mandir}/man6/civclient.6.gz %changelog +* Mon Mar 6 2006 Brian Pepple - 2.0.8-2 +- Update to 2.0.8. + * Thu Feb 16 2006 Brian Pepple - 2.0.7-6 - Remove unnecessary BR (alsa-lib-devel & SDL-devel). Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Nov 2005 15:23:59 -0000 1.10 +++ sources 6 Mar 2006 16:04:20 -0000 1.11 @@ -1,2 +1,2 @@ -7a60ea8f39822036b86640532accc5ce freeciv-2.0.7.tar.bz2 +9ebd5899c2c78362e0e2c68791673a88 freeciv-2.0.8.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 16:08:32 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 6 Mar 2006 11:08:32 -0500 Subject: rpms/pcsc-tools/devel pcsc-tools-1.4.1-atrmsg.patch, NONE, 1.1 pcsc-tools.spec, 1.2, 1.3 smartcard_list.txt, 1.2, 1.3 Message-ID: <200603061609.k26G95xK030304@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30281 Modified Files: pcsc-tools.spec smartcard_list.txt Added Files: pcsc-tools-1.4.1-atrmsg.patch Log Message: * Mon Mar 6 2006 Ville Skytt?? - 1.4.1-3 - Update smartcard_list.txt to 20060305. - Fix some ATR_analysis messages. pcsc-tools-1.4.1-atrmsg.patch: --- NEW FILE pcsc-tools-1.4.1-atrmsg.patch --- --- ATR_analysis~ 2006-03-06 00:40:15.000000000 +0200 +++ ATR_analysis 2006-03-06 01:17:49.000000000 +0200 @@ -249,3 +249,3 @@ { - print "Programming Param P: $PI Volts, I: $I milli-Amp?res"; + print "Programming param P: $PI volts, I: $I milliamperes"; } @@ -254,3 +254,3 @@ { - print "Programming param PI2 (PI1 sould be ignored): "; + print "Programming param PI2 (PI1 should be ignored): "; if (($value>49)||($value<251)) Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pcsc-tools.spec 18 Feb 2006 13:09:01 -0000 1.2 +++ pcsc-tools.spec 6 Mar 2006 16:08:32 -0000 1.3 @@ -1,6 +1,6 @@ Name: pcsc-tools Version: 1.4.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Tools to be used with smart cards and PC/SC Group: Development/Tools @@ -9,6 +9,7 @@ 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 Source2: %{name}-gscriptor.desktop +Patch0: %{name}-1.4.1-atrmsg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -28,6 +29,7 @@ %prep %setup -q +%patch0 sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile sed -i -e 's|/usr/lib/pcsc\b|%{_datadir}/pcsc|' ATR_analysis* if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then @@ -70,6 +72,10 @@ %changelog +* Mon Mar 6 2006 Ville Skytt?? - 1.4.1-3 +- Update smartcard_list.txt to 20060305. +- Fix some ATR_analysis messages. + * Sat Feb 18 2006 Ville Skytt?? - 1.4.1-2 - Update smartcard_list.txt to 20060205. Index: smartcard_list.txt =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/smartcard_list.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- smartcard_list.txt 18 Feb 2006 13:09:01 -0000 1.2 +++ smartcard_list.txt 6 Mar 2006 16:08:32 -0000 1.3 @@ -192,6 +192,9 @@ 3B 29 00 80 72 A4 45 64 00 FF 00 10 MPCOS-3DES 8K (Gemplus) +3B 2A 00 80 65 A0 58 04 01 62 72 D6 43 + Gemplus GemCombiXplore MPCOS Pro + 3B 2A 00 80 65 A2 01 00 00 00 72 D6 41 MPCOS_EMV_1B @@ -338,6 +341,10 @@ 3B 6B 00 00 80 65 B0 83 01 03 74 83 00 90 00 Gemplus GemXpresso PRO 64 PK +3B 6B 00 00 80 65 B0 83 01 04 74 83 00 90 00 + Gemplus GXP3 64V2N + U.S. Department of Defense Common Access Card (DoD CAC) + 3B 6B .. FF 80 62 .. A2 56 46 69 6E 45 49 44 JCOP20 v2.x @@ -397,6 +404,9 @@ 3B 6F 00 00 80 31 E0 6B 04 06 03 04 40 55 55 55 55 55 55 Blue American Express Card +3B 6F 00 00 80 31 E0 6B 04 20 05 02 30 55 55 55 55 55 55 + Buypass card for Norsk Tipping (http://norsk-tipping.no) + 3B 6F 00 00 80 5A 08 03 03 00 00 00 24 22 0E E7 82 90 00 Navigo (contact mode) @@ -706,6 +716,9 @@ 3B BC 94 00 40 14 47 47 33 48 33 35 58 56 32 30 30 30 GSM SIM CARD 32K, Vodafone +3B BC 94 00 40 14 47 47 33 49 35 43 41 43 31 30 30 30 + Siemens SIM card + 3B BC 94 00 40 14 47 47 33 53 30 35 31 53 31 30 31 30 GSM SIM (Tele2, Estonia) From fedora-extras-commits at redhat.com Mon Mar 6 16:17:55 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Mon, 6 Mar 2006 11:17:55 -0500 Subject: rpms/ghdl/FC-4 ghdl-svn40.patch,NONE,1.1 ghdl.spec,1.7,1.8 Message-ID: <200603061618.k26GISqV030493@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30452 Modified Files: ghdl.spec Added Files: ghdl-svn40.patch Log Message: update to svn40 ghdl-svn40.patch: --- NEW FILE ghdl-svn40.patch --- diff -urN ghdl-0.21/vhdl/evaluation.adb ghdl-0.22dev/vhdl/evaluation.adb --- ghdl-0.21/vhdl/evaluation.adb 2005-12-11 16:32:03.000000000 +0100 +++ ghdl-0.22dev/vhdl/evaluation.adb 2006-03-06 14:10:30.000000000 +0100 @@ -836,6 +836,28 @@ return Build_Simple_Aggregate (Res_List, Orig, Res_Type); end Eval_Concatenation; + function Eval_Array_Equality (Left, Right : Iir) return Boolean + is + L_List : Iir_List; + R_List : Iir_List; + N : Natural; + begin + -- FIXME: the simple aggregates are lost. + L_List := Get_Simple_Aggregate_List (Eval_String_Literal (Left)); + R_List := Get_Simple_Aggregate_List (Eval_String_Literal (Right)); + N := Get_Nbr_Elements (L_List); + if N /= Get_Nbr_Elements (R_List) then + return False; + end if; + for I in 0 .. N - 1 loop + -- FIXME: this is wrong: (eg: evaluated lit) + if Get_Nth_Element (L_List, I) /= Get_Nth_Element (R_List, I) then + return False; + end if; + end loop; + return True; + end Eval_Array_Equality; + -- ORIG is either a dyadic operator or a function call. function Eval_Dyadic_Operator (Orig : Iir; Left, Right : Iir) return Iir @@ -1073,34 +1095,10 @@ (Get_Fp_Value (Left) / Iir_Fp64 (Get_Value (Right)), Orig); when Iir_Predefined_Array_Equality => - declare - L_List : Iir_List; - R_List : Iir_List; - R : Boolean; - N : Natural; - begin - -- FIXME: the simple aggregates are lost. - L_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Left)); - R_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Right)); - N := Get_Nbr_Elements (L_List); - if N /= Get_Nbr_Elements (R_List) then - R := False; - else - R := True; - for I in 0 .. N - 1 loop - -- FIXME: this is wrong: (eg: evaluated lit) - if Get_Nth_Element (L_List, I) - /= Get_Nth_Element (R_List, I) - then - R := False; - exit; - end if; - end loop; - end if; - return Build_Boolean (R, Orig); - end; + return Build_Boolean (Eval_Array_Equality (Left, Right), Orig); + + when Iir_Predefined_Array_Inequality => + return Build_Boolean (not Eval_Array_Equality (Left, Right), Orig); when Iir_Predefined_Array_Sll | Iir_Predefined_Array_Srl @@ -1111,8 +1109,7 @@ return Eval_Shift_Operator (Eval_String_Literal (Left), Right, Orig, Func); - when Iir_Predefined_Array_Inequality - | Iir_Predefined_Array_Less + when Iir_Predefined_Array_Less | Iir_Predefined_Array_Less_Equal | Iir_Predefined_Array_Greater | Iir_Predefined_Array_Greater_Equal diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi --- ghdl-0.21/vhdl/ghdl.texi 2005-12-12 03:21:55.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdl.texi 2006-03-06 14:10:12.000000000 +0100 @@ -4,10 +4,14 @@ @settitle GHDL guide @c %**end of header + at direntry +* ghdl: (ghdl). VHDL compiler. + at end direntry + @titlepage @title GHDL guide @subtitle GHDL, a VHDL compiler - at subtitle For GHDL version 0.21 (Sokcho edition) + at subtitle For GHDL version 0.22 (Sokcho edition) @author Tristan Gingold @c The following two commands start the copyright page. @page diff -urN ghdl-0.21/vhdl/grt/config/linux.c ghdl-0.22dev/vhdl/grt/config/linux.c --- ghdl-0.21/vhdl/grt/config/linux.c 2005-12-12 03:29:26.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/linux.c 2006-03-06 14:10:20.000000000 +0100 @@ -189,7 +189,12 @@ #endif /* Context for the main stack. */ -static __thread struct stack_context main_stack_context; +#ifdef USE_THREADS +#define THREAD __thread +#else +#define THREAD +#endif +static THREAD struct stack_context main_stack_context; extern void grt_set_main_stack (struct stack_context *stack); diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c --- ghdl-0.21/vhdl/grt/config/win32.c 2005-12-12 03:39:16.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/win32.c 2006-03-06 14:10:20.000000000 +0100 @@ -1,5 +1,5 @@ -/* GRT stack implementation for Win32 - Copyright (C) 2004, 2005 Felix Bertram. +/* GRT stack implementation for Win32 using fibers. + Copyright (C) 2005 Tristan Gingold. GHDL 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 @@ -16,139 +16,74 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -//----------------------------------------------------------------------------- -// Project: GHDL - VHDL Simulator -// Description: Win32 port of stacks package -// Note: Tristan's original i386/Linux used assembly-code -// to manually switch stacks for performance reasons. -// History: 2004feb09, FB, created. -//----------------------------------------------------------------------------- #include -//#include -//#include -//#include - - -//#define INFO printf -#define INFO (void) - -// GHDL names an endless loop calling FUNC with ARG a 'stack' -// at a given time, only one stack may be 'executed' -typedef struct -{ HANDLE thread; // stack's thread - HANDLE mutex; // mutex to suspend/resume thread - void (*Func)(void*); // stack's FUNC - void* Arg; // ARG passed to FUNC -} Stack_Type_t, *Stack_Type; +#include -Stack_Type_t main_stack_context; -extern Stack_Type grt_stack_main_stack; +struct stack_type +{ + LPVOID fiber; // Win fiber. + void (*func)(void *); // Function + void *arg; // Function argument. +}; + +static struct stack_type main_stack_context; +extern void grt_set_main_stack (struct stack_type *stack); -//------------------------------------------------------------------------------ void grt_stack_init(void) -// Initialize the stacks package. -// This may adjust stack sizes. -// Must be called after grt.options.decode. -// => procedure Stack_Init; -{ INFO("grt_stack_init\n"); - INFO(" main_stack_context=0x%08x\n", &main_stack_context); - - // create event. reset event, as we are currently running - main_stack_context.mutex = CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - grt_stack_main_stack= &main_stack_context; -} - -//------------------------------------------------------------------------------ -static unsigned long __stdcall grt_stack_loop(void* pv_myStack) -{ - Stack_Type myStack= (Stack_Type)pv_myStack; - - INFO("grt_stack_loop\n"); - - INFO(" myStack=0x%08x\n", myStack); - - // block until event becomes set again. - // this happens when this stack is enabled for the first time - WaitForSingleObject(myStack->mutex, INFINITE); - - // run stack's function in endless loop - while(1) - { INFO(" call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg); - myStack->Func(myStack->Arg); - } - - // we never get here... - return 0; -} - -//------------------------------------------------------------------------------ -Stack_Type grt_stack_create(void* Func, void* Arg) -// Create a new stack, which on first execution will call FUNC with -// an argument ARG. -// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type; -{ Stack_Type newStack; - DWORD m_IDThread; // Thread's ID (dummy) - - INFO("grt_stack_create\n"); - INFO(" call 0x%08x with 0x%08x\n", Func, Arg); - - newStack= malloc(sizeof(Stack_Type_t)); - - // init function and argument - newStack->Func= Func; - newStack->Arg= Arg; - - // create event. reset event, so that thread will blocked in grt_stack_loop - newStack->mutex= CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - INFO(" newStack=0x%08x\n", newStack); - - // create thread, which executes grt_stack_loop - newStack->thread= CreateThread(NULL, // lpsa - 0, // cbStack - grt_stack_loop, // lpStartAddr - newStack, // lpvThreadParm - 0, // fdwCreate - &m_IDThread); // lpIDThread - - return newStack; -} - -//------------------------------------------------------------------------------ -void grt_stack_switch(Stack_Type To, Stack_Type From) -// Resume stack TO and save the current context to the stack pointed by -// CUR. -// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); -{ INFO("grt_stack_switch\n"); - INFO(" from 0x%08x to 0x%08x\n", From, To); - - // set 'To' event. this will make the other thread either - // - start for first time in grt_stack_loop - // - resume at WaitForSingleObject below - SetEvent(To->mutex); - - // block until 'From' event becomes set again - // as we are running, our event is reset and we block here - // when stacks are switched, with above SetEvent, we may proceed - WaitForSingleObject(From->mutex, INFINITE); -} - -//------------------------------------------------------------------------------ -void grt_stack_delete(Stack_Type Stack) -// Delete stack STACK, which must not be currently executed. -// => procedure Stack_Delete (Stack : Stack_Type); -{ INFO("grt_stack_delete\n"); +{ + main_stack_context.fiber = ConvertThreadToFiber (NULL); + if (main_stack_context.fiber == NULL) + { + fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n", + GetLastError ()); + abort (); + } + grt_set_main_stack (&main_stack_context); +} + +static VOID __stdcall +grt_stack_loop (void *v_stack) +{ + struct stack_type *stack = (struct stack_type *)v_stack; + while (1) + { + (*stack->func)(stack->arg); + } +} + +struct stack_type * +grt_stack_create (void (*func)(void *), void *arg) +{ + struct stack_type *res; + + res = malloc (sizeof (struct stack_type)); + if (res == NULL) + return NULL; + res->func = func; + res->arg = arg; + res->fiber = CreateFiber (0, &grt_stack_loop, res); + if (res->fiber == NULL) + { + free (res); + return NULL; + } + return res; +} + +void +grt_stack_switch (struct stack_type *to, struct stack_type *from) +{ + SwitchToFiber (to->fiber); +} + +void +grt_stack_delete (struct stack_type *stack) +{ + DeleteFiber (stack->fiber); + stack->fiber = NULL; } -//---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME void __gnat_raise_storage_error(void) { @@ -161,6 +96,3 @@ } #endif -//---------------------------------------------------------------------------- -// end of file - diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c --- ghdl-0.21/vhdl/grt/ghwlib.c 2005-12-07 06:29:04.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.c 2006-03-06 14:10:21.000000000 +0100 @@ -1214,16 +1214,31 @@ return 0; } +static const char * +ghw_get_lit (union ghw_type *type, int e) +{ + if (e >= type->en.nbr || e < 0) + return "??"; + else + return type->en.lits[e]; +} + +static void +ghw_disp_lit (union ghw_type *type, int e) +{ + printf ("%s (%d)", ghw_get_lit (type, e), e); +} + void ghw_disp_value (union ghw_val *val, union ghw_type *type) { switch (ghw_get_base_type (type)->kind) { case ghdl_rtik_type_b2: - printf ("%s (%d)", type->en.lits[val->b2], val->b2); + ghw_disp_lit (type, val->b2); break; case ghdl_rtik_type_e8: - printf ("%s (%d)", type->en.lits[val->e8], val->e8); + ghw_disp_lit (type, val->e8); break; case ghdl_rtik_type_i32: printf ("%d", val->i32); @@ -1582,10 +1597,14 @@ } void -ghw_disp_range (union ghw_range *rng) +ghw_disp_range (union ghw_type *type, union ghw_range *rng) { switch (rng->kind) { + case ghdl_rtik_type_e8: + printf ("%s %s %s", ghw_get_lit (type, rng->e8.left), + ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right)); + break; case ghdl_rtik_type_i32: case ghdl_rtik_type_p32: printf ("%d %s %d", @@ -1657,7 +1676,7 @@ printf ("subtype %s is ", s->name); ghw_disp_typename (h, s->base); printf (" range "); - ghw_disp_range (s->rng); + ghw_disp_range (s->base, s->rng); printf (";\n"); } break; @@ -1692,7 +1711,7 @@ { if (i != 0) printf (", "); - ghw_disp_range (a->rngs[i]); + ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]); } printf (");\n"); } diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h --- ghdl-0.21/vhdl/grt/ghwlib.h 2005-12-07 06:27:09.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.h 2006-03-06 14:10:21.000000000 +0100 @@ -390,7 +390,8 @@ const char *ghw_get_dir (int is_downto); -void ghw_disp_range (union ghw_range *rng); +/* Note: TYPE must be a base type (used only to display literals). */ +void ghw_disp_range (union ghw_type *type, union ghw_range *rng); void ghw_disp_type (struct ghw_handler *h, union ghw_type *t); diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb --- ghdl-0.21/vhdl/grt/grt-signals.adb 2005-11-18 03:13:36.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-signals.adb 2006-03-06 14:10:21.000000000 +0100 @@ -1095,15 +1095,6 @@ when others => Internal_Error ("ghdl_create_signal_attribute"); end case; --- Sig_Instance_Name := new Ghdl_Instance_Name_Type' --- (Kind => Ghdl_Name_Signal, --- Name => null, --- Parent => null, --- Brother => null, --- Sig_Mode => Mode, --- Sig_Kind => Kind_Signal_No, --- Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last), --- Sig_Type_Desc => Sig_Type); -- Note: bit and boolean are both mode_b2. Res := Create_Signal (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True), diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb --- ghdl-0.21/vhdl/grt/grt-waves.adb 2005-12-07 05:50:07.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-waves.adb 2006-03-06 14:10:21.000000000 +0100 @@ -785,6 +785,15 @@ Nbr_Scope_Signals : Natural := 0; Nbr_Dumped_Signals : Natural := 0; + -- This is only valid during write_hierarchy. + function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural + is + function To_Integer_Address is new Ada.Unchecked_Conversion + (Ghdl_Signal_Ptr, Integer_Address); + begin + return Natural (To_Integer_Address (Sig.Alink)); + end Get_Signal_Number; + procedure Write_Signal_Number (Val_Addr : Address; Val_Name : Vstring; Val_Type : Ghdl_Rti_Access) @@ -792,20 +801,28 @@ pragma Unreferenced (Val_Name); pragma Unreferenced (Val_Type); - function To_Integer_Address is new Ada.Unchecked_Conversion - (Ghdl_Signal_Ptr, Integer_Address); + Num : Natural; + function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion (Source => Integer_Address, Target => Ghdl_Signal_Ptr); Sig : Ghdl_Signal_Ptr; begin + -- Convert to signal. Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all); - if not Sig.Flags.Is_Dumped then - Sig.Flags.Is_Dumped := True; + + -- Get signal number. + Num := Get_Signal_Number (Sig); + + -- If the signal number is 0, then assign a valid signal number. + if Num = 0 then Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1; - Sig.Flink := To_Ghdl_Signal_Ptr + Sig.Alink := To_Ghdl_Signal_Ptr (Integer_Address (Nbr_Dumped_Signals)); + Num := Nbr_Dumped_Signals; end if; - Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink))); + + -- Do the real job: write the signal number. + Wave_Put_ULEB128 (Ghdl_E32 (Num)); end Write_Signal_Number; procedure Foreach_Scalar_Signal_Number is new @@ -1370,13 +1387,18 @@ Table_Initial => 32, Table_Increment => 100); + function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is + begin + return Dump_Table.Table (N); + end Get_Dump_Entry; + procedure Write_Hierarchy (Root : VhpiHandleT) is N : Natural; begin - -- Check Flink is 0. + -- Check Alink is 0. for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flink /= null then + if Sig_Table.Table (I).Alink /= null then Internal_Error ("wave.write_hierarchy"); end if; end loop; @@ -1393,15 +1415,20 @@ Wave_Put_Byte (0); Dump_Table.Set_Last (Nbr_Dumped_Signals); + for I in Dump_Table.First .. Dump_Table.Last loop + Dump_Table.Table (I) := null; + end loop; -- Save and clear. - N := 0; for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flags.Is_Dumped then - N := N + 1; + N := Get_Signal_Number (Sig_Table.Table (I)); + if N /= 0 then + if Dump_Table.Table (N) /= null then + Internal_Error ("wave.write_hierarchy(2)"); + end if; Dump_Table.Table (N) := Sig_Table.Table (I); + Sig_Table.Table (I).Alink := null; end if; - Sig_Table.Table (I).Flink := null; end loop; end Write_Hierarchy; diff -urN ghdl-0.21/vhdl/Makefile.in ghdl-0.22dev/vhdl/Makefile.in --- ghdl-0.21/vhdl/Makefile.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Makefile.in 2006-03-06 14:26:21.000000000 +0100 @@ -480,6 +480,7 @@ #GRT_USE_PTHREADS=y ifeq ($(GRT_USE_PTHREADS),y) + GRT_CFLAGS+=-DUSE_THREADS GRT_ADD_OBJS+=grt-cthreads.o GRT_EXTRA_LIB+=-lpthread endif @@ -527,7 +528,7 @@ $(CC) -c $(GRT_FLAGS) -o $@ $< linux.o: $(GRTSRCDIR)/config/linux.c - $(CC) -c $(GRT_FLAGS) -o $@ $< + $(CC) -c $(GRT_FLAGS) $(GRT_CFLAGS) -o $@ $< win32.o: $(GRTSRCDIR)/config/win32.c $(CC) -c $(GRT_FLAGS) -o $@ $< diff -urN ghdl-0.21/vhdl/parse.adb ghdl-0.22dev/vhdl/parse.adb --- ghdl-0.21/vhdl/parse.adb 2005-12-17 07:18:00.000000000 +0100 +++ ghdl-0.22dev/vhdl/parse.adb 2006-03-06 14:10:30.000000000 +0100 @@ -3540,7 +3540,7 @@ Set_Location (Res); Set_Expression (Res, Parse_Expression); - Expect (Tok_Select, "after expression"); + Expect (Tok_Select, "'select' expected after expression"); Scan.Scan; if Current_Token = Tok_Left_Paren then Target := Parse_Aggregate; @@ -3556,13 +3556,13 @@ Build_Init (Last); loop Wf_Chain := Parse_Waveform; - Expect (Tok_When, "after waveform"); + Expect (Tok_When, "'when' expected after waveform"); Scan.Scan; Assoc := Parse_Choices (Null_Iir); Set_Associated (Assoc, Wf_Chain); Append_Subchain (Last, Res, Assoc); exit when Current_Token = Tok_Semi_Colon; - Expect (Tok_Comma, "after choice"); + Expect (Tok_Comma, "',' (comma) expected after choice"); Scan.Scan; end loop; return Res; diff -urN ghdl-0.21/vhdl/sem_assocs.adb ghdl-0.22dev/vhdl/sem_assocs.adb --- ghdl-0.21/vhdl/sem_assocs.adb 2005-10-08 14:45:00.000000000 +0200 +++ ghdl-0.22dev/vhdl/sem_assocs.adb 2006-03-06 14:10:30.000000000 +0100 @@ -551,7 +551,7 @@ exit when Index_Type = Null_Iir; Chain := Get_Individual_Association_Chain (Assoc); Sem_Choices_Range - (Chain, Index_Type, True, Get_Location (Assoc), Low, High); + (Chain, Index_Type, False, Get_Location (Assoc), Low, High); Set_Individual_Association_Chain (Assoc, Chain); end loop; end Finish_Individual_Assoc_Array_Subtype; diff -urN ghdl-0.21/vhdl/sem_expr.adb ghdl-0.22dev/vhdl/sem_expr.adb --- ghdl-0.21/vhdl/sem_expr.adb 2005-12-17 07:13:37.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_expr.adb 2006-03-06 14:10:30.000000000 +0100 @@ -2278,6 +2278,7 @@ Lb := Low; Hb := High; end if; + -- Checks all values between POS and POS_MAX are handled. Pos := Eval_Pos (Lb); Pos_Max := Eval_Pos (Hb); if Pos > Pos_Max then diff -urN ghdl-0.21/vhdl/sem_names.adb ghdl-0.22dev/vhdl/sem_names.adb --- ghdl-0.21/vhdl/sem_names.adb 2005-12-11 14:50:31.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_names.adb 2006-03-06 14:10:30.000000000 +0100 @@ -1974,7 +1974,8 @@ Error_Msg_Sem ("function name is a procedure", Name); when Iir_Kind_Process_Statement - | Iir_Kind_Component_Declaration => + | Iir_Kind_Component_Declaration + | Iir_Kind_Type_Conversion => Error_Msg_Sem (Disp_Node (Prefix) & " cannot be indexed or sliced", Name); Res := Null_Iir; diff -urN ghdl-0.21/vhdl/translation.adb ghdl-0.22dev/vhdl/translation.adb --- ghdl-0.21/vhdl/translation.adb 2005-12-10 12:11:41.000000000 +0100 +++ ghdl-0.22dev/vhdl/translation.adb 2006-03-06 14:10:22.000000000 +0100 @@ -1797,15 +1797,13 @@ -- Check bounds length of L match bounds length of R. -- If L_TYPE (resp. R_TYPE) is not a thin array, then L_NODE - -- (resp. R_NODE) are not used (and may be o_lnode_null). + -- (resp. R_NODE) are not used (and may be Mnode_Null). -- If L_TYPE (resp. T_TYPE) is a fat array, then L_NODE (resp. R_NODE) - -- must be a variable pointing to the array. + -- must designate the array. procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir); -- Create a subtype range to be stored into the location pointed by @@ -8412,10 +8410,19 @@ return True; end Need_Range_Check; - procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) + procedure Check_Range_Low (Value : O_Dnode; Atype : Iir) is If_Blk : O_If_Block; begin + Open_Temp; + Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); + Chap6.Gen_Bound_Error (Null_Iir); + Finish_If_Stmt (If_Blk); + Close_Temp; + end Check_Range_Low; + + procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) is + begin if not Need_Range_Check (Expr, Atype) then return; end if; @@ -8428,20 +8435,14 @@ Chap6.Gen_Bound_Error (Expr); end if; else - Open_Temp; - Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); - Chap6.Gen_Bound_Error (Null_Iir); - Finish_If_Stmt (If_Blk); - Close_Temp; + Check_Range_Low (Value, Atype); end if; end Check_Range; procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir) is L_Tinfo, R_Tinfo : Type_Info_Acc; @@ -8491,10 +8492,10 @@ exit when Index = Null_Iir; Sub_Cond := New_Compare_Op (ON_Neq, - Chap6.Get_Array_Ptr_Bound_Length (L_Node, L_Type, - I + 1, L_Mode), - Chap6.Get_Array_Ptr_Bound_Length (R_Node, R_Type, - I + 1, R_Mode), + M2E (Range_To_Length + (Get_Array_Range (L_Node, L_Type, I + 1))), + M2E (Range_To_Length + (Get_Array_Range (R_Node, R_Type, I + 1))), Ghdl_Bool_Type); if I = 0 then Cond := Sub_Cond; @@ -10081,8 +10082,8 @@ New_Assign_Stmt (Get_Var (Alias_Info.Alias_Var), New_Value (M2Lp (Chap3.Get_Array_Base (Name_Node)))); - Chap3.Check_Array_Match (Decl_Type, O_Lnode_Null, Kind, - Name_Type, M2Lp (Name_Node), Kind, + Chap3.Check_Array_Match (Decl_Type, T2M (Decl_Type, Kind), + Name_Type, Name_Node, Decl); Close_Temp; when Type_Mode_Scalar => @@ -11691,6 +11692,16 @@ end; end if; + if Get_Kind (Formal_Type) in Iir_Kinds_Array_Type_Definition + then + -- Check length matches. + Stabilize (Formal_Node); + Stabilize (Actual_Node); + Chap3.Check_Array_Match (Formal_Type, Formal_Node, + Actual_Type, Actual_Node, + Assoc); + end if; + Data := (Actual_Node => Actual_Node, Actual_Type => Actual_Type, Mode => Mode, @@ -14420,8 +14431,8 @@ E := Create_Temp_Init (T_Info.Ortho_Ptr_Type (Mode_Value), Val); Chap3.Check_Array_Match - (Target_Type, M2Lp (T), Mode_Value, - Get_Type (Expr), New_Obj (E), Mode_Value, + (Target_Type, T, + Get_Type (Expr), Dp2M (E, T_Info, Mode_Value), Null_Iir); Chap3.Translate_Object_Copy (T, New_Obj_Value (E), Target_Type); @@ -15169,9 +15180,10 @@ begin E := Create_Temp_Init (Expr_Info.Ortho_Ptr_Type (Mode_Value), Expr); - Chap3.Check_Array_Match (Res_Type, O_Lnode_Null, Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, T2M (Res_Type, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); return New_Convert_Ov (New_Value (Chap3.Get_Array_Ptr_Base_Ptr (New_Obj (E), Expr_Type, Mode_Value)), @@ -15199,9 +15211,10 @@ Chap3.Get_Array_Bounds_Ptr (O_Lnode_Null, Expr_Type, Mode_Value)); -- Check array match. - Chap3.Check_Array_Match (Res_Type, New_Obj (Res), Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, Dv2M (Res, Res_Info, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); Close_Temp; return New_Address (New_Obj (Res), Res_Info.Ortho_Ptr_Type (Mode_Value)); @@ -22283,19 +22296,58 @@ function Translate_Val_Attribute (Attr : Iir) return O_Enode is - T : O_Dnode; - Prefix : Iir; - Ttype : O_Tnode; + Val : O_Enode; + Attr_Type : Iir; + Res_Var : O_Dnode; + Res_Type : O_Tnode; begin - Prefix := Get_Type (Attr); - Ttype := Get_Ortho_Type (Prefix, Mode_Value); - T := Create_Temp (Ttype); - New_Assign_Stmt - (New_Obj (T), - New_Convert_Ov (Chap7.Translate_Expression (Get_Parameter (Attr)), - Ttype)); - Chap3.Check_Range (T, Attr, Get_Type (Get_Prefix (Attr))); - return New_Obj_Value (T); + Attr_Type := Get_Type (Attr); + Res_Type := Get_Ortho_Type (Attr_Type, Mode_Value); + Res_Var := Create_Temp (Res_Type); + Val := Chap7.Translate_Expression (Get_Parameter (Attr)); + + case Get_Kind (Attr_Type) is + when Iir_Kind_Enumeration_Type_Definition + | Iir_Kind_Enumeration_Subtype_Definition => + -- For enumeration, always check the value is in the enum + -- range. + declare + Val_Type : O_Tnode; + Val_Var : O_Dnode; + If_Blk : O_If_Block; + begin + Val_Type := Get_Ortho_Type (Get_Type (Get_Parameter (Attr)), + Mode_Value); + Val_Var := Create_Temp_Init (Val_Type, Val); + Start_If_Stmt + (If_Blk, + New_Dyadic_Op + (ON_Or, + New_Compare_Op (ON_Lt, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, 0)), + Ghdl_Bool_Type), + New_Compare_Op (ON_Ge, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, + Integer_64 + (Get_Nbr_Elements + (Get_Enumeration_Literal_List + (Attr_Type))))), + Ghdl_Bool_Type))); + Chap6.Gen_Bound_Error (Attr); + Finish_If_Stmt (If_Blk); + Val := New_Obj_Value (Val_Var); + end; + when others => + null; + end case; + + New_Assign_Stmt (New_Obj (Res_Var), New_Convert_Ov (Val, Res_Type)); + Chap3.Check_Range (Res_Var, Attr, Get_Type (Get_Prefix (Attr))); + return New_Obj_Value (Res_Var); end Translate_Val_Attribute; function Translate_Pos_Attribute (Attr : Iir; Res_Type : Iir) diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads --- ghdl-0.21/vhdl/version.ads 2005-12-18 14:07:38.000000000 +0100 +++ ghdl-0.22dev/vhdl/version.ads 2006-03-06 14:10:30.000000000 +0100 @@ -1,4 +1,4 @@ package Version is Ghdl_Version : constant String := - "GHDL 0.21 (20051218) [Sokcho edition]"; + "GHDL 0.22dev (20051220) [Sokcho edition]"; end Version; Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/FC-4/ghdl.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ghdl.spec 16 Feb 2006 08:46:52 -0000 1.7 +++ ghdl.spec 6 Mar 2006 16:17:54 -0000 1.8 @@ -4,7 +4,7 @@ Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.39svn.0%{?dist} +Release: 0.40svn.0%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -14,7 +14,7 @@ # ./dist.sh sources Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2 -Patch0: ghdl-svn39.patch +Patch0: ghdl-svn40.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo Requires(post): /sbin/install-info @@ -215,6 +215,10 @@ %{_libexecdir}/gcc/ %changelog +* Mon Mar 6 2006 Thomas Sailer - 0.22-0.40svn.0 +- update to svn40, to fix an array bounds checking bug apparently + introduced in svn39 + * Thu Feb 16 2006 Thomas Sailer - 0.22-0.39svn.0 - update to svn39, to fix some constant bugs From fedora-extras-commits at redhat.com Mon Mar 6 16:23:01 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 11:23:01 -0500 Subject: rpms/powermanga/devel powermanga.spec,1.10,1.11 Message-ID: <200603061623.k26GNXg1030543@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/powermanga/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30524 Modified Files: powermanga.spec Log Message: Default to modular X for non Fedora systems. Index: powermanga.spec =================================================================== RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- powermanga.spec 6 Mar 2006 15:16:01 -0000 1.10 +++ powermanga.spec 6 Mar 2006 16:23:01 -0000 1.11 @@ -10,9 +10,8 @@ Patch0: powermanga-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils -# Use monolithic X up to FC4, and modular X for FC5+ -%if 0%{?fedora} < 5 -%else +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libXxf86dga-devel, libXxf86vm-devel %endif From fedora-extras-commits at redhat.com Mon Mar 6 16:34:51 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 11:34:51 -0500 Subject: rpms/djvulibre/devel djvulibre-3.5.16-extraqualif.patch, NONE, 1.1 djvulibre.spec, 1.13, 1.14 Message-ID: <200603061635.k26GZRwT030602@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30580 Modified Files: djvulibre.spec Added Files: djvulibre-3.5.16-extraqualif.patch Log Message: Work in progress to build for FC5, but there are still some errors to fix. djvulibre-3.5.16-extraqualif.patch: --- NEW FILE djvulibre-3.5.16-extraqualif.patch --- diff -Naupr djvulibre-3.5.16.orig/libdjvu/ByteStream.h djvulibre-3.5.16/libdjvu/ByteStream.h --- djvulibre-3.5.16.orig/libdjvu/ByteStream.h 2003-11-07 23:08:20.000000000 +0100 +++ djvulibre-3.5.16/libdjvu/ByteStream.h 2006-01-30 11:22:17.000000000 +0100 @@ -242,7 +242,7 @@ public: and writes it to the specified stream. */ void formatmessage( const char *fmt, ... ); /** Looks up the message and writes it to the specified stream. */ - void ByteStream::writemessage( const char *message ); + void writemessage( const char *message ); /** Writes a one-byte integer to a ByteStream. */ void write8 (unsigned int card8); /** Writes a two-bytes integer to a ByteStream. diff -Naupr djvulibre-3.5.16.orig/libdjvu/GURL.h djvulibre-3.5.16/libdjvu/GURL.h --- djvulibre-3.5.16.orig/libdjvu/GURL.h 2003-11-07 23:08:21.000000000 +0100 +++ djvulibre-3.5.16/libdjvu/GURL.h 2006-01-30 11:18:17.000000000 +0100 @@ -278,10 +278,10 @@ public: //@} /// Returns TRUE if #gurl1# and #gurl2# are the same - bool GURL::operator==(const GURL & gurl2) const; + bool operator==(const GURL & gurl2) const; /// Returns TRUE if #gurl1# and #gurl2# are different - bool GURL::operator!=(const GURL & gurl2) const; + bool operator!=(const GURL & gurl2) const; /// Assignment operator GURL & operator=(const GURL & url); Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- djvulibre.spec 6 Mar 2006 15:53:08 -0000 1.13 +++ djvulibre.spec 6 Mar 2006 16:34:50 -0000 1.14 @@ -1,15 +1,21 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre -Version: 3.5.15 -Release: 3%{?dist} +Version: 3.5.16 +Release: 1%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz -Patch0: djvulibre-3.5.15-gcc401.patch +Patch0: djvulibre-3.5.16-extraqualif.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: xorg-x11-devel, qt-devel, libjpeg-devel, libtiff-devel +BuildRequires: qt-devel, libjpeg-devel, libtiff-devel BuildRequires: mozilla, redhat-menus, hicolor-icon-theme +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libXt-devel +%else +BuildRequires: xorg-x11-devel +%endif # Provide these here, they're so small, it's not worth splitting them out Provides: mozilla-djvulibre = %{version}-%{release} Provides: djvulibre-devel = %{version}-%{release} @@ -32,7 +38,7 @@ %prep %setup -%patch0 -p1 -b .gcc401 +%patch0 -p1 -b .extraqualif %build @@ -96,9 +102,15 @@ %changelog -* Mon Mar 6 2006 Matthias Saou 3.5.15-3 +* Mon Mar 6 2006 Matthias Saou 3.5.16-2 - FC5 rebuild. +* Mon Jan 30 2006 Matthias Saou 3.5.16-1 +- Update to 3.5.16. +- Add conditional to build with/without modular X depending on FC version. +- Remove no longer needed gcc4 patch. +- Add extra qualification patch. + * Thu Aug 4 2005 Matthias Saou 3.5.15-2 - Include djvulibre-3.5.15-gcc401.patch to fix compilation with gcc 4.0.1. - Add hicolor-icon-theme build req for /usr/share/icons/hicolor/48x48/mimetypes From fedora-extras-commits at redhat.com Mon Mar 6 16:40:53 2006 From: fedora-extras-commits at redhat.com (Alexander Larsson (alexl)) Date: Mon, 6 Mar 2006 11:40:53 -0500 Subject: rpms/sabayon/devel sabayon-2.12.3-xinit.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 sabayon.spec, 1.18, 1.19 sources, 1.9, 1.10 Message-ID: <200603061641.k26GfQF4030683@cvs-int.fedora.redhat.com> Author: alexl Update of /cvs/extras/rpms/sabayon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30658 Modified Files: .cvsignore sabayon.spec sources Added Files: sabayon-2.12.3-xinit.patch Log Message: * Mon Mar 6 2006 Alexander Larsson - 2.12.3-1 - update to 2.12.3 - Fix Xnest dependency with modular X - Fix Xsession script being moved in FC5 - Remove sabayon.schema from doc, as it wasn't in this release sabayon-2.12.3-xinit.patch: --- NEW FILE sabayon-2.12.3-xinit.patch --- Index: configure.ac =================================================================== RCS file: /cvs/gnome/sabayon/configure.ac,v retrieving revision 1.65 diff -u -p -r1.65 configure.ac --- configure.ac 6 Mar 2006 08:24:40 -0000 1.65 +++ configure.ac 6 Mar 2006 16:28:36 -0000 @@ -108,7 +108,7 @@ if test "x$with_distro" = "x"; then else case $with_distro in redhat) - XSESSION="/etc/X11/xdm/Xsession" + AC_CHECK_FILE(/etc/X11/xinit/Xsession, XSESSION="/etc/X11/xinit/Xsession", XSESSION="/etc/X11/xdm/Xsession") SESSION_NAME="gnome" install_xinitrc_script="yes" XINITRC_SYSCONFDIR="X11/xinit/xinitrc.d" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 17 Nov 2005 13:27:33 -0000 1.9 +++ .cvsignore 6 Mar 2006 16:40:53 -0000 1.10 @@ -1,3 +1 @@ -sabayon-2.12.0.tar.gz -sabayon-2.12.1.tar.bz2 -sabayon-2.12.2.tar.bz2 +sabayon-2.12.3.tar.bz2 Index: sabayon.spec =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- sabayon.spec 17 Nov 2005 14:25:40 -0000 1.18 +++ sabayon.spec 6 Mar 2006 16:40:53 -0000 1.19 @@ -13,8 +13,8 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_pytho\n_lib()")} Name: sabayon -Version: 2.12.2 -Release: 2 +Version: 2.12.3 +Release: 1 Summary: Tool to maintain user profiles in a GNOME desktop Group: Applications/System @@ -24,6 +24,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: sabayon-2.12.3-xinit.patch + Requires: python-abi = %{pyver} Requires: gamin-python Requires: libxml2-python @@ -38,6 +40,7 @@ BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: usermode +BuildRequires: xorg-x11-server-Xnest Requires(post): shadow-utils Requires(preun): shadow-utils @@ -54,7 +57,7 @@ Group: Applications/System Requires: %{name} = %{version}-%{release} -Requires: Xnest +Requires: xorg-x11-server-Xnest Requires: shadow-utils %description admin @@ -64,7 +67,13 @@ %prep %setup -q +%patch1 -p0 -b .xinit + + %build +#needed for patch 1 (xinit fix) +autoconf + %configure \ --enable-consolehelper=yes \ --with-prototype-user=%{name}-admin @@ -119,7 +128,8 @@ %files -f sabayon.lang %defattr(-, root, root, 755) -%doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES sabayon.schema +%doc AUTHORS ChangeLog.gz NEWS README TODO ISSUES +# Wasn't in tarball for 2.12.3: sabayon.schema %config(noreplace) %{_sysconfdir}/gconf/2/local-defaults.path %config(noreplace) %{_sysconfdir}/gconf/2/local-mandatory.path @@ -176,6 +186,12 @@ %{python_sitelib}/%{name}/lockdown %changelog +* Mon Mar 6 2006 Alexander Larsson - 2.12.3-1 +- update to 2.12.3 +- Fix Xnest dependency with modular X +- Fix Xsession script being moved in FC5 +- Remove sabayon.schema from doc, as it wasn't in this release + * Thu Nov 17 2005 Alexander Larsson - 2.12.2-2 - Update to 2.12.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 17 Nov 2005 13:27:33 -0000 1.9 +++ sources 6 Mar 2006 16:40:53 -0000 1.10 @@ -1 +1 @@ -3d3e0a543a25b439023abd9abede6ac4 sabayon-2.12.2.tar.bz2 +259b56fecdba0cb5d2c93f2999d04900 sabayon-2.12.3.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 6 17:00:09 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:00:09 -0500 Subject: rpms/libupnp import.log,1.4,1.5 Message-ID: <200603061700.k26H0gjH030890@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30856 Modified Files: import.log Log Message: auto-import libupnp-1.3.1-1 on branch devel from libupnp-1.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libupnp/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 14 Feb 2006 21:53:22 -0000 1.4 +++ import.log 6 Mar 2006 17:00:09 -0000 1.5 @@ -1,3 +1,4 @@ libupnp-1_2_1a-4:HEAD:libupnp-1.2.1a-4.src.rpm:1137746395 libupnp-1_2_1a-5:HEAD:libupnp-1.2.1a-5.src.rpm:1139607771 libupnp-1_2_1a-6:HEAD:libupnp-1.2.1a-6.src.rpm:1139953991 +libupnp-1_3_1-1:HEAD:libupnp-1.3.1-1.src.rpm:1141664399 From fedora-extras-commits at redhat.com Mon Mar 6 17:00:15 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:00:15 -0500 Subject: rpms/libupnp/devel .cvsignore, 1.2, 1.3 libupnp.spec, 1.3, 1.4 sources, 1.2, 1.3 libupnp_dsm_320.patch, 1.1, NONE libupnp_ixml_FC4.patch, 1.1, NONE libupnp_performance.patch, 1.1, NONE Message-ID: <200603061700.k26H0lJe030895@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30856/devel Modified Files: .cvsignore libupnp.spec sources Removed Files: libupnp_dsm_320.patch libupnp_ixml_FC4.patch libupnp_performance.patch Log Message: auto-import libupnp-1.3.1-1 on branch devel from libupnp-1.3.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libupnp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jan 2006 08:40:11 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:00:15 -0000 1.3 @@ -1 +1 @@ -libupnp-1.2.1a.tar.gz +libupnp-1.3.1.tar.gz Index: libupnp.spec =================================================================== RCS file: /cvs/extras/rpms/libupnp/devel/libupnp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libupnp.spec 14 Feb 2006 21:53:28 -0000 1.3 +++ libupnp.spec 6 Mar 2006 17:00:15 -0000 1.4 @@ -1,14 +1,11 @@ -Version: 1.2.1a +Version: 1.3.1 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 6%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://upnp.sourceforge.net/ Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz -Patch0: libupnp_dsm_320.patch -Patch1: libupnp_ixml_FC4.patch -Patch2: libupnp_performance.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -28,61 +25,46 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 chmod 644 {LICENSE,README} -# Fix permissions for files in debuginfo package -find . -name '*.[ch]' | xargs chmod 644 - -# Fix libupnp.so symlink -sed -i -e 's#ln -s \$(PREFIX)/usr/lib/libupnp\.so#ln -s libupnp.so#' upnp/makefile - -# Remove -Os optflag and add RPM optflags in makefiles -# Install libraries in correct directories -find . -name '[Mm]akefile' | xargs sed -i \ - -e 's/^\([[:space:]]*CFLAGS .*\) -Os/\1/' \ - -e 's/^\([[:space:]]*DEBUG_FLAGS .*\) -Os/\1/' \ - -e 's/^[[:space:]]*CFLAGS .*/& $(RPM_OPT_FLAGS)/' \ - -e 's#/usr/lib\([/ ;]\)#%{_libdir}\1#g' \ - -e 's#/usr/lib$#%{_libdir}#g' - %build -make -C upnp STRIP="echo Not stripping" %{?_smp_mflags} +%configure +make %{?_smp_mflags} %install rm -rf %{buildroot} +%makeinstall -## Install libupnp.so and headers -make -C upnp PREFIX=%{buildroot} install - -## Install libixml.so and headers -make -C ixml PREFIX=%{buildroot} install -install -p ixml/inc/ixml.h %{buildroot}%{_includedir}/upnp - -## Install libthreadutil.so and headers -make -C threadutil PREFIX=%{buildroot} install - +rm %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc LICENSE README -%{_libdir}/libixml.so* -%{_libdir}/libthreadutil.so* -%{_libdir}/libupnp.so* +%doc LICENSE README NEWS +%{_libdir}/libixml.so.* +%{_libdir}/libthreadutil.so.* +%{_libdir}/libupnp.so.* %files devel %defattr(0644,root,root,0755) %{_includedir}/upnp/ +%{_libdir}/libixml.so +%{_libdir}/libthreadutil.so +%{_libdir}/libupnp.so +%{_libdir}/libixml.a +%{_libdir}/libthreadutil.a +%{_libdir}/libupnp.a +%{_libdir}/pkgconfig/libupnp.pc %clean rm -rf %{buildroot} %changelog +* Sun Mar 05 2006 Eric Tanguy - 1.3.1-1 +- Update to 1.3.1 + * Tue Feb 14 2006 Eric Tanguy - 1.2.1a-6 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libupnp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jan 2006 08:40:11 -0000 1.2 +++ sources 6 Mar 2006 17:00:15 -0000 1.3 @@ -1 +1 @@ -e72b3550bf064eedf080f16f09688891 libupnp-1.2.1a.tar.gz +6646be5e31e58188e8f47c6ce64faa4c libupnp-1.3.1.tar.gz --- libupnp_dsm_320.patch DELETED --- --- libupnp_ixml_FC4.patch DELETED --- --- libupnp_performance.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 17:03:14 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:03:14 -0500 Subject: rpms/libupnp import.log,1.5,1.6 Message-ID: <200603061703.k26H3kkS000402@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv348 Modified Files: import.log Log Message: auto-import libupnp-1.3.1-1 on branch FC-3 from libupnp-1.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libupnp/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 6 Mar 2006 17:00:09 -0000 1.5 +++ import.log 6 Mar 2006 17:03:14 -0000 1.6 @@ -2,3 +2,4 @@ libupnp-1_2_1a-5:HEAD:libupnp-1.2.1a-5.src.rpm:1139607771 libupnp-1_2_1a-6:HEAD:libupnp-1.2.1a-6.src.rpm:1139953991 libupnp-1_3_1-1:HEAD:libupnp-1.3.1-1.src.rpm:1141664399 +libupnp-1_3_1-1:FC-3:libupnp-1.3.1-1.src.rpm:1141664572 From fedora-extras-commits at redhat.com Mon Mar 6 17:03:21 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:03:21 -0500 Subject: rpms/libupnp/FC-3 .cvsignore, 1.2, 1.3 libupnp.spec, 1.1, 1.2 sources, 1.2, 1.3 libupnp_dsm_320.patch, 1.1, NONE libupnp_ixml_FC4.patch, 1.1, NONE libupnp_performance.patch, 1.1, NONE Message-ID: <200603061703.k26H3rr2000412@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv348/FC-3 Modified Files: .cvsignore libupnp.spec sources Removed Files: libupnp_dsm_320.patch libupnp_ixml_FC4.patch libupnp_performance.patch Log Message: auto-import libupnp-1.3.1-1 on branch FC-3 from libupnp-1.3.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jan 2006 08:40:11 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:03:20 -0000 1.3 @@ -1 +1 @@ -libupnp-1.2.1a.tar.gz +libupnp-1.3.1.tar.gz Index: libupnp.spec =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-3/libupnp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libupnp.spec 20 Jan 2006 08:40:11 -0000 1.1 +++ libupnp.spec 6 Mar 2006 17:03:20 -0000 1.2 @@ -1,14 +1,11 @@ -Version: 1.2.1a +Version: 1.3.1 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://upnp.sourceforge.net/ Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz -Patch0: libupnp_dsm_320.patch -Patch1: libupnp_ixml_FC4.patch -Patch2: libupnp_performance.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -28,61 +25,52 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 chmod 644 {LICENSE,README} -# Fix permissions for files in debuginfo package -find . -name '*.[ch]' | xargs chmod 644 - -# Fix libupnp.so symlink -sed -i -e 's#ln -s \$(PREFIX)/usr/lib/libupnp\.so#ln -s libupnp.so#' upnp/makefile - -# Remove -Os optflag and add RPM optflags in makefiles -# Install libraries in correct directories -find . -name '[Mm]akefile' | xargs sed -i \ - -e 's/^\([[:space:]]*CFLAGS .*\) -Os/\1/' \ - -e 's/^\([[:space:]]*DEBUG_FLAGS .*\) -Os/\1/' \ - -e 's/^[[:space:]]*CFLAGS .*/& $(RPM_OPT_FLAGS)/' \ - -e 's#/usr/lib\([/ ;]\)#%{_libdir}\1#g' \ - -e 's#/usr/lib$#%{_libdir}#g' - %build -make -C upnp STRIP="echo Not stripping" %{?_smp_mflags} +%configure +make %{?_smp_mflags} %install rm -rf %{buildroot} +%makeinstall -## Install libupnp.so and headers -make -C upnp PREFIX=%{buildroot} install - -## Install libixml.so and headers -make -C ixml PREFIX=%{buildroot} install -install -p ixml/inc/ixml.h %{buildroot}%{_includedir}/upnp - -## Install libthreadutil.so and headers -make -C threadutil PREFIX=%{buildroot} install - +rm %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc LICENSE README -%{_libdir}/libixml.so* -%{_libdir}/libthreadutil.so* -%{_libdir}/libupnp.so* +%doc LICENSE README NEWS +%{_libdir}/libixml.so.* +%{_libdir}/libthreadutil.so.* +%{_libdir}/libupnp.so.* %files devel %defattr(0644,root,root,0755) %{_includedir}/upnp/ +%{_libdir}/libixml.so +%{_libdir}/libthreadutil.so +%{_libdir}/libupnp.so +%{_libdir}/libixml.a +%{_libdir}/libthreadutil.a +%{_libdir}/libupnp.a +%{_libdir}/pkgconfig/libupnp.pc %clean rm -rf %{buildroot} %changelog +* Sun Mar 05 2006 Eric Tanguy - 1.3.1-1 +- Update to 1.3.1 + +* Tue Feb 14 2006 Eric Tanguy - 1.2.1a-6 +- Rebuild for FC5 + +* Fri Feb 10 2006 Eric Tanguy - 1.2.1a-5 +- Rebuild for FC5 + * Mon Jan 9 2006 Eric Tanguy 1.2.1a-4 - Include libupnp.so symlink in package to take care of non versioning of libupnp.so.1.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jan 2006 08:40:11 -0000 1.2 +++ sources 6 Mar 2006 17:03:21 -0000 1.3 @@ -1 +1 @@ -e72b3550bf064eedf080f16f09688891 libupnp-1.2.1a.tar.gz +6646be5e31e58188e8f47c6ce64faa4c libupnp-1.3.1.tar.gz --- libupnp_dsm_320.patch DELETED --- --- libupnp_ixml_FC4.patch DELETED --- --- libupnp_performance.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 17:03:39 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:03:39 -0500 Subject: rpms/viruskiller/devel viruskiller-1.0-makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 viruskiller.spec, 1.8, 1.9 viruskiller-0.9-makefile.patch, 1.1, NONE viruskiller-0.9-zzip.patch, 1.1, NONE Message-ID: <200603061704.k26H4CkM000447@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/viruskiller/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv370 Modified Files: .cvsignore sources viruskiller.spec Added Files: viruskiller-1.0-makefile.patch Removed Files: viruskiller-0.9-makefile.patch viruskiller-0.9-zzip.patch Log Message: Update to 1.0-1. viruskiller-1.0-makefile.patch: --- NEW FILE viruskiller-1.0-makefile.patch --- diff -Naupr viruskiller-1.0.orig/makefile viruskiller-1.0/makefile --- viruskiller-1.0.orig/makefile 2005-05-21 19:03:45.000000000 +0200 +++ viruskiller-1.0/makefile 2006-03-06 17:47:30.000000000 +0100 @@ -7,18 +7,16 @@ VERSION = 1.0 RELEASE = 1 USEPAK = 1 -PREFIX=$(DESTDIR)/usr +PREFIX = $(DESTDIR)/usr BINDIR = $(PREFIX)/games/ -DATADIR = $(PREFIX)/share/games/parallelrealities/ -DOCDIR = $(PREFIX)/share/doc/$(PROG)-$(VERSION)-$(RELEASE)/ -ICONDIR = $(PREFIX)/share/icons/ -KDE = $(PREFIX)/share/applnk/Games/Arcade/ -GNOME = $(PREFIX)/share/gnome/apps/Games/ +DATADIR = $(PREFIX)/share/games/viruskiller/ +ICONDIR = $(PREFIX)/share/pixmaps/ +GNOME = $(PREFIX)/share/applications/ SAFEDIR = /tmp/ -CFLAGS += `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) -CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DSAFEDIR=\"$(SAFEDIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DOCDIR)manual.html\" -Wall +CFLAGS += $(OPTFLAGS) `sdl-config --cflags` -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DUSEPAK=$(USEPAK) +CFLAGS += -DPAKNAME=\"$(PAKNAME)\" -DPAKLOCATION=\"$(DATADIR)\" -DSAFEDIR=\"$(SAFEDIR)\" -DUNIX -DGAMEPLAYMANUAL=\"$(DATADIR)manual.html\" LIBS = `sdl-config --libs` -lSDL_mixer -lSDL_image -lSDL_ttf OBJS += CAudio.o @@ -77,19 +75,10 @@ install: ./pak data gfx music sound $(PAKNAME) mkdir -p $(BINDIR) mkdir -p $(DATADIR) - mkdir -p $(DOCDIR) mkdir -p $(ICONDIR) - mkdir -p $(ICONDIR)mini - mkdir -p $(ICONDIR)large - mkdir -p $(KDE) mkdir -p $(GNOME) - strip $(PROG) - install -o root -g games -m 755 $(PROG) $(BINDIR)$(PROG) - install -o root -g games -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME) - cp $(DOCS) $(DOCDIR) + install -m 755 $(PROG) $(BINDIR)$(PROG) + install -m 644 $(PAKNAME) $(DATADIR)$(PAKNAME) cp $(ICONS)$(PROG).png $(ICONDIR) - cp $(ICONS)$(PROG)-mini.png $(ICONDIR)mini/$(PROG).png - cp $(ICONS)$(PROG)-large.png $(ICONDIR)large/$(PROG).png - cp $(ICONS)$(PROG).desktop $(KDE) cp $(ICONS)$(PROG).desktop $(GNOME) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/viruskiller/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Nov 2004 02:51:06 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:03:39 -0000 1.3 @@ -1 +1 @@ -viruskiller-0.9-1.tar.gz +viruskiller-1.0-1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/viruskiller/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Nov 2004 02:51:06 -0000 1.2 +++ sources 6 Mar 2006 17:03:39 -0000 1.3 @@ -1 +1 @@ -5dd118cce987cf0cea027f5960bd53e1 viruskiller-0.9-1.tar.gz +de7c78b3abdb4ff488943d78a94f5bb1 viruskiller-1.0-1.tar.gz Index: viruskiller.spec =================================================================== RCS file: /cvs/extras/rpms/viruskiller/devel/viruskiller.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- viruskiller.spec 6 Mar 2006 15:04:42 -0000 1.8 +++ viruskiller.spec 6 Mar 2006 17:03:39 -0000 1.9 @@ -1,17 +1,16 @@ Summary: Frantic shooting game where viruses invade your computer Name: viruskiller -Version: 0.9 -Release: 7%{?dist} +Version: 1.0 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://www.parallelrealities.co.uk/virusKiller.php # No absolute URL since the home page tunnels it through a PHP script Source: viruskiller-%{version}-1.tar.gz -Patch0: viruskiller-0.9-makefile.patch -Patch1: viruskiller-0.9-zzip.patch +Patch0: viruskiller-1.0-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: SDL-devel, SDL_mixer-devel, SDL_image-devel, SDL_ttf-devel -BuildRequires: zziplib-devel, desktop-file-utils +BuildRequires: zlib-devel, desktop-file-utils %description Your computer has been invaded! Dozens of little viruses are pouring in via @@ -26,7 +25,6 @@ %prep %setup %patch0 -p1 -b .makefile -%patch1 -p1 -b .zzip %build @@ -68,14 +66,17 @@ %defattr(-, root, root, 0755) %doc doc/* %{_prefix}/games/viruskiller -%{_prefix}/share/games/viruskiller +%{_prefix}/share/games/viruskiller/ %{_datadir}/pixmaps/viruskiller.png %{_datadir}/applications/*%{name}.desktop %changelog -* Mon Mar 6 2006 Matthias Saou 0.9-7 -- FC5 rebuild. +* Mon Mar 6 2006 Matthias Saou 1.0-1 +- Update to 1.0-1. +- Update makefile patch. +- Remove no longer needed zziplib patch. +- No longer build require zziplib-devel, but zlib-devel instead. * Thu Feb 9 2006 Matthias Saou 0.9-6 - Rebuild for new gcc/glibc. --- viruskiller-0.9-makefile.patch DELETED --- --- viruskiller-0.9-zzip.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 17:05:45 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:05:45 -0500 Subject: rpms/libupnp import.log,1.6,1.7 Message-ID: <200603061706.k26H6Hdn000591@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv541 Modified Files: import.log Log Message: auto-import libupnp-1.3.1-1 on branch FC-4 from libupnp-1.3.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libupnp/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 6 Mar 2006 17:03:14 -0000 1.6 +++ import.log 6 Mar 2006 17:05:45 -0000 1.7 @@ -3,3 +3,4 @@ libupnp-1_2_1a-6:HEAD:libupnp-1.2.1a-6.src.rpm:1139953991 libupnp-1_3_1-1:HEAD:libupnp-1.3.1-1.src.rpm:1141664399 libupnp-1_3_1-1:FC-3:libupnp-1.3.1-1.src.rpm:1141664572 +libupnp-1_3_1-1:FC-4:libupnp-1.3.1-1.src.rpm:1141664718 From fedora-extras-commits at redhat.com Mon Mar 6 17:05:53 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:05:53 -0500 Subject: rpms/libupnp/FC-4 .cvsignore, 1.2, 1.3 libupnp.spec, 1.1, 1.2 sources, 1.2, 1.3 libupnp_dsm_320.patch, 1.1, NONE libupnp_ixml_FC4.patch, 1.1, NONE libupnp_performance.patch, 1.1, NONE Message-ID: <200603061706.k26H6Pvd000599@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/libupnp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv541/FC-4 Modified Files: .cvsignore libupnp.spec sources Removed Files: libupnp_dsm_320.patch libupnp_ixml_FC4.patch libupnp_performance.patch Log Message: auto-import libupnp-1.3.1-1 on branch FC-4 from libupnp-1.3.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Jan 2006 08:40:11 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:05:52 -0000 1.3 @@ -1 +1 @@ -libupnp-1.2.1a.tar.gz +libupnp-1.3.1.tar.gz Index: libupnp.spec =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-4/libupnp.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libupnp.spec 20 Jan 2006 08:40:11 -0000 1.1 +++ libupnp.spec 6 Mar 2006 17:05:52 -0000 1.2 @@ -1,14 +1,11 @@ -Version: 1.2.1a +Version: 1.3.1 Summary: Universal Plug and Play (UPnP) SDK Name: libupnp -Release: 4%{?dist} +Release: 1%{?dist} License: BSD Group: System Environment/Libraries URL: http://upnp.sourceforge.net/ Source: http://ovh.dl.sourceforge.net/sourceforge/upnp/%{name}-%{version}.tar.gz -Patch0: libupnp_dsm_320.patch -Patch1: libupnp_ixml_FC4.patch -Patch2: libupnp_performance.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -28,61 +25,52 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 -%patch2 -p1 chmod 644 {LICENSE,README} -# Fix permissions for files in debuginfo package -find . -name '*.[ch]' | xargs chmod 644 - -# Fix libupnp.so symlink -sed -i -e 's#ln -s \$(PREFIX)/usr/lib/libupnp\.so#ln -s libupnp.so#' upnp/makefile - -# Remove -Os optflag and add RPM optflags in makefiles -# Install libraries in correct directories -find . -name '[Mm]akefile' | xargs sed -i \ - -e 's/^\([[:space:]]*CFLAGS .*\) -Os/\1/' \ - -e 's/^\([[:space:]]*DEBUG_FLAGS .*\) -Os/\1/' \ - -e 's/^[[:space:]]*CFLAGS .*/& $(RPM_OPT_FLAGS)/' \ - -e 's#/usr/lib\([/ ;]\)#%{_libdir}\1#g' \ - -e 's#/usr/lib$#%{_libdir}#g' - %build -make -C upnp STRIP="echo Not stripping" %{?_smp_mflags} +%configure +make %{?_smp_mflags} %install rm -rf %{buildroot} +%makeinstall -## Install libupnp.so and headers -make -C upnp PREFIX=%{buildroot} install - -## Install libixml.so and headers -make -C ixml PREFIX=%{buildroot} install -install -p ixml/inc/ixml.h %{buildroot}%{_includedir}/upnp - -## Install libthreadutil.so and headers -make -C threadutil PREFIX=%{buildroot} install - +rm %{buildroot}%{_libdir}/{libixml.la,libthreadutil.la,libupnp.la} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc LICENSE README -%{_libdir}/libixml.so* -%{_libdir}/libthreadutil.so* -%{_libdir}/libupnp.so* +%doc LICENSE README NEWS +%{_libdir}/libixml.so.* +%{_libdir}/libthreadutil.so.* +%{_libdir}/libupnp.so.* %files devel %defattr(0644,root,root,0755) %{_includedir}/upnp/ +%{_libdir}/libixml.so +%{_libdir}/libthreadutil.so +%{_libdir}/libupnp.so +%{_libdir}/libixml.a +%{_libdir}/libthreadutil.a +%{_libdir}/libupnp.a +%{_libdir}/pkgconfig/libupnp.pc %clean rm -rf %{buildroot} %changelog +* Sun Mar 05 2006 Eric Tanguy - 1.3.1-1 +- Update to 1.3.1 + +* Tue Feb 14 2006 Eric Tanguy - 1.2.1a-6 +- Rebuild for FC5 + +* Fri Feb 10 2006 Eric Tanguy - 1.2.1a-5 +- Rebuild for FC5 + * Mon Jan 9 2006 Eric Tanguy 1.2.1a-4 - Include libupnp.so symlink in package to take care of non versioning of libupnp.so.1.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libupnp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Jan 2006 08:40:11 -0000 1.2 +++ sources 6 Mar 2006 17:05:53 -0000 1.3 @@ -1 +1 @@ -e72b3550bf064eedf080f16f09688891 libupnp-1.2.1a.tar.gz +6646be5e31e58188e8f47c6ce64faa4c libupnp-1.3.1.tar.gz --- libupnp_dsm_320.patch DELETED --- --- libupnp_ixml_FC4.patch DELETED --- --- libupnp_performance.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 6 17:05:50 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:05:50 -0500 Subject: rpms/bbkeys/devel bbkeys.spec,1.10,1.11 Message-ID: <200603061706.k26H6MGS000594@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/bbkeys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv539 Modified Files: bbkeys.spec Log Message: FC5 rebuild. Index: bbkeys.spec =================================================================== RCS file: /cvs/extras/rpms/bbkeys/devel/bbkeys.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- bbkeys.spec 8 Feb 2006 14:49:14 -0000 1.10 +++ bbkeys.spec 6 Mar 2006 17:05:50 -0000 1.11 @@ -8,11 +8,11 @@ Source: http://dl.sf.net/bbkeys/bbkeys-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: blackbox-devel -# Use monolithic X up to FC4, and modular X for FC5+ -%if 0%{?fedora} < 5 -BuildRequires: xorg-x11-devel -%else +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libX11-devel, libXext-devel +%else +BuildRequires: xorg-x11-devel %endif %description From fedora-extras-commits at redhat.com Mon Mar 6 17:07:09 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:07:09 -0500 Subject: rpms/blackbox/devel blackbox.spec,1.12,1.13 Message-ID: <200603061707.k26H7fNo000744@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/blackbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv674 Modified Files: blackbox.spec Log Message: FC5 rebuild. Index: blackbox.spec =================================================================== RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- blackbox.spec 8 Feb 2006 14:52:02 -0000 1.12 +++ blackbox.spec 6 Mar 2006 17:07:09 -0000 1.13 @@ -9,11 +9,11 @@ Source1: blackbox.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gcc-c++, pkgconfig -# Use monolithic X up to FC4, and modular X for FC5+ -%if 0%{?fedora} < 5 -BuildRequires: xorg-x11-devel -%else +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libXt-devel, libXext-devel +%else +BuildRequires: xorg-x11-devel %endif %description From fedora-extras-commits at redhat.com Mon Mar 6 17:08:11 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:08:11 -0500 Subject: rpms/bbkeys/devel bbkeys.spec,1.11,1.12 Message-ID: <200603061708.k26H8icm000854@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/bbkeys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv758 Modified Files: bbkeys.spec Log Message: FC5 rebuild, oops. Index: bbkeys.spec =================================================================== RCS file: /cvs/extras/rpms/bbkeys/devel/bbkeys.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- bbkeys.spec 6 Mar 2006 17:05:50 -0000 1.11 +++ bbkeys.spec 6 Mar 2006 17:08:11 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Completely configurable key-combo grabber for blackbox Name: bbkeys Version: 0.9.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: User Interface/Desktops URL: http://bbkeys.sourceforge.net/ @@ -54,6 +54,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.9.0-4 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.9.0-3 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 17:08:44 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:08:44 -0500 Subject: rpms/blackbox/devel blackbox.spec,1.13,1.14 Message-ID: <200603061709.k26H9G57000934@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/blackbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv850 Modified Files: blackbox.spec Log Message: FC5 rebuild, oops. Index: blackbox.spec =================================================================== RCS file: /cvs/extras/rpms/blackbox/devel/blackbox.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- blackbox.spec 6 Mar 2006 17:07:09 -0000 1.13 +++ blackbox.spec 6 Mar 2006 17:08:43 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Very small and fast Window Manager Name: blackbox Version: 0.70.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: User Interface/Desktops URL: http://blackboxwm.sourceforge.net/ @@ -82,6 +82,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.70.1-4 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.70.1-3 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 17:12:01 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:12:01 -0500 Subject: rpms/csmash/devel csmash.spec,1.11,1.12 Message-ID: <200603061712.k26HCYaH001040@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/csmash/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1021 Modified Files: csmash.spec Log Message: FC5 rebuild. Index: csmash.spec =================================================================== RCS file: /cvs/extras/rpms/csmash/devel/csmash.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- csmash.spec 8 Feb 2006 15:05:40 -0000 1.11 +++ csmash.spec 6 Mar 2006 17:12:00 -0000 1.12 @@ -1,7 +1,7 @@ Summary: 3D tabletennis game Name: csmash Version: 0.6.6 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL Group: Amusements/Games URL: http://cannonsmash.sourceforge.net/ @@ -12,11 +12,11 @@ BuildRequires: gtk2-devel, libjpeg-devel, zlib-devel, gcc-c++ BuildRequires: SDL-devel >= 1.2.0, SDL_mixer-devel, SDL_image-devel BuildRequires: desktop-file-utils -# Use monolithic X up to FC4, and modular X for FC5+ -%if 0%{?fedora} < 5 -BuildRequires: xorg-x11-devel, Mesa-devel +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libX11-devel, libGL-devel, libGLU-devel %else -BuildRequires: libX11-devel, mesa-libGL-devel, mesa-libGLU-devel +BuildRequires: xorg-x11-devel, Mesa-devel %endif %description @@ -75,6 +75,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.6.6-12 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.6.6-11 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Mon Mar 6 17:13:08 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:13:08 -0500 Subject: rpms/ushare/devel ushare.spec,1.4,1.5 Message-ID: <200603061713.k26HDhRF001068@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1048 Modified Files: ushare.spec Log Message: Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/devel/ushare.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ushare.spec 19 Feb 2006 17:16:12 -0000 1.4 +++ ushare.spec 6 Mar 2006 17:13:08 -0000 1.5 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,9 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 +- Rebuild with libupnp-1.3.1 + * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Mon Mar 6 17:15:18 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:15:18 -0500 Subject: rpms/Gtk-Perl/devel Gtk-Perl.spec,1.4,1.5 Message-ID: <200603061715.k26HFoSJ001127@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/Gtk-Perl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1080 Modified Files: Gtk-Perl.spec Log Message: FC5 rebuild. Index: Gtk-Perl.spec =================================================================== RCS file: /cvs/extras/rpms/Gtk-Perl/devel/Gtk-Perl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Gtk-Perl.spec 8 Feb 2006 16:29:23 -0000 1.4 +++ Gtk-Perl.spec 6 Mar 2006 17:15:18 -0000 1.5 @@ -3,7 +3,7 @@ Summary: Perl extensions for GTK+ (the Gimp ToolKit) Name: Gtk-Perl Version: 0.7008 -Release: 39%{?dist} +Release: 40%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.gtkperl.org/ @@ -13,10 +13,11 @@ BuildRequires: gtk+-devel, gdk-pixbuf-devel, libglade-devel BuildRequires: gnome-libs-devel, gtkhtml-devel, gal-devel BuildRequires: perl(XML::Parser) -%if 0%{?fedora} < 5 -BuildRequires: Mesa-devel +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libXt-devel, libXpm-devel, libGL-devel %else -BuildRequires: mesa-libGL-devel, libXt-devel, libXpm-devel +BuildRequires: Mesa-devel %endif # Internal perl provides not caught by the find-provides @@ -100,6 +101,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 0.7008-40 +- FC5 rebuild. + * Wed Feb 8 2006 Matthias Saou 0.7008-39 - Rebuild for new gcc/glibc. - Add conditional to build with/without modular X depending on FC version. From fedora-extras-commits at redhat.com Mon Mar 6 17:16:10 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:16:10 -0500 Subject: rpms/ushare/FC-3 ushare.spec,1.2,1.3 Message-ID: <200603061716.k26HGgLM001188@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1166 Modified Files: ushare.spec Log Message: Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-3/ushare.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ushare.spec 19 Feb 2006 17:18:07 -0000 1.2 +++ ushare.spec 6 Mar 2006 17:16:10 -0000 1.3 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,9 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 +- Rebuild with libupnp-1.3.1 + * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Mon Mar 6 17:17:05 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Mon, 6 Mar 2006 12:17:05 -0500 Subject: rpms/ushare/FC-4 ushare.spec,1.2,1.3 Message-ID: <200603061717.k26HHdxb001232@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1194 Modified Files: ushare.spec Log Message: Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-4/ushare.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ushare.spec 19 Feb 2006 17:19:39 -0000 1.2 +++ ushare.spec 6 Mar 2006 17:17:04 -0000 1.3 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,9 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 +- Rebuild with libupnp-1.3.1 + * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Mon Mar 6 17:24:49 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:24:49 -0500 Subject: rpms/xvattr/devel xvattr.spec,1.8,1.9 Message-ID: <200603061725.k26HPLT3001333@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/xvattr/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1315 Modified Files: xvattr.spec Log Message: FC5 rebuild. Index: xvattr.spec =================================================================== RCS file: /cvs/extras/rpms/xvattr/devel/xvattr.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xvattr.spec 9 Feb 2006 19:20:25 -0000 1.8 +++ xvattr.spec 6 Mar 2006 17:24:49 -0000 1.9 @@ -1,20 +1,20 @@ Summary: Utility for getting and setting Xv attributes Name: xvattr Version: 1.3 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: User Interface/X URL: http://www.dtek.chalmers.se/groups/dvd/ Source: http://www.dtek.chalmers.se/groups/dvd/dist/xvattr-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk+-devel -%if "%{?fedora}" >= "5" +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libXt-devel, libXv-devel %else BuildRequires: xorg-x11-devel %endif - %description This program is used for getting and setting Xv attributes such as XV_BRIGHTNESS, XV_CONTRAST, XV_SATURATION, XV_HUE, XV_COLORKEY, ... @@ -46,6 +46,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.3-9 +- FC5 rebuild. + * Thu Feb 9 2006 Matthias Saou 1.3-8 - Rebuild for new gcc/glibc and modular X. From fedora-extras-commits at redhat.com Mon Mar 6 17:26:29 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Mon, 6 Mar 2006 12:26:29 -0500 Subject: rpms/synergy/devel synergy.spec,1.12,1.13 Message-ID: <200603061727.k26HR1VN001395@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/synergy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1378 Modified Files: synergy.spec Log Message: FC5 rebuild. Index: synergy.spec =================================================================== RCS file: /cvs/extras/rpms/synergy/devel/synergy.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- synergy.spec 21 Dec 2005 10:51:24 -0000 1.12 +++ synergy.spec 6 Mar 2006 17:26:29 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Mouse and keyboard sharing utility Name: synergy Version: 1.2.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Daemons URL: http://synergy2.sourceforge.net/ @@ -9,7 +9,8 @@ Patch: synergy-1.2.2-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gcc-c++, autoconf, automake -%if "%{fedora}" >= "5" +# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libX11-devel, libXext-devel, libXtst-devel, libXt-devel BuildRequires: libXinerama-devel %else @@ -54,6 +55,9 @@ %changelog +* Mon Mar 6 2006 Matthias Saou 1.2.7-2 +- FC5 rebuild. + * Tue Dec 20 2005 Matthias Saou 1.2.7-1 - Update to 1.2.7. - Add automake build requirement (to get aclocal). From fedora-extras-commits at redhat.com Mon Mar 6 17:44:08 2006 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Mon, 6 Mar 2006 12:44:08 -0500 Subject: rpms/testdisk/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 testdisk.spec, 1.2, 1.3 Message-ID: <200603061744.k26HieHp001522@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1501 Modified Files: .cvsignore sources testdisk.spec Log Message: Update to latest version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2006 17:24:03 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:44:08 -0000 1.3 @@ -1 +1 @@ -testdisk-6.2.tar.bz2 +testdisk-6.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2006 17:24:03 -0000 1.2 +++ sources 6 Mar 2006 17:44:08 -0000 1.3 @@ -1 +1 @@ -9c103d130f56d3dd901246574a1df76b testdisk-6.2.tar.bz2 +e099bd9bb87d4da5712699bdea3da00f testdisk-6.3.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-3/testdisk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- testdisk.spec 23 Jan 2006 07:47:13 -0000 1.2 +++ testdisk.spec 6 Mar 2006 17:44:08 -0000 1.3 @@ -3,8 +3,8 @@ Summary(fr): Outil pour v?rifier et restorer des partitions Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ????? Name: testdisk -Version: 6.2 -Release: 3%{?dist} +Version: 6.3 +Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 @@ -57,7 +57,10 @@ %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* %changelog -* Mon Jan 23 2006 Christophe Group +* Mon Mar 6 2006 Christophe Grenier 6.3-1 +- Update to latest version + +* Mon Jan 23 2006 Christophe Grenier 6.2-3 - 6.2-3 - same spec for all arches hence add dist From fedora-extras-commits at redhat.com Mon Mar 6 17:47:53 2006 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Mon, 6 Mar 2006 12:47:53 -0500 Subject: rpms/testdisk/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 testdisk.spec, 1.2, 1.3 Message-ID: <200603061748.k26HmPhb001600@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1579 Modified Files: .cvsignore sources testdisk.spec Log Message: Update to 6.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2006 17:24:03 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:47:53 -0000 1.3 @@ -1 +1 @@ -testdisk-6.2.tar.bz2 +testdisk-6.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2006 17:24:03 -0000 1.2 +++ sources 6 Mar 2006 17:47:53 -0000 1.3 @@ -1 +1 @@ -9c103d130f56d3dd901246574a1df76b testdisk-6.2.tar.bz2 +e099bd9bb87d4da5712699bdea3da00f testdisk-6.3.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/FC-4/testdisk.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- testdisk.spec 23 Jan 2006 07:47:18 -0000 1.2 +++ testdisk.spec 6 Mar 2006 17:47:53 -0000 1.3 @@ -3,8 +3,8 @@ Summary(fr): Outil pour v?rifier et restorer des partitions Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ????? Name: testdisk -Version: 6.2 -Release: 3%{?dist} +Version: 6.3 +Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 @@ -57,7 +57,10 @@ %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* %changelog -* Mon Jan 23 2006 Christophe Group +* Mon Mar 6 2006 Christophe Grenier 6.3-1 +- Update to latest version + +* Mon Jan 23 2006 Christophe Grenier 6.2-3 - 6.2-3 - same spec for all arches hence add dist From fedora-extras-commits at redhat.com Mon Mar 6 17:51:59 2006 From: fedora-extras-commits at redhat.com (Christophe GRENIER (grenier)) Date: Mon, 6 Mar 2006 12:51:59 -0500 Subject: rpms/testdisk/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 testdisk.spec, 1.3, 1.4 Message-ID: <200603061752.k26HqWIJ001680@cvs-int.fedora.redhat.com> Author: grenier Update of /cvs/extras/rpms/testdisk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1659 Modified Files: .cvsignore sources testdisk.spec Log Message: Update to version 6.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2006 17:24:03 -0000 1.2 +++ .cvsignore 6 Mar 2006 17:51:59 -0000 1.3 @@ -1 +1,2 @@ testdisk-6.2.tar.bz2 +testdisk-6.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2006 17:24:03 -0000 1.2 +++ sources 6 Mar 2006 17:51:59 -0000 1.3 @@ -1 +1,2 @@ 9c103d130f56d3dd901246574a1df76b testdisk-6.2.tar.bz2 +e099bd9bb87d4da5712699bdea3da00f testdisk-6.3.tar.bz2 Index: testdisk.spec =================================================================== RCS file: /cvs/extras/rpms/testdisk/devel/testdisk.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- testdisk.spec 28 Feb 2006 17:42:05 -0000 1.3 +++ testdisk.spec 6 Mar 2006 17:51:59 -0000 1.4 @@ -3,8 +3,8 @@ Summary(fr): Outil pour v?rifier et restorer des partitions Summary(ru_RU.KOI8-R): ????????? ??? ???????? ? ?????????????? ???????? ????? Name: testdisk -Version: 6.2 -Release: 4%{?dist} +Version: 6.3 +Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://www.cgsecurity.org/testdisk-%{version}.tar.bz2 @@ -57,6 +57,9 @@ %{_mandir}/man1/testdisk.1* %{_mandir}/man1/photorec.1* %changelog +* Mon Mar 6 2006 Christophe Grenier 6.3-1 +- Update to latest version + * Tue Feb 28 2006 ChangeLog Grenier 6.2-4 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon Mar 6 18:13:55 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Mar 2006 13:13:55 -0500 Subject: rpms/gnupg2/devel gnupg2.spec,1.32,1.33 Message-ID: <200603061814.k26IES3c003695@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1754 Modified Files: gnupg2.spec Log Message: * Mon Mar 6 2006 Ville Skytt?? > 1.9.20-33 - Don't hardcode pcsc-lite lib name. cleanup %{kde_scriptdir} usage Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- gnupg2.spec 16 Feb 2006 19:50:31 -0000 1.32 +++ gnupg2.spec 6 Mar 2006 18:13:55 -0000 1.33 @@ -1,22 +1,11 @@ -# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) -# Note: this is just the name of the default shared lib to load in scdaemon, -# it can use other implementations too (including non-pcsc ones). -%define pcsc_lib libpcsclite.so.0 - - # Keep an eye on http://bugzilla.redhat.com/bugzilla/175744, in case these dirs go away or change -%if "%{?fedora}" > "4" %define kde_scriptdir %{_sysconfdir}/kde -%else -%define kde_scriptdir %{_prefix} -%define own_scriptdir 1 -%endif Summary: Utility for secure communication and data storage Name: gnupg2 Version: 1.9.20 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/System @@ -57,6 +46,9 @@ BuildRequires: bzip2-devel Buildrequires: libusb-devel BuildRequires: docbook-utils +%if "%{?fedora}" > "3" +BuildRequires: pcsc-lite-libs +%endif Requires: pinentry >= 0.7.1 @@ -88,7 +80,16 @@ #sed -i -e 's|^NEED_KSBA_VERSION=.*|NEED_KSBA_VERSION=0.9.11|' configure.ac configure #endif -sed -i -e 's/"libpcsclite\.so"/"%{pcsc_lib}"/' scd/{scdaemon,pcsc-wrapper}.c +# pcsc-lite library major: 0 in 1.2.0, 1 in 1.2.9+ (dlopen()'d in pcsc-wrapper) +# Note: this is just the name of the default shared lib to load in scdaemon, +# it can use other implementations too (including non-pcsc ones). +%if "%{?fedora}" > "3" +%global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.?)) +%else +%define pcsclib libpcsclite.so.0 +%endif + +sed -i -e 's/"libpcsclite\.so"/"%{pcsclib}"/' scd/{scdaemon,pcsc-wrapper}.c %build @@ -100,7 +101,6 @@ make %{?_smp_mflags} - %check ||: ## Allows for better debugability (doesn't work, fixme) # echo "debug-allow-core-dumps" >> tests/gpgsm.conf @@ -154,13 +154,8 @@ %{_libdir}/gnupg/ %{_libexecdir}/* %{_infodir}/* -%if "%{?own_scriptdir}" == "1" -%{kde_scriptdir}/env/ -%{kde_scriptdir}/shutdown/ -%else %{kde_scriptdir}/env/*.sh %{kde_scriptdir}/shutdown/*.sh -%endif %clean @@ -168,8 +163,11 @@ %changelog +* Mon Mar 6 2006 Ville Skytt?? > 1.9.20-3 +- Don't hardcode pcsc-lite lib name. + * Thu Feb 16 2006 Rex Dieter 1.9.20-2 -- fc5+: use /etc/kde/(env|shutdown) for scripts (#175744) +- use /etc/kde/(env|shutdown) for scripts (#175744) * Fri Feb 10 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Mon Mar 6 18:22:46 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 6 Mar 2006 13:22:46 -0500 Subject: rpms/kyum/FC-4 kyum-0.7.5-su.patch, NONE, 1.1 kyum.sh, NONE, 1.1 kyum.spec, 1.5, 1.6 Message-ID: <200603061823.k26INIHX003800@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3777 Modified Files: kyum.spec Added Files: kyum-0.7.5-su.patch kyum.sh Log Message: Add su wrapper for kyum #182986 kyum-0.7.5-su.patch: --- NEW FILE kyum-0.7.5-su.patch --- --- kyum-0.7.5/src/kyum.desktop.org 2006-03-06 18:54:08.000000000 +0100 +++ kyum-0.7.5/src/kyum.desktop 2006-03-06 18:56:10.000000000 +0100 @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=KYum Name[xx]=xxKYumxx -Exec=kdesu kyum %i %m -caption "%c" +Exec=kyum %i %m -caption "%c" Icon=kyum Type=Application DocPath=kyum/kyum.html --- NEW FILE kyum.sh --- #!/bin/sh IFS=$"\t\n " /usr/bin/kdesu /usr/bin/kyum.bin "$@" Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/FC-4/kyum.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kyum.spec 5 Mar 2006 20:37:57 -0000 1.5 +++ kyum.spec 6 Mar 2006 18:22:46 -0000 1.6 @@ -1,6 +1,6 @@ Name: kyum Version: 0.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Graphical User Frontend (GUI) for yum @@ -8,7 +8,9 @@ Group: Applications/System URL: http://www.sourceforge.net/projects/kyum Source: http://dl.sourceforge.net/sourceforge/kyum/%{name}-%{version}.tar.gz +Source1: kyum.sh Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch +Patch2: kyum-0.7.5-su.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +30,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -41,6 +44,9 @@ %makeinstall +mv $RPM_BUILD_ROOT/%{_bindir}/kyum $RPM_BUILD_ROOT/%{_bindir}/kyum.bin +cp %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/kyum + # mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities desktop-file-install --delete-original \ --vendor fedora \ @@ -56,7 +62,7 @@ %files %defattr(-,root,root,-) -%{_bindir}/* +%attr(0755,root,root) %{_bindir}/* %dir %{_datadir}/apps/kyum %{_datadir}/apps/kyum/*/* %{_datadir}/apps/kyum/kyum_sysinfo.p* @@ -67,6 +73,9 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Mon Mar 06 2006 Jochen Schmitt 0.7.5-3 +- su wrapper for kyum #182986 + * Sun Feb 12 2006 Jochen Schmitt 0.7.5-2 - Rebuilt for FC5 From fedora-extras-commits at redhat.com Mon Mar 6 18:25:25 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 6 Mar 2006 13:25:25 -0500 Subject: rpms/kyum/devel kyum-0.7.5-su.patch, NONE, 1.1 kyum.sh, NONE, 1.1 kyum.spec, 1.9, 1.10 Message-ID: <200603061825.k26IPwks003876@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/kyum/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3854 Modified Files: kyum.spec Added Files: kyum-0.7.5-su.patch kyum.sh Log Message: Add su wrapper for kyum #182986 kyum-0.7.5-su.patch: --- NEW FILE kyum-0.7.5-su.patch --- --- kyum-0.7.5/src/kyum.desktop.org 2006-03-06 18:54:08.000000000 +0100 +++ kyum-0.7.5/src/kyum.desktop 2006-03-06 18:56:10.000000000 +0100 @@ -2,7 +2,7 @@ Encoding=UTF-8 Name=KYum Name[xx]=xxKYumxx -Exec=kdesu kyum %i %m -caption "%c" +Exec=kyum %i %m -caption "%c" Icon=kyum Type=Application DocPath=kyum/kyum.html --- NEW FILE kyum.sh --- #!/bin/sh IFS=$"\t\n " /usr/bin/kdesu /usr/bin/kyum.bin "$@" Index: kyum.spec =================================================================== RCS file: /cvs/extras/rpms/kyum/devel/kyum.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- kyum.spec 12 Feb 2006 19:26:40 -0000 1.9 +++ kyum.spec 6 Mar 2006 18:25:25 -0000 1.10 @@ -1,6 +1,6 @@ Name: kyum Version: 0.7.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Graphical User Frontend (GUI) for yum @@ -8,7 +8,9 @@ Group: Applications/System URL: http://www.sourceforge.net/projects/kyum Source: http://dl.sourceforge.net/sourceforge/kyum/%{name}-%{version}.tar.gz +Source1: kyum.sh Patch1: kyum-0.6.3-workaround-missing-libfam.la.patch +Patch2: kyum-0.7.5-su.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -28,6 +30,7 @@ %prep %setup -q %patch1 -p1 +%patch2 -p1 %build [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh @@ -41,6 +44,9 @@ %makeinstall +mv $RPM_BUILD_ROOT/%{_bindir}/kyum $RPM_BUILD_ROOT/%{_bindir}/kyum.bin +cp %{SOURCE1} $RPM_BUILD_ROOT/%{_bindir}/kyum + # mkdir -p $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities desktop-file-install --delete-original \ --vendor fedora \ @@ -56,7 +62,7 @@ %files %defattr(-,root,root,-) -%{_bindir}/* +%attr(0755,root,root) %{_bindir}/* %dir %{_datadir}/apps/kyum %{_datadir}/apps/kyum/*/* %{_datadir}/apps/kyum/kyum_sysinfo.p* @@ -67,6 +73,9 @@ %doc ChangeLog COPYING README AUTHORS %changelog +* Mon Mar 06 2006 Jochen Schmitt 0.7.5-3 +- su wrapper for kyum #182986 + * Sun Feb 12 2006 Jochen Schmitt 0.7.5-2 - Rebuilt for FC5 From fedora-extras-commits at redhat.com Mon Mar 6 19:03:00 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:03:00 -0500 Subject: rpms/gstreamer08-plugins - New directory Message-ID: <200603061903.k26J32at005878@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5870/gstreamer08-plugins Log Message: Directory /cvs/extras/rpms/gstreamer08-plugins added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 19:03:07 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:03:07 -0500 Subject: rpms/gstreamer08-plugins/devel - New directory Message-ID: <200603061903.k26J39uM005893@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5870/gstreamer08-plugins/devel Log Message: Directory /cvs/extras/rpms/gstreamer08-plugins/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 19:03:34 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:03:34 -0500 Subject: rpms/gstreamer08-plugins Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603061903.k26J3avt005927@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5915 Added Files: Makefile import.log Log Message: Setup of module gstreamer08-plugins --- NEW FILE Makefile --- # Top level Makefile for module gstreamer08-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 Mon Mar 6 19:03:40 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:03:40 -0500 Subject: rpms/gstreamer08-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603061903.k26J3gBG005947@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5915/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module gstreamer08-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 Mon Mar 6 19:05:42 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:05:42 -0500 Subject: rpms/gstreamer08-plugins import.log,1.1,1.2 Message-ID: <200603061906.k26J6Erk006066@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6017 Modified Files: import.log Log Message: auto-import gstreamer08-plugins-0.8.12-2 on branch devel from gstreamer08-plugins-0.8.12-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-plugins/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Mar 2006 19:03:33 -0000 1.1 +++ import.log 6 Mar 2006 19:05:42 -0000 1.2 @@ -0,0 +1 @@ +gstreamer08-plugins-0_8_12-2:HEAD:gstreamer08-plugins-0.8.12-2.src.rpm:1141671938 From fedora-extras-commits at redhat.com Mon Mar 6 19:05:52 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:05:52 -0500 Subject: rpms/gstreamer08-plugins/devel gst-fionread.m4, NONE, 1.1 gst-plugins-0.8.11-docbook-check.patch, NONE, 1.1 gstreamer-plugins-0.8.7-alsa.patch, NONE, 1.1 gstreamer08-plugins.spec, NONE, 1.1 patch-tarball.sh, NONE, 1.1 removed-sources.txt, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603061906.k26J6dX0006075@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gstreamer08-plugins/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6017/devel Modified Files: .cvsignore sources Added Files: gst-fionread.m4 gst-plugins-0.8.11-docbook-check.patch gstreamer-plugins-0.8.7-alsa.patch gstreamer08-plugins.spec patch-tarball.sh removed-sources.txt Log Message: auto-import gstreamer08-plugins-0.8.12-2 on branch devel from gstreamer08-plugins-0.8.12-2.src.rpm --- NEW FILE gst-fionread.m4 --- AC_DEFUN([GST_CHECK_FIONREAD], [ AC_MSG_CHECKING(for FIONREAD in sys/ioctl.h) AC_CACHE_VAL(GST_FIONREAD_IN_SYS_IOCTL, [ AC_TRY_COMPILE([ #include #include ], [ int x = FIONREAD; if ( x ) return 0; ], GST_FIONREAD_IN_SYS_IOCTL="yes",GST_FIONREAD_IN_SYS_IOCTL="no") ]) AC_MSG_RESULT($GST_FIONREAD_IN_SYS_IOCTL) if test "$GST_FIONREAD_IN_SYS_IOCTL" = "yes"; then AC_DEFINE([HAVE_FIONREAD_IN_SYS_IOCTL], 1, [FIONREAD ioctl found in sys/ioclt.h]) else AC_MSG_CHECKING(for FIONREAD in sys/filio.h) AC_CACHE_VAL(GST_FIONREAD_IN_SYS_FILIO, [ AC_TRY_COMPILE([ #include #include ], [ int x = FIONREAD; if ( x ) return 0; ], GST_FIONREAD_IN_SYS_FILIO="yes",GST_FIONREAD_IN_SYS_FILIO="no") ]) AC_MSG_RESULT($GST_FIONREAD_IN_SYS_FILIO) if test "$GST_FIONREAD_IN_SYS_FILIO" = "yes"; then AC_DEFINE([HAVE_FIONREAD_IN_SYS_FILIO], 1, [FIONREAD ioctl found in sys/filio.h]) fi fi ]) gst-plugins-0.8.11-docbook-check.patch: --- NEW FILE gst-plugins-0.8.11-docbook-check.patch --- --- gst-plugins-0.8.11.bak/configure.ac.bak 2005-09-09 18:10:31.000000000 -0400 +++ gst-plugins-0.8.11.bak/configure.ac 2005-09-09 18:11:33.000000000 -0400 @@ -186,7 +186,7 @@ AC_HELP_STRING([--with-pkg-config-path],[colon-separated list of pkg-config(1) dirs]), [export PKG_CONFIG_PATH=${withval}]) -GST_DOC() +GST_DOCBOOK_CHECK() dnl check architecture GST_ARCH() gstreamer-plugins-0.8.7-alsa.patch: --- NEW FILE gstreamer-plugins-0.8.7-alsa.patch --- --- gst-plugins-0.8.7/configure.ac~ 2005-01-05 13:17:49.000000000 -0500 +++ gst-plugins-0.8.7/configure.ac 2005-01-05 13:21:25.144796197 -0500 @@ -116,6 +116,10 @@ DEFAULT_AUDIOSRC="osxaudiosrc" DEFAULT_VIDEOSINK="osxvideosink" ;; + *-redhat-linux-gnu ) + DEFAULT_AUDIOSINK="alsasink" + DEFAULT_AUDIOSRC="alsasrc" + ;; esac AC_SUBST(DEFAULT_AUDIOSINK) --- NEW FILE gstreamer08-plugins.spec --- %define gstreamer gstreamer08 %define majmin 0.8 %define _gst 0.8.12 %define po_package gst-plugins-%{majmin} Name: %{gstreamer}-plugins Version: 0.8.12 Release: 2%{?dist} Summary: GStreamer Streaming media framework plug-ins Group: Applications/Multimedia License: LGPL URL: http://gstreamer.freedesktop.org/ Source: http://gstreamer.freedesktop.org/src/gst-plugins/gst-plugins-%{version}.tar.bz2 Source2: patch-tarball.sh Source3: removed-sources.txt Source4: gst-fionread.m4 Patch1: gstreamer-plugins-0.8.7-alsa.patch Patch2: gst-plugins-0.8.11-docbook-check.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel BuildRequires: %{gstreamer}-devel >= %_gst # translations BuildRequires: gettext # plug-in build dependencies BuildRequires: arts-devel BuildRequires: cdparanoia-devel >= alpha9.7 BuildRequires: gnome-vfs2-devel >= 2.1.3 BuildRequires: libpng-devel BuildRequires: libmng-devel BuildRequires: SDL-devel >= 1.2.0 BuildRequires: libtheora-devel >= 1.0alpha3-3 BuildRequires: libavc1394-devel >= 0.4.1-5 BuildRequires: speex-devel BuildRequires: flac-devel >= 1.1.2 BuildRequires: libmusicbrainz-devel BuildRequires: libXdamage-devel BuildRequires: libXv-devel BuildRequires: libGLU-devel BuildRequires: libGL-devel #BuildRequires: cairo-devel %ifnarch s390 s390x BuildRequires: libdv-devel %endif Requires: %{name} >= %_gst Requires(post): /sbin/ldconfig Requires(post): /usr/bin/gst-register-%{majmin} Requires(pre): /usr/bin/gconftool-2 Requires(post): /usr/bin/gconftool-2 Requires(postun): /usr/bin/gconftool-2 Requires(preun): /usr/bin/gconftool-2 Requires(postun): /sbin/ldconfig Requires(postun): /usr/bin/gst-register-%{majmin} # FIXME: is it necessary to Requires: these packages ? If so, why no others ? # => Not needed, as soname deps are present and min.versions, too. #Requires: cdparanoia-libs >= alpha9.7 #Requires: libmusicbrainz >= 2.1.1 %description GStreamer is a streaming media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. Its plugin-based architecture means that new data types or processing capabilities can be added simply by installing new plugins. %package devel Summary: Libraries/include files for GStreamer plug-ins Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{gstreamer}-devel >= %_gst Requires: GConf2-devel %description devel GStreamer is a streaming-media framework, based on graphs of filters which operate on media data. Applications using this library can do anything from real-time sound processing to playing videos, and just about anything else media-related. Its plugin-based architecture means that new data types or processing capabilities can be added simply by installing new plugins. This package contains the libraries and includes files necessary to develop applications and plugins for GStreamer. %prep %setup -q -n gst-plugins-%{version} %patch1 -p1 -b .alsa %patch2 -p1 -b .docbook-check mkdir gst-libs/ext/ffmpeg %build cp %{SOURCE4} m4/ libtoolize --force --copy aclocal -I m4 -I common/m4 automake autoconf %configure --disable-vorbistest \ --disable-ffmpeg \ --disable-faad \ --disable-sndfile \ --disable-mikmod \ --disable-spc \ --disable-cairo \ --enable-DEBUG --disable-tests --disable-examples make %{?_smp_mflags} cp %{SOURCE3} . %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make DESTDIR=${RPM_BUILD_ROOT} install unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majmin}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{majmin}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %find_lang %{po_package} %clean rm -rf $RPM_BUILD_ROOT %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` SCHEMAS="gstreamer-%{majmin}.schemas" for S in $SCHEMAS; do /usr/bin/gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/$S >/dev/null || : done fi %post /sbin/ldconfig env DISPLAY= %{_bindir}/gst-register-%{majmin} >/dev/null 2>&1 export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` SCHEMAS="gstreamer-%{majmin}.schemas" for S in $SCHEMAS; do /usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null done %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`/usr/bin/gconftool-2 --get-default-source` SCHEMAS="gstreamer-%{majmin}.schemas" for S in $SCHEMAS; do /usr/bin/gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/$S >/dev/null || : done fi %postun /sbin/ldconfig env DISPLAY= /usr/bin/gst-register-%{majmin} >/dev/null 2>&1 || true %files -f %{po_package}.lang %defattr(-, root, root) %doc AUTHORS COPYING README removed-sources.txt %{_sysconfdir}/gconf/schemas/gstreamer-%{majmin}.schemas %{_bindir}/* %{_libdir}/*so.* %ifarch %{ix86} ia64 ppc ppc64 x86_64 %{_libdir}/gstreamer-%{majmin}/libgst1394.* %endif %{_libdir}/gstreamer-%{majmin}/libgstac3parse.* %{_libdir}/gstreamer-%{majmin}/libgstadder.* %{_libdir}/gstreamer-%{majmin}/libgstalpha.* %{_libdir}/gstreamer-%{majmin}/libgstalaw.* %{_libdir}/gstreamer-%{majmin}/libgstalsa.* %{_libdir}/gstreamer-%{majmin}/libgstalphacolor.* %{_libdir}/gstreamer-%{majmin}/libgstapetag.* %{_libdir}/gstreamer-%{majmin}/libgstarts.* %{_libdir}/gstreamer-%{majmin}/libgstaudiorate.* %{_libdir}/gstreamer-%{majmin}/libgstartsdsink.* %{_libdir}/gstreamer-%{majmin}/libgstasf.* %{_libdir}/gstreamer-%{majmin}/libgstaudio.* %{_libdir}/gstreamer-%{majmin}/libgstaudioconvert.* %{_libdir}/gstreamer-%{majmin}/libgstaudiofile.* %{_libdir}/gstreamer-%{majmin}/libgstaudiofilter.* %{_libdir}/gstreamer-%{majmin}/libgstaudioscale.* %{_libdir}/gstreamer-%{majmin}/libgstauparse.* %{_libdir}/gstreamer-%{majmin}/libgstavi.* %{_libdir}/gstreamer-%{majmin}/libgstcdparanoia.* %{_libdir}/gstreamer-%{majmin}/libgstcdplayer.* %{_libdir}/gstreamer-%{majmin}/libgstcdxaparse.* %{_libdir}/gstreamer-%{majmin}/libgstchart.* %{_libdir}/gstreamer-%{majmin}/libgstcolorspace.* %{_libdir}/gstreamer-%{majmin}/libgstcutter.* %{_libdir}/gstreamer-%{majmin}/libgstdeinterlace.* %{_libdir}/gstreamer-%{majmin}/libgstdebug.* %{_libdir}/gstreamer-%{majmin}/libgstdecodebin.* %ifnarch s390 s390x %{_libdir}/gstreamer-%{majmin}/libgstdvdec.* %endif %{_libdir}/gstreamer-%{majmin}/libgstefence.* %{_libdir}/gstreamer-%{majmin}/libgsteffectv.* %{_libdir}/gstreamer-%{majmin}/libgstesd.* %{_libdir}/gstreamer-%{majmin}/libgstequalizer.* %{_libdir}/gstreamer-%{majmin}/libgstfestival.* %{_libdir}/gstreamer-%{majmin}/libgstfilter.* %{_libdir}/gstreamer-%{majmin}/libgstflac.* %{_libdir}/gstreamer-%{majmin}/libgstffmpegcolorspace.* %{_libdir}/gstreamer-%{majmin}/libgstflxdec.* %{_libdir}/gstreamer-%{majmin}/libgstgamma.* %{_libdir}/gstreamer-%{majmin}/libgstgdkpixbuf.* %{_libdir}/gstreamer-%{majmin}/libgstglimagesink.* %{_libdir}/gstreamer-%{majmin}/libgstgnomevfs.* %{_libdir}/gstreamer-%{majmin}/libgstgoom.* %{_libdir}/gstreamer-%{majmin}/libgstidct.* %{_libdir}/gstreamer-%{majmin}/libgstinterleave.* %{_libdir}/gstreamer-%{majmin}/libgstjpeg.* %{_libdir}/gstreamer-%{majmin}/libgstlevel.* %{_libdir}/gstreamer-%{majmin}/libgstmatroska.* %{_libdir}/gstreamer-%{majmin}/libgstmedian.* %{_libdir}/gstreamer-%{majmin}/libgstmng.* %{_libdir}/gstreamer-%{majmin}/libgstmodplug.* %{_libdir}/gstreamer-%{majmin}/libgstmonoscope.* %{_libdir}/gstreamer-%{majmin}/libgstmultifilesink.* %{_libdir}/gstreamer-%{majmin}/libgstmulaw.* %{_libdir}/gstreamer-%{majmin}/libgstmultipart.* %{_libdir}/gstreamer-%{majmin}/libgstnavigationtest.* %{_libdir}/gstreamer-%{majmin}/libgstogg.* %{_libdir}/gstreamer-%{majmin}/libgstossaudio.* %{_libdir}/gstreamer-%{majmin}/libgstoverlay.* %{_libdir}/gstreamer-%{majmin}/libgstpassthrough.* %{_libdir}/gstreamer-%{majmin}/libgstplayondemand.* %{_libdir}/gstreamer-%{majmin}/libgstplaybin.* %{_libdir}/gstreamer-%{majmin}/libgstpng.* %{_libdir}/gstreamer-%{majmin}/libgstqtdemux.* %{_libdir}/gstreamer-%{majmin}/libgstresample.* %{_libdir}/gstreamer-%{majmin}/libgstriff.* %{_libdir}/gstreamer-%{majmin}/libgstrmdemux.* %{_libdir}/gstreamer-%{majmin}/libgstrtjpeg.* %{_libdir}/gstreamer-%{majmin}/libgstrtp.* %{_libdir}/gstreamer-%{majmin}/libgstsdlvideosink.* %{_libdir}/gstreamer-%{majmin}/libgstsilence.* %{_libdir}/gstreamer-%{majmin}/libgstsinesrc.* %{_libdir}/gstreamer-%{majmin}/libgstsmooth.* %{_libdir}/gstreamer-%{majmin}/libgstsmoothwave.* %{_libdir}/gstreamer-%{majmin}/libgstsmpte.* %{_libdir}/gstreamer-%{majmin}/libgstsnapshot.* %{_libdir}/gstreamer-%{majmin}/libgstspectrum.* %{_libdir}/gstreamer-%{majmin}/libgstspeed.* %{_libdir}/gstreamer-%{majmin}/libgstspeex.* %{_libdir}/gstreamer-%{majmin}/libgststereo.* %{_libdir}/gstreamer-%{majmin}/libgstswitch.* %{_libdir}/gstreamer-%{majmin}/libgstsynaesthesia.* %{_libdir}/gstreamer-%{majmin}/libgsttta.* %{_libdir}/gstreamer-%{majmin}/libgsttagedit.* %{_libdir}/gstreamer-%{majmin}/libgsttcp.* %{_libdir}/gstreamer-%{majmin}/libgsttrm.* %{_libdir}/gstreamer-%{majmin}/libgsttextoverlay.* %{_libdir}/gstreamer-%{majmin}/libgsttheora.* %{_libdir}/gstreamer-%{majmin}/libgsttimeoverlay.* %{_libdir}/gstreamer-%{majmin}/libgsttypefindfunctions.* %{_libdir}/gstreamer-%{majmin}/libgstudp.* %{_libdir}/gstreamer-%{majmin}/libgstvbidec.* %{_libdir}/gstreamer-%{majmin}/libgstvcdsrc.* %{_libdir}/gstreamer-%{majmin}/libgstvideo.* %{_libdir}/gstreamer-%{majmin}/libgstvideo4linux.* %{_libdir}/gstreamer-%{majmin}/libgstvideo4linux2.* %{_libdir}/gstreamer-%{majmin}/libgstvideobalance.* %{_libdir}/gstreamer-%{majmin}/libgstvideocrop.* %{_libdir}/gstreamer-%{majmin}/libgstvideodrop.* %{_libdir}/gstreamer-%{majmin}/libgstvideofilter.* %{_libdir}/gstreamer-%{majmin}/libgstvideobox.* %{_libdir}/gstreamer-%{majmin}/libgstvideomixer.* %{_libdir}/gstreamer-%{majmin}/libgstvideorate.* %{_libdir}/gstreamer-%{majmin}/libgstvideoflip.* %{_libdir}/gstreamer-%{majmin}/libgstvideoscale.* %{_libdir}/gstreamer-%{majmin}/libgstvideotestsrc.* %{_libdir}/gstreamer-%{majmin}/libgstvolenv.* %{_libdir}/gstreamer-%{majmin}/libgstvolume.* %{_libdir}/gstreamer-%{majmin}/libgstvorbis.* %{_libdir}/gstreamer-%{majmin}/libgstwavenc.* %{_libdir}/gstreamer-%{majmin}/libgstwavparse.* %{_libdir}/gstreamer-%{majmin}/libgstximagesink.* %{_libdir}/gstreamer-%{majmin}/libgstxvimagesink.* %{_libdir}/gstreamer-%{majmin}/libgstxwindowlistener.* %{_libdir}/gstreamer-%{majmin}/libgsty4menc.* %{_libdir}/gstreamer-%{majmin}/libgstmixmatrix.* %{_libdir}/gstreamer-%{majmin}/libgstautodetect.* %{_libdir}/gstreamer-%{majmin}/libgstdvdlpcmdec.* %{_libdir}/gstreamer-%{majmin}/libgstgconfelements.* %{_libdir}/gstreamer-%{majmin}/libgstpuzzle.* %{_libdir}/gstreamer-%{majmin}/libgstrfbsrc.* %{_libdir}/gstreamer-%{majmin}/libgstsubparse.* #%{_libdir}/gstreamer-%{majmin}/libgstcairo.* %{_libdir}/gstreamer-%{majmin}/libgstfreeze.* %{_libdir}/gstreamer-%{majmin}/libgstvideo4linuxradio.* %{_libdir}/gstreamer-%{majmin}/libgstimagemixer.* %{_mandir}/man*/* %files devel %defattr(-, root, root) %{_includedir}/gstreamer-%{majmin}/gst/* %{_libdir}/pkgconfig/*.pc %{_libdir}/*so %changelog * Sun Mar 5 2006 Brian Pepple - 0.8.12-2 - Add dist tag. - Add patch-tarball.sh back. - Strip source tarball of code w/ legal issues. - Remove req. for cdparanoia-libs & libmusicbrainz. - Fix references to gstreamer-devel. - Fix GConf2 scriptlets. * Thu Feb 16 2006 Brian Pepple - 0.8.12-1 - Update to 0.8.12. - Drop source2 (patch-tarball.sh). - Remove unnecessary BR (glib2-devel, autoconf, automake, libtool, audiofile-devel, esound-devel, alsa-lib-devel, libvorbis-devel, GConf2-devel, libjpeg-devel, libogg-devel, libraw1394-devel). - Add full source. * Fri Jan 06 2006 John (J5) Palmieri - 0.8.11.3 - Obsolete the old gstreamer-plugins package * Sat Dec 17 2005 Thomas Vander Stichele - 0.8.11-2 - rebuilt using gstreamer08 as base package name for devel - properly do Requires(post) and Requires(postun) - decouple gstreamer and gstreamer-plugins version numbers, they are not linked - remove hermes completely * Fri Dec 09 2005 Jesse Keating - 0.8.11-1.1 - rebuilt * Tue Sep 09 2005 John (J5) Palmieri - 0.8.11-1 - Upgrade to upstream version 0.8.11 - add a patch which makes the right call in configure for checking for docbook * Tue Aug 18 2005 John (J5) Palmieri - 0.8.10-1 - Upgrade to upstream version 0.8.10 - removed backported soundjuicer patch as it is in this release * Thu Jun 30 2005 John (J5) Palmieri - 0.8.9-2 - Backport patch from cvs to fix soundjuicer - disable the cairo plugin as it uses the old API * Tue Jun 7 2005 John (J5) Palmieri - 0.8.9-1 - update to upstream 0.8.9 - disable spc support - Add requirement for cairo-devel - Add freeze, video4linuxradio, and wavpack plugins * Mon May 9 2005 John (J5) Palmieri - 0.8.8-6 - Added patch to fix segfault (Bug #156622) * Mon Apr 4 2005 Elliot Lee - 0.8.8-5 - Remove mikmod support * Wed Mar 30 2005 John (J5) Palmieri - 0.8.8-4 - s/GConf-devel/GConf2-devel * Tue Mar 29 2005 John (J5) Palmieri - 0.8.8-3 - Added Requires: GConf-devel to the devel package * Sun Mar 27 2005 John (J5) Palmieri - 0.8.8-2 - disabled building Hermes because it is not needed and doesn't compile with gcc4.0. If upstream fixes it we can reenable * Wed Mar 23 2005 John (J5) Palmieri - 0.8.8-1 - Update to upstream version 0.8.8 - Rebuild for libmusicbrainz 2.1.1 * Sun Feb 06 2005 Warren Togami - 0.8.7-3 - rebuild against new libraw1394 * Wed Jan 05 2005 Colin Walters - 0.8.7-2 - BR gtk2-devel (139151) * Wed Jan 05 2005 Colin Walters - 0.8.7-1 - New upstream version - Add new patch gstreamer-plugins-0.8.7-alsa.patch which obsoletes gstreamer-plugins-0.7.5-alsa.patch - Add in speex, tta, apetag plugins * Tue Dec 21 2004 Colin Walters - 0.8.6-1 - New upstream version - Remove obsoleted gstreamer-plugins-0.8.4-vorbis-seek-workaround.patch - BR latest libavc1394-devel - Add libgstequalizer.so * Wed Oct 27 2004 Colin Walters - 0.8.5-3 - Also remove mplex from sources * Thu Oct 14 2004 Colin Walters - 0.8.5-2 - Drop BR on xmms-devel, libghttp-devel - Add BR on libmng-devel * Wed Oct 06 2004 Colin Walters - 0.8.5-1 - Update to 0.8.5 - Add mngsink - Remove speex for now, configure check is buggy * Fri Sep 24 2004 Colin Walters - 0.8.4-2 - Add gstreamer-plugins-0.8.4-vorbis-seek-workaround.patch for 133411 * Mon Aug 31 2004 Colin Walters - 0.8.4-1 - Update to 0.8.4 - Add gstglimagesink * Mon Aug 07 2004 Colin Walters - 0.8.3-2 - Restore media-info, which was not shipped for some unknown reason (#129392) * Mon Aug 02 2004 Colin Walters - 0.8.3-1 - Update to 0.8.3 - Remove alsa fixes - Kill off lame plugin - Add alphacolor, decodebin, multifilesink, and playbin. * Wed Jul 28 2004 Colin Walters - 0.8.2-6 - Really restore ffmpegcolorspace - Reinstate checks for exact plugins installed, i was a bit shortsighted in removing it - BuildRequire libtheora-devel - Ensure we disable faad and sndfile even if they are installed * Tue Jul 27 2004 Colin Walters - 0.8.2-5 - Re-add ffmpegcolorspace, since it does not have patent issues - Restore smp_mflags * Fri Jul 16 2004 Colin Walters - 0.8.2-4 - Backported ALSA fixes from CVS HEAD * Tue Jul 05 2004 Colin Walters - 0.8.2-3 - Another rebuild to placate beehive! * Tue Jul 05 2004 Colin Walters - 0.8.2-2 - Rebuild to placate beehive * Wed Jun 23 2004 Colin Walters - 0.8.2-1 - Update to 0.8.2, fixes numerous bugs - Remove upstreamed memleaks patch * Sun Jun 20 2004 Jeremy Katz - 0.8.1-5 - rebuild to lose gtk+ 1.2 dependency * Wed Jun 15 2004 Colin Walters 0.8.1-4 - BuildRequire libghttp-devel * Tue Jun 15 2004 Elliot Lee - rebuilt * Wed May 19 2004 Colin Walters 0.8.1-3 - Don't lose if gst-register isn't installed * Fri May 07 2004 Colin Walters 0.8.1-2 - Apply patch to fix memleaks * Wed Apr 15 2004 Colin Walters 0.8.1-1 - Update to 0.8.1 * Wed Mar 31 2004 Colin Walters 0.8.0-3 - Second attempt at rebuild to pick up new libdv * Tue Mar 30 2004 Colin Walters 0.8.0-2 - Rebuild to pick up new libdv (hopefully). - Use one big glob to capture all plugins. No GStreamer plugin that's included directly in the tarball that I am aware of besides ffmpeg includes patented code directly, so this should be safe. * Tue Mar 16 2004 Alex Larsson 0.8.0-1 - update to 0.8.0 * Thu Mar 11 2004 Alex Larsson 0.7.6-2 - correct plugin names * Wed Mar 10 2004 Alex Larsson 0.7.6-1 - update to 0.7.6 * Tue Mar 02 2004 Elliot Lee - rebuilt * Mon Mar 1 2004 Alexander Larsson 0.7.5-2 - Make alsa default sink/source instead of oss. * Fri Feb 27 2004 Alexander Larsson 0.7.5-1 - update to 0.7.5 * Fri Feb 13 2004 Elliot Lee - rebuilt * Wed Jan 28 2004 Alexander Larsson 0.7.3-2 - Use versioned gst-register * Wed Jan 28 2004 Alexander Larsson 0.7.3-1 - update to 0.7.3 * Thu Nov 27 2003 Thomas Woerner 0.6.3-4 - added BuildRequires for libraw1394-devel * Wed Sep 17 2003 Bill Nottingham 0.6.3-3 - more cleanups * Fri Sep 12 2003 Nalin Dahyabhai 0.6.3-2 - build gstcolorspace against a static bundled libHermes, which might want to move into its own package at some point - explicitly list the plugins which are built in the files manifest so that we get errors if there are some which don't get built or get added between releases - disable qcam on amd64 -- configure disables it on non-i386 arches - limit 1394 support to amd64,ia64,ppc,ppc64,x86 * Thu Sep 11 2003 Alexander Larsson 0.6.3-1 - Update to 0.6.3 (gnome 2.4 final) - remove all mpeg plugins * Tue Aug 19 2003 Alexander Larsson 0.6.2-1 - 0.6.2 * Wed Jun 04 2003 Elliot Lee - rebuilt * Wed May 21 2003 Jeremy Katz 0.6.0-7 - use automake 1.6 * Mon Feb 17 2003 Florian La Roche - rebuild to get sane s390x requires * Tue Feb 11 2003 Jonathan Blandford 0.6.0-4 - unset the DISPLAY when running gst-register * Sat Feb 8 2003 Bill Nottingham 0.6.0-4 - move libgst*.so.X.X to main package; things require them (#80518, #83805) - gstreamer-plugins-devel requires gstreamer-devel (#82506) * Tue Feb 4 2003 Jonathan Blandford 0.6.0-3 - remove ffmpeg for now. It doesn't build -fPIC * Tue Feb 04 2003 Phil Knirsch 0.6.0-2 - Bump release and rebuild. * Thu Jan 30 2003 Jonathan Blandford - new version. Requires new gstreamer. * Wed Jan 22 2003 Tim Powers - rebuilt * Wed Jan 15 2003 Matt Wilson 0.5.0-18 - disable qcam on all non x86 and x86_64 platforms * Mon Dec 30 2002 Florian La Roche - fix spec file to better remove libgstmedia-info - exclude for mainframe * Thu Dec 19 2002 Elliot Lee 0.5.0-15 - Include ia64 - Add BuildRequires: autoconf automake * Wed Dec 18 2002 Jonathan Blandford - rebuild * Tue Dec 17 2002 Jonathan Blandford 0.5.0-12 - rebuild * Mon Dec 16 2002 Jonathan Blandford 0.5.0-10 - rebuild - disable tests * Mon Dec 16 2002 Tim Powers 0.5.0-9 - rebuild * Wed Dec 11 2002 Jonathan Blandford 0.5.0-7 - fix libdir for ia64. * Wed Dec 11 2002 Jonathan Blandford 0.5.0-3 - ExcludeArch: ia64. Random assembler errors that I have no hope of fixing - Add devel package * Wed Dec 11 2002 Jonathan Blandford 0.5.0-1 - 0.5.0 - apparently, festival-devel isn't needed. * Tue Dec 10 2002 Tim Powers 0.4.2-3 - rebuild to fix broken dep on libgstreamer-0.4.2.so.0 * Tue Dec 3 2002 Havoc Pennington - excludearch the arches that can't build gstreamer cothreads - well it isn't really SMP-safe - add patch for including pthread.h when required - prereq gconftool - fix typo that broke schema installation in post * Mon Dec 2 2002 Havoc Pennington - initial "official" import - munge tarball for legal cleanliness * Thu Nov 7 2002 Jeremy Katz - 0.4.2 * Mon Sep 23 2002 Jeremy Katz - 0.4.1 - install the gconf schema - use %%configure * Sun Sep 22 2002 Jeremy Katz - update to 0.4.0 - give explicit vorbis include path, don't run vorbis test * Sun Aug 11 2002 Jeremy Katz - collapse into one package to preserve some sanity * Wed Mar 13 2002 Thomas Vander Stichele - added more BuildRequires and Requires - rearranged some plugins - added changelog ;) --- NEW FILE patch-tarball.sh --- #! /bin/sh set -e if test $# -lt 1; then echo "usage: $0 gst-plugins-VERSION" 1>&2 exit 1 fi PKG="$1" DIRNAME=`mktemp -d deleteme-XXXXXX` cd $DIRNAME ORIGBALL=../$PKG.tar.bz2 DESTBALL=../$PKG.patched.tar.bz2 echo "Saving original file list" tar -tjf $ORIGBALL | sort > origfiles.txt echo "Extracting original tarball" tar -xjf $ORIGBALL MPEG_INFIXES="mpeg mpg mp3 mp2 mad" MPEG_PATHS="ext/mad ext/mpeg2dec ext/mplex ext/mpeg2enc gst/mpeg1sys gst/mpeg1videoparse gst/mpeg2sub gst/mpegaudio gst/mpegaudioparse gst/mpegstream ext/lame gst/dvdsubdec" for mod in $MPEG_PATHS; do echo rm -rf -- "$PKG/${mod}" rm -rf -- "$PKG/${mod}" sys=$(dirname "${mod}") submod=$(basename "${mod}") perl -pi -e "s/[a-zA-Z0-9]*$submod[a-zA-Z0-9]*//g" $PKG/$sys/Makefile.in perl -pi -e "s/[a-zA-Z0-9]*$submod[a-zA-Z0-9]*//g" $PKG/$sys/Makefile.am perl -pi -e "s#^$sys/[a-zA-Z0-9]*$submod[a-zA-Z0-9]*/Makefile##g" $PKG/configure.ac perl -pi -e "s# $submod # #g" $PKG/configure.ac done for I in ffmpeg ; do rm -rf $PKG/gst-libs/ext/$I done echo "Creating new tarball" tar -cjf $DESTBALL $PKG echo "Extracting new file list" tar -tjf $DESTBALL | sort > newfiles.txt diff -u origfiles.txt newfiles.txt > ../removed-sources.txt || true cd .. rm -rf $DIRNAME echo "$PKG.patched.tar.bz2 created, removed files in removed-sources.txt" exit 0 --- NEW FILE removed-sources.txt --- --- origfiles.txt 2006-03-05 15:40:39.000000000 -0500 +++ newfiles.txt 2006-03-05 15:41:00.000000000 -0500 @@ -325,12 +325,6 @@ gst-plugins-0.8.12/ext/ladspa/Makefile.in gst-plugins-0.8.12/ext/ladspa/search.c gst-plugins-0.8.12/ext/ladspa/utils.h -gst-plugins-0.8.12/ext/lame/ -gst-plugins-0.8.12/ext/lame/gstlame.c -gst-plugins-0.8.12/ext/lame/gstlame.h -gst-plugins-0.8.12/ext/lame/Makefile.am -gst-plugins-0.8.12/ext/lame/Makefile.in -gst-plugins-0.8.12/ext/lame/README gst-plugins-0.8.12/ext/lcs/ gst-plugins-0.8.12/ext/lcs/gstcolorspace.c gst-plugins-0.8.12/ext/lcs/Makefile.am @@ -372,13 +366,6 @@ gst-plugins-0.8.12/ext/libvisual/Makefile.am gst-plugins-0.8.12/ext/libvisual/Makefile.in gst-plugins-0.8.12/ext/libvisual/visual.c -gst-plugins-0.8.12/ext/mad/ -gst-plugins-0.8.12/ext/mad/gstid3demuxbin.c -gst-plugins-0.8.12/ext/mad/gstid3tag.c -gst-plugins-0.8.12/ext/mad/gstmad.c -gst-plugins-0.8.12/ext/mad/gstmad.h -gst-plugins-0.8.12/ext/mad/Makefile.am -gst-plugins-0.8.12/ext/mad/Makefile.in gst-plugins-0.8.12/ext/Makefile.am gst-plugins-0.8.12/ext/Makefile.in gst-plugins-0.8.12/ext/mikmod/ @@ -389,35 +376,6 @@ gst-plugins-0.8.12/ext/mikmod/Makefile.in gst-plugins-0.8.12/ext/mikmod/mikmod_reader.c gst-plugins-0.8.12/ext/mikmod/README -gst-plugins-0.8.12/ext/mpeg2dec/ -gst-plugins-0.8.12/ext/mpeg2dec/gstmpeg2dec.c -gst-plugins-0.8.12/ext/mpeg2dec/gstmpeg2dec.h -gst-plugins-0.8.12/ext/mpeg2dec/Makefile.am -gst-plugins-0.8.12/ext/mpeg2dec/Makefile.in -gst-plugins-0.8.12/ext/mpeg2enc/ -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2enc.cc -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2enc.hh -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoder.cc -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoder.hh -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoptions.cc -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encoptions.hh -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encpicturereader.cc -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encpicturereader.hh -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encstreamwriter.cc -gst-plugins-0.8.12/ext/mpeg2enc/gstmpeg2encstreamwriter.hh -gst-plugins-0.8.12/ext/mpeg2enc/Makefile.am -gst-plugins-0.8.12/ext/mpeg2enc/Makefile.in -gst-plugins-0.8.12/ext/mplex/ -gst-plugins-0.8.12/ext/mplex/gstmplex.cc -gst-plugins-0.8.12/ext/mplex/gstmplex.hh -gst-plugins-0.8.12/ext/mplex/gstmplexibitstream.cc -gst-plugins-0.8.12/ext/mplex/gstmplexibitstream.hh -gst-plugins-0.8.12/ext/mplex/gstmplexjob.cc -gst-plugins-0.8.12/ext/mplex/gstmplexjob.hh -gst-plugins-0.8.12/ext/mplex/gstmplexoutputstream.cc -gst-plugins-0.8.12/ext/mplex/gstmplexoutputstream.hh -gst-plugins-0.8.12/ext/mplex/Makefile.am -gst-plugins-0.8.12/ext/mplex/Makefile.in gst-plugins-0.8.12/ext/musepack/ gst-plugins-0.8.12/ext/musepack/gstmusepackdec.c gst-plugins-0.8.12/ext/musepack/gstmusepackdec.h @@ -742,10 +700,6 @@ gst-plugins-0.8.12/gst/dvdlpcmdec/gstdvdlpcmdec.h gst-plugins-0.8.12/gst/dvdlpcmdec/Makefile.am gst-plugins-0.8.12/gst/dvdlpcmdec/Makefile.in -gst-plugins-0.8.12/gst/dvdsubdec/ -gst-plugins-0.8.12/gst/dvdsubdec/dvdsubdec.c -gst-plugins-0.8.12/gst/dvdsubdec/Makefile.am -gst-plugins-0.8.12/gst/dvdsubdec/Makefile.in gst-plugins-0.8.12/gst/effectv/ gst-plugins-0.8.12/gst/effectv/gstaging.c gst-plugins-0.8.12/gst/effectv/gstdice.c @@ -1097,72 +1051,6 @@ gst-plugins-0.8.12/gst/monoscope/monoscope.c gst-plugins-0.8.12/gst/monoscope/monoscope.h gst-plugins-0.8.12/gst/monoscope/README -gst-plugins-0.8.12/gst/mpeg1sys/ -gst-plugins-0.8.12/gst/mpeg1sys/buffer.c -gst-plugins-0.8.12/gst/mpeg1sys/buffer.h -gst-plugins-0.8.12/gst/mpeg1sys/gstmpeg1systemencode.c -gst-plugins-0.8.12/gst/mpeg1sys/gstmpeg1systemencode.h -gst-plugins-0.8.12/gst/mpeg1sys/main.h -gst-plugins-0.8.12/gst/mpeg1sys/Makefile.am -gst-plugins-0.8.12/gst/mpeg1sys/Makefile.in -gst-plugins-0.8.12/gst/mpeg1sys/systems.c -gst-plugins-0.8.12/gst/mpeg1videoparse/ -gst-plugins-0.8.12/gst/mpeg1videoparse/gstmp1videoparse.c -gst-plugins-0.8.12/gst/mpeg1videoparse/gstmp1videoparse.h -gst-plugins-0.8.12/gst/mpeg1videoparse/Makefile.am -gst-plugins-0.8.12/gst/mpeg1videoparse/Makefile.in -gst-plugins-0.8.12/gst/mpeg2sub/ -gst-plugins-0.8.12/gst/mpeg2sub/gstmpeg2subt.c -gst-plugins-0.8.12/gst/mpeg2sub/gstmpeg2subt.h -gst-plugins-0.8.12/gst/mpeg2sub/Makefile.am -gst-plugins-0.8.12/gst/mpeg2sub/Makefile.in -gst-plugins-0.8.12/gst/mpeg2sub/Notes.txt -gst-plugins-0.8.12/gst/mpegaudio/ -gst-plugins-0.8.12/gst/mpegaudio/common.c -gst-plugins-0.8.12/gst/mpegaudio/common.h -gst-plugins-0.8.12/gst/mpegaudio/encode.c -gst-plugins-0.8.12/gst/mpegaudio/encoder.h -gst-plugins-0.8.12/gst/mpegaudio/gstmpegaudio.c -gst-plugins-0.8.12/gst/mpegaudio/gstmpegaudio.h -gst-plugins-0.8.12/gst/mpegaudio/Makefile.am -gst-plugins-0.8.12/gst/mpegaudio/Makefile.in -gst-plugins-0.8.12/gst/mpegaudio/musicin.c -gst-plugins-0.8.12/gst/mpegaudio/musicin.h -gst-plugins-0.8.12/gst/mpegaudioparse/ -gst-plugins-0.8.12/gst/mpegaudioparse/gstmpegaudioparse.c -gst-plugins-0.8.12/gst/mpegaudioparse/gstmpegaudioparse.h -gst-plugins-0.8.12/gst/mpegaudioparse/Makefile.am -gst-plugins-0.8.12/gst/mpegaudioparse/Makefile.in -gst-plugins-0.8.12/gst/mpegaudio/psy.c -gst-plugins-0.8.12/gst/mpegaudio/putbits.c -gst-plugins-0.8.12/gst/mpegaudio/putbits.h -gst-plugins-0.8.12/gst/mpegaudio/README.crh -gst-plugins-0.8.12/gst/mpegaudio/subs.c -gst-plugins-0.8.12/gst/mpegaudio/table_absthr.h -gst-plugins-0.8.12/gst/mpegaudio/table_alloc.h -gst-plugins-0.8.12/gst/mpegaudio/table_cb.h -gst-plugins-0.8.12/gst/mpegaudio/table_enwindow.h -gst-plugins-0.8.12/gst/mpegaudio/tables.c -gst-plugins-0.8.12/gst/mpegaudio/table_th.h -gst-plugins-0.8.12/gst/mpegaudio/tonal.c -gst-plugins-0.8.12/gst/mpegstream/ -gst-plugins-0.8.12/gst/mpegstream/gstdvddemux.c -gst-plugins-0.8.12/gst/mpegstream/gstdvddemux.h -gst-plugins-0.8.12/gst/mpegstream/gstmpegclock.c -gst-plugins-0.8.12/gst/mpegstream/gstmpegclock.h -gst-plugins-0.8.12/gst/mpegstream/gstmpegdemux.c -gst-plugins-0.8.12/gst/mpegstream/gstmpegdemux.h -gst-plugins-0.8.12/gst/mpegstream/gstmpegpacketize.c -gst-plugins-0.8.12/gst/mpegstream/gstmpegpacketize.h -gst-plugins-0.8.12/gst/mpegstream/gstmpegparse.c -gst-plugins-0.8.12/gst/mpegstream/gstmpegparse.h -gst-plugins-0.8.12/gst/mpegstream/gstmpegstream.c -gst-plugins-0.8.12/gst/mpegstream/gstrfc2250enc.c -gst-plugins-0.8.12/gst/mpegstream/gstrfc2250enc.h -gst-plugins-0.8.12/gst/mpegstream/Makefile.am -gst-plugins-0.8.12/gst/mpegstream/Makefile.in -gst-plugins-0.8.12/gst/mpegstream/notes -gst-plugins-0.8.12/gst/mpegstream/README gst-plugins-0.8.12/gst/multifilesink/ gst-plugins-0.8.12/gst/multifilesink/gstmultifilesink.c gst-plugins-0.8.12/gst/multifilesink/gstmultifilesink.h Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-plugins/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Mar 2006 19:03:40 -0000 1.1 +++ .cvsignore 6 Mar 2006 19:05:52 -0000 1.2 @@ -0,0 +1 @@ +gst-plugins-0.8.12.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-plugins/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Mar 2006 19:03:40 -0000 1.1 +++ sources 6 Mar 2006 19:05:52 -0000 1.2 @@ -0,0 +1 @@ +023fecf32bdffea8e06e3ad903b88f9b gst-plugins-0.8.12.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 6 19:10:17 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Mon, 6 Mar 2006 14:10:17 -0500 Subject: owners owners.list,1.715,1.716 Message-ID: <200603061910.k26JAnYM006145@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6128 Modified Files: owners.list Log Message: Add gstreamer08-plugins Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.715 retrieving revision 1.716 diff -u -r1.715 -r1.716 --- owners.list 6 Mar 2006 10:12:28 -0000 1.715 +++ owners.list 6 Mar 2006 19:10:16 -0000 1.716 @@ -383,6 +383,7 @@ Fedora Extras|grisbi|Personal finances manager|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|gstreamer-python|Python bindings for GStreamer|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|gstreamer08|GStreamer streaming media framework runtime|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|gstreamer08-plugins|GStreamer streaming media framework plug-ins|bdpepple at ameritech.net|extras-qa at fedoraproject.org| Fedora Extras|gstreamer08-python|Python bindings for GStreamer 0.8|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 6 19:33:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Mar 2006 14:33:52 -0500 Subject: rpms/gsview/devel gsview.desktop,1.2,1.3 gsview.spec,1.16,1.17 Message-ID: <200603061934.k26JYOYq006343@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gsview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6272 Modified Files: gsview.desktop gsview.spec Log Message: * Wed Mar 1 2006 Rex Dieter 4.7-6 - %(rpm -q --qf '%{VERSION}' ghostscript) -> %(gs --version) - follow fdo icon spec - restore epstool bits Index: gsview.desktop =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gsview.desktop 4 Dec 2004 12:25:30 -0000 1.2 +++ gsview.desktop 6 Mar 2006 19:33:51 -0000 1.3 @@ -1,11 +1,10 @@ -# $Id$ [Desktop Entry] Encoding=UTF-8 Name=GSview GenericName=PS/PDF Viewer Comment=EPS,PDF,PS Viewer Exec=gsview -Icon=gsview.png +Icon=gsview Terminal=false Type=Application MimeType=image/x-eps;application/postscript;application/pdf; Index: gsview.spec =================================================================== RCS file: /cvs/extras/rpms/gsview/devel/gsview.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gsview.spec 10 Feb 2006 13:59:32 -0000 1.16 +++ gsview.spec 6 Mar 2006 19:33:51 -0000 1.17 @@ -2,7 +2,7 @@ Summary: PostScript and PDF previewer Name: gsview Version: 4.7 -Release: 5%{?dist}.1 +Release: 6%{?dist} License: Aladdin Free Public License, Ghostgum Software Pty Ltd Group: Applications/Publishing @@ -10,7 +10,7 @@ URL: http://www.cs.wisc.edu/~ghost/gsview/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # ppc: FIXME. -ExcludeArch: ppc +# ExcludeArch: ppc Source1: gsview.desktop @@ -18,8 +18,8 @@ BuildRequires: desktop-file-utils BuildRequires: sed >= 4.0 BuildRequires: ghostscript-devel >= 7.07-15.3 -%define gs_ver %{expand:%%(rpm -q --qf '%%{VERSION}' ghostscript-devel | cut -d. -f-2 )} -%define gs_ver1 %{expand:%%(echo %{gs_ver} | cut -d. -f1)} +%global gs_ver %(gs --version 2> /dev/null | cut -d. -f-2 ) +%global gs_ver1 %(echo %{gs_ver} | cut -d. -f1 ) %if "%{?gs_ver1}" == "7" # See http://www.redhat.com/archives/fedora-devel-list/2004-August/msg00068.html Requires: ghostscript >= 7.07-15.3 @@ -87,23 +87,29 @@ GSVIEW_ETCPATH=$RPM_BUILD_ROOT%{_sysconfdir} # desktop/icon files -install -D -p -m644 binary/gsview48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/gsview.png +install -D -p -m644 binary/gsview48.png\ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gsview.png -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --vendor fedora \ --add-category X-Fedora \ %{SOURCE1} ## Unpackaged files -# nuke depcrecated epstool, to be (hopefully) packaged separately... someday. -rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*} +# nuke deprecated epstool, when (hopefully) packaged separately... someday. +#rm -f $RPM_BUILD_ROOT{%{_bindir}/epstool,%{_docdir}/*/epstool*} %post -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +update-desktop-database -q %{_datadir}/applications > /dev/null 2>&1 || : %postun -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : +touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: +update-desktop-database -q %{_datadir}/applications > /dev/null 2>&1 || : %files @@ -113,7 +119,7 @@ %config(noreplace) %{_sysconfdir}/gsview/printer.ini %{_mandir}/man*/* %{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/*.png +%{_datadir}/icons/hicolor/*/*/* %doc %{_docdir}/* @@ -122,6 +128,11 @@ %changelog +* Wed Mar 1 2006 Rex Dieter 4.7-6 +- %%(rpm -q --qf '%%{VERSION}' ghostscript) -> %%(gs --version) +- follow fdo icon spec +- restore epstool bits + * Fri Feb 10 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Mon Mar 6 20:00:45 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:00:45 -0500 Subject: rpms/zeroinstall-injector - New directory Message-ID: <200603062000.k26K0l9Y007338@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7324/zeroinstall-injector Log Message: Directory /cvs/extras/rpms/zeroinstall-injector added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 20:00:51 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:00:51 -0500 Subject: rpms/zeroinstall-injector/devel - New directory Message-ID: <200603062000.k26K0rVt007361@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7324/zeroinstall-injector/devel Log Message: Directory /cvs/extras/rpms/zeroinstall-injector/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 20:01:25 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:01:25 -0500 Subject: rpms/zeroinstall-injector Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603062001.k26K1RbC009239@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9226 Added Files: Makefile import.log Log Message: Setup of module zeroinstall-injector --- NEW FILE Makefile --- # Top level Makefile for module zeroinstall-injector all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 6 20:01:32 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:01:32 -0500 Subject: rpms/zeroinstall-injector/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603062001.k26K1YQn009262@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9226/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module zeroinstall-injector --- NEW 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 Mar 6 20:02:00 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 15:02:00 -0500 Subject: rpms/perl-Config-Tiny/FC-4 .cvsignore, 1.5, 1.6 perl-Config-Tiny.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603062002.k26K2a6V009376@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Config-Tiny/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9288/FC-4 Modified Files: .cvsignore perl-Config-Tiny.spec sources Log Message: Updated to 2.05. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Dec 2005 16:25:31 -0000 1.5 +++ .cvsignore 6 Mar 2006 20:02:00 -0000 1.6 @@ -1 +1 @@ -Config-Tiny-2.03.tar.gz +Config-Tiny-2.05.tar.gz Index: perl-Config-Tiny.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/perl-Config-Tiny.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Config-Tiny.spec 30 Dec 2005 16:25:31 -0000 1.9 +++ perl-Config-Tiny.spec 6 Mar 2006 20:02:00 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Config-Tiny -Version: 2.03 +Version: 2.05 Release: 1%{?dist} Summary: Perl module for reading and writing .ini style configuration files @@ -22,6 +22,7 @@ %prep %setup -q -n Config-Tiny-%{version} +chmod a-x Changes lib/Config/Tiny.pm %build @@ -53,6 +54,15 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 2.05-1 +- Updated to 2.05. + +* Sat Feb 18 2006 Jose Pedro Oliveira - 2.04-2 +- Rebuild for FC5 (perl 5.8.8). + +* Sat Jan 28 2006 Jose Pedro Oliveira - 2.04-1 +- Updated to 2.04. + * Fri Dec 30 2005 Jose Pedro Oliveira - 2.03-1 - Updated to 2.03. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Dec 2005 16:25:31 -0000 1.5 +++ sources 6 Mar 2006 20:02:00 -0000 1.6 @@ -1 +1 @@ -14b7c75fec38fd59fdf6390093946d7d Config-Tiny-2.03.tar.gz +bac7f9eda771593c869313859fe45ff7 Config-Tiny-2.05.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 20:02:07 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 15:02:07 -0500 Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.6, 1.7 perl-Config-Tiny.spec, 1.11, 1.12 sources, 1.6, 1.7 Message-ID: <200603062002.k26K2du5009385@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Config-Tiny/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9288/devel Modified Files: .cvsignore perl-Config-Tiny.spec sources Log Message: Updated to 2.05. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Jan 2006 00:29:14 -0000 1.6 +++ .cvsignore 6 Mar 2006 20:02:06 -0000 1.7 @@ -1 +1 @@ -Config-Tiny-2.04.tar.gz +Config-Tiny-2.05.tar.gz Index: perl-Config-Tiny.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Config-Tiny.spec 18 Feb 2006 16:18:52 -0000 1.11 +++ perl-Config-Tiny.spec 6 Mar 2006 20:02:06 -0000 1.12 @@ -1,6 +1,6 @@ Name: perl-Config-Tiny -Version: 2.04 -Release: 2%{?dist} +Version: 2.05 +Release: 1%{?dist} Summary: Perl module for reading and writing .ini style configuration files Group: Development/Libraries @@ -22,6 +22,7 @@ %prep %setup -q -n Config-Tiny-%{version} +chmod a-x Changes lib/Config/Tiny.pm %build @@ -53,6 +54,9 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 2.05-1 +- Updated to 2.05. + * Sat Feb 18 2006 Jose Pedro Oliveira - 2.04-2 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Jan 2006 00:29:14 -0000 1.6 +++ sources 6 Mar 2006 20:02:06 -0000 1.7 @@ -1 +1 @@ -d14e3691a3fc357daa7ebe3af018c6b4 Config-Tiny-2.04.tar.gz +bac7f9eda771593c869313859fe45ff7 Config-Tiny-2.05.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 20:02:53 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:02:53 -0500 Subject: rpms/zeroinstall-injector/devel zeroinstall-injector-0.18.tar.gz.gpg, NONE, 1.1 zeroinstall-injector.spec, NONE, 1.1 Message-ID: <200603062002.k26K2tjk009420@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9394/devel Added Files: zeroinstall-injector-0.18.tar.gz.gpg zeroinstall-injector.spec Log Message: auto-import zeroinstall-injector-0.18-4 on branch devel from zeroinstall-injector-0.18-4.src.rpm --- NEW FILE zeroinstall-injector-0.18.tar.gz.gpg --- ?|??b%?c?N&?m?v&N&?m??m??m?8?~????????A?@?k!??Jx?k??????~?BB???8??`*~ h?9PA?/Y??m???u???*?????????O?U??m??????WA???=c????W?[}? ?8C?w?U?w?tb>??i??Or>???\????%?????~?? ???R?j? w??????q?j(???i?n8K??R_X??}?U/Vo9?????K601? s???`????k?\???? ?B?OL??c??f???b???);?Pzy?^@????/??5)f?V???)??lN?e????H????????E?????,H?@??????3r????*? /=???3b?U??s^????????jzq?0?? 7?g?FV?c????????+??$???VS???"??h?????u6?>???D??mXb?DG:w??Il???W?Y??????6:?(??&?b^[$DM??'??T??fc\?i?ve???O'4-8?lR??R:?????j"????????6_?U0J'?:?] ????`z???j?KT?? |o?h??=?og? ?ev! ?5??$??|f???D??%??F??2?-z??'????S???Q????V?(p?{ ???AhNRi?#??L~K??}>q??????G??# ^~? ?y??????  ?}?#>A????? dvfAS???2Q?]???z\k???????bmC?]??S????Z ??C??[g??GC?@ ?????\??o?`YmtXw?q?h??0???v?#T?>?;\? ,MR????M??.C????mw?? ??3/?4:??}??c}Z??(??2??/'}vg?d?1??i???????K(dkr?7??,?????3 .a???9s#??K?H??????z????7~W??P??????#?P?[????#>?k ??&/u?@k?.?????p?V??I?!0FGY?6?@p?q?HN??xvi??I0?P[??"?"d[?w??M?????P5??"j??N???F=???77??,????????n]?J???n/?????a??28????P????9e?A??-F"???dT? S??????|?{$M?!v A?????~[t?v???V0?????4??v????4/?M??f[??? v?????g????>???o???"???%llWI????o??m?>??[nl?\?? z??k+?Yy*??U????5??%;?(???7?LP???%????^?? #~? ME?? ???}?'E??x????2&?}??????z{?Qw?S??r??U? ?????*???T?? n??*?sh_??????y{qp?i?1?3??6??G:??rI?????????q?{??6i??#Ch?? ??r???k?-5?z????kC$??? ??& ??j??kYb?r??????~?S8??pse?b???TT%%?5dsT3?USg_?-p?W5??d???????O?,4.??G1??A{}???????]?zB?? 8 ??o? u;????F???Aj????&B?{??W??b?/@?????+C?fs?w???p? ???2V_??C?D???b`R?Aq?L?m?>?r??????>k?^T?5?4A=????1?O?!T?o???"????#d?.?l]???^`F??*O????~???? ??nCa??? n??????kv???6 ???R^?.]Y?j????{E?????t?? d?T?i??zQ?"jBj???5??V?6A??I?^??&?? h.???N?~v???Jh?UK#?(X2h?????"?d????9?g?m&? $?\?-??'W??7???c?(??q?$????Q?????L|`+H???c?2}??C?jA?i!???????????'bk?ay??o??*?? ????&???F????n????1??? ?s?D?`??y???"????P4?????bdB!?&g??s??*?l?`A)?Q????6?/Z-m??\A??,?i???!?O?d??=??????2?X??K????H?????F??A"?|??!???+????g?O??? ? (?????n??s_????v?aa?.G?/?(?+}?9??\?X?Ir??9?? ???????h?c=????R? n????- ???M?q???????? ????F?{??????o???????]??_?x??G-@?? p=????????0Z?yn?T?o?+gG??F?J?Qm??>w.???KWD?`??F?b???m??W(#??????????_?? T:??w???_??8???~???????>.?d@???????^?]????>?n?%???V]:eS??^?|" ?y??:\?S????xT????{?I???~-oS?Q#}Z?????&I??,?IVa?? &;?8w?]6C??0]|1.?'????+?N???????.'?t???[?vz,t ?X???7???@+?kQ?Q9W???"(??????NyP +H[?Q?'????Yp?%???????@7wA??[Q?m???wK?@G??y3?????z?9!4?0?_???-+b???+?+?*??-?E?k????Z?^._????????q?F??.i?3j|l??@T???d,=???h???="???z? ?Qfa??^"L~??=?.?q??.?*?????c???sN????????1??r???a?4????????f?G?!??l?t??h??SJ??9?/?pt?!?<9??n?Tg?w'?%? ? ??=?D2???!a/???]?w&???????I5?R????c?i?[6?????s???dvHl%? vv?Ft?)|???5s?E????A??5hb??)]?9z?EZ???/6?Sw??X?0a???D!/o??R5U?i???O?6r???"?`? ?x????R??????/?^?[w8? ???????!???=eT: ????,?a?p{??????? ??k-?(5????R?+?????Yh?;?????j?i?????f????+?????????????.??/I at s%3A?v?V?"????e?`?B??)Ka2 ???+??_??s'???dse0K#?1??NS|?X??M??Kv???=???b??g ?n????L G?{?????Qs????????-~?j7(???.??F????Hw?H???mM?H?2?;?!w????????Yzp?o???????r?? ?*??j?=\LMM-Mm>???v }???-?v?m???X????YG???B?ANIt????U??c????/???n??>o???? IKk? ??????e;8??"?\?H??Q? ??V?????AN$?+qd:???7K?a,??g??[?q>T??|?H?O??@?L ???]?G?? ?r???????d)": ??? ?=??????XX?yt???[?????`E?,?=??~?????????8?????[S???;?????????W?s? ???- ? ?;J^\?????l@"}s??h? ?????'65?c??T *{???H]?D??a? ?Np=M?????W?o{GG?c=_?G?:KkQ?c?}??? k????>??.???&?R?#?_???XWy9CVhj?D????BYRu??9???g?j??j????t?sGT? ?"?S,?PG?)???=/4?? zl??/*l? ?c8?W? ???i??1\?;?u"?;\?_?N??? {?mA(?q?a??_???Xr-S??F??K?=?9???Jm~h? ???u???3Z?1Q`/I ??jjG~?K?_??@?Y???^????4G???P`??^??>??yYRX??{??P?,????'???\????>???|????*?&??I? ????!?"$\m-??6KV?????U??Q?U???.,?l???9???)????zP????[+?????XBi?={n?{?{9>???K???P?^?#gN???&?????N3?69??,?????T~?f?}%qC??;?k???1v?'P?|???o??j??.?|???#/i?p??v ?U?T??VGb??^q6?t??????Wx??Z???ga? ?iM*K?]????T~????f(?*.?Vv?X?????F?~?` ??@?<(P)i??c???]Xb???&?T5 S????$? ??v?a?d?&\???._GON?v?? ;G`??d??S#PR-?H9?s/??~?9????o??[fE????? Z?????5U??[(???6l??,?O ???????a???)???r?Q?\l???G?A|? ????q?2*?"?,d????p????????H5??}?D?x??SZ???p???lZ?X?U[??<k?E??~???=Q>??????,a?R ;R'o????z??F??2???u^??^[??????X? ,??f?MV&n?|???fS"8-?Ug???????[C:I|#+eYj|`pgu??4J)F??Reh?0?1?? ???4?????g:PKe?o??z:?9>??Fj???){????q?5/??@??-?}?4?cz?,????gnuP???????G9w?-9??M?7???????K?\@????h??|WC?%??;z!????i?LV?s?\?e??T?7???.??W???RT????dVj?;iHk?\GZ??????????? ??yBe? ?o??I7?^??Et????d?4?Z?????W????B,kvY?k???Q?? Y?]*?h?B?m3>??F??O11?6??r!\??b?D\????]???5o??D???????????p???U??1U?bi2??????<5u??]U??o~?`"F??5u??{f??0?????T?N?"?k0?????k ?????4n?Nv^\?/?[??z ? z~?n?5p+N??y9?I??????g??????4;???? ?EL??q??~=d ?5t????@*? .JV&??????Y?E"? |?{?t?G?oU???M????Q??Q m?"y??yIl??????T??k D??Y?7??????? -??3?d?E?B9!?????????????hCG???????x we???_6????k????}?????T[?H?K%?????r?|W??m?????e?nV???L~t ?ZV??@.?%?????p^Y????????{?W??#*?4?m?b??+&??D ???:_j?Z?????t??o?%??`? d??=??X?]???4???;????Mk'?L??L|?X???u3I? d ?B?????*?????e??Z?2h6????\?o?b?E?h?q?5r?4?a???????Hln?&{???^??!??8?K?K?5J???CM?=? ?????~ ???????A!>??/?? ?[?w?-~?>$??xS??S??l???? u???X??? ???T?^?????HH? x/???6?a?4??????_???z??????v?j?~?Y?-/???19U?v`?b-v 'p3???Ya?{}$??????n????f??????? z?^??4?? ?????{= n?pM>'7=Z?h?}?*?V ??{?b???=f:?i5????????x4?N?qdO9xI?p?????y3pu=& ??/?M1??~,???mX0????(?C? 8O?Tn7X?a???D?x HL}??04~N?9??)Ear?B?o?3w????~9m??????????7??w???6??V?D?$????$?? ???? ???!??y?A??;???? ????F?D??[??r??1???????x??n?t???????y`?u $????&?Ro?2??????d&??6?}?????lj{>?k ?+"?:P?D??`|???fY??????Z??-??Fes??W2 *r???????k?z?>?n??d6j??z?&?????wZ??>???????? ???$r?a?;???`i?????RR??N??P??>? 0?#t?!?h?f? \???????^!?U?? ??P?mE????s???!??*??L?=m??Y!I-D-????? ??l H~???\g???ST?lk4?A???36?+?UD???]gr%E?????`?f???"?t???@????d??????u0( f??[f?s?l??????_#V?^??f???s???M?A?0??1?A??a????????n???,?6? J&?F??x85?tk????/??Y??qT?;?*??l? ?????5?x^O9?K}u??????3? 0YS??>?h?KRh?*u ?R??c??G?\?9??????C6?Jh???o??n,b?????:,d%?oB???^?(?? ???=?o??w?J!????=s5???D ???9 P+p[???IRG????? >???&?V?????l?$?_?fo*7????~?? c}???+8?N???i?????\uS??5?????&V??:Wb?:??b????-??????=z??#k??|?^??S3$??????????cJ?l?p???h(??iJI1?????Q??qS4?#?l3?c??dQ???M???Ay:??Z??;w@???????????#?Zp??.??? ??p?*? j??>oS L??W?^Vh?j???????\?Q?i??^??)p?h ?bH_&?Q?U?H?*?? Fx-/??R????.?????????W?z?1??tM3*??^????N???O?* ?=???`??d@1V?JF??Y$??r?`????g?x9'!?=?Y>??)???DK!??^?X? ??$?S/PF?)?d????m??iq????=4??????i??}'?~ "?)?m???A???a(?$H?9??2??;?????5??^y??#?Cq`?,?V?????`j?A????g?@9??N???S -,Y?*;??D????????(b??WGRy????q???m? s??9????G?5??????@??H????ol???? J?g??R'????Y?u8??@?=???ED??????nKp(???tBB???>?O??N???????/???\C??B? ?`?i?HAI????yLF?&??<|??nqs??D????t?L???(???M????? 9????9??????`????]???????@Z?N?Y%1???K?C?? Y?ip??p?????&???\xhjF?U??$TrTh+????????Cg??-? q?P????G??_?"?5a??l?? ???,Ho6?CE???????Yq?Z?}?n1d?'??P?S?%???????k>??$???w?7??;?n??s7*?.?l??/Z?x??k?s$ ?f???????E????? ????[?r??X?^+???Z9B*\?????|I?o{???78zt?1?)V%??N?5A?i>?^??w??Tfv?d~hv???!??z?1rk??$T0uWM??[w ?????Z?zV?q?R?z????|?????61?x??????????? X????$??mu?,?F?)n?}?lG ??.??r)?t?.???q.???*J?????@B?L??????L???5?(?T)?k/!??o?2&?y?+?|t?K+G????_Fv???^?u[?Z^?????,???r??0E{??4'?5J?q7???Y??l???V?????LQ??????????Wt?tH]?=?d{??{(q????????ZyqC??'S???Ii.=I?]???_l"???w+ Q%#?U???\?{w??????1??>?s??Y ??)jl???S??\??wv??{jC???w??I?^:C?_!? ?? 6??j???? %4?m?O??Kl?qvK ???>?NO????%U?I???v.?z???=???G"/ a? ?>? ?/?FT?F??D????J???=R???L????z8]?a?C ??Eo???c?#y?Q-????t?s??d?Zs??????????FK?I????8???]&?7Y{?].?B??0?? ??q????????????`???o?????(?E??a0??7?????n?sK?#??~?4??=2?d=???b\?eP???1T7?&??D??i????w )??????_?B???2?7(???,~ ?L???f??,\y??!v ?e?Z?q?? ?h?J????r?"]zu?[?W ???????BX?U?k????k???4???????3? ]%N?3G??u???}??????^G??~?? %??=?+^?p?P?p??J???\~$? ??>Z?d?r?I??G?-J?? ??[r?????M???O?q0 ?@??\m????X???&??w?u?h?????,6????j?? v?@????3.A?????&?)j?E???o'V??????C?^????G??????S????AZ?Wz?c??J?ai?&D(=?|p??!hw????Y/z??H ???!f?_??Y1?]?-?3????umk?????t????M??f?????7g???????)?J??????RQ????5?\????V?N??-???!?ad??_e?tiQ#?Y???8??????X?gg?/??d$?????????????Ru;?s???|????a_\m????-O?V????KU?2JK???????we?fegzH?S???? ????2????J???F?]?I????SY]?w?x?p ???o?????=?[a??vO???z{?K4??>????L7mp? ???????^??v???&6?{??K?y??/%;?????Q?}??o?I??????jh???m??iqr^??{1?=?hf???8A;??I???k???#=?~8?????!?ur???$???}?!??d?&?????8eCQ(^s??ml????l?V????"?W????????6????X?u?\J????v??<? ??zm?y?,~????l$^???b????K?? ??_???7???????=???w;??qW?S?K? U?~,? ??]S???\?^?l?W??5 am[o?+??:8'?}qC???5?????.??f??C???O 4S?n??D ?+????4D??!?*?@??n5?????7????K??)U?MOU?1??p?????T???'F(??#w?????????T+67?M2`?N????}??0???i?kD?Ze??$????'?????:S2?????N??@??????? ????p?g?????? m???R???Cq???Ps???^?y??i,??????u?.??q:~??N^C??=?{??Ms?=?d?2??Y??3?G{?)?z;????^/???U?3??;Q?Px[g ?N?yegh%????{ ????????Z?dZ?Q?????g?,@?ky?C????LC?N?[{U-?n_"*(?#7??j?s????&p??C??WUV???z?>R?"U???9?{??"!? ? %wS?,Ob??}?+??S(V"K~j??????RI?`c-?-[m??N@?M?7u??n??6=??)??V?? t? ? +???Qv+??xf?[T????&?[Z?@/?>>??/??$]??R??&?G?##?5??RR?R*?G????????8,?????9??!?????:(h???P ??$w??????T?'??????-|?;????? ??&?j0x?????z}??Y6??%VC??&J?zK?2;?? ?W??rc??b? v` qO??>L??[????gz?/?!??a?sM4{??O{"????'???????{S?Ar???'????LE/?|???r??'NZ~z`m?##cT_}Z?????B??=j???y??v0??#^*x? lK?(??Sq>C????????g??????_W)??o?t??2?a????'?I?i]???^s? wEb!???#?:?`%??n?.?7???%?,Ek??W??Gt??,????????$o????.?$Fn??@??I`?????I?j??@ =?'#???LM??L? ???(??4!??.??\/)}H^a`????`??yH;"?/?\???j??|?>b???????kXe??/?K?? ??2?F? ?M?_gU??q???6?????}?????L??g??d]? =????????????G?? d?v)??:$e????q?????B??n???(EI~????R~?????????%????1k?XJ E??~??L???' ?????US???? ?`rAJa?c???+???g#???D??9?*????????Ze.?H?:?W?~cJ??N?q?"g ???f?@??K??q???#???_?H??C?? c?(8??(? ??Fe???^?@?????C>o???*JRRZiK?????k ??NT??E?)%??,X??[f?9?J??f,?M~????"H0k???*6?u?1ke?????? 1Sb%??? g????-??W?;.r??????:??6[|?????? +mT\????^G_1?)?????D?m???F?F?????=I*'??<[???8?:?? ?5?~????? ??@ ???!V? }??,??!AT?????G ??Do?a???????hB?????Wr???0? ??I@Q?? ? ?i?]?Li!???E?? ty???ow?XF??? ?5?"??t??`???l??B?c?g?8????1?j??&W9???M6j2?:?Y???????)????b ? ?H:`r? ????"B???BC?<[?J5??????????????"d?????@-7?),??tMm?W4GCi?W????9?5z?B*??+??_?????=?6f)??_D?x?y???P!& ?'I_?I??SJ??g g?C??]?!?xc?e??? ??DA? k~ &? !?`+?z?)????????nr2wM?%:?JI,??{ot6]??g?#-;?A??|??G????^?;9????I?kh ??g-???Zg??,/?_??^????????5=???+=O;~0`??DxAO5$???$??????g?2???J_)?? ??<??1`Xz?R?u? ??e?]sz?????b`????#?C???H`J?}?S-?5B}^???K???????? ???????cmM#)??vF?1r`P=?o?(?AN??i???????Z?LV?#?)??0c=?'7G{???-??b%j?Nx??| 7YX????A?LCc?n????{?v?}? ???X?????6?????*??{?^???[5fV ??cN???3??????????[! ?2??6???, ?:^|mi8?z?????S????0?OB C?{?3??|??N\F\????qK]?0?V]V???M:+\????9??y??? ?3???\??X???q???x? ?l??8?k#????Vw?5?)???'?>??>???=!kK???s?y!??I??^:????um -?O???JY W?fP??P&?? ?????I???)?2^?X??O??}>a???k???Y*?.???????}j{?k`???.=???????????B?ci-XH?o??y ???a^??#om"?????(?4D?? ??'????N!??@d  $?\??\m?????????Z ??jX??U?W????R???b?#jmb {F????a}?@^hv?e)?? 1;=?n !? ?4 ?dVNc?N?k???&!?U?W?X"? ?u!?8???????z?????$%?????????D??A??$???$j?A?@?=???X???d$??_ z??f??a?l?&???/nx??_??f RY"????????w???????3 ???sX?[.r???????? Vf5+? ?unK??? /?E?/?3????zF????M'w??5??}_??V?A&??(?[?y??p??F???????mP"???"j?PU??8!?? 0h0?????7?p?>e?;????T??>h?^m?L?J~??*? ????^07???>??}y????H??????~^U!?`???:80??f????v8?YXD?)?l??Re??????*:-??????3[?_j??G??? ????@&=7E????[???E?w?????????????Zk?Z???P?? ?~>kvg?Q????9??*%?#;S???JH;]?s?? ????_????;j????D ????&?,Ml????o??] ?;%???i_?o?sC(?Zc?? J?? R?? ???6?r3??AMR????c- ???????TXw????k(?[?s1?}??&~??r ??K? D???o??j?J_F?,a????AU7????0??????_]B??+,do!??l&????b? $?vKi?'g?<"?z???3?????Sc5???k??z?>???sE??m?????E_?9? ??T ?q??z??0??!?????C??|,???#BL?????????Wcd?T?;?4?Lm?Th?~?zi??o???Y| CD????-?v??T*?? |[??rD?a????#??7.???y :1?aOZW???,??J????J?2/v7A"??f?u(?H????,) $p?{1??O+S??@p?1F??p,??]?a?O ???J???`? ???$??r?[-P%??k?;b???n??'??K0>H??HS?Y???"C????|?f?e)?`:P;??4???c??r???^Q$??w????? ??{???K|o,rj????t?6?.`??T?????T5??\??}?1~?kV}R???]??'????:?(}???????5l ???9?L??i? ? ???????o??^?6???f???17#???L?V???!b?????o(??i?d?|??&?,?V???>%f??H?W? Uz?F????A6J?????;^?3?B?E?c????z?5??????? ??A???KfN??W????~?1y?7?h?Pa0??`{?????????v???:?r?;???U???(??W0G?? ??~??5?"?5R??'??|???#l|????d????p?:Go:?0??????S?g?}?JY??????-????@hNS??m???1?Y??$"7?g?? ??Q???BL[?????%E??_ ?????cR????c???v?j?] ?? g]#N?? ???:Ad??Z?.??1F???????aJ??I?SOaw?V???H$???%$??? #??saw`???2+???o?K?KT?????C??dD?o?????x?W????? ???????????????Z ??????g??x??n????EC??Z?????:,??!?V??z?g?????z?z?w?.:?n???y??"????}-?S[??? ?????????7N??!q??9?????????\R??z?GQk?*+?kGm6??]:?6??????1,$??hH? ???kc??????]_kQ9?????oTpW?;s`?\f????????q-?hE0.??R?????/)4????&??GQ??e?k????mF?6??%?????b ?s?????*e???l?l ????v??4???9??__T[?#s?'??_??t??????z9*?j?????v??????^ ????{$?D??"??if}????;yW?w??x?N?+??? ??"y?`v??(???C?z?7??( ??? )?0???V[z??????E?P?"?EQrlO???09SWW?????@l???????????V??A:?x??wt??u????E?? ?(??q!?_?!??=e N%/k??]? ?`???j???d?y{??*/f? ???fRI???5????U?}B???"?bc????&mm?Cp}????????9?8N]C?t??????? $(??a?M???W/_?+?????_e^})Qim?6(??s? L=?\Y???Mp???Q???d?St3?`????y??+?????!\??F ???.C?y'n???????2 i??8????\??b y/?~?????{^e??LLB????v??/0???????????w??y*.7???m? 8??????$????j??:j~%?Y?X?n??6 ?O??{w?cb q???+?T?b??)/?Z'^?j????9???~?!e?V??(?/?u?h | 4?! ;GN?("??#???u?Bo??A????mhFm?q???L*??%?;?-g(?M?????????Z(??4?dBl??B?YO??5/W?9BG??R?{F?RN????M????V ? ????b??d}????T(;???M??l0?]??????s6;}gc?nez??s'X??x??`?1?????X??i6h????Sj4??T~OQ????S??0?Nf^{oP/?????????H?[?D\???1?FKi-?q??hi??D???:?/v??\???-?vxH??? ?U??????)??`????@?q`??3???UJ9dc?"?v??R<-? ?K?s?????'?;'??mF?`R??]?>?+M?U?`??Yd??J???k???`~D??c?yDi?W?? ?G????4????dn?A7?1??C?I9?;\?1 s???kI^??NX?@???[?Rs?&?>?? (?CHV?c? ?Rere/o??6*??|??+`D}?.~'????X?'????w!? ??+??? ?YA?u^?Y??"???d??-Q?Q??#??b?on ?h?????Y~????i??6???J??o?)z?JV`BASF???h y]-?>?o?4???1??????????>??l??a?5??Yw??_???????I?X ?T? ??q??W????Z?wA ??)??~-w?y?Z^???_'RJ??SV????'ZG?????LA?.x???r??T???Y???????8'^?q?/??m?o?j>??+???  q$k?"8H??B?????h?y????D???L]??o???;Z?=?????*?'t? U?OU0& ??uN??'1??4u ?C???Z??^&_.??????0j/Kl;??~????PQ3??-???e????%P ??????/L??V??K_l%?Q$???uv ???eO?? ????B?S?rY?`??g3]?k???@n?-T v $?7??,8?l??=G?????w--??H???W???;# ?[?E?J?@???1f?m?????dq??{??;?X??4]???i?)??yax??^!B??i?????OviEI~A:b4?????.??T??)?tp???k[K?????P?z??? ??? ?}?J"?kS?)??w?%*?D<?f??w????:F??????oo??JM? ; ?#? ?-?X??~z3?9f8??S?????k????7? ?????Pqg>??^(?N?[???(*???dD???\j????S??y,?? H-^C?I$???? ??mK????????XM?I'????y?d?|," e???p?X?i?/?l ?i^???Tl3??\>???W?p??]??$??@???u?uZn?+v?@?y??s??"d??????*>?Ys?Bn %`???9???l???]JXM? ????\???.?-?.M?x[P? B?7>???3??P?5?J?K????Y??????5^;;<{[r 2G???=???\???r??+`Ib?]? d!?;??-??_???????$/?5?Kn??????O??_??G?L?????|7e}?????5?e??g%?_???S?7?6??????l?1??????s??.??\C????????'????????;?lb9?{Q?H????z????`r F; 5!b\???&f`?Yc0????@0???<yO?0?Ztl????`B???w??0??]6?c?jk?? 1???? ??X??????kY??M:A?i?,?O????LHP7"??%?? }?f??M????m??L?H#gfX?:??g??????????%?|?" ??;???c?????.S,'?????z=V?????!?6?/???)_C?X??N??? o?? ?? ?T?k???L????*f)?ep????GK???aK??{??a????D1e??~l?W=`????1?.??@Pb??? ??B???8(q?Jw???`?F??? ??????C?????hr?g?q???????m9???,t?{c?h??u--g??m?&?xb??:h??6?? 6}\???2j?# Wx????DH???????E?e`???xy??"?i1???u??V??-D?l?Qv7??w?N??f;???Nw?K??2Lt??N(???1?su ?????z3f??? ????=;??Ti-??v??"?u???? ?????o?I??,?6?=??????.=?]M?Zd9??M?g?M?u??? f???i?K\4??=?Cwu?w;??O????o?b?K??p?,?Tb??? ???Fz*P???J?e??;???" _???_???{?br?L???y#?ew??Un?2????8??b?l,????]pY????@?????&q??'nisNn\7;?#>?4?c?????#?\? T???_?_?a?R??????I??9r?*?s0?'mJU[4???W?:?:s+???{o?P?Jh?e^??zB?w?t?`rV?E??=?f?0|?1??l?H?}MI?Bz??=??z7v?u?2AmM??D MT}?M>?@+PL????7?(??????h? ?k? ??????Q??PRp?\?[.E?V? ?B???ni? ?;x???V?????Np9?????Kx?J-????S??|??T^>}!&??L?4? ??r?yv??a?iH;&)????X???`OI????a K???i1?_?4z??,3??6Md??$5???J???uk???p???????]?WB??l??A??? M????2^?8Gw|???4?/??e?@c<h?H????B?~?Fk??k?$??I?~?lw??8??\D???????R{??%{7????7??(???????????i?a1?(A lf????;??r?Bf????????B?? k?#L(???2??2/nP&?t?????????t?}???i??P?Ue?_gF?6??????C?H/ ?9D?^a?k?d????K?hD&?mwB???6?e?]?p?%?}4-x???[??5??!?b?xFf%m5???+/>?P!?\??T???[ ~?OH??'???$?`?k.`x??pGK????@?(?jn)?4???????u_?,????????????,;??D???*?????l?P\?5?/?m???e]??* Z??3?@h?t?{???^g?H;b~??? ????C?~` ?D?n??p?oG????S????\q fs ?6???4Z?F????Y|?!:????7??`???????D??Jq?Lh???? D??????7kQz??:?9jZ?0?n?K|\~Xq|??d?{??b?tH?_?]o??,????8?????r?$8??V1?H7?????&???_-???v??:?E?????????????????_y??jR? [Se??R?|?D?H???~?+?w??,?f?q=??)E?ta?(??GN?vK?????O???OH#????W?S4???B&???I??????kh?q?[K??????? ?{???`??5j2;g????Y??\??$??N-s-?N???+'oHk? ?dv??|???5???n?A????m"|?Vlt??F1?auX??m?l?????l????)??G?>? ?%?F?x???,???(?/???{e?=Z!???? ???\??b?\k?~!?????@t??????B?????????U/??n?????? ?????$p?%C^9C????b ?????????=?1h?? ????????%?-?m??????????1u W? ???o'?Q??i?7??8?6b???n????e8w"?JVk?8??????R??`?8 ?8N???????E???h? ?i"? ??P??\??hC???Z?u>?%?0?????????1??R??tx??q)EC?c?=vUt??Jf*|*?}???1?gvM?*. ??E????? ?????Mx??{??1???????(???????Z? d????p^!??-?7?*.NN?2?gY;x????'??\??CGz?G<5f???A??\?Q`k???pdcz???F?}?0E??C>?N/n??B?>(??2?D?<`?K??? ??!2/}@?_T\S1????f!?m?&!?Od????J????KOb???H?,?H???,???O?,?9??]?j???????fjb?Sw%????6Q???*?~?????S\7|hFlv??P?H; i??E?_??? ?3L2?!????????M????????mC?/?w?e?? ?>"3??%??????,?????U?k??????%?[+?}?i?m??????0UI????CgG-??X?????X?TX???!??,1? ?3=*Z?h???2?l&?????XM???e??\?b??vR23???[k?Z???}7???????B?It?w2?Z???c???~?m:[6o?1  quW???????b??5? {??Og ?MZ9?P?^5Q?h??OE??????|Q87~l/?PE?s~b ?K* ?o?? ?w??????Y????{?????????/?VP????y????C?????K7?n?~SO??f???ANE??i[lE??k??c??;???3 '?A????????g??-2?8???f`???j`vi?S?zi????? ????'?Xw?0???B???S2g??5??E???8q??"??1c?J?v?u?V?5?????????sy??????????/???]???????M???d??I?6??;w??OB????z???????d1?f???-!.q?pxa?$Y5???C??"???aw?l???j?????????????7%??F<>?????O?X??F???Pq:??N???M?=???X?H?"V??j???D?d?F?T??8??5?}??5?SV\?2?????}r_)?"%rL??? ! ?:??V??T??&?0?Y????? )?7??????????{?(????w?????Tp??~??????|A?|P??"HS?? ?175E?ByW*?PDt?c6?1I??,????k~?k??n,?d???N/m?e???e???0 ?S*???X\?b??Y?L)K??80?=??@????3?O???R??&???8????,m3D??~?{?C??N7??r??z??8b??[?????????K??w???0v????/??,?{?7????h????7? ???3?y?$ ?#I?? H/P??E?7???sy???6??????y??t?C?c0?]~?SK/7De+?F?m&??4O?j#?n ?Q??S@@iK???Z?@Y?)??3?6W}"*?'????`V?G? 5?'[??C???j?????????*w??v???f?X9???X??6^8 ?/??LW9?:?I ???x??h???????P?!W????(o??M? ?)?=?q9ky?W?Sb[?7????w?P????????L?j>.@??iv?(??m??E#?H?X ?I???????R@?v!??g?o?q???,_?????l?s?Y??T??w)?????]U[?-U?BC????4?U??F?#??6???S??W?? ?????????0??I??????????? ????3????w?| ?uwG?g?M???\z???`?m?????/?{??n j#?6?????????????????,W?>)???|?YS??rP?/????: ??K??????:Y???????wHX????b????-???!?y??T?`J?6o???\???????i??Y????c.????f???o?~5?xsb??3?????]Ue??????L???????Ms????C`T?!/??MeT671U???~v~K?#?w?FWVS??:N??? ??????{Db?I?h??F\?o?v???? ;??-?R-?SSP??>2??W?n"? ?k#;?u?s???H????x2?P?e???M??r???????_?@??m(y g? ??.?Od????R??????q??t???? ?>??q??????M??q?r???.?2/??y???0????f???_2?D?????????6??IqDk(?U?=?z????? ????2?\???-h?n?????[??u4]D?9??{?.???a???[1???/)Bg0w?|m`???#m \?X0?M?6?Z?0???YJ??q?9??]*?~?T[?k??fG4BV??k?G?E????K?Q?~?????A.???6P{?(?L Z??U?????u?"????)?F?????C1?. x8?w`Yh? ?O????_L??Y???at?>???v?????????/?n?o??Rg?l??:???*??????1??\???q???sx????5??5? ?Et) ?6?z??d!?;a????\???hu!??>M???{??G>!d????#?????M?x?oxf??9????l???????&A~?????n~??V?^?c?!ul&QQ???6???n???O?Q=????????J??;+?>Z????????O?ag?3?B???L?3??kyK?+wq??U-;??.;?U??M?X??o??U?w???~R2wh1?"h??q?????@???U???i???3???g=N??B?r?A?%???1?O1?A???? ?r3o?#?dU t?>??[?r!@?Iu???R???)?w???|^???k?,???%?t?rpo?b???/?IG?^&]?\??????9???????*????a??nC?X}?I??~&????>??[,?_Z?9???V ? k?;?[????4????J????????9b?${??N??-R?? ;??WPh2???}?+??)??V?????b.????7?????Q??c?f?q??p??? >??G?`???h;5[??\?~%fj-?,?c5??q}?}??????????f?ms??#??;???< '??a`?m?????|?cf=b????av}????3?????vvhL?kA 8 ?6h?????/? ?4????X?+z?@t????Y?)?E??????j???x? ^?_????:???;?/=G?f?2????'(?p???c??W?I?1j???m???)?????](??A??G ?????!i??%??????G6?*B??y'????? ?^f???&?8????;{???A????Q=q ???Gx??????bw;?PP?+7????Y??? ???Fe7?=???]u?!?18^0 ? o????????u0F? ???D????????YF??&|Q?yA????C???.e%?6??|?3*?]?j?1????L*?3??hBi???; ?????|????v?7?b=N:??g?w??9??2En6?op'^????p"??x????]??_]?M_?Rw?.?????d??|????*??pQ??f?S?{6????q?D??1ZK?b ?Z;:???F????%?A3Tqm-?U E?NV???(?YE???v;??????.???????bR??Q?|?????-K?"?Ar 8R???)B??b?b???H??W8R?????+?1\?:T?????i????k??}???lmB5??????9#??? K?{?B/?M:k??S??????|Sw,??)"?&|E?1?o]???p;??K?SMC%?"?????\?_^ak???^P?????U???M?|?A? i' ??????6??3{m@?:??42?N0CL???h?-??ar?"??dt??C?Iv??L<+k??? ?z: ?Z??B]?????9?????}???????F?.BX???"?4? ?F??\ZO}?` ???st????????b[??^9?E????3V???==?-??????"??????Y(?BN?l$???w|;[???????ZIK??#*p_?Jr?((???h?-^? Tu??????q??X??:?T??????3?|e3?B?4? k[?H(DPIxm"]A?\??'5^?o?6???/???e?N?/??ZDn??kt?T?T??$?????L??uf???=u? ?N`??B?N???k?R??7?? ?1???????$gf?=???$????.l/dqKW?^?Qc ?'??PA ?YD??k??C?= ??.?"???!???/UGHon???v?????i??????A}????l?d?x?? ??x???(r????M??????2???E8???-?0s;s????'H?(?* ? ` \?Y?]??6??>{???? ?q"?Z|??5|?m? ??????_#???i??L? Z??[t??q? ???1??L?za?nb[L3?!??R?%??G???P? ???? ???zmXa?0?v?K6V.X[8???????f??&?V???????~??s;?=?c+?????Xl??|??}???????r&m?j{vf?tZ???? ???~???????k?+???EP???z14,T?a??E?fe???K`?????),I~(???V?,]???,??"?? ?V?m?? ?}Xz(?XH????^??5k??1?zV?3??y?(?>??S?`7L[????????g???F???P???qZ?~???{????>??Q%???vWZ?D*g???RX??y??3?M5????g??? ???? a????@?????`?:??T1?r?"~"????#i:?t????/???m???????y??5a?v??be???v?[??ui?;b-g?1??&?<JMeb^?~?u??^?P?Y2?Ac?-?\?f{]9??Ef?W?????mv?Y?7? ;r????w??z-??r>???\??l??????????Wx??h????:>??w?+?g???t?<^??[????????~o?o??=? ?????^???v???w?8w????7? ?nR?>??e???}?'9?? X?? ??# ?"????kh?F ?????|??z??AB??';R?? J??_/??????l???{?i?\?????J?8?Ip?]v@?r??(?u?uq0??????7?V$$ad??@?F?h?-?$?5???? k?=?m??????Tp???}??Sko??????A??Y??HN*X???? ?FGOy`?dyS??8?e -?E????e?a???`?}40?T(???\bF???ua?R??M?&?(?x(?q?7W??????*? .u+hi?T???+?Q??]?L*?{?A?$y????P?1?sa?????? 7U?:(F ??[?????.????0au?N-??????? >? ?0#b1F?????jfI?v???6??&O??@,%????;??DT8?? 0?g????K7??????????a#Y???????N?mBH!?T??S????s??????c@?rxg?? By?? ?ia?x`O ?Q??s??@?O?ZG???Ry?P?C ?$??n`P?$??D??qK?Fb*???^?????5.????U4???????#1??l?=A]`y? ?X?? ??y??1-???U}?8???mi?? ?????:???c!4 ?????R!D?????A?$?JwN???QE?9 ??-"A c?FkP?Og?H`???NA?E??1?hq?bE??f? h??S1?g?V4}?????4???+??x?C?"4?B?? ??5?j`??>??????????6????)0?I??M?$%3b58?a??6???l2???-M8???????Vy???$?[?-?????b?)?t??lh??????W??I??B????&)]m?;?~|":_??nZ.f??mW???WG??/?`??9??h???a????k0???W??o????,??6???G?????????|5g"k??ML|???4x'??? ?B???D??? v?????[???ML??e?F,??H6???W?+u???????d?l ??%?S?41>,Kjf*?s0 ??O8?BS?@?1?} ??e-?L ;?*?A?X?? @???HJ9????J?C*\E??*? )1??????????r?%*Q??} 9?F??e|z`???5???A????\?2a????=y@??????0?`??=?l ?????|?'?aK???\?E=?n???h?;?=???? Kr=(#??q?$?Z&p(?0'1?:a?????P??F{}??s:?1?L$?u4L????0`?vEz??x??@ vRP???C?YT> $?;????Q??*?X?????1?J??c????5???J??l????=?d?  ?=`?MYDC:[&???o???h???:=?????1??LL??S?Z?Z?U`e? i?o!???8J????? ?J ???E%.l??{dV?^6??V??????d?{?????NIi?oLlMjWT0$R??!=i~?>??9?B?????????"8w?_??^a??!!???I`? ????z?9Tl??? mT?H??d??M?? ?i~G????m?B????????r?-??Z 2?\|?y??_??????????3S?04????A??Wy??f???M??_????M?A o?w??w CQ>??7?}?V??'D? ?b??O%@??\{???????:????h[?ZT?TI?????{?>?`^?*b?c???2??7?d???? de2M@? ??. ??O??3??"TO?????????????N?p??$???G??v?9*???$???:N??db??$??9?VuH?Q?e??o??????!??)?? ???> ?M%?#?? ja#(? ???_?&;?.,"?P????X??Q??c? ?x'???$ ?c??r?gH?M????huY?+QU??|???????A??Z???#? 5?}?>,I???W???????oL???????6i? I??/ jS???Bl9[G? ??o???57+?VE?3?.\??(???????0dXEa?h?Y??7I?B ??????#??G-?Y??.?1:??u?)??,?6?z'??@?@6/&?b?s??}]]+uaY?y??? ????n??????r,????o?????? B?g?&???@?????;t??????H?{9M?3??B-? ??{?@?PuX'??55+??uv??X?? --- NEW FILE zeroinstall-injector.spec --- %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: zeroinstall-injector Version: 0.18 Release: 4%{?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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python gnupg Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: PyXML pygtk2 gnupg %description A running process is created by combining many different libraries (and other components). In the Zero Install world, we have all versions of each library available at all times. The problem then is how to choose which versions to use. The injector solves this problem by selecting components to meet a program's requirements, according to a policy you give it. The injector finds out which versions are available, and downloads and runs the ones you choose. %prep gpg --decrypt %{SOURCE0} | gzip -cd - | tar xvf - %setup -q -T -D %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 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING README %{_bindir}/0* %dir %{python_sitelib}/zeroinstall/ %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/0launch-gui/0launch-gui %{python_sitelib}/zeroinstall/0launch-gui/README %{python_sitelib}/zeroinstall/0launch-gui/injector-gui.xml %{python_sitelib}/zeroinstall/*/*.py %{python_sitelib}/zeroinstall/*/*.pyc %{_mandir}/man1/0* %changelog * Sun Mar 5 2006 Michel Salim 0.18-4 - Removed left-behind pushd and popd * Sat Feb 25 2006 Michel Salim 0.18-3 - Add Python-related requirements, BuildReq on gnupg to decrypt upstream source * Sat Feb 18 2006 Michel Salim 0.18-2 - Use _mandir, discard CFLAGS and unused python_sitearch definition * Thu Feb 16 2006 Michel Salim 0.18-1 - Initial Fedora Extras release, based on upstream spec contributed by Juan Carlos Jimenez Garcia From fedora-extras-commits at redhat.com Mon Mar 6 20:02:46 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:02:46 -0500 Subject: rpms/zeroinstall-injector import.log,1.1,1.2 Message-ID: <200603062003.k26K3IUq009466@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/rpms/zeroinstall-injector In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9394 Modified Files: import.log Log Message: auto-import zeroinstall-injector-0.18-4 on branch devel from zeroinstall-injector-0.18-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/zeroinstall-injector/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Mar 2006 20:01:25 -0000 1.1 +++ import.log 6 Mar 2006 20:02:45 -0000 1.2 @@ -0,0 +1 @@ +zeroinstall-injector-0_18-4:HEAD:zeroinstall-injector-0.18-4.src.rpm:1141675357 From fedora-extras-commits at redhat.com Mon Mar 6 20:06:49 2006 From: fedora-extras-commits at redhat.com (Michel Alexandre Salim (salimma)) Date: Mon, 6 Mar 2006 15:06:49 -0500 Subject: owners owners.list,1.716,1.717 Message-ID: <200603062007.k26K7MSj009586@cvs-int.fedora.redhat.com> Author: salimma Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9562 Modified Files: owners.list Log Message: Added zeroinstall-injector Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.716 retrieving revision 1.717 diff -u -r1.716 -r1.717 --- owners.list 6 Mar 2006 19:10:16 -0000 1.716 +++ owners.list 6 Mar 2006 20:06:49 -0000 1.717 @@ -1511,6 +1511,7 @@ Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org| Fedora Extras|yum-utils|Utilities based around the yum package manager|skvidal at phy.duke.edu|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|zeroinstall-injector|The Zero Install Injector (0launch)|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org| Fedora Extras|zoo|File archiving utility with compression|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 6 20:17:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 15:17:17 -0500 Subject: rpms/perl-Log-Log4perl/FC-4 .cvsignore, 1.2, 1.3 perl-Log-Log4perl.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603062017.k26KHqON009836@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-serv9692/FC-4 Modified Files: .cvsignore perl-Log-Log4perl.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Feb 2006 16:19:16 -0000 1.2 +++ .cvsignore 6 Mar 2006 20:17:16 -0000 1.3 @@ -1 +1 @@ -Log-Log4perl-1.03.tar.gz +Log-Log4perl-1.04.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.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Log-Log4perl.spec 9 Feb 2006 16:38:09 -0000 1.2 +++ perl-Log-Log4perl.spec 6 Mar 2006 20:17:16 -0000 1.3 @@ -9,8 +9,8 @@ %{?_with_filerotate:%define log_dispatch_filerotate 1} Name: perl-Log-Log4perl -Version: 1.03 -Release: 2%{?dist} +Version: 1.04 +Release: 1%{?dist} Summary: Log4j implementation for Perl Group: Development/Libraries @@ -92,6 +92,12 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. + +* Mon Feb 27 2006 Jose Pedro Oliveira - 1.03-3 +- Rebuild for FC5 (perl 5.8.8). + * Thu Feb 9 2006 Jose Pedro Oliveira - 1.03-2 - Added a couple of comments as suggested by Paul Howarth (#176137). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Feb 2006 16:19:16 -0000 1.2 +++ sources 6 Mar 2006 20:17:16 -0000 1.3 @@ -1 +1 @@ -2b471ec7e844a2b603239c3808155b56 Log-Log4perl-1.03.tar.gz +5df5587f17e46be23cf50c9eee73046f Log-Log4perl-1.04.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 20:17:24 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 15:17:24 -0500 Subject: rpms/perl-Log-Log4perl/devel .cvsignore, 1.2, 1.3 perl-Log-Log4perl.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603062017.k26KHuds009845@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-serv9692/devel Modified Files: .cvsignore perl-Log-Log4perl.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 9 Feb 2006 16:19:16 -0000 1.2 +++ .cvsignore 6 Mar 2006 20:17:23 -0000 1.3 @@ -1 +1 @@ -Log-Log4perl-1.03.tar.gz +Log-Log4perl-1.04.tar.gz Index: perl-Log-Log4perl.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Log-Log4perl.spec 27 Feb 2006 17:45:23 -0000 1.3 +++ perl-Log-Log4perl.spec 6 Mar 2006 20:17:23 -0000 1.4 @@ -9,8 +9,8 @@ %{?_with_filerotate:%define log_dispatch_filerotate 1} Name: perl-Log-Log4perl -Version: 1.03 -Release: 3%{?dist} +Version: 1.04 +Release: 1%{?dist} Summary: Log4j implementation for Perl Group: Development/Libraries @@ -92,6 +92,9 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. + * Mon Feb 27 2006 Jose Pedro Oliveira - 1.03-3 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 9 Feb 2006 16:19:16 -0000 1.2 +++ sources 6 Mar 2006 20:17:23 -0000 1.3 @@ -1 +1 @@ -2b471ec7e844a2b603239c3808155b56 Log-Log4perl-1.03.tar.gz +5df5587f17e46be23cf50c9eee73046f Log-Log4perl-1.04.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 20:35:50 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 6 Mar 2006 15:35:50 -0500 Subject: rpms/gnupg2/devel gnupg2.spec,1.33,1.34 Message-ID: <200603062036.k26KaNGD010163@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gnupg2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10146 Modified Files: gnupg2.spec Log Message: hush the libpcsc query Index: gnupg2.spec =================================================================== RCS file: /cvs/extras/rpms/gnupg2/devel/gnupg2.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- gnupg2.spec 6 Mar 2006 18:13:55 -0000 1.33 +++ gnupg2.spec 6 Mar 2006 20:35:49 -0000 1.34 @@ -84,7 +84,7 @@ # Note: this is just the name of the default shared lib to load in scdaemon, # it can use other implementations too (including non-pcsc ones). %if "%{?fedora}" > "3" -%global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.?)) +%global pcsclib %(basename $(ls -1 %{_libdir}/libpcsclite.so.? 2>/dev/null ) 2>/dev/null ) %else %define pcsclib libpcsclite.so.0 %endif From fedora-extras-commits at redhat.com Mon Mar 6 21:03:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:03:33 -0500 Subject: rpms/perl-HTTP-Proxy - New directory Message-ID: <200603062103.k26L3ZOi012339@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12331/perl-HTTP-Proxy Log Message: Directory /cvs/extras/rpms/perl-HTTP-Proxy added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 21:03:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:03:39 -0500 Subject: rpms/perl-HTTP-Proxy/devel - New directory Message-ID: <200603062103.k26L3fVF012354@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12331/perl-HTTP-Proxy/devel Log Message: Directory /cvs/extras/rpms/perl-HTTP-Proxy/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 6 21:04:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:04:01 -0500 Subject: rpms/perl-HTTP-Proxy Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603062104.k26L43MX012388@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376 Added Files: Makefile import.log Log Message: Setup of module perl-HTTP-Proxy --- NEW FILE Makefile --- # Top level Makefile for module perl-HTTP-Proxy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 6 21:04:08 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:04:08 -0500 Subject: rpms/perl-HTTP-Proxy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603062104.k26L4AGB012406@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12376/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTTP-Proxy --- NEW 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 Mar 6 21:05:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:05:17 -0500 Subject: rpms/perl-HTTP-Proxy import.log,1.1,1.2 Message-ID: <200603062105.k26L5npX012484@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447 Modified Files: import.log Log Message: auto-import perl-HTTP-Proxy-0.17-2 on branch devel from perl-HTTP-Proxy-0.17-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 6 Mar 2006 21:04:01 -0000 1.1 +++ import.log 6 Mar 2006 21:05:17 -0000 1.2 @@ -0,0 +1 @@ +perl-HTTP-Proxy-0_17-2:HEAD:perl-HTTP-Proxy-0.17-2.src.rpm:1141679109 From fedora-extras-commits at redhat.com Mon Mar 6 21:05:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:05:39 -0500 Subject: rpms/perl-HTTP-Proxy/devel HTTP-Proxy-0.17-save.pm.patch, NONE, 1.1 perl-HTTP-Proxy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603062106.k26L6Box012488@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12447/devel Modified Files: .cvsignore sources Added Files: HTTP-Proxy-0.17-save.pm.patch perl-HTTP-Proxy.spec Log Message: auto-import perl-HTTP-Proxy-0.17-2 on branch devel from perl-HTTP-Proxy-0.17-2.src.rpm HTTP-Proxy-0.17-save.pm.patch: --- NEW FILE HTTP-Proxy-0.17-save.pm.patch --- diff -ruN HTTP-Proxy-0.17-orig/lib/HTTP/Proxy/BodyFilter/save.pm HTTP-Proxy-0.17/lib/HTTP/Proxy/BodyFilter/save.pm --- HTTP-Proxy-0.17-orig/lib/HTTP/Proxy/BodyFilter/save.pm 2005-09-28 22:26:09.000000000 +0100 +++ HTTP-Proxy-0.17/lib/HTTP/Proxy/BodyFilter/save.pm 2006-03-06 20:50:50.000000000 +0000 @@ -279,7 +279,7 @@ Returning C<""> or C will prevent the creation of the file. This lets a filter decide even more precisely what to save or not, even though this should be done in the match subroutine (see -HTTP::Proxy's C method). +HTTP::Proxy's C method). =back @@ -389,7 +389,7 @@ Thanks to Nicolas Chuche for telling me about C. -Thanks to Rafa?l Garcia-Suarez and David Rigaudiere for their help on +Thanks to Rafa??l Garcia-Suarez and David Rigaudiere for their help on irc while coding the nasty C method. C<;-)> Thanks to Howard Jones for the inspiration and initial patch for the --- NEW FILE perl-HTTP-Proxy.spec --- Name: perl-HTTP-Proxy Version: 0.17 Release: 2%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/HTTP-Proxy/ Source0: http://www.cpan.org/authors/id/B/BO/BOOK/HTTP-Proxy-%{version}.tar.gz Patch0: HTTP-Proxy-0.17-save.pm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Pod), perl(HTML::Parser) BuildRequires: perl(HTTP::Daemon), perl(LWP::UserAgent), perl(Crypt::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Its main use should be to record and/or modify web sessions, so as to help users create web robots, web testing suites, as well as proxy systems than can transparently alter the requests to and answers from an origin server. %prep %setup -q -n HTTP-Proxy-%{version} %patch0 -p1 %build %{__perl} Build.PL installdirs=vendor ./Build %install rm -rf $RPM_BUILD_ROOT ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check ./Build test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README eg/ %{perl_vendorlib}/HTTP/ %{_mandir}/man3/*.3* %changelog * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-2 - save.pm patched and converted to utf8 (HTTP-Proxy-0.17-save.pm.patch). * Thu Dec 8 2005 Jose Pedro Oliveira - 0.17-1 - Update to 0.17. * Thu Sep 8 2005 Jose Pedro Oliveira - 0.16-1 - Update to 0.16. * Sun Jul 04 2004 Jose Pedro Oliveira - 0:0.13-0.fdr.1 - First build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 6 Mar 2006 21:04:08 -0000 1.1 +++ .cvsignore 6 Mar 2006 21:05:38 -0000 1.2 @@ -0,0 +1 @@ +HTTP-Proxy-0.17.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 6 Mar 2006 21:04:08 -0000 1.1 +++ sources 6 Mar 2006 21:05:38 -0000 1.2 @@ -0,0 +1 @@ +5f8dee810951840408092c07faccfa1a HTTP-Proxy-0.17.tar.gz From fedora-extras-commits at redhat.com Mon Mar 6 21:09:07 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 16:09:07 -0500 Subject: owners owners.list,1.717,1.718 Message-ID: <200603062109.k26L9dOQ012602@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12585 Modified Files: owners.list Log Message: New package: perl-HTTP-Proxy (#179043). Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.717 retrieving revision 1.718 diff -u -r1.717 -r1.718 --- owners.list 6 Mar 2006 20:06:49 -0000 1.717 +++ owners.list 6 Mar 2006 21:09:07 -0000 1.718 @@ -910,6 +910,7 @@ Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|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-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-HTTP-Proxy|A pure Perl HTTP proxy|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Ima-DBI|Database connection caching and organization|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon Mar 6 22:05:45 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 6 Mar 2006 17:05:45 -0500 Subject: rpms/python-basemap/devel python-basemap.spec,1.5,1.6 Message-ID: <200603062206.k26M6IKc014952@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-basemap/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14933 Modified Files: python-basemap.spec Log Message: Rebuild for updated shapelib Index: python-basemap.spec =================================================================== RCS file: /cvs/extras/rpms/python-basemap/devel/python-basemap.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-basemap.spec 28 Feb 2006 22:44:31 -0000 1.5 +++ python-basemap.spec 6 Mar 2006 22:05:44 -0000 1.6 @@ -2,7 +2,7 @@ Name: python-basemap Version: 0.8.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Plots data on map projections (with continental and political boundaries) Group: Development/Libraries License: MIT and GPL @@ -59,6 +59,9 @@ %changelog +* Mon Mar 6 2006 Orion Poplawski 0.8.2-3 +- Rebuild for updated shapelib + * Tue Feb 28 2006 Orion Poplawski 0.8.2-2 - python-matplotlib now owns toolkits directoery From fedora-extras-commits at redhat.com Mon Mar 6 22:43:20 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Mon, 6 Mar 2006 17:43:20 -0500 Subject: rpms/banshee/devel banshee.spec,1.2,1.3 Message-ID: <200603062243.k26Mhro0015232@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15215 Modified Files: banshee.spec Log Message: * Mon Mar 6 2006 Christopher Aillon 0.10.6-3 - Don't build with smp_mflags, as parallel make causes the build to fail Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- banshee.spec 4 Mar 2006 16:44:37 -0000 1.2 +++ banshee.spec 6 Mar 2006 22:43:19 -0000 1.3 @@ -1,6 +1,6 @@ Name: banshee Version: 0.10.6 -Release: 2 +Release: 3 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -38,7 +38,7 @@ %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} %configure --disable-docs --with-gstreamer-0-10 -make %{?_smp_mflags} +make %install %{__rm} -rf $RPM_BUILD_ROOT @@ -94,6 +94,9 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Mon Mar 6 2006 Christopher Aillon 0.10.6-3 +- Don't build with smp_mflags, as parallel make causes the build to fail + * Sat Mar 4 2006 Christopher Aillon 0.10.6-2 - Rebuild From fedora-extras-commits at redhat.com Mon Mar 6 22:58:02 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 17:58:02 -0500 Subject: rpms/perl-HTTP-Proxy/devel perl-HTTP-Proxy.spec,1.1,1.2 Message-ID: <200603062258.k26MwZUG015343@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15326 Modified Files: perl-HTTP-Proxy.spec Log Message: Added missing BR: perl(Test::Pod::Coverage). Index: perl-HTTP-Proxy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/perl-HTTP-Proxy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTTP-Proxy.spec 6 Mar 2006 21:05:38 -0000 1.1 +++ perl-HTTP-Proxy.spec 6 Mar 2006 22:58:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-HTTP-Proxy Version: 0.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: perl BuildRequires: perl(Module::Build) -BuildRequires: perl(Test::Pod), perl(HTML::Parser) +BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage), perl(HTML::Parser) BuildRequires: perl(HTTP::Daemon), perl(LWP::UserAgent), perl(Crypt::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -56,6 +56,9 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-3 +- Added missing BR: perl(Test::Pod::Coverage). + * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-2 - save.pm patched and converted to utf8 (HTTP-Proxy-0.17-save.pm.patch). From fedora-extras-commits at redhat.com Mon Mar 6 23:27:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 6 Mar 2006 18:27:43 -0500 Subject: rpms/perl-HTTP-Proxy/FC-4 perl-HTTP-Proxy.spec,1.1,1.2 Message-ID: <200603062328.k26NSGgA017410@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17393 Modified Files: perl-HTTP-Proxy.spec Log Message: Sync with devel Index: perl-HTTP-Proxy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/perl-HTTP-Proxy.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTTP-Proxy.spec 6 Mar 2006 21:05:38 -0000 1.1 +++ perl-HTTP-Proxy.spec 6 Mar 2006 23:27:42 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-HTTP-Proxy Version: 0.17 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries @@ -13,7 +13,7 @@ BuildArch: noarch BuildRequires: perl BuildRequires: perl(Module::Build) -BuildRequires: perl(Test::Pod), perl(HTML::Parser) +BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage), perl(HTML::Parser) BuildRequires: perl(HTTP::Daemon), perl(LWP::UserAgent), perl(Crypt::SSLeay) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -56,6 +56,9 @@ %changelog +* Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-3 +- Added missing BR: perl(Test::Pod::Coverage). + * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-2 - save.pm patched and converted to utf8 (HTTP-Proxy-0.17-save.pm.patch). From fedora-extras-commits at redhat.com Tue Mar 7 00:23:13 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 6 Mar 2006 19:23:13 -0500 Subject: rpms/hfsplusutils/devel hfsplusutils.spec,1.6,1.7 Message-ID: <200603070023.k270NjbQ019417@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/hfsplusutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19395 Modified Files: hfsplusutils.spec Log Message: rebuild Index: hfsplusutils.spec =================================================================== RCS file: /cvs/extras/rpms/hfsplusutils/devel/hfsplusutils.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- hfsplusutils.spec 30 Apr 2005 11:58:16 -0000 1.6 +++ hfsplusutils.spec 7 Mar 2006 00:23:11 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Tools for reading Macintosh HFS+ volumes Name: hfsplusutils Version: 1.0.4 -Release: 5 +Release: 6 License: GPL Group: Applications/File @@ -68,6 +68,9 @@ %changelog +* Tue Mar 7 2006 David Woodhouse 1.0.4-6 +- Rebuild + * Sat Apr 30 2005 David Woodhouse 1.0.4-5 - Fix pointer abuse which GCC 4 doesn't like. Yes, the workaround is ugly as sin, but it is at least valid C. Apart from the bit From fedora-extras-commits at redhat.com Tue Mar 7 00:24:31 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Mon, 6 Mar 2006 19:24:31 -0500 Subject: rpms/exim/devel exim.spec,1.13,1.14 Message-ID: <200603070025.k270P4Pd019475@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19448 Modified Files: exim.spec Log Message: rebuild Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- exim.spec 29 Nov 2005 12:10:28 -0000 1.13 +++ exim.spec 7 Mar 2006 00:24:31 -0000 1.14 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -287,6 +287,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue Mar 7 2006 David Woodhouse 4.60-3 +- Rebuild + * Tue Nov 29 2005 David Woodhouse 4.60-2 - Require libXt-devel From fedora-extras-commits at redhat.com Tue Mar 7 00:51:46 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Mon, 6 Mar 2006 19:51:46 -0500 Subject: rpms/opencv/FC-4 opencv.spec,1.1,1.2 Message-ID: <200603070052.k270qIF9019685@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19645 Modified Files: opencv.spec Log Message: Bumping up release number Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opencv.spec 5 Mar 2006 19:45:57 -0000 1.1 +++ opencv.spec 7 Mar 2006 00:51:45 -0000 1.2 @@ -2,7 +2,7 @@ Name: opencv Version: 0.9.7 -Release: 3 +Release: 4 Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -111,6 +111,9 @@ %changelog +* Mon Mar 6 2005 Simon Perreault - 0.9.7-4 +- Rebuild + * Sun Oct 16 2005 Simon Perreault - 0.9.7-3 - Removed useless sample compilation makefiles/project files and replaced them with one that works on Fedora Core. From fedora-extras-commits at redhat.com Tue Mar 7 00:53:16 2006 From: fedora-extras-commits at redhat.com (Bill Nottingham (notting)) Date: Mon, 6 Mar 2006 19:53:16 -0500 Subject: fedora-release RPM-GPG-KEY-fedora-legacy, NONE, 1.1 fedora-legacy.repo, NONE, 1.1 Message-ID: <200603070053.k270rGKW019759@cvs-int.fedora.redhat.com> Author: notting Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19725 Added Files: RPM-GPG-KEY-fedora-legacy fedora-legacy.repo Log Message: add legacy stuff --- NEW FILE RPM-GPG-KEY-fedora-legacy --- -----BEGIN PGP PUBLIC KEY BLOCK----- Version: GnuPG v1.0.7 (GNU/Linux) mQGiBEALkQkRBACCBCp/a5rsqy2Q0NW/2OMkYtsb3k5M6dsQYoHDLiZK4VG1j+Bf 2zzp+HJiUnLFp/l7mROuRioU9/UHpEYFIVunBYXeZf84OxB+mruh9UZtYn3oVXtH oaMI7hIFirTZ5eEY7zrfvTbvZ2Sm5cE3F2G5sWVOfxhl5opinuWN4xtSwwCggooh LqarkF4KN6D8xoyjrhLaxiMD/Az7RE6oH0Vwl9dX7YmccymDEesT5Ql6Q5FvfkuZ F5ZaQwaBO2ko2hMMh2AdCxoYAZPjWqC5r6Wy9P8hMfh+A0S4zon2DE/r0d4vLEY2 HoptwtElq6gpltydx+/vXhZWkwCO//Kz9wXgZr496KtGXmEKYtdlVScBW6OvdyyD 18zeA/9RuY59C7uxxe6cu7amqjP52xx5rHGkdJD5E8o3rmjdsr9tJ3FcjtIV0DV2 BkfLIMnsp2gd972n7JBzlA9LJ+JTtMzvf9WdrErpRz1VeI1jHe4/hNGe3hd6xJIE rxj5FH+LwTj3vfErZdKsWOuudNkz1N4AwZr/k05gV3bi7j8RCLRIRmVkb3JhIExl Z2FjeSAoaHR0cDovL3d3dy5mZWRvcmFsZWdhY3kub3JnKSA8c2Vjbm90aWNlQGZl ZG9yYWxlZ2FjeS5vcmc+iFkEExECABkFAkALkQkECwcDAgMVAgMDFgIBAh4BAheA AAoJEBCMRRJzEAL686wAn3bA5dioMd0UDpUaES9TglLDpONbAJ467XWdHHwhxuHz oxWc3q7rWPBinLkCDQRAC5EuEAgAsPAVcrvrKB1A/hxoM61KEgaLB9GnGUOgoaV6 I58stO3sxaxj3bblrpIJjo02BA49xrtL8kpqjKveABThVC1yiSYfySmXKHlO09cv A+qj+QSxieRciFKc50F1+j8q5Hqcigxzwhr4sJt5IhAx6HIwar5uxNNBgE98JN42 GthUH39G+alRmzVd+3gQCLFroJSzHtFX7IlwHM33owAZwIVGlUhlBTHdbsvGf0xG mPYkI+JAUXpTTsnP7kR0/Ktm3zAHBEMw19eqQ5MSwVo28cA+jq2sLrL5DiE5quCd tB/RVnUUdbfN/o8sN6yxssNB6ZOB61l0K8bvm+9Qgstn/EQFSwADBggAmmFJueD1 iXehZsRtaH+qZw7z6Q6jUPxDTiuVPhLkUux3wOSWMOp6S+ZYliCaw32TBKgE2SwT NnvTJYsuGLf3ECxOxMmu2McDHYZM82zRV4PRBMKFfiOa67/x5lhZgEkqf9TO+wk5 M67GYbjZoyBaYEiE+eWD2cdema3n3zXzy+q2UEkHkzHx6ME9dRrgND3EW2hC9GJ6 7wY9h+BlUR6Am4o0/ZLZJ2QEvyVnlI3/zZo9L6h8waZKI4l16nuDr/O8z2UOYc/X OMwBJCVwvbB2Z/f91dhy2EVWJZyyZBCG/FMXXDchxKwJOOQgrVbxWGDIMSdyHLUL 2FuWnC/vdKc7wYhGBBgRAgAGBQJAC5EuAAoJEBCMRRJzEAL6wkcAnAlIrH0JuGjL T17HoheG/iUbj4Z4AJ9b/7OPGgNglwrLQJfihyPzManKYw== =wmoy -----END PGP PUBLIC KEY BLOCK----- --- NEW FILE fedora-legacy.repo --- [legacy-updates] name=Fedora Legacy $releasever - $basearch - Updates mirrorlist=http://fedora.redhat.com/download/mirrors/legacy-updates-released-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy [legacy-testing] name=Fedora Legacy $releasever - $basearch - Updates Testing mirrorlist=http://fedora.redhat.com/download/mirrors/legacy-updates-testing-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy From fedora-extras-commits at redhat.com Tue Mar 7 00:53:07 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Mon, 6 Mar 2006 19:53:07 -0500 Subject: rpms/opencv/FC-4 opencv.spec,1.2,1.3 Message-ID: <200603070053.k270rd7E019762@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19721 Modified Files: opencv.spec Log Message: We're now officially in 2006. Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- opencv.spec 7 Mar 2006 00:51:45 -0000 1.2 +++ opencv.spec 7 Mar 2006 00:53:07 -0000 1.3 @@ -111,7 +111,7 @@ %changelog -* Mon Mar 6 2005 Simon Perreault - 0.9.7-4 +* Mon Mar 6 2006 Simon Perreault - 0.9.7-4 - Rebuild * Sun Oct 16 2005 Simon Perreault - 0.9.7-3 From fedora-extras-commits at redhat.com Tue Mar 7 02:27:28 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 6 Mar 2006 21:27:28 -0500 Subject: rpms/moodss/devel .cvsignore, 1.7, 1.8 moodss.spec, 1.20, 1.21 sources, 1.8, 1.9 Message-ID: <200603070228.k272S0na023809@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23783 Modified Files: .cvsignore moodss.spec sources Log Message: 21.1 upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 22 Jan 2006 16:37:50 -0000 1.7 +++ .cvsignore 7 Mar 2006 02:27:24 -0000 1.8 @@ -1 +1,2 @@ moodss-21.0.tar.bz2 +moodss-21.1.tar.bz2 Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- moodss.spec 15 Feb 2006 19:41:09 -0000 1.20 +++ moodss.spec 7 Mar 2006 02:27:24 -0000 1.21 @@ -1,10 +1,10 @@ Name: moodss -Version: 21.0 -Release: 2%{?dist} +Version: 21.1 +Release: 1%{?dist} Summary: Powerful modular monitoring graphical application Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moodss-21.0.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moodss-21.1.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,8 @@ %changelog +* Mon Feb 27 2006 Jean-Luc Fontaine 21.1-1 +- 21.1 upstream release * Wed Feb 15 2006 Jean-Luc Fontaine 21.0-2 - rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/moodss/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Jan 2006 16:37:50 -0000 1.8 +++ sources 7 Mar 2006 02:27:24 -0000 1.9 @@ -1 +1,2 @@ 1366c31bfbda443103dcd7f53e10e3a8 moodss-21.0.tar.bz2 +f4563adcfe077b0c9716f7bf86ac94e0 moodss-21.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 02:37:09 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 6 Mar 2006 21:37:09 -0500 Subject: rpms/moomps/devel .cvsignore, 1.6, 1.7 moomps.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200603070237.k272bg5j023887@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23866 Modified Files: .cvsignore moomps.spec sources Log Message: - 5.5 upstream release - in post installation stage, fix moodss modules path - use fedora-useradd instead of useradd Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Jan 2006 16:35:23 -0000 1.6 +++ .cvsignore 7 Mar 2006 02:37:09 -0000 1.7 @@ -1 +1,2 @@ moomps-5.4.tar.bz2 +moomps-5.5.tar.bz2 Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- moomps.spec 15 Feb 2006 19:44:36 -0000 1.9 +++ moomps.spec 7 Mar 2006 02:37:09 -0000 1.10 @@ -1,19 +1,19 @@ Name: moomps -Version: 5.4 -Release: 2%{?dist} +Version: 5.5 +Release: 1%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moomps-5.4.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moomps-5.5.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): %_sbindir/useradd, %_sbindir/usermod +Requires(pre): fedora-usermgmt >= 0.8 Requires(preun): /sbin/chkconfig, /sbin/service Requires(post): /sbin/chkconfig Requires(postun): /sbin/service -Requires: moodss >= 21.0, tclx >= 8.3 +Requires: moodss >= 21.1, tclx >= 8.3 %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -38,8 +38,8 @@ %pre # if not present, add moomps user (even when upgrading): if ! %_sbindir/usermod -l moomps moomps 2>/dev/null; then - %_sbindir/useradd -r moomps -d /srv/moomps -c 'service companion to moodss'\ - -s '/sbin/nologin' + %_sbindir/fedora-useradd 23 -r -d /srv/moomps\ + -c 'service companion to moodss' -s '/sbin/nologin' moomps fi %preun @@ -50,6 +50,10 @@ fi %post +# fix moodss modules path (useful on x86_64 architecture): +sed\ + -e 's,lappend auto_path /usr/lib/moodss,lappend auto_path %_libdir/moodss,'\ + -i %_sbindir/moomps if [ $1 -eq 1 ]; then # installing chkconfig --add moomps fi @@ -77,6 +81,10 @@ %changelog +* Sun Feb 12 2006 Jean-Luc Fontaine 5.5-1 +- 5.5 upstream release +- in post installation stage, fix moodss modules path +- use fedora-useradd instead of useradd * Wed Feb 15 2006 Jean-Luc Fontaine 5.4-2 - rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Jan 2006 16:35:23 -0000 1.6 +++ sources 7 Mar 2006 02:37:09 -0000 1.7 @@ -1 +1,2 @@ 37045d89b50a78f5f6f445cc4d897c62 moomps-5.4.tar.bz2 +249a456d2db2dbc5ed95f31d926d063d moomps-5.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 02:40:37 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 6 Mar 2006 21:40:37 -0500 Subject: rpms/moomps/devel moomps.spec,1.10,1.11 Message-ID: <200603070241.k272f9lt023932@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23915 Modified Files: moomps.spec Log Message: log date was wrong. Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- moomps.spec 7 Mar 2006 02:37:09 -0000 1.10 +++ moomps.spec 7 Mar 2006 02:40:37 -0000 1.11 @@ -81,7 +81,7 @@ %changelog -* Sun Feb 12 2006 Jean-Luc Fontaine 5.5-1 +* Mon Mar 6 2006 Jean-Luc Fontaine 5.5-1 - 5.5 upstream release - in post installation stage, fix moodss modules path - use fedora-useradd instead of useradd From fedora-extras-commits at redhat.com Tue Mar 7 02:48:25 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 6 Mar 2006 21:48:25 -0500 Subject: rpms/moodss/FC-4 .cvsignore, 1.8, 1.9 moodss.spec, 1.19, 1.20 sources, 1.8, 1.9 Message-ID: <200603070248.k272mwBE024043@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moodss/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24018 Modified Files: .cvsignore moodss.spec sources Log Message: 21.1 upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Jan 2006 17:37:12 -0000 1.8 +++ .cvsignore 7 Mar 2006 02:48:25 -0000 1.9 @@ -1 +1,2 @@ moodss-21.0.tar.bz2 +moodss-21.1.tar.bz2 Index: moodss.spec =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/moodss.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- moodss.spec 22 Jan 2006 17:37:12 -0000 1.19 +++ moodss.spec 7 Mar 2006 02:48:25 -0000 1.20 @@ -1,10 +1,10 @@ Name: moodss -Version: 21.0 +Version: 21.1 Release: 1%{?dist} Summary: Powerful modular monitoring graphical application Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moodss-21.0.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moodss-21.1.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,8 @@ %changelog +* Mon Feb 27 2006 Jean-Luc Fontaine 21.1-1 +- 21.1 upstream release * Fri Nov 11 2005 Jean-Luc Fontaine 21.0-1 - 21.0 upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/moodss/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Jan 2006 17:37:12 -0000 1.8 +++ sources 7 Mar 2006 02:48:25 -0000 1.9 @@ -1 +1,2 @@ 1366c31bfbda443103dcd7f53e10e3a8 moodss-21.0.tar.bz2 +f4563adcfe077b0c9716f7bf86ac94e0 moodss-21.1.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 02:55:30 2006 From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain)) Date: Mon, 6 Mar 2006 21:55:30 -0500 Subject: rpms/moomps/FC-4 .cvsignore, 1.6, 1.7 moomps.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200603070256.k272u2ar024155@cvs-int.fedora.redhat.com> Author: jfontain Update of /cvs/extras/rpms/moomps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24130 Modified Files: .cvsignore moomps.spec sources Log Message: - 5.5 upstream release - in post installation stage, fix moodss modules path - use fedora-useradd instead of useradd Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 22 Jan 2006 17:39:36 -0000 1.6 +++ .cvsignore 7 Mar 2006 02:55:30 -0000 1.7 @@ -1 +1,2 @@ moomps-5.4.tar.bz2 +moomps-5.5.tar.bz2 Index: moomps.spec =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/moomps.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- moomps.spec 22 Jan 2006 17:39:36 -0000 1.8 +++ moomps.spec 7 Mar 2006 02:55:30 -0000 1.9 @@ -1,19 +1,19 @@ Name: moomps -Version: 5.4 +Version: 5.5 Release: 1%{?dist} Summary: Powerful modular monitoring service Group: Applications/System License: GPL -Source0: http://download.sourceforge.net/moodss/moomps-5.4.tar.bz2 +Source0: http://download.sourceforge.net/moodss/moomps-5.5.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): %_sbindir/useradd, %_sbindir/usermod +Requires(pre): fedora-usermgmt >= 0.8 Requires(preun): /sbin/chkconfig, /sbin/service Requires(post): /sbin/chkconfig Requires(postun): /sbin/service -Requires: moodss >= 21.0, tclx >= 8.3 +Requires: moodss >= 21.1, tclx >= 8.3 %description moomps (Modular Object Oriented Multi-Purpose Service) is a modular @@ -38,8 +38,8 @@ %pre # if not present, add moomps user (even when upgrading): if ! %_sbindir/usermod -l moomps moomps 2>/dev/null; then - %_sbindir/useradd -r moomps -d /srv/moomps -c 'service companion to moodss'\ - -s '/sbin/nologin' + %_sbindir/fedora-useradd 23 -r -d /srv/moomps\ + -c 'service companion to moodss' -s '/sbin/nologin' moomps fi %preun @@ -50,6 +50,10 @@ fi %post +# fix moodss modules path (useful on x86_64 architecture): +sed\ + -e 's,lappend auto_path /usr/lib/moodss,lappend auto_path %_libdir/moodss,'\ + -i %_sbindir/moomps if [ $1 -eq 1 ]; then # installing chkconfig --add moomps fi @@ -77,6 +81,13 @@ %changelog +* Mon Mar 6 2006 Jean-Luc Fontaine 5.5-1 +- 5.5 upstream release +- in post installation stage, fix moodss modules path +- use fedora-useradd instead of useradd + +* Wed Feb 15 2006 Jean-Luc Fontaine 5.4-2 +- rebuild for Fedora Extras 5 * Fri Nov 11 2005 Jean-Luc Fontaine 5.4-1 - 5.4 upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/moomps/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 22 Jan 2006 17:39:36 -0000 1.6 +++ sources 7 Mar 2006 02:55:30 -0000 1.7 @@ -1 +1,2 @@ 37045d89b50a78f5f6f445cc4d897c62 moomps-5.4.tar.bz2 +249a456d2db2dbc5ed95f31d926d063d moomps-5.5.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 04:07:33 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Mon, 6 Mar 2006 23:07:33 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics-simple.patch, NONE, 1.1 opencv-0.9.7-intrinsics.patch, NONE, 1.1 opencv.spec, 1.3, 1.4 Message-ID: <200603070408.k274861t028247@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28212 Modified Files: opencv.spec Added Files: opencv-0.9.7-intrinsics-simple.patch opencv-0.9.7-intrinsics.patch Log Message: SSE2 support on x86_64. opencv-0.9.7-intrinsics-simple.patch: --- NEW FILE opencv-0.9.7-intrinsics-simple.patch --- diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h --- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-06 22:59:56.000000000 -0500 @@ -48,7 +48,7 @@ #include #include - #if defined WIN64 && defined EM64T && defined _MSC_VER + #if defined WIN64 && defined EM64T && defined _MSC_VER || defined __GNUC__ #include #endif opencv-0.9.7-intrinsics.patch: --- NEW FILE opencv-0.9.7-intrinsics.patch --- diff -urp opencv-0.9.7.orig/configure.in opencv-0.9.7/configure.in --- opencv-0.9.7.orig/configure.in 2006-03-06 22:10:57.000000000 -0500 +++ opencv-0.9.7/configure.in 2006-03-06 22:25:29.000000000 -0500 @@ -281,6 +281,11 @@ dnl # #AC_SUBST(CXXOPENMP) +dnl +dnl ****************** SSE2 Intrinsics ************************** +dnl +AC_CHECK_HEADERS([emmintrin.h]) + AC_SUBST(DEBUG) AC_CONFIG_FILES([Makefile diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h --- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:10:58.000000000 -0500 +++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-06 22:34:04.000000000 -0500 @@ -48,7 +48,8 @@ #include #include - #if defined WIN64 && defined EM64T && defined _MSC_VER + #if defined HAVE_EMMINTRIN_H \ + || defined WIN64 && defined EM64T && defined _MSC_VER #include #endif Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- opencv.spec 7 Mar 2006 00:53:07 -0000 1.3 +++ opencv.spec 7 Mar 2006 04:07:32 -0000 1.4 @@ -2,7 +2,7 @@ Name: opencv Version: 0.9.7 -Release: 4 +Release: 5%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -10,6 +10,7 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile +Patch0: opencv-0.9.7-intrinsics-simple.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel @@ -48,6 +49,7 @@ %prep %setup -q +%patch -p1 -b .intrinsics %{__sed} -i 's/\r//' interfaces/swig/python/*.py \ samples/python/*.py %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \ @@ -111,6 +113,9 @@ %changelog +* Mon Mar 6 2006 Simon Perreault - 0.9.7-5 +- SSE2 support on x86_64. + * Mon Mar 6 2006 Simon Perreault - 0.9.7-4 - Rebuild From fedora-extras-commits at redhat.com Tue Mar 7 06:27:04 2006 From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal)) Date: Tue, 7 Mar 2006 01:27:04 -0500 Subject: rpms/seahorse/devel seahorse.spec,1.17,1.18 Message-ID: <200603070627.k276RfYU032402@cvs-int.fedora.redhat.com> Author: skvidal Update of /cvs/extras/rpms/seahorse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32385 Modified Files: seahorse.spec Log Message: for bug 184124 Index: seahorse.spec =================================================================== RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- seahorse.spec 24 Feb 2006 04:02:12 -0000 1.17 +++ seahorse.spec 7 Mar 2006 06:27:03 -0000 1.18 @@ -1,6 +1,6 @@ Name: seahorse Version: 0.8 -Release: 3%{dist} +Release: 4%{dist} Summary: GNOME2 interface for gnupg Group: User Interface/Desktops License: GPL @@ -20,6 +20,7 @@ BuildRequires: scrollkeeper BuildRequires: nautilus-devel BuildRequires: libsoup-devel +BuildRequires: openldap-devel Requires(post): desktop-file-utils Requires(post): GConf2 Requires(post): scrollkeeper @@ -122,6 +123,9 @@ %changelog +* Tue Mar 7 2006 Seth Vidal +- added openldap-devel buildreq to hopefully close bug # 184124 + * Thu Feb 23 2006 Seth Vidal - Patch from John Thacker for rh bug #182694 From fedora-extras-commits at redhat.com Tue Mar 7 07:13:59 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 7 Mar 2006 02:13:59 -0500 Subject: rpms/qgit/FC-4 qgit.spec,1.1,1.2 Message-ID: <200603070714.k277EVcn002030@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2010 Modified Files: qgit.spec Log Message: - changed dependency from git to git-core - fixed year in the changelog Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-4/qgit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qgit.spec 3 Mar 2006 21:34:00 -0000 1.1 +++ qgit.spec 7 Mar 2006 07:13:52 -0000 1.2 @@ -1,6 +1,6 @@ Name: qgit Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, qt-devel -Requires: git >= 1.2.0 +Requires: git-core >= 1.2.0 %description With qgit you are able to browse revisions history, view patch content @@ -46,16 +46,19 @@ %changelog -* Sun Feb 19 2005 Dan Horak 1.1-1 +* Tue Mar 7 2006 Dan Horak 1.1-2 +- change requires from git to git-core only + +* Sun Feb 19 2006 Dan Horak 1.1-1 - updated to upstream version 1.1 - fixed download URL for Source0 from sourceforge.net - requires git >= 1.2.0 -* Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.3 +* Sat Feb 11 2006 Dan Horak 1.1-0.1.rc3.3 - added docs -* Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.2 +* Sat Feb 11 2006 Dan Horak 1.1-0.1.rc3.2 - added desktop file -* Wed Feb 8 2005 Dan Horak 1.1-0.1.rc3.1 +* Wed Feb 8 2006 Dan Horak 1.1-0.1.rc3.1 - first version From fedora-extras-commits at redhat.com Tue Mar 7 07:17:33 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Tue, 7 Mar 2006 02:17:33 -0500 Subject: rpms/qgit/devel qgit.spec,1.1,1.2 Message-ID: <200603070718.k277I5jD002129@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2102 Modified Files: qgit.spec Log Message: - changed dependency from git to git-core - fixed year in the changelog Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qgit.spec 3 Mar 2006 21:34:00 -0000 1.1 +++ qgit.spec 7 Mar 2006 07:17:33 -0000 1.2 @@ -1,6 +1,6 @@ Name: qgit Version: 1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, qt-devel -Requires: git >= 1.2.0 +Requires: git-core >= 1.2.0 %description With qgit you are able to browse revisions history, view patch content @@ -46,16 +46,19 @@ %changelog -* Sun Feb 19 2005 Dan Horak 1.1-1 +* Tue Mar 7 2006 Dan Horak 1.1-2 +- change requires from git to git-core only + +* Sun Feb 19 2006 Dan Horak 1.1-1 - updated to upstream version 1.1 - fixed download URL for Source0 from sourceforge.net - requires git >= 1.2.0 -* Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.3 +* Sat Feb 11 2006 Dan Horak 1.1-0.1.rc3.3 - added docs -* Sat Feb 11 2005 Dan Horak 1.1-0.1.rc3.2 +* Sat Feb 11 2006 Dan Horak 1.1-0.1.rc3.2 - added desktop file -* Wed Feb 8 2005 Dan Horak 1.1-0.1.rc3.1 +* Wed Feb 8 2006 Dan Horak 1.1-0.1.rc3.1 - first version From fedora-extras-commits at redhat.com Tue Mar 7 08:54:43 2006 From: fedora-extras-commits at redhat.com (Alexander Larsson (alexl)) Date: Tue, 7 Mar 2006 03:54:43 -0500 Subject: rpms/sabayon/devel sabayon.spec,1.19,1.20 Message-ID: <200603070855.k278tFdk004306@cvs-int.fedora.redhat.com> Author: alexl Update of /cvs/extras/rpms/sabayon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4289 Modified Files: sabayon.spec Log Message: * Tue Mar 7 2006 Alexander Larsson - 2.12.3-2 - Add libXt-devel buildreq Index: sabayon.spec =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sabayon.spec 6 Mar 2006 16:40:53 -0000 1.19 +++ sabayon.spec 7 Mar 2006 08:54:43 -0000 1.20 @@ -14,7 +14,7 @@ Name: sabayon Version: 2.12.3 -Release: 1 +Release: 2 Summary: Tool to maintain user profiles in a GNOME desktop Group: Applications/System @@ -37,6 +37,7 @@ BuildRequires: pygtk2-devel BuildRequires: gtk2-devel BuildRequires: libX11-devel +BuildRequires: libXt-devel BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: usermode @@ -186,6 +187,9 @@ %{python_sitelib}/%{name}/lockdown %changelog +* Tue Mar 7 2006 Alexander Larsson - 2.12.3-2 +- Add libXt-devel buildreq + * Mon Mar 6 2006 Alexander Larsson - 2.12.3-1 - update to 2.12.3 - Fix Xnest dependency with modular X From fedora-extras-commits at redhat.com Tue Mar 7 09:38:09 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 7 Mar 2006 04:38:09 -0500 Subject: rpms/Canna/devel Canna.spec,1.3,1.4 Message-ID: <200603070938.k279cgjg006892@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/Canna/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6868 Modified Files: Canna.spec Log Message: requires versioned imake. Index: Canna.spec =================================================================== RCS file: /cvs/extras/rpms/Canna/devel/Canna.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Canna.spec 25 Jan 2006 04:59:56 -0000 1.3 +++ Canna.spec 7 Mar 2006 09:38:09 -0000 1.4 @@ -41,7 +41,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot Prereq: /sbin/chkconfig, /etc/services, /bin/grep, /bin/cp -BuildRequires: imake cpp gawk +BuildRequires: cpp gawk +BuildRequires: imake >= 1.0.1-3 Obsoletes: tamago %description From fedora-extras-commits at redhat.com Tue Mar 7 10:15:14 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 7 Mar 2006 05:15:14 -0500 Subject: fedora-security/audit fc4,1.166,1.167 fc5,1.73,1.74 Message-ID: <200603071015.k27AFE9j008913@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8889 Modified Files: fc4 fc5 Log Message: Note helixplayer/realplayer issues which are unconfirmed and believed to be not vulnerabilities Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.166 retrieving revision 1.167 diff -u -r1.166 -r1.167 --- fc4 5 Mar 2006 23:08:54 -0000 1.166 +++ fc4 7 Mar 2006 10:15:00 -0000 1.167 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060304 -Up to date FC4 as of 20060304 +Up to date CVE as of CVE email 20060306 +Up to date FC4 as of 20060306 ** are items that need attention +CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) @@ -94,8 +95,8 @@ CVE-2005-4153 VULNERABLE (mailman) CVE-2005-4134 backport (mozilla) [since FEDORA-2006-075] CVE-2005-4134 backport (firefox) [since FEDORA-2006-076] -CVE-2005-4130 ** (HelixPlayer) no information available -CVE-2005-4126 ** (HelixPlayer) no information available +CVE-2005-4130 ignore (HelixPlayer) not verified +CVE-2005-4126 ignore (HelixPlayer) not verified CVE-2005-4077 backport (curl) [since FEDORA-2005-1137] CVE-2005-3964 VULNERABLE (openmotif) bz#174815 CVE-2005-3962 backport (perl) [since FEDORA-2005-1144] @@ -156,7 +157,7 @@ CVE-2005-3402 ignore (thunderbird) mozilla say by design CVE-2005-3392 ignore (php) safe mode isn't safe CVE-2005-3391 ignore (php) safe mode isn't safe -CVE-2005-3390 backport (php) [since FEDORA-2005-1062] +CVE-2005-3390 backport (php, fixed 5.1.2 at least) [since FEDORA-2005-1062] CVE-2005-3389 backport (php) [since FEDORA-2005-1062] CVE-2005-3388 backport (php) [since FEDORA-2005-1062] CVE-2005-3359 version (kernel, fixed 2.6.14) [since FEDORA-2005-1067] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.73 retrieving revision 1.74 diff -u -r1.73 -r1.74 --- fc5 5 Mar 2006 23:08:54 -0000 1.73 +++ fc5 7 Mar 2006 10:15:00 -0000 1.74 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060304 +Up to date CVE as of CVE email 20060306 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -17,6 +17,7 @@ ** are items that need attention +CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) CVE-2006-0884 ** thunderbird CVE-2006-0836 VULNERABLE (thunderbird) @@ -105,8 +106,8 @@ CVE-2005-4153 backport (mailman) mailman-2.1.5-date_overflows.patch CVE-2005-4134 backport (mozilla) mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html -CVE-2005-4130 ** (HelixPlayer) no information yet available -CVE-2005-4126 ** (HelixPlayer) no information yet available +CVE-2005-4130 ignore (HelixPlayer) not verified +CVE-2005-4126 ignore (HelixPlayer) not verified CVE-2005-4077 version (curl, fixed 7.15.1) CVE-2005-3964 backport (openmotif) CVE-2005-3962 version (perl, fixed 5.8.8) From fedora-extras-commits at redhat.com Tue Mar 7 10:34:02 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 7 Mar 2006 05:34:02 -0500 Subject: rpms/proftpd/devel .cvsignore, 1.6, 1.7 proftpd.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200603071034.k27AYYaC009014@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/proftpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8988 Modified Files: .cvsignore proftpd.spec sources Log Message: Update to 1.3.0rc4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Feb 2006 18:30:16 -0000 1.6 +++ .cvsignore 7 Mar 2006 10:34:01 -0000 1.7 @@ -1 +1 @@ -proftpd-1.3.0rc3.tar.bz2 +proftpd-1.3.0rc4.tar.bz2 Index: proftpd.spec =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- proftpd.spec 6 Mar 2006 15:13:37 -0000 1.12 +++ proftpd.spec 7 Mar 2006 10:34:01 -0000 1.13 @@ -1,11 +1,11 @@ Summary: Flexible, stable and highly-configurable FTP server Name: proftpd Version: 1.3.0 -Release: 0.2.rc3%{?dist} +Release: 0.2.rc4%{?dist} License: GPL Group: System Environment/Daemons URL: http://www.proftpd.org/ -Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}rc3.tar.bz2 +Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}rc4.tar.bz2 Source1: proftpd.conf Source2: proftpd.init Source3: proftpd-xinetd @@ -42,7 +42,7 @@ %prep -%setup -n %{name}-%{version}rc3 +%setup -n %{name}-%{version}rc4 %build @@ -145,6 +145,9 @@ %changelog +* Tue Mar 7 2006 Matthias Saou 1.3.0-0.2.rc4 +- Update to 1.3.0rc4 (bugfix release). + * Mon Mar 6 2006 Matthias Saou 1.3.0-0.2.rc3 - FC5 rebuild. Index: sources =================================================================== RCS file: /cvs/extras/rpms/proftpd/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Feb 2006 18:30:16 -0000 1.6 +++ sources 7 Mar 2006 10:34:01 -0000 1.7 @@ -1 +1 @@ -050c3e2caec0d930f8a331e7b3ec0931 proftpd-1.3.0rc3.tar.bz2 +175da3e672d9f441b852259c7baee21e proftpd-1.3.0rc4.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 13:03:57 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Tue, 7 Mar 2006 08:03:57 -0500 Subject: rpms/kinput2/devel kinput2.spec,1.3,1.4 Message-ID: <200603071304.k27D4UvR015119@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/kinput2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15102 Modified Files: kinput2.spec Log Message: * Tue Mar 7 2006 Akira TAGOH - v3.1-27 - moved out from /usr/X11R6. (#170934) Index: kinput2.spec =================================================================== RCS file: /cvs/extras/rpms/kinput2/devel/kinput2.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kinput2.spec 12 Jul 2005 00:53:31 -0000 1.3 +++ kinput2.spec 7 Mar 2006 13:03:56 -0000 1.4 @@ -25,10 +25,11 @@ Name: kinput2 Version: v3.1 -Release: 26%{?dist} +Release: 27%{?dist} License: Distributable -BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: xorg-x11-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: libICE-devel libSM-devel libX11-devel libXaw-devel libXext-devel libXmu-devel libXpm-devel libXt-devel libXp-devel +BuildRequires: imake >= 1.0.1-3 %if %{is_canna_used} BuildRequires: Canna-devel >= 3.7p1-6 %endif @@ -130,38 +131,30 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6 -if [ -d %{_prefix}/X11R6.1 ]; then - ln -sf $RPM_BUILD_ROOT%{_prefix}/X11R6 $RPM_BUILD_ROOT%{_prefix}/X11R6.1 -fi -if [ -d %{_prefix}/X11R6.3 ]; then - ln -sf $RPM_BUILD_ROOT%{_prefix}/X11R6 $RPM_BUILD_ROOT%{_prefix}/X11R6.3 -fi -mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/bin -mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/man/man1 +mkdir -p $RPM_BUILD_ROOT%{_bindir} %if %{build_with_wnn4} -install -c -m 0755 kinput2.wnn4 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -c -m 0755 kinput2.wnn4 $RPM_BUILD_ROOT%{_bindir} %endif %if %{build_with_wnn6} -install -c -m 0755 kinput2.wnn6 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -c -m 0755 kinput2.wnn6 $RPM_BUILD_ROOT%{_bindir} %endif %if %{build_with_canna} -install -c -m 0755 kinput2.canna $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -c -m 0755 kinput2.canna $RPM_BUILD_ROOT%{_bindir} %endif %if %{build_with_canna_wnn4} -install -c -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -c -m 0755 kinput2.canna-wnn4 $RPM_BUILD_ROOT%{_bindir} %endif %if %{build_with_canna_wnn6} -install -c -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_prefix}/X11R6/bin +install -c -m 0755 kinput2.canna-wnn6 $RPM_BUILD_ROOT%{_bindir} %endif -mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults -install -c -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults/Kinput2 +mkdir -p $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults +install -c -m 0444 cmd/Kinput2.ad $RPM_BUILD_ROOT%{_datadir}/X11/app-defaults/Kinput2 -mkdir -p $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/ccdef -install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/ccdef -install -c -m 0444 ccdef/rule.* $RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/ccdef +mkdir -p $RPM_BUILD_ROOT%{_libdir}/X11/ccdef +install -c -m 0444 ccdef/ccdef.* $RPM_BUILD_ROOT%{_libdir}/X11/ccdef +install -c -m 0444 ccdef/rule.* $RPM_BUILD_ROOT%{_libdir}/X11/ccdef make install.man DESTDIR=$RPM_BUILD_ROOT @@ -177,19 +170,19 @@ %post %if %([ '%{build_with_wnn4}' -eq '1' -a '%{build_with_wnn6}' -eq '0' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.wnn4 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.wnn4 %{_bindir}/kinput2 %endif %if %([ '%{build_with_wnn6}' -eq '1' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.wnn6 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.wnn6 %{_bindir}/kinput2 %endif %if %([ '%{build_with_canna}' -eq '1' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.canna %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna %{_bindir}/kinput2 %endif %if %([ '%{build_with_canna_wnn4}' -eq '1' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.canna-wnn4 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna-wnn4 %{_bindir}/kinput2 %endif %if %{build_with_canna_wnn6} -ln -sf kinput2.canna-wnn6 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna-wnn6 %{_bindir}/kinput2 %endif %if %{is_canna_used} %{inst_alternatives_canna} @@ -200,7 +193,7 @@ %preun if [ "$1" = 0 ]; then - rm -rf %{_prefix}/X11R6/bin/kinput2 + rm -rf %{_bindir}/kinput2 %if %{is_canna_used} %{uninst_alternatives_canna} %endif @@ -211,19 +204,19 @@ %triggerpostun -- kinput2-canna-wnn6 %if %([ '%{build_with_wnn4}' -eq '1' -a '%{build_with_wnn6}' -eq '0' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.wnn4 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.wnn4 %{_bindir}/kinput2 %endif %if %([ '%{build_with_wnn6}' -eq '1' -a '%{build_with_canna}' -eq '0' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.wnn6 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.wnn6 %{_bindir}/kinput2 %endif %if %([ '%{build_with_canna}' -eq '1' -a '%{build_with_canna_wnn4}' -eq '0' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.canna %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna %{_bindir}/kinput2 %endif %if %([ '%{build_with_canna_wnn4}' -eq '1' -a '%{build_with_canna_wnn6}' -eq '0' ] && echo 1 || echo 0) -ln -sf kinput2.canna-wnn4 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna-wnn4 %{_bindir}/kinput2 %endif %if %{build_with_canna_wnn6} -ln -sf kinput2.canna-wnn6 %{_prefix}/X11R6/bin/kinput2 +ln -sf kinput2.canna-wnn6 %{_bindir}/kinput2 %endif %if %{is_canna_used} %{inst_alternatives_canna} @@ -235,19 +228,22 @@ %files %defattr(-, root, root) %doc Copyright NEWS README doc -%config %{_prefix}/X11R6/lib/X11/app-defaults/Kinput2 +%config %{_datadir}/X11/app-defaults/Kinput2 %if %{is_wnn_used} -%{_prefix}/X11R6/lib/X11/ccdef +%{_libdir}/X11/ccdef %endif -%{_prefix}/X11R6/bin/kinput2* -%{_prefix}/X11R6/man/man1/kinput2.1x* +%{_bindir}/kinput2* +%{_mandir}/man1/kinput2.1x* %{_sysconfdir}/X11/xinit/xinput.d %changelog -* Tue Jul 12 2005 Akira TAGOH - v3.1-26.fc5 +* Tue Mar 7 2006 Akira TAGOH - v3.1-27 +- moved out from /usr/X11R6. (#170934) + +* Tue Jul 12 2005 Akira TAGOH - v3.1-26 - use proper xinput script for kinput2-wnn. -* Thu Jun 30 2005 Akira TAGOH - v3.1-25.fc5 +* Thu Jun 30 2005 Akira TAGOH - v3.1-25 - Import into Extras. * Tue Feb 8 2005 Akira TAGOH - v3.1-24 From fedora-extras-commits at redhat.com Tue Mar 7 13:22:54 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 7 Mar 2006 08:22:54 -0500 Subject: rpms/gtkwave/devel gtkwave.spec, 1.8, 1.9 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 Message-ID: <200603071323.k27DNR4U015316@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15283 Modified Files: gtkwave.spec sources .cvsignore Log Message: update to 1.3.86 Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/gtkwave.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gtkwave.spec 27 Feb 2006 14:28:02 -0000 1.8 +++ gtkwave.spec 7 Mar 2006 13:22:54 -0000 1.9 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.85 +Version: 1.3.86 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -80,6 +80,9 @@ %{_mandir}/man1/vztminer.1* %changelog +* Tue Mar 7 2006 Paul Howarth 1.3.86-1 +- update to 1.3.86 + * Mon Feb 27 2006 Paul Howarth 1.3.85-1 - update to 1.3.85 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 14:28:02 -0000 1.8 +++ sources 7 Mar 2006 13:22:54 -0000 1.9 @@ -1 +1 @@ -cbc84d9ea8a0bf56cc935bf96d279c71 gtkwave-1.3.85.tgz +8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 14:28:02 -0000 1.8 +++ .cvsignore 7 Mar 2006 13:22:54 -0000 1.9 @@ -1 +1 @@ -gtkwave-1.3.85.tgz +gtkwave-1.3.86.tgz From fedora-extras-commits at redhat.com Tue Mar 7 13:26:07 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 7 Mar 2006 08:26:07 -0500 Subject: rpms/gtkwave/FC-4 gtkwave.spec, 1.7, 1.8 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 Message-ID: <200603071326.k27DQeNU015426@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/gtkwave.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtkwave.spec 27 Feb 2006 14:33:14 -0000 1.7 +++ gtkwave.spec 7 Mar 2006 13:26:07 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.85 +Version: 1.3.86 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -80,6 +80,9 @@ %{_mandir}/man1/vztminer.1* %changelog +* Tue Mar 7 2006 Paul Howarth 1.3.86-1 +- update to 1.3.86 + * Mon Feb 27 2006 Paul Howarth 1.3.85-1 - update to 1.3.85 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 14:33:14 -0000 1.8 +++ sources 7 Mar 2006 13:26:07 -0000 1.9 @@ -1 +1 @@ -cbc84d9ea8a0bf56cc935bf96d279c71 gtkwave-1.3.85.tgz +8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 14:33:14 -0000 1.8 +++ .cvsignore 7 Mar 2006 13:26:07 -0000 1.9 @@ -1 +1 @@ -gtkwave-1.3.85.tgz +gtkwave-1.3.86.tgz From fedora-extras-commits at redhat.com Tue Mar 7 13:28:21 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Tue, 7 Mar 2006 08:28:21 -0500 Subject: rpms/gtkwave/FC-3 gtkwave.spec, 1.7, 1.8 sources, 1.8, 1.9 .cvsignore, 1.8, 1.9 Message-ID: <200603071328.k27DSrIt015528@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/gtkwave/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15507 Modified Files: gtkwave.spec sources .cvsignore Log Message: resync with devel Index: gtkwave.spec =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/gtkwave.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtkwave.spec 27 Feb 2006 14:35:40 -0000 1.7 +++ gtkwave.spec 7 Mar 2006 13:28:21 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Waveform Viewer Name: gtkwave -Version: 1.3.85 +Version: 1.3.86 Release: 1%{?dist} License: GPL & MIT Group: Applications/Engineering @@ -80,6 +80,9 @@ %{_mandir}/man1/vztminer.1* %changelog +* Tue Mar 7 2006 Paul Howarth 1.3.86-1 +- update to 1.3.86 + * Mon Feb 27 2006 Paul Howarth 1.3.85-1 - update to 1.3.85 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 27 Feb 2006 14:35:40 -0000 1.8 +++ sources 7 Mar 2006 13:28:21 -0000 1.9 @@ -1 +1 @@ -cbc84d9ea8a0bf56cc935bf96d279c71 gtkwave-1.3.85.tgz +8658d66e842ec75f3b2d7c0913809dc1 gtkwave-1.3.86.tgz Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkwave/FC-3/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 27 Feb 2006 14:35:40 -0000 1.8 +++ .cvsignore 7 Mar 2006 13:28:21 -0000 1.9 @@ -1 +1 @@ -gtkwave-1.3.85.tgz +gtkwave-1.3.86.tgz From fedora-extras-commits at redhat.com Tue Mar 7 14:25:54 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 7 Mar 2006 09:25:54 -0500 Subject: rpms/gnomebaker/devel gnomebaker.spec,1.3,1.4 Message-ID: <200603071426.k27EQQGJ017794@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnomebaker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17774 Modified Files: gnomebaker.spec Log Message: * Tue Mar 7 2006 Brian Pepple - 0.5.1-4 - Rebuild for FC5. - Add requires for gstreamer08-plugins. Index: gnomebaker.spec =================================================================== RCS file: /cvs/extras/rpms/gnomebaker/devel/gnomebaker.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gnomebaker.spec 11 Feb 2006 15:04:27 -0000 1.3 +++ gnomebaker.spec 7 Mar 2006 14:25:53 -0000 1.4 @@ -1,6 +1,6 @@ Name: gnomebaker Version: 0.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Gnome CD/DVD burner Group: Applications/Multimedia @@ -20,6 +20,7 @@ Requires: cdrecord Requires: mkisofs Requires: cdda2wav +Requires: gstreamer08-plugins Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -76,6 +77,10 @@ %changelog +* Tue Mar 7 2006 Brian Pepple - 0.5.1-4 +- Rebuild for FC5. +- Add requires for gstreamer08-plugins. + * Sat Feb 11 2006 Brian Pepple - 0.5.1-3 - Rebuild. From fedora-extras-commits at redhat.com Tue Mar 7 14:44:49 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Tue, 7 Mar 2006 09:44:49 -0500 Subject: owners owners.list,1.718,1.719 Message-ID: <200603071445.k27EjLqb018075@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18056 Modified Files: owners.list Log Message: Remove swish-e and initng which are not yet approved. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.718 retrieving revision 1.719 diff -u -r1.718 -r1.719 --- owners.list 6 Mar 2006 21:09:07 -0000 1.718 +++ owners.list 7 Mar 2006 14:44:49 -0000 1.719 @@ -449,7 +449,6 @@ Fedora Extras|iiimf-le-simplehangul|Romanized Korean Hangul language engine for IIIMF|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| -Fedora Extras|initng|A full replacement of SysVinit|daner964 at student.liu.se|extras-qa at fedoraproject.org| Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|inti|Integrated Foundation Classes for GNOME and GTK+|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|intuitively|Automatic IP detection utility|pertusus at free.fr|extras-qa at fedoraproject.org| @@ -1291,7 +1290,6 @@ 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|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|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| -Fedora Extras|swish-e|Simple Web Indexing System for Humans - Enhanced|bkyoung at users.sourceforge.net|extras-qa at fedoraproject.org| Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|syck|YAML for C, Python, and PHP|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Mar 7 16:11:19 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 11:11:19 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-pythondir.patch, NONE, 1.1 opencv.spec, 1.4, 1.5 Message-ID: <200603071611.k27GBpTX022170@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22150 Modified Files: opencv.spec Added Files: opencv-0.9.7-pythondir.patch Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-6 - Fixed Python bindings location on x86_64. opencv-0.9.7-pythondir.patch: --- NEW FILE opencv-0.9.7-pythondir.patch --- diff -urp opencv-0.9.7.orig/interfaces/swig/python/Makefile.am opencv-0.9.7/interfaces/swig/python/Makefile.am --- opencv-0.9.7.orig/interfaces/swig/python/Makefile.am 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/python/Makefile.am 2006-03-07 09:42:55.000000000 -0500 @@ -18,7 +18,7 @@ AM_CPPFLAGS = \ if BUILD_PYTHON_WRAPPERS - pkgpython_LTLIBRARIES = _cv.la _highgui.la + pkgpyexec_LTLIBRARIES = _cv.la _highgui.la pkgpython_PYTHON = \ __init__.py \ Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- opencv.spec 7 Mar 2006 04:07:32 -0000 1.4 +++ opencv.spec 7 Mar 2006 16:11:17 -0000 1.5 @@ -1,8 +1,11 @@ %define with_ffmpeg 0 +%define pythondir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') +%define pyexecdir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)') + Name: opencv Version: 0.9.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -10,7 +13,8 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile -Patch0: opencv-0.9.7-intrinsics-simple.patch +Patch0: opencv-0.9.7-intrinsics.patch +Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel @@ -41,7 +45,7 @@ Summary: Python bindings for apps which use OpenCV Group: Development/Libraries Requires: opencv = %{version}-%{release} -Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`) +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description python This package contains Python bindings for the OpenCV library. @@ -49,7 +53,8 @@ %prep %setup -q -%patch -p1 -b .intrinsics +%patch0 -p1 -b .intrinsics +%patch1 -p1 -b .pythondir %{__sed} -i 's/\r//' interfaces/swig/python/*.py \ samples/python/*.py %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \ @@ -57,15 +62,19 @@ %build -%configure --disable-static --enable-python --with-apps +%configure --enable-maintainer-mode --disable-static --enable-python --with-apps make %{?_smp_mflags} +%check +make check + + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ - $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/opencv/*.la \ + $RPM_BUILD_ROOT%{pyexecdir}/opencv/*.la \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/build_all.sh \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.dsp \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.vcproj \ @@ -108,11 +117,18 @@ %files python -%{_libdir}/python*/site-packages/opencv +%dir %{pythondir}/opencv +%{pythondir}/opencv/*.py +%{pythondir}/opencv/*.pyc +%ghost %{pythondir}/opencv/*.pyo +%{pyexecdir}/opencv %doc %{_datadir}/opencv/samples/python %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-6 +- Fixed Python bindings location on x86_64. + * Mon Mar 6 2006 Simon Perreault - 0.9.7-5 - SSE2 support on x86_64. From fedora-extras-commits at redhat.com Tue Mar 7 16:53:42 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 11:53:42 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.1, 1.2 opencv.spec, 1.5, 1.6 Message-ID: <200603071654.k27GsFdl022419@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22397 Modified Files: opencv-0.9.7-intrinsics.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-7 - Fixed intrinsics patch so that it works. opencv-0.9.7-intrinsics.patch: Index: opencv-0.9.7-intrinsics.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opencv-0.9.7-intrinsics.patch 7 Mar 2006 04:07:32 -0000 1.1 +++ opencv-0.9.7-intrinsics.patch 7 Mar 2006 16:53:42 -0000 1.2 @@ -1,6 +1,6 @@ diff -urp opencv-0.9.7.orig/configure.in opencv-0.9.7/configure.in ---- opencv-0.9.7.orig/configure.in 2006-03-06 22:10:57.000000000 -0500 -+++ opencv-0.9.7/configure.in 2006-03-06 22:25:29.000000000 -0500 +--- opencv-0.9.7.orig/configure.in 2005-07-25 08:26:34.000000000 -0400 ++++ opencv-0.9.7/configure.in 2006-03-07 11:37:37.287015530 -0500 @@ -281,6 +281,11 @@ dnl # #AC_SUBST(CXXOPENMP) @@ -13,9 +13,37 @@ AC_SUBST(DEBUG) AC_CONFIG_FILES([Makefile +diff -urp opencv-0.9.7.orig/cv/src/_cv.h opencv-0.9.7/cv/src/_cv.h +--- opencv-0.9.7.orig/cv/src/_cv.h 2005-06-10 06:09:22.000000000 -0400 ++++ opencv-0.9.7/cv/src/_cv.h 2006-03-07 11:40:07.946072812 -0500 +@@ -42,6 +42,10 @@ + #ifndef _CV_INTERNAL_H_ + #define _CV_INTERNAL_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #if defined _MSC_VER && _MSC_VER >= 1200 + /* disable warnings related to inline functions */ + #pragma warning( disable: 4711 4710 4514 ) +diff -urp opencv-0.9.7.orig/cvaux/src/_cvaux.h opencv-0.9.7/cvaux/src/_cvaux.h +--- opencv-0.9.7.orig/cvaux/src/_cvaux.h 2004-08-08 14:52:26.000000000 -0400 ++++ opencv-0.9.7/cvaux/src/_cvaux.h 2006-03-07 11:40:44.758355511 -0500 +@@ -41,6 +41,10 @@ + #ifndef __CVAUX_H__ + #define __CVAUX_H__ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #if _MSC_VER >= 1200 + #pragma warning( disable: 4710 4711 4514 ) /* function AAA selected for automatic inline expansion */ + #endif diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h ---- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:10:58.000000000 -0500 -+++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-06 22:34:04.000000000 -0500 +--- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2005-07-20 06:53:14.000000000 -0400 ++++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-07 11:37:37.288015510 -0500 @@ -48,7 +48,8 @@ #include #include @@ -26,3 +54,88 @@ #include #endif +diff -urp opencv-0.9.7.orig/cxcore/src/_cxcore.h opencv-0.9.7/cxcore/src/_cxcore.h +--- opencv-0.9.7.orig/cxcore/src/_cxcore.h 2005-06-10 06:46:49.000000000 -0400 ++++ opencv-0.9.7/cxcore/src/_cxcore.h 2006-03-07 11:39:18.422040124 -0500 +@@ -42,6 +42,10 @@ + #ifndef _CXCORE_INTERNAL_H_ + #define _CXCORE_INTERNAL_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #if defined _MSC_VER && _MSC_VER >= 1200 + /* disable warnings related to inline functions */ + #pragma warning( disable: 4711 4710 4514 ) +diff -urp opencv-0.9.7.orig/otherlibs/highgui/_highgui.h opencv-0.9.7/otherlibs/highgui/_highgui.h +--- opencv-0.9.7.orig/otherlibs/highgui/_highgui.h 2005-02-01 06:33:24.000000000 -0500 ++++ opencv-0.9.7/otherlibs/highgui/_highgui.h 2006-03-07 11:42:21.432472106 -0500 +@@ -42,6 +42,12 @@ + #ifndef __HIGHGUI_H_ + #define __HIGHGUI_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#elif defined WIN32 ++void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ); ++#endif ++ + #include + #include + #include +@@ -52,12 +58,6 @@ + #include "highgui.h" + #include "cxmisc.h" + +-#ifndef WIN32 +-#include "cvconfig.h" +-#else +-void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ); +-#endif +- + /* Errors */ + #define HG_OK 0 /* Don't bet on it! */ + #define HG_BADNAME -1 /* Bad window or file name */ +diff -urp opencv-0.9.7.orig/tests/cv/src/cvtest.h opencv-0.9.7/tests/cv/src/cvtest.h +--- opencv-0.9.7.orig/tests/cv/src/cvtest.h 2005-06-20 11:12:24.000000000 -0400 ++++ opencv-0.9.7/tests/cv/src/cvtest.h 2006-03-07 11:44:30.908949495 -0500 +@@ -42,6 +42,10 @@ + #ifndef _CVTEST_H_ + #define _CVTEST_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #ifdef WIN32 + #include + #endif +diff -urp opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h opencv-0.9.7/tests/cxcore/src/cxcoretest.h +--- opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h 2005-06-20 11:13:30.000000000 -0400 ++++ opencv-0.9.7/tests/cxcore/src/cxcoretest.h 2006-03-07 11:43:55.992629792 -0500 +@@ -42,6 +42,10 @@ + #ifndef _CXCORE_TEST_H_ + #define _CXCORE_TEST_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #if defined WIN32 || defined WIN64 + #include + #endif +diff -urp opencv-0.9.7.orig/tests/cxts/_cxts.h opencv-0.9.7/tests/cxts/_cxts.h +--- opencv-0.9.7.orig/tests/cxts/_cxts.h 2005-06-02 10:59:49.000000000 -0400 ++++ opencv-0.9.7/tests/cxts/_cxts.h 2006-03-07 11:43:03.487652756 -0500 +@@ -42,6 +42,10 @@ + #ifndef __CXTS_INTERNAL_H__ + #define __CXTS_INTERNAL_H__ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #if (defined WIN32 || defined WIN64) && (_MSC_VER >= 1200 || defined _ICL) + #pragma warning( disable: 4514 ) + #endif Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- opencv.spec 7 Mar 2006 16:11:17 -0000 1.5 +++ opencv.spec 7 Mar 2006 16:53:42 -0000 1.6 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -126,6 +126,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-7 +- Fixed intrinsics patch so that it works. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-6 - Fixed Python bindings location on x86_64. From fedora-extras-commits at redhat.com Tue Mar 7 17:09:57 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 12:09:57 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.2, 1.3 opencv.spec, 1.6, 1.7 Message-ID: <200603071710.k27HATRF024413@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24385 Modified Files: opencv-0.9.7-intrinsics.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-8 - Again fixed intrinsics patch so that Python modules build on x86_64. opencv-0.9.7-intrinsics.patch: Index: opencv-0.9.7-intrinsics.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- opencv-0.9.7-intrinsics.patch 7 Mar 2006 16:53:42 -0000 1.2 +++ opencv-0.9.7-intrinsics.patch 7 Mar 2006 17:09:57 -0000 1.3 @@ -1,6 +1,6 @@ diff -urp opencv-0.9.7.orig/configure.in opencv-0.9.7/configure.in ---- opencv-0.9.7.orig/configure.in 2005-07-25 08:26:34.000000000 -0400 -+++ opencv-0.9.7/configure.in 2006-03-07 11:37:37.287015530 -0500 +--- opencv-0.9.7.orig/configure.in 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/configure.in 2006-03-07 12:05:24.000000000 -0500 @@ -281,6 +281,11 @@ dnl # #AC_SUBST(CXXOPENMP) @@ -14,8 +14,8 @@ AC_CONFIG_FILES([Makefile diff -urp opencv-0.9.7.orig/cv/src/_cv.h opencv-0.9.7/cv/src/_cv.h ---- opencv-0.9.7.orig/cv/src/_cv.h 2005-06-10 06:09:22.000000000 -0400 -+++ opencv-0.9.7/cv/src/_cv.h 2006-03-07 11:40:07.946072812 -0500 +--- opencv-0.9.7.orig/cv/src/_cv.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/cv/src/_cv.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CV_INTERNAL_H_ #define _CV_INTERNAL_H_ @@ -28,8 +28,8 @@ /* disable warnings related to inline functions */ #pragma warning( disable: 4711 4710 4514 ) diff -urp opencv-0.9.7.orig/cvaux/src/_cvaux.h opencv-0.9.7/cvaux/src/_cvaux.h ---- opencv-0.9.7.orig/cvaux/src/_cvaux.h 2004-08-08 14:52:26.000000000 -0400 -+++ opencv-0.9.7/cvaux/src/_cvaux.h 2006-03-07 11:40:44.758355511 -0500 +--- opencv-0.9.7.orig/cvaux/src/_cvaux.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/cvaux/src/_cvaux.h 2006-03-07 12:05:24.000000000 -0500 @@ -41,6 +41,10 @@ #ifndef __CVAUX_H__ #define __CVAUX_H__ @@ -42,8 +42,8 @@ #pragma warning( disable: 4710 4711 4514 ) /* function AAA selected for automatic inline expansion */ #endif diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h ---- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2005-07-20 06:53:14.000000000 -0400 -+++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-07 11:37:37.288015510 -0500 +--- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-07 12:05:24.000000000 -0500 @@ -48,7 +48,8 @@ #include #include @@ -55,8 +55,8 @@ #endif diff -urp opencv-0.9.7.orig/cxcore/src/_cxcore.h opencv-0.9.7/cxcore/src/_cxcore.h ---- opencv-0.9.7.orig/cxcore/src/_cxcore.h 2005-06-10 06:46:49.000000000 -0400 -+++ opencv-0.9.7/cxcore/src/_cxcore.h 2006-03-07 11:39:18.422040124 -0500 +--- opencv-0.9.7.orig/cxcore/src/_cxcore.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/cxcore/src/_cxcore.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CXCORE_INTERNAL_H_ #define _CXCORE_INTERNAL_H_ @@ -68,9 +68,35 @@ #if defined _MSC_VER && _MSC_VER >= 1200 /* disable warnings related to inline functions */ #pragma warning( disable: 4711 4710 4514 ) +diff -urp opencv-0.9.7.orig/interfaces/swig/python/error.h opencv-0.9.7/interfaces/swig/python/error.h +--- opencv-0.9.7.orig/interfaces/swig/python/error.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/interfaces/swig/python/error.h 2006-03-07 12:06:40.000000000 -0500 +@@ -44,6 +44,9 @@ + // Mark Asbach + // Institute of Communications Engineering, RWTH Aachen University + ++#ifdef HAVE_CONFIG_H ++#include ++#endif + + #include "cxcore.h" + +diff -urp opencv-0.9.7.orig/interfaces/swig/python/pycvseq.h opencv-0.9.7/interfaces/swig/python/pycvseq.h +--- opencv-0.9.7.orig/interfaces/swig/python/pycvseq.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/interfaces/swig/python/pycvseq.h 2006-03-07 12:07:13.000000000 -0500 +@@ -39,6 +39,9 @@ + // + //M*/ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif + + #include "cxcore.h" + diff -urp opencv-0.9.7.orig/otherlibs/highgui/_highgui.h opencv-0.9.7/otherlibs/highgui/_highgui.h ---- opencv-0.9.7.orig/otherlibs/highgui/_highgui.h 2005-02-01 06:33:24.000000000 -0500 -+++ opencv-0.9.7/otherlibs/highgui/_highgui.h 2006-03-07 11:42:21.432472106 -0500 +--- opencv-0.9.7.orig/otherlibs/highgui/_highgui.h 2006-03-06 22:58:42.000000000 -0500 ++++ opencv-0.9.7/otherlibs/highgui/_highgui.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,12 @@ #ifndef __HIGHGUI_H_ #define __HIGHGUI_H_ @@ -98,8 +124,8 @@ #define HG_OK 0 /* Don't bet on it! */ #define HG_BADNAME -1 /* Bad window or file name */ diff -urp opencv-0.9.7.orig/tests/cv/src/cvtest.h opencv-0.9.7/tests/cv/src/cvtest.h ---- opencv-0.9.7.orig/tests/cv/src/cvtest.h 2005-06-20 11:12:24.000000000 -0400 -+++ opencv-0.9.7/tests/cv/src/cvtest.h 2006-03-07 11:44:30.908949495 -0500 +--- opencv-0.9.7.orig/tests/cv/src/cvtest.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/tests/cv/src/cvtest.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CVTEST_H_ #define _CVTEST_H_ @@ -112,8 +138,8 @@ #include #endif diff -urp opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h opencv-0.9.7/tests/cxcore/src/cxcoretest.h ---- opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h 2005-06-20 11:13:30.000000000 -0400 -+++ opencv-0.9.7/tests/cxcore/src/cxcoretest.h 2006-03-07 11:43:55.992629792 -0500 +--- opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/tests/cxcore/src/cxcoretest.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CXCORE_TEST_H_ #define _CXCORE_TEST_H_ @@ -126,8 +152,8 @@ #include #endif diff -urp opencv-0.9.7.orig/tests/cxts/_cxts.h opencv-0.9.7/tests/cxts/_cxts.h ---- opencv-0.9.7.orig/tests/cxts/_cxts.h 2005-06-02 10:59:49.000000000 -0400 -+++ opencv-0.9.7/tests/cxts/_cxts.h 2006-03-07 11:43:03.487652756 -0500 +--- opencv-0.9.7.orig/tests/cxts/_cxts.h 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/tests/cxts/_cxts.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef __CXTS_INTERNAL_H__ #define __CXTS_INTERNAL_H__ Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- opencv.spec 7 Mar 2006 16:53:42 -0000 1.6 +++ opencv.spec 7 Mar 2006 17:09:57 -0000 1.7 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -126,6 +126,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-8 +- Again fixed intrinsics patch so that Python modules build on x86_64. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-7 - Fixed intrinsics patch so that it works. From fedora-extras-commits at redhat.com Tue Mar 7 17:17:26 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:17:26 -0500 Subject: rpms/physfs/FC-3 physfs.spec,1.2,1.3 Message-ID: <200603071717.k27HHw9v024565@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24513/FC-3 Modified Files: physfs.spec Log Message: Resolve bugzilla 183705 Index: physfs.spec =================================================================== RCS file: /cvs/extras/rpms/physfs/FC-3/physfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- physfs.spec 28 Feb 2006 23:50:28 -0000 1.2 +++ physfs.spec 7 Mar 2006 17:17:26 -0000 1.3 @@ -1,6 +1,6 @@ Name: physfs Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries Summary: Library to provide abstract access to various archives @@ -50,6 +50,15 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 install -m0644 docs/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3 +# Handle man page conflicts (bz #183705) +mv $RPM_BUILD_ROOT%{_mandir}/man3/author.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-author.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/description.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-description.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/extension.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-extension.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/major.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-major.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/minor.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-minor.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/patch.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-patch.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/url.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-url.3 + %clean rm -rf $RPM_BUILD_ROOT @@ -72,6 +81,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1.0.1-4 +- resolve man page conflicts (bz #183705) + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.1-3 - bump for FC-5 From fedora-extras-commits at redhat.com Tue Mar 7 17:17:32 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:17:32 -0500 Subject: rpms/physfs/FC-4 physfs.spec,1.2,1.3 Message-ID: <200603071718.k27HI4Mx024568@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24513/FC-4 Modified Files: physfs.spec Log Message: Resolve bugzilla 183705 Index: physfs.spec =================================================================== RCS file: /cvs/extras/rpms/physfs/FC-4/physfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- physfs.spec 28 Feb 2006 23:50:33 -0000 1.2 +++ physfs.spec 7 Mar 2006 17:17:32 -0000 1.3 @@ -1,6 +1,6 @@ Name: physfs Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries Summary: Library to provide abstract access to various archives @@ -50,6 +50,15 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 install -m0644 docs/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3 +# Handle man page conflicts (bz #183705) +mv $RPM_BUILD_ROOT%{_mandir}/man3/author.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-author.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/description.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-description.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/extension.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-extension.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/major.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-major.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/minor.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-minor.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/patch.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-patch.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/url.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-url.3 + %clean rm -rf $RPM_BUILD_ROOT @@ -72,6 +81,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1.0.1-4 +- resolve man page conflicts (bz #183705) + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.1-3 - bump for FC-5 From fedora-extras-commits at redhat.com Tue Mar 7 17:17:38 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:17:38 -0500 Subject: rpms/physfs/devel physfs.spec,1.2,1.3 Message-ID: <200603071718.k27HIAx9024571@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/physfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24513/devel Modified Files: physfs.spec Log Message: Resolve bugzilla 183705 Index: physfs.spec =================================================================== RCS file: /cvs/extras/rpms/physfs/devel/physfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- physfs.spec 28 Feb 2006 23:50:39 -0000 1.2 +++ physfs.spec 7 Mar 2006 17:17:37 -0000 1.3 @@ -1,6 +1,6 @@ Name: physfs Version: 1.0.1 -Release: 3%{?dist} +Release: 4%{?dist} License: BSD Group: System Environment/Libraries Summary: Library to provide abstract access to various archives @@ -50,6 +50,15 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3 install -m0644 docs/man/man3/* $RPM_BUILD_ROOT%{_mandir}/man3 +# Handle man page conflicts (bz #183705) +mv $RPM_BUILD_ROOT%{_mandir}/man3/author.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-author.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/description.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-description.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/extension.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-extension.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/major.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-major.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/minor.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-minor.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/patch.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-patch.3 +mv $RPM_BUILD_ROOT%{_mandir}/man3/url.3 $RPM_BUILD_ROOT%{_mandir}/man3/physfs-url.3 + %clean rm -rf $RPM_BUILD_ROOT @@ -72,6 +81,9 @@ %{_mandir}/man3/* %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1.0.1-4 +- resolve man page conflicts (bz #183705) + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.1-3 - bump for FC-5 From fedora-extras-commits at redhat.com Tue Mar 7 17:25:40 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:25:40 -0500 Subject: rpms/logjam/FC-3 logjam-4.4.1-ru.po.asp.patch, NONE, 1.1 logjam.spec, 1.14, 1.15 Message-ID: <200603071726.k27HQCQ1024775@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24716/FC-3 Modified Files: logjam.spec Added Files: logjam-4.4.1-ru.po.asp.patch Log Message: Fix russian translations (bz 183619) logjam-4.4.1-ru.po.asp.patch: --- NEW FILE logjam-4.4.1-ru.po.asp.patch --- --- logjam-4.5.1/po/ru_RU.po.orig 2005-01-03 11:13:27.000000000 +0200 +++ logjam-4.5.1/po/ru_RU.po 2005-02-08 14:40:10.147249896 +0200 @@ -6,19 +7,21 @@ # http://www.livejournal.com/~mihun/ , 2002. # Grigory Bakunov , # http://www.livejournal.com/~bobuk/, 2003. -# Kir Kolyshkin , 2003-2004, # http://www.livejournal.com/~k001/ +# Kir Kolyshkin , 2003-2004,. +# Andy Shevchenko , 2005. msgid "" msgstr "" -"Project-Id-Version: LogJam 4.4.0\n" +"Project-Id-Version: ru_RU\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-24 09:12-0700\n" -"PO-Revision-Date: 2005-01-07 02:40+0400\n" -"Last-Translator: Kir Kolyshkin \n" -"Language-Team: Russian\n" +"PO-Revision-Date: 2005-10-25 13:04+0300\n" +"Last-Translator: Andy Shevchenko \n" +"Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10.2\n" #: ../data/logjam.desktop.in.h:1 ../src/docklet.c:67 ../src/init.c:190 msgid "LogJam" @@ -323,7 +324,7 @@ #: ../src/cmdline_data.h:22 msgid "Manage user list." -msgstr "" +msgstr "???????????????????? ?????????????? ??????????????????????????." #: ../src/cmdline_data.h:46 msgid "Reset checkfriends information." @@ -351,7 +352,7 @@ #: ../src/cmdline_data.h:218 msgid "Add a user to the user list." -msgstr "" +msgstr "???????????????? ???????????????????????? ?? ????????????." #: ../src/conf.c:88 msgid "new host name is invalid" @@ -788,7 +789,7 @@ #: ../src/getopt.c:741 ../src/getopt.c:914 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s: ?????????? `%c%s' ?????????????? ??????????????????\n" +msgstr "%s: ?????????? `%s' ?????????????? ??????????????????\n" #. --option #: ../src/getopt.c:770 @@ -1152,9 +1152,8 @@ msgstr "_????????????:" #: ../src/jamview.c:414 -#, fuzzy msgid "_Tags:" -msgstr "_????: " +msgstr "_????????:" #: ../src/jamview.c:466 msgid "_Preformatted" @@ -1213,9 +1212,8 @@ msgstr "???????????? ?????????????? XML-?????????? ????????????????: %s" #: ../src/journalstore_xml.c:751 -#, fuzzy msgid "No offline copy of this journal." -msgstr "???????????????????? ???????????????????? ?????????????? ???????????? ????????????????." +msgstr "?????? ?????????????????? ?????????? ???????????? ????????????????." #: ../src/link.c:113 msgid "Make Link" @@ -1554,9 +1552,8 @@ msgstr "/??????/_??????????????????????" #: ../src/menu.c:417 -#, fuzzy msgid "/View/_Tags" -msgstr "/??????/_????????????" +msgstr "/??????/_????????" #: ../src/menu.c:418 msgid "/View/M_usic" @@ -1927,7 +1924,7 @@ #: ../src/preview.c:188 msgid "Tags" -msgstr "" +msgstr "????????" #: ../src/preview.c:248 msgid "HTML Preview" @@ -2234,13 +2231,12 @@ #. this translation is not crucial #: ../src/thanks.h:11 msgid "patches" -msgstr "" +msgstr "????????????????" #. this translation is not crucial #: ../src/thanks.h:13 -#, fuzzy msgid "Japanese translation" -msgstr "?????????????? ???? ??????????????????" +msgstr "?????????????? ???? ????????????????" #. this translation is not crucial #: ../src/thanks.h:15 ../src/thanks.h:29 @@ -2299,9 +2295,8 @@ #. this translation is not crucial #: ../src/thanks.h:39 -#, fuzzy msgid "Debian package, undo" -msgstr "???????????? ?? Debian-??????????????" +msgstr "Debian-??????????, ??????????" #. this translation is not crucial #: ../src/thanks.h:41 @@ -2500,71 +2494,3 @@ msgid "Do not show again" msgstr "???? ???????????????????? ??????????" -#~ msgid "automake fixes, testing" -#~ msgstr "?????????????????????? automake, ????????????????????????" - -#~ msgid "music|None" -#~ msgstr "???? ????????????????????" - -#~ msgid "users|None" -#~ msgstr "??????????" - -#~ msgid "Unable to save to '%s': %s." -#~ msgstr "???????????????????? ?????????????????? ?? '%s': %s." - -#~ msgid "Radio buttons" -#~ msgstr "??????????-????????????" - -#~ msgid "Check boxes" -#~ msgstr "???????????? ????????????" - -#~ msgid "Drop-down menu" -#~ msgstr "???????????????????? ????????" - -#~ msgid "Text entry" -#~ msgstr "???????? ??????????" - -#~ msgid "Scale" -#~ msgstr "????????????" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "Possible answers:" -#~ msgstr "?????????????????? ????????????:" - -#~ msgid "<< Less" -#~ msgstr "<< ????????????" - -#~ msgid "More >>" -#~ msgstr "???????????? >>" - -#~ msgid "Add _question: " -#~ msgstr "???????????????? ????????????: " - -#~ msgid "Deletes this question from the poll." -#~ msgstr "?????????????? ???????? ???????????? ???? ??????????????????????." - -#~ msgid "Move up" -#~ msgstr "??????????" - -#~ msgid "Move this question up one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Move down" -#~ msgstr "????????" - -#~ msgid "Move this question down one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Poll _name (optional): " -#~ msgstr "???????????????? (??????????????????????????):" - -#~ msgid " Question #%d - %s " -#~ msgstr " ???????????? #%d - %s " - -#~ msgid "[Fill in at least the first possible answer.]" -#~ msgstr "[?????????????????? ???????? ???? ???????? ?????????????? ????????????.]" - -#~ msgid "[Fill in some question text.]" -#~ msgstr "[?????????????????? ?????????? ??????????????.]" Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-3/logjam.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- logjam.spec 28 Feb 2006 23:09:27 -0000 1.14 +++ logjam.spec 7 Mar 2006 17:25:40 -0000 1.15 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPL @@ -23,6 +23,7 @@ Patch4: logjam-4.4.1-fedora-desktop.patch Patch5: logjam-4.5-patch8-manfix.patch Patch6: logjam-4.5.2-gtkhtml38.patch +Patch7: logjam-4.4.1-ru.po.asp.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -46,6 +47,7 @@ %patch4 -p1 -b .desktop %patch5 -p1 -b .manfix %patch6 -p1 -b .gtkhtml38 +%patch7 -p1 -b .ru.po %build autoconf @@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1:4.5.3-2 +- update russian translations, bz 183619 + * Tue Feb 28 2006 Tom "spot" Callaway 1:4.5.3-1 - bump to 4.5.3 From fedora-extras-commits at redhat.com Tue Mar 7 17:25:52 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:25:52 -0500 Subject: rpms/logjam/devel logjam-4.4.1-ru.po.asp.patch, NONE, 1.1 logjam.spec, 1.23, 1.24 Message-ID: <200603071726.k27HQOXv024783@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24716/devel Modified Files: logjam.spec Added Files: logjam-4.4.1-ru.po.asp.patch Log Message: Fix russian translations (bz 183619) logjam-4.4.1-ru.po.asp.patch: --- NEW FILE logjam-4.4.1-ru.po.asp.patch --- --- logjam-4.5.1/po/ru_RU.po.orig 2005-01-03 11:13:27.000000000 +0200 +++ logjam-4.5.1/po/ru_RU.po 2005-02-08 14:40:10.147249896 +0200 @@ -6,19 +7,21 @@ # http://www.livejournal.com/~mihun/ , 2002. # Grigory Bakunov , # http://www.livejournal.com/~bobuk/, 2003. -# Kir Kolyshkin , 2003-2004, # http://www.livejournal.com/~k001/ +# Kir Kolyshkin , 2003-2004,. +# Andy Shevchenko , 2005. msgid "" msgstr "" -"Project-Id-Version: LogJam 4.4.0\n" +"Project-Id-Version: ru_RU\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-24 09:12-0700\n" -"PO-Revision-Date: 2005-01-07 02:40+0400\n" -"Last-Translator: Kir Kolyshkin \n" -"Language-Team: Russian\n" +"PO-Revision-Date: 2005-10-25 13:04+0300\n" +"Last-Translator: Andy Shevchenko \n" +"Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10.2\n" #: ../data/logjam.desktop.in.h:1 ../src/docklet.c:67 ../src/init.c:190 msgid "LogJam" @@ -323,7 +324,7 @@ #: ../src/cmdline_data.h:22 msgid "Manage user list." -msgstr "" +msgstr "???????????????????? ?????????????? ??????????????????????????." #: ../src/cmdline_data.h:46 msgid "Reset checkfriends information." @@ -351,7 +352,7 @@ #: ../src/cmdline_data.h:218 msgid "Add a user to the user list." -msgstr "" +msgstr "???????????????? ???????????????????????? ?? ????????????." #: ../src/conf.c:88 msgid "new host name is invalid" @@ -788,7 +789,7 @@ #: ../src/getopt.c:741 ../src/getopt.c:914 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s: ?????????? `%c%s' ?????????????? ??????????????????\n" +msgstr "%s: ?????????? `%s' ?????????????? ??????????????????\n" #. --option #: ../src/getopt.c:770 @@ -1152,9 +1152,8 @@ msgstr "_????????????:" #: ../src/jamview.c:414 -#, fuzzy msgid "_Tags:" -msgstr "_????: " +msgstr "_????????:" #: ../src/jamview.c:466 msgid "_Preformatted" @@ -1213,9 +1212,8 @@ msgstr "???????????? ?????????????? XML-?????????? ????????????????: %s" #: ../src/journalstore_xml.c:751 -#, fuzzy msgid "No offline copy of this journal." -msgstr "???????????????????? ???????????????????? ?????????????? ???????????? ????????????????." +msgstr "?????? ?????????????????? ?????????? ???????????? ????????????????." #: ../src/link.c:113 msgid "Make Link" @@ -1554,9 +1552,8 @@ msgstr "/??????/_??????????????????????" #: ../src/menu.c:417 -#, fuzzy msgid "/View/_Tags" -msgstr "/??????/_????????????" +msgstr "/??????/_????????" #: ../src/menu.c:418 msgid "/View/M_usic" @@ -1927,7 +1924,7 @@ #: ../src/preview.c:188 msgid "Tags" -msgstr "" +msgstr "????????" #: ../src/preview.c:248 msgid "HTML Preview" @@ -2234,13 +2231,12 @@ #. this translation is not crucial #: ../src/thanks.h:11 msgid "patches" -msgstr "" +msgstr "????????????????" #. this translation is not crucial #: ../src/thanks.h:13 -#, fuzzy msgid "Japanese translation" -msgstr "?????????????? ???? ??????????????????" +msgstr "?????????????? ???? ????????????????" #. this translation is not crucial #: ../src/thanks.h:15 ../src/thanks.h:29 @@ -2299,9 +2295,8 @@ #. this translation is not crucial #: ../src/thanks.h:39 -#, fuzzy msgid "Debian package, undo" -msgstr "???????????? ?? Debian-??????????????" +msgstr "Debian-??????????, ??????????" #. this translation is not crucial #: ../src/thanks.h:41 @@ -2500,71 +2494,3 @@ msgid "Do not show again" msgstr "???? ???????????????????? ??????????" -#~ msgid "automake fixes, testing" -#~ msgstr "?????????????????????? automake, ????????????????????????" - -#~ msgid "music|None" -#~ msgstr "???? ????????????????????" - -#~ msgid "users|None" -#~ msgstr "??????????" - -#~ msgid "Unable to save to '%s': %s." -#~ msgstr "???????????????????? ?????????????????? ?? '%s': %s." - -#~ msgid "Radio buttons" -#~ msgstr "??????????-????????????" - -#~ msgid "Check boxes" -#~ msgstr "???????????? ????????????" - -#~ msgid "Drop-down menu" -#~ msgstr "???????????????????? ????????" - -#~ msgid "Text entry" -#~ msgstr "???????? ??????????" - -#~ msgid "Scale" -#~ msgstr "????????????" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "Possible answers:" -#~ msgstr "?????????????????? ????????????:" - -#~ msgid "<< Less" -#~ msgstr "<< ????????????" - -#~ msgid "More >>" -#~ msgstr "???????????? >>" - -#~ msgid "Add _question: " -#~ msgstr "???????????????? ????????????: " - -#~ msgid "Deletes this question from the poll." -#~ msgstr "?????????????? ???????? ???????????? ???? ??????????????????????." - -#~ msgid "Move up" -#~ msgstr "??????????" - -#~ msgid "Move this question up one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Move down" -#~ msgstr "????????" - -#~ msgid "Move this question down one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Poll _name (optional): " -#~ msgstr "???????????????? (??????????????????????????):" - -#~ msgid " Question #%d - %s " -#~ msgstr " ???????????? #%d - %s " - -#~ msgid "[Fill in at least the first possible answer.]" -#~ msgstr "[?????????????????? ???????? ???? ???????? ?????????????? ????????????.]" - -#~ msgid "[Fill in some question text.]" -#~ msgstr "[?????????????????? ?????????? ??????????????.]" Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/devel/logjam.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- logjam.spec 28 Feb 2006 23:09:51 -0000 1.23 +++ logjam.spec 7 Mar 2006 17:25:52 -0000 1.24 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPL @@ -23,6 +23,7 @@ Patch4: logjam-4.4.1-fedora-desktop.patch Patch5: logjam-4.5-patch8-manfix.patch Patch6: logjam-4.5.2-gtkhtml38.patch +Patch7: logjam-4.4.1-ru.po.asp.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -46,6 +47,7 @@ %patch4 -p1 -b .desktop %patch5 -p1 -b .manfix %patch6 -p1 -b .gtkhtml38 +%patch7 -p1 -b .ru.po %build autoconf @@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1:4.5.3-2 +- update russian translations, bz 183619 + * Tue Feb 28 2006 Tom "spot" Callaway 1:4.5.3-1 - bump to 4.5.3 From fedora-extras-commits at redhat.com Tue Mar 7 17:25:46 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 12:25:46 -0500 Subject: rpms/logjam/FC-4 logjam-4.4.1-ru.po.asp.patch, NONE, 1.1 logjam.spec, 1.23, 1.24 Message-ID: <200603071726.k27HQIE1024778@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/logjam/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24716/FC-4 Modified Files: logjam.spec Added Files: logjam-4.4.1-ru.po.asp.patch Log Message: Fix russian translations (bz 183619) logjam-4.4.1-ru.po.asp.patch: --- NEW FILE logjam-4.4.1-ru.po.asp.patch --- --- logjam-4.5.1/po/ru_RU.po.orig 2005-01-03 11:13:27.000000000 +0200 +++ logjam-4.5.1/po/ru_RU.po 2005-02-08 14:40:10.147249896 +0200 @@ -6,19 +7,21 @@ # http://www.livejournal.com/~mihun/ , 2002. # Grigory Bakunov , # http://www.livejournal.com/~bobuk/, 2003. -# Kir Kolyshkin , 2003-2004, # http://www.livejournal.com/~k001/ +# Kir Kolyshkin , 2003-2004,. +# Andy Shevchenko , 2005. msgid "" msgstr "" -"Project-Id-Version: LogJam 4.4.0\n" +"Project-Id-Version: ru_RU\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-08-24 09:12-0700\n" -"PO-Revision-Date: 2005-01-07 02:40+0400\n" -"Last-Translator: Kir Kolyshkin \n" -"Language-Team: Russian\n" +"PO-Revision-Date: 2005-10-25 13:04+0300\n" +"Last-Translator: Andy Shevchenko \n" +"Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.10.2\n" #: ../data/logjam.desktop.in.h:1 ../src/docklet.c:67 ../src/init.c:190 msgid "LogJam" @@ -323,7 +324,7 @@ #: ../src/cmdline_data.h:22 msgid "Manage user list." -msgstr "" +msgstr "???????????????????? ?????????????? ??????????????????????????." #: ../src/cmdline_data.h:46 msgid "Reset checkfriends information." @@ -351,7 +352,7 @@ #: ../src/cmdline_data.h:218 msgid "Add a user to the user list." -msgstr "" +msgstr "???????????????? ???????????????????????? ?? ????????????." #: ../src/conf.c:88 msgid "new host name is invalid" @@ -788,7 +789,7 @@ #: ../src/getopt.c:741 ../src/getopt.c:914 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s: ?????????? `%c%s' ?????????????? ??????????????????\n" +msgstr "%s: ?????????? `%s' ?????????????? ??????????????????\n" #. --option #: ../src/getopt.c:770 @@ -1152,9 +1152,8 @@ msgstr "_????????????:" #: ../src/jamview.c:414 -#, fuzzy msgid "_Tags:" -msgstr "_????: " +msgstr "_????????:" #: ../src/jamview.c:466 msgid "_Preformatted" @@ -1213,9 +1212,8 @@ msgstr "???????????? ?????????????? XML-?????????? ????????????????: %s" #: ../src/journalstore_xml.c:751 -#, fuzzy msgid "No offline copy of this journal." -msgstr "???????????????????? ???????????????????? ?????????????? ???????????? ????????????????." +msgstr "?????? ?????????????????? ?????????? ???????????? ????????????????." #: ../src/link.c:113 msgid "Make Link" @@ -1554,9 +1552,8 @@ msgstr "/??????/_??????????????????????" #: ../src/menu.c:417 -#, fuzzy msgid "/View/_Tags" -msgstr "/??????/_????????????" +msgstr "/??????/_????????" #: ../src/menu.c:418 msgid "/View/M_usic" @@ -1927,7 +1924,7 @@ #: ../src/preview.c:188 msgid "Tags" -msgstr "" +msgstr "????????" #: ../src/preview.c:248 msgid "HTML Preview" @@ -2234,13 +2231,12 @@ #. this translation is not crucial #: ../src/thanks.h:11 msgid "patches" -msgstr "" +msgstr "????????????????" #. this translation is not crucial #: ../src/thanks.h:13 -#, fuzzy msgid "Japanese translation" -msgstr "?????????????? ???? ??????????????????" +msgstr "?????????????? ???? ????????????????" #. this translation is not crucial #: ../src/thanks.h:15 ../src/thanks.h:29 @@ -2299,9 +2295,8 @@ #. this translation is not crucial #: ../src/thanks.h:39 -#, fuzzy msgid "Debian package, undo" -msgstr "???????????? ?? Debian-??????????????" +msgstr "Debian-??????????, ??????????" #. this translation is not crucial #: ../src/thanks.h:41 @@ -2500,71 +2494,3 @@ msgid "Do not show again" msgstr "???? ???????????????????? ??????????" -#~ msgid "automake fixes, testing" -#~ msgstr "?????????????????????? automake, ????????????????????????" - -#~ msgid "music|None" -#~ msgstr "???? ????????????????????" - -#~ msgid "users|None" -#~ msgstr "??????????" - -#~ msgid "Unable to save to '%s': %s." -#~ msgstr "???????????????????? ?????????????????? ?? '%s': %s." - -#~ msgid "Radio buttons" -#~ msgstr "??????????-????????????" - -#~ msgid "Check boxes" -#~ msgstr "???????????? ????????????" - -#~ msgid "Drop-down menu" -#~ msgstr "???????????????????? ????????" - -#~ msgid "Text entry" -#~ msgstr "???????? ??????????" - -#~ msgid "Scale" -#~ msgstr "????????????" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "Possible answers:" -#~ msgstr "?????????????????? ????????????:" - -#~ msgid "<< Less" -#~ msgstr "<< ????????????" - -#~ msgid "More >>" -#~ msgstr "???????????? >>" - -#~ msgid "Add _question: " -#~ msgstr "???????????????? ????????????: " - -#~ msgid "Deletes this question from the poll." -#~ msgstr "?????????????? ???????? ???????????? ???? ??????????????????????." - -#~ msgid "Move up" -#~ msgstr "??????????" - -#~ msgid "Move this question up one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Move down" -#~ msgstr "????????" - -#~ msgid "Move this question down one place in the poll." -#~ msgstr "?????????????????????? ???????? ???????????? ???? ???????? ?????????????? ????????." - -#~ msgid "Poll _name (optional): " -#~ msgstr "???????????????? (??????????????????????????):" - -#~ msgid " Question #%d - %s " -#~ msgstr " ???????????? #%d - %s " - -#~ msgid "[Fill in at least the first possible answer.]" -#~ msgstr "[?????????????????? ???????? ???? ???????? ?????????????? ????????????.]" - -#~ msgid "[Fill in some question text.]" -#~ msgstr "[?????????????????? ?????????? ??????????????.]" Index: logjam.spec =================================================================== RCS file: /cvs/extras/rpms/logjam/FC-4/logjam.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- logjam.spec 28 Feb 2006 23:09:34 -0000 1.23 +++ logjam.spec 7 Mar 2006 17:25:45 -0000 1.24 @@ -2,7 +2,7 @@ Name: logjam Version: 4.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 Summary: GTK2 client for LiveJournal License: GPL @@ -23,6 +23,7 @@ Patch4: logjam-4.4.1-fedora-desktop.patch Patch5: logjam-4.5-patch8-manfix.patch Patch6: logjam-4.5.2-gtkhtml38.patch +Patch7: logjam-4.4.1-ru.po.asp.patch %description This is the new GTK2 client for LiveJournal (http://www.livejournal.com). @@ -46,6 +47,7 @@ %patch4 -p1 -b .desktop %patch5 -p1 -b .manfix %patch6 -p1 -b .gtkhtml38 +%patch7 -p1 -b .ru.po %build autoconf @@ -83,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 7 2006 Tom "spot" Callaway 1:4.5.3-2 +- update russian translations, bz 183619 + * Tue Feb 28 2006 Tom "spot" Callaway 1:4.5.3-1 - bump to 4.5.3 From fedora-extras-commits at redhat.com Tue Mar 7 17:38:59 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:38:59 -0500 Subject: rpms/CCfits - New directory Message-ID: <200603071739.k27Hd1YI025079@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25071/CCfits Log Message: Directory /cvs/extras/rpms/CCfits added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 17:39:05 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:39:05 -0500 Subject: rpms/CCfits/devel - New directory Message-ID: <200603071739.k27Hd7JO025094@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25071/CCfits/devel Log Message: Directory /cvs/extras/rpms/CCfits/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 17:39:22 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:39:22 -0500 Subject: rpms/CCfits Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603071739.k27HdOS0025128@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116 Added Files: Makefile import.log Log Message: Setup of module CCfits --- NEW FILE Makefile --- # Top level Makefile for module CCfits all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 7 17:39:27 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:39:27 -0500 Subject: rpms/CCfits/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603071739.k27HdUtW025150@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25116/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module CCfits --- NEW 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 Mar 7 17:40:18 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:40:18 -0500 Subject: rpms/CCfits import.log,1.1,1.2 Message-ID: <200603071740.k27Heoiw025238@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25198 Modified Files: import.log Log Message: auto-import CCfits-1.4-3.fc4 on branch devel from CCfits-1.4-3.fc4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/CCfits/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Mar 2006 17:39:21 -0000 1.1 +++ import.log 7 Mar 2006 17:40:17 -0000 1.2 @@ -0,0 +1 @@ +CCfits-1_4-3_fc4:HEAD:CCfits-1.4-3.fc4.src.rpm:1141753210 From fedora-extras-commits at redhat.com Tue Mar 7 17:40:23 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:40:23 -0500 Subject: rpms/CCfits/devel CCfits-1.4-g++4.patch, NONE, 1.1 CCfits-1.4-removerpath.patch, NONE, 1.1 CCfits.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603071740.k27HeuV7025242@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25198/devel Modified Files: .cvsignore sources Added Files: CCfits-1.4-g++4.patch CCfits-1.4-removerpath.patch CCfits.spec Log Message: auto-import CCfits-1.4-3.fc4 on branch devel from CCfits-1.4-3.fc4.src.rpm CCfits-1.4-g++4.patch: --- NEW FILE CCfits-1.4-g++4.patch --- diff -ur CCfits.old/ExtHDUT.h CCfits/ExtHDUT.h --- CCfits.old/ExtHDUT.h 2006-02-16 11:36:03.000000000 +0100 +++ CCfits/ExtHDUT.h 2006-02-16 11:35:31.000000000 +0100 @@ -145,7 +145,8 @@ long firstElement(0); long dimSize(1); std::vector inputDimensions(naxis(),1); - size_t n(std::min(naxis(),first.size())); + size_t sNaxis = static_cast(naxis()); + size_t n(std::min(sNaxis,first.size())); std::copy(&first[0],&first[n],&inputDimensions[0]); for (long i = 0; i < naxis(); ++i) { diff -ur CCfits.old/PHDUT.h CCfits/PHDUT.h --- CCfits.old/PHDUT.h 2006-02-16 11:36:03.000000000 +0100 +++ CCfits/PHDUT.h 2006-02-16 11:35:31.000000000 +0100 @@ -141,7 +141,8 @@ long firstElement(0); long dimSize(1); std::vector inputDimensions(naxis(),1); - size_t n(std::min(naxis(),first.size())); + size_t sNaxis = static_cast(naxis()); + size_t n(std::min(sNaxis,first.size())); std::copy(&first[0],&first[n],&inputDimensions[0]); for (long i = 0; i < naxis(); ++i) { @@ -553,7 +554,7 @@ try { PrimaryHDU& image = dynamic_cast&>(*this); - image.writeImage(firstVertex,lastVertex,stride,data); + image.writeImage(firstVertex,lastVertex,data); } catch (std::bad_cast) { @@ -565,7 +566,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } else if (bitpix() == Idouble) @@ -575,7 +576,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } else if (bitpix() == Ibyte) { @@ -584,7 +585,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } else if (bitpix() == Ilong) { @@ -595,7 +596,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } else @@ -605,7 +606,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } } else if (bitpix() == Ishort) @@ -617,7 +618,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } else @@ -627,7 +628,7 @@ size_t n(data.size()); std::valarray __tmp(n); for (size_t j= 0; j < n; ++j) __tmp[j] = data[j]; - phdu.writeImage(firstVertex,lastVertex,stride,__tmp); + phdu.writeImage(firstVertex,lastVertex,__tmp); } } else CCfits-1.4-removerpath.patch: --- NEW FILE CCfits-1.4-removerpath.patch --- --- CCfits.old/Makefile.in 2006-02-20 21:05:34.000000000 +0100 +++ CCfits/Makefile.in 2006-02-20 21:08:28.000000000 +0100 @@ -157,8 +157,6 @@ SUBDIRS = vs.net -R_LIB_PATH = @RDFLAGS@ - MSVC_FILES = MSconfig.h EXTRA_DIST = config BUILD CHANGES $(MSVC_FILES) @@ -168,7 +166,6 @@ cookbook_SOURCES = cookbook.cxx cookbook_LDADD = libCCfits.la -cookbook_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH) INCLUDES = -I$(top_srcdir)/.. @@ -198,7 +195,6 @@ # This will tell shared library which STD C++ library to use without # needing the user to use LD_LIBRARY_PATH environment variable libCCfits_la_LIBADD = $(LIBSTDCPP) -libCCfits_la_LDFLAGS = -R $(R_LIB_PATH) -R $(CXX_LIB_PATH) libCCfits_ladir = $(pkgincludedir) @@ -241,6 +237,7 @@ CONFIG_CLEAN_FILES = Doxyfile LTLIBRARIES = $(lib_LTLIBRARIES) +libCCfits_la_LDFLAGS = libCCfits_la_DEPENDENCIES = am_libCCfits_la_OBJECTS = AsciiTable.lo BinTable.lo Column.lo \ ColumnCreator.lo ColumnData.lo ColumnVectorData.lo ExtHDU.lo \ @@ -254,6 +251,7 @@ am_cookbook_OBJECTS = cookbook.$(OBJEXT) cookbook_OBJECTS = $(am_cookbook_OBJECTS) cookbook_DEPENDENCIES = libCCfits.la +cookbook_LDFLAGS = DEFAULT_INCLUDES = -I. -I$(srcdir) -I. depcomp = $(SHELL) $(top_srcdir)/config/depcomp --- NEW FILE CCfits.spec --- Name: CCfits Version: 1.4 Release: 3%{?dist} Summary: A C++ interface for cfitsio Group: Development/Libraries License: BSD URL: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits Source0: http://heasarc.gsfc.nasa.gov/docs/software/fitsio/ccfits/CCfits-1.4.tar.gz Patch0: CCfits-1.4-g++4.patch Patch1: CCfits-1.4-removerpath.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cfitsio-devel BuildRequires: gcc-c++ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig %description CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++. It is written in ANSI C++ and implemented using the C++ Standard Library with namespaces, exception handling, and member template functions. %package devel Summary: Headers for developing programs that will use %{name} Group: Development/Libraries Requires: cfitsio-devel Requires: %{name} = %{version}-%{release} %description devel These are the header files and libraries needed to develop a %{name} application. %package docs Summary: Documentation for %{name}, includes full API docs Group: Documentation %description docs This package contains the full API documentation for %{name}. %prep %setup -q -n CCfits %patch0 -p1 %patch1 -p1 # Remove perl files in html docs rm -rf %{_builddir}/%{name}/html/*.pl %build %configure --disable-static --with-cfitsio=%{_prefix} --with-cfitsio-include=%{_includedir}/cfitsio make %{?_smp_mflags} %install rm -fr %{buildroot} make install DESTDIR=%{buildroot} %clean rm -fr %{buildroot} %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root) %doc License.txt %{_libdir}/*so.* %files devel %defattr(-,root,root) %doc CHANGES %exclude %{_bindir}/cookbook %{_libdir}/*.so %exclude %{_libdir}/*.la %{_includedir}/* %files docs %defattr(-,root,root,-) %doc html %changelog * Tue Mar 07 2006 Sergio Pascual 1.4-3 - Rebuilt with new upstream source. * Mon Mar 06 2006 Sergio Pascual 1.4-2 - Removed Source with license file License.txt. * Mon Feb 20 2006 Sergio Pascual 1.4-1 - Removed perl files in documentation. - Changed license type to BSD. - Main summary changed and trailing dots removed. - Removed -rpath in the shared library * Thu Feb 16 2006 Sergio Pascual 1.4-0 - Initial spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/CCfits/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2006 17:39:27 -0000 1.1 +++ .cvsignore 7 Mar 2006 17:40:23 -0000 1.2 @@ -0,0 +1 @@ +CCfits-1.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/CCfits/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2006 17:39:27 -0000 1.1 +++ sources 7 Mar 2006 17:40:23 -0000 1.2 @@ -0,0 +1 @@ +230edb39de6a1e3dc6e0adda65d0676d CCfits-1.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 7 17:44:36 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 12:44:36 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.3, 1.4 opencv.spec, 1.7, 1.8 Message-ID: <200603071745.k27Hj826025311@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25287 Modified Files: opencv-0.9.7-intrinsics.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-9 - Still more fixing of intrinsics patch for Python bindings on x86_64. opencv-0.9.7-intrinsics.patch: Index: opencv-0.9.7-intrinsics.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- opencv-0.9.7-intrinsics.patch 7 Mar 2006 17:09:57 -0000 1.3 +++ opencv-0.9.7-intrinsics.patch 7 Mar 2006 17:44:35 -0000 1.4 @@ -165,3 +165,31 @@ #if (defined WIN32 || defined WIN64) && (_MSC_VER >= 1200 || defined _ICL) #pragma warning( disable: 4514 ) #endif +diff -urp opencv-0.9.7.orig/interfaces/swig/general/cv.i opencv-0.9.7/interfaces/swig/general/cv.i +--- opencv-0.9.7.orig/interfaces/swig/general/cv.i 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/interfaces/swig/general/cv.i 2006-03-07 12:33:16.000000000 -0500 +@@ -49,6 +49,10 @@ + + + %{ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include "cv.h" + %} + +diff -urp opencv-0.9.7.orig/interfaces/swig/general/highgui.i opencv-0.9.7/interfaces/swig/general/highgui.i +--- opencv-0.9.7.orig/interfaces/swig/general/highgui.i 2006-03-06 22:58:41.000000000 -0500 ++++ opencv-0.9.7/interfaces/swig/general/highgui.i 2006-03-07 12:33:46.000000000 -0500 +@@ -48,6 +48,10 @@ + %module(package="opencv") highgui + + %{ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include "highgui.h" + %} + Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- opencv.spec 7 Mar 2006 17:09:57 -0000 1.7 +++ opencv.spec 7 Mar 2006 17:44:35 -0000 1.8 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -126,6 +126,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-9 +- Still more fixing of intrinsics patch for Python bindings on x86_64. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-8 - Again fixed intrinsics patch so that Python modules build on x86_64. From fedora-extras-commits at redhat.com Tue Mar 7 17:46:39 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Tue, 7 Mar 2006 12:46:39 -0500 Subject: owners owners.list,1.719,1.720 Message-ID: <200603071747.k27HlBCd025382@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25355 Modified Files: owners.list Log Message: Added CCfits, a C++ interface for cfitsio Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.719 retrieving revision 1.720 diff -u -r1.719 -r1.720 --- owners.list 7 Mar 2006 14:44:49 -0000 1.719 +++ owners.list 7 Mar 2006 17:46:38 -0000 1.720 @@ -103,6 +103,7 @@ Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|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|ville.skytta at iki.fi|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| From fedora-extras-commits at redhat.com Tue Mar 7 18:49:27 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 13:49:27 -0500 Subject: rpms/opencv/FC-4 opencv.spec,1.8,1.9 Message-ID: <200603071850.k27Io0w9027524@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27507 Modified Files: opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-10 - Using simple intrinsincs patch. Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- opencv.spec 7 Mar 2006 17:44:35 -0000 1.8 +++ opencv.spec 7 Mar 2006 18:49:27 -0000 1.9 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -13,7 +13,7 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile -Patch0: opencv-0.9.7-intrinsics.patch +Patch0: opencv-0.9.7-intrinsics-simple.patch Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -126,6 +126,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-10 +- Using simple intrinsincs patch. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-9 - Still more fixing of intrinsics patch for Python bindings on x86_64. From fedora-extras-commits at redhat.com Tue Mar 7 18:54:03 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Tue, 7 Mar 2006 13:54:03 -0500 Subject: rpms/ufsparse/devel sources,1.5,1.6 ufsparse.spec,1.11,1.12 Message-ID: <200603071854.k27IsZ3P027655@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ufsparse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27632 Modified Files: sources ufsparse.spec Log Message: New release, including two new libs. Index: sources =================================================================== RCS file: /cvs/extras/rpms/ufsparse/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Feb 2006 16:39:46 -0000 1.5 +++ sources 7 Mar 2006 18:54:03 -0000 1.6 @@ -1 +1 @@ -534abf5e6f6ab58dbeaf6154fc31ec61 UFsparse.tar.gz +15f2cc58c2d66fa2ac0286cdfcf7cc76 UFsparse.tar.gz Index: ufsparse.spec =================================================================== RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ufsparse.spec 15 Feb 2006 16:32:11 -0000 1.11 +++ ufsparse.spec 7 Mar 2006 18:54:03 -0000 1.12 @@ -1,12 +1,12 @@ Name: ufsparse -Version: 0.93 -Release: 2%{?dist} +Version: 1.2 +Release: 1%{?dist} Summary: University of Florida sparse matrix libraries Group: System Environment/Libraries License: Distributable -URL: http://www.cise.ufl.edu/research/sparse/UFsparse/ -Source0: http://www.cise.ufl.edu/research/sparse/UFsparse/Jan28_2006/UFsparse.tar.gz +URL: http://www.cise.ufl.edu/research/sparse/UFsparse +Source0: http://www.cise.ufl.edu/research/sparse/UFsparse/v%{version}/UFsparse.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: blas-devel @@ -20,7 +20,10 @@ COLAMD column approximate minimum degree ordering CCOLAMD constrained column approximate minimum degree ordering CHOLMOD sparse Cholesky factorization + CSparse a concise sparse matrix package + CXSparse CSparse extended: complex matrix, int and long int support KLU sparse LU factorization, primarily for circuit simulation + LDL a simple LDL' factorization UMFPACK sparse LU factorization UFconfig configuration file for all the above packages. @@ -139,6 +142,44 @@ ln -sf libcolamd.so.%{colamd_version} libcolamd.so popd +## Don't install CSparse as the header file name conflicts with +## CXSparse. CXSparse is a superset of CSparse, with the user needing +## to link against -lcxsparse rather than -lcsparse. This is an +## annoyance and not real issue. +%define csparse_version 1.2 +%define csparse_version_major 1 +pushd CSparse + pushd Source + make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libcsparse.a + gcc -shared -Wl,-soname,libcsparse.so.%{csparse_version_major} -o libcsparse.so.%{csparse_version} `ls *.o` + cp *.a *.so* ../../Lib +# cp cs.h ../../Include + popd + mkdir ../Doc/CSparse/ + cp README.txt License.txt lesser.txt ../Doc/CSparse +popd +pushd Lib + ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major} + ln -sf libcsparse.so.%{csparse_version} libcsparse.so +popd + +%define cxsparse_version 1.2 +%define cxsparse_version_major 1 +pushd CXSparse + pushd Source + make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libcxsparse.a + gcc -shared -Wl,-soname,libcxsparse.so.%{cxsparse_version_major} -o libcxsparse.so.%{cxsparse_version} `ls *.o` + cp *.a *.so* ../../Lib + cp cs.h ../../Include + popd + mkdir ../Doc/CXSparse/ + cp README.txt License.txt lesser.txt ../Doc/CXSparse +popd +pushd Lib + ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major} + ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so +popd + %define klu_version 0.7 %define klu_version_major 0 pushd KLU @@ -151,7 +192,6 @@ mkdir ../Doc/KLU/ cp README.txt Doc/lesser.txt ../Doc/KLU/ mkdir ../Devel/KLU/ - cp Doc/thesis.pdf Doc/README ../Devel/KLU/ popd pushd Lib ln -sf libklu.so.%{klu_version} libklu.so.%{klu_version_major} @@ -232,6 +272,10 @@ %{_libdir}/lib*.so %changelog +* Tue Mar 7 2006 Quentin Spencer 1.2-1 +- New release. +- Build newly added libraries CSparse and CXSparse. + * Wed Feb 15 2006 Quentin Spencer 0.93-2 - Rebuild for Fedora Extras 5. From fedora-extras-commits at redhat.com Tue Mar 7 19:05:32 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 14:05:32 -0500 Subject: rpms/lib765/devel lib765.spec,1.1,1.2 Message-ID: <200603071905.k27J5YvW029657@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29625/devel Modified Files: lib765.spec Log Message: auto-import lib765-0.3.3-4 on branch devel from lib765-0.3.3-4.src.rpm Index: lib765.spec =================================================================== RCS file: /cvs/extras/rpms/lib765/devel/lib765.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lib765.spec 13 Jan 2006 00:58:49 -0000 1.1 +++ lib765.spec 7 Mar 2006 19:05:31 -0000 1.2 @@ -1,7 +1,7 @@ Summary: A library for emulating the uPD765a floppy controller Name: lib765 Version: 0.3.3 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.seasip.demon.co.uk/Unix/LibDsk/lib765-%{version}.tar.gz @@ -16,7 +16,7 @@ %package devel Summary: Development files for lib765. Group: Development/Libraries -Requires: libdsk-devel +Requires: libdsk-devel, lib765=%{version}-%{release} %description devel Development files for lib765. @@ -51,6 +51,9 @@ %exclude %{_libdir}/lib765.la %changelog +* Tue Mar 7 2006 Paul F. Johnson 0.3.3-4 +- Added Require for devel package + * Mon Nov 14 2005 Paul F. Johnson 0.3.3-3 - now uses %{?_smp_mflags} during the make process From fedora-extras-commits at redhat.com Tue Mar 7 19:05:24 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 14:05:24 -0500 Subject: rpms/lib765 import.log,1.2,1.3 Message-ID: <200603071906.k27J60Cn029661@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29625 Modified Files: import.log Log Message: auto-import lib765-0.3.3-4 on branch devel from lib765-0.3.3-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lib765/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 13 Jan 2006 00:58:43 -0000 1.2 +++ import.log 7 Mar 2006 19:05:23 -0000 1.3 @@ -1 +1,2 @@ lib765-0_3_3-3:HEAD:lib765-0.3.3-3.src.rpm:1137113910 +lib765-0_3_3-4:HEAD:lib765-0.3.3-4.src.rpm:1141758291 From fedora-extras-commits at redhat.com Tue Mar 7 19:06:04 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 14:06:04 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.4, 1.5 opencv.spec, 1.9, 1.10 Message-ID: <200603071906.k27J6alp029722@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29668 Modified Files: opencv-0.9.7-intrinsics.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-11 - Don't do "make check" because it doesn't run any tests anyway. - Back to main intrinsics patch. opencv-0.9.7-intrinsics.patch: Index: opencv-0.9.7-intrinsics.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- opencv-0.9.7-intrinsics.patch 7 Mar 2006 17:44:35 -0000 1.4 +++ opencv-0.9.7-intrinsics.patch 7 Mar 2006 19:06:04 -0000 1.5 @@ -123,48 +123,6 @@ /* Errors */ #define HG_OK 0 /* Don't bet on it! */ #define HG_BADNAME -1 /* Bad window or file name */ -diff -urp opencv-0.9.7.orig/tests/cv/src/cvtest.h opencv-0.9.7/tests/cv/src/cvtest.h ---- opencv-0.9.7.orig/tests/cv/src/cvtest.h 2006-03-06 22:58:41.000000000 -0500 -+++ opencv-0.9.7/tests/cv/src/cvtest.h 2006-03-07 12:05:24.000000000 -0500 -@@ -42,6 +42,10 @@ - #ifndef _CVTEST_H_ - #define _CVTEST_H_ - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #ifdef WIN32 - #include - #endif -diff -urp opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h opencv-0.9.7/tests/cxcore/src/cxcoretest.h ---- opencv-0.9.7.orig/tests/cxcore/src/cxcoretest.h 2006-03-06 22:58:41.000000000 -0500 -+++ opencv-0.9.7/tests/cxcore/src/cxcoretest.h 2006-03-07 12:05:24.000000000 -0500 -@@ -42,6 +42,10 @@ - #ifndef _CXCORE_TEST_H_ - #define _CXCORE_TEST_H_ - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #if defined WIN32 || defined WIN64 - #include - #endif -diff -urp opencv-0.9.7.orig/tests/cxts/_cxts.h opencv-0.9.7/tests/cxts/_cxts.h ---- opencv-0.9.7.orig/tests/cxts/_cxts.h 2006-03-06 22:58:41.000000000 -0500 -+++ opencv-0.9.7/tests/cxts/_cxts.h 2006-03-07 12:05:24.000000000 -0500 -@@ -42,6 +42,10 @@ - #ifndef __CXTS_INTERNAL_H__ - #define __CXTS_INTERNAL_H__ - -+#ifdef HAVE_CONFIG_H -+#include -+#endif -+ - #if (defined WIN32 || defined WIN64) && (_MSC_VER >= 1200 || defined _ICL) - #pragma warning( disable: 4514 ) - #endif diff -urp opencv-0.9.7.orig/interfaces/swig/general/cv.i opencv-0.9.7/interfaces/swig/general/cv.i --- opencv-0.9.7.orig/interfaces/swig/general/cv.i 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/general/cv.i 2006-03-07 12:33:16.000000000 -0500 Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- opencv.spec 7 Mar 2006 18:49:27 -0000 1.9 +++ opencv.spec 7 Mar 2006 19:06:04 -0000 1.10 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -13,7 +13,7 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile -Patch0: opencv-0.9.7-intrinsics-simple.patch +Patch0: opencv-0.9.7-intrinsics.patch Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -66,10 +66,6 @@ make %{?_smp_mflags} -%check -make check - - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -126,6 +122,10 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-11 +- Don't do "make check" because it doesn't run any tests anyway. +- Back to main intrinsics patch. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-10 - Using simple intrinsincs patch. From fedora-extras-commits at redhat.com Tue Mar 7 19:45:00 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 14:45:00 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics.patch, 1.5, 1.6 opencv.spec, 1.10, 1.11 Message-ID: <200603071945.k27JjXWn030036@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30012 Modified Files: opencv-0.9.7-intrinsics.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-12 - More intrinsics patch fixing. opencv-0.9.7-intrinsics.patch: Index: opencv-0.9.7-intrinsics.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- opencv-0.9.7-intrinsics.patch 7 Mar 2006 19:06:04 -0000 1.5 +++ opencv-0.9.7-intrinsics.patch 7 Mar 2006 19:44:59 -0000 1.6 @@ -151,3 +151,45 @@ #include "highgui.h" %} +diff -urp opencv-0.9.7.orig/apps/haartraining/src/_cvcommon.h opencv-0.9.7/apps/haartraining/src/_cvcommon.h +--- opencv-0.9.7.orig/apps/haartraining/src/_cvcommon.h 2006-03-07 14:23:05.000000000 -0500 ++++ opencv-0.9.7/apps/haartraining/src/_cvcommon.h 2006-03-07 14:34:25.000000000 -0500 +@@ -42,6 +42,10 @@ + #ifndef __CVCOMMON_H_ + #define __CVCOMMON_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include + #include + +diff -urp opencv-0.9.7.orig/apps/haartraining/src/_cvhaartraining.h opencv-0.9.7/apps/haartraining/src/_cvhaartraining.h +--- opencv-0.9.7.orig/apps/haartraining/src/_cvhaartraining.h 2006-03-07 14:23:05.000000000 -0500 ++++ opencv-0.9.7/apps/haartraining/src/_cvhaartraining.h 2006-03-07 14:33:31.000000000 -0500 +@@ -48,6 +48,10 @@ + #ifndef __CVHAARTRAINING_H_ + #define __CVHAARTRAINING_H_ + ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include <_cvcommon.h> + #include + #include +diff -urp opencv-0.9.7.orig/apps/haartraining/src/performance.cpp opencv-0.9.7/apps/haartraining/src/performance.cpp +--- opencv-0.9.7.orig/apps/haartraining/src/performance.cpp 2006-03-07 14:23:05.000000000 -0500 ++++ opencv-0.9.7/apps/haartraining/src/performance.cpp 2006-03-07 14:35:41.000000000 -0500 +@@ -44,6 +44,10 @@ + * + * Measure performance of classifier + */ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ + #include "cv.h" + #include + #include Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- opencv.spec 7 Mar 2006 19:06:04 -0000 1.10 +++ opencv.spec 7 Mar 2006 19:44:59 -0000 1.11 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -122,6 +122,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-12 +- More intrinsics patch fixing. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-11 - Don't do "make check" because it doesn't run any tests anyway. - Back to main intrinsics patch. From fedora-extras-commits at redhat.com Tue Mar 7 19:51:18 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 14:51:18 -0500 Subject: rpms/opencv/FC-4 opencv-0.9.7-intrinsics-simple.patch, 1.1, 1.2 opencv.spec, 1.11, 1.12 Message-ID: <200603071951.k27Jpoes030136@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30114 Modified Files: opencv-0.9.7-intrinsics-simple.patch opencv.spec Log Message: * Tue Mar 7 2006 Simon Perreault - 0.9.7-13 - Changed intrinsics patch so that it matches upstream. opencv-0.9.7-intrinsics-simple.patch: Index: opencv-0.9.7-intrinsics-simple.patch =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv-0.9.7-intrinsics-simple.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opencv-0.9.7-intrinsics-simple.patch 7 Mar 2006 04:07:32 -0000 1.1 +++ opencv-0.9.7-intrinsics-simple.patch 7 Mar 2006 19:51:18 -0000 1.2 @@ -6,7 +6,7 @@ #include - #if defined WIN64 && defined EM64T && defined _MSC_VER -+ #if defined WIN64 && defined EM64T && defined _MSC_VER || defined __GNUC__ ++ #if defined WIN64 && defined EM64T && defined _MSC_VER || defined __SSE2__ #include #endif Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-4/opencv.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- opencv.spec 7 Mar 2006 19:44:59 -0000 1.11 +++ opencv.spec 7 Mar 2006 19:51:18 -0000 1.12 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -13,7 +13,7 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile -Patch0: opencv-0.9.7-intrinsics.patch +Patch0: opencv-0.9.7-intrinsics-simple.patch Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -122,6 +122,9 @@ %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-13 +- Changed intrinsics patch so that it matches upstream. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-12 - More intrinsics patch fixing. From fedora-extras-commits at redhat.com Tue Mar 7 19:53:22 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Tue, 7 Mar 2006 14:53:22 -0500 Subject: rpms/python-matplotlib/devel .cvsignore, 1.8, 1.9 python-matplotlib.spec, 1.14, 1.15 sources, 1.8, 1.9 Message-ID: <200603071953.k27JrtdJ030203@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30180 Modified Files: .cvsignore python-matplotlib.spec sources Log Message: Update to 0.87.1 Add pycairo >= 1.0.2 requires (FC5+ only) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 28 Feb 2006 18:50:06 -0000 1.8 +++ .cvsignore 7 Mar 2006 19:53:22 -0000 1.9 @@ -1 +1 @@ -matplotlib-0.87.tar.gz +matplotlib-0.87.1.tar.gz Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- python-matplotlib.spec 28 Feb 2006 18:52:43 -0000 1.14 +++ python-matplotlib.spec 7 Mar 2006 19:53:22 -0000 1.15 @@ -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 +Version: 0.87.1 Release: 1%{?dist} Summary: Python plotting library @@ -16,6 +16,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 %description @@ -89,6 +90,10 @@ %{python_sitearch}/matplotlib/backends/_tkagg.so %changelog +* Tue Mar 7 2006 Orion Poplawski 0.87.1-1 +- Update to 0.87.1 +- Add pycairo >= 1.0.2 requires (FC5+ only) + * Fri Feb 24 2006 Orion Poplawski 0.87-1 - Update to 0.87 - Add BR numpy and python-numarray Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 28 Feb 2006 18:50:06 -0000 1.8 +++ sources 7 Mar 2006 19:53:22 -0000 1.9 @@ -1 +1 @@ -4ffff13865b37e8e39719d266419c976 matplotlib-0.87.tar.gz +bc605e5346128a0e2b9c5b0d602ecec8 matplotlib-0.87.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 7 19:57:34 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 7 Mar 2006 14:57:34 -0500 Subject: rpms/banshee/devel banshee-0.10.7-dll-path.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 banshee.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603071958.k27Jw63A030273@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30249 Modified Files: .cvsignore banshee.spec sources Added Files: banshee-0.10.7-dll-path.patch Log Message: * Tue Mar 7 2006 Christopher Aillon 0.10.7-1 - Update to 0.10.7 - Fix build on x86-64 banshee-0.10.7-dll-path.patch: --- NEW FILE banshee-0.10.7-dll-path.patch --- --- banshee-0.10.7/configure.dll-path 2006-03-07 14:40:54.000000000 -0500 +++ banshee-0.10.7/configure 2006-03-07 14:43:20.000000000 -0500 @@ -22663,7 +22663,7 @@ for asm in $required_assemblies; do echo "$as_me:$LINENO: checking for $asm.dll" >&5 echo $ECHO_N "checking for $asm.dll... $ECHO_C" >&6 - if test ! -e `$PKG_CONFIG --variable=libdir mono`/mono/1.0/$asm.dll; then + if test ! -e `$PKG_CONFIG --variable=prefix mono`/lib/mono/1.0/$asm.dll; then { { echo "$as_me:$LINENO: error: missing required Mono DLL: $asm.dll" >&5 echo "$as_me: error: missing required Mono DLL: $asm.dll" >&2;} { (exit 1); exit 1; }; } Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Mar 2006 16:22:25 -0000 1.2 +++ .cvsignore 7 Mar 2006 19:57:34 -0000 1.3 @@ -1 +1 @@ -banshee-0.10.6.tar.gz +banshee-0.10.7.tar.gz Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- banshee.spec 6 Mar 2006 22:43:19 -0000 1.3 +++ banshee.spec 7 Mar 2006 19:57:34 -0000 1.4 @@ -1,6 +1,6 @@ Name: banshee -Version: 0.10.6 -Release: 3 +Version: 0.10.7 +Release: 1 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -27,6 +27,8 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils +Patch1: banshee-0.10.7-dll-path.patch + %description Banshee allows you to import CDs, sync your music collection to an iPod, play music directly from an iPod, create playlists with songs from your @@ -34,6 +36,7 @@ %prep %setup -q +%patch1 -p1 -b .dll-path %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -94,6 +97,10 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Tue Mar 7 2006 Christopher Aillon 0.10.7-1 +- Update to 0.10.7 +- Fix build on x86-64 + * Mon Mar 6 2006 Christopher Aillon 0.10.6-3 - Don't build with smp_mflags, as parallel make causes the build to fail Index: sources =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Mar 2006 16:22:25 -0000 1.2 +++ sources 7 Mar 2006 19:57:34 -0000 1.3 @@ -1 +1 @@ -398b69c1818568b9d7a39c5e036de84b banshee-0.10.6.tar.gz +cae68ff23077f4ec37ab23b040c2470a banshee-0.10.7.tar.gz From fedora-extras-commits at redhat.com Tue Mar 7 20:10:44 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Tue, 7 Mar 2006 15:10:44 -0500 Subject: rpms/gparted/devel .cvsignore, 1.4, 1.5 gparted.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603072011.k27KBH1J032244@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gparted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32218 Modified Files: .cvsignore gparted.spec sources Log Message: * Mon Mar 07 2006 Deji Akingunola - 0.2.2-1 - New release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 30 Jan 2006 16:37:15 -0000 1.4 +++ .cvsignore 7 Mar 2006 20:10:44 -0000 1.5 @@ -1 +1 @@ -gparted-0.2.tar.bz2 +gparted-0.2.2.tar.bz2 Index: gparted.spec =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gparted.spec 13 Feb 2006 20:58:09 -0000 1.5 +++ gparted.spec 7 Mar 2006 20:10:44 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Gnome Partition Editor Name: gparted -Version: 0.2 -Release: 2%{?dist} +Version: 0.2.2 +Release: 1%{?dist} Group: Applications/System License: GPL URL: http://gparted.sourceforge.net @@ -77,6 +77,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Mon Mar 07 2006 Deji Akingunola - 0.2.2-1 +- New release + * Mon Feb 13 2006 Deji Akingunola - 0.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 30 Jan 2006 16:37:15 -0000 1.4 +++ sources 7 Mar 2006 20:10:44 -0000 1.5 @@ -1 +1 @@ -250008cfbb87ef78298951bc999c6621 gparted-0.2.tar.bz2 +40419b1b10723055edfc6567a296fea0 gparted-0.2.2.tar.bz2 From fedora-extras-commits at redhat.com Tue Mar 7 20:19:30 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 7 Mar 2006 15:19:30 -0500 Subject: rpms/bigloo/devel bigloo.spec,1.4,1.5 Message-ID: <200603072020.k27KK2oa032396@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32379 Modified Files: bigloo.spec Log Message: Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/bigloo.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bigloo.spec 28 Feb 2006 18:58:07 -0000 1.4 +++ bigloo.spec 7 Mar 2006 20:19:29 -0000 1.5 @@ -2,7 +2,7 @@ Name: bigloo Version: 2.7a -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages @@ -65,7 +65,7 @@ %prep %setup -q -n %{name}%{version} # disable bmem for now -%patch0 -p1 +#%patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -90,7 +90,8 @@ %{!?_with_java: --jvm=no} \ --sharedbde=yes \ --sharedcompiler=yes \ - --coflags="$RPM_OPT_FLAGS" + --coflags="$RPM_OPT_FLAGS" \ + --cpicflags="-fPIC" perl -pi -e 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config From fedora-extras-commits at redhat.com Tue Mar 7 22:14:15 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:14:15 -0500 Subject: rpms/fuse-emulator - New directory Message-ID: <200603072214.k27MEFvX004271@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4264/fuse-emulator Log Message: Directory /cvs/extras/rpms/fuse-emulator added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 22:14:20 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:14:20 -0500 Subject: rpms/fuse-emulator/devel - New directory Message-ID: <200603072214.k27MENqD004287@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4264/fuse-emulator/devel Log Message: Directory /cvs/extras/rpms/fuse-emulator/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 22:14:46 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:14:46 -0500 Subject: rpms/fuse-emulator Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603072214.k27MEmtN004321@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4309 Added Files: Makefile import.log Log Message: Setup of module fuse-emulator --- NEW FILE Makefile --- # Top level Makefile for module fuse-emulator all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 7 22:14:52 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:14:52 -0500 Subject: rpms/fuse-emulator/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603072214.k27MEsgZ004341@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4309/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module fuse-emulator --- NEW 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 Mar 7 22:16:46 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:16:46 -0500 Subject: rpms/fuse-emulator import.log,1.1,1.2 Message-ID: <200603072217.k27MHIf5004488@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4449 Modified Files: import.log Log Message: auto-import fuse-emulator-0.7.0-6 on branch devel from fuse-emulator-0.7.0-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/fuse-emulator/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Mar 2006 22:14:46 -0000 1.1 +++ import.log 7 Mar 2006 22:16:46 -0000 1.2 @@ -0,0 +1 @@ +fuse-emulator-0_7_0-6:HEAD:fuse-emulator-0.7.0-6.src.rpm:1141769794 From fedora-extras-commits at redhat.com Tue Mar 7 22:16:52 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Tue, 7 Mar 2006 17:16:52 -0500 Subject: rpms/fuse-emulator/devel README.z88sdk, NONE, 1.1 fuse-emulator.spec, NONE, 1.1 fuse-sound.patch, NONE, 1.1 fuse.png, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603072217.k27MHOIw004492@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/fuse-emulator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4449/devel Modified Files: .cvsignore sources Added Files: README.z88sdk fuse-emulator.spec fuse-sound.patch fuse.png Log Message: auto-import fuse-emulator-0.7.0-6 on branch devel from fuse-emulator-0.7.0-6.src.rpm --- NEW FILE README.z88sdk --- HOW TO USE THE Z88SDK WITH FUSE ------------------------------- Using the Z88 SDK with fuse is a very simple operation. Grab a copy of the rpm, install and write your code, as you would, in C. Next, compile and target the ZX Spectrum zcc +zx .c -o .bin -lndos Assuming all is well, your code will be generated. THIS IS NOT AN EXECUTABLE! Load up Fuse. Click on File, move to "Open Binary Data". The usual filer window opens. Select the file you've just compiled and click "Open". The filer closes and you're presented with another window asking for a start address. You can enter any number from about 25000. For this explaination, I would use 32768. Click OK. Your .bin file is now in memory. To run the code, press the following keys T, ctrl + shift (the cursor turns to a white on black E), L 32768 return. On screen you will see the words RANDOMISE USR 32768 before you press return. When you press return, the code will be executed. That's about it! --- NEW FILE fuse-emulator.spec --- Summary: The Free UNIX Spectrum Emulator Name: fuse-emulator Version: 0.7.0 Release: 6%{?dist} License: GPL Group: Applications/Emulators Source: http://kent.dl.sourceforge.net/sourceforge/fuse-emulator/fuse-%{version}.tar.gz Source1: fuse.png Source2: README.z88sdk Patch: fuse-sound.patch URL: http://fuse-emulator.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libdsk-devel BuildRequires: lib765-devel BuildRequires: gtk2-devel BuildRequires: libxml2-devel BuildRequires: libpng-devel BuildRequires: libspectrum-devel BuildRequires: bison BuildRequires: flex # The SRPM created from this spec file deliberately does not include the # ROMS required to run the emulator. For the location of the ROMS, see # the ROMS readme file. %description Fuse is a spectrum emulator which emulates multiple models, including the 16K, 48K, 128K, +2, +2A, +3 and various clones. %prep rm -rf ${RPM_BUILD_ROOT} %setup -q -n fuse-%{version} %patch -p1 -b sound.c %build %configure make %{?_smp_mflags} %install rm -rf ${RPM_BUILD_ROOT} mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1 mkdir -p ${RPM_BUILD_ROOT}%{_bindir} mkdir -p ${RPM_BUILD_ROOT}%{_libdir} mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/fuse mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps install -m0644 man/fuse.1 ${RPM_BUILD_ROOT}%{_mandir}/man1 install -c fuse ${RPM_BUILD_ROOT}%{_bindir}/fuse cp lib/*.z80 ${RPM_BUILD_ROOT}%{_datadir}/fuse/ cp lib/*.bmp ${RPM_BUILD_ROOT}%{_datadir}/fuse/ cp lib/*.scr ${RPM_BUILD_ROOT}%{_datadir}/fuse/ install -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png cp %{SOURCE2} README.z88sdk %clean rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) %{_mandir}/man1/fuse.1.gz %{_bindir}/fuse %{_datadir}/fuse/ %{_datadir}/pixmaps/%{name}.png %doc AUTHORS ChangeLog COPYING README THANKS ROMS README.z88sdk %changelog * Thu Feb 9 2006 Paul F. Johnson - 0.7.0-6 - Removed pre and post as they were empty - Fixed the "fuse-emulator" problem * Wed Oct 26 2005 Paul F. Johnson - 0.7.0-5 - Altered package name to fuse-emulator (macro) - Removed BR: zlib-devel and BR: glibc-devel and both Requires - Included comment regarding the SRPM not containing the ROMS - Added README.z88sdk file to the archive - Made the source of the tarball a valid one! - Removed a comma from after xml2-devel * Mon Oct 17 2005 Paul F. Johnson - 0.7.0-4 - Minor alteration to spec file (Build require=perl gone) - Addition of sound.c patch file * Fri Sep 02 2005 Paul F. Johnson - 0.7.0-3.fc - Removal of ROMS and addition to documentation of where to get ROMS * Mon Aug 29 2005 Paul F. Johnson - 0.7.0-2.fc - Fixes to both the source and spec for FC * Mon Feb 28 2005 Ian Chapman - 0.7.0-2.iss - Rebuild for newer version of lib765 (0.3.3) * Mon Jul 16 2004 Ian Chapman - 0.7.0-1.iss - Updated to version 0.7.0 - Updated for Fedora Core 2 - Added a graphic for the menu icon * Fri Dec 05 2003 Ian Chapman - 0.6.1.1-2 - Minor fixes to changelog - Improved use of macros - Removed most explicit library dependancies - Added menu icon * Sun Nov 30 2003 Ian Chapman - 0.6.1.1-1 - Initial Release fuse-sound.patch: --- NEW FILE fuse-sound.patch --- --- sound.c 2005-10-17 23:20:45.000000000 +0100 +++ fuse-0.7.0/sound.c 2005-08-20 23:46:32.000000000 +0100 @@ -58,8 +58,8 @@ int sound_stereo_ay_abc=0; /* (AY stereo) true for ABC stereo, else ACB */ int sound_stereo_ay_narrow=0; /* (AY stereo) true for narrow AY st. sep. */ -static int sound_stereo_ay=0; /* local copy of settings_current.stereo_ay */ -static int sound_stereo_beeper=0; /* and settings_current.stereo_beeper */ +int sound_stereo_ay=0; /* local copy of settings_current.stereo_ay */ +int sound_stereo_beeper=0; /* and settings_current.stereo_beeper */ /* assume all three tone channels together match the beeper volume (ish). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-emulator/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2006 22:14:52 -0000 1.1 +++ .cvsignore 7 Mar 2006 22:16:52 -0000 1.2 @@ -0,0 +1 @@ +fuse-0.7.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-emulator/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2006 22:14:52 -0000 1.1 +++ sources 7 Mar 2006 22:16:52 -0000 1.2 @@ -0,0 +1 @@ +ebb124e808e6467630efaae01fe03b64 fuse-0.7.0.tar.gz From fedora-extras-commits at redhat.com Tue Mar 7 23:51:51 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Tue, 7 Mar 2006 18:51:51 -0500 Subject: fedora-release fedora-release.spec,1.17,1.18 Message-ID: <200603072351.k27NppkX007224@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7206 Modified Files: fedora-release.spec Log Message: bump version, own /etc/pki/rpm-gpg (#164498) Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- fedora-release.spec 15 Feb 2006 19:04:31 -0000 1.17 +++ fedora-release.spec 7 Mar 2006 23:51:43 -0000 1.18 @@ -1,5 +1,5 @@ -%define release_version 4.92 -%define release_name Pre-FC5 +%define release_version 5 +%define release_name Bordeaux %define builtin_release_version Rawhide %define builtin_release_name Rawhide %define real_release_version %{?release_version}%{!?release_version:%{builtin_release_version}} @@ -99,4 +99,5 @@ /usr/share/firstboot/modules/eula.py* /usr/share/eula/eula.en_US %{_defaultdocdir}/HTML +%dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/* From fedora-extras-commits at redhat.com Tue Mar 7 23:56:51 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:56:51 -0500 Subject: rpms/oneko - New directory Message-ID: <200603072356.k27NurZQ007282@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7274/oneko Log Message: Directory /cvs/extras/rpms/oneko added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 23:56:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:56:57 -0500 Subject: rpms/oneko/devel - New directory Message-ID: <200603072356.k27Nuxj9007297@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7274/oneko/devel Log Message: Directory /cvs/extras/rpms/oneko/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 7 23:57:11 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:57:11 -0500 Subject: rpms/oneko Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603072357.k27NvD8j007331@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7319 Added Files: Makefile import.log Log Message: Setup of module oneko --- NEW FILE Makefile --- # Top level Makefile for module oneko all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 7 23:57:16 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:57:16 -0500 Subject: rpms/oneko/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603072357.k27NvJkr007351@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7319/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module oneko --- NEW 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 Mar 7 23:57:50 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:57:50 -0500 Subject: rpms/oneko import.log,1.1,1.2 Message-ID: <200603072358.k27NwNdW007486@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7400 Modified Files: import.log Log Message: auto-import oneko-1.2-3 on branch devel from oneko-1.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/oneko/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 7 Mar 2006 23:57:11 -0000 1.1 +++ import.log 7 Mar 2006 23:57:50 -0000 1.2 @@ -0,0 +1 @@ +oneko-1_2-3:HEAD:oneko-1.2-3.src.rpm:1141775851 From fedora-extras-commits at redhat.com Tue Mar 7 23:57:56 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 18:57:56 -0500 Subject: rpms/oneko/devel oneko-1.2.sakura.5-nobsd.patch, NONE, 1.1 oneko.desktop, NONE, 1.1 oneko.png, NONE, 1.1 oneko.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603072358.k27NwS3K007490@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7400/devel Modified Files: .cvsignore sources Added Files: oneko-1.2.sakura.5-nobsd.patch oneko.desktop oneko.png oneko.spec Log Message: auto-import oneko-1.2-3 on branch devel from oneko-1.2-3.src.rpm oneko-1.2.sakura.5-nobsd.patch: --- NEW FILE oneko-1.2.sakura.5-nobsd.patch --- --- oneko-1.2.sakura.5.orig/cursors/cursor.include +++ oneko-1.2.sakura.5/cursors/cursor.include @@ -2,8 +2,6 @@ #include "mouse_cursor_mask.xbm" #include "bone_cursor.xbm" #include "bone_cursor_mask.xbm" -#include "bsd_cursor.xbm" -#include "bsd_cursor_mask.xbm" #include "card_cursor.xbm" #include "card_cursor_mask.xbm" #include "petal_cursor.xbm" --- oneko-1.2.sakura.5.orig/oneko.h +++ oneko-1.2.sakura.5/oneko.h @@ -36,7 +36,6 @@ #include "bitmaps/neko/neko.include" #include "bitmaps/tora/tora.include" #include "bitmaps/dog/dog.include" -#include "bitmaps/bsd/bsd.include" #include "bitmaps/sakura/sakura.include" #include "bitmaps/tomoyo/tomoyo.include" @@ -44,7 +43,6 @@ #include "bitmasks/neko/neko.mask.include" #include "bitmasks/dog/dog.mask.include" -#include "bitmasks/bsd/bsd.mask.include" #include "bitmasks/sakura/sakura.mask.include" #include "bitmasks/tomoyo/tomoyo.mask.include" --- oneko-1.2.sakura.5.orig/oneko.c +++ oneko-1.2.sakura.5/oneko.c @@ -33,7 +33,7 @@ int Synchronous = False; /* Types of animals */ -#define BITMAPTYPES 6 +#define BITMAPTYPES 5 typedef struct _AnimalDefaults { char *name; int speed, idle, bitmap_width, bitmap_height; @@ -51,8 +51,6 @@ mouse_cursor_width,mouse_cursor_height, mouse_cursor_x_hot,mouse_cursor_y_hot }, { "dog" , 10, 6, 32, 32, 125000L, 0, 0, bone_cursor_bits,bone_cursor_mask_bits, bone_cursor_width,bone_cursor_height, bone_cursor_x_hot,bone_cursor_y_hot }, - { "bsd_daemon" , 16, 6, 32, 32, 300000L, 22, 20, bsd_cursor_bits,bsd_cursor_mask_bits, - bsd_cursor_width,bsd_cursor_height, bsd_cursor_x_hot,bsd_cursor_y_hot }, { "sakura" , 13, 6, 32, 32, 125000L, 0, 0, card_cursor_bits,card_cursor_mask_bits, card_cursor_width,card_cursor_height, card_cursor_x_hot,card_cursor_y_hot }, { "tomoyo" , 10, 6, 32, 32, 125000L, 32, 32, petal_cursor_bits,petal_cursor_mask_bits, @@ -154,70 +152,70 @@ BitmapGCData BitmapGCDataTable[] = { - { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_bsd_bits, mati2_sakura_bits, mati2_tomoyo_bits, - &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_bsd_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits }, - { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_bsd_bits, jare2_sakura_bits, jare2_tomoyo_bits, - &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_bsd_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits }, - { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_bsd_bits, kaki1_sakura_bits, kaki1_tomoyo_bits, - &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_bsd_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits }, - { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_bsd_bits, kaki2_sakura_bits, kaki2_tomoyo_bits, - &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_bsd_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits }, - { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_bsd_bits, mati3_sakura_bits, mati3_tomoyo_bits, - &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_bsd_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits }, - { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_bsd_bits, sleep1_sakura_bits, sleep1_tomoyo_bits, - &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_bsd_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits }, - { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_bsd_bits, sleep2_sakura_bits, sleep2_tomoyo_bits, - &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_bsd_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits }, - { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, awake_bsd_bits, awake_sakura_bits, awake_tomoyo_bits, - &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_bsd_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits }, - { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, up1_bsd_bits, up1_sakura_bits, up1_tomoyo_bits, - &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_bsd_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits }, - { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, up2_bsd_bits, up2_sakura_bits, up2_tomoyo_bits, - &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_bsd_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits }, - { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, down1_bsd_bits, down1_sakura_bits, down1_tomoyo_bits, - &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_bsd_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits }, - { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, down2_bsd_bits, down2_sakura_bits, down2_tomoyo_bits, - &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_bsd_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits }, - { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, left1_bsd_bits, left1_sakura_bits, left1_tomoyo_bits, - &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_bsd_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits }, - { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, left2_bsd_bits, left2_sakura_bits, left2_tomoyo_bits, - &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_bsd_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits }, - { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, right1_bsd_bits, right1_sakura_bits, right1_tomoyo_bits, - &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_bsd_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits }, - { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, right2_bsd_bits, right2_sakura_bits, right2_tomoyo_bits, - &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_bsd_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits }, - { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_bsd_bits, upleft1_sakura_bits, upleft1_tomoyo_bits, - &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_bsd_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits }, - { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_bsd_bits, upleft2_sakura_bits, upleft2_tomoyo_bits, - &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_bsd_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits }, - { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_bsd_bits, upright1_sakura_bits, upright1_tomoyo_bits, - &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_bsd_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits }, - { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_bsd_bits, upright2_sakura_bits, upright2_tomoyo_bits, - &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_bsd_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits }, - { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_bsd_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits, - &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_bsd_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits }, - { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_bsd_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits, - &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_bsd_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits }, - { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_bsd_bits, dwright1_sakura_bits, dwright1_tomoyo_bits, - &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_bsd_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits }, - { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_bsd_bits, dwright2_sakura_bits, dwright2_tomoyo_bits, - &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_bsd_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits }, - { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_bsd_bits, utogi1_sakura_bits, utogi1_tomoyo_bits, - &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_bsd_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits }, - { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_bsd_bits, utogi2_sakura_bits, utogi2_tomoyo_bits, - &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_bsd_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits }, - { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_bsd_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits, - &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_bsd_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits }, - { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_bsd_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits, - &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_bsd_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits }, - { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_bsd_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits, - &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_bsd_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits }, - { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_bsd_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits, - &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_bsd_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits }, - { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_bsd_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits, - &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_bsd_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits }, - { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_bsd_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits, - &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_bsd_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits }, + { &Mati2GC, &Mati2Xbm, mati2_bits, mati2_tora_bits, mati2_dog_bits, mati2_sakura_bits, mati2_tomoyo_bits, + &Mati2Msk, mati2_mask_bits, mati2_mask_bits, mati2_dog_mask_bits, mati2_sakura_mask_bits, mati2_tomoyo_mask_bits }, + { &Jare2GC, &Jare2Xbm, jare2_bits, jare2_tora_bits, jare2_dog_bits, jare2_sakura_bits, jare2_tomoyo_bits, + &Jare2Msk, jare2_mask_bits, jare2_mask_bits, jare2_dog_mask_bits, jare2_sakura_mask_bits, jare2_tomoyo_mask_bits }, + { &Kaki1GC, &Kaki1Xbm, kaki1_bits, kaki1_tora_bits, kaki1_dog_bits, kaki1_sakura_bits, kaki1_tomoyo_bits, + &Kaki1Msk, kaki1_mask_bits, kaki1_mask_bits, kaki1_dog_mask_bits, kaki1_sakura_mask_bits, kaki1_tomoyo_mask_bits }, + { &Kaki2GC, &Kaki2Xbm, kaki2_bits, kaki2_tora_bits, kaki2_dog_bits, kaki2_sakura_bits, kaki2_tomoyo_bits, + &Kaki2Msk, kaki2_mask_bits, kaki2_mask_bits, kaki2_dog_mask_bits, kaki2_sakura_mask_bits, kaki2_tomoyo_mask_bits }, + { &Mati3GC, &Mati3Xbm, mati3_bits, mati3_tora_bits, mati3_dog_bits, mati3_sakura_bits, mati3_tomoyo_bits, + &Mati3Msk, mati3_mask_bits, mati3_mask_bits, mati3_dog_mask_bits, mati3_sakura_mask_bits, mati3_tomoyo_mask_bits }, + { &Sleep1GC, &Sleep1Xbm, sleep1_bits, sleep1_tora_bits, sleep1_dog_bits, sleep1_sakura_bits, sleep1_tomoyo_bits, + &Sleep1Msk, sleep1_mask_bits, sleep1_mask_bits, sleep1_dog_mask_bits, sleep1_sakura_mask_bits, sleep1_tomoyo_mask_bits }, + { &Sleep2GC, &Sleep2Xbm, sleep2_bits, sleep2_tora_bits, sleep2_dog_bits, sleep2_sakura_bits, sleep2_tomoyo_bits, + &Sleep2Msk, sleep2_mask_bits, sleep2_mask_bits, sleep2_dog_mask_bits, sleep2_sakura_mask_bits, sleep2_tomoyo_mask_bits }, + { &AwakeGC, &AwakeXbm, awake_bits, awake_tora_bits, awake_dog_bits, awake_sakura_bits, awake_tomoyo_bits, + &AwakeMsk, awake_mask_bits, awake_mask_bits, awake_dog_mask_bits, awake_sakura_mask_bits, awake_tomoyo_mask_bits }, + { &Up1GC, &Up1Xbm, up1_bits, up1_tora_bits, up1_dog_bits, up1_sakura_bits, up1_tomoyo_bits, + &Up1Msk, up1_mask_bits, up1_mask_bits, up1_dog_mask_bits, up1_sakura_mask_bits, up1_tomoyo_mask_bits }, + { &Up2GC, &Up2Xbm, up2_bits, up2_tora_bits, up2_dog_bits, up2_sakura_bits, up2_tomoyo_bits, + &Up2Msk, up2_mask_bits, up2_mask_bits, up2_dog_mask_bits, up2_sakura_mask_bits, up2_tomoyo_mask_bits }, + { &Down1GC, &Down1Xbm, down1_bits, down1_tora_bits, down1_dog_bits, down1_sakura_bits, down1_tomoyo_bits, + &Down1Msk, down1_mask_bits, down1_mask_bits, down1_dog_mask_bits, down1_sakura_mask_bits, down1_tomoyo_mask_bits }, + { &Down2GC, &Down2Xbm, down2_bits, down2_tora_bits, down2_dog_bits, down2_sakura_bits, down2_tomoyo_bits, + &Down2Msk, down2_mask_bits, down2_mask_bits, down2_dog_mask_bits, down2_sakura_mask_bits, down2_tomoyo_mask_bits }, + { &Left1GC, &Left1Xbm, left1_bits, left1_tora_bits, left1_dog_bits, left1_sakura_bits, left1_tomoyo_bits, + &Left1Msk, left1_mask_bits, left1_mask_bits, left1_dog_mask_bits, left1_sakura_mask_bits, left1_tomoyo_mask_bits }, + { &Left2GC, &Left2Xbm, left2_bits, left2_tora_bits, left2_dog_bits, left2_sakura_bits, left2_tomoyo_bits, + &Left2Msk, left2_mask_bits, left2_mask_bits, left2_dog_mask_bits, left2_sakura_mask_bits, left2_tomoyo_mask_bits }, + { &Right1GC, &Right1Xbm, right1_bits, right1_tora_bits, right1_dog_bits, right1_sakura_bits, right1_tomoyo_bits, + &Right1Msk, right1_mask_bits, right1_mask_bits,right1_dog_mask_bits, right1_sakura_mask_bits, right1_tomoyo_mask_bits }, + { &Right2GC, &Right2Xbm, right2_bits, right2_tora_bits, right2_dog_bits, right2_sakura_bits, right2_tomoyo_bits, + &Right2Msk, right2_mask_bits, right2_mask_bits, right2_dog_mask_bits, right2_sakura_mask_bits, right2_tomoyo_mask_bits }, + { &UpLeft1GC, &UpLeft1Xbm, upleft1_bits, upleft1_tora_bits, upleft1_dog_bits, upleft1_sakura_bits, upleft1_tomoyo_bits, + &UpLeft1Msk, upleft1_mask_bits, upleft1_mask_bits, upleft1_dog_mask_bits, upleft1_sakura_mask_bits, upleft1_tomoyo_mask_bits }, + { &UpLeft2GC, &UpLeft2Xbm, upleft2_bits, upleft2_tora_bits, upleft2_dog_bits, upleft2_sakura_bits, upleft2_tomoyo_bits, + &UpLeft2Msk, upleft2_mask_bits, upleft2_mask_bits,upleft2_dog_mask_bits, upleft2_sakura_mask_bits, upleft2_tomoyo_mask_bits }, + { &UpRight1GC, &UpRight1Xbm, upright1_bits, upright1_tora_bits, upright1_dog_bits, upright1_sakura_bits, upright1_tomoyo_bits, + &UpRight1Msk, upright1_mask_bits, upright1_mask_bits,upright1_dog_mask_bits, upright1_sakura_mask_bits, upright1_tomoyo_mask_bits }, + { &UpRight2GC, &UpRight2Xbm, upright2_bits, upright2_tora_bits, upright2_dog_bits, upright2_sakura_bits, upright2_tomoyo_bits, + &UpRight2Msk, upright2_mask_bits, upright2_mask_bits,upright2_dog_mask_bits, upright2_sakura_mask_bits, upright2_tomoyo_mask_bits }, + { &DownLeft1GC, &DownLeft1Xbm, dwleft1_bits, dwleft1_tora_bits, dwleft1_dog_bits, dwleft1_sakura_bits, dwleft1_tomoyo_bits, + &DownLeft1Msk, dwleft1_mask_bits, dwleft1_mask_bits, dwleft1_dog_mask_bits, dwleft1_sakura_mask_bits, dwleft1_tomoyo_mask_bits }, + { &DownLeft2GC, &DownLeft2Xbm, dwleft2_bits, dwleft2_tora_bits, dwleft2_dog_bits, dwleft2_sakura_bits, dwleft2_tomoyo_bits, + &DownLeft2Msk, dwleft2_mask_bits, dwleft2_mask_bits, dwleft2_dog_mask_bits, dwleft2_sakura_mask_bits, dwleft2_tomoyo_mask_bits }, + { &DownRight1GC, &DownRight1Xbm, dwright1_bits, dwright1_tora_bits, dwright1_dog_bits, dwright1_sakura_bits, dwright1_tomoyo_bits, + &DownRight1Msk, dwright1_mask_bits, dwright1_mask_bits, dwright1_dog_mask_bits, dwright1_sakura_mask_bits, dwright1_tomoyo_mask_bits }, + { &DownRight2GC, &DownRight2Xbm, dwright2_bits, dwright2_tora_bits, dwright2_dog_bits, dwright2_sakura_bits, dwright2_tomoyo_bits, + &DownRight2Msk, dwright2_mask_bits, dwright2_mask_bits, dwright2_dog_mask_bits, dwright2_sakura_mask_bits, dwright2_tomoyo_mask_bits }, + { &UpTogi1GC, &UpTogi1Xbm, utogi1_bits, utogi1_tora_bits, utogi1_dog_bits, utogi1_sakura_bits, utogi1_tomoyo_bits, + &UpTogi1Msk, utogi1_mask_bits, utogi1_mask_bits, utogi1_dog_mask_bits, utogi1_sakura_mask_bits, utogi1_tomoyo_mask_bits }, + { &UpTogi2GC, &UpTogi2Xbm, utogi2_bits, utogi2_tora_bits, utogi2_dog_bits, utogi2_sakura_bits, utogi2_tomoyo_bits, + &UpTogi2Msk, utogi2_mask_bits, utogi2_mask_bits, utogi2_dog_mask_bits, utogi2_sakura_mask_bits, utogi2_tomoyo_mask_bits }, + { &DownTogi1GC, &DownTogi1Xbm, dtogi1_bits, dtogi1_tora_bits, dtogi1_dog_bits, dtogi1_sakura_bits, dtogi1_tomoyo_bits, + &DownTogi1Msk, dtogi1_mask_bits, dtogi1_mask_bits, dtogi1_dog_mask_bits, dtogi1_sakura_mask_bits, dtogi1_tomoyo_mask_bits }, + { &DownTogi2GC, &DownTogi2Xbm, dtogi2_bits, dtogi2_tora_bits, dtogi2_dog_bits, dtogi2_sakura_bits, dtogi2_tomoyo_bits, + &DownTogi2Msk, dtogi2_mask_bits, dtogi2_mask_bits, dtogi2_dog_mask_bits, dtogi2_sakura_mask_bits, dtogi2_tomoyo_mask_bits }, + { &LeftTogi1GC, &LeftTogi1Xbm, ltogi1_bits, ltogi1_tora_bits, ltogi1_dog_bits, ltogi1_sakura_bits, ltogi1_tomoyo_bits, + &LeftTogi1Msk, ltogi1_mask_bits, ltogi1_mask_bits,ltogi1_dog_mask_bits, ltogi1_sakura_mask_bits, ltogi1_tomoyo_mask_bits }, + { &LeftTogi2GC, &LeftTogi2Xbm, ltogi2_bits, ltogi2_tora_bits, ltogi2_dog_bits, ltogi2_sakura_bits, ltogi2_tomoyo_bits, + &LeftTogi2Msk, ltogi2_mask_bits, ltogi2_mask_bits,ltogi2_dog_mask_bits, ltogi2_sakura_mask_bits, ltogi2_tomoyo_mask_bits }, + { &RightTogi1GC, &RightTogi1Xbm, rtogi1_bits, rtogi1_tora_bits, rtogi1_dog_bits, rtogi1_sakura_bits, rtogi1_tomoyo_bits, + &RightTogi1Msk, rtogi1_mask_bits, rtogi1_mask_bits,rtogi1_dog_mask_bits, rtogi1_sakura_mask_bits, rtogi1_tomoyo_mask_bits }, + { &RightTogi2GC, &RightTogi2Xbm, rtogi2_bits, rtogi2_tora_bits, rtogi2_dog_bits, rtogi2_sakura_bits, rtogi2_tomoyo_bits, + &RightTogi2Msk, rtogi2_mask_bits, rtogi2_mask_bits,rtogi2_dog_mask_bits, rtogi2_sakura_mask_bits, rtogi2_tomoyo_mask_bits }, { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL } }; @@ -1512,8 +1510,6 @@ } else { char *av = argv[ArgCounter] + 1; - if (strcmp(av, "bsd") == 0) - av = "bsd_daemon"; for (loop=0;loop 1.2-3 - remove includedir macro, not needed - rename japanese man page to not have .jp extension * Thu Jan 19 2006 Tom "spot" Callaway 1.2-2 - use _includedir macro - remove _i386_ hardcode - fix blatant typo in patch - rename docs to jp - use -p for install - remove xorg-x11-proto-devel, unnecessary * Wed Jan 18 2006 Tom "spot" Callaway 1.2-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/oneko/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 7 Mar 2006 23:57:16 -0000 1.1 +++ .cvsignore 7 Mar 2006 23:57:56 -0000 1.2 @@ -0,0 +1 @@ +oneko-1.2.sakura.5.noBSD.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/oneko/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 7 Mar 2006 23:57:16 -0000 1.1 +++ sources 7 Mar 2006 23:57:56 -0000 1.2 @@ -0,0 +1 @@ +c183cc8963d32ded3d9dacd4514188ff oneko-1.2.sakura.5.noBSD.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 00:00:38 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 19:00:38 -0500 Subject: owners owners.list,1.720,1.721 Message-ID: <200603080001.k2801AOk008556@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7708 Modified Files: owners.list Log Message: Oneko. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.720 retrieving revision 1.721 diff -u -r1.720 -r1.721 --- owners.list 7 Mar 2006 17:46:38 -0000 1.720 +++ owners.list 8 Mar 2006 00:00:38 -0000 1.721 @@ -749,6 +749,7 @@ 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| Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org| +Fedora Extras|oneko|Cat chases the cursor|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|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| From fedora-extras-commits at redhat.com Wed Mar 8 00:02:15 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 19:02:15 -0500 Subject: rpms/oneko/FC-3 oneko.spec,1.1,1.2 Message-ID: <200603080002.k2802lEm009624@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9577/FC-3 Modified Files: oneko.spec Log Message: Fix pre-modular X issues (FC-3/4). Index: oneko.spec =================================================================== RCS file: /cvs/extras/rpms/oneko/FC-3/oneko.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- oneko.spec 7 Mar 2006 23:57:56 -0000 1.1 +++ oneko.spec 8 Mar 2006 00:02:14 -0000 1.2 @@ -12,7 +12,7 @@ URL: http://www.daidouji.com/oneko/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: oneko-1.2.sakura.5-nobsd.patch -BuildRequires: libX11-devel, imake, libXext-devel +BuildRequires: xorg-x11-devel BuildRequires: desktop-file-utils %description @@ -50,7 +50,7 @@ %files %defattr(-,root,root) %doc README.jp README-NEW README-SUPP.jp sample.resource -%{_bindir}/oneko +%{_exec_prefix}/X11R6/bin/oneko %{_datadir}/applications/fedora-oneko.desktop %{_datadir}/pixmaps/oneko.png %{_mandir}/ja/man1/* From fedora-extras-commits at redhat.com Wed Mar 8 00:02:26 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Tue, 7 Mar 2006 19:02:26 -0500 Subject: rpms/oneko/FC-4 oneko.spec,1.1,1.2 Message-ID: <200603080003.k28035uc009627@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/oneko/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9577/FC-4 Modified Files: oneko.spec Log Message: Fix pre-modular X issues (FC-3/4). Index: oneko.spec =================================================================== RCS file: /cvs/extras/rpms/oneko/FC-4/oneko.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- oneko.spec 7 Mar 2006 23:57:56 -0000 1.1 +++ oneko.spec 8 Mar 2006 00:02:26 -0000 1.2 @@ -12,7 +12,7 @@ URL: http://www.daidouji.com/oneko/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: oneko-1.2.sakura.5-nobsd.patch -BuildRequires: libX11-devel, imake, libXext-devel +BuildRequires: xorg-x11-devel BuildRequires: desktop-file-utils %description @@ -50,7 +50,7 @@ %files %defattr(-,root,root) %doc README.jp README-NEW README-SUPP.jp sample.resource -%{_bindir}/oneko +%{_exec_prefix}/X11R6/bin/oneko %{_datadir}/applications/fedora-oneko.desktop %{_datadir}/pixmaps/oneko.png %{_mandir}/ja/man1/* From fedora-extras-commits at redhat.com Wed Mar 8 00:20:38 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:20:38 -0500 Subject: rpms/quadkonsole - New directory Message-ID: <200603080020.k280KeLF009850@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9842/quadkonsole Log Message: Directory /cvs/extras/rpms/quadkonsole added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 00:20:44 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:20:44 -0500 Subject: rpms/quadkonsole/devel - New directory Message-ID: <200603080020.k280KkU0009865@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9842/quadkonsole/devel Log Message: Directory /cvs/extras/rpms/quadkonsole/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 00:21:13 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:21:13 -0500 Subject: rpms/quadkonsole Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603080021.k280LF2k009899@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887 Added Files: Makefile import.log Log Message: Setup of module quadkonsole --- NEW FILE Makefile --- # Top level Makefile for module quadkonsole all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 00:21:22 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:21:22 -0500 Subject: rpms/quadkonsole/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603080021.k280LOKi009917@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9887/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module quadkonsole --- NEW 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 Mar 8 00:22:23 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:22:23 -0500 Subject: rpms/quadkonsole import.log,1.1,1.2 Message-ID: <200603080022.k280Mub8009989@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9955 Modified Files: import.log Log Message: auto-import quadkonsole-2.0.1-2 on branch devel from quadkonsole-2.0.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/quadkonsole/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 00:21:13 -0000 1.1 +++ import.log 8 Mar 2006 00:22:23 -0000 1.2 @@ -0,0 +1 @@ +quadkonsole-2_0_1-2:HEAD:quadkonsole-2.0.1-2.src.rpm:1141777336 From fedora-extras-commits at redhat.com Wed Mar 8 00:22:29 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:22:29 -0500 Subject: rpms/quadkonsole/devel quadkonsole.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603080023.k280N2os009993@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/quadkonsole/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9955/devel Modified Files: .cvsignore sources Added Files: quadkonsole.spec Log Message: auto-import quadkonsole-2.0.1-2 on branch devel from quadkonsole-2.0.1-2.src.rpm --- NEW FILE quadkonsole.spec --- Name: quadkonsole Version: 2.0.1 Release: 2%{?dist} Summary: Embeds Konsole kparts in a grid layout Group: Applications/System License: GPL URL: http://nomis80.org/quadkonsole/ Source0: http://nomis80.org/quadkonsole/quadkonsole-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 3.2, desktop-file-utils %description QuadKonsole is a program which embeds 4 Konsoles (other numbers can be specified on the command-line). This way you save screen real estate, you don't have to worry about careful placement and the startup time is faster than starting up 4 separate Konsoles. %prep %setup -q %build %configure --disable-rpath make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --delete-original \ --add-category X-Fedora \ $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/quadkonsole.desktop %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS COPYING README TODO %{_bindir}/quadkonsole %{_datadir}/applications/kde/fedora-quadkonsole.desktop %changelog * Tue Mar 7 2006 Simon Perreault - 2.0.1-2 - Reformatted description to make rpmlint happy. * Tue Mar 7 2006 Simon Perreault - 2.0.1-1 - Initial package. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/quadkonsole/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 00:21:22 -0000 1.1 +++ .cvsignore 8 Mar 2006 00:22:29 -0000 1.2 @@ -0,0 +1 @@ +quadkonsole-2.0.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/quadkonsole/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 00:21:22 -0000 1.1 +++ sources 8 Mar 2006 00:22:29 -0000 1.2 @@ -0,0 +1 @@ +3334b7a3ad3e6f9b96f59a00ccedae91 quadkonsole-2.0.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 00:26:00 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 19:26:00 -0500 Subject: owners owners.list,1.721,1.722 Message-ID: <200603080026.k280QXAX010078@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10032 Modified Files: owners.list Log Message: Added quadkonsole component Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.721 retrieving revision 1.722 diff -u -r1.721 -r1.722 --- owners.list 8 Mar 2006 00:00:38 -0000 1.721 +++ owners.list 8 Mar 2006 00:26:00 -0000 1.722 @@ -1181,6 +1181,7 @@ 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|qtparted|Partition Magic clone written in C++ using the Qt toolkit|steve at silug.org|extras-qa at fedoraproject.org| +Fedora Extras|quadkonsole|Embeds Konsole kparts in a grid layout|nomis80 at nomis80.org|extras-qa at fedoraproject.org| Fedora Extras|QuantLib| QuantLib is a free/open-source library for modeling, trading, and risk management in real-life|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|quarry|A multi-purpose board-game GUI|michel.salim at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|qucs|Circuit simulator|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 8 01:39:24 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Tue, 7 Mar 2006 20:39:24 -0500 Subject: rpms/opencv/devel opencv-0.9.7-intrinsics-simple.patch, NONE, 1.1 opencv-0.9.7-intrinsics.patch, NONE, 1.1 opencv-0.9.7-pythondir.patch, NONE, 1.1 opencv.spec, 1.1, 1.2 Message-ID: <200603080139.k281dup1012536@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12507 Modified Files: opencv.spec Added Files: opencv-0.9.7-intrinsics-simple.patch opencv-0.9.7-intrinsics.patch opencv-0.9.7-pythondir.patch Log Message: Merging FC-4 stuff back into devel branch. opencv-0.9.7-intrinsics-simple.patch: --- NEW FILE opencv-0.9.7-intrinsics-simple.patch --- diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h --- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-06 22:59:56.000000000 -0500 @@ -48,7 +48,7 @@ #include #include - #if defined WIN64 && defined EM64T && defined _MSC_VER + #if defined WIN64 && defined EM64T && defined _MSC_VER || defined __SSE2__ #include #endif opencv-0.9.7-intrinsics.patch: --- NEW FILE opencv-0.9.7-intrinsics.patch --- diff -urp opencv-0.9.7.orig/configure.in opencv-0.9.7/configure.in --- opencv-0.9.7.orig/configure.in 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/configure.in 2006-03-07 12:05:24.000000000 -0500 @@ -281,6 +281,11 @@ dnl # #AC_SUBST(CXXOPENMP) +dnl +dnl ****************** SSE2 Intrinsics ************************** +dnl +AC_CHECK_HEADERS([emmintrin.h]) + AC_SUBST(DEBUG) AC_CONFIG_FILES([Makefile diff -urp opencv-0.9.7.orig/cv/src/_cv.h opencv-0.9.7/cv/src/_cv.h --- opencv-0.9.7.orig/cv/src/_cv.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cv/src/_cv.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CV_INTERNAL_H_ #define _CV_INTERNAL_H_ +#ifdef HAVE_CONFIG_H +#include +#endif + #if defined _MSC_VER && _MSC_VER >= 1200 /* disable warnings related to inline functions */ #pragma warning( disable: 4711 4710 4514 ) diff -urp opencv-0.9.7.orig/cvaux/src/_cvaux.h opencv-0.9.7/cvaux/src/_cvaux.h --- opencv-0.9.7.orig/cvaux/src/_cvaux.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cvaux/src/_cvaux.h 2006-03-07 12:05:24.000000000 -0500 @@ -41,6 +41,10 @@ #ifndef __CVAUX_H__ #define __CVAUX_H__ +#ifdef HAVE_CONFIG_H +#include +#endif + #if _MSC_VER >= 1200 #pragma warning( disable: 4710 4711 4514 ) /* function AAA selected for automatic inline expansion */ #endif diff -urp opencv-0.9.7.orig/cxcore/include/cxtypes.h opencv-0.9.7/cxcore/include/cxtypes.h --- opencv-0.9.7.orig/cxcore/include/cxtypes.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cxcore/include/cxtypes.h 2006-03-07 12:05:24.000000000 -0500 @@ -48,7 +48,8 @@ #include #include - #if defined WIN64 && defined EM64T && defined _MSC_VER + #if defined HAVE_EMMINTRIN_H \ + || defined WIN64 && defined EM64T && defined _MSC_VER #include #endif diff -urp opencv-0.9.7.orig/cxcore/src/_cxcore.h opencv-0.9.7/cxcore/src/_cxcore.h --- opencv-0.9.7.orig/cxcore/src/_cxcore.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/cxcore/src/_cxcore.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef _CXCORE_INTERNAL_H_ #define _CXCORE_INTERNAL_H_ +#ifdef HAVE_CONFIG_H +#include +#endif + #if defined _MSC_VER && _MSC_VER >= 1200 /* disable warnings related to inline functions */ #pragma warning( disable: 4711 4710 4514 ) diff -urp opencv-0.9.7.orig/interfaces/swig/python/error.h opencv-0.9.7/interfaces/swig/python/error.h --- opencv-0.9.7.orig/interfaces/swig/python/error.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/python/error.h 2006-03-07 12:06:40.000000000 -0500 @@ -44,6 +44,9 @@ // Mark Asbach // Institute of Communications Engineering, RWTH Aachen University +#ifdef HAVE_CONFIG_H +#include +#endif #include "cxcore.h" diff -urp opencv-0.9.7.orig/interfaces/swig/python/pycvseq.h opencv-0.9.7/interfaces/swig/python/pycvseq.h --- opencv-0.9.7.orig/interfaces/swig/python/pycvseq.h 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/python/pycvseq.h 2006-03-07 12:07:13.000000000 -0500 @@ -39,6 +39,9 @@ // //M*/ +#ifdef HAVE_CONFIG_H +#include +#endif #include "cxcore.h" diff -urp opencv-0.9.7.orig/otherlibs/highgui/_highgui.h opencv-0.9.7/otherlibs/highgui/_highgui.h --- opencv-0.9.7.orig/otherlibs/highgui/_highgui.h 2006-03-06 22:58:42.000000000 -0500 +++ opencv-0.9.7/otherlibs/highgui/_highgui.h 2006-03-07 12:05:24.000000000 -0500 @@ -42,6 +42,12 @@ #ifndef __HIGHGUI_H_ #define __HIGHGUI_H_ +#ifdef HAVE_CONFIG_H +#include +#elif defined WIN32 +void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ); +#endif + #include #include #include @@ -52,12 +58,6 @@ #include "highgui.h" #include "cxmisc.h" -#ifndef WIN32 -#include "cvconfig.h" -#else -void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin ); -#endif - /* Errors */ #define HG_OK 0 /* Don't bet on it! */ #define HG_BADNAME -1 /* Bad window or file name */ diff -urp opencv-0.9.7.orig/interfaces/swig/general/cv.i opencv-0.9.7/interfaces/swig/general/cv.i --- opencv-0.9.7.orig/interfaces/swig/general/cv.i 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/general/cv.i 2006-03-07 12:33:16.000000000 -0500 @@ -49,6 +49,10 @@ %{ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "cv.h" %} diff -urp opencv-0.9.7.orig/interfaces/swig/general/highgui.i opencv-0.9.7/interfaces/swig/general/highgui.i --- opencv-0.9.7.orig/interfaces/swig/general/highgui.i 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/general/highgui.i 2006-03-07 12:33:46.000000000 -0500 @@ -48,6 +48,10 @@ %module(package="opencv") highgui %{ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "highgui.h" %} diff -urp opencv-0.9.7.orig/apps/haartraining/src/_cvcommon.h opencv-0.9.7/apps/haartraining/src/_cvcommon.h --- opencv-0.9.7.orig/apps/haartraining/src/_cvcommon.h 2006-03-07 14:23:05.000000000 -0500 +++ opencv-0.9.7/apps/haartraining/src/_cvcommon.h 2006-03-07 14:34:25.000000000 -0500 @@ -42,6 +42,10 @@ #ifndef __CVCOMMON_H_ #define __CVCOMMON_H_ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include diff -urp opencv-0.9.7.orig/apps/haartraining/src/_cvhaartraining.h opencv-0.9.7/apps/haartraining/src/_cvhaartraining.h --- opencv-0.9.7.orig/apps/haartraining/src/_cvhaartraining.h 2006-03-07 14:23:05.000000000 -0500 +++ opencv-0.9.7/apps/haartraining/src/_cvhaartraining.h 2006-03-07 14:33:31.000000000 -0500 @@ -48,6 +48,10 @@ #ifndef __CVHAARTRAINING_H_ #define __CVHAARTRAINING_H_ +#ifdef HAVE_CONFIG_H +#include +#endif + #include <_cvcommon.h> #include #include diff -urp opencv-0.9.7.orig/apps/haartraining/src/performance.cpp opencv-0.9.7/apps/haartraining/src/performance.cpp --- opencv-0.9.7.orig/apps/haartraining/src/performance.cpp 2006-03-07 14:23:05.000000000 -0500 +++ opencv-0.9.7/apps/haartraining/src/performance.cpp 2006-03-07 14:35:41.000000000 -0500 @@ -44,6 +44,10 @@ * * Measure performance of classifier */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include "cv.h" #include #include opencv-0.9.7-pythondir.patch: --- NEW FILE opencv-0.9.7-pythondir.patch --- diff -urp opencv-0.9.7.orig/interfaces/swig/python/Makefile.am opencv-0.9.7/interfaces/swig/python/Makefile.am --- opencv-0.9.7.orig/interfaces/swig/python/Makefile.am 2006-03-06 22:58:41.000000000 -0500 +++ opencv-0.9.7/interfaces/swig/python/Makefile.am 2006-03-07 09:42:55.000000000 -0500 @@ -18,7 +18,7 @@ AM_CPPFLAGS = \ if BUILD_PYTHON_WRAPPERS - pkgpython_LTLIBRARIES = _cv.la _highgui.la + pkgpyexec_LTLIBRARIES = _cv.la _highgui.la pkgpython_PYTHON = \ __init__.py \ Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/devel/opencv.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- opencv.spec 5 Mar 2006 19:45:57 -0000 1.1 +++ opencv.spec 8 Mar 2006 01:39:23 -0000 1.2 @@ -1,8 +1,11 @@ %define with_ffmpeg 0 +%define pythondir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib()') +%define pyexecdir %(%{__python} -c 'from distutils import sysconfig; print sysconfig.get_python_lib(1)') + Name: opencv Version: 0.9.7 -Release: 3 +Release: 13%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -10,6 +13,8 @@ URL: http://www.intel.com/technology/computing/opencv/index.htm Source0: http://prdownloads.sourceforge.net/opencvlibrary/opencv-%{version}.tar.gz Source1: opencv-samples-Makefile +Patch0: opencv-0.9.7-intrinsics-simple.patch +Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel @@ -40,7 +45,7 @@ Summary: Python bindings for apps which use OpenCV Group: Development/Libraries Requires: opencv = %{version}-%{release} -Requires: %{_libdir}/python%(echo `python -c "import sys; print sys.version[0:3]"`) +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description python This package contains Python bindings for the OpenCV library. @@ -48,6 +53,8 @@ %prep %setup -q +%patch0 -p1 -b .intrinsics +%patch1 -p1 -b .pythondir %{__sed} -i 's/\r//' interfaces/swig/python/*.py \ samples/python/*.py %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \ @@ -55,7 +62,7 @@ %build -%configure --disable-static --enable-python --with-apps +%configure --enable-maintainer-mode --disable-static --enable-python --with-apps make %{?_smp_mflags} @@ -63,7 +70,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \ - $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/opencv/*.la \ + $RPM_BUILD_ROOT%{pyexecdir}/opencv/*.la \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/build_all.sh \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.dsp \ $RPM_BUILD_ROOT%{_datadir}/opencv/samples/c/cvsample.vcproj \ @@ -106,11 +113,46 @@ %files python -%{_libdir}/python*/site-packages/opencv +%dir %{pythondir}/opencv +%{pythondir}/opencv/*.py +%{pythondir}/opencv/*.pyc +%ghost %{pythondir}/opencv/*.pyo +%{pyexecdir}/opencv %doc %{_datadir}/opencv/samples/python %changelog +* Tue Mar 7 2006 Simon Perreault - 0.9.7-13 +- Changed intrinsics patch so that it matches upstream. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-12 +- More intrinsics patch fixing. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-11 +- Don't do "make check" because it doesn't run any tests anyway. +- Back to main intrinsics patch. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-10 +- Using simple intrinsincs patch. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-9 +- Still more fixing of intrinsics patch for Python bindings on x86_64. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-8 +- Again fixed intrinsics patch so that Python modules build on x86_64. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-7 +- Fixed intrinsics patch so that it works. + +* Tue Mar 7 2006 Simon Perreault - 0.9.7-6 +- Fixed Python bindings location on x86_64. + +* Mon Mar 6 2006 Simon Perreault - 0.9.7-5 +- SSE2 support on x86_64. + +* Mon Mar 6 2006 Simon Perreault - 0.9.7-4 +- Rebuild + * Sun Oct 16 2005 Simon Perreault - 0.9.7-3 - Removed useless sample compilation makefiles/project files and replaced them with one that works on Fedora Core. From fedora-extras-commits at redhat.com Wed Mar 8 03:08:57 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 7 Mar 2006 22:08:57 -0500 Subject: rpms/cpanspec/devel .cvsignore, 1.2, 1.3 cpanspec.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603080309.k2839UNN016754@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16733 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.60. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Feb 2006 22:18:10 -0000 1.2 +++ .cvsignore 8 Mar 2006 03:08:57 -0000 1.3 @@ -1 +1 @@ -cpanspec-1.59.tar.gz +cpanspec-1.60.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpanspec.spec 3 Feb 2006 22:18:10 -0000 1.1 +++ cpanspec.spec 8 Mar 2006 03:08:57 -0000 1.2 @@ -1,6 +1,6 @@ Name: cpanspec -Version: 1.59 -Release: 2%{?dist} +Version: 1.60 +Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools @@ -36,9 +36,6 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - # No tests. #%check #./Build test @@ -48,11 +45,14 @@ %files %defattr(-,root,root,-) -%doc COPYING Artistic +%doc Artistic COPYING BUGS TODO %{_bindir}/* %{_mandir}/man1/* %changelog +* Tue Mar 07 2006 Steven Pritchard 1.60-1 +- Update to 1.60. + * Wed Feb 01 2006 Steven Pritchard 1.59-2 - URL/Source0 on SourceForge. - Use a more appropriate Group. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Feb 2006 22:18:10 -0000 1.2 +++ sources 8 Mar 2006 03:08:57 -0000 1.3 @@ -1 +1 @@ -3ed3cc74eeda4b7ad2d04534013c7672 cpanspec-1.59.tar.gz +ebfaf5da00b1a5096f1919451d9be9e6 cpanspec-1.60.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 03:11:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 7 Mar 2006 22:11:45 -0500 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.2, 1.3 cpanspec.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603080312.k283CHaR016862@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16821 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.60. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Feb 2006 22:18:10 -0000 1.2 +++ .cvsignore 8 Mar 2006 03:11:44 -0000 1.3 @@ -1 +1 @@ -cpanspec-1.59.tar.gz +cpanspec-1.60.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cpanspec.spec 3 Feb 2006 22:18:10 -0000 1.1 +++ cpanspec.spec 8 Mar 2006 03:11:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: cpanspec -Version: 1.59 -Release: 2%{?dist} +Version: 1.60 +Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic Group: Development/Tools @@ -36,9 +36,6 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - # No tests. #%check #./Build test @@ -48,11 +45,14 @@ %files %defattr(-,root,root,-) -%doc COPYING Artistic +%doc Artistic COPYING BUGS TODO %{_bindir}/* %{_mandir}/man1/* %changelog +* Tue Mar 07 2006 Steven Pritchard 1.60-1 +- Update to 1.60. + * Wed Feb 01 2006 Steven Pritchard 1.59-2 - URL/Source0 on SourceForge. - Use a more appropriate Group. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Feb 2006 22:18:10 -0000 1.2 +++ sources 8 Mar 2006 03:11:44 -0000 1.3 @@ -1 +1 @@ -3ed3cc74eeda4b7ad2d04534013c7672 cpanspec-1.59.tar.gz +ebfaf5da00b1a5096f1919451d9be9e6 cpanspec-1.60.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 04:48:47 2006 From: fedora-extras-commits at redhat.com (Leon Ho (llch)) Date: Tue, 7 Mar 2006 23:48:47 -0500 Subject: rpms/xcin/devel xcin.spec,1.5,1.6 Message-ID: <200603080449.k284nKSm019024@cvs-int.fedora.redhat.com> Author: llch Update of /cvs/extras/rpms/xcin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19007 Modified Files: xcin.spec Log Message: bump build for FE5 Index: xcin.spec =================================================================== RCS file: /cvs/extras/rpms/xcin/devel/xcin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xcin.spec 22 May 2005 23:02:22 -0000 1.5 +++ xcin.spec 8 Mar 2006 04:48:47 -0000 1.6 @@ -1,7 +1,7 @@ Summary: An X Input Method Server for Chinese. Name: xcin Version: 2.5.3.pre3 -Release: 27 +Release: 28 License: GPL Group: User Interface/X Source0: ftp://xcin.linux.org.tw/pub/xcin/xcin/%{name}-%{version}.tar.gz @@ -110,6 +110,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Mar 08 2006 Leon Ho - 2.5.3.pre3-28 +- rebuilt for Fedora Extras 5 + * Sun May 22 2005 Jeremy Katz - 2.5.3.pre3-27 - rebuild on all arches From fedora-extras-commits at redhat.com Wed Mar 8 06:10:32 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Wed, 8 Mar 2006 01:10:32 -0500 Subject: rpms/namazu/devel filter-requires-namazu.sh, 1.1, 1.2 namazu.spec, 1.4, 1.5 Message-ID: <200603080611.k286B4fP023208@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/namazu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23189 Modified Files: filter-requires-namazu.sh namazu.spec Log Message: * Wed Mar 8 2006 Akira TAGOH - 2.0.15-3 - filter-requires-namazu.sh: updated to fix much more self-dependencies. (#184149) Index: filter-requires-namazu.sh =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/filter-requires-namazu.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- filter-requires-namazu.sh 30 May 2005 02:23:25 -0000 1.1 +++ filter-requires-namazu.sh 8 Mar 2006 06:10:31 -0000 1.2 @@ -1,3 +1,3 @@ #!/bin/sh -/usr/lib/rpm/find-requires $* | grep -v 'perl(nmzidx.pl)' +/usr/lib/rpm/find-requires $* | egrep -v 'perl\((nmzidx.pl|conf.pl|document.pl|time.pl|util.pl|var.pl)\)' Index: namazu.spec =================================================================== RCS file: /cvs/extras/rpms/namazu/devel/namazu.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- namazu.spec 2 Mar 2006 07:30:38 -0000 1.4 +++ namazu.spec 8 Mar 2006 06:10:31 -0000 1.5 @@ -7,7 +7,7 @@ Summary: Namazu is a full-text search engine Name: namazu Version: 2.0.15 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Text URL: http://www.namazu.org/ @@ -139,6 +139,9 @@ %changelog +* Wed Mar 8 2006 Akira TAGOH - 2.0.15-3 +- filter-requires-namazu.sh: updated to fix much more self-dependencies. (#184149) + * Thu Mar 2 2006 Akira TAGOH - 2.0.15-2 - New upstream release. - namazu-2.0.13-de.patch: removed. From fedora-extras-commits at redhat.com Wed Mar 8 10:26:03 2006 From: fedora-extras-commits at redhat.com (Sergio Pascual (sergiopr)) Date: Wed, 8 Mar 2006 05:26:03 -0500 Subject: rpms/CCfits/devel CCfits.spec,1.1,1.2 Message-ID: <200603081026.k28AQahM032080@cvs-int.fedora.redhat.com> Author: sergiopr Update of /cvs/extras/rpms/CCfits/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32062 Modified Files: CCfits.spec Log Message: Removed explicit Buildrequires: gcc-c++ Index: CCfits.spec =================================================================== RCS file: /cvs/extras/rpms/CCfits/devel/CCfits.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- CCfits.spec 7 Mar 2006 17:40:23 -0000 1.1 +++ CCfits.spec 8 Mar 2006 10:26:03 -0000 1.2 @@ -1,6 +1,6 @@ Name: CCfits Version: 1.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A C++ interface for cfitsio Group: Development/Libraries @@ -12,7 +12,6 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cfitsio-devel -BuildRequires: gcc-c++ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -78,6 +77,8 @@ %doc html %changelog +* Wed Mar 08 2006 Sergio Pascual 1.4-4 +- Removed explicit Buildrequires gcc-c++ * Tue Mar 07 2006 Sergio Pascual 1.4-3 - Rebuilt with new upstream source. * Mon Mar 06 2006 Sergio Pascual 1.4-2 From fedora-extras-commits at redhat.com Wed Mar 8 10:49:02 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Wed, 8 Mar 2006 05:49:02 -0500 Subject: rpms/gstreamer-python/FC-4 .cvsignore, 1.4, 1.5 gstreamer-python.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200603081049.k28AnfCM032227@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/gstreamer-python/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32203 Modified Files: .cvsignore gstreamer-python.spec sources Log Message: update to 0.8.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 14 Jan 2006 13:59:42 -0000 1.4 +++ .cvsignore 8 Mar 2006 10:49:01 -0000 1.5 @@ -1 +1 @@ -gst-python-0.8.3.tar.bz2 +gst-python-0.8.4.tar.bz2 Index: gstreamer-python.spec =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/gstreamer-python.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gstreamer-python.spec 14 Jan 2006 13:59:42 -0000 1.9 +++ gstreamer-python.spec 8 Mar 2006 10:49:01 -0000 1.10 @@ -3,9 +3,9 @@ %define gstreamer gstreamer Name: %{gstreamer}-python -Version: 0.8.3 -Release: 1 -Summary: Python bindings for GStreamer. +Version: 0.8.4 +Release: 1%{?dist} +Summary: Python bindings for GStreamer Group: Development/Languages License: LGPL @@ -71,6 +71,10 @@ %{_libdir}/pkgconfig/gst-python-0.8.pc %changelog +* Wed Mar 08 2006 Thomas Vander Stichele +- 0.8.4-1 +- update to 0.8.4 version + * Sat Jan 14 2006 Thomas Vander Stichele - 0.8.3-1 - fix requires and buildrequires which were using an underscore - update to 0.8.3 version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gstreamer-python/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 14 Jan 2006 13:59:42 -0000 1.4 +++ sources 8 Mar 2006 10:49:01 -0000 1.5 @@ -1 +1 @@ -f33f6b95d3911e7ad355199abea8d0ff gst-python-0.8.3.tar.bz2 +bbd06996c510543b169210f0219215f7 gst-python-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 8 12:13:33 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Wed, 8 Mar 2006 07:13:33 -0500 Subject: rpms/gstreamer08-python/devel .cvsignore, 1.2, 1.3 gstreamer08-python.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603081214.k28CE55U003846@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/gstreamer08-python/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3825 Modified Files: .cvsignore gstreamer08-python.spec sources Log Message: new release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-python/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Jan 2006 17:24:48 -0000 1.2 +++ .cvsignore 8 Mar 2006 12:13:20 -0000 1.3 @@ -1 +1 @@ -gst-python-0.8.3.tar.bz2 +gst-python-0.8.4.tar.bz2 Index: gstreamer08-python.spec =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-python/devel/gstreamer08-python.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gstreamer08-python.spec 22 Jan 2006 17:24:48 -0000 1.1 +++ gstreamer08-python.spec 8 Mar 2006 12:13:20 -0000 1.2 @@ -5,7 +5,7 @@ %define pygtk_minver 2.4.0 Name: %{gstreamer}-python -Version: 0.8.3 +Version: 0.8.4 Release: 1%{?dist} Summary: Python bindings for GStreamer @@ -71,6 +71,10 @@ %{_libdir}/pkgconfig/gst-python-0.8.pc %changelog +* Wed Mar 08 2006 Thomas Vander Stichele +- 0.8.4-1 +- new upstream release + * Sun Jan 22 2006 Thomas Vander Stichele - Renamed package to gstreamer08-python for rawhide before FC5 - Removed Requires: of -devel packages Index: sources =================================================================== RCS file: /cvs/extras/rpms/gstreamer08-python/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Jan 2006 17:24:48 -0000 1.2 +++ sources 8 Mar 2006 12:13:20 -0000 1.3 @@ -1 +1 @@ -f33f6b95d3911e7ad355199abea8d0ff gst-python-0.8.3.tar.bz2 +bbd06996c510543b169210f0219215f7 gst-python-0.8.4.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 8 12:42:04 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Wed, 8 Mar 2006 07:42:04 -0500 Subject: rpms/opencv/devel opencv.spec,1.2,1.3 Message-ID: <200603081242.k28CgbJO004449@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4432 Modified Files: opencv.spec Log Message: * Wed Mar 8 2006 Simon Perreault - 0.9.7-14 - Added build dependency on Autotools. Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/devel/opencv.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- opencv.spec 8 Mar 2006 01:39:23 -0000 1.2 +++ opencv.spec 8 Mar 2006 12:42:04 -0000 1.3 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -17,6 +17,7 @@ Patch1: opencv-0.9.7-pythondir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildRequires: autoconf, automake BuildRequires: gtk2-devel, libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: swig >= 1.3.24, zlib-devel, pkgconfig BuildRequires: python-devel @@ -122,6 +123,9 @@ %changelog +* Wed Mar 8 2006 Simon Perreault - 0.9.7-14 +- Added build dependency on Autotools. + * Tue Mar 7 2006 Simon Perreault - 0.9.7-13 - Changed intrinsics patch so that it matches upstream. From fedora-extras-commits at redhat.com Wed Mar 8 13:02:46 2006 From: fedora-extras-commits at redhat.com (Neil Horman (nhorman)) Date: Wed, 8 Mar 2006 08:02:46 -0500 Subject: rpms/iozone/devel iozone.spec,1.2,1.3 Message-ID: <200603081303.k28D3Jjo006438@cvs-int.fedora.redhat.com> Author: nhorman Update of /cvs/extras/rpms/iozone/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6420 Modified Files: iozone.spec Log Message: bumping release number Index: iozone.spec =================================================================== RCS file: /cvs/extras/rpms/iozone/devel/iozone.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- iozone.spec 31 May 2005 18:54:41 -0000 1.2 +++ iozone.spec 8 Mar 2006 13:02:46 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Filesystem benchmarking utility Name: iozone Version: 3 -Release: 1%{?dist} +Release: 2%{?dist} License: Freeware Group: Applications/Engineering URL: http://www.iozone.org From fedora-extras-commits at redhat.com Wed Mar 8 13:15:10 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Wed, 8 Mar 2006 08:15:10 -0500 Subject: rpms/opencv/devel opencv.spec,1.3,1.4 Message-ID: <200603081315.k28DFgnR006543@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6526 Modified Files: opencv.spec Log Message: * Wed Mar 8 2006 Simon Perreault - 0.9.7-15 - Force a re-run of Autotools by calling autoreconf. Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/devel/opencv.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- opencv.spec 8 Mar 2006 12:42:04 -0000 1.3 +++ opencv.spec 8 Mar 2006 13:15:09 -0000 1.4 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -60,10 +60,11 @@ samples/python/*.py %{__sed} -i 's/^#!.*//' interfaces/swig/python/adaptors.py \ interfaces/swig/python/__init__.py +autoreconf -vif %build -%configure --enable-maintainer-mode --disable-static --enable-python --with-apps +%configure --disable-static --enable-python --with-apps make %{?_smp_mflags} @@ -123,6 +124,9 @@ %changelog +* Wed Mar 8 2006 Simon Perreault - 0.9.7-15 +- Force a re-run of Autotools by calling autoreconf. + * Wed Mar 8 2006 Simon Perreault - 0.9.7-14 - Added build dependency on Autotools. From fedora-extras-commits at redhat.com Wed Mar 8 14:45:52 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 8 Mar 2006 09:45:52 -0500 Subject: fedora-security/audit fc4,1.167,1.168 fc5,1.74,1.75 Message-ID: <200603081445.k28EjqAR008857@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8837 Modified Files: fc4 fc5 Log Message: Note new thunderbird issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.167 retrieving revision 1.168 diff -u -r1.167 -r1.168 --- fc4 7 Mar 2006 10:15:00 -0000 1.167 +++ fc4 8 Mar 2006 14:45:43 -0000 1.168 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- fc5 7 Mar 2006 10:15:00 -0000 1.74 +++ fc5 8 Mar 2006 14:45:43 -0000 1.75 @@ -17,6 +17,7 @@ ** are items that need attention +CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) CVE-2006-0884 ** thunderbird From fedora-extras-commits at redhat.com Wed Mar 8 15:17:57 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 8 Mar 2006 10:17:57 -0500 Subject: rpms/ufsparse/devel ufsparse.spec,1.12,1.13 Message-ID: <200603081518.k28FITqs011049@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/ufsparse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11030 Modified Files: ufsparse.spec Log Message: Disable building CSparse--see comments in %build section. Index: ufsparse.spec =================================================================== RCS file: /cvs/extras/rpms/ufsparse/devel/ufsparse.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ufsparse.spec 7 Mar 2006 18:54:03 -0000 1.12 +++ ufsparse.spec 8 Mar 2006 15:17:56 -0000 1.13 @@ -102,9 +102,13 @@ %define cholmod_version_major 1 ### CHOLMOD can also be compiled to use the METIS library, but it is not ### used here because its licensing terms exclude it from Fedora Extras. -### To compile with METIS, change the definition below to -### CHOLMOD_FLAGS="$RPM_OPT_FLAGS -I%{_includedir}/metis -fPIC" +### To compile with METIS, define enable_metis as 1 below. +%define enable_metis 0 +%if "%{?enable_metis}" == "1" +CHOLMOD_FLAGS="$RPM_OPT_FLAGS -I%{_includedir}/metis -fPIC" +%else CHOLMOD_FLAGS="$RPM_OPT_FLAGS -DNPARTITION -fPIC" +%endif pushd CHOLMOD pushd Lib make -f Makefile CFLAGS="$CHOLMOD_FLAGS" @@ -142,10 +146,12 @@ ln -sf libcolamd.so.%{colamd_version} libcolamd.so popd -## Don't install CSparse as the header file name conflicts with -## CXSparse. CXSparse is a superset of CSparse, with the user needing -## to link against -lcxsparse rather than -lcsparse. This is an -## annoyance and not real issue. +### CXSparse is a superset of CSparse, and the two share common header +### names, so it does not make sense to build both. CXSparse is built +### by default, but CSparse can be built instead by defining +### enable_csparse as 1 below. +%define enable_csparse 0 +%if "%{?enable_csparse}" == "1" %define csparse_version 1.2 %define csparse_version_major 1 pushd CSparse @@ -153,16 +159,17 @@ make -f Makefile CFLAGS="$RPM_OPT_FLAGS -fPIC" libcsparse.a gcc -shared -Wl,-soname,libcsparse.so.%{csparse_version_major} -o libcsparse.so.%{csparse_version} `ls *.o` cp *.a *.so* ../../Lib -# cp cs.h ../../Include + cp cs.h ../../Include popd mkdir ../Doc/CSparse/ - cp README.txt License.txt lesser.txt ../Doc/CSparse + cp README.txt License.txt lesser.txt ../Doc/CSparse popd pushd Lib ln -sf libcsparse.so.%{csparse_version} libcsparse.so.%{csparse_version_major} ln -sf libcsparse.so.%{csparse_version} libcsparse.so popd +%else %define cxsparse_version 1.2 %define cxsparse_version_major 1 pushd CXSparse @@ -179,6 +186,7 @@ ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so.%{cxsparse_version_major} ln -sf libcxsparse.so.%{cxsparse_version} libcxsparse.so popd +%endif %define klu_version 0.7 %define klu_version_major 0 @@ -274,7 +282,8 @@ %changelog * Tue Mar 7 2006 Quentin Spencer 1.2-1 - New release. -- Build newly added libraries CSparse and CXSparse. +- Build newly added library CXSparse (but not CSparse--see comments + in build section). * Wed Feb 15 2006 Quentin Spencer 0.93-2 - Rebuild for Fedora Extras 5. From fedora-extras-commits at redhat.com Wed Mar 8 15:24:40 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 8 Mar 2006 10:24:40 -0500 Subject: fedora-security/audit fc4,1.168,1.169 fc5,1.75,1.76 Message-ID: <200603081524.k28FOeGU011133@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11113 Modified Files: fc4 fc5 Log Message: Note two new PHP cve ids. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.168 retrieving revision 1.169 diff -u -r1.168 -r1.169 --- fc4 8 Mar 2006 14:45:43 -0000 1.168 +++ fc4 8 Mar 2006 15:24:33 -0000 1.169 @@ -4,6 +4,8 @@ ** are items that need attention CVE-2006-1045 VULNERABLE (thunderbird) +CVE-2006-1015 ignore (php) safe mode isn't safe +CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.75 retrieving revision 1.76 diff -u -r1.75 -r1.76 --- fc5 8 Mar 2006 14:45:43 -0000 1.75 +++ fc5 8 Mar 2006 15:24:33 -0000 1.76 @@ -18,6 +18,8 @@ ** are items that need attention CVE-2006-1045 VULNERABLE (thunderbird) +CVE-2006-1015 ignore (php) safe mode isn't safe +CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) CVE-2006-0884 ** thunderbird From fedora-extras-commits at redhat.com Wed Mar 8 16:19:30 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:19:30 -0500 Subject: rpms/ikvm - New directory Message-ID: <200603081619.k28GJXF0013340@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13332/ikvm Log Message: Directory /cvs/extras/rpms/ikvm added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 16:19:36 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:19:36 -0500 Subject: rpms/ikvm/devel - New directory Message-ID: <200603081619.k28GJdmN013355@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13332/ikvm/devel Log Message: Directory /cvs/extras/rpms/ikvm/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 16:20:16 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:20:16 -0500 Subject: rpms/ikvm Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603081620.k28GKIZW013389@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13377 Added Files: Makefile import.log Log Message: Setup of module ikvm --- NEW FILE Makefile --- # Top level Makefile for module ikvm all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 16:20:22 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:20:22 -0500 Subject: rpms/ikvm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603081620.k28GKOiJ013409@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13377/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ikvm --- NEW 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 Mar 8 16:22:16 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 11:22:16 -0500 Subject: rpms/kdesvn/devel .cvsignore, 1.6, 1.7 kdesvn.spec, 1.12, 1.13 sources, 1.6, 1.7 Message-ID: <200603081622.k28GMnLs013463@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kdesvn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13438 Modified Files: .cvsignore kdesvn.spec sources Log Message: Update to 0.7.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Feb 2006 16:34:10 -0000 1.6 +++ .cvsignore 8 Mar 2006 16:22:16 -0000 1.7 @@ -1 +1 @@ -kdesvn-0.7.3.tar.gz +kdesvn-0.7.4.tar.gz Index: kdesvn.spec =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/kdesvn.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- kdesvn.spec 13 Feb 2006 18:56:09 -0000 1.12 +++ kdesvn.spec 8 Mar 2006 16:22:16 -0000 1.13 @@ -1,6 +1,6 @@ Name: kdesvn -Version: 0.7.3 -Release: 2%{?dist} +Version: 0.7.4 +Release: 1%{?dist} Summary: A subversion client for KDE with KIO integration Group: Development/Tools @@ -97,6 +97,9 @@ %changelog +* Wed Mar 8 2006 - Orion Poplawski - 0.7.4-1 +- Update to 0.7.4 + * Mon Feb 13 2006 - Orion Poplawski - 0.7.3-2 - Rebuild for gcc/glibc changes Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesvn/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 1 Feb 2006 16:34:10 -0000 1.6 +++ sources 8 Mar 2006 16:22:16 -0000 1.7 @@ -1 +1 @@ -db4e90a3776f9cd524e6cb432b566c73 kdesvn-0.7.3.tar.gz +d8d3860c55200b95e59fffeb2546531f kdesvn-0.7.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 16:23:11 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:23:11 -0500 Subject: rpms/ikvm import.log,1.1,1.2 Message-ID: <200603081623.k28GNidI013552@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13511 Modified Files: import.log Log Message: auto-import ikvm-0.22-4 on branch devel from ikvm-0.22-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ikvm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 16:20:16 -0000 1.1 +++ import.log 8 Mar 2006 16:23:11 -0000 1.2 @@ -0,0 +1 @@ +ikvm-0_22-4:HEAD:ikvm-0.22-4.src.rpm:1141834969 From fedora-extras-commits at redhat.com Wed Mar 8 16:23:17 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Wed, 8 Mar 2006 11:23:17 -0500 Subject: rpms/ikvm/devel ikvm-scripts.patch, NONE, 1.1 ikvm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603081623.k28GNo5e013557@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/ikvm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13511/devel Modified Files: .cvsignore sources Added Files: ikvm-scripts.patch ikvm.spec Log Message: auto-import ikvm-0.22-4 on branch devel from ikvm-0.22-4.src.rpm ikvm-scripts.patch: --- NEW FILE ikvm-scripts.patch --- diff -ru ikvm-0.22.orig/scripts/ikvmc.in ikvm-0.22/scripts/ikvmc.in --- ikvm-0.22.orig/scripts/ikvmc.in 2005-12-15 22:29:34.000000000 -0500 +++ ikvm-0.22/scripts/ikvmc.in 2006-03-06 16:54:14.000000000 -0500 @@ -1,2 +1,2 @@ #!/bin/sh -exec @RUNTIME@ @prefix@/lib/ikvm/ikvmc.exe "$@" +exec @RUNTIME@ @libdir@/ikvm/ikvmc.exe "$@" diff -ru ikvm-0.22.orig/scripts/ikvm.in ikvm-0.22/scripts/ikvm.in --- ikvm-0.22.orig/scripts/ikvm.in 2005-12-15 22:29:34.000000000 -0500 +++ ikvm-0.22/scripts/ikvm.in 2006-03-06 16:54:22.000000000 -0500 @@ -1,2 +1,2 @@ #!/bin/sh -exec @RUNTIME@ @prefix@/lib/ikvm/ikvm.exe "$@" +exec @RUNTIME@ @libdir@/ikvm/ikvm.exe "$@" diff -ru ikvm-0.22.orig/scripts/ikvmstub.in ikvm-0.22/scripts/ikvmstub.in --- ikvm-0.22.orig/scripts/ikvmstub.in 2005-12-15 22:29:34.000000000 -0500 +++ ikvm-0.22/scripts/ikvmstub.in 2006-03-06 16:54:32.000000000 -0500 @@ -1,2 +1,2 @@ #!/bin/sh -exec @RUNTIME@ @prefix@/lib/ikvm/ikvmstub.exe "$@" +exec @RUNTIME@ @libdir@/ikvm/ikvmstub.exe "$@" --- NEW FILE ikvm.spec --- %define ikvmdir %{buildroot}%{_libdir}/ikvm Summary: An implementation of Java for Mono Name: ikvm Version: 0.22 Release: 4%{?dist} License: BSD Group: Development/Languages Source0: http://go-mono.com/sources/ikvm/ikvm-%{version}.tar.gz Patch0: ikvm-scripts.patch URL: http://www.ikvm.net/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-core, mono-devel, dos2unix %description This package provides IKVM.NET, an open source Java compatibility layer for Mono, which includes a Virtual Machine, a bytecode compiler, and various class libraries for Java, as well as tools for Java and Mono interoperability. %package devel Summary: IKVM pkgconfig file Group: Development/Languages Requires: %{name} = %{version}-%{release} %description devel This package contains the pkgconfig configuration file for IKVM. %prep rm -rf %{RPM_BUILD_ROOT} %setup -q %patch0 -p1 -b .patch0 %build %configure make dos2unix LICENSE %install %{__rm} -rf %{buildroot} %{__mkdir} -p %{buildroot}%{_libdir}/pkgconfig %{__mkdir} -p %{buildroot}%{_bindir} %{__mkdir} -p %{ikvmdir} %{__install} -c bin/ikvm.exe %{ikvmdir}/ikvm.exe %{__install} -c bin/ikvmc.exe %{ikvmdir}/ikvmc.exe %{__install} -c bin/ikvmstub.exe %{ikvmdir}/ikvmstub.ex %{__install} -c lib/IKVM.AWT.WinForms.dll %{ikvmdir}/IKVM.AWT.WinForms.dll %{__install} -c lib/IKVM.GNU.Classpath.dll %{ikvmdir}/IKVM.GNU.Classpath.dll %{__install} -c lib/IKVM.Runtime.dll %{ikvmdir}/IKVM.Runtime.dll %{__install} -c scripts/ikvmc %{buildroot}%{_bindir}/ikvmc %{__install} -c scripts/ikvm %{buildroot}%{_bindir}/ikvm %{__install} -c scripts/ikvmstub %{buildroot}%{_bindir}/ikvmstub %{__install} -c -m 644 ikvm.pc %{buildroot}%{_libdir}/pkgconfig/ikvm.pc %files %doc LICENSE COPYING %{_bindir}/* %{_libdir}/ikvm/ %files devel %{_libdir}/pkgconfig/ikvm.pc %clean %{__rm} -rf %{buildroot} %changelog * Mon Mar 6 2006 Michel Salim 0.22-4 - Fixed summary - Changed URL field - Make IKVM own libdir/ikvm/ - Convert LICENSE to Unix text format - Added COPYING to list of files - Fixed launch scripts so they are correct on x86_64 * Thu Jan 26 2006 Paul F. Johnson 0.22-3 - Fix to include IKVM.GNU.Classpath * Wed Jan 25 2006 Paul F. Johnson 0.22-2 - D'oh! Wrong package description! * Mon Jan 23 2006 Paul F. Johnson 0.22-1 - Initial import Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ikvm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 16:20:22 -0000 1.1 +++ .cvsignore 8 Mar 2006 16:23:17 -0000 1.2 @@ -0,0 +1 @@ +ikvm-0.22.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ikvm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 16:20:22 -0000 1.1 +++ sources 8 Mar 2006 16:23:17 -0000 1.2 @@ -0,0 +1 @@ +84124d4c71f0e992d865626d1d13cf1c ikvm-0.22.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 16:44:19 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 11:44:19 -0500 Subject: rpms/kdesvn/FC-4 .cvsignore, 1.5, 1.6 kdesvn.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603081644.k28Gipb9014155@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/kdesvn/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14132 Modified Files: .cvsignore kdesvn.spec sources Log Message: Update to 0.7.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 1 Feb 2006 17:06:19 -0000 1.5 +++ .cvsignore 8 Mar 2006 16:44:19 -0000 1.6 @@ -1 +1 @@ -kdesvn-0.7.3.tar.gz +kdesvn-0.7.4.tar.gz Index: kdesvn.spec =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-4/kdesvn.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kdesvn.spec 1 Feb 2006 17:06:19 -0000 1.7 +++ kdesvn.spec 8 Mar 2006 16:44:19 -0000 1.8 @@ -1,5 +1,5 @@ Name: kdesvn -Version: 0.7.3 +Version: 0.7.4 Release: 1%{?dist} Summary: A subversion client for KDE with KIO integration @@ -95,6 +95,9 @@ %changelog +* Wed Mar 8 2006 - Orion Poplawski - 0.7.4-1 +- New upstream version 0.7.4 + * Wed Feb 1 2006 - Orion Poplawski - 0.7.3-1 - New upstream version 0.7.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdesvn/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 1 Feb 2006 17:06:19 -0000 1.5 +++ sources 8 Mar 2006 16:44:19 -0000 1.6 @@ -1 +1 @@ -db4e90a3776f9cd524e6cb432b566c73 kdesvn-0.7.3.tar.gz +d8d3860c55200b95e59fffeb2546531f kdesvn-0.7.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 16:58:02 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 11:58:02 -0500 Subject: rpms/scalapack/FC-3 scalapack-1.7-fedora3.patch, 1.2, 1.3 scalapack.spec, 1.9, 1.10 Message-ID: <200603081658.k28GwZmF014266@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14206/FC-3 Modified Files: scalapack-1.7-fedora3.patch scalapack.spec Log Message: Fix NOOPT to be -fPIC. scalapack-1.7-fedora3.patch: Index: scalapack-1.7-fedora3.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-fedora3.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-fedora3.patch 1 Mar 2006 00:22:49 -0000 1.2 +++ scalapack-1.7-fedora3.patch 8 Mar 2006 16:58:02 -0000 1.3 @@ -1,5 +1,5 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 +--- scalapack-1.7/SCALAPACK/SLmake.inc.fedora3 2006-03-08 10:51:28.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:55:27.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -31,14 +31,16 @@ TESTINGdir = $(home)/TESTING # -@@ -71,8 +71,8 @@ +@@ -70,9 +70,9 @@ + F77 = g77 #F77 = /usr/local/pgi/linux86/bin/pgf77 CC = gcc - NOOPT = +-NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC -+CCFLAGS = $(RPM_OPT_FLAGS) -fPIC ++NOOPT = -fPIC ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) ++CCFLAGS = $(RPM_OPT_FLAGS) $(NOOPT) SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) @@ -60,8 +62,8 @@ +PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) +RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) ---- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 +--- scalapack-1.7/SCALAPACK/Makefile.fedora3 2006-03-08 10:55:36.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:56:39.000000000 -0600 @@ -49,7 +49,7 @@ all: lib #all: lib exe Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scalapack.spec 1 Mar 2006 00:22:49 -0000 1.9 +++ scalapack.spec 8 Mar 2006 16:58:02 -0000 1.10 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -49,7 +49,7 @@ %prep %setup -q -c -n %{name}-%{version} -%patch0 -p1 +#%patch0 -p1 %ifarch x86_64 ppc64 sparc64 ia64 %patch1 -p1 %endif @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 +- set -fPIC as NOOPT + * Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 - fix 64 bit builds - enable shared libraries From fedora-extras-commits at redhat.com Wed Mar 8 16:58:08 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 11:58:08 -0500 Subject: rpms/scalapack/FC-4 scalapack-1.7-fedora.patch, 1.2, 1.3 scalapack.spec, 1.11, 1.12 Message-ID: <200603081658.k28GweEO014270@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14206/FC-4 Modified Files: scalapack-1.7-fedora.patch scalapack.spec Log Message: Fix NOOPT to be -fPIC. scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-fedora.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-fedora.patch 1 Mar 2006 00:22:56 -0000 1.2 +++ scalapack-1.7-fedora.patch 8 Mar 2006 16:58:08 -0000 1.3 @@ -1,5 +1,23 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 +--- scalapack-1.7/SCALAPACK/Makefile.fedora 2001-08-10 11:44:13.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:41:39.000000000 -0600 +@@ -49,7 +49,7 @@ + all: lib + #all: lib exe + +-lib: toolslib pblaslib redistlib scalapacklib ++lib: toolslib pblaslib redistlib scalapacklib shared + + exe: pblasexe redistexe scalapackexe + +@@ -90,3 +90,6 @@ + ( cd $(SRCdir); $(MAKE) clean ) + ( cd $(TOOLSdir); $(MAKE) clean ) + ( cd $(REDISTdir)/SRC; $(MAKE) clean ) ++ ++shared: scalapacklib ++ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) +--- scalapack-1.7/SCALAPACK/SLmake.inc.fedora 2001-08-08 21:59:50.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:42:41.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -39,10 +57,11 @@ +F77 = gfortran #F77 = /usr/local/pgi/linux86/bin/pgf77 CC = gcc - NOOPT = +-NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC ++NOOPT = -fPIC ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) +CCFLAGS = $(RPM_OPT_FLAGS) -fPIC SRCFLAG = F77LOADER = $(F77) @@ -74,21 +93,3 @@ +PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) +RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) ---- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 -@@ -49,7 +49,7 @@ - all: lib - #all: lib exe - --lib: toolslib pblaslib redistlib scalapacklib -+lib: toolslib pblaslib redistlib scalapacklib shared - - exe: pblasexe redistexe scalapackexe - -@@ -90,3 +90,6 @@ - ( cd $(SRCdir); $(MAKE) clean ) - ( cd $(TOOLSdir); $(MAKE) clean ) - ( cd $(REDISTdir)/SRC; $(MAKE) clean ) -+ -+shared: scalapacklib -+ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- scalapack.spec 1 Mar 2006 00:22:56 -0000 1.11 +++ scalapack.spec 8 Mar 2006 16:58:08 -0000 1.12 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 +- set -fPIC as NOOPT + * Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 - fix 64 bit builds - enable shared libraries From fedora-extras-commits at redhat.com Wed Mar 8 16:58:14 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 11:58:14 -0500 Subject: rpms/scalapack/devel scalapack-1.7-fedora.patch, 1.3, 1.4 scalapack.spec, 1.12, 1.13 Message-ID: <200603081658.k28Gwklm014274@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14206/devel Modified Files: scalapack-1.7-fedora.patch scalapack.spec Log Message: Fix NOOPT to be -fPIC. scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-fedora.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scalapack-1.7-fedora.patch 1 Mar 2006 00:23:02 -0000 1.3 +++ scalapack-1.7-fedora.patch 8 Mar 2006 16:58:14 -0000 1.4 @@ -1,5 +1,23 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.patch1 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-14 09:09:21.000000000 -0600 +--- scalapack-1.7/SCALAPACK/Makefile.fedora 2001-08-10 11:44:13.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:41:39.000000000 -0600 +@@ -49,7 +49,7 @@ + all: lib + #all: lib exe + +-lib: toolslib pblaslib redistlib scalapacklib ++lib: toolslib pblaslib redistlib scalapacklib shared + + exe: pblasexe redistexe scalapackexe + +@@ -90,3 +90,6 @@ + ( cd $(SRCdir); $(MAKE) clean ) + ( cd $(TOOLSdir); $(MAKE) clean ) + ( cd $(REDISTdir)/SRC; $(MAKE) clean ) ++ ++shared: scalapacklib ++ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) +--- scalapack-1.7/SCALAPACK/SLmake.inc.fedora 2001-08-08 21:59:50.000000000 -0500 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:42:41.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -39,10 +57,11 @@ +F77 = gfortran #F77 = /usr/local/pgi/linux86/bin/pgf77 CC = gcc - NOOPT = +-NOOPT = -F77FLAGS = -O3 $(NOOPT) -CCFLAGS = -O4 -+F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -fPIC ++NOOPT = -fPIC ++F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) +CCFLAGS = $(RPM_OPT_FLAGS) -fPIC SRCFLAG = F77LOADER = $(F77) @@ -74,21 +93,3 @@ +PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) +RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) ---- scalapack-1.7/SCALAPACK/Makefile.BAD 2006-02-14 09:11:43.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-02-14 09:12:35.000000000 -0600 -@@ -49,7 +49,7 @@ - all: lib - #all: lib exe - --lib: toolslib pblaslib redistlib scalapacklib -+lib: toolslib pblaslib redistlib scalapacklib shared - - exe: pblasexe redistexe scalapackexe - -@@ -90,3 +90,6 @@ - ( cd $(SRCdir); $(MAKE) clean ) - ( cd $(TOOLSdir); $(MAKE) clean ) - ( cd $(REDISTdir)/SRC; $(MAKE) clean ) -+ -+shared: scalapacklib -+ ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scalapack.spec 1 Mar 2006 00:23:02 -0000 1.12 +++ scalapack.spec 8 Mar 2006 16:58:14 -0000 1.13 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 11%{?dist} +Release: 12%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 +- set -fPIC as NOOPT + * Sun Feb 26 2006 Tom "spot" Callaway 1.7-11 - fix 64 bit builds - enable shared libraries From fedora-extras-commits at redhat.com Wed Mar 8 18:02:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 13:02:52 -0500 Subject: rpms/lyx/devel lyx.spec, 1.25, 1.26 lyx-1.4.0-boost.patch, 1.1, NONE lyx-1.4.0-gcc41.patch, 1.1, NONE lyx-crystal.png, 1.1, NONE Message-ID: <200603081803.k28I3OW8018324@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18267 Modified Files: lyx.spec Removed Files: lyx-1.4.0-boost.patch lyx-1.4.0-gcc41.patch lyx-crystal.png Log Message: * Wed Mar 08 2006 Rex Dieter 1.4.0-1 - 1.4.0(final) - drop boost bits Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- lyx.spec 3 Mar 2006 19:27:04 -0000 1.25 +++ lyx.spec 8 Mar 2006 18:02:51 -0000 1.26 @@ -1,29 +1,17 @@ -## avoid on fc4/gcc-4.0.2, due to http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24389 -## (fixed in gcc-4.0.3) -%if "%{?fedora}" != "4" -#define _without_included_boost --without-included-boost -%endif - -%define beta pre6 - Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 0.11.%{beta}%{?dist} +Release: 1%{?dist} License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ -Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 +#Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: lyx-1.4.0-helpers.patch -# http://bugzilla.lyx.org/show_bug.cgi?id=2297 -Patch2: lyx-1.4.0-boost.patch -# http://bugzilla.lyx.org/show_bug.cgi?id=2278 -# http://www.mail-archive.com/lyx-devel at lists.lyx.org/msg86593.html -Patch3: lyx-1.4.0-gcc41.patch # app-wrapper for various frontends Source10: lyx.sh @@ -48,7 +36,6 @@ BuildRequires: zlib-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts -%{?_without_included_boost:BuildRequires: boost-devel >= 1.33} # For texhash Requires(post): tetex-fonts @@ -102,11 +89,6 @@ %setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .helpers -%patch2 -p1 -b .boost -# possibly questionable patch, leave out for now -- Rex -#patch3 -p0 -b .gcc41 - -# ./autogen.sh %build @@ -178,12 +160,12 @@ # Catch installed/uninstalled helpers %triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then -cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: +cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi %triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then -cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: +cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi @@ -216,6 +198,14 @@ %changelog +* Wed Mar 08 2006 Rex Dieter 1.4.0-1 +- 1.4.0(final) +- drop boost bits + +* Tue Mar 07 2006 Rex Dieter 1.4.0-0.12.rc +- 1.4.0rc +- drop boost patch (for now) + * Fri Mar 03 2006 Rex Dieter 1.4.0-0.11.pre6 - 1.4.0pre6 - --disable-stdlib-debug --disable-assertions --disable-concept-checks --- lyx-1.4.0-boost.patch DELETED --- --- lyx-1.4.0-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 8 18:11:01 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 13:11:01 -0500 Subject: rpms/lyx/devel .cvsignore, 1.8, 1.9 lyx.spec, 1.26, 1.27 sources, 1.9, 1.10 Message-ID: <200603081811.k28IBYYU018455@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18432 Modified Files: .cvsignore lyx.spec sources Log Message: Release++, retag for missing Source's Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 3 Mar 2006 19:27:04 -0000 1.8 +++ .cvsignore 8 Mar 2006 18:10:59 -0000 1.9 @@ -1 +1 @@ -lyx-1.4.0pre6.tar.bz2 +lyx-1.4.0.tar.bz2 Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- lyx.spec 8 Mar 2006 18:02:51 -0000 1.26 +++ lyx.spec 8 Mar 2006 18:11:00 -0000 1.27 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Publishing @@ -198,7 +198,7 @@ %changelog -* Wed Mar 08 2006 Rex Dieter 1.4.0-1 +* Wed Mar 08 2006 Rex Dieter 1.4.0-2 - 1.4.0(final) - drop boost bits Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 3 Mar 2006 19:27:04 -0000 1.9 +++ sources 8 Mar 2006 18:11:00 -0000 1.10 @@ -1 +1 @@ -bcc2e2b301a4e30e9bf7556afccae060 lyx-1.4.0pre6.tar.bz2 +5ab37471339ff7dbc8f0c43282746cb0 lyx-1.4.0.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 8 18:20:51 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 8 Mar 2006 13:20:51 -0500 Subject: rpms/libtasn1/FC-4 libtasn1.spec,1.11,1.12 sources,1.3,1.4 Message-ID: <200603081821.k28ILOu7018622@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18587/FC-4 Modified Files: libtasn1.spec sources Log Message: updated to 0.3.1 Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/libtasn1.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libtasn1.spec 6 Mar 2006 11:29:06 -0000 1.11 +++ libtasn1.spec 8 Mar 2006 18:20:51 -0000 1.12 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.0 +Version: 0.3.1 Release: %release_func 1 License: LGPL @@ -93,6 +93,9 @@ %changelog +* Wed Mar 8 2006 Enrico Scholz - 0.3.1-1 +- updated to 0.3.1 + * Mon Mar 6 2006 Enrico Scholz - 0.3.0-1 - updated to 0.3.0 - removed unneeded curlies Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2006 11:15:36 -0000 1.3 +++ sources 8 Mar 2006 18:20:51 -0000 1.4 @@ -1,2 +1,2 @@ -e78a3fba867f6d956ead70d86815a2d7 libtasn1-0.3.0.tar.gz -0f8dc79aca78440e0c31dfef6ed5e571 libtasn1-0.3.0.tar.gz.sig +f56641ed0e1ee4d1903ba25ab046ed45 libtasn1-0.3.1.tar.gz +8097b205dd0fb3b351f8fd707dee903e libtasn1-0.3.1.tar.gz.sig From fedora-extras-commits at redhat.com Wed Mar 8 18:20:57 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 8 Mar 2006 13:20:57 -0500 Subject: rpms/libtasn1/devel libtasn1.spec,1.10,1.11 sources,1.3,1.4 Message-ID: <200603081821.k28ILUNU018626@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18587/devel Modified Files: libtasn1.spec sources Log Message: updated to 0.3.1 Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libtasn1.spec 6 Mar 2006 11:29:12 -0000 1.10 +++ libtasn1.spec 8 Mar 2006 18:20:57 -0000 1.11 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.0 +Version: 0.3.1 Release: %release_func 1 License: LGPL @@ -93,6 +93,9 @@ %changelog +* Wed Mar 8 2006 Enrico Scholz - 0.3.1-1 +- updated to 0.3.1 + * Mon Mar 6 2006 Enrico Scholz - 0.3.0-1 - updated to 0.3.0 - removed unneeded curlies Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 6 Mar 2006 11:21:46 -0000 1.3 +++ sources 8 Mar 2006 18:20:57 -0000 1.4 @@ -1,2 +1,2 @@ -e78a3fba867f6d956ead70d86815a2d7 libtasn1-0.3.0.tar.gz -0f8dc79aca78440e0c31dfef6ed5e571 libtasn1-0.3.0.tar.gz.sig +f56641ed0e1ee4d1903ba25ab046ed45 libtasn1-0.3.1.tar.gz +8097b205dd0fb3b351f8fd707dee903e libtasn1-0.3.1.tar.gz.sig From fedora-extras-commits at redhat.com Wed Mar 8 18:37:12 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 8 Mar 2006 13:37:12 -0500 Subject: rpms/pcsc-tools/devel .cvsignore, 1.2, 1.3 pcsc-tools.spec, 1.3, 1.4 sources, 1.2, 1.3 pcsc-tools-1.4.1-atrmsg.patch, 1.1, NONE pcsc-tools-gscriptor.desktop, 1.1, NONE smartcard_list.txt, 1.3, NONE Message-ID: <200603081837.k28Ibil6018804@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18783 Modified Files: .cvsignore pcsc-tools.spec sources Removed Files: pcsc-tools-1.4.1-atrmsg.patch pcsc-tools-gscriptor.desktop smartcard_list.txt Log Message: * Wed Mar 8 2006 Ville Skytt?? - 1.4.2-1 - 1.4.2, desktop file, recent smartcard_list.txt, ATR_analysis message patch and smartcard_list.txt lookup path improvement included upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 13 Dec 2005 20:45:49 -0000 1.2 +++ .cvsignore 8 Mar 2006 18:37:12 -0000 1.3 @@ -1 +1 @@ -pcsc-tools-1.4.1.tar.gz +pcsc-tools-1.4.2.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pcsc-tools.spec 6 Mar 2006 16:08:32 -0000 1.3 +++ pcsc-tools.spec 8 Mar 2006 18:37:12 -0000 1.4 @@ -1,15 +1,13 @@ Name: pcsc-tools -Version: 1.4.1 -Release: 3%{?dist} +Version: 1.4.2 +Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC Group: Development/Tools 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 -Source2: %{name}-gscriptor.desktop -Patch0: %{name}-1.4.1-atrmsg.patch +#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 @@ -29,14 +27,14 @@ %prep %setup -q -%patch0 sed -i -e 's/-O2 -g/$(RPM_OPT_FLAGS)/' Makefile -sed -i -e 's|/usr/lib/pcsc\b|%{_datadir}/pcsc|' ATR_analysis* if ! pkg-config --atleast-version 1.2.9 libpcsclite ; then -sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c + sed -i -e 's/LPTSTR/LPSTR/' pcsc_scan.c fi -iconv -f iso-8859-1 -t utf-8 %{SOURCE1} > smartcard_list.txt -cp -p %{SOURCE2} gscriptor.desktop +# cp %{SOURCE1} . +for f in Changelog smartcard_list.txt ; do + iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f +done %build @@ -72,6 +70,10 @@ %changelog +* Wed Mar 8 2006 Ville Skytt?? - 1.4.2-1 +- 1.4.2, desktop file, recent smartcard_list.txt, ATR_analysis message + patch and smartcard_list.txt lookup path improvement included upstream. + * Mon Mar 6 2006 Ville Skytt?? - 1.4.1-3 - Update smartcard_list.txt to 20060305. - Fix some ATR_analysis messages. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 13 Dec 2005 20:45:49 -0000 1.2 +++ sources 8 Mar 2006 18:37:12 -0000 1.3 @@ -1 +1 @@ -517cb2a5e6d3170f408cc7550223ed89 pcsc-tools-1.4.1.tar.gz +9cd68c933fafda78f844b114319a52b8 pcsc-tools-1.4.2.tar.gz --- pcsc-tools-1.4.1-atrmsg.patch DELETED --- --- pcsc-tools-gscriptor.desktop DELETED --- --- smartcard_list.txt DELETED --- From fedora-extras-commits at redhat.com Wed Mar 8 19:15:44 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 14:15:44 -0500 Subject: rpms/lyx/devel lyx.spec,1.27,1.28 Message-ID: <200603081916.k28JGLAs020936@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20918 Modified Files: lyx.spec Log Message: add mailing list reference for dropping -fexceptions drop last boost reference Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- lyx.spec 8 Mar 2006 18:11:00 -0000 1.27 +++ lyx.spec 8 Mar 2006 19:15:44 -0000 1.28 @@ -97,7 +97,8 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -# drop -fexceptions from RPM_OPT_FLAGS (suggested by lyx devs) +# drop -fexceptions from RPM_OPT_FLAGS, suggested by lyx devs: +# http://www.mail-archive.com/lyx-devel at lists.lyx.org/msg85794.html export CFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )" export CXXFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )" @@ -112,7 +113,6 @@ --with-aspell \ --without-warnings --disable-dependency-tracking \ --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ - %{?_without_included_boost} # Intermediate cleanup # (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking From fedora-extras-commits at redhat.com Wed Mar 8 19:18:40 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 14:18:40 -0500 Subject: rpms/pl/FC-3 .cvsignore,1.5,1.6 pl.spec,1.15,1.16 sources,1.5,1.6 Message-ID: <200603081919.k28JJCL9021045@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20988/FC-3 Modified Files: .cvsignore pl.spec sources Log Message: new version 5.6.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pl/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Jan 2006 19:35:07 -0000 1.5 +++ .cvsignore 8 Mar 2006 19:18:40 -0000 1.6 @@ -1,3 +1,3 @@ -pl-5.6.3.tar.gz HTMLmanual.tar.gz +pl-5.6.7.tar.gz userguide.html.tgz Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/FC-3/pl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- pl.spec 28 Jan 2006 19:35:07 -0000 1.15 +++ pl.spec 8 Mar 2006 19:18:40 -0000 1.16 @@ -1,5 +1,5 @@ Name: pl -Version: 5.6.3 +Version: 5.6.7 Release: 1%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -7,13 +7,15 @@ Group: Development/Languages License: LGPL URL: http://www.swi-prolog.org -Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz +Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.7.tar.gz Source1: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: pl-5.4.6-rpath.patch Patch1: pl-5.6.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libjpeg-devel, readline-devel, openssl-devel +BuildRequires: libjpeg-devel +BuildRequires: readline-devel +BuildRequires: openssl-devel BuildRequires: unixODBC-devel BuildRequires: xorg-x11-devel @@ -83,6 +85,9 @@ %changelog +* Wed Mar 8 2006 Gerard Milmeister - 5.6.7-1 +- new version 5.6.7 + * Sat Jan 28 2006 Gerard Milmeister - 5.6.3-1 - new version 5.6.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pl/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Jan 2006 19:35:07 -0000 1.5 +++ sources 8 Mar 2006 19:18:40 -0000 1.6 @@ -1,3 +1,3 @@ -6b83cbe448a6d2b0655a426d2e9cdcad pl-5.6.3.tar.gz -6ffc2ce035b0534f822757472d734237 HTMLmanual.tar.gz +f1691c99e00622145c00d50caf4aef08 HTMLmanual.tar.gz +63f8a2dd6a48333fb1f848f78c1c5409 pl-5.6.7.tar.gz 72feb8797f134c45be719133873cae1f userguide.html.tgz From fedora-extras-commits at redhat.com Wed Mar 8 19:18:46 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 14:18:46 -0500 Subject: rpms/pl/FC-4 .cvsignore,1.6,1.7 pl.spec,1.18,1.19 sources,1.6,1.7 Message-ID: <200603081919.k28JJIlX021051@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20988/FC-4 Modified Files: .cvsignore pl.spec sources Log Message: new version 5.6.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pl/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Jan 2006 19:35:13 -0000 1.6 +++ .cvsignore 8 Mar 2006 19:18:46 -0000 1.7 @@ -1,3 +1,3 @@ -pl-5.6.3.tar.gz HTMLmanual.tar.gz +pl-5.6.7.tar.gz userguide.html.tgz Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/FC-4/pl.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- pl.spec 28 Jan 2006 19:35:13 -0000 1.18 +++ pl.spec 8 Mar 2006 19:18:46 -0000 1.19 @@ -1,5 +1,5 @@ Name: pl -Version: 5.6.3 +Version: 5.6.7 Release: 1%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler @@ -7,13 +7,15 @@ Group: Development/Languages License: LGPL URL: http://www.swi-prolog.org -Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz +Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.7.tar.gz Source1: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: pl-5.4.6-rpath.patch Patch1: pl-5.6.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libjpeg-devel, readline-devel, openssl-devel +BuildRequires: libjpeg-devel +BuildRequires: readline-devel +BuildRequires: openssl-devel BuildRequires: unixODBC-devel BuildRequires: xorg-x11-devel @@ -83,6 +85,9 @@ %changelog +* Wed Mar 8 2006 Gerard Milmeister - 5.6.7-1 +- new version 5.6.7 + * Sat Jan 28 2006 Gerard Milmeister - 5.6.3-1 - new version 5.6.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pl/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Jan 2006 19:35:13 -0000 1.6 +++ sources 8 Mar 2006 19:18:46 -0000 1.7 @@ -1,3 +1,3 @@ -6b83cbe448a6d2b0655a426d2e9cdcad pl-5.6.3.tar.gz -6ffc2ce035b0534f822757472d734237 HTMLmanual.tar.gz +f1691c99e00622145c00d50caf4aef08 HTMLmanual.tar.gz +63f8a2dd6a48333fb1f848f78c1c5409 pl-5.6.7.tar.gz 72feb8797f134c45be719133873cae1f userguide.html.tgz From fedora-extras-commits at redhat.com Wed Mar 8 19:18:52 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 14:18:52 -0500 Subject: rpms/pl/devel .cvsignore,1.6,1.7 pl.spec,1.22,1.23 sources,1.6,1.7 Message-ID: <200603081919.k28JJOeO021057@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/pl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20988/devel Modified Files: .cvsignore pl.spec sources Log Message: new version 5.6.7 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pl/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 28 Jan 2006 19:35:19 -0000 1.6 +++ .cvsignore 8 Mar 2006 19:18:52 -0000 1.7 @@ -1,3 +1,3 @@ -pl-5.6.3.tar.gz HTMLmanual.tar.gz +pl-5.6.7.tar.gz userguide.html.tgz Index: pl.spec =================================================================== RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- pl.spec 17 Feb 2006 21:36:42 -0000 1.22 +++ pl.spec 8 Mar 2006 19:18:52 -0000 1.23 @@ -1,19 +1,21 @@ Name: pl -Version: 5.6.3 -Release: 2%{?dist} +Version: 5.6.7 +Release: 1%{?dist} Summary: SWI-Prolog - Edinburgh compatible Prolog compiler Group: Development/Languages License: LGPL URL: http://www.swi-prolog.org -Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.3.tar.gz +Source: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.7.tar.gz Source1: http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz Source2: http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz Patch0: pl-5.4.6-rpath.patch Patch1: pl-5.6.0-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libjpeg-devel, readline-devel, openssl-devel +BuildRequires: libjpeg-devel +BuildRequires: readline-devel +BuildRequires: openssl-devel BuildRequires: unixODBC-devel Buildrequires: freetype-devel BuildRequires: libICE-devel @@ -93,8 +95,8 @@ %changelog -* Fri Feb 17 2006 Gerard Milmeister - 5.6.3-2 -- Rebuild for Fedora Extras 5 +* Wed Mar 8 2006 Gerard Milmeister - 5.6.7-1 +- new version 5.6.7 * Sat Jan 28 2006 Gerard Milmeister - 5.6.3-1 - new version 5.6.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pl/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 28 Jan 2006 19:35:19 -0000 1.6 +++ sources 8 Mar 2006 19:18:52 -0000 1.7 @@ -1,3 +1,3 @@ -6b83cbe448a6d2b0655a426d2e9cdcad pl-5.6.3.tar.gz -6ffc2ce035b0534f822757472d734237 HTMLmanual.tar.gz +f1691c99e00622145c00d50caf4aef08 HTMLmanual.tar.gz +63f8a2dd6a48333fb1f848f78c1c5409 pl-5.6.7.tar.gz 72feb8797f134c45be719133873cae1f userguide.html.tgz From fedora-extras-commits at redhat.com Wed Mar 8 19:27:30 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Wed, 8 Mar 2006 14:27:30 -0500 Subject: rpms/mantis/devel sources,1.6,1.7 mantis.spec,1.9,1.10 Message-ID: <200603081928.k28JS2ee021233@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mantis/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21214 Modified Files: sources mantis.spec Log Message: updated to 1.0.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/mantis/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 18 Feb 2006 10:59:42 -0000 1.6 +++ sources 8 Mar 2006 19:27:29 -0000 1.7 @@ -1 +1 @@ -40909a3da82bc2c36a08c013b4463d6a mantis-1.0.0.tar.gz +ac9b8c7e1595bb281a2d5268eaf7fcea mantis-1.0.1.tar.gz Index: mantis.spec =================================================================== RCS file: /cvs/extras/rpms/mantis/devel/mantis.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- mantis.spec 18 Feb 2006 10:59:42 -0000 1.9 +++ mantis.spec 8 Mar 2006 19:27:30 -0000 1.10 @@ -8,7 +8,7 @@ Summary: Web-based bugtracking system Name: mantis -Version: 1.0.0 +Version: 1.0.1 Release: %release_func 1 License: GPL Group: Applications/Internet @@ -138,6 +138,9 @@ %changelog +* Wed Mar 8 2006 Enrico Scholz - 1.0.1-1 +- updated to 1.0.1 + * Sat Feb 18 2006 Enrico Scholz - 1.0.0-1 - updated to 1.0.0 From fedora-extras-commits at redhat.com Wed Mar 8 19:41:00 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 14:41:00 -0500 Subject: rpms/gcl/devel gcl-bash.patch,NONE,1.1 gcl.spec,1.15,1.16 Message-ID: <200603081941.k28JfWMi021343@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21323 Modified Files: gcl.spec Added Files: gcl-bash.patch Log Message: gcl-bash.patch: --- NEW FILE gcl-bash.patch --- --- gcl-2.6.7/configure.bash 2006-03-08 20:39:05.000000000 +0100 +++ gcl-2.6.7/configure 2006-03-08 20:39:39.000000000 +0100 @@ -1711,7 +1711,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` Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gcl.spec 17 Feb 2006 23:34:03 -0000 1.15 +++ gcl.spec 8 Mar 2006 19:40:59 -0000 1.16 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 6%{?dist} +Release: 7%{?dist} Summary: GNU Common Lisp Group: Development/Languages @@ -8,8 +8,12 @@ URL: http://www.gnu.org/software/gcl Source: ftp://ftp.gnu.org/pub/gnu/gcl/gcl-2.6.7.tar.gz Patch0: gcl-pers.patch +Patch1: gcl-bash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: readline-devel, tk-devel, tcl-devel, gmp-devel +BuildRequires: readline-devel +BuildRequires: tk-devel +BuildRequires: tcl-devel +BuildRequires: gmp-devel BuildRequires: tetex, texinfo Requires(post): /sbin/install-info Requires(postun): /sbin/install-info @@ -26,6 +30,7 @@ %prep %setup -q %patch0 -p1 +#%patch1 -p1 %build @@ -91,6 +96,9 @@ %changelog +* Wed Mar 8 2006 Gerard Milmeister - 2.6.7-7 +- Patch gcl-bash.patch for configure + * Sat Feb 18 2006 Gerard Milmeister - 2.6.7-6 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed Mar 8 19:45:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 14:45:52 -0500 Subject: rpms/lyx/devel .cvsignore, 1.9, 1.10 lyx.spec, 1.28, 1.29 sources, 1.10, 1.11 Message-ID: <200603081946.k28JkPpq021422@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21399 Modified Files: .cvsignore lyx.spec sources Log Message: * Wed Mar 08 2006 Rex Dieter 1.4.0-3 - include beamer.layout Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 8 Mar 2006 18:10:59 -0000 1.9 +++ .cvsignore 8 Mar 2006 19:45:52 -0000 1.10 @@ -1 +1,2 @@ lyx-1.4.0.tar.bz2 +beamer.layout Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- lyx.spec 8 Mar 2006 19:15:44 -0000 1.28 +++ lyx.spec 8 Mar 2006 19:45:52 -0000 1.29 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing @@ -15,10 +15,12 @@ # app-wrapper for various frontends Source10: lyx.sh - +# .desktop files Source20: lyx.desktop Source21: lyx-qt.desktop Source22: lyx-xforms.desktop +# misc +Source100: ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/beamer/lyx/layouts/beamer.layout # TODO: use helpers.sh script at runtime, instead of depending on # lyx's configure and %%triggers @@ -129,10 +131,13 @@ make install DESTDIR=$RPM_BUILD_ROOT ## Handle front-ends -install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx +install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx install -p -m0755 -D src/lyx-qt $RPM_BUILD_ROOT%{_bindir}/lyx-qt install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms +# misc/extras +install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/ + # Set up the lyx-specific class files where TeX can see them texmf=%{_datadir}/texmf mkdir -p $RPM_BUILD_ROOT${texmf}/tex/latex @@ -198,6 +203,9 @@ %changelog +* Wed Mar 08 2006 Rex Dieter 1.4.0-3 +- include beamer.layout + * Wed Mar 08 2006 Rex Dieter 1.4.0-2 - 1.4.0(final) - drop boost bits Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 8 Mar 2006 18:11:00 -0000 1.10 +++ sources 8 Mar 2006 19:45:52 -0000 1.11 @@ -1 +1,2 @@ 5ab37471339ff7dbc8f0c43282746cb0 lyx-1.4.0.tar.bz2 +c906271900a0627d3df2a38ad962a285 beamer.layout From fedora-extras-commits at redhat.com Wed Mar 8 19:53:24 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 14:53:24 -0500 Subject: rpms/gcl/devel gcl-bash.patch,1.1,1.2 gcl.spec,1.16,1.17 Message-ID: <200603081953.k28JrvPc021506@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21482 Modified Files: gcl-bash.patch gcl.spec Log Message: gcl-bash.patch: Index: gcl-bash.patch =================================================================== RCS file: /cvs/extras/rpms/gcl/devel/gcl-bash.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gcl-bash.patch 8 Mar 2006 19:40:59 -0000 1.1 +++ gcl-bash.patch 8 Mar 2006 19:53:24 -0000 1.2 @@ -1,5 +1,5 @@ ---- gcl-2.6.7/configure.bash 2006-03-08 20:39:05.000000000 +0100 -+++ gcl-2.6.7/configure 2006-03-08 20:39:39.000000000 +0100 +--- gcl-2.6.7/configure.bash 2006-03-08 20:50:04.000000000 +0100 ++++ gcl-2.6.7/configure 2006-03-08 20:52:25.000000000 +0100 @@ -1711,7 +1711,7 @@ # results, and the version is kept in special file). @@ -9,3 +9,12 @@ fi if test "`uname -s`" = "AIX" ; then system=AIX-`uname -v`.`uname -r` +@@ -2409,7 +2409,7 @@ + X_LIBS="$X_LIBS -L$x_libraries" + # For Solaris; some versions of Sun CC require a space after -R and + # others require no space. Words are not sufficient . . . . +- case "`(uname -sr) 2>/dev/null`" in ++ case "`uname -sr 2>/dev/null`" in + "SunOS 5"*) + echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 + echo "configure:2416: checking whether -R must be followed by a space" >&5 Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- gcl.spec 8 Mar 2006 19:40:59 -0000 1.16 +++ gcl.spec 8 Mar 2006 19:53:24 -0000 1.17 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 7%{?dist} +Release: 8%{?dist} Summary: GNU Common Lisp Group: Development/Languages From fedora-extras-commits at redhat.com Wed Mar 8 20:01:23 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 15:01:23 -0500 Subject: rpms/srecord/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 srecord.spec, 1.2, 1.3 Message-ID: <200603082001.k28K1tsP023497@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23430/FC-3 Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.24. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Sep 2005 12:25:41 -0000 1.3 +++ .cvsignore 8 Mar 2006 20:01:23 -0000 1.4 @@ -1 +1 @@ -srecord-1.23.tar.gz +srecord-1.24.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Sep 2005 12:25:41 -0000 1.3 +++ sources 8 Mar 2006 20:01:23 -0000 1.4 @@ -1 +1 @@ -fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz +de498fade437769c83442ede94073fe1 srecord-1.24.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-3/srecord.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- srecord.spec 23 Sep 2005 12:25:41 -0000 1.2 +++ srecord.spec 8 Mar 2006 20:01:23 -0000 1.3 @@ -1,5 +1,5 @@ Name: srecord -Version: 1.23 +Version: 1.24 Release: 1%{?dist} Summary: Manipulate EPROM load files @@ -64,6 +64,12 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 1.24-1 +- Update to 1.24. + +* Wed Feb 15 2006 Jose Pedro Oliveira - 1.23-2 +- Rebuild. + * Fri Sep 23 2005 Jose Pedro Oliveira - 1.23-1 - Update to 1.23. From fedora-extras-commits at redhat.com Wed Mar 8 20:01:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 15:01:33 -0500 Subject: rpms/srecord/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 srecord.spec, 1.2, 1.3 Message-ID: <200603082002.k28K27c2023502@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23430/FC-4 Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.24. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Sep 2005 12:25:41 -0000 1.3 +++ .cvsignore 8 Mar 2006 20:01:32 -0000 1.4 @@ -1 +1 @@ -srecord-1.23.tar.gz +srecord-1.24.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Sep 2005 12:25:41 -0000 1.3 +++ sources 8 Mar 2006 20:01:33 -0000 1.4 @@ -1 +1 @@ -fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz +de498fade437769c83442ede94073fe1 srecord-1.24.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/FC-4/srecord.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- srecord.spec 23 Sep 2005 12:25:41 -0000 1.2 +++ srecord.spec 8 Mar 2006 20:01:33 -0000 1.3 @@ -1,5 +1,5 @@ Name: srecord -Version: 1.23 +Version: 1.24 Release: 1%{?dist} Summary: Manipulate EPROM load files @@ -64,6 +64,12 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 1.24-1 +- Update to 1.24. + +* Wed Feb 15 2006 Jose Pedro Oliveira - 1.23-2 +- Rebuild. + * Fri Sep 23 2005 Jose Pedro Oliveira - 1.23-1 - Update to 1.23. From fedora-extras-commits at redhat.com Wed Mar 8 20:01:43 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 15:01:43 -0500 Subject: rpms/srecord/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 srecord.spec, 1.3, 1.4 Message-ID: <200603082002.k28K2F6Q023507@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/srecord/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23430/devel Modified Files: .cvsignore sources srecord.spec Log Message: Update to 1.24. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 23 Sep 2005 12:25:47 -0000 1.3 +++ .cvsignore 8 Mar 2006 20:01:43 -0000 1.4 @@ -1 +1 @@ -srecord-1.23.tar.gz +srecord-1.24.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 23 Sep 2005 12:25:47 -0000 1.3 +++ sources 8 Mar 2006 20:01:43 -0000 1.4 @@ -1 +1 @@ -fcca798d3cc3f186410b8ed0e1c2e793 srecord-1.23.tar.gz +de498fade437769c83442ede94073fe1 srecord-1.24.tar.gz Index: srecord.spec =================================================================== RCS file: /cvs/extras/rpms/srecord/devel/srecord.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- srecord.spec 15 Feb 2006 01:20:42 -0000 1.3 +++ srecord.spec 8 Mar 2006 20:01:43 -0000 1.4 @@ -1,6 +1,6 @@ Name: srecord -Version: 1.23 -Release: 2%{?dist} +Version: 1.24 +Release: 1%{?dist} Summary: Manipulate EPROM load files Group: Development/Tools @@ -64,6 +64,9 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 1.24-1 +- Update to 1.24. + * Wed Feb 15 2006 Jose Pedro Oliveira - 1.23-2 - Rebuild. From fedora-extras-commits at redhat.com Wed Mar 8 20:22:44 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 8 Mar 2006 15:22:44 -0500 Subject: fedora-release fedora-release.spec,1.18,1.19 Message-ID: <200603082022.k28KMi4M023773@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23755 Modified Files: fedora-release.spec Log Message: add bits for about-fedora scrollkeeper stuff Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- fedora-release.spec 7 Mar 2006 23:51:43 -0000 1.18 +++ fedora-release.spec 8 Mar 2006 20:22:36 -0000 1.19 @@ -34,6 +34,8 @@ cp README-en.txt $MAINDIR/README cp -af README-* $MAINDIR cp -af RELEASE-NOTES-* $MAINDIR +cp -r *.css figs stylesheet-images ../ +cp -r about ../ popd rm -f */*.eps make index.html @@ -68,6 +70,10 @@ install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d done +# about fedora stuff +mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release +install -m 644 release-notes/about-fedora.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release + %clean rm -rf $RPM_BUILD_ROOT @@ -84,6 +90,12 @@ mv -f /etc/issue.net.rpmnew /etc/issue.net fi +%post +[ -x /usr/sbin/scrollkeeper-update ] && /usr/sbin/scrollkeeper-update + +%postun +[ -x /usr/sbin/scrollkeeper-update ] && /usr/sbin/scrollkeeper-update + %files %defattr(-,root,root) %attr(0644,root,root) /etc/fedora-release @@ -94,6 +106,7 @@ %config(noreplace) /etc/yum.repos.d/* %doc R* stylesheet-images figs *.css %doc eula.txt GPL autorun-template +%doc about %config %attr(0644,root,root) /etc/issue %config %attr(0644,root,root) /etc/issue.net /usr/share/firstboot/modules/eula.py* @@ -101,3 +114,4 @@ %{_defaultdocdir}/HTML %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/* +%{_datadir}/omf/fedora-release From fedora-extras-commits at redhat.com Wed Mar 8 20:45:09 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 8 Mar 2006 15:45:09 -0500 Subject: fedora-release fedora-release.spec,1.19,1.20 Message-ID: <200603082045.k28Kj9Eg023871@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23853 Modified Files: fedora-release.spec Log Message: more about-fedora fun Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- fedora-release.spec 8 Mar 2006 20:22:36 -0000 1.19 +++ fedora-release.spec 8 Mar 2006 20:45:02 -0000 1.20 @@ -73,6 +73,8 @@ # about fedora stuff mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release install -m 644 release-notes/about-fedora.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release +mkdir -p $RPM_BUILD_ROOT%{datadir}/gnome/help/about-fedora +cp -r release-notes/about/* $RPM_BUILD_ROOT%{datadir}/gnome/help/about-fedora %clean rm -rf $RPM_BUILD_ROOT @@ -115,3 +117,4 @@ %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/* %{_datadir}/omf/fedora-release +%{_datadir}/gnome/help/about-fedora From fedora-extras-commits at redhat.com Wed Mar 8 20:53:23 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 8 Mar 2006 15:53:23 -0500 Subject: rpms/gcl/devel gcl.spec,1.17,1.18 Message-ID: <200603082053.k28Krtm8023902@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/gcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23885 Modified Files: gcl.spec Log Message: Index: gcl.spec =================================================================== RCS file: /cvs/extras/rpms/gcl/devel/gcl.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- gcl.spec 8 Mar 2006 19:53:24 -0000 1.17 +++ gcl.spec 8 Mar 2006 20:53:23 -0000 1.18 @@ -1,6 +1,6 @@ Name: gcl Version: 2.6.7 -Release: 8%{?dist} +Release: 9%{?dist} Summary: GNU Common Lisp Group: Development/Languages @@ -30,7 +30,7 @@ %prep %setup -q %patch0 -p1 -#%patch1 -p1 +%patch1 -p1 %build From fedora-extras-commits at redhat.com Wed Mar 8 21:08:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:08:16 -0500 Subject: rpms/multitail - New directory Message-ID: <200603082108.k28L8IEh025876@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25866/multitail Log Message: Directory /cvs/extras/rpms/multitail added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 21:08:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:08:22 -0500 Subject: rpms/multitail/devel - New directory Message-ID: <200603082108.k28L8O86025893@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25866/multitail/devel Log Message: Directory /cvs/extras/rpms/multitail/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 21:08:48 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:08:48 -0500 Subject: rpms/multitail Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603082108.k28L8o7h025927@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25915 Added Files: Makefile import.log Log Message: Setup of module multitail --- NEW FILE Makefile --- # Top level Makefile for module multitail all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 21:08:58 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:08:58 -0500 Subject: rpms/multitail/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603082109.k28L905d025947@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25915/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module multitail --- NEW 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 Mar 8 21:09:40 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:09:40 -0500 Subject: rpms/multitail import.log,1.1,1.2 Message-ID: <200603082110.k28LACrF026015@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25981 Modified Files: import.log Log Message: auto-import multitail-3.8.7-3 on branch devel from multitail-3.8.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/multitail/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 21:08:47 -0000 1.1 +++ import.log 8 Mar 2006 21:09:40 -0000 1.2 @@ -0,0 +1 @@ +multitail-3_8_7-3:HEAD:multitail-3.8.7-3.src.rpm:1141852165 From fedora-extras-commits at redhat.com Wed Mar 8 21:09:48 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:09:48 -0500 Subject: rpms/multitail/devel multitail.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603082110.k28LAKPu026019@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25981/devel Modified Files: .cvsignore sources Added Files: multitail.spec Log Message: auto-import multitail-3.8.7-3 on branch devel from multitail-3.8.7-3.src.rpm --- NEW FILE multitail.spec --- Name: multitail Version: 3.8.7 Release: 3%{?dist} Summary: View one or multiple files like tail but with multiple windows Group: Applications/Text License: GPL URL: http://www.vanheusden.com/multitail/ Source: http://www.vanheusden.com/multitail/multitail-%{version}.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel %description MultiTail lets you view one or multiple files like the original tail program. The difference is that it creates multiple windows on your console (with ncurses). It can also monitor wildcards: if another file matching the wildcard has a more recent modification date, it will automatically switch to that file. That way you can, for example, monitor a complete directory of files. Merging of 2 or even more logfiles is possible. It can also use colors while displaying the logfiles (through regular expressions), for faster recognition of what is important and what not. Multitail can also filter lines (again with regular expressions) and has interactive menus for editing given regular expressions and deleting and adding windows. One can also have windows with the output of shell scripts and other software. When viewing the output of external software, MultiTail can mimic the functionality of tools like 'watch' and such. %prep %setup -q %{__sed} -i 's/\r//' *.html %build CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} %install %{__rm} -rf %{buildroot} %{__install} -d -m0755 %{buildroot}%{_bindir} \ %{buildroot}%{_mandir}/man1/ \ %{buildroot}%{_sysconfdir} %{__make} install DESTDIR="%{buildroot}" %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc *.conf *.html Changes license.txt readme.txt %{_mandir}/man1/multitail.1* %config(noreplace) %{_sysconfdir}/multitail.conf %{_bindir}/multitail %changelog * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7-3 - Small changes as suggested in #182122. - Updated to release 3.8.7-3. * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7-2 - Small changes as suggested in #182122. - Updated to release 3.8.7-2. * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7-1 - Updated to release 3.8.7-1. * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7 - Updated to release 3.8.7. * Sat Feb 18 2006 Udo van den Heuvel - 3.8.6 - Imported Dries' SPEC file - Updated to release 3.8.6. * Mon Jan 30 2006 Dries Verachtert - 3.8.5-1 - 4025/dries - Updated to release 3.8.5. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 21:08:58 -0000 1.1 +++ .cvsignore 8 Mar 2006 21:09:47 -0000 1.2 @@ -0,0 +1 @@ +multitail-3.8.7.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 21:08:58 -0000 1.1 +++ sources 8 Mar 2006 21:09:47 -0000 1.2 @@ -0,0 +1 @@ +b216c9e0d598e3e048b2c6738a54ba08 multitail-3.8.7.tgz From fedora-extras-commits at redhat.com Wed Mar 8 21:14:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:14:22 -0500 Subject: owners owners.list,1.722,1.723 Message-ID: <200603082114.k28LEs9v026086@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26069 Modified Files: owners.list Log Message: New component: multitail (#182122). Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.722 retrieving revision 1.723 diff -u -r1.722 -r1.723 --- owners.list 8 Mar 2006 00:26:00 -0000 1.722 +++ owners.list 8 Mar 2006 21:14:22 -0000 1.723 @@ -695,6 +695,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|mpc|Command-line client for MPD|gauret at free.fr|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| Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com From fedora-extras-commits at redhat.com Wed Mar 8 21:21:46 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 8 Mar 2006 16:21:46 -0500 Subject: fedora-release fedora-release.spec,1.20,1.21 Message-ID: <200603082121.k28LLkU3026229@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26211 Modified Files: fedora-release.spec Log Message: more about fedora magic Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- fedora-release.spec 8 Mar 2006 20:45:02 -0000 1.20 +++ fedora-release.spec 8 Mar 2006 21:21:38 -0000 1.21 @@ -20,6 +20,7 @@ BuildRoot: %{_tmppath}/fedora-release-root BuildArchitectures: noarch BuildRequires: xmlto +BuildRequires: desktop-file-utils %description Fedora Core release file @@ -73,8 +74,8 @@ # about fedora stuff mkdir -p $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release install -m 644 release-notes/about-fedora.omf $RPM_BUILD_ROOT%{_datadir}/omf/fedora-release -mkdir -p $RPM_BUILD_ROOT%{datadir}/gnome/help/about-fedora -cp -r release-notes/about/* $RPM_BUILD_ROOT%{datadir}/gnome/help/about-fedora +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +install -m 644 release-notes/about-fedora.desktop $RPM_BUILD_ROOT%{_datadir}/applications/about-fedora.desktop %clean rm -rf $RPM_BUILD_ROOT @@ -93,10 +94,14 @@ fi %post -[ -x /usr/sbin/scrollkeeper-update ] && /usr/sbin/scrollkeeper-update +[ -x /usr/bin/scrollkeeper-update ] && /usr/bin/scrollkeeper-update +[ -x /usr/bin/update-desktop-database ] && /usr/bin/update-desktop-database +exit 0 %postun -[ -x /usr/sbin/scrollkeeper-update ] && /usr/sbin/scrollkeeper-update +[ -x /usr/bin/scrollkeeper-update ] && /usr/bin/scrollkeeper-update +[ -x /usr/bin/update-desktop-database ] && /usr/bin/update-desktop-database +exit 0 %files %defattr(-,root,root) @@ -117,4 +122,4 @@ %dir /etc/pki/rpm-gpg /etc/pki/rpm-gpg/* %{_datadir}/omf/fedora-release -%{_datadir}/gnome/help/about-fedora +%{_datadir}/applications/*.desktop From fedora-extras-commits at redhat.com Wed Mar 8 21:25:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 8 Mar 2006 16:25:15 -0500 Subject: rpms/perl-Image-Info/devel Image-Info-1.19-inc-Module-Install.pm.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 perl-Image-Info.spec, 1.9, 1.10 sources, 1.3, 1.4 Image-Info-1.16-XBM.pm.patch, 1.1, NONE Image-Info-1.16-XPM.pm.patch, 1.1, NONE Image-Info-1.16-string.t.patch, 1.1, NONE Message-ID: <200603082125.k28LPldq026298@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26267 Modified Files: .cvsignore perl-Image-Info.spec sources Added Files: Image-Info-1.19-inc-Module-Install.pm.patch Removed Files: Image-Info-1.16-XBM.pm.patch Image-Info-1.16-XPM.pm.patch Image-Info-1.16-string.t.patch Log Message: Update to 1.19. Dropped patches: Image-Info-1.16-string.t.patch (no longer needed) Image-Info-1.16-XBM.pm.patch (upstream) Image-Info-1.16-XPM.pm.patch (upstream) New patch: Image-Info-1.19-inc-Module-Install.pm.patch (Module::Install 0.58 is broken). Image-Info-1.19-inc-Module-Install.pm.patch: --- NEW FILE Image-Info-1.19-inc-Module-Install.pm.patch --- --- Image-Info-1.19-orig/inc/Module/Install.pm 2006-03-05 09:15:08.000000000 +0000 +++ Image-Info-1.19/inc/Module/Install.pm 2006-03-06 19:18:22.000000000 +0000 @@ -35,6 +35,8 @@ use File::Path (); use FindBin; + at inc::Module::Install::ISA = 'Module::Install'; + sub autoload { my $self = shift; my $who = $self->_caller; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Feb 2006 21:18:17 -0000 1.3 +++ .cvsignore 8 Mar 2006 21:25:14 -0000 1.4 @@ -1 +1 @@ -Image-Info-1.17.tar.gz +Image-Info-1.19.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Image-Info.spec 20 Feb 2006 21:32:43 -0000 1.9 +++ perl-Image-Info.spec 8 Mar 2006 21:25:14 -0000 1.10 @@ -1,21 +1,20 @@ %define rgbtxt %{_datadir}/X11/rgb.txt Name: perl-Image-Info -Version: 1.17 -Release: 2%{?dist} +Version: 1.19 +Release: 1%{?dist} Summary: Image meta information extraction module for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Image-Info/ Source0: http://www.cpan.org/authors/id/T/TE/TELS/image/Image-Info-%{version}.tar.gz -Patch0: Image-Info-1.16-string.t.patch -Patch1: Image-Info-1.16-XBM.pm.patch -Patch2: Image-Info-1.16-XPM.pm.patch +Patch0: Image-Info-1.19-inc-Module-Install.pm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl +BuildRequires: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: %{rgbtxt} Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -28,8 +27,6 @@ %prep %setup -q -n Image-Info-%{version} %patch0 -p1 -%patch1 -p1 -%patch2 -p1 chmod 644 Changes README exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -64,6 +61,16 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 1.19-1 +- Update to 1.19. +- Module::Install 0.58 is broken (Image-Info-1.19-inc-Module-Install.pm.patch). +- BR: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple). + +* Fri Mar 3 2006 Jose Pedro Oliveira - 1.18-1 +- Update to 1.18 (broken: cpan ticket #6558). +- Dropped patches Image-Info-1.16-X[BP]M.pm.patch (accepted upstream). +- Dropped patch Image-Info-1.16-string.t.patch (test has been rewritten). + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.17-2 - BR: perl(Test::Pod), perl(Test::Pod::Coverage). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 20 Feb 2006 21:18:17 -0000 1.3 +++ sources 8 Mar 2006 21:25:14 -0000 1.4 @@ -1 +1 @@ -1b8e4f952ce7dfaa6464b9e385548a89 Image-Info-1.17.tar.gz +5a63a7071b62d2420f822b85efde3395 Image-Info-1.19.tar.gz --- Image-Info-1.16-XBM.pm.patch DELETED --- --- Image-Info-1.16-XPM.pm.patch DELETED --- --- Image-Info-1.16-string.t.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 8 21:29:53 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Wed, 8 Mar 2006 16:29:53 -0500 Subject: fedora-release eula.txt, 1.1.1.1, 1.2 fedora-release.spec, 1.21, 1.22 EULA, 1.1.1.1, NONE Message-ID: <200603082129.k28LTrC4026339@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26316 Modified Files: eula.txt fedora-release.spec Removed Files: EULA Log Message: get the eula right Index: eula.txt =================================================================== RCS file: /cvs/fedora/fedora-release/eula.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- eula.txt 5 Apr 2005 18:35:02 -0000 1.1.1.1 +++ eula.txt 8 Mar 2006 21:29:45 -0000 1.2 @@ -1,5 +1,5 @@ LICENSE AGREEMENT - FEDORA(TM) CORE 4 + FEDORA(TM) CORE 5 This agreement governs the download, installation or use of the Software (as defined below) and any updates to the Software, @@ -90,7 +90,7 @@ United Nations Convention on the International Sale of Goods shall not apply. -Copyright (C) 2003, 2004, 2005 Fedora Project. All rights reserved. "Red Hat" -and "Fedora" are trademarks of Red Hat, Inc. "Linux" is a registered -trademark of Linus Torvalds. All other trademarks are the property of -their respective owners. +Copyright (C) 2003, 2004, 2005, 2006 Fedora Project. All rights reserved. +"Red Hat" and "Fedora" are trademarks of Red Hat, Inc. "Linux" is a +registered trademark of Linus Torvalds. All other trademarks are the +property of their respective owners. Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- fedora-release.spec 8 Mar 2006 21:21:38 -0000 1.21 +++ fedora-release.spec 8 Mar 2006 21:29:45 -0000 1.22 @@ -7,7 +7,7 @@ Summary: Fedora Core release file Name: fedora-release Version: %{real_release_version} -Release: 1 +Release: 2 License: GFDL Group: System Environment/Base Source: fedora-release-%{real_release_version}.tar.gz --- EULA DELETED --- From fedora-extras-commits at redhat.com Wed Mar 8 21:35:00 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 8 Mar 2006 16:35:00 -0500 Subject: rpms/bash-completion/FC-4 .cvsignore, 1.9, 1.10 bash-completion.spec, 1.12, 1.13 sources, 1.9, 1.10 bash-completion-20050721-bash31quoting.patch, 1.1, NONE bash-completion-20050721-cvs-stat.patch, 1.1, NONE bash-completion-20050721-mtr.patch, 1.1, NONE bash-completion.profile, 1.3, NONE Message-ID: <200603082135.k28LZWt9026479@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/bash-completion/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26458 Modified Files: .cvsignore bash-completion.spec sources Removed Files: bash-completion-20050721-bash31quoting.patch bash-completion-20050721-cvs-stat.patch bash-completion-20050721-mtr.patch bash-completion.profile Log Message: * Thu Mar 2 2006 Ville Skytt?? - 20060301-1 - 20060301, patches and profile.d scriptlet applied/included upstream. - Convert docs to UTF-8. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 22 Jul 2005 06:51:53 -0000 1.9 +++ .cvsignore 8 Mar 2006 21:34:56 -0000 1.10 @@ -1 +1 @@ -bash-completion-20050721.tar.bz2 +bash-completion-20060301.tar.bz2 Index: bash-completion.spec =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- bash-completion.spec 11 Feb 2006 09:57:44 -0000 1.12 +++ bash-completion.spec 8 Mar 2006 21:34:57 -0000 1.13 @@ -1,19 +1,15 @@ Name: bash-completion -Version: 20050721 -Release: 4%{?dist} +Version: 20060301 +Release: 1%{?dist} Summary: Programmable completion for Bash Group: System Environment/Shells License: GPL URL: http://www.caliban.org/bash/ Source0: http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2 -Source1: %{name}.profile Source2: %{name}-mock Source3: %{name}-repomanage Source4: %{name}-plague-client -Patch0: %{name}-20050721-cvs-stat.patch -Patch1: %{name}-20050721-bash31quoting.patch -Patch2: %{name}-20050721-mtr.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,9 +22,7 @@ %prep %setup -q -n bash_completion -%patch0 -%patch1 -p1 -%patch2 +f=Changelog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f install -pm 644 %{SOURCE2} contrib/mock install -pm 644 %{SOURCE3} contrib/plague-client install -pm 644 %{SOURCE3} contrib/repomanage @@ -41,8 +35,7 @@ rm -rf $RPM_BUILD_ROOT %{name}-ghosts.list install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -pm 644 bash_completion $RPM_BUILD_ROOT%{_sysconfdir} -install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/bash_completion.sh +install -pm 644 bash_completion.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name} install -pm 644 contrib/* $RPM_BUILD_ROOT%{_datadir}/%{name} install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d @@ -81,7 +74,6 @@ %bashcomp_trigger ruby-ri ri %bashcomp_trigger sbcl %bashcomp_trigger snownews -%bashcomp_trigger subversion %bashcomp_trigger unace %bashcomp_trigger unixODBC isql %bashcomp_trigger unrar @@ -98,6 +90,10 @@ %changelog +* Thu Mar 2 2006 Ville Skytt?? - 20060301-1 +- 20060301, patches and profile.d scriptlet applied/included upstream. +- Convert docs to UTF-8. + * Wed Feb 8 2006 Ville Skytt?? - 20050721-4 - Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod). - Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews. Index: sources =================================================================== RCS file: /cvs/extras/rpms/bash-completion/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 22 Jul 2005 06:51:53 -0000 1.9 +++ sources 8 Mar 2006 21:34:57 -0000 1.10 @@ -1 +1 @@ -4de9f0dee0663f08b5e24f64490e642e bash-completion-20050721.tar.bz2 +ed95a89f57357a42b8e4eb95487bf9d0 bash-completion-20060301.tar.bz2 --- bash-completion-20050721-bash31quoting.patch DELETED --- --- bash-completion-20050721-cvs-stat.patch DELETED --- --- bash-completion-20050721-mtr.patch DELETED --- --- bash-completion.profile DELETED --- From fedora-extras-commits at redhat.com Wed Mar 8 22:12:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Mar 2006 17:12:12 -0500 Subject: rpms/allegro/devel allegro-4.2.0-fullscreen.patch, NONE, 1.1 allegro-4.2.0-fullscreen2.patch, NONE, 1.1 allegro-4.2.0-mprotect.patch, NONE, 1.1 allegro.spec, 1.25, 1.26 Message-ID: <200603082212.k28MCi8G028569@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28540 Modified Files: allegro.spec Added Files: allegro-4.2.0-fullscreen.patch allegro-4.2.0-fullscreen2.patch allegro-4.2.0-mprotect.patch Log Message: * Wed Mar 8 2006 Hans de Goede 4.2.0-9 - fix fullscreen <-> window switching bug (bz 183645) - fix asm stretch code on i386 with NX processors, thanks to openBSD. allegro-4.2.0-fullscreen.patch: --- NEW FILE allegro-4.2.0-fullscreen.patch --- diff -ur allegro-4.2.0.orig/include/allegro/platform/aintunix.h allegro-4.2.0/include/allegro/platform/aintunix.h --- allegro-4.2.0.orig/include/allegro/platform/aintunix.h 2005-09-04 18:00:07.000000000 +0200 +++ allegro-4.2.0/include/allegro/platform/aintunix.h 2006-03-02 14:50:17.000000000 +0100 @@ -88,7 +88,11 @@ AL_FUNC(void, _xwin_handle_input, (void)); AL_FUNC(void, _xwin_private_handle_input, (void)); - + AL_FUNC(int , _xwin_keyboard_init, (void)); + AL_FUNC(void, _xwin_keyboard_exit, (void)); + + AL_VAR(int, _xwin_keyboard_installed); + #ifndef ALLEGRO_MULTITHREADED AL_VAR(int, _xwin_missed_input); Only in allegro-4.2.0/include/allegro/platform: aintunix.h~ diff -ur allegro-4.2.0.orig/include/xalleg.h allegro-4.2.0/include/xalleg.h --- allegro-4.2.0.orig/include/xalleg.h 2004-12-02 02:02:31.000000000 +0100 +++ allegro-4.2.0/include/xalleg.h 2006-03-02 14:42:58.000000000 +0100 @@ -126,6 +126,7 @@ int num_modes; int mode_switched; int override_redirected; + int window_used; #endif char window_title[1024]; Only in allegro-4.2.0/include: xalleg.h~ diff -ur allegro-4.2.0.orig/src/x/xkeyboard.c allegro-4.2.0/src/x/xkeyboard.c --- allegro-4.2.0.orig/src/x/xkeyboard.c 2005-11-05 17:06:53.000000000 +0100 +++ allegro-4.2.0/src/x/xkeyboard.c 2006-03-02 14:50:19.000000000 +0100 @@ -34,12 +34,12 @@ #define PREFIX_W "al-xkey WARNING: " #define PREFIX_E "al-xkey ERROR: " +int _xwin_keyboard_installed = 0; #ifdef ALLEGRO_USE_XIM static XIM xim = NULL; static XIC xic = NULL; #endif static XModifierKeymap *xmodmap = NULL; -static int xkeyboard_installed = 0; static int used[KEY_MAX]; static int sym_per_key; static int min_keycode, max_keycode; @@ -365,7 +365,7 @@ void _xwin_keyboard_handler(XKeyEvent *event, int dga2_hack) { int keycode; - if (!xkeyboard_installed) + if (!_xwin_keyboard_installed) return; if (_xwin_keyboard_callback) @@ -646,7 +646,7 @@ { XKeyboardControl values; - if (!xkeyboard_installed) + if (!_xwin_keyboard_installed) return; XLOCK(); @@ -668,10 +668,10 @@ -/* x_keyboard_init +/* _xwin_keyboard_init * Initialise the X11 keyboard driver. */ -static int x_keyboard_init(void) +int _xwin_keyboard_init(void) { #ifdef ALLEGRO_USE_XIM XIMStyles *xim_styles; @@ -680,7 +680,7 @@ int i; #endif - if (xkeyboard_installed) + if (_xwin_keyboard_installed) return 0; main_pid = getpid(); @@ -745,21 +745,21 @@ XUNLOCK (); - xkeyboard_installed = 1; + _xwin_keyboard_installed = 1; return 0; } -/* x_keyboard_exit +/* _xwin_keyboard_exit * Shut down the X11 keyboard driver. */ -static void x_keyboard_exit(void) +void _xwin_keyboard_exit(void) { - if (!xkeyboard_installed) + if (!_xwin_keyboard_installed) return; - xkeyboard_installed = 0; + _xwin_keyboard_installed = 0; XLOCK (); @@ -799,8 +799,8 @@ "X11 keyboard", "X11 keyboard", FALSE, - x_keyboard_init, - x_keyboard_exit, + _xwin_keyboard_init, + _xwin_keyboard_exit, NULL, // AL_METHOD(void, poll, (void)); x_set_leds, NULL, // AL_METHOD(void, set_rate, (int delay, int rate)); Only in allegro-4.2.0/src/x: xkeyboard.c~ diff -ur allegro-4.2.0.orig/src/x/xwin.c allegro-4.2.0/src/x/xwin.c --- allegro-4.2.0.orig/src/x/xwin.c 2005-10-27 23:23:40.000000000 +0200 +++ allegro-4.2.0/src/x/xwin.c 2006-03-02 14:48:00.000000000 +0100 @@ -130,6 +130,7 @@ 0, /* num_modes */ 0, /* mode_switched */ 0, /* override_redirected */ + 0, /* window_used */ #endif XWIN_DEFAULT_WINDOW_TITLE, /* window_title */ @@ -322,20 +323,13 @@ } } - - -/* _xwin_hide_x_mouse: - * Create invisible X cursor +/* _xwin_free_cursor: + * Helper for freeing the cursor which is done in a number of different places. */ -static void _xwin_hide_x_mouse(void) +static void _xwin_free_cursor(void) { - unsigned long gcmask; - XGCValues gcvalues; - Pixmap pixmap; - - XUndefineCursor(_xwin.display, _xwin.window); - if (_xwin.cursor != None) { + XUndefineCursor(_xwin.display, _xwin.window); XFreeCursor(_xwin.display, _xwin.cursor); _xwin.cursor = None; } @@ -346,7 +340,19 @@ _xwin.xcursor_image = None; } #endif +} +/* _xwin_hide_x_mouse: + * Create invisible X cursor + */ +static void _xwin_hide_x_mouse(void) +{ + unsigned long gcmask; + XGCValues gcvalues; + Pixmap pixmap; + + _xwin_free_cursor(); + pixmap = XCreatePixmap(_xwin.display, _xwin.window, 1, 1, 1); if (pixmap != None) { GC temp_gc; @@ -462,20 +468,7 @@ static void _xwin_private_destroy_window(void) { _xwin_private_destroy_screen(); - - if (_xwin.cursor != None) { - XUndefineCursor(_xwin.display, _xwin.window); - XFreeCursor(_xwin.display, _xwin.cursor); - _xwin.cursor = None; - } - -#ifdef ALLEGRO_XWINDOWS_WITH_XCURSOR - if (_xwin.xcursor_image != None) { - XcursorImageDestroy(_xwin.xcursor_image); - _xwin.xcursor_image = None; - } -#endif - + _xwin_free_cursor(); _xwin.visual = 0; if (_xwin.gc != None) { @@ -673,10 +666,6 @@ static BITMAP *_xwin_private_create_screen(GFX_DRIVER *drv, int w, int h, int vw, int vh, int depth, int fullscreen) { -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE - XSetWindowAttributes setattr; -#endif - if (_xwin.window == None) { ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("No window")); return 0; @@ -715,11 +704,50 @@ #ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE /* If we are going fullscreen, disable window decorations. */ if (fullscreen) { + XSetWindowAttributes setattr; + + /* HACK HACK HACK + We need to destroy the window if it has already been used once, + since doing fullscreen with a window wich has been mapped already + has issues. see: http:// mail not archived yet */ + if (_xwin.window_used) { + /* remember if the keyboard was installed */ + int keyb_installed = _xwin_keyboard_installed; + + /* remember the cursor and set the cursor to None so that the + remembered cursor does not get freed. */ + Cursor cursor = _xwin.cursor; +#ifdef ALLEGRO_XWINDOWS_WITH_XCURSOR + XcursorImage *xcursor_image = _xwin.xcursor_image; + _xwin.xcursor_image = None; +#endif + _xwin.cursor = None; + + /* close keyboard & window, then recreate both */ + _xwin_keyboard_exit(); + _xwin_private_destroy_window(); + if ((*_xwin_window_creator)()) { + ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Could not create window")); + return 0; + } + if (keyb_installed) + /* has a return value but can't fail */ + _xwin_keyboard_init(); + + /* Free the new cursor and put the old one back */ + _xwin_free_cursor(); + _xwin.cursor = cursor; +#ifdef ALLEGRO_XWINDOWS_WITH_XCURSOR + _xwin.xcursor_image = xcursor_image; +#endif + XDefineCursor(_xwin.display, _xwin.window, _xwin.cursor); + } setattr.override_redirect = True; XChangeWindowAttributes(_xwin.display, _xwin.window, CWOverrideRedirect, &setattr); _xwin.override_redirected = 1; } + _xwin.window_used = 1; #endif /* Set window size and save dimensions. */ Only in allegro-4.2.0/src/x: xwin.c~ allegro-4.2.0-fullscreen2.patch: --- NEW FILE allegro-4.2.0-fullscreen2.patch --- --- allegro-4.2.0/include/xalleg.h.fullscreen 2004-12-02 02:02:31.000000000 +0100 +++ allegro-4.2.0/include/xalleg.h 2006-03-03 23:10:18.000000000 +0100 @@ -124,8 +124,8 @@ #ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE XF86VidModeModeInfo **modesinfo; int num_modes; - int mode_switched; - int override_redirected; + int mode_switched; /* only kept around and set for ABI compat */ + int override_redirected; /* no longer used, kept for ABI compat */ #endif char window_title[1024]; @@ -139,6 +139,18 @@ #endif void (*close_button_callback)(void); + + /* These are at the end of the struct to maintain abi compat with + allegro-4.2.0 (if and only if compiled with the same configuration). + Notice that IMHO apps really shouldnot be using _xwin, but we export it, + so its fair game. */ +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + XF86VidModeModeInfo *orig_modeinfo; +#endif + /* Seperate fullscreen and managed window id's, see + _xwin_private_create_window in src/x/xwin.c for more details. */ + Window fs_window; + Window wm_window; } _xwin; --- allegro-4.2.0/src/x/xwin.c.fullscreen 2005-10-27 23:23:40.000000000 +0200 +++ allegro-4.2.0/src/x/xwin.c 2006-03-03 23:52:22.000000000 +0100 @@ -142,7 +142,12 @@ NULL, /* mutex */ #endif - NULL /* window close hook */ + NULL, /* window close hook */ +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + 0, /* orig_modeinfo */ +#endif + None, /* fs_window */ + None /* wm_window */ }; void *allegro_icon = alex_xpm; @@ -199,7 +204,6 @@ static void _xwin_private_set_palette_range(AL_CONST PALETTE p, int from, int to); static void _xwin_private_set_window_defaults(void); static void _xwin_private_flush_buffers(void); -static void _xwin_private_resize_window(int w, int h); static void _xwin_private_process_event(XEvent *event); static void _xwin_private_set_warped_mouse_mode(int permanent); static void _xwin_private_redraw_window(int x, int y, int w, int h); @@ -261,7 +265,8 @@ static void _xwin_private_slow_palette_32(int sx, int sy, int sw, int sh); #ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE -static int _xvidmode_private_set_fullscreen(int w, int h); +static void _xvidmode_private_set_fullscreen(int w, int h, int *vidmode_width, + int *vidmode_height); static void _xvidmode_private_unset_fullscreen(void); #endif @@ -372,10 +377,31 @@ } } - +/* _xwin_wait_mapped: + * wait for a window to become mapped. (shamelessly borrowed from SDL) + */ +static void _xwin_wait_mapped(Window win) +{ + XEvent event; + do { + XMaskEvent(_xwin.display, StructureNotifyMask, &event); + } while ( (event.type != MapNotify) || (event.xmap.event != win) ); +} /* _xwin_create_window: - * Wrapper for XCreateWindow. + * We use 3 windows: + * -fs_window (for fullscreen) + * -wm_window (window managed) + * -window (the real window) + * 2 of which will be created here: wm_window and window. The fullscreen + * window gets (re)created when needed, because reusing it causes trouble see: + * http://sourceforge.net/tracker/index.php?func=detail&aid=1441740&group_id=5665&atid=105665 + * The real window uses wm_window as parent initially and will be reparened to + * the (freshly created) fullscreen window when requested and reparented + * back again in screen_destroy. + * + * Idea / concept of 3 windows borrowed from SDL. But somehow SDL manages + * to reuse the fullscreen window too. */ static int _xwin_private_create_window(void) { @@ -389,21 +415,23 @@ _mouse_on = FALSE; - /* Create window. */ + /* Create the managed window. */ + setattr.background_pixel = XBlackPixel(_xwin.display, _xwin.screen); setattr.border_pixel = XBlackPixel(_xwin.display, _xwin.screen); - setattr.event_mask = (KeyPressMask | KeyReleaseMask + setattr.event_mask = (KeyPressMask | KeyReleaseMask | StructureNotifyMask | EnterWindowMask | LeaveWindowMask | FocusChangeMask | ExposureMask | PropertyChangeMask | ButtonPressMask | ButtonReleaseMask | PointerMotionMask /*| MappingNotifyMask (SubstructureRedirectMask?)*/); - _xwin.window = XCreateWindow(_xwin.display, XDefaultRootWindow(_xwin.display), + _xwin.wm_window = XCreateWindow(_xwin.display, + XDefaultRootWindow(_xwin.display), 0, 0, 320, 200, 0, CopyFromParent, InputOutput, CopyFromParent, - CWBorderPixel | CWEventMask, &setattr); - + CWBackPixel | CWBorderPixel | CWEventMask, + &setattr); /* Get associated visual and window depth (bits per pixel). */ - XGetWindowAttributes(_xwin.display, _xwin.window, &getattr); + XGetWindowAttributes(_xwin.display, _xwin.wm_window, &getattr); _xwin.visual = getattr.visual; _xwin.window_depth = getattr.depth; @@ -411,15 +439,27 @@ if ((_xwin.visual->class == PseudoColor) || (_xwin.visual->class == GrayScale) || (_xwin.visual->class == DirectColor)) - _xwin.colormap = XCreateColormap(_xwin.display, _xwin.window, _xwin.visual, AllocAll); + _xwin.colormap = XCreateColormap(_xwin.display, _xwin.wm_window, _xwin.visual, AllocAll); else - _xwin.colormap = XCreateColormap(_xwin.display, _xwin.window, _xwin.visual, AllocNone); - XSetWindowColormap(_xwin.display, _xwin.window, _xwin.colormap); + _xwin.colormap = XCreateColormap(_xwin.display, _xwin.wm_window, _xwin.visual, AllocNone); + XSetWindowColormap(_xwin.display, _xwin.wm_window, _xwin.colormap); XInstallColormap(_xwin.display, _xwin.colormap); + + /* Create the real / drawing window (reuses setattr). */ + setattr.colormap = _xwin.colormap; + _xwin.window = XCreateWindow(_xwin.display, + _xwin.wm_window, + 0, 0, 320, 200, 0, + CopyFromParent, InputOutput, CopyFromParent, + CWBackPixel | CWBorderPixel | CWEventMask | + CWColormap, &setattr); + /* Map the real / drawing window it won't appear untill the parent does */ + XMapWindow(_xwin.display, _xwin.window); + /* Set WM_DELETE_WINDOW atom in WM_PROTOCOLS property (to get window_delete requests). */ wm_delete_window = XInternAtom (_xwin.display, "WM_DELETE_WINDOW", False); - XSetWMProtocols (_xwin.display, _xwin.window, &wm_delete_window, 1); + XSetWMProtocols (_xwin.display, _xwin.wm_window, &wm_delete_window, 1); /* Set default window parameters. */ (*_xwin_window_defaultor)(); @@ -494,6 +534,11 @@ XDestroyWindow(_xwin.display, _xwin.window); _xwin.window = None; } + + if (_xwin.wm_window != None) { + XDestroyWindow(_xwin.display, _xwin.wm_window); + _xwin.wm_window = None; + } } void _xwin_destroy_window(void) @@ -673,10 +718,6 @@ static BITMAP *_xwin_private_create_screen(GFX_DRIVER *drv, int w, int h, int vw, int vh, int depth, int fullscreen) { -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE - XSetWindowAttributes setattr; -#endif - if (_xwin.window == None) { ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("No window")); return 0; @@ -711,55 +752,48 @@ ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Unsupported color depth")); return 0; } - -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE - /* If we are going fullscreen, disable window decorations. */ - if (fullscreen) { - setattr.override_redirect = True; - XChangeWindowAttributes(_xwin.display, _xwin.window, - CWOverrideRedirect, &setattr); - _xwin.override_redirected = 1; - } -#endif - - /* Set window size and save dimensions. */ - _xwin_private_resize_window(w, h); + + /* Save dimensions. */ + _xwin.window_width = w; + _xwin.window_height = h; _xwin.screen_width = w; _xwin.screen_height = h; _xwin.screen_depth = depth; _xwin.virtual_width = vw; _xwin.virtual_height = vh; -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE - if (fullscreen) { - AL_CONST char *fc; - char tmp1[64], tmp2[128]; - int i; - - /* Switch video mode. */ - if (!_xvidmode_private_set_fullscreen(w, h)) { - ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("Can not set video mode")); - return 0; - } + /* Resize the (real) window */ + XResizeWindow(_xwin.display, _xwin.window, w, h); - /* Hack: make the window fully visible and center cursor. */ - XMoveWindow(_xwin.display, _xwin.window, 0, 0); - XF86VidModeSetViewPort(_xwin.display, _xwin.screen, 0, 0); - - /* This chunk is disabled by default because of problems on KDE desktops. */ - fc = get_config_string(uconvert_ascii("graphics", tmp1), - uconvert_ascii("force_centering", tmp2), - NULL); - - if ((fc) && ((i = ugetc(fc)) != 0) && ((i == 'y') || (i == 'Y') || (i == '1'))) { - XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, 0, 0); - XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, w - 1, 0); - XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, 0, h - 1); - XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, w - 1, h - 1); - } + if (fullscreen) { + XSetWindowAttributes setattr; + /* local width and height vars used for fullscreen window size and for + storing the video_mode size which is then used to center the window */ + int fs_width = DisplayWidth(_xwin.display, _xwin.screen); + int fs_height = DisplayHeight(_xwin.display, _xwin.screen); - XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, w / 2, h / 2); - XSync(_xwin.display, False); + /* Create the fullscreen window */ + setattr.override_redirect = True; + setattr.background_pixel = XBlackPixel(_xwin.display, _xwin.screen); + setattr.border_pixel = XBlackPixel(_xwin.display, _xwin.screen); + setattr.event_mask = StructureNotifyMask; + setattr.colormap = _xwin.colormap; + _xwin.fs_window = XCreateWindow(_xwin.display, + XDefaultRootWindow(_xwin.display), + 0, 0, fs_width, fs_height, 0, + CopyFromParent, InputOutput, + CopyFromParent, CWOverrideRedirect | + CWBackPixel | CWColormap | CWBorderPixel | + CWEventMask, &setattr); + + /* Map the fullscreen window */ + XMapRaised(_xwin.display, _xwin.fs_window); + _xwin_wait_mapped(_xwin.fs_window); + /* Make sure we got to the top of the window stack */ + XRaiseWindow(_xwin.display, _xwin.fs_window); + + /* Reparent the real window */ + XReparentWindow(_xwin.display, _xwin.window, _xwin.fs_window, 0, 0); /* Grab the keyboard and mouse. */ if (XGrabKeyboard(_xwin.display, XDefaultRootWindow(_xwin.display), False, @@ -775,8 +809,45 @@ return 0; } _xwin.mouse_grabbed = 1; - } + +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + /* Try to switch video mode. This must be done after the pointer is + grabbed, because otherwise it can be outside the window negating the + XF86VidModeSetViewPort done in set_fullscreen. This makes the old + center the window hack unnescesarry. Notice that since the XF86VM + extension requests do not go through the regular X output buffer? We + need to make sure that all above requests are processed first. */ + XSync(_xwin.display, False); + _xvidmode_private_set_fullscreen(w, h, &fs_width, &fs_height); #endif + + /* Center the window (if nescesarry) */ + if ((fs_width != w) || (fs_height != h)) + XMoveWindow(_xwin.display, _xwin.window, (fs_width - w) / 2, + (fs_height - h) / 2); + + /* Last: center the cursor */ + XWarpPointer(_xwin.display, None, _xwin.window, 0, 0, 0, 0, w / 2, h / 2); + } else { + XSizeHints *hints = XAllocSizeHints();; + + /* Resize managed window. */ + XResizeWindow(_xwin.display, _xwin.wm_window, w, h); + + /* Set size and position hints for Window Manager. */ + if (hints) { + hints->flags = PMinSize | PMaxSize | PBaseSize; + hints->min_width = hints->max_width = hints->base_width = w; + hints->min_height = hints->max_height = hints->base_height = h; + XSetWMNormalHints(_xwin.display, _xwin.wm_window, hints); + + XFree(hints); + } + + /* Map the window managed window */ + XMapWindow(_xwin.display, _xwin.wm_window); + _xwin_wait_mapped(_xwin.wm_window); + } /* Create XImage with the size of virtual screen. */ if (_xwin_private_create_ximage(vw, vh) != 0) { @@ -804,12 +875,6 @@ bmp = _xwin_private_create_screen(drv, w, h, vw, vh, depth, fullscreen); if (bmp == 0) { _xwin_private_destroy_screen(); - /* Work around a weird bug with some window managers (KWin, Window Maker). */ - if (fullscreen) { - bmp = _xwin_private_create_screen(drv, w, h, vw, vh, depth, fullscreen); - if (bmp == 0) - _xwin_private_destroy_screen(); - } } XUNLOCK(); return bmp; @@ -843,7 +908,6 @@ _xwin_private_destroy_ximage(); -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE if (_xwin.mouse_grabbed) { XUngrabPointer(_xwin.display, CurrentTime); _xwin.mouse_grabbed = 0; @@ -854,14 +918,8 @@ _xwin.keyboard_grabbed = 0; } +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE _xvidmode_private_unset_fullscreen(); - - if (_xwin.override_redirected) { - setattr.override_redirect = False; - XChangeWindowAttributes(_xwin.display, _xwin.window, - CWOverrideRedirect, &setattr); - _xwin.override_redirected = 0; - } #endif /* whack color-conversion blitter */ @@ -869,8 +927,16 @@ _release_colorconv_blitter(blitter_func); blitter_func = NULL; } - - XUnmapWindow (_xwin.display, _xwin.window); + + if (_xwin.fs_window != None) { + /* Reparent the real window! */ + XReparentWindow(_xwin.display, _xwin.window, _xwin.wm_window, 0, 0); + XUnmapWindow(_xwin.display, _xwin.fs_window); + XDestroyWindow(_xwin.display, _xwin.fs_window); + _xwin.fs_window = None; + } + else + XUnmapWindow (_xwin.display, _xwin.wm_window); (*_xwin_window_defaultor)(); } @@ -2139,31 +2205,31 @@ XpmAttributes attributes; #endif - if (_xwin.window == None) + if (_xwin.wm_window == None) return; /* Set window title. */ - XStoreName(_xwin.display, _xwin.window, _xwin.window_title); + XStoreName(_xwin.display, _xwin.wm_window, _xwin.window_title); /* Set hints. */ hint.res_name = _xwin.application_name; hint.res_class = _xwin.application_class; - XSetClassHint(_xwin.display, _xwin.window, &hint); + XSetClassHint(_xwin.display, _xwin.wm_window, &hint); wm_hints.flags = InputHint | StateHint | WindowGroupHint; wm_hints.input = True; wm_hints.initial_state = NormalState; - wm_hints.window_group = _xwin.window; + wm_hints.window_group = _xwin.wm_window; #ifdef ALLEGRO_XWINDOWS_WITH_XPM if (allegro_icon) { wm_hints.flags |= IconPixmapHint | IconMaskHint; attributes.valuemask = XpmReturnAllocPixels | XpmReturnExtensions; - XpmCreatePixmapFromData(_xwin.display,_xwin.window,allegro_icon,&wm_hints.icon_pixmap,&wm_hints.icon_mask, &attributes); + XpmCreatePixmapFromData(_xwin.display,_xwin.wm_window,allegro_icon,&wm_hints.icon_pixmap,&wm_hints.icon_mask, &attributes); } #endif - XSetWMHints(_xwin.display, _xwin.window, &wm_hints); + XSetWMHints(_xwin.display, _xwin.wm_window, &wm_hints); } @@ -2213,41 +2279,6 @@ } - -/* _xwin_resize_window: - * Wrapper for XResizeWindow. - */ -static void _xwin_private_resize_window(int w, int h) -{ - XSizeHints *hints; - - if (_xwin.window == None) - return; - - /* New window size. */ - _xwin.window_width = w; - _xwin.window_height = h; - - /* Resize window. */ - XUnmapWindow(_xwin.display, _xwin.window); - XResizeWindow(_xwin.display, _xwin.window, w, h); - XMapWindow(_xwin.display, _xwin.window); - - hints = XAllocSizeHints(); - if (hints == 0) - return; - - /* Set size and position hints for Window Manager. */ - hints->flags = PMinSize | PMaxSize | PBaseSize; - hints->min_width = hints->max_width = hints->base_width = w; - hints->min_height = hints->max_height = hints->base_height = h; - XSetWMNormalHints(_xwin.display, _xwin.window, hints); - - XFree(hints); -} - - - /* _xwin_process_event: * Process one event. */ @@ -2723,51 +2754,93 @@ * Support for XF86VidMode extension. */ #ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE +/* qsort comparison function for sorting the modes */ +static int cmpmodes(const void *va, const void *vb) +{ + const XF86VidModeModeInfo *a = *(const XF86VidModeModeInfo **)va; + const XF86VidModeModeInfo *b = *(const XF86VidModeModeInfo **)vb; + if ( a->hdisplay == b->hdisplay ) + return b->vdisplay - a->vdisplay; + else + return b->hdisplay - a->hdisplay; +} + /* _xvidmode_private_set_fullscreen: - * Attempt to switch video mode and make window fullscreen. + * Attempt to switch to a better matching video mode. + * Matching code for non exact match (smallest bigger res) rather shamelessly + * taken from SDL. */ -static int _xvidmode_private_set_fullscreen(int w, int h) +static void _xvidmode_private_set_fullscreen(int w, int h, int *vidmode_width, + int *vidmode_height) { int vid_event_base, vid_error_base; int vid_major_version, vid_minor_version; - XF86VidModeModeInfo *mode; int i; - + /* Test that display is local. */ - if (!_xwin_private_display_is_local()) { - ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("VidMode extension requires local display")); - return 0; - } + if (!_xwin_private_display_is_local()) + return; /* Test for presence of VidMode extension. */ if (!XF86VidModeQueryExtension(_xwin.display, &vid_event_base, &vid_error_base) - || !XF86VidModeQueryVersion(_xwin.display, &vid_major_version, &vid_minor_version)) { - ustrzcpy(allegro_error, ALLEGRO_ERROR_SIZE, get_config_text("VidMode extension is not supported")); - return 0; - } + || !XF86VidModeQueryVersion(_xwin.display, &vid_major_version, &vid_minor_version)) + return; /* Get list of modelines. */ if (!XF86VidModeGetAllModeLines(_xwin.display, _xwin.screen, &_xwin.num_modes, &_xwin.modesinfo)) - return 0; - - /* Search for a matching video mode. */ - for (i = 0; i < _xwin.num_modes; i++) { - mode = _xwin.modesinfo[i]; - if ((mode->hdisplay == w) && (mode->vdisplay == h)) { - /* Switch video mode. */ - if (!XF86VidModeSwitchToMode(_xwin.display, _xwin.screen, mode)) - return 0; + return; - /* Lock mode switching. */ - XF86VidModeLockModeSwitch(_xwin.display, _xwin.screen, True); + /* Remember the mode to restore */ + _xwin.orig_modeinfo = _xwin.modesinfo[0]; - _xwin.mode_switched = 1; - return 1; - } + /* Search for an exact matching video mode. */ + for (i = 0; i < _xwin.num_modes; i++) { + if ((_xwin.modesinfo[i]->hdisplay == w) && + (_xwin.modesinfo[i]->vdisplay == h)) + break; } - return 0; + /* Search for a non exact match (smallest bigger res). */ + if (i == _xwin.num_modes) { + int best_width = 0, best_height = 0; + qsort(_xwin.modesinfo, _xwin.num_modes, sizeof(void *), cmpmodes); + for (i = _xwin.num_modes-1; i > 0; i--) { + if ( ! best_width ) { + if ( (_xwin.modesinfo[i]->hdisplay >= w) && + (_xwin.modesinfo[i]->vdisplay >= h) ) { + best_width = _xwin.modesinfo[i]->hdisplay; + best_height = _xwin.modesinfo[i]->vdisplay; + } + } else { + if ( (_xwin.modesinfo[i]->hdisplay != best_width) || + (_xwin.modesinfo[i]->vdisplay != best_height) ) { + i++; + break; + } + } + } + } + + /* Switch video mode. */ + if ((_xwin.modesinfo[i] == _xwin.orig_modeinfo) || + !XF86VidModeSwitchToMode(_xwin.display, _xwin.screen, + _xwin.modesinfo[i])) { + *vidmode_width = _xwin.orig_modeinfo->hdisplay; + *vidmode_height = _xwin.orig_modeinfo->vdisplay; + _xwin.orig_modeinfo = NULL; + } else { + *vidmode_width = _xwin.modesinfo[i]->hdisplay; + *vidmode_height = _xwin.modesinfo[i]->vdisplay; + /* only kept / set for compatibility with apps which check this */ + _xwin.mode_switched = 1; + } + + /* Lock mode switching. */ + XF86VidModeLockModeSwitch(_xwin.display, _xwin.screen, True); + + /* Set viewport. */ + XF86VidModeSetViewPort(_xwin.display, _xwin.screen, 0, 0); } @@ -2793,13 +2866,15 @@ static void _xvidmode_private_unset_fullscreen(void) { if (_xwin.num_modes > 0) { - if (_xwin.mode_switched) { - /* Unlock mode switching. */ - XF86VidModeLockModeSwitch(_xwin.display, _xwin.screen, False); + /* Unlock mode switching. */ + XF86VidModeLockModeSwitch(_xwin.display, _xwin.screen, False); + if (_xwin.orig_modeinfo) { /* Restore the original video mode. */ - XF86VidModeSwitchToMode(_xwin.display, _xwin.screen, _xwin.modesinfo[0]); - + XF86VidModeSwitchToMode(_xwin.display, _xwin.screen, + _xwin.orig_modeinfo); + _xwin.orig_modeinfo = 0; + /* only kept / set for compatibility with apps which check this */ _xwin.mode_switched = 0; } @@ -2809,36 +2884,35 @@ _xwin.modesinfo = 0; } } +#endif -/* _xvidmode_private_fetch_mode_list: +/* _xwin_private_fetch_mode_list: * Generates a list of valid video modes. */ -static GFX_MODE_LIST *_xvidmode_private_fetch_mode_list(void) +static GFX_MODE_LIST *_xwin_private_fetch_mode_list(void) { + int num_modes = 1, num_bpp = 0; + GFX_MODE_LIST *mode_list; + int i, j; +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + int has_vidmode = 0; int vid_event_base, vid_error_base; int vid_major_version, vid_minor_version; XF86VidModeModeInfo **modesinfo; - int num_modes, num_bpp; - GFX_MODE_LIST *mode_list; - int i, j; - - /* Test that display is local. */ - if (!_xwin_private_display_is_local()) - return 0; - - /* Test for presence of VidMode extension. */ - if (!XF86VidModeQueryExtension(_xwin.display, &vid_event_base, &vid_error_base) - || !XF86VidModeQueryVersion(_xwin.display, &vid_major_version, &vid_minor_version)) - return 0; - - /* Get list of modelines. */ - if (!XF86VidModeGetAllModeLines(_xwin.display, _xwin.screen, &num_modes, &modesinfo)) - return 0; + + /* Test that display is local. */ + if ( _xwin_private_display_is_local() && + /* Test for presence of VidMode extension. */ + XF86VidModeQueryExtension(_xwin.display, &vid_event_base, &vid_error_base) && + XF86VidModeQueryVersion(_xwin.display, &vid_major_version, &vid_minor_version) && + /* Get list of modelines. */ + XF86VidModeGetAllModeLines(_xwin.display, _xwin.screen, &num_modes, &modesinfo)) + has_vidmode = 1; +#endif /* Calculate the number of color depths we have to support. */ - num_bpp = 0; #ifdef ALLEGRO_COLOR8 num_bpp++; #endif @@ -2857,25 +2931,48 @@ /* Allocate space for mode list. */ mode_list = malloc(sizeof(GFX_MODE_LIST)); if (!mode_list) { - free_modelines(modesinfo, num_modes); +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + if (has_vidmode) + free_modelines(modesinfo, num_modes); +#endif return 0; } mode_list->mode = malloc(sizeof(GFX_MODE) * ((num_modes * num_bpp) + 1)); if (!mode_list->mode) { free(mode_list); - free_modelines(modesinfo, num_modes); +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + if (has_vidmode) + free_modelines(modesinfo, num_modes); +#endif return 0; } /* Fill in mode list. */ j = 0; for (i = 0; i < num_modes; i++) { -#define ADD_MODE(BPP) \ + +#define ADD_SCREEN_MODE(BPP) \ + mode_list->mode[j].width = DisplayWidth(_xwin.display, _xwin.screen); \ + mode_list->mode[j].height = DisplayHeight(_xwin.display, _xwin.screen); \ + mode_list->mode[j].bpp = BPP; \ + j++ +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE +#define ADD_VIDMODE_MODE(BPP) \ mode_list->mode[j].width = modesinfo[i]->hdisplay; \ mode_list->mode[j].height = modesinfo[i]->vdisplay; \ mode_list->mode[j].bpp = BPP; \ j++ +#define ADD_MODE(BPP) \ + if (has_vidmode) { \ + ADD_VIDMODE_MODE(BPP); \ + } else { \ + ADD_SCREEN_MODE(BPP); \ + } +#else +#define ADD_MODE(BPP) ADD_SCREEN_MODE(BPP) +#endif + #ifdef ALLEGRO_COLOR8 ADD_MODE(8); #endif @@ -2896,11 +2993,13 @@ mode_list->mode[j].bpp = 0; mode_list->num_modes = j; - free_modelines(modesinfo, num_modes); +#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE + if (has_vidmode) + free_modelines(modesinfo, num_modes); +#endif return mode_list; } -#endif @@ -2909,15 +3008,11 @@ */ GFX_MODE_LIST *_xwin_fetch_mode_list(void) { -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE GFX_MODE_LIST *list; XLOCK(); - list = _xvidmode_private_fetch_mode_list(); + list = _xwin_private_fetch_mode_list(); XUNLOCK(); return list; -#else - return 0; -#endif } --- allegro-4.2.0/src/x/xgfxdrv.c~ 2006-03-08 22:47:27.000000000 +0100 +++ allegro-4.2.0/src/x/xgfxdrv.c 2006-03-08 22:47:27.000000000 +0100 @@ -61,7 +61,6 @@ -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE static BITMAP *_xwin_fullscreen_gfxdrv_init(int w, int h, int vw, int vh, int color_depth); @@ -98,7 +97,6 @@ 0, FALSE }; -#endif @@ -109,9 +107,7 @@ { GFX_XDGA2, &gfx_xdga2, FALSE }, { GFX_XDGA2_SOFT, &gfx_xdga2_soft, FALSE }, #endif -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE { GFX_XWINDOWS_FULLSCREEN, &gfx_xwin_fullscreen, TRUE }, -#endif { GFX_XWINDOWS, &gfx_xwin, TRUE }, { 0, NULL, 0 } }; @@ -138,7 +134,6 @@ -#ifdef ALLEGRO_XWINDOWS_WITH_XF86VIDMODE /* _xwin_fullscreen_gfxdrv_init: * Creates screen bitmap (with video mode extension). */ @@ -146,4 +141,3 @@ { return _xwin_create_screen(&gfx_xwin_fullscreen, w, h, vw, vh, color_depth, TRUE); } -#endif allegro-4.2.0-mprotect.patch: --- NEW FILE allegro-4.2.0-mprotect.patch --- --- allegro-4.2.0/tools/grabber.c.mprotect 2005-09-04 18:00:18.000000000 +0200 +++ allegro-4.2.0/tools/grabber.c 2006-03-08 23:13:39.000000000 +0100 @@ -3121,6 +3121,7 @@ case OSTYPE_SUNOS: s = "SunOS/Solaris"; break; case OSTYPE_FREEBSD: s = "FreeBSD"; break; case OSTYPE_NETBSD: s = "NetBSD"; break; + case OSTYPE_OPENBSD: s = "OpenBSD"; break; case OSTYPE_IRIX: s = "IRIX"; break; case OSTYPE_DARWIN: s = "Darwin"; break; case OSTYPE_QNX: s = "QNX"; break; --- allegro-4.2.0/include/allegro/platform/alunixac.hin.mprotect 2005-10-30 21:23:33.000000000 +0100 +++ allegro-4.2.0/include/allegro/platform/alunixac.hin 2006-03-08 23:13:39.000000000 +0100 @@ -169,6 +169,9 @@ /* Define to 1 if you have the `mmap' function. */ #undef HAVE_MMAP +/* Define to 1 if you have the `mprotect' function. */ +#undef HAVE_MPROTECT + /* Define to 1 if you have the header file, and it defines `DIR'. */ #undef HAVE_NDIR_H --- allegro-4.2.0/include/allegro/system.h.mprotect 2005-03-15 21:32:43.000000000 +0100 +++ allegro-4.2.0/include/allegro/system.h 2006-03-08 23:13:39.000000000 +0100 @@ -53,6 +53,7 @@ #define OSTYPE_SUNOS AL_ID('S','U','N',' ') #define OSTYPE_FREEBSD AL_ID('F','B','S','D') #define OSTYPE_NETBSD AL_ID('N','B','S','D') +#define OSTYPE_OPENBSD AL_ID('O','B','S','D') #define OSTYPE_IRIX AL_ID('I','R','I','X') #define OSTYPE_DARWIN AL_ID('D','A','R','W') #define OSTYPE_QNX AL_ID('Q','N','X',' ') --- allegro-4.2.0/configure.mprotect 2005-11-06 10:54:00.000000000 +0100 +++ allegro-4.2.0/configure 2006-03-08 23:13:39.000000000 +0100 @@ -11225,7 +11225,7 @@ -for ac_func in mmap memcmp mkstemp stricmp strlwr strupr vprintf +for ac_func in mmap mprotect memcmp mkstemp stricmp strlwr strupr vprintf do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 --- allegro-4.2.0/configure.in.mprotect 2005-08-07 23:50:49.000000000 +0200 +++ allegro-4.2.0/configure.in 2006-03-08 23:13:39.000000000 +0100 @@ -713,7 +713,7 @@ AC_STRUCT_TM AC_TYPE_SIGNAL -AC_CHECK_FUNCS(mmap memcmp mkstemp stricmp strlwr strupr vprintf) +AC_CHECK_FUNCS(mmap mprotect memcmp mkstemp stricmp strlwr strupr vprintf) dnl Tweak header files for library build CFLAGS="$CFLAGS -DALLEGRO_LIB_BUILD" --- allegro-4.2.0/src/unix/usystem.c.mprotect 2005-09-04 18:00:17.000000000 +0200 +++ allegro-4.2.0/src/unix/usystem.c 2006-03-08 23:13:39.000000000 +0100 @@ -196,6 +196,9 @@ else if (!strcmp(utsn.sysname, "NetBSD")) { os_type = OSTYPE_NETBSD; } + else if (!strcmp(utsn.sysname, "OpenBSD")) { + os_type = OSTYPE_OPENBSD; + } else if ((!strcmp(utsn.sysname, "IRIX")) || (!strcmp(utsn.sysname, "IRIX64"))) { os_type = OSTYPE_IRIX; --- allegro-4.2.0/src/unix/uesd.c.mprotect 2005-03-12 08:54:27.000000000 +0100 +++ allegro-4.2.0/src/unix/uesd.c 2006-03-08 23:13:39.000000000 +0100 @@ -27,6 +27,7 @@ #include #include +#include /* FD_ZERO() needs this */ #include #include --- allegro-4.2.0/src/i386/istretch.c.mprotect 2005-03-15 19:02:22.000000000 +0100 +++ allegro-4.2.0/src/i386/istretch.c 2006-03-08 23:14:52.000000000 +0100 @@ -30,6 +30,10 @@ #include "winalleg.h" /* For VirtualProtect */ #endif /* ifdef ALLEGRO_WINDOWS */ +#ifdef HAVE_MPROTECT + #include + #include +#endif /* helper macro for generating stretchers in each color depth */ @@ -435,7 +439,9 @@ #ifdef ALLEGRO_WINDOWS /* Play nice with Windows executable memory protection */ VirtualProtect(_scratch_mem, _scratch_mem_size, PAGE_EXECUTE_READWRITE, &old_protect); - #endif /* ifdef ALLEGRO_WINDOWS */ + #elif defined(HAVE_MPROTECT) + mprotect(_scratch_mem, _scratch_mem_size, PROT_EXEC|PROT_READ|PROT_WRITE); + #endif /* call the stretcher */ _do_stretch(source, dest, _scratch_mem, sx>>16, sy, syd, Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- allegro.spec 27 Feb 2006 09:58:51 -0000 1.25 +++ allegro.spec 8 Mar 2006 22:12:12 -0000 1.26 @@ -18,6 +18,8 @@ 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 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 @@ -128,6 +130,9 @@ %patch4 -p1 -z .digmid %patch5 -p1 -z .alsa-big-endian %patch6 -p1 -z .64bit +%patch7 -p1 -z .fullscreen +%patch8 -p1 -z .mprotect + %build %configure \ @@ -214,6 +219,10 @@ %changelog +* Wed Mar 8 2006 Hans de Goede 4.2.0-9 +- fix fullscreen <-> window switching bug (bz 183645) +- fix asm stretch code on i386 with NX processors, thanks to openBSD. + * Mon Feb 27 2006 Hans de Goede 4.2.0-8 - fix sound not working on PPC (bz 183112) - fix allegro not finding and loading plugins/modules on x86_64 (bz 183113) From fedora-extras-commits at redhat.com Wed Mar 8 22:15:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 8 Mar 2006 17:15:12 -0500 Subject: rpms/allegro/devel allegro.spec,1.26,1.27 Message-ID: <200603082215.k28MFicY028657@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28633 Modified Files: allegro.spec Log Message: oops forgot to raise release Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- allegro.spec 8 Mar 2006 22:12:12 -0000 1.26 +++ allegro.spec 8 Mar 2006 22:15:11 -0000 1.27 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 8 +Release: 9 Summary: A game programming library Summary(es): Una libreria de programacion de juegos From fedora-extras-commits at redhat.com Wed Mar 8 22:18:33 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:18:33 -0500 Subject: rpms/ftnchek - New directory Message-ID: <200603082218.k28MIZUW028775@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28757/ftnchek Log Message: Directory /cvs/extras/rpms/ftnchek added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:18:39 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:18:39 -0500 Subject: rpms/ftnchek/devel - New directory Message-ID: <200603082218.k28MIfkG028856@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28757/ftnchek/devel Log Message: Directory /cvs/extras/rpms/ftnchek/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:19:00 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:19:00 -0500 Subject: rpms/ftnchek Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603082219.k28MJ29F028890@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28878 Added Files: Makefile import.log Log Message: Setup of module ftnchek --- NEW FILE Makefile --- # Top level Makefile for module ftnchek all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 22:19:06 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:19:06 -0500 Subject: rpms/ftnchek/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603082219.k28MJ8eJ028908@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28878/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ftnchek --- NEW 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 Mar 8 22:19:55 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:19:55 -0500 Subject: rpms/ftnchek import.log,1.1,1.2 Message-ID: <200603082220.k28MKRLA028989@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28952 Modified Files: import.log Log Message: auto-import ftnchek-3.3.1-3 on branch devel from ftnchek-3.3.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ftnchek/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 22:19:00 -0000 1.1 +++ import.log 8 Mar 2006 22:19:54 -0000 1.2 @@ -0,0 +1 @@ +ftnchek-3_3_1-3:HEAD:ftnchek-3.3.1-3.src.rpm:1141856387 From fedora-extras-commits at redhat.com Wed Mar 8 22:20:00 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:20:00 -0500 Subject: rpms/ftnchek/devel ftnchek-3.3.1-datadir.patch, NONE, 1.1 ftnchek.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603082220.k28MKXAN028993@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28952/devel Modified Files: .cvsignore sources Added Files: ftnchek-3.3.1-datadir.patch ftnchek.spec Log Message: auto-import ftnchek-3.3.1-3 on branch devel from ftnchek-3.3.1-3.src.rpm ftnchek-3.3.1-datadir.patch: --- NEW FILE ftnchek-3.3.1-datadir.patch --- --- ftnchek-3.3.1/dcl2inc.in.orig 1999-11-02 17:23:36.000000000 -0700 +++ ftnchek-3.3.1/dcl2inc.in 2006-03-07 14:45:33.000000000 -0700 @@ -24,5 +24,5 @@ # The following lines are edited by configure when it builds dcl2inc. prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@libdir@/ftnchek -exec @AWK@ -f ${libdir}/dcl2inc.awk "$@" +datadir=@datadir@/ftnchek +exec @AWK@ -f ${datadir}/dcl2inc.awk "$@" --- ftnchek-3.3.1/Makefile.in.orig 2006-03-07 14:45:46.000000000 -0700 +++ ftnchek-3.3.1/Makefile.in 2006-03-07 14:47:00.000000000 -0700 @@ -99,7 +99,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ bindir = @bindir@ -datadir = @datadir@ +datadir = @datadir@/ftnchek mandir = @mandir@ manext = .1 sgimansubdir = @sgimansubdir@ @@ -496,9 +496,9 @@ $(CP) ftnchek$(EXE) $(bindir) -$(STRIP) $(bindir)/ftnchek$(EXE) $(CHMOD) 755 $(bindir)/ftnchek$(EXE) - -$(MKDIR) -p $(libdir) - $(CP) dcl2inc.awk $(libdir)/dcl2inc.awk - $(CHMOD) 644 $(libdir)/dcl2inc.awk + -$(MKDIR) -p $(datadir) + $(CP) dcl2inc.awk $(datadir)/dcl2inc.awk + $(CHMOD) 644 $(datadir)/dcl2inc.awk $(CP) dcl2inc$(CMD) $(bindir)/dcl2inc$(CMD) $(CHMOD) 755 $(bindir)/dcl2inc$(CMD) -$(RM) $(bindir)/fcl2vcg @@ -580,14 +580,14 @@ uninstall: -$(RM) $(bindir)/dcl2inc$(CMD) -$(RM) $(bindir)/ftnchek$(CMD) - -$(RM) $(libdir)/dcl2inc.awk + -$(RM) $(datadir)/dcl2inc.awk -$(RM) $(mandir)/cat1/dcl2inc$(manext) -$(RM) $(mandir)/cat1/ftnchek$(manext) -$(RM) $(mandir)/dcl2inc.z $(mandir)/ftnchek.z # SGI -$(RM) $(mandir)/man1/dcl2inc$(manext) -$(RM) $(mandir)/man1/ftnchek$(manext) -$(RM) $(lispdir)/ftnchek.el - -$(RMDIR) $(libdir) + -$(RMDIR) $(datadir) # WARNING: do NOT execute this target, unless you have nroff/troff or groff # to recreate the formatted documentation files. --- NEW FILE ftnchek.spec --- Name: ftnchek Version: 3.3.1 Release: 3 Summary: Static analyzer for Fortran 77 programs Group: Development/Tools License: MIT URL: http://www.dsm.fordham.edu/~ftnchek/ Source0: http://www.dsm.fordham.edu/~ftnchek/download/ftnchek-3.3.1.tar.gz Patch0: ftnchek-3.3.1-datadir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: groff, emacs %description ftnchek is a static analyzer for Fortran 77 programs. It is designed to detect certain errors in a Fortran program that a compiler usually does not. ftnchek is not primarily intended to detect syntax errors. Its purpose is to assist the user in finding semantic errors. Semantic errors are legal in the Fortran language but are wasteful or may cause incorrect operation. For example, variables which are never used may indicate some omission in the program; uninitialized variables contain garbage which may cause incorrect results to be calculated; and variables which are not declared may not have the intended type. ftnchek is intended to assist users in the debugging of their Fortran program. It is not intended to catch all syntax errors. This is the function of the compiler. Prior to using ftnchek, the user should verify that the program compiles correctly. %package emacs Summary: Emacs support for ftnchek Group: Development/Tools Requires: %{name} = %{version}-%{release} Requires: %{_datadir}/emacs/site-lisp %description emacs %{summary}. %prep %setup -q %patch -p1 -b .datadir #Stop configure from overriding CFLAGS sed -i -e 's/CFLAGS="-DUNIX.*"//' configure %build export CFLAGS="$RPM_OPT_FLAGS -DUNIX" %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp %makeinstall datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ lispdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE README FAQ PATCHES %{_bindir}/dcl2inc %{_bindir}/ftnchek %{_datadir}/ftnchek/ %{_mandir}/man1/dcl2inc.1* %{_mandir}/man1/ftnchek.1* %files emacs %{_datadir}/emacs/site-lisp/ftnchek.el %{_datadir}/emacs/site-lisp/ftnchek.elc %changelog * Wed Mar 08 2006 Orion Poplawki 3.3.1-3 - Own %{_datadir}/ftnchek/ - Add period to end of emacs package description * Wed Mar 08 2006 Orion Poplawki 3.3.1-2 - Add emacs sub-package for emacs support - Fix up CFLAGS to use RPM CFLAGS - Add FAQ and PATCHES to %doc * Tue Mar 07 2006 Orion Poplawki 3.3.1-1 - Initial Fedora Extras submission Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ftnchek/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 22:19:06 -0000 1.1 +++ .cvsignore 8 Mar 2006 22:20:00 -0000 1.2 @@ -0,0 +1 @@ +ftnchek-3.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ftnchek/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 22:19:06 -0000 1.1 +++ sources 8 Mar 2006 22:20:00 -0000 1.2 @@ -0,0 +1 @@ +e1f4ce51ea1a85e7b080ab5d23013f97 ftnchek-3.3.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 22:31:30 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:31:30 -0500 Subject: rpms/R-wavethresh - New directory Message-ID: <200603082231.k28MVWPL029208@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29200/R-wavethresh Log Message: Directory /cvs/extras/rpms/R-wavethresh added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:31:36 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:31:36 -0500 Subject: rpms/R-wavethresh/devel - New directory Message-ID: <200603082231.k28MVcKL029223@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29200/R-wavethresh/devel Log Message: Directory /cvs/extras/rpms/R-wavethresh/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:31:56 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:31:56 -0500 Subject: rpms/R-wavethresh Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603082231.k28MVwU6029257@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29245 Added Files: Makefile import.log Log Message: Setup of module R-wavethresh --- NEW FILE Makefile --- # Top level Makefile for module R-wavethresh all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 22:32:01 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:32:01 -0500 Subject: rpms/R-wavethresh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603082232.k28MW3GN029277@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29245/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module R-wavethresh --- NEW 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 Mar 8 22:32:37 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:32:37 -0500 Subject: rpms/R-wavethresh import.log,1.1,1.2 Message-ID: <200603082233.k28MXApn029375@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29330 Modified Files: import.log Log Message: auto-import R-wavethresh-2.2-2 on branch devel from R-wavethresh-2.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/R-wavethresh/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 22:31:55 -0000 1.1 +++ import.log 8 Mar 2006 22:32:37 -0000 1.2 @@ -0,0 +1 @@ +R-wavethresh-2_2-2:HEAD:R-wavethresh-2.2-2.src.rpm:1141857150 From fedora-extras-commits at redhat.com Wed Mar 8 22:32:44 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:32:44 -0500 Subject: rpms/R-wavethresh/devel R-wavethresh.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603082233.k28MXG27029379@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-wavethresh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29330/devel Modified Files: .cvsignore sources Added Files: R-wavethresh.spec Log Message: auto-import R-wavethresh-2.2-2 on branch devel from R-wavethresh-2.2-2.src.rpm --- NEW FILE R-wavethresh.spec --- %define packrel 8 %define packname wavethresh Summary: R module, Software to perform wavelet statistics and transforms Name: R-%{packname} Version: 2.2 Release: 2%{?dist} License: GPL Group: Applications/Engineering Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}-%{packrel}.tar.gz URL: http://cran.r-project.org/contrib/main/Descriptions/wavethresh.html BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: R >= 1.4 BuildRequires: R >= 1.4, tetex-latex %description Software to perform 1-d and 2-d wavelet statistics and transforms %prep %setup -q -n %{packname} %build %install %{__rm} -rf %{buildroot} cd ..; R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library %{__rm} -rf %{buildroot}%{_libdir}/R/library/R.css %check cd ..;%{_bindir}/R CMD check %{packname} %clean %{__rm} -rf %{buildroot} %post %{__cat} %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun %{__cat} %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %defattr(-, root, root, -) %{_libdir}/R/library/%{packname} %doc DESCRIPTION %changelog * Wed Mar 8 2006 Jose' Matos - 2.2-2 - Rename License to simply GPL, added DESCRIPTION to %%doc * Fri Mar 03 2006 Jos?? Matos 2.2-1 - Initial package creation Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/R-wavethresh/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 22:32:01 -0000 1.1 +++ .cvsignore 8 Mar 2006 22:32:43 -0000 1.2 @@ -0,0 +1 @@ +wavethresh_2.2-8.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-wavethresh/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 22:32:01 -0000 1.1 +++ sources 8 Mar 2006 22:32:43 -0000 1.2 @@ -0,0 +1 @@ +13049af3067f3dbd1abd689996c8a7cb wavethresh_2.2-8.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 22:34:33 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:34:33 -0500 Subject: rpms/R-waveslim - New directory Message-ID: <200603082234.k28MYZ3o029467@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29459/R-waveslim Log Message: Directory /cvs/extras/rpms/R-waveslim added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:34:39 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:34:39 -0500 Subject: rpms/R-waveslim/devel - New directory Message-ID: <200603082234.k28MYfPr029482@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29459/R-waveslim/devel Log Message: Directory /cvs/extras/rpms/R-waveslim/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 8 22:34:58 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:34:58 -0500 Subject: rpms/R-waveslim Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603082235.k28MZ1uC029516@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29504 Added Files: Makefile import.log Log Message: Setup of module R-waveslim --- NEW FILE Makefile --- # Top level Makefile for module R-waveslim all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 8 22:35:04 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:35:04 -0500 Subject: rpms/R-waveslim/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603082235.k28MZ6ow029536@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29504/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module R-waveslim --- NEW 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 Mar 8 22:35:51 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:35:51 -0500 Subject: rpms/R-waveslim import.log,1.1,1.2 Message-ID: <200603082236.k28MaNA6029604@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29570 Modified Files: import.log Log Message: auto-import R-waveslim-1.5-2 on branch devel from R-waveslim-1.5-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/R-waveslim/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 8 Mar 2006 22:34:58 -0000 1.1 +++ import.log 8 Mar 2006 22:35:50 -0000 1.2 @@ -0,0 +1 @@ +R-waveslim-1_5-2:HEAD:R-waveslim-1.5-2.src.rpm:1141857343 From fedora-extras-commits at redhat.com Wed Mar 8 22:35:56 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 17:35:56 -0500 Subject: rpms/R-waveslim/devel R-waveslim.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603082236.k28MaTXm029608@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/rpms/R-waveslim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29570/devel Modified Files: .cvsignore sources Added Files: R-waveslim.spec Log Message: auto-import R-waveslim-1.5-2 on branch devel from R-waveslim-1.5-2.src.rpm --- NEW FILE R-waveslim.spec --- %define packname waveslim Summary: R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing Name: R-%{packname} Version: 1.5 Release: 2%{?dist} License: GPL Group: Applications/Engineering Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz URL: http://www.image.ucar.edu/staff/whitcher/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: R >= 1.9.0 BuildRequires: R >= 1.9.0, tetex-latex, gcc-gfortran %description Basic wavelet routines for time series (1D), image (2D) and array (3D) analysis. The code provided here is based on wavelet methodology developed in Percival and Walden (2000); Gencay, Selcuk and Whitcher (2001); the dual-tree complex wavelet transform (CWT) from Kingsbury (1999, 2001) as implemented by Selesnick; and Hilbert wavelet pairs (Selesnick 2001, 2002). All figures in chapters 4-7 of GSW (2001) are reproducible using this package and R code available at the book website(s) below. %prep %setup -q -n %{packname} %build %install %{__rm} -rf %{buildroot} cd ..; R CMD INSTALL %{packname} -l %{buildroot}%{_libdir}/R/library %{__rm} -rf %{buildroot}%{_libdir}/R/library/R.css %check cd ..;%{_bindir}/R CMD check %{packname} %clean %{__rm} -rf %{buildroot} %post %{__cat} %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun %{__cat} %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %defattr(-, root, root, -) %{_libdir}/R/library/%{packname} %doc DESCRIPTION %changelog * Wed Mar 08 2006 Jos?? Matos 1.5-2 - Rename License to GPL only, add gfortran as BR, add DESCRIPTION to %%doc * Fri Mar 03 2006 Jos?? Matos 1.5-1 - Initial package creation Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/R-waveslim/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 8 Mar 2006 22:35:04 -0000 1.1 +++ .cvsignore 8 Mar 2006 22:35:56 -0000 1.2 @@ -0,0 +1 @@ +waveslim_1.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-waveslim/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 8 Mar 2006 22:35:04 -0000 1.1 +++ sources 8 Mar 2006 22:35:56 -0000 1.2 @@ -0,0 +1 @@ +be50b05225e14941232a00338d61e920 waveslim_1.5.tar.gz From fedora-extras-commits at redhat.com Wed Mar 8 22:43:40 2006 From: fedora-extras-commits at redhat.com (Marc Maurer (uwog)) Date: Wed, 8 Mar 2006 17:43:40 -0500 Subject: rpms/abiword/devel abiword.spec,1.31,1.32 Message-ID: <200603082244.k28MiCa3029672@cvs-int.fedora.redhat.com> Author: uwog Update of /cvs/extras/rpms/abiword/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29649 Modified Files: abiword.spec Log Message: Disable the collaboration plugin; it doesn't belong in 2.4.x, and does not work at all Index: abiword.spec =================================================================== RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- abiword.spec 16 Feb 2006 13:19:40 -0000 1.31 +++ abiword.spec 8 Mar 2006 22:43:40 -0000 1.32 @@ -3,7 +3,7 @@ Summary: The AbiWord word processor Name: abiword Version: 2.4.2 -Release: 6%{?dist} +Release: 7%{?dist} Epoch: 1 Group: Applications/Editors License: GPL @@ -65,7 +65,7 @@ cd ../abiword-plugins libtoolize --copy --force ./nextgen.sh -%configure --disable-gda --disable-pdf --with-abiword=../abi +%configure --disable-abicollab --disable-gda --disable-pdf --with-abiword=../abi # Remove libtool predep_objects and postdep_objects wonkiness so that # building without -nostdlib doesn't include them twice. Because we # already link with g++, weird stuff happens if you don't let the @@ -134,6 +134,9 @@ %{_datadir}/icons/*png %changelog +* Wed Mar 08 2006 Marc Maurer - 1:2.4.2-7.fc5 +- Disable the collaboration plugin; it is not working in 2.4.x + * Thu Feb 16 2006 Marc Maurer - 1:2.4.2-6.fc5 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed Mar 8 22:58:18 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:58:18 -0500 Subject: owners owners.list,1.723,1.724 Message-ID: <200603082258.k28MwolX029923@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29906 Modified Files: owners.list Log Message: Add ftnchek Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.723 retrieving revision 1.724 diff -u -r1.723 -r1.724 --- owners.list 8 Mar 2006 21:14:22 -0000 1.723 +++ owners.list 8 Mar 2006 22:58:17 -0000 1.724 @@ -265,6 +265,7 @@ Fedora Extras|freeze|freeze/melt/fcat compression utilities|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|frotz|Interpreter for Infocom and other Z-machine games|chris at chrisgrau.com|extras-qa at fedoraproject.org| Fedora Extras|fslint|FSlint - a utility to find and clean "lint" on a filesystem|P at draigBrady.com|extras-qa at fedoraproject.org| +Fedora Extras|ftnchek|Static analyzer for Fortran 77 programs|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|fuse|File System in Userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at newmail.ru|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 8 22:59:47 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 8 Mar 2006 17:59:47 -0500 Subject: rpms/ftnchek/devel ftnchek.spec,1.1,1.2 Message-ID: <200603082300.k28N0JPE029984@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29959 Modified Files: ftnchek.spec Log Message: Add %{?dist} tag Index: ftnchek.spec =================================================================== RCS file: /cvs/extras/rpms/ftnchek/devel/ftnchek.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ftnchek.spec 8 Mar 2006 22:20:00 -0000 1.1 +++ ftnchek.spec 8 Mar 2006 22:59:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: ftnchek Version: 3.3.1 -Release: 3 +Release: 3%{?dist} Summary: Static analyzer for Fortran 77 programs Group: Development/Tools From fedora-extras-commits at redhat.com Wed Mar 8 23:47:42 2006 From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos)) Date: Wed, 8 Mar 2006 18:47:42 -0500 Subject: owners owners.list,1.724,1.725 Message-ID: <200603082348.k28NmUrl032056@cvs-int.fedora.redhat.com> Author: jamatos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32027 Modified Files: owners.list Log Message: Added R-waveslim and R-wavethresh Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.724 retrieving revision 1.725 diff -u -r1.724 -r1.725 --- owners.list 8 Mar 2006 22:58:17 -0000 1.724 +++ owners.list 8 Mar 2006 23:47:42 -0000 1.725 @@ -1218,6 +1218,8 @@ 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-mysql|A Ruby interface to MySQL|oliver.andrich at gmail.com|extras-qa at fedoraproject.org| +Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org| +Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org| Fedora Extras|rxvt|Rxvt (ouR XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|rxvt-unicode|A unicode version of rxvt|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|rzip|A large-file compression program|i at stingr.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 9 00:14:34 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 19:14:34 -0500 Subject: rpms/scalapack/FC-3 scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora3.patch, 1.3, 1.4 scalapack.spec, 1.10, 1.11 Message-ID: <200603090015.k290F72b001566@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1497/FC-3 Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora3.patch scalapack.spec Log Message: lam in Fedora Core moved its libs into %{_libdir}/lam, so we need to hokey pokey accordingly. scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:22:49 -0000 1.2 +++ scalapack-1.7-64bitlibs.patch 9 Mar 2006 00:14:32 -0000 1.3 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 -@@ -29,7 +29,7 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.64bit 2006-03-08 18:06:37.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:07:19.000000000 -0600 +@@ -29,13 +29,13 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,3 +9,19 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM + # + USEMPI = -DUsingMpiBlacs +-SMPLIB = -L/usr/lib -lmpi ++SMPLIB = -L/usr/lib64 -lmpi + BLACSFINIT = -lmpiblacsF77init + BLACSCINIT = -lmpiblacsCinit + BLACSLIB = -lmpiblacs +@@ -97,7 +97,7 @@ + SCALAPACKSLIB = -L$(home) -lscalapack + BLASLIB = -lblas + # +-LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib64/lam -llam -lmpi -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil + PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) + PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora3.patch: Index: scalapack-1.7-fedora3.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack-1.7-fedora3.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scalapack-1.7-fedora3.patch 8 Mar 2006 16:58:02 -0000 1.3 +++ scalapack-1.7-fedora3.patch 9 Mar 2006 00:14:32 -0000 1.4 @@ -1,5 +1,5 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.fedora3 2006-03-08 10:51:28.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:55:27.000000000 -0600 +--- scalapack-1.7/SCALAPACK/SLmake.inc.fedora3 2006-03-08 18:00:22.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:04:06.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -24,7 +24,7 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = -lmpi ++SMPLIB = -L/usr/lib -lmpi +BLACSFINIT = -lmpiblacsF77init +BLACSCINIT = -lmpiblacsCinit +BLACSLIB = -lmpiblacs @@ -44,7 +44,7 @@ SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) -@@ -94,9 +94,13 @@ +@@ -94,9 +94,12 @@ # The name of the libraries to be created/linked to # SCALAPACKLIB = $(home)/libscalapack.a @@ -55,15 +55,14 @@ -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi +EXTRALIBS = -ldl -lpthread -lutil -+ +PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) +PRLIBS = $(SCALAPACKSLIB) $(CBLACSLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) +RLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) LIBS = $(PBLIBS) ---- scalapack-1.7/SCALAPACK/Makefile.fedora3 2006-03-08 10:55:36.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:56:39.000000000 -0600 +--- scalapack-1.7/SCALAPACK/Makefile.fedora3 2006-03-08 18:04:12.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 18:04:51.000000000 -0600 @@ -49,7 +49,7 @@ all: lib #all: lib exe Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-3/scalapack.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- scalapack.spec 8 Mar 2006 16:58:02 -0000 1.10 +++ scalapack.spec 9 Mar 2006 00:14:32 -0000 1.11 @@ -1,14 +1,14 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html Source0: http://www.netlib.org/scalapack/scalapack.tgz -BuildRequires: lapack-devel, blas-devel, lam, blacs-devel +BuildRequires: lapack, blas, lam, blacs-devel BuildRequires: gcc-g77, glibc-devel -Requires: lapack, blas-devel, lam, blacs-devel +Requires: lapack, blas, lam, blacs-devel BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: scalapack-1.7-fedora3.patch Patch1: scalapack-1.7-64bitlibs.patch @@ -49,9 +49,9 @@ %prep %setup -q -c -n %{name}-%{version} -#%patch0 -p1 +%patch0 -p1 %ifarch x86_64 ppc64 sparc64 ia64 -%patch1 -p1 +%patch1 -p1 -b .64bit %endif %build @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-13 +- lam moved into _libdir/lam... need to fix patches + * Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 - set -fPIC as NOOPT From fedora-extras-commits at redhat.com Thu Mar 9 00:14:51 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 19:14:51 -0500 Subject: rpms/scalapack/FC-4 scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora.patch, 1.3, 1.4 scalapack.spec, 1.12, 1.13 Message-ID: <200603090015.k290FPm0001574@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1497/FC-4 Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora.patch scalapack.spec Log Message: lam in Fedora Core moved its libs into %{_libdir}/lam, so we need to hokey pokey accordingly. scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:22:56 -0000 1.2 +++ scalapack-1.7-64bitlibs.patch 9 Mar 2006 00:14:50 -0000 1.3 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 -@@ -29,7 +29,7 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.64bit 2006-03-08 18:10:40.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:11:04.000000000 -0600 +@@ -29,13 +29,13 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,3 +9,19 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM + # + USEMPI = -DUsingMpiBlacs +-SMPLIB = -L/usr/lib/lam -lmpi ++SMPLIB = -L/usr/lib64/lam -lmpi + BLACSFINIT = -lmpiblacsF77init + BLACSCINIT = -lmpiblacsCinit + BLACSLIB = -lmpiblacs +@@ -97,7 +97,7 @@ + SCALAPACKSLIB = -L$(home) -lscalapack + BLASLIB = -lblas + # +-LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib64/lam -llam -lmpi -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil + + PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack-1.7-fedora.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scalapack-1.7-fedora.patch 8 Mar 2006 16:58:08 -0000 1.3 +++ scalapack-1.7-fedora.patch 9 Mar 2006 00:14:50 -0000 1.4 @@ -1,5 +1,5 @@ --- scalapack-1.7/SCALAPACK/Makefile.fedora 2001-08-10 11:44:13.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:41:39.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 18:08:21.000000000 -0600 @@ -49,7 +49,7 @@ all: lib #all: lib exe @@ -17,7 +17,7 @@ +shared: scalapacklib + ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) --- scalapack-1.7/SCALAPACK/SLmake.inc.fedora 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:42:41.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:09:05.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -42,7 +42,7 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = -lmpi ++SMPLIB = -L/usr/lib/lam -lmpi +BLACSFINIT = -lmpiblacsF77init +BLACSCINIT = -lmpiblacsCinit +BLACSLIB = -lmpiblacs @@ -62,7 +62,7 @@ -CCFLAGS = -O4 +NOOPT = -fPIC +F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -+CCFLAGS = $(RPM_OPT_FLAGS) -fPIC ++CCFLAGS = $(RPM_OPT_FLAGS) $(NOOPT) SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) @@ -86,7 +86,7 @@ -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi +EXTRALIBS = -ldl -lpthread -lutil + +PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/FC-4/scalapack.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- scalapack.spec 8 Mar 2006 16:58:08 -0000 1.12 +++ scalapack.spec 9 Mar 2006 00:14:50 -0000 1.13 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-13 +- lam moved into _libdir/lam... need to fix patches + * Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 - set -fPIC as NOOPT From fedora-extras-commits at redhat.com Thu Mar 9 00:14:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 8 Mar 2006 19:14:57 -0500 Subject: rpms/scalapack/devel scalapack-1.7-64bitlibs.patch, 1.2, 1.3 scalapack-1.7-fedora.patch, 1.4, 1.5 scalapack.spec, 1.13, 1.14 Message-ID: <200603090015.k290FU5Z001582@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/scalapack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1497/devel Modified Files: scalapack-1.7-64bitlibs.patch scalapack-1.7-fedora.patch scalapack.spec Log Message: lam in Fedora Core moved its libs into %{_libdir}/lam, so we need to hokey pokey accordingly. scalapack-1.7-64bitlibs.patch: Index: scalapack-1.7-64bitlibs.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-64bitlibs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scalapack-1.7-64bitlibs.patch 1 Mar 2006 00:23:02 -0000 1.2 +++ scalapack-1.7-64bitlibs.patch 9 Mar 2006 00:14:57 -0000 1.3 @@ -1,6 +1,6 @@ ---- scalapack-1.7/SCALAPACK/SLmake.inc.BAD 2006-02-25 10:09:28.000000000 -0600 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-02-25 10:14:14.000000000 -0600 -@@ -29,7 +29,7 @@ +--- scalapack-1.7/SCALAPACK/SLmake.inc.64bit 2006-03-08 18:10:40.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:11:04.000000000 -0600 +@@ -29,13 +29,13 @@ # and the directory where the BLACS libraries are # BLACSDBGLVL = 0 @@ -9,3 +9,19 @@ # # MPI setup; tailor to your system if using MPIBLACS # Will need to comment out these 6 lines if using PVM + # + USEMPI = -DUsingMpiBlacs +-SMPLIB = -L/usr/lib/lam -lmpi ++SMPLIB = -L/usr/lib64/lam -lmpi + BLACSFINIT = -lmpiblacsF77init + BLACSCINIT = -lmpiblacsCinit + BLACSLIB = -lmpiblacs +@@ -97,7 +97,7 @@ + SCALAPACKSLIB = -L$(home) -lscalapack + BLASLIB = -lblas + # +-LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib64/lam -llam -lmpi -llamf77mpi + EXTRALIBS = -ldl -lpthread -lutil + + PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) scalapack-1.7-fedora.patch: Index: scalapack-1.7-fedora.patch =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack-1.7-fedora.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scalapack-1.7-fedora.patch 8 Mar 2006 16:58:14 -0000 1.4 +++ scalapack-1.7-fedora.patch 9 Mar 2006 00:14:57 -0000 1.5 @@ -1,5 +1,5 @@ --- scalapack-1.7/SCALAPACK/Makefile.fedora 2001-08-10 11:44:13.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 10:41:39.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/Makefile 2006-03-08 18:08:21.000000000 -0600 @@ -49,7 +49,7 @@ all: lib #all: lib exe @@ -17,7 +17,7 @@ +shared: scalapacklib + ( mkdir tmp ; cp $(SCALAPACKLIB) tmp ; cd tmp ; ar x $(SCALAPACKLIB) ; gcc -shared -o $(home)/libscalapack.so.1.0.0 *.o -Wl,-soname=libscalapack.so.1 ; cd .. ) --- scalapack-1.7/SCALAPACK/SLmake.inc.fedora 2001-08-08 21:59:50.000000000 -0500 -+++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 10:42:41.000000000 -0600 ++++ scalapack-1.7/SCALAPACK/SLmake.inc 2006-03-08 18:09:05.000000000 -0600 @@ -19,7 +19,7 @@ # The complete path to the top level of ScaLAPACK directory, usually # $(HOME)/SCALAPACK @@ -42,7 +42,7 @@ -BLACSFINIT = $(BLACSdir)/libmpiblacsF77init-p4.a -BLACSCINIT = $(BLACSdir)/libmpiblacsCinit-p4.a -BLACSLIB = $(BLACSdir)/libmpiblacs-p4.a -+SMPLIB = -lmpi ++SMPLIB = -L/usr/lib/lam -lmpi +BLACSFINIT = -lmpiblacsF77init +BLACSCINIT = -lmpiblacsCinit +BLACSLIB = -lmpiblacs @@ -62,7 +62,7 @@ -CCFLAGS = -O4 +NOOPT = -fPIC +F77FLAGS = $(RPM_OPT_FLAGS) $(NOOPT) -+CCFLAGS = $(RPM_OPT_FLAGS) -fPIC ++CCFLAGS = $(RPM_OPT_FLAGS) $(NOOPT) SRCFLAG = F77LOADER = $(F77) CCLOADER = $(CC) @@ -86,7 +86,7 @@ -PBLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) -PRLIBS = $(SCALAPACKLIB) $(CBLACSLIB) $(SMPLIB) -RLIBS = $(SCALAPACKLIB) $(FBLACSLIB) $(CBLACSLIB) $(BLASLIB) $(SMPLIB) -+LAMLIBS = -llam -lmpi -llamf77mpi ++LAMLIBS = -L/usr/lib/lam -llam -lmpi -llamf77mpi +EXTRALIBS = -ldl -lpthread -lutil + +PBLIBS = $(SCALAPACKSLIB) $(FBLACSLIB) $(BLASLIB) $(SMPLIB) $(LAMLIBS) $(EXTRALIBS) Index: scalapack.spec =================================================================== RCS file: /cvs/extras/rpms/scalapack/devel/scalapack.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- scalapack.spec 8 Mar 2006 16:58:14 -0000 1.13 +++ scalapack.spec 9 Mar 2006 00:14:57 -0000 1.14 @@ -1,7 +1,7 @@ Summary: A subset of LAPACK routines redesigned for distributed memory MIMD parallel computers Name: scalapack Version: 1.7 -Release: 12%{?dist} +Release: 13%{?dist} License: Freely distributable Group: Development/Libraries URL: http://www.netlib.org/scalapack/scalapack_home.html @@ -95,6 +95,9 @@ %{_libdir}/libscalapack.so %changelog +* Wed Mar 8 2006 Tom "spot" Callaway 1.7-13 +- lam moved into _libdir/lam... need to fix patches + * Wed Mar 8 2006 Tom "spot" Callaway 1.7-12 - set -fPIC as NOOPT From fedora-extras-commits at redhat.com Thu Mar 9 01:57:02 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:02 -0500 Subject: rpms/kdetoys - New directory Message-ID: <200603090157.k291v4TH004006@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3998/kdetoys Log Message: Directory /cvs/extras/rpms/kdetoys added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 01:57:08 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:08 -0500 Subject: rpms/kdetoys/devel - New directory Message-ID: <200603090157.k291vAOt004021@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3998/kdetoys/devel Log Message: Directory /cvs/extras/rpms/kdetoys/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 01:57:19 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:19 -0500 Subject: rpms/kdetoys Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603090157.k291vLeF004055@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4043 Added Files: Makefile import.log Log Message: Setup of module kdetoys --- NEW FILE Makefile --- # Top level Makefile for module kdetoys all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 9 01:57:25 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:25 -0500 Subject: rpms/kdetoys/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603090157.k291vRBH004073@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4043/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kdetoys --- NEW 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 Mar 9 01:57:47 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:47 -0500 Subject: rpms/kdetoys import.log,1.1,1.2 Message-ID: <200603090158.k291wJPM004141@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4107 Modified Files: import.log Log Message: auto-import kdetoys-3.5.1-3 on branch devel from kdetoys-3.5.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kdetoys/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Mar 2006 01:57:19 -0000 1.1 +++ import.log 9 Mar 2006 01:57:47 -0000 1.2 @@ -0,0 +1 @@ +kdetoys-3_5_1-3:HEAD:kdetoys-3.5.1-3.src.rpm:1141869464 From fedora-extras-commits at redhat.com Thu Mar 9 01:57:53 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 20:57:53 -0500 Subject: rpms/kdetoys/devel kdetoys.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603090158.k291wP54004147@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdetoys/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4107/devel Modified Files: .cvsignore sources Added Files: kdetoys.spec Log Message: auto-import kdetoys-3.5.1-3 on branch devel from kdetoys-3.5.1-3.src.rpm --- NEW FILE kdetoys.spec --- %define is_release 1 Summary: K Desktop Environment - Toys and Amusements Name: kdetoys Group: Amusements/Graphics Epoch: 7 Version: 3.5.1 Release: 3%{?dist} License: GPL Url: http://www.kde.org/ Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdetoys-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:%{version} BuildRequires: gettext BuildRequires: desktop-file-utils ## Recommended, not (absolutely) required -- Rex #Requires(hint): kdebase >= 6:%{version} %if "%{is_release}" != "1" BuildRequires: automake %endif %description Includes: * amor: Amusing Misuse Of Resources put's comic figures above your windows * eyesapplet: a kicker applet similar to XEyes * fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them * kaphorism: displays aphorisms * kmoon: system tray applet showing the moon phase * kodo: mouse movement meter * kscore: kicker applet with a sports ticker * kteatime: system tray applet that makes sure your tea doesn't get too strong * ktux: Tux-in-a-Spaceship screen saver * kweather: kicker applet that will display the current weather outside * kworldwatch: application and kicker applet showing daylight area on the world globe NOTE: kicker applets and screen savers require kdebase to be installed, and user to be logged-in to KDE. %prep %if "%{?is_release}" != "0" %setup -q -n %{name}-%{version}%{?beta} %else %setup -q -n %{name} %endif %if "%{is_release}" != "1" make -f admin/Makefile.common cvs %endif %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --includedir=%{_includedir}/kde \ --disable-rpath \ --disable-gcc-hidden-visibility \ --enable-new-ldflags \ --disable-debug --disable-warnings \ --disable-dependancy-tracking --enable-final \ %{?debug: --enable-debug --enable-warnings --disable-final } make %{?_smp_mflags} %install rm -rf "$RPM_BUILD_ROOT" make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install \ --dir=$RPM_BUILD_ROOT%{_datadir}/applnk/System/ScreenSavers \ --delete-original \ --vendor="kde" \ --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/applnk/System/ScreenSavers/*.desktop desktop-file-install \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \ --vendor="" \ --add-category="X-Fedora" \ --add-category="Application" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop # replace absolute symlink with relative ln -nfs tips-en $RPM_BUILD_ROOT%{_datadir}/apps/amor/tips ## File lists # locale's %find_lang %{name} || touch %{name}.lang # 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 ] && ln -nsf ../common $i/common done popd fi done fi ## Unpackaged files # 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 #rm -f $RPM_BUILD_ROOT%{_libdir}/kde3/*.la %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 ||: %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_bindir}/* %{_libdir}/libkdeinit_*.* %{_libdir}/kde3/* %{_datadir}/applications/kde/*.desktop %{_datadir}/applnk/System/ScreenSavers/*.desktop %{_datadir}/apps/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/service*/*.desktop %clean rm -rf $RPM_BUILD_ROOT %changelog * Mon Mar 06 2006 Rex Dieter 7:3.3.5-3 - %%doc AUTHORS COPYING README - BR: gettext - drop %%{?debug_package} reference - desktop-file-install --vendor="kde"/--add-category="Application", where needed - comment inclusion of .la files * Wed Feb 22 2006 Rex Dieter 7:3.5.1-2 - update %%description - %%post/%%postun: drop ldconfig, update-destkop-database - desktop-file-install --add-category="X-Fedora" * Sat Jan 21 2006 Rex Dieter 7:3.5.1-1 - kde-3.5.1 * Tue Dec 08 2005 Rex Dieter 7:3.5.0-1.2 - --enable-new-ldflags - --disable-gcc-hidden-visibility * Sat Mar 19 2005 Than Ngo 7:3.4.0-1 - 3.4.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdetoys/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2006 01:57:25 -0000 1.1 +++ .cvsignore 9 Mar 2006 01:57:53 -0000 1.2 @@ -0,0 +1 @@ +kdetoys-3.5.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdetoys/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2006 01:57:25 -0000 1.1 +++ sources 9 Mar 2006 01:57:53 -0000 1.2 @@ -0,0 +1 @@ +d98d4f30a8aa6d43b0af06421d4d6586 kdetoys-3.5.1.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 9 02:00:49 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 21:00:49 -0500 Subject: owners owners.list,1.725,1.726 Message-ID: <200603090201.k2921M7k006052@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4194 Modified Files: owners.list Log Message: kdetoys import Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.725 retrieving revision 1.726 diff -u -r1.725 -r1.726 --- owners.list 8 Mar 2006 23:47:42 -0000 1.725 +++ owners.list 9 Mar 2006 02:00:49 -0000 1.726 @@ -488,6 +488,7 @@ Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|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|kdesvn|A subversion client for KDE|orion at cora.nwra.com|extras-qa at fedoraproject.org| +Fedora Extras|kdetoys|K Desktop Environment - Toys and Amusements|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|keychain|Agent manager for OpenSSH, ssh.com, Sun SSH, and GnuPG|ad+rh-bugzilla at uni-x.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 9 02:24:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 8 Mar 2006 21:24:24 -0500 Subject: rpms/maxima/devel maxima.spec,1.17,1.18 Message-ID: <200603090224.k292Outk006191@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6174 Modified Files: maxima.spec Log Message: * Wed Mar 08 2006 Rex Dieter 5.9.2-11 - fc5: enable runtime-gcl - runtime-sbcl: Requires: sbcl = %{sbcl_version_used_to_build} Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- maxima.spec 27 Feb 2006 14:58:50 -0000 1.17 +++ maxima.spec 9 Mar 2006 02:24:24 -0000 1.18 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -21,10 +21,8 @@ %define _enable_clisp --enable-clisp # cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796 #define _enable_cmucl --enable-cmucl -%if "%{?fedora}" != "5" -# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026 +# gcl *was* not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026 %define _enable_gcl --enable-gcl -%endif %define _enable_sbcl --enable-sbcl %endif @@ -142,8 +140,13 @@ Summary: Maxima compiled with SBCL Group: Applications/Engineering BuildRequires: sbcl -#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)} -Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} +# maxima requires the *same* version it was built against +# this hack should work, even in mock (-: -- Rex +%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) +%if "%{?sbcl_ver}" >= "0.9" +%define sbcl_ver2 = %{sbcl_ver} +%endif +Requires: sbcl %{?sbcl_ver2} Requires: %{name} = %{version} Obsoletes: maxima-exec-sbcl < %{version}-%{release} Provides: %{name}-runtime = %{version} @@ -351,6 +354,10 @@ %changelog +* Wed Mar 08 2006 Rex Dieter 5.9.2-11 +- fc5: enable runtime-gcl +- runtime-sbcl: Requires: sbcl = %%{sbcl_version_used_to_build} + * Mon Feb 27 2006 Rex Dieter 5.9.2-10 - respin for sbcl-0.9.10 From fedora-extras-commits at redhat.com Thu Mar 9 09:48:49 2006 From: fedora-extras-commits at redhat.com (Alexander Larsson (alexl)) Date: Thu, 9 Mar 2006 04:48:49 -0500 Subject: rpms/sabayon/devel sabayon.spec,1.20,1.21 Message-ID: <200603090949.k299nLUk021177@cvs-int.fedora.redhat.com> Author: alexl Update of /cvs/extras/rpms/sabayon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21160 Modified Files: sabayon.spec Log Message: * Thu Mar 9 2006 Alexander Larsson - 2.12.3-3 - Add xorg-x11-xinit build-req so configure picks the right Xsession script Index: sabayon.spec =================================================================== RCS file: /cvs/extras/rpms/sabayon/devel/sabayon.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sabayon.spec 7 Mar 2006 08:54:43 -0000 1.20 +++ sabayon.spec 9 Mar 2006 09:48:48 -0000 1.21 @@ -14,7 +14,7 @@ Name: sabayon Version: 2.12.3 -Release: 2 +Release: 3 Summary: Tool to maintain user profiles in a GNOME desktop Group: Applications/System @@ -42,6 +42,9 @@ BuildRequires: desktop-file-utils BuildRequires: usermode BuildRequires: xorg-x11-server-Xnest +# Needed to pick up the right Xsession file +BuildRequires: xorg-x11-xinit + Requires(post): shadow-utils Requires(preun): shadow-utils @@ -187,6 +190,10 @@ %{python_sitelib}/%{name}/lockdown %changelog +* Thu Mar 9 2006 Alexander Larsson - 2.12.3-3 +- Add xorg-x11-xinit build-req so configure picks the + right Xsession script + * Tue Mar 7 2006 Alexander Larsson - 2.12.3-2 - Add libXt-devel buildreq From fedora-extras-commits at redhat.com Thu Mar 9 10:33:04 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 9 Mar 2006 05:33:04 -0500 Subject: rpms/z88dk import.log,1.2,1.3 Message-ID: <200603091033.k29AXbCG023244@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/z88dk In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23212 Modified Files: import.log Log Message: auto-import z88dk-1.6-8 on branch devel from z88dk-1.6-8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/z88dk/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 13 Jan 2006 00:19:16 -0000 1.2 +++ import.log 9 Mar 2006 10:33:04 -0000 1.3 @@ -1 +1,2 @@ z88dk-1_6-7:HEAD:z88dk-1.6-7.src.rpm:1137111538 +z88dk-1_6-8:HEAD:z88dk-1.6-8.src.rpm:1141900370 From fedora-extras-commits at redhat.com Thu Mar 9 10:33:10 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 9 Mar 2006 05:33:10 -0500 Subject: rpms/z88dk/devel z88dk.spec,1.1,1.2 Message-ID: <200603091033.k29AXgZu023247@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/z88dk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23212/devel Modified Files: z88dk.spec Log Message: auto-import z88dk-1.6-8 on branch devel from z88dk-1.6-8.src.rpm Index: z88dk.spec =================================================================== RCS file: /cvs/extras/rpms/z88dk/devel/z88dk.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- z88dk.spec 13 Jan 2006 00:19:34 -0000 1.1 +++ z88dk.spec 9 Mar 2006 10:33:10 -0000 1.2 @@ -1,13 +1,14 @@ Summary: A Z80 cross compiler Name: z88dk Version: 1.6 -Release: 7%{?dist} +Release: 8%{?dist} License: Artistic Group: Development/Tools Source: http://dl.sf.net/z88dk/z88dk-src-%{version}.tgz Patch: z88make.patch URL: http://z88dk.sourceforge.net/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExcludeArch: x86_64 ia64 %description z88dk is a Z80 cross compiler capable of generating binary files for a variety @@ -34,7 +35,6 @@ export PATH=%{_builddir}/z88dk/bin:$PATH export CC=gcc export CFLAGS="%{optflags}" -ExcludeArch=x86_64 # Note: do not use %{?_smp_mflags} with make because the Makefiles don't support parallel builds %{__make} clean %{__make} -e @@ -71,6 +71,9 @@ %{_mandir}/man3z/ %changelog +* Thu Mar 9 2006 Paul F. Johnson - 1.6-8 +- Added ExcludeArch for ia64 + * Mon Oct 17 2005 Paul F. Johnson - 1.6-7 - Add ExcludeArch for x86_64 machines From fedora-extras-commits at redhat.com Thu Mar 9 10:57:43 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Thu, 9 Mar 2006 05:57:43 -0500 Subject: fedora-security/audit fc4,1.169,1.170 fc5,1.76,1.77 Message-ID: <200603091057.k29AvhX6023577@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23555 Modified Files: fc4 fc5 Log Message: Latest updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.169 retrieving revision 1.170 diff -u -r1.169 -r1.170 --- fc4 8 Mar 2006 15:24:33 -0000 1.169 +++ fc4 9 Mar 2006 10:57:35 -0000 1.170 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060306 -Up to date FC4 as of 20060306 +Up to date CVE as of CVE email 20060308 +Up to date FC4 as of 20060308 ** are items that need attention +CVE-2006-1079 ignore (httpd) not a vulnerability +CVE-2006-1078 ignore (httpd) not a vulnerability CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe @@ -10,6 +12,7 @@ CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) +CVE-2006-0746 VULNERABLE (kpdf) bz#184308 CVE-2006-0741 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 version (postgresql, 8.1 only) @@ -128,6 +131,7 @@ CVE-2005-3651 version (ethereal, fixed 0.10.14) [since FEDORA-2006-006] CVE-2005-3632 version (netpbm) CVE-2005-3631 version (udev) +CVE-2005-3629 ** initscripts CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169] CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3628 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.76 retrieving revision 1.77 diff -u -r1.76 -r1.77 --- fc5 8 Mar 2006 15:24:33 -0000 1.76 +++ fc5 9 Mar 2006 10:57:36 -0000 1.77 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060306 +Up to date CVE as of CVE email 20060308 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -17,6 +17,8 @@ ** are items that need attention +CVE-2006-1079 ignore (httpd) not a vulnerability +CVE-2006-1078 ignore (httpd) not a vulnerability CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe @@ -24,6 +26,7 @@ CVE-2006-0903 VULNERABLE (mysql) CVE-2006-0884 ** thunderbird CVE-2006-0836 VULNERABLE (thunderbird) +CVE-2006-0746 VULNERABLE (kpdf) CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 ignore (postgresql) we don't build --enable-cassert CVE-2006-0645 version (gnutls, fixed 1.2.10) @@ -138,6 +141,7 @@ CVE-2005-3651 version (ethereal, fixed 0.10.14) CVE-2005-3632 version (netpbm) CVE-2005-3631 version (udev) +CVE-2005-3629 ** initscripts CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3628 version (poppler, fixed 0.4.4) From fedora-extras-commits at redhat.com Thu Mar 9 12:04:50 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 9 Mar 2006 07:04:50 -0500 Subject: fedora-security/audit fc4,1.170,1.171 fc5,1.77,1.78 Message-ID: <200603091204.k29C4o3P027519@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27499 Modified Files: fc4 fc5 Log Message: Note a new mod_python cve id. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.170 retrieving revision 1.171 diff -u -r1.170 -r1.171 --- fc4 9 Mar 2006 10:57:35 -0000 1.170 +++ fc4 9 Mar 2006 12:04:35 -0000 1.171 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability CVE-2006-1045 VULNERABLE (thunderbird) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.77 retrieving revision 1.78 diff -u -r1.77 -r1.78 --- fc5 9 Mar 2006 10:57:36 -0000 1.77 +++ fc5 9 Mar 2006 12:04:35 -0000 1.78 @@ -17,6 +17,7 @@ ** are items that need attention +CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability CVE-2006-1045 VULNERABLE (thunderbird) From fedora-extras-commits at redhat.com Thu Mar 9 13:33:14 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Thu, 9 Mar 2006 08:33:14 -0500 Subject: rpms/SIBsim4/devel .cvsignore, 1.3, 1.4 SIBsim4.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603091333.k29DXkEe029844@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/SIBsim4/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29823 Modified Files: .cvsignore SIBsim4.spec sources Log Message: New upstream release 0.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Feb 2006 14:22:50 -0000 1.3 +++ .cvsignore 9 Mar 2006 13:33:13 -0000 1.4 @@ -1 +1 @@ -SIBsim4-0.10.tar.bz2 +SIBsim4-0.11.tar.bz2 Index: SIBsim4.spec =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/devel/SIBsim4.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- SIBsim4.spec 21 Feb 2006 14:22:50 -0000 1.3 +++ SIBsim4.spec 9 Mar 2006 13:33:13 -0000 1.4 @@ -1,5 +1,5 @@ Name: SIBsim4 -Version: 0.10 +Version: 0.11 Release: 1%{?dist} Summary: Align expressed RNA sequences on a DNA template Group: Applications/Engineering @@ -43,6 +43,9 @@ %changelog +* Thu Mar 9 2006 Christian Iseli 0.11-1 +- Version 0.11. + * Tue Feb 21 2006 Christian Iseli 0.10-1 - Version 0.10. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Feb 2006 14:22:50 -0000 1.3 +++ sources 9 Mar 2006 13:33:13 -0000 1.4 @@ -1 +1 @@ -bcbd35af80c261d2bff584d7c536e909 SIBsim4-0.10.tar.bz2 +01461e9f397feabb030d4c326d7103ac SIBsim4-0.11.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 9 13:36:13 2006 From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris)) Date: Thu, 9 Mar 2006 08:36:13 -0500 Subject: rpms/SIBsim4/FC-4 .cvsignore, 1.3, 1.4 SIBsim4.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603091336.k29DajLT029940@cvs-int.fedora.redhat.com> Author: c4chris Update of /cvs/extras/rpms/SIBsim4/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29915 Modified Files: .cvsignore SIBsim4.spec sources Log Message: New upstream release 0.11. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 21 Feb 2006 15:02:10 -0000 1.3 +++ .cvsignore 9 Mar 2006 13:36:13 -0000 1.4 @@ -1 +1 @@ -SIBsim4-0.10.tar.bz2 +SIBsim4-0.11.tar.bz2 Index: SIBsim4.spec =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-4/SIBsim4.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- SIBsim4.spec 21 Feb 2006 15:02:10 -0000 1.2 +++ SIBsim4.spec 9 Mar 2006 13:36:13 -0000 1.3 @@ -1,5 +1,5 @@ Name: SIBsim4 -Version: 0.10 +Version: 0.11 Release: 1%{?dist} Summary: Align expressed RNA sequences on a DNA template Group: Applications/Engineering @@ -43,6 +43,9 @@ %changelog +* Thu Mar 9 2006 Christian Iseli 0.11-1 +- Version 0.11. + * Tue Feb 21 2006 Christian Iseli 0.10-1 - Version 0.10. Index: sources =================================================================== RCS file: /cvs/extras/rpms/SIBsim4/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 21 Feb 2006 15:02:10 -0000 1.3 +++ sources 9 Mar 2006 13:36:13 -0000 1.4 @@ -1 +1 @@ -bcbd35af80c261d2bff584d7c536e909 SIBsim4-0.10.tar.bz2 +01461e9f397feabb030d4c326d7103ac SIBsim4-0.11.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 9 14:51:44 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 09:51:44 -0500 Subject: rpms/R-RScaLAPACK/FC-3 R-RScaLAPACK-0.5.1-blacsfix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-configurefix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-gcc4.patch, NONE, 1.1 R-RScaLAPACK.spec, 1.11, 1.12 Message-ID: <200603091452.k29EqGja032347@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32271/FC-3 Modified Files: R-RScaLAPACK.spec Added Files: R-RScaLAPACK-0.5.1-blacsfix.patch R-RScaLAPACK-0.5.1-configurefix.patch R-RScaLAPACK-0.5.1-gcc4.patch Log Message: With scalapack finally working, we can get this thing going as well. R-RScaLAPACK-0.5.1-blacsfix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-blacsfix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c.BAD 2006-02-26 11:14:18.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c 2006-02-26 11:14:42.000000000 -0600 @@ -113,7 +113,7 @@ * the function is sla.gridExit, so exit. */ if (ipGridAndDims[8] == 0 && rel_flag == 1){ - F77_CALL(blacs_exit_)(&exitTemp); + F77_CALL(blacs_exit)(&exitTemp); printf ("Exiting BLACS ... rank = %d\n",iMyRank); return AsInt(1); } @@ -127,7 +127,7 @@ /* Uses BLACS call to perform MPI_Init */ int CR_InitializeEnv(int *ipMyRank, int *ipNumProcs) { - F77_CALL(blacs_pinfo_)(ipMyRank, ipNumProcs); + F77_CALL(blacs_pinfo)(ipMyRank, ipNumProcs); return 0; } @@ -534,7 +534,7 @@ D_Rprintf ((" Process 0 ... in cntrl statement ..after init \n")); - F77_CALL(blacs_get_)(&temp1, &temp2, &ictxt); + F77_CALL(blacs_get)(&temp1, &temp2, &ictxt); /* Calculate the value for WATOBD */ D_Rprintf ((" Process 0 ... in cntrl statement ..1 \n")); R-RScaLAPACK-0.5.1-configurefix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-configurefix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in.BAD 2006-02-26 10:06:00.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in 2006-02-26 10:16:03.000000000 -0600 @@ -135,7 +135,7 @@ AC_MSG_NOTICE(LAM-libmpi.a not found) MPI_LAM=no ]) - AC_CHECK_LIB(lamf77mpi, mpi_comm_create__,[ + AC_CHECK_LIB(lamf77mpi, mpi_comm_create_,[ LIBS="-llamf77mpi ${LIBS}" MPI_LAM=yes ],[ @@ -258,8 +258,8 @@ else AC_LANG_PUSH(Fortran 77) AC_CHECK_LIB(blas, ztrsm,[ - LIBS="-lf77blas ${LIBS}"], [ - AC_MSG_ERROR(libf77blas.a not found,-1) + LIBS="-lblas ${LIBS}"], [ + AC_MSG_ERROR(libblas.a not found,-1) ]) AC_LANG_POP(Fortran 77) fi @@ -297,16 +297,16 @@ AC_MSG_ERROR(libcblacsF77init.a not found,-1) fi else - AC_CHECK_LIB(blacs, Cblacs_gridexit,[], [ - AC_MSG_ERROR(libblacs.a not found,-1) + AC_CHECK_LIB(mpiblacs, Cblacs_gridexit,[], [ + AC_MSG_ERROR(libmpiblacs.a not found,-1) ]) - AC_CHECK_LIB(blacsCinit, Cblacs_pinfo,[],[ - AC_MSG_ERROR(libblacsCinit.a not found,-1) + AC_CHECK_LIB(mpiblacsCinit, Cblacs_pinfo,[],[ + AC_MSG_ERROR(libmpiblacsCinit.a not found,-1) ]) - AC_CHECK_LIB(blacsF77init, blacs_pinfo__,[],[ - AC_MSG_ERROR(libblacsF77init.a not found,-1) + AC_CHECK_LIB(mpiblacsF77init, blacs_pinfo_,[],[ + AC_MSG_ERROR(libmpiblacsF77init.a not found,-1) ]) fi R-RScaLAPACK-0.5.1-gcc4.patch: --- NEW FILE R-RScaLAPACK-0.5.1-gcc4.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.BAD 2006-02-25 10:23:29.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile 2006-02-25 10:23:41.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in.BAD 2006-02-26 11:12:04.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in 2006-02-26 11:12:13.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-3/R-RScaLAPACK.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- R-RScaLAPACK.spec 13 Jun 2005 04:17:33 -0000 1.11 +++ R-RScaLAPACK.spec 9 Mar 2006 14:51:43 -0000 1.12 @@ -1,24 +1,23 @@ %define packname RScaLAPACK +%define lamdir %{_libdir}/lam Name: R-%{packname} -Version: 0.4.0 -Release: 12%{?dist} +Version: 0.5.1 +Release: 2%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib Group: Applications/Engineering Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK -BuildRequires: R-devel, tetex-latex -BuildRequires: gcc-g77, lam, blacs, scalapack +BuildRequires: R-devel, tetex-latex, lapack +BuildRequires: gcc-gfortran, lam, blacs-devel, scalapack-devel, autoconf Requires: R, scalapack BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch +Patch1: R-RScaLAPACK-0.5.1-gcc4.patch Patch2: R-RScaLAPACK-0.4.0-lam-mpi-blacs64.patch -# -# Normally, this is bad form, but we need to do this. -# lam needs to be built with -fPIC for x86_64 to work. -# -ExcludeArch: x86_64 +Patch3: R-RScaLAPACK-0.5.1-configurefix.patch +Patch4: R-RScaLAPACK-0.5.1-blacsfix.patch %description R package: @@ -28,19 +27,25 @@ %prep %setup -T -c -a 0 -%ifarch x86_64 ppc64 sparc64 alpha ia64 +%ifarch x86_64 ppc64 sparc64 ia64 alpha %patch2 -p1 %else %patch0 -p1 %endif +%patch1 -p1 +%patch3 -p1 +%patch4 -p1 %build +cd RScaLAPACK +autoconf +cd .. cp %{packname}/DESCRIPTION . %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library -%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} +%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} # %{_bindir}/R CMD check %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css @@ -49,21 +54,25 @@ rm -rf $RPM_BUILD_ROOT %post -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %defattr(-,root,root,-) %doc DESCRIPTION -%{_libdir}/R/library/%{packname} +%{_libdir}/R/library/%{packname}/ %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 +- get this thing working again + +* Mon Jan 9 2006 Tom "spot" Callaway 0.5.1-1 +- bump to 0.5.1 + * Mon May 16 2005 Tom "spot" Callaway 0.4.0-9 -- test fails unless you are running it on a lam cluster, +- test fails unless you are running it on a lam cluster, so don't run it here * Sun May 15 2005 Tom "spot" Callaway 0.4.0-8 From fedora-extras-commits at redhat.com Thu Mar 9 14:51:50 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 09:51:50 -0500 Subject: rpms/R-RScaLAPACK/FC-4 R-RScaLAPACK-0.5.1-blacsfix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-configurefix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-gcc4.patch, NONE, 1.1 R-RScaLAPACK.spec, 1.11, 1.12 Message-ID: <200603091452.k29EqMVZ032350@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32271/FC-4 Modified Files: R-RScaLAPACK.spec Added Files: R-RScaLAPACK-0.5.1-blacsfix.patch R-RScaLAPACK-0.5.1-configurefix.patch R-RScaLAPACK-0.5.1-gcc4.patch Log Message: With scalapack finally working, we can get this thing going as well. R-RScaLAPACK-0.5.1-blacsfix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-blacsfix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c.BAD 2006-02-26 11:14:18.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c 2006-02-26 11:14:42.000000000 -0600 @@ -113,7 +113,7 @@ * the function is sla.gridExit, so exit. */ if (ipGridAndDims[8] == 0 && rel_flag == 1){ - F77_CALL(blacs_exit_)(&exitTemp); + F77_CALL(blacs_exit)(&exitTemp); printf ("Exiting BLACS ... rank = %d\n",iMyRank); return AsInt(1); } @@ -127,7 +127,7 @@ /* Uses BLACS call to perform MPI_Init */ int CR_InitializeEnv(int *ipMyRank, int *ipNumProcs) { - F77_CALL(blacs_pinfo_)(ipMyRank, ipNumProcs); + F77_CALL(blacs_pinfo)(ipMyRank, ipNumProcs); return 0; } @@ -534,7 +534,7 @@ D_Rprintf ((" Process 0 ... in cntrl statement ..after init \n")); - F77_CALL(blacs_get_)(&temp1, &temp2, &ictxt); + F77_CALL(blacs_get)(&temp1, &temp2, &ictxt); /* Calculate the value for WATOBD */ D_Rprintf ((" Process 0 ... in cntrl statement ..1 \n")); R-RScaLAPACK-0.5.1-configurefix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-configurefix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in.BAD 2006-02-26 10:06:00.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in 2006-02-26 10:16:03.000000000 -0600 @@ -135,7 +135,7 @@ AC_MSG_NOTICE(LAM-libmpi.a not found) MPI_LAM=no ]) - AC_CHECK_LIB(lamf77mpi, mpi_comm_create__,[ + AC_CHECK_LIB(lamf77mpi, mpi_comm_create_,[ LIBS="-llamf77mpi ${LIBS}" MPI_LAM=yes ],[ @@ -258,8 +258,8 @@ else AC_LANG_PUSH(Fortran 77) AC_CHECK_LIB(blas, ztrsm,[ - LIBS="-lf77blas ${LIBS}"], [ - AC_MSG_ERROR(libf77blas.a not found,-1) + LIBS="-lblas ${LIBS}"], [ + AC_MSG_ERROR(libblas.a not found,-1) ]) AC_LANG_POP(Fortran 77) fi @@ -297,16 +297,16 @@ AC_MSG_ERROR(libcblacsF77init.a not found,-1) fi else - AC_CHECK_LIB(blacs, Cblacs_gridexit,[], [ - AC_MSG_ERROR(libblacs.a not found,-1) + AC_CHECK_LIB(mpiblacs, Cblacs_gridexit,[], [ + AC_MSG_ERROR(libmpiblacs.a not found,-1) ]) - AC_CHECK_LIB(blacsCinit, Cblacs_pinfo,[],[ - AC_MSG_ERROR(libblacsCinit.a not found,-1) + AC_CHECK_LIB(mpiblacsCinit, Cblacs_pinfo,[],[ + AC_MSG_ERROR(libmpiblacsCinit.a not found,-1) ]) - AC_CHECK_LIB(blacsF77init, blacs_pinfo__,[],[ - AC_MSG_ERROR(libblacsF77init.a not found,-1) + AC_CHECK_LIB(mpiblacsF77init, blacs_pinfo_,[],[ + AC_MSG_ERROR(libmpiblacsF77init.a not found,-1) ]) fi R-RScaLAPACK-0.5.1-gcc4.patch: --- NEW FILE R-RScaLAPACK-0.5.1-gcc4.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.BAD 2006-02-25 10:23:29.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile 2006-02-25 10:23:41.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in.BAD 2006-02-26 11:12:04.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in 2006-02-26 11:12:13.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-4/R-RScaLAPACK.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- R-RScaLAPACK.spec 13 Jun 2005 04:17:34 -0000 1.11 +++ R-RScaLAPACK.spec 9 Mar 2006 14:51:50 -0000 1.12 @@ -1,25 +1,23 @@ %define packname RScaLAPACK +%define lamdir %{_libdir}/lam Name: R-%{packname} -Version: 0.4.0 -Release: 12%{?dist} +Version: 0.5.1 +Release: 2%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib Group: Applications/Engineering Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK -BuildRequires: R-devel, tetex-latex -BuildRequires: gcc-gfortran, lam, blacs, scalapack +BuildRequires: R-devel, tetex-latex, lapack-devel +BuildRequires: gcc-gfortran, lam, blacs-devel, scalapack-devel, autoconf Requires: R, scalapack BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch -Patch1: R-RScaLAPACK-0.4.0-gcc4.patch +Patch1: R-RScaLAPACK-0.5.1-gcc4.patch Patch2: R-RScaLAPACK-0.4.0-lam-mpi-blacs64.patch -# -# Normally, this is bad form, but we need to do this. -# lam needs to be built with -fPIC for x86_64 to work. -# -ExcludeArch: x86_64 +Patch3: R-RScaLAPACK-0.5.1-configurefix.patch +Patch4: R-RScaLAPACK-0.5.1-blacsfix.patch %description R package: @@ -35,14 +33,19 @@ %patch0 -p1 %endif %patch1 -p1 +%patch3 -p1 +%patch4 -p1 %build +cd RScaLAPACK +autoconf +cd .. cp %{packname}/DESCRIPTION . %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library -%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} +%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} # %{_bindir}/R CMD check %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css @@ -51,19 +54,23 @@ rm -rf $RPM_BUILD_ROOT %post -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %defattr(-,root,root,-) %doc DESCRIPTION -%{_libdir}/R/library/%{packname} +%{_libdir}/R/library/%{packname}/ %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 +- get this thing working again + +* Mon Jan 9 2006 Tom "spot" Callaway 0.5.1-1 +- bump to 0.5.1 + * Mon May 16 2005 Tom "spot" Callaway 0.4.0-9 - test fails unless you are running it on a lam cluster, so don't run it here From fedora-extras-commits at redhat.com Thu Mar 9 14:51:56 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 09:51:56 -0500 Subject: rpms/R-RScaLAPACK/devel R-RScaLAPACK-0.5.1-blacsfix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-configurefix.patch, NONE, 1.1 R-RScaLAPACK-0.5.1-gcc4.patch, NONE, 1.1 R-RScaLAPACK.spec, 1.11, 1.12 Message-ID: <200603091452.k29EqS6f032355@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32271/devel Modified Files: R-RScaLAPACK.spec Added Files: R-RScaLAPACK-0.5.1-blacsfix.patch R-RScaLAPACK-0.5.1-configurefix.patch R-RScaLAPACK-0.5.1-gcc4.patch Log Message: With scalapack finally working, we can get this thing going as well. R-RScaLAPACK-0.5.1-blacsfix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-blacsfix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c.BAD 2006-02-26 11:14:18.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/CRscalapack.c 2006-02-26 11:14:42.000000000 -0600 @@ -113,7 +113,7 @@ * the function is sla.gridExit, so exit. */ if (ipGridAndDims[8] == 0 && rel_flag == 1){ - F77_CALL(blacs_exit_)(&exitTemp); + F77_CALL(blacs_exit)(&exitTemp); printf ("Exiting BLACS ... rank = %d\n",iMyRank); return AsInt(1); } @@ -127,7 +127,7 @@ /* Uses BLACS call to perform MPI_Init */ int CR_InitializeEnv(int *ipMyRank, int *ipNumProcs) { - F77_CALL(blacs_pinfo_)(ipMyRank, ipNumProcs); + F77_CALL(blacs_pinfo)(ipMyRank, ipNumProcs); return 0; } @@ -534,7 +534,7 @@ D_Rprintf ((" Process 0 ... in cntrl statement ..after init \n")); - F77_CALL(blacs_get_)(&temp1, &temp2, &ictxt); + F77_CALL(blacs_get)(&temp1, &temp2, &ictxt); /* Calculate the value for WATOBD */ D_Rprintf ((" Process 0 ... in cntrl statement ..1 \n")); R-RScaLAPACK-0.5.1-configurefix.patch: --- NEW FILE R-RScaLAPACK-0.5.1-configurefix.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in.BAD 2006-02-26 10:06:00.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/configure.in 2006-02-26 10:16:03.000000000 -0600 @@ -135,7 +135,7 @@ AC_MSG_NOTICE(LAM-libmpi.a not found) MPI_LAM=no ]) - AC_CHECK_LIB(lamf77mpi, mpi_comm_create__,[ + AC_CHECK_LIB(lamf77mpi, mpi_comm_create_,[ LIBS="-llamf77mpi ${LIBS}" MPI_LAM=yes ],[ @@ -258,8 +258,8 @@ else AC_LANG_PUSH(Fortran 77) AC_CHECK_LIB(blas, ztrsm,[ - LIBS="-lf77blas ${LIBS}"], [ - AC_MSG_ERROR(libf77blas.a not found,-1) + LIBS="-lblas ${LIBS}"], [ + AC_MSG_ERROR(libblas.a not found,-1) ]) AC_LANG_POP(Fortran 77) fi @@ -297,16 +297,16 @@ AC_MSG_ERROR(libcblacsF77init.a not found,-1) fi else - AC_CHECK_LIB(blacs, Cblacs_gridexit,[], [ - AC_MSG_ERROR(libblacs.a not found,-1) + AC_CHECK_LIB(mpiblacs, Cblacs_gridexit,[], [ + AC_MSG_ERROR(libmpiblacs.a not found,-1) ]) - AC_CHECK_LIB(blacsCinit, Cblacs_pinfo,[],[ - AC_MSG_ERROR(libblacsCinit.a not found,-1) + AC_CHECK_LIB(mpiblacsCinit, Cblacs_pinfo,[],[ + AC_MSG_ERROR(libmpiblacsCinit.a not found,-1) ]) - AC_CHECK_LIB(blacsF77init, blacs_pinfo__,[],[ - AC_MSG_ERROR(libblacsF77init.a not found,-1) + AC_CHECK_LIB(mpiblacsF77init, blacs_pinfo_,[],[ + AC_MSG_ERROR(libmpiblacsF77init.a not found,-1) ]) fi R-RScaLAPACK-0.5.1-gcc4.patch: --- NEW FILE R-RScaLAPACK-0.5.1-gcc4.patch --- --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.BAD 2006-02-25 10:23:29.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile 2006-02-25 10:23:41.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: --- R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in.BAD 2006-02-26 11:12:04.000000000 -0600 +++ R-RScaLAPACK-0.5.1/RScaLAPACK/src/Makefile.in 2006-02-26 11:12:13.000000000 -0600 @@ -16,10 +16,10 @@ all: CRDriver RScaLAPACK.so RScaLAPACK.so: $(PA_OBJECTS) - $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lg2c $(LDFLAGS) $(PALIBS) -o $@ + $(SHLIB_LINK) $(PA_OBJECTS) $(CFLAGS) -lgfortran $(LDFLAGS) $(PALIBS) -o $@ CRDriver: CRDriver.o $(CR_OBJECTS) - $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lg2c -o $@ + $(CC) CRDriver.o $(CR_OBJECTS) $(LDFLAGS) $(LIBS) $(CFLAGS) -lgfortran -o $@ cp CRDriver $(exec_dir) clean: Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- R-RScaLAPACK.spec 13 Jun 2005 04:17:39 -0000 1.11 +++ R-RScaLAPACK.spec 9 Mar 2006 14:51:55 -0000 1.12 @@ -1,25 +1,23 @@ %define packname RScaLAPACK +%define lamdir %{_libdir}/lam Name: R-%{packname} -Version: 0.4.0 -Release: 12%{?dist} +Version: 0.5.1 +Release: 2%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib Group: Applications/Engineering Summary: An interface to perform parallel computation on linear algebra problems using ScaLAPACK -BuildRequires: R-devel, tetex-latex -BuildRequires: gcc-gfortran, lam, blacs, scalapack +BuildRequires: R-devel, tetex-latex, lapack-devel +BuildRequires: gcc-gfortran, lam, blacs-devel, scalapack-devel, autoconf Requires: R, scalapack BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: R-RScaLAPACK-0.4.0-lam-mpi-blacs.patch -Patch1: R-RScaLAPACK-0.4.0-gcc4.patch +Patch1: R-RScaLAPACK-0.5.1-gcc4.patch Patch2: R-RScaLAPACK-0.4.0-lam-mpi-blacs64.patch -# -# Normally, this is bad form, but we need to do this. -# lam needs to be built with -fPIC for x86_64 to work. -# -ExcludeArch: x86_64 +Patch3: R-RScaLAPACK-0.5.1-configurefix.patch +Patch4: R-RScaLAPACK-0.5.1-blacsfix.patch %description R package: @@ -35,14 +33,19 @@ %patch0 -p1 %endif %patch1 -p1 +%patch3 -p1 +%patch4 -p1 %build +cd RScaLAPACK +autoconf +cd .. cp %{packname}/DESCRIPTION . %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir}/R/library -%{_bindir}/R CMD INSTALL -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} +%{_bindir}/R CMD INSTALL --configure-args="CFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -lmpiblacsCinit -lmpiblacs -llam -llamf77mpi -lmpi -llapack' FFLAGS='$RPM_OPT_FLAGS -I%{_includedir}/lam/ -L%{lamdir} -lutil -llapack'" -l $RPM_BUILD_ROOT%{_libdir}/R/library %{packname} # %{_bindir}/R CMD check %{packname} test -d %{packname}/src && (cd %{packname}/src; rm -f *.o *.so) rm -rf $RPM_BUILD_ROOT%{_libdir}/R/library/R.css @@ -51,19 +54,23 @@ rm -rf $RPM_BUILD_ROOT %post -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %postun -%{_bindir}/R CMD perl %{_libdir}/R/share/perl/build-help.pl --htmllists cat %{_libdir}/R/library/*/CONTENTS > %{_libdir}/R/doc/html/search/index.txt %files %defattr(-,root,root,-) %doc DESCRIPTION -%{_libdir}/R/library/%{packname} +%{_libdir}/R/library/%{packname}/ %changelog +* Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 +- get this thing working again + +* Mon Jan 9 2006 Tom "spot" Callaway 0.5.1-1 +- bump to 0.5.1 + * Mon May 16 2005 Tom "spot" Callaway 0.4.0-9 - test fails unless you are running it on a lam cluster, so don't run it here From fedora-extras-commits at redhat.com Thu Mar 9 15:06:32 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:06:32 -0500 Subject: rpms/perl-YAML-Parser-Syck - New directory Message-ID: <200603091506.k29F6YCA001870@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1862/perl-YAML-Parser-Syck Log Message: Directory /cvs/extras/rpms/perl-YAML-Parser-Syck added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 15:06:38 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:06:38 -0500 Subject: rpms/perl-YAML-Parser-Syck/devel - New directory Message-ID: <200603091506.k29F6el8001885@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1862/perl-YAML-Parser-Syck/devel Log Message: Directory /cvs/extras/rpms/perl-YAML-Parser-Syck/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 15:07:09 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:07:09 -0500 Subject: rpms/perl-YAML-Parser-Syck Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603091507.k29F7Bjd001924@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1911 Added Files: Makefile import.log Log Message: Setup of module perl-YAML-Parser-Syck --- NEW FILE Makefile --- # Top level Makefile for module perl-YAML-Parser-Syck all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 9 15:07:15 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:07:15 -0500 Subject: rpms/perl-YAML-Parser-Syck/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603091507.k29F7UZQ001954@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1911/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-YAML-Parser-Syck --- NEW 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 Mar 9 15:08:20 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:08:20 -0500 Subject: rpms/perl-YAML-Parser-Syck import.log,1.1,1.2 Message-ID: <200603091508.k29F8qsf002034@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000 Modified Files: import.log Log Message: auto-import perl-YAML-Parser-Syck-0.01-4 on branch devel from perl-YAML-Parser-Syck-0.01-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Mar 2006 15:07:09 -0000 1.1 +++ import.log 9 Mar 2006 15:08:20 -0000 1.2 @@ -0,0 +1 @@ +perl-YAML-Parser-Syck-0_01-4:HEAD:perl-YAML-Parser-Syck-0.01-4.src.rpm:1141916892 From fedora-extras-commits at redhat.com Thu Mar 9 15:08:43 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:08:43 -0500 Subject: rpms/perl-YAML-Parser-Syck/devel perl-YAML-Parser-Syck.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603091509.k29F9KK7002039@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2000/devel Modified Files: .cvsignore sources Added Files: perl-YAML-Parser-Syck.spec Log Message: auto-import perl-YAML-Parser-Syck-0.01-4 on branch devel from perl-YAML-Parser-Syck-0.01-4.src.rpm --- NEW FILE perl-YAML-Parser-Syck.spec --- Name: perl-YAML-Parser-Syck Version: 0.01 Release: 4 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)) %description libsyck is a *gift* from a gifted Stiff named 'Why'. YAML::Parser::Syck is an XS module that binds libsyck to Perl. %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} %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/* %check %{__make} test %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Artistic COPYING Changes %{perl_vendorarch}/* %{_mandir}/man3/*.3* %changelog * Wed Sep 7 2005 Paul Howarth - 0.01-4 - Remove pkgname macro for clarity - Remove redundant BR: perl - More specific URL - License is same as perl (GPL or Artistic), not just Artistic - Add BR: syck-devel - Tidy summary - Remove redundant "|| :" from %%check - Use perl_vendorarch, not perl_vendorlib for arch-specific package - Unconditionally remove buildroot in %%clean - Simplify compiler optimization flags setup - Include license text - Include Changes - Use macros consistently * Thu May 19 2005 Oliver Falk - 0.01-3 - Absolute new specfile (fedora template) * Sun Apr 03 2005 Oliver Falk - 0.01-2.1 - Rebuild against syck 0.53 * Wed Mar 16 2005 Oliver Falk - 0.01-2 - BuildRequire syck - Speclean (a bit) changelog * Thu Jan 20 2005 Oliver Falk - 0.01-1 - Initial build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2006 15:07:15 -0000 1.1 +++ .cvsignore 9 Mar 2006 15:08:43 -0000 1.2 @@ -0,0 +1 @@ +YAML-Parser-Syck-0.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-YAML-Parser-Syck/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2006 15:07:15 -0000 1.1 +++ sources 9 Mar 2006 15:08:43 -0000 1.2 @@ -0,0 +1 @@ +03e5e469259d959471468e9e84b8f918 YAML-Parser-Syck-0.01.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 15:09:53 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 9 Mar 2006 10:09:53 -0500 Subject: rpms/freeciv/FC-4 .cvsignore, 1.10, 1.11 freeciv.spec, 1.15, 1.16 sources, 1.10, 1.11 Message-ID: <200603091510.k29FAP6c002107@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2079 Modified Files: .cvsignore freeciv.spec sources Log Message: * Thu Mar 9 2006 Brian Pepple - 2.0.8-1 - Update to 2.0.8 (fixes #184507). - Remove unnecessary BR (alsa-lib-devel & SDL-devel). Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 6 Nov 2005 15:25:58 -0000 1.10 +++ .cvsignore 9 Mar 2006 15:09:53 -0000 1.11 @@ -1,2 +1,2 @@ -freeciv-2.0.7.tar.bz2 +freeciv-2.0.8.tar.bz2 stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/freeciv.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- freeciv.spec 6 Nov 2005 15:25:58 -0000 1.15 +++ freeciv.spec 9 Mar 2006 15:09:53 -0000 1.16 @@ -1,6 +1,6 @@ Name: freeciv -Version: 2.0.7 -Release: 2%{?dist} +Version: 2.0.8 +Release: 1%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games @@ -18,10 +18,8 @@ BuildRequires: readline-devel BuildRequires: zlib-devel BuildRequires: bind-devel -BuildRequires: SDL-devel BuildRequires: SDL_mixer-devel BuildRequires: esound-devel -BuildRequires: alsa-lib-devel BuildRequires: ncurses-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -90,6 +88,10 @@ %{_mandir}/man6/civclient.6.gz %changelog +* Thu Mar 9 2006 Brian Pepple - 2.0.8-1 +- Update to 2.0.8 (fixes #184507). +- Remove unnecessary BR (alsa-lib-devel & SDL-devel). + * Sun Nov 6 2005 Brian Pepple - 2.0.7-2 - Update to 2.0.7. - Modify desktop patch for upstream fixes. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 6 Nov 2005 15:25:58 -0000 1.10 +++ sources 9 Mar 2006 15:09:53 -0000 1.11 @@ -1,2 +1,2 @@ -7a60ea8f39822036b86640532accc5ce freeciv-2.0.7.tar.bz2 +9ebd5899c2c78362e0e2c68791673a88 freeciv-2.0.8.tar.bz2 77215914712f2f351092918f5e41e39e stdsounds3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 15:13:02 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Thu, 9 Mar 2006 10:13:02 -0500 Subject: rpms/perl-YAML-Parser-Syck/devel perl-YAML-Parser-Syck.spec, 1.1, 1.2 Message-ID: <200603091513.k29FDYlO002195@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/perl-YAML-Parser-Syck/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2175 Modified Files: perl-YAML-Parser-Syck.spec Log Message: * Thu Mar 09 2006 Oliver Falk - 0.01-5 - Add dist-tag - Rebuild 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.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-YAML-Parser-Syck.spec 9 Mar 2006 15:08:43 -0000 1.1 +++ perl-YAML-Parser-Syck.spec 9 Mar 2006 15:13:01 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-YAML-Parser-Syck Version: 0.01 -Release: 4 +Release: 5%{?dist} Summary: Perl Wrapper for the YAML Parser Extension: libsyck Group: Development/Libraries @@ -8,7 +8,7 @@ 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 +BuildRequires: syck-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -46,6 +46,10 @@ %{_mandir}/man3/*.3* %changelog +* Thu Mar 09 2006 Oliver Falk - 0.01-5 +- Add dist-tag +- Rebuild + * Wed Sep 7 2005 Paul Howarth - 0.01-4 - Remove pkgname macro for clarity - Remove redundant BR: perl From fedora-extras-commits at redhat.com Thu Mar 9 15:24:12 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 9 Mar 2006 10:24:12 -0500 Subject: rpms/freeciv/FC-3 freeciv-desktop.patch, 1.2, 1.3 .cvsignore, 1.5, 1.6 freeciv.spec, 1.5, 1.6 sources, 1.5, 1.6 freeciv_desktop.patch, 1.1, NONE Message-ID: <200603091524.k29FOiJ0002339@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/freeciv/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2311 Modified Files: .cvsignore freeciv.spec sources Added Files: freeciv-desktop.patch Removed Files: freeciv_desktop.patch Log Message: * Thu Mar 9 2006 Brian Pepple - 2.0.8-1 - Add dist tag. - Update to 2.0.8 (fixes #184507). - Remove unnecessary BR (alsa-lib-devel & SDL-devel). - Use new stdsounds. freeciv-desktop.patch: Index: freeciv-desktop.patch =================================================================== RCS file: freeciv-desktop.patch diff -N freeciv-desktop.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ freeciv-desktop.patch 9 Mar 2006 15:24:12 -0000 1.3 @@ -0,0 +1,12 @@ +diff -ur freeciv-2.0.7.OLD/bootstrap/freeciv.desktop.in freeciv-2.0.7/bootstrap/freeciv.desktop.in +--- freeciv-2.0.7.OLD/bootstrap/freeciv.desktop.in 2005-10-13 13:38:05.000000000 -0400 ++++ freeciv-2.0.7/bootstrap/freeciv.desktop.in 2005-11-06 09:58:18.000000000 -0500 +@@ -14,7 +14,7 @@ + Comment[pl]=Gra strategiczna podobna do Cywilizacji(TM) + Comment[pt]=Jogo similar ao Civilization(TM) + Exec=civclient +-Icon=gnome-globe.png ++Icon=freeciv.xpm + StartupNotify=true + Terminal=false + Type=Application Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-3/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Apr 2005 02:12:51 -0000 1.5 +++ .cvsignore 9 Mar 2006 15:24:12 -0000 1.6 @@ -1,2 +1,2 @@ -freeciv-2.0.0.tar.bz2 -stdsounds2.tar.gz +freeciv-2.0.8.tar.bz2 +stdsounds3.tar.gz Index: freeciv.spec =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-3/freeciv.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- freeciv.spec 19 Apr 2005 03:12:41 -0000 1.5 +++ freeciv.spec 9 Mar 2006 15:24:12 -0000 1.6 @@ -1,16 +1,16 @@ Name: freeciv -Version: 2.0.0 -Release: 3.fc3 +Version: 2.0.8 +Release: 1%{?dist} Summary: The Freeciv multi-player strategy game Group: Amusements/Games License: GPL URL: http://www.freeciv.org/index.php/Freeciv Source0: ftp://freeciv.org/pub/freeciv/stable/%{name}-%{version}.tar.bz2 -Source1: http://www.freeciv.org/ftp/contrib/sounds/sets/stdsounds2.tar.gz +Source1: ftp://ftp.freeciv.org/%{name}/contrib/sounds/sets/stdsounds3.tar.gz Source2: %{name}-server.desktop Source3: %{name}.xpm -Patch1: %{name}_desktop.patch +Patch1: %{name}-desktop.patch Patch2: %{name}-aifill.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,10 +18,8 @@ BuildRequires: readline-devel BuildRequires: zlib-devel BuildRequires: bind-devel -BuildRequires: SDL-devel BuildRequires: SDL_mixer-devel BuildRequires: esound-devel -BuildRequires: alsa-lib-devel BuildRequires: ncurses-devel BuildRequires: desktop-file-utils BuildRequires: gettext @@ -35,12 +33,11 @@ %prep %setup -q -n %{name}-%{version} -%patch1 -p0 -b .desktop +%patch1 -p1 -b .desktop %patch2 -p0 -b .aifill %build -%configure --enable-debug=no \ - --enable-client=gtk2 +%configure --enable-client=gtk2 make %{?_smp_mflags} %install @@ -62,7 +59,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/civmanual # Add the sound files. -(cd $RPM_BUILD_ROOT%{_datadir}/freeciv; tar xzf %{SOURCE1}; ) +tar xzf %{SOURCE1} +cp -p data/stdsounds.soundspec $RPM_BUILD_ROOT%{_datadir}/%{name} +mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds +cp -p data/stdsounds/*.ogg $RPM_BUILD_ROOT%{_datadir}/%{name}/stdsounds %{__install} -D -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.xpm @@ -82,11 +82,17 @@ %{_bindir}/civclient %{_datadir}/%{name} %{_datadir}/pixmaps/%{name}.xpm -%config %{_datadir}/applications/* +%{_datadir}/applications/fedora-*.desktop %{_mandir}/man6/civserver.6.gz %{_mandir}/man6/civclient.6.gz %changelog +* Thu Mar 9 2006 Brian Pepple - 2.0.8-1 +- Add dist tag. +- Update to 2.0.8 (fixes #184507). +- Remove unnecessary BR (alsa-lib-devel & SDL-devel). +- Use new stdsounds. + * Mon Apr 18 2005 Brian Pepple - 2.0.0-3.fc3 - Re-add patch to set aifill to 5 on new servers to get some opponents. Index: sources =================================================================== RCS file: /cvs/extras/rpms/freeciv/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Apr 2005 02:12:51 -0000 1.5 +++ sources 9 Mar 2006 15:24:12 -0000 1.6 @@ -1,2 +1,2 @@ -fa7170026cc2aefdafd43b27a4bfaf80 freeciv-2.0.0.tar.bz2 -63b06631addeaccf45bc4bf6b8ddf7b3 stdsounds2.tar.gz +9ebd5899c2c78362e0e2c68791673a88 freeciv-2.0.8.tar.bz2 +77215914712f2f351092918f5e41e39e stdsounds3.tar.gz --- freeciv_desktop.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 9 16:15:38 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 11:15:38 -0500 Subject: rpms/lyx/devel lyx.spec,1.29,1.30 Message-ID: <200603091616.k29GGAhX004332@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4315 Modified Files: lyx.spec Log Message: * Thu Mar 09 2006 Rex Dieter 1.4.0-4 - fix stripping of -fexceptions from %optflags Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- lyx.spec 8 Mar 2006 19:45:52 -0000 1.29 +++ lyx.spec 9 Mar 2006 16:15:37 -0000 1.30 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Publishing @@ -99,10 +99,10 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -# drop -fexceptions from RPM_OPT_FLAGS, suggested by lyx devs: +# drop -fexceptions from optflags, suggested by lyx devs: # http://www.mail-archive.com/lyx-devel at lists.lyx.org/msg85794.html -export CFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )" -export CXXFLAGS="$(echo %optflags | sed -e 's|-fexceptions||' )" +optflags="$(echo %optflags | sed -e 's|-fexceptions||' )" +%global optflags $optflags for frontend in qt xforms ; do @@ -110,7 +110,7 @@ --disable-rpath \ --enable-compression-support \ --with-frontend=$frontend \ - --enable-optimization="$RPM_OPT_FLAGS" \ + --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ --without-warnings --disable-dependency-tracking \ @@ -203,6 +203,9 @@ %changelog +* Thu Mar 09 2006 Rex Dieter 1.4.0-4 +- fix stripping of -fexceptions from %%optflags + * Wed Mar 08 2006 Rex Dieter 1.4.0-3 - include beamer.layout From fedora-extras-commits at redhat.com Thu Mar 9 16:50:08 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 9 Mar 2006 11:50:08 -0500 Subject: rpms/pcsc-tools/devel .cvsignore, 1.3, 1.4 pcsc-tools.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603091650.k29Goeti004613@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4585 Modified Files: .cvsignore pcsc-tools.spec sources Log Message: * Thu Mar 9 2006 Ville Skytt?? - 1.4.3-1 - 1.4.3. - Improve description. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Mar 2006 18:37:12 -0000 1.3 +++ .cvsignore 9 Mar 2006 16:50:07 -0000 1.4 @@ -1 +1 @@ -pcsc-tools-1.4.2.tar.gz +pcsc-tools-1.4.3.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pcsc-tools.spec 8 Mar 2006 18:37:12 -0000 1.4 +++ pcsc-tools.spec 9 Mar 2006 16:50:07 -0000 1.5 @@ -1,5 +1,5 @@ Name: pcsc-tools -Version: 1.4.2 +Version: 1.4.3 Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC @@ -15,14 +15,11 @@ Requires: pcsc-lite %description -The pcsc-tools package contains some tools useful for a PC/SC user. -The tools provided are: -* pcsc_scan(1) scans available smart card readers and print detected - events: card insertion with ATR, card removal; -* ATR_analysis(1) analyses a smart card ATR (Anwser To Reset) -* scriptor(1) Perl script to send commands to a smart card using a - batch file or stdin; -* gscriptor(1) the same idea as scriptor(1) but with Perl-Gtk GUI. +The pcsc-tools package contains some useful tools for a PC/SC user: +pcsc_scan regularly scans connected PC/SC smart card readers and +prints detected events, ATR_analysis analyzes smart card ATRs (Anwser +To Reset), scriptor sends commands to a smart card, and gscriptor does +that from a GTK user interface. %prep @@ -44,9 +41,6 @@ %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT%{_prefix} -install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pcsc -mv $RPM_BUILD_ROOT%{_prefix}/pcsc/* $RPM_BUILD_ROOT%{_datadir}/pcsc -rmdir $RPM_BUILD_ROOT%{_prefix}/pcsc desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ @@ -70,6 +64,10 @@ %changelog +* Thu Mar 9 2006 Ville Skytt?? - 1.4.3-1 +- 1.4.3. +- Improve description. + * Wed Mar 8 2006 Ville Skytt?? - 1.4.2-1 - 1.4.2, desktop file, recent smartcard_list.txt, ATR_analysis message patch and smartcard_list.txt lookup path improvement included upstream. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Mar 2006 18:37:12 -0000 1.3 +++ sources 9 Mar 2006 16:50:07 -0000 1.4 @@ -1 +1 @@ -9cd68c933fafda78f844b114319a52b8 pcsc-tools-1.4.2.tar.gz +c21a0865983d0f3eb9841eb4d03e67f1 pcsc-tools-1.4.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 16:52:22 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 11:52:22 -0500 Subject: rpms/R-RScaLAPACK/FC-3 R-RScaLAPACK.spec,1.12,1.13 sources,1.2,1.3 Message-ID: <200603091652.k29Gqswq004714@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4662/FC-3 Modified Files: R-RScaLAPACK.spec sources Log Message: Upload the source before building. :P Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-3/R-RScaLAPACK.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- R-RScaLAPACK.spec 9 Mar 2006 14:51:43 -0000 1.12 +++ R-RScaLAPACK.spec 9 Mar 2006 16:52:22 -0000 1.13 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib @@ -65,6 +65,9 @@ %{_libdir}/R/library/%{packname}/ %changelog +* Thu Mar 9 2006 Tom "spot" Callaway 0.5.1-3 +- forgot to upload source + * Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 - get this thing working again Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Apr 2005 17:48:06 -0000 1.2 +++ sources 9 Mar 2006 16:52:22 -0000 1.3 @@ -1 +1 @@ -e086b79d25d1c5d1eba377b632609d67 RScaLAPACK_0.4.0.tar.gz +906d69b630dbd4a50960b2ce099d460f RScaLAPACK_0.5.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 16:52:28 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 11:52:28 -0500 Subject: rpms/R-RScaLAPACK/FC-4 R-RScaLAPACK.spec,1.12,1.13 sources,1.2,1.3 Message-ID: <200603091653.k29Gr0UH004718@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4662/FC-4 Modified Files: R-RScaLAPACK.spec sources Log Message: Upload the source before building. :P Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-4/R-RScaLAPACK.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- R-RScaLAPACK.spec 9 Mar 2006 14:51:50 -0000 1.12 +++ R-RScaLAPACK.spec 9 Mar 2006 16:52:27 -0000 1.13 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib @@ -65,6 +65,9 @@ %{_libdir}/R/library/%{packname}/ %changelog +* Thu Mar 9 2006 Tom "spot" Callaway 0.5.1-3 +- forgot to upload source + * Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 - get this thing working again Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Apr 2005 17:48:06 -0000 1.2 +++ sources 9 Mar 2006 16:52:27 -0000 1.3 @@ -1 +1 @@ -e086b79d25d1c5d1eba377b632609d67 RScaLAPACK_0.4.0.tar.gz +906d69b630dbd4a50960b2ce099d460f RScaLAPACK_0.5.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 16:52:36 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Thu, 9 Mar 2006 11:52:36 -0500 Subject: rpms/R-RScaLAPACK/devel .cvsignore, 1.2, 1.3 R-RScaLAPACK.spec, 1.12, 1.13 sources, 1.2, 1.3 Message-ID: <200603091653.k29Gr9R8004723@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/R-RScaLAPACK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4662/devel Modified Files: .cvsignore R-RScaLAPACK.spec sources Log Message: Upload the source before building. :P Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Apr 2005 17:48:06 -0000 1.2 +++ .cvsignore 9 Mar 2006 16:52:36 -0000 1.3 @@ -1 +1,2 @@ RScaLAPACK_0.4.0.tar.gz +RScaLAPACK_0.5.1.tar.gz Index: R-RScaLAPACK.spec =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/R-RScaLAPACK.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- R-RScaLAPACK.spec 9 Mar 2006 14:51:55 -0000 1.12 +++ R-RScaLAPACK.spec 9 Mar 2006 16:52:36 -0000 1.13 @@ -3,7 +3,7 @@ Name: R-%{packname} Version: 0.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Source0: ftp://cran.r-project.org/pub/R/contrib/main/%{packname}_%{version}.tar.gz License: Freely distributable URL: http://cran.r-project.org/contrib @@ -65,6 +65,9 @@ %{_libdir}/R/library/%{packname}/ %changelog +* Thu Mar 9 2006 Tom "spot" Callaway 0.5.1-3 +- forgot to upload source + * Sun Feb 26 2006 Tom "spot" Callaway 0.5.1-2 - get this thing working again Index: sources =================================================================== RCS file: /cvs/extras/rpms/R-RScaLAPACK/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Apr 2005 17:48:06 -0000 1.2 +++ sources 9 Mar 2006 16:52:36 -0000 1.3 @@ -1 +1 @@ -e086b79d25d1c5d1eba377b632609d67 RScaLAPACK_0.4.0.tar.gz +906d69b630dbd4a50960b2ce099d460f RScaLAPACK_0.5.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 17:04:24 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 12:04:24 -0500 Subject: rpms/perl-GD/FC-4 .cvsignore, 1.8, 1.9 perl-GD.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200603091704.k29H4xQK006777@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6739/FC-4 Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.32. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Feb 2006 18:15:37 -0000 1.8 +++ .cvsignore 9 Mar 2006 17:04:24 -0000 1.9 @@ -1 +1 @@ -GD-2.31.tar.gz +GD-2.32.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/perl-GD.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-GD.spec 21 Feb 2006 18:15:37 -0000 1.10 +++ perl-GD.spec 9 Mar 2006 17:04:24 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-GD -Version: 2.31 +Version: 2.32 Release: 1%{?dist} Summary: Perl interface to the GD graphics library @@ -25,7 +25,7 @@ %prep %setup -q -n GD-%{version} %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \ - qd.pl bdf_scripts/bdf2gdfont.pl demos/{*.{pl,cgi},truetype_test} + qd.pl demos/{*.{pl,cgi},truetype_test} chmod 644 bdf_scripts/* demos/* chmod 755 qd.pl @@ -64,6 +64,9 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 2.32-1 +- Update to 2.32. + * Tue Feb 21 2006 Jose Pedro Oliveira - 2.31-1 - Update to 2.31. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Feb 2006 18:15:37 -0000 1.8 +++ sources 9 Mar 2006 17:04:24 -0000 1.9 @@ -1 +1 @@ -71e5050c45d2270984b271cbd9ec897b GD-2.31.tar.gz +84a79a60966b2de61dbf622342e3ee3d GD-2.32.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 17:04:31 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 12:04:31 -0500 Subject: rpms/perl-GD/devel .cvsignore, 1.8, 1.9 perl-GD.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200603091705.k29H53N0006782@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-GD/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6739/devel Modified Files: .cvsignore perl-GD.spec sources Log Message: Update to 2.32. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 21 Feb 2006 18:10:28 -0000 1.8 +++ .cvsignore 9 Mar 2006 17:04:30 -0000 1.9 @@ -1 +1 @@ -GD-2.31.tar.gz +GD-2.32.tar.gz Index: perl-GD.spec =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/perl-GD.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-GD.spec 21 Feb 2006 18:10:28 -0000 1.13 +++ perl-GD.spec 9 Mar 2006 17:04:30 -0000 1.14 @@ -1,5 +1,5 @@ Name: perl-GD -Version: 2.31 +Version: 2.32 Release: 1%{?dist} Summary: Perl interface to the GD graphics library @@ -26,7 +26,7 @@ %prep %setup -q -n GD-%{version} %{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \ - qd.pl bdf_scripts/bdf2gdfont.pl demos/{*.{pl,cgi},truetype_test} + qd.pl demos/{*.{pl,cgi},truetype_test} chmod 644 bdf_scripts/* demos/* chmod 755 qd.pl @@ -65,6 +65,9 @@ %changelog +* Wed Mar 8 2006 Jose Pedro Oliveira - 2.32-1 +- Update to 2.32. + * Tue Feb 21 2006 Jose Pedro Oliveira - 2.31-1 - Update to 2.31. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-GD/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 21 Feb 2006 18:10:28 -0000 1.8 +++ sources 9 Mar 2006 17:04:30 -0000 1.9 @@ -1 +1 @@ -71e5050c45d2270984b271cbd9ec897b GD-2.31.tar.gz +84a79a60966b2de61dbf622342e3ee3d GD-2.32.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 17:42:54 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Thu, 9 Mar 2006 12:42:54 -0500 Subject: rpms/vpnc/devel vpnc-0.3.3-rekeying.patch, NONE, 1.1 generic-vpnc.conf, 1.1, 1.2 vpnc.spec, 1.11, 1.12 vpnc-0.3.3-disconnect.patch, 1.1, NONE Message-ID: <200603091743.k29HhQ0w007066@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7044 Modified Files: generic-vpnc.conf vpnc.spec Added Files: vpnc-0.3.3-rekeying.patch Removed Files: vpnc-0.3.3-disconnect.patch Log Message: * Thu Mar 9 2006 Tomas Mraz 0.3.3-7 - add basic rekeying support (the patch includes NAT keepalive support by Brian Downing) - dropped disconnect patch (solved differently) vpnc-0.3.3-rekeying.patch: --- NEW FILE vpnc-0.3.3-rekeying.patch --- --- vpnc-0.3.3/vpnc.c.rekeying 2006-03-09 18:33:04.000000000 +0100 +++ vpnc-0.3.3/vpnc.c 2006-03-09 18:33:40.000000000 +0100 @@ -60,15 +60,13 @@ static uint8_t r_packet[2048]; static ssize_t r_length; -extern void vpnc_doit(unsigned long tous_spi, +extern int vpnc_doit(unsigned long tous_spi, const unsigned char *tous_key, struct sockaddr_in *tous_dest, unsigned long tothem_spi, const unsigned char *tothem_key, struct sockaddr_in *tothem_dest, int tun_fd, int md_algo, int cry_algo, - uint8_t * kill_packet_p, size_t kill_packet_size_p, - struct sockaddr *kill_dest_p, uint16_t encap_mode, int isakmp_fd, const char *pidfile); @@ -332,6 +330,7 @@ time_t start = time(NULL); time_t end = 0; void *realtosend; + static uint32_t zero; pfd.fd = sockfd; pfd.events = POLLIN; @@ -365,8 +364,13 @@ if (pollresult != 0) { recvsize = recv_ignore_dup(recvbuf, recvbufsize); end = time(NULL); - if (recvsize != -1) - break; + if (recvsize != -1) { + if (encap_mode == IPSEC_ENCAP_TUNNEL || + memcmp(recvbuf, &zero, sizeof(zero)) == 0) + /* this hack drops ESP packets on NATed connections + during rekeying, but it shouldn't matter much */ + break; + } continue; } @@ -383,7 +387,7 @@ if (encap_mode != IPSEC_ENCAP_TUNNEL) { recvsize -= 4; /* 4 bytes non-esp marker */ - memcpy(recvbuf, recvbuf+4, recvsize); + memmove(recvbuf, recvbuf+4, recvsize); } /* Wait at least 2s for a response or 4 times the time it took @@ -1882,7 +1886,7 @@ return r; } -static void setup_link(struct sa_block *s) +static int setup_link(struct sa_block *s) { struct isakmp_payload *rp, *us, *ke = NULL, *them, *nonce_r = NULL; struct isakmp_packet *r; @@ -1893,6 +1897,8 @@ size_t p_size = 0; uint8_t nonce[20], *dh_public = NULL; int ipsec_cry_algo = 0, ipsec_hash_algo = 0, i; + static int rekey = 0; + static int tunnelfd = -1; DEBUG(2, printf("S7.1\n")); /* Set up the Diffie-Hellman stuff. */ @@ -1944,6 +1950,7 @@ memcpy(realiv_msgid, s->current_iv_msgid, 4); } +again: DEBUG(2, printf("S7.3\n")); reject = unpack_verify_phase2(s, r_packet, r_length, &r, nonce, sizeof(nonce)); @@ -1952,6 +1959,13 @@ && r->exchange_type == ISAKMP_EXCHANGE_INFORMATIONAL) { /* handle notifie responder-lifetime (ignore) */ /* (broken hash => ignore AUTHENTICATION_FAILED) */ + if (reject == 0 + && r->payload->next->type == ISAKMP_PAYLOAD_D && rekey) { + DEBUG(2, printf("ignoring delete old ESP SA notify\n")); + r_length = sendrecv(r_packet, sizeof(*r_packet), NULL, 0, 0); + goto again; + } + if (reject == 0 && r->payload->next->type != ISAKMP_PAYLOAD_N) reject = ISAKMP_N_INVALID_PAYLOAD_TYPE; @@ -2122,51 +2136,20 @@ nonce_r->u.nonce.data, nonce_r->u.nonce.length); DEBUG(2, printf("S7.7\n")); - /* Create the delete payload, now that we have all the information. */ - { - struct isakmp_payload *d_isakmp, *d_ipsec; - uint32_t del_msgid; - - gcry_randomize((uint8_t *) & del_msgid, sizeof(del_msgid), GCRY_WEAK_RANDOM); - d_isakmp = new_isakmp_payload(ISAKMP_PAYLOAD_D); - d_isakmp->u.d.doi = ISAKMP_DOI_IPSEC; - d_isakmp->u.d.protocol = ISAKMP_IPSEC_PROTO_ISAKMP; - d_isakmp->u.d.spi_length = 2 * ISAKMP_COOKIE_LENGTH; - d_isakmp->u.d.num_spi = 1; - d_isakmp->u.d.spi = xallocc(1 * sizeof(uint8_t *)); - d_isakmp->u.d.spi[0] = xallocc(2 * ISAKMP_COOKIE_LENGTH); - memcpy(d_isakmp->u.d.spi[0] + ISAKMP_COOKIE_LENGTH * 0, s->i_cookie, - ISAKMP_COOKIE_LENGTH); - memcpy(d_isakmp->u.d.spi[0] + ISAKMP_COOKIE_LENGTH * 1, s->r_cookie, - ISAKMP_COOKIE_LENGTH); - d_ipsec = new_isakmp_payload(ISAKMP_PAYLOAD_D); - d_ipsec->next = d_isakmp; - d_ipsec->u.d.doi = ISAKMP_DOI_IPSEC; - d_ipsec->u.d.protocol = ISAKMP_IPSEC_PROTO_IPSEC_ESP; - d_ipsec->u.d.spi_length = 4; - d_ipsec->u.d.num_spi = 2; - d_ipsec->u.d.spi = xallocc(2 * sizeof(uint8_t *)); - d_ipsec->u.d.spi[0] = xallocc(d_ipsec->u.d.spi_length); - memcpy(d_ipsec->u.d.spi[0], &s->tous_esp_spi, 4); - d_ipsec->u.d.spi[1] = xallocc(d_ipsec->u.d.spi_length); - memcpy(d_ipsec->u.d.spi[1], &s->tothem_esp_spi, 4); - phase2_authpacket(s, d_ipsec, ISAKMP_EXCHANGE_INFORMATIONAL, - del_msgid, &s->kill_packet, &s->kill_packet_size, - nonce, sizeof(nonce), nonce_r->u.nonce.data, nonce_r->u.nonce.length); - isakmp_crypt(s, s->kill_packet, s->kill_packet_size, 1); - } - DEBUG(2, printf("S7.8\n")); /* Set up the interface here so it's ready when our acknowledgement * arrives. */ - config_tunnel(); - DEBUG(2, printf("S7.9\n")); + if (!rekey) { + config_tunnel(); + } + + DEBUG(2, printf("S7.8\n")); { uint8_t *tous_keys, *tothem_keys; struct sockaddr_in tothem_dest, tous_dest; unsigned char *dh_shared_secret = NULL; - int tunnelfd = sockfd; - + uint16_t em = encap_mode; + if (dh_grp) { /* Determine the shared secret. */ dh_shared_secret = xallocc(dh_getlen(dh_grp)); @@ -2186,21 +2169,66 @@ nonce, sizeof(nonce), nonce_r->u.nonce.data, nonce_r->u.nonce.length); memcpy(&tous_dest, dest_addr, sizeof(tous_dest)); if (opt_udpencap && s->peer_udpencap_port) { - close(tunnelfd); - tunnelfd = make_socket(htons(opt_udpencapport)); + if (!rekey) { + tunnelfd = make_socket(htons(opt_udpencapport)); + } tous_dest.sin_port = htons(s->peer_udpencap_port); - encap_mode = IPSEC_ENCAP_UDP_TUNNEL; + em = IPSEC_ENCAP_UDP_TUNNEL; + } else if (em != IPSEC_ENCAP_TUNNEL) { + tunnelfd = sockfd; + } else { + if (!rekey) { + tunnelfd = socket(PF_INET, SOCK_RAW, IPPROTO_ESP); + if (tunnelfd == -1) { + error(1, errno, "socket(SOCK_RAW) failed"); + } + } } if (dh_grp) group_free(dh_grp); - DEBUG(2, printf("S7.10\n")); - vpnc_doit(s->tous_esp_spi, tous_keys, &tothem_dest, + DEBUG(2, printf("S7.9\n")); + reject = vpnc_doit(s->tous_esp_spi, tous_keys, &tothem_dest, s->tothem_esp_spi, tothem_keys, (struct sockaddr_in *)&tous_dest, - s->tun_fd, ipsec_hash_algo, ipsec_cry_algo, - s->kill_packet, s->kill_packet_size, dest_addr, - encap_mode, tunnelfd, + s->tun_fd, ipsec_hash_algo, ipsec_cry_algo, em, tunnelfd, config[CONFIG_PID_FILE]); + rekey = reject == 0; } + + DEBUG(2, printf("S7.10\n")); + /* Create and send the delete payload. */ + if (reject != 0) { + struct isakmp_payload *d_isakmp = NULL, *d_ipsec; + uint32_t del_msgid; + + gcry_create_nonce((uint8_t *) & del_msgid, sizeof(del_msgid)); + d_isakmp = new_isakmp_payload(ISAKMP_PAYLOAD_D); + d_isakmp->u.d.doi = ISAKMP_DOI_IPSEC; + d_isakmp->u.d.protocol = ISAKMP_IPSEC_PROTO_ISAKMP; + d_isakmp->u.d.spi_length = 2 * ISAKMP_COOKIE_LENGTH; + d_isakmp->u.d.num_spi = 1; + d_isakmp->u.d.spi = xallocc(1 * sizeof(uint8_t *)); + d_isakmp->u.d.spi[0] = xallocc(2 * ISAKMP_COOKIE_LENGTH); + memcpy(d_isakmp->u.d.spi[0] + ISAKMP_COOKIE_LENGTH * 0, s->i_cookie, + ISAKMP_COOKIE_LENGTH); + memcpy(d_isakmp->u.d.spi[0] + ISAKMP_COOKIE_LENGTH * 1, s->r_cookie, + ISAKMP_COOKIE_LENGTH); + + d_ipsec = new_isakmp_payload(ISAKMP_PAYLOAD_D); + d_ipsec->next = d_isakmp; + d_ipsec->u.d.doi = ISAKMP_DOI_IPSEC; + d_ipsec->u.d.protocol = ISAKMP_IPSEC_PROTO_IPSEC_ESP; + d_ipsec->u.d.spi_length = 4; + d_ipsec->u.d.num_spi = 2; + d_ipsec->u.d.spi = xallocc(2 * sizeof(uint8_t *)); + d_ipsec->u.d.spi[0] = xallocc(d_ipsec->u.d.spi_length); + memcpy(d_ipsec->u.d.spi[0], &s->tous_esp_spi, 4); + d_ipsec->u.d.spi[1] = xallocc(d_ipsec->u.d.spi_length); + memcpy(d_ipsec->u.d.spi[1], &s->tothem_esp_spi, 4); + sendrecv_phase2(s, d_ipsec, ISAKMP_EXCHANGE_INFORMATIONAL, + del_msgid, 1, NULL, NULL, + NULL, 0, NULL, 0); + } + return reject; } int main(int argc, char **argv) @@ -2239,7 +2267,9 @@ do_load_balance = do_phase_2_config(oursa); } while (do_load_balance); DEBUG(2, printf("S7\n")); - setup_link(oursa); + while(setup_link(oursa) == 0) { + DEBUG(2, printf("S7 Rekeying\n")); + } DEBUG(2, printf("S8\n")); setenv("reason", "disconnect", 1); system(config[CONFIG_SCRIPT]); --- vpnc-0.3.3/config.c.rekeying 2005-05-01 22:06:36.000000000 +0200 +++ vpnc-0.3.3/config.c 2006-03-09 18:33:04.000000000 +0100 @@ -56,6 +56,8 @@ int opt_1des; int opt_udpencap; uint16_t opt_udpencapport; +int opt_nat_keepalive; +int opt_rekey_interval; void hex_dump(const char *str, const void *data, ssize_t len) { @@ -113,6 +115,16 @@ return "10000"; } +static const char *config_def_nat_keepalive(void) +{ + return "0"; +} + +static const char *config_def_rekey_interval(void) +{ + return "0"; +} + static const char *config_def_app_version(void) { struct utsname uts; @@ -299,6 +311,20 @@ "disable use of NAT-T", NULL }, { + CONFIG_NAT_KEEPALIVE, 1, 1, + "--nat-keepalive", + "NAT-Keepalive packet interval ", + "", + "If non-zero, send out NAT-Keepalive packets at specified interval", + config_def_nat_keepalive + }, { + CONFIG_REKEY_INTERVAL, 1, 1, + "--rekey-interval", + "Rekeying interval ", + "", + "If non-zero, rekey the connection at specified interval", + config_def_rekey_interval + }, { CONFIG_NON_INTERACTIVE, 0, 1, "--non-inter", "Noninteractive", @@ -535,6 +561,8 @@ opt_1des = (config[CONFIG_ENABLE_1DES]) ? 1 : 0; opt_udpencap=(config[CONFIG_UDP_ENCAP]) ? 1 : 0; opt_udpencapport=atoi(config[CONFIG_UDP_ENCAP_PORT]); + opt_nat_keepalive=atoi(config[CONFIG_NAT_KEEPALIVE]); + opt_rekey_interval=atoi(config[CONFIG_REKEY_INTERVAL]); } if (opt_debug >= 99) { --- vpnc-0.3.3/tunip.c.rekeying 2005-05-05 12:25:00.000000000 +0200 +++ vpnc-0.3.3/tunip.c 2006-03-09 18:33:04.000000000 +0100 @@ -333,18 +333,14 @@ return 1; } -int encap_esp_new(struct encap_method *encap, unsigned char proto) +int encap_esp_new(struct encap_method *encap, int encap_fd) { #ifdef IP_HDRINCL int hincl = 1; #endif - encap->fd = socket(PF_INET, SOCK_RAW, proto); + encap->fd = encap_fd; - if (encap->fd == -1) { - perror("socket(SOCK_RAW)"); - return -1; - } #ifdef IP_HDRINCL if (setsockopt(encap->fd, IPPROTO_IP, IP_HDRINCL, &hincl, sizeof(hincl)) == -1) { @@ -766,15 +762,16 @@ } static uint8_t volatile do_kill; -static uint8_t *kill_packet; -static size_t kill_packet_size; -static struct sockaddr *kill_dest; -static void vpnc_main_loop(struct peer_desc *peer, struct encap_method *meth, int tun_fd, const char *pidfile) +#define VPNC_POLL_TIMEOUT 2000 + +static int vpnc_main_loop(struct peer_desc *peer, struct encap_method *meth, int tun_fd, const char *pidfile) { - int sock; struct pollfd pollfds[2]; + time_t keepalive, rekey, now; + int rv = 1; + keepalive = rekey = time(NULL); pollfds[0].fd = tun_fd; pollfds[0].events = POLLIN; pollfds[1].fd = encap_get_fd(meth); @@ -784,13 +781,26 @@ int presult; do { - presult = poll(pollfds, sizeof(pollfds) / sizeof(pollfds[0]), -1); + presult = poll(pollfds, sizeof(pollfds) / sizeof(pollfds[0]), VPNC_POLL_TIMEOUT); } while (presult == -1 && errno == EINTR && !do_kill); if (presult == -1) { syslog(LOG_ERR, "poll: %m"); continue; } + now = time(NULL); + if (opt_nat_keepalive && now-keepalive >= opt_nat_keepalive) { + const char *payload = "\xff"; + sendto(meth->fd, payload, 1, 0, + (struct sockaddr *)&peer->remote_sa->dest, + sizeof(peer->remote_sa->dest)); + } + + if (opt_rekey_interval && now-rekey >= opt_rekey_interval) { + rv = 0; + do_kill = 255; + } + if (pollfds[0].revents & POLLIN) { int pack; @@ -863,16 +873,13 @@ } } - sock = socket(AF_INET, SOCK_DGRAM, 0); - if (sock >= 0) { - sendto(sock, kill_packet, kill_packet_size, 0, - kill_dest, sizeof(struct sockaddr_in)); - close(sock); - } - tun_close(oursa->tun_fd, oursa->tun_name); - if (pidfile) - unlink(pidfile); /* ignore errors */ - syslog(LOG_NOTICE, "terminated"); + if (rv != 0) { + tun_close(oursa->tun_fd, oursa->tun_name); + if (pidfile) + unlink(pidfile); /* ignore errors */ + syslog(LOG_NOTICE, "terminated"); + } + return rv; } void killit(int signum) @@ -898,7 +905,7 @@ fclose(pf); } -void +int vpnc_doit(unsigned long tous_spi, const unsigned char *tous_key, struct sockaddr_in *tous_dest, @@ -906,9 +913,7 @@ const unsigned char *tothem_key, struct sockaddr_in *tothem_dest, int tun_fd, int md_algo, int cry_algo, - uint8_t * kill_packet_p, size_t kill_packet_size_p, - struct sockaddr *kill_dest_p, - uint16_t encap_mode, int udp_fd, + uint16_t encap_mode, int encap_fd, const char *pidfile) { struct encap_method meth; @@ -918,12 +923,13 @@ switch (encap_mode) { case IPSEC_ENCAP_TUNNEL: - if (encap_esp_new(&meth, IPPROTO_ESP) == -1) + if (encap_esp_new(&meth, encap_fd) == -1) exit(1); + opt_nat_keepalive = 0; break; case IPSEC_ENCAP_UDP_TUNNEL: case IPSEC_ENCAP_UDP_TUNNEL_OLD: - if (encap_udp_new(&meth, udp_fd) == -1) + if (encap_udp_new(&meth, encap_fd) == -1) exit(1); break; default: @@ -984,11 +990,6 @@ vpnpeer.local_sa = &tous_sa; vpnpeer.remote_sa = &tothem_sa; - do_kill = 0; - kill_packet = kill_packet_p; - kill_packet_size = kill_packet_size_p; - kill_dest = kill_dest_p; - signal(SIGHUP, killit); signal(SIGINT, killit); signal(SIGTERM, killit); @@ -1000,7 +1001,7 @@ chdir("/"); setsid(); - if (!opt_nd) { + if (do_kill == 0 && !opt_nd) { /* do_kill != 0 -> rekeying */ pid_t pid; if ((pid = fork()) < 0) { fprintf(stderr, "Warning, could not fork the child process!\n"); @@ -1019,5 +1020,7 @@ openlog("vpnc", LOG_PID, LOG_DAEMON); } - vpnc_main_loop(&vpnpeer, &meth, tun_fd, (!opt_nd) ? pidfile : NULL); + do_kill = 0; + + return vpnc_main_loop(&vpnpeer, &meth, tun_fd, (!opt_nd) ? pidfile : NULL); } --- vpnc-0.3.3/config.h.rekeying 2005-05-01 22:06:45.000000000 +0200 +++ vpnc-0.3.3/config.h 2006-03-09 18:33:04.000000000 +0100 @@ -44,6 +44,8 @@ CONFIG_UDP_ENCAP, CONFIG_UDP_ENCAP_PORT, CONFIG_DISABLE_NATT, + CONFIG_NAT_KEEPALIVE, + CONFIG_REKEY_INTERVAL, LAST_CONFIG }; @@ -60,6 +62,8 @@ extern int opt_1des; extern int opt_udpencap; extern uint16_t opt_udpencapport; +extern int opt_nat_keepalive; +extern int opt_rekey_interval; #define DEBUG(lvl, a) do {if (opt_debug >= (lvl)) {a;}} while (0) --- vpnc-0.3.3/vpnc.h.rekeying 2004-11-22 01:11:55.000000000 +0100 +++ vpnc-0.3.3/vpnc.h 2006-03-09 18:33:04.000000000 +0100 @@ -46,8 +46,6 @@ uint8_t *current_iv; uint8_t our_address[4], our_netmask[4]; uint32_t tous_esp_spi, tothem_esp_spi; - uint8_t *kill_packet; - size_t kill_packet_size; uint16_t peer_udpencap_port; int do_pfs; }; Index: generic-vpnc.conf =================================================================== RCS file: /cvs/extras/rpms/vpnc/devel/generic-vpnc.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- generic-vpnc.conf 20 Dec 2004 20:46:38 -0000 1.1 +++ generic-vpnc.conf 9 Mar 2006 17:42:53 -0000 1.2 @@ -1,5 +1,7 @@ #IPSec gateway my.vpn.gateway #IPSec ID my.ipsec.id #IPSec secret mysecret -# your username goes here +# your username goes here: #Xauth username +# if you want to test rekeying specify nonzero seconds here: +#Rekeying interval 0 Index: vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/vpnc/devel/vpnc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- vpnc.spec 15 Feb 2006 17:58:56 -0000 1.11 +++ vpnc.spec 9 Mar 2006 17:42:53 -0000 1.12 @@ -1,6 +1,6 @@ Name: vpnc Version: 0.3.3 -Release: 6 +Release: 7 Summary: IPSec VPN client compatible with Cisco equipment @@ -13,7 +13,8 @@ Patch1: vpnc-0.3.3-sbin-path.patch Patch2: vpnc-0.3.3-ip-output.patch Patch3: vpnc-0.3.3-no-srcport.patch -Patch4: vpnc-0.3.3-disconnect.patch +Patch4: vpnc-0.3.3-rekeying.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libgcrypt-devel > 1.1.90 @@ -31,7 +32,7 @@ %patch1 -p1 -b .sbin-path %patch2 -p1 -b .ip-output %patch3 -p1 -b .no-srcport -%patch4 -p1 -b .disconnect +%patch4 -p1 -b .rekeying %build make PREFIX=/usr @@ -64,6 +65,11 @@ %ghost %verify(not md5 size mtime) %{_var}/run/vpnc/resolv.conf-backup %changelog +* Thu Mar 9 2006 Tomas Mraz 0.3.3-7 +- add basic rekeying support (the patch includes NAT keepalive support + by Brian Downing) +- dropped disconnect patch (solved differently) + * Wed Feb 15 2006 Tomas Mraz 0.3.3-6 - rebuild with new gcc --- vpnc-0.3.3-disconnect.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 9 18:18:58 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 13:18:58 -0500 Subject: rpms/perl-pmtools/devel perl-pmtools.spec,1.4,1.5 Message-ID: <200603091819.k29IJUG0009189@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9172 Modified Files: perl-pmtools.spec Log Message: Rebuild for FC5 (perl 5.8.8). Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/devel/perl-pmtools.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-pmtools.spec 22 Dec 2005 19:29:52 -0000 1.4 +++ perl-pmtools.spec 9 Mar 2006 18:18:58 -0000 1.5 @@ -1,12 +1,12 @@ Name: perl-pmtools Version: 1.00 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries License: Artistic Url: http://language.perl.com/ -Source: http://history.perl.org/src/pmtools-1.00.tar.gz +Source: http://history.perl.org/src/pmtools-%{version}.tar.gz Patch1: pmtools-1.00-different-tarball.patch Patch2: pmtools-1.00-pmall.patch Patch3: pmtools-1.00-pmeth-pman2pmman.patch @@ -14,7 +14,7 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This is pmtools -- a suite of small programs to help manage modules. @@ -47,7 +47,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -65,6 +65,9 @@ %changelog +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.00-4 +- Rebuild for FC5 (perl 5.8.8). + * Thu Dec 22 2005 Jose Pedro Oliveira - 1.00-3 - Dist tag. From fedora-extras-commits at redhat.com Thu Mar 9 18:22:52 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Thu, 9 Mar 2006 13:22:52 -0500 Subject: rpms/banshee/devel banshee.spec,1.4,1.5 Message-ID: <200603091823.k29INOms009314@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9263 Modified Files: banshee.spec Log Message: * Thu Mar 9 2006 Christopher Aillon 0.10.7-2 - Add explicit Requires on libipoddevice (#184482) Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- banshee.spec 7 Mar 2006 19:57:34 -0000 1.4 +++ banshee.spec 9 Mar 2006 18:22:51 -0000 1.5 @@ -1,6 +1,6 @@ Name: banshee Version: 0.10.7 -Release: 1 +Release: 2 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -23,6 +23,8 @@ BuildRequires: gstreamer-plugins-base-devel >= 0.10 BuildRequires: gnome-desktop-devel BuildRequires: nautilus-cd-burner-devel + +Requires: libipoddevice Requires(post): GConf2 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -97,6 +99,9 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Thu Mar 9 2006 Christopher Aillon 0.10.7-2 +- Add explicit Requires on libipoddevice (#184482) + * Tue Mar 7 2006 Christopher Aillon 0.10.7-1 - Update to 0.10.7 - Fix build on x86-64 From fedora-extras-commits at redhat.com Thu Mar 9 18:24:35 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 13:24:35 -0500 Subject: rpms/perl-SNMP_Session/devel perl-SNMP_Session.spec,1.3,1.4 Message-ID: <200603091825.k29IP7ZL009385@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-SNMP_Session/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9368 Modified Files: perl-SNMP_Session.spec Log Message: Rebuild for FC5 (perl 5.8.8). Index: perl-SNMP_Session.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SNMP_Session/devel/perl-SNMP_Session.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-SNMP_Session.spec 29 Dec 2005 01:51:22 -0000 1.3 +++ perl-SNMP_Session.spec 9 Mar 2006 18:24:35 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-SNMP_Session Version: 1.08 -Release: 1%{?dist} +Release: 2%{?dist} Summary: SNMP support for Perl 5 Group: Development/Libraries @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Pure Perl SNMP v1 and SNMP v2 support for Perl 5. @@ -53,6 +53,9 @@ %changelog +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.08-2 +- Rebuild for FC5 (perl 5.8.8). + * Thu Dec 29 2005 Jose Pedro Oliveira - 1.08-1 - Update to 1.08. From fedora-extras-commits at redhat.com Thu Mar 9 18:34:01 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 13:34:01 -0500 Subject: rpms/pdfjam/devel pdfjam.spec,1.3,1.4 Message-ID: <200603091834.k29IYXvB009462@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/pdfjam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9445 Modified Files: pdfjam.spec Log Message: Rebuild for FC5. Index: pdfjam.spec =================================================================== RCS file: /cvs/extras/rpms/pdfjam/devel/pdfjam.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pdfjam.spec 14 May 2005 01:54:16 -0000 1.3 +++ pdfjam.spec 9 Mar 2006 18:34:00 -0000 1.4 @@ -1,6 +1,6 @@ Name: pdfjam Version: 1.20 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Utilities for join, rotate and align PDFs Group: Applications/Publishing @@ -58,6 +58,9 @@ %changelog +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.20-4 +- Rebuild for FC5. + * Sat May 14 2005 Jose Pedro Oliveira - 1.20-3 - Add dist tag. From fedora-extras-commits at redhat.com Thu Mar 9 19:09:08 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 9 Mar 2006 14:09:08 -0500 Subject: rpms/snort/devel .cvsignore, 1.3, 1.4 snort.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200603091909.k29J9fRS011555@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11532 Modified Files: .cvsignore snort.spec sources Log Message: update to 2.4.4 Fixes CVE-2006-0839 Security update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/snort/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Feb 2006 02:12:01 -0000 1.3 +++ .cvsignore 9 Mar 2006 19:09:07 -0000 1.4 @@ -1 +1 @@ -snort-2.4.3.tar.gz +snort-2.4.4.tar.gz Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- snort.spec 17 Feb 2006 02:06:16 -0000 1.5 +++ snort.spec 9 Mar 2006 19:09:08 -0000 1.6 @@ -1,6 +1,6 @@ Summary: Intrusion detection system Name: snort -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -112,6 +112,10 @@ Please see the documentation in %{_docdir}/%{name}-%{version} +There are no rules in this package the license they are released under forbids +us from repackaging them and redistributing them. + + %description plain+flexresp Snort compiled with flexresp support. Requires libnet rpm. @@ -148,14 +152,9 @@ %setup -q %patch0 -p1 -b .config -%build -#touch -r . * -#aclocal -#automake -#rm -rf building && mkdir -p building && cd building +%build -#export AM_CFLAGS="-g -O2" SNORT_BASE_CONFIG="--prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ --with-libpcap-includes=/usr/include/pcap" @@ -165,8 +164,6 @@ # plain { -#mkdir plain -#cd plain %configure $SNORT_BASE_CONFIG --with-mysql=no \ --with-postgresql=no \ --with-oracle=no \ @@ -174,8 +171,6 @@ make %{?_smp_mflags} mv src/snort snort-plain -# make distclean -#cd .. } # plain+flexresp @@ -187,7 +182,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp -# make distclean } # mysql+flexresp @@ -199,7 +193,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp -# make distclean } # mysql @@ -210,7 +203,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql -# make distclean } @@ -224,7 +216,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp -# make distclean } # postgresql @@ -235,7 +226,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql -# make distclean } # snmp @@ -249,7 +239,6 @@ make %{?_smp_mflags} mv src/snort snort-snmp -# make distclean } @@ -401,6 +390,10 @@ %changelog +* Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 +- Update to 2.4.4 +- Fixes CVE-2006-0839 + * Thu Feb 16 2006 Dennis Gilmore - 2.4.3-1 - Updated to 2.4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/snort/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Feb 2006 02:12:01 -0000 1.3 +++ sources 9 Mar 2006 19:09:08 -0000 1.4 @@ -1 +1 @@ -5c3c8c69f2459bbe0c1f2057966c88a7 snort-2.4.3.tar.gz +9dc9060d1f2e248663eceffadfc45e7e snort-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 19:11:25 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 9 Mar 2006 14:11:25 -0500 Subject: rpms/snort/FC-3 .cvsignore, 1.3, 1.4 snort.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603091911.k29JBvfN011632@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11607 Modified Files: .cvsignore snort.spec sources Log Message: Update to 2.4.4 Fixes CVE-2006-0839 Security update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/snort/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Feb 2006 02:18:37 -0000 1.3 +++ .cvsignore 9 Mar 2006 19:11:25 -0000 1.4 @@ -1 +1 @@ -snort-2.4.3.tar.gz +snort-2.4.4.tar.gz Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-3/snort.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- snort.spec 17 Feb 2006 02:18:37 -0000 1.4 +++ snort.spec 9 Mar 2006 19:11:25 -0000 1.5 @@ -1,6 +1,6 @@ Summary: Intrusion detection system Name: snort -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -112,6 +112,10 @@ Please see the documentation in %{_docdir}/%{name}-%{version} +There are no rules in this package the license they are released under forbids +us from repackaging them and redistributing them. + + %description plain+flexresp Snort compiled with flexresp support. Requires libnet rpm. @@ -148,14 +152,9 @@ %setup -q %patch0 -p1 -b .config -%build -#touch -r . * -#aclocal -#automake -#rm -rf building && mkdir -p building && cd building +%build -#export AM_CFLAGS="-g -O2" SNORT_BASE_CONFIG="--prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ --with-libpcap-includes=/usr/include/pcap" @@ -165,8 +164,6 @@ # plain { -#mkdir plain -#cd plain %configure $SNORT_BASE_CONFIG --with-mysql=no \ --with-postgresql=no \ --with-oracle=no \ @@ -174,8 +171,6 @@ make %{?_smp_mflags} mv src/snort snort-plain -# make distclean -#cd .. } # plain+flexresp @@ -187,7 +182,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp -# make distclean } # mysql+flexresp @@ -199,7 +193,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp -# make distclean } # mysql @@ -210,7 +203,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql -# make distclean } @@ -224,7 +216,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp -# make distclean } # postgresql @@ -235,7 +226,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql -# make distclean } # snmp @@ -249,7 +239,6 @@ make %{?_smp_mflags} mv src/snort snort-snmp -# make distclean } @@ -401,6 +390,10 @@ %changelog +* Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 +- Update to 2.4.4 +- Fixes CVE-2006-0839 + * Thu Feb 16 2006 Dennis Gilmore - 2.4.3-1 - Updated to 2.4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/snort/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Feb 2006 02:18:37 -0000 1.3 +++ sources 9 Mar 2006 19:11:25 -0000 1.4 @@ -1 +1 @@ -5c3c8c69f2459bbe0c1f2057966c88a7 snort-2.4.3.tar.gz +9dc9060d1f2e248663eceffadfc45e7e snort-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 19:12:38 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Thu, 9 Mar 2006 14:12:38 -0500 Subject: rpms/snort/FC-4 .cvsignore, 1.3, 1.4 snort.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200603091913.k29JDAra011715@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11685 Modified Files: .cvsignore snort.spec sources Log Message: Update to 2.4.4 Fixes CVE-2006-0839 Security update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/snort/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Feb 2006 02:16:48 -0000 1.3 +++ .cvsignore 9 Mar 2006 19:12:38 -0000 1.4 @@ -1 +1 @@ -snort-2.4.3.tar.gz +snort-2.4.4.tar.gz Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-4/snort.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- snort.spec 17 Feb 2006 02:16:48 -0000 1.5 +++ snort.spec 9 Mar 2006 19:12:38 -0000 1.6 @@ -1,6 +1,6 @@ Summary: Intrusion detection system Name: snort -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} License: GPL Group: Applications/Internet @@ -112,6 +112,10 @@ Please see the documentation in %{_docdir}/%{name}-%{version} +There are no rules in this package the license they are released under forbids +us from repackaging them and redistributing them. + + %description plain+flexresp Snort compiled with flexresp support. Requires libnet rpm. @@ -148,14 +152,9 @@ %setup -q %patch0 -p1 -b .config -%build -#touch -r . * -#aclocal -#automake -#rm -rf building && mkdir -p building && cd building +%build -#export AM_CFLAGS="-g -O2" SNORT_BASE_CONFIG="--prefix=%{_prefix} \ --sysconfdir=%{_sysconfdir} \ --with-libpcap-includes=/usr/include/pcap" @@ -165,8 +164,6 @@ # plain { -#mkdir plain -#cd plain %configure $SNORT_BASE_CONFIG --with-mysql=no \ --with-postgresql=no \ --with-oracle=no \ @@ -174,8 +171,6 @@ make %{?_smp_mflags} mv src/snort snort-plain -# make distclean -#cd .. } # plain+flexresp @@ -187,7 +182,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp -# make distclean } # mysql+flexresp @@ -199,7 +193,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp -# make distclean } # mysql @@ -210,7 +203,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql -# make distclean } @@ -224,7 +216,6 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp -# make distclean } # postgresql @@ -235,7 +226,6 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql -# make distclean } # snmp @@ -249,7 +239,6 @@ make %{?_smp_mflags} mv src/snort snort-snmp -# make distclean } @@ -401,6 +390,10 @@ %changelog +* Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 +- Update to 2.4.4 +- Fixes CVE-2006-0839 + * Thu Feb 16 2006 Dennis Gilmore - 2.4.3-1 - Updated to 2.4.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/snort/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 17 Feb 2006 02:16:48 -0000 1.3 +++ sources 9 Mar 2006 19:12:38 -0000 1.4 @@ -1 +1 @@ -5c3c8c69f2459bbe0c1f2057966c88a7 snort-2.4.3.tar.gz +9dc9060d1f2e248663eceffadfc45e7e snort-2.4.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 19:42:13 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:42:13 -0500 Subject: rpms/cmucl - New directory Message-ID: <200603091942.k29JgFqu012061@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12053/cmucl Log Message: Directory /cvs/extras/rpms/cmucl added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 19:42:19 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:42:19 -0500 Subject: rpms/cmucl/devel - New directory Message-ID: <200603091942.k29JgLZN012076@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12053/cmucl/devel Log Message: Directory /cvs/extras/rpms/cmucl/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 19:42:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:42:30 -0500 Subject: rpms/cmucl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603091942.k29JgW8Z012110@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12098 Added Files: Makefile import.log Log Message: Setup of module cmucl --- NEW FILE Makefile --- # Top level Makefile for module cmucl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 9 19:42:36 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:42:36 -0500 Subject: rpms/cmucl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603091942.k29JgcdS012133@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12098/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module cmucl --- NEW 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 Mar 9 19:43:25 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:43:25 -0500 Subject: rpms/cmucl import.log,1.1,1.2 Message-ID: <200603091943.k29JhvJ2012255@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12213 Modified Files: import.log Log Message: auto-import cmucl-19c-3 on branch devel from cmucl-19c-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/cmucl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Mar 2006 19:42:30 -0000 1.1 +++ import.log 9 Mar 2006 19:43:24 -0000 1.2 @@ -0,0 +1 @@ +cmucl-19c-3:HEAD:cmucl-19c-3.src.rpm:1141933401 From fedora-extras-commits at redhat.com Thu Mar 9 19:43:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 14:43:30 -0500 Subject: rpms/cmucl/devel cmucl-19c-motif-shared.patch, NONE, 1.1 cmucl-19c-optflags.patch, NONE, 1.1 cmucl-19c-x86-linux.tar.bz2.asc, NONE, 1.1 cmucl-src-19c.tar.bz2.asc, NONE, 1.1 cmucl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603091944.k29Ji3b1012259@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12213/devel Modified Files: .cvsignore sources Added Files: cmucl-19c-motif-shared.patch cmucl-19c-optflags.patch cmucl-19c-x86-linux.tar.bz2.asc cmucl-src-19c.tar.bz2.asc cmucl.spec Log Message: auto-import cmucl-19c-3 on branch devel from cmucl-19c-3.src.rpm cmucl-19c-motif-shared.patch: --- NEW FILE cmucl-19c-motif-shared.patch --- --- cmucl-19/src/motif/server/Config.x86.motif-shared 2004-04-26 07:07:36.000000000 -0500 +++ cmucl-19/src/motif/server/Config.x86 2004-08-04 12:59:32.209585248 -0500 @@ -1,6 +1,6 @@ -CFLAGS = -O2 -I/usr/X11R6/include -I. -I$(VPATH) +CFLAGS = -O2 $(RPM_OPT_FLAGS) -I/usr/X11R6/include -I. -I$(VPATH) LDFLAGS = -L/usr/X11R6/lib -LIBS = -static -lXm -dynamic -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread +LIBS = -lXm # This def assumes you are building in the same or parallel # tree to the CVS souce layout. Sites may need to customize # this path. cmucl-19c-optflags.patch: --- NEW FILE cmucl-19c-optflags.patch --- --- cmucl-19c/src/lisp/Config.linux_gencgc.optflags 2005-09-19 23:02:28.000000000 -0500 +++ cmucl-19c/src/lisp/Config.linux_gencgc 2005-10-21 07:20:49.000000000 -0500 @@ -21,7 +21,7 @@ RUNTIME = $(GENCGC) $(LINKAGE) # __NO_CTYPE so builds on glibc 2.3 will run on (some) older glibc's. CPPFLAGS = -D__NO_CTYPE -I. -I$(PATH1) -I- -I/usr/X11R6/include $(RUNTIME) -CFLAGS = -rdynamic -Wstrict-prototypes -Wall -g $(RUNTIME) +CFLAGS = -rdynamic -Wstrict-prototypes -Wall -g $(RUNTIME) $(RPM_OPT_FLAGS) ASFLAGS = -g -DGENCGC -DLINKAGE_TABLE NM = $(PATH1)/linux-nm UNDEFSYMPATTERN = -Xlinker -u -Xlinker & --- NEW FILE cmucl-19c-x86-linux.tar.bz2.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.2 (GNU/Linux) iD8DBQBDfJXwJ5IjUmgZO7IRAk5HAKCjvV5A2aHv8bid3blfx0dDCLU5JQCdHXU4 VKW3qWwzUh8WvMhDDLOUwpw= =M+N3 -----END PGP SIGNATURE----- --- NEW FILE cmucl-src-19c.tar.bz2.asc --- -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (SunOS) iD8DBQBDelYZJ5IjUmgZO7IRAjAPAJ9Ew+EDs40AdupM6vQKY12c4qonjgCffUsu LrTEUqp+fuCkQYsCUOdjTnY= =/60F -----END PGP SIGNATURE----- --- NEW FILE cmucl.spec --- Summary: CMU Common Lisp compiler Name: cmucl Version: 19c Release: 3%{?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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} ## ix86 section %ifarch %{ix86} %define cmucl_arch x86 #define bootstrap cmucl #define bootstrap_pkg 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 %define bootstrap_src -a 10 %else BuildRequires: %{?bootstrap_pkg} %endif %endif Patch1: cmucl-19c-motif-shared.patch Patch2: cmucl-19c-optflags.patch BuildRequires: sed >= 4.0 BuildRequires: openmotif-devel BuildRequires: time BuildRequires: bc %description CMUCL is a free, high performance implementation of the Common Lisp programming language which runs on most major Unix platforms. It mainly conforms to the ANSI Common Lisp standard. CMUCL provides a sophisticated native code compiler; a powerful foreign function interface; an implementation of CLOS, the Common Lisp Object System, which includes multimethods and a metaobject protocol; a source-level debugger and code profiler; and an Emacs-like editor implemented in Common Lisp. CMUCL is maintained by a team of volunteers collaborating over the Internet, and is mostly in the public domain. %package extras Summary: Extra tools and libraries for CMU Common Lisp Group: Development/Languages Requires: %{name} = %{version}-%{release} %description extras %{summary}. # Not used...yet %if 0 %package devel Summary: Development files for %{name} Group: Development/Languages Requires: %{name} = %{version}-%{release} %description devel %{summary}. %endif %prep %setup -q -c %{name}-%{version} %{?bootstrap_src} %patch1 -p1 -b .motif-shared %patch2 -p1 -b .optflags %build %if 1 ## Simple build method ./src/tools/build.sh \ -b %{_target_platform} \ -C "linux_gencgc %{cmucl_arch}" \ -v "%{version} Fedora Extras release %{release}" \ %{!?bootstrap:-o "bin/lisp -noinit -batch"} # make binary dist archives ./src/tools/make-dist.sh %{_target_platform}-4 %{version} %{cmucl_arch} linux %else ## OLD complicated build method (but needed sometimes, e.g. cross-compiling) # Create target buildroot ./src/tools/create-target.sh %{_target_platform} linux_gencgc %{cmucl_arch} # Use binary-dist lisp to create initial kernel.core ./src/tools/build-world.sh %{_target_platform} %{!?bootstrap:bin/lisp} # build native lisp binary ./src/tools/rebuild-lisp.sh %{_target_platform} # Generate lisp.core ./src/tools/load-world.sh %{_target_platform} "%{version} Fedora Extras release %{release}" # rebuild kernel.core using native lisp ./src/tools/build-world.sh %{_target_platform} %{_target_platform}/lisp/lisp # (Re)generate lisp.core ./src/tools/load-world.sh %{_target_platform} "%{version} Fedora Extras release %{release}" # Build auxilary stuff ./src/tools/build-utils.sh %{_target_platform} # make binary dist archives ./src/tools/make-dist.sh %{_target_platform} %{version} %{cmucl_arch} linux %endif %install rm -rf $RPM_BUILD_ROOT mkdir -p dist pushd dist # unarchive newly creating binary dist archives tar xvzf ../cmucl-%{version}-%{cmucl_arch}-linux.tar.gz tar xvzf ../cmucl-%{version}-%{cmucl_arch}-linux.extra.tar.gz mkdir -p $RPM_BUILD_ROOT%{_libdir}/cmucl/ cp -a bin $RPM_BUILD_ROOT%{_libdir}/cmucl/ cp -a lib/cmucl $RPM_BUILD_ROOT%{_libdir}/ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -p man/man1/* $RPM_BUILD_ROOT%{_mandir}/man1/ popd ## Setup app-wrapper install -m755 -p -D $RPM_BUILD_ROOT%{_libdir}/cmucl/sample-wrapper $RPM_BUILD_ROOT%{_bindir}/cmucl # Fixup paths in wrapper sed -i -e "s|^CMUCLLIB=.*|CMUCLLIB=%{_libdir}/cmucl/lib|" $RPM_BUILD_ROOT%{_bindir}/cmucl sed -i -e "s|/<>|%{_libdir}/cmucl|" $RPM_BUILD_ROOT%{_bindir}/cmucl # ln -sf cmucl $RPM_BUILD_ROOT%{_bindir}/cmulisp # many apps (ie, maxima) expect to find the wrapper named 'lisp' too ln -sf cmucl $RPM_BUILD_ROOT%{_bindir}/lisp ## Unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/cmucl/sample-wrapper %files %defattr(-,root,root) %doc dist/doc/cmucl/README dist/doc/cmucl/release*.txt %{_bindir}/cmucl %{_bindir}/cmulisp %{_bindir}/lisp %dir %{_libdir}/cmucl %{_libdir}/cmucl/internals.inc %{_libdir}/cmucl/bin/ %dir %{_libdir}/cmucl/lib %{_libdir}/cmucl/lib/lisp.core %{_libdir}/cmucl/lib/load-foreign.csh %{_libdir}/cmucl/lib/config %{_libdir}/cmucl/lib/config.lisp %{_libdir}/cmucl/lib/generic-site.lisp %dir %{_libdir}/cmucl/lib/subsystems %{_libdir}/cmucl/lib/subsystems/gray-*-library.* %{_libdir}/cmucl/lib/subsystems/iodefs-library.* %{_libdir}/cmucl/lib/subsystems/simple-*-library.* %{_libdir}/cmucl/lisp.nm %{_libdir}/cmucl/lisp.map %{_libdir}/cmucl/internals.h %{_mandir}/man1/* %files extras %defattr(-,root,root) %{_libdir}/cmucl/lib/subsystems/clx-library.* %{_libdir}/cmucl/lib/subsystems/hemlock-library.* %{_libdir}/cmucl/lib/subsystems/clm-library.* %{_libdir}/cmucl/lib/XKeysymDB %{_libdir}/cmucl/lib/hemlock11.cursor %{_libdir}/cmucl/lib/hemlock11.mask %{_libdir}/cmucl/lib/spell-dictionary.bin %{_libdir}/cmucl/lib/mh-scan %{_libdir}/cmucl/lib/motifd ## Not sure what to include, if anything. ?? -- Rex #files devel #defattr(-,root,root) %clean rm -rf $RPM_BUILD_ROOT %changelog * Wed Mar 08 2006 Rex Dieter 19c-3 - License: +MIT - BR: bc, time * Fri Dec 02 2005 Rex Dieter 19c-2 - 19c (final) * Fri Oct 21 2005 Rex Dieter 19c-1.pre - cleanup shared-motif patch - use simpler build.sh script * Fri Oct 21 2005 Rex Dieter 19c-0.pre1 - 19c-pre1 - drop upstreamed gcc4 patch - drop unused setarch/personality bits * Fri Oct 07 2005 Rex Dieter 19b-5 - use known-to-be-good cmucl-19a for bootstrap (19b has issues) - drop personalility patch (not needed afterall) * Mon Sep 19 2005 Rex Dieter 19b-4 - move (re)exec/personality call runprog.c -> lisp.c (in main() ) - optflags patch - better gcc4 patch - use my_setarch.c instead of setarch * Tue Sep 13 2005 Rex Dieter 19b-3 - ADDR_NO_RANDOMIZE patch - gcc4 patch * Fri Aug 26 2005 Rex Dieter 19b-2 - use setarch - -extras subpkg * Thu Aug 16 2005 Rex Dieter 19b-1 - 19b release - cleanup for Fedora Extras * Thu Aug 26 2004 Rex Dieter 0:19-0.fdr.2.a - Fix Release: 19e -> 19a * Wed Aug 04 2004 Rex Dieter 0:19-0.fdr.1.a - cmucl-19a release - nix -extras subpkg, for now * Tue Mar 30 2004 Rex Dieter 0:18-0.fdr.2.e - remove extraneous macros - include URL's for all Source's. * Fri Oct 10 2003 Rex Dieter 0:18-0.fdr.1.e - first try. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cmucl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2006 19:42:36 -0000 1.1 +++ .cvsignore 9 Mar 2006 19:43:30 -0000 1.2 @@ -0,0 +1,2 @@ +cmucl-19c-x86-linux.tar.bz2 +cmucl-src-19c.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cmucl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2006 19:42:36 -0000 1.1 +++ sources 9 Mar 2006 19:43:30 -0000 1.2 @@ -0,0 +1,2 @@ +04bf7da2a49a309080bf504d0b1e8c28 cmucl-19c-x86-linux.tar.bz2 +c791f18c764e3c21970fecbbfb5b4524 cmucl-src-19c.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 9 19:50:34 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:50:34 -0500 Subject: rpms/nomadsync - New directory Message-ID: <200603091950.k29Joaes012394@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12386/nomadsync Log Message: Directory /cvs/extras/rpms/nomadsync added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 19:50:40 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:50:40 -0500 Subject: rpms/nomadsync/devel - New directory Message-ID: <200603091950.k29Jog3h012409@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12386/nomadsync/devel Log Message: Directory /cvs/extras/rpms/nomadsync/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 9 19:50:57 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:50:57 -0500 Subject: rpms/nomadsync Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603091950.k29JoxnW012443@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12431 Added Files: Makefile import.log Log Message: Setup of module nomadsync --- NEW FILE Makefile --- # Top level Makefile for module nomadsync all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 9 19:51:03 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:51:03 -0500 Subject: rpms/nomadsync/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603091951.k29Jp5Bs012463@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12431/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nomadsync --- NEW 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 Mar 9 19:52:56 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:52:56 -0500 Subject: rpms/nomadsync import.log,1.1,1.2 Message-ID: <200603091953.k29JrSnW012549@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12514 Modified Files: import.log Log Message: auto-import nomadsync-0.4.2-8 on branch devel from nomadsync-0.4.2-8.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nomadsync/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 9 Mar 2006 19:50:57 -0000 1.1 +++ import.log 9 Mar 2006 19:52:56 -0000 1.2 @@ -0,0 +1 @@ +nomadsync-0_4_2-8:HEAD:nomadsync-0.4.2-8.src.rpm:1141933968 From fedora-extras-commits at redhat.com Thu Mar 9 19:53:02 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 14:53:02 -0500 Subject: rpms/nomadsync/devel nomadsync.desktop, NONE, 1.1 nomadsync.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603091953.k29JrYtA012553@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12514/devel Modified Files: .cvsignore sources Added Files: nomadsync.desktop nomadsync.spec Log Message: auto-import nomadsync-0.4.2-8 on branch devel from nomadsync-0.4.2-8.src.rpm --- NEW FILE nomadsync.desktop --- [Desktop Entry] Name=Nomadsync Name[sv]=Nomadsync GenericName=Nomad/Zen Jukebox/Dell DJ Synchronization utility GenericName[sv]=Klient f??r Nomad/Zen/Dell DJ Jukebox synkronisering Comment=A tool for managing Creative Nomad/Zen Jukeboxes and Dell DJs Comment[sv]=Ett verktyg f??r att synkronisera Creative Nomad/Zen Jukebox:ar och Dell DJ-spelare Exec=nomadsync Terminal=false Type=Application Icon=nomadsync-logo.png Categories=Application;AudioVideo; Encoding=UTF-8 --- NEW FILE nomadsync.spec --- # SPEC file for nomadsync, primary target is the Fedora Extras # RPM repository. # # For testing a certain distribution, rely on macros that # you define in your ".rpmmacros" file. For example, for # test building a Fedora Extras package, define the following # two macros in .rpmmacros: # # %dist .fc5 # %fedora 5 # Name: nomadsync Version: 0.4.2 Release: 8%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils Requires(postun): desktop-file-utils BuildRequires: libusb-devel BuildRequires: libnjb-devel BuildRequires: id3lib-devel BuildRequires: gawk BuildRequires: desktop-file-utils # This will pull in the apropriate wxGTK version BuildRequires: %{_bindir}/wxgtk-2.4-config %description This package provides an application to synchronize music trees with Creative NOMAD Jukebox, Creative Zen and Dell DJ line of MP3 players. %prep %setup -q -n %{name} %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install # Install that icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps install -p -m 644 doc/camelHead.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/nomadsync-logo.png # Add distro-specifics to .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} # Remove erroneous desktop file directory rm -rf $RPM_BUILD_ROOT/Utilities # Fixup permissions chmod 644 ChangeLog authors copying readme install # Fix end-of-line encoding %{__sed} -i 's?\r??' ChangeLog %{__sed} -i 's?\r??' readme %clean rm -rf $RPM_BUILD_ROOT %post update-desktop-database %{_datadir}/applications &> /dev/null %postun if [ "$1" = "0" ]; then update-desktop-database %{_datadir}/applications &> /dev/null fi %files %defattr(-, root, root, -) %{_bindir}/nomadsync %{_datadir}/pixmaps/nomadsync-logo.png %{_datadir}/applications/*.desktop %doc ChangeLog authors copying readme %changelog * Wed Mar 8 2006 Linus Walleij 0.4.2-8 - New sources, do not re-tar the file. * Tue Mar 7 2006 Linus Walleij 0.4.2-7 - Detect wxGTK 2.4.x in a smarter way. * Sun Jan 15 2006 Linus Walleij 0.4.2-6 - Making a compat choice for FC5 and beyond. * Mon Dec 19 2005 Linus Walleij 0.4.2-5 - Fixing in response to reviewers comments. * Sat Nov 16 2005 Linus Walleij 0.4.2-4 - Added a desktop file by way of Source1-parameter instead. * Sat Oct 15 2005 Linus Walleij 0.4.2-3 - Added a desktop file. * Fri Oct 14 2005 Linus Walleij 0.4.2-2 - Tweaks and fixes to dependencies. * Thu Oct 06 2005 Brent Norris 0.4.2-1 - First RPM'ed Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 9 Mar 2006 19:51:02 -0000 1.1 +++ .cvsignore 9 Mar 2006 19:53:02 -0000 1.2 @@ -0,0 +1 @@ +nomadsync-0.4.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 9 Mar 2006 19:51:02 -0000 1.1 +++ sources 9 Mar 2006 19:53:02 -0000 1.2 @@ -0,0 +1 @@ +fd55927c54cd0737cdecb88e4bfbf0b7 nomadsync-0.4.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 19:59:28 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 9 Mar 2006 14:59:28 -0500 Subject: rpms/perl-DBD-SQLite/devel perl-DBD-SQLite.spec,1.7,1.8 Message-ID: <200603092000.k29K01KU012635@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-DBD-SQLite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12616 Modified Files: perl-DBD-SQLite.spec Log Message: - DBD::SQLite fails to build with the current FC-5 sqlite version (3.3.3); see bugzilla entry #183530. Forcing package rebuild with the included version of sqlite (3.2.7). Index: perl-DBD-SQLite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-DBD-SQLite.spec 18 Feb 2006 16:26:19 -0000 1.7 +++ perl-DBD-SQLite.spec 9 Mar 2006 19:59:28 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite Version: 1.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries @@ -33,7 +33,7 @@ %build -CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor +CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor USE_LOCAL_SQLITE=1 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS" @@ -63,6 +63,11 @@ %changelog +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.11-3 +- DBD::SQLite fails to build with the current FC-5 sqlite version (3.3.3); + see bugzilla entry #183530. + Forcing package rebuild with the included version of sqlite (3.2.7). + * Sat Feb 18 2006 Jose Pedro Oliveira - 1.11-2 - Rebuild for FC5 (perl 5.8.8). From fedora-extras-commits at redhat.com Thu Mar 9 20:12:34 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Thu, 9 Mar 2006 15:12:34 -0500 Subject: owners owners.list,1.726,1.727 Message-ID: <200603092013.k29KD6wJ014630@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14613 Modified Files: owners.list Log Message: Added nomadsync. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.726 retrieving revision 1.727 diff -u -r1.726 -r1.727 --- owners.list 9 Mar 2006 02:00:49 -0000 1.726 +++ owners.list 9 Mar 2006 20:12:33 -0000 1.727 @@ -738,6 +738,7 @@ Fedora Extras|ngrep|Network layer grep tool|oliver at linux-kernel.at|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|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| Fedora Extras|notecase|A hierarchical note manager|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|notemeister|Notemeister is a small, simple note organizer made for the GNOME2 desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 9 20:21:28 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 9 Mar 2006 15:21:28 -0500 Subject: fedora-release fedora-core.repo, 1.1, 1.2 fedora-development.repo, 1.2, 1.3 fedora-extras-development.repo, 1.1, 1.2 fedora-extras.repo, 1.3, 1.4 fedora-updates.repo, 1.6, 1.7 Message-ID: <200603092021.k29KLSHM014734@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14699 Modified Files: fedora-core.repo fedora-development.repo fedora-extras-development.repo fedora-extras.repo fedora-updates.repo Log Message: enable the right repos Index: fedora-core.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-core.repo 15 Feb 2006 19:58:10 -0000 1.1 +++ fedora-core.repo 9 Mar 2006 20:21:21 -0000 1.2 @@ -2,7 +2,7 @@ name=Fedora Core $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os/ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-$releasever -enabled=0 +enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-development.repo 2 Mar 2006 17:15:07 -0000 1.2 +++ fedora-development.repo 9 Mar 2006 20:21:21 -0000 1.3 @@ -27,7 +27,7 @@ name=Fedora Core - Development #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide -enabled=1 +enabled=0 gpgcheck=0 [development-debuginfo] Index: fedora-extras-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-extras-development.repo 15 Feb 2006 20:01:52 -0000 1.1 +++ fedora-extras-development.repo 9 Mar 2006 20:21:21 -0000 1.2 @@ -2,7 +2,7 @@ name=Fedora Extras - Development Tree #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel -enabled=1 +enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-extras.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-extras.repo 15 Feb 2006 19:58:10 -0000 1.3 +++ fedora-extras.repo 9 Mar 2006 20:21:21 -0000 1.4 @@ -2,7 +2,7 @@ name=Fedora Extras $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/ mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-$releasever -enabled=0 +enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-updates.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fedora-updates.repo 15 Feb 2006 19:58:10 -0000 1.6 +++ fedora-updates.repo 9 Mar 2006 20:21:21 -0000 1.7 @@ -2,7 +2,7 @@ name=Fedora Core $releasever - $basearch - Updates #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/ mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc$releasever -enabled=0 +enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora From fedora-extras-commits at redhat.com Thu Mar 9 20:27:34 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 9 Mar 2006 15:27:34 -0500 Subject: rpms/qps/FC-4 .cvsignore,1.4,1.5 qps.spec,1.4,1.5 sources,1.4,1.5 Message-ID: <200603092028.k29KS67f014816@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14778/FC-4 Modified Files: .cvsignore qps.spec sources Log Message: Update to 1.9.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 22 Feb 2006 19:55:18 -0000 1.4 +++ .cvsignore 9 Mar 2006 20:27:34 -0000 1.5 @@ -1 +1 @@ -qps-1.9.12.tar.gz +qps-1.9.13.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/qps.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qps.spec 22 Feb 2006 19:55:18 -0000 1.4 +++ qps.spec 9 Mar 2006 20:27:34 -0000 1.5 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.12 +Version: 1.9.13 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3208/qps-1.9.12.tar.gz +Source0: http://kldp.net/frs/download.php/3228/qps-1.9.13.tar.gz Source1: qps.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %changelog +* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 +- Update to 1.9.13 + * Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 - Update to 1.9.12 - Add COPYING file Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 22 Feb 2006 19:55:18 -0000 1.4 +++ sources 9 Mar 2006 20:27:34 -0000 1.5 @@ -1 +1 @@ -8a42863a1fa6de1d40f031f6787198f7 qps-1.9.12.tar.gz +4db5051d7880e3cf427b06319dd55676 qps-1.9.13.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 20:27:40 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 9 Mar 2006 15:27:40 -0500 Subject: rpms/qps/devel .cvsignore,1.5,1.6 qps.spec,1.5,1.6 sources,1.5,1.6 Message-ID: <200603092028.k29KSCUW014821@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14778/devel Modified Files: .cvsignore qps.spec sources Log Message: Update to 1.9.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 22 Feb 2006 20:57:59 -0000 1.5 +++ .cvsignore 9 Mar 2006 20:27:40 -0000 1.6 @@ -1 +1 @@ -qps-1.9.12.tar.gz +qps-1.9.13.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qps.spec 22 Feb 2006 20:57:59 -0000 1.5 +++ qps.spec 9 Mar 2006 20:27:40 -0000 1.6 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.12 +Version: 1.9.13 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3208/qps-1.9.12.tar.gz +Source0: http://kldp.net/frs/download.php/3228/qps-1.9.13.tar.gz Source1: qps.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %changelog +* Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 +- Update to 1.9.13 + * Wed Feb 22 2006 Dawid Gajownik - 1.9.12-1 - Update to 1.9.12 - Drop gcc41.patch (pushed upstream) Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 22 Feb 2006 20:57:59 -0000 1.5 +++ sources 9 Mar 2006 20:27:40 -0000 1.6 @@ -1 +1 @@ -8a42863a1fa6de1d40f031f6787198f7 qps-1.9.12.tar.gz +4db5051d7880e3cf427b06319dd55676 qps-1.9.13.tar.gz From fedora-extras-commits at redhat.com Thu Mar 9 20:54:38 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 9 Mar 2006 15:54:38 -0500 Subject: fedora-release fedora-release.spec,1.22,1.23 Message-ID: <200603092054.k29KsctV015272@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15254 Modified Files: fedora-release.spec Log Message: no autorun this time around, only one eula, fix the repo config Index: fedora-release.spec =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- fedora-release.spec 8 Mar 2006 21:29:45 -0000 1.22 +++ fedora-release.spec 9 Mar 2006 20:54:31 -0000 1.23 @@ -7,7 +7,7 @@ Summary: Fedora Core release file Name: fedora-release Version: %{real_release_version} -Release: 2 +Release: 4 License: GFDL Group: System Environment/Base Source: fedora-release-%{real_release_version}.tar.gz @@ -112,7 +112,7 @@ %config(noreplace) /etc/sysconfig/rhn/sources %config(noreplace) /etc/yum.repos.d/* %doc R* stylesheet-images figs *.css -%doc eula.txt GPL autorun-template +%doc eula.txt GPL %doc about %config %attr(0644,root,root) /etc/issue %config %attr(0644,root,root) /etc/issue.net From fedora-extras-commits at redhat.com Thu Mar 9 20:58:46 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 15:58:46 -0500 Subject: rpms/cmucl/devel cmucl.spec,1.1,1.2 Message-ID: <200603092059.k29KxI7P015325@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15308 Modified Files: cmucl.spec Log Message: * Thu Mar 09 2006 Rex Dieter 19c-4 - move bootstrap source outside of %ifarch block Index: cmucl.spec =================================================================== RCS file: /cvs/extras/rpms/cmucl/devel/cmucl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cmucl.spec 9 Mar 2006 19:43:30 -0000 1.1 +++ cmucl.spec 9 Mar 2006 20:58:46 -0000 1.2 @@ -2,7 +2,7 @@ Summary: CMU Common Lisp compiler Name: cmucl Version: 19c -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain/MIT Group: Development/Languages @@ -13,13 +13,13 @@ ExclusiveArch: %{ix86} ## ix86 section +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 %ifarch %{ix86} %define cmucl_arch x86 #define bootstrap cmucl #define bootstrap_pkg 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 %define bootstrap_src -a 10 %else BuildRequires: %{?bootstrap_pkg} @@ -184,6 +184,9 @@ %changelog +* Thu Mar 09 2006 Rex Dieter 19c-4 +- move bootstrap source outside of %%ifarch block + * Wed Mar 08 2006 Rex Dieter 19c-3 - License: +MIT - BR: bc, time From fedora-extras-commits at redhat.com Thu Mar 9 21:00:53 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 16:00:53 -0500 Subject: owners owners.list,1.727,1.728 Message-ID: <200603092101.k29L1P0a017281@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15412 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.727 retrieving revision 1.728 diff -u -r1.727 -r1.728 --- owners.list 9 Mar 2006 20:12:33 -0000 1.727 +++ owners.list 9 Mar 2006 21:00:52 -0000 1.728 @@ -126,6 +126,7 @@ Fedora Extras|clearsilver|HTML template system|fedora at soeterbroek.com|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|cmucl|CMU Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at redhat.com|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|colordiff|Color terminal highlighter for diff files|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 9 21:37:43 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 9 Mar 2006 16:37:43 -0500 Subject: rpms/maxima/devel maxima.spec,1.18,1.19 Message-ID: <200603092138.k29LcFa0017460@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17443 Modified Files: maxima.spec Log Message: * Thu Mar 09 2006 Rex Dieter 5.9.2-12 - enable runtime-cmucl (%ix86 only, atm) Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- maxima.spec 9 Mar 2006 02:24:24 -0000 1.18 +++ maxima.spec 9 Mar 2006 21:37:42 -0000 1.19 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -17,10 +17,13 @@ %define _with_default_lisp --with-default-lisp=clisp +%ifarch %{ix86} +# cmucl review (done): http://bugzilla.redhat.com/bugzilla/166796 +%define _enable_cmucl --enable-cmucl +%endif + %ifarch %{ix86} x86_64 %define _enable_clisp --enable-clisp -# cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796 -#define _enable_cmucl --enable-cmucl # gcl *was* not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026 %define _enable_gcl --enable-gcl %define _enable_sbcl --enable-sbcl @@ -354,6 +357,9 @@ %changelog +* Thu Mar 09 2006 Rex Dieter 5.9.2-12 +- enable runtime-cmucl (%%ix86 only, atm) + * Wed Mar 08 2006 Rex Dieter 5.9.2-11 - fc5: enable runtime-gcl - runtime-sbcl: Requires: sbcl = %%{sbcl_version_used_to_build} From fedora-extras-commits at redhat.com Fri Mar 10 01:29:43 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 9 Mar 2006 20:29:43 -0500 Subject: rpms/lib765 import.log,1.3,1.4 Message-ID: <200603100130.k2A1UF3X026592@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26556 Modified Files: import.log Log Message: auto-import lib765-0.3.3-5 on branch devel from lib765-0.3.3-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lib765/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 7 Mar 2006 19:05:23 -0000 1.3 +++ import.log 10 Mar 2006 01:29:42 -0000 1.4 @@ -1,2 +1,3 @@ lib765-0_3_3-3:HEAD:lib765-0.3.3-3.src.rpm:1137113910 lib765-0_3_3-4:HEAD:lib765-0.3.3-4.src.rpm:1141758291 +lib765-0_3_3-5:HEAD:lib765-0.3.3-5.src.rpm:1141954170 From fedora-extras-commits at redhat.com Fri Mar 10 01:29:50 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Thu, 9 Mar 2006 20:29:50 -0500 Subject: rpms/lib765/devel lib765.spec,1.2,1.3 Message-ID: <200603100130.k2A1UM9K026595@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26556/devel Modified Files: lib765.spec Log Message: auto-import lib765-0.3.3-5 on branch devel from lib765-0.3.3-5.src.rpm Index: lib765.spec =================================================================== RCS file: /cvs/extras/rpms/lib765/devel/lib765.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lib765.spec 7 Mar 2006 19:05:31 -0000 1.2 +++ lib765.spec 10 Mar 2006 01:29:49 -0000 1.3 @@ -1,7 +1,7 @@ Summary: A library for emulating the uPD765a floppy controller Name: lib765 Version: 0.3.3 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.seasip.demon.co.uk/Unix/LibDsk/lib765-%{version}.tar.gz @@ -16,7 +16,7 @@ %package devel Summary: Development files for lib765. Group: Development/Libraries -Requires: libdsk-devel, lib765=%{version}-%{release} +Requires: libdsk-devel, %{name}=%{version}-%{release} %description devel Development files for lib765. @@ -51,6 +51,9 @@ %exclude %{_libdir}/lib765.la %changelog +* Thu Mar 9 2006 Paul F. Johnson 0.3.3-5 +- Bug in the spec file means it didn't compile. + * Tue Mar 7 2006 Paul F. Johnson 0.3.3-4 - Added Require for devel package From fedora-extras-commits at redhat.com Fri Mar 10 03:50:18 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Thu, 9 Mar 2006 22:50:18 -0500 Subject: rpms/rssowl/devel rssowl.spec,1.4,1.5 Message-ID: <200603100350.k2A3ooPn031174@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/rssowl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31157 Modified Files: rssowl.spec Log Message: Revision 11. Rebuild with new compiler. Index: rssowl.spec =================================================================== RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rssowl.spec 7 Feb 2006 23:49:18 -0000 1.4 +++ rssowl.spec 10 Mar 2006 03:50:17 -0000 1.5 @@ -1,6 +1,6 @@ %define name rssowl %define version 1.2 -%define release 10%{?dist} +%define release 11%{?dist} %define jdk java Name: %name @@ -138,6 +138,9 @@ %{_libdir}/gcj/%{name} %changelog +* Thu Mar 9 2006 Anthony Green - 1.2-11 +- Rebuild with new compiler. + * Tue Feb 7 2006 Anthony Green - 1.2-10 - Fix swt jar reference in build-jar-repository. From fedora-extras-commits at redhat.com Fri Mar 10 04:51:09 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 9 Mar 2006 23:51:09 -0500 Subject: rpms/deskbar-applet/FC-4 .cvsignore, 1.2, 1.3 deskbar-applet.spec, 1.5, 1.6 sources, 1.2, 1.3 Message-ID: <200603100451.k2A4pftv000878@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv857 Modified Files: .cvsignore deskbar-applet.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Mar 2005 16:59:04 -0000 1.2 +++ .cvsignore 10 Mar 2006 04:51:08 -0000 1.3 @@ -1 +1 @@ -deskbar-applet-0.2.tar.gz +deskbar-applet-0.8.4.tar.gz Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/FC-4/deskbar-applet.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- deskbar-applet.spec 7 Apr 2005 00:12:03 -0000 1.5 +++ deskbar-applet.spec 10 Mar 2006 04:51:08 -0000 1.6 @@ -1,15 +1,17 @@ +%{!?pyver: %define pyver %(%{__python} -c 'import sys;print(sys.version[0:3])')}%{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} + Name: deskbar-applet -Version: 0.2 -Release: 4 +Version: 0.8.4 +Release: 1%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet License: GPL URL: http://browserbookapp.sourceforge.net/deskbar.html -Source0: http://prdownloads.sourceforge.net/browserbookapp/deskbar-applet-0.2.tar.gz +Source0: http://dl.sourceforge.net/browserbookapp/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf -BuildArch: noarch +BuildRequires: gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel gnome-python2-applet +Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2 %description This applet looks like the current Gnome Mini-Commander, but it launches search @@ -28,22 +30,34 @@ %setup -q %build +%configure +make %{_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -install -D -m 0755 deskbar-applet.py $RPM_BUILD_ROOT%{_libexecdir}/deskbar-applet.py -install -D -m 0644 DeskbarApplet.server $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/DeskbarApplet.server +make install DESTDIR=$RPM_BUILD_ROOT +find $RPM_BUILD_ROOT -name \*.la -exec rm {} \; +%{find_lang} %{name} %clean rm -rf $RPM_BUILD_ROOT -%files +%files -f %{name}.lang +%defattr(-,root,root,-) %defattr(-,root,root,-) -%doc CHANGELOG LICENCE README -%{_libexecdir}/deskbar-applet.py -%{_libdir}/bonobo/servers/DeskbarApplet.server +%doc AUTHORS ChangeLog COPYING README +%{_sysconfdir}/gconf/schemas/%{name}.schemas +%{_libdir}/%{name} +%{_libdir}/bonobo/servers/Deskbar_Applet.server +%{_libdir}/pkgconfig/%{name}.pc +%{python_sitelib}/deskbar +%{_datadir}/%{name} +%{_datadir}/pixmaps/%{name}.png %changelog +* Thu Mar 9 2006 Ignacio Vazquez-Abrams 0.8.4-1 +- Upstream update + * Thu Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Mar 2005 16:59:04 -0000 1.2 +++ sources 10 Mar 2006 04:51:08 -0000 1.3 @@ -1 +1 @@ -051558aa867073aa901dc1049ae0ae12 deskbar-applet-0.2.tar.gz +590ac908dd8890aef9492aabf0a0c78a deskbar-applet-0.8.4.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 07:52:10 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 02:52:10 -0500 Subject: rpms/m17n-db/devel README, NONE, 1.1 Makefile, 1.1, NONE m17n-db.spec, 1.2, NONE sources, 1.2, NONE Message-ID: <200603100752.k2A7qCoS007233@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-db/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7195 Added Files: README Removed Files: Makefile m17n-db.spec sources Log Message: m17n-db is now in Fedora Core. --- NEW FILE README --- m17n-db has moved to Fedora Core as of FC5. --- Makefile DELETED --- --- m17n-db.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 09:04:28 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 04:04:28 -0500 Subject: rpms/m17n-db/FC-4 bn-itrans-t-182227.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 m17n-db.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603100905.k2A951rd011566@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-db/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11541 Modified Files: .cvsignore m17n-db.spec sources Added Files: bn-itrans-t-182227.patch Log Message: sync with Core: - Bengali input maps fixes (runab) - map Probhat '*' key to an alternate sequence since glyph missing (#179821) - more itrans cleanup (#182227) - add icon for Tamil99 (aalam) * Thu Mar 2 2006 Jens Petersen - 1.3.3-1 - update to 1.3.3 bugfix release - fixes to Bengali, Hindi, and Punjabi maps (runab, aalam) - Tamil phonetic map now works - new Tamil99 Government Standard map (I Felix) * Tue Feb 14 2006 Jens Petersen - 1.3.2-2 - add Indian input maps ported from scim-tables - add Nepali subpackage * Fri Feb 10 2006 Jens Petersen - 1.3.2-1 - update to 1.3.2 bugfix release - do not include ja-anthy.mim input map * Thu Feb 2 2006 Jens Petersen - 1.3.1-1 - update to 1.3.1 release - add new icons to language subpackages - new common-cjk subpackage for CJK common files - new Swedish subpackage - exclude new pkgconfig file bn-itrans-t-182227.patch: --- NEW FILE bn-itrans-t-182227.patch --- --- m17n-db-1.3.3/bn-itrans.mim.1 2006-02-03 20:47:17.000000000 +0900 +++ m17n-db-1.3.3/bn-itrans.mim 2006-03-09 17:20:41.000000000 +0900 @@ -61,7 +61,7 @@ ("D" "??????") ("Dh" "??????") ("N" "??????") - ("t" "??????") + ("t" "???") ("th" "??????") ("d" "??????") ("dh" "??????") @@ -100,16 +100,10 @@ ("U" "???") ("RRi" "???") ("R^i" "???") - ("LLi" "???") ; not in ITRANS Bengali table - ("L^i" "???") ; not in ITRANS Bengali table ("e" "???") ("ai" "???") ("o" "???") ("au" "???") - ("RRI" "???") ; not in ITRANS Bengali table - ("R^I" "???") ; not in ITRANS Bengali table - ("LLI" "???") ; not in ITRANS Bengali table - ("L^I" "???") ; not in ITRANS Bengali table (".N" "???") (".n" "???") ("M" "???") ; not in ITRANS Bengali table @@ -126,10 +120,6 @@ ("7" "???") ("8" "???") ("9" "???") - ("#" "??????") ; not in ITRANS Bengali table - ("$" "??????") ; not in ITRANS Bengali table - ("^" "?????????") ; not in ITRANS Bengali table - ("*" "?????????") ; not in ITRANS Bengali table ("]" "???") ; not in ITRANS Bengali table ((S-\ ) "???") ; not in ITRANS Bengali table ((C-@) "???")) ; not in ITRANS Bengali table @@ -146,16 +136,10 @@ ("U" (delete @-) "???") ("RRi" (delete @-) "???") ("R^i" (delete @-) "???") - ("LLi" (delete @-) "???") ; not in ITRANS Bengali table - ("L^i" (delete @-) "???") ; not in ITRANS Bengali table ("e" (delete @-) "???") ("ai" (delete @-) "???") ("o" (delete @-) "???") - ("au" (delete @-) "???") - ("RRI" (delete @-) "???") ; not in ITRANS Bengali table - ("R^I" (delete @-) "???") ; not in ITRANS Bengali table - ("LLI" (delete @-) "???") ; not in ITRANS Bengali table - ("L^I" (delete @-) "???")) ; not in ITRANS Bengali table + ("au" (delete @-) "???")) (return ((Return))) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 04:22:07 -0000 1.2 +++ .cvsignore 10 Mar 2006 09:04:26 -0000 1.3 @@ -1 +1,2 @@ -m17n-db-1.2.0.tar.gz +m17n-db-1.3.3.tar.gz +m17n-db-indic-0.3.1.tar.gz Index: m17n-db.spec =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-4/m17n-db.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- m17n-db.spec 11 Nov 2005 04:39:17 -0000 1.2 +++ m17n-db.spec 10 Mar 2006 09:04:26 -0000 1.3 @@ -1,13 +1,15 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.2.0 +Version: 1.3.3 Release: 1%{?dist} Group: System Environment/Libraries License: LGPL URL: http://www.m17n.org/m17n-lib/index.html Source0: %{name}-%{version}.tar.gz +Source1: %{name}-indic-0.3.1.tar.gz BuildArch: noarch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: bn-itrans-t-182227.patch %description This package contains multilingualization (m17n) datafiles for m17n-lib @@ -23,6 +25,14 @@ m17n-db datafiles not needed for using the input maps. +%package common-cjk +Summary: m17n-db common files for CJK input +Group: System Environment/Libraries + +%description common-cjk +m17n-db common files for Chinese, Japanese and Korean input maps. + + %package amharic Summary: m17n-db input table for Amharic Group: System Environment/Libraries @@ -74,6 +84,7 @@ %package chinese Summary: m17n-db input table for Chinese Group: System Environment/Libraries +Requires: %{name}-common-cjk %description chinese m17n-db Chinese input map. @@ -186,6 +197,7 @@ %package korean Summary: m17n-db input table for Korean Group: System Environment/Libraries +Requires: %{name}-common-cjk %description korean m17n-db Korean input map. @@ -223,6 +235,14 @@ m17n-db Myanmar input map. +%package nepali +Summary: m17n-db input tables for Nepali +Group: System Environment/Libraries + +%description nepali +m17n-db Nepali input maps. + + %package oriya Summary: m17n-db input table for Oriya Group: System Environment/Libraries @@ -271,6 +291,14 @@ m17n-db Slovak input map. +%package swedish +Summary: m17n-db input table for Swedish +Group: System Environment/Libraries + +%description swedish +m17n-db Swedish input map. + + %package syriac Summary: m17n-db input table for Syriac Group: System Environment/Libraries @@ -320,8 +348,8 @@ %prep -%setup -q - +%setup -q -a1 +%patch1 -p1 -b .1 %build %configure @@ -332,9 +360,16 @@ rm -rf $RPM_BUILD_ROOT %makeinstall -# don't need ispell -rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim +# add new Indic maps +cp -p %{name}-indic/*.mim $RPM_BUILD_ROOT%{_datadir}/m17n +cp -p %{name}-indic/*.png $RPM_BUILD_ROOT%{_datadir}/m17n/icons + +# don't need ispell or anthy +rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png} +rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ja-anthy.mim,icons/ja-anthy.png} +# drop pkgconfig file for now +rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/m17n-db.pc %clean rm -rf $RPM_BUILD_ROOT @@ -347,6 +382,7 @@ %dir %{_datadir}/m17n %{_datadir}/m17n/mdb.dir %{_datadir}/m17n/*.tbl +%{_datadir}/m17n/command.mim %files datafiles %defattr(-,root,root) @@ -357,231 +393,319 @@ %{_datadir}/m17n/*.tab %{_datadir}/m17n/LOCALE.* +%files common-cjk +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/cjk-*.mim +%{_datadir}/m17n/variable.mim + %files amharic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/am-*.mim +%{_datadir}/m17n/icons/am-*.png %files arabic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ar-*.mim +%{_datadir}/m17n/icons/ar-*.png %files armenian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hy-*.mim +%{_datadir}/m17n/icons/hy-*.png %files assamese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/as-*.mim +%{_datadir}/m17n/icons/as-*.png %files bengali %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bn-*.mim +%{_datadir}/m17n/icons/bn-*.png %files bopomofo %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bopo-*.mim +%{_datadir}/m17n/icons/bopo-*.png %files chinese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/zh-*.mim +%{_datadir}/m17n/icons/zh-*.png %files croatian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hr-*.mim +%{_datadir}/m17n/icons/hr-*.png %files dhivehi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/dv-*.mim +%{_datadir}/m17n/icons/dv-*.png %files farsi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/fa-*.mim +%{_datadir}/m17n/icons/fa-*.png %files generic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/rfc1345.mim +%{_datadir}/m17n/icons/rfc1345.png %{_datadir}/m17n/unicode.mim +%{_datadir}/m17n/icons/unicode.png %files georgian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ka-*.mim +%{_datadir}/m17n/icons/ka-*.png %files greek %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/el-*.mim +%{_datadir}/m17n/icons/el-*.png %files gujarati %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/gu-*.mim +%{_datadir}/m17n/icons/gu-*.png %files hebrew %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/he-*.mim +%{_datadir}/m17n/icons/he-*.png %files hindi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hi-*.mim +%{_datadir}/m17n/icons/hi-*.png %files japanese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ja-*.mim +%{_datadir}/m17n/icons/ja-*.png %files kazakh %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/kk-*.mim +%{_datadir}/m17n/icons/kk-*.png %files khmer %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/km-*.mim +%{_datadir}/m17n/icons/km-*.png %files kannada %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/kn-*.mim +%{_datadir}/m17n/icons/kn-*.png %files korean %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ko-*.mim +%{_datadir}/m17n/icons/ko-*.png %files lao %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/lo-*.mim +%{_datadir}/m17n/icons/lo-*.png %files latin %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/latn-*.mim +%{_datadir}/m17n/icons/latn-*.png %files malayalam %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ml-*.mim +%{_datadir}/m17n/icons/ml-*.png %files myanmar %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/my-*.mim +%{_datadir}/m17n/icons/my-*.png + + +%files nepali +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/ne-*.mim +%{_datadir}/m17n/icons/ne-*.png %files oriya %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/or-*.mim +%{_datadir}/m17n/icons/or-*.png %files punjabi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/pa-*.mim +%{_datadir}/m17n/icons/pa-*.png %files russian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ru-*.mim +%{_datadir}/m17n/icons/ru-*.png %files serbian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/sr-*.mim +%{_datadir}/m17n/icons/sr-*.png %files sinhala %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/si-*.mim +%{_datadir}/m17n/icons/si-*.png %files slovak %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/sk-*.mim +%{_datadir}/m17n/icons/sk-*.png + + +%files swedish +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/sv-*.mim +%{_datadir}/m17n/icons/sv-*.png %files syriac %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/syrc-*.mim +%{_datadir}/m17n/icons/syrc-*.png %files tamil %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ta-*.mim +%{_datadir}/m17n/icons/ta-*.png %files telugu %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/te-*.mim +%{_datadir}/m17n/icons/te-*.png %files thai %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/th-*.mim +%{_datadir}/m17n/icons/th-*.png %files tibetan %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bo-*.mim +%{_datadir}/m17n/icons/bo-*.png %files vietnamese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/vi-*.mim +%{_datadir}/m17n/icons/vi-*.png %changelog +* Thu Mar 9 2006 Jens Petersen - 1.3.3-1.fc4 +- Bengali input maps fixes (runab) + - map Probhat '*' key to an alternate sequence since glyph missing (#179821) + - more itrans cleanup (#182227) +- add icon for Tamil99 (aalam) + +* Thu Mar 2 2006 Jens Petersen - 1.3.3-1 +- update to 1.3.3 bugfix release +- fixes to Bengali, Hindi, and Punjabi maps (runab, aalam) +- Tamil phonetic map now works +- new Tamil99 Government Standard map (I Felix) + +* Tue Feb 14 2006 Jens Petersen - 1.3.2-2 +- add Indian input maps ported from scim-tables +- add Nepali subpackage + +* Fri Feb 10 2006 Jens Petersen - 1.3.2-1 +- update to 1.3.2 bugfix release +- do not include ja-anthy.mim input map + +* Thu Feb 2 2006 Jens Petersen - 1.3.1-1 +- update to 1.3.1 release + - add new icons to language subpackages + - new common-cjk subpackage for CJK common files + - new Swedish subpackage + - exclude new pkgconfig file + +* Fri Dec 16 2005 Jens Petersen - 1.2.0-2 +- import to Fedora Core + * Wed Nov 9 2005 Jens Petersen - 1.2.0-1 - separate output datafiles to datafiles subpackage. @@ -591,5 +715,5 @@ * Sat Sep 24 2005 Jens Petersen - split .mim input tables into separate subpackages per language -* Sat Jan 15 2005 UTUMI Hirosi - 1.2.0-2.fdr.ut +* Sat Jan 15 2005 UTUMI Hirosi - modify spec for fedora Index: sources =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 04:22:07 -0000 1.2 +++ sources 10 Mar 2006 09:04:26 -0000 1.3 @@ -1 +1,2 @@ -de2a5ded6800a3744e8df0d665d1ffe5 m17n-db-1.2.0.tar.gz +a2aec22334c108565cc466d80a66292c m17n-db-1.3.3.tar.gz +2af3a9684965617273c5d9c2162acc4e m17n-db-indic-0.3.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 09:32:47 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 04:32:47 -0500 Subject: rpms/m17n-db/FC-3 bn-itrans-t-182227.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 m17n-db.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603100933.k2A9XK7J012051@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-db/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12001 Modified Files: .cvsignore m17n-db.spec sources Added Files: bn-itrans-t-182227.patch Log Message: sync with FC-4: - Bengali input maps fixes (runab) - map Probhat '*' key to an alternate sequence since glyph missing (#179821) - more itrans cleanup (#182227) - add icon for Tamil99 (aalam) * Thu Mar 2 2006 Jens Petersen - 1.3.3-1 - update to 1.3.3 bugfix release - fixes to Bengali, Hindi, and Punjabi maps (runab, aalam) - Tamil phonetic map now works - new Tamil99 Government Standard map (I Felix) * Tue Feb 14 2006 Jens Petersen - 1.3.2-2 - add Indian input maps ported from scim-tables - add Nepali subpackage * Fri Feb 10 2006 Jens Petersen - 1.3.2-1 - update to 1.3.2 bugfix release - do not include ja-anthy.mim input map * Thu Feb 2 2006 Jens Petersen - 1.3.1-1 - update to 1.3.1 release - add new icons to language subpackages - new common-cjk subpackage for CJK common files - new Swedish subpackage - exclude new pkgconfig file bn-itrans-t-182227.patch: --- NEW FILE bn-itrans-t-182227.patch --- --- m17n-db-1.3.3/bn-itrans.mim.1 2006-02-03 20:47:17.000000000 +0900 +++ m17n-db-1.3.3/bn-itrans.mim 2006-03-09 17:20:41.000000000 +0900 @@ -61,7 +61,7 @@ ("D" "??????") ("Dh" "??????") ("N" "??????") - ("t" "??????") + ("t" "???") ("th" "??????") ("d" "??????") ("dh" "??????") @@ -100,16 +100,10 @@ ("U" "???") ("RRi" "???") ("R^i" "???") - ("LLi" "???") ; not in ITRANS Bengali table - ("L^i" "???") ; not in ITRANS Bengali table ("e" "???") ("ai" "???") ("o" "???") ("au" "???") - ("RRI" "???") ; not in ITRANS Bengali table - ("R^I" "???") ; not in ITRANS Bengali table - ("LLI" "???") ; not in ITRANS Bengali table - ("L^I" "???") ; not in ITRANS Bengali table (".N" "???") (".n" "???") ("M" "???") ; not in ITRANS Bengali table @@ -126,10 +120,6 @@ ("7" "???") ("8" "???") ("9" "???") - ("#" "??????") ; not in ITRANS Bengali table - ("$" "??????") ; not in ITRANS Bengali table - ("^" "?????????") ; not in ITRANS Bengali table - ("*" "?????????") ; not in ITRANS Bengali table ("]" "???") ; not in ITRANS Bengali table ((S-\ ) "???") ; not in ITRANS Bengali table ((C-@) "???")) ; not in ITRANS Bengali table @@ -146,16 +136,10 @@ ("U" (delete @-) "???") ("RRi" (delete @-) "???") ("R^i" (delete @-) "???") - ("LLi" (delete @-) "???") ; not in ITRANS Bengali table - ("L^i" (delete @-) "???") ; not in ITRANS Bengali table ("e" (delete @-) "???") ("ai" (delete @-) "???") ("o" (delete @-) "???") - ("au" (delete @-) "???") - ("RRI" (delete @-) "???") ; not in ITRANS Bengali table - ("R^I" (delete @-) "???") ; not in ITRANS Bengali table - ("LLI" (delete @-) "???") ; not in ITRANS Bengali table - ("L^I" (delete @-) "???")) ; not in ITRANS Bengali table + ("au" (delete @-) "???")) (return ((Return))) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 04:22:07 -0000 1.2 +++ .cvsignore 10 Mar 2006 09:32:37 -0000 1.3 @@ -1 +1,2 @@ -m17n-db-1.2.0.tar.gz +m17n-db-1.3.3.tar.gz +m17n-db-indic-0.3.1.tar.gz Index: m17n-db.spec =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-3/m17n-db.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- m17n-db.spec 11 Nov 2005 04:39:17 -0000 1.2 +++ m17n-db.spec 10 Mar 2006 09:32:37 -0000 1.3 @@ -1,13 +1,15 @@ Name: m17n-db Summary: Multilingualization datafiles for m17n-lib -Version: 1.2.0 +Version: 1.3.3 Release: 1%{?dist} Group: System Environment/Libraries License: LGPL URL: http://www.m17n.org/m17n-lib/index.html Source0: %{name}-%{version}.tar.gz +Source1: %{name}-indic-0.3.1.tar.gz BuildArch: noarch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: bn-itrans-t-182227.patch %description This package contains multilingualization (m17n) datafiles for m17n-lib @@ -23,6 +25,14 @@ m17n-db datafiles not needed for using the input maps. +%package common-cjk +Summary: m17n-db common files for CJK input +Group: System Environment/Libraries + +%description common-cjk +m17n-db common files for Chinese, Japanese and Korean input maps. + + %package amharic Summary: m17n-db input table for Amharic Group: System Environment/Libraries @@ -74,6 +84,7 @@ %package chinese Summary: m17n-db input table for Chinese Group: System Environment/Libraries +Requires: %{name}-common-cjk %description chinese m17n-db Chinese input map. @@ -186,6 +197,7 @@ %package korean Summary: m17n-db input table for Korean Group: System Environment/Libraries +Requires: %{name}-common-cjk %description korean m17n-db Korean input map. @@ -223,6 +235,14 @@ m17n-db Myanmar input map. +%package nepali +Summary: m17n-db input tables for Nepali +Group: System Environment/Libraries + +%description nepali +m17n-db Nepali input maps. + + %package oriya Summary: m17n-db input table for Oriya Group: System Environment/Libraries @@ -271,6 +291,14 @@ m17n-db Slovak input map. +%package swedish +Summary: m17n-db input table for Swedish +Group: System Environment/Libraries + +%description swedish +m17n-db Swedish input map. + + %package syriac Summary: m17n-db input table for Syriac Group: System Environment/Libraries @@ -320,8 +348,8 @@ %prep -%setup -q - +%setup -q -a1 +%patch1 -p1 -b .1 %build %configure @@ -332,9 +360,16 @@ rm -rf $RPM_BUILD_ROOT %makeinstall -# don't need ispell -rm $RPM_BUILD_ROOT%{_datadir}/m17n/ispell.mim +# add new Indic maps +cp -p %{name}-indic/*.mim $RPM_BUILD_ROOT%{_datadir}/m17n +cp -p %{name}-indic/*.png $RPM_BUILD_ROOT%{_datadir}/m17n/icons + +# don't need ispell or anthy +rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ispell.mim,icons/en-ispell.png} +rm $RPM_BUILD_ROOT%{_datadir}/m17n/{ja-anthy.mim,icons/ja-anthy.png} +# drop pkgconfig file for now +rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/m17n-db.pc %clean rm -rf $RPM_BUILD_ROOT @@ -347,6 +382,7 @@ %dir %{_datadir}/m17n %{_datadir}/m17n/mdb.dir %{_datadir}/m17n/*.tbl +%{_datadir}/m17n/command.mim %files datafiles %defattr(-,root,root) @@ -357,231 +393,319 @@ %{_datadir}/m17n/*.tab %{_datadir}/m17n/LOCALE.* +%files common-cjk +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/cjk-*.mim +%{_datadir}/m17n/variable.mim + %files amharic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/am-*.mim +%{_datadir}/m17n/icons/am-*.png %files arabic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ar-*.mim +%{_datadir}/m17n/icons/ar-*.png %files armenian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hy-*.mim +%{_datadir}/m17n/icons/hy-*.png %files assamese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/as-*.mim +%{_datadir}/m17n/icons/as-*.png %files bengali %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bn-*.mim +%{_datadir}/m17n/icons/bn-*.png %files bopomofo %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bopo-*.mim +%{_datadir}/m17n/icons/bopo-*.png %files chinese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/zh-*.mim +%{_datadir}/m17n/icons/zh-*.png %files croatian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hr-*.mim +%{_datadir}/m17n/icons/hr-*.png %files dhivehi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/dv-*.mim +%{_datadir}/m17n/icons/dv-*.png %files farsi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/fa-*.mim +%{_datadir}/m17n/icons/fa-*.png %files generic %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/rfc1345.mim +%{_datadir}/m17n/icons/rfc1345.png %{_datadir}/m17n/unicode.mim +%{_datadir}/m17n/icons/unicode.png %files georgian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ka-*.mim +%{_datadir}/m17n/icons/ka-*.png %files greek %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/el-*.mim +%{_datadir}/m17n/icons/el-*.png %files gujarati %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/gu-*.mim +%{_datadir}/m17n/icons/gu-*.png %files hebrew %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/he-*.mim +%{_datadir}/m17n/icons/he-*.png %files hindi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/hi-*.mim +%{_datadir}/m17n/icons/hi-*.png %files japanese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ja-*.mim +%{_datadir}/m17n/icons/ja-*.png %files kazakh %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/kk-*.mim +%{_datadir}/m17n/icons/kk-*.png %files khmer %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/km-*.mim +%{_datadir}/m17n/icons/km-*.png %files kannada %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/kn-*.mim +%{_datadir}/m17n/icons/kn-*.png %files korean %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ko-*.mim +%{_datadir}/m17n/icons/ko-*.png %files lao %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/lo-*.mim +%{_datadir}/m17n/icons/lo-*.png %files latin %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/latn-*.mim +%{_datadir}/m17n/icons/latn-*.png %files malayalam %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ml-*.mim +%{_datadir}/m17n/icons/ml-*.png %files myanmar %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/my-*.mim +%{_datadir}/m17n/icons/my-*.png + + +%files nepali +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/ne-*.mim +%{_datadir}/m17n/icons/ne-*.png %files oriya %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/or-*.mim +%{_datadir}/m17n/icons/or-*.png %files punjabi %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/pa-*.mim +%{_datadir}/m17n/icons/pa-*.png %files russian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ru-*.mim +%{_datadir}/m17n/icons/ru-*.png %files serbian %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/sr-*.mim +%{_datadir}/m17n/icons/sr-*.png %files sinhala %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/si-*.mim +%{_datadir}/m17n/icons/si-*.png %files slovak %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/sk-*.mim +%{_datadir}/m17n/icons/sk-*.png + + +%files swedish +%defattr(-,root,root) +%dir %{_datadir}/m17n +%{_datadir}/m17n/sv-*.mim +%{_datadir}/m17n/icons/sv-*.png %files syriac %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/syrc-*.mim +%{_datadir}/m17n/icons/syrc-*.png %files tamil %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/ta-*.mim +%{_datadir}/m17n/icons/ta-*.png %files telugu %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/te-*.mim +%{_datadir}/m17n/icons/te-*.png %files thai %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/th-*.mim +%{_datadir}/m17n/icons/th-*.png %files tibetan %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/bo-*.mim +%{_datadir}/m17n/icons/bo-*.png %files vietnamese %defattr(-,root,root) %dir %{_datadir}/m17n %{_datadir}/m17n/vi-*.mim +%{_datadir}/m17n/icons/vi-*.png %changelog +* Thu Mar 9 2006 Jens Petersen - 1.3.3-1.fc3 +- Bengali input maps fixes (runab) + - map Probhat '*' key to an alternate sequence since glyph missing (#179821) + - more itrans cleanup (#182227) +- add icon for Tamil99 (aalam) + +* Thu Mar 2 2006 Jens Petersen - 1.3.3-1 +- update to 1.3.3 bugfix release +- fixes to Bengali, Hindi, and Punjabi maps (runab, aalam) +- Tamil phonetic map now works +- new Tamil99 Government Standard map (I Felix) + +* Tue Feb 14 2006 Jens Petersen - 1.3.2-2 +- add Indian input maps ported from scim-tables +- add Nepali subpackage + +* Fri Feb 10 2006 Jens Petersen - 1.3.2-1 +- update to 1.3.2 bugfix release +- do not include ja-anthy.mim input map + +* Thu Feb 2 2006 Jens Petersen - 1.3.1-1 +- update to 1.3.1 release + - add new icons to language subpackages + - new common-cjk subpackage for CJK common files + - new Swedish subpackage + - exclude new pkgconfig file + +* Fri Dec 16 2005 Jens Petersen - 1.2.0-2 +- import to Fedora Core + * Wed Nov 9 2005 Jens Petersen - 1.2.0-1 - separate output datafiles to datafiles subpackage. @@ -591,5 +715,5 @@ * Sat Sep 24 2005 Jens Petersen - split .mim input tables into separate subpackages per language -* Sat Jan 15 2005 UTUMI Hirosi - 1.2.0-2.fdr.ut +* Sat Jan 15 2005 UTUMI Hirosi - modify spec for fedora Index: sources =================================================================== RCS file: /cvs/extras/rpms/m17n-db/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 04:22:07 -0000 1.2 +++ sources 10 Mar 2006 09:32:37 -0000 1.3 @@ -1 +1,2 @@ -de2a5ded6800a3744e8df0d665d1ffe5 m17n-db-1.2.0.tar.gz +a2aec22334c108565cc466d80a66292c m17n-db-1.3.3.tar.gz +2af3a9684965617273c5d9c2162acc4e m17n-db-indic-0.3.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 11:56:43 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 10 Mar 2006 06:56:43 -0500 Subject: rpms/convmv/devel .cvsignore, 1.2, 1.3 convmv.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200603101157.k2ABvFa7016430@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/convmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16407 Modified Files: .cvsignore convmv.spec sources Log Message: version 1.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Jan 2005 08:20:55 -0000 1.2 +++ .cvsignore 10 Mar 2006 11:56:42 -0000 1.3 @@ -1 +1 @@ -convmv-1.08.tar.gz +convmv-1.09.tar.gz Index: convmv.spec =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/convmv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- convmv.spec 6 Apr 2005 22:11:36 -0000 1.4 +++ convmv.spec 10 Mar 2006 11:56:42 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Convert filename encodings Name: convmv -Version: 1.08 -Release: 3 +Version: 1.09 +Release: 1 Group: Applications/System License: GPL @@ -37,6 +37,9 @@ %{_mandir}/man*/* %changelog +* Fri Mar 10 2006 Nils Philippsen +- version 1.09 + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Jan 2005 08:20:55 -0000 1.2 +++ sources 10 Mar 2006 11:56:42 -0000 1.3 @@ -1 +1 @@ -40707f82b1a9631fe715f68f94431d3a convmv-1.08.tar.gz +79e76800852866dedefc1aaf32ea69e9 convmv-1.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 12:37:05 2006 From: fedora-extras-commits at redhat.com (Nils Philippsen (nphilipp)) Date: Fri, 10 Mar 2006 07:37:05 -0500 Subject: rpms/convmv/devel convmv.spec,1.5,1.6 Message-ID: <200603101237.k2ACbbuf018521@cvs-int.fedora.redhat.com> Author: nphilipp Update of /cvs/extras/rpms/convmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18504 Modified Files: convmv.spec Log Message: use username in BuildRoot don't use PREFIX in %build Index: convmv.spec =================================================================== RCS file: /cvs/extras/rpms/convmv/devel/convmv.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- convmv.spec 10 Mar 2006 11:56:42 -0000 1.5 +++ convmv.spec 10 Mar 2006 12:37:04 -0000 1.6 @@ -9,7 +9,7 @@ Source: http://j3e.de/linux/convmv/convmv-%{version}.tar.gz BuildRequires: /usr/bin/md5sum BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This package contains the tool convmv with which you can convert the encodings @@ -20,7 +20,7 @@ %build md5sum -c MD5sums -make PREFIX=%{_prefix} +make make test %install From fedora-extras-commits at redhat.com Fri Mar 10 13:36:29 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 08:36:29 -0500 Subject: rpms/m17n-lib/devel README, NONE, 1.1 Makefile, 1.1, NONE m17n-lib-1.2.0-core-libs-only.patch, 1.1, NONE m17n-lib.spec, 1.2, NONE sources, 1.2, NONE Message-ID: <200603101336.k2ADaVQV021200@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-lib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21190 Added Files: README Removed Files: Makefile m17n-lib-1.2.0-core-libs-only.patch m17n-lib.spec sources Log Message: m17n-lib is now in Core. --- NEW FILE README --- m17n-lib has moved to Fedora Core as of FC5. --- Makefile DELETED --- --- m17n-lib-1.2.0-core-libs-only.patch DELETED --- --- m17n-lib.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 14:00:17 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 09:00:17 -0500 Subject: rpms/m17n-lib/FC-4 m17n-lib-nobuild-examples.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 m17n-lib.spec, 1.2, 1.3 sources, 1.2, 1.3 m17n-lib-1.2.0-core-libs-only.patch, 1.1, NONE Message-ID: <200603101400.k2AE0nd7021399@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-lib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21279 Modified Files: .cvsignore m17n-lib.spec sources Added Files: m17n-lib-nobuild-examples.patch Removed Files: m17n-lib-1.2.0-core-libs-only.patch Log Message: sync with Core: - update to 1.3.3 minor bugfix release * Fri Feb 10 2006 Jens Petersen - 1.3.2-1 - update to 1.3.2 bugfix release - m17n-lib-no-gui-headers.patch is now upstream * Thu Feb 2 2006 Jens Petersen - 1.3.1-1 - update to 1.3.1 release - rename use_otf and use_anthy macros to with_gui and with_examples - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch * Fri Dec 16 2005 Jens Petersen - 1.2.0-2 - buildrequire autoconf m17n-lib-nobuild-examples.patch: --- NEW FILE m17n-lib-nobuild-examples.patch --- --- m17n-lib-1.3.1/Makefile.am~ 2005-11-21 16:39:00.000000000 +0900 +++ m17n-lib-1.3.1/Makefile.am 2006-02-02 16:01:48.000000000 +0900 @@ -22,7 +22,7 @@ ## Process this file with Automake to create Makefile.in -SUBDIRS = src example +SUBDIRS = src bin_SCRIPTS = m17n-config Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 04:53:15 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:00:17 -0000 1.3 @@ -1 +1 @@ -m17n-lib-1.2.0.tar.gz +m17n-lib-1.3.3.tar.gz Index: m17n-lib.spec =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-4/m17n-lib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- m17n-lib.spec 15 Nov 2005 02:39:22 -0000 1.2 +++ m17n-lib.spec 10 Mar 2006 14:00:17 -0000 1.3 @@ -1,11 +1,11 @@ -# set to 1 to build with OpenType Font support -%define use_otf 0 -# set to 1 to build with anthy support -%define use_anthy 0 +# set to 1 to build with GUI and OpenType Font support +%define with_gui 0 +# set to 1 to build examples (including anthy support) +%define with_examples 0 Name: m17n-lib -Version: 1.2.0 -Release: 1%{?dist} +Version: 1.3.3 +Release: 0%{?dist} Summary: Multilingual text library Group: System Environment/Libraries @@ -15,16 +15,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: m17n-db -%if %{use_otf} +%if %{with_gui} BuildRequires: libxml2-devel, xorg-x11-devel BuildRequires: freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0 BuildRequires: libotf-devel >= %{libotf_version} +%else +BuildRequires: autoconf %endif -%if %{use_anthy} +%if %{with_examples} BuildRequires: anthy-devel %endif Requires: m17n-db -Patch1: m17n-lib-1.2.0-core-libs-only.patch +Patch2: m17n-lib-nobuild-examples.patch %description m17n-lib is a multilingual text library used primarily to allow @@ -42,14 +44,20 @@ %prep %setup -q -%if ! %{use_otf} -%patch1 -p1 -b .gui -autoreconf +%if ! %{with_examples} +%patch2 -p1 -b .examples %endif +# patch2 touches Makefile.am +autoreconf %build -%configure --disable-static +%configure --disable-static \ +%if ! %{with_gui} + --with-gui=no +%else + %{nil} +%endif make @@ -86,6 +94,22 @@ %changelog +* Thu Mar 2 2006 Jens Petersen - 1.3.3-0%{?dist} +- update to 1.3.3 minor bugfix release + +* Fri Feb 10 2006 Jens Petersen - 1.3.2-1 +- update to 1.3.2 bugfix release + - m17n-lib-no-gui-headers.patch is now upstream + +* Thu Feb 2 2006 Jens Petersen - 1.3.1-1 +- update to 1.3.1 release + - rename use_otf and use_anthy macros to with_gui and with_examples + - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch + with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch + +* Fri Dec 16 2005 Jens Petersen - 1.2.0-2 +- buildrequire autoconf + * Thu Nov 10 2005 Jens Petersen - 1.2.0-1 - do not build static lib and .la files (Warren Togami) Index: sources =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 04:53:15 -0000 1.2 +++ sources 10 Mar 2006 14:00:17 -0000 1.3 @@ -1 +1 @@ -215242775c67930e20597b2c7703acef m17n-lib-1.2.0.tar.gz +f07f9fb93506db439567f774290e4dd6 m17n-lib-1.3.3.tar.gz --- m17n-lib-1.2.0-core-libs-only.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 14:01:01 2006 From: fedora-extras-commits at redhat.com (Anthony Green (green)) Date: Fri, 10 Mar 2006 09:01:01 -0500 Subject: rpms/rssowl/devel rssowl.script,1.3,1.4 rssowl.spec,1.5,1.6 Message-ID: <200603101401.k2AE1YTY023315@cvs-int.fedora.redhat.com> Author: green Update of /cvs/extras/rpms/rssowl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21410 Modified Files: rssowl.script rssowl.spec Log Message: Revision 12. Fix script goof. Index: rssowl.script =================================================================== RCS file: /cvs/extras/rpms/rssowl/devel/rssowl.script,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rssowl.script 7 Feb 2006 23:09:11 -0000 1.3 +++ rssowl.script 10 Mar 2006 14:01:01 -0000 1.4 @@ -5,9 +5,9 @@ # This makes the embedded browser work. if [ -z "$MOZILLA_FIVE_HOME" ]; then - XPCOM=$(ls -t /usr/lib64/mozilla-*/libxpcom.so|head -n1) + XPCOM=$(ls -t /usr/lib/mozilla-*/libxpcom.so|head -n1) export MOZILLA_FIVE_HOME=$(dirname $XPCOM) fi export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$MOZILLA_FIVE_HOME -exec java -Djava.library.path=/usr/lib64/ -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.1.2.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.1.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.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.1.2.jar:/usr/share/eclipse/plugins/org.eclipse.ui.forms_3.1.0.jar:/usr/share/java/swt-gtk-3.1.1.jar:/usr/share/java/commons-logging.jar:/usr/share/eclipse/plugins/org.eclipse.jface_3.1.1.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.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rssowl.spec 10 Mar 2006 03:50:17 -0000 1.5 +++ rssowl.spec 10 Mar 2006 14:01:01 -0000 1.6 @@ -1,6 +1,6 @@ %define name rssowl %define version 1.2 -%define release 11%{?dist} +%define release 12%{?dist} %define jdk java Name: %name @@ -138,6 +138,9 @@ %{_libdir}/gcj/%{name} %changelog +* Fri Mar 10 2006 Anthony Green - 1.2-12 +- Fix script goof. + * Thu Mar 9 2006 Anthony Green - 1.2-11 - Rebuild with new compiler. From fedora-extras-commits at redhat.com Fri Mar 10 14:12:31 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 09:12:31 -0500 Subject: rpms/m17n-lib/FC-3 m17n-lib-nobuild-examples.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 m17n-lib.spec, 1.2, 1.3 sources, 1.2, 1.3 m17n-lib-1.2.0-core-libs-only.patch, 1.1, NONE Message-ID: <200603101413.k2AED3FX023458@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/m17n-lib/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23430 Modified Files: .cvsignore m17n-lib.spec sources Added Files: m17n-lib-nobuild-examples.patch Removed Files: m17n-lib-1.2.0-core-libs-only.patch Log Message: sync with FC-4: - update to 1.3.3 minor bugfix release * Fri Feb 10 2006 Jens Petersen - 1.3.2-1 - update to 1.3.2 bugfix release - m17n-lib-no-gui-headers.patch is now upstream * Thu Feb 2 2006 Jens Petersen - 1.3.1-1 - update to 1.3.1 release - rename use_otf and use_anthy macros to with_gui and with_examples - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch * Fri Dec 16 2005 Jens Petersen - 1.2.0-2 - buildrequire autoconf m17n-lib-nobuild-examples.patch: --- NEW FILE m17n-lib-nobuild-examples.patch --- --- m17n-lib-1.3.1/Makefile.am~ 2005-11-21 16:39:00.000000000 +0900 +++ m17n-lib-1.3.1/Makefile.am 2006-02-02 16:01:48.000000000 +0900 @@ -22,7 +22,7 @@ ## Process this file with Automake to create Makefile.in -SUBDIRS = src example +SUBDIRS = src bin_SCRIPTS = m17n-config Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 04:53:15 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:12:29 -0000 1.3 @@ -1 +1 @@ -m17n-lib-1.2.0.tar.gz +m17n-lib-1.3.3.tar.gz Index: m17n-lib.spec =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-3/m17n-lib.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- m17n-lib.spec 15 Nov 2005 02:41:48 -0000 1.2 +++ m17n-lib.spec 10 Mar 2006 14:12:29 -0000 1.3 @@ -1,11 +1,11 @@ -# set to 1 to build with OpenType Font support -%define use_otf 0 -# set to 1 to build with anthy support -%define use_anthy 0 +# set to 1 to build with GUI and OpenType Font support +%define with_gui 0 +# set to 1 to build examples (including anthy support) +%define with_examples 0 Name: m17n-lib -Version: 1.2.0 -Release: 1%{?dist} +Version: 1.3.3 +Release: 0%{?dist} Summary: Multilingual text library Group: System Environment/Libraries @@ -15,16 +15,18 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: m17n-db -%if %{use_otf} +%if %{with_gui} BuildRequires: libxml2-devel, xorg-x11-devel BuildRequires: freetype-devel >= 2.0, fribidi-devel, gd-devel >= 2.0 BuildRequires: libotf-devel >= %{libotf_version} +%else +BuildRequires: autoconf %endif -%if %{use_anthy} +%if %{with_examples} BuildRequires: anthy-devel %endif Requires: m17n-db -Patch1: m17n-lib-1.2.0-core-libs-only.patch +Patch2: m17n-lib-nobuild-examples.patch %description m17n-lib is a multilingual text library used primarily to allow @@ -42,14 +44,20 @@ %prep %setup -q -%if ! %{use_otf} -%patch1 -p1 -b .gui -autoreconf +%if ! %{with_examples} +%patch2 -p1 -b .examples %endif +# patch2 touches Makefile.am +autoreconf %build -%configure --disable-static +%configure --disable-static \ +%if ! %{with_gui} + --with-gui=no +%else + %{nil} +%endif make @@ -86,6 +94,22 @@ %changelog +* Thu Mar 2 2006 Jens Petersen - 1.3.3-0%{?dist} +- update to 1.3.3 minor bugfix release + +* Fri Feb 10 2006 Jens Petersen - 1.3.2-1 +- update to 1.3.2 bugfix release + - m17n-lib-no-gui-headers.patch is now upstream + +* Thu Feb 2 2006 Jens Petersen - 1.3.1-1 +- update to 1.3.1 release + - rename use_otf and use_anthy macros to with_gui and with_examples + - build --with-gui=no and replace m17n-lib-1.2.0-core-libs-only.patch + with m17n-lib-no-gui-headers.patch and m17n-lib-nobuild-examples.patch + +* Fri Dec 16 2005 Jens Petersen - 1.2.0-2 +- buildrequire autoconf + * Thu Nov 10 2005 Jens Petersen - 1.2.0-1 - do not build static lib and .la files (Warren Togami) Index: sources =================================================================== RCS file: /cvs/extras/rpms/m17n-lib/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 04:53:15 -0000 1.2 +++ sources 10 Mar 2006 14:12:29 -0000 1.3 @@ -1 +1 @@ -215242775c67930e20597b2c7703acef m17n-lib-1.2.0.tar.gz +f07f9fb93506db439567f774290e4dd6 m17n-lib-1.3.3.tar.gz --- m17n-lib-1.2.0-core-libs-only.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 14:15:32 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Fri, 10 Mar 2006 09:15:32 -0500 Subject: rpms/fish/devel fish-1.14.0-wutil.patch,NONE,1.1 fish.spec,1.5,1.6 Message-ID: <200603101416.k2AEG5Hn023603@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23553 Modified Files: fish.spec Added Files: fish-1.14.0-wutil.patch Log Message: * Fri Mar 10 2006 Oliver Falk - 1.14.0-2 - Fix buildreqs - Fix wutil.h fish-1.14.0-wutil.patch: --- NEW FILE fish-1.14.0-wutil.patch --- diff -Nur fish-1.14.0-orig/wutil.h fish-1.14.0/wutil.h --- fish-1.14.0-orig/wutil.h 2005-09-24 22:31:33.000000000 +0200 +++ fish-1.14.0/wutil.h 2006-03-10 11:19:08.000000000 +0100 @@ -11,6 +11,7 @@ #include #include #include +#include "config.h" /** Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fish.spec 28 Sep 2005 11:24:42 -0000 1.5 +++ fish.spec 10 Mar 2006 14:15:32 -0000 1.6 @@ -2,16 +2,18 @@ Name: fish Version: 1.14.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Shells URL: http://roo.no-ip.org/fish/ Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 +Patch0: fish-1.14.0-wutil.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: doxygen ncurses-devel xorg-x11-devel +BuildRequires: doxygen ncurses-devel +BuildRequires: libX11-devel libXt-devel libXext-devel %description fish is a shell geared towards interactive use. It's features are @@ -20,6 +22,8 @@ %prep %setup -q +%patch0 -p1 -b .wutil + %build @@ -69,6 +73,10 @@ %config %_sysconfdir/fish.d/completions/*.fish %changelog +* Fri Mar 10 2006 Oliver Falk - 1.14.0-2 +- Fix buildreqs +- Fix wutil.h + * Sat Sep 24 2005 Axel Liljencrantz 1.14.0-0 - 1.14.0 From fedora-extras-commits at redhat.com Fri Mar 10 14:16:51 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 09:16:51 -0500 Subject: rpms/scim-m17n/devel README, NONE, 1.1 Makefile, 1.1, NONE scim-m17n.spec, 1.1, NONE sources, 1.2, NONE Message-ID: <200603101416.k2AEGrTe023702@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-m17n/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23660 Added Files: README Removed Files: Makefile scim-m17n.spec sources Log Message: scim-m17n is now in Core. --- NEW FILE README --- scim-m17n has moved to Fedora Core as of FC5. --- Makefile DELETED --- --- scim-m17n.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 14:21:12 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 10 Mar 2006 09:21:12 -0500 Subject: rpms/xfce4-xkb-plugin/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xfce4-xkb-plugin.spec, 1.3, 1.4 Message-ID: <200603101421.k2AELjj2023795@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23774 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Dec 2005 22:28:33 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:21:12 -0000 1.3 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.2.tar.gz +xfce4-xkb-plugin-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Dec 2005 22:28:33 -0000 1.2 +++ sources 10 Mar 2006 14:21:12 -0000 1.3 @@ -1 +1 @@ -b233819d685ab3b7f4a47c2da9fb6936 xfce4-xkb-plugin-0.3.2.tar.gz +a23baec787ee6666e15a3c243fc14ec4 xfce4-xkb-plugin-0.3.3.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xfce4-xkb-plugin.spec 16 Feb 2006 18:46:46 -0000 1.3 +++ xfce4-xkb-plugin.spec 10 Mar 2006 14:21:12 -0000 1.4 @@ -1,6 +1,6 @@ Name: xfce4-xkb-plugin -Version: 0.3.2 -Release: 6%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel Group: User Interface/Desktops @@ -43,6 +43,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 10 2006 Christoph Wickert - 0.3.3-1 +- Update to 0.3.3. + * Thu Feb 16 2006 Christoph Wickert - 0.3.2-6 - Rebuild for Fedora Extras 5. From fedora-extras-commits at redhat.com Fri Mar 10 14:30:07 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 09:30:07 -0500 Subject: rpms/scim-m17n/FC-4 .cvsignore, 1.2, 1.3 scim-m17n.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603101430.k2AEUdqL023908@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-m17n/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23885 Modified Files: .cvsignore scim-m17n.spec sources Log Message: sync with Core: - update to 0.2.0 release * Thu Feb 9 2006 Jens Petersen - 0.1.4-3 - specify filelist more precisely Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 09:58:07 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:30:07 -0000 1.3 @@ -1 +1 @@ -scim-m17n-0.1.4.tar.gz +scim-m17n-0.2.0.tar.gz Index: scim-m17n.spec =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-4/scim-m17n.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scim-m17n.spec 11 Nov 2005 09:58:07 -0000 1.1 +++ scim-m17n.spec 10 Mar 2006 14:30:07 -0000 1.2 @@ -1,5 +1,5 @@ Name: scim-m17n -Version: 0.1.4 +Version: 0.2.0 Release: 1%{?dist} Summary: SCIM IMEngine for m17n-lib @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: scim-devel m17n-lib-devel +Requires: scim %description scim-m17n provides a SCIM IMEngine for m17n-lib, which allows @@ -29,7 +30,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/IMEngine/m17n.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/IMEngine/m17n.la %clean @@ -39,11 +40,17 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README THANKS -%{_libdir}/scim-1.0 -%{_datadir}/scim +%{_libdir}/scim-1.0/*/IMEngine/m17n.so +%{_datadir}/scim/icons/* %changelog +* Sun Feb 12 2006 Jens Petersen - 0.2.0-1 +- update to 0.2.0 release + +* Thu Feb 9 2006 Jens Petersen - 0.1.4-3 +- specify filelist more precisely + * Wed Oct 5 2005 Jens Petersen - 0.1.4-1 - initial packaging for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 09:58:07 -0000 1.2 +++ sources 10 Mar 2006 14:30:07 -0000 1.3 @@ -1 +1 @@ -33fb5cc21a239a69a39118a2ca1cab7e scim-m17n-0.1.4.tar.gz +0756a310e0b8503c80de4e1f53a9524c scim-m17n-0.2.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 14:33:09 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Fri, 10 Mar 2006 09:33:09 -0500 Subject: rpms/scim-m17n/FC-3 .cvsignore, 1.2, 1.3 scim-m17n.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603101433.k2AEXfr1023988@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/scim-m17n/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23967 Modified Files: .cvsignore scim-m17n.spec sources Log Message: sync with FC-4: - update to 0.2.0 release * Thu Feb 9 2006 Jens Petersen - 0.1.4-3 - specify filelist more precisely Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Nov 2005 09:58:07 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:33:09 -0000 1.3 @@ -1 +1 @@ -scim-m17n-0.1.4.tar.gz +scim-m17n-0.2.0.tar.gz Index: scim-m17n.spec =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-3/scim-m17n.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- scim-m17n.spec 11 Nov 2005 09:58:07 -0000 1.1 +++ scim-m17n.spec 10 Mar 2006 14:33:09 -0000 1.2 @@ -1,5 +1,5 @@ Name: scim-m17n -Version: 0.1.4 +Version: 0.2.0 Release: 1%{?dist} Summary: SCIM IMEngine for m17n-lib @@ -10,6 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildrequires: scim-devel m17n-lib-devel +Requires: scim %description scim-m17n provides a SCIM IMEngine for m17n-lib, which allows @@ -29,7 +30,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/IMEngine/m17n.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/IMEngine/m17n.la %clean @@ -39,11 +40,17 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README THANKS -%{_libdir}/scim-1.0 -%{_datadir}/scim +%{_libdir}/scim-1.0/*/IMEngine/m17n.so +%{_datadir}/scim/icons/* %changelog +* Sun Feb 12 2006 Jens Petersen - 0.2.0-1 +- update to 0.2.0 release + +* Thu Feb 9 2006 Jens Petersen - 0.1.4-3 +- specify filelist more precisely + * Wed Oct 5 2005 Jens Petersen - 0.1.4-1 - initial packaging for Fedora Extras Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-m17n/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Nov 2005 09:58:07 -0000 1.2 +++ sources 10 Mar 2006 14:33:09 -0000 1.3 @@ -1 +1 @@ -33fb5cc21a239a69a39118a2ca1cab7e scim-m17n-0.1.4.tar.gz +0756a310e0b8503c80de4e1f53a9524c scim-m17n-0.2.0.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 14:54:07 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 10 Mar 2006 09:54:07 -0500 Subject: rpms/xfce4-xkb-plugin/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xfce4-xkb-plugin.spec, 1.1, 1.2 Message-ID: <200603101454.k2AEsd32024114@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24093 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 16 Dec 2005 22:28:33 -0000 1.2 +++ .cvsignore 10 Mar 2006 14:54:07 -0000 1.3 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.2.tar.gz +xfce4-xkb-plugin-0.3.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 16 Dec 2005 22:28:33 -0000 1.2 +++ sources 10 Mar 2006 14:54:07 -0000 1.3 @@ -1 +1 @@ -b233819d685ab3b7f4a47c2da9fb6936 xfce4-xkb-plugin-0.3.2.tar.gz +a23baec787ee6666e15a3c243fc14ec4 xfce4-xkb-plugin-0.3.3.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/xfce4-xkb-plugin.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xfce4-xkb-plugin.spec 16 Dec 2005 22:28:33 -0000 1.1 +++ xfce4-xkb-plugin.spec 10 Mar 2006 14:54:07 -0000 1.2 @@ -1,6 +1,6 @@ Name: xfce4-xkb-plugin -Version: 0.3.2 -Release: 4%{?dist} +Version: 0.3.3 +Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel Group: User Interface/Desktops @@ -42,6 +42,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 10 2006 Christoph Wickert - 0.3.3-1 +- Update to 0.3.3. + * Thu Dec 01 2005 Christoph Wickert - 0.3.2-4 - Add libxfcegui4-devel BuildReqs. - Fix %defattr. From fedora-extras-commits at redhat.com Fri Mar 10 15:03:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 10 Mar 2006 10:03:03 -0500 Subject: rpms/cmucl/devel cmucl.spec,1.2,1.3 Message-ID: <200603101503.k2AF3ZFP026036@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/cmucl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26017 Modified Files: cmucl.spec Log Message: refer to bugzilla entry for bootstrap availability Index: cmucl.spec =================================================================== RCS file: /cvs/extras/rpms/cmucl/devel/cmucl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cmucl.spec 9 Mar 2006 20:58:46 -0000 1.2 +++ cmucl.spec 10 Mar 2006 15:03:03 -0000 1.3 @@ -10,6 +10,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# bootstrap available for %%ix86 only: http://bugzilla.redhat.com/bugzilla/185085 ExclusiveArch: %{ix86} ## ix86 section @@ -26,6 +27,15 @@ %endif %endif +## x86_64 section +#ifarch x86_64 +#endif + +## ppc +#ifarch ppc +#endif + + Patch1: cmucl-19c-motif-shared.patch Patch2: cmucl-19c-optflags.patch From fedora-extras-commits at redhat.com Fri Mar 10 15:19:53 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 10 Mar 2006 10:19:53 -0500 Subject: rpms/libshout/FC-4 libshout.autotools.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libshout.spec, 1.8, 1.9 sources, 1.2, 1.3 Message-ID: <200603101520.k2AFKQ2h026176@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26152 Modified Files: .cvsignore libshout.spec sources Added Files: libshout.autotools.patch Log Message: update to 2.2 libshout.autotools.patch: --- NEW FILE libshout.autotools.patch --- diff -Naur libshout-2.2/include/shout/Makefile.am libshout-2.2.patched/include/shout/Makefile.am --- libshout-2.2/include/shout/Makefile.am 2004-03-21 05:03:33.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.am 2006-03-10 14:09:58.000000000 +0100 @@ -2,5 +2,5 @@ AUTOMAKE_OPTIONS = foreign -includedir = $(prefix)/include/shout -nodist_include_HEADERS = shout.h +pkgincludedir = $(includedir)/shout +nodist_pkginclude_HEADERS = shout.h diff -Naur libshout-2.2/include/shout/Makefile.in libshout-2.2.patched/include/shout/Makefile.in --- libshout-2.2/include/shout/Makefile.in 2006-01-03 20:19:05.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.in 2006-03-10 14:14:56.000000000 +0100 @@ -61,7 +61,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(includedir)" nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(nodist_include_HEADERS) +HEADERS = $(nodist_pkginclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -197,7 +197,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -includedir = $(prefix)/include/shout +pkgincludedir = $(includedir)//shout infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ @@ -217,7 +217,7 @@ target = @target@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign -nodist_include_HEADERS = shout.h +nodist_pkginclude_HEADERS = shout.h all: all-am .SUFFIXES: @@ -262,22 +262,22 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -install-nodist_includeHEADERS: $(nodist_include_HEADERS) +install-nodist_includeHEADERS: $(nodist_pkginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ - $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ done uninstall-nodist_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(includedir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:46:31 -0000 1.2 +++ .cvsignore 10 Mar 2006 15:19:53 -0000 1.3 @@ -1 +1 @@ -libshout-1.0.9.tar.gz +libshout-2.2.tar.gz Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-4/libshout.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libshout.spec 22 May 2005 23:50:52 -0000 1.8 +++ libshout.spec 10 Mar 2006 15:19:53 -0000 1.9 @@ -1,18 +1,26 @@ Name: libshout -Version: 1.0.9 -Release: 4 -Summary: icecast source streaming library. +Version: 2.2 +Release: 1%{?dist} +Summary: icecast source streaming library -Group: Libraries/Multimedia +Group: System Environment/Libraries License: LGPL URL: http://www.icecast.org/ -Source: http://developer.icecast.org/libshout/releases/%{name}-%{version}.tar.gz -Patch: libshout-makefile.patch +Source: http://downloads.us.xiph.org/releases/libshout/libshout-%{version}.tar.gz +Patch: libshout.autotools.patch + +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: libtheora-devel +BuildRequires: speex-devel + +# so it generates and installs the .pc file +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -Libshout is a library for communicating with and sending data to an +ibshout is a library for communicating with and sending data to an icecast server. It handles the socket connection, the timing of the data, and prevents most bad data from getting to the icecast server. @@ -37,11 +45,12 @@ %install rm -rf $RPM_BUILD_ROOT -# docs install in $(prefix)/doc, we don't want that, so don't go into SUBDIRS -%makeinstall SUBDIRS= +%makeinstall find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +rm -rf $RPM_BUILD_ROOT%{_docdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -51,20 +60,25 @@ %files %defattr(-,root,root,-) -%doc AUTHORS CHANGES COPYING README +%doc COPYING NEWS README %{_libdir}/libshout.so.* %files devel %defattr(-,root,root,-) -%doc doc/*.html doc/style.css +%doc examples/*.c doc/*.xml doc/*.xsl %{_libdir}/libshout.a %{_libdir}/libshout.so +%{_libdir}/pkgconfig/shout.pc %dir %{_includedir}/shout/ %{_includedir}/shout/shout.h - -# ----------------------------------------------------------------------------- +%{_datadir}/aclocal/shout.m4 %changelog +* Fri Mar 10 2006 Thomas Vander Stichele +- 2.2-1 +- new (incompatible) version, but deps are updated +- various cleanups + * Sun May 22 2005 Jeremy Katz - 1.0.9-4 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:46:31 -0000 1.2 +++ sources 10 Mar 2006 15:19:53 -0000 1.3 @@ -1 +1 @@ -bbe598e28bbf2989a90d78ff33953ea2 libshout-1.0.9.tar.gz +d5b273a072785ee14a85ff76f66850aa libshout-2.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 15:48:41 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 10 Mar 2006 10:48:41 -0500 Subject: rpms/libshout/devel libshout.autotools.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libshout.spec, 1.9, 1.10 sources, 1.2, 1.3 Message-ID: <200603101549.k2AFnDZu026340@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26315 Modified Files: .cvsignore libshout.spec sources Added Files: libshout.autotools.patch Log Message: new version libshout.autotools.patch: --- NEW FILE libshout.autotools.patch --- diff -Naur libshout-2.2/include/shout/Makefile.am libshout-2.2.patched/include/shout/Makefile.am --- libshout-2.2/include/shout/Makefile.am 2004-03-21 05:03:33.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.am 2006-03-10 14:09:58.000000000 +0100 @@ -2,5 +2,5 @@ AUTOMAKE_OPTIONS = foreign -includedir = $(prefix)/include/shout -nodist_include_HEADERS = shout.h +pkgincludedir = $(includedir)/shout +nodist_pkginclude_HEADERS = shout.h diff -Naur libshout-2.2/include/shout/Makefile.in libshout-2.2.patched/include/shout/Makefile.in --- libshout-2.2/include/shout/Makefile.in 2006-01-03 20:19:05.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.in 2006-03-10 14:14:56.000000000 +0100 @@ -61,7 +61,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(includedir)" nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(nodist_include_HEADERS) +HEADERS = $(nodist_pkginclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -197,7 +197,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -includedir = $(prefix)/include/shout +pkgincludedir = $(includedir)//shout infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ @@ -217,7 +217,7 @@ target = @target@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign -nodist_include_HEADERS = shout.h +nodist_pkginclude_HEADERS = shout.h all: all-am .SUFFIXES: @@ -262,22 +262,22 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -install-nodist_includeHEADERS: $(nodist_include_HEADERS) +install-nodist_includeHEADERS: $(nodist_pkginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ - $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ done uninstall-nodist_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(includedir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libshout/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:46:31 -0000 1.2 +++ .cvsignore 10 Mar 2006 15:48:41 -0000 1.3 @@ -1 +1 @@ -libshout-1.0.9.tar.gz +libshout-2.2.tar.gz Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/devel/libshout.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libshout.spec 5 Mar 2006 17:07:59 -0000 1.9 +++ libshout.spec 10 Mar 2006 15:48:41 -0000 1.10 @@ -1,18 +1,26 @@ Name: libshout -Version: 1.0.9 -Release: 5%{?dist} +Version: 2.2 +Release: 1%{?dist} Summary: icecast source streaming library -Group: Libraries/Multimedia +Group: System Environment/Libraries License: LGPL URL: http://www.icecast.org/ -Source: http://developer.icecast.org/libshout/releases/%{name}-%{version}.tar.gz -Patch: libshout-makefile.patch +Source: http://downloads.us.xiph.org/releases/libshout/libshout-%{version}.tar.gz +Patch: libshout.autotools.patch + +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: libtheora-devel +BuildRequires: speex-devel + +# so it generates and installs the .pc file +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description -Libshout is a library for communicating with and sending data to an +ibshout is a library for communicating with and sending data to an icecast server. It handles the socket connection, the timing of the data, and prevents most bad data from getting to the icecast server. @@ -37,11 +45,12 @@ %install rm -rf $RPM_BUILD_ROOT -# docs install in $(prefix)/doc, we don't want that, so don't go into SUBDIRS -%makeinstall SUBDIRS= +%makeinstall find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' +rm -rf $RPM_BUILD_ROOT%{_docdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -51,18 +60,25 @@ %files %defattr(-,root,root,-) -%doc AUTHORS CHANGES COPYING README +%doc COPYING NEWS README %{_libdir}/libshout.so.* %files devel %defattr(-,root,root,-) -%doc doc/*.html doc/style.css +%doc examples/*.c doc/*.xml doc/*.xsl %{_libdir}/libshout.a %{_libdir}/libshout.so +%{_libdir}/pkgconfig/shout.pc %dir %{_includedir}/shout/ %{_includedir}/shout/shout.h +%{_datadir}/aclocal/shout.m4 %changelog +* Fri Mar 10 2006 Thomas Vander Stichele +- 2.2-1 +- new (incompatible) version, but deps are updated +- various cleanups + * Sun Mar 05 2006 Thomas Vander Stichele - 1.0.9-5 - rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libshout/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:46:31 -0000 1.2 +++ sources 10 Mar 2006 15:48:41 -0000 1.3 @@ -1 +1 @@ -bbe598e28bbf2989a90d78ff33953ea2 libshout-1.0.9.tar.gz +d5b273a072785ee14a85ff76f66850aa libshout-2.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 15:50:29 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 10 Mar 2006 10:50:29 -0500 Subject: rpms/libshout/FC-4 libshout-makefile.patch,1.1,NONE Message-ID: <200603101550.k2AFoV2d026439@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26430 Removed Files: libshout-makefile.patch Log Message: remove old patch --- libshout-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 15:51:02 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 10 Mar 2006 10:51:02 -0500 Subject: rpms/libshout/devel libshout-makefile.patch,1.1,NONE Message-ID: <200603101551.k2AFp4R4026472@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26463 Removed Files: libshout-makefile.patch Log Message: remove old patch --- libshout-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 15:58:44 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:58:44 -0500 Subject: rpms/rogue - New directory Message-ID: <200603101558.k2AFwkHu026554@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26546/rogue Log Message: Directory /cvs/extras/rpms/rogue added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 15:58:50 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:58:50 -0500 Subject: rpms/rogue/devel - New directory Message-ID: <200603101558.k2AFwq04026569@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26546/rogue/devel Log Message: Directory /cvs/extras/rpms/rogue/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 15:59:02 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:59:02 -0500 Subject: rpms/rogue Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603101559.k2AFx4dA026603@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26591 Added Files: Makefile import.log Log Message: Setup of module rogue --- NEW FILE Makefile --- # Top level Makefile for module rogue all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 15:59:08 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:59:08 -0500 Subject: rpms/rogue/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603101559.k2AFxAsN026623@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26591/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module rogue --- NEW 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 Mar 10 15:59:35 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:59:35 -0500 Subject: rpms/rogue import.log,1.1,1.2 Message-ID: <200603101600.k2AG07kJ026724@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26672 Modified Files: import.log Log Message: auto-import rogue-5.4.2-1 on branch devel from rogue-5.4.2-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/rogue/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 15:59:02 -0000 1.1 +++ import.log 10 Mar 2006 15:59:34 -0000 1.2 @@ -0,0 +1 @@ +rogue-5_4_2-1:HEAD:rogue-5.4.2-1.src.rpm:1142006371 From fedora-extras-commits at redhat.com Fri Mar 10 15:59:40 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 10:59:40 -0500 Subject: rpms/rogue/devel rogue-includes.patch, NONE, 1.1 rogue-rpmopts.patch, NONE, 1.1 rogue.desktop, NONE, 1.1 rogue.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603101600.k2AG0Dre026728@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26672/devel Modified Files: .cvsignore sources Added Files: rogue-includes.patch rogue-rpmopts.patch rogue.desktop rogue.spec Log Message: auto-import rogue-5.4.2-1 on branch devel from rogue-5.4.2-1.src.rpm rogue-includes.patch: --- NEW FILE rogue-includes.patch --- --- rogue/extern.h 2006-01-30 08:35:18.000000000 -0800 +++ rogue.new/extern.h 2006-02-25 21:31:27.000000000 -0800 @@ -61,6 +61,7 @@ */ #include +#include void auto_save(int); int come_down(); rogue-rpmopts.patch: --- NEW FILE rogue-rpmopts.patch --- diff -Naur rogue/Makefile rogue.new/Makefile --- rogue/Makefile 2006-01-29 18:24:39.000000000 -0800 +++ rogue.new/Makefile 2006-02-25 21:19:41.000000000 -0800 @@ -38,7 +38,7 @@ CC = gcc ROPTS = -DALLSCORES -DSCOREFILE -COPTS = -O3 +COPTS := -O3 CFLAGS= $(COPTS) $(ROPTS) LIBS = -lcurses RM = rm -f --- NEW FILE rogue.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Rogue GenericName=Rogue Comment=The original curses-based adventure game Exec=rogue Icon= Terminal=true Type=Application Categories=Application;Game; Version=5.4.2 --- NEW FILE rogue.spec --- Name: rogue Version: 5.4.2 Release: 1%{?dist} Summary: The original graphical adventure game Group: Amusements/Games License: BSD URL: http://roguelike.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/roguelike/rogue5.4.2-src.tar.gz Source1: rogue.desktop Patch0: rogue-rpmopts.patch Patch1: rogue-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #BuildRequires: #Requires: %description The one, the only, the original graphical adventure game that spawned an entire genre. %prep %setup -q -c -n %{name}-%{version} %patch0 -p1 %patch1 -p1 %{__sed} -i 's/\r//' rogue54.html %{__sed} -i 's/\r//' readme54.html chmod a-x *.c *.h %build make COPTS="$RPM_OPT_FLAGS" %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT install -pD -m 0755 rogue54 $RPM_BUILD_ROOT/%{_bindir}/rogue install -pD rogue.6 $RPM_BUILD_ROOT/%{_mandir}/man6/rogue.6 mkdir -p $RPM_BUILD_ROOT/%{_var}/games/roguelike 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,-) %attr(2755,games,games) %{_bindir}/rogue %{_mandir}/man6/rogue.6.gz %{_datadir}/applications/fedora-%{name}.desktop %dir %attr(0775,games,games) %{_var}/games/roguelike %doc LICENSE.TXT rogue54.doc rogue54.html readme54.html %changelog * Sat Feb 25 2006 Wart 5.4.2-1 - Initial spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 15:59:08 -0000 1.1 +++ .cvsignore 10 Mar 2006 15:59:40 -0000 1.2 @@ -0,0 +1 @@ +rogue5.4.2-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 15:59:08 -0000 1.1 +++ sources 10 Mar 2006 15:59:40 -0000 1.2 @@ -0,0 +1 @@ +bd656cb017a579eba835a0ee445a0a32 rogue5.4.2-src.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 16:01:29 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 10 Mar 2006 11:01:29 -0500 Subject: owners owners.list,1.728,1.729 Message-ID: <200603101602.k2AG23Ca028665@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28638 Modified Files: owners.list Log Message: Added rogue Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.728 retrieving revision 1.729 diff -u -r1.728 -r1.729 --- owners.list 9 Mar 2006 21:00:52 -0000 1.728 +++ owners.list 10 Mar 2006 16:01:28 -0000 1.729 @@ -1208,6 +1208,7 @@ Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org| 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| Fedora Extras|rootsh|Shell wrapper for auditing|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|roundup|Simple and flexible issue-tracking system|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|rpmDirectoryCheck|Tool to detect some RPM packaging errors|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 10 16:34:05 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 10 Mar 2006 11:34:05 -0500 Subject: rpms/torcs/FC-4 torcs-1.2.4-extraqualif.patch, NONE, 1.1 torcs-1.2.4-freealutfix.patch, NONE, 1.1 torcs-1.2.4-track_cpp.patch, NONE, 1.1 torcs.spec, 1.10, 1.11 Message-ID: <200603101634.k2AGYbwS028869@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28818/FC-4 Modified Files: torcs.spec Added Files: torcs-1.2.4-extraqualif.patch torcs-1.2.4-freealutfix.patch torcs-1.2.4-track_cpp.patch Log Message: Fix #179614 and update spec to build with modular X. torcs-1.2.4-extraqualif.patch: --- NEW FILE torcs-1.2.4-extraqualif.patch --- diff -Naupr torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h --- torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h 2005-08-24 21:19:47.000000000 +0200 +++ torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h 2006-03-10 16:50:51.000000000 +0100 @@ -78,7 +78,7 @@ public: void update(tSituation *s, float Fps); - void cGrScreen::camDraw(tSituation *s); + void camDraw(tSituation *s); void updateCurrent(tSituation *s); torcs-1.2.4-freealutfix.patch: --- NEW FILE torcs-1.2.4-freealutfix.patch --- --- torcs-1.2.4/src/modules/graphic/ssggraph/Makefile.freealutfix 2006-02-01 10:46:38.000000000 -0500 +++ torcs-1.2.4/src/modules/graphic/ssggraph/Makefile 2006-02-01 10:46:56.000000000 -0500 @@ -24,7 +24,7 @@ MODULEDIR = modules/graphic -LIBS = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal +LIBS = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal -lalut SHIPDIR = config torcs-1.2.4-track_cpp.patch: --- NEW FILE torcs-1.2.4-track_cpp.patch --- --- src/tools/trackgen/track.orig.cpp 2005-08-24 14:19:48.000000000 -0500 +++ src/tools/trackgen/track.cpp 2005-10-04 02:15:55.000000000 -0500 @@ -392,7 +392,7 @@ trackvertices[3*nbvert] = x; \ trackvertices[3*nbvert+1] = y; \ trackvertices[3*nbvert+2] = z; \ - trackindices[nbvert] = nbvert++; \ + trackindices[nbvert] = nbvert+1; \ } \ } while (0) @@ -403,7 +403,7 @@ trackvertices[3*nbvert] = x; \ trackvertices[3*nbvert+1] = y; \ trackvertices[3*nbvert+2] = z; \ - trackindices[nbvert] = nbvert++; \ + trackindices[nbvert] = nbvert+1; \ printf("x=%f y=%f z=%f u=%f v=%f\n", \ (tdble)(x), (tdble)(y), (tdble)(z), \ (tdble)(t1), (tdble)(t2)); \ Index: torcs.spec =================================================================== RCS file: /cvs/extras/rpms/torcs/FC-4/torcs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- torcs.spec 9 Dec 2005 12:40:04 -0000 1.10 +++ torcs.spec 10 Mar 2006 16:34:05 -0000 1.11 @@ -3,7 +3,7 @@ Summary: The Open Racing Car Simulator Name: torcs Version: 1.2.4 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://torcs.org/ @@ -12,11 +12,20 @@ Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz 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: xorg-x11-devel, freeglut-devel, plib-devel >= 1.8.3 +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 +%else +BuildRequires: xorg-x11-devel +%endif %description TORCS is a 3D racing cars simulator using OpenGL. The goal is to have @@ -39,13 +48,21 @@ %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 -%configure -# Having %{?_smp_mflags} makes the build fail with 1.2.3 +# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4) +%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 %{__make} @@ -145,6 +162,19 @@ %changelog +* 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. +- Include track.cpp patch from Debian. +- Explicitly set X includes and libraries with modular X, since otherwise + configure checks fail badly (first libm, then all X libs...). +- Add missing modular X build requirements. +- Include patch to fix one extra qualifification error with gcc 4.1. + +* Wed Mar 1 2006 Matthias Saou 1.2.4-2 +- Add support for modular X on FC >= 5. +- Include patches to rebuild against new openal and freealut (#179614). + * Wed Oct 12 2005 Matthias Saou 1.2.4-1 - Update to 1.2.4. - Add torcs-data-tracks-road requirement directly to main torcs. From fedora-extras-commits at redhat.com Fri Mar 10 16:34:11 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Fri, 10 Mar 2006 11:34:11 -0500 Subject: rpms/torcs/devel torcs-1.2.4-extraqualif.patch, NONE, 1.1 torcs-1.2.4-freealutfix.patch, NONE, 1.1 torcs-1.2.4-track_cpp.patch, NONE, 1.1 torcs.spec, 1.11, 1.12 Message-ID: <200603101634.k2AGYhSB028872@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/torcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28818/devel Modified Files: torcs.spec Added Files: torcs-1.2.4-extraqualif.patch torcs-1.2.4-freealutfix.patch torcs-1.2.4-track_cpp.patch Log Message: Fix #179614 and update spec to build with modular X. torcs-1.2.4-extraqualif.patch: --- NEW FILE torcs-1.2.4-extraqualif.patch --- diff -Naupr torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h --- torcs-1.2.4.orig/src/modules/graphic/ssggraph/grscreen.h 2005-08-24 21:19:47.000000000 +0200 +++ torcs-1.2.4/src/modules/graphic/ssggraph/grscreen.h 2006-03-10 16:50:51.000000000 +0100 @@ -78,7 +78,7 @@ public: void update(tSituation *s, float Fps); - void cGrScreen::camDraw(tSituation *s); + void camDraw(tSituation *s); void updateCurrent(tSituation *s); torcs-1.2.4-freealutfix.patch: --- NEW FILE torcs-1.2.4-freealutfix.patch --- --- torcs-1.2.4/src/modules/graphic/ssggraph/Makefile.freealutfix 2006-02-01 10:46:38.000000000 -0500 +++ torcs-1.2.4/src/modules/graphic/ssggraph/Makefile 2006-02-01 10:46:56.000000000 -0500 @@ -24,7 +24,7 @@ MODULEDIR = modules/graphic -LIBS = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal +LIBS = -lplibsl -lplibsm -lplibsg -lplibssg -lplibul -lplibssgaux -lopenal -lalut SHIPDIR = config torcs-1.2.4-track_cpp.patch: --- NEW FILE torcs-1.2.4-track_cpp.patch --- --- src/tools/trackgen/track.orig.cpp 2005-08-24 14:19:48.000000000 -0500 +++ src/tools/trackgen/track.cpp 2005-10-04 02:15:55.000000000 -0500 @@ -392,7 +392,7 @@ trackvertices[3*nbvert] = x; \ trackvertices[3*nbvert+1] = y; \ trackvertices[3*nbvert+2] = z; \ - trackindices[nbvert] = nbvert++; \ + trackindices[nbvert] = nbvert+1; \ } \ } while (0) @@ -403,7 +403,7 @@ trackvertices[3*nbvert] = x; \ trackvertices[3*nbvert+1] = y; \ trackvertices[3*nbvert+2] = z; \ - trackindices[nbvert] = nbvert++; \ + trackindices[nbvert] = nbvert+1; \ printf("x=%f y=%f z=%f u=%f v=%f\n", \ (tdble)(x), (tdble)(y), (tdble)(z), \ (tdble)(t1), (tdble)(t2)); \ Index: torcs.spec =================================================================== RCS file: /cvs/extras/rpms/torcs/devel/torcs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- torcs.spec 14 Oct 2005 08:30:08 -0000 1.11 +++ torcs.spec 10 Mar 2006 16:34:11 -0000 1.12 @@ -3,7 +3,7 @@ Summary: The Open Racing Car Simulator Name: torcs Version: 1.2.4 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://torcs.org/ @@ -12,11 +12,20 @@ Source2: http://dl.sf.net/torcs/TORCS-%{version}-src-robots-berniw.tgz 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: xorg-x11-devel, freeglut-devel, plib-devel >= 1.8.3 +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 +%else +BuildRequires: xorg-x11-devel +%endif %description TORCS is a 3D racing cars simulator using OpenGL. The goal is to have @@ -39,13 +48,21 @@ %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 -%configure -# Having %{?_smp_mflags} makes the build fail with 1.2.3 +# Force locations with modular X (for FC5+ and non-Fedora) - Required (1.2.4) +%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 %{__make} @@ -145,6 +162,19 @@ %changelog +* 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. +- Include track.cpp patch from Debian. +- Explicitly set X includes and libraries with modular X, since otherwise + configure checks fail badly (first libm, then all X libs...). +- Add missing modular X build requirements. +- Include patch to fix one extra qualifification error with gcc 4.1. + +* Wed Mar 1 2006 Matthias Saou 1.2.4-2 +- Add support for modular X on FC >= 5. +- Include patches to rebuild against new openal and freealut (#179614). + * Wed Oct 12 2005 Matthias Saou 1.2.4-1 - Update to 1.2.4. - Add torcs-data-tracks-road requirement directly to main torcs. From fedora-extras-commits at redhat.com Fri Mar 10 18:46:01 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:46:01 -0500 Subject: rpms/perl-HTTP-BrowserDetect - New directory Message-ID: <200603101846.k2AIk35j000699@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv690/perl-HTTP-BrowserDetect Log Message: Directory /cvs/extras/rpms/perl-HTTP-BrowserDetect added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 18:46:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:46:06 -0500 Subject: rpms/perl-HTTP-BrowserDetect/devel - New directory Message-ID: <200603101846.k2AIk94F000718@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv690/perl-HTTP-BrowserDetect/devel Log Message: Directory /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 18:46:37 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:46:37 -0500 Subject: rpms/perl-HTTP-BrowserDetect Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603101846.k2AIkdQo000757@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv745 Added Files: Makefile import.log Log Message: Setup of module perl-HTTP-BrowserDetect --- NEW FILE Makefile --- # Top level Makefile for module perl-HTTP-BrowserDetect all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 18:46:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:46:43 -0500 Subject: rpms/perl-HTTP-BrowserDetect/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603101846.k2AIkjgR000777@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv745/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-HTTP-BrowserDetect --- NEW 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 Mar 10 18:47:14 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:47:14 -0500 Subject: owners owners.list,1.729,1.730 Message-ID: <200603101847.k2AIllL1000850@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv796 Modified Files: owners.list Log Message: Add perl-HTTP-BrowserDetect. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.729 retrieving revision 1.730 diff -u -r1.729 -r1.730 --- owners.list 10 Mar 2006 16:01:28 -0000 1.729 +++ owners.list 10 Mar 2006 18:47:14 -0000 1.730 @@ -916,6 +916,7 @@ Fedora Extras|perl-HTML-Template-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|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-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-HTTP-BrowserDetect|HTTP::BrowserDetect Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Proxy|A pure Perl HTTP proxy|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 10 18:47:41 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:47:41 -0500 Subject: rpms/perl-HTTP-BrowserDetect import.log,1.1,1.2 Message-ID: <200603101848.k2AImDhd000868@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv831 Modified Files: import.log Log Message: auto-import perl-HTTP-BrowserDetect-0.98-1 on branch devel from perl-HTTP-BrowserDetect-0.98-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-BrowserDetect/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 18:46:36 -0000 1.1 +++ import.log 10 Mar 2006 18:47:40 -0000 1.2 @@ -0,0 +1 @@ +perl-HTTP-BrowserDetect-0_98-1:HEAD:perl-HTTP-BrowserDetect-0.98-1.src.rpm:1142016445 From fedora-extras-commits at redhat.com Fri Mar 10 18:47:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 13:47:47 -0500 Subject: rpms/perl-HTTP-BrowserDetect/devel perl-HTTP-BrowserDetect.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603101848.k2AImJYw000872@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv831/devel Modified Files: .cvsignore sources Added Files: perl-HTTP-BrowserDetect.spec Log Message: auto-import perl-HTTP-BrowserDetect-0.98-1 on branch devel from perl-HTTP-BrowserDetect-0.98-1.src.rpm --- NEW FILE perl-HTTP-BrowserDetect.spec --- Name: perl-HTTP-BrowserDetect Version: 0.98 Release: 1%{?dist} Summary: HTTP::BrowserDetect Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTTP-BrowserDetect/ Source0: http://www.cpan.org/modules/by-module/HTTP/HTTP-BrowserDetect-0.98.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Determines the Web browser, version, and platform from an HTTP user agent string. %prep %setup -q -n HTTP-BrowserDetect-%{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+rwX,go+rX,go-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 * Thu Aug 18 2005 Steven Pritchard 0.98-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 18:46:43 -0000 1.1 +++ .cvsignore 10 Mar 2006 18:47:46 -0000 1.2 @@ -0,0 +1 @@ +HTTP-BrowserDetect-0.98.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 18:46:43 -0000 1.1 +++ sources 10 Mar 2006 18:47:46 -0000 1.2 @@ -0,0 +1 @@ +ac6837e47e25a13e1c7b927f2c6d9adc HTTP-BrowserDetect-0.98.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 18:51:26 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 10 Mar 2006 13:51:26 -0500 Subject: rpms/lyx/FC-4 lyx-1.4.0-helpers.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 helpers.sh, 1.1, 1.2 lyx.spec, 1.16, 1.17 sources, 1.5, 1.6 lyx-1.3.7-helpers.patch, 1.1, NONE lyx-1.3.7-noxfonts.patch, 1.1, NONE lyx-crystal.png, 1.1, NONE Message-ID: <200603101851.k2AIpxT9000980@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv954 Modified Files: .cvsignore helpers.sh lyx.spec sources Added Files: lyx-1.4.0-helpers.patch Removed Files: lyx-1.3.7-helpers.patch lyx-1.3.7-noxfonts.patch lyx-crystal.png Log Message: sync w/devel branch (lyx-1.4.0) lyx-1.4.0-helpers.patch: --- NEW FILE lyx-1.4.0-helpers.patch --- --- lyx-1.4.0pre3/lib/configure.helpers 2005-12-24 03:57:10.000000000 -0600 +++ lyx-1.4.0pre3/lib/configure 2006-01-23 07:29:27.000000000 -0600 @@ -811,7 +811,7 @@ echo $ac_n "checking for a Postscript previewer""... $ac_c" echo "$ac_t""" PS_VIEWER= -for ac_prog in gsview32 gv "ghostview -swap" kghostview +for ac_prog in evince gsview32 gsview kghostview ggv gv "ghostview -swap" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 @@ -849,7 +849,7 @@ echo $ac_n "checking for a PDF previewer""... $ac_c" echo "$ac_t""" PDF_VIEWER= -for ac_prog in acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview +for ac_prog in acrobat acrord32 acroread evince xpdf gsview32 gsview kpdf kghostview ggv gv ghostview do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 @@ -923,7 +923,7 @@ echo $ac_n "checking for a HTML previewer""... $ac_c" echo "$ac_t""" HTML_VIEWER= -for ac_prog in "mozilla file://\$\$p\$\$i" netscape +for ac_prog in "htmlview file://\$\$p\$\$i" "mozilla file://\$\$p\$\$i" netscape do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog ; ac_word=$2 --- lyx-1.4.0pre3/lib/configure.m4.helpers 2005-09-08 04:20:12.000000000 -0500 +++ lyx-1.4.0pre3/lib/configure.m4 2006-01-23 07:27:26.000000000 -0600 @@ -286,17 +286,17 @@ SEARCH_PROG([for a LaTeX -> OpenOffice.org converter],latex_to_sxw_command, "oolatex \$\$i" "oolatex.sh \$\$i") # Search something to preview postscript -SEARCH_PROG([for a Postscript previewer],PS_VIEWER,gsview32 gv "ghostview -swap" kghostview) +SEARCH_PROG([for a Postscript previewer],PS_VIEWER,evince gsview32 gsview kghostview ggv gv "ghostview -swap") EPS_VIEWER=$PS_VIEWER # Search for a program to preview pdf -SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 gsview32 acroread gv ghostview xpdf kpdf kghostview) +SEARCH_PROG([for a PDF previewer],PDF_VIEWER, acrobat acrord32 acroread evince xpdf gsview32 gsview kpdf kghostview ggv gv ghostview) # Search something to preview dvi -SEARCH_PROG([for a DVI previewer],DVI_VIEWER, xdvi windvi yap kdvi) +SEARCH_PROG([for a DVI previewer],DVI_VIEWER, kdvi xdvi windvi yap) # Search something to preview html -SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "mozilla file://\$\$p\$\$i" netscape) +SEARCH_PROG([for a HTML previewer],HTML_VIEWER, "htmlview file://\$\$p\$\$i " "mozilla file://\$\$p\$\$i" netscape) # Search for a program to convert ps to pdf SEARCH_PROG([for a PS to PDF converter],ps_to_pdf_command, "ps2pdf13 \$\$i") Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 20 Jan 2006 17:51:39 -0000 1.3 +++ .cvsignore 10 Mar 2006 18:51:26 -0000 1.4 @@ -1 +1,2 @@ -lyx-1.3.7.tar.bz2 +lyx-1.4.0.tar.bz2 +beamer.layout Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- lyx.spec 20 Jan 2006 18:43:46 -0000 1.16 +++ lyx.spec 10 Mar 2006 18:51:26 -0000 1.17 @@ -1,29 +1,28 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx -Version: 1.3.7 -Release: 5%{?dist} +Version: 1.4.0 +Release: 4%{?dist} License: GPL Group: Applications/Publishing Url: http://www.lyx.org/ -Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 +#Source: ftp://ftp.devel.lyx.org/pub/lyx/pre/lyx-%{version}%{?beta}.tar.bz2 +Source: ftp://ftp.lyx.org/pub/lyx/stable/lyx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: lyx-1.3.7-helpers.patch -Patch2: lyx-1.3.7-noxfonts.patch +Patch1: lyx-1.4.0-helpers.patch # app-wrapper for various frontends Source10: lyx.sh - +# .desktop files Source20: lyx.desktop Source21: lyx-qt.desktop Source22: lyx-xforms.desktop +# misc +Source100: ftp://tug.ctan.org/pub/tex-archive/macros/latex/contrib/beamer/lyx/layouts/beamer.layout -# "borrow" kde's crystal icon for lyx -Source30: lyx-crystal.png - -# TODO: use this find_helpers.sh script at runtime, instead of depending on +# TODO: use helpers.sh script at runtime, instead of depending on # lyx's configure and %%triggers #Source100: helpers.sh @@ -31,14 +30,12 @@ BuildRequires: qt-devel # xforms frontend BuildRequires: xforms-devel -BuildRequires: libjpeg-devel -%if "%{?fedora}" > "4" -BuildRequires: libXpm-devel -%endif BuildRequires: desktop-file-utils +BuildRequires: python BuildRequires: aiksaurus-devel BuildRequires: aspell-devel +BuildRequires: zlib-devel BuildRequires: tetex-latex BuildRequires: tetex-fonts @@ -91,60 +88,55 @@ %prep -%setup -q +%setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .helpers -%patch2 -p1 -b .noxfonts - -# ./autogen.sh %build -unset LINGUAS ||: - # QT -test -f /etc/profile.d/qt.sh && unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib;QTINC=${QTDIR}/include -%{?gcc296: export CXXFLAGS="$RPM_OPT_FLAGS -ftemplate-depth-44" } -%configure \ - --with-frontend=qt \ - --enable-optimization="$RPM_OPT_FLAGS" \ - --with-aiksaurus \ - --with-pspell \ - --without-warnings --disable-debug --disable-dependency-tracking +unset QTDIR || : ; . /etc/profile.d/qt.sh +export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include -make %{?_smp_mflags} -cp -a src/lyx lyx-qt +# drop -fexceptions from optflags, suggested by lyx devs: +# http://www.mail-archive.com/lyx-devel at lists.lyx.org/msg85794.html +optflags="$(echo %optflags | sed -e 's|-fexceptions||' )" +%global optflags $optflags -# Intermediate cleanup -# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking -make -C src/frontends clean +for frontend in qt xforms ; do -# XFORMS %configure \ - --with-frontend=xforms \ - --enable-optimization="$RPM_OPT_FLAGS" \ + --disable-rpath \ + --enable-compression-support \ + --with-frontend=$frontend \ + --enable-optimization="%{optflags}" \ --with-aiksaurus \ - --with-pspell \ - --without-warnings --disable-debug --disable-dependency-tracking + --with-aspell \ + --without-warnings --disable-dependency-tracking \ + --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ + +# Intermediate cleanup +# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking +make -C src/frontends clean make %{?_smp_mflags} -cp -a src/lyx lyx-xforms + +done %install rm -rf $RPM_BUILD_ROOT -unset LINGUAS ||: - make install DESTDIR=$RPM_BUILD_ROOT ## Handle front-ends -install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx -install -p -m0755 -D lyx-qt $RPM_BUILD_ROOT%{_bindir}/lyx-qt -install -p -m0755 -D lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms +install -p -m0755 -D %{SOURCE10} $RPM_BUILD_ROOT%{_bindir}/lyx +install -p -m0755 -D src/lyx-qt $RPM_BUILD_ROOT%{_bindir}/lyx-qt +install -p -m0755 -D src/lyx-xforms $RPM_BUILD_ROOT%{_bindir}/lyx-xforms +# misc/extras +install -p -m644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/lyx/layouts/ # Set up the lyx-specific class files where TeX can see them texmf=%{_datadir}/texmf @@ -152,10 +144,6 @@ mv $RPM_BUILD_ROOT%{_datadir}/lyx/tex \ $RPM_BUILD_ROOT${texmf}/tex/latex/lyx -# KDE already has a nice builtin crystalsvg icon, -# but this is for gnome's benefit (gtk2 < 2.6) -install -p -m644 -D %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps/lyx.png - mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -164,27 +152,25 @@ %find_lang %{name} || touch %{name}.lang -#touch $RPM_BUILD_ROOT%{_datadir}/%{name}/xfonts/PSres.upr - %post -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : -texhash >& /dev/null ||: -cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: +texhash > /dev/null 2>&1 ||: +cd %{_datadir}/lyx && ./configure > /dev/null 2>&1 ||: %postun -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : -texhash >& /dev/null ||: +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: +texhash > /dev/null 2>&1 ||: # Catch installed/uninstalled helpers %triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then -cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi %triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then -cd %{_datadir}/lyx && ./configure --srcdir >& /dev/null +cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi @@ -196,11 +182,9 @@ %defattr(-,root,root,-) %doc ANNOUNCE ChangeLog lib/CREDITS NEWS README %{_bindir}/lyx -%{_bindir}/noweb2lyx -%{_bindir}/reLyX -#{_datadir}/applications/*-lyx.desktop -%{_datadir}/pixmaps/* -%{_mandir}/man?/* +%{_bindir}/lyxclient +%{_bindir}/tex2lyx +%{_mandir}/man1/* %{_datadir}/lyx/ %{_datadir}/texmf/tex/latex/lyx/ %verify(not md5 size mtime) %{_datadir}/lyx/*.lst @@ -219,7 +203,48 @@ %changelog -* Fri Jan 20 2006 Rex Dieter 1.3.7-5 +* Thu Mar 09 2006 Rex Dieter 1.4.0-4 +- fix stripping of -fexceptions from %%optflags + +* Wed Mar 08 2006 Rex Dieter 1.4.0-3 +- include beamer.layout + +* Wed Mar 08 2006 Rex Dieter 1.4.0-2 +- 1.4.0(final) +- drop boost bits + +* Tue Mar 07 2006 Rex Dieter 1.4.0-0.12.rc +- 1.4.0rc +- drop boost patch (for now) + +* Fri Mar 03 2006 Rex Dieter 1.4.0-0.11.pre6 +- 1.4.0pre6 +- --disable-stdlib-debug --disable-assertions --disable-concept-checks +- don't use --without-included-boost (for now) + +* Mon Feb 20 2006 Rex Dieter 1.4.0-0.10.pre5 +- gcc41 patch +- document boost/gcc41 patches +- avoid --without-included-boost on fc4/gcc-4.0.2 (gcc bug) + +* Tue Feb 14 2006 Rex Dieter 1.4.0-0.9.pre5 +- updated boost patch +- drop -fexceptions from %%optflags + +* Mon Feb 13 2006 Rex Dieter 1.4.0-0.7.pre5 +- --without-included-boost +- BR: boost-devel + +* Mon Feb 13 2006 Rex Dieter 1.4.0-0.5.pre5 +- 1.4.0pre5 + +* Tue Jan 31 2006 Rex Dieter 1.4.0-0.2.pre4 +- 1.4.0pre4 + +* Fri Jan 20 2006 Rex Dieter 1.4.0-0.1.pre3 +- 1.4.0pre3 + +* Fri Jan 20 2006 Rex Dieter 1.3.7-4 - cleanup/fix snarfing of intermediate frontend builds. * Fri Jan 20 2006 Rex Dieter 1.3.7-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Jan 2006 17:51:39 -0000 1.5 +++ sources 10 Mar 2006 18:51:26 -0000 1.6 @@ -1 +1,2 @@ -cef9a2fca128c32ffa04c214d02cde04 lyx-1.3.7.tar.bz2 +5ab37471339ff7dbc8f0c43282746cb0 lyx-1.4.0.tar.bz2 +c906271900a0627d3df2a38ad962a285 beamer.layout --- lyx-1.3.7-helpers.patch DELETED --- --- lyx-1.3.7-noxfonts.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 19:11:11 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Fri, 10 Mar 2006 14:11:11 -0500 Subject: rpms/cfitsio/FC-4 cfitsio.spec,1.9,1.10 Message-ID: <200603101911.k2AJBhJe003681@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3645/FC-4 Modified Files: cfitsio.spec Log Message: Have build point to existant f95 rather than non-existant g95. Bugzilla Bug 185107 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-4/cfitsio.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cfitsio.spec 28 Feb 2006 20:33:53 -0000 1.9 +++ cfitsio.spec 10 Mar 2006 19:11:10 -0000 1.10 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -37,7 +37,7 @@ %patch -p1 %build -FC=g95 +FC=f95 export FC %configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name} make shared %{?_smp_mflags} @@ -69,6 +69,9 @@ %{_libdir}/libcfitsio.so %changelog +* Fri Mar 10 2006 Matthew Truch - 3.006-3 +- Point to f95 instead of g95 as per bugzilla bug 185107 + * Tue Feb 28 2006 Matthew Truch - 3.006-2 - Fix spelling typo in name of License.txt file. From fedora-extras-commits at redhat.com Fri Mar 10 19:11:19 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Fri, 10 Mar 2006 14:11:19 -0500 Subject: rpms/cfitsio/devel cfitsio.spec,1.10,1.11 Message-ID: <200603101911.k2AJBpRq003684@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3645/devel Modified Files: cfitsio.spec Log Message: Have build point to existant f95 rather than non-existant g95. Bugzilla Bug 185107 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cfitsio.spec 28 Feb 2006 20:33:59 -0000 1.10 +++ cfitsio.spec 10 Mar 2006 19:11:18 -0000 1.11 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -37,7 +37,7 @@ %patch -p1 %build -FC=g95 +FC=f95 export FC %configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name} make shared %{?_smp_mflags} @@ -69,6 +69,9 @@ %{_libdir}/libcfitsio.so %changelog +* Fri Mar 10 2006 Matthew Truch - 3.006-3 +- Point to f95 instead of g95 as per bugzilla bug 185107 + * Tue Feb 28 2006 Matthew Truch - 3.006-2 - Fix spelling typo in name of License.txt file. From fedora-extras-commits at redhat.com Fri Mar 10 19:15:08 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Fri, 10 Mar 2006 14:15:08 -0500 Subject: rpms/hpic/FC-4 hpic.spec,1.5,1.6 Message-ID: <200603101915.k2AJFe2Z003795@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/hpic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3742/FC-4 Modified Files: hpic.spec Log Message: Correct typo I made in changelog version number. No real changes; no new build. Index: hpic.spec =================================================================== RCS file: /cvs/extras/rpms/hpic/FC-4/hpic.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hpic.spec 28 Feb 2006 18:58:56 -0000 1.5 +++ hpic.spec 10 Mar 2006 19:15:08 -0000 1.6 @@ -66,7 +66,7 @@ %{_libdir}/libhpic.a %changelog -* Tue Feb 28 2006 Matthew Truch - 0.52-6 +* Tue Feb 28 2006 Matthew Truch - 0.52.2-1 - Update to 0.52.2 upstream bugfix release. * Tue Feb 28 2006 Matthew Truch - 0.52-6 From fedora-extras-commits at redhat.com Fri Mar 10 19:15:14 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Fri, 10 Mar 2006 14:15:14 -0500 Subject: rpms/hpic/devel hpic.spec,1.5,1.6 Message-ID: <200603101915.k2AJFld3003798@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/hpic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3742/devel Modified Files: hpic.spec Log Message: Correct typo I made in changelog version number. No real changes; no new build. Index: hpic.spec =================================================================== RCS file: /cvs/extras/rpms/hpic/devel/hpic.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hpic.spec 28 Feb 2006 18:59:02 -0000 1.5 +++ hpic.spec 10 Mar 2006 19:15:14 -0000 1.6 @@ -66,7 +66,7 @@ %{_libdir}/libhpic.a %changelog -* Tue Feb 28 2006 Matthew Truch - 0.52-6 +* Tue Feb 28 2006 Matthew Truch - 0.52.2-1 - Update to 0.52.2 upstream bugfix release. * Tue Feb 28 2006 Matthew Truch - 0.52-6 From fedora-extras-commits at redhat.com Fri Mar 10 19:15:02 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Fri, 10 Mar 2006 14:15:02 -0500 Subject: rpms/hpic/FC-3 hpic.spec,1.5,1.6 Message-ID: <200603101916.k2AJG4b6003801@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/hpic/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3742/FC-3 Modified Files: hpic.spec Log Message: Correct typo I made in changelog version number. No real changes; no new build. Index: hpic.spec =================================================================== RCS file: /cvs/extras/rpms/hpic/FC-3/hpic.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- hpic.spec 28 Feb 2006 18:58:48 -0000 1.5 +++ hpic.spec 10 Mar 2006 19:14:43 -0000 1.6 @@ -66,7 +66,7 @@ %{_libdir}/libhpic.a %changelog -* Tue Feb 28 2006 Matthew Truch - 0.52-6 +* Tue Feb 28 2006 Matthew Truch - 0.52.2-1 - Update to 0.52.2 upstream bugfix release. * Tue Feb 28 2006 Matthew Truch - 0.52-6 From fedora-extras-commits at redhat.com Fri Mar 10 19:22:13 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:22:13 -0500 Subject: rpms/perl-HTTP-BrowserDetect/FC-4 perl-HTTP-BrowserDetect.spec, 1.1, 1.2 Message-ID: <200603101922.k2AJMkrQ003904@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3871/FC-4 Modified Files: perl-HTTP-BrowserDetect.spec Log Message: Improve Summary. Index: perl-HTTP-BrowserDetect.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-BrowserDetect/FC-4/perl-HTTP-BrowserDetect.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTTP-BrowserDetect.spec 10 Mar 2006 18:47:46 -0000 1.1 +++ perl-HTTP-BrowserDetect.spec 10 Mar 2006 19:22:13 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-HTTP-BrowserDetect Version: 0.98 -Release: 1%{?dist} -Summary: HTTP::BrowserDetect Perl module +Release: 2%{?dist} +Summary: Perl browser detection library License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTTP-BrowserDetect/ @@ -44,5 +44,8 @@ %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.98-2 +- Improve Summary. + * Thu Aug 18 2005 Steven Pritchard 0.98-1 - Specfile autogenerated. From fedora-extras-commits at redhat.com Fri Mar 10 19:22:19 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:22:19 -0500 Subject: rpms/perl-HTTP-BrowserDetect/devel perl-HTTP-BrowserDetect.spec, 1.1, 1.2 Message-ID: <200603101922.k2AJMpI1003908@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3871/devel Modified Files: perl-HTTP-BrowserDetect.spec Log Message: Improve Summary. Index: perl-HTTP-BrowserDetect.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-BrowserDetect/devel/perl-HTTP-BrowserDetect.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-HTTP-BrowserDetect.spec 10 Mar 2006 18:47:46 -0000 1.1 +++ perl-HTTP-BrowserDetect.spec 10 Mar 2006 19:22:19 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-HTTP-BrowserDetect Version: 0.98 -Release: 1%{?dist} -Summary: HTTP::BrowserDetect Perl module +Release: 2%{?dist} +Summary: Perl browser detection library License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/HTTP-BrowserDetect/ @@ -44,5 +44,8 @@ %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.98-2 +- Improve Summary. + * Thu Aug 18 2005 Steven Pritchard 0.98-1 - Specfile autogenerated. From fedora-extras-commits at redhat.com Fri Mar 10 19:36:33 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 10 Mar 2006 14:36:33 -0500 Subject: rpms/maxima/FC-4 maxima.spec,1.16,1.17 Message-ID: <200603101937.k2AJb64Q004233@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4212 Modified Files: maxima.spec Log Message: * Thu Mar 09 2006 Rex Dieter 5.9.2-12 - enable runtime-cmucl (%%ix86 only, atm) * Wed Mar 08 2006 Rex Dieter 5.9.2-11 - fc5: enable runtime-gcl - runtime-sbcl: Requires: sbcl = %%{sbcl_version_used_to_build} Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- maxima.spec 27 Feb 2006 15:34:04 -0000 1.16 +++ maxima.spec 10 Mar 2006 19:36:33 -0000 1.17 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 10%{?dist} +Release: 12%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -17,14 +17,15 @@ %define _with_default_lisp --with-default-lisp=clisp +%ifarch %{ix86} +# cmucl review (done): http://bugzilla.redhat.com/bugzilla/166796 +%define _enable_cmucl --enable-cmucl +%endif + %ifarch %{ix86} x86_64 %define _enable_clisp --enable-clisp -# cmucl review pending: http://bugzilla.redhat.com/bugzilla/166796 -#define _enable_cmucl --enable-cmucl -%if "%{?fedora}" != "5" -# gcl not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026 +# gcl *was* not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026 %define _enable_gcl --enable-gcl -%endif %define _enable_sbcl --enable-sbcl %endif @@ -142,8 +143,13 @@ Summary: Maxima compiled with SBCL Group: Applications/Engineering BuildRequires: sbcl -#define sbcl_ver %{expand:%%(sbcl --version | cut -d' ' -f2)} -Requires: sbcl %{?sbcl_ver: >= %{sbcl_ver}} +# maxima requires the *same* version it was built against +# this hack should work, even in mock (-: -- Rex +%global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) +%if "%{?sbcl_ver}" >= "0.9" +%define sbcl_ver2 = %{sbcl_ver} +%endif +Requires: sbcl %{?sbcl_ver2} Requires: %{name} = %{version} Obsoletes: maxima-exec-sbcl < %{version}-%{release} Provides: %{name}-runtime = %{version} @@ -351,6 +357,13 @@ %changelog +* Thu Mar 09 2006 Rex Dieter 5.9.2-12 +- enable runtime-cmucl (%%ix86 only, atm) + +* Wed Mar 08 2006 Rex Dieter 5.9.2-11 +- fc5: enable runtime-gcl +- runtime-sbcl: Requires: sbcl = %%{sbcl_version_used_to_build} + * Mon Feb 27 2006 Rex Dieter 5.9.2-10 - respin for sbcl-0.9.10 From fedora-extras-commits at redhat.com Fri Mar 10 19:45:25 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:45:25 -0500 Subject: rpms/perl-Kwiki - New directory Message-ID: <200603101945.k2AJjRCP004350@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4341/perl-Kwiki Log Message: Directory /cvs/extras/rpms/perl-Kwiki added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 19:45:31 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:45:31 -0500 Subject: rpms/perl-Kwiki/devel - New directory Message-ID: <200603101945.k2AJjXeu004365@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4341/perl-Kwiki/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 19:45:51 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:45:51 -0500 Subject: rpms/perl-Kwiki Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603101945.k2AJjrbj004399@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4387 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 19:45:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:45:56 -0500 Subject: rpms/perl-Kwiki/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603101945.k2AJjwZe004419@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4387/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki --- NEW 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 Mar 10 19:46:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:46:28 -0500 Subject: rpms/perl-Kwiki import.log,1.1,1.2 Message-ID: <200603101947.k2AJl0h4004487@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4453 Modified Files: import.log Log Message: auto-import perl-Kwiki-0.38-2 on branch devel from perl-Kwiki-0.38-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 19:45:51 -0000 1.1 +++ import.log 10 Mar 2006 19:46:28 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-0_38-2:HEAD:perl-Kwiki-0.38-2.src.rpm:1142019980 From fedora-extras-commits at redhat.com Fri Mar 10 19:46:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 14:46:34 -0500 Subject: rpms/perl-Kwiki/devel perl-Kwiki.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603101947.k2AJl6I0004491@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4453/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki.spec Log Message: auto-import perl-Kwiki-0.38-2 on branch devel from perl-Kwiki-0.38-2.src.rpm --- NEW FILE perl-Kwiki.spec --- Name: perl-Kwiki Version: 0.38 Release: 2%{?dist} Summary: Kwiki Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Spoon) >= 0.22 Requires: perl(Spoon) >= 0.22 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description A Wiki is a website that allows its users to add pages, and edit any existing pages. It is one of the most popular forms of web collaboration. If you are new to wiki, visit http://c2.com/cgi/wiki?WelcomeVisitors which is possibly the oldest wiki, and has lots of information about how wikis work. Kwiki is a Perl wiki implementation based on the Spoon application architecture and using the Spiffy object orientation model. The major goals of Kwiki are that it be easy to install, maintain and extend. All the features of a Kwiki wiki come from plugin modules. The base installation comes with the bare minimum plugins to make a working Kwiki. To make a really nice Kwiki installation you need to install additional plugins. Which plugins you pick is entirely up to you. Another goal of Kwiki is that every installation will be unique. When there are hundreds of plugins available, this will hopefully be the case. %prep %setup -q -n Kwiki-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README kwiki COPYING Artistic %{perl_vendorlib}/* %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.32-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Wed Dec 28 2005 Steven Pritchard 0.38-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 19:45:56 -0000 1.1 +++ .cvsignore 10 Mar 2006 19:46:34 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-0.38.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 19:45:56 -0000 1.1 +++ sources 10 Mar 2006 19:46:34 -0000 1.2 @@ -0,0 +1 @@ +85508ce6bdadba28a0512d27c9e83841 Kwiki-0.38.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 20:04:26 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 10 Mar 2006 15:04:26 -0500 Subject: rpms/kdocker/FC-4 kdocker.spec,1.3,1.4 Message-ID: <200603102004.k2AK4wpN006612@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdocker/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6594 Modified Files: kdocker.spec Log Message: * Fri Mar 10 2006 Rex Dieter 1.3-5 - build failure, useless -debuginfo (#180103) Index: kdocker.spec =================================================================== RCS file: /cvs/extras/rpms/kdocker/FC-4/kdocker.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kdocker.spec 22 Jan 2006 02:49:32 -0000 1.3 +++ kdocker.spec 10 Mar 2006 20:04:26 -0000 1.4 @@ -2,7 +2,7 @@ Name: kdocker Summary: Dock any application in the system tray Version: 1.3 -Release: 4%{?dist} +Release: 5%{?dist} Group: User Interface/Desktops License: GPL @@ -14,6 +14,10 @@ BuildRequires: desktop-file-utils BuildRequires: qt-devel >= 1:3.3 +%if "%{?fedora}" > "4" +BuildRequires: libXmu-devel +BuildRequires: libXpm-devel +%endif %description KDocker will help you dock any application in the system tray. This means you @@ -56,7 +60,10 @@ %install rm -rf $RPM_BUILD_ROOT +unset QTDIR || : ; . /etc/profile.d/qt.sh + qmake DESTDIR=$RPM_BUILD_ROOT +sed -i -e '/^\s*-\?strip /d' Makefile # naughty qmake make install @@ -87,7 +94,7 @@ %files -f %{name}.lang -%defattr(-, root, root) +%defattr(-,root,root,-) %doc AUTHORS BUGS COPYING CREDITS ChangeLog HACKING README TODO VERSION %{_bindir}/* %dir %{_datadir}/kdocker/ @@ -97,6 +104,12 @@ %changelog +* Fri Mar 10 2006 Rex Dieter 1.3-5 +- build failure, useless -debuginfo (#180103) + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + * Sat Jan 21 2006 Rex Dieter 1.3-4 - .desktop: fix path to app-icon (#178531) From fedora-extras-commits at redhat.com Fri Mar 10 20:06:04 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 10 Mar 2006 15:06:04 -0500 Subject: rpms/kdocker/devel kdocker.spec,1.6,1.7 Message-ID: <200603102006.k2AK6aaS006686@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdocker/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6667 Modified Files: kdocker.spec Log Message: * Fri Mar 10 2006 Rex Dieter 1.3-5 - build failure, useless -debuginfo (#180103) Index: kdocker.spec =================================================================== RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kdocker.spec 1 Mar 2006 16:02:10 -0000 1.6 +++ kdocker.spec 10 Mar 2006 20:06:04 -0000 1.7 @@ -2,7 +2,7 @@ Name: kdocker Summary: Dock any application in the system tray Version: 1.3 -Release: 4%{?dist}.4 +Release: 5%{?dist} Group: User Interface/Desktops License: GPL @@ -94,7 +94,7 @@ %files -f %{name}.lang -%defattr(-, root, root) +%defattr(-,root,root,-) %doc AUTHORS BUGS COPYING CREDITS ChangeLog HACKING README TODO VERSION %{_bindir}/* %dir %{_datadir}/kdocker/ @@ -104,6 +104,9 @@ %changelog +* Fri Mar 10 2006 Rex Dieter 1.3-5 +- build failure, useless -debuginfo (#180103) + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Fri Mar 10 20:12:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 15:12:06 -0500 Subject: rpms/perl-Kwiki/devel perl-Kwiki-filter-requires.sh, NONE, 1.1 perl-Kwiki.spec, 1.1, 1.2 Message-ID: <200603102012.k2AKCdX5006786@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6768 Modified Files: perl-Kwiki.spec Added Files: perl-Kwiki-filter-requires.sh Log Message: Improve Summary. Fix up dependency filtering. --- NEW FILE perl-Kwiki-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki/devel/perl-Kwiki.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki.spec 10 Mar 2006 19:46:34 -0000 1.1 +++ perl-Kwiki.spec 10 Mar 2006 20:12:06 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Kwiki Version: 0.38 -Release: 2%{?dist} -Summary: Kwiki Perl module +Release: 3%{?dist} +Summary: Perl wiki implementation License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki/ @@ -12,6 +12,10 @@ Requires: perl(Spoon) >= 0.22 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source1: %{name}-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description A Wiki is a website that allows its users to add pages, and edit any existing pages. It is one of the most popular forms of web collaboration. @@ -33,11 +37,7 @@ %prep %setup -q -n Kwiki-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE1} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -61,7 +61,7 @@ make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) @@ -72,7 +72,11 @@ %{_mandir}/man3/* %changelog -* Mon Feb 27 2006 Steven Pritchard 0.32-2 +* Fri Mar 10 2006 Steven Pritchard 0.38-3 +- Improve Summary. +- Fix up dependency filtering. + +* Mon Feb 27 2006 Steven Pritchard 0.38-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Fri Mar 10 21:35:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 16:35:06 -0500 Subject: owners owners.list,1.730,1.731 Message-ID: <200603102135.k2ALZdVN009145@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9126 Modified Files: owners.list Log Message: Add perl-Kwiki. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.730 retrieving revision 1.731 diff -u -r1.730 -r1.731 --- owners.list 10 Mar 2006 18:47:14 -0000 1.730 +++ owners.list 10 Mar 2006 21:35:06 -0000 1.731 @@ -941,6 +941,7 @@ 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 Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki|Perl wiki implementation|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 10 21:46:37 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 10 Mar 2006 16:46:37 -0500 Subject: kadischi/lib functions.py,1.2,1.3 Message-ID: <200603102147.k2ALl7wB009189@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9170/kadischi/lib Modified Files: functions.py Log Message: Commit for bug #169812 and #178623 (functions.py) Index: functions.py =================================================================== RCS file: /cvs/devel/kadischi/lib/functions.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- functions.py 28 Aug 2005 10:20:17 -0000 1.2 +++ functions.py 10 Mar 2006 21:46:35 -0000 1.3 @@ -6,6 +6,10 @@ import rpm import urlgrabber.grabber as grabber +# Import isys for get_kernel_version() +sys.path.append("/usr/lib/anaconda") +import isys + def normalize_path (parts, rootpath = None): if rootpath == None: rootpath = '/' @@ -65,9 +69,21 @@ kernel_version = None clear_rpm_db_files (rootdir) ts = rpm.TransactionSet (rootdir) - for mi in ts.dbMatch ('name', 'kernel'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) - clear_rpm_db_files (rootdir) + while kernel_version == None: + if isys.smpAvailable() or isys.htavailable(): + for mi in ts.dbMatch ('name', 'kernel-xen-hypervisor'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'hypervisor' + clear_rpm_db_files (rootdir) + for mi in ts.dbMatch ('name', 'kernel-smp'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp' + clear_rpm_db_files (rootdir) + else: + for mi in ts.dbMatch ('name', 'kernel-xen-hypervisor'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'hypervisor' + clear_rpm_db_files (rootdir) + for mi in ts.dbMatch ('name', 'kernel'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + clear_rpm_db_files (rootdir) return kernel_version def clean_directory (dir, remove_when_done=True, keep_child_directories=False): @@ -116,4 +132,4 @@ flc_log ('Done.') else: flc_log ('You should clean temporary files.') - sys.exit (1) \ No newline at end of file + sys.exit (1) From fedora-extras-commits at redhat.com Fri Mar 10 22:07:14 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:07:14 -0500 Subject: rpms/perl-Mail-SPF-Query/devel .cvsignore, 1.2, 1.3 perl-Mail-SPF-Query.spec, 1.2, 1.3 sources, 1.2, 1.3 use-sys-hostname.patch, 1.1, 1.2 MSQ-fallback.patch, 1.1, NONE Message-ID: <200603102207.k2AM7mZu011234@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Mail-SPF-Query/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11198 Modified Files: .cvsignore perl-Mail-SPF-Query.spec sources use-sys-hostname.patch Removed Files: MSQ-fallback.patch Log Message: Update to 1.999.1. Drop MSQ-fallback.patch (upstream seems to have a similar fix). Update use-sys-hostname.patch. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Aug 2005 15:59:58 -0000 1.2 +++ .cvsignore 10 Mar 2006 22:07:14 -0000 1.3 @@ -1 +1 @@ -Mail-SPF-Query-1.997.tar.gz +Mail-SPF-Query-1.999.1.tar.gz Index: perl-Mail-SPF-Query.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/perl-Mail-SPF-Query.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Mail-SPF-Query.spec 6 Sep 2005 00:49:52 -0000 1.2 +++ perl-Mail-SPF-Query.spec 10 Mar 2006 22:07:14 -0000 1.3 @@ -1,13 +1,12 @@ Name: perl-Mail-SPF-Query -Version: 1.997 -Release: 5%{?dist} +Version: 1.999.1 +Release: 1%{?dist} Summary: Mail::SPF::Query Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Mail-SPF-Query/ Source0: http://www.cpan.org/modules/by-module/Mail/Mail-SPF-Query-%{version}.tar.gz # From Paul Howarth -Patch0: MSQ-fallback.patch Patch1: use-sys-hostname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -25,9 +24,10 @@ %prep %setup -q -n Mail-SPF-Query-%{version} -%patch0 -p1 %patch1 -p1 +chmod -x examples/* bin/* + %build %{__perl} Makefile.PL INSTALLDIRS=vendor %{__perl} -pi -e 's/^\tLD_RUN_PATH=[^\s]+\s*/\t/' Makefile @@ -48,6 +48,7 @@ # Don't include the spfd and spfquery scripts in _bindir. rm -f $RPM_BUILD_ROOT%{_bindir}/spfd $RPM_BUILD_ROOT%{_bindir}/spfquery +rm -rf $RPM_BUILD_ROOT%{_mandir}/man1 # Does a lot of external DNS lookups. %check @@ -58,11 +59,16 @@ %files %defattr(-,root,root,-) -%doc Changes README sample spfd spfquery COPYING Artistic +%doc CHANGES README examples/ bin/ COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 1.999.1-1 +- Update to 1.999.1 +- Drop MSQ-fallback.patch (upstream seems to have a similar fix) +- Update use-sys-hostname.patch + * Mon Sep 05 2005 Steven Pritchard 1.997-5 - Spec cleanup - Include COPYING and Artistic Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 4 Aug 2005 15:59:58 -0000 1.2 +++ sources 10 Mar 2006 22:07:14 -0000 1.3 @@ -1 +1 @@ -9e110d00520e0fe174c25c0734a8baf6 Mail-SPF-Query-1.997.tar.gz +6d62d024d1614fa1fa4f43bd39ee7bf0 Mail-SPF-Query-1.999.1.tar.gz use-sys-hostname.patch: Index: use-sys-hostname.patch =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-SPF-Query/devel/use-sys-hostname.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- use-sys-hostname.patch 4 Aug 2005 15:59:58 -0000 1.1 +++ use-sys-hostname.patch 10 Mar 2006 22:07:14 -0000 1.2 @@ -1,12 +1,20 @@ ---- Mail-SPF-Query-1.997.orig/Query.pm 2005-07-21 15:24:38.000000000 -0500 -+++ Mail-SPF-Query-1.997/Query.pm 2005-07-21 15:25:32.000000000 -0500 -@@ -325,8 +325,7 @@ +--- Mail-SPF-Query-1.999.1/lib/Mail/SPF/Query.pm.orig 2006-02-26 11:41:11.000000000 -0600 ++++ Mail-SPF-Query-1.999.1/lib/Mail/SPF/Query.pm 2006-03-10 15:56:05.000000000 -0600 +@@ -23,7 +23,7 @@ + our $VERSION = '1.999.1'; # fake version for EU::MM and CPAN + $VERSION = '1.999001'; # real numerical version + +-use Sys::Hostname::Long; ++use Sys::Hostname; + use Net::DNS qw(); # by default it exports mx, which we define. + use Net::CIDR::Lite; + use URI::Escape; +@@ -296,7 +296,7 @@ + $query->{ipv6} ? die "IPv6 not supported" : ""); if (not $query->{myhostname}) { - use Sys::Hostname; -- eval { require Sys::Hostname::Long }; -- $query->{myhostname} = $@ ? hostname() : Sys::Hostname::Long::hostname_long(); +- $query->{myhostname} = Sys::Hostname::Long::hostname_long(); + $query->{myhostname} = hostname(); } - $query->{myhostname} ||= "localhost"; + --- MSQ-fallback.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 10 22:32:57 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 10 Mar 2006 17:32:57 -0500 Subject: rpms/lib765 import.log,1.4,1.5 Message-ID: <200603102233.k2AMXTsB011427@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11395 Modified Files: import.log Log Message: auto-import lib765-0.3.3-6 on branch devel from lib765-0.3.3-6.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/lib765/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 10 Mar 2006 01:29:42 -0000 1.4 +++ import.log 10 Mar 2006 22:32:56 -0000 1.5 @@ -1,3 +1,4 @@ lib765-0_3_3-3:HEAD:lib765-0.3.3-3.src.rpm:1137113910 lib765-0_3_3-4:HEAD:lib765-0.3.3-4.src.rpm:1141758291 lib765-0_3_3-5:HEAD:lib765-0.3.3-5.src.rpm:1141954170 +lib765-0_3_3-6:HEAD:lib765-0.3.3-6.src.rpm:1142029964 From fedora-extras-commits at redhat.com Fri Mar 10 22:33:02 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 10 Mar 2006 17:33:02 -0500 Subject: rpms/lib765/devel lib765.spec,1.3,1.4 Message-ID: <200603102233.k2AMXZq5011430@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/lib765/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11395/devel Modified Files: lib765.spec Log Message: auto-import lib765-0.3.3-6 on branch devel from lib765-0.3.3-6.src.rpm Index: lib765.spec =================================================================== RCS file: /cvs/extras/rpms/lib765/devel/lib765.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lib765.spec 10 Mar 2006 01:29:49 -0000 1.3 +++ lib765.spec 10 Mar 2006 22:33:02 -0000 1.4 @@ -1,7 +1,7 @@ Summary: A library for emulating the uPD765a floppy controller Name: lib765 Version: 0.3.3 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.seasip.demon.co.uk/Unix/LibDsk/lib765-%{version}.tar.gz @@ -16,7 +16,7 @@ %package devel Summary: Development files for lib765. Group: Development/Libraries -Requires: libdsk-devel, %{name}=%{version}-%{release} +Requires: libdsk-devel, %{name} = %{version}-%{release} %description devel Development files for lib765. @@ -51,6 +51,9 @@ %exclude %{_libdir}/lib765.la %changelog +* Fri Mar 10 2006 Paul F. Johnson 0.3.3-6 +- Minor tweak to the spec file + * Thu Mar 9 2006 Paul F. Johnson 0.3.3-5 - Bug in the spec file means it didn't compile. From fedora-extras-commits at redhat.com Fri Mar 10 22:36:04 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:36:04 -0500 Subject: rpms/perl-IO-All/devel IO-All-filter-requires.sh, NONE, 1.1 perl-IO-All.spec, 1.1, 1.2 Message-ID: <200603102236.k2AMaaZ9011519@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11452 Modified Files: perl-IO-All.spec Added Files: IO-All-filter-requires.sh Log Message: Change dep filter. Various cleanups to match current cpanspec. --- NEW FILE IO-All-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-IO-All.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/devel/perl-IO-All.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-IO-All.spec 3 Mar 2006 01:22:22 -0000 1.1 +++ perl-IO-All.spec 10 Mar 2006 22:36:04 -0000 1.2 @@ -1,17 +1,21 @@ Name: perl-IO-All Version: 0.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: IO::All Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-All/ -Source0: http://www.cpan.org/modules/by-module/IO/IO-All-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/IO-All-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Spiffy) >= 0.21 Requires: perl(Spiffy) >= 0.21 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: IO-All-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description The IO::All object is a proxy for IO::File, IO::Dir, IO::Socket, IO::String, Tie::File, File::Spec, File::Path and File::ReadBackwards; as @@ -23,11 +27,7 @@ %prep %setup -q -n IO-All-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -44,22 +44,23 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check %{?_with_check:make test} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.33-3 +- Change dep filter. +- Various cleanups to match current cpanspec. + * Mon Feb 27 2006 Steven Pritchard 0.33-2 - Filter Requires: perl(mixin). - Turn off "make test" for now. From fedora-extras-commits at redhat.com Fri Mar 10 22:47:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:47:24 -0500 Subject: rpms/perl-IO-All/FC-4 IO-All-filter-requires.sh, NONE, 1.1 perl-IO-All.spec, 1.1, 1.2 Message-ID: <200603102247.k2AMlumt011617@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-IO-All/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11599 Modified Files: perl-IO-All.spec Added Files: IO-All-filter-requires.sh Log Message: Change dep filter. Various cleanups to match current cpanspec. --- NEW FILE IO-All-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-IO-All.spec =================================================================== RCS file: /cvs/extras/rpms/perl-IO-All/FC-4/perl-IO-All.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-IO-All.spec 3 Mar 2006 01:22:22 -0000 1.1 +++ perl-IO-All.spec 10 Mar 2006 22:47:24 -0000 1.2 @@ -1,17 +1,21 @@ Name: perl-IO-All Version: 0.33 -Release: 2%{?dist} +Release: 3%{?dist} Summary: IO::All Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/IO-All/ -Source0: http://www.cpan.org/modules/by-module/IO/IO-All-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/IO-All-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Spiffy) >= 0.21 Requires: perl(Spiffy) >= 0.21 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: IO-All-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description The IO::All object is a proxy for IO::File, IO::Dir, IO::Socket, IO::String, Tie::File, File::Spec, File::Path and File::ReadBackwards; as @@ -23,11 +27,7 @@ %prep %setup -q -n IO-All-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -44,22 +44,23 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check %{?_with_check:make test} %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.33-3 +- Change dep filter. +- Various cleanups to match current cpanspec. + * Mon Feb 27 2006 Steven Pritchard 0.33-2 - Filter Requires: perl(mixin). - Turn off "make test" for now. From fedora-extras-commits at redhat.com Fri Mar 10 22:58:06 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:58:06 -0500 Subject: rpms/perl-Kwiki-ModPerl - New directory Message-ID: <200603102258.k2AMw8EQ011754@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11743/perl-Kwiki-ModPerl Log Message: Directory /cvs/extras/rpms/perl-Kwiki-ModPerl added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 22:58:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:58:12 -0500 Subject: rpms/perl-Kwiki-ModPerl/devel - New directory Message-ID: <200603102258.k2AMwEZx011779@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11743/perl-Kwiki-ModPerl/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-ModPerl/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 22:58:30 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:58:30 -0500 Subject: rpms/perl-Kwiki-ModPerl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102258.k2AMwW0p011822@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11810 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-ModPerl --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-ModPerl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 22:58:36 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:58:36 -0500 Subject: rpms/perl-Kwiki-ModPerl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102258.k2AMwcis011840@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11810/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-ModPerl --- NEW 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 Mar 10 22:58:13 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:58:13 -0500 Subject: owners owners.list,1.731,1.732 Message-ID: <200603102258.k2AMwjX8011853@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11757 Modified Files: owners.list Log Message: Add perl-Kwiki-ModPerl. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.731 retrieving revision 1.732 diff -u -r1.731 -r1.732 --- owners.list 10 Mar 2006 21:35:06 -0000 1.731 +++ owners.list 10 Mar 2006 22:58:13 -0000 1.732 @@ -942,6 +942,7 @@ 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 Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki|Perl wiki implementation|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-ModPerl|Kwiki::ModPerl Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 10 22:59:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:59:07 -0500 Subject: rpms/perl-Kwiki-ModPerl import.log,1.1,1.2 Message-ID: <200603102259.k2AMxdfd011918@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11884 Modified Files: import.log Log Message: auto-import perl-Kwiki-ModPerl-0.09-2 on branch devel from perl-Kwiki-ModPerl-0.09-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-ModPerl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 22:58:30 -0000 1.1 +++ import.log 10 Mar 2006 22:59:06 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-ModPerl-0_09-2:HEAD:perl-Kwiki-ModPerl-0.09-2.src.rpm:1142031539 From fedora-extras-commits at redhat.com Fri Mar 10 22:59:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 17:59:12 -0500 Subject: rpms/perl-Kwiki-ModPerl/devel perl-Kwiki-ModPerl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102259.k2AMxjuS011922@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-ModPerl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11884/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-ModPerl.spec Log Message: auto-import perl-Kwiki-ModPerl-0.09-2 on branch devel from perl-Kwiki-ModPerl-0.09-2.src.rpm --- NEW FILE perl-Kwiki-ModPerl.spec --- Name: perl-Kwiki-ModPerl Version: 0.09 Release: 2%{?dist} Summary: Kwiki::ModPerl Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-ModPerl/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-ModPerl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.32 BuildRequires: perl(mod_perl2) Requires: perl(Kwiki) >= 0.32 Requires: perl(mod_perl2) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki mod_perl plugin. %prep %setup -q -n Kwiki-ModPerl-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.09-2 - Drop explicit BR: perl. * Thu Dec 29 2005 Steven Pritchard 0.09-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-ModPerl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 22:58:35 -0000 1.1 +++ .cvsignore 10 Mar 2006 22:59:12 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-ModPerl-0.09.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-ModPerl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 22:58:35 -0000 1.1 +++ sources 10 Mar 2006 22:59:12 -0000 1.2 @@ -0,0 +1 @@ +f8508aab16b000a363aeab15823cca7a Kwiki-ModPerl-0.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:02:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:02:43 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs - New directory Message-ID: <200603102302.k2AN2jcv013962@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13949/perl-Kwiki-Archive-Rcs Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Archive-Rcs added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:02:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:02:50 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs/devel - New directory Message-ID: <200603102302.k2AN2q7T013981@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13949/perl-Kwiki-Archive-Rcs/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:03:19 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:03:19 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102303.k2AN3LRO014018@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14006 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Archive-Rcs --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Archive-Rcs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:03:31 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:03:31 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102303.k2AN3ber014034@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14006/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Archive-Rcs --- NEW 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 Mar 10 23:04:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:04:22 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs import.log,1.1,1.2 Message-ID: <200603102304.k2AN4sPp014106@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14072 Modified Files: import.log Log Message: auto-import perl-Kwiki-Archive-Rcs-0.15-3 on branch devel from perl-Kwiki-Archive-Rcs-0.15-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:03:19 -0000 1.1 +++ import.log 10 Mar 2006 23:04:21 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Archive-Rcs-0_15-3:HEAD:perl-Kwiki-Archive-Rcs-0.15-3.src.rpm:1142031855 From fedora-extras-commits at redhat.com Fri Mar 10 23:04:30 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:04:30 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs/devel perl-Kwiki-Archive-Rcs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102305.k2AN52tP014110@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14072/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Archive-Rcs.spec Log Message: auto-import perl-Kwiki-Archive-Rcs-0.15-3 on branch devel from perl-Kwiki-Archive-Rcs-0.15-3.src.rpm --- NEW FILE perl-Kwiki-Archive-Rcs.spec --- Name: perl-Kwiki-Archive-Rcs Version: 0.15 Release: 3%{?dist} Summary: Kwiki::Archive::Rcs Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Archive-Rcs/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Archive-Rcs-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.38 Requires: perl(Kwiki) >= 0.38 Requires: rcs Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki Page Archival Using RCS. %prep %setup -q -n Kwiki-Archive-Rcs-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.15-3 - Add explicit Requires: rcs. * Mon Feb 27 2006 Steven Pritchard 0.15-2 - Drop explicit BR: perl. * Thu Dec 29 2005 Steven Pritchard 0.15-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:03:31 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:04:30 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Archive-Rcs-0.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:03:31 -0000 1.1 +++ sources 10 Mar 2006 23:04:30 -0000 1.2 @@ -0,0 +1 @@ +02ac4c1104fcbea0779562501e45305c Kwiki-Archive-Rcs-0.15.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:13:51 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:13:51 -0500 Subject: rpms/perl-Kwiki-Revisions - New directory Message-ID: <200603102313.k2ANDrHS014253@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14245/perl-Kwiki-Revisions Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Revisions added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:13:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:13:56 -0500 Subject: rpms/perl-Kwiki-Revisions/devel - New directory Message-ID: <200603102313.k2ANDxnu014268@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14245/perl-Kwiki-Revisions/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Revisions/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:14:14 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:14:14 -0500 Subject: rpms/perl-Kwiki-Revisions Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102314.k2ANEG0M014305@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14293 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Revisions --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Revisions all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:14:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:14:22 -0500 Subject: rpms/perl-Kwiki-Revisions/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102314.k2ANEOVn014324@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14293/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Revisions --- NEW 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 Mar 10 23:14:41 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:14:41 -0500 Subject: rpms/perl-Kwiki-Archive-Rcs/devel perl-Kwiki-Archive-Rcs.spec, 1.1, 1.2 Message-ID: <200603102315.k2ANFDOI014420@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14354 Modified Files: perl-Kwiki-Archive-Rcs.spec Log Message: Improve Summary. Index: perl-Kwiki-Archive-Rcs.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Archive-Rcs/devel/perl-Kwiki-Archive-Rcs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-Archive-Rcs.spec 10 Mar 2006 23:04:30 -0000 1.1 +++ perl-Kwiki-Archive-Rcs.spec 10 Mar 2006 23:14:41 -0000 1.2 @@ -1,7 +1,7 @@ Name: perl-Kwiki-Archive-Rcs Version: 0.15 -Release: 3%{?dist} -Summary: Kwiki::Archive::Rcs Perl module +Release: 4%{?dist} +Summary: Kwiki Page Archival Using RCS License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Archive-Rcs/ @@ -49,6 +49,9 @@ %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.15-4 +- Improve Summary. + * Mon Feb 27 2006 Steven Pritchard 0.15-3 - Add explicit Requires: rcs. From fedora-extras-commits at redhat.com Fri Mar 10 23:15:01 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:15:01 -0500 Subject: rpms/perl-Kwiki-Revisions import.log,1.1,1.2 Message-ID: <200603102315.k2ANFXUu014423@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14386 Modified Files: import.log Log Message: auto-import perl-Kwiki-Revisions-0.15-2 on branch devel from perl-Kwiki-Revisions-0.15-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Revisions/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:14:14 -0000 1.1 +++ import.log 10 Mar 2006 23:15:01 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Revisions-0_15-2:HEAD:perl-Kwiki-Revisions-0.15-2.src.rpm:1142032484 From fedora-extras-commits at redhat.com Fri Mar 10 23:15:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:15:07 -0500 Subject: rpms/perl-Kwiki-Revisions/devel perl-Kwiki-Revisions.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102315.k2ANFeC8014427@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14386/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Revisions.spec Log Message: auto-import perl-Kwiki-Revisions-0.15-2 on branch devel from perl-Kwiki-Revisions-0.15-2.src.rpm --- NEW FILE perl-Kwiki-Revisions.spec --- Name: perl-Kwiki-Revisions Version: 0.15 Release: 2%{?dist} Summary: Kwiki::Revisions Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Revisions/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Revisions-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.38 Requires: perl(Kwiki) >= 0.38 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki Revisions plugin. %prep %setup -q -n Kwiki-Revisions-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.15-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.15-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Revisions/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:14:22 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:15:07 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Revisions-0.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Revisions/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:14:22 -0000 1.1 +++ sources 10 Mar 2006 23:15:07 -0000 1.2 @@ -0,0 +1 @@ +f78b7af532c19df58d351c8a718c08cf Kwiki-Revisions-0.15.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:23:11 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:23:11 -0500 Subject: rpms/perl-Kwiki-Revisions/devel Kwiki-Revisions-filter-requires.sh, NONE, 1.1 perl-Kwiki-Revisions.spec, 1.1, 1.2 Message-ID: <200603102323.k2ANNhpG014541@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Revisions/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14521 Modified Files: perl-Kwiki-Revisions.spec Added Files: Kwiki-Revisions-filter-requires.sh Log Message: Cleanup to match current cpanspec. --- NEW FILE Kwiki-Revisions-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-Revisions.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Revisions/devel/perl-Kwiki-Revisions.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-Revisions.spec 10 Mar 2006 23:15:07 -0000 1.1 +++ perl-Kwiki-Revisions.spec 10 Mar 2006 23:23:11 -0000 1.2 @@ -1,28 +1,28 @@ Name: perl-Kwiki-Revisions Version: 0.15 -Release: 2%{?dist} -Summary: Kwiki::Revisions Perl module +Release: 3%{?dist} +Summary: Kwiki Revisions plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Revisions/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Revisions-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-Revisions-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.38 Requires: perl(Kwiki) >= 0.38 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-Revisions-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki Revisions plugin. %prep %setup -q -n Kwiki-Revisions-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -39,22 +39,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.15-3 +- Cleanup to match current cpanspec. + * Mon Feb 27 2006 Steven Pritchard 0.15-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Fri Mar 10 23:24:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:24:50 -0500 Subject: rpms/perl-Kwiki-NewPage - New directory Message-ID: <200603102324.k2ANOqv4014641@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14633/perl-Kwiki-NewPage Log Message: Directory /cvs/extras/rpms/perl-Kwiki-NewPage added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:24:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:24:56 -0500 Subject: rpms/perl-Kwiki-NewPage/devel - New directory Message-ID: <200603102324.k2ANOw0F014660@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14633/perl-Kwiki-NewPage/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-NewPage/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:25:13 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:25:13 -0500 Subject: rpms/perl-Kwiki-NewPage Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102325.k2ANPF5i014699@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14683 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-NewPage --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-NewPage all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:25:19 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:25:19 -0500 Subject: rpms/perl-Kwiki-NewPage/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102325.k2ANPLrX014722@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14683/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-NewPage --- NEW 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 Mar 10 23:25:57 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:25:57 -0500 Subject: rpms/perl-Kwiki-RecentChanges - New directory Message-ID: <200603102325.k2ANPxxp014841@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14823/perl-Kwiki-RecentChanges Log Message: Directory /cvs/extras/rpms/perl-Kwiki-RecentChanges added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:26:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:26:03 -0500 Subject: rpms/perl-Kwiki-RecentChanges/devel - New directory Message-ID: <200603102326.k2ANQ5B2014862@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14823/perl-Kwiki-RecentChanges/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:26:20 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:26:20 -0500 Subject: rpms/perl-Kwiki-RecentChanges Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200603102326.k2ANQMTX014900@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14884 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-RecentChanges --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-RecentChanges all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:25:50 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:25:50 -0500 Subject: rpms/perl-Kwiki-NewPage import.log,1.1,1.2 Message-ID: <200603102326.k2ANQN8T014904@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14795 Modified Files: import.log Log Message: auto-import perl-Kwiki-NewPage-0.12-2 on branch devel from perl-Kwiki-NewPage-0.12-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-NewPage/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:25:13 -0000 1.1 +++ import.log 10 Mar 2006 23:25:50 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-NewPage-0_12-2:HEAD:perl-Kwiki-NewPage-0.12-2.src.rpm:1142033143 From fedora-extras-commits at redhat.com Fri Mar 10 23:26:26 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:26:26 -0500 Subject: rpms/perl-Kwiki-RecentChanges/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102326.k2ANQSBS014922@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14884/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-RecentChanges --- NEW 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 Mar 10 23:25:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:25:56 -0500 Subject: rpms/perl-Kwiki-NewPage/devel perl-Kwiki-NewPage.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102326.k2ANQTv4014926@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14795/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-NewPage.spec Log Message: auto-import perl-Kwiki-NewPage-0.12-2 on branch devel from perl-Kwiki-NewPage-0.12-2.src.rpm --- NEW FILE perl-Kwiki-NewPage.spec --- Name: perl-Kwiki-NewPage Version: 0.12 Release: 2%{?dist} Summary: Kwiki::NewPage Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-NewPage/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-NewPage-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.34 Requires: perl(Kwiki) >= 0.34 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki New Page plugin. %prep %setup -q -n Kwiki-NewPage-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.12-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.12-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-NewPage/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:25:18 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:25:56 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-NewPage-0.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-NewPage/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:25:18 -0000 1.1 +++ sources 10 Mar 2006 23:25:56 -0000 1.2 @@ -0,0 +1 @@ +14feb28dc087ea07dccad58f05842302 Kwiki-NewPage-0.12.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:27:01 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:27:01 -0500 Subject: rpms/perl-Kwiki-Search - New directory Message-ID: <200603102327.k2ANR3a5015070@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15044/perl-Kwiki-Search Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Search added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:27:07 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:27:07 -0500 Subject: rpms/perl-Kwiki-Search/devel - New directory Message-ID: <200603102327.k2ANR9x4015099@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15044/perl-Kwiki-Search/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Search/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:26:57 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:26:57 -0500 Subject: rpms/perl-Kwiki-RecentChanges import.log,1.1,1.2 Message-ID: <200603102327.k2ANRT3T015127@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15024 Modified Files: import.log Log Message: auto-import perl-Kwiki-RecentChanges-0.13-2 on branch devel from perl-Kwiki-RecentChanges-0.13-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:26:19 -0000 1.1 +++ import.log 10 Mar 2006 23:26:57 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-RecentChanges-0_13-2:HEAD:perl-Kwiki-RecentChanges-0.13-2.src.rpm:1142033209 From fedora-extras-commits at redhat.com Fri Mar 10 23:27:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:27:03 -0500 Subject: rpms/perl-Kwiki-RecentChanges/devel perl-Kwiki-RecentChanges.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102327.k2ANRZjs015146@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15024/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-RecentChanges.spec Log Message: auto-import perl-Kwiki-RecentChanges-0.13-2 on branch devel from perl-Kwiki-RecentChanges-0.13-2.src.rpm --- NEW FILE perl-Kwiki-RecentChanges.spec --- Name: perl-Kwiki-RecentChanges Version: 0.13 Release: 2%{?dist} Summary: Kwiki::RecentChanges Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-RecentChanges/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-RecentChanges-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki Recent Changes plugin. %prep %setup -q -n Kwiki-RecentChanges-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.13-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.13-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:26:26 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:27:03 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-RecentChanges-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:26:26 -0000 1.1 +++ sources 10 Mar 2006 23:27:03 -0000 1.2 @@ -0,0 +1 @@ +393c2a606b3574b775c2ce5b23fc7b8d Kwiki-RecentChanges-0.13.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:27:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:27:39 -0500 Subject: rpms/perl-Kwiki-Search Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102327.k2ANRf64015195@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15157 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Search --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Search all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:27:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:27:45 -0500 Subject: rpms/perl-Kwiki-Search/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102327.k2ANRlB9015217@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15157/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Search --- NEW 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 Mar 10 23:28:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:22 -0500 Subject: rpms/perl-Kwiki-UserPreferences - New directory Message-ID: <200603102328.k2ANSOMi015273@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262/perl-Kwiki-UserPreferences Log Message: Directory /cvs/extras/rpms/perl-Kwiki-UserPreferences added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:28:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:27 -0500 Subject: rpms/perl-Kwiki-UserPreferences/devel - New directory Message-ID: <200603102328.k2ANSVYD015294@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262/perl-Kwiki-UserPreferences/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:28:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:47 -0500 Subject: rpms/perl-Kwiki-UserPreferences Makefile, NONE, 1.1 import.log, NONE, 1.1 Message-ID: <200603102328.k2ANSn3V015368@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15350 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-UserPreferences --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-UserPreferences all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:28:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:53 -0500 Subject: rpms/perl-Kwiki-UserPreferences/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102328.k2ANStda015386@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15350/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-UserPreferences --- NEW 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 Mar 10 23:28:36 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:36 -0500 Subject: rpms/perl-Kwiki-Search import.log,1.1,1.2 Message-ID: <200603102329.k2ANTB6Q015401@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15309 Modified Files: import.log Log Message: auto-import perl-Kwiki-Search-0.12-2 on branch devel from perl-Kwiki-Search-0.12-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Search/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:27:39 -0000 1.1 +++ import.log 10 Mar 2006 23:28:36 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Search-0_12-2:HEAD:perl-Kwiki-Search-0.12-2.src.rpm:1142033305 From fedora-extras-commits at redhat.com Fri Mar 10 23:28:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:28:42 -0500 Subject: rpms/perl-Kwiki-Search/devel perl-Kwiki-Search.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102329.k2ANTE1R015405@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15309/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Search.spec Log Message: auto-import perl-Kwiki-Search-0.12-2 on branch devel from perl-Kwiki-Search-0.12-2.src.rpm --- NEW FILE perl-Kwiki-Search.spec --- Name: perl-Kwiki-Search Version: 0.12 Release: 2%{?dist} Summary: Kwiki::Search Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Search/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Search-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.34 Requires: perl(Kwiki) >= 0.34 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki Search plugin. %prep %setup -q -n Kwiki-Search-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.12-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.12-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Search/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:27:45 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:28:42 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Search-0.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Search/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:27:45 -0000 1.1 +++ sources 10 Mar 2006 23:28:42 -0000 1.2 @@ -0,0 +1 @@ +80350bc49752c514ba2df21ddd39a3fb Kwiki-Search-0.12.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:29:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:29:47 -0500 Subject: rpms/perl-Kwiki-UserPreferences import.log,1.1,1.2 Message-ID: <200603102330.k2ANUJHf015499@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15460 Modified Files: import.log Log Message: auto-import perl-Kwiki-UserPreferences-0.13-2 on branch devel from perl-Kwiki-UserPreferences-0.13-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserPreferences/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:28:46 -0000 1.1 +++ import.log 10 Mar 2006 23:29:47 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-UserPreferences-0_13-2:HEAD:perl-Kwiki-UserPreferences-0.13-2.src.rpm:1142033378 From fedora-extras-commits at redhat.com Fri Mar 10 23:29:53 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:29:53 -0500 Subject: rpms/perl-Kwiki-UserPreferences/devel perl-Kwiki-UserPreferences.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102330.k2ANUPur015503@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15460/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-UserPreferences.spec Log Message: auto-import perl-Kwiki-UserPreferences-0.13-2 on branch devel from perl-Kwiki-UserPreferences-0.13-2.src.rpm --- NEW FILE perl-Kwiki-UserPreferences.spec --- Name: perl-Kwiki-UserPreferences Version: 0.13 Release: 2%{?dist} Summary: Kwiki::UserPreferences Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-UserPreferences/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserPreferences-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki User Preferences plugin. %prep %setup -q -n Kwiki-UserPreferences-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.13-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.13-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:28:52 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:29:53 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-UserPreferences-0.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:28:52 -0000 1.1 +++ sources 10 Mar 2006 23:29:53 -0000 1.2 @@ -0,0 +1 @@ +8b75bffcb6cf4fa79a3f71612efa9339 Kwiki-UserPreferences-0.13.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:31:26 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:31:26 -0500 Subject: owners owners.list,1.732,1.733 Message-ID: <200603102331.k2ANVwrs015561@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15543 Modified Files: owners.list Log Message: Adding: perl-Kwiki-Archive-Rcs perl-Kwiki-NewPage perl-Kwiki-RecentChanges perl-Kwiki-Revisions perl-Kwiki-Search perl-Kwiki-UserPreferences Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.732 retrieving revision 1.733 diff -u -r1.732 -r1.733 --- owners.list 10 Mar 2006 22:58:13 -0000 1.732 +++ owners.list 10 Mar 2006 23:31:26 -0000 1.733 @@ -942,7 +942,13 @@ 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 Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki|Perl wiki implementation|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Archive-Rcs|Kwiki::Archive::Rcs Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-ModPerl|Kwiki::ModPerl Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-NewPage|Kwiki::NewPage Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-RecentChanges|Kwiki::RecentChanges Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Revisions|Kwiki::Revisions Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Search|Kwiki::Search Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-UserPreferences|Kwiki::UserPreferences Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 10 23:37:19 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:37:19 -0500 Subject: rpms/perl-Kwiki-UserName - New directory Message-ID: <200603102337.k2ANbLRa015674@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15666/perl-Kwiki-UserName Log Message: Directory /cvs/extras/rpms/perl-Kwiki-UserName added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:37:25 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:37:25 -0500 Subject: rpms/perl-Kwiki-UserName/devel - New directory Message-ID: <200603102337.k2ANbRYJ015689@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15666/perl-Kwiki-UserName/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-UserName/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:37:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:37:42 -0500 Subject: rpms/perl-Kwiki-UserName Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102337.k2ANbi6O015723@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15711 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-UserName --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-UserName all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:37:48 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:37:48 -0500 Subject: rpms/perl-Kwiki-UserName/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102337.k2ANboLg015743@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15711/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-UserName --- NEW 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 Mar 10 23:38:17 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:38:17 -0500 Subject: rpms/perl-Kwiki-UserName import.log,1.1,1.2 Message-ID: <200603102338.k2ANcnf1015814@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15780 Modified Files: import.log Log Message: auto-import perl-Kwiki-UserName-0.14-2 on branch devel from perl-Kwiki-UserName-0.14-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserName/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:37:42 -0000 1.1 +++ import.log 10 Mar 2006 23:38:16 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-UserName-0_14-2:HEAD:perl-Kwiki-UserName-0.14-2.src.rpm:1142033889 From fedora-extras-commits at redhat.com Fri Mar 10 23:38:22 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:38:22 -0500 Subject: rpms/perl-Kwiki-UserName/devel perl-Kwiki-UserName.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102338.k2ANctK3015818@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15780/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-UserName.spec Log Message: auto-import perl-Kwiki-UserName-0.14-2 on branch devel from perl-Kwiki-UserName-0.14-2.src.rpm --- NEW FILE perl-Kwiki-UserName.spec --- Name: perl-Kwiki-UserName Version: 0.14 Release: 2%{?dist} Summary: Kwiki::UserName Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-UserName/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserName-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 BuildRequires: perl(Kwiki::UserPreferences) >= 0.13 Requires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki::UserPreferences) >= 0.13 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki User Name plugin. %prep %setup -q -n Kwiki-UserName-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* perldoc -t perlgpl > COPYING perldoc -t perlartistic > Artistic %check make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README COPYING Artistic %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.14-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. * Thu Dec 29 2005 Steven Pritchard 0.14-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserName/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:37:48 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:38:22 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-UserName-0.14.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserName/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:37:48 -0000 1.1 +++ sources 10 Mar 2006 23:38:22 -0000 1.2 @@ -0,0 +1 @@ +a079e9735032183d9080e7da015c3bcf Kwiki-UserName-0.14.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:42:09 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:42:09 -0500 Subject: rpms/perl-Kwiki-Diff - New directory Message-ID: <200603102342.k2ANgBwa015938@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15930/perl-Kwiki-Diff Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Diff added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:42:15 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:42:15 -0500 Subject: rpms/perl-Kwiki-Diff/devel - New directory Message-ID: <200603102342.k2ANgHlp015953@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15930/perl-Kwiki-Diff/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Diff/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:42:33 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:42:33 -0500 Subject: rpms/perl-Kwiki-Diff Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102342.k2ANgZIi015987@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15975 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Diff --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Diff all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:42:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:42:39 -0500 Subject: rpms/perl-Kwiki-Diff/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102342.k2ANgfWJ016007@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15975/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Diff --- NEW 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 Mar 10 23:43:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:43:16 -0500 Subject: rpms/perl-Kwiki-Diff import.log,1.1,1.2 Message-ID: <200603102343.k2ANhm5B016079@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16042 Modified Files: import.log Log Message: auto-import perl-Kwiki-Diff-0.03-2 on branch devel from perl-Kwiki-Diff-0.03-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Diff/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:42:33 -0000 1.1 +++ import.log 10 Mar 2006 23:43:15 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Diff-0_03-2:HEAD:perl-Kwiki-Diff-0.03-2.src.rpm:1142034188 From fedora-extras-commits at redhat.com Fri Mar 10 23:43:21 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:43:21 -0500 Subject: rpms/perl-Kwiki-Diff/devel perl-Kwiki-Diff.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102343.k2ANhsPt016084@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Diff/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16042/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Diff.spec Log Message: auto-import perl-Kwiki-Diff-0.03-2 on branch devel from perl-Kwiki-Diff-0.03-2.src.rpm --- NEW FILE perl-Kwiki-Diff.spec --- Name: perl-Kwiki-Diff Version: 0.03 Release: 2%{?dist} Summary: Kwiki::Diff Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Diff/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Diff-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Algorithm::Diff) >= 1.18 BuildRequires: perl(Kwiki) >= 0.34 BuildRequires: perl(Kwiki::Revisions) >= 0.12 BuildRequires: perl(Spiffy) >= 0.22 Requires: perl(Algorithm::Diff) >= 1.18 Requires: perl(Kwiki) >= 0.34 Requires: perl(Kwiki::Revisions) >= 0.12 Requires: perl(Spiffy) >= 0.22 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Kwiki Diff plugin. %prep %setup -q -n Kwiki-Diff-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check rm -f debug*.list make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Sat Feb 25 2006 Steven Pritchard 0.03-2 - Fix License tag. - Don't generate COPYING and Artistic so we can re-enable "make test". - Remove debug*.list so "make test" doesn't fail. * Thu Dec 29 2005 Steven Pritchard 0.03-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Diff/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:42:39 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:43:21 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Diff-0.03.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Diff/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:42:39 -0000 1.1 +++ sources 10 Mar 2006 23:43:21 -0000 1.2 @@ -0,0 +1 @@ +e77bc115dc5224fbade93c36bea9181b Kwiki-Diff-0.03.tar.gz From fedora-extras-commits at redhat.com Fri Mar 10 23:46:04 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:46:04 -0500 Subject: rpms/perl-Kwiki-NewPage/devel Kwiki-NewPage-filter-requires.sh, NONE, 1.1 perl-Kwiki-NewPage.spec, 1.1, 1.2 Message-ID: <200603102346.k2ANkblc016157@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-NewPage/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16127 Modified Files: perl-Kwiki-NewPage.spec Added Files: Kwiki-NewPage-filter-requires.sh Log Message: Various cleanups. --- NEW FILE Kwiki-NewPage-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-NewPage.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-NewPage/devel/perl-Kwiki-NewPage.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-NewPage.spec 10 Mar 2006 23:25:56 -0000 1.1 +++ perl-Kwiki-NewPage.spec 10 Mar 2006 23:46:04 -0000 1.2 @@ -1,28 +1,28 @@ Name: perl-Kwiki-NewPage Version: 0.12 -Release: 2%{?dist} -Summary: Kwiki::NewPage Perl module +Release: 3%{?dist} +Summary: Kwiki New Page plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-NewPage/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-NewPage-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-NewPage-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.34 Requires: perl(Kwiki) >= 0.34 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-NewPage-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki New Page plugin. %prep %setup -q -n Kwiki-NewPage-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -39,22 +39,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.12-3 +- Various cleanups. + * Mon Feb 27 2006 Steven Pritchard 0.12-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Fri Mar 10 23:48:05 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:48:05 -0500 Subject: rpms/perl-Kwiki-Users-Remote - New directory Message-ID: <200603102348.k2ANm7w4016256@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16248/perl-Kwiki-Users-Remote Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Users-Remote added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:48:11 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:48:11 -0500 Subject: rpms/perl-Kwiki-Users-Remote/devel - New directory Message-ID: <200603102348.k2ANmDLA016273@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16248/perl-Kwiki-Users-Remote/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 10 23:48:28 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:48:28 -0500 Subject: rpms/perl-Kwiki-Users-Remote Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603102348.k2ANmUKv016312@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16298 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Users-Remote --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Users-Remote all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 10 23:48:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:48:34 -0500 Subject: rpms/perl-Kwiki-Users-Remote/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603102348.k2ANmaHb016335@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16298/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Users-Remote --- NEW 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 Mar 10 23:49:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:49:03 -0500 Subject: rpms/perl-Kwiki-Users-Remote import.log,1.1,1.2 Message-ID: <200603102349.k2ANnaqm016413@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16372 Modified Files: import.log Log Message: auto-import perl-Kwiki-Users-Remote-0.04-1 on branch devel from perl-Kwiki-Users-Remote-0.04-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Users-Remote/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 10 Mar 2006 23:48:28 -0000 1.1 +++ import.log 10 Mar 2006 23:49:03 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Users-Remote-0_04-1:HEAD:perl-Kwiki-Users-Remote-0.04-1.src.rpm:1142034535 From fedora-extras-commits at redhat.com Fri Mar 10 23:49:09 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 18:49:09 -0500 Subject: rpms/perl-Kwiki-Users-Remote/devel perl-Kwiki-Users-Remote.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603102349.k2ANngiq016417@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16372/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Users-Remote.spec Log Message: auto-import perl-Kwiki-Users-Remote-0.04-1 on branch devel from perl-Kwiki-Users-Remote-0.04-1.src.rpm --- NEW FILE perl-Kwiki-Users-Remote.spec --- Name: perl-Kwiki-Users-Remote Version: 0.04 Release: 1%{?dist} Summary: Kwiki::Users::Remote Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Users-Remote/ Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Users-Remote-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.32 BuildRequires: perl(Kwiki::UserName) >= 0.14 BuildRequires: perl(Kwiki::Users) Requires: perl(Kwiki) >= 0.32 Requires: perl(Kwiki::UserName) >= 0.14 Requires: perl(Kwiki::Users) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Automatically set Kwiki user name from HTTP authentication. %prep %setup -q -n Kwiki-Users-Remote-%{version} cat < $RPM_SOURCE_DIR/%{name}-req #!/bin/sh %{__perl_requires} $* | sed -e '/^perl(mixin)$/d' EOF %define __perl_requires %{_sourcedir}/%{name}-req chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check rm -f debug*.list make test %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Mon Feb 27 2006 Steven Pritchard 0.04-1 - Specfile autogenerated. - Drop auto-detected explicit BR: perl. - Improve description. - Remove debug*.list so "make test" works. - Filter out perl(mixin) dependency. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 10 Mar 2006 23:48:34 -0000 1.1 +++ .cvsignore 10 Mar 2006 23:49:09 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Users-Remote-0.04.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 10 Mar 2006 23:48:34 -0000 1.1 +++ sources 10 Mar 2006 23:49:09 -0000 1.2 @@ -0,0 +1 @@ +fbddc866eed5d4c85583617df4a272a2 Kwiki-Users-Remote-0.04.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 00:10:47 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:10:47 -0500 Subject: rpms/perl-Kwiki-RecentChanges/devel Kwiki-RecentChanges-filter-requires.sh, NONE, 1.1 perl-Kwiki-RecentChanges.spec, 1.1, 1.2 Message-ID: <200603110011.k2B0BJrd018544@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18526 Modified Files: perl-Kwiki-RecentChanges.spec Added Files: Kwiki-RecentChanges-filter-requires.sh Log Message: Cleanup. --- NEW FILE Kwiki-RecentChanges-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-RecentChanges.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/perl-Kwiki-RecentChanges.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-RecentChanges.spec 10 Mar 2006 23:27:03 -0000 1.1 +++ perl-Kwiki-RecentChanges.spec 11 Mar 2006 00:10:45 -0000 1.2 @@ -1,28 +1,28 @@ Name: perl-Kwiki-RecentChanges Version: 0.13 -Release: 2%{?dist} -Summary: Kwiki::RecentChanges Perl module +Release: 3%{?dist} +Summary: Kwiki Recent Changes plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-RecentChanges/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-RecentChanges-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-RecentChanges-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-RecentChanges-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki Recent Changes plugin. %prep %setup -q -n Kwiki-RecentChanges-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -39,22 +39,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.13-3 +- Cleanup. + * Mon Feb 27 2006 Steven Pritchard 0.13-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Sat Mar 11 00:13:20 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:13:20 -0500 Subject: rpms/perl-Kwiki-Raw - New directory Message-ID: <200603110013.k2B0DMBf018648@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18640/perl-Kwiki-Raw Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Raw added to the repository From fedora-extras-commits at redhat.com Sat Mar 11 00:13:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:13:27 -0500 Subject: rpms/perl-Kwiki-Raw/devel - New directory Message-ID: <200603110013.k2B0DT1m018663@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18640/perl-Kwiki-Raw/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Raw/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 11 00:13:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:13:56 -0500 Subject: rpms/perl-Kwiki-Raw Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603110013.k2B0DwpN018698@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18686 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Raw --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Raw all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 11 00:14:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:14:03 -0500 Subject: rpms/perl-Kwiki-Raw/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603110014.k2B0E512018718@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18686/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Raw --- NEW 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 Mar 11 00:15:25 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:15:25 -0500 Subject: rpms/perl-Kwiki-Raw/devel filter-requires.sh, NONE, 1.1 perl-Kwiki-Raw.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603110015.k2B0FRmV018810@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18757/devel Modified Files: .cvsignore sources Added Files: filter-requires.sh perl-Kwiki-Raw.spec Log Message: auto-import perl-Kwiki-Raw-0.02-2 on branch devel from perl-Kwiki-Raw-0.02-2.src.rpm --- NEW FILE filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' --- NEW FILE perl-Kwiki-Raw.spec --- Name: perl-Kwiki-Raw Version: 0.02 Release: 2%{?dist} Summary: Provide an action to retrieve the raw wikitext of a page License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Raw/ Source0: http://www.cpan.org/authors/id/C/CD/CDENT/Kwiki/Kwiki-Raw-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Source1: filter-requires.sh %global real_perl_requires %{__perl_requires} %define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires %description Kwiki module that provides an action to retrieve the raw wikitext of a page. %prep %setup -q -n Kwiki-Raw-%{version} sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE1} > %{__perl_requires} chmod +x %{__perl_requires} %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/* %check make test %clean rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) %doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Tue Mar 07 2006 Steven Pritchard 0.02-2 - Don't write to Source1. * Tue Mar 07 2006 Steven Pritchard 0.02-1 - Specfile autogenerated. - Improve Summary and description. - Filter out perl(mixin) dependency. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Raw/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Mar 2006 00:14:02 -0000 1.1 +++ .cvsignore 11 Mar 2006 00:15:25 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Raw-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Raw/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Mar 2006 00:14:02 -0000 1.1 +++ sources 11 Mar 2006 00:15:25 -0000 1.2 @@ -0,0 +1 @@ +6fab8df1440b1bd1a87a983e860b6ef5 Kwiki-Raw-0.02.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 00:15:02 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:15:02 -0500 Subject: rpms/perl-Kwiki-Raw import.log,1.1,1.2 Message-ID: <200603110015.k2B0FYVB018819@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Raw In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18757 Modified Files: import.log Log Message: auto-import perl-Kwiki-Raw-0.02-2 on branch devel from perl-Kwiki-Raw-0.02-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Raw/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Mar 2006 00:13:56 -0000 1.1 +++ import.log 11 Mar 2006 00:15:01 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Raw-0_02-2:HEAD:perl-Kwiki-Raw-0.02-2.src.rpm:1142036093 From fedora-extras-commits at redhat.com Sat Mar 11 00:15:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:15:24 -0500 Subject: rpms/perl-Kwiki-Search/devel Kwiki-Search-filter-requires.sh, NONE, 1.1 perl-Kwiki-Search.spec, 1.1, 1.2 Message-ID: <200603110015.k2B0FuSR018848@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Search/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18774 Modified Files: perl-Kwiki-Search.spec Added Files: Kwiki-Search-filter-requires.sh Log Message: Cleanup. --- NEW FILE Kwiki-Search-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-Search.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Search/devel/perl-Kwiki-Search.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-Search.spec 10 Mar 2006 23:28:42 -0000 1.1 +++ perl-Kwiki-Search.spec 11 Mar 2006 00:15:23 -0000 1.2 @@ -1,28 +1,28 @@ Name: perl-Kwiki-Search Version: 0.12 -Release: 2%{?dist} -Summary: Kwiki::Search Perl module +Release: 3%{?dist} +Summary: Kwiki Search plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Search/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Search-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-Search-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.34 Requires: perl(Kwiki) >= 0.34 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-Search-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki Search plugin. %prep %setup -q -n Kwiki-Search-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -39,22 +39,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.12-3 +- Cleanup. + * Mon Feb 27 2006 Steven Pritchard 0.12-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Sat Mar 11 00:18:05 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:18:05 -0500 Subject: rpms/perl-Kwiki-Attachments - New directory Message-ID: <200603110018.k2B0I7tx018949@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/perl-Kwiki-Attachments Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Attachments added to the repository From fedora-extras-commits at redhat.com Sat Mar 11 00:18:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:18:12 -0500 Subject: rpms/perl-Kwiki-Attachments/devel - New directory Message-ID: <200603110018.k2B0IEvZ018964@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/perl-Kwiki-Attachments/devel Log Message: Directory /cvs/extras/rpms/perl-Kwiki-Attachments/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 11 00:18:43 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:18:43 -0500 Subject: rpms/perl-Kwiki-Attachments Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603110018.k2B0IjAx018998@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18986 Added Files: Makefile import.log Log Message: Setup of module perl-Kwiki-Attachments --- NEW FILE Makefile --- # Top level Makefile for module perl-Kwiki-Attachments all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 11 00:18:55 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:18:55 -0500 Subject: rpms/perl-Kwiki-Attachments/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603110019.k2B0J0vq019018@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18986/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Kwiki-Attachments --- NEW 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 Mar 11 00:19:42 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:19:42 -0500 Subject: rpms/perl-Kwiki-Attachments import.log,1.1,1.2 Message-ID: <200603110020.k2B0KEdM019096@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19058 Modified Files: import.log Log Message: auto-import perl-Kwiki-Attachments-0.18-1 on branch devel from perl-Kwiki-Attachments-0.18-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Attachments/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 11 Mar 2006 00:18:43 -0000 1.1 +++ import.log 11 Mar 2006 00:19:42 -0000 1.2 @@ -0,0 +1 @@ +perl-Kwiki-Attachments-0_18-1:HEAD:perl-Kwiki-Attachments-0.18-1.src.rpm:1142036360 From fedora-extras-commits at redhat.com Sat Mar 11 00:19:49 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:19:49 -0500 Subject: rpms/perl-Kwiki-Attachments/devel perl-Kwiki-Attachments.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603110020.k2B0KL7o019100@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Attachments/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19058/devel Modified Files: .cvsignore sources Added Files: perl-Kwiki-Attachments.spec Log Message: auto-import perl-Kwiki-Attachments-0.18-1 on branch devel from perl-Kwiki-Attachments-0.18-1.src.rpm --- NEW FILE perl-Kwiki-Attachments.spec --- Name: perl-Kwiki-Attachments Version: 0.18 Release: 1%{?dist} Summary: Kwiki::Attachments Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Attachments/ Source0: http://www.cpan.org/authors/id/S/SU/SUE/Kwiki-Attachments-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module gives a Kwiki wiki the ability to upload, store and manage file attachments on any page. Thumbnails will be created for supported file types if Imager or Image::Magick is installed. For more information, read the module POD. %prep %setup -q -n Kwiki-Attachments-%{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+rwX,go+rX,go-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 Mar 07 2006 Steven Pritchard 0.18-1 - Specfile autogenerated. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Attachments/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 11 Mar 2006 00:18:54 -0000 1.1 +++ .cvsignore 11 Mar 2006 00:19:48 -0000 1.2 @@ -0,0 +1 @@ +Kwiki-Attachments-0.18.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Attachments/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 11 Mar 2006 00:18:54 -0000 1.1 +++ sources 11 Mar 2006 00:19:48 -0000 1.2 @@ -0,0 +1 @@ +6eccc9c91ad0e1be8c19794fff0d870a Kwiki-Attachments-0.18.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 00:20:35 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:20:35 -0500 Subject: rpms/perl-Kwiki-UserPreferences/devel Kwiki-UserPreferences-filter-requires.sh, NONE, 1.1 perl-Kwiki-UserPreferences.spec, 1.1, 1.2 Message-ID: <200603110021.k2B0L9Rq019153@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19110 Modified Files: perl-Kwiki-UserPreferences.spec Added Files: Kwiki-UserPreferences-filter-requires.sh Log Message: Cleanup. --- NEW FILE Kwiki-UserPreferences-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-UserPreferences.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserPreferences/devel/perl-Kwiki-UserPreferences.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-UserPreferences.spec 10 Mar 2006 23:29:53 -0000 1.1 +++ perl-Kwiki-UserPreferences.spec 11 Mar 2006 00:20:35 -0000 1.2 @@ -1,28 +1,28 @@ Name: perl-Kwiki-UserPreferences Version: 0.13 -Release: 2%{?dist} -Summary: Kwiki::UserPreferences Perl module +Release: 3%{?dist} +Summary: Kwiki User Preferences plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-UserPreferences/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserPreferences-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-UserPreferences-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 Requires: perl(Kwiki) >= 0.37 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-UserPreferences-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki User Preferences plugin. %prep %setup -q -n Kwiki-UserPreferences-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -39,22 +39,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.13-3 +- Cleanup. + * Mon Feb 27 2006 Steven Pritchard 0.13-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Sat Mar 11 00:22:52 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:22:52 -0500 Subject: owners owners.list,1.733,1.734 Message-ID: <200603110023.k2B0NPXt019244@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19214 Modified Files: owners.list Log Message: Adding: perl-Kwiki-Attachments perl-Kwiki-Diff perl-Kwiki-Raw perl-Kwiki-UserName perl-Kwiki-Users-Remote Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.733 retrieving revision 1.734 diff -u -r1.733 -r1.734 --- owners.list 10 Mar 2006 23:31:26 -0000 1.733 +++ owners.list 11 Mar 2006 00:22:52 -0000 1.734 @@ -943,12 +943,17 @@ Fedora Extras|perl-Jcode|Perl extension interface for converting Japanese text|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki|Perl wiki implementation|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-Archive-Rcs|Kwiki::Archive::Rcs Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Attachments|Kwiki::Attachments Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Diff|Kwiki::Diff Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-ModPerl|Kwiki::ModPerl Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-NewPage|Kwiki::NewPage Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Raw|Provide an action to retrieve the raw wikitext of a page|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-RecentChanges|Kwiki::RecentChanges Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-Revisions|Kwiki::Revisions Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-Search|Kwiki::Search Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-UserName|Kwiki::UserName Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Kwiki-UserPreferences|Kwiki::UserPreferences Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Kwiki-Users-Remote|Kwiki::Users::Remote Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Sat Mar 11 00:28:04 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:28:04 -0500 Subject: rpms/perl-Kwiki-UserName/devel Kwiki-UserName-filter-requires.sh, NONE, 1.1 perl-Kwiki-UserName.spec, 1.1, 1.2 Message-ID: <200603110028.k2B0Saow019311@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-UserName/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19284 Modified Files: perl-Kwiki-UserName.spec Added Files: Kwiki-UserName-filter-requires.sh Log Message: Cleanup. --- NEW FILE Kwiki-UserName-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-UserName.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-UserName/devel/perl-Kwiki-UserName.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-UserName.spec 10 Mar 2006 23:38:22 -0000 1.1 +++ perl-Kwiki-UserName.spec 11 Mar 2006 00:27:59 -0000 1.2 @@ -1,11 +1,11 @@ Name: perl-Kwiki-UserName Version: 0.14 -Release: 2%{?dist} -Summary: Kwiki::UserName Perl module +Release: 3%{?dist} +Summary: Kwiki User Name plugin License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-UserName/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-UserName-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-UserName-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.37 @@ -14,17 +14,17 @@ Requires: perl(Kwiki::UserPreferences) >= 0.13 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-UserName-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Kwiki User Name plugin. %prep %setup -q -n Kwiki-UserName-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -41,22 +41,22 @@ chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/* -perldoc -t perlgpl > COPYING -perldoc -t perlartistic > Artistic - %check make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) -%doc Changes README COPYING Artistic +%doc Changes README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.14-3 +- Cleanup. + * Mon Feb 27 2006 Steven Pritchard 0.14-2 - Drop explicit BR: perl. - Filter perl(mixin) dependency. From fedora-extras-commits at redhat.com Sat Mar 11 00:42:39 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 10 Mar 2006 19:42:39 -0500 Subject: rpms/perl-Kwiki-Users-Remote/devel Kwiki-Users-Remote-filter-requires.sh, NONE, 1.1 perl-Kwiki-Users-Remote.spec, 1.1, 1.2 Message-ID: <200603110043.k2B0hB4r019552@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19534 Modified Files: perl-Kwiki-Users-Remote.spec Added Files: Kwiki-Users-Remote-filter-requires.sh Log Message: Cleanup. --- NEW FILE Kwiki-Users-Remote-filter-requires.sh --- #!/bin/sh @@PERL_REQ@@ "$@" | sed -e '/^perl(mixin)$/d' Index: perl-Kwiki-Users-Remote.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Kwiki-Users-Remote/devel/perl-Kwiki-Users-Remote.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Kwiki-Users-Remote.spec 10 Mar 2006 23:49:09 -0000 1.1 +++ perl-Kwiki-Users-Remote.spec 11 Mar 2006 00:42:39 -0000 1.2 @@ -1,11 +1,11 @@ Name: perl-Kwiki-Users-Remote Version: 0.04 -Release: 1%{?dist} -Summary: Kwiki::Users::Remote Perl module +Release: 2%{?dist} +Summary: Set Kwiki user name from HTTP authentication License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Kwiki-Users-Remote/ -Source0: http://www.cpan.org/modules/by-module/Kwiki/Kwiki-Users-Remote-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/I/IA/IAN/Kwiki-Users-Remote-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl(Kwiki) >= 0.32 @@ -16,17 +16,17 @@ Requires: perl(Kwiki::Users) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Source98: Kwiki-Users-Remote-filter-requires.sh +%global real_perl_requires %{__perl_requires} +%define __perl_requires %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)-filter-requires + %description Automatically set Kwiki user name from HTTP authentication. %prep %setup -q -n Kwiki-Users-Remote-%{version} -cat < $RPM_SOURCE_DIR/%{name}-req -#!/bin/sh -%{__perl_requires} $* | sed -e '/^perl(mixin)$/d' -EOF -%define __perl_requires %{_sourcedir}/%{name}-req +sed -e 's,@@PERL_REQ@@,%{real_perl_requires},' %{SOURCE98} > %{__perl_requires} chmod +x %{__perl_requires} %build @@ -48,7 +48,7 @@ make test %clean -rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %{__perl_requires} %files %defattr(-,root,root,-) @@ -57,6 +57,9 @@ %{_mandir}/man3/* %changelog +* Fri Mar 10 2006 Steven Pritchard 0.04-2 +- Cleanup. + * Mon Feb 27 2006 Steven Pritchard 0.04-1 - Specfile autogenerated. - Drop auto-detected explicit BR: perl. From fedora-extras-commits at redhat.com Sat Mar 11 13:13:01 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sat, 11 Mar 2006 08:13:01 -0500 Subject: owners owners.list,1.734,1.735 Message-ID: <200603111313.k2BDDXQq014590@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14573 Modified Files: owners.list Log Message: Taking ownership of camstream package. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.734 retrieving revision 1.735 diff -u -r1.734 -r1.735 --- owners.list 11 Mar 2006 00:22:52 -0000 1.734 +++ owners.list 11 Mar 2006 13:12:59 -0000 1.735 @@ -99,7 +99,7 @@ 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|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|nomis80 at nomis80.org|extras-qa at fedoraproject.org| Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 11 15:06:21 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 11 Mar 2006 10:06:21 -0500 Subject: rpms/grads/devel grads.spec,1.7,1.8 Message-ID: <200603111506.k2BF6vvI018992@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/grads/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18963 Modified Files: grads.spec Log Message: * Sat Mar 11 2006 Patrice Dumas 1.9b4-9 - rebuild for newer libdap Index: grads.spec =================================================================== RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- grads.spec 17 Feb 2006 15:11:17 -0000 1.7 +++ grads.spec 11 Mar 2006 15:06:20 -0000 1.8 @@ -1,6 +1,6 @@ Name: grads Version: 1.9b4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Tool for easy acces, manipulation, and visualization of data Group: Applications/Engineering @@ -104,6 +104,9 @@ %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary %changelog +* Sat Mar 11 2006 Patrice Dumas 1.9b4-9 +- rebuild for newer libdap + * Fri Feb 17 2006 Patrice Dumas 1.9b4-8 - enable hdf for ppc, now that it is there - use a wrapper include file to prepend sd_ to netcdf symbols for From fedora-extras-commits at redhat.com Sat Mar 11 17:52:57 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sat, 11 Mar 2006 12:52:57 -0500 Subject: rpms/apachetop/devel apachetop.spec,1.10,1.11 Message-ID: <200603111753.k2BHrUFl023626@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/apachetop/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23609 Modified Files: apachetop.spec Log Message: - remove hardcoded dependency on httpd Index: apachetop.spec =================================================================== RCS file: /cvs/extras/rpms/apachetop/devel/apachetop.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- apachetop.spec 21 Feb 2006 16:57:39 -0000 1.10 +++ apachetop.spec 11 Mar 2006 17:52:57 -0000 1.11 @@ -1,6 +1,6 @@ Name: apachetop Version: 0.12.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A top-like display of Apache logs Group: Applications/Internet @@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, m4, readline-devel -Requires: httpd %description ApacheTop watches a logfile generated by Apache (in standard common or @@ -46,6 +45,9 @@ %changelog +* Sat Mar 11 2006 Aurelien Bompard 0.12.5-4 +- remove hardcoded requirement on httpd (#184491) + * Tue Feb 21 2006 Aurelien Bompard 0.12.5-3 - rebuilt for FC5 From fedora-extras-commits at redhat.com Sat Mar 11 19:57:01 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 14:57:01 -0500 Subject: rpms/rkhunter/FC-1 .cvsignore, 1.3, 1.4 rkhunter.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603111957.k2BJvXbt027885@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27864 Modified Files: .cvsignore rkhunter.spec sources Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-1/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jan 2006 06:31:13 -0000 1.3 +++ .cvsignore 11 Mar 2006 19:57:00 -0000 1.4 @@ -1,2 +1,3 @@ -rkhunter-1.2.7.tar.gz +rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-1/rkhunter.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rkhunter.spec 5 Jan 2006 06:31:13 -0000 1.2 +++ rkhunter.spec 11 Mar 2006 19:57:00 -0000 1.3 @@ -1,23 +1,26 @@ +%define rkhVer 1.2.8 +%define rpmRel 1 + # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require # in order to function properly [perl(Digest::MD5) & perl(Digest::SHA1)]. AutoReqProv: no Name: rkhunter -Version: 1.2.7 -Release: 1 +Version: %{rkhVer} +Release: %{rpmRel}%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.2.8.tar.gz Source1: rkhunter-auto_scan.tar.gz -Source2: rkhunter-%{version}-%{release}.src.md5 -Patch0: rkhunter-1.2.7-install_dir-conf.patch +Source2: rkhunter-%{rkhVer}-%{rpmRel}.src.sha +Patch0: rkhunter-1.2.8-default_settings-conf.patch Patch1: rkhunter-1.1.8-showfiles.patch Patch2: rkhunter-1.1.9-shared_man_search.patch -Patch3: rkhunter-1.1.9-app_check_default.patch +Patch3: rkhunter-1.2.8-app_check_default.patch Patch4: rkhunter-1.2.7-datestamp.patch Patch5: rkhunter-1.2.7-append_log.patch Patch6: rkhunter-1.2.7-group_log.patch @@ -51,15 +54,15 @@ %prep # This optional check is for verification of original sources -# DURING the binary build process (md5 canary check) -[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \ - && %{__perl} -pi.orig -e ' - s|../SOURCES|%{_sourcedir}|g; - ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $? -%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \ - %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 +# DURING the binary build process (sha1 canary check) +#[ ! -e %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig ] \ +# && %{__perl} -pi.orig -e ' +# s|../SOURCES|%{_sourcedir}|g; +# ' %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#sha1sum --check %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha || exit $? +#%{__rm} -f %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#%{__mv} %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig \ +# %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha %setup -q -n %{name} %setup -q -D -T -a 1 -n %{name} @@ -148,8 +151,8 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb -cd .. -[ ! -d %{name} ] || %{__rm} -rf %{name} +#cd .. +#[ ! -d %{name} ] || %{__rm} -rf %{name} %post @@ -187,6 +190,13 @@ %changelog +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + * Mon Jun 11 2005 Greg Houlette - 1.2.7-1 - Added signature auto-updating to CRON scan (new script) - Removed BOOTSCAN pending rewrite to full SysV Init scan in background Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-1/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 06:31:13 -0000 1.3 +++ sources 11 Mar 2006 19:57:00 -0000 1.4 @@ -1,2 +1,2 @@ -288ba8a87352716384823c9ea1958fa7 rkhunter-1.2.7.tar.gz +41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 20:17:13 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 15:17:13 -0500 Subject: rpms/rkhunter/FC-1 rkhunter-1.2.8-1.src.sha, NONE, 1.1 rkhunter-1.2.8-app_check_default.patch, NONE, 1.1 rkhunter-1.2.8-default_settings-conf.patch, NONE, 1.1 rkhunter-1.1.9-app_check_default.patch, 1.1, NONE rkhunter-1.2.7-1.src.md5, 1.1, NONE rkhunter-1.2.7-install_dir-conf.patch, 1.1, NONE Message-ID: <200603112017.k2BKHFMM029900@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29880 Added Files: rkhunter-1.2.8-1.src.sha rkhunter-1.2.8-app_check_default.patch rkhunter-1.2.8-default_settings-conf.patch Removed Files: rkhunter-1.1.9-app_check_default.patch rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-install_dir-conf.patch Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf --- NEW FILE rkhunter-1.2.8-1.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch rkhunter-1.2.8-app_check_default.patch: --- NEW FILE rkhunter-1.2.8-app_check_default.patch --- --- files/rkhunter.orig 2006-02-14 05:35:20.000000000 -0500 +++ files/rkhunter 2006-03-05 14:20:37.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 # Patched software versions? USE_PATCHED_SOFTWARE=0 @@ -196,6 +196,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -5053,7 +5056,8 @@ echo $ECHOOPT "--report-mode* : Don't show uninteresting information for reports" echo $ECHOOPT "--report-warnings-only* : Show only warnings (lesser output than --report-mode," echo $ECHOOPT " more than --quiet)" - echo $ECHOOPT "--skip-application-check* : Don't run application version checks" +# echo $ECHOOPT "--skip-application-check* : Don't run application version checks" + echo $ECHOOPT "--run-application-check* : Run application version checks" echo $ECHOOPT "--skip-keypress (-sk)* : Don't wait after every test (non-interactive)" echo $ECHOOPT "--quick* : Perform quick scan (instead of full scan)" echo $ECHOOPT "--quiet* : Be quiet (only show warnings)" rkhunter-1.2.8-default_settings-conf.patch: --- NEW FILE rkhunter-1.2.8-default_settings-conf.patch --- --- files/rkhunter.conf.orig 2005-03-19 12:27:20.000000000 -0500 +++ files/rkhunter.conf 2006-03-06 06:17:26.000000000 -0500 @@ -3,6 +3,7 @@ # # All lines beginning with a dash (#) or empty lines, will be ignored. # +#INSTALLDIR=/usr/local # Links to files. Don't change if you don't need to. LATESTVERSION=/rkhunter_latest.dat @@ -37,11 +38,12 @@ # Allow hidden directory # One directory per line (use multiple ALLOWHIDDENDIR lines) # +#ALLOWHIDDENDIR=/dev/.udevdb #ALLOWHIDDENDIR=/etc/.java # Allow hidden file # One file per line (use multiple ALLOWHIDDENFILE lines) # -#ALLOWHIDDENFILE=/etc/.java +#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz # The End --- rkhunter-1.1.9-app_check_default.patch DELETED --- --- rkhunter-1.2.7-1.src.md5 DELETED --- --- rkhunter-1.2.7-install_dir-conf.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 11 20:23:56 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 11 Mar 2006 15:23:56 -0500 Subject: rpms/gramps/devel gramps.spec,1.18,1.19 Message-ID: <200603112024.k2BKOTwS029948@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gramps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29931 Modified Files: gramps.spec Log Message: * Sat Mar 11 2006 Brian Pepple - 2.0.10-3 - Remove Utility category from desktop file. - Update scriptlets. Index: gramps.spec =================================================================== RCS file: /cvs/extras/rpms/gramps/devel/gramps.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- gramps.spec 28 Feb 2006 18:56:34 -0000 1.18 +++ gramps.spec 11 Mar 2006 20:23:56 -0000 1.19 @@ -1,6 +1,6 @@ Name: gramps Version: 2.0.10 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Genealogical Research and Analysis Management Programming System Group: Applications/Productivity @@ -31,12 +31,14 @@ Requires: rcs Requires: python-reportlab >= 1.20 Requires: graphviz -Requires(post): shared-mime-info -Requires(post): scrollkeeper -Requires(post): GConf2 -Requires(postun): shared-mime-info +Requires(pre): GConf2 +Requires(post): desktop-file-utils +Requires(post): scrollkeeper +Requires(post): GConf2 +Requires(preun): GConf2 +Requires(postun): desktop-file-utils Requires(postun): scrollkeeper -Requires(postun): GConf2 + %description gramps (Genealogical Research and Analysis Management Programming @@ -69,7 +71,6 @@ desktop-file-install --vendor fedora --delete-original \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - --add-category Utility \ ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop @@ -77,21 +78,35 @@ rm -rf ${RPM_BUILD_ROOT} +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : +fi + + %post -GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` \ - gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : +scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : update-desktop-database &> /dev/null ||: update-mime-database %{_datadir}/mime &> /dev/null || : -scrollkeeper-update -q -o %{_datadir}/omf/%{name} || : + + +%preun +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : +fi %postun scrollkeeper-update -q || : -if [ "$1" = "0" ]; then - update-desktop-database &> /dev/null ||: - update-mime-database %{_datadir}/mime &> /dev/null || : -fi +update-desktop-database &> /dev/null ||: +update-mime-database %{_datadir}/mime &> /dev/null || : %files -f %{name}.lang @@ -111,6 +126,10 @@ %changelog +* Sat Mar 11 2006 Brian Pepple - 2.0.10-3 +- Remove Utility category from desktop file. +- Update scriptlets. + * Tue Feb 28 2006 Brian Pepple - 2.0.10-2 - Update to 2.0.10. From fedora-extras-commits at redhat.com Sat Mar 11 20:49:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 11 Mar 2006 15:49:03 -0500 Subject: rpms/cpanspec/devel .cvsignore, 1.3, 1.4 cpanspec.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603112049.k2BKnZ24030084@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30061 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.61. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Mar 2006 03:08:57 -0000 1.3 +++ .cvsignore 11 Mar 2006 20:49:03 -0000 1.4 @@ -1 +1 @@ -cpanspec-1.60.tar.gz +cpanspec-1.61.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cpanspec.spec 8 Mar 2006 03:08:57 -0000 1.2 +++ cpanspec.spec 11 Mar 2006 20:49:03 -0000 1.3 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.60 +Version: 1.61 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Sat Mar 11 2006 Steven Pritchard 1.61-1 +- Update to 1.61. + * Tue Mar 07 2006 Steven Pritchard 1.60-1 - Update to 1.60. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Mar 2006 03:08:57 -0000 1.3 +++ sources 11 Mar 2006 20:49:03 -0000 1.4 @@ -1 +1 @@ -ebfaf5da00b1a5096f1919451d9be9e6 cpanspec-1.60.tar.gz +69df0b4f1a1fe4efd469c212cd8cb983 cpanspec-1.61.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 20:51:42 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 15:51:42 -0500 Subject: rpms/rkhunter/FC-2 rkhunter-1.2.8-1.src.sha, NONE, 1.1 rkhunter-1.2.8-app_check_default.patch, NONE, 1.1 rkhunter-1.2.8-default_settings-conf.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 rkhunter.spec, 1.2, 1.3 sources, 1.3, 1.4 rkhunter-1.1.9-app_check_default.patch, 1.1, NONE rkhunter-1.2.7-1.src.md5, 1.1, NONE rkhunter-1.2.7-install_dir-conf.patch, 1.1, NONE Message-ID: <200603112052.k2BKqEqO030186@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30149 Modified Files: .cvsignore rkhunter.spec sources Added Files: rkhunter-1.2.8-1.src.sha rkhunter-1.2.8-app_check_default.patch rkhunter-1.2.8-default_settings-conf.patch Removed Files: rkhunter-1.1.9-app_check_default.patch rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-install_dir-conf.patch Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf --- NEW FILE rkhunter-1.2.8-1.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch rkhunter-1.2.8-app_check_default.patch: --- NEW FILE rkhunter-1.2.8-app_check_default.patch --- --- files/rkhunter.orig 2006-02-14 05:35:20.000000000 -0500 +++ files/rkhunter 2006-03-05 14:20:37.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 # Patched software versions? USE_PATCHED_SOFTWARE=0 @@ -196,6 +196,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -5053,7 +5056,8 @@ echo $ECHOOPT "--report-mode* : Don't show uninteresting information for reports" echo $ECHOOPT "--report-warnings-only* : Show only warnings (lesser output than --report-mode," echo $ECHOOPT " more than --quiet)" - echo $ECHOOPT "--skip-application-check* : Don't run application version checks" +# echo $ECHOOPT "--skip-application-check* : Don't run application version checks" + echo $ECHOOPT "--run-application-check* : Run application version checks" echo $ECHOOPT "--skip-keypress (-sk)* : Don't wait after every test (non-interactive)" echo $ECHOOPT "--quick* : Perform quick scan (instead of full scan)" echo $ECHOOPT "--quiet* : Be quiet (only show warnings)" rkhunter-1.2.8-default_settings-conf.patch: --- NEW FILE rkhunter-1.2.8-default_settings-conf.patch --- --- files/rkhunter.conf.orig 2005-03-19 12:27:20.000000000 -0500 +++ files/rkhunter.conf 2006-03-06 06:17:26.000000000 -0500 @@ -3,6 +3,7 @@ # # All lines beginning with a dash (#) or empty lines, will be ignored. # +#INSTALLDIR=/usr/local # Links to files. Don't change if you don't need to. LATESTVERSION=/rkhunter_latest.dat @@ -37,11 +38,12 @@ # Allow hidden directory # One directory per line (use multiple ALLOWHIDDENDIR lines) # +#ALLOWHIDDENDIR=/dev/.udevdb #ALLOWHIDDENDIR=/etc/.java # Allow hidden file # One file per line (use multiple ALLOWHIDDENFILE lines) # -#ALLOWHIDDENFILE=/etc/.java +#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz # The End Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-2/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jan 2006 07:06:50 -0000 1.3 +++ .cvsignore 11 Mar 2006 20:51:42 -0000 1.4 @@ -1,2 +1,3 @@ -rkhunter-1.2.7.tar.gz +rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-2/rkhunter.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rkhunter.spec 5 Jan 2006 07:06:50 -0000 1.2 +++ rkhunter.spec 11 Mar 2006 20:51:42 -0000 1.3 @@ -1,23 +1,26 @@ +%define rkhVer 1.2.8 +%define rpmRel 1 + # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require # in order to function properly [perl(Digest::MD5) & perl(Digest::SHA1)]. AutoReqProv: no Name: rkhunter -Version: 1.2.7 -Release: 1 +Version: %{rkhVer} +Release: %{rpmRel}%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.2.8.tar.gz Source1: rkhunter-auto_scan.tar.gz -Source2: rkhunter-%{version}-%{release}.src.md5 -Patch0: rkhunter-1.2.7-install_dir-conf.patch +Source2: rkhunter-%{rkhVer}-%{rpmRel}.src.sha +Patch0: rkhunter-1.2.8-default_settings-conf.patch Patch1: rkhunter-1.1.8-showfiles.patch Patch2: rkhunter-1.1.9-shared_man_search.patch -Patch3: rkhunter-1.1.9-app_check_default.patch +Patch3: rkhunter-1.2.8-app_check_default.patch Patch4: rkhunter-1.2.7-datestamp.patch Patch5: rkhunter-1.2.7-append_log.patch Patch6: rkhunter-1.2.7-group_log.patch @@ -51,15 +54,15 @@ %prep # This optional check is for verification of original sources -# DURING the binary build process (md5 canary check) -[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \ - && %{__perl} -pi.orig -e ' - s|../SOURCES|%{_sourcedir}|g; - ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $? -%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \ - %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 +# DURING the binary build process (sha1 canary check) +#[ ! -e %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig ] \ +# && %{__perl} -pi.orig -e ' +# s|../SOURCES|%{_sourcedir}|g; +# ' %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#sha1sum --check %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha || exit $? +#%{__rm} -f %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#%{__mv} %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig \ +# %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha %setup -q -n %{name} %setup -q -D -T -a 1 -n %{name} @@ -148,8 +151,8 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb -cd .. -[ ! -d %{name} ] || %{__rm} -rf %{name} +#cd .. +#[ ! -d %{name} ] || %{__rm} -rf %{name} %post @@ -187,6 +190,13 @@ %changelog +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + * Mon Jun 11 2005 Greg Houlette - 1.2.7-1 - Added signature auto-updating to CRON scan (new script) - Removed BOOTSCAN pending rewrite to full SysV Init scan in background Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-2/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 07:06:50 -0000 1.3 +++ sources 11 Mar 2006 20:51:42 -0000 1.4 @@ -1,2 +1,2 @@ -288ba8a87352716384823c9ea1958fa7 rkhunter-1.2.7.tar.gz +41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz --- rkhunter-1.1.9-app_check_default.patch DELETED --- --- rkhunter-1.2.7-1.src.md5 DELETED --- --- rkhunter-1.2.7-install_dir-conf.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 11 20:57:36 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 15:57:36 -0500 Subject: rpms/rkhunter/FC-3 rkhunter-1.2.8-1.src.sha, NONE, 1.1 rkhunter-1.2.8-app_check_default.patch, NONE, 1.1 rkhunter-1.2.8-default_settings-conf.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rkhunter.spec, 1.4, 1.5 sources, 1.4, 1.5 rkhunter-1.1.9-app_check_default.patch, 1.1, NONE rkhunter-1.2.7-1.src.md5, 1.1, NONE rkhunter-1.2.7-install_dir-conf.patch, 1.1, NONE Message-ID: <200603112058.k2BKw8Cv030275@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30247 Modified Files: .cvsignore rkhunter.spec sources Added Files: rkhunter-1.2.8-1.src.sha rkhunter-1.2.8-app_check_default.patch rkhunter-1.2.8-default_settings-conf.patch Removed Files: rkhunter-1.1.9-app_check_default.patch rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-install_dir-conf.patch Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf --- NEW FILE rkhunter-1.2.8-1.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch rkhunter-1.2.8-app_check_default.patch: --- NEW FILE rkhunter-1.2.8-app_check_default.patch --- --- files/rkhunter.orig 2006-02-14 05:35:20.000000000 -0500 +++ files/rkhunter 2006-03-05 14:20:37.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 # Patched software versions? USE_PATCHED_SOFTWARE=0 @@ -196,6 +196,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -5053,7 +5056,8 @@ echo $ECHOOPT "--report-mode* : Don't show uninteresting information for reports" echo $ECHOOPT "--report-warnings-only* : Show only warnings (lesser output than --report-mode," echo $ECHOOPT " more than --quiet)" - echo $ECHOOPT "--skip-application-check* : Don't run application version checks" +# echo $ECHOOPT "--skip-application-check* : Don't run application version checks" + echo $ECHOOPT "--run-application-check* : Run application version checks" echo $ECHOOPT "--skip-keypress (-sk)* : Don't wait after every test (non-interactive)" echo $ECHOOPT "--quick* : Perform quick scan (instead of full scan)" echo $ECHOOPT "--quiet* : Be quiet (only show warnings)" rkhunter-1.2.8-default_settings-conf.patch: --- NEW FILE rkhunter-1.2.8-default_settings-conf.patch --- --- files/rkhunter.conf.orig 2005-03-19 12:27:20.000000000 -0500 +++ files/rkhunter.conf 2006-03-06 06:17:26.000000000 -0500 @@ -3,6 +3,7 @@ # # All lines beginning with a dash (#) or empty lines, will be ignored. # +#INSTALLDIR=/usr/local # Links to files. Don't change if you don't need to. LATESTVERSION=/rkhunter_latest.dat @@ -37,11 +38,12 @@ # Allow hidden directory # One directory per line (use multiple ALLOWHIDDENDIR lines) # +#ALLOWHIDDENDIR=/dev/.udevdb #ALLOWHIDDENDIR=/etc/.java # Allow hidden file # One file per line (use multiple ALLOWHIDDENFILE lines) # -#ALLOWHIDDENFILE=/etc/.java +#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz # The End Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 07:19:11 -0000 1.4 +++ .cvsignore 11 Mar 2006 20:57:35 -0000 1.5 @@ -1,2 +1,3 @@ -rkhunter-1.2.7.tar.gz +rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-3/rkhunter.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- rkhunter.spec 5 Jan 2006 07:19:11 -0000 1.4 +++ rkhunter.spec 11 Mar 2006 20:57:35 -0000 1.5 @@ -1,23 +1,26 @@ +%define rkhVer 1.2.8 +%define rpmRel 1 + # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require # in order to function properly [perl(Digest::MD5) & perl(Digest::SHA1)]. AutoReqProv: no Name: rkhunter -Version: 1.2.7 -Release: 1 +Version: %{rkhVer} +Release: %{rpmRel}%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.2.8.tar.gz Source1: rkhunter-auto_scan.tar.gz -Source2: rkhunter-%{version}-%{release}.src.md5 -Patch0: rkhunter-1.2.7-install_dir-conf.patch +Source2: rkhunter-%{rkhVer}-%{rpmRel}.src.sha +Patch0: rkhunter-1.2.8-default_settings-conf.patch Patch1: rkhunter-1.1.8-showfiles.patch Patch2: rkhunter-1.1.9-shared_man_search.patch -Patch3: rkhunter-1.1.9-app_check_default.patch +Patch3: rkhunter-1.2.8-app_check_default.patch Patch4: rkhunter-1.2.7-datestamp.patch Patch5: rkhunter-1.2.7-append_log.patch Patch6: rkhunter-1.2.7-group_log.patch @@ -51,15 +54,15 @@ %prep # This optional check is for verification of original sources -# DURING the binary build process (md5 canary check) -[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \ - && %{__perl} -pi.orig -e ' - s|../SOURCES|%{_sourcedir}|g; - ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $? -%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \ - %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 +# DURING the binary build process (sha1 canary check) +#[ ! -e %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig ] \ +# && %{__perl} -pi.orig -e ' +# s|../SOURCES|%{_sourcedir}|g; +# ' %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#sha1sum --check %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha || exit $? +#%{__rm} -f %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#%{__mv} %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig \ +# %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha %setup -q -n %{name} %setup -q -D -T -a 1 -n %{name} @@ -148,8 +151,8 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb -cd .. -[ ! -d %{name} ] || %{__rm} -rf %{name} +#cd .. +#[ ! -d %{name} ] || %{__rm} -rf %{name} %post @@ -187,6 +190,13 @@ %changelog +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + * Mon Jun 11 2005 Greg Houlette - 1.2.7-1 - Added signature auto-updating to CRON scan (new script) - Removed BOOTSCAN pending rewrite to full SysV Init scan in background Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 07:19:11 -0000 1.4 +++ sources 11 Mar 2006 20:57:35 -0000 1.5 @@ -1,2 +1,2 @@ -288ba8a87352716384823c9ea1958fa7 rkhunter-1.2.7.tar.gz +41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz --- rkhunter-1.1.9-app_check_default.patch DELETED --- --- rkhunter-1.2.7-1.src.md5 DELETED --- --- rkhunter-1.2.7-install_dir-conf.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 11 21:02:45 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 16:02:45 -0500 Subject: rpms/rkhunter/FC-4 rkhunter-1.2.8-1.src.sha, NONE, 1.1 rkhunter-1.2.8-app_check_default.patch, NONE, 1.1 rkhunter-1.2.8-default_settings-conf.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rkhunter.spec, 1.6, 1.7 sources, 1.4, 1.5 rkhunter-1.1.9-app_check_default.patch, 1.1, NONE rkhunter-1.2.7-1.src.md5, 1.1, NONE rkhunter-1.2.7-install_dir-conf.patch, 1.1, NONE Message-ID: <200603112103.k2BL3HEg032262@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32234 Modified Files: .cvsignore rkhunter.spec sources Added Files: rkhunter-1.2.8-1.src.sha rkhunter-1.2.8-app_check_default.patch rkhunter-1.2.8-default_settings-conf.patch Removed Files: rkhunter-1.1.9-app_check_default.patch rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-install_dir-conf.patch Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf --- NEW FILE rkhunter-1.2.8-1.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch rkhunter-1.2.8-app_check_default.patch: --- NEW FILE rkhunter-1.2.8-app_check_default.patch --- --- files/rkhunter.orig 2006-02-14 05:35:20.000000000 -0500 +++ files/rkhunter 2006-03-05 14:20:37.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 # Patched software versions? USE_PATCHED_SOFTWARE=0 @@ -196,6 +196,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -5053,7 +5056,8 @@ echo $ECHOOPT "--report-mode* : Don't show uninteresting information for reports" echo $ECHOOPT "--report-warnings-only* : Show only warnings (lesser output than --report-mode," echo $ECHOOPT " more than --quiet)" - echo $ECHOOPT "--skip-application-check* : Don't run application version checks" +# echo $ECHOOPT "--skip-application-check* : Don't run application version checks" + echo $ECHOOPT "--run-application-check* : Run application version checks" echo $ECHOOPT "--skip-keypress (-sk)* : Don't wait after every test (non-interactive)" echo $ECHOOPT "--quick* : Perform quick scan (instead of full scan)" echo $ECHOOPT "--quiet* : Be quiet (only show warnings)" rkhunter-1.2.8-default_settings-conf.patch: --- NEW FILE rkhunter-1.2.8-default_settings-conf.patch --- --- files/rkhunter.conf.orig 2005-03-19 12:27:20.000000000 -0500 +++ files/rkhunter.conf 2006-03-06 06:17:26.000000000 -0500 @@ -3,6 +3,7 @@ # # All lines beginning with a dash (#) or empty lines, will be ignored. # +#INSTALLDIR=/usr/local # Links to files. Don't change if you don't need to. LATESTVERSION=/rkhunter_latest.dat @@ -37,11 +38,12 @@ # Allow hidden directory # One directory per line (use multiple ALLOWHIDDENDIR lines) # +#ALLOWHIDDENDIR=/dev/.udevdb #ALLOWHIDDENDIR=/etc/.java # Allow hidden file # One file per line (use multiple ALLOWHIDDENFILE lines) # -#ALLOWHIDDENFILE=/etc/.java +#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz # The End Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 07:27:20 -0000 1.4 +++ .cvsignore 11 Mar 2006 21:02:45 -0000 1.5 @@ -1,2 +1,3 @@ -rkhunter-1.2.7.tar.gz +rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-4/rkhunter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rkhunter.spec 5 Jan 2006 07:27:20 -0000 1.6 +++ rkhunter.spec 11 Mar 2006 21:02:45 -0000 1.7 @@ -1,23 +1,26 @@ +%define rkhVer 1.2.8 +%define rpmRel 1 + # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require # in order to function properly [perl(Digest::MD5) & perl(Digest::SHA1)]. AutoReqProv: no Name: rkhunter -Version: 1.2.7 -Release: 1 +Version: %{rkhVer} +Release: %{rpmRel}%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.2.8.tar.gz Source1: rkhunter-auto_scan.tar.gz -Source2: rkhunter-%{version}-%{release}.src.md5 -Patch0: rkhunter-1.2.7-install_dir-conf.patch +Source2: rkhunter-%{rkhVer}-%{rpmRel}.src.sha +Patch0: rkhunter-1.2.8-default_settings-conf.patch Patch1: rkhunter-1.1.8-showfiles.patch Patch2: rkhunter-1.1.9-shared_man_search.patch -Patch3: rkhunter-1.1.9-app_check_default.patch +Patch3: rkhunter-1.2.8-app_check_default.patch Patch4: rkhunter-1.2.7-datestamp.patch Patch5: rkhunter-1.2.7-append_log.patch Patch6: rkhunter-1.2.7-group_log.patch @@ -51,15 +54,15 @@ %prep # This optional check is for verification of original sources -# DURING the binary build process (md5 canary check) -[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \ - && %{__perl} -pi.orig -e ' - s|../SOURCES|%{_sourcedir}|g; - ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $? -%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \ - %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 +# DURING the binary build process (sha1 canary check) +#[ ! -e %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig ] \ +# && %{__perl} -pi.orig -e ' +# s|../SOURCES|%{_sourcedir}|g; +# ' %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#sha1sum --check %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha || exit $? +#%{__rm} -f %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#%{__mv} %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig \ +# %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha %setup -q -n %{name} %setup -q -D -T -a 1 -n %{name} @@ -148,8 +151,8 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb -cd .. -[ ! -d %{name} ] || %{__rm} -rf %{name} +#cd .. +#[ ! -d %{name} ] || %{__rm} -rf %{name} %post @@ -187,6 +190,13 @@ %changelog +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + * Mon Jun 11 2005 Greg Houlette - 1.2.7-1 - Added signature auto-updating to CRON scan (new script) - Removed BOOTSCAN pending rewrite to full SysV Init scan in background Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 07:27:20 -0000 1.4 +++ sources 11 Mar 2006 21:02:45 -0000 1.5 @@ -1,2 +1,2 @@ -288ba8a87352716384823c9ea1958fa7 rkhunter-1.2.7.tar.gz +41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz --- rkhunter-1.1.9-app_check_default.patch DELETED --- --- rkhunter-1.2.7-1.src.md5 DELETED --- --- rkhunter-1.2.7-install_dir-conf.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 11 21:08:17 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 11 Mar 2006 16:08:17 -0500 Subject: rpms/rkhunter/devel rkhunter-1.2.8-1.src.sha, NONE, 1.1 rkhunter-1.2.8-app_check_default.patch, NONE, 1.1 rkhunter-1.2.8-default_settings-conf.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 rkhunter.spec, 1.6, 1.7 sources, 1.4, 1.5 rkhunter-1.1.9-app_check_default.patch, 1.1, NONE rkhunter-1.2.7-1.src.md5, 1.1, NONE rkhunter-1.2.7-install_dir-conf.patch, 1.1, NONE Message-ID: <200603112108.k2BL8qD6032437@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32401 Modified Files: .cvsignore rkhunter.spec sources Added Files: rkhunter-1.2.8-1.src.sha rkhunter-1.2.8-app_check_default.patch rkhunter-1.2.8-default_settings-conf.patch Removed Files: rkhunter-1.1.9-app_check_default.patch rkhunter-1.2.7-1.src.md5 rkhunter-1.2.7-install_dir-conf.patch Log Message: * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag - Updated the application check default patchfile (chunk failure) - Changed to SHA1 for optional message digest (canary check) - Added a couple of suggested skip entries to rkhunter.conf --- NEW FILE rkhunter-1.2.8-1.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch rkhunter-1.2.8-app_check_default.patch: --- NEW FILE rkhunter-1.2.8-app_check_default.patch --- --- files/rkhunter.orig 2006-02-14 05:35:20.000000000 -0500 +++ files/rkhunter 2006-03-05 14:20:37.000000000 -0500 @@ -49,7 +49,7 @@ # Skip passwd/group check PASSWDCHECK_SKIP=0 # Application check -APPLICATION_CHECK=1 +APPLICATION_CHECK=0 # Patched software versions? USE_PATCHED_SOFTWARE=0 @@ -196,6 +196,9 @@ shift ROOTDIR=$1 ;; + --run-application-check | --runapplicationcheck | --run-applicationcheck) + APPLICATION_CHECK=1 + ;; --scan-knownbad-files) PERFORMKNOWNBAD=1 ;; @@ -5053,7 +5056,8 @@ echo $ECHOOPT "--report-mode* : Don't show uninteresting information for reports" echo $ECHOOPT "--report-warnings-only* : Show only warnings (lesser output than --report-mode," echo $ECHOOPT " more than --quiet)" - echo $ECHOOPT "--skip-application-check* : Don't run application version checks" +# echo $ECHOOPT "--skip-application-check* : Don't run application version checks" + echo $ECHOOPT "--run-application-check* : Run application version checks" echo $ECHOOPT "--skip-keypress (-sk)* : Don't wait after every test (non-interactive)" echo $ECHOOPT "--quick* : Perform quick scan (instead of full scan)" echo $ECHOOPT "--quiet* : Be quiet (only show warnings)" rkhunter-1.2.8-default_settings-conf.patch: --- NEW FILE rkhunter-1.2.8-default_settings-conf.patch --- --- files/rkhunter.conf.orig 2005-03-19 12:27:20.000000000 -0500 +++ files/rkhunter.conf 2006-03-06 06:17:26.000000000 -0500 @@ -3,6 +3,7 @@ # # All lines beginning with a dash (#) or empty lines, will be ignored. # +#INSTALLDIR=/usr/local # Links to files. Don't change if you don't need to. LATESTVERSION=/rkhunter_latest.dat @@ -37,11 +38,12 @@ # Allow hidden directory # One directory per line (use multiple ALLOWHIDDENDIR lines) # +#ALLOWHIDDENDIR=/dev/.udevdb #ALLOWHIDDENDIR=/etc/.java # Allow hidden file # One file per line (use multiple ALLOWHIDDENFILE lines) # -#ALLOWHIDDENFILE=/etc/.java +#ALLOWHIDDENFILE=/usr/share/man/man1/..1.gz # The End Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Jan 2006 07:36:18 -0000 1.4 +++ .cvsignore 11 Mar 2006 21:08:16 -0000 1.5 @@ -1,2 +1,3 @@ -rkhunter-1.2.7.tar.gz +rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rkhunter.spec 5 Jan 2006 07:36:18 -0000 1.6 +++ rkhunter.spec 11 Mar 2006 21:08:16 -0000 1.7 @@ -1,23 +1,26 @@ +%define rkhVer 1.2.8 +%define rpmRel 1 + # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require # in order to function properly [perl(Digest::MD5) & perl(Digest::SHA1)]. AutoReqProv: no Name: rkhunter -Version: 1.2.7 -Release: 1 +Version: %{rkhVer} +Release: %{rpmRel}%{?dist} Summary: A host-based tool to scan for rootkits, backdoors and local exploits Group: Applications/System License: GPL URL: http://www.rootkit.nl/ -Source0: http://downloads.rootkit.nl/rkhunter-1.2.7.tar.gz +Source0: http://downloads.rootkit.nl/rkhunter-1.2.8.tar.gz Source1: rkhunter-auto_scan.tar.gz -Source2: rkhunter-%{version}-%{release}.src.md5 -Patch0: rkhunter-1.2.7-install_dir-conf.patch +Source2: rkhunter-%{rkhVer}-%{rpmRel}.src.sha +Patch0: rkhunter-1.2.8-default_settings-conf.patch Patch1: rkhunter-1.1.8-showfiles.patch Patch2: rkhunter-1.1.9-shared_man_search.patch -Patch3: rkhunter-1.1.9-app_check_default.patch +Patch3: rkhunter-1.2.8-app_check_default.patch Patch4: rkhunter-1.2.7-datestamp.patch Patch5: rkhunter-1.2.7-append_log.patch Patch6: rkhunter-1.2.7-group_log.patch @@ -51,15 +54,15 @@ %prep # This optional check is for verification of original sources -# DURING the binary build process (md5 canary check) -[ ! -e %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig ] \ - && %{__perl} -pi.orig -e ' - s|../SOURCES|%{_sourcedir}|g; - ' %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -md5sum --check %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 || exit $? -%{__rm} -f %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 -%{__mv} %{_sourcedir}/%{name}-%{version}-%{release}.src.md5.orig \ - %{_sourcedir}/%{name}-%{version}-%{release}.src.md5 +# DURING the binary build process (sha1 canary check) +#[ ! -e %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig ] \ +# && %{__perl} -pi.orig -e ' +# s|../SOURCES|%{_sourcedir}|g; +# ' %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#sha1sum --check %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha || exit $? +#%{__rm} -f %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha +#%{__mv} %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha.orig \ +# %{_sourcedir}/%{name}-%{rkhVer}-%{rpmRel}.src.sha %setup -q -n %{name} %setup -q -D -T -a 1 -n %{name} @@ -148,8 +151,8 @@ %clean %{__rm} -rf $RPM_BUILD_ROOT # Autoclean for rpmbuild -bb -cd .. -[ ! -d %{name} ] || %{__rm} -rf %{name} +#cd .. +#[ ! -d %{name} ] || %{__rm} -rf %{name} %post @@ -187,6 +190,13 @@ %changelog +* Tue Mar 7 2006 Greg Houlette - 1.2.8-1 +- New package version release +- reworked the .spec file to support optional dist tag +- Updated the application check default patchfile (chunk failure) +- Changed to SHA1 for optional message digest (canary check) +- Added a couple of suggested skip entries to rkhunter.conf + * Mon Jun 11 2005 Greg Houlette - 1.2.7-1 - Added signature auto-updating to CRON scan (new script) - Removed BOOTSCAN pending rewrite to full SysV Init scan in background Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Jan 2006 07:36:18 -0000 1.4 +++ sources 11 Mar 2006 21:08:16 -0000 1.5 @@ -1,2 +1,2 @@ -288ba8a87352716384823c9ea1958fa7 rkhunter-1.2.7.tar.gz +41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz --- rkhunter-1.1.9-app_check_default.patch DELETED --- --- rkhunter-1.2.7-1.src.md5 DELETED --- --- rkhunter-1.2.7-install_dir-conf.patch DELETED --- From fedora-extras-commits at redhat.com Sat Mar 11 21:19:46 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 11 Mar 2006 16:19:46 -0500 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.3, 1.4 cpanspec.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603112120.k2BLKIKf032544@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32523 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.61. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Mar 2006 03:11:44 -0000 1.3 +++ .cvsignore 11 Mar 2006 21:19:46 -0000 1.4 @@ -1 +1 @@ -cpanspec-1.60.tar.gz +cpanspec-1.61.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- cpanspec.spec 8 Mar 2006 03:11:44 -0000 1.2 +++ cpanspec.spec 11 Mar 2006 21:19:46 -0000 1.3 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.60 +Version: 1.61 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Sat Mar 11 2006 Steven Pritchard 1.61-1 +- Update to 1.61. + * Tue Mar 07 2006 Steven Pritchard 1.60-1 - Update to 1.60. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Mar 2006 03:11:44 -0000 1.3 +++ sources 11 Mar 2006 21:19:46 -0000 1.4 @@ -1 +1 @@ -ebfaf5da00b1a5096f1919451d9be9e6 cpanspec-1.60.tar.gz +69df0b4f1a1fe4efd469c212cd8cb983 cpanspec-1.61.tar.gz From fedora-extras-commits at redhat.com Sat Mar 11 21:51:19 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 11 Mar 2006 16:51:19 -0500 Subject: owners owners.list,1.735,1.736 Message-ID: <200603112151.k2BLpp2f032694@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32673 Modified Files: owners.list Log Message: taking ownership of freedroidrpg Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.735 retrieving revision 1.736 diff -u -r1.735 -r1.736 --- owners.list 11 Mar 2006 13:12:59 -0000 1.735 +++ owners.list 11 Mar 2006 21:51:18 -0000 1.736 @@ -258,7 +258,7 @@ Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|freealut|Implementation of OpenAL's ALUT standard|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|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|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|extras-orphan at fedoraproject.org|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 Sat Mar 11 21:53:37 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 11 Mar 2006 16:53:37 -0500 Subject: owners owners.list,1.736,1.737 Message-ID: <200603112154.k2BLs9Wd032735@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32715 Modified Files: owners.list Log Message: Oops! Editted wrong line last time. Let's try to take ownership of the right package this time. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.736 retrieving revision 1.737 diff -u -r1.736 -r1.737 --- owners.list 11 Mar 2006 21:51:18 -0000 1.736 +++ owners.list 11 Mar 2006 21:53:37 -0000 1.737 @@ -258,8 +258,8 @@ Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|freealut|Implementation of OpenAL's ALUT standard|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|freeciv|The Freeciv multi-player strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org| -Fedora Extras|freedroid|Clone of the C64 Game Paradroid|wart at kobold.org|extras-qa at fedoraproject.org| -Fedora Extras|freedroidrpg|Role playing game with Freedroid theme and Tux as the hero|extras-orphan 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|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| Fedora Extras|FreeWnn|Japanese input server|petersen at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 11 22:50:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Sat, 11 Mar 2006 17:50:35 -0500 Subject: rpms/allegro/devel allegro-4.2.0-mprotect.patch, 1.1, 1.2 allegro.spec, 1.27, 1.28 Message-ID: <200603112251.k2BMp7er002290@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2268 Modified Files: allegro-4.2.0-mprotect.patch allegro.spec Log Message: * Sat Mar 11 2006 Hans de Goede 4.2.0-10 - really fix asm stretch code on i386 with NX processors, on OpenBSD mprotects first argument does not need to be page-aligned, but on Linux it does. Note that for this to work you may also need to disable selinux (rh 185214) allegro-4.2.0-mprotect.patch: Index: allegro-4.2.0-mprotect.patch =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro-4.2.0-mprotect.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- allegro-4.2.0-mprotect.patch 8 Mar 2006 22:12:12 -0000 1.1 +++ allegro-4.2.0-mprotect.patch 11 Mar 2006 22:50:34 -0000 1.2 @@ -1,5 +1,5 @@ --- allegro-4.2.0/tools/grabber.c.mprotect 2005-09-04 18:00:18.000000000 +0200 -+++ allegro-4.2.0/tools/grabber.c 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/tools/grabber.c 2006-03-11 23:27:31.000000000 +0100 @@ -3121,6 +3121,7 @@ case OSTYPE_SUNOS: s = "SunOS/Solaris"; break; case OSTYPE_FREEBSD: s = "FreeBSD"; break; @@ -9,7 +9,7 @@ case OSTYPE_DARWIN: s = "Darwin"; break; case OSTYPE_QNX: s = "QNX"; break; --- allegro-4.2.0/include/allegro/platform/alunixac.hin.mprotect 2005-10-30 21:23:33.000000000 +0100 -+++ allegro-4.2.0/include/allegro/platform/alunixac.hin 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/include/allegro/platform/alunixac.hin 2006-03-11 23:27:31.000000000 +0100 @@ -169,6 +169,9 @@ /* Define to 1 if you have the `mmap' function. */ #undef HAVE_MMAP @@ -21,7 +21,7 @@ #undef HAVE_NDIR_H --- allegro-4.2.0/include/allegro/system.h.mprotect 2005-03-15 21:32:43.000000000 +0100 -+++ allegro-4.2.0/include/allegro/system.h 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/include/allegro/system.h 2006-03-11 23:27:31.000000000 +0100 @@ -53,6 +53,7 @@ #define OSTYPE_SUNOS AL_ID('S','U','N',' ') #define OSTYPE_FREEBSD AL_ID('F','B','S','D') @@ -31,7 +31,7 @@ #define OSTYPE_DARWIN AL_ID('D','A','R','W') #define OSTYPE_QNX AL_ID('Q','N','X',' ') --- allegro-4.2.0/configure.mprotect 2005-11-06 10:54:00.000000000 +0100 -+++ allegro-4.2.0/configure 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/configure 2006-03-11 23:27:31.000000000 +0100 @@ -11225,7 +11225,7 @@ @@ -42,7 +42,7 @@ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 --- allegro-4.2.0/configure.in.mprotect 2005-08-07 23:50:49.000000000 +0200 -+++ allegro-4.2.0/configure.in 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/configure.in 2006-03-11 23:27:31.000000000 +0100 @@ -713,7 +713,7 @@ AC_STRUCT_TM AC_TYPE_SIGNAL @@ -53,7 +53,7 @@ dnl Tweak header files for library build CFLAGS="$CFLAGS -DALLEGRO_LIB_BUILD" --- allegro-4.2.0/src/unix/usystem.c.mprotect 2005-09-04 18:00:17.000000000 +0200 -+++ allegro-4.2.0/src/unix/usystem.c 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/src/unix/usystem.c 2006-03-11 23:27:31.000000000 +0100 @@ -196,6 +196,9 @@ else if (!strcmp(utsn.sysname, "NetBSD")) { os_type = OSTYPE_NETBSD; @@ -65,7 +65,7 @@ || (!strcmp(utsn.sysname, "IRIX64"))) { os_type = OSTYPE_IRIX; --- allegro-4.2.0/src/unix/uesd.c.mprotect 2005-03-12 08:54:27.000000000 +0100 -+++ allegro-4.2.0/src/unix/uesd.c 2006-03-08 23:13:39.000000000 +0100 ++++ allegro-4.2.0/src/unix/uesd.c 2006-03-11 23:27:31.000000000 +0100 @@ -27,6 +27,7 @@ #include @@ -75,25 +75,31 @@ #include --- allegro-4.2.0/src/i386/istretch.c.mprotect 2005-03-15 19:02:22.000000000 +0100 -+++ allegro-4.2.0/src/i386/istretch.c 2006-03-08 23:14:52.000000000 +0100 -@@ -30,6 +30,10 @@ ++++ allegro-4.2.0/src/i386/istretch.c 2006-03-11 23:31:44.000000000 +0100 +@@ -30,6 +30,11 @@ #include "winalleg.h" /* For VirtualProtect */ #endif /* ifdef ALLEGRO_WINDOWS */ +#ifdef HAVE_MPROTECT + #include + #include ++ #include +#endif /* helper macro for generating stretchers in each color depth */ -@@ -435,7 +439,9 @@ +@@ -435,7 +440,14 @@ #ifdef ALLEGRO_WINDOWS /* Play nice with Windows executable memory protection */ VirtualProtect(_scratch_mem, _scratch_mem_size, PAGE_EXECUTE_READWRITE, &old_protect); - #endif /* ifdef ALLEGRO_WINDOWS */ + #elif defined(HAVE_MPROTECT) -+ mprotect(_scratch_mem, _scratch_mem_size, PROT_EXEC|PROT_READ|PROT_WRITE); ++ { ++ char *p = (char *)((unsigned long)_scratch_mem & ~(PAGE_SIZE-1ul)); ++ if (mprotect(p, _scratch_mem_size + ((char *)_scratch_mem - p), ++ PROT_EXEC|PROT_READ|PROT_WRITE)) ++ perror("allegro-error: mprotect failed during stretched blit!"); ++ } + #endif /* call the stretcher */ Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- allegro.spec 8 Mar 2006 22:15:11 -0000 1.27 +++ allegro.spec 11 Mar 2006 22:50:34 -0000 1.28 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 9 +Release: 10 Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -219,6 +219,11 @@ %changelog +* Sat Mar 11 2006 Hans de Goede 4.2.0-10 +- really fix asm stretch code on i386 with NX processors, on OpenBSD mprotects + first argument does not need to be page-aligned, but on Linux it does. + Note that for this to work you may also need to disable selinux (rh 185214) + * Wed Mar 8 2006 Hans de Goede 4.2.0-9 - fix fullscreen <-> window switching bug (bz 183645) - fix asm stretch code on i386 with NX processors, thanks to openBSD. From fedora-extras-commits at redhat.com Sun Mar 12 02:14:34 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Sat, 11 Mar 2006 21:14:34 -0500 Subject: rpms/perl-Module-Build/devel .cvsignore, 1.8, 1.9 perl-Module-Build.spec, 1.13, 1.14 sources, 1.8, 1.9 Message-ID: <200603120215.k2C2F75k010828@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-serv10803 Modified Files: .cvsignore perl-Module-Build.spec sources Log Message: Update to 0.2612. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 6 Jul 2005 05:36:18 -0000 1.8 +++ .cvsignore 12 Mar 2006 02:14:33 -0000 1.9 @@ -1 +1 @@ -Module-Build-0.2611.tar.gz +Module-Build-0.2612.tar.gz Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- perl-Module-Build.spec 6 Sep 2005 01:04:44 -0000 1.13 +++ perl-Module-Build.spec 12 Mar 2006 02:14:33 -0000 1.14 @@ -1,6 +1,6 @@ Name: perl-Module-Build -Version: 0.2611 -Release: 2%{?dist} +Version: 0.2612 +Release: 1%{?dist} Summary: Perl module for building and installing Perl modules Group: Development/Libraries License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Sat Mar 11 2006 Steven Pritchard - 0.2612-1 +- Update to 0.2612. + * Mon Sep 05 2005 Steven Pritchard - 0.2611-2 - Minor spec cleanup. - Add COPYING and Artistic. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 6 Jul 2005 05:36:18 -0000 1.8 +++ sources 12 Mar 2006 02:14:33 -0000 1.9 @@ -1 +1 @@ -d0fa9a7917ed43d1c1f8b707e86b6061 Module-Build-0.2611.tar.gz +fa1504741e9c931f75e804953c1d5417 Module-Build-0.2612.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 05:44:43 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:44:43 -0500 Subject: extras-buildsys/server main.py,1.18,1.19 Message-ID: <200603120544.k2C5ihfJ017064@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16976/server Modified Files: main.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- main.py 15 Feb 2006 17:03:30 -0000 1.18 +++ main.py 12 Mar 2006 05:44:35 -0000 1.19 @@ -19,6 +19,8 @@ import sys import os import socket +import signal +import time from plague import AuthedXMLRPCServer from plague import HTTPServer from plague import daemonize @@ -59,7 +61,16 @@ ################################################################# -if __name__ == '__main__': +bm_server = None + +def exit_handler(signum, frame): + global bm_server + print "Received SIGTERM, quitting..." + bm_server.stop() + +def main(): + global bm_server + usage = "Usage: %s [-p ] [-l ] [-d] [-c ]" % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, @@ -135,7 +146,7 @@ bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, port)) except socket.error, e: if e[0] == 98: # Address already in use - print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, UI_PORT) + print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, port) os._exit(1) bm_server.register_instance(ui) @@ -157,20 +168,30 @@ DebugUtils.registerThreadName(dummy) del dummy + # Set up our termination handler + signal.signal(signal.SIGTERM, exit_handler) + print "Build Server accepting requests on %s:%d.\n" % (hostname, port) + + # Serve requests until we're told to stop try: bm_server.serve_forever() except KeyboardInterrupt: - # Make sure the BuildMaster thread shuts down - print "Shutting down..." - bm.stop() - srpm_server.stop() - tbs.stop() + bm_server.server_close() + + # Make sure the BuildMaster thread shuts down + print "Shutting down..." + bm.stop() + srpm_server.stop() + tbs.stop() if opts.pidfile: os.unlink(opts.pidfile) + time.sleep(2) print "Done." os._exit(0) +if __name__ == '__main__': + main() From fedora-extras-commits at redhat.com Sun Mar 12 05:44:21 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:44:21 -0500 Subject: extras-buildsys ChangeLog,1.171,1.172 Message-ID: <200603120544.k2C5ipBV017067@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16976 Modified Files: ChangeLog Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- ChangeLog 26 Feb 2006 16:51:28 -0000 1.171 +++ ChangeLog 12 Mar 2006 05:44:12 -0000 1.172 @@ -1,3 +1,24 @@ +2006-03-12 Dan Williams + + * builder/builder.py + - Add a SIGTERM handler for clean shutdown + - Clean up lifecycle management + + * common/HTTPServer.py + - Clean up lifecycle management of PlgHTTPServerManager objects + + * common/SSLCommon.py + - Clean up lifecycle management of PlgBaseServer objects + - Initialize correct parent object in PlgBaseSSLServer.__init__ + + * etc/plague-builder.init + etc/plague-server.init + - Cleanups + + * server/main.py + - Add a SIGTERM handler for clean shutdown + - Clean up lifecycle management + 2006-02-26 Dan Williams * client/client.py From fedora-extras-commits at redhat.com Sun Mar 12 05:44:26 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:44:26 -0500 Subject: extras-buildsys/builder builder.py,1.51,1.52 Message-ID: <200603120544.k2C5iuAe017070@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16976/builder Modified Files: builder.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.51 retrieving revision 1.52 diff -u -r1.51 -r1.52 --- builder.py 19 Feb 2006 06:52:11 -0000 1.51 +++ builder.py 12 Mar 2006 05:44:19 -0000 1.52 @@ -29,6 +29,7 @@ import errno import exceptions import threading +import signal from plague import ArchUtils from plague import FileDownloader from plague import AuthedXMLRPCServer @@ -44,6 +45,10 @@ certs = {} build_arches = [] +def log(string): + sys.stdout.write(string) + sys.stdout.flush() + def get_hostname(cfg, bind_all): cfg_hostname = cfg.get_str("Network", "hostname") @@ -805,7 +810,16 @@ return max_jobs +bserver = None + +def exit_handler(signum, frame): + global bserver + log("Received SIGTERM, quitting...\n") + bserver.stop() + def main(): + global bserver + usage = "Usage: %s [-p ] [-l ] [-d] -c " % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, @@ -819,7 +833,7 @@ (opts, args) = parser.parse_args() if not opts.configfile: - print "Must specify a config file." + log("Must specify a config file.\n") sys.exit(1) # Load in the config @@ -834,18 +848,18 @@ build_arches = determine_build_arches(cfg) if not len(build_arches): - print "Cannot determine buildable arches for this builder. Exiting..." + log("Cannot determine buildable arches for this builder. Exiting...\n") sys.exit(1) cfg.load_target_configs(build_arches) if len(cfg.targets()) == 0: - print "No useable mock buildroots configured. Exiting..." + log("No useable mock buildroots configured. Exiting...\n") sys.exit(1) if opts.daemon: ret=daemonize.createDaemon() if ret: - print "Daemonizing failed!" + log("Daemonizing failed!\n") sys.exit(2) if opts.pidfile: @@ -861,7 +875,7 @@ work_dir = cfg.get_str("Directories", "builder_work_dir") if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): - print "%s does not exist or is not readable." % work_dir + log("%s does not exist or is not readable.\n" % work_dir) os._exit(1) # Start up the HTTP server thread which the build server @@ -880,44 +894,52 @@ pass os._exit(1) - print "Binding to address '%s' with arches: [%s]" % (hostname, string.join(build_arches, ",")) + log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ","))) xmlrpc_port = cfg.get_int("Network", "xmlrpc_port") try: if cfg.get_bool("SSL", "use_ssl") == True: - xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, certs) + bserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, certs) else: - xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) + bserver = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) except socket.error, e: if e[0] == 98: - print "Error: couldn't bind to address '%s:%s'. " \ - "Is the builder already running?" % (hostname, xmlrpc_port) + log("Error: couldn't bind to address '%s:%s'. " \ + "Is the builder already running?\n" % (hostname, xmlrpc_port)) os._exit(1) max_jobs = determine_max_jobs(cfg) bcs = XMLRPCBuilderServer(cfg, max_jobs) - xmlserver.register_instance(bcs) + bserver.register_instance(bcs) + + # Set up our termination handler + signal.signal(signal.SIGTERM, exit_handler) - last_time = time.time() try: - while True: - xmlserver.handle_request() + bserver.handle_request() except KeyboardInterrupt, e: - print "Shutting down..." - (building_jobs, free) = bcs.building_jobs() - for jobid in building_jobs.keys(): - bcs.die(jobid) - # wait for the jobs to clean up before quitting - while True: - (building_jobs, free) = bcs.building_jobs() - if len(building_jobs.keys()) == 0: - break - try: - print "Waiting for building jobs to stop" - time.sleep(1) - except KeyboardInterrupt: - break + bserver.server_close() + log("Shutting down...\n") http_server.stop() + + (building_jobs, free) = bcs.building_jobs() + for jobid in building_jobs.keys(): + bcs.die(jobid) + + # wait for the jobs to clean up before quitting + log("Waiting for running jobs to stop...") + while True: + (building_jobs, free) = bcs.building_jobs() + if len(building_jobs.keys()) == 0: + break + try: + log(".") + time.sleep(0.5) + except KeyboardInterrupt: + break + log(" done.\n"); + sys.stdout.flush() + time.sleep(2) os._exit(0) From fedora-extras-commits at redhat.com Sun Mar 12 05:44:32 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:44:32 -0500 Subject: extras-buildsys/common HTTPServer.py, 1.8, 1.9 SSLCommon.py, 1.12, 1.13 Message-ID: <200603120545.k2C5j2NH017076@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16976/common Modified Files: HTTPServer.py SSLCommon.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- HTTPServer.py 29 Nov 2005 06:41:46 -0000 1.8 +++ HTTPServer.py 12 Mar 2006 05:44:24 -0000 1.9 @@ -102,19 +102,17 @@ self._server = PlgHTTPSServer(addr, http_dir, certs) else: self._server = PlgHTTPServer(addr, http_dir) - self._stop = False self._stopped = False threading.Thread.__init__(self) self.setName("PlgHTTPServerManager: %s/%s" % (addr, http_dir)) def run(self): DebugUtils.registerThreadName(self) - while not self._stop: - self._server.handle_request() + self._server.serve_forever() self._stopped = True def stop(self): - self._stop = True + self._server.stop() t = time.time() while not self._stopped: if time.time() > t + 2: Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- SSLCommon.py 25 Nov 2005 04:45:07 -0000 1.12 +++ SSLCommon.py 12 Mar 2006 05:44:24 -0000 1.13 @@ -56,16 +56,17 @@ allow_reuse_address = 1 def __init__(self, server_addr, req_handler): + self._quit = False self.allow_reuse_address = 1 SocketServer.ThreadingTCPServer.__init__(self, server_addr, req_handler) + def stop(self): + self._quit = True + def serve_forever(self): - while True: - try: - self.handle_request() - except KeyboardInterrupt, e: - print "Shutting down..." - break + while not self._quit: + self.handle_request() + self.server_close() class PlgBaseSSLServer(PlgBaseServer): @@ -75,7 +76,7 @@ self._timeout = timeout self.ssl_ctx = CreateSSLContext(certs) - SocketServer.BaseServer.__init__(self, server_address, req_handler) + PlgBaseServer.__init__(self, server_address, req_handler) sock = socket.socket(self.address_family, self.socket_type) con = SSL.Connection(self.ssl_ctx, sock) From fedora-extras-commits at redhat.com Sun Mar 12 05:44:37 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:44:37 -0500 Subject: extras-buildsys/etc plague-builder.init, 1.9, 1.10 plague-server.init, 1.4, 1.5 Message-ID: <200603120545.k2C5j7eC017080@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16976/etc Modified Files: plague-builder.init plague-server.init Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plague-builder.init 16 Feb 2006 05:01:17 -0000 1.9 +++ plague-builder.init 12 Mar 2006 05:44:30 -0000 1.10 @@ -13,30 +13,34 @@ # Source function library. . /etc/init.d/functions -prog="plague-builder" +servicename="plague-builder" +processname="plague-builder" +pidfile=/var/run/plague-builder.pid +logfile=/var/log/plague-builder.log -if [ -f /etc/sysconfig/plague-builder ]; then -. /etc/sysconfig/plague-builder +if [ -f /etc/sysconfig/$servicename ]; then +. /etc/sysconfig/$servicename fi start() { - if [ ! -f /var/lock/subsys/plague-builder ]; then - echo -n $"Starting $prog: " - daemon plague-builder -c $CONFIG -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log - echo - touch /var/lock/subsys/plague-builder - return 0 + if [ ! -f /var/lock/subsys/$servicename ]; then + echo -n $"Starting $servicename: " + daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename fi } stop() { - if test "x`pidof -x plague-builder`" != x; then - echo -n $"Stopping $prog: " - killproc plague-builder + echo -n $"Stopping $servicename: " + killproc -p $pidfile $servicename + RETVAL=$? echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile fi - rm -f /var/lock/subsys/plague-builder - return 0 } restart() { @@ -45,25 +49,26 @@ } case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status plague-builder - ;; - restart) + start) + start + ;; + stop) + stop + ;; + status) + status -p $pidfile $processname + RETVAL=$? + ;; + restart) stop - start - ;; - condrestart) - [ -f /var/lock/subsys/plague-builder ] && restart || : - ;; - *) - echo "Usage: {start|stop|status|reload|restart[|probe]" - exit 1 - ;; + start + ;; + condrestart) + [ -f /var/lock/subsys/$servicename ] && restart || : + ;; + *) + echo "Usage: $0 {start|stop|status|reload|restart[|probe]" + exit 1 + ;; esac exit $? Index: plague-server.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- plague-server.init 16 Feb 2006 05:01:17 -0000 1.4 +++ plague-server.init 12 Mar 2006 05:44:30 -0000 1.5 @@ -13,30 +13,34 @@ # Source function library. . /etc/init.d/functions -prog="plague-server" +servicename="plague-server" +processname="plague-server" +pidfile=/var/run/plague-server.pid +logfile=/var/log/plague-server.log -if [ -f /etc/sysconfig/plague-server ]; then -. /etc/sysconfig/plague-server +if [ -f /etc/sysconfig/$servicename ]; then +. /etc/sysconfig/$servicename fi start() { - if [ ! -f /var/lock/subsys/plague-server ]; then - echo -n $"Starting $prog: " - daemon plague-server -c $CONFIG -d -p /var/run/plague-server.pid -l /var/log/plague-server.log - echo - touch /var/lock/subsys/plague-server - return 0 + if [ ! -f /var/lock/subsys/$servicename ]; then + echo -n $"Starting $servicename: " + daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename fi } stop() { - if test "x`pidof -x plague-server`" != x; then - echo -n $"Stopping $prog: " - killproc plague-server + echo -n $"Stopping $servicename: " + killproc -p $pidfile $servicename + RETVAL=$? echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile fi - rm -f /var/lock/subsys/plague-server - return 0 } restart() { @@ -45,25 +49,26 @@ } case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status plague-server - ;; - restart) - stop - start - ;; - condrestart) - [ -f /var/lock/subsys/plague-server ] && restart || : - ;; - *) - echo "Usage: {start|stop|status|reload|restart[|probe]" - exit 1 - ;; + start) + start + ;; + stop) + stop + ;; + status) + status -p $pidfile $processname + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + [ -f /var/lock/subsys/$servicename ] && restart || : + ;; + *) + echo "Usage: $0 {start|stop|status|reload|restart[|probe]" + exit 1 + ;; esac exit $? From fedora-extras-commits at redhat.com Sun Mar 12 05:53:20 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:53:20 -0500 Subject: extras-buildsys/server main.py,1.14.2.3,1.14.2.4 Message-ID: <200603120553.k2C5rK9J017176@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091/server Modified Files: Tag: STABLE_0_4 main.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.14.2.3 retrieving revision 1.14.2.4 diff -u -r1.14.2.3 -r1.14.2.4 --- main.py 15 Feb 2006 17:14:50 -0000 1.14.2.3 +++ main.py 12 Mar 2006 05:53:13 -0000 1.14.2.4 @@ -19,6 +19,8 @@ import sys import os import socket +import signal +import time from plague import AuthedXMLRPCServer from plague import HTTPServer from plague import daemonize @@ -59,7 +61,16 @@ ################################################################# -if __name__ == '__main__': +bm_server = None + +def exit_handler(signum, frame): + global bm_server + print "Received SIGTERM, quitting..." + bm_server.stop() + +def main(): + global bm_server + usage = "Usage: %s [-p ] [-l ] [-d] [-c ]" % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, @@ -135,7 +146,7 @@ bm_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, port)) except socket.error, e: if e[0] == 98: # Address already in use - print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, UI_PORT) + print "Error: couldn't bind to address '%s:%s'. Is the server already running?" % (hostname, port) os._exit(1) bm_server.register_instance(ui) @@ -157,20 +168,30 @@ DebugUtils.registerThreadName(dummy) del dummy + # Set up our termination handler + signal.signal(signal.SIGTERM, exit_handler) + print "Build Server accepting requests on %s:%d.\n" % (hostname, port) + + # Serve requests until we're told to stop try: bm_server.serve_forever() except KeyboardInterrupt: - # Make sure the BuildMaster thread shuts down - print "Shutting down..." - bm.stop() - srpm_server.stop() - tbs.stop() + bm_server.server_close() + + # Make sure the BuildMaster thread shuts down + print "Shutting down..." + bm.stop() + srpm_server.stop() + tbs.stop() if opts.pidfile: os.unlink(opts.pidfile) + time.sleep(2) print "Done." os._exit(0) +if __name__ == '__main__': + main() From fedora-extras-commits at redhat.com Sun Mar 12 05:52:56 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:52:56 -0500 Subject: extras-buildsys ChangeLog,1.126.2.41,1.126.2.42 Message-ID: <200603120553.k2C5rQq8017179@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091 Modified Files: Tag: STABLE_0_4 ChangeLog Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.41 retrieving revision 1.126.2.42 diff -u -r1.126.2.41 -r1.126.2.42 --- ChangeLog 26 Feb 2006 16:52:12 -0000 1.126.2.41 +++ ChangeLog 12 Mar 2006 05:52:48 -0000 1.126.2.42 @@ -1,3 +1,24 @@ +2006-03-12 Dan Williams + + * builder/builder.py + - Add a SIGTERM handler for clean shutdown + - Clean up lifecycle management + + * common/HTTPServer.py + - Clean up lifecycle management of PlgHTTPServerManager objects + + * common/SSLCommon.py + - Clean up lifecycle management of PlgBaseServer objects + - Initialize correct parent object in PlgBaseSSLServer.__init__ + + * etc/plague-builder.init + etc/plague-server.init + - Cleanups + + * server/main.py + - Add a SIGTERM handler for clean shutdown + - Clean up lifecycle management + 2006-02-26 Dan Williams * client/client.py From fedora-extras-commits at redhat.com Sun Mar 12 05:53:01 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:53:01 -0500 Subject: extras-buildsys/builder builder.py,1.44.2.7,1.44.2.8 Message-ID: <200603120553.k2C5rVkY017182@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091/builder Modified Files: Tag: STABLE_0_4 builder.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.44.2.7 retrieving revision 1.44.2.8 diff -u -r1.44.2.7 -r1.44.2.8 --- builder.py 19 Feb 2006 06:57:21 -0000 1.44.2.7 +++ builder.py 12 Mar 2006 05:52:54 -0000 1.44.2.8 @@ -29,6 +29,7 @@ import errno import exceptions import threading +import signal from plague import ArchUtils from plague import FileDownloader from plague import AuthedXMLRPCServer @@ -44,6 +45,10 @@ certs = {} build_arches = [] +def log(string): + sys.stdout.write(string) + sys.stdout.flush() + def get_hostname(cfg, bind_all): cfg_hostname = cfg.get_str("Network", "hostname") @@ -805,7 +810,16 @@ return max_jobs +bserver = None + +def exit_handler(signum, frame): + global bserver + log("Received SIGTERM, quitting...\n") + bserver.stop() + def main(): + global bserver + usage = "Usage: %s [-p ] [-l ] [-d] -c " % sys.argv[0] parser = OptionParser(usage=usage) parser.add_option("-p", "--pidfile", default=None, @@ -819,7 +833,7 @@ (opts, args) = parser.parse_args() if not opts.configfile: - print "Must specify a config file." + log("Must specify a config file.\n") sys.exit(1) # Load in the config @@ -834,18 +848,18 @@ build_arches = determine_build_arches(cfg) if not len(build_arches): - print "Cannot determine buildable arches for this builder. Exiting..." + log("Cannot determine buildable arches for this builder. Exiting...\n") sys.exit(1) cfg.load_target_configs(build_arches) if len(cfg.targets()) == 0: - print "No useable mock buildroots configured. Exiting..." + log("No useable mock buildroots configured. Exiting...\n") sys.exit(1) if opts.daemon: ret=daemonize.createDaemon() if ret: - print "Daemonizing failed!" + log("Daemonizing failed!\n") sys.exit(2) if opts.pidfile: @@ -861,7 +875,7 @@ work_dir = cfg.get_str("Directories", "builder_work_dir") if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK): - print "%s does not exist or is not readable." % work_dir + log("%s does not exist or is not readable.\n" % work_dir) os._exit(1) # Start up the HTTP server thread which the build server @@ -880,44 +894,52 @@ pass os._exit(1) - print "Binding to address '%s' with arches: [%s]" % (hostname, string.join(build_arches, ",")) + log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ","))) xmlrpc_port = cfg.get_int("Network", "xmlrpc_port") try: if cfg.get_bool("SSL", "use_ssl") == True: - xmlserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, certs) + bserver = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, certs) else: - xmlserver = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) + bserver = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None) except socket.error, e: if e[0] == 98: - print "Error: couldn't bind to address '%s:%s'. " \ - "Is the builder already running?" % (hostname, xmlrpc_port) + log("Error: couldn't bind to address '%s:%s'. " \ + "Is the builder already running?\n" % (hostname, xmlrpc_port)) os._exit(1) max_jobs = determine_max_jobs(cfg) bcs = XMLRPCBuilderServer(cfg, max_jobs) - xmlserver.register_instance(bcs) + bserver.register_instance(bcs) + + # Set up our termination handler + signal.signal(signal.SIGTERM, exit_handler) - last_time = time.time() try: - while True: - xmlserver.handle_request() + bserver.handle_request() except KeyboardInterrupt, e: - print "Shutting down..." - (building_jobs, free) = bcs.building_jobs() - for jobid in building_jobs.keys(): - bcs.die(jobid) - # wait for the jobs to clean up before quitting - while True: - (building_jobs, free) = bcs.building_jobs() - if len(building_jobs.keys()) == 0: - break - try: - print "Waiting for building jobs to stop" - time.sleep(1) - except KeyboardInterrupt: - break + bserver.server_close() + log("Shutting down...\n") http_server.stop() + + (building_jobs, free) = bcs.building_jobs() + for jobid in building_jobs.keys(): + bcs.die(jobid) + + # wait for the jobs to clean up before quitting + log("Waiting for running jobs to stop...") + while True: + (building_jobs, free) = bcs.building_jobs() + if len(building_jobs.keys()) == 0: + break + try: + log(".") + time.sleep(0.5) + except KeyboardInterrupt: + break + log(" done.\n"); + sys.stdout.flush() + time.sleep(2) os._exit(0) From fedora-extras-commits at redhat.com Sun Mar 12 05:53:07 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:53:07 -0500 Subject: extras-buildsys/common HTTPServer.py, 1.6.2.2, 1.6.2.3 SSLCommon.py, 1.10.4.2, 1.10.4.3 Message-ID: <200603120553.k2C5rbRd017186@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091/common Modified Files: Tag: STABLE_0_4 HTTPServer.py SSLCommon.py Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -r1.6.2.2 -r1.6.2.3 --- HTTPServer.py 29 Nov 2005 06:36:38 -0000 1.6.2.2 +++ HTTPServer.py 12 Mar 2006 05:52:59 -0000 1.6.2.3 @@ -102,19 +102,17 @@ self._server = PlgHTTPSServer(addr, http_dir, certs) else: self._server = PlgHTTPServer(addr, http_dir) - self._stop = False self._stopped = False threading.Thread.__init__(self) self.setName("PlgHTTPServerManager: %s/%s" % (addr, http_dir)) def run(self): DebugUtils.registerThreadName(self) - while not self._stop: - self._server.handle_request() + self._server.serve_forever() self._stopped = True def stop(self): - self._stop = True + self._server.stop() t = time.time() while not self._stopped: if time.time() > t + 2: Index: SSLCommon.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/SSLCommon.py,v retrieving revision 1.10.4.2 retrieving revision 1.10.4.3 diff -u -r1.10.4.2 -r1.10.4.3 --- SSLCommon.py 24 Nov 2005 22:32:02 -0000 1.10.4.2 +++ SSLCommon.py 12 Mar 2006 05:52:59 -0000 1.10.4.3 @@ -56,16 +56,17 @@ allow_reuse_address = 1 def __init__(self, server_addr, req_handler): + self._quit = False self.allow_reuse_address = 1 SocketServer.ThreadingTCPServer.__init__(self, server_addr, req_handler) + def stop(self): + self._quit = True + def serve_forever(self): - while True: - try: - self.handle_request() - except KeyboardInterrupt, e: - print "Shutting down..." - break + while not self._quit: + self.handle_request() + self.server_close() class PlgBaseSSLServer(PlgBaseServer): @@ -75,7 +76,7 @@ self._timeout = timeout self.ssl_ctx = CreateSSLContext(certs) - SocketServer.BaseServer.__init__(self, server_address, req_handler) + PlgBaseServer.__init__(self, server_address, req_handler) sock = socket.socket(self.address_family, self.socket_type) con = SSL.Connection(self.ssl_ctx, sock) From fedora-extras-commits at redhat.com Sun Mar 12 05:53:15 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 00:53:15 -0500 Subject: extras-buildsys/etc plague-builder.init, 1.7.2.2, 1.7.2.3 plague-server.init, 1.2.2.2, 1.2.2.3 Message-ID: <200603120553.k2C5rjmg017190@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/etc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091/etc Modified Files: Tag: STABLE_0_4 plague-builder.init plague-server.init Log Message: 2006-03-12 Dan Williams * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management * common/HTTPServer.py - Clean up lifecycle management of PlgHTTPServerManager objects * common/SSLCommon.py - Clean up lifecycle management of PlgBaseServer objects - Initialize correct parent object in PlgBaseSSLServer.__init__ * etc/plague-builder.init etc/plague-server.init - Cleanups * server/main.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management Index: plague-builder.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -u -r1.7.2.2 -r1.7.2.3 --- plague-builder.init 16 Feb 2006 06:14:46 -0000 1.7.2.2 +++ plague-builder.init 12 Mar 2006 05:53:05 -0000 1.7.2.3 @@ -13,30 +13,34 @@ # Source function library. . /etc/init.d/functions -prog="plague-builder" +servicename="plague-builder" +processname="plague-builder" +pidfile=/var/run/plague-builder.pid +logfile=/var/log/plague-builder.log -if [ -f /etc/sysconfig/plague-builder ]; then -. /etc/sysconfig/plague-builder +if [ -f /etc/sysconfig/$servicename ]; then +. /etc/sysconfig/$servicename fi start() { - if [ ! -f /var/lock/subsys/plague-builder ]; then - echo -n $"Starting $prog: " - daemon plague-builder -c $CONFIG -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log - echo - touch /var/lock/subsys/plague-builder - return 0 + if [ ! -f /var/lock/subsys/$servicename ]; then + echo -n $"Starting $servicename: " + daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename fi } stop() { - if test "x`pidof -x plague-builder`" != x; then - echo -n $"Stopping $prog: " - killproc plague-builder + echo -n $"Stopping $servicename: " + killproc -p $pidfile $servicename + RETVAL=$? echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile fi - rm -f /var/lock/subsys/plague-builder - return 0 } restart() { @@ -45,25 +49,26 @@ } case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status plague-builder - ;; - restart) + start) + start + ;; + stop) + stop + ;; + status) + status -p $pidfile $processname + RETVAL=$? + ;; + restart) stop - start - ;; - condrestart) - [ -f /var/lock/subsys/plague-builder ] && restart || : - ;; - *) - echo "Usage: {start|stop|status|reload|restart[|probe]" - exit 1 - ;; + start + ;; + condrestart) + [ -f /var/lock/subsys/$servicename ] && restart || : + ;; + *) + echo "Usage: $0 {start|stop|status|reload|restart[|probe]" + exit 1 + ;; esac exit $? Index: plague-server.init =================================================================== RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -u -r1.2.2.2 -r1.2.2.3 --- plague-server.init 16 Feb 2006 06:14:46 -0000 1.2.2.2 +++ plague-server.init 12 Mar 2006 05:53:05 -0000 1.2.2.3 @@ -13,30 +13,34 @@ # Source function library. . /etc/init.d/functions -prog="plague-server" +servicename="plague-server" +processname="plague-server" +pidfile=/var/run/plague-server.pid +logfile=/var/log/plague-server.log -if [ -f /etc/sysconfig/plague-server ]; then -. /etc/sysconfig/plague-server +if [ -f /etc/sysconfig/$servicename ]; then +. /etc/sysconfig/$servicename fi start() { - if [ ! -f /var/lock/subsys/plague-server ]; then - echo -n $"Starting $prog: " - daemon plague-server -c $CONFIG -d -p /var/run/plague-server.pid -l /var/log/plague-server.log - echo - touch /var/lock/subsys/plague-server - return 0 + if [ ! -f /var/lock/subsys/$servicename ]; then + echo -n $"Starting $servicename: " + daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename fi } stop() { - if test "x`pidof -x plague-server`" != x; then - echo -n $"Stopping $prog: " - killproc plague-server + echo -n $"Stopping $servicename: " + killproc -p $pidfile $servicename + RETVAL=$? echo + if [ $RETVAL -eq 0 ]; then + rm -f /var/lock/subsys/$servicename + rm -f $pidfile fi - rm -f /var/lock/subsys/plague-server - return 0 } restart() { @@ -45,25 +49,26 @@ } case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status plague-server - ;; - restart) - stop - start - ;; - condrestart) - [ -f /var/lock/subsys/plague-server ] && restart || : - ;; - *) - echo "Usage: {start|stop|status|reload|restart[|probe]" - exit 1 - ;; + start) + start + ;; + stop) + stop + ;; + status) + status -p $pidfile $processname + RETVAL=$? + ;; + restart) + stop + start + ;; + condrestart) + [ -f /var/lock/subsys/$servicename ] && restart || : + ;; + *) + echo "Usage: $0 {start|stop|status|reload|restart[|probe]" + exit 1 + ;; esac exit $? From fedora-extras-commits at redhat.com Sun Mar 12 09:42:54 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Sun, 12 Mar 2006 04:42:54 -0500 Subject: rpms/amaya/devel amaya.spec,1.23,1.24 Message-ID: <200603120943.k2C9hQgs029457@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amaya/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29440 Modified Files: amaya.spec Log Message: fix symlink (bug #184503) Index: amaya.spec =================================================================== RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- amaya.spec 22 Feb 2006 22:49:45 -0000 1.23 +++ amaya.spec 12 Mar 2006 09:42:53 -0000 1.24 @@ -1,6 +1,6 @@ Name: amaya Version: 9.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: W3C's browser/web authoring tool Group: Applications/Internet @@ -43,8 +43,8 @@ export CFLAGS="$RPM_OPT_FLAGS" ../configure --enable-bookmarks \ --prefix=%_libdir \ - --bindir=%_bindir \ - --exec_prefix=%_exec_prefix \ + --bindir=%_bindir \ + --exec_prefix=%_exec_prefix \ --libdir=%_libdir \ --with-gtk make @@ -64,7 +64,8 @@ # fix up symlinks pushd ${RPM_BUILD_ROOT}%{_bindir} >/dev/null rm -f amaya* -ln -s %{_libdir}/Amaya-*/gtk/bin/amaya amaya-gtk +amayadir=`ls -d ${RPM_BUILD_ROOT}%{_libdir}/Amaya-*` +ln -s %{_libdir}/`basename $amayadir`/gtk/bin/amaya amaya-gtk ln -s amaya-gtk amaya popd >/dev/null @@ -102,6 +103,9 @@ %{_datadir}/pixmaps/* %changelog +* Sun Mar 12 2006 Aurelien Bompard 9.1-12 +- fix symlink (bug #184503) + * Wed Feb 22 2006 Aurelien Bompard 9.1-11 - give up on x86_64 and excludearch it From fedora-extras-commits at redhat.com Sun Mar 12 11:44:30 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 12 Mar 2006 06:44:30 -0500 Subject: rpms/lrmi/devel .cvsignore, 1.3, 1.4 lrmi.spec, 1.7, 1.8 sources, 1.3, 1.4 lrmi-0.9-asm.patch, 1.1, NONE Message-ID: <200603121145.k2CBj3OD001252@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lrmi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1229 Modified Files: .cvsignore lrmi.spec sources Removed Files: lrmi-0.9-asm.patch Log Message: * Sun Mar 12 2006 Ville Skytt?? - 0.10-1 - 0.10, asm patch applied upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/lrmi/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Nov 2005 17:57:01 -0000 1.3 +++ .cvsignore 12 Mar 2006 11:44:29 -0000 1.4 @@ -1 +1 @@ -lrmi-0.9.tar.gz +lrmi-0.10.tar.gz Index: lrmi.spec =================================================================== RCS file: /cvs/extras/rpms/lrmi/devel/lrmi.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- lrmi.spec 4 Dec 2005 18:23:51 -0000 1.7 +++ lrmi.spec 12 Mar 2006 11:44:29 -0000 1.8 @@ -1,6 +1,6 @@ Name: lrmi -Version: 0.9 -Release: 2%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: Library for calling real mode BIOS routines Group: System Environment/Libraries @@ -8,7 +8,6 @@ URL: http://sourceforge.net/projects/lrmi/ Source0: http://download.sourceforge.net/lrmi/%{name}-%{version}.tar.gz Patch0: %{name}-0.9-build.patch -Patch1: %{name}-0.9-asm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} @@ -37,7 +36,6 @@ %prep %setup -q %patch0 -%patch1 %build @@ -77,6 +75,9 @@ %changelog +* Sun Mar 12 2006 Ville Skytt?? - 0.10-1 +- 0.10, asm patch applied upstream. + * Sun Dec 4 2005 Ville Skytt?? - 0.9-2 - Fix build with new binutils. Index: sources =================================================================== RCS file: /cvs/extras/rpms/lrmi/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Nov 2005 17:57:01 -0000 1.3 +++ sources 12 Mar 2006 11:44:29 -0000 1.4 @@ -1 +1 @@ -00c2d0e4f4848100c04d8f88591cb943 lrmi-0.9.tar.gz +fc1d9495e8f4563fca471bb65f34a5da lrmi-0.10.tar.gz --- lrmi-0.9-asm.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 12 11:46:19 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 12 Mar 2006 06:46:19 -0500 Subject: rpms/xosd/devel xosd.spec,1.10,1.11 Message-ID: <200603121146.k2CBkpXN001318@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xosd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1301 Modified Files: xosd.spec Log Message: * Sun Mar 12 2006 Ville Skytt?? - 2.2.14-5 - Convert docs to UTF-8. Index: xosd.spec =================================================================== RCS file: /cvs/extras/rpms/xosd/devel/xosd.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- xosd.spec 17 Nov 2005 16:54:03 -0000 1.10 +++ xosd.spec 12 Mar 2006 11:46:18 -0000 1.11 @@ -5,7 +5,7 @@ Name: xosd Version: 2.2.14 -Release: 4%{?dist} +Release: 5%{?dist} Summary: On-screen display library for X Group: System Environment/Libraries @@ -72,6 +72,9 @@ %setup -q %patch0 -p0 %patch1 -p1 +for f in ChangeLog man/xosd_{create,destroy,display,is_onscreen,set_bar_length}.3 ; do + iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f +done %build @@ -125,6 +128,9 @@ %changelog +* Sun Mar 12 2006 Ville Skytt?? - 2.2.14-5 +- Convert docs to UTF-8. + * Thu Nov 17 2005 Ville Skytt?? - 2.2.14-4 - Adapt to modular X packaging. - Don't ship static libraries by default. From fedora-extras-commits at redhat.com Sun Mar 12 11:54:40 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 12 Mar 2006 06:54:40 -0500 Subject: rpms/s3switch/devel s3switch.spec,1.7,1.8 Message-ID: <200603121155.k2CBtCDu001419@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/s3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1402 Modified Files: s3switch.spec Log Message: * Sun Mar 12 2006 Ville Skytt?? - 0.0-7.20020912 - Rebuild. Index: s3switch.spec =================================================================== RCS file: /cvs/extras/rpms/s3switch/devel/s3switch.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- s3switch.spec 6 Apr 2005 22:13:31 -0000 1.7 +++ s3switch.spec 12 Mar 2006 11:54:40 -0000 1.8 @@ -1,7 +1,6 @@ Name: s3switch Version: 0.0 -Release: 6.20020912 - +Release: 7.20020912%{?dist} Summary: Manage the output device on S3 Savage chips Group: Applications/System @@ -16,8 +15,8 @@ Patch3: %{name}-lrmi.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: lrmi-devel ExclusiveArch: %{ix86} +BuildRequires: lrmi-devel Requires: %{_bindir}/consolehelper %description @@ -73,7 +72,10 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Sun Mar 12 2006 Ville Skytt?? - 0.0-7.20020912 +- Rebuild. + +* Fri Apr 7 2005 Michael Schwendt - 0.0-6.20020912 - rebuilt * Fri Jul 23 2004 Ville Skytt?? 0:0.0-0.fdr.5.20020912 From fedora-extras-commits at redhat.com Sun Mar 12 12:02:27 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 12 Mar 2006 07:02:27 -0500 Subject: rpms/tpb/devel tpb.spec,1.10,1.11 Message-ID: <200603121202.k2CC2xDP003422@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/tpb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3405 Modified Files: tpb.spec Log Message: * Sun Mar 12 2006 Ville Skytt?? - 0.6.4-3 - Rebuild. Index: tpb.spec =================================================================== RCS file: /cvs/extras/rpms/tpb/devel/tpb.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tpb.spec 19 Nov 2005 17:55:44 -0000 1.10 +++ tpb.spec 12 Mar 2006 12:02:26 -0000 1.11 @@ -1,6 +1,6 @@ Name: tpb Version: 0.6.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: ThinkPad button support utility Group: System Environment/Base @@ -99,6 +99,9 @@ %changelog +* Sun Mar 12 2006 Ville Skytt?? - 0.6.4-3 +- Rebuild. + * Thu Nov 17 2005 Ville Skytt?? - 0.6.4-2 - Adapt to modular X packaging. From fedora-extras-commits at redhat.com Sun Mar 12 12:04:20 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 12 Mar 2006 07:04:20 -0500 Subject: rpms/ks3switch/devel ks3switch.spec,1.2,1.3 Message-ID: <200603121204.k2CC4tZt003491@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/ks3switch/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3473 Modified Files: ks3switch.spec Log Message: * Sun Mar 12 2006 Ville Skytt?? - 0.1-2 - Rebuild. Index: ks3switch.spec =================================================================== RCS file: /cvs/extras/rpms/ks3switch/devel/ks3switch.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ks3switch.spec 20 Sep 2005 20:41:20 -0000 1.2 +++ ks3switch.spec 12 Mar 2006 12:04:20 -0000 1.3 @@ -1,6 +1,6 @@ Name: ks3switch Version: 0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE utility for managing the output device on S3 Savage chips Group: Applications/System @@ -11,11 +11,11 @@ Patch1: %{name}-exec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# ExclusiveArch due to s3switch availability +ExclusiveArch: %{ix86} BuildRequires: kdelibs-devel BuildRequires: desktop-file-utils Requires: s3switch -# ExclusiveArch due to s3switch availability -ExclusiveArch: %{ix86} %description KS3switch is a KDE frontend to s3switch, the utility for managing the @@ -68,6 +68,9 @@ %changelog +* Sun Mar 12 2006 Ville Skytt?? - 0.1-2 +- Rebuild. + * Tue Sep 20 2005 Ville Skytt?? - 0.1-1 - Fix desktop entry categories (#165464). - Tidy up build dependencies. From fedora-extras-commits at redhat.com Sun Mar 12 13:24:11 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Sun, 12 Mar 2006 08:24:11 -0500 Subject: rpms/camstream/devel camstream.spec,1.10,1.11 Message-ID: <200603121324.k2CDOhV7006114@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/camstream/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6097 Modified Files: camstream.spec Log Message: * Sat Mar 11 2006 Simon Perreault - 0.26.3-9 - Taking ownership of package. - Fixed build dependencies (#178654). Index: camstream.spec =================================================================== RCS file: /cvs/extras/rpms/camstream/devel/camstream.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- camstream.spec 26 Feb 2006 07:51:53 -0000 1.10 +++ camstream.spec 12 Mar 2006 13:24:10 -0000 1.11 @@ -1,6 +1,6 @@ Name: camstream Version: 0.26.3 -Release: 8 +Release: 9%{?dist} Summary: Set of programs to make use of your webcam @@ -14,8 +14,7 @@ Patch1: %{name}-%{version}-x86_64-asm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: qt-devel, libjpeg-devel, libpng-devel, autoconf, XFree86-devel -BuildRequires: desktop-file-utils +BuildRequires: qt-devel, autoconf, desktop-file-utils ExclusiveArch: %{ix86} x86_64 %description @@ -26,13 +25,6 @@ %prep -cat< - 0.26.3-9 +- Taking ownership of package. +- Fixed build dependencies (#178654). + * Wed May 25 2005 Colin Charles - 0.26.3-8 - remove ppc (ExclusiveArch x86/x86_64), as there's x86 assembly in video_asm.S that would require porting (#158652) From fedora-extras-commits at redhat.com Sun Mar 12 13:29:50 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:29:50 -0500 Subject: rpms/ushare import.log,1.7,1.8 Message-ID: <200603121330.k2CDUMIl006238@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6202 Modified Files: import.log Log Message: auto-import ushare-0.9.7-1 on branch devel from ushare-0.9.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ushare/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 19 Feb 2006 17:19:33 -0000 1.7 +++ import.log 12 Mar 2006 13:29:50 -0000 1.8 @@ -4,3 +4,4 @@ ushare-0_9_6-1:HEAD:ushare-0.9.6-1.src.rpm:1140369356 ushare-0_9_6-1:FC-3:ushare-0.9.6-1.src.rpm:1140369459 ushare-0_9_6-1:FC-4:ushare-0.9.6-1.src.rpm:1140369564 +ushare-0_9_7-1:HEAD:ushare-0.9.7-1.src.rpm:1142170180 From fedora-extras-commits at redhat.com Sun Mar 12 13:29:56 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:29:56 -0500 Subject: rpms/ushare/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ushare.spec, 1.5, 1.6 Message-ID: <200603121330.k2CDUST5006243@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6202/devel Modified Files: .cvsignore sources ushare.spec Log Message: auto-import ushare-0.9.7-1 on branch devel from ushare-0.9.7-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ushare/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Feb 2006 17:16:12 -0000 1.3 +++ .cvsignore 12 Mar 2006 13:29:56 -0000 1.4 @@ -1 +1 @@ -ushare-0.9.6.tar.bz2 +ushare-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ushare/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2006 17:16:12 -0000 1.3 +++ sources 12 Mar 2006 13:29:56 -0000 1.4 @@ -1 +1 @@ -05312707a1fd241dfd44ad78508207eb ushare-0.9.6.tar.bz2 +e978c648f808cf1740b1583a78b922ff ushare-0.9.7.tar.bz2 Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/devel/ushare.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ushare.spec 6 Mar 2006 17:13:08 -0000 1.5 +++ ushare.spec 12 Mar 2006 13:29:56 -0000 1.6 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.6 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,8 +68,8 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog -* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 -- Rebuild with libupnp-1.3.1 +* Sun Mar 12 2006 Eric Tanguy - 0.9.7-1 +- Update to 0.9.7 * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Sun Mar 12 13:31:22 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:31:22 -0500 Subject: rpms/ushare import.log,1.8,1.9 Message-ID: <200603121331.k2CDVs6d006340@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6306 Modified Files: import.log Log Message: auto-import ushare-0.9.7-1 on branch FC-3 from ushare-0.9.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ushare/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 12 Mar 2006 13:29:50 -0000 1.8 +++ import.log 12 Mar 2006 13:31:22 -0000 1.9 @@ -5,3 +5,4 @@ ushare-0_9_6-1:FC-3:ushare-0.9.6-1.src.rpm:1140369459 ushare-0_9_6-1:FC-4:ushare-0.9.6-1.src.rpm:1140369564 ushare-0_9_7-1:HEAD:ushare-0.9.7-1.src.rpm:1142170180 +ushare-0_9_7-1:FC-3:ushare-0.9.7-1.src.rpm:1142170272 From fedora-extras-commits at redhat.com Sun Mar 12 13:31:28 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:31:28 -0500 Subject: rpms/ushare/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ushare.spec, 1.3, 1.4 Message-ID: <200603121332.k2CDW04Z006345@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6306/FC-3 Modified Files: .cvsignore sources ushare.spec Log Message: auto-import ushare-0.9.7-1 on branch FC-3 from ushare-0.9.7-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Feb 2006 17:18:07 -0000 1.3 +++ .cvsignore 12 Mar 2006 13:31:27 -0000 1.4 @@ -1 +1 @@ -ushare-0.9.6.tar.bz2 +ushare-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2006 17:18:07 -0000 1.3 +++ sources 12 Mar 2006 13:31:27 -0000 1.4 @@ -1 +1 @@ -05312707a1fd241dfd44ad78508207eb ushare-0.9.6.tar.bz2 +e978c648f808cf1740b1583a78b922ff ushare-0.9.7.tar.bz2 Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-3/ushare.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ushare.spec 6 Mar 2006 17:16:10 -0000 1.3 +++ ushare.spec 12 Mar 2006 13:31:27 -0000 1.4 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.6 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,8 +68,8 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog -* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 -- Rebuild with libupnp-1.3.1 +* Sun Mar 12 2006 Eric Tanguy - 0.9.7-1 +- Update to 0.9.7 * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Sun Mar 12 13:32:48 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:32:48 -0500 Subject: rpms/ushare import.log,1.9,1.10 Message-ID: <200603121333.k2CDXLeC006441@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6407 Modified Files: import.log Log Message: auto-import ushare-0.9.7-1 on branch FC-4 from ushare-0.9.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ushare/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 12 Mar 2006 13:31:22 -0000 1.9 +++ import.log 12 Mar 2006 13:32:48 -0000 1.10 @@ -6,3 +6,4 @@ ushare-0_9_6-1:FC-4:ushare-0.9.6-1.src.rpm:1140369564 ushare-0_9_7-1:HEAD:ushare-0.9.7-1.src.rpm:1142170180 ushare-0_9_7-1:FC-3:ushare-0.9.7-1.src.rpm:1142170272 +ushare-0_9_7-1:FC-4:ushare-0.9.7-1.src.rpm:1142170359 From fedora-extras-commits at redhat.com Sun Mar 12 13:32:54 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Sun, 12 Mar 2006 08:32:54 -0500 Subject: rpms/ushare/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 ushare.spec, 1.3, 1.4 Message-ID: <200603121333.k2CDXQdo006446@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ushare/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6407/FC-4 Modified Files: .cvsignore sources ushare.spec Log Message: auto-import ushare-0.9.7-1 on branch FC-4 from ushare-0.9.7-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Feb 2006 17:19:39 -0000 1.3 +++ .cvsignore 12 Mar 2006 13:32:54 -0000 1.4 @@ -1 +1 @@ -ushare-0.9.6.tar.bz2 +ushare-0.9.7.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Feb 2006 17:19:39 -0000 1.3 +++ sources 12 Mar 2006 13:32:54 -0000 1.4 @@ -1 +1 @@ -05312707a1fd241dfd44ad78508207eb ushare-0.9.6.tar.bz2 +e978c648f808cf1740b1583a78b922ff ushare-0.9.7.tar.bz2 Index: ushare.spec =================================================================== RCS file: /cvs/extras/rpms/ushare/FC-4/ushare.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- ushare.spec 6 Mar 2006 17:17:04 -0000 1.3 +++ ushare.spec 12 Mar 2006 13:32:54 -0000 1.4 @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.6 -Release: 2%{?dist} +Version: 0.9.7 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,8 +68,8 @@ %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog -* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 -- Rebuild with libupnp-1.3.1 +* Sun Mar 12 2006 Eric Tanguy - 0.9.7-1 +- Update to 0.9.7 * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From fedora-extras-commits at redhat.com Sun Mar 12 13:43:47 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 08:43:47 -0500 Subject: extras-buildsys/server BuildMaster.py, 1.37, 1.38 DBManager.py, 1.5, 1.6 UserInterface.py, 1.60, 1.61 Message-ID: <200603121343.k2CDhlFh006660@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6621/server Modified Files: BuildMaster.py DBManager.py UserInterface.py Log Message: 2006-03-12 Dan Williams * server/BuildMaster.py server/DBManager.py server/UserInterface.py - Prefix 'epoch', 'version', and 'release' database fields with 'rpm_', since MySQL 5 added 'release' as a reserved word. Bastards. Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- BuildMaster.py 29 Nov 2005 06:41:51 -0000 1.37 +++ BuildMaster.py 12 Mar 2006 13:43:40 -0000 1.38 @@ -239,7 +239,7 @@ def _write_job_status_to_db(self, uid, attrdict): sql = "status='%s'" % attrdict['status'] if attrdict.has_key('epoch') and attrdict.has_key('version') and attrdict.has_key('release'): - sql = sql + ", epoch='%s', version='%s', release='%s'" % (attrdict['epoch'], + sql = sql + ", rpm_epoch='%s', rpm_version='%s', rpm_release='%s'" % (attrdict['epoch'], attrdict['version'], attrdict['release']) if attrdict.has_key('result_msg'): import urllib Index: DBManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/DBManager.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- DBManager.py 25 Nov 2005 22:10:18 -0000 1.5 +++ DBManager.py 12 Mar 2006 13:43:40 -0000 1.6 @@ -312,8 +312,11 @@ dbcx = self.dbcx() if not dbcx: os._exit(1) - self._ensure_tables(dbcx) + (success, msg) = self._ensure_tables(dbcx) del dbcx + if not success: + print msg + os._exit(1) def dbcx(self): try: @@ -321,7 +324,6 @@ except StandardError, e: dbcx = None print "DB Error: %s" % e - return dbcx def _ensure_tables(self, dbcx): @@ -348,16 +350,15 @@ 'endtime BIGINT, ' \ 'status VARCHAR(20), ' \ 'result VARCHAR(15), ' \ - 'epoch VARCHAR(4), ' \ - 'version VARCHAR(25), ' \ - 'release VARCHAR(25), ' \ + 'rpm_epoch VARCHAR(4), ' \ + 'rpm_version VARCHAR(25), ' \ + 'rpm_release VARCHAR(25), ' \ 'archlist VARCHAR(75), ' \ 'result_msg TEXT' \ ')' % uid_type) dbcx.commit() except StandardError, e: - print "Could not access the job database. Reason: '%s'. Exiting..." % e - os._exit(1) + return (False, "Could not access the job database. Reason: '%s'. Exiting..." % e) # Create the archjobs table try: @@ -378,8 +379,7 @@ ')') dbcx.commit() except StandardError, e: - print "Could not access the job database. Reason: '%s'. Exiting..." % e - os._exit(1) + return (False, "Could not access the job database. Reason: '%s'. Exiting..." % e) # Create the users table try: @@ -397,6 +397,8 @@ ')') dbcx.commit() except StandardError, e: - print "Could not access the user database. Reason: '%s'. Exiting..." % e - os._exit(1) + return (False, "Could not access the user database. Reason: '%s'. Exiting..." % e) + + return (True, "") + Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.60 retrieving revision 1.61 diff -u -r1.60 -r1.61 --- UserInterface.py 28 Nov 2005 17:51:05 -0000 1.60 +++ UserInterface.py 12 Mar 2006 13:43:40 -0000 1.61 @@ -376,7 +376,7 @@ return (-1, "Error: Invalid job UID.", {}) sql = 'SELECT uid, username, package, source, target_distro, target_target, ' \ - 'target_repo, starttime, endtime, status, epoch, version, release, ' \ + 'target_repo, starttime, endtime, status, rpm_epoch, rpm_version, rpm_release, ' \ 'archlist, result_msg FROM jobs WHERE uid=%d' % uid # Run the query for the job @@ -402,10 +402,10 @@ jobrec['starttime'] = job['starttime'] jobrec['endtime'] = job['endtime'] jobrec['status'] = job['status'] - if job['epoch'] and job['version'] and job['release']: - jobrec['epoch'] = job['epoch'] - jobrec['version'] = job['version'] - jobrec['release'] = job['release'] + if job['rpm_epoch'] and job['rpm_version'] and job['rpm_release']: + jobrec['epoch'] = job['rpm_epoch'] + jobrec['version'] = job['rpm_version'] + jobrec['release'] = job['rpm_release'] base_url = self._cfg.get_str("UI", "log_url") target_str = "%s-%s-%s" % (jobrec['target_distro'], jobrec['target_target'], jobrec['target_repo']) log_url = PackageJob.make_job_log_url(base_url, target_str, From fedora-extras-commits at redhat.com Sun Mar 12 13:43:42 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 08:43:42 -0500 Subject: extras-buildsys ChangeLog,1.172,1.173 Message-ID: <200603121344.k2CDiDvk006663@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6621 Modified Files: ChangeLog Log Message: 2006-03-12 Dan Williams * server/BuildMaster.py server/DBManager.py server/UserInterface.py - Prefix 'epoch', 'version', and 'release' database fields with 'rpm_', since MySQL 5 added 'release' as a reserved word. Bastards. Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- ChangeLog 12 Mar 2006 05:44:12 -0000 1.172 +++ ChangeLog 12 Mar 2006 13:43:34 -0000 1.173 @@ -1,5 +1,13 @@ 2006-03-12 Dan Williams + * server/BuildMaster.py + server/DBManager.py + server/UserInterface.py + - Prefix 'epoch', 'version', and 'release' database fields with + 'rpm_', since MySQL 5 added 'release' as a reserved word. Bastards. + +2006-03-12 Dan Williams + * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management From fedora-extras-commits at redhat.com Sun Mar 12 16:48:29 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 12 Mar 2006 11:48:29 -0500 Subject: rpms/mimetic/devel mimetic-0.9.0-noconfigh.patch, NONE, 1.1 sources, 1.2, 1.3 mimetic.spec, 1.2, 1.3 .cvsignore, 1.2, 1.3 mimetic-0.8.9-noconfigh.patch, 1.1, NONE Message-ID: <200603121649.k2CGn1V1012901@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12855/devel Modified Files: sources mimetic.spec .cvsignore Added Files: mimetic-0.9.0-noconfigh.patch Removed Files: mimetic-0.8.9-noconfigh.patch Log Message: - updated to 0.9.0 - rediffed/updated the .noconfigh patch mimetic-0.9.0-noconfigh.patch: --- NEW FILE mimetic-0.9.0-noconfigh.patch --- --- mimetic-0.9.0/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 +++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:24:10.000000000 +0100 @@ -23,14 +23,14 @@ #include #include #include -#ifdef HAVE_MMAP +#if 1 #include #endif namespace mimetic { -#if HAVE_MMAP == 1 +#if 1 == 1 typedef MMFile File; #else typedef StdFile File; --- mimetic-0.9.0/mimetic/rfc822/messageid.h.noconfigh 2005-03-25 12:20:31.000000000 +0100 +++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:25:18.000000000 +0100 @@ -18,10 +18,10 @@ #include #include #include -#if HAVE_STDINT_H +#if 1 #include #endif -#ifdef HAVE_INTTYPES_H +#if 1 #include #endif #include --- mimetic-0.9.0/mimetic/message.h.noconfigh 2005-03-07 16:35:08.000000000 +0100 +++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:24:10.000000000 +0100 @@ -21,7 +21,7 @@ #include #include #include -#ifdef HAVE_UNISTD_H +#if 1 #include #endif Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Dec 2005 22:09:50 -0000 1.2 +++ sources 12 Mar 2006 16:48:28 -0000 1.3 @@ -1 +1 @@ -fa3cb93e37684c71ac5afad02870302b mimetic-0.8.9.tar.gz +1c81a12a7acf28367ea6a10218924f8c mimetic-0.9.0.tar.gz Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/mimetic.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mimetic.spec 18 Feb 2006 11:03:11 -0000 1.2 +++ mimetic.spec 12 Mar 2006 16:48:28 -0000 1.3 @@ -3,15 +3,15 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: mimetic -Version: 0.8.9 -Release: %release_func 4 +Version: 0.9.0 +Release: %release_func 1 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries License: GPL URL: http://codesink.org/mimetic_mime_library.html Source0: http://codesink.org/download/%name-%version.tar.gz -Patch0: mimetic-0.8.9-noconfigh.patch +Patch0: mimetic-0.9.0-noconfigh.patch Patch1: mimetic-0.8.9-gcc41.patch BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) @@ -90,6 +90,10 @@ %changelog +* Sun Mar 12 2006 Enrico Scholz - 0.9.0-1 +- updated to 0.9.0 +- rediffed/updated the .noconfigh patch + * Sat Feb 18 2006 Enrico Scholz - 0.8.9-4 - rebuilt for FC5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Dec 2005 22:09:50 -0000 1.2 +++ .cvsignore 12 Mar 2006 16:48:28 -0000 1.3 @@ -1 +1 @@ -mimetic-0.8.9.tar.gz +mimetic-*.tar.gz --- mimetic-0.8.9-noconfigh.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 12 16:48:35 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 12 Mar 2006 11:48:35 -0500 Subject: rpms/mimetic/FC-4 mimetic-0.9.0-noconfigh.patch, NONE, 1.1 sources, 1.2, 1.3 mimetic.spec, 1.1, 1.2 .cvsignore, 1.2, 1.3 mimetic-0.8.9-noconfigh.patch, 1.1, NONE Message-ID: <200603121649.k2CGn8vj012906@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12855/FC-4 Modified Files: sources mimetic.spec .cvsignore Added Files: mimetic-0.9.0-noconfigh.patch Removed Files: mimetic-0.8.9-noconfigh.patch Log Message: - updated to 0.9.0 - rediffed/updated the .noconfigh patch mimetic-0.9.0-noconfigh.patch: --- NEW FILE mimetic-0.9.0-noconfigh.patch --- --- mimetic-0.9.0/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 +++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:24:10.000000000 +0100 @@ -23,14 +23,14 @@ #include #include #include -#ifdef HAVE_MMAP +#if 1 #include #endif namespace mimetic { -#if HAVE_MMAP == 1 +#if 1 == 1 typedef MMFile File; #else typedef StdFile File; --- mimetic-0.9.0/mimetic/rfc822/messageid.h.noconfigh 2005-03-25 12:20:31.000000000 +0100 +++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:25:18.000000000 +0100 @@ -18,10 +18,10 @@ #include #include #include -#if HAVE_STDINT_H +#if 1 #include #endif -#ifdef HAVE_INTTYPES_H +#if 1 #include #endif #include --- mimetic-0.9.0/mimetic/message.h.noconfigh 2005-03-07 16:35:08.000000000 +0100 +++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:24:10.000000000 +0100 @@ -21,7 +21,7 @@ #include #include #include -#ifdef HAVE_UNISTD_H +#if 1 #include #endif Index: sources =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Dec 2005 22:09:50 -0000 1.2 +++ sources 12 Mar 2006 16:48:35 -0000 1.3 @@ -1 +1 @@ -fa3cb93e37684c71ac5afad02870302b mimetic-0.8.9.tar.gz +1c81a12a7acf28367ea6a10218924f8c mimetic-0.9.0.tar.gz Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-4/mimetic.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mimetic.spec 25 Dec 2005 22:09:50 -0000 1.1 +++ mimetic.spec 12 Mar 2006 16:48:35 -0000 1.2 @@ -3,15 +3,15 @@ %{!?release_func:%global release_func() %1%{?dist}} Name: mimetic -Version: 0.8.9 -Release: %release_func 3 +Version: 0.9.0 +Release: %release_func 1 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries License: GPL URL: http://codesink.org/mimetic_mime_library.html Source0: http://codesink.org/download/%name-%version.tar.gz -Patch0: mimetic-0.8.9-noconfigh.patch +Patch0: mimetic-0.9.0-noconfigh.patch Patch1: mimetic-0.8.9-gcc41.patch BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n) @@ -90,6 +90,10 @@ %changelog +* Sun Mar 12 2006 Enrico Scholz - 0.9.0-1 +- updated to 0.9.0 +- rediffed/updated the .noconfigh patch + * Sun Dec 25 2005 Enrico Scholz - 0.8.9-3 - fixed compilation with gcc41 - first Fedora Extras release (review #171624) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Dec 2005 22:09:50 -0000 1.2 +++ .cvsignore 12 Mar 2006 16:48:35 -0000 1.3 @@ -1 +1 @@ -mimetic-0.8.9.tar.gz +mimetic-*.tar.gz --- mimetic-0.8.9-noconfigh.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 12 16:52:40 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 11:52:40 -0500 Subject: rpms/thinkpad-kmod/devel thinkpad-kmod.spec,1.4,1.5 Message-ID: <200603121653.k2CGrCOC013020@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13002 Modified Files: thinkpad-kmod.spec Log Message: Bump hardcoded kernel version for test build Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- thinkpad-kmod.spec 2 Mar 2006 21:43:44 -0000 1.4 +++ thinkpad-kmod.spec 12 Mar 2006 16:52:39 -0000 1.5 @@ -4,7 +4,7 @@ # end stuff to be ... # temporarily hardcoded: -%define kver 2.6.15-1.1996_FC5 +%define kver 2.6.15-1.2041_FC5 %define kvariants "" %define kmod_name thinkpad From fedora-extras-commits at redhat.com Sun Mar 12 17:03:21 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 12 Mar 2006 12:03:21 -0500 Subject: rpms/mimetic/FC-4 mimetic.spec, 1.2, 1.3 mimetic-0.9.0-noconfigh.patch, 1.1, 1.2 Message-ID: <200603121703.k2CH3s5x015061@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15023/FC-4 Modified Files: mimetic.spec mimetic-0.9.0-noconfigh.patch Log Message: - fixed a missing case in the noconfigh patch Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-4/mimetic.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mimetic.spec 12 Mar 2006 16:48:35 -0000 1.2 +++ mimetic.spec 12 Mar 2006 17:03:21 -0000 1.3 @@ -4,7 +4,7 @@ Name: mimetic Version: 0.9.0 -Release: %release_func 1 +Release: %release_func 2 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries @@ -90,6 +90,9 @@ %changelog +* Sun Mar 12 2006 Enrico Scholz - 0.9.0-2 +- fixed a missing case in the noconfigh patch + * Sun Mar 12 2006 Enrico Scholz - 0.9.0-1 - updated to 0.9.0 - rediffed/updated the .noconfigh patch mimetic-0.9.0-noconfigh.patch: Index: mimetic-0.9.0-noconfigh.patch =================================================================== RCS file: /cvs/extras/rpms/mimetic/FC-4/mimetic-0.9.0-noconfigh.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mimetic-0.9.0-noconfigh.patch 12 Mar 2006 16:48:35 -0000 1.1 +++ mimetic-0.9.0-noconfigh.patch 12 Mar 2006 17:03:21 -0000 1.2 @@ -1,5 +1,5 @@ --- mimetic-0.9.0/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 -+++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:24:10.000000000 +0100 ++++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:56:02.000000000 +0100 @@ -23,14 +23,14 @@ #include #include @@ -17,8 +17,19 @@ typedef MMFile File; #else typedef StdFile File; +--- mimetic-0.9.0/mimetic/os/directory.h.noconfigh 2005-03-25 12:05:44.000000000 +0100 ++++ mimetic-0.9.0/mimetic/os/directory.h 2006-03-12 17:56:23.000000000 +0100 +@@ -3,7 +3,7 @@ + #include + #include + #include +-#ifdef HAVE_DIRENT_H ++#if 1 + #include + #endif + #include --- mimetic-0.9.0/mimetic/rfc822/messageid.h.noconfigh 2005-03-25 12:20:31.000000000 +0100 -+++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:25:18.000000000 +0100 ++++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:56:02.000000000 +0100 @@ -18,10 +18,10 @@ #include #include @@ -33,7 +44,7 @@ #endif #include --- mimetic-0.9.0/mimetic/message.h.noconfigh 2005-03-07 16:35:08.000000000 +0100 -+++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:24:10.000000000 +0100 ++++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:56:02.000000000 +0100 @@ -21,7 +21,7 @@ #include #include From fedora-extras-commits at redhat.com Sun Mar 12 17:03:13 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 12 Mar 2006 12:03:13 -0500 Subject: rpms/mimetic/devel mimetic.spec, 1.3, 1.4 mimetic-0.9.0-noconfigh.patch, 1.1, 1.2 Message-ID: <200603121704.k2CH4Lc2015068@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/mimetic/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15023/devel Modified Files: mimetic.spec mimetic-0.9.0-noconfigh.patch Log Message: - fixed a missing case in the noconfigh patch Index: mimetic.spec =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/mimetic.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mimetic.spec 12 Mar 2006 16:48:28 -0000 1.3 +++ mimetic.spec 12 Mar 2006 17:03:13 -0000 1.4 @@ -4,7 +4,7 @@ Name: mimetic Version: 0.9.0 -Release: %release_func 1 +Release: %release_func 2 Summary: A full featured MIME library written in C++ Group: System Environment/Libraries @@ -90,6 +90,9 @@ %changelog +* Sun Mar 12 2006 Enrico Scholz - 0.9.0-2 +- fixed a missing case in the noconfigh patch + * Sun Mar 12 2006 Enrico Scholz - 0.9.0-1 - updated to 0.9.0 - rediffed/updated the .noconfigh patch mimetic-0.9.0-noconfigh.patch: Index: mimetic-0.9.0-noconfigh.patch =================================================================== RCS file: /cvs/extras/rpms/mimetic/devel/mimetic-0.9.0-noconfigh.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mimetic-0.9.0-noconfigh.patch 12 Mar 2006 16:48:28 -0000 1.1 +++ mimetic-0.9.0-noconfigh.patch 12 Mar 2006 17:03:13 -0000 1.2 @@ -1,5 +1,5 @@ --- mimetic-0.9.0/mimetic/os/file.h.noconfigh 2005-02-23 11:26:15.000000000 +0100 -+++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:24:10.000000000 +0100 ++++ mimetic-0.9.0/mimetic/os/file.h 2006-03-12 17:56:02.000000000 +0100 @@ -23,14 +23,14 @@ #include #include @@ -17,8 +17,19 @@ typedef MMFile File; #else typedef StdFile File; +--- mimetic-0.9.0/mimetic/os/directory.h.noconfigh 2005-03-25 12:05:44.000000000 +0100 ++++ mimetic-0.9.0/mimetic/os/directory.h 2006-03-12 17:56:23.000000000 +0100 +@@ -3,7 +3,7 @@ + #include + #include + #include +-#ifdef HAVE_DIRENT_H ++#if 1 + #include + #endif + #include --- mimetic-0.9.0/mimetic/rfc822/messageid.h.noconfigh 2005-03-25 12:20:31.000000000 +0100 -+++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:25:18.000000000 +0100 ++++ mimetic-0.9.0/mimetic/rfc822/messageid.h 2006-03-12 17:56:02.000000000 +0100 @@ -18,10 +18,10 @@ #include #include @@ -33,7 +44,7 @@ #endif #include --- mimetic-0.9.0/mimetic/message.h.noconfigh 2005-03-07 16:35:08.000000000 +0100 -+++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:24:10.000000000 +0100 ++++ mimetic-0.9.0/mimetic/message.h 2006-03-12 17:56:02.000000000 +0100 @@ -21,7 +21,7 @@ #include #include From fedora-extras-commits at redhat.com Sun Mar 12 17:34:07 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 12 Mar 2006 12:34:07 -0500 Subject: rpms/kst/devel kst.spec,1.3,1.4 Message-ID: <200603121734.k2CHYeUX015321@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/kst/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15304 Modified Files: kst.spec Log Message: Bump build so we pick up the new version of cfitsio. Index: kst.spec =================================================================== RCS file: /cvs/extras/rpms/kst/devel/kst.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kst.spec 26 Feb 2006 18:54:00 -0000 1.3 +++ kst.spec 12 Mar 2006 17:34:07 -0000 1.4 @@ -1,6 +1,6 @@ Name: kst Version: 1.2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A data viewing program for KDE Group: Applications/Engineering @@ -75,7 +75,7 @@ %build unset QTDIR || : ; . /etc/profile.d/qt.sh - +export KDEDIR=%{_prefix} %configure --disable-dependency-tracking --disable-static \ --disable-rpath \ --with-qt-libraries=$QTDIR/lib \ @@ -210,6 +210,10 @@ %{_datadir}/services/kst/kstdata_netcdf.desktop %changelog +* Sun Mar 12 2006 Matthew Truch - 1.2.0-10 +- Yet another tweak to configure options. +- Bump build so new cfitsio version is picked up. + * Sun Feb 26 2006 Matthew Truch - 1.2.0-9 - Improve qt lib and include configure options. From fedora-extras-commits at redhat.com Sun Mar 12 17:57:49 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 12 Mar 2006 12:57:49 -0500 Subject: rpms/kst/FC-4 kst.spec,1.3,1.4 Message-ID: <200603121758.k2CHwLiH015500@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/kst/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15481 Modified Files: kst.spec Log Message: Bump build revision to pick up new cfitsio version. Index: kst.spec =================================================================== RCS file: /cvs/extras/rpms/kst/FC-4/kst.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kst.spec 26 Feb 2006 17:51:06 -0000 1.3 +++ kst.spec 12 Mar 2006 17:57:48 -0000 1.4 @@ -1,6 +1,6 @@ Name: kst Version: 1.2.0 -Release: 8%{?dist} +Release: 10%{?dist} Summary: A data viewing program for KDE Group: Applications/Engineering @@ -75,11 +75,13 @@ %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include +export KDEDIR=%{_prefix} %configure --disable-dependency-tracking --disable-static \ --disable-rpath \ + --with-qt-libraries=$QTDIR/lib \ + --with-qt-includes=$QTDIR/include \ --with-extra-includes=%{_includedir}/cfitsio:%{_includedir}/netcdf-3 \ - --with-extra-libs=%{_libdir}/netcdf-3 --disable-debug + --with-extra-libs=%{_libdir}:%{_libdir}/netcdf-3 --disable-debug make %{?_smp_mflags} %install @@ -208,6 +210,13 @@ %{_datadir}/services/kst/kstdata_netcdf.desktop %changelog +* Sun Mar 12 2006 Matthew Truch - 1.2.0-10 +- Yet another tweak to configure options. +- Bump build so new cfitsio version is picked up. + +* Sun Feb 26 2006 Matthew Truch - 1.2.0-9 +- Improve qt lib and include configure options. + * Sun Feb 26 2006 Matthew Truch - 1.2.0-8 - Bump release due to build issue. From fedora-extras-commits at redhat.com Sun Mar 12 18:12:18 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:12:18 -0500 Subject: rpms/python-logilab-common/FC-4 .cvsignore, 1.5, 1.6 python-logilab-common.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603121812.k2CICpBN017567@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17525/FC-4 Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Version 0.14.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Jan 2006 16:53:34 -0000 1.5 +++ .cvsignore 12 Mar 2006 18:12:18 -0000 1.6 @@ -1 +1 @@ -common-0.13.0.tar.gz +common-0.14.1.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/python-logilab-common.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-logilab-common.spec 12 Jan 2006 16:53:34 -0000 1.4 +++ python-logilab-common.spec 12 Mar 2006 18:12:18 -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-logilab-common -Version: 0.13.0 +Version: 0.14.1 Release: 1%{?dist} Summary: Common libraries for Logilab projects @@ -55,6 +55,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-1 +- Version 0.14.1 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.13.0-1 - Version 0.13.0 - astng no longer part of the package Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jan 2006 16:53:34 -0000 1.5 +++ sources 12 Mar 2006 18:12:18 -0000 1.6 @@ -1 +1 @@ -9b6500c2a23660edfabe65bf73137a51 common-0.13.0.tar.gz +8c4172329e810a53245e8b3f568e6be7 common-0.14.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:12:25 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:12:25 -0500 Subject: rpms/python-logilab-common/devel .cvsignore, 1.5, 1.6 python-logilab-common.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603121812.k2CICvwn017572@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17525/devel Modified Files: .cvsignore python-logilab-common.spec sources Log Message: Version 0.14.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Jan 2006 16:53:40 -0000 1.5 +++ .cvsignore 12 Mar 2006 18:12:25 -0000 1.6 @@ -1 +1 @@ -common-0.13.0.tar.gz +common-0.14.1.tar.gz Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/python-logilab-common.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-logilab-common.spec 12 Jan 2006 16:53:40 -0000 1.4 +++ python-logilab-common.spec 12 Mar 2006 18:12:25 -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-logilab-common -Version: 0.13.0 +Version: 0.14.1 Release: 1%{?dist} Summary: Common libraries for Logilab projects @@ -55,6 +55,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-1 +- Version 0.14.1 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.13.0-1 - Version 0.13.0 - astng no longer part of the package Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jan 2006 16:53:40 -0000 1.5 +++ sources 12 Mar 2006 18:12:25 -0000 1.6 @@ -1 +1 @@ -9b6500c2a23660edfabe65bf73137a51 common-0.13.0.tar.gz +8c4172329e810a53245e8b3f568e6be7 common-0.14.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:15:40 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:15:40 -0500 Subject: rpms/python-astng/devel .cvsignore, 1.4, 1.5 python-astng.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603121816.k2CIGErV017763@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-astng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17698/devel Modified Files: .cvsignore python-astng.spec sources Log Message: Version 0.15.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jan 2006 16:55:41 -0000 1.4 +++ .cvsignore 12 Mar 2006 18:15:40 -0000 1.5 @@ -1 +1 @@ -astng-0.14.0.tar.gz +astng-0.15.1.tar.gz Index: python-astng.spec =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/python-astng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-astng.spec 12 Jan 2006 16:55:41 -0000 1.5 +++ python-astng.spec 12 Mar 2006 18:15:40 -0000 1.6 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-astng -Version: 0.14.0 +Version: 0.15.1 Release: 1%{?dist} Summary: Python Abstract Syntax Tree New Generation @@ -53,6 +53,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.15.1-1 +- Version 0.15.1 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.14.0-1 - Version 0.14.0 - Drop the modname patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-astng/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2006 16:55:41 -0000 1.4 +++ sources 12 Mar 2006 18:15:40 -0000 1.5 @@ -1 +1 @@ -29fa137d44eeed6a69e2e3feb07cff0a astng-0.14.0.tar.gz +2a7fb54c7059309759aa7f4d7d1f029d astng-0.15.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:15:25 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:15:25 -0500 Subject: rpms/python-astng/FC-4 .cvsignore, 1.4, 1.5 python-astng.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603121816.k2CIG9J9017758@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-astng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17698/FC-4 Modified Files: .cvsignore python-astng.spec sources Log Message: Version 0.15.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 12 Jan 2006 16:55:35 -0000 1.4 +++ .cvsignore 12 Mar 2006 18:15:25 -0000 1.5 @@ -1 +1 @@ -astng-0.14.0.tar.gz +astng-0.15.1.tar.gz Index: python-astng.spec =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/python-astng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-astng.spec 12 Jan 2006 16:55:35 -0000 1.5 +++ python-astng.spec 12 Mar 2006 18:15:25 -0000 1.6 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-astng -Version: 0.14.0 +Version: 0.15.1 Release: 1%{?dist} Summary: Python Abstract Syntax Tree New Generation @@ -53,6 +53,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.15.1-1 +- Version 0.15.1 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.14.0-1 - Version 0.14.0 - Drop the modname patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-astng/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 12 Jan 2006 16:55:35 -0000 1.4 +++ sources 12 Mar 2006 18:15:25 -0000 1.5 @@ -1 +1 @@ -29fa137d44eeed6a69e2e3feb07cff0a astng-0.14.0.tar.gz +2a7fb54c7059309759aa7f4d7d1f029d astng-0.15.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:18:21 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:18:21 -0500 Subject: rpms/pylint/FC-4 .cvsignore, 1.5, 1.6 pylint.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200603121818.k2CIIrgP017966@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/pylint/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17928/FC-4 Modified Files: .cvsignore pylint.spec sources Log Message: Version 0.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Jan 2006 16:52:29 -0000 1.5 +++ .cvsignore 12 Mar 2006 18:18:21 -0000 1.6 @@ -1 +1 @@ -pylint-0.9.0.tar.gz +pylint-0.10.0.tar.gz Index: pylint.spec =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/pylint.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pylint.spec 12 Jan 2006 16:52:29 -0000 1.5 +++ pylint.spec 12 Mar 2006 18:18:21 -0000 1.6 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pylint -Version: 0.9.0 +Version: 0.10.0 Release: 1%{?dist} Summary: Analyzes Python code looking for bugs and signs of poor quality @@ -84,6 +84,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.10.0-1 +- Version 0.10.0 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.9.0-1 - Version 0.9.0 - Add COPYING to docs Index: sources =================================================================== RCS file: /cvs/extras/rpms/pylint/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jan 2006 16:52:29 -0000 1.5 +++ sources 12 Mar 2006 18:18:21 -0000 1.6 @@ -1 +1 @@ -c7d69b110be9e64bb4f3f9b7dcbbf98c pylint-0.9.0.tar.gz +9c8dd130411eca6f16c3a5f531f44fa2 pylint-0.10.0.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:18:27 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:18:27 -0500 Subject: rpms/pylint/devel .cvsignore, 1.5, 1.6 pylint.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200603121818.k2CIIxRN017971@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/pylint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17928/devel Modified Files: .cvsignore pylint.spec sources Log Message: Version 0.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Jan 2006 16:52:35 -0000 1.5 +++ .cvsignore 12 Mar 2006 18:18:26 -0000 1.6 @@ -1 +1 @@ -pylint-0.9.0.tar.gz +pylint-0.10.0.tar.gz Index: pylint.spec =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/pylint.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pylint.spec 12 Jan 2006 16:52:35 -0000 1.5 +++ pylint.spec 12 Mar 2006 18:18:26 -0000 1.6 @@ -1,7 +1,7 @@ %{!?_python_sitelib: %define _python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: pylint -Version: 0.9.0 +Version: 0.10.0 Release: 1%{?dist} Summary: Analyzes Python code looking for bugs and signs of poor quality @@ -84,6 +84,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.10.0-1 +- Version 0.10.0 + * Thu Jan 12 2006 Konstantin Ryabitsev - 0.9.0-1 - Version 0.9.0 - Add COPYING to docs Index: sources =================================================================== RCS file: /cvs/extras/rpms/pylint/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Jan 2006 16:52:35 -0000 1.5 +++ sources 12 Mar 2006 18:18:26 -0000 1.6 @@ -1 +1 @@ -c7d69b110be9e64bb4f3f9b7dcbbf98c pylint-0.9.0.tar.gz +9c8dd130411eca6f16c3a5f531f44fa2 pylint-0.10.0.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 18:35:47 2006 From: fedora-extras-commits at redhat.com (Konstantin Ryabitsev (icon)) Date: Sun, 12 Mar 2006 13:35:47 -0500 Subject: rpms/python-logilab-common/devel python-logilab-common.spec, 1.5, 1.6 Message-ID: <200603121836.k2CIaKSt018111@cvs-int.fedora.redhat.com> Author: icon Update of /cvs/extras/rpms/python-logilab-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18094 Modified Files: python-logilab-common.spec Log Message: Trying to work around a failure in devel build. Index: python-logilab-common.spec =================================================================== RCS file: /cvs/extras/rpms/python-logilab-common/devel/python-logilab-common.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-logilab-common.spec 12 Mar 2006 18:12:25 -0000 1.5 +++ python-logilab-common.spec 12 Mar 2006 18:35:47 -0000 1.6 @@ -2,7 +2,7 @@ Name: python-logilab-common Version: 0.14.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Common libraries for Logilab projects Group: Development/Libraries @@ -46,6 +46,8 @@ %dir %{_python_sitelib}/logilab/common %dir %{_python_sitelib}/logilab/common/ureports %{_python_sitelib}/logilab/*.py +%{_python_sitelib}/logilab/*.pyc +%ghost %{_python_sitelib}/logilab/*.pyo %{_python_sitelib}/logilab/common/*.py %{_python_sitelib}/logilab/common/*.pyc %ghost %{_python_sitelib}/logilab/common/*.pyo @@ -55,6 +57,9 @@ %changelog +* Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-2 +- Also handle __init__.pyc and __init__.pyo + * Sun Mar 12 2006 Konstantin Ryabitsev - 0.14.1-1 - Version 0.14.1 From fedora-extras-commits at redhat.com Sun Mar 12 20:09:47 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 12 Mar 2006 15:09:47 -0500 Subject: rpms/highlight/devel .cvsignore, 1.4, 1.5 highlight-2.4-rpmoptflags.patch, 1.3, 1.4 highlight.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200603122010.k2CKAKsN022297@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22271 Modified Files: .cvsignore highlight-2.4-rpmoptflags.patch highlight.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 1 Nov 2005 15:55:32 -0000 1.4 +++ .cvsignore 12 Mar 2006 20:09:47 -0000 1.5 @@ -1 +1 @@ -highlight-2.4.3.tar.gz +highlight-2.4.4.tar.gz highlight-2.4-rpmoptflags.patch: Index: highlight-2.4-rpmoptflags.patch =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight-2.4-rpmoptflags.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- highlight-2.4-rpmoptflags.patch 11 Oct 2005 17:16:37 -0000 1.3 +++ highlight-2.4-rpmoptflags.patch 12 Mar 2006 20:09:47 -0000 1.4 @@ -1,11 +1,11 @@ ---- highlight-2.4-2/highlight/makefile.rpx 2005-08-04 19:49:31.000000000 +0200 -+++ highlight-2.4-2/highlight/makefile 2005-10-10 18:22:14.000000000 +0200 +--- highlight-2.4.4/highlight/makefile.org 2006-03-12 21:02:07.000000000 +0100 ++++ highlight-2.4.4/highlight/makefile 2006-03-12 21:03:13.000000000 +0100 @@ -15,7 +15,7 @@ CXX=c++ --CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -+CFLAGS := ${RPM_OPT_FLAGS} -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DUSE_FN_MATCH - - LDFLAGS = -L/usr/lib -s +-CFLAGS := -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\" ++CFLAGS := ${RPM_OPT_FLAGS} -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\" + #CFLAGS := -Wall -DHL_DATA_DIR=\"${HL_DATA_DIR}\" + LDFLAGS = -s Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- highlight.spec 12 Feb 2006 19:21:35 -0000 1.10 +++ highlight.spec 12 Mar 2006 20:09:47 -0000 1.11 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.4.3 -Release: 2%{?dist} +Version: 2.4.4 +Release: 1%{?dist} Group: Development/Tools License: GPL @@ -49,6 +49,10 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 +- New upstream release +- Adapt rpmopt patch to new upstream release + * Sun Feb 12 2006 Jochen Schmitt 2.4.3-2 - Rebuilt for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Nov 2005 15:55:32 -0000 1.4 +++ sources 12 Mar 2006 20:09:47 -0000 1.5 @@ -1 +1 @@ -19b0437361f84467fff11bdbeba654a0 highlight-2.4.3.tar.gz +c2ea3c4a11a76379d73bd4bccd6c3228 highlight-2.4.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 20:14:32 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Sun, 12 Mar 2006 15:14:32 -0500 Subject: rpms/highlight/FC-4 .cvsignore, 1.2, 1.3 highlight-2.4-rpmoptflags.patch, 1.3, 1.4 highlight.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200603122015.k2CKF4DX022393@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22360 Modified Files: .cvsignore highlight-2.4-rpmoptflags.patch highlight.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 4 Aug 2005 15:38:30 -0000 1.2 +++ .cvsignore 12 Mar 2006 20:14:31 -0000 1.3 @@ -1 +1 @@ -highlight-2.4-1.tar.bz2 +highlight-2.4.4.tar.gz highlight-2.4-rpmoptflags.patch: Index: highlight-2.4-rpmoptflags.patch =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/highlight-2.4-rpmoptflags.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- highlight-2.4-rpmoptflags.patch 11 Oct 2005 17:18:47 -0000 1.3 +++ highlight-2.4-rpmoptflags.patch 12 Mar 2006 20:14:31 -0000 1.4 @@ -1,11 +1,11 @@ ---- highlight-2.4-2/highlight/makefile.rpx 2005-08-04 19:49:31.000000000 +0200 -+++ highlight-2.4-2/highlight/makefile 2005-10-10 18:22:14.000000000 +0200 +--- highlight-2.4.4/highlight/makefile.org 2006-03-12 21:02:07.000000000 +0100 ++++ highlight-2.4.4/highlight/makefile 2006-03-12 21:03:13.000000000 +0100 @@ -15,7 +15,7 @@ CXX=c++ --CFLAGS := -O2 -Wall -pedantic -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -+CFLAGS := ${RPM_OPT_FLAGS} -DHL_DATA_DIR=\"${HL_DATA_DIR}\" -DUSE_FN_MATCH - - LDFLAGS = -L/usr/lib -s +-CFLAGS := -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\" ++CFLAGS := ${RPM_OPT_FLAGS} -O2 -DHL_DATA_DIR=\"${HL_DATA_DIR}\" + #CFLAGS := -Wall -DHL_DATA_DIR=\"${HL_DATA_DIR}\" + LDFLAGS = -s Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/highlight.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- highlight.spec 1 Nov 2005 16:00:05 -0000 1.7 +++ highlight.spec 12 Mar 2006 20:14:31 -0000 1.8 @@ -1,6 +1,6 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.4.3 +Version: 2.4.4 Release: 1%{?dist} Group: Development/Tools @@ -49,6 +49,13 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 +- New upstream release +- Adapt rpmopt patch to new upstream release + +* Sun Feb 12 2006 Jochen Schmitt 2.4.3-2 +- Rebuilt for FC5 + * Tue Nov 1 2005 Jochen Schmitt 2.4.3-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 1 Nov 2005 16:00:05 -0000 1.4 +++ sources 12 Mar 2006 20:14:31 -0000 1.5 @@ -1 +1 @@ -19b0437361f84467fff11bdbeba654a0 highlight-2.4.3.tar.gz +c2ea3c4a11a76379d73bd4bccd6c3228 highlight-2.4.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 12 20:35:40 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 12 Mar 2006 15:35:40 -0500 Subject: rpms/lucidlife/FC-4 lucidlife.spec,1.3,1.4 Message-ID: <200603122036.k2CKaCxd022556@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22521/FC-4 Modified Files: lucidlife.spec Log Message: Minor fix to ChangeLog entries: escape RPM macros. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/FC-4/lucidlife.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lucidlife.spec 26 Feb 2006 21:42:50 -0000 1.3 +++ lucidlife.spec 12 Mar 2006 20:35:40 -0000 1.4 @@ -59,13 +59,13 @@ %changelog * Sun Feb 26 2006 Peter Gordon - 0.9-3 -- Add {dist} tag to the release to fix CVS tagging issue. +- Add %%{?dist} tag to the release to fix CVS tagging issue. * Sun Feb 19 2006 Peter Gordon - 0.9-2 - Dropped Requires: on gtk2 and gnome-vfs2, as the -devel sonames will pull these in. - Fixed handling of .desktop file to conform to Fedora Extras guidelines. -- Changed %files section to use %{_datadir}/%{name} instead of hardcoding +- Changed %%files section to use %%{_datadir}/%%{name} instead of hardcoding "lucidlife" to help prevent file ownership problems - Thanks to Brian Pepple in BZ #177881 for these suggestions. From fedora-extras-commits at redhat.com Sun Mar 12 20:35:46 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 12 Mar 2006 15:35:46 -0500 Subject: rpms/lucidlife/devel lucidlife.spec,1.3,1.4 Message-ID: <200603122036.k2CKaJRe022559@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22521/devel Modified Files: lucidlife.spec Log Message: Minor fix to ChangeLog entries: escape RPM macros. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lucidlife.spec 26 Feb 2006 21:43:04 -0000 1.3 +++ lucidlife.spec 12 Mar 2006 20:35:46 -0000 1.4 @@ -59,13 +59,13 @@ %changelog * Sun Feb 26 2006 Peter Gordon - 0.9-3 -- Add {dist} tag to the release to fix CVS tagging issue. +- Add %%{?dist} tag to the release to fix CVS tagging issue. * Sun Feb 19 2006 Peter Gordon - 0.9-2 - Dropped Requires: on gtk2 and gnome-vfs2, as the -devel sonames will pull these in. - Fixed handling of .desktop file to conform to Fedora Extras guidelines. -- Changed %files section to use %{_datadir}/%{name} instead of hardcoding +- Changed %%files section to use %%{_datadir}/%%{name} instead of hardcoding "lucidlife" to help prevent file ownership problems - Thanks to Brian Pepple in BZ #177881 for these suggestions. From fedora-extras-commits at redhat.com Sun Mar 12 21:56:38 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Sun, 12 Mar 2006 16:56:38 -0500 Subject: rpms/nomadsync/devel nomadsync-libnjbloc.patch, NONE, 1.1 nomadsync.spec, 1.1, 1.2 Message-ID: <200603122157.k2CLvBkZ024809@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24789 Modified Files: nomadsync.spec Added Files: nomadsync-libnjbloc.patch Log Message: Bugfinding in the new spec nomadsync-libnjbloc.patch: --- NEW FILE nomadsync-libnjbloc.patch --- --- src/Makefile.in.orig 2006-03-12 22:32:56.000000000 +0100 +++ src/Makefile.in 2006-03-12 22:33:18.000000000 +0100 @@ -67,7 +67,7 @@ layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) \ mpg123.$(OBJEXT) nomadsync_OBJECTS = $(am_nomadsync_OBJECTS) -nomadsync_DEPENDENCIES = /usr/local/lib/libnjb.so +nomadsync_DEPENDENCIES = /usr/lib/libnjb.so DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -226,7 +226,7 @@ libmpg123/l2tables.h libmpg123/layer1.cpp libmpg123/layer2.cpp libmpg123/layer3.cpp \ libmpg123/mpg123.cpp libmpg123/mpg123.h -nomadsync_LDADD = /usr/local/lib/libnjb.so -lid3 +nomadsync_LDADD = /usr/lib/libnjb.so -lid3 AM_CXXFLAGS = `gtk-config --cflags` # this is where the desktop file will go Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/nomadsync.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nomadsync.spec 9 Mar 2006 19:53:02 -0000 1.1 +++ nomadsync.spec 12 Mar 2006 21:56:38 -0000 1.2 @@ -12,13 +12,14 @@ Name: nomadsync Version: 0.4.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch0: nomadsync-libnjbloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -38,9 +39,10 @@ %prep %setup -q -n %{name} +%patch0 -p0 %build -%configure +%configure --with-wx-config=%{_bindir}/wxgtk-2.4-config make %{?_smp_mflags} %install @@ -83,6 +85,9 @@ %doc ChangeLog authors copying readme %changelog +* Sun Mar 12 2006 Linus Walleij 0.4.2-9 +- Found a patchable bug during build tests. + * Wed Mar 8 2006 Linus Walleij 0.4.2-8 - New sources, do not re-tar the file. From fedora-extras-commits at redhat.com Sun Mar 12 22:07:33 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Sun, 12 Mar 2006 17:07:33 -0500 Subject: rpms/nomadsync/FC-4 nomadsync-libnjbloc.patch, NONE, 1.1 nomadsync.spec, 1.1, 1.2 Message-ID: <200603122208.k2CM86iZ026799@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26769 Modified Files: nomadsync.spec Added Files: nomadsync-libnjbloc.patch Log Message: Trying this in FC4 to see if it is a pure GCC4.1.0 bug nomadsync-libnjbloc.patch: --- NEW FILE nomadsync-libnjbloc.patch --- --- src/Makefile.in.orig 2006-03-12 22:32:56.000000000 +0100 +++ src/Makefile.in 2006-03-12 22:33:18.000000000 +0100 @@ -67,7 +67,7 @@ layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) \ mpg123.$(OBJEXT) nomadsync_OBJECTS = $(am_nomadsync_OBJECTS) -nomadsync_DEPENDENCIES = /usr/local/lib/libnjb.so +nomadsync_DEPENDENCIES = /usr/lib/libnjb.so DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -226,7 +226,7 @@ libmpg123/l2tables.h libmpg123/layer1.cpp libmpg123/layer2.cpp libmpg123/layer3.cpp \ libmpg123/mpg123.cpp libmpg123/mpg123.h -nomadsync_LDADD = /usr/local/lib/libnjb.so -lid3 +nomadsync_LDADD = /usr/lib/libnjb.so -lid3 AM_CXXFLAGS = `gtk-config --cflags` # this is where the desktop file will go Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/FC-4/nomadsync.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nomadsync.spec 9 Mar 2006 19:53:02 -0000 1.1 +++ nomadsync.spec 12 Mar 2006 22:07:33 -0000 1.2 @@ -12,13 +12,14 @@ Name: nomadsync Version: 0.4.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop +Patch0: nomadsync-libnjbloc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -38,9 +39,10 @@ %prep %setup -q -n %{name} +%patch0 -p0 %build -%configure +%configure --with-wx-config=%{_bindir}/wxgtk-2.4-config make %{?_smp_mflags} %install @@ -83,6 +85,9 @@ %doc ChangeLog authors copying readme %changelog +* Sun Mar 12 2006 Linus Walleij 0.4.2-9 +- Found a patchable bug during build tests. + * Wed Mar 8 2006 Linus Walleij 0.4.2-8 - New sources, do not re-tar the file. From fedora-extras-commits at redhat.com Sun Mar 12 23:04:51 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 12 Mar 2006 18:04:51 -0500 Subject: kadischi/lib functions.py,1.3,1.4 Message-ID: <200603122305.k2CN5L7m028960@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28941/kadischi/lib Modified Files: functions.py Log Message: Revert to upstream kernel naming scheme for Xen kernel (functions.py) Index: functions.py =================================================================== RCS file: /cvs/devel/kadischi/lib/functions.py,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- functions.py 10 Mar 2006 21:46:35 -0000 1.3 +++ functions.py 12 Mar 2006 23:04:49 -0000 1.4 @@ -71,15 +71,15 @@ ts = rpm.TransactionSet (rootdir) while kernel_version == None: if isys.smpAvailable() or isys.htavailable(): - for mi in ts.dbMatch ('name', 'kernel-xen-hypervisor'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'hypervisor' + for mi in ts.dbMatch ('name', 'kernel-xen0'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' clear_rpm_db_files (rootdir) for mi in ts.dbMatch ('name', 'kernel-smp'): kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp' clear_rpm_db_files (rootdir) else: - for mi in ts.dbMatch ('name', 'kernel-xen-hypervisor'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'hypervisor' + for mi in ts.dbMatch ('name', 'kernel-xen0'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' clear_rpm_db_files (rootdir) for mi in ts.dbMatch ('name', 'kernel'): kernel_version = "%s-%s" % (mi['version'], mi['release']) From fedora-extras-commits at redhat.com Sun Mar 12 23:45:24 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 18:45:24 -0500 Subject: rpms/kover/devel kover.spec,1.10,1.11 Message-ID: <200603122345.k2CNjuKN029132@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/kover/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29115 Modified Files: kover.spec Log Message: * Sun Mar 12 2006 Adrian Reber - 2.9.6-5 - rebuilt Index: kover.spec =================================================================== RCS file: /cvs/extras/rpms/kover/devel/kover.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- kover.spec 12 Feb 2006 16:27:55 -0000 1.10 +++ kover.spec 12 Mar 2006 23:45:24 -0000 1.11 @@ -1,7 +1,7 @@ Name: kover Summary: WYSIWYG CD cover printer with CDDB support Version: 2.9.6 -Release: 4 +Release: 5 License: GPL Group: Applications/Publishing Source0 http://lisas.de/kover/kover-2.9.6.tar.gz @@ -58,6 +58,9 @@ %attr(755,root,root)%{_bindir}/cd-text %changelog +* Sun Mar 12 2006 Adrian Reber - 2.9.6-5 +- rebuilt + * Sun Feb 12 2006 Adrian Reber - 2.9.6-4 - rebuilt From fedora-extras-commits at redhat.com Mon Mar 13 00:19:37 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 19:19:37 -0500 Subject: rpms/libcdio/devel libcdio.spec,1.15,1.16 Message-ID: <200603130020.k2D0KApS031165@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/libcdio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31148 Modified Files: libcdio.spec Log Message: * Mon Sep 26 2005 Adrian Reber - 0.76-2 - Rebuilt Index: libcdio.spec =================================================================== RCS file: /cvs/extras/rpms/libcdio/devel/libcdio.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libcdio.spec 26 Sep 2005 08:21:49 -0000 1.15 +++ libcdio.spec 13 Mar 2006 00:19:36 -0000 1.16 @@ -1,6 +1,6 @@ Name: libcdio Version: 0.76 -Release: 1%{?dist} +Release: 2%{?dist} Summary: CD-ROM input and control library Group: Applications/Multimedia @@ -107,6 +107,9 @@ %changelog +* Mon Sep 26 2005 Adrian Reber - 0.76-2 +- Rebuilt + * Mon Sep 26 2005 Adrian Reber - 0.76-1 - Updated to 0.76. - Included doxygen generated documentation into -devel From fedora-extras-commits at redhat.com Mon Mar 13 00:44:38 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 19:44:38 -0500 Subject: rpms/most/devel most.spec,1.10,1.11 Message-ID: <200603130045.k2D0jAOE031362@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/most/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31343 Modified Files: most.spec Log Message: * Sun Mar 12 2006 Adrian Reber - 4.10.2-3 - rebuilt Index: most.spec =================================================================== RCS file: /cvs/extras/rpms/most/devel/most.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- most.spec 29 Nov 2005 12:56:04 -0000 1.10 +++ most.spec 13 Mar 2006 00:44:37 -0000 1.11 @@ -1,7 +1,7 @@ Summary: more, less, most Name: most Version: 4.10.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL URL: ftp://space.mit.edu/pub/davis/most/ Group: Applications/Text @@ -43,6 +43,9 @@ %changelog +* Sun Mar 12 2006 Adrian Reber - 4.10.2-3 +- rebuilt + * Tue Nov 29 2005 Adrian Reber - 4.10.2-2 - rebuilt for new slang From fedora-extras-commits at redhat.com Mon Mar 13 00:52:21 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 19:52:21 -0500 Subject: rpms/ninja/devel ninja.spec,1.7,1.8 Message-ID: <200603130052.k2D0qrKP031439@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/ninja/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31422 Modified Files: ninja.spec Log Message: * Sun Mar 12 2006 Adrian Reber - 1.5.8.1-4 - rebuilt Index: ninja.spec =================================================================== RCS file: /cvs/extras/rpms/ninja/devel/ninja.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- ninja.spec 1 Apr 2005 16:36:00 -0000 1.7 +++ ninja.spec 13 Mar 2006 00:52:21 -0000 1.8 @@ -1,13 +1,13 @@ Name: ninja Version: 1.5.8.1 -Release: 3 +Release: 4 License: GPL Summary: Text based Internet Relay Chat (IRC) client Group: Applications/Internet URL: http://ninja.qoop.org/ Source0: ftp://ninja.qoop.org/ninja/sources/%{name}-%{version}.tar.gz Patch0: %{name}-%{version}-doc.patch -Buildroot: %{_tmppath}/%{name}-%{version}-root +Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel %description @@ -58,6 +58,9 @@ %doc README ChangeLog BUGS+TODO %changelog +* Sun Mar 12 2006 Adrian Reber - 1.5.8.1-4 +- rebuilt + * Fri Apr 1 2005 Michael Schwendt - 1.5.8.1-3 - Include ninja directory in datadir. From fedora-extras-commits at redhat.com Mon Mar 13 00:59:32 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 19:59:32 -0500 Subject: rpms/sopwith/devel sopwith.spec,1.6,1.7 Message-ID: <200603130100.k2D104iK031530@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/sopwith/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31486 Modified Files: sopwith.spec Log Message: * Sun Mar 12 2006 Adrian Reber - 1.7.1-3 - rebuilt Index: sopwith.spec =================================================================== RCS file: /cvs/extras/rpms/sopwith/devel/sopwith.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sopwith.spec 29 Mar 2005 20:24:50 -0000 1.6 +++ sopwith.spec 13 Mar 2006 00:59:32 -0000 1.7 @@ -1,6 +1,6 @@ Name: sopwith Version: 1.7.1 -Release: 2 +Release: 3 Summary: SDL port of the sopwith game Group: Amusements/Games @@ -70,6 +70,9 @@ %changelog +* Sun Mar 12 2006 Adrian Reber - 1.7.1-3 +- rebuilt + * Tue Mar 29 2005 Adrian Reber - 1.7.1-2 - added patch to fix gcc4 compiler error From fedora-extras-commits at redhat.com Mon Mar 13 01:39:39 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 20:39:39 -0500 Subject: rpms/source-highlight/devel .cvsignore, 1.7, 1.8 source-highlight.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200603130140.k2D1eC2e001097@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/source-highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1074 Modified Files: .cvsignore source-highlight.spec sources Log Message: * Sun Mar 12 2006 Adrian Reber - 2.3-1 - updated to 2.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/source-highlight/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 17 Oct 2005 10:11:25 -0000 1.7 +++ .cvsignore 13 Mar 2006 01:39:39 -0000 1.8 @@ -1,2 +1,2 @@ -source-highlight-2.2.tar.gz -source-highlight-2.2.tar.gz.sig +source-highlight-2.3.tar.gz +source-highlight-2.3.tar.gz.sig Index: source-highlight.spec =================================================================== RCS file: /cvs/extras/rpms/source-highlight/devel/source-highlight.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- source-highlight.spec 17 Oct 2005 10:11:25 -0000 1.11 +++ source-highlight.spec 13 Mar 2006 01:39:39 -0000 1.12 @@ -1,11 +1,11 @@ Summary: Produces a document with syntax highlighting Name: source-highlight -Version: 2.2 +Version: 2.3 Release: 1%{?dist} Group: Development/Tools License: GPL -Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.2.tar.gz -Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.2.tar.gz.sig +Source0: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.3.tar.gz +Source1: ftp://ftp.gnu.org/gnu/src-highlite/source-highlight-2.3.tar.gz.sig URL: http://www.gnu.org/software/src-highlite/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison, flex, boost-devel @@ -60,6 +60,9 @@ %{_infodir}/source-highlight.info* %changelog +* Sun Mar 12 2006 Adrian Reber - 2.3-1 +- updated to 2.3 + * Mon Oct 17 2005 Adrian Reber - 2.2-1 - updated to 2.2 - added ctags BuildRequires and Requires Index: sources =================================================================== RCS file: /cvs/extras/rpms/source-highlight/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 17 Oct 2005 10:11:25 -0000 1.7 +++ sources 13 Mar 2006 01:39:39 -0000 1.8 @@ -1,2 +1,2 @@ -f9e86829095fbb32d233c4bb38fad3d5 source-highlight-2.2.tar.gz -3e42f2764d9faba3f432b9c78e869488 source-highlight-2.2.tar.gz.sig +321d7e5142aae85261054bc9f7cb8394 source-highlight-2.3.tar.gz +8f6a8ab3d2d306bfd785162eef396288 source-highlight-2.3.tar.gz.sig From fedora-extras-commits at redhat.com Mon Mar 13 02:22:14 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 12 Mar 2006 21:22:14 -0500 Subject: kadischi/livecd_generator livecd-mkinitrd.sh,1.2,1.3 Message-ID: <200603130222.k2D2MiG7003165@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3146/kadischi/livecd_generator Modified Files: livecd-mkinitrd.sh Log Message: Bring Kadischi initrd script up to speed with FC4 busybox-anaconda-1.01-3 (livecd-mkinitrd.sh) Index: livecd-mkinitrd.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- livecd-mkinitrd.sh 28 Aug 2005 10:20:17 -0000 1.2 +++ livecd-mkinitrd.sh 13 Mar 2006 02:22:12 -0000 1.3 @@ -173,7 +173,7 @@ dd if=/dev/zero of=$IMAGE bs=1k count=$IMAGESIZE 2> /dev/null || exit 1 -LODEV=$(echo findlodev | /sbin/nash --quiet) +LODEV=$(losetup -f) if [ -z "$LODEV" ]; then rm -rf $MNTIMAGE $MNTPOINT $IMAGE @@ -218,6 +218,7 @@ inst $rootdir/lib/ld-linux.so.2 "$MNTIMAGE/lib/ld-linux.so.2" inst $rootdir/lib/libselinux.so.1 "$MNTIMAGE/lib/libselinux.so.1" +inst $rootdir/lib/libsepol.so.1 "$MNTIMAGE/lib/libsepol.so.1" if [ -f $rootdir/lib/tls/libc.so.6 ]; then inst $rootdir/lib/tls/libc.so.6 "$MNTIMAGE/lib/libc.so.6" From fedora-extras-commits at redhat.com Mon Mar 13 03:37:49 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 12 Mar 2006 22:37:49 -0500 Subject: rpms/tin/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tin.spec, 1.10, 1.11 Message-ID: <200603130338.k2D3cMZG005302@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/tin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5281 Modified Files: .cvsignore sources tin.spec Log Message: * Sun Mar 13 2006 Adrian Reber - 1.8.1-1 - updated to 1.8.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tin/devel/.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 13 Mar 2006 03:37:49 -0000 1.5 @@ -1 +1,2 @@ -tin-1.6.2.tar.bz2 +tin-1.8.1.tar.bz2 +tin-1.8.1.tar.bz2.sign Index: sources =================================================================== RCS file: /cvs/extras/rpms/tin/devel/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 13 Mar 2006 03:37:49 -0000 1.5 @@ -1 +1,2 @@ -3ab61ba7c7d3b7a3596ba199c570c4e4 tin-1.6.2.tar.bz2 +efeecdf72683213d9e705c28de87ea2e tin-1.8.1.tar.bz2 +4f7dd48ddd79d79203dc0094f692999f tin-1.8.1.tar.bz2.sign Index: tin.spec =================================================================== RCS file: /cvs/extras/rpms/tin/devel/tin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- tin.spec 22 May 2005 23:43:22 -0000 1.10 +++ tin.spec 13 Mar 2006 03:37:49 -0000 1.11 @@ -1,12 +1,12 @@ Name: tin -Version: 1.6.2 -Release: 4 - +Version: 1.8.1 +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.1.tar.bz2 +Source1: ftp://ftp.tin.org/pub/news/clients/tin/v1.8/tin-1.8.1.tar.bz2.sign BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel, byacc, desktop-file-utils, pcre-devel @@ -78,6 +78,7 @@ %{_bindir}/metamutt %{_bindir}/opt-case.pl %{_bindir}/w2r.pl +%{_bindir}/tinews.pl %{_mandir}/man1/* %{_mandir}/man5/* /usr/share/locale/*/*/* @@ -85,6 +86,9 @@ %changelog +* 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 From fedora-extras-commits at redhat.com Mon Mar 13 03:45:56 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 22:45:56 -0500 Subject: extras-buildsys/server Config.py,1.12,1.13 PackageJob.py,1.43,1.44 Message-ID: <200603130345.k2D3jukH005420@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5384/server Modified Files: Config.py PackageJob.py Log Message: 2006-03-12 Dan Williams Fix up kmod support. * server/Config.py - Fix splitting of arches for Additonal Package Arches - Use wildcard matching (*, ?, [...], [!...]) for package names in Additional Package Arches so we can support kmods easily * server/PackageJob.py - Add lots of comments in arch_handling() so people can tell what's going on Index: Config.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Config.py 1 Dec 2005 03:17:25 -0000 1.12 +++ Config.py 13 Mar 2006 03:45:48 -0000 1.13 @@ -15,6 +15,7 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import os +import fnmatch from ConfigParser import ConfigParser from plague import BaseConfig @@ -166,6 +167,7 @@ self._testing = self.get_bool("General", "testing") self._mock_configs = self._find_mock_configs() + self._addl_pkg_arches = self._get_addl_pkg_arches() def _find_mock_configs(self): mock_configs = {} @@ -215,7 +217,7 @@ def testing(self): return self._testing - def addl_pkg_arches(self): + def _get_addl_pkg_arches(self): if not self._config.has_section("Additional Package Arches"): return {} items = self._config.items("Additional Package Arches") @@ -224,12 +226,20 @@ if type(arches) != type("") or not len(arches): continue try: - l = opt.split() - except Exception: + l = arches.split() + except Exception, e: continue addl_arches[pkg] = l return addl_arches + def addl_arches_for_pkg(self, name): + # Match package name against Additional Package Arches + # entries, taking wildcards into account + for item in self._addl_pkg_arches.keys(): + if fnmatch.fnmatchcase(name, item): + return self._addl_pkg_arches[item] + return [] + def save_default_config(self, filename=None): self.add_section("General") self.set_option("General", "distro", "fedora") Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- PackageJob.py 26 Feb 2006 17:00:46 -0000 1.43 +++ PackageJob.py 13 Mar 2006 03:45:48 -0000 1.44 @@ -207,16 +207,15 @@ return self.uid def arch_handling(self, hdr): - addl_arches = [] - try: - addl_arches = self._target_cfg.addl_pkg_arches()[self.name] - except KeyError: - pass + # Grab additional allowed arches for this package, using + # wildcard matching if needed + addl_arches = self._target_cfg.addl_arches_for_pkg(self.name) + # Grab list of base arches (like i386, ppc, x86_64) that this + # buildsys supports. NOT subarch variants like i686, i586, ppc32, etc. base_arches = self._target_cfg.basearches() - opt_arches = self._target_cfg.optarches() - # Remove arches we don't support from addl_arches + # Remove arches the buildsys doesn't support from addl_arches for arch in addl_arches: # ArchUtils.sub_arches is only used to determine which arches to build on by default, # so that if we have an Additional Package Arches that specifies @@ -227,45 +226,63 @@ if master_addl_arch not in base_arches: addl_arches.remove(arch) + # Grab arches the SRPM does/does not want to build for. If the package + # does use one or more of these tags in the specfile, hdr[''] will + # return an empty list, and we'll use defaults instead ba = hdr['buildarchs'] exclusive = hdr['exclusivearch'] exclude = hdr['excludearch'] build_arches = {} + # If the SRPM is noarch, there's nothing left to do, since + # it can build on any architecture the builders support if ba == ['noarch']: build_arches['noarch'] = None return (build_arches, None, None) - # default to building all base arches the 'target' + # default to building all base arches the target # supports, and any additional arches from the # Additional Package Arches file whose "master" arch # is enabled for this target - pkg_arches = [] - allowed_arches = [] + pkg_arches = [] # Arches the package wants to build for + allowed_arches = [] # Arches the buildsys allows + + # Add all base architectures the buildsys supports for arch in base_arches: pkg_arches.append(arch) allowed_arches.append(arch) + + # Add additional per-package architectures from Additional + # Package Architectures configuration option for arch in addl_arches: pkg_arches.append(arch) allowed_arches.append(arch) - # Optional arches don't get built by default but are "allowed" + + # Allow building on any optional architectures the buildsystem + # supports, but don't build for them unless the package + # requests it + opt_arches = self._target_cfg.optarches() for arch in opt_arches: allowed_arches.append(arch) if ba: + # If the package specifies a set of arches with + # BuildArch, use those rather than the default set pkg_arches = ba - else: - if exclusive: - pkg_arches = exclusive + elif exclusive: + # If the package specifies a set of arches with + # ExclusiveArch, use those rather than the default set + pkg_arches = exclusive + # Filter out any arches the package explicitly excludes if exclude: for arch in exclude: if arch in pkg_arches: pkg_arches.remove(arch) - # we probably need to check the archs, and make sure they are what - # we can build for + # Filter the final list of arches the package will build on + # through the list of arches this buildsys allows for thisarch in pkg_arches: if thisarch in allowed_arches: build_arches[thisarch] = None From fedora-extras-commits at redhat.com Mon Mar 13 03:45:50 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 22:45:50 -0500 Subject: extras-buildsys ChangeLog,1.173,1.174 Message-ID: <200603130346.k2D3kLSX005423@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5384 Modified Files: ChangeLog Log Message: 2006-03-12 Dan Williams Fix up kmod support. * server/Config.py - Fix splitting of arches for Additonal Package Arches - Use wildcard matching (*, ?, [...], [!...]) for package names in Additional Package Arches so we can support kmods easily * server/PackageJob.py - Add lots of comments in arch_handling() so people can tell what's going on Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- ChangeLog 12 Mar 2006 13:43:34 -0000 1.173 +++ ChangeLog 13 Mar 2006 03:45:43 -0000 1.174 @@ -1,5 +1,18 @@ 2006-03-12 Dan Williams + Fix up kmod support. + + * server/Config.py + - Fix splitting of arches for Additonal Package Arches + - Use wildcard matching (*, ?, [...], [!...]) for package names in + Additional Package Arches so we can support kmods easily + + * server/PackageJob.py + - Add lots of comments in arch_handling() so people can tell what's + going on + +2006-03-12 Dan Williams + * server/BuildMaster.py server/DBManager.py server/UserInterface.py From fedora-extras-commits at redhat.com Mon Mar 13 04:16:42 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:16:42 -0500 Subject: extras-buildsys/server Config.py, 1.7.2.3, 1.7.2.4 PackageJob.py, 1.31.2.9, 1.31.2.10 Message-ID: <200603130416.k2D4Ggij007444@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7387/server Modified Files: Tag: STABLE_0_4 Config.py PackageJob.py Log Message: 2006-03-12 Dan Williams Fix up kmod support. * server/Config.py - Fix splitting of arches for Additonal Package Arches - Use wildcard matching (*, ?, [...], [!...]) for package names in Additional Package Arches so we can support kmods easily * server/PackageJob.py - Add lots of comments in arch_handling() so people can tell what's going on Index: Config.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v retrieving revision 1.7.2.3 retrieving revision 1.7.2.4 diff -u -r1.7.2.3 -r1.7.2.4 --- Config.py 14 Nov 2005 19:14:25 -0000 1.7.2.3 +++ Config.py 13 Mar 2006 04:16:34 -0000 1.7.2.4 @@ -15,6 +15,7 @@ # Copyright 2005 Dan Williams and Red Hat, Inc. import os +import fnmatch from ConfigParser import ConfigParser from plague import BaseConfig @@ -163,6 +164,8 @@ self._repo = self.get_str("General", "repo") self._testing = self.get_bool("General", "testing") + self._addl_pkg_arches = self._get_addl_pkg_arches() + def parent_cfg(self): return self._parent_cfg @@ -192,7 +195,7 @@ def testing(self): return self._testing - def addl_pkg_arches(self): + def _get_addl_pkg_arches(self): if not self._config.has_section("Additional Package Arches"): return {} items = self._config.items("Additional Package Arches") @@ -201,12 +204,20 @@ if type(arches) != type("") or not len(arches): continue try: - l = opt.split() - except Exception: + l = arches.split() + except Exception, e: continue addl_arches[pkg] = l return addl_arches + def addl_arches_for_pkg(self, name): + # Match package name against Additional Package Arches + # entries, taking wildcards into account + for item in self._addl_pkg_arches.keys(): + if fnmatch.fnmatchcase(name, item): + return self._addl_pkg_arches[item] + return [] + def save_default_config(self, filename=None): self.add_section("General") self.set_option("General", "distro", "fedora") Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.31.2.9 retrieving revision 1.31.2.10 diff -u -r1.31.2.9 -r1.31.2.10 --- PackageJob.py 19 Feb 2006 04:44:05 -0000 1.31.2.9 +++ PackageJob.py 13 Mar 2006 04:16:34 -0000 1.31.2.10 @@ -183,16 +183,15 @@ return self.uid def arch_handling(self, hdr): - addl_arches = [] - try: - addl_arches = self._target_cfg.addl_pkg_arches()[self.name] - except KeyError: - pass + # Grab additional allowed arches for this package, using + # wildcard matching if needed + addl_arches = self._target_cfg.addl_arches_for_pkg(self.name) + # Grab list of base arches (like i386, ppc, x86_64) that this + # buildsys supports. NOT subarch variants like i686, i586, ppc32, etc. base_arches = self._target_cfg.get_list("Arches", "base_arches") - opt_arches = self._target_cfg.get_list("Arches", "optional_arches") - # Remove arches we don't support from addl_arches + # Remove arches the buildsys doesn't support from addl_arches for arch in addl_arches: # ArchUtils.sub_arches is only used to determine which arches to build on by default, # so that if we have an Additional Package Arches that specifies @@ -203,45 +202,63 @@ if master_addl_arch not in base_arches: addl_arches.remove(arch) + # Grab arches the SRPM does/does not want to build for. If the package + # does use one or more of these tags in the specfile, hdr[''] will + # return an empty list, and we'll use defaults instead ba = hdr['buildarchs'] exclusive = hdr['exclusivearch'] exclude = hdr['excludearch'] build_arches = {} + # If the SRPM is noarch, there's nothing left to do, since + # it can build on any architecture the builders support if ba == ['noarch']: build_arches['noarch'] = None return (build_arches, None, None) - # default to building all base arches the 'target' + # default to building all base arches the target # supports, and any additional arches from the # Additional Package Arches file whose "master" arch # is enabled for this target - pkg_arches = [] - allowed_arches = [] + pkg_arches = [] # Arches the package wants to build for + allowed_arches = [] # Arches the buildsys allows + + # Add all base architectures the buildsys supports for arch in base_arches: pkg_arches.append(arch) allowed_arches.append(arch) + + # Add additional per-package architectures from Additional + # Package Architectures configuration option for arch in addl_arches: pkg_arches.append(arch) allowed_arches.append(arch) - # Optional arches don't get built by default but are "allowed" + + # Allow building on any optional architectures the buildsystem + # supports, but don't build for them unless the package + # requests it + opt_arches = self._target_cfg.get_list("Arches", "optional_arches") for arch in opt_arches: allowed_arches.append(arch) if ba: + # If the package specifies a set of arches with + # BuildArch, use those rather than the default set pkg_arches = ba - else: - if exclusive: - pkg_arches = exclusive + elif exclusive: + # If the package specifies a set of arches with + # ExclusiveArch, use those rather than the default set + pkg_arches = exclusive + # Filter out any arches the package explicitly excludes if exclude: for arch in exclude: if arch in pkg_arches: pkg_arches.remove(arch) - # we probably need to check the archs, and make sure they are what - # we can build for + # Filter the final list of arches the package will build on + # through the list of arches this buildsys allows for thisarch in pkg_arches: if thisarch in allowed_arches: build_arches[thisarch] = None From fedora-extras-commits at redhat.com Mon Mar 13 04:16:36 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:16:36 -0500 Subject: extras-buildsys ChangeLog,1.126.2.42,1.126.2.43 Message-ID: <200603130417.k2D4H6gY007447@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7387 Modified Files: Tag: STABLE_0_4 ChangeLog Log Message: 2006-03-12 Dan Williams Fix up kmod support. * server/Config.py - Fix splitting of arches for Additonal Package Arches - Use wildcard matching (*, ?, [...], [!...]) for package names in Additional Package Arches so we can support kmods easily * server/PackageJob.py - Add lots of comments in arch_handling() so people can tell what's going on Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.42 retrieving revision 1.126.2.43 diff -u -r1.126.2.42 -r1.126.2.43 --- ChangeLog 12 Mar 2006 05:52:48 -0000 1.126.2.42 +++ ChangeLog 13 Mar 2006 04:16:26 -0000 1.126.2.43 @@ -1,5 +1,18 @@ 2006-03-12 Dan Williams + Fix up kmod support. + + * server/Config.py + - Fix splitting of arches for Additonal Package Arches + - Use wildcard matching (*, ?, [...], [!...]) for package names in + Additional Package Arches so we can support kmods easily + + * server/PackageJob.py + - Add lots of comments in arch_handling() so people can tell what's + going on + +2006-03-12 Dan Williams + * builder/builder.py - Add a SIGTERM handler for clean shutdown - Clean up lifecycle management From fedora-extras-commits at redhat.com Mon Mar 13 04:30:15 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:30:15 -0500 Subject: extras-buildsys ChangeLog, 1.126.2.43, 1.126.2.44 plague.spec, 1.27.2.4, 1.27.2.5 Message-ID: <200603130430.k2D4UF7N007513@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7492 Modified Files: Tag: STABLE_0_4 ChangeLog plague.spec Log Message: 2006-03-12 Dan Williams * Release of 0.4.4 Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.43 retrieving revision 1.126.2.44 diff -u -r1.126.2.43 -r1.126.2.44 --- ChangeLog 13 Mar 2006 04:16:26 -0000 1.126.2.43 +++ ChangeLog 13 Mar 2006 04:30:08 -0000 1.126.2.44 @@ -1,5 +1,9 @@ 2006-03-12 Dan Williams + * Release of 0.4.4 + +2006-03-12 Dan Williams + Fix up kmod support. * server/Config.py Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.27.2.4 retrieving revision 1.27.2.5 diff -u -r1.27.2.4 -r1.27.2.5 --- plague.spec 28 Nov 2005 17:51:21 -0000 1.27.2.4 +++ plague.spec 13 Mar 2006 04:30:08 -0000 1.27.2.5 @@ -2,7 +2,7 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.3 +Version: 0.4.4 Release: 1%{?dist} License: GPL Group: Development/Tools @@ -109,7 +109,6 @@ %files %defattr(-, root, root) -%doc README ChangeLog %{_bindir}/%{name}-server %dir %{_datadir}/%{name}/server %{_datadir}/%{name}/server/*.py* @@ -120,6 +119,7 @@ %files common %defattr(-, root, root) +%doc README ChangeLog /usr/lib/python?.?/site-packages/plague/*.py* %files builder @@ -144,6 +144,46 @@ %changelog +* Sun Mar 12 2006 Dan Williams 0.4.4-1 +- Update to 0.4.4 release + - Don't use pyOpenSSL's sendall() call, but simulate it to achieve + timeouts, better error handling, and more efficient CPU usage + - Fix up initscripts and lifecycle management + - Implement a TERM handler in server & builder for clean shutdown + - Ensure jobs don't hang around on builders if they get left there for + some reason (ie, server didn't unlock repo for the job) + - Make Additional Package Arches really work (kmod support) + +* Tue Jan 24 2006 Dan Williams 0.4.3-6 +- Increase build server builder thread sleep time to work around SSL issues +- Spawn mock in a new process group, and when killing jobs kill the entire + process group. Hopefully fix orphaned rpmbuild processes on job kill + +* Mon Jan 23 2006 Dan Williams 0.4.3-5 +- Restore builder connection timeout + +* Mon Jan 23 2006 Dan Williams 0.4.3-4 +- Revert SSL fixes from last build + +* Sun Jan 22 2006 Dan Williams 0.4.3-3 +- Don't traceback when killing jobs on builders +- Work around SSL hanging issues + +* Tue Nov 29 2005 Dan Williams 0.4.3-2 +- Move README and ChangeLog to -common package +- Traceback/debug functionality added in server, depends on + threadframe module from elsewhere. Disabled by default. + +* Thu Nov 24 2005 Dan Williams 0.4.3-1 +- Add socket timeouts for fileserver and xmlrpc bits + +* Fri Nov 18 2005 Dan Williams 0.4.2-7 +- Suspend builders on hard errors such as running out of disk space +- Retry downloads from server/builder 5 times, not 3 +- Log retried downloads on the server +- Add socket timeouts to downloads to work around hanging issues + when downloading from the builder (the downloading/done issue) + * Tue Nov 15 2005 Dan Williams 0.4.2-5 - Log kill requests on the server From fedora-extras-commits at redhat.com Mon Mar 13 04:36:22 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 12 Mar 2006 23:36:22 -0500 Subject: rpms/rogue/devel rogue.spec,1.1,1.2 Message-ID: <200603130436.k2D4as5E007601@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7575 Modified Files: rogue.spec Log Message: Added missing BR: Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rogue.spec 10 Mar 2006 15:59:40 -0000 1.1 +++ rogue.spec 13 Mar 2006 04:36:21 -0000 1.2 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -12,8 +12,8 @@ Patch1: rogue-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#BuildRequires: -#Requires: +BuildRequires: desktop-file-utils +BuildRequires: ncurses-devel %description The one, the only, the original graphical adventure game that spawned @@ -60,5 +60,8 @@ %changelog +* Sun Mar 12 2006 Wart 5.4.2-2 +- Added missing BR: ncurses-devel, desktop-file-utils + * Sat Feb 25 2006 Wart 5.4.2-1 - Initial spec file. From fedora-extras-commits at redhat.com Mon Mar 13 04:36:56 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:36:56 -0500 Subject: rpms/plague/devel .cvsignore, 1.9, 1.10 plague.spec, 1.25, 1.26 sources, 1.23, 1.24 Message-ID: <200603130437.k2D4bSij007624@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7600 Modified Files: .cvsignore plague.spec sources Log Message: * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve timeouts, better error handling, and more efficient CPU usage - Fix up initscripts and lifecycle management - Implement a TERM handler in server & builder for clean shutdown - Ensure jobs don't hang around on builders if they get left there for some reason (ie, server didn't unlock repo for the job) - Make Additional Package Arches really work (kmod support) - Own /usr/lib/python?.?/site-packages/plague (#rh172794#) - Require createrepo >= 4.3 (#rh170531#) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plague/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 24 Nov 2005 23:47:57 -0000 1.9 +++ .cvsignore 13 Mar 2006 04:36:56 -0000 1.10 @@ -6,3 +6,4 @@ plague-0.4.1.tar.bz2 plague-0.4.2.tar.bz2 plague-0.4.3.tar.bz2 +plague-0.4.4.tar.bz2 Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- plague.spec 16 Feb 2006 05:12:37 -0000 1.25 +++ plague.spec 13 Mar 2006 04:36:56 -0000 1.26 @@ -2,8 +2,8 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.3 -Release: 6%{?dist} +Version: 0.4.4 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 @@ -145,7 +145,15 @@ %changelog -* ------- +* Sun Mar 12 2006 Dan Williams 0.4.4-1 +- Update to 0.4.4 release + - Don't use pyOpenSSL's sendall() call, but simulate it to achieve + timeouts, better error handling, and more efficient CPU usage + - Fix up initscripts and lifecycle management + - Implement a TERM handler in server & builder for clean shutdown + - Ensure jobs don't hang around on builders if they get left there for + some reason (ie, server didn't unlock repo for the job) + - Make Additional Package Arches really work (kmod support) - Own /usr/lib/python?.?/site-packages/plague (#rh172794#) - Require createrepo >= 4.3 (#rh170531#) Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/devel/sources,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- sources 24 Jan 2006 19:07:00 -0000 1.23 +++ sources 13 Mar 2006 04:36:56 -0000 1.24 @@ -1 +1 @@ -6282064ae35d13f6b72744400c8a49c0 plague-0.4.3.tar.bz2 +eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 04:40:05 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:40:05 -0500 Subject: rpms/plague/FC-4 plague.spec,1.22,1.23 sources,1.21,1.22 Message-ID: <200603130440.k2D4ecPw007744@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7723 Modified Files: plague.spec sources Log Message: * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve timeouts, better error handling, and more efficient CPU usage - Fix up initscripts and lifecycle management - Implement a TERM handler in server & builder for clean shutdown - Ensure jobs don't hang around on builders if they get left there for some reason (ie, server didn't unlock repo for the job) - Make Additional Package Arches really work (kmod support) - Own /usr/lib/python?.?/site-packages/plague (#rh172794#) - Require createrepo >= 4.3 (#rh170531#) Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- plague.spec 24 Jan 2006 19:07:39 -0000 1.22 +++ plague.spec 13 Mar 2006 04:40:05 -0000 1.23 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.3 -Release: 6%{?dist} +Version: 0.4.4 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo +Requires: python-sqlite, createrepo >= 4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -120,7 +120,8 @@ %files common %defattr(-, root, root) %doc README ChangeLog -/usr/lib/python?.?/site-packages/plague/*.py* +%dir /usr/lib/python?.?/site-packages/%{name} +/usr/lib/python?.?/site-packages/%{name}/*.py* %files builder %defattr(-, root, root) @@ -144,6 +145,18 @@ %changelog +* Sun Mar 12 2006 Dan Williams 0.4.4-1 +- Update to 0.4.4 release + - Don't use pyOpenSSL's sendall() call, but simulate it to achieve + timeouts, better error handling, and more efficient CPU usage + - Fix up initscripts and lifecycle management + - Implement a TERM handler in server & builder for clean shutdown + - Ensure jobs don't hang around on builders if they get left there for + some reason (ie, server didn't unlock repo for the job) + - Make Additional Package Arches really work (kmod support) +- Own /usr/lib/python?.?/site-packages/plague (#rh172794#) +- Require createrepo >= 4.3 (#rh170531#) + * Tue Jan 24 2006 Dan Williams 0.4.3-6 - Increase build server builder thread sleep time to work around SSL issues - Spawn mock in a new process group, and when killing jobs kill the entire Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/FC-4/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 24 Jan 2006 19:07:39 -0000 1.21 +++ sources 13 Mar 2006 04:40:05 -0000 1.22 @@ -1 +1 @@ -6282064ae35d13f6b72744400c8a49c0 plague-0.4.3.tar.bz2 +eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 04:42:55 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 12 Mar 2006 23:42:55 -0500 Subject: rpms/plague/FC-3 plague.spec,1.22,1.23 sources,1.21,1.22 Message-ID: <200603130443.k2D4hR3G007835@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7802 Modified Files: plague.spec sources Log Message: * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve timeouts, better error handling, and more efficient CPU usage - Fix up initscripts and lifecycle management - Implement a TERM handler in server & builder for clean shutdown - Ensure jobs don't hang around on builders if they get left there for some reason (ie, server didn't unlock repo for the job) - Make Additional Package Arches really work (kmod support) - Own /usr/lib/python?.?/site-packages/plague (#rh172794#) - Require createrepo >= 4.3 (#rh170531#) Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- plague.spec 24 Jan 2006 19:08:26 -0000 1.22 +++ plague.spec 13 Mar 2006 04:42:55 -0000 1.23 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.3 -Release: 6%{?dist} +Version: 0.4.4 +Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo +Requires: python-sqlite, createrepo >= 4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -120,7 +120,8 @@ %files common %defattr(-, root, root) %doc README ChangeLog -/usr/lib/python?.?/site-packages/plague/*.py* +%dir /usr/lib/python?.?/site-packages/%{name} +/usr/lib/python?.?/site-packages/%{name}/*.py* %files builder %defattr(-, root, root) @@ -144,6 +145,18 @@ %changelog +* Sun Mar 12 2006 Dan Williams 0.4.4-1 +- Update to 0.4.4 release + - Don't use pyOpenSSL's sendall() call, but simulate it to achieve + timeouts, better error handling, and more efficient CPU usage + - Fix up initscripts and lifecycle management + - Implement a TERM handler in server & builder for clean shutdown + - Ensure jobs don't hang around on builders if they get left there for + some reason (ie, server didn't unlock repo for the job) + - Make Additional Package Arches really work (kmod support) +- Own /usr/lib/python?.?/site-packages/plague (#rh172794#) +- Require createrepo >= 4.3 (#rh170531#) + * Tue Jan 24 2006 Dan Williams 0.4.3-6 - Increase build server builder thread sleep time to work around SSL issues - Spawn mock in a new process group, and when killing jobs kill the entire Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/FC-3/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 24 Jan 2006 19:08:26 -0000 1.21 +++ sources 13 Mar 2006 04:42:55 -0000 1.22 @@ -1 +1 @@ -6282064ae35d13f6b72744400c8a49c0 plague-0.4.3.tar.bz2 +eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 04:54:55 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:54:55 -0500 Subject: rpms/python-cpio - New directory Message-ID: <200603130454.k2D4svUl007976@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7968/python-cpio Log Message: Directory /cvs/extras/rpms/python-cpio added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 04:55:01 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:55:01 -0500 Subject: rpms/python-cpio/devel - New directory Message-ID: <200603130455.k2D4t3rl007991@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7968/python-cpio/devel Log Message: Directory /cvs/extras/rpms/python-cpio/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 04:55:18 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:55:18 -0500 Subject: rpms/python-cpio Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603130455.k2D4tKoq008025@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8013 Added Files: Makefile import.log Log Message: Setup of module python-cpio --- NEW FILE Makefile --- # Top level Makefile for module python-cpio all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 13 04:55:23 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:55:23 -0500 Subject: rpms/python-cpio/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603130455.k2D4tPw2008045@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8013/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-cpio --- NEW 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 Mar 13 04:55:54 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:55:54 -0500 Subject: rpms/python-cpio import.log,1.1,1.2 Message-ID: <200603130456.k2D4uQNR008116@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8082 Modified Files: import.log Log Message: auto-import python-cpio-0.1-1 on branch devel from python-cpio-0.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-cpio/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Mar 2006 04:55:17 -0000 1.1 +++ import.log 13 Mar 2006 04:55:54 -0000 1.2 @@ -0,0 +1 @@ +python-cpio-0_1-1:HEAD:python-cpio-0.1-1.src.rpm:1142225747 From fedora-extras-commits at redhat.com Mon Mar 13 04:56:00 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sun, 12 Mar 2006 23:56:00 -0500 Subject: rpms/python-cpio/devel python-cpio.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603130456.k2D4uWav008120@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/python-cpio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8082/devel Modified Files: .cvsignore sources Added Files: python-cpio.spec Log Message: auto-import python-cpio-0.1-1 on branch devel from python-cpio-0.1-1.src.rpm --- NEW FILE python-cpio.spec --- %{!?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-cpio Version: 0.1 Release: 1%{?dist} Summary: A Python module for accessing cpio archives Group: Development/Languages License: LGPL URL: http://developer.berlios.de/projects/python-cpio/ Source0: http://download.berlios.de/python-cpio/python-cpio-0.1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description This is a Python module for accessing cpio archives. %prep %setup -q %build CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build %install rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING.lib README TODO %{python_sitelib}/cpioarchive.py %{python_sitelib}/cpioarchive.py[co] %changelog * Tue Jan 3 2006 Ignacio Vazquez-Abrams 0.1-1 - Initial RPM release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-cpio/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Mar 2006 04:55:23 -0000 1.1 +++ .cvsignore 13 Mar 2006 04:56:00 -0000 1.2 @@ -0,0 +1 @@ +python-cpio-0.1.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-cpio/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Mar 2006 04:55:23 -0000 1.1 +++ sources 13 Mar 2006 04:56:00 -0000 1.2 @@ -0,0 +1 @@ +277934c8aa149dfa2714d70a68fe363d python-cpio-0.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 05:49:42 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Mon, 13 Mar 2006 00:49:42 -0500 Subject: rpms/deskbar-applet/devel deskbar-applet-2.14.0-beagleexists.patch, NONE, 1.1 deskbar-applet-2.14.0-fedorabz.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 deskbar-applet.spec, 1.19, 1.20 sources, 1.9, 1.10 deskbar-applet-2.13.91-beagleexists.patch, 1.1, NONE deskbar-applet-2.13.91-fedorabz.patch, 1.1, NONE deskbar-applet-2.13.91-prctl.patch, 1.1, NONE Message-ID: <200603130550.k2D5oEiJ010243@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10216 Modified Files: .cvsignore deskbar-applet.spec sources Added Files: deskbar-applet-2.14.0-beagleexists.patch deskbar-applet-2.14.0-fedorabz.patch Removed Files: deskbar-applet-2.13.91-beagleexists.patch deskbar-applet-2.13.91-fedorabz.patch deskbar-applet-2.13.91-prctl.patch Log Message: Upstream update deskbar-applet-2.14.0-beagleexists.patch: --- NEW FILE deskbar-applet-2.14.0-beagleexists.patch --- --- deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py.fedora 2006-03-12 21:24:16.000000000 -0500 +++ deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py 2006-03-12 21:24:56.000000000 -0500 @@ -1,5 +1,6 @@ import os from os.path import exists, join +from glob import glob from gettext import gettext as _ import gobject @@ -9,7 +10,7 @@ #FIXME: better way to detect beagle ? def _check_requirements(): for dir in get_xdg_data_dirs(): - if exists(join(dir, "applications", "best.desktop")) or exists(join(dir, "applications", "beagle-search.desktop")): + if exists(join(dir, "applications", "best.desktop")) or glob(join(dir, "applications", "*beagle-search.desktop")): return (deskbar.Handler.HANDLER_IS_HAPPY, None, None) return (deskbar.Handler.HANDLER_IS_NOT_APPLICABLE, "Beagle does not seem to be installed, skipping", None) deskbar-applet-2.14.0-fedorabz.patch: --- NEW FILE deskbar-applet-2.14.0-fedorabz.patch --- --- deskbar-applet-2.14.0/deskbar/handlers/Makefile.in.fedorabz 2006-03-12 21:21:00.000000000 -0500 +++ deskbar-applet-2.14.0/deskbar/handlers/Makefile.in 2006-03-12 21:21:25.000000000 -0500 @@ -240,6 +240,7 @@ email_address.py epiphany.py files.py galago.py galeon.py \ gtkbookmarks.py google-live.py history.py mozilla.py \ programs.py pathprograms.py volumes.py web_address.py yahoo.py \ + fedorabz.py \ $(am__append_1) EXTRA_DIST = \ debug-async_handler.py \ --- deskbar-applet-2.14.0/data/art/Makefile.in.fedorabz 2006-03-12 21:20:07.000000000 -0500 +++ deskbar-applet-2.14.0/data/art/Makefile.in 2006-03-12 21:20:42.000000000 -0500 @@ -244,6 +244,7 @@ deskbar-applet-panel-v.png \ deskbar-applet-panel-h.png \ deskbar-applet-small.png \ + fedorabz.png \ folder-bookmark.png \ generic.png \ yahoo.png \ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 14 Feb 2006 05:00:09 -0000 1.9 +++ .cvsignore 13 Mar 2006 05:49:42 -0000 1.10 @@ -1 +1 @@ -deskbar-applet-2.13.91.tar.bz2 +deskbar-applet-2.14.0.tar.bz2 Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- deskbar-applet.spec 24 Feb 2006 12:07:06 -0000 1.19 +++ deskbar-applet.spec 13 Mar 2006 05:49:42 -0000 1.20 @@ -2,19 +2,18 @@ %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: deskbar-applet -Version: 2.13.91 -Release: 3%{?dist} +Version: 2.14.0 +Release: 1%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet License: GPL -URL: http://browserbookapp.sourceforge.net/deskbar.html -Source0: http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.13/%{name}-%{version}.tar.bz2 +URL: http://live.gnome.org/DeskbarApplet +Source0: http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.14/%{name}-%{version}.tar.bz2 Source1: fedorabz.py Source2: fedorabz.png -Patch0: deskbar-applet-2.13.91-fedorabz.patch -Patch1: deskbar-applet-2.13.91-prctl.patch -Patch2: deskbar-applet-2.13.91-beagleexists.patch +Patch0: deskbar-applet-2.14.0-fedorabz.patch +Patch2: deskbar-applet-2.14.0-beagleexists.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel gnome-python2-applet Requires: gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2 @@ -23,24 +22,19 @@ Requires(preun): GConf2 %description -This applet looks like the current Gnome Mini-Commander, but it launches search -queries instead of programs. - -Example search-engines include -+ Google -+ MSN -+ EBay -+ IMDB -+ Stock Quotes -+ Wikipedia -+ Local File Search (and eventually also Beagle) +The goal of DeskbarApplet is to provide an omnipresent versatile search +interface. By typing search terms into the deskbar entry in your panel you are +presented with the search results as you type. + +Seaches are handled by a series of plugins. DeskbarApplet provides a simple +interface to manage these plugins to provide you with the search results that +fit your needs. %prep %setup -q cp %{SOURCE1} deskbar/handlers cp %{SOURCE2} data/art %patch -p1 -b .fedorabz -%patch1 -p1 -b .prctl %patch2 -p1 -b .beagleexists %build @@ -90,6 +84,9 @@ %{_datadir}/pixmaps/%{name}.svg %changelog +* Sun Mar 12 2006 Ignacio Vazquez-Abrams 2.14.0-1 +- Upstream update + * Fri Feb 24 2006 Ignacio Vazquez-Abrams 2.13.91-3 - Added beagle fix (#182728) Index: sources =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 14 Feb 2006 05:00:09 -0000 1.9 +++ sources 13 Mar 2006 05:49:42 -0000 1.10 @@ -1 +1 @@ -693c3221d73e8a6fe59144249e6deb43 deskbar-applet-2.13.91.tar.bz2 +2c9910160c2814e6497c5d6b6887fa8e deskbar-applet-2.14.0.tar.bz2 --- deskbar-applet-2.13.91-beagleexists.patch DELETED --- --- deskbar-applet-2.13.91-fedorabz.patch DELETED --- --- deskbar-applet-2.13.91-prctl.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 13 07:36:37 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 13 Mar 2006 02:36:37 -0500 Subject: rpms/perl-XML-RSS/FC-4 .cvsignore, 1.2, 1.3 perl-XML-RSS.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603130737.k2D7b9O8014469@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-XML-RSS/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14431/FC-4 Modified Files: .cvsignore perl-XML-RSS.spec sources Log Message: * Mon Mar 13 2006 Ville Skytt?? - 1.10-1 - 1.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jan 2005 11:10:17 -0000 1.2 +++ .cvsignore 13 Mar 2006 07:36:36 -0000 1.3 @@ -1 +1 @@ -XML-RSS-1.05.tar.gz +XML-RSS-1.10.tar.gz Index: perl-XML-RSS.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/FC-4/perl-XML-RSS.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-XML-RSS.spec 6 Apr 2005 22:13:09 -0000 1.3 +++ perl-XML-RSS.spec 13 Mar 2006 07:36:36 -0000 1.4 @@ -1,19 +1,18 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-XML-RSS -Version: 1.05 -Release: 2 - +Version: 1.10 +Release: 1%{?dist} Summary: Perl module for managing RDF Site Summary (RSS) files Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/XML-RSS/ -Source0: http://www.cpan.org/authors/id/K/KE/KELLAN/XML-RSS-1.05.tar.gz +Source0: http://www.cpan.org/authors/id/A/AB/ABH/XML-RSS-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Test::Manifest), perl(XML::Parser) +BuildRequires: perl(Test::Manifest) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(XML::Parser) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -40,7 +39,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -51,12 +50,15 @@ %files %defattr(-,root,root,-) %doc Changes README TODO examples -%{perl_vendorlib}/XML -%{_mandir}/man3/*.3* +%{perl_vendorlib}/XML/ +%{_mandir}/man3/XML::RSS.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Mar 13 2006 Ville Skytt?? - 1.10-1 +- 1.10. + +* Fri Apr 7 2005 Michael Schwendt - 1.05-2 - rebuilt * Sat Aug 14 2004 Ville Skytt?? - 0:1.05-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jan 2005 11:10:17 -0000 1.2 +++ sources 13 Mar 2006 07:36:36 -0000 1.3 @@ -1 +1 @@ -3eaa65ec6316edec3194b6a2f384a65c XML-RSS-1.05.tar.gz +d5a55a2eeeb479681bc72d32ac87cf8f XML-RSS-1.10.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 07:36:43 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 13 Mar 2006 02:36:43 -0500 Subject: rpms/perl-XML-RSS/devel .cvsignore, 1.2, 1.3 perl-XML-RSS.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603130737.k2D7bF8H014474@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-XML-RSS/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14431/devel Modified Files: .cvsignore perl-XML-RSS.spec sources Log Message: * Mon Mar 13 2006 Ville Skytt?? - 1.10-1 - 1.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Jan 2005 11:10:17 -0000 1.2 +++ .cvsignore 13 Mar 2006 07:36:43 -0000 1.3 @@ -1 +1 @@ -XML-RSS-1.05.tar.gz +XML-RSS-1.10.tar.gz Index: perl-XML-RSS.spec =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/perl-XML-RSS.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-XML-RSS.spec 6 Apr 2005 22:13:09 -0000 1.3 +++ perl-XML-RSS.spec 13 Mar 2006 07:36:43 -0000 1.4 @@ -1,19 +1,18 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-XML-RSS -Version: 1.05 -Release: 2 - +Version: 1.10 +Release: 1%{?dist} Summary: Perl module for managing RDF Site Summary (RSS) files Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/XML-RSS/ -Source0: http://www.cpan.org/authors/id/K/KE/KELLAN/XML-RSS-1.05.tar.gz +Source0: http://www.cpan.org/authors/id/A/AB/ABH/XML-RSS-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl >= 1:5.6.1, perl(Test::Manifest), perl(XML::Parser) +BuildRequires: perl(Test::Manifest) +BuildRequires: perl(Test::Pod) +BuildRequires: perl(XML::Parser) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -40,7 +39,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -51,12 +50,15 @@ %files %defattr(-,root,root,-) %doc Changes README TODO examples -%{perl_vendorlib}/XML -%{_mandir}/man3/*.3* +%{perl_vendorlib}/XML/ +%{_mandir}/man3/XML::RSS.3* %changelog -* Fri Apr 7 2005 Michael Schwendt +* Mon Mar 13 2006 Ville Skytt?? - 1.10-1 +- 1.10. + +* Fri Apr 7 2005 Michael Schwendt - 1.05-2 - rebuilt * Sat Aug 14 2004 Ville Skytt?? - 0:1.05-0.fdr.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-XML-RSS/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Jan 2005 11:10:17 -0000 1.2 +++ sources 13 Mar 2006 07:36:43 -0000 1.3 @@ -1 +1 @@ -3eaa65ec6316edec3194b6a2f384a65c XML-RSS-1.05.tar.gz +d5a55a2eeeb479681bc72d32ac87cf8f XML-RSS-1.10.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 08:21:04 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Mon, 13 Mar 2006 03:21:04 -0500 Subject: owners owners.list,1.737,1.738 Message-ID: <200603130821.k2D8Lacu016564@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16547 Modified Files: owners.list Log Message: python-cpio Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.737 retrieving revision 1.738 diff -u -r1.737 -r1.738 --- owners.list 11 Mar 2006 21:53:37 -0000 1.737 +++ owners.list 13 Mar 2006 08:21:03 -0000 1.738 @@ -1145,6 +1145,7 @@ Fedora Extras|python-cherrypy|A pythonic, object-oriented web development framework|gijs at gewis.nl|extras-qa at fedoraproject.org| Fedora Extras|python-cherrytemplate|An easy and powerful templating module for Python|gijs at gewis.nl|extras-qa at fedoraproject.org| Fedora Extras|python-clientform|Python module for client-side HTML forms|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| +Fedora Extras|python-cpio|A Python module for accessing cpio archives|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-crypto|A cryptography library for Python|fedora at leemhuis.info|extras-qa at fedoraproject.org| Fedora Extras|python-dateutil|Powerful extensions to the standard datetime module|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|python-dialog|Python interface to the Unix dialog utility|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 13 08:47:10 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 03:47:10 -0500 Subject: rpms/gpsim/devel gpsim.spec,1.3,1.4 Message-ID: <200603130847.k2D8lgnN016694@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16675 Modified Files: gpsim.spec Log Message: Rebuild for FE5. Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gpsim.spec 6 Oct 2005 13:08:40 -0000 1.3 +++ gpsim.spec 13 Mar 2006 08:47:09 -0000 1.4 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.21.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -78,10 +78,13 @@ %{_includedir}/* %changelog -* Thu Oct 6 2005 Alain Portal 0.21.11-1 +* Mon Mar 13 2006 Alain Portal 0.21.11-2 + - Rebuild for FE5 + +* Thu Oct 6 2005 Alain Portal 0.21.11-1 - Remove useless Requires -* Wed Oct 5 2005 Alain Portal 0.21.11-1 +* Wed Oct 5 2005 Alain Portal 0.21.11-1 - New version - Improve download url @@ -104,7 +107,7 @@ * Mon Sep 12 2005 Alain Portal 0.21.4-1 - New version -* Mon Nov 8 2004 Alain Portal 0:0.21.2-0.fdr.2 +* Mon Nov 8 2004 Alain Portal 0:0.21.2-0.fdr.2 - Add BuildRequires flex, readline-devel * Wed Oct 27 2004 Alain Portal 0:0.21.2-0.fdr.1 From fedora-extras-commits at redhat.com Mon Mar 13 08:56:45 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 03:56:45 -0500 Subject: rpms/erlang/FC-4 .cvsignore, 1.4, 1.5 erlang.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603130857.k2D8vHQ7016821@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16765 Modified Files: .cvsignore erlang.spec sources Log Message: new version R10B-10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 29 Dec 2005 00:34:58 -0000 1.4 +++ .cvsignore 13 Mar 2006 08:56:45 -0000 1.5 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-9.tar.gz -otp_doc_man_R10B-9.tar.gz -otp_src_R10B-9.tar.gz +otp_doc_html_R10B-10.tar.gz +otp_doc_man_R10B-10.tar.gz +otp_src_R10B-10.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- erlang.spec 29 Dec 2005 00:34:58 -0000 1.5 +++ erlang.spec 13 Mar 2006 08:56:45 -0000 1.6 @@ -1,14 +1,14 @@ Name: erlang Version: R10B -Release: 9.1%{?dist} +Release: 10.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-9.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-9.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-9.tar.gz +Source: http://www.erlang.org/download/otp_src_R10B-10.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R10B-10.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R10B-10.tar.gz Patch: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -36,7 +36,7 @@ %prep -%setup -q -n otp_src_R10B-9 +%setup -q -n otp_src_R10B-10 %patch -p1 %patch1 -p1 %patch2 -p1 @@ -94,6 +94,9 @@ %changelog +* Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 +- new version R10B-10 + * Thu Dec 29 2005 Gerard Milmeister - R10B-9.1 - New Version R10B-9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Dec 2005 00:34:58 -0000 1.4 +++ sources 13 Mar 2006 08:56:45 -0000 1.5 @@ -1,3 +1,3 @@ -108bc01be67aaa2edde9a0331ef9bc71 otp_doc_html_R10B-9.tar.gz -051cd9893b36313f20a420bc2491905c otp_doc_man_R10B-9.tar.gz -05791e9097f36202eb705df2a1db6500 otp_src_R10B-9.tar.gz +d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz +207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz +c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 08:58:34 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 03:58:34 -0500 Subject: rpms/gputils/devel gputils.spec,1.6,1.7 Message-ID: <200603130859.k2D8x7O9016891@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gputils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16871 Modified Files: gputils.spec Log Message: Rebuild for FE5 Index: gputils.spec =================================================================== RCS file: /cvs/extras/rpms/gputils/devel/gputils.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gputils.spec 12 Sep 2005 20:27:49 -0000 1.6 +++ gputils.spec 13 Mar 2006 08:58:34 -0000 1.7 @@ -1,6 +1,6 @@ Name: gputils Version: 0.13.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Development utilities for Microchip (TM) PIC (TM) microcontrollers Group: Development/Languages @@ -44,6 +44,9 @@ %{_mandir}/fr/man1/* %changelog +* Mon Mar 13 2006 Alain Portal 0.13.3-2 + - Rebuild for FE5 + * Mon Sep 12 2005 Alain Portal 0.13.3-1 - New version - Patch to update french man pages From fedora-extras-commits at redhat.com Mon Mar 13 09:03:47 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 04:03:47 -0500 Subject: rpms/gtk+extra/devel gtk+extra.spec,1.3,1.4 Message-ID: <200603130904.k2D94KPS019274@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gtk+extra/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19233 Modified Files: gtk+extra.spec Log Message: Rebuild for FE5 Index: gtk+extra.spec =================================================================== RCS file: /cvs/extras/rpms/gtk+extra/devel/gtk+extra.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gtk+extra.spec 5 Oct 2005 13:11:43 -0000 1.3 +++ gtk+extra.spec 13 Mar 2006 09:03:47 -0000 1.4 @@ -1,6 +1,6 @@ Name: gtk+extra Version: 2.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library of gtk+ widgets Summary(fr): Une biblioth??que de widgets gtk+ @@ -76,6 +76,9 @@ %changelog +* Mon Mar 13 2006 Alain Portal 2.1.1-2 + - Rebuild for FE5 + * Wed Oct 5 2005 Alain Portal 2.1.1-1 - New version - Revert to the official package. From fedora-extras-commits at redhat.com Mon Mar 13 09:04:21 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:04:21 -0500 Subject: rpms/multisync - New directory Message-ID: <200603130904.k2D94Nqt019284@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19273/multisync Log Message: Directory /cvs/extras/rpms/multisync added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 09:04:40 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:04:40 -0500 Subject: rpms/multisync/devel - New directory Message-ID: <200603130904.k2D94gH3019328@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19273/multisync/devel Log Message: Directory /cvs/extras/rpms/multisync/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 09:05:33 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:05:33 -0500 Subject: rpms/multisync Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603130905.k2D95beO019374@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19362 Added Files: Makefile import.log Log Message: Setup of module multisync --- NEW FILE Makefile --- # Top level Makefile for module multisync all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 13 09:05:45 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:05:45 -0500 Subject: rpms/multisync/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603130905.k2D95l6T019393@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19362/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module multisync --- NEW 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 Mar 13 09:11:41 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:11:41 -0500 Subject: rpms/multisync import.log,1.1,1.2 Message-ID: <200603130912.k2D9CD5e019871@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19610 Modified Files: import.log Log Message: auto-import multisync-0.90.18-4 on branch devel from multisync-0.90.18-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/multisync/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Mar 2006 09:05:33 -0000 1.1 +++ import.log 13 Mar 2006 09:11:40 -0000 1.2 @@ -0,0 +1 @@ +multisync-0_90_18-4:HEAD:multisync-0.90.18-4.src.rpm:1142240940 From fedora-extras-commits at redhat.com Mon Mar 13 09:11:47 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:11:47 -0500 Subject: rpms/multisync/devel multisync-gui-svn151.patch, NONE, 1.1 multisync-rpath.patch, NONE, 1.1 multisync-werror.patch, NONE, 1.1 multisync.desktop, NONE, 1.1 multisync.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603130912.k2D9CKRf019878@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19610/devel Modified Files: .cvsignore sources Added Files: multisync-gui-svn151.patch multisync-rpath.patch multisync-werror.patch multisync.desktop multisync.spec Log Message: auto-import multisync-0.90.18-4 on branch devel from multisync-0.90.18-4.src.rpm multisync-gui-svn151.patch: --- NEW FILE multisync-gui-svn151.patch --- diff -uhrN --exclude=.svn gui/aclocal.m4 /homes/awjb/cvs/multisync-gui/aclocal.m4 --- gui/aclocal.m4 2005-08-31 14:00:35.000000000 +0200 +++ /homes/awjb/cvs/multisync-gui/aclocal.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,6970 +0,0 @@ -# generated automatically by aclocal 1.7.9 -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# 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. - -# Do all the work for Automake. -*- Autoconf -*- - -# This macro actually does too much some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -# Free Software Foundation, Inc. - -# 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, 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. - -# serial 10 - -AC_PREREQ([2.54]) - -# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow -# the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl -# test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && - test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_MISSING_PROG(AMTAR, tar) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. -AC_REQUIRE([AC_PROG_AWK])dnl -AC_REQUIRE([AC_PROG_MAKE_SET])dnl -AC_REQUIRE([AM_SET_LEADING_DOT])dnl - -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -]) -]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $1 | $1:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) - -# Copyright 2002 Free Software Foundation, Inc. - -# 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, 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 - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.7.9])]) - -# Helper functions for option handling. -*- Autoconf -*- - -# Copyright 2001, 2002 Free Software Foundation, Inc. - -# 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, 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. - -# serial 2 - -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) - -# _AM_SET_OPTION(NAME) -# ------------------------------ [...51598 lines suppressed...] - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` - if test -z "$file"; then - file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file` - fi - touch $file - ;; - - tar) - shift - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - fi - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case "$firstarg" in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case "$firstarg" in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and you do not seem to have it handy on your - system. You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 diff -uhrN --exclude=.svn gui/mkinstalldirs /homes/awjb/cvs/multisync-gui/mkinstalldirs --- gui/mkinstalldirs 2005-02-06 07:25:15.000000000 +0100 +++ /homes/awjb/cvs/multisync-gui/mkinstalldirs 1970-01-01 01:00:00.000000000 +0100 @@ -1,111 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy -# Author: Noah Friedman -# Created: 1993-05-16 -# Public domain - -errstatus=0 -dirmode="" - -usage="\ -Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" 1>&2 - exit 0 - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -case $dirmode in - '') - if mkdir -p -- . 2>/dev/null; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - fi - ;; - *) - if mkdir -m "$dirmode" -p -- . 2>/dev/null; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - fi - ;; -esac - -for file -do - set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'` - shift - - pathcomp= - for d - do - pathcomp="$pathcomp$d" - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr="" - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp="$pathcomp/" - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# End: -# mkinstalldirs ends here Binary files gui/multisync0.90 and /homes/awjb/cvs/multisync-gui/multisync0.90 differ Binary files gui/pair.o and /homes/awjb/cvs/multisync-gui/pair.o differ diff -uhrN --exclude=.svn gui/plugins.c /homes/awjb/cvs/multisync-gui/plugins.c --- gui/plugins.c 2005-11-06 13:29:29.000000000 +0100 +++ /homes/awjb/cvs/multisync-gui/plugins.c 2006-03-01 09:09:20.000000000 +0100 @@ -32,5 +32,7 @@ #ifdef ENABLE_EVO msync_register_evo_sync(env); #endif +#ifdef ENABLE_SYNCE msync_register_synce_sync(env); +#endif } Binary files gui/plugins.o and /homes/awjb/cvs/multisync-gui/plugins.o differ diff -uhrN --exclude=.svn gui/stamp-h1 /homes/awjb/cvs/multisync-gui/stamp-h1 --- gui/stamp-h1 2005-08-31 14:03:12.000000000 +0200 +++ /homes/awjb/cvs/multisync-gui/stamp-h1 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -timestamp for config.h Binary files gui/support.o and /homes/awjb/cvs/multisync-gui/support.o differ multisync-rpath.patch: --- NEW FILE multisync-rpath.patch --- --- tools/Makefile.am.orig 2005-11-29 14:43:23.000000000 +0100 +++ tools/Makefile.am 2005-11-29 14:46:18.000000000 +0100 @@ -1,13 +1,13 @@ ## Process this file with automake to produce Makefile.in -AM_CFLAGS = -Wall -Werror -I$(top_srcdir) +AM_CFLAGS = -Wall -I$(top_srcdir) INCLUDES = @PACKAGE_CFLAGS@ bin_PROGRAMS = msynctool convcard msynctool_SOURCES = msynctool.c -msynctool_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) +msynctool_LDFLAGS = @PACKAGE_LIBS@ convcard_SOURCES = convcard.c -convcard_LDFLAGS = @PACKAGE_LIBS@ -R $(libdir) \ No newline at end of file +convcard_LDFLAGS = @PACKAGE_LIBS@ multisync-werror.patch: --- NEW FILE multisync-werror.patch --- --- gui/Makefile.am.orig 2006-03-01 09:23:42.000000000 +0100 +++ gui/Makefile.am 2006-03-01 09:23:54.000000000 +0100 @@ -20,7 +20,7 @@ SYNCELIB = endif -AM_CFLAGS = -Wall -Werror -I$(top_srcdir) +AM_CFLAGS = -Wall -I$(top_srcdir) INCLUDES = \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ --- gui/evolution2_sync/Makefile.am.orig 2006-03-01 09:33:32.000000000 +0100 +++ gui/evolution2_sync/Makefile.am 2006-03-01 09:33:43.000000000 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AM_CFLAGS = @XMLCFLAGS@ -Werror -Wall +AM_CFLAGS = @XMLCFLAGS@ -Wall INCLUDES = @PACKAGE_CFLAGS@ -I$(top_srcdir) --- gui/evolution_sync/Makefile.am.orig 2006-03-01 09:33:54.000000000 +0100 +++ gui/evolution_sync/Makefile.am 2006-03-01 09:34:03.000000000 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AM_CFLAGS = @XMLCFLAGS@ -Werror -Wall +AM_CFLAGS = @XMLCFLAGS@ -Wall INCLUDES = @PACKAGE_CFLAGS@ -I$(top_srcdir) --- gui/file-sync/Makefile.am.orig 2006-03-01 09:32:57.000000000 +0100 +++ gui/file-sync/Makefile.am 2006-03-01 09:33:09.000000000 +0100 @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -AM_CFLAGS = @XMLCFLAGS@ -Werror -Wall +AM_CFLAGS = @XMLCFLAGS@ -Wall INCLUDES = @PACKAGE_CFLAGS@ -I$(top_srcdir) -I$(srcdir) --- gui/synce_sync/Makefile.am.orig 2006-03-01 09:34:20.000000000 +0100 +++ gui/synce_sync/Makefile.am 2006-03-01 09:34:29.000000000 +0100 @@ -1,6 +1,6 @@ ## Process this synce with automake to produce Makesynce.in -AM_CFLAGS = @XMLCFLAGS@ -Werror -Wall +AM_CFLAGS = @XMLCFLAGS@ -Wall INCLUDES = @PACKAGE_CFLAGS@ -I$(top_srcdir) --- NEW FILE multisync.desktop --- [Desktop Entry] Name=multisync Comment=Calendar synchronization program Exec=multisync Terminal=false Type=Application Encoding=UTF-8 Categories=Application;System; --- NEW FILE multisync.spec --- Name: multisync Version: 0.90.18 Release: 4%{?dist} Summary: Calendar (and other PIM data) synchronization program Group: Applications/Communications License: GPL URL: http://www.opensync.org # see http://www.opensync.org/wiki/download Source0: %{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: multisync-rpath.patch # this is svn151 with a few fixes Patch1: multisync-gui-svn151.patch Patch2: multisync-werror.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel BuildRequires: gnome-libs-devel BuildRequires: libgnomeui-devel BuildRequires: desktop-file-utils BuildRequires: libopensync-plugin-evolution2-devel BuildRequires: automake %description MultiSync is a program to synchronize calendars, addressbooks and other PIM data between programs on your computer and other computers, mobile devices, PDAs or cell phones. It is packaged with plugins for Ximian Evolution, IrMC mobile devices, Opie / Zaurus PDAs, SyncML, ldap and for backup. %package gui Summary: GUI interface for multisync Group: Applications/Communications Requires: %{name} = %{version}-%{release} %description gui Graphical User Interface for multisync %prep %setup -q %patch0 %patch1 %patch2 %build # both don't like smp flags so disable them for now NOCONFIGURE=true ./autogen.sh %configure --disable-static %{__make} # build gui cd gui autoreconf -sfi %configure --disable-static --disable-rpath # if we don't do a make clean here we only get a segfaulting binary %{__make} clean %{__make} %install rm -fr $RPM_BUILD_ROOT %makeinstall cd gui %makeinstall mv $RPM_BUILD_ROOT/%{_bindir}/multisync{0.90,} find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' 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 AUTHORS COPYING ChangeLog README %{_bindir}/convcard %{_bindir}/msynctool %files gui %defattr(-, root, root,-) %doc COPYING %{_bindir}/multisync %{_datadir}/applications/*desktop %changelog * Wed Mar 01 2006 Andreas Bierfert 0.90.18-4 - fix segfaulting binary - diff against svn151 - code a little bit for sanity * Fri Feb 17 2006 Andreas Bierfert 0.90.18-3 - Add missing desktop file - Add BR for evolution2 plugin so gui will detect this correctly * Sat Dec 31 2005 Andreas Bierfert 0.90.18-2 - add BR libgnomeui-devel - comment on missing smp flags * Tue Nov 29 2005 Andreas Bierfert 0.90.18-1 - user newer version from opensync project - split gui and cmd line tool * Thu Aug 11 2005 Andreas Bierfert 0.82-4 - remove devel package altogether - change Requires 0.82-3 - fedorarized - install plugins in a more compact way - add devel package * Tue Nov 23 2004 Che - initial rpm release - decided to not split it for sanity reasons. - thanks to streeter for the patches. (cheers to rh) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multisync/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Mar 2006 09:05:45 -0000 1.1 +++ .cvsignore 13 Mar 2006 09:11:47 -0000 1.2 @@ -0,0 +1 @@ +multisync-0.90.18.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/multisync/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Mar 2006 09:05:45 -0000 1.1 +++ sources 13 Mar 2006 09:11:47 -0000 1.2 @@ -0,0 +1 @@ +d55d8eaeecb825b87a25eeceaef92cb9 multisync-0.90.18.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 09:44:30 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 13 Mar 2006 04:44:30 -0500 Subject: rpms/nc6 - New directory Message-ID: <200603130944.k2D9iWbg020373@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nc6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20365/nc6 Log Message: Directory /cvs/extras/rpms/nc6 added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 09:44:36 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 13 Mar 2006 04:44:36 -0500 Subject: rpms/nc6/devel - New directory Message-ID: <200603130944.k2D9icDM020388@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nc6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20365/nc6/devel Log Message: Directory /cvs/extras/rpms/nc6/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 09:45:44 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 13 Mar 2006 04:45:44 -0500 Subject: rpms/nc6/devel Makefile,NONE,1.1 Message-ID: <200603130945.k2D9jkOq020435@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nc6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20408/nc6/devel Added Files: Makefile Log Message: fix interrupted new-module setup ***** Error reading new file: [Errno 2] No such file or directory: 'Makefile' From fedora-extras-commits at redhat.com Mon Mar 13 09:45:38 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Mon, 13 Mar 2006 04:45:38 -0500 Subject: rpms/nc6 Makefile,NONE,1.1 Message-ID: <200603130945.k2D9jeiD020419@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/nc6 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20408/nc6 Added Files: Makefile Log Message: fix interrupted new-module setup --- NEW FILE Makefile --- # Top level Makefile for module nc6 all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; From fedora-extras-commits at redhat.com Mon Mar 13 09:46:52 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Mon, 13 Mar 2006 04:46:52 -0500 Subject: owners owners.list,1.738,1.739 Message-ID: <200603130947.k2D9lPuv020492@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20475 Modified Files: owners.list Log Message: - add multisync Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.738 retrieving revision 1.739 diff -u -r1.738 -r1.739 --- owners.list 13 Mar 2006 08:21:03 -0000 1.738 +++ owners.list 13 Mar 2006 09:46:52 -0000 1.739 @@ -698,6 +698,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|mpc|Command-line client for MPD|gauret at free.fr|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| Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 13 10:00:51 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:00:51 -0500 Subject: rpms/gpsim/devel gpsim.spec,1.4,1.5 Message-ID: <200603131001.k2DA1NYa022537@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20666 Modified Files: gpsim.spec Log Message: Rebuild for FE5 Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gpsim.spec 13 Mar 2006 08:47:09 -0000 1.4 +++ gpsim.spec 13 Mar 2006 10:00:51 -0000 1.5 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.21.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -78,10 +78,10 @@ %{_includedir}/* %changelog -* Mon Mar 13 2006 Alain Portal 0.21.11-2 +* Mon Mar 13 2006 Alain Portal 0.21.11-3 - Rebuild for FE5 -* Thu Oct 6 2005 Alain Portal 0.21.11-1 +* Thu Oct 6 2005 Alain Portal 0.21.11-2 - Remove useless Requires * Wed Oct 5 2005 Alain Portal 0.21.11-1 From fedora-extras-commits at redhat.com Mon Mar 13 10:12:16 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:12:16 -0500 Subject: rpms/pikdev - New directory Message-ID: <200603131012.k2DACIrT022698@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22690/pikdev Log Message: Directory /cvs/extras/rpms/pikdev added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 10:12:23 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:12:23 -0500 Subject: rpms/pikdev/devel - New directory Message-ID: <200603131012.k2DACPhZ022713@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22690/pikdev/devel Log Message: Directory /cvs/extras/rpms/pikdev/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 10:12:55 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:12:55 -0500 Subject: rpms/pikdev Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603131012.k2DACvnG022747@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22735 Added Files: Makefile import.log Log Message: Setup of module pikdev --- NEW FILE Makefile --- # Top level Makefile for module pikdev all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 13 10:13:02 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:13:02 -0500 Subject: rpms/pikdev/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603131013.k2DAD4CI022765@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22735/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pikdev --- NEW 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 Mar 13 10:29:19 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Mon, 13 Mar 2006 05:29:19 -0500 Subject: owners owners.list,1.739,1.740 Message-ID: <200603131029.k2DATp9Z022911@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22894/owners Modified Files: owners.list Log Message: Add pikdev module. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.739 retrieving revision 1.740 diff -u -r1.739 -r1.740 --- owners.list 13 Mar 2006 09:46:52 -0000 1.739 +++ owners.list 13 Mar 2006 10:29:19 -0000 1.740 @@ -1100,6 +1100,7 @@ Fedora Extras|php-pecl-sqlite|PECL package for accessing SQLite databases|matthias at rpmforge.net|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|physfs|Library to provide abstract access to various archives|tcallawa at redhat.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| Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 13 11:09:58 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Mon, 13 Mar 2006 06:09:58 -0500 Subject: rpms/nc6/devel nc6.spec,NONE,1.1 sources,NONE,1.1 Message-ID: <200603131110.k2DBA09U025020@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/nc6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25006/devel Added Files: nc6.spec sources Log Message: auto-import nc6-1.0-2 on branch devel from nc6-1.0-2.src.rpm --- NEW FILE nc6.spec --- Summary: Netcat with IPv6 Support Name: nc6 Version: 1.0 Release: 2%{?dist} Group: Applications/Internet URL: http://www.deepspace6.net/projects/netcat6.html License: GPL Source: ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description netcat6 is an IPv6-enabled clone of the original netcat utility. "Netcat is a simple Unix utility which reads and writes data across network connections. It is designed to be a reliable "back-end" tool that can be used directly or easily driven by other programs and scripts. At the same time, it is a feature-rich network debugging and exploration tool, since it can create almost any kind of connection you would need and has several interesting built-in capabilities. Netcat, or "nc" as the actual program is named, should have been supplied long ago as another one of those cryptic but standard Unix tools." %prep %setup -q %configure --prefix=%{_prefix} --mandir=%{_mandir} %build make COPTS="$RPM_OPT_FLAGS" DESTDIR="$RPM_BUILD_ROOT" %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_bindir}/%{name} %doc %{_mandir}/man1/nc6* %doc README AUTHORS COPYING NEWS TODO %changelog * Wed Mar 8 2006 Radek Vok??l 1.0-2 - clean RPM_BUILD_ROOT before install - group Application/Internet - fix BuildRoot * Tue Mar 7 2006 Radek Vok??l 1.0-1 - initial build for Fedora Extras --- NEW FILE sources --- 5074bc51989420a1f68716f93322030f nc6-1.0.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 11:11:45 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Mon, 13 Mar 2006 06:11:45 -0500 Subject: rpms/fish/devel fish-1.21.2-fallback.patch, NONE, 1.1 fish.spec, 1.6, 1.7 Message-ID: <200603131112.k2DBCH4X025093@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/rpms/fish/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25073 Modified Files: fish.spec Added Files: fish-1.21.2-fallback.patch Log Message: * Update to 1.21.2 fish-1.21.2-fallback.patch: --- NEW FILE fish-1.21.2-fallback.patch --- diff -Nur fish-1.21.2-orig/fallback.h fish-1.21.2/fallback.h --- fish-1.21.2-orig/fallback.h 2006-03-09 13:01:19.000000000 +0100 +++ fish-1.21.2/fallback.h 2006-03-10 17:03:15.000000000 +0100 @@ -31,7 +31,7 @@ strings and decimal numbers, position (%n), field width and precision. */ -int fwprintf( FILE *f, const wchar_t *format, ... ); + /** @@ -41,7 +41,7 @@ strings and decimal numbers, position (%n), field width and precision. */ -int swprintf( wchar_t *str, size_t l, const wchar_t *format, ... ); + /** Print formated string. Some operating systems (Like NetBSD) do not @@ -50,7 +50,7 @@ strings and decimal numbers, position (%n), field width and precision. */ -int wprintf( const wchar_t *format, ... ); + /** Print formated string. Some operating systems (Like NetBSD) do not @@ -59,7 +59,7 @@ strings and decimal numbers, position (%n), field width and precision. */ -int vwprintf( const wchar_t *filter, va_list va ); + /** Print formated string. Some operating systems (Like NetBSD) do not @@ -68,7 +68,7 @@ strings and decimal numbers, position (%n), field width and precision. */ -int vfwprintf( FILE *f, const wchar_t *filter, va_list va ); + /** Print formated string. Some operating systems (Like NetBSD) do not @@ -77,31 +77,31 @@ strings and decimal numbers, position (%n), field width and precision. */ -int vswprintf( wchar_t *out, size_t n, const wchar_t *filter, va_list va ); + /** Fallback implementation of fgetwc */ -wint_t fgetwc(FILE *stream); + /** Fallback implementation of getwc */ -wint_t getwc(FILE *stream); + /** Fallback implementation of fputwc */ -wint_t fputwc(wchar_t wc, FILE *stream); + /** Fallback implementation of putwc */ -wint_t putwc(wchar_t wc, FILE *stream); + /** Fallback implementation of wcstok. Uses code borrowed from glibc. */ -wchar_t *wcstok(wchar_t *wcs, const wchar_t *delim, wchar_t **ptr); + /** @@ -115,15 +115,15 @@ real wcwidth. Therefore, the fallback wcwidth assumes any printing character takes up one column and anything else uses 0 columns. */ -int wcwidth( wchar_t c ); + /** Create a duplicate string. Wide string version of strdup. Will automatically exit if out of memory. */ -wchar_t *wcsdup(const wchar_t *in); -size_t wcslen(const wchar_t *in); + + /** Case insensitive string compare function. Wide string version of @@ -136,7 +136,7 @@ fish and guaranteed to be a sane, english word. Using wcscasecmp on a user-supplied string should be considered a bug. */ -int wcscasecmp( const wchar_t *a, const wchar_t *b ); + /** Case insensitive string compare function. Wide string version of @@ -149,7 +149,7 @@ fish and guaranteed to be a sane, english word. Using wcsncasecmp on a user-supplied string should be considered a bug. */ -int wcsncasecmp( const wchar_t *a, const wchar_t *b, int count ); + /** Returns a newly allocated wide character string wich is a copy of @@ -173,9 +173,6 @@ to represent numbers higher than 9. Higher bases than 36 are not supported. */ -long wcstol(const wchar_t *nptr, - wchar_t **endptr, - int base); Index: fish.spec =================================================================== RCS file: /cvs/extras/rpms/fish/devel/fish.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fish.spec 10 Mar 2006 14:15:32 -0000 1.6 +++ fish.spec 13 Mar 2006 11:11:44 -0000 1.7 @@ -1,15 +1,15 @@ Summary: A friendly interactive shell Name: fish -Version: 1.14.0 -Release: 2%{?dist} +Version: 1.21.2 +Release: 1%{?dist} License: GPL Group: System Environment/Shells URL: http://roo.no-ip.org/fish/ Source0: http://roo.no-ip.org/%{name}/files/%{version}/%{name}-%{version}.tar.bz2 -Patch0: fish-1.14.0-wutil.patch +Patch0: fish-1.21.2-fallback.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen ncurses-devel @@ -22,8 +22,7 @@ %prep %setup -q -%patch0 -p1 -b .wutil - +%patch0 -p1 -b .fallback %build @@ -34,6 +33,8 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR="$RPM_BUILD_ROOT" +%find_lang %{name}.\* + %clean rm -rf $RPM_BUILD_ROOT @@ -48,31 +49,38 @@ mv %_sysconfdir/fish.tmp %_sysconfdir/shells fi -%files +%files -f %{name}.\*.lang %defattr(-,root,root,-) %doc %_datadir/doc/%{name}-%{version} %_mandir/man1/fish.1* %_mandir/man1/xsel.1x* %_mandir/man1/mimedb.1* %_mandir/man1/set_color.1* -%_mandir/man1/tokenize.1* %_mandir/man1/count.1* +%_mandir/man1/fishd.1.* +%_mandir/man1/fish_pager.1.* %attr(0755,root,root) %_bindir/fish %attr(0755,root,root) %_bindir/fishd %attr(0755,root,root) %_bindir/fish_pager %attr(0755,root,root) %_bindir/xsel %attr(0755,root,root) %_bindir/set_color -%attr(0755,root,root) %_bindir/tokenize %attr(0755,root,root) %_bindir/mimedb %attr(0755,root,root) %_bindir/count +%dir %_datadir/fish/completions +%config %_datadir/fish/completions/*.fish +%dir %_datadir/fish/functions +%config %_datadir/fish/functions/*.fish +%_datadir/fish/fish %config %_sysconfdir/fish %config %_sysconfdir/fish_inputrc %dir %_sysconfdir/fish.d %config %_sysconfdir/fish.d/fish_*.fish -%dir %_sysconfdir/fish.d/completions -%config %_sysconfdir/fish.d/completions/*.fish %changelog +* Mon Mar 13 2006 Oliver Falk - 1.21.2-1 +- Update +- Applied patch provided by Michael Schwendt + * Fri Mar 10 2006 Oliver Falk - 1.14.0-2 - Fix buildreqs - Fix wutil.h From fedora-extras-commits at redhat.com Mon Mar 13 11:14:11 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Mon, 13 Mar 2006 06:14:11 -0500 Subject: owners owners.list,1.740,1.741 Message-ID: <200603131114.k2DBEis5025165@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25148 Modified Files: owners.list Log Message: nc6 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.740 retrieving revision 1.741 diff -u -r1.740 -r1.741 --- owners.list 13 Mar 2006 10:29:19 -0000 1.740 +++ owners.list 13 Mar 2006 11:14:10 -0000 1.741 @@ -714,6 +714,7 @@ Fedora Extras|nautilus-search-tool|A Nautilus extension to put "Search for Files" on the context menu of folders|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|nautilus-sendto|Nautilus context menu for sending files|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|nazghul|A computer role-playing game (CRPG) engine|tibbs at math.uh.edu|extras-qa at fedoraproject.org| +Fedora Extras|nc6|IPv6-enabled clone of the original netcat utility.|rvokal at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ncarg|A Fortran and C based software package for scientific visualization|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|ncftp|Improved console FTP client|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|ncmpc|A curses client for the Music Player Daemon (MPD)|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Mon Mar 13 11:26:03 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Mon, 13 Mar 2006 06:26:03 -0500 Subject: rpms/nc6/devel Makefile,1.1,1.2 Message-ID: <200603131126.k2DBQZ0e025310@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/nc6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25293 Modified Files: Makefile Log Message: - fix broken makefile Index: Makefile =================================================================== RCS file: /cvs/extras/rpms/nc6/devel/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Makefile 13 Mar 2006 09:45:44 -0000 1.1 +++ Makefile 13 Mar 2006 11:26:03 -0000 1.2 @@ -1,6 +1,6 @@ # Makefile for source rpm: nc6 # $Id$ -NAME := wine-docs +NAME := nc6 SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common From fedora-extras-commits at redhat.com Mon Mar 13 11:28:24 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Mon, 13 Mar 2006 06:28:24 -0500 Subject: rpms/nc6/devel nc6.spec,1.1,1.2 Message-ID: <200603131128.k2DBSule025368@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/nc6/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25351 Modified Files: nc6.spec Log Message: add dist and rebuilt Index: nc6.spec =================================================================== RCS file: /cvs/extras/rpms/nc6/devel/nc6.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nc6.spec 13 Mar 2006 11:09:56 -0000 1.1 +++ nc6.spec 13 Mar 2006 11:28:24 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Netcat with IPv6 Support Name: nc6 Version: 1.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Internet URL: http://www.deepspace6.net/projects/netcat6.html License: GPL @@ -42,6 +42,9 @@ %doc README AUTHORS COPYING NEWS TODO %changelog +* Mon Mar 13 2006 Radek Vok??l 1.0-3 +- add ?dist and rebuilt in extras + * Wed Mar 8 2006 Radek Vok??l 1.0-2 - clean RPM_BUILD_ROOT before install - group Application/Internet From fedora-extras-commits at redhat.com Mon Mar 13 13:05:47 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 08:05:47 -0500 Subject: extras-buildsys/server main.py,1.19,1.20 Message-ID: <200603131305.k2DD5lAa029487@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29469/server Modified Files: main.py Log Message: Don't try stopping the traceback server if it's not enabled Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- main.py 12 Mar 2006 05:44:35 -0000 1.19 +++ main.py 13 Mar 2006 13:05:38 -0000 1.20 @@ -183,7 +183,8 @@ print "Shutting down..." bm.stop() srpm_server.stop() - tbs.stop() + if use_tbs: + tbs.stop() if opts.pidfile: os.unlink(opts.pidfile) From fedora-extras-commits at redhat.com Mon Mar 13 13:07:40 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 08:07:40 -0500 Subject: extras-buildsys/server main.py,1.14.2.4,1.14.2.5 Message-ID: <200603131307.k2DD7eji029521@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29503/server Modified Files: Tag: STABLE_0_4 main.py Log Message: Don't try stopping the traceback server if it's not enabled Index: main.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/main.py,v retrieving revision 1.14.2.4 retrieving revision 1.14.2.5 diff -u -r1.14.2.4 -r1.14.2.5 --- main.py 12 Mar 2006 05:53:13 -0000 1.14.2.4 +++ main.py 13 Mar 2006 13:07:31 -0000 1.14.2.5 @@ -183,7 +183,8 @@ print "Shutting down..." bm.stop() srpm_server.stop() - tbs.stop() + if use_tbs: + tbs.stop() if opts.pidfile: os.unlink(opts.pidfile) From fedora-extras-commits at redhat.com Mon Mar 13 13:27:15 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 13 Mar 2006 08:27:15 -0500 Subject: rpms/geomview/FC-4 geomview.desktop,1.2,1.3 geomview.spec,1.7,1.8 Message-ID: <200603131327.k2DDRlht029659@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/geomview/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29640 Modified Files: geomview.desktop geomview.spec Log Message: * Mon Mar 13 2006 Rex Dieter 1.8.3-0.3.cvs20040221 - drop deprecated BR: libGL.so.1,libGLU.so.1 bits - ExcludeArch: x86_64 (#182625) - .desktop: MimeType: application/x-geomview Index: geomview.desktop =================================================================== RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- geomview.desktop 3 Jan 2006 15:11:53 -0000 1.2 +++ geomview.desktop 13 Mar 2006 13:27:14 -0000 1.3 @@ -3,7 +3,7 @@ Comment=An interactive 3D viewing program Exec=geomview Icon=geomview -#MimeType=application/x-geomview +MimeType=application/x-geomview Type=Application Encoding=UTF-8 Categories=Application;Graphics;Scientific;Education;Math; Index: geomview.spec =================================================================== RCS file: /cvs/extras/rpms/geomview/FC-4/geomview.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- geomview.spec 3 Jan 2006 19:51:43 -0000 1.7 +++ geomview.spec 13 Mar 2006 13:27:14 -0000 1.8 @@ -9,7 +9,7 @@ Name: geomview Summary: Interactive 3D viewing program Version: 1.8.2 -Release: 0.2.cvs%{cvs}%{?dist}.1 +Release: 0.3.cvs%{cvs}%{?dist} License: LGPL Url: http://www.geomview.org/ @@ -18,6 +18,8 @@ #Source0: http://dl.sourceforge.net/sourceforge/geomview/geomview-%{version}.tar.gz Source0: http://www.ee.surrey.ac.uk/Personal/L.Wood/software/SaVi/src/unreleased/geomview-snapshot-2004-02-21.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# http://bugzilla.redhat.com/bugzilla/182625 +ExcludeArch: x86_64 Obsoletes: %{name}-plugins < %{version}-%{release} Provides: %{name}-plugins = %{version}-%{release} @@ -41,11 +43,7 @@ BuildRequires: openmotif-devel BuildRequires: xforms-devel ## X/GL support -%if "%{?fedora}" > "3" BuildRequires: libGL-devel libGLU-devel -%else -BuildRequires: libGL.so.1 libGLU.so.1 -%endif Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -173,12 +171,11 @@ rm -rf $RPM_BUILD_ROOT -%POST +%post /sbin/install-info --info-dir=%{_infodir} %{_infodir}/%{name}.gz ||: -for icon_theme in hicolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||: +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: %preun if [ $1 -eq 0 ] ;then @@ -186,10 +183,9 @@ fi %postun -for icon_theme in hicolor ; do - touch --no-create %{_datadir}/icons/${icon_theme} ||: - gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: -done +touch --no-create %{_datadir}/icons/hicolor ||: +gtk-update-icon-cache -q %{_datadir}/icons/hicolor > /dev/null 2>&1 ||: +update-desktop-database %{_datadir}/applications > /dev/null 2>&1 ||: %files @@ -249,6 +245,14 @@ %changelog +* Mon Mar 13 2006 Rex Dieter 1.8.3-0.3.cvs20040221 +- drop deprecated BR: libGL.so.1,libGLU.so.1 bits +- ExcludeArch: x86_64 (#182625) +- .desktop: MimeType: application/x-geomview + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + * Tue Jan 03 2006 Rex Dieter 1.8.2-0.2.cvs20040221 - rework Obsoletes/Provides: geomview-plugins From fedora-extras-commits at redhat.com Mon Mar 13 13:28:34 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 13 Mar 2006 08:28:34 -0500 Subject: fedora-security/audit fc5,1.78,1.79 Message-ID: <200603131328.k2DDSYL0029717@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29631 Modified Files: fc5 Log Message: Fill in the missing issues that needed work Check all FC5 VULNERABLEs; most are fixed in rawhide hence will be okay in FC5 when released; some others don't have fixes yet (especially the browser suite stuff) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.78 retrieving revision 1.79 diff -u -r1.78 -r1.79 --- fc5 9 Mar 2006 12:04:35 -0000 1.78 +++ fc5 13 Mar 2006 13:28:27 -0000 1.79 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060308 +Up to date CVE as of CVE email 20060312 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -24,17 +24,20 @@ CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe CVE-2006-0975 version (flex) by inspection -CVE-2006-0903 VULNERABLE (mysql) -CVE-2006-0884 ** thunderbird +CVE-2006-0903 VULNERABLE (mysql) low/not upstream yet +CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) -CVE-2006-0746 VULNERABLE (kpdf) +CVE-2006-0746 version (kdegraphics, fixed 3.4) +CVE-2006-0742 VULNERABLE (kernel) [fixed rawhide 1.2045] +CVE-2006-0741 VULNERABLE (kernel, fixed 2.6.15.5) [fixed rawhide 1.2045] CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 ignore (postgresql) we don't build --enable-cassert 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-0557 VULNERABLE (kernel, fixed 2.6.15.6) [fixed rawhide 1.2045] CVE-2006-0553 version (postgresql, only 8.1, fixed 8.1.3) -CVE-2006-0528 VULNERABLE (evolution) bz#182416 +CVE-2006-0528 VULNERABLE (cairo) bz#182416 [fixed rawhide cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch] CVE-2006-0496 VULNERABLE (mozilla) not fixed upstream CVE-2006-0496 VULNERABLE (firefox) not fixed upstream CVE-2006-0482 ignore (kernel) sparc only @@ -48,7 +51,7 @@ CVE-2006-0301 backport (xpdf) xpdf-3.01pl2.patch CVE-2006-0301 version (poppler, fixed 0.4.5) CVE-2006-0301 backport (kdegraphics) post-3.5.1-kdegraphics-CVE-2006-0301.diff -CVE-2006-0300 VULNERABLE (tar) +CVE-2006-0300 VULNERABLE (tar) [fixed rawhide in tar-1.15.1-13] CVE-2006-0299 version (firefox, fixed 1.5.0.1) CVE-2006-0299 version (mozilla, 1.8 branch only) CVE-2006-0299 version (thunderbird, fixed 1.5) @@ -87,6 +90,7 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) patch-2.6.16-rc3 CVE-2006-0082 version (ImageMagick, not 6.2.5.4) +CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 CVE-2006-0035 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 @@ -95,8 +99,8 @@ CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS CVE-2005-4720 version (firefox, fixed 1.5) CVE-2005-4720 versoin (thunderbird, fixed 1.5) -CVE-2005-4685 VULNERABLE (mozilla) -CVE-2005-4685 VULNERABLE (firefox) +CVE-2005-4685 VULNERABLE (mozilla) not fixed upstream +CVE-2005-4685 VULNERABLE (firefox) not fixed upstream CVE-2005-4684 VULNERABLE (kdebase) not fixed upstream CVE-2005-4667 backport (unzip) CVE-2005-4639 version (kernel, fixed 2.6.15) @@ -142,7 +146,7 @@ CVE-2005-3651 version (ethereal, fixed 0.10.14) CVE-2005-3632 version (netpbm) CVE-2005-3631 version (udev) -CVE-2005-3629 ** initscripts +CVE-2005-3629 version (initscripts, fixed 8.29 at least) CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3628 version (poppler, fixed 0.4.4) @@ -555,7 +559,6 @@ CVE-2005-0752 version (firefox, fixed 1.0.3) CVE-2005-0750 version (kernel, fixed 2.6.11.6) CVE-2005-0749 version (kernel, fixed 2.6.11.6) -CVE-2006-0741 VULNERABLE (kernel, fixed 2.6.15.5) CVE-2005-0739 version (ethereal, fixed after 0.10.9) CVE-2005-0736 version (kernel, fixed 2.6.11) CVE-2005-0718 version (squid, fixed 2.5.STABLE8) @@ -724,7 +727,7 @@ CVE-2005-0069 backport (vim) vim-6.4-tmpfile.patch CVE-2005-0064 version (xpdf, fixed 3.0.1) CVE-2005-0064 version (tetex, fixed 3.0) -CVE-2005-0064 version (kpdf, not 3.4) +CVE-2005-0064 version (kdegraphics, not 3.4) CVE-2005-0064 backport (cups) cups-CAN-2005-0064.patch CVE-2005-0039 ignore (kernel) not a vulnerability: don't do this says the rfc CVE-2005-0034 version (bind, fixed after 9.3.0) @@ -961,7 +964,7 @@ CVE-2004-0832 version (squid, fixed 2.5.STABLE7) CVE-2004-0829 version (samba, fixed 2.2.11) CVE-2004-0827 version (ImageMagick, fixed 6.0.6.2) -CVE-2004-0826 ** NSS +CVE-2004-0826 verson (nss, fixed 3.9.2) CVE-2004-0823 version (openldap, fixed after 2.1.19) CVE-2004-0817 version (imlib, fixed 2.1.20 at least) CVE-2004-0816 version (kernel, fixed 2.6.8) From fedora-extras-commits at redhat.com Mon Mar 13 13:55:45 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 13 Mar 2006 08:55:45 -0500 Subject: rpms/lyx/FC-4 helpers.sh,1.2,1.3 Message-ID: <200603131356.k2DDuIGN029845@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29828 Modified Files: helpers.sh Log Message: * Thu Mar 09 2006 Rex Dieter 1.4.0-4 - fix stripping of -fexceptions from %optflags Index: helpers.sh =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/helpers.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- helpers.sh 10 Mar 2006 18:51:26 -0000 1.2 +++ helpers.sh 13 Mar 2006 13:55:45 -0000 1.3 @@ -1,5 +1,4 @@ #!/bin/bash -# $Id$ if [ -f /etc/lyx.conf ]; then source /etc/helpers.conf From fedora-extras-commits at redhat.com Mon Mar 13 15:17:57 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:17:57 -0500 Subject: extras-buildsys/builder builder.py,1.44.2.8,1.44.2.9 Message-ID: <200603131517.k2DFHvCb001711@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1654/builder Modified Files: Tag: STABLE_0_4 builder.py Log Message: 2006-03-13 Dan Williams * Release of 0.4.4.1 * builder/builder.py - (main): Fix usage of handle_request when serve_forever was intended Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.44.2.8 retrieving revision 1.44.2.9 diff -u -r1.44.2.8 -r1.44.2.9 --- builder.py 12 Mar 2006 05:52:54 -0000 1.44.2.8 +++ builder.py 13 Mar 2006 15:17:49 -0000 1.44.2.9 @@ -915,7 +915,7 @@ signal.signal(signal.SIGTERM, exit_handler) try: - bserver.handle_request() + bserver.serve_forever() except KeyboardInterrupt, e: bserver.server_close() From fedora-extras-commits at redhat.com Mon Mar 13 15:17:51 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:17:51 -0500 Subject: extras-buildsys ChangeLog, 1.126.2.44, 1.126.2.45 plague.spec, 1.27.2.5, 1.27.2.6 Message-ID: <200603131518.k2DFIL8N001715@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1654 Modified Files: Tag: STABLE_0_4 ChangeLog plague.spec Log Message: 2006-03-13 Dan Williams * Release of 0.4.4.1 * builder/builder.py - (main): Fix usage of handle_request when serve_forever was intended Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.44 retrieving revision 1.126.2.45 diff -u -r1.126.2.44 -r1.126.2.45 --- ChangeLog 13 Mar 2006 04:30:08 -0000 1.126.2.44 +++ ChangeLog 13 Mar 2006 15:17:43 -0000 1.126.2.45 @@ -1,3 +1,10 @@ +2006-03-13 Dan Williams + + * Release of 0.4.4.1 + + * builder/builder.py + - (main): Fix usage of handle_request when serve_forever was intended + 2006-03-12 Dan Williams * Release of 0.4.4 Index: plague.spec =================================================================== RCS file: /cvs/fedora/extras-buildsys/plague.spec,v retrieving revision 1.27.2.5 retrieving revision 1.27.2.6 diff -u -r1.27.2.5 -r1.27.2.6 --- plague.spec 13 Mar 2006 04:30:08 -0000 1.27.2.5 +++ plague.spec 13 Mar 2006 15:17:43 -0000 1.27.2.6 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.4 +Version: 0.4.4.1 Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo +Requires: python-sqlite, createrepo >= 0.4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -120,7 +120,8 @@ %files common %defattr(-, root, root) %doc README ChangeLog -/usr/lib/python?.?/site-packages/plague/*.py* +%dir /usr/lib/python?.?/site-packages/%{name} +/usr/lib/python?.?/site-packages/%{name}/*.py* %files builder %defattr(-, root, root) @@ -144,6 +145,10 @@ %changelog +* Mon Mar 13 2006 Dan Williams 0.4.4.1-1 +- Update to 0.4.4.1 +- Fix createrepo dep to >= 0.4.3 (#rh170531) + * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve @@ -153,6 +158,8 @@ - Ensure jobs don't hang around on builders if they get left there for some reason (ie, server didn't unlock repo for the job) - Make Additional Package Arches really work (kmod support) +- Own /usr/lib/python?.?/site-packages/plague (#rh172794#) +- Require createrepo >= 4.3 (#rh170531#) * Tue Jan 24 2006 Dan Williams 0.4.3-6 - Increase build server builder thread sleep time to work around SSL issues From fedora-extras-commits at redhat.com Mon Mar 13 15:19:34 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:19:34 -0500 Subject: extras-buildsys/builder builder.py,1.52,1.53 Message-ID: <200603131519.k2DFJYwM001760@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1726/builder Modified Files: builder.py Log Message: 2006-03-13 Dan Williams * builder/builder.py - (main): Fix usage of handle_request when serve_forever was intended Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- builder.py 12 Mar 2006 05:44:19 -0000 1.52 +++ builder.py 13 Mar 2006 15:19:27 -0000 1.53 @@ -915,7 +915,7 @@ signal.signal(signal.SIGTERM, exit_handler) try: - bserver.handle_request() + bserver.serve_forever() except KeyboardInterrupt, e: bserver.server_close() From fedora-extras-commits at redhat.com Mon Mar 13 15:19:29 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:19:29 -0500 Subject: extras-buildsys ChangeLog,1.174,1.175 Message-ID: <200603131519.k2DFJxRM001763@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1726 Modified Files: ChangeLog Log Message: 2006-03-13 Dan Williams * builder/builder.py - (main): Fix usage of handle_request when serve_forever was intended Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- ChangeLog 13 Mar 2006 03:45:43 -0000 1.174 +++ ChangeLog 13 Mar 2006 15:19:21 -0000 1.175 @@ -1,3 +1,8 @@ +2006-03-13 Dan Williams + + * builder/builder.py + - (main): Fix usage of handle_request when serve_forever was intended + 2006-03-12 Dan Williams Fix up kmod support. From fedora-extras-commits at redhat.com Mon Mar 13 15:30:00 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:30:00 -0500 Subject: rpms/plague/devel .cvsignore, 1.10, 1.11 plague.spec, 1.26, 1.27 sources, 1.24, 1.25 Message-ID: <200603131530.k2DFUWT9001830@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1807 Modified Files: .cvsignore plague.spec sources Log Message: * Mon Mar 13 2006 Dan Williams 0.4.4.1-1 - Update to 0.4.4.1 - Fix createrepo dep to >= 0.4.3 (#rh170531) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/plague/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Mar 2006 04:36:56 -0000 1.10 +++ .cvsignore 13 Mar 2006 15:30:00 -0000 1.11 @@ -7,3 +7,4 @@ plague-0.4.2.tar.bz2 plague-0.4.3.tar.bz2 plague-0.4.4.tar.bz2 +plague-0.4.4.1.tar.bz2 Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/devel/plague.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- plague.spec 13 Mar 2006 04:36:56 -0000 1.26 +++ plague.spec 13 Mar 2006 15:30:00 -0000 1.27 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.4 +Version: 0.4.4.1 Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo >= 4.3 +Requires: python-sqlite, createrepo >= 0.4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -145,6 +145,10 @@ %changelog +* Mon Mar 13 2006 Dan Williams 0.4.4.1-1 +- Update to 0.4.4.1 +- Fix createrepo dep to >= 0.4.3 (#rh170531) + * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 13 Mar 2006 04:36:56 -0000 1.24 +++ sources 13 Mar 2006 15:30:00 -0000 1.25 @@ -1 +1 @@ -eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 +0eb43e25cdd8d630759d010115101956 plague-0.4.4.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 15:35:57 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:35:57 -0500 Subject: rpms/plague/FC-4 plague.spec,1.23,1.24 sources,1.22,1.23 Message-ID: <200603131536.k2DFaT23001912@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1893 Modified Files: plague.spec sources Log Message: Update from devel branch Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-4/plague.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- plague.spec 13 Mar 2006 04:40:05 -0000 1.23 +++ plague.spec 13 Mar 2006 15:35:57 -0000 1.24 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.4 +Version: 0.4.4.1 Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo >= 4.3 +Requires: python-sqlite, createrepo >= 0.4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -145,6 +145,10 @@ %changelog +* Mon Mar 13 2006 Dan Williams 0.4.4.1-1 +- Update to 0.4.4.1 +- Fix createrepo dep to >= 0.4.3 (#rh170531) + * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/FC-4/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 13 Mar 2006 04:40:05 -0000 1.22 +++ sources 13 Mar 2006 15:35:57 -0000 1.23 @@ -1 +1 @@ -eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 +0eb43e25cdd8d630759d010115101956 plague-0.4.4.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 15:38:13 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 13 Mar 2006 10:38:13 -0500 Subject: rpms/plague/FC-3 plague.spec,1.23,1.24 sources,1.22,1.23 Message-ID: <200603131538.k2DFcjCj001980@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/plague/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1961 Modified Files: plague.spec sources Log Message: Update from devel branch Index: plague.spec =================================================================== RCS file: /cvs/extras/rpms/plague/FC-3/plague.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- plague.spec 13 Mar 2006 04:42:55 -0000 1.23 +++ plague.spec 13 Mar 2006 15:38:13 -0000 1.24 @@ -2,14 +2,14 @@ Summary: Distributed build system for RPMs Name: plague -Version: 0.4.4 +Version: 0.4.4.1 Release: 1%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/plague/releases/%{name}-%{version}.tar.bz2 URL: http://www.fedoraproject.org/wiki/Projects/Plague BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: python-sqlite, createrepo >= 4.3 +Requires: python-sqlite, createrepo >= 0.4.3 Requires: %{name}-common = %{version}-%{release} Requires(post): /sbin/chkconfig Requires(post): /sbin/service @@ -145,6 +145,10 @@ %changelog +* Mon Mar 13 2006 Dan Williams 0.4.4.1-1 +- Update to 0.4.4.1 +- Fix createrepo dep to >= 0.4.3 (#rh170531) + * Sun Mar 12 2006 Dan Williams 0.4.4-1 - Update to 0.4.4 release - Don't use pyOpenSSL's sendall() call, but simulate it to achieve Index: sources =================================================================== RCS file: /cvs/extras/rpms/plague/FC-3/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 13 Mar 2006 04:42:55 -0000 1.22 +++ sources 13 Mar 2006 15:38:13 -0000 1.23 @@ -1 +1 @@ -eecd67eb038bef9603a3a8f846677063 plague-0.4.4.tar.bz2 +0eb43e25cdd8d630759d010115101956 plague-0.4.4.1.tar.bz2 From fedora-extras-commits at redhat.com Mon Mar 13 15:40:53 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 13 Mar 2006 10:40:53 -0500 Subject: rpms/yumex/devel .cvsignore, 1.16, 1.17 sources, 1.19, 1.20 yumex.spec, 1.20, 1.21 Message-ID: <200603131541.k2DFfPI1002103@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2079 Modified Files: .cvsignore sources yumex.spec Log Message: Release 0.99.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 2 Mar 2006 10:09:39 -0000 1.16 +++ .cvsignore 13 Mar 2006 15:40:53 -0000 1.17 @@ -1 +1 @@ -yumex-0.99.11.tar.gz +yumex-0.99.12.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 2 Mar 2006 10:09:39 -0000 1.19 +++ sources 13 Mar 2006 15:40:53 -0000 1.20 @@ -1 +1 @@ -cad44f4f35d0df846a25cb56a08ecad5 yumex-0.99.11.tar.gz +13564e96536b7e935ea5ee16eece3d3c yumex-0.99.12.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- yumex.spec 2 Mar 2006 10:09:39 -0000 1.20 +++ yumex.spec 13 Mar 2006 15:40:53 -0000 1.21 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.11 +Version: 0.99.12 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -24,7 +24,7 @@ %prep -%setup +%setup -q %build @@ -65,6 +65,9 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 +- Development Release 0.99.12-1.0 +- Added '-q' option to setup * Tue Feb 28 2006 Tim Lauridsen - 0.99.11-1.0 - Development Release 0.99.11-1.0 * Tue Feb 15 2006 Tim Lauridsen - 0.99.10-1.0 From fedora-extras-commits at redhat.com Mon Mar 13 15:58:42 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 10:58:42 -0500 Subject: rpms/erlang/FC-4 erlang.spec,1.6,1.7 Message-ID: <200603131559.k2DFxE0G002259@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225/FC-4 Modified Files: erlang.spec Log Message: new version Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/FC-4/erlang.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- erlang.spec 13 Mar 2006 08:56:45 -0000 1.6 +++ erlang.spec 13 Mar 2006 15:58:42 -0000 1.7 @@ -14,9 +14,14 @@ Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel, openssl-devel, flex, unixODBC-devel -BuildRequires: tcl-devel, tk-devel + +BuildRequires: ncurses-devel +BuildRequires: openssl-devel +BuildRequires: unixODBC-devel +BuildRequires: tcl-devel +BuildRequires: tk-devel BuildRequires: java-1.4.2-gcj-compat-devel +BuildRequires: flex Requires: tk From fedora-extras-commits at redhat.com Mon Mar 13 15:58:48 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 10:58:48 -0500 Subject: rpms/erlang/devel .cvsignore, 1.4, 1.5 erlang.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200603131559.k2DFxKKb002264@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2225/devel Modified Files: .cvsignore erlang.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2006 23:29:12 -0000 1.4 +++ .cvsignore 13 Mar 2006 15:58:48 -0000 1.5 @@ -1,3 +1,3 @@ -otp_doc_html_R10B-9.tar.gz -otp_doc_man_R10B-9.tar.gz -otp_src_R10B-9.tar.gz +otp_doc_html_R10B-10.tar.gz +otp_doc_man_R10B-10.tar.gz +otp_src_R10B-10.tar.gz Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- erlang.spec 17 Feb 2006 23:32:19 -0000 1.9 +++ erlang.spec 13 Mar 2006 15:58:48 -0000 1.10 @@ -1,14 +1,14 @@ Name: erlang Version: R10B -Release: 9.2%{?dist} +Release: 10.1%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages License: Erlang Public License URL: http://www.erlang.org -Source: http://www.erlang.org/download/otp_src_R10B-9.tar.gz -Source1: http://www.erlang.org/download/otp_doc_html_R10B-9.tar.gz -Source2: http://www.erlang.org/download/otp_doc_man_R10B-9.tar.gz +Source: http://www.erlang.org/download/otp_src_R10B-10.tar.gz +Source1: http://www.erlang.org/download/otp_doc_html_R10B-10.tar.gz +Source2: http://www.erlang.org/download/otp_doc_man_R10B-10.tar.gz Patch: otp-links.patch Patch1: otp-install.patch Patch2: otp-rpath.patch @@ -41,7 +41,7 @@ %prep -%setup -q -n otp_src_R10B-9 +%setup -q -n otp_src_R10B-10 %patch -p1 %patch1 -p1 %patch2 -p1 @@ -99,6 +99,9 @@ %changelog +* Mon Mar 13 2006 Gerard Milmeister - R10B-10.1 +- new version R10B-10 + * Thu Dec 29 2005 Gerard Milmeister - R10B-9.1 - New Version R10B-9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2006 23:29:12 -0000 1.4 +++ sources 13 Mar 2006 15:58:48 -0000 1.5 @@ -1,3 +1,3 @@ -108bc01be67aaa2edde9a0331ef9bc71 otp_doc_html_R10B-9.tar.gz -051cd9893b36313f20a420bc2491905c otp_doc_man_R10B-9.tar.gz -05791e9097f36202eb705df2a1db6500 otp_src_R10B-9.tar.gz +d6e9655ff07af642025b0465c5e7e1a6 otp_doc_html_R10B-10.tar.gz +207e00bcaf5a9428bd86e3973f9b699f otp_doc_man_R10B-10.tar.gz +c1405c885f07d661b7362b822d571586 otp_src_R10B-10.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 16:07:24 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 11:07:24 -0500 Subject: rpms/bigloo/FC-4 .cvsignore, 1.3, 1.4 bigloo.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603131607.k2DG7uJN004277@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4248 Modified Files: .cvsignore bigloo.spec sources Log Message: new version 2.8a Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Nov 2005 22:44:55 -0000 1.3 +++ .cvsignore 13 Mar 2006 16:07:23 -0000 1.4 @@ -1 +1 @@ -bigloo2.7a.tar.gz +bigloo2.8a-alpha13Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/bigloo.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- bigloo.spec 28 Nov 2005 10:14:27 -0000 1.4 +++ bigloo.spec 13 Mar 2006 16:07:24 -0000 1.5 @@ -1,18 +1,23 @@ %define _with_java 1 Name: bigloo -Version: 2.7a -Release: 2%{?dist} +Version: 2.8a +Release: 1.20060313%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.7a.tar.gz +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha13Mar06.tar.gz Patch0: bigloo-bmem.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: emacs, emacs-el, xemacs, xemacs-el, /sbin/install-info -BuildRequires: zip, java-1.4.2-gcj-compat-devel +BuildRequires: emacs +BuildRequires: emacs-el +BuildRequires: xemacs +BuildRequires: xemacs-el +BuildRequires: /sbin/install-info +BuildRequires: zip +BuildRequires: java-1.4.2-gcj-compat-devel Requires: bigloo-libs = %{version}-%{release} Requires(post): /sbin/install-info Requires(postun): /sbin/install-info @@ -65,7 +70,7 @@ %prep %setup -q -n %{name}%{version} # disable bmem for now -%patch0 -p1 +# %patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -96,10 +101,13 @@ # _smp_mflags breaks the build env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make DESTDIR=%{inplace} install -env LD_LIBRARY_PATH=%{inplace}%{_libdir} \ +env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + PATH=`pwd`/bin:$PATH \ BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make compile-bee @@ -195,6 +203,9 @@ %changelog +* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1 +- new version 2.8a-20060313 + * Mon Nov 28 2005 Gerard Milmeister - 2.7a-2 - disable bmem, causes link problems Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Nov 2005 22:44:55 -0000 1.3 +++ sources 13 Mar 2006 16:07:24 -0000 1.4 @@ -1 +1 @@ -92606b9dc7444ff13c17cdda3f008824 bigloo2.7a.tar.gz +c545f654bfcc274a0eec5382ab00f58e bigloo2.8a-alpha13Mar06.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 16:18:42 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 11:18:42 -0500 Subject: rpms/erlang/devel erlang.spec,1.10,1.11 otp-glibc24.patch,1.2,1.3 Message-ID: <200603131619.k2DGJEW0004419@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/erlang/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4385 Modified Files: erlang.spec otp-glibc24.patch Log Message: Index: erlang.spec =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/erlang.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- erlang.spec 13 Mar 2006 15:58:48 -0000 1.10 +++ erlang.spec 13 Mar 2006 16:18:42 -0000 1.11 @@ -1,6 +1,6 @@ Name: erlang Version: R10B -Release: 10.1%{?dist} +Release: 10.2%{?dist} Summary: General-purpose programming language and runtime environment Group: Development/Languages @@ -13,6 +13,7 @@ Patch1: otp-install.patch Patch2: otp-rpath.patch Patch3: otp-sslrpath.patch +Patch4: otp-glibc24.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses-devel @@ -46,6 +47,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build otp-glibc24.patch: Index: otp-glibc24.patch =================================================================== RCS file: /cvs/extras/rpms/erlang/devel/otp-glibc24.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- otp-glibc24.patch 2 Nov 2005 21:28:29 -0000 1.2 +++ otp-glibc24.patch 13 Mar 2006 16:18:42 -0000 1.3 @@ -1,11 +1,11 @@ ---- otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c.glibc24 2005-09-06 22:01:13.000000000 +0200 -+++ otp_src_R10B-6/erts/emulator/hipe/hipe_x86_signal.c 2005-09-06 22:01:36.000000000 +0200 +--- otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c.glibc24 2006-03-13 17:16:39.000000000 +0100 ++++ otp_src_R10B-10/erts/emulator/hipe/hipe_x86_signal.c 2006-03-13 17:17:11.000000000 +0100 @@ -27,7 +27,7 @@ #include #include "hipe_signal.h" -#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 3 -+#if __GLIBC__ == 2 && (__GLIBC_MINOR__ == 3 || __GLIBC_MINOR__ == 4) ++#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 4 /* See comment below for glibc 2.2. */ + #ifndef __USE_GNU #define __USE_GNU /* to un-hide RTLD_NEXT */ - #include From fedora-extras-commits at redhat.com Mon Mar 13 16:33:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 11:33:54 -0500 Subject: rpms/bigloo/devel .cvsignore, 1.3, 1.4 bigloo.spec, 1.5, 1.6 sources, 1.3, 1.4 Message-ID: <200603131634.k2DGYQn5004679@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4658 Modified Files: .cvsignore bigloo.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 27 Nov 2005 23:18:00 -0000 1.3 +++ .cvsignore 13 Mar 2006 16:33:53 -0000 1.4 @@ -1 +1 @@ -bigloo2.7a.tar.gz +bigloo2.8a-alpha13Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/bigloo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bigloo.spec 7 Mar 2006 20:19:29 -0000 1.5 +++ bigloo.spec 13 Mar 2006 16:33:53 -0000 1.6 @@ -1,18 +1,23 @@ %define _with_java 1 Name: bigloo -Version: 2.7a -Release: 4%{?dist} +Version: 2.8a +Release: 1.20060313%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.7a.tar.gz +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha13Mar06.tar.gz Patch0: bigloo-bmem.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: emacs, emacs-el, xemacs, xemacs-el, /sbin/install-info -BuildRequires: zip, java-1.4.2-gcj-compat-devel +BuildRequires: emacs +BuildRequires: emacs-el +BuildRequires: xemacs +BuildRequires: xemacs-el +BuildRequires: /sbin/install-info +BuildRequires: zip +BuildRequires: java-1.4.2-gcj-compat-devel Requires: bigloo-libs = %{version}-%{release} Requires(post): /sbin/install-info Requires(postun): /sbin/install-info @@ -65,7 +70,7 @@ %prep %setup -q -n %{name}%{version} # disable bmem for now -#%patch0 -p1 +# %patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -90,17 +95,19 @@ %{!?_with_java: --jvm=no} \ --sharedbde=yes \ --sharedcompiler=yes \ - --coflags="$RPM_OPT_FLAGS" \ - --cpicflags="-fPIC" + --coflags="$RPM_OPT_FLAGS" perl -pi -e 's|EMACSBRAND=.*|EMACSBRAND=emacs21|' Makefile.config # _smp_mflags breaks the build env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make DESTDIR=%{inplace} install -env LD_LIBRARY_PATH=%{inplace}%{_libdir} \ +env LD_LIBRARY_PATH=`pwd`/lib/%{version} \ + PATH=`pwd`/bin:$PATH \ BIGLOOLIB=%{inplace}%{_libdir}/bigloo/%{version} \ make compile-bee @@ -196,8 +203,8 @@ %changelog -* Tue Feb 28 2006 Gerard Milmeister - 2.7a-3 -- Rebuild for Fedora Extras 5 +* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1 +- new version 2.8a-20060313 * Mon Nov 28 2005 Gerard Milmeister - 2.7a-2 - disable bmem, causes link problems Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 27 Nov 2005 23:18:00 -0000 1.3 +++ sources 13 Mar 2006 16:33:53 -0000 1.4 @@ -1 +1 @@ -92606b9dc7444ff13c17cdda3f008824 bigloo2.7a.tar.gz +c545f654bfcc274a0eec5382ab00f58e bigloo2.8a-alpha13Mar06.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 16:54:45 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 13 Mar 2006 11:54:45 -0500 Subject: rpms/hdf5/devel hdf5-1.6.5-flags.patch,NONE,1.1 hdf5.spec,1.8,1.9 Message-ID: <200603131655.k2DGtHcb004881@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4855 Modified Files: hdf5.spec Added Files: hdf5-1.6.5-flags.patch Log Message: Add patch to avoid HDF setting the compiler flags hdf5-1.6.5-flags.patch: --- NEW FILE hdf5-1.6.5-flags.patch --- --- hdf5-1.6.5/config/linux-gnulibc1.orig 2005-10-28 14:15:27.000000000 -0600 +++ hdf5-1.6.5/config/linux-gnulibc1 2006-03-13 09:49:37.000000000 -0700 @@ -25,14 +25,5 @@ CC_BASENAME=gcc fi -# Figure out GNU C compiler flags -. $srcdir/config/gnu-flags - -# Figure out PGI C compiler flags -. $srcdir/config/pgi-flags - -# Figure out Intel C compiler flags -. $srcdir/config/intel-flags - # Check MPICH settings . $srcdir/config/mpich --- hdf5-1.6.5/fortran/config/linux-gnulibc1.orig 2006-03-13 09:39:23.000000000 -0700 +++ hdf5-1.6.5/fortran/config/linux-gnulibc1 2006-03-13 09:47:18.000000000 -0700 @@ -25,16 +25,6 @@ CC_BASENAME=gcc fi -# Figure out GNU C compiler flags -. $srcdir/config/gnu-flags - -# Figure out PGI C compiler flags -. $srcdir/config/pgi-flags - -# Figure out Intel C compiler flags -. $srcdir/config/intel-flags - - # The default Fortran 90 compiler if test "X-" = "X-$F9X"; then case $CC_BASENAME in Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hdf5.spec 13 Feb 2006 18:50:15 -0000 1.8 +++ hdf5.spec 13 Mar 2006 16:54:44 -0000 1.9 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -12,6 +12,7 @@ Patch3: hdf5-1.6.4-testh5repack.patch Patch4: hdf5-1.6.5-h5diff_attr.patch Patch5: hdf5-1.6.4-ppc.patch +Patch6: hdf5-1.6.5-flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time @@ -40,6 +41,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 -b .flags %build autoconf @@ -96,6 +98,9 @@ %{_libdir}/*.mod %changelog +* Mon Mar 13 2006 Orion Poplawski 1.6.5-4 +- Add patch to avoid HDF setting the compiler flags + * Mon Feb 13 2006 Orion Poplawski 1.6.5-3 - Rebuild for gcc/glibc changes From fedora-extras-commits at redhat.com Mon Mar 13 17:27:54 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 13 Mar 2006 12:27:54 -0500 Subject: rpms/apollon/devel apollon-1.0.1-firstrun.patch, NONE, 1.1 apollon.spec, 1.4, 1.5 Message-ID: <200603131728.k2DHSR7M007717@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/apollon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7697 Modified Files: apollon.spec Added Files: apollon-1.0.1-firstrun.patch Log Message: * Mon Mar 13 2006 Rex Dieter 1.0.1-5 - firstrun patch (#185258) apollon-1.0.1-firstrun.patch: --- NEW FILE apollon-1.0.1-firstrun.patch --- --- apollon-1.0.1/apollon/firstrun.ui.h.firstrun 2004-10-13 11:33:15.000000000 -0500 +++ apollon-1.0.1/apollon/firstrun.ui.h 2006-03-13 10:53:45.000000000 -0600 @@ -51,7 +51,7 @@ //where are the plugins installed? QDir installedPath ("/usr/share/giFT/giftd.conf.template"); - if (installedPath.exists()) { + if (QFile::exists(installedPath.path())) { installedPath = "/usr/share/giFT/"; } else { Index: apollon.spec =================================================================== RCS file: /cvs/extras/rpms/apollon/devel/apollon.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apollon.spec 1 Mar 2006 16:43:57 -0000 1.4 +++ apollon.spec 13 Mar 2006 17:27:54 -0000 1.5 @@ -2,7 +2,7 @@ Summary: Filesharing client Name: apollon Version: 1.0.1 -Release: 4%{?dist}.2 +Release: 5%{?dist} License: GPL Group: Applications/Internet @@ -13,13 +13,13 @@ # Fix Name/GenericName, append ; to Categories, # remove lines containing non UTF-8 chars ([de] entries) Patch1: apollon-1.0.1-dtfix.patch +# http://bugzilla.redhat.com/bugzilla/185258 +Patch2: apollon-1.0.1-firstrun.patch BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: gift-devel - -BuildRequires: qt-devel >= 1:3.3 -BuildRequires: kdelibs-devel >= 6:3.3 +BuildRequires: kdelibs-devel %description A filesharing client which uses giFT. @@ -29,12 +29,11 @@ %setup -q %patch1 -p1 -b .dtfix - +%patch2 -p1 -b .firstrun %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-rpath \ @@ -49,11 +48,10 @@ make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --delete-original --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category Application \ - --add-category X-Fedora \ +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ + --vendor="fedora" --delete-original \ + --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop ## File lists @@ -110,6 +108,9 @@ %changelog +* Mon Mar 13 2006 Rex Dieter 1.0.1-5 +- firstrun patch (#185258) + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Mon Mar 13 17:41:30 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Mon, 13 Mar 2006 12:41:30 -0500 Subject: rpms/apollon/FC-4 apollon-1.0.1-firstrun.patch, NONE, 1.1 apollon.spec, 1.1, 1.2 Message-ID: <200603131742.k2DHg2gI007820@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/apollon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7795 Modified Files: apollon.spec Added Files: apollon-1.0.1-firstrun.patch Log Message: * Mon Mar 13 2006 Rex Dieter 1.0.1-5 - firstrun patch (#185258) apollon-1.0.1-firstrun.patch: --- NEW FILE apollon-1.0.1-firstrun.patch --- --- apollon-1.0.1/apollon/firstrun.ui.h.firstrun 2004-10-13 11:33:15.000000000 -0500 +++ apollon-1.0.1/apollon/firstrun.ui.h 2006-03-13 10:53:45.000000000 -0600 @@ -51,7 +51,7 @@ //where are the plugins installed? QDir installedPath ("/usr/share/giFT/giftd.conf.template"); - if (installedPath.exists()) { + if (QFile::exists(installedPath.path())) { installedPath = "/usr/share/giFT/"; } else { Index: apollon.spec =================================================================== RCS file: /cvs/extras/rpms/apollon/FC-4/apollon.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- apollon.spec 20 Dec 2005 15:14:06 -0000 1.1 +++ apollon.spec 13 Mar 2006 17:41:30 -0000 1.2 @@ -2,7 +2,7 @@ Summary: Filesharing client Name: apollon Version: 1.0.1 -Release: 3%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Internet @@ -13,15 +13,13 @@ # Fix Name/GenericName, append ; to Categories, # remove lines containing non UTF-8 chars ([de] entries) Patch1: apollon-1.0.1-dtfix.patch +# http://bugzilla.redhat.com/bugzilla/185258 +Patch2: apollon-1.0.1-firstrun.patch BuildRequires: gettext BuildRequires: desktop-file-utils BuildRequires: gift-devel - -BuildRequires: qt-devel >= 1:3.3 -BuildRequires: kdelibs-devel >= 6:3.3 -# Hack/woraround kdelibs-devel bug: https://bugzilla.redhat.com/bugzilla/170602 -BuildRequires: libacl-devel +BuildRequires: kdelibs-devel %description A filesharing client which uses giFT. @@ -31,12 +29,11 @@ %setup -q %patch1 -p1 -b .dtfix - +%patch2 -p1 -b .firstrun %build unset QTDIR || : ; . /etc/profile.d/qt.sh -export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include %configure \ --disable-rpath \ @@ -51,11 +48,10 @@ make install DESTDIR=$RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications -desktop-file-install --delete-original --vendor fedora \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category Application \ - --add-category X-Fedora \ +desktop-file-install \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \ + --vendor="fedora" --delete-original \ + --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop ## File lists @@ -112,6 +108,15 @@ %changelog +* Mon Mar 13 2006 Rex Dieter 1.0.1-5 +- firstrun patch (#185258) + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Thu Jan 26 2006 Rex Dieter 1.0.1-4 +- drop libacl hack + * Tue Dec 20 2005 Rex Dieter 1.0.1-3 - BR: libacl-devel (workaround kdelibs bug #170602) From fedora-extras-commits at redhat.com Mon Mar 13 18:04:18 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 13 Mar 2006 13:04:18 -0500 Subject: rpms/tuxpaint/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 tuxpaint.spec, 1.7, 1.8 tuxpaint-0.9.13-destdir.patch, 1.1, NONE Message-ID: <200603131804.k2DI4r3s009918@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/tuxpaint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9895 Modified Files: .cvsignore sources tuxpaint.spec Removed Files: tuxpaint-0.9.13-destdir.patch Log Message: Update to 0.9.15. Drop destdir patch. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tuxpaint/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 8 Nov 2004 05:29:43 -0000 1.3 +++ .cvsignore 13 Mar 2006 18:04:17 -0000 1.4 @@ -1 +1 @@ -tuxpaint-0.9.13.tar.gz +tuxpaint-0.9.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tuxpaint/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 8 Nov 2004 05:29:43 -0000 1.3 +++ sources 13 Mar 2006 18:04:17 -0000 1.4 @@ -1 +1 @@ -580ed290af35c34a33f2206f7f36e489 tuxpaint-0.9.13.tar.gz +4431d1381712cbf3ade566aa47cb3cab tuxpaint-0.9.15.tar.gz Index: tuxpaint.spec =================================================================== RCS file: /cvs/extras/rpms/tuxpaint/devel/tuxpaint.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tuxpaint.spec 22 May 2005 23:41:22 -0000 1.7 +++ tuxpaint.spec 13 Mar 2006 18:04:17 -0000 1.8 @@ -1,6 +1,6 @@ Name: tuxpaint -Version: 0.9.13 -Release: 3 +Version: 0.9.15 +Release: 1%{?dist} Epoch: 1 Summary: Drawing program designed for young children @@ -8,9 +8,8 @@ Group: Applications/Multimedia License: GPL URL: http://www.newbreedsoftware.com/tuxpaint/ -Source0: http://dl.sf.net/tuxpaint/tuxpaint-0.9.13.tar.gz +Source0: http://dl.sf.net/tuxpaint/tuxpaint-0.9.15.tar.gz Source1: %{name}.desktop -Patch0: %{name}-%{version}-destdir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.4, SDL_image-devel, SDL_ttf-devel @@ -24,7 +23,6 @@ %prep %setup -q -%patch0 -p1 -b .destdir %build make %{?_smp_mflags} PREFIX=/usr @@ -35,8 +33,8 @@ mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applnk/Graphics mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/{16x16,32x32,48x48}/apps/ -make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_usr} \ - X11_ICON_PREFIX=%{_datadir}/pixmaps/ +make install PKG_ROOT=$RPM_BUILD_ROOT PREFIX=%{_usr} \ + X11_ICON_PREFIX=$RPM_BUILD_ROOT%{_datadir}/pixmaps/ find $RPM_BUILD_ROOT -type d|xargs chmod 0755 %find_lang %{name} @@ -66,6 +64,10 @@ %{_mandir}/*/man1/* %changelog +* Mon Mar 13 2006 Steven Pritchard 1:0.9.15-1 +- Update to 0.9.15 +- Drop destdir patch + * Sun May 22 2005 Jeremy Katz - 1:0.9.13-3 - rebuild on all arches --- tuxpaint-0.9.13-destdir.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 13 18:21:59 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 13 Mar 2006 13:21:59 -0500 Subject: rpms/hdf5/devel hdf5-1.6.5-flags.patch,1.1,1.2 Message-ID: <200603131822.k2DIMVk0010132@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10106 Modified Files: hdf5-1.6.5-flags.patch Log Message: We still need some stuff from gnu-flags. Just remove the arch stuff hdf5-1.6.5-flags.patch: Index: hdf5-1.6.5-flags.patch =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/hdf5-1.6.5-flags.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf5-1.6.5-flags.patch 13 Mar 2006 16:54:44 -0000 1.1 +++ hdf5-1.6.5-flags.patch 13 Mar 2006 18:21:58 -0000 1.2 @@ -1,36 +1,56 @@ ---- hdf5-1.6.5/config/linux-gnulibc1.orig 2005-10-28 14:15:27.000000000 -0600 -+++ hdf5-1.6.5/config/linux-gnulibc1 2006-03-13 09:49:37.000000000 -0700 -@@ -25,14 +25,5 @@ - CC_BASENAME=gcc - fi +--- hdf5-1.6.5/config/gnu-flags.orig 2005-10-28 14:15:26.000000000 -0600 ++++ hdf5-1.6.5/config/gnu-flags 2006-03-13 10:59:58.000000000 -0700 +@@ -107,25 +107,6 @@ + gcc*|egcs*|pgcc*) + # Architecture-specific flags + arch= +- case "$host_os-$host_cpu" in +- # FreeBSD sets the information from "uname -m" to the general machine +- # architecture, not the specific CPU for the machine, so even our +- # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD +- # machine, use the "sysctl" command to get the CPU hardware model. +- freebsd*-i386) +- host_cpu_model=`sysctl -n hw.model` +- case "$host_cpu_model" in +- # Hmm.. this might not catch Celerons, but it won't hurt them either... +- *Pro*|*II*|*III*|*IV*|*Athlon*) +- arch="-march=i686" +- ;; +- esac +- ;; +- +- *-i686) +- arch="-march=i686" +- ;; +- esac --# Figure out GNU C compiler flags --. $srcdir/config/gnu-flags -- --# Figure out PGI C compiler flags --. $srcdir/config/pgi-flags -- --# Figure out Intel C compiler flags --. $srcdir/config/intel-flags -- - # Check MPICH settings - . $srcdir/config/mpich ---- hdf5-1.6.5/fortran/config/linux-gnulibc1.orig 2006-03-13 09:39:23.000000000 -0700 -+++ hdf5-1.6.5/fortran/config/linux-gnulibc1 2006-03-13 09:47:18.000000000 -0700 -@@ -25,16 +25,6 @@ - CC_BASENAME=gcc - fi + # Host-specific flags + case "`hostname`" in +--- hdf5-1.6.5/fortran/config/gnu-flags.orig 2005-10-28 14:57:02.000000000 -0600 ++++ hdf5-1.6.5/fortran/config/gnu-flags 2006-03-13 10:59:22.000000000 -0700 +@@ -107,25 +107,6 @@ + gcc*|egcs*|pgcc*) + # Architecture-specific flags + arch= +- case "$host_os-$host_cpu" in +- # FreeBSD sets the information from "uname -m" to the general machine +- # architecture, not the specific CPU for the machine, so even our +- # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD +- # machine, use the "sysctl" command to get the CPU hardware model. +- freebsd*-i386) +- host_cpu_model=`sysctl -n hw.model` +- case "$host_cpu_model" in +- # Hmm.. this might not catch Celerons, but it won't hurt them either... +- *Pro*|*II*|*III*|*IV*|*Athlon*) +- arch="-march=i686" +- ;; +- esac +- ;; +- +- *-i686) +- arch="-march=i686" +- ;; +- esac --# Figure out GNU C compiler flags --. $srcdir/config/gnu-flags -- --# Figure out PGI C compiler flags --. $srcdir/config/pgi-flags -- --# Figure out Intel C compiler flags --. $srcdir/config/intel-flags -- -- - # The default Fortran 90 compiler - if test "X-" = "X-$F9X"; then - case $CC_BASENAME in + # Host-specific flags + case "`hostname`" in From fedora-extras-commits at redhat.com Mon Mar 13 18:33:03 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:33:03 -0500 Subject: rpms/clearsilver/devel sources,1.2,1.3 Message-ID: <200603131833.k2DIXZhI010354@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10317 Modified Files: sources Log Message: release 0.10.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clearsilver/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Jan 2006 17:15:17 -0000 1.2 +++ sources 13 Mar 2006 18:33:03 -0000 1.3 @@ -1 +1 @@ -10e19526e87b712068e9073469b10d94 clearsilver-0.10.2.tar.gz +ff4104b0e58bca1b61d528edbd902769 clearsilver-0.10.3.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 18:33:21 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Mon, 13 Mar 2006 13:33:21 -0500 Subject: comps comps-fe5.xml,1.2,1.3 Message-ID: <200603131833.k2DIXrNC010357@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10337 Modified Files: comps-fe5.xml Log Message: merged Index: comps-fe5.xml =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- comps-fe5.xml 11 Mar 2006 06:38:21 -0000 1.2 +++ comps-fe5.xml 13 Mar 2006 18:33:21 -0000 1.3 @@ -99,16 +99,22 @@ blacs blas + cernlib-utils galculator + hmmer + kst + lagan lapack numpy octave qalculate-gtk qalculate-kde qcad + qucs R R-gnomeGUI scalapack + SIBsim4 @@ -146,6 +152,8 @@ gtweakui istanbul lock-keys-applet + nautilus-flac-converter + nautilus-image-converter sabayon seahorse smeg @@ -205,6 +213,7 @@ lacewing lincity-ng lmarbles + lucidlife Maelstrom nethack nethack-vultures @@ -225,6 +234,7 @@ uqm viruskiller wesnoth + worminator xboard xpilot-ng xplanet @@ -240,6 +250,7 @@ true drgeo + drgeo-doc gperiodic stellarium tuxtype2 @@ -307,6 +318,7 @@ digikam fontforge fyre + grads gpp gqview graphviz @@ -366,6 +378,7 @@ gnotime gnumeric gourmet + gramps grisbi gsview koffice-suite @@ -374,8 +387,8 @@ notecase notemeister MagicPoint + pybliographer qcad - xfcalendar @@ -402,8 +415,11 @@ graveman grip kover + libvisual-plugins soundconverter soundtracker + tagtool + ushare xmms xmms-cdread xmms-flac @@ -423,6 +439,7 @@ apt cfengine cfs + crack dkms epylog fuse @@ -433,7 +450,9 @@ ibmonitor lirc moodss + moomps nagios + nfswatch rdiff-backup sabayon shorewall @@ -474,6 +493,7 @@ ircd-hybrid jabberd kannel + ushare @@ -510,6 +530,7 @@ apachetop awstats boa + dap-server-cgi lighttpd lighttpd-fastcgi mediawiki @@ -564,6 +585,7 @@ xfce4-toys xfwm4-themes xfwm4-themes + xfcalendar @@ -629,6 +651,7 @@ aterm fonttools rxvt + workrave xlockmore @@ -664,6 +687,16 @@ + web-development + Web Development + These packages are helpful when developing web applications or web pages. + false + true + + + + + admin-tools Administration Tools This group is a collection of graphical administration tools for the system, such as for managing user accounts and configuring system hardware. @@ -739,6 +772,7 @@ 70 xfce-software-development + web-development @@ -751,4 +785,4 @@ network-server - + \ No newline at end of file From fedora-extras-commits at redhat.com Mon Mar 13 18:34:10 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:34:10 -0500 Subject: rpms/clearsilver/FC-3 sources,1.2,1.3 Message-ID: <200603131834.k2DIYglf010386@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10369 Modified Files: sources Log Message: release 0.10.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Jan 2006 17:15:17 -0000 1.2 +++ sources 13 Mar 2006 18:34:09 -0000 1.3 @@ -1 +1 @@ -10e19526e87b712068e9073469b10d94 clearsilver-0.10.2.tar.gz +ff4104b0e58bca1b61d528edbd902769 clearsilver-0.10.3.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 18:34:53 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:34:53 -0500 Subject: rpms/clearsilver/FC-4 sources,1.2,1.3 Message-ID: <200603131835.k2DIZPt4010409@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10392 Modified Files: sources Log Message: release 0.10.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Jan 2006 17:15:17 -0000 1.2 +++ sources 13 Mar 2006 18:34:53 -0000 1.3 @@ -1 +1 @@ -10e19526e87b712068e9073469b10d94 clearsilver-0.10.2.tar.gz +ff4104b0e58bca1b61d528edbd902769 clearsilver-0.10.3.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 18:36:57 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:36:57 -0500 Subject: rpms/clearsilver/devel clearsilver-0.10.3-fedora.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 clearsilver.spec, 1.2, 1.3 Message-ID: <200603131837.k2DIbTNE010446@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10424 Modified Files: .cvsignore clearsilver.spec Added Files: clearsilver-0.10.3-fedora.patch Log Message: * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 clearsilver-0.10.3-fedora.patch: --- NEW FILE clearsilver-0.10.3-fedora.patch --- diff -Nur clearsilver-0.10.3.orig/cgi/cgi.c clearsilver-0.10.3/cgi/cgi.c --- clearsilver-0.10.3.orig/cgi/cgi.c 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/cgi/cgi.c 2006-03-13 19:17:12.000000000 +0100 @@ -641,7 +641,7 @@ if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL) { - debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d"; + debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d"; } if (!pid) diff -Nur clearsilver-0.10.3.orig/configure clearsilver-0.10.3/configure --- clearsilver-0.10.3.orig/configure 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/configure 2006-03-13 19:20:09.000000000 +0100 @@ -6003,7 +6003,7 @@ echo $ECHO_N "checking for python includes... $ECHO_C" >&6 python_inc=no python_lib=no - python_search_path="/neo/opt /usr/local /usr /c" + python_search_path="/usr" python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15" if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then python_bin=$cs_cv_python_path @@ -6299,7 +6299,8 @@ done _ACJNI_FOLLOWED="$_cur" -_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +_JTOPDIR="$java_path" case "$host_os" in darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'` _JINC="$_JTOPDIR/Headers";; diff -Nur clearsilver-0.10.3.orig/imd/imdm.py clearsilver-0.10.3/imd/imdm.py --- clearsilver-0.10.3.orig/imd/imdm.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/imd/imdm.py 2006-03-13 19:20:25.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/local/bin/python +#!/usr/bin/python # # imdm # diff -Nur clearsilver-0.10.3.orig/java-jni/Makefile clearsilver-0.10.3/java-jni/Makefile --- clearsilver-0.10.3.orig/java-jni/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/java-jni/Makefile 2006-03-13 19:21:50.000000000 +0100 @@ -37,14 +37,14 @@ org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR) $(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS -CSTest.class: CSTest.java +CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR) $(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java gold: CSTest.class @/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold @echo "Generated gold files" -test: CSTest.class +test: CSTest.class $(NEO_UTIL_SO) @echo "Running java test" @failed=0; \ rm -f javatest.out; \ diff -Nur clearsilver-0.10.3.orig/ruby/Makefile clearsilver-0.10.3/ruby/Makefile --- clearsilver-0.10.3.orig/ruby/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/ruby/Makefile 2006-03-13 19:22:19.000000000 +0100 @@ -41,7 +41,7 @@ install: all - $(RUBY) install.rb install + $(RUBY) install.rb install --prefix=$(DESTDIR) clean: $(RM) ext/hdf/*.o ext/hdf/*.so diff -Nur clearsilver-0.10.3.orig/scripts/document.py clearsilver-0.10.3/scripts/document.py --- clearsilver-0.10.3.orig/scripts/document.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/scripts/document.py 2006-03-13 19:22:42.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python """ document.py -- Simple script to generate manpages from C header files. Looks for the following formatted C comments in the C header files: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clearsilver/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Jan 2006 17:15:17 -0000 1.2 +++ .cvsignore 13 Mar 2006 18:36:56 -0000 1.3 @@ -1 +1 @@ -clearsilver-0.10.2.tar.gz +clearsilver-0.10.3.tar.gz Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/devel/clearsilver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clearsilver.spec 13 Feb 2006 18:22:17 -0000 1.2 +++ clearsilver.spec 13 Mar 2006 18:36:56 -0000 1.3 @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: clearsilver -Version: 0.10.2 -Release: 3%{?dist} +Version: 0.10.3 +Release: 1%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License URL: http://www.clearsilver.net/ Source0: http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz -Patch0: %{name}-0.10.2-fedora.patch +Patch0: %{name}-0.10.3-fedora.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel Provides: %{name}-devel = %{version}-%{release} @@ -162,6 +162,9 @@ %endif %changelog +* Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 +- release 0.10.3 + * Mon Feb 13 2006 Joost Soeterbroek - 0.10.2-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon Mar 13 18:38:41 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:38:41 -0500 Subject: rpms/clearsilver/FC-3 clearsilver-0.10.3-fedora.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 clearsilver.spec, 1.1, 1.2 Message-ID: <200603131839.k2DIdDAN010475@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10452 Modified Files: .cvsignore clearsilver.spec Added Files: clearsilver-0.10.3-fedora.patch Log Message: * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 clearsilver-0.10.3-fedora.patch: --- NEW FILE clearsilver-0.10.3-fedora.patch --- diff -Nur clearsilver-0.10.3.orig/cgi/cgi.c clearsilver-0.10.3/cgi/cgi.c --- clearsilver-0.10.3.orig/cgi/cgi.c 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/cgi/cgi.c 2006-03-13 19:17:12.000000000 +0100 @@ -641,7 +641,7 @@ if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL) { - debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d"; + debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d"; } if (!pid) diff -Nur clearsilver-0.10.3.orig/configure clearsilver-0.10.3/configure --- clearsilver-0.10.3.orig/configure 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/configure 2006-03-13 19:20:09.000000000 +0100 @@ -6003,7 +6003,7 @@ echo $ECHO_N "checking for python includes... $ECHO_C" >&6 python_inc=no python_lib=no - python_search_path="/neo/opt /usr/local /usr /c" + python_search_path="/usr" python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15" if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then python_bin=$cs_cv_python_path @@ -6299,7 +6299,8 @@ done _ACJNI_FOLLOWED="$_cur" -_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +_JTOPDIR="$java_path" case "$host_os" in darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'` _JINC="$_JTOPDIR/Headers";; diff -Nur clearsilver-0.10.3.orig/imd/imdm.py clearsilver-0.10.3/imd/imdm.py --- clearsilver-0.10.3.orig/imd/imdm.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/imd/imdm.py 2006-03-13 19:20:25.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/local/bin/python +#!/usr/bin/python # # imdm # diff -Nur clearsilver-0.10.3.orig/java-jni/Makefile clearsilver-0.10.3/java-jni/Makefile --- clearsilver-0.10.3.orig/java-jni/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/java-jni/Makefile 2006-03-13 19:21:50.000000000 +0100 @@ -37,14 +37,14 @@ org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR) $(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS -CSTest.class: CSTest.java +CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR) $(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java gold: CSTest.class @/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold @echo "Generated gold files" -test: CSTest.class +test: CSTest.class $(NEO_UTIL_SO) @echo "Running java test" @failed=0; \ rm -f javatest.out; \ diff -Nur clearsilver-0.10.3.orig/ruby/Makefile clearsilver-0.10.3/ruby/Makefile --- clearsilver-0.10.3.orig/ruby/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/ruby/Makefile 2006-03-13 19:22:19.000000000 +0100 @@ -41,7 +41,7 @@ install: all - $(RUBY) install.rb install + $(RUBY) install.rb install --prefix=$(DESTDIR) clean: $(RM) ext/hdf/*.o ext/hdf/*.so diff -Nur clearsilver-0.10.3.orig/scripts/document.py clearsilver-0.10.3/scripts/document.py --- clearsilver-0.10.3.orig/scripts/document.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/scripts/document.py 2006-03-13 19:22:42.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python """ document.py -- Simple script to generate manpages from C header files. Looks for the following formatted C comments in the C header files: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Jan 2006 17:15:17 -0000 1.2 +++ .cvsignore 13 Mar 2006 18:38:41 -0000 1.3 @@ -1 +1 @@ -clearsilver-0.10.2.tar.gz +clearsilver-0.10.3.tar.gz Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-3/clearsilver.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clearsilver.spec 8 Jan 2006 17:15:17 -0000 1.1 +++ clearsilver.spec 13 Mar 2006 18:38:41 -0000 1.2 @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: clearsilver -Version: 0.10.2 -Release: 2%{?dist} +Version: 0.10.3 +Release: 1%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License URL: http://www.clearsilver.net/ Source0: http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz -Patch0: %{name}-0.10.2-fedora.patch +Patch0: %{name}-0.10.3-fedora.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel Provides: %{name}-devel = %{version}-%{release} @@ -162,6 +162,12 @@ %endif %changelog +* Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 +- release 0.10.3 + +* Mon Feb 13 2006 Joost Soeterbroek - 0.10.2-3 +- Rebuild for Fedora Extras 5 + * Fri Jan 6 2006 Joost Soeterbroek - 0.10.2-2 - Rebuild with disable-ruby, disable-java for any arch other than i386 - hardcoded version in Patch0 From fedora-extras-commits at redhat.com Mon Mar 13 18:39:50 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Mon, 13 Mar 2006 13:39:50 -0500 Subject: rpms/clearsilver/FC-4 clearsilver-0.10.3-fedora.patch, NONE, 1.1 clearsilver.spec, 1.1, 1.2 Message-ID: <200603131840.k2DIeOhe010533@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10481 Modified Files: clearsilver.spec Added Files: clearsilver-0.10.3-fedora.patch Log Message: * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 clearsilver-0.10.3-fedora.patch: --- NEW FILE clearsilver-0.10.3-fedora.patch --- diff -Nur clearsilver-0.10.3.orig/cgi/cgi.c clearsilver-0.10.3/cgi/cgi.c --- clearsilver-0.10.3.orig/cgi/cgi.c 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/cgi/cgi.c 2006-03-13 19:17:12.000000000 +0100 @@ -641,7 +641,7 @@ if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL) { - debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d"; + debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d"; } if (!pid) diff -Nur clearsilver-0.10.3.orig/configure clearsilver-0.10.3/configure --- clearsilver-0.10.3.orig/configure 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/configure 2006-03-13 19:20:09.000000000 +0100 @@ -6003,7 +6003,7 @@ echo $ECHO_N "checking for python includes... $ECHO_C" >&6 python_inc=no python_lib=no - python_search_path="/neo/opt /usr/local /usr /c" + python_search_path="/usr" python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15" if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then python_bin=$cs_cv_python_path @@ -6299,7 +6299,8 @@ done _ACJNI_FOLLOWED="$_cur" -_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'` +_JTOPDIR="$java_path" case "$host_os" in darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'` _JINC="$_JTOPDIR/Headers";; diff -Nur clearsilver-0.10.3.orig/imd/imdm.py clearsilver-0.10.3/imd/imdm.py --- clearsilver-0.10.3.orig/imd/imdm.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/imd/imdm.py 2006-03-13 19:20:25.000000000 +0100 @@ -1,4 +1,4 @@ -#!/usr/local/bin/python +#!/usr/bin/python # # imdm # diff -Nur clearsilver-0.10.3.orig/java-jni/Makefile clearsilver-0.10.3/java-jni/Makefile --- clearsilver-0.10.3.orig/java-jni/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/java-jni/Makefile 2006-03-13 19:21:50.000000000 +0100 @@ -37,14 +37,14 @@ org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR) $(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS -CSTest.class: CSTest.java +CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR) $(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java gold: CSTest.class @/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold @echo "Generated gold files" -test: CSTest.class +test: CSTest.class $(NEO_UTIL_SO) @echo "Running java test" @failed=0; \ rm -f javatest.out; \ diff -Nur clearsilver-0.10.3.orig/ruby/Makefile clearsilver-0.10.3/ruby/Makefile --- clearsilver-0.10.3.orig/ruby/Makefile 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/ruby/Makefile 2006-03-13 19:22:19.000000000 +0100 @@ -41,7 +41,7 @@ install: all - $(RUBY) install.rb install + $(RUBY) install.rb install --prefix=$(DESTDIR) clean: $(RM) ext/hdf/*.o ext/hdf/*.so diff -Nur clearsilver-0.10.3.orig/scripts/document.py clearsilver-0.10.3/scripts/document.py --- clearsilver-0.10.3.orig/scripts/document.py 2006-03-13 18:04:52.000000000 +0100 +++ clearsilver-0.10.3/scripts/document.py 2006-03-13 19:22:42.000000000 +0100 @@ -1,4 +1,4 @@ -#!/bin/env python +#!/usr/bin/env python """ document.py -- Simple script to generate manpages from C header files. Looks for the following formatted C comments in the C header files: Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-4/clearsilver.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- clearsilver.spec 8 Jan 2006 17:15:17 -0000 1.1 +++ clearsilver.spec 13 Mar 2006 18:39:49 -0000 1.2 @@ -1,14 +1,14 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: clearsilver -Version: 0.10.2 -Release: 2%{?dist} +Version: 0.10.3 +Release: 1%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License URL: http://www.clearsilver.net/ Source0: http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz -Patch0: %{name}-0.10.2-fedora.patch +Patch0: %{name}-0.10.3-fedora.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zlib-devel Provides: %{name}-devel = %{version}-%{release} @@ -162,6 +162,12 @@ %endif %changelog +* Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 +- release 0.10.3 + +* Mon Feb 13 2006 Joost Soeterbroek - 0.10.2-3 +- Rebuild for Fedora Extras 5 + * Fri Jan 6 2006 Joost Soeterbroek - 0.10.2-2 - Rebuild with disable-ruby, disable-java for any arch other than i386 - hardcoded version in Patch0 From fedora-extras-commits at redhat.com Mon Mar 13 18:42:58 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Mon, 13 Mar 2006 13:42:58 -0500 Subject: comps comps-fe5.xml.in,1.18,1.19 Message-ID: <200603131843.k2DIhU35010626@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10609 Modified Files: comps-fe5.xml.in Log Message: Add packages: highlight, inadyn Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- comps-fe5.xml.in 13 Mar 2006 18:18:46 -0000 1.18 +++ comps-fe5.xml.in 13 Mar 2006 18:42:58 -0000 1.19 @@ -41,6 +41,7 @@ gforth ghc git-core + highlight lincvs lua mach @@ -448,6 +449,7 @@ ghex hercules ibmonitor + inadyn>/packagereq> lirc moodss moomps From fedora-extras-commits at redhat.com Mon Mar 13 19:24:30 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 13 Mar 2006 14:24:30 -0500 Subject: comps comps-fe5.xml.in,1.19,1.20 Message-ID: <200603131925.k2DJP2mY012842@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12825 Modified Files: comps-fe5.xml.in Log Message: Added rogue and tong games. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- comps-fe5.xml.in 13 Mar 2006 18:42:58 -0000 1.19 +++ comps-fe5.xml.in 13 Mar 2006 19:24:29 -0000 1.20 @@ -226,11 +226,13 @@ qascade qqo rocksndiamonds + rogue scorched3d sirius sopwith starfighter supertux + tong torcs uqm viruskiller From fedora-extras-commits at redhat.com Mon Mar 13 19:34:41 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 13 Mar 2006 14:34:41 -0500 Subject: rpms/nomadsync/FC-4 nomadsync-libnjbloc64.patch, NONE, 1.1 nomadsync.spec, 1.2, 1.3 Message-ID: <200603131935.k2DJZDej012902@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12879 Modified Files: nomadsync.spec Added Files: nomadsync-libnjbloc64.patch Log Message: x86_64 patching, trying this approach... nomadsync-libnjbloc64.patch: --- NEW FILE nomadsync-libnjbloc64.patch --- --- src/Makefile.in.orig 2006-03-12 22:32:56.000000000 +0100 +++ src/Makefile.in 2006-03-13 07:54:27.000000000 +0100 @@ -67,7 +67,7 @@ layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) \ mpg123.$(OBJEXT) nomadsync_OBJECTS = $(am_nomadsync_OBJECTS) -nomadsync_DEPENDENCIES = /usr/local/lib/libnjb.so +nomadsync_DEPENDENCIES = /usr/lib64/libnjb.so DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -226,7 +226,7 @@ libmpg123/l2tables.h libmpg123/layer1.cpp libmpg123/layer2.cpp libmpg123/layer3.cpp \ libmpg123/mpg123.cpp libmpg123/mpg123.h -nomadsync_LDADD = /usr/local/lib/libnjb.so -lid3 +nomadsync_LDADD = /usr/lib64/libnjb.so -lid3 AM_CXXFLAGS = `gtk-config --cflags` # this is where the desktop file will go Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/FC-4/nomadsync.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nomadsync.spec 12 Mar 2006 22:07:33 -0000 1.2 +++ nomadsync.spec 13 Mar 2006 19:34:40 -0000 1.3 @@ -12,14 +12,14 @@ Name: nomadsync Version: 0.4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ - Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: nomadsync-libnjbloc.patch +Patch1: nomadsync-libnjbloc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -39,7 +39,11 @@ %prep %setup -q -n %{name} +%if "%{_arch}" == "x86_64" +%patch1 -p0 +%else %patch0 -p0 +%endif %build %configure --with-wx-config=%{_bindir}/wxgtk-2.4-config @@ -85,6 +89,9 @@ %doc ChangeLog authors copying readme %changelog +* Mon Mar 13 2006 Linus Walleij 0.4.2-10 +- Fixed a x86_64 bug, by separate patching, I think... + * Sun Mar 12 2006 Linus Walleij 0.4.2-9 - Found a patchable bug during build tests. From fedora-extras-commits at redhat.com Mon Mar 13 19:45:46 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Mon, 13 Mar 2006 14:45:46 -0500 Subject: rpms/rogue/devel rogue.png, NONE, 1.1 rogue.desktop, 1.1, 1.2 rogue.spec, 1.2, 1.3 Message-ID: <200603131946.k2DJkI7t013020@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12993 Modified Files: rogue.desktop rogue.spec Added Files: rogue.png Log Message: Added icon for .desktop file. Index: rogue.desktop =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- rogue.desktop 10 Mar 2006 15:59:40 -0000 1.1 +++ rogue.desktop 13 Mar 2006 19:45:45 -0000 1.2 @@ -4,7 +4,7 @@ GenericName=Rogue Comment=The original curses-based adventure game Exec=rogue -Icon= +Icon=rogue.png Terminal=true Type=Application Categories=Application;Game; Index: rogue.spec =================================================================== RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- rogue.spec 13 Mar 2006 04:36:21 -0000 1.2 +++ rogue.spec 13 Mar 2006 19:45:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: rogue Version: 5.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The original graphical adventure game Group: Amusements/Games @@ -8,6 +8,7 @@ URL: http://roguelike.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/roguelike/rogue5.4.2-src.tar.gz Source1: rogue.desktop +Source2: rogue.png Patch0: rogue-rpmopts.patch Patch1: rogue-includes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -43,23 +44,41 @@ --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,-) %attr(2755,games,games) %{_bindir}/rogue %{_mandir}/man6/rogue.6.gz %{_datadir}/applications/fedora-%{name}.desktop +%{_datadir}/icons/hicolor/32x32/apps/rogue.png %dir %attr(0775,games,games) %{_var}/games/roguelike %doc LICENSE.TXT rogue54.doc rogue54.html readme54.html %changelog +* Mon Mar 13 2006 Wart 5.4.2-3 +- Added icon for .desktop file. + * Sun Mar 12 2006 Wart 5.4.2-2 - Added missing BR: ncurses-devel, desktop-file-utils From fedora-extras-commits at redhat.com Mon Mar 13 20:10:28 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 13 Mar 2006 15:10:28 -0500 Subject: rpms/hdf5/FC-4 hdf5-1.6.5-flags.patch,NONE,1.1 hdf5.spec,1.7,1.8 Message-ID: <200603132011.k2DKB1b5015199@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15179 Modified Files: hdf5.spec Added Files: hdf5-1.6.5-flags.patch Log Message: Add patch to avoid HDF setting the compiler flags hdf5-1.6.5-flags.patch: --- NEW FILE hdf5-1.6.5-flags.patch --- --- hdf5-1.6.5/config/gnu-flags.orig 2005-10-28 14:15:26.000000000 -0600 +++ hdf5-1.6.5/config/gnu-flags 2006-03-13 10:59:58.000000000 -0700 @@ -107,25 +107,6 @@ gcc*|egcs*|pgcc*) # Architecture-specific flags arch= - case "$host_os-$host_cpu" in - # FreeBSD sets the information from "uname -m" to the general machine - # architecture, not the specific CPU for the machine, so even our - # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD - # machine, use the "sysctl" command to get the CPU hardware model. - freebsd*-i386) - host_cpu_model=`sysctl -n hw.model` - case "$host_cpu_model" in - # Hmm.. this might not catch Celerons, but it won't hurt them either... - *Pro*|*II*|*III*|*IV*|*Athlon*) - arch="-march=i686" - ;; - esac - ;; - - *-i686) - arch="-march=i686" - ;; - esac # Host-specific flags case "`hostname`" in --- hdf5-1.6.5/fortran/config/gnu-flags.orig 2005-10-28 14:57:02.000000000 -0600 +++ hdf5-1.6.5/fortran/config/gnu-flags 2006-03-13 10:59:22.000000000 -0700 @@ -107,25 +107,6 @@ gcc*|egcs*|pgcc*) # Architecture-specific flags arch= - case "$host_os-$host_cpu" in - # FreeBSD sets the information from "uname -m" to the general machine - # architecture, not the specific CPU for the machine, so even our - # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD - # machine, use the "sysctl" command to get the CPU hardware model. - freebsd*-i386) - host_cpu_model=`sysctl -n hw.model` - case "$host_cpu_model" in - # Hmm.. this might not catch Celerons, but it won't hurt them either... - *Pro*|*II*|*III*|*IV*|*Athlon*) - arch="-march=i686" - ;; - esac - ;; - - *-i686) - arch="-march=i686" - ;; - esac # Host-specific flags case "`hostname`" in Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- hdf5.spec 21 Dec 2005 21:55:39 -0000 1.7 +++ hdf5.spec 13 Mar 2006 20:10:28 -0000 1.8 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -12,6 +12,7 @@ Patch3: hdf5-1.6.4-testh5repack.patch Patch4: hdf5-1.6.5-h5diff_attr.patch Patch5: hdf5-1.6.4-ppc.patch +Patch6: hdf5-1.6.5-flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran >= 4.0.2, krb5-devel, openssl-devel, zlib-devel, time @@ -40,6 +41,7 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 -b .flags %build autoconf @@ -95,6 +97,9 @@ %{_libdir}/*.mod %changelog +* Mon Mar 13 2006 Orion Poplawski 1.6.5-3 +- Add patch to avoid HDF setting the compiler flags + * Wed Dec 21 2005 Orion Poplawski 1.6.5-2 - Don't ship h5perf with missing library From fedora-extras-commits at redhat.com Mon Mar 13 20:14:51 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 13 Mar 2006 15:14:51 -0500 Subject: rpms/hdf5/FC-3 hdf5-1.6.5-flags.patch,NONE,1.1 hdf5.spec,1.2,1.3 Message-ID: <200603132015.k2DKFE4v015317@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15273 Modified Files: hdf5.spec Added Files: hdf5-1.6.5-flags.patch Log Message: Add patch to avoid HDF setting the march compiler flag hdf5-1.6.5-flags.patch: --- NEW FILE hdf5-1.6.5-flags.patch --- --- hdf5-1.6.5/config/gnu-flags.orig 2005-10-28 14:15:26.000000000 -0600 +++ hdf5-1.6.5/config/gnu-flags 2006-03-13 10:59:58.000000000 -0700 @@ -107,25 +107,6 @@ gcc*|egcs*|pgcc*) # Architecture-specific flags arch= - case "$host_os-$host_cpu" in - # FreeBSD sets the information from "uname -m" to the general machine - # architecture, not the specific CPU for the machine, so even our - # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD - # machine, use the "sysctl" command to get the CPU hardware model. - freebsd*-i386) - host_cpu_model=`sysctl -n hw.model` - case "$host_cpu_model" in - # Hmm.. this might not catch Celerons, but it won't hurt them either... - *Pro*|*II*|*III*|*IV*|*Athlon*) - arch="-march=i686" - ;; - esac - ;; - - *-i686) - arch="-march=i686" - ;; - esac # Host-specific flags case "`hostname`" in --- hdf5-1.6.5/fortran/config/gnu-flags.orig 2005-10-28 14:57:02.000000000 -0600 +++ hdf5-1.6.5/fortran/config/gnu-flags 2006-03-13 10:59:22.000000000 -0700 @@ -107,25 +107,6 @@ gcc*|egcs*|pgcc*) # Architecture-specific flags arch= - case "$host_os-$host_cpu" in - # FreeBSD sets the information from "uname -m" to the general machine - # architecture, not the specific CPU for the machine, so even our - # Pentium II Xeon server is set to "i386". Once we know we are on a FreeBSD - # machine, use the "sysctl" command to get the CPU hardware model. - freebsd*-i386) - host_cpu_model=`sysctl -n hw.model` - case "$host_cpu_model" in - # Hmm.. this might not catch Celerons, but it won't hurt them either... - *Pro*|*II*|*III*|*IV*|*Athlon*) - arch="-march=i686" - ;; - esac - ;; - - *-i686) - arch="-march=i686" - ;; - esac # Host-specific flags case "`hostname`" in Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/hdf5.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- hdf5.spec 2 Mar 2006 21:38:43 -0000 1.2 +++ hdf5.spec 13 Mar 2006 20:14:51 -0000 1.3 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -11,6 +11,7 @@ Patch2: hdf5-1.6.4-norpath.patch Patch3: hdf5-1.6.4-testh5repack.patch Patch4: hdf5-1.6.5-h5diff_attr.patch +Patch5: hdf5-1.6.5-flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, time @@ -38,6 +39,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 -b .flags %build autoconf @@ -92,6 +94,9 @@ %{_libdir}/*.so %changelog +* Mon Mar 13 2006 Orion Poplawski 1.6.5-2 +- Add patch to avoid HDF setting the march compiler flag + * Thu Mar 02 2006 Orion Poplawski 1.6.5-1 - Update to 1.6.5 From fedora-extras-commits at redhat.com Mon Mar 13 20:15:16 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:15:16 -0500 Subject: rpms/adime - New directory Message-ID: <200603132015.k2DKFIMt015331@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15321/adime Log Message: Directory /cvs/extras/rpms/adime added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 20:15:23 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:15:23 -0500 Subject: rpms/adime/devel - New directory Message-ID: <200603132015.k2DKFPg5015375@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15321/adime/devel Log Message: Directory /cvs/extras/rpms/adime/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 20:15:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:15:58 -0500 Subject: rpms/adime Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603132016.k2DKG0iV015419@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404 Added Files: Makefile import.log Log Message: Setup of module adime --- NEW FILE Makefile --- # Top level Makefile for module adime all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 13 20:16:04 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:16:04 -0500 Subject: rpms/adime/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603132016.k2DKG64x015437@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15404/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module adime --- NEW 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 Mar 13 20:16:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:16:58 -0500 Subject: rpms/adime import.log,1.1,1.2 Message-ID: <200603132017.k2DKHVjM015517@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15478 Modified Files: import.log Log Message: auto-import adime-2.2.1-3 on branch devel from adime-2.2.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/adime/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Mar 2006 20:15:58 -0000 1.1 +++ import.log 13 Mar 2006 20:16:58 -0000 1.2 @@ -0,0 +1 @@ +adime-2_2_1-3:HEAD:adime-2.2.1-3.src.rpm:1142280752 From fedora-extras-commits at redhat.com Mon Mar 13 20:17:08 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 15:17:08 -0500 Subject: rpms/adime/devel adime-2.2.1-so-fixes.patch, NONE, 1.1 adime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603132017.k2DKHek9015521@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/adime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15478/devel Modified Files: .cvsignore sources Added Files: adime-2.2.1-so-fixes.patch adime.spec Log Message: auto-import adime-2.2.1-3 on branch devel from adime-2.2.1-3.src.rpm adime-2.2.1-so-fixes.patch: --- NEW FILE adime-2.2.1-so-fixes.patch --- --- adime-2.2.1/misc/makefile.uni.soname 2004-09-10 21:34:54.000000000 +0200 +++ adime-2.2.1/misc/makefile.uni 2006-03-12 09:23:54.000000000 +0100 @@ -53,7 +53,7 @@ # link as a shared object OBJ_DIR = $(OBJ_PLATFORM_ROOT_DIR)/$(PACKAGE5) -IMPLIB_BASENAME = lib$(PACKAGE5).so +IMPLIB_BASENAME = lib$(PACKAGE5).so.0 IMPLIB_NAME = $(LIB_DIR)/$(IMPLIB_BASENAME) LIB_NAME = $(IMPLIB_NAME) @@ -153,7 +153,11 @@ SFLAGS = $(WFLAGS) ifndef SYMBOLMODE LFLAGS += -s -LIB_FLAGS = `allegro-config --libs release $(ALLEGRO_CONFIG_FLAGS)` +# allegro-config --libs drags in -lalleg_unshareable, which is non-PIC +# and thus should only be in the application not a .so file. This means all +# applications which use adime must be linked with: +# -Wl,--export-dynamic -lalleg_unsharable (or `allegro-config --libs`) +LIB_FLAGS= $(shell allegro-config --libs | sed 's/-lalleg_unsharable//') endif endif endif @@ -236,7 +240,7 @@ LINK_LIB_DEPS = define LINK_LIB -gcc $(LFLAGS) -shared -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) +gcc $(LFLAGS) -shared -Wl,-soname=$(IMPLIB_BASENAME) -o $(IMPLIB_NAME) $(LIB_OBJS) $(LIB_FLAGS) endef LINK_EXE_DEPS = @@ -270,7 +274,7 @@ $(SYSTEM_LIB_DIR)/$(IMPLIB_BASENAME): $(IMPLIB_NAME) install -m 755 -d $(SYSTEM_LIB_DIR) - install -m 644 $< $@ + install -m 755 $< $@ $(SYSTEM_INCLUDE_DIR)/adime.h: include/adime.h install -m 755 -d $(SYSTEM_INCLUDE_DIR) --- NEW FILE adime.spec --- Name: adime Version: 2.2.1 Release: 3%{?dist} Summary: Allegro Dialogs Made Easy Group: System Environment/Libraries License: zlib License URL: http://adime.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Patch0: adime-2.2.1-so-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel texinfo Requires(post): /sbin/install-info Requires(preun): /sbin/install-info %description Adime is a portable add-on library for Allegro with functions for generating Allegro dialogs in a very simple way. Its main purpose is to give as easy an API as possible to people who want dialogs for editing many kinds of input data. %package devel Summary: Development libraries and headers for adime Group: Development/Libraries Requires: %{name} = %{version} Requires: allegro-devel %description devel The developmental files that must be installed in order to compile applications which use adime. %prep %setup -q %patch0 -p1 -z .so-fixes ./fix.sh unix rm docs/txt/tmpfile.txt mkdir docs/html docs/rtf %build make %{?_smp_mflags} lib docs \ CFLAGS="-fPIC -DPIC $RPM_OPT_FLAGS" \ CFLAGS_NO_OPTIMIZE="-fPIC -DPIC $RPM_OPT_FLAGS" \ LFLAGS=-g %install rm -rf $RPM_BUILD_ROOT make install install-man install-info \ SYSTEM_DIR=$RPM_BUILD_ROOT/usr \ SYSTEM_LIB_DIR=$RPM_BUILD_ROOT%{_libdir} \ SYSTEM_MAN_DIR=$RPM_BUILD_ROOT%{_mandir} \ SYSTEM_INFO_DIR=$RPM_BUILD_ROOT%{_infodir} rm $RPM_BUILD_ROOT%{_infodir}/dir ln -s libadime.so.0 $RPM_BUILD_ROOT%{_libdir}/libadime.so %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %post devel /sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || : %preun devel if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || : fi %files %defattr(-,root,root,-) %doc license.txt thanks.txt changes.txt %{_libdir}/libadime.so.0 %files devel %defattr(-,root,root,-) %doc readme.txt docs/txt/*.txt docs/rtf docs/html %{_includedir}/adime.h %{_includedir}/adime %{_libdir}/libadime.so %{_mandir}/man3/* %{_infodir}/adime.info.gz %changelog * Sun Mar 12 2006 Hans de Goede 2.2.1-3 - change license to "zlib License" - modify adime-2.2.1-so-fixes.patch to strip -lalleg_unshareble from allegro-config --libs output instead of using a hardcoded allegro linkerflag * Sun Mar 12 2006 Hans de Goede 2.2.1-2 - add BR texinfo - mkdir docs/html and docs/rtf during %%prep to make "make docs" happy, include the results in %%doc - don't link liballeg_unsharable.a into our .so.0 file * Sat Mar 11 2006 Hans de Goede 2.2.1-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/adime/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Mar 2006 20:16:04 -0000 1.1 +++ .cvsignore 13 Mar 2006 20:17:07 -0000 1.2 @@ -0,0 +1 @@ +adime-2.2.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/adime/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Mar 2006 20:16:04 -0000 1.1 +++ sources 13 Mar 2006 20:17:07 -0000 1.2 @@ -0,0 +1 @@ +aa71fbe7661e56421cab42e6bca70c7c adime-2.2.1.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 20:47:03 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Mon, 13 Mar 2006 15:47:03 -0500 Subject: rpms/nomadsync/devel nomadsync-libnjbloc64.patch, NONE, 1.1 nomadsync.spec, 1.2, 1.3 Message-ID: <200603132047.k2DKlZR4015760@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15740 Modified Files: nomadsync.spec Added Files: nomadsync-libnjbloc64.patch Log Message: Don't think this will work on devel but need to bump anyway. nomadsync-libnjbloc64.patch: --- NEW FILE nomadsync-libnjbloc64.patch --- --- src/Makefile.in.orig 2006-03-12 22:32:56.000000000 +0100 +++ src/Makefile.in 2006-03-13 07:54:27.000000000 +0100 @@ -67,7 +67,7 @@ layer1.$(OBJEXT) layer2.$(OBJEXT) layer3.$(OBJEXT) \ mpg123.$(OBJEXT) nomadsync_OBJECTS = $(am_nomadsync_OBJECTS) -nomadsync_DEPENDENCIES = /usr/local/lib/libnjb.so +nomadsync_DEPENDENCIES = /usr/lib64/libnjb.so DEFAULT_INCLUDES = -I. -I$(srcdir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -226,7 +226,7 @@ libmpg123/l2tables.h libmpg123/layer1.cpp libmpg123/layer2.cpp libmpg123/layer3.cpp \ libmpg123/mpg123.cpp libmpg123/mpg123.h -nomadsync_LDADD = /usr/local/lib/libnjb.so -lid3 +nomadsync_LDADD = /usr/lib64/libnjb.so -lid3 AM_CXXFLAGS = `gtk-config --cflags` # this is where the desktop file will go Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/nomadsync.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nomadsync.spec 12 Mar 2006 21:56:38 -0000 1.2 +++ nomadsync.spec 13 Mar 2006 20:47:03 -0000 1.3 @@ -12,14 +12,14 @@ Name: nomadsync Version: 0.4.2 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ - Group: Applications/Multimedia Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: %{name}.desktop Patch0: nomadsync-libnjbloc.patch +Patch1: nomadsync-libnjbloc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -39,7 +39,11 @@ %prep %setup -q -n %{name} +%if "%{_arch}" == "x86_64" +%patch1 -p0 +%else %patch0 -p0 +%endif %build %configure --with-wx-config=%{_bindir}/wxgtk-2.4-config @@ -85,6 +89,9 @@ %doc ChangeLog authors copying readme %changelog +* Mon Mar 13 2006 Linus Walleij 0.4.2-10 +- Fixed a x86_64 bug, by separate patching, I think... + * Sun Mar 12 2006 Linus Walleij 0.4.2-9 - Found a patchable bug during build tests. From fedora-extras-commits at redhat.com Mon Mar 13 21:02:59 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Mon, 13 Mar 2006 16:02:59 -0500 Subject: comps comps-fe5.xml.in,1.20,1.21 Message-ID: <200603132103.k2DL3TCt017870@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17829 Modified Files: comps-fe5.xml.in Log Message: Add gdl, ncarg, gv, environment-modules, kompose Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- comps-fe5.xml.in 13 Mar 2006 19:24:29 -0000 1.20 +++ comps-fe5.xml.in 13 Mar 2006 21:02:56 -0000 1.21 @@ -102,10 +102,12 @@ blas cernlib-utils galculator + gdl hmmer kst lagan lapack + ncarg numpy octave qalculate-gtk @@ -322,6 +324,7 @@ fontforge fyre grads + gv gpp gqview graphviz @@ -444,6 +447,7 @@ cfs crack dkms + environment-modules epylog fuse fwbuilder @@ -674,6 +678,7 @@ kbibtex kiosktool kmymoney2 + kompose kyum From fedora-extras-commits at redhat.com Mon Mar 13 21:06:07 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 13 Mar 2006 16:06:07 -0500 Subject: rpms/lirc-kmod/devel kmodtool,1.2,1.3 lirc-kmod.spec,1.2,1.3 Message-ID: <200603132106.k2DL6dk3017921@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17902 Modified Files: kmodtool lirc-kmod.spec Log Message: * Mon Mar 13 2006 Ville Skytt?? - 0.8.0-3 - Hardcode kernel version and variants for test builds. - Remove xen-hypervisor and xen-guest from kmodtool. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kmodtool 28 Jan 2006 12:50:41 -0000 1.2 +++ kmodtool 13 Mar 2006 21:06:07 -0000 1.3 @@ -24,8 +24,8 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.4" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)' +myver="0.10.5" +knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= verrel= Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lirc-kmod.spec 28 Jan 2006 12:50:41 -0000 1.2 +++ lirc-kmod.spec 13 Mar 2006 21:06:07 -0000 1.3 @@ -5,13 +5,29 @@ %define kmodtool sh %{SOURCE10} # end stuff to be ... +# temporarily hardcoded: +%define kver 2.6.15-1.2041_FC5 +%ifnarch i686 x86_64 ppc +%define kvariants "" +%else +%ifarch i686 +%define kvariants "" smp xen0 xenU +%endif +%ifarch x86_64 +%define kvariants "" xen0 xenU +%endif +%ifarch ppc +%define kvariants "" smp +%endif +%endif + %define kmod_name lirc %define kverrel %(%{kmodtool} verrel %{?kver} 2>/dev/null) %{!?kvariants: %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)} Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 2.%(echo %{kverrel} | tr - _) +Release: 3.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -97,6 +113,10 @@ %changelog +* Mon Mar 13 2006 Ville Skytt?? - 0.8.0-3 +- Hardcode kernel version and variants for test builds. +- Remove xen-hypervisor and xen-guest from kmodtool. + * Sat Jan 28 2006 Ville Skytt?? - 0.8.0-2 - Update kmodtool to 0.10.4, fixes support for non-UP FC kernels. From fedora-extras-commits at redhat.com Mon Mar 13 21:09:16 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 13 Mar 2006 16:09:16 -0500 Subject: rpms/lirc-kmod/devel lirc-kmod.spec,1.3,1.4 Message-ID: <200603132109.k2DL9mMZ018006@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17989 Modified Files: lirc-kmod.spec Log Message: Add ExclusiveArch for buildsys. Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lirc-kmod.spec 13 Mar 2006 21:06:07 -0000 1.3 +++ lirc-kmod.spec 13 Mar 2006 21:09:15 -0000 1.4 @@ -38,6 +38,8 @@ Patch1: %{name}-0.8.0-2616.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +ExclusiveArch: i586 i686 x86_64 ppc + %description LIRC is a package that allows you to decode and send infra-red and other signals of many (but not all) commonly used remote controls. From fedora-extras-commits at redhat.com Mon Mar 13 21:20:42 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Mon, 13 Mar 2006 16:20:42 -0500 Subject: rpms/thinkpad-kmod-common/devel thinkpad-kmod-common.spec,1.2,1.3 Message-ID: <200603132121.k2DLLGVM018122@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod-common/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18103 Modified Files: thinkpad-kmod-common.spec Log Message: ... Index: thinkpad-kmod-common.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod-common/devel/thinkpad-kmod-common.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- thinkpad-kmod-common.spec 2 Mar 2006 21:29:22 -0000 1.2 +++ thinkpad-kmod-common.spec 13 Mar 2006 21:20:41 -0000 1.3 @@ -17,6 +17,7 @@ Requires: pam >= 0.79-8 Requires: initscripts >= 8.08-1 +# ExclusiveArch due to kmod-thinkpad availability. ExclusiveArch: i386 %description From fedora-extras-commits at redhat.com Mon Mar 13 21:57:23 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 13 Mar 2006 16:57:23 -0500 Subject: rpms/perl-Image-Info/devel .cvsignore, 1.4, 1.5 perl-Image-Info.spec, 1.10, 1.11 sources, 1.4, 1.5 Image-Info-1.19-inc-Module-Install.pm.patch, 1.1, NONE Message-ID: <200603132157.k2DLvtYf018490@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18469 Modified Files: .cvsignore perl-Image-Info.spec sources Removed Files: Image-Info-1.19-inc-Module-Install.pm.patch Log Message: Update to 1.20. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 8 Mar 2006 21:25:14 -0000 1.4 +++ .cvsignore 13 Mar 2006 21:57:23 -0000 1.5 @@ -1 +1 @@ -Image-Info-1.19.tar.gz +Image-Info-1.20.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/perl-Image-Info.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Image-Info.spec 8 Mar 2006 21:25:14 -0000 1.10 +++ perl-Image-Info.spec 13 Mar 2006 21:57:23 -0000 1.11 @@ -1,7 +1,7 @@ %define rgbtxt %{_datadir}/X11/rgb.txt Name: perl-Image-Info -Version: 1.19 +Version: 1.20 Release: 1%{?dist} Summary: Image meta information extraction module for Perl @@ -9,7 +9,6 @@ License: GPL or Artistic URL: http://search.cpan.org/dist/Image-Info/ Source0: http://www.cpan.org/authors/id/T/TE/TELS/image/Image-Info-%{version}.tar.gz -Patch0: Image-Info-1.19-inc-Module-Install.pm.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -26,8 +25,7 @@ %prep %setup -q -n Image-Info-%{version} -%patch0 -p1 -chmod 644 Changes README exifdump imgdump +chmod 644 README exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -61,8 +59,11 @@ %changelog +* Mon Mar 13 2006 Jose Pedro Oliveira - 1.20-1 +- Update to 1.20. + * Wed Mar 8 2006 Jose Pedro Oliveira - 1.19-1 -- Update to 1.19. +- Update to 1.19 (broken: cpan tickets: #18020 and #18147). - Module::Install 0.58 is broken (Image-Info-1.19-inc-Module-Install.pm.patch). - BR: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Mar 2006 21:25:14 -0000 1.4 +++ sources 13 Mar 2006 21:57:23 -0000 1.5 @@ -1 +1 @@ -5a63a7071b62d2420f822b85efde3395 Image-Info-1.19.tar.gz +91d44efe6387ee189b1c7164b087bf7a Image-Info-1.20.tar.gz --- Image-Info-1.19-inc-Module-Install.pm.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 13 22:18:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 13 Mar 2006 17:18:17 -0500 Subject: rpms/perl-Image-Info/FC-4 .cvsignore, 1.2, 1.3 perl-Image-Info.spec, 1.7, 1.8 sources, 1.2, 1.3 Image-Info-1.16-XBM.pm.patch, 1.1, NONE Image-Info-1.16-XPM.pm.patch, 1.1, NONE Image-Info-1.16-string.t.patch, 1.1, NONE Message-ID: <200603132218.k2DMIn9H020649@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Image-Info/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20628 Modified Files: .cvsignore perl-Image-Info.spec sources Removed Files: Image-Info-1.16-XBM.pm.patch Image-Info-1.16-XPM.pm.patch Image-Info-1.16-string.t.patch Log Message: Update to 1.20. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:03:17 -0000 1.2 +++ .cvsignore 13 Mar 2006 22:18:15 -0000 1.3 @@ -1 +1 @@ -Image-Info-1.16.tar.gz +Image-Info-1.20.tar.gz Index: perl-Image-Info.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/perl-Image-Info.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Image-Info.spec 23 Nov 2005 15:28:57 -0000 1.7 +++ perl-Image-Info.spec 13 Mar 2006 22:18:15 -0000 1.8 @@ -1,23 +1,22 @@ %define rgbtxt %{_prefix}/X11R6/lib/X11/rgb.txt Name: perl-Image-Info -Version: 1.16 -Release: 5%{?dist} +Version: 1.20 +Release: 1%{?dist} Summary: Image meta information extraction module for Perl Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Image-Info/ -Source0: http://www.cpan.org/authors/id/G/GA/GAAS/Image-Info-1.16.tar.gz -Patch0: Image-Info-1.16-string.t.patch -Patch1: Image-Info-1.16-XBM.pm.patch -Patch2: Image-Info-1.16-XPM.pm.patch +Source0: http://www.cpan.org/authors/id/T/TE/TELS/image/Image-Info-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl +BuildRequires: perl(Image::Xbm), perl(Image::Xpm), perl(XML::Simple) +BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: %{rgbtxt} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This Perl extension allows you to extract meta information from @@ -26,10 +25,7 @@ %prep %setup -q -n Image-Info-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -chmod 644 Changes README exifdump imgdump +chmod 644 README exifdump imgdump %{__perl} -pi -e 's|/usr/X11R6/lib/X11/rgb\.txt|%{rgbtxt}|' \ lib/Image/Info/XPM.pm @@ -63,6 +59,9 @@ %changelog +* Mon Mar 13 2006 Jose Pedro Oliveira - 1.20-1 +- Update to 1.20. + * Wed Nov 23 2005 Ville Skytt?? - 1.16-5 - Add dependency on rgb.txt. - Specfile cleanups. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-Info/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:03:17 -0000 1.2 +++ sources 13 Mar 2006 22:18:15 -0000 1.3 @@ -1 +1 @@ -502b6299ef2d41f67bca4e1f7d9335ab Image-Info-1.16.tar.gz +91d44efe6387ee189b1c7164b087bf7a Image-Info-1.20.tar.gz --- Image-Info-1.16-XBM.pm.patch DELETED --- --- Image-Info-1.16-XPM.pm.patch DELETED --- --- Image-Info-1.16-string.t.patch DELETED --- From fedora-extras-commits at redhat.com Mon Mar 13 22:42:16 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Mon, 13 Mar 2006 17:42:16 -0500 Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.5, 1.6 perl-Test-MockObject.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603132242.k2DMgneW020884@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-MockObject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20854 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: Update to 1.03. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 28 Feb 2006 03:06:10 -0000 1.5 +++ .cvsignore 13 Mar 2006 22:42:16 -0000 1.6 @@ -1 +1 @@ -Test-MockObject-1.02.tar.gz +Test-MockObject-1.03.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- perl-Test-MockObject.spec 28 Feb 2006 03:06:10 -0000 1.9 +++ perl-Test-MockObject.spec 13 Mar 2006 22:42:16 -0000 1.10 @@ -1,5 +1,5 @@ Name: perl-Test-MockObject -Version: 1.02 +Version: 1.03 Release: 1%{?dist} Summary: Perl extension for emulating troublesome interfaces @@ -11,10 +11,10 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -BuildRequires: perl(Test::Exception), perl(Test::Warn) +BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) -BuildRequires: perl(UNIVERSAL::can) >= 1.00 -BuildRequires: perl(UNIVERSAL::isa) >= 0.02 +BuildRequires: perl(UNIVERSAL::can) >= 1.11 +BuildRequires: perl(UNIVERSAL::isa) >= 0.06 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -60,6 +60,9 @@ %changelog +* Mon Mar 13 2006 Jose Pedro Oliveira - 1.03-1 +- Update to 1.03. + * Tue Feb 28 2006 Jose Pedro Oliveira - 1.02-1 - Update to 1.02. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 28 Feb 2006 03:06:10 -0000 1.5 +++ sources 13 Mar 2006 22:42:16 -0000 1.6 @@ -1 +1 @@ -df6dfa7a6d260230db2d48d4a446bd1d Test-MockObject-1.02.tar.gz +b6a13614c61f68ff1cfc4c5609bff947 Test-MockObject-1.03.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 22:45:27 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:45:27 -0500 Subject: rpms/glyph-keeper - New directory Message-ID: <200603132245.k2DMjT72021008@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21000/glyph-keeper Log Message: Directory /cvs/extras/rpms/glyph-keeper added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 22:45:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:45:33 -0500 Subject: rpms/glyph-keeper/devel - New directory Message-ID: <200603132245.k2DMjZsj021023@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21000/glyph-keeper/devel Log Message: Directory /cvs/extras/rpms/glyph-keeper/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 13 22:45:51 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:45:51 -0500 Subject: rpms/glyph-keeper Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603132245.k2DMjrAl021057@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21045 Added Files: Makefile import.log Log Message: Setup of module glyph-keeper --- NEW FILE Makefile --- # Top level Makefile for module glyph-keeper all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 13 22:45:57 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:45:57 -0500 Subject: rpms/glyph-keeper/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603132245.k2DMjxHb021077@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21045/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module glyph-keeper --- NEW 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 Mar 13 22:46:39 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:46:39 -0500 Subject: rpms/glyph-keeper import.log,1.1,1.2 Message-ID: <200603132247.k2DMlBMK021154@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21117 Modified Files: import.log Log Message: auto-import glyph-keeper-0.29.1-2 on branch devel from glyph-keeper-0.29.1-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/glyph-keeper/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Mar 2006 22:45:51 -0000 1.1 +++ import.log 13 Mar 2006 22:46:38 -0000 1.2 @@ -0,0 +1 @@ +glyph-keeper-0_29_1-2:HEAD:glyph-keeper-0.29.1-2.src.rpm:1142289734 From fedora-extras-commits at redhat.com Mon Mar 13 22:46:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:46:44 -0500 Subject: rpms/glyph-keeper/devel glyph-keeper-0.29.1-fixes.patch, NONE, 1.1 glyph-keeper.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603132247.k2DMlHlk021158@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/glyph-keeper/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21117/devel Modified Files: .cvsignore sources Added Files: glyph-keeper-0.29.1-fixes.patch glyph-keeper.spec Log Message: auto-import glyph-keeper-0.29.1-2 on branch devel from glyph-keeper-0.29.1-2.src.rpm glyph-keeper-0.29.1-fixes.patch: --- NEW FILE glyph-keeper-0.29.1-fixes.patch --- diff -ur glyph-keeper-0.29.1.orig/Makefile.GNU.all glyph-keeper-0.29.1/Makefile.GNU.all --- glyph-keeper-0.29.1.orig/Makefile.GNU.all 2005-07-09 16:26:56.000000000 +0200 +++ glyph-keeper-0.29.1/Makefile.GNU.all 2006-03-11 17:11:10.000000000 +0100 @@ -66,13 +66,9 @@ CC := gcc -WFLAGS := -W -Wall - -OFLAGS := -O3 -s - FT_CFLAGS := $(WFLAGS) -std=c89 $(OFLAGS) -Ifreetype/include $(ft_defines) -GK_CFLAGS := $(WFLAGS) -std=c89 $(OFLAGS) -Iinclude $(gk_defines) $(if $(FT_LIB),,-Ifreetype/include) +GK_CFLAGS := $(CFLAGS) -std=c89 -Iinclude $(gk_defines) $(if $(FT_LIB),,-Ifreetype/include) Only in glyph-keeper-0.29.1: Makefile.GNU.all~ diff -ur glyph-keeper-0.29.1.orig/include/glyph.h glyph-keeper-0.29.1/include/glyph.h --- glyph-keeper-0.29.1.orig/include/glyph.h 2005-07-09 15:02:50.000000000 +0200 +++ glyph-keeper-0.29.1/include/glyph.h 2006-03-11 19:13:38.000000000 +0100 @@ -149,7 +149,7 @@ #elif (GLYPH_TARGET == GLYPH_TARGET_SDL) -#include +#include #define GLYPH_TARGET_STR "SDL" #define GLYPH_TARGET_SURFACE SDL_Surface #define GLYPH_TARGET_HAS_RECTFILL Only in glyph-keeper-0.29.1/include: glyph.h~ Only in glyph-keeper-0.29.1: log Only in glyph-keeper-0.29.1/obj: glyph-alleg.o Only in glyph-keeper-0.29.1/obj: glyph-sdl.o Only in glyph-keeper-0.29.1/obj: libglyph-alleg.a Only in glyph-keeper-0.29.1/obj: libglyph-sdl.a diff -ur glyph-keeper-0.29.1.orig/src/glyph_index.c glyph-keeper-0.29.1/src/glyph_index.c --- glyph-keeper-0.29.1.orig/src/glyph_index.c 2005-06-24 11:35:00.000000000 +0200 +++ glyph-keeper-0.29.1/src/glyph_index.c 2006-03-11 19:11:04.000000000 +0100 @@ -58,13 +58,13 @@ if (!index->pages) return size; size += 69*sizeof(void*); - if ((int)index->pages[68]) + if ((long)index->pages[68]) { for (a=0; a<68; a++) { if (!index->pages[a]) continue; size += 129*sizeof(void*); - if ((int)index->pages[a][128]) + if ((long)index->pages[a][128]) { for (b=0; b<128; b++) { if (index->pages[a][b]) size += 129*sizeof(void*); } } @@ -220,7 +220,7 @@ /* unlinking the glyph from index */ page_c[c_index] = 0; - (*(int*)(page_c+128))--; + (*(long*)(page_c+128))--; /* uninking the glyph from keeper's list */ if (glyph == keeper->head) keeper->head = keeper->head->next; @@ -235,19 +235,19 @@ free(glyph); /* releasing unnecessary index pages, and index itself */ - if (((int)page_c[128])<=0) + if (((long)page_c[128])<=0) { free(page_c); page_b[b_index] = 0; keeper->allocated -= 129*sizeof(void*); - (*(int*)(page_b+128))--; - if (((int)page_b[128])<=0) + (*(long*)(page_b+128))--; + if (((long)page_b[128])<=0) { free(page_b); index->pages[a_index] = 0; keeper->allocated -= 129*sizeof(void*); - (*(int*)(index->pages+68))--; - if (((int)index->pages[68])<=0) + (*(long*)(index->pages+68))--; + if (((long)index->pages[68])<=0) { free(index->pages); index->pages = 0; @@ -314,7 +314,7 @@ { index->pages[a_index] = (GLYPH***)_gk_malloc(129*sizeof(void*)); if (!index->pages[a_index]) return 0; - (*(int*)(index->pages+68))++; + (*(long*)(index->pages+68))++; memset(index->pages[a_index],0,129*sizeof(void*)); keeper->allocated += 129*sizeof(void*); } @@ -326,7 +326,7 @@ { page_b[b_index] = (GLYPH**)_gk_malloc(129*sizeof(void*)); if (!page_b[b_index]) return 0; - (*(int*)(page_b+128))++; + (*(long*)(page_b+128))++; memset(page_b[b_index],0,129*sizeof(void*)); keeper->allocated += 129*sizeof(void*); } @@ -338,7 +338,7 @@ CARE(page_c[c_index]==0); page_c[c_index] = glyph; - (*(int*)(page_c+128))++; + (*(long*)(page_c+128))++; glyph->index = index; glyph->prev = 0; @@ -512,7 +512,7 @@ GLYPH_REND *rend; int ni = 0, nr = 0; - _gk_msg("GLYPH_KEEP object (address:%d):\n",(int)keeper); + _gk_msg("GLYPH_KEEP object (address:%p):\n", keeper); if (!keeper) return; _gk_msg(" can keep %d glyphs, currently keeping %d\n",keeper->max_glyphs,keeper->num_glyphs); Only in glyph-keeper-0.29.1/src: glyph_index.c~ --- NEW FILE glyph-keeper.spec --- Name: glyph-keeper Version: 0.29.1 Release: 2%{?dist} Summary: Library for text rendering Group: System Environment/Libraries License: zlib License URL: http://kd.lab.nig.ac.jp/glyph-keeper/ Source0: http://kd.lab.nig.ac.jp/%{name}/files/%{name}-%{version}-no-freetype.zip Patch0: glyph-keeper-0.29.1-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: freetype-devel >= 2.1.10 BuildRequires: SDL-devel allegro-devel %description Glyph Keeper is a library for text rendering. It is written in C and can be used by C or C++ code. Glyph Keeper helps your program to load a font, render character glyphs and write them to the target surface. Right now only Allegro and SDL targets are supported, but there will be more in future. Glyph Keeper uses FreeType as a font engine. %package devel Summary: Library for text rendering Group: Development/Libraries Requires: allegro-devel SDL-devel %description devel Glyph Keeper is a library for text rendering. It is written in C and can be used by C or C++ code. Glyph Keeper helps your program to load a font, render character glyphs and write them to the target surface. Right now only Allegro and SDL targets are supported, but there will be more in future. Glyph Keeper uses FreeType as a font engine. %prep %setup -q %patch -p1 %build make %{?_smp_mflags} -f Makefile.GNU.all TARGET=ALLEGRO FT_LIB=-lfreetype \ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/freetype2" lib make %{?_smp_mflags} -f Makefile.GNU.all TARGET=SDL FT_LIB=-lfreetype \ CFLAGS="$RPM_OPT_FLAGS -I/usr/include/freetype2" lib %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_libdir} mkdir -p $RPM_BUILD_ROOT%{_includedir} install -m 644 obj/libglyph-*.a $RPM_BUILD_ROOT%{_libdir} install -m 644 include/glyph.h $RPM_BUILD_ROOT%{_includedir} %clean rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) %doc license.txt changes.txt authors.txt docs/* %{_includedir}/glyph.h %{_libdir}/libglyph-*.a %changelog * Mon Mar 13 2006 Hans de Goede 0.29.1-2 -change license to "zlib License" -add authors.txt and docs/* to %%doc * Sat Mar 11 2006 Hans de Goede 0.29.1-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glyph-keeper/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Mar 2006 22:45:57 -0000 1.1 +++ .cvsignore 13 Mar 2006 22:46:44 -0000 1.2 @@ -0,0 +1 @@ +glyph-keeper-0.29.1-no-freetype.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/glyph-keeper/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Mar 2006 22:45:57 -0000 1.1 +++ sources 13 Mar 2006 22:46:44 -0000 1.2 @@ -0,0 +1 @@ +e90e5103dce7d89aba2180bb830de8d9 glyph-keeper-0.29.1-no-freetype.zip From fedora-extras-commits at redhat.com Mon Mar 13 22:57:30 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Mon, 13 Mar 2006 17:57:30 -0500 Subject: rpms/allegro/devel allegro-4.2.0-no-execheap.patch, NONE, 1.1 allegro.spec, 1.28, 1.29 Message-ID: <200603132258.k2DMw2dQ021356@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21321 Modified Files: allegro.spec Added Files: allegro-4.2.0-no-execheap.patch Log Message: * Mon Mar 13 2006 Hans de Goede 4.2.0-11 - really, _really_ fix asm stretch code on i386 with NX processors, long ?? story see bugzilla bug 185214 . allegro-4.2.0-no-execheap.patch: --- NEW FILE allegro-4.2.0-no-execheap.patch --- diff -ur allegro-4.2.0.orig/src/i386/icsprite.c allegro-4.2.0/src/i386/icsprite.c --- allegro-4.2.0.orig/src/i386/icsprite.c 2001-11-06 16:30:47.000000000 +0100 +++ allegro-4.2.0/src/i386/icsprite.c 2006-03-13 23:26:53.000000000 +0100 @@ -45,6 +45,11 @@ #if defined ALLEGRO_COLOR24 || defined ALLEGRO_COLOR32 unsigned long *p32; #endif + + #ifdef USE_MMAP_GEN_CODE_BUF + /* make sure we get a new map */ + _map_size = 0; + #endif for (y=0; yh; y++) { @@ -270,13 +275,40 @@ COMPILER_RET(); + #ifdef USE_MMAP_GEN_CODE_BUF + /* Lie about the size, return the size mapped which >= size used / + compiler_pos, because we need the size mapped for munmap */ + *len = _map_size; + /* we don't need _rw_map or _map_fd anymore */ + munmap(_rw_map, _map_size); + close(_map_fd); + return _exec_map; + #else p = malloc(compiler_pos); if (p) { memcpy(p, _scratch_mem, compiler_pos); *len = compiler_pos; + #ifdef ALLEGRO_WINDOWS + { + DWORD old_protect; + /* Play nice with Windows executable memory protection */ + VirtualProtect(p, compiler_pos, PAGE_EXECUTE_READWRITE, &old_protect); + } + #elif defined(HAVE_MPROTECT) + { + char *aligned_p = (char *)((unsigned long)p & ~(PAGE_SIZE-1ul)); + if (mprotect(aligned_p, compiler_pos + ((char *)p - aligned_p), + PROT_EXEC|PROT_READ|PROT_WRITE)) { + perror("allegro-error: mprotect failed during stretched blit!"); + free(p); + return NULL; + } + } + #endif } return p; + #endif } @@ -327,8 +359,11 @@ if (sprite) { for (plane=0; plane<4; plane++) if (sprite->proc[plane].draw) + #ifdef USE_MMAP_GEN_CODE_BUF + munmap(sprite->proc[plane].draw, sprite->proc[plane].len); + #else free(sprite->proc[plane].draw); - + #endif free(sprite); } } diff -ur allegro-4.2.0.orig/src/i386/istretch.c allegro-4.2.0/src/i386/istretch.c --- allegro-4.2.0.orig/src/i386/istretch.c 2006-03-13 22:48:45.000000000 +0100 +++ allegro-4.2.0/src/i386/istretch.c 2006-03-13 23:18:56.000000000 +0100 @@ -216,29 +216,18 @@ char depth; char flags; int lru; - void *data; + void *exec; /* xr_ mapping in the mmap case, normally both in one. */ int size; +#ifdef USE_MMAP_GEN_CODE_BUF + void *rw; /* _rw mapping for the mmap case. */ + int fd; /* mapping backing fd for the mmap case. */ +#endif } STRETCHER_INFO; - #define NUM_STRETCHERS 8 - -static STRETCHER_INFO stretcher_info[NUM_STRETCHERS] = -{ - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 }, - { 0, 0, 0, 0, 0, 0, NULL, 0 } -}; - - +static STRETCHER_INFO stretcher_info[NUM_STRETCHERS]; static int stretcher_count = 0; - static int stretcher_virgin = TRUE; @@ -251,11 +240,14 @@ int i; for (i=0; i>= 2; - _do_stretch(source, dest, stretcher_info[i].data, sx>>16, sy, syd, + _do_stretch(source, dest, stretcher_info[i].exec, sx>>16, sy, syd, dest_x, dest_y, dest_height, dest->vtable->color_depth); stretcher_info[i].lru = stretcher_count; return; @@ -382,17 +383,18 @@ } } - /* make sure all allocated memory is freed atexit */ - if (stretcher_virgin) { - stretcher_virgin = FALSE; - _add_exit_func(free_stretchers, "free_stretchers"); - } - + #ifdef USE_MMAP_GEN_CODE_BUF + _exec_map = stretcher_info[best].exec; + _rw_map = stretcher_info[best].rw; + _map_size = stretcher_info[best].size; + _map_fd = stretcher_info[best].fd; + #else prev_scratch_mem = _scratch_mem; prev_scratch_mem_size = _scratch_mem_size; - _scratch_mem = stretcher_info[best].data; + _scratch_mem = stretcher_info[best].exec; _scratch_mem_size = stretcher_info[best].size; + #endif if (is_linear_bitmap(dest)) { /* build a simple linear stretcher */ @@ -439,7 +441,7 @@ #ifdef ALLEGRO_WINDOWS /* Play nice with Windows executable memory protection */ VirtualProtect(_scratch_mem, _scratch_mem_size, PAGE_EXECUTE_READWRITE, &old_protect); - #elif defined(HAVE_MPROTECT) + #elif defined(HAVE_MPROTECT) && !defined(USE_MMAP_GEN_CODE_BUF) { char *p = (char *)((unsigned long)_scratch_mem & ~(PAGE_SIZE-1ul)); if (mprotect(p, _scratch_mem_size + ((char *)_scratch_mem - p), @@ -448,22 +450,29 @@ } #endif - /* call the stretcher */ - _do_stretch(source, dest, _scratch_mem, sx>>16, sy, syd, - dest_x, dest_y, dest_height, dest->vtable->color_depth); - - /* and store it in the cache */ + /* store it in the cache */ stretcher_info[best].sx = sx; stretcher_info[best].sxd = sxd; stretcher_info[best].dest_width = dest_width; stretcher_info[best].depth = dest->vtable->color_depth; stretcher_info[best].flags = flags; stretcher_info[best].lru = stretcher_count; - stretcher_info[best].data = _scratch_mem; + #ifdef USE_MMAP_GEN_CODE_BUF + stretcher_info[best].exec = _exec_map; + stretcher_info[best].rw = _rw_map; + stretcher_info[best].size = _map_size; + stretcher_info[best].fd = _map_fd; + #else + stretcher_info[best].exec = _scratch_mem; stretcher_info[best].size = _scratch_mem_size; _scratch_mem = prev_scratch_mem; _scratch_mem_size = prev_scratch_mem_size; + #endif + + /* and call the stretcher */ + _do_stretch(source, dest, stretcher_info[best].exec, sx>>16, sy, syd, + dest_x, dest_y, dest_height, dest->vtable->color_depth); } diff -ur allegro-4.2.0.orig/src/i386/opcodes.h allegro-4.2.0/src/i386/opcodes.h --- allegro-4.2.0.orig/src/i386/opcodes.h 2000-05-14 22:17:13.000000000 +0200 +++ allegro-4.2.0/src/i386/opcodes.h 2006-03-13 23:00:31.000000000 +0100 @@ -19,6 +19,51 @@ #ifndef OPCODES_H #define OPCODES_H +/* mremap is only available under Linux, so is selinux which is the reason for + USE_MMAP_GEN_CODE_BUF so that is no problem. */ +#ifdef ALLEGRO_LINUX + #define USE_MMAP_GEN_CODE_BUF + #define __USE_GNU /* for mremap */ + #include /* for mkstemp */ + #include /* for unlink */ + #include /* for PAGE_SIZE */ + #include /* for mmap */ + + static void *_exec_map; + static void *_rw_map; + static int _map_size; + static int _map_fd; + + #define GROW_GEN_CODE_BUF(size) \ + if (!_map_size) { \ + /* Create backing file. FIXME: error-checking, but how? */ \ + char tempfile_name[] = "/tmp/allegroXXXXXX"; \ + _map_fd = mkstemp(tempfile_name); \ + unlink(tempfile_name); \ + /* Grow backing file to multiple of page size */ \ + _map_size = (size + (PAGE_SIZE-1)) & ~(PAGE_SIZE-1); \ + ftruncate(_map_fd, _map_size); \ + /* And create the 2 mappings */ \ + _exec_map = mmap(0, _map_size, PROT_EXEC | PROT_READ, MAP_SHARED, \ + _map_fd, 0); \ + _rw_map = mmap(0, _map_size, PROT_READ | PROT_WRITE, MAP_SHARED, \ + _map_fd, 0); \ + } \ + else if (size > _map_size) { \ + int old_size = _map_size; \ + /* Grow backing file to multiple of page size */ \ + _map_size = (size + (PAGE_SIZE-1)) & ~(PAGE_SIZE-1); \ + ftruncate(_map_fd, _map_size); \ + /* And remap the 2 mappings */ \ + _exec_map = mremap(_exec_map, old_size, _map_size, MREMAP_MAYMOVE); \ + _rw_map = mremap(_rw_map, old_size, _map_size, MREMAP_MAYMOVE); \ + } + + #define GEN_CODE_BUF _rw_map +#else + #define GROW_GEN_CODE_BUF(size) _grow_scratch_mem(size) + #define GEN_CODE_BUF _scratch_mem +#endif #ifdef ALLEGRO_ASM_USE_FS #define FS_PREFIX() COMPILER_BYTE(0x64) @@ -30,37 +75,37 @@ #define COMPILER_BYTE(val) { \ - *(((unsigned char *)_scratch_mem)+compiler_pos) = val; \ + *(((unsigned char *)GEN_CODE_BUF)+compiler_pos) = val; \ compiler_pos++; \ } #define COMPILER_WORD(val) { \ - *((unsigned short *)(((char *)_scratch_mem)+compiler_pos)) = val; \ + *((unsigned short *)(((char *)GEN_CODE_BUF)+compiler_pos)) = val; \ compiler_pos += 2; \ } #define COMPILER_LONG(val) { \ - *((unsigned long *)(((char *)_scratch_mem)+compiler_pos)) = val; \ + *((unsigned long *)(((char *)GEN_CODE_BUF)+compiler_pos)) = val; \ compiler_pos += 4; \ } #define COMPILER_INC_ESI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x46); /* incl %esi */ \ } #define COMPILER_INC_EDI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x47); /* incl %edi */ \ } #define COMPILER_ADD_ESI(val) { \ - _grow_scratch_mem(compiler_pos+6); \ + GROW_GEN_CODE_BUF(compiler_pos+6); \ COMPILER_BYTE(0x81); /* addl $val, %esi */ \ COMPILER_BYTE(0xC6); \ COMPILER_LONG(val); \ @@ -68,87 +113,87 @@ #define COMPILER_ADD_ECX_EAX() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0x01); /* addl %ecx, %eax */ \ COMPILER_BYTE(0xC8); \ } #define COMPILER_MOV_EAX(val) { \ - _grow_scratch_mem(compiler_pos+5); \ + GROW_GEN_CODE_BUF(compiler_pos+5); \ COMPILER_BYTE(0xB8); /* movl $val, %eax */ \ COMPILER_LONG(val); \ } #define COMPILER_MOV_ECX(val) { \ - _grow_scratch_mem(compiler_pos+5); \ + GROW_GEN_CODE_BUF(compiler_pos+5); \ COMPILER_BYTE(0xB9); /* movl $val, %ecx */ \ COMPILER_LONG(val); \ } #define COMPILER_MOV_EDX(val) { \ - _grow_scratch_mem(compiler_pos+5); \ + GROW_GEN_CODE_BUF(compiler_pos+5); \ COMPILER_BYTE(0xBA); /* movl $val, %edx */ \ COMPILER_LONG(val); \ } #define COMPILER_MOV_EDI_EAX() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0x89); /* movl %edi, %eax */ \ COMPILER_BYTE(0xF8); \ } #define COMPILER_CALL_ESI() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0xFF); /* call *%esi */ \ COMPILER_BYTE(0xD6); \ } #define COMPILER_OUTW() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0x66); /* outw %ax, %dx */ \ COMPILER_BYTE(0xEF); \ } #define COMPILER_PUSH_ESI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x56); /* pushl %esi */ \ } #define COMPILER_PUSH_EDI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x57); /* pushl %edi */ \ } #define COMPILER_POP_ESI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x5E); /* popl %esi */ \ } #define COMPILER_POP_EDI() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0x5F); /* popl %edi */ \ } #define COMPILER_REP_MOVSB() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0xF2); /* rep */ \ COMPILER_BYTE(0xA4); /* movsb */ \ } #define COMPILER_REP_MOVSW() { \ - _grow_scratch_mem(compiler_pos+3); \ + GROW_GEN_CODE_BUF(compiler_pos+3); \ COMPILER_BYTE(0xF3); /* rep */ \ COMPILER_BYTE(0x66); /* word prefix */ \ COMPILER_BYTE(0xA5); /* movsw */ \ @@ -156,14 +201,14 @@ #define COMPILER_REP_MOVSL() { \ - _grow_scratch_mem(compiler_pos+2); \ + GROW_GEN_CODE_BUF(compiler_pos+2); \ COMPILER_BYTE(0xF3); /* rep */ \ COMPILER_BYTE(0xA5); /* movsl */ \ } #define COMPILER_REP_MOVSL2() { \ - _grow_scratch_mem(compiler_pos+17); \ + GROW_GEN_CODE_BUF(compiler_pos+17); \ COMPILER_BYTE(0x8D); /* leal (%ecx, %ecx, 2), %ecx */ \ COMPILER_BYTE(0x0C); \ COMPILER_BYTE(0x49); \ @@ -185,7 +230,7 @@ #define COMPILER_LODSB() { \ - _grow_scratch_mem(compiler_pos+3); \ + GROW_GEN_CODE_BUF(compiler_pos+3); \ COMPILER_BYTE(0x8A); /* movb (%esi), %al */ \ COMPILER_BYTE(0x06); \ COMPILER_BYTE(0x46); /* incl %esi */ \ @@ -193,7 +238,7 @@ #define COMPILER_LODSW() { \ - _grow_scratch_mem(compiler_pos+6); \ + GROW_GEN_CODE_BUF(compiler_pos+6); \ COMPILER_BYTE(0x66); /* word prefix */ \ COMPILER_BYTE(0x8B); /* movw (%esi), %ax */ \ COMPILER_BYTE(0x06); \ @@ -204,7 +249,7 @@ #define COMPILER_LODSL() { \ - _grow_scratch_mem(compiler_pos+5); \ + GROW_GEN_CODE_BUF(compiler_pos+5); \ COMPILER_BYTE(0x8B); /* movl (%esi), %eax */ \ COMPILER_BYTE(0x06); \ COMPILER_BYTE(0x83); /* addl $4, %esi */ \ @@ -214,7 +259,7 @@ #define COMPILER_LODSL2() { \ - _grow_scratch_mem(compiler_pos+15); \ + GROW_GEN_CODE_BUF(compiler_pos+15); \ COMPILER_BYTE(0x8B); /* movl (%esi), %eax */ \ COMPILER_BYTE(0x06); \ COMPILER_BYTE(0x25); /* andl $0xFFFFFF, %eax */ \ @@ -231,7 +276,7 @@ #define COMPILER_STOSB() { \ - _grow_scratch_mem(compiler_pos+4); \ + GROW_GEN_CODE_BUF(compiler_pos+4); \ COMPILER_BYTE(0x26); /* movb %al, %es:(%edi) */ \ COMPILER_BYTE(0x88); \ COMPILER_BYTE(0x07); \ @@ -240,7 +285,7 @@ #define COMPILER_STOSW() { \ - _grow_scratch_mem(compiler_pos+7); \ + GROW_GEN_CODE_BUF(compiler_pos+7); \ COMPILER_BYTE(0x26); /* es segment prefix */ \ COMPILER_BYTE(0x66); /* word prefix */ \ COMPILER_BYTE(0x89); /* movw %ax, %es:(%edi) */ \ @@ -252,7 +297,7 @@ #define COMPILER_STOSL() { \ - _grow_scratch_mem(compiler_pos+6); \ + GROW_GEN_CODE_BUF(compiler_pos+6); \ COMPILER_BYTE(0x26); /* es segment prefix */ \ COMPILER_BYTE(0x89); /* movl %eax, %es:(%edi) */ \ COMPILER_BYTE(0x07); \ @@ -263,7 +308,7 @@ #define COMPILER_STOSL2() { \ - _grow_scratch_mem(compiler_pos+11); \ + GROW_GEN_CODE_BUF(compiler_pos+11); \ COMPILER_BYTE(0x66); /* word prefix */ \ COMPILER_BYTE(0x26); /* es segment prefix */ \ COMPILER_BYTE(0x89); /* movw %ax, %es:(%edi) */ \ @@ -279,7 +324,7 @@ #define COMPILER_MASKED_STOSB(mask_color) { \ - _grow_scratch_mem(compiler_pos+8); \ + GROW_GEN_CODE_BUF(compiler_pos+8); \ COMPILER_BYTE(0x08); /* orb %al, %al */ \ COMPILER_BYTE(0xC0); \ COMPILER_BYTE(0x74); /* jz skip */ \ @@ -292,7 +337,7 @@ #define COMPILER_MASKED_STOSW(mask_color) { \ - _grow_scratch_mem(compiler_pos+13); \ + GROW_GEN_CODE_BUF(compiler_pos+13); \ COMPILER_BYTE(0x66); /* word prefix */ \ COMPILER_BYTE(0x3D); /* cmpw mask_color, %ax */ \ COMPILER_WORD(mask_color); \ @@ -309,7 +354,7 @@ #define COMPILER_MASKED_STOSL(mask_color) { \ - _grow_scratch_mem(compiler_pos+13); \ + GROW_GEN_CODE_BUF(compiler_pos+13); \ COMPILER_BYTE(0x3D); /* cmpl mask_color, %eax */ \ COMPILER_LONG(mask_color); \ COMPILER_BYTE(0x74); /* jz skip */ \ @@ -324,7 +369,7 @@ #define COMPILER_MASKED_STOSL2(mask_color) { \ - _grow_scratch_mem(compiler_pos+18); \ + GROW_GEN_CODE_BUF(compiler_pos+18); \ COMPILER_BYTE(0x3D); /* cmpl mask_color, %eax */ \ COMPILER_LONG(mask_color); \ COMPILER_BYTE(0x74); /* jz skip */ \ @@ -360,7 +405,7 @@ #define COMPILER_MOVB_IMMED(offset, val) { \ - _grow_scratch_mem(MOV_IMMED_SIZE(2+FS_SIZE, offset)); \ + GROW_GEN_CODE_BUF(MOV_IMMED_SIZE(2+FS_SIZE, offset)); \ FS_PREFIX(); /* fs: */ \ COMPILER_BYTE(0xC6); /* movb $val, offset(%eax) */ \ MOV_IMMED(offset); \ @@ -369,7 +414,7 @@ #define COMPILER_MOVW_IMMED(offset, val) { \ - _grow_scratch_mem(MOV_IMMED_SIZE(4+FS_SIZE, offset)); \ + GROW_GEN_CODE_BUF(MOV_IMMED_SIZE(4+FS_SIZE, offset)); \ COMPILER_BYTE(0x66); /* word prefix */ \ FS_PREFIX(); /* fs: */ \ COMPILER_BYTE(0xC7); /* movw $val, offset(%eax) */ \ @@ -379,7 +424,7 @@ #define COMPILER_MOVL_IMMED(offset, val) { \ - _grow_scratch_mem(MOV_IMMED_SIZE(5+FS_SIZE, offset)); \ + GROW_GEN_CODE_BUF(MOV_IMMED_SIZE(5+FS_SIZE, offset)); \ FS_PREFIX(); /* fs: */ \ COMPILER_BYTE(0xC7); /* movl $val, offset(%eax) */ \ MOV_IMMED(offset); \ @@ -388,7 +433,7 @@ #define COMPILER_RET() { \ - _grow_scratch_mem(compiler_pos+1); \ + GROW_GEN_CODE_BUF(compiler_pos+1); \ COMPILER_BYTE(0xC3); /* ret */ \ } Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- allegro.spec 11 Mar 2006 22:50:34 -0000 1.28 +++ allegro.spec 13 Mar 2006 22:57:30 -0000 1.29 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 10 +Release: 11 Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -20,6 +20,7 @@ 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 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 @@ -132,6 +133,7 @@ %patch6 -p1 -z .64bit %patch7 -p1 -z .fullscreen %patch8 -p1 -z .mprotect +%patch9 -p1 -z .execheap %build @@ -219,6 +221,10 @@ %changelog +* Mon Mar 13 2006 Hans de Goede 4.2.0-11 +- really, _really_ fix asm stretch code on i386 with NX processors, long +?? story see bugzilla bug 185214 . + * Sat Mar 11 2006 Hans de Goede 4.2.0-10 - really fix asm stretch code on i386 with NX processors, on OpenBSD mprotects first argument does not need to be page-aligned, but on Linux it does. From fedora-extras-commits at redhat.com Mon Mar 13 23:01:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 18:01:33 -0500 Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.12, 1.13 abcm2ps.spec, 1.12, 1.13 sources, 1.12, 1.13 Message-ID: <200603132302.k2DN27e0023444@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23350/FC-4 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Feb 2006 11:30:30 -0000 1.12 +++ .cvsignore 13 Mar 2006 23:01:33 -0000 1.13 @@ -1,2 +1,2 @@ -abcm2ps-4.12.8.tar.gz +abcm2ps-4.12.10.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- abcm2ps.spec 13 Feb 2006 11:30:30 -0000 1.12 +++ abcm2ps.spec 13 Mar 2006 23:01:33 -0000 1.13 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.8 +Version: 4.12.10 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-4.12.8.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.10.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 +* Mon Mar 13 2006 Gerard Milmeister - 4.12.10-1 +- new version 4.12.10 + * Mon Feb 13 2006 Gerard Milmeister - 4.12.8-1 - new version 4.12.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2006 11:30:30 -0000 1.12 +++ sources 13 Mar 2006 23:01:33 -0000 1.13 @@ -1,2 +1,2 @@ -119acfaf7c93ea0a83a69d4c6ae5c9ac abcm2ps-4.12.8.tar.gz +4866c0fdc9a9151e03400bb3fd55bb18 abcm2ps-4.12.10.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Mon Mar 13 23:01:40 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 13 Mar 2006 18:01:40 -0500 Subject: rpms/abcm2ps/devel .cvsignore, 1.12, 1.13 abcm2ps.spec, 1.13, 1.14 sources, 1.12, 1.13 Message-ID: <200603132302.k2DN2FEa023453@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23350/devel Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Feb 2006 11:37:41 -0000 1.12 +++ .cvsignore 13 Mar 2006 23:01:39 -0000 1.13 @@ -1,2 +1,2 @@ -abcm2ps-4.12.8.tar.gz +abcm2ps-4.12.10.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- abcm2ps.spec 17 Feb 2006 20:37:47 -0000 1.13 +++ abcm2ps.spec 13 Mar 2006 23:01:40 -0000 1.14 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.8 -Release: 2%{?dist} +Version: 4.12.10 +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-4.12.8.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.10.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,8 +52,8 @@ %changelog -* Fri Feb 17 2006 Gerard Milmeister - 4.12.8-2 -- Rebuild for Fedora Extras 5 +* Mon Mar 13 2006 Gerard Milmeister - 4.12.10-1 +- new version 4.12.10 * Mon Feb 13 2006 Gerard Milmeister - 4.12.8-1 - new version 4.12.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2006 11:37:41 -0000 1.12 +++ sources 13 Mar 2006 23:01:40 -0000 1.13 @@ -1,2 +1,2 @@ -119acfaf7c93ea0a83a69d4c6ae5c9ac abcm2ps-4.12.8.tar.gz +4866c0fdc9a9151e03400bb3fd55bb18 abcm2ps-4.12.10.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Mon Mar 13 23:15:36 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Mon, 13 Mar 2006 18:15:36 -0500 Subject: comps comps-fe5.xml.in,1.21,1.22 Message-ID: <200603132316.k2DNGB9L023612@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23588 Modified Files: comps-fe5.xml.in Log Message: add pork and valknut to comps Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- comps-fe5.xml.in 13 Mar 2006 21:02:56 -0000 1.21 +++ comps-fe5.xml.in 13 Mar 2006 23:15:35 -0000 1.22 @@ -307,6 +307,7 @@ straw sylpheed sylpheed-claws + valknut x3270-x11 xchat-gnome @@ -522,6 +523,7 @@ nget ninja nmh + pork rtorrent snownews tin From fedora-extras-commits at redhat.com Mon Mar 13 23:24:21 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:24:21 -0500 Subject: rpms/libibverbs import.log,1.6,1.7 Message-ID: <200603132324.k2DNOrW6023777@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23743 Modified Files: import.log Log Message: auto-import libibverbs-1.0-1 on branch devel from libibverbs-1.0-1.src.rpm Import libibverbs 1.0 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 16 Feb 2006 19:00:18 -0000 1.6 +++ import.log 13 Mar 2006 23:24:20 -0000 1.7 @@ -3,3 +3,4 @@ libibverbs-1_0-0_3_rc5:FC-4:libibverbs-1.0-0.3.rc5.src.rpm:1137996521 libibverbs-1_0-0_5_rc7:HEAD:libibverbs-1.0-0.5.rc7.src.rpm:1140116192 libibverbs-1_0-0_5_rc7:FC-4:libibverbs-1.0-0.5.rc7.src.rpm:1140116508 +libibverbs-1_0-1:HEAD:libibverbs-1.0-1.src.rpm:1142292336 From fedora-extras-commits at redhat.com Mon Mar 13 23:24:27 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:24:27 -0500 Subject: rpms/libibverbs/devel .cvsignore, 1.4, 1.5 libibverbs.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603132324.k2DNOxNc023782@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23743/devel Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0-1 on branch devel from libibverbs-1.0-1.src.rpm Import libibverbs 1.0 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2006 18:55:08 -0000 1.4 +++ .cvsignore 13 Mar 2006 23:24:26 -0000 1.5 @@ -1 +1 @@ -libibverbs-1.0-rc7.tar.gz +libibverbs-1.0.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libibverbs.spec 16 Feb 2006 18:55:08 -0000 1.3 +++ libibverbs.spec 13 Mar 2006 23:24:26 -0000 1.4 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0-rc7 +%define ver 1.0 Name: libibverbs Version: 1.0 -Release: 0.5.rc7%{?dist} +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-rc7.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sysfsutils-devel @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Thu Feb 16 2006 Roland Dreier - 1.0-1 +- New upstream release + * Wed Feb 15 2006 Roland Dreier - 1.0-0.5.rc7 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2006 18:55:08 -0000 1.4 +++ sources 13 Mar 2006 23:24:26 -0000 1.5 @@ -1 +1 @@ -432245140a984601eaf1a1a6badad709 libibverbs-1.0-rc7.tar.gz +49769f2956f1e6fc40693c924a8d97af libibverbs-1.0.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 23:28:39 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:28:39 -0500 Subject: rpms/libibverbs import.log,1.7,1.8 Message-ID: <200603132329.k2DNTBDB023996@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23962 Modified Files: import.log Log Message: auto-import libibverbs-1.0-1 on branch FC-4 from libibverbs-1.0-1.src.rpm Import libibverbs 1.0 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 13 Mar 2006 23:24:20 -0000 1.7 +++ import.log 13 Mar 2006 23:28:39 -0000 1.8 @@ -4,3 +4,4 @@ libibverbs-1_0-0_5_rc7:HEAD:libibverbs-1.0-0.5.rc7.src.rpm:1140116192 libibverbs-1_0-0_5_rc7:FC-4:libibverbs-1.0-0.5.rc7.src.rpm:1140116508 libibverbs-1_0-1:HEAD:libibverbs-1.0-1.src.rpm:1142292336 +libibverbs-1_0-1:FC-4:libibverbs-1.0-1.src.rpm:1142292600 From fedora-extras-commits at redhat.com Mon Mar 13 23:28:45 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:28:45 -0500 Subject: rpms/libibverbs/FC-4 .cvsignore, 1.4, 1.5 libibverbs.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603132329.k2DNTHUc024001@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23962/FC-4 Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0-1 on branch FC-4 from libibverbs-1.0-1.src.rpm Import libibverbs 1.0 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2006 19:00:23 -0000 1.4 +++ .cvsignore 13 Mar 2006 23:28:45 -0000 1.5 @@ -1 +1 @@ -libibverbs-1.0-rc7.tar.gz +libibverbs-1.0.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/libibverbs.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libibverbs.spec 16 Feb 2006 19:00:24 -0000 1.3 +++ libibverbs.spec 13 Mar 2006 23:28:45 -0000 1.4 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0-rc7 +%define ver 1.0 Name: libibverbs Version: 1.0 -Release: 0.5.rc7%{?dist} +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-rc7.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sysfsutils-devel @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Thu Feb 16 2006 Roland Dreier - 1.0-1 +- New upstream release + * Wed Feb 15 2006 Roland Dreier - 1.0-0.5.rc7 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2006 19:00:24 -0000 1.4 +++ sources 13 Mar 2006 23:28:45 -0000 1.5 @@ -1 +1 @@ -432245140a984601eaf1a1a6badad709 libibverbs-1.0-rc7.tar.gz +49769f2956f1e6fc40693c924a8d97af libibverbs-1.0.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 23:36:58 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:36:58 -0500 Subject: rpms/libmthca import.log,1.6,1.7 Message-ID: <200603132337.k2DNbUfp024163@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libmthca In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24129 Modified Files: import.log Log Message: auto-import libmthca-1.0-1 on branch devel from libmthca-1.0-1.src.rpm Import libmthca 1.0 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libmthca/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 16 Feb 2006 19:07:05 -0000 1.6 +++ import.log 13 Mar 2006 23:36:58 -0000 1.7 @@ -3,3 +3,4 @@ libmthca-1_0-0_3_rc5:FC-4:libmthca-1.0-0.3.rc5.src.rpm:1137996363 libmthca-1_0-0_5_rc7:HEAD:libmthca-1.0-0.5.rc7.src.rpm:1140116808 libmthca-1_0-0_5_rc7:FC-4:libmthca-1.0-0.5.rc7.src.rpm:1140116913 +libmthca-1_0-1:HEAD:libmthca-1.0-1.src.rpm:1142293099 From fedora-extras-commits at redhat.com Mon Mar 13 23:37:04 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:37:04 -0500 Subject: rpms/libmthca/devel .cvsignore, 1.4, 1.5 libmthca.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603132337.k2DNbaSP024169@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libmthca/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24129/devel Modified Files: .cvsignore libmthca.spec sources Log Message: auto-import libmthca-1.0-1 on branch devel from libmthca-1.0-1.src.rpm Import libmthca 1.0 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmthca/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2006 19:05:25 -0000 1.4 +++ .cvsignore 13 Mar 2006 23:37:04 -0000 1.5 @@ -1 +1 @@ -libmthca-1.0-rc7.tar.gz +libmthca-1.0.tar.gz Index: libmthca.spec =================================================================== RCS file: /cvs/extras/rpms/libmthca/devel/libmthca.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libmthca.spec 16 Feb 2006 19:05:25 -0000 1.3 +++ libmthca.spec 13 Mar 2006 23:37:04 -0000 1.4 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0-rc7 +%define ver 1.0 Name: libmthca Version: 1.0 -Release: 0.5.rc7%{?dist} +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-rc7.tar.gz +Source: http://openib.org/downloads/libmthca-1.0.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 +* Thu Feb 16 2006 Roland Dreier - 1.0-1 +- New upstream release + * Sun Feb 15 2006 Roland Dreier - 1.0-0.5.rc7 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmthca/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2006 19:05:25 -0000 1.4 +++ sources 13 Mar 2006 23:37:04 -0000 1.5 @@ -1 +1 @@ -7972d80c24461ba61996004eb37ae259 libmthca-1.0-rc7.tar.gz +f0a3aba79e35215064c7c45da17f3abe libmthca-1.0.tar.gz From fedora-extras-commits at redhat.com Mon Mar 13 23:38:04 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:38:04 -0500 Subject: rpms/libmthca import.log,1.7,1.8 Message-ID: <200603132338.k2DNcall024264@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libmthca In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24230 Modified Files: import.log Log Message: auto-import libmthca-1.0-1 on branch FC-4 from libmthca-1.0-1.src.rpm Import libmthca 1.0 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libmthca/import.log,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- import.log 13 Mar 2006 23:36:58 -0000 1.7 +++ import.log 13 Mar 2006 23:38:04 -0000 1.8 @@ -4,3 +4,4 @@ libmthca-1_0-0_5_rc7:HEAD:libmthca-1.0-0.5.rc7.src.rpm:1140116808 libmthca-1_0-0_5_rc7:FC-4:libmthca-1.0-0.5.rc7.src.rpm:1140116913 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 From fedora-extras-commits at redhat.com Mon Mar 13 23:38:10 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Mon, 13 Mar 2006 18:38:10 -0500 Subject: rpms/libmthca/FC-4 .cvsignore, 1.4, 1.5 libmthca.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603132338.k2DNch0J024271@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libmthca/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24230/FC-4 Modified Files: .cvsignore libmthca.spec sources Log Message: auto-import libmthca-1.0-1 on branch FC-4 from libmthca-1.0-1.src.rpm Import libmthca 1.0 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmthca/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Feb 2006 19:07:31 -0000 1.4 +++ .cvsignore 13 Mar 2006 23:38:10 -0000 1.5 @@ -1 +1 @@ -libmthca-1.0-rc7.tar.gz +libmthca-1.0.tar.gz Index: libmthca.spec =================================================================== RCS file: /cvs/extras/rpms/libmthca/FC-4/libmthca.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libmthca.spec 16 Feb 2006 19:07:31 -0000 1.3 +++ libmthca.spec 13 Mar 2006 23:38:10 -0000 1.4 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0-rc7 +%define ver 1.0 Name: libmthca Version: 1.0 -Release: 0.5.rc7%{?dist} +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-rc7.tar.gz +Source: http://openib.org/downloads/libmthca-1.0.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 +* Thu Feb 16 2006 Roland Dreier - 1.0-1 +- New upstream release + * Sun Feb 15 2006 Roland Dreier - 1.0-0.5.rc7 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmthca/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Feb 2006 19:07:31 -0000 1.4 +++ sources 13 Mar 2006 23:38:10 -0000 1.5 @@ -1 +1 @@ -7972d80c24461ba61996004eb37ae259 libmthca-1.0-rc7.tar.gz +f0a3aba79e35215064c7c45da17f3abe libmthca-1.0.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 04:04:20 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Mon, 13 Mar 2006 23:04:20 -0500 Subject: rpms/uudeview/devel uudeview.spec,1.8,1.9 Message-ID: <200603140404.k2E44qVB002827@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/uudeview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2810 Modified Files: uudeview.spec Log Message: * Mon Mar 13 2006 Adrian Reber - 0.5.20-7 - rebuilt Index: uudeview.spec =================================================================== RCS file: /cvs/extras/rpms/uudeview/devel/uudeview.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- uudeview.spec 29 Apr 2005 07:57:41 -0000 1.8 +++ uudeview.spec 14 Mar 2006 04:04:19 -0000 1.9 @@ -1,6 +1,6 @@ Name: uudeview Version: 0.5.20 -Release: 6 +Release: 7 License: GPL Group: Applications/File @@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: inews, tcl, tk BuildRequires: tetex-latex, transfig, desktop-file-utils -BuildRequires: XFree86-devel, %{_includedir}/tcl.h, %{_includedir}/tk.h +BuildRequires: %{_includedir}/tcl.h, %{_includedir}/tk.h Requires: %{_sbindir}/sendmail %description @@ -82,6 +82,9 @@ %{_libdir}/*.a %changelog +* Mon Mar 13 2006 Adrian Reber - 0.5.20-7 +- rebuilt + * Fri Apr 29 2005 Adrian Reber - 0.5.20-6 - renamed psfig to epsfig in library.ltx (#156249) From fedora-extras-commits at redhat.com Tue Mar 14 05:57:39 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 14 Mar 2006 00:57:39 -0500 Subject: rpms/libibverbs import.log,1.8,1.9 Message-ID: <200603140558.k2E5wCPX005130@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5096 Modified Files: import.log Log Message: auto-import libibverbs-1.0.1-1 on branch devel from libibverbs-1.0.1-1.src.rpm Import libibverbs 1.0.1 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- import.log 13 Mar 2006 23:28:39 -0000 1.8 +++ import.log 14 Mar 2006 05:57:39 -0000 1.9 @@ -5,3 +5,4 @@ libibverbs-1_0-0_5_rc7:FC-4:libibverbs-1.0-0.5.rc7.src.rpm:1140116508 libibverbs-1_0-1:HEAD:libibverbs-1.0-1.src.rpm:1142292336 libibverbs-1_0-1:FC-4:libibverbs-1.0-1.src.rpm:1142292600 +libibverbs-1_0_1-1:HEAD:libibverbs-1.0.1-1.src.rpm:1142315940 From fedora-extras-commits at redhat.com Tue Mar 14 05:57:46 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 14 Mar 2006 00:57:46 -0500 Subject: rpms/libibverbs/devel .cvsignore, 1.5, 1.6 libibverbs.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603140558.k2E5wIXT005135@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5096/devel Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0.1-1 on branch devel from libibverbs-1.0.1-1.src.rpm Import libibverbs 1.0.1 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 23:24:26 -0000 1.5 +++ .cvsignore 14 Mar 2006 05:57:45 -0000 1.6 @@ -1 +1 @@ -libibverbs-1.0.tar.gz +libibverbs-1.0.1.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/libibverbs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libibverbs.spec 13 Mar 2006 23:24:26 -0000 1.4 +++ libibverbs.spec 14 Mar 2006 05:57:45 -0000 1.5 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0 +%define ver 1.0.1 Name: libibverbs -Version: 1.0 +Version: 1.0.1 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.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sysfsutils-devel @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 13 2006 Roland Dreier - 1.0.1-1 +- New upstream release + * Thu Feb 16 2006 Roland Dreier - 1.0-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 23:24:26 -0000 1.5 +++ sources 14 Mar 2006 05:57:45 -0000 1.6 @@ -1 +1 @@ -49769f2956f1e6fc40693c924a8d97af libibverbs-1.0.tar.gz +641aa8589b0da6032884aa31a6716337 libibverbs-1.0.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 06:18:40 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 14 Mar 2006 01:18:40 -0500 Subject: rpms/libibverbs import.log,1.9,1.10 Message-ID: <200603140619.k2E6JCNr007232@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7198 Modified Files: import.log Log Message: auto-import libibverbs-1.0.1-1 on branch FC-4 from libibverbs-1.0.1-1.src.rpm Import libibverbs 1.0.1 release Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libibverbs/import.log,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- import.log 14 Mar 2006 05:57:39 -0000 1.9 +++ import.log 14 Mar 2006 06:18:39 -0000 1.10 @@ -6,3 +6,4 @@ libibverbs-1_0-1:HEAD:libibverbs-1.0-1.src.rpm:1142292336 libibverbs-1_0-1:FC-4:libibverbs-1.0-1.src.rpm:1142292600 libibverbs-1_0_1-1:HEAD:libibverbs-1.0.1-1.src.rpm:1142315940 +libibverbs-1_0_1-1:FC-4:libibverbs-1.0.1-1.src.rpm:1142317199 From fedora-extras-commits at redhat.com Tue Mar 14 06:18:46 2006 From: fedora-extras-commits at redhat.com (Roland Dreier (dreier)) Date: Tue, 14 Mar 2006 01:18:46 -0500 Subject: rpms/libibverbs/FC-4 .cvsignore, 1.5, 1.6 libibverbs.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603140619.k2E6JI9d007237@cvs-int.fedora.redhat.com> Author: dreier Update of /cvs/extras/rpms/libibverbs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7198/FC-4 Modified Files: .cvsignore libibverbs.spec sources Log Message: auto-import libibverbs-1.0.1-1 on branch FC-4 from libibverbs-1.0.1-1.src.rpm Import libibverbs 1.0.1 release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Mar 2006 23:28:45 -0000 1.5 +++ .cvsignore 14 Mar 2006 06:18:46 -0000 1.6 @@ -1 +1 @@ -libibverbs-1.0.tar.gz +libibverbs-1.0.1.tar.gz Index: libibverbs.spec =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/libibverbs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libibverbs.spec 13 Mar 2006 23:28:45 -0000 1.4 +++ libibverbs.spec 14 Mar 2006 06:18:46 -0000 1.5 @@ -1,16 +1,16 @@ # $Id$ -%define ver 1.0 +%define ver 1.0.1 Name: libibverbs -Version: 1.0 +Version: 1.0.1 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.tar.gz +Source: http://openib.org/downloads/libibverbs-1.0.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: sysfsutils-devel @@ -77,6 +77,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 13 2006 Roland Dreier - 1.0.1-1 +- New upstream release + * Thu Feb 16 2006 Roland Dreier - 1.0-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libibverbs/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Mar 2006 23:28:45 -0000 1.5 +++ sources 14 Mar 2006 06:18:46 -0000 1.6 @@ -1 +1 @@ -49769f2956f1e6fc40693c924a8d97af libibverbs-1.0.tar.gz +641aa8589b0da6032884aa31a6716337 libibverbs-1.0.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 07:53:26 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:53:26 -0500 Subject: rpms/ecl - New directory Message-ID: <200603140753.k2E7rSVp009592@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9584/ecl Log Message: Directory /cvs/extras/rpms/ecl added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 07:53:31 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:53:31 -0500 Subject: rpms/ecl/devel - New directory Message-ID: <200603140753.k2E7rY0V009607@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9584/ecl/devel Log Message: Directory /cvs/extras/rpms/ecl/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 07:53:50 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:53:50 -0500 Subject: rpms/ecl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603140753.k2E7rq8c009641@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9629 Added Files: Makefile import.log Log Message: Setup of module ecl --- NEW FILE Makefile --- # Top level Makefile for module ecl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 14 07:53:56 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:53:56 -0500 Subject: rpms/ecl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603140753.k2E7rwOI009661@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9629/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ecl --- NEW 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 Mar 14 07:56:10 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:56:10 -0500 Subject: rpms/ecl import.log,1.1,1.2 Message-ID: <200603140756.k2E7ugK5009730@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9696 Modified Files: import.log Log Message: auto-import ecl-0.9h-4 on branch devel from ecl-0.9h-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ecl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Mar 2006 07:53:50 -0000 1.1 +++ import.log 14 Mar 2006 07:56:09 -0000 1.2 @@ -0,0 +1 @@ +ecl-0_9h-4:HEAD:ecl-0.9h-4.src.rpm:1142322962 From fedora-extras-commits at redhat.com Tue Mar 14 07:56:15 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 02:56:15 -0500 Subject: rpms/ecl/devel ecl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603140756.k2E7umoA009734@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9696/devel Modified Files: .cvsignore sources Added Files: ecl.spec Log Message: auto-import ecl-0.9h-4 on branch devel from ecl-0.9h-4.src.rpm --- NEW FILE ecl.spec --- Name: ecl Version: 0.9h Release: 4 Summary: Embeddable Common-Lisp Group: Development/Languages License: LGPL URL: http://ecls.sourceforge.net Source0: http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-0.9h.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel BuildRequires: m4 BuildRequires: texinfo Requires(post): /sbin/install-info Requires(postun): /sbin/install-info %description ECL (Embeddable Common-Lisp) is an interpreter of the Common-Lisp language as described in the X3J13 Ansi specification, featuring CLOS (Common-Lisp Object System), conditions, loops, etc, plus a translator to C, which can produce standalone executables. # no -devel package for header files is split off # since they are required by the main package %prep %setup0 -q # wrong character in texinfo file perl -pi -e 's|\xc7||' src/doc/user.txi %build %configure --enable-boehm=included --enable-threads=yes --with-cxx make (cd build/doc; make all html) %install rm -rf $RPM_BUILD_ROOT make prefix=$RPM_BUILD_ROOT%{_prefix} \ bindir=$RPM_BUILD_ROOT%{_bindir} \ libdir=$RPM_BUILD_ROOT%{_libdir}/ecl \ mandir=$RPM_BUILD_ROOT%{_mandir} \ docdir=$RPM_BUILD_ROOT%{_docdir} \ infodir=$RPM_BUILD_ROOT%{_infodir} \ install rm -f $RPM_BUILD_ROOT%{_infodir}/dir rm -fr $RPM_BUILD_ROOT%{_docdir} find $RPM_BUILD_ROOT%{_libdir}/ecl -name '*.lsp' | xargs chmod 0644 %post /sbin/install-info %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || : /sbin/install-info %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || : %postun if [ $1 = 0 ]; then /sbin/install-info --delete %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || : /sbin/install-info --delete %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || : fi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/ecl %{_bindir}/ecl-config %{_libdir}/ecl %{_mandir}/man*/* %{_infodir}/* %doc ANNOUNCEMENT Copyright LGPL README.1st build/doc/*.html build/doc/ecl build/doc/ecldev %changelog * Tue Mar 14 2006 Gerard Milmeister - 0.9h-4 - removed buildreq perl * Fri Mar 10 2006 Gerard Milmeister - 0.9h-3 - fixed permissions and texinfo problems * Sun Dec 4 2005 Gerard Milmeister - 0.9h-2 - buildreq m4, texinfo * Mon Nov 21 2005 Gerard Milmeister - 0.9h-1 - New Version 0.9h * Sat Aug 20 2005 Gerard Milmeister - 0.9g-1 - New Version 0.9g * Sun Apr 10 2005 Gerard Milmeister - 0.9e-1.cvs20050410 - CVS Version 20050410 * Sun Apr 10 2005 Gerard Milmeister - 0.9e-1 - New Version 0.9e * Sat Nov 6 2004 Gerard Milmeister - 0:0.9-0.fdr.1.d - New Version 0.9d * Sat Mar 27 2004 Gerard Milmeister - 0:0.9-0.fdr.1.c - First Fedora release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ecl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Mar 2006 07:53:56 -0000 1.1 +++ .cvsignore 14 Mar 2006 07:56:15 -0000 1.2 @@ -0,0 +1 @@ +ecl-0.9h.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ecl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Mar 2006 07:53:56 -0000 1.1 +++ sources 14 Mar 2006 07:56:15 -0000 1.2 @@ -0,0 +1 @@ +d02ae5ce7fa48fe534666ce853aaa27e ecl-0.9h.tgz From fedora-extras-commits at redhat.com Tue Mar 14 08:00:42 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 14 Mar 2006 03:00:42 -0500 Subject: owners owners.list,1.741,1.742 Message-ID: <200603140801.k2E81EFh010677@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9832 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.741 retrieving revision 1.742 diff -u -r1.741 -r1.742 --- owners.list 13 Mar 2006 11:14:10 -0000 1.741 +++ owners.list 14 Mar 2006 08:00:41 -0000 1.742 @@ -202,6 +202,7 @@ Fedora Extras|dynamite|Extract data compressed with PKWARE Data Compression Library|andreas.bierfert at lowlatency.de|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|ecl|Embeddable Common-Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|ecore|An event and X abstraction layer|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|edb|A database convenience library wrapped around BDB|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Mar 14 08:26:07 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Tue, 14 Mar 2006 03:26:07 -0500 Subject: rpms/pikdev import.log,1.1,1.2 Message-ID: <200603140826.k2E8Qd4I011900@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11863 Modified Files: import.log Log Message: auto-import pikdev-0.8.4-3 on branch devel from pikdev-0.8.4-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pikdev/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 13 Mar 2006 10:12:55 -0000 1.1 +++ import.log 14 Mar 2006 08:26:06 -0000 1.2 @@ -0,0 +1 @@ +pikdev-0_8_4-3:HEAD:pikdev-0.8.4-3.src.rpm:1142326024 From fedora-extras-commits at redhat.com Tue Mar 14 08:26:13 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Tue, 14 Mar 2006 03:26:13 -0500 Subject: rpms/pikdev/devel LISEZMOI.Fedora, NONE, 1.1 README.Fedora, NONE, 1.1 pikdev.desktop, NONE, 1.1 pikdev.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603140826.k2E8QjFU011904@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11863/devel Modified Files: .cvsignore sources Added Files: LISEZMOI.Fedora README.Fedora pikdev.desktop pikdev.spec Log Message: auto-import pikdev-0.8.4-3 on branch devel from pikdev-0.8.4-3.src.rpm --- NEW FILE LISEZMOI.Fedora --- Pour utiliser pikdev, les utilisateurs ont besoin d'acc??der au(x) port(s) s??rie et/ou parall??le en mode lecture/??criture, suivant le programmateur utilis??. Aussi, le super-utilisateur doit ajouter les utilisateurs susceptibles d'utiliser le programmateur aux groupes uucp (pour le port s??rie) et/ou lp (pour le port parall??le). Pour ce faire, taper la commande suivante : useradd -G lp,uucp utilisateur pour chaque utilisateur que vous souhaitez ajouter. De plus, si un programmateur sur port parall??le est utilis??, il est n??cessaire de charger le module ppdev, gr??ce ?? la commande : modprobe ppdev --- NEW FILE README.Fedora --- This application needs the users to access serial and/or paralell port in RW mode, depends upon the programmer is used. So, administrator have to add allowed users to uucp and/or lp groups. To do this, type the following command line: useradd -G lp,uucp allowed_user for each allowed_user you want to add. And if a paralell port programmer is used, you need to load the ppdev module, by typing the following command line: modprobe ppdev --- NEW FILE pikdev.desktop --- [Desktop Entry] Name=Pikdev Comment=IDE for PICmicro based applications Comment[fr]=Environnement de d??veloppement int??gr?? pour applications ?? base de microcontr??leurs PIC Exec=pikdev -caption "%c" %i %m Icon=pikdev.png Terminal=false Type=Application Encoding=UTF-8 Categories=Application; DocPath=pikdev/index.html --- NEW FILE pikdev.spec --- Name: pikdev Version: 0.8.4 Release: 3%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC Group: Development/Tools License: GPL Url: http://pikdev.free.fr Source0: http://pikdev.free.fr/%{name}-%{version}.tar.gz Source1: %{name}.desktop Source2: README.Fedora Source3: LISEZMOI.Fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils, kdelibs-devel Requires: gputils %description PiKdev is a simple IDE dedicated to the development of PIC based applications under KDE. Features: - Integrated editor - Project management - Integrated programming engine for 12, 14 and 16 bits PIC (flash or EPROM technology) - Support for parallel and serial port programmers - KDE compliant look-and-feel WARNING: Administrator have to see the README.Fedora file locate in the %{_docdir}/%{name}-%{version} directory to complete full feature installation. %description -l fr PiKdev est un EDI (Environnement de D??veloppement Int??gr??) d??di?? au d??veloppement, sous KDE, d'applications ?? base de microcontr??leurs PIC de Microchip. Fonctionnalit??s : - ??diteur int??gr?? - Gestionnaire de projet - Engin de programmation int??gr?? pour les PIC 12, 14 et 16 bits (technologie flash ou EPROM) - Gestion des programmateurs pour port parall??le et port s??rie - Conformit?? de l'aspect et de la convivialit?? de KDE ATTENTION : l'installateur du paquetage doit lire le fichier LISEZMOI.Fedora, situ?? dans le r??pertoire %{_docdir}/%{name}-%{version}, afin de voir comment finir l'installation. %prep %setup -q %{__cp} -p %{SOURCE2} . %{__cp} -p %{SOURCE3} . %build %configure --disable-rpath rm -rf pkp cd pikdev make -f Makefile.pkp cd .. cp pikdev/pkp . make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install-strip DESTDIR=$RPM_BUILD_ROOT chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category "Development" \ --add-category "IDE" \ --add-category "X-Fedora" \ %{SOURCE1} %find_lang %{name} %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-, root, root) %doc LICENSE README.Fedora LISEZMOI.Fedora %{_bindir}/* %{_datadir}/applications/* %{_datadir}/apps/%{name}/ %{_datadir}/apps/katepart/syntax/* %{_datadir}/icons/* %changelog * Wed Mar 08 2006 Alain Portal 0.8.4-3 - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5 - Package must own %{_datadir}/apps/%{name} directory * Tue Jan 31 2006 Alain Portal 0.8.4-2 - Don't use the precompiled version of pkp * Mon Jan 30 2006 Alain Portal 0.8.4-1 - New upstream version * Tue Jan 10 2006 Alain Portal 0.8.2-2 - Add the %{?dist} macro * Fri Dec 16 2005 Alain Portal 0.8.2-1 - New version - Add french summary and description - Add french documentation * Mon Jan 10 2005 Alain Portal 0:0.7.2-0.fdr.1 - New version * Mon Nov 08 2004 Alain Portal 0:0.7.1-0.fdr.2 - Add BuildRequires kdelibs-devel, qt-devel, xorg-x11-devel * Wed Oct 27 2004 Alain Portal 0:0.7.1-0.fdr.1 - Initial Fedora RPM - Patch to fix french typo Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pikdev/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 13 Mar 2006 10:13:01 -0000 1.1 +++ .cvsignore 14 Mar 2006 08:26:13 -0000 1.2 @@ -0,0 +1 @@ +pikdev-0.8.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pikdev/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 13 Mar 2006 10:13:01 -0000 1.1 +++ sources 14 Mar 2006 08:26:13 -0000 1.2 @@ -0,0 +1 @@ +95c6cf21241134ed684373b8176f6ea1 pikdev-0.8.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 08:38:53 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 14 Mar 2006 03:38:53 -0500 Subject: rpms/amarok/devel amarok-1.4-engines-cfg.patch, NONE, 1.1 amarok-1.4-helix.patch, NONE, 1.1 .cvsignore, 1.19, 1.20 amarok.spec, 1.43, 1.44 sources, 1.19, 1.20 amarok-1.3-engines-cfg.patch, 1.3, NONE amarok-1.3.4-helix-libs.patch, 1.1, NONE Message-ID: <200603140839.k2E8dPWi012021@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11994 Modified Files: .cvsignore amarok.spec sources Added Files: amarok-1.4-engines-cfg.patch amarok-1.4-helix.patch Removed Files: amarok-1.3-engines-cfg.patch amarok-1.3.4-helix-libs.patch Log Message: version 1.4beta2 amarok-1.4-engines-cfg.patch: --- NEW FILE amarok-1.4-engines-cfg.patch --- diff -Nur amarok-1.3-orig/amarok/src/engine/gst10/config/gstconfig.kcfg amarok-1.3/amarok/src/engine/gst10/config/gstconfig.kcfg --- amarok-1.3-orig/amarok/src/engine/gst10/config/gstconfig.kcfg 2005-08-14 17:53:18.000000000 -0500 +++ amarok-1.3/amarok/src/engine/gst10/config/gstconfig.kcfg 2005-08-16 12:15:31.000000000 -0500 @@ -10,7 +10,7 @@ Select the sound output plugin ("sink"). Their availability depends on the system configuration. - osssink + autoaudiosink amarok-1.4-helix.patch: --- NEW FILE amarok-1.4-helix.patch --- --- ./configure.helix 2006-03-05 20:28:13.000000000 +0100 +++ ./configure 2006-03-13 23:04:01.000000000 +0100 @@ -38181,7 +38181,7 @@ # BEGIN DO_NOT_COMPILE CHECK ############################################################################### -if test x$build_xine != xyes -a x$build_helix != xno; then +if test x$build_xine = xno -a x$build_helix = xno; then DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" no_engine=yes Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- .cvsignore 17 Feb 2006 11:00:41 -0000 1.19 +++ .cvsignore 14 Mar 2006 08:38:52 -0000 1.20 @@ -1 +1 @@ -amarok-1.4-beta1.tar.bz2 +amarok-1.4-beta2.tar.bz2 Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- amarok.spec 22 Feb 2006 09:22:26 -0000 1.43 +++ amarok.spec 14 Mar 2006 08:38:52 -0000 1.44 @@ -7,16 +7,16 @@ Name: amarok Summary: Media player for KDE Version: 1.4 -Release: 0.7.beta1%{?dist} +Release: 0.8.beta2%{?dist} Group: Applications/Multimedia License: GPL Url: http://amarok.kde.org -Source0: http://dl.sf.net/amarok/amarok-1.4-beta1.tar.bz2 +Source0: http://dl.sf.net/amarok/amarok-1.4-beta2.tar.bz2 Patch0: amarok-1.4beta1-gst10.patch -#Patch0: amarok-1.3.4-helix-libs.patch +Patch1: amarok-1.4-helix.patch #Patch1: amarok-1.3.6-libtunepimp040.patch -Patch2: amarok-1.3-engines-cfg.patch +Patch2: amarok-1.4-engines-cfg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdemultimedia-devel >= 6:3.2 @@ -47,7 +47,6 @@ BuildRequires: faad2-devel %endif -Requires: kdemultimedia >= 6:3.2 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils @@ -97,15 +96,15 @@ %prep -%setup -q -n %{name}-%{version}-beta1 +%setup -q -n %{name}-%{version}-beta2 # Discover the helix libs -#%patch0 -p1 -b .helix-libs +%patch1 -p1 -b .helix # Use libtunepimp 0.4.0 (api changed) #%patch1 -p1 -b .libtunepimp040 # Gstreamer default sink should be autoaudiosink %patch2 -p1 -b .engines-cfg # Don't use cache to detect gst 0.10 or it will fail because gst 0.8 is not present -%patch0 -p1 -b .gst10 +#%patch0 -p1 -b .gst10 %build @@ -222,8 +221,6 @@ %{_libdir}/libamarok.* %{_datadir}/apps/konqsidebartng/*/amarok.desktop %{_datadir}/apps/profiles/amarok.profile.xml -%{_libdir}/mcop/Amarok -%{_libdir}/mcop/amarok* %{_datadir}/config/amarokrc %{_datadir}/config.kcfg/*.kcfg # Gstreamer engine @@ -237,10 +234,6 @@ # Akode engine %{_datadir}/services/amarok_aKode-engine.desktop %{_libdir}/kde3/libamarok_aKode-engine.* -# Arts engine -%{_libdir}/libamarokarts* -%{_libdir}/kde3/libamarok_artsengine_plugin.* -%{_datadir}/services/amarok_artsengine_plugin.desktop # Helix engine %ifnarch ppc64 x86_64 s390 s390x ia64 %{_libdir}/kde3/libamarok_helixengine_plugin.* @@ -264,6 +257,9 @@ %changelog +* Sun Mar 05 2006 Aurelien Bompard 1.4-0.8.beta2 +- version 1.4 beta2 + * Wed Feb 22 2006 Aurelien Bompard 1.4-0.7.beta1 - disable build of Helix engine on x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/amarok/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 17 Feb 2006 11:00:41 -0000 1.19 +++ sources 14 Mar 2006 08:38:52 -0000 1.20 @@ -1 +1 @@ -78dfa2c8c65cb7fe1cf26aaa6cc193e8 amarok-1.4-beta1.tar.bz2 +0c7e2a5e8ea2d73d8e73b986090cfc37 amarok-1.4-beta2.tar.bz2 --- amarok-1.3-engines-cfg.patch DELETED --- --- amarok-1.3.4-helix-libs.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 14 08:45:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:45:32 -0500 Subject: rpms/nessus-libraries - New directory Message-ID: <200603140845.k2E8jYop012156@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12148/nessus-libraries Log Message: Directory /cvs/extras/rpms/nessus-libraries added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 08:45:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:45:39 -0500 Subject: rpms/nessus-libraries/devel - New directory Message-ID: <200603140845.k2E8jf39012171@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12148/nessus-libraries/devel Log Message: Directory /cvs/extras/rpms/nessus-libraries/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 08:46:00 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:46:00 -0500 Subject: rpms/nessus-libraries Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603140846.k2E8k2lV012205@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12193 Added Files: Makefile import.log Log Message: Setup of module nessus-libraries --- NEW FILE Makefile --- # Top level Makefile for module nessus-libraries all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 14 08:46:05 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:46:05 -0500 Subject: rpms/nessus-libraries/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603140846.k2E8k8hv012225@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12193/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module nessus-libraries --- NEW 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 Mar 14 08:46:57 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:46:57 -0500 Subject: rpms/nessus-libraries import.log,1.1,1.2 Message-ID: <200603140847.k2E8lTeY012312@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12270 Modified Files: import.log Log Message: auto-import nessus-libraries-2.2.6-2 on branch devel from nessus-libraries-2.2.6-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Mar 2006 08:46:00 -0000 1.1 +++ import.log 14 Mar 2006 08:46:57 -0000 1.2 @@ -0,0 +1 @@ +nessus-libraries-2_2_6-2:HEAD:nessus-libraries-2.2.6-2.src.rpm:1142326008 From fedora-extras-commits at redhat.com Tue Mar 14 08:47:03 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Tue, 14 Mar 2006 03:47:03 -0500 Subject: rpms/nessus-libraries/devel nessus-libraries-2.2.4.Makefile.patch, NONE, 1.1 nessus-libraries-config.patch, NONE, 1.1 nessus-libraries.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603140847.k2E8lZ1t012316@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/nessus-libraries/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12270/devel Modified Files: .cvsignore sources Added Files: nessus-libraries-2.2.4.Makefile.patch nessus-libraries-config.patch nessus-libraries.spec Log Message: auto-import nessus-libraries-2.2.6-2 on branch devel from nessus-libraries-2.2.6-2.src.rpm nessus-libraries-2.2.4.Makefile.patch: --- NEW FILE nessus-libraries-2.2.4.Makefile.patch --- diff -Naurp nessus-libraries.orig/libnessus/Makefile nessus-libraries/libnessus/Makefile --- nessus-libraries.orig/libnessus/Makefile 2004-08-31 19:15:07.000000000 +0200 +++ nessus-libraries/libnessus/Makefile 2005-07-06 12:56:28.000000000 +0200 @@ -72,7 +72,7 @@ ids_send.o : ids_send.c $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ids_send.c bpf_share.o: bpf_share.c - $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c bpf_share.c + $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" -c bpf_share.c rand.o: rand.c $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c rand.c @@ -81,16 +81,16 @@ popen.o: popen.c $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c popen.c services.o: services.c - $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c + $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" -c services.c services1.o: services1.c - $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c + $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c proctitle.o: proctitle.c $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c proctitle.c store.o: store.c - $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c + $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" -c store.c kb.o: kb.c nessus-libraries-config.patch: --- NEW FILE nessus-libraries-config.patch --- --- nessus-config.pre.in.orig 2006-02-24 10:23:33.000000000 +0100 +++ nessus-config.pre.in 2006-02-24 10:24:22.000000000 +0100 @@ -12,8 +12,8 @@ PREFIX=@prefix@ -LIBDIR=$PREFIX/lib -INCLUDEDIR=$PREFIX/include +LIBDIR=@libdir@ +INCLUDEDIR=@includedir@ DEFS="@syspcap@" VERSION=@version@ CIPHER="%CIPHER_LDFLAGS%" --- NEW FILE nessus-libraries.spec --- Name: nessus-libraries Version: 2.2.6 Release: 2%{?dist} Summary: Support libraries for nessus Group: System Environment/Libraries License: GPL URL: http://www.nessus.org Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-libraries-2.2.6.tar.gz Patch0: nessus-libraries-config.patch Patch1: nessus-libraries-2.2.4.Makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison BuildRequires: flex BuildRequires: libpcap BuildRequires: openssl-devel %description Support libraries for nessus %package devel Summary: Development package for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: libpcap Requires: openssl-devel %description devel The %{name}-devel package contains the files needed for development with %{name}. %prep %setup -q -n %{name} %patch0 %patch1 -p1 %build %configure --enable-chiper --disable-nessuspcap --enable-shared \ --disable-static --with-pic make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # generate ghost service.* files mkdir -m 0755 -p %{buildroot}%{_localstatedir}/lib/nessus touch %{buildroot}%{_localstatedir}/lib/nessus/services.{tcp,udp,txt} 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 libnessus/COPYING %ghost %dir %{_localstatedir}/lib/nessus %ghost %verify(not md5 size mtime) %{_localstatedir}/lib/nessus/services.* %{_libdir}/libhosts_gatherer.so.* %{_libdir}/libnessus.so.* %exclude %{_sbindir}/uninstall-nessus %files devel %defattr(-,root,root,-) %{_libdir}/libhosts_gatherer.so %{_libdir}/libnessus.so %{_includedir}/nessus %{_mandir}/man1/nessus-config.* %{_bindir}/nessus-config %changelog * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - include patch for localstatedir - build pic only - ghost service files * Tue Feb 21 2006 Andreas Bierfert 2.2.6-1 - Initial Revision Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Mar 2006 08:46:05 -0000 1.1 +++ .cvsignore 14 Mar 2006 08:47:02 -0000 1.2 @@ -0,0 +1 @@ +nessus-libraries-2.2.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/nessus-libraries/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Mar 2006 08:46:05 -0000 1.1 +++ sources 14 Mar 2006 08:47:02 -0000 1.2 @@ -0,0 +1 @@ +ac027cd2dfa149a44a6dbb748eb93ce9 nessus-libraries-2.2.6.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 10:41:19 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 05:41:19 -0500 Subject: rpms/diradmin/devel diradmin.spec,1.10,1.11 Message-ID: <200603141041.k2EAfpg0017482@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/diradmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17465 Modified Files: diradmin.spec Log Message: Rework modular X build requirements. Index: diradmin.spec =================================================================== RCS file: /cvs/extras/rpms/diradmin/devel/diradmin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- diradmin.spec 8 Feb 2006 15:10:20 -0000 1.10 +++ diradmin.spec 14 Mar 2006 10:41:18 -0000 1.11 @@ -1,7 +1,7 @@ Summary: User control management tool for LDAP directories Name: diradmin Version: 1.7.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/System URL: http://diradmin.open-it.org/ @@ -10,9 +10,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gnome-libs-devel, openldap-devel, desktop-file-utils BuildRequires: openssl-devel -# Workaround for modular X and gtk+-devel < 1.2.10-48 -BuildRequires: libX11-devel, libXext-devel, libXi-devel -BuildRequires: libXpm-devel, libSM-devel +# Required until libSM-devel gets required by gnome-libs-devel (#184125) +# Use modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libSM-devel, libXpm-devel +%endif + Obsoletes: directory_administrator <= 1.5.1-4 %description @@ -88,6 +91,10 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 1.7.1-4 +- Remove nearly all modular X build requirements (still libSM-devel #184125). +- Add libXpm-devel build requirement, it's an optional configure check. + * Wed Feb 8 2006 Matthias Saou 1.7.1-3 - Rebuild for new gcc/glibc. - Still no fix for #171557 though, sorry. From fedora-extras-commits at redhat.com Tue Mar 14 10:54:50 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 05:54:50 -0500 Subject: rpms/gtktalog/devel gtktalog.spec,1.7,1.8 Message-ID: <200603141055.k2EAtMaS017569@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/gtktalog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17547 Modified Files: gtktalog.spec Log Message: Rearrange requirements and build requirements, have eject and ogginfo detected. Index: gtktalog.spec =================================================================== RCS file: /cvs/extras/rpms/gtktalog/devel/gtktalog.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtktalog.spec 9 Feb 2006 10:16:30 -0000 1.7 +++ gtktalog.spec 14 Mar 2006 10:54:49 -0000 1.8 @@ -1,16 +1,18 @@ Summary: The GNOME disk catalog Name: gtktalog Version: 1.0.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Archiving URL: http://www.nongnu.org/gtktalog/ Source: ftp://ftp.gnu.org/savannah/files/gtktalog/gtktalog.pkg/%{version}/gtktalog-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: gnome-libs >= 1.2, zlib, eject, bzip2, /usr/bin/file -BuildRequires: gnome-libs-devel, gtk+-devel, desktop-file-utils, gcc-c++ -%if 0%{?fedora} < 5 -%else +Requires: gnome-libs >= 1.2, unzip, bzip2, file, eject, vorbis-tools +BuildRequires: gnome-libs-devel >= 1.2, desktop-file-utils, gettext-devel +BuildRequires: unzip, bzip2, file, eject, vorbis-tools +# Required until libSM-devel gets required by gnome-libs-devel (#184125) +# Use modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 BuildRequires: libSM-devel %endif @@ -62,6 +64,11 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 1.0.4-7 +- Make libSM-devel buildd requirement conditional. It souldn't be here + anyway an will go away when #184125 gets fixed. +- Add eject and vorbis-tools (ogginfo) support, rearrange requirements. + * Thu Feb 9 2006 Matthias Saou 1.0.4-6 - Add conditional to build with modular X depending on FC version. - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Tue Mar 14 11:04:10 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 06:04:10 -0500 Subject: rpms/i8kutils/devel i8kbuttons.init,1.6,1.7 i8kutils.spec,1.8,1.9 Message-ID: <200603141104.k2EB4lxZ019622@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/i8kutils/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19594 Modified Files: i8kbuttons.init i8kutils.spec Log Message: FC5 rebuild and silence possible kernel module insertion error. Index: i8kbuttons.init =================================================================== RCS file: /cvs/extras/rpms/i8kutils/devel/i8kbuttons.init,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- i8kbuttons.init 23 Aug 2005 16:29:05 -0000 1.6 +++ i8kbuttons.init 14 Mar 2006 11:04:08 -0000 1.7 @@ -24,7 +24,7 @@ case "$1" in start) echo -n $"Starting $prog: " - /sbin/modprobe i8k force=1 + /sbin/modprobe i8k force=1 &>/dev/null if pidofproc $prog &>/dev/null; then echo_failure RETVAL=1 Index: i8kutils.spec =================================================================== RCS file: /cvs/extras/rpms/i8kutils/devel/i8kutils.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- i8kutils.spec 9 Feb 2006 15:21:52 -0000 1.8 +++ i8kutils.spec 14 Mar 2006 11:04:10 -0000 1.9 @@ -4,7 +4,7 @@ Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools Name: i8kutils Version: 1.25 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Base URL: http://people.debian.org/~dz/i8k/ @@ -83,6 +83,10 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 1.25-6 +- FC5 rebuild. +- Silence possible kernel module insertion error in the init script. + * Thu Feb 9 2006 Matthias Saou 1.25-5 - Rebuild for new gcc/glibc. From fedora-extras-commits at redhat.com Tue Mar 14 11:05:06 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 06:05:06 -0500 Subject: rpms/php-eaccelerator/devel .cvsignore, 1.4, 1.5 php-eaccelerator.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200603141105.k2EB5cJ2019686@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19620 Modified Files: .cvsignore php-eaccelerator.spec sources Log Message: Update to latest svn200603090012 snapshot. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Feb 2006 17:12:20 -0000 1.4 +++ .cvsignore 14 Mar 2006 11:05:06 -0000 1.5 @@ -1 +1 @@ -eaccelerator-5.1-cvs200602071647.tar.gz +eaccelerator-svn200603090012.tar.gz Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- php-eaccelerator.spec 9 Feb 2006 17:12:24 -0000 1.8 +++ php-eaccelerator.spec 14 Mar 2006 11:05:06 -0000 1.9 @@ -2,17 +2,17 @@ %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.4.1)} %define module_version 0.9.3 -%define prever cvs200602071647 +%define prever svn200603090012 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 0.1%{?dist} +Release: 0.2%{?dist} License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ #Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.gz -Source: http://snapshots.eaccelerator.net/eaccelerator-5.1-%{prever}.tar.gz +Source: http://snapshots.eaccelerator.net/eaccelerator-%{prever}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Requires: php = %{php_version} Provides: php-zend_extension @@ -29,7 +29,7 @@ %prep #setup -n eaccelerator-%{module_version} -%setup -n eaccelerator-5.1-%{prever} +%setup -n eaccelerator-%{prever} %build @@ -90,6 +90,9 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 5.1.x_0.9.3-0.2 +- Update to latest eaccelerator-svn200603090012 snapshot. + * Thu Feb 9 2006 Matthias Saou 5.1.x_0.9.3-0.1 - Update to 5.1.x compatible snapshot. - Will try to make re2c available in Extras in order to build require it. Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Feb 2006 17:12:24 -0000 1.4 +++ sources 14 Mar 2006 11:05:06 -0000 1.5 @@ -1 +1 @@ -6ad0cd6244c8bb165367c848e14dd382 eaccelerator-5.1-cvs200602071647.tar.gz +762cb56c56190186e5e9a46b2fd2798d eaccelerator-svn200603090012.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 12:08:27 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 07:08:27 -0500 Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.9,1.10 Message-ID: <200603141209.k2EC916S021869@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/php-eaccelerator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21850 Modified Files: php-eaccelerator.spec Log Message: Pass userid 48 to configure script on PPC for sysvipc semaphores. Index: php-eaccelerator.spec =================================================================== RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- php-eaccelerator.spec 14 Mar 2006 11:05:06 -0000 1.9 +++ php-eaccelerator.spec 14 Mar 2006 12:08:27 -0000 1.10 @@ -4,10 +4,14 @@ %define module_version 0.9.3 %define prever svn200603090012 +# This is the apache userid, only used for sysvipc semaphores which is the +# default on ppc since spinlock is not detected +%define userid 48 + Summary: PHP accelerator, optimizer, encoder and dynamic content cacher Name: php-eaccelerator Version: %{php_version}_%{module_version} -Release: 0.2%{?dist} +Release: 0.3%{?dist} License: GPL Group: Development/Languages URL: http://eaccelerator.sourceforge.net/ @@ -34,7 +38,10 @@ %build phpize -%configure +%configure \ +%ifarch ppc + --with-eaccelerator-userid="%{userid}" +%endif # Set fcntl based semaphores to avoid ipc based locking issues on x86_64 %ifarch x86_64 %{__perl} -pi -e 's|.*(MM_SEM_[A-Z]+).*|/* #undef $1 */|g' config.h @@ -90,6 +97,9 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 5.1.x_0.9.3-0.3 +- Pass userid 48 to configure script on PPC for sysvipc semaphores. + * Tue Mar 14 2006 Matthias Saou 5.1.x_0.9.3-0.2 - Update to latest eaccelerator-svn200603090012 snapshot. From fedora-extras-commits at redhat.com Tue Mar 14 12:12:16 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 14 Mar 2006 07:12:16 -0500 Subject: rpms/phpldapadmin/devel .cvsignore, 1.5, 1.6 phpldapadmin.spec, 1.9, 1.10 sources, 1.6, 1.7 Message-ID: <200603141212.k2ECCntU021958@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21937 Modified Files: .cvsignore phpldapadmin.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 2 Mar 2006 17:41:50 -0000 1.5 +++ .cvsignore 14 Mar 2006 12:12:16 -0000 1.6 @@ -1 +1 @@ -phpldapadmin-0.9.8.1.tar.gz +phpldapadmin-0.9.8.2.tar.gz Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/phpldapadmin.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- phpldapadmin.spec 2 Mar 2006 17:41:50 -0000 1.9 +++ phpldapadmin.spec 14 Mar 2006 12:12:16 -0000 1.10 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.1 +Version: 0.9.8.2 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 +- update to 0.9.8.2 + * Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 - upgrade to 0.9.8.1 - remove unneeded tools dir *.po files in locale dir Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 17:41:50 -0000 1.6 +++ sources 14 Mar 2006 12:12:16 -0000 1.7 @@ -1 +1 @@ -6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz +a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 12:27:01 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 14 Mar 2006 07:27:01 -0500 Subject: rpms/phpldapadmin/FC-4 phpldapadmin.spec,1.10,1.11 sources,1.5,1.6 Message-ID: <200603141227.k2ECRYiW022085@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22066 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/phpldapadmin.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- phpldapadmin.spec 2 Mar 2006 17:43:05 -0000 1.10 +++ phpldapadmin.spec 14 Mar 2006 12:27:01 -0000 1.11 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.1 +Version: 0.9.8.2 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 +- update to 0.9.8.2 + * Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 - upgrade to 0.9.8.1 - remove unneeded tools dir *.po files in locale dir Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Mar 2006 17:43:05 -0000 1.5 +++ sources 14 Mar 2006 12:27:01 -0000 1.6 @@ -1 +1 @@ -6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz +a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 12:28:04 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 14 Mar 2006 07:28:04 -0500 Subject: rpms/phpldapadmin/FC-3 phpldapadmin.spec,1.9,1.10 sources,1.5,1.6 Message-ID: <200603141228.k2ECSa1Z022153@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/phpldapadmin/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22134 Modified Files: phpldapadmin.spec sources Log Message: Index: phpldapadmin.spec =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/phpldapadmin.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- phpldapadmin.spec 2 Mar 2006 17:44:39 -0000 1.9 +++ phpldapadmin.spec 14 Mar 2006 12:28:04 -0000 1.10 @@ -1,6 +1,6 @@ Name: phpldapadmin Summary: Web-based tool for managing LDAP servers -Version: 0.9.8.1 +Version: 0.9.8.2 Release: 1%{?dist} Group: Applications/Internet License: GPL @@ -112,6 +112,9 @@ %changelog +* Tue Mar 14 2006 Dmitry Butskoy - 0.9.8.2-1 +- update to 0.9.8.2 + * Thu Mar 2 2006 Dmitry Butskoy - 0.9.8.1-1 - upgrade to 0.9.8.1 - remove unneeded tools dir *.po files in locale dir Index: sources =================================================================== RCS file: /cvs/extras/rpms/phpldapadmin/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 2 Mar 2006 17:44:39 -0000 1.5 +++ sources 14 Mar 2006 12:28:04 -0000 1.6 @@ -1 +1 @@ -6ca00931bbbe2b4174b382e948157641 phpldapadmin-0.9.8.1.tar.gz +a83b44d90b14983b01db53ec39053a15 phpldapadmin-0.9.8.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 12:32:55 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 14 Mar 2006 07:32:55 -0500 Subject: fedora-security/audit fc4,1.171,1.172 fc5,1.79,1.80 Message-ID: <200603141232.k2ECWtse022229@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22209 Modified Files: fc4 fc5 Log Message: Note new gnupg issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.171 retrieving revision 1.172 diff -u -r1.171 -r1.172 --- fc4 9 Mar 2006 12:04:35 -0000 1.171 +++ fc4 14 Mar 2006 12:32:47 -0000 1.172 @@ -76,6 +76,7 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] patch-2.6.15.5 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) +CVE-2006-0049 version (gnupg, 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.5 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- fc5 13 Mar 2006 13:28:27 -0000 1.79 +++ fc5 14 Mar 2006 12:32:47 -0000 1.80 @@ -90,6 +90,7 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) patch-2.6.16-rc3 CVE-2006-0082 version (ImageMagick, not 6.2.5.4) +CVE-2006-0049 VULNERABLE (gnupg, fixed 1.4.2.2) CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 From fedora-extras-commits at redhat.com Tue Mar 14 12:33:31 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 14 Mar 2006 07:33:31 -0500 Subject: rpms/worminator/devel worminator.spec,1.1,1.2 Message-ID: <200603141234.k2ECY3nK022252@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22235 Modified Files: worminator.spec Log Message: * Tue Mar 14 2006 Hans de Goede 3.0R2.1-2 - move worminator data dir from /usr/share/games to just /usr/share to match the games-SIG guidelines. Sorry about the somewhat large download for effectivly no changes, but I wanted to make this change before FC5 release. Index: worminator.spec =================================================================== RCS file: /cvs/extras/rpms/worminator/devel/worminator.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- worminator.spec 6 Mar 2006 07:19:09 -0000 1.1 +++ worminator.spec 14 Mar 2006 12:33:31 -0000 1.2 @@ -1,6 +1,6 @@ Name: worminator Version: 3.0R2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Sidescrolling platform and shoot'em up action-game Group: Amusements/Games License: GPL @@ -10,7 +10,7 @@ Source2: worminator.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel, desktop-file-utils -Requires: worminator-data = 3.0R2.1 +Requires: worminator-data >= 3.0R2.1-2 %description You play as The Worminator and fight your way through many levels of madness @@ -24,7 +24,7 @@ %build gcc $RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations \ - -Wno-char-subscripts -DDATADIR=\"%{_datadir}/games/%{name}/\" -o %{name} \ + -Wno-char-subscripts -DDATADIR=\"%{_datadir}/%{name}/\" -o %{name} \ Worminator.c `allegro-config --libs` @@ -69,6 +69,11 @@ %changelog +* Tue Mar 14 2006 Hans de Goede 3.0R2.1-2 +- move worminator data dir from /usr/share/games to just /usr/share to match + the games-SIG guidelines. Sorry about the somewhat large download for + effectivly no changes, but I wanted to make this change before FC5 release. + * Sat Mar 4 2006 Hans de Goede 3.0R2.1-1 - initial Fedora Extras package - loosely based on the SRPM from Cru: From fedora-extras-commits at redhat.com Tue Mar 14 12:47:13 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 14 Mar 2006 07:47:13 -0500 Subject: fedora-security/audit fc4,1.172,1.173 fc5,1.80,1.81 Message-ID: <200603141247.k2EClDnj022342@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22320 Modified Files: fc4 fc5 Log Message: Minor fixes Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.172 retrieving revision 1.173 diff -u -r1.172 -r1.173 --- fc4 14 Mar 2006 12:32:47 -0000 1.172 +++ fc4 14 Mar 2006 12:47:06 -0000 1.173 @@ -1,5 +1,5 @@ -Up to date CVE as of CVE email 20060308 -Up to date FC4 as of 20060308 +Up to date CVE as of CVE email 20060313 +Up to date FC4 as of 20060313 ** are items that need attention @@ -9,17 +9,18 @@ CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe -CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) bz#183261 CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) CVE-2006-0746 VULNERABLE (kpdf) bz#184308 +CVE-2006-0742 VULNERABLE (kernel) CVE-2006-0741 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 version (postgresql, 8.1 only) CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107] CVE-2006-0591 version (postgresql, fixed 8.0.6) [since FEDORA-2005-021] CVE-2006-0576 VULNERABLE (oprofile) +CVE-2006-0557 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0555 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0554 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0553 version (postgresql, 8.1 only) @@ -28,6 +29,7 @@ CVE-2006-0496 VULNERABLE (firefox) CVE-2006-0482 ignore (kernel) sparc only CVE-2006-0481 version (libpng, 1.2.7 only) +CVE-2006-0459 version (flex) by inspection CVE-2006-0457 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0455 version (gnupg, fixed 1.4.2.1) [since FEDORA-2006-116] CVE-2006-0454 backport (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3 @@ -76,7 +78,8 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] patch-2.6.15.5 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) -CVE-2006-0049 version (gnupg, 1.4.2.2) [since FEDORA-2006-147] +CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] +CVE-2006-0040 VULNERABLE (gtkhtml) CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.5 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.80 retrieving revision 1.81 diff -u -r1.80 -r1.81 --- fc5 14 Mar 2006 12:32:47 -0000 1.80 +++ fc5 14 Mar 2006 12:47:06 -0000 1.81 @@ -1,4 +1,4 @@ -Up to date CVE as of CVE email 20060312 +Up to date CVE as of CVE email 20060313 Up to date FC5 as of FC5-Test3 1. Removed packages with security issues that are no longer in FC5 @@ -23,7 +23,6 @@ CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe -CVE-2006-0975 version (flex) by inspection CVE-2006-0903 VULNERABLE (mysql) low/not upstream yet CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) @@ -42,6 +41,7 @@ CVE-2006-0496 VULNERABLE (firefox) not fixed upstream CVE-2006-0482 ignore (kernel) sparc only CVE-2006-0481 version (libpng, 1.2.7 only) +CVE-2006-0459 version (flex) by inspection CVE-2006-0455 version (gnupg, fixed 1.4.2.1) CVE-2006-0454 backport (kernel, fixed 2.6.15.3) patch-2.6.16-rc3 CVE-2006-0405 version (libtiff, 3.8.0 only) From fedora-extras-commits at redhat.com Tue Mar 14 13:35:37 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 14 Mar 2006 08:35:37 -0500 Subject: rpms/worminator-data/devel worminator-data.spec,1.1,1.2 Message-ID: <200603141336.k2EDa9pW024434@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/worminator-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24417 Modified Files: worminator-data.spec Log Message: * Tue Mar 14 2006 Hans de Goede 3.0R2.1-2 - move worminator data dir from /usr/share/games to just /usr/share to match the games-SIG guidelines. Sorry about the somewhat large download for effectivly no changes, but I wanted to make this change before FC5 release. Index: worminator-data.spec =================================================================== RCS file: /cvs/extras/rpms/worminator-data/devel/worminator-data.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- worminator-data.spec 6 Mar 2006 07:16:07 -0000 1.1 +++ worminator-data.spec 14 Mar 2006 13:35:37 -0000 1.2 @@ -1,6 +1,6 @@ Name: worminator-data Version: 3.0R2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Data for worminator the game Group: Amusements/Games License: GPL @@ -29,9 +29,9 @@ %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_datadir}/games/worminator -tar xzf %{SOURCE0} -C $RPM_BUILD_ROOT%{_datadir}/games/worminator -rm $RPM_BUILD_ROOT%{_datadir}/games/worminator/ICON.ICO +mkdir -p $RPM_BUILD_ROOT%{_datadir}/worminator +tar xzf %{SOURCE0} -C $RPM_BUILD_ROOT%{_datadir}/worminator +rm $RPM_BUILD_ROOT%{_datadir}/worminator/ICON.ICO %clean @@ -41,10 +41,15 @@ %files %defattr(-,root,root) %doc license.txt license-change.txt -%{_datadir}/games/worminator +%{_datadir}/worminator %changelog +* Tue Mar 14 2006 Hans de Goede 3.0R2.1-2 +- move worminator data dir from /usr/share/games to just /usr/share to match + the games-SIG guidelines. Sorry about the somewhat large download for + effectivly no changes, but I wanted to make this change before FC5 release. + * Sat Mar 4 2006 Hans de Goede 3.0R2.1-1 - initial Fedora Extras package - loosely based on the SRPM from Cru: From fedora-extras-commits at redhat.com Tue Mar 14 14:59:13 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Tue, 14 Mar 2006 09:59:13 -0500 Subject: rpms/gpsim/devel gpsim-0.21.11.happy_gcc, NONE, 1.1 gpsim.spec, 1.5, 1.6 Message-ID: <200603141459.k2EExjBt026615@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26571 Modified Files: gpsim.spec Added Files: gpsim-0.21.11.happy_gcc Log Message: Add patch to fix a compile time error with gcc-4.1.0. --- NEW FILE gpsim-0.21.11.happy_gcc --- --- gpsim-0.21.11/src/value.h 2005-09-07 15:34:24.000000000 +0200 +++ gpsim-0.21.11.fix/src/value.h 2006-03-14 15:31:44.000000000 +0100 @@ -290,7 +290,7 @@ bool getVal() { return value; } - static Boolean* Boolean::typeCheck(Value* val, string valDesc); + static Boolean* typeCheck(Value* val, string valDesc); virtual bool compare(ComparisonOperator *compOp, Value *rvalue); virtual Value *copy() { return new Boolean(value); } @@ -353,9 +353,9 @@ virtual char *toString(char *, int len); virtual char *toBitStr(char *, int len); - static Integer* Integer::typeCheck(Value* val, string valDesc); - static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin); - static Integer* Integer::assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax); + static Integer* typeCheck(Value* val, string valDesc); + static Integer* assertValid(Value* val, string valDesc, gint64 valMin); + static Integer* assertValid(Value* val, string valDesc, gint64 valMin, gint64 valMax); virtual bool compare(ComparisonOperator *compOp, Value *rvalue); inline operator gint64() { @@ -498,7 +498,7 @@ /// copy the object value to a user char array virtual char *toString(char *, int len); - static AbstractRange* AbstractRange::typeCheck(Value* val, string valDesc); + static AbstractRange* typeCheck(Value* val, string valDesc); virtual bool compare(ComparisonOperator *compOp, Value *rvalue); private: Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gpsim.spec 13 Mar 2006 10:00:51 -0000 1.5 +++ gpsim.spec 14 Mar 2006 14:59:13 -0000 1.6 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.21.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -8,6 +8,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk+extra-devel, flex, readline-devel @@ -43,6 +44,7 @@ %prep %setup -q +%patch -p1 %{__chmod} a-x examples/12bit/p12x.inc examples/14bit/sine.asm %build @@ -78,6 +80,9 @@ %{_includedir}/* %changelog +* Tue Mar 14 2006 Alain Portal 0.21.11-4 + - Patch to make gcc-4.1.0 happy + * Mon Mar 13 2006 Alain Portal 0.21.11-3 - Rebuild for FE5 From fedora-extras-commits at redhat.com Tue Mar 14 15:05:44 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 10:05:44 -0500 Subject: rpms/hercules/devel .cvsignore, 1.3, 1.4 hercules.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200603141506.k2EF6I8b028668@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/hercules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28619 Modified Files: .cvsignore hercules.spec sources Log Message: Upate to 3.03.1, then 3.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 25 Jan 2005 14:27:55 -0000 1.3 +++ .cvsignore 14 Mar 2006 15:05:31 -0000 1.4 @@ -1 +1 @@ -hercules-3.02.tar.gz +hercules-3.04.tar.gz Index: hercules.spec =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/hercules.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hercules.spec 23 May 2005 10:41:05 -0000 1.8 +++ hercules.spec 14 Mar 2006 15:05:31 -0000 1.9 @@ -2,8 +2,8 @@ Summary: Hercules S/370, ESA/390, and z/Architecture emulator Name: hercules -Version: 3.02 -Release: %{?date:0.%{date}.}3 +Version: 3.04 +Release: 1%{?date:.%{date}} License: QPL Group: Applications/Emulators URL: http://www.conmicro.cx/hercules/ @@ -20,12 +20,13 @@ card reader, card punch, channel-to-channel adapter, LCS Ethernet, and printer-keyboard, 3270 terminal, and 3287 printer devices. + %prep %setup -n %{name}-%{version}%{?date:-cvs} ### FIXME: Make buildsystem use standard autotools directories (Fix upstream please) %{__perl} -pi.orig -e 's|^(modexecdir) =.*$|$1 = \$(libdir)/hercules|' \ - Makefile.in crypto/Makefile.in + Makefile.in crypto/Makefile.in %{__mv} hercules.cnf hercules.cnf.sample %{__cat} <hercules.cnf @@ -98,13 +99,13 @@ unset LANG LC_COLLATE if [ `id -u` != 0 ]; then - echo "This script requires root permissions." - exit 1 + echo "This script requires root permissions." + exit 1 fi lsmod | grep -q ipchains && { - echo "ipchains module is already loaded, cannot setup iptables." - exit 1 + echo "ipchains module is already loaded, cannot setup iptables." + exit 1 } ### This device must be present for hercules to setup networking. @@ -116,7 +117,7 @@ ### Enable IP forwarding, you can permanently change this in in ### /etc/sysctl.conf with "net.ipv4.ip_forward = 1". -echo "1" >/proc/sys/net/ipv4/ip_forward +echo "1" > /proc/sys/net/ipv4/ip_forward ### Masquerade the hercules network. iptables -t nat -A POSTROUTING -s ${HERCNET} -j MASQUERADE @@ -142,12 +143,14 @@ EOT EOF + %build %configure \ - --enable-dependency-tracking \ - --enable-optimization="%{optflags}" + --enable-dependency-tracking \ + --enable-optimization="%{optflags}" %{__make} %{?_smp_mflags} + %install %{__rm} -rf %{buildroot} %makeinstall @@ -157,6 +160,7 @@ %{__install} -m0644 hercules.cnf hercules.{ins,prm,tdf} \ %{buildroot}%{_sysconfdir}/hercules/ + %clean %{__rm} -rf %{buildroot} @@ -173,7 +177,14 @@ %exclude %{_libdir}/*.la %{_mandir}/man?/* + %changelog +* Tue Mar 14 2006 Matthias Saou 3.04-1 +- Update to 3.04. + +* Thu Feb 9 2006 Matthias Saou 3.03.1-1 +- Update to 3.03.1. + * Sun May 22 2005 Jeremy Katz - 3.02-3 - rebuild on all arches Index: sources =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 25 Jan 2005 14:27:55 -0000 1.3 +++ sources 14 Mar 2006 15:05:31 -0000 1.4 @@ -1 +1 @@ -d765ad315a1eba281bd816e63d854dc5 hercules-3.02.tar.gz +7c7df7d52bf0365d5cbe051dc9e2e481 hercules-3.04.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 15:23:38 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 14 Mar 2006 10:23:38 -0500 Subject: rpms/deskbar-applet/devel deskbar-applet.spec, 1.20, 1.21 fedorabz.py, 1.6, 1.7 Message-ID: <200603141524.k2EFOAuJ028861@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/deskbar-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28835 Modified Files: deskbar-applet.spec fedorabz.py Log Message: Fixed bug in Fedora Bugzilla handler (#184231) Index: deskbar-applet.spec =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- deskbar-applet.spec 13 Mar 2006 05:49:42 -0000 1.20 +++ deskbar-applet.spec 14 Mar 2006 15:23:37 -0000 1.21 @@ -3,7 +3,7 @@ Name: deskbar-applet Version: 2.14.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Gnome applet to allow easy access to various search engines Group: Applications/Internet @@ -84,6 +84,9 @@ %{_datadir}/pixmaps/%{name}.svg %changelog +* Tue Mar 14 2006 Ignacio Vazquez-Abrams 2.14.0-2 +- Fixed bug in Fedora Bugzilla handler (#184231) + * Sun Mar 12 2006 Ignacio Vazquez-Abrams 2.14.0-1 - Upstream update Index: fedorabz.py =================================================================== RCS file: /cvs/extras/rpms/deskbar-applet/devel/fedorabz.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fedorabz.py 3 Feb 2006 00:13:25 -0000 1.6 +++ fedorabz.py 14 Mar 2006 15:23:37 -0000 1.7 @@ -32,3 +32,5 @@ def query(self, query, max=5): if query.isdigit(): return [FedoraBZMatch(self, name=query)] + else: + return [] From fedora-extras-commits at redhat.com Tue Mar 14 15:27:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 10:27:30 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-4 .cvsignore, 1.11, 1.12 perl-ExtUtils-CBuilder.spec, 1.15, 1.16 sources, 1.11, 1.12 Message-ID: <200603141528.k2EFS23F028946@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28908/FC-4 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.16. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 6 Oct 2005 22:02:26 -0000 1.11 +++ .cvsignore 14 Mar 2006 15:27:29 -0000 1.12 @@ -1 +1 @@ -ExtUtils-CBuilder-0.15.tar.gz +ExtUtils-CBuilder-0.16.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-ExtUtils-CBuilder.spec 6 Oct 2005 22:02:26 -0000 1.15 +++ perl-ExtUtils-CBuilder.spec 14 Mar 2006 15:27:29 -0000 1.16 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.15 +Version: 0.16 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -11,7 +11,7 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module can build the C portions of Perl modules by invoking the @@ -53,6 +53,12 @@ %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 0.16-1 +- Update to 0.16. + +* Wed Feb 15 2006 Jose Pedro Oliveira - 0.15-2 +- Rebuild for FC5 (perl 5.8.8). + * Thu Oct 6 2005 Jose Pedro Oliveira - 0.15-1 - Update 0.15. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 6 Oct 2005 22:02:26 -0000 1.11 +++ sources 14 Mar 2006 15:27:29 -0000 1.12 @@ -1 +1 @@ -f104f2221f43c27c3b164ce94e138b97 ExtUtils-CBuilder-0.15.tar.gz +3436fdd2b13cabb95a59df5e699fa6f3 ExtUtils-CBuilder-0.16.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 15:27:35 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 10:27:35 -0500 Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.11, 1.12 perl-ExtUtils-CBuilder.spec, 1.16, 1.17 sources, 1.11, 1.12 Message-ID: <200603141528.k2EFS8wJ028951@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28908/devel Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.16. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 6 Oct 2005 21:53:05 -0000 1.11 +++ .cvsignore 14 Mar 2006 15:27:35 -0000 1.12 @@ -1 +1 @@ -ExtUtils-CBuilder-0.15.tar.gz +ExtUtils-CBuilder-0.16.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-ExtUtils-CBuilder.spec 15 Feb 2006 18:00:57 -0000 1.16 +++ perl-ExtUtils-CBuilder.spec 14 Mar 2006 15:27:35 -0000 1.17 @@ -1,6 +1,6 @@ Name: perl-ExtUtils-CBuilder -Version: 0.15 -Release: 2%{?dist} +Version: 0.16 +Release: 1%{?dist} Summary: Compile and link C code for Perl modules Group: Development/Libraries @@ -53,6 +53,9 @@ %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 0.16-1 +- Update to 0.16. + * Wed Feb 15 2006 Jose Pedro Oliveira - 0.15-2 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 6 Oct 2005 21:53:05 -0000 1.11 +++ sources 14 Mar 2006 15:27:35 -0000 1.12 @@ -1 +1 @@ -f104f2221f43c27c3b164ce94e138b97 ExtUtils-CBuilder-0.15.tar.gz +3436fdd2b13cabb95a59df5e699fa6f3 ExtUtils-CBuilder-0.16.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 15:57:33 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 10:57:33 -0500 Subject: rpms/multitail/FC-4 .cvsignore, 1.2, 1.3 multitail.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603141558.k2EFw55X029329@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29291/FC-4 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 3.8.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Mar 2006 21:09:47 -0000 1.2 +++ .cvsignore 14 Mar 2006 15:57:33 -0000 1.3 @@ -1 +1 @@ -multitail-3.8.7.tgz +multitail-3.8.9.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/multitail.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multitail.spec 8 Mar 2006 21:09:47 -0000 1.1 +++ multitail.spec 14 Mar 2006 15:57:33 -0000 1.2 @@ -1,6 +1,6 @@ Name: multitail -Version: 3.8.7 -Release: 3%{?dist} +Version: 3.8.9 +Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows Group: Applications/Text @@ -52,6 +52,9 @@ %{_bindir}/multitail %changelog +* Tue Mar 14 2006 Folkert van Heuesden - 3.8.9-1 +- Updated to release 3.8.9. + * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7-3 - Small changes as suggested in #182122. - Updated to release 3.8.7-3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Mar 2006 21:09:47 -0000 1.2 +++ sources 14 Mar 2006 15:57:33 -0000 1.3 @@ -1 +1 @@ -b216c9e0d598e3e048b2c6738a54ba08 multitail-3.8.7.tgz +feac6869ddb5ee974abbe52a0130af7e multitail-3.8.9.tgz From fedora-extras-commits at redhat.com Tue Mar 14 15:57:39 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 10:57:39 -0500 Subject: rpms/multitail/devel .cvsignore, 1.2, 1.3 multitail.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603141558.k2EFwBWe029334@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29291/devel Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 3.8.9. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Mar 2006 21:09:47 -0000 1.2 +++ .cvsignore 14 Mar 2006 15:57:38 -0000 1.3 @@ -1 +1 @@ -multitail-3.8.7.tgz +multitail-3.8.9.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multitail.spec 8 Mar 2006 21:09:47 -0000 1.1 +++ multitail.spec 14 Mar 2006 15:57:38 -0000 1.2 @@ -1,6 +1,6 @@ Name: multitail -Version: 3.8.7 -Release: 3%{?dist} +Version: 3.8.9 +Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows Group: Applications/Text @@ -52,6 +52,9 @@ %{_bindir}/multitail %changelog +* Tue Mar 14 2006 Folkert van Heuesden - 3.8.9-1 +- Updated to release 3.8.9. + * Thu Feb 23 2006 Udo van den Heuvel - 3.8.7-3 - Small changes as suggested in #182122. - Updated to release 3.8.7-3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Mar 2006 21:09:47 -0000 1.2 +++ sources 14 Mar 2006 15:57:38 -0000 1.3 @@ -1 +1 @@ -b216c9e0d598e3e048b2c6738a54ba08 multitail-3.8.7.tgz +feac6869ddb5ee974abbe52a0130af7e multitail-3.8.9.tgz From fedora-extras-commits at redhat.com Tue Mar 14 16:30:39 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 14 Mar 2006 11:30:39 -0500 Subject: rpms/d4x/devel d4x.spec,1.10,1.11 Message-ID: <200603141631.k2EGVCci031839@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/d4x/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31819 Modified Files: d4x.spec Log Message: FC5 rebuild (and modular X support). Index: d4x.spec =================================================================== RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- d4x.spec 2 Nov 2005 13:11:56 -0000 1.10 +++ d4x.spec 14 Mar 2006 16:30:39 -0000 1.11 @@ -4,7 +4,7 @@ Summary: Downloader for X that supports resuming and many other features Name: d4x Version: 2.5.6 -Release: 1%{?pre:.%{pre}}%{?dist} +Release: 2%{?pre:.%{pre}}%{?dist} Group: Applications/Internet License: Artistic URL: http://www.krasu.ru/soft/chuchelo/ @@ -12,6 +12,10 @@ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel BuildRequires: libao-devel, esound-devel, desktop-file-utils, openssl-devel +# Use modular X for FC5+ and non-Fedora +%if %{!?fedora:5}%{?fedora} >= 5 +BuildRequires: libXt-devel +%endif %description This program lets you download files from the internet using either the ftp @@ -66,6 +70,11 @@ %changelog +* Tue Mar 14 2006 Matthias Saou 2.5.6-2 +- FC5 rebuild... the build error that kept this rebuild pending was only X + not being detected by configure (libXt-devel missing) that was not making + configure exit... because make then failed miserably. + * Wed Nov 2 2005 Matthias Saou 2.5.6-1 - Update to 2.5.6. From fedora-extras-commits at redhat.com Tue Mar 14 16:39:55 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 14 Mar 2006 11:39:55 -0500 Subject: rpms/uudeview/devel uudeview.spec,1.9,1.10 Message-ID: <200603141640.k2EGeRMr031941@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/uudeview/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31922 Modified Files: uudeview.spec Log Message: * Mon Mar 13 2006 Adrian Reber - 0.5.20-8 - make it also build on x86_64 Index: uudeview.spec =================================================================== RCS file: /cvs/extras/rpms/uudeview/devel/uudeview.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- uudeview.spec 14 Mar 2006 04:04:19 -0000 1.9 +++ uudeview.spec 14 Mar 2006 16:39:55 -0000 1.10 @@ -1,6 +1,6 @@ Name: uudeview Version: 0.5.20 -Release: 7 +Release: 8 License: GPL Group: Applications/File @@ -39,6 +39,7 @@ %patch0 -p1 %patch1 -p0 %{__sed} -i -e "s,psfig,epsfig,g" doc/library.ltx +%{__sed} -i -e "s,for ff_subdir in lib,for ff_subdir in %{_lib},g" configure %build %configure --enable-sendmail=%{_sbindir}/sendmail @@ -82,6 +83,9 @@ %{_libdir}/*.a %changelog +* Mon Mar 13 2006 Adrian Reber - 0.5.20-8 +- make it also build on x86_64 + * Mon Mar 13 2006 Adrian Reber - 0.5.20-7 - rebuilt From fedora-extras-commits at redhat.com Tue Mar 14 16:57:32 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 14 Mar 2006 11:57:32 -0500 Subject: rpms/banshee/devel .cvsignore, 1.3, 1.4 banshee.spec, 1.5, 1.6 sources, 1.3, 1.4 banshee-0.10.7-dll-path.patch, 1.1, NONE Message-ID: <200603141658.k2EGw4sI032029@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32008 Modified Files: .cvsignore banshee.spec sources Removed Files: banshee-0.10.7-dll-path.patch Log Message: * Tue Mar 14 2006 Christopher Aillon 0.10.8-1 - Update to 0.10.8 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 7 Mar 2006 19:57:34 -0000 1.3 +++ .cvsignore 14 Mar 2006 16:57:31 -0000 1.4 @@ -1 +1 @@ -banshee-0.10.7.tar.gz +banshee-0.10.8.tar.gz Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- banshee.spec 9 Mar 2006 18:22:51 -0000 1.5 +++ banshee.spec 14 Mar 2006 16:57:31 -0000 1.6 @@ -1,6 +1,6 @@ Name: banshee -Version: 0.10.7 -Release: 2 +Version: 0.10.8 +Release: 1 Summary: easily import, manage, and play selections from your music collection Group: Applications/Multimedia @@ -29,8 +29,6 @@ Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -Patch1: banshee-0.10.7-dll-path.patch - %description Banshee allows you to import CDs, sync your music collection to an iPod, play music directly from an iPod, create playlists with songs from your @@ -38,7 +36,6 @@ %prep %setup -q -%patch1 -p1 -b .dll-path %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} @@ -99,6 +96,9 @@ %exclude %{_libdir}/banshee/*.la %changelog +* Tue Mar 14 2006 Christopher Aillon 0.10.8-1 +- Update to 0.10.8 + * Thu Mar 9 2006 Christopher Aillon 0.10.7-2 - Add explicit Requires on libipoddevice (#184482) Index: sources =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 7 Mar 2006 19:57:34 -0000 1.3 +++ sources 14 Mar 2006 16:57:31 -0000 1.4 @@ -1 +1 @@ -cae68ff23077f4ec37ab23b040c2470a banshee-0.10.7.tar.gz +cfa4051cd8aba171a09dcb9a3f34fef3 banshee-0.10.8.tar.gz --- banshee-0.10.7-dll-path.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 14 17:21:16 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Tue, 14 Mar 2006 12:21:16 -0500 Subject: rpms/gpsim/devel gpsim-0.21.11.happy_gcc,1.1,1.2 Message-ID: <200603141721.k2EHLpb0001953@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1934 Modified Files: gpsim-0.21.11.happy_gcc Log Message: Update patch. Index: gpsim-0.21.11.happy_gcc =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim-0.21.11.happy_gcc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gpsim-0.21.11.happy_gcc 14 Mar 2006 14:59:13 -0000 1.1 +++ gpsim-0.21.11.happy_gcc 14 Mar 2006 17:21:15 -0000 1.2 @@ -1,3 +1,16 @@ +diff -ru gpsim-0.21.11/cli/ui_gpsim.cc gpsim-0.21.11.fix/cli/ui_gpsim.cc +--- gpsim-0.21.11/cli/ui_gpsim.cc 2005-09-24 05:59:20.000000000 +0200 ++++ gpsim-0.21.11.fix/cli/ui_gpsim.cc 2006-03-14 18:34:12.000000000 +0100 +@@ -34,7 +34,7 @@ + CGpsimUserInterface(const char *paStrings[]); + virtual ~CGpsimUserInterface() {} + +- void CGpsimUserInterface::SetStreams(FILE *in, FILE *out); ++ void SetStreams(FILE *in, FILE *out); + virtual ISimConsole &GetConsole(); + virtual void DisplayMessage(unsigned int uStringID, ...); + virtual void DisplayMessage(FILE * pOut, unsigned int uStringID, ...); +diff -ru gpsim-0.21.11/src/value.h gpsim-0.21.11.fix/src/value.h --- gpsim-0.21.11/src/value.h 2005-09-07 15:34:24.000000000 +0200 +++ gpsim-0.21.11.fix/src/value.h 2006-03-14 15:31:44.000000000 +0100 @@ -290,7 +290,7 @@ From fedora-extras-commits at redhat.com Tue Mar 14 17:37:49 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Tue, 14 Mar 2006 12:37:49 -0500 Subject: rpms/denyhosts/devel .cvsignore, 1.16, 1.17 denyhosts.spec, 1.26, 1.27 sources, 1.16, 1.17 Message-ID: <200603141738.k2EHcLdD002176@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2155 Modified Files: .cvsignore denyhosts.spec sources Log Message: * Tue Mar 14 2006 Jason L Tibbitts III - 2.2-1 - Update to 2.2. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 10 Feb 2006 18:45:54 -0000 1.16 +++ .cvsignore 14 Mar 2006 17:37:48 -0000 1.17 @@ -1 +1 @@ -DenyHosts-2.1.tar.gz +DenyHosts-2.2.tar.gz Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- denyhosts.spec 28 Feb 2006 15:04:19 -0000 1.26 +++ denyhosts.spec 14 Mar 2006 17:37:48 -0000 1.27 @@ -1,6 +1,6 @@ Name: denyhosts -Version: 2.1 -release: 2%{?dist} +Version: 2.2 +release: 1%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -142,6 +142,9 @@ %changelog +* Tue Mar 14 2006 Jason L Tibbitts III - 2.2-1 +- Update to 2.2. + * Tue Feb 28 2006 Jason L Tibbitts III - 2.1-2 - Add some additional ghosted files. Index: sources =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 10 Feb 2006 18:45:54 -0000 1.16 +++ sources 14 Mar 2006 17:37:48 -0000 1.17 @@ -1 +1 @@ -1c40bda86884901f125bfbce3d8c35cb DenyHosts-2.1.tar.gz +feba0e9a48dbf1fa9cbd2b5b8907f349 DenyHosts-2.2.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 18:05:05 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:05:05 -0500 Subject: rpms/freedoom - New directory Message-ID: <200603141805.k2EI57of004261@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4253/freedoom Log Message: Directory /cvs/extras/rpms/freedoom added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 18:05:23 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:05:23 -0500 Subject: rpms/freedoom/devel - New directory Message-ID: <200603141805.k2EI5Pt3004279@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4253/freedoom/devel Log Message: Directory /cvs/extras/rpms/freedoom/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 18:05:36 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:05:36 -0500 Subject: rpms/freedoom Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603141805.k2EI5cti004314@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4301 Added Files: Makefile import.log Log Message: Setup of module freedoom --- NEW FILE Makefile --- # Top level Makefile for module freedoom all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 14 18:05:55 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:05:55 -0500 Subject: rpms/freedoom/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603141805.k2EI5vPt004339@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4301/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module freedoom --- NEW 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 Mar 14 18:11:19 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:11:19 -0500 Subject: rpms/freedoom import.log,1.1,1.2 Message-ID: <200603141811.k2EIBqC3004456@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4420 Modified Files: import.log Log Message: auto-import freedoom-0.4.1-3 on branch devel from freedoom-0.4.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/freedoom/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Mar 2006 18:05:36 -0000 1.1 +++ import.log 14 Mar 2006 18:11:19 -0000 1.2 @@ -0,0 +1 @@ +freedoom-0_4_1-3:HEAD:freedoom-0.4.1-3.src.rpm:1142359875 From fedora-extras-commits at redhat.com Tue Mar 14 18:11:27 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 13:11:27 -0500 Subject: rpms/freedoom/devel freedoom.desktop, NONE, 1.1 freedoom.png, NONE, 1.1 freedoom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603141812.k2EICLWW004460@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedoom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4420/devel Modified Files: .cvsignore sources Added Files: freedoom.desktop freedoom.png freedoom.spec Log Message: auto-import freedoom-0.4.1-3 on branch devel from freedoom-0.4.1-3.src.rpm --- NEW FILE freedoom.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Freedoom GenericName=Free Doom Comment=A new set of Doom levels Exec=prboom -iwad /usr/share/doom/freedoom.wad Icon=freedoom.png Terminal=false Type=Application Categories=Application;Game; Version=0.4.1 --- NEW FILE freedoom.spec --- %define waddir %{_datadir}/doom Name: freedoom Version: 0.4.1 Release: 3%{?dist} Summary: Replacement game files for doom game engines Group: Amusements/Games License: BSD URL: http://freedoom.sourceforge.net Source0: http://dl.sourceforge.net/sourceforge/freedoom/freedoom-iwad-%{version}.zip Source1: freedoom.desktop Source2: freedoom.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: desktop-file-utils Requires: prboom %description A set of game resources for the DOOM game engine. While the Doom source code is Free, you currently still need one of the proprietary IWAD files from id in order to play Doom. Freedoom aims to create a Free alternative. Combined with the GPL-licensed Doom source code this will result in a completely Free Doom-based game. %prep %setup -q -n freedoom-iwad-%{version} %build # Game data files. Nothing to build! %install rm -rf $RPM_BUILD_ROOT install -pD -m 0644 doom2.wad $RPM_BUILD_ROOT/%{waddir}/freedoom.wad desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %{waddir}/%{name}.wad %{_datadir}/applications/*.desktop %{_datadir}/icons/hicolor/48x48/apps/*.png %doc README COPYING CREDITS NEWS %changelog * Tue Mar 14 2006 Wart 0.4.1-3 - Use correct License: tag. - Remove unnecessary comment. * Mon Mar 13 2006 Wart 0.4.1-2 - Install wad in new location (see discussion on bz #185211) * Sat Mar 11 2006 Wart 0.4.1-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/freedoom/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Mar 2006 18:05:55 -0000 1.1 +++ .cvsignore 14 Mar 2006 18:11:27 -0000 1.2 @@ -0,0 +1 @@ +freedoom-iwad-0.4.1.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/freedoom/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Mar 2006 18:05:55 -0000 1.1 +++ sources 14 Mar 2006 18:11:27 -0000 1.2 @@ -0,0 +1 @@ +ff53600885f09d0335bbdcd574df30c3 freedoom-iwad-0.4.1.zip From fedora-extras-commits at redhat.com Tue Mar 14 18:32:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 13:32:21 -0500 Subject: rpms/perl-Glib/devel .cvsignore, 1.10, 1.11 perl-Glib.spec, 1.15, 1.16 sources, 1.10, 1.11 Message-ID: <200603141832.k2EIWrZd004708@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Glib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4687 Modified Files: .cvsignore perl-Glib.spec sources Log Message: Update to 1.120. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 13 Feb 2006 20:31:13 -0000 1.10 +++ .cvsignore 14 Mar 2006 18:32:21 -0000 1.11 @@ -1 +1 @@ -Glib-1.105.tar.gz +Glib-1.120.tar.gz Index: perl-Glib.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/devel/perl-Glib.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Glib.spec 13 Feb 2006 20:33:36 -0000 1.15 +++ perl-Glib.spec 14 Mar 2006 18:32:21 -0000 1.16 @@ -1,6 +1,6 @@ Name: perl-Glib -Version: 1.105 -Release: 2%{?dist} +Version: 1.120 +Release: 1%{?dist} Summary: Perl interface to GLib Group: Development/Libraries @@ -59,13 +59,16 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog LICENSE NEWS README README.api-changes TODO +%doc AUTHORS ChangeLog LICENSE NEWS README TODO %{perl_vendorarch}/auto/Glib/ %{perl_vendorarch}/Glib* %{_mandir}/man3/*.3* %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 1.120-1 +- Update to 1.120. + * Mon Feb 13 2006 Jose Pedro Oliveira - 1.105-2 - make tag problem. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 13 Feb 2006 20:31:13 -0000 1.10 +++ sources 14 Mar 2006 18:32:21 -0000 1.11 @@ -1 +1 @@ -b3ab8094fb83d0931e4042f2f6704342 Glib-1.105.tar.gz +639d22451339e07844e6be3b5e345959 Glib-1.120.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 19:16:53 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Tue, 14 Mar 2006 14:16:53 -0500 Subject: rpms/perl-Gtk2/devel .cvsignore, 1.11, 1.12 perl-Gtk2.spec, 1.15, 1.16 sources, 1.11, 1.12 Message-ID: <200603141917.k2EJHPV4006824@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6803 Modified Files: .cvsignore perl-Gtk2.spec sources Log Message: Update to 1.120. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 20 Feb 2006 20:08:29 -0000 1.11 +++ .cvsignore 14 Mar 2006 19:16:52 -0000 1.12 @@ -1 +1 @@ -Gtk2-1.104.tar.gz +Gtk2-1.120.tar.gz Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-Gtk2.spec 20 Feb 2006 20:08:29 -0000 1.15 +++ perl-Gtk2.spec 14 Mar 2006 19:16:52 -0000 1.16 @@ -5,7 +5,7 @@ # Name: perl-Gtk2 -Version: 1.104 +Version: 1.120 Release: 1%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library @@ -16,9 +16,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 2:5.8.0 -BuildRequires: gtk2-devel, perl-Glib >= 1.105 +BuildRequires: gtk2-devel, perl-Glib >= 1.120 BuildRequires: perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig) -Requires: perl-Glib >= 1.105 +Requires: perl-Glib >= 1.120 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -75,6 +75,9 @@ %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 1.120-1 +- Update to 1.120. + * Mon Feb 20 2006 Jose Pedro Oliveira - 1.104-1 - Update to 1.104. - Requires perl(Glib) >= 1.105 (1.104 had problems with perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 20 Feb 2006 20:08:29 -0000 1.11 +++ sources 14 Mar 2006 19:16:52 -0000 1.12 @@ -1 +1 @@ -89bb024113a12f233094dd32ac0be462 Gtk2-1.104.tar.gz +3d0eef4271bd624b284f9a23f4bdbb96 Gtk2-1.120.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 19:28:43 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:28:43 -0500 Subject: rpms/prboom - New directory Message-ID: <200603141928.k2EJSjRr007008@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997/prboom Log Message: Directory /cvs/extras/rpms/prboom added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 19:28:49 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:28:49 -0500 Subject: rpms/prboom/devel - New directory Message-ID: <200603141928.k2EJSpu9007023@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6997/prboom/devel Log Message: Directory /cvs/extras/rpms/prboom/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 14 19:29:02 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:29:02 -0500 Subject: rpms/prboom Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603141929.k2EJT4lH007057@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7045 Added Files: Makefile import.log Log Message: Setup of module prboom --- NEW FILE Makefile --- # Top level Makefile for module prboom all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 14 19:29:08 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:29:08 -0500 Subject: rpms/prboom/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603141929.k2EJTAi4007077@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7045/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module prboom --- NEW 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 Mar 14 19:30:04 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:30:04 -0500 Subject: rpms/prboom import.log,1.1,1.2 Message-ID: <200603141930.k2EJUdNZ007185@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7137 Modified Files: import.log Log Message: auto-import prboom-2.3.1-4 on branch devel from prboom-2.3.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/prboom/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 14 Mar 2006 19:29:02 -0000 1.1 +++ import.log 14 Mar 2006 19:30:04 -0000 1.2 @@ -0,0 +1 @@ +prboom-2_3_1-4:HEAD:prboom-2.3.1-4.src.rpm:1142364598 From fedora-extras-commits at redhat.com Tue Mar 14 19:30:10 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:30:10 -0500 Subject: rpms/prboom/devel prboom-2.3.1-64bit.patch, NONE, 1.1 prboom-2.3.1-config.patch, NONE, 1.1 prboom-2.3.1-gamedir.patch, NONE, 1.1 prboom-2.3.1-gcc4.patch, NONE, 1.1 prboom.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603141930.k2EJUg1V007189@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7137/devel Modified Files: .cvsignore sources Added Files: prboom-2.3.1-64bit.patch prboom-2.3.1-config.patch prboom-2.3.1-gamedir.patch prboom-2.3.1-gcc4.patch prboom.spec Log Message: auto-import prboom-2.3.1-4 on branch devel from prboom-2.3.1-4.src.rpm prboom-2.3.1-64bit.patch: --- NEW FILE prboom-2.3.1-64bit.patch --- diff -ur prboom-2.3.1.orig/src/d_main.c prboom-2.3.1/src/d_main.c --- prboom-2.3.1.orig/src/d_main.c 2006-03-12 10:53:56.000000000 +0100 +++ prboom-2.3.1/src/d_main.c 2006-03-12 10:37:27.000000000 +0100 @@ -1719,13 +1719,21 @@ { // for statistics driver extern void* statcopy; + void *orig_statcopy = statcopy; + char *check; // killough 5/2/98: this takes a memory // address as an integer on the command line! - statcopy = (void*) atoi(myargv[p+1]); - //jff 9/3/98 use logical output routine - lprintf (LO_CONFIRM,"External statistics registered.\n"); + // HDG 11/3/2006: UGLY! Fixed to use strtoul, so this has + // atleast a chance to work on 64 bit. + statcopy = (void*) strtoul(myargv[p+1], &check, 0); + if (*check == '\0') + //jff 9/3/98 use logical output routine + lprintf (LO_CONFIRM,"External statistics registered.\n"); + else + // we should report an error here I Guess + statcopy = orig_statcopy; } // sf: -blockmap option as a variable now Only in prboom-2.3.1/src: d_main.c~ diff -ur prboom-2.3.1.orig/src/doomdata.h prboom-2.3.1/src/doomdata.h --- prboom-2.3.1.orig/src/doomdata.h 2004-09-15 21:09:42.000000000 +0200 +++ prboom-2.3.1/src/doomdata.h 2006-03-12 10:53:43.000000000 +0100 @@ -82,9 +82,9 @@ typedef struct { short textureoffset GCC_PACKED; short rowoffset GCC_PACKED; - char toptexture[8] GCC_PACKED; - char bottomtexture[8] GCC_PACKED; - char midtexture[8] GCC_PACKED; + char toptexture[8] /* GCC_PACKED */; + char bottomtexture[8] /* GCC_PACKED */; + char midtexture[8] /* GCC_PACKED */; short sector GCC_PACKED; // Front sector, towards viewer. } GCC_PACKED mapsidedef_t; @@ -147,8 +147,8 @@ typedef struct { short floorheight GCC_PACKED; short ceilingheight GCC_PACKED; - char floorpic[8] GCC_PACKED; - char ceilingpic[8] GCC_PACKED; + char floorpic[8] /* GCC_PACKED */; + char ceilingpic[8] /* GCC_PACKED */; short lightlevel GCC_PACKED; short special GCC_PACKED; short tag GCC_PACKED; Only in prboom-2.3.1/src: doomdata.h~ diff -ur prboom-2.3.1.orig/src/p_saveg.c prboom-2.3.1/src/p_saveg.c --- prboom-2.3.1.orig/src/p_saveg.c 2004-09-15 21:09:45.000000000 +0200 +++ prboom-2.3.1/src/p_saveg.c 2006-03-12 10:44:33.000000000 +0100 @@ -45,7 +45,7 @@ // Pads save_p to a 4-byte boundary // so that the load/save works on SGI&Gecko. -#define PADSAVEP() do { save_p += (4 - ((int) save_p & 3)) & 3; } while (0) +#define PADSAVEP() do { save_p += (4 - ((long) save_p & 3)) & 3; } while (0) // // P_ArchivePlayers // @@ -95,7 +95,7 @@ for (j=0 ; jnext) if (th->function == P_MobjThinker) - th->prev = (thinker_t *) ++number_of_thinkers; + th->prev = (thinker_t *)(long) ++number_of_thinkers; } // phares 9/13/98: Moved this code outside of P_ArchiveThinkers so the @@ -436,10 +436,10 @@ PADSAVEP(); memcpy (mobj, save_p, sizeof(mobj_t)); save_p += sizeof(mobj_t); - mobj->state = states + (int) mobj->state; + mobj->state = states + (long) mobj->state; if (mobj->player) - (mobj->player = &players[(int) mobj->player - 1]) -> mo = mobj; + (mobj->player = &players[(long) mobj->player - 1]) -> mo = mobj; P_SetThingPosition (mobj); mobj->info = &mobjinfo[mobj->type]; @@ -746,7 +746,7 @@ ceiling_t *ceiling = Z_Malloc (sizeof(*ceiling), PU_LEVEL, NULL); memcpy (ceiling, save_p, sizeof(*ceiling)); save_p += sizeof(*ceiling); - ceiling->sector = §ors[(int)ceiling->sector]; + ceiling->sector = §ors[(long)ceiling->sector]; ceiling->sector->ceilingdata = ceiling; //jff 2/22/98 if (ceiling->thinker.function) @@ -763,10 +763,10 @@ vldoor_t *door = Z_Malloc (sizeof(*door), PU_LEVEL, NULL); memcpy (door, save_p, sizeof(*door)); save_p += sizeof(*door); - door->sector = §ors[(int)door->sector]; + door->sector = §ors[(long)door->sector]; //jff 1/31/98 unarchive line remembered by door as well - door->line = (int)door->line!=-1? &lines[(int)door->line] : NULL; + door->line = (long)door->line!=-1? &lines[(long)door->line] : NULL; door->sector->ceilingdata = door; //jff 2/22/98 door->thinker.function = T_VerticalDoor; @@ -780,7 +780,7 @@ floormove_t *floor = Z_Malloc (sizeof(*floor), PU_LEVEL, NULL); memcpy (floor, save_p, sizeof(*floor)); save_p += sizeof(*floor); - floor->sector = §ors[(int)floor->sector]; + floor->sector = §ors[(long)floor->sector]; floor->sector->floordata = floor; //jff 2/22/98 floor->thinker.function = T_MoveFloor; P_AddThinker (&floor->thinker); @@ -793,7 +793,7 @@ plat_t *plat = Z_Malloc (sizeof(*plat), PU_LEVEL, NULL); memcpy (plat, save_p, sizeof(*plat)); save_p += sizeof(*plat); - plat->sector = §ors[(int)plat->sector]; + plat->sector = §ors[(long)plat->sector]; plat->sector->floordata = plat; //jff 2/22/98 if (plat->thinker.function) @@ -810,7 +810,7 @@ lightflash_t *flash = Z_Malloc (sizeof(*flash), PU_LEVEL, NULL); memcpy (flash, save_p, sizeof(*flash)); save_p += sizeof(*flash); - flash->sector = §ors[(int)flash->sector]; + flash->sector = §ors[(long)flash->sector]; flash->thinker.function = T_LightFlash; P_AddThinker (&flash->thinker); break; @@ -822,7 +822,7 @@ strobe_t *strobe = Z_Malloc (sizeof(*strobe), PU_LEVEL, NULL); memcpy (strobe, save_p, sizeof(*strobe)); save_p += sizeof(*strobe); - strobe->sector = §ors[(int)strobe->sector]; + strobe->sector = §ors[(long)strobe->sector]; strobe->thinker.function = T_StrobeFlash; P_AddThinker (&strobe->thinker); break; @@ -834,7 +834,7 @@ glow_t *glow = Z_Malloc (sizeof(*glow), PU_LEVEL, NULL); memcpy (glow, save_p, sizeof(*glow)); save_p += sizeof(*glow); - glow->sector = §ors[(int)glow->sector]; + glow->sector = §ors[(long)glow->sector]; glow->thinker.function = T_Glow; P_AddThinker (&glow->thinker); break; @@ -846,7 +846,7 @@ fireflicker_t *flicker = Z_Malloc (sizeof(*flicker), PU_LEVEL, NULL); memcpy (flicker, save_p, sizeof(*flicker)); save_p += sizeof(*flicker); - flicker->sector = §ors[(int)flicker->sector]; + flicker->sector = §ors[(long)flicker->sector]; flicker->thinker.function = T_FireFlicker; P_AddThinker (&flicker->thinker); break; @@ -859,7 +859,7 @@ elevator_t *elevator = Z_Malloc (sizeof(*elevator), PU_LEVEL, NULL); memcpy (elevator, save_p, sizeof(*elevator)); save_p += sizeof(*elevator); - elevator->sector = §ors[(int)elevator->sector]; + elevator->sector = §ors[(long)elevator->sector]; elevator->sector->floordata = elevator; //jff 2/22/98 elevator->sector->ceilingdata = elevator; //jff 2/22/98 elevator->thinker.function = T_MoveElevator; Only in prboom-2.3.1/src: p_saveg.c~ diff -ur prboom-2.3.1.orig/src/p_spec.c prboom-2.3.1/src/p_spec.c --- prboom-2.3.1.orig/src/p_spec.c 2004-09-15 21:09:36.000000000 +0200 +++ prboom-2.3.1/src/p_spec.c 2006-03-12 10:46:28.000000000 +0100 @@ -976,11 +976,11 @@ switch (t) // return whether thinker of same type is active { case floor_special: - return (int)sec->floordata; + return (long)sec->floordata; case ceiling_special: - return (int)sec->ceilingdata; + return (long)sec->ceilingdata; case lighting_special: - return (int)sec->lightingdata; + return (long)sec->lightingdata; } return 1; // don't know which special, must be active, shouldn't be here } Only in prboom-2.3.1/src: p_spec.c~ diff -ur prboom-2.3.1.orig/src/r_patch.c prboom-2.3.1/src/r_patch.c --- prboom-2.3.1.orig/src/r_patch.c 2004-09-15 21:09:19.000000000 +0200 +++ prboom-2.3.1/src/r_patch.c 2006-03-12 10:51:25.000000000 +0100 @@ -198,7 +198,7 @@ // allocate our data chunk dataSize = pixelDataSize + columnsDataSize + postsDataSize; - patch->data = (unsigned char*)Z_Malloc(dataSize, PU_CACHE, &patch->data); + patch->data = (unsigned char*)Z_Malloc(dataSize, PU_CACHE, (void **)&patch->data); memset(patch->data, 0, dataSize); // set out pixel, column, and post pointers into our data array @@ -207,7 +207,7 @@ patch->posts = (TPatchPost*)((unsigned char*)patch->columns + columnsDataSize); // sanity check that we've got all the memory allocated we need - assert(((int)patch->posts + (int)(numPostsTotal*sizeof(TPatchPost)) - (int)patch->data) == dataSize); + assert(((long)patch->posts + (long)(numPostsTotal*sizeof(TPatchPost)) - (long)patch->data) == dataSize); memset(patch->pixels, 0xff, (patch->width*patch->height)); @@ -422,7 +422,7 @@ // allocate our data chunk dataSize = pixelDataSize + columnsDataSize + postsDataSize; - composite_patch->data = (unsigned char*)Z_Malloc(dataSize, PU_STATIC, &composite_patch->data); + composite_patch->data = (unsigned char*)Z_Malloc(dataSize, PU_STATIC, (void **)&composite_patch->data); memset(composite_patch->data, 0, dataSize); // set out pixel, column, and post pointers into our data array @@ -431,7 +431,7 @@ composite_patch->posts = (TPatchPost*)((unsigned char*)composite_patch->columns + columnsDataSize); // sanity check that we've got all the memory allocated we need - assert(((int)composite_patch->posts + (int)(numPostsTotal*sizeof(TPatchPost)) - (int)composite_patch->data) == dataSize); + assert(((long)composite_patch->posts + (long)(numPostsTotal*sizeof(TPatchPost)) - (long)composite_patch->data) == dataSize); memset(composite_patch->pixels, 0xff, (composite_patch->width*composite_patch->height)); Only in prboom-2.3.1/src: r_patch.c~ prboom-2.3.1-config.patch: --- NEW FILE prboom-2.3.1-config.patch --- --- prboom-2.3.1/src/g_cmd.c.hdg 2006-03-10 21:48:49.000000000 +0100 +++ prboom-2.3.1/src/g_cmd.c 2006-03-10 22:10:46.000000000 +0100 @@ -501,7 +501,6 @@ // CPhipps - compatibility vars static const char *complevel_str[] = { - "prboom_current", // -1 = best "doom_12", "doom_1666", "doom2_19", @@ -516,19 +515,16 @@ "MBF", "prboom_203beta", "prboom_210_211", - "prboom_212_223", + "prboom_212_223", /* untill 224 actually but lets not mod the string */ + "prboom_current" /* 230 - 231 and probably later */ }; -static int desired_default_compatibility_level; -CONSOLE_INT(default_compatibility_level, desired_default_compatibility_level, NULL, 0, MAX_COMPATIBILITY_LEVEL-1, complevel_str, 0) +CONSOLE_INT(default_compatibility_level, default_compatibility_level, NULL, 0, MAX_COMPATIBILITY_LEVEL-1, complevel_str, 0) { - default_compatibility_level = desired_default_compatibility_level - 1; } -static int desired_compatibility_level; -CONSOLE_INT(compatibility_level, desired_compatibility_level, NULL, 0, MAX_COMPATIBILITY_LEVEL-1, complevel_str, 0) +CONSOLE_INT(compatibility_level, compatibility_level, NULL, 0, MAX_COMPATIBILITY_LEVEL-1, complevel_str, 0) { - compatibility_level = desired_compatibility_level - 1; G_Compatibility(); } prboom-2.3.1-gamedir.patch: --- NEW FILE prboom-2.3.1-gamedir.patch --- diff -Naur prboom-2.3.1/configure prboom-2.3.1.new/configure --- prboom-2.3.1/configure 2004-09-15 12:11:41.000000000 -0700 +++ prboom-2.3.1.new/configure 2006-03-13 15:42:56.000000000 -0800 @@ -1853,9 +1853,9 @@ if test "x$prefix" != xNONE; then - DOOMWADDIR="$prefix/share/games/doom" + DOOMWADDIR="$prefix/share/doom" else - DOOMWADDIR="$ac_default_prefix/share/games/doom" + DOOMWADDIR="$ac_default_prefix/share/doom" fi cat >>confdefs.h <<_ACEOF #define DOOMWADDIR "$DOOMWADDIR" diff -Naur prboom-2.3.1/src/d_main.c prboom-2.3.1.new/src/d_main.c --- prboom-2.3.1/src/d_main.c 2006-03-08 18:41:07.000000000 -0800 +++ prboom-2.3.1.new/src/d_main.c 2006-03-13 15:31:16.000000000 -0800 @@ -158,6 +158,7 @@ "doom.wad", "doom1.wad", "doomu.wad", /* CPhipps - alow doomu.wad */ + "freedoom.wad", /* wart at kobold.org: added freedoom for Fedora Extras */ }; static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads; prboom-2.3.1-gcc4.patch: --- NEW FILE prboom-2.3.1-gcc4.patch --- diff -Naur prboom-2.3.1/src/c_runcmd.c prboom-2.3.1.new/src/c_runcmd.c --- prboom-2.3.1/src/c_runcmd.c 2004-09-15 12:09:37.000000000 -0700 +++ prboom-2.3.1.new/src/c_runcmd.c 2006-03-06 20:42:04.000000000 -0800 @@ -1212,7 +1212,7 @@ { char *filedata; - if(M_ReadFile(filename, (byte **)&filedata) <= 0) // haleyjd: ptr cast + if(M_ReadFile(filename, (char **)(&filedata)) <= 0) C_Printf("couldn't exec '%s'\n", filename); else { diff -Naur prboom-2.3.1/src/d_main.c prboom-2.3.1.new/src/d_main.c --- prboom-2.3.1/src/d_main.c 2004-09-24 11:27:37.000000000 -0700 +++ prboom-2.3.1.new/src/d_main.c 2006-03-06 20:42:04.000000000 -0800 @@ -137,7 +137,7 @@ extern boolean timingdemo, singledemo, demoplayback, fastdemo; // killough -static int basetic; +int basetic; char wadfile[PATH_MAX+1]; // primary wad file char mapdir[PATH_MAX+1]; // directory of development maps diff -Naur prboom-2.3.1/src/gl_intern.h prboom-2.3.1.new/src/gl_intern.h --- prboom-2.3.1/src/gl_intern.h 2004-09-15 12:09:48.000000000 -0700 +++ prboom-2.3.1.new/src/gl_intern.h 2006-03-06 20:42:04.000000000 -0800 @@ -93,7 +93,6 @@ extern boolean gl_shared_texture_palette; extern boolean use_mipmapping; extern int transparent_pal_index; -extern unsigned char gld_palmap[256]; extern GLTexture *last_gltexture; extern int last_cm; diff -Naur prboom-2.3.1/src/m_fixed.h prboom-2.3.1.new/src/m_fixed.h --- prboom-2.3.1/src/m_fixed.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/m_fixed.h 2006-03-06 20:42:04.000000000 -0800 @@ -123,7 +123,7 @@ /* CPhipps - made __inline__ to inline, as specified in the gcc docs * Also made const */ -inline static const fixed_t FixedMul(fixed_t a, fixed_t b) +inline static fixed_t FixedMul(fixed_t a, fixed_t b) { return (fixed_t)((int_64_t) a*b >> FRACBITS); } @@ -186,7 +186,7 @@ /* CPhipps - made __inline__ to inline, as specified in the gcc docs * Also made const */ -inline static const fixed_t FixedDiv(fixed_t a, fixed_t b) +inline static fixed_t FixedDiv(fixed_t a, fixed_t b) { return (D_abs(a)>>14) >= D_abs(b) ? ((a^b)>>31) ^ INT_MAX : (fixed_t)(((int_64_t) a << FRACBITS) / b); @@ -199,7 +199,7 @@ * (notice that the C standard for % does not guarantee this) */ -inline static const fixed_t FixedMod(fixed_t a, fixed_t b) +inline static fixed_t FixedMod(fixed_t a, fixed_t b) { if (b & (b-1)) { fixed_t r = a % b; diff -Naur prboom-2.3.1/src/p_maputl.h prboom-2.3.1.new/src/p_maputl.h --- prboom-2.3.1/src/p_maputl.h 2004-09-15 12:09:45.000000000 -0700 +++ prboom-2.3.1.new/src/p_maputl.h 2006-03-06 20:42:04.000000000 -0800 @@ -64,7 +64,9 @@ typedef boolean (*traverser_t)(intercept_t *in); #ifdef __GNUC__ -#define CONSTFUNC const +// Not for gcc4! +// #define CONSTFUNC const +#define CONSTFUNC #else #define CONSTFUNC #endif diff -Naur prboom-2.3.1/src/p_mobj.h prboom-2.3.1.new/src/p_mobj.h --- prboom-2.3.1/src/p_mobj.h 2004-09-15 12:09:47.000000000 -0700 +++ prboom-2.3.1.new/src/p_mobj.h 2006-03-06 20:42:04.000000000 -0800 @@ -369,8 +369,6 @@ // Whether an object is "sentient" or not. Used for environmental influences. #define sentient(mobj) ((mobj)->health > 0 && (mobj)->info->seestate) -extern mapthing_t itemrespawnque[]; -extern int itemrespawntime[]; extern int iquehead; extern int iquetail; extern int gravity; diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c --- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.c 2006-03-06 20:42:04.000000000 -0800 @@ -130,7 +130,7 @@ case 'X': \ case 'p': \ GET_VARS \ - ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ state = STATE_NONE; \ break; \ case 'e': \ @@ -139,17 +139,17 @@ case 'g': \ case 'G': \ GET_VARS \ - ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ state = STATE_NONE; \ break; \ case 'c': \ GET_VARS \ - ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ state = STATE_NONE; \ break; \ case 's': \ GET_VARS \ - ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ state = STATE_NONE; \ break; \ case 'n': \ @@ -306,11 +306,11 @@ } int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, va_list ap) { if (*nmax > 1) { - **pinsertion = (char) va_arg(*ap, int); + **pinsertion = (char) va_arg(ap, int); *pinsertion += 1; *nmax -= 1; } @@ -338,9 +338,9 @@ */ int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, va_list ap) { - const char *str = va_arg(*ap, const char *); + const char *str = va_arg(ap, const char *); int nprinted; int len; int pad = 0; @@ -428,7 +428,7 @@ */ int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, va_list ap) { long int number = 0; unsigned long int unumber; @@ -463,17 +463,17 @@ { case 'd': case 'i': - number = (signed short int) va_arg(*ap, int); + number = (signed short int) va_arg(ap, int); break; case 'u': case 'o': case 'x': case 'X': - unumber = (unsigned short int) va_arg(*ap, int); + unumber = (unsigned short int) va_arg(ap, int); numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = (unsigned long) va_arg(ap, void *); numbersigned = 0; } break; @@ -482,17 +482,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed long int); + number = va_arg(ap, signed long int); break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned long int); + unumber = va_arg(ap, unsigned long int); numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = (unsigned long) va_arg(ap, void *); numbersigned = numbersigned; } break; @@ -501,17 +501,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed int); + number = va_arg(ap, signed int); break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned int); + unumber = va_arg(ap, unsigned int); numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = (unsigned long) va_arg(ap, void *); numbersigned = 0; } } /* switch fmt to retrieve number */ @@ -784,12 +784,12 @@ */ int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, va_list ap) { char *digits; int sign = 0; int dec; - double value = va_arg(*ap, double); + double value = va_arg(ap, double); int len; int pad = 0; diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h --- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.h 2006-03-06 20:42:04.000000000 -0800 @@ -17,16 +17,16 @@ * if there had been enough room). */ int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, va_list ap); int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, va_list ap); int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, va_list ap); int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, va_list ap); /* These are the flags you need (use logical OR) for the flags parameter of * fmt functions above. diff -Naur prboom-2.3.1/src/r_bsp.h prboom-2.3.1.new/src/r_bsp.h --- prboom-2.3.1/src/r_bsp.h 2004-09-15 12:09:31.000000000 -0700 +++ prboom-2.3.1.new/src/r_bsp.h 2006-03-06 20:42:04.000000000 -0800 @@ -41,11 +41,6 @@ extern line_t *linedef; extern sector_t *frontsector; extern sector_t *backsector; -extern int rw_x; -extern int rw_stopx; -extern boolean segtextured; -extern boolean markfloor; /* false if the back side is the same plane */ -extern boolean markceiling; /* old code -- killough: * extern drawseg_t drawsegs[MAXDRAWSEGS]; diff -Naur prboom-2.3.1/src/r_data.h prboom-2.3.1.new/src/r_data.h --- prboom-2.3.1/src/r_data.h 2004-09-15 12:09:33.000000000 -0700 +++ prboom-2.3.1.new/src/r_data.h 2006-03-06 20:42:04.000000000 -0800 @@ -48,7 +48,7 @@ { int originx, originy; // Block origin, which has already accounted int patch; // for the internal origin of the patch. -} texpatch_t __attribute__((packed)); +} texpatch_t; // // Texture definition. diff -Naur prboom-2.3.1/src/r_main.c prboom-2.3.1.new/src/r_main.c --- prboom-2.3.1/src/r_main.c 2004-09-15 12:09:26.000000000 -0700 +++ prboom-2.3.1.new/src/r_main.c 2006-03-06 20:42:04.000000000 -0800 @@ -118,7 +118,7 @@ // killough 5/2/98: reformatted // -const int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node) +int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node) { if (!node->dx) return x <= node->x ? node->dy > 0 : node->dy < 0; @@ -137,7 +137,7 @@ // killough 5/2/98: reformatted -const int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line) +int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line) { fixed_t lx = line->v1->x; fixed_t ly = line->v1->y; diff -Naur prboom-2.3.1/src/r_main.h prboom-2.3.1.new/src/r_main.h --- prboom-2.3.1/src/r_main.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/r_main.h 2006-03-06 20:42:04.000000000 -0800 @@ -112,8 +112,8 @@ // Utility functions. // -const int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node); -const int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line); +int R_PointOnSide(fixed_t x, fixed_t y, const node_t *node); +int R_PointOnSegSide(fixed_t x, fixed_t y, const seg_t *line); angle_t R_PointToAngle(fixed_t x, fixed_t y); angle_t R_PointToAngle2(fixed_t x1, fixed_t y1, fixed_t x2, fixed_t y2); subsector_t *R_PointInSubsector(fixed_t x, fixed_t y); diff -Naur prboom-2.3.1/src/SDL/i_system.c prboom-2.3.1.new/src/SDL/i_system.c --- prboom-2.3.1/src/SDL/i_system.c 2004-09-15 12:09:21.000000000 -0700 +++ prboom-2.3.1.new/src/SDL/i_system.c 2006-03-06 20:42:04.000000000 -0800 @@ -133,7 +133,8 @@ if (rc <= 0) { I_Error("I_Read: read failed: %s", rc ? strerror(errno) : "EOF"); } - sz -= rc; (unsigned char *)buf += rc; + sz -= rc; + buf += rc; } } --- NEW FILE prboom.spec --- %define waddir %{_datadir}/doom Name: prboom Version: 2.3.1 Release: 4%{?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.3.1.tar.gz Patch0: prboom-2.3.1-gcc4.patch Patch1: prboom-2.3.1-gamedir.patch Patch2: prboom-2.3.1-config.patch Patch3: prboom-2.3.1-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_net-devel Requires: freedoom %description prboom is an open-source port of Doom, the classic 3D first-person shooter game. It totally outclassed any 3D world games that preceded it, with amazing speed, flexibility, and outstanding gameplay. The specs to the game were released, and thousands of extra levels were written by fans of the game; even today new levels are written for Doom faster then any one person could play them. %prep %setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %build %configure --disable-cpu-opt --program-prefix='' make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %makeinstall # Move the binaries out of the crufty /usr/games directory mkdir -p $RPM_BUILD_ROOT/%{_bindir} mv $RPM_BUILD_ROOT/usr/games/* $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{waddir} mv $RPM_BUILD_ROOT/%{_datadir}/games/doom/%{name}.wad $RPM_BUILD_ROOT/%{waddir} # Remove the doc files that will get picked up in the files # section below. rm -rf $RPM_BUILD_ROOT/%{_docdir} %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/prboom %{_bindir}/prboom-game-server %dir %{waddir} %{waddir}/prboom.wad %{_mandir}/man5/* %{_mandir}/man6/* %doc NEWS AUTHORS README COPYING %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt %changelog * Tue Mar 14 2006 Wart 2.3.1-4 - Added patch to fix up some x86_64 issues * Mon Mar 13 2006 Wart 2.3.1-3 - Once again, change the default wad dir to datadir/doom (see discussion on bz #185211) * Sun Mar 12 2006 Wart 2.3.1-2 - Replace datadir/games/doom with datadir/prboom in the files section. * Sat Mar 11 2006 Wart 2.3.1-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 14 Mar 2006 19:29:08 -0000 1.1 +++ .cvsignore 14 Mar 2006 19:30:09 -0000 1.2 @@ -0,0 +1 @@ +prboom-2.3.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 14 Mar 2006 19:29:08 -0000 1.1 +++ sources 14 Mar 2006 19:30:09 -0000 1.2 @@ -0,0 +1 @@ +c53231604fe6cf7352e73911ad44c90d prboom-2.3.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 19:35:06 2006 From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon)) Date: Tue, 14 Mar 2006 14:35:06 -0500 Subject: rpms/banshee/devel banshee.spec,1.6,1.7 Message-ID: <200603141935.k2EJZdhw007286@cvs-int.fedora.redhat.com> Author: caillon Update of /cvs/extras/rpms/banshee/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7269 Modified Files: banshee.spec Log Message: disable helix, we use gstreamer Index: banshee.spec =================================================================== RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- banshee.spec 14 Mar 2006 16:57:31 -0000 1.6 +++ banshee.spec 14 Mar 2006 19:35:06 -0000 1.7 @@ -39,7 +39,7 @@ %build export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir} -%configure --disable-docs --with-gstreamer-0-10 +%configure --disable-docs --with-gstreamer-0-10 --disable-helix make %install From fedora-extras-commits at redhat.com Tue Mar 14 19:54:39 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 14:54:39 -0500 Subject: owners owners.list,1.742,1.743 Message-ID: <200603141955.k2EJtBaL007478@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7459 Modified Files: owners.list Log Message: Added prboom and freedoom Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.742 retrieving revision 1.743 diff -u -r1.742 -r1.743 --- owners.list 14 Mar 2006 08:00:41 -0000 1.742 +++ owners.list 14 Mar 2006 19:54:38 -0000 1.743 @@ -259,6 +259,7 @@ Fedora Extras|fping|Scriptable, parallelized ping-like utility|kaboom at oobleck.net|extras-qa at fedoraproject.org| Fedora Extras|freealut|Implementation of OpenAL's ALUT standard|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| 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|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|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| @@ -1122,6 +1123,7 @@ 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| Fedora Extras|pptp|Point-to-Point Tunneling Protocol (PPTP) Client|paul at city-fan.org|extras-qa at fedoraproject.org| +Fedora Extras|prboom|GPL Doom game engine|wart at kobold.org|extras-qa at fedoraproject.org| 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|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Tue Mar 14 20:49:40 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Tue, 14 Mar 2006 15:49:40 -0500 Subject: comps comps-fe5.xml.in,1.22,1.23 Message-ID: <200603142050.k2EKoCXX009954@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9929 Modified Files: comps-fe5.xml.in Log Message: Added the freedoom game Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- comps-fe5.xml.in 13 Mar 2006 23:15:35 -0000 1.22 +++ comps-fe5.xml.in 14 Mar 2006 20:49:40 -0000 1.23 @@ -204,6 +204,7 @@ foobillard fortune-mod freeciv + freedoom freedroid freedroidrpg gl-117 From fedora-extras-commits at redhat.com Tue Mar 14 21:34:48 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 14 Mar 2006 16:34:48 -0500 Subject: rpms/NetworkManager-vpnc/devel .cvsignore, 1.4, 1.5 NetworkManager-vpnc.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603142135.k2ELZKVX012817@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/NetworkManager-vpnc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12754 Modified Files: .cvsignore NetworkManager-vpnc.spec sources Log Message: * Tue Mar 14 2006 Dan Williams - 0.6.0-1 - Update to CVS snapshot of 0.6 for NM compatibility Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Jan 2006 06:48:22 -0000 1.4 +++ .cvsignore 14 Mar 2006 21:34:47 -0000 1.5 @@ -1,3 +1,4 @@ NetworkManager-vpnc-0.2.tar.gz NetworkManager-vpnc-0.3.tar.gz NetworkManager-vpnc-0.5.0.tar.gz +NetworkManager-vpnc-0.6.0.tar.gz Index: NetworkManager-vpnc.spec =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- NetworkManager-vpnc.spec 27 Jan 2006 06:48:22 -0000 1.6 +++ NetworkManager-vpnc.spec 14 Mar 2006 21:34:47 -0000 1.7 @@ -1,12 +1,12 @@ -%define nm_version 0.5.1 -%define dbus_version 0.35 +%define nm_version 0.6.0 +%define dbus_version 0.60 %define gtk2_version 2.6.0 %define vpnc_version 0.3.3-3 %define shared_mime_version 0.16-3 Summary: NetworkManager VPN integration for vpnc Name: NetworkManager-vpnc -Version: 0.5.0 +Version: 0.6.0 Release: 1 License: GPL Group: System Environment/Base @@ -84,6 +84,9 @@ %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png %changelog +* Tue Mar 14 2006 Dan Williams - 0.6.0-1 +- Update to CVS snapshot of 0.6 for NM compatibility + * Fri Jan 27 2006 Dan Williams - 0.5.0-1 - CVS snapshot for compatibility new NetworkManager Index: sources =================================================================== RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Jan 2006 06:48:22 -0000 1.4 +++ sources 14 Mar 2006 21:34:47 -0000 1.5 @@ -1 +1 @@ -45ffcb2a1c03c545db0c8d8a4fcbd885 NetworkManager-vpnc-0.5.0.tar.gz +ca50e94e775243965b5df36a26c45d42 NetworkManager-vpnc-0.6.0.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 22:14:14 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Tue, 14 Mar 2006 17:14:14 -0500 Subject: rpms/liferea/devel liferea-mozilla-lib64.patch, NONE, 1.1 liferea.spec, 1.34, 1.35 Message-ID: <200603142214.k2EMElGk015486@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15461 Modified Files: liferea.spec Added Files: liferea-mozilla-lib64.patch Log Message: * Tue Mar 14 2006 Brian Pepple - 1.0.7-3 - Add patch to find mozilla on x86_64 (#185243). liferea-mozilla-lib64.patch: --- NEW FILE liferea-mozilla-lib64.patch --- diff -ur liferea-1.0.7.ORIG/src/liferea.in liferea-1.0.7/src/liferea.in --- liferea-1.0.7.ORIG/src/liferea.in 2006-01-16 18:11:19.000000000 -0500 +++ liferea-1.0.7/src/liferea.in 2006-03-14 16:45:26.000000000 -0500 @@ -39,7 +39,7 @@ fi @MOZILLA_LIB_DIR_SEARCH@ -look_for_mozilla "/usr/lib/mozilla*/chrome/comm.jar" +look_for_mozilla "/usr/lib*/mozilla*/chrome/comm.jar" look_for_mozilla "/usr/local/mozilla*/chrome/comm.jar" look_for_mozilla "/opt/mozilla/chrome/comm.jar" look_for_mozilla "/opt/mozilla/lib/chrome/comm.jar" Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- liferea.spec 6 Mar 2006 15:09:38 -0000 1.34 +++ liferea.spec 14 Mar 2006 22:14:14 -0000 1.35 @@ -2,13 +2,14 @@ Name: liferea Version: 1.0.7 -Release: 2%{?dist} +Release: 3%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-mozilla-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel @@ -38,6 +39,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p1 -b .mozilla %build @@ -105,6 +107,9 @@ %changelog +* Tue Mar 14 2006 Brian Pepple - 1.0.7-3 +- Add patch to find mozilla on x86_64 (#185243). + * Mon Mar 6 2006 Brian Pepple - 1.0.7-2 - Update to 1.0.7. - Fix gconf scriptlets. From fedora-extras-commits at redhat.com Tue Mar 14 22:47:05 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 14 Mar 2006 17:47:05 -0500 Subject: rpms/emelfm2/devel .cvsignore, 1.5, 1.6 emelfm2.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603142247.k2EMlcFT015825@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15797 Modified Files: .cvsignore emelfm2.spec sources Log Message: Update to 0.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 Jan 2006 11:40:28 -0000 1.5 +++ .cvsignore 14 Mar 2006 22:47:05 -0000 1.6 @@ -1 +1 @@ -emelfm2-0.1.5.tar.gz +emelfm2-0.1.6.tar.gz Index: emelfm2.spec =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/emelfm2.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- emelfm2.spec 18 Feb 2006 22:05:57 -0000 1.8 +++ emelfm2.spec 14 Mar 2006 22:47:05 -0000 1.9 @@ -1,6 +1,6 @@ Name: emelfm2 -Version: 0.1.5 -Release: 2%{?dist} +Version: 0.1.6 +Release: 1%{?dist} Summary: A file manager that implements the popular two-pane design Group: Applications/File @@ -10,7 +10,8 @@ Patch0: %{name}-0.1.2-makefile.config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.4.0, gettext, desktop-file-utils +BuildRequires: gtk2-devel >= 2.6.0, gettext, desktop-file-utils +Requires: findutils >= 4.2, file, grep, sed %description emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements @@ -53,7 +54,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc docs/ACTIONS docs/CHANGELOG docs/CONFIGURATION docs/CREDITS docs/HACKING -%doc docs/PLUGINS docs/README docs/TODO docs/USAGE docs/WARNING +%doc docs/README docs/TODO docs/USAGE docs/WARNING %doc docs/help.txt docs/GPL docs/LGPL %{_bindir}/%{name} %{_libdir}/%{name} @@ -63,6 +64,10 @@ %changelog +* Tue Mar 14 2006 Christoph Wickert - 0.1.6-1 +- Update to 0.1.6. +- Add Requires for plugins. + * Sat Feb 18 2006 Christoph Wickert - 0.1.5-2 - Rebuild for Fedora Extras 5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/emelfm2/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 26 Jan 2006 11:40:28 -0000 1.5 +++ sources 14 Mar 2006 22:47:05 -0000 1.6 @@ -1 +1 @@ -826e9edf31431a0b6a2c0208a475df54 emelfm2-0.1.5.tar.gz +389f78c70df52c592e61b873ce69ec30 emelfm2-0.1.6.tar.gz From fedora-extras-commits at redhat.com Tue Mar 14 23:03:19 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Tue, 14 Mar 2006 18:03:19 -0500 Subject: rpms/emelfm2/FC-4 .cvsignore, 1.4, 1.5 emelfm2.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603142303.k2EN3pNL017997@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/emelfm2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17975 Modified Files: .cvsignore emelfm2.spec sources Log Message: Update to 0.1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/emelfm2/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 26 Jan 2006 11:56:26 -0000 1.4 +++ .cvsignore 14 Mar 2006 23:03:19 -0000 1.5 @@ -1 +1 @@ -emelfm2-0.1.5.tar.gz +emelfm2-0.1.6.tar.gz Index: emelfm2.spec =================================================================== RCS file: /cvs/extras/rpms/emelfm2/FC-4/emelfm2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- emelfm2.spec 26 Jan 2006 11:56:26 -0000 1.4 +++ emelfm2.spec 14 Mar 2006 23:03:19 -0000 1.5 @@ -1,5 +1,5 @@ Name: emelfm2 -Version: 0.1.5 +Version: 0.1.6 Release: 1%{?dist} Summary: A file manager that implements the popular two-pane design @@ -10,7 +10,8 @@ Patch0: %{name}-0.1.2-makefile.config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel >= 2.4.0, gettext, desktop-file-utils +BuildRequires: gtk2-devel >= 2.6.0, gettext, desktop-file-utils +Requires: findutils >= 4.2, file, grep, sed %description emelFM2 is the GTK+2 port of emelFM. emelFM2 is a file manager that implements @@ -53,7 +54,7 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc docs/ACTIONS docs/CHANGELOG docs/CONFIGURATION docs/CREDITS docs/HACKING -%doc docs/PLUGINS docs/README docs/TODO docs/USAGE docs/WARNING +%doc docs/README docs/TODO docs/USAGE docs/WARNING %doc docs/help.txt docs/GPL docs/LGPL %{_bindir}/%{name} %{_libdir}/%{name} @@ -63,6 +64,10 @@ %changelog +* Tue Mar 14 2006 Christoph Wickert - 0.1.6-1 +- Update to 0.1.6. +- Add Requires for plugins. + * Thu Jan 26 2006 Christoph Wickert - 0.1.5-1 - Update to 0.1.5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/emelfm2/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 26 Jan 2006 11:56:26 -0000 1.4 +++ sources 14 Mar 2006 23:03:19 -0000 1.5 @@ -1 +1 @@ -826e9edf31431a0b6a2c0208a475df54 emelfm2-0.1.5.tar.gz +389f78c70df52c592e61b873ce69ec30 emelfm2-0.1.6.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 00:01:53 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Tue, 14 Mar 2006 19:01:53 -0500 Subject: rpms/lock-keys-applet/devel lock-keys-applet.spec,1.14,1.15 Message-ID: <200603150002.k2F02csU020353@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/lock-keys-applet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20322 Modified Files: lock-keys-applet.spec Log Message: Let's give it a spin Index: lock-keys-applet.spec =================================================================== RCS file: /cvs/extras/rpms/lock-keys-applet/devel/lock-keys-applet.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- lock-keys-applet.spec 3 Mar 2006 13:30:53 -0000 1.14 +++ lock-keys-applet.spec 15 Mar 2006 00:01:52 -0000 1.15 @@ -8,7 +8,7 @@ URL: http://mfcn.ilo.de/led_applet/ Source0: http://www.wh-hms.uni-ulm.de/~mfcn/shared/lock-keys/lock-keys-applet-1.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libgnomeui-devel gnome-panel-devel scrollkeeper libtool automake autoconf +BuildRequires: libgnomeui-devel gnome-panel-devel scrollkeeper gettext Requires(post): scrollkeeper Requires(postun): scrollkeeper @@ -23,9 +23,6 @@ %setup -q %build -%ifarch x86_64 -libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf -%endif %configure make %{?_smp_mflags} @@ -53,7 +50,7 @@ %{_libexecdir}/%{name} %changelog -* Mon Feb 13 2006 Ignacio Vazquez-Abrams 1.0-10 +* Tue Mar 14 2006 Ignacio Vazquez-Abrams 1.0-10 - Rebuild for Fedora Extras 5 * Fri Apr 22 2005 Ignacio Vazquez-Abrams 1.0-9 From fedora-extras-commits at redhat.com Wed Mar 15 05:55:59 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Wed, 15 Mar 2006 00:55:59 -0500 Subject: rpms/rogue/FC-4 rogue.png,1.1,1.2 Message-ID: <200603150556.k2F5u1RK000520@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/rogue/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv509 Modified Files: rogue.png Log Message: Resize image to match the directory that it's going into. From fedora-extras-commits at redhat.com Wed Mar 15 07:49:16 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 15 Mar 2006 02:49:16 -0500 Subject: rpms/perl-MailTools/devel .cvsignore, 1.8, 1.9 perl-MailTools.spec, 1.15, 1.16 sources, 1.8, 1.9 Message-ID: <200603150749.k2F7nmDc004936@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/perl-MailTools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4915 Modified Files: .cvsignore perl-MailTools.spec sources Log Message: * Wed Mar 1 2006 Ville Skytt?? - 1.74-1 - 1.74. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 22 Jan 2006 08:16:53 -0000 1.8 +++ .cvsignore 15 Mar 2006 07:49:15 -0000 1.9 @@ -1 +1 @@ -MailTools-1.73.tar.gz +MailTools-1.74.tar.gz Index: perl-MailTools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/perl-MailTools.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- perl-MailTools.spec 22 Jan 2006 08:16:53 -0000 1.15 +++ perl-MailTools.spec 15 Mar 2006 07:49:15 -0000 1.16 @@ -1,6 +1,6 @@ Summary: Various mail-related perl modules Name: perl-MailTools -Version: 1.73 +Version: 1.74 Release: 1%{?dist} License: GPL or Artistic @@ -57,6 +57,9 @@ %changelog +* Wed Mar 1 2006 Ville Skytt?? - 1.74-1 +- 1.74. + * Sun Jan 22 2006 Ville Skytt?? - 1.73-1 - 1.73. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-MailTools/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 22 Jan 2006 08:16:53 -0000 1.8 +++ sources 15 Mar 2006 07:49:15 -0000 1.9 @@ -1 +1 @@ -5fae3213871ae435014c613e88d081a7 MailTools-1.73.tar.gz +aba82a7eb87906278d98174e10d838be MailTools-1.74.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 08:37:49 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 15 Mar 2006 03:37:49 -0500 Subject: rpms/gpsim/devel gpsim.spec,1.6,1.7 Message-ID: <200603150838.k2F8cLAm007063@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7043 Modified Files: gpsim.spec Log Message: Update patch. Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gpsim.spec 14 Mar 2006 14:59:13 -0000 1.6 +++ gpsim.spec 15 Mar 2006 08:37:48 -0000 1.7 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.21.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -80,6 +80,9 @@ %{_includedir}/* %changelog +* Wed Mar 15 2006 Alain Portal 0.21.11-5 + - Update Patch + * Tue Mar 14 2006 Alain Portal 0.21.11-4 - Patch to make gcc-4.1.0 happy From fedora-extras-commits at redhat.com Wed Mar 15 09:11:16 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 15 Mar 2006 04:11:16 -0500 Subject: rpms/gpsim/devel gpsim-0.21.11.happy_gcc, 1.2, 1.3 gpsim.spec, 1.7, 1.8 Message-ID: <200603150912.k2F9C8Uv009637@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/gpsim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9611 Modified Files: gpsim-0.21.11.happy_gcc gpsim.spec Log Message: Update patch. Index: gpsim-0.21.11.happy_gcc =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim-0.21.11.happy_gcc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- gpsim-0.21.11.happy_gcc 14 Mar 2006 17:21:15 -0000 1.2 +++ gpsim-0.21.11.happy_gcc 15 Mar 2006 09:11:15 -0000 1.3 @@ -10,6 +10,18 @@ virtual ISimConsole &GetConsole(); virtual void DisplayMessage(unsigned int uStringID, ...); virtual void DisplayMessage(FILE * pOut, unsigned int uStringID, ...); +diff -ru gpsim-0.21.11/src/p12x.h gpsim-0.21.11.fix/src/p12x.h +--- gpsim-0.21.11/src/p12x.h 2005-09-26 05:51:23.000000000 +0200 ++++ gpsim-0.21.11.fix/src/p12x.h 2006-03-15 10:24:02.000000000 +0100 +@@ -108,7 +108,7 @@ + + virtual PROCESSOR_TYPE isa(void){return _P12CE518_;}; + virtual void tris_instruction(unsigned int tris_register); +- virtual void P12CE518::set_eeprom(I2C_EE *e); ++ virtual void set_eeprom(I2C_EE *e); + + P12CE518(void); + static Processor *construct(void); diff -ru gpsim-0.21.11/src/value.h gpsim-0.21.11.fix/src/value.h --- gpsim-0.21.11/src/value.h 2005-09-07 15:34:24.000000000 +0200 +++ gpsim-0.21.11.fix/src/value.h 2006-03-14 15:31:44.000000000 +0100 Index: gpsim.spec =================================================================== RCS file: /cvs/extras/rpms/gpsim/devel/gpsim.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gpsim.spec 15 Mar 2006 08:37:48 -0000 1.7 +++ gpsim.spec 15 Mar 2006 09:11:15 -0000 1.8 @@ -1,6 +1,6 @@ Name: gpsim Version: 0.21.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A simulator for Microchip (TM) PIC (TM) microcontrollers Summary(fr): Un simulateur pour les microcontr??leurs PIC (TM) Microchip (TM) @@ -80,6 +80,9 @@ %{_includedir}/* %changelog +* Wed Mar 15 2006 Alain Portal 0.21.11-6 + - Update Patch + * Wed Mar 15 2006 Alain Portal 0.21.11-5 - Update Patch From fedora-extras-commits at redhat.com Wed Mar 15 09:40:08 2006 From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal)) Date: Wed, 15 Mar 2006 04:40:08 -0500 Subject: rpms/gaim-guifications/devel gaim-guifications.spec,1.4,1.5 Message-ID: <200603150940.k2F9eeT6010341@cvs-int.fedora.redhat.com> Author: rvokal Update of /cvs/extras/rpms/gaim-guifications/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10301 Modified Files: gaim-guifications.spec Log Message: - rebuild Index: gaim-guifications.spec =================================================================== RCS file: /cvs/extras/rpms/gaim-guifications/devel/gaim-guifications.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gaim-guifications.spec 18 Aug 2005 18:04:27 -0000 1.4 +++ gaim-guifications.spec 15 Mar 2006 09:40:07 -0000 1.5 @@ -13,7 +13,7 @@ Summary: Guifications Plugin for Gaim Name: gaim-guifications Version: 2.12 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet Url: http://guifications.sourceforge.net/Guifications/ @@ -53,6 +53,9 @@ %{_datadir}/pixmaps/gaim/guifications %changelog +* Wed Mar 15 2006 Radek Vok??l - 2.12-3 +- rebuild + * Thu Aug 18 2005 Jeremy Katz - 2.12-2 - rebuild for new cairo From fedora-extras-commits at redhat.com Wed Mar 15 09:41:19 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 04:41:19 -0500 Subject: rpms/polyxmass-bin/FC-3 .cvsignore, 1.4, 1.5 polyxmass-bin.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603150941.k2F9fp6X010456@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/polyxmass-bin/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10387/FC-3 Modified Files: .cvsignore polyxmass-bin.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Feb 2006 09:04:54 -0000 1.4 +++ .cvsignore 15 Mar 2006 09:41:19 -0000 1.5 @@ -1 +1 @@ -polyxmass-bin-0.9.2.tar.gz +polyxmass-bin-0.9.3.tar.gz Index: polyxmass-bin.spec =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/polyxmass-bin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- polyxmass-bin.spec 28 Feb 2006 09:04:54 -0000 1.4 +++ polyxmass-bin.spec 15 Mar 2006 09:41:19 -0000 1.5 @@ -1,12 +1,12 @@ Name: polyxmass-bin -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} Summary: The GNU polyxmass software suite Group: Applications/Engineering License: GPL URL: http://www.polyxmass.org/ -Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.2/polyxmass-bin-0.9.2.tar.gz +Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.3/polyxmass-bin-0.9.3.tar.gz Source1: polyxmass.desktop Patch0: polyxmass-bin-src-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,6 +72,10 @@ %exclude %{_datadir}/doc/polyxmass-bin %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.3-1 +- version upgrade + * Tue Feb 28 2006 Andreas Bierfert 0.9.2-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Feb 2006 09:04:54 -0000 1.4 +++ sources 15 Mar 2006 09:41:19 -0000 1.5 @@ -1 +1 @@ -12ef6f1dc89adc049503490039d6b6dc polyxmass-bin-0.9.2.tar.gz +d0f93501ea851fd21e0efacba95869ee polyxmass-bin-0.9.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 09:41:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 04:41:25 -0500 Subject: rpms/polyxmass-bin/FC-4 .cvsignore, 1.4, 1.5 polyxmass-bin.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603150941.k2F9fvRk010461@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/polyxmass-bin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10387/FC-4 Modified Files: .cvsignore polyxmass-bin.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Feb 2006 09:05:01 -0000 1.4 +++ .cvsignore 15 Mar 2006 09:41:25 -0000 1.5 @@ -1 +1 @@ -polyxmass-bin-0.9.2.tar.gz +polyxmass-bin-0.9.3.tar.gz Index: polyxmass-bin.spec =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/polyxmass-bin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- polyxmass-bin.spec 28 Feb 2006 09:05:01 -0000 1.4 +++ polyxmass-bin.spec 15 Mar 2006 09:41:25 -0000 1.5 @@ -1,12 +1,12 @@ Name: polyxmass-bin -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} Summary: The GNU polyxmass software suite Group: Applications/Engineering License: GPL URL: http://www.polyxmass.org/ -Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.2/polyxmass-bin-0.9.2.tar.gz +Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.3/polyxmass-bin-0.9.3.tar.gz Source1: polyxmass.desktop Patch0: polyxmass-bin-src-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,6 +72,10 @@ %exclude %{_datadir}/doc/polyxmass-bin %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.3-1 +- version upgrade + * Tue Feb 28 2006 Andreas Bierfert 0.9.2-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Feb 2006 09:05:01 -0000 1.4 +++ sources 15 Mar 2006 09:41:25 -0000 1.5 @@ -1 +1 @@ -12ef6f1dc89adc049503490039d6b6dc polyxmass-bin-0.9.2.tar.gz +d0f93501ea851fd21e0efacba95869ee polyxmass-bin-0.9.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 09:41:31 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 04:41:31 -0500 Subject: rpms/polyxmass-bin/devel .cvsignore, 1.4, 1.5 polyxmass-bin.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603150942.k2F9g3bn010467@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/polyxmass-bin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10387/devel Modified Files: .cvsignore polyxmass-bin.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Feb 2006 08:30:51 -0000 1.4 +++ .cvsignore 15 Mar 2006 09:41:30 -0000 1.5 @@ -1 +1 @@ -polyxmass-bin-0.9.2.tar.gz +polyxmass-bin-0.9.3.tar.gz Index: polyxmass-bin.spec =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/devel/polyxmass-bin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- polyxmass-bin.spec 28 Feb 2006 08:30:51 -0000 1.5 +++ polyxmass-bin.spec 15 Mar 2006 09:41:30 -0000 1.6 @@ -1,12 +1,12 @@ Name: polyxmass-bin -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} Summary: The GNU polyxmass software suite Group: Applications/Engineering License: GPL URL: http://www.polyxmass.org/ -Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.2/polyxmass-bin-0.9.2.tar.gz +Source0: http://www.polyxmass.org/polyxmass-bin/downloads/0.9.3/polyxmass-bin-0.9.3.tar.gz Source1: polyxmass.desktop Patch0: polyxmass-bin-src-makefile.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -72,6 +72,10 @@ %exclude %{_datadir}/doc/polyxmass-bin %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.3-1 +- version upgrade + * Tue Feb 28 2006 Andreas Bierfert 0.9.2-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/polyxmass-bin/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Feb 2006 08:30:51 -0000 1.4 +++ sources 15 Mar 2006 09:41:30 -0000 1.5 @@ -1 +1 @@ -12ef6f1dc89adc049503490039d6b6dc polyxmass-bin-0.9.2.tar.gz +d0f93501ea851fd21e0efacba95869ee polyxmass-bin-0.9.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 09:44:39 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 04:44:39 -0500 Subject: rpms/plt-scheme/FC-4 plt-scheme.spec,1.14,1.15 Message-ID: <200603150945.k2F9jB24010566@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/plt-scheme/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10511/FC-4 Modified Files: plt-scheme.spec Log Message: Index: plt-scheme.spec =================================================================== RCS file: /cvs/extras/rpms/plt-scheme/FC-4/plt-scheme.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- plt-scheme.spec 28 Jan 2006 13:37:03 -0000 1.14 +++ plt-scheme.spec 15 Mar 2006 09:44:39 -0000 1.15 @@ -85,7 +85,7 @@ rm -fr $RPM_BUILD_ROOT%{_libdir}/plt/notes # get-base.ss causes error during install -find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f +#find $RPM_BUILD_ROOT%{_libdir}/plt -name get-base\* | xargs rm -f mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps From fedora-extras-commits at redhat.com Wed Mar 15 09:45:40 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 04:45:40 -0500 Subject: rpms/ecl/FC-4 ecl.spec,1.1,1.2 Message-ID: <200603150946.k2F9kCox010678@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10616 Modified Files: ecl.spec Log Message: Index: ecl.spec =================================================================== RCS file: /cvs/extras/rpms/ecl/FC-4/ecl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ecl.spec 14 Mar 2006 07:56:15 -0000 1.1 +++ ecl.spec 15 Mar 2006 09:45:39 -0000 1.2 @@ -1,6 +1,6 @@ Name: ecl Version: 0.9h -Release: 4 +Release: 4%{?dist} Summary: Embeddable Common-Lisp Group: Development/Languages From fedora-extras-commits at redhat.com Wed Mar 15 10:28:47 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 05:28:47 -0500 Subject: rpms/ecl/devel ecl.spec,1.1,1.2 Message-ID: <200603151029.k2FATKJ5012885@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12863 Modified Files: ecl.spec Log Message: Index: ecl.spec =================================================================== RCS file: /cvs/extras/rpms/ecl/devel/ecl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ecl.spec 14 Mar 2006 07:56:15 -0000 1.1 +++ ecl.spec 15 Mar 2006 10:28:47 -0000 1.2 @@ -1,6 +1,6 @@ Name: ecl Version: 0.9h -Release: 4 +Release: 4%{?dist} Summary: Embeddable Common-Lisp Group: Development/Languages @@ -8,7 +8,7 @@ URL: http://ecls.sourceforge.net Source0: http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-0.9h.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xorg-x11-devel +BuildRequires: libX11-devel BuildRequires: m4 BuildRequires: texinfo Requires(post): /sbin/install-info From fedora-extras-commits at redhat.com Wed Mar 15 10:31:35 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 15 Mar 2006 05:31:35 -0500 Subject: rpms/pikdev/devel pikdev.spec,1.1,1.2 Message-ID: <200603151032.k2FAW72c012961@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12940 Modified Files: pikdev.spec Log Message: Exclude ppc arch which fail to build. Fix some other problem (see %changelog) Index: pikdev.spec =================================================================== RCS file: /cvs/extras/rpms/pikdev/devel/pikdev.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pikdev.spec 14 Mar 2006 08:26:13 -0000 1.1 +++ pikdev.spec 15 Mar 2006 10:31:35 -0000 1.2 @@ -1,6 +1,6 @@ Name: pikdev Version: 0.8.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC @@ -17,6 +17,8 @@ Requires: gputils +ExcludeArch: ppc + %description PiKdev is a simple IDE dedicated to the development of PIC based applications under KDE. @@ -61,7 +63,11 @@ rm -rf pkp cd pikdev -make -f Makefile.pkp +make -f Makefile.pkp \ +CCPP=g++ \ +LINK=g++ \ +CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.8.4" \ +LIBS= cd .. cp pikdev/pkp . make %{?_smp_mflags} @@ -69,7 +75,7 @@ %install rm -rf $RPM_BUILD_ROOT -make install-strip DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop @@ -96,6 +102,13 @@ %{_datadir}/icons/* %changelog +* Wed Mar 15 2006 Alain Portal 0.8.4-4 + - Exclude temporarily ppc arch because don't exist + in ppc glibc headers + - Override compiler for pkp Makefile and propagate $RPM_OPT_FLAGS on it + - Make install instead of install-strip + - Contributions of Ralf Corsepius + Thanks to him. * Wed Mar 08 2006 Alain Portal 0.8.4-3 - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5 - Package must own %{_datadir}/apps/%{name} directory From fedora-extras-commits at redhat.com Wed Mar 15 12:14:56 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 15 Mar 2006 07:14:56 -0500 Subject: rpms/perl-Glib/FC-4 .cvsignore, 1.7, 1.8 perl-Glib.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200603151215.k2FCFURB017421@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Glib/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17396 Modified Files: .cvsignore perl-Glib.spec sources Log Message: Sync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 19 Jan 2006 11:30:49 -0000 1.7 +++ .cvsignore 15 Mar 2006 12:14:55 -0000 1.8 @@ -1 +1 @@ -Glib-1.103.tar.gz +Glib-1.120.tar.gz Index: perl-Glib.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-4/perl-Glib.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Glib.spec 19 Jan 2006 11:30:49 -0000 1.11 +++ perl-Glib.spec 15 Mar 2006 12:14:55 -0000 1.12 @@ -1,5 +1,5 @@ Name: perl-Glib -Version: 1.103 +Version: 1.120 Release: 1%{?dist} Summary: Perl interface to GLib @@ -59,13 +59,25 @@ %files %defattr(-,root,root,-) -%doc AUTHORS ChangeLog LICENSE NEWS README README.api-changes TODO +%doc AUTHORS ChangeLog LICENSE NEWS README TODO %{perl_vendorarch}/auto/Glib/ %{perl_vendorarch}/Glib* %{_mandir}/man3/*.3* %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 1.120-1 +- Update to 1.120. + +* Mon Feb 13 2006 Jose Pedro Oliveira - 1.105-2 +- make tag problem. + +* Mon Feb 13 2006 Jose Pedro Oliveira - 1.105-1 +- Update to 1.105. + +* Mon Feb 6 2006 Jose Pedro Oliveira - 1.104-1 +- Update to 1.104 (fails one test in perl 5.8.8). + * Thu Jan 19 2006 Jose Pedro Oliveira - 1.103-1 - Update to 1.103. - Provides list: filtered out perl(MY) (#177956). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Glib/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 19 Jan 2006 11:30:49 -0000 1.7 +++ sources 15 Mar 2006 12:14:55 -0000 1.8 @@ -1 +1 @@ -fe8d123a872776a0c5cae50d513bf938 Glib-1.103.tar.gz +639d22451339e07844e6be3b5e345959 Glib-1.120.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 12:18:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 15 Mar 2006 07:18:03 -0500 Subject: rpms/perl-Gtk2/FC-4 .cvsignore, 1.7, 1.8 perl-Gtk2.spec, 1.11, 1.12 sources, 1.7, 1.8 Message-ID: <200603151218.k2FCIZi0017527@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Gtk2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17506 Modified Files: .cvsignore perl-Gtk2.spec sources Log Message: Sync with devel Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 Jan 2006 16:35:08 -0000 1.7 +++ .cvsignore 15 Mar 2006 12:18:02 -0000 1.8 @@ -1 +1 @@ -Gtk2-1.102.tar.gz +Gtk2-1.120.tar.gz Index: perl-Gtk2.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/perl-Gtk2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Gtk2.spec 2 Jan 2006 16:35:08 -0000 1.11 +++ perl-Gtk2.spec 15 Mar 2006 12:18:02 -0000 1.12 @@ -1,5 +1,11 @@ +# +# Rebuild option: +# +# --with testsuite - run the test suite (requires X) +# + Name: perl-Gtk2 -Version: 1.102 +Version: 1.120 Release: 1%{?dist} Summary: Perl interface to the 2.x series of the Gimp Toolkit library @@ -10,10 +16,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: perl >= 2:5.8.0 -BuildRequires: gtk2-devel, perl-Glib >= 1.102 +BuildRequires: gtk2-devel, perl-Glib >= 1.120 BuildRequires: perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig) -Requires: perl-Glib >= 1.102 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl-Glib >= 1.120 +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module allows you to write Gtk+ graphical user interfaces in a @@ -25,6 +31,17 @@ %prep %setup -q -n Gtk2-%{version} +iconv -f iso-8859-1 -t utf-8 -o pm/Helper.pm{.utf8,} +mv pm/Helper.pm{.utf8,} + +# Provides: exclude perl(main) +cat <<__EOF__ > %{name}-perl.prov +#!/bin/sh +/usr/lib/rpm/perl.prov \$* | grep -v '^perl(main)$' +__EOF__ +%define __perl_provides %{_builddir}/Gtk2-%{version}/%{name}-perl.prov +chmod +x %{__perl_provides} + %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -41,8 +58,7 @@ %check -# Testing requires X -%{?_with_tests:make test} +%{?_with_testsuite:make test} %clean @@ -59,6 +75,18 @@ %changelog +* Tue Mar 14 2006 Jose Pedro Oliveira - 1.120-1 +- Update to 1.120. + +* Mon Feb 20 2006 Jose Pedro Oliveira - 1.104-1 +- Update to 1.104. +- Requires perl(Glib) >= 1.105 (1.104 had problems with perl 5.8.8). + +* Thu Jan 19 2006 Jose Pedro Oliveira - 1.103-1 +- Update to 1.103. +- Converted the Gtk2::Helper man page to utf8 (#177802). +- Provides list: filtered out perl(main) (#177802). + * Wed Nov 30 2005 Jose Pedro Oliveira - 1.102-1 - Update to 1.102. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 Jan 2006 16:35:08 -0000 1.7 +++ sources 15 Mar 2006 12:18:02 -0000 1.8 @@ -1 +1 @@ -8bd7173c8a2b6b8baf2fa3c3d48d4bb5 Gtk2-1.102.tar.gz +3d0eef4271bd624b284f9a23f4bdbb96 Gtk2-1.120.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 12:20:02 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 15 Mar 2006 07:20:02 -0500 Subject: rpms/djvulibre/devel .cvsignore, 1.6, 1.7 djvulibre.spec, 1.14, 1.15 sources, 1.6, 1.7 djvulibre-3.5.15-gcc401.patch, 1.1, NONE djvulibre-3.5.16-extraqualif.patch, 1.1, NONE Message-ID: <200603151220.k2FCKYsS017595@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/djvulibre/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17574 Modified Files: .cvsignore djvulibre.spec sources Removed Files: djvulibre-3.5.15-gcc401.patch djvulibre-3.5.16-extraqualif.patch Log Message: Update to CVS to fix gcc 4.1 build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 6 Mar 2006 15:51:09 -0000 1.6 +++ .cvsignore 15 Mar 2006 12:20:02 -0000 1.7 @@ -1 +1 @@ -djvulibre-3.5.16.tar.gz +djvulibre-3.5.16cvs.tar.gz Index: djvulibre.spec =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/djvulibre.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- djvulibre.spec 6 Mar 2006 16:34:50 -0000 1.14 +++ djvulibre.spec 15 Mar 2006 12:20:02 -0000 1.15 @@ -1,12 +1,11 @@ Summary: DjVu viewers, encoders and utilities Name: djvulibre Version: 3.5.16 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Publishing URL: http://djvulibre.djvuzone.org/ -Source: http://dl.sf.net/djvu/djvulibre-%{version}.tar.gz -Patch0: djvulibre-3.5.16-extraqualif.patch +Source: http://dl.sf.net/djvu/djvulibre-%{version}cvs.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: qt-devel, libjpeg-devel, libtiff-devel BuildRequires: mozilla, redhat-menus, hicolor-icon-theme @@ -38,7 +37,9 @@ %prep %setup -%patch0 -p1 -b .extraqualif +# In 3.5.15cvs, hardcoded "/usr/include/qt3" needs replacing +. /etc/profile.d/qt.sh +%{__perl} -pi -e "s|/usr/include/qt3|${QTINC}|g" gui/djview/Makefile.dep %build @@ -97,13 +98,19 @@ #files devel #defattr(-, root, root, 0755) %{_includedir}/libdjvu/ +%{_libdir}/pkgconfig/ddjvuapi.pc %exclude %{_libdir}/*.la %{_libdir}/*.so %changelog +* Tue Mar 14 2006 Matthias Saou 3.5.16-3 +- Update to CVS snapshot, fixes the build with gcc 4.1 (sf.net #1420522). +- Include workaround for wrong qt3 includes in gui/djview/Makefile.dep. +- Add new pkgconfig ddjvuapi.pc file. + * Mon Mar 6 2006 Matthias Saou 3.5.16-2 -- FC5 rebuild. +- FC5 rebuild... nope. * Mon Jan 30 2006 Matthias Saou 3.5.16-1 - Update to 3.5.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/djvulibre/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 6 Mar 2006 15:51:09 -0000 1.6 +++ sources 15 Mar 2006 12:20:02 -0000 1.7 @@ -1 +1 @@ -5591c99a50aed1613a796a5aa4978fc0 djvulibre-3.5.16.tar.gz +45e3436ca4a0f2d791909464da03bf62 djvulibre-3.5.16cvs.tar.gz --- djvulibre-3.5.15-gcc401.patch DELETED --- --- djvulibre-3.5.16-extraqualif.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 15 13:27:27 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 15 Mar 2006 08:27:27 -0500 Subject: rpms/pikdev/FC-4 pikdev.spec,1.1,1.2 Message-ID: <200603151327.k2FDRxtL019867@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19850 Modified Files: pikdev.spec Log Message: Same spec file than devel branch Index: pikdev.spec =================================================================== RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pikdev.spec 14 Mar 2006 08:26:13 -0000 1.1 +++ pikdev.spec 15 Mar 2006 13:27:26 -0000 1.2 @@ -1,6 +1,6 @@ Name: pikdev Version: 0.8.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC @@ -17,6 +17,8 @@ Requires: gputils +ExcludeArch: ppc + %description PiKdev is a simple IDE dedicated to the development of PIC based applications under KDE. @@ -61,7 +63,11 @@ rm -rf pkp cd pikdev -make -f Makefile.pkp +make -f Makefile.pkp \ +CCPP=g++ \ +LINK=g++ \ +CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.8.4" \ +LIBS= cd .. cp pikdev/pkp . make %{?_smp_mflags} @@ -69,7 +75,7 @@ %install rm -rf $RPM_BUILD_ROOT -make install-strip DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop @@ -96,6 +102,13 @@ %{_datadir}/icons/* %changelog +* Wed Mar 15 2006 Alain Portal 0.8.4-4 + - Exclude temporarily ppc arch because don't exist + in ppc glibc headers + - Override compiler for pkp Makefile and propagate $RPM_OPT_FLAGS on it + - Make install instead of install-strip + - Contributions of Ralf Corsepius + Thanks to him. * Wed Mar 08 2006 Alain Portal 0.8.4-3 - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5 - Package must own %{_datadir}/apps/%{name} directory From fedora-extras-commits at redhat.com Wed Mar 15 14:19:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 15 Mar 2006 09:19:14 -0500 Subject: rpms/perl-Mail-Sender/devel .cvsignore, 1.2, 1.3 perl-Mail-Sender.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603151419.k2FEJkmj022069@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Mail-Sender/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22011/devel Modified Files: .cvsignore perl-Mail-Sender.spec sources Log Message: Update to 0.8.13. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Sep 2005 15:12:40 -0000 1.2 +++ .cvsignore 15 Mar 2006 14:19:14 -0000 1.3 @@ -1 +1 @@ -Mail-Sender-0.8.10.tar.gz +Mail-Sender-0.8.13.tar.gz Index: perl-Mail-Sender.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/devel/perl-Mail-Sender.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Mail-Sender.spec 17 Feb 2006 20:37:31 -0000 1.2 +++ perl-Mail-Sender.spec 15 Mar 2006 14:19:14 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-Mail-Sender -Version: 0.8.10 -Release: 3%{?dist} +Version: 0.8.13 +Release: 1%{?dist} Summary: Module for sending mails with attachments through an SMTP server Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 15 2006 Jose Pedro Oliveira - 0.8.13-1 +- Update to 0.8.13. + * Fri Feb 17 2006 Jose Pedro Oliveira - 0.8.10-3 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Sep 2005 15:12:40 -0000 1.2 +++ sources 15 Mar 2006 14:19:14 -0000 1.3 @@ -1 +1 @@ -4dac1115bacca2ed0b8403c3874975da Mail-Sender-0.8.10.tar.gz +a30a7267995f7503724b3195ce9493bd Mail-Sender-0.8.13.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 14:19:03 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 15 Mar 2006 09:19:03 -0500 Subject: rpms/perl-Mail-Sender/FC-4 .cvsignore, 1.2, 1.3 perl-Mail-Sender.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603151420.k2FEK7sX022077@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Mail-Sender/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22011/FC-4 Modified Files: .cvsignore perl-Mail-Sender.spec sources Log Message: Update to 0.8.13. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 12 Sep 2005 15:12:40 -0000 1.2 +++ .cvsignore 15 Mar 2006 14:19:02 -0000 1.3 @@ -1 +1 @@ -Mail-Sender-0.8.10.tar.gz +Mail-Sender-0.8.13.tar.gz Index: perl-Mail-Sender.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/FC-4/perl-Mail-Sender.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Mail-Sender.spec 12 Sep 2005 15:12:40 -0000 1.1 +++ perl-Mail-Sender.spec 15 Mar 2006 14:19:02 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Mail-Sender -Version: 0.8.10 -Release: 2%{?dist} +Version: 0.8.13 +Release: 1%{?dist} Summary: Module for sending mails with attachments through an SMTP server Group: Development/Libraries @@ -10,7 +10,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description %{summary}. @@ -56,6 +56,12 @@ %changelog +* Wed Mar 15 2006 Jose Pedro Oliveira - 0.8.13-1 +- Update to 0.8.13. + +* Fri Feb 17 2006 Jose Pedro Oliveira - 0.8.10-3 +- Rebuild for FC5 (perl 5.8.8). + * Mon Sep 12 2005 Jose Pedro Oliveira - 0.8.10-2 - License clarification. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Mail-Sender/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 12 Sep 2005 15:12:40 -0000 1.2 +++ sources 15 Mar 2006 14:19:02 -0000 1.3 @@ -1 +1 @@ -4dac1115bacca2ed0b8403c3874975da Mail-Sender-0.8.10.tar.gz +a30a7267995f7503724b3195ce9493bd Mail-Sender-0.8.13.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 14:49:54 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 15 Mar 2006 09:49:54 -0500 Subject: owners owners.list,1.743,1.744 Message-ID: <200603151450.k2FEoRYg022376@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22356 Modified Files: owners.list Log Message: +kadischi Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.743 retrieving revision 1.744 diff -u -r1.743 -r1.744 --- owners.list 14 Mar 2006 19:54:38 -0000 1.743 +++ owners.list 15 Mar 2006 14:49:54 -0000 1.744 @@ -483,6 +483,7 @@ Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|juk|Jukebox and music manager for KDE|nomis80 at nomis80.org|extras-qa at fedoraproject.org| +Fedora Extras|kadischi|An application for Fedora-based LiveCD generation|cgoorah at yahoo.com.au|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 Wed Mar 15 14:51:42 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Wed, 15 Mar 2006 09:51:42 -0500 Subject: rpms/hercules/devel hercules.spec,1.9,1.10 Message-ID: <200603151452.k2FEqEmL022405@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/hercules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22388 Modified Files: hercules.spec Log Message: Next try, builds for me with mach, but not in the buildsys with mock :-( Index: hercules.spec =================================================================== RCS file: /cvs/extras/rpms/hercules/devel/hercules.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hercules.spec 14 Mar 2006 15:05:31 -0000 1.9 +++ hercules.spec 15 Mar 2006 14:51:42 -0000 1.10 @@ -10,6 +10,8 @@ Source: http://www.conmicro.cx/hercules/hercules-%{version}%{?date:-cvs}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: bison, zlib-devel, bzip2-devel, libgcrypt-devel, gcc-c++ +BuildRequires: gettext-devel +BuildRequires: autoconf, automake, libtool Obsoletes: hercules-docs <= 3.01 %description @@ -23,6 +25,9 @@ %prep %setup -n %{name}-%{version}%{?date:-cvs} +#autoreconf -Iautoconf -Im4 -f -i +aclocal +automake -c -f ### FIXME: Make buildsystem use standard autotools directories (Fix upstream please) %{__perl} -pi.orig -e 's|^(modexecdir) =.*$|$1 = \$(libdir)/hercules|' \ From fedora-extras-commits at redhat.com Wed Mar 15 15:16:41 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Wed, 15 Mar 2006 10:16:41 -0500 Subject: rpms/pikdev/FC-4 pikdev.spec,1.2,1.3 Message-ID: <200603151517.k2FFHEap024573@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24552 Modified Files: pikdev.spec Log Message: Try to fix a x86_64 build failure. /usr/lib/qt-3.3 seems not set. Index: pikdev.spec =================================================================== RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pikdev.spec 15 Mar 2006 13:27:26 -0000 1.2 +++ pikdev.spec 15 Mar 2006 15:16:41 -0000 1.3 @@ -1,6 +1,6 @@ Name: pikdev Version: 0.8.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC @@ -59,6 +59,8 @@ %build +[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh + %configure --disable-rpath rm -rf pkp @@ -102,6 +104,8 @@ %{_datadir}/icons/* %changelog +* Wed Mar 15 2006 Alain Portal 0.8.4-5 + - Source qt.sh if $QTDIR isn't set. Always Ralf... * Wed Mar 15 2006 Alain Portal 0.8.4-4 - Exclude temporarily ppc arch because don't exist in ppc glibc headers From fedora-extras-commits at redhat.com Wed Mar 15 15:23:22 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:23:22 -0500 Subject: rpms/muine - New directory Message-ID: <200603151523.k2FFNOii024768@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24760/muine Log Message: Directory /cvs/extras/rpms/muine added to the repository From fedora-extras-commits at redhat.com Wed Mar 15 15:23:27 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:23:27 -0500 Subject: rpms/muine/devel - New directory Message-ID: <200603151523.k2FFNTkJ024783@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24760/muine/devel Log Message: Directory /cvs/extras/rpms/muine/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 15 15:24:57 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:24:57 -0500 Subject: rpms/muine Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603151524.k2FFOxOk024817@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24805 Added Files: Makefile import.log Log Message: Setup of module muine --- NEW FILE Makefile --- # Top level Makefile for module muine all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 15 15:25:03 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:25:03 -0500 Subject: rpms/muine/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603151525.k2FFP5MI024837@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24805/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module muine --- NEW 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 Mar 15 15:27:12 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:27:12 -0500 Subject: rpms/muine import.log,1.1,1.2 Message-ID: <200603151527.k2FFRiLX024919@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24882 Modified Files: import.log Log Message: auto-import muine-0.8.4-5 on branch devel from muine-0.8.4-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/muine/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Mar 2006 15:24:57 -0000 1.1 +++ import.log 15 Mar 2006 15:27:12 -0000 1.2 @@ -0,0 +1 @@ +muine-0_8_4-5:HEAD:muine-0.8.4-5.src.rpm:1142436430 From fedora-extras-commits at redhat.com Wed Mar 15 15:27:18 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 10:27:18 -0500 Subject: rpms/muine/devel muine-gacutil_flags.patch, NONE, 1.1 muine.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603151527.k2FFRo3S024923@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24882/devel Modified Files: .cvsignore sources Added Files: muine-gacutil_flags.patch muine.spec Log Message: auto-import muine-0.8.4-5 on branch devel from muine-0.8.4-5.src.rpm muine-gacutil_flags.patch: --- NEW FILE muine-gacutil_flags.patch --- --- muine-0.8.4/configure.old 2006-03-14 20:51:14.000000000 +0100 +++ muine-0.8.4/configure 2006-03-14 20:52:32.000000000 +0100 @@ -21724,7 +21724,7 @@ { (exit 1); exit 1; }; } fi -GACUTIL_FLAGS='/package muine /gacdir $(libdir) /root $(DESTDIR)$(libdir)' +GACUTIL_FLAGS='/package muine /gacdir $(prefix)/lib /root $(DESTDIR)$(prefix)/lib' --- NEW FILE muine.spec --- Name: muine Version: 0.8.4 Release: 5%{?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-gacutil_flags.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: mono-devel, gtk-sharp2-gapi, gtk-sharp2 BuildRequires: gtk2-devel, gnome-vfs2-devel, gnome-icon-theme BuildRequires: dbus-sharp >= 0.50, gdbm-devel BuildRequires: gstreamer08-plugins-devel BuildRequires: libid3tag-devel BuildRequires: libvorbis-devel, flac-devel BuildRequires: desktop-file-utils, gettext Requires: mono-core, dbus-sharp >= 0.50, gtk-sharp2 Requires(pre): GConf2 Requires(post): GConf2, desktop-file-utils Requires(preun): GConf2 Requires(postun): desktop-file-utils %description Muine is a new music player for GNOME using some new UI ideas. The idea is that it will be much easier and comfortable to use than the iTunes model, which is used by most GNOME music players. It is written in C and C#, using GStreamer for music playback. %package devel Summary: Files required for Muine plug-in development Group: Development/Libraries Requires: %{name} = %{epoch}:%{version} %description devel Files needed for building plug-ins for Muine. %prep %setup -q %patch0 -p1 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT #install tray plugin which is not included by default install plugins/TrayIcon.dll $RPM_BUILD_ROOT%{_libdir}/muine/plugins/ install -m 644 plugins/TrayIcon.dll.config $RPM_BUILD_ROOT%{_libdir}/muine/plugins/ install plugins/muine-tray* $RPM_BUILD_ROOT%{_libdir}/muine/plugins/ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' %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 %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : fi %post update-desktop-database &> /dev/null ||: export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : fi %postun update-desktop-database &> /dev/null ||: %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README TODO %{_sysconfdir}/gconf/schemas/muine.schemas %{_bindir}/* %{_libdir}/dbus-1.0/services/org.gnome.Muine.service %{_prefix}/lib/mono/gac/muine-dbus/*/muine-dbus.dll %{_prefix}/lib/mono/gac/muine-plugin/*/muine-plugin.dll %{_prefix}/lib/mono/muine %{_libdir}/muine/*.so* %{_libdir}/muine/*.exe* %{_libdir}/muine/plugins/InotifyPlugin.dll* %{_datadir}/applications/* %{_datadir}/pixmaps/muine.png %{_libdir}/muine/plugins/TrayIcon.dll* %{_libdir}/muine/plugins/muine-tray-*.png %files devel %{_libdir}/pkgconfig/*.pc %{_libdir}/muine/*.a %changelog * Tue Mar 14 2006 Sindre Pedersen Bj??rdal - 0.8.4-5 - Patch added to really fix the x86_64 issue * Mon Mar 13 2006 Sindre Pedersen Bj??rdal - 0.8.4-4 - Replace {_libdir} with {_prefix}/lib/ for 64-bit * Mon Mar 06 2006 Sindre Pedersen Bj??rdal - 0.8.4-3 - Include trayicon by default - Fix GConf scriptlets - Create -devel package for devel files * Tue Feb 16 2006 Sindre Pedersen Bj??rdal - 0.8.4-2 - Remove Dashboard plugin, as dashboard doesn't exist yet. * Mon Jan 30 2006 Sindre Pedersen Bj??rdal - 0.8.4-1 - Initial build Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/muine/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Mar 2006 15:25:02 -0000 1.1 +++ .cvsignore 15 Mar 2006 15:27:18 -0000 1.2 @@ -0,0 +1 @@ +muine-0.8.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/muine/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Mar 2006 15:25:02 -0000 1.1 +++ sources 15 Mar 2006 15:27:18 -0000 1.2 @@ -0,0 +1 @@ +215dab4b1a0022deadb848b646640514 muine-0.8.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 15 16:02:02 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Wed, 15 Mar 2006 11:02:02 -0500 Subject: owners owners.list,1.744,1.745 Message-ID: <200603151602.k2FG2YZS027085@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25046 Modified Files: owners.list Log Message: Add muine that I maintain Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.744 retrieving revision 1.745 diff -u -r1.744 -r1.745 --- owners.list 15 Mar 2006 14:49:54 -0000 1.744 +++ owners.list 15 Mar 2006 16:02:01 -0000 1.745 @@ -703,6 +703,7 @@ Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|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|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org| Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org| Fedora Extras|mysql-administrator|GUI to manage mysql Databases|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com From fedora-extras-commits at redhat.com Wed Mar 15 16:28:28 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 15 Mar 2006 11:28:28 -0500 Subject: rpms/highlight/devel highlight-2.4-fixcodegen.patch, NONE, 1.1 highlight.spec, 1.11, 1.12 Message-ID: <200603151629.k2FGT0gR027219@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27197 Modified Files: highlight.spec Added Files: highlight-2.4-fixcodegen.patch Log Message: Add fixcodegen patch, #184245 highlight-2.4-fixcodegen.patch: --- NEW FILE highlight-2.4-fixcodegen.patch --- diff -ur highlight-2.4.4.old/highlight/codegenerator.cpp highlight-2.4.4/highlight/codegenerator.cpp --- highlight-2.4.4.old/highlight/codegenerator.cpp 2006-02-19 09:11:18.000000000 -0800 +++ highlight-2.4.4/highlight/codegenerator.cpp 2006-02-19 09:11:18.000000000 -0800 @@ -284,7 +284,11 @@ bool CodeGenerator::readNewLine(string &newLine){ bool eof; - terminatingChar=newLine[lineIndex-1]; + if (lineIndex > 0) { + terminatingChar=newLine[lineIndex-1]; + } else { + terminatingChar = '\0'; + } if (formattingPossible && formattingEnabled) { eof=!formatter->hasMoreLines(); if (!eof) { Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- highlight.spec 12 Mar 2006 20:09:47 -0000 1.11 +++ highlight.spec 15 Mar 2006 16:28:28 -0000 1.12 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch +Patch3: highlight-2.4-fixcodegen.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -25,6 +26,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -49,6 +51,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 +- Add fixcodegen patch #184245 + * Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 - New upstream release - Adapt rpmopt patch to new upstream release From fedora-extras-commits at redhat.com Wed Mar 15 16:30:24 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 15 Mar 2006 11:30:24 -0500 Subject: rpms/highlight/FC-4 highlight-2.4-fixcodegen.patch, NONE, 1.1 highlight.spec, 1.8, 1.9 Message-ID: <200603151630.k2FGUubi027293@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27273 Modified Files: highlight.spec Added Files: highlight-2.4-fixcodegen.patch Log Message: Add fixcodegen patch, #184245 highlight-2.4-fixcodegen.patch: --- NEW FILE highlight-2.4-fixcodegen.patch --- diff -ur highlight-2.4.4.old/highlight/codegenerator.cpp highlight-2.4.4/highlight/codegenerator.cpp --- highlight-2.4.4.old/highlight/codegenerator.cpp 2006-02-19 09:11:18.000000000 -0800 +++ highlight-2.4.4/highlight/codegenerator.cpp 2006-02-19 09:11:18.000000000 -0800 @@ -284,7 +284,11 @@ bool CodeGenerator::readNewLine(string &newLine){ bool eof; - terminatingChar=newLine[lineIndex-1]; + if (lineIndex > 0) { + terminatingChar=newLine[lineIndex-1]; + } else { + terminatingChar = '\0'; + } if (formattingPossible && formattingEnabled) { eof=!formatter->hasMoreLines(); if (!eof) { Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/highlight.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- highlight.spec 12 Mar 2006 20:14:31 -0000 1.8 +++ highlight.spec 15 Mar 2006 16:30:24 -0000 1.9 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch +Patch3: highlight-2.4-fixcodegen.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -25,6 +26,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -49,6 +51,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 +- Add fixcodegen patch #184245 + * Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 - New upstream release - Adapt rpmopt patch to new upstream release From fedora-extras-commits at redhat.com Wed Mar 15 16:37:45 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 11:37:45 -0500 Subject: rpms/ecl/devel ecl-gcc41.patch,NONE,1.1 ecl.spec,1.2,1.3 Message-ID: <200603151638.k2FGcHsg027413@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/ecl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27390 Modified Files: ecl.spec Added Files: ecl-gcc41.patch Log Message: ecl-gcc41.patch: --- NEW FILE ecl-gcc41.patch --- --- ecl-0.9h/src/gc/include/gc_cpp.h.gcc41 2006-03-15 17:11:48.000000000 +0100 +++ ecl-0.9h/src/gc/include/gc_cpp.h 2006-03-15 17:12:13.000000000 +0100 @@ -180,7 +180,7 @@ inline void* operator new[]( size_t size, void *p ); inline void operator delete[]( void* obj ); # ifdef GC_PLACEMENT_DELETE - inline void gc::operator delete[]( void*, void* ); + inline void operator delete[]( void*, void* ); # endif #endif /* GC_OPERATOR_NEW_ARRAY */ }; Index: ecl.spec =================================================================== RCS file: /cvs/extras/rpms/ecl/devel/ecl.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ecl.spec 15 Mar 2006 10:28:47 -0000 1.2 +++ ecl.spec 15 Mar 2006 16:37:45 -0000 1.3 @@ -1,12 +1,13 @@ Name: ecl Version: 0.9h -Release: 4%{?dist} +Release: 5%{?dist} Summary: Embeddable Common-Lisp Group: Development/Languages License: LGPL URL: http://ecls.sourceforge.net Source0: http://switch.dl.sourceforge.net/sourceforge/ecls/ecl-0.9h.tgz +Patch0: ecl-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libX11-devel BuildRequires: m4 @@ -25,13 +26,14 @@ %prep %setup0 -q +%patch0 -p1 # wrong character in texinfo file perl -pi -e 's|\xc7||' src/doc/user.txi %build %configure --enable-boehm=included --enable-threads=yes --with-cxx -make +make -k (cd build/doc; make all html) @@ -77,6 +79,9 @@ %changelog +* Wed Mar 15 2006 Gerard Milmeister - 0.9h-5 +- patch for gcc 4.1 + * Tue Mar 14 2006 Gerard Milmeister - 0.9h-4 - removed buildreq perl From fedora-extras-commits at redhat.com Wed Mar 15 17:16:59 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 12:16:59 -0500 Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.13, 1.14 abcm2ps.spec, 1.13, 1.14 sources, 1.13, 1.14 Message-ID: <200603151717.k2FHHVV3029544@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29497/FC-4 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 13 Mar 2006 23:01:33 -0000 1.13 +++ .cvsignore 15 Mar 2006 17:16:59 -0000 1.14 @@ -1,2 +1,2 @@ -abcm2ps-4.12.10.tar.gz +abcm2ps-4.12.11.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- abcm2ps.spec 13 Mar 2006 23:01:33 -0000 1.13 +++ abcm2ps.spec 15 Mar 2006 17:16:59 -0000 1.14 @@ -1,5 +1,5 @@ Name: abcm2ps -Version: 4.12.10 +Version: 4.12.11 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript @@ -52,6 +52,9 @@ %changelog +* Wed Mar 15 2006 Gerard Milmeister - 4.12.11-1 +- new version 4.12.11 + * Mon Mar 13 2006 Gerard Milmeister - 4.12.10-1 - new version 4.12.10 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 13 Mar 2006 23:01:33 -0000 1.13 +++ sources 15 Mar 2006 17:16:59 -0000 1.14 @@ -1,2 +1,2 @@ -4866c0fdc9a9151e03400bb3fd55bb18 abcm2ps-4.12.10.tar.gz +8052dc74e322ecf065a44cf1e6bd05e0 abcm2ps-4.12.11.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Wed Mar 15 17:17:05 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 12:17:05 -0500 Subject: rpms/abcm2ps/devel .cvsignore, 1.13, 1.14 abcm2ps.spec, 1.14, 1.15 sources, 1.13, 1.14 Message-ID: <200603151717.k2FHHcBc029552@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29497/devel Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 13 Mar 2006 23:01:39 -0000 1.13 +++ .cvsignore 15 Mar 2006 17:17:05 -0000 1.14 @@ -1,2 +1,2 @@ -abcm2ps-4.12.10.tar.gz +abcm2ps-4.12.11.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- abcm2ps.spec 13 Mar 2006 23:01:40 -0000 1.14 +++ abcm2ps.spec 15 Mar 2006 17:17:05 -0000 1.15 @@ -1,5 +1,5 @@ Name: abcm2ps -Version: 4.12.10 +Version: 4.12.11 Release: 1%{?dist} Summary: A program to typeset ABC tunes into Postscript @@ -52,6 +52,9 @@ %changelog +* Wed Mar 15 2006 Gerard Milmeister - 4.12.11-1 +- new version 4.12.11 + * Mon Mar 13 2006 Gerard Milmeister - 4.12.10-1 - new version 4.12.10 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 13 Mar 2006 23:01:40 -0000 1.13 +++ sources 15 Mar 2006 17:17:05 -0000 1.14 @@ -1,2 +1,2 @@ -4866c0fdc9a9151e03400bb3fd55bb18 abcm2ps-4.12.10.tar.gz +8052dc74e322ecf065a44cf1e6bd05e0 abcm2ps-4.12.11.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Wed Mar 15 17:20:02 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 12:20:02 -0500 Subject: rpms/abcm2ps/FC-4 abcm2ps.spec,1.14,1.15 Message-ID: <200603151720.k2FHKYUv029687@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29655/FC-4 Modified Files: abcm2ps.spec Log Message: Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- abcm2ps.spec 15 Mar 2006 17:16:59 -0000 1.14 +++ abcm2ps.spec 15 Mar 2006 17:20:02 -0000 1.15 @@ -1,12 +1,12 @@ Name: abcm2ps Version: 4.12.11 -Release: 1%{?dist} +Release: 2%{?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-4.12.10.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.11.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Wed Mar 15 17:20:08 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Wed, 15 Mar 2006 12:20:08 -0500 Subject: rpms/abcm2ps/devel abcm2ps.spec,1.15,1.16 Message-ID: <200603151720.k2FHKeiY029690@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29655/devel Modified Files: abcm2ps.spec Log Message: Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- abcm2ps.spec 15 Mar 2006 17:17:05 -0000 1.15 +++ abcm2ps.spec 15 Mar 2006 17:20:08 -0000 1.16 @@ -1,12 +1,12 @@ Name: abcm2ps Version: 4.12.11 -Release: 1%{?dist} +Release: 2%{?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-4.12.10.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.11.tar.gz Source1: http://abcplus.sourceforge.net/abcplus_en-1.0.4.zip BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) From fedora-extras-commits at redhat.com Wed Mar 15 18:38:05 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:38:05 -0500 Subject: rpms/raidem - New directory Message-ID: <200603151838.k2FIc70W032082@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32074/raidem Log Message: Directory /cvs/extras/rpms/raidem added to the repository From fedora-extras-commits at redhat.com Wed Mar 15 18:38:11 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:38:11 -0500 Subject: rpms/raidem/devel - New directory Message-ID: <200603151838.k2FIcDH1032097@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32074/raidem/devel Log Message: Directory /cvs/extras/rpms/raidem/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 15 18:38:29 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:38:29 -0500 Subject: rpms/raidem Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603151838.k2FIcVAL032131@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32119 Added Files: Makefile import.log Log Message: Setup of module raidem --- NEW FILE Makefile --- # Top level Makefile for module raidem all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 15 18:38:34 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:38:34 -0500 Subject: rpms/raidem/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603151838.k2FIcaXt032152@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32119/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module raidem --- NEW 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 Mar 15 18:43:28 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:43:28 -0500 Subject: rpms/raidem import.log,1.1,1.2 Message-ID: <200603151844.k2FIi1Hc032314@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32246 Modified Files: import.log Log Message: auto-import raidem-0.3-1 on branch devel from raidem-0.3-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/raidem/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 15 Mar 2006 18:38:28 -0000 1.1 +++ import.log 15 Mar 2006 18:43:28 -0000 1.2 @@ -0,0 +1 @@ +raidem-0_3-1:HEAD:raidem-0.3-1.src.rpm:1142447952 From fedora-extras-commits at redhat.com Wed Mar 15 18:43:34 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:43:34 -0500 Subject: rpms/raidem/devel raidem-0.3-datapath.patch, NONE, 1.1 raidem-0.3-no-mp3.patch, NONE, 1.1 raidem-0.3-syslibs.patch, NONE, 1.1 raidem-0.3-warn.patch, NONE, 1.1 raidem.desktop, NONE, 1.1 raidem.png, NONE, 1.1 raidem.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603151844.k2FIi6Ol032318@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32246/devel Modified Files: .cvsignore sources Added Files: raidem-0.3-datapath.patch raidem-0.3-no-mp3.patch raidem-0.3-syslibs.patch raidem-0.3-warn.patch raidem.desktop raidem.png raidem.spec Log Message: auto-import raidem-0.3-1 on branch devel from raidem-0.3-1.src.rpm raidem-0.3-datapath.patch: --- NEW FILE raidem-0.3-datapath.patch --- --- raidem-0.3/src/init.m.orig 2006-03-12 21:50:32.000000000 +0100 +++ raidem-0.3/src/init.m 2006-03-12 21:59:44.000000000 +0100 @@ -115,6 +115,8 @@ tiles_init(); set_colour_conversion_keep_alpha(); + /* so that Sebum will find our files */ + chdir(RAIDEM_DATA_DIR); base_sebum = [SebFile new]; if (not [base_sebum loadSebumDirectory:"data/base"]) { base_sebum = nil; raidem-0.3-no-mp3.patch: --- NEW FILE raidem-0.3-no-mp3.patch --- diff -urN raidem-0.3-src.orig/src/music.m raidem-0.3-src/src/music.m --- raidem-0.3-src.orig/src/music.m 2006-01-21 09:24:01.000000000 +0100 +++ raidem-0.3-src/src/music.m 2006-03-12 20:42:31.000000000 +0100 @@ -3,6 +3,8 @@ * This file handles music stuff using AllegroMP3. */ +#ifndef NO_MP3 + #include #include #include @@ -287,3 +289,47 @@ free(music_data); music_data = NULL; } + +/*--------------------------------------------------------------*/ + +#else /* ifndef NO_MP3 */ + +int music_vol = 255; + +void play_music(const char *directory) +{ +} + +void poll_music(void) +{ +} + +void free_music(void) +{ +} + +void adjust_music_volume(void) +{ +} + +void play_mp3(const char *filename) +{ +} + +void start_autopoll_music(void) +{ +} + +void stop_autopoll_music(void) +{ +} + +void music_init(void) +{ +} + +void music_shutdown(void) +{ +} + +#endif diff -urN raidem-0.3-src.orig/src/seborrhea/mp3.m raidem-0.3-src/src/seborrhea/mp3.m --- raidem-0.3-src.orig/src/seborrhea/mp3.m 2005-09-01 18:55:28.000000000 +0200 +++ raidem-0.3-src/src/seborrhea/mp3.m 2006-03-12 20:42:31.000000000 +0100 @@ -1,3 +1,4 @@ +#ifndef NO_MP3 /* seborrhea-mp3.m, * * This is for music lumps. @@ -76,3 +77,5 @@ [parent addToList:seb]; return YES; } + +#endif diff -urN raidem-0.3-src.orig/include/seborrhea/seborrhea.h raidem-0.3-src/include/seborrhea/seborrhea.h --- raidem-0.3-src.orig/include/seborrhea/seborrhea.h 2005-09-01 18:52:37.000000000 +0200 +++ raidem-0.3-src/include/seborrhea/seborrhea.h 2006-03-12 20:42:31.000000000 +0100 @@ -16,7 +16,9 @@ #include "seborrhea/container-queue.h" #include "seborrhea/container-shuffle.h" +#ifndef NO_MP3 #include "seborrhea/mp3.h" +#endif #include "seborrhea/spline.h" raidem-0.3-syslibs.patch: --- NEW FILE raidem-0.3-syslibs.patch --- diff -urN raidem-0.3-src.orig/Makefile raidem-0.3-src/Makefile --- raidem-0.3-src.orig/Makefile 2006-01-31 06:33:08.000000000 +0100 +++ raidem-0.3-src/Makefile 2006-03-12 20:42:31.000000000 +0100 @@ -208,10 +208,7 @@ spline.o \ strdup.o \ token.o \ - zzpk.o) \ - lib/alrand/alrand.o \ - lib/alrand/lcg.o \ - lib/alrand/mersenne.o + zzpk.o) UNITS := $(addprefix obj/units/,\ all-units.o \ diff -urN raidem-0.3-src.orig/include/alrand/alrand.h raidem-0.3-src/include/alrand/alrand.h --- raidem-0.3-src.orig/include/alrand/alrand.h 1970-01-01 01:00:00.000000000 +0100 +++ raidem-0.3-src/include/alrand/alrand.h 2006-03-12 20:43:25.000000000 +0100 @@ -0,0 +1,30 @@ +/* (partial) alrand emulation file for glibc */ +#ifndef __alrand_h +#define __alrand_h + +#include + +#define alrand_init() +#define alrand_exit() +#define alrand_set_global_generator_type(x) + + +#define alrand_rand() random() +#define alrand_srand(seed) srandom(seed) + + +#define alrand_create(a, b) calloc(1, sizeof(struct drand48_data)) +#define alrand_destroy(state) free(state) +#define alrand_seed(state, seed) srand48_r(seed, state) + +typedef unsigned int alrand_uint32_t; +typedef struct drand48_data alrand_state; + +static inline alrand_uint32_t alrand_generate(alrand_state *state) +{ + long ret; + lrand48_r(state, &ret); + return ret; +} + +#endif diff -urN raidem-0.3-src.orig/include/seborrhea/font-glyphkeeper.h raidem-0.3-src/include/seborrhea/font-glyphkeeper.h --- raidem-0.3-src.orig/include/seborrhea/font-glyphkeeper.h 2005-09-01 17:18:13.000000000 +0200 +++ raidem-0.3-src/include/seborrhea/font-glyphkeeper.h 2006-03-12 20:42:31.000000000 +0100 @@ -2,7 +2,7 @@ #ifndef _seb_included_font_glyphkeeper_h #define _seb_included_font_glyphkeeper_h -#include "glyph-keeper/include/glyph.h" +#include #include "seborrhea/font.h" @interface SebFontGlyphKeeper: AbstractSebFont diff -urN raidem-0.3-src.orig/src/map-editor/map-proc.m raidem-0.3-src/src/map-editor/map-proc.m --- raidem-0.3-src.orig/src/map-editor/map-proc.m 2006-01-20 03:33:33.000000000 +0100 +++ raidem-0.3-src/src/map-editor/map-proc.m 2006-03-12 20:42:31.000000000 +0100 @@ -4,7 +4,7 @@ #include #include #include -#include "adime/include/adime.h" +#include #include "common.h" #include "group.h" #include "gui/gui-clip.h" diff -urN raidem-0.3-src.orig/src/map-editor/redit.m raidem-0.3-src/src/map-editor/redit.m --- raidem-0.3-src.orig/src/map-editor/redit.m 2005-12-06 00:38:24.000000000 +0100 +++ raidem-0.3-src/src/map-editor/redit.m 2006-03-12 20:42:31.000000000 +0100 @@ -7,7 +7,7 @@ #include #include #include -#include "adime/include/adime.h" +#include #include "common.h" #include "game.h" #include "group.h" diff -urN raidem-0.3-src.orig/src/seborrhea/font-glyphkeeper.m raidem-0.3-src/src/seborrhea/font-glyphkeeper.m --- raidem-0.3-src.orig/src/seborrhea/font-glyphkeeper.m 2006-01-10 05:39:43.000000000 +0100 +++ raidem-0.3-src/src/seborrhea/font-glyphkeeper.m 2006-03-12 20:42:31.000000000 +0100 @@ -4,7 +4,7 @@ */ #include -#include "glyph-keeper/include/glyph.h" +#include #include "seborrhea/font-glyphkeeper.h" #include "seborrhea/seborrhea-common.h" #include "seborrhea/seborrhea-debug.h" raidem-0.3-warn.patch: --- NEW FILE raidem-0.3-warn.patch --- diff -urN raidem-0.3-src.orig/src/map.m raidem-0.3-src/src/map.m --- raidem-0.3-src.orig/src/map.m 2005-11-29 23:13:43.000000000 +0100 +++ raidem-0.3-src/src/map.m 2006-03-12 20:42:31.000000000 +0100 @@ -390,7 +390,7 @@ dirname = strrchr(temp, '/'); if (dirname) - *dirname++; + dirname++; } music_dirname = strdup(dirname); --- NEW FILE raidem.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Raidem GenericName=2d top-down shoot'em up Comment=Inspired by Raptor Exec=raidem Icon=raidem.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; Version=0.3 --- NEW FILE raidem.spec --- Name: raidem Version: 0.3 Release: 1%{?dist} Summary: 2d top-down shoot'em up Group: Amusements/Games License: zlib License URL: http://home.exetel.com.au/tjaden/raidem/ # This is an exacy copy of the upstream src except that lib/almp3 which is # an included mp3 decoder has been removed. Source0: %{name}-%{version}-src.zip Source1: raidem.png Source2: raidem.desktop Patch0: raidem-0.3-no-mp3.patch Patch1: raidem-0.3-syslibs.patch Patch2: raidem-0.3-datapath.patch Patch3: raidem-0.3-warn.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-objc glyph-keeper-devel freetype-devel adime-devel BuildRequires: zziplib-devel libpng-devel %description Raid'em is a 2d top-down shoot'em up. It began as a remake of Raid II (abandoned long ago), which was inspired by Raptor, but has turned out very differently. Features: Neat looking graphics, LOTS of explosions and scrap metal, Eye candy a-plenty, Many different powerups, A desert. And a space platform. And some snow, 2 player mode, Demo recording and playback, Loads of fun. %prep %setup -q -n %{name}-%{version}-src %patch0 -p1 -z .no_mp3 %patch1 -p1 -z .syslibs %patch2 -p1 -z .datapath %patch3 -p1 -z .warn # remove all included system libs, to avoid using the included system headers. mv lib/loadpng . rm -fr lib/* mv loadpng lib %build make %{?_smp_mflags} lib/loadpng/libldpng.a raid \ CFLAGS="-Iinclude -Ilib -DNO_MP3 -DNO_ID3TAGS -DNO_FBLEND \ -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -DITOUCH \ -DRAIDEM_DATA_DIR=\\\"%{_datadir}/%{name}/\\\"" \ LDLIBS="-lglyph-alleg `freetype-config --libs` lib/loadpng/libldpng.a -lpng \ -lzzip -ladime `allegro-config --libs` -lz -lpthread -lobjc" %install rm -rf $RPM_BUILD_ROOT #DIY, since the Makefile uses hardcoded ( := assigned) paths. mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 755 raid $RPM_BUILD_ROOT%{_bindir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} cp -a data demos maps $RPM_BUILD_ROOT%{_datadir}/%{name} # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps install -p -m 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps %clean rm -rf $RPM_BUILD_ROOT %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %doc ChangeLog docs/LICENCE.txt docs/README.txt docs/damages.txt %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-raidem.desktop %{_datadir}/icons/hicolor/48x48/apps/raidem.png %changelog * Sat Mar 12 2006 Hans de Goede 0.3-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/raidem/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 15 Mar 2006 18:38:34 -0000 1.1 +++ .cvsignore 15 Mar 2006 18:43:34 -0000 1.2 @@ -0,0 +1 @@ +raidem-0.3-src.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/raidem/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 15 Mar 2006 18:38:34 -0000 1.1 +++ sources 15 Mar 2006 18:43:34 -0000 1.2 @@ -0,0 +1 @@ +7a8de682a0fe122e784cc192b19ece4e raidem-0.3-src.zip From fedora-extras-commits at redhat.com Wed Mar 15 18:43:42 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 13:43:42 -0500 Subject: owners owners.list,1.745,1.746 Message-ID: <200603151844.k2FIiEY9032347@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32297/owners Modified Files: owners.list Log Message: Add adime, glyph-keeper, raidem Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.745 retrieving revision 1.746 diff -u -r1.745 -r1.746 --- owners.list 15 Mar 2006 16:02:01 -0000 1.745 +++ owners.list 15 Mar 2006 18:43:41 -0000 1.746 @@ -18,6 +18,7 @@ Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| Fedora Extras|acpitool|A command line ACPI client for Linux|pertusus at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|adime|Allegro Dialogs Made Easy|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|advancecomp|Recompression utilities for .PNG, .MNG and .ZIP files|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|aide|Intrusion detection environment|bugs.michael at gmx.net|extras-qa at fedoraproject.org| @@ -331,6 +332,7 @@ Fedora Extras|global|A source code tag system|gemi at bluewin.ch|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|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|gnet2|A simple network library built upon glib|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| @@ -1215,6 +1217,7 @@ Fedora Extras|qucs|Circuit simulator|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|R|A language and environment for statistical computing and graphics|tcallawa at redhat.com|extras-qa at fedoraproject.org| +Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|rdiff-backup|Convenient and transparent local/remote incremental mirror/backup|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 15 19:28:22 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 15 Mar 2006 14:28:22 -0500 Subject: rpms/raidem/devel raidem.spec,1.1,1.2 Message-ID: <200603151928.k2FJSsow001954@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/raidem/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1937 Modified Files: raidem.spec Log Message: Add missing desktop-file-utils BR Index: raidem.spec =================================================================== RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- raidem.spec 15 Mar 2006 18:43:34 -0000 1.1 +++ raidem.spec 15 Mar 2006 19:28:21 -0000 1.2 @@ -16,7 +16,7 @@ Patch3: raidem-0.3-warn.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-objc glyph-keeper-devel freetype-devel adime-devel -BuildRequires: zziplib-devel libpng-devel +BuildRequires: zziplib-devel libpng-devel desktop-file-utils %description Raid'em is a 2d top-down shoot'em up. It began as a remake of Raid II From fedora-extras-commits at redhat.com Wed Mar 15 19:52:17 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 15 Mar 2006 14:52:17 -0500 Subject: rpms/thinkpad-kmod/devel kmodtool, 1.2, 1.3 thinkpad-kmod.spec, 1.5, 1.6 Message-ID: <200603151952.k2FJqn7n002348@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2329 Modified Files: kmodtool thinkpad-kmod.spec Log Message: * Wed Mar 15 2006 Ville Skytt?? - 5.9-3 - Build for xen0 and xenU too. - Remove xen-hypervisor and xen-guest from kmodtool. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/kmodtool,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- kmodtool 28 Jan 2006 12:51:08 -0000 1.2 +++ kmodtool 15 Mar 2006 19:52:17 -0000 1.3 @@ -24,8 +24,8 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.4" -knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen\(0\|U\|-\(guest\|hypervisor\)\)\)' +myver="0.10.5" +knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= verrel= Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- thinkpad-kmod.spec 12 Mar 2006 16:52:39 -0000 1.5 +++ thinkpad-kmod.spec 15 Mar 2006 19:52:17 -0000 1.6 @@ -4,8 +4,12 @@ # end stuff to be ... # temporarily hardcoded: -%define kver 2.6.15-1.2041_FC5 +%define kver 2.6.15-1.2054_FC5 +%ifarch i686 +%define kvariants "" xen0 xenU +%else %define kvariants "" +%endif %define kmod_name thinkpad %define kverrel %(%{kmodtool} verrel %{?kver} 2>/dev/null) @@ -65,6 +69,10 @@ %changelog +* Wed Mar 15 2006 Ville Skytt?? - 5.9-3 +- Build for xen0 and xenU too. +- Remove xen-hypervisor and xen-guest from kmodtool. + * Thu Mar 2 2006 Ville Skytt?? - 5.9-2 - Hardcode kernel version and variants for a test build. From fedora-extras-commits at redhat.com Wed Mar 15 19:55:56 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 15 Mar 2006 14:55:56 -0500 Subject: rpms/lirc-kmod/devel lirc-kmod.spec,1.4,1.5 Message-ID: <200603151956.k2FJuSxO002436@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2413 Modified Files: lirc-kmod.spec Log Message: * Wed Mar 15 2006 Ville Skytt?? - 0.8.0-4 - Add ppc64 and ppc64iseries while waiting for #185387. Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lirc-kmod.spec 13 Mar 2006 21:09:15 -0000 1.4 +++ lirc-kmod.spec 15 Mar 2006 19:55:56 -0000 1.5 @@ -6,7 +6,7 @@ # end stuff to be ... # temporarily hardcoded: -%define kver 2.6.15-1.2041_FC5 +%define kver 2.6.15-1.2054_FC5 %ifnarch i686 x86_64 ppc %define kvariants "" %else @@ -27,7 +27,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 3.%(echo %{kverrel} | tr - _) +Release: 4.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -38,7 +38,8 @@ Patch1: %{name}-0.8.0-2616.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -ExclusiveArch: i586 i686 x86_64 ppc +# ExclusiveArch to assist the FE build system. +ExclusiveArch: i586 i686 x86_64 ppc ppc64 ppc64iseries %description LIRC is a package that allows you to decode and send infra-red and @@ -115,6 +116,9 @@ %changelog +* Wed Mar 15 2006 Ville Skytt?? - 0.8.0-4 +- Add ppc64 and ppc64iseries while waiting for #185387. + * Mon Mar 13 2006 Ville Skytt?? - 0.8.0-3 - Hardcode kernel version and variants for test builds. - Remove xen-hypervisor and xen-guest from kmodtool. From fedora-extras-commits at redhat.com Wed Mar 15 20:23:26 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Wed, 15 Mar 2006 15:23:26 -0500 Subject: rpms/thinkpad-kmod/devel thinkpad-kmod.spec,1.6,1.7 Message-ID: <200603152023.k2FKNwjm004577@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4560 Modified Files: thinkpad-kmod.spec Log Message: * Wed Mar 15 2006 Ville Skytt?? - 5.9-4 - Drop xenU. Index: thinkpad-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- thinkpad-kmod.spec 15 Mar 2006 19:52:17 -0000 1.6 +++ thinkpad-kmod.spec 15 Mar 2006 20:23:25 -0000 1.7 @@ -6,7 +6,7 @@ # temporarily hardcoded: %define kver 2.6.15-1.2054_FC5 %ifarch i686 -%define kvariants "" xen0 xenU +%define kvariants "" xen0 %else %define kvariants "" %endif @@ -18,7 +18,7 @@ Name: %{kmod_name}-kmod Summary: %{kmod_name} kernel modules Version: 5.9 -Release: 2.%(echo %{kverrel} | tr - _) +Release: 4.%(echo %{kverrel} | tr - _) URL: http://tpctl.sourceforge.net/ Source0: http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz @@ -69,6 +69,9 @@ %changelog +* Wed Mar 15 2006 Ville Skytt?? - 5.9-4 +- Drop xenU. + * Wed Mar 15 2006 Ville Skytt?? - 5.9-3 - Build for xen0 and xenU too. - Remove xen-hypervisor and xen-guest from kmodtool. From fedora-extras-commits at redhat.com Wed Mar 15 21:16:35 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 16:16:35 -0500 Subject: rpms/koffice/devel .cvsignore, 1.7, 1.8 koffice.spec, 1.31, 1.32 sources, 1.7, 1.8 Message-ID: <200603152117.k2FLH72o006834@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6787 Modified Files: .cvsignore koffice.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 2 Feb 2006 12:47:27 -0000 1.7 +++ .cvsignore 15 Mar 2006 21:16:35 -0000 1.8 @@ -1 +1 @@ -koffice-1.4.90.tar.bz2 +koffice-1.4.95.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- koffice.spec 26 Feb 2006 08:54:13 -0000 1.31 +++ koffice.spec 15 Mar 2006 21:16:35 -0000 1.32 @@ -1,18 +1,17 @@ Name: koffice -Version: 1.4.90 -Release: 4%{?dist} +Version: 1.4.95 +Release: 1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: http://download.kde.org/unstable/koffice-1.5-beta1/src/koffice-1.4.90.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-beta2/koffice-1.4.95.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -# Fix --enable-final -Patch1: koffice-kotext-lines.patch +Patch1: koffice-kspread-cpp.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -54,7 +53,6 @@ BuildRequires: aspell-devel BuildRequires: libacl-devel BuildRequires: libxslt-devel -# new with 1.4.90 BuildRequires: OpenEXR-devel BuildRequires: libexif-devel BuildRequires: libGL-devel libGLU-devel @@ -210,7 +208,7 @@ %prep %setup -q %patch0 -p1 -%patch1 -p2 +%patch1 # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -400,15 +398,6 @@ --delete-original \ $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kplato.desktop -#writeup -desktop-file-install \ - --vendor=fedora \ - --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category=X-Fedora \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applnk/Office/writeup.desktop - - rm $RPM_BUILD_ROOT/%{_libdir}/*.la %clean @@ -524,14 +513,6 @@ %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png %{_datadir}/apps/kross -# add writeup here for now -%{_bindir}/writeup -%{_libdir}/kde3/libwriteup_part.* -%{_libdir}/kde3/writeup.* -%{_libdir}/libkdeinit_writeup.so -%{_datadir}/applications/fedora-writeup.desktop -%{_datadir}/apps/writeup -%{_datadir}/services/writeuppart.desktop %exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel @@ -742,6 +723,7 @@ %defattr(-,root,root,-) %{_bindir}/kexi %{_bindir}/ksqlite* +%{_bindir}/krossrunner %{_libdir}/libkdeinit_kexi.so %{_libdir}/libkexicore.so.* %{_libdir}/libkexidatatable.so.* @@ -913,6 +895,10 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Mon Mar 13 2006 Andreas Bierfert +1.4.95-1 +- version upgrade + * Sun Feb 26 2006 Andreas Bierfert 1.4.90-4 - kivio requires kdegraphics (#182289) Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 2 Feb 2006 12:47:27 -0000 1.7 +++ sources 15 Mar 2006 21:16:35 -0000 1.8 @@ -1 +1 @@ -99a8de4e93b00e1c3148a5f96b67d966 koffice-1.4.90.tar.bz2 +ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 15 21:29:38 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 16:29:38 -0500 Subject: rpms/koffice/devel koffice-kspread-cpp.patch,NONE,1.1 Message-ID: <200603152129.k2FLTeDi006974@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6960 Added Files: koffice-kspread-cpp.patch Log Message: - forgot patch koffice-kspread-cpp.patch: --- NEW FILE koffice-kspread-cpp.patch --- --- kspread/valueparser.h.orig 2006-03-14 10:36:32.000000000 +0100 +++ kspread/valueparser.h 2006-03-14 10:36:54.000000000 +0100 @@ -70,7 +70,7 @@ bool & duration); /** a helper function to read numbers and distinguish integers and FPs */ - double ValueParser::readNumber(const QString &_str, bool * ok, bool * isInt); + double readNumber(const QString &_str, bool * ok, bool * isInt); /** a helper function to read integers */ int readInt (const QString &str, uint &pos); FormatType fmtType; From fedora-extras-commits at redhat.com Wed Mar 15 21:39:41 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 15 Mar 2006 16:39:41 -0500 Subject: rpms/nomadsync/devel nomadsync-baseclass.patch, NONE, 1.1 nomadsync-baseclass2.patch, NONE, 1.1 nomadsync.spec, 1.3, 1.4 Message-ID: <200603152140.k2FLeE5j007126@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7101 Modified Files: nomadsync.spec Added Files: nomadsync-baseclass.patch nomadsync-baseclass2.patch Log Message: Patching two files to make GCC4.1.0 happy. nomadsync-baseclass.patch: --- NEW FILE nomadsync-baseclass.patch --- --- src/BaseNomad.h~ 2004-10-18 17:06:18.000000000 +0200 +++ src/BaseNomad.h 2006-03-15 22:14:36.000000000 +0100 @@ -17,7 +17,7 @@ class BaseNomad { public: - BaseNomad::BaseNomad() : m_nLastError(0), m_bPlaylistsRead(false){} + BaseNomad() : m_nLastError(0), m_bPlaylistsRead(false){} virtual ~BaseNomad(); void RemoveTracks(); void RemovePlaylists(); nomadsync-baseclass2.patch: --- NEW FILE nomadsync-baseclass2.patch --- --- src/EzGrid.h~ 2005-01-20 14:39:50.000000000 +0100 +++ src/EzGrid.h 2006-03-15 22:22:10.000000000 +0100 @@ -8,7 +8,7 @@ class EzGrid : public wxGrid { public: - EzGrid::EzGrid(wxWindow *parent, + EzGrid(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxWANTS_CHARS, const wxString& name = wxPanelNameStr); Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/nomadsync.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nomadsync.spec 13 Mar 2006 20:47:03 -0000 1.3 +++ nomadsync.spec 15 Mar 2006 21:39:41 -0000 1.4 @@ -12,7 +12,7 @@ Name: nomadsync Version: 0.4.2 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ Group: Applications/Multimedia @@ -20,6 +20,8 @@ Source1: %{name}.desktop Patch0: nomadsync-libnjbloc.patch Patch1: nomadsync-libnjbloc64.patch +Patch2: nomadsync-baseclass.patch +Patch3: nomadsync-baseclass2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -44,6 +46,8 @@ %else %patch0 -p0 %endif +%patch2 -p0 +%patch3 -p0 %build %configure --with-wx-config=%{_bindir}/wxgtk-2.4-config @@ -89,6 +93,9 @@ %doc ChangeLog authors copying readme %changelog +* Wed Mar 15 2006 Linus Walleij 0.4.2-11 +- Patched a baseclass issue that annoyed GCC 4.1.0 + * Mon Mar 13 2006 Linus Walleij 0.4.2-10 - Fixed a x86_64 bug, by separate patching, I think... From fedora-extras-commits at redhat.com Wed Mar 15 21:45:39 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Wed, 15 Mar 2006 16:45:39 -0500 Subject: rpms/irssi/devel irssi-0.8.10-glibc-invalid-pointer.patch, NONE, 1.1 irssi.spec, 1.14, 1.15 Message-ID: <200603152146.k2FLkBf1007207@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/irssi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7187 Modified Files: irssi.spec Added Files: irssi-0.8.10-glibc-invalid-pointer.patch Log Message: irssi: fix for invalid pointer irssi-0.8.10-glibc-invalid-pointer.patch: --- NEW FILE irssi-0.8.10-glibc-invalid-pointer.patch --- --- src/irc/dcc/dcc.c 2005-12-25 02:12:48.000000000 -0600 +++ src/irc/dcc/dcc.c 2005-12-25 02:12:55.000000000 -0600 @@ -58,8 +58,8 @@ pos = gslist_find_string(dcc_types, type); if (pos != NULL) { - dcc_types = g_slist_remove(dcc_types, pos->data); g_free(pos->data); + dcc_types = g_slist_remove(dcc_types, pos->data); } } Index: irssi.spec =================================================================== RCS file: /cvs/extras/rpms/irssi/devel/irssi.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- irssi.spec 28 Jan 2006 20:10:50 -0000 1.14 +++ irssi.spec 15 Mar 2006 21:45:39 -0000 1.15 @@ -3,12 +3,13 @@ Summary: Modular text mode IRC client with Perl scripting Name: irssi Version: 0.8.10 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Communications URL: http://irssi.org/ Source0: http://irssi.org/files/irssi-%{version}.tar.bz2 +Patch0: irssi-0.8.10-glibc-invalid-pointer.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: ncurses-devel openssl-devel zlib-devel BuildRequires: pkgconfig glib2-devel @@ -36,6 +37,7 @@ %prep %setup -q -n %{name}-%{version} +%patch0 -p0 %build %configure --enable-ipv6 --with-textui \ @@ -83,6 +85,9 @@ %{_includedir}/irssi %changelog +* Wed Mar 15 2006 Dams - 0.8.10-4 +- Added patch from Saleem Abdulrasool to fix invalid pointer. + * Sat Jan 28 2006 Dams - 0.8.10-3 - Fixed changelog -_- From fedora-extras-commits at redhat.com Wed Mar 15 21:53:58 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 15 Mar 2006 16:53:58 -0500 Subject: rpms/nomadsync/devel nomadsync-baseclass3.patch, NONE, 1.1 nomadsync.spec, 1.4, 1.5 Message-ID: <200603152154.k2FLsUbW007295@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/nomadsync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7264 Modified Files: nomadsync.spec Added Files: nomadsync-baseclass3.patch Log Message: Iteratively adding patches. nomadsync-baseclass3.patch: --- NEW FILE nomadsync-baseclass3.patch --- --- src/NomadSyncDlg.h~ 2005-03-05 16:15:58.000000000 +0100 +++ src/NomadSyncDlg.h 2006-03-15 22:51:09.000000000 +0100 @@ -31,7 +31,7 @@ void OnAbout(wxCommandEvent& WXUNUSED(event)); void OnCellValueChanged(wxGridEvent& ev); void CheckActionsToDo(); - ActionList::iterator NomadSyncDlg::FindAction(int nRow); + ActionList::iterator FindAction(int nRow); void OnContextMenu(wxCommandEvent& event); void OnRightClick(wxGridEvent& event); void OnLabelLeftClick(wxGridEvent& event); Index: nomadsync.spec =================================================================== RCS file: /cvs/extras/rpms/nomadsync/devel/nomadsync.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nomadsync.spec 15 Mar 2006 21:39:41 -0000 1.4 +++ nomadsync.spec 15 Mar 2006 21:53:58 -0000 1.5 @@ -12,7 +12,7 @@ Name: nomadsync Version: 0.4.2 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A music synchronization program form portable audio players URL: http://nomadsync.sourceforge.net/ Group: Applications/Multimedia @@ -22,6 +22,7 @@ Patch1: nomadsync-libnjbloc64.patch Patch2: nomadsync-baseclass.patch Patch3: nomadsync-baseclass2.patch +Patch4: nomadsync-baseclass3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) License: GPL Requires(post): desktop-file-utils @@ -48,6 +49,7 @@ %endif %patch2 -p0 %patch3 -p0 +%patch4 -p0 %build %configure --with-wx-config=%{_bindir}/wxgtk-2.4-config @@ -93,6 +95,9 @@ %doc ChangeLog authors copying readme %changelog +* Wed Mar 15 2006 Linus Walleij 0.4.2-12 +- Iteratively adding patches to find problems. + * Wed Mar 15 2006 Linus Walleij 0.4.2-11 - Patched a baseclass issue that annoyed GCC 4.1.0 From fedora-extras-commits at redhat.com Wed Mar 15 21:59:46 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 16:59:46 -0500 Subject: rpms/wine/devel .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 wine.spec, 1.19, 1.20 Message-ID: <200603152200.k2FM0I2J007423@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7389 Modified Files: .cvsignore sources wine.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 3 Mar 2006 00:28:43 -0000 1.10 +++ .cvsignore 15 Mar 2006 21:59:45 -0000 1.11 @@ -1,2 +1,2 @@ wine-fonts-20050524.tar.gz -wine-0.9.9-fe.tar.bz2 +wine-0.9.10-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Mar 2006 00:28:43 -0000 1.11 +++ sources 15 Mar 2006 21:59:45 -0000 1.12 @@ -1,2 +1,2 @@ fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 +054e71983834d777be3271f63f8484d6 wine-0.9.10-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- wine.spec 3 Mar 2006 07:36:29 -0000 1.19 +++ wine.spec 15 Mar 2006 21:59:45 -0000 1.20 @@ -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.9 +Version: 0.9.10 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.9-fe.tar.bz2 +Source0: wine-0.9.10-fe.tar.bz2 Source1: wine.init Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora From fedora-extras-commits at redhat.com Wed Mar 15 22:14:59 2006 From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia)) Date: Wed, 15 Mar 2006 17:14:59 -0500 Subject: mock mock.py,1.36,1.37 Message-ID: <200603152214.k2FMExBa009507@cvs-int.fedora.redhat.com> Author: jcwillia Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9488 Modified Files: mock.py Log Message: add chroot command for running arbitrary commands in the chroot Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- mock.py 24 Feb 2006 19:31:57 -0000 1.36 +++ mock.py 15 Mar 2006 22:14:38 -0000 1.37 @@ -780,6 +780,12 @@ my.close() print 'Finished initializing root' + + elif args[0] == 'chroot': + config_opts['clean'] = config_opts['quiet'] = False + my= Root(config_opts) + my.do_chroot(' '.join(args[1:]), True) + print 'Finished chroot command' else: if args[0] == 'rebuild': From fedora-extras-commits at redhat.com Wed Mar 15 22:27:52 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:27:52 -0500 Subject: rpms/hdf5/devel hdf5-1.6.5-x86_64.patch,NONE,1.1 Message-ID: <200603152227.k2FMRs5M009674@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9655 Added Files: hdf5-1.6.5-x86_64.patch Log Message: Patch for libtool to find libraries on x86_64 hdf5-1.6.5-x86_64.patch: --- NEW FILE hdf5-1.6.5-x86_64.patch --- --- hdf5-1.6.5/configure.norpath 2006-03-15 14:12:46.000000000 -0700 +++ hdf5-1.6.5/configure 2006-03-15 14:14:09.000000000 -0700 @@ -6097,8 +6097,8 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib" case $host_os in aix3*) From fedora-extras-commits at redhat.com Wed Mar 15 22:27:26 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 17:27:26 -0500 Subject: rpms/wine-docs/FC-3 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wine-docs.spec, 1.9, 1.10 Message-ID: <200603152227.k2FMRwqH009685@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9601/FC-3 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Mar 2006 23:26:11 -0000 1.6 +++ .cvsignore 15 Mar 2006 22:27:26 -0000 1.7 @@ -1 +1 @@ -wine-docs-0.9.9.tar.bz2 +wine-docs-0.9.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 23:26:11 -0000 1.6 +++ sources 15 Mar 2006 22:27:26 -0000 1.7 @@ -1 +1 @@ -dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 +8057a2d7901c6436d69ee7bbe88700b4 wine-docs-0.9.10.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wine-docs.spec 3 Mar 2006 12:27:53 -0000 1.9 +++ wine-docs.spec 15 Mar 2006 22:27:26 -0000 1.10 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.10.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.10-1 +- version upgrade + * Fri Mar 03 2006 Andreas Bierfert 0.9.9-1 - version upgrade From fedora-extras-commits at redhat.com Wed Mar 15 22:27:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 17:27:32 -0500 Subject: rpms/wine-docs/FC-4 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wine-docs.spec, 1.9, 1.10 Message-ID: <200603152228.k2FMS4je009690@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9601/FC-4 Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Mar 2006 23:26:17 -0000 1.6 +++ .cvsignore 15 Mar 2006 22:27:32 -0000 1.7 @@ -1 +1 @@ -wine-docs-0.9.9.tar.bz2 +wine-docs-0.9.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 23:26:17 -0000 1.6 +++ sources 15 Mar 2006 22:27:32 -0000 1.7 @@ -1 +1 @@ -dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 +8057a2d7901c6436d69ee7bbe88700b4 wine-docs-0.9.10.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wine-docs.spec 3 Mar 2006 11:35:42 -0000 1.9 +++ wine-docs.spec 15 Mar 2006 22:27:32 -0000 1.10 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.10.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.10-1 +- version upgrade + * Fri Mar 03 2006 Andreas Bierfert 0.9.9-1 - version upgrade From fedora-extras-commits at redhat.com Wed Mar 15 22:27:37 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 15 Mar 2006 17:27:37 -0500 Subject: rpms/wine-docs/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 wine-docs.spec, 1.6, 1.7 Message-ID: <200603152228.k2FMSADg009695@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine-docs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9601/devel Modified Files: .cvsignore sources wine-docs.spec Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Mar 2006 23:26:23 -0000 1.6 +++ .cvsignore 15 Mar 2006 22:27:37 -0000 1.7 @@ -1 +1 @@ -wine-docs-0.9.9.tar.bz2 +wine-docs-0.9.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 23:26:23 -0000 1.6 +++ sources 15 Mar 2006 22:27:37 -0000 1.7 @@ -1 +1 @@ -dd1c03c345180dad9aa9a52a2618ac41 wine-docs-0.9.9.tar.bz2 +8057a2d7901c6436d69ee7bbe88700b4 wine-docs-0.9.10.tar.bz2 Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wine-docs.spec 2 Mar 2006 23:26:23 -0000 1.6 +++ wine-docs.spec 15 Mar 2006 22:27:37 -0000 1.7 @@ -1,12 +1,12 @@ Name: wine-docs -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: Documentation for wine Group: Documentation License: LGPL URL: http://www.winehq.org -Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.9.tar.bz2 +Source0: http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.10.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: docbook-utils-pdf @@ -37,6 +37,10 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Wed Mar 15 2006 Andreas Bierfert +0.9.10-1 +- version upgrade + * Fri Mar 03 2006 Andreas Bierfert 0.9.9-1 - version upgrade From fedora-extras-commits at redhat.com Wed Mar 15 22:28:30 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:28:30 -0500 Subject: rpms/hdf5/devel hdf5-1.6.4-norpath.patch,1.1,1.2 Message-ID: <200603152229.k2FMT2s7009767@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9701 Modified Files: hdf5-1.6.4-norpath.patch Log Message: Change to patch configure - no autoconf hdf5-1.6.4-norpath.patch: Index: hdf5-1.6.4-norpath.patch =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/hdf5-1.6.4-norpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf5-1.6.4-norpath.patch 5 Jul 2005 20:20:17 -0000 1.1 +++ hdf5-1.6.4-norpath.patch 15 Mar 2006 22:28:30 -0000 1.2 @@ -10,17 +10,6 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) ---- hdf5-1.6.4/aclocal.m4.BAD 2005-04-03 18:53:47.000000000 -0500 -+++ hdf5-1.6.4/aclocal.m4 2005-04-03 18:54:13.000000000 -0500 -@@ -1383,7 +1383,7 @@ - - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='' - export_dynamic_flag_spec='${wl}--export-dynamic' - case $host_os in - cygwin* | mingw* | pw32*) --- hdf5-1.6.4/c++/config/commence.in.BAD 2005-04-03 18:55:05.000000000 -0500 +++ hdf5-1.6.4/c++/config/commence.in 2005-04-03 18:55:25.000000000 -0500 @@ -50,8 +50,8 @@ @@ -44,3 +33,14 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) +--- hdf5-1.6.4/configure.norpath 2006-03-15 14:12:46.000000000 -0700 ++++ hdf5-1.6.4/configure 2006-03-15 14:14:09.000000000 -0700 +@@ -5569,7 +5569,7 @@ + + if test "$ld_shlibs" = yes; then + runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec='' + export_dynamic_flag_spec='${wl}--export-dynamic' + case $host_os in + cygwin* | mingw* | pw32*) From fedora-extras-commits at redhat.com Wed Mar 15 22:29:45 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:29:45 -0500 Subject: rpms/hdf5/devel hdf5.spec,1.9,1.10 Message-ID: <200603152230.k2FMUHeX009797@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9773 Modified Files: hdf5.spec Log Message: - Change rpath patch to not need autoconf - Add patch for libtool on x86_64 - Fix shared lib permissions Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/devel/hdf5.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- hdf5.spec 13 Mar 2006 16:54:44 -0000 1.9 +++ hdf5.spec 15 Mar 2006 22:29:45 -0000 1.10 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -13,6 +13,7 @@ Patch4: hdf5-1.6.5-h5diff_attr.patch Patch5: hdf5-1.6.4-ppc.patch Patch6: hdf5-1.6.5-flags.patch +Patch7: hdf5-1.6.5-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time @@ -42,9 +43,9 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -b .flags +%patch7 -p1 -b .x86_64 %build -autoconf %configure --with-ssl --enable-cxx --enable-fortran \ --enable-threadsafe --with-pthread make @@ -52,7 +53,8 @@ %install rm -rf $RPM_BUILD_ROOT find doc/html -type f | xargs chmod -x -find doc/html -name '*.sh*' | xargs chmod +x +#find doc/html -name '*.sh*' | xargs chmod +x +find doc/html -name Dependencies | xargs rm %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir} rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings # Don't instal h5perf until h5test.so.0 issues is sorted out @@ -69,7 +71,7 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt %doc release_docs/HISTORY.txt doc/html %{_bindir}/gif2h5 @@ -83,10 +85,10 @@ %{_bindir}/h5repack %{_bindir}/h5repart %{_bindir}/h5unjam -%{_libdir}/*.so.* +%attr(0755,root,root) %{_libdir}/*.so.* %files devel -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %{_bindir}/h5c++ %{_bindir}/h5cc %{_bindir}/h5fc @@ -98,6 +100,11 @@ %{_libdir}/*.mod %changelog +* Wed Mar 15 2006 Orion Poplawski 1.6.5-5 +- Change rpath patch to not need autoconf +- Add patch for libtool on x86_64 +- Fix shared lib permissions + * Mon Mar 13 2006 Orion Poplawski 1.6.5-4 - Add patch to avoid HDF setting the compiler flags From fedora-extras-commits at redhat.com Wed Mar 15 22:36:52 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:36:52 -0500 Subject: rpms/hdf5/FC-4 hdf5-1.6.4-norpath.patch,1.1,1.2 Message-ID: <200603152237.k2FMbPUS010031@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9933 Modified Files: hdf5-1.6.4-norpath.patch Log Message: Change to patch configure, no need for autoconf hdf5-1.6.4-norpath.patch: Index: hdf5-1.6.4-norpath.patch =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5-1.6.4-norpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf5-1.6.4-norpath.patch 5 Jul 2005 20:20:17 -0000 1.1 +++ hdf5-1.6.4-norpath.patch 15 Mar 2006 22:36:52 -0000 1.2 @@ -10,17 +10,6 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) ---- hdf5-1.6.4/aclocal.m4.BAD 2005-04-03 18:53:47.000000000 -0500 -+++ hdf5-1.6.4/aclocal.m4 2005-04-03 18:54:13.000000000 -0500 -@@ -1383,7 +1383,7 @@ - - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='' - export_dynamic_flag_spec='${wl}--export-dynamic' - case $host_os in - cygwin* | mingw* | pw32*) --- hdf5-1.6.4/c++/config/commence.in.BAD 2005-04-03 18:55:05.000000000 -0500 +++ hdf5-1.6.4/c++/config/commence.in 2005-04-03 18:55:25.000000000 -0500 @@ -50,8 +50,8 @@ @@ -44,3 +33,14 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) +--- hdf5-1.6.4/configure.norpath 2006-03-15 14:12:46.000000000 -0700 ++++ hdf5-1.6.4/configure 2006-03-15 14:14:09.000000000 -0700 +@@ -5569,7 +5569,7 @@ + + if test "$ld_shlibs" = yes; then + runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec='' + export_dynamic_flag_spec='${wl}--export-dynamic' + case $host_os in + cygwin* | mingw* | pw32*) From fedora-extras-commits at redhat.com Wed Mar 15 22:38:19 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:38:19 -0500 Subject: rpms/hdf5/FC-4 hdf5-1.6.5-x86_64.patch,NONE,1.1 Message-ID: <200603152238.k2FMcLtB010229@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10144 Added Files: hdf5-1.6.5-x86_64.patch Log Message: Patch to tell libtool to look in 64bit lib dirs hdf5-1.6.5-x86_64.patch: --- NEW FILE hdf5-1.6.5-x86_64.patch --- --- hdf5-1.6.5/configure.norpath 2006-03-15 14:12:46.000000000 -0700 +++ hdf5-1.6.5/configure 2006-03-15 14:14:09.000000000 -0700 @@ -6097,8 +6097,8 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib" case $host_os in aix3*) From fedora-extras-commits at redhat.com Wed Mar 15 22:38:36 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:38:36 -0500 Subject: rpms/hdf5/FC-4 hdf5.spec,1.8,1.9 Message-ID: <200603152239.k2FMd9eR010392@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10253 Modified Files: hdf5.spec Log Message: - Change rpath patch to not need autoconf - Add patch for libtool on x86_64 - Fix shared lib permissions Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-4/hdf5.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- hdf5.spec 13 Mar 2006 20:10:28 -0000 1.8 +++ hdf5.spec 15 Mar 2006 22:38:36 -0000 1.9 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -13,6 +13,7 @@ Patch4: hdf5-1.6.5-h5diff_attr.patch Patch5: hdf5-1.6.4-ppc.patch Patch6: hdf5-1.6.5-flags.patch +Patch7: hdf5-1.6.5-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gfortran >= 4.0.2, krb5-devel, openssl-devel, zlib-devel, time @@ -42,16 +43,16 @@ %patch4 -p1 %patch5 -p1 %patch6 -p1 -b .flags +%patch7 -p1 -b .x86_64 %build -autoconf %configure --with-ssl --enable-fortran --enable-cxx --enable-threadsafe --with-pthread make %install rm -rf $RPM_BUILD_ROOT find doc/html -type f | xargs chmod -x -find doc/html -name '*.sh*' | xargs chmod +x +find doc/html -name 'Dependencies' | xargs rm %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir} rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings # Don't instal h5perf until h5test.so.0 issues is sorted out @@ -68,7 +69,7 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt %doc release_docs/HISTORY.txt doc/html %{_bindir}/gif2h5 @@ -82,10 +83,10 @@ %{_bindir}/h5repack %{_bindir}/h5repart %{_bindir}/h5unjam -%{_libdir}/*.so.* +%attr(0755,root,root) %{_libdir}/*.so.* %files devel -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %{_bindir}/h5c++ %{_bindir}/h5cc %{_bindir}/h5fc @@ -97,6 +98,11 @@ %{_libdir}/*.mod %changelog +* Wed Mar 15 2006 Orion Poplawski 1.6.5-4 +- Change rpath patch to not need autoconf +- Add patch for libtool on x86_64 +- Fix shared lib permissions + * Mon Mar 13 2006 Orion Poplawski 1.6.5-3 - Add patch to avoid HDF setting the compiler flags From fedora-extras-commits at redhat.com Wed Mar 15 22:41:08 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:41:08 -0500 Subject: rpms/hdf5/FC-3 hdf5-1.6.4-norpath.patch,1.1,1.2 Message-ID: <200603152241.k2FMffNp010637@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10617 Modified Files: hdf5-1.6.4-norpath.patch Log Message: Patch configure to avoid needed autoconf hdf5-1.6.4-norpath.patch: Index: hdf5-1.6.4-norpath.patch =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/hdf5-1.6.4-norpath.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- hdf5-1.6.4-norpath.patch 5 Jul 2005 20:20:17 -0000 1.1 +++ hdf5-1.6.4-norpath.patch 15 Mar 2006 22:41:08 -0000 1.2 @@ -10,17 +10,6 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) ---- hdf5-1.6.4/aclocal.m4.BAD 2005-04-03 18:53:47.000000000 -0500 -+++ hdf5-1.6.4/aclocal.m4 2005-04-03 18:54:13.000000000 -0500 -@@ -1383,7 +1383,7 @@ - - if test "$ld_shlibs" = yes; then - runpath_var=LD_RUN_PATH -- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec='' - export_dynamic_flag_spec='${wl}--export-dynamic' - case $host_os in - cygwin* | mingw* | pw32*) --- hdf5-1.6.4/c++/config/commence.in.BAD 2005-04-03 18:55:05.000000000 -0500 +++ hdf5-1.6.4/c++/config/commence.in 2005-04-03 18:55:25.000000000 -0500 @@ -50,8 +50,8 @@ @@ -44,3 +33,14 @@ LT_RUN=$(LT) --mode=execute LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) +--- hdf5-1.6.4/configure.norpath 2006-03-15 14:12:46.000000000 -0700 ++++ hdf5-1.6.4/configure 2006-03-15 14:14:09.000000000 -0700 +@@ -5569,7 +5569,7 @@ + + if test "$ld_shlibs" = yes; then + runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec='' + export_dynamic_flag_spec='${wl}--export-dynamic' + case $host_os in + cygwin* | mingw* | pw32*) From fedora-extras-commits at redhat.com Wed Mar 15 22:42:23 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:42:23 -0500 Subject: rpms/hdf5/FC-3 hdf5-1.6.5-x86_64.patch,NONE,1.1 Message-ID: <200603152242.k2FMgPii010660@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10648 Added Files: hdf5-1.6.5-x86_64.patch Log Message: Patch to tell libtool to look for 64bit libs hdf5-1.6.5-x86_64.patch: --- NEW FILE hdf5-1.6.5-x86_64.patch --- --- hdf5-1.6.5/configure.norpath 2006-03-15 14:12:46.000000000 -0700 +++ hdf5-1.6.5/configure 2006-03-15 14:14:09.000000000 -0700 @@ -6097,8 +6097,8 @@ shlibpath_overrides_runpath=unknown version_type=none dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" +sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" +sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /lib /usr/lib /usr/local/lib" case $host_os in aix3*) From fedora-extras-commits at redhat.com Wed Mar 15 22:44:41 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 15 Mar 2006 17:44:41 -0500 Subject: rpms/hdf5/FC-3 hdf5.spec,1.3,1.4 Message-ID: <200603152245.k2FMjDq9010700@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/hdf5/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10676 Modified Files: hdf5.spec Log Message: - Change rpath patch to not need autoconf - Add patch for libtool on x86_64 - Fix shared lib permissions Index: hdf5.spec =================================================================== RCS file: /cvs/extras/rpms/hdf5/FC-3/hdf5.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- hdf5.spec 13 Mar 2006 20:14:51 -0000 1.3 +++ hdf5.spec 15 Mar 2006 22:44:40 -0000 1.4 @@ -1,6 +1,6 @@ Name: hdf5 Version: 1.6.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A general purpose library and file format for storing scientific data License: BSD-ish Group: System Environment/Libraries @@ -12,6 +12,7 @@ Patch3: hdf5-1.6.4-testh5repack.patch Patch4: hdf5-1.6.5-h5diff_attr.patch Patch5: hdf5-1.6.5-flags.patch +Patch6: hdf5-1.6.5-x86_64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: krb5-devel, openssl-devel, zlib-devel, time @@ -40,9 +41,9 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 -b .flags +%patch6 -p1 -b .x86_64 %build -autoconf # the Fortran parts are hitting GCC bug 17917, add --enable-fortran when it gets fixed. %configure --with-ssl --enable-cxx --enable-threadsafe --with-pthread make @@ -50,7 +51,7 @@ %install rm -rf $RPM_BUILD_ROOT find doc/html -type f | xargs chmod -x -find doc/html -name '*.sh*' | xargs chmod +x +find doc/html -name Dependencies | xargs rm %makeinstall docdir=${RPM_BUILD_ROOT}%{_docdir} rm -rf $RPM_BUILD_ROOT/%{_libdir}/*.la $RPM_BUILD_ROOT/%{_libdir}/*.settings # Don't instal h5perf until h5test.so.0 issues is sorted out @@ -67,7 +68,7 @@ %postun -p /sbin/ldconfig %files -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %doc COPYING MANIFEST README.txt release_docs/RELEASE.txt %doc release_docs/HISTORY.txt doc/html %{_bindir}/gif2h5 @@ -81,10 +82,10 @@ %{_bindir}/h5repack %{_bindir}/h5repart %{_bindir}/h5unjam -%{_libdir}/*.so.* +%attr(0755,root,root) %{_libdir}/*.so.* %files devel -%defattr(-,root,root,0755) +%defattr(-,root,root,-) %{_bindir}/h5c++ %{_bindir}/h5cc %{_bindir}/h5redeploy @@ -94,6 +95,11 @@ %{_libdir}/*.so %changelog +* Wed Mar 15 2006 Orion Poplawski 1.6.5-3 +- Change rpath patch to not need autoconf +- Add patch for libtool on x86_64 +- Fix shared lib permissions + * Mon Mar 13 2006 Orion Poplawski 1.6.5-2 - Add patch to avoid HDF setting the march compiler flag From fedora-extras-commits at redhat.com Thu Mar 16 01:54:12 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 15 Mar 2006 20:54:12 -0500 Subject: rpms/perl-Module-Build/devel perl-Module-Build.spec,1.14,1.15 Message-ID: <200603160154.k2G1sirB017620@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-serv17603 Modified Files: perl-Module-Build.spec Log Message: Add versioned deps for Archive::Tar, ExtUtils::CBuilder, and ExtUtils::ParseXS. Index: perl-Module-Build.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Module-Build/devel/perl-Module-Build.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- perl-Module-Build.spec 12 Mar 2006 02:14:33 -0000 1.14 +++ perl-Module-Build.spec 16 Mar 2006 01:54:11 -0000 1.15 @@ -1,6 +1,6 @@ Name: perl-Module-Build Version: 0.2612 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Perl module for building and installing Perl modules Group: Development/Libraries License: GPL or Artistic @@ -8,8 +8,14 @@ Source0: http://www.cpan.org/authors/id/K/KW/KWILLIAMS/Module-Build-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 -Requires: perl(ExtUtils::ParseXS), perl(YAML) >= 0.35, perl(YAML) < 0.49 +BuildRequires: perl(Archive::Tar) >= 1.08 +BuildRequires: perl(ExtUtils::CBuilder) >= 0.02 +BuildRequires: perl(ExtUtils::ParseXS) >= 2.02 +BuildRequires: perl(YAML) >= 0.35, perl(YAML) < 0.49 +Requires: perl(Archive::Tar) >= 1.08 +Requires: perl(ExtUtils::CBuilder) >= 0.02 +Requires: perl(ExtUtils::ParseXS) >= 2.02 +Requires: perl(YAML) >= 0.35, perl(YAML) < 0.49 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description @@ -50,6 +56,10 @@ %{_mandir}/man3/Module::Build*.3* %changelog +* Wed Mar 15 2006 Steven Pritchard - 0.2612-2 +- Add versioned deps for Archive::Tar, ExtUtils::CBuilder, and + ExtUtils::ParseXS. + * Sat Mar 11 2006 Steven Pritchard - 0.2612-1 - Update to 0.2612. From fedora-extras-commits at redhat.com Thu Mar 16 04:34:54 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Wed, 15 Mar 2006 23:34:54 -0500 Subject: owners owners.list,1.746,1.747 Message-ID: <200603160435.k2G4ZQUh023804@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23787/owners Modified Files: owners.list Log Message: Update owners.list with my new email address for ownership of lucidlife. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.746 retrieving revision 1.747 diff -u -r1.746 -r1.747 --- owners.list 15 Mar 2006 18:43:41 -0000 1.746 +++ owners.list 16 Mar 2006 04:34:53 -0000 1.747 @@ -652,7 +652,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|jcarpenter at condell.org|extras-qa at fedoraproject.org| Fedora Extras|lua|A powerful light-weight programming language|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| -Fedora Extras|lucidlife|A Conway's Life simulator|admin at ramshacklestudios.com|extras-qa at fedoraproject.org| +Fedora Extras|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|extras-qa at fedoraproject.org| Fedora Extras|lvcool|Utility to cool Athlon processor during idle on Via KT133 or KX133 chipsets|wtogami at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|lyx|WYSIWYM (What You See Is What You Mean) document processor|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|lzo|A data compression library with very fast (de)compression|anvil at livna.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 16 06:53:04 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Thu, 16 Mar 2006 01:53:04 -0500 Subject: rpms/lucidlife/FC-4 lucidlife.spec,1.4,1.5 Message-ID: <200603160653.k2G6rbv3027970@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938/FC-4 Modified Files: lucidlife.spec Log Message: Update my email address in the spec files, bump release for rebuild due to new email address and previous minor spec file fixes. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/FC-4/lucidlife.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lucidlife.spec 12 Mar 2006 20:35:40 -0000 1.4 +++ lucidlife.spec 16 Mar 2006 06:53:04 -0000 1.5 @@ -1,6 +1,6 @@ Name: lucidlife Version: 0.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Conway's Life simulator Group: Amusements/Games @@ -58,10 +58,13 @@ %changelog -* Sun Feb 26 2006 Peter Gordon - 0.9-3 +* Wed Mar 15 2006 Peter Gordon - 0.9-4 +- Rebuild for spec file fixes and email address change. + +* Sun Feb 26 2006 Peter Gordon - 0.9-3 - Add %%{?dist} tag to the release to fix CVS tagging issue. -* Sun Feb 19 2006 Peter Gordon - 0.9-2 +* Sun Feb 19 2006 Peter Gordon - 0.9-2 - Dropped Requires: on gtk2 and gnome-vfs2, as the -devel sonames will pull these in. - Fixed handling of .desktop file to conform to Fedora Extras guidelines. @@ -69,5 +72,5 @@ "lucidlife" to help prevent file ownership problems - Thanks to Brian Pepple in BZ #177881 for these suggestions. -* Sun Jan 15 2006 Peter Gordon - 0.9-1 +* Sun Jan 15 2006 Peter Gordon - 0.9-1 - Initial packaging. From fedora-extras-commits at redhat.com Thu Mar 16 06:53:11 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Thu, 16 Mar 2006 01:53:11 -0500 Subject: rpms/lucidlife/devel lucidlife.spec,1.4,1.5 Message-ID: <200603160653.k2G6rhI5027973@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938/devel Modified Files: lucidlife.spec Log Message: Update my email address in the spec files, bump release for rebuild due to new email address and previous minor spec file fixes. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lucidlife.spec 12 Mar 2006 20:35:46 -0000 1.4 +++ lucidlife.spec 16 Mar 2006 06:53:10 -0000 1.5 @@ -1,6 +1,6 @@ Name: lucidlife Version: 0.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A Conway's Life simulator Group: Amusements/Games @@ -58,10 +58,13 @@ %changelog -* Sun Feb 26 2006 Peter Gordon - 0.9-3 +* Wed Mar 15 2006 Peter Gordon - 0.9-4 +- Rebuild for spec file fixes and email address change. + +* Sun Feb 26 2006 Peter Gordon - 0.9-3 - Add %%{?dist} tag to the release to fix CVS tagging issue. -* Sun Feb 19 2006 Peter Gordon - 0.9-2 +* Sun Feb 19 2006 Peter Gordon - 0.9-2 - Dropped Requires: on gtk2 and gnome-vfs2, as the -devel sonames will pull these in. - Fixed handling of .desktop file to conform to Fedora Extras guidelines. @@ -69,5 +72,5 @@ "lucidlife" to help prevent file ownership problems - Thanks to Brian Pepple in BZ #177881 for these suggestions. -* Sun Jan 15 2006 Peter Gordon - 0.9-1 +* Sun Jan 15 2006 Peter Gordon - 0.9-1 - Initial packaging. From fedora-extras-commits at redhat.com Thu Mar 16 08:10:14 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 16 Mar 2006 03:10:14 -0500 Subject: rpms/libsexy/devel .cvsignore, 1.5, 1.6 libsexy.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200603160810.k2G8Aop8032190@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libsexy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32169 Modified Files: .cvsignore libsexy.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 6 Feb 2006 04:33:59 -0000 1.5 +++ .cvsignore 16 Mar 2006 08:10:12 -0000 1.6 @@ -1 +1 @@ -libsexy-0.1.6.tar.gz +libsexy-0.1.7.tar.gz Index: libsexy.spec =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/libsexy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libsexy.spec 14 Feb 2006 05:01:42 -0000 1.6 +++ libsexy.spec 16 Mar 2006 08:10:12 -0000 1.7 @@ -1,12 +1,12 @@ Name: libsexy -Version: 0.1.6 -Release: 2%{?dist} +Version: 0.1.7 +Release: 1%{?dist} Summary: Funky fresh graphical widgets for GTK+ 2 Group: System Environment/Libraries License: LGPL URL: http://wiki.chipx86.com/wiki/Libsexy -Source0: http://osiris.chipx86.com/projects/libsexy/releases/%{name}-%{version}.tar.gz +Source0: http://releases.chipx86.com/libsexy/libsexy/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel libxml2-devel enchant-devel @@ -55,6 +55,9 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Thu Mar 16 2006 Ignacio Vazquez-Abrams 0.1.7-1 +- Upstream update + * Mon Feb 13 2006 Ignacio Vazquez-Abrams 0.1.6-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 6 Feb 2006 04:33:59 -0000 1.5 +++ sources 16 Mar 2006 08:10:12 -0000 1.6 @@ -1 +1 @@ -495d8d986f0caa23b001f8e09d11eaf3 libsexy-0.1.6.tar.gz +227df7c2d7ca421f41cef12c98b1e40f libsexy-0.1.7.tar.gz From fedora-extras-commits at redhat.com Thu Mar 16 16:29:16 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Thu, 16 Mar 2006 11:29:16 -0500 Subject: rpms/python-matplotlib/devel .cvsignore, 1.9, 1.10 python-matplotlib.spec, 1.15, 1.16 sources, 1.9, 1.10 Message-ID: <200603161629.k2GGTnan017763@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/python-matplotlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17738 Modified Files: .cvsignore python-matplotlib.spec sources Log Message: Update to 0.87.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 7 Mar 2006 19:53:22 -0000 1.9 +++ .cvsignore 16 Mar 2006 16:29:16 -0000 1.10 @@ -1 +1 @@ -matplotlib-0.87.1.tar.gz +matplotlib-0.87.2.tar.gz Index: python-matplotlib.spec =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/python-matplotlib.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- python-matplotlib.spec 7 Mar 2006 19:53:22 -0000 1.15 +++ python-matplotlib.spec 16 Mar 2006 16:29:16 -0000 1.16 @@ -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.1 +Version: 0.87.2 Release: 1%{?dist} Summary: Python plotting library @@ -90,6 +90,9 @@ %{python_sitearch}/matplotlib/backends/_tkagg.so %changelog +* Tue Mar 7 2006 Orion Poplawski 0.87.2-1 +- Update to 0.87.2 + * Tue Mar 7 2006 Orion Poplawski 0.87.1-1 - Update to 0.87.1 - Add pycairo >= 1.0.2 requires (FC5+ only) Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-matplotlib/devel/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 7 Mar 2006 19:53:22 -0000 1.9 +++ sources 16 Mar 2006 16:29:16 -0000 1.10 @@ -1 +1 @@ -bc605e5346128a0e2b9c5b0d602ecec8 matplotlib-0.87.1.tar.gz +74dde3c3e33797f56ebd6ca578090f8e matplotlib-0.87.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 16 17:30:16 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Thu, 16 Mar 2006 12:30:16 -0500 Subject: rpms/freedroidrpg/devel freedroidrpg.spec,1.12,1.13 Message-ID: <200603161730.k2GHUnkg019956@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/freedroidrpg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19937 Modified Files: freedroidrpg.spec Log Message: Add needed BR for modular xorg. Index: freedroidrpg.spec =================================================================== RCS file: /cvs/extras/rpms/freedroidrpg/devel/freedroidrpg.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- freedroidrpg.spec 2 Mar 2006 21:29:04 -0000 1.12 +++ freedroidrpg.spec 16 Mar 2006 17:30:16 -0000 1.13 @@ -1,6 +1,6 @@ Name: freedroidrpg Version: 0.9.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Role playing game with Freedroid theme and Tux as the hero Group: Amusements/Games @@ -19,6 +19,7 @@ BuildRequires: ImageMagick BuildRequires: libvorbis-devel BuildRequires: desktop-file-utils +BuildRequires: mesa-libGLU-devel %description The Freedroid RPG is an extension/modification of the classical @@ -26,13 +27,6 @@ %prep -cat< - 0.9.13-2 +- Add BR: for modular xorg. + * Sat Sep 10 2005 Ville Skytt?? - 0.9.13-1 - 0.9.13. - Drop some outdated docs. From fedora-extras-commits at redhat.com Thu Mar 16 17:39:03 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 16 Mar 2006 10:39:03 -0700 Subject: rpms/bonnie++/devel bonnie++.spec,1.8,1.9 Message-ID: <200603161739.k2GHd3fe020078@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/bonnie++/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20067 Modified Files: bonnie++.spec Log Message: rebuild for FC5 Index: bonnie++.spec =================================================================== RCS file: /cvs/extras/rpms/bonnie++/devel/bonnie++.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- bonnie++.spec 6 Apr 2005 22:11:13 -0000 1.8 +++ bonnie++.spec 16 Mar 2006 17:39:03 -0000 1.9 @@ -1,6 +1,6 @@ Name: bonnie++ Version: 1.03a -Release: 4 +Release: 5%{?dist} Summary: Filesystem and disk benchmark & burn-in suite @@ -56,6 +56,9 @@ %changelog +* Thu Mar 16 2006 Warren Togami 0:1.03a-5 +- rebuild for FC5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Mar 16 17:41:57 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 16 Mar 2006 10:41:57 -0700 Subject: rpms/lvcool/devel lvcool.spec,1.9,1.10 Message-ID: <200603161741.k2GHfvCH020178@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/lvcool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20167 Modified Files: lvcool.spec Log Message: rebuild for FC5 Index: lvcool.spec =================================================================== RCS file: /cvs/extras/rpms/lvcool/devel/lvcool.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lvcool.spec 12 Apr 2005 14:54:53 -0000 1.9 +++ lvcool.spec 16 Mar 2006 17:41:57 -0000 1.10 @@ -2,7 +2,7 @@ Name: lvcool # Upstream has no version, tarball repacked Version: 1.0.0 -Release: 3 +Release: 4%{?dist} URL: http://vcool.occludo.net/VC_Linux.html License: GPL @@ -48,6 +48,9 @@ %changelog +* Thu Mar 16 2006 Warren Togami - 1.0.0-4 +- rebuild for FC5 + * Tue Apr 12 2005 Michael Schwendt - 1.0.0-3 - Remove "BuildArch: athlon" again. It would be correct, but is not supported by Fedora Extras CVS Makefile. From fedora-extras-commits at redhat.com Thu Mar 16 17:51:43 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 16 Mar 2006 12:51:43 -0500 Subject: rpms/nexuiz-data/devel .cvsignore, 1.4, 1.5 nexuiz-data.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603161752.k2GHqFKC020342@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20308 Modified Files: .cvsignore nexuiz-data.spec sources Log Message: * Thu Mar 16 2006 Adrian Reber - 1.5-1 - updated to 1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Sep 2005 14:22:04 -0000 1.4 +++ .cvsignore 16 Mar 2006 17:51:43 -0000 1.5 @@ -1 +1 @@ -nexuiz-data-1.2.1.tar +nexuiz-data-1.5.tar Index: nexuiz-data.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/nexuiz-data.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nexuiz-data.spec 19 Sep 2005 14:22:04 -0000 1.4 +++ nexuiz-data.spec 16 Mar 2006 17:51:43 -0000 1.5 @@ -1,20 +1,19 @@ -%define datadate 20050905 +%define datadate 20060208 Summary: Game data for the Nexuiz first person shooter Name: nexuiz-data -Version: 1.2.1 +Version: 1.5 Release: 1 License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip -# unzip nexuiz121.zip -# mkdir nexuiz-data-1.2.1/ -# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/gpl.txt \ -# Nexuiz/betacredits.txt Nexuiz/gamemodes.txt \ -# nexuiz-data-1.2.1/ -# tar cvf nexuiz-data-1.2.1.tar nexuiz-data-1.2.1/ +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz15.zip +# unzip nexuiz15.zip +# mkdir nexuiz-data-1.5/ +# mv Nexuiz/data/ Nexuiz/gpl.txt Nexuiz/Docs/* \ +# nexuiz-data-1.5/ +# tar cvf nexuiz-data-1.5.tar nexuiz-data-1.5/ Source0: nexuiz-data-%{version}.tar BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,14 +26,14 @@ %prep %setup -q -%{__sed} -i 's/\r//' Readme.htm *.txt data/*.txt +%{__sed} -i 's/\r//' Readme.htm *.txt FAQ* %build %install %{__rm} -rf %{buildroot} %{__mkdir_p} %{buildroot}%{_datadir}/nexuiz/data/ -%{__install} -p data/data%{datadate}-full.pk3 \ +%{__install} -p data/data%{datadate}.pk3 \ %{buildroot}%{_datadir}/nexuiz/data/ %clean @@ -42,11 +41,14 @@ %files %defattr(0644, root, root, 0755) -%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt betacredits.txt -%doc gamemodes.txt +%doc Readme.htm gpl.txt cvars.txt mapping.txt +%doc gamemodes.txt FAQ* %{_datadir}/nexuiz/ %changelog +* Thu Mar 16 2006 Adrian Reber - 1.5-1 +- updated to 1.5 + * Mon Sep 19 2005 Adrian Reber - 1.2.1-1 - updated to 1.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Sep 2005 14:22:04 -0000 1.4 +++ sources 16 Mar 2006 17:51:43 -0000 1.5 @@ -1 +1 @@ -64d371d2008b096c67980e7a65a412bc nexuiz-data-1.2.1.tar +d7bcb0515a8d91b1cfb12546550e92fc nexuiz-data-1.5.tar From fedora-extras-commits at redhat.com Thu Mar 16 17:53:23 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 16 Mar 2006 10:53:23 -0700 Subject: rpms/perl-Digest-Nilsimsa/devel perl-Digest-Nilsimsa.spec,1.7,1.8 Message-ID: <200603161753.k2GHrNEK020374@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Digest-Nilsimsa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20363 Modified Files: perl-Digest-Nilsimsa.spec Log Message: rebuild for FC5 Index: perl-Digest-Nilsimsa.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Digest-Nilsimsa/devel/perl-Digest-Nilsimsa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- perl-Digest-Nilsimsa.spec 6 Apr 2005 22:12:44 -0000 1.7 +++ perl-Digest-Nilsimsa.spec 16 Mar 2006 17:53:23 -0000 1.8 @@ -1,6 +1,6 @@ Name: perl-Digest-Nilsimsa Version: 0.06 -Release: 5 +Release: 6%{?dist} Summary: Perl interface to the Nilsima Algorithm @@ -48,6 +48,9 @@ %changelog +* Thu Mar 16 2006 Warren Togami 0.06-6 +- rebuild for FC5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Thu Mar 16 18:04:18 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 16 Mar 2006 13:04:18 -0500 Subject: rpms/nexuiz/devel .cvsignore, 1.4, 1.5 nexuiz-1.0-basedir.patch, 1.1, 1.2 nexuiz.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200603161804.k2GI4pni022477@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22451 Modified Files: .cvsignore nexuiz-1.0-basedir.patch nexuiz.spec sources Log Message: * Wed Mar 16 2006 Adrian Reber - 1.5-1 - updated to 1.5 - enabled sdl binary Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 19 Sep 2005 14:25:48 -0000 1.4 +++ .cvsignore 16 Mar 2006 18:04:18 -0000 1.5 @@ -1 +1 @@ -nexuizenginesource20050911.zip +nexuizenginesource20060208.zip nexuiz-1.0-basedir.patch: Index: nexuiz-1.0-basedir.patch =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz-1.0-basedir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nexuiz-1.0-basedir.patch 9 Jul 2005 11:59:33 -0000 1.1 +++ nexuiz-1.0-basedir.patch 16 Mar 2006 18:04:18 -0000 1.2 @@ -4,7 +4,7 @@ fs_mempool = Mem_AllocPool("file management", 0, NULL); -- strcpy(fs_basedir, "."); +- strcpy(fs_basedir, ""); + strcpy(fs_basedir, "/usr/share/nexuiz"); strcpy(fs_gamedir, ""); Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- nexuiz.spec 30 Nov 2005 12:53:04 -0000 1.8 +++ nexuiz.spec 16 Mar 2006 18:04:18 -0000 1.9 @@ -1,14 +1,14 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.5 +Release: 1%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip -# unzip nexuiz121.zip Nexuiz/nexuizenginesource20050911.zip -Source: nexuizenginesource20050911.zip +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz15.zip +# unzip nexuiz15.zip Nexuiz/nexuizenginesource20060208.zip +Source: nexuizenginesource20060208.zip Patch0: nexuiz-1.0-basedir.patch Patch1: nexuiz-1.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -16,7 +16,7 @@ BuildRequires: ImageMagick, file BuildRequires: libX11-devel, alsa-lib-devel, desktop-file-utils BuildRequires: mesa-libGL-devel libXext-devel libXxf86dga-devel -BuildRequires: libXxf86vm-devel +BuildRequires: libXxf86vm-devel SDL-devel # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build Requires: zlib libvorbis libjpeg @@ -36,7 +36,7 @@ Requires: nexuiz-data = %{version} # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build -Requires: libz.so.1 +Requires: zlib %description server Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, @@ -54,7 +54,7 @@ %build -%{__make} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" +%{__make} cl-release sv-release sdl-release OPTIM_RELEASE="$RPM_OPT_FLAGS" convert darkplaces.ico nexuiz.png @@ -63,9 +63,11 @@ # Install the main programs %{__mkdir_p} %{buildroot}%{_bindir} -%{__install} -m 0755 darkplaces-glx \ +%{__install} -m 0755 nexuiz-glx \ %{buildroot}%{_bindir}/nexuiz-glx -%{__install} -m 0755 darkplaces-dedicated \ +%{__install} -m 0755 nexuiz-sdl \ + %{buildroot}%{_bindir}/nexuiz-sdl +%{__install} -m 0755 nexuiz-dedicated \ %{buildroot}%{_bindir}/nexuiz-dedicated # Create the desktop file @@ -115,6 +117,7 @@ %defattr(-,root,root,-) %doc COPYING darkplaces.txt %{_bindir}/nexuiz-glx +%{_bindir}/nexuiz-sdl %{_datadir}/icons/hicolor/*/apps/nexuiz.png %{_datadir}/applications/*%{name}.desktop @@ -125,6 +128,10 @@ %changelog +* Wed Mar 16 2006 Adrian Reber - 1.5-1 +- updated to 1.5 +- enabled sdl binary + * Wed Nov 30 2005 Adrian Reber - 1.2.1-3 - changes for modular X Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 19 Sep 2005 14:25:48 -0000 1.4 +++ sources 16 Mar 2006 18:04:18 -0000 1.5 @@ -1 +1 @@ -ea845ee2842ad6a2304da1f0b2c95bdd nexuizenginesource20050911.zip +9ad968b3706b00d4a0f196d1c3f2267d nexuizenginesource20060208.zip From fedora-extras-commits at redhat.com Thu Mar 16 18:07:20 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 16 Mar 2006 13:07:20 -0500 Subject: rpms/libtunepimp/devel .cvsignore, 1.2, 1.3 libtunepimp.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200603161807.k2GI7sdh022526@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libtunepimp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22491 Modified Files: .cvsignore libtunepimp.spec sources Log Message: * Thu Mar 16 2006 Rex Dieter 0.4.2-1 - 0.4.2 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 20 Nov 2005 19:14:31 -0000 1.2 +++ .cvsignore 16 Mar 2006 18:07:20 -0000 1.3 @@ -1 +1 @@ -libtunepimp-0.4.0.tar.gz +libtunepimp-0.4.2.tar.gz Index: libtunepimp.spec =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libtunepimp.spec 1 Mar 2006 16:18:04 -0000 1.6 +++ libtunepimp.spec 16 Mar 2006 18:07:20 -0000 1.7 @@ -1,16 +1,17 @@ Summary: A library for creating MusicBrainz enabled tagging applications Name: libtunepimp -Version: 0.4.0 -Release: 5%{?dist}.2 +Version: 0.4.2 +Release: 1%{?dist} + # README.LGPL implies that it's not completely lgpl, yet. License: GPL Group: System Environment/Libraries URL: http://www.musicbrainz.org/products/tunepimp/ -Source: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-0.4.0.tar.gz +Source: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: libtunepimp-0.4.0-gcc41.patch +#Patch1: libtunepimp-0.4.0-gcc41.patch BuildRequires: readline-devel BuildRequires: libvorbis-devel @@ -42,7 +43,7 @@ %prep %setup -q -%patch1 -p1 -b .gcc41 +#patch1 -p1 -b .gcc41 %build @@ -95,6 +96,9 @@ %changelog +* Thu Mar 16 2006 Rex Dieter 0.4.2-1 +- 0.4.2 + * Wed Mar 1 2006 Rex Dieter - fc5: gcc/glibc respin Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Nov 2005 19:14:31 -0000 1.2 +++ sources 16 Mar 2006 18:07:20 -0000 1.3 @@ -1 +1 @@ -c11c3082ee72896949cb4fdb7acbbf63 libtunepimp-0.4.0.tar.gz +10b9e4a2f1930aed78ef7ddaebbe0fde libtunepimp-0.4.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 16 18:08:00 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:08:00 -0500 Subject: rpms/lzo/devel lzo.spec,1.9,1.10 Message-ID: <200603161808.k2GI8Yuh022595@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/lzo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22560 Modified Files: lzo.spec Log Message: lzo: release bump Index: lzo.spec =================================================================== RCS file: /cvs/extras/rpms/lzo/devel/lzo.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- lzo.spec 17 Jan 2006 17:37:43 -0000 1.9 +++ lzo.spec 16 Mar 2006 18:08:00 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Data compression library with very fast (de)compression Name: lzo Version: 1.08 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: System Environment/Libraries @@ -59,6 +59,9 @@ %{_libdir}/liblzo.a %changelog +* Thu Mar 16 2006 Dams - 1.08-6.fc5 +- Rebuild for new gcc + * Tue Jan 17 2006 Dams - 1.08-5.fc5 - Bumped release for gcc 4.1 rebuild From fedora-extras-commits at redhat.com Thu Mar 16 18:08:47 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 16 Mar 2006 13:08:47 -0500 Subject: rpms/libtunepimp/FC-4 libtunepimp.spec,1.3,1.4 sources,1.2,1.3 Message-ID: <200603161809.k2GI9J7f022664@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libtunepimp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22601 Modified Files: libtunepimp.spec sources Log Message: * Thu Mar 16 2006 Rex Dieter 0.4.2-1 - 0.4.2 Index: libtunepimp.spec =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/FC-4/libtunepimp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libtunepimp.spec 19 Dec 2005 18:08:42 -0000 1.3 +++ libtunepimp.spec 16 Mar 2006 18:08:47 -0000 1.4 @@ -1,16 +1,17 @@ Summary: A library for creating MusicBrainz enabled tagging applications Name: libtunepimp -Version: 0.4.0 -Release: 4%{?dist} +Version: 0.4.2 +Release: 1%{?dist} + # README.LGPL implies that it's not completely lgpl, yet. License: GPL Group: System Environment/Libraries URL: http://www.musicbrainz.org/products/tunepimp/ -Source: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-0.4.0.tar.gz +Source: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: libtunepimp-0.3.0-gcc4.patch +#Patch1: libtunepimp-0.4.0-gcc41.patch BuildRequires: readline-devel BuildRequires: libvorbis-devel @@ -42,7 +43,7 @@ %prep %setup -q -%patch1 -p1 -b .gcc4 +#patch1 -p1 -b .gcc41 %build @@ -95,6 +96,15 @@ %changelog +* Thu Mar 16 2006 Rex Dieter 0.4.2-1 +- 0.4.2 + +* Wed Mar 1 2006 Rex Dieter +- fc5: gcc/glibc respin + +* Mon Dec 19 2005 Rex Dieter 0.4.0-5 +- update gcc4 patch + * Mon Dec 19 2005 Rex Dieter 0.4.0-4 - -tools: fix Req: %%name dependancy Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 20 Nov 2005 19:14:31 -0000 1.2 +++ sources 16 Mar 2006 18:08:47 -0000 1.3 @@ -1 +1 @@ -c11c3082ee72896949cb4fdb7acbbf63 libtunepimp-0.4.0.tar.gz +10b9e4a2f1930aed78ef7ddaebbe0fde libtunepimp-0.4.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 16 18:14:11 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Thu, 16 Mar 2006 11:14:11 -0700 Subject: rpms/perl-Razor-Agent/devel perl-Razor-Agent.spec,1.11,1.12 Message-ID: <200603161814.k2GIEBRw022792@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/perl-Razor-Agent/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22780 Modified Files: perl-Razor-Agent.spec Log Message: rebuild for FC5 Index: perl-Razor-Agent.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Razor-Agent/devel/perl-Razor-Agent.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- perl-Razor-Agent.spec 11 Nov 2005 21:11:31 -0000 1.11 +++ perl-Razor-Agent.spec 16 Mar 2006 18:14:11 -0000 1.12 @@ -3,7 +3,7 @@ Name: perl-Razor-Agent Version: 2.77 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Use a Razor catalogue server to filter spam messages Group: Applications/Internet @@ -89,6 +89,9 @@ %changelog +* Thu Mar 16 2006 Warren Togami - 2.77-3 +- rebuild for FC5 + * Fri Nov 11 2005 Warren Togami - 2.77-2 - 2.77 From fedora-extras-commits at redhat.com Thu Mar 16 18:14:16 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:14:16 -0500 Subject: rpms/libtar/devel libtar.spec,1.8,1.9 Message-ID: <200603161814.k2GIEmP1022835@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libtar/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22808 Modified Files: libtar.spec Log Message: libtar: release bump, URLs corrections Index: libtar.spec =================================================================== RCS file: /cvs/extras/rpms/libtar/devel/libtar.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libtar.spec 22 May 2005 23:53:32 -0000 1.8 +++ libtar.spec 16 Mar 2006 18:14:16 -0000 1.9 @@ -1,12 +1,12 @@ Summary: Tar file manipulation API Name: libtar Version: 1.2.11 -Release: 5 +Release: 6%{?dist} License: BSD Group: System Environment/Libraries -URL: http://www-dev.cites.uiuc.edu/libtar/ -Source0: %{name}-%{version}.tar.gz +URL: http://www.feep.net/libtar/ +Source0: ftp://ftp.feep.net/pub/software/libtar/libtar-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Provides: libtar-devel = %{name}-%{version} BuildRequires: zlib-devel @@ -47,6 +47,9 @@ %changelog +* Thu Mar 16 2006 Dams - 1.2.11-6.fc5 +- Modified URL and added one in Source0 + * Sun May 22 2005 Jeremy Katz - 1.2.11-5 - rebuild on all arches From fedora-extras-commits at redhat.com Thu Mar 16 18:20:32 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 16 Mar 2006 13:20:32 -0500 Subject: rpms/libtunepimp/devel libtunepimp.spec, 1.7, 1.8 libtunepimp-0.4.0-gcc41.patch, 1.1, NONE Message-ID: <200603161821.k2GIL4CB023027@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libtunepimp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23006 Modified Files: libtunepimp.spec Removed Files: libtunepimp-0.4.0-gcc41.patch Log Message: drop deprecated libtunepimp-0.4.0-gcc41.patch Index: libtunepimp.spec =================================================================== RCS file: /cvs/extras/rpms/libtunepimp/devel/libtunepimp.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libtunepimp.spec 16 Mar 2006 18:07:20 -0000 1.7 +++ libtunepimp.spec 16 Mar 2006 18:20:32 -0000 1.8 @@ -11,8 +11,6 @@ Source: http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -#Patch1: libtunepimp-0.4.0-gcc41.patch - BuildRequires: readline-devel BuildRequires: libvorbis-devel BuildRequires: flac-devel @@ -43,8 +41,6 @@ %prep %setup -q -#patch1 -p1 -b .gcc41 - %build %configure \ --- libtunepimp-0.4.0-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 16 18:26:09 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:26:09 -0500 Subject: rpms/libsndfile/devel .cvsignore, 1.3, 1.4 libsndfile.spec, 1.9, 1.10 sources, 1.3, 1.4 libsndfile-1.0.11-svx-channels.patch, 1.1, NONE Message-ID: <200603161826.k2GIQfSe023155@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libsndfile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23132 Modified Files: .cvsignore libsndfile.spec sources Removed Files: libsndfile-1.0.11-svx-channels.patch Log Message: libsndfile: updated to 1.0.14 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Mar 2005 01:44:40 -0000 1.3 +++ .cvsignore 16 Mar 2006 18:26:08 -0000 1.4 @@ -1 +1 @@ -libsndfile-1.0.11.tar.gz +libsndfile-1.0.14.tar.gz Index: libsndfile.spec =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/libsndfile.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libsndfile.spec 27 Jun 2005 18:19:30 -0000 1.9 +++ libsndfile.spec 16 Mar 2006 18:26:08 -0000 1.10 @@ -1,12 +1,11 @@ Summary: Library for reading and writing sound files Name: libsndfile -Version: 1.0.11 -Release: 3%{?dist} +Version: 1.0.14 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.mega-nerd.com/libsndfile/ Source0: http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz -Patch0: libsndfile-1.0.11-svx-channels.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRequires: alsa-lib-devel @@ -32,8 +31,6 @@ %prep %setup -q -%patch0 -p1 -b .svx-channels - %build %configure --disable-dependency-tracking @@ -62,6 +59,7 @@ %{_bindir}/sndfile-info %{_bindir}/sndfile-play %{_bindir}/sndfile-convert +%{_bindir}/sndfile-regtest %{_mandir}/man1/sndfile-info.1* %{_mandir}/man1/sndfile-play.1* %{_mandir}/man1/sndfile-convert.1* @@ -79,6 +77,10 @@ %changelog +* Thu Mar 16 2006 Dams - 1.0.14-1.fc5 +- Updated to 1.0.14 +- Dropped patch0 + * Thu May 12 2005 Michael Schwendt - 1.0.11-3 - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Mar 2005 01:44:40 -0000 1.3 +++ sources 16 Mar 2006 18:26:08 -0000 1.4 @@ -1 +1 @@ -9ec0b3610041423a57387f284849f2fc libsndfile-1.0.11.tar.gz +3513c2283f4063f57615c5b9b45bf30a libsndfile-1.0.14.tar.gz --- libsndfile-1.0.11-svx-channels.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 16 18:32:42 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:32:42 -0500 Subject: rpms/libsamplerate/devel libsamplerate.spec,1.10,1.11 Message-ID: <200603161833.k2GIXEkm023233@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libsamplerate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23216 Modified Files: libsamplerate.spec Log Message: libsamplerate: release bump Index: libsamplerate.spec =================================================================== RCS file: /cvs/extras/rpms/libsamplerate/devel/libsamplerate.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libsamplerate.spec 27 Jun 2005 18:19:30 -0000 1.10 +++ libsamplerate.spec 16 Mar 2006 18:32:42 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Sample rate conversion library for audio data Name: libsamplerate Version: 0.1.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Libraries URL: http://www.mega-nerd.com/SRC/ @@ -75,6 +75,9 @@ %changelog +* Thu Mar 16 2006 Dams - 0.1.2-4.fc5 +- rebuild + * Thu May 12 2005 Michael Schwendt - 0.1.2-3 - rebuilt From fedora-extras-commits at redhat.com Thu Mar 16 18:36:26 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 16 Mar 2006 13:36:26 -0500 Subject: rpms/octave/devel octave.spec,1.31,1.32 Message-ID: <200603161836.k2GIaw70023326@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23309 Modified Files: octave.spec Log Message: Rebuild for new hdf5. Misc spec changes. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- octave.spec 24 Feb 2006 07:23:11 -0000 1.31 +++ octave.spec 16 Mar 2006 18:36:26 -0000 1.32 @@ -63,10 +63,9 @@ %define enable64 --enable-64=no %endif CPPFLAGS=-I%{_includedir}/glpk \ -CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure %enable64 \ - --enable-shared=yes --enable-lite-kernel --enable-static=no \ - --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} \ - --mandir=%{_mandir} +CXXFLAGS="$RPM_OPT_FLAGS" ./configure %enable64 \ + --enable-shared --disable-static --prefix=%{_prefix} \ + --infodir=%{_infodir} --libdir=%{_libdir} --mandir=%{_mandir} make %{?_smp_mflags} @@ -128,6 +127,8 @@ %changelog * Fri Feb 24 2006 Quentin Spencer 2.9.4-8 +- Rebuild for new hdf5. +- Remove obsolete configure options. - Make sure /usr/libexec/octave is owned by octave. * Wed Feb 15 2006 Quentin Spencer 2.9.4-7 From fedora-extras-commits at redhat.com Thu Mar 16 18:38:41 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:38:41 -0500 Subject: rpms/libebml/devel libebml.spec,1.12,1.13 Message-ID: <200603161839.k2GIdDse023436@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libebml/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23385 Modified Files: libebml.spec Log Message: libebml: release bump Index: libebml.spec =================================================================== RCS file: /cvs/extras/rpms/libebml/devel/libebml.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libebml.spec 29 Nov 2005 09:46:41 -0000 1.12 +++ libebml.spec 16 Mar 2006 18:38:40 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Extensible Binary Meta Language library Name: libebml Version: 0.7.6 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -67,6 +67,9 @@ %changelog +* Thu Mar 16 2006 Dams - 0.7.6-2.fc5 +- Release bump + * Tue Nov 29 2005 Matthias Saou 0.7.6-1 - Update to 0.7.6. - Change URL to the project's one. From fedora-extras-commits at redhat.com Thu Mar 16 18:40:06 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 16 Mar 2006 13:40:06 -0500 Subject: rpms/octave/FC-4 octave.spec,1.26,1.27 Message-ID: <200603161840.k2GIed8V023587@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23519 Modified Files: octave.spec Log Message: Remove obsolete configure options. Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- octave.spec 24 Feb 2006 07:16:14 -0000 1.26 +++ octave.spec 16 Mar 2006 18:40:06 -0000 1.27 @@ -53,9 +53,7 @@ %build -CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" ./configure \ - --enable-shared=yes --enable-lite-kernel --enable-static=no \ - --prefix=%{_prefix} --infodir=%{_infodir} --libdir=%{_libdir} +%configure --enable-shared --disable-static make %{?_smp_mflags} @@ -118,8 +116,9 @@ %changelog -* Fri Feb 24 2006 Quentin Spencer 2.1.72-4 +* Thu Mar 16 2006 Quentin Spencer 2.1.72-4 - Make sure /usr/libexec/octave is owned by octave. +- Remove configure options that are now obsolete. * Wed Feb 1 2006 Quentin Spencer 2.1.72-3 - Patch to fix bug #179242. From fedora-extras-commits at redhat.com Thu Mar 16 18:44:26 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:44:26 -0500 Subject: rpms/libmatroska/devel libmatroska.spec,1.12,1.13 Message-ID: <200603161844.k2GIix5H023695@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libmatroska/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23673 Modified Files: libmatroska.spec Log Message: libmatroska: release bump Index: libmatroska.spec =================================================================== RCS file: /cvs/extras/rpms/libmatroska/devel/libmatroska.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libmatroska.spec 29 Nov 2005 09:56:55 -0000 1.12 +++ libmatroska.spec 16 Mar 2006 18:44:26 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Open audio/video container format library Name: libmatroska Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries URL: http://www.matroska.org/ @@ -71,6 +71,9 @@ %changelog +* Thu Mar 16 2006 Dams - 0.8.0-2.fc5 +- Rebuild + * Tue Nov 29 2005 Matthias Saou 0.8.0-1 - Update to 0.8.0. - Add a full description for the devel package. From fedora-extras-commits at redhat.com Thu Mar 16 18:54:51 2006 From: fedora-extras-commits at redhat.com (Dams Nade (anvil)) Date: Thu, 16 Mar 2006 13:54:51 -0500 Subject: rpms/libcddb/devel libcddb.spec,1.15,1.16 Message-ID: <200603161855.k2GItNM9023792@cvs-int.fedora.redhat.com> Author: anvil Update of /cvs/extras/rpms/libcddb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23774 Modified Files: libcddb.spec Log Message: libcddb: release bump Index: libcddb.spec =================================================================== RCS file: /cvs/extras/rpms/libcddb/devel/libcddb.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- libcddb.spec 23 Aug 2005 14:50:41 -0000 1.15 +++ libcddb.spec 16 Mar 2006 18:54:50 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Library (C API) for accessing CDDB servers Name: libcddb Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL Group: System Environment/Libraries @@ -66,6 +66,9 @@ %changelog +* Thu Mar 16 2006 Dams - 1.2.1-2.fc5 +- Rebuild + * Tue Aug 23 2005 Dams - 1.2.1 - Updated to 1.2.1 From fedora-extras-commits at redhat.com Thu Mar 16 19:37:06 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:37:06 -0500 Subject: rpms/dumb - New directory Message-ID: <200603161937.k2GJb8Nr026115@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26107/dumb Log Message: Directory /cvs/extras/rpms/dumb added to the repository From fedora-extras-commits at redhat.com Thu Mar 16 19:37:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:37:12 -0500 Subject: rpms/dumb/devel - New directory Message-ID: <200603161937.k2GJbELj026130@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26107/dumb/devel Log Message: Directory /cvs/extras/rpms/dumb/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 16 19:37:29 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:37:29 -0500 Subject: rpms/dumb Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603161937.k2GJbV9v026164@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26152 Added Files: Makefile import.log Log Message: Setup of module dumb --- NEW FILE Makefile --- # Top level Makefile for module dumb all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 16 19:37:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:37:35 -0500 Subject: rpms/dumb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603161937.k2GJbbZ8026184@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26152/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module dumb --- NEW 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 Mar 16 19:38:06 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:38:06 -0500 Subject: rpms/dumb import.log,1.1,1.2 Message-ID: <200603161938.k2GJcch6026254@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26220 Modified Files: import.log Log Message: auto-import dumb-0.9.3-2 on branch devel from dumb-0.9.3-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dumb/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 16 Mar 2006 19:37:29 -0000 1.1 +++ import.log 16 Mar 2006 19:38:06 -0000 1.2 @@ -0,0 +1 @@ +dumb-0_9_3-2:HEAD:dumb-0.9.3-2.src.rpm:1142538114 From fedora-extras-commits at redhat.com Thu Mar 16 19:38:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Thu, 16 Mar 2006 14:38:12 -0500 Subject: rpms/dumb/devel dumb.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603161938.k2GJci7d026258@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26220/devel Modified Files: .cvsignore sources Added Files: dumb.spec Log Message: auto-import dumb-0.9.3-2 on branch devel from dumb-0.9.3-2.src.rpm --- NEW FILE dumb.spec --- Name: dumb Version: 0.9.3 Release: 2%{?dist} Summary: IT, XM, S3M and MOD player library Group: System Environment/Libraries License: GPL-Compatible URL: http://dumb.sourceforge.net/ Source0: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.gz Source1: http://dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}-autotools.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel %description IT, XM, S3M and MOD player library. Mainly targeted for use with the allegro game programming library, but it can be used without allegro. Faithful to the original trackers, especially IT. %package devel Summary: Development libraries and headers for dumb Group: Development/Libraries Requires: %{name} = %{version} %description devel The developmental files that must be installed in order to compile applications which use dumb. %prep %setup -q -b 01 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT #clean out .la and static libs rm -f $RPM_BUILD_ROOT%{_libdir}/*.a $RPM_BUILD_ROOT%{_libdir}/*.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc licence.txt release.txt readme.txt %{_bindir}/dumb* %{_libdir}/lib*-%{version}.so %files devel %defattr(-,root,root,-) %doc docs/deprec.txt docs/dumb.txt docs/faq.txt docs/fnptr.txt docs/howto.txt docs/ptr.txt %{_includedir}/*.h %{_libdir}/libdumb.so %{_libdir}/libaldmb.so %changelog * Thu Mar 16 2006 Hans de Goede 0.9.3-2 - Drop modplug.txt from %doc and move release.txt and readme.txt from the -devel package to the main package (bz 185576). * Fri Jan 27 2006 Hans de Goede 0.9.3-1 - Initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dumb/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 16 Mar 2006 19:37:35 -0000 1.1 +++ .cvsignore 16 Mar 2006 19:38:11 -0000 1.2 @@ -0,0 +1,2 @@ +dumb-0.9.3-autotools.tar.gz +dumb-0.9.3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/dumb/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 16 Mar 2006 19:37:35 -0000 1.1 +++ sources 16 Mar 2006 19:38:12 -0000 1.2 @@ -0,0 +1,2 @@ +3e345d643060880bab7c574774c4b35b dumb-0.9.3-autotools.tar.gz +f48da5b990aa8aa822d3b6a951baf5c2 dumb-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 16 19:44:20 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Thu, 16 Mar 2006 14:44:20 -0500 Subject: rpms/galeon/FC-4 galeon.spec,1.20,1.21 Message-ID: <200603161944.k2GJiqux026461@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/galeon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26444 Modified Files: galeon.spec Log Message: Removed x86_64 specific automake runs Index: galeon.spec =================================================================== RCS file: /cvs/extras/rpms/galeon/FC-4/galeon.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- galeon.spec 1 Mar 2006 18:49:01 -0000 1.20 +++ galeon.spec 16 Mar 2006 19:44:20 -0000 1.21 @@ -1,7 +1,7 @@ Summary: GNOME2 Web browser based on Mozilla Name: galeon Version: 2.0.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet URL: http://galeon.sourceforge.net/ @@ -11,13 +11,12 @@ Requires: mozilla = 37:1.7.12 BuildRequires: gettext mozilla-nspr-devel desktop-file-utils BuildRequires: gtk2-devel >= 2.4.0 gnome-desktop-devel +BuildRequires: libglade2-devel >= 2.3.1 libbonoboui-devel >= 2.1.1 BuildRequires: mozilla-devel >= 37:1.7.2 BuildRequires: libxml2-devel >= 2.6.6 BuildRequires: libgnomeui-devel >= 2.5.2 +BuildRequires: ORBit2-devel >= 2.0.0 BuildRequires: perl(XML::Parser) scrollkeeper -%ifarch x86_64 -BuildRequires: autoconf automake libtool intltool -%endif %description Galeon is a web browser built around Gecko (Mozilla's rendering @@ -29,10 +28,6 @@ %prep %setup -q -n %{name}-%{version}%{?extraversion} -%ifarch x86_64 -aclocal -autoconf -%endif %build %configure \ @@ -101,6 +96,9 @@ %changelog +* Thu Mar 16 2006 Denis Leroy - 2.0.1-2 +- Removed x86_64 specific automake runs + * Wed Mar 1 2006 Denis Leroy - 2.0.1-1 - Update to 2.0.1 From fedora-extras-commits at redhat.com Thu Mar 16 20:25:34 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Thu, 16 Mar 2006 15:25:34 -0500 Subject: devel/common branches,1.3,1.4 Message-ID: <200603162026.k2GKQ6rX011548@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/devel/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11035 Modified Files: branches Log Message: branch adjust Index: branches =================================================================== RCS file: /cvs/extras/devel/common/branches,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- branches 31 May 2005 18:50:04 -0000 1.3 +++ branches 16 Mar 2006 20:25:32 -0000 1.4 @@ -5,4 +5,5 @@ FC-2:fc2:.fc2:fedora:2 FC-3:fc3:.fc3:fedora:3 FC-4:fc4:.fc4:fedora:4 -devel:devel:.fc5:fedora:5 +FC-5:fc5:.fc5:fedora:5 +devel:devel:.fc6:fedora:6 From fedora-extras-commits at redhat.com Thu Mar 16 22:33:48 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Thu, 16 Mar 2006 17:33:48 -0500 Subject: rpms/ghdl/devel ghdl-svn49.patch,NONE,1.1 ghdl.spec,1.10,1.11 Message-ID: <200603162234.k2GMYKCk009344@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9314 Modified Files: ghdl.spec Added Files: ghdl-svn49.patch Log Message: update to svn49 ghdl-svn49.patch: --- NEW FILE ghdl-svn49.patch --- diff -urN ghdl-0.21/README ghdl-0.22dev/README --- ghdl-0.21/README 2005-12-18 14:49:00.000000000 +0100 +++ ghdl-0.22dev/README 2006-03-16 20:52:11.000000000 +0100 @@ -27,19 +27,33 @@ *************************** Required: -* the sources of gcc-4.0.2 (at least the core part). +* the sources of gcc-4.1.0 (at least the core part). Note: other versions of gcc sources have not been tested. * the Ada95 GNAT compiler (GNAT v3.15p and GNAT GPL 2005 are known to work; Ada compilers in most Linux distributions are more or less buggy) * GNU/Linux for ix86 (pc systems) (porting is necessary for other systems) Procedure: +* Check your Ada compiler. On some systems (or with some distribution), the + GNAT compiler seems broken. Try this very simple example, using file + example.adb +<<<<<<<<<<<<<<<<<< +procedure Example is +begin + null; +end Example; +<<<<<<<<<<<<<<<<<< + Compile with + $ gnatmake example + It should create an executable, 'example'. + If this doesn't work, your GNAT installation is broken. It may be a PATH + problem or something else. * untar the gcc tarball * untar the ghdl tarball (this sould have been done, since you are reading a file from it). * move or copy the vhdl directory of ghdl into the gcc subdirectory of the gcc distribution. - You should have a gcc-4.0.2/gcc/vhdl directory. + You should have a gcc-4.1.0/gcc/vhdl directory. * configure gcc with the --enable-languages=vhdl option. You may of course add other languages. Refer to the gcc installation documentation. diff -urN ghdl-0.21/vhdl/Make-lang.in ghdl-0.22dev/vhdl/Make-lang.in --- ghdl-0.21/vhdl/Make-lang.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Make-lang.in 2006-03-16 20:52:10.000000000 +0100 @@ -96,22 +96,21 @@ AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \ -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \ -I$(AGCC_GCCSRC_DIR)/libcpp/include -AGCC_CFLAGS=-g -DIN_GCC $(AGCC_INC_FLAGS) +AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) AGCC_LOCAL_OBJS=ortho-lang.o gcc-version.o AGCC_DEPS := $(AGCC_LOCAL_OBJS) AGCC_OBJS := $(AGCC_LOCAL_OBJS) \ $(AGCC_GCCOBJ_DIR)/gcc/toplev.o \ - $(AGCC_GCCOBJ_DIR)/gcc/c-convert.o \ $(AGCC_GCCOBJ_DIR)/gcc/libbackend.a \ $(AGCC_GCCOBJ_DIR)/libcpp/libcpp.a \ $(AGCC_GCCOBJ_DIR)/libiberty/libiberty.a -gcc-version.c: $(AGCC_GCCSRC_DIR)/gcc/version.c +gcc-version.c: $(AGCC_GCCSRC_DIR)/gcc/BASE-VER -$(RM) -f $@ echo '#include "version.h"' > $@ - sed -n -e '/version_string/ s/";/ (ghdl)";/p' < $< >> $@ + echo "const char version_string[] = \""`cat $<` "(ghdl)\";" >> $@ echo 'const char bug_report_url[] = "";' >> $@ gcc-version.o: gcc-version.c diff -urN ghdl-0.21/vhdl/Makefile.in ghdl-0.22dev/vhdl/Makefile.in --- ghdl-0.21/vhdl/Makefile.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Makefile.in 2006-03-16 20:52:10.000000000 +0100 @@ -480,6 +480,7 @@ #GRT_USE_PTHREADS=y ifeq ($(GRT_USE_PTHREADS),y) + GRT_CFLAGS+=-DUSE_THREADS GRT_ADD_OBJS+=grt-cthreads.o GRT_EXTRA_LIB+=-lpthread endif @@ -527,7 +528,7 @@ $(CC) -c $(GRT_FLAGS) -o $@ $< linux.o: $(GRTSRCDIR)/config/linux.c - $(CC) -c $(GRT_FLAGS) -o $@ $< + $(CC) -c $(GRT_FLAGS) $(GRT_CFLAGS) -o $@ $< win32.o: $(GRTSRCDIR)/config/win32.c $(CC) -c $(GRT_FLAGS) -o $@ $< diff -urN ghdl-0.21/vhdl/configuration.adb ghdl-0.22dev/vhdl/configuration.adb --- ghdl-0.21/vhdl/configuration.adb 2005-09-22 23:26:43.000000000 +0200 +++ ghdl-0.22dev/vhdl/configuration.adb 2006-03-16 20:51:10.000000000 +0100 @@ -25,7 +25,7 @@ package body Configuration is procedure Add_Design_Concurrent_Stmts (Parent : Iir); procedure Add_Design_Block_Configuration (Blk : Iir_Block_Configuration); - procedure Add_Design_Aspect (Aspect : Iir); + procedure Add_Design_Aspect (Aspect : Iir; Add_Default : Boolean); Current_File_Dependence : Iir_List := Null_Iir_List; Current_Configuration : Iir_Configuration_Declaration := Null_Iir; @@ -53,6 +53,16 @@ return; end if; + -- May be enabled to debug dependency construction. + if False then + if From = Null_Iir then + Warning_Msg_Elab (Disp_Node (Unit) & " added", Unit); + else + Warning_Msg_Elab + (Disp_Node (Unit) & " added by " & Disp_Node (From), From); + end if; + end if; + Set_Elab_Flag (Unit, True); Lib_Unit := Get_Library_Unit (Unit); @@ -200,7 +210,7 @@ begin Unit := Get_Instantiated_Unit (Stmt); if Get_Kind (Unit) /= Iir_Kind_Component_Declaration then - Add_Design_Aspect (Unit); + Add_Design_Aspect (Unit, True); end if; end; when Iir_Kind_Generate_Statement @@ -216,7 +226,7 @@ end loop; end Add_Design_Concurrent_Stmts; - procedure Add_Design_Aspect (Aspect : Iir) + procedure Add_Design_Aspect (Aspect : Iir; Add_Default : Boolean) is use Libraries; @@ -231,10 +241,13 @@ end if; case Get_Kind (Aspect) is when Iir_Kind_Entity_Aspect_Entity => + -- Add the entity. Entity := Get_Entity (Aspect); - Entity_Lib := Get_Library_Unit (Entity); Add_Design_Unit (Entity, Aspect); + + -- Extract and add the architecture. Arch := Get_Architecture (Aspect); + Entity_Lib := Get_Library_Unit (Entity); if Arch /= Null_Iir then case Get_Kind (Arch) is when Iir_Kind_Simple_Name => @@ -263,10 +276,15 @@ Arch := Get_Design_Unit (Arch); end if; Load_Design_Unit (Arch, Aspect); - Config := Get_Default_Configuration_Declaration - (Get_Library_Unit (Arch)); - if Config /= Null_Iir then - Add_Design_Unit (Config, Aspect); + Add_Design_Unit (Arch, Aspect); + + -- Add the default configuration if required. + if Add_Default then + Config := Get_Default_Configuration_Declaration + (Get_Library_Unit (Arch)); + if Config /= Null_Iir then + Add_Design_Unit (Config, Aspect); + end if; end if; when Iir_Kind_Entity_Aspect_Configuration => Add_Design_Unit (Get_Configuration (Aspect), Aspect); @@ -424,7 +442,9 @@ -- CONF is either a configuration specification or a component -- configuration. - procedure Add_Design_Binding_Indication (Conf : Iir) + -- If ADD_DEFAULT is true, then the default configuration for the design + -- binding must be added if required. + procedure Add_Design_Binding_Indication (Conf : Iir; Add_Default : Boolean) is Bind : Iir_Binding_Indication; Inst : Iir; @@ -442,12 +462,13 @@ return; end if; Check_Binding_Indication (Conf); - Add_Design_Aspect (Get_Entity_Aspect (Bind)); + Add_Design_Aspect (Get_Entity_Aspect (Bind), Add_Default); end Add_Design_Binding_Indication; procedure Add_Design_Block_Configuration (Blk : Iir_Block_Configuration) is Item : Iir; + Sub_Config : Iir; begin if Blk = Null_Iir then return; @@ -456,10 +477,11 @@ while Item /= Null_Iir loop case Get_Kind (Item) is when Iir_Kind_Configuration_Specification => - Add_Design_Binding_Indication (Item); + Add_Design_Binding_Indication (Item, True); when Iir_Kind_Component_Configuration => - Add_Design_Binding_Indication (Item); - Add_Design_Block_Configuration (Get_Block_Configuration (Item)); + Sub_Config := Get_Block_Configuration (Item); + Add_Design_Binding_Indication (Item, Sub_Config = Null_Iir); + Add_Design_Block_Configuration (Sub_Config); when Iir_Kind_Block_Configuration => Add_Design_Block_Configuration (Item); when others => diff -urN ghdl-0.21/vhdl/errorout.adb ghdl-0.22dev/vhdl/errorout.adb --- ghdl-0.21/vhdl/errorout.adb 2005-09-22 23:27:25.000000000 +0200 +++ ghdl-0.22dev/vhdl/errorout.adb 2006-03-16 20:51:10.000000000 +0100 @@ -501,7 +501,7 @@ & Name_Table.Name_Buffer (1 .. Name_Table.Name_Length) & '''; when Iir_Kind_Entity_Aspect_Entity => - return Disp_Node (Get_Entity (Node)) + return "aspect " & Disp_Node (Get_Entity (Node)) & '(' & Iirs_Utils.Image_Identifier (Get_Architecture (Node)) & ')'; when Iir_Kind_Entity_Aspect_Configuration => diff -urN ghdl-0.21/vhdl/evaluation.adb ghdl-0.22dev/vhdl/evaluation.adb --- ghdl-0.21/vhdl/evaluation.adb 2005-12-11 16:32:03.000000000 +0100 +++ ghdl-0.22dev/vhdl/evaluation.adb 2006-03-16 20:51:10.000000000 +0100 @@ -836,6 +836,28 @@ return Build_Simple_Aggregate (Res_List, Orig, Res_Type); end Eval_Concatenation; + function Eval_Array_Equality (Left, Right : Iir) return Boolean + is + L_List : Iir_List; + R_List : Iir_List; + N : Natural; + begin + -- FIXME: the simple aggregates are lost. + L_List := Get_Simple_Aggregate_List (Eval_String_Literal (Left)); + R_List := Get_Simple_Aggregate_List (Eval_String_Literal (Right)); + N := Get_Nbr_Elements (L_List); + if N /= Get_Nbr_Elements (R_List) then + return False; + end if; + for I in 0 .. N - 1 loop + -- FIXME: this is wrong: (eg: evaluated lit) + if Get_Nth_Element (L_List, I) /= Get_Nth_Element (R_List, I) then + return False; + end if; + end loop; + return True; + end Eval_Array_Equality; + -- ORIG is either a dyadic operator or a function call. function Eval_Dyadic_Operator (Orig : Iir; Left, Right : Iir) return Iir @@ -1073,34 +1095,10 @@ (Get_Fp_Value (Left) / Iir_Fp64 (Get_Value (Right)), Orig); when Iir_Predefined_Array_Equality => - declare - L_List : Iir_List; - R_List : Iir_List; - R : Boolean; - N : Natural; - begin - -- FIXME: the simple aggregates are lost. - L_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Left)); - R_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Right)); - N := Get_Nbr_Elements (L_List); - if N /= Get_Nbr_Elements (R_List) then - R := False; - else - R := True; - for I in 0 .. N - 1 loop - -- FIXME: this is wrong: (eg: evaluated lit) - if Get_Nth_Element (L_List, I) - /= Get_Nth_Element (R_List, I) - then - R := False; - exit; - end if; - end loop; - end if; - return Build_Boolean (R, Orig); - end; + return Build_Boolean (Eval_Array_Equality (Left, Right), Orig); + + when Iir_Predefined_Array_Inequality => + return Build_Boolean (not Eval_Array_Equality (Left, Right), Orig); when Iir_Predefined_Array_Sll | Iir_Predefined_Array_Srl @@ -1111,8 +1109,7 @@ return Eval_Shift_Operator (Eval_String_Literal (Left), Right, Orig, Func); - when Iir_Predefined_Array_Inequality - | Iir_Predefined_Array_Less + when Iir_Predefined_Array_Less | Iir_Predefined_Array_Less_Equal | Iir_Predefined_Array_Greater | Iir_Predefined_Array_Greater_Equal diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi --- ghdl-0.21/vhdl/ghdl.texi 2005-12-12 03:21:55.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdl.texi 2006-03-16 20:51:01.000000000 +0100 @@ -4,15 +4,19 @@ @settitle GHDL guide @c %**end of header + at direntry +* ghdl: (ghdl). VHDL compiler. + at end direntry + @titlepage @title GHDL guide @subtitle GHDL, a VHDL compiler - at subtitle For GHDL version 0.21 (Sokcho edition) + at subtitle For GHDL version 0.22 (Sokcho edition) @author Tristan Gingold @c The following two commands start the copyright page. @page @vskip 0pt plus 1filll -Copyright @copyright{} 2002, 2003, 2004, 2005 Tristan Gingold. +Copyright @copyright{} 2002, 2003, 2004, 2005, 2006 Tristan Gingold. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or @@ -70,11 +74,11 @@ @contents @ifnottex - at node Top + at node Top, Introduction, (dir), (dir) @top GHDL guide GHDL, a VHDL compiler. -Copyright @copyright{} 2002, 2003, 2004 Tristan Gingold. +Copyright @copyright{} 2002, 2003, 2004, 2005, 2006 Tristan Gingold. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 @@ -90,7 +94,6 @@ * Flaws and bugs report:: * Copyrights:: * Index:: - @end menu @end ifnottex @@ -902,6 +905,9 @@ messages that report such constructions. Some warnings are reported only during analysis, others during elaboration. +You could disable a warning by using the @option{--warn-no-XXX} +instead of @option{--warn-XXX}. + @table @code @item --warn-reserved @cindex @option{--warn-reserved} switch @@ -1688,6 +1694,7 @@ * Library database:: * VHDL files format:: * Top entity:: +* Using vendor libraries:: * Interfacing to other languages:: @end menu @@ -1865,7 +1872,7 @@ If the type mark is a composite type (record or array), the file is composed of a 2 lines signature, followed by a raw stream. - at node Top entity, Interfacing to other languages, VHDL files format, GHDL implementation of VHDL + at node Top entity, Using vendor libraries, VHDL files format, GHDL implementation of VHDL @comment node-name, next, previous, up @section Top entity There are some restrictions on the entity being at the apex of a design @@ -1879,8 +1886,38 @@ The ports type must be constrained. @end itemize - at node Interfacing to other languages, , Top entity, GHDL implementation of VHDL - at comment node-name, next, previous, up at section Interfacing with other languages + at node Using vendor libraries, Interfacing to other languages, Top entity, GHDL implementation of VHDL + at comment node-name, next, previous, up + at section Using vendor libraries +Many vendors libraries have been analyzed with GHDL. There are +usually no problems. Be sure to use the @option{--work=} option. +However, some problems have been encountered. + +GHDL follows the VHDL LRM (the manual which defines VHDL) more +strictly than other VHDL tools. You could try to relax the +restrictions by using the @option{--std=93c}, @option{-fexplicit} and + at option{--warn-no-vital-generic}. + +Even with these relaxations, some broken libraries may fail. + +For example, @code{unisim_VITAL.vhd} from @code{Xilinx} can't be +compiled because lines such as: + at smallexample + variable Write_A_Write_B : memory_collision_type := Write_A_Write_B; + variable Read_A_Write_B : memory_collision_type := Read_A_Write_B; + at end smallexample +(there are 6 such lines). +According to VHDL visibility rules, @samp{Write_A_Write_B} cannot be used +while it is defined. This is very logical because it prevents from silly +declarations such as + at smallexample + constant k : natural := 2 * k; + at end smallexample +This files must be modified. Fortunatly, in the example the variables +are never written. So it is enough to remove them. + + at node Interfacing to other languages, , Using vendor libraries, GHDL implementation of VHDL + at comment node-name, next, previous, up @section Interfacing to other languages @cindex interfacing @cindex other languages @@ -1931,7 +1968,7 @@ * Linking with foreign object files:: * Starting a simulation from a foreign program:: * Linking with Ada:: -* Using GRT from Ada:: +* Using GRT from Ada:: @end menu @node Restrictions on foreign declarations, Linking with foreign object files, Interfacing to other languages, Interfacing to other languages @@ -2036,7 +2073,7 @@ $ gnatmake my_prog -largs `ghdl --list-link design` @end smallexample - at node Using GRT from Ada, , Linking with Ada, Interfacing to other languages + at node Using GRT from Ada, , Linking with Ada, Interfacing to other languages @comment node-name, next, previous, up @subsection Using GRT from Ada @quotation Warning diff -urN ghdl-0.21/vhdl/ghdldrv/ghdlmain.adb ghdl-0.22dev/vhdl/ghdldrv/ghdlmain.adb --- ghdl-0.21/vhdl/ghdldrv/ghdlmain.adb 2005-12-04 04:51:33.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdldrv/ghdlmain.adb 2006-03-16 20:51:04.000000000 +0100 @@ -1,5 +1,5 @@ -- GHDL driver - main part. --- Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold +-- Copyright (C) 2002, 2003, 2004, 2005, 2006 Tristan Gingold -- -- GHDL 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 @@ -225,7 +225,7 @@ Put_Line ("Written by Tristan Gingold."); New_Line; -- Display copyright. Assume 80 cols terminal. - Put_Line ("Copyright (C) 2003, 2004, 2005 Tristan Gingold."); + Put_Line ("Copyright (C) 2003, 2004, 2005, 2006 Tristan Gingold."); Put_Line ("GHDL is free software, covered by the " & "GNU General Public License. There is NO"); Put_Line ("warranty; not even for MERCHANTABILITY or" diff -urN ghdl-0.21/vhdl/grt/config/linux.c ghdl-0.22dev/vhdl/grt/config/linux.c --- ghdl-0.21/vhdl/grt/config/linux.c 2005-12-12 03:29:26.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/linux.c 2006-03-16 20:51:05.000000000 +0100 @@ -189,7 +189,12 @@ #endif /* Context for the main stack. */ -static __thread struct stack_context main_stack_context; +#ifdef USE_THREADS +#define THREAD __thread +#else +#define THREAD +#endif +static THREAD struct stack_context main_stack_context; extern void grt_set_main_stack (struct stack_context *stack); @@ -280,3 +285,28 @@ res->cur_length = stack_size; return res; } + +#include +static int run_env_en; +static jmp_buf run_env; + +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (run_env_en) + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; +} + diff -urN ghdl-0.21/vhdl/grt/config/pthread.c ghdl-0.22dev/vhdl/grt/config/pthread.c --- ghdl-0.21/vhdl/grt/config/pthread.c 2005-12-12 03:37:47.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/pthread.c 2006-03-16 20:51:05.000000000 +0100 @@ -27,7 +27,7 @@ #include #include #include - +#include //#define INFO printf #define INFO (void) @@ -41,7 +41,8 @@ void* Arg; // ARG passed to FUNC } Stack_Type_t, *Stack_Type; -Stack_Type_t main_stack_context; +static Stack_Type_t main_stack_context; +static Stack_Type_t *current; extern void grt_set_main_stack (Stack_Type_t *stack); //---------------------------------------------------------------------------- @@ -58,6 +59,8 @@ // lock the mutex, as we are currently running pthread_mutex_lock(&(main_stack_context.mutex)); + current = &main_stack_context; + grt_set_main_stack (&main_stack_context); } @@ -115,6 +118,10 @@ return newStack; } +static int need_longjmp; +static int run_env_en; +static jmp_buf run_env; + //---------------------------------------------------------------------------- void grt_stack_switch(Stack_Type To, Stack_Type From) // Resume stack TO and save the current context to the stack pointed by @@ -122,7 +129,9 @@ // => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); { INFO("grt_stack_switch\n"); INFO(" from 0x%08x to 0x%08x\n", From, To); - + + current = To; + // unlock 'To' mutex. this will make the other thread either // - starts for first time in grt_stack_loop // - resumes at lock below @@ -132,6 +141,9 @@ // as we are running, our mutex is locked and we block here // when stacks are switched, with above unlock, we may proceed pthread_mutex_lock(&(From->mutex)); + + if (From == &main_stack_context && need_longjmp != 0) + longjmp (run_env, need_longjmp); } //---------------------------------------------------------------------------- @@ -141,6 +153,35 @@ { INFO("grt_stack_delete\n"); } +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (!run_env_en) + return; + + if (current != &main_stack_context) + { + need_longjmp = val; + grt_stack_switch (&main_stack_context, current); + } + else + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; +} + + //---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c --- ghdl-0.21/vhdl/grt/config/win32.c 2005-12-12 03:39:16.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/win32.c 2006-03-16 20:51:05.000000000 +0100 @@ -1,5 +1,5 @@ -/* GRT stack implementation for Win32 - Copyright (C) 2004, 2005 Felix Bertram. +/* GRT stack implementation for Win32 using fibers. + Copyright (C) 2005 Tristan Gingold. GHDL 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 @@ -16,139 +16,120 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -//----------------------------------------------------------------------------- -// Project: GHDL - VHDL Simulator -// Description: Win32 port of stacks package -// Note: Tristan's original i386/Linux used assembly-code -// to manually switch stacks for performance reasons. -// History: 2004feb09, FB, created. -//----------------------------------------------------------------------------- #include -//#include -//#include -//#include - - -//#define INFO printf -#define INFO (void) - -// GHDL names an endless loop calling FUNC with ARG a 'stack' -// at a given time, only one stack may be 'executed' -typedef struct -{ HANDLE thread; // stack's thread - HANDLE mutex; // mutex to suspend/resume thread - void (*Func)(void*); // stack's FUNC - void* Arg; // ARG passed to FUNC -} Stack_Type_t, *Stack_Type; +#include +#include +#include -Stack_Type_t main_stack_context; -extern Stack_Type grt_stack_main_stack; +struct stack_type +{ + LPVOID fiber; // Win fiber. + void (*func)(void *); // Function + void *arg; // Function argument. +}; + +static struct stack_type main_stack_context; +static struct stack_type *current; +extern void grt_set_main_stack (struct stack_type *stack); -//------------------------------------------------------------------------------ void grt_stack_init(void) -// Initialize the stacks package. -// This may adjust stack sizes. -// Must be called after grt.options.decode. -// => procedure Stack_Init; -{ INFO("grt_stack_init\n"); - INFO(" main_stack_context=0x%08x\n", &main_stack_context); - - // create event. reset event, as we are currently running - main_stack_context.mutex = CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - grt_stack_main_stack= &main_stack_context; -} - -//------------------------------------------------------------------------------ -static unsigned long __stdcall grt_stack_loop(void* pv_myStack) -{ - Stack_Type myStack= (Stack_Type)pv_myStack; - - INFO("grt_stack_loop\n"); - - INFO(" myStack=0x%08x\n", myStack); - - // block until event becomes set again. - // this happens when this stack is enabled for the first time - WaitForSingleObject(myStack->mutex, INFINITE); - - // run stack's function in endless loop - while(1) - { INFO(" call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg); - myStack->Func(myStack->Arg); - } - - // we never get here... - return 0; -} - -//------------------------------------------------------------------------------ -Stack_Type grt_stack_create(void* Func, void* Arg) -// Create a new stack, which on first execution will call FUNC with -// an argument ARG. -// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type; -{ Stack_Type newStack; - DWORD m_IDThread; // Thread's ID (dummy) - - INFO("grt_stack_create\n"); - INFO(" call 0x%08x with 0x%08x\n", Func, Arg); - - newStack= malloc(sizeof(Stack_Type_t)); - - // init function and argument - newStack->Func= Func; - newStack->Arg= Arg; - - // create event. reset event, so that thread will blocked in grt_stack_loop - newStack->mutex= CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - INFO(" newStack=0x%08x\n", newStack); - - // create thread, which executes grt_stack_loop - newStack->thread= CreateThread(NULL, // lpsa - 0, // cbStack - grt_stack_loop, // lpStartAddr - newStack, // lpvThreadParm - 0, // fdwCreate - &m_IDThread); // lpIDThread - - return newStack; -} - -//------------------------------------------------------------------------------ -void grt_stack_switch(Stack_Type To, Stack_Type From) -// Resume stack TO and save the current context to the stack pointed by -// CUR. -// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); -{ INFO("grt_stack_switch\n"); - INFO(" from 0x%08x to 0x%08x\n", From, To); - - // set 'To' event. this will make the other thread either - // - start for first time in grt_stack_loop - // - resume at WaitForSingleObject below - SetEvent(To->mutex); - - // block until 'From' event becomes set again - // as we are running, our event is reset and we block here - // when stacks are switched, with above SetEvent, we may proceed - WaitForSingleObject(From->mutex, INFINITE); -} - -//------------------------------------------------------------------------------ -void grt_stack_delete(Stack_Type Stack) -// Delete stack STACK, which must not be currently executed. -// => procedure Stack_Delete (Stack : Stack_Type); -{ INFO("grt_stack_delete\n"); +{ + main_stack_context.fiber = ConvertThreadToFiber (NULL); + if (main_stack_context.fiber == NULL) + { + fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n", + GetLastError ()); + abort (); + } + grt_set_main_stack (&main_stack_context); + current = &main_stack_context; +} + +static VOID __stdcall +grt_stack_loop (void *v_stack) +{ + struct stack_type *stack = (struct stack_type *)v_stack; + while (1) + { + (*stack->func)(stack->arg); + } +} + +struct stack_type * +grt_stack_create (void (*func)(void *), void *arg) +{ + struct stack_type *res; + + res = malloc (sizeof (struct stack_type)); + if (res == NULL) + return NULL; + res->func = func; + res->arg = arg; + res->fiber = CreateFiber (0, &grt_stack_loop, res); + if (res->fiber == NULL) + { + free (res); + return NULL; + } + return res; +} + +static int run_env_en; +static jmp_buf run_env; +static int need_longjmp; + +void +grt_stack_switch (struct stack_type *to, struct stack_type *from) +{ + assert (current == from); + current = to; + SwitchToFiber (to->fiber); + if (from == &main_stack_context && need_longjmp) + { + /* We returned to do the longjump. */ + current = &main_stack_context; + longjmp (run_env, need_longjmp); + } +} + +void +grt_stack_delete (struct stack_type *stack) +{ + DeleteFiber (stack->fiber); + stack->fiber = NULL; +} + +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (!run_env_en) + return; + + if (current != &main_stack_context) + { + /* We are allowed to jump only in the same stack. + First switch back to the main thread. */ + need_longjmp = val; + SwitchToFiber (main_stack_context.fiber); + } + else + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; } -//---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME void __gnat_raise_storage_error(void) { @@ -161,6 +142,3 @@ } #endif -//---------------------------------------------------------------------------- -// end of file - diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c --- ghdl-0.21/vhdl/grt/ghwlib.c 2005-12-07 06:29:04.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.c 2006-03-16 20:51:05.000000000 +0100 @@ -1214,16 +1214,31 @@ return 0; } +static const char * +ghw_get_lit (union ghw_type *type, int e) +{ + if (e >= type->en.nbr || e < 0) + return "??"; + else + return type->en.lits[e]; +} + +static void +ghw_disp_lit (union ghw_type *type, int e) +{ + printf ("%s (%d)", ghw_get_lit (type, e), e); +} + void ghw_disp_value (union ghw_val *val, union ghw_type *type) { switch (ghw_get_base_type (type)->kind) { case ghdl_rtik_type_b2: - printf ("%s (%d)", type->en.lits[val->b2], val->b2); + ghw_disp_lit (type, val->b2); break; case ghdl_rtik_type_e8: - printf ("%s (%d)", type->en.lits[val->e8], val->e8); + ghw_disp_lit (type, val->e8); break; case ghdl_rtik_type_i32: printf ("%d", val->i32); @@ -1582,10 +1597,14 @@ } void -ghw_disp_range (union ghw_range *rng) +ghw_disp_range (union ghw_type *type, union ghw_range *rng) { switch (rng->kind) { + case ghdl_rtik_type_e8: + printf ("%s %s %s", ghw_get_lit (type, rng->e8.left), + ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right)); + break; case ghdl_rtik_type_i32: case ghdl_rtik_type_p32: printf ("%d %s %d", @@ -1657,7 +1676,7 @@ printf ("subtype %s is ", s->name); ghw_disp_typename (h, s->base); printf (" range "); - ghw_disp_range (s->rng); + ghw_disp_range (s->base, s->rng); printf (";\n"); } break; @@ -1692,7 +1711,7 @@ { if (i != 0) printf (", "); - ghw_disp_range (a->rngs[i]); + ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]); } printf (");\n"); } diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h --- ghdl-0.21/vhdl/grt/ghwlib.h 2005-12-07 06:27:09.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.h 2006-03-16 20:51:05.000000000 +0100 @@ -390,7 +390,8 @@ const char *ghw_get_dir (int is_downto); -void ghw_disp_range (union ghw_range *rng); +/* Note: TYPE must be a base type (used only to display literals). */ +void ghw_disp_range (union ghw_type *type, union ghw_range *rng); void ghw_disp_type (struct ghw_handler *h, union ghw_type *t); diff -urN ghdl-0.21/vhdl/grt/grt-cbinding.c ghdl-0.22dev/vhdl/grt/grt-cbinding.c --- ghdl-0.21/vhdl/grt/grt-cbinding.c 2005-12-11 15:03:18.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-cbinding.c 2006-03-16 20:51:05.000000000 +0100 @@ -18,7 +18,6 @@ */ #include #include -#include FILE * __ghdl_get_stdout (void) @@ -44,29 +43,6 @@ fprintf (stream, "%g", val); } -static int run_env_en; -static jmp_buf run_env; - -void -__ghdl_maybe_return_via_longjump (int val) -{ - if (run_env_en) - longjmp (run_env, val); -} - -int -__ghdl_run_through_longjump (int (*func)(void)) -{ - int res; - - run_env_en = 1; - res = setjmp (run_env); - if (res == 0) - res = (*func)(); - run_env_en = 0; - return res; -} - #if 1 void __gnat_last_chance_handler (void) diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb --- ghdl-0.21/vhdl/grt/grt-signals.adb 2005-11-18 03:13:36.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-signals.adb 2006-03-16 20:51:05.000000000 +0100 @@ -1095,15 +1095,6 @@ when others => Internal_Error ("ghdl_create_signal_attribute"); end case; --- Sig_Instance_Name := new Ghdl_Instance_Name_Type' --- (Kind => Ghdl_Name_Signal, --- Name => null, --- Parent => null, --- Brother => null, --- Sig_Mode => Mode, --- Sig_Kind => Kind_Signal_No, --- Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last), --- Sig_Type_Desc => Sig_Type); -- Note: bit and boolean are both mode_b2. Res := Create_Signal (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True), diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb --- ghdl-0.21/vhdl/grt/grt-waves.adb 2005-12-07 05:50:07.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-waves.adb 2006-03-16 20:51:05.000000000 +0100 @@ -785,6 +785,15 @@ Nbr_Scope_Signals : Natural := 0; Nbr_Dumped_Signals : Natural := 0; + -- This is only valid during write_hierarchy. + function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural + is + function To_Integer_Address is new Ada.Unchecked_Conversion + (Ghdl_Signal_Ptr, Integer_Address); + begin + return Natural (To_Integer_Address (Sig.Alink)); + end Get_Signal_Number; + procedure Write_Signal_Number (Val_Addr : Address; Val_Name : Vstring; Val_Type : Ghdl_Rti_Access) @@ -792,20 +801,28 @@ pragma Unreferenced (Val_Name); pragma Unreferenced (Val_Type); - function To_Integer_Address is new Ada.Unchecked_Conversion - (Ghdl_Signal_Ptr, Integer_Address); + Num : Natural; + function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion (Source => Integer_Address, Target => Ghdl_Signal_Ptr); Sig : Ghdl_Signal_Ptr; begin + -- Convert to signal. Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all); - if not Sig.Flags.Is_Dumped then - Sig.Flags.Is_Dumped := True; + + -- Get signal number. + Num := Get_Signal_Number (Sig); + + -- If the signal number is 0, then assign a valid signal number. + if Num = 0 then Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1; - Sig.Flink := To_Ghdl_Signal_Ptr + Sig.Alink := To_Ghdl_Signal_Ptr (Integer_Address (Nbr_Dumped_Signals)); + Num := Nbr_Dumped_Signals; end if; - Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink))); + + -- Do the real job: write the signal number. + Wave_Put_ULEB128 (Ghdl_E32 (Num)); end Write_Signal_Number; procedure Foreach_Scalar_Signal_Number is new @@ -1370,13 +1387,18 @@ Table_Initial => 32, Table_Increment => 100); + function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is + begin + return Dump_Table.Table (N); + end Get_Dump_Entry; + procedure Write_Hierarchy (Root : VhpiHandleT) is N : Natural; begin - -- Check Flink is 0. + -- Check Alink is 0. for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flink /= null then + if Sig_Table.Table (I).Alink /= null then Internal_Error ("wave.write_hierarchy"); end if; end loop; @@ -1393,15 +1415,20 @@ Wave_Put_Byte (0); Dump_Table.Set_Last (Nbr_Dumped_Signals); + for I in Dump_Table.First .. Dump_Table.Last loop + Dump_Table.Table (I) := null; + end loop; -- Save and clear. - N := 0; for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flags.Is_Dumped then - N := N + 1; + N := Get_Signal_Number (Sig_Table.Table (I)); + if N /= 0 then + if Dump_Table.Table (N) /= null then + Internal_Error ("wave.write_hierarchy(2)"); + end if; Dump_Table.Table (N) := Sig_Table.Table (I); + Sig_Table.Table (I).Alink := null; end if; - Sig_Table.Table (I).Flink := null; end loop; end Write_Hierarchy; diff -urN ghdl-0.21/vhdl/ortho-lang.c ghdl-0.22dev/vhdl/ortho-lang.c --- ghdl-0.21/vhdl/ortho-lang.c 2005-12-10 12:04:40.000000000 +0100 +++ ghdl-0.22dev/vhdl/ortho-lang.c 2006-03-16 20:51:08.000000000 +0100 @@ -18,6 +18,8 @@ #include "tree-gimple.h" #include "function.h" #include "cgraph.h" +#include "target.h" +#include "convert.h" const int tree_identifier_size = sizeof (struct tree_identifier); @@ -494,6 +496,89 @@ } } +/* The following function has been copied and modified from c-convert.c. */ + +/* Change of width--truncation and extension of integers or reals-- + is represented with NOP_EXPR. Proper functioning of many things + assumes that no other conversions can be NOP_EXPRs. + + Conversion between integer and pointer is represented with CONVERT_EXPR. + Converting integer to real uses FLOAT_EXPR + and real to integer uses FIX_TRUNC_EXPR. + + Here is a list of all the functions that assume that widening and + narrowing is always done with a NOP_EXPR: + In convert.c, convert_to_integer. + In c-typeck.c, build_binary_op (boolean ops), and + c_common_truthvalue_conversion. + In expr.c: expand_expr, for operands of a MULT_EXPR. + In fold-const.c: fold. + In tree.c: get_narrower and get_unwidened. */ + +/* Subroutines of `convert'. */ + + + +/* Create an expression whose value is that of EXPR, + converted to type TYPE. The TREE_TYPE of the value + is always TYPE. This function implements all reasonable + conversions; callers should filter out those that are + not permitted by the language being compiled. */ + +tree +convert (tree type, tree expr) +{ + tree e = expr; + enum tree_code code = TREE_CODE (type); + const char *invalid_conv_diag; + + if (type == error_mark_node + || expr == error_mark_node + || TREE_TYPE (expr) == error_mark_node) + return error_mark_node; + + if ((invalid_conv_diag + = targetm.invalid_conversion (TREE_TYPE (expr), type))) + { + error (invalid_conv_diag); + return error_mark_node; + } + + if (type == TREE_TYPE (expr)) + return expr; + + if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (TREE_TYPE (expr))) + return fold_build1 (NOP_EXPR, type, expr); + if (TREE_CODE (TREE_TYPE (expr)) == ERROR_MARK) + return error_mark_node; + if (TREE_CODE (TREE_TYPE (expr)) == VOID_TYPE || code == VOID_TYPE) + { + abort (); + return error_mark_node; + } + if (code == INTEGER_TYPE || code == ENUMERAL_TYPE) + return fold (convert_to_integer (type, e)); + if (code == BOOLEAN_TYPE) + { + tree t = ortho_truthvalue_conversion (expr); + if (TREE_CODE (t) == ERROR_MARK) + return t; + + /* If it returns a NOP_EXPR, we must fold it here to avoid + infinite recursion between fold () and convert (). */ + if (TREE_CODE (t) == NOP_EXPR) + return fold_build1 (NOP_EXPR, type, TREE_OPERAND (t, 0)); + else + return fold_build1 (NOP_EXPR, type, t); + } + if (code == POINTER_TYPE || code == REFERENCE_TYPE) + return fold (convert_to_pointer (type, e)); + if (code == REAL_TYPE) + return fold (convert_to_real (type, e)); + + abort (); +} + /* Return a definition for a builtin function named NAME and whose data type is TYPE. TYPE should be a function type with argument types. FUNCTION_CODE tells later passes how to compile calls to this function. @@ -603,8 +688,6 @@ #define LANG_HOOKS_POST_OPTIONS ortho_post_options #undef LANG_HOOKS_HONOR_READONLY #define LANG_HOOKS_HONOR_READONLY true -#undef LANG_HOOKS_TRUTHVALUE_CONVERSION -#define LANG_HOOKS_TRUTHVALUE_CONVERSION ortho_truthvalue_conversion #undef LANG_HOOKS_MARK_ADDRESSABLE #define LANG_HOOKS_MARK_ADDRESSABLE ortho_mark_addressable #undef LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION @@ -1234,7 +1317,7 @@ void finish_record_aggr (struct o_record_aggr_list *list, tree *res) { - *res = build_constructor (list->atype, list->chain.first); + *res = build_constructor_from_list (list->atype, list->chain.first); } @@ -1260,18 +1343,16 @@ void finish_array_aggr (struct o_array_aggr_list *list, tree *res) { - *res = build_constructor (list->atype, list->chain.first); + *res = build_constructor_from_list (list->atype, list->chain.first); } tree new_union_aggr (tree atype, tree field, tree value) { - tree el; tree res; - el = build_tree_list (field, value); - res = build_constructor (atype, el); + res = build_constructor_single (atype, field, value); TREE_CONSTANT (res) = 1; return res; } diff -urN ghdl-0.21/vhdl/parse.adb ghdl-0.22dev/vhdl/parse.adb --- ghdl-0.21/vhdl/parse.adb 2005-12-17 07:18:00.000000000 +0100 +++ ghdl-0.22dev/vhdl/parse.adb 2006-03-16 20:51:10.000000000 +0100 @@ -3540,7 +3540,7 @@ Set_Location (Res); Set_Expression (Res, Parse_Expression); - Expect (Tok_Select, "after expression"); + Expect (Tok_Select, "'select' expected after expression"); Scan.Scan; if Current_Token = Tok_Left_Paren then Target := Parse_Aggregate; @@ -3556,13 +3556,13 @@ Build_Init (Last); loop Wf_Chain := Parse_Waveform; - Expect (Tok_When, "after waveform"); + Expect (Tok_When, "'when' expected after waveform"); Scan.Scan; Assoc := Parse_Choices (Null_Iir); Set_Associated (Assoc, Wf_Chain); Append_Subchain (Last, Res, Assoc); exit when Current_Token = Tok_Semi_Colon; - Expect (Tok_Comma, "after choice"); + Expect (Tok_Comma, "',' (comma) expected after choice"); Scan.Scan; end loop; return Res; diff -urN ghdl-0.21/vhdl/sem_assocs.adb ghdl-0.22dev/vhdl/sem_assocs.adb --- ghdl-0.21/vhdl/sem_assocs.adb 2005-10-08 14:45:00.000000000 +0200 +++ ghdl-0.22dev/vhdl/sem_assocs.adb 2006-03-16 20:51:10.000000000 +0100 @@ -551,7 +551,7 @@ exit when Index_Type = Null_Iir; Chain := Get_Individual_Association_Chain (Assoc); Sem_Choices_Range - (Chain, Index_Type, True, Get_Location (Assoc), Low, High); + (Chain, Index_Type, False, Get_Location (Assoc), Low, High); Set_Individual_Association_Chain (Assoc, Chain); end loop; end Finish_Individual_Assoc_Array_Subtype; diff -urN ghdl-0.21/vhdl/sem_expr.adb ghdl-0.22dev/vhdl/sem_expr.adb --- ghdl-0.21/vhdl/sem_expr.adb 2005-12-17 07:13:37.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_expr.adb 2006-03-16 20:51:10.000000000 +0100 @@ -2278,6 +2278,7 @@ Lb := Low; Hb := High; end if; + -- Checks all values between POS and POS_MAX are handled. Pos := Eval_Pos (Lb); Pos_Max := Eval_Pos (Hb); if Pos > Pos_Max then diff -urN ghdl-0.21/vhdl/sem_names.adb ghdl-0.22dev/vhdl/sem_names.adb --- ghdl-0.21/vhdl/sem_names.adb 2005-12-11 14:50:31.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_names.adb 2006-03-16 20:51:10.000000000 +0100 @@ -1974,7 +1974,8 @@ Error_Msg_Sem ("function name is a procedure", Name); when Iir_Kind_Process_Statement - | Iir_Kind_Component_Declaration => + | Iir_Kind_Component_Declaration + | Iir_Kind_Type_Conversion => Error_Msg_Sem (Disp_Node (Prefix) & " cannot be indexed or sliced", Name); Res := Null_Iir; diff -urN ghdl-0.21/vhdl/translation.adb ghdl-0.22dev/vhdl/translation.adb --- ghdl-0.21/vhdl/translation.adb 2005-12-10 12:11:41.000000000 +0100 +++ ghdl-0.22dev/vhdl/translation.adb 2006-03-16 20:51:05.000000000 +0100 @@ -1,5 +1,5 @@ -- Iir to ortho translator. --- Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold +-- Copyright (C) 2002, 2003, 2004, 2005, 2006 Tristan Gingold -- -- GHDL 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 @@ -1797,15 +1797,13 @@ -- Check bounds length of L match bounds length of R. -- If L_TYPE (resp. R_TYPE) is not a thin array, then L_NODE - -- (resp. R_NODE) are not used (and may be o_lnode_null). + -- (resp. R_NODE) are not used (and may be Mnode_Null). -- If L_TYPE (resp. T_TYPE) is a fat array, then L_NODE (resp. R_NODE) - -- must be a variable pointing to the array. + -- must designate the array. procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir); -- Create a subtype range to be stored into the location pointed by @@ -8412,10 +8410,19 @@ return True; end Need_Range_Check; - procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) + procedure Check_Range_Low (Value : O_Dnode; Atype : Iir) is If_Blk : O_If_Block; begin + Open_Temp; + Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); + Chap6.Gen_Bound_Error (Null_Iir); + Finish_If_Stmt (If_Blk); + Close_Temp; + end Check_Range_Low; + + procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) is + begin if not Need_Range_Check (Expr, Atype) then return; end if; @@ -8428,20 +8435,14 @@ Chap6.Gen_Bound_Error (Expr); end if; else - Open_Temp; - Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); - Chap6.Gen_Bound_Error (Null_Iir); - Finish_If_Stmt (If_Blk); - Close_Temp; + Check_Range_Low (Value, Atype); end if; end Check_Range; procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir) is L_Tinfo, R_Tinfo : Type_Info_Acc; @@ -8491,10 +8492,10 @@ exit when Index = Null_Iir; Sub_Cond := New_Compare_Op (ON_Neq, - Chap6.Get_Array_Ptr_Bound_Length (L_Node, L_Type, - I + 1, L_Mode), - Chap6.Get_Array_Ptr_Bound_Length (R_Node, R_Type, - I + 1, R_Mode), + M2E (Range_To_Length + (Get_Array_Range (L_Node, L_Type, I + 1))), + M2E (Range_To_Length + (Get_Array_Range (R_Node, R_Type, I + 1))), Ghdl_Bool_Type); if I = 0 then Cond := Sub_Cond; @@ -10081,8 +10082,8 @@ New_Assign_Stmt (Get_Var (Alias_Info.Alias_Var), New_Value (M2Lp (Chap3.Get_Array_Base (Name_Node)))); - Chap3.Check_Array_Match (Decl_Type, O_Lnode_Null, Kind, - Name_Type, M2Lp (Name_Node), Kind, + Chap3.Check_Array_Match (Decl_Type, T2M (Decl_Type, Kind), + Name_Type, Name_Node, Decl); Close_Temp; when Type_Mode_Scalar => @@ -11691,6 +11692,16 @@ end; end if; + if Get_Kind (Formal_Type) in Iir_Kinds_Array_Type_Definition + then + -- Check length matches. + Stabilize (Formal_Node); + Stabilize (Actual_Node); + Chap3.Check_Array_Match (Formal_Type, Formal_Node, + Actual_Type, Actual_Node, + Assoc); + end if; + Data := (Actual_Node => Actual_Node, Actual_Type => Actual_Type, Mode => Mode, @@ -14420,8 +14431,8 @@ E := Create_Temp_Init (T_Info.Ortho_Ptr_Type (Mode_Value), Val); Chap3.Check_Array_Match - (Target_Type, M2Lp (T), Mode_Value, - Get_Type (Expr), New_Obj (E), Mode_Value, + (Target_Type, T, + Get_Type (Expr), Dp2M (E, T_Info, Mode_Value), Null_Iir); Chap3.Translate_Object_Copy (T, New_Obj_Value (E), Target_Type); @@ -15169,9 +15180,10 @@ begin E := Create_Temp_Init (Expr_Info.Ortho_Ptr_Type (Mode_Value), Expr); - Chap3.Check_Array_Match (Res_Type, O_Lnode_Null, Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, T2M (Res_Type, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); return New_Convert_Ov (New_Value (Chap3.Get_Array_Ptr_Base_Ptr (New_Obj (E), Expr_Type, Mode_Value)), @@ -15199,9 +15211,10 @@ Chap3.Get_Array_Bounds_Ptr (O_Lnode_Null, Expr_Type, Mode_Value)); -- Check array match. - Chap3.Check_Array_Match (Res_Type, New_Obj (Res), Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, Dv2M (Res, Res_Info, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); Close_Temp; return New_Address (New_Obj (Res), Res_Info.Ortho_Ptr_Type (Mode_Value)); @@ -22283,19 +22296,58 @@ function Translate_Val_Attribute (Attr : Iir) return O_Enode is - T : O_Dnode; - Prefix : Iir; - Ttype : O_Tnode; + Val : O_Enode; + Attr_Type : Iir; + Res_Var : O_Dnode; + Res_Type : O_Tnode; begin - Prefix := Get_Type (Attr); - Ttype := Get_Ortho_Type (Prefix, Mode_Value); - T := Create_Temp (Ttype); - New_Assign_Stmt - (New_Obj (T), - New_Convert_Ov (Chap7.Translate_Expression (Get_Parameter (Attr)), - Ttype)); - Chap3.Check_Range (T, Attr, Get_Type (Get_Prefix (Attr))); - return New_Obj_Value (T); + Attr_Type := Get_Type (Attr); + Res_Type := Get_Ortho_Type (Attr_Type, Mode_Value); + Res_Var := Create_Temp (Res_Type); + Val := Chap7.Translate_Expression (Get_Parameter (Attr)); + + case Get_Kind (Attr_Type) is + when Iir_Kind_Enumeration_Type_Definition + | Iir_Kind_Enumeration_Subtype_Definition => + -- For enumeration, always check the value is in the enum + -- range. + declare + Val_Type : O_Tnode; + Val_Var : O_Dnode; + If_Blk : O_If_Block; + begin + Val_Type := Get_Ortho_Type (Get_Type (Get_Parameter (Attr)), + Mode_Value); + Val_Var := Create_Temp_Init (Val_Type, Val); + Start_If_Stmt + (If_Blk, + New_Dyadic_Op + (ON_Or, + New_Compare_Op (ON_Lt, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, 0)), + Ghdl_Bool_Type), + New_Compare_Op (ON_Ge, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, + Integer_64 + (Get_Nbr_Elements + (Get_Enumeration_Literal_List + (Attr_Type))))), + Ghdl_Bool_Type))); + Chap6.Gen_Bound_Error (Attr); + Finish_If_Stmt (If_Blk); + Val := New_Obj_Value (Val_Var); + end; + when others => + null; + end case; + + New_Assign_Stmt (New_Obj (Res_Var), New_Convert_Ov (Val, Res_Type)); + Chap3.Check_Range (Res_Var, Attr, Get_Type (Get_Prefix (Attr))); + return New_Obj_Value (Res_Var); end Translate_Val_Attribute; function Translate_Pos_Attribute (Attr : Iir; Res_Type : Iir) diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads --- ghdl-0.21/vhdl/version.ads 2005-12-18 14:07:38.000000000 +0100 +++ ghdl-0.22dev/vhdl/version.ads 2006-03-16 20:51:10.000000000 +0100 @@ -1,4 +1,4 @@ package Version is Ghdl_Version : constant String := - "GHDL 0.21 (20051218) [Sokcho edition]"; + "GHDL 0.22dev (20051220) [Sokcho edition]"; end Version; Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- ghdl.spec 6 Mar 2006 14:50:41 -0000 1.10 +++ ghdl.spec 16 Mar 2006 22:33:48 -0000 1.11 @@ -1,10 +1,10 @@ -%define gccver 4.0.2 +%define gccver 4.1.0 %define ghdlver 0.21 Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.40svn.0%{?dist} +Release: 0.49svn.0%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -14,7 +14,7 @@ # ./dist.sh sources Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2 -Patch0: ghdl-svn40.patch +Patch0: ghdl-svn49.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo Requires(post): /sbin/install-info @@ -215,6 +215,9 @@ %{_libexecdir}/gcc/ %changelog +* Thu Mar 16 2006 Thomas Sailer - 0.22-0.49svn.0 +- update to svn49, using gcc 4.1.0 + * Mon Mar 6 2006 Thomas Sailer - 0.22-0.40svn.0 - update to svn40, to fix an array bounds checking bug apparently introduced in svn39 From fedora-extras-commits at redhat.com Thu Mar 16 22:51:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 16 Mar 2006 17:51:29 -0500 Subject: rpms/scons/devel .cvsignore, 1.2, 1.3 scons.spec, 1.6, 1.7 sources, 1.2, 1.3 Message-ID: <200603162252.k2GMq1ns009397@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/scons/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9370/devel Modified Files: .cvsignore scons.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scons/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:19:08 -0000 1.2 +++ .cvsignore 16 Mar 2006 22:51:29 -0000 1.3 @@ -1 +1 @@ -scons-0.96.tar.gz +scons-0.96.1.tar.gz Index: scons.spec =================================================================== RCS file: /cvs/extras/rpms/scons/devel/scons.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scons.spec 17 Feb 2006 21:39:32 -0000 1.6 +++ scons.spec 16 Mar 2006 22:51:29 -0000 1.7 @@ -1,6 +1,6 @@ Name: scons -Version: 0.96 -Release: 6%{?dist} +Version: 0.96.1 +Release: 1%{?dist} Summary: An Open Source software construction tool @@ -52,8 +52,8 @@ %{_mandir}/man*/* %changelog -* Fri Feb 17 2006 Gerard Milmeister - 0.96-6 -- Rebuild for Fedora Extras 5 +* Sat Jun 18 2005 Gerard Milmeister - 0.96.1-1 +- New Version 0.96.1 * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/scons/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:19:08 -0000 1.2 +++ sources 16 Mar 2006 22:51:29 -0000 1.3 @@ -1 +1 @@ -0c08161c77a4338fca58840bd87151f6 scons-0.96.tar.gz +45b1c346edd8a0970210aeb1e82557c9 scons-0.96.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 00:31:04 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 16 Mar 2006 19:31:04 -0500 Subject: rpms/qemu/FC-4 .cvsignore, 1.3, 1.4 qemu.spec, 1.6, 1.7 sources, 1.3, 1.4 qemu-0.7.0-gcc4-ppc.patch, 1.1, NONE qemu-0.7.0-gcc4-x86.patch, 1.1, NONE Message-ID: <200603170031.k2H0VjCh013635@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13614 Modified Files: .cvsignore qemu.spec sources Removed Files: qemu-0.7.0-gcc4-ppc.patch qemu-0.7.0-gcc4-x86.patch Log Message: Update to 0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Apr 2005 11:34:52 -0000 1.3 +++ .cvsignore 17 Mar 2006 00:31:03 -0000 1.4 @@ -1 +1 @@ -qemu-0.7.0.tar.gz +qemu-0.8.0.tar.gz Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qemu.spec 16 May 2005 09:39:10 -0000 1.6 +++ qemu.spec 17 Mar 2006 00:31:03 -0000 1.7 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.7.0 -Release: 2 +Version: 0.8.0 +Release: 1.%{?dist} License: GPL/LGPL Group: Development/Tools @@ -9,10 +9,8 @@ Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch -Patch1: qemu-0.7.0-gcc4-x86.patch -Patch2: qemu-0.7.0-gcc4-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: SDL-devel +BuildRequires: SDL-devel compat-gcc-32 PreReq: /sbin/chkconfig PreReq: /sbin/service ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64 @@ -36,11 +34,9 @@ %prep %setup -q %patch0 -p1 -%patch1 -p0 -%patch2 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M +./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa make %install @@ -78,11 +74,16 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog -* Mon May 16 2005 David Woodhouse .0.7.0-2 +* Fri Mar 17 2006 David Woodhouse 0.8.0-1 +- Update to 0.8.0 +- Resort to using compat-gcc-32 +- Enable ALSA + +* Mon May 16 2005 David Woodhouse 0.7.0-2 - Proper fix for GCC 4 putting 'blr' or 'ret' in the middle of the function, for i386, x86_64 and PPC. -* Sat Apr 30 2005 David Woodhouse .0.7.0-1 +* Sat Apr 30 2005 David Woodhouse 0.7.0-1 - Update to 0.7.0 - Fix dyngen for PPC functions which end in unconditional branch Index: sources =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Apr 2005 11:34:52 -0000 1.3 +++ sources 17 Mar 2006 00:31:03 -0000 1.4 @@ -1 +1 @@ -234e9ace03b00259bb57dc5a9c633056 qemu-0.7.0.tar.gz +eb175b26583280706fe7e4d8910d320d qemu-0.8.0.tar.gz --- qemu-0.7.0-gcc4-ppc.patch DELETED --- --- qemu-0.7.0-gcc4-x86.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 00:32:17 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 16 Mar 2006 19:32:17 -0500 Subject: rpms/qemu/FC-4 qemu.spec,1.7,1.8 Message-ID: <200603170032.k2H0Wn5g013678@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13664 Modified Files: qemu.spec Log Message: no dot before dist Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qemu.spec 17 Mar 2006 00:31:03 -0000 1.7 +++ qemu.spec 17 Mar 2006 00:32:16 -0000 1.8 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 1.%{?dist} +Release: 1%{?dist} License: GPL/LGPL Group: Development/Tools From fedora-extras-commits at redhat.com Fri Mar 17 00:34:39 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 16 Mar 2006 19:34:39 -0500 Subject: rpms/qemu/devel .cvsignore, 1.3, 1.4 qemu.spec, 1.6, 1.7 sources, 1.3, 1.4 qemu-0.7.0-gcc4-ppc.patch, 1.1, NONE qemu-0.7.0-gcc4-x86.patch, 1.1, NONE Message-ID: <200603170035.k2H0ZB5Q013748@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13723 Modified Files: .cvsignore qemu.spec sources Removed Files: qemu-0.7.0-gcc4-ppc.patch qemu-0.7.0-gcc4-x86.patch Log Message: Update to 0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Apr 2005 11:34:52 -0000 1.3 +++ .cvsignore 17 Mar 2006 00:34:39 -0000 1.4 @@ -1 +1 @@ -qemu-0.7.0.tar.gz +qemu-0.8.0.tar.gz Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qemu.spec 16 May 2005 09:39:10 -0000 1.6 +++ qemu.spec 17 Mar 2006 00:34:39 -0000 1.7 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.7.0 -Release: 2 +Version: 0.8.0 +Release: 1%{?dist} License: GPL/LGPL Group: Development/Tools @@ -9,10 +9,8 @@ Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch -Patch1: qemu-0.7.0-gcc4-x86.patch -Patch2: qemu-0.7.0-gcc4-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: SDL-devel +BuildRequires: SDL-devel compat-gcc-32 PreReq: /sbin/chkconfig PreReq: /sbin/service ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64 @@ -36,11 +34,9 @@ %prep %setup -q %patch0 -p1 -%patch1 -p0 -%patch2 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M +./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa make %install @@ -78,11 +74,16 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog -* Mon May 16 2005 David Woodhouse .0.7.0-2 +* Fri Mar 17 2006 David Woodhouse 0.8.0-1 +- Update to 0.8.0 +- Resort to using compat-gcc-32 +- Enable ALSA + +* Mon May 16 2005 David Woodhouse 0.7.0-2 - Proper fix for GCC 4 putting 'blr' or 'ret' in the middle of the function, for i386, x86_64 and PPC. -* Sat Apr 30 2005 David Woodhouse .0.7.0-1 +* Sat Apr 30 2005 David Woodhouse 0.7.0-1 - Update to 0.7.0 - Fix dyngen for PPC functions which end in unconditional branch Index: sources =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Apr 2005 11:34:52 -0000 1.3 +++ sources 17 Mar 2006 00:34:39 -0000 1.4 @@ -1 +1 @@ -234e9ace03b00259bb57dc5a9c633056 qemu-0.7.0.tar.gz +eb175b26583280706fe7e4d8910d320d qemu-0.8.0.tar.gz --- qemu-0.7.0-gcc4-ppc.patch DELETED --- --- qemu-0.7.0-gcc4-x86.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 00:35:33 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 16 Mar 2006 19:35:33 -0500 Subject: rpms/qemu/FC-5 .cvsignore, 1.3, 1.4 qemu.spec, 1.6, 1.7 sources, 1.3, 1.4 qemu-0.7.0-gcc4-ppc.patch, 1.1, NONE qemu-0.7.0-gcc4-x86.patch, 1.1, NONE Message-ID: <200603170036.k2H0a54G013831@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13751 Modified Files: .cvsignore qemu.spec sources Removed Files: qemu-0.7.0-gcc4-ppc.patch qemu-0.7.0-gcc4-x86.patch Log Message: Update to 0.8.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 30 Apr 2005 11:34:52 -0000 1.3 +++ .cvsignore 17 Mar 2006 00:35:32 -0000 1.4 @@ -1 +1 @@ -qemu-0.7.0.tar.gz +qemu-0.8.0.tar.gz Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qemu.spec 16 May 2005 09:39:10 -0000 1.6 +++ qemu.spec 17 Mar 2006 00:35:32 -0000 1.7 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu -Version: 0.7.0 -Release: 2 +Version: 0.8.0 +Release: 1%{?dist} License: GPL/LGPL Group: Development/Tools @@ -9,10 +9,8 @@ Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch -Patch1: qemu-0.7.0-gcc4-x86.patch -Patch2: qemu-0.7.0-gcc4-ppc.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: SDL-devel +BuildRequires: SDL-devel compat-gcc-32 PreReq: /sbin/chkconfig PreReq: /sbin/service ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64 @@ -36,11 +34,9 @@ %prep %setup -q %patch0 -p1 -%patch1 -p0 -%patch2 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M +./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa make %install @@ -78,11 +74,16 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog -* Mon May 16 2005 David Woodhouse .0.7.0-2 +* Fri Mar 17 2006 David Woodhouse 0.8.0-1 +- Update to 0.8.0 +- Resort to using compat-gcc-32 +- Enable ALSA + +* Mon May 16 2005 David Woodhouse 0.7.0-2 - Proper fix for GCC 4 putting 'blr' or 'ret' in the middle of the function, for i386, x86_64 and PPC. -* Sat Apr 30 2005 David Woodhouse .0.7.0-1 +* Sat Apr 30 2005 David Woodhouse 0.7.0-1 - Update to 0.7.0 - Fix dyngen for PPC functions which end in unconditional branch Index: sources =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 30 Apr 2005 11:34:52 -0000 1.3 +++ sources 17 Mar 2006 00:35:32 -0000 1.4 @@ -1 +1 @@ -234e9ace03b00259bb57dc5a9c633056 qemu-0.7.0.tar.gz +eb175b26583280706fe7e4d8910d320d qemu-0.8.0.tar.gz --- qemu-0.7.0-gcc4-ppc.patch DELETED --- --- qemu-0.7.0-gcc4-x86.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 00:37:51 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 16 Mar 2006 19:37:51 -0500 Subject: rpms/python-myghty/devel .cvsignore, 1.5, 1.6 python-myghty.spec, 1.5, 1.6 sources, 1.5, 1.6 Message-ID: <200603170038.k2H0cdcf013923@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/python-myghty/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13885 Modified Files: .cvsignore python-myghty.spec sources Log Message: - 1.0.1; build requires python-setuptools Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-myghty/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 26 Jan 2006 07:17:19 -0000 1.5 +++ .cvsignore 17 Mar 2006 00:37:51 -0000 1.6 @@ -1 +1 @@ -Myghty-1.0.tar.gz +Myghty-1.0.1.tar.gz Index: python-myghty.spec =================================================================== RCS file: /cvs/extras/rpms/python-myghty/devel/python-myghty.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-myghty.spec 26 Jan 2006 07:17:19 -0000 1.5 +++ python-myghty.spec 17 Mar 2006 00:37:51 -0000 1.6 @@ -1,7 +1,7 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: python-myghty -Version: 1.0 +Version: 1.0.1 Release: 1%{?dist} Summary: A Python-based templating system derived from HTML::Mason @@ -12,7 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python +BuildRequires: python-setuptools %description Myghty is a Python based web and templating framework originally based on @@ -48,6 +48,9 @@ %changelog +* Thu Mar 16 2006 Luke Macken 1.0.1-1 +- 1.0.1; build requires python-setuptools + * Wed Jan 04 2006 Luke Macken 1.0-1 - 1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-myghty/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 26 Jan 2006 07:17:19 -0000 1.5 +++ sources 17 Mar 2006 00:37:51 -0000 1.6 @@ -1 +1 @@ -4329dea233683c2e073036ea48f23fd8 Myghty-1.0.tar.gz +82b2a05f421b2b81cae716ccde74dce1 Myghty-1.0.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 00:38:16 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 16 Mar 2006 19:38:16 -0500 Subject: rpms/qemu/FC-5 qemu.spec,1.7,1.8 Message-ID: <200603170038.k2H0cmH5013926@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13904 Modified Files: qemu.spec Log Message: bump release Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qemu.spec 17 Mar 2006 00:35:32 -0000 1.7 +++ qemu.spec 17 Mar 2006 00:38:15 -0000 1.8 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 1%{?dist} +Release: 1.1%{?dist} License: GPL/LGPL Group: Development/Tools @@ -74,6 +74,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Fri Mar 17 2006 David Woodhouse 0.8.0-1.1 +- Bump release to work around accidental .fc5 tag in -devel branch + * Fri Mar 17 2006 David Woodhouse 0.8.0-1 - Update to 0.8.0 - Resort to using compat-gcc-32 From fedora-extras-commits at redhat.com Fri Mar 17 01:01:43 2006 From: fedora-extras-commits at redhat.com (Luke Macken (lmacken)) Date: Thu, 16 Mar 2006 20:01:43 -0500 Subject: rpms/naim/devel .cvsignore, 1.5, 1.6 naim.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603170102.k2H12FrG016051@cvs-int.fedora.redhat.com> Author: lmacken Update of /cvs/extras/rpms/naim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16016 Modified Files: .cvsignore naim.spec sources Log Message: naim-0.11.8.2-2006-02-28-2047 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/naim/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Feb 2006 22:22:42 -0000 1.5 +++ .cvsignore 17 Mar 2006 01:01:43 -0000 1.6 @@ -1 +1 @@ -naim-0.11.8.2-2006-01-29-1935.tar.bz2 +naim-0.11.8.2-2006-02-28-2047.tar.bz2 Index: naim.spec =================================================================== RCS file: /cvs/extras/rpms/naim/devel/naim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- naim.spec 19 Feb 2006 02:11:32 -0000 1.8 +++ naim.spec 17 Mar 2006 01:01:43 -0000 1.9 @@ -1,4 +1,4 @@ -%define snapshot 2006-01-29-1935 +%define snapshot 2006-02-28-2047 Name: naim Version: 0.11.8.2 @@ -40,6 +40,9 @@ %{_mandir}/*/* %changelog +* Thu Mar 16 2006 Luke Macken 0.11.8.2-3 +- 2006-02-28-2047 development snapshot + * Sat Feb 18 2006 Luke Macken 0.11.8.2-2 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/naim/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Feb 2006 22:22:42 -0000 1.5 +++ sources 17 Mar 2006 01:01:43 -0000 1.6 @@ -1 +1 @@ -e03200205b6ffaff8baa790b0b22a7bc naim-0.11.8.2-2006-01-29-1935.tar.bz2 +6e4f551a4bc784b889a0368e0aa2a0a3 naim-0.11.8.2-2006-02-28-2047.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 17 01:16:59 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 16 Mar 2006 20:16:59 -0500 Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.20,1.21 Message-ID: <200603170117.k2H1HV8F016251@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/xchat-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16209 Modified Files: xchat-gnome.spec Log Message: * Thu Mar 16 2006 Brian Pepple - 0.10-4 - Rebuild for new libsexy. Index: xchat-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xchat-gnome.spec 25 Feb 2006 17:42:09 -0000 1.20 +++ xchat-gnome.spec 17 Mar 2006 01:16:59 -0000 1.21 @@ -3,7 +3,7 @@ Name: xchat-gnome Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -137,6 +137,9 @@ %changelog +* Thu Mar 16 2006 Brian Pepple - 0.10-4 +- Rebuild for new libsexy. + * Sat Feb 25 2006 Brian Pepple - 0.10-3 - Add libnotify patch to work with 0.3.0 api. From fedora-extras-commits at redhat.com Fri Mar 17 01:19:16 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Thu, 16 Mar 2006 20:19:16 -0500 Subject: rpms/xchat-gnome/FC-5 xchat-gnome.spec,1.20,1.21 Message-ID: <200603170119.k2H1JmIQ016346@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/xchat-gnome/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16329 Modified Files: xchat-gnome.spec Log Message: * Thu Mar 16 2006 Brian Pepple - 0.10-4 - Rebuild for new libsexy. Index: xchat-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/xchat-gnome/FC-5/xchat-gnome.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xchat-gnome.spec 25 Feb 2006 17:42:09 -0000 1.20 +++ xchat-gnome.spec 17 Mar 2006 01:19:16 -0000 1.21 @@ -3,7 +3,7 @@ Name: xchat-gnome Version: 0.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -137,6 +137,9 @@ %changelog +* Thu Mar 16 2006 Brian Pepple - 0.10-4 +- Rebuild for new libsexy. + * Sat Feb 25 2006 Brian Pepple - 0.10-3 - Add libnotify patch to work with 0.3.0 api. From fedora-extras-commits at redhat.com Fri Mar 17 06:48:05 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 17 Mar 2006 01:48:05 -0500 Subject: rpms/mercurial/FC-5 mercurial.spec,1.7,1.8 Message-ID: <200603170648.k2H6mbB1027176@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27157 Modified Files: mercurial.spec Log Message: rebuild to test the buildsys Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/FC-5/mercurial.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mercurial.spec 17 Feb 2006 20:05:53 -0000 1.7 +++ mercurial.spec 17 Mar 2006 06:48:05 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -34,6 +34,9 @@ %changelog +* Fri Mar 17 2006 Jeremy Katz - 0.8-3 +- rebuild + * Fri Feb 17 2006 Jeremy Katz - 0.8-2 - rebuild From fedora-extras-commits at redhat.com Fri Mar 17 07:02:33 2006 From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj)) Date: Fri, 17 Mar 2006 02:02:33 -0500 Subject: rpms/mercurial/devel mercurial.spec,1.7,1.8 Message-ID: <200603170703.k2H736GH029204@cvs-int.fedora.redhat.com> Author: katzj Update of /cvs/extras/rpms/mercurial/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29187 Modified Files: mercurial.spec Log Message: rebuild to test the buildsys Index: mercurial.spec =================================================================== RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mercurial.spec 17 Feb 2006 20:05:53 -0000 1.7 +++ mercurial.spec 17 Mar 2006 07:02:33 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A fast, lightweight distributed source control management system Name: mercurial Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Development/Tools URL: http://www.selenic.com/mercurial/ @@ -34,6 +34,9 @@ %changelog +* Fri Mar 17 2006 Jeremy Katz - 0.8-3 +- rebuild + * Fri Feb 17 2006 Jeremy Katz - 0.8-2 - rebuild From fedora-extras-commits at redhat.com Fri Mar 17 07:28:47 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 02:28:47 -0500 Subject: rpms/lirc-kmod/devel lirc-kmod.spec,1.5,1.6 Message-ID: <200603170729.k2H7TJHX029385@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29366 Modified Files: lirc-kmod.spec Log Message: * Fri Mar 17 2006 Ville Skytt?? - 0.8.0-5 - Drop the ppc64* experiment. Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lirc-kmod.spec 15 Mar 2006 19:55:56 -0000 1.5 +++ lirc-kmod.spec 17 Mar 2006 07:28:47 -0000 1.6 @@ -27,7 +27,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 4.%(echo %{kverrel} | tr - _) +Release: 5.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -39,7 +39,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # ExclusiveArch to assist the FE build system. -ExclusiveArch: i586 i686 x86_64 ppc ppc64 ppc64iseries +ExclusiveArch: i586 i686 x86_64 ppc %description LIRC is a package that allows you to decode and send infra-red and @@ -116,6 +116,9 @@ %changelog +* Fri Mar 17 2006 Ville Skytt?? - 0.8.0-5 +- Drop the ppc64* experiment. + * Wed Mar 15 2006 Ville Skytt?? - 0.8.0-4 - Add ppc64 and ppc64iseries while waiting for #185387. From fedora-extras-commits at redhat.com Fri Mar 17 07:33:45 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 02:33:45 -0500 Subject: rpms/lirc-kmod/FC-5 lirc-kmod.spec,1.5,1.6 Message-ID: <200603170734.k2H7YHqH029463@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29446 Modified Files: lirc-kmod.spec Log Message: * Fri Mar 17 2006 Ville Skytt?? - 0.8.0-5 - Drop the ppc64* experiment. Index: lirc-kmod.spec =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/lirc-kmod.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lirc-kmod.spec 15 Mar 2006 19:55:56 -0000 1.5 +++ lirc-kmod.spec 17 Mar 2006 07:33:45 -0000 1.6 @@ -27,7 +27,7 @@ Name: %{kmod_name}-kmod Version: 0.8.0 -Release: 4.%(echo %{kverrel} | tr - _) +Release: 5.%(echo %{kverrel} | tr - _) Summary: LIRC kernel modules Group: System Environment/Kernel @@ -39,7 +39,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # ExclusiveArch to assist the FE build system. -ExclusiveArch: i586 i686 x86_64 ppc ppc64 ppc64iseries +ExclusiveArch: i586 i686 x86_64 ppc %description LIRC is a package that allows you to decode and send infra-red and @@ -116,6 +116,9 @@ %changelog +* Fri Mar 17 2006 Ville Skytt?? - 0.8.0-5 +- Drop the ppc64* experiment. + * Wed Mar 15 2006 Ville Skytt?? - 0.8.0-4 - Add ppc64 and ppc64iseries while waiting for #185387. From fedora-extras-commits at redhat.com Fri Mar 17 07:46:56 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 02:46:56 -0500 Subject: extras-buildsys/utils extras-push-all, 1.1, 1.2 extras-repobuild.py, 1.10, 1.11 extras-repoview.py, 1.1, 1.2 extras-sign-move.py, 1.6, 1.7 Message-ID: <200603170746.k2H7kuSH029569@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29545 Modified Files: extras-push-all extras-repobuild.py extras-repoview.py extras-sign-move.py Log Message: Update for FE5, keep only one latest package in devel. Index: extras-push-all =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-push-all,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- extras-push-all 22 Jan 2006 10:51:45 -0000 1.1 +++ extras-push-all 17 Mar 2006 07:46:49 -0000 1.2 @@ -14,7 +14,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -dists="3 4 development" +dists="3 4 5 development" changed= sign_move() Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- extras-repobuild.py 21 Jan 2006 18:18:51 -0000 1.10 +++ extras-repobuild.py 17 Mar 2006 07:46:49 -0000 1.11 @@ -29,8 +29,10 @@ cachedir = '/tmp/repomd-cache' compsname = 'comps.xml' archdict = {'3':['x86_64', 'i386'], + '4':['ppc','x86_64', 'i386'], + '5':['ppc','x86_64', 'i386'], 'development':['ppc','x86_64','i386'], - '4':['ppc','x86_64', 'i386']} + } ts = rpmUtils.transaction.initReadOnlyTransaction() @@ -50,7 +52,7 @@ sys.exit(result) -def do_repo_stuff(repodir): +def do_repo_stuff(repodir, keep=2): compspath = os.path.join(repodir, compsname) rpdata = os.path.join(repodir, 'repodata') debugprint('removing tree %s' % rpdata) @@ -59,8 +61,8 @@ if os.path.exists(rpdata): shutil.rmtree(rpdata) print 'processing: %s' % repodir - print 'Cleaning up older packages' - cmd = '/usr/bin/repomanage -k2 -o %s | xargs rm -f' % (repodir) + print 'Cleaning up older packages (keeping %d latest)' % (keep) + cmd = '/usr/bin/repomanage -k%d -o %s | xargs rm -f' % (keep, repodir) run_and_check(cmd) print 'Creating repository metadata' @@ -92,15 +94,16 @@ sys.exit(1) distdir = 'fedora-%s-extras' % dist destdir = os.path.join(treedir, dist) + keep = (dist == 'development') and 1 or 2 print "Making Repository Metadata" - do_repo_stuff(os.path.join(destdir, 'SRPMS')) + do_repo_stuff(os.path.join(destdir, 'SRPMS'), keep) # arch repo creation for arch in archdict[dist]: repodir = os.path.join(destdir, arch) - do_repo_stuff(repodir) + do_repo_stuff(repodir, keep) if __name__ == '__main__': me = os.getcwd() Index: extras-repoview.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repoview.py,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- extras-repoview.py 21 Jan 2006 18:18:51 -0000 1.1 +++ extras-repoview.py 17 Mar 2006 07:46:49 -0000 1.2 @@ -23,8 +23,10 @@ treedir = '/rpmbuild/extras/tree/extras' archdict = {'3':['x86_64', 'i386'], + '4':['ppc','x86_64', 'i386'], + '5':['ppc','x86_64', 'i386'], 'development':['ppc','x86_64','i386'], - '4':['ppc','x86_64', 'i386']} + } DEBUG = False Index: extras-sign-move.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- extras-sign-move.py 21 Jan 2006 18:18:51 -0000 1.6 +++ extras-sign-move.py 17 Mar 2006 07:46:49 -0000 1.7 @@ -36,9 +36,10 @@ cachedir = '/tmp/repomd-cache' compsname = 'comps.xml' archdict = {'3':['x86_64', 'i386'], - 'development':['ppc','x86_64','i386'], '4':['ppc','x86_64', 'i386'], - '5':['ppc','x86_64', 'i386']} + '5':['ppc','x86_64', 'i386'], + 'development':['ppc','x86_64','i386'], + } ts = rpmUtils.transaction.initReadOnlyTransaction() From fedora-extras-commits at redhat.com Fri Mar 17 08:36:49 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 17 Mar 2006 03:36:49 -0500 Subject: rpms/scons/FC-5 .cvsignore,1.2,1.3 scons.spec,1.6,1.7 Message-ID: <200603170837.k2H8bL4g031799@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/scons/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31769 Modified Files: .cvsignore scons.spec Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scons/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:19:08 -0000 1.2 +++ .cvsignore 17 Mar 2006 08:36:49 -0000 1.3 @@ -1 +1 @@ -scons-0.96.tar.gz +scons-0.96.1.tar.gz Index: scons.spec =================================================================== RCS file: /cvs/extras/rpms/scons/FC-5/scons.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- scons.spec 17 Feb 2006 21:39:32 -0000 1.6 +++ scons.spec 17 Mar 2006 08:36:49 -0000 1.7 @@ -1,6 +1,6 @@ Name: scons -Version: 0.96 -Release: 6%{?dist} +Version: 0.96.1 +Release: 1%{?dist} Summary: An Open Source software construction tool @@ -52,8 +52,8 @@ %{_mandir}/man*/* %changelog -* Fri Feb 17 2006 Gerard Milmeister - 0.96-6 -- Rebuild for Fedora Extras 5 +* Sat Jun 18 2005 Gerard Milmeister - 0.96.1-1 +- New Version 0.96.1 * Fri Apr 7 2005 Michael Schwendt - rebuilt From fedora-extras-commits at redhat.com Fri Mar 17 08:37:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 17 Mar 2006 03:37:33 -0500 Subject: rpms/scons/FC-5 sources,1.2,1.3 Message-ID: <200603170838.k2H8c6GU031829@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/scons/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31806 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/scons/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:19:08 -0000 1.2 +++ sources 17 Mar 2006 08:37:33 -0000 1.3 @@ -1 +1 @@ -0c08161c77a4338fca58840bd87151f6 scons-0.96.tar.gz +45b1c346edd8a0970210aeb1e82557c9 scons-0.96.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 08:39:03 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Fri, 17 Mar 2006 03:39:03 -0500 Subject: rpms/scons/FC-5 scons.spec,1.7,1.8 Message-ID: <200603170839.k2H8dZrZ031891@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/scons/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31871 Modified Files: scons.spec Log Message: Index: scons.spec =================================================================== RCS file: /cvs/extras/rpms/scons/FC-5/scons.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- scons.spec 17 Mar 2006 08:36:49 -0000 1.7 +++ scons.spec 17 Mar 2006 08:39:03 -0000 1.8 @@ -1,6 +1,6 @@ Name: scons Version: 0.96.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: An Open Source software construction tool From fedora-extras-commits at redhat.com Fri Mar 17 10:07:07 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 05:07:07 -0500 Subject: rpms/qemu/devel qemu-0.7.0-build.patch,1.1,1.2 qemu.spec,1.7,1.8 Message-ID: <200603171007.k2HA7erx004089@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4061 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: Fix i386 build qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu-0.7.0-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-0.7.0-build.patch 30 Apr 2005 11:34:52 -0000 1.1 +++ qemu-0.7.0-build.patch 17 Mar 2006 10:07:05 -0000 1.2 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall ++OP_CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qemu.spec 17 Mar 2006 00:34:39 -0000 1.7 +++ qemu.spec 17 Mar 2006 10:07:05 -0000 1.8 @@ -74,6 +74,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Fri Mar 17 2006 David Woodhouse 0.8.0-2 +- Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it + * Fri Mar 17 2006 David Woodhouse 0.8.0-1 - Update to 0.8.0 - Resort to using compat-gcc-32 From fedora-extras-commits at redhat.com Fri Mar 17 10:08:48 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 05:08:48 -0500 Subject: rpms/qemu/FC-4 qemu-0.7.0-build.patch,1.1,1.2 qemu.spec,1.8,1.9 Message-ID: <200603171009.k2HA9LDW004124@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4097 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: Fix i386 build qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu-0.7.0-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-0.7.0-build.patch 30 Apr 2005 11:34:52 -0000 1.1 +++ qemu-0.7.0-build.patch 17 Mar 2006 10:08:47 -0000 1.2 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall ++OP_CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qemu.spec 17 Mar 2006 00:32:16 -0000 1.8 +++ qemu.spec 17 Mar 2006 10:08:47 -0000 1.9 @@ -74,6 +74,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Fri Mar 17 2006 David Woodhouse 0.8.0-2 +- Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it + * Fri Mar 17 2006 David Woodhouse 0.8.0-1 - Update to 0.8.0 - Resort to using compat-gcc-32 From fedora-extras-commits at redhat.com Fri Mar 17 10:10:00 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 05:10:00 -0500 Subject: rpms/qemu/FC-4 qemu.spec,1.9,1.10 Message-ID: <200603171010.k2HAAXQL004171@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4154 Modified Files: qemu.spec Log Message: actually change the release Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- qemu.spec 17 Mar 2006 10:08:47 -0000 1.9 +++ qemu.spec 17 Mar 2006 10:10:00 -0000 1.10 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL/LGPL Group: Development/Tools From fedora-extras-commits at redhat.com Fri Mar 17 10:24:47 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 05:24:47 -0500 Subject: rpms/qemu/FC-4 qemu-0.7.0-build.patch,1.2,1.3 Message-ID: <200603171025.k2HAPLlP004302@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4274 Modified Files: qemu-0.7.0-build.patch Log Message: use -mcpu for x86_64 too qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu-0.7.0-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qemu-0.7.0-build.patch 17 Mar 2006 10:08:47 -0000 1.2 +++ qemu-0.7.0-build.patch 17 Mar 2006 10:24:42 -0000 1.3 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall ++OP_CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld From fedora-extras-commits at redhat.com Fri Mar 17 10:58:02 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 05:58:02 -0500 Subject: rpms/multisync/FC-4 multisync-tool.patch, NONE, 1.1 multisync.spec, 1.1, 1.2 Message-ID: <200603171058.k2HAwY20004453@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397/FC-4 Modified Files: multisync.spec Added Files: multisync-tool.patch Log Message: - fix #185631 multisync-tool.patch: --- NEW FILE multisync-tool.patch --- --- multisync-0.90.18/tools/msynctool.c.editor 2005-11-06 16:14:21.000000000 +0200 +++ multisync-0.90.18/tools/msynctool.c 2005-11-12 12:48:18.570791944 +0200 @@ -509,7 +509,7 @@ static osync_bool configure(OSyncEnv *os char *editcmd = g_strdup_printf("%s %s", editor, tmpfile); if (system(editcmd)) { editcmd = g_strdup_printf("vi %s", tmpfile); - if (system("editcmd")) { + if (system(editcmd)) { osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to open editor. Aborting"); g_free(editcmd); goto error_free_tmp; Index: multisync.spec =================================================================== RCS file: /cvs/extras/rpms/multisync/FC-4/multisync.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multisync.spec 13 Mar 2006 09:11:47 -0000 1.1 +++ multisync.spec 17 Mar 2006 10:58:01 -0000 1.2 @@ -1,6 +1,6 @@ Name: multisync Version: 0.90.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Calendar (and other PIM data) synchronization program Group: Applications/Communications @@ -13,6 +13,7 @@ # this is svn151 with a few fixes Patch1: multisync-gui-svn151.patch Patch2: multisync-werror.patch +Patch3: multisync-tool.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel @@ -41,6 +42,7 @@ %patch0 %patch1 %patch2 +%patch3 -p1 %build # both don't like smp flags so disable them for now @@ -89,6 +91,10 @@ %{_datadir}/applications/*desktop %changelog +* Fri Mar 17 2006 Andreas Bierfert +0.90.18-5 +- fix #185631 + * Wed Mar 01 2006 Andreas Bierfert 0.90.18-4 - fix segfaulting binary From fedora-extras-commits at redhat.com Fri Mar 17 10:58:08 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 05:58:08 -0500 Subject: rpms/multisync/FC-5 multisync-tool.patch, NONE, 1.1 multisync.spec, 1.1, 1.2 Message-ID: <200603171058.k2HAweaq004456@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397/FC-5 Modified Files: multisync.spec Added Files: multisync-tool.patch Log Message: - fix #185631 multisync-tool.patch: --- NEW FILE multisync-tool.patch --- --- multisync-0.90.18/tools/msynctool.c.editor 2005-11-06 16:14:21.000000000 +0200 +++ multisync-0.90.18/tools/msynctool.c 2005-11-12 12:48:18.570791944 +0200 @@ -509,7 +509,7 @@ static osync_bool configure(OSyncEnv *os char *editcmd = g_strdup_printf("%s %s", editor, tmpfile); if (system(editcmd)) { editcmd = g_strdup_printf("vi %s", tmpfile); - if (system("editcmd")) { + if (system(editcmd)) { osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to open editor. Aborting"); g_free(editcmd); goto error_free_tmp; Index: multisync.spec =================================================================== RCS file: /cvs/extras/rpms/multisync/FC-5/multisync.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multisync.spec 13 Mar 2006 09:11:47 -0000 1.1 +++ multisync.spec 17 Mar 2006 10:58:08 -0000 1.2 @@ -1,6 +1,6 @@ Name: multisync Version: 0.90.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Calendar (and other PIM data) synchronization program Group: Applications/Communications @@ -13,6 +13,7 @@ # this is svn151 with a few fixes Patch1: multisync-gui-svn151.patch Patch2: multisync-werror.patch +Patch3: multisync-tool.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel @@ -41,6 +42,7 @@ %patch0 %patch1 %patch2 +%patch3 -p1 %build # both don't like smp flags so disable them for now @@ -89,6 +91,10 @@ %{_datadir}/applications/*desktop %changelog +* Fri Mar 17 2006 Andreas Bierfert +0.90.18-5 +- fix #185631 + * Wed Mar 01 2006 Andreas Bierfert 0.90.18-4 - fix segfaulting binary From fedora-extras-commits at redhat.com Fri Mar 17 10:58:14 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 05:58:14 -0500 Subject: rpms/multisync/devel multisync-tool.patch, NONE, 1.1 multisync.spec, 1.1, 1.2 Message-ID: <200603171058.k2HAwkHl004459@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/multisync/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397/devel Modified Files: multisync.spec Added Files: multisync-tool.patch Log Message: - fix #185631 multisync-tool.patch: --- NEW FILE multisync-tool.patch --- --- multisync-0.90.18/tools/msynctool.c.editor 2005-11-06 16:14:21.000000000 +0200 +++ multisync-0.90.18/tools/msynctool.c 2005-11-12 12:48:18.570791944 +0200 @@ -509,7 +509,7 @@ static osync_bool configure(OSyncEnv *os char *editcmd = g_strdup_printf("%s %s", editor, tmpfile); if (system(editcmd)) { editcmd = g_strdup_printf("vi %s", tmpfile); - if (system("editcmd")) { + if (system(editcmd)) { osync_error_set(error, OSYNC_ERROR_GENERIC, "Unable to open editor. Aborting"); g_free(editcmd); goto error_free_tmp; Index: multisync.spec =================================================================== RCS file: /cvs/extras/rpms/multisync/devel/multisync.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- multisync.spec 13 Mar 2006 09:11:47 -0000 1.1 +++ multisync.spec 17 Mar 2006 10:58:13 -0000 1.2 @@ -1,6 +1,6 @@ Name: multisync Version: 0.90.18 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Calendar (and other PIM data) synchronization program Group: Applications/Communications @@ -13,6 +13,7 @@ # this is svn151 with a few fixes Patch1: multisync-gui-svn151.patch Patch2: multisync-werror.patch +Patch3: multisync-tool.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libopensync-devel @@ -41,6 +42,7 @@ %patch0 %patch1 %patch2 +%patch3 -p1 %build # both don't like smp flags so disable them for now @@ -89,6 +91,10 @@ %{_datadir}/applications/*desktop %changelog +* Fri Mar 17 2006 Andreas Bierfert +0.90.18-5 +- fix #185631 + * Wed Mar 01 2006 Andreas Bierfert 0.90.18-4 - fix segfaulting binary From fedora-extras-commits at redhat.com Fri Mar 17 11:13:29 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 06:13:29 -0500 Subject: rpms/qemu/FC-4 qemu.spec,1.10,1.11 Message-ID: <200603171114.k2HBEEjx006545@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6528 Modified Files: qemu.spec Log Message: Fix x86_64 too Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-4/qemu.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qemu.spec 17 Mar 2006 10:10:00 -0000 1.10 +++ qemu.spec 17 Mar 2006 11:13:27 -0000 1.11 @@ -1,12 +1,12 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL/LGPL Group: Development/Tools URL: http://fabrice.bellard.free.fr/qemu -Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz +Source0: http://www.qemu.org/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -36,7 +36,11 @@ %patch0 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa +./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 %install @@ -74,6 +78,10 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Fri Mar 17 2006 David Woodhouse 0.8.0-3 +- Use -mcpu= instead of -mtune= on x86_64 too +- Disable SPARC targets on x86_64, because dyngen doesn't like fnegs + * Fri Mar 17 2006 David Woodhouse 0.8.0-2 - Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it From fedora-extras-commits at redhat.com Fri Mar 17 12:49:49 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 07:49:49 -0500 Subject: rpms/rkhunter/FC-1 rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.3, 1.4 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603171250.k2HCoL0v008812@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-1 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8790 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-1/rkhunter.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rkhunter.spec 11 Mar 2006 19:57:00 -0000 1.3 +++ rkhunter.spec 17 Mar 2006 12:49:48 -0000 1.4 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 12:52:55 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 07:52:55 -0500 Subject: rpms/rkhunter/FC-2 rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.3, 1.4 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603171253.k2HCrS0h008849@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-2 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8831 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-2/rkhunter.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- rkhunter.spec 11 Mar 2006 20:51:42 -0000 1.3 +++ rkhunter.spec 17 Mar 2006 12:52:55 -0000 1.4 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 12:55:11 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 07:55:11 -0500 Subject: rpms/rkhunter/FC-3 rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.5, 1.6 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603171255.k2HCti9p008881@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8863 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-3/rkhunter.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- rkhunter.spec 11 Mar 2006 20:57:35 -0000 1.5 +++ rkhunter.spec 17 Mar 2006 12:55:11 -0000 1.6 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 12:58:54 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 07:58:54 -0500 Subject: rpms/rkhunter/FC-4 rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.7, 1.8 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603171259.k2HCxQFq008976@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8924 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-4/rkhunter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rkhunter.spec 11 Mar 2006 21:02:45 -0000 1.7 +++ rkhunter.spec 17 Mar 2006 12:58:54 -0000 1.8 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:01:00 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 08:01:00 -0500 Subject: rpms/rkhunter/devel rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.7, 1.8 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603171301.k2HD1WcA010910@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9022 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rkhunter.spec 11 Mar 2006 21:08:16 -0000 1.7 +++ rkhunter.spec 17 Mar 2006 13:01:00 -0000 1.8 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:24:42 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:24:42 -0500 Subject: rpms/wine/FC-3 .cvsignore, 1.9, 1.10 sources, 1.10, 1.11 wine.spec, 1.13, 1.14 wine-20050524-generated.patch, 1.1, NONE Message-ID: <200603171325.k2HDPFs6011148@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074/FC-3 Modified Files: .cvsignore sources wine.spec Removed Files: wine-20050524-generated.patch Log Message: - version upgrade - drop ancient fonts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 3 Mar 2006 09:16:26 -0000 1.9 +++ .cvsignore 17 Mar 2006 13:24:42 -0000 1.10 @@ -1,2 +1 @@ -wine-fonts-20050524.tar.gz -wine-0.9.9-fe.tar.bz2 +wine-0.9.10-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 3 Mar 2006 09:16:26 -0000 1.10 +++ sources 17 Mar 2006 13:24:42 -0000 1.11 @@ -1,2 +1 @@ -fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 +054e71983834d777be3271f63f8484d6 wine-0.9.10-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- wine.spec 3 Mar 2006 09:16:26 -0000 1.13 +++ wine.spec 17 Mar 2006 13:24:42 -0000 1.14 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,6 @@ # special fedora tarball without winemp3 stuff Source0: wine-0.9.9-fe.tar.bz2 Source1: wine.init -Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora Source4: wine-32.conf Source100: wine-notepad.desktop @@ -19,7 +18,6 @@ Source104: wine-winefile.desktop Source105: wine-winemine.desktop Source106: wine-winhelp.desktop -Patch2: wine-20050524-generated.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} @@ -180,10 +178,6 @@ mkdir -p %{buildroot}%{_initrddir} install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine -# Install Wine's fonts -mkdir -p %{buildroot}%{_datadir}/fonts/wine -tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine - desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ @@ -537,48 +531,7 @@ %{_libdir}/wine/wtsapi32.dll.so %{_libdir}/wine/security.dll.so %{_libdir}/wine/sfc.dll.so -%dir %{_datadir}/fonts/wine -%{_datadir}/fonts/wine/wine_coure.fon -%{_datadir}/fonts/wine/wine_couree.fon -%{_datadir}/fonts/wine/wine_courer.fon -%{_datadir}/fonts/wine/wine_marlett.ttf -%{_datadir}/fonts/wine/wine_sserife.fon -%{_datadir}/fonts/wine/wine_sserifee.fon -%{_datadir}/fonts/wine/wine_sserifer.fon -%{_datadir}/fonts/wine/wine_vgasys.fon -%{_datadir}/fonts/wine/wine_vgasyse.fon -%{_datadir}/fonts/wine/wine_vgasysr.fon -%{_datadir}/fonts/wine/coue1255.fon -%{_datadir}/fonts/wine/coue1256.fon -%{_datadir}/fonts/wine/coue1257.fon -%{_datadir}/fonts/wine/coure.fon -%{_datadir}/fonts/wine/couree.fon -%{_datadir}/fonts/wine/coureg.fon -%{_datadir}/fonts/wine/courer.fon -%{_datadir}/fonts/wine/couret.fon -%{_datadir}/fonts/wine/cvgasys.fon -%{_datadir}/fonts/wine/hvgasys.fon -%{_datadir}/fonts/wine/jvgasys.fon -%{_datadir}/fonts/wine/marlett.ttf -%{_datadir}/fonts/wine/ssee1255.fon -%{_datadir}/fonts/wine/ssee1256.fon -%{_datadir}/fonts/wine/ssee1257.fon -%{_datadir}/fonts/wine/ssee874.fon -%{_datadir}/fonts/wine/sserife.fon -%{_datadir}/fonts/wine/sserifee.fon -%{_datadir}/fonts/wine/sserifeg.fon -%{_datadir}/fonts/wine/sserifer.fon -%{_datadir}/fonts/wine/sserifet.fon -%{_datadir}/fonts/wine/svgasys.fon -%{_datadir}/fonts/wine/vgas1255.fon -%{_datadir}/fonts/wine/vgas1256.fon -%{_datadir}/fonts/wine/vgas1257.fon -%{_datadir}/fonts/wine/vgas874.fon -%{_datadir}/fonts/wine/vgasys.fon -%{_datadir}/fonts/wine/vgasyse.fon -%{_datadir}/fonts/wine/vgasysg.fon -%{_datadir}/fonts/wine/vgasysr.fon -%{_datadir}/fonts/wine/vgasyst.fon +%{_datadir}/wine/fonts/ %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so %{_libdir}/wine/wineps16.drv16 @@ -683,6 +636,11 @@ %{_libdir}/wine/*.def %changelog +* Fri Mar 17 2006 Andreas Bierfert 0.9.9-1 - version upgrade --- wine-20050524-generated.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:24:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:24:49 -0500 Subject: rpms/wine/FC-4 .cvsignore, 1.10, 1.11 sources, 1.11, 1.12 wine.spec, 1.15, 1.16 wine-20050524-generated.patch, 1.1, NONE Message-ID: <200603171325.k2HDPLEb011153@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074/FC-4 Modified Files: .cvsignore sources wine.spec Removed Files: wine-20050524-generated.patch Log Message: - version upgrade - drop ancient fonts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 3 Mar 2006 09:16:35 -0000 1.10 +++ .cvsignore 17 Mar 2006 13:24:48 -0000 1.11 @@ -1,2 +1 @@ -wine-fonts-20050524.tar.gz -wine-0.9.9-fe.tar.bz2 +wine-0.9.10-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 3 Mar 2006 09:16:35 -0000 1.11 +++ sources 17 Mar 2006 13:24:48 -0000 1.12 @@ -1,2 +1 @@ -fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz -a6c02fe36f4391655f4836b74b37d27f wine-0.9.9-fe.tar.bz2 +054e71983834d777be3271f63f8484d6 wine-0.9.10-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- wine.spec 3 Mar 2006 09:16:35 -0000 1.15 +++ wine.spec 17 Mar 2006 13:24:48 -0000 1.16 @@ -1,5 +1,5 @@ Name: wine -Version: 0.9.9 +Version: 0.9.10 Release: 1%{?dist} Summary: A Windows 16/32/64 bit emulator @@ -9,7 +9,6 @@ # special fedora tarball without winemp3 stuff Source0: wine-0.9.9-fe.tar.bz2 Source1: wine.init -Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora Source4: wine-32.conf Source100: wine-notepad.desktop @@ -19,7 +18,6 @@ Source104: wine-winefile.desktop Source105: wine-winemine.desktop Source106: wine-winhelp.desktop -Patch2: wine-20050524-generated.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) ExclusiveArch: %{ix86} @@ -180,10 +178,6 @@ mkdir -p %{buildroot}%{_initrddir} install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine -# Install Wine's fonts -mkdir -p %{buildroot}%{_datadir}/fonts/wine -tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine - desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ @@ -537,48 +531,7 @@ %{_libdir}/wine/wtsapi32.dll.so %{_libdir}/wine/security.dll.so %{_libdir}/wine/sfc.dll.so -%dir %{_datadir}/fonts/wine -%{_datadir}/fonts/wine/wine_coure.fon -%{_datadir}/fonts/wine/wine_couree.fon -%{_datadir}/fonts/wine/wine_courer.fon -%{_datadir}/fonts/wine/wine_marlett.ttf -%{_datadir}/fonts/wine/wine_sserife.fon -%{_datadir}/fonts/wine/wine_sserifee.fon -%{_datadir}/fonts/wine/wine_sserifer.fon -%{_datadir}/fonts/wine/wine_vgasys.fon -%{_datadir}/fonts/wine/wine_vgasyse.fon -%{_datadir}/fonts/wine/wine_vgasysr.fon -%{_datadir}/fonts/wine/coue1255.fon -%{_datadir}/fonts/wine/coue1256.fon -%{_datadir}/fonts/wine/coue1257.fon -%{_datadir}/fonts/wine/coure.fon -%{_datadir}/fonts/wine/couree.fon -%{_datadir}/fonts/wine/coureg.fon -%{_datadir}/fonts/wine/courer.fon -%{_datadir}/fonts/wine/couret.fon -%{_datadir}/fonts/wine/cvgasys.fon -%{_datadir}/fonts/wine/hvgasys.fon -%{_datadir}/fonts/wine/jvgasys.fon -%{_datadir}/fonts/wine/marlett.ttf -%{_datadir}/fonts/wine/ssee1255.fon -%{_datadir}/fonts/wine/ssee1256.fon -%{_datadir}/fonts/wine/ssee1257.fon -%{_datadir}/fonts/wine/ssee874.fon -%{_datadir}/fonts/wine/sserife.fon -%{_datadir}/fonts/wine/sserifee.fon -%{_datadir}/fonts/wine/sserifeg.fon -%{_datadir}/fonts/wine/sserifer.fon -%{_datadir}/fonts/wine/sserifet.fon -%{_datadir}/fonts/wine/svgasys.fon -%{_datadir}/fonts/wine/vgas1255.fon -%{_datadir}/fonts/wine/vgas1256.fon -%{_datadir}/fonts/wine/vgas1257.fon -%{_datadir}/fonts/wine/vgas874.fon -%{_datadir}/fonts/wine/vgasys.fon -%{_datadir}/fonts/wine/vgasyse.fon -%{_datadir}/fonts/wine/vgasysg.fon -%{_datadir}/fonts/wine/vgasysr.fon -%{_datadir}/fonts/wine/vgasyst.fon +%{_datadir}/wine/fonts/ %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so %{_libdir}/wine/wineps16.drv16 @@ -683,6 +636,11 @@ %{_libdir}/wine/*.def %changelog +* Fri Mar 17 2006 Andreas Bierfert 0.9.9-1 - version upgrade --- wine-20050524-generated.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:24:54 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:24:54 -0500 Subject: rpms/wine/FC-5 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 wine.spec, 1.20, 1.21 wine-20050524-generated.patch, 1.1, NONE Message-ID: <200603171325.k2HDPRbd011158@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074/FC-5 Modified Files: .cvsignore sources wine.spec Removed Files: wine-20050524-generated.patch Log Message: - version upgrade - drop ancient fonts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 15 Mar 2006 21:59:45 -0000 1.11 +++ .cvsignore 17 Mar 2006 13:24:54 -0000 1.12 @@ -1,2 +1 @@ -wine-fonts-20050524.tar.gz wine-0.9.10-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 15 Mar 2006 21:59:45 -0000 1.12 +++ sources 17 Mar 2006 13:24:54 -0000 1.13 @@ -1,2 +1 @@ -fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz 054e71983834d777be3271f63f8484d6 wine-0.9.10-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- wine.spec 15 Mar 2006 21:59:45 -0000 1.20 +++ wine.spec 17 Mar 2006 13:24:54 -0000 1.21 @@ -11,7 +11,6 @@ # special fedora tarball without winemp3 stuff Source0: wine-0.9.10-fe.tar.bz2 Source1: wine.init -Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora Source4: wine-32.conf Source100: wine-notepad.desktop @@ -21,7 +20,6 @@ Source104: wine-winefile.desktop Source105: wine-winemine.desktop Source106: wine-winhelp.desktop -Patch2: wine-20050524-generated.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -158,8 +156,6 @@ %prep %setup -q -n %{name}-%{version}-fe -%patch2 -p1 -b .generated -autoconf %build export CFLAGS="$RPM_OPT_FLAGS" @@ -193,10 +189,6 @@ mkdir -p %{buildroot}%{_initrddir} install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine -# Install Wine's fonts -mkdir -p %{buildroot}%{_datadir}/fonts/wine -tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine - desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ @@ -550,48 +542,7 @@ %{_libdir}/wine/wtsapi32.dll.so %{_libdir}/wine/security.dll.so %{_libdir}/wine/sfc.dll.so -%dir %{_datadir}/fonts/wine -%{_datadir}/fonts/wine/wine_coure.fon -%{_datadir}/fonts/wine/wine_couree.fon -%{_datadir}/fonts/wine/wine_courer.fon -%{_datadir}/fonts/wine/wine_marlett.ttf -%{_datadir}/fonts/wine/wine_sserife.fon -%{_datadir}/fonts/wine/wine_sserifee.fon -%{_datadir}/fonts/wine/wine_sserifer.fon -%{_datadir}/fonts/wine/wine_vgasys.fon -%{_datadir}/fonts/wine/wine_vgasyse.fon -%{_datadir}/fonts/wine/wine_vgasysr.fon -%{_datadir}/fonts/wine/coue1255.fon -%{_datadir}/fonts/wine/coue1256.fon -%{_datadir}/fonts/wine/coue1257.fon -%{_datadir}/fonts/wine/coure.fon -%{_datadir}/fonts/wine/couree.fon -%{_datadir}/fonts/wine/coureg.fon -%{_datadir}/fonts/wine/courer.fon -%{_datadir}/fonts/wine/couret.fon -%{_datadir}/fonts/wine/cvgasys.fon -%{_datadir}/fonts/wine/hvgasys.fon -%{_datadir}/fonts/wine/jvgasys.fon -%{_datadir}/fonts/wine/marlett.ttf -%{_datadir}/fonts/wine/ssee1255.fon -%{_datadir}/fonts/wine/ssee1256.fon -%{_datadir}/fonts/wine/ssee1257.fon -%{_datadir}/fonts/wine/ssee874.fon -%{_datadir}/fonts/wine/sserife.fon -%{_datadir}/fonts/wine/sserifee.fon -%{_datadir}/fonts/wine/sserifeg.fon -%{_datadir}/fonts/wine/sserifer.fon -%{_datadir}/fonts/wine/sserifet.fon -%{_datadir}/fonts/wine/svgasys.fon -%{_datadir}/fonts/wine/vgas1255.fon -%{_datadir}/fonts/wine/vgas1256.fon -%{_datadir}/fonts/wine/vgas1257.fon -%{_datadir}/fonts/wine/vgas874.fon -%{_datadir}/fonts/wine/vgasys.fon -%{_datadir}/fonts/wine/vgasyse.fon -%{_datadir}/fonts/wine/vgasysg.fon -%{_datadir}/fonts/wine/vgasysr.fon -%{_datadir}/fonts/wine/vgasyst.fon +%{_datadir}/wine/fonts/ %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so %{_libdir}/wine/wineps16.drv16 @@ -696,6 +647,11 @@ %{_libdir}/wine/*.def %changelog +* Thu Mar 16 2006 Andreas Bierfert +0.9.10-1 +- version upgrade +- drop ancient extra fonts + * Fri Mar 03 2006 Andreas Bierfert 0.9.9-1 - version upgrade --- wine-20050524-generated.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:25:00 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:25:00 -0500 Subject: rpms/wine/devel .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 wine.spec, 1.20, 1.21 wine-20050524-generated.patch, 1.1, NONE Message-ID: <200603171325.k2HDPWGo011163@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11074/devel Modified Files: .cvsignore sources wine.spec Removed Files: wine-20050524-generated.patch Log Message: - version upgrade - drop ancient fonts Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 15 Mar 2006 21:59:45 -0000 1.11 +++ .cvsignore 17 Mar 2006 13:25:00 -0000 1.12 @@ -1,2 +1 @@ -wine-fonts-20050524.tar.gz wine-0.9.10-fe.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wine/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 15 Mar 2006 21:59:45 -0000 1.12 +++ sources 17 Mar 2006 13:25:00 -0000 1.13 @@ -1,2 +1 @@ -fb216b10993cb17501efff7afa812da1 wine-fonts-20050524.tar.gz 054e71983834d777be3271f63f8484d6 wine-0.9.10-fe.tar.bz2 Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- wine.spec 15 Mar 2006 21:59:45 -0000 1.20 +++ wine.spec 17 Mar 2006 13:25:00 -0000 1.21 @@ -11,7 +11,6 @@ # special fedora tarball without winemp3 stuff Source0: wine-0.9.10-fe.tar.bz2 Source1: wine.init -Source2: wine-fonts-20050524.tar.gz Source3: wine-README-Fedora Source4: wine-32.conf Source100: wine-notepad.desktop @@ -21,7 +20,6 @@ Source104: wine-winefile.desktop Source105: wine-winemine.desktop Source106: wine-winhelp.desktop -Patch2: wine-20050524-generated.patch Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -158,8 +156,6 @@ %prep %setup -q -n %{name}-%{version}-fe -%patch2 -p1 -b .generated -autoconf %build export CFLAGS="$RPM_OPT_FLAGS" @@ -193,10 +189,6 @@ mkdir -p %{buildroot}%{_initrddir} install -p -c -m 755 %SOURCE1 %{buildroot}%{_initrddir}/wine -# Install Wine's fonts -mkdir -p %{buildroot}%{_datadir}/fonts/wine -tar xzf %SOURCE2 -C %{buildroot}%{_datadir}/fonts/wine - desktop-file-install \ --vendor=fedora \ --dir=$RPM_BUILD_ROOT%{_datadir}/applications \ @@ -550,48 +542,7 @@ %{_libdir}/wine/wtsapi32.dll.so %{_libdir}/wine/security.dll.so %{_libdir}/wine/sfc.dll.so -%dir %{_datadir}/fonts/wine -%{_datadir}/fonts/wine/wine_coure.fon -%{_datadir}/fonts/wine/wine_couree.fon -%{_datadir}/fonts/wine/wine_courer.fon -%{_datadir}/fonts/wine/wine_marlett.ttf -%{_datadir}/fonts/wine/wine_sserife.fon -%{_datadir}/fonts/wine/wine_sserifee.fon -%{_datadir}/fonts/wine/wine_sserifer.fon -%{_datadir}/fonts/wine/wine_vgasys.fon -%{_datadir}/fonts/wine/wine_vgasyse.fon -%{_datadir}/fonts/wine/wine_vgasysr.fon -%{_datadir}/fonts/wine/coue1255.fon -%{_datadir}/fonts/wine/coue1256.fon -%{_datadir}/fonts/wine/coue1257.fon -%{_datadir}/fonts/wine/coure.fon -%{_datadir}/fonts/wine/couree.fon -%{_datadir}/fonts/wine/coureg.fon -%{_datadir}/fonts/wine/courer.fon -%{_datadir}/fonts/wine/couret.fon -%{_datadir}/fonts/wine/cvgasys.fon -%{_datadir}/fonts/wine/hvgasys.fon -%{_datadir}/fonts/wine/jvgasys.fon -%{_datadir}/fonts/wine/marlett.ttf -%{_datadir}/fonts/wine/ssee1255.fon -%{_datadir}/fonts/wine/ssee1256.fon -%{_datadir}/fonts/wine/ssee1257.fon -%{_datadir}/fonts/wine/ssee874.fon -%{_datadir}/fonts/wine/sserife.fon -%{_datadir}/fonts/wine/sserifee.fon -%{_datadir}/fonts/wine/sserifeg.fon -%{_datadir}/fonts/wine/sserifer.fon -%{_datadir}/fonts/wine/sserifet.fon -%{_datadir}/fonts/wine/svgasys.fon -%{_datadir}/fonts/wine/vgas1255.fon -%{_datadir}/fonts/wine/vgas1256.fon -%{_datadir}/fonts/wine/vgas1257.fon -%{_datadir}/fonts/wine/vgas874.fon -%{_datadir}/fonts/wine/vgasys.fon -%{_datadir}/fonts/wine/vgasyse.fon -%{_datadir}/fonts/wine/vgasysg.fon -%{_datadir}/fonts/wine/vgasysr.fon -%{_datadir}/fonts/wine/vgasyst.fon +%{_datadir}/wine/fonts/ %{_libdir}/wine/winealsa.drv.so %{_libdir}/wine/wineps.drv.so %{_libdir}/wine/wineps16.drv16 @@ -696,6 +647,11 @@ %{_libdir}/wine/*.def %changelog +* Thu Mar 16 2006 Andreas Bierfert +0.9.10-1 +- version upgrade +- drop ancient extra fonts + * Fri Mar 03 2006 Andreas Bierfert 0.9.9-1 - version upgrade --- wine-20050524-generated.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 13:28:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:28:49 -0500 Subject: rpms/wine/FC-3 wine.spec,1.14,1.15 Message-ID: <200603171329.k2HDTMN2011248@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11186/FC-3 Modified Files: wine.spec Log Message: - clean up BR Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- wine.spec 17 Mar 2006 13:24:42 -0000 1.14 +++ wine.spec 17 Mar 2006 13:28:49 -0000 1.15 @@ -22,7 +22,6 @@ ExclusiveArch: %{ix86} -BuildRequires: autoconf BuildRequires: bison BuildRequires: flex BuildRequires: alsa-lib-devel @@ -144,8 +143,6 @@ %prep %setup -q -n %{name}-%{version}-fe -%patch2 -p1 -b .generated -autoconf %build export CFLAGS="$RPM_OPT_FLAGS" From fedora-extras-commits at redhat.com Fri Mar 17 13:29:02 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:29:02 -0500 Subject: rpms/wine/FC-5 wine.spec,1.21,1.22 Message-ID: <200603171329.k2HDTZ5v011251@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11186/FC-5 Modified Files: wine.spec Log Message: - clean up BR Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- wine.spec 17 Mar 2006 13:24:54 -0000 1.21 +++ wine.spec 17 Mar 2006 13:29:02 -0000 1.22 @@ -25,7 +25,6 @@ ExclusiveArch: %{ix86} -BuildRequires: autoconf BuildRequires: bison BuildRequires: flex BuildRequires: alsa-lib-devel From fedora-extras-commits at redhat.com Fri Mar 17 13:29:08 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:29:08 -0500 Subject: rpms/wine/devel wine.spec,1.21,1.22 Message-ID: <200603171329.k2HDTeWj011255@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11186/devel Modified Files: wine.spec Log Message: - clean up BR Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- wine.spec 17 Mar 2006 13:25:00 -0000 1.21 +++ wine.spec 17 Mar 2006 13:29:08 -0000 1.22 @@ -25,7 +25,6 @@ ExclusiveArch: %{ix86} -BuildRequires: autoconf BuildRequires: bison BuildRequires: flex BuildRequires: alsa-lib-devel From fedora-extras-commits at redhat.com Fri Mar 17 13:28:56 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:28:56 -0500 Subject: rpms/wine/FC-4 wine.spec,1.16,1.17 Message-ID: <200603171329.k2HDTZZ2011252@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11186/FC-4 Modified Files: wine.spec Log Message: - clean up BR Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- wine.spec 17 Mar 2006 13:24:48 -0000 1.16 +++ wine.spec 17 Mar 2006 13:28:55 -0000 1.17 @@ -22,7 +22,6 @@ ExclusiveArch: %{ix86} -BuildRequires: autoconf BuildRequires: bison BuildRequires: flex BuildRequires: alsa-lib-devel @@ -144,8 +143,6 @@ %prep %setup -q -n %{name}-%{version}-fe -%patch2 -p1 -b .generated -autoconf %build export CFLAGS="$RPM_OPT_FLAGS" From fedora-extras-commits at redhat.com Fri Mar 17 13:51:45 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 17 Mar 2006 08:51:45 -0500 Subject: rpms/xfce4-xkb-plugin/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xfce4-xkb-plugin.spec, 1.4, 1.5 Message-ID: <200603171352.k2HDqIRQ011543@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11522 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Mar 2006 14:21:12 -0000 1.3 +++ .cvsignore 17 Mar 2006 13:51:45 -0000 1.4 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.3.tar.gz +xfce4-xkb-plugin-0.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Mar 2006 14:21:12 -0000 1.3 +++ sources 17 Mar 2006 13:51:45 -0000 1.4 @@ -1 +1 @@ -a23baec787ee6666e15a3c243fc14ec4 xfce4-xkb-plugin-0.3.3.tar.gz +06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xfce4-xkb-plugin.spec 10 Mar 2006 14:21:12 -0000 1.4 +++ xfce4-xkb-plugin.spec 17 Mar 2006 13:51:45 -0000 1.5 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -10,7 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel -BuildRequires: libXext-devel, libXpm-devel +# for modular X +%if "%{?fedora}" > "4" +BuildRequires: libXext-devel, libXpm-devel +%endif %description Xfce XKB layout switch plugin for the Xfce panel. It displays the current @@ -43,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 +- Update to 0.3.4. + * Fri Mar 10 2006 Christoph Wickert - 0.3.3-1 - Update to 0.3.3. From fedora-extras-commits at redhat.com Fri Mar 17 13:53:58 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 17 Mar 2006 08:53:58 -0500 Subject: rpms/xfce4-xkb-plugin/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xfce4-xkb-plugin.spec, 1.4, 1.5 Message-ID: <200603171354.k2HDsU9p011610@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11589 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Mar 2006 14:21:12 -0000 1.3 +++ .cvsignore 17 Mar 2006 13:53:57 -0000 1.4 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.3.tar.gz +xfce4-xkb-plugin-0.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Mar 2006 14:21:12 -0000 1.3 +++ sources 17 Mar 2006 13:53:57 -0000 1.4 @@ -1 +1 @@ -a23baec787ee6666e15a3c243fc14ec4 xfce4-xkb-plugin-0.3.3.tar.gz +06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/xfce4-xkb-plugin.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xfce4-xkb-plugin.spec 10 Mar 2006 14:21:12 -0000 1.4 +++ xfce4-xkb-plugin.spec 17 Mar 2006 13:53:57 -0000 1.5 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -10,7 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel -BuildRequires: libXext-devel, libXpm-devel +# for modular X +%if "%{?fedora}" > "4" +BuildRequires: libXext-devel, libXpm-devel +%endif %description Xfce XKB layout switch plugin for the Xfce panel. It displays the current @@ -43,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 +- Update to 0.3.4. + * Fri Mar 10 2006 Christoph Wickert - 0.3.3-1 - Update to 0.3.3. From fedora-extras-commits at redhat.com Fri Mar 17 13:55:16 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 17 Mar 2006 08:55:16 -0500 Subject: rpms/xfce4-xkb-plugin/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 xfce4-xkb-plugin.spec, 1.2, 1.3 Message-ID: <200603171355.k2HDtmDj011741@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11697 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.4 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Mar 2006 14:54:07 -0000 1.3 +++ .cvsignore 17 Mar 2006 13:55:15 -0000 1.4 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.3.tar.gz +xfce4-xkb-plugin-0.3.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Mar 2006 14:54:07 -0000 1.3 +++ sources 17 Mar 2006 13:55:15 -0000 1.4 @@ -1 +1 @@ -a23baec787ee6666e15a3c243fc14ec4 xfce4-xkb-plugin-0.3.3.tar.gz +06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/xfce4-xkb-plugin.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- xfce4-xkb-plugin.spec 10 Mar 2006 14:54:07 -0000 1.2 +++ xfce4-xkb-plugin.spec 17 Mar 2006 13:55:15 -0000 1.3 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.3 +Version: 0.3.4 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -10,6 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel +# for modular X +%if "%{?fedora}" > "4" +BuildRequires: libXext-devel, libXpm-devel +%endif %description Xfce XKB layout switch plugin for the Xfce panel. It displays the current @@ -42,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 +- Update to 0.3.4. + * Fri Mar 10 2006 Christoph Wickert - 0.3.3-1 - Update to 0.3.3. From fedora-extras-commits at redhat.com Fri Mar 17 13:55:47 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:55:47 -0500 Subject: rpms/wine/FC-3 wine.spec,1.15,1.16 Message-ID: <200603171356.k2HDuJrc011775@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11725/FC-3 Modified Files: wine.spec Log Message: - forgot to change source Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- wine.spec 17 Mar 2006 13:28:49 -0000 1.15 +++ wine.spec 17 Mar 2006 13:55:47 -0000 1.16 @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.9-fe.tar.bz2 +Source0: wine-0.9.10-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf From fedora-extras-commits at redhat.com Fri Mar 17 13:55:53 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 17 Mar 2006 08:55:53 -0500 Subject: rpms/wine/FC-4 wine.spec,1.17,1.18 Message-ID: <200603171356.k2HDuP4n011780@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11725/FC-4 Modified Files: wine.spec Log Message: - forgot to change source Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- wine.spec 17 Mar 2006 13:28:55 -0000 1.17 +++ wine.spec 17 Mar 2006 13:55:53 -0000 1.18 @@ -7,7 +7,7 @@ License: LGPL URL: http://www.winehq.org/ # special fedora tarball without winemp3 stuff -Source0: wine-0.9.9-fe.tar.bz2 +Source0: wine-0.9.10-fe.tar.bz2 Source1: wine.init Source3: wine-README-Fedora Source4: wine-32.conf From fedora-extras-commits at redhat.com Fri Mar 17 14:57:13 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 09:57:13 -0500 Subject: rpms/qemu/FC-5 qemu-0.7.0-build.patch,1.1,1.2 qemu.spec,1.8,1.9 Message-ID: <200603171457.k2HEvVgS014669@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14645 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: fix i386 and x86_64 builds qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu-0.7.0-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- qemu-0.7.0-build.patch 30 Apr 2005 11:34:52 -0000 1.1 +++ qemu-0.7.0-build.patch 17 Mar 2006 14:57:13 -0000 1.2 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(RPM_OPT_FLAGS) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(RPM_OPT_FLAGS) -Wall ++OP_CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qemu.spec 17 Mar 2006 00:38:15 -0000 1.8 +++ qemu.spec 17 Mar 2006 14:57:13 -0000 1.9 @@ -1,12 +1,12 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 1.1%{?dist} +Release: 3%{?dist} License: GPL/LGPL Group: Development/Tools URL: http://fabrice.bellard.free.fr/qemu -Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz +Source0: http://www.qemu.org/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -36,7 +36,11 @@ %patch0 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa +./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 %install @@ -74,8 +78,12 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog -* Fri Mar 17 2006 David Woodhouse 0.8.0-1.1 -- Bump release to work around accidental .fc5 tag in -devel branch +* Fri Mar 17 2006 David Woodhouse 0.8.0-3 +- Use -mcpu= instead of -mtune= on x86_64 too +- Disable SPARC targets on x86_64, because dyngen doesn't like fnegs + +* Fri Mar 17 2006 David Woodhouse 0.8.0-2 +- Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it * Fri Mar 17 2006 David Woodhouse 0.8.0-1 - Update to 0.8.0 From fedora-extras-commits at redhat.com Fri Mar 17 14:58:10 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 17 Mar 2006 09:58:10 -0500 Subject: rpms/qemu/devel qemu-0.7.0-build.patch,1.2,1.3 qemu.spec,1.8,1.9 Message-ID: <200603171458.k2HEwgVA014736@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14710 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: fix i386 and x86_64 builds qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu-0.7.0-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qemu-0.7.0-build.patch 17 Mar 2006 10:07:05 -0000 1.2 +++ qemu-0.7.0-build.patch 17 Mar 2006 14:58:09 -0000 1.3 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(subst -mtune=pentium4,-mcpu=pentium4,$(RPM_OPT_FLAGS)) -Wall ++OP_CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- qemu.spec 17 Mar 2006 10:07:05 -0000 1.8 +++ qemu.spec 17 Mar 2006 14:58:09 -0000 1.9 @@ -1,12 +1,12 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL/LGPL Group: Development/Tools URL: http://fabrice.bellard.free.fr/qemu -Source0: http://fabrice.bellard.free.fr/qemu/%{name}-%{version}.tar.gz +Source0: http://www.qemu.org/%{name}-%{version}.tar.gz Source1: qemu.init Patch0: qemu-0.7.0-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -36,7 +36,11 @@ %patch0 -p1 %build -./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M --cc=gcc32 --enable-alsa +./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 %install @@ -74,6 +78,10 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Fri Mar 17 2006 David Woodhouse 0.8.0-3 +- Use -mcpu= instead of -mtune= on x86_64 too +- Disable SPARC targets on x86_64, because dyngen doesn't like fnegs + * Fri Mar 17 2006 David Woodhouse 0.8.0-2 - Don't use -mtune=pentium4 on i386. GCC 3.2 doesn't like it From fedora-extras-commits at redhat.com Fri Mar 17 15:58:12 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 10:58:12 -0500 Subject: rpms/libshout/devel libshout.spec,1.10,1.11 Message-ID: <200603171558.k2HFwiAo017106@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17085 Modified Files: libshout.spec Log Message: rebuild again Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/devel/libshout.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libshout.spec 10 Mar 2006 15:48:41 -0000 1.10 +++ libshout.spec 17 Mar 2006 15:58:11 -0000 1.11 @@ -79,10 +79,6 @@ - new (incompatible) version, but deps are updated - various cleanups -* Sun Mar 05 2006 Thomas Vander Stichele -- 1.0.9-5 -- rebuild - * Sun May 22 2005 Jeremy Katz - 1.0.9-4 - rebuild on all arches From fedora-extras-commits at redhat.com Fri Mar 17 16:01:09 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 11:01:09 -0500 Subject: rpms/libshout/FC-5 libshout.spec,1.10,1.11 Message-ID: <200603171601.k2HG1fxv019107@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18035 Modified Files: libshout.spec Log Message: rebuild Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-5/libshout.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libshout.spec 10 Mar 2006 15:48:41 -0000 1.10 +++ libshout.spec 17 Mar 2006 16:01:09 -0000 1.11 @@ -79,10 +79,6 @@ - new (incompatible) version, but deps are updated - various cleanups -* Sun Mar 05 2006 Thomas Vander Stichele -- 1.0.9-5 -- rebuild - * Sun May 22 2005 Jeremy Katz - 1.0.9-4 - rebuild on all arches From fedora-extras-commits at redhat.com Fri Mar 17 16:25:24 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 17 Mar 2006 11:25:24 -0500 Subject: rpms/octave-forge/FC-4 .cvsignore, 1.5, 1.6 octave-forge.spec, 1.21, 1.22 sources, 1.5, 1.6 Message-ID: <200603171625.k2HGPvYx019272@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19251 Modified Files: .cvsignore octave-forge.spec sources Log Message: New release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 30 Jan 2006 16:00:43 -0000 1.5 +++ .cvsignore 17 Mar 2006 16:25:24 -0000 1.6 @@ -1 +1 @@ -octave-forge-2006.01.28.patched.tar.gz +octave-forge-2006.03.17.patched.tar.gz Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-4/octave-forge.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- octave-forge.spec 3 Feb 2006 17:12:03 -0000 1.21 +++ octave-forge.spec 17 Mar 2006 16:25:24 -0000 1.22 @@ -1,6 +1,6 @@ Name: octave-forge -Version: 2006.01.28 -Release: 2%{?dist} +Version: 2006.03.17 +Release: 1%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -15,7 +15,6 @@ ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version} ## rm -Rf octave-forge-%{version} Source0: %{name}-%{version}.patched.tar.gz -Patch0: octave-forge-2006.01.28.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: octave >= 2.1.69 ImageMagick @@ -33,7 +32,6 @@ %prep %setup -q -%patch0 -p0 %build @@ -67,6 +65,9 @@ %changelog +* Fri Mar 17 2006 Quentin Spencer 2001.03.17-1 +- New release. Remove old patch. + * Fri Feb 3 2006 Quentin Spencer 2001.01.28-2 - Patch to fix some files that were not installed. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 30 Jan 2006 16:00:43 -0000 1.5 +++ sources 17 Mar 2006 16:25:24 -0000 1.6 @@ -1 +1 @@ -8192ee6bc3784e35180623592de4303f octave-forge-2006.01.28.patched.tar.gz +a1e76ab52fb9894586d6a7a0dc15e603 octave-forge-2006.03.17.patched.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 16:28:04 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 17 Mar 2006 11:28:04 -0500 Subject: rpms/octave-forge/FC-4 octave-forge-2006.01.28.patch,1.1,NONE Message-ID: <200603171628.k2HGS6vk019340@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19331 Removed Files: octave-forge-2006.01.28.patch Log Message: Remove old patches. --- octave-forge-2006.01.28.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 16:45:39 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 11:45:39 -0500 Subject: rpms/libshout/FC-5 libshout.spec,1.11,1.12 Message-ID: <200603171646.k2HGkBU7019542@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19520 Modified Files: libshout.spec Log Message: bump for rebuild Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-5/libshout.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libshout.spec 17 Mar 2006 16:01:09 -0000 1.11 +++ libshout.spec 17 Mar 2006 16:45:39 -0000 1.12 @@ -1,6 +1,6 @@ Name: libshout Version: 2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: icecast source streaming library Group: System Environment/Libraries @@ -74,6 +74,10 @@ %{_datadir}/aclocal/shout.m4 %changelog +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-2 +- rebuild to please the extras repository + * Fri Mar 10 2006 Thomas Vander Stichele - 2.2-1 - new (incompatible) version, but deps are updated From fedora-extras-commits at redhat.com Fri Mar 17 16:53:38 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 17 Mar 2006 11:53:38 -0500 Subject: rpms/octave-forge/FC-5 .cvsignore, 1.6, 1.7 octave-forge.spec, 1.20, 1.21 sources, 1.6, 1.7 octave-forge-2006.01.28.patch, 1.3, NONE Message-ID: <200603171654.k2HGsBFx019652@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19631 Modified Files: .cvsignore octave-forge.spec sources Removed Files: octave-forge-2006.01.28.patch Log Message: New release. Remove old patches. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Feb 2006 13:43:31 -0000 1.6 +++ .cvsignore 17 Mar 2006 16:53:38 -0000 1.7 @@ -1,2 +1 @@ -octave-forge-2006.01.28.patched.tar.gz -octave-forge-2006.01.28-fixed.patch.gz +octave-forge-2006.03.17.patched.tar.gz Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-5/octave-forge.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- octave-forge.spec 18 Feb 2006 06:46:36 -0000 1.20 +++ octave-forge.spec 17 Mar 2006 16:53:38 -0000 1.21 @@ -1,6 +1,6 @@ Name: octave-forge -Version: 2006.01.28 -Release: 5%{?dist} +Version: 2006.03.17 +Release: 1%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -15,8 +15,6 @@ ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version} ## rm -Rf octave-forge-%{version} Source0: %{name}-%{version}.patched.tar.gz -Patch0: %{name}-2006.01.28.patch -Patch1: %{name}-2006.01.28-fixed.patch.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: octave >= 2.9.4 ImageMagick @@ -34,11 +32,8 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 # The sparse matrix functions are in octave 2.9.x so don't install them touch main/sparse/NOINSTALL -chmod +x admin/octlink.sh %build export CPPFLAGS=-I%{_includedir}/netcdf-3 @@ -72,6 +67,9 @@ %changelog +* Fri Mar 17 2006 Quentin Spencer 2006.03.17-1 +- New release. Remove old patches. + * Sat Feb 18 2006 Quentin Spencer 2006.01.28-5 - Amend patch0 to correctly deal with 64-bit indexing. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave-forge/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Feb 2006 13:43:31 -0000 1.6 +++ sources 17 Mar 2006 16:53:38 -0000 1.7 @@ -1,2 +1 @@ -8192ee6bc3784e35180623592de4303f octave-forge-2006.01.28.patched.tar.gz -fb0c7cc8f4d759ef0de76c8218583a32 octave-forge-2006.01.28-fixed.patch.gz +a1e76ab52fb9894586d6a7a0dc15e603 octave-forge-2006.03.17.patched.tar.gz --- octave-forge-2006.01.28.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 17:52:25 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Fri, 17 Mar 2006 12:52:25 -0500 Subject: rpms/clearsilver/devel clearsilver.spec,1.3,1.4 Message-ID: <200603171752.k2HHqw95023436@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23380 Modified Files: clearsilver.spec Log Message: * Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 - fix for x86_64 Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/devel/clearsilver.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clearsilver.spec 13 Mar 2006 18:36:56 -0000 1.3 +++ clearsilver.spec 17 Mar 2006 17:52:25 -0000 1.4 @@ -2,7 +2,7 @@ Name: clearsilver Version: 0.10.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License @@ -81,6 +81,7 @@ %patch0 -p1 touch configure sed -i 's|/neo/opt/bin/python|%{__python}|' python/examples/*/*.py +sed -i 's|PYTHON_SITE = @PYTHON_SITE@|PYTHON_SITE = %{python_sitearch}|' rules.mk.in find python/examples -type f | xargs chmod -x %build @@ -162,6 +163,9 @@ %endif %changelog +* Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 +- fix for x86_64 + * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 From fedora-extras-commits at redhat.com Fri Mar 17 18:04:05 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:04:05 -0500 Subject: rpms/python-chm - New directory Message-ID: <200603171804.k2HI47Xe025958@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/python-chm Log Message: Directory /cvs/extras/rpms/python-chm added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 18:04:13 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:04:13 -0500 Subject: rpms/python-chm/devel - New directory Message-ID: <200603171804.k2HI4Fq1025973@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25950/python-chm/devel Log Message: Directory /cvs/extras/rpms/python-chm/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 18:04:48 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:04:48 -0500 Subject: rpms/python-chm Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603171804.k2HI4oqJ026007@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25995 Added Files: Makefile import.log Log Message: Setup of module python-chm --- NEW FILE Makefile --- # Top level Makefile for module python-chm all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 17 18:05:13 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:05:13 -0500 Subject: rpms/python-chm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603171805.k2HI5FrG026026@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25995/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module python-chm --- NEW 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 Mar 17 18:06:56 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:06:56 -0500 Subject: rpms/python-chm/devel python-chm.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603171807.k2HI7Sxo026105@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26065/devel Modified Files: .cvsignore sources Added Files: python-chm.spec Log Message: auto-import python-chm-0.8.2-2 on branch devel from python-chm-0.8.2-2.src.rpm --- NEW FILE python-chm.spec --- %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-chm Version: 0.8.2 Release: 2%{?dist} Summary: Python package for CHM files handling Group: Development/Languages License: GPL URL: http://gnochm.sourceforge.net/pychm.html Source0: http://dl.sf.net/gnochm/pychm-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel BuildRequires: chmlib-devel Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") %description The python chm package provides three modules, chm, chmlib and extra, which provide access to the API implemented by the C library chmlib and some additional classes and functions. They are used to access MS-ITSS encoded files - Compressed Html Help files (.chm). %prep %setup -q -n pychm-%{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 COPYING NEWS README %dir %{python_sitearch}/chm/ %{python_sitearch}/chm/*.py %{python_sitearch}/chm/*.pyc %{python_sitearch}/chm/*.so %ghost %{python_sitearch}/chm/*.pyo %changelog * Sun Mar 12 2006 Patrice Dumas 0.8.2-2 - Fedora Extras submission, loosely based on Dag. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-chm/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Mar 2006 18:05:13 -0000 1.1 +++ .cvsignore 17 Mar 2006 18:06:56 -0000 1.2 @@ -0,0 +1 @@ +pychm-0.8.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-chm/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Mar 2006 18:05:13 -0000 1.1 +++ sources 17 Mar 2006 18:06:56 -0000 1.2 @@ -0,0 +1 @@ +d1bc0d4d2d9f91aef5bf12ab0f92f0da pychm-0.8.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 18:06:29 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 13:06:29 -0500 Subject: rpms/python-chm import.log,1.1,1.2 Message-ID: <200603171807.k2HI7VO2026108@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/python-chm In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26065 Modified Files: import.log Log Message: auto-import python-chm-0.8.2-2 on branch devel from python-chm-0.8.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-chm/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Mar 2006 18:04:47 -0000 1.1 +++ import.log 17 Mar 2006 18:06:29 -0000 1.2 @@ -0,0 +1 @@ +python-chm-0_8_2-2:HEAD:python-chm-0.8.2-2.src.rpm:1142618750 From fedora-extras-commits at redhat.com Fri Mar 17 18:08:17 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Fri, 17 Mar 2006 13:08:17 -0500 Subject: rpms/clearsilver/FC-5 clearsilver.spec,1.3,1.4 Message-ID: <200603171808.k2HI8tPC026200@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26156 Modified Files: clearsilver.spec Log Message: * Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 - fix for x86_64 Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-5/clearsilver.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- clearsilver.spec 13 Mar 2006 18:36:56 -0000 1.3 +++ clearsilver.spec 17 Mar 2006 18:08:17 -0000 1.4 @@ -2,7 +2,7 @@ Name: clearsilver Version: 0.10.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License @@ -81,6 +81,7 @@ %patch0 -p1 touch configure sed -i 's|/neo/opt/bin/python|%{__python}|' python/examples/*/*.py +sed -i 's|PYTHON_SITE = @PYTHON_SITE@|PYTHON_SITE = %{python_sitearch}|' rules.mk.in find python/examples -type f | xargs chmod -x %build @@ -162,6 +163,9 @@ %endif %changelog +* Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 +- fix for x86_64 + * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 From fedora-extras-commits at redhat.com Fri Mar 17 18:09:11 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Fri, 17 Mar 2006 13:09:11 -0500 Subject: rpms/clearsilver/FC-4 clearsilver.spec,1.2,1.3 Message-ID: <200603171809.k2HI9hIL026273@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26208 Modified Files: clearsilver.spec Log Message: * Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 - fix for x86_64 Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-4/clearsilver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clearsilver.spec 13 Mar 2006 18:39:49 -0000 1.2 +++ clearsilver.spec 17 Mar 2006 18:09:10 -0000 1.3 @@ -2,7 +2,7 @@ Name: clearsilver Version: 0.10.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License @@ -81,6 +81,7 @@ %patch0 -p1 touch configure sed -i 's|/neo/opt/bin/python|%{__python}|' python/examples/*/*.py +sed -i 's|PYTHON_SITE = @PYTHON_SITE@|PYTHON_SITE = %{python_sitearch}|' rules.mk.in find python/examples -type f | xargs chmod -x %build @@ -162,6 +163,9 @@ %endif %changelog +* Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 +- fix for x86_64 + * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 From fedora-extras-commits at redhat.com Fri Mar 17 18:09:58 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:09:58 -0500 Subject: rpms/ularn/devel - New directory Message-ID: <200603171810.k2HIA0kd026297@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/ularn/devel Log Message: Directory /cvs/extras/rpms/ularn/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 18:09:43 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:09:43 -0500 Subject: rpms/ularn - New directory Message-ID: <200603171809.k2HI9j2D026278@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26265/ularn Log Message: Directory /cvs/extras/rpms/ularn added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 18:10:01 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Fri, 17 Mar 2006 13:10:01 -0500 Subject: rpms/clearsilver/FC-3 clearsilver.spec,1.2,1.3 Message-ID: <200603171810.k2HIAXeU026393@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/clearsilver/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26296 Modified Files: clearsilver.spec Log Message: * Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 - fix for x86_64 Index: clearsilver.spec =================================================================== RCS file: /cvs/extras/rpms/clearsilver/FC-3/clearsilver.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- clearsilver.spec 13 Mar 2006 18:38:41 -0000 1.2 +++ clearsilver.spec 17 Mar 2006 18:10:00 -0000 1.3 @@ -2,7 +2,7 @@ Name: clearsilver Version: 0.10.3 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Fast and powerful HTML templating system Group: Development/Libraries License: Neotonic ClearSilver Software License @@ -81,6 +81,7 @@ %patch0 -p1 touch configure sed -i 's|/neo/opt/bin/python|%{__python}|' python/examples/*/*.py +sed -i 's|PYTHON_SITE = @PYTHON_SITE@|PYTHON_SITE = %{python_sitearch}|' rules.mk.in find python/examples -type f | xargs chmod -x %build @@ -162,6 +163,9 @@ %endif %changelog +* Fri Mar 17 2006 Joost Soeterbroek - 0.10.3-3 +- fix for x86_64 + * Mon Mar 13 2006 Joost Soeterbroek - 0.10.3-1 - release 0.10.3 From fedora-extras-commits at redhat.com Fri Mar 17 18:10:25 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:10:25 -0500 Subject: rpms/ularn Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603171810.k2HIARfH026381@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26342 Added Files: Makefile import.log Log Message: Setup of module ularn --- NEW FILE Makefile --- # Top level Makefile for module ularn all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 17 18:10:33 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:10:33 -0500 Subject: rpms/ularn/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603171810.k2HIAgXk026404@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26342/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module ularn --- NEW 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 Mar 17 18:12:08 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:12:08 -0500 Subject: rpms/ularn import.log,1.1,1.2 Message-ID: <200603171812.k2HICfYN026633@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26575 Modified Files: import.log Log Message: auto-import ularn-1.5p4-4 on branch devel from ularn-1.5p4-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ularn/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Mar 2006 18:10:25 -0000 1.1 +++ import.log 17 Mar 2006 18:12:08 -0000 1.2 @@ -0,0 +1 @@ +ularn-1_5p4-4:HEAD:ularn-1.5p4-4.src.rpm:1142619107 From fedora-extras-commits at redhat.com Fri Mar 17 18:12:24 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:12:24 -0500 Subject: rpms/ularn/devel config.sh.in, NONE, 1.1 ularn-build.patch, NONE, 1.1 ularn-datadir.patch, NONE, 1.1 ularn-drop-setgid.patch, NONE, 1.1 ularn-euid.patch, NONE, 1.1 ularn.desktop, NONE, 1.1 ularn.png, NONE, 1.1 ularn.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603171812.k2HICwoo026646@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26575/devel Modified Files: .cvsignore sources Added Files: config.sh.in ularn-build.patch ularn-datadir.patch ularn-drop-setgid.patch ularn-euid.patch ularn.desktop ularn.png ularn.spec Log Message: auto-import ularn-1.5p4-4 on branch devel from ularn-1.5p4-4.src.rpm --- NEW FILE config.sh.in --- #!/bin/sh # config.sh # This file was produced by running the Configure script. hpux='undef' linux='define' bsd='undef' cygwin='undef' syserr='define' bsdlibs='' d_eunice='undef' eunicefix=':' define='define' contains='grep' cppstdin='/usr/bin/cpp' cppminus='' d_ftime='define' d_getopt='define' d_index='define' d_termio='define' d_voidsig='define' libc='/usr/lib/libc.a' mansrc='' manext='' models='none' split='' small='' medium='' large='' huge='' ccflags='' ldflags='' cc='gcc' n='-n' c='' package='Ularn' spitshell='cat' shsharp='true' sharpbang='#!' startsh='#!/bin/sh' loclist=' expr sed echo cat rm tr grep ' expr='/usr/bin/expr' sed='/bin/sed' echo='/bin/echo' cat='/bin/cat' rm='/bin/rm' mv='' cp='' tail='' tr='/usr/bin/tr' mkdir='' sort='' uniq='' grep='/bin/grep' trylist=' xmkmf imake compress uncompress test Mcc cpp ' test='test' inews='' egrep='' more='' pg='' Mcc='Mcc' vi='' mailx='' mail='' cpp='@bindir@/cpp' perl='' compress='@bindir@/compress' uncompress='@bindir@/uncompress' imake='/usr/bin/X11/imake' xmkmf='/usr/bin/X11/xmkmf' bindir='@bindir@' d_drand48='define' d_havetlib='define' termlib='-lcurses' d_itimer='define' d_systime='' d_random='undef' defcomp='undef' imaketmpl='' libdir='@datadir@/ularn' scoredir='@var@/games' mycompress='@bindir@/compress -c' myuncompress='@bindir@/uncompress -c' CONFIG=true ularn-build.patch: --- NEW FILE ularn-build.patch --- diff -Naur Ularn/extern.h Ularn.new/extern.h --- Ularn/extern.h 2001-11-16 10:13:18.000000000 -0800 +++ Ularn.new/extern.h 2006-02-25 16:34:40.000000000 -0800 @@ -88,11 +88,11 @@ int getcharacter(void); int newgame(void); /*VARARGS*/ -int lprintf(); +int lprintf(char *, ...); int lprint(long); int lwrite(char *, int); long lgetc1(void); -long lrint(void); +long lr_int(void); int lrfill(char *, int); char *lgetw(void); char *lgetl(void); @@ -441,11 +441,11 @@ int getcharacter(); int newgame(); /*VARARGS*/ -int lprintf(); +int lprintf(char *, ...); int lprint(); int lwrite(); long lgetc1(); -long lrint(); +long lr_int(); int lrfill(); char *lgetw(); char *lgetl(); diff -Naur Ularn/fortune.c Ularn.new/fortune.c --- Ularn/fortune.c 2001-11-16 10:13:19.000000000 -0800 +++ Ularn.new/fortune.c 2006-02-25 16:21:57.000000000 -0800 @@ -16,7 +16,6 @@ int lines,tmp; struct stat stat; int retval; - char *malloc(); if (fortune_fd==0) { /* open the file */ diff -Naur Ularn/header.h Ularn.new/header.h --- Ularn/header.h 2001-11-16 10:13:19.000000000 -0800 +++ Ularn.new/header.h 2006-02-25 16:22:58.000000000 -0800 @@ -27,7 +27,8 @@ #include #include #include -#include +#include +#include #ifdef USG # include #else diff -Naur Ularn/io.c Ularn.new/io.c --- Ularn/io.c 2001-11-16 10:13:19.000000000 -0800 +++ Ularn.new/io.c 2006-02-25 20:02:55.000000000 -0800 @@ -19,7 +19,7 @@ * FILE INPUT ROUTINES * * long lgetc() read one character from input buffer - * long lrint() read one integer from input buffer + * long lr_int() read one integer from input buffer * lrfill(address,number) put input bytes into a buffer * char *lgetw() get a whitespace ended word from input * char *lgetl() get a \n or EOF ended line from input @@ -101,18 +101,14 @@ */ /*VARARGS*/ -lprintf(va_alist) -va_dcl +lprintf(char *fmt, ...) { va_list ap; /* pointer for variable argument list */ - char *fmt; char *outb,*tmpb; long wide,left,cont,n; /* data for lprintf */ char db[12]; /* %d buffer in lprintf */ - va_start(ap); /* initialize the var args pointer */ - - fmt = (char *)va_arg(ap, char *); /* pointer to format string */ + va_start(ap, fmt); /* initialize the var args pointer */ if (lpnt >= lpend) lflush(); outb = lpnt; @@ -308,7 +304,7 @@ } /* - * long lrint() Read one integer from input buffer + * long lr_int() Read one integer from input buffer * * +---------+---------+---------+---------+ * | high | | | low | @@ -320,7 +316,7 @@ * The save order is low order first, to high order (4 bytes total) * Returns the int read */ -long lrint() +long lr_int() { long i; @@ -562,7 +558,7 @@ { char termbuf[1024]; char *pc, *capptr = cap+10; - char *malloc(), *tgetstr(), *term, *getenv(); + char *tgetstr(), *term, *getenv(); switch (tgetent(termbuf, term = getenv("TERM"))) { case -1: diff -Naur Ularn/main.c Ularn.new/main.c --- Ularn/main.c 2001-11-16 10:13:20.000000000 -0800 +++ Ularn.new/main.c 2006-02-25 16:33:25.000000000 -0800 @@ -46,7 +46,7 @@ { int i, hard; char buf[BUFSIZ]; - char *malloc(), *getenv(), *getlogin(), *ptr=0; + char *getenv(), *getlogin(), *ptr=0; struct passwd *pwe,*getpwuid(); extern char *optarg; extern int optind, opterr; diff -Naur Ularn/Makefile.u.SH Ularn.new/Makefile.u.SH --- Ularn/Makefile.u.SH 2001-11-16 10:18:27.000000000 -0800 +++ Ularn.new/Makefile.u.SH 2006-02-25 17:20:26.000000000 -0800 @@ -97,12 +97,12 @@ ########################################################################## install: $(PROGRAM) $(LIBFILES) - if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi - -cp Umaps Ufortune Uhelp $(LIBDIR) - -chmod 644 $(LIBDIR)/Umaps $(LIBDIR)/Ufortune \ - $(LIBDIR)/Uhelp - if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi - -cp $(PROGRAM) $(BINDIR) + if test ! -d $(DESTDIR)$(LIBDIR) ; then mkdir -p $(DESTDIR)$(LIBDIR) ; fi + -cp Umaps Ufortune Uhelp $(DESTDIR)$(LIBDIR) + -chmod 644 $(DESTDIR)$(LIBDIR)/Umaps $(DESTDIR)$(LIBDIR)/Ufortune \ + $(DESTDIR)$(LIBDIR)/Uhelp + if test ! -d $(DESTDIR)$(BINDIR) ; then mkdir -p $(DESTDIR)$(BINDIR) ; fi + -cp $(PROGRAM) $(DESTDIR)$(BINDIR) lint: diff -Naur Ularn/savelev.c Ularn.new/savelev.c --- Ularn/savelev.c 2001-11-16 10:13:27.000000000 -0800 +++ Ularn.new/savelev.c 2006-02-25 17:19:14.000000000 -0800 @@ -6,14 +6,7 @@ #include "monst.h" #include "extern.h" -#ifdef CYGWIN #include -#define SYSERRLISTDEFINED -#endif - -#ifndef SYSERRLISTDEFINED -extern char *sys_errlist[]; -#endif extern int errno; @@ -216,11 +209,11 @@ unsigned int thesum, asum; struct sphere *sp,*splast; Saved_Level * storage; - char buf[1024], *tmp="/tmp/UtmpXXXXXX", *mkstemp(); + char buf[1024], *tempfilename="/tmp/UtmpXXXXXX"; int fd; if (compress) { - if ((tempfilename = mkstemp(tmp)) == NULL) { + if (fd = (mkstemp(tempfilename)) == -1) { fprintf(stderr,"Can't create temp file to restore game\n"); perror("mkstemp"); nosignal=0; @@ -241,6 +234,7 @@ unlink(tempfilename); return; } +/* if ((fd = open(tempfilename, O_RDONLY)) < 0) { fprintf(stderr,"Can't open temp file to restore game\n"); perror("open"); @@ -249,6 +243,7 @@ died(-265); return; } +*/ } else { if ((fd = open(fname, O_RDONLY)) <= 0) { fprintf(stderr,"Can't open file <%s> to restore game\n", @@ -454,7 +449,7 @@ ncalls++; if ((nwrote = write(fd, buf, num)) == -1) { fprintf(stderr, "Error writing to save file\n"); - fprintf(stderr, "errno = %d\t[%s]\n",errno,sys_errlist[errno]); + fprintf(stderr, "errno = %d\t[%s]\n",errno,strerror(errno)); fprintf(stderr, " Wrote %d bytes so far\n", w); fprintf(stderr, " Call: %d\n", ncalls); abort(); @@ -485,7 +480,7 @@ ncalls++; if ((nread = read(fd, buf, num)) == -1) { fprintf(stderr, "Error reading from save file\n"); - fprintf(stderr, "errno = %d\t[%s]\n",errno,sys_errlist[errno]); + fprintf(stderr, "errno = %d\t[%s]\n",errno,strerror(errno)); fprintf(stderr, " Read %d bytes so far\n", w); fprintf(stderr, " Call: %d\n", ncalls); perror("read"); diff -Naur Ularn/tok.c Ularn.new/tok.c --- Ularn/tok.c 2001-11-16 10:13:31.000000000 -0800 +++ Ularn.new/tok.c 2006-02-25 17:07:40.000000000 -0800 @@ -3,6 +3,7 @@ #include "player.h" #include "monst.h" #include "extern.h" +#include extern int nonap; #define MAXUM 52 /* maximum number of user re-named monsters */ @@ -61,11 +62,15 @@ /* shell escape */ if (cc == '!') { int pgrp; +/* #ifdef USG +*/ pgrp = getpgrp(); +/* #else pgrp = getpgrp(getpid()); -#endif /* USG */ +#endif +*/ resetscroll(); clear(); @@ -75,7 +80,7 @@ settty(); setuid(geteuid()); setgid(getegid()); - setpgrp(getpid(), pgrp); + setpgid(getpid(), pgrp); if ((sh = getenv("SHELL")) != (char *)NULL) { execl(sh, sh, (char *)0); if (!strcmp(sh, "/bin/sh")) { ularn-datadir.patch: --- NEW FILE ularn-datadir.patch --- diff -Naur Ularn/config.h.SH Ularn.new/config.h.SH --- Ularn/config.h.SH 2001-11-16 10:13:15.000000000 -0800 +++ Ularn.new/config.h.SH 2006-03-16 12:54:35.000000000 -0800 @@ -136,6 +136,11 @@ */ #define LIBDIR "$libdir" /**/ +/* SCOREBOARDDIR: + * This symbol indicates the directory containing the scoreboard file. + */ +#define SCOREBOARDDIR "$scoredir" /**/ + /* COMPRESS * This symbol contains the command to do compression from stdin * to stdout. diff -Naur Ularn/data.c Ularn.new/data.c --- Ularn/data.c 2001-11-16 10:48:22.000000000 -0800 +++ Ularn.new/data.c 2006-03-16 13:00:30.000000000 -0800 @@ -4,6 +4,7 @@ #include "itm.h" char *libdir = LIBDIR; +char *scoredir = SCOREBOARDDIR; /* the game save filename */ char savefilename[MAXPATHLEN]; diff -Naur Ularn/extern.h Ularn.new/extern.h --- Ularn/extern.h 2006-03-16 07:58:03.000000000 -0800 +++ Ularn.new/extern.h 2006-03-16 13:14:37.000000000 -0800 @@ -712,7 +712,7 @@ /************** extern decls for all data items **********/ -extern char *tempfilename, *libdir; +extern char *tempfilename, *libdir, *scoredir; extern char bot1f,bot2f,bot3f; /* in display.c */ extern char ckpfile[], monstnamelist[]; extern char larnlevels[],lastmonst[]; diff -Naur Ularn/header.h Ularn.new/header.h --- Ularn/header.h 2006-03-16 07:58:03.000000000 -0800 +++ Ularn.new/header.h 2006-03-16 13:21:29.000000000 -0800 @@ -47,7 +47,7 @@ /**************** File Names ****************/ -#define SCORENAME "Uscore" +#define SCORENAME "Ularn-scoreboard" #define HELPNAME "Uhelp" #define LEVELSNAME "Umaps" #define FORTSNAME "Ufortune" diff -Naur Ularn/main.c Ularn.new/main.c --- Ularn/main.c 2006-03-16 12:50:33.000000000 -0800 +++ Ularn.new/main.c 2006-03-16 13:17:19.000000000 -0800 @@ -95,7 +95,7 @@ sprintf(buf, "%s/%s", ptr, ckpfile); /* the checkpoint file */ strcpy(ckpfile, buf); - sprintf(scorefile, "%s/%s", libdir, SCORENAME); /* the Ularn scoreboard filename */ + sprintf(scorefile, "%s/%s", scoredir, SCORENAME); /* the Ularn scoreboard filename */ sprintf(helpfile, "%s/%s", libdir, HELPNAME); /* the Ularn on-line help file */ @@ -118,8 +118,9 @@ */ if (access(scorefile,0) == -1) /* not there */ if (makeboard() == -1) { - fprintf(stderr, "I can't create the scoreboard.\n"); - fprintf(stderr, "Check permissions on %s\n",libdir); + fprintf(stderr, "I can't create the scoreboard %s.\n", + scorefile); + fprintf(stderr, "Check permissions on %s\n",scoredir); exit(1); } ularn-drop-setgid.patch: --- NEW FILE ularn-drop-setgid.patch --- diff -Naur Ularn/data.c Ularn.new/data.c --- Ularn/data.c 2006-03-16 13:40:53.000000000 -0800 +++ Ularn.new/data.c 2006-03-16 13:39:41.000000000 -0800 @@ -5,6 +5,7 @@ char *libdir = LIBDIR; char *scoredir = SCOREBOARDDIR; +FILE *scoreboard_filehandle = (FILE *)NULL; /* the game save filename */ char savefilename[MAXPATHLEN]; diff -Naur Ularn/extern.h Ularn.new/extern.h --- Ularn/extern.h 2006-03-16 13:40:53.000000000 -0800 +++ Ularn.new/extern.h 2006-03-16 13:42:26.000000000 -0800 @@ -713,6 +713,7 @@ /************** extern decls for all data items **********/ extern char *tempfilename, *libdir, *scoredir; +extern FILE *scoreboard_filehandle; extern char bot1f,bot2f,bot3f; /* in display.c */ extern char ckpfile[], monstnamelist[]; extern char larnlevels[],lastmonst[]; diff -Naur Ularn/header.h Ularn.new/header.h --- Ularn/header.h 2006-03-16 13:40:53.000000000 -0800 +++ Ularn.new/header.h 2006-03-17 07:02:33.000000000 -0800 @@ -6,6 +6,9 @@ #include #include +#define _GNU_SOURCE /* this must be done before the first include of unistd.h */ +#include + #ifdef FTIMER # include #endif /* FTIMER */ diff -Naur Ularn/main.c Ularn.new/main.c --- Ularn/main.c 2006-03-16 13:40:53.000000000 -0800 +++ Ularn.new/main.c 2006-03-17 07:02:35.000000000 -0800 @@ -50,7 +50,22 @@ struct passwd *pwe,*getpwuid(); extern char *optarg; extern int optind, opterr; + gid_t realgid; + /* Open the scoreboard file immediately and then drop our setgid + * privileges. + */ + sprintf(scorefile, "%s/%s", scoredir, SCORENAME); /* the Ularn scoreboard filename */ + /* This could be NULL! Users of this variable must check + * before using and not bother writing a scoreboard if it is null. + */ + scoreboard_filehandle=fopen(scorefile, "r+"); + realgid = getgid(); + if (setresgid(-1, realgid, realgid) != 0) { + perror("Could not drop setgid privileges. Aborting."); + exit(1); + } + /* * first task is to identify the player @@ -95,7 +110,6 @@ sprintf(buf, "%s/%s", ptr, ckpfile); /* the checkpoint file */ strcpy(ckpfile, buf); - sprintf(scorefile, "%s/%s", scoredir, SCORENAME); /* the Ularn scoreboard filename */ sprintf(helpfile, "%s/%s", libdir, HELPNAME); /* the Ularn on-line help file */ diff -Naur Ularn/scores.c Ularn.new/scores.c --- Ularn/scores.c 2001-11-16 10:13:28.000000000 -0800 +++ Ularn.new/scores.c 2006-03-16 14:22:14.000000000 -0800 @@ -145,8 +145,9 @@ writeboard() { FILE *fp; + fp = scoreboard_filehandle; - if ((fp = fopen(scorefile, "w")) == (FILE *)NULL) { + if (fp == (FILE *)NULL) { lprcat("Can't open scorefile for writing\n"); lflush(); return(-1); @@ -185,7 +186,7 @@ } if (writeboard()) return(-1); - chmod(scorefile, 0666); + //chmod(scorefile, 0666); return(0); } ularn-euid.patch: --- NEW FILE ularn-euid.patch --- diff -Naur Ularn/main.c Ularn.new/main.c --- Ularn/main.c 2006-03-16 07:58:03.000000000 -0800 +++ Ularn.new/main.c 2006-03-16 12:37:51.000000000 -0800 @@ -55,15 +55,13 @@ /* * first task is to identify the player */ - if ((ptr = getlogin()) == (char *)NULL) { - if (pwe=getpwuid(geteuid())) - ptr = pwe->pw_name; - else if ((ptr = getenv("LOGNAME")) == (char *)NULL) - if ((ptr = getenv("USER")) == (char *)NULL) { -noone: fprintf(stderr,"Who *are* you?\n"); - exit(1); - } - } + if (pwe=getpwuid(geteuid())) + ptr = pwe->pw_name; + else if ((ptr = getenv("LOGNAME")) == (char *)NULL) + if ((ptr = getenv("USER")) == (char *)NULL) { +noone: fprintf(stderr,"Who *are* you?\n"); + exit(1); + } if (ptr==(char *)NULL) goto noone; if (strlen(ptr)==0) --- NEW FILE ularn.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Ularn GenericName=Ularn Comment=Text based game Exec=Ularn Icon=ularn.png Terminal=true Type=Application Categories=Application;Game; Version=1.5p4 --- NEW FILE ularn.spec --- Name: ularn Version: 1.5p4 Release: 4%{?dist} Summary: Simple roguelike game Group: Amusements/Games License: GPL URL: http://www.ularn.org Source0: http://www.ularn.org/Ularn-1.5ishPL4.tar.gz Source1: config.sh.in Source2: ularn.desktop Source3: ularn.png Patch0: ularn-build.patch Patch1: ularn-euid.patch Patch2: ularn-datadir.patch Patch3: ularn-drop-setgid.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ncurses BuildRequires: desktop-file-utils Requires: ncompress %description A text-based roguelike game based on the original Larn. Travel through dungeons collecting weapons, killing monsters, in order to find and sell the Eye of Larn to save your sick daughter. %prep %setup -q -n Ularn # The configure script for this package is interactive. However, it # produces a config.sh script that can be customized if necessary. # a pre-built config.sh script is used to avoid running an interactive # configure script, but still must be customized slightly. sed -e 's#@bindir@#%{_bindir}#' \ -e 's#@datadir@#%{_datadir}#' \ -e 's#@var@#%{_var}#' < %{SOURCE1} > config.sh chmod +x config.h.SH %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %build # Keep track of where we are. Some of the configuration scripts change # the current working directory. builddir=`pwd` . config.h.SH ${builddir}/Makefile.u.SH cd ${builddir} mv Makefile.u Makefile CC="gcc $RPM_OPT_FLAGS" make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/%{_var}/games touch $RPM_BUILD_ROOT/%{_var}/games/Ularn-scoreboard desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ install -p -m 644 %{SOURCE3} $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 # Note that the game is setgid games, and the directory with # the score file is group writable. %files %defattr(-,root,root,-) %attr(2755,root,games) %{_bindir}/Ularn %{_datadir}/%{name} %config(noreplace) %attr (0664,root,games) %{_var}/games/Ularn-scoreboard %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %doc README README.spoilers GPL CHANGES.text Ularnopts %changelog * Fri Mar 17 2006 Wart 1.5p4-4 - Updated setgid patch to prevent someone from regaining setgid privileges. - Own /usr/share/ularn directory * Thu Mar 16 2006 Wart 1.5p4-3 - Added a patch to use the effective uid in determining the players name, or more precisely, don't use the id of the controlling terminal's user. - Added a patch to look for game files in /usr/share/ularn and move the scoreboard to /var/games. - Added a patch to drop setgid privileges after opening the scoreboard file for writing. * Mon Mar 13 2006 Wart 1.5p4-2 - Added icon for .desktop file. - Change default permissions so that only critical files are owned by 'games' - Add missing scoreboard file. * Sat Feb 25 2006 Wart 1.5p4-1 - Initial spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ularn/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Mar 2006 18:10:33 -0000 1.1 +++ .cvsignore 17 Mar 2006 18:12:24 -0000 1.2 @@ -0,0 +1 @@ +Ularn-1.5ishPL4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/ularn/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Mar 2006 18:10:33 -0000 1.1 +++ sources 17 Mar 2006 18:12:24 -0000 1.2 @@ -0,0 +1 @@ +e38861b422d4f8973536da0e8f475221 Ularn-1.5ishPL4.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 18:17:23 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:17:23 -0500 Subject: owners owners.list,1.747,1.748 Message-ID: <200603171817.k2HIHv0g026712@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26695 Modified Files: owners.list Log Message: Added ularn, a roguelike game. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.747 retrieving revision 1.748 diff -u -r1.747 -r1.748 --- owners.list 16 Mar 2006 04:34:53 -0000 1.747 +++ owners.list 17 Mar 2006 18:17:23 -0000 1.748 @@ -1412,6 +1412,7 @@ Fedora Extras|ufraw|Tool to retrieve raw image data from digital cameras|nphilipp at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|ufsparse|University of Florida sparse matrix libraries|qspencer at ieee.org|extras-qa at fedoraproject.org| Fedora Extras|uim|A multilingual input method library|tagoh at redhat.com|extras-qa at fedoraproject.org|petersen at redhat.com +Fedora Extras|ularn|Roguelike game|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|ulogd|The userspace logging daemon for netfilter|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|unison|File synchronization tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|unrtf|RTF to other formats converter|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 17 18:19:42 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:19:42 -0500 Subject: comps comps-fe5.xml.in,1.23,1.24 Message-ID: <200603171820.k2HIKFGI026774@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26733 Modified Files: comps-fe5.xml.in Log Message: Added new game 'ularn'; very minor formatting cleanup. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- comps-fe5.xml.in 14 Mar 2006 20:49:40 -0000 1.23 +++ comps-fe5.xml.in 17 Mar 2006 18:19:42 -0000 1.24 @@ -217,7 +217,7 @@ lacewing lincity-ng lmarbles - lucidlife + lucidlife Maelstrom nethack nethack-vultures @@ -237,6 +237,7 @@ supertux tong torcs + ularn uqm viruskiller wesnoth From fedora-extras-commits at redhat.com Fri Mar 17 18:22:17 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Fri, 17 Mar 2006 13:22:17 -0500 Subject: rpms/ularn/devel ularn.spec,1.1,1.2 Message-ID: <200603171822.k2HIMnAc026807@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/ularn/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26788 Modified Files: ularn.spec Log Message: Clarify a comment. Index: ularn.spec =================================================================== RCS file: /cvs/extras/rpms/ularn/devel/ularn.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ularn.spec 17 Mar 2006 18:12:24 -0000 1.1 +++ ularn.spec 17 Mar 2006 18:22:17 -0000 1.2 @@ -80,8 +80,7 @@ fi -# Note that the game is setgid games, and the directory with -# the score file is group writable. +# Note that the game is setgid games, and the score file is group writable. %files %defattr(-,root,root,-) %attr(2755,root,games) %{_bindir}/Ularn From fedora-extras-commits at redhat.com Fri Mar 17 18:25:19 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Fri, 17 Mar 2006 13:25:19 -0500 Subject: rpms/opencv/FC-5 opencv.spec,1.4,1.5 Message-ID: <200603171825.k2HIPpCp026982@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/opencv/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26965 Modified Files: opencv.spec Log Message: Need to bump release for FC5 build Index: opencv.spec =================================================================== RCS file: /cvs/extras/rpms/opencv/FC-5/opencv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- opencv.spec 8 Mar 2006 13:15:09 -0000 1.4 +++ opencv.spec 17 Mar 2006 18:25:19 -0000 1.5 @@ -5,7 +5,7 @@ Name: opencv Version: 0.9.7 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Collection of algorithms for computer vision Group: Development/Libraries @@ -124,6 +124,9 @@ %changelog +* Fri Mar 17 2006 Simon Perreault - 0.9.7-16 +- Rebuild. + * Wed Mar 8 2006 Simon Perreault - 0.9.7-15 - Force a re-run of Autotools by calling autoreconf. From fedora-extras-commits at redhat.com Fri Mar 17 18:26:34 2006 From: fedora-extras-commits at redhat.com (Simon Perreault (nomis80)) Date: Fri, 17 Mar 2006 13:26:34 -0500 Subject: rpms/camstream/FC-5 camstream.spec,1.11,1.12 Message-ID: <200603171827.k2HIR7jM027043@cvs-int.fedora.redhat.com> Author: nomis80 Update of /cvs/extras/rpms/camstream/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27019 Modified Files: camstream.spec Log Message: Need to bump release for rebuild on FC5 Index: camstream.spec =================================================================== RCS file: /cvs/extras/rpms/camstream/FC-5/camstream.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- camstream.spec 12 Mar 2006 13:24:10 -0000 1.11 +++ camstream.spec 17 Mar 2006 18:26:34 -0000 1.12 @@ -1,6 +1,6 @@ Name: camstream Version: 0.26.3 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Set of programs to make use of your webcam @@ -89,6 +89,9 @@ %changelog +* Fri Mar 17 2006 Simon Perreault - 0.26.3-10 +- Rebuild. + * Sat Mar 11 2006 Simon Perreault - 0.26.3-9 - Taking ownership of package. - Fixed build dependencies (#178654). From fedora-extras-commits at redhat.com Fri Mar 17 19:03:21 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 14:03:21 -0500 Subject: comps comps-fe5.xml.in,1.24,1.25 Message-ID: <200603171903.k2HJ3sE3029603@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29573 Modified Files: comps-fe5.xml.in Log Message: Remove dead packages (cdiff, rpmproc) and sort development-tools. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- comps-fe5.xml.in 17 Mar 2006 18:19:42 -0000 1.24 +++ comps-fe5.xml.in 17 Mar 2006 19:03:20 -0000 1.25 @@ -24,9 +24,9 @@ abicheck bazaar + bigloo bzr ccache - cdiff clisp cogito colordiff @@ -41,24 +41,22 @@ gforth ghc git-core - highlight + highlight lincvs lua mach - mock meld mercurial + mock monotone - pylint ocaml + pylint quilt rpmlint - rpmproc splint tkcvs tla yasm - bigloo From fedora-extras-commits at redhat.com Fri Mar 17 19:08:16 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 14:08:16 -0500 Subject: comps comps-fe5.xml.in,1.25,1.26 Message-ID: <200603171908.k2HJ8mqE029688@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29671 Modified Files: comps-fe5.xml.in Log Message: Add kid3. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- comps-fe5.xml.in 17 Mar 2006 19:03:20 -0000 1.25 +++ comps-fe5.xml.in 17 Mar 2006 19:08:16 -0000 1.26 @@ -421,6 +421,7 @@ gnomebaker graveman grip + kid3 kover libvisual-plugins soundconverter From fedora-extras-commits at redhat.com Fri Mar 17 19:12:16 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 14:12:16 -0500 Subject: comps comps-fe5.xml.in,1.26,1.27 Message-ID: <200603171912.k2HJCmur029747@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29724 Modified Files: comps-fe5.xml.in Log Message: No apt or synaptic for FE5 (yet). Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- comps-fe5.xml.in 17 Mar 2006 19:08:16 -0000 1.26 +++ comps-fe5.xml.in 17 Mar 2006 19:12:16 -0000 1.27 @@ -444,7 +444,6 @@ aide airsnort apcupsd - apt cfengine cfs crack @@ -718,7 +717,6 @@ gparted gsynaptics qtparted - synaptic system-config-control yumex From fedora-extras-commits at redhat.com Fri Mar 17 19:13:27 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 17 Mar 2006 14:13:27 -0500 Subject: rpms/tuxtype2/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tuxtype2.spec, 1.7, 1.8 Message-ID: <200603171914.k2HJE0VG029798@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/tuxtype2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29769 Modified Files: .cvsignore sources tuxtype2.spec Log Message: Sync with devel. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tuxtype2/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 05:30:27 -0000 1.2 +++ .cvsignore 17 Mar 2006 19:13:27 -0000 1.3 @@ -1 +1 @@ -tuxtype2-1.5.2.tar.gz +tuxtype2-1.5.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/tuxtype2/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 05:30:27 -0000 1.2 +++ sources 17 Mar 2006 19:13:27 -0000 1.3 @@ -1 +1 @@ -b47c4712ea7891dd7158faa98981de07 tuxtype2-1.5.2.tar.gz +ca04e65d3b19ddeeedb8a49147ed642b tuxtype2-1.5.3.tar.bz2 Index: tuxtype2.spec =================================================================== RCS file: /cvs/extras/rpms/tuxtype2/FC-4/tuxtype2.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- tuxtype2.spec 22 May 2005 22:28:39 -0000 1.7 +++ tuxtype2.spec 17 Mar 2006 19:13:27 -0000 1.8 @@ -1,12 +1,12 @@ Name: tuxtype2 -Version: 1.5.2 -Release: 3 +Version: 1.5.3 +Release: 1%{?dist} Summary: Tux Typing, an educational typing tutor for children Group: Amusements/Games License: GPL URL: http://tuxtype.sourceforge.net/ -Source0: http://dl.sf.net/tuxtype/%{name}-%{version}.tar.gz +Source0: http://dl.sf.net/tuxtype/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel >= 1.2.5, SDL_image-devel, SDL_mixer-devel @@ -66,6 +66,9 @@ %{_datadir}/applications/* %changelog +* Fri Feb 17 2006 Steven Pritchard 1.5.3-1 +- Update to 1.5.3 + * Sun May 22 2005 Jeremy Katz - 1.5.2-3 - rebuild on all arches From fedora-extras-commits at redhat.com Fri Mar 17 19:14:24 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 17 Mar 2006 14:14:24 -0500 Subject: comps comps-fe5.xml.in,1.27,1.28 Message-ID: <200603171914.k2HJEvSm029861@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29816 Modified Files: comps-fe5.xml.in Log Message: Make xemacs-el optional, add (optional) xemacs-nox. Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- comps-fe5.xml.in 17 Mar 2006 19:12:16 -0000 1.27 +++ comps-fe5.xml.in 17 Mar 2006 19:14:24 -0000 1.28 @@ -563,8 +563,9 @@ xemacs - xemacs-el + xemacs-el xemacs-info + xemacs-nox xemacs-sumo xemacs-sumo-el xemacs-sumo-info From fedora-extras-commits at redhat.com Fri Mar 17 19:31:22 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:31:22 -0500 Subject: rpms/argus - New directory Message-ID: <200603171931.k2HJVOGp030023@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30015/argus Log Message: Directory /cvs/extras/rpms/argus added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 19:31:27 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:31:27 -0500 Subject: rpms/argus/devel - New directory Message-ID: <200603171931.k2HJVTkt030038@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30015/argus/devel Log Message: Directory /cvs/extras/rpms/argus/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 19:31:41 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:31:41 -0500 Subject: rpms/argus Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603171931.k2HJVhra030073@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30061 Added Files: Makefile import.log Log Message: Setup of module argus --- NEW FILE Makefile --- # Top level Makefile for module argus all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 17 19:31:46 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:31:46 -0500 Subject: rpms/argus/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603171931.k2HJVmOg030093@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30061/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module argus --- NEW 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 Mar 17 19:32:30 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:32:30 -0500 Subject: rpms/argus import.log,1.1,1.2 Message-ID: <200603171933.k2HJX2Tb030221@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30170 Modified Files: import.log Log Message: auto-import argus-2.0.6.fixes.1-7 on branch devel from argus-2.0.6.fixes.1-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/argus/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Mar 2006 19:31:40 -0000 1.1 +++ import.log 17 Mar 2006 19:32:30 -0000 1.2 @@ -0,0 +1 @@ +argus-2_0_6_fixes_1-7:HEAD:argus-2.0.6.fixes.1-7.src.rpm:1142623945 From fedora-extras-commits at redhat.com Fri Mar 17 19:32:36 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:32:36 -0500 Subject: rpms/argus/devel README.fedora, NONE, 1.1 argus-2.0.6.fixes.1-build.patch, NONE, 1.1 argus-2.0.6.fixes.1-makefile.patch, NONE, 1.1 argus-clients-2.0.6.fixes.1-build.patch, NONE, 1.1 argus-clients-2.0.6.fixes.1-makefile.patch, NONE, 1.1 argus-clients-2.0.6.fixes.1-print.patch, NONE, 1.1 argus.init, NONE, 1.1 argus.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603171933.k2HJX8aN030225@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30170/devel Modified Files: .cvsignore sources Added Files: README.fedora argus-2.0.6.fixes.1-build.patch argus-2.0.6.fixes.1-makefile.patch argus-clients-2.0.6.fixes.1-build.patch argus-clients-2.0.6.fixes.1-makefile.patch argus-clients-2.0.6.fixes.1-print.patch argus.init argus.spec Log Message: auto-import argus-2.0.6.fixes.1-7 on branch devel from argus-2.0.6.fixes.1-7.src.rpm --- NEW FILE README.fedora --- Several issues came up during packaging argus for Fedora Extras: 1. the contrib/ subdirectory of the Argus clients source package contains a PERL module, which causes a dependency on PERL, even though the contrib directory was added using %doc, and even though no executable bits were set. Here is a fix, suggested by dgregor on #fedora-extras: dgregor # Filter unwanted Requires: dgregor cat << \EOF > %{name}-req dgregor #!/bin/sh dgregor %{__perl_provides} $* | sed -e '/.*/d' dgregor EOF dgregor %define __perl_requires %{_builddir}/%{name}-%{version}/%{name}-req dgregor chmod +x %{__perl_requires} dgregor It seems like overkill, but everything else I tried get the broken pipe error Currently I'm hoping for a fix to rpmbuild, allowing something like '%doc(nodeps) foo' in a spec file. If that doesn't pan out, the above solution will do the trick. Alternatively, creating a perl-Argus rpm from the material in contrib is a possibility. 2. aside from build and makefile patches (fixing gcc 4.0.2 and DESTDIR issues, respectively), I added an output formatting patch from Peter Van Epp which can be found on the Argus mailing list archives (https://lists.andrew.cmu.edu/mailman/listinfo/argus-info) This and other fixes will be incorporated upstream into a new release, as indicated by Argus's author on the list. argus-2.0.6.fixes.1-build.patch: --- NEW FILE argus-2.0.6.fixes.1-build.patch --- diff -NarU5 argus-2.0.6.fixes.1.orig/common/argus_parse.c argus-2.0.6.fixes.1/common/argus_parse.c --- argus-2.0.6.fixes.1.orig/common/argus_parse.c 2004-02-23 10:00:36.000000000 -0500 +++ argus-2.0.6.fixes.1/common/argus_parse.c 2006-02-24 12:00:56.000000000 -0500 @@ -1783,12 +1783,11 @@ int ArgusReadSaslStreamSocket (struct ARGUS_INPUT *input) { int retn = 0, fd = input->fd, cnt; unsigned int value = 0, *pvalue = &value; - struct ArgusRecord *argus = NULL; - char *output = NULL, *end = NULL, *ptr = NULL; + char *argus = NULL, *output = NULL, *end = NULL, *ptr = NULL; unsigned int outputlen = 0; if ((retn = sasl_getprop(input->sasl_conn, SASL_MAXOUTBUF, (void **) &pvalue)) != SASL_OK) ArgusLog (LOG_ERR, "ArgusReadSaslStreamSocket: sasl_getprop %s\n", strerror(errno)); @@ -1808,26 +1807,26 @@ ArgusDebug (5, "ArgusReadSaslStreamSocket (0x%x) sasl_decoded %d bytes\n", input, outputlen); #endif ptr += cnt; if (outputlen) { - argus = (struct ArgusRecord *) output; + argus = output; end = output + outputlen; - while ((char *)argus < end) { - input->ArgusReadSocketCnt = ntohs(argus->ahdr.length); + while (argus < end) { + input->ArgusReadSocketCnt = ntohs(((struct ArgusRecord *)argus)->ahdr.length); bcopy (argus, input->ArgusReadBuffer, input->ArgusReadSocketCnt); - if (ArgusHandleDatum (argus, &ArgusFilterCode) == 1) { + if (ArgusHandleDatum ((struct ArgusRecord *)argus, &ArgusFilterCode) == 1) { if (!input->filename) write (fd, "DONE: ", strlen("DONE: ")); retn = 1; break; } else - (char *)argus += input->ArgusReadSocketCnt; + argus += input->ArgusReadSocketCnt; } free (output); input->ArgusSaslBufCnt -= cnt; diff -NarU5 argus-2.0.6.fixes.1.orig/common/gencode.c argus-2.0.6.fixes.1/common/gencode.c --- argus-2.0.6.fixes.1.orig/common/gencode.c 2004-02-23 10:00:36.000000000 -0500 +++ argus-2.0.6.fixes.1/common/gencode.c 2006-02-24 11:54:41.000000000 -0500 @@ -57,11 +57,11 @@ #include #include #include #include -#include +#include #include #include #include #include diff -NarU5 argus-2.0.6.fixes.1.orig/server/ArgusOutput.c argus-2.0.6.fixes.1/server/ArgusOutput.c --- argus-2.0.6.fixes.1.orig/server/ArgusOutput.c 2004-02-23 10:00:36.000000000 -0500 +++ argus-2.0.6.fixes.1/server/ArgusOutput.c 2006-02-24 11:54:41.000000000 -0500 @@ -1196,11 +1196,11 @@ void ArgusCheckClientStatus () { int retn, fd; struct sockaddr from; - int len = sizeof (from); + socklen_t len = sizeof (from); if ((fd = accept (ArgusLfd, (struct sockaddr *)&from, &len)) > 0) { if ((fcntl (fd, F_SETFL, O_NONBLOCK)) >= 0) { if (ArgusTcpWrapper (fd, &from) >= 0) { int i; argus-2.0.6.fixes.1-makefile.patch: --- NEW FILE argus-2.0.6.fixes.1-makefile.patch --- diff -NarU5 argus-2.0.6.fixes.1.orig/common/Makefile.in argus-2.0.6.fixes.1/common/Makefile.in --- argus-2.0.6.fixes.1.orig/common/Makefile.in 2004-02-23 10:00:36.000000000 -0500 +++ argus-2.0.6.fixes.1/common/Makefile.in 2006-03-15 11:08:37.000000000 -0500 @@ -144,18 +144,18 @@ version.c: $(srcdir)/../VERSION @rm -f $@ sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@ install: force - [ -d $(LIBDEST) ] || \ - (mkdir -p $(LIBDEST); chmod 755 $(LIBDEST)) + [ -d $(DESTDIR)/$(LIBDEST) ] || \ + (mkdir -p $(DESTDIR)/$(LIBDEST); chmod 755 $(DESTDIR)/$(LIBDEST)) - $(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a - $(INSTALL) $(srcdir)/../lib/argus_parse.a $(LIBDEST)/argus_parse.a + $(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a + $(INSTALL) $(srcdir)/../lib/argus_parse.a $(DESTDIR)/$(LIBDEST)/argus_parse.a - $(RANLIB) $(LIBDEST)/argus_common.a - $(RANLIB) $(LIBDEST)/argus_parse.a + $(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a + $(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_parse.a clean: rm -f $(CLEANFILES) distclean: diff -NarU5 argus-2.0.6.fixes.1.orig/Makefile.in argus-2.0.6.fixes.1/Makefile.in --- argus-2.0.6.fixes.1.orig/Makefile.in 2004-04-13 01:32:58.000000000 -0400 +++ argus-2.0.6.fixes.1/Makefile.in 2006-03-15 11:08:37.000000000 -0500 @@ -29,14 +29,14 @@ LIBS = @LIBS@ CFLAGS = -g LDFLAGS = -g -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ -docdir = $(prefix)/share/doc/argus-2.0 +#docdir = $(prefix)/share/doc/argus-2.0 #### End of system configuration section. #### SHELL = /bin/sh @@ -62,82 +62,82 @@ .PHONY: all install: force ${MAKE} installdirs - [ -d $(prefix) ] || \ - (mkdir -p $(prefix); chmod 755 $(prefix)) + [ -d $(DESTDIR)/$(prefix) ] || \ + (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix)) - [ -d @sbindir@ ] || \ - (mkdir -p @sbindir@; chmod 755 @sbindir@) + [ -d $(DESTDIR)/@sbindir@ ] || \ + (mkdir -p $(DESTDIR)/@sbindir@; chmod 755 $(DESTDIR)/@sbindir@) - [ -d $(exec_prefix)/argus ] || \ - (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus) - - [ -d $(exec_prefix)/argus/archive ] || \ - (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive) - - [ -d $(docdir) ] || \ - (mkdir -p $(docdir); chmod 755 $(docdir)) - - [ -d $(docdir)/html ] || \ - (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html) - - [ -d $(docdir)/html/man ] || \ - (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man) +# [ -d $(exec_prefix)/argus ] || \ +# (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus) +# +# [ -d $(exec_prefix)/argus/archive ] || \ +# (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive) +# +# [ -d $(docdir) ] || \ +# (mkdir -p $(docdir); chmod 755 $(docdir)) +# +# [ -d $(docdir)/html ] || \ +# (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html) +# +# [ -d $(docdir)/html/man ] || \ +# (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man) @-for d in $(DIRS); \ do \ (cd $$d; echo "### Make install in" `pwd`; \ $(MAKE) $(MFLAGS) install; \ echo "### Done with" `pwd`); \ done - $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir) - $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir) - $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man - - $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus - $(INSTALL) -m 0644 $(srcdir)/README $(docdir) - $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus - $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir) - - $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug - - [ -d @mandir@ ] || \ - (mkdir -p @mandir@; chmod 755 @mandir@) - [ -d @mandir@/man1 ] || \ - (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1) - [ -d @mandir@/man5 ] || \ - (mkdir -p @mandir@/man5; chmod 755 @mandir@/man5) - [ -d @mandir@/man8 ] || \ - (mkdir -p @mandir@/man8; chmod 755 @mandir@/man8) - $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.5 @mandir@/man5/argus.5 - $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.conf.5 @mandir@/man5/argus.conf.5 - $(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5 - - $(INSTALL) -m 0644 $(srcdir)/man/man8/argus.8 @mandir@/man8/argus.8 - - $(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 @mandir@/man1/ra.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 @mandir@/man1/racount.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 @mandir@/man1/ragator.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 @mandir@/man1/ramon.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rapolicy.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rasort.1 - $(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 @mandir@/man1/raxml.1 +# $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man +# +# $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus +# $(INSTALL) -m 0644 $(srcdir)/README $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus +# $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir) +# +# $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug + + [ -d $(DESTDIR)/@mandir@ ] || \ + (mkdir -p $(DESTDIR)/@mandir@; chmod 755 $(DESTDIR)/@mandir@) +# [ -d @mandir@/man1 ] || \ +# (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1) + [ -d $(DESTDIR)/@mandir@/man5 ] || \ + (mkdir -p $(DESTDIR)/@mandir@/man5; chmod 755 $(DESTDIR)/@mandir@/man5) + [ -d $(DESTDIR)/@mandir@/man8 ] || \ + (mkdir -p $(DESTDIR)/@mandir@/man8; chmod 755 $(DESTDIR)/@mandir@/man8) + $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.5 $(DESTDIR)/@mandir@/man5/argus.5 + $(INSTALL) -m 0644 $(srcdir)/man/man5/argus.conf.5 $(DESTDIR)/@mandir@/man5/argus.conf.5 +# $(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 @mandir@/man5/rarc.5 + + $(INSTALL) -m 0644 $(srcdir)/man/man8/argus.8 $(DESTDIR)/@mandir@/man8/argus.8 + +# $(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 @mandir@/man1/ra.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 @mandir@/man1/racount.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 @mandir@/man1/ragator.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 @mandir@/man1/ramon.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rapolicy.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 @mandir@/man1/rasort.1 +# $(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 @mandir@/man1/raxml.1 uninstall: - rm -f @mandir@/man5/argus.5 - rm -f @mandir@/man5/argus.conf.5 - rm -f @mandir@/man8/argus.8 - - rm -rf $(docdir) - rm -f $(exec_prefix)/argus/COPYING - rm -f $(exec_prefix)/argus/README + rm -f $(DESTDIR)/@mandir@/man5/argus.5 + rm -f $(DESTDIR)/@mandir@/man5/argus.conf.5 + rm -f $(DESTDIR)/@mandir@/man8/argus.8 + +# rm -rf $(docdir) +# rm -f $(exec_prefix)/argus/COPYING +# rm -f $(exec_prefix)/argus/README installdirs: - ${srcdir}/config/mkinstalldirs $(bindir) $(infodir) + ${srcdir}/config/mkinstalldirs $(DESTDIR)/$(bindir) $(DESTDIR)/$(infodir) Makefile: Makefile.in config.status $(SHELL) config.status config.status: configure diff -NarU5 argus-2.0.6.fixes.1.orig/server/Makefile.in argus-2.0.6.fixes.1/server/Makefile.in --- argus-2.0.6.fixes.1.orig/server/Makefile.in 2004-02-23 10:00:36.000000000 -0500 +++ argus-2.0.6.fixes.1/server/Makefile.in 2006-03-15 11:09:04.000000000 -0500 @@ -41,11 +41,11 @@ # # Various configurable paths (remember to edit Makefile.in, not Makefile) # # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of directory to install the system binaries SBINDIR = @sbindir@ # Pathname of directory to install the system binaries BINDIR = @bindir@ @@ -131,16 +131,16 @@ @rm -f $@ sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@ install: force - [ -d $(prefix) ] || \ - (mkdir -p $(prefix); chmod 755 $(prefix)) - [ -d $(SBINDIR) ] || \ - (mkdir -p $(SBINDIR); chmod 755 $(SBINDIR)) + [ -d $(DESTDIR)/$(prefix) ] || \ + (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix)) + [ -d $(DESTDIR)/$(SBINDIR) ] || \ + (mkdir -p $(DESTDIR)/$(SBINDIR); chmod 755 $(DESTDIR)/$(SBINDIR)) - $(INSTALL) $(srcdir)/../bin/argus_ at V_PCAP@ $(SBINDIR)/argus + $(INSTALL) $(srcdir)/../bin/argus_ at V_PCAP@ $(DESTDIR)/$(SBINDIR)/argus clean: rm -f $(CLEANFILES) distclean: argus-clients-2.0.6.fixes.1-build.patch: --- NEW FILE argus-clients-2.0.6.fixes.1-build.patch --- diff -NarU5 argus-clients-2.0.6.fixes.1.orig/common/argus_parse.c argus-clients-2.0.6.fixes.1/common/argus_parse.c --- argus-clients-2.0.6.fixes.1.orig/common/argus_parse.c 2003-12-06 12:42:13.000000000 -0500 +++ argus-clients-2.0.6.fixes.1/common/argus_parse.c 2006-02-24 14:06:04.000000000 -0500 @@ -2202,12 +2202,11 @@ int ArgusReadSaslStreamSocket (struct ARGUS_INPUT *input) { int retn = 0, fd = input->fd, cnt = 0; unsigned int val = 0, *pval = &val; - struct ArgusRecord *argus = NULL; - char *output = NULL, *end = NULL, *ptr = NULL; + char *argus = NULL, *output = NULL, *end = NULL, *ptr = NULL; unsigned int outputlen = 0; if ((retn = sasl_getprop(input->sasl_conn, SASL_MAXOUTBUF, (void **) &pval)) != SASL_OK) ArgusLog (LOG_ERR, "ArgusReadSaslStreamSocket: sasl_getprop %s", strerror(errno)); @@ -2226,26 +2225,26 @@ if ((retn = sasl_decode (input->sasl_conn, ptr, cnt, &output, &outputlen)) == SASL_OK) { #ifdef ARGUSDEBUG ArgusDebug (5, "ArgusReadSaslStreamSocket (0x%x) sasl_decoded %d bytes\n", input, outputlen); #endif if (outputlen) { - argus = (struct ArgusRecord *) output; + argus = output; end = output + outputlen; - while ((char *)argus < end) { - input->ArgusReadSocketCnt = ntohs(argus->ahdr.length); - bcopy ((char *) argus, input->ArgusReadBuffer, input->ArgusReadSocketCnt); + while (argus < end) { + input->ArgusReadSocketCnt = ntohs(((struct ArgusRecord *)argus)->ahdr.length); + bcopy (argus, input->ArgusReadBuffer, input->ArgusReadSocketCnt); - if (ArgusHandleDatum (argus, &ArgusFilterCode) == 1) { + if (ArgusHandleDatum ((struct ArgusRecord *)argus, &ArgusFilterCode) == 1) { if (Sflag) ArgusWriteConnection (input, "DONE: ", strlen("DONE: ")); retn = 1; break; } else - (char *)argus += input->ArgusReadSocketCnt; + argus += input->ArgusReadSocketCnt; } free (output); } diff -NarU5 argus-clients-2.0.6.fixes.1.orig/common/gencode.c argus-clients-2.0.6.fixes.1/common/gencode.c --- argus-clients-2.0.6.fixes.1.orig/common/gencode.c 2004-04-26 12:30:23.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/common/gencode.c 2006-02-24 14:05:56.000000000 -0500 @@ -230,11 +230,11 @@ #include #include -static u_int ArgusNetMask; +u_int ArgusNetMask; static int snaplen; int ArgusFilterCompile(struct bpf_program *program, char *buf, int optimize, unsigned int mask) { argus-clients-2.0.6.fixes.1-makefile.patch: --- NEW FILE argus-clients-2.0.6.fixes.1-makefile.patch --- diff -NarU5 argus-clients-2.0.6.fixes.1.orig/clients/Makefile.in argus-clients-2.0.6.fixes.1/clients/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/clients/Makefile.in 2003-07-10 13:28:32.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/clients/Makefile.in 2006-02-24 14:35:36.000000000 -0500 @@ -42,11 +42,11 @@ # # Various configurable paths (remember to edit Makefile.in, not Makefile) # # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of install directory # Pathname of directory to install the system binaries SBINDIR = @sbindir@ @@ -163,17 +163,17 @@ OBJ = $(SRC:.c=.o) CLEANFILES = $(OBJ) $(PROGS) install: force - [ -d $(prefix) ] || \ - (mkdir -p $(prefix); chmod 755 $(prefix)) + [ -d $(DESTDIR)/$(prefix) ] || \ + (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix)) - [ -d $(BINDIR) ] || \ - (mkdir -p $(BINDIR); chmod 755 $(BINDIR)) + [ -d $(DESTDIR)/$(BINDIR) ] || \ + (mkdir -p $(DESTDIR)/$(BINDIR); chmod 755 $(DESTDIR)/$(BINDIR)) - $(INSTALL) $(srcdir)/../bin/ra* $(BINDIR) + $(INSTALL) $(srcdir)/../bin/ra* $(DESTDIR)/$(BINDIR) clean: rm -f $(CLEANFILES) distclean: diff -NarU5 argus-clients-2.0.6.fixes.1.orig/common/Makefile.in argus-clients-2.0.6.fixes.1/common/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/common/Makefile.in 2003-07-10 13:28:32.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/common/Makefile.in 2006-02-24 14:35:36.000000000 -0500 @@ -19,11 +19,11 @@ # # Various configurable paths (remember to edit Makefile.in, not Makefile) # # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of directory to install the include files INCLDEST = @includedir@ # Pathname of directory to install the library LIBDEST = @libdir@ @@ -129,18 +129,18 @@ version.c: $(srcdir)/../VERSION @rm -f $@ sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@ install: force all - [ -d $(LIBDEST) ] || \ - (mkdir -p $(LIBDEST); chmod 755 $(LIBDEST)) + [ -d $(DESTDIR)/$(LIBDEST) ] || \ + (mkdir -p $(DESTDIR)/$(LIBDEST); chmod 755 $(DESTDIR)/$(LIBDEST)) - $(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a - $(INSTALL) $(srcdir)/../lib/argus_parse.a $(LIBDEST)/argus_parse.a + $(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a + $(INSTALL) $(srcdir)/../lib/argus_parse.a $(DESTDIR)/$(LIBDEST)/argus_parse.a - $(RANLIB) $(LIBDEST)/argus_common.a - $(RANLIB) $(LIBDEST)/argus_parse.a + $(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a + $(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_parse.a clean: rm -f $(CLEANFILES) distclean: diff -NarU5 argus-clients-2.0.6.fixes.1.orig/Makefile.in argus-clients-2.0.6.fixes.1/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/Makefile.in 2003-07-10 13:28:29.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/Makefile.in 2006-02-24 14:35:36.000000000 -0500 @@ -27,14 +27,14 @@ LIBS = @LIBS@ CFLAGS = -g LDFLAGS = -g -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ -docdir = $(prefix)/share/doc/argus-2.0 +#docdir = $(prefix)/share/doc/argus-2.0 #### End of system configuration section. #### SHELL = /bin/sh @@ -63,108 +63,109 @@ .PHONY: all install: force make installdirs - [ -d $(prefix) ] || \ - (mkdir -p $(prefix); chmod 755 $(prefix)) + [ -d $(DESTDIR)/$(prefix) ] || \ + (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix)) - [ -d @sbindir@ ] || \ - (mkdir -p @sbindir@; chmod 755 @sbindir@) +# [ -d @sbindir@ ] || \ +# (mkdir -p @sbindir@; chmod 755 @sbindir@) - [ -d @bindir@ ] || \ - (mkdir -p @bindir@; chmod 755 @bindir@) + [ -d $(DESTDIR)/@bindir@ ] || \ + (mkdir -p $(DESTDIR)/@bindir@; chmod 755 $(DESTDIR)/@bindir@) - [ -d $(exec_prefix)/argus ] || \ - (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus) - - [ -d $(exec_prefix)/argus/archive ] || \ - (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive) - - [ -d $(docdir) ] || \ - (mkdir -p $(docdir); chmod 755 $(docdir)) - - [ -d $(docdir)/html ] || \ - (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html) - - [ -d $(docdir)/html/man ] || \ - (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man) +# [ -d $(exec_prefix)/argus ] || \ +# (mkdir -p $(exec_prefix)/argus; chmod 755 $(exec_prefix)/argus) +# +# [ -d $(exec_prefix)/argus/archive ] || \ +# (mkdir -p $(exec_prefix)/argus/archive; chmod 755 $(exec_prefix)/argus/archive) +# +# [ -d $(docdir) ] || \ +# (mkdir -p $(docdir); chmod 755 $(docdir)) +# +# [ -d $(docdir)/html ] || \ +# (mkdir -p $(docdir)/html; chmod 755 $(docdir)/html) +# +# [ -d $(docdir)/html/man ] || \ +# (mkdir -p $(docdir)/html/man; chmod 755 $(docdir)/html/man) @for i in $(DIRS) ; do \ if [ -d $$i ] ; then \ echo "making in $$i"; \ cd $$i; \ make install; \ cd ..; \ fi; \ done - $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir) - $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir) - $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man - - $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus - $(INSTALL) -m 0644 $(srcdir)/README $(docdir) - $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus - $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir) - - $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug - - [ -d @mandir@ ] || \ - (mkdir -p @mandir@; chmod 755 @mandir@) - [ -d @mandir@/man1 ] || \ - (mkdir -p @mandir@/man1; chmod 755 @mandir@/man1) +# $(INSTALL) -m 0644 $(srcdir)/doc/FAQ $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/doc/HOW-TO $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/doc/html/man/*.html $(docdir)/html/man +# +# $(INSTALL) -m 0644 $(srcdir)/README $(prefix)/argus +# $(INSTALL) -m 0644 $(srcdir)/README $(docdir) +# $(INSTALL) -m 0644 $(srcdir)/COPYING $(prefix)/argus +# $(INSTALL) -m 0644 $(srcdir)/COPYING $(docdir) +# +# $(INSTALL) -m 0755 $(srcdir)/bin/argusbug @bindir@/argusbug + + [ -d $(DESTDIR)/@mandir@ ] || \ + (mkdir -p $(DESTDIR)/@mandir@; chmod 755 $(DESTDIR)/@mandir@) + [ -d $(DESTDIR)/@mandir@/man1 ] || \ + (mkdir -p $(DESTDIR)/@mandir@/man1; chmod 755 $(DESTDIR)/@mandir@/man1) $(INSTALL) -m 0644 $(srcdir)/man/man1/ra.1 \ - @mandir@/man1/ra.1 + $(DESTDIR)/@mandir@/man1/ra.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/racount.1 \ - @mandir@/man1/racount.1 + $(DESTDIR)/@mandir@/man1/racount.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/ragator.1 \ - @mandir@/man1/ragator.1 + $(DESTDIR)/@mandir@/man1/ragator.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/rahosts.1 \ - @mandir@/man1/rahosts.1 + $(DESTDIR)/@mandir@/man1/rahosts.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/ramon.1 \ - @mandir@/man1/ramon.1 + $(DESTDIR)/@mandir@/man1/ramon.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/ranonymize.1 \ - @mandir@/man1/ranonymize.1 + $(DESTDIR)/@mandir@/man1/ranonymize.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/rapolicy.1 \ - @mandir@/man1/rapolicy.1 + $(DESTDIR)/@mandir@/man1/rapolicy.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/rasort.1 \ - @mandir@/man1/rasort.1 + $(DESTDIR)/@mandir@/man1/rasort.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/rastrip.1 \ - @mandir@/man1/rastrip.1 + $(DESTDIR)/@mandir@/man1/rastrip.1 $(INSTALL) -m 0644 $(srcdir)/man/man1/raxml.1 \ - @mandir@/man1/raxml.1 - [ -d @mandir@/man5 ] || \ - (mkdir -p @mandir@/man5; chmod 755 @mandir@/man5) + $(DESTDIR)/@mandir@/man1/raxml.1 + [ -d $(DESTDIR)/@mandir@/man5 ] || \ + (mkdir -p $(DESTDIR)/@mandir@/man5; chmod 755 $(DESTDIR)/@mandir@/man5) $(INSTALL) -m 0644 $(srcdir)/man/man5/rarc.5 \ - @mandir@/man5/rarc.5 + $(DESTDIR)/@mandir@/man5/rarc.5 + uninstall: - rm -f @bindir@/argusbug - rm -f @bindir@/ra - rm -f @bindir@/racount - rm -f @bindir@/ragator - rm -f @bindir@/rahistogram - rm -f @bindir@/rahosts - rm -f @bindir@/rarpwatch - rm -f @bindir@/raseq - rm -f @bindir@/rasrvstats - rm -f @bindir@/ratop - rm -f @bindir@/raxml - - rm -f @mandir@/man1/ra.1 - rm -f @mandir@/man1/racount.1 - rm -f @mandir@/man1/ragator.1 - rm -f @mandir@/man1/rasort.1 - rm -f @mandir@/man1/raxml.1 - rm -f @mandir@/man1/tcpdump.1 - rm -f @mandir@/man5/argus.5 - rm -f @mandir@/man5/argus.conf.5 - rm -f @mandir@/man5/rarc.5 - - rm -rf $(docdir) - rm -f $(exec_prefix)/argus/COPYING - rm -f $(exec_prefix)/argus/README + rm -f $(DESTDIR)/@bindir@/argusbug + rm -f $(DESTDIR)/@bindir@/ra + rm -f $(DESTDIR)/@bindir@/racount + rm -f $(DESTDIR)/@bindir@/ragator + rm -f $(DESTDIR)/@bindir@/rahistogram + rm -f $(DESTDIR)/@bindir@/rahosts + rm -f $(DESTDIR)/@bindir@/rarpwatch + rm -f $(DESTDIR)/@bindir@/raseq + rm -f $(DESTDIR)/@bindir@/rasrvstats + rm -f $(DESTDIR)/@bindir@/ratop + rm -f $(DESTDIR)/@bindir@/raxml + + rm -f $(DESTDIR)/@mandir@/man1/ra.1 + rm -f $(DESTDIR)/@mandir@/man1/racount.1 + rm -f $(DESTDIR)/@mandir@/man1/ragator.1 + rm -f $(DESTDIR)/@mandir@/man1/rasort.1 + rm -f $(DESTDIR)/@mandir@/man1/raxml.1 + rm -f $(DESTDIR)/@mandir@/man1/tcpdump.1 + rm -f $(DESTDIR)/@mandir@/man5/argus.5 + rm -f $(DESTDIR)/@mandir@/man5/argus.conf.5 + rm -f $(DESTDIR)/@mandir@/man5/rarc.5 + + #rm -rf $(docdir) + #rm -f $(exec_prefix)/argus/COPYING + #rm -f $(exec_prefix)/argus/README installdirs: ${srcdir}/config/mkinstalldirs $(bindir) $(infodir) Makefile: Makefile.in config.status diff -NarU5 argus-clients-2.0.6.fixes.1.orig/ragraph/Makefile.in argus-clients-2.0.6.fixes.1/ragraph/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/ragraph/Makefile.in 2003-07-10 13:28:32.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/ragraph/Makefile.in 2006-02-24 14:35:36.000000000 -0500 @@ -20,11 +20,11 @@ # # Various configurable paths (remember to edit Makefile.in, not Makefile) # # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of directory to install the system binaries SBINDIR = @sbindir@ # Pathname of directory to install the system binaries @@ -92,18 +92,18 @@ OBJ = $(SRC:.c=.o) CLEANFILES = $(OBJ) $(PROGS) install: force all - [ -d $(DESTDIR) ] || \ - (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR)) +# [ -d $(DESTDIR) ] || \ +# (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR)) - [ -d $(BINDIR) ] || \ - (mkdir -p $(BINDIR); chmod 755 $(BINDIR)) + [ -d $(DESTDIR)/$(BINDIR) ] || \ + (mkdir -p $(DESTDIR)/$(BINDIR); chmod 755 $(DESTDIR)/$(BINDIR)) - $(INSTALL) @INSTALL_BIN@/rahistogram $(BINDIR) - $(INSTALL) @INSTALL_BIN@/ragraph $(BINDIR) + $(INSTALL) @INSTALL_BIN@/rahistogram $(DESTDIR)/$(BINDIR) + $(INSTALL) @INSTALL_BIN@/ragraph $(DESTDIR)/$(BINDIR) clean: rm -f $(CLEANFILES) distclean: diff -NarU5 argus-clients-2.0.6.fixes.1.orig/ragrep/Makefile.in argus-clients-2.0.6.fixes.1/ragrep/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/ragrep/Makefile.in 2003-07-10 13:28:32.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/ragrep/Makefile.in 2006-02-24 14:36:43.000000000 -0500 @@ -13,11 +13,11 @@ SHELL = /bin/sh # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of directory to install the system binaries SBINDIR = @sbindir@ # Pathname of directory to install the system binaries @@ -188,16 +188,17 @@ maintainer-clean-binPROGRAMS: install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) $(mkinstalldirs) $(BINDIR) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done +# installation of binaries handled by toplevel makefile +# @list='$(bin_PROGRAMS)'; for p in $$list; do \ +# if test -f $$p; then \ +# echo " $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ +# $(INSTALL_PROGRAM) $$p $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ +# else :; fi; \ +# done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) list='$(bin_PROGRAMS)'; for p in $$list; do \ rm -f $(BINDIR)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ diff -NarU5 argus-clients-2.0.6.fixes.1.orig/ratop/Makefile.in argus-clients-2.0.6.fixes.1/ratop/Makefile.in --- argus-clients-2.0.6.fixes.1.orig/ratop/Makefile.in 2003-07-10 13:28:32.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/ratop/Makefile.in 2006-02-24 14:35:36.000000000 -0500 @@ -19,11 +19,11 @@ # # Various configurable paths (remember to edit Makefile.in, not Makefile) # # Top level hierarchy -prefix = $(DESTDIR)@prefix@ +prefix = @prefix@ exec_prefix = @exec_prefix@ # Pathname of directory to install the system binaries SBINDIR = @sbindir@ # Pathname of directory to install the system binaries BINDIR = @bindir@ @@ -86,18 +86,18 @@ OBJ = $(SRC:.c=.o) CLEANFILES = $(OBJ) $(PROGS) install: force all - [ -d $(DESTDIR) ] || \ - (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR)) - [ -d $(prefix) ] || \ - (mkdir -p $(prefix); chmod 755 $(prefix)) - [ -d $(BINDIR) ] || \ - (mkdir -p $(BINDIR); chmod 755 $(BINDIR)) +# [ -d $(DESTDIR) ] || \ +# (mkdir -p $(DESTDIR); chmod 755 $(DESTDIR)) + [ -d $(DESTDIR)/$(prefix) ] || \ + (mkdir -p $(DESTDIR)/$(prefix); chmod 755 $(DESTDIR)/$(prefix)) + [ -d $(DESTDIR)/$(BINDIR) ] || \ + (mkdir -p $(DESTDIR)/$(BINDIR); chmod 755 $(DESTDIR)/$(BINDIR)) - $(INSTALL) @INSTALL_BIN@/ratop $(BINDIR) + $(INSTALL) @INSTALL_BIN@/ratop $(DESTDIR)/$(BINDIR) clean: rm -f $(CLEANFILES) distclean: argus-clients-2.0.6.fixes.1-print.patch: --- NEW FILE argus-clients-2.0.6.fixes.1-print.patch --- diff -NarU5 argus-clients-2.0.6.fixes.1.orig/common/argus_client.c argus-clients-2.0.6.fixes.1/common/argus_client.c --- argus-clients-2.0.6.fixes.1.orig/common/argus_client.c 2004-05-10 09:41:34.000000000 -0400 +++ argus-clients-2.0.6.fixes.1/common/argus_client.c 2006-03-08 16:37:12.000000000 -0500 @@ -67,10 +67,14 @@ } RaPrintDate = 0; for (x = 0; x < MAX_PRINT_ALG_TYPES; x++) { if (!strncmp (RaPrintKeyWords[x], soption, strlen(RaPrintKeyWords[x]))) { + if (x == 0) { + RaPrintStartTime = 1; + RaPrintLastTime = 1; + } if (x < 3) RaPrintDate++; switch (RaOptionOperation) { case RA_ADD_OPTION: if (RaOptionRank == -1) { int z = 0; @@ -3088,11 +3092,11 @@ } else break; } if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) { - char tmpbuf[128], *ptr = tmpbuf, *str = RaLabel, lastchr = ' '; + char tmpbuf[1024], *ptr = tmpbuf, *str = RaLabel, lastchr = ' '; bzero (tmpbuf, sizeof(tmpbuf)); lastchr = RaFieldDelimiter; while (*str) { if (*str == ' ') { @@ -3118,12 +3122,14 @@ void ArgusPrintDateLabel (char *buf) { if (lflag) ArgusPrintLastDateLabel (buf); - else + else { ArgusPrintStartDateLabel (buf); + ArgusPrintLastDateLabel (buf); + } } void ArgusPrintStartDateLabel (char *buf) @@ -3446,11 +3452,12 @@ if (ArgusDstUserDataLen > 10) len++; sprintf (&buf[strlen(buf)], "%*sdstUdata%*s ", (len)/2, " ", (len)/2, " "); if (len & 0x01) sprintf(&buf[strlen(buf)], " "); } - } + } else + sprintf (&buf[strlen(buf)], " srcUdata%cdstUdata ", RaFieldDelimiter); } void ArgusPrintTCPExtensionsLabel (char *buf) { diff -NarU5 argus-clients-2.0.6.fixes.1.orig/common/argus_util.c argus-clients-2.0.6.fixes.1/common/argus_util.c --- argus-clients-2.0.6.fixes.1.orig/common/argus_util.c 2003-12-06 12:43:56.000000000 -0500 +++ argus-clients-2.0.6.fixes.1/common/argus_util.c 2006-03-08 16:45:56.000000000 -0500 @@ -907,39 +907,31 @@ extern char *ArgusProgramName; void ArgusPrintStartDate (char *date, struct ArgusRecord *ptr) { - char delim = ' '; struct timeval *tvp = NULL; if (ptr->ahdr.type & ARGUS_MAR) tvp = &ptr->argus_mar.startime; else tvp = &ptr->argus_far.time.start; - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - delim = RaFieldDelimiter; - - sprintf (&date[strlen(date)], "%s%c", print_time(tvp), delim); + sprintf (&date[strlen(date)], "%s", print_time(tvp)); } void ArgusPrintLastDate (char *date, struct ArgusRecord *ptr) { - char delim = ' '; struct timeval *tvp = NULL; if (ptr->ahdr.type & ARGUS_MAR) tvp = &ptr->argus_mar.now; else tvp = &ptr->argus_far.time.last; - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - delim = RaFieldDelimiter; - - sprintf (&date[strlen(date)], "%s%c", print_time(tvp), delim); + sprintf (&date[strlen(date)], "%s", print_time(tvp)); } void ArgusPrintDate (char *date, struct ArgusRecord *ptr) { @@ -965,11 +957,11 @@ if (!((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))) if (RaPrintStartTime && RaPrintLastTime) sprintf (&date[strlen(date)], " "); if (RaPrintLastTime) - sprintf (&date[strlen(date)], "%s%c", print_time(last), delim); + sprintf (&date[strlen(date)], "%s", print_time(last)); } void ArgusPrintSrcRate (char *, struct ArgusRecord *); void ArgusPrintDstRate (char *, struct ArgusRecord *); void ArgusPrintRate (char *, struct ArgusRecord *); @@ -1001,21 +993,21 @@ ArgusThisAgr = (struct ArgusAGRStruct *)ArgusThisFarHdrs[ARGUS_AGR_DSR_INDEX]; if (ArgusThisAgr && (ArgusThisAgr->type == ARGUS_AGR_DSR)) hits = ArgusThisAgr->count; - sprintf(&buf[strlen(buf)], "%5d ", hits); + sprintf(&buf[strlen(buf)], "%5d", hits); } } void ArgusPrintAverageDuration (char *, struct ArgusRecord *); void ArgusPrintAvgDuration (char *date, struct ArgusRecord *ptr) { struct ArgusAGRStruct *ArgusThisAgr = NULL; - char *sptr, *iptr, delim = ' '; + char *sptr, *iptr; struct timeval *start = NULL, *last = NULL; struct timeval buf, *time = &buf; if (ptr->ahdr.type & ARGUS_MAR) { start = &ptr->argus_mar.startime; @@ -1063,21 +1055,16 @@ if (pflag) { sptr = &date[strlen(date)]; sprintf(sptr, ".%06d", (int) time->tv_usec); sptr[pflag + 1] = '\0'; } - - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf(&date[strlen(date)], "%c", delim); - else - sprintf(&date[strlen(date)], "%c", ' '); } void ArgusPrintDuration (char *date, struct ArgusRecord *ptr) { - char *sptr, *iptr, delim = ' '; + char *sptr, *iptr; struct timeval *start = NULL, *last = NULL; struct timeval buf, *time = &buf; if (ptr->ahdr.type & ARGUS_MAR) { start = &ptr->argus_mar.startime; @@ -1113,15 +1100,10 @@ if (pflag) { sptr = &date[strlen(date)]; sprintf(sptr, ".%06d", (int) time->tv_usec); sptr[pflag + 1] = '\0'; } - - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf(&date[strlen(date)], "%c", delim); - else - sprintf(&date[strlen(date)], "%c", ' '); } void ArgusGetIndicatorString (struct ArgusRecord *, char *); @@ -1213,12 +1195,10 @@ } } } } - *ptr = RaFieldDelimiter; - } else { int encdone = 0; bcopy (" ", buf, 9); if (argus->ahdr.type & ARGUS_MAR) { @@ -1384,11 +1364,11 @@ if (ArgusInput->ArgusManStart.ahdr.status & ARGUS_ID_IS_IPADDR) argusIDStr = ipaddr_string (&argus->ahdr.argusid); else sprintf (argusIDStr, "%u", argus->ahdr.argusid); - sprintf(buf, "%-15.15s ", argusIDStr); + sprintf(buf, "%-15.15s", argusIDStr); } void ArgusPrintBinNumber (char *, struct ArgusRecord *); void ArgusPrintBins (char *, struct ArgusRecord *); @@ -1402,11 +1382,11 @@ } void ArgusPrintSequenceNumber (char *buf, struct ArgusRecord *argus) { - sprintf(buf, "%d ", argus->ahdr.seqNumber); + sprintf(buf, "%d", argus->ahdr.seqNumber); } void ArgusPrintIndicator (char *buf, struct ArgusRecord *argus) { @@ -1422,14 +1402,25 @@ struct ArgusMacStruct *mac = (struct ArgusMacStruct *) ArgusThisFarHdrs[ARGUS_MAC_DSR_INDEX]; esrcString = etheraddr_string ((u_char *)&mac->phys_union.ether.ethersrc); edstString = etheraddr_string ((u_char *)&mac->phys_union.ether.etherdst); - sprintf (buf, "%17.17s %17.17s ", esrcString, edstString); + sprintf (buf, "%17.17s", esrcString); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); + sprintf (&buf[strlen(buf)], "%17.17s", edstString); - } else - sprintf (buf, "%17.17s %17.17s ", blankStr, blankStr); + } else { + sprintf (buf, "%17.17s", blankStr); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); + sprintf (&buf[strlen(buf)], "%17.17s", blankStr); + } } void ArgusPrintProto (char *buf, struct ArgusRecord *argus) { @@ -1450,14 +1441,14 @@ protoStr = protoStrBuf; sprintf (protoStr, "%u", proto); protoStr = (nflag > 2) ? protoStrBuf : (proto >= IPPROTOSTR) ? "unas" : ip_proto_string[proto]; - if ((proto == IPPROTO_UDP) && (argus->argus_far.flow.ip_flow.tp_p == ARGUS_RTP_FLOWTAG)) + if ((nflag < 3) && (proto == IPPROTO_UDP) && (argus->argus_far.flow.ip_flow.tp_p == ARGUS_RTP_FLOWTAG)) protoStr = "rtp"; - if ((proto == IPPROTO_UDP) && (argus->argus_far.flow.ip_flow.tp_p == ARGUS_RTCP_FLOWTAG)) + if ((nflag < 3) && (proto == IPPROTO_UDP) && (argus->argus_far.flow.ip_flow.tp_p == ARGUS_RTCP_FLOWTAG)) protoStr = "rtcp"; break; } @@ -1466,11 +1457,11 @@ break; } } if (protoStr != NULL) - sprintf (buf, "%4.4s ", protoStr); + sprintf (buf, "%4.4s", protoStr); } int ArgusPrintNet = 0; void @@ -1535,11 +1526,11 @@ { void *addr = NULL; struct ArgusFlow *flow; if (argus->ahdr.type & ARGUS_MAR) { - sprintf (&buf[strlen(buf)], "%*d ", hfield, argus->argus_mar.nextMrSequenceNum); + sprintf (&buf[strlen(buf)], "%*u ", hfield, argus->argus_mar.nextMrSequenceNum); } else { flow = &argus->argus_far.flow; ArgusThisProto = argus->ahdr.status & 0xFFFF; @@ -1593,13 +1584,14 @@ addrstr = etheraddr_string ((unsigned char *) addr); break; } if (addr != NULL) - sprintf (buf, "%*.*s ", thishfield, thishfield, addrstr); + sprintf (buf, "%*.*s", thishfield, thishfield, addrstr); else - sprintf (buf, "%*.*s ", thishfield, thishfield, " "); + sprintf (buf, "%*.*s", thishfield, thishfield, " "); + } void ArgusPrintSrcPort (char *buf, struct ArgusRecord *argus) @@ -1629,12 +1621,10 @@ } case ETHERTYPE_REVARP: case ETHERTYPE_ARP: sprintf (&buf[strlen(buf)], "%*s", pfield - 1, " "); - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf (buf, "%c", RaFieldDelimiter); break; default: ArgusPrintPort (&buf[strlen(buf)], argus, flow->mac_flow.ssap); break; @@ -1648,11 +1638,11 @@ void ArgusPrintDstPort (char *buf, struct ArgusRecord *argus) { if (argus->ahdr.type & ARGUS_MAR) { - sprintf (&buf[strlen(buf)], "%-*d", pfield + 1, argus->argus_mar.flows); + sprintf (&buf[strlen(buf)], "%-*u", pfield + 1, argus->argus_mar.flows); } else { struct ArgusFlow *flow = &argus->argus_far.flow; ArgusThisProto = argus->ahdr.status & 0xFFFF; @@ -1671,13 +1661,10 @@ else sprintf (&buf[strlen(buf)], "%*s", pfield + 1, " "); } else sprintf (&buf[strlen(buf)], "%*s", pfield - 1, " "); - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf (buf, "%c", RaFieldDelimiter); - break; default: ArgusPrintPort (&buf[strlen(buf)], argus, flow->mac_flow.dsap); break; @@ -1697,75 +1684,82 @@ if (port != 0xFFFF) { if (nflag > 1) { switch (proto) { case IPPROTO_TCP: case IPPROTO_UDP: - if (RaPrintIndex > 0) + if ((RaPrintIndex > 0) && ((RaFieldDelimiter == ' ') || + (RaFieldDelimiter == '\0'))) { if ((RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintSrcAddr) || (RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintDstAddr)) if (RaFieldDelimiter == '\0') if (buf[strlen(buf) - 1] == ' ') buf[strlen(buf) - 1] = '.'; + } + + sprintf (buf, "%-*d", thispfield, port); - sprintf (buf, "%-*d ", thispfield, port); break; default: - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf (&buf[strlen(buf)], "%c", RaFieldDelimiter); - else - sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); break; } } else { switch (proto) { case IPPROTO_TCP: case IPPROTO_UDP: - if (RaPrintIndex > 0) + if ((RaPrintIndex > 0) && ((RaFieldDelimiter == ' ') || + (RaFieldDelimiter == '\0'))) { if ((RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintSrcAddr) || (RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintDstAddr)) if (RaFieldDelimiter == '\0') if (buf[strlen(buf) - 1] == ' ') buf[strlen(buf) - 1] = '.'; + } if (proto == IPPROTO_TCP) - sprintf (buf, "%-*.*s ", thispfield, thispfield, tcpport_string(port)); + sprintf (buf, "%-*.*s", thispfield, thispfield, tcpport_string(port)); else - sprintf (buf, "%-*.*s ", thispfield, thispfield, udpport_string(port)); + sprintf (buf, "%-*.*s", thispfield, thispfield, udpport_string(port)); break; default: - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) - sprintf (&buf[strlen(buf)], "%c", RaFieldDelimiter); - else - sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); + break; } } } else { if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) { sprintf (buf, "%c", RaFieldDelimiter); } else { switch (proto) { default: - sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); + sprintf (buf, "%-*.*s", thispfield, thispfield, " "); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf (&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); break; case IPPROTO_TCP: case IPPROTO_UDP: - if (RaPrintIndex > 0) + if ((RaPrintIndex > 0) && ((RaFieldDelimiter == ' ') || + (RaFieldDelimiter == '\0'))) { if ((RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintSrcAddr) || (RaPrintAlgorithms[RaPrintIndex - 1] == ArgusPrintDstAddr)) if (RaFieldDelimiter == '\0') if (buf[strlen(buf) - 1] == ' ') buf[strlen(buf) - 1] = '.'; - + } if (argus->ahdr.status & ARGUS_MERGED) sprintf (buf, "%-*.*s ", thispfield, thispfield, "*"); else - sprintf (buf, "%-*d ", thispfield, port); + sprintf (buf, "%-*d", thispfield, port); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf (&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); break; } } } @@ -1773,20 +1767,13 @@ } default: thispfield -= 2; - if ((ArgusThisProto == 0) && (proto != 0)) { - sprintf (buf, "%-*.*s ", thispfield, thispfield, llcsap_string((unsigned char) port)); - } else { + if ((ArgusThisProto == 0) && (proto != 0)) + sprintf (buf, "%-*.*s", thispfield, thispfield, llcsap_string((unsigned char) port)); - if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) { - sprintf (buf, "%c", RaFieldDelimiter); - } else { - sprintf (buf, "%-*.*s ", thispfield, thispfield, " "); - } - } } } @@ -1967,11 +1954,11 @@ sprintf (dirStr, " <-> "); break; } } - sprintf (buf, "%s ", dirStr); + sprintf (buf, "%s", dirStr); } void ArgusPrintCounts (char *buf, struct ArgusRecord *argus) { @@ -1984,11 +1971,11 @@ } else { src_count = argus->argus_far.src.count; dst_count = argus->argus_far.dst.count; } - sprintf (buf, "%-8u %-8u ", src_count, dst_count); + sprintf (buf, "%-8u%c%-8u", src_count,RaFieldDelimiter, dst_count); } void ArgusPrintSrcPackets (char *buf, struct ArgusRecord *argus) { @@ -1999,11 +1986,11 @@ } else { src_count = argus->argus_far.src.count; } - sprintf (buf, "%-8u ", src_count); + sprintf (buf, "%-8u", src_count); } void ArgusPrintDstPackets (char *buf, struct ArgusRecord *argus) { @@ -2014,11 +2001,11 @@ } else { dst_count = argus->argus_far.dst.count; } - sprintf (buf, "%-8u ", dst_count); + sprintf (buf, "%-8u", dst_count); } void ArgusPrintBytes (char *buf, struct ArgusRecord *argus) { @@ -2036,11 +2023,11 @@ src_bytes = argus->argus_far.src.bytes; dst_bytes = argus->argus_far.dst.bytes; } } - sprintf (buf, "%-12u %-12u", src_bytes, dst_bytes); + sprintf (buf, "%-12u%c%-12u", src_bytes, RaFieldDelimiter, dst_bytes); } void ArgusPrintSrcBytes (char *buf, struct ArgusRecord *argus) { @@ -2075,12 +2062,10 @@ } sprintf (buf, "%-12u", dst_bytes); } - - #include void ArgusPrintSrcJitter (char *buf, struct ArgusRecord *argus) { @@ -2090,12 +2075,12 @@ } void ArgusPrintDstJitter (char *buf, struct ArgusRecord *argus) { - RaPrintSrcTime = 1; - RaPrintDstTime = 0; + RaPrintSrcTime = 0; + RaPrintDstTime = 1; ArgusPrintJitter (buf, argus); } void ArgusPrintJitter (char *buf, struct ArgusRecord *argus) @@ -2145,15 +2130,22 @@ sprintf (stdstr, "%d.%03d", istdev/1000, istdev%1000); stdstr[6] = '\0'; sprintf (jitterstr, "%6d.%03d (%6s)", meanval/1000, meanval%1000, stdstr); */ sprintf (jitterstr, "%6d.%03d", meanval/1000, meanval%1000); - sprintf (&buf[strlen(buf)], "%-12s ", jitterstr); + sprintf (&buf[strlen(buf)], "%-12s", jitterstr); } else { sprintf (jitterstr, "%6d.%03d", meanval/1000, meanval%1000); - sprintf (&buf[strlen(buf)], "%-12s ", jitterstr); + sprintf (&buf[strlen(buf)], "%-12s", jitterstr); + } + + if (RaPrintDstTime) { + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); } } if (RaPrintDstTime) { bzero (stdstr, 128); @@ -2318,16 +2310,21 @@ else sprintf (ptr, "%.2f", 0.0); sprintf (buf, "%10s", ptr); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); + if (dst_count > 1) sprintf (ptr, "%.2f", ((double)(dst_count)/seconds)); else sprintf (ptr, "%.2f", 0.0); - sprintf (&buf[strlen(buf)], "%10s ", ptr); + sprintf (&buf[strlen(buf)], "%10s", ptr); } /* struct ArgusTCPObjectMetrics { @@ -2441,15 +2438,23 @@ seconds = (double)(time->tv_sec * 1.0) + (double)(time->tv_usec/1000000.0); if (seconds) { sprintf (ptr, "%.4f", ((double)srcLossPkts)); sprintf (buf, "%10s", ptr); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); sprintf (ptr, "%.4f", ((double)dstLossPkts)); - sprintf (&buf[strlen(buf)], "%10s ", ptr); + sprintf (&buf[strlen(buf)], "%10s", ptr); } else { sprintf (ptr, "%.4f", 0.0); sprintf (buf, "%10s", ptr); + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); + else + sprintf(&buf[strlen(buf)], "%c", ' '); sprintf (ptr, "%.4f", 0.0); sprintf (&buf[strlen(buf)], "%10s ", ptr); } } } @@ -2490,14 +2495,14 @@ src_bytes = argus->argus_far.src.bytes; } if (seconds) { sprintf (ptr, "%.2f", ((double)(src_bytes * 8.0))/seconds); - sprintf (&buf[strlen(buf)], "%11s ", ptr); + sprintf (&buf[strlen(buf)], "%11s", ptr); } else { sprintf (ptr, "%.2f", 0.0); - sprintf (&buf[strlen(buf)], "%11s ", ptr); + sprintf (&buf[strlen(buf)], "%11s", ptr); } } void @@ -2536,24 +2541,24 @@ dst_bytes = argus->argus_far.dst.bytes; } if (seconds) { sprintf (ptr, "%.2f", ((double)(dst_bytes * 8.0))/seconds); - sprintf (&buf[strlen(buf)], "%13s ", ptr); + sprintf (&buf[strlen(buf)], "%13s", ptr); } else { sprintf (ptr, "%.2f", 0.0); - sprintf (&buf[strlen(buf)], "%13s ", ptr); + sprintf (&buf[strlen(buf)], "%13s", ptr); } } void ArgusPrintLoad (char *buf, struct ArgusRecord *argus) { int src_count = 0, dst_count = 0, src_bytes = 0, dst_bytes = 0; struct timeval *start = NULL, *last = NULL; struct timeval timebuf, *time = &timebuf; - char tmpbuf[128], *ptr = tmpbuf; + char tmpbuf[128], *ptr = tmpbuf, delim = ' '; double seconds; start = &argus->argus_far.time.start; last = &argus->argus_far.time.last; @@ -2581,21 +2586,24 @@ dst_bytes = argus->argus_far.dst.appbytes; } else { src_bytes = argus->argus_far.src.bytes; dst_bytes = argus->argus_far.dst.bytes; } + + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + delim = RaFieldDelimiter; if (seconds) { sprintf (ptr, "%.2f", ((double)(src_bytes * 8.0))/seconds); - sprintf (buf, "%13s", ptr); + sprintf (buf, "%13s%c", ptr, delim); sprintf (ptr, "%.2f", ((double)(dst_bytes * 8.0))/seconds); - sprintf (&buf[strlen(buf)], "%13s ", ptr); + sprintf (&buf[strlen(buf)], "%13s", ptr); } else { sprintf (ptr, "%.2f", 0.0); - sprintf (buf, "%13s", ptr); + sprintf (buf, "%13s%c", ptr, delim); sprintf (ptr, "%.2f", 0.0); - sprintf (&buf[strlen(buf)], "%13s ", ptr); + sprintf (&buf[strlen(buf)], "%13s", ptr); } } void ArgusPrintSrcTTL (char *buf, struct ArgusRecord *argus) @@ -2606,13 +2614,13 @@ for (i = 1; i < 257; i <<= 1) { if ((sdis < 0) && (argus->argus_far.attr_ip.sttl <= i)) { sdis = i - argus->argus_far.attr_ip.sttl; } } - sprintf (&buf[strlen(buf)], " %3d ", sdis); + sprintf (&buf[strlen(buf)], " %3d", sdis); } else - sprintf (&buf[strlen(buf)], " %3d ", argus->argus_far.attr_ip.sttl); + sprintf (&buf[strlen(buf)], " %3d", argus->argus_far.attr_ip.sttl); } void ArgusPrintDstTTL (char *buf, struct ArgusRecord *argus) { @@ -2622,63 +2630,74 @@ for (i = 1; i < 257; i <<= 1) { if ((ddis < 0) && (argus->argus_far.attr_ip.dttl <= i)) { ddis = i - argus->argus_far.attr_ip.dttl; } } - sprintf (&buf[strlen(buf)], " %3d ", ddis); + sprintf (&buf[strlen(buf)], " %3d", ddis); } else - sprintf (&buf[strlen(buf)], " %3d ", argus->argus_far.attr_ip.dttl); + sprintf (&buf[strlen(buf)], " %3d", argus->argus_far.attr_ip.dttl); } void ArgusPrintVLAN (char *buf, struct ArgusRecord *argus) { if (ArgusThisFarStatus & ARGUS_VLAN_DSR_STATUS) { struct ArgusVlanStruct *vlan = (struct ArgusVlanStruct *) ArgusThisFarHdrs[ARGUS_VLAN_DSR_INDEX]; if (vlan->status & ARGUS_SRC_VLAN) - sprintf (&buf[strlen(buf)], "0x%04x ", vlan->sid); + sprintf (&buf[strlen(buf)], "0x%04x%c", vlan->sid, RaFieldDelimiter); else - sprintf(&buf[strlen(buf)], " "); + if (RaFieldDelimiter == ' ') + sprintf(&buf[strlen(buf)], " "); + else + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); if (vlan->status & ARGUS_DST_VLAN) - sprintf (&buf[strlen(buf)], "0x%04x ", vlan->did); + sprintf (&buf[strlen(buf)], "0x%04x", vlan->did); else - sprintf(&buf[strlen(buf)], " "); + if (RaFieldDelimiter == ' ') + sprintf(&buf[strlen(buf)], " "); } else - sprintf (&buf[strlen(buf)], " "); + if (RaFieldDelimiter == ' ') + sprintf (&buf[strlen(buf)], " "); + else + sprintf(&buf[strlen(buf)], "%c", RaFieldDelimiter); } void ArgusPrintMPLS (char *buf, struct ArgusRecord *argus) { if (ArgusThisFarStatus & ARGUS_MPLS_DSR_STATUS) { struct ArgusMplsStruct *mpls = (struct ArgusMplsStruct *) ArgusThisFarHdrs[ARGUS_MPLS_DSR_INDEX]; if (mpls->status & ARGUS_SRC_MPLS) - sprintf (&buf[strlen(buf)], " %5x ", mpls->slabel); + sprintf (&buf[strlen(buf)], "%5x%c", mpls->slabel, RaFieldDelimiter); else - sprintf(&buf[strlen(buf)], " "); + sprintf(&buf[strlen(buf)], " %c", RaFieldDelimiter); if (mpls->status & ARGUS_DST_MPLS) - sprintf (&buf[strlen(buf)], " %5x ", mpls->dlabel); + sprintf (&buf[strlen(buf)], "%5x", mpls->dlabel); else - sprintf(&buf[strlen(buf)], " "); + if (RaFieldDelimiter == ' ') + sprintf(&buf[strlen(buf)], " "); } else - sprintf (&buf[strlen(buf)], " "); + if (RaFieldDelimiter == ' ') + sprintf(&buf[strlen(buf)], " "); + else + sprintf (&buf[strlen(buf)], "%c", RaFieldDelimiter); } void ArgusPrintSrcTOS (char *buf, struct ArgusRecord *argus) { - sprintf (&buf[strlen(buf)], " %3d ", argus->argus_far.attr_ip.stos); + sprintf (&buf[strlen(buf)], " %3d ", argus->argus_far.attr_ip.stos); } void ArgusPrintDstTOS (char *buf, struct ArgusRecord *argus) { - sprintf (&buf[strlen(buf)], " %3d ", argus->argus_far.attr_ip.dtos); + sprintf (&buf[strlen(buf)], " %3d" , argus->argus_far.attr_ip.dtos); } void ArgusPrintWindow (char *buf, struct ArgusRecord *argus) @@ -2692,19 +2711,19 @@ tcp = (struct ArgusTCPObject *)ArgusThisFarHdrs[ARGUS_TCP_DSR_INDEX]; if (tcp != NULL) { srcwin = tcp->src.win; dstwin = tcp->dst.win; - sprintf (&buf[strlen(buf)], "%-5d %-5d ", srcwin, dstwin); + sprintf (&buf[strlen(buf)], "%-5d%c%-5d", srcwin, RaFieldDelimiter, dstwin); } else { - sprintf (&buf[strlen(buf)], "%14s", " "); + sprintf (&buf[strlen(buf)], "%5s%c%5s", " ", RaFieldDelimiter, " "); } break; } default: - sprintf (&buf[strlen(buf)], "%14s", " "); + sprintf (&buf[strlen(buf)], "%5s%c%5s", " ", RaFieldDelimiter, " "); } } void ArgusPrintTCPExtensions (char *buf, struct ArgusRecord *argus) @@ -2848,13 +2867,17 @@ bzero (argus_strbuf, MAXSTRLEN); bzero (tmpbuf, MAXSTRLEN); for (RaPrintIndex = 0; RaPrintIndex < MAX_PRINT_ALG_TYPES; RaPrintIndex++) { - if (RaPrintAlgorithms[RaPrintIndex] != NULL) + if (RaPrintAlgorithms[RaPrintIndex] != NULL) { RaPrintAlgorithms[RaPrintIndex](&argus_strbuf[strlen(argus_strbuf)], argus); - else + if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) + sprintf(&argus_strbuf[strlen(argus_strbuf)], "%c", RaFieldDelimiter); + else + sprintf(&argus_strbuf[strlen(argus_strbuf)], "%c", ' '); + } else break; } while (isspace((int)(argus_strbuf[strlen(argus_strbuf) - 1]))) argus_strbuf[strlen(argus_strbuf) - 1] = '\0'; @@ -2880,17 +2903,12 @@ *--ptr = '\0'; } } while (*str) { - if (*str == ' ') { - if (lastchr != RaFieldDelimiter) - *ptr++ = RaFieldDelimiter; + if (*str == ' ') while (isspace((int)*str)) str++; - } - lastchr = *str; - *ptr++ = *str++; } if (tmpbuf[strlen(tmpbuf) - 1] == RaFieldDelimiter) tmpbuf[strlen(tmpbuf) - 1] = '\0'; @@ -3225,11 +3243,11 @@ char delim = ' '; if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) delim = RaFieldDelimiter; - if ((ArgusSrcUserDataLen > 0) || (ArgusDstUserDataLen)) { + if ((ArgusSrcUserDataLen > 0) || (ArgusDstUserDataLen > 0)) { if (ArgusSrcUserDataLen > 0) { switch (eflag) { case ARGUS_ENCODE_ASCII: exlen = ArgusSrcUserDataLen; break; @@ -3251,26 +3269,25 @@ len = len > ArgusSrcUserDataLen ? ArgusSrcUserDataLen : len; bzero (strbuf, sizeof(strbuf)); bzero (conbuf, sizeof(conbuf)); if ((len = ArgusEncode (&user->data, NULL, len, str, sizeof(strbuf))) > 0) - sprintf (con, "%cs[%d]=%s", delim, len, str); + sprintf (con, "s[%d]=%s", len, str); else sprintf (con, " "); if (delim == ' ') - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, con); + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s", exlen, con); else - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-s ", con); + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-s", con); - } else { - if (delim != ' ') - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%c", delim); - else - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, " "); } } + if (delim != ' ') + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%c", delim); + else + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, " "); if (ArgusDstUserDataLen > 0) { switch (eflag) { case ARGUS_ENCODE_ASCII: exlen = ArgusDstUserDataLen; @@ -3294,27 +3311,31 @@ len = len > ArgusDstUserDataLen ? ArgusDstUserDataLen : len; bzero (strbuf, sizeof(strbuf)); bzero (conbuf, sizeof(conbuf)); if ((len = ArgusEncode (&user->data, NULL, len, str, sizeof(strbuf))) > 0) - sprintf (con, "%cd[%d]=%s", delim, len, str); + sprintf (con, "d[%d]=%s", len, str); else sprintf (con, " "); if (delim == ' ') sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, con); else - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-s ", con); + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-s", con); - } else - if (delim != ' ') - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%c", delim); - else - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, " "); + } } + if (delim != ' ') + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%c", delim); + else + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s ", exlen, " "); - sprintf (&RaUserDataStr[strlen(RaUserDataStr)], " "); + } else { + if (delim != ' ') + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%c", delim); + else + sprintf (&RaUserDataStr[strlen(RaUserDataStr)], "%-*s %-*s ", exlen, " ", exlen, " "); } } static char basis_64[] = --- NEW FILE argus.init --- #!/bin/sh # # chkconfig: - 55 45 # description: argus generates network transaction audit records. # processname: argus # # Source function library. . /etc/init.d/functions [ -f /usr/sbin/argus ] || exit 0 # Source networking configuration. . /etc/sysconfig/network # Check that networking is up. [ "${NETWORKING}" = "no" ] && exit 0 # Set up argus command-line options if [ -e /etc/argus.conf ] ; then ARGUS_OPTIONS="-d" else ARGUS_OPTIONS="-d -e $HOSTNAME -B 127.0.0.1 -P 561" fi RETVAL=0 start() { echo -n $"Starting argus: " daemon argus $ARGUS_OPTIONS RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/argus return $RETVAL } stop() { echo -n $"Shutting down argus: " killproc argus RETVAL=$? [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/argus echo return $RETVAL } dostatus() { status argus } restart() { stop start } condrestart() { [ -e /var/lock/subsys/argus ] && restart || : } # See how we were called. case "$1" in start) start ;; stop) stop ;; restart|reload) restart ;; condrestart) condrestart ;; status) dostatus ;; *) echo "Usage: argus {start|stop|restart|reload|condrestart|status}" exit 1 esac exit $RETVAL --- NEW FILE argus.spec --- Name: argus Version: 2.0.6.fixes.1 Release: 7%{?dist} Summary: Network transaction audit tool License: GPL Group: Applications/Internet Url: http://qosient.com/argus Source0: ftp://ftp.qosient.com/dev/argus-2.0/%{name}-%{version}.tar.gz Source1: ftp://ftp.qosient.com/dev/argus-2.0/%{name}-clients-%{version}.tar.gz Source2: argus.init Source3: README.fedora Patch0: argus-2.0.6.fixes.1-makefile.patch Patch1: argus-2.0.6.fixes.1-build.patch Patch2: argus-clients-2.0.6.fixes.1-makefile.patch Patch3: argus-clients-2.0.6.fixes.1-build.patch Patch4: argus-clients-2.0.6.fixes.1-print.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig #Requires: libpcap BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison %package clients Summary: Client tools for argus network audit Group: Applications/Internet %description Argus (Audit Record Generation and Utilization System) is an IP network transaction audit tool. The data generated by argus can be used for a wide range of tasks such as network operations, security and performance management. %description clients Clients to the argus probe which process and display information. %prep %setup -a0 %setup -a1 %patch0 -p1 %patch1 -p1 pushd %{name}-clients-%{version} %patch2 -p1 %patch3 -p1 %patch4 -p1 popd %{__install} -p -m 0644 %{SOURCE3} . %build %configure --with-sasl=yes %{__make} %{?_smp_mflags} pushd %{name}-clients-%{version} %configure --with-sasl=yes %{__make} %{?_smp_mflags} popd %install %{__rm} -rf %{buildroot} %{__make} DESTDIR=%{buildroot} install pushd %{name}-clients-%{version} %{__make} DESTDIR=%{buildroot} install # avoid unwanted dependencies when using these as docs (clients package): find doc contrib support ragraph -type f -exec chmod a-x '{}' \; popd %{__rm} -rf %{buildroot}/%{_libdir} %{__rm} -rf %{buildroot}/%{_bindir}/ragraph %{__install} -d -m 0755 %{buildroot}/%{_localstatedir}/lib/argus/archive %{__install} -D -m 0644 support/Config/argus.conf %{buildroot}/%{_sysconfdir}/argus.conf %{__install} -D -m 0755 %{SOURCE2} %{buildroot}/%{_initrddir}/argus # fix up argus.conf to a good default %{__sed} -i 's|var/log/argus|var/lib/argus|' %{buildroot}/%{_sysconfdir}/argus.conf %{__sed} -i 's|#ARGUS_BIND_IP|ARGUS_BIND_IP|' %{buildroot}/%{_sysconfdir}/argus.conf %{__sed} -i 's|#ARGUS_ACCESS_PORT|ARGUS_ACCESS_PORT|' %{buildroot}/%{_sysconfdir}/argus.conf # avoid unwanted dependencies when using these as docs (main package): find support -type f -exec chmod a-x '{}' \; %clean %{__rm} -rf %{buildroot} %post # only post-install if [ $1 -le 1 ]; then /sbin/chkconfig --add argus fi %preun # only pre-erase if [ $1 -eq 0 ]; then /sbin/service argus stop >/dev/null 2>&1 /sbin/chkconfig --del argus fi %postun # only postun-upgrade if [ $1 -ge 1 ]; then /sbin/service argus condrestart >/dev/null 2>&1 fi %files %defattr(-,root,root) %doc support doc/CHANGES doc/FAQ doc/HOW-TO doc/html bin/argusbug %doc COPYING CREDITS INSTALL README VERSION %config(noreplace) %{_sysconfdir}/argus.conf %{_initrddir}/argus %{_sbindir}/argus* %{_mandir}/man5/argus* %{_mandir}/man8/argus* %dir %{_localstatedir}/lib/argus %dir %{_localstatedir}/lib/argus/archive %files clients %doc %{name}-clients-%{version}/ChangeLog %{name}-clients-%{version}/COPYING %doc %{name}-clients-%{version}/CREDITS %{name}-clients-%{version}/INSTALL %doc %{name}-clients-%{version}/README %{name}-clients-%{version}/VERSION %doc %{name}-clients-%{version}/doc/CHANGES %{name}-clients-%{version}/doc/FAQ %doc %{name}-clients-%{version}/doc/HOW-TO %{name}-clients-%{version}/doc/html %doc %{name}-clients-%{version}/support %doc %{name}-clients-%{version}/ragraph/ragraph.pl # .pm checked for dependencies regardless of permissions #%doc %{name}-clients-%{version}/contrib %doc README.fedora %{_bindir}/ra* %{_mandir}/man1/ra* %{_mandir}/man5/ra* %changelog * Wed Mar 15 2006 Gabriel Somlo 2.0.6.fixes.1-7 - fixed argus makefile patch * Fri Mar 10 2006 Gabriel Somlo 2.0.6.fixes.1-6 - argus.conf now enables listening for connections on localhost - added README.fedora to clients subpackage explaining contrib situation and ra printing patch * Wed Mar 08 2006 Gabriel Somlo 2.0.6.fixes.1-5 - added patch from Peter Van Epp to fix ra printing bugs * Mon Mar 06 2006 Gabriel Somlo 2.0.6.fixes.1-4 - removing execute flag from all documentation - capture file location changed /var/argus -> /var/lib/argus - init script set to default-disabled * Sun Mar 05 2006 Gabriel Somlo 2.0.6.fixes.1-3 - backed out of __perl_requires redefine for .pm files - trouble w. rpmbuild * Fri Feb 24 2006 Gabriel Somlo 2.0.6.fixes.1-2 - empty perl_req/prov avoids .pm's in %doc from being dep-checked at all - misc spec file fixes * Fri Feb 24 2006 Gabriel Somlo 2.0.6.fixes.1-1 - initial build for fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/argus/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Mar 2006 19:31:46 -0000 1.1 +++ .cvsignore 17 Mar 2006 19:32:36 -0000 1.2 @@ -0,0 +1,2 @@ +argus-2.0.6.fixes.1.tar.gz +argus-clients-2.0.6.fixes.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/argus/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Mar 2006 19:31:46 -0000 1.1 +++ sources 17 Mar 2006 19:32:36 -0000 1.2 @@ -0,0 +1,2 @@ +b90b8ea951fd0e2193b9a6bab565a139 argus-2.0.6.fixes.1.tar.gz +59f65159070f849211685513384fa90f argus-clients-2.0.6.fixes.1.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 19:37:17 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Fri, 17 Mar 2006 14:37:17 -0500 Subject: owners owners.list,1.748,1.749 Message-ID: <200603171937.k2HJboiS030310@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30293/owners Modified Files: owners.list Log Message: added entry for argus Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.748 retrieving revision 1.749 diff -u -r1.748 -r1.749 --- owners.list 17 Mar 2006 18:17:23 -0000 1.748 +++ owners.list 17 Mar 2006 19:37:17 -0000 1.749 @@ -47,6 +47,7 @@ Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|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|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org| Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| 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 Fri Mar 17 19:55:46 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Fri, 17 Mar 2006 14:55:46 -0500 Subject: rpms/dkms/devel .cvsignore, 1.5, 1.6 dkms.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603171956.k2HJuIbl030616@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/dkms/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30595 Modified Files: .cvsignore dkms.spec sources Log Message: update to 2.0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Dec 2005 15:54:10 -0000 1.5 +++ .cvsignore 17 Mar 2006 19:55:45 -0000 1.6 @@ -1 +1 @@ -dkms-2.0.9.tar.gz +dkms-2.0.10.tar.gz Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/dkms.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dkms.spec 13 Feb 2006 04:27:51 -0000 1.9 +++ dkms.spec 17 Mar 2006 19:55:45 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.9 -Release: 2%{?dist} +Version: 2.0.10 +Release: 1%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch @@ -9,7 +9,7 @@ Requires: bash > 1.99 Provides: dkms-minimal URL: http://linux.dell.com/dkms -Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz +Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: kernel-devel @@ -103,6 +103,13 @@ %changelog +* Fri Mar 17 2006 Matt Domsch 2.0.10-1 +- Update to 2.0.10 + - add PRE_INSTALL dkms.conf directive + - add SuSE Kernel Module Package (mkkmp) support + - patch from Eric Devolder enables mkinitrd for Debian Sarge + - include debian/ directory in upstream tarball + * Sun Feb 12 2006 Matt Domsch 2.0.9-2 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Dec 2005 15:54:10 -0000 1.5 +++ sources 17 Mar 2006 19:55:45 -0000 1.6 @@ -1 +1 @@ -a0f0cff22c84386cbe897e812a2eda29 dkms-2.0.9.tar.gz +76cf622250341690649f5637c6d871f6 dkms-2.0.10.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 20:01:41 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 17 Mar 2006 15:01:41 -0500 Subject: rpms/gourmet/FC-4 .cvsignore, 1.4, 1.5 gourmet.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603172002.k2HK2IVO032594@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30676 Modified Files: .cvsignore gourmet.spec sources Log Message: Updated version removed shell bangs from site-lib stuff that isn't installed as executable fixed some EOL encoding errors Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Nov 2005 23:29:07 -0000 1.4 +++ .cvsignore 17 Mar 2006 20:01:40 -0000 1.5 @@ -1,2 +1,3 @@ gourmet-0.8.5.12.tar.gz gourmet-0.8.5.13.tar.gz +gourmet-0.8.5.14.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/gourmet.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gourmet.spec 11 Nov 2005 23:29:07 -0000 1.3 +++ gourmet.spec 17 Mar 2006 20:01:40 -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: gourmet -Version: 0.8.5.13 +Version: 0.8.5.14 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,10 +33,21 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop +%{__sed} -i 's?\r??' src/lib/defaults_sk.py +%{__sed} -i 's?\r??' src/lib/defaults_pt.py +chmod -x data/recipe.dtd # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f popd +# remove shell bangs +pushd src/lib +for file in `find . -type f`; do + cp $file $file.orig + grep -v "\#\!\/usr\/bin" $file.orig > $file + rm -f $file.orig +done +popd %build pushd i18n @@ -52,6 +63,7 @@ %{__python} setup.py install -O1 --skip-build --root %buildroot \ --disable-modules-check + desktop-file-install %buildroot%_datadir/applications/gourmet.desktop \ --vendor=fedora \ --add-category=X-Fedora \ @@ -59,7 +71,6 @@ --copy-name-to-generic-name \ --delete-original - %find_lang %{name} %clean @@ -98,6 +109,10 @@ %{_datadir}/gourmet %changelog +* Fri Mar 17 2006 Michael A. Peters - 0.8.5.14-1 +- New upstream version +- rpmlint cleanup + * Fri Nov 11 2005 Michael A. Peters - 0.8.5.13-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Nov 2005 23:29:07 -0000 1.4 +++ sources 17 Mar 2006 20:01:40 -0000 1.5 @@ -1,2 +1,3 @@ 77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz 3db64a0609bf5d97b81d8600dda559b9 gourmet-0.8.5.13.tar.gz +f958809ea958f79a0593c3e226388faa gourmet-0.8.5.14.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 20:07:42 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Fri, 17 Mar 2006 15:07:42 -0500 Subject: rpms/gourmet/FC-5 gourmet.spec,1.3,1.4 sources,1.4,1.5 Message-ID: <200603172008.k2HK8Hfw032655@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32632 Modified Files: gourmet.spec sources Log Message: sync with fc-4 changes Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-5/gourmet.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gourmet.spec 11 Nov 2005 23:30:17 -0000 1.3 +++ gourmet.spec 17 Mar 2006 20:07:41 -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: gourmet -Version: 0.8.5.13 +Version: 0.8.5.14 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,10 +33,21 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop +%{__sed} -i 's?\r??' src/lib/defaults_sk.py +%{__sed} -i 's?\r??' src/lib/defaults_pt.py +chmod -x data/recipe.dtd # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f popd +# remove shell bangs +pushd src/lib +for file in `find . -type f`; do + cp $file $file.orig + grep -v "\#\!\/usr\/bin" $file.orig > $file + rm -f $file.orig +done +popd %build pushd i18n @@ -52,6 +63,7 @@ %{__python} setup.py install -O1 --skip-build --root %buildroot \ --disable-modules-check + desktop-file-install %buildroot%_datadir/applications/gourmet.desktop \ --vendor=fedora \ --add-category=X-Fedora \ @@ -59,7 +71,6 @@ --copy-name-to-generic-name \ --delete-original - %find_lang %{name} %clean @@ -98,6 +109,10 @@ %{_datadir}/gourmet %changelog +* Fri Mar 17 2006 Michael A. Peters - 0.8.5.14-1 +- New upstream version +- rpmlint cleanup + * Fri Nov 11 2005 Michael A. Peters - 0.8.5.13-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Nov 2005 23:30:17 -0000 1.4 +++ sources 17 Mar 2006 20:07:41 -0000 1.5 @@ -1,2 +1,3 @@ 77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz 3db64a0609bf5d97b81d8600dda559b9 gourmet-0.8.5.13.tar.gz +f958809ea958f79a0593c3e226388faa gourmet-0.8.5.14.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 20:41:52 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Fri, 17 Mar 2006 15:41:52 -0500 Subject: rpms/dkms/FC-4 .cvsignore, 1.4, 1.5 dkms.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603172042.k2HKgPBn001349@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/dkms/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1301 Modified Files: .cvsignore dkms.spec sources Log Message: update to 2.0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Dec 2005 15:53:50 -0000 1.4 +++ .cvsignore 17 Mar 2006 20:41:52 -0000 1.5 @@ -1 +1 @@ -dkms-2.0.9.tar.gz +dkms-2.0.10.tar.gz Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-4/dkms.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dkms.spec 10 Dec 2005 15:53:50 -0000 1.7 +++ dkms.spec 17 Mar 2006 20:41:52 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.9 +Version: 2.0.10 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -9,7 +9,7 @@ Requires: bash > 1.99 Provides: dkms-minimal URL: http://linux.dell.com/dkms -Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz +Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: kernel-devel @@ -103,6 +103,16 @@ %changelog +* Fri Mar 17 2006 Matt Domsch 2.0.10-1 +- Update to 2.0.10 + - add PRE_INSTALL dkms.conf directive + - add SuSE Kernel Module Package (mkkmp) support + - patch from Eric Devolder enables mkinitrd for Debian Sarge + - include debian/ directory in upstream tarball + +* Sun Feb 12 2006 Matt Domsch 2.0.9-2 +- rebuild for FC5 + * Sat Dec 10 2005 Matt Domsch 2.0.9-1 - Added URL tag - Update to 2.0.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Dec 2005 15:53:50 -0000 1.5 +++ sources 17 Mar 2006 20:41:52 -0000 1.6 @@ -1 +1 @@ -a0f0cff22c84386cbe897e812a2eda29 dkms-2.0.9.tar.gz +76cf622250341690649f5637c6d871f6 dkms-2.0.10.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 20:44:02 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Fri, 17 Mar 2006 15:44:02 -0500 Subject: rpms/dkms/FC-3 .cvsignore, 1.4, 1.5 dkms.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603172044.k2HKiYRJ001535@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/dkms/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1478 Modified Files: .cvsignore dkms.spec sources Log Message: update to 2.0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 10 Dec 2005 15:52:53 -0000 1.4 +++ .cvsignore 17 Mar 2006 20:44:01 -0000 1.5 @@ -1 +1 @@ -dkms-2.0.9.tar.gz +dkms-2.0.10.tar.gz Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-3/dkms.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dkms.spec 10 Dec 2005 15:52:53 -0000 1.7 +++ dkms.spec 17 Mar 2006 20:44:01 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.9 +Version: 2.0.10 Release: 1%{?dist} License: GPL Group: System Environment/Base @@ -9,7 +9,7 @@ Requires: bash > 1.99 Provides: dkms-minimal URL: http://linux.dell.com/dkms -Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz +Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: kernel-devel @@ -103,6 +103,16 @@ %changelog +* Fri Mar 17 2006 Matt Domsch 2.0.10-1 +- Update to 2.0.10 + - add PRE_INSTALL dkms.conf directive + - add SuSE Kernel Module Package (mkkmp) support + - patch from Eric Devolder enables mkinitrd for Debian Sarge + - include debian/ directory in upstream tarball + +* Sun Feb 12 2006 Matt Domsch 2.0.9-2 +- rebuild for FC5 + * Sat Dec 10 2005 Matt Domsch 2.0.9-1 - Added URL tag - Update to 2.0.9 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Dec 2005 15:52:53 -0000 1.5 +++ sources 17 Mar 2006 20:44:01 -0000 1.6 @@ -1 +1 @@ -a0f0cff22c84386cbe897e812a2eda29 dkms-2.0.9.tar.gz +76cf622250341690649f5637c6d871f6 dkms-2.0.10.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 21:13:37 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Fri, 17 Mar 2006 16:13:37 -0500 Subject: rpms/dkms/FC-5 .cvsignore, 1.5, 1.6 dkms.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603172114.k2HLEBGL003764@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/dkms/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3743 Modified Files: .cvsignore dkms.spec sources Log Message: update to 2.0.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Dec 2005 15:54:10 -0000 1.5 +++ .cvsignore 17 Mar 2006 21:13:37 -0000 1.6 @@ -1 +1 @@ -dkms-2.0.9.tar.gz +dkms-2.0.10.tar.gz Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-5/dkms.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- dkms.spec 13 Feb 2006 04:27:51 -0000 1.9 +++ dkms.spec 17 Mar 2006 21:13:37 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms -Version: 2.0.9 -Release: 2%{?dist} +Version: 2.0.10 +Release: 1%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch @@ -9,7 +9,7 @@ Requires: bash > 1.99 Provides: dkms-minimal URL: http://linux.dell.com/dkms -Source0: http://linux.dell.com/dkms/dkms-%{version}.tar.gz +Source0: http://linux.dell.com/dkms/permalink/dkms-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: kernel-devel @@ -103,6 +103,13 @@ %changelog +* Fri Mar 17 2006 Matt Domsch 2.0.10-1 +- Update to 2.0.10 + - add PRE_INSTALL dkms.conf directive + - add SuSE Kernel Module Package (mkkmp) support + - patch from Eric Devolder enables mkinitrd for Debian Sarge + - include debian/ directory in upstream tarball + * Sun Feb 12 2006 Matt Domsch 2.0.9-2 - rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Dec 2005 15:54:10 -0000 1.5 +++ sources 17 Mar 2006 21:13:37 -0000 1.6 @@ -1 +1 @@ -a0f0cff22c84386cbe897e812a2eda29 dkms-2.0.9.tar.gz +76cf622250341690649f5637c6d871f6 dkms-2.0.10.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 21:16:40 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:16:40 -0500 Subject: rpms/libshout/FC-5 libshout.spec,1.12,1.13 Message-ID: <200603172117.k2HLHCFm003887@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3841 Modified Files: libshout.spec Log Message: bump for rebuild Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-5/libshout.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libshout.spec 17 Mar 2006 16:45:39 -0000 1.12 +++ libshout.spec 17 Mar 2006 21:16:39 -0000 1.13 @@ -1,6 +1,6 @@ Name: libshout Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: icecast source streaming library Group: System Environment/Libraries @@ -29,6 +29,11 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: libogg-devel +Requires: libvorbis-devel +Requires: libtheora-devel +Requires: speex-devel + %description devel The libshout-devel package contains the header files needed for developing applications that send data to an icecast server. Install libshout-devel if @@ -75,6 +80,10 @@ %changelog * Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-3 +- add Requires: to -devel package + +* Fri Mar 17 2006 Thomas Vander Stichele - 2.2-2 - rebuild to please the extras repository From fedora-extras-commits at redhat.com Fri Mar 17 21:18:12 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:18:12 -0500 Subject: rpms/libshout/FC-4 libshout.spec,1.9,1.10 Message-ID: <200603172118.k2HLIi2M003954@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3934 Modified Files: libshout.spec Log Message: bump for rebuild Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-4/libshout.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libshout.spec 10 Mar 2006 15:19:53 -0000 1.9 +++ libshout.spec 17 Mar 2006 21:18:12 -0000 1.10 @@ -1,6 +1,6 @@ Name: libshout Version: 2.2 -Release: 1%{?dist} +Release: 3%{?dist} Summary: icecast source streaming library Group: System Environment/Libraries @@ -29,6 +29,11 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: libogg-devel +Requires: libvorbis-devel +Requires: libtheora-devel +Requires: speex-devel + %description devel The libshout-devel package contains the header files needed for developing applications that send data to an icecast server. Install libshout-devel if @@ -74,6 +79,14 @@ %{_datadir}/aclocal/shout.m4 %changelog +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-3 +- add Requires: to -devel package + +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-2 +- rebuild to please the extras repository + * Fri Mar 10 2006 Thomas Vander Stichele - 2.2-1 - new (incompatible) version, but deps are updated From fedora-extras-commits at redhat.com Fri Mar 17 21:24:44 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:24:44 -0500 Subject: rpms/flumotion/FC-5 flumotion.spec,1.4,1.5 Message-ID: <200603172125.k2HLPHak004107@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/flumotion/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4089 Modified Files: flumotion.spec Log Message: require pyOpenSSL Index: flumotion.spec =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-5/flumotion.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- flumotion.spec 5 Mar 2006 14:17:25 -0000 1.4 +++ flumotion.spec 17 Mar 2006 21:24:44 -0000 1.5 @@ -5,7 +5,7 @@ Name: flumotion Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Flumotion - the Fluendo Streaming Server Group: Applications/Internet @@ -21,6 +21,7 @@ Requires: python-twisted >= 1.3.0 Requires: pygtk2 >= 2.8.0 Requires: python-imaging +Requires: pyOpenSSL # for make-dummy-cert to work Requires(post): openssl @@ -219,6 +220,10 @@ %{_sysconfdir}/rc.d/init.d/flumotion %changelog +* Fri Mar 17 2006 Thomas Vander Stichele +- 0.2.0-2 +- require pyOpenSSL, without which the manager does not start + * Sun Mar 05 2006 Thomas Vander Stichele - 0.2.0-1 - new upstream release From fedora-extras-commits at redhat.com Fri Mar 17 21:25:34 2006 From: fedora-extras-commits at redhat.com (Matt Domsch (mdomsch)) Date: Fri, 17 Mar 2006 16:25:34 -0500 Subject: rpms/dkms/FC-5 dkms.spec,1.10,1.11 Message-ID: <200603172126.k2HLQ6l2004134@cvs-int.fedora.redhat.com> Author: mdomsch Update of /cvs/extras/rpms/dkms/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4117 Modified Files: dkms.spec Log Message: bump release Index: dkms.spec =================================================================== RCS file: /cvs/extras/rpms/dkms/FC-5/dkms.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- dkms.spec 17 Mar 2006 21:13:37 -0000 1.10 +++ dkms.spec 17 Mar 2006 21:25:34 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Dynamic Kernel Module Support Framework Name: dkms Version: 2.0.10 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Base BuildArch: noarch @@ -103,6 +103,9 @@ %changelog +* Fri Mar 17 2006 Matt Domsch 2.0.10-2 +- bump release + * Fri Mar 17 2006 Matt Domsch 2.0.10-1 - Update to 2.0.10 - add PRE_INSTALL dkms.conf directive From fedora-extras-commits at redhat.com Fri Mar 17 21:29:05 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:29:05 -0500 Subject: rpms/flumotion/FC-5 flumotion.spec,1.5,1.6 Message-ID: <200603172129.k2HLTbC4004241@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/flumotion/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4221 Modified Files: flumotion.spec Log Message: require pyOpenSSL Index: flumotion.spec =================================================================== RCS file: /cvs/extras/rpms/flumotion/FC-5/flumotion.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- flumotion.spec 17 Mar 2006 21:24:44 -0000 1.5 +++ flumotion.spec 17 Mar 2006 21:29:04 -0000 1.6 @@ -100,7 +100,7 @@ rm -rf $RPM_BUILD_ROOT %pre -/usr/sbin/useradd -s /sbin/nologin -r -d %{_datadir}/flumotion -M -r \ +/usr/sbin/useradd -s /sbin/nologin -r -d %{_localstatedir}/cache/flumotion -M -r \ flumotion > /dev/null 2> /dev/null || : %post @@ -211,7 +211,6 @@ %{_datadir}/flumotion/image %{_datadir}/flumotion/make-dummy-cert %{_datadir}/flumotion/*.xsl -%dir %attr(750,flumotion,root) %{_datadir}/flumotion/.flumotion %attr(750,flumotion,root) %{_sysconfdir}/flumotion %attr(750,flumotion,root) %{_localstatedir}/run/flumotion @@ -223,6 +222,8 @@ * Fri Mar 17 2006 Thomas Vander Stichele - 0.2.0-2 - require pyOpenSSL, without which the manager does not start +- use /var/cache/flumotion as the home dir, so that the cache can be written, + instead of using datadir * Sun Mar 05 2006 Thomas Vander Stichele - 0.2.0-1 From fedora-extras-commits at redhat.com Fri Mar 17 21:42:49 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:42:49 -0500 Subject: rpms/acpi - New directory Message-ID: <200603172142.k2HLgpHL004354@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346/acpi Log Message: Directory /cvs/extras/rpms/acpi added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 21:42:55 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:42:55 -0500 Subject: rpms/acpi/devel - New directory Message-ID: <200603172142.k2HLgv1r004369@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4346/acpi/devel Log Message: Directory /cvs/extras/rpms/acpi/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 21:43:17 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:43:17 -0500 Subject: rpms/acpi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603172143.k2HLhJsR004403@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4391 Added Files: Makefile import.log Log Message: Setup of module acpi --- NEW FILE Makefile --- # Top level Makefile for module acpi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 17 21:43:23 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:43:23 -0500 Subject: rpms/acpi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603172143.k2HLhPNP004427@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4391/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module acpi --- NEW 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 Mar 17 21:43:50 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:43:50 -0500 Subject: rpms/libshout/FC-3 .cvsignore, 1.2, 1.3 libshout.spec, 1.4, 1.5 sources, 1.2, 1.3 Message-ID: <200603172144.k2HLiMdj004533@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462 Modified Files: .cvsignore libshout.spec sources Log Message: bump for rebuild Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:46:31 -0000 1.2 +++ .cvsignore 17 Mar 2006 21:43:49 -0000 1.3 @@ -1 +1 @@ -libshout-1.0.9.tar.gz +libshout-2.2.tar.gz Index: libshout.spec =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-3/libshout.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libshout.spec 10 Dec 2004 22:03:05 -0000 1.4 +++ libshout.spec 17 Mar 2006 21:43:49 -0000 1.5 @@ -1,19 +1,26 @@ Name: libshout -Version: 1.0.9 -Release: 1 -Summary: icecast source streaming library. +Version: 2.2 +Release: 3%{?dist} +Summary: icecast source streaming library -Group: Libraries/Multimedia +Group: System Environment/Libraries License: LGPL URL: http://www.icecast.org/ -Source: http://developer.icecast.org/libshout/releases/%{name}-%{version}.tar.gz -Patch: libshout-makefile.patch +Source: http://downloads.us.xiph.org/releases/libshout/libshout-%{version}.tar.gz +Patch: libshout.autotools.patch + +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: libtheora-devel +BuildRequires: speex-devel + +# so it generates and installs the .pc file +BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires(post,postun): /sbin/ldconfig %description -Libshout is a library for communicating with and sending data to an +ibshout is a library for communicating with and sending data to an icecast server. It handles the socket connection, the timing of the data, and prevents most bad data from getting to the icecast server. @@ -22,6 +29,11 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: libogg-devel +Requires: libvorbis-devel +Requires: libtheora-devel +Requires: speex-devel + %description devel The libshout-devel package contains the header files needed for developing applications that send data to an icecast server. Install libshout-devel if @@ -38,11 +50,12 @@ %install rm -rf $RPM_BUILD_ROOT -# docs install in $(prefix)/doc, we don't want that, so don't go into SUBDIRS -%makeinstall SUBDIRS= +%makeinstall find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' - + +rm -rf $RPM_BUILD_ROOT%{_docdir} + %clean rm -rf $RPM_BUILD_ROOT @@ -52,18 +65,41 @@ %files %defattr(-,root,root,-) -%doc AUTHORS CHANGES COPYING README +%doc COPYING NEWS README %{_libdir}/libshout.so.* %files devel %defattr(-,root,root,-) -%doc doc/*.html doc/style.css +%doc examples/*.c doc/*.xml doc/*.xsl %{_libdir}/libshout.a %{_libdir}/libshout.so +%{_libdir}/pkgconfig/shout.pc +%dir %{_includedir}/shout/ %{_includedir}/shout/shout.h - -# ----------------------------------------------------------------------------- +%{_datadir}/aclocal/shout.m4 %changelog +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-3 +- add Requires: to -devel package + +* Fri Mar 17 2006 Thomas Vander Stichele +- 2.2-2 +- rebuild to please the extras repository + +* Fri Mar 10 2006 Thomas Vander Stichele +- 2.2-1 +- new (incompatible) version, but deps are updated +- various cleanups + +* Sun May 22 2005 Jeremy Katz - 1.0.9-4 +- rebuild on all arches + +* Fri Apr 1 2005 Michael Schwendt - 1.0.9-3 +- Include headers directory entry in -devel package. + +* Sat Feb 26 2005 Ville Skytt?? - 1.0.9-2 +- Remove redundant explicit /sbin/ldconfig dependency. + * Wed Jun 04 2003 Thomas Vander Stichele - 1.0.9-0.fdr.1: initial RPM release Index: sources =================================================================== RCS file: /cvs/extras/rpms/libshout/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:46:31 -0000 1.2 +++ sources 17 Mar 2006 21:43:49 -0000 1.3 @@ -1 +1 @@ -bbe598e28bbf2989a90d78ff33953ea2 libshout-1.0.9.tar.gz +d5b273a072785ee14a85ff76f66850aa libshout-2.2.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 21:44:02 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:44:02 -0500 Subject: rpms/acpi import.log,1.1,1.2 Message-ID: <200603172144.k2HLiYIt004543@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4494 Modified Files: import.log Log Message: auto-import acpi-0.09-1 on branch devel from acpi-0.09-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/acpi/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Mar 2006 21:43:17 -0000 1.1 +++ import.log 17 Mar 2006 21:44:02 -0000 1.2 @@ -0,0 +1 @@ +acpi-0_09-1:HEAD:acpi-0.09-1.src.rpm:1142631817 From fedora-extras-commits at redhat.com Fri Mar 17 21:44:08 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 17 Mar 2006 16:44:08 -0500 Subject: rpms/acpi/devel acpi-0.09-keep_CFLAGS.diff, NONE, 1.1 acpi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603172144.k2HLieEa004576@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/acpi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4494/devel Modified Files: .cvsignore sources Added Files: acpi-0.09-keep_CFLAGS.diff acpi.spec Log Message: auto-import acpi-0.09-1 on branch devel from acpi-0.09-1.src.rpm acpi-0.09-keep_CFLAGS.diff: --- NEW FILE acpi-0.09-keep_CFLAGS.diff --- --- Makefile.in-old 2006-03-06 11:18:24.000000000 +0100 +++ Makefile.in 2006-03-06 11:18:41.000000000 +0100 @@ -69,7 +69,7 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ -CFLAGS = -Wall +CFLAGS = @CFLAGS@ bin_PROGRAMS = acpi acpi_SOURCES = acpi.c main.c list.c --- NEW FILE acpi.spec --- Summary: Command-line ACPI client Summary(pl): Klient ACPI dzia??aj??cy z linii polece?? Name: acpi Version: 0.09 Release: 1%{?dist} License: GPL Group: Applications/System Source0: http://grahame.angrygoats.net/source/acpi/acpi-%{version}.tar.gz Patch0: acpi-0.09-keep_CFLAGS.diff URL: http://grahame.angrygoats.net/acpi.shtml BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description Linux ACPI client is a small command-line program that attempts to replicate the functionality of the 'old' apm command on ACPI systems. It includes battery and thermal information. %description -l pl Klient Linux ACPI to ma??y program dzia??aj??cy z linii polece??, b??d??cy pr??b?? zast??pienia funkcjonalno??ci "starego" polecenia apm na systemach opartych o ACPI. Zawiera informacje o zasilaniu i temperaturze. %prep %setup -q %patch0 %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 ChangeLog README COPYING %{_bindir}/acpi %changelog * Mon Mar 6 2006 Patrice Dumas - 0.09-1 - based on pld. Updated, and adapted to fedora extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/acpi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Mar 2006 21:43:22 -0000 1.1 +++ .cvsignore 17 Mar 2006 21:44:08 -0000 1.2 @@ -0,0 +1 @@ +acpi-0.09.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/acpi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Mar 2006 21:43:22 -0000 1.1 +++ sources 17 Mar 2006 21:44:08 -0000 1.2 @@ -0,0 +1 @@ +a5a70595834b487c3a2f9278a3d60768 acpi-0.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 21:48:21 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Fri, 17 Mar 2006 16:48:21 -0500 Subject: rpms/ghdl/FC-5 ghdl-svn38.patch,1.1,NONE ghdl-svn39.patch,1.1,NONE Message-ID: <200603172148.k2HLmNjM004692@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4683 Removed Files: ghdl-svn38.patch ghdl-svn39.patch Log Message: remove unneeded patches --- ghdl-svn38.patch DELETED --- --- ghdl-svn39.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 21:51:00 2006 From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs)) Date: Fri, 17 Mar 2006 16:51:00 -0500 Subject: rpms/libshout/FC-3 libshout.autotools.patch, NONE, 1.1 libshout-makefile.patch, 1.1, NONE Message-ID: <200603172151.k2HLp22f004728@cvs-int.fedora.redhat.com> Author: thomasvs Update of /cvs/extras/rpms/libshout/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4716 Added Files: libshout.autotools.patch Removed Files: libshout-makefile.patch Log Message: bump for rebuild libshout.autotools.patch: --- NEW FILE libshout.autotools.patch --- diff -Naur libshout-2.2/include/shout/Makefile.am libshout-2.2.patched/include/shout/Makefile.am --- libshout-2.2/include/shout/Makefile.am 2004-03-21 05:03:33.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.am 2006-03-10 14:09:58.000000000 +0100 @@ -2,5 +2,5 @@ AUTOMAKE_OPTIONS = foreign -includedir = $(prefix)/include/shout -nodist_include_HEADERS = shout.h +pkgincludedir = $(includedir)/shout +nodist_pkginclude_HEADERS = shout.h diff -Naur libshout-2.2/include/shout/Makefile.in libshout-2.2.patched/include/shout/Makefile.in --- libshout-2.2/include/shout/Makefile.in 2006-01-03 20:19:05.000000000 +0100 +++ libshout-2.2.patched/include/shout/Makefile.in 2006-03-10 14:14:56.000000000 +0100 @@ -61,7 +61,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(includedir)" nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER) -HEADERS = $(nodist_include_HEADERS) +HEADERS = $(nodist_pkginclude_HEADERS) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -197,7 +197,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -includedir = $(prefix)/include/shout +pkgincludedir = $(includedir)//shout infodir = @infodir@ install_sh = @install_sh@ libdir = @libdir@ @@ -217,7 +217,7 @@ target = @target@ target_alias = @target_alias@ AUTOMAKE_OPTIONS = foreign -nodist_include_HEADERS = shout.h +nodist_pkginclude_HEADERS = shout.h all: all-am .SUFFIXES: @@ -262,22 +262,22 @@ distclean-libtool: -rm -f libtool uninstall-info-am: -install-nodist_includeHEADERS: $(nodist_include_HEADERS) +install-nodist_includeHEADERS: $(nodist_pkginclude_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(mkdir_p) "$(DESTDIR)$(includedir)" - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + test -z "$(pkgincludedir)" || $(mkdir_p) "$(DESTDIR)$(pkgincludedir)" + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f=$(am__strip_dir) \ - echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(includedir)/$$f'"; \ - $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(includedir)/$$f"; \ + echo " $(nodist_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + $(nodist_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgincludedir)/$$f"; \ done uninstall-nodist_includeHEADERS: @$(NORMAL_UNINSTALL) - @list='$(nodist_include_HEADERS)'; for p in $$list; do \ + @list='$(nodist_pkginclude_HEADERS)'; for p in $$list; do \ f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(includedir)/$$f'"; \ - rm -f "$(DESTDIR)$(includedir)/$$f"; \ + echo " rm -f '$(DESTDIR)$(pkgincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgincludedir)/$$f"; \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) --- libshout-makefile.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 22:23:15 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:23:15 -0500 Subject: kadischi/bootsplash - New directory Message-ID: <200603172223.k2HMNFhd006909@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/bootsplash In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6900/bootsplash Log Message: Directory /cvs/devel/kadischi/bootsplash added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 22:30:07 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:30:07 -0500 Subject: kadischi/post_install_scripts 01prelink.sh, NONE, 1.1 01umountproc.sh, 1.1.1.1, NONE Message-ID: <200603172230.k2HMU7OJ007037@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6963/kadischi/post_install_scripts Added Files: 01prelink.sh Removed Files: 01umountproc.sh Log Message: Kadischi transitional fixes(FC4->FC5), standard bootsplash support --- NEW FILE 01prelink.sh --- #!/bin/bash # # chroot to build directory and prelink . /etc/kadischi/build.conf CHROOTDIR=$BUILDDIR/livecd-build_no$BUILDNUM/system if [ -f $CHROOTDIR/etc/prelink.conf ]; then echo "Prelinking.. " chroot $CHROOTDIR /bin/mount -t proc /proc /proc || exit 1 chroot $CHROOTDIR /usr/sbin/prelink --all >/dev/null 2>&1 chroot $CHROOTDIR /bin/umount /proc || exit 1 exit 0 else echo "No prelink.conf found.. won't prelink." exit 0 fi --- 01umountproc.sh DELETED --- From fedora-extras-commits at redhat.com Fri Mar 17 22:29:51 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:29:51 -0500 Subject: kadischi Makefile.am,1.1.1.1,1.2 configure.ac,1.2,1.3 Message-ID: <200603172230.k2HMULwh007041@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6963/kadischi Modified Files: Makefile.am configure.ac Log Message: Kadischi transitional fixes(FC4->FC5), standard bootsplash support Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile.am 21 Aug 2005 17:08:47 -0000 1.1.1.1 +++ Makefile.am 17 Mar 2006 22:29:49 -0000 1.2 @@ -11,7 +11,8 @@ patches \ post_install_scripts \ rc \ - scanswap + scanswap \ + bootsplash EXTRA_DIST = \ pycheckrc \ Index: configure.ac =================================================================== RCS file: /cvs/devel/kadischi/configure.ac,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- configure.ac 13 Oct 2005 01:05:57 -0000 1.2 +++ configure.ac 17 Mar 2006 22:29:49 -0000 1.3 @@ -58,4 +58,5 @@ post_install_scripts/Makefile rc/Makefile scanswap/Makefile +bootsplash/Makefile ]) From fedora-extras-commits at redhat.com Fri Mar 17 22:29:56 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:29:56 -0500 Subject: kadischi/conf Makefile.am,1.3,1.4 Message-ID: <200603172230.k2HMUQld007044@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/conf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6963/kadischi/conf Modified Files: Makefile.am Log Message: Kadischi transitional fixes(FC4->FC5), standard bootsplash support Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/conf/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- Makefile.am 29 Aug 2005 17:45:45 -0000 1.3 +++ Makefile.am 17 Mar 2006 22:29:54 -0000 1.4 @@ -2,8 +2,8 @@ conf_DATA = build.conf buildstamp install-data-hook: - echo INSTALLDIR=$(pkgdatadir) >> $(confdir)/build.conf + echo INSTALLDIR=$(pkgdatadir) >> $(DESTDIR)$(confdir)/build.conf uninstall-hook: rm -rf $(confdir)/*~ - rmdir $(confdir) \ No newline at end of file + rmdir $(confdir) From fedora-extras-commits at redhat.com Fri Mar 17 22:30:02 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:30:02 -0500 Subject: kadischi/livecd_generator install-boot.sh, 1.1.1.1, 1.2 kadischi.py, 1.4, 1.5 livecd-mkinitrd.sh, 1.3, 1.4 Message-ID: <200603172230.k2HMUWli007049@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6963/kadischi/livecd_generator Modified Files: install-boot.sh kadischi.py livecd-mkinitrd.sh Log Message: Kadischi transitional fixes(FC4->FC5), standard bootsplash support Index: install-boot.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- install-boot.sh 21 Aug 2005 17:09:00 -0000 1.1.1.1 +++ install-boot.sh 17 Mar 2006 22:30:00 -0000 1.2 @@ -3,18 +3,63 @@ sysdir=$1 csysdir=$2 kernel=$3 +kernel_is_xen=$(echo $kernel | grep -G [[:alnum:]]xen0) +kernel_version_proper=$(echo $kernel | sed -e 's|xen0||') +kernel_params='' + + . /etc/kadischi/build.conf + +if [ -x $sysdir/usr/bin/rhgb ]; then + kernel_params="$kernel_params rhgb" +fi cp $sysdir/boot/isolinux/initrd.img $csysdir/boot/isolinux/initrd.img cp $sysdir/boot/vmlinuz-$kernel $csysdir/boot/isolinux/vmlinuz cp /usr/lib/syslinux/isolinux.bin $csysdir/boot/isolinux/ + +if [ ! $kernel_is_xen ]; then +cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{boot,general,options,license}.msg} $csysdir/boot/isolinux/ cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_ default linux prompt 1 +display boot.msg timeout 600 +F1 boot.msg +F2 options.msg +F3 general.msg +F4 license.msg label linux kernel vmlinuz - append initrd=initrd.img ramdisk_size=10000 -label test + append initrd=initrd.img quiet $kernel_params +label debug kernel vmlinuz - append initrd=initrd.img INITRD_DBG=x ramdisk_size=10000 -_EOF_ \ No newline at end of file + append initrd=initrd.img INITRD_DBG=x +label memtest86 + kernel memtest + append - +_EOF_ +else +cp $INSTALLDIR/bootsplash/{memtest,splash.lss,{xenboot,general,options,license,xen}.msg} $csysdir/boot/isolinux/ +cp $sysdir/boot/xen.gz-$kernel_version_proper $csysdir/boot/isolinux/xen.gz +cp /usr/lib/syslinux/mboot.c32 $csysdir/boot/isolinux/ +cat > $csysdir/boot/isolinux/isolinux.cfg <<_EOF_ +default linux +prompt 1 +display xenboot.msg +timeout 600 +F1 xenboot.msg +F2 options.msg +F3 general.msg +F4 license.msg +F5 xen.msg +label linux + kernel mboot.c32 + append xen.gz nosmp noacpi --- vmlinuz --- initrd.img quiet $kernel_params +label debug + kernel mboot.c32 + append xen.gz nosmp noacpi noreboot --- vmlinuz --- initrd.img INITRD_DBG=x +label memtest86 + kernel memtest + append - +_EOF_ +fi Index: kadischi.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kadischi.py 13 Oct 2005 01:05:48 -0000 1.4 +++ kadischi.py 17 Mar 2006 22:30:00 -0000 1.5 @@ -32,7 +32,7 @@ # process command line options -usage = 'usage: %prog [options] \n\npath-to-the-repository can be a path on the local file system (without any prefixes) but can also be a path to a http, ftp or some other type of repository. For details, consult the documentation at http://fedoraproject.org/wiki/KadischiDoc' +usage = 'usage: %prog [options] \n\npath-to-the-repository can be a path on the local file system (without any prefixes) but can also be a path to a http, ftp or some other type of repository. For details, consult the documentation at http://fedoraproject.org/wiki/Kadischi/Documentation' version = '%prog ' + version parser = optparse.OptionParser (usage=usage, version=version) @@ -177,7 +177,7 @@ # load config file options -flc_log ('Loadnig config file options') +flc_log ('Loading config file options') buildconf = shvarFile (normalize_path([confdir, 'build.conf']), True) builddir = buildconf ["BUILDDIR"] @@ -221,7 +221,7 @@ flc_log ('\n *** running anaconda *** \n') -run ("anaconda %s --rootpath=%s --method=%s --livecd" % (anaconda_args, sysdir, method), builddir) +run ("anaconda %s --rootpath=%s --method=%s" % (anaconda_args, sysdir, method), builddir) flc_log ('\n *** anaconda has finished the job *** \n') @@ -292,4 +292,4 @@ cleanup (builddir) flc_log ('Finished.') -sys.exit (0) \ No newline at end of file +sys.exit (0) Index: livecd-mkinitrd.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- livecd-mkinitrd.sh 13 Mar 2006 02:22:12 -0000 1.3 +++ livecd-mkinitrd.sh 17 Mar 2006 22:30:00 -0000 1.4 @@ -200,16 +200,16 @@ mkdir -p $MNTIMAGE/lib mkdir -p $MNTIMAGE/lib/tls -mkdir -p $MNTIMAGE/lib/obsolete/linuxthreads mkdir -p $MNTIMAGE/lib/modules/$kernel mkdir -p $MNTIMAGE/bin mkdir -p $MNTIMAGE/etc +mkdir -p $MNTIMAGE/etc/modprobe.d mkdir -p $MNTIMAGE/dev mkdir -p $MNTIMAGE/proc mkdir -p $MNTIMAGE/sys mkdir -p $MNTIMAGE/sysroot mkdir -p $MNTIMAGE/tmp -mkdir -p $MNTIMAGE/usr/share/hwdata +mkdir -p $MNTIMAGE/usr/lib mkdir -p $MNTIMAGE/var/lib/nfs/rpc_pipefs ln -s bin $MNTIMAGE/sbin @@ -219,19 +219,19 @@ inst $rootdir/lib/ld-linux.so.2 "$MNTIMAGE/lib/ld-linux.so.2" inst $rootdir/lib/libselinux.so.1 "$MNTIMAGE/lib/libselinux.so.1" inst $rootdir/lib/libsepol.so.1 "$MNTIMAGE/lib/libsepol.so.1" +inst $rootdir/lib/libdl.so.2 "$MNTIMAGE/lib/libdl.so.2" if [ -f $rootdir/lib/tls/libc.so.6 ]; then inst $rootdir/lib/tls/libc.so.6 "$MNTIMAGE/lib/libc.so.6" else - inst $rootdir/lib/obsolete/linuxthreads/libc.so.6 "$MNTIMAGE/lib/obsolete/linuxthreads/libc.so.6" - ln -s "/lib/obsolete/linuxthreads/libc.so.6" "$MNTIMAGE/lib/libc.so.6" + inst $rootdir/lib/libc.so.6 "$MNTIMAGE/lib/libc.so.6" fi if [ -f $rootdir/lib/tls/libm.so.6 ]; then inst $rootdir/lib/tls/libm.so.6 "$MNTIMAGE/lib/libm.so.6" else - inst $rootdir/lib/obsolete/linuxthreads/libm.so.6 "$MNTIMAGE/lib/obsolete/linuxthreads/libm.so.6" - ln -s "/lib/obsolete/linuxthreads/libm.so.6" "$MNTIMAGE/lib/libm.so.6" + inst $rootdir/lib/libm.so.6 "$MNTIMAGE/lib/libm.so.6" + ln -s "/lib/libm.so.6" "$MNTIMAGE/usr/lib/libm.so" fi inst /sbin/busybox.anaconda "$MNTIMAGE/bin/busybox" @@ -252,8 +252,7 @@ inst $rootdir/sbin/MAKEDEV "$MNTIMAGE/sbin/MAKEDEV" fi -inst $rootdir/usr/share/hwdata/pcitable "$MNTIMAGE/usr/share/hwdata/pcitable" -inst $rootdir/etc/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.conf.dist" +inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist" inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep" PPMODULES=$(findmodules drivers/parport) From fedora-extras-commits at redhat.com Fri Mar 17 22:36:41 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:36:41 -0500 Subject: kadischi/bootsplash Makefile.am, NONE, 1.1 boot.msg, NONE, 1.1 general.msg, NONE, 1.1 license.msg, NONE, 1.1 options.msg, NONE, 1.1 splash.lss, NONE, 1.1 xen.msg, NONE, 1.1 xenboot.msg, NONE, 1.1 Message-ID: <200603172236.k2HMaf9D007085@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/bootsplash In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7067/kadischi/bootsplash Added Files: Makefile.am boot.msg general.msg license.msg options.msg splash.lss xen.msg xenboot.msg Log Message: bootsplash/ files, bootsplash support --- NEW FILE Makefile.am --- bootsplashdir = $(pkgdatadir)/bootsplash bootsplash_DATA = memtest splash.lss boot.msg general.msg options.msg license.msg xenboot.msg xen.msg uninstall-hook: rmdir $(bootsplashdir) --- NEW FILE boot.msg --- splash.lss Welcome to the Fedora Core Live CD built with Kadischi. - To start the live cd press the 0107 key. - Use the function keys listed below for more information. 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 --- NEW FILE general.msg --- 00 01What is Fedora07 Fedora is a set of projects sponsored by Red Hat and guided by the Fedora Foundation. These projects are developed by a large community of people who strive to provide and maintain the very best in free, open source software and standards. Fedora Core, the central Fedora project, is an operating system and platform based on Linux, that is always free for anyone to use, modify, and distribute, now and forever. 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 For the default live system, press 0107. --- NEW FILE license.msg --- 00 01Legal Notice07 Copyright (c) 2006 by Fedora Foundation and others. This material may be distributed only subject to the terms and conditions set forth in the Open Publication License, v1.0, available at http://www.opencontent.org/openpub/. FEDORA, FEDORA PROJECT, and the Fedora Logo are trademarks of RedHat, Inc., are registered or pending registration in the U.S. and other countries, and are used here under license to the Fedora Foundation. 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 For the default live system, press 0107. --- NEW FILE options.msg --- 00 01Live CD built with Kadischi07 Kadischi is an application for Fedora-based Live CD generation. It takes input from a Fedora RPM repository as an input and outputs a Live CD ISO image. For advanced options, Type: 01memtest07 : to test memory 01debug07 : to view the debug output of the LiveCD 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 For the default live system, press 0107. --- NEW FILE splash.lss --- =??, OP??) 6?0U$ A@? @? fSf? @? @? fT?f? ??@?E?B? ?I ;0? @? i?? D?P?5 ?F 0? ??pe% 0? ??p?I?B? ?& @? ???U?b?@??c? 5 2 0???? B??0? ??????S6$ ?????pS&?XV???\k2?? ?E"2????????pR&?hV???LZ2?? ?Y#C?? ????I ????? ?E"B?? ?????pT%??V?p??$ ?E"B?? ????I ???P? ???PI ???@? ???@I pT# ?V ??z?? ?????Z? ??z? K`U?`?(? V`? ? ?pC ??B [ b??? ????S???5????2TfQ4  ???? ?f?3 ?f?3 T  --- NEW FILE xen.msg --- 00 01Xen Support in Kadischi07 Xen is an open source virtualization for the Linux kernel. Virtualization allows multiple instances of an operating system to run at the same time on a single physical hardware platform. Xen lets you enclose and test new upgrades to Fedora without disturbing the host system. Xen installation and support are significantly enhanced with Fedora Core 5. 0f[F1-Main] [F2-Options] [F3-General] [F4-License] [F5-Xen]07 For the default live system, press 0107. --- NEW FILE xenboot.msg --- splash.lss 01Welcome to the Fedora Core Live CD built with Kadischi07. - To start the live cd press the 0107 key. - Use the function keys listed below for more information. 0f[F1-Main] [F2-Options] [F3-General] [F4-License] [F5-Xen]07 From fedora-extras-commits at redhat.com Fri Mar 17 22:42:29 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 17:42:29 -0500 Subject: kadischi/post_install_scripts Makefile.am,1.1.1.1,1.2 Message-ID: <200603172243.k2HMh0Gu007121@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7102/kadischi/post_install_scripts Modified Files: Makefile.am Log Message: post_install_scripts/Makefile.am, commit Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/Makefile.am,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- Makefile.am 21 Aug 2005 17:09:01 -0000 1.1.1.1 +++ Makefile.am 17 Mar 2006 22:42:27 -0000 1.2 @@ -1,5 +1,5 @@ PYTHON_FILES = 03fstab.py 05fsclean.py 06sysconfig.py -BASH_FILES = 01umountproc.sh 02install.sh 04auth.sh +BASH_FILES = 01prelink.sh 02install.sh 04auth.sh pisdir = $(pkgdatadir)/post_install_scripts pis_SCRIPTS = $(PYTHON_FILES) $(BASH_FILES) @@ -14,4 +14,4 @@ clean: rm -f *.pyo *.pyc - rm -f ${BUILT_SOURCES} \ No newline at end of file + rm -f ${BUILT_SOURCES} From fedora-extras-commits at redhat.com Fri Mar 17 23:22:16 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:22:16 -0500 Subject: rpms/mod_cband - New directory Message-ID: <200603172322.k2HNMIEa009252@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9243/mod_cband Log Message: Directory /cvs/extras/rpms/mod_cband added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 23:22:25 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:22:25 -0500 Subject: rpms/mod_cband/devel - New directory Message-ID: <200603172322.k2HNMRZk009264@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9243/mod_cband/devel Log Message: Directory /cvs/extras/rpms/mod_cband/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 17 23:22:53 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:22:53 -0500 Subject: rpms/mod_cband Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603172322.k2HNMtN9009309@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9297 Added Files: Makefile import.log Log Message: Setup of module mod_cband --- NEW FILE Makefile --- # Top level Makefile for module mod_cband all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 17 23:23:14 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:23:14 -0500 Subject: rpms/mod_cband/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603172323.k2HNNGIh009334@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9297/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module mod_cband --- NEW 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 Mar 17 23:23:18 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Fri, 17 Mar 2006 18:23:18 -0500 Subject: rpms/audacity/FC-5 audacity-1.2.3-gcc41.patch, NONE, 1.1 audacity-1.2.4b-missing-pango.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 audacity.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200603172323.k2HNNoBZ009387@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/audacity/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9337 Modified Files: .cvsignore audacity.spec sources Added Files: audacity-1.2.3-gcc41.patch audacity-1.2.4b-missing-pango.patch Log Message: * Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b - Update to 1.2.4b (stable release). - Follow upstream recommendation and use the GTK+ 1.x wxGTK. This is because of various issues with fonts/layout/behaviour. - Build with compat-wxGTK-devel. - Modify build section to find wx-2.4-config instead of wx-config. audacity-1.2.3-gcc41.patch: --- NEW FILE audacity-1.2.3-gcc41.patch --- diff -Nur audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h --- audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h 2004-11-18 07:17:35.000000000 +0100 +++ audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h 2006-03-17 21:26:04.000000000 +0100 @@ -146,7 +146,7 @@ static const char *getVersionString(); /// Get SoundTouch library version Id - static uint SoundTouch::getVersionId(); + static uint getVersionId(); /// Sets new rate control value. Normal rate = 1.0, smaller values /// represent slower rate, larger faster rates. audacity-1.2.4b-missing-pango.patch: --- NEW FILE audacity-1.2.4b-missing-pango.patch --- diff -Nur audacity-src-1.2.4b-orig/src/Makefile.in audacity-src-1.2.4b/src/Makefile.in --- audacity-src-1.2.4b-orig/src/Makefile.in 2005-11-27 03:33:31.000000000 +0100 +++ audacity-src-1.2.4b/src/Makefile.in 2006-03-17 23:46:15.000000000 +0100 @@ -28,7 +28,7 @@ EXTRAOBJS = @EXTRAOBJS@ OPTOBJS = @OPTOBJS@ -LIBS = @LIBS@ +LIBS = @LIBS@ -lpangox-1.0 EXTRATARGETS = @EXTRATARGETS@ ######################################## Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:04:07 -0000 1.2 +++ .cvsignore 17 Mar 2006 23:23:18 -0000 1.3 @@ -1 +1 @@ -audacity-src-1.2.1.tar.bz2 +audacity-src-1.2.4b.tar.gz Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- audacity.spec 21 May 2005 10:36:06 -0000 1.12 +++ audacity.spec 17 Mar 2006 23:23:18 -0000 1.13 @@ -1,28 +1,32 @@ Name: audacity -Version: 1.2.3 -Release: 5 +Version: 1.2.4 +Release: 0.1.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.3.tar.gz +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 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 %{?_with_mp3:BuildRequires: libmad-devel} -%{?_with_gtk1:BuildRequires: wxGTK-devel} -%{!?_with_gtk1:BuildRequires: wxGTK2-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 Requires(postun): desktop-file-utils # Compile options: # --with mp3 : enable mp3 support -# --with gtk1 : use GTK+ version of wxGTK, else GTK2 version +# --with gtk2 : use GTK+ 2.x version of wxGTK, else GTK+ 1.x version # --with portaudiov19 : enable version 19 of portaudio (disables portmixer) @@ -35,8 +39,10 @@ Linux/*BSD, MacOS, and Windows. %prep -%setup -q -n %{name}-src-%{version} +%setup -q -n %{name}-src-%{version}b %patch1 -p1 -b .aboutdialog +%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 for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp @@ -45,6 +51,13 @@ 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-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 @@ -98,6 +111,13 @@ %doc %{_datadir}/doc/* %changelog +* Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b +- Update to 1.2.4b (stable release). +- Follow upstream recommendation and use the GTK+ 1.x wxGTK. + This is because of various issues with fonts/layout/behaviour. +- Build with compat-wxGTK-devel. +- Modify build section to find wx-2.4-config instead of wx-config. + * Fri May 20 2005 David Woodhouse - 1.2.3-5 - Bump release number again due to spurious build system failure and the fact that the build system seems to be ignoring repeated build Index: sources =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Dec 2004 16:24:36 -0000 1.4 +++ sources 17 Mar 2006 23:23:18 -0000 1.5 @@ -1 +1 @@ -dbfc1b401420aa694753d35acb5a8a28 audacity-src-1.2.3.tar.gz +37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz From fedora-extras-commits at redhat.com Fri Mar 17 23:24:17 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:24:17 -0500 Subject: rpms/mod_cband import.log,1.1,1.2 Message-ID: <200603172324.k2HNOorE009483@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9435 Modified Files: import.log Log Message: auto-import mod_cband-0.9.7.2-3 on branch devel from mod_cband-0.9.7.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/mod_cband/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 17 Mar 2006 23:22:53 -0000 1.1 +++ import.log 17 Mar 2006 23:24:17 -0000 1.2 @@ -0,0 +1 @@ +mod_cband-0_9_7_2-3:HEAD:mod_cband-0.9.7.2-3.src.rpm:1142637847 From fedora-extras-commits at redhat.com Fri Mar 17 23:24:27 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:24:27 -0500 Subject: rpms/mod_cband/devel mod_cband.conf, NONE, 1.1 mod_cband.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603172324.k2HNOxDN009489@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_cband/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9435/devel Modified Files: .cvsignore sources Added Files: mod_cband.conf mod_cband.spec Log Message: auto-import mod_cband-0.9.7.2-3 on branch devel from mod_cband-0.9.7.2-3.src.rpm --- NEW FILE mod_cband.conf --- # This is an example config for the mod_cband bandwidth limiting module # Load the module LoadModule cband_module modules/mod_cband.so # This can will give you the bandwidth status. You can append "?xml" to # the end of the URI if you have an XML fetish (weirdo!) and want to see # it in that format. SetHandler cband-status Order allow,deny Allow from 127.0.0.1/32 # This space intentionally left commented. See the docs for more examples, # including but not limited to per-user limits. # Speed limiting. # # DocumentRoot /var/www/xyz.org/ # ServerName xyz.org # CustomLog /var/log/apache2/xyz.org.access combined # ErrorLog /var/log/apache2/xyz.org.access.error # RewriteEngine On # RewriteOptions inherit # # # Maximal 1024kbps speed for this virtualhost # # Maximal 10 requests per second for this virtualhost # # Maximal 30 open connections for this virtualhost # CBandSpeed 1024 10 30 # # # Maximal 10kB/s speed, 3 requests/s and 2 open connections for any # remote client # CBandRemoteSpeed 10kb/s 3 2 # # # Maximal 20kB/s speed, 2 requests/s and 3 open connections for # remote # # clients from class googlebot_class :P # CBandClassRemoteSpeed googlebot_class 20kb/s 2 3 # # Bandwidth quota # Specify default 'bandwidth exceeded' location # CBandDefaultExceededURL http://grumblesmurf.org/bandwidth_exceeded.html # # # DocumentRoot /var/www/xyz.org/ # ServerName xyz.org # CustomLog /var/log/apache2/xyz.org.access combined # ErrorLog /var/log/apache2/xyz.org.access.error # RewriteEngine On # RewriteOptions inherit # # # 100MB virtualhost bandwidth limit # CBandLimit 100000 # # # redirect to http://abc.org/bandwidth_exceeded.html # # when the limit has been reached # CBandExceededURL http://abc.org/bandwidth_exceeded.html # # # virtualhost's scoreboard file # CBandScoreboard /var/run/apache2/xyz.org.scoreboard # # # a period of time after which the scoreboard will be cleared (30 # minutes) # CBandPeriod 30M # --- NEW FILE mod_cband.spec --- Name: mod_cband Version: 0.9.7.2 Release: 3%{?dist} Summary: Bandwidth limiting for virtual hosts Group: System Environment/Daemons License: GPL URL: http://cband.linux.pl/ Source0: http://cband.linux.pl/download/mod-cband-%{version}.tgz Source1: mod_cband.conf BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: httpd-devel Requires: httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing) %description mod_cband is an Apache 2 module provided to solve the problem of limiting virtualhosts bandwidth usage. When the configured virtualhost's transfer limit is exceeded, mod_cband will redirect all further requests to a location specified in the configuration file. %prep %setup -q -n mod-cband-%{version} %build %configure make %{?_smp_mflags} %install rm -rf %{buildroot} install -D -m755 src/.libs/mod_cband.so %{buildroot}/%{_libdir}/httpd/modules/mod_cband.so install -D -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/mod_cband.conf %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc AUTHORS Changes INSTALL LICENSE conf *.copyright %{_libdir}/httpd/modules/mod_cband.so %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_cband.conf %changelog * Thu Mar 17 2006 Michael Fleming 0.9.7.2-3 - Config file set not to be replaced on upgrade - Status information URI limited to localhost by default. * Tue Mar 7 2006 Michael Fleming 0.9.7.2-2 - Updated tarball from upstream (some very small changes in code, essentially in integer handling). - Example config file added and installed in Apache's conf.d dir * Sun Feb 5 2006 Michael Fleming 0.9.7.2-1 - Fedora Extras review release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Mar 2006 23:23:14 -0000 1.1 +++ .cvsignore 17 Mar 2006 23:24:26 -0000 1.2 @@ -0,0 +1 @@ +mod-cband-0.9.7.2.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/mod_cband/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Mar 2006 23:23:14 -0000 1.1 +++ sources 17 Mar 2006 23:24:26 -0000 1.2 @@ -0,0 +1 @@ +d261161ac299437a1342b12ae586cab9 mod-cband-0.9.7.2.tgz From fedora-extras-commits at redhat.com Fri Mar 17 23:31:30 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:31:30 -0500 Subject: rpms/GeoIP/FC-5 GeoIP.spec,1.1,1.2 Message-ID: <200603172332.k2HNW368009653@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/GeoIP/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9618 Modified Files: GeoIP.spec Log Message: * Sat Mar 18 2006 Michael Fleming 1.3.14-4 - Build for FC5 Index: GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/GeoIP/FC-5/GeoIP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- GeoIP.spec 18 Feb 2006 05:44:56 -0000 1.1 +++ GeoIP.spec 17 Mar 2006 23:31:30 -0000 1.2 @@ -1,6 +1,6 @@ Name: GeoIP Version: 1.3.14 -Release: 3%{?dist} +Release: 4%{?dist} Summary: C library for country/city/organization to IP address or hostname mapping Group: Development/Libraries License: GPL @@ -71,6 +71,9 @@ %{_libdir}/libGeoIPUpdate.so %changelog +* Sat Mar 18 2006 Michael Fleming 1.3.14-4 +- Build for FC5 + * Sat Feb 18 2006 Michael Fleming 1.3.14-3 - Fix Obsoletes/Provides for old "geoip"-convention packages - Move .so symlinks to -devel where they should be From fedora-extras-commits at redhat.com Fri Mar 17 23:31:35 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Fri, 17 Mar 2006 18:31:35 -0500 Subject: rpms/ghdl/devel ghdl.spec,1.11,1.12 Message-ID: <200603172332.k2HNW79D009659@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9613 Modified Files: ghdl.spec Log Message: -mtune=generic is apparently not supported by FSF gcc Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ghdl.spec 16 Mar 2006 22:33:48 -0000 1.11 +++ ghdl.spec 17 Mar 2006 23:31:35 -0000 1.12 @@ -71,6 +71,12 @@ # These compiler flags in rawhide seem to break the build, so get rid of them OPT_FLAGS=$(echo $OPT_FLAGS | %{__sed} \ +%ifarch i386 i486 i586 i686 + -e 's/-mtune=generic/-mtune=pentium4/g' \ +%endif +%ifarch x86_64 + -e 's/-mtune=generic/-mtune=nocona/g' \ +%endif -e 's/-fstack-protector//g ' \ -e 's/--param=ssp-buffer-size=[0-9]*//g') From fedora-extras-commits at redhat.com Fri Mar 17 23:33:43 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:33:43 -0500 Subject: rpms/mlmmj/FC-5 mlmmj.spec,1.21,1.22 Message-ID: <200603172334.k2HNYGLQ009723@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mlmmj/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9702 Modified Files: mlmmj.spec Log Message: * Sat Mar 18 2006 Michael Fleming 1.2.11-4 - Bump for FC5 final. Really Index: mlmmj.spec =================================================================== RCS file: /cvs/extras/rpms/mlmmj/FC-5/mlmmj.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- mlmmj.spec 28 Feb 2006 22:48:35 -0000 1.21 +++ mlmmj.spec 17 Mar 2006 23:33:43 -0000 1.22 @@ -3,7 +3,7 @@ Summary: Mailserver-independent ezmlm-like mailing list manager Name: mlmmj Version: 1.2.11 -Release: 3%{?dist} +Release: 4%{?dist} License: MIT Group: Applications/Internet Source: http://mlmmj.mmj.dk/files/mlmmj-%{version}.tar.bz2 @@ -48,6 +48,9 @@ %{_mandir}/man1/mlmmj-* %changelog +* Sat Mar 18 2006 Michael Fleming 1.2.11-4 +- Bump for FC5 final. Really + * Wed Mar 1 2006 Michael Fleming 1.2.11-3 - Bump for FC5 From fedora-extras-commits at redhat.com Fri Mar 17 23:35:59 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:35:59 -0500 Subject: rpms/mod_security/FC-5 mod_security.spec,1.12,1.13 Message-ID: <200603172336.k2HNaVLs009793@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_security/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9767 Modified Files: mod_security.spec Log Message: * Sat Mar 18 2006 Michael Fleming 1.9.2-4 - Bump for FC5 final Index: mod_security.spec =================================================================== RCS file: /cvs/extras/rpms/mod_security/FC-5/mod_security.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mod_security.spec 28 Feb 2006 22:45:34 -0000 1.12 +++ mod_security.spec 17 Mar 2006 23:35:58 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Security module for the Apache HTTP Server Name: mod_security Version: 1.9.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL URL: http://www.modsecurity.org/ Group: System Environment/Daemons @@ -40,6 +40,9 @@ %config(noreplace) /etc/httpd/conf.d/mod_security.conf %changelog +* Sat Mar 18 2006 Michael Fleming 1.9.2-4 +- Bump for FC5 final + * Wed Mar 1 2006 Michael Fleming 1.9.2-3 - Bump for FC5 From fedora-extras-commits at redhat.com Fri Mar 17 23:45:39 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Fri, 17 Mar 2006 18:45:39 -0500 Subject: owners owners.list,1.749,1.750 Message-ID: <200603172346.k2HNkBvf009932@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9915 Modified Files: owners.list Log Message: Added mod_cband Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.749 retrieving revision 1.750 diff -u -r1.749 -r1.750 --- owners.list 17 Mar 2006 19:37:17 -0000 1.749 +++ owners.list 17 Mar 2006 23:45:23 -0000 1.750 @@ -692,6 +692,7 @@ Fedora Extras|mock|Builds packages inside chroots|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|mod_annodex|Apache module for server-side support of annodex media|thomas at apestaart.org|extras-qa at fedoraproject.org| Fedora Extras|mod_auth_pam|PAM authentication module for Apache|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|mod_cband|Bandwidth limiting for virtual hosts|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org| Fedora Extras|mod_geoip|GeoIP module for the Apache HTTP Server|mfleming+rpm at enlartenment.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| 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| From fedora-extras-commits at redhat.com Fri Mar 17 23:52:05 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 17 Mar 2006 18:52:05 -0500 Subject: rpms/vnstat/FC-5 vnstat.spec,1.4,1.5 Message-ID: <200603172352.k2HNqb6g009993@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/vnstat/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9973 Modified Files: vnstat.spec Log Message: * Fri Mar 18 2006 Adrian Reber - 1.4-6 - rebuilt Index: vnstat.spec =================================================================== RCS file: /cvs/extras/rpms/vnstat/FC-5/vnstat.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vnstat.spec 23 May 2005 00:22:11 -0000 1.4 +++ vnstat.spec 17 Mar 2006 23:52:05 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.4 -Release: 5 +Release: 6?%{dist} License: GPL Group: System Environment/Daemons @@ -87,6 +87,9 @@ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Fri Mar 18 2006 Adrian Reber - 1.4-6 +- rebuilt + * Sun May 22 2005 Jeremy Katz - 1.4-5 - rebuild on all arches From fedora-extras-commits at redhat.com Fri Mar 17 23:55:19 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Fri, 17 Mar 2006 18:55:19 -0500 Subject: rpms/vnstat/FC-5 vnstat.spec,1.5,1.6 Message-ID: <200603172355.k2HNtpPP010069@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/vnstat/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10052 Modified Files: vnstat.spec Log Message: * Fri Mar 18 2006 Adrian Reber - 1.4-7 - rebuilt; fixed dist tag Index: vnstat.spec =================================================================== RCS file: /cvs/extras/rpms/vnstat/FC-5/vnstat.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- vnstat.spec 17 Mar 2006 23:52:05 -0000 1.5 +++ vnstat.spec 17 Mar 2006 23:55:19 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Console-based network traffic monitor Name: vnstat Version: 1.4 -Release: 6?%{dist} +Release: 7%{?dist} License: GPL Group: System Environment/Daemons @@ -87,6 +87,9 @@ %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name} %changelog +* Fri Mar 18 2006 Adrian Reber - 1.4-7 +- rebuilt; fixed dist tag + * Fri Mar 18 2006 Adrian Reber - 1.4-6 - rebuilt From fedora-extras-commits at redhat.com Sat Mar 18 00:02:18 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 19:02:18 -0500 Subject: kadischi/bootsplash memtest,NONE,1.1 Message-ID: <200603180002.k2I02IH6012061@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/bootsplash In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12049/kadischi/bootsplash Added Files: memtest Log Message: po/Makefile bootsplash/memetest, commit --- NEW FILE memtest --- ????? ??s ???s? .??? a??? ??? Loading ? ?,j ?(j ?$j ? j?j ?S???1???f[????g? ??D:??B??h???;Qr??M???????????u???`???+?d????.??????????p???????@???p??????????@??l???;?p????????????????t????<?F????tc??tO?????l??????????@??x?????????f?x ??D:??B??????9Qw??>???????????u???x?????UWVS??? 9?r"? =?? ? ???t???????l ??  QPj?? ??` ??/ ?X/ ?H/ ?g. ?Y. ?#. ?. ?. ?y, ?k, ?C, ?5, ?$, ??0 P?s?`% ??Pj?s?? ^[^_]?????[[^_]?WVS?d? 1??4$????? j?.  ?D$@ ?? ? ? <?? ?<t\< tw?D$@ j?? ?2?????????????t!???b??Pjj?2 j?? ?2 ?( ? ?M ?? ?? ?? ????)??B9?u?1???^_]?UWV?l$?|$;l$s1?? ?L$? ?*B9?u??v??1???D5 [??PjJj?w????? [?S? ? ????? [?UWVS??? ??u?<$u??0? ?70F???W?7FB?$???<$u??L$$??~? B?D$(H9?|??|$, ??? P?FPU?I?????)d??P?F PU?y????? j VU? ?????[^_]?UWVS? ~K?D<a?D?|$ ~=?D<b?6?|$ ~/?D<c?(?|$ ~!?D<d??|$~?D<e? ?|$~?D<f1???~?D< ??????? ? ;G t ?G??????????w ???????? ?N???jjV?=? t ?G??????????G ????jjj j4j ??????? ?H t ?G??????????G ?????jjj ????????g??Pjj ???????g??Pjj ???????)g??Pjj ???????$??=g??Pjj ?r???Ujj?h?????????????????? ??????_g??Pjj ? ?????? ???????_g??Pjj ???????? P?4Vjj ?????Ujj ?????????| P?I????? ?|$MF????????????? P?????D$??? ???? ???;Eu-????F????D$1??@;T$s?J??t?;T$v?;Et ????;,$r?1???Y^[^_]?UWVS??? ??????????mh??Pjj ??????? ??X ?e????? ??? ??????? ?D$ ???????([^_]?UWVS? <?? j <?? ?`????? [?VS??? ???h??PR????h??P??h ??????Z????X?????[?S??? ?????????????j ??t$(Pj?R???????j z????ln????yi??P?? ?*?, ????u??ln???Hu???n??????n????,i??P?L$?T$?\$?D$???$???????0[^_?WVS??? ?? ????????u??u??pn???3???? ????|n???????????????u z????|n???D$@t ??????ln??????? ????n?????ln??????n??????n???? z???i?????h H??????PRV???$???????D$@??h ????Q??????1?RP?,$???$?h????D$?????? ??h H??????????u? ????D$Pjh? /jjh? ??X??? ??X??? ??X??? ??X??? ? ??X??? j?]????? ????B???|? ?v u??5? ??u????@??????u?????"??u???????u????? ??u??????????u???????u????? ??u?????h? ? ??u????@??????u?????"??u???????u????? ??u??????\???????????p' u ???? ???? ???? ???? ???? u ???? ???? ???? ???? ???? ??u5 u5 ??u5 ?|$u???$?4$jh? ??u????@Pjh? u ??5 ??u?????Pjh? u4??^?? u4??U?? u4??L?? u4??C??u4??:??u??p?0??u??`?&??u??P???u??@???u??0???u?? ?$?$ ??u5 ?|$u???$?$??p??u??p?0??u??`?&??u??P???u??@???u??0???u?? ?$?$???|$ u????|$ u??? ?|$ u???$?4$jh? 3q??Pjj ?\?????_g??Pjj ?L?????$j ?????r??Pjj?????Wjj???????$??????C????qRjj ?????Vjj ????????q??Pjj ???????$??r??Pjj ???????r??Pjj???????'r??Pjj???????$Wjj?}????%????j????? [^_??S? ???e???e??????????e???e???e???e???e???e???(???/???e???!???e?????????????????????????????? ntium 4 (0.13) Dual Channel (128 bits) odify Timing: [ a g ? From fedora-extras-commits at redhat.com Sat Mar 18 00:02:35 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 17 Mar 2006 19:02:35 -0500 Subject: kadischi/po Makefile,NONE,1.1 Message-ID: <200603180002.k2I02Z5d012080@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/po In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12049/kadischi/po Added Files: Makefile Log Message: po/Makefile bootsplash/memetest, commit --- NEW FILE Makefile --- From fedora-extras-commits at redhat.com Sat Mar 18 01:10:01 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Fri, 17 Mar 2006 20:10:01 -0500 Subject: rpms/ghdl/devel .cvsignore,1.4,1.5 sources,1.4,1.5 Message-ID: <200603180110.k2I1AX6I014453@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14434 Modified Files: .cvsignore sources Log Message: svn49 now needs gcc-4.1.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 18 Dec 2005 22:47:39 -0000 1.4 +++ .cvsignore 18 Mar 2006 01:09:58 -0000 1.5 @@ -4,3 +4,4 @@ ghdl-imagef64fix.patch ghdl-0.20.tar.bz2 ghdl-0.21.tar.bz2 +gcc-core-4.1.0.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 18 Dec 2005 22:47:39 -0000 1.4 +++ sources 18 Mar 2006 01:09:58 -0000 1.5 @@ -1,2 +1,2 @@ -f7781398ada62ba255486673e6274b26 gcc-core-4.0.2.tar.bz2 a0ebb9b4ea9d33e67e6ae9768d10eb3a ghdl-0.21.tar.bz2 +15efa164579c7cf4a48859ee87d2a1fa gcc-core-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 18 02:07:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 17 Mar 2006 21:07:14 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-4 .cvsignore, 1.12, 1.13 perl-ExtUtils-CBuilder.spec, 1.16, 1.17 sources, 1.12, 1.13 Message-ID: <200603180207.k2I27kXq016818@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16761/FC-4 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 14 Mar 2006 15:27:29 -0000 1.12 +++ .cvsignore 18 Mar 2006 02:07:13 -0000 1.13 @@ -1 +1 @@ -ExtUtils-CBuilder-0.16.tar.gz +ExtUtils-CBuilder-0.17.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- perl-ExtUtils-CBuilder.spec 14 Mar 2006 15:27:29 -0000 1.16 +++ perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:13 -0000 1.17 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.16 +Version: 0.17 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 +- Update to 0.17. + * Tue Mar 14 2006 Jose Pedro Oliveira - 0.16-1 - Update to 0.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 14 Mar 2006 15:27:29 -0000 1.12 +++ sources 18 Mar 2006 02:07:13 -0000 1.13 @@ -1 +1 @@ -3436fdd2b13cabb95a59df5e699fa6f3 ExtUtils-CBuilder-0.16.tar.gz +b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 02:07:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 17 Mar 2006 21:07:21 -0500 Subject: rpms/perl-ExtUtils-CBuilder/FC-5 .cvsignore, 1.12, 1.13 perl-ExtUtils-CBuilder.spec, 1.17, 1.18 sources, 1.12, 1.13 Message-ID: <200603180207.k2I27rbs016823@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16761/FC-5 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 14 Mar 2006 15:27:35 -0000 1.12 +++ .cvsignore 18 Mar 2006 02:07:21 -0000 1.13 @@ -1 +1 @@ -ExtUtils-CBuilder-0.16.tar.gz +ExtUtils-CBuilder-0.17.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-ExtUtils-CBuilder.spec 14 Mar 2006 15:27:35 -0000 1.17 +++ perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:21 -0000 1.18 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.16 +Version: 0.17 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 +- Update to 0.17. + * Tue Mar 14 2006 Jose Pedro Oliveira - 0.16-1 - Update to 0.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 14 Mar 2006 15:27:35 -0000 1.12 +++ sources 18 Mar 2006 02:07:21 -0000 1.13 @@ -1 +1 @@ -3436fdd2b13cabb95a59df5e699fa6f3 ExtUtils-CBuilder-0.16.tar.gz +b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 02:07:34 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 17 Mar 2006 21:07:34 -0500 Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.12, 1.13 perl-ExtUtils-CBuilder.spec, 1.17, 1.18 sources, 1.12, 1.13 Message-ID: <200603180208.k2I287b7016828@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16761/devel Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.17. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 14 Mar 2006 15:27:35 -0000 1.12 +++ .cvsignore 18 Mar 2006 02:07:33 -0000 1.13 @@ -1 +1 @@ -ExtUtils-CBuilder-0.16.tar.gz +ExtUtils-CBuilder-0.17.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-ExtUtils-CBuilder.spec 14 Mar 2006 15:27:35 -0000 1.17 +++ perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:33 -0000 1.18 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.16 +Version: 0.17 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 +- Update to 0.17. + * Tue Mar 14 2006 Jose Pedro Oliveira - 0.16-1 - Update to 0.16. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 14 Mar 2006 15:27:35 -0000 1.12 +++ sources 18 Mar 2006 02:07:33 -0000 1.13 @@ -1 +1 @@ -3436fdd2b13cabb95a59df5e699fa6f3 ExtUtils-CBuilder-0.16.tar.gz +b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 02:57:07 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 17 Mar 2006 21:57:07 -0500 Subject: rpms/tla/FC-5 tla-remove-invariant.patch, NONE, 1.1 tla.spec, 1.26, 1.27 Message-ID: <200603180257.k2I2vd4q017152@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tla/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17132 Modified Files: tla.spec Added Files: tla-remove-invariant.patch Log Message: Remove failing invariant check. Will need to revert when glibc is fixed tla-remove-invariant.patch: --- NEW FILE tla-remove-invariant.patch --- Index: tla-working/src/hackerlab/tests/arrays-tests/unit-ar.c =================================================================== --- tla-working.orig/src/hackerlab/tests/arrays-tests/unit-ar.c +++ tla-working/src/hackerlab/tests/arrays-tests/unit-ar.c @@ -50,7 +50,6 @@ static void check_array (size_t size, unsigned long * ar) { int x; - invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1))); invariant (size == ar_size ((void *)ar, lim_use_must_malloc, sizeof (*ar))); for (x = 0; x < size; ++x) invariant (ar[x] == HASH_INDEX (x)); Index: tla.spec =================================================================== RCS file: /cvs/extras/rpms/tla/FC-5/tla.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- tla.spec 3 Mar 2006 13:18:56 -0000 1.26 +++ tla.spec 18 Mar 2006 02:57:06 -0000 1.27 @@ -1,6 +1,6 @@ Name: tla Version: 1.3.4 -Release: 3%{?dist} +Release: 2%{?dist} Summary: GNU arch revision control system Group: Development/Tools @@ -12,6 +12,7 @@ Patch0: %{name}-1.2pre0-posix.patch # Patch1 and Source2 from Debian's 1.3.3-3, the latter updated for 1.3.4. Patch1: %{name}-1.3.3-sysneon.patch +Patch2: %{name}-remove-invariant.patch Source2: %{name}-generate-manpage.pl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,6 +40,7 @@ rm -rf src/libneon rm -rf src/expat %patch1 -p1 +%patch2 -p1 %build mkdir src/=build @@ -77,6 +79,9 @@ %{_mandir}/man1/tla.1* %changelog +* Fri Mar 17 2006 Josh Boyer - 1.3.4-4 +- Add patch to remove failing invariant (bug 182742) + * Fri Mar 3 2006 Josh Boyer - 1.3.4-3 - Remove ppc alignment patch now that glibc is fixed From fedora-extras-commits at redhat.com Sat Mar 18 03:01:54 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 17 Mar 2006 22:01:54 -0500 Subject: rpms/tla/FC-5 tla.spec,1.27,1.28 Message-ID: <200603180302.k2I32QvL019149@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tla/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19123 Modified Files: tla.spec Log Message: Um.. specify the right release number Index: tla.spec =================================================================== RCS file: /cvs/extras/rpms/tla/FC-5/tla.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- tla.spec 18 Mar 2006 02:57:06 -0000 1.27 +++ tla.spec 18 Mar 2006 03:01:54 -0000 1.28 @@ -1,6 +1,6 @@ Name: tla Version: 1.3.4 -Release: 2%{?dist} +Release: 4%{?dist} Summary: GNU arch revision control system Group: Development/Tools From fedora-extras-commits at redhat.com Sat Mar 18 03:08:32 2006 From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer)) Date: Fri, 17 Mar 2006 22:08:32 -0500 Subject: rpms/tla/devel tla-remove-invariant.patch, NONE, 1.1 tla.spec, 1.26, 1.27 Message-ID: <200603180309.k2I395oP019229@cvs-int.fedora.redhat.com> Author: jwboyer Update of /cvs/extras/rpms/tla/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19209 Modified Files: tla.spec Added Files: tla-remove-invariant.patch Log Message: Remove erroring invariant tla-remove-invariant.patch: --- NEW FILE tla-remove-invariant.patch --- Index: tla-working/src/hackerlab/tests/arrays-tests/unit-ar.c =================================================================== --- tla-working.orig/src/hackerlab/tests/arrays-tests/unit-ar.c +++ tla-working/src/hackerlab/tests/arrays-tests/unit-ar.c @@ -50,7 +50,6 @@ static void check_array (size_t size, unsigned long * ar) { int x; - invariant (0 == ((unsigned long)ar & (MACHINE_ALIGNMENT - 1))); invariant (size == ar_size ((void *)ar, lim_use_must_malloc, sizeof (*ar))); for (x = 0; x < size; ++x) invariant (ar[x] == HASH_INDEX (x)); Index: tla.spec =================================================================== RCS file: /cvs/extras/rpms/tla/devel/tla.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- tla.spec 3 Mar 2006 13:18:56 -0000 1.26 +++ tla.spec 18 Mar 2006 03:08:32 -0000 1.27 @@ -1,6 +1,6 @@ Name: tla Version: 1.3.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GNU arch revision control system Group: Development/Tools @@ -12,6 +12,7 @@ Patch0: %{name}-1.2pre0-posix.patch # Patch1 and Source2 from Debian's 1.3.3-3, the latter updated for 1.3.4. Patch1: %{name}-1.3.3-sysneon.patch +Patch2: %{name}-remove-invariant.patch Source2: %{name}-generate-manpage.pl BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -39,6 +40,7 @@ rm -rf src/libneon rm -rf src/expat %patch1 -p1 +%patch2 -p1 %build mkdir src/=build @@ -77,6 +79,9 @@ %{_mandir}/man1/tla.1* %changelog +* Fri Mar 17 2006 Josh Boyer - 1.3.4-4 +- Add patch to remove failing invariant (bug 182742) + * Fri Mar 3 2006 Josh Boyer - 1.3.4-3 - Remove ppc alignment patch now that glibc is fixed From fedora-extras-commits at redhat.com Sat Mar 18 03:30:06 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Fri, 17 Mar 2006 22:30:06 -0500 Subject: rpms/rkhunter/FC-5 rkhunter-1.2.8-2.src.sha, NONE, 1.1 rkhunter.spec, 1.7, 1.8 rkhunter-1.2.8-1.src.sha, 1.1, NONE Message-ID: <200603180330.k2I3UdpB019366@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19347 Modified Files: rkhunter.spec Added Files: rkhunter-1.2.8-2.src.sha Removed Files: rkhunter-1.2.8-1.src.sha Log Message: * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) --- NEW FILE rkhunter-1.2.8-2.src.sha --- 1a882ef4351214facffcad1d5c0e7acf1a9d875b ../SOURCES/rkhunter-1.2.8.tar.gz 7e050d1a82a060b77943d3f7ccd82982d41f1ec3 ../SOURCES/rkhunter-auto_scan.tar.gz 7f60ea47f064ab28ae40b7ffc8a62a68a7b14735 ../SOURCES/rkhunter-1.1.8-showfiles.patch 4e43e6566ff748ac355aac0cde9643d8173c03be ../SOURCES/rkhunter-1.1.9-shared_man_search.patch 1058f002585440a9d53c7dbd4a4e4cf2778c0f21 ../SOURCES/rkhunter-1.2.7-datestamp.patch ad40550fab9ada953546a83ab56586ffd183a160 ../SOURCES/rkhunter-1.2.7-append_log.patch 80148ca917ecd3117e1e2cf03237f188fa3632e7 ../SOURCES/rkhunter-1.2.7-group_log.patch fbf80a4343c0be375a744215bf5b834f23734525 ../SOURCES/rkhunter-1.2.7-manpage.patch f72d92d220edeaaaddc40155a22a2b4bc7d81b82 ../SOURCES/rkhunter-1.2.8-app_check_default.patch 85a6bc95f36a8aa5c2f5aee0b0ab6f749d450c9d ../SOURCES/rkhunter-1.2.8-default_settings-conf.patch Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-5/rkhunter.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- rkhunter.spec 11 Mar 2006 21:08:16 -0000 1.7 +++ rkhunter.spec 18 Mar 2006 03:30:06 -0000 1.8 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 1 +%define rpmRel 2 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -114,7 +114,7 @@ %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_bindir} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_sysconfdir}/{cron.daily,sysconfig,logrotate.d} -%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts +%{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version} %{__mkdir} -m755 -p ${RPM_BUILD_ROOT}%{_mandir}/man8 %{__mkdir} -m750 -p ${RPM_BUILD_ROOT}%{_var}/%{name}/{db,tmp} @@ -136,12 +136,12 @@ %{__install} -m644 -p files/development/*.8 ${RPM_BUILD_ROOT}%{_mandir}/man8/ -%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ -%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_libdir}/%{name}/scripts/ +%{__install} -m750 -p files/check_modules.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_port.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/check_update.sh ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashmd5.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/filehashsha1.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ +%{__install} -m750 -p files/showfiles.pl ${RPM_BUILD_ROOT}%{_prefix}/lib/%{name}/scripts/ %{__install} -m750 -p 01-%{name} ${RPM_BUILD_ROOT}%{_sysconfdir}/cron.daily/ %{__install} -m644 -p %{name}.logrotate ${RPM_BUILD_ROOT}%{_sysconfdir}/logrotate.d/%{name} %{__install} -m640 -p files/%{name}.conf ${RPM_BUILD_ROOT}%{_sysconfdir}/ @@ -168,15 +168,15 @@ %postun if [ "$1" = 0 ]; then [ ! -d %{_var}/%{name} ] || %{__rm} -rf %{_var}/%{name} - [ ! -d %{_libdir}/%{name} ] || %{__rm} -rf %{_libdir}/%{name} + [ ! -d %{_prefix}/lib/%{name} ] || %{__rm} -rf %{_prefix}/lib/%{name} fi %files %defattr(-,root,root,-) %{_bindir}/%{name} -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/scripts +%dir %{_prefix}/lib/%{name} +%{_prefix}/lib/%{name}/scripts %{_sysconfdir}/cron.daily/01-%{name} %{_sysconfdir}/logrotate.d/%{name} %dir %{_var}/%{name} @@ -190,6 +190,10 @@ %changelog +* Fri Mar 17 2006 Greg Houlette - 1.2.8-2 +- Fixed architectural dependency during package creation eliminating + use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) + * Tue Mar 7 2006 Greg Houlette - 1.2.8-1 - New package version release - reworked the .spec file to support optional dist tag --- rkhunter-1.2.8-1.src.sha DELETED --- From fedora-extras-commits at redhat.com Sat Mar 18 03:58:49 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Fri, 17 Mar 2006 22:58:49 -0500 Subject: comps comps-fe5.xml.in,1.28,1.29 Message-ID: <200603180359.k2I3xLR0019581@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19522 Modified Files: comps-fe5.xml.in Log Message: Add both nautilus-actions and texmaker Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- comps-fe5.xml.in 17 Mar 2006 19:14:24 -0000 1.28 +++ comps-fe5.xml.in 18 Mar 2006 03:58:49 -0000 1.29 @@ -153,6 +153,7 @@ gtweakui istanbul lock-keys-applet + nautilus-actions nautilus-flac-converter nautilus-image-converter sabayon @@ -396,6 +397,7 @@ MagicPoint pybliographer qcad + texmaker From fedora-extras-commits at redhat.com Sat Mar 18 08:53:06 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:53:06 -0500 Subject: rpms/libnasl - New directory Message-ID: <200603180853.k2I8r8b2030295@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30287/libnasl Log Message: Directory /cvs/extras/rpms/libnasl added to the repository From fedora-extras-commits at redhat.com Sat Mar 18 08:53:12 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:53:12 -0500 Subject: rpms/libnasl/devel - New directory Message-ID: <200603180853.k2I8rEKT030310@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30287/libnasl/devel Log Message: Directory /cvs/extras/rpms/libnasl/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 18 08:53:32 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:53:32 -0500 Subject: rpms/libnasl Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603180853.k2I8rY9a030344@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30332 Added Files: Makefile import.log Log Message: Setup of module libnasl --- NEW FILE Makefile --- # Top level Makefile for module libnasl all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 18 08:53:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:53:39 -0500 Subject: rpms/libnasl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603180853.k2I8rfTK030364@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30332/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libnasl --- NEW 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 Mar 18 08:54:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:54:30 -0500 Subject: rpms/libnasl import.log,1.1,1.2 Message-ID: <200603180855.k2I8t2I6030457@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30413 Modified Files: import.log Log Message: auto-import libnasl-2.2.6-2 on branch devel from libnasl-2.2.6-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libnasl/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 18 Mar 2006 08:53:32 -0000 1.1 +++ import.log 18 Mar 2006 08:54:30 -0000 1.2 @@ -0,0 +1 @@ +libnasl-2_2_6-2:HEAD:libnasl-2.2.6-2.src.rpm:1142672061 From fedora-extras-commits at redhat.com Sat Mar 18 08:54:36 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:54:36 -0500 Subject: rpms/libnasl/devel libnasl-2.2.4.pki.patch, NONE, 1.1 libnasl-config.patch, NONE, 1.1 libnasl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603180855.k2I8t8QK030461@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30413/devel Modified Files: .cvsignore sources Added Files: libnasl-2.2.4.pki.patch libnasl-config.patch libnasl.spec Log Message: auto-import libnasl-2.2.6-2 on branch devel from libnasl-2.2.6-2.src.rpm libnasl-2.2.4.pki.patch: --- NEW FILE libnasl-2.2.4.pki.patch --- diff -Naurp libnasl.orig/Makefile libnasl/Makefile --- libnasl.orig/Makefile 2004-07-28 20:07:09.000000000 +0200 +++ libnasl/Makefile 2005-07-06 15:15:56.000000000 +0200 @@ -17,8 +17,9 @@ install: all $(INSTALL) -c -m 0644 doc/nasl-config.1 $(DESTDIR)${mandir}/man1 $(INSTALL) -c -m 0644 doc/nasl.1 $(DESTDIR)${mandir}/man1 $(INSTALL) -c -m 0644 doc/nasl-config.1 $(DESTDIR)${mandir}/man1 - test -d $(DESTDIR)${localstatedir}/nessus || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir}/nessus - $(INSTALL) -c -m 0644 doc/nessus_org.pem $(DESTDIR)${localstatedir}/nessus/nessus_org.pem + test -d $(DESTDIR)${localstatedir}/lib/nessus || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir}/lib/nessus + test -d $(DESTDIR)${sysconfdir}/pki/nessus || $(INSTALL_DIR) -m 755 $(DESTDIR)${sysconfdir}/pki/nessus + $(INSTALL) -c -m 0644 doc/nessus_org.pem $(DESTDIR)${sysconfdir}/pki/nessus/nessus_org.pem @echo diff -Naurp libnasl.orig/nasl/Makefile libnasl/nasl/Makefile --- libnasl.orig/nasl/Makefile 2005-02-10 17:03:51.000000000 +0100 +++ libnasl/nasl/Makefile 2005-07-06 15:10:46.000000000 +0200 @@ -126,13 +126,13 @@ nasl_init.o: nasl_init.c nasl_crypto2.o: nasl_crypto2.c - $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)\" nasl_crypto2.c + $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" -DNESSUS_PKI_DIR=\"$(sysconfdir)/pki\" nasl_crypto2.c nasl_server.o: nasl_server.c - $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)\" nasl_server.c + $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" nasl_server.c nasl_cmd_exec.o: nasl_cmd_exec.c - $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)\" nasl_cmd_exec.c + $(COMPILE) -c -DNESSUS_STATE_DIR=\"$(localstatedir)/lib\" nasl_cmd_exec.c nasl_func.o: nasl_func.c nasl_var.h diff -Naurp libnasl.orig/nasl/nasl_crypto2.c libnasl/nasl/nasl_crypto2.c --- libnasl.orig/nasl/nasl_crypto2.c 2005-03-19 23:23:49.000000000 +0100 +++ libnasl/nasl/nasl_crypto2.c 2005-07-06 15:08:37.000000000 +0200 @@ -798,7 +798,7 @@ char * map_file(char * filename, int * l int generate_signed_script(char * filename) { RSA * rsa = NULL; - FILE * fp = fopen(NESSUS_STATE_DIR "/nessus/nessus_org.priv.pem", "r"); + FILE * fp = fopen(NESSUS_PKI_DIR "/nessus/nessus_org.priv.pem", "r"); unsigned char * result; int len; int i; @@ -873,7 +873,7 @@ int verify_script_signature(char * filen char * t; unsigned char md[SHA_DIGEST_LENGTH+1]; RSA * rsa = NULL; - FILE * fp = fopen(NESSUS_STATE_DIR "/nessus/nessus_org.pem", "r"); + FILE * fp = fopen(NESSUS_PKI_DIR "/nessus/nessus_org.pem", "r"); char sig[16384]; unsigned char bin_sig[8192]; int binsz = 0; @@ -885,7 +885,7 @@ int verify_script_signature(char * filen if ( fp == NULL ) { - fprintf(stderr, "Open %s/nessus/nessus_org.pem : %s\n", NESSUS_STATE_DIR, strerror(errno)); + fprintf(stderr, "Open %s/nessus/nessus_org.pem : %s\n", NESSUS_PKI_DIR, strerror(errno)); return -1; } libnasl-config.patch: --- NEW FILE libnasl-config.patch --- --- nasl-config.in.orig 2006-02-24 11:21:23.000000000 +0100 +++ nasl-config.in 2006-02-24 11:21:46.000000000 +0100 @@ -12,8 +12,8 @@ PREFIX=@prefix@ -LIBDIR=$PREFIX/lib -INCLUDEDIR=$PREFIX/include +LIBDIR=@libdir@ +INCLUDEDIR=@includedir@ VERSION=@version@ usage() --- NEW FILE libnasl.spec --- Name: libnasl Version: 2.2.6 Release: 2%{?dist} Summary: Nessus Attack Scripting Language Group: System Environment/Libraries License: GPL URL: http://www.nessus.org Source0: ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/libnasl-2.2.6.tar.gz Patch0: libnasl-config.patch Patch1: libnasl-2.2.4.pki.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison BuildRequires: libpcap BuildRequires: nessus-libraries-devel >= %{version} BuildRequires: tetex-dvips BuildRequires: tetex-latex %description NASL is a scripting language designed for the Nessus security scanner. Its aim is to allow anyone to write a test for a given security hole in a few minutes, to allow people to share their tests without having to worry about their operating system, and to guarantee everyone that a NASL script can not do anything nasty except performing a given security test against a given target. Thus, NASL allows you to easily forge IP packets, or to send regular packets. It provides you some convenient functions that will make the test of web and FTP server more easy to write. NASL garantees you that a NASL script: - will not send any packet to a host other than the target host, - will not execute any commands on your local system. %package devel Summary: Nessus Attack Scripting Language header files Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains the files needed for development with %{name}. %prep %setup -q -n %{name} %patch0 %patch1 -p1 %build %configure --enable-shared --disable-static --with-pic #smp_mflags will breake build make cd doc make %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT/%{_libdir}/libnasl.la %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files %defattr(-,root,root,-) %doc COPYING doc/nasl_guide.ps doc/nasl_guide.dvi %{_bindir}/nasl %{_libdir}/libnasl.so.* %{_mandir}/man1/nasl.1* %{_localstatedir}/lib/nessus %{_sysconfdir}/pki/nessus %files devel %defattr(-,root,root,-) %{_bindir}/nasl-config %{_libdir}/libnasl.so %{_includedir}/nessus %{_mandir}/man1/nasl-config.1* %changelog * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - add pki location patch - tune BR - honor now localstatedir * Fri Feb 24 2006 Andreas Bierfert 2.2.6-1 - initial version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 18 Mar 2006 08:53:38 -0000 1.1 +++ .cvsignore 18 Mar 2006 08:54:36 -0000 1.2 @@ -0,0 +1 @@ +libnasl-2.2.6.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 18 Mar 2006 08:53:38 -0000 1.1 +++ sources 18 Mar 2006 08:54:36 -0000 1.2 @@ -0,0 +1 @@ +06f90680d20953fb9806b8c54e021683 libnasl-2.2.6.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 08:56:04 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Sat, 18 Mar 2006 03:56:04 -0500 Subject: rpms/gourmet/devel .cvsignore, 1.4, 1.5 gourmet.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603180856.k2I8uaVo030512@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30456 Modified Files: .cvsignore gourmet.spec sources Log Message: Testing branch of gourmet (adds some cool features). Spec file builds - but not ready for build request. Not for fc4/fc5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Nov 2005 23:30:17 -0000 1.4 +++ .cvsignore 18 Mar 2006 08:56:03 -0000 1.5 @@ -1,2 +1,3 @@ gourmet-0.8.5.12.tar.gz gourmet-0.8.5.13.tar.gz +gourmet-0.10.1.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/gourmet.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- gourmet.spec 11 Nov 2005 23:30:17 -0000 1.3 +++ gourmet.spec 18 Mar 2006 08:56:04 -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: gourmet -Version: 0.8.5.13 +Version: 0.10.1 Release: 1%{?dist} Summary: PyGTK Recipe Manager @@ -33,15 +33,31 @@ %prep %setup -q %{__sed} -i 's?\.$??g' gourmet.desktop +#%%{__sed} -i 's?\r??' src/lib/defaults_sk.py +#%%{__sed} -i 's?\r??' src/lib/defaults_pt.py +chmod -x data/recipe.dtd # remove *.mo files - we'll regenerate them pushd i18n find -name \*.mo |xargs rm -f popd +# remove shell bangs +pushd src/lib +for file in `find . -type f`; do + cp $file $file.orig + if [ ! "$file" = "./nutrition/__init__.py" ]; then + grep -v "^\#\!\/usr\/bin" $file.orig > $file + fi + rm -f $file.orig +done +popd %build pushd i18n for file in *.po; do - sh make_mo.sh $(basename $file .po) + # broken .po files + if [ ! ${file} = "hu.po" ] && [ ! ${file} = "pt_BR.po" ]; then + sh make_mo.sh $(basename $file .po) + fi done popd @@ -52,6 +68,7 @@ %{__python} setup.py install -O1 --skip-build --root %buildroot \ --disable-modules-check + desktop-file-install %buildroot%_datadir/applications/gourmet.desktop \ --vendor=fedora \ --add-category=X-Fedora \ @@ -59,7 +76,6 @@ --copy-name-to-generic-name \ --delete-original - %find_lang %{name} %clean @@ -92,12 +108,31 @@ %{python_sitelib}/gourmet/importers/html_plugins/*.py %{python_sitelib}/gourmet/importers/html_plugins/*.pyc %ghost %{python_sitelib}/gourmet/importers/html_plugins/*.pyo +%dir %{python_sitelib}/gourmet/nutrition +%{python_sitelib}/gourmet/nutrition/*.py +%{python_sitelib}/gourmet/nutrition/*.pyc +%ghost %{python_sitelib}/gourmet/nutrition/*.pyo # datadir stuff %{_datadir}/applications/fedora-gourmet.desktop %{_datadir}/pixmaps/recbox.png %{_datadir}/gourmet %changelog +* Sat Mar 18 2006 Michael A. Peters - 0.10.1-1 +- This is the unstable branch of gourmet - for the devel branch +- of Fedora Extras +-- Main new features since 0.8 stable branch: +-- adds nutritional information +-- uses sqlite database backend +- TODO (packaging) +-- broken po files (two of them) +-- verify sqlite backend works as advertised +-- verify updating existing recipe database works + +* Fri Mar 17 2006 Michael A. Peters - 0.8.5.14-1 +- New upstream version +- rpmlint cleanup + * Fri Nov 11 2005 Michael A. Peters - 0.8.5.13-1 - New upstream version Index: sources =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Nov 2005 23:30:17 -0000 1.4 +++ sources 18 Mar 2006 08:56:04 -0000 1.5 @@ -1,2 +1 @@ -77b615493759a5a37a55589e7a24b9a9 gourmet-0.8.5.12.tar.gz -3db64a0609bf5d97b81d8600dda559b9 gourmet-0.8.5.13.tar.gz +a3e73adb21c205ba0bd6ee76ee5860c9 gourmet-0.10.1.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 08:57:45 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 03:57:45 -0500 Subject: rpms/libnasl/devel libnasl.spec,1.1,1.2 Message-ID: <200603180858.k2I8wHaO030538@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libnasl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30521 Modified Files: libnasl.spec Log Message: - Fix BR Index: libnasl.spec =================================================================== RCS file: /cvs/extras/rpms/libnasl/devel/libnasl.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libnasl.spec 18 Mar 2006 08:54:36 -0000 1.1 +++ libnasl.spec 18 Mar 2006 08:57:45 -0000 1.2 @@ -1,6 +1,6 @@ Name: libnasl Version: 2.2.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Nessus Attack Scripting Language Group: System Environment/Libraries @@ -12,7 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bison -BuildRequires: libpcap BuildRequires: nessus-libraries-devel >= %{version} BuildRequires: tetex-dvips BuildRequires: tetex-latex @@ -83,6 +82,10 @@ %{_mandir}/man1/nasl-config.1* %changelog +* Sat Mar 18 2006 Andreas Bierfert +2.2.6-3 +- fix BR + * Fri Feb 24 2006 Andreas Bierfert 2.2.6-2 - add pki location patch From fedora-extras-commits at redhat.com Sat Mar 18 10:07:29 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Sat, 18 Mar 2006 05:07:29 -0500 Subject: rpms/gourmet/devel gourmet.spec,1.4,1.5 Message-ID: <200603181008.k2IA81pT002712@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2691 Modified Files: gourmet.spec Log Message: Missing explicit require for python-sqlite2 Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/gourmet.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gourmet.spec 18 Mar 2006 08:56:04 -0000 1.4 +++ gourmet.spec 18 Mar 2006 10:07:28 -0000 1.5 @@ -23,6 +23,7 @@ Requires: pygtk2 > 2.3.9 Requires: PyRTF Requires: python-imaging +Requires: python-sqlite2 %description Gourmet Recipe Manager is a recipe-organizer for GNOME that generates shopping From fedora-extras-commits at redhat.com Sat Mar 18 10:16:09 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 05:16:09 -0500 Subject: rpms/perl-File-Slurp/devel .cvsignore, 1.3, 1.4 perl-File-Slurp.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603181016.k2IAGjLS002821@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Slurp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2742/devel Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2006 06:27:17 -0000 1.3 +++ .cvsignore 18 Mar 2006 10:16:04 -0000 1.4 @@ -1 +1 @@ -File-Slurp-9999.11.tar.gz +File-Slurp-9999.12.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/perl-File-Slurp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-File-Slurp.spec 28 Feb 2006 23:24:04 -0000 1.4 +++ perl-File-Slurp.spec 18 Mar 2006 10:16:04 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-File-Slurp -Version: 9999.11 -Release: 2%{?dist} +Version: 9999.12 +Release: 1%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL or Artistic Group: Development/Libraries @@ -53,15 +53,12 @@ %{_mandir}/man3/* %changelog +* Sat Mar 18 2006 Ralf Cors??pius - 9999.12-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 9999.11-2 - Rebuild for perl-5.8.8. * Wed Feb 01 2006 Ralf Cors??pius - 9999.11-1 - Upstream update. - BR perl(Test::Pod), perl(Test::Pod::Coverage). - -* Sat Sep 10 2005 Ralf Corsepius - 9999.09-2 -- Apply JPO's patch (PR #167282). - -* Thu Sep 01 2005 Ralf Corsepius - 9999.09-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2006 06:27:17 -0000 1.3 +++ sources 18 Mar 2006 10:16:04 -0000 1.4 @@ -1 +1 @@ -f07d4a5e580412cb40cf50a0d99de30d File-Slurp-9999.11.tar.gz +6a162082834307bac95be3e3fc955ce9 File-Slurp-9999.12.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 10:16:17 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 05:16:17 -0500 Subject: rpms/perl-File-Slurp/FC-4 .cvsignore, 1.3, 1.4 perl-File-Slurp.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603181016.k2IAGor1002826@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Slurp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2742/FC-4 Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2006 06:27:23 -0000 1.3 +++ .cvsignore 18 Mar 2006 10:16:17 -0000 1.4 @@ -1 +1 @@ -File-Slurp-9999.11.tar.gz +File-Slurp-9999.12.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-4/perl-File-Slurp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-File-Slurp.spec 1 Feb 2006 06:27:23 -0000 1.3 +++ perl-File-Slurp.spec 18 Mar 2006 10:16:17 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-File-Slurp -Version: 9999.11 +Version: 9999.12 Release: 1%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL or Artistic @@ -53,12 +53,9 @@ %{_mandir}/man3/* %changelog +* Sat Mar 18 2006 Ralf Cors??pius - 9999.12-1 +- Upstream update. + * Wed Feb 01 2006 Ralf Cors??pius - 9999.11-1 - Upstream update. - BR perl(Test::Pod), perl(Test::Pod::Coverage). - -* Sat Sep 10 2005 Ralf Corsepius - 9999.09-2 -- Apply JPO's patch (PR #167282). - -* Thu Sep 01 2005 Ralf Corsepius - 9999.09-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2006 06:27:23 -0000 1.3 +++ sources 18 Mar 2006 10:16:17 -0000 1.4 @@ -1 +1 @@ -f07d4a5e580412cb40cf50a0d99de30d File-Slurp-9999.11.tar.gz +6a162082834307bac95be3e3fc955ce9 File-Slurp-9999.12.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 10:16:25 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 05:16:25 -0500 Subject: rpms/perl-File-Slurp/FC-5 .cvsignore, 1.3, 1.4 perl-File-Slurp.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603181016.k2IAGxDh002831@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Slurp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2742/FC-5 Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2006 06:27:17 -0000 1.3 +++ .cvsignore 18 Mar 2006 10:16:24 -0000 1.4 @@ -1 +1 @@ -File-Slurp-9999.11.tar.gz +File-Slurp-9999.12.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-5/perl-File-Slurp.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-File-Slurp.spec 28 Feb 2006 23:24:04 -0000 1.4 +++ perl-File-Slurp.spec 18 Mar 2006 10:16:24 -0000 1.5 @@ -1,6 +1,6 @@ Name: perl-File-Slurp -Version: 9999.11 -Release: 2%{?dist} +Version: 9999.12 +Release: 1%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL or Artistic Group: Development/Libraries @@ -53,15 +53,12 @@ %{_mandir}/man3/* %changelog +* Sat Mar 18 2006 Ralf Cors??pius - 9999.12-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 9999.11-2 - Rebuild for perl-5.8.8. * Wed Feb 01 2006 Ralf Cors??pius - 9999.11-1 - Upstream update. - BR perl(Test::Pod), perl(Test::Pod::Coverage). - -* Sat Sep 10 2005 Ralf Corsepius - 9999.09-2 -- Apply JPO's patch (PR #167282). - -* Thu Sep 01 2005 Ralf Corsepius - 9999.09-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2006 06:27:17 -0000 1.3 +++ sources 18 Mar 2006 10:16:24 -0000 1.4 @@ -1 +1 @@ -f07d4a5e580412cb40cf50a0d99de30d File-Slurp-9999.11.tar.gz +6a162082834307bac95be3e3fc955ce9 File-Slurp-9999.12.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 10:16:31 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 05:16:31 -0500 Subject: rpms/perl-File-Slurp/FC-3 .cvsignore, 1.3, 1.4 perl-File-Slurp.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603181017.k2IAH5To002836@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-File-Slurp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2742/FC-3 Modified Files: .cvsignore perl-File-Slurp.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 1 Feb 2006 06:27:29 -0000 1.3 +++ .cvsignore 18 Mar 2006 10:16:31 -0000 1.4 @@ -1 +1 @@ -File-Slurp-9999.11.tar.gz +File-Slurp-9999.12.tar.gz Index: perl-File-Slurp.spec =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-3/perl-File-Slurp.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-File-Slurp.spec 1 Feb 2006 06:27:29 -0000 1.3 +++ perl-File-Slurp.spec 18 Mar 2006 10:16:31 -0000 1.4 @@ -1,5 +1,5 @@ Name: perl-File-Slurp -Version: 9999.11 +Version: 9999.12 Release: 1%{?dist} Summary: Efficient Reading/Writing of Complete Files License: GPL or Artistic @@ -53,12 +53,9 @@ %{_mandir}/man3/* %changelog +* Sat Mar 18 2006 Ralf Cors??pius - 9999.12-1 +- Upstream update. + * Wed Feb 01 2006 Ralf Cors??pius - 9999.11-1 - Upstream update. - BR perl(Test::Pod), perl(Test::Pod::Coverage). - -* Sat Sep 10 2005 Ralf Corsepius - 9999.09-2 -- Apply JPO's patch (PR #167282). - -* Thu Sep 01 2005 Ralf Corsepius - 9999.09-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-File-Slurp/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 1 Feb 2006 06:27:29 -0000 1.3 +++ sources 18 Mar 2006 10:16:31 -0000 1.4 @@ -1 +1 @@ -f07d4a5e580412cb40cf50a0d99de30d File-Slurp-9999.11.tar.gz +6a162082834307bac95be3e3fc955ce9 File-Slurp-9999.12.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 10:21:29 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 05:21:29 -0500 Subject: owners owners.list,1.750,1.751 Message-ID: <200603181022.k2IAM1FJ003028@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3009 Modified Files: owners.list Log Message: - add nessus-libraries - add libnasl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.750 retrieving revision 1.751 diff -u -r1.750 -r1.751 --- owners.list 17 Mar 2006 23:45:23 -0000 1.750 +++ owners.list 18 Mar 2006 10:21:28 -0000 1.751 @@ -584,6 +584,7 @@ Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org| Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|libnasl|Nessus Attack Scripting Language|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| @@ -729,6 +730,7 @@ Fedora Extras|nco|Suite of programs for manipulating NetCDF/HDF4 files|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|ncview|A visual browser for netCDF format files|ed at eh3.com|extras-qa at fedoraproject.org| Fedora Extras|nedit|A GUI text editor for systems with X and Motif|jnovy at redhat.com|extras-qa at fedoraproject.org| +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|netdiag|Diagnostic program for Ethernet adapters under Linux|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 18 10:53:58 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sat, 18 Mar 2006 05:53:58 -0500 Subject: rpms/scribus/devel .cvsignore, 1.6, 1.7 scribus.spec, 1.15, 1.16 sources, 1.6, 1.7 Message-ID: <200603181054.k2IAsVbO003181@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/scribus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3160 Modified Files: .cvsignore scribus.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 19 Jan 2006 08:19:35 -0000 1.6 +++ .cvsignore 18 Mar 2006 10:53:58 -0000 1.7 @@ -1 +1 @@ -scribus-1.2.4.1.tar.bz2 +scribus-1.3.2.tar.bz2 Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- scribus.spec 16 Feb 2006 22:59:17 -0000 1.15 +++ scribus.spec 18 Mar 2006 10:53:58 -0000 1.16 @@ -1,13 +1,13 @@ Name: scribus -Version: 1.2.4.1 -Release: 4%{?dist} +Version: 1.3.2 +Release: 1%{?dist} Summary: DeskTop Publishing application written in Qt Group: Applications/Productivity License: GPL URL: http://www.scribus.net/ -Source0: http://www.scribus.org.uk/downloads/1.2.4.1/scribus-1.2.4.1.tar.bz2 +Source0: http://www.scribus.org.uk/downloads/1.3.2/scribus-1.3.2.tar.bz2 Source1: scribus.xml Source2: scribus.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -136,6 +136,10 @@ %changelog +* Sat Mar 18 2006 Andreas Bierfert +1.3.2-1 +- upgrade to beta version + * Thu Feb 16 2006 Andreas Bierfert 1.2.4.1-4 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Jan 2006 08:19:35 -0000 1.6 +++ sources 18 Mar 2006 10:53:58 -0000 1.7 @@ -1 +1 @@ -d72ffe72b1d9ba1230557692af803927 scribus-1.2.4.1.tar.bz2 +700b8ce377084e317aa9d34a2157428d scribus-1.3.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 18 13:58:06 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 08:58:06 -0500 Subject: rpms/liferea/FC-4 liferea-mozilla-lib64.patch, NONE, 1.1 .cvsignore, 1.20, 1.21 liferea.spec, 1.25, 1.26 sources, 1.21, 1.22 Message-ID: <200603181358.k2IDwcuo010267@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10240 Modified Files: .cvsignore liferea.spec sources Added Files: liferea-mozilla-lib64.patch Log Message: * Sat Mar 18 2006 Brian Pepple - 1.0.7-1 - Update to 1.0.7. - Add patch to find mozilla on x86_64 - Fix gconf scriptlets. - Remove unnecessary BR (zlib-devel & libxml2-devel). liferea-mozilla-lib64.patch: --- NEW FILE liferea-mozilla-lib64.patch --- diff -ur liferea-1.0.7.ORIG/src/liferea.in liferea-1.0.7/src/liferea.in --- liferea-1.0.7.ORIG/src/liferea.in 2006-01-16 18:11:19.000000000 -0500 +++ liferea-1.0.7/src/liferea.in 2006-03-14 16:45:26.000000000 -0500 @@ -39,7 +39,7 @@ fi @MOZILLA_LIB_DIR_SEARCH@ -look_for_mozilla "/usr/lib/mozilla*/chrome/comm.jar" +look_for_mozilla "/usr/lib*/mozilla*/chrome/comm.jar" look_for_mozilla "/usr/local/mozilla*/chrome/comm.jar" look_for_mozilla "/opt/mozilla/chrome/comm.jar" look_for_mozilla "/opt/mozilla/lib/chrome/comm.jar" Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- .cvsignore 2 Feb 2006 18:25:21 -0000 1.20 +++ .cvsignore 18 Mar 2006 13:58:05 -0000 1.21 @@ -1 +1 @@ -liferea-1.0.3.tar.gz +liferea-1.0.7.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- liferea.spec 2 Feb 2006 18:25:21 -0000 1.25 +++ liferea.spec 18 Mar 2006 13:58:05 -0000 1.26 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.3 +Version: 1.0.7 Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -9,20 +9,20 @@ License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: %{name}-mozilla-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libxml2-devel BuildRequires: gtkhtml2-devel mozilla-devel BuildRequires: GConf2-devel BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: zlib-devel %if %{with_dbus} BuildRequires: dbus-devel %endif -Requires(post): GConf2 +Requires(pre): GConf2 +Requires(post): GConf2 Requires(preun): GConf2 @@ -64,16 +64,26 @@ rm -rf ${RPM_BUILD_ROOT} +%pre +if [ "$1" -gt 1 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || : +fi + + %post -export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/liferea.schemas >/dev/null || : + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : %preun -export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source) -gconftool-2 --makefile-uninstall-rule \ - %{_sysconfdir}/gconf/schemas/liferea.schemas >/dev/null || : +if [ "$1" -eq 0 ]; then + export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` + gconftool-2 --makefile-uninstall-rule \ + %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || : +fi %files -f %{name}.lang @@ -92,6 +102,12 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 1.0.7-1 +- Update to 1.0.7. +- Add patch to find mozilla on x86_64 +- Fix gconf scriptlets. +- Remove unnecessary BR (zlib-devel & libxml2-devel). + * Thu Feb 2 2006 Brian Pepple - 1.0.3-1 - Update to 1.0.3. Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 2 Feb 2006 18:25:21 -0000 1.21 +++ sources 18 Mar 2006 13:58:05 -0000 1.22 @@ -1 +1 @@ -40232e6884e4ae9628916868a9a9c828 liferea-1.0.3.tar.gz +d75b2621d2e926695e833eaa2aed68c2 liferea-1.0.7.tar.gz From fedora-extras-commits at redhat.com Sat Mar 18 14:09:22 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 18 Mar 2006 09:09:22 -0500 Subject: rpms/tinyerp/devel tinyerp-server-pidlog.patch, NONE, 1.1 tinyerp-server, 1.2, 1.3 tinyerp-server.conf, 1.1, 1.2 tinyerp-server.patch, 1.4, 1.5 tinyerp.spec, 1.15, 1.16 Message-ID: <200603181409.k2IE9u6g012285@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12254 Modified Files: tinyerp-server tinyerp-server.conf tinyerp-server.patch tinyerp.spec Added Files: tinyerp-server-pidlog.patch Log Message: - added patch for handling the pid and log file in the server, modified the init.d script - updated config file to include only default values tinyerp-server-pidlog.patch: --- NEW FILE tinyerp-server-pidlog.patch --- diff -Nru server.orig/bin/netsvc.py server/bin/netsvc.py --- server.orig/bin/netsvc.py 2005-10-07 13:45:46.000000000 +0200 +++ server/bin/netsvc.py 2006-03-18 14:47:47.000000000 +0100 @@ -96,13 +96,20 @@ class ServiceUnavailable(Exception): pass +import tools.config +import os + LOG_DEBUG='debug' LOG_INFO='info' LOG_WARNING='warn' LOG_ERROR='error' LOG_CRITICAL='critical' -handler = logging.StreamHandler(sys.stdout) +if tools.config['logfile']: + fd = open(tools.config['logfile'], 'a') + handler = logging.StreamHandler(fd) +else: + handler = logging.StreamHandler(sys.stdout) # create a format for log messages and dates formatter = logging.Formatter('%(asctime)s %(levelname)s:%(name)s:%(message)s', '%a, %d %b %Y %H:%M:%S') @@ -202,11 +209,19 @@ self.server.socket.close() self.server.socket.close() Agent.quit() + if tools.config['pidfile']: + os.unlink(tools.config['pidfile']) del self.server sys.exit(0) def start(self): + if tools.config['pidfile']: + fd=open(tools.config['pidfile'], 'w') + pidtext="%d" % (os.getpid()) + fd.write(pidtext) + fd.close() signal.signal(signal.SIGINT, self.handler) + signal.signal(signal.SIGTERM, self.handler) self.server.register_introspection_functions() self.server.serve_forever() diff -Nru server.orig/bin/tools/config.py server/bin/tools/config.py --- server.orig/bin/tools/config.py 2006-01-22 20:26:30.000000000 +0100 +++ server/bin/tools/config.py 2006-03-10 11:16:19.000000000 +0100 @@ -50,6 +50,8 @@ 'language': None, 'addons_path' : None, 'root_path' : None, + 'pidfile' : None, + 'logfile' : None, } parser = optparse.OptionParser(version=tinyerp_version_string) @@ -57,6 +59,8 @@ parser.add_option("-c", "--config", dest="config", help="specify alternate config file") parser.add_option("-s", "--save", action="store_true", dest="save", default=False, help="save configuration to ~/.terp_serverrc") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable debugging") + parser.add_option("--pidfile", dest="pidfile", help="file where the server pid will be stored") + parser.add_option("--logfile", dest="logfile", help="file where the server log will be stored") parser.add_option("-n", "--interface", dest="interface", help="specify the TCP IP address") parser.add_option("-p", "--port", dest="port", help="specify the TCP port") @@ -104,6 +108,8 @@ self.options['upgrade'] = opt.upgrade self.options['verbose'] = opt.verbose + self.options['pidfile'] = opt.pidfile + self.options['logfile'] = opt.logfile init = {} if opt.init: Index: tinyerp-server =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp-server 25 Jan 2006 09:22:50 -0000 1.2 +++ tinyerp-server 18 Mar 2006 14:09:22 -0000 1.3 @@ -14,21 +14,23 @@ # Source function library. . /etc/rc.d/init.d/functions -OPTS="" +PIDFILE=/var/spool/tinyerp/tinyerp-server.pid +LOCKFILE=/var/lock/subsys/tinyerp-server +LOGFILE=/var/log/tinyerp/tinyerp-server.log + +OPTS="--pidfile=$PIDFILE --logfile=$LOGFILE" prog="tinyerp-server" # check if the tinyerp-server conf file is present, then use it if [ -f /etc/tinyerp-server.conf ]; then - OPTS="-c /etc/tinyerp-server.conf" + OPTS="$OPTS -c /etc/tinyerp-server.conf" fi # check the existence of the tinyerp-server script [ -z "/usr/bin/tinyerp-server" ] && exit 0 RETVAL=0 -PIDFILE=/var/spool/tinyerp/tinyerp-server.pid -LOCKFILE=/var/lock/subsys/tinyerp-server start() { echo -n $"Starting $prog: " @@ -45,7 +47,7 @@ kill -TERM `cat $PIDFILE` > /dev/null 2>&1 RETVAL=$? if [ $RETVAL -eq 0 ] ; then - rm -f $PIDFILE $LOCKFILE + rm -f $LOCKFILE echo_success echo Index: tinyerp-server.conf =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyerp-server.conf 20 Nov 2005 18:25:32 -0000 1.1 +++ tinyerp-server.conf 18 Mar 2006 14:09:22 -0000 1.2 @@ -1,21 +1,18 @@ [options] without_demo = False -root_path = None +upgrade = False verbose = False xmlrpc = True -db_user = tinyerp +db_user = False db_password = False -webdb_host = False -webdb_name = False +root_path = None soap = False -db_host = False -webdb_user = False -webdb_password = False -db_name = tinyerp -webdb_port = False +translate_modules = ['all'] +db_name = terp +netrpc = True demo = {} interface = -netrpc = True +db_host = False db_port = False port = 8069 addons_path = None tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp-server.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-server.patch 30 Jan 2006 13:56:00 -0000 1.4 +++ tinyerp-server.patch 18 Mar 2006 14:09:22 -0000 1.5 @@ -21,14 +21,3 @@ 'stock', 'subscription'] required_modules = [('psycopg', 'PostgreSQL module'), -@@ -104,8 +106,9 @@ - # create startup script - start_script = \ - "#!/bin/sh\n\ -+echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\ - cd %s/lib/python%s/site-packages/tinyerp-server\n\ --exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable) -+exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable) - # write script - f = open('tinyerp-server', 'w') - f.write(start_script) Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/devel/tinyerp.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- tinyerp.spec 14 Feb 2006 08:07:43 -0000 1.15 +++ tinyerp.spec 18 Mar 2006 14:09:22 -0000 1.16 @@ -3,7 +3,7 @@ Name: tinyerp Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client @@ -23,6 +23,7 @@ Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch +Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -50,6 +51,7 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 +%patch2 %build cd client @@ -137,6 +139,10 @@ %changelog +* Sat Mar 18 2006 Dan Horak 3.2.1-3 +- new config file with only default values (#184505) +- added a patch for handling the pid and log file in the server (#184502) + * Tue Feb 14 2006 Dan Horak 3.2.1-2 - rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sat Mar 18 14:39:59 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 18 Mar 2006 09:39:59 -0500 Subject: rpms/tinyerp/FC-3 tinyerp-server-pidlog.patch, NONE, 1.1 tinyerp-server, 1.3, 1.4 tinyerp-server.conf, 1.1, 1.2 tinyerp-server.patch, 1.5, 1.6 tinyerp.spec, 1.11, 1.12 Message-ID: <200603181440.k2IEeYdS012493@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12462 Modified Files: tinyerp-server tinyerp-server.conf tinyerp-server.patch tinyerp.spec Added Files: tinyerp-server-pidlog.patch Log Message: - added patch for handling the pid and log file in the server, modified the init.d script - updated config file to include only default values tinyerp-server-pidlog.patch: --- NEW FILE tinyerp-server-pidlog.patch --- diff -Nru server.orig/bin/netsvc.py server/bin/netsvc.py --- server.orig/bin/netsvc.py 2005-10-07 13:45:46.000000000 +0200 +++ server/bin/netsvc.py 2006-03-18 14:47:47.000000000 +0100 @@ -96,13 +96,20 @@ class ServiceUnavailable(Exception): pass +import tools.config +import os + LOG_DEBUG='debug' LOG_INFO='info' LOG_WARNING='warn' LOG_ERROR='error' LOG_CRITICAL='critical' -handler = logging.StreamHandler(sys.stdout) +if tools.config['logfile']: + fd = open(tools.config['logfile'], 'a') + handler = logging.StreamHandler(fd) +else: + handler = logging.StreamHandler(sys.stdout) # create a format for log messages and dates formatter = logging.Formatter('%(asctime)s %(levelname)s:%(name)s:%(message)s', '%a, %d %b %Y %H:%M:%S') @@ -202,11 +209,19 @@ self.server.socket.close() self.server.socket.close() Agent.quit() + if tools.config['pidfile']: + os.unlink(tools.config['pidfile']) del self.server sys.exit(0) def start(self): + if tools.config['pidfile']: + fd=open(tools.config['pidfile'], 'w') + pidtext="%d" % (os.getpid()) + fd.write(pidtext) + fd.close() signal.signal(signal.SIGINT, self.handler) + signal.signal(signal.SIGTERM, self.handler) self.server.register_introspection_functions() self.server.serve_forever() diff -Nru server.orig/bin/tools/config.py server/bin/tools/config.py --- server.orig/bin/tools/config.py 2006-01-22 20:26:30.000000000 +0100 +++ server/bin/tools/config.py 2006-03-10 11:16:19.000000000 +0100 @@ -50,6 +50,8 @@ 'language': None, 'addons_path' : None, 'root_path' : None, + 'pidfile' : None, + 'logfile' : None, } parser = optparse.OptionParser(version=tinyerp_version_string) @@ -57,6 +59,8 @@ parser.add_option("-c", "--config", dest="config", help="specify alternate config file") parser.add_option("-s", "--save", action="store_true", dest="save", default=False, help="save configuration to ~/.terp_serverrc") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable debugging") + parser.add_option("--pidfile", dest="pidfile", help="file where the server pid will be stored") + parser.add_option("--logfile", dest="logfile", help="file where the server log will be stored") parser.add_option("-n", "--interface", dest="interface", help="specify the TCP IP address") parser.add_option("-p", "--port", dest="port", help="specify the TCP port") @@ -104,6 +108,8 @@ self.options['upgrade'] = opt.upgrade self.options['verbose'] = opt.verbose + self.options['pidfile'] = opt.pidfile + self.options['logfile'] = opt.logfile init = {} if opt.init: Index: tinyerp-server =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tinyerp-server 25 Jan 2006 09:14:04 -0000 1.3 +++ tinyerp-server 18 Mar 2006 14:39:56 -0000 1.4 @@ -14,21 +14,23 @@ # Source function library. . /etc/rc.d/init.d/functions -OPTS="" +PIDFILE=/var/spool/tinyerp/tinyerp-server.pid +LOCKFILE=/var/lock/subsys/tinyerp-server +LOGFILE=/var/log/tinyerp/tinyerp-server.log + +OPTS="--pidfile=$PIDFILE --logfile=$LOGFILE" prog="tinyerp-server" # check if the tinyerp-server conf file is present, then use it if [ -f /etc/tinyerp-server.conf ]; then - OPTS="-c /etc/tinyerp-server.conf" + OPTS="$OPTS -c /etc/tinyerp-server.conf" fi # check the existence of the tinyerp-server script [ -z "/usr/bin/tinyerp-server" ] && exit 0 RETVAL=0 -PIDFILE=/var/spool/tinyerp/tinyerp-server.pid -LOCKFILE=/var/lock/subsys/tinyerp-server start() { echo -n $"Starting $prog: " @@ -45,7 +47,7 @@ kill -TERM `cat $PIDFILE` > /dev/null 2>&1 RETVAL=$? if [ $RETVAL -eq 0 ] ; then - rm -f $PIDFILE $LOCKFILE + rm -f $LOCKFILE echo_success echo Index: tinyerp-server.conf =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyerp-server.conf 27 Nov 2005 09:26:58 -0000 1.1 +++ tinyerp-server.conf 18 Mar 2006 14:39:57 -0000 1.2 @@ -1,21 +1,18 @@ [options] without_demo = False -root_path = None +upgrade = False verbose = False xmlrpc = True -db_user = tinyerp +db_user = False db_password = False -webdb_host = False -webdb_name = False +root_path = None soap = False -db_host = False -webdb_user = False -webdb_password = False -db_name = tinyerp -webdb_port = False +translate_modules = ['all'] +db_name = terp +netrpc = True demo = {} interface = -netrpc = True +db_host = False db_port = False port = 8069 addons_path = None tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp-server.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tinyerp-server.patch 30 Jan 2006 13:42:31 -0000 1.5 +++ tinyerp-server.patch 18 Mar 2006 14:39:57 -0000 1.6 @@ -21,14 +21,3 @@ 'stock', 'subscription'] required_modules = [('psycopg', 'PostgreSQL module'), -@@ -104,8 +106,9 @@ - # create startup script - start_script = \ - "#!/bin/sh\n\ -+echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\ - cd %s/lib/python%s/site-packages/tinyerp-server\n\ --exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable) -+exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable) - # write script - f = open('tinyerp-server', 'w') - f.write(start_script) Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-3/tinyerp.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- tinyerp.spec 30 Jan 2006 13:42:31 -0000 1.11 +++ tinyerp.spec 18 Mar 2006 14:39:57 -0000 1.12 @@ -3,7 +3,7 @@ Name: tinyerp Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client @@ -22,6 +22,7 @@ Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch +Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -49,6 +50,7 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 +%patch2 %build cd client @@ -137,6 +139,10 @@ %changelog +* Sat Mar 18 2006 Dan Horak 3.2.1-2 +- new config file with only default values (#184505) +- added a patch for handling the pid and log file in the server (#184502) + * Mon Jan 30 2006 Dan Horak 3.2.1-1 - update to upstream tinyerp 3.2.1 - fixed filename for the czech translation From fedora-extras-commits at redhat.com Sat Mar 18 14:41:46 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 18 Mar 2006 09:41:46 -0500 Subject: rpms/tinyerp/FC-4 tinyerp-server-pidlog.patch, NONE, 1.1 tinyerp-server, 1.3, 1.4 tinyerp-server.conf, 1.1, 1.2 tinyerp-server.patch, 1.5, 1.6 tinyerp.spec, 1.13, 1.14 Message-ID: <200603181442.k2IEgJrN012566@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12537 Modified Files: tinyerp-server tinyerp-server.conf tinyerp-server.patch tinyerp.spec Added Files: tinyerp-server-pidlog.patch Log Message: - added patch for handling the pid and log file in the server, modified the init.d script - updated config file to include only default values tinyerp-server-pidlog.patch: --- NEW FILE tinyerp-server-pidlog.patch --- diff -Nru server.orig/bin/netsvc.py server/bin/netsvc.py --- server.orig/bin/netsvc.py 2005-10-07 13:45:46.000000000 +0200 +++ server/bin/netsvc.py 2006-03-18 14:47:47.000000000 +0100 @@ -96,13 +96,20 @@ class ServiceUnavailable(Exception): pass +import tools.config +import os + LOG_DEBUG='debug' LOG_INFO='info' LOG_WARNING='warn' LOG_ERROR='error' LOG_CRITICAL='critical' -handler = logging.StreamHandler(sys.stdout) +if tools.config['logfile']: + fd = open(tools.config['logfile'], 'a') + handler = logging.StreamHandler(fd) +else: + handler = logging.StreamHandler(sys.stdout) # create a format for log messages and dates formatter = logging.Formatter('%(asctime)s %(levelname)s:%(name)s:%(message)s', '%a, %d %b %Y %H:%M:%S') @@ -202,11 +209,19 @@ self.server.socket.close() self.server.socket.close() Agent.quit() + if tools.config['pidfile']: + os.unlink(tools.config['pidfile']) del self.server sys.exit(0) def start(self): + if tools.config['pidfile']: + fd=open(tools.config['pidfile'], 'w') + pidtext="%d" % (os.getpid()) + fd.write(pidtext) + fd.close() signal.signal(signal.SIGINT, self.handler) + signal.signal(signal.SIGTERM, self.handler) self.server.register_introspection_functions() self.server.serve_forever() diff -Nru server.orig/bin/tools/config.py server/bin/tools/config.py --- server.orig/bin/tools/config.py 2006-01-22 20:26:30.000000000 +0100 +++ server/bin/tools/config.py 2006-03-10 11:16:19.000000000 +0100 @@ -50,6 +50,8 @@ 'language': None, 'addons_path' : None, 'root_path' : None, + 'pidfile' : None, + 'logfile' : None, } parser = optparse.OptionParser(version=tinyerp_version_string) @@ -57,6 +59,8 @@ parser.add_option("-c", "--config", dest="config", help="specify alternate config file") parser.add_option("-s", "--save", action="store_true", dest="save", default=False, help="save configuration to ~/.terp_serverrc") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable debugging") + parser.add_option("--pidfile", dest="pidfile", help="file where the server pid will be stored") + parser.add_option("--logfile", dest="logfile", help="file where the server log will be stored") parser.add_option("-n", "--interface", dest="interface", help="specify the TCP IP address") parser.add_option("-p", "--port", dest="port", help="specify the TCP port") @@ -104,6 +108,8 @@ self.options['upgrade'] = opt.upgrade self.options['verbose'] = opt.verbose + self.options['pidfile'] = opt.pidfile + self.options['logfile'] = opt.logfile init = {} if opt.init: Index: tinyerp-server =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tinyerp-server 25 Jan 2006 08:40:27 -0000 1.3 +++ tinyerp-server 18 Mar 2006 14:41:46 -0000 1.4 @@ -14,21 +14,23 @@ # Source function library. . /etc/rc.d/init.d/functions -OPTS="" +PIDFILE=/var/spool/tinyerp/tinyerp-server.pid +LOCKFILE=/var/lock/subsys/tinyerp-server +LOGFILE=/var/log/tinyerp/tinyerp-server.log + +OPTS="--pidfile=$PIDFILE --logfile=$LOGFILE" prog="tinyerp-server" # check if the tinyerp-server conf file is present, then use it if [ -f /etc/tinyerp-server.conf ]; then - OPTS="-c /etc/tinyerp-server.conf" + OPTS="$OPTS -c /etc/tinyerp-server.conf" fi # check the existence of the tinyerp-server script [ -z "/usr/bin/tinyerp-server" ] && exit 0 RETVAL=0 -PIDFILE=/var/spool/tinyerp/tinyerp-server.pid -LOCKFILE=/var/lock/subsys/tinyerp-server start() { echo -n $"Starting $prog: " @@ -45,7 +47,7 @@ kill -TERM `cat $PIDFILE` > /dev/null 2>&1 RETVAL=$? if [ $RETVAL -eq 0 ] ; then - rm -f $PIDFILE $LOCKFILE + rm -f $LOCKFILE echo_success echo Index: tinyerp-server.conf =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyerp-server.conf 20 Nov 2005 18:40:53 -0000 1.1 +++ tinyerp-server.conf 18 Mar 2006 14:41:46 -0000 1.2 @@ -1,21 +1,18 @@ [options] without_demo = False -root_path = None +upgrade = False verbose = False xmlrpc = True -db_user = tinyerp +db_user = False db_password = False -webdb_host = False -webdb_name = False +root_path = None soap = False -db_host = False -webdb_user = False -webdb_password = False -db_name = tinyerp -webdb_port = False +translate_modules = ['all'] +db_name = terp +netrpc = True demo = {} interface = -netrpc = True +db_host = False db_port = False port = 8069 addons_path = None tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp-server.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- tinyerp-server.patch 30 Jan 2006 13:52:51 -0000 1.5 +++ tinyerp-server.patch 18 Mar 2006 14:41:46 -0000 1.6 @@ -21,14 +21,3 @@ 'stock', 'subscription'] required_modules = [('psycopg', 'PostgreSQL module'), -@@ -104,8 +106,9 @@ - # create startup script - start_script = \ - "#!/bin/sh\n\ -+echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\ - cd %s/lib/python%s/site-packages/tinyerp-server\n\ --exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable) -+exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable) - # write script - f = open('tinyerp-server', 'w') - f.write(start_script) Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-4/tinyerp.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- tinyerp.spec 30 Jan 2006 13:52:51 -0000 1.13 +++ tinyerp.spec 18 Mar 2006 14:41:46 -0000 1.14 @@ -3,7 +3,7 @@ Name: tinyerp Version: 3.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client @@ -22,6 +22,7 @@ Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch +Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -49,6 +50,7 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 +%patch2 %build cd client @@ -137,6 +139,10 @@ %changelog +* Sat Mar 18 2006 Dan Horak 3.2.1-2 +- new config file with only default values (#184505) +- added a patch for handling the pid and log file in the server (#184502) + * Mon Jan 30 2006 Dan Horak 3.2.1-1 - update to upstream tinyerp 3.2.1 - fixed filename for the czech translation From fedora-extras-commits at redhat.com Sat Mar 18 14:43:35 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sat, 18 Mar 2006 09:43:35 -0500 Subject: rpms/tinyerp/FC-5 tinyerp-server-pidlog.patch, NONE, 1.1 tinyerp-server, 1.2, 1.3 tinyerp-server.conf, 1.1, 1.2 tinyerp-server.patch, 1.4, 1.5 tinyerp.spec, 1.15, 1.16 Message-ID: <200603181444.k2IEi8OS012639@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/tinyerp/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12610 Modified Files: tinyerp-server tinyerp-server.conf tinyerp-server.patch tinyerp.spec Added Files: tinyerp-server-pidlog.patch Log Message: - added patch for handling the pid and log file in the server, modified the init.d script - updated config file to include only default values tinyerp-server-pidlog.patch: --- NEW FILE tinyerp-server-pidlog.patch --- diff -Nru server.orig/bin/netsvc.py server/bin/netsvc.py --- server.orig/bin/netsvc.py 2005-10-07 13:45:46.000000000 +0200 +++ server/bin/netsvc.py 2006-03-18 14:47:47.000000000 +0100 @@ -96,13 +96,20 @@ class ServiceUnavailable(Exception): pass +import tools.config +import os + LOG_DEBUG='debug' LOG_INFO='info' LOG_WARNING='warn' LOG_ERROR='error' LOG_CRITICAL='critical' -handler = logging.StreamHandler(sys.stdout) +if tools.config['logfile']: + fd = open(tools.config['logfile'], 'a') + handler = logging.StreamHandler(fd) +else: + handler = logging.StreamHandler(sys.stdout) # create a format for log messages and dates formatter = logging.Formatter('%(asctime)s %(levelname)s:%(name)s:%(message)s', '%a, %d %b %Y %H:%M:%S') @@ -202,11 +209,19 @@ self.server.socket.close() self.server.socket.close() Agent.quit() + if tools.config['pidfile']: + os.unlink(tools.config['pidfile']) del self.server sys.exit(0) def start(self): + if tools.config['pidfile']: + fd=open(tools.config['pidfile'], 'w') + pidtext="%d" % (os.getpid()) + fd.write(pidtext) + fd.close() signal.signal(signal.SIGINT, self.handler) + signal.signal(signal.SIGTERM, self.handler) self.server.register_introspection_functions() self.server.serve_forever() diff -Nru server.orig/bin/tools/config.py server/bin/tools/config.py --- server.orig/bin/tools/config.py 2006-01-22 20:26:30.000000000 +0100 +++ server/bin/tools/config.py 2006-03-10 11:16:19.000000000 +0100 @@ -50,6 +50,8 @@ 'language': None, 'addons_path' : None, 'root_path' : None, + 'pidfile' : None, + 'logfile' : None, } parser = optparse.OptionParser(version=tinyerp_version_string) @@ -57,6 +59,8 @@ parser.add_option("-c", "--config", dest="config", help="specify alternate config file") parser.add_option("-s", "--save", action="store_true", dest="save", default=False, help="save configuration to ~/.terp_serverrc") parser.add_option("-v", "--verbose", action="store_true", dest="verbose", default=False, help="enable debugging") + parser.add_option("--pidfile", dest="pidfile", help="file where the server pid will be stored") + parser.add_option("--logfile", dest="logfile", help="file where the server log will be stored") parser.add_option("-n", "--interface", dest="interface", help="specify the TCP IP address") parser.add_option("-p", "--port", dest="port", help="specify the TCP port") @@ -104,6 +108,8 @@ self.options['upgrade'] = opt.upgrade self.options['verbose'] = opt.verbose + self.options['pidfile'] = opt.pidfile + self.options['logfile'] = opt.logfile init = {} if opt.init: Index: tinyerp-server =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-server,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- tinyerp-server 25 Jan 2006 09:22:50 -0000 1.2 +++ tinyerp-server 18 Mar 2006 14:43:35 -0000 1.3 @@ -14,21 +14,23 @@ # Source function library. . /etc/rc.d/init.d/functions -OPTS="" +PIDFILE=/var/spool/tinyerp/tinyerp-server.pid +LOCKFILE=/var/lock/subsys/tinyerp-server +LOGFILE=/var/log/tinyerp/tinyerp-server.log + +OPTS="--pidfile=$PIDFILE --logfile=$LOGFILE" prog="tinyerp-server" # check if the tinyerp-server conf file is present, then use it if [ -f /etc/tinyerp-server.conf ]; then - OPTS="-c /etc/tinyerp-server.conf" + OPTS="$OPTS -c /etc/tinyerp-server.conf" fi # check the existence of the tinyerp-server script [ -z "/usr/bin/tinyerp-server" ] && exit 0 RETVAL=0 -PIDFILE=/var/spool/tinyerp/tinyerp-server.pid -LOCKFILE=/var/lock/subsys/tinyerp-server start() { echo -n $"Starting $prog: " @@ -45,7 +47,7 @@ kill -TERM `cat $PIDFILE` > /dev/null 2>&1 RETVAL=$? if [ $RETVAL -eq 0 ] ; then - rm -f $PIDFILE $LOCKFILE + rm -f $LOCKFILE echo_success echo Index: tinyerp-server.conf =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-server.conf,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tinyerp-server.conf 20 Nov 2005 18:25:32 -0000 1.1 +++ tinyerp-server.conf 18 Mar 2006 14:43:35 -0000 1.2 @@ -1,21 +1,18 @@ [options] without_demo = False -root_path = None +upgrade = False verbose = False xmlrpc = True -db_user = tinyerp +db_user = False db_password = False -webdb_host = False -webdb_name = False +root_path = None soap = False -db_host = False -webdb_user = False -webdb_password = False -db_name = tinyerp -webdb_port = False +translate_modules = ['all'] +db_name = terp +netrpc = True demo = {} interface = -netrpc = True +db_host = False db_port = False port = 8069 addons_path = None tinyerp-server.patch: Index: tinyerp-server.patch =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp-server.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- tinyerp-server.patch 30 Jan 2006 13:56:00 -0000 1.4 +++ tinyerp-server.patch 18 Mar 2006 14:43:35 -0000 1.5 @@ -21,14 +21,3 @@ 'stock', 'subscription'] required_modules = [('psycopg', 'PostgreSQL module'), -@@ -104,8 +106,9 @@ - # create startup script - start_script = \ - "#!/bin/sh\n\ -+echo $$ > /var/spool/tinyerp/tinyerp-server.pid\n\ - cd %s/lib/python%s/site-packages/tinyerp-server\n\ --exec %s ./tinyerp-server.py $@" % (sys.prefix, py_short_version, sys.executable) -+exec %s ./tinyerp-server.py $@ >> /var/log/tinyerp/tinyerp-server.log 2>&1" % (sys.prefix, py_short_version, sys.executable) - # write script - f = open('tinyerp-server', 'w') - f.write(start_script) Index: tinyerp.spec =================================================================== RCS file: /cvs/extras/rpms/tinyerp/FC-5/tinyerp.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- tinyerp.spec 14 Feb 2006 08:07:43 -0000 1.15 +++ tinyerp.spec 18 Mar 2006 14:43:35 -0000 1.16 @@ -3,7 +3,7 @@ Name: tinyerp Version: 3.2.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: Open Source ERP Client @@ -23,6 +23,7 @@ Requires: pygtk2, pygtk2-libglade, pydot Patch0: tinyerp-client.patch Patch1: tinyerp-server.patch +Patch2: tinyerp-server-pidlog.patch %description Tiny ERP is a free enterprise management software package. It @@ -50,6 +51,7 @@ %setup -q -a 1 -c %{name}-%{version} %patch0 %patch1 +%patch2 %build cd client @@ -137,6 +139,10 @@ %changelog +* Sat Mar 18 2006 Dan Horak 3.2.1-3 +- new config file with only default values (#184505) +- added a patch for handling the pid and log file in the server (#184502) + * Tue Feb 14 2006 Dan Horak 3.2.1-2 - rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sat Mar 18 16:08:03 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 18 Mar 2006 11:08:03 -0500 Subject: rpms/compat-wxGTK/devel compat-wxGTK.spec,1.2,1.3 Message-ID: <200603181608.k2IG8dqZ016734@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/compat-wxGTK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16714 Modified Files: compat-wxGTK.spec Log Message: Fix up issues mentioned in 175500. Index: compat-wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/compat-wxGTK/devel/compat-wxGTK.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- compat-wxGTK.spec 6 Jan 2006 17:52:38 -0000 1.2 +++ compat-wxGTK.spec 18 Mar 2006 16:08:02 -0000 1.3 @@ -2,7 +2,7 @@ Name: compat-wxGTK Version: 2.4.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Compatibility version of the wxWidgets GTK GUI library License: BSD Group: System Environment/Libraries @@ -19,8 +19,6 @@ Requires: %{name}-common = %{version}-%{release} Obsoletes: wxGTK <= 2.4.2-12 -Provides: wxGTK = %{version}-%{release} - %description wxWidgets/GTK is the GTK+ (1.2) port of the C++ cross-platform wxWidgets GUI library, offering classes for all common GUI controls as well as a @@ -38,7 +36,6 @@ Requires: gtk+-devel Conflicts: %{name}2-devel Obsoletes: wxGTK-devel <= 2.4.2-12 -Provides: wxGTK-devel = %{version}-%{release} %description devel This package includes files needed to link with the wxGTK library. @@ -48,7 +45,6 @@ Summary: Compatibility version of the wxWidgets GTK2 GUI library Requires: %{name}-common = %{version}-%{release} Obsoletes: wxGTK2 <= 2.4.2-12 -Provides: wxGTK2 = %{version}-%{release} %description -n %{name}2 wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets @@ -67,7 +63,6 @@ Requires: gtk2-devel Conflicts: %{name}-devel Obsoletes: wxGTK2-devel <= 2.4.2-12 -Provides: wxGTK2-devel = %{version}-%{release} %description -n %{name}2-devel This package include files needed to link with the wxGTK2 library. @@ -76,7 +71,6 @@ Group: System Environment/Libraries Summary: wxGTK* common files Obsoletes: wxGTK-common <= 2.4.2-12 -Provides: wxGTK-common = %{version}-%{release} %description common Common files for wxWidgets/GTK1 and GTK2. @@ -85,7 +79,6 @@ Group: Development/Libraries Summary: wxGTK* common development files Obsoletes: wxGTK-common-devel <= 2.4.2-12 -Provides: wxGTK-common-devel = %{version}-%{release} %description common-devel Common development files for wxWidgets/GTK1 and GTK2. @@ -95,7 +88,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-gl <= 2.4.2-12 -Provides: wxGTK-gl = %{version}-%{release} %description gl %{summary}. @@ -105,7 +97,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-gl <= 2.4.2-12 -Provides: wxGTK2-gl = %{version}-%{release} %description -n %{name}2-gl %{summary}. @@ -115,7 +106,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-stc <= 2.4.2-12 -Provides: wxGTK-stc = %{version}-%{release} %description stc Styled text control add-on for wxGTK. Based on the Scintillia project. @@ -125,7 +115,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-stc <= 2.4.2-12 -Provides: wxGTK2-stc = %{version}-%{release} %description -n %{name}2-stc Styled text control add-on for wxGTK2. Based on the Scintillia project. @@ -135,7 +124,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-xrc <= 2.4.2-12 -Provides: wxGTK-xrc = %{version}-%{release} %description xrc The XML-based resource system, known as XRC, allows user interface @@ -148,7 +136,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-xrc <= 2.4.2-12 -Provides: wxGTK2-xrc = %{version}-%{release} %description -n %{name}2-xrc The XML-based resource system, known as XRC, allows user interface @@ -288,7 +275,7 @@ %ghost %{_bindir}/wx-2.4-config %{_bindir}/wxgtk2-*-config %{_libdir}/libwx_gtk2[-_]*.so -%{_libdir}/wx/include/gtk-2* +%{_libdir}/wx/include/gtk2-2* %files common -f wxstd.lang %defattr(-,root,root,-) @@ -330,6 +317,10 @@ %changelog +* Sat Mar 18 2006 Tom "spot" Callaway - 2.4.2-17 +- fix include blob in files (bz 175500) +- remove all "Provides" (bz 175500) + * Fri Jan 6 2006 Tom "spot" Callaway - 2.4.2-16 - FC5 modular X deps From fedora-extras-commits at redhat.com Sat Mar 18 17:05:36 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 18 Mar 2006 12:05:36 -0500 Subject: rpms/compat-wxGTK/FC-5 compat-wxGTK.spec,1.2,1.3 Message-ID: <200603181706.k2IH6AOH019498@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/compat-wxGTK/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19466/FC-5 Modified Files: compat-wxGTK.spec Log Message: Do it for FC-4. Index: compat-wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/compat-wxGTK/FC-5/compat-wxGTK.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- compat-wxGTK.spec 6 Jan 2006 17:52:38 -0000 1.2 +++ compat-wxGTK.spec 18 Mar 2006 17:05:36 -0000 1.3 @@ -2,7 +2,7 @@ Name: compat-wxGTK Version: 2.4.2 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Compatibility version of the wxWidgets GTK GUI library License: BSD Group: System Environment/Libraries @@ -19,8 +19,6 @@ Requires: %{name}-common = %{version}-%{release} Obsoletes: wxGTK <= 2.4.2-12 -Provides: wxGTK = %{version}-%{release} - %description wxWidgets/GTK is the GTK+ (1.2) port of the C++ cross-platform wxWidgets GUI library, offering classes for all common GUI controls as well as a @@ -38,7 +36,6 @@ Requires: gtk+-devel Conflicts: %{name}2-devel Obsoletes: wxGTK-devel <= 2.4.2-12 -Provides: wxGTK-devel = %{version}-%{release} %description devel This package includes files needed to link with the wxGTK library. @@ -48,7 +45,6 @@ Summary: Compatibility version of the wxWidgets GTK2 GUI library Requires: %{name}-common = %{version}-%{release} Obsoletes: wxGTK2 <= 2.4.2-12 -Provides: wxGTK2 = %{version}-%{release} %description -n %{name}2 wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets @@ -67,7 +63,6 @@ Requires: gtk2-devel Conflicts: %{name}-devel Obsoletes: wxGTK2-devel <= 2.4.2-12 -Provides: wxGTK2-devel = %{version}-%{release} %description -n %{name}2-devel This package include files needed to link with the wxGTK2 library. @@ -76,7 +71,6 @@ Group: System Environment/Libraries Summary: wxGTK* common files Obsoletes: wxGTK-common <= 2.4.2-12 -Provides: wxGTK-common = %{version}-%{release} %description common Common files for wxWidgets/GTK1 and GTK2. @@ -85,7 +79,6 @@ Group: Development/Libraries Summary: wxGTK* common development files Obsoletes: wxGTK-common-devel <= 2.4.2-12 -Provides: wxGTK-common-devel = %{version}-%{release} %description common-devel Common development files for wxWidgets/GTK1 and GTK2. @@ -95,7 +88,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-gl <= 2.4.2-12 -Provides: wxGTK-gl = %{version}-%{release} %description gl %{summary}. @@ -105,7 +97,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-gl <= 2.4.2-12 -Provides: wxGTK2-gl = %{version}-%{release} %description -n %{name}2-gl %{summary}. @@ -115,7 +106,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-stc <= 2.4.2-12 -Provides: wxGTK-stc = %{version}-%{release} %description stc Styled text control add-on for wxGTK. Based on the Scintillia project. @@ -125,7 +115,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-stc <= 2.4.2-12 -Provides: wxGTK2-stc = %{version}-%{release} %description -n %{name}2-stc Styled text control add-on for wxGTK2. Based on the Scintillia project. @@ -135,7 +124,6 @@ Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} Obsoletes: wxGTK-xrc <= 2.4.2-12 -Provides: wxGTK-xrc = %{version}-%{release} %description xrc The XML-based resource system, known as XRC, allows user interface @@ -148,7 +136,6 @@ Group: System Environment/Libraries Requires: %{name}2 = %{version}-%{release} Obsoletes: wxGTK2-xrc <= 2.4.2-12 -Provides: wxGTK2-xrc = %{version}-%{release} %description -n %{name}2-xrc The XML-based resource system, known as XRC, allows user interface @@ -288,7 +275,7 @@ %ghost %{_bindir}/wx-2.4-config %{_bindir}/wxgtk2-*-config %{_libdir}/libwx_gtk2[-_]*.so -%{_libdir}/wx/include/gtk-2* +%{_libdir}/wx/include/gtk2-2* %files common -f wxstd.lang %defattr(-,root,root,-) @@ -330,6 +317,10 @@ %changelog +* Sat Mar 18 2006 Tom "spot" Callaway - 2.4.2-17 +- fix include blob in files (bz 175500) +- remove all "Provides" (bz 175500) + * Fri Jan 6 2006 Tom "spot" Callaway - 2.4.2-16 - FC5 modular X deps From fedora-extras-commits at redhat.com Sat Mar 18 17:05:29 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Sat, 18 Mar 2006 12:05:29 -0500 Subject: rpms/compat-wxGTK/FC-4 compat-wxGTK.spec,1.3,1.4 Message-ID: <200603181706.k2IH6Wbt019501@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/compat-wxGTK/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19466/FC-4 Modified Files: compat-wxGTK.spec Log Message: Do it for FC-4. Index: compat-wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/compat-wxGTK/FC-4/compat-wxGTK.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- compat-wxGTK.spec 18 Mar 2006 16:08:02 -0000 1.3 +++ compat-wxGTK.spec 18 Mar 2006 17:05:29 -0000 1.4 @@ -15,7 +15,7 @@ BuildRequires: gtk+-devel gtk2-devel zlib-devel >= 1.1.4 BuildRequires: libpng-devel libjpeg-devel libtiff-devel -BuildRequires: mesa-libGL-devel, mesa-libGLU-devel +BuildRequires: xorg-x11-Mesa-libGL, xorg-x11-Mesa-libGLU, xorg-x11-devel Requires: %{name}-common = %{version}-%{release} Obsoletes: wxGTK <= 2.4.2-12 From fedora-extras-commits at redhat.com Sat Mar 18 17:51:42 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sat, 18 Mar 2006 12:51:42 -0500 Subject: rpms/prboom/devel prboom-2.3.1-fixpsnprintf.patch, NONE, 1.1 prboom-2.3.1-gcc4.patch, 1.1, 1.2 prboom.spec, 1.1, 1.2 Message-ID: <200603181752.k2IHqEmK020957@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20924 Modified Files: prboom-2.3.1-gcc4.patch prboom.spec Added Files: prboom-2.3.1-fixpsnprintf.patch Log Message: Updated patches to fix segfault on i386 (BZ #185741) prboom-2.3.1-fixpsnprintf.patch: --- NEW FILE prboom-2.3.1-fixpsnprintf.patch --- diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c --- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.c 2006-03-18 09:04:48.000000000 -0800 @@ -130,7 +130,7 @@ case 'X': \ case 'p': \ GET_VARS \ - ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, (*pfmt == 'p' || prefix == 'l')? va_arg(ap, unsigned long):va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 'e': \ @@ -139,17 +139,17 @@ case 'g': \ case 'G': \ GET_VARS \ - ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, double)); \ state = STATE_NONE; \ break; \ case 'c': \ GET_VARS \ - ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 's': \ GET_VARS \ - ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, char *)); \ state = STATE_NONE; \ break; \ case 'n': \ @@ -306,11 +306,11 @@ } int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, int arg) { if (*nmax > 1) { - **pinsertion = (char) va_arg(*ap, int); + **pinsertion = (char) arg; *pinsertion += 1; *nmax -= 1; } @@ -338,9 +338,8 @@ */ int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, const char *str) { - const char *str = va_arg(*ap, const char *); int nprinted; int len; int pad = 0; @@ -428,7 +427,7 @@ */ int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, unsigned long arg) { long int number = 0; unsigned long int unumber; @@ -463,17 +462,17 @@ { case 'd': case 'i': - number = (signed short int) va_arg(*ap, int); + number = (signed short int) arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = (unsigned short int) va_arg(*ap, int); + unumber = (unsigned short int) arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } break; @@ -482,17 +481,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed long int); + number = arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned long int); + unumber = arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = numbersigned; } break; @@ -501,17 +500,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed int); + number = (signed int)arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned int); + unumber = (unsigned int)arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } } /* switch fmt to retrieve number */ @@ -784,13 +783,11 @@ */ int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, double value) { char *digits; int sign = 0; int dec; - double value = va_arg(*ap, double); - int len; int pad = 0; int signwidth = 0; diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h --- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.h 2006-03-18 09:05:19.000000000 -0800 @@ -17,16 +17,16 @@ * if there had been enough room). */ int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, int arg); int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, unsigned long arg); int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, const char *str); int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, double value); /* These are the flags you need (use logical OR) for the flags parameter of * fmt functions above. prboom-2.3.1-gcc4.patch: Index: prboom-2.3.1-gcc4.patch =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/prboom-2.3.1-gcc4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom-2.3.1-gcc4.patch 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom-2.3.1-gcc4.patch 18 Mar 2006 17:51:42 -0000 1.2 @@ -89,176 +89,6 @@ extern int iquehead; extern int iquetail; extern int gravity; -diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c ---- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.c 2006-03-06 20:42:04.000000000 -0800 -@@ -130,7 +130,7 @@ - case 'X': \ - case 'p': \ - GET_VARS \ -- ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'e': \ -@@ -139,17 +139,17 @@ - case 'g': \ - case 'G': \ - GET_VARS \ -- ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'c': \ - GET_VARS \ -- ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 's': \ - GET_VARS \ -- ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'n': \ -@@ -306,11 +306,11 @@ - } - - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - if (*nmax > 1) - { -- **pinsertion = (char) va_arg(*ap, int); -+ **pinsertion = (char) va_arg(ap, int); - *pinsertion += 1; - *nmax -= 1; - } -@@ -338,9 +338,9 @@ - */ - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { -- const char *str = va_arg(*ap, const char *); -+ const char *str = va_arg(ap, const char *); - int nprinted; - int len; - int pad = 0; -@@ -428,7 +428,7 @@ - */ - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - long int number = 0; - unsigned long int unumber; -@@ -463,17 +463,17 @@ - { - case 'd': - case 'i': -- number = (signed short int) va_arg(*ap, int); -+ number = (signed short int) va_arg(ap, int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = (unsigned short int) va_arg(*ap, int); -+ unumber = (unsigned short int) va_arg(ap, int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - break; -@@ -482,17 +482,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed long int); -+ number = va_arg(ap, signed long int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned long int); -+ unumber = va_arg(ap, unsigned long int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = numbersigned; - } - break; -@@ -501,17 +501,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed int); -+ number = va_arg(ap, signed int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned int); -+ unumber = va_arg(ap, unsigned int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - } /* switch fmt to retrieve number */ -@@ -784,12 +784,12 @@ - */ - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - char *digits; - int sign = 0; - int dec; -- double value = va_arg(*ap, double); -+ double value = va_arg(ap, double); - - int len; - int pad = 0; -diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h ---- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.h 2006-03-06 20:42:04.000000000 -0800 -@@ -17,16 +17,16 @@ - * if there had been enough room). - */ - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - /* These are the flags you need (use logical OR) for the flags parameter of - * fmt functions above. diff -Naur prboom-2.3.1/src/r_bsp.h prboom-2.3.1.new/src/r_bsp.h --- prboom-2.3.1/src/r_bsp.h 2004-09-15 12:09:31.000000000 -0700 +++ prboom-2.3.1.new/src/r_bsp.h 2006-03-06 20:42:04.000000000 -0800 Index: prboom.spec =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom.spec 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom.spec 18 Mar 2006 17:51:42 -0000 1.2 @@ -2,7 +2,7 @@ Name: prboom Version: 2.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open source port of the DOOM game engine Group: Amusements/Games @@ -13,6 +13,7 @@ Patch1: prboom-2.3.1-gamedir.patch Patch2: prboom-2.3.1-config.patch Patch3: prboom-2.3.1-64bit.patch +Patch4: prboom-2.3.1-fixpsnprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_net-devel @@ -32,6 +33,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure --disable-cpu-opt --program-prefix='' @@ -67,6 +69,9 @@ %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt %changelog +* Fri Mar 17 2006 Wart 2.3.1-5 +- Updated patches to fix segfault on i386 (BZ #185741) + * Tue Mar 14 2006 Wart 2.3.1-4 - Added patch to fix up some x86_64 issues From fedora-extras-commits at redhat.com Sat Mar 18 18:35:40 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sat, 18 Mar 2006 13:35:40 -0500 Subject: rpms/qemu/FC-5 qemu-0.7.0-build.patch,1.2,1.3 qemu.spec,1.9,1.10 Message-ID: <200603181836.k2IIaDCr023305@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23283 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: filter out more compiler options qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu-0.7.0-build.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qemu-0.7.0-build.patch 17 Mar 2006 14:57:13 -0000 1.2 +++ qemu-0.7.0-build.patch 18 Mar 2006 18:35:40 -0000 1.3 @@ -4,7 +4,7 @@ -include config-host.mak -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing ifdef CONFIG_DARWIN CFLAGS+= -mdynamic-no-pic endif @@ -15,7 +15,7 @@ DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) endif -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing ++CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing #CFLAGS+=-Werror LDFLAGS=-g LIBS= @@ -24,7 +24,7 @@ # -msmall-data is not used because we want two-instruction relocations # for the constant constructions -OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall ++OP_CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing # Ensure there's only a single GP CFLAGS += -msmall-data LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- qemu.spec 17 Mar 2006 14:57:13 -0000 1.9 +++ qemu.spec 18 Mar 2006 18:35:40 -0000 1.10 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL/LGPL Group: Development/Tools @@ -78,6 +78,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Sat Mar 18 2006 David Woodhouse 0.8.0-4 +- Disable stack-protector options which gcc 3.2 doesn't like + * Fri Mar 17 2006 David Woodhouse 0.8.0-3 - Use -mcpu= instead of -mtune= on x86_64 too - Disable SPARC targets on x86_64, because dyngen doesn't like fnegs From fedora-extras-commits at redhat.com Sat Mar 18 20:51:36 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 15:51:36 -0500 Subject: rpms/gossip/devel .cvsignore, 1.5, 1.6 gossip.spec, 1.15, 1.16 sources, 1.5, 1.6 Message-ID: <200603182052.k2IKq9Ce027962@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27941 Modified Files: .cvsignore gossip.spec sources Log Message: * Sat Mar 18 2006 Brian Pepple - 0.10.2-3 - Update to 0.10.2. - Add BR for iso-codes-devel & gnome-doc-utils. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Feb 2006 20:40:38 -0000 1.5 +++ .cvsignore 18 Mar 2006 20:51:36 -0000 1.6 @@ -1 +1 @@ -gossip-0.10.1.tar.bz2 +gossip-0.10.2.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/gossip.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gossip.spec 25 Feb 2006 20:53:19 -0000 1.15 +++ gossip.spec 18 Mar 2006 20:51:36 -0000 1.16 @@ -1,8 +1,8 @@ %define with_dbus 1 Name: gossip -Version: 0.10.1 -Release: 2%{?dist} +Version: 0.10.2 +Release: 3%{?dist} Summary: Gnome Jabber Client Group: Applications/Communications @@ -21,6 +21,9 @@ BuildRequires: aspell-devel BuildRequires: gettext BuildRequires: scrollkeeper +BuildRequires: iso-codes-devel +BuildRequires: gnome-doc-utils + %if %{with_dbus} BuildRequires: dbus-devel >= 0.31 @@ -42,7 +45,7 @@ %build -%configure \ +%configure --disable-scrollkeeper \ %if %{with_dbus} --enable-dbus=yes %else @@ -118,6 +121,10 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 0.10.2-3 +- Update to 0.10.2. +- Add BR for iso-codes-devel & gnome-doc-utils. + * Sat Feb 25 2006 Brian Pepple - 0.10.1-2 - Bump to make upgrade path. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Feb 2006 20:40:38 -0000 1.5 +++ sources 18 Mar 2006 20:51:36 -0000 1.6 @@ -1 +1 @@ -2cf3be244b3983da193ef0ef35302782 gossip-0.10.1.tar.bz2 +f53dbf1fa951c620dbf4b95560e51c8c gossip-0.10.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 18 20:54:32 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 15:54:32 -0500 Subject: rpms/gossip/FC-5 .cvsignore, 1.5, 1.6 gossip.spec, 1.15, 1.16 sources, 1.5, 1.6 Message-ID: <200603182055.k2IKt4Jk028038@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gossip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28017 Modified Files: .cvsignore gossip.spec sources Log Message: * Sat Mar 18 2006 Brian Pepple - 0.10.2-2 - Update to 0.10.2. - Add BR for iso-codes-devel & gnome-doc-utils. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 25 Feb 2006 20:40:38 -0000 1.5 +++ .cvsignore 18 Mar 2006 20:54:32 -0000 1.6 @@ -1 +1 @@ -gossip-0.10.1.tar.bz2 +gossip-0.10.2.tar.bz2 Index: gossip.spec =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/gossip.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gossip.spec 25 Feb 2006 20:53:19 -0000 1.15 +++ gossip.spec 18 Mar 2006 20:54:32 -0000 1.16 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: gossip -Version: 0.10.1 +Version: 0.10.2 Release: 2%{?dist} Summary: Gnome Jabber Client @@ -21,6 +21,9 @@ BuildRequires: aspell-devel BuildRequires: gettext BuildRequires: scrollkeeper +BuildRequires: iso-codes-devel +BuildRequires: gnome-doc-utils + %if %{with_dbus} BuildRequires: dbus-devel >= 0.31 @@ -42,7 +45,7 @@ %build -%configure \ +%configure --disable-scrollkeeper \ %if %{with_dbus} --enable-dbus=yes %else @@ -118,6 +121,10 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 0.10.2-2 +- Update to 0.10.2. +- Add BR for iso-codes-devel & gnome-doc-utils. + * Sat Feb 25 2006 Brian Pepple - 0.10.1-2 - Bump to make upgrade path. Index: sources =================================================================== RCS file: /cvs/extras/rpms/gossip/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 25 Feb 2006 20:40:38 -0000 1.5 +++ sources 18 Mar 2006 20:54:32 -0000 1.6 @@ -1 +1 @@ -2cf3be244b3983da193ef0ef35302782 gossip-0.10.1.tar.bz2 +f53dbf1fa951c620dbf4b95560e51c8c gossip-0.10.2.tar.bz2 From fedora-extras-commits at redhat.com Sat Mar 18 22:45:14 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sat, 18 Mar 2006 17:45:14 -0500 Subject: rpms/qemu/FC-5 qemu-0.7.0-build.patch,1.3,1.4 qemu.spec,1.10,1.11 Message-ID: <200603182245.k2IMjklu032326@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32304 Modified Files: qemu-0.7.0-build.patch qemu.spec Log Message: drop qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu-0.7.0-build.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qemu-0.7.0-build.patch 18 Mar 2006 18:35:40 -0000 1.3 +++ qemu-0.7.0-build.patch 18 Mar 2006 22:45:13 -0000 1.4 @@ -1,33 +1,5 @@ --- qemu-0.7.0/Makefile.orig 2005-04-27 21:52:05.000000000 +0100 +++ qemu-0.7.0/Makefile 2005-04-30 11:01:41.000000000 +0100 -@@ -1,6 +1,6 @@ - -include config-host.mak - --CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing - ifdef CONFIG_DARWIN - CFLAGS+= -mdynamic-no-pic - endif ---- qemu-0.7.0/Makefile.target.orig 2005-04-27 21:52:05.000000000 +0100 -+++ qemu-0.7.0/Makefile.target 2005-04-30 11:03:59.000000000 +0100 -@@ -14,7 +14,7 @@ - VPATH+=:$(SRC_PATH)/linux-user - DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) - endif --CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing - #CFLAGS+=-Werror - LDFLAGS=-g - LIBS= -@@ -177,7 +177,7 @@ - ifeq ($(ARCH),alpha) - # -msmall-data is not used because we want two-instruction relocations - # for the constant constructions --OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing - # Ensure there's only a single GP - CFLAGS += -msmall-data - LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld @@ -463,7 +463,7 @@ install: all Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- qemu.spec 18 Mar 2006 18:35:40 -0000 1.10 +++ qemu.spec 18 Mar 2006 22:45:13 -0000 1.11 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL/LGPL Group: Development/Tools @@ -10,7 +10,7 @@ Source1: qemu.init Patch0: qemu-0.7.0-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: SDL-devel compat-gcc-32 +BuildRequires: SDL-devel compat-gcc-32 zlib-devel PreReq: /sbin/chkconfig PreReq: /sbin/service ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64 @@ -78,6 +78,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Sat Mar 18 2006 David Woodhouse 0.8.0-5 +- Just drop $RPM_OPT_FLAGS. They're too much of a PITA + * Sat Mar 18 2006 David Woodhouse 0.8.0-4 - Disable stack-protector options which gcc 3.2 doesn't like From fedora-extras-commits at redhat.com Sat Mar 18 22:53:52 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sat, 18 Mar 2006 17:53:52 -0500 Subject: rpms/qemu/FC-5 qemu-0.7.0-build.patch,1.4,1.5 Message-ID: <200603182254.k2IMsP86032382@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32362 Modified Files: qemu-0.7.0-build.patch Log Message: Doh. Patch correct file qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu-0.7.0-build.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qemu-0.7.0-build.patch 18 Mar 2006 22:45:13 -0000 1.4 +++ qemu-0.7.0-build.patch 18 Mar 2006 22:53:52 -0000 1.5 @@ -1,5 +1,5 @@ ---- qemu-0.7.0/Makefile.orig 2005-04-27 21:52:05.000000000 +0100 -+++ qemu-0.7.0/Makefile 2005-04-30 11:01:41.000000000 +0100 +--- qemu-0.7.0/Makefile.target.orig 2005-04-27 21:52:05.000000000 +0100 ++++ qemu-0.7.0/Makefile.target 2005-04-30 11:01:41.000000000 +0100 @@ -463,7 +463,7 @@ install: all From fedora-extras-commits at redhat.com Sat Mar 18 23:07:35 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Sat, 18 Mar 2006 18:07:35 -0500 Subject: owners owners.list,1.751,1.752 Message-ID: <200603182308.k2IN888Y002136@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2119 Modified Files: owners.list Log Message: add acpi and python-chm Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.751 retrieving revision 1.752 diff -u -r1.751 -r1.752 --- owners.list 18 Mar 2006 10:21:28 -0000 1.751 +++ owners.list 18 Mar 2006 23:07:35 -0000 1.752 @@ -17,6 +17,7 @@ Fedora Extras|abe|A scrolling, platform-jumping, ancient pyramid exploring game|wart at kobold.org|extras-qa at fedoraproject.org| Fedora Extras|abicheck|ABI checking tool|bugs.michael at gmx.net|extras-qa at fedoraproject.org| Fedora Extras|abiword|The AbiWord word processor|uwog at uwog.net|extras-qa at fedoraproject.org| +Fedora Extras|acpi|Command-line ACPI client|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|acpitool|A command line ACPI client for Linux|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|adime|Allegro Dialogs Made Easy|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|adns|Advanced, easy to use, asynchronous-capable DNS client library|byte at fedoraproject.org|extras-qa at fedoraproject.org| @@ -1158,6 +1159,7 @@ Fedora Extras|python-cheetah|Template engine and code-generator|mikeb at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|python-cherrypy|A pythonic, object-oriented web development framework|gijs at gewis.nl|extras-qa at fedoraproject.org| Fedora Extras|python-cherrytemplate|An easy and powerful templating module for Python|gijs at gewis.nl|extras-qa at fedoraproject.org| +Fedora Extras|python-chm|Python package for CHM files handling|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|python-clientform|Python module for client-side HTML forms|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org| Fedora Extras|python-cpio|A Python module for accessing cpio archives|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|python-crypto|A cryptography library for Python|fedora at leemhuis.info|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sun Mar 19 01:16:33 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 18 Mar 2006 20:16:33 -0500 Subject: rpms/python-GeoIP/FC-5 python-GeoIP.spec,1.1,1.2 Message-ID: <200603190117.k2J1H6XK006288@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/python-GeoIP/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6266 Modified Files: python-GeoIP.spec Log Message: * Sun Mar 19 2006 Michael Fleming 1.2.1-4 - Bump for FC5 Index: python-GeoIP.spec =================================================================== RCS file: /cvs/extras/rpms/python-GeoIP/FC-5/python-GeoIP.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- python-GeoIP.spec 21 Feb 2006 22:33:22 -0000 1.1 +++ python-GeoIP.spec 19 Mar 2006 01:16:32 -0000 1.2 @@ -2,7 +2,7 @@ Name: python-GeoIP Version: 1.2.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python bindings for the GeoIP geographical lookup libraries Group: Development/Languages @@ -43,6 +43,9 @@ %changelog +* Sun Mar 19 2006 Michael Fleming 1.2.1-4 +- Bump for FC5 + * Mon Feb 21 2006 Michael Fleming 1.2.1-3 - Trivial spec tweaks - Removed redundant GeoIP Requires: (rpm picks it up automatically) From fedora-extras-commits at redhat.com Sun Mar 19 01:29:53 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 18 Mar 2006 20:29:53 -0500 Subject: rpms/mod_geoip/FC-5 mod_geoip.spec,1.1,1.2 Message-ID: <200603190130.k2J1UQ9Q006467@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/rpms/mod_geoip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6448 Modified Files: mod_geoip.spec Log Message: * Sun Mar 19 2006 Michael Fleming 1.1.7-3 - Bump for FC5 Index: mod_geoip.spec =================================================================== RCS file: /cvs/extras/rpms/mod_geoip/FC-5/mod_geoip.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mod_geoip.spec 20 Feb 2006 22:45:12 -0000 1.1 +++ mod_geoip.spec 19 Mar 2006 01:29:53 -0000 1.2 @@ -1,7 +1,7 @@ Summary: GeoIP module for the Apache HTTP Server Name: mod_geoip Version: 1.1.7 -Release: 2%{?dist} +Release: 3%{?dist} License: Apache Software License Group: System Environment/Daemons URL: http://www.maxmind.com/app/mod_geoip @@ -46,6 +46,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_geoip.conf %changelog +* Sun Mar 19 2006 Michael Fleming 1.1.7-3 +- Bump for FC5 + * Sat Feb 18 2006 Michael Fleming 1.1.7-2 - Small cleanups, including a saner Requires: for httpd - Don't strip the binary From fedora-extras-commits at redhat.com Sun Mar 19 01:49:51 2006 From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming)) Date: Sat, 18 Mar 2006 20:49:51 -0500 Subject: comps comps-fe5.xml.in,1.29,1.30 Message-ID: <200603190150.k2J1oNmP006555@cvs-int.fedora.redhat.com> Author: mfleming Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6538 Modified Files: comps-fe5.xml.in Log Message: Added mlmmj, mod_cband, mod_security & mod_geoip Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- comps-fe5.xml.in 18 Mar 2006 03:58:49 -0000 1.29 +++ comps-fe5.xml.in 19 Mar 2006 01:49:51 -0000 1.30 @@ -355,6 +355,7 @@ clamav-milter exim exim-doc + mlmmj pyzor @@ -546,6 +547,9 @@ lighttpd lighttpd-fastcgi mediawiki + mod_cband + mod_geoip + mod_security moin plone thttpd From fedora-extras-commits at redhat.com Sun Mar 19 02:52:11 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 21:52:11 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/FC-4 .cvsignore, 1.4, 1.5 perl-Locale-Maketext-Lexicon.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603190252.k2J2qhQr008718@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8663/FC-4 Modified Files: .cvsignore perl-Locale-Maketext-Lexicon.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Dec 2005 14:03:58 -0000 1.4 +++ .cvsignore 19 Mar 2006 02:52:11 -0000 1.5 @@ -1 +1 @@ -Locale-Maketext-Lexicon-0.53.tar.gz +Locale-Maketext-Lexicon-0.54.tar.gz Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Locale-Maketext-Lexicon.spec 5 Dec 2005 14:03:58 -0000 1.4 +++ perl-Locale-Maketext-Lexicon.spec 19 Mar 2006 02:52:11 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Locale-Maketext-Lexicon -Version: 0.53 +Version: 0.54 Release: 1%{?dist} Summary: Extract translatable strings from source License: GPL or Artistic @@ -55,16 +55,8 @@ %{_mandir}/man3/* %changelog -* Mon Dec 05 2005 Ralf Corsepius - 0.53-1 +* Sun Mar 19 2006 Ralf Cors??pius - 0.54-1 - Upstream update. -* Sun Nov 13 2005 Ralf Corsepius - 0.50-1 -- Upsteam update. -- Add docs to %%doc -- Inline provides-filter script into spec. - -* Sat Sep 17 2005 Ralf Corsepius - 0.49-2 -- Spec file cleanup. - -* Tue Sep 13 2005 Ralf Corsepius - 0.49-1 -- FE submission. +* Mon Dec 05 2005 Ralf Corsepius - 0.53-1 +- Upstream update. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Dec 2005 14:03:58 -0000 1.4 +++ sources 19 Mar 2006 02:52:11 -0000 1.5 @@ -1 +1 @@ -c1bce07646a0d9bcd8a56a60235b63ec Locale-Maketext-Lexicon-0.53.tar.gz +2adcb8651081bcb07629305f8b5e8f71 Locale-Maketext-Lexicon-0.54.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 02:52:17 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 21:52:17 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/FC-5 .cvsignore, 1.4, 1.5 perl-Locale-Maketext-Lexicon.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603190252.k2J2qoGT008723@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8663/FC-5 Modified Files: .cvsignore perl-Locale-Maketext-Lexicon.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Dec 2005 13:40:16 -0000 1.4 +++ .cvsignore 19 Mar 2006 02:52:17 -0000 1.5 @@ -1 +1 @@ -Locale-Maketext-Lexicon-0.53.tar.gz +Locale-Maketext-Lexicon-0.54.tar.gz Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Locale-Maketext-Lexicon.spec 28 Feb 2006 23:25:33 -0000 1.6 +++ perl-Locale-Maketext-Lexicon.spec 19 Mar 2006 02:52:17 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Locale-Maketext-Lexicon -Version: 0.53 -Release: 2%{?dist} +Version: 0.54 +Release: 1%{?dist} Summary: Extract translatable strings from source License: GPL or Artistic Group: Development/Libraries @@ -55,19 +55,11 @@ %{_mandir}/man3/* %changelog +* Sun Mar 19 2006 Ralf Cors??pius - 0.54-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 0.53-2 - Rebuild for perl-5.8.8. * Mon Dec 05 2005 Ralf Corsepius - 0.53-1 - Upstream update. - -* Sun Nov 13 2005 Ralf Corsepius - 0.50-1 -- Upsteam update. -- Add docs to %%doc -- Inline provides-filter script into spec. - -* Sat Sep 17 2005 Ralf Corsepius - 0.49-2 -- Spec file cleanup. - -* Tue Sep 13 2005 Ralf Corsepius - 0.49-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Dec 2005 13:40:16 -0000 1.4 +++ sources 19 Mar 2006 02:52:17 -0000 1.5 @@ -1 +1 @@ -c1bce07646a0d9bcd8a56a60235b63ec Locale-Maketext-Lexicon-0.53.tar.gz +2adcb8651081bcb07629305f8b5e8f71 Locale-Maketext-Lexicon-0.54.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 02:52:18 2006 From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu)) Date: Sat, 18 Mar 2006 21:52:18 -0500 Subject: rpms/perl-Locale-Maketext-Lexicon/devel .cvsignore, 1.4, 1.5 perl-Locale-Maketext-Lexicon.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603190252.k2J2qo7n008728@cvs-int.fedora.redhat.com> Author: corsepiu Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8663/devel Modified Files: .cvsignore perl-Locale-Maketext-Lexicon.spec sources Log Message: Upstream update. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 5 Dec 2005 13:40:16 -0000 1.4 +++ .cvsignore 19 Mar 2006 02:52:18 -0000 1.5 @@ -1 +1 @@ -Locale-Maketext-Lexicon-0.53.tar.gz +Locale-Maketext-Lexicon-0.54.tar.gz Index: perl-Locale-Maketext-Lexicon.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-Locale-Maketext-Lexicon.spec 28 Feb 2006 23:25:33 -0000 1.6 +++ perl-Locale-Maketext-Lexicon.spec 19 Mar 2006 02:52:18 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-Locale-Maketext-Lexicon -Version: 0.53 -Release: 2%{?dist} +Version: 0.54 +Release: 1%{?dist} Summary: Extract translatable strings from source License: GPL or Artistic Group: Development/Libraries @@ -55,19 +55,11 @@ %{_mandir}/man3/* %changelog +* Sun Mar 19 2006 Ralf Cors??pius - 0.54-1 +- Upstream update. + * Wed Mar 01 2006 Ralf Cors??pius - 0.53-2 - Rebuild for perl-5.8.8. * Mon Dec 05 2005 Ralf Corsepius - 0.53-1 - Upstream update. - -* Sun Nov 13 2005 Ralf Corsepius - 0.50-1 -- Upsteam update. -- Add docs to %%doc -- Inline provides-filter script into spec. - -* Sat Sep 17 2005 Ralf Corsepius - 0.49-2 -- Spec file cleanup. - -* Tue Sep 13 2005 Ralf Corsepius - 0.49-1 -- FE submission. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 5 Dec 2005 13:40:16 -0000 1.4 +++ sources 19 Mar 2006 02:52:18 -0000 1.5 @@ -1 +1 @@ -c1bce07646a0d9bcd8a56a60235b63ec Locale-Maketext-Lexicon-0.53.tar.gz +2adcb8651081bcb07629305f8b5e8f71 Locale-Maketext-Lexicon-0.54.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 03:31:31 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 22:31:31 -0500 Subject: rpms/liferea/devel .cvsignore, 1.23, 1.24 liferea.spec, 1.35, 1.36 sources, 1.24, 1.25 liferea-mozilla-lib64.patch, 1.1, NONE Message-ID: <200603190332.k2J3W3Au010923@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10902 Modified Files: .cvsignore liferea.spec sources Removed Files: liferea-mozilla-lib64.patch Log Message: * Sat Mar 18 2006 Brian Pepple - 1.0.8-3 - Update to 1.0.8. - Drop mozilla-lib64 patch, fixed upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 6 Mar 2006 15:09:38 -0000 1.23 +++ .cvsignore 19 Mar 2006 03:31:30 -0000 1.24 @@ -1 +1 @@ -liferea-1.0.7.tar.gz +liferea-1.0.8.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- liferea.spec 14 Mar 2006 22:14:14 -0000 1.35 +++ liferea.spec 19 Mar 2006 03:31:30 -0000 1.36 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.7 +Version: 1.0.8 Release: 3%{?dist} Summary: An RSS/RDF feed reader @@ -9,7 +9,6 @@ License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-mozilla-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel @@ -39,7 +38,6 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .mozilla %build @@ -107,6 +105,10 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 1.0.8-3 +- Update to 1.0.8. +- Drop mozilla-lib64 patch, fixed upstream. + * Tue Mar 14 2006 Brian Pepple - 1.0.7-3 - Add patch to find mozilla on x86_64 (#185243). Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/devel/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 6 Mar 2006 15:09:38 -0000 1.24 +++ sources 19 Mar 2006 03:31:30 -0000 1.25 @@ -1 +1 @@ -d75b2621d2e926695e833eaa2aed68c2 liferea-1.0.7.tar.gz +395a27a7d3e104e66767dc02161a9bdd liferea-1.0.8.tar.gz --- liferea-mozilla-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 03:33:39 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 22:33:39 -0500 Subject: rpms/liferea/FC-5 .cvsignore, 1.23, 1.24 liferea.spec, 1.35, 1.36 sources, 1.24, 1.25 liferea-mozilla-lib64.patch, 1.1, NONE Message-ID: <200603190334.k2J3YBZO011004@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10983 Modified Files: .cvsignore liferea.spec sources Removed Files: liferea-mozilla-lib64.patch Log Message: * Sat Mar 18 2006 Brian Pepple - 1.0.8-2 - Update to 1.0.8. - Drop mozilla-lib64 patch, fixed upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/.cvsignore,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- .cvsignore 6 Mar 2006 15:09:38 -0000 1.23 +++ .cvsignore 19 Mar 2006 03:33:39 -0000 1.24 @@ -1 +1 @@ -liferea-1.0.7.tar.gz +liferea-1.0.8.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/liferea.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- liferea.spec 14 Mar 2006 22:14:14 -0000 1.35 +++ liferea.spec 19 Mar 2006 03:33:39 -0000 1.36 @@ -1,15 +1,14 @@ %define with_dbus 1 Name: liferea -Version: 1.0.7 -Release: 3%{?dist} +Version: 1.0.8 +Release: 2%{?dist} Summary: An RSS/RDF feed reader Group: Applications/Internet License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-mozilla-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel @@ -39,7 +38,6 @@ %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .mozilla %build @@ -107,6 +105,10 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 1.0.8-2 +- Update to 1.0.8. +- Drop mozilla-lib64 patch, fixed upstream. + * Tue Mar 14 2006 Brian Pepple - 1.0.7-3 - Add patch to find mozilla on x86_64 (#185243). Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-5/sources,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- sources 6 Mar 2006 15:09:38 -0000 1.24 +++ sources 19 Mar 2006 03:33:39 -0000 1.25 @@ -1 +1 @@ -d75b2621d2e926695e833eaa2aed68c2 liferea-1.0.7.tar.gz +395a27a7d3e104e66767dc02161a9bdd liferea-1.0.8.tar.gz --- liferea-mozilla-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 03:35:49 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sat, 18 Mar 2006 22:35:49 -0500 Subject: rpms/liferea/FC-4 .cvsignore, 1.21, 1.22 liferea.spec, 1.26, 1.27 sources, 1.22, 1.23 liferea-mozilla-lib64.patch, 1.1, NONE Message-ID: <200603190336.k2J3aLxf011092@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/liferea/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11066 Modified Files: .cvsignore liferea.spec sources Removed Files: liferea-mozilla-lib64.patch Log Message: * Sat Mar 18 2006 Brian Pepple - 1.0.8-1 - Update to 1.0.8. - Drop mozilla-lib64 patch, fixed upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/.cvsignore,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- .cvsignore 18 Mar 2006 13:58:05 -0000 1.21 +++ .cvsignore 19 Mar 2006 03:35:49 -0000 1.22 @@ -1 +1 @@ -liferea-1.0.7.tar.gz +liferea-1.0.8.tar.gz Index: liferea.spec =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/liferea.spec,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- liferea.spec 18 Mar 2006 13:58:05 -0000 1.26 +++ liferea.spec 19 Mar 2006 03:35:49 -0000 1.27 @@ -1,7 +1,7 @@ %define with_dbus 1 Name: liferea -Version: 1.0.7 +Version: 1.0.8 Release: 1%{?dist} Summary: An RSS/RDF feed reader @@ -9,7 +9,6 @@ License: GPL URL: http://liferea.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-mozilla-lib64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkhtml2-devel mozilla-devel @@ -102,6 +101,10 @@ %changelog +* Sat Mar 18 2006 Brian Pepple - 1.0.8-1 +- Update to 1.0.8. +- Drop mozilla-lib64 patch, fixed upstream. + * Sat Mar 18 2006 Brian Pepple - 1.0.7-1 - Update to 1.0.7. - Add patch to find mozilla on x86_64 Index: sources =================================================================== RCS file: /cvs/extras/rpms/liferea/FC-4/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 18 Mar 2006 13:58:05 -0000 1.22 +++ sources 19 Mar 2006 03:35:49 -0000 1.23 @@ -1 +1 @@ -d75b2621d2e926695e833eaa2aed68c2 liferea-1.0.7.tar.gz +395a27a7d3e104e66767dc02161a9bdd liferea-1.0.8.tar.gz --- liferea-mozilla-lib64.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 03:39:55 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 18 Mar 2006 22:39:55 -0500 Subject: rpms/rkhunter/FC-5 .cvsignore, 1.5, 1.6 rkhunter.spec, 1.8, 1.9 sources, 1.5, 1.6 rkhunter-1.2.8-2.src.sha, 1.1, NONE Message-ID: <200603190340.k2J3eReG011165@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11141 Modified Files: .cvsignore rkhunter.spec sources Removed Files: rkhunter-1.2.8-2.src.sha Log Message: * Sat Mar 18 2006 Greg Houlette - 1.2.8-3 - Made an RPM transparent change to move the sha1 canary check file out of CVS and into the external lookaside cache (whose filename changes with every new package release anyway...) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Mar 2006 21:08:16 -0000 1.5 +++ .cvsignore 19 Mar 2006 03:39:54 -0000 1.6 @@ -1,3 +1,4 @@ rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +rkhunter-1.2.8-3.src.sha clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-5/rkhunter.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rkhunter.spec 18 Mar 2006 03:30:06 -0000 1.8 +++ rkhunter.spec 19 Mar 2006 03:39:54 -0000 1.9 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 2 +%define rpmRel 3 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -190,6 +190,11 @@ %changelog +* Sat Mar 18 2006 Greg Houlette - 1.2.8-3 +- Made an RPM transparent change to move the sha1 canary check + file out of CVS and into the external lookaside cache (whose + filename changes with every new package release anyway...) + * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Mar 2006 21:08:16 -0000 1.5 +++ sources 19 Mar 2006 03:39:54 -0000 1.6 @@ -1,2 +1,3 @@ 41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz +31a24aa09e6afa4cc0ec783dfe429a58 rkhunter-1.2.8-3.src.sha --- rkhunter-1.2.8-2.src.sha DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 03:48:37 2006 From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters)) Date: Sat, 18 Mar 2006 22:48:37 -0500 Subject: rpms/gourmet/devel gourmet-0.10.1-hu.po.patch, NONE, 1.1 gourmet-0.10.1-pt_BR.po.patch, NONE, 1.1 nutritionDruid.glade, NONE, 1.1 .cvsignore, 1.5, 1.6 gourmet.spec, 1.5, 1.6 Message-ID: <200603190349.k2J3nALU011246@cvs-int.fedora.redhat.com> Author: mpeters Update of /cvs/extras/rpms/gourmet/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11219 Modified Files: .cvsignore gourmet.spec Added Files: gourmet-0.10.1-hu.po.patch gourmet-0.10.1-pt_BR.po.patch nutritionDruid.glade Log Message: using spaces in spec file instead of tabs. added a file missing from upstream tarball. patched two broken .po files gourmet-0.10.1-hu.po.patch: --- NEW FILE gourmet-0.10.1-hu.po.patch --- --- gourmet-0.10.1/i18n/hu.po 2006-03-12 12:09:22.000000000 -0800 +++ hu.po 2006-03-18 19:21:00.000000000 -0800 @@ -558,9 +558,6 @@ "\n" "\n" msgstr "" -"???\n" -"???\n" -"\n" #: ../glade/recCard.glade.h:4 msgid "Category:" @@ -2818,4 +2815,4 @@ #, fuzzy #~ msgid "Recipe saved as Mealmaster file %(file)s" -#~ msgstr "Recept elmentve Melmaster %(file)s f??jlba." \ No newline at end of file +#~ msgstr "Recept elmentve Melmaster %(file)s f??jlba." gourmet-0.10.1-pt_BR.po.patch: --- NEW FILE gourmet-0.10.1-pt_BR.po.patch --- --- gourmet-0.10.1/i18n/pt_BR.po 2006-03-12 12:09:22.000000000 -0800 +++ pt_BR.po 2006-03-18 19:19:54.000000000 -0800 @@ -562,9 +562,6 @@ "\n" "\n" msgstr "" -"???\n" -"???\n" -"\n" #: ../glade/recCard.glade.h:4 msgid "Category:" @@ -2807,4 +2804,4 @@ #~ "MasterCook e alguns websites populares. Gourmet pode exportar receitas como " #~ "texto, arquivos MealMaster, p??ginas HTML, e um formato XML customizado para " #~ "interc??mbio com outros usu??rios Gourmet. Gourmet suporta linkar imagens com " -#~ "as receitas." \ No newline at end of file +#~ "as receitas." --- NEW FILE nutritionDruid.glade --- GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False 600 650 True False True False False GDK_WINDOW_TYPE_HINT_NORMAL GDK_GRAVITY_NORTH_WEST True False True False 0 True 0.5 0.5 1 1 0 0 12 6 True True True GTK_POS_TOP False False True False 0 True False 0 True <i>Select equivalent of</i> False True GTK_JUSTIFY_LEFT False False 0 0.5 0 6 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True True False True GTK_JUSTIFY_LEFT True True 0 0.5 6 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True True True 0 True * False 6 True True True <i>from USDA database</i> False True GTK_JUSTIFY_LEFT True False 0 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True _Change ingredient True GTK_RELIEF_NORMAL True 0 False False GTK_PACK_END True gtk-apply True GTK_RELIEF_NORMAL True 0 False True GTK_PACK_END 0 False True True <i>or</i> False True GTK_JUSTIFY_LEFT False False 0 0.5 10 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True 0.5 0.5 1 1 0 0 6 0 True False 0 True 0.5 0.5 1 1 0 0 0 0 True Enter C_ustom Information True GTK_RELIEF_NORMAL True 0 False False 6 False False True 0.5 0.5 1 1 6 0 12 0 True False 0 True 0 False True True False 0 True _Search USDA Ingredient Database: True False GTK_JUSTIFY_LEFT False False 0 0.5 0 0 searchEntry PANGO_ELLIPSIZE_NONE -1 False 0 0 False False gtk-find True GTK_RELIEF_NORMAL True 6 False False GTK_PACK_END True True True True True 0 True * False 12 True True True Search as you t_ype True GTK_RELIEF_NORMAL True False False True 6 False False GTK_PACK_END 0 False True True False 0 True Show only food in _group: True False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 foodGroupComboBox PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True False True 12 True True 6 False True True 0 False True True False 0 True <i>Search _results:</i> True True GTK_JUSTIFY_LEFT False False 0 0.5 0 0 treeview PANGO_ELLIPSIZE_NONE -1 False 0 0 True True True False 0 True gtk-goto-last True GTK_RELIEF_NORMAL True 6 True True GTK_PACK_END True gtk-go-forward True GTK_RELIEF_NORMAL True 6 True True GTK_PACK_END True gtk-go-back True GTK_RELIEF_NORMAL True 6 True True GTK_PACK_END True gtk-goto-first True GTK_RELIEF_NORMAL True 6 True True GTK_PACK_END True False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 True True GTK_PACK_END 0 False True 0 False True True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_SHADOW_NONE GTK_CORNER_TOP_LEFT True True False False True False False False 0 True True 0 True True False True True False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 tab True False 0 True False True GTK_JUSTIFY_LEFT True False 0 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False True True <i>From: </i> False True GTK_JUSTIFY_LEFT False False 0 0.5 0 12 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True 0 0.5 1 1 0 0 18 0 True 2 2 False 12 12 True _Amount: True False GTK_JUSTIFY_LEFT False False 0 0.5 0 0 fromAmountEntry PANGO_ELLIPSIZE_NONE -1 False 0 0 1 0 1 fill True Unit: True False GTK_JUSTIFY_LEFT False False 0 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 1 1 2 fill True True number_entry 0 0 Wed, 19 Oct 2005 23:46:08 GMT 1 2 0 1 fill True False 0 True False True True 0 False False True unit False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True _Change unit True GTK_RELIEF_NORMAL True 12 False False True _Save new unit True GTK_RELIEF_NORMAL True 0 False False True gtk-cancel True GTK_RELIEF_NORMAL True 12 False False 1 2 1 2 0 False False True <i>To: </i> False True GTK_JUSTIFY_LEFT False False 0 0.5 0 12 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True 0.5 0.5 1 1 0 0 18 0 True 2 2 False 12 6 True _Amount: True False GTK_JUSTIFY_LEFT False False 0 0.5 0 0 toAmountEntry PANGO_ELLIPSIZE_NONE -1 False 0 0 1 0 1 fill True _Unit: True False GTK_JUSTIFY_LEFT False False 0 0.5 0 0 toUnitCombo PANGO_ELLIPSIZE_NONE -1 False 0 0 1 1 2 fill True True number_entry 0 0 Wed, 19 Oct 2005 23:46:08 GMT 1 2 0 1 fill True False True 1 2 1 2 fill 0 False False False True True False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 tab True False 0 True False 0 True <i>Enter nutritional information for </i> False True GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True True number_entry 0 0 Wed, 19 Oct 2005 23:46:08 GMT 0 True True True False True 0 True True True True False True GTK_JUSTIFY_LEFT True True 0 0.5 6 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True False True GTK_JUSTIFY_LEFT True False 0 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False 0 False False True <i>or</i> False True GTK_JUSTIFY_LEFT False False 0 0.5 10 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True False 0 True 0.5 0.5 1 1 0 0 0 0 True _Use Information from USDA Database True GTK_RELIEF_NORMAL True 0 False False 0 False True True 4 False False True True GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_SHADOW_NONE GTK_CORNER_TOP_LEFT True GTK_SHADOW_IN True False 0 0 True True False True True False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 tab True False 0 True <b>Choose a Density</b> False True GTK_JUSTIFY_LEFT False False 0 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True False False GTK_JUSTIFY_LEFT True False 0 0.5 12 0 PANGO_ELLIPSIZE_NONE -1 False 0 0 False False True 0.5 0.5 1 1 12 0 12 0 True False 0 0 True True False True True False False GTK_JUSTIFY_LEFT False False 0.5 0.5 0 0 PANGO_ELLIPSIZE_NONE -1 False 0 tab 6 True True True GTK_BUTTONBOX_END 12 True gtk-go-back True GTK_RELIEF_NORMAL True True I_gnore True GTK_RELIEF_NORMAL True True True gtk-apply True GTK_RELIEF_NORMAL True 12 False True Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 18 Mar 2006 08:56:03 -0000 1.5 +++ .cvsignore 19 Mar 2006 03:48:37 -0000 1.6 @@ -1,3 +1 @@ -gourmet-0.8.5.12.tar.gz -gourmet-0.8.5.13.tar.gz gourmet-0.10.1.tar.gz Index: gourmet.spec =================================================================== RCS file: /cvs/extras/rpms/gourmet/devel/gourmet.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gourmet.spec 18 Mar 2006 10:07:28 -0000 1.5 +++ gourmet.spec 19 Mar 2006 03:48:37 -0000 1.6 @@ -1,29 +1,35 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} -Name: gourmet -Version: 0.10.1 -Release: 1%{?dist} -Summary: PyGTK Recipe Manager - -Group: Applications/Productivity -License: GPL -URL: http://grecipe-manager.sourceforge.net -Source0: http://easynews.dl.sourceforge.net/sourceforge/grecipe-manager/%{name}-%{version}.tar.gz +Name: gourmet +Version: 0.10.1 +Release: 2%{?dist} +Summary: PyGTK Recipe Manager + +Group: Applications/Productivity +License: GPL +URL: http://grecipe-manager.sourceforge.net +Source0: http://easynews.dl.sourceforge.net/sourceforge/grecipe-manager/%{name}-%{version}.tar.gz +# Temporary - mistakingly left out of upstream tarball +# upstream notified of problem +Source90: nutritionDruid.glade + +# fix the .po files +patch90: gourmet-0.10.1-hu.po.patch +patch91: gourmet-0.10.1-pt_BR.po.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: python >= 0:2.2 -BuildRequires: gettext -BuildRequires: desktop-file-utils -BuildRequires: sed >= 3.95 -Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") -Requires: gnome-python2 -Requires: gnome-python2-gnomeprint -Requires: metakit +BuildArch: noarch +BuildRequires: python >= 0:2.2 +BuildRequires: gettext +BuildRequires: desktop-file-utils +BuildRequires: sed >= 3.95 +Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") +Requires: gnome-python2 gnome-python2-gnomeprint metakit PyRTF Requires: pygtk2 > 2.3.9 -Requires: PyRTF -Requires: python-imaging -Requires: python-sqlite2 +Requires: python-imaging python-sqlite2 +# FC4 meets specified versions, but has glade errors - so somewhere the +# python glade requirements got bumped up w/o documenting %description Gourmet Recipe Manager is a recipe-organizer for GNOME that generates shopping @@ -33,6 +39,8 @@ %prep %setup -q +%patch90 -p1 +%patch91 -p1 %{__sed} -i 's?\.$??g' gourmet.desktop #%%{__sed} -i 's?\r??' src/lib/defaults_sk.py #%%{__sed} -i 's?\r??' src/lib/defaults_pt.py @@ -55,10 +63,7 @@ %build pushd i18n for file in *.po; do - # broken .po files - if [ ! ${file} = "hu.po" ] && [ ! ${file} = "pt_BR.po" ]; then - sh make_mo.sh $(basename $file .po) - fi + sh make_mo.sh $(basename $file .po) done popd @@ -77,6 +82,8 @@ --copy-name-to-generic-name \ --delete-original +install -p -m644 %{SOURCE90} %{buildroot}%{_datadir}/%{name}/ + %find_lang %{name} %clean @@ -119,6 +126,15 @@ %{_datadir}/gourmet %changelog +* Sat Mar 18 2006 Michael A. Peters - 0.10.1-2 +- A file was missing from the 0.10.1 upstream tarball. +- Added missing glade file from a cvs co of project (Source90). +- fixed broken po files (Patch90 + Patch91) +- (using 90 because those issues shouldn't be in final release) +-- +- TODO (upstream issue) +-- easier transition from 0.8.x user database to 0.10.x user database + * Sat Mar 18 2006 Michael A. Peters - 0.10.1-1 - This is the unstable branch of gourmet - for the devel branch - of Fedora Extras From fedora-extras-commits at redhat.com Sun Mar 19 04:25:44 2006 From: fedora-extras-commits at redhat.com (Gregory Lynn Houlette (tamaster)) Date: Sat, 18 Mar 2006 23:25:44 -0500 Subject: rpms/rkhunter/devel .cvsignore, 1.5, 1.6 rkhunter.spec, 1.8, 1.9 sources, 1.5, 1.6 rkhunter-1.2.8-2.src.sha, 1.1, NONE Message-ID: <200603190426.k2J4QG4N013299@cvs-int.fedora.redhat.com> Author: tamaster Update of /cvs/extras/rpms/rkhunter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13278 Modified Files: .cvsignore rkhunter.spec sources Removed Files: rkhunter-1.2.8-2.src.sha Log Message: * Sat Mar 18 2006 Greg Houlette - 1.2.8-3 - Made an RPM transparent change to move the sha1 canary check file out of CVS and into the external lookaside cache (whose filename changes with every new package release anyway...) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Mar 2006 21:08:16 -0000 1.5 +++ .cvsignore 19 Mar 2006 04:25:43 -0000 1.6 @@ -1,3 +1,4 @@ rkhunter-1.2.8.tar.gz rkhunter-auto_scan.tar.gz +rkhunter-1.2.8-3.src.sha clog Index: rkhunter.spec =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/rkhunter.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- rkhunter.spec 17 Mar 2006 13:01:00 -0000 1.8 +++ rkhunter.spec 19 Mar 2006 04:25:43 -0000 1.9 @@ -1,5 +1,5 @@ %define rkhVer 1.2.8 -%define rpmRel 2 +%define rpmRel 3 # We can't let RPM do the dependencies automatic because it'll then pick up # a correct but undesirable perl dependency, which rkhunter does not require @@ -190,6 +190,11 @@ %changelog +* Sat Mar 18 2006 Greg Houlette - 1.2.8-3 +- Made an RPM transparent change to move the sha1 canary check + file out of CVS and into the external lookaside cache (whose + filename changes with every new package release anyway...) + * Fri Mar 17 2006 Greg Houlette - 1.2.8-2 - Fixed architectural dependency during package creation eliminating use of _libdir configure macro (x86_64 /usr/lib64 mis-targeting) Index: sources =================================================================== RCS file: /cvs/extras/rpms/rkhunter/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Mar 2006 21:08:16 -0000 1.5 +++ sources 19 Mar 2006 04:25:43 -0000 1.6 @@ -1,2 +1,3 @@ 41122193b5006b617e03c637a17ae982 rkhunter-1.2.8.tar.gz a80c43eec631b565ca8b85e7ce9b8724 rkhunter-auto_scan.tar.gz +31a24aa09e6afa4cc0ec783dfe429a58 rkhunter-1.2.8-3.src.sha --- rkhunter-1.2.8-2.src.sha DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 04:45:19 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Sat, 18 Mar 2006 23:45:19 -0500 Subject: rpms/libsexy/devel .cvsignore, 1.6, 1.7 libsexy.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200603190445.k2J4jpF7013414@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libsexy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13387 Modified Files: .cvsignore libsexy.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Mar 2006 08:10:12 -0000 1.6 +++ .cvsignore 19 Mar 2006 04:45:18 -0000 1.7 @@ -1 +1 @@ -libsexy-0.1.7.tar.gz +libsexy-0.1.8.tar.gz Index: libsexy.spec =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/libsexy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libsexy.spec 16 Mar 2006 08:10:12 -0000 1.7 +++ libsexy.spec 19 Mar 2006 04:45:18 -0000 1.8 @@ -1,5 +1,5 @@ Name: libsexy -Version: 0.1.7 +Version: 0.1.8 Release: 1%{?dist} Summary: Funky fresh graphical widgets for GTK+ 2 @@ -9,7 +9,8 @@ Source0: http://releases.chipx86.com/libsexy/libsexy/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel libxml2-devel enchant-devel +BuildRequires: gtk2-devel libxml2-devel +Requires: enchant %description Some funky fresh graphical widgets for GTK+ 2 applications. @@ -55,6 +56,9 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Sat Mar 18 2006 Ignacio Vazquez-Abrams 0.1.8-1 +- Upstream update + * Thu Mar 16 2006 Ignacio Vazquez-Abrams 0.1.7-1 - Upstream update Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsexy/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Mar 2006 08:10:12 -0000 1.6 +++ sources 19 Mar 2006 04:45:18 -0000 1.7 @@ -1 +1 @@ -227df7c2d7ca421f41cef12c98b1e40f libsexy-0.1.7.tar.gz +ddc52cc8196f9f0bf48a5c7569b6bb38 libsexy-0.1.8.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 06:56:30 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 01:56:30 -0500 Subject: rpms/prboom/devel prboom.spec,1.2,1.3 Message-ID: <200603190657.k2J6v2kj017569@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17552 Modified Files: prboom.spec Log Message: Updated date to reflect checkin. Index: prboom.spec =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- prboom.spec 18 Mar 2006 17:51:42 -0000 1.2 +++ prboom.spec 19 Mar 2006 06:56:29 -0000 1.3 @@ -69,7 +69,7 @@ %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt %changelog -* Fri Mar 17 2006 Wart 2.3.1-5 +* Sat Mar 18 2006 Wart 2.3.1-5 - Updated patches to fix segfault on i386 (BZ #185741) * Tue Mar 14 2006 Wart 2.3.1-4 From fedora-extras-commits at redhat.com Sun Mar 19 06:59:52 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 01:59:52 -0500 Subject: rpms/prboom/FC-5 prboom-2.3.1-fixpsnprintf.patch, NONE, 1.1 prboom-2.3.1-gcc4.patch, 1.1, 1.2 prboom.spec, 1.1, 1.2 Message-ID: <200603190700.k2J70OxC017695@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17662 Modified Files: prboom-2.3.1-gcc4.patch prboom.spec Added Files: prboom-2.3.1-fixpsnprintf.patch Log Message: Fix segfault on i386 (BZ #185741) prboom-2.3.1-fixpsnprintf.patch: --- NEW FILE prboom-2.3.1-fixpsnprintf.patch --- diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c --- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.c 2006-03-18 09:04:48.000000000 -0800 @@ -130,7 +130,7 @@ case 'X': \ case 'p': \ GET_VARS \ - ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, (*pfmt == 'p' || prefix == 'l')? va_arg(ap, unsigned long):va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 'e': \ @@ -139,17 +139,17 @@ case 'g': \ case 'G': \ GET_VARS \ - ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, double)); \ state = STATE_NONE; \ break; \ case 'c': \ GET_VARS \ - ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 's': \ GET_VARS \ - ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, char *)); \ state = STATE_NONE; \ break; \ case 'n': \ @@ -306,11 +306,11 @@ } int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, int arg) { if (*nmax > 1) { - **pinsertion = (char) va_arg(*ap, int); + **pinsertion = (char) arg; *pinsertion += 1; *nmax -= 1; } @@ -338,9 +338,8 @@ */ int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, const char *str) { - const char *str = va_arg(*ap, const char *); int nprinted; int len; int pad = 0; @@ -428,7 +427,7 @@ */ int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, unsigned long arg) { long int number = 0; unsigned long int unumber; @@ -463,17 +462,17 @@ { case 'd': case 'i': - number = (signed short int) va_arg(*ap, int); + number = (signed short int) arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = (unsigned short int) va_arg(*ap, int); + unumber = (unsigned short int) arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } break; @@ -482,17 +481,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed long int); + number = arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned long int); + unumber = arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = numbersigned; } break; @@ -501,17 +500,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed int); + number = (signed int)arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned int); + unumber = (unsigned int)arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } } /* switch fmt to retrieve number */ @@ -784,13 +783,11 @@ */ int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, double value) { char *digits; int sign = 0; int dec; - double value = va_arg(*ap, double); - int len; int pad = 0; int signwidth = 0; diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h --- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.h 2006-03-18 09:05:19.000000000 -0800 @@ -17,16 +17,16 @@ * if there had been enough room). */ int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, int arg); int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, unsigned long arg); int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, const char *str); int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, double value); /* These are the flags you need (use logical OR) for the flags parameter of * fmt functions above. prboom-2.3.1-gcc4.patch: Index: prboom-2.3.1-gcc4.patch =================================================================== RCS file: /cvs/extras/rpms/prboom/FC-5/prboom-2.3.1-gcc4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom-2.3.1-gcc4.patch 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom-2.3.1-gcc4.patch 19 Mar 2006 06:59:52 -0000 1.2 @@ -89,176 +89,6 @@ extern int iquehead; extern int iquetail; extern int gravity; -diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c ---- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.c 2006-03-06 20:42:04.000000000 -0800 -@@ -130,7 +130,7 @@ - case 'X': \ - case 'p': \ - GET_VARS \ -- ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'e': \ -@@ -139,17 +139,17 @@ - case 'g': \ - case 'G': \ - GET_VARS \ -- ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'c': \ - GET_VARS \ -- ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 's': \ - GET_VARS \ -- ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'n': \ -@@ -306,11 +306,11 @@ - } - - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - if (*nmax > 1) - { -- **pinsertion = (char) va_arg(*ap, int); -+ **pinsertion = (char) va_arg(ap, int); - *pinsertion += 1; - *nmax -= 1; - } -@@ -338,9 +338,9 @@ - */ - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { -- const char *str = va_arg(*ap, const char *); -+ const char *str = va_arg(ap, const char *); - int nprinted; - int len; - int pad = 0; -@@ -428,7 +428,7 @@ - */ - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - long int number = 0; - unsigned long int unumber; -@@ -463,17 +463,17 @@ - { - case 'd': - case 'i': -- number = (signed short int) va_arg(*ap, int); -+ number = (signed short int) va_arg(ap, int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = (unsigned short int) va_arg(*ap, int); -+ unumber = (unsigned short int) va_arg(ap, int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - break; -@@ -482,17 +482,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed long int); -+ number = va_arg(ap, signed long int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned long int); -+ unumber = va_arg(ap, unsigned long int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = numbersigned; - } - break; -@@ -501,17 +501,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed int); -+ number = va_arg(ap, signed int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned int); -+ unumber = va_arg(ap, unsigned int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - } /* switch fmt to retrieve number */ -@@ -784,12 +784,12 @@ - */ - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - char *digits; - int sign = 0; - int dec; -- double value = va_arg(*ap, double); -+ double value = va_arg(ap, double); - - int len; - int pad = 0; -diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h ---- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.h 2006-03-06 20:42:04.000000000 -0800 -@@ -17,16 +17,16 @@ - * if there had been enough room). - */ - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - /* These are the flags you need (use logical OR) for the flags parameter of - * fmt functions above. diff -Naur prboom-2.3.1/src/r_bsp.h prboom-2.3.1.new/src/r_bsp.h --- prboom-2.3.1/src/r_bsp.h 2004-09-15 12:09:31.000000000 -0700 +++ prboom-2.3.1.new/src/r_bsp.h 2006-03-06 20:42:04.000000000 -0800 Index: prboom.spec =================================================================== RCS file: /cvs/extras/rpms/prboom/FC-5/prboom.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom.spec 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom.spec 19 Mar 2006 06:59:52 -0000 1.2 @@ -2,7 +2,7 @@ Name: prboom Version: 2.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open source port of the DOOM game engine Group: Amusements/Games @@ -13,6 +13,7 @@ Patch1: prboom-2.3.1-gamedir.patch Patch2: prboom-2.3.1-config.patch Patch3: prboom-2.3.1-64bit.patch +Patch4: prboom-2.3.1-fixpsnprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_net-devel @@ -32,6 +33,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure --disable-cpu-opt --program-prefix='' @@ -67,6 +69,9 @@ %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt %changelog +* Sat Mar 18 2006 Wart 2.3.1-5 +- Updated patches to fix segfault on i386 (BZ #185741) + * Tue Mar 14 2006 Wart 2.3.1-4 - Added patch to fix up some x86_64 issues From fedora-extras-commits at redhat.com Sun Mar 19 07:02:27 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 02:02:27 -0500 Subject: rpms/prboom/FC-4 prboom-2.3.1-fixpsnprintf.patch, NONE, 1.1 prboom-2.3.1-gcc4.patch, 1.1, 1.2 prboom.spec, 1.1, 1.2 Message-ID: <200603190703.k2J734Fg019627@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19590 Modified Files: prboom-2.3.1-gcc4.patch prboom.spec Added Files: prboom-2.3.1-fixpsnprintf.patch Log Message: Fix segfault on i386 (BZ #185741) prboom-2.3.1-fixpsnprintf.patch: --- NEW FILE prboom-2.3.1-fixpsnprintf.patch --- diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c --- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.c 2006-03-18 09:04:48.000000000 -0800 @@ -130,7 +130,7 @@ case 'X': \ case 'p': \ GET_VARS \ - ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, (*pfmt == 'p' || prefix == 'l')? va_arg(ap, unsigned long):va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 'e': \ @@ -139,17 +139,17 @@ case 'g': \ case 'G': \ GET_VARS \ - ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, double)); \ state = STATE_NONE; \ break; \ case 'c': \ GET_VARS \ - ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, int)); \ state = STATE_NONE; \ break; \ case 's': \ GET_VARS \ - ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ + ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, va_arg(ap, char *)); \ state = STATE_NONE; \ break; \ case 'n': \ @@ -306,11 +306,11 @@ } int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, int arg) { if (*nmax > 1) { - **pinsertion = (char) va_arg(*ap, int); + **pinsertion = (char) arg; *pinsertion += 1; *nmax -= 1; } @@ -338,9 +338,8 @@ */ int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, const char *str) { - const char *str = va_arg(*ap, const char *); int nprinted; int len; int pad = 0; @@ -428,7 +427,7 @@ */ int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, unsigned long arg) { long int number = 0; unsigned long int unumber; @@ -463,17 +462,17 @@ { case 'd': case 'i': - number = (signed short int) va_arg(*ap, int); + number = (signed short int) arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = (unsigned short int) va_arg(*ap, int); + unumber = (unsigned short int) arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } break; @@ -482,17 +481,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed long int); + number = arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned long int); + unumber = arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = numbersigned; } break; @@ -501,17 +500,17 @@ { case 'd': case 'i': - number = va_arg(*ap, signed int); + number = (signed int)arg; break; case 'u': case 'o': case 'x': case 'X': - unumber = va_arg(*ap, unsigned int); + unumber = (unsigned int)arg; numbersigned = 0; break; case 'p': - unumber = (unsigned long) va_arg(*ap, void *); + unumber = arg; numbersigned = 0; } } /* switch fmt to retrieve number */ @@ -784,13 +783,11 @@ */ int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap) + int width, int precision, char prefix, double value) { char *digits; int sign = 0; int dec; - double value = va_arg(*ap, double); - int len; int pad = 0; int signwidth = 0; diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h --- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 +++ prboom-2.3.1.new/src/psnprntf.h 2006-03-18 09:05:19.000000000 -0800 @@ -17,16 +17,16 @@ * if there had been enough room). */ int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, int arg); int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, unsigned long arg); int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, const char *str); int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, - int width, int precision, char prefix, va_list *ap); + int width, int precision, char prefix, double value); /* These are the flags you need (use logical OR) for the flags parameter of * fmt functions above. prboom-2.3.1-gcc4.patch: Index: prboom-2.3.1-gcc4.patch =================================================================== RCS file: /cvs/extras/rpms/prboom/FC-4/prboom-2.3.1-gcc4.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom-2.3.1-gcc4.patch 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom-2.3.1-gcc4.patch 19 Mar 2006 07:02:25 -0000 1.2 @@ -89,176 +89,6 @@ extern int iquehead; extern int iquetail; extern int gravity; -diff -Naur prboom-2.3.1/src/psnprntf.c prboom-2.3.1.new/src/psnprntf.c ---- prboom-2.3.1/src/psnprntf.c 2004-09-24 11:27:36.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.c 2006-03-06 20:42:04.000000000 -0800 -@@ -130,7 +130,7 @@ - case 'X': \ - case 'p': \ - GET_VARS \ -- ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_int(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'e': \ -@@ -139,17 +139,17 @@ - case 'g': \ - case 'G': \ - GET_VARS \ -- ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_double(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'c': \ - GET_VARS \ -- ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_char(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 's': \ - GET_VARS \ -- ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, &ap); \ -+ ncount += pvsnfmt_str(&pinsertion, &nmax, *pfmt, flags, width, precision, prefix, ap); \ - state = STATE_NONE; \ - break; \ - case 'n': \ -@@ -306,11 +306,11 @@ - } - - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - if (*nmax > 1) - { -- **pinsertion = (char) va_arg(*ap, int); -+ **pinsertion = (char) va_arg(ap, int); - *pinsertion += 1; - *nmax -= 1; - } -@@ -338,9 +338,9 @@ - */ - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { -- const char *str = va_arg(*ap, const char *); -+ const char *str = va_arg(ap, const char *); - int nprinted; - int len; - int pad = 0; -@@ -428,7 +428,7 @@ - */ - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - long int number = 0; - unsigned long int unumber; -@@ -463,17 +463,17 @@ - { - case 'd': - case 'i': -- number = (signed short int) va_arg(*ap, int); -+ number = (signed short int) va_arg(ap, int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = (unsigned short int) va_arg(*ap, int); -+ unumber = (unsigned short int) va_arg(ap, int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - break; -@@ -482,17 +482,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed long int); -+ number = va_arg(ap, signed long int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned long int); -+ unumber = va_arg(ap, unsigned long int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = numbersigned; - } - break; -@@ -501,17 +501,17 @@ - { - case 'd': - case 'i': -- number = va_arg(*ap, signed int); -+ number = va_arg(ap, signed int); - break; - case 'u': - case 'o': - case 'x': - case 'X': -- unumber = va_arg(*ap, unsigned int); -+ unumber = va_arg(ap, unsigned int); - numbersigned = 0; - break; - case 'p': -- unumber = (unsigned long) va_arg(*ap, void *); -+ unumber = (unsigned long) va_arg(ap, void *); - numbersigned = 0; - } - } /* switch fmt to retrieve number */ -@@ -784,12 +784,12 @@ - */ - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap) -+ int width, int precision, char prefix, va_list ap) - { - char *digits; - int sign = 0; - int dec; -- double value = va_arg(*ap, double); -+ double value = va_arg(ap, double); - - int len; - int pad = 0; -diff -Naur prboom-2.3.1/src/psnprntf.h prboom-2.3.1.new/src/psnprntf.h ---- prboom-2.3.1/src/psnprntf.h 2004-09-15 12:09:27.000000000 -0700 -+++ prboom-2.3.1.new/src/psnprntf.h 2006-03-06 20:42:04.000000000 -0800 -@@ -17,16 +17,16 @@ - * if there had been enough room). - */ - int pvsnfmt_char(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_int(char **pinsertion, size_t *nmax, char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_str(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - int pvsnfmt_double(char **pinsertion, size_t *nmax, const char fmt, int flags, -- int width, int precision, char prefix, va_list *ap); -+ int width, int precision, char prefix, va_list ap); - - /* These are the flags you need (use logical OR) for the flags parameter of - * fmt functions above. diff -Naur prboom-2.3.1/src/r_bsp.h prboom-2.3.1.new/src/r_bsp.h --- prboom-2.3.1/src/r_bsp.h 2004-09-15 12:09:31.000000000 -0700 +++ prboom-2.3.1.new/src/r_bsp.h 2006-03-06 20:42:04.000000000 -0800 Index: prboom.spec =================================================================== RCS file: /cvs/extras/rpms/prboom/FC-4/prboom.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom.spec 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom.spec 19 Mar 2006 07:02:25 -0000 1.2 @@ -2,7 +2,7 @@ Name: prboom Version: 2.3.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open source port of the DOOM game engine Group: Amusements/Games @@ -13,6 +13,7 @@ Patch1: prboom-2.3.1-gamedir.patch Patch2: prboom-2.3.1-config.patch Patch3: prboom-2.3.1-64bit.patch +Patch4: prboom-2.3.1-fixpsnprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL_mixer-devel SDL_net-devel @@ -32,6 +33,7 @@ %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %configure --disable-cpu-opt --program-prefix='' @@ -67,6 +69,9 @@ %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt %changelog +* Sat Mar 18 2006 Wart 2.3.1-5 +- Updated patches to fix segfault on i386 (BZ #185741) + * Tue Mar 14 2006 Wart 2.3.1-4 - Added patch to fix up some x86_64 issues From fedora-extras-commits at redhat.com Sun Mar 19 09:47:25 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 19 Mar 2006 04:47:25 -0500 Subject: rpms/xemacs/FC-5 xemacs.spec,1.20,1.21 Message-ID: <200603190947.k2J9lvTF028010@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27976/FC-5 Modified Files: xemacs.spec Log Message: * Sat Mar 18 2006 Ville Skytt?? - 21.4.19-3 - Build without -fstack-protector by default for now (#183643). Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/FC-5/xemacs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xemacs.spec 11 Feb 2006 13:11:48 -0000 1.20 +++ xemacs.spec 19 Mar 2006 09:47:24 -0000 1.21 @@ -2,13 +2,14 @@ %bcond_with xaw3d %bcond_without debug %bcond_without mule +%bcond_with stackprot %define pkgdir %{_datadir}/xemacs %define exectop %{_libdir}/xemacs-%{version} Name: xemacs Version: 21.4.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -186,7 +187,12 @@ %build -export CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" +CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" +%if ! %{with stackprot} +CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')" +CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')" +%endif +export CFLAGS # XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir, # --includedir, --libexecdir, --localstatedir, --sharedstatedir @@ -449,6 +455,9 @@ %changelog +* Sat Mar 18 2006 Ville Skytt?? - 21.4.19-3 +- Build without -fstack-protector by default for now (#183643). + * Thu Feb 2 2006 Ville Skytt?? - 21.4.19-2 - 21.4.19, X paths patch mostly applied upstream. From fedora-extras-commits at redhat.com Sun Mar 19 09:47:31 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 19 Mar 2006 04:47:31 -0500 Subject: rpms/xemacs/devel xemacs.spec,1.20,1.21 Message-ID: <200603190948.k2J9m4ib028013@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/xemacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27976/devel Modified Files: xemacs.spec Log Message: * Sat Mar 18 2006 Ville Skytt?? - 21.4.19-3 - Build without -fstack-protector by default for now (#183643). Index: xemacs.spec =================================================================== RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- xemacs.spec 11 Feb 2006 13:11:48 -0000 1.20 +++ xemacs.spec 19 Mar 2006 09:47:31 -0000 1.21 @@ -2,13 +2,14 @@ %bcond_with xaw3d %bcond_without debug %bcond_without mule +%bcond_with stackprot %define pkgdir %{_datadir}/xemacs %define exectop %{_libdir}/xemacs-%{version} Name: xemacs Version: 21.4.19 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Different version of Emacs Group: Applications/Editors @@ -186,7 +187,12 @@ %build -export CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" +CFLAGS="${CFLAGS:-$RPM_OPT_FLAGS -fno-strict-aliasing}" +%if ! %{with stackprot} +CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')" +CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')" +%endif +export CFLAGS # XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir, # --includedir, --libexecdir, --localstatedir, --sharedstatedir @@ -449,6 +455,9 @@ %changelog +* Sat Mar 18 2006 Ville Skytt?? - 21.4.19-3 +- Build without -fstack-protector by default for now (#183643). + * Thu Feb 2 2006 Ville Skytt?? - 21.4.19-2 - 21.4.19, X paths patch mostly applied upstream. From fedora-extras-commits at redhat.com Sun Mar 19 11:57:25 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Sun, 19 Mar 2006 06:57:25 -0500 Subject: rpms/exim/FC-4 exim-4.50-config.patch, 1.2, 1.3 exim.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200603191157.k2JBvvl6032342@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32318 Modified Files: exim-4.50-config.patch exim.spec sources Log Message: Update FC4 to 4.60 exim-4.50-config.patch: Index: exim-4.50-config.patch =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim-4.50-config.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- exim-4.50-config.patch 5 Oct 2005 10:13:18 -0000 1.2 +++ exim-4.50-config.patch 19 Mar 2006 11:57:24 -0000 1.3 @@ -58,7 +58,7 @@ #------------------------------------------------------------------------------ -@@ -255,17 +255,19 @@ +@@ -255,17 +255,20 @@ LOOKUP_DBM=yes LOOKUP_LSEARCH=yes @@ -72,8 +72,10 @@ -# LOOKUP_LDAP=yes +LOOKUP_LDAP=yes +LDAP_LIB_TYPE=OPENLDAP2 -+LOOKUP_LIBS=-lldap -llber -lsqlite3 - # LOOKUP_MYSQL=yes ++LOOKUP_INCLUDE=-I/usr/include/mysql ++LOOKUP_LIBS=-lldap -llber -lsqlite3 -L/usr/$(_lib)/mysql -lmysqlclient -lpq +-# LOOKUP_MYSQL=yes ++LOOKUP_MYSQL=yes -# LOOKUP_NIS=yes -# LOOKUP_NISPLUS=yes +LOOKUP_NIS=yes @@ -81,7 +83,8 @@ # LOOKUP_ORACLE=yes -# LOOKUP_PASSWD=yes +LOOKUP_PASSWD=yes - # LOOKUP_PGSQL=yes +-# LOOKUP_PGSQL=yes ++# LOOKUP_PGSQL=yes -# LOOKUP_SQLITE=yes +LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- exim.spec 5 Oct 2005 10:13:18 -0000 1.7 +++ exim.spec 19 Mar 2006 11:57:24 -0000 1.8 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim -Version: 4.54 -Release: 1%{?dist} +Version: 4.60 +Release: 3%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -27,9 +27,10 @@ Patch15: exim-4.52-dynamic-pcre.patch Requires: /etc/aliases -BuildRequires: db4-devel openssl-devel openldap-devel XFree86-devel pam-devel +BuildRequires: db4-devel openssl-devel openldap-devel pam-devel BuildRequires: lynx pcre-devel sqlite-devel -BuildRequires: cyrus-sasl-devel openldap-devel openssl-devel +BuildRequires: cyrus-sasl-devel openldap-devel openssl-devel mysql-devel postgresql-devel +BuildRequires: xorg-x11-devel PreReq: cyrus-sasl openldap openssl %description @@ -285,6 +286,25 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue Mar 7 2006 David Woodhouse 4.60-3 +- Rebuild + +* Tue Nov 29 2005 David Woodhouse 4.60-2 +- Require libXt-devel + +* Tue Nov 29 2005 David Woodhouse 4.60-1 +- Update to 4.60 + +* Sun Nov 13 2005 David Woodhouse 4.54-4 +- Fix 64-bit build + +* Fri Nov 11 2005 David Woodhouse 4.54-3 +- Update X11 BuildRequires + +* Wed Oct 5 2005 David Woodhouse 4.54-2 +- Rebuild for new OpenSSL +- Add MySQL and Postgres support to keep jgarzik happy + * Wed Oct 5 2005 David Woodhouse 4.54-1 - Update to Exim 4.54 - Enable sqlite support Index: sources =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 5 Oct 2005 10:13:18 -0000 1.6 +++ sources 19 Mar 2006 11:57:24 -0000 1.7 @@ -1,2 +1,2 @@ ad76f73c6b3d01caa88078e3e622745a sa-exim-4.2.tar.gz -f3cdf5292f4bbb1ee2de42d4338b3b9f exim-4.54.tar.bz2 +eed3c8fc393cf7ccc9c1079b28516128 exim-4.60.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 12:31:52 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:31:52 -0500 Subject: rpms/libopts - New directory Message-ID: <200603191231.k2JCVsvo002016@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2008/libopts Log Message: Directory /cvs/extras/rpms/libopts added to the repository From fedora-extras-commits at redhat.com Sun Mar 19 12:31:57 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:31:57 -0500 Subject: rpms/libopts/devel - New directory Message-ID: <200603191231.k2JCVxHT002031@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2008/libopts/devel Log Message: Directory /cvs/extras/rpms/libopts/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 19 12:32:23 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:32:23 -0500 Subject: rpms/libopts Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603191232.k2JCWPo8002065@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2053 Added Files: Makefile import.log Log Message: Setup of module libopts --- NEW FILE Makefile --- # Top level Makefile for module libopts all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 19 12:32:29 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:32:29 -0500 Subject: rpms/libopts/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603191232.k2JCWVAE002085@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2053/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libopts --- NEW 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 Mar 19 12:33:30 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:33:30 -0500 Subject: rpms/libopts import.log,1.1,1.2 Message-ID: <200603191234.k2JCY2mj002155@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2121 Modified Files: import.log Log Message: auto-import libopts-27.1-3 on branch devel from libopts-27.1-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libopts/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Mar 2006 12:32:23 -0000 1.1 +++ import.log 19 Mar 2006 12:33:29 -0000 1.2 @@ -0,0 +1 @@ +libopts-27_1-3:HEAD:libopts-27.1-3.src.rpm:1142771597 From fedora-extras-commits at redhat.com Sun Mar 19 12:33:35 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 07:33:35 -0500 Subject: rpms/libopts/devel libopts.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603191234.k2JCY8dR002159@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2121/devel Modified Files: .cvsignore sources Added Files: libopts.spec Log Message: auto-import libopts-27.1-3 on branch devel from libopts-27.1-3.src.rpm --- NEW FILE libopts.spec --- Summary: Options library for autogen Name: libopts Version: 27.1 Release: 3%{?dist} License: LGPL or BSD Group: Development/Libraries Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz URL: http://autogen.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(preun): /sbin/install-info Requires(post): /sbin/install-info %description libopts is part of the autogen build system %package devel Group: Development/Libraries Summary: Development files for libopts Requires: libopts = %{version}-%{release} %description devel Development files for libopts %prep rm -rf ${RPM_BUILD_ROOT} %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}/lib*.la rm -f ${RPM_BUILD_ROOT}%{_infodir}/libopts.txt* rm -f ${RPM_BUILD_ROOT}%{_infordir}/dir %clean rm -rf ${RPM_BUILD_ROOT} %postun -p /sbin/ldconfig %post -p /sbin/ldconfig %preun devel if [ $1 = 0 ]; then /sbin/install-info --delete \ --info-dir=%{__infodir} %{__infodir}/libopts.info fi %files %defattr(-,root,root) %doc COPYING* NEWS ChangeLog %{_libdir}/libopts.so.* %files devel %defattr(-,root,root) %{_libdir}/libopts.so %{_infodir}/libopts.info.gz %{_mandir}/man?/* %{_bindir}/libopts-config %{_includedir}/autoopts %changelog * Sun Mar 19 2006 Paul F. Johnson 27.1-3 - Small fixes to spec file * Fri Feb 24 2006 Ralf Corspius 27.1-2 - Rework spec * Thu Feb 23 2006 Paul F. Johnson 27.1-1 - Initial import, bug fixes to the spec and other such things Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libopts/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Mar 2006 12:32:29 -0000 1.1 +++ .cvsignore 19 Mar 2006 12:33:35 -0000 1.2 @@ -0,0 +1 @@ +libopts-27.1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libopts/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Mar 2006 12:32:29 -0000 1.1 +++ sources 19 Mar 2006 12:33:35 -0000 1.2 @@ -0,0 +1 @@ +50a546ee14d866819afd502e809c8095 libopts-27.1.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 14:07:46 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 19 Mar 2006 09:07:46 -0500 Subject: rpms/xchat-gnome/devel xchat-gnome.spec,1.21,1.22 Message-ID: <200603191408.k2JE8I8g006750@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/xchat-gnome/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6733 Modified Files: xchat-gnome.spec Log Message: * Sun Mar 19 2006 Brian Pepple - 0.10-5 - Rebuild for libsexy-0.1.8. Index: xchat-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xchat-gnome.spec 17 Mar 2006 01:16:59 -0000 1.21 +++ xchat-gnome.spec 19 Mar 2006 14:07:45 -0000 1.22 @@ -3,7 +3,7 @@ Name: xchat-gnome Version: 0.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -137,6 +137,9 @@ %changelog +* Sun Mar 19 2006 Brian Pepple - 0.10-5 +- Rebuild for libsexy-0.1.8. + * Thu Mar 16 2006 Brian Pepple - 0.10-4 - Rebuild for new libsexy. From fedora-extras-commits at redhat.com Sun Mar 19 14:09:39 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 19 Mar 2006 09:09:39 -0500 Subject: rpms/xchat-gnome/FC-5 xchat-gnome.spec,1.21,1.22 Message-ID: <200603191410.k2JEAB0E006821@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/xchat-gnome/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6804 Modified Files: xchat-gnome.spec Log Message: * Sun Mar 19 2006 Brian Pepple - 0.10-5 - Rebuild for libsexy-0.1.8. Index: xchat-gnome.spec =================================================================== RCS file: /cvs/extras/rpms/xchat-gnome/FC-5/xchat-gnome.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xchat-gnome.spec 17 Mar 2006 01:19:16 -0000 1.21 +++ xchat-gnome.spec 19 Mar 2006 14:09:39 -0000 1.22 @@ -3,7 +3,7 @@ Name: xchat-gnome Version: 0.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GNOME front-end to xchat Group: Applications/Internet @@ -137,6 +137,9 @@ %changelog +* Sun Mar 19 2006 Brian Pepple - 0.10-5 +- Rebuild for libsexy-0.1.8. + * Thu Mar 16 2006 Brian Pepple - 0.10-4 - Rebuild for new libsexy. From fedora-extras-commits at redhat.com Sun Mar 19 15:13:42 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Sun, 19 Mar 2006 10:13:42 -0500 Subject: rpms/ghdl/devel gcc41-ada-pr18302.patch, NONE, 1.1 gcc41-ada-tweaks.patch, NONE, 1.1 gcc41-cfaval.patch, NONE, 1.1 gcc41-gnuc-rh-release.patch, NONE, 1.1 gcc41-ia64-libunwind.patch, NONE, 1.1 gcc41-ice-hack.patch, NONE, 1.1 gcc41-java-nomulti.patch, NONE, 1.1 gcc41-java-slow_pthread_self.patch, NONE, 1.1 gcc41-mni.patch, NONE, 1.1 gcc41-ppc32-retaddr.patch, NONE, 1.1 gcc41-ppc64-m32-m64-multilib-only.patch, NONE, 1.1 gcc41-rh184446.patch, NONE, 1.1 gcc41-x86_64-sse3.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 ghdl.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200603191514.k2JFEF8V009144@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9079 Modified Files: .cvsignore ghdl.spec sources Added Files: gcc41-ada-pr18302.patch gcc41-ada-tweaks.patch gcc41-cfaval.patch gcc41-gnuc-rh-release.patch gcc41-ia64-libunwind.patch gcc41-ice-hack.patch gcc41-java-nomulti.patch gcc41-java-slow_pthread_self.patch gcc41-mni.patch gcc41-ppc32-retaddr.patch gcc41-ppc64-m32-m64-multilib-only.patch gcc41-rh184446.patch gcc41-x86_64-sse3.patch Log Message: use core gcc sources as baseline sources does not work yet on x86_64, waiting for upstream to fix gcc41-ada-pr18302.patch: --- NEW FILE gcc41-ada-pr18302.patch --- gcc/ada/ 2004-11-28 James A. Morrison PR ada/18302 * Make-lang.in (check-gnat): Set EXPECT environment variable. testsuite/ 2005-05-18 Jakub Jelinek * ada/acats/run_all.sh: Filter out spawn line from target_bit. 2004-11-28 James A. Morrison PR ada/18302 * ada/acats/run_all.sh (target_run): Run test through run_test.expect. * ada/acats/run_test.expect: Expect script for ACATS tests. --- gcc/testsuite/ada/acats/run_all.sh (.../gcc-4_0-branch) (revision 107266) +++ gcc/testsuite/ada/acats/run_all.sh (.../redhat/gcc-4_0-branch) (revision 107414) @@ -13,7 +13,8 @@ gnatflags="-gnatws" target_run () { -$* + LD_LIBRARY_PATH=$ADA_INCLUDE_PATH${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH} \ + $EXPECT -f $testdir/run_test.exp $1 > $2 } # End of customization section. @@ -92,8 +93,8 @@ # Find out the size in bit of an address on the target target_gnatmake $testdir/support/impbit.adb >> $dir/acats.log 2>&1 -target_run $dir/support/impbit > $dir/support/impbit.out 2>&1 -target_bit=`cat $dir/support/impbit.out` +target_run $dir/support/impbit $dir/support/impbit.out 2>/dev/null +target_bit=`egrep -v -e ^spawn $dir/support/impbit.out` echo target_bit="$target_bit" >> $dir/acats.log # Find out a suitable asm statement @@ -259,7 +260,7 @@ if [ ! -x $dir/tests/$chapter/$i/$binmain ]; then sync fi - target_run $dir/tests/$chapter/$i/$binmain > $dir/tests/$chapter/$i/${i}.log 2>&1 + target_run $dir/tests/$chapter/$i/$binmain $dir/tests/$chapter/$i/${i}.log 2>&1 cd $dir/tests/$chapter/$i cat ${i}.log >> $dir/acats.log egrep -e '(==== |\+\+\+\+ |\!\!\!\! )' ${i}.log > /dev/null 2>&1 --- gcc/testsuite/ada/acats/run_test.exp (.../gcc-4_0-branch) (revision 0) +++ gcc/testsuite/ada/acats/run_test.exp (.../redhat/gcc-4_0-branch) (revision 107414) @@ -0,0 +1,13 @@ +#!/usr/bin/expect -f + +if {[info exists env(DEJAGNU_TIMEOUT)]} { + set timeout $env(DEJAGNU_TIMEOUT) +} else { + set timeout 300 +} + +spawn $argv +expect timeout { + send_user "Program timed out.\n" + exit 1 +} --- gcc/ada/Make-lang.in (.../gcc-4_0-branch) (revision 107266) +++ gcc/ada/Make-lang.in (.../redhat/gcc-4_0-branch) (revision 107414) @@ -809,6 +809,7 @@ check-gnat: test -d $(ACATSDIR) || mkdir -p $(ACATSDIR) testdir=`cd ${srcdir}/${ACATSDIR}; ${PWD_COMMAND}`; \ + EXPECT=${EXPECT} ; export EXPECT ; \ export testdir; cd $(ACATSDIR); $(SHELL) $${testdir}/run_acats $(CHAPTERS) .PHONY: check-gnat gcc41-ada-tweaks.patch: --- NEW FILE gcc41-ada-tweaks.patch --- 2004-10-04 Jakub Jelinek * gnat_ugn.texi: Add : and . to direntry. * gnat-style.texi: Change dircategory to GNU Ada tools. 2005-02-08 Jakub Jelinek * Makefile.in (gnatlib-shared-default): Disallow dlopening of libgnat.so. --- gcc/ada/gnat-style.texi (.../gcc-4_0-branch) (revision 107266) +++ gcc/ada/gnat-style.texi (.../redhat/gcc-4_0-branch) (revision 107414) @@ -28,7 +28,7 @@ @setchapternewpage odd - at dircategory Programming + at dircategory GNU Ada tools @direntry * gnat-style: (gnat-style). GNAT Coding Style @end direntry --- gcc/ada/Makefile.in (.../gcc-4_0-branch) (revision 107266) +++ gcc/ada/Makefile.in (.../redhat/gcc-4_0-branch) (revision 107414) @@ -1316,7 +1316,7 @@ LIBRARY_VERSION := $(LIB_VERSION) endif -ifeq ($(strip $(filter-out powerpc% linux%,$(arch) $(osys))),) +ifeq ($(strip $(filter-out powerpc% ppc% linux%,$(arch) $(osys))),) LIBGNAT_TARGET_PAIRS = \ a-intnam.ads * unwind-dw2.h (_Unwind_FrameState): Add REG_SAVED_VAL_OFFSET and REG_SAVED_VAL_EXP constants. * unwind-dw2.c (struct _Unwind_Context): Add by_value array. (_Unwind_GetGR, _Unwind_SetGR, _Unwind_GetGRPtr, _Unwind_SetGRPtr): Handle regs stored by value. (_Unwind_SetGRValue, _Unwind_GRByValue): New functions. (execute_cfa_program): Handle DW_CFA_val_offset, DW_CFA_val_offset_sf and DW_CFA_val_expression. (uw_update_context_1): Handle REG_SAVED_REG with regs stored by value specially. Handle REG_SAVED_VAL_OFFSET and REG_SAVED_VAL_EXP. (uw_install_context_1): Handle target regs stored by value. * gcc.target/i386/cleanup-1.c: New test. * gcc.target/i386/cleanup-2.c: New test. --- gcc/unwind-dw2.h.jj 2006-03-01 14:43:03.000000000 +0100 +++ gcc/unwind-dw2.h 2006-03-01 15:02:51.000000000 +0100 @@ -53,7 +53,9 @@ typedef struct REG_UNSAVED, REG_SAVED_OFFSET, REG_SAVED_REG, - REG_SAVED_EXP + REG_SAVED_EXP, + REG_SAVED_VAL_OFFSET, + REG_SAVED_VAL_EXP } how; } reg[DWARF_FRAME_REGISTERS+1]; --- gcc/unwind-dw2.c.jj 2006-03-01 14:43:03.000000000 +0100 +++ gcc/unwind-dw2.c 2006-03-02 18:59:34.000000000 +0100 @@ -72,6 +72,7 @@ struct _Unwind_Context struct dwarf_eh_bases bases; _Unwind_Word args_size; char signal_frame; + char by_value[DWARF_FRAME_REGISTERS+1]; }; /* Byte size of every register managed by these routines. */ @@ -118,7 +119,7 @@ read_8u (const void *p) { const union un static inline unsigned long read_8s (const void *p) { const union unaligned *up = p; return up->s8; } -/* Get the value of register REG as saved in CONTEXT. */ +/* Get the value of register INDEX as saved in CONTEXT. */ inline _Unwind_Word _Unwind_GetGR (struct _Unwind_Context *context, int index) @@ -136,6 +137,9 @@ _Unwind_GetGR (struct _Unwind_Context *c size = dwarf_reg_size_table[index]; ptr = context->reg[index]; + if (context->by_value[index]) + return (_Unwind_Word) (_Unwind_Internal_Ptr) ptr; + /* This will segfault if the register hasn't been saved. */ if (size == sizeof(_Unwind_Ptr)) return * (_Unwind_Ptr *) ptr; @@ -160,7 +164,7 @@ _Unwind_GetCFA (struct _Unwind_Context * return (_Unwind_Ptr) context->cfa; } -/* Overwrite the saved value for register REG in CONTEXT with VAL. */ +/* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ inline void _Unwind_SetGR (struct _Unwind_Context *context, int index, _Unwind_Word val) @@ -171,6 +175,13 @@ _Unwind_SetGR (struct _Unwind_Context *c index = DWARF_REG_TO_UNWIND_COLUMN (index); gcc_assert (index < (int) sizeof(dwarf_reg_size_table)); size = dwarf_reg_size_table[index]; + + if (context->by_value[index]) + { + context->reg[index] = (void *) (_Unwind_Internal_Ptr) val; + return; + } + ptr = context->reg[index]; if (size == sizeof(_Unwind_Ptr)) @@ -188,6 +199,8 @@ static inline void * _Unwind_GetGRPtr (struct _Unwind_Context *context, int index) { index = DWARF_REG_TO_UNWIND_COLUMN (index); + if (context->by_value[index]) + return &context->reg[index]; return context->reg[index]; } @@ -197,9 +210,34 @@ static inline void _Unwind_SetGRPtr (struct _Unwind_Context *context, int index, void *p) { index = DWARF_REG_TO_UNWIND_COLUMN (index); + context->by_value[index] = 0; context->reg[index] = p; } +/* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ + +static inline void +_Unwind_SetGRValue (struct _Unwind_Context *context, int index, + _Unwind_Word val) +{ + index = DWARF_REG_TO_UNWIND_COLUMN (index); + gcc_assert (index < (int) sizeof(dwarf_reg_size_table)); + gcc_assert (dwarf_reg_size_table[index] == sizeof (_Unwind_Ptr)); + + context->by_value[index] = 1; + context->reg[index] = (void *) (_Unwind_Internal_Ptr) val; +} + +/* Return non-zero if register INDEX is stored by value rather than + by reference. */ + +static inline int +_Unwind_GRByValue (struct _Unwind_Context *context, int index) +{ + index = DWARF_REG_TO_UNWIND_COLUMN (index); + return context->by_value[index]; +} + /* Retrieve the return address for CONTEXT. */ inline _Unwind_Ptr @@ -922,7 +960,7 @@ execute_cfa_program (const unsigned char insn_ptr += utmp; break; - /* From the dwarf3 draft. */ + /* Dwarf3. */ case DW_CFA_offset_extended_sf: insn_ptr = read_uleb128 (insn_ptr, ®); insn_ptr = read_sleb128 (insn_ptr, &stmp); @@ -945,6 +983,33 @@ execute_cfa_program (const unsigned char /* cfa_how deliberately not set. */ break; + case DW_CFA_val_offset: + insn_ptr = read_uleb128 (insn_ptr, ®); + insn_ptr = read_uleb128 (insn_ptr, &utmp); + offset = (_Unwind_Sword) utmp * fs->data_align; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].how + = REG_SAVED_VAL_OFFSET; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].loc.offset = offset; + break; + + case DW_CFA_val_offset_sf: + insn_ptr = read_uleb128 (insn_ptr, ®); + insn_ptr = read_sleb128 (insn_ptr, &stmp); + offset = stmp * fs->data_align; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].how + = REG_SAVED_VAL_OFFSET; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].loc.offset = offset; + break; + + case DW_CFA_val_expression: + insn_ptr = read_uleb128 (insn_ptr, ®); + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].how + = REG_SAVED_VAL_EXP; + fs->regs.reg[DWARF_REG_TO_UNWIND_COLUMN (reg)].loc.exp = insn_ptr; + insn_ptr = read_uleb128 (insn_ptr, &utmp); + insn_ptr += utmp; + break; + case DW_CFA_GNU_window_save: /* ??? Hardcoded for SPARC register window configuration. */ for (reg = 16; reg < 32; ++reg) @@ -1113,7 +1178,7 @@ typedef union { _Unwind_Ptr ptr; _Unwind static inline void _Unwind_SetSpColumn (struct _Unwind_Context *context, void *cfa, - _Unwind_SpTmp *tmp_sp) + _Unwind_SpTmp *tmp_sp) { int size = dwarf_reg_size_table[__builtin_dwarf_sp_column ()]; @@ -1194,9 +1259,14 @@ uw_update_context_1 (struct _Unwind_Cont break; case REG_SAVED_REG: - _Unwind_SetGRPtr - (context, i, - _Unwind_GetGRPtr (&orig_context, fs->regs.reg[i].loc.reg)); + if (_Unwind_GRByValue (&orig_context, fs->regs.reg[i].loc.reg)) + _Unwind_SetGRValue (context, i, + _Unwind_GetGR (&orig_context, + fs->regs.reg[i].loc.reg)); + else + _Unwind_SetGRPtr (context, i, + _Unwind_GetGRPtr (&orig_context, + fs->regs.reg[i].loc.reg)); break; case REG_SAVED_EXP: @@ -1211,6 +1281,25 @@ uw_update_context_1 (struct _Unwind_Cont _Unwind_SetGRPtr (context, i, (void *) val); } break; + + case REG_SAVED_VAL_OFFSET: + _Unwind_SetGRValue (context, i, + (_Unwind_Internal_Ptr) + (cfa + fs->regs.reg[i].loc.offset)); + break; + + case REG_SAVED_VAL_EXP: + { + const unsigned char *exp = fs->regs.reg[i].loc.exp; + _Unwind_Word len; + _Unwind_Ptr val; + + exp = read_uleb128 (exp, &len); + val = execute_stack_op (exp, exp + len, &orig_context, + (_Unwind_Ptr) cfa); + _Unwind_SetGRValue (context, i, val); + } + break; } context->signal_frame = fs->signal_frame; @@ -1327,14 +1416,31 @@ uw_install_context_1 (struct _Unwind_Con /* If the target frame does not have a saved stack pointer, then set up the target's CFA. */ if (!_Unwind_GetGRPtr (target, __builtin_dwarf_sp_column ())) - _Unwind_SetSpColumn (target, target->cfa, &sp_slot); + _Unwind_SetSpColumn (target, target->cfa, &sp_slot); for (i = 0; i < DWARF_FRAME_REGISTERS; ++i) { void *c = current->reg[i]; void *t = target->reg[i]; - if (t && c && t != c) + gcc_assert (current->by_value[i] == 0); + if (target->by_value[i] && c) + { + _Unwind_Word w; + _Unwind_Ptr p; + if (dwarf_reg_size_table[i] == sizeof (_Unwind_Word)) + { + w = (_Unwind_Internal_Ptr) t; + memcpy (c, &w, sizeof (_Unwind_Word)); + } + else + { + gcc_assert (dwarf_reg_size_table[i] == sizeof (_Unwind_Ptr)); + p = (_Unwind_Internal_Ptr) t; + memcpy (c, &p, sizeof (_Unwind_Ptr)); + } + } + else if (t && c && t != c) memcpy (c, t, dwarf_reg_size_table[i]); } --- gcc/testsuite/gcc.target/i386/cleanup-1.c.jj 2006-03-03 11:25:14.000000000 +0100 +++ gcc/testsuite/gcc.target/i386/cleanup-1.c 2006-03-03 11:25:48.000000000 +0100 @@ -0,0 +1,240 @@ +/* { dg-do run { target i?86-*-linux* x86_64-*-linux* } } */ +/* { dg-options "-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2" } */ +/* Test complex CFA value expressions. */ + +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +void +bar (void) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +void __attribute__((noinline)) +foo (int x) +{ + char buf[256]; +#ifdef __i386__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leal %1, %%ecx\n" +"2:\t" "call bar\n" +"3:\t" "jmp 18f\n" +"4:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"5:\t" ".long 7f-6f # Length of Common Information Entry\n" +"6:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -4 # CIE Data Alignment Factor\n\t" + ".byte 0x8 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0xc # DW_CFA_def_cfa\n\t" + ".uleb128 0x4\n\t" + ".uleb128 0x0\n\t" + ".align 4\n" +"7:\t" ".long 17f-8f # FDE Length\n" +"8:\t" ".long 8b-5b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 4b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 10f-9f\n" +"9:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 3b-1b\n" +"10:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 12f-11f\n" +"11:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 3b-2b\n" +"12:\t" ".byte 0x40 + (3b-2b-1) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x8\n\t" + ".uleb128 16f-13f\n" +"13:\t" ".byte 0x78 # DW_OP_breg8\n\t" + ".sleb128 15f-14f\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"14:\t" ".4byte 3b-.\n\t" + ".byte 0x1c # DW_OP_minus\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"15:\t" ".4byte 18f-.\n\t" + ".byte 0x22 # DW_OP_plus\n" +"16:\t" ".align 4\n" +"17:\t" ".previous\n" +"18:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "eax", "edx", "ecx"); +#elif defined __x86_64__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leaq %1, %%rdi\n" +"2:\t" "subq $128, %%rsp\n" +"3:\t" "call bar\n" +"4:\t" "addq $128, %%rsp\n" +"5:\t" "jmp 24f\n" +"6:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"7:\t" ".long 9f-8f # Length of Common Information Entry\n" +"8:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -8 # CIE Data Alignment Factor\n\t" + ".byte 0x10 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0x12 # DW_CFA_def_cfa_sf\n\t" + ".uleb128 0x7\n\t" + ".sleb128 16\n\t" + ".align 8\n" +"9:\t" ".long 23f-10f # FDE Length\n" +"10:\t" ".long 10b-7b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 6b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 12f-11f\n" +"11:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-1b\n" +"12:\t" ".byte 0x40 + (2b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 14f-13f\n" +"13:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-2b\n" +"14:\t" ".byte 0x40 + (3b-2b) # DW_CFA_advance_loc\n\t" + ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" + ".uleb128 0\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 16f-15f\n" +"15:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-3b\n" +"16:\t" ".byte 0x40 + (4b-3b-1) # DW_CFA_advance_loc\n\t" + ".byte 0x0e # DW_CFA_def_cfa_offset\n\t" + ".uleb128 128\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 20f-17f\n" +"17:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 19f-18f\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"18:\t" ".4byte 4b-.\n\t" + ".byte 0x1c # DW_OP_minus\n\t" + ".byte 0x0d # DW_OP_const4s\n" +"19:\t" ".4byte 24f-.\n\t" + ".byte 0x22 # DW_OP_plus\n" +"20:\t" ".byte 0x40 + (5b-4b+1) # DW_CFA_advance_loc\n\t" + ".byte 0x13 # DW_CFA_def_cfa_offset_sf\n\t" + ".sleb128 16\n\t" + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 22f-21f\n" +"21:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 4b-5b\n" +"22:\t" ".align 8\n" +"23:\t" ".previous\n" +"24:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "rax", "rdx", "rcx", "rsi", "rdi", + "r8", "r9", "r10", "r11"); +#else +# error Unsupported test architecture +#endif +} + +static int __attribute__((noinline)) +fn2 (void) +{ + foo (3); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ + fn2 (); + return 0; +} + +static void * +fn0 (void) +{ + char dummy __attribute__((cleanup (handler))); + fn1 (); + return 0; +} + +int +main (void) +{ + fn0 (); + return 0; +} --- gcc/testsuite/gcc.target/i386/cleanup-2.c.jj 2006-03-03 11:25:26.000000000 +0100 +++ gcc/testsuite/gcc.target/i386/cleanup-2.c 2006-03-03 11:27:06.000000000 +0100 @@ -0,0 +1,205 @@ +/* { dg-do run { target { { i?86-*-linux* x86_64-*-linux* } && lp64 } } } */ +/* { dg-options "-fexceptions -fnon-call-exceptions -fasynchronous-unwind-tables -O2" } */ +/* Test complex CFA value expressions. */ + +#include +#include +#include +#include +#include + +static _Unwind_Reason_Code +force_unwind_stop (int version, _Unwind_Action actions, + _Unwind_Exception_Class exc_class, + struct _Unwind_Exception *exc_obj, + struct _Unwind_Context *context, + void *stop_parameter) +{ + if (actions & _UA_END_OF_STACK) + abort (); + return _URC_NO_REASON; +} + +static void +force_unwind () +{ + struct _Unwind_Exception *exc = malloc (sizeof (*exc)); + memset (&exc->exception_class, 0, sizeof (exc->exception_class)); + exc->exception_cleanup = 0; + + _Unwind_ForcedUnwind (exc, force_unwind_stop, 0); + abort (); +} + +int count; + +static void +counter (void *p __attribute__((unused))) +{ + ++count; +} + +static void +handler (void *p __attribute__((unused))) +{ + if (count != 2) + abort (); + _exit (0); +} + +static int __attribute__((noinline)) +fn5 (void) +{ + char dummy __attribute__((cleanup (counter))); + force_unwind (); + return 0; +} + +void +bar (void) +{ + char dummy __attribute__((cleanup (counter))); + fn5 (); +} + +void __attribute__((noinline)) +foo (int x) +{ + char buf[256]; +#ifdef __x86_64__ + __asm ( + "testl %0, %0\n\t" + "jnz 1f\n\t" + ".subsection 1\n\t" + ".type _L_mutex_lock_%=, @function\n" +"_L_mutex_lock_%=:\n" +"1:\t" "leaq %1, %%rdi\n" +"2:\t" "subq $128, %%rsp\n" +"3:\t" "call bar\n" +"4:\t" "addq $128, %%rsp\n" +"5:\t" "jmp 21f\n" +"6:\t" ".size _L_mutex_lock_%=, .-_L_mutex_lock_%=\n\t" + ".previous\n\t" + ".section .eh_frame,\"a\", at progbits\n" +"7:\t" ".long 9f-8f # Length of Common Information Entry\n" +"8:\t" ".long 0x0 # CIE Identifier Tag\n\t" + ".byte 0x1 # CIE Version\n\t" + ".ascii \"zR\\0\" # CIE Augmentation\n\t" + ".uleb128 0x1 # CIE Code Alignment Factor\n\t" + ".sleb128 -8 # CIE Data Alignment Factor\n\t" + ".byte 0x10 # CIE RA Column\n\t" + ".uleb128 0x1 # Augmentation size\n\t" + ".byte 0x1b # FDE Encoding (pcrel sdata4)\n\t" + ".byte 0xc # DW_CFA_def_cfa\n\t" + ".uleb128 0x7\n\t" + ".uleb128 0x0\n\t" + ".align 8\n" +"9:\t" ".long 20f-10f # FDE Length\n" +"10:\t" ".long 10b-7b # FDE CIE offset\n\t" + ".long 1b-. # FDE initial location\n\t" + ".long 6b-1b # FDE address range\n\t" + ".uleb128 0x0 # Augmentation size\n\t" + /* This CFA expression computes the address right + past the jnz instruction above, from %rip somewhere + within the _L_mutex_lock_%= subsection. */ + ".byte 0x16 # DW_CFA_val_expression\n\t" + ".uleb128 0x10\n\t" + ".uleb128 19f-11f\n" +"11:\t" ".byte 0x80 # DW_OP_breg16\n\t" + ".sleb128 0\n" +"12:\t" ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0x48\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 16f-13f\n" +"13:\t" ".byte 0x13 # DW_OP_drop\n\t" + ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 1\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0x81\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 15f-14f\n" +"14:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 3b-2b-1\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-15f\n" +"15:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 2b-1b-1\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-16f\n" +"16:\t" ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 0xe8\n\t" + ".byte 0x2e # DW_OP_ne\n\t" + ".byte 0x28 # DW_OP_bra\n\t" + ".2byte 18f-17f\n" +"17:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 4b-3b\n\t" + ".byte 0x2f # DW_OP_skip\n\t" + ".2byte 12b-18f\n" +"18:\t" ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 1\n\t" + ".byte 0x12 # DW_OP_dup\n\t" + ".byte 0x94 # DW_OP_deref_size\n\t" + ".byte 4\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 72 - (6b-5b) * 8 # (6b-5b) == 5 ? 32 : 56\n\t" + ".byte 0x24 # DW_OP_shl\n\t" + ".byte 0x08 # DW_OP_const1u\n\t" + ".byte 72 - (6b-5b) * 8 # (6b-5b) == 5 ? 32 : 56\n\t" + ".byte 0x26 # DW_OP_shra\n\t" + ".byte 0x22 # DW_OP_plus\n\t" + ".byte 0x23 # DW_OP_plus_uconst\n\t" + ".uleb128 6b-5b-1\n" +"19:\t" ".byte 0x40 + (3b-1b) # DW_CFA_advance_loc\n\t" + ".byte 0xe # DW_CFA_def_cfa_offset\n\t" + ".uleb128 128\n\t" + ".byte 0x40 + (5b-3b) # DW_CFA_advance_loc\n\t" + ".byte 0xe # DW_CFA_def_cfa_offset\n\t" + ".uleb128 0\n\t" + ".align 8\n" +"20:\t" ".previous\n" +"21:" + : : "r" (x), "m" (x), "r" (buf) + : "memory", "rax", "rdx", "rcx", "rsi", "rdi", + "r8", "r9", "r10", "r11"); +#else +# error Unsupported test architecture +#endif +} + +static int __attribute__((noinline)) +fn2 (void) +{ + foo (3); + return 0; +} + +static int __attribute__((noinline)) +fn1 (void) +{ + fn2 (); + return 0; +} + +static void * +fn0 (void) +{ + char dummy __attribute__((cleanup (handler))); + fn1 (); + return 0; +} + +int +main (void) +{ + fn0 (); + return 0; +} gcc41-gnuc-rh-release.patch: --- NEW FILE gcc41-gnuc-rh-release.patch --- 2004-10-19 Jakub Jelinek * c-cppbuiltin.c (define__GNUC__): Also define __GNUC_RH_RELEASE__. --- gcc/c-cppbuiltin.c.jj 2004-10-07 21:27:38.000000000 +0200 +++ gcc/c-cppbuiltin.c 2004-10-19 11:41:50.000000000 +0200 @@ -257,13 +257,13 @@ define__GNUC__ (void) { /* The format of the version string, enforced below, is ([^0-9]*-)?[0-9]+[.][0-9]+([.][0-9]+)?([- ].*)? */ - const char *q, *v = version_string; + const char *q, *v = version_string, *vstart, *vend; while (*v && !ISDIGIT (*v)) v++; gcc_assert (*v && (v <= version_string || v[-1] == '-')); - q = v; + vstart = q = v; while (ISDIGIT (*v)) v++; builtin_define_with_value_n ("__GNUC__", q, v - q); @@ -289,6 +289,27 @@ define__GNUC__ (void) builtin_define_with_value_n ("__GNUC_PATCHLEVEL__", "0", 1); gcc_assert (!*v || *v == ' ' || *v == '-'); + + vend = v; + v = strchr (v, '('); + if (v != NULL && strncmp (v + 1, "Red Hat ", 8) == 0) + { + v += 9; + if (strncmp (v, "Linux ", 6) == 0) + v += 6; + + gcc_assert (strncmp (v, vstart, vend - vstart) == 0); + gcc_assert (v[vend - vstart] == '-'); + + v += vend - vstart + 1; + q = v; + gcc_assert (ISDIGIT (*v)); + while (ISDIGIT (*v)) + v++; + builtin_define_with_value_n ("__GNUC_RH_RELEASE__", q, v - q); + + gcc_assert (!*v || *v == ')' || *v == '.'); + } } /* Define macros used by . Currently only defines limits gcc41-ia64-libunwind.patch: --- NEW FILE gcc41-ia64-libunwind.patch --- 2004-11-27 Jakub Jelinek * config.gcc (ia64*-*-linux*): If native and libelf is installed, use ia64/t-glibc-no-libunwind instead of the other t-*unwind* fragments. * config/ia64/t-glibc-no-libunwind: New file. * config/ia64/change-symver.c: New file. * config/ia64/unwind-ia64.c: If USE_SYMVER_GLOBAL and SHARED, define _Unwind_* to __symverglobal_Unwind_*. (alias): Undefine. (symverglobal): Define. Use it on _Unwind_*. * config/ia64/mkmap-symver-multi.awk: New file. * config/ia64/libgcc-ia64-no-libunwind.ver: New file. --- gcc/config.gcc.jj 2004-10-04 08:55:44.000000000 -0400 +++ gcc/config.gcc 2004-11-13 05:23:50.000000000 -0500 @@ -1185,9 +1185,16 @@ ia64*-*-freebsd*) ;; ia64*-*-linux*) tm_file="${tm_file} dbxelf.h elfos.h svr4.h linux.h ia64/sysv4.h ia64/linux.h" - tmake_file="${tmake_file} ia64/t-ia64 t-libunwind ia64/t-glibc" - if test x$with_system_libunwind != xyes ; then - tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind" + tmake_file="${tmake_file} ia64/t-ia64" + if test x${target} = x${host} && test x${target} = x${build} \ + && grep gelf_getverdef /usr/include/gelf.h > /dev/null 2>&1 \ + && test -f /usr/lib/libelf.so; then + tmake_file="${tmake_file} ia64/t-glibc-no-libunwind" + else + tmake_file="${tmake_file} t-libunwind ia64/t-glibc" + if test x$with_system_libunwind != xyes ; then + tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind" + fi fi target_cpu_default="MASK_GNU_AS|MASK_GNU_LD" extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o" --- gcc/config/ia64/t-glibc-no-libunwind.jj 2004-02-18 10:27:36.000000000 -0500 +++ gcc/config/ia64/t-glibc-no-libunwind 2004-11-15 09:56:33.000000000 -0500 @@ -0,0 +1,30 @@ +# Don't use system libunwind library on IA-64 GLIBC based system, +# but make _Unwind_* symbols unversioned, so that created programs +# are usable even when libgcc_s uses libunwind. +LIB2ADDEH += $(srcdir)/config/ia64/fde-glibc.c +SHLIB_MAPFILES += $(srcdir)/config/ia64/libgcc-ia64-no-libunwind.ver +SHLIB_MKMAP = $(srcdir)/config/ia64/mkmap-symver-multi.awk + +SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ + -Wl,--soname=$(SHLIB_SONAME) \ + -Wl,--version-script=$(SHLIB_MAP) \ + -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ $(SHLIB_OBJS) -lc && \ + rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \ + if [ -f $(SHLIB_DIR)/$(SHLIB_SONAME) ]; then \ + mv -f $(SHLIB_DIR)/$(SHLIB_SONAME) \ + $(SHLIB_DIR)/$(SHLIB_SONAME).backup; \ + else true; fi && \ + gcc -O2 -o $(SHLIB_DIR)/$(SHLIB_SONAME).tweak \ + $(srcdir)/config/ia64/change-symver.c -lelf && \ + $(SHLIB_DIR)/$(SHLIB_SONAME).tweak $(SHLIB_DIR)/$(SHLIB_SONAME).tmp \ + GCC_3.4.2 _GLOBAL_ \ + _Unwind_GetGR _Unwind_RaiseException _Unwind_GetRegionStart _Unwind_SetIP \ + _Unwind_GetIP _Unwind_GetLanguageSpecificData _Unwind_Resume \ + _Unwind_DeleteException _Unwind_SetGR _Unwind_ForcedUnwind \ + _Unwind_Backtrace _Unwind_FindEnclosingFunction _Unwind_GetCFA \ + _Unwind_Resume_or_Rethrow _Unwind_GetBSP && \ + rm -f $(SHLIB_DIR)/$(SHLIB_SONAME).tweak && \ + mv $(SHLIB_DIR)/$(SHLIB_SONAME).tmp $(SHLIB_DIR)/$(SHLIB_SONAME) && \ + $(LN_S) $(SHLIB_SONAME) $(SHLIB_DIR)/$(SHLIB_SOLINK) + +TARGET_LIBGCC2_CFLAGS += -DUSE_SYMVER_GLOBAL --- gcc/config/ia64/change-symver.c.jj 2004-02-18 10:27:36.000000000 -0500 +++ gcc/config/ia64/change-symver.c 2004-11-13 05:23:50.000000000 -0500 @@ -0,0 +1,211 @@ +#define _GNU_SOURCE 1 +#define _FILE_OFFSET_BITS 64 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +int +compute_veridx (const char *name, Elf *elf, Elf_Data *verd, GElf_Shdr *verd_shdr) +{ + if (strcmp (name, "_GLOBAL_") == 0) + return 1; + + int cnt; + size_t offset = 0; + for (cnt = verd_shdr->sh_info; --cnt >= 0; ) + { + GElf_Verdef defmem; + GElf_Verdef *def; + GElf_Verdaux auxmem; + GElf_Verdaux *aux; + unsigned int auxoffset; + + /* Get the data at the next offset. */ + def = gelf_getverdef (verd, offset, &defmem); + if (def == NULL) + break; + + auxoffset = offset + def->vd_aux; + aux = gelf_getverdaux (verd, auxoffset, &auxmem); + if (aux == NULL) + break; + + if (strcmp (name, elf_strptr (elf, verd_shdr->sh_link, + aux->vda_name)) == 0) + return def->vd_ndx; + + /* Find the next offset. */ + offset += def->vd_next; + } + + return -1; +} + +int +main (int argc, char **argv) +{ + if (argc < 4) + error (1, 0, "Usage: change_symver library from_symver to_symver symbol...\nExample: change_symver libfoo.so FOO_1.0 *global* bar baz"); + + const char *fname = argv[1]; + + /* Open the file. */ + int fd; + fd = open (fname, O_RDWR); + if (fd == -1) + error (1, errno, fname); + + elf_version (EV_CURRENT); + + /* Now get the ELF descriptor. */ + Elf *elf = elf_begin (fd, ELF_C_READ_MMAP, NULL); + if (elf == NULL || elf_kind (elf) != ELF_K_ELF) + error (1, 0, "Couldn't open %s: %s", fname, elf_errmsg (-1)); + + size_t shstrndx; + /* Get the section header string table index. */ + if (elf_getshstrndx (elf, &shstrndx) < 0) + error (1, 0, "cannot get shstrndx from %s", fname); + + GElf_Ehdr ehdr_mem; + GElf_Ehdr *ehdr; + + /* We need the ELF header in a few places. */ + ehdr = gelf_getehdr (elf, &ehdr_mem); + if (ehdr == NULL) + error (1, 0, "couldn't get ELF headers %s: %s", fname, elf_errmsg (-1)); + + Elf_Scn *scn = NULL; + GElf_Shdr shdr_mem, verd_shdr, ver_shdr, dynsym_shdr; + Elf_Data *ver = NULL, *verd = NULL, *dynsym = NULL; + + while ((scn = elf_nextscn (elf, scn)) != NULL) + { + GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem); + + if (shdr == NULL) + error (1, 0, "couldn't get shdr from %s", fname); + + if ((shdr->sh_flags & SHF_ALLOC) != 0) + { + const char *name = elf_strptr (elf, shstrndx, shdr->sh_name); + Elf_Data **p; + + if (strcmp (name, ".gnu.version") == 0) + { + p = &ver; + ver_shdr = *shdr; + } + else if (strcmp (name, ".gnu.version_d") == 0) + { + p = &verd; + verd_shdr = *shdr; + } + else if (strcmp (name, ".dynsym") == 0) + { + p = &dynsym; + dynsym_shdr = *shdr; + } + else + continue; + + if (*p != NULL) + error (1, 0, "Two %s sections in %s", name, fname); + *p = elf_getdata (scn, NULL); + if (*p == NULL || elf_getdata (scn, *p) != NULL) + error (1, 0, "No data or non-contiguous data in %s section in %s", + name, fname); + } + } + + if (ver == NULL || verd == NULL || dynsym == NULL) + error (1, 0, "Couldn't find one of the needed sections in %s", fname); + + int from_idx = compute_veridx (argv[2], elf, verd, &verd_shdr); + if (from_idx == -1) + error (1, 0, "Could not find symbol version %s in %s", argv[2], fname); + + int to_idx = compute_veridx (argv[3], elf, verd, &verd_shdr); + if (to_idx == -1) + error (1, 0, "Could not find symbol version %s in %s", argv[3], fname); + + if (dynsym_shdr.sh_entsize != gelf_fsize (elf, ELF_T_SYM, 1, ehdr->e_version) + || dynsym_shdr.sh_size % dynsym_shdr.sh_entsize + || ver_shdr.sh_entsize != 2 + || (ver_shdr.sh_size & 1) + || dynsym_shdr.sh_size / dynsym_shdr.sh_entsize != ver_shdr.sh_size / 2) + error (1, 0, "Unexpected sh_size or sh_entsize in %s", fname); + + size_t nentries = ver_shdr.sh_size / 2; + size_t cnt; + GElf_Versym array[nentries]; + for (cnt = 0; cnt < nentries; ++cnt) + { + GElf_Versym vsymmem; + GElf_Versym *vsym; + + vsym = gelf_getversym (ver, cnt, &vsymmem); + if (vsym == NULL) + error (1, 0, "gelt_getversym failed in %s: %s", fname, elf_errmsg (-1)); + + array[cnt] = *vsym; + if (*vsym != from_idx) + continue; + + GElf_Sym sym_mem; + GElf_Sym *sym; + sym = gelf_getsym (dynsym, cnt, &sym_mem); + if (sym == NULL) + error (1, 0, "gelt_getsym failed in %s: %s", fname, elf_errmsg (-1)); + + const char *name = elf_strptr (elf, dynsym_shdr.sh_link, sym->st_name); + + int argn; + for (argn = 4; argn < argc; ++argn) + if (fnmatch (argv[argn], name, 0) == 0) + { + array[cnt] = to_idx; + break; + } + } + + if (sizeof (array[0]) != 2) + abort (); + +#if __BYTE_ORDER == __LITTLE_ENDIAN + if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) + ; + else if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) +#elif __BYTE_ORDER == __BIG_ENDIAN + if (ehdr->e_ident[EI_DATA] == ELFDATA2MSB) + ; + else if (ehdr->e_ident[EI_DATA] == ELFDATA2LSB) +#else +# error Unsupported endianity +#endif + { + for (cnt = 0; cnt < nentries; ++cnt) + array[cnt] = ((array[cnt] & 0xff) << 8) | ((array[cnt] & 0xff00) >> 8); + } + else + error (1, 0, "Unknown EI_DATA %d in %s", ehdr->e_ident[EI_DATA], fname); + + if (elf_end (elf) != 0) + error (1, 0, "couldn't close %s: %s", fname, elf_errmsg (-1)); + + if (lseek (fd, ver_shdr.sh_offset, SEEK_SET) != (off_t) ver_shdr.sh_offset) + error (1, 0, "failed to seek to %zd in %s", (size_t) ver_shdr.sh_offset, + fname); + + if (write (fd, array, 2 * nentries) != (ssize_t) (2 * nentries)) + error (1, 0, "failed to write .gnu.version section into %s", fname); + + close (fd); + return 0; +} --- gcc/config/ia64/unwind-ia64.c.jj 2004-10-04 08:55:57.000000000 -0400 +++ gcc/config/ia64/unwind-ia64.c 2004-11-15 09:07:45.000000000 -0500 @@ -51,6 +51,51 @@ #define UNW_FLAG_UHANDLER(x) ((x) & 0x0000000200000000L) #define UNW_LENGTH(x) ((x) & 0x00000000ffffffffL) +#if defined (USE_SYMVER_GLOBAL) && defined (SHARED) +extern _Unwind_Reason_Code __symverglobal_Unwind_Backtrace + (_Unwind_Trace_Fn, void *); +extern void __symverglobal_Unwind_DeleteException + (struct _Unwind_Exception *); +extern void * __symverglobal_Unwind_FindEnclosingFunction (void *); +extern _Unwind_Reason_Code __symverglobal_Unwind_ForcedUnwind + (struct _Unwind_Exception *, _Unwind_Stop_Fn, void *); +extern _Unwind_Word __symverglobal_Unwind_GetCFA + (struct _Unwind_Context *); +extern _Unwind_Word __symverglobal_Unwind_GetBSP + (struct _Unwind_Context *); +extern _Unwind_Word __symverglobal_Unwind_GetGR + (struct _Unwind_Context *, int ); +extern _Unwind_Ptr __symverglobal_Unwind_GetIP (struct _Unwind_Context *); +extern void *__symverglobal_Unwind_GetLanguageSpecificData + (struct _Unwind_Context *); +extern _Unwind_Ptr __symverglobal_Unwind_GetRegionStart + (struct _Unwind_Context *); +extern _Unwind_Reason_Code __symverglobal_Unwind_RaiseException + (struct _Unwind_Exception *); +extern void __symverglobal_Unwind_Resume (struct _Unwind_Exception *); +extern _Unwind_Reason_Code __symverglobal_Unwind_Resume_or_Rethrow + (struct _Unwind_Exception *); +extern void __symverglobal_Unwind_SetGR + (struct _Unwind_Context *, int, _Unwind_Word); +extern void __symverglobal_Unwind_SetIP + (struct _Unwind_Context *, _Unwind_Ptr); +#define _Unwind_Backtrace __symverglobal_Unwind_Backtrace +#define _Unwind_DeleteException __symverglobal_Unwind_DeleteException +#define _Unwind_FindEnclosingFunction __symverglobal_Unwind_FindEnclosingFunction +#define _Unwind_ForcedUnwind __symverglobal_Unwind_ForcedUnwind +#define _Unwind_GetBSP __symverglobal_Unwind_GetBSP +#define _Unwind_GetCFA __symverglobal_Unwind_GetCFA +#define _Unwind_GetGR __symverglobal_Unwind_GetGR +#define _Unwind_GetIP __symverglobal_Unwind_GetIP +#define _Unwind_GetLanguageSpecificData __symverglobal_Unwind_GetLanguageSpecificData +#define _Unwind_GetRegionStart __symverglobal_Unwind_GetRegionStart +#define _Unwind_RaiseException __symverglobal_Unwind_RaiseException +#define _Unwind_Resume __symverglobal_Unwind_Resume +#define _Unwind_Resume_or_Rethrow __symverglobal_Unwind_Resume_or_Rethrow +#define _Unwind_SetGR __symverglobal_Unwind_SetGR +#define _Unwind_SetIP __symverglobal_Unwind_SetIP +#endif + enum unw_application_register { UNW_AR_BSP, @@ -2402,4 +2447,44 @@ alias (_Unwind_SetGR); alias (_Unwind_SetIP); #endif +#if defined (USE_SYMVER_GLOBAL) && defined (SHARED) +#undef alias +#define symverglobal(name, version) \ +__typeof (__symverglobal##name) __symverlocal##name \ + __attribute__ ((alias ("__symverglobal" #name))); \ +__asm__ (".symver __symverglobal" #name"," #name "@@GCC_3.4.2");\ +__asm__ (".symver __symverlocal" #name"," #name "@" #version) + +#undef _Unwind_Backtrace +#undef _Unwind_DeleteException +#undef _Unwind_FindEnclosingFunction +#undef _Unwind_ForcedUnwind +#undef _Unwind_GetBSP +#undef _Unwind_GetCFA +#undef _Unwind_GetGR +#undef _Unwind_GetIP +#undef _Unwind_GetLanguageSpecificData +#undef _Unwind_GetRegionStart +#undef _Unwind_RaiseException +#undef _Unwind_Resume +#undef _Unwind_Resume_or_Rethrow +#undef _Unwind_SetGR +#undef _Unwind_SetIP +symverglobal (_Unwind_Backtrace, GCC_3.3); +symverglobal (_Unwind_DeleteException, GCC_3.0); +symverglobal (_Unwind_FindEnclosingFunction, GCC_3.3); +symverglobal (_Unwind_ForcedUnwind, GCC_3.0); +symverglobal (_Unwind_GetBSP, GCC_3.3.2); +symverglobal (_Unwind_GetCFA, GCC_3.3); +symverglobal (_Unwind_GetGR, GCC_3.0); +symverglobal (_Unwind_GetIP, GCC_3.0); +symverglobal (_Unwind_GetLanguageSpecificData, GCC_3.0); +symverglobal (_Unwind_GetRegionStart, GCC_3.0); +symverglobal (_Unwind_RaiseException, GCC_3.0); +symverglobal (_Unwind_Resume, GCC_3.0); +symverglobal (_Unwind_Resume_or_Rethrow, GCC_3.3); +symverglobal (_Unwind_SetGR, GCC_3.0); +symverglobal (_Unwind_SetIP, GCC_3.0); +#endif + #endif --- gcc/config/ia64/mkmap-symver-multi.awk.jj 2004-02-18 10:27:36.000000000 -0500 +++ gcc/config/ia64/mkmap-symver-multi.awk 2004-11-15 09:46:50.000000000 -0500 @@ -0,0 +1,133 @@ +# Generate an ELF symbol version map a-la Solaris and GNU ld. +# Contributed by Richard Henderson +# +# This file is part of GCC. +# +# GCC 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, or (at your option) any later +# version. +# +# GCC 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 GCC; see the file COPYING. If not, write to the Free +# Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +BEGIN { + state = "nm"; + sawsymbol = 0; +} + +# Remove comment and blank lines. +/^ *#/ || /^ *$/ { + next; +} + +# We begin with nm input. Collect the set of symbols that are present +# so that we can not emit them into the final version script -- Solaris +# complains at us if we do. + +state == "nm" && /^%%/ { + state = "ver"; + next; +} + +state == "nm" && ($1 == "U" || $2 == "U") { + next; +} + +state == "nm" && NF == 3 { + if ($3 ~ /^[^@]*@GCC_[0-9.]*$/) { + def[$3] = 1 + tl=$3 + sub(/^.*@/,"",tl) + ver[$3] = tl + } else { + sub(/@@?GCC_[0-9.]*$/,"",$3) + def[$3] = 1; + } + sawsymbol = 1; + next; +} + +state == "nm" { + next; +} + +# Now we process a simplified variant of the Solaris symbol version +# script. We have one symbol per line, no semicolons, simple markers +# for beginning and ending each section, and %inherit markers for +# describing version inheritence. A symbol may appear in more than +# one symbol version, and the last seen takes effect. + +NF == 3 && $1 == "%inherit" { + inherit[$2] = $3; + next; +} + +NF == 2 && $2 == "{" { + libs[$1] = 1; + thislib = $1; + next; +} + +$1 == "}" { + thislib = ""; + next; +} + +{ + ver[$1] = thislib; + next; +} + +END { + if (!sawsymbol) + { + print "No symbols seen -- broken or mis-installed nm?" | "cat 1>&2"; + exit 1; + } + for (l in libs) + output(l); +} + +function output(lib) { + if (done[lib]) + return; + done[lib] = 1; + if (inherit[lib]) + output(inherit[lib]); + + empty=1 + for (sym in ver) + if ((ver[sym] == lib) && (sym in def)) + { + if (empty) + { + printf("%s {\n", lib); + printf(" global:\n"); + empty = 0; + } + symp = sym; + sub(/@GCC_[0-9.]*$/,"",symp); + printf("\t%s;\n", symp); + if (dotsyms) + printf("\t.%s;\n", symp); + } + + if (empty) + { + for (l in libs) + if (inherit[l] == lib) + inherit[l] = inherit[lib]; + } + else if (inherit[lib]) + printf("} %s;\n", inherit[lib]); + else + printf ("\n local:\n\t*;\n};\n"); +} --- gcc/config/ia64/libgcc-ia64-no-libunwind.ver.jj 2004-02-18 10:27:36.000000000 -0500 +++ gcc/config/ia64/libgcc-ia64-no-libunwind.ver 2004-11-15 09:19:56.000000000 -0500 @@ -0,0 +1,17 @@ +GCC_3.4.2 { + _Unwind_GetGR + _Unwind_RaiseException + _Unwind_GetRegionStart + _Unwind_SetIP + _Unwind_GetIP + _Unwind_GetLanguageSpecificData + _Unwind_Resume + _Unwind_DeleteException + _Unwind_SetGR + _Unwind_ForcedUnwind + _Unwind_Backtrace + _Unwind_FindEnclosingFunction + _Unwind_GetCFA + _Unwind_Resume_or_Rethrow + _Unwind_GetBSP +} gcc41-ice-hack.patch: --- NEW FILE gcc41-ice-hack.patch --- 2004-01-23 Jakub Jelinek * system.h (ICE_EXIT_CODE): Define. * gcc.c (execute): Don't free first string early, but at the end of the function. Call retry_ice if compiler exited with ICE_EXIT_CODE. (retry_ice): New function. * diagnostic.c (diagnostic_count_diagnostic, diagnostic_action_after_output, error_recursion): Exit with ICE_EXIT_CODE instead of FATAL_EXIT_CODE. --- gcc/system.h.jj 2004-01-19 17:29:30.000000000 +0100 +++ gcc/system.h 2004-01-21 11:53:41.000000000 +0100 @@ -153,6 +153,10 @@ extern int errno; # endif #endif +#ifndef ICE_EXIT_CODE +# define ICE_EXIT_CODE 27 +#endif + #ifdef HAVE_UNISTD_H # include #endif --- gcc/gcc.c.jj 2004-01-21 11:45:20.000000000 +0100 +++ gcc/gcc.c 2004-01-21 11:56:46.000000000 +0100 @@ -346,6 +346,9 @@ static void init_gcc_specs (struct obsta #if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX) static const char *convert_filename (const char *, int, int); #endif +#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS)) +static void retry_ice (const char *prog, const char **argv); +#endif static const char *if_exists_spec_function (int, const char **); static const char *if_exists_else_spec_function (int, const char **); @@ -2841,7 +2844,7 @@ execute (void) } } - if (string != commands[i].prog) + if (i && string != commands[i].prog) free ((void *) string); } @@ -2897,6 +2900,16 @@ See %s for instructions.", else if (WIFEXITED (status) && WEXITSTATUS (status) >= MIN_FATAL_STATUS) { +#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS)) + /* For ICEs in cc1, cc1obj, cc1plus see if it is + reproducible or not. */ + char *p; + if (WEXITSTATUS (status) == ICE_EXIT_CODE + && i == 0 + && (p = strrchr (commands[0].argv[0], DIR_SEPARATOR)) + && ! strncmp (p + 1, "cc1", 3)) + retry_ice (commands[0].prog, commands[0].argv); +#endif if (WEXITSTATUS (status) > greatest_status) greatest_status = WEXITSTATUS (status); ret_code = -1; @@ -2917,6 +2930,9 @@ See %s for instructions.", } } + if (commands[0].argv[0] != commands[0].prog) + free ((PTR) commands[0].argv[0]); + return ret_code; } } @@ -5898,6 +5914,224 @@ give_switch (int switchnum, int omit_fir switches[switchnum].validated = 1; } +#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS)) +#define RETRY_ICE_ATTEMPTS 2 + +static void +retry_ice (const char *prog, const char **argv) +{ + int nargs, out_arg = -1, quiet = 0, attempt; + int pid, retries, sleep_interval; + const char **new_argv; + char *temp_filenames[RETRY_ICE_ATTEMPTS * 2 + 2]; + + if (input_filename == NULL || ! strcmp (input_filename, "-")) + return; + + for (nargs = 0; argv[nargs] != NULL; ++nargs) + /* Only retry compiler ICEs, not preprocessor ones. */ + if (! strcmp (argv[nargs], "-E")) + return; + else if (argv[nargs][0] == '-' && argv[nargs][1] == 'o') + { + if (out_arg == -1) + out_arg = nargs; + else + return; + } + /* If the compiler is going to output any time information, + it might varry between invocations. */ + else if (! strcmp (argv[nargs], "-quiet")) + quiet = 1; + else if (! strcmp (argv[nargs], "-ftime-report")) + return; + + if (out_arg == -1 || !quiet) + return; + + memset (temp_filenames, '\0', sizeof (temp_filenames)); + new_argv = alloca ((nargs + 3) * sizeof (const char *)); + memcpy (new_argv, argv, (nargs + 1) * sizeof (const char *)); + new_argv[nargs++] = "-frandom-seed=0"; + new_argv[nargs] = NULL; + if (new_argv[out_arg][2] == '\0') + new_argv[out_arg + 1] = "-"; + else + new_argv[out_arg] = "-o-"; + + for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS + 1; ++attempt) + { + int fd = -1; + int status; + + temp_filenames[attempt * 2] = make_temp_file (".out"); + temp_filenames[attempt * 2 + 1] = make_temp_file (".err"); + + if (attempt == RETRY_ICE_ATTEMPTS) + { + int i; + int fd1, fd2; + struct stat st1, st2; + size_t n, len; + char *buf; + + buf = xmalloc (8192); + + for (i = 0; i < 2; ++i) + { + fd1 = open (temp_filenames[i], O_RDONLY); + fd2 = open (temp_filenames[2 + i], O_RDONLY); + + if (fd1 < 0 || fd2 < 0) + { + i = -1; + close (fd1); + close (fd2); + break; + } + + if (fstat (fd1, &st1) < 0 || fstat (fd2, &st2) < 0) + { + i = -1; + close (fd1); + close (fd2); + break; + } + + if (st1.st_size != st2.st_size) + { + close (fd1); + close (fd2); + break; + } + + len = 0; + for (n = st1.st_size; n; n -= len) + { + len = n; + if (len > 4096) + len = 4096; + + if (read (fd1, buf, len) != (int) len + || read (fd2, buf + 4096, len) != (int) len) + { + i = -1; + break; + } + + if (memcmp (buf, buf + 4096, len) != 0) + break; + } + + close (fd1); + close (fd2); + + if (n) + break; + } + + free (buf); + if (i == -1) + break; + + if (i != 2) + { + notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n"); + break; + } + + fd = open (temp_filenames[attempt * 2], O_RDWR); + if (fd < 0) + break; + write (fd, "//", 2); + for (i = 0; i < nargs; i++) + { + write (fd, " ", 1); + write (fd, new_argv[i], strlen (new_argv[i])); + } + write (fd, "\n", 1); + new_argv[nargs] = "-E"; + new_argv[nargs + 1] = NULL; + } + + /* Fork a subprocess; wait and retry if it fails. */ + sleep_interval = 1; + pid = -1; + for (retries = 0; retries < 4; retries++) + { + pid = fork (); + if (pid >= 0) + break; + sleep (sleep_interval); + sleep_interval *= 2; + } + + if (pid < 0) + break; + else if (pid == 0) + { + if (attempt != RETRY_ICE_ATTEMPTS) + fd = open (temp_filenames[attempt * 2], O_RDWR); + if (fd < 0) + exit (-1); + if (fd != 1) + { + close (1); + dup (fd); + close (fd); + } + + fd = open (temp_filenames[attempt * 2 + 1], O_RDWR); + if (fd < 0) + exit (-1); + if (fd != 2) + { + close (2); + dup (fd); + close (fd); + } + + if (prog == new_argv[0]) + execvp (prog, (char *const *) new_argv); + else + execv (new_argv[0], (char *const *) new_argv); + exit (-1); + } + + if (waitpid (pid, &status, 0) < 0) + break; + + if (attempt < RETRY_ICE_ATTEMPTS + && (! WIFEXITED (status) || WEXITSTATUS (status) != ICE_EXIT_CODE)) + { + notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n"); + break; + } + else if (attempt == RETRY_ICE_ATTEMPTS) + { + close (fd); + if (WIFEXITED (status) + && WEXITSTATUS (status) == SUCCESS_EXIT_CODE) + { + notice ("Preprocessed source stored into %s file, please attach this to your bugreport.\n", + temp_filenames[attempt * 2]); + /* Make sure it is not deleted. */ + free (temp_filenames[attempt * 2]); + temp_filenames[attempt * 2] = NULL; + break; + } + } + } + + for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS * 2 + 2; attempt++) + if (temp_filenames[attempt]) + { + unlink (temp_filenames[attempt]); + free (temp_filenames[attempt]); + } +} +#endif + /* Search for a file named NAME trying various prefixes including the user's -B prefix and some standard ones. Return the absolute file name found. If nothing is found, return NAME. */ --- gcc/diagnostic.c.jj 2003-10-01 12:09:21.000000000 +0200 +++ gcc/diagnostic.c 2004-01-21 11:54:47.000000000 +0100 @@ -237,14 +237,14 @@ diagnostic_action_after_output (diagnost fnotice (stderr, "Please submit a full bug report,\n" "with preprocessed source if appropriate.\n" "See %s for instructions.\n", bug_report_url); - exit (FATAL_EXIT_CODE); + exit (ICE_EXIT_CODE); case DK_FATAL: if (context->abort_on_error) real_abort (); fnotice (stderr, "compilation terminated.\n"); - exit (FATAL_EXIT_CODE); + exit (ICE_EXIT_CODE); default: gcc_unreachable (); gcc41-java-nomulti.patch: --- NEW FILE gcc41-java-nomulti.patch --- --- libjava/configure.ac.jj 2004-08-16 21:13:29.000000000 +0200 +++ libjava/configure.ac 2004-08-21 11:44:59.020755542 +0200 @@ -367,6 +367,10 @@ use_gtk_awt="" TOOLKIT= AC_SUBST(TOOLKIT) +if test -n "${with_multisubdir}"; then + peerlibs=no +fi + for peer in $peerlibs ; do case $peer in xlib) --- libjava/configure.jj 2004-08-16 21:22:14.000000000 +0200 +++ libjava/configure 2004-08-21 11:45:16.260738060 +0200 @@ -4118,6 +4118,9 @@ use_gtk_awt="" # The default toolkit to use is the first one specified. TOOLKIT= +if test -n "${with_multisubdir}"; then + peerlibs=no +fi for peer in $peerlibs ; do case $peer in gcc41-java-slow_pthread_self.patch: --- NEW FILE gcc41-java-slow_pthread_self.patch --- 2005-05-20 Jakub Jelinek * configure.host (slow_pthread_self): Set to empty unconditionally on Linux targets. --- libjava/configure.host (.../gcc-4_0-branch) (revision 107266) +++ libjava/configure.host (.../redhat/gcc-4_0-branch) (revision 107414) @@ -174,6 +174,7 @@ sh-linux* | sh[34]*-linux*) can_unwind_signal=yes libgcj_ld_symbolic='-Wl,-Bsymbolic' + slow_pthread_self= if test x$slow_pthread_self = xyes \ && test x$cross_compiling != xyes; then cat > conftest.c < * config.gcc (i[34567]86-*-*): Add tmmintrin.h to extra_headers. (x86_64-*-*): Likewise. * config/i386/i386.c (pta_flags): Add PTA_MNI. (override_options): Check MNI. (ix86_builtins): Add IX86_BUILTIN_PHADDW, IX86_BUILTIN_PHADDD, IX86_BUILTIN_PHADDSW, IX86_BUILTIN_PHSUBW, IX86_BUILTIN_PHSUBD, IX86_BUILTIN_PHSUBSW, IX86_BUILTIN_PMADDUBSW, IX86_BUILTIN_PMULHRSW, IX86_BUILTIN_PSHUFB, IX86_BUILTIN_PSIGNB, IX86_BUILTIN_PSIGNW, IX86_BUILTIN_PSIGND, IX86_BUILTIN_PALIGNR, IX86_BUILTIN_PABSB, IX86_BUILTIN_PABSW, IX86_BUILTIN_PABSD, IX86_BUILTIN_PHADDW128, IX86_BUILTIN_PHADDD128, IX86_BUILTIN_PHADDSW128, IX86_BUILTIN_PHSUBW128, IX86_BUILTIN_PHSUBD128, IX86_BUILTIN_PHSUBSW128, IX86_BUILTIN_PMADDUBSW128, IX86_BUILTIN_PMULHRSW128, IX86_BUILTIN_PSHUFB128, IX86_BUILTIN_PSIGNB128, IX86_BUILTIN_PSIGNW128, IX86_BUILTIN_PSIGND128, IX86_BUILTIN_PALIGNR128, IX86_BUILTIN_PABSB128, IX86_BUILTIN_PABSW128 and IX86_BUILTIN_PABSD128. (bdesc_2arg): Add MNI. (bdesc_1arg): Likewise. (ix86_init_mmx_sse_builtins): Support MNI. (ix86_expand_builtin): Likewise. * config/i386/i386.h (TARGET_CPU_CPP_BUILTINS): Likewise. * config/i386/i386.md (UNSPEC_LDQQU): Renamed to ... (UNSPEC_LDDQU): This. (UNSPEC_PSHUFB): New. (UNSPEC_PSIGN): Likewise. (UNSPEC_PALIGNR): Likewise. Include mmx.md before sse.md. * config/i386/i386.opt: Add -mmni. * config/i386/sse.md (sse3_lddqu): Updated. (mni_phaddwv8hi3): New pattern for MNI. (mni_phaddwv4hi3): Likewise. (mni_phadddv4si3): Likewise. (mni_phadddv2si3): Likewise. (mni_phaddswv8hi3): Likewise. (mni_phaddswv4hi3): Likewise. (mni_phsubwv8hi3): Likewise. (mni_phsubwv4hi3): Likewise. (mni_phsubdv4si3): Likewise. (mni_phsubdv2si3): Likewise. (mni_phsubswv8hi3): Likewise. (mni_phsubswv4hi3): Likewise. (mni_pmaddubswv8hi3): Likewise. (mni_pmaddubswv4hi3): Likewise. (mni_pmulhrswv8hi3): Likewise. (mni_pmulhrswv4hi3): Likewise. (mni_pshufbv16qi3): Likewise. (mni_pshufbv8qi3): Likewise. (mni_psign3): Likewise. (mni_psign3): Likewise. (mni_palignrti): Likewise. (mni_palignrdi): Likewise. (mni_pabs2): Likewise. (mni_pabs2): Likewise. * config/i386/tmmintrin.h: New file. * doc/extend.texi: Document MNI built-in functions. * doc/invoke.texi: Document -mmni/-mno-mni switches. --- gcc/config.gcc.mni 2006-02-14 13:18:08.000000000 -0800 +++ gcc/config.gcc 2006-02-24 13:39:19.000000000 -0800 @@ -263,11 +263,13 @@ xscale-*-*) ;; i[34567]86-*-*) cpu_type=i386 - extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h pmmintrin.h" + extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h + pmmintrin.h tmmintrin.h" ;; x86_64-*-*) cpu_type=i386 - extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h pmmintrin.h" + extra_headers="mmintrin.h mm3dnow.h xmmintrin.h emmintrin.h + pmmintrin.h tmmintrin.h" need_64bit_hwint=yes ;; ia64-*-*) --- gcc/config/i386/i386.c.mni 2006-02-24 13:39:19.000000000 -0800 +++ gcc/config/i386/i386.c 2006-02-24 13:39:19.000000000 -0800 @@ -1446,11 +1446,12 @@ override_options (void) PTA_SSE = 1, PTA_SSE2 = 2, PTA_SSE3 = 4, - PTA_MMX = 8, - PTA_PREFETCH_SSE = 16, - PTA_3DNOW = 32, - PTA_3DNOW_A = 64, - PTA_64BIT = 128 + PTA_MNI = 8, + PTA_MMX = 16, + PTA_PREFETCH_SSE = 32, + PTA_3DNOW = 64, + PTA_3DNOW_A = 128, + PTA_64BIT = 256 } flags; } const processor_alias_table[] = @@ -1645,6 +1646,9 @@ override_options (void) if (processor_alias_table[i].flags & PTA_SSE3 && !(target_flags_explicit & MASK_SSE3)) target_flags |= MASK_SSE3; + if (processor_alias_table[i].flags & PTA_MNI + && !(target_flags_explicit & MASK_MNI)) + target_flags |= MASK_MNI; if (processor_alias_table[i].flags & PTA_PREFETCH_SSE) x86_prefetch_sse = true; if (TARGET_64BIT && !(processor_alias_table[i].flags & PTA_64BIT)) @@ -1836,6 +1840,10 @@ override_options (void) if (!TARGET_80387) target_flags |= MASK_NO_FANCY_MATH_387; + /* Turn on SSE3 builtins for -mmni. */ + if (TARGET_MNI) + target_flags |= MASK_SSE3; + /* Turn on SSE2 builtins for -msse3. */ if (TARGET_SSE3) target_flags |= MASK_SSE2; @@ -14147,6 +14155,41 @@ enum ix86_builtins IX86_BUILTIN_MONITOR, IX86_BUILTIN_MWAIT, + /* Merom New Instructions. */ + IX86_BUILTIN_PHADDW, + IX86_BUILTIN_PHADDD, + IX86_BUILTIN_PHADDSW, + IX86_BUILTIN_PHSUBW, + IX86_BUILTIN_PHSUBD, + IX86_BUILTIN_PHSUBSW, + IX86_BUILTIN_PMADDUBSW, + IX86_BUILTIN_PMULHRSW, + IX86_BUILTIN_PSHUFB, + IX86_BUILTIN_PSIGNB, + IX86_BUILTIN_PSIGNW, + IX86_BUILTIN_PSIGND, + IX86_BUILTIN_PALIGNR, + IX86_BUILTIN_PABSB, + IX86_BUILTIN_PABSW, + IX86_BUILTIN_PABSD, + + IX86_BUILTIN_PHADDW128, + IX86_BUILTIN_PHADDD128, + IX86_BUILTIN_PHADDSW128, + IX86_BUILTIN_PHSUBW128, + IX86_BUILTIN_PHSUBD128, + IX86_BUILTIN_PHSUBSW128, + IX86_BUILTIN_PMADDUBSW128, + IX86_BUILTIN_PMULHRSW128, + IX86_BUILTIN_PSHUFB128, + IX86_BUILTIN_PSIGNB128, + IX86_BUILTIN_PSIGNW128, + IX86_BUILTIN_PSIGND128, + IX86_BUILTIN_PALIGNR128, + IX86_BUILTIN_PABSB128, + IX86_BUILTIN_PABSW128, + IX86_BUILTIN_PABSD128, + IX86_BUILTIN_VEC_INIT_V2SI, IX86_BUILTIN_VEC_INIT_V4HI, IX86_BUILTIN_VEC_INIT_V8QI, @@ -14487,7 +14530,33 @@ static const struct builtin_description { MASK_SSE3, CODE_FOR_sse3_haddv4sf3, "__builtin_ia32_haddps", IX86_BUILTIN_HADDPS, 0, 0 }, { MASK_SSE3, CODE_FOR_sse3_haddv2df3, "__builtin_ia32_haddpd", IX86_BUILTIN_HADDPD, 0, 0 }, { MASK_SSE3, CODE_FOR_sse3_hsubv4sf3, "__builtin_ia32_hsubps", IX86_BUILTIN_HSUBPS, 0, 0 }, - { MASK_SSE3, CODE_FOR_sse3_hsubv2df3, "__builtin_ia32_hsubpd", IX86_BUILTIN_HSUBPD, 0, 0 } + { MASK_SSE3, CODE_FOR_sse3_hsubv2df3, "__builtin_ia32_hsubpd", IX86_BUILTIN_HSUBPD, 0, 0 }, + + /* MNI MMX */ + { MASK_MNI, CODE_FOR_mni_phaddwv8hi3, "__builtin_ia32_phaddw128", IX86_BUILTIN_PHADDW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phaddwv4hi3, "__builtin_ia32_phaddw", IX86_BUILTIN_PHADDW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phadddv4si3, "__builtin_ia32_phaddd128", IX86_BUILTIN_PHADDD128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phadddv2si3, "__builtin_ia32_phaddd", IX86_BUILTIN_PHADDD, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phaddswv8hi3, "__builtin_ia32_phaddsw128", IX86_BUILTIN_PHADDSW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phaddswv4hi3, "__builtin_ia32_phaddsw", IX86_BUILTIN_PHADDSW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubwv8hi3, "__builtin_ia32_phsubw128", IX86_BUILTIN_PHSUBW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubwv4hi3, "__builtin_ia32_phsubw", IX86_BUILTIN_PHSUBW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubdv4si3, "__builtin_ia32_phsubd128", IX86_BUILTIN_PHSUBD128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubdv2si3, "__builtin_ia32_phsubd", IX86_BUILTIN_PHSUBD, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubswv8hi3, "__builtin_ia32_phsubsw128", IX86_BUILTIN_PHSUBSW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_phsubswv4hi3, "__builtin_ia32_phsubsw", IX86_BUILTIN_PHSUBSW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pmaddubswv8hi3, "__builtin_ia32_pmaddubsw128", IX86_BUILTIN_PMADDUBSW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pmaddubswv4hi3, "__builtin_ia32_pmaddubsw", IX86_BUILTIN_PMADDUBSW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pmulhrswv8hi3, "__builtin_ia32_pmulhrsw128", IX86_BUILTIN_PMULHRSW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pmulhrswv4hi3, "__builtin_ia32_pmulhrsw", IX86_BUILTIN_PMULHRSW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pshufbv16qi3, "__builtin_ia32_pshufb128", IX86_BUILTIN_PSHUFB128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pshufbv8qi3, "__builtin_ia32_pshufb", IX86_BUILTIN_PSHUFB, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv16qi3, "__builtin_ia32_psignb128", IX86_BUILTIN_PSIGNB128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv8qi3, "__builtin_ia32_psignb", IX86_BUILTIN_PSIGNB, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv8hi3, "__builtin_ia32_psignw128", IX86_BUILTIN_PSIGNW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv4hi3, "__builtin_ia32_psignw", IX86_BUILTIN_PSIGNW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv4si3, "__builtin_ia32_psignd128", IX86_BUILTIN_PSIGND128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_psignv2si3, "__builtin_ia32_psignd", IX86_BUILTIN_PSIGND, 0, 0 } }; static const struct builtin_description bdesc_1arg[] = @@ -14532,8 +14601,16 @@ static const struct builtin_description { MASK_SSE2, CODE_FOR_sse2_cvttps2dq, 0, IX86_BUILTIN_CVTTPS2DQ, 0, 0 }, /* SSE3 */ - { MASK_SSE3, CODE_FOR_sse3_movshdup, 0, IX86_BUILTIN_MOVSHDUP, 0, 0 }, - { MASK_SSE3, CODE_FOR_sse3_movsldup, 0, IX86_BUILTIN_MOVSLDUP, 0, 0 }, + { MASK_SSE3, CODE_FOR_sse3_movshdup, "__builtin_ia32_movshdup", IX86_BUILTIN_MOVSHDUP, 0, 0 }, + { MASK_SSE3, CODE_FOR_sse3_movsldup, "__builtin_ia32_movsldup", IX86_BUILTIN_MOVSLDUP, 0, 0 }, + + /* MNI */ + { MASK_MNI, CODE_FOR_mni_pabsv16qi2, "__builtin_ia32_pabsb128", IX86_BUILTIN_PABSB128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pabsv8qi2, "__builtin_ia32_pabsb", IX86_BUILTIN_PABSB, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pabsv8hi2, "__builtin_ia32_pabsw128", IX86_BUILTIN_PABSW128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pabsv4hi2, "__builtin_ia32_pabsw", IX86_BUILTIN_PABSW, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pabsv4si2, "__builtin_ia32_pabsd128", IX86_BUILTIN_PABSD128, 0, 0 }, + { MASK_MNI, CODE_FOR_mni_pabsv2si2, "__builtin_ia32_pabsd", IX86_BUILTIN_PABSD, 0, 0 } }; static void @@ -14678,6 +14755,16 @@ ix86_init_mmx_sse_builtins (void) /* Normal vector unops. */ tree v4sf_ftype_v4sf = build_function_type_list (V4SF_type_node, V4SF_type_node, NULL_TREE); + tree v16qi_ftype_v16qi + = build_function_type_list (V16QI_type_node, V16QI_type_node, NULL_TREE); + tree v8hi_ftype_v8hi + = build_function_type_list (V8HI_type_node, V8HI_type_node, NULL_TREE); + tree v4si_ftype_v4si + = build_function_type_list (V4SI_type_node, V4SI_type_node, NULL_TREE); + tree v8qi_ftype_v8qi + = build_function_type_list (V8QI_type_node, V8QI_type_node, NULL_TREE); + tree v4hi_ftype_v4hi + = build_function_type_list (V4HI_type_node, V4HI_type_node, NULL_TREE); /* Normal vector binops. */ tree v4sf_ftype_v4sf_v4sf @@ -14697,6 +14784,12 @@ ix86_init_mmx_sse_builtins (void) long_long_unsigned_type_node, long_long_unsigned_type_node, NULL_TREE); + tree di_ftype_di_di_int + = build_function_type_list (long_long_unsigned_type_node, + long_long_unsigned_type_node, + long_long_unsigned_type_node, + integer_type_node, NULL_TREE); + tree v2si_ftype_v2sf = build_function_type_list (V2SI_type_node, V2SF_type_node, NULL_TREE); tree v2sf_ftype_v2si @@ -14801,6 +14894,9 @@ ix86_init_mmx_sse_builtins (void) tree v2di_ftype_v2di_int = build_function_type_list (V2DI_type_node, V2DI_type_node, integer_type_node, NULL_TREE); + tree v2di_ftype_v2di_v2di_int + = build_function_type_list (V2DI_type_node, V2DI_type_node, + V2DI_type_node, integer_type_node, NULL_TREE); tree v4si_ftype_v4si_int = build_function_type_list (V4SI_type_node, V4SI_type_node, integer_type_node, NULL_TREE); @@ -14926,6 +15022,50 @@ ix86_init_mmx_sse_builtins (void) def_builtin (d->mask, d->name, type, d->code); } + /* Add all builtins that are more or less simple operations on 1 operand. */ + for (i = 0, d = bdesc_1arg; i < ARRAY_SIZE (bdesc_1arg); i++, d++) + { + enum machine_mode mode; + tree type; + + if (d->name == 0) + continue; + mode = insn_data[d->icode].operand[1].mode; + + switch (mode) + { + case V16QImode: + type = v16qi_ftype_v16qi; + break; + case V8HImode: + type = v8hi_ftype_v8hi; + break; + case V4SImode: + type = v4si_ftype_v4si; + break; + case V2DFmode: + type = v2df_ftype_v2df; + break; + case V4SFmode: + type = v4sf_ftype_v4sf; + break; + case V8QImode: + type = v8qi_ftype_v8qi; + break; + case V4HImode: + type = v4hi_ftype_v4hi; + break; + case V2SImode: + type = v2si_ftype_v2si; + break; + + default: + abort (); + } + + def_builtin (d->mask, d->name, type, d->code); + } + /* Add the remaining MMX insns with somewhat more complicated types. */ def_builtin (MASK_MMX, "__builtin_ia32_emms", void_ftype_void, IX86_BUILTIN_EMMS); def_builtin (MASK_MMX, "__builtin_ia32_psllw", v4hi_ftype_v4hi_di, IX86_BUILTIN_PSLLW); @@ -15128,15 +15268,15 @@ ix86_init_mmx_sse_builtins (void) void_ftype_unsigned_unsigned, IX86_BUILTIN_MWAIT); } - def_builtin (MASK_SSE3, "__builtin_ia32_movshdup", - v4sf_ftype_v4sf, - IX86_BUILTIN_MOVSHDUP); - def_builtin (MASK_SSE3, "__builtin_ia32_movsldup", - v4sf_ftype_v4sf, - IX86_BUILTIN_MOVSLDUP); def_builtin (MASK_SSE3, "__builtin_ia32_lddqu", v16qi_ftype_pcchar, IX86_BUILTIN_LDDQU); + /* Merom New Instructions. */ + def_builtin (MASK_MNI, "__builtin_ia32_palignr128", + v2di_ftype_v2di_v2di_int, IX86_BUILTIN_PALIGNR128); + def_builtin (MASK_MNI, "__builtin_ia32_palignr", di_ftype_di_di_int, + IX86_BUILTIN_PALIGNR); + /* Access to the vec_init patterns. */ ftype = build_function_type_list (V2SI_type_node, integer_type_node, integer_type_node, NULL_TREE); @@ -15627,7 +15767,7 @@ ix86_expand_builtin (tree exp, rtx targe tree arglist = TREE_OPERAND (exp, 1); tree arg0, arg1, arg2; rtx op0, op1, op2, pat; - enum machine_mode tmode, mode0, mode1, mode2; + enum machine_mode tmode, mode0, mode1, mode2, mode3; unsigned int fcode = DECL_FUNCTION_CODE (fndecl); switch (fcode) @@ -16004,6 +16144,52 @@ ix86_expand_builtin (tree exp, rtx targe return ix86_expand_unop_builtin (CODE_FOR_sse3_lddqu, arglist, target, 1); + case IX86_BUILTIN_PALIGNR: + case IX86_BUILTIN_PALIGNR128: + if (fcode == IX86_BUILTIN_PALIGNR) + { + icode = CODE_FOR_mni_palignrdi; + mode = DImode; + } + else + { + icode = CODE_FOR_mni_palignrti; + mode = V2DImode; + } + arg0 = TREE_VALUE (arglist); + arg1 = TREE_VALUE (TREE_CHAIN (arglist)); + arg2 = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist))); + op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0); + op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0); + op2 = expand_expr (arg2, NULL_RTX, VOIDmode, 0); + tmode = insn_data[icode].operand[0].mode; + mode1 = insn_data[icode].operand[1].mode; + mode2 = insn_data[icode].operand[2].mode; + mode3 = insn_data[icode].operand[3].mode; + + if (! (*insn_data[icode].operand[1].predicate) (op0, mode1)) + { + op0 = copy_to_reg (op0); + op0 = simplify_gen_subreg (mode1, op0, GET_MODE (op0), 0); + } + if (! (*insn_data[icode].operand[2].predicate) (op1, mode2)) + { + op1 = copy_to_reg (op1); + op1 = simplify_gen_subreg (mode2, op1, GET_MODE (op1), 0); + } + if (! (*insn_data[icode].operand[3].predicate) (op2, mode3)) + { + error ("shift must be an immediate"); + return const0_rtx; + } + target = gen_reg_rtx (mode); + pat = GEN_FCN (icode) (simplify_gen_subreg (tmode, target, mode, 0), + op0, op1, op2); + if (! pat) + return 0; + emit_insn (pat); + return target; + case IX86_BUILTIN_VEC_INIT_V2SI: case IX86_BUILTIN_VEC_INIT_V4HI: case IX86_BUILTIN_VEC_INIT_V8QI: --- gcc/config/i386/i386.h.mni 2006-02-04 06:59:11.000000000 -0800 +++ gcc/config/i386/i386.h 2006-02-24 13:39:19.000000000 -0800 @@ -385,6 +385,8 @@ extern int x86_prefetch_sse; builtin_define ("__SSE2__"); \ if (TARGET_SSE3) \ builtin_define ("__SSE3__"); \ + if (TARGET_MNI) \ + builtin_define ("__MNI__"); \ if (TARGET_SSE_MATH && TARGET_SSE) \ builtin_define ("__SSE_MATH__"); \ if (TARGET_SSE_MATH && TARGET_SSE2) \ --- gcc/config/i386/i386.md.mni 2006-02-24 13:39:19.000000000 -0800 +++ gcc/config/i386/i386.md 2006-02-24 13:39:19.000000000 -0800 @@ -102,7 +102,7 @@ (UNSPEC_MFENCE 44) (UNSPEC_LFENCE 45) (UNSPEC_PSADBW 46) - (UNSPEC_LDQQU 47) + (UNSPEC_LDDQU 47) ; Generic math support (UNSPEC_COPYSIGN 50) @@ -146,6 +146,11 @@ (UNSPEC_SP_TEST 101) (UNSPEC_SP_TLS_SET 102) (UNSPEC_SP_TLS_TEST 103) + + ; MNI + (UNSPEC_PSHUFB 120) + (UNSPEC_PSIGN 121) + (UNSPEC_PALIGNR 122) ]) (define_constants @@ -20262,6 +20267,6 @@ "mov{q}\t{%1, %3|%3, %1}\;xor{q}\t{%%fs:%P2, %3|%3, QWORD PTR %%fs:%P2}" [(set_attr "type" "multi")]) -(include "sse.md") (include "mmx.md") +(include "sse.md") (include "sync.md") --- gcc/config/i386/i386.opt.mni 2006-02-24 13:39:19.000000000 -0800 +++ gcc/config/i386/i386.opt 2006-02-24 13:39:19.000000000 -0800 @@ -197,6 +197,10 @@ msse3 Target Report Mask(SSE3) Support MMX, SSE, SSE2 and SSE3 built-in functions and code generation +mmni +Target Report Mask(MNI) +Support MMX, SSE, SSE2, SSE3 and MNI built-in functions and code generation + msseregparm Target RejectNegative Mask(SSEREGPARM) Use SSE register passing conventions for SF and DF mode --- gcc/config/i386/sse.md.mni 2006-02-24 13:39:19.000000000 -0800 +++ gcc/config/i386/sse.md 2006-02-24 13:39:19.000000000 -0800 @@ -278,7 +278,7 @@ (define_insn "sse3_lddqu" [(set (match_operand:V16QI 0 "register_operand" "=x") (unspec:V16QI [(match_operand:V16QI 1 "memory_operand" "m")] - UNSPEC_LDQQU))] + UNSPEC_LDDQU))] "TARGET_SSE3" "lddqu\t{%1, %0|%0, %1}" [(set_attr "type" "ssecvt") @@ -3923,3 +3923,578 @@ ;; "monitor\t%0, %1, %2" "monitor" [(set_attr "length" "3")]) + +;; MNI +(define_insn "mni_phaddwv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (vec_concat:V8HI + (vec_concat:V4HI + (vec_concat:V2HI + (plus:HI + (vec_select:HI + (match_operand:V8HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 5)]))) + (plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 7)]))))) + (vec_concat:V4HI + (vec_concat:V2HI + (plus:HI + (vec_select:HI + (match_operand:V8HI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 5)]))) + (plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))] + "TARGET_MNI" + "phaddw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phaddwv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (vec_concat:V4HI + (vec_concat:V2HI + (plus:HI + (vec_select:HI + (match_operand:V4HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (plus:HI + (vec_select:HI + (match_operand:V4HI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phaddw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_phadddv4si3" + [(set (match_operand:V4SI 0 "register_operand" "=x") + (vec_concat:V4SI + (vec_concat:V2SI + (plus:SI + (vec_select:SI + (match_operand:V4SI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 1)]))) + (plus:SI + (vec_select:SI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2SI + (plus:SI + (vec_select:SI + (match_operand:V4SI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 1)]))) + (plus:SI + (vec_select:SI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phaddd\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phadddv2si3" + [(set (match_operand:V2SI 0 "register_operand" "=y") + (vec_concat:V2SI + (plus:SI + (vec_select:SI + (match_operand:V2SI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 1)]))) + (plus:SI + (vec_select:SI + (match_operand:V2SI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 1)])))))] + "TARGET_MNI" + "phaddd\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_phaddswv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (vec_concat:V8HI + (vec_concat:V4HI + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI + (match_operand:V8HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (ss_plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 5)]))) + (ss_plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 7)]))))) + (vec_concat:V4HI + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI + (match_operand:V8HI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (ss_plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 5)]))) + (ss_plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))] + "TARGET_MNI" + "phaddsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phaddswv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (vec_concat:V4HI + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI + (match_operand:V4HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (ss_plus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_plus:HI + (vec_select:HI + (match_operand:V4HI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (ss_plus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phaddsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_phsubwv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (vec_concat:V8HI + (vec_concat:V4HI + (vec_concat:V2HI + (minus:HI + (vec_select:HI + (match_operand:V8HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 5)]))) + (minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 7)]))))) + (vec_concat:V4HI + (vec_concat:V2HI + (minus:HI + (vec_select:HI + (match_operand:V8HI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 5)]))) + (minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))] + "TARGET_MNI" + "phsubw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phsubwv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (vec_concat:V4HI + (vec_concat:V2HI + (minus:HI + (vec_select:HI + (match_operand:V4HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (minus:HI + (vec_select:HI + (match_operand:V4HI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phsubw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_phsubdv4si3" + [(set (match_operand:V4SI 0 "register_operand" "=x") + (vec_concat:V4SI + (vec_concat:V2SI + (minus:SI + (vec_select:SI + (match_operand:V4SI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 1)]))) + (minus:SI + (vec_select:SI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2SI + (minus:SI + (vec_select:SI + (match_operand:V4SI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 1)]))) + (minus:SI + (vec_select:SI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phsubd\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phsubdv2si3" + [(set (match_operand:V2SI 0 "register_operand" "=y") + (vec_concat:V2SI + (minus:SI + (vec_select:SI + (match_operand:V2SI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 1) (parallel [(const_int 1)]))) + (minus:SI + (vec_select:SI + (match_operand:V2SI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:SI (match_dup 2) (parallel [(const_int 1)])))))] + "TARGET_MNI" + "phsubd\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_phsubswv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (vec_concat:V8HI + (vec_concat:V4HI + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI + (match_operand:V8HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (ss_minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 5)]))) + (ss_minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 7)]))))) + (vec_concat:V4HI + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI + (match_operand:V8HI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (ss_minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 4)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 5)]))) + (ss_minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 6)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 7)])))))))] + "TARGET_MNI" + "phsubsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_phsubswv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (vec_concat:V4HI + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI + (match_operand:V4HI 1 "register_operand" "0") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 1)]))) + (ss_minus:HI + (vec_select:HI (match_dup 1) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 1) (parallel [(const_int 3)])))) + (vec_concat:V2HI + (ss_minus:HI + (vec_select:HI + (match_operand:V4HI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 1)]))) + (ss_minus:HI + (vec_select:HI (match_dup 2) (parallel [(const_int 2)])) + (vec_select:HI (match_dup 2) (parallel [(const_int 3)]))))))] + "TARGET_MNI" + "phsubsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_pmaddubswv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (ss_plus:V8HI + (mult:V8HI + (zero_extend:V8HI + (vec_select:V4QI + (match_operand:V16QI 1 "nonimmediate_operand" "%0") + (parallel [(const_int 0) + (const_int 2) + (const_int 4) + (const_int 6) + (const_int 8) + (const_int 10) + (const_int 12) + (const_int 14)]))) + (sign_extend:V8HI + (vec_select:V8QI + (match_operand:V16QI 2 "nonimmediate_operand" "xm") + (parallel [(const_int 0) + (const_int 2) + (const_int 4) + (const_int 6) + (const_int 8) + (const_int 10) + (const_int 12) + (const_int 14)])))) + (mult:V8HI + (zero_extend:V8HI + (vec_select:V16QI (match_dup 1) + (parallel [(const_int 1) + (const_int 3) + (const_int 5) + (const_int 7) + (const_int 9) + (const_int 11) + (const_int 13) + (const_int 15)]))) + (sign_extend:V8HI + (vec_select:V16QI (match_dup 2) + (parallel [(const_int 1) + (const_int 3) + (const_int 5) + (const_int 7) + (const_int 9) + (const_int 11) + (const_int 13) + (const_int 15)]))))))] + "TARGET_MNI" + "pmaddubsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "TI")]) + +(define_insn "mni_pmaddubswv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (ss_plus:V4HI + (mult:V4HI + (zero_extend:V4HI + (vec_select:V4QI + (match_operand:V8QI 1 "nonimmediate_operand" "%0") + (parallel [(const_int 0) + (const_int 2) + (const_int 4) + (const_int 6)]))) + (sign_extend:V4HI + (vec_select:V4QI + (match_operand:V8QI 2 "nonimmediate_operand" "ym") + (parallel [(const_int 0) + (const_int 2) + (const_int 4) + (const_int 6)])))) + (mult:V4HI + (zero_extend:V4HI + (vec_select:V8QI (match_dup 1) + (parallel [(const_int 1) + (const_int 3) + (const_int 5) + (const_int 7)]))) + (sign_extend:V4HI + (vec_select:V8QI (match_dup 2) + (parallel [(const_int 1) + (const_int 3) + (const_int 5) + (const_int 7)]))))))] + "TARGET_MNI" + "pmaddubsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseiadd") + (set_attr "mode" "DI")]) + +(define_insn "mni_pmulhrswv8hi3" + [(set (match_operand:V8HI 0 "register_operand" "=x") + (truncate:V8HI + (lshiftrt:V8SI + (plus:V8SI + (lshiftrt:V8SI + (mult:V8SI + (sign_extend:V8SI + (match_operand:V8HI 1 "nonimmediate_operand" "%0")) + (sign_extend:V8SI + (match_operand:V8HI 2 "nonimmediate_operand" "xm"))) + (const_int 14)) + (const_vector:V8HI [(const_int 1) (const_int 1) + (const_int 1) (const_int 1) + (const_int 1) (const_int 1) + (const_int 1) (const_int 1)])) + (const_int 1))))] + "TARGET_MNI && ix86_binary_operator_ok (MULT, V8HImode, operands)" + "pmulhrsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseimul") + (set_attr "mode" "TI")]) + +(define_insn "mni_pmulhrswv4hi3" + [(set (match_operand:V4HI 0 "register_operand" "=y") + (truncate:V4HI + (lshiftrt:V4SI + (plus:V4SI + (lshiftrt:V4SI + (mult:V4SI + (sign_extend:V4SI + (match_operand:V4HI 1 "nonimmediate_operand" "%0")) + (sign_extend:V4SI + (match_operand:V4HI 2 "nonimmediate_operand" "ym"))) + (const_int 14)) + (const_vector:V4HI [(const_int 1) (const_int 1) + (const_int 1) (const_int 1)])) + (const_int 1))))] + "TARGET_MNI && ix86_binary_operator_ok (MULT, V4HImode, operands)" + "pmulhrsw\t{%2, %0|%0, %2}" + [(set_attr "type" "sseimul") + (set_attr "mode" "DI")]) + +(define_insn "mni_pshufbv16qi3" + [(set (match_operand:V16QI 0 "register_operand" "=x") + (unspec:V16QI [(match_operand:V16QI 1 "register_operand" "0") + (match_operand:V16QI 2 "nonimmediate_operand" "xm")] + UNSPEC_PSHUFB))] + "TARGET_MNI" + "pshufb\t{%2, %0|%0, %2}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "TI")]) + +(define_insn "mni_pshufbv8qi3" + [(set (match_operand:V8QI 0 "register_operand" "=y") + (unspec:V8QI [(match_operand:V8QI 1 "register_operand" "0") + (match_operand:V8QI 2 "nonimmediate_operand" "ym")] + UNSPEC_PSHUFB))] + "TARGET_MNI" + "pshufb\t{%2, %0|%0, %2}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "DI")]) + +(define_insn "mni_psign3" + [(set (match_operand:SSEMODE124 0 "register_operand" "=x") + (unspec:SSEMODE124 [(match_operand:SSEMODE124 1 "register_operand" "0") + (match_operand:SSEMODE124 2 "nonimmediate_operand" "xm")] + UNSPEC_PSIGN))] + "TARGET_MNI" + "psign\t{%2, %0|%0, %2}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "TI")]) + +(define_insn "mni_psign3" + [(set (match_operand:MMXMODEI 0 "register_operand" "=y") + (unspec:MMXMODEI [(match_operand:MMXMODEI 1 "register_operand" "0") + (match_operand:MMXMODEI 2 "nonimmediate_operand" "ym")] + UNSPEC_PSIGN))] + "TARGET_MNI" + "psign\t{%2, %0|%0, %2}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "DI")]) + +(define_insn "mni_palignrti" + [(set (match_operand:TI 0 "register_operand" "=x") + (unspec:TI [(match_operand:TI 1 "register_operand" "0") + (match_operand:TI 2 "nonimmediate_operand" "xm") + (match_operand:SI 3 "const_0_to_255_mul_8_operand" "n")] + UNSPEC_PALIGNR))] + "TARGET_MNI" +{ + operands[3] = GEN_INT (INTVAL (operands[3]) / 8); + return "palignr\t{%3, %2, %0|%0, %2, %3}"; +} + [(set_attr "type" "sseishft") + (set_attr "mode" "TI")]) + +(define_insn "mni_palignrdi" + [(set (match_operand:DI 0 "register_operand" "=y") + (unspec:DI [(match_operand:DI 1 "register_operand" "0") + (match_operand:DI 2 "nonimmediate_operand" "ym") + (match_operand:SI 3 "const_0_to_255_mul_8_operand" "n")] + UNSPEC_PALIGNR))] + "TARGET_MNI" +{ + operands[3] = GEN_INT (INTVAL (operands[3]) / 8); + return "palignr\t{%3, %2, %0|%0, %2, %3}"; +} + [(set_attr "type" "sseishft") + (set_attr "mode" "DI")]) + +(define_insn "mni_pabs2" + [(set (match_operand:SSEMODE124 0 "register_operand" "=x") + (abs:SSEMODE124 (match_operand:SSEMODE124 1 "nonimmediate_operand" "xm")))] + "TARGET_MNI" + "pabs\t{%1, %0|%0, %1}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "TI")]) + +(define_insn "mni_pabs2" + [(set (match_operand:MMXMODEI 0 "register_operand" "=y") + (abs:MMXMODEI (match_operand:MMXMODEI 1 "nonimmediate_operand" "ym")))] + "TARGET_MNI" + "pabs\t{%1, %0|%0, %1}"; + [(set_attr "type" "sselog1") + (set_attr "mode" "DI")]) --- gcc/config/i386/tmmintrin.h.mni 2006-02-24 13:39:19.000000000 -0800 +++ gcc/config/i386/tmmintrin.h 2006-02-24 13:39:19.000000000 -0800 @@ -0,0 +1,224 @@ +/* Copyright (C) 2006 Free Software Foundation, Inc. + + This file is part of GCC. + + GCC 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, or (at your option) + any later version. + + GCC 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 GCC; see the file COPYING. If not, write to + the Free Software Foundation, 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +/* As a special exception, if you include this header file into source + files compiled by GCC, this header file does not by itself cause + the resulting executable to be covered by the GNU General Public + License. This exception does not however invalidate any other + reasons why the executable file might be covered by the GNU General + Public License. */ + +/* Implemented from the specification included in the Intel C++ Compiler + User Guide and Reference, version 9.1. */ + +#ifndef _TMMINTRIN_H_INCLUDED +#define _TMMINTRIN_H_INCLUDED + +#ifdef __MNI__ +#include + +static __inline __m128i +_mm_hadd_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phaddw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m128i +_mm_hadd_epi32 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phaddd128 ((__v4si)__X, (__v4si)__Y); +} + +static __inline __m128i +_mm_hadds_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phaddsw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m64 +_mm_hadd_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phaddw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m64 +_mm_hadd_pi32 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phaddd ((__v2si)__X, (__v2si)__Y); +} + +static __inline __m64 +_mm_hadds_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phaddsw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m128i +_mm_hsub_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phsubw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m128i +_mm_hsub_epi32 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phsubd128 ((__v4si)__X, (__v4si)__Y); +} + +static __inline __m128i +_mm_hsubs_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_phsubsw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m64 +_mm_hsub_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phsubw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m64 +_mm_hsub_pi32 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phsubd ((__v2si)__X, (__v2si)__Y); +} + +static __inline __m64 +_mm_hsubs_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_phsubsw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m128i +_mm_maddubs_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_pmaddubsw128 ((__v16qi)__X, (__v16qi)__Y); +} + +static __inline __m64 +_mm_maddubs_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_pmaddubsw ((__v8qi)__X, (__v8qi)__Y); +} + +static __inline __m128i +_mm_mulhrs_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_pmulhrsw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m64 +_mm_mulhrs_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_pmulhrsw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m128i +_mm_shuffle_epi8 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_pshufb128 ((__v16qi)__X, (__v16qi)__Y); +} + +static __inline __m64 +_mm_shuffle_pi8 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_pshufb ((__v8qi)__X, (__v8qi)__Y); +} + +static __inline __m128i +_mm_sign_epi8 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_psignb128 ((__v16qi)__X, (__v16qi)__Y); +} + +static __inline __m128i +_mm_sign_epi16 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_psignw128 ((__v8hi)__X, (__v8hi)__Y); +} + +static __inline __m128i +_mm_sign_epi32 (__m128i __X, __m128i __Y) +{ + return (__m128i) __builtin_ia32_psignd128 ((__v4si)__X, (__v4si)__Y); +} + +static __inline __m64 +_mm_sign_pi8 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_psignb ((__v8qi)__X, (__v8qi)__Y); +} + +static __inline __m64 +_mm_sign_pi16 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_psignw ((__v4hi)__X, (__v4hi)__Y); +} + +static __inline __m64 +_mm_sign_pi32 (__m64 __X, __m64 __Y) +{ + return (__m64) __builtin_ia32_psignd ((__v2si)__X, (__v2si)__Y); +} + +#define _mm_alignr_epi8(__X, __Y, __N) \ + ((__m128i)__builtin_ia32_palignr128 ((__v2di) __X, (__v2di) __Y, (__N) * 8)) + +#define _mm_alignr_pi8(__X, __Y, __N) \ + ((__m64)__builtin_ia32_palignr ((long long) (__X), (long long) (__Y), (__N) * 8)) + +static __inline __m128i +_mm_abs_epi8 (__m128i __X) +{ + return (__m128i) __builtin_ia32_pabsb128 ((__v16qi)__X); +} + +static __inline __m128i +_mm_abs_epi16 (__m128i __X) +{ + return (__m128i) __builtin_ia32_pabsw128 ((__v8hi)__X); +} + +static __inline __m128i +_mm_abs_epi32 (__m128i __X) +{ + return (__m128i) __builtin_ia32_pabsd128 ((__v4si)__X); +} + +static __inline __m64 +_mm_abs_pi8 (__m64 __X) +{ + return (__m64) __builtin_ia32_pabsb ((__v8qi)__X); +} + +static __inline __m64 +_mm_abs_pi16 (__m64 __X) +{ + return (__m64) __builtin_ia32_pabsw ((__v4hi)__X); +} + +static __inline __m64 +_mm_abs_pi32 (__m64 __X) +{ + return (__m64) __builtin_ia32_pabsd ((__v2si)__X); +} + +#endif /* __MNI__ */ + +#endif /* _TMMINTRIN_H_INCLUDED */ --- gcc/doc/extend.texi.mni 2006-02-21 22:42:04.000000000 -0800 +++ gcc/doc/extend.texi 2006-02-24 13:39:19.000000000 -0800 @@ -6701,6 +6701,52 @@ The following built-in functions are ava Generates the @code{movddup} machine instruction as a load from memory. @end table +The following built-in functions are available when @option{-mmni} is used. +All of them generate the machine instruction that is part of the name +with MMX registers. + + at smallexample +v2si __builtin_ia32_phaddd (v2si, v2si) +v4hi __builtin_ia32_phaddw (v4hi, v4hi) +v4hi __builtin_ia32_phaddsw (v4hi, v4hi) +v2si __builtin_ia32_phsubd (v2si, v2si) +v4hi __builtin_ia32_phsubw (v4hi, v4hi) +v4hi __builtin_ia32_phsubsw (v4hi, v4hi) +v8qi __builtin_ia32_pmaddubsw (v8qi, v8qi) +v4hi __builtin_ia32_pmulhrsw (v4hi, v4hi) +v8qi __builtin_ia32_pshufb (v8qi, v8qi) +v8qi __builtin_ia32_psignb (v8qi, v8qi) +v2si __builtin_ia32_psignd (v2si, v2si) +v4hi __builtin_ia32_psignw (v4hi, v4hi) +long long __builtin_ia32_palignr (long long, long long, int) +v8qi __builtin_ia32_pabsb (v8qi) +v2si __builtin_ia32_pabsd (v2si) +v4hi __builtin_ia32_pabsw (v4hi) + at end smallexample + +The following built-in functions are available when @option{-mmni} is used. +All of them generate the machine instruction that is part of the name +with SSE registers. + + at smallexample +v4si __builtin_ia32_phaddd128 (v4si, v4si) +v8hi __builtin_ia32_phaddw128 (v8hi, v8hi) +v8hi __builtin_ia32_phaddsw128 (v8hi, v8hi) +v4si __builtin_ia32_phsubd128 (v4si, v4si) +v8hi __builtin_ia32_phsubw128 (v8hi, v8hi) +v8hi __builtin_ia32_phsubsw128 (v8hi, v8hi) +v16qi __builtin_ia32_pmaddubsw128 (v16qi, v16qi) +v8hi __builtin_ia32_pmulhrsw128 (v8hi, v8hi) +v16qi __builtin_ia32_pshufb128 (v16qi, v16qi) +v16qi __builtin_ia32_psignb128 (v16qi, v16qi) +v4si __builtin_ia32_psignd128 (v4si, v4si) +v8hi __builtin_ia32_psignw128 (v8hi, v8hi) +v2di __builtin_ia32_palignr (v2di, v2di, int) +v16qi __builtin_ia32_pabsb128 (v16qi) +v4si __builtin_ia32_pabsd128 (v4si) +v8hi __builtin_ia32_pabsw128 (v8hi) + at end smallexample + The following built-in functions are available when @option{-m3dnow} is used. All of them generate the machine instruction that is part of the name. --- gcc/doc/invoke.texi.mni 2006-02-14 13:17:58.000000000 -0800 +++ gcc/doc/invoke.texi 2006-02-24 13:42:50.000000000 -0800 @@ -522,7 +522,7 @@ Objective-C and Objective-C++ Dialects}. -mno-fp-ret-in-387 -msoft-float -msvr3-shlib @gol -mno-wide-multiply -mrtd -malign-double @gol -mpreferred-stack-boundary=@var{num} @gol --mmmx -msse -msse2 -msse3 -m3dnow @gol +-mmmx -msse -msse2 -msse3 -mmni -m3dnow @gol -mthreads -mno-align-stringops -minline-all-stringops @gol -mpush-args -maccumulate-outgoing-args -m128bit-long-double @gol -m96bit-long-double -mregparm=@var{num} -msseregparm @gol @@ -9343,6 +9343,8 @@ preferred alignment to @option{-mpreferr @itemx -mno-sse2 @item -msse3 @itemx -mno-sse3 + at item -mmni + at itemx -mno-mni @item -m3dnow @itemx -mno-3dnow @opindex mmmx gcc41-ppc32-retaddr.patch: --- NEW FILE gcc41-ppc32-retaddr.patch --- 2005-11-28 Jakub Jelinek * config/rs6000/rs6000.c (rs6000_return_addr): If COUNT == 0, read word RETURN_ADDRESS_OFFSET bytes above arg_pointer_rtx instead of doing an extran indirection from frame_pointer_rtx. * gcc.dg/20051128-1.c: New test. --- gcc/config/rs6000/rs6000.c.jj 2005-11-26 14:38:01.000000000 +0100 +++ gcc/config/rs6000/rs6000.c 2005-11-28 20:32:18.000000000 +0100 @@ -13166,17 +13166,22 @@ rs6000_return_addr (int count, rtx frame don't try to be too clever here. */ if (count != 0 || (DEFAULT_ABI != ABI_AIX && flag_pic)) { + rtx x; cfun->machine->ra_needs_full_frame = 1; - return - gen_rtx_MEM - (Pmode, - memory_address - (Pmode, - plus_constant (copy_to_reg - (gen_rtx_MEM (Pmode, - memory_address (Pmode, frame))), - RETURN_ADDRESS_OFFSET))); + if (count == 0) + { + gcc_assert (frame == frame_pointer_rtx); + x = arg_pointer_rtx; + } + else + { + x = memory_address (Pmode, frame); + x = copy_to_reg (gen_rtx_MEM (Pmode, x)); + } + + x = plus_constant (x, RETURN_ADDRESS_OFFSET); + return gen_rtx_MEM (Pmode, memory_address (Pmode, x)); } cfun->machine->ra_need_lr = 1; --- gcc/testsuite/gcc.dg/20051128-1.c.jj 2005-10-10 11:21:41.096999000 +0200 +++ gcc/testsuite/gcc.dg/20051128-1.c 2005-11-28 12:30:57.000000000 +0100 @@ -0,0 +1,41 @@ +/* { dg-do run } */ +/* { dg-options "-O2 -fpic" } */ + +extern void exit (int); +extern void abort (void); + +int b; + +struct A +{ + void *pad[147]; + void *ra, *h; + long o; +}; + +void +__attribute__((noinline)) +foo (struct A *a, void *x) +{ + __builtin_memset (a, 0, sizeof (a)); + if (!b) + exit (0); +} + +void +__attribute__((noinline)) +bar (void) +{ + struct A a; + + __builtin_unwind_init (); + foo (&a, __builtin_return_address (0)); +} + +int +main (void) +{ + bar (); + abort (); + return 0; +} gcc41-ppc64-m32-m64-multilib-only.patch: --- NEW FILE gcc41-ppc64-m32-m64-multilib-only.patch --- --- gcc/config/rs6000/t-linux64 2003-06-03 05:11:45.000000000 -0400 +++ gcc/config/rs6000/t-linux64 2003-06-11 17:07:16.000000000 -0400 @@ -4,13 +4,13 @@ LIB2FUNCS_EXTRA = tramp.S $(srcdir)/conf # Modify the shared lib version file SHLIB_MKMAP_OPTS = -v dotsyms=1 -MULTILIB_OPTIONS = m64/m32 msoft-float -MULTILIB_DIRNAMES = 64 32 nof +MULTILIB_OPTIONS = m64/m32 +MULTILIB_DIRNAMES = 64 32 MULTILIB_EXTRA_OPTS = fPIC mstrict-align -MULTILIB_EXCEPTIONS = m64/msoft-float -MULTILIB_EXCLUSIONS = m64/!m32/msoft-float -MULTILIB_OSDIRNAMES = ../lib64 ../lib nof -MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) +MULTILIB_EXCEPTIONS = +MULTILIB_EXCLUSIONS = +MULTILIB_OSDIRNAMES = ../lib64 ../lib +MULTILIB_MATCHES = TARGET_LIBGCC2_CFLAGS = -mno-minimal-toc -fPIC gcc41-rh184446.patch: --- NEW FILE gcc41-rh184446.patch --- for gcc/ChangeLog from Richard Henderson , Alexandre Oliva * config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Use secure-plt-compatible load sequence to compute the GOT address for -fPIC -msecure-plt. Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c.orig 2006-03-09 20:02:13.000000000 -0300 +++ gcc/config/rs6000/rs6000.c 2006-03-09 22:00:43.000000000 -0300 @@ -3081,7 +3081,7 @@ rs6000_legitimize_tls_address (rtx addr, { rtx gsym = rs6000_got_sym (); got = gen_reg_rtx (Pmode); - if (flag_pic == 0) + if (flag_pic == 0 || (flag_pic && TARGET_SECURE_PLT)) rs6000_emit_move (got, gsym, Pmode); else { gcc41-x86_64-sse3.patch: --- NEW FILE gcc41-x86_64-sse3.patch --- 2005-11-17 H.J. Lu PR target/24879 * config/i386/i386.c (ix86_init_mmx_sse_builtins): Add void_ftype_di_di and void_ftype_pcvoid_di_di. Use void_ftype_di_di on __builtin_ia32_mwait and void_ftype_pcvoid_di_di on __builtin_ia32_monitor for 64bit. (ix86_expand_builtin): Support 64bit monitor and mwait. * config/i386/pmmintrin.h (_mm_monitor): Remove macro. Use inline function. (_mm_mwait): Likewise. * config/i386/sse.md (sse3_mwait): Make it 32bit only. (sse3_mwait64): New. 64bit mwait. (sse3_monitor): Make it 32bit only. (sse3_monitor64): New. 64bit monitor. gcc/testsuite/ 2005-11-17 H.J. Lu PR target/24879 * gcc.target/i386/monitor.c: New file. --- gcc/config/i386/i386.c.sse3 2005-11-15 17:33:02.000000000 -0800 +++ gcc/config/i386/i386.c 2005-11-17 09:44:47.000000000 -0800 @@ -14347,10 +14347,20 @@ ix86_init_mmx_sse_builtins (void) tree void_ftype_unsigned_unsigned = build_function_type_list (void_type_node, unsigned_type_node, unsigned_type_node, NULL_TREE); + tree void_ftype_di_di + = build_function_type_list (void_type_node, + long_long_unsigned_type_node, + long_long_unsigned_type_node, + NULL_TREE); tree void_ftype_pcvoid_unsigned_unsigned = build_function_type_list (void_type_node, const_ptr_type_node, unsigned_type_node, unsigned_type_node, NULL_TREE); + tree void_ftype_pcvoid_di_di + = build_function_type_list (void_type_node, const_ptr_type_node, + long_long_unsigned_type_node, + long_long_unsigned_type_node, + NULL_TREE); tree unsigned_ftype_void = build_function_type (unsigned_type_node, void_list_node); tree v2si_ftype_v4sf @@ -14811,12 +14821,24 @@ ix86_init_mmx_sse_builtins (void) def_builtin (MASK_SSE2, "__builtin_ia32_pmaddwd128", v4si_ftype_v8hi_v8hi, IX86_BUILTIN_PMADDWD128); /* Prescott New Instructions. */ - def_builtin (MASK_SSE3, "__builtin_ia32_monitor", - void_ftype_pcvoid_unsigned_unsigned, - IX86_BUILTIN_MONITOR); - def_builtin (MASK_SSE3, "__builtin_ia32_mwait", - void_ftype_unsigned_unsigned, - IX86_BUILTIN_MWAIT); + if (TARGET_64BIT) + { + def_builtin (MASK_SSE3, "__builtin_ia32_monitor", + void_ftype_pcvoid_di_di, + IX86_BUILTIN_MONITOR); + def_builtin (MASK_SSE3, "__builtin_ia32_mwait", + void_ftype_di_di, + IX86_BUILTIN_MWAIT); + } + else + { + def_builtin (MASK_SSE3, "__builtin_ia32_monitor", + void_ftype_pcvoid_unsigned_unsigned, + IX86_BUILTIN_MONITOR); + def_builtin (MASK_SSE3, "__builtin_ia32_mwait", + void_ftype_unsigned_unsigned, + IX86_BUILTIN_MWAIT); + } def_builtin (MASK_SSE3, "__builtin_ia32_movshdup", v4sf_ftype_v4sf, IX86_BUILTIN_MOVSHDUP); @@ -15660,13 +15682,17 @@ ix86_expand_builtin (tree exp, rtx targe op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0); op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0); op2 = expand_expr (arg2, NULL_RTX, VOIDmode, 0); + mode = TARGET_64BIT ? DImode : SImode; if (!REG_P (op0)) - op0 = copy_to_mode_reg (SImode, op0); + op0 = copy_to_mode_reg (mode, op0); if (!REG_P (op1)) - op1 = copy_to_mode_reg (SImode, op1); + op1 = copy_to_mode_reg (mode, op1); if (!REG_P (op2)) - op2 = copy_to_mode_reg (SImode, op2); - emit_insn (gen_sse3_monitor (op0, op1, op2)); + op2 = copy_to_mode_reg (mode, op2); + if (TARGET_64BIT) + emit_insn (gen_sse3_monitor64 (op0, op1, op2)); + else + emit_insn (gen_sse3_monitor (op0, op1, op2)); return 0; case IX86_BUILTIN_MWAIT: @@ -15674,11 +15700,15 @@ ix86_expand_builtin (tree exp, rtx targe arg1 = TREE_VALUE (TREE_CHAIN (arglist)); op0 = expand_expr (arg0, NULL_RTX, VOIDmode, 0); op1 = expand_expr (arg1, NULL_RTX, VOIDmode, 0); + mode = TARGET_64BIT ? DImode : SImode; if (!REG_P (op0)) - op0 = copy_to_mode_reg (SImode, op0); + op0 = copy_to_mode_reg (mode, op0); if (!REG_P (op1)) - op1 = copy_to_mode_reg (SImode, op1); - emit_insn (gen_sse3_mwait (op0, op1)); + op1 = copy_to_mode_reg (mode, op1); + if (TARGET_64BIT) + emit_insn (gen_sse3_mwait64 (op0, op1)); + else + emit_insn (gen_sse3_mwait (op0, op1)); return 0; case IX86_BUILTIN_LDDQU: --- gcc/config/i386/pmmintrin.h.sse3 2005-11-04 14:13:48.000000000 -0800 +++ gcc/config/i386/pmmintrin.h 2005-11-15 22:44:02.000000000 -0800 @@ -110,7 +110,6 @@ _mm_lddqu_si128 (__m128i const *__P) return (__m128i) __builtin_ia32_lddqu ((char const *)__P); } -#if 0 static __inline void __attribute__((__always_inline__)) _mm_monitor (void const * __P, unsigned int __E, unsigned int __H) { @@ -122,10 +121,6 @@ _mm_mwait (unsigned int __E, unsigned in { __builtin_ia32_mwait (__E, __H); } -#else -#define _mm_monitor(P, E, H) __builtin_ia32_monitor ((P), (E), (H)) -#define _mm_mwait(E, H) __builtin_ia32_mwait ((E), (H)) -#endif #endif /* __SSE3__ */ --- gcc/config/i386/sse.md.sse3 2005-11-04 14:13:48.000000000 -0800 +++ gcc/config/i386/sse.md 2005-11-17 09:25:31.000000000 -0800 @@ -3890,15 +3890,36 @@ [(unspec_volatile [(match_operand:SI 0 "register_operand" "a") (match_operand:SI 1 "register_operand" "c")] UNSPECV_MWAIT)] - "TARGET_SSE3" + "TARGET_SSE3 && !TARGET_64BIT" "mwait\t%0, %1" [(set_attr "length" "3")]) +(define_insn "sse3_mwait64" + [(unspec_volatile [(match_operand:DI 0 "register_operand" "a") + (match_operand:DI 1 "register_operand" "c")] + UNSPECV_MWAIT)] + "TARGET_SSE3 && TARGET_64BIT" +;; Older assembler doesn't support "mwait %rax,%rcx". +;; "mwait\t%0, %1" + "mwait" + [(set_attr "length" "3")]) + (define_insn "sse3_monitor" [(unspec_volatile [(match_operand:SI 0 "register_operand" "a") (match_operand:SI 1 "register_operand" "c") (match_operand:SI 2 "register_operand" "d")] UNSPECV_MONITOR)] - "TARGET_SSE3" + "TARGET_SSE3 && !TARGET_64BIT" "monitor\t%0, %1, %2" [(set_attr "length" "3")]) + +(define_insn "sse3_monitor64" + [(unspec_volatile [(match_operand:DI 0 "register_operand" "a") + (match_operand:DI 1 "register_operand" "c") + (match_operand:DI 2 "register_operand" "d")] + UNSPECV_MONITOR)] + "TARGET_SSE3 && TARGET_64BIT" +;; Older assembler doesn't support "monitor %rax,%rcx,%rdx". +;; "monitor\t%0, %1, %2" + "monitor" + [(set_attr "length" "3")]) --- gcc/testsuite/gcc.target/i386/monitor.c.sse3 2005-11-15 22:59:54.000000000 -0800 +++ gcc/testsuite/gcc.target/i386/monitor.c 2005-11-15 23:25:23.000000000 -0800 @@ -0,0 +1,27 @@ +/* { dg-do compile { target i?86-*-* x86_64-*-* } } */ +/* { dg-options "-O2 -msse3" } */ + +/* Verify that they work in both 32bit and 64bit. */ + +#include + +void +foo (char *p, int x, int y, int z) +{ + _mm_monitor (p, y, x); + _mm_mwait (z, y); +} + +void +bar (char *p, long x, long y, long z) +{ + _mm_monitor (p, y, x); + _mm_mwait (z, y); +} + +void +foo1 (char *p) +{ + _mm_monitor (p, 0, 0); + _mm_mwait (0, 0); +} Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 18 Mar 2006 01:09:58 -0000 1.5 +++ .cvsignore 19 Mar 2006 15:13:36 -0000 1.6 @@ -4,4 +4,5 @@ ghdl-imagef64fix.patch ghdl-0.20.tar.bz2 ghdl-0.21.tar.bz2 +gcc-4.1.0-20060304.tar.bz2 gcc-core-4.1.0.tar.bz2 Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- ghdl.spec 17 Mar 2006 23:31:35 -0000 1.12 +++ ghdl.spec 19 Mar 2006 15:13:36 -0000 1.13 @@ -1,10 +1,11 @@ %define gccver 4.1.0 %define ghdlver 0.21 +%define DATE 20060304 Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.49svn.0%{?dist} +Release: 0.49svn.1%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -12,16 +13,76 @@ # check out the SVN repo # cd translate/gcc/ # ./dist.sh sources -Source0: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 -Source1: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2 -Patch0: ghdl-svn49.patch +Source0: gcc-%{gccver}-%{DATE}.tar.bz2 +Source100: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 +Patch1: gcc41-ice-hack.patch +Patch2: gcc41-ppc64-m32-m64-multilib-only.patch +Patch3: gcc41-ia64-libunwind.patch +Patch4: gcc41-gnuc-rh-release.patch +Patch5: gcc41-java-nomulti.patch +Patch6: gcc41-ada-pr18302.patch +Patch7: gcc41-ada-tweaks.patch +Patch8: gcc41-java-slow_pthread_self.patch +Patch9: gcc41-ppc32-retaddr.patch +Patch10: gcc41-x86_64-sse3.patch +Patch11: gcc41-mni.patch +Patch12: gcc41-cfaval.patch +Patch13: gcc41-rh184446.patch +Patch100: ghdl-svn49.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gcc-gnat >= 4.0.0-0.40, texinfo Requires(post): /sbin/install-info Requires(preun): /sbin/install-info Requires: gcc # gcc-gnat missing on ppc: Bug 174720 ExcludeArch: ppc +# (Build)Requires from fc gcc41 package +%define multilib_64_archs sparc64 ppc64 s390x x86_64 +%ifarch s390x +%define multilib_32_arch s390 +%endif +%ifarch sparc64 +%define multilib_32_arch sparc +%endif +%ifarch ppc64 +%define multilib_32_arch ppc +%endif +%ifarch x86_64 +%define multilib_32_arch i386 +%endif +# Need binutils with -pie support >= 2.14.90.0.4-4 +# Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4 +# Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2 +# Need binutils which support .weakref >= 2.16.91.0.3-1 +BuildRequires: binutils >= 2.16.91.0.3-1 +BuildRequires: zlib-devel, gettext, bison, flex, texinfo +# Make sure pthread.h doesn't contain __thread tokens +# Make sure glibc supports stack protector +BuildRequires: glibc-devel >= 2.3.90-2 +%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha +# Make sure glibc supports TFmode long double +BuildRequires: glibc >= 2.3.90-35 +%endif +%ifarch %{multilib_64_archs} sparc ppc +# Ensure glibc{,-devel} is installed for both multilib arches +BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so +%endif +# Ada requires Ada to build +BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 +# Need .eh_frame ld optimizations +# Need proper visibility support +# Need -pie support +# Need --as-needed/--no-as-needed support +# On ppc64, need omit dot symbols support and --non-overlapping-opd +# Need binutils that owns /usr/bin/c++filt +# Need binutils that support .weakref +Requires: binutils >= 2.16.91.0.3-1 +# Make sure gdb will understand DW_FORM_strp +Conflicts: gdb < 5.1-2 +Requires: glibc-devel >= 2.2.90-12 +%ifarch ppc ppc64 s390 s390x sparc sparcv9 alpha +# Make sure glibc supports TFmode long double +Requires: glibc >= 2.3.90-35 +%endif # Make sure we don't use clashing namespaces %define _vendor fedora_ghdl @@ -50,13 +111,29 @@ Ada95. %prep -%setup -q -n gcc-%{gccver} -T -b 1 -a 0 +%setup -q -n gcc-%{gccver}-%{DATE} -T -b 0 -a 100 +%patch1 -p0 -b .ice-hack~ +%patch2 -p0 -b .ppc64-m32-m64-multilib-only~ +%patch3 -p0 -b .ia64-libunwind~ +#patch4 -p0 -b .gnuc-rh-release~ +%patch5 -p0 -b .java-nomulti~ +%patch6 -p0 -b .ada-pr18302~ +%patch7 -p0 -b .ada-tweaks~ +%patch8 -p0 -b .java-slow_pthread_self~ +%patch9 -p0 -b .ppc32-retaddr~ +%patch10 -p0 -b .x86_64-sse3~ +%patch11 -p0 -b .mni~ +%patch12 -p0 -b .cfaval~ +%patch13 -p0 -b .rh184446~ +sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c +sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gccver})"/' gcc/version.c pushd ghdl-%{ghdlver} -%patch0 -p1 +%patch100 -p1 %{__mv} vhdl ../gcc/ popd %build +%{__rm} -fr obj-%{gcc_target_platform} %{__mkdir} obj-%{gcc_target_platform} pushd obj-%{gcc_target_platform} @@ -104,6 +181,13 @@ --infodir=%{_infodir} \ --enable-languages=vhdl \ %{!?_without_mock:--disable-multilib} \ + --enable-shared \ + --enable-threads=posix \ + --enable-checking=release \ + --with-system-zlib \ + --enable-__cxa_atexit \ + --disable-libunwind-exceptions \ + --disable-libgcj \ %ifarch sparc --host=%{gcc_target_platform} \ --build=%{gcc_target_platform} \ @@ -221,6 +305,9 @@ %{_libexecdir}/gcc/ %changelog +* Sun Mar 19 2006 Thomas Sailer - 0.22-0.49svn.1 +- use core gcc as base compiler sources + * Thu Mar 16 2006 Thomas Sailer - 0.22-0.49svn.0 - update to svn49, using gcc 4.1.0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 18 Mar 2006 01:09:58 -0000 1.5 +++ sources 19 Mar 2006 15:13:36 -0000 1.6 @@ -1,2 +1,2 @@ a0ebb9b4ea9d33e67e6ae9768d10eb3a ghdl-0.21.tar.bz2 -15efa164579c7cf4a48859ee87d2a1fa gcc-core-4.1.0.tar.bz2 +cc39dd702c70d0a784c7ecdedbb503b7 gcc-4.1.0-20060304.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 16:46:46 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sun, 19 Mar 2006 11:46:46 -0500 Subject: rpms/qgit/devel .cvsignore, 1.2, 1.3 qgit.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603191647.k2JGlI4g011452@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11431 Modified Files: .cvsignore qgit.spec sources Log Message: - update to upstream version 1.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 21:34:00 -0000 1.2 +++ .cvsignore 19 Mar 2006 16:46:45 -0000 1.3 @@ -1 +1 @@ -qgit-1.1.tar.bz2 +qgit-1.1.1.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qgit.spec 7 Mar 2006 07:17:33 -0000 1.2 +++ qgit.spec 19 Mar 2006 16:46:45 -0000 1.3 @@ -1,6 +1,6 @@ Name: qgit -Version: 1.1 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -46,6 +46,9 @@ %changelog +* Sun Mar 19 2006 Dan Horak 1.1.1-1 +- update to upstream version 1.1.1 + * Tue Mar 7 2006 Dan Horak 1.1-2 - change requires from git to git-core only Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 21:34:00 -0000 1.2 +++ sources 19 Mar 2006 16:46:45 -0000 1.3 @@ -1 +1 @@ -add6add14f3dd0602a3607a0acd5e983 qgit-1.1.tar.bz2 +bf81d73fd1633fbd02cb74e0b5d5b0b4 qgit-1.1.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 16:50:10 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sun, 19 Mar 2006 11:50:10 -0500 Subject: rpms/qgit/FC-4 .cvsignore, 1.2, 1.3 qgit.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603191650.k2JGog83011537@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11516 Modified Files: .cvsignore qgit.spec sources Log Message: - update to upstream version 1.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 21:34:00 -0000 1.2 +++ .cvsignore 19 Mar 2006 16:50:10 -0000 1.3 @@ -1 +1 @@ -qgit-1.1.tar.bz2 +qgit-1.1.1.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-4/qgit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qgit.spec 7 Mar 2006 07:13:52 -0000 1.2 +++ qgit.spec 19 Mar 2006 16:50:10 -0000 1.3 @@ -1,6 +1,6 @@ Name: qgit -Version: 1.1 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -46,6 +46,9 @@ %changelog +* Sun Mar 19 2006 Dan Horak 1.1.1-1 +- update to upstream version 1.1.1 + * Tue Mar 7 2006 Dan Horak 1.1-2 - change requires from git to git-core only Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 21:34:00 -0000 1.2 +++ sources 19 Mar 2006 16:50:10 -0000 1.3 @@ -1 +1 @@ -add6add14f3dd0602a3607a0acd5e983 qgit-1.1.tar.bz2 +bf81d73fd1633fbd02cb74e0b5d5b0b4 qgit-1.1.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 16:52:39 2006 From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz)) Date: Sun, 19 Mar 2006 11:52:39 -0500 Subject: rpms/qgit/FC-5 .cvsignore, 1.2, 1.3 qgit.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603191653.k2JGrCwB011613@cvs-int.fedora.redhat.com> Author: sharkcz Update of /cvs/extras/rpms/qgit/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592 Modified Files: .cvsignore qgit.spec sources Log Message: - update to upstream version 1.1.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 3 Mar 2006 21:34:00 -0000 1.2 +++ .cvsignore 19 Mar 2006 16:52:39 -0000 1.3 @@ -1 +1 @@ -qgit-1.1.tar.bz2 +qgit-1.1.1.tar.bz2 Index: qgit.spec =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-5/qgit.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- qgit.spec 7 Mar 2006 07:17:33 -0000 1.2 +++ qgit.spec 19 Mar 2006 16:52:39 -0000 1.3 @@ -1,6 +1,6 @@ Name: qgit -Version: 1.1 -Release: 2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: QGit is a git GUI repository browser Group: Development/Tools @@ -46,6 +46,9 @@ %changelog +* Sun Mar 19 2006 Dan Horak 1.1.1-1 +- update to upstream version 1.1.1 + * Tue Mar 7 2006 Dan Horak 1.1-2 - change requires from git to git-core only Index: sources =================================================================== RCS file: /cvs/extras/rpms/qgit/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 3 Mar 2006 21:34:00 -0000 1.2 +++ sources 19 Mar 2006 16:52:39 -0000 1.3 @@ -1 +1 @@ -add6add14f3dd0602a3607a0acd5e983 qgit-1.1.tar.bz2 +bf81d73fd1633fbd02cb74e0b5d5b0b4 qgit-1.1.1.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 17:42:24 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 12:42:24 -0500 Subject: rpms/cfitsio/FC-4 cfitsio.spec,1.10,1.11 Message-ID: <200603191742.k2JHgugr013760@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13713/FC-4 Modified Files: cfitsio.spec Log Message: Fix references to %{buildroot} so they aren't in %build; only in %install. Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-4/cfitsio.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cfitsio.spec 10 Mar 2006 19:11:10 -0000 1.10 +++ cfitsio.spec 19 Mar 2006 17:42:23 -0000 1.11 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -39,14 +39,14 @@ %build FC=f95 export FC -%configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name} +%configure make shared %{?_smp_mflags} unset FC %install rm -rf %{buildroot} mkdir -p %{buildroot} -LIBDIR=%{_lib} INCLUDEDIR=include/%{name} make install +make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_PREFIX=%{buildroot}%{_prefix} install pushd %{buildroot}%{_libdir} ln -s libcfitsio.so.0 libcfitsio.so popd @@ -69,6 +69,10 @@ %{_libdir}/libcfitsio.so %changelog +* Sun Mar 19 2006 Matthew Truch - 3.006-4 +- Don't use %{buildroot} in %build, only in %_install as per + appended comments to Bugzilla bug 172042 + * Fri Mar 10 2006 Matthew Truch - 3.006-3 - Point to f95 instead of g95 as per bugzilla bug 185107 From fedora-extras-commits at redhat.com Sun Mar 19 17:42:30 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 12:42:30 -0500 Subject: rpms/cfitsio/FC-5 cfitsio.spec,1.11,1.12 Message-ID: <200603191743.k2JHh2D7013763@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13713/FC-5 Modified Files: cfitsio.spec Log Message: Fix references to %{buildroot} so they aren't in %build; only in %install. Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-5/cfitsio.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cfitsio.spec 10 Mar 2006 19:11:18 -0000 1.11 +++ cfitsio.spec 19 Mar 2006 17:42:29 -0000 1.12 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -39,14 +39,14 @@ %build FC=f95 export FC -%configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name} +%configure make shared %{?_smp_mflags} unset FC %install rm -rf %{buildroot} mkdir -p %{buildroot} -LIBDIR=%{_lib} INCLUDEDIR=include/%{name} make install +make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_PREFIX=%{buildroot}%{_prefix} install pushd %{buildroot}%{_libdir} ln -s libcfitsio.so.0 libcfitsio.so popd @@ -69,6 +69,10 @@ %{_libdir}/libcfitsio.so %changelog +* Sun Mar 19 2006 Matthew Truch - 3.006-4 +- Don't use %{buildroot} in %build, only in %_install as per + appended comments to Bugzilla bug 172042 + * Fri Mar 10 2006 Matthew Truch - 3.006-3 - Point to f95 instead of g95 as per bugzilla bug 185107 From fedora-extras-commits at redhat.com Sun Mar 19 17:42:35 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 12:42:35 -0500 Subject: rpms/cfitsio/devel cfitsio.spec,1.11,1.12 Message-ID: <200603191743.k2JHh874013766@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13713/devel Modified Files: cfitsio.spec Log Message: Fix references to %{buildroot} so they aren't in %build; only in %install. Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cfitsio.spec 10 Mar 2006 19:11:18 -0000 1.11 +++ cfitsio.spec 19 Mar 2006 17:42:35 -0000 1.12 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -39,14 +39,14 @@ %build FC=f95 export FC -%configure --prefix=%{buildroot}/%{_prefix} --includedir=%{buildroot}/%{_includedir}/%{name} +%configure make shared %{?_smp_mflags} unset FC %install rm -rf %{buildroot} mkdir -p %{buildroot} -LIBDIR=%{_lib} INCLUDEDIR=include/%{name} make install +make LIBDIR=%{_lib} INCLUDEDIR=include/%{name} CFITSIO_PREFIX=%{buildroot}%{_prefix} install pushd %{buildroot}%{_libdir} ln -s libcfitsio.so.0 libcfitsio.so popd @@ -69,6 +69,10 @@ %{_libdir}/libcfitsio.so %changelog +* Sun Mar 19 2006 Matthew Truch - 3.006-4 +- Don't use %{buildroot} in %build, only in %_install as per + appended comments to Bugzilla bug 172042 + * Fri Mar 10 2006 Matthew Truch - 3.006-3 - Point to f95 instead of g95 as per bugzilla bug 185107 From fedora-extras-commits at redhat.com Sun Mar 19 18:04:57 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 13:04:57 -0500 Subject: rpms/libopts import.log,1.2,1.3 Message-ID: <200603191805.k2JI5TZv015904@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15872 Modified Files: import.log Log Message: auto-import libopts-27.1-4 on branch devel from libopts-27.1-4.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libopts/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 19 Mar 2006 12:33:29 -0000 1.2 +++ import.log 19 Mar 2006 18:04:57 -0000 1.3 @@ -1 +1,2 @@ libopts-27_1-3:HEAD:libopts-27.1-3.src.rpm:1142771597 +libopts-27_1-4:HEAD:libopts-27.1-4.src.rpm:1142791461 From fedora-extras-commits at redhat.com Sun Mar 19 18:05:05 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 13:05:05 -0500 Subject: rpms/libopts/devel libopts.spec,1.1,1.2 Message-ID: <200603191805.k2JI5bY2015907@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15872/devel Modified Files: libopts.spec Log Message: auto-import libopts-27.1-4 on branch devel from libopts-27.1-4.src.rpm Index: libopts.spec =================================================================== RCS file: /cvs/extras/rpms/libopts/devel/libopts.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libopts.spec 19 Mar 2006 12:33:35 -0000 1.1 +++ libopts.spec 19 Mar 2006 18:05:05 -0000 1.2 @@ -1,7 +1,7 @@ Summary: Options library for autogen Name: libopts Version: 27.1 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL or BSD Group: Development/Libraries Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz @@ -35,7 +35,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la rm -f ${RPM_BUILD_ROOT}%{_infodir}/libopts.txt* -rm -f ${RPM_BUILD_ROOT}%{_infordir}/dir +rm -rf ${RPM_BUILD_ROOT}%{_infordir}/dir %clean rm -rf ${RPM_BUILD_ROOT} @@ -64,6 +64,9 @@ %{_includedir}/autoopts %changelog +* Sun Mar 19 2006 Paul F. Johnson 27.1-4 +- Small patch to fix a build problem on the buildsys + * Sun Mar 19 2006 Paul F. Johnson 27.1-3 - Small fixes to spec file From fedora-extras-commits at redhat.com Sun Mar 19 18:41:43 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 13:41:43 -0500 Subject: rpms/nexuiz/FC-5 nexuiz.spec,1.9,1.10 Message-ID: <200603191842.k2JIgGGK016202@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16182 Modified Files: nexuiz.spec Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-5/nexuiz.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nexuiz.spec 16 Mar 2006 18:04:18 -0000 1.9 +++ nexuiz.spec 19 Mar 2006 18:41:43 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -128,6 +128,9 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-2 +- rebuilt + * Wed Mar 16 2006 Adrian Reber - 1.5-1 - updated to 1.5 - enabled sdl binary From fedora-extras-commits at redhat.com Sun Mar 19 18:44:56 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 13:44:56 -0500 Subject: rpms/nexuiz/devel nexuiz.spec,1.9,1.10 Message-ID: <200603191845.k2JIjSRg016270@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16251 Modified Files: nexuiz.spec Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nexuiz.spec 16 Mar 2006 18:04:18 -0000 1.9 +++ nexuiz.spec 19 Mar 2006 18:44:56 -0000 1.10 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -128,6 +128,9 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-2 +- rebuilt + * Wed Mar 16 2006 Adrian Reber - 1.5-1 - updated to 1.5 - enabled sdl binary From fedora-extras-commits at redhat.com Sun Mar 19 18:53:34 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 13:53:34 -0500 Subject: rpms/nexuiz-data/FC-4 .cvsignore, 1.3, 1.4 nexuiz-data.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603191854.k2JIs6oP016337@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz-data/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16316 Modified Files: .cvsignore nexuiz-data.spec sources Log Message: * Thu Mar 16 2006 Adrian Reber - 1.5-1 - updated to 1.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Sep 2005 18:03:30 -0000 1.3 +++ .cvsignore 19 Mar 2006 18:53:34 -0000 1.4 @@ -1 +1 @@ -nexuiz-data-1.2.1.tar +nexuiz-data-1.5.tar Index: nexuiz-data.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/nexuiz-data.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- nexuiz-data.spec 19 Sep 2005 18:03:30 -0000 1.2 +++ nexuiz-data.spec 19 Mar 2006 18:53:34 -0000 1.3 @@ -1,20 +1,19 @@ -%define datadate 20050905 +%define datadate 20060208 Summary: Game data for the Nexuiz first person shooter Name: nexuiz-data -Version: 1.2.1 +Version: 1.5 Release: 1 License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip -# unzip nexuiz121.zip -# mkdir nexuiz-data-1.2.1/ -# mv Nexuiz/data/ Nexuiz/Readme.htm Nexuiz/gpl.txt \ -# Nexuiz/betacredits.txt Nexuiz/gamemodes.txt \ -# nexuiz-data-1.2.1/ -# tar cvf nexuiz-data-1.2.1.tar nexuiz-data-1.2.1/ +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz15.zip +# unzip nexuiz15.zip +# mkdir nexuiz-data-1.5/ +# mv Nexuiz/data/ Nexuiz/gpl.txt Nexuiz/Docs/* \ +# nexuiz-data-1.5/ +# tar cvf nexuiz-data-1.5.tar nexuiz-data-1.5/ Source0: nexuiz-data-%{version}.tar BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,14 +26,14 @@ %prep %setup -q -%{__sed} -i 's/\r//' Readme.htm *.txt data/*.txt +%{__sed} -i 's/\r//' Readme.htm *.txt FAQ* %build %install %{__rm} -rf %{buildroot} %{__mkdir_p} %{buildroot}%{_datadir}/nexuiz/data/ -%{__install} -p data/data%{datadate}-full.pk3 \ +%{__install} -p data/data%{datadate}.pk3 \ %{buildroot}%{_datadir}/nexuiz/data/ %clean @@ -42,11 +41,14 @@ %files %defattr(0644, root, root, 0755) -%doc Readme.htm gpl.txt data/cvars.txt data/mapping.txt betacredits.txt -%doc gamemodes.txt +%doc Readme.htm gpl.txt cvars.txt mapping.txt +%doc gamemodes.txt FAQ* %{_datadir}/nexuiz/ %changelog +* Thu Mar 16 2006 Adrian Reber - 1.5-1 +- updated to 1.5 + * Mon Sep 19 2005 Adrian Reber - 1.2.1-1 - updated to 1.2.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz-data/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Sep 2005 18:03:30 -0000 1.3 +++ sources 19 Mar 2006 18:53:34 -0000 1.4 @@ -1 +1 @@ -64d371d2008b096c67980e7a65a412bc nexuiz-data-1.2.1.tar +d7bcb0515a8d91b1cfb12546550e92fc nexuiz-data-1.5.tar From fedora-extras-commits at redhat.com Sun Mar 19 19:02:48 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 14:02:48 -0500 Subject: rpms/nexuiz/FC-4 .cvsignore, 1.3, 1.4 nexuiz-1.0-basedir.patch, 1.1, 1.2 nexuiz.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603191903.k2JJ3K9W018378@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18352 Modified Files: .cvsignore nexuiz-1.0-basedir.patch nexuiz.spec sources Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 19 Sep 2005 18:58:07 -0000 1.3 +++ .cvsignore 19 Mar 2006 19:02:47 -0000 1.4 @@ -1 +1 @@ -nexuizenginesource20050911.zip +nexuizenginesource20060208.zip nexuiz-1.0-basedir.patch: Index: nexuiz-1.0-basedir.patch =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz-1.0-basedir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- nexuiz-1.0-basedir.patch 9 Jul 2005 11:59:33 -0000 1.1 +++ nexuiz-1.0-basedir.patch 19 Mar 2006 19:02:47 -0000 1.2 @@ -4,7 +4,7 @@ fs_mempool = Mem_AllocPool("file management", 0, NULL); -- strcpy(fs_basedir, "."); +- strcpy(fs_basedir, ""); + strcpy(fs_basedir, "/usr/share/nexuiz"); strcpy(fs_gamedir, ""); Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nexuiz.spec 19 Sep 2005 18:58:07 -0000 1.4 +++ nexuiz.spec 19 Mar 2006 19:02:47 -0000 1.5 @@ -1,23 +1,24 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz -Version: 1.2.1 -Release: 1%{?dist} +Version: 1.5 +Release: 2%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ # Source is custom, obtained with : -# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz121.zip -# unzip nexuiz121.zip Nexuiz/nexuizenginesource20050911.zip -Source: nexuizenginesource20050911.zip +# wget http://dl.sf.net/sourceforge/nexuiz/nexuiz15.zip +# unzip nexuiz15.zip Nexuiz/nexuizenginesource20060208.zip +Source: nexuizenginesource20060208.zip Patch0: nexuiz-1.0-basedir.patch Patch1: nexuiz-1.1-nostrip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # For the .ico extraction BuildRequires: ImageMagick, file BuildRequires: xorg-x11-devel, alsa-lib-devel, desktop-file-utils +BuildRequires: SDL-devel # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build -Requires: libz.so.1 libvorbis.so.0 libvorbisfile.so.3 libjpeg.so.62 +Requires: zlib libvorbis libjpeg Requires: desktop-file-utils >= 0.9 Requires: nexuiz-data = %{version} Requires(post): desktop-file-utils @@ -34,7 +35,7 @@ Requires: nexuiz-data = %{version} # This is necessary as these libraries are loaded during runtime # and therefore it isn't picked up by RPM during build -Requires: libz.so.1 +Requires: zlib %description server Nexuiz is a fast-paced, chaotic, and intense multiplayer first person shooter, @@ -48,10 +49,11 @@ %patch0 -p0 -b .basedir %patch1 -p0 -b .nostrip %{__sed} -i 's/\r//' darkplaces.txt +%{__sed} -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc %build -%{__make} cl-release sv-release OPTIM_RELEASE="$RPM_OPT_FLAGS" +%{__make} cl-release sv-release sdl-release OPTIM_RELEASE="$RPM_OPT_FLAGS" convert darkplaces.ico nexuiz.png @@ -60,9 +62,11 @@ # Install the main programs %{__mkdir_p} %{buildroot}%{_bindir} -%{__install} -m 0755 darkplaces-glx \ +%{__install} -m 0755 nexuiz-glx \ %{buildroot}%{_bindir}/nexuiz-glx -%{__install} -m 0755 darkplaces-dedicated \ +%{__install} -m 0755 nexuiz-sdl \ + %{buildroot}%{_bindir}/nexuiz-sdl +%{__install} -m 0755 nexuiz-dedicated \ %{buildroot}%{_bindir}/nexuiz-dedicated # Create the desktop file @@ -112,6 +116,7 @@ %defattr(-,root,root,-) %doc COPYING darkplaces.txt %{_bindir}/nexuiz-glx +%{_bindir}/nexuiz-sdl %{_datadir}/icons/hicolor/*/apps/nexuiz.png %{_datadir}/applications/*%{name}.desktop @@ -122,6 +127,17 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-2 +- rebuilt + +* Wed Mar 16 2006 Adrian Reber - 1.5-1 +- updated to 1.5 +- enabled sdl binary + +* Wed Nov 30 2005 Adrian Reber - 1.2.1-2 +- changed requires to make it work on 64 bit platforms + (thanks thl) + * Mon Sep 19 2005 Adrian Reber - 1.2.1-1 - updated to 1.2.1 - icons and binaries are now being renamed from darkplaces* to nexuiz* Index: sources =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 19 Sep 2005 18:58:07 -0000 1.3 +++ sources 19 Mar 2006 19:02:47 -0000 1.4 @@ -1 +1 @@ -ea845ee2842ad6a2304da1f0b2c95bdd nexuizenginesource20050911.zip +9ad968b3706b00d4a0f196d1c3f2267d nexuizenginesource20060208.zip From fedora-extras-commits at redhat.com Sun Mar 19 19:25:01 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 14:25:01 -0500 Subject: rpms/nexuiz/FC-4 nexuiz.spec,1.5,1.6 Message-ID: <200603191925.k2JJPXQb018530@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18513 Modified Files: nexuiz.spec Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-3 - works better on FC4 without modular X changes Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-4/nexuiz.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nexuiz.spec 19 Mar 2006 19:02:47 -0000 1.5 +++ nexuiz.spec 19 Mar 2006 19:25:00 -0000 1.6 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -49,7 +49,6 @@ %patch0 -p0 -b .basedir %patch1 -p0 -b .nostrip %{__sed} -i 's/\r//' darkplaces.txt -%{__sed} -i 's,/usr/X11R6/,/usr/,g' makefile makefile.inc %build @@ -127,6 +126,9 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-3 +- works better on FC4 without modular X changes + * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt From fedora-extras-commits at redhat.com Sun Mar 19 19:27:34 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Sun, 19 Mar 2006 14:27:34 -0500 Subject: rpms/nexuiz/FC-5 nexuiz.spec,1.10,1.11 Message-ID: <200603191928.k2JJS6di018596@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18579 Modified Files: nexuiz.spec Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-3 - rebuilt Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/FC-5/nexuiz.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nexuiz.spec 19 Mar 2006 18:41:43 -0000 1.10 +++ nexuiz.spec 19 Mar 2006 19:27:34 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -128,6 +128,9 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-3 +- rebuilt + * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt From fedora-extras-commits at redhat.com Sun Mar 19 20:38:23 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 13:38:23 -0700 Subject: rpms/scponly/FC-5 scponly.spec,1.3,1.4 Message-ID: <200603192038.k2JKcNKo020842@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20831 Modified Files: scponly.spec Log Message: - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-5/scponly.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scponly.spec 17 Feb 2006 21:18:32 -0000 1.3 +++ scponly.spec 19 Mar 2006 20:38:22 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -22,7 +22,7 @@ %setup -q %build -%configure --enable-scp-compat +%configure --enable-scp-compat --enable-rsync-compat --enable-winscp-compat %{__make} %{?_smp_mflags} \ OPTS="%{optflags}" @@ -45,6 +45,10 @@ %{_bindir}/scponly %changelog +* Sun Mar 19 2006 Warren Togami - 4.6-2 +- --enable-winscp-compat seems necessary +- --enable-rsync-compat seems useful too + * Fri Feb 17 2006 Warren Togami - 4.6-1 - 4.6 - --enable-scp-compat so scp works From fedora-extras-commits at redhat.com Sun Mar 19 20:39:32 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 13:39:32 -0700 Subject: rpms/scponly/FC-4 scponly.spec,1.3,1.4 Message-ID: <200603192039.k2JKdWAP020944@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20933 Modified Files: scponly.spec Log Message: - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-4/scponly.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scponly.spec 17 Feb 2006 21:19:40 -0000 1.3 +++ scponly.spec 19 Mar 2006 20:39:32 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -22,7 +22,7 @@ %setup -q %build -%configure --enable-scp-compat +%configure --enable-scp-compat --enable-rsync-compat --enable-winscp-compat %{__make} %{?_smp_mflags} \ OPTS="%{optflags}" @@ -45,6 +45,10 @@ %{_bindir}/scponly %changelog +* Sun Mar 19 2006 Warren Togami - 4.6-2 +- --enable-winscp-compat seems necessary +- --enable-rsync-compat seems useful too + * Fri Feb 17 2006 Warren Togami - 4.6-1 - 4.6 - --enable-scp-compat so scp works From fedora-extras-commits at redhat.com Sun Mar 19 20:40:00 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 13:40:00 -0700 Subject: rpms/scponly/FC-3 scponly.spec,1.3,1.4 Message-ID: <200603192040.k2JKe0dj021042@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21031 Modified Files: scponly.spec Log Message: - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-3/scponly.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- scponly.spec 17 Feb 2006 21:20:06 -0000 1.3 +++ scponly.spec 19 Mar 2006 20:40:00 -0000 1.4 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -22,7 +22,7 @@ %setup -q %build -%configure --enable-scp-compat +%configure --enable-scp-compat --enable-rsync-compat --enable-winscp-compat %{__make} %{?_smp_mflags} \ OPTS="%{optflags}" @@ -45,6 +45,10 @@ %{_bindir}/scponly %changelog +* Sun Mar 19 2006 Warren Togami - 4.6-2 +- --enable-winscp-compat seems necessary +- --enable-rsync-compat seems useful too + * Fri Feb 17 2006 Warren Togami - 4.6-1 - 4.6 - --enable-scp-compat so scp works From fedora-extras-commits at redhat.com Sun Mar 19 20:52:50 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 19 Mar 2006 15:52:50 -0500 Subject: rpms/apt/devel .cvsignore, 1.4, 1.5 apt.spec, 1.18, 1.19 default.conf, 1.5, 1.6 sources, 1.4, 1.5 apt-0.5.15cnc5-manifest-limit.patch, 1.1, NONE apt-0.5.15cnc6-pymake2.patch, 1.1, NONE apt-0.5.15cnc6-rdonly.patch, 1.1, NONE apt-pymake.patch, 1.1, NONE apt-scriptdir.patch, 1.1, NONE apt-shell-155990.patch, 1.1, NONE Message-ID: <200603192053.k2JKrNH4021187@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21164/devel Modified Files: .cvsignore apt.spec default.conf sources Removed Files: apt-0.5.15cnc5-manifest-limit.patch apt-0.5.15cnc6-pymake2.patch apt-0.5.15cnc6-rdonly.patch apt-pymake.patch apt-scriptdir.patch apt-shell-155990.patch Log Message: * Sun Mar 19 2006 Ville Skytt?? - 0.5.15lorg3-0.1.pre1 - 0.5.15lorg3-pre1: preliminary multilib and repomd support. - Update config for kernel and module packages. - Don't ship static libraries. - Don't mark init script as config. - Don't build -groupinstall for now. - Clean up dependency lists for FC5+. - Specfile cleanup. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Mar 2005 12:08:38 -0000 1.4 +++ .cvsignore 19 Mar 2006 20:52:50 -0000 1.5 @@ -1 +1 @@ -apt-0.5.15cnc7.tar.bz2 +apt-0.5.15lorg3-pre1.tar.bz2 Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- apt.spec 13 Nov 2005 14:52:50 -0000 1.18 +++ apt.spec 19 Mar 2006 20:52:50 -0000 1.19 @@ -1,165 +1,150 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define scriptdir %{_datadir}/apt/scripts/ - %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.15cnc7 -Release: 7%{?dist} -Group: System Environment/Base -URL: https://moin.conectiva.com.br/AptRpm -License: GPL -ExcludeArch: x86_64 ppc64 - -# unfortunately the source isn't really directly downloadable with wget etc: -#Source0: https://moin.conectiva.com.br/AptRpm?action=AttachFile&do=get&target=apt-0.5.15cnc7.tar.bz2 -Source0: %{name}-%{version}.tar.bz2 +Summary: Debian's Advanced Packaging Tool with RPM support +Name: apt +Version: 0.5.15lorg3 +Release: 0.1.pre1%{?dist} +Group: System Environment/Base +URL: https://moin.conectiva.com.br/AptRpm +License: GPL + +Source0: http://laiskiainen.org/apt/testing/apt-0.5.15lorg3-pre1.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 # nightly updater scripts & config -Source20: apt.init -Source21: apt.cron -Source22: apt.sysconfig +Source20: apt.init +Source21: apt.cron +Source22: apt.sysconfig # Sources 50-99 are for Lua-scripts not in contrib/ -#Source50: -#Source51: -Source52: preserve-conf.lua -Source54: upgradevirt.lua +Source50: preserve-conf.lua +Source51: upgradevirt.lua # 100-149 for sources.list.d # no default entry for fedora at all -#Source100: fedora.list -#Source101: macromedia.list # 150-199 for apt.conf.d -# "factory defaults" for Fedora Core -Source150: default.conf +# "factory defaults" for Fedora Core + Extras +Source150: default.conf # 200-249 for trusted gpg keys # Fedora key -Source200: gpg-pubkey-4f2a6fd2-3f9d9d3b +Source200: gpg-pubkey-4f2a6fd2-3f9d9d3b # "Old" RHL key -Source202: gpg-pubkey-db42a60e-37ea5438 +Source202: gpg-pubkey-db42a60e-37ea5438 # Fedora Extras key -Source203: gpg-pubkey-1ac70ce6-41bebeef +Source203: gpg-pubkey-1ac70ce6-41bebeef # 250-299 for vendor.list.d -Source250: fedora-vendor.list -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source250: fedora-vendor.list -Provides: apt-mirrorselect - -# Other deps are automatically picked up by rpm -Requires: gnupg, bzip2 -Requires(post): chkconfig, ldconfig -Requires(preun): chkconfig -# Needed by the mirror-selector script -Requires: wget +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # TODO: verify the required minimum Python version -BuildRequires: python-devel >= 2.2 -BuildRequires: rpm-devel, zlib-devel, bzip2-devel, libstdc++-devel, gettext -BuildRequires: docbook-utils, perl, readline-devel, ncurses-devel, libtool +BuildRequires: python-devel >= 2.2 +BuildRequires: libxml2-devel +BuildRequires: rpm-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, %{comps} +BuildRequires: %{_bindir}/xsltproc +BuildRequires: %{comps} +%endif +# libxml2-devel, #183689 +BuildRequires: pkgconfig +Requires: gnupg +Requires: bzip2 +# wget needed by the mirror-selector script +Requires: wget +Requires(post): chkconfig +Requires(post): ldconfig +Requires(preun): chkconfig +Provides: apt-mirrorselect +%if 0%{!?_with_groupinstall:1} +Obsoletes: %{name}-groupinstall < %{version}-%{release} %endif -# Work around missing deps in rpm-devel :-/ -BuildRequires: beecrypt-devel, elfutils-libelf-devel - -Patch0: apt-shell-155990.patch -# Fix some issues in python binding build -Patch1: apt-pymake.patch -Patch5: apt-0.5.15cnc6-pymake2.patch -# Make rpm manifest usage configurable -Patch3: apt-0.5.15cnc5-manifest-limit.patch -# Take read-only, not exclusive rpmdb lock for the initial dependency processing -Patch6: apt-0.5.15cnc6-rdonly.patch -# Move scripts from /usr/lib/apt to /usr/share/apt -Patch7: apt-scriptdir.patch %description -A port of Debian's apt tools for RPM based distributions. -It provides the apt-get utility that provides a simpler, safer way to -install and upgrade packages. APT features complete installation ordering, -multiple source capability and several other unique features. - -%package devel -Summary: Development files and documentation for APT's libapt-pkg. -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: rpm-devel -%description devel -This package contains the header files and static libraries 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} -%description python +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 +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 + +%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} + +%description python The apt-python package contains a module which allows python programs to access the APT library interface. -%package groupinstall -Summary: Add commands to install and remove package groups. -Group: System Environment/Base -Requires: %{name} = %{version}-%{release} -Requires: rhpl, comps -%description groupinstall -This package adds four new commands to apt for installing, removing and viewing -groups of packages: +%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 +This package adds four new commands to apt for installing, removing +and viewing groups of packages: apt-cache groupnames apt-cache showgroup [ ..] apt-get groupinstall [ ..] apt-get groupremove [ ..] -The group information is retrieved from comps.xml used by anaconda (the -system installer) and other package management tools of RHL/RHEL/FC -distributions. +The group information is retrieved from comps.xml used by anaconda +(the system installer) and other package management tools of +RHL/RHEL/FC distributions. %prep -%setup -q -%patch0 -p0 -b .155990 -%patch1 -p0 -b .pymake -%patch3 -p1 -b .manifest -%patch5 -p0 -b .pymake2 -%patch6 -p1 -b .rdonly -%patch7 -p0 -b .scriptdir +%setup -q -n %{name}-%{version}-pre1 # 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/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 -# appease aclocal >= 1.8 -perl -pi -e 's|^(AC_DEFUN\()(\w+)|$1\[$2\]|' buildlib/*.m4 - -# http://distro2.conectiva.com.br/pipermail/apt-rpm/2005-March/002664.html -libtoolize -f && autoreconf - %build -%configure --disable-dependency-tracking +%configure --disable-dependency-tracking --disable-static SGML_CATALOG_FILES=$(ls -1 %{_sysconfdir}/sgml/sgml-docbook-3.1* | head -n 1) \ make %{?_smp_mflags} @@ -176,7 +161,7 @@ %install rm -rf $RPM_BUILD_ROOT -%makeinstall includedir=$RPM_BUILD_ROOT%{_includedir}/apt-pkg +make install DESTDIR=$RPM_BUILD_ROOT includedir=%{_includedir}/apt-pkg %find_lang %{name} # The state files @@ -190,104 +175,108 @@ 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 -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf -install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/sources.list -install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/vendors.list -install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences -install -p -m 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/ +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/ # install config parts -install -p -m 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/ -install -p -m 644 %{SOURCE250} $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list +install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/ +install -pm 644 %{SOURCE250} \ + $RPM_BUILD_ROOT%{_sysconfdir}/apt/vendors.list.d/fedora.list # GPG keys mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ -for gpgkey in %{SOURCE200} %{SOURCE202} %{SOURCE203}; do - install -p -m 644 $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ +for gpgkey in %{SOURCE200} %{SOURCE202} %{SOURCE203} ; do + install -pm 644 $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ done # Lua scripts -mkdir -p $RPM_BUILD_ROOT%{scriptdir} -for script in %{SOURCE52} %{SOURCE54}; do - install -p -m 755 $script $RPM_BUILD_ROOT%{scriptdir} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts +for script in %{SOURCE50} %{SOURCE51} ; do + install -pm 755 $script $RPM_BUILD_ROOT%{_datadir}/apt/scripts done # The python bindings mkdir -p $RPM_BUILD_ROOT%{python_sitearch}/ -install -p -m 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/ -install -p -m 644 python/apt.py{c,} $RPM_BUILD_ROOT%{python_sitearch}/ +install -pm 755 python/_apt.so $RPM_BUILD_ROOT%{python_sitearch}/ +install -pm 644 python/apt.py{c,} $RPM_BUILD_ROOT%{python_sitearch}/ touch $RPM_BUILD_ROOT%{python_sitearch}/apt.pyo # Nightly updater scripts & default config -install -D -p -m 755 %{SOURCE20} $RPM_BUILD_ROOT/%{_initrddir}/apt -install -D -p -m 755 %{SOURCE21} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron -install -D -p -m 644 %{SOURCE22} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt +install -Dpm 755 %{SOURCE20} $RPM_BUILD_ROOT/%{_initrddir}/apt +install -Dpm 755 %{SOURCE21} $RPM_BUILD_ROOT/%{_sysconfdir}/cron.daily/apt.cron +install -Dpm 644 %{SOURCE22} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/apt # GPG checker from contrib -install -p -m 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{scriptdir}/ +install -pm 755 contrib/gpg-check/*.lua $RPM_BUILD_ROOT/%{_datadir}/apt/scripts # apt-groupinstall from contrib -install -p -m 755 contrib/apt-groupinstall/{groupinstall-backend-comps.py,apt-groupinstall.lua} $RPM_BUILD_ROOT/%{scriptdir} -install -p -m 644 contrib/apt-groupinstall/apt-groupinstall.conf $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/ +%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 644 contrib/apt-groupinstall/apt-groupinstall.conf \ + $RPM_BUILD_ROOT/%{_sysconfdir}/apt/apt.conf.d/ +%endif # nuke .la files rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%clean +rm -rf $RPM_BUILD_ROOT + + %pre if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then - mv -f %{_sysconfdir}/apt/apt.conf %{_sysconfdir}/apt/apt.conf.rpmsave - echo "NOTE: Default configuration changed!" - echo "If you have made any changes to the configuration locally" - echo "Merge your local customizations from %{_sysconfdir}/apt/apt.conf.rpmsave" - echo "to %{_sysconfdir}/apt/apt.conf" + mv -f %{_sysconfdir}/apt/apt.conf %{_sysconfdir}/apt/apt.conf.rpmsave + echo "NOTE: Default configuration changed!" + echo "If you have made any changes to the configuration locally," + echo "Merge your local customizations from %{_sysconfdir}/apt/apt.conf.rpmsave" + echo "to %{_sysconfdir}/apt/apt.conf" fi -%preun -if [ $1 = 0 ]; then - /sbin/service apt stop > /dev/null 2>&1 - /sbin/chkconfig --del apt -fi -exit 0 - %post /sbin/ldconfig -if [ ! -f %{_sysconfdir}/apt/apt.conf ]; then - echo "// User customizable configuration goes here" \ +if [ ! -f %{_sysconfdir}/apt/apt.conf ] ; then + echo "// User customizable configuration goes here" \ > %{_sysconfdir}/apt/apt.conf fi /sbin/chkconfig --add apt -%postun -p /sbin/ldconfig +%preun +if [ $1 -eq 0 ] ; then + %{_initrddir}/apt stop &>/dev/null || : + /sbin/chkconfig --del apt +fi -%clean -rm -rf $RPM_BUILD_ROOT +%postun -p /sbin/ldconfig %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS* COPYING* ABOUT* TODO comps2prio.xsl doc/examples/ contrib/ -%dir %{_sysconfdir}/apt -%dir %{_sysconfdir}/apt/sources.list.d -%dir %{_sysconfdir}/apt/vendors.list.d -%dir %{_sysconfdir}/apt/apt.conf.d -%dir %{_sysconfdir}/apt/gpg -%{_sysconfdir}/apt/gpg/gpg-pubkey* -%config(noreplace) %{_sysconfdir}/sysconfig/apt -%config(noreplace) %{_sysconfdir}/apt/rpmpriorities -%config(noreplace) %{_sysconfdir}/apt/preferences + +%dir %{_sysconfdir}/apt/ %config(noreplace) %{_sysconfdir}/apt/apt.conf +%config(noreplace) %{_sysconfdir}/apt/preferences +%config(noreplace) %{_sysconfdir}/apt/rpmpriorities %config(noreplace) %{_sysconfdir}/apt/sources.list %config(noreplace) %{_sysconfdir}/apt/vendors.list -# NOTE: no noreplace on these because we WANT to be able to change the defaults +# NOTE: no noreplace on *.d because we WANT to be able to change the defaults # without user intervention! -%config %{_sysconfdir}/apt/apt.conf.d/* -%exclude %{_sysconfdir}/apt/apt.conf.d/apt-groupinstall.conf -#%config %{_sysconfdir}/apt/sources.list.d/*.list -%config %{_sysconfdir}/apt/vendors.list.d/* -%config %{_initrddir}/apt +%dir %{_sysconfdir}/apt/apt.conf.d/ +%config %{_sysconfdir}/apt/apt.conf.d/default.conf +%config %{_sysconfdir}/apt/sources.list.d/ +%config %{_sysconfdir}/apt/vendors.list.d/ + +%config(noreplace) %{_sysconfdir}/sysconfig/apt %config %{_sysconfdir}/cron.daily/apt.cron +%{_sysconfdir}/apt/gpg/ +%{_initrddir}/apt + %{_bindir}/apt-cache %{_bindir}/apt-cdrom %{_bindir}/apt-config @@ -297,36 +286,51 @@ %{_bindir}/genpkglist %{_bindir}/gensrclist %{_bindir}/genbasedir -%{_libdir}/*.so.* -%{_libdir}/apt -%{_datadir}/apt -%exclude %{scriptdir}/apt-groupinstall.lua -%exclude %{scriptdir}/groupinstall-backend-comps.py -%{_mandir}/man?/* -%{_localstatedir}/cache/apt -%{_localstatedir}/state/apt +%{_libdir}/libapt-pkg*.so.* +%{_libdir}/apt/ +%dir %{_datadir}/apt/ +%dir %{_datadir}/apt/scripts/ +%{_datadir}/apt/scripts/gpg-check.lua +%{_datadir}/apt/scripts/gpg-import.lua +%{_datadir}/apt/scripts/preserve-conf.lua +%{_datadir}/apt/scripts/upgradevirt.lua +%{_localstatedir}/cache/apt/ +%{_localstatedir}/state/apt/ +%{_mandir}/man[58]/*.[58]* %files devel -%defattr(-, root, root) +%defattr(-,root,root,-) %{_includedir}/apt-pkg/ -%{_libdir}/*.so -%{_libdir}/*.a +%{_libdir}/libapt-pkg*.so %files python -%defattr(-, root, root) +%defattr(-,root,root,-) %{python_sitearch}/_apt.so %{python_sitearch}/apt.py %{python_sitearch}/apt.pyc %ghost %{python_sitearch}/apt.pyo +%if 0%{?_with_groupinstall:1} %files groupinstall -%defattr(-, root, root) +%defattr(-,root,root,-) +# XXX not config? %{_sysconfdir}/apt/apt.conf.d/apt-groupinstall.conf -%{scriptdir}/apt-groupinstall.lua -%{scriptdir}/groupinstall-backend-comps.py +%{_datadir}/apt/scripts/apt-groupinstall.lua +%{_datadir}/apt/scripts/groupinstall-backend-comps.py +%ghost %{_datadir}/apt/scripts/groupinstall-backend-comps.py[co] +%endif %changelog +* Sun Mar 19 2006 Ville Skytt?? - 0.5.15lorg3-0.1.pre1 +- 0.5.15lorg3-pre1: preliminary multilib and repomd support. +- Update config for kernel and module packages. +- Don't ship static libraries. +- Don't mark init script as config. +- Don't build -groupinstall for now. +- Clean up dependency lists for FC5+. +- Specfile cleanup. + * Sun Nov 13 2005 Ville Skytt?? - 0.5.15cnc7-7 - Rebuild against new OpenSSL. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- default.conf 18 Feb 2005 22:14:10 -0000 1.5 +++ default.conf 19 Mar 2006 20:52:50 -0000 1.6 @@ -26,9 +26,19 @@ // Completely ignore GnuPG signature packages (introduced in rpm 4.1) Ignore { "gpg-pubkey"; }; // Allow multiple kernel and kernel-related packages to be installed - Allow-Duplicated { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; "^gpg-pubkey$"; }; + Allow-Duplicated { + "^kernel(-(hugemem|kdump|smp|xen[0U]))(-devel)?$"; + "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))$"; + "^kmod-.+$"; + "^gpg-pubkey$"; + }; // XXX: not used currently - //Allow-Duplicated-Upgrade { "^kernel(-(BOOT|bigmem|debug|smp|unsupported|xen[0U]))?(-(devel|source(code)?|unsupported-modules))?$"; }; + //Allow-Duplicated-Upgrade { + // "^kernel(-(hugemem|kdump|smp|xen[0U]))(-devel)?$"; + // "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))$"; + // "^kmod-.+$"; + // "^gpg-pubkey$"; + //}; // "Upgrade" allow-duplicated packages as well Upgrade-Virtual "true"; // Enable source rebuilds Index: sources =================================================================== RCS file: /cvs/extras/rpms/apt/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Mar 2005 12:08:38 -0000 1.4 +++ sources 19 Mar 2006 20:52:50 -0000 1.5 @@ -1 +1 @@ -9e44ec1503fa96832bbd9b532543e4de apt-0.5.15cnc7.tar.bz2 +5c6b3f37374d266e89805a2912d11fb6 apt-0.5.15lorg3-pre1.tar.bz2 --- apt-0.5.15cnc5-manifest-limit.patch DELETED --- --- apt-0.5.15cnc6-pymake2.patch DELETED --- --- apt-0.5.15cnc6-rdonly.patch DELETED --- --- apt-pymake.patch DELETED --- --- apt-scriptdir.patch DELETED --- --- apt-shell-155990.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 21:04:22 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 14:04:22 -0700 Subject: rpms/scponly/FC-5 scponly.spec,1.4,1.5 Message-ID: <200603192104.k2JL4Mfj023228@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23217 Modified Files: scponly.spec Log Message: Need rsync in buildroot. Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-5/scponly.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scponly.spec 19 Mar 2006 20:38:22 -0000 1.4 +++ scponly.spec 19 Mar 2006 21:04:22 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -10,6 +10,7 @@ # Checks only for location of binaries BuildRequires: openssh-clients >= 3.4 +BuildRequires: rsync %description scponly is an alternative 'shell' for system administrators @@ -45,7 +46,7 @@ %{_bindir}/scponly %changelog -* Sun Mar 19 2006 Warren Togami - 4.6-2 +* Sun Mar 19 2006 Warren Togami - 4.6-3 - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too From fedora-extras-commits at redhat.com Sun Mar 19 21:07:22 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 14:07:22 -0700 Subject: rpms/scponly/FC-4 scponly.spec,1.4,1.5 Message-ID: <200603192107.k2JL7MBn023315@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23304 Modified Files: scponly.spec Log Message: Need rsync in buildroot. Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-4/scponly.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scponly.spec 19 Mar 2006 20:39:32 -0000 1.4 +++ scponly.spec 19 Mar 2006 21:07:22 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -10,6 +10,7 @@ # Checks only for location of binaries BuildRequires: openssh-clients >= 3.4 +BuildRequires: rsync %description scponly is an alternative 'shell' for system administrators @@ -45,7 +46,7 @@ %{_bindir}/scponly %changelog -* Sun Mar 19 2006 Warren Togami - 4.6-2 +* Sun Mar 19 2006 Warren Togami - 4.6-3 - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too From fedora-extras-commits at redhat.com Sun Mar 19 21:12:30 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Sun, 19 Mar 2006 14:12:30 -0700 Subject: rpms/scponly/FC-3 scponly.spec,1.4,1.5 Message-ID: <200603192112.k2JLCUA6023420@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/scponly/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23409 Modified Files: scponly.spec Log Message: Need rsync in the buildroot too. Index: scponly.spec =================================================================== RCS file: /cvs/extras/rpms/scponly/FC-3/scponly.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- scponly.spec 19 Mar 2006 20:40:00 -0000 1.4 +++ scponly.spec 19 Mar 2006 21:12:30 -0000 1.5 @@ -1,7 +1,7 @@ Summary: Restricted shell for ssh based file services Name: scponly Version: 4.6 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Applications/Internet URL: http://sublimation.org/scponly/ @@ -10,6 +10,7 @@ # Checks only for location of binaries BuildRequires: openssh-clients >= 3.4 +BuildRequires: rsync %description scponly is an alternative 'shell' for system administrators @@ -45,7 +46,7 @@ %{_bindir}/scponly %changelog -* Sun Mar 19 2006 Warren Togami - 4.6-2 +* Sun Mar 19 2006 Warren Togami - 4.6-3 - --enable-winscp-compat seems necessary - --enable-rsync-compat seems useful too From fedora-extras-commits at redhat.com Sun Mar 19 21:21:54 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 19 Mar 2006 16:21:54 -0500 Subject: rpms/apt/devel apt.spec,1.19,1.20 default.conf,1.6,1.7 Message-ID: <200603192122.k2JLMQ6L023620@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23601 Modified Files: apt.spec default.conf Log Message: * Sun Mar 19 2006 Ville Skytt?? - 0.5.15lorg3-0.2.pre1 - Fix Allow-Duplicated* default.conf bugs introduced in previous version. Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- apt.spec 19 Mar 2006 20:52:50 -0000 1.19 +++ apt.spec 19 Mar 2006 21:21:54 -0000 1.20 @@ -6,7 +6,7 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3 -Release: 0.1.pre1%{?dist} +Release: 0.2.pre1%{?dist} Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm License: GPL @@ -322,6 +322,9 @@ %changelog +* Sun Mar 19 2006 Ville Skytt?? - 0.5.15lorg3-0.2.pre1 +- Fix Allow-Duplicated* default.conf bugs introduced in previous version. + * Sun Mar 19 2006 Ville Skytt?? - 0.5.15lorg3-0.1.pre1 - 0.5.15lorg3-pre1: preliminary multilib and repomd support. - Update config for kernel and module packages. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- default.conf 19 Mar 2006 20:52:50 -0000 1.6 +++ default.conf 19 Mar 2006 21:21:54 -0000 1.7 @@ -27,15 +27,15 @@ Ignore { "gpg-pubkey"; }; // 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[0U]))?(-devel)?$"; + "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; "^kmod-.+$"; "^gpg-pubkey$"; }; // 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[0U]))?(-devel)?$"; + // "^(GFS|cman|dlm|gnbd)-kernel(-(hugemem|kdump|smp|xen[0U]))?$"; // "^kmod-.+$"; // "^gpg-pubkey$"; //}; From fedora-extras-commits at redhat.com Sun Mar 19 21:56:01 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:01 -0500 Subject: rpms/deutex - New directory Message-ID: <200603192156.k2JLu3Ah023839@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23831/deutex Log Message: Directory /cvs/extras/rpms/deutex added to the repository From fedora-extras-commits at redhat.com Sun Mar 19 21:56:07 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:07 -0500 Subject: rpms/deutex/devel - New directory Message-ID: <200603192156.k2JLu9h0023854@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23831/deutex/devel Log Message: Directory /cvs/extras/rpms/deutex/devel added to the repository From fedora-extras-commits at redhat.com Sun Mar 19 21:56:18 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:18 -0500 Subject: rpms/deutex Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603192156.k2JLuKUf023888@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876 Added Files: Makefile import.log Log Message: Setup of module deutex --- NEW FILE Makefile --- # Top level Makefile for module deutex all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 19 21:56:24 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:24 -0500 Subject: rpms/deutex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603192156.k2JLuQ6Q023908@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23876/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module deutex --- NEW 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 Mar 19 21:56:50 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:50 -0500 Subject: rpms/deutex import.log,1.1,1.2 Message-ID: <200603192157.k2JLvM3k023992@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23952 Modified Files: import.log Log Message: auto-import deutex-4.4.0-1 on branch devel from deutex-4.4.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/deutex/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 19 Mar 2006 21:56:18 -0000 1.1 +++ import.log 19 Mar 2006 21:56:50 -0000 1.2 @@ -0,0 +1 @@ +deutex-4_4_0-1:HEAD:deutex-4.4.0-1.src.rpm:1142805407 From fedora-extras-commits at redhat.com Sun Mar 19 21:56:56 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 16:56:56 -0500 Subject: rpms/deutex/devel deutex-4.4.0-64bit.patch, NONE, 1.1 deutex-4.4.0-build.patch, NONE, 1.1 deutex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603192157.k2JLvSYK023996@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/deutex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23952/devel Modified Files: .cvsignore sources Added Files: deutex-4.4.0-64bit.patch deutex-4.4.0-build.patch deutex.spec Log Message: auto-import deutex-4.4.0-1 on branch devel from deutex-4.4.0-1.src.rpm deutex-4.4.0-64bit.patch: --- NEW FILE deutex-4.4.0-64bit.patch --- diff -Naur deutex-4.4.0/src/deutex.h deutex-4.4.0.new/src/deutex.h --- deutex-4.4.0/src/deutex.h 1999-12-30 15:20:22.000000000 -0800 +++ deutex-4.4.0.new/src/deutex.h 2006-03-18 15:50:51.000000000 -0800 @@ -43,10 +43,10 @@ /*long = Int32 on a 32 bit processor*/ typedef char Int8; typedef short Int16; -typedef long Int32; +typedef int Int32; typedef unsigned char UInt8; typedef unsigned short UInt16; -typedef unsigned long UInt32; +typedef unsigned int UInt32; #endif #if defined DeuTex deutex-4.4.0-build.patch: --- NEW FILE deutex-4.4.0-build.patch --- diff -Naur deutex-4.4.0/Makefile deutex-4.4.0.new/Makefile --- deutex-4.4.0/Makefile 2006-03-18 15:53:16.000000000 -0800 +++ deutex-4.4.0.new/Makefile 2006-03-18 16:31:25.000000000 -0800 @@ -14,10 +14,10 @@ # Others Don't know. Send feedback to the maintainer. # -PREFIX=/usr/local +PREFIX=/usr # Compiled by users -CFLAGS = -O2 +CFLAGS := -O2 CC = cc LDFLAGS = @@ -190,10 +190,10 @@ touch $@ install: - install -p -m 0755 deutex $(PREFIX)/bin - install -p -m 0755 deusf $(PREFIX)/bin - install -p -m 0644 deutex.6 $(PREFIX)/man/man6 - ln -sf deutex.6 $(PREFIX)/man/man6/deusf.6 + install -pD -m 0755 deutex $(DESTDIR)$(PREFIX)/bin/deutex + install -pD -m 0755 deusf $(DESTDIR)$(PREFIX)/bin/deusf + install -pD -m 0644 deutex.6 $(DESTDIR)$(PREFIX)/share/man/man6/deutex.6 + install -pD -m 0644 deutex.6 $(DESTDIR)$(PREFIX)/share/man/man6/deusf.6 src/version.c: VERSION printf "const char deutex_version[] = \"%s\";\n" $(VERSION) >$@ --- NEW FILE deutex.spec --- Name: deutex Version: 4.4.0 Release: 1%{?dist} Summary: DOOM wad file manipulator Group: Amusements/Graphics License: GPL-Compatible URL: http://www.teaser.fr/~amajorel/deutex/ Source0: http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.tar.gz Patch0: deutex-4.4.0-build.patch Patch1: deutex-4.4.0-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description DeuTex is a wad composer for Doom, Heretic, Hexen and Strife. It can be used to extract the lumps of a wad and save them as individual files. Conversely, it can also build a wad from separate files. When extracting a lump to a file, it does not just copy the raw data, it converts it to an appropriate format (such as PPM for graphics, Sun audio for samples, etc.). Conversely, when it reads files for inclusion in pwads, it does the necessary conversions (for example, from PPM to Doom picture format). In addition, DeuTex has functions such as merging wads, etc. If you're doing any wad hacking beyond level editing, DeuTex is a must. %prep %setup -q %patch0 -p1 %patch1 -p1 # Minor permissions cleanup for rpmlint. chmod a-x src/picture.c %build make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} iconv --from=ISO-8859-1 --to=UTF-8 deutex.6 > deutex.6.new mv deutex.6.new deutex.6 %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/deutex %{_bindir}/deusf %{_mandir}/man6/* %doc COPYING COPYING.LIB LICENSE CHANGES README %doc docsrc/changes.html docsrc/hackers_guide.html %changelog * Sun Mar 19 2006 Wart 4.4.0-1 - Initial spec file. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/deutex/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 19 Mar 2006 21:56:24 -0000 1.1 +++ .cvsignore 19 Mar 2006 21:56:56 -0000 1.2 @@ -0,0 +1 @@ +deutex-4.4.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/deutex/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 19 Mar 2006 21:56:24 -0000 1.1 +++ sources 19 Mar 2006 21:56:56 -0000 1.2 @@ -0,0 +1 @@ +4c4ea0ff9eae76165a3756b756d71a16 deutex-4.4.0.tar.gz From fedora-extras-commits at redhat.com Sun Mar 19 22:01:32 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 19 Mar 2006 17:01:32 -0500 Subject: rpms/sylpheed/devel sylpheed-2.2.3-defs.h.patch, NONE, 1.1 .cvsignore, 1.15, 1.16 sources, 1.15, 1.16 sylpheed.spec, 1.27, 1.28 sylpheed-default-browser.patch, 1.1, NONE Message-ID: <200603192202.k2JM24SE026029@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25991 Modified Files: .cvsignore sources sylpheed.spec Added Files: sylpheed-2.2.3-defs.h.patch Removed Files: sylpheed-default-browser.patch Log Message: * Sun Mar 19 2006 Michael Schwendt - 2.2.3-1 - Update to 2.2.3. - Update external commands (defs.h) patch. sylpheed-2.2.3-defs.h.patch: --- NEW FILE sylpheed-2.2.3-defs.h.patch --- diff -Nur sylpheed-2.2.3-orig/libsylph/defs.h sylpheed-2.2.3/libsylph/defs.h --- sylpheed-2.2.3-orig/libsylph/defs.h 2006-01-10 09:18:15.000000000 +0100 +++ sylpheed-2.2.3/libsylph/defs.h 2006-03-19 22:45:40.000000000 +0100 @@ -87,12 +87,12 @@ #else # define DEFAULT_SIGNATURE ".signature" #endif -#define DEFAULT_INC_PATH "/usr/bin/mh/inc" +#define DEFAULT_INC_PATH "/usr/bin/inc" #define DEFAULT_INC_PROGRAM "inc" /* #define DEFAULT_INC_PATH "/usr/bin/imget" */ /* #define DEFAULT_INC_PROGRAM "imget" */ #define DEFAULT_SENDMAIL_CMD "/usr/sbin/sendmail -t -i" -#define DEFAULT_BROWSER_CMD "mozilla-firefox -remote 'openURL(%s,new-window)'" +#define DEFAULT_BROWSER_CMD "gnome-open '%s'" #ifdef _PATH_MAILDIR # define DEFAULT_SPOOL_PATH _PATH_MAILDIR Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- .cvsignore 11 Nov 2005 11:03:34 -0000 1.15 +++ .cvsignore 19 Mar 2006 22:01:32 -0000 1.16 @@ -1,2 +1,2 @@ -sylpheed-2.0.4.tar.bz2.asc -sylpheed-2.0.4.tar.bz2 +sylpheed-2.2.3.tar.bz2.asc +sylpheed-2.2.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- sources 11 Nov 2005 11:03:35 -0000 1.15 +++ sources 19 Mar 2006 22:01:32 -0000 1.16 @@ -1,2 +1,2 @@ -f4dc5a59840a59d92d432e297f7b5106 sylpheed-2.0.4.tar.bz2.asc -c9f1c4cf2b3933ebbb58519ba3b77887 sylpheed-2.0.4.tar.bz2 +e686a2fd8cf2ce3dd0ac766fd58fb15d sylpheed-2.2.3.tar.bz2.asc +4fe29639ac4f628f348120361310e0af sylpheed-2.2.3.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sylpheed.spec 15 Feb 2006 02:16:00 -0000 1.27 +++ sylpheed.spec 19 Mar 2006 22:01:32 -0000 1.28 @@ -4,8 +4,8 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed -Version: 2.0.4 -Release: 2%{?dist} +Version: 2.2.3 +Release: 1%{?dist} License: GPL URL: http://sylpheed.good-day.net/ Group: Applications/Internet @@ -16,11 +16,12 @@ %{!?_without_compface:BuildRequires: compface-devel} %{?_with_ldap:BuildRequires: openldap-devel} %{?_with_jpilot:BuildRequires: jpilot-devel} -Source0: http://sylpheed.good-day.net/sylpheed/%{name}-%{version}.tar.bz2 +BuildRequires: gtkspell-devel +Source0: http://sylpheed.good-day.net/sylpheed/v2.2/%{name}-%{version}.tar.bz2 Source1: sylpheed.1 -Patch2: sylpheed-default-browser.patch -Patch3: sylpheed-1.9.10-desktop.patch +Patch1: sylpheed-2.2.3-defs.h.patch +Patch2: sylpheed-1.9.10-desktop.patch %description This program is an X based fast email client which has features @@ -39,8 +40,8 @@ %prep %setup -q -%patch2 -p1 -b .default-browser -%patch3 -p1 -b .desktop +%patch1 -p1 -b .defs.h +%patch2 -p1 -b .desktop %build %configure --enable-ssl %{!?_without_gpgme:--enable-gpgme} \ @@ -75,12 +76,20 @@ %doc COPYING ChangeLog README INSTALL TODO %doc ChangeLog.ja README.ja INSTALL.ja TODO.ja %{_bindir}/sylpheed -%{_datadir}/sylpheed +%{_datadir}/sylpheed/ %{_datadir}/applications/* %{_datadir}/pixmaps/* -%{_mandir}/man1 +%{_mandir}/man1/* %changelog +* Sun Mar 19 2006 Michael Schwendt - 2.2.3-1 +- Update to 2.2.3. +- Update external commands (defs.h) patch. + +* Sat Feb 18 2006 Michael Schwendt - 2.2.0-1 +- Update to 2.2.0 (new stable series). +- BR gtkspell-devel. + * Wed Feb 15 2006 Michael Schwendt - 2.0.4-2 - rebuilt for FC5 --- sylpheed-default-browser.patch DELETED --- From fedora-extras-commits at redhat.com Sun Mar 19 22:19:55 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 17:19:55 -0500 Subject: owners owners.list,1.752,1.753 Message-ID: <200603192220.k2JMKSOV026122@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26093 Modified Files: owners.list Log Message: Added deutex Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.752 retrieving revision 1.753 diff -u -r1.752 -r1.753 --- owners.list 18 Mar 2006 23:07:35 -0000 1.752 +++ owners.list 19 Mar 2006 22:19:53 -0000 1.753 @@ -177,6 +177,7 @@ Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org| Fedora Extras|denyhosts|A script to help thwart ssh server attacks|tibbs at math.uh.edu|extras-qa at fedoraproject.org| Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| +Fedora Extras|deutex|Doom wad manipulation tool|wart at kobold.org|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|extras-orphan at fedoraproject.org|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 Sun Mar 19 22:42:34 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 19 Mar 2006 17:42:34 -0500 Subject: extras-buildsys/utils extras-sign-move.py,1.7,1.8 Message-ID: <200603192242.k2JMgYf0026250@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26221 Modified Files: extras-sign-move.py Log Message: - Add q'n'd arch copy functionality, use it for wine*.i386 -> x86_64. - Make code match comments wrt. use of copy2 for noarch packages. Index: extras-sign-move.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- extras-sign-move.py 17 Mar 2006 07:46:49 -0000 1.7 +++ extras-sign-move.py 19 Mar 2006 22:42:27 -0000 1.8 @@ -40,6 +40,20 @@ '5':['ppc','x86_64', 'i386'], 'development':['ppc','x86_64','i386'], } +# Note: *no* depsolving is done for these. +copydict = { 'wine.i386': ['x86_64'], + 'wine-arts.i386': ['x86_64'], + 'wine-capi.i386': ['x86_64'], + 'wine-cms.i386': ['x86_64'], + 'wine-debuginfo.i386': ['x86_64'], + 'wine-devel.i386': ['x86_64'], + 'wine-esd.i386': ['x86_64'], + 'wine-jack.i386': ['x86_64'], + 'wine-ldap.i386': ['x86_64'], + 'wine-nas.i386': ['x86_64'], + 'wine-tools.i386': ['x86_64'], + 'wine-twain.i386': ['x86_64'], + } ts = rpmUtils.transaction.initReadOnlyTransaction() @@ -198,11 +212,25 @@ # go through each package and move it to the right arch location. # if it is a noarch package, copy2 it to all arch locations and unlink it - # if it is a debuginfo package move it into the 'debug' dir for that arch + # if it is listed in copydict, copy2 it around as appropriate + # if it is a debuginfo package, move it into the 'debug' dir for that arch print "Moving Packages into Place" for package in files['rpm'] + files['debuginfo']: pkg_fn = os.path.basename(package) (n,a,e,v,r) = naevr(package) + + copyarchs = copydict.get('%s.%s' % (n, a)) + if copyarchs: + for arch in copyarchs: + if not arch in archdict[dist]: + continue + if package in files['debuginfo']: + arch = '%s/debug' % arch + rpmloc = os.path.join(destdir, arch, pkg_fn) + debugprint("Copying %s to %s" % (package, rpmloc)) + if not DEBUG: + shutil.copy2(package, rpmloc) + if a == 'noarch': for arch in archdict[dist]: if package in files['debuginfo']: @@ -210,7 +238,7 @@ rpmloc = os.path.join(destdir, arch, pkg_fn) debugprint("Copying %s to %s" % (package, rpmloc)) if not DEBUG: - shutil.copy(package, rpmloc) + shutil.copy2(package, rpmloc) if not DEBUG: os.unlink(package) From fedora-extras-commits at redhat.com Sun Mar 19 23:31:03 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 19 Mar 2006 18:31:03 -0500 Subject: rpms/fluxbox/FC-5 .cvsignore, 1.6, 1.7 fluxbox.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200603192331.k2JNVapt028445@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fluxbox/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28407/FC-5 Modified Files: .cvsignore fluxbox.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fluxbox/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Mar 2006 22:57:50 -0000 1.6 +++ .cvsignore 19 Mar 2006 23:31:02 -0000 1.7 @@ -1 +1 @@ -fluxbox-0.9.14.tar.bz2 +fluxbox-0.9.15.tar.bz2 Index: fluxbox.spec =================================================================== RCS file: /cvs/extras/rpms/fluxbox/FC-5/fluxbox.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fluxbox.spec 2 Mar 2006 22:57:50 -0000 1.16 +++ fluxbox.spec 19 Mar 2006 23:31:03 -0000 1.17 @@ -1,6 +1,6 @@ Name: fluxbox -Version: 0.9.14 -Release: 3%{?dist} +Version: 0.9.15 +Release: 1%{?dist} Summary: Window Manager based on Blackbox @@ -8,10 +8,9 @@ License: MIT URL: http://fluxbox.sourceforge.net -Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2 +Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.15.tar.bz2 Source3: fluxbox.desktop Source4: fluxbox-xdg-menu.py -Patch0: fluxbox-gcc41.patch Patch1: fluxbox-menu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -43,7 +42,6 @@ %prep %setup -q -%patch0 -p1 %patch1 %build @@ -80,6 +78,10 @@ %{_datadir}/xsessions/fluxbox.desktop %changelog +* Sun Mar 19 2006 Andreas Bierfert +0.9.15-1 +- version upgrade + * Thu Mar 02 2006 Andreas Bierfert 0.9.14-3 - fix Requires Index: sources =================================================================== RCS file: /cvs/extras/rpms/fluxbox/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 22:57:50 -0000 1.6 +++ sources 19 Mar 2006 23:31:03 -0000 1.7 @@ -1 +1 @@ -7641aaea532841e103e9705bb5b98f62 fluxbox-0.9.14.tar.bz2 +5fd0353b79d433c117f650a53c254e88 fluxbox-0.9.15.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 23:31:09 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 19 Mar 2006 18:31:09 -0500 Subject: rpms/fluxbox/devel .cvsignore, 1.6, 1.7 fluxbox.spec, 1.16, 1.17 sources, 1.6, 1.7 Message-ID: <200603192331.k2JNVfKZ028450@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fluxbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28407/devel Modified Files: .cvsignore fluxbox.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 2 Mar 2006 22:57:50 -0000 1.6 +++ .cvsignore 19 Mar 2006 23:31:09 -0000 1.7 @@ -1 +1 @@ -fluxbox-0.9.14.tar.bz2 +fluxbox-0.9.15.tar.bz2 Index: fluxbox.spec =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fluxbox.spec 2 Mar 2006 22:57:50 -0000 1.16 +++ fluxbox.spec 19 Mar 2006 23:31:09 -0000 1.17 @@ -1,6 +1,6 @@ Name: fluxbox -Version: 0.9.14 -Release: 3%{?dist} +Version: 0.9.15 +Release: 1%{?dist} Summary: Window Manager based on Blackbox @@ -8,10 +8,9 @@ License: MIT URL: http://fluxbox.sourceforge.net -Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.14.tar.bz2 +Source0: http://download.sourceforge.net/fluxbox/fluxbox-0.9.15.tar.bz2 Source3: fluxbox.desktop Source4: fluxbox-xdg-menu.py -Patch0: fluxbox-gcc41.patch Patch1: fluxbox-menu.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot @@ -43,7 +42,6 @@ %prep %setup -q -%patch0 -p1 %patch1 %build @@ -80,6 +78,10 @@ %{_datadir}/xsessions/fluxbox.desktop %changelog +* Sun Mar 19 2006 Andreas Bierfert +0.9.15-1 +- version upgrade + * Thu Mar 02 2006 Andreas Bierfert 0.9.14-3 - fix Requires Index: sources =================================================================== RCS file: /cvs/extras/rpms/fluxbox/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 2 Mar 2006 22:57:50 -0000 1.6 +++ sources 19 Mar 2006 23:31:09 -0000 1.7 @@ -1 +1 @@ -7641aaea532841e103e9705bb5b98f62 fluxbox-0.9.14.tar.bz2 +5fd0353b79d433c117f650a53c254e88 fluxbox-0.9.15.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 19 23:40:02 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 18:40:02 -0500 Subject: rpms/libopts import.log,1.3,1.4 Message-ID: <200603192340.k2JNeZJL028622@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28587 Modified Files: import.log Log Message: auto-import libopts-27.1-5 on branch devel from libopts-27.1-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libopts/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 19 Mar 2006 18:04:57 -0000 1.3 +++ import.log 19 Mar 2006 23:40:02 -0000 1.4 @@ -1,2 +1,3 @@ libopts-27_1-3:HEAD:libopts-27.1-3.src.rpm:1142771597 libopts-27_1-4:HEAD:libopts-27.1-4.src.rpm:1142791461 +libopts-27_1-5:HEAD:libopts-27.1-5.src.rpm:1142811579 From fedora-extras-commits at redhat.com Sun Mar 19 23:40:08 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sun, 19 Mar 2006 18:40:08 -0500 Subject: rpms/libopts/devel libopts.spec,1.2,1.3 Message-ID: <200603192340.k2JNefhY028625@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/libopts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28587/devel Modified Files: libopts.spec Log Message: auto-import libopts-27.1-5 on branch devel from libopts-27.1-5.src.rpm Index: libopts.spec =================================================================== RCS file: /cvs/extras/rpms/libopts/devel/libopts.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libopts.spec 19 Mar 2006 18:05:05 -0000 1.2 +++ libopts.spec 19 Mar 2006 23:40:08 -0000 1.3 @@ -1,7 +1,7 @@ Summary: Options library for autogen Name: libopts Version: 27.1 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL or BSD Group: Development/Libraries Source: http://osdn.dl.sourceforge.net/autogen/%{name}-%{version}.tar.gz @@ -35,7 +35,7 @@ make DESTDIR=${RPM_BUILD_ROOT} install rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la rm -f ${RPM_BUILD_ROOT}%{_infodir}/libopts.txt* -rm -rf ${RPM_BUILD_ROOT}%{_infordir}/dir +rm -rf ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf ${RPM_BUILD_ROOT} @@ -64,6 +64,9 @@ %{_includedir}/autoopts %changelog +* Sun Mar 19 2006 Paul F. Johnson 27.1-5 +- Must learn to spell... must learn to spell... + * Sun Mar 19 2006 Paul F. Johnson 27.1-4 - Small patch to fix a build problem on the buildsys From fedora-extras-commits at redhat.com Sun Mar 19 23:47:46 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 19 Mar 2006 18:47:46 -0500 Subject: rpms/wine/FC-5 wine.spec,1.22,1.23 Message-ID: <200603192348.k2JNmIMs028741@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28709/FC-5 Modified Files: wine.spec Log Message: - bump for x86_64 inclusion Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- wine.spec 17 Mar 2006 13:29:02 -0000 1.22 +++ wine.spec 19 Mar 2006 23:47:46 -0000 1.23 @@ -2,7 +2,7 @@ Name: wine Version: 0.9.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -646,6 +646,10 @@ %{_libdir}/wine/*.def %changelog +* Mon Mar 20 2006 Andreas Bierfert +0.9.10-2 +- bump for x86_64 tree inclusion \o/ + * Thu Mar 16 2006 Andreas Bierfert 0.9.10-1 - version upgrade From fedora-extras-commits at redhat.com Sun Mar 19 23:47:52 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Sun, 19 Mar 2006 18:47:52 -0500 Subject: rpms/wine/devel wine.spec,1.22,1.23 Message-ID: <200603192348.k2JNmOh6028744@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wine/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28709/devel Modified Files: wine.spec Log Message: - bump for x86_64 inclusion Index: wine.spec =================================================================== RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- wine.spec 17 Mar 2006 13:29:08 -0000 1.22 +++ wine.spec 19 Mar 2006 23:47:51 -0000 1.23 @@ -2,7 +2,7 @@ Name: wine Version: 0.9.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A Windows 16/32/64 bit emulator Group: Applications/Emulators @@ -646,6 +646,10 @@ %{_libdir}/wine/*.def %changelog +* Mon Mar 20 2006 Andreas Bierfert +0.9.10-2 +- bump for x86_64 tree inclusion \o/ + * Thu Mar 16 2006 Andreas Bierfert 0.9.10-1 - version upgrade From fedora-extras-commits at redhat.com Mon Mar 20 00:58:53 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Sun, 19 Mar 2006 19:58:53 -0500 Subject: rpms/audacity/devel audacity-1.2.3-gcc41.patch, NONE, 1.1 audacity-1.2.4b-missing-pango.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 audacity.spec, 1.12, 1.13 sources, 1.4, 1.5 Message-ID: <200603200059.k2K0xP7q030983@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/audacity/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30942 Modified Files: .cvsignore audacity.spec sources Added Files: audacity-1.2.3-gcc41.patch audacity-1.2.4b-missing-pango.patch Log Message: sync with FC-5 branch audacity-1.2.3-gcc41.patch: --- NEW FILE audacity-1.2.3-gcc41.patch --- diff -Nur audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h --- audacity-src-1.2.3-orig/lib-src/soundtouch/include/SoundTouch.h 2004-11-18 07:17:35.000000000 +0100 +++ audacity-src-1.2.3/lib-src/soundtouch/include/SoundTouch.h 2006-03-17 21:26:04.000000000 +0100 @@ -146,7 +146,7 @@ static const char *getVersionString(); /// Get SoundTouch library version Id - static uint SoundTouch::getVersionId(); + static uint getVersionId(); /// Sets new rate control value. Normal rate = 1.0, smaller values /// represent slower rate, larger faster rates. audacity-1.2.4b-missing-pango.patch: --- NEW FILE audacity-1.2.4b-missing-pango.patch --- diff -Nur audacity-src-1.2.4b-orig/src/Makefile.in audacity-src-1.2.4b/src/Makefile.in --- audacity-src-1.2.4b-orig/src/Makefile.in 2005-11-27 03:33:31.000000000 +0100 +++ audacity-src-1.2.4b/src/Makefile.in 2006-03-17 23:46:15.000000000 +0100 @@ -28,7 +28,7 @@ EXTRAOBJS = @EXTRAOBJS@ OPTOBJS = @OPTOBJS@ -LIBS = @LIBS@ +LIBS = @LIBS@ -lpangox-1.0 EXTRATARGETS = @EXTRATARGETS@ ######################################## Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:04:07 -0000 1.2 +++ .cvsignore 20 Mar 2006 00:58:52 -0000 1.3 @@ -1 +1 @@ -audacity-src-1.2.1.tar.bz2 +audacity-src-1.2.4b.tar.gz Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/audacity.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- audacity.spec 21 May 2005 10:36:06 -0000 1.12 +++ audacity.spec 20 Mar 2006 00:58:52 -0000 1.13 @@ -1,28 +1,32 @@ Name: audacity -Version: 1.2.3 -Release: 5 +Version: 1.2.4 +Release: 0.1.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.3.tar.gz +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 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 %{?_with_mp3:BuildRequires: libmad-devel} -%{?_with_gtk1:BuildRequires: wxGTK-devel} -%{!?_with_gtk1:BuildRequires: wxGTK2-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 Requires(postun): desktop-file-utils # Compile options: # --with mp3 : enable mp3 support -# --with gtk1 : use GTK+ version of wxGTK, else GTK2 version +# --with gtk2 : use GTK+ 2.x version of wxGTK, else GTK+ 1.x version # --with portaudiov19 : enable version 19 of portaudio (disables portmixer) @@ -35,8 +39,10 @@ Linux/*BSD, MacOS, and Windows. %prep -%setup -q -n %{name}-src-%{version} +%setup -q -n %{name}-src-%{version}b %patch1 -p1 -b .aboutdialog +%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 for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp @@ -45,6 +51,13 @@ 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-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 @@ -98,6 +111,13 @@ %doc %{_datadir}/doc/* %changelog +* Fri Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b +- Update to 1.2.4b (stable release). +- Follow upstream recommendation and use the GTK+ 1.x wxGTK. + This is because of various issues with fonts/layout/behaviour. +- Build with compat-wxGTK-devel. +- Modify build section to find wx-2.4-config instead of wx-config. + * Fri May 20 2005 David Woodhouse - 1.2.3-5 - Bump release number again due to spurious build system failure and the fact that the build system seems to be ignoring repeated build Index: sources =================================================================== RCS file: /cvs/extras/rpms/audacity/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Dec 2004 16:24:36 -0000 1.4 +++ sources 20 Mar 2006 00:58:52 -0000 1.5 @@ -1 +1 @@ -dbfc1b401420aa694753d35acb5a8a28 audacity-src-1.2.3.tar.gz +37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz From fedora-extras-commits at redhat.com Mon Mar 20 02:44:37 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 21:44:37 -0500 Subject: rpms/cfitsio/FC-4 cfitsio.spec,1.11,1.12 Message-ID: <200603200245.k2K2jAjp002969@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2920/FC-4 Modified Files: cfitsio.spec Log Message: I know editing a changelog after the fact is wrong, but I had to get rid of the macros as they were screwing up many things. I originally thought that after the start of the changlog section, everything was treated as text and macros were not expanded. I was wrong. :-( Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-4/cfitsio.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- cfitsio.spec 19 Mar 2006 17:42:23 -0000 1.11 +++ cfitsio.spec 20 Mar 2006 02:44:37 -0000 1.12 @@ -70,7 +70,7 @@ %changelog * Sun Mar 19 2006 Matthew Truch - 3.006-4 -- Don't use %{buildroot} in %build, only in %_install as per +- Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 * Fri Mar 10 2006 Matthew Truch - 3.006-3 From fedora-extras-commits at redhat.com Mon Mar 20 02:44:44 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 21:44:44 -0500 Subject: rpms/cfitsio/FC-5 cfitsio.spec,1.12,1.13 Message-ID: <200603200245.k2K2jGlu002972@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2920/FC-5 Modified Files: cfitsio.spec Log Message: I know editing a changelog after the fact is wrong, but I had to get rid of the macros as they were screwing up many things. I originally thought that after the start of the changlog section, everything was treated as text and macros were not expanded. I was wrong. :-( Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-5/cfitsio.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cfitsio.spec 19 Mar 2006 17:42:29 -0000 1.12 +++ cfitsio.spec 20 Mar 2006 02:44:43 -0000 1.13 @@ -70,7 +70,7 @@ %changelog * Sun Mar 19 2006 Matthew Truch - 3.006-4 -- Don't use %{buildroot} in %build, only in %_install as per +- Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 * Fri Mar 10 2006 Matthew Truch - 3.006-3 From fedora-extras-commits at redhat.com Mon Mar 20 02:44:49 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Sun, 19 Mar 2006 21:44:49 -0500 Subject: rpms/cfitsio/devel cfitsio.spec,1.12,1.13 Message-ID: <200603200245.k2K2jLp3002975@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2920/devel Modified Files: cfitsio.spec Log Message: I know editing a changelog after the fact is wrong, but I had to get rid of the macros as they were screwing up many things. I originally thought that after the start of the changlog section, everything was treated as text and macros were not expanded. I was wrong. :-( Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cfitsio.spec 19 Mar 2006 17:42:35 -0000 1.12 +++ cfitsio.spec 20 Mar 2006 02:44:49 -0000 1.13 @@ -70,7 +70,7 @@ %changelog * Sun Mar 19 2006 Matthew Truch - 3.006-4 -- Don't use %{buildroot} in %build, only in %_install as per +- Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 * Fri Mar 10 2006 Matthew Truch - 3.006-3 From fedora-extras-commits at redhat.com Mon Mar 20 02:56:48 2006 From: fedora-extras-commits at redhat.com (Michael Thomas (wart)) Date: Sun, 19 Mar 2006 21:56:48 -0500 Subject: rpms/prboom/devel prboom-2.3.1-gamedir.patch,1.1,1.2 Message-ID: <200603200257.k2K2vKCl003001@cvs-int.fedora.redhat.com> Author: wart Update of /cvs/extras/rpms/prboom/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2981 Modified Files: prboom-2.3.1-gamedir.patch Log Message: Add freedoom to the in-game list of wads (Options -> Features -> Load Wad) prboom-2.3.1-gamedir.patch: Index: prboom-2.3.1-gamedir.patch =================================================================== RCS file: /cvs/extras/rpms/prboom/devel/prboom-2.3.1-gamedir.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- prboom-2.3.1-gamedir.patch 14 Mar 2006 19:30:09 -0000 1.1 +++ prboom-2.3.1-gamedir.patch 20 Mar 2006 02:56:47 -0000 1.2 @@ -1,6 +1,6 @@ diff -Naur prboom-2.3.1/configure prboom-2.3.1.new/configure ---- prboom-2.3.1/configure 2004-09-15 12:11:41.000000000 -0700 -+++ prboom-2.3.1.new/configure 2006-03-13 15:42:56.000000000 -0800 +--- prboom-2.3.1/configure 2006-03-19 18:45:36.000000000 -0800 ++++ prboom-2.3.1.new/configure 2006-03-18 08:59:30.000000000 -0800 @@ -1853,9 +1853,9 @@ @@ -13,10 +13,9 @@ fi cat >>confdefs.h <<_ACEOF #define DOOMWADDIR "$DOOMWADDIR" - diff -Naur prboom-2.3.1/src/d_main.c prboom-2.3.1.new/src/d_main.c ---- prboom-2.3.1/src/d_main.c 2006-03-08 18:41:07.000000000 -0800 -+++ prboom-2.3.1.new/src/d_main.c 2006-03-13 15:31:16.000000000 -0800 +--- prboom-2.3.1/src/d_main.c 2006-03-19 18:45:36.000000000 -0800 ++++ prboom-2.3.1.new/src/d_main.c 2006-03-18 08:59:35.000000000 -0800 @@ -158,6 +158,7 @@ "doom.wad", "doom1.wad", @@ -25,3 +24,14 @@ }; static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads; +diff -Naur prboom-2.3.1/src/mn_menus.c prboom-2.3.1.new/src/mn_menus.c +--- prboom-2.3.1/src/mn_menus.c 2004-09-15 12:09:48.000000000 -0700 ++++ prboom-2.3.1.new/src/mn_menus.c 2006-03-19 18:53:42.000000000 -0800 +@@ -425,6 +425,7 @@ + {it_title, FC_GOLD "load wad", NULL, "M_WAD"}, + {it_gap}, + {it_info, FC_GOLD "select iwad"}, ++ {it_runcmd, "Freedoom", "mn_iwad freedoom"}, + {it_runcmd, "Doom Shareware", "mn_iwad doom1"}, + {it_runcmd, "Doom", "mn_iwad doom"}, + {it_runcmd, "Ultimate Doom", "mn_iwad doomu"}, From fedora-extras-commits at redhat.com Mon Mar 20 03:07:02 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 19 Mar 2006 22:07:02 -0500 Subject: rpms/lucidlife/devel lucidlife.spec,1.5,1.6 Message-ID: <200603200307.k2K37a4g005047@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5027/devel Modified Files: lucidlife.spec Log Message: Update for new dist tag in Extras Development. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lucidlife.spec 16 Mar 2006 06:53:10 -0000 1.5 +++ lucidlife.spec 20 Mar 2006 03:07:02 -0000 1.6 @@ -1,6 +1,6 @@ Name: lucidlife Version: 0.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Conway's Life simulator Group: Amusements/Games @@ -58,6 +58,9 @@ %changelog +* Sun Mar 19 2006 Peter Gordon - 0.9-5 +- Rebuild for new dist tag in FE Devel. + * Wed Mar 15 2006 Peter Gordon - 0.9-4 - Rebuild for spec file fixes and email address change. From fedora-extras-commits at redhat.com Mon Mar 20 03:18:20 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 19 Mar 2006 22:18:20 -0500 Subject: rpms/lucidlife/FC-5 lucidlife.spec,1.5,1.6 Message-ID: <200603200318.k2K3IqYJ005246@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5214/FC-5 Modified Files: lucidlife.spec Log Message: Rebuild for new dist tag in FE Devel. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/FC-5/lucidlife.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lucidlife.spec 16 Mar 2006 06:53:10 -0000 1.5 +++ lucidlife.spec 20 Mar 2006 03:18:19 -0000 1.6 @@ -1,6 +1,6 @@ Name: lucidlife Version: 0.9 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A Conway's Life simulator Group: Amusements/Games @@ -58,6 +58,9 @@ %changelog +* Sun Mar 19 2006 Peter Gordon - 0.9-5 +- Rebuild for new dist tag in FE Devel. + * Wed Mar 15 2006 Peter Gordon - 0.9-4 - Rebuild for spec file fixes and email address change. From fedora-extras-commits at redhat.com Mon Mar 20 03:18:31 2006 From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon)) Date: Sun, 19 Mar 2006 22:18:31 -0500 Subject: rpms/lucidlife/devel lucidlife.spec,1.6,1.7 Message-ID: <200603200319.k2K3J4UG005249@cvs-int.fedora.redhat.com> Author: pgordon Update of /cvs/extras/rpms/lucidlife/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5214/devel Modified Files: lucidlife.spec Log Message: Rebuild for new dist tag in FE Devel. Index: lucidlife.spec =================================================================== RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- lucidlife.spec 20 Mar 2006 03:07:02 -0000 1.6 +++ lucidlife.spec 20 Mar 2006 03:18:31 -0000 1.7 @@ -1,6 +1,6 @@ Name: lucidlife Version: 0.9 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A Conway's Life simulator Group: Amusements/Games @@ -58,6 +58,9 @@ %changelog +* Sun Mar 19 2006 Peter Gordon - 0.9-6 +- Bump release due to CVS tagging not liking me. + * Sun Mar 19 2006 Peter Gordon - 0.9-5 - Rebuild for new dist tag in FE Devel. From fedora-extras-commits at redhat.com Mon Mar 20 04:21:17 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 19 Mar 2006 23:21:17 -0500 Subject: extras-buildsys/server Builder.py,1.31,1.32 Message-ID: <200603200421.k2K4LHbe007452@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7427/server Modified Files: Builder.py Log Message: Ping builders inactive at startup (#rh185514#) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- Builder.py 19 Feb 2006 06:28:52 -0000 1.31 +++ Builder.py 20 Mar 2006 04:21:09 -0000 1.32 @@ -102,6 +102,10 @@ (self._alive, target_list) = self._ping_builder() if self._alive: self._init_builder(target_list) + else: + # Treat the builder as timed out and ping it periodically + self._ping_timeout = time.time() + self._suspend_reason = SUSPEND_TIMEOUT def _init_builder(self, target_list): self._target_list = target_list From fedora-extras-commits at redhat.com Mon Mar 20 04:22:16 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 19 Mar 2006 23:22:16 -0500 Subject: extras-buildsys/server Builder.py,1.20.2.8,1.20.2.9 Message-ID: <200603200422.k2K4MG0Y007481@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7463/server Modified Files: Tag: STABLE_0_4 Builder.py Log Message: Ping builders inactive at startup (#rh185514#) Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.20.2.8 retrieving revision 1.20.2.9 diff -u -r1.20.2.8 -r1.20.2.9 --- Builder.py 19 Feb 2006 06:30:15 -0000 1.20.2.8 +++ Builder.py 20 Mar 2006 04:22:08 -0000 1.20.2.9 @@ -103,6 +103,10 @@ (self._alive, target_list) = self._ping_builder() if self._alive: self._init_builder(target_list) + else: + # Treat the builder as timed out and ping it periodically + self._ping_timeout = time.time() + self._suspend_reason = SUSPEND_TIMEOUT def _init_builder(self, target_list): self._target_list = target_list From fedora-extras-commits at redhat.com Mon Mar 20 05:59:02 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Mon, 20 Mar 2006 00:59:02 -0500 Subject: kadischi/ks_examples minimal-livecd.cfg,1.2,1.3 Message-ID: <200603200559.k2K5xWeJ009713@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/ks_examples In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9660/kadischi/ks_examples Modified Files: minimal-livecd.cfg Log Message: Various minor cleanups Index: minimal-livecd.cfg =================================================================== RCS file: /cvs/devel/kadischi/ks_examples/minimal-livecd.cfg,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- minimal-livecd.cfg 22 Aug 2005 20:34:15 -0000 1.2 +++ minimal-livecd.cfg 20 Mar 2006 05:59:00 -0000 1.3 @@ -19,6 +19,9 @@ # not guaranteed to work #clearpart --linux +# We shouldn't expect to be prompted when finished, let's not. +reboot + %packages %post From fedora-extras-commits at redhat.com Mon Mar 20 05:59:08 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Mon, 20 Mar 2006 00:59:08 -0500 Subject: kadischi/post_install_scripts 04auth.sh,1.1.1.1,1.2 Message-ID: <200603200559.k2K5xcoX009716@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9660/kadischi/post_install_scripts Modified Files: 04auth.sh Log Message: Various minor cleanups Index: 04auth.sh =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/04auth.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- 04auth.sh 21 Aug 2005 17:09:01 -0000 1.1.1.1 +++ 04auth.sh 20 Mar 2006 05:59:05 -0000 1.2 @@ -2,6 +2,11 @@ chroot $1 /usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth -chroot $1 /usr/sbin/lokkit --quiet --nostart -f --disabled - +# Don't disable a user's set firewall rules explicitly +fw_is_enabled=$(grep ^--enabled $1/etc/sysconfig/system-config-securitylevel) +if [ -n $fw_is_enabled ]; then + echo "Found an enabled firewall.." +else + chroot $1 /usr/sbin/lokkit --quiet --nostart -f --disabled +fi chroot $1 /usr/sbin/lokkit --quiet --nostart --selinux=disabled From fedora-extras-commits at redhat.com Mon Mar 20 05:59:13 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Mon, 20 Mar 2006 00:59:13 -0500 Subject: kadischi/rc rc.readonly-livecd,1.1.1.1,1.2 Message-ID: <200603200559.k2K5xh8h009720@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/rc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9660/kadischi/rc Modified Files: rc.readonly-livecd Log Message: Various minor cleanups Index: rc.readonly-livecd =================================================================== RCS file: /cvs/devel/kadischi/rc/rc.readonly-livecd,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- rc.readonly-livecd 21 Aug 2005 17:08:47 -0000 1.1.1.1 +++ rc.readonly-livecd 20 Mar 2006 05:59:11 -0000 1.2 @@ -38,7 +38,11 @@ mount_file /etc echo "Moving /etc/rc.d to /livecd/ramfs (we need this for safe shutdown)" - mv /etc/rc.d /livecd/ramfs/ + if [ ! ${INITRD_DBG} ]; then + mv /etc/rc.d /livecd/ramfs/ >/dev/null 2>&1 + else + mv /etc/rc.d /livecd/ramfs/ + fi ln -s /livecd/ramfs/rc.d /etc/rc.d # Can be changed by dhcp: @@ -70,4 +74,4 @@ *) from_init ;; -esac \ No newline at end of file +esac From fedora-extras-commits at redhat.com Mon Mar 20 09:36:31 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 20 Mar 2006 04:36:31 -0500 Subject: fedora-security/audit fc5,1.81,1.82 Message-ID: <200603200936.k2K9aVQ7018649@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18615 Modified Files: fc5 Log Message: Bring up to date with GOLD FC5 For each vuln marked backport or VULNERABLE look to see if fc5-gold version has changed from fc5-test3 if not, keep the same marking as before if it has, see if we've changed major version if we have not then keep backport marking, but check vuln check code to see if we've fixed this by version or backport Add missing new vulns Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.81 retrieving revision 1.82 diff -u -r1.81 -r1.82 --- fc5 14 Mar 2006 12:47:06 -0000 1.81 +++ fc5 20 Mar 2006 09:36:13 -0000 1.82 @@ -1,25 +1,17 @@ -Up to date CVE as of CVE email 20060313 -Up to date FC5 as of FC5-Test3 - -1. Removed packages with security issues that are no longer in FC5 -(iiimf, libungif, slocate) -2. Verified all marked as 'version', inc tricky packages like openssl -and httpd -3. Looked at those marked backport where we ship a newer version, manually -looked at rest marked backport -4. Looked at CVE for any new packages added to FC5 -5. Filed tracking bugs for vulnerable issues -6. Looked at extra packages in test2 which have had security issues -(mono, nss, php-pear) -7. Double check vulnerables and file fc5test2 bugs -8. Deal with new/removed packages in fc5test3 -9. Check all marked as backport/vulnerable to see what changed in test3 +Up to date CVE as of CVE email 20060319 +Up to date FC5 as of 20060320 ** are items that need attention +CVE-2006-1296 ** beagle +CVE-2006-1273 ** firefox (prob win only, vague) +CVE-2006-1251 ** exim +CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues +CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability +CVE-2006-1052 backport (kernel) patch-2.6.16-rc6 CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe @@ -27,23 +19,27 @@ CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) CVE-2006-0746 version (kdegraphics, fixed 3.4) -CVE-2006-0742 VULNERABLE (kernel) [fixed rawhide 1.2045] -CVE-2006-0741 VULNERABLE (kernel, fixed 2.6.15.5) [fixed rawhide 1.2045] +CVE-2006-0744 ** kernel +CVE-2006-0742 backport (kernel) patch-2.6.16-rc6 +CVE-2006-0741 backport (kernel, fixed 2.6.15.5) patch-2.6.16-rc6 CVE-2006-0730 version (dovecot, 1.0beta[12] only) CVE-2006-0678 ignore (postgresql) we don't build --enable-cassert 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-0557 VULNERABLE (kernel, fixed 2.6.15.6) [fixed rawhide 1.2045] +CVE-2006-0557 backport (kernel, fixed 2.6.15.6) patch-2.6.16-rc6 +CVE-2006-0555 backport (kernel) patch-2.6.16-rc6-git3 +CVE-2006-0554 backport (kernel) patch-2.6.16-rc6 CVE-2006-0553 version (postgresql, only 8.1, fixed 8.1.3) -CVE-2006-0528 VULNERABLE (cairo) bz#182416 [fixed rawhide cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch] +CVE-2006-0528 backport (cairo) cairo-1.0.2-chunk-glyphs-CVE-2006-0528.patch CVE-2006-0496 VULNERABLE (mozilla) not fixed upstream CVE-2006-0496 VULNERABLE (firefox) not fixed upstream CVE-2006-0482 ignore (kernel) sparc only CVE-2006-0481 version (libpng, 1.2.7 only) CVE-2006-0459 version (flex) by inspection +CVE-2006-0457 backport (kernel) patch-2.6.16-rc6 CVE-2006-0455 version (gnupg, fixed 1.4.2.1) -CVE-2006-0454 backport (kernel, fixed 2.6.15.3) patch-2.6.16-rc3 +CVE-2006-0454 backport (kernel, fixed 2.6.15.3) patch-2.6.16-rc6 CVE-2006-0405 version (libtiff, 3.8.0 only) CVE-2006-0377 version (squirrelmail, fixed 1.4.6) CVE-2006-0369 ignore (mysql) this is not a security issue @@ -76,7 +72,7 @@ CVE-2006-0292 version (firefox, fixed 1.5.1) CVE-2006-0292 backport (mozilla) mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch CVE-2006-0292 version (thunderbird, fixed 1.5) -CVE-2006-0254 backport (tomcat5, fixed 5.5.16) +CVE-2006-0254 backport (tomcat5, fixed 5.5.16) **check this** CVE-2006-0236 ignore (thunderbird) windows only CVE-2006-0225 version (openssh, fixed 4.3p2) CVE-2006-0208 version (php, fixed 5.1.2) @@ -88,21 +84,21 @@ CVE-2006-0144 version (php-pear, not 1.4.4) CVE-2006-0097 ignore (php) Windows only CVE-2006-0096 ignore (kernel) minor and requires root -CVE-2006-0095 backport (kernel) patch-2.6.16-rc3 +CVE-2006-0095 backport (kernel) patch-2.6.16-rc6 CVE-2006-0082 version (ImageMagick, not 6.2.5.4) -CVE-2006-0049 VULNERABLE (gnupg, fixed 1.4.2.2) +CVE-2006-0049 version (gnupg, fixed 1.4.2.2) CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix -CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 -CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 -CVE-2006-0035 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc3 +CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 +CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 +CVE-2006-0035 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 CVE-2006-0019 version (kdelibs, fixed 3.5.1) CVE-2005-4703 ignore (tomcat) windows only CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS CVE-2005-4720 version (firefox, fixed 1.5) -CVE-2005-4720 versoin (thunderbird, fixed 1.5) +CVE-2005-4720 version (thunderbird, fixed 1.5) CVE-2005-4685 VULNERABLE (mozilla) not fixed upstream CVE-2005-4685 VULNERABLE (firefox) not fixed upstream -CVE-2005-4684 VULNERABLE (kdebase) not fixed upstream +CVE-2005-4684 ignore (kdebase) not fixed upstream, low, can't fix CVE-2005-4667 backport (unzip) CVE-2005-4639 version (kernel, fixed 2.6.15) CVE-2005-4636 version (openoffice.org, fixed 2.0.1) @@ -186,7 +182,7 @@ CVE-2005-3359 version (kernel, fixed 2.6.14) CVE-2005-3358 version (kernel, fixed 2.6.11) CVE-2005-3357 backport (httpd, affects 2.2.0) -CVE-2005-3356 backport (kernel) patch-2.6.16-rc3 +CVE-2005-3356 backport (kernel) patch-2.6.16-rc6 CVE-2005-3353 version (php, not 5.0) CVE-2005-3352 backport (httpd, fixed 2.2.1) CVE-2005-3351 version (spamassassin, fixed 3.1.0) @@ -269,7 +265,7 @@ CVE-2005-2917 version (squid, fixed 2.5.STABLE11) CVE-2005-2876 version (util-linux, fixed 2.13-pre3) CVE-2005-2874 version (cups, fixed 1.1.23) -CVE-2005-2873 VULNERABLE (kernel) not fixed upstream +CVE-2005-2873 VULNERABLE (kernel) not fixed upstream CVE-2005-2872 version (kernel, fixed 2.6.12) CVE-2005-2871 version (thunderbird) CVE-2005-2871 version (mozilla, fixed 1.7.12) @@ -1386,7 +1382,7 @@ CVE-2003-0133 version (evolution, fixed 1.2.4) CVE-2003-0132 version (httpd, fixed 2.0.45) CVE-2003-0131 version (openssl, not 0.9.8) -CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) +CVE-2003-0131 backport (openssl097a, fixed 0.9.7b) CVE-2003-0130 version (evolution, fixed 1.2.3) CVE-2003-0129 version (evolution, fixed 1.2.3) CVE-2003-0128 version (evolution, fixed 1.2.3) From fedora-extras-commits at redhat.com Mon Mar 20 11:31:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 20 Mar 2006 06:31:07 -0500 Subject: rpms/TeXmacs/FC-5 TeXmacs-gcc41.patch, NONE, 1.1 TeXmacs.spec, 1.31, 1.32 Message-ID: <200603201131.k2KBVdMe023248@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23226 Modified Files: TeXmacs.spec Added Files: TeXmacs-gcc41.patch Log Message: TeXmacs-gcc41.patch: --- NEW FILE TeXmacs-gcc41.patch --- --- TeXmacs-1.0.6-src/src/Classes/Atomic/parse_string.hpp.gcc41 2006-03-20 11:50:54.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Classes/Atomic/parse_string.hpp 2006-03-20 11:51:11.000000000 +0100 @@ -48,4 +48,7 @@ }; CONCRETE_CODE(parse_string); +ostream& operator << (ostream& out, parse_string s); +bool test (parse_string s, string what); + #endif // defined PARSE_STRING_H --- TeXmacs-1.0.6-src/src/Typeset/Bridge/bridge.hpp.gcc41 2006-03-20 11:06:55.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/Bridge/bridge.hpp 2006-03-20 11:12:06.000000000 +0100 @@ -76,6 +76,7 @@ ostream& operator << (ostream& out, bridge br); extern bridge nil_bridge; tree substitute (tree t, path p, tree u); +bridge make_bridge (typesetter ttt, tree st, path ip); #include "impl_typesetter.hpp" --- TeXmacs-1.0.6-src/src/Typeset/Concat/concater.hpp.gcc41 2006-03-20 11:15:45.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/Concat/concater.hpp 2006-03-20 11:16:02.000000000 +0100 @@ -171,4 +171,10 @@ typedef concater_rep* concater; +box typeset_as_box (edit_env env, tree t, path ip); +array typeset_concat (edit_env env, tree t, path ip); +array typeset_concat_range (edit_env env, tree t, path ip, + int i1, int i2); +array typeset_marker (edit_env env, path ip); + #endif // defined CONCATER_H --- TeXmacs-1.0.6-src/src/Typeset/env.hpp.gcc41 2006-03-20 11:46:28.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/env.hpp 2006-03-20 11:46:41.000000000 +0100 @@ -434,4 +434,6 @@ void extract_format (tree fm, tree* r, int n); tree load_inclusion (url u); // implemented in tm_file.cpp +ostream& operator << (ostream& out, edit_env env); + #endif // defined ENV_H --- TeXmacs-1.0.6-src/src/Typeset/boxes.hpp.gcc41 2006-03-20 11:47:20.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/boxes.hpp 2006-03-20 11:47:51.000000000 +0100 @@ -314,4 +314,6 @@ attach_dip(t,decorate_middle(ip)),decorate_middle(ip) #define attach_right(t,ip) attach_dip(t,decorate_right(ip)),decorate_right(ip) +void make_eps (url dest, ::display dis, box b, int dpi); + #endif // defined BOXES_H --- TeXmacs-1.0.6-src/src/Window/ps_device.hpp.gcc41 2006-03-20 11:18:08.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Window/ps_device.hpp 2006-03-20 11:18:24.000000000 +0100 @@ -102,4 +102,9 @@ virtual void apply_shadow (SI x1, SI y1, SI x2, SI y2) = 0; }; + void abs_round (SI& l); + void abs_round (SI& x, SI& y); + void abs_inner_round (SI& x1, SI& y1, SI& x2, SI& y2); + void abs_outer_round (SI& x1, SI& y1, SI& x2, SI& y2); + #endif // defined PS_DEVICE_H Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/FC-5/TeXmacs.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- TeXmacs.spec 17 Feb 2006 23:47:44 -0000 1.31 +++ TeXmacs.spec 20 Mar 2006 11:31:06 -0000 1.32 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -10,6 +10,7 @@ Patch0: TeXmacs-maxima.patch Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch +Patch3: TeXmacs-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex @@ -51,6 +52,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -151,8 +153,11 @@ %changelog +* Mon Mar 20 2006 Gerard Milmeister - 1.0.6-6 +- fix problems with gcc41 (TeXmacs-gcc41.patch) + * Sat Feb 18 2006 Gerard Milmeister - 1.0.6-4 -- Temporary fix for compiling problem +- Temporary fix for compiling problem (TeXmacs-event.patch) * Fri Feb 17 2006 Gerard Milmeister - 1.0.6-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon Mar 20 11:32:58 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Mon, 20 Mar 2006 06:32:58 -0500 Subject: rpms/TeXmacs/devel TeXmacs-gcc41.patch, NONE, 1.1 TeXmacs.spec, 1.31, 1.32 Message-ID: <200603201133.k2KBXUuZ023324@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/TeXmacs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23304 Modified Files: TeXmacs.spec Added Files: TeXmacs-gcc41.patch Log Message: TeXmacs-gcc41.patch: --- NEW FILE TeXmacs-gcc41.patch --- --- TeXmacs-1.0.6-src/src/Classes/Atomic/parse_string.hpp.gcc41 2006-03-20 11:50:54.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Classes/Atomic/parse_string.hpp 2006-03-20 11:51:11.000000000 +0100 @@ -48,4 +48,7 @@ }; CONCRETE_CODE(parse_string); +ostream& operator << (ostream& out, parse_string s); +bool test (parse_string s, string what); + #endif // defined PARSE_STRING_H --- TeXmacs-1.0.6-src/src/Typeset/Bridge/bridge.hpp.gcc41 2006-03-20 11:06:55.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/Bridge/bridge.hpp 2006-03-20 11:12:06.000000000 +0100 @@ -76,6 +76,7 @@ ostream& operator << (ostream& out, bridge br); extern bridge nil_bridge; tree substitute (tree t, path p, tree u); +bridge make_bridge (typesetter ttt, tree st, path ip); #include "impl_typesetter.hpp" --- TeXmacs-1.0.6-src/src/Typeset/Concat/concater.hpp.gcc41 2006-03-20 11:15:45.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/Concat/concater.hpp 2006-03-20 11:16:02.000000000 +0100 @@ -171,4 +171,10 @@ typedef concater_rep* concater; +box typeset_as_box (edit_env env, tree t, path ip); +array typeset_concat (edit_env env, tree t, path ip); +array typeset_concat_range (edit_env env, tree t, path ip, + int i1, int i2); +array typeset_marker (edit_env env, path ip); + #endif // defined CONCATER_H --- TeXmacs-1.0.6-src/src/Typeset/env.hpp.gcc41 2006-03-20 11:46:28.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/env.hpp 2006-03-20 11:46:41.000000000 +0100 @@ -434,4 +434,6 @@ void extract_format (tree fm, tree* r, int n); tree load_inclusion (url u); // implemented in tm_file.cpp +ostream& operator << (ostream& out, edit_env env); + #endif // defined ENV_H --- TeXmacs-1.0.6-src/src/Typeset/boxes.hpp.gcc41 2006-03-20 11:47:20.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Typeset/boxes.hpp 2006-03-20 11:47:51.000000000 +0100 @@ -314,4 +314,6 @@ attach_dip(t,decorate_middle(ip)),decorate_middle(ip) #define attach_right(t,ip) attach_dip(t,decorate_right(ip)),decorate_right(ip) +void make_eps (url dest, ::display dis, box b, int dpi); + #endif // defined BOXES_H --- TeXmacs-1.0.6-src/src/Window/ps_device.hpp.gcc41 2006-03-20 11:18:08.000000000 +0100 +++ TeXmacs-1.0.6-src/src/Window/ps_device.hpp 2006-03-20 11:18:24.000000000 +0100 @@ -102,4 +102,9 @@ virtual void apply_shadow (SI x1, SI y1, SI x2, SI y2) = 0; }; + void abs_round (SI& l); + void abs_round (SI& x, SI& y); + void abs_inner_round (SI& x1, SI& y1, SI& x2, SI& y2); + void abs_outer_round (SI& x1, SI& y1, SI& x2, SI& y2); + #endif // defined PS_DEVICE_H Index: TeXmacs.spec =================================================================== RCS file: /cvs/extras/rpms/TeXmacs/devel/TeXmacs.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- TeXmacs.spec 17 Feb 2006 23:47:44 -0000 1.31 +++ TeXmacs.spec 20 Mar 2006 11:32:58 -0000 1.32 @@ -1,6 +1,6 @@ Name: TeXmacs Version: 1.0.6 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Structured wysiwyg scientific text editor Group: Applications/Editors @@ -10,6 +10,7 @@ Patch0: TeXmacs-maxima.patch Patch1: TeXmacs-inline.patch Patch2: TeXmacs-event.patch +Patch3: TeXmacs-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: tetex, tetex-fonts, ghostscript Buildrequires: guile-devel, desktop-file-utils, tetex @@ -51,6 +52,7 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 perl -pi -e "s|LDPATH = \@CONFIG_BPATH\@|LDPATH =|" src/makefile.in @@ -151,8 +153,11 @@ %changelog +* Mon Mar 20 2006 Gerard Milmeister - 1.0.6-6 +- fix problems with gcc41 (TeXmacs-gcc41.patch) + * Sat Feb 18 2006 Gerard Milmeister - 1.0.6-4 -- Temporary fix for compiling problem +- Temporary fix for compiling problem (TeXmacs-event.patch) * Fri Feb 17 2006 Gerard Milmeister - 1.0.6-3 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Mon Mar 20 12:23:55 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Mon, 20 Mar 2006 07:23:55 -0500 Subject: rpms/libsexy/FC-5 .cvsignore, 1.6, 1.7 libsexy.spec, 1.7, 1.8 sources, 1.6, 1.7 Message-ID: <200603201224.k2KCORxv025560@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/libsexy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25539 Modified Files: .cvsignore libsexy.spec sources Log Message: Upstream update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsexy/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 16 Mar 2006 08:10:12 -0000 1.6 +++ .cvsignore 20 Mar 2006 12:23:54 -0000 1.7 @@ -1 +1 @@ -libsexy-0.1.7.tar.gz +libsexy-0.1.8.tar.gz Index: libsexy.spec =================================================================== RCS file: /cvs/extras/rpms/libsexy/FC-5/libsexy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libsexy.spec 16 Mar 2006 08:10:12 -0000 1.7 +++ libsexy.spec 20 Mar 2006 12:23:54 -0000 1.8 @@ -1,5 +1,5 @@ Name: libsexy -Version: 0.1.7 +Version: 0.1.8 Release: 1%{?dist} Summary: Funky fresh graphical widgets for GTK+ 2 @@ -9,7 +9,8 @@ Source0: http://releases.chipx86.com/libsexy/libsexy/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: gtk2-devel libxml2-devel enchant-devel +BuildRequires: gtk2-devel libxml2-devel +Requires: enchant %description Some funky fresh graphical widgets for GTK+ 2 applications. @@ -55,6 +56,9 @@ %{_libdir}/pkgconfig/%{name}.pc %changelog +* Mon Mar 20 2006 Ignacio Vazquez-Abrams 0.1.8-1 +- Upstream update + * Thu Mar 16 2006 Ignacio Vazquez-Abrams 0.1.7-1 - Upstream update Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsexy/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 16 Mar 2006 08:10:12 -0000 1.6 +++ sources 20 Mar 2006 12:23:54 -0000 1.7 @@ -1 +1 @@ -227df7c2d7ca421f41cef12c98b1e40f libsexy-0.1.7.tar.gz +ddc52cc8196f9f0bf48a5c7569b6bb38 libsexy-0.1.8.tar.gz From fedora-extras-commits at redhat.com Mon Mar 20 12:32:25 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 20 Mar 2006 07:32:25 -0500 Subject: rpms/yumex/FC-5 sources,1.20,1.21 yumex.spec,1.21,1.22 Message-ID: <200603201232.k2KCWvM1025673@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25637/FC-5 Modified Files: sources yumex.spec Log Message: Release 0.99.13 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 13 Mar 2006 15:40:53 -0000 1.20 +++ sources 20 Mar 2006 12:32:25 -0000 1.21 @@ -1 +1 @@ -13564e96536b7e935ea5ee16eece3d3c yumex-0.99.12.tar.gz +cfad88b2e83aafa6f7523ea037ec2731 yumex-0.99.13.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- yumex.spec 13 Mar 2006 15:40:53 -0000 1.21 +++ yumex.spec 20 Mar 2006 12:32:25 -0000 1.22 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.12 +Version: 0.99.13 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,9 +65,11 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 +- Development Release 0.99.13-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 - Development Release 0.99.12-1.0 -- Added '-q' option to setup +- Added '-q' option to %%setup * Tue Feb 28 2006 Tim Lauridsen - 0.99.11-1.0 - Development Release 0.99.11-1.0 * Tue Feb 15 2006 Tim Lauridsen - 0.99.10-1.0 From fedora-extras-commits at redhat.com Mon Mar 20 12:32:31 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Mon, 20 Mar 2006 07:32:31 -0500 Subject: rpms/yumex/devel .cvsignore, 1.17, 1.18 sources, 1.20, 1.21 yumex.spec, 1.21, 1.22 Message-ID: <200603201233.k2KCX3sI025678@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25637/devel Modified Files: .cvsignore sources yumex.spec Log Message: Release 0.99.13 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 Mar 2006 15:40:53 -0000 1.17 +++ .cvsignore 20 Mar 2006 12:32:30 -0000 1.18 @@ -1 +1 @@ -yumex-0.99.12.tar.gz +yumex-0.99.13.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- sources 13 Mar 2006 15:40:53 -0000 1.20 +++ sources 20 Mar 2006 12:32:30 -0000 1.21 @@ -1 +1 @@ -13564e96536b7e935ea5ee16eece3d3c yumex-0.99.12.tar.gz +cfad88b2e83aafa6f7523ea037ec2731 yumex-0.99.13.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- yumex.spec 13 Mar 2006 15:40:53 -0000 1.21 +++ yumex.spec 20 Mar 2006 12:32:30 -0000 1.22 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.12 +Version: 0.99.13 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,9 +65,11 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 +- Development Release 0.99.13-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 - Development Release 0.99.12-1.0 -- Added '-q' option to setup +- Added '-q' option to %%setup * Tue Feb 28 2006 Tim Lauridsen - 0.99.11-1.0 - Development Release 0.99.11-1.0 * Tue Feb 15 2006 Tim Lauridsen - 0.99.10-1.0 From fedora-extras-commits at redhat.com Mon Mar 20 12:43:28 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:43:28 -0500 Subject: extras-buildsys/server Builder.py, 1.32, 1.33 BuilderManager.py, 1.19, 1.20 Config.py, 1.13, 1.14 Message-ID: <200603201243.k2KChSDo025797@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25775/server Modified Files: Builder.py BuilderManager.py Config.py Log Message: 2006-03-20 Dan Williams * server/Config.py - Change config file format for builders. Each builder is now listed on a different line like this: builder1 = 20 https://127.0.0.1:8888 Each builder's tag (what's before the = sign) must start with 'builder'. The number right after the = is the builder's weight, or preference. Higher numbers mean the builder is more likely to be used. * server/BuilderManager.py - Use builder weights when picking which builder to use for a job * server/Builder.py - Add accessort for builder weight Index: Builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- Builder.py 20 Mar 2006 04:21:09 -0000 1.32 +++ Builder.py 20 Mar 2006 12:43:21 -0000 1.33 @@ -67,7 +67,7 @@ _BUILDER_PING_INTERVAL = 60 * 5 # In seconds - def __init__(self, manager, cfg, address): + def __init__(self, manager, cfg, address, weight): self._cur_jobid = None self._manager = manager self._jobs = {} @@ -85,6 +85,7 @@ self._ping_now = False self._when_died = 0 self._server_cfg = cfg + self._weight = weight certs = None if self._server_cfg.get_bool("Builders", "use_ssl"): @@ -201,6 +202,9 @@ def free_slots(self): return self._free_slots + + def weight(self): + return self._weight def start_job(self, par_job, target_dict, srpm_url): if not self.available(): Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- BuilderManager.py 26 Nov 2005 06:10:22 -0000 1.19 +++ BuilderManager.py 20 Mar 2006 12:43:21 -0000 1.20 @@ -55,6 +55,7 @@ del builder_dict print string print "" + os._exit(1) self._queue_lock = threading.Lock() self._queue = [] @@ -72,21 +73,23 @@ def add_new_builders(self): self._builders_lock.acquire() - builder_list = [] - tmp_list = self._cfg.get_list("Builders", "builders") + tmp_list = self._cfg.builders() prefix = "http://" if self._cfg.get_bool("Builders", "use_ssl") == True: prefix = "https://" - for addr in tmp_list: + + builder_list = {} + for addr in tmp_list.keys(): + new_addr = addr # Rewrite addresses to match current builder connection method if addr.startswith("http://"): - addr = addr[7:] + new_addr = addr[7:] elif addr.startswith("https://"): - addr = addr[8:] - - builder_list.append(prefix + addr) + new_addr = addr[8:] + if new_addr: + builder_list[prefix + new_addr] = tmp_list[addr] - for address in builder_list: + for address in builder_list.keys(): # If the address is already in our _builders list, skip it skip = False for builder in self._builders: @@ -96,7 +99,8 @@ continue # Add the builder to our build list - builder = Builder.Builder(self, self._cfg, address) + weight = builder_list[address] + builder = Builder.Builder(self, self._cfg, address, weight) builder.start() self._builders.append(builder) @@ -124,15 +128,26 @@ return True return self._have_work - def _builder_sort_func(self, builder): - return builder.free_slots() - def _builder_cmp_func(self, builder1, builder2): - if builder1.free_slots() > builder2.free_slots(): + # If both builders have at least one free slot, sort on + # weight, not free slots + b1_free = builder1.free_slots() + b2_free = builder2.free_slots() + if b1_free > 0 and b2_free > 0: + b1_weight = builder1.weight() + b2_weight = builder2.weight() + # Equal weight case falls through to + # sort on free slots + if b1_weight > b2_weight: + return 1 + elif b1_weight < b2_weight: + return -1 + + if b1_free > b2_free: return 1 - elif builder1.free_slots() == builder2.free_slots(): + elif b1_free == b2_free: return 0 - elif builder1.free_slots() < builder2.free_slots(): + elif b1_free < b2_free: return -1 return 1 @@ -154,22 +169,21 @@ continue # Find all free builders that could satisfy the request - builder_list = [] + possible_builders = [] for builder in self._builders: if builder.available() and builder.can_build_for_target(req['target_dict']): - builder_list.append(builder) + possible_builders.append(builder) - # Use the builder with the most free build slots - if sys.version_info[:3] >= (2, 4, 0): - builder_list.sort(key=self._builder_sort_func, reverse=True) - else: - builder_list.sort(self._builder_cmp_func) - builder_list.reverse() + # Sort builder list by free slots and weights + possible_builders.sort(self._builder_cmp_func) + possible_builders.reverse() - for builder in builder_list: + for builder in possible_builders: try: job = builder.start_job(parent, req['target_dict'], req['srpm_url']) - except RuntimeError: + except RuntimeError, e: + print "Builder (%s) couldn't start job %s because: '%s'" % (builder.address(), + req['target_dict'], e) continue if not new_jobs.has_key(parent): Index: Config.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- Config.py 13 Mar 2006 03:45:48 -0000 1.13 +++ Config.py 20 Mar 2006 12:43:21 -0000 1.14 @@ -39,10 +39,14 @@ self._targets = [] self._target_strings = {} self._target_aliases = {} + self._builders = self._load_builders() def targets(self): return self._targets + def builders(self): + return self._builders + def resolve_target_user_alias(self, user_alias): try: cfg = self._target_aliases[user_alias.lower()] @@ -91,7 +95,30 @@ try: self._add_target(target_cfg) except InvalidTargetException, e: - print "Error: could not add target %s because: %s" % (f, e) + print "Error: could not add target %s because: %s" % (f, e) + + def _load_builders(self): + if not self._config.has_section("Builders"): + return {} + items = self._config.items("Builders") + print items + builder_list = {} + for (tag, builder) in items: + if not tag.startswith("builder"): + continue + weight = 0 + weight_str = "0" + addr = None + try: + (weight_str, addr) = builder.split() + except ValueError: + pass + try: + weight = int(weight_str) + except ValueError: + weight = 0 + builder_list[addr] = weight + return builder_list def save_default_config(self, filename=None): self.add_section("General") @@ -113,7 +140,8 @@ self.add_section("Builders") self.set_option("Builders", "use_ssl", "yes") - self.set_option("Builders", "builders", "127.0.0.1:8888") + self.set_option("Builders", "0 builder1", "127.0.0.1:8888") + self.set_option("Builders", "10 builder2", "127.0.0.2:8888") self.add_section("SSL") self.set_option("SSL", "server_key_and_cert", "/etc/plague/server/certs/server_key_and_cert.pem") From fedora-extras-commits at redhat.com Mon Mar 20 12:44:28 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:44:28 -0500 Subject: extras-buildsys ChangeLog,1.175,1.176 Message-ID: <200603201244.k2KCiS7l025828@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25808 Modified Files: ChangeLog Log Message: 2006-03-20 Dan Williams * server/Config.py - Change config file format for builders. Each builder is now listed on a different line like this: builder1 = 20 https://127.0.0.1:8888 Each builder's tag (what's before the = sign) must start with 'builder'. The number right after the = is the builder's weight, or preference. Higher numbers mean the builder is more likely to be used. * server/BuilderManager.py - Use builder weights when picking which builder to use for a job * server/Builder.py - Add accessort for builder weight Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- ChangeLog 13 Mar 2006 15:19:21 -0000 1.175 +++ ChangeLog 20 Mar 2006 12:44:20 -0000 1.176 @@ -1,3 +1,19 @@ +2006-03-20 Dan Williams + + * server/Config.py + - Change config file format for builders. Each builder is now listed on + a different line like this: builder1 = 20 https://127.0.0.1:8888 + Each builder's tag (what's before the = sign) must start with + 'builder'. The number right after the = is the builder's + weight, or preference. Higher numbers mean the builder is more + likely to be used. + + * server/BuilderManager.py + - Use builder weights when picking which builder to use for a job + + * server/Builder.py + - Add accessort for builder weight + 2006-03-13 Dan Williams * builder/builder.py From fedora-extras-commits at redhat.com Mon Mar 20 12:47:08 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:47:08 -0500 Subject: extras-buildsys/server ArchJob.py,1.26,1.27 Message-ID: <200603201247.k2KCl8Ne025921@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25853/server Modified Files: ArchJob.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- ArchJob.py 23 Feb 2006 19:13:48 -0000 1.26 +++ ArchJob.py 20 Mar 2006 12:47:01 -0000 1.27 @@ -215,7 +215,7 @@ dl_dict[DL_WAIT_TIME] = 0 self._downloads[uf] = dl_dict - def dl_callback(self, status, cb_data): + def dl_callback(self, status, cb_data, err_msg): url = cb_data self._download_lock.acquire() dl_dict = self._downloads[url] @@ -226,8 +226,8 @@ if dl_dict[DL_RETRIES] >= 10: dl_dict[DL_STATUS] = STATUS_ERROR else: - print "%s (%s/%s): Failed to retrieve %s (attempt %d), trying again..." % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES]) + print "%s (%s/%s): Failed to retrieve %s (attempt %d) (Error %s), trying again..." % (self.par_job.uid, + self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES], err_msg) dl_dict[DL_STATUS] = STATUS_WAITING dl_dict[DL_WAIT_TIME] = 5 # Wait a bit before trying again dl_dict[DL_RETRIES] = dl_dict[DL_RETRIES] + 1 From fedora-extras-commits at redhat.com Mon Mar 20 12:46:52 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:46:52 -0500 Subject: extras-buildsys ChangeLog,1.176,1.177 Message-ID: <200603201247.k2KClMRw025924@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25853 Modified Files: ChangeLog Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- ChangeLog 20 Mar 2006 12:44:20 -0000 1.176 +++ ChangeLog 20 Mar 2006 12:46:44 -0000 1.177 @@ -1,5 +1,14 @@ 2006-03-20 Dan Williams + * common/FileDownloader.py + - Pass error message to download callback + + * builder/builder.py + server/ArchJob.py + - Print out download errors, if any + +2006-03-20 Dan Williams + * server/Config.py - Change config file format for builders. Each builder is now listed on a different line like this: builder1 = 20 https://127.0.0.1:8888 From fedora-extras-commits at redhat.com Mon Mar 20 12:46:57 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:46:57 -0500 Subject: extras-buildsys/builder builder.py,1.53,1.54 Message-ID: <200603201247.k2KClR9q025929@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25853/builder Modified Files: builder.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- builder.py 13 Mar 2006 15:19:27 -0000 1.53 +++ builder.py 20 Mar 2006 12:46:50 -0000 1.54 @@ -169,7 +169,7 @@ sys.stdout.write(s + string) sys.stdout.flush() - def dl_callback(self, dl_status, cb_data): + def dl_callback(self, dl_status, cb_data, err_msg): url = cb_data if dl_status == 'done': self._status = 'downloaded' @@ -187,7 +187,7 @@ else: # retry the download self._status = 'init' - self._log("ERROR: Failed to retrieve %s on attempt %d. Trying again...\n" % (url, self._srpm_tries)) + self._log("ERROR: Failed to retrieve %s on attempt %d (%s). Trying again...\n" % (url, self._srpm_tries, err_msg)) def _copy_mock_output_to_log(self): if self._mock_log and os.path.exists(self._mock_log): From fedora-extras-commits at redhat.com Mon Mar 20 12:47:03 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:47:03 -0500 Subject: extras-buildsys/common FileDownloader.py,1.16,1.17 Message-ID: <200603201247.k2KClXQE025935@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25853/common Modified Files: FileDownloader.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- FileDownloader.py 18 Nov 2005 15:11:27 -0000 1.16 +++ FileDownloader.py 20 Mar 2006 12:46:55 -0000 1.17 @@ -94,6 +94,7 @@ def run(self): result = None + err_msg = None if self._url and self._target_dir and self._filename: if not os.path.exists(self._target_dir): os.makedirs(self._target_dir) @@ -105,16 +106,16 @@ # if CommonErrors.canIgnoreSSLError(e): # pass except socket.error, e: - if CommonErrors.canIgnoreSocketError(e): - pass + if not CommonErrors.canIgnoreSocketError(e): + err_msg = "Socket Error: %s" % e except IOError, e: - if CommonErrors.canIgnoreSocketError(e): - pass + if not CommonErrors.canIgnoreSocketError(e): + err_msg = "IOError Error: %s" % e if result: - self._callback('done', self._cb_data) + self._callback('done', self._cb_data, err_msg) else: - self._callback('failed', self._cb_data) + self._callback('failed', self._cb_data, err_msg) From fedora-extras-commits at redhat.com Mon Mar 20 12:48:57 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:48:57 -0500 Subject: extras-buildsys/server ArchJob.py,1.16.2.9,1.16.2.10 Message-ID: <200603201248.k2KCmvRK026012@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25946/server Modified Files: Tag: STABLE_0_4 ArchJob.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: ArchJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/ArchJob.py,v retrieving revision 1.16.2.9 retrieving revision 1.16.2.10 diff -u -r1.16.2.9 -r1.16.2.10 --- ArchJob.py 23 Feb 2006 19:14:49 -0000 1.16.2.9 +++ ArchJob.py 20 Mar 2006 12:48:49 -0000 1.16.2.10 @@ -196,7 +196,7 @@ dl_dict[DL_WAIT_TIME] = 0 self._downloads[uf] = dl_dict - def dl_callback(self, status, cb_data): + def dl_callback(self, status, cb_data, err_msg): url = cb_data self._download_lock.acquire() dl_dict = self._downloads[url] @@ -207,8 +207,8 @@ if dl_dict[DL_RETRIES] >= 10: dl_dict[DL_STATUS] = STATUS_ERROR else: - print "%s (%s/%s): Failed to retrieve %s (attempt %d), trying again..." % (self.par_job.uid, - self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES]) + print "%s (%s/%s): Failed to retrieve %s (attempt %d) (Error %s), trying again..." % (self.par_job.uid, + self.par_job.package, self._target_dict['arch'], url, dl_dict[DL_RETRIES], err_msg) dl_dict[DL_STATUS] = STATUS_WAITING dl_dict[DL_WAIT_TIME] = 5 # Wait a bit before trying again dl_dict[DL_RETRIES] = dl_dict[DL_RETRIES] + 1 From fedora-extras-commits at redhat.com Mon Mar 20 12:48:40 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:48:40 -0500 Subject: extras-buildsys ChangeLog,1.126.2.45,1.126.2.46 Message-ID: <200603201249.k2KCnBlP026015@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25946 Modified Files: Tag: STABLE_0_4 ChangeLog Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.45 retrieving revision 1.126.2.46 diff -u -r1.126.2.45 -r1.126.2.46 --- ChangeLog 13 Mar 2006 15:17:43 -0000 1.126.2.45 +++ ChangeLog 20 Mar 2006 12:48:33 -0000 1.126.2.46 @@ -1,3 +1,12 @@ +2006-03-20 Dan Williams + + * common/FileDownloader.py + - Pass error message to download callback + + * builder/builder.py + server/ArchJob.py + - Print out download errors, if any + 2006-03-13 Dan Williams * Release of 0.4.4.1 From fedora-extras-commits at redhat.com Mon Mar 20 12:48:46 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:48:46 -0500 Subject: extras-buildsys/builder builder.py,1.44.2.9,1.44.2.10 Message-ID: <200603201249.k2KCnGTU026018@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/builder In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25946/builder Modified Files: Tag: STABLE_0_4 builder.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: builder.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/builder/builder.py,v retrieving revision 1.44.2.9 retrieving revision 1.44.2.10 diff -u -r1.44.2.9 -r1.44.2.10 --- builder.py 13 Mar 2006 15:17:49 -0000 1.44.2.9 +++ builder.py 20 Mar 2006 12:48:38 -0000 1.44.2.10 @@ -169,7 +169,7 @@ sys.stdout.write(s + string) sys.stdout.flush() - def dl_callback(self, dl_status, cb_data): + def dl_callback(self, dl_status, cb_data, err_msg): url = cb_data if dl_status == 'done': self._status = 'downloaded' @@ -187,7 +187,7 @@ else: # retry the download self._status = 'init' - self._log("ERROR: Failed to retrieve %s on attempt %d. Trying again...\n" % (url, self._srpm_tries)) + self._log("ERROR: Failed to retrieve %s on attempt %d (%s). Trying again...\n" % (url, self._srpm_tries, err_msg)) def _copy_mock_output_to_log(self): if self._mock_log and os.path.exists(self._mock_log): From fedora-extras-commits at redhat.com Mon Mar 20 12:48:51 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 07:48:51 -0500 Subject: extras-buildsys/common FileDownloader.py,1.15.2.1,1.15.2.2 Message-ID: <200603201249.k2KCnMZD026021@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25946/common Modified Files: Tag: STABLE_0_4 FileDownloader.py Log Message: 2006-03-20 Dan Williams * common/FileDownloader.py - Pass error message to download callback * builder/builder.py server/ArchJob.py - Print out download errors, if any Index: FileDownloader.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/FileDownloader.py,v retrieving revision 1.15.2.1 retrieving revision 1.15.2.2 diff -u -r1.15.2.1 -r1.15.2.2 --- FileDownloader.py 18 Nov 2005 15:13:15 -0000 1.15.2.1 +++ FileDownloader.py 20 Mar 2006 12:48:44 -0000 1.15.2.2 @@ -94,6 +94,7 @@ def run(self): result = None + err_msg = None if self._url and self._target_dir and self._filename: if not os.path.exists(self._target_dir): os.makedirs(self._target_dir) @@ -105,16 +106,16 @@ # if CommonErrors.canIgnoreSSLError(e): # pass except socket.error, e: - if CommonErrors.canIgnoreSocketError(e): - pass + if not CommonErrors.canIgnoreSocketError(e): + err_msg = "Socket Error: %s" % e except IOError, e: - if CommonErrors.canIgnoreSocketError(e): - pass + if not CommonErrors.canIgnoreSocketError(e): + err_msg = "IOError Error: %s" % e if result: - self._callback('done', self._cb_data) + self._callback('done', self._cb_data, err_msg) else: - self._callback('failed', self._cb_data) + self._callback('failed', self._cb_data, err_msg) From fedora-extras-commits at redhat.com Mon Mar 20 14:37:11 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 20 Mar 2006 09:37:11 -0500 Subject: fedora-security/audit fc5,1.82,1.83 Message-ID: <200603201437.k2KEbB5b030844@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30819 Modified Files: fc5 Log Message: triage exim Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- fc5 20 Mar 2006 09:36:13 -0000 1.82 +++ fc5 20 Mar 2006 14:37:03 -0000 1.83 @@ -5,7 +5,7 @@ CVE-2006-1296 ** beagle CVE-2006-1273 ** firefox (prob win only, vague) -CVE-2006-1251 ** exim +CVE-2006-1251 version (exim) script not shipped CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) @@ -332,7 +332,7 @@ CVE-2005-2491 ignore (httpd) httpd uses system pcre CVE-2005-2490 version (kernel, fixed 2.6.13.1) CVE-2005-2475 backport (unzip) unzip-5.52-toctou.patch -CVE-2005-2471 verison (netpbm, fixed 10.31) +CVE-2005-2471 version (netpbm, fixed 10.31) CVE-2005-2459 ignore (kernel, fixed 2.6.12.5) dropped as code path not possible CVE-2005-2458 version (kernel, fixed 2.6.12.5) CVE-2005-2457 version (kernel, fixed 2.6.12.5) @@ -746,7 +746,7 @@ CVE-2004-2607 version (kernel, fixed 2.6.5) CVE-2004-2589 version (gaim, fixed 0.82) CVE-2004-2546 version (samba, fixed 3.0.6) -CVE-2004-2541 blocked (cscope) by FORTIFY_SOURCE +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 @@ -961,7 +961,7 @@ CVE-2004-0832 version (squid, fixed 2.5.STABLE7) CVE-2004-0829 version (samba, fixed 2.2.11) CVE-2004-0827 version (ImageMagick, fixed 6.0.6.2) -CVE-2004-0826 verson (nss, fixed 3.9.2) +CVE-2004-0826 version (nss, fixed 3.9.2) CVE-2004-0823 version (openldap, fixed after 2.1.19) CVE-2004-0817 version (imlib, fixed 2.1.20 at least) CVE-2004-0816 version (kernel, fixed 2.6.8) @@ -1337,7 +1337,7 @@ CVE-2003-0354 version (ghostscript, fixed 7.07) CVE-2003-0328 version (epic, fixed epic4-2.2 at least) CVE-2003-0300 ignore (sylpheed) only a crasher -CVE-2003-0299 ignmore (mutt) only a crasher +CVE-2003-0299 ignore (mutt) only a crasher CVE-2003-0298 version (mozilla, fixed after 1.4a) CVE-2003-0296 version (evolution, fixed 1.4.5 at least) CVE-2003-0289 version (cdrtools, fixed 2.01a14) From fedora-extras-commits at redhat.com Mon Mar 20 14:52:09 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 20 Mar 2006 09:52:09 -0500 Subject: fedora-security/audit fc4,1.173,1.174 fc5,1.83,1.84 Message-ID: <200603201452.k2KEq9ga030971@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30947 Modified Files: fc4 fc5 Log Message: Note the new cURL issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.173 retrieving revision 1.174 diff -u -r1.173 -r1.174 --- fc4 14 Mar 2006 12:47:06 -0000 1.173 +++ fc4 20 Mar 2006 14:52:02 -0000 1.174 @@ -6,6 +6,7 @@ CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability +CVE-2006-1061 ignore (curl, 7.15.0 - 7.15.2 only) CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.83 retrieving revision 1.84 diff -u -r1.83 -r1.84 --- fc5 20 Mar 2006 14:37:03 -0000 1.83 +++ fc5 20 Mar 2006 14:52:02 -0000 1.84 @@ -11,6 +11,7 @@ CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability +CVE-2006-1061 VULNERABLE (curl, fixed 7.15.3) CVE-2006-1052 backport (kernel) patch-2.6.16-rc6 CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe From fedora-extras-commits at redhat.com Mon Mar 20 16:09:28 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Mon, 20 Mar 2006 11:09:28 -0500 Subject: fedora-security/audit fc4,1.174,1.175 fc5,1.84,1.85 Message-ID: <200603201609.k2KG9SOi004706@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4686 Modified Files: fc4 fc5 Log Message: x.org issue is first advisory Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.174 retrieving revision 1.175 diff -u -r1.174 -r1.175 --- fc4 20 Mar 2006 14:52:02 -0000 1.174 +++ fc4 20 Mar 2006 16:09:19 -0000 1.175 @@ -1,8 +1,10 @@ -Up to date CVE as of CVE email 20060313 -Up to date FC4 as of 20060313 +Up to date CVE as of CVE email 20060315 +Up to date FC4 as of 20060315 ** are items that need attention +CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues +CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability @@ -14,6 +16,7 @@ CVE-2006-0884 ** thunderbird CVE-2006-0836 version (thunderbird, 1.5 only) CVE-2006-0746 VULNERABLE (kpdf) bz#184308 +CVE-2006-0745 version (xorg-x11) not fc4 CVE-2006-0742 VULNERABLE (kernel) CVE-2006-0741 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0730 version (dovecot, 1.0beta[12] only) @@ -190,7 +193,7 @@ CVE-2005-3273 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] CVE-2005-3272 version (kernel, fixed 2.6.13) [since FEDORA-2005-949] CVE-2005-3271 version (kernel, fixed 2.6.9) since GA -CVE-2005-3258 backport (squid) [since FEDORA-2005-1009] +CVE-2005-3258 version (squid, fixed 2.5.STABLE12) [since FEDORA-2006-150] was backport since FEDORA-2005-1009 CVE-2005-3257 version (kernel, fixed 2.6.15) [since FEDORA-2006-077] was backport since FEDORA-2005-1138 CVE-2005-3249 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] CVE-2005-3248 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.84 retrieving revision 1.85 diff -u -r1.84 -r1.85 --- fc5 20 Mar 2006 14:52:02 -0000 1.84 +++ fc5 20 Mar 2006 16:09:19 -0000 1.85 @@ -20,6 +20,7 @@ CVE-2006-0884 VULNERABLE (thunderbird) CVE-2006-0836 VULNERABLE (thunderbird) CVE-2006-0746 version (kdegraphics, fixed 3.4) +CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172] CVE-2006-0744 ** kernel CVE-2006-0742 backport (kernel) patch-2.6.16-rc6 CVE-2006-0741 backport (kernel, fixed 2.6.15.5) patch-2.6.16-rc6 From fedora-extras-commits at redhat.com Mon Mar 20 16:40:47 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:40:47 -0500 Subject: owners owners.list,1.753,1.754 Message-ID: <200603201641.k2KGfJw3004979@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4962 Modified Files: owners.list Log Message: added perl-Date-Pcalc Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.753 retrieving revision 1.754 diff -u -r1.753 -r1.754 --- owners.list 19 Mar 2006 22:19:53 -0000 1.753 +++ owners.list 20 Mar 2006 16:40:46 -0000 1.754 @@ -875,6 +875,7 @@ Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Date-Pcalc|Gregorian calendar date calculations|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-DBD-CSV|DBI driver for CSV files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Mon Mar 20 16:47:23 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:47:23 -0500 Subject: rpms/perl-Date-Pcalc - New directory Message-ID: <200603201647.k2KGlPJw005052@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5044/perl-Date-Pcalc Log Message: Directory /cvs/extras/rpms/perl-Date-Pcalc added to the repository From fedora-extras-commits at redhat.com Mon Mar 20 16:47:29 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:47:29 -0500 Subject: rpms/perl-Date-Pcalc/devel - New directory Message-ID: <200603201647.k2KGlVBM005067@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5044/perl-Date-Pcalc/devel Log Message: Directory /cvs/extras/rpms/perl-Date-Pcalc/devel added to the repository From fedora-extras-commits at redhat.com Mon Mar 20 16:47:40 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:47:40 -0500 Subject: rpms/perl-Date-Pcalc Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603201647.k2KGlgbx005101@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5089 Added Files: Makefile import.log Log Message: Setup of module perl-Date-Pcalc --- NEW FILE Makefile --- # Top level Makefile for module perl-Date-Pcalc all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 20 16:47:45 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:47:45 -0500 Subject: rpms/perl-Date-Pcalc/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603201647.k2KGllX2005121@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5089/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Date-Pcalc --- NEW 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 Mar 20 16:48:06 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:48:06 -0500 Subject: rpms/perl-Date-Pcalc import.log,1.1,1.2 Message-ID: <200603201648.k2KGmdU6005235@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5155 Modified Files: import.log Log Message: auto-import perl-Date-Pcalc-1.2-3 on branch devel from perl-Date-Pcalc-1.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Date-Pcalc/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 20 Mar 2006 16:47:39 -0000 1.1 +++ import.log 20 Mar 2006 16:48:06 -0000 1.2 @@ -0,0 +1 @@ +perl-Date-Pcalc-1_2-3:HEAD:perl-Date-Pcalc-1.2-3.src.rpm:1142876885 From fedora-extras-commits at redhat.com Mon Mar 20 16:48:13 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Mon, 20 Mar 2006 11:48:13 -0500 Subject: rpms/perl-Date-Pcalc/devel perl-Date-Pcalc.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603201648.k2KGmjrq005240@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-Date-Pcalc/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5155/devel Modified Files: .cvsignore sources Added Files: perl-Date-Pcalc.spec Log Message: auto-import perl-Date-Pcalc-1.2-3 on branch devel from perl-Date-Pcalc-1.2-3.src.rpm --- NEW FILE perl-Date-Pcalc.spec --- Name: perl-Date-Pcalc Version: 1.2 Release: 3%{?dist} Summary: Gregorian calendar date calculations License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Date-Pcalc/ Source0: http://search.cpan.org/CPAN/authors/id/S/ST/STBEY/Date-Pcalc-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch BuildRequires: %{_bindir}/iconv %description This package consists of a Perl module for all kinds of date calculations based on the Gregorian calendar (the one used in all western countries today), thereby complying with all relevant norms and standards: ISO/R 2015-1971, DIN 1355 and, to some extent, ISO 8601 (where applicable). %prep %setup -q -n Date-Pcalc-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT %{_bindir}/iconv --from-code=ISO-8859-1 --to-code=UTF-8 blib/man3/Date::Pcalc.3pm -o blib/man3/Date::Pcalc.3pm-utf8 mv blib/man3/Date::Pcalc.3pm-utf8 blib/man3/Date::Pcalc.3pm 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/* %clean rm -rf $RPM_BUILD_ROOT %check make test %files %defattr(-,root,root,-) %doc CHANGES.txt README.txt EXAMPLES.txt CREDITS.txt GNU_GPL.txt Artistic.txt %{perl_vendorlib}/Date %{_mandir}/man3/* %changelog * Mon Mar 20 2006 Mike McGrath - 1.2-3 - Minor fixes and formatting in spec file * Sun Mar 19 2006 Mike McGrath - 1.2-2 - Include license and credits - Convert manpage to utf-8 * Sat Mar 18 2006 Mike McGrath - 1.2-1 - First attempt at a Fedora friendly spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Date-Pcalc/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 20 Mar 2006 16:47:45 -0000 1.1 +++ .cvsignore 20 Mar 2006 16:48:13 -0000 1.2 @@ -0,0 +1 @@ +Date-Pcalc-1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Date-Pcalc/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 20 Mar 2006 16:47:45 -0000 1.1 +++ sources 20 Mar 2006 16:48:13 -0000 1.2 @@ -0,0 +1 @@ +1c09a09337c7d2e18a17898ca577c644 Date-Pcalc-1.2.tar.gz From fedora-extras-commits at redhat.com Mon Mar 20 17:33:21 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Mon, 20 Mar 2006 12:33:21 -0500 Subject: fedora-release fedora-core.repo, 1.2, 1.3 fedora-development.repo, 1.3, 1.4 fedora-extras-development.repo, 1.2, 1.3 fedora-extras.repo, 1.4, 1.5 fedora-legacy.repo, 1.1, 1.2 fedora-updates-testing.repo, 1.4, 1.5 fedora-updates.repo, 1.7, 1.8 Message-ID: <200603201733.k2KHXLUG007645@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7616 Modified Files: fedora-core.repo fedora-development.repo fedora-extras-development.repo fedora-extras.repo fedora-legacy.repo fedora-updates-testing.repo fedora-updates.repo Log Message: mirror-list should reference Download not download. Index: fedora-core.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-core.repo 9 Mar 2006 20:21:21 -0000 1.2 +++ fedora-core.repo 20 Mar 2006 17:33:14 -0000 1.3 @@ -1,7 +1,7 @@ [core] name=Fedora Core $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os/ -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-$releasever enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-development.repo 9 Mar 2006 20:21:21 -0000 1.3 +++ fedora-development.repo 20 Mar 2006 17:33:14 -0000 1.4 @@ -26,7 +26,7 @@ [development] name=Fedora Core - Development #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/ -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-rawhide +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide enabled=0 gpgcheck=0 Index: fedora-extras-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fedora-extras-development.repo 9 Mar 2006 20:21:21 -0000 1.2 +++ fedora-extras-development.repo 20 Mar 2006 17:33:14 -0000 1.3 @@ -1,7 +1,7 @@ [extras-development] name=Fedora Extras - Development Tree #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/ -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-devel enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-extras.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-extras.repo 9 Mar 2006 20:21:21 -0000 1.4 +++ fedora-extras.repo 20 Mar 2006 17:33:14 -0000 1.5 @@ -1,7 +1,7 @@ [extras] name=Fedora Extras $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/ -mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-$releasever enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-legacy.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-legacy.repo,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- fedora-legacy.repo 7 Mar 2006 00:53:09 -0000 1.1 +++ fedora-legacy.repo 20 Mar 2006 17:33:14 -0000 1.2 @@ -1,13 +1,13 @@ [legacy-updates] name=Fedora Legacy $releasever - $basearch - Updates -mirrorlist=http://fedora.redhat.com/download/mirrors/legacy-updates-released-fc$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/legacy-updates-released-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy [legacy-testing] name=Fedora Legacy $releasever - $basearch - Updates Testing -mirrorlist=http://fedora.redhat.com/download/mirrors/legacy-updates-testing-fc$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/legacy-updates-testing-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-legacy Index: fedora-updates-testing.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-updates-testing.repo 15 Feb 2006 19:58:10 -0000 1.4 +++ fedora-updates-testing.repo 20 Mar 2006 17:33:14 -0000 1.5 @@ -1,7 +1,7 @@ [updates-testing] name=Fedora Core $releasever - $basearch - Test Updates #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/$basearch/ -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-testing-fc$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test Index: fedora-updates.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fedora-updates.repo 9 Mar 2006 20:21:21 -0000 1.7 +++ fedora-updates.repo 20 Mar 2006 17:33:14 -0000 1.8 @@ -1,7 +1,7 @@ [updates] name=Fedora Core $releasever - $basearch - Updates #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/ -mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc$releasever +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-fc$releasever enabled=1 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora From fedora-extras-commits at redhat.com Mon Mar 20 18:00:55 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 20 Mar 2006 13:00:55 -0500 Subject: fedora-security/audit fc5,1.85,1.86 Message-ID: <200603201800.k2KI0tOF007877@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7859 Modified Files: fc5 Log Message: Note a new beagle issue. Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.85 retrieving revision 1.86 diff -u -r1.85 -r1.86 --- fc5 20 Mar 2006 16:09:19 -0000 1.85 +++ fc5 20 Mar 2006 18:00:48 -0000 1.86 @@ -3,7 +3,7 @@ ** are items that need attention -CVE-2006-1296 ** beagle +CVE-2006-1296 VULNERABLE (beagle) bz#185981 CVE-2006-1273 ** firefox (prob win only, vague) CVE-2006-1251 version (exim) script not shipped CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues From fedora-extras-commits at redhat.com Mon Mar 20 18:21:22 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 13:21:22 -0500 Subject: extras-buildsys/server Config.py,1.14,1.15 Message-ID: <200603201821.k2KILMJS009989@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9964/server Modified Files: Config.py Log Message: Some fixups from builder weight patch Index: Config.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Config.py 20 Mar 2006 12:43:21 -0000 1.14 +++ Config.py 20 Mar 2006 18:21:15 -0000 1.15 @@ -101,7 +101,6 @@ if not self._config.has_section("Builders"): return {} items = self._config.items("Builders") - print items builder_list = {} for (tag, builder) in items: if not tag.startswith("builder"): @@ -140,8 +139,8 @@ self.add_section("Builders") self.set_option("Builders", "use_ssl", "yes") - self.set_option("Builders", "0 builder1", "127.0.0.1:8888") - self.set_option("Builders", "10 builder2", "127.0.0.2:8888") + self.set_option("Builders", "builder1", "20 127.0.0.1:8888") + self.set_option("Builders", "builder2", "0 127.0.0.2:8888") self.add_section("SSL") self.set_option("SSL", "server_key_and_cert", "/etc/plague/server/certs/server_key_and_cert.pem") From fedora-extras-commits at redhat.com Mon Mar 20 18:28:45 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 13:28:45 -0500 Subject: extras-buildsys/server Config.py,1.15,1.16 Message-ID: <200603201828.k2KISjcM010035@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10017/server Modified Files: Config.py Log Message: Fix default path of server targets directory Index: Config.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- Config.py 20 Mar 2006 18:21:15 -0000 1.15 +++ Config.py 20 Mar 2006 18:28:37 -0000 1.16 @@ -129,7 +129,7 @@ self.set_option("Directories", "server_work_dir", "/rpmbuild",) self.set_option("Directories", "repo_dir", "/repodir") self.set_option("Directories", "tmpdir", "/tmp") - self.set_option("Directories", "target_configs_dir", "/etc/plague/targets") + self.set_option("Directories", "target_configs_dir", "/etc/plague/server/targets") self.set_option("Directories", "mock_configs_dir", "/etc/mock") self.add_section("Email") From fedora-extras-commits at redhat.com Mon Mar 20 18:38:44 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Mon, 20 Mar 2006 13:38:44 -0500 Subject: rpms/argus/FC-4 argus.spec,1.1,1.2 Message-ID: <200603201839.k2KIdHHJ010120@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10073/FC-4 Modified Files: argus.spec Log Message: added buildrequires ncurses-devel Index: argus.spec =================================================================== RCS file: /cvs/extras/rpms/argus/FC-4/argus.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- argus.spec 17 Mar 2006 19:32:36 -0000 1.1 +++ argus.spec 20 Mar 2006 18:38:44 -0000 1.2 @@ -1,6 +1,6 @@ Name: argus Version: 2.0.6.fixes.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Network transaction audit tool License: GPL Group: Applications/Internet @@ -18,7 +18,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig #Requires: libpcap -BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison +BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison ncurses-devel %package clients Summary: Client tools for argus network audit @@ -123,6 +123,9 @@ %{_mandir}/man5/ra* %changelog +* Mon Mar 20 2006 Gabriel Somlo 2.0.6.fixes.1-8 +- added ncurses-devel build requirement + * Wed Mar 15 2006 Gabriel Somlo 2.0.6.fixes.1-7 - fixed argus makefile patch From fedora-extras-commits at redhat.com Mon Mar 20 18:38:51 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Mon, 20 Mar 2006 13:38:51 -0500 Subject: rpms/argus/FC-5 argus.spec,1.1,1.2 Message-ID: <200603201839.k2KIdNZr010123@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10073/FC-5 Modified Files: argus.spec Log Message: added buildrequires ncurses-devel Index: argus.spec =================================================================== RCS file: /cvs/extras/rpms/argus/FC-5/argus.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- argus.spec 17 Mar 2006 19:32:36 -0000 1.1 +++ argus.spec 20 Mar 2006 18:38:51 -0000 1.2 @@ -1,6 +1,6 @@ Name: argus Version: 2.0.6.fixes.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Network transaction audit tool License: GPL Group: Applications/Internet @@ -18,7 +18,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig #Requires: libpcap -BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison +BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison ncurses-devel %package clients Summary: Client tools for argus network audit @@ -123,6 +123,9 @@ %{_mandir}/man5/ra* %changelog +* Mon Mar 20 2006 Gabriel Somlo 2.0.6.fixes.1-8 +- added ncurses-devel build requirement + * Wed Mar 15 2006 Gabriel Somlo 2.0.6.fixes.1-7 - fixed argus makefile patch From fedora-extras-commits at redhat.com Mon Mar 20 18:38:57 2006 From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo)) Date: Mon, 20 Mar 2006 13:38:57 -0500 Subject: rpms/argus/devel argus.spec,1.1,1.2 Message-ID: <200603201839.k2KIdTn5010126@cvs-int.fedora.redhat.com> Author: somlo Update of /cvs/extras/rpms/argus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10073/devel Modified Files: argus.spec Log Message: added buildrequires ncurses-devel Index: argus.spec =================================================================== RCS file: /cvs/extras/rpms/argus/devel/argus.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- argus.spec 17 Mar 2006 19:32:36 -0000 1.1 +++ argus.spec 20 Mar 2006 18:38:56 -0000 1.2 @@ -1,6 +1,6 @@ Name: argus Version: 2.0.6.fixes.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Network transaction audit tool License: GPL Group: Applications/Internet @@ -18,7 +18,7 @@ Requires(post): /sbin/chkconfig Requires(preun): /sbin/chkconfig #Requires: libpcap -BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison +BuildRequires: libpcap cyrus-sasl-devel tcp_wrappers flex bison ncurses-devel %package clients Summary: Client tools for argus network audit @@ -123,6 +123,9 @@ %{_mandir}/man5/ra* %changelog +* Mon Mar 20 2006 Gabriel Somlo 2.0.6.fixes.1-8 +- added ncurses-devel build requirement + * Wed Mar 15 2006 Gabriel Somlo 2.0.6.fixes.1-7 - fixed argus makefile patch From fedora-extras-commits at redhat.com Mon Mar 20 20:05:22 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Mon, 20 Mar 2006 15:05:22 -0500 Subject: extras-buildsys/server BuilderManager.py,1.20,1.21 Message-ID: <200603202005.k2KK5MlK015032@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15014/server Modified Files: BuilderManager.py Log Message: Remove debug exit() Index: BuilderManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- BuilderManager.py 20 Mar 2006 12:43:21 -0000 1.20 +++ BuilderManager.py 20 Mar 2006 20:05:11 -0000 1.21 @@ -55,7 +55,6 @@ del builder_dict print string print "" - os._exit(1) self._queue_lock = threading.Lock() self._queue = [] From fedora-extras-commits at redhat.com Tue Mar 21 00:33:51 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 20 Mar 2006 19:33:51 -0500 Subject: rpms/perl-Exception-Class/devel .cvsignore, 1.3, 1.4 perl-Exception-Class.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603210034.k2L0YOkv024636@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24605 Modified Files: .cvsignore perl-Exception-Class.spec sources Log Message: Update to 1.23. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jan 2006 02:26:49 -0000 1.3 +++ .cvsignore 21 Mar 2006 00:33:50 -0000 1.4 @@ -1 +1 @@ -Exception-Class-1.22.tar.gz +Exception-Class-1.23.tar.gz Index: perl-Exception-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/perl-Exception-Class.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Exception-Class.spec 11 Jan 2006 02:26:49 -0000 1.4 +++ perl-Exception-Class.spec 21 Mar 2006 00:33:50 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Exception-Class -Version: 1.22 +Version: 1.23 Release: 1%{?dist} Summary: Exception::Class Perl module License: GPL or Artistic @@ -8,9 +8,9 @@ Source0: http://www.cpan.org/modules/by-module/Exception/Exception-Class-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Devel::StackTrace) >= 1.1 +BuildRequires: perl(Devel::StackTrace) >= 1.12 BuildRequires: perl(Class::Data::Inheritable) >= 0.02 -Requires: perl(Devel::StackTrace) >= 1.1 +Requires: perl(Devel::StackTrace) >= 1.12 Requires: perl(Class::Data::Inheritable) >= 0.02 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Fri Feb 03 2006 Steven Pritchard 1.23-1 +- Update to 1.23 + * Tue Jan 10 2006 Steven Pritchard 1.22-1 - Update to 1.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jan 2006 02:26:49 -0000 1.3 +++ sources 21 Mar 2006 00:33:50 -0000 1.4 @@ -1 +1 @@ -ad8bb64e8473ba5817a2b329ec7dde42 Exception-Class-1.22.tar.gz +560b42c0cf8b795bdc793459edb7ec13 Exception-Class-1.23.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 01:05:37 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Mon, 20 Mar 2006 20:05:37 -0500 Subject: fedora-security/audit fc5,1.86,1.87 Message-ID: <200603210105.k2L15bW2026669@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26651 Modified Files: fc5 Log Message: Add a new gnome-screensaver issue. Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.86 retrieving revision 1.87 diff -u -r1.86 -r1.87 --- fc5 20 Mar 2006 18:00:48 -0000 1.86 +++ fc5 21 Mar 2006 01:05:26 -0000 1.87 @@ -3,6 +3,7 @@ ** are items that need attention +CVE-2006-1335 version (gnome-screensaver, fixed 2.14) CVE-2006-1296 VULNERABLE (beagle) bz#185981 CVE-2006-1273 ** firefox (prob win only, vague) CVE-2006-1251 version (exim) script not shipped From fedora-extras-commits at redhat.com Tue Mar 21 02:07:57 2006 From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz)) Date: Mon, 20 Mar 2006 21:07:57 -0500 Subject: rpms/mmv/devel mmv.spec,1.4,1.5 Message-ID: <200603210208.k2L28T0O028884@cvs-int.fedora.redhat.com> Author: shishz Update of /cvs/extras/rpms/mmv/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28867 Modified Files: mmv.spec Log Message: * Mon Mar 20 2006 Zing - 1.01b-6 - fix permissions on doc files Index: mmv.spec =================================================================== RCS file: /cvs/extras/rpms/mmv/devel/mmv.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- mmv.spec 14 Feb 2006 01:19:57 -0000 1.4 +++ mmv.spec 21 Mar 2006 02:07:55 -0000 1.5 @@ -1,6 +1,6 @@ Name: mmv Version: 1.01b -Release: 5%{?dist} +Release: 6%{?dist} Summary: Move/copy/append/link multiple files Group: Applications/File @@ -49,8 +49,10 @@ rm -rf $RPM_BUILD_ROOT %files +%defattr(0644,root,root,-) +%doc copyright changelog %defattr(-,root,root,-) -%doc ANNOUNCE ARTICLE READ.ME copyright changelog +%doc ANNOUNCE ARTICLE READ.ME %{_bindir}/mmv %{_bindir}/mcp %{_bindir}/mad @@ -58,6 +60,9 @@ %{_mandir}/man1/* %changelog +* Mon Mar 20 2006 Zing - 1.01b-6 +- fix permissions on doc files + * Mon Feb 13 2006 Zing - 1.01b-5 - sync with debian mmv_1.01b-14 - symlink man page for mcp/mad/mln From fedora-extras-commits at redhat.com Tue Mar 21 03:26:52 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Mon, 20 Mar 2006 22:26:52 -0500 Subject: rpms/perl-Exception-Class/FC-5 .cvsignore, 1.3, 1.4 perl-Exception-Class.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603210327.k2L3RP2G031111@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Exception-Class/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31090 Modified Files: .cvsignore perl-Exception-Class.spec sources Log Message: Update to 1.23. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 11 Jan 2006 02:26:49 -0000 1.3 +++ .cvsignore 21 Mar 2006 03:26:52 -0000 1.4 @@ -1 +1 @@ -Exception-Class-1.22.tar.gz +Exception-Class-1.23.tar.gz Index: perl-Exception-Class.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/FC-5/perl-Exception-Class.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- perl-Exception-Class.spec 11 Jan 2006 02:26:49 -0000 1.4 +++ perl-Exception-Class.spec 21 Mar 2006 03:26:52 -0000 1.5 @@ -1,5 +1,5 @@ Name: perl-Exception-Class -Version: 1.22 +Version: 1.23 Release: 1%{?dist} Summary: Exception::Class Perl module License: GPL or Artistic @@ -8,9 +8,9 @@ Source0: http://www.cpan.org/modules/by-module/Exception/Exception-Class-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: perl(Devel::StackTrace) >= 1.1 +BuildRequires: perl(Devel::StackTrace) >= 1.12 BuildRequires: perl(Class::Data::Inheritable) >= 0.02 -Requires: perl(Devel::StackTrace) >= 1.1 +Requires: perl(Devel::StackTrace) >= 1.12 Requires: perl(Class::Data::Inheritable) >= 0.02 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -52,6 +52,9 @@ %{_mandir}/man3/* %changelog +* Fri Feb 03 2006 Steven Pritchard 1.23-1 +- Update to 1.23 + * Tue Jan 10 2006 Steven Pritchard 1.22-1 - Update to 1.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Exception-Class/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 11 Jan 2006 02:26:49 -0000 1.3 +++ sources 21 Mar 2006 03:26:52 -0000 1.4 @@ -1 +1 @@ -ad8bb64e8473ba5817a2b329ec7dde42 Exception-Class-1.22.tar.gz +560b42c0cf8b795bdc793459edb7ec13 Exception-Class-1.23.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 08:45:55 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Tue, 21 Mar 2006 03:45:55 -0500 Subject: rpms/nexuiz/devel nexuiz.spec,1.10,1.11 Message-ID: <200603210846.k2L8kSZr009851@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/nexuiz/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9834 Modified Files: nexuiz.spec Log Message: * Sun Mar 19 2006 Adrian Reber - 1.5-3 - rebuilt Index: nexuiz.spec =================================================================== RCS file: /cvs/extras/rpms/nexuiz/devel/nexuiz.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nexuiz.spec 19 Mar 2006 18:44:56 -0000 1.10 +++ nexuiz.spec 21 Mar 2006 08:45:55 -0000 1.11 @@ -1,7 +1,7 @@ Summary: Multiplayer, deathmatch oriented first person shooter Name: nexuiz Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Amusements/Games URL: http://www.nexuiz.com/ @@ -128,6 +128,9 @@ %changelog +* Sun Mar 19 2006 Adrian Reber - 1.5-3 +- rebuilt + * Sun Mar 19 2006 Adrian Reber - 1.5-2 - rebuilt From fedora-extras-commits at redhat.com Tue Mar 21 10:24:55 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 05:24:55 -0500 Subject: rpms/exim/FC-4 exim-4.50-config.patch,1.3,1.4 exim.spec,1.8,1.9 Message-ID: <200603211025.k2LAPTua014942@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14908 Modified Files: exim-4.50-config.patch exim.spec Log Message: actually enable pgsql exim-4.50-config.patch: Index: exim-4.50-config.patch =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim-4.50-config.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- exim-4.50-config.patch 19 Mar 2006 11:57:24 -0000 1.3 +++ exim-4.50-config.patch 21 Mar 2006 10:24:55 -0000 1.4 @@ -84,7 +84,7 @@ -# LOOKUP_PASSWD=yes +LOOKUP_PASSWD=yes -# LOOKUP_PGSQL=yes -+# LOOKUP_PGSQL=yes ++LOOKUP_PGSQL=yes -# LOOKUP_SQLITE=yes +LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- exim.spec 19 Mar 2006 11:57:24 -0000 1.8 +++ exim.spec 21 Mar 2006 10:24:55 -0000 1.9 @@ -286,6 +286,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue Mar 21 2006 David Woodhouse 4.60-4 +- Actually enable Postgres + * Tue Mar 7 2006 David Woodhouse 4.60-3 - Rebuild From fedora-extras-commits at redhat.com Tue Mar 21 10:25:36 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 05:25:36 -0500 Subject: rpms/exim/FC-4 exim.spec,1.9,1.10 Message-ID: <200603211026.k2LAQ9gB014978@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14945 Modified Files: exim.spec Log Message: Bah. We should take the release tag from the changelog :) Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- exim.spec 21 Mar 2006 10:24:55 -0000 1.9 +++ exim.spec 21 Mar 2006 10:25:36 -0000 1.10 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons From fedora-extras-commits at redhat.com Tue Mar 21 10:26:52 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 05:26:52 -0500 Subject: rpms/exim/FC-5 exim-4.50-config.patch,1.4,1.5 exim.spec,1.14,1.15 Message-ID: <200603211027.k2LAROP8015042@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15020 Modified Files: exim-4.50-config.patch exim.spec Log Message: actually enable pgsql exim-4.50-config.patch: Index: exim-4.50-config.patch =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/exim-4.50-config.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim-4.50-config.patch 13 Nov 2005 19:31:25 -0000 1.4 +++ exim-4.50-config.patch 21 Mar 2006 10:26:51 -0000 1.5 @@ -84,7 +84,7 @@ -# LOOKUP_PASSWD=yes +LOOKUP_PASSWD=yes -# LOOKUP_PGSQL=yes -+# LOOKUP_PGSQL=yes ++LOOKUP_PGSQL=yes -# LOOKUP_SQLITE=yes +LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- exim.spec 7 Mar 2006 00:24:31 -0000 1.14 +++ exim.spec 21 Mar 2006 10:26:51 -0000 1.15 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -287,6 +287,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue Mar 21 2006 David Woodhouse 4.60-4 +- Actually enable Postgres + * Tue Mar 7 2006 David Woodhouse 4.60-3 - Rebuild From fedora-extras-commits at redhat.com Tue Mar 21 10:29:10 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 05:29:10 -0500 Subject: rpms/exim/devel exim-4.50-config.patch,1.4,1.5 exim.spec,1.14,1.15 Message-ID: <200603211029.k2LATgmd015132@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15110 Modified Files: exim-4.50-config.patch exim.spec Log Message: actually enable pgsql exim-4.50-config.patch: Index: exim-4.50-config.patch =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim-4.50-config.patch,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- exim-4.50-config.patch 13 Nov 2005 19:31:25 -0000 1.4 +++ exim-4.50-config.patch 21 Mar 2006 10:29:09 -0000 1.5 @@ -84,7 +84,7 @@ -# LOOKUP_PASSWD=yes +LOOKUP_PASSWD=yes -# LOOKUP_PGSQL=yes -+# LOOKUP_PGSQL=yes ++LOOKUP_PGSQL=yes -# LOOKUP_SQLITE=yes +LOOKUP_SQLITE=yes # LOOKUP_WHOSON=yes Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- exim.spec 7 Mar 2006 00:24:31 -0000 1.14 +++ exim.spec 21 Mar 2006 10:29:09 -0000 1.15 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -287,6 +287,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Tue Mar 21 2006 David Woodhouse 4.60-4 +- Actually enable Postgres + * Tue Mar 7 2006 David Woodhouse 4.60-3 - Rebuild From fedora-extras-commits at redhat.com Tue Mar 21 12:24:19 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 21 Mar 2006 07:24:19 -0500 Subject: rpms/liboil/FC-5 .cvsignore, 1.7, 1.8 liboil.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <200603211224.k2LCOpIt019380@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19350 Modified Files: .cvsignore liboil.spec sources Log Message: Update to 0.3.7.1 to fix PPC build. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Feb 2006 09:46:01 -0000 1.7 +++ .cvsignore 21 Mar 2006 12:24:18 -0000 1.8 @@ -1 +1 @@ -liboil-0.3.7.tar.gz +liboil-0.3.7.1.tar.gz Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-5/liboil.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- liboil.spec 6 Mar 2006 15:28:29 -0000 1.15 +++ liboil.spec 21 Mar 2006 12:24:18 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.7 -Release: 3%{?dist} +Version: 0.3.7.1 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ @@ -68,6 +68,7 @@ %files devel %defattr(-, root, root, 0755) +%{_bindir}/oil-bugreport %{_includedir}/* %{_libdir}/*.a %exclude %{_libdir}/*.la @@ -77,6 +78,10 @@ %changelog +* Tue Mar 21 2006 Matthias Saou 0.3.7.1-1 +- Update to today's CVS code which should fix the PPC build issue. +- Include new oil-bugreport tool in the devel package. + * Mon Mar 6 2006 Matthias Saou 0.3.7-3 - FC5 rebuild (well, try at least since PPC fixes are required). Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Feb 2006 09:46:01 -0000 1.7 +++ sources 21 Mar 2006 12:24:18 -0000 1.8 @@ -1 +1 @@ -1f08e71fe775bfa1266a741742f1904b liboil-0.3.7.tar.gz +e6c5aee5a2f69e6ddce48a5ac74ee5bb liboil-0.3.7.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 12:43:29 2006 From: fedora-extras-commits at redhat.com (Matthias Saou (thias)) Date: Tue, 21 Mar 2006 07:43:29 -0500 Subject: rpms/liboil/devel .cvsignore, 1.7, 1.8 liboil.spec, 1.15, 1.16 sources, 1.7, 1.8 Message-ID: <200603211244.k2LCi29J019502@cvs-int.fedora.redhat.com> Author: thias Update of /cvs/extras/rpms/liboil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19481 Modified Files: .cvsignore liboil.spec sources Log Message: Sync with FC-5's update to 0.3.7.1. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Feb 2006 09:46:01 -0000 1.7 +++ .cvsignore 21 Mar 2006 12:43:29 -0000 1.8 @@ -1 +1 @@ -liboil-0.3.7.tar.gz +liboil-0.3.7.1.tar.gz Index: liboil.spec =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/liboil.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- liboil.spec 6 Mar 2006 15:28:29 -0000 1.15 +++ liboil.spec 21 Mar 2006 12:43:29 -0000 1.16 @@ -1,7 +1,7 @@ Summary: Library of Optimized Inner Loops, CPU optimized functions Name: liboil -Version: 0.3.7 -Release: 3%{?dist} +Version: 0.3.7.1 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries URL: http://liboil.freedesktop.org/ @@ -68,6 +68,7 @@ %files devel %defattr(-, root, root, 0755) +%{_bindir}/oil-bugreport %{_includedir}/* %{_libdir}/*.a %exclude %{_libdir}/*.la @@ -77,6 +78,10 @@ %changelog +* Tue Mar 21 2006 Matthias Saou 0.3.7.1-1 +- Update to today's CVS code which should fix the PPC build issue. +- Include new oil-bugreport tool in the devel package. + * Mon Mar 6 2006 Matthias Saou 0.3.7-3 - FC5 rebuild (well, try at least since PPC fixes are required). Index: sources =================================================================== RCS file: /cvs/extras/rpms/liboil/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Feb 2006 09:46:01 -0000 1.7 +++ sources 21 Mar 2006 12:43:29 -0000 1.8 @@ -1 +1 @@ -1f08e71fe775bfa1266a741742f1904b liboil-0.3.7.tar.gz +e6c5aee5a2f69e6ddce48a5ac74ee5bb liboil-0.3.7.1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 12:53:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 07:53:44 -0500 Subject: rpms/allegro/devel allegro-4.2.0-nicevsync.patch, NONE, 1.1 allegro.spec, 1.29, 1.30 Message-ID: <200603211254.k2LCsG3D019595@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19575 Modified Files: allegro.spec Added Files: allegro-4.2.0-nicevsync.patch Log Message: * Tue Mar 21 2006 Hans de Goede 4.2.0-12 - Sleep in xwindows vsync emulation, instead of busy waiting. allegro-4.2.0-nicevsync.patch: --- NEW FILE allegro-4.2.0-nicevsync.patch --- --- allegro-4.2.0/src/x/xwin.c~ 2006-03-21 12:57:42.000000000 +0100 +++ allegro-4.2.0/src/x/xwin.c 2006-03-21 12:57:42.000000000 +0100 @@ -2265,6 +2265,7 @@ XUNLOCK(); do { + rest(1); } while (retrace_count == prev); } else { Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- allegro.spec 13 Mar 2006 22:57:30 -0000 1.29 +++ allegro.spec 21 Mar 2006 12:53:44 -0000 1.30 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 11 +Release: 12 Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -21,6 +21,7 @@ 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 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 @@ -134,7 +135,7 @@ %patch7 -p1 -z .fullscreen %patch8 -p1 -z .mprotect %patch9 -p1 -z .execheap - +%patch10 -p1 -z .nicevsync %build %configure \ @@ -221,6 +222,9 @@ %changelog +* Tue Mar 21 2006 Hans de Goede 4.2.0-12 +- Sleep in xwindows vsync emulation, instead of busy waiting. + * Mon Mar 13 2006 Hans de Goede 4.2.0-11 - really, _really_ fix asm stretch code on i386 with NX processors, long ?? story see bugzilla bug 185214 . From fedora-extras-commits at redhat.com Tue Mar 21 14:06:35 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:06:35 -0500 Subject: rpms/libtranslate/FC-4 libtranslate-0.99-int64.diff, NONE, 1.1 libtranslate.spec, 1.2, 1.3 Message-ID: <200603211407.k2LE7837023782@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23762 Modified Files: libtranslate.spec Added Files: libtranslate-0.99-int64.diff Log Message: libtranslate-0.99-int64.diff: --- NEW FILE libtranslate-0.99-int64.diff --- --- src/translate-util.c.orig Mon Jan 17 17:45:45 2005 +++ src/translate-util.c Fri Dec 30 22:26:26 2005 @@ -136,7 +136,7 @@ g_return_val_if_fail(big != NULL, NULL); g_return_val_if_fail(little != NULL, NULL); - lower_big = g_ascii_strdown(big, big_len); + lower_big = g_ascii_strdown(big, (int) big_len); lower_little = g_ascii_strdown(little, -1); s = strstr(lower_big, lower_little); Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/FC-4/libtranslate.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libtranslate.spec 14 Sep 2005 11:10:52 -0000 1.2 +++ libtranslate.spec 21 Mar 2006 14:06:33 -0000 1.3 @@ -8,6 +8,7 @@ Source: %{url}/libtranslate-%{version}.tar.gz Patch1: %{url}/libtranslate-0.99-charsetparse.diff Patch2: %{url}/libtranslate-0.99-condfix.diff +Patch3: %{url}/libtranslate-0.99-int64.diff Patch10: libtranslate-add_Promt_service.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 1:0.8, gettext @@ -43,6 +44,7 @@ %setup -q -n %{name}-%{version} %patch1 -p0 %patch2 -p0 +%patch3 -p0 %patch10 -p0 %build @@ -95,6 +97,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 0.99-5 +- add upstream's patch fixing memory exhaustion on 64-bit platforms + * Wed Sep 7 2005 Dmitry Butskoy - 0.99-4 - even more cleanups - Accepted for Fedora Extra From fedora-extras-commits at redhat.com Tue Mar 21 14:07:45 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:07:45 -0500 Subject: rpms/libtranslate/FC-4 libtranslate.spec,1.3,1.4 Message-ID: <200603211408.k2LE8HHY023807@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23790 Modified Files: libtranslate.spec Log Message: Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/FC-4/libtranslate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libtranslate.spec 21 Mar 2006 14:06:33 -0000 1.3 +++ libtranslate.spec 21 Mar 2006 14:07:45 -0000 1.4 @@ -1,7 +1,7 @@ Name: libtranslate Summary: Natural language translation library Version: 0.99 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Group: System Environment/Libraries %define url http://savannah.nongnu.org/download/libtranslate From fedora-extras-commits at redhat.com Tue Mar 21 14:54:55 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:54:55 -0500 Subject: rpms/libtranslate/FC-5 libtranslate-0.99-int64.diff, NONE, 1.1 libtranslate.spec, 1.3, 1.4 Message-ID: <200603211455.k2LEtSpp024020@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24000 Modified Files: libtranslate.spec Added Files: libtranslate-0.99-int64.diff Log Message: libtranslate-0.99-int64.diff: --- NEW FILE libtranslate-0.99-int64.diff --- --- src/translate-util.c.orig Mon Jan 17 17:45:45 2005 +++ src/translate-util.c Fri Dec 30 22:26:26 2005 @@ -136,7 +136,7 @@ g_return_val_if_fail(big != NULL, NULL); g_return_val_if_fail(little != NULL, NULL); - lower_big = g_ascii_strdown(big, big_len); + lower_big = g_ascii_strdown(big, (int) big_len); lower_little = g_ascii_strdown(little, -1); s = strstr(lower_big, lower_little); Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/FC-5/libtranslate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libtranslate.spec 15 Feb 2006 12:18:06 -0000 1.3 +++ libtranslate.spec 21 Mar 2006 14:54:55 -0000 1.4 @@ -1,13 +1,14 @@ Name: libtranslate Summary: Natural language translation library Version: 0.99 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Libraries %define url http://savannah.nongnu.org/download/libtranslate Source: %{url}/libtranslate-%{version}.tar.gz Patch1: %{url}/libtranslate-0.99-charsetparse.diff Patch2: %{url}/libtranslate-0.99-condfix.diff +Patch3: %{url}/libtranslate-0.99-int64.diff Patch10: libtranslate-add_Promt_service.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 1:0.8, gettext @@ -43,6 +44,7 @@ %setup -q -n %{name}-%{version} %patch1 -p0 %patch2 -p0 +%patch3 -p0 %patch10 -p0 %build @@ -95,6 +97,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 0.99-6 +- add upstream's patch fixing memory exhaustion on 64-bit platforms + * Wed Feb 15 2006 Dmitry Butskoy - 0.99-5 - rebuild for FC5 From fedora-extras-commits at redhat.com Tue Mar 21 14:56:22 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:56:22 -0500 Subject: rpms/libtranslate/FC-4 libtranslate.spec,1.4,1.5 Message-ID: <200603211456.k2LEusEF024081@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24064 Modified Files: libtranslate.spec Log Message: Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/FC-4/libtranslate.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- libtranslate.spec 21 Mar 2006 14:07:45 -0000 1.4 +++ libtranslate.spec 21 Mar 2006 14:56:22 -0000 1.5 @@ -1,7 +1,7 @@ Name: libtranslate Summary: Natural language translation library Version: 0.99 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Libraries %define url http://savannah.nongnu.org/download/libtranslate @@ -97,7 +97,7 @@ %{_libdir}/pkgconfig/* %changelog -* Tue Mar 21 2006 Dmitry Butskoy - 0.99-5 +* Tue Mar 21 2006 Dmitry Butskoy - 0.99-6 - add upstream's patch fixing memory exhaustion on 64-bit platforms * Wed Sep 7 2005 Dmitry Butskoy - 0.99-4 From fedora-extras-commits at redhat.com Tue Mar 21 14:57:46 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:57:46 -0500 Subject: rpms/libtranslate/FC-3 libtranslate-0.99-int64.diff, NONE, 1.1 libtranslate.spec, 1.2, 1.3 Message-ID: <200603211458.k2LEwIRH024112@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24092 Modified Files: libtranslate.spec Added Files: libtranslate-0.99-int64.diff Log Message: libtranslate-0.99-int64.diff: --- NEW FILE libtranslate-0.99-int64.diff --- --- src/translate-util.c.orig Mon Jan 17 17:45:45 2005 +++ src/translate-util.c Fri Dec 30 22:26:26 2005 @@ -136,7 +136,7 @@ g_return_val_if_fail(big != NULL, NULL); g_return_val_if_fail(little != NULL, NULL); - lower_big = g_ascii_strdown(big, big_len); + lower_big = g_ascii_strdown(big, (int) big_len); lower_little = g_ascii_strdown(little, -1); s = strstr(lower_big, lower_little); Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/FC-3/libtranslate.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libtranslate.spec 14 Sep 2005 11:12:05 -0000 1.2 +++ libtranslate.spec 21 Mar 2006 14:57:45 -0000 1.3 @@ -1,13 +1,14 @@ Name: libtranslate Summary: Natural language translation library Version: 0.99 -Release: 4%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Libraries %define url http://savannah.nongnu.org/download/libtranslate Source: %{url}/libtranslate-%{version}.tar.gz Patch1: %{url}/libtranslate-0.99-charsetparse.diff Patch2: %{url}/libtranslate-0.99-condfix.diff +Patch3: %{url}/libtranslate-0.99-int64.diff Patch10: libtranslate-add_Promt_service.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 1:0.8, gettext @@ -43,6 +44,7 @@ %setup -q -n %{name}-%{version} %patch1 -p0 %patch2 -p0 +%patch3 -p0 %patch10 -p0 %build @@ -95,6 +97,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 0.99-6 +- add upstream's patch fixing memory exhaustion on 64-bit platforms + * Wed Sep 7 2005 Dmitry Butskoy - 0.99-4 - even more cleanups - Accepted for Fedora Extra From fedora-extras-commits at redhat.com Tue Mar 21 14:59:09 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 09:59:09 -0500 Subject: rpms/libtranslate/devel libtranslate-0.99-int64.diff, NONE, 1.1 libtranslate.spec, 1.3, 1.4 Message-ID: <200603211459.k2LExgTZ024220@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/libtranslate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24193 Modified Files: libtranslate.spec Added Files: libtranslate-0.99-int64.diff Log Message: libtranslate-0.99-int64.diff: --- NEW FILE libtranslate-0.99-int64.diff --- --- src/translate-util.c.orig Mon Jan 17 17:45:45 2005 +++ src/translate-util.c Fri Dec 30 22:26:26 2005 @@ -136,7 +136,7 @@ g_return_val_if_fail(big != NULL, NULL); g_return_val_if_fail(little != NULL, NULL); - lower_big = g_ascii_strdown(big, big_len); + lower_big = g_ascii_strdown(big, (int) big_len); lower_little = g_ascii_strdown(little, -1); s = strstr(lower_big, lower_little); Index: libtranslate.spec =================================================================== RCS file: /cvs/extras/rpms/libtranslate/devel/libtranslate.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libtranslate.spec 15 Feb 2006 12:18:06 -0000 1.3 +++ libtranslate.spec 21 Mar 2006 14:59:09 -0000 1.4 @@ -1,13 +1,14 @@ Name: libtranslate Summary: Natural language translation library Version: 0.99 -Release: 5%{?dist} +Release: 6%{?dist} License: BSD Group: System Environment/Libraries %define url http://savannah.nongnu.org/download/libtranslate Source: %{url}/libtranslate-%{version}.tar.gz Patch1: %{url}/libtranslate-0.99-charsetparse.diff Patch2: %{url}/libtranslate-0.99-condfix.diff +Patch3: %{url}/libtranslate-0.99-int64.diff Patch10: libtranslate-add_Promt_service.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pkgconfig >= 1:0.8, gettext @@ -43,6 +44,7 @@ %setup -q -n %{name}-%{version} %patch1 -p0 %patch2 -p0 +%patch3 -p0 %patch10 -p0 %build @@ -95,6 +97,9 @@ %{_libdir}/pkgconfig/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 0.99-6 +- add upstream's patch fixing memory exhaustion on 64-bit platforms + * Wed Feb 15 2006 Dmitry Butskoy - 0.99-5 - rebuild for FC5 From fedora-extras-commits at redhat.com Tue Mar 21 15:05:24 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:05:24 -0500 Subject: rpms/nail/FC-3 nail-12.0-nostrip.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 nail.spec, 1.4, 1.5 sources, 1.2, 1.3 nail-11.25-nostrip.patch, 1.1, NONE Message-ID: <200603211505.k2LF5utd026228@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26202 Modified Files: .cvsignore nail.spec sources Added Files: nail-12.0-nostrip.patch Removed Files: nail-11.25-nostrip.patch Log Message: nail-12.0-nostrip.patch: --- NEW FILE nail-12.0-nostrip.patch --- diff -Nrbu nail-11.25/Makefile nail-11.25-OK/Makefile --- nail-11.25/Makefile 2005-07-29 15:31:44.000000000 +0400 +++ nail-11.25-OK/Makefile 2005-10-17 12:45:26.000000000 +0400 @@ -96,7 +96,7 @@ install: all test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) - $(UCBINSTALL) -c -s mailx $(DESTDIR)$(BINDIR)/mailx + $(UCBINSTALL) -c mailx $(DESTDIR)$(BINDIR)/mailx test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1 $(UCBINSTALL) -c -m 644 mailx.1 $(DESTDIR)$(MANDIR)/man1/mailx.1 test -d $(DESTDIR)$(SYSCONFDIR) || mkdir -p $(DESTDIR)$(SYSCONFDIR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/nail/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Sep 2005 10:28:36 -0000 1.2 +++ .cvsignore 21 Mar 2006 15:05:24 -0000 1.3 @@ -1 +1 @@ -nail-11.25.tar.bz2 +mailx-12.0.tar.bz2 Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-3/nail.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nail.spec 17 Oct 2005 14:43:00 -0000 1.4 +++ nail.spec 21 Mar 2006 15:05:24 -0000 1.5 @@ -1,18 +1,17 @@ %define use_nss 0 +%define rename 1 Summary: Enhanced implementation of the mailx command Name: nail -Version: 11.25 -Release: 4%{?dist} +Version: 12.0 +Release: 1%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net -Source0: http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -# Note: it is just "lynx -source http://nail.sourceforge.net > nail.html" -Source1: nail.html +Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nail-11.25-config.patch -Patch1: nail-11.25-nostrip.patch +Patch1: nail-12.0-nostrip.patch %if %{use_nss} BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig @@ -36,11 +35,29 @@ %prep -%setup -q +%setup -q -n mailx-%{version} %patch0 -p1 %patch1 -p1 -cp %{SOURCE1} %{name}.html +%if %{rename} +# Use old name "nail" to avoid conflicts with the Core mailx package +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +' %{name}.rc + +mv mailx.1.html %{name}.html +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +s/MAILX/NAIL/g +s/Mailx/Nail/g +' %{name}.html +%endif %build @@ -56,7 +73,7 @@ BINDIR=%{_bindir} \ MANDIR=%{_mandir} \ SYSCONFDIR=%{_sysconfdir} \ - MAILRC=%{_sysconfdir}/nail.rc \ + MAILRC=%{_sysconfdir}/%{name}.rc \ MAILSPOOL=%{_localstatedir}/mail \ SENDMAIL=%{_sbindir}/sendmail \ UCBINSTALL=install \ @@ -69,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install +%if %{rename} +# rename to old name "nail", to avoid conflicts with the Core mailx package +mv -f $RPM_BUILD_ROOT%{_bindir}/mailx $RPM_BUILD_ROOT%{_bindir}/%{name} +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/mailx.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -77,12 +100,18 @@ %files %defattr(-,root,root) %doc COPYING AUTHORS README %{name}.html -%config(noreplace) %{_sysconfdir}/nail.rc -%{_bindir}/nail -%{_mandir}/man1/nail* +%config(noreplace) %{_sysconfdir}/%{name}.rc +%{_bindir}/%{name} +%{_mandir}/*/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 +- upgrade to 12.0 +- change new upstream name "mailx" to the old name "nail" to avoid + conflicts with the Core mailx package. +- drop Source1, use package's html file instead. + * Mon Oct 17 2005 Dmitry Butskoy - 11.25-4 - don't strip binaries on makeinstall (#170972) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nail/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 10:28:36 -0000 1.2 +++ sources 21 Mar 2006 15:05:24 -0000 1.3 @@ -1 +1 @@ -54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 +67e8236a73f8a2d85c45cf8a2bdf7af1 mailx-12.0.tar.bz2 --- nail-11.25-nostrip.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 15:08:40 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:08:40 -0500 Subject: rpms/nail/FC-3 nail.html,1.1,NONE Message-ID: <200603211508.k2LF8ghB026252@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26243 Removed Files: nail.html Log Message: --- nail.html DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 15:19:46 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:19:46 -0500 Subject: rpms/nail/FC-4 nail-12.0-nostrip.patch, NONE, 1.1 nail.spec, 1.4, 1.5 sources, 1.2, 1.3 nail-11.25-nostrip.patch, 1.1, NONE nail.html, 1.1, NONE Message-ID: <200603211520.k2LFKIcA026350@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26328 Modified Files: nail.spec sources Added Files: nail-12.0-nostrip.patch Removed Files: nail-11.25-nostrip.patch nail.html Log Message: nail-12.0-nostrip.patch: --- NEW FILE nail-12.0-nostrip.patch --- diff -Nrbu nail-11.25/Makefile nail-11.25-OK/Makefile --- nail-11.25/Makefile 2005-07-29 15:31:44.000000000 +0400 +++ nail-11.25-OK/Makefile 2005-10-17 12:45:26.000000000 +0400 @@ -96,7 +96,7 @@ install: all test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) - $(UCBINSTALL) -c -s mailx $(DESTDIR)$(BINDIR)/mailx + $(UCBINSTALL) -c mailx $(DESTDIR)$(BINDIR)/mailx test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1 $(UCBINSTALL) -c -m 644 mailx.1 $(DESTDIR)$(MANDIR)/man1/mailx.1 test -d $(DESTDIR)$(SYSCONFDIR) || mkdir -p $(DESTDIR)$(SYSCONFDIR) Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-4/nail.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- nail.spec 17 Oct 2005 14:42:33 -0000 1.4 +++ nail.spec 21 Mar 2006 15:19:45 -0000 1.5 @@ -1,18 +1,17 @@ %define use_nss 0 +%define rename 1 Summary: Enhanced implementation of the mailx command Name: nail -Version: 11.25 -Release: 4%{?dist} +Version: 12.0 +Release: 1%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net -Source0: http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -# Note: it is just "lynx -source http://nail.sourceforge.net > nail.html" -Source1: nail.html +Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nail-11.25-config.patch -Patch1: nail-11.25-nostrip.patch +Patch1: nail-12.0-nostrip.patch %if %{use_nss} BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig @@ -36,11 +35,29 @@ %prep -%setup -q +%setup -q -n mailx-%{version} %patch0 -p1 %patch1 -p1 -cp %{SOURCE1} %{name}.html +%if %{rename} +# Use old name "nail" to avoid conflicts with the Core mailx package +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +' %{name}.rc + +mv mailx.1.html %{name}.html +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +s/MAILX/NAIL/g +s/Mailx/Nail/g +' %{name}.html +%endif %build @@ -56,7 +73,7 @@ BINDIR=%{_bindir} \ MANDIR=%{_mandir} \ SYSCONFDIR=%{_sysconfdir} \ - MAILRC=%{_sysconfdir}/nail.rc \ + MAILRC=%{_sysconfdir}/%{name}.rc \ MAILSPOOL=%{_localstatedir}/mail \ SENDMAIL=%{_sbindir}/sendmail \ UCBINSTALL=install \ @@ -69,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install +%if %{rename} +# rename to old name "nail", to avoid conflicts with the Core mailx package +mv -f $RPM_BUILD_ROOT%{_bindir}/mailx $RPM_BUILD_ROOT%{_bindir}/%{name} +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/mailx.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -77,12 +100,18 @@ %files %defattr(-,root,root) %doc COPYING AUTHORS README %{name}.html -%config(noreplace) %{_sysconfdir}/nail.rc -%{_bindir}/nail -%{_mandir}/man1/nail* +%config(noreplace) %{_sysconfdir}/%{name}.rc +%{_bindir}/%{name} +%{_mandir}/*/* %changelog +* Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 +- upgrade to 12.0 +- change new upstream name "mailx" to the old name "nail" to avoid + conflicts with the Core mailx package. +- drop Source1, use package's html file instead. + * Mon Oct 17 2005 Dmitry Butskoy - 11.25-4 - don't strip binaries on makeinstall (#170972) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nail/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 10:28:36 -0000 1.2 +++ sources 21 Mar 2006 15:19:45 -0000 1.3 @@ -1 +1 @@ -54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 +67e8236a73f8a2d85c45cf8a2bdf7af1 mailx-12.0.tar.bz2 --- nail-11.25-nostrip.patch DELETED --- --- nail.html DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 15:21:32 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:21:32 -0500 Subject: rpms/nail/FC-5 nail-12.0-nostrip.patch, NONE, 1.1 nail.spec, 1.9, 1.10 sources, 1.2, 1.3 nail-11.25-nostrip.patch, 1.1, NONE nail.html, 1.1, NONE Message-ID: <200603211522.k2LFM4Co026436@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26409 Modified Files: nail.spec sources Added Files: nail-12.0-nostrip.patch Removed Files: nail-11.25-nostrip.patch nail.html Log Message: nail-12.0-nostrip.patch: --- NEW FILE nail-12.0-nostrip.patch --- diff -Nrbu nail-11.25/Makefile nail-11.25-OK/Makefile --- nail-11.25/Makefile 2005-07-29 15:31:44.000000000 +0400 +++ nail-11.25-OK/Makefile 2005-10-17 12:45:26.000000000 +0400 @@ -96,7 +96,7 @@ install: all test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) - $(UCBINSTALL) -c -s mailx $(DESTDIR)$(BINDIR)/mailx + $(UCBINSTALL) -c mailx $(DESTDIR)$(BINDIR)/mailx test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1 $(UCBINSTALL) -c -m 644 mailx.1 $(DESTDIR)$(MANDIR)/man1/mailx.1 test -d $(DESTDIR)$(SYSCONFDIR) || mkdir -p $(DESTDIR)$(SYSCONFDIR) Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-5/nail.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nail.spec 15 Feb 2006 12:21:25 -0000 1.9 +++ nail.spec 21 Mar 2006 15:21:32 -0000 1.10 @@ -1,18 +1,17 @@ %define use_nss 0 +%define rename 1 Summary: Enhanced implementation of the mailx command Name: nail -Version: 11.25 -Release: 6%{?dist} +Version: 12.0 +Release: 1%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net -Source0: http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -# Note: it is just "lynx -source http://nail.sourceforge.net > nail.html" -Source1: nail.html +Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nail-11.25-config.patch -Patch1: nail-11.25-nostrip.patch +Patch1: nail-12.0-nostrip.patch %if %{use_nss} BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig @@ -36,11 +35,29 @@ %prep -%setup -q +%setup -q -n mailx-%{version} %patch0 -p1 %patch1 -p1 -cp %{SOURCE1} %{name}.html +%if %{rename} +# Use old name "nail" to avoid conflicts with the Core mailx package +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +' %{name}.rc + +mv mailx.1.html %{name}.html +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +s/MAILX/NAIL/g +s/Mailx/Nail/g +' %{name}.html +%endif %build @@ -56,7 +73,7 @@ BINDIR=%{_bindir} \ MANDIR=%{_mandir} \ SYSCONFDIR=%{_sysconfdir} \ - MAILRC=%{_sysconfdir}/nail.rc \ + MAILRC=%{_sysconfdir}/%{name}.rc \ MAILSPOOL=%{_localstatedir}/mail \ SENDMAIL=%{_sbindir}/sendmail \ UCBINSTALL=install \ @@ -69,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install +%if %{rename} +# rename to old name "nail", to avoid conflicts with the Core mailx package +mv -f $RPM_BUILD_ROOT%{_bindir}/mailx $RPM_BUILD_ROOT%{_bindir}/%{name} +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/mailx.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -77,17 +100,17 @@ %files %defattr(-,root,root) %doc COPYING AUTHORS README %{name}.html -%config(noreplace) %{_sysconfdir}/nail.rc -%{_bindir}/nail -%{_mandir}/man1/nail* +%config(noreplace) %{_sysconfdir}/%{name}.rc +%{_bindir}/%{name} +%{_mandir}/*/* %changelog -* Wed Feb 15 2006 Dmitry Butskoy - 11.25-6 -- rebuild for FC5 - -* Wed Nov 16 2005 Dmitry Butskoy - 11.25-5 -- rebuild. +* Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 +- upgrade to 12.0 +- change new upstream name "mailx" to the old name "nail" to avoid + conflicts with the Core mailx package. +- drop Source1, use package's html file instead. * Mon Oct 17 2005 Dmitry Butskoy - 11.25-4 - don't strip binaries on makeinstall (#170972) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nail/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 10:28:36 -0000 1.2 +++ sources 21 Mar 2006 15:21:32 -0000 1.3 @@ -1 +1 @@ -54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 +67e8236a73f8a2d85c45cf8a2bdf7af1 mailx-12.0.tar.bz2 --- nail-11.25-nostrip.patch DELETED --- --- nail.html DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 15:23:53 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:23:53 -0500 Subject: rpms/nail/devel nail-12.0-nostrip.patch, NONE, 1.1 nail.spec, 1.9, 1.10 sources, 1.2, 1.3 nail-11.25-nostrip.patch, 1.1, NONE nail.html, 1.1, NONE Message-ID: <200603211524.k2LFOP3T026562@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26537 Modified Files: nail.spec sources Added Files: nail-12.0-nostrip.patch Removed Files: nail-11.25-nostrip.patch nail.html Log Message: nail-12.0-nostrip.patch: --- NEW FILE nail-12.0-nostrip.patch --- diff -Nrbu nail-11.25/Makefile nail-11.25-OK/Makefile --- nail-11.25/Makefile 2005-07-29 15:31:44.000000000 +0400 +++ nail-11.25-OK/Makefile 2005-10-17 12:45:26.000000000 +0400 @@ -96,7 +96,7 @@ install: all test -d $(DESTDIR)$(BINDIR) || mkdir -p $(DESTDIR)$(BINDIR) - $(UCBINSTALL) -c -s mailx $(DESTDIR)$(BINDIR)/mailx + $(UCBINSTALL) -c mailx $(DESTDIR)$(BINDIR)/mailx test -d $(DESTDIR)$(MANDIR)/man1 || mkdir -p $(DESTDIR)$(MANDIR)/man1 $(UCBINSTALL) -c -m 644 mailx.1 $(DESTDIR)$(MANDIR)/man1/mailx.1 test -d $(DESTDIR)$(SYSCONFDIR) || mkdir -p $(DESTDIR)$(SYSCONFDIR) Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/devel/nail.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- nail.spec 15 Feb 2006 12:21:25 -0000 1.9 +++ nail.spec 21 Mar 2006 15:23:52 -0000 1.10 @@ -1,18 +1,17 @@ %define use_nss 0 +%define rename 1 Summary: Enhanced implementation of the mailx command Name: nail -Version: 11.25 -Release: 6%{?dist} +Version: 12.0 +Release: 1%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net -Source0: http://surfnet.dl.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 -# Note: it is just "lynx -source http://nail.sourceforge.net > nail.html" -Source1: nail.html +Source0: http://dl.sourceforge.net/heirloom/mailx-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch0: nail-11.25-config.patch -Patch1: nail-11.25-nostrip.patch +Patch1: nail-12.0-nostrip.patch %if %{use_nss} BuildRequires: mozilla-nss-devel, mozilla-nspr-devel, pkgconfig @@ -36,11 +35,29 @@ %prep -%setup -q +%setup -q -n mailx-%{version} %patch0 -p1 %patch1 -p1 -cp %{SOURCE1} %{name}.html +%if %{rename} +# Use old name "nail" to avoid conflicts with the Core mailx package +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +' %{name}.rc + +mv mailx.1.html %{name}.html +sed -i '/Heirloom/ { + p + n +} +s/mailx/nail/g +s/MAILX/NAIL/g +s/Mailx/Nail/g +' %{name}.html +%endif %build @@ -56,7 +73,7 @@ BINDIR=%{_bindir} \ MANDIR=%{_mandir} \ SYSCONFDIR=%{_sysconfdir} \ - MAILRC=%{_sysconfdir}/nail.rc \ + MAILRC=%{_sysconfdir}/%{name}.rc \ MAILSPOOL=%{_localstatedir}/mail \ SENDMAIL=%{_sbindir}/sendmail \ UCBINSTALL=install \ @@ -69,6 +86,12 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT `cat makeflags` install +%if %{rename} +# rename to old name "nail", to avoid conflicts with the Core mailx package +mv -f $RPM_BUILD_ROOT%{_bindir}/mailx $RPM_BUILD_ROOT%{_bindir}/%{name} +mv -f $RPM_BUILD_ROOT%{_mandir}/man1/mailx.1 $RPM_BUILD_ROOT%{_mandir}/man1/%{name}.1 +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -77,17 +100,17 @@ %files %defattr(-,root,root) %doc COPYING AUTHORS README %{name}.html -%config(noreplace) %{_sysconfdir}/nail.rc -%{_bindir}/nail -%{_mandir}/man1/nail* +%config(noreplace) %{_sysconfdir}/%{name}.rc +%{_bindir}/%{name} +%{_mandir}/*/* %changelog -* Wed Feb 15 2006 Dmitry Butskoy - 11.25-6 -- rebuild for FC5 - -* Wed Nov 16 2005 Dmitry Butskoy - 11.25-5 -- rebuild. +* Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 +- upgrade to 12.0 +- change new upstream name "mailx" to the old name "nail" to avoid + conflicts with the Core mailx package. +- drop Source1, use package's html file instead. * Mon Oct 17 2005 Dmitry Butskoy - 11.25-4 - don't strip binaries on makeinstall (#170972) Index: sources =================================================================== RCS file: /cvs/extras/rpms/nail/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Sep 2005 10:28:36 -0000 1.2 +++ sources 21 Mar 2006 15:23:52 -0000 1.3 @@ -1 +1 @@ -54f42db31911d734fcf37a89b72d4df7 nail-11.25.tar.bz2 +67e8236a73f8a2d85c45cf8a2bdf7af1 mailx-12.0.tar.bz2 --- nail-11.25-nostrip.patch DELETED --- --- nail.html DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 15:39:54 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 21 Mar 2006 10:39:54 -0500 Subject: rpms/bigloo/FC-4 .cvsignore, 1.4, 1.5 bigloo.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603211540.k2LFeQPD026890@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26867 Modified Files: .cvsignore bigloo.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Mar 2006 16:07:23 -0000 1.4 +++ .cvsignore 21 Mar 2006 15:39:54 -0000 1.5 @@ -1 +1 @@ -bigloo2.8a-alpha13Mar06.tar.gz +bigloo2.8a-alpha21Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/bigloo.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- bigloo.spec 13 Mar 2006 16:07:24 -0000 1.5 +++ bigloo.spec 21 Mar 2006 15:39:54 -0000 1.6 @@ -2,14 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060313%{?dist} +Release: 1.20060321%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha13Mar06.tar.gz -Patch0: bigloo-bmem.patch +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -69,8 +68,6 @@ %prep %setup -q -n %{name}%{version} -# disable bmem for now -# %patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -203,7 +200,10 @@ %changelog -* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 +- new version 2.8a-20060321 + +* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 * Mon Nov 28 2005 Gerard Milmeister - 2.7a-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Mar 2006 16:07:24 -0000 1.4 +++ sources 21 Mar 2006 15:39:54 -0000 1.5 @@ -1 +1 @@ -c545f654bfcc274a0eec5382ab00f58e bigloo2.8a-alpha13Mar06.tar.gz +de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 15:42:14 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 21 Mar 2006 10:42:14 -0500 Subject: rpms/bigloo/FC-5 .cvsignore, 1.4, 1.5 bigloo.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603211542.k2LFgkYY026972@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26934/FC-5 Modified Files: .cvsignore bigloo.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Mar 2006 16:33:53 -0000 1.4 +++ .cvsignore 21 Mar 2006 15:42:14 -0000 1.5 @@ -1 +1 @@ -bigloo2.8a-alpha13Mar06.tar.gz +bigloo2.8a-alpha21Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/bigloo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bigloo.spec 13 Mar 2006 16:33:53 -0000 1.6 +++ bigloo.spec 21 Mar 2006 15:42:14 -0000 1.7 @@ -2,14 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060313%{?dist} +Release: 1.20060321%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha13Mar06.tar.gz -Patch0: bigloo-bmem.patch +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -69,8 +68,6 @@ %prep %setup -q -n %{name}%{version} -# disable bmem for now -# %patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -203,7 +200,10 @@ %changelog -* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 +- new version 2.8a-20060321 + +* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 * Mon Nov 28 2005 Gerard Milmeister - 2.7a-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Mar 2006 16:33:53 -0000 1.4 +++ sources 21 Mar 2006 15:42:14 -0000 1.5 @@ -1 +1 @@ -c545f654bfcc274a0eec5382ab00f58e bigloo2.8a-alpha13Mar06.tar.gz +de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 15:42:20 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Tue, 21 Mar 2006 10:42:20 -0500 Subject: rpms/bigloo/devel .cvsignore, 1.4, 1.5 bigloo.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603211542.k2LFgqqb026977@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26934/devel Modified Files: .cvsignore bigloo.spec sources Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 13 Mar 2006 16:33:53 -0000 1.4 +++ .cvsignore 21 Mar 2006 15:42:19 -0000 1.5 @@ -1 +1 @@ -bigloo2.8a-alpha13Mar06.tar.gz +bigloo2.8a-alpha21Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/bigloo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bigloo.spec 13 Mar 2006 16:33:53 -0000 1.6 +++ bigloo.spec 21 Mar 2006 15:42:19 -0000 1.7 @@ -2,14 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060313%{?dist} +Release: 1.20060321%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha13Mar06.tar.gz -Patch0: bigloo-bmem.patch +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -69,8 +68,6 @@ %prep %setup -q -n %{name}%{version} -# disable bmem for now -# %patch0 -p1 perl -pi -e 's|bmask=755|bmask=644|' configure @@ -203,7 +200,10 @@ %changelog -* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 +- new version 2.8a-20060321 + +* Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 * Mon Nov 28 2005 Gerard Milmeister - 2.7a-2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 13 Mar 2006 16:33:53 -0000 1.4 +++ sources 21 Mar 2006 15:42:19 -0000 1.5 @@ -1 +1 @@ -c545f654bfcc274a0eec5382ab00f58e bigloo2.8a-alpha13Mar06.tar.gz +de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 15:44:24 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 10:44:24 -0500 Subject: rpms/nail/FC-5 nail.spec,1.10,1.11 Message-ID: <200603211544.k2LFivMC027162@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27140 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-5/nail.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nail.spec 21 Mar 2006 15:21:32 -0000 1.10 +++ nail.spec 21 Mar 2006 15:44:24 -0000 1.11 @@ -79,7 +79,8 @@ UCBINSTALL=install \ > makeflags -make %{?_smp_mflags} `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +# %{?_smp_mflags} cannot be used here +make `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install From fedora-extras-commits at redhat.com Tue Mar 21 15:48:39 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 21 Mar 2006 10:48:39 -0500 Subject: fedora-security/audit fc4,1.175,1.176 fc5,1.87,1.88 Message-ID: <200603211548.k2LFmd3h027249@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27225 Modified Files: fc4 fc5 Log Message: Sort the files since from time to time I put lines in the wrong places Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.175 retrieving revision 1.176 diff -u -r1.175 -r1.176 --- fc4 20 Mar 2006 16:09:19 -0000 1.175 +++ fc4 21 Mar 2006 15:48:32 -0000 1.176 @@ -8,7 +8,7 @@ CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability -CVE-2006-1061 ignore (curl, 7.15.0 - 7.15.2 only) +CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only) CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe @@ -41,33 +41,33 @@ CVE-2006-0377 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133] CVE-2006-0369 ignore (mysql) this is not a security issue CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected -CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104] CVE-2006-0301 version (poppler, fixed 0.4.5) [since FEDORA-2006-103] +CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104] CVE-2006-0301 backport (kdegraphics) [since FEDORA-2006-105] CVE-2006-0300 VULNERABLE (tar) bz#181773 -CVE-2006-0299 version (firefox, 1.5 only) -CVE-2006-0299 version (mozilla, 1.8 branch only) CVE-2006-0299 version (thunderbird, 1.5 only) -CVE-2006-0298 version (firefox, 1.5 only) -CVE-2006-0298 version (mozilla, 1.8 branch only) +CVE-2006-0299 version (mozilla, 1.8 branch only) +CVE-2006-0299 version (firefox, 1.5 only) CVE-2006-0298 version (thunderbird, 1.5 only) -CVE-2006-0297 version (firefox, 1.5 only) -CVE-2006-0297 version (mozilla, 1.8 branch only) +CVE-2006-0298 version (mozilla, 1.8 branch only) +CVE-2006-0298 version (firefox, 1.5 only) CVE-2006-0297 version (thunderbird, 1.5 only) -CVE-2006-0296 backport (firefox) [since FEDORA-2006-076] +CVE-2006-0297 version (mozilla, 1.8 branch only) +CVE-2006-0297 version (firefox, 1.5 only) CVE-2006-0296 backport (mozilla) [since FEDORA-2006-075] +CVE-2006-0296 backport (firefox) [since FEDORA-2006-076] CVE-2006-0296 VULNERABLE (thunderbird) -CVE-2006-0295 version (firefox, 1.5 only) -CVE-2006-0295 version (mozilla, 1.8 branch only) CVE-2006-0295 version (thunderbird, 1.5 only) -CVE-2006-0294 version (firefox, 1.5 only) -CVE-2006-0294 version (mozilla, 1.8 branch only) +CVE-2006-0295 version (mozilla, 1.8 branch only) +CVE-2006-0295 version (firefox, 1.5 only) CVE-2006-0294 version (thunderbird, 1.5 only) -CVE-2006-0293 version (firefox, 1.5 only) -CVE-2006-0293 version (mozilla, 1.8 branch only) +CVE-2006-0294 version (mozilla, 1.8 branch only) +CVE-2006-0294 version (firefox, 1.5 only) CVE-2006-0293 version (thunderbird, 1.5 only) -CVE-2006-0292 backport (firefox) [since FEDORA-2006-076] +CVE-2006-0293 version (mozilla, 1.8 branch only) +CVE-2006-0293 version (firefox, 1.5 only) CVE-2006-0292 backport (mozilla) [since FEDORA-2006-075] +CVE-2006-0292 backport (firefox) [since FEDORA-2006-076] CVE-2006-0292 VULNERABLE (thunderbird) CVE-2006-0254 VULNERABLE (tomcat5, fixed 5.5.16) bz#178178 CVE-2006-0236 ignore (thunderbird) windows only flaw @@ -88,9 +88,9 @@ CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050 +CVE-2005-4720 VULNERABLE (thunderbird) CVE-2005-4720 VULNERABLE (mozilla) CVE-2005-4720 VULNERABLE (firefox) -CVE-2005-4720 VULNERABLE (thunderbird) CVE-2005-4703 ignore (tomcat) windows only CVE-2005-4685 VULNERABLE (mozilla) CVE-2005-4685 VULNERABLE (firefox) @@ -141,30 +141,30 @@ CVE-2005-3632 version (netpbm) CVE-2005-3631 version (udev) CVE-2005-3629 ** initscripts -CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169] -CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3628 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 CVE-2005-3628 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 +CVE-2005-3628 backport (xpdf) [since FEDORA-2005-1169] +CVE-2005-3628 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3628 backport (cups) [since FEDORA-2005-1142] +CVE-2005-3627 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3627 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3627 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3627 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3627 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3627 backport (cups) [since FEDORA-2006-010] -CVE-2005-3627 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3626 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3626 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3626 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3626 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3626 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3626 backport (cups) [since FEDORA-2006-010] -CVE-2005-3626 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3625 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3625 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3625 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3625 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3625 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3625 backport (cups) [since FEDORA-2006-010] -CVE-2005-3625 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3624 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] +CVE-2005-3624 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 CVE-2005-3624 backport (xpdf) [since FEDORA-2005-027] CVE-2005-3624 backport (tetex) [since FEDORA-2006-028] -CVE-2005-3624 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 -CVE-2005-3624 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] CVE-2005-3624 backport (cups) [since FEDORA-2006-010] CVE-2005-3623 version (kernel, fixed 2.6.14.5) [since FEDORA-2006-077] was backport since FEDORA-2006-013 CVE-2005-3582 version (ImageMagick) gentoo only @@ -204,20 +204,20 @@ CVE-2005-3243 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] CVE-2005-3242 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] CVE-2005-3241 version (ethereal, fixed 0.10.13) [since FEDORA-2005-1011] -CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169] -CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3193 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 CVE-2005-3193 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 +CVE-2005-3193 backport (xpdf) [since FEDORA-2005-1169] +CVE-2005-3193 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3193 backport (cups) [since FEDORA-2005-1142] -CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169] -CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3192 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 CVE-2005-3192 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 +CVE-2005-3192 backport (xpdf) [since FEDORA-2005-1169] +CVE-2005-3192 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3192 backport (cups) [since FEDORA-2005-1142] -CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169] -CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3191 version (poppler, fixed 0.4.4) [since FEDORA-2005-026] was backport since FEDORA-2005-1171 CVE-2005-3191 version (kdegraphics, fixed 3.5.1) [since FEDORA-2006-088] was backport since FEDORA-2005-1160 +CVE-2005-3191 backport (xpdf) [since FEDORA-2005-1169] +CVE-2005-3191 backport (tetex) [since FEDORA-2005-1126] CVE-2005-3191 backport (cups) [since FEDORA-2005-1142] CVE-2005-3186 backport (gtk2) [since FEDORA-2005-1088] CVE-2005-3186 backport (gdk-pixbuf) [since FEDORA-2005-1085] Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.87 retrieving revision 1.88 diff -u -r1.87 -r1.88 --- fc5 21 Mar 2006 01:05:26 -0000 1.87 +++ fc5 21 Mar 2006 15:48:32 -0000 1.88 @@ -47,34 +47,34 @@ CVE-2006-0377 version (squirrelmail, fixed 1.4.6) CVE-2006-0369 ignore (mysql) this is not a security issue CVE-2006-0321 version (fetchmail, fixed 6.3.2) -CVE-2006-0301 backport (xpdf) xpdf-3.01pl2.patch CVE-2006-0301 version (poppler, fixed 0.4.5) +CVE-2006-0301 backport (xpdf) xpdf-3.01pl2.patch CVE-2006-0301 backport (kdegraphics) post-3.5.1-kdegraphics-CVE-2006-0301.diff CVE-2006-0300 VULNERABLE (tar) [fixed rawhide in tar-1.15.1-13] -CVE-2006-0299 version (firefox, fixed 1.5.0.1) -CVE-2006-0299 version (mozilla, 1.8 branch only) CVE-2006-0299 version (thunderbird, fixed 1.5) -CVE-2006-0298 version (firefox, fixed 1.5.0.1) -CVE-2006-0298 version (mozilla, 1.8 branch only) +CVE-2006-0299 version (mozilla, 1.8 branch only) +CVE-2006-0299 version (firefox, fixed 1.5.0.1) CVE-2006-0298 version (thunderbird, fixed 1.5) -CVE-2006-0297 version (firefox, fixed 1.5.0.1) -CVE-2006-0297 version (mozilla, 1.8 branch only) +CVE-2006-0298 version (mozilla, 1.8 branch only) +CVE-2006-0298 version (firefox, fixed 1.5.0.1) CVE-2006-0297 version (thunderbird, fixed 1.5) +CVE-2006-0297 version (mozilla, 1.8 branch only) +CVE-2006-0297 version (firefox, fixed 1.5.0.1) +CVE-2006-0296 version (thunderbird, fixed 1.5) CVE-2006-0296 version (firefox, fixed 1.5.0.1) CVE-2006-0296 backport (mozilla) mozilla-1.7.12-CVE-2006-0296-XULDocument.persist.patch -CVE-2006-0296 version (thunderbird, fixed 1.5) -CVE-2006-0295 version (firefox, fixed 1.5.0.1) -CVE-2006-0295 version (mozilla, 1.8 branch only) CVE-2006-0295 version (thunderbird, fixed 1.5) -CVE-2006-0294 version (firefox, fixed 1.5.0.1) -CVE-2006-0294 version (mozilla, 1.8 branch only) +CVE-2006-0295 version (mozilla, 1.8 branch only) +CVE-2006-0295 version (firefox, fixed 1.5.0.1) CVE-2006-0294 version (thunderbird, fixed 1.5) -CVE-2006-0293 version (firefox, fixed 1.5.0.1) -CVE-2006-0293 version (mozilla, 1.8 branch only) +CVE-2006-0294 version (mozilla, 1.8 branch only) +CVE-2006-0294 version (firefox, fixed 1.5.0.1) CVE-2006-0293 version (thunderbird, fixed 1.5) +CVE-2006-0293 version (mozilla, 1.8 branch only) +CVE-2006-0293 version (firefox, fixed 1.5.0.1) +CVE-2006-0292 version (thunderbird, fixed 1.5) CVE-2006-0292 version (firefox, fixed 1.5.1) CVE-2006-0292 backport (mozilla) mozilla-1.7.12-CVE-2006-0292-javascript-unrooted.patch -CVE-2006-0292 version (thunderbird, fixed 1.5) CVE-2006-0254 backport (tomcat5, fixed 5.5.16) **check this** CVE-2006-0236 ignore (thunderbird) windows only CVE-2006-0225 version (openssh, fixed 4.3p2) @@ -95,10 +95,10 @@ CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 CVE-2006-0035 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 CVE-2006-0019 version (kdelibs, fixed 3.5.1) -CVE-2005-4703 ignore (tomcat) windows only -CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS -CVE-2005-4720 version (firefox, fixed 1.5) CVE-2005-4720 version (thunderbird, fixed 1.5) +CVE-2005-4720 version (firefox, fixed 1.5) +CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS +CVE-2005-4703 ignore (tomcat) windows only CVE-2005-4685 VULNERABLE (mozilla) not fixed upstream CVE-2005-4685 VULNERABLE (firefox) not fixed upstream CVE-2005-4684 ignore (kdebase) not fixed upstream, low, can't fix @@ -115,8 +115,8 @@ CVE-2005-4158 ignore (sudo) only env_reset will properly clean the environment CVE-2005-4154 ignore (php) don't install untrusted pear packages CVE-2005-4153 backport (mailman) mailman-2.1.5-date_overflows.patch -CVE-2005-4134 backport (mozilla) mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch CVE-2005-4134 ignore (firefox) http://www.mozilla.org/security/history-title.html +CVE-2005-4134 backport (mozilla) mozilla-1.7.12-CVE-2005-4134-long-history-dos.patch CVE-2005-4130 ignore (HelixPlayer) not verified CVE-2005-4126 ignore (HelixPlayer) not verified CVE-2005-4077 version (curl, fixed 7.15.1) @@ -147,30 +147,30 @@ CVE-2005-3632 version (netpbm) CVE-2005-3631 version (udev) CVE-2005-3629 version (initscripts, fixed 8.29 at least) -CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch -CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3628 version (poppler, fixed 0.4.4) CVE-2005-3628 version (kdegraphics, fixed 3.5.1) +CVE-2005-3628 backport (xpdf) xpdf-3.01pl2.patch +CVE-2005-3628 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3628 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3627 backport (xpdf) xpdf-3.01pl2.patch -CVE-2005-3627 backport (tetex) CVE-2005-3627 version (poppler, fixed 0.4.4) CVE-2005-3627 version (kdegraphics, fixed 3.5.1) +CVE-2005-3627 backport (xpdf) xpdf-3.01pl2.patch +CVE-2005-3627 backport (tetex) CVE-2005-3627 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3626 backport (xpdf) xpdf-3.01pl2.patch -CVE-2005-3626 backport (tetex) CVE-2005-3626 version (poppler, fixed 0.4.4) CVE-2005-3626 version (kdegraphics, fixed 3.5.1) +CVE-2005-3626 backport (xpdf) xpdf-3.01pl2.patch +CVE-2005-3626 backport (tetex) CVE-2005-3626 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3625 backport (xpdf) xpdf-3.01pl2.patch -CVE-2005-3625 backport (tetex) CVE-2005-3625 version (poppler, fixed 0.4.4) CVE-2005-3625 version (kdegraphics, fixed 3.5.1) +CVE-2005-3625 backport (xpdf) xpdf-3.01pl2.patch +CVE-2005-3625 backport (tetex) CVE-2005-3625 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3624 backport (xpdf) xpdf-3.01pl2.patch -CVE-2005-3624 backport (tetex) CVE-2005-3624 version (poppler, fixed 0.4.4) CVE-2005-3624 version (kdegraphics, fixed 3.5.1) +CVE-2005-3624 backport (xpdf) xpdf-3.01pl2.patch +CVE-2005-3624 backport (tetex) CVE-2005-3624 backport (cups) cups-CVE-2005-3625,6,7.patch CVE-2005-3623 version (kernel, fixed 2.6.14.5) CVE-2005-3582 version (ImageMagick) gentoo only @@ -209,21 +209,21 @@ CVE-2005-3243 version (ethereal, fixed 0.10.13) CVE-2005-3242 version (ethereal, fixed 0.10.13) CVE-2005-3241 version (ethereal, fixed 0.10.13) +CVE-2005-3193 version (poppler, fixed 0.4.4) +CVE-2005-3193 version (kdegraphics, fixed 3.5.1) CVE-2005-3193 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3193 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3193 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3193 version (poppler, fixed 0.4.4) -CVE-2005-3193 version (kdegraphics, fixed 3.5.1) +CVE-2005-3192 version (poppler, fixed 0.4.4) +CVE-2005-3192 version (kdegraphics, fixed 3.5.1) CVE-2005-3192 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3192 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3192 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3192 version (poppler, fixed 0.4.4) -CVE-2005-3192 version (kdegraphics, fixed 3.5.1) +CVE-2005-3191 version (poppler, fixed 0.4.4) +CVE-2005-3191 version (kdegraphics, fixed 3.5.1) CVE-2005-3191 backport (xpdf) xpdf-3.01pl2.patch CVE-2005-3191 backport (tetex) tetex-3.0-CVE-2005-3193.patch CVE-2005-3191 backport (cups) cups-CVE-2005-3625,6,7.patch -CVE-2005-3191 version (poppler, fixed 0.4.4) -CVE-2005-3191 version (kdegraphics, fixed 3.5.1) CVE-2005-3186 version (gtk2, fixed 2.8.7 at least) CVE-2005-3186 backport (gdk-pixbuf) CVE-2005-3185 version (wget, fixed 1.10.2 at least) From fedora-extras-commits at redhat.com Tue Mar 21 16:06:59 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 11:06:59 -0500 Subject: rpms/nail/devel nail.spec,1.10,1.11 Message-ID: <200603211607.k2LG7VRK029309@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29283 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/devel/nail.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- nail.spec 21 Mar 2006 15:23:52 -0000 1.10 +++ nail.spec 21 Mar 2006 16:06:59 -0000 1.11 @@ -79,7 +79,8 @@ UCBINSTALL=install \ > makeflags -make %{?_smp_mflags} `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +# %{?_smp_mflags} cannot be used here +make `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install From fedora-extras-commits at redhat.com Tue Mar 21 16:08:34 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 11:08:34 -0500 Subject: rpms/nail/FC-4 nail.spec,1.5,1.6 Message-ID: <200603211609.k2LG96pM029384@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29363 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-4/nail.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nail.spec 21 Mar 2006 15:19:45 -0000 1.5 +++ nail.spec 21 Mar 2006 16:08:33 -0000 1.6 @@ -79,7 +79,8 @@ UCBINSTALL=install \ > makeflags -make %{?_smp_mflags} `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +# %{?_smp_mflags} cannot be used here +make `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install From fedora-extras-commits at redhat.com Tue Mar 21 16:09:46 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Tue, 21 Mar 2006 11:09:46 -0500 Subject: rpms/nail/FC-3 nail.spec,1.5,1.6 Message-ID: <200603211610.k2LGAI4C029434@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29415 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-3/nail.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- nail.spec 21 Mar 2006 15:05:24 -0000 1.5 +++ nail.spec 21 Mar 2006 16:09:45 -0000 1.6 @@ -79,7 +79,8 @@ UCBINSTALL=install \ > makeflags -make %{?_smp_mflags} `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" +# %{?_smp_mflags} cannot be used here +make `cat makeflags` CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %install From fedora-extras-commits at redhat.com Tue Mar 21 16:15:52 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Tue, 21 Mar 2006 11:15:52 -0500 Subject: fedora-security/audit fc4,1.176,1.177 fc5,1.88,1.89 Message-ID: <200603211615.k2LGFqrX029495@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29476 Modified Files: fc4 fc5 Log Message: Expand the mozilla,firefox,thunderbird text we used in fc4 to make an easier comparison with fc5 file. Do a diff with fc4 to fc5 as a sanity check to make sure we're not missing anything. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.176 retrieving revision 1.177 diff -u -r1.176 -r1.177 --- fc4 21 Mar 2006 15:48:32 -0000 1.176 +++ fc4 21 Mar 2006 16:15:43 -0000 1.177 @@ -3,12 +3,14 @@ ** are items that need attention +CVE-2006-1273 ** firefox (prob win only, vague) CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only) +CVE-2006-1052 ** kernel CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe CVE-2006-1014 ignore (php) safe mode isn't safe @@ -17,6 +19,7 @@ CVE-2006-0836 version (thunderbird, 1.5 only) CVE-2006-0746 VULNERABLE (kpdf) bz#184308 CVE-2006-0745 version (xorg-x11) not fc4 +CVE-2006-0744 ** kernel CVE-2006-0742 VULNERABLE (kernel) CVE-2006-0741 backport (kernel) [since FEDORA-2006-131] patch-2.6.15.5 CVE-2006-0730 version (dovecot, 1.0beta[12] only) @@ -494,15 +497,22 @@ CVE-2005-1175 backport (krb5) [since FEDORA-2005-553] CVE-2005-1174 backport (krb5) [since FEDORA-2005-553] CVE-2005-1160 version (thunderbird) [since FEDORA-2005-606] -CVE-2005-1160 version (firefox, mozilla) +CVE-2005-1160 version (firefox) +CVE-2005-1160 version (mozilla) CVE-2005-1159 version (thunderbird) [since FEDORA-2005-606] -CVE-2005-1159 version (firefox, mozilla) +CVE-2005-1159 version (firefox) +CVE-2005-1159 version (mozilla) CVE-2005-1158 version (firefox, fixed 1.0.3) -CVE-2005-1157 version (firefox, mozilla) -CVE-2005-1156 version (firefox, mozilla) -CVE-2005-1155 version (firefox, mozilla) -CVE-2005-1154 version (firefox, mozilla) -CVE-2005-1153 version (firefox, mozilla) +CVE-2005-1157 version (firefox) +CVE-2005-1157 version (mozilla) +CVE-2005-1156 version (firefox) +CVE-2005-1156 version (mozilla) +CVE-2005-1155 version (firefox) +CVE-2005-1155 version (mozilla) +CVE-2005-1154 version (firefox) +CVE-2005-1154 version (mozilla) +CVE-2005-1153 version (firefox) +CVE-2005-1153 version (mozilla) CVE-2005-1111 backport (cpio) from srpm CVE-2005-1065 version (tetex, not upstream) CVE-2005-1061 version (logwatch, in 4.3.2 at least) @@ -565,20 +575,31 @@ CVE-2005-0627 version (qt, fixed 3.3.4) CVE-2005-0626 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA CVE-2005-0605 backport (xorg-x11) ...-fix-CAN-2005-0605.patch +CVE-2005-0605 ** openmotif CVE-2005-0602 VULNERABLE (unzip, fixed 5.52) not in srpm CVE-2005-0596 version (php, fixed 5.0) -CVE-2005-0593 version (firefox, mozilla) -CVE-2005-0592 version (firefox, mozilla) +CVE-2005-0593 version (firefox) +CVE-2005-0593 version (mozilla) +CVE-2005-0592 version (firefox) +CVE-2005-0592 version (mozilla) CVE-2005-0591 version (firefox, fixed 1.0.1) CVE-2005-0590 version (openswan, fixed 2.1.4) -CVE-2005-0590 version (firefox, mozilla, thunderbird) +CVE-2005-0590 version (firefox) +CVE-2005-0590 version (mozilla) +CVE-2005-0590 version (thunderbird) CVE-2005-0589 version (firefox, fixed 1.0.1) -CVE-2005-0588 version (firefox, mozilla) -CVE-2005-0587 version (firefox, mozilla) -CVE-2005-0586 version (firefox, mozilla) -CVE-2005-0585 version (firefox, mozilla) -CVE-2005-0584 version (firefox, mozilla) -CVE-2005-0578 version (firefox, mozilla) +CVE-2005-0588 version (firefox) +CVE-2005-0588 version (mozilla) +CVE-2005-0587 version (firefox) +CVE-2005-0587 version (mozilla) +CVE-2005-0586 version (firefox) +CVE-2005-0586 version (mozilla) +CVE-2005-0585 version (firefox) +CVE-2005-0585 version (mozilla) +CVE-2005-0584 version (firefox) +CVE-2005-0584 version (mozilla) +CVE-2005-0578 version (firefox) +CVE-2005-0578 version (mozilla) CVE-2005-0565 version (kernel, not 2.6) CVE-2005-0532 version (kernel, fixed 2.6.11) CVE-2005-0531 version (kernel, fixed 2.6.11) @@ -607,7 +628,9 @@ CVE-2005-0401 version (mozilla, fixed 1.7.7) CVE-2005-0401 version (firefox, fixed 1.0.2) CVE-2005-0400 version (kernel, fixed in bk since 20050325, therefore 2.6.11.6) [since FEDORA-2005-510] was backport -CVE-2005-0399 version (mozilla, Firefox, thunderbird) +CVE-2005-0399 version (mozilla) +CVE-2005-0399 verison (firefox) +CVE-2005-0399 version (thunderbird) CVE-2005-0398 version (ipsec-tools, fixed 0.5) CVE-2005-0397 version (ImageMagick, fixed 6.0.2.5) CVE-2005-0396 version (kdelibs, fixed 3.4.0) @@ -660,14 +683,22 @@ CVE-2005-0155 backport (perl, not 5.8.6) perl-5.8.5-CAN-2005-0155+0156.patch CVE-2005-0152 version (squirrelmail, not 1.4) CVE-2005-0150 version (firefox, fixed 1.0) -CVE-2005-0149 version (mozilla, firefox) -CVE-2005-0147 version (mozilla, firefox) -CVE-2005-0146 version (mozilla, firefox) +CVE-2005-0149 version (mozilla) +CVE-2005-0149 version (firefox) +CVE-2005-0147 version (mozilla) +CVE-2005-0147 version (firefox) +CVE-2005-0146 version (mozilla) +CVE-2005-0146 version (firefox) CVE-2005-0145 version (firefox, fixed 1.0) -CVE-2005-0144 version (mozilla, firefox) -CVE-2005-0143 version (mozilla, firefox) -CVE-2005-0142 version (mozilla, firefox, thunderbird) -CVE-2005-0141 version (mozilla, firefox) +CVE-2005-0144 version (mozilla) +CVE-2005-0144 version (firefox) +CVE-2005-0143 version (mozilla) +CVE-2005-0143 version (firefox) +CVE-2005-0142 version (mozilla) +CVE-2005-0142 version (firefox) +CVE-2005-0142 version (thunderbird) +CVE-2005-0141 version (mozilla) +CVE-2005-0141 version (firefox) CVE-2005-0137 version (kernel, not 2.6) CVE-2005-0135 version (kernel, fixed 2.6.11) CVE-2005-0124 version (kernel, fixed 2.6.11) @@ -751,7 +782,8 @@ CVE-2004-1761 version (ethereal, fixed 0.10.3) CVE-2004-1689 version (sudo, fixed 1.6.8p1) CVE-2004-1653 ignore (openssh) -CVE-2004-1639 version (mozilla, firefox) +CVE-2004-1639 version (mozilla) +CVE-2004-1639 version (firefox) CVE-2004-1617 ignore (lynx) not able to verify flaw CVE-2004-1614 version (mozilla, fixed 1.7.5) CVE-2004-1613 version (mozilla, fixed 1.7.5) @@ -759,13 +791,21 @@ CVE-2004-1471 version (cvs, fixed 1.12.9) CVE-2004-1453 version (glibc, fixed 2.3.5) CVE-2004-1452 version (tomcat, fixed 5.0.27-r3) -CVE-2004-1451 version (mozilla, firefox, thunderbird) -CVE-2004-1450 version (mozilla, firefox, thunderbird) -CVE-2004-1449 version (mozilla, firefox, thunderbird) +CVE-2004-1451 version (mozilla) +CVE-2004-1451 version (firefox) +CVE-2004-1451 version (thunderbird) +CVE-2004-1450 version (mozilla) +CVE-2004-1450 version (firefox) +CVE-2004-1450 version (thunderbird) +CVE-2004-1449 version (mozilla) +CVE-2004-1449 version (firefox) +CVE-2004-1449 verison (thunderbird) CVE-2004-1392 version (php, fixed 5.0.4) CVE-2004-1382 version (glibc, not 2.3.5) -CVE-2004-1381 version (firefox, mozilla) -CVE-2004-1380 version (firefox, mozilla) +CVE-2004-1381 version (firefox) +CVE-2004-1381 version (mozilla) +CVE-2004-1380 version (firefox) +CVE-2004-1380 version (mozilla) CVE-2004-1377 backport (a2ps, fixed 4.13?) patch included in srpm CVE-2004-1337 version (kernel, fixed 2.6.11) CVE-2004-1336 version (tetex, fixed 3.0) at least, checked source @@ -888,10 +928,17 @@ CVE-2004-0923 version (cups, fixed 1.2.22) CVE-2004-0918 version (squid, fixed 2.4.STABLE7) CVE-2004-0914 version (xorg-x11, fixed after 6.8.1) -CVE-2004-0909 version (Mozilla, Thunderbird, Firefox) +CVE-2004-0914 ** openmotif +CVE-2004-0909 version (mozilla) +CVE-2004-0909 version (thunderbird) +CVE-2004-0909 version (firefox) CVE-2004-0908 version (mozilla #133021, fixed 1.7.3) -CVE-2004-0907 version (Mozilla, Thunderbird, Firefox) -CVE-2004-0906 version (Mozilla, Thunderbird, Firefox) +CVE-2004-0907 version (mozilla) +CVE-2004-0907 version (thunderbird) +CVE-2004-0907 version (firefox) +CVE-2004-0906 version (mozilla) +CVE-2004-0906 version (thunderbird) +CVE-2004-0906 version (firefox) CVE-2004-0905 version (mozilla #133012, fixed 1.7.3) CVE-2004-0904 version (mozilla #133014, fixed 1.7.3) CVE-2004-0903 version (mozilla #133016, fixed 1.7.3) @@ -952,7 +999,9 @@ CVE-2004-0783 version (gdk-pixbuf, fixed 0.22) CVE-2004-0782 version (gtk2, fixed 2.6.7 at least by inspection) CVE-2004-0782 version (gdk-pixbuf, fixed 0.22) -CVE-2004-0779 version (mozilla, firefox, thunderbird) +CVE-2004-0779 version (mozilla) +CVE-2004-0779 version (firefox) +CVE-2004-0779 version (thunderbird) CVE-2004-0778 version (cvs, fixed 1.11.17) CVE-2004-0772 version (krb5, fixed after 1.2.8) CVE-2004-0771 backport (lha, changelog) @@ -994,7 +1043,9 @@ CVE-2004-0686 version (samba, fixed 3.0.6) CVE-2004-0685 version (kernel, not 2.6) CVE-2004-0658 ignore (kernel) not a security issue -CVE-2004-0648 version (mozilla, firefox, thunderbird) +CVE-2004-0648 version (mozilla) +CVE-2004-0648 version (firefox) +CVE-2004-0648 version (thunderbird) CVE-2004-0644 version (krb5, fixed after 1.3.4) CVE-2004-0643 version (krb5, fixed after 1.3.1) CVE-2004-0642 version (krb5, fixed after 1.3.4) @@ -1219,12 +1270,10 @@ CVE-2003-0775 version (sane-backends, fixed 1.0.10) CVE-2003-0774 version (sane-backends, fixed 1.0.10) CVE-2003-0773 version (sane-backends, fixed 1.0.10) -CVE-2003-0743 version (exim, fixed 4.21) CVE-2003-0740 version (stunnel, fixed 3.26) CVE-2003-0730 version (xfree86, fixed after 4.3.0) CVE-2003-0700 version (kernel, not 2.6) CVE-2003-0699 version (kernel, not 2.6) -CVE-2003-0698 version (exim, fixed 4.21) CVE-2003-0695 version (openssh, fixed 3.7.1) CVE-2003-0694 version (sendmail, fixed 8.12.10) CVE-2003-0693 version (openssh, fixed 3.7) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- fc5 21 Mar 2006 15:48:32 -0000 1.88 +++ fc5 21 Mar 2006 16:15:43 -0000 1.89 @@ -6,7 +6,6 @@ CVE-2006-1335 version (gnome-screensaver, fixed 2.14) CVE-2006-1296 VULNERABLE (beagle) bz#185981 CVE-2006-1273 ** firefox (prob win only, vague) -CVE-2006-1251 version (exim) script not shipped CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) @@ -122,6 +121,7 @@ CVE-2005-4077 version (curl, fixed 7.15.1) CVE-2005-3964 backport (openmotif) CVE-2005-3962 version (perl, fixed 5.8.8) +CVE-2005-3912 ** perl CVE-2005-3896 ignore (mozilla) recoverable DoS only CVE-2005-3883 version (php, fixed 5.1.1 at least) CVE-2005-3858 version (kernel, fixed 2.6.13) @@ -1268,12 +1268,10 @@ CVE-2003-0775 version (sane-backends, fixed 1.0.10) CVE-2003-0774 version (sane-backends, fixed 1.0.10) CVE-2003-0773 version (sane-backends, fixed 1.0.10) -CVE-2003-0743 version (exim, fixed 4.21) CVE-2003-0740 version (stunnel, fixed 3.26) CVE-2003-0730 version (xfree86, fixed after 4.3.0) CVE-2003-0700 version (kernel, not 2.6) CVE-2003-0699 version (kernel, not 2.6) -CVE-2003-0698 version (exim, fixed 4.21) CVE-2003-0695 version (openssh, fixed 3.7.1) CVE-2003-0694 version (sendmail, fixed 8.12.10) CVE-2003-0693 version (openssh, fixed 3.7) From fedora-extras-commits at redhat.com Tue Mar 21 16:58:45 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 11:58:45 -0500 Subject: rpms/qemu/FC-5 qemu.spec,1.11,1.12 Message-ID: <200603211659.k2LGxHMw029777@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29756 Modified Files: qemu.spec Log Message: Fix linker script on PPC Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- qemu.spec 18 Mar 2006 22:45:13 -0000 1.11 +++ qemu.spec 21 Mar 2006 16:58:44 -0000 1.12 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL/LGPL Group: Development/Tools @@ -9,6 +9,7 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: SDL-devel compat-gcc-32 zlib-devel PreReq: /sbin/chkconfig @@ -34,6 +35,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build ./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M \ @@ -78,6 +80,9 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Sat Mar 18 2006 David Woodhouse 0.8.0-6 +- Update linker script for PPC + * Sat Mar 18 2006 David Woodhouse 0.8.0-5 - Just drop $RPM_OPT_FLAGS. They're too much of a PITA From fedora-extras-commits at redhat.com Tue Mar 21 16:59:20 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 11:59:20 -0500 Subject: rpms/qemu/FC-5 qemu-0.8.0-sdata.patch,NONE,1.1 Message-ID: <200603211659.k2LGxMqV029794@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29782 Added Files: qemu-0.8.0-sdata.patch Log Message: Fix linker script on PPC qemu-0.8.0-sdata.patch: --- NEW FILE qemu-0.8.0-sdata.patch --- --- qemu-0.8.0/ppc.ld~ 2005-12-19 22:51:53.000000000 +0000 +++ qemu-0.8.0/ppc.ld 2006-03-21 16:46:58.000000000 +0000 @@ -90,7 +90,11 @@ SECTIONS /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } + .sdata : + { + PROVIDE (_SDA_BASE_ = 32768); + *(.sdata .sdata.* .gnu.linkonce.s.*) + } _edata = .; PROVIDE (edata = .); __bss_start = .; From fedora-extras-commits at redhat.com Tue Mar 21 17:21:42 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Tue, 21 Mar 2006 12:21:42 -0500 Subject: fedora-security/audit fc5,1.89,1.90 Message-ID: <200603211721.k2LHLgmu031820@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31781 Modified Files: fc5 Log Message: Note two fedora updates. Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.89 retrieving revision 1.90 diff -u -r1.89 -r1.90 --- fc5 21 Mar 2006 16:15:43 -0000 1.89 +++ fc5 21 Mar 2006 17:21:34 -0000 1.90 @@ -4,14 +4,14 @@ ** are items that need attention CVE-2006-1335 version (gnome-screensaver, fixed 2.14) -CVE-2006-1296 VULNERABLE (beagle) bz#185981 +CVE-2006-1296 backport (beagle) bz#185981 [since FEDORA-2006-188] CVE-2006-1273 ** firefox (prob win only, vague) CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability -CVE-2006-1061 VULNERABLE (curl, fixed 7.15.3) +CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189] CVE-2006-1052 backport (kernel) patch-2.6.16-rc6 CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe From fedora-extras-commits at redhat.com Tue Mar 21 17:28:20 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Tue, 21 Mar 2006 12:28:20 -0500 Subject: rpms/qemu/devel qemu-0.8.0-sdata.patch, NONE, 1.1 qemu-0.7.0-build.patch, 1.3, 1.4 qemu.spec, 1.9, 1.10 Message-ID: <200603211728.k2LHSqNU031941@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/qemu/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31907 Modified Files: qemu-0.7.0-build.patch qemu.spec Added Files: qemu-0.8.0-sdata.patch Log Message: fix PPC linker script qemu-0.8.0-sdata.patch: --- NEW FILE qemu-0.8.0-sdata.patch --- --- qemu-0.8.0/ppc.ld~ 2005-12-19 22:51:53.000000000 +0000 +++ qemu-0.8.0/ppc.ld 2006-03-21 16:46:58.000000000 +0000 @@ -90,7 +90,11 @@ SECTIONS /* We want the small data sections together, so single-instruction offsets can access them all, and initialized data all before uninitialized, so we can shorten the on-disk segment size. */ - .sdata : { *(.sdata) } + .sdata : + { + PROVIDE (_SDA_BASE_ = 32768); + *(.sdata .sdata.* .gnu.linkonce.s.*) + } _edata = .; PROVIDE (edata = .); __bss_start = .; qemu-0.7.0-build.patch: Index: qemu-0.7.0-build.patch =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu-0.7.0-build.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- qemu-0.7.0-build.patch 17 Mar 2006 14:58:09 -0000 1.3 +++ qemu-0.7.0-build.patch 21 Mar 2006 17:28:20 -0000 1.4 @@ -1,33 +1,5 @@ ---- qemu-0.7.0/Makefile.orig 2005-04-27 21:52:05.000000000 +0100 -+++ qemu-0.7.0/Makefile 2005-04-30 11:01:41.000000000 +0100 -@@ -1,6 +1,6 @@ - -include config-host.mak - --CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing - ifdef CONFIG_DARWIN - CFLAGS+= -mdynamic-no-pic - endif --- qemu-0.7.0/Makefile.target.orig 2005-04-27 21:52:05.000000000 +0100 -+++ qemu-0.7.0/Makefile.target 2005-04-30 11:03:59.000000000 +0100 -@@ -14,7 +14,7 @@ - VPATH+=:$(SRC_PATH)/linux-user - DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) - endif --CFLAGS=-Wall -O2 -g -fno-strict-aliasing -+CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall -fno-strict-aliasing - #CFLAGS+=-Werror - LDFLAGS=-g - LIBS= -@@ -177,7 +177,7 @@ - ifeq ($(ARCH),alpha) - # -msmall-data is not used because we want two-instruction relocations - # for the constant constructions --OP_CFLAGS=-Wall -O2 -g -+OP_CFLAGS=$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)) -Wall - # Ensure there's only a single GP - CFLAGS += -msmall-data - LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld ++++ qemu-0.7.0/Makefile.target 2005-04-30 11:01:41.000000000 +0100 @@ -463,7 +463,7 @@ install: all Index: qemu.spec =================================================================== RCS file: /cvs/extras/rpms/qemu/devel/qemu.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- qemu.spec 17 Mar 2006 14:58:09 -0000 1.9 +++ qemu.spec 21 Mar 2006 17:28:20 -0000 1.10 @@ -1,7 +1,7 @@ Summary: QEMU is a FAST! processor emulator Name: qemu Version: 0.8.0 -Release: 3%{?dist} +Release: 6%{?dist} License: GPL/LGPL Group: Development/Tools @@ -9,8 +9,9 @@ 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 BuildRoot: %{_tmppath}/%{name}-%{version}-root -BuildRequires: SDL-devel compat-gcc-32 +BuildRequires: SDL-devel compat-gcc-32 zlib-devel PreReq: /sbin/chkconfig PreReq: /sbin/service ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64 @@ -34,6 +35,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build ./configure --prefix=%{_prefix} --interp-prefix=%{_prefix}/qemu-%%M \ @@ -78,6 +80,15 @@ %config %{_sysconfdir}/rc.d/init.d/qemu %changelog +* Sat Mar 18 2006 David Woodhouse 0.8.0-6 +- Update linker script for PPC + +* Sat Mar 18 2006 David Woodhouse 0.8.0-5 +- Just drop $RPM_OPT_FLAGS. They're too much of a PITA + +* Sat Mar 18 2006 David Woodhouse 0.8.0-4 +- Disable stack-protector options which gcc 3.2 doesn't like + * Fri Mar 17 2006 David Woodhouse 0.8.0-3 - Use -mcpu= instead of -mtune= on x86_64 too - Disable SPARC targets on x86_64, because dyngen doesn't like fnegs From fedora-extras-commits at redhat.com Tue Mar 21 17:37:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 12:37:33 -0500 Subject: rpms/allegro/FC-5 allegro.spec,1.29,1.30 Message-ID: <200603211738.k2LHc5x6032145@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32128 Modified Files: allegro.spec Log Message: * Tue Mar 21 2006 Hans de Goede 4.2.0-12 - Sleep in xwindows vsync emulation, instead of busy waiting. Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/FC-5/allegro.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- allegro.spec 13 Mar 2006 22:57:30 -0000 1.29 +++ allegro.spec 21 Mar 2006 17:37:32 -0000 1.30 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 11 +Release: 12 Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -21,6 +21,7 @@ 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 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 @@ -134,7 +135,7 @@ %patch7 -p1 -z .fullscreen %patch8 -p1 -z .mprotect %patch9 -p1 -z .execheap - +%patch10 -p1 -z .nicevsync %build %configure \ @@ -221,6 +222,9 @@ %changelog +* Tue Mar 21 2006 Hans de Goede 4.2.0-12 +- Sleep in xwindows vsync emulation, instead of busy waiting. + * Mon Mar 13 2006 Hans de Goede 4.2.0-11 - really, _really_ fix asm stretch code on i386 with NX processors, long ?? story see bugzilla bug 185214 . From fedora-extras-commits at redhat.com Tue Mar 21 17:39:19 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 12:39:19 -0500 Subject: rpms/allegro/FC-5 allegro.spec,1.30,1.31 Message-ID: <200603211739.k2LHdpQg032199@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32182 Modified Files: allegro.spec Log Message: Add %{dist} to Release Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/FC-5/allegro.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- allegro.spec 21 Mar 2006 17:37:32 -0000 1.30 +++ allegro.spec 21 Mar 2006 17:39:18 -0000 1.31 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 12 +Release: 12%{dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -224,6 +224,7 @@ %changelog * Tue Mar 21 2006 Hans de Goede 4.2.0-12 - Sleep in xwindows vsync emulation, instead of busy waiting. +- Add %%{dist} to Release * Mon Mar 13 2006 Hans de Goede 4.2.0-11 - really, _really_ fix asm stretch code on i386 with NX processors, long From fedora-extras-commits at redhat.com Tue Mar 21 17:40:32 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 12:40:32 -0500 Subject: rpms/allegro/devel allegro.spec,1.30,1.31 Message-ID: <200603211741.k2LHf4vd032280@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32258 Modified Files: allegro.spec Log Message: Add %{dist} to Release Index: allegro.spec =================================================================== RCS file: /cvs/extras/rpms/allegro/devel/allegro.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- allegro.spec 21 Mar 2006 12:53:44 -0000 1.30 +++ allegro.spec 21 Mar 2006 17:40:31 -0000 1.31 @@ -1,6 +1,6 @@ Name: allegro Version: 4.2.0 -Release: 12 +Release: 12%{dist} Summary: A game programming library Summary(es): Una libreria de programacion de juegos @@ -224,6 +224,7 @@ %changelog * Tue Mar 21 2006 Hans de Goede 4.2.0-12 - Sleep in xwindows vsync emulation, instead of busy waiting. +- Add %%{dist} to Release * Mon Mar 13 2006 Hans de Goede 4.2.0-11 - really, _really_ fix asm stretch code on i386 with NX processors, long From fedora-extras-commits at redhat.com Tue Mar 21 17:50:12 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 12:50:12 -0500 Subject: rpms/allegro/FC-5 allegro-4.2.0-nicevsync.patch,NONE,1.1 Message-ID: <200603211750.k2LHoEIk032369@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/allegro/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32357 Added Files: allegro-4.2.0-nicevsync.patch Log Message: * Tue Mar 21 2006 Hans de Goede 4.2.0-12 - Sleep in xwindows vsync emulation, instead of busy waiting. allegro-4.2.0-nicevsync.patch: --- NEW FILE allegro-4.2.0-nicevsync.patch --- --- allegro-4.2.0/src/x/xwin.c~ 2006-03-21 12:57:42.000000000 +0100 +++ allegro-4.2.0/src/x/xwin.c 2006-03-21 12:57:42.000000000 +0100 @@ -2265,6 +2265,7 @@ XUNLOCK(); do { + rest(1); } while (retrace_count == prev); } else { From fedora-extras-commits at redhat.com Tue Mar 21 17:52:42 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 12:52:42 -0500 Subject: rpms/goffice/devel goffice.spec,1.8,1.9 Message-ID: <200603211753.k2LHrEHE032406@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/goffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32389 Modified Files: goffice.spec Log Message: * Tue Mar 21 2006 Hans de Goede 0.2.0-2 - rebuild for new libgsf Index: goffice.spec =================================================================== RCS file: /cvs/extras/rpms/goffice/devel/goffice.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- goffice.spec 17 Feb 2006 00:15:36 -0000 1.8 +++ goffice.spec 21 Mar 2006 17:52:41 -0000 1.9 @@ -1,6 +1,6 @@ Name: goffice Version: 0.2.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Goffice support libraries Group: System Environment/Libraries License: GPL @@ -70,6 +70,9 @@ %changelog +* Tue Mar 21 2006 Hans de Goede 0.2.0-2 +- rebuild for new libgsf + * Thu Feb 16 2006 Hans de Goede 0.2.0-1 - New upstream version - Remove .la files from plugin dirs From fedora-extras-commits at redhat.com Tue Mar 21 19:35:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Tue, 21 Mar 2006 14:35:35 -0500 Subject: rpms/gnumeric/devel gnumeric.spec,1.15,1.16 Message-ID: <200603211936.k2LJa8tY004675@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gnumeric/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4658 Modified Files: gnumeric.spec Log Message: * Tue Mar 21 2006 Hans de Goede 1:1.6.2-2 - rebuild for new libgsf Index: gnumeric.spec =================================================================== RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- gnumeric.spec 17 Feb 2006 00:25:39 -0000 1.15 +++ gnumeric.spec 21 Mar 2006 19:35:35 -0000 1.16 @@ -1,7 +1,7 @@ Summary: A spreadsheet program for GNOME. Name: gnumeric Version: 1.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Epoch: 1 License: GPL Group: Applications/Productivity @@ -164,6 +164,9 @@ %changelog +* Tue Mar 21 2006 Hans de Goede 1:1.6.2-2 +- rebuild for new libgsf + * Thu Feb 16 2006 Hans de Goede 1:1.6.2-1 - New upstream version - Rebuild for new gcc4.1 and glibc From fedora-extras-commits at redhat.com Tue Mar 21 21:21:56 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:21:56 -0500 Subject: rpms/pdsh - New directory Message-ID: <200603212121.k2LLLwuN009192@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9184/pdsh Log Message: Directory /cvs/extras/rpms/pdsh added to the repository From fedora-extras-commits at redhat.com Tue Mar 21 21:22:02 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:22:02 -0500 Subject: rpms/pdsh/devel - New directory Message-ID: <200603212122.k2LLM4Gd009207@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9184/pdsh/devel Log Message: Directory /cvs/extras/rpms/pdsh/devel added to the repository From fedora-extras-commits at redhat.com Tue Mar 21 21:22:18 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:22:18 -0500 Subject: rpms/pdsh Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603212122.k2LLMKww009246@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9234 Added Files: Makefile import.log Log Message: Setup of module pdsh --- NEW FILE Makefile --- # Top level Makefile for module pdsh all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 21 21:22:24 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:22:24 -0500 Subject: rpms/pdsh/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603212122.k2LLMQQF009267@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9234/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pdsh --- NEW 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 Mar 21 21:22:57 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:22:57 -0500 Subject: rpms/pdsh import.log,1.1,1.2 Message-ID: <200603212123.k2LLNTmk009462@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9334 Modified Files: import.log Log Message: auto-import pdsh-2.8.1-7 on branch devel from pdsh-2.8.1-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pdsh/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 21 Mar 2006 21:22:16 -0000 1.1 +++ import.log 21 Mar 2006 21:22:57 -0000 1.2 @@ -0,0 +1 @@ +pdsh-2_8_1-7:HEAD:pdsh-2.8.1-7.src.rpm:1142976171 From fedora-extras-commits at redhat.com Tue Mar 21 21:23:03 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:23:03 -0500 Subject: rpms/pdsh/devel pdsh-load-so.patch, NONE, 1.1 pdsh.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603212123.k2LLNZ9k009469@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9334/devel Modified Files: .cvsignore sources Added Files: pdsh-load-so.patch pdsh.spec Log Message: auto-import pdsh-2.8.1-7 on branch devel from pdsh-2.8.1-7.src.rpm pdsh-load-so.patch: --- NEW FILE pdsh-load-so.patch --- Index: src/pdsh/mod.c =================================================================== --- src/pdsh/mod.c (revision 1012) +++ src/pdsh/mod.c (working copy) @@ -720,13 +720,6 @@ _mod_load_dynamic_modules(const char *di strcpy(p, entry->d_name); - /* - * As an efficiency enhancement, only attempt to open - * libtool ".la" files. - */ - if (strcmp(&p[strlen(p) - 3], ".la") != 0) - continue; - if (stat(path, &st) < 0) continue; if (!S_ISREG(st.st_mode)) --- NEW FILE pdsh.spec --- Name: pdsh Version: 2.8.1 Release: 7 Summary: Parallel remote shell program License: GPL Url: http://sourceforge.net/projects/pdsh/ Group: System Environment/Base Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}-1.tar.gz Patch1: pdsh-load-so.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pdsh-rcmd # # Enabling and disabling pdsh options # defaults: # enabled: readline, rsh, ssh # disabled: rms, mrsh, qshell, mqshell, genders, nodeattr, machines, # nodeupdown # To build the various module subpackages, pass --with on # the rpmbuild command line (if your rpm is a recent enough version) # # Similarly, to disable various pdsh options pass --without on # the rpmbuild command line. # # This specfile also supports passing the --with and --without through # the environment variables PDSH_WITH_OPTIONS and PDSH_WITHOUT_OPTIONS. # e.g. PDSH_WITH_OPTIONS="qshell genders" rpmbuild .... # %define _without_env ${PDSH_WITHOUT_OPTIONS} %define _with_env ${PDSH_WITH_OPTIONS} %define dstr "%%%%"define %define check() echo %_%{1}_env|grep -qw %%1 && echo %dstr _%{1}_%%1 --%{1}-%%1 %{expand: %%define pdsh_with() %%((%{check with})||(%{check without}))%%{nil}} %define def() %%{!?_%{2}_%1: %%{!?_%{3}_%1: %%global _%{2}_%1 --%{2}-%1}} %{expand: %pdsh_with ssh} %{expand: %def ssh with without} %{expand: %pdsh_with rsh} %{expand: %def rsh with without} %{expand: %pdsh_with readline} %{expand: %def readline with without} %{expand: %pdsh_with mrsh} %{expand: %def mrsh without with} %{expand: %pdsh_with qshell} %{expand: %def qshell without with} %{expand: %pdsh_with mqshell} %{expand: %def mqshell without with} %{expand: %pdsh_with genders} %{expand: %def genders without with} %{expand: %pdsh_with nodeattr} %{expand: %def nodeattr without with} %{expand: %pdsh_with nodeupdown} %{expand: %def nodeupdown without with} %{expand: %pdsh_with dshgroups} %{expand: %def dshgroups without with} %{expand: %pdsh_with machines} %{expand: %def machines without with} %{expand: %pdsh_with slurm} %{expand: %def slurm without with} %{expand: %pdsh_with rms} %{expand: %def rms without with} %{expand: %pdsh_with debug} %{expand: %def debug without with} # # If "--with debug" is set compile with --enable-debug # and try not to strip binaries. # # (See /usr/share/doc/rpm-*/conditionalbuilds) # %if %{?_with_debug:1}%{!?_with_debug:0} %define _enable_debug --enable-debug %endif %{?_with_qshell:BuildRequires: qsnetlibs} %{?_with_mqshell:BuildRequires: qsnetlibs} %{?_with_readline:BuildRequires: readline-devel} %{?_with_nodeupdown:BuildRequires: whatsup} %{?_with_genders:BuildRequires: genders > 1.0} ############################################################################## # Pdsh description %description Pdsh is a multithreaded remote shell client which executes commands on multiple remote hosts in parallel. Pdsh can use several different remote shell services, including standard "rsh", Kerberos IV, and ssh. ############################################################################## %package qshd Summary: Remote shell daemon for pdsh/qshell/Elan3 Group: System Environment/Base Requires: xinetd %description qshd Remote shell service for running Quadrics Elan3 jobs under pdsh. Sets up Elan capabilities and environment variables needed by Quadrics MPICH executables. ############################################################################## %package mqshd Summary: Remote shell daemon for pdsh/mqshell/Elan3 Group: System Environment/Base Requires: xinetd %description mqshd Remote shell service for running Quadrics Elan3 jobs under pdsh with mrsh authentication. Sets up Elan capabilities and environment variables needed by Quadrics MPICH executables. ############################################################################## # # Module packages: # %package rcmd-rsh Summary: Provides bsd rcmd capability to pdsh Group: System Environment/Base Provides: pdsh-rcmd %description rcmd-rsh Pdsh module for bsd rcmd functionality. Note: This module requires that the pdsh binary be installed setuid root. %package rcmd-ssh Summary: Provides ssh rcmd capability to pdsh Group: System Environment/Base Provides: pdsh-rcmd %description rcmd-ssh Pdsh module for ssh rcmd functionality. %package rcmd-qshell Summary: Provides qshell rcmd capability to pdsh Group: System Environment/Base Provides: pdsh-rcmd Conflicts: pdsh-rcmd-mqshell %description rcmd-qshell Pdsh module for running QsNet MPI jobs. Note: This module requires that the pdsh binary be installed setuid root. %package rcmd-mrsh Summary: Provides mrsh rcmd capability to pdsh Group: System Environment/Base Provides: pdsh-rcmd %description rcmd-mrsh Pdsh module for mrsh rcmd functionality. %package rcmd-mqshell Summary: Provides mqshell rcmd capability to pdsh Group: System Environment/Base Provides: pdsh-rcmd Conflicts: pdsh-rcmd-qshell %description rcmd-mqshell Pdsh module for mqshell rcmd functionality. %package mod-genders Summary: Provides libgenders support for pdsh Group: System Environment/Base Requires: genders >= 1.1 Conflicts: pdsh-mod-nodeattr Conflicts: pdsh-mod-machines %description mod-genders Pdsh module for libgenders functionality. %package mod-nodeattr Summary: Provides genders support for pdsh using the nodeattr program Group: System Environment/Base Requires: genders Conflicts: pdsh-mod-genders Conflicts: pdsh-mod-machines %description mod-nodeattr Pdsh module for genders functionality using the nodeattr program. %package mod-nodeupdown Summary: Provides libnodeupdown support for pdsh Group: System Environment/Base Requires: whatsup %description mod-nodeupdown Pdsh module providing -v functionality using libnodeupdown. %package mod-rms Summary: Provides RMS support for pdsh Group: System Environment/Base Requires: qsrmslibs %description mod-rms Pdsh module providing support for gathering the list of target nodes from an allocated RMS resource. %package mod-machines Summary: Pdsh module for gathering list of target nodes from a machines file Group: System Environment/Base Conflicts: pdsh-mod-genders Conflicts: pdsh-mod-nodeattr %description mod-machines Pdsh module for gathering list of all target nodes from a machines file. %package mod-dshgroup Summary: Provides dsh-style group file support for pdsh Group: System Environment/Base Requires: whatsup %description mod-dshgroup Pdsh module providing dsh (Dancer's shell) style "group" file support. Provides -g groupname and -X groupname options to pdsh. %package mod-slurm Summary: Provides support for running pdsh under SLURM allocations Group: System Environment/Base Requires: slurm %description mod-slurm Pdsh module providing support for gathering the list of target nodes from an allocated SLURM job. ############################################################################## %prep %setup -n pdsh-2.8.1-1 %patch1 -p0 ############################################################################## %build %configure --program-prefix=%{?_program_prefix:%{_program_prefix}} \ %{?_enable_debug} \ %{?_with_rsh} \ %{?_without_rsh} \ %{?_with_ssh} \ %{?_without_ssh} \ %{?_with_qshell} \ %{?_without_qshell} \ %{?_with_readline} \ %{?_without_readline} \ %{?_with_machines} \ %{?_without_machines} \ %{?_with_genders} \ %{?_without_genders} \ %{?_with_rms} \ %{?_without_rms} \ %{?_with_nodeupdown} \ %{?_without_nodeupdown} \ %{?_with_nodeattr} \ %{?_without_nodeattr} \ %{?_with_mrsh} \ %{?_without_mrsh} \ %{?_with_mqshell} \ %{?_without_mqshell} \ %{?_with_slurm} \ %{?_without_slurm} \ %{?_with_dshgroups} \ %{?_without_dshgroups} # FIXME: build fails when trying to build with _smp_mflags if qsnet is enabled # make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" make CFLAGS="$RPM_OPT_FLAGS" ############################################################################## %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT" make install # needed to allow rpm's find-debuginfo.sh to find binaries by default they # are installed with perms that aren't selected by the find in # find-debuginfo.sh chmod 755 $RPM_BUILD_ROOT/%{_bindir}/pd{sh,cp} if [ -x $RPM_BUILD_ROOT/%{_sbindir}/in.qshd ]; then install -D -m644 etc/qshell.xinetd $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/qshell fi if [ -x $RPM_BUILD_ROOT/%{_sbindir}/in.mqshd ]; then install -D -m644 etc/mqshell.xinetd $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/mqshell fi # according to developer: .so's are modules not really libraries .a's and # .la's don't need to be packaged. rm $RPM_BUILD_ROOT/%{_libdir}/pdsh/*a ############################################################################## %clean rm -rf "$RPM_BUILD_ROOT" ############################################################################## %files %defattr(-,root,root) %doc COPYING README ChangeLog NEWS DISCLAIMER README.KRB4 README.modules README.QsNet %{_bindir}/pdsh %{_bindir}/pdcp %{_bindir}/dshbak %{_mandir}/man1/* ############################################################################## %if %{?_with_rsh:1}%{!?_with_rsh:0} %files rcmd-rsh %defattr(-,root,root) %{_libdir}/pdsh/xrcmd.* %endif ############################################################################## %if %{?_with_ssh:1}%{!?_with_ssh:0} %files rcmd-ssh %defattr(-,root,root) %{_libdir}/pdsh/sshcmd.* %endif ############################################################################## %if %{?_with_qshell:1}%{!?_with_qshell:0} %files rcmd-qshell %defattr(-,root,root) %{_libdir}/pdsh/qcmd.* %endif ############################################################################## %if %{?_with_mrsh:1}%{!?_with_mrsh:0} %files rcmd-mrsh %defattr(-,root,root) %{_libdir}/pdsh/mcmd.* %endif ############################################################################## %if %{?_with_mqshell:1}%{!?_with_mqshell:0} %files rcmd-mqshell %defattr(-,root,root) %{_libdir}/pdsh/mqcmd.* %endif ############################################################################## %if %{?_with_genders:1}%{!?_with_genders:0} %files mod-genders %defattr(-,root,root) %{_libdir}/pdsh/genders.* %endif ############################################################################## %if %{?_with_nodeattr:1}%{!?_with_nodeattr:0} %files mod-nodeattr %defattr(-,root,root) %{_libdir}/pdsh/nodeattr.* %endif ############################################################################## %if %{?_with_nodeupdown:1}%{!?_with_nodeupdown:0} %files mod-nodeupdown %defattr(-,root,root) %{_libdir}/pdsh/nodeupdown.* %endif ############################################################################## %if %{?_with_rms:1}%{!?_with_rms:0} %files mod-rms %defattr(-,root,root) %{_libdir}/pdsh/rms.* %endif ############################################################################## %if %{?_with_machines:1}%{!?_with_machines:0} %files mod-machines %defattr(-,root,root) %{_libdir}/pdsh/machines.* %endif ############################################################################## %if %{?_with_dshgroups:1}%{!?_with_dshgroups:0} %files mod-dshgroup %defattr(-,root,root) %{_libdir}/pdsh/dshgroup.* %endif ############################################################################## %if %{?_with_slurm:1}%{!?_with_slurm:0} %files mod-slurm %defattr(-,root,root) %{_libdir}/pdsh/slurm.* %endif ############################################################################## %if %{?_with_qshell:1}%{!?_with_qshell:0} %files qshd %defattr(-,root,root) %{_sbindir}/in.qshd %{_sysconfdir}/xinetd.d/qshell %post qshd if ! grep "^qshell" /etc/services >/dev/null; then echo "qshell 523/tcp # pdsh/qshell/elan3" >>/etc/services fi %{_initrddir}/xinetd reload %endif ############################################################################## %if %{?_with_mqshell:1}%{!?_with_mqshell:0} %files mqshd %defattr(-,root,root) %{_sbindir}/in.mqshd %{_sysconfdir}/xinetd.d/mqshell %post mqshd if ! grep "^mqshell" /etc/services >/dev/null; then echo "mqshell 21234/tcp # pdsh/mqshell/elan3" >>/etc/services fi %{_initrddir}/xinetd reload %endif ############################################################################## %changelog * Mon Mar 13 2006 Ben Woodard 2.8.1-7 - An optimization in pdsh depended on the .la files being there. Removed optimization. * Mon Mar 6 2006 Ben Woodard 2.8.1-6 - Add COPYING file to file list - removed .la packages from sub packages. * Fri Feb 23 2006 Ben Woodard 2.8.1-5 - changed source location to point to main site not mirror. - inserted version macro in source line * Thu Feb 22 2006 Ben Woodard 2.8.1-4 - changed perms of pdsh and pcp after install so that find-debuginfo.sh finds the files and they get stripped. - removed change of attributes of pdsh and pcp in files section - removed .a files from packages. * Wed Feb 22 2006 Ben Woodard - add parameters to make - replace etc with _sysconfdir in most places - remove post section with unexplained removing of cached man pages. - removed dots at end of all summaries. * Wed Feb 16 2006 Ben Woodard 2.8.1-3 - removed dot at end of summary - removed unused/broken smp build - changed to using initrddir macro - changed depricated Prereq to Requires * Thu Feb 9 2006 Ben Woodard 2.8.1-2 - add in rpmlint fixes - change buildroot * Wed Feb 8 2006 Mark Grondona 2.8.1-1 - pdsh 2.8.1 critical bugfix release * Wed Feb 1 2006 Ben Woodard 2.8-2 - Modified spec file to fix some problems uncovered by rpmlint Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 21 Mar 2006 21:22:23 -0000 1.1 +++ .cvsignore 21 Mar 2006 21:23:03 -0000 1.2 @@ -0,0 +1 @@ +pdsh-2.8.1-1.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 21 Mar 2006 21:22:23 -0000 1.1 +++ sources 21 Mar 2006 21:23:03 -0000 1.2 @@ -0,0 +1 @@ +d39b58da791f9437bdb4848da4efd6d1 pdsh-2.8.1-1.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 21:36:21 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Tue, 21 Mar 2006 16:36:21 -0500 Subject: owners owners.list,1.754,1.755 Message-ID: <200603212136.k2LLarCH009628@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9611 Modified Files: owners.list Log Message: added pdsh to owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.754 retrieving revision 1.755 diff -u -r1.754 -r1.755 --- owners.list 20 Mar 2006 16:40:46 -0000 1.754 +++ owners.list 21 Mar 2006 21:36:21 -0000 1.755 @@ -805,6 +805,7 @@ 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| +Fedora Extras|pdsh|Parallel remote shell program|woodard at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|perl-Algorithm-Dependency|Algorithmic framework for implementing dependency trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Algorithm-Diff|Algorithm::Diff Perl module|steve at silug.org|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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Tue Mar 21 21:50:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 16:50:59 -0500 Subject: mock mock.py,1.37,1.38 Message-ID: <200603212150.k2LLoxBF009721@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/mock In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9698 Modified Files: mock.py Log Message: Patch from Clark Williams Set up links to /dev/std[in|out|err] in buildroots Index: mock.py =================================================================== RCS file: /cvs/fedora/mock/mock.py,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- mock.py 15 Mar 2006 22:14:38 -0000 1.37 +++ mock.py 21 Mar 2006 21:50:52 -0000 1.38 @@ -555,6 +555,14 @@ if not os.path.exists(devpath): os.symlink('../proc/self/fd', devpath) + fd = 0 + for item in ('stdin', 'stdout', 'stderr'): + devpath = os.path.join(self.rootdir, 'dev', item) + if not os.path.exists(devpath): + fdpath = os.path.join('../proc/self/fd', str(fd)) + os.symlink(fdpath, devpath) + fd += 1 + for item in [os.path.join(self.rootdir, 'etc', 'mtab'), os.path.join(self.rootdir, 'etc', 'fstab'), os.path.join(self.rootdir, 'var', 'log', 'yum.log')]: From fedora-extras-commits at redhat.com Tue Mar 21 21:56:40 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 16:56:40 -0500 Subject: rpms/mock/devel mock.spec,1.12,1.13 sources,1.5,1.6 Message-ID: <200603212157.k2LLvCha009837@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9818 Modified Files: mock.spec sources Log Message: * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mock.spec 2 Mar 2006 06:23:30 -0000 1.12 +++ mock.spec 21 Mar 2006 21:56:40 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -10,7 +10,6 @@ Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils BuildRequires: libselinux-devel -Patch0: mock-0.4-unpackaged-files-fix.patch %description Mock takes a srpm and builds it in a chroot @@ -18,8 +17,6 @@ %prep %setup -q -%patch0 -p1 -b .unpackaged-files-fix - %build make @@ -68,6 +65,9 @@ %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-7 +- Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots + * Thu Mar 2 2006 Seth Vidal - 0.4-6 - iterate for gcc rebuild and fc5 final Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Aug 2005 04:26:30 -0000 1.5 +++ sources 21 Mar 2006 21:56:40 -0000 1.6 @@ -1 +1 @@ -37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz +863fb1a60d49138f75ca899f1bbc4349 mock-0.4.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 21:57:46 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 16:57:46 -0500 Subject: rpms/mock/devel mock-0.4-unpackaged-files-fix.patch,1.1,NONE Message-ID: <200603212157.k2LLvmBJ009857@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9848 Removed Files: mock-0.4-unpackaged-files-fix.patch Log Message: Kill upstreamed patch --- mock-0.4-unpackaged-files-fix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 21:59:26 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 16:59:26 -0500 Subject: rpms/mock/FC-4 mock.spec, 1.11, 1.12 sources, 1.4, 1.5 mock-0.4-unpackaged-files-fix.patch, 1.1, NONE Message-ID: <200603212159.k2LLxwXl009974@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9953 Modified Files: mock.spec sources Removed Files: mock-0.4-unpackaged-files-fix.patch Log Message: * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mock.spec 24 Jan 2006 17:18:04 -0000 1.11 +++ mock.spec 21 Mar 2006 21:59:25 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 5%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -10,7 +10,6 @@ Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils BuildRequires: libselinux-devel -Patch0: mock-0.4-unpackaged-files-fix.patch %description Mock takes a srpm and builds it in a chroot @@ -18,8 +17,6 @@ %prep %setup -q -%patch0 -p1 -b .unpackaged-files-fix - %build make @@ -68,6 +65,12 @@ %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-7 +- Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots + +* Thu Mar 2 2006 Seth Vidal - 0.4-6 +- iterate for gcc rebuild and fc5 final + * Tue Jan 24 2006 Dan Williams - 0.4-5 - Back out setpgrp patch, found a better way to do it in plague Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Aug 2005 04:22:07 -0000 1.4 +++ sources 21 Mar 2006 21:59:25 -0000 1.5 @@ -1 +1 @@ -37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz +863fb1a60d49138f75ca899f1bbc4349 mock-0.4.tar.gz --- mock-0.4-unpackaged-files-fix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 22:01:57 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:01:57 -0500 Subject: rpms/mock/FC-3 mock.spec, 1.11, 1.12 sources, 1.5, 1.6 mock-0.4-unpackaged-files-fix.patch, 1.1, NONE Message-ID: <200603212202.k2LM2TcC011970@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11942 Modified Files: mock.spec sources Removed Files: mock-0.4-unpackaged-files-fix.patch Log Message: * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- mock.spec 24 Jan 2006 17:20:23 -0000 1.11 +++ mock.spec 21 Mar 2006 22:01:57 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 5%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -10,7 +10,6 @@ Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils BuildRequires: libselinux-devel -Patch0: mock-0.4-unpackaged-files-fix.patch %description Mock takes a srpm and builds it in a chroot @@ -18,8 +17,6 @@ %prep %setup -q -%patch0 -p1 -b .unpackaged-files-fix - %build make @@ -68,6 +65,12 @@ %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-7 +- Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots + +* Thu Mar 2 2006 Seth Vidal - 0.4-6 +- iterate for gcc rebuild and fc5 final + * Tue Jan 24 2006 Dan Williams - 0.4-5 - Back out setpgrp patch, found a better way to do it in plague Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Aug 2005 04:26:06 -0000 1.5 +++ sources 21 Mar 2006 22:01:57 -0000 1.6 @@ -1 +1 @@ -37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz +863fb1a60d49138f75ca899f1bbc4349 mock-0.4.tar.gz --- mock-0.4-unpackaged-files-fix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 22:12:45 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 21 Mar 2006 17:12:45 -0500 Subject: rpms/perl-Net-CIDR-Lite/devel .cvsignore, 1.2, 1.3 perl-Net-CIDR-Lite.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603212213.k2LMDHVL012114@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Net-CIDR-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12085 Modified Files: .cvsignore perl-Net-CIDR-Lite.spec sources Log Message: Update to 0.20. Use canonical URL. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Aug 2005 19:47:09 -0000 1.2 +++ .cvsignore 21 Mar 2006 22:12:44 -0000 1.3 @@ -1 +1 @@ -Net-CIDR-Lite-0.18.tar.gz +Net-CIDR-Lite-0.20.tar.gz Index: perl-Net-CIDR-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/devel/perl-Net-CIDR-Lite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Net-CIDR-Lite.spec 6 Sep 2005 01:22:08 -0000 1.3 +++ perl-Net-CIDR-Lite.spec 21 Mar 2006 22:12:45 -0000 1.4 @@ -1,11 +1,11 @@ Name: perl-Net-CIDR-Lite -Version: 0.18 -Release: 3%{?dist} +Version: 0.20 +Release: 1%{?dist} Summary: Net::CIDR::Lite Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-CIDR-Lite/ -Source0: http://www.cpan.org/modules/by-module/Net/Net-CIDR-Lite-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/D/DO/DOUGW/Net-CIDR-Lite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -49,6 +49,10 @@ %{_mandir}/man3/* %changelog +* Tue Mar 21 2006 Steven Pritchard 0.20-1 +- Update to 0.20 +- Use canonical URL + * Mon Sep 05 2005 Steven Pritchard 0.18-3 - Minor spec cleanup - Add COPYING and Artistic Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Aug 2005 19:47:09 -0000 1.2 +++ sources 21 Mar 2006 22:12:45 -0000 1.3 @@ -1 +1 @@ -c4c839713b701458e880bf2d058cbab4 Net-CIDR-Lite-0.18.tar.gz +54998db6b297ffc8a20adb91ea744200 Net-CIDR-Lite-0.20.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 22:15:59 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:15:59 -0500 Subject: rpms/mock/devel mock.spec,1.13,1.14 Message-ID: <200603212216.k2LMGVoU012200@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12179 Modified Files: mock.spec Log Message: Merge some bits with upstream specfile; fix manpage packaging Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mock.spec 21 Mar 2006 21:56:40 -0000 1.13 +++ mock.spec 21 Mar 2006 22:15:58 -0000 1.14 @@ -11,6 +11,7 @@ Requires(pre): shadow-utils BuildRequires: libselinux-devel + %description Mock takes a srpm and builds it in a chroot @@ -59,6 +60,7 @@ %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} %{_libexecdir}/mock-yum +%{_mandir}/man1/mock.1* %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock %{_libdir}/libselinux-mock.so @@ -81,6 +83,9 @@ * Wed Jan 18 2006 Dan Williams - 0.4-3 - Add unpackaged files fix from RH#163576 (Adrian Reber) +* Tue Dec 27 2005 Seth Vidal +- add patch from Andreas Thienemann - adds man page + * Tue Aug 16 2005 Matthias Saou 0.4-2 - Fix ?fedora check when not defined (would fail to parse). @@ -92,6 +97,9 @@ * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for +* Sat Jun 11 2005 Seth Vidal +- security fix in mock-helper + * Sat Jun 11 2005 Seth Vidal - mock 0.3 - security release - mock-helper allowed execution of arbitrary commands by member of mock From fedora-extras-commits at redhat.com Tue Mar 21 22:21:19 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:21:19 -0500 Subject: rpms/mock/FC-5 mock.spec, 1.12, 1.13 sources, 1.5, 1.6 mock-0.4-unpackaged-files-fix.patch, 1.1, NONE Message-ID: <200603212221.k2LMLp9k012331@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12300 Modified Files: mock.spec sources Removed Files: mock-0.4-unpackaged-files-fix.patch Log Message: Update from devel Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mock.spec 2 Mar 2006 06:23:30 -0000 1.12 +++ mock.spec 21 Mar 2006 22:21:18 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -10,7 +10,7 @@ Requires: python, yum >= 2.2.1 Requires(pre): shadow-utils BuildRequires: libselinux-devel -Patch0: mock-0.4-unpackaged-files-fix.patch + %description Mock takes a srpm and builds it in a chroot @@ -18,8 +18,6 @@ %prep %setup -q -%patch0 -p1 -b .unpackaged-files-fix - %build make @@ -62,12 +60,16 @@ %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} %{_libexecdir}/mock-yum +%{_mandir}/man1/mock.1* %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock %{_libdir}/libselinux-mock.so %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-7 +- Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots + * Thu Mar 2 2006 Seth Vidal - 0.4-6 - iterate for gcc rebuild and fc5 final @@ -81,6 +83,9 @@ * Wed Jan 18 2006 Dan Williams - 0.4-3 - Add unpackaged files fix from RH#163576 (Adrian Reber) +* Tue Dec 27 2005 Seth Vidal +- add patch from Andreas Thienemann - adds man page + * Tue Aug 16 2005 Matthias Saou 0.4-2 - Fix ?fedora check when not defined (would fail to parse). @@ -92,6 +97,9 @@ * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for +* Sat Jun 11 2005 Seth Vidal +- security fix in mock-helper + * Sat Jun 11 2005 Seth Vidal - mock 0.3 - security release - mock-helper allowed execution of arbitrary commands by member of mock Index: sources =================================================================== RCS file: /cvs/extras/rpms/mock/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 4 Aug 2005 04:26:30 -0000 1.5 +++ sources 21 Mar 2006 22:21:18 -0000 1.6 @@ -1 +1 @@ -37a480a4da61035ac6812aec3684ccf6 mock-0.4.tar.gz +863fb1a60d49138f75ca899f1bbc4349 mock-0.4.tar.gz --- mock-0.4-unpackaged-files-fix.patch DELETED --- From fedora-extras-commits at redhat.com Tue Mar 21 22:25:14 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:25:14 -0500 Subject: rpms/mock/devel mock.spec,1.14,1.15 Message-ID: <200603212225.k2LMPkcV012479@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12462 Modified Files: mock.spec Log Message: bump release for fc5/fc6 split Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/devel/mock.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- mock.spec 21 Mar 2006 22:15:58 -0000 1.14 +++ mock.spec 21 Mar 2006 22:24:58 -0000 1.15 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -67,6 +67,9 @@ %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-8 +- bump release for fc5/fc6 split + * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots From fedora-extras-commits at redhat.com Tue Mar 21 22:27:17 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:27:17 -0500 Subject: rpms/mock/FC-5 mock.spec,1.13,1.14 Message-ID: <200603212227.k2LMRn8e012562@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12543 Modified Files: mock.spec Log Message: update from devel Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-5/mock.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- mock.spec 21 Mar 2006 22:21:18 -0000 1.13 +++ mock.spec 21 Mar 2006 22:27:17 -0000 1.14 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -67,6 +67,9 @@ %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-8 +- bump release for fc5/fc6 split + * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots From fedora-extras-commits at redhat.com Tue Mar 21 22:29:54 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:29:54 -0500 Subject: rpms/mock/FC-4 mock.spec,1.12,1.13 Message-ID: <200603212230.k2LMUR7L012637@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12618 Modified Files: mock.spec Log Message: Update from devel Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-4/mock.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mock.spec 21 Mar 2006 21:59:25 -0000 1.12 +++ mock.spec 21 Mar 2006 22:29:54 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Requires(pre): shadow-utils BuildRequires: libselinux-devel + %description Mock takes a srpm and builds it in a chroot @@ -59,12 +60,16 @@ %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} %{_libexecdir}/mock-yum +%{_mandir}/man1/mock.1* %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock %{_libdir}/libselinux-mock.so %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-8 +- bump release for fc5/fc6 split + * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots @@ -81,6 +86,9 @@ * Wed Jan 18 2006 Dan Williams - 0.4-3 - Add unpackaged files fix from RH#163576 (Adrian Reber) +* Tue Dec 27 2005 Seth Vidal +- add patch from Andreas Thienemann - adds man page + * Tue Aug 16 2005 Matthias Saou 0.4-2 - Fix ?fedora check when not defined (would fail to parse). @@ -92,6 +100,9 @@ * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for +* Sat Jun 11 2005 Seth Vidal +- security fix in mock-helper + * Sat Jun 11 2005 Seth Vidal - mock 0.3 - security release - mock-helper allowed execution of arbitrary commands by member of mock From fedora-extras-commits at redhat.com Tue Mar 21 22:31:26 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Tue, 21 Mar 2006 17:31:26 -0500 Subject: rpms/mock/FC-3 mock.spec,1.12,1.13 Message-ID: <200603212231.k2LMVwRE012706@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/extras/rpms/mock/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12686 Modified Files: mock.spec Log Message: Update from devel Index: mock.spec =================================================================== RCS file: /cvs/extras/rpms/mock/FC-3/mock.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- mock.spec 21 Mar 2006 22:01:57 -0000 1.12 +++ mock.spec 21 Mar 2006 22:31:25 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Builds packages inside chroots Name: mock Version: 0.4 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Development/Tools Source: http://fedoraproject.org/projects/mock/releases/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Requires(pre): shadow-utils BuildRequires: libselinux-devel + %description Mock takes a srpm and builds it in a chroot @@ -59,12 +60,16 @@ %config(noreplace) %{_sysconfdir}/%{name}/*.cfg %{_bindir}/%{name} %{_libexecdir}/mock-yum +%{_mandir}/man1/mock.1* %attr(04750, root, mock) %{_sbindir}/mock-helper %attr(02775, root, mock) %dir /var/lib/mock %{_libdir}/libselinux-mock.so %changelog +* Tue Mar 21 2006 Dan Williams - 0.4-8 +- bump release for fc5/fc6 split + * Tue Mar 21 2006 Dan Williams - 0.4-7 - Update to mock CVS; add symlinks for /dev/std[in|out|err] to buildroots @@ -81,6 +86,9 @@ * Wed Jan 18 2006 Dan Williams - 0.4-3 - Add unpackaged files fix from RH#163576 (Adrian Reber) +* Tue Dec 27 2005 Seth Vidal +- add patch from Andreas Thienemann - adds man page + * Tue Aug 16 2005 Matthias Saou 0.4-2 - Fix ?fedora check when not defined (would fail to parse). @@ -92,6 +100,9 @@ * Sun Jun 12 2005 Jeremy Katz - set default.cfg based on both arch and distro built for +* Sat Jun 11 2005 Seth Vidal +- security fix in mock-helper + * Sat Jun 11 2005 Seth Vidal - mock 0.3 - security release - mock-helper allowed execution of arbitrary commands by member of mock From fedora-extras-commits at redhat.com Tue Mar 21 22:35:03 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Tue, 21 Mar 2006 17:35:03 -0500 Subject: rpms/perl-Net-CIDR-Lite/FC-5 .cvsignore, 1.2, 1.3 perl-Net-CIDR-Lite.spec, 1.3, 1.4 sources, 1.2, 1.3 Message-ID: <200603212235.k2LMZZfX012788@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/perl-Net-CIDR-Lite/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12756 Modified Files: .cvsignore perl-Net-CIDR-Lite.spec sources Log Message: Update to 0.20. Use canonical URL. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 1 Aug 2005 19:47:09 -0000 1.2 +++ .cvsignore 21 Mar 2006 22:35:03 -0000 1.3 @@ -1 +1 @@ -Net-CIDR-Lite-0.18.tar.gz +Net-CIDR-Lite-0.20.tar.gz Index: perl-Net-CIDR-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/FC-5/perl-Net-CIDR-Lite.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Net-CIDR-Lite.spec 6 Sep 2005 01:22:08 -0000 1.3 +++ perl-Net-CIDR-Lite.spec 21 Mar 2006 22:35:03 -0000 1.4 @@ -1,11 +1,11 @@ Name: perl-Net-CIDR-Lite -Version: 0.18 -Release: 3%{?dist} +Version: 0.20 +Release: 1%{?dist} Summary: Net::CIDR::Lite Perl module License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Net-CIDR-Lite/ -Source0: http://www.cpan.org/modules/by-module/Net/Net-CIDR-Lite-%{version}.tar.gz +Source0: http://www.cpan.org/authors/id/D/DO/DOUGW/Net-CIDR-Lite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -49,6 +49,10 @@ %{_mandir}/man3/* %changelog +* Tue Mar 21 2006 Steven Pritchard 0.20-1 +- Update to 0.20 +- Use canonical URL + * Mon Sep 05 2005 Steven Pritchard 0.18-3 - Minor spec cleanup - Add COPYING and Artistic Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Net-CIDR-Lite/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 1 Aug 2005 19:47:09 -0000 1.2 +++ sources 21 Mar 2006 22:35:03 -0000 1.3 @@ -1 +1 @@ -c4c839713b701458e880bf2d058cbab4 Net-CIDR-Lite-0.18.tar.gz +54998db6b297ffc8a20adb91ea744200 Net-CIDR-Lite-0.20.tar.gz From fedora-extras-commits at redhat.com Tue Mar 21 23:08:40 2006 From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard)) Date: Tue, 21 Mar 2006 18:08:40 -0500 Subject: rpms/amarok/FC-5 amarok-1.4-helix.patch, 1.1, 1.2 amarok.spec, 1.44, 1.45 Message-ID: <200603212309.k2LN9TnT016814@cvs-int.fedora.redhat.com> Author: abompard Update of /cvs/extras/rpms/amarok/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16792 Modified Files: amarok-1.4-helix.patch amarok.spec Log Message: make amarok build with gstreamer only (helix is unavailable on x86_64) amarok-1.4-helix.patch: Index: amarok-1.4-helix.patch =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok-1.4-helix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- amarok-1.4-helix.patch 14 Mar 2006 08:38:52 -0000 1.1 +++ amarok-1.4-helix.patch 21 Mar 2006 23:08:40 -0000 1.2 @@ -1,11 +1,20 @@ --- ./configure.helix 2006-03-05 20:28:13.000000000 +0100 -+++ ./configure 2006-03-13 23:04:01.000000000 +0100 ++++ ./configure 2006-03-22 00:04:48.000000000 +0100 @@ -38181,7 +38181,7 @@ # BEGIN DO_NOT_COMPILE CHECK ############################################################################### -if test x$build_xine != xyes -a x$build_helix != xno; then -+if test x$build_xine = xno -a x$build_helix = xno; then ++if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then DO_NOT_COMPILE="$DO_NOT_COMPILE amarok" no_engine=yes +@@ -40594,7 +40594,7 @@ + echo " ==================================" + echo " =" + echo " = No suitable multimedia framework was detected. You need to install at least" +- echo " = the Xine or Helix framework as detailed in the amaroK README." ++ echo " = the Xine, Helix framework or GStreamer as detailed in the amaroK README." + echo " =" + fi + Index: amarok.spec =================================================================== RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- amarok.spec 14 Mar 2006 08:38:52 -0000 1.44 +++ amarok.spec 21 Mar 2006 23:08:40 -0000 1.45 @@ -7,7 +7,7 @@ Name: amarok Summary: Media player for KDE Version: 1.4 -Release: 0.8.beta2%{?dist} +Release: 0.9.beta2%{?dist} Group: Applications/Multimedia License: GPL @@ -154,7 +154,7 @@ # Head until the blank line: perl -pi -e '/^$/ && exit' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop -desktop-file-install --vendor fedora \ +desktop-file-install --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --delete-original \ --add-category Application \ @@ -257,6 +257,9 @@ %changelog +* Wed Mar 22 2006 Aurelien Bompard 1.4-0.9.beta2 +- make amarok build even with gstreamer only + * Sun Mar 05 2006 Aurelien Bompard 1.4-0.8.beta2 - version 1.4 beta2 From fedora-extras-commits at redhat.com Wed Mar 22 00:04:33 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Tue, 21 Mar 2006 19:04:33 -0500 Subject: rpms/wine-docs/FC-4 wine-docs.spec,1.10,1.11 Message-ID: <200603220005.k2M0568X019007@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/wine-docs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18990 Modified Files: wine-docs.spec Log Message: * Wed Mar 22 2006 Michael Schwendt - 0.9.10-0.1 - make this release 0.1 as to not move the old tag - insert docbook2txt wrapper script in %build to get strace output and work around FC-4 elinks FE-4 buildsys problem (#179852) Index: wine-docs.spec =================================================================== RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- wine-docs.spec 15 Mar 2006 22:27:32 -0000 1.10 +++ wine-docs.spec 22 Mar 2006 00:04:33 -0000 1.11 @@ -1,6 +1,6 @@ Name: wine-docs Version: 0.9.10 -Release: 1%{?dist} +Release: 0.1%{?dist} Summary: Documentation for wine Group: Documentation @@ -22,6 +22,15 @@ %build ./configure + +cat< docbook2txt +#!/bin/sh +strace -f /usr/bin/docbook2txt \$* +exit 0 +EOT +chmod +x docbook2txt +PATH=$(pwd):$PATH make + make @@ -37,6 +46,11 @@ %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB %changelog +* Wed Mar 22 2006 Michael Schwendt - 0.9.10-0.1 +- make this release 0.1 as to not move the old tag +- insert docbook2txt wrapper script in %%build to get strace output + and work around FC-4 elinks FE-4 buildsys problem (#179852) + * Wed Mar 15 2006 Andreas Bierfert 0.9.10-1 - version upgrade From fedora-extras-commits at redhat.com Wed Mar 22 03:32:34 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Tue, 21 Mar 2006 22:32:34 -0500 Subject: rpms/ghc/FC-5 ghc-6.4.1-gcc41.patch,NONE,1.1 ghc.spec,1.11,1.12 Message-ID: <200603220333.k2M3X6jd025794@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/ghc/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25769 Modified Files: ghc.spec Added Files: ghc-6.4.1-gcc41.patch Log Message: - add ghc-6.4.1-gcc41.patch to fix stage2 linking on x86_64 (Chris Parrott, #185914) ghc-6.4.1-gcc41.patch: --- NEW FILE ghc-6.4.1-gcc41.patch --- diff -urwpN ghc-6.4.1/ghc/rts/StgCRun.c ghc-6.4.1.patched/ghc/rts/StgCRun.c --- ghc-6.4.1/ghc/rts/StgCRun.c 2005-03-30 04:01:48.000000000 -0600 +++ ghc-6.4.1.patched/ghc/rts/StgCRun.c 2006-03-21 17:13:22.000000000 -0600 @@ -179,7 +179,7 @@ StgRun(StgFunPtr f, StgRegTable *basereg extern StgThreadReturnCode StgRun(StgFunPtr f, StgRegTable *basereg); -static void StgRunIsImplementedInAssembler(void) +static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void) { __asm__ volatile ( /* @@ -604,7 +604,7 @@ static void StgRunIsImplementedInAssembl // *) The Link Register is saved to a different offset in the caller's stack frame // (Linux: 4(r1), Darwin 8(r1)) -static void StgRunIsImplementedInAssembler(void) +static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void) { __asm__ volatile ( "\t.globl StgRun\n" @@ -683,7 +683,7 @@ static void StgRunIsImplementedInAssembl #ifdef linux_HOST_OS extern StgThreadReturnCode StgRun(StgFunPtr f, StgRegTable *basereg); -static void StgRunIsImplementedInAssembler(void) +static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void) { // r0 volatile // r1 stack pointer @@ -833,7 +833,7 @@ static void StgRunIsImplementedInAssembl #define LOCALS 31 #endif -static void StgRunIsImplementedInAssembler(void) +static void GNUC3_ATTRIBUTE(used) StgRunIsImplementedInAssembler(void) { __asm__ volatile( ".global StgRun\n" Index: ghc.spec =================================================================== RCS file: /cvs/extras/rpms/ghc/FC-5/ghc.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- ghc.spec 2 Mar 2006 08:40:15 -0000 1.11 +++ ghc.spec 22 Mar 2006 03:32:33 -0000 1.12 @@ -6,7 +6,7 @@ Name: ghc Version: 6.4.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Glasgow Haskell Compilation system License: BSD style Group: Development/Languages @@ -14,13 +14,14 @@ URL: http://haskell.org/ghc/ Requires: %{ghcver} = %{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ghc, sed -Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel +BuildRequires: ghc, sed +Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel %if %{build_doc} # haddock generates libraries/ docs -Buildrequires: libxslt, docbook-style-xsl, haddock +Buildrequires: libxslt, docbook-style-xsl, haddock %endif -Prefix: %{_prefix} +Prefix: %{_prefix} +Patch1: ghc-6.4.1-gcc41.patch %description GHC is a state-of-the-art programming suite for Haskell, a purely @@ -78,6 +79,7 @@ %prep %setup -q -n ghc-%{version} +%patch1 -p1 -b .1-gcc %build %if !%{build_prof} @@ -156,15 +158,19 @@ %endif %changelog -* Thu Mar 2 2006 Jens Petersen - 6.4.1-3 +* Wed Mar 22 2006 Jens Petersen - 6.4.1-4.fc5 +- add ghc-6.4.1-gcc41.patch from gentoo-haskell to fix stage2 linking on x86_64 + (Chris Parrott, #185914) + +* Thu Mar 2 2006 Jens Petersen - 6.4.1-3.fc5 - buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024) - make ghc-doc require ghc (Michel Salim, #180449) -* Tue Oct 11 2005 Jens Petersen - 6.4.1-2 +* Tue Oct 11 2005 Jens Petersen - 6.4.1-2.fc5 - turn on build_doc since haddock is now in Extras - no longer specify ghc version to build with (Ville Skytt??, #170176) -* Tue Sep 20 2005 Jens Petersen - 6.4.1-1 +* Tue Sep 20 2005 Jens Petersen - 6.4.1-1.fc5 - 6.4.1 release - the following patches are now upstream: ghc-6.4-powerpc.patch, rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch, From fedora-extras-commits at redhat.com Wed Mar 22 04:31:57 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:31:57 -0500 Subject: rpms/jigdo - New directory Message-ID: <200603220431.k2M4VxJC027955@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27947/jigdo Log Message: Directory /cvs/extras/rpms/jigdo added to the repository From fedora-extras-commits at redhat.com Wed Mar 22 04:32:02 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:32:02 -0500 Subject: rpms/jigdo/devel - New directory Message-ID: <200603220432.k2M4W4KC027970@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27947/jigdo/devel Log Message: Directory /cvs/extras/rpms/jigdo/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 22 04:32:35 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:32:35 -0500 Subject: rpms/jigdo Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603220432.k2M4WbGo028004@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27992 Added Files: Makefile import.log Log Message: Setup of module jigdo --- NEW FILE Makefile --- # Top level Makefile for module jigdo all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 22 04:32:41 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:32:41 -0500 Subject: rpms/jigdo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603220432.k2M4WhAO028024@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27992/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module jigdo --- NEW 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 Mar 22 04:35:09 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:35:09 -0500 Subject: rpms/jigdo import.log,1.1,1.2 Message-ID: <200603220435.k2M4ZfUU028122@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28078 Modified Files: import.log Log Message: auto-import jigdo-0.7.2-3 on branch devel from jigdo-0.7.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/jigdo/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 Mar 2006 04:32:35 -0000 1.1 +++ import.log 22 Mar 2006 04:35:09 -0000 1.2 @@ -0,0 +1 @@ +jigdo-0_7_2-3:HEAD:jigdo-0.7.2-3.src.rpm:1143002087 From fedora-extras-commits at redhat.com Wed Mar 22 04:35:15 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Tue, 21 Mar 2006 23:35:15 -0500 Subject: rpms/jigdo/devel jigdo-0.7.1-debug.patch, NONE, 1.1 jigdo-0.7.2-amd64.patch, NONE, 1.1 jigdo-0.7.2-gcc41.patch, NONE, 1.1 jigdo.desktop, NONE, 1.1 jigdo.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603220435.k2M4ZlfK028126@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/rpms/jigdo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28078/devel Modified Files: .cvsignore sources Added Files: jigdo-0.7.1-debug.patch jigdo-0.7.2-amd64.patch jigdo-0.7.2-gcc41.patch jigdo.desktop jigdo.spec Log Message: auto-import jigdo-0.7.2-3 on branch devel from jigdo-0.7.2-3.src.rpm jigdo-0.7.1-debug.patch: --- NEW FILE jigdo-0.7.1-debug.patch --- --- jigdo-0.7.1/configure.debug 2004-06-20 16:49:15.000000000 -0400 +++ jigdo-0.7.1/configure 2005-04-15 18:19:10.000000000 -0400 @@ -2723,8 +2723,6 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -CFLAGS=`echo "$CFLAGS" | sed 's/\(^\| \)-g\( \|$\)/ /'` -CXXFLAGS=`echo "$CXXFLAGS" | sed 's/\(^\| \)-g\( \|$\)/ /'` IF_GXX2="#" IF_NOGXX2="" if test "$GXX" = yes; then jigdo-0.7.2-amd64.patch: --- NEW FILE jigdo-0.7.2-amd64.patch --- Index: src/cachefile.hh =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/cachefile.hh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -B -r1.3 -r1.4 --- src/cachefile.hh 2 Jul 2005 22:05:03 -0000 1.3 +++ src/cachefile.hh 21 Jul 2005 11:31:43 -0000 1.4 @@ -1,4 +1,4 @@ -/* $Id: cachefile.hh,v 1.3 2005/07/02 22:05:03 atterer Exp $ -*- C++ -*- +/* $Id: cachefile.hh,v 1.4 2005/07/21 11:31:43 atterer Exp $ -*- C++ -*- __ _ |_) /| Copyright (C) 2001-2002 | richard@ | \/?| Richard Atterer | atterer.net @@ -94,7 +94,7 @@ only valid until the next database operation. */ Status findName(const byte*& resultData, size_t& resultSize, const string& fileName, - long long int& resultFileSize, time_t& resultMtime); + off_t& resultFileSize, time_t& resultMtime); /** Insert/overwrite entry for the given file (name must be absolute, file must have the supplied mtime and size). The data Index: src/cachefile.cc =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/cachefile.cc,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -B -r1.7 -r1.8 --- src/cachefile.cc 2 Jul 2005 22:05:03 -0000 1.7 +++ src/cachefile.cc 21 Jul 2005 11:31:43 -0000 1.8 @@ -1,4 +1,4 @@ -/* $Id: cachefile.cc,v 1.7 2005/07/02 22:05:03 atterer Exp $ -*- C++ -*- +/* $Id: cachefile.cc,v 1.8 2005/07/21 11:31:43 atterer Exp $ -*- C++ -*- __ _ |_) /| Copyright (C) 2001-2003 | richard@ | \/?| Richard Atterer | atterer.net @@ -131,7 +131,7 @@ //________________________________________ Status CacheFile::findName(const byte*& resultData, size_t& resultSize, - const string& fileName, long long int& resultFileSize, + const string& fileName, off_t& resultFileSize, time_t& resultMtime) { DBT key; memset(&key, 0, sizeof(DBT)); key.data = const_cast(fileName.c_str()); jigdo-0.7.2-gcc41.patch: --- NEW FILE jigdo-0.7.2-gcc41.patch --- ? jigdo-gcc41.patch Index: src/jigdo-file.cc =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/jigdo-file.cc,v retrieving revision 1.19 diff -u -b -B -r1.19 jigdo-file.cc --- src/jigdo-file.cc 5 Jul 2005 12:47:17 -0000 1.19 +++ src/jigdo-file.cc 29 Jan 2006 23:42:14 -0000 @@ -477,6 +477,16 @@ } //______________________________________________________________________ +//______________________________________________________________________ + +void outOfMemory() { + cerr << subst(_("%1: Out of memory - aborted."), binName()) << endl; + exit(3); +} +//______________________________________________________________________ + +} // local namespace + enum { LONGOPT_BUFSIZE = 0x100, LONGOPT_NOFORCE, LONGOPT_MINSIZE, LONGOPT_MD5SIZE, LONGOPT_MKIMAGECHECK, LONGOPT_NOMKIMAGECHECK, @@ -722,15 +732,6 @@ return result; } -//______________________________________________________________________ - -void outOfMemory() { - cerr << subst(_("%1: Out of memory - aborted."), binName()) << endl; - exit(3); -} -//______________________________________________________________________ - -} // local namespace void exit_tryHelp() { cerr << subst(_("%1: Try `%1 -h' or `man jigdo-file' for more " Index: src/mktemplate.hh =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/mktemplate.hh,v retrieving revision 1.9 diff -u -b -B -r1.9 mktemplate.hh --- src/mktemplate.hh 5 Jul 2005 12:26:20 -0000 1.9 +++ src/mktemplate.hh 29 Jan 2006 23:42:14 -0000 @@ -136,7 +136,7 @@ void prepareJigdo(); void finalizeJigdo(const string& imageLeafName, const string& templLeafName, const MD5Sum& templMd5Sum); - INLINE bool MkTemplate::scanFiles(size_t blockLength, uint32 blockMask, + INLINE bool scanFiles(size_t blockLength, uint32 blockMask, size_t md5BlockLength); INLINE bool scanImage(byte* buf, size_t bufferLength, size_t blockLength, uint32 blockMask, size_t md5BlockLength, MD5Sum&); Index: src/recursedir.cc =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/recursedir.cc,v retrieving revision 1.9 diff -u -b -B -r1.9 recursedir.cc --- src/recursedir.cc 2 Jul 2005 22:05:04 -0000 1.9 +++ src/recursedir.cc 29 Jan 2006 23:42:14 -0000 @@ -56,6 +56,10 @@ //______________________________________________________________________ +} // local namespace +//________________________________________ + + /* Assign the next object name to result. Returns FAILURE if no more names available. Note: An object name is immediately removed from the start of "objects" when it is copied to "result". The name of @@ -130,9 +134,6 @@ } } } - -} // local namespace -//________________________________________ bool RecurseDir::getName(string& result, struct stat* fileInfo, bool checkFiles) Index: src/recursedir.hh =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/recursedir.hh,v retrieving revision 1.6 diff -u -b -B -r1.6 recursedir.hh --- src/recursedir.hh 4 Jul 2005 10:25:10 -0000 1.6 +++ src/recursedir.hh 29 Jan 2006 23:42:14 -0000 @@ -101,7 +101,7 @@ string curDir; stack recurseStack; - inline bool RecurseDir::getNextObjectName(string& result) + inline bool getNextObjectName(string& result) throw(RecurseError); queue objects; // Queue of filenames to output/dirs to recurse into queue objectsFrom; // Files containing filenames Index: src/net/download.hh =================================================================== RCS file: /cvsroot/jigdo/jigdo/src/net/download.hh,v retrieving revision 1.16 diff -u -b -B -r1.16 download.hh --- src/net/download.hh 9 Apr 2005 23:09:52 -0000 1.16 +++ src/net/download.hh 29 Jan 2006 23:55:04 -0000 @@ -126,7 +126,7 @@ static size_t curlWriter(void* data, size_t size, size_t nmemb, void* selfPtr); // Called by glibcurl after curl_multi_perform() - static void Download::glibcurlCallback(void*); + static void glibcurlCallback(void*); // Unregister request from glibwww event loop // void pauseNow(); --- NEW FILE jigdo.desktop --- [Desktop Entry] Name=Jigsaw Download Manager GenericName=Download Manager Comment=Download files prepared for Jigdo Exec=jigdo Icon=jigdo-icon.png Terminal=false StartupWMClass="jigdo" Type=Application Categories=GTK;Application;Network; Encoding=UTF-8 --- NEW FILE jigdo.spec --- Name: jigdo Version: 0.7.2 Release: 3 Summary: Ease distribution of large files over the Internet Group: Applications/Internet License: GPL URL: http://atterer.net/jigdo/ Source0: http://atterer.net/jigdo/%{name}-%{version}.tar.bz2 Source1: jigdo.desktop Patch0: jigdo-0.7.2-amd64.patch Patch1: jigdo-0.7.1-debug.patch Patch2: jigdo-0.7.2-gcc41.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: db4-devel, bzip2-devel, curl-devel, /bin/awk, gettext BuildRequires: desktop-file-utils, gtk2-devel >= 0:2.0.6 Requires: wget %description Jigsaw Download, or short jigdo, is a tool designed to ease the distribution of very large files over the internet, for example CD or DVD images. Its aim is to make downloading the images as easy for users as a click on a direct download link in a browser, while avoiding all the problems that server administrators have with hosting such large files. It accomplishes this by using the separate pieces of any big file (such as the files contained within a CD/DVD image) to create a special "template" file which makes reassembly of the big file very easy for users who only have the pieces. %prep %setup -q %patch0 -p0 -b .amd64 %patch1 -p1 -b .debug %patch2 -p0 -b .gcc41 %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR="$RPM_BUILD_ROOT" INSTALL_EXE="/usr/bin/install -c" install # remove debian-specific script rm -f $RPM_BUILD_ROOT%{_bindir}/jigdo-mirror \ $RPM_BUILD_ROOT%{_mandir}/man?/jigdo-mirror* %find_lang %{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ --add-category X-Fedora-Extra \ %{SOURCE1} # icon mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps install -m 0644 -p gfx/jigdo-icon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps %clean rm -rf $RPM_BUILD_ROOT %files -f %{name}.lang %defattr(-,root,root,-) %doc changelog COPYING README THANKS doc/*.html doc/TechDetails.txt doc/README-bindist.txt %{_bindir}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_datadir}/pixmaps/jigdo-icon.png %{_datadir}/applications/* %attr(0644,root,root) %{_mandir}/man[^3]/* %changelog * Wed Mar 8 2006 Ian Burrell - 0.7.2-3 - Remove dependency on w3c-libwww * Sun Jan 29 2006 Ian Burrell - 0.7.2-2 - Cleanup BuildRequires - Patch for GCC 4.1 * Thu Dec 22 2005 Ian Burrell - 0.7.2-1 - Update to 0.7.2 - Patch from CVS for 64-bit * Fri Apr 15 2005 Charles R. Anderson 0.7.1-4 - add gcc4 patch - remove --enable-debug and patch out configure's removal of -g * Fri Apr 15 2005 Charles R. Anderson 0.7.1-3 - BR gettext instead - move icon back to /usr/share/pixmaps - add Category GTK to desktop file * Fri Apr 15 2005 Charles R. Anderson 0.7.1-2 - BR gettext-devel - desktop category X-Fedora-Extra * Mon Apr 11 2005 Charles R. Anderson 0.7.1-1 - prepare for Fedora Extras - update to 0.7.1 - remove unneeded db41 and debug patches * Fri Jul 02 2004 Charles R. Anderson 0:0.7.0-0.fdr.5 - install icon to /usr/share/jigdo/pixmaps and use that path in desktop file - remove jigdo-mirror, since it is debian-specific * Tue Jun 01 2004 Charles R. Anderson 0:0.7.0-0.fdr.4 - don't strip binaries so debuginfo is created properly - make jigdo-icon.png non-executable - fixup buildroot path in jigdo-lite - use more descriptive summary, description, and desktop file metadata * Mon Feb 02 2004 Charles R. Anderson 0:0.7.0-0.fdr.3 - Revise patch to compile against db-4.1+ * Mon Feb 02 2004 Charles R. Anderson 0:0.7.0-0.fdr.2 - Add patch to compile against db-4.2. - BuildRequires: zlib-devel, /bin/awk - Requires: wget - Integrate jigdo.desktop into .spec file * Sat Jan 31 2004 Charles R. Anderson 0:0.7.0-0.fdr.1 - Initial fedoraized release - Install i18n files - Install desktop file and icon - Add a bunch of BuildRequires * Mon Jan 26 2002 Alexander Skwar 0.6.2-4mdk - Icons will be provided in the gfx subdirectory of the tarball * Sun Jan 25 2002 Alexander Skwar 0.6.2-3mdk - Jigdo compiles with gcc 2.96 now - Only re-define the macros if they aren't yet defined * Sat Jan 24 2002 Alexander Skwar 0.6.2-2mdk - Make the SPEC be generic, so that it can be built on non-Mandrake machines * Sat Jan 24 2002 Alexander Skwar 0.6.2-1mdk - 0.6.2 - Remove patch1 - merged upstream * Tue Jan 22 2002 Alexander Skwar 0.6.1-1mdk - First Mandrake release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/jigdo/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Mar 2006 04:32:41 -0000 1.1 +++ .cvsignore 22 Mar 2006 04:35:15 -0000 1.2 @@ -0,0 +1 @@ +jigdo-0.7.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/jigdo/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Mar 2006 04:32:41 -0000 1.1 +++ sources 22 Mar 2006 04:35:15 -0000 1.2 @@ -0,0 +1 @@ +031756ff6c7084a139dc9550a27f6906 jigdo-0.7.2.tar.bz2 From fedora-extras-commits at redhat.com Wed Mar 22 06:55:26 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 22 Mar 2006 01:55:26 -0500 Subject: rpms/haddock/FC-5 haddock.spec,1.1,1.2 Message-ID: <200603220655.k2M6tw1K032527@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/haddock/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32510 Modified Files: haddock.spec Log Message: - rebuild for FE5 Index: haddock.spec =================================================================== RCS file: /cvs/extras/rpms/haddock/FC-5/haddock.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- haddock.spec 28 Sep 2005 03:00:15 -0000 1.1 +++ haddock.spec 22 Mar 2006 06:55:25 -0000 1.2 @@ -1,6 +1,6 @@ Name: haddock Version: 0.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Haddock documentation tool for annotated Haskell source code Group: Development/Tools @@ -62,6 +62,9 @@ %{_datadir}/haddock-%{version} %changelog +* Wed Mar 22 2006 Jens Petersen - 0.7-2.fc5 +- rebuild for FE5 + * Tue Sep 27 2005 Jens Petersen - 0.7-1 - cleanup for Fedora Extras (G??rard Milmeister) - drop versioned binary From fedora-extras-commits at redhat.com Wed Mar 22 07:17:42 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 22 Mar 2006 02:17:42 -0500 Subject: rpms/darcs/FC-5 darcs.spec,1.8,1.9 Message-ID: <200603220718.k2M7IENv002138@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2103 Modified Files: darcs.spec Log Message: build with new ghc build Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/darcs.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- darcs.spec 2 Mar 2006 09:25:22 -0000 1.8 +++ darcs.spec 22 Mar 2006 07:17:41 -0000 1.9 @@ -84,7 +84,7 @@ %changelog -* Thu Mar 2 2006 Jens Petersen - 1.0.6-1 +* Wed Mar 22 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 - darcs-createrepo is gone From fedora-extras-commits at redhat.com Wed Mar 22 07:23:38 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 22 Mar 2006 02:23:38 -0500 Subject: rpms/darcs/FC-5 darcs.spec,1.9,1.10 Message-ID: <200603220724.k2M7OAdP002252@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2235 Modified Files: darcs.spec Log Message: bump release Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-5/darcs.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- darcs.spec 22 Mar 2006 07:17:41 -0000 1.9 +++ darcs.spec 22 Mar 2006 07:23:38 -0000 1.10 @@ -1,6 +1,6 @@ Name: darcs Version: 1.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: David's advanced revision control system Group: Development/Tools @@ -84,7 +84,10 @@ %changelog -* Wed Mar 22 2006 Jens Petersen - 1.0.6-1 +* Wed Mar 22 2006 Jens Petersen - 1.0.6-2 +- build with rebuilt ghc + +* Thu Mar 2 2006 Jens Petersen - 1.0.6-1 - update to 1.0.6 - darcs-createrepo is gone From fedora-extras-commits at redhat.com Wed Mar 22 07:39:14 2006 From: fedora-extras-commits at redhat.com (Ian Burrell (iburrell)) Date: Wed, 22 Mar 2006 02:39:14 -0500 Subject: owners owners.list,1.755,1.756 Message-ID: <200603220739.k2M7dk2G002351@cvs-int.fedora.redhat.com> Author: iburrell Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2333 Modified Files: owners.list Log Message: add jigdo Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.755 retrieving revision 1.756 diff -u -r1.755 -r1.756 --- owners.list 21 Mar 2006 21:36:21 -0000 1.755 +++ owners.list 22 Mar 2006 07:39:13 -0000 1.756 @@ -481,6 +481,7 @@ Fedora Extras|jasper|Implementation of the JPEG-2000 standard, Part 1|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|jed|A fast, compact editor based on the S-Lang screen library.|notting at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|jhead|Tool for displaying EXIF data embedded in JPEG images|adrian at lisas.de|extras-qa at fedoraproject.org| +Fedora Extras|jigdo|Ease distribution of large files over the Internet|ianburrell at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|jikes|A Java source file to bytecode compiler|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|jlint|Java program checker|ville.skytta at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|jogl|Java bindings for the OpenGL API|green at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 22 08:14:51 2006 From: fedora-extras-commits at redhat.com (Jens Petersen (petersen)) Date: Wed, 22 Mar 2006 03:14:51 -0500 Subject: rpms/darcs/FC-4 .cvsignore, 1.3, 1.4 darcs.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200603220815.k2M8FN7L004464@cvs-int.fedora.redhat.com> Author: petersen Update of /cvs/extras/rpms/darcs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4439 Modified Files: .cvsignore darcs.spec sources Log Message: sync with FC-5: - update to 1.0.6 - darcs-createrepo is gone Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Nov 2005 07:03:41 -0000 1.3 +++ .cvsignore 22 Mar 2006 08:14:51 -0000 1.4 @@ -1 +1 @@ -darcs-1.0.4.tar.gz +darcs-1.0.6.tar.gz Index: darcs.spec =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/darcs.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- darcs.spec 27 Dec 2005 04:55:18 -0000 1.7 +++ darcs.spec 22 Mar 2006 08:14:51 -0000 1.8 @@ -1,5 +1,5 @@ Name: darcs -Version: 1.0.5 +Version: 1.0.6 Release: 1%{?dist} Summary: David's advanced revision control system @@ -79,12 +79,15 @@ %files server %defattr(-,root,root,-) %{_localstatedir}/www/cgi-bin -%{_sbindir}/darcs-createrepo %{_sysconfdir}/darcs %{_datadir}/darcs %changelog +* Wed Mar 22 2006 Jens Petersen - 1.0.6-1 +- update to 1.0.6 + - darcs-createrepo is gone + * Thu Dec 8 2005 Jens Petersen - 1.0.5-1 - 1.0.5 bugfix release Index: sources =================================================================== RCS file: /cvs/extras/rpms/darcs/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2005 04:55:18 -0000 1.4 +++ sources 22 Mar 2006 08:14:51 -0000 1.5 @@ -1 +1 @@ -9a9a4f84ed5b6258f7ab321713adf20b darcs-1.0.5.tar.gz +8f3a1ee21b7bfbcca11bf4f9f0042cfd darcs-1.0.6.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 09:30:18 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 22 Mar 2006 04:30:18 -0500 Subject: rpms/yumex/FC-5 .cvsignore, 1.17, 1.18 sources, 1.21, 1.22 yumex.spec, 1.22, 1.23 Message-ID: <200603220930.k2M9UpUF007280@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7243/FC-5 Modified Files: .cvsignore sources yumex.spec Log Message: Release 0.99.14 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/.cvsignore,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- .cvsignore 13 Mar 2006 15:40:53 -0000 1.17 +++ .cvsignore 22 Mar 2006 09:30:17 -0000 1.18 @@ -1 +1 @@ -yumex-0.99.12.tar.gz +yumex-0.99.14.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 20 Mar 2006 12:32:25 -0000 1.21 +++ sources 22 Mar 2006 09:30:17 -0000 1.22 @@ -1 +1 @@ -cfad88b2e83aafa6f7523ea037ec2731 yumex-0.99.13.tar.gz +75aade2fc07e8672d61b0f553f37ab0d yumex-0.99.14.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- yumex.spec 20 Mar 2006 12:32:25 -0000 1.22 +++ yumex.spec 22 Mar 2006 09:30:17 -0000 1.23 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.13 +Version: 0.99.14 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Mar 20 2006 Tim Lauridsen - 0.99.14-1.0 +- Development Release 0.99.14-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 - Development Release 0.99.13-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 From fedora-extras-commits at redhat.com Wed Mar 22 09:30:25 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Wed, 22 Mar 2006 04:30:25 -0500 Subject: rpms/yumex/devel sources,1.21,1.22 yumex.spec,1.22,1.23 Message-ID: <200603220930.k2M9UvHa007285@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7243/devel Modified Files: sources yumex.spec Log Message: Release 0.99.14 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 20 Mar 2006 12:32:30 -0000 1.21 +++ sources 22 Mar 2006 09:30:25 -0000 1.22 @@ -1 +1 @@ -cfad88b2e83aafa6f7523ea037ec2731 yumex-0.99.13.tar.gz +75aade2fc07e8672d61b0f553f37ab0d yumex-0.99.14.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- yumex.spec 20 Mar 2006 12:32:30 -0000 1.22 +++ yumex.spec 22 Mar 2006 09:30:25 -0000 1.23 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.13 +Version: 0.99.14 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Mon Mar 20 2006 Tim Lauridsen - 0.99.14-1.0 +- Development Release 0.99.14-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 - Development Release 0.99.13-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.12-1.0 From fedora-extras-commits at redhat.com Wed Mar 22 10:22:11 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Wed, 22 Mar 2006 05:22:11 -0500 Subject: fedora-security/audit fc4,1.177,1.178 fc5,1.90,1.91 Message-ID: <200603221022.k2MAMB1H009583@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9563 Modified Files: fc4 fc5 Log Message: Latest updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- fc4 21 Mar 2006 16:15:43 -0000 1.177 +++ fc4 22 Mar 2006 10:22:00 -0000 1.178 @@ -1,8 +1,11 @@ -Up to date CVE as of CVE email 20060315 -Up to date FC4 as of 20060315 +Up to date CVE as of CVE email 20060321 +Up to date FC4 as of 20060321 ** are items that need attention +CVE-2006-1354 VULNERABLE (freeradius) bz#186084 +CVE-2006-1343 ** kernel +CVE-2006-1342 ** kernel CVE-2006-1273 ** firefox (prob win only, vague) CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.90 retrieving revision 1.91 diff -u -r1.90 -r1.91 --- fc5 21 Mar 2006 17:21:34 -0000 1.90 +++ fc5 22 Mar 2006 10:22:00 -0000 1.91 @@ -1,8 +1,11 @@ -Up to date CVE as of CVE email 20060319 -Up to date FC5 as of 20060320 +Up to date CVE as of CVE email 20060321 +Up to date FC5 as of 20060321 ** are items that need attention +CVE-2006-1354 VULNERABLE (freeradius) bz#186084 +CVE-2006-1343 ** kernel +CVE-2006-1342 ** kernel CVE-2006-1335 version (gnome-screensaver, fixed 2.14) CVE-2006-1296 backport (beagle) bz#185981 [since FEDORA-2006-188] CVE-2006-1273 ** firefox (prob win only, vague) From fedora-extras-commits at redhat.com Wed Mar 22 10:39:05 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:39:05 -0500 Subject: rpms/perl-pmtools/FC-3 pmtools-1.01-pman2pmman.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-pmtools.spec, 1.2, 1.3 sources, 1.2, 1.3 pmtools-1.00-different-tarball.patch, 1.1, NONE pmtools-1.00-pmall.patch, 1.1, NONE pmtools-1.00-pmeth-pman2pmman.patch, 1.1, NONE Message-ID: <200603221039.k2MAdbOx009796@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9712/FC-3 Modified Files: .cvsignore perl-pmtools.spec sources Added Files: pmtools-1.01-pman2pmman.patch Removed Files: pmtools-1.00-different-tarball.patch pmtools-1.00-pmall.patch pmtools-1.00-pmeth-pman2pmman.patch Log Message: Update to 1.01. pmtools-1.01-pman2pmman.patch: --- NEW FILE pmtools-1.01-pman2pmman.patch --- diff -ruN pmtools-1.01-orig/Makefile.lame pmtools-1.01/Makefile.lame --- pmtools-1.01-orig/Makefile.lame 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/Makefile.lame 2006-03-22 10:23:53.000000000 +0000 @@ -1,5 +1,5 @@ -PROGRAMS=basepods faqpods modpods pfcat plxload pmall pman pmcat \ +PROGRAMS=basepods faqpods modpods pfcat plxload pmall pmman pmcat \ pmdesc pmdirs pmeth pmexp pmfunc pminst pmload pmls pmpath pmvers podgrep \ podpath pods podtoc sitepods stdpods diff -ruN pmtools-1.01-orig/Makefile.PL pmtools-1.01/Makefile.PL --- pmtools-1.01-orig/Makefile.PL 2006-03-22 00:54:57.000000000 +0000 +++ pmtools-1.01/Makefile.PL 2006-03-22 10:23:53.000000000 +0000 @@ -4,8 +4,8 @@ NAME => "pmtools", DISTNAME => "pmtools", EXE_FILES => [ basepods, faqpods, modpods, pfcat, plxload, - pmall, pman, pmcat, pmdesc, pmdirs, pmeth, pmexp, - pmfunc, pminst, pmload, pmls, pmpath, pmvers, + pmall, pmcat, pmdesc, pmdirs, pmeth, pmexp, + pmfunc, pminst, pmload, pmman, pmls, pmpath, pmvers, podgrep, podpath, pods, podtoc, sitepods, stdpods ], PM => { 'Devel/Loaded.pm' => '$(INST_LIBDIR)/Devel/Loaded.pm' } diff -ruN pmtools-1.01-orig/MANIFEST pmtools-1.01/MANIFEST --- pmtools-1.01-orig/MANIFEST 2006-03-22 02:57:51.000000000 +0000 +++ pmtools-1.01/MANIFEST 2006-03-22 10:23:53.000000000 +0000 @@ -12,7 +12,7 @@ pfcat plxload pmall -pman +pmman pmcat pmdesc pmdirs diff -ruN pmtools-1.01-orig/pman pmtools-1.01/pman --- pmtools-1.01-orig/pman 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/pman 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -#!/usr/bin/env perl -# pman -- show a module's man page -# tchrist at perl.com - -BEGIN { $^W = 1 } -BEGIN { die "usage: $0 module ...\n" unless @ARGV } - -use FindBin qw($Bin); - -$errors = 0; - -unless ($pager = $ENV{PAGER}) { - require Config; - $pager = $Config::Config{"pager"} || "more"; -} - -for $module (@ARGV) { - my $path = `$Bin/pmpath $module`; - if ($?) { - $errors++; - next; - } - chomp $path; - system "pod2text $path | $pager"; - $errors += ($? != 1); -} - -exit($errors != 0); - -__END__ - -=head1 NAME - -pman - show a module's man page - -=head1 DESCRIPTION - -Send a module's pod through pod2text and your pager. - -This is mostly here for people too lazy to type - - $ pod2text `pmpath CGI` | $PAGER - -=head1 EXAMPLES - - $ pman CGI - $ pman Curses - -Or running under different versions of Perl: - - $ oldperl -S pman CGI - $ filsperl -S pman Threads - -=head1 SEE ALSO - -pod2text(1), perlpod(1), pod2man(1), pod2html(1). - -=head1 AUTHOR and COPYRIGHT - -Copyright (c) 1999 Tom Christiansen - -This is free software. You may modify it and distribute it -under Perl's Artistic Licence. Modified versions must be -clearly indicated. diff -ruN pmtools-1.01-orig/pmman pmtools-1.01/pmman --- pmtools-1.01-orig/pmman 1970-01-01 01:00:00.000000000 +0100 +++ pmtools-1.01/pmman 2006-03-22 10:23:53.000000000 +0000 @@ -0,0 +1,64 @@ +#!/usr/bin/env perl +# pmman -- show a module's man page +# tchrist at perl.com + +BEGIN { $^W = 1 } +BEGIN { die "usage: $0 module ...\n" unless @ARGV } + +use FindBin qw($Bin); + +$errors = 0; + +unless ($pager = $ENV{PAGER}) { + require Config; + $pager = $Config::Config{"pager"} || "more"; +} + +for $module (@ARGV) { + my $path = `$Bin/pmpath $module`; + if ($?) { + $errors++; + next; + } + chomp $path; + system "pod2text $path | $pager"; + $errors += ($? != 1); +} + +exit($errors != 0); + +__END__ + +=head1 NAME + +pmman - show a module's man page + +=head1 DESCRIPTION + +Send a module's pod through pod2text and your pager. + +This is mostly here for people too lazy to type + + $ pod2text `pmpath CGI` | $PAGER + +=head1 EXAMPLES + + $ pmman CGI + $ pmman Curses + +Or running under different versions of Perl: + + $ oldperl -S pmman CGI + $ filsperl -S pmman Threads + +=head1 SEE ALSO + +pod2text(1), perlpod(1), pod2man(1), pod2html(1). + +=head1 AUTHOR and COPYRIGHT + +Copyright (c) 1999 Tom Christiansen + +This is free software. You may modify it and distribute it +under Perl's Artistic Licence. Modified versions must be +clearly indicated. diff -ruN pmtools-1.01-orig/README pmtools-1.01/README --- pmtools-1.01-orig/README 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/README 2006-03-22 10:23:53.000000000 +0000 @@ -383,10 +383,10 @@ ========================================================= -pman - show the module's pod docs +pmman - show the module's pod docs - $ pman CGI - $ pman Curses + $ pmman CGI + $ pmman Curses This is mostly here for people too lazy to type $ pod2text `pmpath CGI` | more Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2005 02:06:20 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:39:05 -0000 1.3 @@ -1 +1 @@ -pmtools-1.00.tar.gz +pmtools-1.01.tar.gz Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-3/perl-pmtools.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-pmtools.spec 17 Mar 2005 03:40:07 -0000 1.2 +++ perl-pmtools.spec 22 Mar 2006 10:39:05 -0000 1.3 @@ -1,22 +1,18 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-pmtools -Version: 1.00 -Release: 1 +Version: 1.01 +Release: 1%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries License: Artistic -Url: http://language.perl.com/ -Source: http://history.perl.org/src/pmtools-1.00.tar.gz -Patch1: pmtools-1.00-different-tarball.patch -Patch2: pmtools-1.00-pmall.patch -Patch3: pmtools-1.00-pmeth-pman2pmman.patch +URL: http://search.cpan.org/dist/pmtools/ +Source: http://www.cpan.org/authors/id/M/ML/MLFISHER/pmtools-%{version}.tar.gz +Patch: pmtools-1.01-pman2pmman.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This is pmtools -- a suite of small programs to help manage modules. @@ -29,9 +25,7 @@ %prep %setup -q -n pmtools-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -p1 chmod 755 pmman find . -type f -perm 755 | xargs %{__perl} -pi -e 's{^#!/usr/bin/env perl}{#!%{__perl}}' @@ -49,7 +43,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -67,6 +61,21 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 1.01-1 +- Update to 1.01. +- URL updated: pmtools is now available in CPAN. +- Dropped patches pmtools-1.00-{different-tarball.patch,pmall.patch}: + they were accepted upstream. + +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.00-4 +- Rebuild for FC5 (perl 5.8.8). + +* Thu Dec 22 2005 Jose Pedro Oliveira - 1.00-3 +- Dist tag. + +* Fri Apr 7 2005 Michael Schwendt - 1.00-2 +- rebuilt + * Sun Feb 06 2005 Jose Pedro Oliveira - 1.00-1 - Valid source file link found. - Package renamed to 'perl-pmtools' in order to avoid name clash with @@ -77,5 +86,5 @@ script 'pman' into 'pmman' in order to avoid a filename clash with the pinfo package. -* Sat Feb 28 2004 Jose Pedro Oliveira 0:1.00-0.fdr.0 +* Sat Feb 28 2004 Jose Pedro Oliveira - 0:1.00-0.fdr.0 - Initial build for fedora.us Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2005 02:06:20 -0000 1.2 +++ sources 22 Mar 2006 10:39:05 -0000 1.3 @@ -1 +1 @@ -88ee58113ac3d513d94f81f9fdfaeb00 pmtools-1.00.tar.gz +85d800dff1f73b559a929d7984435b57 pmtools-1.01.tar.gz --- pmtools-1.00-different-tarball.patch DELETED --- --- pmtools-1.00-pmall.patch DELETED --- --- pmtools-1.00-pmeth-pman2pmman.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 10:39:11 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:39:11 -0500 Subject: rpms/perl-pmtools/FC-4 pmtools-1.01-pman2pmman.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-pmtools.spec, 1.3, 1.4 sources, 1.2, 1.3 pmtools-1.00-different-tarball.patch, 1.1, NONE pmtools-1.00-pmall.patch, 1.1, NONE pmtools-1.00-pmeth-pman2pmman.patch, 1.1, NONE Message-ID: <200603221039.k2MAdhkN009801@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9712/FC-4 Modified Files: .cvsignore perl-pmtools.spec sources Added Files: pmtools-1.01-pman2pmman.patch Removed Files: pmtools-1.00-different-tarball.patch pmtools-1.00-pmall.patch pmtools-1.00-pmeth-pman2pmman.patch Log Message: Update to 1.01. pmtools-1.01-pman2pmman.patch: --- NEW FILE pmtools-1.01-pman2pmman.patch --- diff -ruN pmtools-1.01-orig/Makefile.lame pmtools-1.01/Makefile.lame --- pmtools-1.01-orig/Makefile.lame 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/Makefile.lame 2006-03-22 10:23:53.000000000 +0000 @@ -1,5 +1,5 @@ -PROGRAMS=basepods faqpods modpods pfcat plxload pmall pman pmcat \ +PROGRAMS=basepods faqpods modpods pfcat plxload pmall pmman pmcat \ pmdesc pmdirs pmeth pmexp pmfunc pminst pmload pmls pmpath pmvers podgrep \ podpath pods podtoc sitepods stdpods diff -ruN pmtools-1.01-orig/Makefile.PL pmtools-1.01/Makefile.PL --- pmtools-1.01-orig/Makefile.PL 2006-03-22 00:54:57.000000000 +0000 +++ pmtools-1.01/Makefile.PL 2006-03-22 10:23:53.000000000 +0000 @@ -4,8 +4,8 @@ NAME => "pmtools", DISTNAME => "pmtools", EXE_FILES => [ basepods, faqpods, modpods, pfcat, plxload, - pmall, pman, pmcat, pmdesc, pmdirs, pmeth, pmexp, - pmfunc, pminst, pmload, pmls, pmpath, pmvers, + pmall, pmcat, pmdesc, pmdirs, pmeth, pmexp, + pmfunc, pminst, pmload, pmman, pmls, pmpath, pmvers, podgrep, podpath, pods, podtoc, sitepods, stdpods ], PM => { 'Devel/Loaded.pm' => '$(INST_LIBDIR)/Devel/Loaded.pm' } diff -ruN pmtools-1.01-orig/MANIFEST pmtools-1.01/MANIFEST --- pmtools-1.01-orig/MANIFEST 2006-03-22 02:57:51.000000000 +0000 +++ pmtools-1.01/MANIFEST 2006-03-22 10:23:53.000000000 +0000 @@ -12,7 +12,7 @@ pfcat plxload pmall -pman +pmman pmcat pmdesc pmdirs diff -ruN pmtools-1.01-orig/pman pmtools-1.01/pman --- pmtools-1.01-orig/pman 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/pman 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -#!/usr/bin/env perl -# pman -- show a module's man page -# tchrist at perl.com - -BEGIN { $^W = 1 } -BEGIN { die "usage: $0 module ...\n" unless @ARGV } - -use FindBin qw($Bin); - -$errors = 0; - -unless ($pager = $ENV{PAGER}) { - require Config; - $pager = $Config::Config{"pager"} || "more"; -} - -for $module (@ARGV) { - my $path = `$Bin/pmpath $module`; - if ($?) { - $errors++; - next; - } - chomp $path; - system "pod2text $path | $pager"; - $errors += ($? != 1); -} - -exit($errors != 0); - -__END__ - -=head1 NAME - -pman - show a module's man page - -=head1 DESCRIPTION - -Send a module's pod through pod2text and your pager. - -This is mostly here for people too lazy to type - - $ pod2text `pmpath CGI` | $PAGER - -=head1 EXAMPLES - - $ pman CGI - $ pman Curses - -Or running under different versions of Perl: - - $ oldperl -S pman CGI - $ filsperl -S pman Threads - -=head1 SEE ALSO - -pod2text(1), perlpod(1), pod2man(1), pod2html(1). - -=head1 AUTHOR and COPYRIGHT - -Copyright (c) 1999 Tom Christiansen - -This is free software. You may modify it and distribute it -under Perl's Artistic Licence. Modified versions must be -clearly indicated. diff -ruN pmtools-1.01-orig/pmman pmtools-1.01/pmman --- pmtools-1.01-orig/pmman 1970-01-01 01:00:00.000000000 +0100 +++ pmtools-1.01/pmman 2006-03-22 10:23:53.000000000 +0000 @@ -0,0 +1,64 @@ +#!/usr/bin/env perl +# pmman -- show a module's man page +# tchrist at perl.com + +BEGIN { $^W = 1 } +BEGIN { die "usage: $0 module ...\n" unless @ARGV } + +use FindBin qw($Bin); + +$errors = 0; + +unless ($pager = $ENV{PAGER}) { + require Config; + $pager = $Config::Config{"pager"} || "more"; +} + +for $module (@ARGV) { + my $path = `$Bin/pmpath $module`; + if ($?) { + $errors++; + next; + } + chomp $path; + system "pod2text $path | $pager"; + $errors += ($? != 1); +} + +exit($errors != 0); + +__END__ + +=head1 NAME + +pmman - show a module's man page + +=head1 DESCRIPTION + +Send a module's pod through pod2text and your pager. + +This is mostly here for people too lazy to type + + $ pod2text `pmpath CGI` | $PAGER + +=head1 EXAMPLES + + $ pmman CGI + $ pmman Curses + +Or running under different versions of Perl: + + $ oldperl -S pmman CGI + $ filsperl -S pmman Threads + +=head1 SEE ALSO + +pod2text(1), perlpod(1), pod2man(1), pod2html(1). + +=head1 AUTHOR and COPYRIGHT + +Copyright (c) 1999 Tom Christiansen + +This is free software. You may modify it and distribute it +under Perl's Artistic Licence. Modified versions must be +clearly indicated. diff -ruN pmtools-1.01-orig/README pmtools-1.01/README --- pmtools-1.01-orig/README 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/README 2006-03-22 10:23:53.000000000 +0000 @@ -383,10 +383,10 @@ ========================================================= -pman - show the module's pod docs +pmman - show the module's pod docs - $ pman CGI - $ pman Curses + $ pmman CGI + $ pmman Curses This is mostly here for people too lazy to type $ pod2text `pmpath CGI` | more Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2005 02:06:20 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:39:11 -0000 1.3 @@ -1 +1 @@ -pmtools-1.00.tar.gz +pmtools-1.01.tar.gz Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-4/perl-pmtools.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-pmtools.spec 6 Apr 2005 22:13:29 -0000 1.3 +++ perl-pmtools.spec 22 Mar 2006 10:39:11 -0000 1.4 @@ -1,23 +1,18 @@ -%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)} - Name: perl-pmtools -Version: 1.00 -Release: 2 - +Version: 1.01 +Release: 1%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries License: Artistic -Url: http://language.perl.com/ -Source: http://history.perl.org/src/pmtools-1.00.tar.gz -Patch1: pmtools-1.00-different-tarball.patch -Patch2: pmtools-1.00-pmall.patch -Patch3: pmtools-1.00-pmeth-pman2pmman.patch +URL: http://search.cpan.org/dist/pmtools/ +Source: http://www.cpan.org/authors/id/M/ML/MLFISHER/pmtools-%{version}.tar.gz +Patch: pmtools-1.01-pman2pmman.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This is pmtools -- a suite of small programs to help manage modules. @@ -30,9 +25,7 @@ %prep %setup -q -n pmtools-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -p1 chmod 755 pmman find . -type f -perm 755 | xargs %{__perl} -pi -e 's{^#!/usr/bin/env perl}{#!%{__perl}}' @@ -50,7 +43,7 @@ chmod -R u+w $RPM_BUILD_ROOT/* -%check || : +%check make test @@ -68,7 +61,19 @@ %changelog -* Fri Apr 7 2005 Michael Schwendt +* Wed Mar 22 2006 Jose Pedro Oliveira - 1.01-1 +- Update to 1.01. +- URL updated: pmtools is now available in CPAN. +- Dropped patches pmtools-1.00-{different-tarball.patch,pmall.patch}: + they were accepted upstream. + +* Thu Mar 9 2006 Jose Pedro Oliveira - 1.00-4 +- Rebuild for FC5 (perl 5.8.8). + +* Thu Dec 22 2005 Jose Pedro Oliveira - 1.00-3 +- Dist tag. + +* Fri Apr 7 2005 Michael Schwendt - 1.00-2 - rebuilt * Sun Feb 06 2005 Jose Pedro Oliveira - 1.00-1 @@ -81,5 +86,5 @@ script 'pman' into 'pmman' in order to avoid a filename clash with the pinfo package. -* Sat Feb 28 2004 Jose Pedro Oliveira 0:1.00-0.fdr.0 +* Sat Feb 28 2004 Jose Pedro Oliveira - 0:1.00-0.fdr.0 - Initial build for fedora.us Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2005 02:06:20 -0000 1.2 +++ sources 22 Mar 2006 10:39:11 -0000 1.3 @@ -1 +1 @@ -88ee58113ac3d513d94f81f9fdfaeb00 pmtools-1.00.tar.gz +85d800dff1f73b559a929d7984435b57 pmtools-1.01.tar.gz --- pmtools-1.00-different-tarball.patch DELETED --- --- pmtools-1.00-pmall.patch DELETED --- --- pmtools-1.00-pmeth-pman2pmman.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 10:39:17 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:39:17 -0500 Subject: rpms/perl-pmtools/FC-5 pmtools-1.01-pman2pmman.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-pmtools.spec, 1.5, 1.6 sources, 1.2, 1.3 pmtools-1.00-different-tarball.patch, 1.1, NONE pmtools-1.00-pmall.patch, 1.1, NONE pmtools-1.00-pmeth-pman2pmman.patch, 1.1, NONE Message-ID: <200603221039.k2MAdnMb009806@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9712/FC-5 Modified Files: .cvsignore perl-pmtools.spec sources Added Files: pmtools-1.01-pman2pmman.patch Removed Files: pmtools-1.00-different-tarball.patch pmtools-1.00-pmall.patch pmtools-1.00-pmeth-pman2pmman.patch Log Message: Update to 1.01. pmtools-1.01-pman2pmman.patch: --- NEW FILE pmtools-1.01-pman2pmman.patch --- diff -ruN pmtools-1.01-orig/Makefile.lame pmtools-1.01/Makefile.lame --- pmtools-1.01-orig/Makefile.lame 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/Makefile.lame 2006-03-22 10:23:53.000000000 +0000 @@ -1,5 +1,5 @@ -PROGRAMS=basepods faqpods modpods pfcat plxload pmall pman pmcat \ +PROGRAMS=basepods faqpods modpods pfcat plxload pmall pmman pmcat \ pmdesc pmdirs pmeth pmexp pmfunc pminst pmload pmls pmpath pmvers podgrep \ podpath pods podtoc sitepods stdpods diff -ruN pmtools-1.01-orig/Makefile.PL pmtools-1.01/Makefile.PL --- pmtools-1.01-orig/Makefile.PL 2006-03-22 00:54:57.000000000 +0000 +++ pmtools-1.01/Makefile.PL 2006-03-22 10:23:53.000000000 +0000 @@ -4,8 +4,8 @@ NAME => "pmtools", DISTNAME => "pmtools", EXE_FILES => [ basepods, faqpods, modpods, pfcat, plxload, - pmall, pman, pmcat, pmdesc, pmdirs, pmeth, pmexp, - pmfunc, pminst, pmload, pmls, pmpath, pmvers, + pmall, pmcat, pmdesc, pmdirs, pmeth, pmexp, + pmfunc, pminst, pmload, pmman, pmls, pmpath, pmvers, podgrep, podpath, pods, podtoc, sitepods, stdpods ], PM => { 'Devel/Loaded.pm' => '$(INST_LIBDIR)/Devel/Loaded.pm' } diff -ruN pmtools-1.01-orig/MANIFEST pmtools-1.01/MANIFEST --- pmtools-1.01-orig/MANIFEST 2006-03-22 02:57:51.000000000 +0000 +++ pmtools-1.01/MANIFEST 2006-03-22 10:23:53.000000000 +0000 @@ -12,7 +12,7 @@ pfcat plxload pmall -pman +pmman pmcat pmdesc pmdirs diff -ruN pmtools-1.01-orig/pman pmtools-1.01/pman --- pmtools-1.01-orig/pman 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/pman 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -#!/usr/bin/env perl -# pman -- show a module's man page -# tchrist at perl.com - -BEGIN { $^W = 1 } -BEGIN { die "usage: $0 module ...\n" unless @ARGV } - -use FindBin qw($Bin); - -$errors = 0; - -unless ($pager = $ENV{PAGER}) { - require Config; - $pager = $Config::Config{"pager"} || "more"; -} - -for $module (@ARGV) { - my $path = `$Bin/pmpath $module`; - if ($?) { - $errors++; - next; - } - chomp $path; - system "pod2text $path | $pager"; - $errors += ($? != 1); -} - -exit($errors != 0); - -__END__ - -=head1 NAME - -pman - show a module's man page - -=head1 DESCRIPTION - -Send a module's pod through pod2text and your pager. - -This is mostly here for people too lazy to type - - $ pod2text `pmpath CGI` | $PAGER - -=head1 EXAMPLES - - $ pman CGI - $ pman Curses - -Or running under different versions of Perl: - - $ oldperl -S pman CGI - $ filsperl -S pman Threads - -=head1 SEE ALSO - -pod2text(1), perlpod(1), pod2man(1), pod2html(1). - -=head1 AUTHOR and COPYRIGHT - -Copyright (c) 1999 Tom Christiansen - -This is free software. You may modify it and distribute it -under Perl's Artistic Licence. Modified versions must be -clearly indicated. diff -ruN pmtools-1.01-orig/pmman pmtools-1.01/pmman --- pmtools-1.01-orig/pmman 1970-01-01 01:00:00.000000000 +0100 +++ pmtools-1.01/pmman 2006-03-22 10:23:53.000000000 +0000 @@ -0,0 +1,64 @@ +#!/usr/bin/env perl +# pmman -- show a module's man page +# tchrist at perl.com + +BEGIN { $^W = 1 } +BEGIN { die "usage: $0 module ...\n" unless @ARGV } + +use FindBin qw($Bin); + +$errors = 0; + +unless ($pager = $ENV{PAGER}) { + require Config; + $pager = $Config::Config{"pager"} || "more"; +} + +for $module (@ARGV) { + my $path = `$Bin/pmpath $module`; + if ($?) { + $errors++; + next; + } + chomp $path; + system "pod2text $path | $pager"; + $errors += ($? != 1); +} + +exit($errors != 0); + +__END__ + +=head1 NAME + +pmman - show a module's man page + +=head1 DESCRIPTION + +Send a module's pod through pod2text and your pager. + +This is mostly here for people too lazy to type + + $ pod2text `pmpath CGI` | $PAGER + +=head1 EXAMPLES + + $ pmman CGI + $ pmman Curses + +Or running under different versions of Perl: + + $ oldperl -S pmman CGI + $ filsperl -S pmman Threads + +=head1 SEE ALSO + +pod2text(1), perlpod(1), pod2man(1), pod2html(1). + +=head1 AUTHOR and COPYRIGHT + +Copyright (c) 1999 Tom Christiansen + +This is free software. You may modify it and distribute it +under Perl's Artistic Licence. Modified versions must be +clearly indicated. diff -ruN pmtools-1.01-orig/README pmtools-1.01/README --- pmtools-1.01-orig/README 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/README 2006-03-22 10:23:53.000000000 +0000 @@ -383,10 +383,10 @@ ========================================================= -pman - show the module's pod docs +pmman - show the module's pod docs - $ pman CGI - $ pman Curses + $ pmman CGI + $ pmman Curses This is mostly here for people too lazy to type $ pod2text `pmpath CGI` | more Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2005 02:06:20 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:39:16 -0000 1.3 @@ -1 +1 @@ -pmtools-1.00.tar.gz +pmtools-1.01.tar.gz Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-5/perl-pmtools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-pmtools.spec 9 Mar 2006 18:18:58 -0000 1.5 +++ perl-pmtools.spec 22 Mar 2006 10:39:16 -0000 1.6 @@ -1,15 +1,13 @@ Name: perl-pmtools -Version: 1.00 -Release: 4%{?dist} +Version: 1.01 +Release: 1%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries License: Artistic -Url: http://language.perl.com/ -Source: http://history.perl.org/src/pmtools-%{version}.tar.gz -Patch1: pmtools-1.00-different-tarball.patch -Patch2: pmtools-1.00-pmall.patch -Patch3: pmtools-1.00-pmeth-pman2pmman.patch +URL: http://search.cpan.org/dist/pmtools/ +Source: http://www.cpan.org/authors/id/M/ML/MLFISHER/pmtools-%{version}.tar.gz +Patch: pmtools-1.01-pman2pmman.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,9 +25,7 @@ %prep %setup -q -n pmtools-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -p1 chmod 755 pmman find . -type f -perm 755 | xargs %{__perl} -pi -e 's{^#!/usr/bin/env perl}{#!%{__perl}}' @@ -65,6 +61,12 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 1.01-1 +- Update to 1.01. +- URL updated: pmtools is now available in CPAN. +- Dropped patches pmtools-1.00-{different-tarball.patch,pmall.patch}: + they were accepted upstream. + * Thu Mar 9 2006 Jose Pedro Oliveira - 1.00-4 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2005 02:06:20 -0000 1.2 +++ sources 22 Mar 2006 10:39:16 -0000 1.3 @@ -1 +1 @@ -88ee58113ac3d513d94f81f9fdfaeb00 pmtools-1.00.tar.gz +85d800dff1f73b559a929d7984435b57 pmtools-1.01.tar.gz --- pmtools-1.00-different-tarball.patch DELETED --- --- pmtools-1.00-pmall.patch DELETED --- --- pmtools-1.00-pmeth-pman2pmman.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 10:39:22 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:39:22 -0500 Subject: rpms/perl-pmtools/devel pmtools-1.01-pman2pmman.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 perl-pmtools.spec, 1.5, 1.6 sources, 1.2, 1.3 pmtools-1.00-different-tarball.patch, 1.1, NONE pmtools-1.00-pmall.patch, 1.1, NONE pmtools-1.00-pmeth-pman2pmman.patch, 1.1, NONE Message-ID: <200603221039.k2MAdtI1009811@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9712/devel Modified Files: .cvsignore perl-pmtools.spec sources Added Files: pmtools-1.01-pman2pmman.patch Removed Files: pmtools-1.00-different-tarball.patch pmtools-1.00-pmall.patch pmtools-1.00-pmeth-pman2pmman.patch Log Message: Update to 1.01. pmtools-1.01-pman2pmman.patch: --- NEW FILE pmtools-1.01-pman2pmman.patch --- diff -ruN pmtools-1.01-orig/Makefile.lame pmtools-1.01/Makefile.lame --- pmtools-1.01-orig/Makefile.lame 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/Makefile.lame 2006-03-22 10:23:53.000000000 +0000 @@ -1,5 +1,5 @@ -PROGRAMS=basepods faqpods modpods pfcat plxload pmall pman pmcat \ +PROGRAMS=basepods faqpods modpods pfcat plxload pmall pmman pmcat \ pmdesc pmdirs pmeth pmexp pmfunc pminst pmload pmls pmpath pmvers podgrep \ podpath pods podtoc sitepods stdpods diff -ruN pmtools-1.01-orig/Makefile.PL pmtools-1.01/Makefile.PL --- pmtools-1.01-orig/Makefile.PL 2006-03-22 00:54:57.000000000 +0000 +++ pmtools-1.01/Makefile.PL 2006-03-22 10:23:53.000000000 +0000 @@ -4,8 +4,8 @@ NAME => "pmtools", DISTNAME => "pmtools", EXE_FILES => [ basepods, faqpods, modpods, pfcat, plxload, - pmall, pman, pmcat, pmdesc, pmdirs, pmeth, pmexp, - pmfunc, pminst, pmload, pmls, pmpath, pmvers, + pmall, pmcat, pmdesc, pmdirs, pmeth, pmexp, + pmfunc, pminst, pmload, pmman, pmls, pmpath, pmvers, podgrep, podpath, pods, podtoc, sitepods, stdpods ], PM => { 'Devel/Loaded.pm' => '$(INST_LIBDIR)/Devel/Loaded.pm' } diff -ruN pmtools-1.01-orig/MANIFEST pmtools-1.01/MANIFEST --- pmtools-1.01-orig/MANIFEST 2006-03-22 02:57:51.000000000 +0000 +++ pmtools-1.01/MANIFEST 2006-03-22 10:23:53.000000000 +0000 @@ -12,7 +12,7 @@ pfcat plxload pmall -pman +pmman pmcat pmdesc pmdirs diff -ruN pmtools-1.01-orig/pman pmtools-1.01/pman --- pmtools-1.01-orig/pman 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/pman 1970-01-01 01:00:00.000000000 +0100 @@ -1,64 +0,0 @@ -#!/usr/bin/env perl -# pman -- show a module's man page -# tchrist at perl.com - -BEGIN { $^W = 1 } -BEGIN { die "usage: $0 module ...\n" unless @ARGV } - -use FindBin qw($Bin); - -$errors = 0; - -unless ($pager = $ENV{PAGER}) { - require Config; - $pager = $Config::Config{"pager"} || "more"; -} - -for $module (@ARGV) { - my $path = `$Bin/pmpath $module`; - if ($?) { - $errors++; - next; - } - chomp $path; - system "pod2text $path | $pager"; - $errors += ($? != 1); -} - -exit($errors != 0); - -__END__ - -=head1 NAME - -pman - show a module's man page - -=head1 DESCRIPTION - -Send a module's pod through pod2text and your pager. - -This is mostly here for people too lazy to type - - $ pod2text `pmpath CGI` | $PAGER - -=head1 EXAMPLES - - $ pman CGI - $ pman Curses - -Or running under different versions of Perl: - - $ oldperl -S pman CGI - $ filsperl -S pman Threads - -=head1 SEE ALSO - -pod2text(1), perlpod(1), pod2man(1), pod2html(1). - -=head1 AUTHOR and COPYRIGHT - -Copyright (c) 1999 Tom Christiansen - -This is free software. You may modify it and distribute it -under Perl's Artistic Licence. Modified versions must be -clearly indicated. diff -ruN pmtools-1.01-orig/pmman pmtools-1.01/pmman --- pmtools-1.01-orig/pmman 1970-01-01 01:00:00.000000000 +0100 +++ pmtools-1.01/pmman 2006-03-22 10:23:53.000000000 +0000 @@ -0,0 +1,64 @@ +#!/usr/bin/env perl +# pmman -- show a module's man page +# tchrist at perl.com + +BEGIN { $^W = 1 } +BEGIN { die "usage: $0 module ...\n" unless @ARGV } + +use FindBin qw($Bin); + +$errors = 0; + +unless ($pager = $ENV{PAGER}) { + require Config; + $pager = $Config::Config{"pager"} || "more"; +} + +for $module (@ARGV) { + my $path = `$Bin/pmpath $module`; + if ($?) { + $errors++; + next; + } + chomp $path; + system "pod2text $path | $pager"; + $errors += ($? != 1); +} + +exit($errors != 0); + +__END__ + +=head1 NAME + +pmman - show a module's man page + +=head1 DESCRIPTION + +Send a module's pod through pod2text and your pager. + +This is mostly here for people too lazy to type + + $ pod2text `pmpath CGI` | $PAGER + +=head1 EXAMPLES + + $ pmman CGI + $ pmman Curses + +Or running under different versions of Perl: + + $ oldperl -S pmman CGI + $ filsperl -S pmman Threads + +=head1 SEE ALSO + +pod2text(1), perlpod(1), pod2man(1), pod2html(1). + +=head1 AUTHOR and COPYRIGHT + +Copyright (c) 1999 Tom Christiansen + +This is free software. You may modify it and distribute it +under Perl's Artistic Licence. Modified versions must be +clearly indicated. diff -ruN pmtools-1.01-orig/README pmtools-1.01/README --- pmtools-1.01-orig/README 2005-09-06 02:11:31.000000000 +0100 +++ pmtools-1.01/README 2006-03-22 10:23:53.000000000 +0000 @@ -383,10 +383,10 @@ ========================================================= -pman - show the module's pod docs +pmman - show the module's pod docs - $ pman CGI - $ pman Curses + $ pmman CGI + $ pmman Curses This is mostly here for people too lazy to type $ pod2text `pmpath CGI` | more Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Mar 2005 02:06:20 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:39:22 -0000 1.3 @@ -1 +1 @@ -pmtools-1.00.tar.gz +pmtools-1.01.tar.gz Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/devel/perl-pmtools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- perl-pmtools.spec 9 Mar 2006 18:18:58 -0000 1.5 +++ perl-pmtools.spec 22 Mar 2006 10:39:22 -0000 1.6 @@ -1,15 +1,13 @@ Name: perl-pmtools -Version: 1.00 -Release: 4%{?dist} +Version: 1.01 +Release: 1%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries License: Artistic -Url: http://language.perl.com/ -Source: http://history.perl.org/src/pmtools-%{version}.tar.gz -Patch1: pmtools-1.00-different-tarball.patch -Patch2: pmtools-1.00-pmall.patch -Patch3: pmtools-1.00-pmeth-pman2pmman.patch +URL: http://search.cpan.org/dist/pmtools/ +Source: http://www.cpan.org/authors/id/M/ML/MLFISHER/pmtools-%{version}.tar.gz +Patch: pmtools-1.01-pman2pmman.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -27,9 +25,7 @@ %prep %setup -q -n pmtools-%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch -p1 chmod 755 pmman find . -type f -perm 755 | xargs %{__perl} -pi -e 's{^#!/usr/bin/env perl}{#!%{__perl}}' @@ -65,6 +61,12 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 1.01-1 +- Update to 1.01. +- URL updated: pmtools is now available in CPAN. +- Dropped patches pmtools-1.00-{different-tarball.patch,pmall.patch}: + they were accepted upstream. + * Thu Mar 9 2006 Jose Pedro Oliveira - 1.00-4 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Mar 2005 02:06:20 -0000 1.2 +++ sources 22 Mar 2006 10:39:22 -0000 1.3 @@ -1 +1 @@ -88ee58113ac3d513d94f81f9fdfaeb00 pmtools-1.00.tar.gz +85d800dff1f73b559a929d7984435b57 pmtools-1.01.tar.gz --- pmtools-1.00-different-tarball.patch DELETED --- --- pmtools-1.00-pmall.patch DELETED --- --- pmtools-1.00-pmeth-pman2pmman.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 10:53:15 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:53:15 -0500 Subject: rpms/perl-HTTP-Proxy/FC-4 .cvsignore, 1.2, 1.3 perl-HTTP-Proxy.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603221053.k2MArmvD010070@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009/FC-4 Modified Files: .cvsignore perl-HTTP-Proxy.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Mar 2006 21:05:38 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:53:15 -0000 1.3 @@ -1 +1 @@ -HTTP-Proxy-0.17.tar.gz +HTTP-Proxy-0.18.tar.gz Index: perl-HTTP-Proxy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/perl-HTTP-Proxy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-HTTP-Proxy.spec 6 Mar 2006 23:27:42 -0000 1.2 +++ perl-HTTP-Proxy.spec 22 Mar 2006 10:53:15 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-HTTP-Proxy -Version: 0.17 -Release: 3%{?dist} +Version: 0.18 +Release: 1%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-3 - Added missing BR: perl(Test::Pod::Coverage). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Mar 2006 21:05:38 -0000 1.2 +++ sources 22 Mar 2006 10:53:15 -0000 1.3 @@ -1 +1 @@ -5f8dee810951840408092c07faccfa1a HTTP-Proxy-0.17.tar.gz +9a7e180caf7d6854cd3dad3fe0f21365 HTTP-Proxy-0.18.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 10:53:21 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:53:21 -0500 Subject: rpms/perl-HTTP-Proxy/FC-5 .cvsignore, 1.2, 1.3 perl-HTTP-Proxy.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603221053.k2MArrvV010076@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009/FC-5 Modified Files: .cvsignore perl-HTTP-Proxy.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Mar 2006 21:05:38 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:53:21 -0000 1.3 @@ -1 +1 @@ -HTTP-Proxy-0.17.tar.gz +HTTP-Proxy-0.18.tar.gz Index: perl-HTTP-Proxy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/perl-HTTP-Proxy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-HTTP-Proxy.spec 6 Mar 2006 22:58:02 -0000 1.2 +++ perl-HTTP-Proxy.spec 22 Mar 2006 10:53:21 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-HTTP-Proxy -Version: 0.17 -Release: 3%{?dist} +Version: 0.18 +Release: 1%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-3 - Added missing BR: perl(Test::Pod::Coverage). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Mar 2006 21:05:38 -0000 1.2 +++ sources 22 Mar 2006 10:53:21 -0000 1.3 @@ -1 +1 @@ -5f8dee810951840408092c07faccfa1a HTTP-Proxy-0.17.tar.gz +9a7e180caf7d6854cd3dad3fe0f21365 HTTP-Proxy-0.18.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 10:53:27 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Wed, 22 Mar 2006 05:53:27 -0500 Subject: rpms/perl-HTTP-Proxy/devel .cvsignore, 1.2, 1.3 perl-HTTP-Proxy.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603221053.k2MArxAj010081@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10009/devel Modified Files: .cvsignore perl-HTTP-Proxy.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 6 Mar 2006 21:05:38 -0000 1.2 +++ .cvsignore 22 Mar 2006 10:53:27 -0000 1.3 @@ -1 +1 @@ -HTTP-Proxy-0.17.tar.gz +HTTP-Proxy-0.18.tar.gz Index: perl-HTTP-Proxy.spec =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/perl-HTTP-Proxy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-HTTP-Proxy.spec 6 Mar 2006 22:58:02 -0000 1.2 +++ perl-HTTP-Proxy.spec 22 Mar 2006 10:53:27 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-HTTP-Proxy -Version: 0.17 -Release: 3%{?dist} +Version: 0.18 +Release: 1%{?dist} Summary: A pure Perl HTTP proxy Group: Development/Libraries @@ -56,6 +56,9 @@ %changelog +* Wed Mar 22 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Mon Mar 6 2006 Jose Pedro Oliveira - 0.17-3 - Added missing BR: perl(Test::Pod::Coverage). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 6 Mar 2006 21:05:38 -0000 1.2 +++ sources 22 Mar 2006 10:53:27 -0000 1.3 @@ -1 +1 @@ -5f8dee810951840408092c07faccfa1a HTTP-Proxy-0.17.tar.gz +9a7e180caf7d6854cd3dad3fe0f21365 HTTP-Proxy-0.18.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 10:56:48 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Wed, 22 Mar 2006 05:56:48 -0500 Subject: rpms/ghdl/devel ghdl-svn50.patch, NONE, 1.1 ghdl.spec, 1.13, 1.14 ghdl-svn38.patch, 1.1, NONE ghdl-svn39.patch, 1.1, NONE ghdl-svn40.patch, 1.1, NONE ghdl-svn49.patch, 1.1, NONE Message-ID: <200603221057.k2MAvL0g010223@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10203 Modified Files: ghdl.spec Added Files: ghdl-svn50.patch Removed Files: ghdl-svn38.patch ghdl-svn39.patch ghdl-svn40.patch ghdl-svn49.patch Log Message: update to svn50 ghdl-svn50.patch: --- NEW FILE ghdl-svn50.patch --- diff -urN ghdl-0.21/README ghdl-0.22dev/README --- ghdl-0.21/README 2005-12-18 14:49:00.000000000 +0100 +++ ghdl-0.22dev/README 2006-03-22 11:15:27.000000000 +0100 @@ -27,19 +27,33 @@ *************************** Required: -* the sources of gcc-4.0.2 (at least the core part). +* the sources of gcc-4.1.0 (at least the core part). Note: other versions of gcc sources have not been tested. * the Ada95 GNAT compiler (GNAT v3.15p and GNAT GPL 2005 are known to work; Ada compilers in most Linux distributions are more or less buggy) * GNU/Linux for ix86 (pc systems) (porting is necessary for other systems) Procedure: +* Check your Ada compiler. On some systems (or with some distribution), the + GNAT compiler seems broken. Try this very simple example, using file + example.adb +<<<<<<<<<<<<<<<<<< +procedure Example is +begin + null; +end Example; +<<<<<<<<<<<<<<<<<< + Compile with + $ gnatmake example + It should create an executable, 'example'. + If this doesn't work, your GNAT installation is broken. It may be a PATH + problem or something else. * untar the gcc tarball * untar the ghdl tarball (this sould have been done, since you are reading a file from it). * move or copy the vhdl directory of ghdl into the gcc subdirectory of the gcc distribution. - You should have a gcc-4.0.2/gcc/vhdl directory. + You should have a gcc-4.1.0/gcc/vhdl directory. * configure gcc with the --enable-languages=vhdl option. You may of course add other languages. Refer to the gcc installation documentation. diff -urN ghdl-0.21/vhdl/configuration.adb ghdl-0.22dev/vhdl/configuration.adb --- ghdl-0.21/vhdl/configuration.adb 2005-09-22 23:26:43.000000000 +0200 +++ ghdl-0.22dev/vhdl/configuration.adb 2006-03-16 20:51:10.000000000 +0100 @@ -25,7 +25,7 @@ package body Configuration is procedure Add_Design_Concurrent_Stmts (Parent : Iir); procedure Add_Design_Block_Configuration (Blk : Iir_Block_Configuration); - procedure Add_Design_Aspect (Aspect : Iir); + procedure Add_Design_Aspect (Aspect : Iir; Add_Default : Boolean); Current_File_Dependence : Iir_List := Null_Iir_List; Current_Configuration : Iir_Configuration_Declaration := Null_Iir; @@ -53,6 +53,16 @@ return; end if; + -- May be enabled to debug dependency construction. + if False then + if From = Null_Iir then + Warning_Msg_Elab (Disp_Node (Unit) & " added", Unit); + else + Warning_Msg_Elab + (Disp_Node (Unit) & " added by " & Disp_Node (From), From); + end if; + end if; + Set_Elab_Flag (Unit, True); Lib_Unit := Get_Library_Unit (Unit); @@ -200,7 +210,7 @@ begin Unit := Get_Instantiated_Unit (Stmt); if Get_Kind (Unit) /= Iir_Kind_Component_Declaration then - Add_Design_Aspect (Unit); + Add_Design_Aspect (Unit, True); end if; end; when Iir_Kind_Generate_Statement @@ -216,7 +226,7 @@ end loop; end Add_Design_Concurrent_Stmts; - procedure Add_Design_Aspect (Aspect : Iir) + procedure Add_Design_Aspect (Aspect : Iir; Add_Default : Boolean) is use Libraries; @@ -231,10 +241,13 @@ end if; case Get_Kind (Aspect) is when Iir_Kind_Entity_Aspect_Entity => + -- Add the entity. Entity := Get_Entity (Aspect); - Entity_Lib := Get_Library_Unit (Entity); Add_Design_Unit (Entity, Aspect); + + -- Extract and add the architecture. Arch := Get_Architecture (Aspect); + Entity_Lib := Get_Library_Unit (Entity); if Arch /= Null_Iir then case Get_Kind (Arch) is when Iir_Kind_Simple_Name => @@ -263,10 +276,15 @@ Arch := Get_Design_Unit (Arch); end if; Load_Design_Unit (Arch, Aspect); - Config := Get_Default_Configuration_Declaration - (Get_Library_Unit (Arch)); - if Config /= Null_Iir then - Add_Design_Unit (Config, Aspect); + Add_Design_Unit (Arch, Aspect); + + -- Add the default configuration if required. + if Add_Default then + Config := Get_Default_Configuration_Declaration + (Get_Library_Unit (Arch)); + if Config /= Null_Iir then + Add_Design_Unit (Config, Aspect); + end if; end if; when Iir_Kind_Entity_Aspect_Configuration => Add_Design_Unit (Get_Configuration (Aspect), Aspect); @@ -424,7 +442,9 @@ -- CONF is either a configuration specification or a component -- configuration. - procedure Add_Design_Binding_Indication (Conf : Iir) + -- If ADD_DEFAULT is true, then the default configuration for the design + -- binding must be added if required. + procedure Add_Design_Binding_Indication (Conf : Iir; Add_Default : Boolean) is Bind : Iir_Binding_Indication; Inst : Iir; @@ -442,12 +462,13 @@ return; end if; Check_Binding_Indication (Conf); - Add_Design_Aspect (Get_Entity_Aspect (Bind)); + Add_Design_Aspect (Get_Entity_Aspect (Bind), Add_Default); end Add_Design_Binding_Indication; procedure Add_Design_Block_Configuration (Blk : Iir_Block_Configuration) is Item : Iir; + Sub_Config : Iir; begin if Blk = Null_Iir then return; @@ -456,10 +477,11 @@ while Item /= Null_Iir loop case Get_Kind (Item) is when Iir_Kind_Configuration_Specification => - Add_Design_Binding_Indication (Item); + Add_Design_Binding_Indication (Item, True); when Iir_Kind_Component_Configuration => - Add_Design_Binding_Indication (Item); - Add_Design_Block_Configuration (Get_Block_Configuration (Item)); + Sub_Config := Get_Block_Configuration (Item); + Add_Design_Binding_Indication (Item, Sub_Config = Null_Iir); + Add_Design_Block_Configuration (Sub_Config); when Iir_Kind_Block_Configuration => Add_Design_Block_Configuration (Item); when others => diff -urN ghdl-0.21/vhdl/errorout.adb ghdl-0.22dev/vhdl/errorout.adb --- ghdl-0.21/vhdl/errorout.adb 2005-09-22 23:27:25.000000000 +0200 +++ ghdl-0.22dev/vhdl/errorout.adb 2006-03-16 20:51:10.000000000 +0100 @@ -501,7 +501,7 @@ & Name_Table.Name_Buffer (1 .. Name_Table.Name_Length) & '''; when Iir_Kind_Entity_Aspect_Entity => - return Disp_Node (Get_Entity (Node)) + return "aspect " & Disp_Node (Get_Entity (Node)) & '(' & Iirs_Utils.Image_Identifier (Get_Architecture (Node)) & ')'; when Iir_Kind_Entity_Aspect_Configuration => diff -urN ghdl-0.21/vhdl/evaluation.adb ghdl-0.22dev/vhdl/evaluation.adb --- ghdl-0.21/vhdl/evaluation.adb 2005-12-11 16:32:03.000000000 +0100 +++ ghdl-0.22dev/vhdl/evaluation.adb 2006-03-16 20:51:10.000000000 +0100 @@ -836,6 +836,28 @@ return Build_Simple_Aggregate (Res_List, Orig, Res_Type); end Eval_Concatenation; + function Eval_Array_Equality (Left, Right : Iir) return Boolean + is + L_List : Iir_List; + R_List : Iir_List; + N : Natural; + begin + -- FIXME: the simple aggregates are lost. + L_List := Get_Simple_Aggregate_List (Eval_String_Literal (Left)); + R_List := Get_Simple_Aggregate_List (Eval_String_Literal (Right)); + N := Get_Nbr_Elements (L_List); + if N /= Get_Nbr_Elements (R_List) then + return False; + end if; + for I in 0 .. N - 1 loop + -- FIXME: this is wrong: (eg: evaluated lit) + if Get_Nth_Element (L_List, I) /= Get_Nth_Element (R_List, I) then + return False; + end if; + end loop; + return True; + end Eval_Array_Equality; + -- ORIG is either a dyadic operator or a function call. function Eval_Dyadic_Operator (Orig : Iir; Left, Right : Iir) return Iir @@ -1073,34 +1095,10 @@ (Get_Fp_Value (Left) / Iir_Fp64 (Get_Value (Right)), Orig); when Iir_Predefined_Array_Equality => - declare - L_List : Iir_List; - R_List : Iir_List; - R : Boolean; - N : Natural; - begin - -- FIXME: the simple aggregates are lost. - L_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Left)); - R_List := - Get_Simple_Aggregate_List (Eval_String_Literal (Right)); - N := Get_Nbr_Elements (L_List); - if N /= Get_Nbr_Elements (R_List) then - R := False; - else - R := True; - for I in 0 .. N - 1 loop - -- FIXME: this is wrong: (eg: evaluated lit) - if Get_Nth_Element (L_List, I) - /= Get_Nth_Element (R_List, I) - then - R := False; - exit; - end if; - end loop; - end if; - return Build_Boolean (R, Orig); - end; + return Build_Boolean (Eval_Array_Equality (Left, Right), Orig); + + when Iir_Predefined_Array_Inequality => + return Build_Boolean (not Eval_Array_Equality (Left, Right), Orig); when Iir_Predefined_Array_Sll | Iir_Predefined_Array_Srl @@ -1111,8 +1109,7 @@ return Eval_Shift_Operator (Eval_String_Literal (Left), Right, Orig, Func); - when Iir_Predefined_Array_Inequality - | Iir_Predefined_Array_Less + when Iir_Predefined_Array_Less | Iir_Predefined_Array_Less_Equal | Iir_Predefined_Array_Greater | Iir_Predefined_Array_Greater_Equal diff -urN ghdl-0.21/vhdl/ghdldrv/ghdlmain.adb ghdl-0.22dev/vhdl/ghdldrv/ghdlmain.adb --- ghdl-0.21/vhdl/ghdldrv/ghdlmain.adb 2005-12-04 04:51:33.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdldrv/ghdlmain.adb 2006-03-16 20:51:04.000000000 +0100 @@ -1,5 +1,5 @@ -- GHDL driver - main part. --- Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold +-- Copyright (C) 2002, 2003, 2004, 2005, 2006 Tristan Gingold -- -- GHDL 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 @@ -225,7 +225,7 @@ Put_Line ("Written by Tristan Gingold."); New_Line; -- Display copyright. Assume 80 cols terminal. - Put_Line ("Copyright (C) 2003, 2004, 2005 Tristan Gingold."); + Put_Line ("Copyright (C) 2003, 2004, 2005, 2006 Tristan Gingold."); Put_Line ("GHDL is free software, covered by the " & "GNU General Public License. There is NO"); Put_Line ("warranty; not even for MERCHANTABILITY or" diff -urN ghdl-0.21/vhdl/ghdl.texi ghdl-0.22dev/vhdl/ghdl.texi --- ghdl-0.21/vhdl/ghdl.texi 2005-12-12 03:21:55.000000000 +0100 +++ ghdl-0.22dev/vhdl/ghdl.texi 2006-03-16 20:51:01.000000000 +0100 @@ -4,15 +4,19 @@ @settitle GHDL guide @c %**end of header + at direntry +* ghdl: (ghdl). VHDL compiler. + at end direntry + @titlepage @title GHDL guide @subtitle GHDL, a VHDL compiler - at subtitle For GHDL version 0.21 (Sokcho edition) + at subtitle For GHDL version 0.22 (Sokcho edition) @author Tristan Gingold @c The following two commands start the copyright page. @page @vskip 0pt plus 1filll -Copyright @copyright{} 2002, 2003, 2004, 2005 Tristan Gingold. +Copyright @copyright{} 2002, 2003, 2004, 2005, 2006 Tristan Gingold. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or @@ -70,11 +74,11 @@ @contents @ifnottex - at node Top + at node Top, Introduction, (dir), (dir) @top GHDL guide GHDL, a VHDL compiler. -Copyright @copyright{} 2002, 2003, 2004 Tristan Gingold. +Copyright @copyright{} 2002, 2003, 2004, 2005, 2006 Tristan Gingold. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 @@ -90,7 +94,6 @@ * Flaws and bugs report:: * Copyrights:: * Index:: - @end menu @end ifnottex @@ -902,6 +905,9 @@ messages that report such constructions. Some warnings are reported only during analysis, others during elaboration. +You could disable a warning by using the @option{--warn-no-XXX} +instead of @option{--warn-XXX}. + @table @code @item --warn-reserved @cindex @option{--warn-reserved} switch @@ -1688,6 +1694,7 @@ * Library database:: * VHDL files format:: * Top entity:: +* Using vendor libraries:: * Interfacing to other languages:: @end menu @@ -1865,7 +1872,7 @@ If the type mark is a composite type (record or array), the file is composed of a 2 lines signature, followed by a raw stream. - at node Top entity, Interfacing to other languages, VHDL files format, GHDL implementation of VHDL + at node Top entity, Using vendor libraries, VHDL files format, GHDL implementation of VHDL @comment node-name, next, previous, up @section Top entity There are some restrictions on the entity being at the apex of a design @@ -1879,8 +1886,38 @@ The ports type must be constrained. @end itemize - at node Interfacing to other languages, , Top entity, GHDL implementation of VHDL - at comment node-name, next, previous, up at section Interfacing with other languages + at node Using vendor libraries, Interfacing to other languages, Top entity, GHDL implementation of VHDL + at comment node-name, next, previous, up + at section Using vendor libraries +Many vendors libraries have been analyzed with GHDL. There are +usually no problems. Be sure to use the @option{--work=} option. +However, some problems have been encountered. + +GHDL follows the VHDL LRM (the manual which defines VHDL) more +strictly than other VHDL tools. You could try to relax the +restrictions by using the @option{--std=93c}, @option{-fexplicit} and + at option{--warn-no-vital-generic}. + +Even with these relaxations, some broken libraries may fail. + +For example, @code{unisim_VITAL.vhd} from @code{Xilinx} can't be +compiled because lines such as: + at smallexample + variable Write_A_Write_B : memory_collision_type := Write_A_Write_B; + variable Read_A_Write_B : memory_collision_type := Read_A_Write_B; + at end smallexample +(there are 6 such lines). +According to VHDL visibility rules, @samp{Write_A_Write_B} cannot be used +while it is defined. This is very logical because it prevents from silly +declarations such as + at smallexample + constant k : natural := 2 * k; + at end smallexample +This files must be modified. Fortunatly, in the example the variables +are never written. So it is enough to remove them. + + at node Interfacing to other languages, , Using vendor libraries, GHDL implementation of VHDL + at comment node-name, next, previous, up @section Interfacing to other languages @cindex interfacing @cindex other languages @@ -1931,7 +1968,7 @@ * Linking with foreign object files:: * Starting a simulation from a foreign program:: * Linking with Ada:: -* Using GRT from Ada:: +* Using GRT from Ada:: @end menu @node Restrictions on foreign declarations, Linking with foreign object files, Interfacing to other languages, Interfacing to other languages @@ -2036,7 +2073,7 @@ $ gnatmake my_prog -largs `ghdl --list-link design` @end smallexample - at node Using GRT from Ada, , Linking with Ada, Interfacing to other languages + at node Using GRT from Ada, , Linking with Ada, Interfacing to other languages @comment node-name, next, previous, up @subsection Using GRT from Ada @quotation Warning diff -urN ghdl-0.21/vhdl/grt/config/linux.c ghdl-0.22dev/vhdl/grt/config/linux.c --- ghdl-0.21/vhdl/grt/config/linux.c 2005-12-12 03:29:26.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/linux.c 2006-03-16 20:51:05.000000000 +0100 @@ -189,7 +189,12 @@ #endif /* Context for the main stack. */ -static __thread struct stack_context main_stack_context; +#ifdef USE_THREADS +#define THREAD __thread +#else +#define THREAD +#endif +static THREAD struct stack_context main_stack_context; extern void grt_set_main_stack (struct stack_context *stack); @@ -280,3 +285,28 @@ res->cur_length = stack_size; return res; } + +#include +static int run_env_en; +static jmp_buf run_env; + +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (run_env_en) + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; +} + diff -urN ghdl-0.21/vhdl/grt/config/pthread.c ghdl-0.22dev/vhdl/grt/config/pthread.c --- ghdl-0.21/vhdl/grt/config/pthread.c 2005-12-12 03:37:47.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/pthread.c 2006-03-16 20:51:05.000000000 +0100 @@ -27,7 +27,7 @@ #include #include #include - +#include //#define INFO printf #define INFO (void) @@ -41,7 +41,8 @@ void* Arg; // ARG passed to FUNC } Stack_Type_t, *Stack_Type; -Stack_Type_t main_stack_context; +static Stack_Type_t main_stack_context; +static Stack_Type_t *current; extern void grt_set_main_stack (Stack_Type_t *stack); //---------------------------------------------------------------------------- @@ -58,6 +59,8 @@ // lock the mutex, as we are currently running pthread_mutex_lock(&(main_stack_context.mutex)); + current = &main_stack_context; + grt_set_main_stack (&main_stack_context); } @@ -115,6 +118,10 @@ return newStack; } +static int need_longjmp; +static int run_env_en; +static jmp_buf run_env; + //---------------------------------------------------------------------------- void grt_stack_switch(Stack_Type To, Stack_Type From) // Resume stack TO and save the current context to the stack pointed by @@ -122,7 +129,9 @@ // => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); { INFO("grt_stack_switch\n"); INFO(" from 0x%08x to 0x%08x\n", From, To); - + + current = To; + // unlock 'To' mutex. this will make the other thread either // - starts for first time in grt_stack_loop // - resumes at lock below @@ -132,6 +141,9 @@ // as we are running, our mutex is locked and we block here // when stacks are switched, with above unlock, we may proceed pthread_mutex_lock(&(From->mutex)); + + if (From == &main_stack_context && need_longjmp != 0) + longjmp (run_env, need_longjmp); } //---------------------------------------------------------------------------- @@ -141,6 +153,35 @@ { INFO("grt_stack_delete\n"); } +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (!run_env_en) + return; + + if (current != &main_stack_context) + { + need_longjmp = val; + grt_stack_switch (&main_stack_context, current); + } + else + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; +} + + //---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME diff -urN ghdl-0.21/vhdl/grt/config/win32.c ghdl-0.22dev/vhdl/grt/config/win32.c --- ghdl-0.21/vhdl/grt/config/win32.c 2005-12-12 03:39:16.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/config/win32.c 2006-03-16 20:51:05.000000000 +0100 @@ -1,5 +1,5 @@ -/* GRT stack implementation for Win32 - Copyright (C) 2004, 2005 Felix Bertram. +/* GRT stack implementation for Win32 using fibers. + Copyright (C) 2005 Tristan Gingold. GHDL 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 @@ -16,139 +16,120 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -//----------------------------------------------------------------------------- -// Project: GHDL - VHDL Simulator -// Description: Win32 port of stacks package -// Note: Tristan's original i386/Linux used assembly-code -// to manually switch stacks for performance reasons. -// History: 2004feb09, FB, created. -//----------------------------------------------------------------------------- #include -//#include -//#include -//#include - - -//#define INFO printf -#define INFO (void) - -// GHDL names an endless loop calling FUNC with ARG a 'stack' -// at a given time, only one stack may be 'executed' -typedef struct -{ HANDLE thread; // stack's thread - HANDLE mutex; // mutex to suspend/resume thread - void (*Func)(void*); // stack's FUNC - void* Arg; // ARG passed to FUNC -} Stack_Type_t, *Stack_Type; +#include +#include +#include -Stack_Type_t main_stack_context; -extern Stack_Type grt_stack_main_stack; +struct stack_type +{ + LPVOID fiber; // Win fiber. + void (*func)(void *); // Function + void *arg; // Function argument. +}; + +static struct stack_type main_stack_context; +static struct stack_type *current; +extern void grt_set_main_stack (struct stack_type *stack); -//------------------------------------------------------------------------------ void grt_stack_init(void) -// Initialize the stacks package. -// This may adjust stack sizes. -// Must be called after grt.options.decode. -// => procedure Stack_Init; -{ INFO("grt_stack_init\n"); - INFO(" main_stack_context=0x%08x\n", &main_stack_context); - - // create event. reset event, as we are currently running - main_stack_context.mutex = CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - grt_stack_main_stack= &main_stack_context; -} - -//------------------------------------------------------------------------------ -static unsigned long __stdcall grt_stack_loop(void* pv_myStack) -{ - Stack_Type myStack= (Stack_Type)pv_myStack; - - INFO("grt_stack_loop\n"); - - INFO(" myStack=0x%08x\n", myStack); - - // block until event becomes set again. - // this happens when this stack is enabled for the first time - WaitForSingleObject(myStack->mutex, INFINITE); - - // run stack's function in endless loop - while(1) - { INFO(" call 0x%08x with 0x%08x\n", myStack->Func, myStack->Arg); - myStack->Func(myStack->Arg); - } - - // we never get here... - return 0; -} - -//------------------------------------------------------------------------------ -Stack_Type grt_stack_create(void* Func, void* Arg) -// Create a new stack, which on first execution will call FUNC with -// an argument ARG. -// => function Stack_Create (Func : Address; Arg : Address) return Stack_Type; -{ Stack_Type newStack; - DWORD m_IDThread; // Thread's ID (dummy) - - INFO("grt_stack_create\n"); - INFO(" call 0x%08x with 0x%08x\n", Func, Arg); - - newStack= malloc(sizeof(Stack_Type_t)); - - // init function and argument - newStack->Func= Func; - newStack->Arg= Arg; - - // create event. reset event, so that thread will blocked in grt_stack_loop - newStack->mutex= CreateEvent(NULL, // lpsa - FALSE, // fManualReset - FALSE, // fInitialState - NULL); // lpszEventName - - INFO(" newStack=0x%08x\n", newStack); - - // create thread, which executes grt_stack_loop - newStack->thread= CreateThread(NULL, // lpsa - 0, // cbStack - grt_stack_loop, // lpStartAddr - newStack, // lpvThreadParm - 0, // fdwCreate - &m_IDThread); // lpIDThread - - return newStack; -} - -//------------------------------------------------------------------------------ -void grt_stack_switch(Stack_Type To, Stack_Type From) -// Resume stack TO and save the current context to the stack pointed by -// CUR. -// => procedure Stack_Switch (To : Stack_Type; From : Stack_Type); -{ INFO("grt_stack_switch\n"); - INFO(" from 0x%08x to 0x%08x\n", From, To); - - // set 'To' event. this will make the other thread either - // - start for first time in grt_stack_loop - // - resume at WaitForSingleObject below - SetEvent(To->mutex); - - // block until 'From' event becomes set again - // as we are running, our event is reset and we block here - // when stacks are switched, with above SetEvent, we may proceed - WaitForSingleObject(From->mutex, INFINITE); -} - -//------------------------------------------------------------------------------ -void grt_stack_delete(Stack_Type Stack) -// Delete stack STACK, which must not be currently executed. -// => procedure Stack_Delete (Stack : Stack_Type); -{ INFO("grt_stack_delete\n"); +{ + main_stack_context.fiber = ConvertThreadToFiber (NULL); + if (main_stack_context.fiber == NULL) + { + fprintf (stderr, "convertThreadToFiber failed (err=%lu)\n", + GetLastError ()); + abort (); + } + grt_set_main_stack (&main_stack_context); + current = &main_stack_context; +} + +static VOID __stdcall +grt_stack_loop (void *v_stack) +{ + struct stack_type *stack = (struct stack_type *)v_stack; + while (1) + { + (*stack->func)(stack->arg); + } +} + +struct stack_type * +grt_stack_create (void (*func)(void *), void *arg) +{ + struct stack_type *res; + + res = malloc (sizeof (struct stack_type)); + if (res == NULL) + return NULL; + res->func = func; + res->arg = arg; + res->fiber = CreateFiber (0, &grt_stack_loop, res); + if (res->fiber == NULL) + { + free (res); + return NULL; + } + return res; +} + +static int run_env_en; +static jmp_buf run_env; +static int need_longjmp; + +void +grt_stack_switch (struct stack_type *to, struct stack_type *from) +{ + assert (current == from); + current = to; + SwitchToFiber (to->fiber); + if (from == &main_stack_context && need_longjmp) + { + /* We returned to do the longjump. */ + current = &main_stack_context; + longjmp (run_env, need_longjmp); + } +} + +void +grt_stack_delete (struct stack_type *stack) +{ + DeleteFiber (stack->fiber); + stack->fiber = NULL; +} + +void +__ghdl_maybe_return_via_longjump (int val) +{ + if (!run_env_en) + return; + + if (current != &main_stack_context) + { + /* We are allowed to jump only in the same stack. + First switch back to the main thread. */ + need_longjmp = val; + SwitchToFiber (main_stack_context.fiber); + } + else + longjmp (run_env, val); +} + +int +__ghdl_run_through_longjump (int (*func)(void)) +{ + int res; + + run_env_en = 1; + res = setjmp (run_env); + if (res == 0) + res = (*func)(); + run_env_en = 0; + return res; } -//---------------------------------------------------------------------------- #ifndef WITH_GNAT_RUN_TIME void __gnat_raise_storage_error(void) { @@ -161,6 +142,3 @@ } #endif -//---------------------------------------------------------------------------- -// end of file - diff -urN ghdl-0.21/vhdl/grt/ghwlib.c ghdl-0.22dev/vhdl/grt/ghwlib.c --- ghdl-0.21/vhdl/grt/ghwlib.c 2005-12-07 06:29:04.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.c 2006-03-16 20:51:05.000000000 +0100 @@ -1214,16 +1214,31 @@ return 0; } +static const char * +ghw_get_lit (union ghw_type *type, int e) +{ + if (e >= type->en.nbr || e < 0) + return "??"; + else + return type->en.lits[e]; +} + +static void +ghw_disp_lit (union ghw_type *type, int e) +{ + printf ("%s (%d)", ghw_get_lit (type, e), e); +} + void ghw_disp_value (union ghw_val *val, union ghw_type *type) { switch (ghw_get_base_type (type)->kind) { case ghdl_rtik_type_b2: - printf ("%s (%d)", type->en.lits[val->b2], val->b2); + ghw_disp_lit (type, val->b2); break; case ghdl_rtik_type_e8: - printf ("%s (%d)", type->en.lits[val->e8], val->e8); + ghw_disp_lit (type, val->e8); break; case ghdl_rtik_type_i32: printf ("%d", val->i32); @@ -1582,10 +1597,14 @@ } void -ghw_disp_range (union ghw_range *rng) +ghw_disp_range (union ghw_type *type, union ghw_range *rng) { switch (rng->kind) { + case ghdl_rtik_type_e8: + printf ("%s %s %s", ghw_get_lit (type, rng->e8.left), + ghw_get_dir (rng->e8.dir), ghw_get_lit (type, rng->e8.right)); + break; case ghdl_rtik_type_i32: case ghdl_rtik_type_p32: printf ("%d %s %d", @@ -1657,7 +1676,7 @@ printf ("subtype %s is ", s->name); ghw_disp_typename (h, s->base); printf (" range "); - ghw_disp_range (s->rng); + ghw_disp_range (s->base, s->rng); printf (";\n"); } break; @@ -1692,7 +1711,7 @@ { if (i != 0) printf (", "); - ghw_disp_range (a->rngs[i]); + ghw_disp_range ((union ghw_type *)a->base, a->rngs[i]); } printf (");\n"); } diff -urN ghdl-0.21/vhdl/grt/ghwlib.h ghdl-0.22dev/vhdl/grt/ghwlib.h --- ghdl-0.21/vhdl/grt/ghwlib.h 2005-12-07 06:27:09.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/ghwlib.h 2006-03-16 20:51:05.000000000 +0100 @@ -390,7 +390,8 @@ const char *ghw_get_dir (int is_downto); -void ghw_disp_range (union ghw_range *rng); +/* Note: TYPE must be a base type (used only to display literals). */ +void ghw_disp_range (union ghw_type *type, union ghw_range *rng); void ghw_disp_type (struct ghw_handler *h, union ghw_type *t); diff -urN ghdl-0.21/vhdl/grt/grt-cbinding.c ghdl-0.22dev/vhdl/grt/grt-cbinding.c --- ghdl-0.21/vhdl/grt/grt-cbinding.c 2005-12-11 15:03:18.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-cbinding.c 2006-03-16 20:51:05.000000000 +0100 @@ -18,7 +18,6 @@ */ #include #include -#include FILE * __ghdl_get_stdout (void) @@ -44,29 +43,6 @@ fprintf (stream, "%g", val); } -static int run_env_en; -static jmp_buf run_env; - -void -__ghdl_maybe_return_via_longjump (int val) -{ - if (run_env_en) - longjmp (run_env, val); -} - -int -__ghdl_run_through_longjump (int (*func)(void)) -{ - int res; - - run_env_en = 1; - res = setjmp (run_env); - if (res == 0) - res = (*func)(); - run_env_en = 0; - return res; -} - #if 1 void __gnat_last_chance_handler (void) diff -urN ghdl-0.21/vhdl/grt/grt-signals.adb ghdl-0.22dev/vhdl/grt/grt-signals.adb --- ghdl-0.21/vhdl/grt/grt-signals.adb 2005-11-18 03:13:36.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-signals.adb 2006-03-16 20:51:05.000000000 +0100 @@ -1095,15 +1095,6 @@ when others => Internal_Error ("ghdl_create_signal_attribute"); end case; --- Sig_Instance_Name := new Ghdl_Instance_Name_Type' --- (Kind => Ghdl_Name_Signal, --- Name => null, --- Parent => null, --- Brother => null, --- Sig_Mode => Mode, --- Sig_Kind => Kind_Signal_No, --- Sig_Indexes => (First => Sig_Table.Last + 1, Last => Sig_Table.Last), --- Sig_Type_Desc => Sig_Type); -- Note: bit and boolean are both mode_b2. Res := Create_Signal (Mode_B2, Value_Union'(Mode => Mode_B2, B2 => True), diff -urN ghdl-0.21/vhdl/grt/grt-waves.adb ghdl-0.22dev/vhdl/grt/grt-waves.adb --- ghdl-0.21/vhdl/grt/grt-waves.adb 2005-12-07 05:50:07.000000000 +0100 +++ ghdl-0.22dev/vhdl/grt/grt-waves.adb 2006-03-16 20:51:05.000000000 +0100 @@ -785,6 +785,15 @@ Nbr_Scope_Signals : Natural := 0; Nbr_Dumped_Signals : Natural := 0; + -- This is only valid during write_hierarchy. + function Get_Signal_Number (Sig : Ghdl_Signal_Ptr) return Natural + is + function To_Integer_Address is new Ada.Unchecked_Conversion + (Ghdl_Signal_Ptr, Integer_Address); + begin + return Natural (To_Integer_Address (Sig.Alink)); + end Get_Signal_Number; + procedure Write_Signal_Number (Val_Addr : Address; Val_Name : Vstring; Val_Type : Ghdl_Rti_Access) @@ -792,20 +801,28 @@ pragma Unreferenced (Val_Name); pragma Unreferenced (Val_Type); - function To_Integer_Address is new Ada.Unchecked_Conversion - (Ghdl_Signal_Ptr, Integer_Address); + Num : Natural; + function To_Ghdl_Signal_Ptr is new Ada.Unchecked_Conversion (Source => Integer_Address, Target => Ghdl_Signal_Ptr); Sig : Ghdl_Signal_Ptr; begin + -- Convert to signal. Sig := To_Ghdl_Signal_Ptr (To_Addr_Acc (Val_Addr).all); - if not Sig.Flags.Is_Dumped then - Sig.Flags.Is_Dumped := True; + + -- Get signal number. + Num := Get_Signal_Number (Sig); + + -- If the signal number is 0, then assign a valid signal number. + if Num = 0 then Nbr_Dumped_Signals := Nbr_Dumped_Signals + 1; - Sig.Flink := To_Ghdl_Signal_Ptr + Sig.Alink := To_Ghdl_Signal_Ptr (Integer_Address (Nbr_Dumped_Signals)); + Num := Nbr_Dumped_Signals; end if; - Wave_Put_ULEB128 (Ghdl_E32 (To_Integer_Address (Sig.Flink))); + + -- Do the real job: write the signal number. + Wave_Put_ULEB128 (Ghdl_E32 (Num)); end Write_Signal_Number; procedure Foreach_Scalar_Signal_Number is new @@ -1370,13 +1387,18 @@ Table_Initial => 32, Table_Increment => 100); + function Get_Dump_Entry (N : Natural) return Ghdl_Signal_Ptr is + begin + return Dump_Table.Table (N); + end Get_Dump_Entry; + procedure Write_Hierarchy (Root : VhpiHandleT) is N : Natural; begin - -- Check Flink is 0. + -- Check Alink is 0. for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flink /= null then + if Sig_Table.Table (I).Alink /= null then Internal_Error ("wave.write_hierarchy"); end if; end loop; @@ -1393,15 +1415,20 @@ Wave_Put_Byte (0); Dump_Table.Set_Last (Nbr_Dumped_Signals); + for I in Dump_Table.First .. Dump_Table.Last loop + Dump_Table.Table (I) := null; + end loop; -- Save and clear. - N := 0; for I in Sig_Table.First .. Sig_Table.Last loop - if Sig_Table.Table (I).Flags.Is_Dumped then - N := N + 1; + N := Get_Signal_Number (Sig_Table.Table (I)); + if N /= 0 then + if Dump_Table.Table (N) /= null then + Internal_Error ("wave.write_hierarchy(2)"); + end if; Dump_Table.Table (N) := Sig_Table.Table (I); + Sig_Table.Table (I).Alink := null; end if; - Sig_Table.Table (I).Flink := null; end loop; end Write_Hierarchy; diff -urN ghdl-0.21/vhdl/Makefile.in ghdl-0.22dev/vhdl/Makefile.in --- ghdl-0.21/vhdl/Makefile.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Makefile.in 2006-03-22 11:15:27.000000000 +0100 @@ -480,6 +480,7 @@ #GRT_USE_PTHREADS=y ifeq ($(GRT_USE_PTHREADS),y) + GRT_CFLAGS+=-DUSE_THREADS GRT_ADD_OBJS+=grt-cthreads.o GRT_EXTRA_LIB+=-lpthread endif @@ -527,7 +528,7 @@ $(CC) -c $(GRT_FLAGS) -o $@ $< linux.o: $(GRTSRCDIR)/config/linux.c - $(CC) -c $(GRT_FLAGS) -o $@ $< + $(CC) -c $(GRT_FLAGS) $(GRT_CFLAGS) -o $@ $< win32.o: $(GRTSRCDIR)/config/win32.c $(CC) -c $(GRT_FLAGS) -o $@ $< diff -urN ghdl-0.21/vhdl/Make-lang.in ghdl-0.22dev/vhdl/Make-lang.in --- ghdl-0.21/vhdl/Make-lang.in 2005-12-18 14:48:59.000000000 +0100 +++ ghdl-0.22dev/vhdl/Make-lang.in 2006-03-22 11:15:27.000000000 +0100 @@ -96,22 +96,21 @@ AGCC_INC_FLAGS=-I$(AGCC_GCCOBJ_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/include \ -I$(AGCC_GCCSRC_DIR)/gcc -I$(AGCC_GCCSRC_DIR)/gcc/config \ -I$(AGCC_GCCSRC_DIR)/libcpp/include -AGCC_CFLAGS=-g -DIN_GCC $(AGCC_INC_FLAGS) +AGCC_CFLAGS=-g -Wall -DIN_GCC $(AGCC_INC_FLAGS) AGCC_LOCAL_OBJS=ortho-lang.o gcc-version.o AGCC_DEPS := $(AGCC_LOCAL_OBJS) AGCC_OBJS := $(AGCC_LOCAL_OBJS) \ $(AGCC_GCCOBJ_DIR)/gcc/toplev.o \ - $(AGCC_GCCOBJ_DIR)/gcc/c-convert.o \ $(AGCC_GCCOBJ_DIR)/gcc/libbackend.a \ $(AGCC_GCCOBJ_DIR)/libcpp/libcpp.a \ $(AGCC_GCCOBJ_DIR)/libiberty/libiberty.a -gcc-version.c: $(AGCC_GCCSRC_DIR)/gcc/version.c +gcc-version.c: $(AGCC_GCCSRC_DIR)/gcc/BASE-VER -$(RM) -f $@ echo '#include "version.h"' > $@ - sed -n -e '/version_string/ s/";/ (ghdl)";/p' < $< >> $@ + echo "const char version_string[] = \""`cat $<` "(ghdl)\";" >> $@ echo 'const char bug_report_url[] = "";' >> $@ gcc-version.o: gcc-version.c diff -urN ghdl-0.21/vhdl/ortho-lang.c ghdl-0.22dev/vhdl/ortho-lang.c --- ghdl-0.21/vhdl/ortho-lang.c 2005-12-10 12:04:40.000000000 +0100 +++ ghdl-0.22dev/vhdl/ortho-lang.c 2006-03-22 11:15:00.000000000 +0100 @@ -18,6 +18,10 @@ #include "tree-gimple.h" #include "function.h" #include "cgraph.h" +#include "target.h" +#include "convert.h" +#include "tree-pass.h" +#include "tree-dump.h" const int tree_identifier_size = sizeof (struct tree_identifier); @@ -431,6 +435,7 @@ case COMPONENT_REF: case ARRAY_REF: + case ARRAY_RANGE_REF: n = TREE_OPERAND (n, 0); break; @@ -494,6 +499,89 @@ } } +/* The following function has been copied and modified from c-convert.c. */ + +/* Change of width--truncation and extension of integers or reals-- + is represented with NOP_EXPR. Proper functioning of many things + assumes that no other conversions can be NOP_EXPRs. + + Conversion between integer and pointer is represented with CONVERT_EXPR. + Converting integer to real uses FLOAT_EXPR + and real to integer uses FIX_TRUNC_EXPR. + + Here is a list of all the functions that assume that widening and + narrowing is always done with a NOP_EXPR: + In convert.c, convert_to_integer. + In c-typeck.c, build_binary_op (boolean ops), and + c_common_truthvalue_conversion. + In expr.c: expand_expr, for operands of a MULT_EXPR. + In fold-const.c: fold. + In tree.c: get_narrower and get_unwidened. */ + +/* Subroutines of `convert'. */ + + + +/* Create an expression whose value is that of EXPR, + converted to type TYPE. The TREE_TYPE of the value + is always TYPE. This function implements all reasonable + conversions; callers should filter out those that are + not permitted by the language being compiled. */ + +tree +convert (tree type, tree expr) +{ + tree e = expr; + enum tree_code code = TREE_CODE (type); + const char *invalid_conv_diag; + + if (type == error_mark_node + || expr == error_mark_node + || TREE_TYPE (expr) == error_mark_node) + return error_mark_node; + + if ((invalid_conv_diag + = targetm.invalid_conversion (TREE_TYPE (expr), type))) + { + error (invalid_conv_diag); + return error_mark_node; + } + + if (type == TREE_TYPE (expr)) + return expr; + + if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (TREE_TYPE (expr))) + return fold_build1 (NOP_EXPR, type, expr); + if (TREE_CODE (TREE_TYPE (expr)) == ERROR_MARK) + return error_mark_node; + if (TREE_CODE (TREE_TYPE (expr)) == VOID_TYPE || code == VOID_TYPE) + { + abort (); + return error_mark_node; + } + if (code == INTEGER_TYPE || code == ENUMERAL_TYPE) + return fold (convert_to_integer (type, e)); + if (code == BOOLEAN_TYPE) + { + tree t = ortho_truthvalue_conversion (expr); + if (TREE_CODE (t) == ERROR_MARK) + return t; + + /* If it returns a NOP_EXPR, we must fold it here to avoid + infinite recursion between fold () and convert (). */ + if (TREE_CODE (t) == NOP_EXPR) + return fold_build1 (NOP_EXPR, type, TREE_OPERAND (t, 0)); + else + return fold_build1 (NOP_EXPR, type, t); + } + if (code == POINTER_TYPE || code == REFERENCE_TYPE) + return fold (convert_to_pointer (type, e)); + if (code == REAL_TYPE) + return fold (convert_to_real (type, e)); + + abort (); +} + /* Return a definition for a builtin function named NAME and whose data type is TYPE. TYPE should be a function type with argument types. FUNCTION_CODE tells later passes how to compile calls to this function. @@ -603,8 +691,6 @@ #define LANG_HOOKS_POST_OPTIONS ortho_post_options #undef LANG_HOOKS_HONOR_READONLY #define LANG_HOOKS_HONOR_READONLY true -#undef LANG_HOOKS_TRUTHVALUE_CONVERSION -#define LANG_HOOKS_TRUTHVALUE_CONVERSION ortho_truthvalue_conversion #undef LANG_HOOKS_MARK_ADDRESSABLE #define LANG_HOOKS_MARK_ADDRESSABLE ortho_mark_addressable #undef LANG_HOOKS_CALLGRAPH_EXPAND_FUNCTION @@ -1234,7 +1320,7 @@ void finish_record_aggr (struct o_record_aggr_list *list, tree *res) { - *res = build_constructor (list->atype, list->chain.first); + *res = build_constructor_from_list (list->atype, list->chain.first); } @@ -1260,18 +1346,16 @@ void finish_array_aggr (struct o_array_aggr_list *list, tree *res) { - *res = build_constructor (list->atype, list->chain.first); + *res = build_constructor_from_list (list->atype, list->chain.first); } tree new_union_aggr (tree atype, tree field, tree value) { - tree el; tree res; - el = build_tree_list (field, value); - res = build_constructor (atype, el); + res = build_constructor_single (atype, field, value); TREE_CONSTANT (res) = 1; return res; } @@ -1298,6 +1382,7 @@ abort (); ortho_mark_addressable (arr); + return build4 (ARRAY_RANGE_REF, res_type, arr, index, NULL_TREE, NULL_TREE); el_type = TREE_TYPE (TREE_TYPE (arr)); el_ptr_type = build_pointer_type (el_type); @@ -1371,78 +1456,117 @@ return fold (build1 (NOP_EXPR, rtype, size)); } -#if 0 -static tree -ortho_build_addr (tree operand, tree atype) -{ - tree base = exp; +/* Convert the array expression EXP to a pointer. */ +static tree array_to_pointer_conversion (tree exp); - while (handled_component_p (base)) - base = TREE_OPERAND (base, 0); - - if (DECL_P (base)) - TREE_ADDRESSABLE (base) = 1; - - return build1 (ADDR_EXPR, atype, exp); -} -#endif - -tree -new_unchecked_address (tree lvalue, tree atype) +static tree +ortho_build_addr (tree lvalue, tree atype) { tree res; if (TREE_CODE (lvalue) == INDIRECT_REF) { + /* ADDR_REF(INDIRECT_REF(x)) -> x. */ res = TREE_OPERAND (lvalue, 0); } else { - ortho_mark_addressable (lvalue); - - if (TREE_TYPE (lvalue) != TREE_TYPE (atype)) + /* &base[off] -> base+off. */ + if (TREE_CODE (lvalue) == ARRAY_REF + || TREE_CODE (lvalue) == ARRAY_RANGE_REF) { - tree ptr; - ptr = build_pointer_type (TREE_TYPE (lvalue)); - res = build1 (ADDR_EXPR, ptr, lvalue); + tree base = TREE_OPERAND (lvalue, 0); + tree idx = TREE_OPERAND (lvalue, 1); + tree offset; + tree base_type; + + ortho_mark_addressable (base); + + offset = fold_build2 (MULT_EXPR, TREE_TYPE (idx), idx, + array_ref_element_size (lvalue)); + + base = array_to_pointer_conversion (base); + base_type = TREE_TYPE (base); + + res = build2 (PLUS_EXPR, base_type, + base, convert (base_type, offset)); } else - res = build1 (ADDR_EXPR, atype, lvalue); + { + ortho_mark_addressable (lvalue); + + if (TREE_TYPE (lvalue) != TREE_TYPE (atype)) + { + tree ptr; + ptr = build_pointer_type (TREE_TYPE (lvalue)); + res = build1 (ADDR_EXPR, ptr, lvalue); + } + else + res = build1 (ADDR_EXPR, atype, lvalue); + } + res = fold (res); } if (TREE_TYPE (res) != atype) - res = fold (build1 (NOP_EXPR, atype, res)); + res = fold_build1 (NOP_EXPR, atype, res); return res; +} -#if 0 - /* res = build_addr (lvalue, atype); */ - if (TREE_TYPE (res) != atype) +/* Convert the array expression EXP to a pointer. */ +static tree +array_to_pointer_conversion (tree exp) +{ + tree type = TREE_TYPE (exp); + tree adr; + tree restype = TREE_TYPE (type); + tree ptrtype; + + gcc_assert (TREE_CODE (type) == ARRAY_TYPE); + + /* Create a pointer to elements. */ + ptrtype = build_pointer_type (restype); + + switch (TREE_CODE (exp)) { - if (TREE_CODE (TREE_TYPE (res)) != POINTER_TYPE) - abort (); - res = build1 (NOP_EXPR, atype, res); + case INDIRECT_REF: + return convert (ptrtype, TREE_OPERAND (exp, 0)); + + case VAR_DECL: + /* Convert array to pointer to elements. */ + adr = build1 (ADDR_EXPR, ptrtype, exp); + ortho_mark_addressable (exp); + TREE_SIDE_EFFECTS (adr) = 0; /* Default would be, same as EXP. */ + return adr; + + default: + /* Get address. */ + return ortho_build_addr (exp, ptrtype); } - return res; -#endif +} + +tree +new_unchecked_address (tree lvalue, tree atype) +{ + return ortho_build_addr (lvalue, atype); } tree new_address (tree lvalue, tree atype) { - return new_unchecked_address (lvalue, atype); + return ortho_build_addr (lvalue, atype); } tree new_global_address (tree lvalue, tree atype) { - return new_unchecked_address (lvalue, atype); + return ortho_build_addr (lvalue, atype); } tree new_global_unchecked_address (tree lvalue, tree atype) { - return new_unchecked_address (lvalue, atype); + return ortho_build_addr (lvalue, atype); } /* Return a pointer to function FUNC. */ @@ -1748,6 +1872,10 @@ gimplify_function_tree (func); + /* Dump the genericized tree IR. + Enabled by -fdump-tree-gimple. */ + dump_function (TDI_generic, func); + parent = DECL_CONTEXT (func); if (parent != NULL) diff -urN ghdl-0.21/vhdl/parse.adb ghdl-0.22dev/vhdl/parse.adb --- ghdl-0.21/vhdl/parse.adb 2005-12-17 07:18:00.000000000 +0100 +++ ghdl-0.22dev/vhdl/parse.adb 2006-03-16 20:51:10.000000000 +0100 @@ -3540,7 +3540,7 @@ Set_Location (Res); Set_Expression (Res, Parse_Expression); - Expect (Tok_Select, "after expression"); + Expect (Tok_Select, "'select' expected after expression"); Scan.Scan; if Current_Token = Tok_Left_Paren then Target := Parse_Aggregate; @@ -3556,13 +3556,13 @@ Build_Init (Last); loop Wf_Chain := Parse_Waveform; - Expect (Tok_When, "after waveform"); + Expect (Tok_When, "'when' expected after waveform"); Scan.Scan; Assoc := Parse_Choices (Null_Iir); Set_Associated (Assoc, Wf_Chain); Append_Subchain (Last, Res, Assoc); exit when Current_Token = Tok_Semi_Colon; - Expect (Tok_Comma, "after choice"); + Expect (Tok_Comma, "',' (comma) expected after choice"); Scan.Scan; end loop; return Res; diff -urN ghdl-0.21/vhdl/sem_assocs.adb ghdl-0.22dev/vhdl/sem_assocs.adb --- ghdl-0.21/vhdl/sem_assocs.adb 2005-10-08 14:45:00.000000000 +0200 +++ ghdl-0.22dev/vhdl/sem_assocs.adb 2006-03-16 20:51:10.000000000 +0100 @@ -551,7 +551,7 @@ exit when Index_Type = Null_Iir; Chain := Get_Individual_Association_Chain (Assoc); Sem_Choices_Range - (Chain, Index_Type, True, Get_Location (Assoc), Low, High); + (Chain, Index_Type, False, Get_Location (Assoc), Low, High); Set_Individual_Association_Chain (Assoc, Chain); end loop; end Finish_Individual_Assoc_Array_Subtype; diff -urN ghdl-0.21/vhdl/sem_expr.adb ghdl-0.22dev/vhdl/sem_expr.adb --- ghdl-0.21/vhdl/sem_expr.adb 2005-12-17 07:13:37.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_expr.adb 2006-03-16 20:51:10.000000000 +0100 @@ -2278,6 +2278,7 @@ Lb := Low; Hb := High; end if; + -- Checks all values between POS and POS_MAX are handled. Pos := Eval_Pos (Lb); Pos_Max := Eval_Pos (Hb); if Pos > Pos_Max then diff -urN ghdl-0.21/vhdl/sem_names.adb ghdl-0.22dev/vhdl/sem_names.adb --- ghdl-0.21/vhdl/sem_names.adb 2005-12-11 14:50:31.000000000 +0100 +++ ghdl-0.22dev/vhdl/sem_names.adb 2006-03-16 20:51:10.000000000 +0100 @@ -1974,7 +1974,8 @@ Error_Msg_Sem ("function name is a procedure", Name); when Iir_Kind_Process_Statement - | Iir_Kind_Component_Declaration => + | Iir_Kind_Component_Declaration + | Iir_Kind_Type_Conversion => Error_Msg_Sem (Disp_Node (Prefix) & " cannot be indexed or sliced", Name); Res := Null_Iir; diff -urN ghdl-0.21/vhdl/translation.adb ghdl-0.22dev/vhdl/translation.adb --- ghdl-0.21/vhdl/translation.adb 2005-12-10 12:11:41.000000000 +0100 +++ ghdl-0.22dev/vhdl/translation.adb 2006-03-16 20:51:05.000000000 +0100 @@ -1,5 +1,5 @@ -- Iir to ortho translator. --- Copyright (C) 2002, 2003, 2004, 2005 Tristan Gingold +-- Copyright (C) 2002, 2003, 2004, 2005, 2006 Tristan Gingold -- -- GHDL 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 @@ -1797,15 +1797,13 @@ -- Check bounds length of L match bounds length of R. -- If L_TYPE (resp. R_TYPE) is not a thin array, then L_NODE - -- (resp. R_NODE) are not used (and may be o_lnode_null). + -- (resp. R_NODE) are not used (and may be Mnode_Null). -- If L_TYPE (resp. T_TYPE) is a fat array, then L_NODE (resp. R_NODE) - -- must be a variable pointing to the array. + -- must designate the array. procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir); -- Create a subtype range to be stored into the location pointed by @@ -8412,10 +8410,19 @@ return True; end Need_Range_Check; - procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) + procedure Check_Range_Low (Value : O_Dnode; Atype : Iir) is If_Blk : O_If_Block; begin + Open_Temp; + Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); + Chap6.Gen_Bound_Error (Null_Iir); + Finish_If_Stmt (If_Blk); + Close_Temp; + end Check_Range_Low; + + procedure Check_Range (Value : O_Dnode; Expr : Iir; Atype : Iir) is + begin if not Need_Range_Check (Expr, Atype) then return; end if; @@ -8428,20 +8435,14 @@ Chap6.Gen_Bound_Error (Expr); end if; else - Open_Temp; - Start_If_Stmt (If_Blk, Not_In_Range (Value, Atype)); - Chap6.Gen_Bound_Error (Null_Iir); - Finish_If_Stmt (If_Blk); - Close_Temp; + Check_Range_Low (Value, Atype); end if; end Check_Range; procedure Check_Array_Match (L_Type : Iir; - L_Node : O_Lnode; - L_Mode : Object_Kind_Type; + L_Node : Mnode; R_Type : Iir; - R_Node : O_Lnode; - R_Mode : Object_Kind_Type; + R_Node : Mnode; Loc : Iir) is L_Tinfo, R_Tinfo : Type_Info_Acc; @@ -8491,10 +8492,10 @@ exit when Index = Null_Iir; Sub_Cond := New_Compare_Op (ON_Neq, - Chap6.Get_Array_Ptr_Bound_Length (L_Node, L_Type, - I + 1, L_Mode), - Chap6.Get_Array_Ptr_Bound_Length (R_Node, R_Type, - I + 1, R_Mode), + M2E (Range_To_Length + (Get_Array_Range (L_Node, L_Type, I + 1))), + M2E (Range_To_Length + (Get_Array_Range (R_Node, R_Type, I + 1))), Ghdl_Bool_Type); if I = 0 then Cond := Sub_Cond; @@ -10081,8 +10082,8 @@ New_Assign_Stmt (Get_Var (Alias_Info.Alias_Var), New_Value (M2Lp (Chap3.Get_Array_Base (Name_Node)))); - Chap3.Check_Array_Match (Decl_Type, O_Lnode_Null, Kind, - Name_Type, M2Lp (Name_Node), Kind, + Chap3.Check_Array_Match (Decl_Type, T2M (Decl_Type, Kind), + Name_Type, Name_Node, Decl); Close_Temp; when Type_Mode_Scalar => @@ -11691,6 +11692,16 @@ end; end if; + if Get_Kind (Formal_Type) in Iir_Kinds_Array_Type_Definition + then + -- Check length matches. + Stabilize (Formal_Node); + Stabilize (Actual_Node); + Chap3.Check_Array_Match (Formal_Type, Formal_Node, + Actual_Type, Actual_Node, + Assoc); + end if; + Data := (Actual_Node => Actual_Node, Actual_Type => Actual_Type, Mode => Mode, @@ -14420,8 +14431,8 @@ E := Create_Temp_Init (T_Info.Ortho_Ptr_Type (Mode_Value), Val); Chap3.Check_Array_Match - (Target_Type, M2Lp (T), Mode_Value, - Get_Type (Expr), New_Obj (E), Mode_Value, + (Target_Type, T, + Get_Type (Expr), Dp2M (E, T_Info, Mode_Value), Null_Iir); Chap3.Translate_Object_Copy (T, New_Obj_Value (E), Target_Type); @@ -15169,9 +15180,10 @@ begin E := Create_Temp_Init (Expr_Info.Ortho_Ptr_Type (Mode_Value), Expr); - Chap3.Check_Array_Match (Res_Type, O_Lnode_Null, Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, T2M (Res_Type, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); return New_Convert_Ov (New_Value (Chap3.Get_Array_Ptr_Base_Ptr (New_Obj (E), Expr_Type, Mode_Value)), @@ -15199,9 +15211,10 @@ Chap3.Get_Array_Bounds_Ptr (O_Lnode_Null, Expr_Type, Mode_Value)); -- Check array match. - Chap3.Check_Array_Match (Res_Type, New_Obj (Res), Mode_Value, - Expr_Type, New_Obj (E), Mode_Value, - Loc); + Chap3.Check_Array_Match + (Res_Type, Dv2M (Res, Res_Info, Mode_Value), + Expr_Type, Dp2M (E, Expr_Info, Mode_Value), + Loc); Close_Temp; return New_Address (New_Obj (Res), Res_Info.Ortho_Ptr_Type (Mode_Value)); @@ -22283,19 +22296,58 @@ function Translate_Val_Attribute (Attr : Iir) return O_Enode is - T : O_Dnode; - Prefix : Iir; - Ttype : O_Tnode; + Val : O_Enode; + Attr_Type : Iir; + Res_Var : O_Dnode; + Res_Type : O_Tnode; begin - Prefix := Get_Type (Attr); - Ttype := Get_Ortho_Type (Prefix, Mode_Value); - T := Create_Temp (Ttype); - New_Assign_Stmt - (New_Obj (T), - New_Convert_Ov (Chap7.Translate_Expression (Get_Parameter (Attr)), - Ttype)); - Chap3.Check_Range (T, Attr, Get_Type (Get_Prefix (Attr))); - return New_Obj_Value (T); + Attr_Type := Get_Type (Attr); + Res_Type := Get_Ortho_Type (Attr_Type, Mode_Value); + Res_Var := Create_Temp (Res_Type); + Val := Chap7.Translate_Expression (Get_Parameter (Attr)); + + case Get_Kind (Attr_Type) is + when Iir_Kind_Enumeration_Type_Definition + | Iir_Kind_Enumeration_Subtype_Definition => + -- For enumeration, always check the value is in the enum + -- range. + declare + Val_Type : O_Tnode; + Val_Var : O_Dnode; + If_Blk : O_If_Block; + begin + Val_Type := Get_Ortho_Type (Get_Type (Get_Parameter (Attr)), + Mode_Value); + Val_Var := Create_Temp_Init (Val_Type, Val); + Start_If_Stmt + (If_Blk, + New_Dyadic_Op + (ON_Or, + New_Compare_Op (ON_Lt, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, 0)), + Ghdl_Bool_Type), + New_Compare_Op (ON_Ge, + New_Obj_Value (Val_Var), + New_Lit (New_Signed_Literal + (Val_Type, + Integer_64 + (Get_Nbr_Elements + (Get_Enumeration_Literal_List + (Attr_Type))))), + Ghdl_Bool_Type))); + Chap6.Gen_Bound_Error (Attr); + Finish_If_Stmt (If_Blk); + Val := New_Obj_Value (Val_Var); + end; + when others => + null; + end case; + + New_Assign_Stmt (New_Obj (Res_Var), New_Convert_Ov (Val, Res_Type)); + Chap3.Check_Range (Res_Var, Attr, Get_Type (Get_Prefix (Attr))); + return New_Obj_Value (Res_Var); end Translate_Val_Attribute; function Translate_Pos_Attribute (Attr : Iir; Res_Type : Iir) diff -urN ghdl-0.21/vhdl/version.ads ghdl-0.22dev/vhdl/version.ads --- ghdl-0.21/vhdl/version.ads 2005-12-18 14:07:38.000000000 +0100 +++ ghdl-0.22dev/vhdl/version.ads 2006-03-16 20:51:10.000000000 +0100 @@ -1,4 +1,4 @@ package Version is Ghdl_Version : constant String := - "GHDL 0.21 (20051218) [Sokcho edition]"; + "GHDL 0.22dev (20051220) [Sokcho edition]"; end Version; Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- ghdl.spec 19 Mar 2006 15:13:36 -0000 1.13 +++ ghdl.spec 22 Mar 2006 10:56:48 -0000 1.14 @@ -1,11 +1,12 @@ %define gccver 4.1.0 %define ghdlver 0.21 +%define ghdlsvnver 50 %define DATE 20060304 Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.49svn.1%{?dist} +Release: 0.%{ghdlsvnver}svn.1%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -28,7 +29,7 @@ Patch11: gcc41-mni.patch Patch12: gcc41-cfaval.patch Patch13: gcc41-rh184446.patch -Patch100: ghdl-svn49.patch +Patch100: ghdl-svn%{ghdlsvnver}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -84,6 +85,8 @@ Requires: glibc >= 2.3.90-35 %endif +Requires: ghdl-grt = %{version}-%{release} + # Make sure we don't use clashing namespaces %define _vendor fedora_ghdl @@ -110,6 +113,15 @@ functions or procedures written in a foreign language, such as C, C++, or Ada95. +%package grt +Summary: GHDL runtime libraries +Group: System Environment/Libraries + +%description grt +This package contains the runtime libraries needed to link ghdl-compiled +object files into simulator executables. grt contains the simulator kernel +that tracks signal updates and schedules processes. + %prep %setup -q -n gcc-%{gccver}-%{DATE} -T -b 0 -a 100 %patch1 -p0 -b .ice-hack~ @@ -297,14 +309,22 @@ %doc ghdl-%{ghdlver}/COPYING %{_bindir}/ghdl %{_infodir}/ghdl.info.gz -# Need to own directory %{_libdir}/gcc even though we only want the -# %{gcc_target_platform}/%{gccver} subdirectory -%{_libdir}/gcc/ # Need to own directory %{_libexecdir}/gcc even though we only want the # %{gcc_target_platform}/%{gccver} subdirectory %{_libexecdir}/gcc/ +%files grt +# Need to own directory %{_libdir}/gcc even though we only want the +# %{gcc_target_platform}/%{gccver} subdirectory +%{_libdir}/gcc/ + + %changelog +* Wed Mar 22 2006 Thomas Sailer - 0.22-0.50svn.0 +- update to svn50, to fix x86_64 breakage +- move grt (ghdl runtime library) into separate package, to allow parallel + install of i386 and x86_64 grt on x86_64 machines, thus making -m32 work + * Sun Mar 19 2006 Thomas Sailer - 0.22-0.49svn.1 - use core gcc as base compiler sources --- ghdl-svn38.patch DELETED --- --- ghdl-svn39.patch DELETED --- --- ghdl-svn40.patch DELETED --- --- ghdl-svn49.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 12:27:26 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Wed, 22 Mar 2006 07:27:26 -0500 Subject: rpms/nail/devel nail.spec,1.11,1.12 Message-ID: <200603221227.k2MCRw4A014391@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14374 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/devel/nail.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nail.spec 21 Mar 2006 16:06:59 -0000 1.11 +++ nail.spec 22 Mar 2006 12:27:25 -0000 1.12 @@ -4,7 +4,7 @@ Summary: Enhanced implementation of the mailx command Name: nail Version: 12.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net @@ -41,22 +41,21 @@ %if %{rename} # Use old name "nail" to avoid conflicts with the Core mailx package -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g +sed -i '/Heirloom/ n + s/mailx/nail/g ' %{name}.rc +sed -i '/Heirloom/ n + s/mailx/nail/g + s/Mailx/Nail/g +' mailx.1 + +sed -i '/Heirloom/ n + s/mailx/nail/g + s/MAILX /NAIL /g + s/Mailx/Nail/g +' mailx.1.html mv mailx.1.html %{name}.html -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g -s/MAILX/NAIL/g -s/Mailx/Nail/g -' %{name}.html %endif @@ -107,6 +106,10 @@ %changelog +* Wed Mar 22 2006 Dmitry Butskoy - 12.0-2 +- complete "mailx to nail" changes in the manual and config files +- drop _smp_mflags: it caused make to work incorrectly. + * Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 - upgrade to 12.0 - change new upstream name "mailx" to the old name "nail" to avoid From fedora-extras-commits at redhat.com Wed Mar 22 12:40:07 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Wed, 22 Mar 2006 07:40:07 -0500 Subject: rpms/nail/FC-5 nail.spec,1.11,1.12 Message-ID: <200603221240.k2MCee2c014477@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14458 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-5/nail.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- nail.spec 21 Mar 2006 15:44:24 -0000 1.11 +++ nail.spec 22 Mar 2006 12:40:07 -0000 1.12 @@ -4,7 +4,7 @@ Summary: Enhanced implementation of the mailx command Name: nail Version: 12.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net @@ -41,22 +41,21 @@ %if %{rename} # Use old name "nail" to avoid conflicts with the Core mailx package -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g +sed -i '/Heirloom/ n + s/mailx/nail/g ' %{name}.rc +sed -i '/Heirloom/ n + s/mailx/nail/g + s/Mailx/Nail/g +' mailx.1 + +sed -i '/Heirloom/ n + s/mailx/nail/g + s/MAILX /NAIL /g + s/Mailx/Nail/g +' mailx.1.html mv mailx.1.html %{name}.html -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g -s/MAILX/NAIL/g -s/Mailx/Nail/g -' %{name}.html %endif @@ -107,6 +106,10 @@ %changelog +* Wed Mar 22 2006 Dmitry Butskoy - 12.0-2 +- complete "mailx to nail" changes in the manual and config files +- drop _smp_mflags: it caused make to work incorrectly. + * Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 - upgrade to 12.0 - change new upstream name "mailx" to the old name "nail" to avoid From fedora-extras-commits at redhat.com Wed Mar 22 12:54:13 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Wed, 22 Mar 2006 07:54:13 -0500 Subject: rpms/nail/FC-4 nail.spec,1.6,1.7 Message-ID: <200603221254.k2MCsjiK014899@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14882 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-4/nail.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nail.spec 21 Mar 2006 16:08:33 -0000 1.6 +++ nail.spec 22 Mar 2006 12:54:12 -0000 1.7 @@ -4,7 +4,7 @@ Summary: Enhanced implementation of the mailx command Name: nail Version: 12.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net @@ -41,22 +41,21 @@ %if %{rename} # Use old name "nail" to avoid conflicts with the Core mailx package -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g +sed -i '/Heirloom/ n + s/mailx/nail/g ' %{name}.rc +sed -i '/Heirloom/ n + s/mailx/nail/g + s/Mailx/Nail/g +' mailx.1 + +sed -i '/Heirloom/ n + s/mailx/nail/g + s/MAILX /NAIL /g + s/Mailx/Nail/g +' mailx.1.html mv mailx.1.html %{name}.html -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g -s/MAILX/NAIL/g -s/Mailx/Nail/g -' %{name}.html %endif @@ -107,6 +106,10 @@ %changelog +* Wed Mar 22 2006 Dmitry Butskoy - 12.0-2 +- complete "mailx to nail" changes in the manual and config files +- drop _smp_mflags: it caused make to work incorrectly. + * Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 - upgrade to 12.0 - change new upstream name "mailx" to the old name "nail" to avoid From fedora-extras-commits at redhat.com Wed Mar 22 12:59:29 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Wed, 22 Mar 2006 07:59:29 -0500 Subject: rpms/nail/FC-3 nail.spec,1.6,1.7 Message-ID: <200603221300.k2MD01Oi014992@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/nail/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14975 Modified Files: nail.spec Log Message: Index: nail.spec =================================================================== RCS file: /cvs/extras/rpms/nail/FC-3/nail.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- nail.spec 21 Mar 2006 16:09:45 -0000 1.6 +++ nail.spec 22 Mar 2006 12:59:29 -0000 1.7 @@ -4,7 +4,7 @@ Summary: Enhanced implementation of the mailx command Name: nail Version: 12.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Internet License: BSD URL: http://nail.sourceforge.net @@ -41,22 +41,21 @@ %if %{rename} # Use old name "nail" to avoid conflicts with the Core mailx package -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g +sed -i '/Heirloom/ n + s/mailx/nail/g ' %{name}.rc +sed -i '/Heirloom/ n + s/mailx/nail/g + s/Mailx/Nail/g +' mailx.1 + +sed -i '/Heirloom/ n + s/mailx/nail/g + s/MAILX /NAIL /g + s/Mailx/Nail/g +' mailx.1.html mv mailx.1.html %{name}.html -sed -i '/Heirloom/ { - p - n -} -s/mailx/nail/g -s/MAILX/NAIL/g -s/Mailx/Nail/g -' %{name}.html %endif @@ -107,6 +106,10 @@ %changelog +* Wed Mar 22 2006 Dmitry Butskoy - 12.0-2 +- complete "mailx to nail" changes in the manual and config files +- drop _smp_mflags: it caused make to work incorrectly. + * Tue Mar 21 2006 Dmitry Butskoy - 12.0-1 - upgrade to 12.0 - change new upstream name "mailx" to the old name "nail" to avoid From fedora-extras-commits at redhat.com Wed Mar 22 13:26:10 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Wed, 22 Mar 2006 06:26:10 -0700 Subject: rpms/liboil/FC-5 README.CVS, NONE, 1.1 Makefile, 1.1, NONE branch, 1.1, NONE liboil-0.3.3-gccoptfixes.patch, 1.1, NONE liboil.spec, 1.16, NONE sources, 1.8, NONE Message-ID: <200603221326.k2MDQAlq017092@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/liboil/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17081 Added Files: README.CVS Removed Files: Makefile branch liboil-0.3.3-gccoptfixes.patch liboil.spec sources Log Message: This package has been moved into FC5 in order to support gstreamer-0.10 --- NEW FILE README.CVS --- This package has been moved into FC5 in order to support gstreamer-0.10 --- Makefile DELETED --- --- branch DELETED --- --- liboil-0.3.3-gccoptfixes.patch DELETED --- --- liboil.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 13:26:42 2006 From: fedora-extras-commits at redhat.com (Warren Togami (wtogami)) Date: Wed, 22 Mar 2006 06:26:42 -0700 Subject: rpms/liboil/devel README.CVS, NONE, 1.1 .cvsignore, 1.8, NONE Makefile, 1.1, NONE liboil-0.3.3-gccoptfixes.patch, 1.1, NONE liboil.spec, 1.16, NONE sources, 1.8, NONE Message-ID: <200603221326.k2MDQgLt017148@cvs-int.fedora.redhat.com> Author: wtogami Update of /cvs/extras/rpms/liboil/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17137 Added Files: README.CVS Removed Files: .cvsignore Makefile liboil-0.3.3-gccoptfixes.patch liboil.spec sources Log Message: This package has been moved into FC5 in order to support gstreamer-0.10 --- NEW FILE README.CVS --- This package has been moved into FC5 in order to support gstreamer-0.10 --- .cvsignore DELETED --- --- Makefile DELETED --- --- liboil-0.3.3-gccoptfixes.patch DELETED --- --- liboil.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 13:49:58 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 22 Mar 2006 08:49:58 -0500 Subject: rpms/wv2/devel wv2.spec,1.5,1.6 Message-ID: <200603221350.k2MDoU9L017218@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/wv2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17201 Modified Files: wv2.spec Log Message: - bump for libgsf Index: wv2.spec =================================================================== RCS file: /cvs/extras/rpms/wv2/devel/wv2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- wv2.spec 21 Feb 2006 21:40:32 -0000 1.5 +++ wv2.spec 22 Mar 2006 13:49:57 -0000 1.6 @@ -1,6 +1,6 @@ Name: wv2 Version: 0.2.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A library which allows access to Microsoft?? Word files Group: System Environment/Libraries @@ -77,6 +77,9 @@ %{_includedir}/wv2 %changelog +* Wed Mar 22 2006 Andreas Bierfert 0.2.2-9 +- bump for libgsf + * Tue Feb 21 2006 Andreas Bierfert 0.2.2-8 - Fix #19229{1,3} - Tune configure From fedora-extras-commits at redhat.com Wed Mar 22 15:16:42 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 22 Mar 2006 10:16:42 -0500 Subject: rpms/orange/devel orange.spec,1.3,1.4 Message-ID: <200603221517.k2MFHEKI022008@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/orange/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21986 Modified Files: orange.spec Log Message: - bump for libgsf - fix versioning Index: orange.spec =================================================================== RCS file: /cvs/extras/rpms/orange/devel/orange.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- orange.spec 28 Feb 2006 08:36:20 -0000 1.3 +++ orange.spec 22 Mar 2006 15:16:29 -0000 1.4 @@ -1,6 +1,6 @@ Name: orange Version: 0.3 -Release: 0.cvs20051118%{?dist}.2 +Release: 1.cvs20051118%{?dist} Summary: Squeeze out installable Microsoft cabinet files Group: Applications/Communications @@ -71,6 +71,11 @@ %{_includedir}/liborange.h %changelog +* Wed Mar 22 2006 Andreas Bierfert +0.3-1.cvs20051118 +- Bump for libgsf +- fix versioning + * Tue Feb 28 2006 Andreas Bierfert 0.3-0.cvs20051118.fc5.2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Wed Mar 22 15:21:16 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:21:16 -0500 Subject: rpms/libmal - New directory Message-ID: <200603221521.k2MFLakM022140@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22118/libmal Log Message: Directory /cvs/extras/rpms/libmal added to the repository From fedora-extras-commits at redhat.com Wed Mar 22 15:21:27 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:21:27 -0500 Subject: rpms/libmal/devel - New directory Message-ID: <200603221521.k2MFLZlD022139@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22118/libmal/devel Log Message: Directory /cvs/extras/rpms/libmal/devel added to the repository From fedora-extras-commits at redhat.com Wed Mar 22 15:21:48 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:21:48 -0500 Subject: rpms/libmal Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603221521.k2MFLoCU022175@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22163 Added Files: Makefile import.log Log Message: Setup of module libmal --- NEW FILE Makefile --- # Top level Makefile for module libmal all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 22 15:21:56 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:21:56 -0500 Subject: rpms/libmal/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603221521.k2MFLwUL022193@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22163/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module libmal --- NEW 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 Mar 22 15:22:43 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:22:43 -0500 Subject: rpms/libmal/devel libmal-0.31-64bit.patch, NONE, 1.1 libmal-0.31-pi12.patch, NONE, 1.1 libmal.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603221523.k2MFNJxt022278@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22237/devel Modified Files: .cvsignore sources Added Files: libmal-0.31-64bit.patch libmal-0.31-pi12.patch libmal.spec Log Message: auto-import libmal-0.31-1 on branch devel from libmal-0.31-1.src.rpm libmal-0.31-64bit.patch: --- NEW FILE libmal-0.31-64bit.patch --- --- libmal-0.31/configure.64 2003-03-23 11:33:42.000000000 -0600 +++ libmal-0.31/configure 2004-12-16 11:37:13.000000000 -0600 @@ -8102,7 +8102,7 @@ pilotlibs=no PILOT_LIBS="-lpisock" -for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \ +for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \ /usr/extra/pilot/lib ; do if test -r "$pilot_libs/libpisock.so" ; then pilotlibs=yes --- libmal-0.31/configure.in.64 2003-03-22 12:37:22.000000000 -0600 +++ libmal-0.31/configure.in 2004-12-16 11:36:57.000000000 -0600 @@ -60,7 +60,7 @@ pilotlibs=no PILOT_LIBS="-lpisock" -for pilot_libs in $pilot_prefix/lib /usr/lib /usr/local/lib/ \ +for pilot_libs in $pilot_prefix/lib $libdir /usr/lib /usr/local/lib/ \ /usr/extra/pilot/lib ; do if test -r "$pilot_libs/libpisock.so" ; then pilotlibs=yes libmal-0.31-pi12.patch: --- NEW FILE libmal-0.31-pi12.patch --- --- libmal-0.31/libmal.c.pi12 2003-03-23 11:00:26.000000000 -0600 +++ libmal-0.31/libmal.c 2005-06-14 10:51:54.000000000 -0500 @@ -508,8 +508,13 @@ uint8 buffer[BUFFERSIZE]; AGBufferReader * r = NULL; +#if (PILOT_LINK_MAJOR >= 12) + rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, + &id, &attr, &cat); +#else rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, &id, &bufferSize, &attr, &cat); +#endif if (rc < 0) { #ifdef _DEBUG @@ -541,8 +546,13 @@ uint8 buffer[BUFFERSIZE]; AGBufferReader * r = NULL; +#if (PILOT_LINK_MAJOR >= 12) + rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, + &id, &attr, &cat); +#else rc = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, &id, &bufferSize, &attr, &cat); +#endif if (rc < 0) { #ifdef _DEBUG @@ -596,9 +606,13 @@ AGUserConfigWriteData(deviceUserConfig, (AGWriter*)w); } - result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer - , - &id, &bufferSize, &attr, &cat); +#if (PILOT_LINK_MAJOR >= 12) + result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, + &id, &attr, &cat); +#else + result = dlp_ReadRecordByIndex(sd, userConfigDBHandle, 0, (void *)buffer, + &id, &bufferSize, &attr, &cat); +#endif if (result < 0) id = 0; @@ -881,13 +895,25 @@ int idx = pInfo->pilot_RecIndex++; result = (modonly) ? +#if (PILOT_LINK_MAJOR >= 12) + dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pilot_buffer, + &pInfo->id, &idx, + &att, &cat) +#else dlp_ReadNextModifiedRec (sd, pInfo->pilot_rHandle, pInfo->pilot_buffer, &pInfo->id, &idx, &size, &att, &cat) +#endif : +#if (PILOT_LINK_MAJOR >= 12) + dlp_ReadRecordByIndex(sd, pInfo->pilot_rHandle, idx, + pInfo->pilot_buffer, &pInfo->id, + &att, &cat); +#else dlp_ReadRecordByIndex(sd, pInfo->pilot_rHandle, idx, pInfo->pilot_buffer, &pInfo->id, &size, &att, &cat); +#endif if (result < 0) { closeDatabase(pInfo); @@ -1208,7 +1234,11 @@ strcpy(addr.pi_device, device); +#if (PILOT_LINK_MAJOR >= 12) + ret = pi_bind(sd, (struct sockaddr*)&addr); +#else ret = pi_bind(sd, (struct sockaddr*)&addr, sizeof(addr)); +#endif if(ret == -1) { /*fprintf(stderr, "Unable to bind to port '%s'.\n", device);*/ (*printerror) ("Unable to bind to port '%s'.\n", device); --- NEW FILE libmal.spec --- 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 Version: 0.31 Release: 1%{?dist} License: MPL Url: http://jasonday.home.att.net/code/libmal/ Source: http://jasonday.home.att.net/code/libmal/libmal-0.31.tar.gz Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: libmal-0.31-64bit.patch # pilot-link-0.12 fixes Patch2: libmal-0.31-pi12.patch BuildRequires: pilot-link-devel %description A convenience library of the object files contained in Tom Whittaker's malsync distribution, along with a few wrapper functions. %package devel Summary: Header and library files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} %description devel %{summary}. %prep %setup -q %patch1 -p1 -b .64bits %patch2 -p1 -b .pi12 %build %configure --disable-static make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT ## Unpackaged files rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc AUTHORS ChangeLog NEWS README TODO %{_libdir}/lib*.so.* %files devel %defattr(-,root,root) %{_libdir}/lib*.so %{_includedir}/* %changelog * Mon Oct 31 2005 Rex Dieter 0.31-1 - cleanup for Extras * Tue Jun 14 2005 Rex Dieter 0.31-0.1 - pilot-link-0.12 fixes * Thu Dec 16 2004 Rex Dieter 0.31-0.fdr.3 - fix 64 builds (for finding pilot-link libs) * Wed Jul 21 2004 Rex Dieter 0.31-0.fdr.2 - nuke .la file(s). - --disable-static * Fri Oct 17 2003 Rex Dieter 0.31-0.fdr.1 - first try Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmal/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 22 Mar 2006 15:21:56 -0000 1.1 +++ .cvsignore 22 Mar 2006 15:22:43 -0000 1.2 @@ -0,0 +1 @@ +libmal-0.31.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmal/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 22 Mar 2006 15:21:56 -0000 1.1 +++ sources 22 Mar 2006 15:22:43 -0000 1.2 @@ -0,0 +1 @@ +3d1fd0a5ece6de47d55df5829ee8b6a2 libmal-0.31.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 15:22:22 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:22:22 -0500 Subject: rpms/libmal import.log,1.1,1.2 Message-ID: <200603221523.k2MFNJwl022279@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22237 Modified Files: import.log Log Message: auto-import libmal-0.31-1 on branch devel from libmal-0.31-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/libmal/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 22 Mar 2006 15:21:48 -0000 1.1 +++ import.log 22 Mar 2006 15:22:22 -0000 1.2 @@ -0,0 +1 @@ +libmal-0_31-1:HEAD:libmal-0.31-1.src.rpm:1143040939 From fedora-extras-commits at redhat.com Wed Mar 22 15:29:06 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Wed, 22 Mar 2006 10:29:06 -0500 Subject: rpms/octave-forge/devel .cvsignore, 1.6, 1.7 octave-forge.spec, 1.20, 1.21 sources, 1.6, 1.7 octave-forge-2006.01.28.patch, 1.3, NONE Message-ID: <200603221529.k2MFTcjH022430@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave-forge/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22379 Modified Files: .cvsignore octave-forge.spec sources Removed Files: octave-forge-2006.01.28.patch Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 17 Feb 2006 13:43:31 -0000 1.6 +++ .cvsignore 22 Mar 2006 15:29:05 -0000 1.7 @@ -1,2 +1 @@ -octave-forge-2006.01.28.patched.tar.gz -octave-forge-2006.01.28-fixed.patch.gz +octave-forge-2006.03.17.patched.tar.gz Index: octave-forge.spec =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- octave-forge.spec 18 Feb 2006 06:46:36 -0000 1.20 +++ octave-forge.spec 22 Mar 2006 15:29:05 -0000 1.21 @@ -1,6 +1,6 @@ Name: octave-forge -Version: 2006.01.28 -Release: 5%{?dist} +Version: 2006.03.17 +Release: 1%{?dist} Summary: Contributed functions for octave Group: Applications/Engineering @@ -15,8 +15,6 @@ ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version} ## rm -Rf octave-forge-%{version} Source0: %{name}-%{version}.patched.tar.gz -Patch0: %{name}-2006.01.28.patch -Patch1: %{name}-2006.01.28-fixed.patch.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: octave >= 2.9.4 ImageMagick @@ -34,11 +32,8 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p0 # The sparse matrix functions are in octave 2.9.x so don't install them touch main/sparse/NOINSTALL -chmod +x admin/octlink.sh %build export CPPFLAGS=-I%{_includedir}/netcdf-3 @@ -72,6 +67,9 @@ %changelog +* Fri Mar 17 2006 Quentin Spencer 2006.03.17-1 +- New release. Remove old patches. + * Sat Feb 18 2006 Quentin Spencer 2006.01.28-5 - Amend patch0 to correctly deal with 64-bit indexing. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave-forge/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 17 Feb 2006 13:43:31 -0000 1.6 +++ sources 22 Mar 2006 15:29:05 -0000 1.7 @@ -1,2 +1 @@ -8192ee6bc3784e35180623592de4303f octave-forge-2006.01.28.patched.tar.gz -fb0c7cc8f4d759ef0de76c8218583a32 octave-forge-2006.01.28-fixed.patch.gz +a1e76ab52fb9894586d6a7a0dc15e603 octave-forge-2006.03.17.patched.tar.gz --- octave-forge-2006.01.28.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 15:29:13 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:29:13 -0500 Subject: owners owners.list,1.756,1.757 Message-ID: <200603221529.k2MFTkgZ022436@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22394 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.756 retrieving revision 1.757 diff -u -r1.756 -r1.757 --- owners.list 22 Mar 2006 07:39:13 -0000 1.756 +++ owners.list 22 Mar 2006 15:29:13 -0000 1.757 @@ -581,6 +581,7 @@ Fedora Extras|libkexif|Allow Kipi plugins to extract EXIF information|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libkipi|Common plugin infrastructure for KDE image applications|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|libksba|X.509 library|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|libmal|A convenience library for malsync|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|libmatchbox|All font and image operations are provided to other Matchbox packages via libmatchbox|toniw at iki.fi|extras-qa at fedoraproject.org| Fedora Extras|libmatroska|An open Audio/Video container format|anvil at livna.org|extras-qa at fedoraproject.org| Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 22 15:33:38 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 10:33:38 -0500 Subject: rpms/libmal/devel libmal.spec,1.1,1.2 Message-ID: <200603221534.k2MFYAdl022558@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22537 Modified Files: libmal.spec Log Message: * Wed Mar 22 2006 Rex Dieter 0.31-2 - capitalize summary - drop empty %doc's: AUTHORS NEWS TODO Index: libmal.spec =================================================================== RCS file: /cvs/extras/rpms/libmal/devel/libmal.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmal.spec 22 Mar 2006 15:22:43 -0000 1.1 +++ libmal.spec 22 Mar 2006 15:33:38 -0000 1.2 @@ -1,10 +1,10 @@ -Summary: a convenience library for malsync +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 Version: 0.31 -Release: 1%{?dist} +Release: 2%{?dist} License: MPL Url: http://jasonday.home.att.net/code/libmal/ @@ -62,17 +62,23 @@ %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog NEWS README TODO +%defattr(-,root,root,-) +%doc ChangeLog README +#empties +#doc AUTHORS NEWS TODO %{_libdir}/lib*.so.* %files devel -%defattr(-,root,root) +%defattr(-,root,root,-) %{_libdir}/lib*.so %{_includedir}/* %changelog +* Wed Mar 22 2006 Rex Dieter 0.31-2 +- capitalize summary +- drop empty %%doc's: AUTHORS NEWS TODO + * Mon Oct 31 2005 Rex Dieter 0.31-1 - cleanup for Extras From fedora-extras-commits at redhat.com Wed Mar 22 16:10:21 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 11:10:21 -0500 Subject: rpms/gpa/devel gpa-0.7.3-dt.patch, NONE, 1.1 gpa-0.7.3-keyservers.patch, NONE, 1.1 Message-ID: <200603221610.k2MGAOde024769@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24754 Added Files: gpa-0.7.3-dt.patch gpa-0.7.3-keyservers.patch Log Message: import new patches gpa-0.7.3-dt.patch: --- NEW FILE gpa-0.7.3-dt.patch --- --- gpa-0.7.3/gpa.desktop.dt 2005-10-06 10:17:35.000000000 -0500 +++ gpa-0.7.3/gpa.desktop 2006-03-22 10:03:33.000000000 -0600 @@ -2,7 +2,7 @@ Name=GNU Privacy Assistant Name[en_US.ISO8859-1]=GNU Privacy Assistant Exec=gpa -Icon=gpa.png +Icon=gpa Terminal=false Encoding=UTF-8 Type=Application gpa-0.7.3-keyservers.patch: --- NEW FILE gpa-0.7.3-keyservers.patch --- --- gpa-0.7.3/src/keyserver.c.pgp.mit.edu 2006-01-30 03:37:34.000000000 -0600 +++ gpa-0.7.3/src/keyserver.c 2006-03-22 09:54:31.000000000 -0600 @@ -179,6 +179,7 @@ add_server (&serverlist, "hkp://subkeys.pgp.net"); add_server (&serverlist, "ldap://keyserver.pgp.com"); + add_server (&serverlist, "hkp://pgp.mit.edu"); } return rc; From fedora-extras-commits at redhat.com Wed Mar 22 16:11:33 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Wed, 22 Mar 2006 11:11:33 -0500 Subject: rpms/gpa/devel .cvsignore, 1.2, 1.3 gpa.spec, 1.7, 1.8 sources, 1.2, 1.3 gpa-keytable-init.patch, 1.1, NONE Message-ID: <200603221612.k2MGC6ba024820@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/gpa/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24792 Modified Files: .cvsignore gpa.spec sources Removed Files: gpa-keytable-init.patch Log Message: * Wed Mar 22 2006 Rex Dieter 0.7.3-1 - 0.7.3 (development release) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gpa/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:28:52 -0000 1.2 +++ .cvsignore 22 Mar 2006 16:11:33 -0000 1.3 @@ -1 +1,2 @@ -gpa-0.7.0.tar.gz +gpa-0.7.3.tar.bz2 +gpa-0.7.3.tar.bz2.sig Index: gpa.spec =================================================================== RCS file: /cvs/extras/rpms/gpa/devel/gpa.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gpa.spec 27 Feb 2006 21:01:01 -0000 1.7 +++ gpa.spec 22 Mar 2006 16:11:33 -0000 1.8 @@ -1,18 +1,19 @@ -Name: gpa -Summary: Graphical user interface for GnuPG -Version: 0.7.0 -Release: 5%{?dist} - -License: GPL -Group: Applications/System -URL: http://www.gnupg.org/related_software/gpa/ -Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-0.7.0.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source1: gpa.desktop -Patch0: gpa-keyservers.patch -Patch1: gpa-keytable-init.patch +Name: gpa +Summary: Graphical user interface for GnuPG +Version: 0.7.3 +Release: 1%{?dist} + +License: GPL +Group: Applications/System +URL: http://www.gnupg.org/related_software/gpa/ +#Source0: ftp://ftp.gnupg.org/gcrypt/alpha/gpa/gpa-%{version}.tar.gz +Source0: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2 +Source1: http://wald.intevation.org/frs/download.php/152/gpa-%{version}.tar.bz2.sig +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch1: gpa-0.7.3-keyservers.patch +Patch2: gpa-0.7.3-dt.patch BuildRequires: gtk2-devel BuildRequires: zlib-devel @@ -29,8 +30,8 @@ %prep %setup -q -%patch0 -p0 -%patch1 -p1 +%patch1 -p1 -b .keyservers +%patch2 -p1 -b .dt %build @@ -44,12 +45,14 @@ make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-install --vendor fedora \ +desktop-file-install \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Fedora \ - %{SOURCE1} + --vendor fedora --add-category X-Fedora \ + --delete-original \ + $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop -install -p -m644 -D gpa-logo-48x48.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +install -p -m644 -D gpa.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gpa.png +rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gpa.png %find_lang %{name} @@ -77,6 +80,9 @@ %changelog +* Wed Mar 22 2006 Rex Dieter 0.7.3-1 +- 0.7.3 (development release) + * Mon Feb 27 2006 Rex Dieter 0.7.0-5 - follow fdo icon spec - drop superfluous BR: gnupg Index: sources =================================================================== RCS file: /cvs/extras/rpms/gpa/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:28:52 -0000 1.2 +++ sources 22 Mar 2006 16:11:33 -0000 1.3 @@ -1 +1,2 @@ -44cb60cba64a48837588ed27f8db08b2 gpa-0.7.0.tar.gz +a3626266f9dda506445c7297c4172a65 gpa-0.7.3.tar.bz2 +68d7cafe71c21a386109878c206e4016 gpa-0.7.3.tar.bz2.sig --- gpa-keytable-init.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 16:22:26 2006 From: fedora-extras-commits at redhat.com (Oliver Falk (oliver)) Date: Wed, 22 Mar 2006 11:22:26 -0500 Subject: owners owners.list,1.757,1.758 Message-ID: <200603221622.k2MGMwAf025110@cvs-int.fedora.redhat.com> Author: oliver Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25078 Modified Files: owners.list Log Message: * Add missing perl-YAML-Parser-Syck Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.757 retrieving revision 1.758 diff -u -r1.757 -r1.758 --- owners.list 22 Mar 2006 15:29:13 -0000 1.757 +++ owners.list 22 Mar 2006 16:22:25 -0000 1.758 @@ -1102,6 +1102,7 @@ Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|ville.skytta at iki.fi|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|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com 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|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 22 16:25:13 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 22 Mar 2006 11:25:13 -0500 Subject: rpms/highlight/FC-4 .cvsignore, 1.3, 1.4 highlight.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603221625.k2MGPj93025178@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25153 Modified Files: .cvsignore highlight.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 12 Mar 2006 20:14:31 -0000 1.3 +++ .cvsignore 22 Mar 2006 16:25:13 -0000 1.4 @@ -1 +1 @@ -highlight-2.4.4.tar.gz +highlight-2.4.5.tar.gz Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/highlight.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- highlight.spec 15 Mar 2006 16:30:24 -0000 1.9 +++ highlight.spec 22 Mar 2006 16:25:13 -0000 1.10 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.4.4 -Release: 2%{?dist} +Version: 2.4.5 +Release: 1%{?dist} Group: Development/Tools License: GPL @@ -10,7 +10,6 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch -Patch3: highlight-2.4-fixcodegen.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -26,7 +25,6 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -51,8 +49,11 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Mar 22 2006 Jochen Schmitt 2.4.5-1 +- New upstream relase + * Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 -- Add fixcodegen patch #184245 +- Add fixcodegen patch from Eric Hopper #184245 * Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 20:14:31 -0000 1.5 +++ sources 22 Mar 2006 16:25:13 -0000 1.6 @@ -1 +1 @@ -c2ea3c4a11a76379d73bd4bccd6c3228 highlight-2.4.4.tar.gz +c62385c80fd0088a7798875aa0f9a460 highlight-2.4.5.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 16:28:48 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 22 Mar 2006 11:28:48 -0500 Subject: rpms/highlight/FC-5 .cvsignore, 1.5, 1.6 highlight.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200603221629.k2MGTKdO025261@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25237 Modified Files: .cvsignore highlight.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Mar 2006 20:09:47 -0000 1.5 +++ .cvsignore 22 Mar 2006 16:28:48 -0000 1.6 @@ -1 +1 @@ -highlight-2.4.4.tar.gz +highlight-2.4.5.tar.gz Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-5/highlight.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- highlight.spec 15 Mar 2006 16:28:28 -0000 1.12 +++ highlight.spec 22 Mar 2006 16:28:48 -0000 1.13 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.4.4 -Release: 2%{?dist} +Version: 2.4.5 +Release: 1%{?dist} Group: Development/Tools License: GPL @@ -10,7 +10,6 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch -Patch3: highlight-2.4-fixcodegen.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -26,7 +25,6 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -51,8 +49,11 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Mar 22 2006 Jochen Schmitt 2.4.5-1 +- New upstream relase + * Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 -- Add fixcodegen patch #184245 +- Add fixcodegen patch from Eric Hopper #184245 * Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 20:09:47 -0000 1.5 +++ sources 22 Mar 2006 16:28:48 -0000 1.6 @@ -1 +1 @@ -c2ea3c4a11a76379d73bd4bccd6c3228 highlight-2.4.4.tar.gz +c62385c80fd0088a7798875aa0f9a460 highlight-2.4.5.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 16:31:14 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 22 Mar 2006 11:31:14 -0500 Subject: rpms/highlight/devel .cvsignore, 1.5, 1.6 highlight.spec, 1.12, 1.13 sources, 1.5, 1.6 Message-ID: <200603221631.k2MGVkqa025346@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25325 Modified Files: .cvsignore highlight.spec sources Log Message: New upstream release Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 12 Mar 2006 20:09:47 -0000 1.5 +++ .cvsignore 22 Mar 2006 16:31:13 -0000 1.6 @@ -1 +1 @@ -highlight-2.4.4.tar.gz +highlight-2.4.5.tar.gz Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- highlight.spec 15 Mar 2006 16:28:28 -0000 1.12 +++ highlight.spec 22 Mar 2006 16:31:13 -0000 1.13 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter -Version: 2.4.4 -Release: 2%{?dist} +Version: 2.4.5 +Release: 1%{?dist} Group: Development/Tools License: GPL @@ -10,7 +10,6 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch -Patch3: highlight-2.4-fixcodegen.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -26,7 +25,6 @@ %setup -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -51,8 +49,11 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog +* Wed Mar 22 2006 Jochen Schmitt 2.4.5-1 +- New upstream relase + * Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 -- Add fixcodegen patch #184245 +- Add fixcodegen patch from Eric Hopper #184245 * Sun Mar 12 2006 Jochen Schmitt 2.4.4-1 - New upstream release Index: sources =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 12 Mar 2006 20:09:47 -0000 1.5 +++ sources 22 Mar 2006 16:31:13 -0000 1.6 @@ -1 +1 @@ -c2ea3c4a11a76379d73bd4bccd6c3228 highlight-2.4.4.tar.gz +c62385c80fd0088a7798875aa0f9a460 highlight-2.4.5.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 17:22:59 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 22 Mar 2006 12:22:59 -0500 Subject: rpms/highlight/devel highlight-2.4-gcc41.patch, NONE, 1.1 highlight.spec, 1.13, 1.14 highlight-2.4-fixcodegen.patch, 1.1, NONE Message-ID: <200603221723.k2MHNXah027690@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27668 Modified Files: highlight.spec Added Files: highlight-2.4-gcc41.patch Removed Files: highlight-2.4-fixcodegen.patch Log Message: Add gcc41 patch highlight-2.4-gcc41.patch: --- NEW FILE highlight-2.4-gcc41.patch --- --- highlight-2.4.5/highlight/codegenerator.h.org 2006-03-22 17:45:01.000000000 +0100 +++ highlight-2.4.5/highlight/codegenerator.h 2006-03-22 17:50:02.000000000 +0100 @@ -248,7 +248,7 @@ string &getTitle(); /** \param p HTML anchor prefix */ - void CodeGenerator::setHTMLAnchorPrefix(const string & p); + void setHTMLAnchorPrefix(const string & p); protected: CodeGenerator(highlight::OutputType type); Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/devel/highlight.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- highlight.spec 22 Mar 2006 16:31:13 -0000 1.13 +++ highlight.spec 22 Mar 2006 17:22:58 -0000 1.14 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch +Patch3: highlight-2.4-gcc41.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -25,6 +26,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -49,8 +51,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog -* Wed Mar 22 2006 Jochen Schmitt 2.4.5-1 +* Wed Mar 22 2006 Jochen Schmitt 2.4.5-2 - New upstream relase +- Add gcc41 patch * Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 - Add fixcodegen patch from Eric Hopper #184245 --- highlight-2.4-fixcodegen.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 17:36:28 2006 From: fedora-extras-commits at redhat.com (Jochen Schmitt (s4504kr)) Date: Wed, 22 Mar 2006 12:36:28 -0500 Subject: rpms/highlight/FC-5 highlight-2.4-gcc41.patch, NONE, 1.1 highlight.spec, 1.13, 1.14 highlight-2.4-fixcodegen.patch, 1.1, NONE Message-ID: <200603221737.k2MHb0VA028145@cvs-int.fedora.redhat.com> Author: s4504kr Update of /cvs/extras/rpms/highlight/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28104 Modified Files: highlight.spec Added Files: highlight-2.4-gcc41.patch Removed Files: highlight-2.4-fixcodegen.patch Log Message: Add gcc41 patch highlight-2.4-gcc41.patch: --- NEW FILE highlight-2.4-gcc41.patch --- --- highlight-2.4.5/highlight/codegenerator.h.org 2006-03-22 17:45:01.000000000 +0100 +++ highlight-2.4.5/highlight/codegenerator.h 2006-03-22 17:50:02.000000000 +0100 @@ -248,7 +248,7 @@ string &getTitle(); /** \param p HTML anchor prefix */ - void CodeGenerator::setHTMLAnchorPrefix(const string & p); + void setHTMLAnchorPrefix(const string & p); protected: CodeGenerator(highlight::OutputType type); Index: highlight.spec =================================================================== RCS file: /cvs/extras/rpms/highlight/FC-5/highlight.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- highlight.spec 22 Mar 2006 16:28:48 -0000 1.13 +++ highlight.spec 22 Mar 2006 17:36:28 -0000 1.14 @@ -1,7 +1,7 @@ Name: highlight Summary: Universal source code to formatted text converter Version: 2.4.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Development/Tools License: GPL @@ -10,6 +10,7 @@ Source0: http://www.andre-simon.de/zip/%{name}-%{version}.tar.gz Patch1: highlight-2.4-makefile.patch Patch2: highlight-2.4-rpmoptflags.patch +Patch3: highlight-2.4-gcc41.patch Buildroot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n) @@ -25,6 +26,7 @@ %setup -q %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build make %{?_smp_mflags} LDFLAGS= @@ -49,8 +51,9 @@ %doc ChangeLog AUTHORS README* COPYING TODO examples/ %changelog -* Wed Mar 22 2006 Jochen Schmitt 2.4.5-1 +* Wed Mar 22 2006 Jochen Schmitt 2.4.5-2 - New upstream relase +- Add gcc41 patch * Wed Mar 15 2006 Jochen Schmitt 2.4.4-2 - Add fixcodegen patch from Eric Hopper #184245 --- highlight-2.4-fixcodegen.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 17:39:43 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 22 Mar 2006 12:39:43 -0500 Subject: rpms/fftw3 Makefile,1.1,NONE import.log,1.2,NONE Message-ID: <200603221739.k2MHdj4V028240@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/fftw3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28225 Removed Files: Makefile import.log Log Message: Removing files. --- Makefile DELETED --- --- import.log DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 17:45:51 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 22 Mar 2006 12:45:51 -0500 Subject: rpms/fftw3/FC-4 .cvsignore, 1.2, NONE Makefile, 1.1, NONE branch, 1.1, NONE fftw3.spec, 1.2, NONE sources, 1.2, NONE Message-ID: <200603221745.k2MHjroK028313@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/fftw3/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302/FC-4 Removed Files: .cvsignore Makefile branch fftw3.spec sources Log Message: More removals. --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- fftw3.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 17:45:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 22 Mar 2006 12:45:57 -0500 Subject: rpms/fftw3/FC-5 .cvsignore, 1.3, NONE Makefile, 1.1, NONE branch, 1.1, NONE fftw3.spec, 1.3, NONE sources, 1.3, NONE Message-ID: <200603221745.k2MHjxPq028330@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/fftw3/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302/FC-5 Removed Files: .cvsignore Makefile branch fftw3.spec sources Log Message: More removals. --- .cvsignore DELETED --- --- Makefile DELETED --- --- branch DELETED --- --- fftw3.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 17:46:02 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 22 Mar 2006 12:46:02 -0500 Subject: rpms/fftw3/devel .cvsignore, 1.3, NONE Makefile, 1.1, NONE fftw3.spec, 1.3, NONE sources, 1.3, NONE Message-ID: <200603221746.k2MHk5LJ028345@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/fftw3/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28302/devel Removed Files: .cvsignore Makefile fftw3.spec sources Log Message: More removals. --- .cvsignore DELETED --- --- Makefile DELETED --- --- fftw3.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 18:01:14 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 22 Mar 2006 13:01:14 -0500 Subject: rpms/gdesklets/FC-3 .cvsignore, 1.3, NONE Makefile, 1.1, NONE NullObject-1.0-fix.patch, 1.1, NONE branch, 1.1, NONE gdesklets.spec, 1.4, NONE sources, 1.3, NONE Message-ID: <200603221801.k2MI1GVr030037@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/gdesklets/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28572/FC-3 Removed Files: .cvsignore Makefile NullObject-1.0-fix.patch branch gdesklets.spec sources Log Message: removing files --- .cvsignore DELETED --- --- Makefile DELETED --- --- NullObject-1.0-fix.patch DELETED --- --- branch DELETED --- --- gdesklets.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Wed Mar 22 19:26:58 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 22 Mar 2006 14:26:58 -0500 Subject: owners owners.list,1.758,1.759 Message-ID: <200603221927.k2MJRUUZ000984@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv967/owners Modified Files: owners.list Log Message: Remove libgsf113 add dumb Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.758 retrieving revision 1.759 diff -u -r1.758 -r1.759 --- owners.list 22 Mar 2006 16:22:25 -0000 1.758 +++ owners.list 22 Mar 2006 19:26:58 -0000 1.759 @@ -198,6 +198,7 @@ Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org| Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|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|duplicity|Untrusted/encrypted backup using rsync algorithm|extras-orphan 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| @@ -573,7 +574,6 @@ Fedora Extras|libgnomemm26|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|libgnomeuimm20|A C++ interface for Gnome libs (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org| 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|libgsf113|GNOME Structured File library 1.13|j.w.r.degoede at hhs.nl|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|libifp|A general-purpose library-driver for iRiver's iFP portable audio players|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 22 19:17:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 22 Mar 2006 14:17:35 -0500 Subject: rpms/lacewing/devel lacewing.spec,1.3,1.4 Message-ID: <200603221918.k2MJI8NZ000745@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lacewing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv725 Modified Files: lacewing.spec Log Message: * Wed Mar 22 2006 Hans de Goede 1.10-5 - Change fullscreen patch to not change to window / fullscreen untill the menu is left. - Fix all warnings. Index: lacewing.spec =================================================================== RCS file: /cvs/extras/rpms/lacewing/devel/lacewing.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- lacewing.spec 22 Mar 2006 19:10:49 -0000 1.3 +++ lacewing.spec 22 Mar 2006 19:17:35 -0000 1.4 @@ -12,6 +12,7 @@ Patch0: lacewing.patch Patch1: lacewing-fullscreen.patch Patch2: lacewing-nicecpu.patch +Patch3: lacewing-warn.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: allegro-devel desktop-file-utils @@ -31,6 +32,7 @@ %patch0 -p1 -z .unix %patch1 -p1 -z .fullscreen %patch2 -p1 -z .nicecpu +%patch3 -p1 -z .warn %{__sed} -i 's/\r//' readme.txt licence.txt chmod 644 readme.txt licence.txt @@ -84,6 +86,7 @@ * Wed Mar 22 2006 Hans de Goede 1.10-5 - Change fullscreen patch to not change to window / fullscreen untill the menu is left. +- Fix all warnings. * Mon Feb 13 2006 Hans de Goede 1.10-4 - Bump release and rebuild for new gcc4.1 and glibc. From fedora-extras-commits at redhat.com Wed Mar 22 19:22:08 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Wed, 22 Mar 2006 14:22:08 -0500 Subject: fedora-security/audit fc4,1.178,1.179 fc5,1.91,1.92 Message-ID: <200603221922.k2MJM8d7000935@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv905 Modified Files: fc4 fc5 Log Message: Note the sendmail update. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- fc4 22 Mar 2006 10:22:00 -0000 1.178 +++ fc4 22 Mar 2006 19:22:01 -0000 1.179 @@ -88,6 +88,7 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] patch-2.6.15.5 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) +CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-194] CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0040 VULNERABLE (gtkhtml) CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.91 retrieving revision 1.92 diff -u -r1.91 -r1.92 --- fc5 22 Mar 2006 10:22:00 -0000 1.91 +++ fc5 22 Mar 2006 19:22:01 -0000 1.92 @@ -91,6 +91,7 @@ CVE-2006-0096 ignore (kernel) minor and requires root CVE-2006-0095 backport (kernel) patch-2.6.16-rc6 CVE-2006-0082 version (ImageMagick, not 6.2.5.4) +CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-193] CVE-2006-0049 version (gnupg, fixed 1.4.2.2) CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 From fedora-extras-commits at redhat.com Wed Mar 22 19:21:19 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 22 Mar 2006 14:21:19 -0500 Subject: rpms/lacewing/devel lacewing-warn.patch,NONE,1.1 Message-ID: <200603221921.k2MJLLbQ000818@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lacewing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv797 Added Files: lacewing-warn.patch Log Message: * Wed Mar 22 2006 Hans de Goede 1.10-5 - Change fullscreen patch to not change to window / fullscreen untill the menu is left. - Fix all warnings. lacewing-warn.patch: --- NEW FILE lacewing-warn.patch --- --- lacewing-1.10/actor.c.warn 2003-11-25 03:28:14.000000000 +0100 +++ lacewing-1.10/actor.c 2006-03-22 20:11:29.000000000 +0100 @@ -536,7 +536,7 @@ // ysin2 = sin(angle_to_radians(actor[a].angle)) * GRAIN; // } - int target_x, target_y; + int target_x = 0, target_y = 0; float speed_mult; int accel = 0; --- lacewing-1.10/cmds.c.warn 2003-11-25 12:25:16.000000000 +0100 +++ lacewing-1.10/cmds.c 2006-03-22 20:11:29.000000000 +0100 @@ -1183,7 +1183,7 @@ { int special1; - int special2; + int special2 = 0; int special3; int special4; special5 *= 2; @@ -1354,9 +1354,9 @@ { int special1; int special2; - int special3; - int special4; - int special5; + int special3 = 0; + int special4 = 0; + int special5 = 0; timer += grand(4); --- lacewing-1.10/displ_in.c.warn 2006-03-22 20:11:29.000000000 +0100 +++ lacewing-1.10/displ_in.c 2006-03-22 20:11:29.000000000 +0100 @@ -85,9 +85,7 @@ void init_display(void) { - RGB temp_palette2 [1024]; RGB temp_palette [256]; - RGB temp_palette3 [1024]; DATAFILE *datf = load_datafile(DATADIR "gfx/data.dat"); if (datf == NULL) @@ -426,7 +424,7 @@ // else blit(source_bmp, temp_bmp, which_ship * 51 + 1, 1, 0, 0, 49, 49); - int i, x, y, px, base_col; + int i, x, y, px, base_col = 0; for (i = 0; i < 5; i ++) { --- lacewing-1.10/display.c.warn 2006-03-22 20:11:29.000000000 +0100 +++ lacewing-1.10/display.c 2006-03-22 20:11:30.000000000 +0100 @@ -3181,7 +3181,7 @@ // return; int i; - int col1, col2; + int col1 = 0, col2 = 0; int count; int count_x; int k; --- lacewing-1.10/enemy.c.warn 2003-11-25 01:51:16.000000000 +0100 +++ lacewing-1.10/enemy.c 2006-03-22 20:11:30.000000000 +0100 @@ -4440,8 +4440,6 @@ int speed = 0; int speed_div = 5; int mass; - int seed; - int status; int displaced = 0; int colours [4] = {COLOUR_GREEN8, COLOUR_GREEN6, COLOUR_GREEN4, COLOUR_GREEN2}; int colours_for_cloud [5] = {COLOUR_GREEN8, COLOUR_GREEN6, COLOUR_GREEN4, COLOUR_GREEN2, COLOUR_GREEN1}; @@ -5685,7 +5683,7 @@ create_bullet(btype, x, y, xs, ys, OWNER_ENEMY, damage, timer + grand(timer_rand), mass, firing_angle, - status, seed, colours, speed_div, special1,special2,special3,special4,special5); + 0, grand(256), colours, speed_div, special1,special2,special3,special4,special5); } @@ -5737,7 +5735,7 @@ int subtype = enemy[e].subtype; int carrying_pickup = enemy[e].carrying_pickup; int special [10]; - int change_to; + int change_to = 0; switch(enemy[e].type) { --- lacewing-1.10/palette.c.warn 2006-03-22 20:11:59.000000000 +0100 +++ lacewing-1.10/palette.c 2006-03-22 20:11:59.000000000 +0100 @@ -79,12 +79,7 @@ int limit_colour(int colour_input); int average_colours(int colour1, int colour2); -RGB other_palet [1324]; RGB palet [256]; -RGB other_palet2 [2048]; -// what seems to be a weird bug in Allegro forces me to put padding around -// the palet array, or it becomes corrupted. The same thing happened in -// World of Violence and I have no idea why. int adjust_lit_colour(int col, int lit); int add_light_to_colour(int col, int lit); From fedora-extras-commits at redhat.com Wed Mar 22 19:10:49 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 22 Mar 2006 14:10:49 -0500 Subject: rpms/lacewing/devel lacewing-fullscreen.patch, 1.1, 1.2 lacewing.spec, 1.2, 1.3 Message-ID: <200603221911.k2MJBNLc000579@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/lacewing/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv555 Modified Files: lacewing-fullscreen.patch lacewing.spec Log Message: * Wed Mar 22 2006 Hans de Goede 1.10-5 - Change fullscreen patch to not change to window / fullscreen untill the menu is left. lacewing-fullscreen.patch: Index: lacewing-fullscreen.patch =================================================================== RCS file: /cvs/extras/rpms/lacewing/devel/lacewing-fullscreen.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lacewing-fullscreen.patch 30 Jan 2006 21:34:11 -0000 1.1 +++ lacewing-fullscreen.patch 22 Mar 2006 19:10:49 -0000 1.2 @@ -1,17 +1,5 @@ -diff -ur lacewing.orig/config.h lacewing/config.h ---- lacewing.orig/config.h 2006-01-21 13:00:59.000000000 +0100 -+++ lacewing/config.h 2006-01-21 11:19:54.000000000 +0100 -@@ -792,6 +792,7 @@ - int run_vsync; // on or off - int sound_volume; // sound fx volume; if 0 sound effects not played - int ambience_volume; // if 0 ambience not played -+ int windowed; // GFX_AUTODETECT_FULLSCREEN or GFX_AUTODETECT_WINDOWED - }; - - struct starstruct -diff -ur lacewing.orig/main.c lacewing/main.c ---- lacewing.orig/main.c 2006-01-21 13:00:59.000000000 +0100 -+++ lacewing/main.c 2006-01-21 11:20:18.000000000 +0100 +--- lacewing-1.10/main.c.fullscreen 2006-02-28 23:01:57.000000000 +0100 ++++ lacewing-1.10/main.c 2006-02-28 23:03:21.000000000 +0100 @@ -245,7 +245,7 @@ set_color_depth(8); @@ -21,9 +9,8 @@ { set_gfx_mode(GFX_TEXT, 0, 0, 0, 0); allegro_message("Unable to set 640x480 mode\n%s\n", allegro_error); -diff -ur lacewing.orig/menu.c lacewing/menu.c ---- lacewing.orig/menu.c 2006-01-21 13:00:59.000000000 +0100 -+++ lacewing/menu.c 2006-01-21 11:54:18.000000000 +0100 +--- lacewing-1.10/menu.c.fullscreen 2006-02-28 23:01:57.000000000 +0100 ++++ lacewing-1.10/menu.c 2006-02-28 23:05:23.000000000 +0100 @@ -61,6 +61,7 @@ #define KP_WAIT_SHORT 5 @@ -32,7 +19,23 @@ enum { -@@ -604,7 +605,7 @@ +@@ -124,6 +125,7 @@ + int menu_index; + int menu_index_max; + int menu_index_min; ++int last_main_menu_index; + int keypress_wait; + int last_key; + int check_key(int scode); +@@ -327,6 +329,7 @@ + which_menu = MENU_MAIN; + menu_index_max = 4; + menu_index_min = 0; ++ last_main_menu_index = menu_index = 0; + keypress_wait = KP_WAIT_LONG; + + do +@@ -604,7 +610,7 @@ char ostr [50]; char istr [10]; @@ -41,7 +44,7 @@ { col = COLOUR_GREEN6; -@@ -663,114 +664,121 @@ +@@ -663,114 +669,121 @@ strcat(ostr, itoa(options.ambience_volume, istr, 10)); break; case 4: @@ -190,7 +193,7 @@ strcpy(ostr, "Exit"); break; -@@ -798,10 +806,10 @@ +@@ -798,10 +811,10 @@ { // case 5: // case 6: @@ -204,7 +207,15 @@ return 1; } -@@ -1116,13 +1124,13 @@ +@@ -1076,6 +1089,7 @@ + + void menu_trigger(void) + { ++ static char must_change_video_mode = FALSE; + + keypress_wait = KP_WAIT_LONG; + +@@ -1116,13 +1130,25 @@ } break; case MENU_OPTIONS: @@ -212,6 +223,18 @@ + if (menu_index == 32) { play_sound(WAV_MENU2); ++ if (must_change_video_mode) ++ { ++ if (set_gfx_mode(options.windowed, 640, 480, 0, 0) != 0) ++ { ++ set_gfx_mode(GFX_TEXT, 0, 0, 0, 0); ++ allegro_message("Error switching fullscreen / windowed mode\n%s\n", ++ allegro_error); ++ exit(1); ++ } ++ set_palette(palet); ++ must_change_video_mode = FALSE; ++ } change_menu(MENU_MAIN); break; } @@ -220,7 +243,7 @@ { switch(menu_index) { -@@ -1148,18 +1156,33 @@ +@@ -1148,18 +1174,26 @@ play_sound(WAV_MENU1); return; case 4: @@ -229,14 +252,7 @@ + else + options.windowed = GFX_AUTODETECT_WINDOWED; + play_sound(WAV_MENU1); -+ if (set_gfx_mode(options.windowed, 640, 480, 0, 0) != 0) -+ { -+ set_gfx_mode(GFX_TEXT, 0, 0, 0, 0); -+ allegro_message("Error switching fullscreen / windowed mode\n%s\n", -+ allegro_error); -+ exit(1); -+ } -+ set_palette(palet); ++ must_change_video_mode = TRUE; + return; + case 5: if (options.run_vsync == 1) @@ -256,7 +272,7 @@ play_sound(WAV_MENU2); jam_keys(); return; -@@ -1268,7 +1291,7 @@ +@@ -1268,7 +1302,7 @@ if (option_index() == -1) return; @@ -265,7 +281,7 @@ player[0].keys [option_index()] = inputted; else player[1].keys [option_index()] = inputted; -@@ -1282,35 +1305,35 @@ +@@ -1282,35 +1316,35 @@ { switch(menu_index) { @@ -312,7 +328,25 @@ return CMD_LINK; } -@@ -1391,7 +1414,7 @@ +@@ -1373,6 +1409,8 @@ + + void change_menu(int to_which) + { ++ if (which_menu == MENU_MAIN) ++ last_main_menu_index = menu_index; + + which_menu = to_which; + keypress_wait = KP_WAIT_LONG; +@@ -1383,7 +1421,7 @@ + case MENU_MAIN: + game.type = GAME_SINGLE; + which_menu = MENU_MAIN; +- menu_index = 0; ++ menu_index = last_main_menu_index; + menu_index_max = 4; + menu_index_min = 0; + save_config(); +@@ -1391,7 +1429,7 @@ case MENU_OPTIONS: which_menu = MENU_OPTIONS; menu_index = 1; @@ -321,7 +355,7 @@ menu_index_min = 1; break; case MENU_DUEL: -@@ -2827,6 +2850,7 @@ +@@ -2827,6 +2865,7 @@ options.run_vsync = get_config_int("Options", "Run_vsync", 0); options.sound_volume = get_config_int("Options", "Sound_volume", 100); options.ambience_volume = get_config_int("Options", "Ambience_volume", 100); @@ -329,7 +363,7 @@ for (i = 0; i < NO_CMDS; i ++) { -@@ -2905,6 +2929,7 @@ +@@ -2905,6 +2944,7 @@ set_config_int("Options", "Run_vsync", options.run_vsync); set_config_int("Options", "Sound_volume", options.sound_volume); set_config_int("Options", "Ambience_volume", options.ambience_volume); @@ -337,3 +371,13 @@ for (i = 0; i < NO_CMDS; i ++) { +--- lacewing-1.10/config.h.fullscreen 2006-02-28 23:01:57.000000000 +0100 ++++ lacewing-1.10/config.h 2006-02-28 23:01:57.000000000 +0100 +@@ -792,6 +792,7 @@ + int run_vsync; // on or off + int sound_volume; // sound fx volume; if 0 sound effects not played + int ambience_volume; // if 0 ambience not played ++ int windowed; // GFX_AUTODETECT_FULLSCREEN or GFX_AUTODETECT_WINDOWED + }; + + struct starstruct Index: lacewing.spec =================================================================== RCS file: /cvs/extras/rpms/lacewing/devel/lacewing.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- lacewing.spec 13 Feb 2006 15:43:42 -0000 1.2 +++ lacewing.spec 22 Mar 2006 19:10:49 -0000 1.3 @@ -1,6 +1,6 @@ Name: lacewing Version: 1.10 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Asteroid like game with many different ships Group: Amusements/Games License: GPL @@ -36,7 +36,8 @@ %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" PREFIX=%{_prefix} +make %{?_smp_mflags} PREFIX=%{_prefix} \ + CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations" %install @@ -80,6 +81,10 @@ %{_datadir}/icons/hicolor/48x48/apps/lacewing.png %changelog +* Wed Mar 22 2006 Hans de Goede 1.10-5 +- Change fullscreen patch to not change to window / fullscreen untill + the menu is left. + * Mon Feb 13 2006 Hans de Goede 1.10-4 - Bump release and rebuild for new gcc4.1 and glibc. From fedora-extras-commits at redhat.com Wed Mar 22 20:47:17 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 22 Mar 2006 15:47:17 -0500 Subject: rpms/qps/FC-4 .cvsignore,1.5,1.6 qps.spec,1.5,1.6 sources,1.5,1.6 Message-ID: <200603222047.k2MKlnGc003576@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3514/FC-4 Modified Files: .cvsignore qps.spec sources Log Message: Update to 1.9.14 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Mar 2006 20:27:34 -0000 1.5 +++ .cvsignore 22 Mar 2006 20:47:16 -0000 1.6 @@ -1 +1 @@ -qps-1.9.13.tar.gz +qps-1.9.14.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/qps.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qps.spec 9 Mar 2006 20:27:34 -0000 1.5 +++ qps.spec 22 Mar 2006 20:47:16 -0000 1.6 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.13 +Version: 1.9.14 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3228/qps-1.9.13.tar.gz +Source0: http://kldp.net/frs/download.php/3267/qps-1.9.14.tar.gz Source1: qps.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %changelog +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +- Update to 1.9.14 + * Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Mar 2006 20:27:34 -0000 1.5 +++ sources 22 Mar 2006 20:47:16 -0000 1.6 @@ -1 +1 @@ -4db5051d7880e3cf427b06319dd55676 qps-1.9.13.tar.gz +6c45c290670e8dc938afad1cd013ef81 qps-1.9.14.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 20:47:23 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 22 Mar 2006 15:47:23 -0500 Subject: rpms/qps/FC-5 .cvsignore,1.6,1.7 qps.spec,1.6,1.7 sources,1.6,1.7 Message-ID: <200603222047.k2MKltRw003581@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3514/FC-5 Modified Files: .cvsignore qps.spec sources Log Message: Update to 1.9.14 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Mar 2006 20:27:40 -0000 1.6 +++ .cvsignore 22 Mar 2006 20:47:22 -0000 1.7 @@ -1 +1 @@ -qps-1.9.13.tar.gz +qps-1.9.14.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/qps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qps.spec 9 Mar 2006 20:27:40 -0000 1.6 +++ qps.spec 22 Mar 2006 20:47:22 -0000 1.7 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.13 +Version: 1.9.14 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3228/qps-1.9.13.tar.gz +Source0: http://kldp.net/frs/download.php/3267/qps-1.9.14.tar.gz Source1: qps.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %changelog +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +- Update to 1.9.14 + * Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Mar 2006 20:27:40 -0000 1.6 +++ sources 22 Mar 2006 20:47:22 -0000 1.7 @@ -1 +1 @@ -4db5051d7880e3cf427b06319dd55676 qps-1.9.13.tar.gz +6c45c290670e8dc938afad1cd013ef81 qps-1.9.14.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 20:47:28 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Wed, 22 Mar 2006 15:47:28 -0500 Subject: rpms/qps/devel .cvsignore,1.6,1.7 qps.spec,1.6,1.7 sources,1.6,1.7 Message-ID: <200603222048.k2MKm0RT003586@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/qps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3514/devel Modified Files: .cvsignore qps.spec sources Log Message: Update to 1.9.14 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 9 Mar 2006 20:27:40 -0000 1.6 +++ .cvsignore 22 Mar 2006 20:47:28 -0000 1.7 @@ -1 +1 @@ -qps-1.9.13.tar.gz +qps-1.9.14.tar.gz Index: qps.spec =================================================================== RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qps.spec 9 Mar 2006 20:27:40 -0000 1.6 +++ qps.spec 22 Mar 2006 20:47:28 -0000 1.7 @@ -1,12 +1,12 @@ Name: qps -Version: 1.9.13 +Version: 1.9.14 Release: 1%{?dist} Summary: Visual process status monitor Group: Applications/System License: GPL URL: http://qps.kldp.net/ -Source0: http://kldp.net/frs/download.php/3228/qps-1.9.13.tar.gz +Source0: http://kldp.net/frs/download.php/3267/qps-1.9.14.tar.gz Source1: qps.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -54,6 +54,9 @@ %changelog +* Wed Mar 22 2006 Dawid Gajownik - 1.9.14-1 +- Update to 1.9.14 + * Thu Mar 9 2006 Dawid Gajownik - 1.9.13-1 - Update to 1.9.13 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qps/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 9 Mar 2006 20:27:40 -0000 1.6 +++ sources 22 Mar 2006 20:47:28 -0000 1.7 @@ -1 +1 @@ -4db5051d7880e3cf427b06319dd55676 qps-1.9.13.tar.gz +6c45c290670e8dc938afad1cd013ef81 qps-1.9.14.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 21:17:55 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 22 Mar 2006 16:17:55 -0500 Subject: rpms/gnomad2/devel .cvsignore, 1.4, 1.5 gnomad2.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603222118.k2MLIc2N005867@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5846 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Oct 2005 21:10:32 -0000 1.4 +++ .cvsignore 22 Mar 2006 21:17:54 -0000 1.5 @@ -1 +1 @@ -gnomad2-2.8.2.tar.gz +gnomad2-2.8.3.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/gnomad2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnomad2.spec 14 Feb 2006 16:37:21 -0000 1.5 +++ gnomad2.spec 22 Mar 2006 21:17:54 -0000 1.6 @@ -4,13 +4,13 @@ # test building a Fedora Extras package, define the following # two macros in .rpmmacros: # -# %dist .fc4 -# %fedora 4 +# %dist .fc5 +# %fedora 5 # Name: gnomad2 -Version: 2.8.2 -Release: 2%{?dist} +Version: 2.8.3 +Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs License: GPL @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Tue Feb 14 2006 Linus Walleij 2.8.3-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 - Rebuild for Fedora Extras 5. * Wed Oct 23 2005 Linus Walleij 2.8.2-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Oct 2005 21:10:32 -0000 1.4 +++ sources 22 Mar 2006 21:17:54 -0000 1.5 @@ -1 +1 @@ -c84663cbb45125ad39fe4a2f854de19e gnomad2-2.8.2.tar.gz +cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 21:20:06 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 22 Mar 2006 16:20:06 -0500 Subject: rpms/gnomad2/FC-5 .cvsignore, 1.4, 1.5 gnomad2.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603222120.k2MLKePf005949@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5921 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Oct 2005 21:10:32 -0000 1.4 +++ .cvsignore 22 Mar 2006 21:20:06 -0000 1.5 @@ -1 +1 @@ -gnomad2-2.8.2.tar.gz +gnomad2-2.8.3.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/gnomad2.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- gnomad2.spec 14 Feb 2006 16:37:21 -0000 1.5 +++ gnomad2.spec 22 Mar 2006 21:20:06 -0000 1.6 @@ -4,13 +4,13 @@ # test building a Fedora Extras package, define the following # two macros in .rpmmacros: # -# %dist .fc4 -# %fedora 4 +# %dist .fc5 +# %fedora 5 # Name: gnomad2 -Version: 2.8.2 -Release: 2%{?dist} +Version: 2.8.3 +Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs License: GPL @@ -77,6 +77,8 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Tue Feb 14 2006 Linus Walleij 2.8.3-1 +- New upstream version. * Tue Feb 14 2006 Linus Walleij 2.8.2-2 - Rebuild for Fedora Extras 5. * Wed Oct 23 2005 Linus Walleij 2.8.2-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Oct 2005 21:10:32 -0000 1.4 +++ sources 22 Mar 2006 21:20:06 -0000 1.5 @@ -1 +1 @@ -c84663cbb45125ad39fe4a2f854de19e gnomad2-2.8.2.tar.gz +cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 21:22:35 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 22 Mar 2006 16:22:35 -0500 Subject: rpms/gnomad2/FC-4 .cvsignore, 1.4, 1.5 gnomad2.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603222123.k2MLN8UE006084@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6058 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Oct 2005 21:11:23 -0000 1.4 +++ .cvsignore 22 Mar 2006 21:22:35 -0000 1.5 @@ -1 +1 @@ -gnomad2-2.8.2.tar.gz +gnomad2-2.8.3.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/gnomad2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnomad2.spec 23 Oct 2005 21:11:23 -0000 1.4 +++ gnomad2.spec 22 Mar 2006 21:22:35 -0000 1.5 @@ -4,12 +4,12 @@ # test building a Fedora Extras package, define the following # two macros in .rpmmacros: # -# %dist .fc4 -# %fedora 4 +# %dist .fc5 +# %fedora 5 # Name: gnomad2 -Version: 2.8.2 +Version: 2.8.3 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,10 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Tue Feb 14 2006 Linus Walleij 2.8.3-1 +- New upstream version. +* Tue Feb 14 2006 Linus Walleij 2.8.2-2 +- Rebuild for Fedora Extras 5. * Wed Oct 23 2005 Linus Walleij 2.8.2-1 - New upstream realease. * Wed Sep 7 2005 Linus Walleij 2.8.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Oct 2005 21:11:23 -0000 1.4 +++ sources 22 Mar 2006 21:22:35 -0000 1.5 @@ -1 +1 @@ -c84663cbb45125ad39fe4a2f854de19e gnomad2-2.8.2.tar.gz +cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 21:24:25 2006 From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel)) Date: Wed, 22 Mar 2006 16:24:25 -0500 Subject: rpms/gnomad2/FC-3 .cvsignore, 1.4, 1.5 gnomad2.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603222124.k2MLOv3b006180@cvs-int.fedora.redhat.com> Author: snirkel Update of /cvs/extras/rpms/gnomad2/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6150 Modified Files: .cvsignore gnomad2.spec sources Log Message: New upstream version. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Oct 2005 21:12:14 -0000 1.4 +++ .cvsignore 22 Mar 2006 21:24:25 -0000 1.5 @@ -1 +1 @@ -gnomad2-2.8.2.tar.gz +gnomad2-2.8.3.tar.gz Index: gnomad2.spec =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/gnomad2.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- gnomad2.spec 23 Oct 2005 21:12:14 -0000 1.4 +++ gnomad2.spec 22 Mar 2006 21:24:25 -0000 1.5 @@ -4,12 +4,12 @@ # test building a Fedora Extras package, define the following # two macros in .rpmmacros: # -# %dist .fc4 -# %fedora 4 +# %dist .fc5 +# %fedora 5 # Name: gnomad2 -Version: 2.8.2 +Version: 2.8.3 Release: 1%{?dist} Summary: A GNOME 2.0 client for the Creative Jukeboxes and Dell DJs @@ -77,6 +77,10 @@ %doc AUTHORS NEWS README COPYING ChangeLog %changelog +* Tue Feb 14 2006 Linus Walleij 2.8.3-1 +- New upstream version. +* Tue Feb 14 2006 Linus Walleij 2.8.2-2 +- Rebuild for Fedora Extras 5. * Wed Oct 23 2005 Linus Walleij 2.8.2-1 - New upstream realease. * Wed Sep 7 2005 Linus Walleij 2.8.1-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnomad2/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Oct 2005 21:12:14 -0000 1.4 +++ sources 22 Mar 2006 21:24:25 -0000 1.5 @@ -1 +1 @@ -c84663cbb45125ad39fe4a2f854de19e gnomad2-2.8.2.tar.gz +cc2d29265e84c2460075ff2b78c2f119 gnomad2-2.8.3.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 23:10:13 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:10:13 -0500 Subject: rpms/dejavu-fonts import.log,1.38,1.39 Message-ID: <200603222310.k2MNAjwg011580@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11546 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4-1.fc6 on branch devel from dejavu-fonts-2.4-1.fc6.src.rpm 2.4 + experimental spit Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- import.log 4 Mar 2006 20:38:47 -0000 1.38 +++ import.log 22 Mar 2006 23:10:06 -0000 1.39 @@ -35,3 +35,4 @@ dejavu-fonts-2_3-1_fc5:HEAD:dejavu-fonts-2.3-1.fc5.src.rpm:1140419864 dejavu-fonts-2_3-2_fc5:HEAD:dejavu-fonts-2.3-2.fc5.src.rpm:1141475016 dejavu-fonts-2_3-3_fc5:HEAD:dejavu-fonts-2.3-3.fc5.src.rpm:1141504717 +dejavu-fonts-2_4-1_fc6:HEAD:dejavu-fonts-2.4-1.fc6.src.rpm:1143068995 From fedora-extras-commits at redhat.com Wed Mar 22 23:10:27 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:10:27 -0500 Subject: rpms/dejavu-fonts/devel .cvsignore, 1.10, 1.11 dejavu-fonts.spec, 1.16, 1.17 sources, 1.10, 1.11 Message-ID: <200603222310.k2MNAxQC011585@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11546/devel Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4-1.fc6 on branch devel from dejavu-fonts-2.4-1.fc6.src.rpm 2.4 + experimental spit Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 Feb 2006 07:18:17 -0000 1.10 +++ .cvsignore 22 Mar 2006 23:10:27 -0000 1.11 @@ -1 +1 @@ -dejavu-sfd-2.3-1.tar.gz +dejavu-sfd-2.4.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dejavu-fonts.spec 4 Mar 2006 20:38:53 -0000 1.16 +++ dejavu-fonts.spec 22 Mar 2006 23:10:27 -0000 1.17 @@ -1,6 +1,6 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion %{version}-1 +%define archiveversion %{version} %define fontdir %{_datadir}/fonts/%{name} %define xsldir %{_datadir}/xml/%{name} @@ -9,9 +9,9 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.3 -Release: 3%{?dist} -Summary: DejaVu Fonts +Version: 2.4 +Release: 1%{?dist} +Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ @@ -34,6 +34,19 @@ the process of collaborative develop +%package experimental +Group: User Interface/X +Summary: Experimental DejaVu typefaces +# Does not really make sense without the core typefaces +Requires: %{name} = %{version}-%{release} + + +%description experimental +The DejaVu fonts are a font family based on the Bitstream Vera Fonts release +1.10. This package includes the typefaces the DejaVu project considers +experimental. + + %package fontconfig Group: User Interface/X Summary: Files needed to register DejaVu fonts in fontconfig aliases @@ -43,7 +56,7 @@ %description fontconfig -This package will add DejaVu fonts to fontconfig aliases +This package will add DejaVu fonts to fontconfig aliases and keep them there. %prep @@ -58,6 +71,9 @@ DejaVuSans.sfd Sans \ DejaVuSerif.sfd Serif \ DejaVuMonoSans.sfd "Sans Mono" > unicover.txt +# We should probably also regenerate langcover.txt +# but it requires resolution of +# https://bugs.freedesktop.org/show_bug.cgi?id=6316 %check @@ -96,6 +112,21 @@ fi +%post experimental +if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts +fi + + +%postun experimental +if [ "$1" = "0" ]; then + if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts + fi +fi + + +# UGLY but safe and I hope won't be necessary soonish %triggerin fontconfig -- fontconfig, %{_sysconfdir}/fonts/fonts.conf if [ -x %{_sysconfdir}/fonts/fonts.conf ] ; then @@ -111,7 +142,16 @@ %doc *.txt AUTHORS BUGS LICENSE NEWS README %dir %{fontdir} -%{fontdir}/*.ttf +%{fontdir}/DejaVu*.ttf +%exclude %{fontdir}/DejaVu*Condensed*.ttf +%exclude %{fontdir}/DejaVu*ExtraLight*.ttf +%exclude %{fontdir}/DejaVuSerif-*Oblique.ttf + +%files experimental +%defattr(0644,root,root,0755) +%{fontdir}/DejaVu*Condensed*.ttf +%{fontdir}/DejaVu*ExtraLight*.ttf +%{fontdir}/DejaVuSerif-*Oblique.ttf %files fontconfig @@ -121,6 +161,10 @@ %changelog +* Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 +- 2.4 A big thanks to Stepan Roh for getting the project there +- split out experimental typefaces + * Sat Mar 04 2006 Nicolas Mailhot - 2.3-3 - split fontconfig registration in subpackage Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Feb 2006 07:18:17 -0000 1.10 +++ sources 22 Mar 2006 23:10:27 -0000 1.11 @@ -1 +1 @@ -b97e72f4823f93dd3c5d65481a303a5d dejavu-sfd-2.3-1.tar.gz +9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 23:17:17 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:17:17 -0500 Subject: rpms/dejavu-fonts import.log,1.39,1.40 Message-ID: <200603222317.k2MNHoTm011759@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11719 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4-1.fc4 on branch FC-4 from dejavu-fonts-2.4-1.fc4.src.rpm 2.4 + experimental spit Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- import.log 22 Mar 2006 23:10:06 -0000 1.39 +++ import.log 22 Mar 2006 23:17:14 -0000 1.40 @@ -36,3 +36,4 @@ dejavu-fonts-2_3-2_fc5:HEAD:dejavu-fonts-2.3-2.fc5.src.rpm:1141475016 dejavu-fonts-2_3-3_fc5:HEAD:dejavu-fonts-2.3-3.fc5.src.rpm:1141504717 dejavu-fonts-2_4-1_fc6:HEAD:dejavu-fonts-2.4-1.fc6.src.rpm:1143068995 +dejavu-fonts-2_4-1_fc4:FC-4:dejavu-fonts-2.4-1.fc4.src.rpm:1143069423 From fedora-extras-commits at redhat.com Wed Mar 22 23:17:37 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:17:37 -0500 Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.10, 1.11 dejavu-fonts.spec, 1.11, 1.12 sources, 1.10, 1.11 Message-ID: <200603222318.k2MNI9Bf011764@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11719/FC-4 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4-1.fc4 on branch FC-4 from dejavu-fonts-2.4-1.fc4.src.rpm 2.4 + experimental spit Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 Feb 2006 07:18:33 -0000 1.10 +++ .cvsignore 22 Mar 2006 23:17:37 -0000 1.11 @@ -1 +1 @@ -dejavu-sfd-2.3-1.tar.gz +dejavu-sfd-2.4.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- dejavu-fonts.spec 20 Feb 2006 07:18:33 -0000 1.11 +++ dejavu-fonts.spec 22 Mar 2006 23:17:37 -0000 1.12 @@ -1,16 +1,16 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion %{version}-1 -%define fontdir %{_datadir}/fonts/dejavu +%define archiveversion %{version} +%define fontdir %{_datadir}/fonts/%{name} # Let the perl Maintainer worry about Unicode.org data files (updates, licensing) %define Blocks %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/Blocks.txt %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.3 +Version: 2.4 Release: 1%{?dist} -Summary: DejaVu Fonts +Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ @@ -31,6 +31,19 @@ the process of collaborative develop +%package experimental +Group: User Interface/X +Summary: Experimental DejaVu typefaces +# Does not really make sense without the core typefaces +Requires: %{name} = %{version}-%{release} + + +%description experimental +The DejaVu fonts are a font family based on the Bitstream Vera Fonts release +1.10. This package includes the typefaces the DejaVu project considers +experimental. + + %prep %setup -q -n %{archivename}-%{version} @@ -80,16 +93,44 @@ fi +%post experimental +if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts +fi + + +%postun experimental +if [ "$1" = "0" ]; then + if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts + fi +fi + + %files %defattr(0644,root,root,0755) %doc *.txt AUTHORS BUGS LICENSE NEWS README - %dir %{fontdir} -%{fontdir}/*.ttf %ghost %{fontdir}/fonts.cache-1 +%{fontdir}/DejaVu*.ttf +%exclude %{fontdir}/DejaVu*Condensed*.ttf +%exclude %{fontdir}/DejaVu*ExtraLight*.ttf +%exclude %{fontdir}/DejaVuSerif-*Oblique.ttf + + +%files experimental +%defattr(0644,root,root,0755) +%{fontdir}/DejaVu*Condensed*.ttf +%{fontdir}/DejaVu*ExtraLight*.ttf +%{fontdir}/DejaVuSerif-*Oblique.ttf + %changelog +* Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 +- 2.4 A big thanks to Stepan Roh for getting the project there +- split out experimental typefaces + * Mon Feb 20 2006 Nicolas Mailhot - 2.3-1 - 2.3 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Feb 2006 07:18:33 -0000 1.10 +++ sources 22 Mar 2006 23:17:37 -0000 1.11 @@ -1 +1 @@ -b97e72f4823f93dd3c5d65481a303a5d dejavu-sfd-2.3-1.tar.gz +9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 22 23:31:03 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:31:03 -0500 Subject: rpms/dejavu-fonts import.log,1.40,1.41 Message-ID: <200603222331.k2MNVZgJ011897@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4-1.fc5 on branch FC-5 from dejavu-fonts-2.4-1.fc5.src.rpm 2.4 + experimental spit Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- import.log 22 Mar 2006 23:17:14 -0000 1.40 +++ import.log 22 Mar 2006 23:31:03 -0000 1.41 @@ -37,3 +37,4 @@ dejavu-fonts-2_3-3_fc5:HEAD:dejavu-fonts-2.3-3.fc5.src.rpm:1141504717 dejavu-fonts-2_4-1_fc6:HEAD:dejavu-fonts-2.4-1.fc6.src.rpm:1143068995 dejavu-fonts-2_4-1_fc4:FC-4:dejavu-fonts-2.4-1.fc4.src.rpm:1143069423 +dejavu-fonts-2_4-1_fc5:FC-5:dejavu-fonts-2.4-1.fc5.src.rpm:1143070240 From fedora-extras-commits at redhat.com Wed Mar 22 23:31:11 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 22 Mar 2006 18:31:11 -0500 Subject: rpms/dejavu-fonts/FC-5 .cvsignore, 1.10, 1.11 dejavu-fonts.spec, 1.16, 1.17 sources, 1.10, 1.11 Message-ID: <200603222331.k2MNVhXY011902@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11842/FC-5 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4-1.fc5 on branch FC-5 from dejavu-fonts-2.4-1.fc5.src.rpm 2.4 + experimental spit Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 20 Feb 2006 07:18:17 -0000 1.10 +++ .cvsignore 22 Mar 2006 23:31:11 -0000 1.11 @@ -1 +1 @@ -dejavu-sfd-2.3-1.tar.gz +dejavu-sfd-2.4.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- dejavu-fonts.spec 4 Mar 2006 20:38:53 -0000 1.16 +++ dejavu-fonts.spec 22 Mar 2006 23:31:11 -0000 1.17 @@ -1,6 +1,6 @@ %define archivename dejavu-sfd # This macro has the same value as %{version}, except when testing pre-release snapshots -%define archiveversion %{version}-1 +%define archiveversion %{version} %define fontdir %{_datadir}/fonts/%{name} %define xsldir %{_datadir}/xml/%{name} @@ -9,9 +9,9 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.3 -Release: 3%{?dist} -Summary: DejaVu Fonts +Version: 2.4 +Release: 1%{?dist} +Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions URL: http://dejavu.sf.net/ @@ -34,6 +34,19 @@ the process of collaborative develop +%package experimental +Group: User Interface/X +Summary: Experimental DejaVu typefaces +# Does not really make sense without the core typefaces +Requires: %{name} = %{version}-%{release} + + +%description experimental +The DejaVu fonts are a font family based on the Bitstream Vera Fonts release +1.10. This package includes the typefaces the DejaVu project considers +experimental. + + %package fontconfig Group: User Interface/X Summary: Files needed to register DejaVu fonts in fontconfig aliases @@ -43,7 +56,7 @@ %description fontconfig -This package will add DejaVu fonts to fontconfig aliases +This package will add DejaVu fonts to fontconfig aliases and keep them there. %prep @@ -58,6 +71,9 @@ DejaVuSans.sfd Sans \ DejaVuSerif.sfd Serif \ DejaVuMonoSans.sfd "Sans Mono" > unicover.txt +# We should probably also regenerate langcover.txt +# but it requires resolution of +# https://bugs.freedesktop.org/show_bug.cgi?id=6316 %check @@ -96,6 +112,21 @@ fi +%post experimental +if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts +fi + + +%postun experimental +if [ "$1" = "0" ]; then + if [ -x %{_bindir}/fc-cache ]; then + %{_bindir}/fc-cache %{_datadir}/fonts + fi +fi + + +# UGLY but safe and I hope won't be necessary soonish %triggerin fontconfig -- fontconfig, %{_sysconfdir}/fonts/fonts.conf if [ -x %{_sysconfdir}/fonts/fonts.conf ] ; then @@ -111,7 +142,16 @@ %doc *.txt AUTHORS BUGS LICENSE NEWS README %dir %{fontdir} -%{fontdir}/*.ttf +%{fontdir}/DejaVu*.ttf +%exclude %{fontdir}/DejaVu*Condensed*.ttf +%exclude %{fontdir}/DejaVu*ExtraLight*.ttf +%exclude %{fontdir}/DejaVuSerif-*Oblique.ttf + +%files experimental +%defattr(0644,root,root,0755) +%{fontdir}/DejaVu*Condensed*.ttf +%{fontdir}/DejaVu*ExtraLight*.ttf +%{fontdir}/DejaVuSerif-*Oblique.ttf %files fontconfig @@ -121,6 +161,10 @@ %changelog +* Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 +- 2.4 A big thanks to Stepan Roh for getting the project there +- split out experimental typefaces + * Sat Mar 04 2006 Nicolas Mailhot - 2.3-3 - split fontconfig registration in subpackage Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 20 Feb 2006 07:18:17 -0000 1.10 +++ sources 22 Mar 2006 23:31:11 -0000 1.11 @@ -1 +1 @@ -b97e72f4823f93dd3c5d65481a303a5d dejavu-sfd-2.3-1.tar.gz +9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 02:20:01 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 22 Mar 2006 21:20:01 -0500 Subject: rpms/cpanspec/devel .cvsignore, 1.4, 1.5 cpanspec.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603230220.k2N2KXSM018319@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18298 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.62. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Mar 2006 20:49:03 -0000 1.4 +++ .cvsignore 23 Mar 2006 02:20:00 -0000 1.5 @@ -1 +1 @@ -cpanspec-1.61.tar.gz +cpanspec-1.62.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cpanspec.spec 11 Mar 2006 20:49:03 -0000 1.3 +++ cpanspec.spec 23 Mar 2006 02:20:00 -0000 1.4 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.61 +Version: 1.62 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 22 2006 Steven Pritchard 1.62-1 +- Update to 1.62. + * Sat Mar 11 2006 Steven Pritchard 1.61-1 - Update to 1.61. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Mar 2006 20:49:03 -0000 1.4 +++ sources 23 Mar 2006 02:20:00 -0000 1.5 @@ -1 +1 @@ -69df0b4f1a1fe4efd469c212cd8cb983 cpanspec-1.61.tar.gz +0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 02:24:24 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 22 Mar 2006 21:24:24 -0500 Subject: rpms/cpanspec/FC-5 .cvsignore, 1.4, 1.5 cpanspec.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603230224.k2N2OuOh018433@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18412 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.62. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Mar 2006 20:49:03 -0000 1.4 +++ .cvsignore 23 Mar 2006 02:24:24 -0000 1.5 @@ -1 +1 @@ -cpanspec-1.61.tar.gz +cpanspec-1.62.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cpanspec.spec 11 Mar 2006 20:49:03 -0000 1.3 +++ cpanspec.spec 23 Mar 2006 02:24:24 -0000 1.4 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.61 +Version: 1.62 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 22 2006 Steven Pritchard 1.62-1 +- Update to 1.62. + * Sat Mar 11 2006 Steven Pritchard 1.61-1 - Update to 1.61. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Mar 2006 20:49:03 -0000 1.4 +++ sources 23 Mar 2006 02:24:24 -0000 1.5 @@ -1 +1 @@ -69df0b4f1a1fe4efd469c212cd8cb983 cpanspec-1.61.tar.gz +0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 02:25:52 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Wed, 22 Mar 2006 21:25:52 -0500 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.4, 1.5 cpanspec.spec, 1.3, 1.4 sources, 1.4, 1.5 Message-ID: <200603230226.k2N2QONP018514@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18486 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.62. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 11 Mar 2006 21:19:46 -0000 1.4 +++ .cvsignore 23 Mar 2006 02:25:52 -0000 1.5 @@ -1 +1 @@ -cpanspec-1.61.tar.gz +cpanspec-1.62.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- cpanspec.spec 11 Mar 2006 21:19:46 -0000 1.3 +++ cpanspec.spec 23 Mar 2006 02:25:52 -0000 1.4 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.61 +Version: 1.62 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 22 2006 Steven Pritchard 1.62-1 +- Update to 1.62. + * Sat Mar 11 2006 Steven Pritchard 1.61-1 - Update to 1.61. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 11 Mar 2006 21:19:46 -0000 1.4 +++ sources 23 Mar 2006 02:25:52 -0000 1.5 @@ -1 +1 @@ -69df0b4f1a1fe4efd469c212cd8cb983 cpanspec-1.61.tar.gz +0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 02:36:22 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Wed, 22 Mar 2006 21:36:22 -0500 Subject: rpms/glibmm24/devel .cvsignore, 1.7, 1.8 glibmm.spec, 1.10, 1.11 sources, 1.8, 1.9 Message-ID: <200603230236.k2N2atlt018602@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/glibmm24/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18581 Modified Files: .cvsignore glibmm.spec sources Log Message: Update to 2.10.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Feb 2006 22:01:59 -0000 1.7 +++ .cvsignore 23 Mar 2006 02:36:22 -0000 1.8 @@ -1 +1 @@ -glibmm-2.8.4.tar.bz2 +glibmm-2.10.0.tar.bz2 Index: glibmm.spec =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/glibmm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- glibmm.spec 28 Feb 2006 22:02:00 -0000 1.10 +++ glibmm.spec 23 Mar 2006 02:36:22 -0000 1.11 @@ -1,5 +1,5 @@ Name: glibmm24 -Version: 2.8.4 +Version: 2.10.0 Release: 1 Summary: C++ interface for GTK2 (a GUI library for X) @@ -12,7 +12,7 @@ Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig BuildRequires: libsigc++20-devel >= 2.0.0 -BuildRequires: glib2-devel >= 2.8.0 +BuildRequires: glib2-devel >= 2.9.0 %description gtkmm provides a C++ interface to the GTK+ GUI library. gtkmm2 wraps GTK+ 2. @@ -77,6 +77,9 @@ %{_datadir}/aclocal/*.m4 %changelog +* Mon Mar 20 2006 Denis Leroy - 2.10.0-1 +- Update to 2.10.0, requires newer glib + * Tue Feb 28 2006 Denis Leroy - 2.8.4-1 - Update to 2.8.4 - Added optional macro to enable static libs Index: sources =================================================================== RCS file: /cvs/extras/rpms/glibmm24/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 28 Feb 2006 22:02:00 -0000 1.8 +++ sources 23 Mar 2006 02:36:22 -0000 1.9 @@ -1 +1 @@ -952cdde2d6aef201c528d431036d71e1 glibmm-2.8.4.tar.bz2 +3024ad2b8f8fd4f512e1f58d087599bb glibmm-2.10.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 23 06:06:56 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 23 Mar 2006 01:06:56 -0500 Subject: rpms/anthy/devel Makefile, 1.1, NONE anthy-init.el, 1.1, NONE anthy.spec, 1.9, NONE sources, 1.5, NONE Message-ID: <200603230607.k2N671x6026802@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26795 Removed Files: Makefile anthy-init.el anthy.spec sources Log Message: removed. --- Makefile DELETED --- --- anthy-init.el DELETED --- --- anthy.spec DELETED --- --- sources DELETED --- From fedora-extras-commits at redhat.com Thu Mar 23 06:19:41 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 23 Mar 2006 01:19:41 -0500 Subject: rpms/anthy/devel README,NONE,1.1 Message-ID: <200603230619.k2N6JhD8026885@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/anthy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26875 Added Files: README Log Message: --- NEW FILE README --- anthy has moved to Fedora Core development. From fedora-extras-commits at redhat.com Thu Mar 23 06:33:58 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Thu, 23 Mar 2006 01:33:58 -0500 Subject: rpms/apt/devel fedora-core.list, NONE, 1.1 fedora-extras.list, NONE, 1.1 fedora-updates.list, NONE, 1.1 .cvsignore, 1.5, 1.6 apt.spec, 1.20, 1.21 default.conf, 1.7, 1.8 sources, 1.5, 1.6 gpg-pubkey-1ac70ce6-41bebeef, 1.1, NONE gpg-pubkey-4f2a6fd2-3f9d9d3b, 1.1, NONE gpg-pubkey-db42a60e-37ea5438, 1.1, NONE Message-ID: <200603230634.k2N6YU45026989@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/apt/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26963 Modified Files: .cvsignore apt.spec default.conf sources Added Files: fedora-core.list fedora-extras.list fedora-updates.list Removed Files: gpg-pubkey-1ac70ce6-41bebeef gpg-pubkey-4f2a6fd2-3f9d9d3b gpg-pubkey-db42a60e-37ea5438 Log Message: * Wed Mar 22 2006 Ville Skytt?? - 0.5.15lorg3-0.2.pre2 - Don't ship our copies of GPG keys, use ones in /etc/pki/rpm-gpg instead. - Don't import the "Old RHL key" by default. * Wed Mar 22 2006 Panu Matilainen - 0.5.15lorg333-pre2 - set distroverpkg to fedora-release - add distro version and arch independent default source list entries for fedora core, extras + updates - remove old nasty fedora.us-time hacks from post scriptlets --- NEW FILE fedora-core.list --- # Fedora Core repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/os/ # Debug packages # repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/$(ARCH)/debug/ # sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/$(VERSION)/source/SRPMS/ --- NEW FILE fedora-extras.list --- # Fedora Extras repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/ # Debug packages # repomd http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/$(ARCH)/debug/ # Sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/extras/$(VERSION)/SRPMS/ --- NEW FILE fedora-updates.list --- # Fedora Core repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/ # Debug packages #repomd http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/$(ARCH)/debug/ # sources #repomd-src http://download.fedora.redhat.com/pub/ fedora/linux/core/updates/$(VERSION)/SRPMS/ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 19 Mar 2006 20:52:50 -0000 1.5 +++ .cvsignore 23 Mar 2006 06:33:58 -0000 1.6 @@ -1 +1 @@ -apt-0.5.15lorg3-pre1.tar.bz2 +apt-0.5.15lorg3-pre2.tar.bz2 Index: apt.spec =================================================================== RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- apt.spec 19 Mar 2006 21:21:54 -0000 1.20 +++ apt.spec 23 Mar 2006 06:33:58 -0000 1.21 @@ -6,12 +6,12 @@ Summary: Debian's Advanced Packaging Tool with RPM support Name: apt Version: 0.5.15lorg3 -Release: 0.2.pre1%{?dist} +Release: 0.2.pre2%{?dist} Group: System Environment/Base URL: https://moin.conectiva.com.br/AptRpm License: GPL -Source0: http://laiskiainen.org/apt/testing/apt-0.5.15lorg3-pre1.tar.bz2 +Source0: http://laiskiainen.org/apt/testing/%{name}-%{version}-pre2.tar.bz2 # user editable template configs Source1: apt.conf @@ -33,19 +33,15 @@ Source51: upgradevirt.lua # 100-149 for sources.list.d -# no default entry for fedora at all +Source100: fedora-core.list +Source101: fedora-extras.list +Source102: fedora-updates.list # 150-199 for apt.conf.d # "factory defaults" for Fedora Core + Extras Source150: default.conf -# 200-249 for trusted gpg keys -# Fedora key -Source200: gpg-pubkey-4f2a6fd2-3f9d9d3b -# "Old" RHL key -Source202: gpg-pubkey-db42a60e-37ea5438 -# Fedora Extras key -Source203: gpg-pubkey-1ac70ce6-41bebeef +# 200-249 for additional trusted gpg keys # 250-299 for vendor.list.d Source250: fedora-vendor.list @@ -74,6 +70,7 @@ Requires: bzip2 # wget needed by the mirror-selector script Requires: wget +Requires: fedora-release >= 5 Requires(post): chkconfig Requires(post): ldconfig Requires(preun): chkconfig @@ -129,7 +126,7 @@ %prep -%setup -q -n %{name}-%{version}-pre1 +%setup -q -n %{name}-%{version}-pre2 # fix docs to reference correct paths perl -pi -e \ @@ -181,6 +178,11 @@ install -pm 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/apt/preferences install -pm 644 rpmpriorities $RPM_BUILD_ROOT/%{_sysconfdir}/apt/ +# Default source list entries +for source in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do + install -pm 644 $source $RPM_BUILD_ROOT%{_sysconfdir}/apt/sources.list.d/ +done + # install config parts install -pm 644 %{SOURCE150} $RPM_BUILD_ROOT%{_sysconfdir}/apt/apt.conf.d/ install -pm 644 %{SOURCE250} \ @@ -188,9 +190,10 @@ # GPG keys mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ -for gpgkey in %{SOURCE200} %{SOURCE202} %{SOURCE203} ; do - install -pm 644 $gpgkey $RPM_BUILD_ROOT%{_sysconfdir}/apt/gpg/ -done +ln -s /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora \ + $RPM_BUILD_ROOT%{_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 # Lua scripts mkdir -p $RPM_BUILD_ROOT%{_datadir}/apt/scripts @@ -227,22 +230,8 @@ %clean rm -rf $RPM_BUILD_ROOT - -%pre -if [ $1 -gt 1 ] && [ ! -f %{_sysconfdir}/apt/apt.conf.d/default.conf ]; then - mv -f %{_sysconfdir}/apt/apt.conf %{_sysconfdir}/apt/apt.conf.rpmsave - echo "NOTE: Default configuration changed!" - echo "If you have made any changes to the configuration locally," - echo "Merge your local customizations from %{_sysconfdir}/apt/apt.conf.rpmsave" - echo "to %{_sysconfdir}/apt/apt.conf" -fi - %post /sbin/ldconfig -if [ ! -f %{_sysconfdir}/apt/apt.conf ] ; then - echo "// User customizable configuration goes here" \ - > %{_sysconfdir}/apt/apt.conf -fi /sbin/chkconfig --add apt %preun @@ -322,6 +311,17 @@ %changelog +* Wed Mar 22 2006 Ville Skytt?? - 0.5.15lorg3-0.2.pre2 +- Don't ship our copies of GPG keys, use ones in /etc/pki/rpm-gpg instead. +- Don't import the "Old RHL key" by default. + +* Wed Mar 22 2006 Panu Matilainen +- 0.5.15lorg3-pre2 +- set distroverpkg to fedora-release +- add distro version and arch independent default source list entries for + 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 - Fix Allow-Duplicated* default.conf bugs introduced in previous version. Index: default.conf =================================================================== RCS file: /cvs/extras/rpms/apt/devel/default.conf,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- default.conf 19 Mar 2006 21:21:54 -0000 1.7 +++ default.conf 23 Mar 2006 06:33:58 -0000 1.8 @@ -17,6 +17,7 @@ { AllNames "false"; } + DistroVerPkg "fedora-release"; }; RPM Index: sources =================================================================== RCS file: /cvs/extras/rpms/apt/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 19 Mar 2006 20:52:50 -0000 1.5 +++ sources 23 Mar 2006 06:33:58 -0000 1.6 @@ -1 +1 @@ -5c6b3f37374d266e89805a2912d11fb6 apt-0.5.15lorg3-pre1.tar.bz2 +530456d62eb62d980ebb0d057260a7f1 apt-0.5.15lorg3-pre2.tar.bz2 --- gpg-pubkey-1ac70ce6-41bebeef DELETED --- --- gpg-pubkey-4f2a6fd2-3f9d9d3b DELETED --- --- gpg-pubkey-db42a60e-37ea5438 DELETED --- From fedora-extras-commits at redhat.com Thu Mar 23 08:05:39 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 03:05:39 -0500 Subject: rpms/fnfx/FC-5 fnfx-sleep.patch,NONE,1.1 fnfx.spec,1.4,1.5 Message-ID: <200603230806.k2N86BQY031069@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fnfx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31030/FC-5 Modified Files: fnfx.spec Added Files: fnfx-sleep.patch Log Message: - add patch from Radek B??ba to allow fnfx to work again fnfx-sleep.patch: --- NEW FILE fnfx-sleep.patch --- --- fnfx-0.3/src/fnfxd_cmds.c.syspowerstate 2006-03-22 20:23:33.000000000 +0100 +++ fnfx-0.3/src/fnfxd_cmds.c 2006-03-22 20:25:38.000000000 +0100 @@ -362,9 +362,9 @@ } else { if (state == 3) - fprintf(f, "%d", state); + fprintf(f, "mem"); else if (state == 4) - fprintf(f, "%d", state); + fprintf(f, "disk"); else { debug("suspend() - Not supported sleep state."); return 1; --- fnfx-0.3/src/fnfx.h.syspowerstate 2006-03-22 20:23:10.000000000 +0100 +++ fnfx-0.3/src/fnfx.h 2006-03-22 20:24:21.000000000 +0100 @@ -50,7 +50,7 @@ #define ACPI_LCD "/proc/acpi/toshiba/lcd" #define ACPI_VERSION "/proc/acpi/toshiba/version" #define ACPI_VIDEO "/proc/acpi/toshiba/video" -#define ACPI_SLEEP "/proc/acpi/sleep" +#define ACPI_SLEEP "/sys/power/state" #define ACPI_CPU "/proc/acpi/processor/CPU0/limit" #define ACPI_BLUETOOTH "/proc/acpi/toshiba/bluetooth" Index: fnfx.spec =================================================================== RCS file: /cvs/extras/rpms/fnfx/FC-5/fnfx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fnfx.spec 14 Feb 2006 08:57:24 -0000 1.4 +++ fnfx.spec 23 Mar 2006 08:05:37 -0000 1.5 @@ -1,6 +1,6 @@ Name: fnfx Version: 0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Hotkey functions for Toshiba laptops Group: System Environment/Daemons @@ -8,6 +8,7 @@ URL: http://fnfx.sourceforge.net Source0: http://dl.sf.net/fnfx/fnfx-%{version}.tar.gz Source1: fnfx-fnfxd +Patch0: fnfx-sleep.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -63,6 +65,10 @@ %exclude %{_sysconfdir}/fnfx/fnfxrc_example %changelog +* Thu Mar 23 2006 Andreas Bierfert +0.3-7 +- add patch from Radek B??ba to allow fnfx to work again + * Tue Feb 14 2006 Andreas Bierfert 0.3-6 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Thu Mar 23 08:05:59 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 03:05:59 -0500 Subject: rpms/fnfx/devel fnfx-sleep.patch,NONE,1.1 fnfx.spec,1.4,1.5 Message-ID: <200603230806.k2N86bxs031072@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fnfx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31030/devel Modified Files: fnfx.spec Added Files: fnfx-sleep.patch Log Message: - add patch from Radek B??ba to allow fnfx to work again fnfx-sleep.patch: --- NEW FILE fnfx-sleep.patch --- --- fnfx-0.3/src/fnfxd_cmds.c.syspowerstate 2006-03-22 20:23:33.000000000 +0100 +++ fnfx-0.3/src/fnfxd_cmds.c 2006-03-22 20:25:38.000000000 +0100 @@ -362,9 +362,9 @@ } else { if (state == 3) - fprintf(f, "%d", state); + fprintf(f, "mem"); else if (state == 4) - fprintf(f, "%d", state); + fprintf(f, "disk"); else { debug("suspend() - Not supported sleep state."); return 1; --- fnfx-0.3/src/fnfx.h.syspowerstate 2006-03-22 20:23:10.000000000 +0100 +++ fnfx-0.3/src/fnfx.h 2006-03-22 20:24:21.000000000 +0100 @@ -50,7 +50,7 @@ #define ACPI_LCD "/proc/acpi/toshiba/lcd" #define ACPI_VERSION "/proc/acpi/toshiba/version" #define ACPI_VIDEO "/proc/acpi/toshiba/video" -#define ACPI_SLEEP "/proc/acpi/sleep" +#define ACPI_SLEEP "/sys/power/state" #define ACPI_CPU "/proc/acpi/processor/CPU0/limit" #define ACPI_BLUETOOTH "/proc/acpi/toshiba/bluetooth" Index: fnfx.spec =================================================================== RCS file: /cvs/extras/rpms/fnfx/devel/fnfx.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fnfx.spec 14 Feb 2006 08:57:24 -0000 1.4 +++ fnfx.spec 23 Mar 2006 08:05:59 -0000 1.5 @@ -1,6 +1,6 @@ Name: fnfx Version: 0.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Hotkey functions for Toshiba laptops Group: System Environment/Daemons @@ -8,6 +8,7 @@ URL: http://fnfx.sourceforge.net Source0: http://dl.sf.net/fnfx/fnfx-%{version}.tar.gz Source1: fnfx-fnfxd +Patch0: fnfx-sleep.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/chkconfig @@ -24,6 +25,7 @@ %prep %setup -q +%patch0 -p1 %build %configure @@ -63,6 +65,10 @@ %exclude %{_sysconfdir}/fnfx/fnfxrc_example %changelog +* Thu Mar 23 2006 Andreas Bierfert +0.3-7 +- add patch from Radek B??ba to allow fnfx to work again + * Tue Feb 14 2006 Andreas Bierfert 0.3-6 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Thu Mar 23 09:21:46 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 04:21:46 -0500 Subject: rpms/libetpan/FC-5 .cvsignore, 1.7, 1.8 libetpan.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <200603230922.k2N9MIYu001458@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1410/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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Feb 2006 08:52:44 -0000 1.7 +++ .cvsignore 23 Mar 2006 09:21:43 -0000 1.8 @@ -1 +1 @@ -libetpan-0.42.tar.gz +libetpan-0.45.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-5/libetpan.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libetpan.spec 15 Feb 2006 08:32:18 -0000 1.8 +++ libetpan.spec 23 Mar 2006 09:21:43 -0000 1.9 @@ -1,6 +1,6 @@ Name: libetpan -Version: 0.42 -Release: 2%{?dist} +Version: 0.45 +Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries @@ -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.6.0.1 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.6.1.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Thu Mar 23 2006 Andreas Bierfert +0.45-1 +- version upgrade + * Wed Feb 15 2006 Andreas Bierfert 0.42-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Feb 2006 08:52:44 -0000 1.7 +++ sources 23 Mar 2006 09:21:43 -0000 1.8 @@ -1 +1 @@ -269c275151bbb9c3e818b58863cca670 libetpan-0.42.tar.gz +0135cf6a9d97afb1f75001f514448836 libetpan-0.45.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 09:21:54 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 04:21:54 -0500 Subject: rpms/libetpan/devel .cvsignore, 1.7, 1.8 libetpan.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <200603230922.k2N9MQtY001463@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1410/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.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 3 Feb 2006 08:52:44 -0000 1.7 +++ .cvsignore 23 Mar 2006 09:21:54 -0000 1.8 @@ -1 +1 @@ -libetpan-0.42.tar.gz +libetpan-0.45.tar.gz Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libetpan.spec 15 Feb 2006 08:32:18 -0000 1.8 +++ libetpan.spec 23 Mar 2006 09:21:54 -0000 1.9 @@ -1,6 +1,6 @@ Name: libetpan -Version: 0.42 -Release: 2%{?dist} +Version: 0.45 +Release: 1%{?dist} Summary: Portable, efficient middleware for different kinds of mail access Group: System Environment/Libraries @@ -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.6.0.1 +chmod 755 $RPM_BUILD_ROOT%{_libdir}/libetpan.so.6.1.0 %clean rm -rf $RPM_BUILD_ROOT @@ -65,6 +65,10 @@ %{_libdir}/*.so %changelog +* Thu Mar 23 2006 Andreas Bierfert +0.45-1 +- version upgrade + * Wed Feb 15 2006 Andreas Bierfert 0.42-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 3 Feb 2006 08:52:44 -0000 1.7 +++ sources 23 Mar 2006 09:21:54 -0000 1.8 @@ -1 +1 @@ -269c275151bbb9c3e818b58863cca670 libetpan-0.42.tar.gz +0135cf6a9d97afb1f75001f514448836 libetpan-0.45.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 09:41:23 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 23 Mar 2006 04:41:23 -0500 Subject: rpms/pikdev/FC-4 pikdev.spec,1.3,1.4 Message-ID: <200603230941.k2N9fuKH001613@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1596 Modified Files: pikdev.spec Log Message: Try to fix x86_64 build failure by adding BR qt-devel Index: pikdev.spec =================================================================== RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pikdev.spec 15 Mar 2006 15:16:41 -0000 1.3 +++ pikdev.spec 23 Mar 2006 09:41:22 -0000 1.4 @@ -1,6 +1,6 @@ Name: pikdev Version: 0.8.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC @@ -13,7 +13,7 @@ Source3: LISEZMOI.Fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, kdelibs-devel +BuildRequires: desktop-file-utils, kdelibs-devel, qt-devel Requires: gputils @@ -59,8 +59,6 @@ %build -[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh - %configure --disable-rpath rm -rf pkp @@ -104,6 +102,9 @@ %{_datadir}/icons/* %changelog +* Thu Mar 23 2006 Alain Portal 0.8.4-6 + - $QTDIR is set. So, remove the previous change + - Try to fix x86_64 build failure by adding BR qt-devel * Wed Mar 15 2006 Alain Portal 0.8.4-5 - Source qt.sh if $QTDIR isn't set. Always Ralf... * Wed Mar 15 2006 Alain Portal 0.8.4-4 @@ -115,13 +116,13 @@ Thanks to him. * Wed Mar 08 2006 Alain Portal 0.8.4-3 - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5 - - Package must own %{_datadir}/apps/%{name} directory + - Package must own %%{_datadir}/apps/%%{name} directory * Tue Jan 31 2006 Alain Portal 0.8.4-2 - Don't use the precompiled version of pkp * Mon Jan 30 2006 Alain Portal 0.8.4-1 - New upstream version * Tue Jan 10 2006 Alain Portal 0.8.2-2 - - Add the %{?dist} macro + - Add the %%{?dist} macro * Fri Dec 16 2005 Alain Portal 0.8.2-1 - New version - Add french summary and description From fedora-extras-commits at redhat.com Thu Mar 23 10:00:05 2006 From: fedora-extras-commits at redhat.com (Alain Portal (dionysos)) Date: Thu, 23 Mar 2006 05:00:05 -0500 Subject: rpms/pikdev/FC-4 pikdev.spec,1.4,1.5 Message-ID: <200603231000.k2NA0bkw001743@cvs-int.fedora.redhat.com> Author: dionysos Update of /cvs/extras/rpms/pikdev/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1725 Modified Files: pikdev.spec Log Message: Previous try don't fix. So, definitely ExcludeArch x86_64 on FC-4 Index: pikdev.spec =================================================================== RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- pikdev.spec 23 Mar 2006 09:41:22 -0000 1.4 +++ pikdev.spec 23 Mar 2006 10:00:04 -0000 1.5 @@ -1,6 +1,6 @@ Name: pikdev Version: 0.8.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: IDE for development of PICmicro based application (under Linux/KDE) Summary(fr): EDI pour le d??veloppement d'applications ?? base de microcontr??leurs PIC @@ -13,11 +13,12 @@ Source3: LISEZMOI.Fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: desktop-file-utils, kdelibs-devel, qt-devel +BuildRequires: desktop-file-utils, kdelibs-devel Requires: gputils ExcludeArch: ppc +ExcludeArch: x86_64 # Only for FC-4 %description PiKdev is a simple IDE dedicated to the development of PIC @@ -102,6 +103,9 @@ %{_datadir}/icons/* %changelog +* Thu Mar 23 2006 Alain Portal 0.8.4-7 + - No fix. So, remove the previous change + - Definitely exclude arch x86_64 for FC-4 * Thu Mar 23 2006 Alain Portal 0.8.4-6 - $QTDIR is set. So, remove the previous change - Try to fix x86_64 build failure by adding BR qt-devel From fedora-extras-commits at redhat.com Thu Mar 23 12:26:43 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 23 Mar 2006 07:26:43 -0500 Subject: rpms/exim/FC-4 exim-4.60-mon-overflow.patch, NONE, 1.1 exim.spec, 1.10, 1.11 Message-ID: <200603231227.k2NCRFVu008209@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8188 Modified Files: exim.spec Added Files: exim-4.60-mon-overflow.patch Log Message: fix #186303 exim-4.60-mon-overflow.patch: --- NEW FILE exim-4.60-mon-overflow.patch --- --- exim-4.60/exim_monitor/em_queue.c~ 2005-11-28 10:57:32.000000000 +0000 +++ exim-4.60/exim_monitor/em_queue.c 2006-03-23 12:23:20.000000000 +0000 @@ -500,7 +500,7 @@ for (i = 0; i < subdir_max; i++) uschar basename[SPOOL_NAME_LENGTH]; stripchart_total[0]++; if (!eximon_initialized) { printf("."); fflush(stdout); } - Ustrcpy(basename, name); + Ustrncpy(basename, name, SPOOL_NAME_LENGTH - 2); basename[SPOOL_NAME_LENGTH - 2] = 0; if (full) find_queue(basename, queue_add, subdirchar); } Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- exim.spec 21 Mar 2006 10:25:36 -0000 1.10 +++ exim.spec 23 Mar 2006 12:26:42 -0000 1.11 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -25,6 +25,7 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch +Patch16: exim-4.60-mon-overflow.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel pam-devel @@ -78,6 +79,7 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre +%patch16 -p1 %build %ifnarch s390 s390x @@ -286,6 +288,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Thu Mar 23 2006 David Woodhouse 4.60-5 +- Fix eximon buffer overflow (#186303) + * Tue Mar 21 2006 David Woodhouse 4.60-4 - Actually enable Postgres From fedora-extras-commits at redhat.com Thu Mar 23 12:27:47 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 23 Mar 2006 07:27:47 -0500 Subject: rpms/exim/FC-5 exim-4.60-mon-overflow.patch, NONE, 1.1 exim.spec, 1.15, 1.16 Message-ID: <200603231228.k2NCSJSZ008270@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8250 Modified Files: exim.spec Added Files: exim-4.60-mon-overflow.patch Log Message: fix #186303 exim-4.60-mon-overflow.patch: --- NEW FILE exim-4.60-mon-overflow.patch --- --- exim-4.60/exim_monitor/em_queue.c~ 2005-11-28 10:57:32.000000000 +0000 +++ exim-4.60/exim_monitor/em_queue.c 2006-03-23 12:23:20.000000000 +0000 @@ -500,7 +500,7 @@ for (i = 0; i < subdir_max; i++) uschar basename[SPOOL_NAME_LENGTH]; stripchart_total[0]++; if (!eximon_initialized) { printf("."); fflush(stdout); } - Ustrcpy(basename, name); + Ustrncpy(basename, name, SPOOL_NAME_LENGTH - 2); basename[SPOOL_NAME_LENGTH - 2] = 0; if (full) find_queue(basename, queue_add, subdirchar); } Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- exim.spec 21 Mar 2006 10:26:51 -0000 1.15 +++ exim.spec 23 Mar 2006 12:27:47 -0000 1.16 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -25,6 +25,7 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch +Patch16: exim-4.60-mon-overflow.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel pam-devel @@ -79,6 +80,7 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre +%patch16 -p1 %build %ifnarch s390 s390x @@ -287,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Thu Mar 23 2006 David Woodhouse 4.60-5 +- Fix eximon buffer overflow (#186303) + * Tue Mar 21 2006 David Woodhouse 4.60-4 - Actually enable Postgres From fedora-extras-commits at redhat.com Thu Mar 23 12:28:38 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 23 Mar 2006 07:28:38 -0500 Subject: rpms/exim/devel exim-4.60-mon-overflow.patch, NONE, 1.1 exim.spec, 1.15, 1.16 Message-ID: <200603231229.k2NCTB4t008326@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/exim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8302 Modified Files: exim.spec Added Files: exim-4.60-mon-overflow.patch Log Message: fix #186303 exim-4.60-mon-overflow.patch: --- NEW FILE exim-4.60-mon-overflow.patch --- --- exim-4.60/exim_monitor/em_queue.c~ 2005-11-28 10:57:32.000000000 +0000 +++ exim-4.60/exim_monitor/em_queue.c 2006-03-23 12:23:20.000000000 +0000 @@ -500,7 +500,7 @@ for (i = 0; i < subdir_max; i++) uschar basename[SPOOL_NAME_LENGTH]; stripchart_total[0]++; if (!eximon_initialized) { printf("."); fflush(stdout); } - Ustrcpy(basename, name); + Ustrncpy(basename, name, SPOOL_NAME_LENGTH - 2); basename[SPOOL_NAME_LENGTH - 2] = 0; if (full) find_queue(basename, queue_add, subdirchar); } Index: exim.spec =================================================================== RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- exim.spec 21 Mar 2006 10:29:09 -0000 1.15 +++ exim.spec 23 Mar 2006 12:28:38 -0000 1.16 @@ -1,7 +1,7 @@ Summary: The exim mail transfer agent Name: exim Version: 4.60 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Url: http://www.exim.org/ Group: System Environment/Daemons @@ -25,6 +25,7 @@ Patch13: exim-4.43-pamconfig.patch Patch14: exim-4.50-spamdconf.patch Patch15: exim-4.52-dynamic-pcre.patch +Patch16: exim-4.60-mon-overflow.patch Requires: /etc/aliases BuildRequires: db4-devel openssl-devel openldap-devel pam-devel @@ -79,6 +80,7 @@ %patch13 -p1 -b .pam %patch14 -p1 -b .spamd %patch15 -p1 -b .pcre +%patch16 -p1 %build %ifnarch s390 s390x @@ -287,6 +289,9 @@ %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO} %changelog +* Thu Mar 23 2006 David Woodhouse 4.60-5 +- Fix eximon buffer overflow (#186303) + * Tue Mar 21 2006 David Woodhouse 4.60-4 - Actually enable Postgres From fedora-extras-commits at redhat.com Thu Mar 23 13:32:29 2006 From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb)) Date: Thu, 23 Mar 2006 08:32:29 -0500 Subject: rpms/muine/FC-5 muine.spec,1.1,1.2 Message-ID: <200603231333.k2NDX1Em010484@cvs-int.fedora.redhat.com> Author: sindrepb Update of /cvs/extras/rpms/muine/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10467 Modified Files: muine.spec Log Message: Add missing mono-web dependency Index: muine.spec =================================================================== RCS file: /cvs/extras/rpms/muine/FC-5/muine.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- muine.spec 15 Mar 2006 15:27:18 -0000 1.1 +++ muine.spec 23 Mar 2006 13:32:28 -0000 1.2 @@ -1,6 +1,6 @@ Name: muine Version: 0.8.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Music Player for GNOME Group: Applications/Multimedia @@ -17,7 +17,7 @@ BuildRequires: libid3tag-devel BuildRequires: libvorbis-devel, flac-devel BuildRequires: desktop-file-utils, gettext -Requires: mono-core, dbus-sharp >= 0.50, gtk-sharp2 +Requires: mono-core, mono-web, dbus-sharp >= 0.50, gtk-sharp2 Requires(pre): GConf2 Requires(post): GConf2, desktop-file-utils @@ -115,6 +115,9 @@ %{_libdir}/muine/*.a %changelog +* Tue Mar 23 2006 Sindre Pedersen Bj??rdal - 0.8.4-6 +- Add missing mono-web dependency + * Tue Mar 14 2006 Sindre Pedersen Bj??rdal - 0.8.4-5 - Patch added to really fix the x86_64 issue From fedora-extras-commits at redhat.com Thu Mar 23 14:45:32 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 23 Mar 2006 09:45:32 -0500 Subject: rpms/octave/FC-4 .cvsignore, 1.5, 1.6 octave.spec, 1.27, 1.28 sources, 1.5, 1.6 Message-ID: <200603231446.k2NEk4Kn012751@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12730 Modified Files: .cvsignore octave.spec sources Log Message: New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 11 Nov 2005 22:33:49 -0000 1.5 +++ .cvsignore 23 Mar 2006 14:45:31 -0000 1.6 @@ -1 +1 @@ -octave-2.1.72.tar.bz2 +octave-2.1.73.tar.bz2 Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/octave.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- octave.spec 16 Mar 2006 18:40:06 -0000 1.27 +++ octave.spec 23 Mar 2006 14:45:31 -0000 1.28 @@ -1,6 +1,6 @@ Name: octave -Version: 2.1.72 -Release: 4%{?dist} +Version: 2.1.73 +Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -40,7 +40,7 @@ Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: readline-devel fftw-devel hdf5-devel zlib-devel -Requires: lapack-devel blas-devel +Requires: lapack-devel blas-devel gcc-c++ %description devel The octave-devel package contains files needed for developing @@ -116,9 +116,11 @@ %changelog -* Thu Mar 16 2006 Quentin Spencer 2.1.72-4 +* Thu Mar 23 2006 Quentin Spencer 2.1.73-1 +- New upstream release. - Make sure /usr/libexec/octave is owned by octave. - Remove configure options that are now obsolete. +- Add gcc-c++ as dependency of devel package. * Wed Feb 1 2006 Quentin Spencer 2.1.72-3 - Patch to fix bug #179242. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 11 Nov 2005 22:33:49 -0000 1.5 +++ sources 23 Mar 2006 14:45:31 -0000 1.6 @@ -1 +1 @@ -47012ee5efee3a36d04fea3341748862 octave-2.1.72.tar.bz2 +c356475aa06d81a10f8bf27f1a1d27a0 octave-2.1.73.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 23 18:08:15 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Thu, 23 Mar 2006 13:08:15 -0500 Subject: rpms/ghdl/devel ghdl.spec,1.14,1.15 sources,1.6,1.7 Message-ID: <200603231808.k2NI8lJ4021667@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21643 Modified Files: ghdl.spec sources Log Message: back to using FSF gcc sources, as core sources cause a segfault when compiling on x86_64 Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- ghdl.spec 22 Mar 2006 10:56:48 -0000 1.14 +++ ghdl.spec 23 Mar 2006 18:08:13 -0000 1.15 @@ -1,12 +1,11 @@ %define gccver 4.1.0 %define ghdlver 0.21 %define ghdlsvnver 50 -%define DATE 20060304 Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.%{ghdlsvnver}svn.1%{?dist} +Release: 0.%{ghdlsvnver}svn.0%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -14,21 +13,8 @@ # check out the SVN repo # cd translate/gcc/ # ./dist.sh sources -Source0: gcc-%{gccver}-%{DATE}.tar.bz2 +Source0: ftp://gcc.gnu.org/pub/gcc/releases/gcc-%{gccver}/gcc-core-%{gccver}.tar.bz2 Source100: http://ghdl.free.fr/ghdl-%{ghdlver}.tar.bz2 -Patch1: gcc41-ice-hack.patch -Patch2: gcc41-ppc64-m32-m64-multilib-only.patch -Patch3: gcc41-ia64-libunwind.patch -Patch4: gcc41-gnuc-rh-release.patch -Patch5: gcc41-java-nomulti.patch -Patch6: gcc41-ada-pr18302.patch -Patch7: gcc41-ada-tweaks.patch -Patch8: gcc41-java-slow_pthread_self.patch -Patch9: gcc41-ppc32-retaddr.patch -Patch10: gcc41-x86_64-sse3.patch -Patch11: gcc41-mni.patch -Patch12: gcc41-cfaval.patch -Patch13: gcc41-rh184446.patch Patch100: ghdl-svn%{ghdlsvnver}.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/install-info @@ -123,22 +109,7 @@ that tracks signal updates and schedules processes. %prep -%setup -q -n gcc-%{gccver}-%{DATE} -T -b 0 -a 100 -%patch1 -p0 -b .ice-hack~ -%patch2 -p0 -b .ppc64-m32-m64-multilib-only~ -%patch3 -p0 -b .ia64-libunwind~ -#patch4 -p0 -b .gnuc-rh-release~ -%patch5 -p0 -b .java-nomulti~ -%patch6 -p0 -b .ada-pr18302~ -%patch7 -p0 -b .ada-tweaks~ -%patch8 -p0 -b .java-slow_pthread_self~ -%patch9 -p0 -b .ppc32-retaddr~ -%patch10 -p0 -b .x86_64-sse3~ -%patch11 -p0 -b .mni~ -%patch12 -p0 -b .cfaval~ -%patch13 -p0 -b .rh184446~ -sed -i -e 's/4\.1\.1/4.1.0/' gcc/BASE-VER gcc/version.c -sed -i -e 's/" (Red Hat[^)]*)"/" (Red Hat %{version}-%{gccver})"/' gcc/version.c +%setup -q -n gcc-%{gccver} -T -b 0 -a 100 pushd ghdl-%{ghdlver} %patch100 -p1 %{__mv} vhdl ../gcc/ @@ -324,6 +295,8 @@ - update to svn50, to fix x86_64 breakage - move grt (ghdl runtime library) into separate package, to allow parallel install of i386 and x86_64 grt on x86_64 machines, thus making -m32 work +- back to using FSF gcc as base compiler sources, using core gcc sources + causes segfaults during library compile on x86_64 * Sun Mar 19 2006 Thomas Sailer - 0.22-0.49svn.1 - use core gcc as base compiler sources Index: sources =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 19 Mar 2006 15:13:36 -0000 1.6 +++ sources 23 Mar 2006 18:08:13 -0000 1.7 @@ -1,2 +1,2 @@ a0ebb9b4ea9d33e67e6ae9768d10eb3a ghdl-0.21.tar.bz2 -cc39dd702c70d0a784c7ecdedbb503b7 gcc-4.1.0-20060304.tar.bz2 +15efa164579c7cf4a48859ee87d2a1fa gcc-core-4.1.0.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 23 18:15:33 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 23 Mar 2006 13:15:33 -0500 Subject: rpms/python-durus/FC-5 .cvsignore, 1.6, 1.7 python-durus.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200603231816.k2NIG5eW021771@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-durus/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21709/FC-5 Modified Files: .cvsignore python-durus.spec sources Log Message: Update to upstream 3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Feb 2006 17:43:31 -0000 1.6 +++ .cvsignore 23 Mar 2006 18:15:32 -0000 1.7 @@ -1 +1 @@ -Durus-3.2.tar.gz +Durus-3.3.tar.gz Index: python-durus.spec =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-5/python-durus.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-durus.spec 13 Feb 2006 17:43:31 -0000 1.8 +++ python-durus.spec 23 Mar 2006 18:15:32 -0000 1.9 @@ -3,7 +3,7 @@ %define srcname Durus Name: python-durus -Version: 3.2 +Version: 3.3 Release: 1%{?dist} Summary: A Python Object Database @@ -53,6 +53,9 @@ %{_bindir}/durus %changelog +* Thu Mar 23 2006 Shahms E. King 3.3-1 +- Update to upstream 3.3 + * Mon Feb 13 2006 Shahms E. King 3.2-1 - Update to upstream 3.2 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Feb 2006 17:43:31 -0000 1.6 +++ sources 23 Mar 2006 18:15:32 -0000 1.7 @@ -1 +1 @@ -f10d3eebfa01eeee8113b82930c13320 Durus-3.2.tar.gz +e5a91e6fb04715a72f14a89eab329c6f Durus-3.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:15:39 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 23 Mar 2006 13:15:39 -0500 Subject: rpms/python-durus/devel .cvsignore, 1.6, 1.7 python-durus.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200603231816.k2NIGCqa021776@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-durus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21709/devel Modified Files: .cvsignore python-durus.spec sources Log Message: Update to upstream 3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-durus/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Feb 2006 17:43:31 -0000 1.6 +++ .cvsignore 23 Mar 2006 18:15:39 -0000 1.7 @@ -1 +1 @@ -Durus-3.2.tar.gz +Durus-3.3.tar.gz Index: python-durus.spec =================================================================== RCS file: /cvs/extras/rpms/python-durus/devel/python-durus.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-durus.spec 13 Feb 2006 17:43:31 -0000 1.8 +++ python-durus.spec 23 Mar 2006 18:15:39 -0000 1.9 @@ -3,7 +3,7 @@ %define srcname Durus Name: python-durus -Version: 3.2 +Version: 3.3 Release: 1%{?dist} Summary: A Python Object Database @@ -53,6 +53,9 @@ %{_bindir}/durus %changelog +* Thu Mar 23 2006 Shahms E. King 3.3-1 +- Update to upstream 3.3 + * Mon Feb 13 2006 Shahms E. King 3.2-1 - Update to upstream 3.2 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-durus/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Feb 2006 17:43:31 -0000 1.6 +++ sources 23 Mar 2006 18:15:39 -0000 1.7 @@ -1 +1 @@ -f10d3eebfa01eeee8113b82930c13320 Durus-3.2.tar.gz +e5a91e6fb04715a72f14a89eab329c6f Durus-3.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:15:25 2006 From: fedora-extras-commits at redhat.com (Shahms King (shahms)) Date: Thu, 23 Mar 2006 13:15:25 -0500 Subject: rpms/python-durus/FC-4 .cvsignore, 1.6, 1.7 python-durus.spec, 1.8, 1.9 sources, 1.6, 1.7 Message-ID: <200603231816.k2NIGRD7021787@cvs-int.fedora.redhat.com> Author: shahms Update of /cvs/extras/rpms/python-durus/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21709/FC-4 Modified Files: .cvsignore python-durus.spec sources Log Message: Update to upstream 3.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Feb 2006 17:43:25 -0000 1.6 +++ .cvsignore 23 Mar 2006 18:15:24 -0000 1.7 @@ -1 +1 @@ -Durus-3.2.tar.gz +Durus-3.3.tar.gz Index: python-durus.spec =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-4/python-durus.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-durus.spec 13 Feb 2006 17:43:25 -0000 1.8 +++ python-durus.spec 23 Mar 2006 18:15:25 -0000 1.9 @@ -3,7 +3,7 @@ %define srcname Durus Name: python-durus -Version: 3.2 +Version: 3.3 Release: 1%{?dist} Summary: A Python Object Database @@ -53,6 +53,9 @@ %{_bindir}/durus %changelog +* Thu Mar 23 2006 Shahms E. King 3.3-1 +- Update to upstream 3.3 + * Mon Feb 13 2006 Shahms E. King 3.2-1 - Update to upstream 3.2 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-durus/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Feb 2006 17:43:25 -0000 1.6 +++ sources 23 Mar 2006 18:15:25 -0000 1.7 @@ -1 +1 @@ -f10d3eebfa01eeee8113b82930c13320 Durus-3.2.tar.gz +e5a91e6fb04715a72f14a89eab329c6f Durus-3.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:20:12 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 23 Mar 2006 13:20:12 -0500 Subject: rpms/kst/FC-4 .cvsignore,1.2,1.3 kst.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200603231820.k2NIKkEh022131@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/kst/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/FC-4 Modified Files: .cvsignore kst.spec sources Log Message: Update source tarball to new kst 1.2.1 bugfix release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kst/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Feb 2006 00:34:53 -0000 1.2 +++ .cvsignore 23 Mar 2006 18:20:12 -0000 1.3 @@ -1 +1 @@ -kst-1.2.0.tar.gz +kst-1.2.1.tar.gz Index: kst.spec =================================================================== RCS file: /cvs/extras/rpms/kst/FC-4/kst.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kst.spec 12 Mar 2006 17:57:48 -0000 1.4 +++ kst.spec 23 Mar 2006 18:20:12 -0000 1.5 @@ -1,6 +1,6 @@ Name: kst -Version: 1.2.0 -Release: 10%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: A data viewing program for KDE Group: Applications/Engineering @@ -210,6 +210,9 @@ %{_datadir}/services/kst/kstdata_netcdf.desktop %changelog +* Thu Mar 23 2006 Matthew Truch - 1.2.1-1 +- Update to kst 1.2.1 bugfix release from upstream. + * Sun Mar 12 2006 Matthew Truch - 1.2.0-10 - Yet another tweak to configure options. - Bump build so new cfitsio version is picked up. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kst/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Feb 2006 00:34:53 -0000 1.2 +++ sources 23 Mar 2006 18:20:12 -0000 1.3 @@ -1 +1 @@ -789aac131edb24cdefbb90634cbb4b56 kst-1.2.0.tar.gz +254f57baf35f1c5cff88d6aa666fb30c kst-1.2.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:20:20 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 23 Mar 2006 13:20:20 -0500 Subject: rpms/kst/FC-5 .cvsignore,1.2,1.3 kst.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200603231820.k2NIKqCx022162@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/kst/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/FC-5 Modified Files: .cvsignore kst.spec sources Log Message: Update source tarball to new kst 1.2.1 bugfix release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kst/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Feb 2006 00:34:53 -0000 1.2 +++ .cvsignore 23 Mar 2006 18:20:20 -0000 1.3 @@ -1 +1 @@ -kst-1.2.0.tar.gz +kst-1.2.1.tar.gz Index: kst.spec =================================================================== RCS file: /cvs/extras/rpms/kst/FC-5/kst.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kst.spec 12 Mar 2006 17:34:07 -0000 1.4 +++ kst.spec 23 Mar 2006 18:20:20 -0000 1.5 @@ -1,6 +1,6 @@ Name: kst -Version: 1.2.0 -Release: 10%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: A data viewing program for KDE Group: Applications/Engineering @@ -210,6 +210,9 @@ %{_datadir}/services/kst/kstdata_netcdf.desktop %changelog +* Thu Mar 23 2006 Matthew Truch - 1.2.1-1 +- Update to kst 1.2.1 bugfix release from upstream. + * Sun Mar 12 2006 Matthew Truch - 1.2.0-10 - Yet another tweak to configure options. - Bump build so new cfitsio version is picked up. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kst/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Feb 2006 00:34:53 -0000 1.2 +++ sources 23 Mar 2006 18:20:20 -0000 1.3 @@ -1 +1 @@ -789aac131edb24cdefbb90634cbb4b56 kst-1.2.0.tar.gz +254f57baf35f1c5cff88d6aa666fb30c kst-1.2.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:20:26 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 23 Mar 2006 13:20:26 -0500 Subject: rpms/kst/devel .cvsignore,1.2,1.3 kst.spec,1.4,1.5 sources,1.2,1.3 Message-ID: <200603231820.k2NIKw7T022168@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/kst/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22043/devel Modified Files: .cvsignore kst.spec sources Log Message: Update source tarball to new kst 1.2.1 bugfix release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kst/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Feb 2006 00:34:53 -0000 1.2 +++ .cvsignore 23 Mar 2006 18:20:26 -0000 1.3 @@ -1 +1 @@ -kst-1.2.0.tar.gz +kst-1.2.1.tar.gz Index: kst.spec =================================================================== RCS file: /cvs/extras/rpms/kst/devel/kst.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- kst.spec 12 Mar 2006 17:34:07 -0000 1.4 +++ kst.spec 23 Mar 2006 18:20:26 -0000 1.5 @@ -1,6 +1,6 @@ Name: kst -Version: 1.2.0 -Release: 10%{?dist} +Version: 1.2.1 +Release: 1%{?dist} Summary: A data viewing program for KDE Group: Applications/Engineering @@ -210,6 +210,9 @@ %{_datadir}/services/kst/kstdata_netcdf.desktop %changelog +* Thu Mar 23 2006 Matthew Truch - 1.2.1-1 +- Update to kst 1.2.1 bugfix release from upstream. + * Sun Mar 12 2006 Matthew Truch - 1.2.0-10 - Yet another tweak to configure options. - Bump build so new cfitsio version is picked up. Index: sources =================================================================== RCS file: /cvs/extras/rpms/kst/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Feb 2006 00:34:53 -0000 1.2 +++ sources 23 Mar 2006 18:20:26 -0000 1.3 @@ -1 +1 @@ -789aac131edb24cdefbb90634cbb4b56 kst-1.2.0.tar.gz +254f57baf35f1c5cff88d6aa666fb30c kst-1.2.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 18:22:28 2006 From: fedora-extras-commits at redhat.com (Paul Wouters (pwouters)) Date: Thu, 23 Mar 2006 13:22:28 -0500 Subject: rpms/l2tpd/devel l2tpd.spec,1.5,1.6 Message-ID: <200603231823.k2NIN1k4022248@cvs-int.fedora.redhat.com> Author: pwouters Update of /cvs/extras/rpms/l2tpd/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22208 Modified Files: l2tpd.spec Log Message: * Thu Mar 23 2006 Paul Wouters 0.69-0.5.20051030 - Bumped version to release fc5 tag in devel wich is now fc6 Index: l2tpd.spec =================================================================== RCS file: /cvs/extras/rpms/l2tpd/devel/l2tpd.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- l2tpd.spec 3 Mar 2006 15:07:53 -0000 1.5 +++ l2tpd.spec 23 Mar 2006 18:22:28 -0000 1.6 @@ -3,7 +3,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: l2tpd Version: 0.69 -Release: 0.4.%{cvs}%{?dist} +Release: 0.5.%{cvs}%{?dist} License: GPL Url: http://sourceforge.net/projects/%{name}/ Group: System Environment/Daemons @@ -127,6 +127,9 @@ %changelog +* Thu Mar 23 2006 Paul Wouters 0.69-0.5.20051030 +- Bumped version to release fc5 tag in devel wich is now fc6 + * Tue Mar 3 2006 Paul Wouters 0.69-0.4.20051030 - Bumped version From fedora-extras-commits at redhat.com Thu Mar 23 19:07:52 2006 From: fedora-extras-commits at redhat.com (Josh Bressers (bressers)) Date: Thu, 23 Mar 2006 14:07:52 -0500 Subject: fedora-security/audit fc4,1.179,1.180 fc5,1.92,1.93 Message-ID: <200603231907.k2NJ7qPC025759@cvs-int.fedora.redhat.com> Author: bressers Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25737 Modified Files: fc4 fc5 Log Message: Note the firefox non issue. Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- fc4 22 Mar 2006 19:22:01 -0000 1.179 +++ fc4 23 Mar 2006 19:07:40 -0000 1.180 @@ -6,7 +6,7 @@ CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 ** kernel CVE-2006-1342 ** kernel -CVE-2006-1273 ** firefox (prob win only, vague) +CVE-2006-1273 ignore (firefox) This is an IE only issue CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.92 retrieving revision 1.93 diff -u -r1.92 -r1.93 --- fc5 22 Mar 2006 19:22:01 -0000 1.92 +++ fc5 23 Mar 2006 19:07:40 -0000 1.93 @@ -8,7 +8,7 @@ CVE-2006-1342 ** kernel CVE-2006-1335 version (gnome-screensaver, fixed 2.14) CVE-2006-1296 backport (beagle) bz#185981 [since FEDORA-2006-188] -CVE-2006-1273 ** firefox (prob win only, vague) +CVE-2006-1273 ignore (firefox) this issue only affects IE CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues CVE-2006-1242 ** kernel CVE-2006-1095 ignore (mod_python, 3.2.7 only) From fedora-extras-commits at redhat.com Thu Mar 23 19:48:54 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 14:48:54 -0500 Subject: rpms/perl-SOAP-Lite/devel .cvsignore, 1.2, 1.3 perl-SOAP-Lite.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603231949.k2NJnQdH026075@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-SOAP-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26050 Modified Files: .cvsignore perl-SOAP-Lite.spec sources Log Message: Took ownership from Hunter, updated to new sources and new spec file Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Apr 2005 22:42:45 -0000 1.2 +++ .cvsignore 23 Mar 2006 19:48:53 -0000 1.3 @@ -1 +1 @@ -SOAP-Lite-0.60a.tar.gz +SOAP-Lite-0.67.tar.gz Index: perl-SOAP-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/devel/perl-SOAP-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SOAP-Lite.spec 26 Oct 2005 18:23:25 -0000 1.2 +++ perl-SOAP-Lite.spec 23 Mar 2006 19:48:53 -0000 1.3 @@ -1,73 +1,78 @@ -Name: perl-SOAP-Lite -Version: 0.60a -Release: 3%{?dist} -Summary: Provides the Simple Object Access Protocol (SOAP) - -Group: Development/Libraries -License: GPL or Artistic -URL: http://search.cpan.org/dist/SOAP-Lite/ -Source0: http://www.cpan.org/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-0.60a.tar.gz -Source1: filter-requires.sh -Patch0: SOAP-Lite-0.60a-paths.patch +Name: perl-SOAP-Lite +Version: 0.67 +Release: 2%{?dist} +Summary: Client and server side SOAP implementation +License: GPL or Artistic +Group: Development/Libraries +URL: http://search.cpan.org/dist/SOAP-Lite/ +Source0: http://search.cpan.org/CPAN/authors/id/B/BY/BYRNE/SOAP/SOAP-Lite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: perl >= 1:5.6.1 -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) - -%define __perl_requires %{SOURCE1} +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +BuildRequires: perl-XML-Parser +BuildArch: noarch + +%define bogusreqs 'perl(MQClient::MQSeries)\ +perl(MQSeries)\ +perl(MQSeries::Message)\ +perl(MQSeries::Queue)\ +perl(MQSeries::QueueManager)\ +perl(Net::Jabber)' +%global reqfilt sh -c "%{__perl_requires} | %{__grep} -Fv %{bogusreqs}" +%define __perl_requires %{reqfilt} %description -SOAP::Lite for Perl is a collection of Perl modules which provides a simple -and lightweight interface to the Simple Object Access Protocol (SOAP) both -on client and server side. - -This version of SOAP::Lite supports a subset of the SOAP 1.1 specification -and has initial support for SOAP 1.2 specification. - +SOAP::Lite is a collection of Perl modules which provides a simple and +lightweight interface to the Simple Object Access Protocol (SOAP) both on +client and server side. %prep -%setup -q -n SOAP-Lite-0.60 # Upstream tar is inconsistent. -%patch0 -p1 - -# avoid dependencies -find examples -type f | xargs chmod 644 - +%setup -q -n SOAP-Lite-%{version} %build -# Despite the --noprompt, it prompts for a enter.... -%{__perl} Makefile.PL INSTALLDIRS=vendor --noprompt << EOL - -EOL +%{__perl} Makefile.PL --noprompt 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 -a \( -name .packlist \ - -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';' +find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' +#Items not yet in Extras +#find $RPM_BUILD_ROOT -type f -name JABBER* -exec rm -f {} ';' +#find $RPM_BUILD_ROOT -type f -name MQ* -exec rm -f {} ';' -%check || : -make test - +chmod -R u+w $RPM_BUILD_ROOT/* %clean rm -rf $RPM_BUILD_ROOT +%check +make test %files %defattr(-,root,root,-) -%doc README Changes examples -%{_bindir}/* -%{perl_vendorlib}/* -%{_mandir}/man1/*.1* -%{_mandir}/man3/*.3* - +# For license text(s), see the perl package. +%doc Changes README ReleaseNotes.txt +%{_bindir}/*pl +%{perl_vendorlib}/SOAP +%{perl_vendorlib}/Apache +%{perl_vendorlib}/IO +%{perl_vendorlib}/UDDI +%{perl_vendorlib}/OldDocs +%{perl_vendorlib}/XML +%{perl_vendorlib}/XMLRPC +%{_mandir}/man3/* +%{_mandir}/man1/* %changelog +* Mon Mar 20 2006 Mike McGrath - 0.67-2 +- Removed perl requirements that do not yet exist in Extras + +* Sat Mar 18 2006 Mike McGrath - 0.67-1 +- New Owner and new spec file + * Wed Oct 26 2005 Ville Skytt?? - 0.60a-3 - Fix build, doc permissions (#169821). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SOAP-Lite/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Apr 2005 22:42:45 -0000 1.2 +++ sources 23 Mar 2006 19:48:53 -0000 1.3 @@ -1 +1 @@ -aed9f8e9c4cf180d15c6e15aedc484d7 SOAP-Lite-0.60a.tar.gz +2473030e75838e86529ca57a49f9104f SOAP-Lite-0.67.tar.gz From fedora-extras-commits at redhat.com Thu Mar 23 19:51:10 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 14:51:10 -0500 Subject: owners owners.list,1.759,1.760 Message-ID: <200603231951.k2NJpgwE026151@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26132 Modified Files: owners.list Log Message: Took ownership from thm at duke.edu Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.759 retrieving revision 1.760 diff -u -r1.759 -r1.760 --- owners.list 22 Mar 2006 19:26:58 -0000 1.759 +++ owners.list 23 Mar 2006 19:51:09 -0000 1.760 @@ -1026,7 +1026,7 @@ Fedora Extras|perl-Regexp-Common|Regexp::Common Perl module|rc040203 at freenet.de|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-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)|thm at duke.edu|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 Fedora Extras|perl-Sort-Versions|Perl module for sorting of revision-like numbers|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spiffy|Framework for doing object oriented (OO) programming in Perl|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu Mar 23 20:04:47 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:04:47 -0500 Subject: rpms/otrs - New directory Message-ID: <200603232004.k2NK4n73028223@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28215/otrs Log Message: Directory /cvs/extras/rpms/otrs added to the repository From fedora-extras-commits at redhat.com Thu Mar 23 20:04:54 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:04:54 -0500 Subject: rpms/otrs/devel - New directory Message-ID: <200603232004.k2NK4ulZ028238@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28215/otrs/devel Log Message: Directory /cvs/extras/rpms/otrs/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 23 20:05:17 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:05:17 -0500 Subject: rpms/otrs Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603232005.k2NK5JgY028272@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28260 Added Files: Makefile import.log Log Message: Setup of module otrs --- NEW FILE Makefile --- # Top level Makefile for module otrs all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 23 20:05:24 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:05:24 -0500 Subject: rpms/otrs/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603232005.k2NK5QgT028292@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28260/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module otrs --- NEW 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 Mar 23 20:12:00 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:12:00 -0500 Subject: rpms/otrs import.log,1.1,1.2 Message-ID: <200603232012.k2NKCXIa028369@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28334 Modified Files: import.log Log Message: auto-import otrs-2.0.4-3 on branch devel from otrs-2.0.4-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/otrs/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 23 Mar 2006 20:05:17 -0000 1.1 +++ import.log 23 Mar 2006 20:12:00 -0000 1.2 @@ -0,0 +1 @@ +otrs-2_0_4-3:HEAD:otrs-2.0.4-3.src.rpm:1143148320 From fedora-extras-commits at redhat.com Thu Mar 23 20:12:09 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:12:09 -0500 Subject: rpms/otrs/devel otrs.httpd.conf, NONE, 1.1 otrs.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603232012.k2NKCgi5028373@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28334/devel Modified Files: .cvsignore sources Added Files: otrs.httpd.conf otrs.spec Log Message: auto-import otrs-2.0.4-3 on branch devel from otrs-2.0.4-3.src.rpm --- NEW FILE otrs.httpd.conf --- # -- # added for OTRS (http://otrs.org/) # -- # agent, admin and customer frontend ScriptAlias /otrs/ "/var/www/otrs/bin/cgi-bin/" Alias /otrs-web/ "/var/www/otrs/var/httpd/htdocs/" # load all otrs modules Perlrequire /var/www/otrs/scripts/apache2-perl-startup.pl # Apache::Reload - Reload Perl Modules when Changed on Disk PerlModule Apache2::Reload PerlInitHandler Apache2::Reload PerlModule Apache2::RequestRec # set mod_perl2 options # ErrorDocument 403 /otrs/customer.pl ErrorDocument 403 /otrs/index.pl SetHandler perl-script PerlResponseHandler ModPerl::Registry Options +ExecCGI PerlOptions +ParseHeaders PerlOptions +SetupEnv Order Deny,Allow Deny from all Allow from 127.0.0.1 # directory settings AllowOverride None Options +ExecCGI -Includes Order allow,deny Allow from all AllowOverride None Order allow,deny Allow from all --- NEW FILE otrs.spec --- Summary: The Open Ticket Request System Name: otrs Version: 2.0.4 Release: 3 License: GPL Group: Applications/Internet URL: http://www.otrs.org/ Source0: ftp://ftp.otrs.org/pub/%{name}/%{name}-%{version}-01.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: otrs.httpd.conf BuildArch: noarch Requires: mod_perl httpd mysql fetchmail procmail /usr/sbin/sendmail Requires(pre): %{_sbindir}/useradd httpd Requires(preun): /sbin/service /sbin/chkconfig Requires(post): /sbin/chkconfig /sbin/service Requires(postun): /sbin/service #This package does not provide ANY perl modules %define bogusreqs 'perl(Kernel\ perl(HTML::Safe)' %global reqfilt sh -c "%{__perl_requires} | %{__grep} -Fv %{bogusreqs}" %global provfilt sh -c "%{__perl_provides} | %{__grep} -Fv %{bogusreqs}" %define __perl_requires %{reqfilt} %define __perl_provides %{provfilt} %define otrsdir %{_localstatedir}/www/%{name}/ %description OTRS is an Open source Ticket Request System (also well known as trouble ticket system) with many features to manage customer telephone calls and e-mails. The system is built to allow your support, sales, pre-sales, billing, internal IT, helpdesk, etc. department to react quickly to inbound inquiries. %prep %setup -qn otrs %build # copy config file cp Kernel/Config.pm.dist Kernel/Config.pm cd Kernel/Config/ && for foo in *.dist; do cp $foo `basename $foo .dist`; done && cd ../../ chmod 644 ./Kernel/System/Web/*.pm chmod 644 .fetchmailrc.dist sed -i "s/# chkconfig: 2345/# chkconfig: -/" scripts/redhat-rcotrs sed -i "s/OTRS_DB_RUNNING=1/OTRS_DB_RUNNING=0/" scripts/redhat-rcotrs-config sed -i "s|OTRS_ROOT=/opt/|OTRS_ROOT=%{_localstatedir}/www/|" scripts/redhat-rcotrs-config sed -i "s|/opt/|%{_localstatedir}/www/|g" INSTALL Kernel/Config/Defaults.pm Kernel/Config.pm Kernel/Config.pm.dist Kernel/Modules/Installer.pm scripts/apache2-perl-startup.pl README.webserver ./.procmailrc.dist ./bin/SetPermissions.sh ./bin/Cron.sh CHANGES README for foo in var/cron/*.dist; do mv $foo var/cron/`basename $foo .dist`; done for f in ./.*.dist; do mv $f `basename $f .dist`; done # These perl modules are not yet in extras rm ./Kernel/System/CustomerAuth/Radius.pm rm ./Kernel/System/Auth/Radius.pm # Not needed rm ./bin/Cron4Win32.pl rm `find ./scripts/ | grep -i "suse\|apache-"` %install rm -rf %{buildroot} mkdir -p %{buildroot}/%{otrsdir} install -d -m 755 %{buildroot}/etc/rc.d/init.d install -d -m 755 %{buildroot}/etc/sysconfig install -d -m 755 %{buildroot}/etc/httpd/conf.d install -m 755 scripts/redhat-rcotrs %{buildroot}/%{_initrddir}/otrs install -m 644 scripts/redhat-rcotrs-config %{buildroot}/%{_sysconfdir}/sysconfig/otrs install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/%{name}.conf install -m 644 .*ail* %{buildroot}/%{otrsdir} install -m 644 RELEASE %{buildroot}/%{otrsdir}/ mv [bKsv]* %{buildroot}/%{otrsdir} chmod 755 %{buildroot}/%{otrsdir}/scripts/*pl chmod -R 2775 %{buildroot}/%{otrsdir}/var/[alstp]* chmod -R g+w %{buildroot}/%{otrsdir}/var/httpd rm %{buildroot}/%{otrsdir}/scripts/redhat-* rm -rf %{buildroot}/%{otrsdir}/Kernel/cpan-lib/[^H]* %pre %{_sbindir}/useradd -d %{otrsdir} -g apache -c 'OTRS System User' -r -s /sbin/nologin otrs 2> /dev/null || : %preun if [ $1 = 0 ]; then /sbin/service otrs stop > /dev/null 2>&1 || : /sbin/chkconfig --del %{name} || : fi %post /sbin/chkconfig --add %{name} || : /sbin/service httpd condrestart > /dev/null 2>&1 || : %postun /sbin/service httpd condrestart > /dev/null 2>&1 ||: %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %config(noreplace) %{_sysconfdir}/sysconfig/otrs %config(noreplace) %{_sysconfdir}/httpd/conf.d/otrs.conf %{_initrddir}/%{name} %doc doc/ README.webserver README INSTALL CHANGES COPYING CREDITS INSTALL.RedHat README.dtl README.database RELEASE TODO UPGRADING %defattr(-,apache,root,-) %dir %{otrsdir} %config(noreplace) %attr(0640,apache,root) %{otrsdir}/Kernel/Config.pm %dir %{otrsdir}/Kernel/ %{otrsdir}/Kernel/Config.pm.dist %{otrsdir}/Kernel/Config/ %{otrsdir}/Kernel/cpan-lib/ %{otrsdir}/Kernel/Language* %{otrsdir}/Kernel/Modules/ %{otrsdir}/Kernel/Output/ %{otrsdir}/Kernel/System/ %{otrsdir}/bin %{otrsdir}/scripts %{otrsdir}/RELEASE %attr(-,otrs,apache) %{otrsdir}/var %attr(0660,otrs,apache) %{otrsdir}/.*ail* %changelog * Wed Mar 22 2006 Mike McGrath 2.0.4-3 - Removed bogus req's and perl provides - Removed a number of perl packages that are provided by Fedora - Now using %{otrsdir} macro - Created an otrs.httpd.conf source - Changed permissions for otrs/var/httpd * Wed Mar 8 2006 Mike McGrath 2.0.4-2 - Major updates in permissions - Removed perl perl-DBI perl-DBD-MySQL and perl-URI from requires - Changed requires to /usr/sbin/sendmail - Updated Pre to check for udpate conditions - Removed Requires(postun) - Removed MaxRequestsPerChild from http config - Added RELEASE file to ~otrs. It's required there. * Wed Feb 1 2006 Mike McGrath 2.0.4-1 - Fedora friendly spec file * Thu Feb 12 2003 - martin+rpm at otrs.org - spec for RedHat 8.0 created Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/otrs/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 23 Mar 2006 20:05:24 -0000 1.1 +++ .cvsignore 23 Mar 2006 20:12:08 -0000 1.2 @@ -0,0 +1 @@ +otrs-2.0.4-01.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/otrs/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 23 Mar 2006 20:05:24 -0000 1.1 +++ sources 23 Mar 2006 20:12:08 -0000 1.2 @@ -0,0 +1 @@ +cfc0fa4f711c2fa92bc513b57632bbfe otrs-2.0.4-01.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 23 20:16:52 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 15:16:52 -0500 Subject: owners owners.list,1.760,1.761 Message-ID: <200603232017.k2NKHSbq028439@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28417 Modified Files: owners.list Log Message: Added otrs Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.760 retrieving revision 1.761 diff -u -r1.760 -r1.761 --- owners.list 23 Mar 2006 19:51:09 -0000 1.760 +++ owners.list 23 Mar 2006 20:16:51 -0000 1.761 @@ -787,6 +787,7 @@ Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| Fedora Extras|ortp|A C library implementing the RTP protocol (RFC3550)|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|osiv|Open Source Image Velocimetry|ed at eh3.com|extras-qa at fedoraproject.org| +Fedora Extras|otrs|The Open Ticket Request System|imlinux at gmail.com|extras-qa at fedoraproject.org| Fedora Extras|ots|A text summarizer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|overgod|Another Asteroid like game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|p0f|Versatile passive OS fingerprinting tool|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 23 21:31:05 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 16:31:05 -0500 Subject: rpms/libetpan/devel libetpan.spec,1.9,1.10 Message-ID: <200603232131.k2NLVbb2030753@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30718 Modified Files: libetpan.spec Log Message: - remove smp_mflags for now Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/devel/libetpan.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libetpan.spec 23 Mar 2006 09:21:54 -0000 1.9 +++ libetpan.spec 23 Mar 2006 21:31:04 -0000 1.10 @@ -35,7 +35,7 @@ %build %configure --disable-static --with-gnutls=no -make %{?_smp_mflags} +make # %{?_smp_mflags} not parallel clean %install From fedora-extras-commits at redhat.com Thu Mar 23 22:23:17 2006 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Thu, 23 Mar 2006 17:23:17 -0500 Subject: rpms/istanbul/devel istanbul.spec,1.5,1.6 Message-ID: <200603232223.k2NMNnU7000942@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv925 Modified Files: istanbul.spec Log Message: * Thu Mar 23 2006 Jef Spaleta - 0.1.1-9 - attempt to fix 64bit build failures do to unpackaged la Index: istanbul.spec =================================================================== RCS file: /cvs/extras/rpms/istanbul/devel/istanbul.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- istanbul.spec 1 Feb 2006 17:59:00 -0000 1.5 +++ istanbul.spec 23 Mar 2006 22:23:16 -0000 1.6 @@ -8,7 +8,7 @@ Summary: Desktop Session Recorder Name: istanbul Version: 0.1.1 -Release: 8 +Release: 9 License: GPL Group: Applications/Multimedia URL: http://live.gnome.org/Istanbul @@ -53,7 +53,7 @@ %install rm -rf $RPM_BUILD_ROOT %makeinstall -rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/istanbul/extern/pytrayicon/*.la +rm -f $RPM_BUILD_ROOT%{python_sitelib}/%{name}/extern/pytrayicon/*.la desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -80,6 +80,7 @@ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/glade %{_datadir}/%{name}/glade/prefs.glade + %dir %{python_sitelib}/%{name} %{python_sitelib}/%{name}/*.py* %dir %{python_sitelib}/%{name}/extern @@ -91,8 +92,12 @@ %{python_sitelib}/%{name}/main/*.py* %dir %{python_sitelib}/%{name}/configure %{python_sitelib}/%{name}/configure/*.py* +%{python_sitelib}/%{name}/extern/pytrayicon/*.so* %changelog +* Thu Mar 23 2006 Jef Spaleta - 0.1.1-9 +- attempt to fix 64bit build failures do to unpackaged la + * Wed Feb 01 2006 Jef Spaleta - 0.1.1-8 - added pygtk2-devel buildrequires From fedora-extras-commits at redhat.com Thu Mar 23 22:28:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 23 Mar 2006 17:28:25 -0500 Subject: rpms/libetpan/FC-5 libetpan.spec,1.9,1.10 Message-ID: <200603232228.k2NMSwVx001063@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libetpan/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1046 Modified Files: libetpan.spec Log Message: - disable smp_mflags for now Index: libetpan.spec =================================================================== RCS file: /cvs/extras/rpms/libetpan/FC-5/libetpan.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libetpan.spec 23 Mar 2006 09:21:43 -0000 1.9 +++ libetpan.spec 23 Mar 2006 22:28:25 -0000 1.10 @@ -35,7 +35,7 @@ %build %configure --disable-static --with-gnutls=no -make %{?_smp_mflags} +make # %{?_smp_mflags} not parallel clean %install From fedora-extras-commits at redhat.com Thu Mar 23 22:43:54 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 23 Mar 2006 17:43:54 -0500 Subject: rpms/octave/FC-5 octave-2.9.5-sparse.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 octave.spec, 1.32, 1.33 sources, 1.6, 1.7 octave-2.9.4-header.patch, 1.1, NONE octave-2.9.4-x86_64.patch, 1.2, NONE Message-ID: <200603232244.k2NMiRmY001199@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1175 Modified Files: .cvsignore octave.spec sources Added Files: octave-2.9.5-sparse.patch Removed Files: octave-2.9.4-header.patch octave-2.9.4-x86_64.patch Log Message: New upstream release. Lots of spec changes--see changelog. octave-2.9.5-sparse.patch: --- NEW FILE octave-2.9.5-sparse.patch --- Index: liboctave/SparseCmplxQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v retrieving revision 1.2 diff -u -r1.2 SparseCmplxQR.h --- liboctave/SparseCmplxQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseCmplxQR.h 23 Mar 2006 17:56:07 -0000 @@ -137,6 +137,23 @@ #endif }; + +// Publish externally used friend functions. + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, + const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); #endif /* Index: liboctave/SparseQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseQR.h,v retrieving revision 1.2 diff -u -r1.2 SparseQR.h --- liboctave/SparseQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseQR.h 23 Mar 2006 17:56:07 -0000 @@ -133,6 +133,22 @@ #endif }; + +// Publish externally used friend functions. + +extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseMatrix qrsolve (const SparseMatrix &a, const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseMatrix &a, const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); + #endif /* Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Nov 2005 06:02:28 -0000 1.6 +++ .cvsignore 23 Mar 2006 22:43:54 -0000 1.7 @@ -1 +1 @@ -octave-2.9.4.tar.bz2 +octave-2.9.5.tar.bz2 Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- octave.spec 16 Mar 2006 18:36:26 -0000 1.32 +++ octave.spec 23 Mar 2006 22:43:54 -0000 1.33 @@ -1,14 +1,13 @@ Name: octave -Version: 2.9.4 -Release: 8%{?dist} +Version: 2.9.5 +Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering License: GPL Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 -Patch0: octave-2.9.4-header.patch -Patch1: octave-2.9.4-x86_64.patch +Patch0: octave-2.9.5-sparse.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -18,7 +17,7 @@ BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel BuildRequires: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildRequires: readline-devel glibc-devel fftw-devel autoconf gperf -BuildRequires: ufsparse-devel glpk-devel gnuplot +BuildRequires: ufsparse-devel glpk-devel gnuplot desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,7 +41,7 @@ Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: readline-devel fftw-devel hdf5-devel zlib-devel -Requires: lapack-devel blas-devel +Requires: lapack-devel blas-devel gcc-c++ %description devel The octave-devel package contains files needed for developing @@ -52,47 +51,53 @@ %prep %setup -q %patch0 -p0 -%patch1 -p0 -./autogen.sh %build %ifarch x86_64 -%define enable64 --enable-64=yes +%define enable64 yes %else -%define enable64 --enable-64=no +%define enable64 no %endif -CPPFLAGS=-I%{_includedir}/glpk \ -CXXFLAGS="$RPM_OPT_FLAGS" ./configure %enable64 \ - --enable-shared --disable-static --prefix=%{_prefix} \ - --infodir=%{_infodir} --libdir=%{_libdir} --mandir=%{_mandir} -make %{?_smp_mflags} +export CPPFLAGS=-I%{_includedir}/glpk +%configure --enable-shared --disable-static --enable-64=%enable64 +make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}" -#empty -rm -f interpreter/octave.{ky,pg,tp} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f doc/interpreter/munge-texi doc/interpreter/*.o strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir # Make library links mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/octave-%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/octave-%{_arch}.conf -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R +# Remove RPM_BUILD_ROOT from ls-R files +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ls-R +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_datadir}/%{name}/ls-R + +# Clean doc directory +pushd doc + make distclean + rm -f *.in */*.in */*.cc refcard/*.tex +popd + +# Create desktop file +rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop +desktop-file-install --vendor fedora --add-category X-Fedora \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop + -rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/install-info --info-dir=%{_infodir}/ --section="Programming:" --entry="* Octave:(octave). Interactive language for numerical computations." %{_infodir}/octave.info.gz +/sbin/install-info --info-dir=%{_infodir} --section="Programming:" \ + --entry="* Octave:(%{name}). %{summary}." %{_infodir}/octave.info.gz %preun if [ "$1" = "0" ]; then @@ -105,8 +110,8 @@ %files %defattr(-,root,root) %doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP -%doc SENDING-PATCHES THANKS -%doc doc/faq doc/liboctave doc/refcard emacs examples +%doc SENDING-PATCHES THANKS emacs examples doc/interpreter/octave.p* +%doc doc/faq doc/interpreter/HTML doc/refcard %{_bindir}/octave %{_bindir}/octave-%{version} %config(noreplace) /etc/ld.so.conf.d/* @@ -115,9 +120,11 @@ %{_libexecdir}/octave %{_mandir}/man*/octave* %{_infodir}/octave.info* +%{_datadir}/applications/* %files devel %defattr(-,root,root) +%doc doc/liboctave %{_bindir}/mkoctfile* %{_bindir}/octave-bug* %{_bindir}/octave-config* @@ -126,6 +133,13 @@ %changelog +* Thu Mar 23 2006 Quentin Spencer 2.9.5-1 +- New upstream release; remove old patches; add sparse patch. +- Add gcc-c++ as dependency for devel package. +- Add more docs; cleanup extra files in docs. +- Simplify configure command. +- Install desktop file. + * Fri Feb 24 2006 Quentin Spencer 2.9.4-8 - Rebuild for new hdf5. - Remove obsolete configure options. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Nov 2005 06:02:28 -0000 1.6 +++ sources 23 Mar 2006 22:43:54 -0000 1.7 @@ -1 +1 @@ -43561b0d8432847f5eae349c6e89b30a octave-2.9.4.tar.bz2 +09eff7b2319383778db7bb5e50619bf9 octave-2.9.5.tar.bz2 --- octave-2.9.4-header.patch DELETED --- --- octave-2.9.4-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 23 22:44:58 2006 From: fedora-extras-commits at redhat.com (Jef Spaleta (jspaleta)) Date: Thu, 23 Mar 2006 17:44:58 -0500 Subject: rpms/istanbul/FC-5 istanbul.spec,1.5,1.6 Message-ID: <200603232245.k2NMjV4V001224@cvs-int.fedora.redhat.com> Author: jspaleta Update of /cvs/extras/rpms/istanbul/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1205 Modified Files: istanbul.spec Log Message: * Thu Mar 23 2006 Jef Spaleta - 0.1.1-9 - attempt to fix 64bit build failures do to unpackaged la Index: istanbul.spec =================================================================== RCS file: /cvs/extras/rpms/istanbul/FC-5/istanbul.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- istanbul.spec 1 Feb 2006 17:59:00 -0000 1.5 +++ istanbul.spec 23 Mar 2006 22:44:58 -0000 1.6 @@ -8,7 +8,7 @@ Summary: Desktop Session Recorder Name: istanbul Version: 0.1.1 -Release: 8 +Release: 9%{?dist} License: GPL Group: Applications/Multimedia URL: http://live.gnome.org/Istanbul @@ -53,7 +53,7 @@ %install rm -rf $RPM_BUILD_ROOT %makeinstall -rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/istanbul/extern/pytrayicon/*.la +rm -f $RPM_BUILD_ROOT%{python_sitelib}/%{name}/extern/pytrayicon/*.la desktop-file-install --vendor gnome --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -80,6 +80,7 @@ %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/glade %{_datadir}/%{name}/glade/prefs.glade + %dir %{python_sitelib}/%{name} %{python_sitelib}/%{name}/*.py* %dir %{python_sitelib}/%{name}/extern @@ -91,8 +92,12 @@ %{python_sitelib}/%{name}/main/*.py* %dir %{python_sitelib}/%{name}/configure %{python_sitelib}/%{name}/configure/*.py* +%{python_sitelib}/%{name}/extern/pytrayicon/*.so* %changelog +* Thu Mar 23 2006 Jef Spaleta - 0.1.1-9 +- attempt to fix 64bit build failures do to unpackaged la + * Wed Feb 01 2006 Jef Spaleta - 0.1.1-8 - added pygtk2-devel buildrequires From fedora-extras-commits at redhat.com Thu Mar 23 22:50:59 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Thu, 23 Mar 2006 17:50:59 -0500 Subject: rpms/octave/devel octave-2.9.5-sparse.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 octave.spec, 1.32, 1.33 sources, 1.6, 1.7 octave-2.9.4-header.patch, 1.1, NONE octave-2.9.4-x86_64.patch, 1.2, NONE Message-ID: <200603232251.k2NMpVr2001354@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1330 Modified Files: .cvsignore octave.spec sources Added Files: octave-2.9.5-sparse.patch Removed Files: octave-2.9.4-header.patch octave-2.9.4-x86_64.patch Log Message: New upstream release. Lots of spec changes--see changelog. octave-2.9.5-sparse.patch: --- NEW FILE octave-2.9.5-sparse.patch --- Index: liboctave/SparseCmplxQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v retrieving revision 1.2 diff -u -r1.2 SparseCmplxQR.h --- liboctave/SparseCmplxQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseCmplxQR.h 23 Mar 2006 17:56:07 -0000 @@ -137,6 +137,23 @@ #endif }; + +// Publish externally used friend functions. + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, + const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); #endif /* Index: liboctave/SparseQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseQR.h,v retrieving revision 1.2 diff -u -r1.2 SparseQR.h --- liboctave/SparseQR.h 8 Mar 2006 20:17:38 -0000 1.2 +++ liboctave/SparseQR.h 23 Mar 2006 17:56:07 -0000 @@ -133,6 +133,22 @@ #endif }; + +// Publish externally used friend functions. + +extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, + octave_idx_type &info); + +extern SparseMatrix qrsolve (const SparseMatrix &a, const SparseMatrix &b, + octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseMatrix &a, const ComplexMatrix &b, + octave_idx_type &info); + +extern SparseComplexMatrix qrsolve (const SparseMatrix &a, + const SparseComplexMatrix &b, + octave_idx_type &info); + #endif /* Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/octave/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 12 Nov 2005 06:02:28 -0000 1.6 +++ .cvsignore 23 Mar 2006 22:50:59 -0000 1.7 @@ -1 +1 @@ -octave-2.9.4.tar.bz2 +octave-2.9.5.tar.bz2 Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- octave.spec 16 Mar 2006 18:36:26 -0000 1.32 +++ octave.spec 23 Mar 2006 22:50:59 -0000 1.33 @@ -1,14 +1,13 @@ Name: octave -Version: 2.9.4 -Release: 8%{?dist} +Version: 2.9.5 +Release: 1%{?dist} Summary: A high-level language for numerical computations Epoch: 6 Group: Applications/Engineering License: GPL Source: ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2 -Patch0: octave-2.9.4-header.patch -Patch1: octave-2.9.4-x86_64.patch +Patch0: octave-2.9.5-sparse.patch URL: http://www.octave.org Requires: gnuplot less info texinfo Requires(post): /sbin/install-info @@ -18,7 +17,7 @@ BuildRequires: bison flex less tetex gcc-gfortran lapack-devel blas-devel BuildRequires: ncurses-devel zlib-devel libtermcap-devel hdf5-devel BuildRequires: readline-devel glibc-devel fftw-devel autoconf gperf -BuildRequires: ufsparse-devel glpk-devel gnuplot +BuildRequires: ufsparse-devel glpk-devel gnuplot desktop-file-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,7 +41,7 @@ Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Requires: readline-devel fftw-devel hdf5-devel zlib-devel -Requires: lapack-devel blas-devel +Requires: lapack-devel blas-devel gcc-c++ %description devel The octave-devel package contains files needed for developing @@ -52,47 +51,53 @@ %prep %setup -q %patch0 -p0 -%patch1 -p0 -./autogen.sh %build %ifarch x86_64 -%define enable64 --enable-64=yes +%define enable64 yes %else -%define enable64 --enable-64=no +%define enable64 no %endif -CPPFLAGS=-I%{_includedir}/glpk \ -CXXFLAGS="$RPM_OPT_FLAGS" ./configure %enable64 \ - --enable-shared --disable-static --prefix=%{_prefix} \ - --infodir=%{_infodir} --libdir=%{_libdir} --mandir=%{_mandir} -make %{?_smp_mflags} +export CPPFLAGS=-I%{_includedir}/glpk +%configure --enable-shared --disable-static --enable-64=%enable64 +make %{?_smp_mflags} OCTAVE_RELEASE="Fedora Extras %{version}-%{release}" -#empty -rm -f interpreter/octave.{ky,pg,tp} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm -f doc/interpreter/munge-texi doc/interpreter/*.o strip $RPM_BUILD_ROOT/usr/libexec/octave/%{version}/oct/*/*.oct +rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir # Make library links mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d echo "%{_libdir}/octave-%{version}" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/octave-%{_arch}.conf -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_libexecdir}/%{name}/ls-R -perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT/%{_datadir}/%{name}/ls-R +# Remove RPM_BUILD_ROOT from ls-R files +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_libexecdir}/%{name}/ls-R +perl -pi -e "s,$RPM_BUILD_ROOT,," $RPM_BUILD_ROOT%{_datadir}/%{name}/ls-R + +# Clean doc directory +pushd doc + make distclean + rm -f *.in */*.in */*.cc refcard/*.tex +popd + +# Create desktop file +rm $RPM_BUILD_ROOT%{_datadir}/applications/www.octave.org-octave.desktop +desktop-file-install --vendor fedora --add-category X-Fedora \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications examples/octave.desktop + -rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir %clean rm -rf $RPM_BUILD_ROOT %post /sbin/ldconfig -/sbin/install-info --info-dir=%{_infodir}/ --section="Programming:" --entry="* Octave:(octave). Interactive language for numerical computations." %{_infodir}/octave.info.gz +/sbin/install-info --info-dir=%{_infodir} --section="Programming:" \ + --entry="* Octave:(%{name}). %{summary}." %{_infodir}/octave.info.gz %preun if [ "$1" = "0" ]; then @@ -105,8 +110,8 @@ %files %defattr(-,root,root) %doc COPYING NEWS* PROJECTS README README.Linux README.kpathsea ROADMAP -%doc SENDING-PATCHES THANKS -%doc doc/faq doc/liboctave doc/refcard emacs examples +%doc SENDING-PATCHES THANKS emacs examples doc/interpreter/octave.p* +%doc doc/faq doc/interpreter/HTML doc/refcard %{_bindir}/octave %{_bindir}/octave-%{version} %config(noreplace) /etc/ld.so.conf.d/* @@ -115,9 +120,11 @@ %{_libexecdir}/octave %{_mandir}/man*/octave* %{_infodir}/octave.info* +%{_datadir}/applications/* %files devel %defattr(-,root,root) +%doc doc/liboctave %{_bindir}/mkoctfile* %{_bindir}/octave-bug* %{_bindir}/octave-config* @@ -126,6 +133,13 @@ %changelog +* Thu Mar 23 2006 Quentin Spencer 2.9.5-1 +- New upstream release; remove old patches; add sparse patch. +- Add gcc-c++ as dependency for devel package. +- Add more docs; cleanup extra files in docs. +- Simplify configure command. +- Install desktop file. + * Fri Feb 24 2006 Quentin Spencer 2.9.4-8 - Rebuild for new hdf5. - Remove obsolete configure options. Index: sources =================================================================== RCS file: /cvs/extras/rpms/octave/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 12 Nov 2005 06:02:28 -0000 1.6 +++ sources 23 Mar 2006 22:50:59 -0000 1.7 @@ -1 +1 @@ -43561b0d8432847f5eae349c6e89b30a octave-2.9.4.tar.bz2 +09eff7b2319383778db7bb5e50619bf9 octave-2.9.5.tar.bz2 --- octave-2.9.4-header.patch DELETED --- --- octave-2.9.4-x86_64.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 23 23:19:23 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 23 Mar 2006 18:19:23 -0500 Subject: comps comps-fe5.xml.in,1.30,1.31 Message-ID: <200603232319.k2NNJt2k003389@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3372 Modified Files: comps-fe5.xml.in Log Message: Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- comps-fe5.xml.in 19 Mar 2006 01:49:51 -0000 1.30 +++ comps-fe5.xml.in 23 Mar 2006 23:19:21 -0000 1.31 @@ -50,12 +50,15 @@ mock monotone ocaml + pl + plt-scheme pylint quilt rpmlint splint tkcvs tla + yap yasm From fedora-extras-commits at redhat.com Fri Mar 24 01:33:39 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 23 Mar 2006 20:33:39 -0500 Subject: extras-buildsys/server PackageJob.py,1.44,1.45 Message-ID: <200603240133.k2O1XdH8008021@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7987/server Modified Files: PackageJob.py Log Message: 2006-03-23 Dan Williams * server/PackageJob.py - (_arch_deps_solved): fix cachedir and logfile paths; turns out yum already adds the installroot to these. Furthermore, return an error when we can't find a suitable yum config file for the arch Index: PackageJob.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/PackageJob.py,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- PackageJob.py 13 Mar 2006 03:45:48 -0000 1.44 +++ PackageJob.py 24 Mar 2006 01:33:31 -0000 1.45 @@ -446,9 +446,9 @@ job_yum_dir = os.path.join(self._depsolve_dir, arch) for line in config_opts['yum.conf'].split('\n'): if string.find(line, "cachedir=") >= 0: - line = "cachedir=%s" % os.path.join(job_yum_dir, "cache") + line = "cachedir=cache" elif string.find(line, "logfile=") >= 0: - line = "logfile=%s" % os.path.join(job_yum_dir, "yum.log") + line = "logfile=yum.log" config_lines.append(line+'\n') del config_opts @@ -471,7 +471,12 @@ try: base = yum.YumBase() yum_config = self._write_yum_conf(arch) - base.doConfigSetup(fn=yum_config, root=os.path.dirname(yum_config)) + if not yum_config: + del base + raise DepError("WARNING: bad yum config for arch %s." % arch) + + depsolve_root = os.path.dirname(yum_config) + '/' + base.doConfigSetup(fn=yum_config, root=depsolve_root) threshold = 0 if DEBUG: threshold = 5 @@ -513,7 +518,10 @@ print "%s (%s/%s): Depsolve Error: %s" % (self.uid, self.package, arch, str(e)) success = False - del base, srpm + if base: + del base + if srpm: + del srpm return success def start_depsolve(self, first_try=False): From fedora-extras-commits at redhat.com Fri Mar 24 01:33:33 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 23 Mar 2006 20:33:33 -0500 Subject: extras-buildsys ChangeLog,1.177,1.178 Message-ID: <200603240134.k2O1Y3C1008024@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7987 Modified Files: ChangeLog Log Message: 2006-03-23 Dan Williams * server/PackageJob.py - (_arch_deps_solved): fix cachedir and logfile paths; turns out yum already adds the installroot to these. Furthermore, return an error when we can't find a suitable yum config file for the arch Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.177 retrieving revision 1.178 diff -u -r1.177 -r1.178 --- ChangeLog 20 Mar 2006 12:46:44 -0000 1.177 +++ ChangeLog 24 Mar 2006 01:33:25 -0000 1.178 @@ -1,3 +1,10 @@ +2006-03-23 Dan Williams + + * server/PackageJob.py + - (_arch_deps_solved): fix cachedir and logfile paths; turns out yum + already adds the installroot to these. Furthermore, return an + error when we can't find a suitable yum config file for the arch + 2006-03-20 Dan Williams * common/FileDownloader.py From fedora-extras-commits at redhat.com Fri Mar 24 01:34:55 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 23 Mar 2006 20:34:55 -0500 Subject: extras-buildsys/server Repo.py,1.22,1.23 Message-ID: <200603240134.k2O1YtP1008064@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8030/server Modified Files: Repo.py Log Message: 2006-03-23 Dan Williams * server/Repo.py - Consolidate depsolve_again and depsolve_immediate locks into one lock to avoid deadlocks Index: Repo.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/Repo.py,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- Repo.py 24 Feb 2006 17:27:02 -0000 1.22 +++ Repo.py 24 Mar 2006 01:34:48 -0000 1.23 @@ -71,9 +71,8 @@ # The queues are dicts mapping buildjob->boolean, where a boolean # value of True means the job's depsolve has started, and false # means it hasn't. - self._depsolve_immediate_lock = threading.Lock() + self._depsolve_lock = threading.Lock() self._depsolve_immediate_queue = {} - self._depsolve_again_lock = threading.Lock() self._depsolve_again_queue = {} # Repo unlock queue @@ -107,14 +106,12 @@ def request_depsolve(self, buildjob, first_try=False): """ Registers a buildjob be notified to start depsolving when the repo is ready """ + self._depsolve_lock.acquire() if first_try: - self._depsolve_immediate_lock.acquire() self._depsolve_immediate_queue[buildjob] = False - self._depsolve_immediate_lock.release() else: - self._depsolve_again_lock.acquire() self._depsolve_again_queue[buildjob] = False - self._depsolve_again_lock.release() + self._depsolve_lock.release() def request_unlock(self, archjob): self._repo_unlock_lock.acquire() @@ -154,10 +151,10 @@ """ Start waiting depsolves, but only a certain number to avoid nailing the build server too hard. """ - self._depsolve_immediate_lock.acquire() - self._depsolve_again_lock.acquire() + self._depsolve_lock.acquire() max_immediate_depsolves = self.MAX_DEPSOLVE_JOBS + max_again_depsolves = 0 if repo_changed: max_again_depsolves = self.MAX_DEPSOLVE_JOBS / 2 max_immediate_depsolves = self.MAX_DEPSOLVE_JOBS / 2 @@ -168,26 +165,22 @@ if repo_changed: self._start_depsolves_for_queue(self._depsolve_again_queue, max_again_depsolves, first_try=False) - self._depsolve_again_lock.release() - self._depsolve_immediate_lock.release() + self._depsolve_lock.release() def notify_depsolve_done(self, buildjob): """ Notifies the repo that a job is done depsolving """ - self._depsolve_immediate_lock.acquire() - self._depsolve_again_lock.acquire() + self._depsolve_lock.acquire() if buildjob in self._depsolve_immediate_queue: del self._depsolve_immediate_queue[buildjob] elif buildjob in self._depsolve_again_queue: del self._depsolve_again_queue[buildjob] - self._depsolve_again_lock.release() - self._depsolve_immediate_lock.release() + self._depsolve_lock.release() def _any_depsolving_jobs(self): """ Determines if any jobs are currently depsolving """ any_depsolving = False - self._depsolve_immediate_lock.acquire() - self._depsolve_again_lock.acquire() + self._depsolve_lock.acquire() for job in self._depsolve_immediate_queue.keys(): if self._depsolve_immediate_queue[job]: any_depsolving = True @@ -197,8 +190,7 @@ if self._depsolve_again_queue[job]: any_depsolving = True break - self._depsolve_again_lock.release() - self._depsolve_immediate_lock.release() + self._depsolve_lock.release() return any_depsolving @@ -349,6 +341,9 @@ time.sleep(5) + # done + print "Repo (%s): shut down." % self._target_cfg.target_string() + def stop(self): self._stop = True From fedora-extras-commits at redhat.com Fri Mar 24 01:34:50 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Thu, 23 Mar 2006 20:34:50 -0500 Subject: extras-buildsys ChangeLog,1.178,1.179 Message-ID: <200603240135.k2O1ZKlw008067@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8030 Modified Files: ChangeLog Log Message: 2006-03-23 Dan Williams * server/Repo.py - Consolidate depsolve_again and depsolve_immediate locks into one lock to avoid deadlocks Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.178 retrieving revision 1.179 diff -u -r1.178 -r1.179 --- ChangeLog 24 Mar 2006 01:33:25 -0000 1.178 +++ ChangeLog 24 Mar 2006 01:34:42 -0000 1.179 @@ -1,5 +1,11 @@ 2006-03-23 Dan Williams + * server/Repo.py + - Consolidate depsolve_again and depsolve_immediate locks into + one lock to avoid deadlocks + +2006-03-23 Dan Williams + * server/PackageJob.py - (_arch_deps_solved): fix cachedir and logfile paths; turns out yum already adds the installroot to these. Furthermore, return an From fedora-extras-commits at redhat.com Fri Mar 24 03:54:36 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 22:54:36 -0500 Subject: owners owners.list,1.761,1.762 Message-ID: <200603240355.k2O3t9Ow012343@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12324 Modified Files: owners.list Log Message: Took over ownership of perl-bioperl Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.761 retrieving revision 1.762 diff -u -r1.761 -r1.762 --- owners.list 23 Mar 2006 20:16:51 -0000 1.761 +++ owners.list 24 Mar 2006 03:54:36 -0000 1.762 @@ -819,7 +819,7 @@ Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Boulder|An API for hierarchical tag/value structures|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Business-Hours|Calculate business hours in a time period|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Cache-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 24 04:05:08 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:05:08 -0500 Subject: owners owners.list,1.762,1.763 Message-ID: <200603240405.k2O45h0r014328@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14303 Modified Files: owners.list Log Message: Took ownership of perl-GD-SVG Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.762 retrieving revision 1.763 diff -u -r1.762 -r1.763 --- owners.list 24 Mar 2006 03:54:36 -0000 1.762 +++ owners.list 24 Mar 2006 04:05:08 -0000 1.763 @@ -918,7 +918,7 @@ Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GDGraph|Graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GD|Perl interface to the GD graphics library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-GD-SVG|GD SVG enables SVG output from scripts written using GD|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-GD-SVG|GD SVG enables SVG output from scripts written using GD|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com 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 From fedora-extras-commits at redhat.com Fri Mar 24 04:07:59 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:07:59 -0500 Subject: owners owners.list,1.763,1.764 Message-ID: <200603240408.k2O48VKD014363@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14344 Modified Files: owners.list Log Message: Took ownership of perl-Graph Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.763 retrieving revision 1.764 diff -u -r1.763 -r1.764 --- owners.list 24 Mar 2006 04:05:08 -0000 1.763 +++ owners.list 24 Mar 2006 04:07:58 -0000 1.764 @@ -924,7 +924,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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| 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-Graph|A Perl module for dealing with graphs, the abstract data structures|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|imlinux at gmail.com|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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 24 04:10:52 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:10:52 -0500 Subject: owners owners.list,1.764,1.765 Message-ID: <200603240411.k2O4BObI014391@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14374 Modified Files: owners.list Log Message: Took ownership of perl-Heap Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.764 retrieving revision 1.765 diff -u -r1.764 -r1.765 --- owners.list 24 Mar 2006 04:07:58 -0000 1.764 +++ owners.list 24 Mar 2006 04:10:51 -0000 1.765 @@ -927,7 +927,7 @@ Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|imlinux at gmail.com|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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| -Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|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 From fedora-extras-commits at redhat.com Fri Mar 24 04:13:15 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:13:15 -0500 Subject: owners owners.list,1.765,1.766 Message-ID: <200603240413.k2O4DmHl014423@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14406 Modified Files: owners.list Log Message: Took ownership of perl-MIME-Lite Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.765 retrieving revision 1.766 diff -u -r1.765 -r1.766 --- owners.list 24 Mar 2006 04:10:51 -0000 1.765 +++ owners.list 24 Mar 2006 04:13:15 -0000 1.766 @@ -988,7 +988,7 @@ Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-MailTools|MailTools module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Math-GMP|High speed arbitrary size integer math|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|thm at duke.edu|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|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|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 From fedora-extras-commits at redhat.com Fri Mar 24 04:17:18 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:17:18 -0500 Subject: owners owners.list,1.766,1.767 Message-ID: <200603240417.k2O4Hpbf014474@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14454 Modified Files: owners.list Log Message: Took ownership of perl-SVG Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.766 retrieving revision 1.767 diff -u -r1.766 -r1.767 --- owners.list 24 Mar 2006 04:13:15 -0000 1.766 +++ owners.list 24 Mar 2006 04:17:18 -0000 1.767 @@ -1038,7 +1038,7 @@ 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-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 24 04:19:37 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:19:37 -0500 Subject: owners owners.list,1.767,1.768 Message-ID: <200603240420.k2O4KAFN014530@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14494 Modified Files: owners.list Log Message: took ownership of perl-Text-Shellwords Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.767 retrieving revision 1.768 diff -u -r1.767 -r1.768 --- owners.list 24 Mar 2006 04:17:18 -0000 1.767 +++ owners.list 24 Mar 2006 04:19:37 -0000 1.768 @@ -1065,7 +1065,7 @@ 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 Fedora Extras|perl-Text-Reform|Manual text wrapping and reformatting|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Text-Shellwords|A thin wrapper around the shellwords.pl package|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Text-Shellwords|A thin wrapper around the shellwords.pl package|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Template|Expand template text with embedded Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Text-Unidecode|US-ASCII transliterations of Unicode text|pertusus at free.fr|extras-qa at fedoraproject.org| Fedora Extras|perl-Text-WikiFormat|Translate Wiki formatted text into other formats|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 24 04:21:48 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 23 Mar 2006 23:21:48 -0500 Subject: owners owners.list,1.768,1.769 Message-ID: <200603240422.k2O4MKQG014560@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14543 Modified Files: owners.list Log Message: perl-XML-Writer Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.768 retrieving revision 1.769 diff -u -r1.768 -r1.769 --- owners.list 24 Mar 2006 04:19:37 -0000 1.768 +++ owners.list 24 Mar 2006 04:21:48 -0000 1.769 @@ -1099,7 +1099,7 @@ Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|thm at duke.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|ville.skytta at iki.fi|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 From fedora-extras-commits at redhat.com Fri Mar 24 07:09:31 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 24 Mar 2006 02:09:31 -0500 Subject: rpms/smbldap-tools - New directory Message-ID: <200603240709.k2O79Xwx020963@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/smbldap-tools In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20955/smbldap-tools Log Message: Directory /cvs/extras/rpms/smbldap-tools added to the repository From fedora-extras-commits at redhat.com Fri Mar 24 07:09:56 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 24 Mar 2006 02:09:56 -0500 Subject: rpms/smbldap-tools/devel - New directory Message-ID: <200603240709.k2O79wpM020978@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/smbldap-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20955/smbldap-tools/devel Log Message: Directory /cvs/extras/rpms/smbldap-tools/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 24 07:12:56 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 24 Mar 2006 02:12:56 -0500 Subject: rpms/smbldap-tools/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603240712.k2O7CweQ021009@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/smbldap-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20997/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module smbldap-tools --- NEW 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 Mar 24 07:15:06 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 24 Mar 2006 02:15:06 -0500 Subject: rpms/smbldap-tools/devel smbldap-tools-0.9.2-config.patch, NONE, 1.1 smbldap-tools.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603240715.k2O7FdIm021075@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/rpms/smbldap-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21050/devel Modified Files: .cvsignore sources Added Files: smbldap-tools-0.9.2-config.patch smbldap-tools.spec Log Message: auto-import smbldap-tools-0.9.2-2 on branch devel from smbldap-tools-0.9.2-2.src.rpm smbldap-tools-0.9.2-config.patch: --- NEW FILE smbldap-tools-0.9.2-config.patch --- --- smbldap.conf 2006-01-27 10:52:27.000000000 +0000 +++ smbldap.conf 2006-01-27 11:34:20.000000000 +0000 @@ -34,12 +34,12 @@ # Put your own SID. To obtain this number do: "net getlocalsid". # If not defined, parameter is taking from "net getlocalsid" return -SID="S-1-5-21-4205727931-4131263253-1851132061" +#SID="S-1-5-21-4205727931-4131263253-1851132061" # Domain name the Samba server is in charged. # If not defined, parameter is taking from smb.conf configuration file # Ex: sambaDomain="IDEALX-NT" -sambaDomain="IDEALX-NT" +#sambaDomain="IDEALX-NT" ############################################################################## # @@ -85,15 +85,15 @@ # CA certificate # see "man Net::LDAP" in start_tls section for more details -cafile="/etc/smbldap-tools/ca.pem" +cafile="/etc/pki/tls/certs/ldapserverca.pem" # certificate to use to connect to the ldap server # see "man Net::LDAP" in start_tls section for more details -clientcert="/etc/smbldap-tools/smbldap-tools.pem" +clientcert="/etc/pki/tls/certs/ldapclient.pem" # key certificate to use to connect to the ldap server # see "man Net::LDAP" in start_tls section for more details -clientkey="/etc/smbldap-tools/smbldap-tools.key" +clientkey="/etc/pki/tls/certs/ldapclientkey.pem" # LDAP Suffix # Ex: suffix=dc=IDEALX,dc=ORG @@ -102,7 +102,7 @@ # Where are stored Users # Ex: usersdn="ou=Users,dc=IDEALX,dc=ORG" # Warning: if 'suffix' is not set here, you must set the full dn for usersdn -usersdn="ou=Users,${suffix}" +usersdn="ou=People,${suffix}" # Where are stored Computers # Ex: computersdn="ou=Computers,dc=IDEALX,dc=ORG" @@ -112,7 +112,7 @@ # Where are stored Groups # Ex: groupsdn="ou=Groups,dc=IDEALX,dc=ORG" # Warning: if 'suffix' is not set here, you must set the full dn for groupsdn -groupsdn="ou=Groups,${suffix}" +groupsdn="ou=Group,${suffix}" # Where are stored Idmap entries (used if samba is a domain member server) # Ex: groupsdn="ou=Idmap,dc=IDEALX,dc=ORG" --- NEW FILE smbldap-tools.spec --- Summary: User and group administration tools for Samba/OpenLDAP Name: smbldap-tools Version: 0.9.2 Release: 2%{?dist} License: GPL Group: System Environment/Base URL: http://samba.idealx.org/index.en.html Source: http://samba.idealx.org/dist/smbldap-tools-%{version}.tgz Patch0: smbldap-tools-0.9.2-config.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: openldap-clients, samba Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) BuildArch: noarch %description In conjunction with OpenLDAP and Samba-LDAP servers, this collection is useful to add, modify and delete users and groups, and to change Unix and Samba passwords. In those contexts they replace the system tools to manage users, groups and passwords. %prep %setup -q %{__perl} -pi -e 's|/etc/opt/IDEALX|%{_sysconfdir}|g; s|/opt/IDEALX||g;' \ Makefile smb.conf smbldap.conf \ smbldap-populate smbldap_tools.pm configure.pl \ doc/html/*.html %patch0 -p0 # Don't want this in %{_sbindir}... %{__mv} smbldap-tools.spec original-smbldap-tools.spec %build %install %{__rm} -rf %{buildroot} %{__install} -d -m0755 %{buildroot}%{_sbindir} %{__install} -d -m0755 %{buildroot}%{perl_vendorlib} %{__install} -p -m0755 smbldap-* %{buildroot}%{_sbindir} %{__install} -p -m0755 smbldap_tools.pm %{buildroot}%{perl_vendorlib} %{__install} -Dp -m0644 smbldap.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap.conf %{__install} -Dp -m0600 smbldap_bind.conf %{buildroot}%{_sysconfdir}/smbldap-tools/smbldap_bind.conf %clean %{__rm} -rf %{buildroot} %files %defattr(-, root, root, 0755) %doc ChangeLog CONTRIBUTORS COPYING FILES INFRA INSTALL README TODO %doc configure.pl *.conf doc/* %dir %{_sysconfdir}/smbldap-tools/ %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap.conf %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap_bind.conf %{_sbindir}/smbldap-groupadd %{_sbindir}/smbldap-groupdel %{_sbindir}/smbldap-groupmod %{_sbindir}/smbldap-groupshow %{_sbindir}/smbldap-passwd %{_sbindir}/smbldap-populate %{_sbindir}/smbldap-useradd %{_sbindir}/smbldap-userdel %{_sbindir}/smbldap-usermod %{_sbindir}/smbldap-userinfo %{_sbindir}/smbldap-usershow %{perl_vendorlib}/smbldap_tools.pm %changelog * Fri Jan 27 2006 Paul Howarth 0.9.2-2 - Incorporate smbldap.conf review suggestions from Steven Pritchard (#178905) Undefine SID so it is fetched with "net getlocalsid" Undefine sambaDomain so it is fetched from smb.conf TLS keys and certs should go in /etc/pki/tls/certs usersdn should be "ou=People,${suffix}" to match OpenLDAP migration tools groupsdn should be "ou=Group,${suffix}" to match OpenLDAP migration tools * Wed Jan 25 2006 Paul Howarth 0.9.2-1 - Update to 0.9.2 * Tue Jan 17 2006 Paul Howarth 0.9.1-2 - Unpack tarball quietly - Clean up file list - Put smbldap_tools.pm in %{perl_vendorlib} rather than %{_sbindir} - Add %%{?dist} tag * Sat Jun 04 2005 Dag Wieers - 0.9.1-1 - 3108+/dag - Updated to release 0.9.1. * Tue Apr 05 2005 Dag Wieers - 0.8.8-1 - Updated to release 0.8.8. * Wed Feb 16 2005 Dag Wieers - 0.8.7-2 - Fixed locations, removed /opt/IDEALX. (Alain Rykaert) * Tue Feb 15 2005 Dag Wieers - 0.8.7-1 - Updated to release 0.8.7. * Sat Jan 22 2005 Dag Wieers - 0.8.6-1 - Updated to release 0.8.6. * Sun Jun 20 2004 Dag Wieers - 0.8.5-1 - Updated to release 0.8.5. * Sat Mar 13 2004 Dag Wieers - 0.8.4-1 - Updated to release 0.8.4. * Fri Dec 05 2003 Dag Wieers - 0.8.2-0 - Updated to release 0.8.2. * Thu Oct 09 2003 Dag Wieers - 0.8.1-0 - Initial package. (using DAR) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smbldap-tools/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Mar 2006 07:12:56 -0000 1.1 +++ .cvsignore 24 Mar 2006 07:15:06 -0000 1.2 @@ -0,0 +1 @@ +smbldap-tools-0.9.2.tgz Index: sources =================================================================== RCS file: /cvs/extras/rpms/smbldap-tools/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Mar 2006 07:12:56 -0000 1.1 +++ sources 24 Mar 2006 07:15:06 -0000 1.2 @@ -0,0 +1 @@ +bb8eb44adb4e7946de5b486acf480c24 smbldap-tools-0.9.2.tgz From fedora-extras-commits at redhat.com Fri Mar 24 07:19:43 2006 From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc)) Date: Fri, 24 Mar 2006 02:19:43 -0500 Subject: owners owners.list,1.769,1.770 Message-ID: <200603240720.k2O7KGqd021227@cvs-int.fedora.redhat.com> Author: pghmcfc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21205 Modified Files: owners.list Log Message: Add smbldap-tools Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.769 retrieving revision 1.770 diff -u -r1.769 -r1.770 --- owners.list 24 Mar 2006 04:21:48 -0000 1.769 +++ owners.list 24 Mar 2006 07:19:42 -0000 1.770 @@ -1311,6 +1311,7 @@ Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|smb4k|The SMB/CIFS Share Browser for KDE|mgarski at post.pl|extras-qa at fedoraproject.org| +Fedora Extras|smbldap-tools|User and group administration tools for Samba/OpenLDAP|paul at city-fan.org|extras-qa at fedoraproject.org| Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net Fedora Extras|snort|An intrusion detection system|dennis at ausil.us|extras-qa at fedoraproject.org| Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 24 08:43:43 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 24 Mar 2006 03:43:43 -0500 Subject: fedora-security/audit fc4,1.180,1.181 fc5,1.93,1.94 Message-ID: <200603240843.k2O8hhYC023535@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23515 Modified Files: fc4 fc5 Log Message: A couple of days of updates Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- fc4 23 Mar 2006 19:07:40 -0000 1.180 +++ fc4 24 Mar 2006 08:43:34 -0000 1.181 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060321 -Up to date FC4 as of 20060321 +Up to date CVE as of CVE email 20060323 +Up to date FC4 as of 20060323 ** are items that need attention +CVE-2006-1368 ** kernel CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 ** kernel CVE-2006-1342 ** kernel @@ -270,6 +271,7 @@ CVE-2005-2933 backport (libc-client) [since FEDORA-2005-1115] CVE-2005-2933 VULNERABLE (uw-imap) bz#171345 CVE-2005-2929 backport (lynx) [since FEDORA-2005-1079] +CVE-2005-2922 version (HelixPlayer, fixed 1.0.6) [since FEDORA-2005-940] CVE-2005-2917 version (squid, fixed 2.5.STABLE11) [since FEDORA-2005-913] CVE-2005-2876 backport (util-linux, fixed 2.12r) [since FEDORA-2005-887] CVE-2005-2874 version (cups, fixed 1.1.23) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.93 retrieving revision 1.94 diff -u -r1.93 -r1.94 --- fc5 23 Mar 2006 19:07:40 -0000 1.93 +++ fc5 24 Mar 2006 08:43:34 -0000 1.94 @@ -1,8 +1,9 @@ -Up to date CVE as of CVE email 20060321 -Up to date FC5 as of 20060321 +Up to date CVE as of CVE email 20060323 +Up to date FC5 as of 20060323 ** are items that need attention +CVE-2006-1368 ** kernel CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 ** kernel CVE-2006-1342 ** kernel @@ -269,6 +270,7 @@ CVE-2005-2946 version (openssl, fixed 0.9.8) CVE-2005-2933 version (libc-client, fixed 2004g at least) CVE-2005-2929 backport (lynx) +CVE-2005-2922 version (HelixPlayer, fixed 1.0.6) CVE-2005-2917 version (squid, fixed 2.5.STABLE11) CVE-2005-2876 version (util-linux, fixed 2.13-pre3) CVE-2005-2874 version (cups, fixed 1.1.23) From fedora-extras-commits at redhat.com Fri Mar 24 09:35:24 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 24 Mar 2006 04:35:24 -0500 Subject: rpms/paps/devel paps-0.6.3-fix-pagesize.patch, NONE, 1.1 paps.spec, 1.6, 1.7 Message-ID: <200603240936.k2O9a0SX026291@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26271 Modified Files: paps.spec Added Files: paps-0.6.3-fix-pagesize.patch Log Message: * Fri Mar 24 2006 Akira TAGOH - 0.6.3-3 - paps-0.6.3-fix-pagesize.patch: fixed displaying the beginning of line at out of page. (#176207) paps-0.6.3-fix-pagesize.patch: --- NEW FILE paps-0.6.3-fix-pagesize.patch --- diff -ruN paps-0.6.3.orig/src/paps.c paps-0.6.3/src/paps.c --- paps-0.6.3.orig/src/paps.c 2005-12-21 05:22:04.000000000 +0900 +++ paps-0.6.3/src/paps.c 2006-03-24 18:27:06.000000000 +0900 @@ -558,6 +558,7 @@ "%%%%Title: %s\n" "%%%%Creator: paps version 0.1 by Dov Grobgeld\n" "%%%%Pages: (atend)\n" + "%%%%BoundingBox: 0 0 %d %d\n" "%%%%BeginProlog\n" "%%%%Orientation: %s\n" "/papsdict 1 dict def\n" @@ -605,6 +606,8 @@ " 0 pageheight neg translate\n" "} def\n", title, + page_layout->page_width, + page_layout->page_height, orientation_names[orientation] ); @@ -612,6 +615,7 @@ "%% User settings\n" "/pagewidth %d def\n" "/pageheight %d def\n" + "pagewidth pageheight setpagesize\n" "/column_width %d def\n" "/bodyheight %d def\n" Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- paps.spec 2 Mar 2006 07:32:59 -0000 1.6 +++ paps.spec 24 Mar 2006 09:35:23 -0000 1.7 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -8,6 +8,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pango-devel Patch0: paps-0.6.1-makefile.patch +Patch1: paps-0.6.3-fix-pagesize.patch Summary: Plain Text to PostScript converter Group: Applications/Publishing @@ -18,6 +19,7 @@ %prep %setup -q %patch0 -p1 -b .makefile +%patch1 -p1 -b .pagesize aclocal automake autoconf @@ -44,6 +46,9 @@ %changelog +* Fri Mar 24 2006 Akira TAGOH - 0.6.3-3 +- paps-0.6.3-fix-pagesize.patch: fixed displaying the beginning of line at out of page. (#176207) + * Thu Mar 2 2006 Akira TAGOH - 0.6.3-2 - rebuilt. From fedora-extras-commits at redhat.com Fri Mar 24 09:43:06 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 24 Mar 2006 04:43:06 -0500 Subject: rpms/paps/devel paps-0.6.2-fix-bufferoverflow.patch,1.1,NONE Message-ID: <200603240943.k2O9h8v1026353@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26344 Removed Files: paps-0.6.2-fix-bufferoverflow.patch Log Message: --- paps-0.6.2-fix-bufferoverflow.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 09:46:46 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 24 Mar 2006 04:46:46 -0500 Subject: rpms/paps/FC-5 paps.spec, 1.6, 1.7 paps-0.6.2-fix-bufferoverflow.patch, 1.1, NONE Message-ID: <200603240947.k2O9lIuV026443@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26426 Modified Files: paps.spec Removed Files: paps-0.6.2-fix-bufferoverflow.patch Log Message: * Fri Mar 24 2006 Akira TAGOH - 0.6.3-3 - paps-0.6.3-fix-pagesize.patch: fixed displaying the beginning of line at out of page. (#176207) Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/FC-5/paps.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- paps.spec 2 Mar 2006 07:32:59 -0000 1.6 +++ paps.spec 24 Mar 2006 09:46:45 -0000 1.7 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -8,6 +8,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: pango-devel Patch0: paps-0.6.1-makefile.patch +Patch1: paps-0.6.3-fix-pagesize.patch Summary: Plain Text to PostScript converter Group: Applications/Publishing @@ -18,6 +19,7 @@ %prep %setup -q %patch0 -p1 -b .makefile +%patch1 -p1 -b .pagesize aclocal automake autoconf @@ -44,6 +46,9 @@ %changelog +* Fri Mar 24 2006 Akira TAGOH - 0.6.3-3 +- paps-0.6.3-fix-pagesize.patch: fixed displaying the beginning of line at out of page. (#176207) + * Thu Mar 2 2006 Akira TAGOH - 0.6.3-2 - rebuilt. --- paps-0.6.2-fix-bufferoverflow.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 09:49:54 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Fri, 24 Mar 2006 04:49:54 -0500 Subject: rpms/paps/FC-5 paps-0.6.3-fix-pagesize.patch,NONE,1.1 Message-ID: <200603240949.k2O9nuB2026506@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26497 Added Files: paps-0.6.3-fix-pagesize.patch Log Message: paps-0.6.3-fix-pagesize.patch: --- NEW FILE paps-0.6.3-fix-pagesize.patch --- diff -ruN paps-0.6.3.orig/src/paps.c paps-0.6.3/src/paps.c --- paps-0.6.3.orig/src/paps.c 2005-12-21 05:22:04.000000000 +0900 +++ paps-0.6.3/src/paps.c 2006-03-24 18:27:06.000000000 +0900 @@ -558,6 +558,7 @@ "%%%%Title: %s\n" "%%%%Creator: paps version 0.1 by Dov Grobgeld\n" "%%%%Pages: (atend)\n" + "%%%%BoundingBox: 0 0 %d %d\n" "%%%%BeginProlog\n" "%%%%Orientation: %s\n" "/papsdict 1 dict def\n" @@ -605,6 +606,8 @@ " 0 pageheight neg translate\n" "} def\n", title, + page_layout->page_width, + page_layout->page_height, orientation_names[orientation] ); @@ -612,6 +615,7 @@ "%% User settings\n" "/pagewidth %d def\n" "/pageheight %d def\n" + "pagewidth pageheight setpagesize\n" "/column_width %d def\n" "/bodyheight %d def\n" From fedora-extras-commits at redhat.com Fri Mar 24 10:04:50 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:04:50 -0500 Subject: rpms/python-simpy import.log,1.2,1.3 Message-ID: <200603241005.k2OA5X0I028673@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28630 Modified Files: import.log Log Message: auto-import python-simpy-1.7-1 on branch devel from python-simpy-1.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-simpy/import.log,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- import.log 22 Dec 2005 20:27:14 -0000 1.2 +++ import.log 24 Mar 2006 10:04:48 -0000 1.3 @@ -1 +1,2 @@ python-simpy-1_6_1-2:HEAD:python-simpy-1.6.1-2.src.rpm:1135283225 +python-simpy-1_7-1:HEAD:python-simpy-1.7-1.src.rpm:1143194680 From fedora-extras-commits at redhat.com Fri Mar 24 10:05:09 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:05:09 -0500 Subject: rpms/python-simpy/devel .cvsignore, 1.2, 1.3 python-simpy.spec, 1.4, 1.5 sources, 1.2, 1.3 python-simpy-1.6.1-no-shebang.patch, 1.1, NONE Message-ID: <200603241005.k2OA5jrG028678@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28630/devel Modified Files: .cvsignore python-simpy.spec sources Removed Files: python-simpy-1.6.1-no-shebang.patch Log Message: auto-import python-simpy-1.7-1 on branch devel from python-simpy-1.7-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Dec 2005 20:27:20 -0000 1.2 +++ .cvsignore 24 Mar 2006 10:05:09 -0000 1.3 @@ -1 +1 @@ -SimPy-1.6.1.tar.gz +SimPy-1.7final.tar.gz Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-simpy.spec 20 Feb 2006 14:13:18 -0000 1.4 +++ python-simpy.spec 24 Mar 2006 10:05:09 -0000 1.5 @@ -2,14 +2,13 @@ %define pkgname SimPy Name: python-simpy -Version: 1.6.1 -Release: 4%{?dist} +Version: 1.7 +Release: 1%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL URL: http://simpy.sourceforge.net -Source0: http://download.sourceforge.net/simpy/SimPy-%{version}.tar.gz -Patch1: python-simpy-1.6.1-no-shebang.patch +Source0: http://dl.sf.net/simpy/SimPy-%{version}final.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -39,8 +38,8 @@ %prep %setup -q -n %{pkgname}-%{version} -%patch1 - +# Remove the shebangs to make rpmlint happy +%{__sed} -i '1{\?^#!/usr/bin/env\ python$?d}' SimPy/*.py %build %{__python} setup.py build @@ -58,7 +57,9 @@ %files %defattr(-,root,root,-) # choose html over txt files for documentation -%doc *.html PKG-INFO LGPLlicense_files SimPyDocs SimPyModels +%doc *.html PKG-INFO LGPLlicense_files SimPyModels +%doc SimPyDocs/*.html SimPyDocs/*.css +%doc SimPyDocs/bankprograms SimPyDocs/images SimPyDocs/Interfacing SimPyDocs/SimGUIManual SimPyDocs/SimPlotManual SimPyDocs/SimStepManual %dir %{python_sitelib}/%{pkgname}/ %{python_sitelib}/%{pkgname}/*.py %{python_sitelib}/%{pkgname}/*.pyc @@ -71,6 +72,10 @@ %changelog +* Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 +- SimPy-1.7 +- Drop shebang removal patch. Implement it with sed script. + * Mon Feb 20 2006 Sarantis Paskalis - 1.6.1-4 - Rebuild for FC5. Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Dec 2005 20:27:20 -0000 1.2 +++ sources 24 Mar 2006 10:05:09 -0000 1.3 @@ -1 +1 @@ -6de42d6289bee6d767d07f8839f89d07 SimPy-1.6.1.tar.gz +0bf0102e7976b3f40e52fc43f93751ad SimPy-1.7final.tar.gz --- python-simpy-1.6.1-no-shebang.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 10:20:29 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:20:29 -0500 Subject: rpms/python-simpy/FC-5 python-simpy.spec,1.4,1.5 Message-ID: <200603241021.k2OAL1wW028792@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28775 Modified Files: python-simpy.spec Log Message: SimPy 1.7 Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/python-simpy.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- python-simpy.spec 20 Feb 2006 14:13:18 -0000 1.4 +++ python-simpy.spec 24 Mar 2006 10:20:28 -0000 1.5 @@ -2,14 +2,13 @@ %define pkgname SimPy Name: python-simpy -Version: 1.6.1 -Release: 4%{?dist} +Version: 1.7 +Release: 1%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL URL: http://simpy.sourceforge.net -Source0: http://download.sourceforge.net/simpy/SimPy-%{version}.tar.gz -Patch1: python-simpy-1.6.1-no-shebang.patch +Source0: http://dl.sf.net/simpy/SimPy-%{version}final.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -39,8 +38,8 @@ %prep %setup -q -n %{pkgname}-%{version} -%patch1 - +# Remove the shebangs to make rpmlint happy +%{__sed} -i '1{\?^#!/usr/bin/env\ python$?d}' SimPy/*.py %build %{__python} setup.py build @@ -58,7 +57,9 @@ %files %defattr(-,root,root,-) # choose html over txt files for documentation -%doc *.html PKG-INFO LGPLlicense_files SimPyDocs SimPyModels +%doc *.html PKG-INFO LGPLlicense_files SimPyModels +%doc SimPyDocs/*.html SimPyDocs/*.css +%doc SimPyDocs/bankprograms SimPyDocs/images SimPyDocs/Interfacing SimPyDocs/SimGUIManual SimPyDocs/SimPlotManual SimPyDocs/SimStepManual %dir %{python_sitelib}/%{pkgname}/ %{python_sitelib}/%{pkgname}/*.py %{python_sitelib}/%{pkgname}/*.pyc @@ -71,6 +72,10 @@ %changelog +* Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 +- SimPy-1.7 +- Drop shebang removal patch. Implement it with sed script. + * Mon Feb 20 2006 Sarantis Paskalis - 1.6.1-4 - Rebuild for FC5. From fedora-extras-commits at redhat.com Fri Mar 24 10:22:03 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 24 Mar 2006 05:22:03 -0500 Subject: rpms/libgnomedb/devel libgnomedb-1.9.100-unknown-datatype-fix.patch, NONE, 1.1 libgnomedb.spec, 1.12, 1.13 Message-ID: <200603241022.k2OAMZ7S028856@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgnomedb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28836 Modified Files: libgnomedb.spec Added Files: libgnomedb-1.9.100-unknown-datatype-fix.patch Log Message: * Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 - Add patch2 fixing bz 186517 libgnomedb-1.9.100-unknown-datatype-fix.patch: --- NEW FILE libgnomedb-1.9.100-unknown-datatype-fix.patch --- diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c 2005-08-07 15:07:13.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c 2006-03-24 10:22:13.000000000 +0100 @@ -1056,6 +1056,12 @@ GSList *params; GnomeDbParameter *similar = NULL; GSList *param_dest_fields; + + /* If people try to call us to add a NULL param do notting. */ + if (!param) { + g_warning ("Cannot add NULL param"); + return; + } if (g_slist_find (dataset->parameters, param)) return; Only in libgnomedb-1.9.100/libgnomedb: gnome-db-data-set.c~ diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c 2005-09-08 12:36:57.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c 2006-03-24 10:16:17.000000000 +0100 @@ -99,6 +99,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; /* Assoc transl[] = { */ @@ -181,6 +182,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -254,6 +256,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -327,6 +330,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -386,7 +390,7 @@ info->value_test_gda_types = g_new0 (GdaValueType, GDA_VALUE_TYPE_UNKNOWN); gda_type = GDA_VALUE_TYPE_NULL; - for (gda_type ++; gda_type < GDA_VALUE_TYPE_UNKNOWN; gda_type ++) { + for (gda_type ++; gda_type <= GDA_VALUE_TYPE_UNKNOWN; gda_type ++) { info->value_test_data_types [gda_type - 1] = gda_type_to_string (gda_type); info->value_test_gda_types [gda_type - 1] = gda_type; } Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c~ diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c 2005-08-07 15:07:14.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c 2006-03-24 10:25:21.000000000 +0100 @@ -285,7 +285,13 @@ } } - if (type) { + if (!type) + { + g_warning ("Could not determine the DBMS data type for Gda type %d", gda_column_get_gdatype (col_attrs)); + type = "unknown"; + } + + { retval = gnome_db_server_get_data_type_by_name (srv, type); if (!retval) { /* create a GnomeDbServerDataType for that 'type' */ @@ -297,8 +303,6 @@ g_object_unref (retval); } } - else - g_warning ("Could not determine the DBMS data type for Gda type %d", gda_column_get_gdatype (col_attrs)); return retval; } Only in libgnomedb-1.9.100/libgnomedb: gnome-db-wrapper-field.c~ Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libgnomedb.spec 14 Feb 2006 21:29:02 -0000 1.12 +++ libgnomedb.spec 24 Mar 2006 10:22:02 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Library for writing gnome database programs Name: libgnomedb Version: 1.9.100 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -17,6 +17,7 @@ Patch0: libgnomedb-1.2.0-desktop.patch Patch1: libgnomedb-1.9.100-sharp.patch +Patch2: libgnomedb-1.9.100-unknown-datatype-fix.patch %description libgnomedb is a library that eases the task of writing @@ -54,6 +55,7 @@ %setup -q %patch0 -p1 -b .desktop.patch %patch1 -p1 -b .sharp +%patch2 -p1 -b .unknown %build @@ -153,6 +155,9 @@ %changelog +* Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 +- Add patch2 fixing bz 186517 + * Mon Feb 13 2006 Hans de Goede 1:1.9.100-5 - Bump release and rebuild for new gcc4.1 and glibc - Attempt to properly install C-sharp/mono bindings From fedora-extras-commits at redhat.com Fri Mar 24 10:23:34 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:23:34 -0500 Subject: rpms/python-simpy/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200603241024.k2OAO6dv028930@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28902 Modified Files: .cvsignore sources Log Message: Update sources Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Dec 2005 20:27:20 -0000 1.2 +++ .cvsignore 24 Mar 2006 10:23:34 -0000 1.3 @@ -1 +1 @@ -SimPy-1.6.1.tar.gz +SimPy-1.7final.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Dec 2005 20:27:20 -0000 1.2 +++ sources 24 Mar 2006 10:23:34 -0000 1.3 @@ -1 +1 @@ -6de42d6289bee6d767d07f8839f89d07 SimPy-1.6.1.tar.gz +0bf0102e7976b3f40e52fc43f93751ad SimPy-1.7final.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 10:27:37 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:27:37 -0500 Subject: rpms/python-simpy/FC-5 python-simpy.spec,1.5,1.6 Message-ID: <200603241028.k2OASAd0029078@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29061 Modified Files: python-simpy.spec Log Message: Bump release Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/python-simpy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-simpy.spec 24 Mar 2006 10:20:28 -0000 1.5 +++ python-simpy.spec 24 Mar 2006 10:27:37 -0000 1.6 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,6 +72,9 @@ %changelog +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 +- Bump release + * Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 - SimPy-1.7 - Drop shebang removal patch. Implement it with sed script. From fedora-extras-commits at redhat.com Fri Mar 24 10:30:33 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:30:33 -0500 Subject: rpms/python-simpy import.log,1.3,1.4 Message-ID: <200603241031.k2OAV6Qg029174@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29142 Modified Files: import.log Log Message: auto-import python-simpy-1.7-1 on branch FC-5 from python-simpy-1.7-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-simpy/import.log,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- import.log 24 Mar 2006 10:04:48 -0000 1.3 +++ import.log 24 Mar 2006 10:30:33 -0000 1.4 @@ -1,2 +1,3 @@ python-simpy-1_6_1-2:HEAD:python-simpy-1.6.1-2.src.rpm:1135283225 python-simpy-1_7-1:HEAD:python-simpy-1.7-1.src.rpm:1143194680 +python-simpy-1_7-1:FC-5:python-simpy-1.7-1.src.rpm:1143196225 From fedora-extras-commits at redhat.com Fri Mar 24 10:30:39 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:30:39 -0500 Subject: rpms/python-simpy/FC-5 python-simpy.spec, 1.6, 1.7 python-simpy-1.6.1-no-shebang.patch, 1.1, NONE Message-ID: <200603241031.k2OAVBmF029177@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29142/FC-5 Modified Files: python-simpy.spec Removed Files: python-simpy-1.6.1-no-shebang.patch Log Message: auto-import python-simpy-1.7-1 on branch FC-5 from python-simpy-1.7-1.src.rpm Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/python-simpy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-simpy.spec 24 Mar 2006 10:27:37 -0000 1.6 +++ python-simpy.spec 24 Mar 2006 10:30:39 -0000 1.7 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 2%{?dist} +Release: 1%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,9 +72,6 @@ %changelog -* Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 -- Bump release - * Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 - SimPy-1.7 - Drop shebang removal patch. Implement it with sed script. --- python-simpy-1.6.1-no-shebang.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 10:35:59 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:35:59 -0500 Subject: rpms/python-simpy import.log,1.4,1.5 Message-ID: <200603241036.k2OAaWwQ029266@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29234 Modified Files: import.log Log Message: auto-import python-simpy-1.7-3 on branch devel from python-simpy-1.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-simpy/import.log,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- import.log 24 Mar 2006 10:30:33 -0000 1.4 +++ import.log 24 Mar 2006 10:35:59 -0000 1.5 @@ -1,3 +1,4 @@ python-simpy-1_6_1-2:HEAD:python-simpy-1.6.1-2.src.rpm:1135283225 python-simpy-1_7-1:HEAD:python-simpy-1.7-1.src.rpm:1143194680 python-simpy-1_7-1:FC-5:python-simpy-1.7-1.src.rpm:1143196225 +python-simpy-1_7-3:HEAD:python-simpy-1.7-3.src.rpm:1143196551 From fedora-extras-commits at redhat.com Fri Mar 24 10:36:05 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:36:05 -0500 Subject: rpms/python-simpy/devel python-simpy.spec,1.5,1.6 Message-ID: <200603241036.k2OAabQp029269@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29234/devel Modified Files: python-simpy.spec Log Message: auto-import python-simpy-1.7-3 on branch devel from python-simpy-1.7-3.src.rpm Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- python-simpy.spec 24 Mar 2006 10:05:09 -0000 1.5 +++ python-simpy.spec 24 Mar 2006 10:36:05 -0000 1.6 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,6 +72,12 @@ %changelog +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +- Bump release to make tag for building. + +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 +- Bump release + * Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 - SimPy-1.7 - Drop shebang removal patch. Implement it with sed script. From fedora-extras-commits at redhat.com Fri Mar 24 10:37:22 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:37:22 -0500 Subject: rpms/python-simpy import.log,1.5,1.6 Message-ID: <200603241037.k2OAbtRT029370@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29331 Modified Files: import.log Log Message: auto-import python-simpy-1.7-3 on branch FC-5 from python-simpy-1.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-simpy/import.log,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- import.log 24 Mar 2006 10:35:59 -0000 1.5 +++ import.log 24 Mar 2006 10:37:22 -0000 1.6 @@ -2,3 +2,4 @@ python-simpy-1_7-1:HEAD:python-simpy-1.7-1.src.rpm:1143194680 python-simpy-1_7-1:FC-5:python-simpy-1.7-1.src.rpm:1143196225 python-simpy-1_7-3:HEAD:python-simpy-1.7-3.src.rpm:1143196551 +python-simpy-1_7-3:FC-5:python-simpy-1.7-3.src.rpm:1143196634 From fedora-extras-commits at redhat.com Fri Mar 24 10:37:29 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:37:29 -0500 Subject: rpms/python-simpy/FC-5 python-simpy.spec,1.7,1.8 Message-ID: <200603241038.k2OAc14c029373@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29331/FC-5 Modified Files: python-simpy.spec Log Message: auto-import python-simpy-1.7-3 on branch FC-5 from python-simpy-1.7-3.src.rpm Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/python-simpy.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- python-simpy.spec 24 Mar 2006 10:30:39 -0000 1.7 +++ python-simpy.spec 24 Mar 2006 10:37:28 -0000 1.8 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,6 +72,12 @@ %changelog +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +- Bump release to make tag for building. + +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 +- Bump release + * Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 - SimPy-1.7 - Drop shebang removal patch. Implement it with sed script. From fedora-extras-commits at redhat.com Fri Mar 24 10:46:36 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:46:36 -0500 Subject: rpms/python-simpy import.log,1.6,1.7 Message-ID: <200603241047.k2OAl8PD029539@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29505 Modified Files: import.log Log Message: auto-import python-simpy-1.7-3 on branch FC-4 from python-simpy-1.7-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/python-simpy/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 24 Mar 2006 10:37:22 -0000 1.6 +++ import.log 24 Mar 2006 10:46:35 -0000 1.7 @@ -3,3 +3,4 @@ python-simpy-1_7-1:FC-5:python-simpy-1.7-1.src.rpm:1143196225 python-simpy-1_7-3:HEAD:python-simpy-1.7-3.src.rpm:1143196551 python-simpy-1_7-3:FC-5:python-simpy-1.7-3.src.rpm:1143196634 +python-simpy-1_7-3:FC-4:python-simpy-1.7-3.src.rpm:1143197187 From fedora-extras-commits at redhat.com Fri Mar 24 10:46:41 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 05:46:41 -0500 Subject: rpms/python-simpy/FC-4 .cvsignore, 1.2, 1.3 python-simpy.spec, 1.2, 1.3 sources, 1.2, 1.3 python-simpy-1.6.1-no-shebang.patch, 1.1, NONE Message-ID: <200603241047.k2OAlEqu029546@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29505/FC-4 Modified Files: .cvsignore python-simpy.spec sources Removed Files: python-simpy-1.6.1-no-shebang.patch Log Message: auto-import python-simpy-1.7-3 on branch FC-4 from python-simpy-1.7-3.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 22 Dec 2005 20:27:20 -0000 1.2 +++ .cvsignore 24 Mar 2006 10:46:41 -0000 1.3 @@ -1 +1 @@ -SimPy-1.6.1.tar.gz +SimPy-1.7final.tar.gz Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-4/python-simpy.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- python-simpy.spec 26 Dec 2005 11:15:22 -0000 1.2 +++ python-simpy.spec 24 Mar 2006 10:46:41 -0000 1.3 @@ -2,14 +2,13 @@ %define pkgname SimPy Name: python-simpy -Version: 1.6.1 +Version: 1.7 Release: 3%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL URL: http://simpy.sourceforge.net -Source0: http://download.sourceforge.net/simpy/SimPy-%{version}.tar.gz -Patch1: python-simpy-1.6.1-no-shebang.patch +Source0: http://dl.sf.net/simpy/SimPy-%{version}final.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel @@ -39,8 +38,8 @@ %prep %setup -q -n %{pkgname}-%{version} -%patch1 - +# Remove the shebangs to make rpmlint happy +%{__sed} -i '1{\?^#!/usr/bin/env\ python$?d}' SimPy/*.py %build %{__python} setup.py build @@ -58,7 +57,9 @@ %files %defattr(-,root,root,-) # choose html over txt files for documentation -%doc *.html PKG-INFO LGPLlicense_files SimPyDocs SimPyModels +%doc *.html PKG-INFO LGPLlicense_files SimPyModels +%doc SimPyDocs/*.html SimPyDocs/*.css +%doc SimPyDocs/bankprograms SimPyDocs/images SimPyDocs/Interfacing SimPyDocs/SimGUIManual SimPyDocs/SimPlotManual SimPyDocs/SimStepManual %dir %{python_sitelib}/%{pkgname}/ %{python_sitelib}/%{pkgname}/*.py %{python_sitelib}/%{pkgname}/*.pyc @@ -71,6 +72,19 @@ %changelog +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +- Bump release to make tag for building. + +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 +- Bump release + +* Thu Mar 23 2006 Sarantis Paskalis - 1.7-1 +- SimPy-1.7 +- Drop shebang removal patch. Implement it with sed script. + +* Mon Feb 20 2006 Sarantis Paskalis - 1.6.1-4 +- Rebuild for FC5. + * Mon Dec 26 2005 Sarantis Paskalis - 1.6.1-3 - Add dist in release. Bump release. Index: sources =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 22 Dec 2005 20:27:20 -0000 1.2 +++ sources 24 Mar 2006 10:46:41 -0000 1.3 @@ -1 +1 @@ -6de42d6289bee6d767d07f8839f89d07 SimPy-1.6.1.tar.gz +0bf0102e7976b3f40e52fc43f93751ad SimPy-1.7final.tar.gz --- python-simpy-1.6.1-no-shebang.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 11:04:12 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 06:04:12 -0500 Subject: rpms/python-simpy/FC-5 python-simpy.spec,1.8,1.9 Message-ID: <200603241104.k2OB4kJ9031688@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31671 Modified Files: python-simpy.spec Log Message: Rebump release Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-5/python-simpy.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- python-simpy.spec 24 Mar 2006 10:37:28 -0000 1.8 +++ python-simpy.spec 24 Mar 2006 11:04:11 -0000 1.9 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,7 +72,7 @@ %changelog -* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3, 1.7-4 - Bump release to make tag for building. * Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 From fedora-extras-commits at redhat.com Fri Mar 24 11:07:54 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 06:07:54 -0500 Subject: rpms/python-simpy/FC-4 python-simpy.spec,1.3,1.4 Message-ID: <200603241108.k2OB8QJY031742@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31725 Modified Files: python-simpy.spec Log Message: Bump release Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/FC-4/python-simpy.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- python-simpy.spec 24 Mar 2006 10:46:41 -0000 1.3 +++ python-simpy.spec 24 Mar 2006 11:07:54 -0000 1.4 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,7 +72,7 @@ %changelog -* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3, 1.7-4 - Bump release to make tag for building. * Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 From fedora-extras-commits at redhat.com Fri Mar 24 11:09:30 2006 From: fedora-extras-commits at redhat.com (Sarantis Paskalis (sarantis)) Date: Fri, 24 Mar 2006 06:09:30 -0500 Subject: rpms/python-simpy/devel python-simpy.spec,1.6,1.7 Message-ID: <200603241110.k2OBA23N031794@cvs-int.fedora.redhat.com> Author: sarantis Update of /cvs/extras/rpms/python-simpy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31777 Modified Files: python-simpy.spec Log Message: Bump release. Index: python-simpy.spec =================================================================== RCS file: /cvs/extras/rpms/python-simpy/devel/python-simpy.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- python-simpy.spec 24 Mar 2006 10:36:05 -0000 1.6 +++ python-simpy.spec 24 Mar 2006 11:09:29 -0000 1.7 @@ -3,7 +3,7 @@ Name: python-simpy Version: 1.7 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Python simulation framework Group: Development/Languages License: LGPL @@ -72,7 +72,7 @@ %changelog -* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3 +* Fri Mar 24 2006 Sarantis Paskalis - 1.7-3, 1.7-4 - Bump release to make tag for building. * Fri Mar 24 2006 Sarantis Paskalis - 1.7-2 From fedora-extras-commits at redhat.com Fri Mar 24 11:39:55 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:39:55 -0500 Subject: rpms/bcm43xx-fwcutter - New directory Message-ID: <200603241139.k2OBdvtY032027@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32015/bcm43xx-fwcutter Log Message: Directory /cvs/extras/rpms/bcm43xx-fwcutter added to the repository From fedora-extras-commits at redhat.com Fri Mar 24 11:40:01 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:40:01 -0500 Subject: rpms/bcm43xx-fwcutter/devel - New directory Message-ID: <200603241140.k2OBe3Tc032052@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32015/bcm43xx-fwcutter/devel Log Message: Directory /cvs/extras/rpms/bcm43xx-fwcutter/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 24 11:40:12 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:40:12 -0500 Subject: rpms/bcm43xx-fwcutter Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603241140.k2OBeE75032093@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32077 Added Files: Makefile import.log Log Message: Setup of module bcm43xx-fwcutter --- NEW FILE Makefile --- # Top level Makefile for module bcm43xx-fwcutter all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 24 11:40:17 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:40:17 -0500 Subject: rpms/bcm43xx-fwcutter/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603241140.k2OBeJtg032121@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32077/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module bcm43xx-fwcutter --- NEW 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 Mar 24 11:40:41 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:40:41 -0500 Subject: rpms/bcm43xx-fwcutter import.log,1.1,1.2 Message-ID: <200603241141.k2OBfD3r032234@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32170 Modified Files: import.log Log Message: auto-import bcm43xx-fwcutter-003-2 on branch devel from bcm43xx-fwcutter-003-2.src.rpm Import bcm43xx-fwcutter Index: import.log =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 24 Mar 2006 11:40:11 -0000 1.1 +++ import.log 24 Mar 2006 11:40:40 -0000 1.2 @@ -0,0 +1 @@ +bcm43xx-fwcutter-003-2:HEAD:bcm43xx-fwcutter-003-2.src.rpm:1143200438 From fedora-extras-commits at redhat.com Fri Mar 24 11:40:46 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 24 Mar 2006 06:40:46 -0500 Subject: rpms/bcm43xx-fwcutter/devel README.Fedora, NONE, 1.1 bcm43xx-fwcutter.spec, NONE, 1.1 modprobe.bcm43xx, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603241141.k2OBfJ1c032245@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32170/devel Modified Files: .cvsignore sources Added Files: README.Fedora bcm43xx-fwcutter.spec modprobe.bcm43xx Log Message: auto-import bcm43xx-fwcutter-003-2 on branch devel from bcm43xx-fwcutter-003-2.src.rpm Import bcm43xx-fwcutter --- NEW FILE README.Fedora --- Using the bcm43xx-fwcutter tool to install Broadcom firmware in Fedora. ----------------------------------------------------------------------- To use the bcm43xx driver which is part of the Fedora kernel, you need to extract the firmware which is part of the official MacOS, Windows, or Linux drivers. If your Fedora installation is dual-booting with MacOS or Windows, then you probably already have a suitable driver available. Otherwise, the README file contains a number of links from which you can download drivers. It shouldn't matter which one you use -- the kernel's bcm43xx driver ought to work with all of them. Having obtained the file from which you wish to extract the firmware, run this command as root. Replace '' with the actual name of the file, of course: bcm43xx-fwcutter -w /lib/firmware This will save the various firmware files into the /lib/firmware directory, from where the kernel can load them when necessary. Because the bcm43xx driver is new and experimental, it is not configured to be automatically loaded in the Fedora Core 5 kernel. In order to ensure that the driver is loaded, you may need to copy the 'modprobe.bcm43xx' file into the /etc/modprobe.d directory. Please report your success or failure with the bcm43xx driver in bugzilla at https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=186329 --- NEW FILE bcm43xx-fwcutter.spec --- Name: bcm43xx-fwcutter Version: 003 Release: 2%{?dist} Summary: Firmware extraction tool for Broadcom wireless driver Group: System Environment/Base License: GPL URL: http://bcm43xx.berlios.de/ Source0: http://download.berlios.de/bcm43xx/%{name}-%{version}.tar.bz2 Source1: README.Fedora Source2: modprobe.bcm43xx BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description This package contains the 'bcm43xx-fwcutter' tool which is used to extract firmware for the Broadcom network devices, from the official Windows, MacOS or Linux drivers. See the README.Fedora file shipped in the package's documentation for instructions on using this tool. %prep %setup -q sed -i -e 's/-O2/$(RPM_OPT_FLAGS)/' Makefile %build make cp %{SOURCE1} . cp %{SOURCE2} . %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m0755 bcm43xx-fwcutter $RPM_BUILD_ROOT%{_bindir}/bcm43xx-fwcutter mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -m0644 bcm43xx-fwcutter.1 $RPM_BUILD_ROOT%{_mandir}/man1 %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_bindir}/bcm43xx-fwcutter %{_mandir}/man1/* %doc README README.Fedora modprobe.bcm43xx %changelog * Thu Mar 23 2006 David Woodhouse 003-2 - Package review. Use $RPM_OPT_FLAGS, ship man page, etc. - Complete documentation, add sample bcm43xx.modprobe file * Wed Mar 22 2006 David Woodhouse 003-1 - Initial build. --- NEW FILE modprobe.bcm43xx --- alias pci:v000014E4d0x00004301sv*sd*bc*sc*i* bcm43xx alias pci:v000014E4d0x00004307sv*sd*bc*sc*i* bcm43xx alias pci:v000014E4d0x00004318sv*sd*bc*sc*i* bcm43xx alias pci:v000014E4d0x00004320sv*sd*bc*sc*i* bcm43xx alias pci:v000014E4d0x00004324sv*sd*bc*sc*i* bcm43xx alias pci:v000014E4d0x00004325sv*sd*bc*sc*i* bcm43xx Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 24 Mar 2006 11:40:17 -0000 1.1 +++ .cvsignore 24 Mar 2006 11:40:46 -0000 1.2 @@ -0,0 +1 @@ +bcm43xx-fwcutter-003.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 24 Mar 2006 11:40:17 -0000 1.1 +++ sources 24 Mar 2006 11:40:46 -0000 1.2 @@ -0,0 +1 @@ +89b407d920811cfd15507da17f901bb0 bcm43xx-fwcutter-003.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 24 13:26:35 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 24 Mar 2006 08:26:35 -0500 Subject: rpms/libgnomedb/devel libgnomedb-1.9.100-unknown-datatype-fix.patch, 1.1, 1.2 Message-ID: <200603241327.k2ODR7hO005560@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgnomedb/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5540 Modified Files: libgnomedb-1.9.100-unknown-datatype-fix.patch Log Message: * Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 - Add patch2 fixing bz 186517 libgnomedb-1.9.100-unknown-datatype-fix.patch: Index: libgnomedb-1.9.100-unknown-datatype-fix.patch =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb-1.9.100-unknown-datatype-fix.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libgnomedb-1.9.100-unknown-datatype-fix.patch 24 Mar 2006 10:22:02 -0000 1.1 +++ libgnomedb-1.9.100-unknown-datatype-fix.patch 24 Mar 2006 13:26:34 -0000 1.2 @@ -1,6 +1,6 @@ diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c 2005-08-07 15:07:13.000000000 +0200 -+++ libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c 2006-03-24 10:22:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c 2006-03-24 11:20:29.000000000 +0100 @@ -1056,6 +1056,12 @@ GSList *params; GnomeDbParameter *similar = NULL; @@ -14,10 +14,10 @@ if (g_slist_find (dataset->parameters, param)) return; -Only in libgnomedb-1.9.100/libgnomedb: gnome-db-data-set.c~ +Only in libgnomedb-1.9.100/libgnomedb: gnome-db-data-set.c.unknown diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c 2005-09-08 12:36:57.000000000 +0200 -+++ libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c 2006-03-24 10:16:17.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c 2006-03-24 11:21:38.000000000 +0100 @@ -99,6 +99,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, @@ -50,7 +50,13 @@ }; info = g_new0 (GnomeDbServerInfo, 1); -@@ -386,7 +390,7 @@ +@@ -381,12 +385,12 @@ + info->implicit_data_types_casts = TRUE; + info->alias_needs_as_keyword = TRUE; + +- info->value_nb_tests_types = GDA_VALUE_TYPE_UNKNOWN - 1; ++ info->value_nb_tests_types = GDA_VALUE_TYPE_UNKNOWN; + info->value_test_data_types = g_new0 (gchar *, GDA_VALUE_TYPE_UNKNOWN); info->value_test_gda_types = g_new0 (GdaValueType, GDA_VALUE_TYPE_UNKNOWN); gda_type = GDA_VALUE_TYPE_NULL; @@ -59,10 +65,11 @@ info->value_test_data_types [gda_type - 1] = gda_type_to_string (gda_type); info->value_test_gda_types [gda_type - 1] = gda_type; } +Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c.unknown Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c~ diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c 2005-08-07 15:07:14.000000000 +0200 -+++ libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c 2006-03-24 10:25:21.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c 2006-03-24 11:20:29.000000000 +0100 @@ -285,7 +285,13 @@ } } @@ -87,4 +94,174 @@ return retval; } -Only in libgnomedb-1.9.100/libgnomedb: gnome-db-wrapper-field.c~ +Only in libgnomedb-1.9.100/libgnomedb: gnome-db-wrapper-field.c.unknown +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-time.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-time.c 2006-03-24 11:52:45.000000000 +0100 +@@ -173,7 +173,6 @@ + GnomeDbEntryTime *mgtim; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_TIME, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-none.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-none.c 2006-03-24 11:52:36.000000000 +0100 +@@ -109,7 +109,6 @@ + GnomeDbEntryNone *mgnone; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_NONE, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-boolean.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-boolean.c 2006-03-24 11:53:03.000000000 +0100 +@@ -355,7 +355,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_BOOLEAN (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_BOOLEAN (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-time.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-time.c 2006-03-24 11:54:05.000000000 +0100 +@@ -846,7 +846,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_TIME (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_TIME (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-string.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-string.c 2006-03-24 11:54:01.000000000 +0100 +@@ -337,7 +337,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_STRING (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_STRING (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-none.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-none.c 2006-03-24 11:53:43.000000000 +0100 +@@ -276,7 +276,6 @@ + GnomeDbHandlerNone *hdl; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_NONE (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_NONE (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-numerical.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-numerical.c 2006-03-24 11:53:52.000000000 +0100 +@@ -402,7 +402,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_NUMERICAL (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_NUMERICAL (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-boolean.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-boolean.c 2006-03-24 11:52:31.000000000 +0100 +@@ -112,7 +112,6 @@ + GnomeDbEntryBoolean *mgbool; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_BOOLEAN, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-string.c.aap 2006-03-24 11:28:13.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-string.c 2006-03-24 11:52:43.000000000 +0100 +@@ -166,7 +166,6 @@ + GnomeDbEntryString *mgstr; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_STRING, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-text.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-text.c 2006-03-24 12:18:54.000000000 +0100 +@@ -324,7 +324,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_TEXT (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_TEXT (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-text.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-text.c 2006-03-24 12:18:24.000000000 +0100 +@@ -111,7 +111,6 @@ + GnomeDbEntryText *mgtxt; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_TEXT, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-passmd5.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-passmd5.c 2006-03-24 12:18:48.000000000 +0100 +@@ -322,7 +322,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_PASSMD5 (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_PASSMD5 (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c 2006-03-24 12:18:45.000000000 +0100 +@@ -341,7 +341,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_FILESEL (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_FILESEL (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-cidr.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-cidr.c 2006-03-24 12:18:14.000000000 +0100 +@@ -122,7 +122,6 @@ + GnomeDbEntryCidr *mgcidr; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_CIDR, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-cidr.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-cidr.c 2006-03-24 12:18:36.000000000 +0100 +@@ -330,7 +330,6 @@ + gboolean found = FALSE; + + g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_CIDR (iface), FALSE); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); + hdl = GNOME_DB_HANDLER_CIDR (iface); + g_return_val_if_fail (hdl->priv, 0); + +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-passmd5.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-passmd5.c 2006-03-24 12:18:21.000000000 +0100 +@@ -111,7 +111,6 @@ + GnomeDbEntryPassmd5 *mgtxt; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_ENTRY_PASSMD5_TYPE, "handler", dh, NULL); +--- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-filesel.c.aap 2006-03-24 12:18:01.000000000 +0100 ++++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-filesel.c 2006-03-24 12:18:18.000000000 +0100 +@@ -109,7 +109,6 @@ + GnomeDbEntryFilesel *filesel; + + g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); +- g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); + g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); + + obj = g_object_new (GNOME_DB_TYPE_ENTRY_FILESEL, "handler", dh, NULL); From fedora-extras-commits at redhat.com Fri Mar 24 14:04:02 2006 From: fedora-extras-commits at redhat.com (Thomas M. Sailer (sailer)) Date: Fri, 24 Mar 2006 09:04:02 -0500 Subject: rpms/ghdl/devel ghdl.spec,1.15,1.16 Message-ID: <200603241404.k2OE4gOC007959@cvs-int.fedora.redhat.com> Author: sailer Update of /cvs/extras/rpms/ghdl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7932 Modified Files: ghdl.spec Log Message: fix x86_64 BR Index: ghdl.spec =================================================================== RCS file: /cvs/extras/rpms/ghdl/devel/ghdl.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ghdl.spec 23 Mar 2006 18:08:13 -0000 1.15 +++ ghdl.spec 24 Mar 2006 14:03:44 -0000 1.16 @@ -5,7 +5,7 @@ Summary: A VHDL simulator, using the GCC technology Name: ghdl Version: 0.22 -Release: 0.%{ghdlsvnver}svn.0%{?dist} +Release: 0.%{ghdlsvnver}svn.1%{?dist} License: GPL Group: Development/Languages URL: http://ghdl.free.fr/ @@ -49,10 +49,6 @@ # Make sure glibc supports TFmode long double BuildRequires: glibc >= 2.3.90-35 %endif -%ifarch %{multilib_64_archs} sparc ppc -# Ensure glibc{,-devel} is installed for both multilib arches -BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so -%endif # Ada requires Ada to build BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1 # Need .eh_frame ld optimizations @@ -291,6 +287,9 @@ %changelog +* Fri Mar 24 2006 Thomas Sailer - 0.22-0.50svn.1 +- do not require /lib/libc.so.* on x86_64, this does not work under mock + * Wed Mar 22 2006 Thomas Sailer - 0.22-0.50svn.0 - update to svn50, to fix x86_64 breakage - move grt (ghdl runtime library) into separate package, to allow parallel From fedora-extras-commits at redhat.com Fri Mar 24 14:25:52 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 24 Mar 2006 09:25:52 -0500 Subject: rpms/octave/devel octave-2.9.5-sparse.patch, 1.1, 1.2 octave.spec, 1.33, 1.34 Message-ID: <200603241426.k2OEQOJK008138@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8114 Modified Files: octave-2.9.5-sparse.patch octave.spec Log Message: Add more changes to sparse patch. octave-2.9.5-sparse.patch: Index: octave-2.9.5-sparse.patch =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave-2.9.5-sparse.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- octave-2.9.5-sparse.patch 23 Mar 2006 22:50:59 -0000 1.1 +++ octave-2.9.5-sparse.patch 24 Mar 2006 14:25:50 -0000 1.2 @@ -59,3 +59,89 @@ #endif /* +Index: liboctave/CSparse.cc +=================================================================== +RCS file: /cvs/octave/liboctave/CSparse.cc,v +retrieving revision 1.22 +diff -u -r1.22 CSparse.cc +--- liboctave/CSparse.cc 22 Mar 2006 22:58:12 -0000 1.22 ++++ liboctave/CSparse.cc 24 Mar 2006 14:23:38 -0000 +@@ -4273,7 +4273,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4548,7 +4548,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4899,7 +4899,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5176,7 +5176,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +Index: liboctave/dSparse.cc +=================================================================== +RCS file: /cvs/octave/liboctave/dSparse.cc,v +retrieving revision 1.21 +diff -u -r1.21 dSparse.cc +--- liboctave/dSparse.cc 22 Mar 2006 22:58:12 -0000 1.21 ++++ liboctave/dSparse.cc 24 Mar 2006 14:23:39 -0000 +@@ -4376,7 +4376,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4652,7 +4652,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5003,7 +5003,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5350,7 +5350,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- octave.spec 23 Mar 2006 22:50:59 -0000 1.33 +++ octave.spec 24 Mar 2006 14:25:50 -0000 1.34 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -133,6 +133,9 @@ %changelog +* Fri Mar 24 2006 Quentin Spencer 2.9.5-2 +- Add more changes to sparse patch. + * Thu Mar 23 2006 Quentin Spencer 2.9.5-1 - New upstream release; remove old patches; add sparse patch. - Add gcc-c++ as dependency for devel package. From fedora-extras-commits at redhat.com Fri Mar 24 14:49:54 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 24 Mar 2006 09:49:54 -0500 Subject: rpms/libgnomedb/FC-5 libgnomedb-1.9.100-unknown-datatype-fix.patch, NONE, 1.1 libgnomedb.spec, 1.12, 1.13 Message-ID: <200603241450.k2OEoRbM008297@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/libgnomedb/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8275 Modified Files: libgnomedb.spec Added Files: libgnomedb-1.9.100-unknown-datatype-fix.patch Log Message: * Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 - Add patch2 fixing bz 186517 libgnomedb-1.9.100-unknown-datatype-fix.patch: --- NEW FILE libgnomedb-1.9.100-unknown-datatype-fix.patch --- diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c 2005-08-07 15:07:13.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c 2006-03-24 11:20:29.000000000 +0100 @@ -1056,6 +1056,12 @@ GSList *params; GnomeDbParameter *similar = NULL; GSList *param_dest_fields; + + /* If people try to call us to add a NULL param do notting. */ + if (!param) { + g_warning ("Cannot add NULL param"); + return; + } if (g_slist_find (dataset->parameters, param)) return; Only in libgnomedb-1.9.100/libgnomedb: gnome-db-data-set.c.unknown diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c 2005-09-08 12:36:57.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c 2006-03-24 11:21:38.000000000 +0100 @@ -99,6 +99,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; /* Assoc transl[] = { */ @@ -181,6 +182,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -254,6 +256,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -327,6 +330,7 @@ {GDA_VALUE_TYPE_TINYUINT, ""}, {GDA_VALUE_TYPE_TYPE, ""}, {GDA_VALUE_TYPE_UINTEGER, ""}, + {GDA_VALUE_TYPE_UNKNOWN, ""} }; info = g_new0 (GnomeDbServerInfo, 1); @@ -381,12 +385,12 @@ info->implicit_data_types_casts = TRUE; info->alias_needs_as_keyword = TRUE; - info->value_nb_tests_types = GDA_VALUE_TYPE_UNKNOWN - 1; + info->value_nb_tests_types = GDA_VALUE_TYPE_UNKNOWN; info->value_test_data_types = g_new0 (gchar *, GDA_VALUE_TYPE_UNKNOWN); info->value_test_gda_types = g_new0 (GdaValueType, GDA_VALUE_TYPE_UNKNOWN); gda_type = GDA_VALUE_TYPE_NULL; - for (gda_type ++; gda_type < GDA_VALUE_TYPE_UNKNOWN; gda_type ++) { + for (gda_type ++; gda_type <= GDA_VALUE_TYPE_UNKNOWN; gda_type ++) { info->value_test_data_types [gda_type - 1] = gda_type_to_string (gda_type); info->value_test_gda_types [gda_type - 1] = gda_type; } Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c.unknown Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c~ diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c --- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c 2005-08-07 15:07:14.000000000 +0200 +++ libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c 2006-03-24 11:20:29.000000000 +0100 @@ -285,7 +285,13 @@ } } - if (type) { + if (!type) + { + g_warning ("Could not determine the DBMS data type for Gda type %d", gda_column_get_gdatype (col_attrs)); + type = "unknown"; + } + + { retval = gnome_db_server_get_data_type_by_name (srv, type); if (!retval) { /* create a GnomeDbServerDataType for that 'type' */ @@ -297,8 +303,6 @@ g_object_unref (retval); } } - else - g_warning ("Could not determine the DBMS data type for Gda type %d", gda_column_get_gdatype (col_attrs)); return retval; } Only in libgnomedb-1.9.100/libgnomedb: gnome-db-wrapper-field.c.unknown --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-time.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-time.c 2006-03-24 11:52:45.000000000 +0100 @@ -173,7 +173,6 @@ GnomeDbEntryTime *mgtim; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_TIME, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-none.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-none.c 2006-03-24 11:52:36.000000000 +0100 @@ -109,7 +109,6 @@ GnomeDbEntryNone *mgnone; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_NONE, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-boolean.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-boolean.c 2006-03-24 11:53:03.000000000 +0100 @@ -355,7 +355,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_BOOLEAN (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_BOOLEAN (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-time.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-time.c 2006-03-24 11:54:05.000000000 +0100 @@ -846,7 +846,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_TIME (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_TIME (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-string.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-string.c 2006-03-24 11:54:01.000000000 +0100 @@ -337,7 +337,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_STRING (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_STRING (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-none.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-none.c 2006-03-24 11:53:43.000000000 +0100 @@ -276,7 +276,6 @@ GnomeDbHandlerNone *hdl; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_NONE (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_NONE (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-numerical.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-handler-numerical.c 2006-03-24 11:53:52.000000000 +0100 @@ -402,7 +402,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_NUMERICAL (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_NUMERICAL (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-boolean.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-boolean.c 2006-03-24 11:52:31.000000000 +0100 @@ -112,7 +112,6 @@ GnomeDbEntryBoolean *mgbool; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_BOOLEAN, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-string.c.aap 2006-03-24 11:28:13.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/gnome-db-entry-string.c 2006-03-24 11:52:43.000000000 +0100 @@ -166,7 +166,6 @@ GnomeDbEntryString *mgstr; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_STRING, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-text.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-text.c 2006-03-24 12:18:54.000000000 +0100 @@ -324,7 +324,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_TEXT (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_TEXT (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-text.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-text.c 2006-03-24 12:18:24.000000000 +0100 @@ -111,7 +111,6 @@ GnomeDbEntryText *mgtxt; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_TEXT, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-passmd5.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-passmd5.c 2006-03-24 12:18:48.000000000 +0100 @@ -322,7 +322,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_PASSMD5 (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_PASSMD5 (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-filesel.c 2006-03-24 12:18:45.000000000 +0100 @@ -341,7 +341,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_FILESEL (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_FILESEL (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-cidr.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-cidr.c 2006-03-24 12:18:14.000000000 +0100 @@ -122,7 +122,6 @@ GnomeDbEntryCidr *mgcidr; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_CIDR, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-cidr.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-handler-cidr.c 2006-03-24 12:18:36.000000000 +0100 @@ -330,7 +330,6 @@ gboolean found = FALSE; g_return_val_if_fail (iface && IS_GNOME_DB_HANDLER_CIDR (iface), FALSE); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, FALSE); hdl = GNOME_DB_HANDLER_CIDR (iface); g_return_val_if_fail (hdl->priv, 0); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-passmd5.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-passmd5.c 2006-03-24 12:18:21.000000000 +0100 @@ -111,7 +111,6 @@ GnomeDbEntryPassmd5 *mgtxt; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_ENTRY_PASSMD5_TYPE, "handler", dh, NULL); --- libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-filesel.c.aap 2006-03-24 12:18:01.000000000 +0100 +++ libgnomedb-1.9.100/libgnomedb/handlers/plugins/gnome-db-entry-filesel.c 2006-03-24 12:18:18.000000000 +0100 @@ -109,7 +109,6 @@ GnomeDbEntryFilesel *filesel; g_return_val_if_fail (dh && IS_GNOME_DB_DATA_HANDLER (dh), NULL); - g_return_val_if_fail (type != GDA_VALUE_TYPE_UNKNOWN, NULL); g_return_val_if_fail (gnome_db_data_handler_accepts_gda_type (dh, type), NULL); obj = g_object_new (GNOME_DB_TYPE_ENTRY_FILESEL, "handler", dh, NULL); Index: libgnomedb.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomedb/FC-5/libgnomedb.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libgnomedb.spec 14 Feb 2006 21:29:02 -0000 1.12 +++ libgnomedb.spec 24 Mar 2006 14:49:54 -0000 1.13 @@ -1,7 +1,7 @@ Summary: Library for writing gnome database programs Name: libgnomedb Version: 1.9.100 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -17,6 +17,7 @@ Patch0: libgnomedb-1.2.0-desktop.patch Patch1: libgnomedb-1.9.100-sharp.patch +Patch2: libgnomedb-1.9.100-unknown-datatype-fix.patch %description libgnomedb is a library that eases the task of writing @@ -54,6 +55,7 @@ %setup -q %patch0 -p1 -b .desktop.patch %patch1 -p1 -b .sharp +%patch2 -p1 -b .unknown %build @@ -153,6 +155,9 @@ %changelog +* Fri Mar 24 2006 Hans de Goede 1:1.9.100-6 +- Add patch2 fixing bz 186517 + * Mon Feb 13 2006 Hans de Goede 1:1.9.100-5 - Bump release and rebuild for new gcc4.1 and glibc - Attempt to properly install C-sharp/mono bindings From fedora-extras-commits at redhat.com Fri Mar 24 15:13:26 2006 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Fri, 24 Mar 2006 10:13:26 -0500 Subject: rpms/smb4k/devel .cvsignore, 1.4, 1.5 smb4k.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200603241514.k2OFE2Wv010347@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/extras/rpms/smb4k/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10321 Modified Files: .cvsignore smb4k.spec sources Log Message: - Updated to version 0.6.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Feb 2006 16:23:30 -0000 1.4 +++ .cvsignore 24 Mar 2006 15:13:26 -0000 1.5 @@ -1 +1 @@ -smb4k-0.6.8.tar.gz +smb4k-0.6.9.tar.gz Index: smb4k.spec =================================================================== RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- smb4k.spec 24 Feb 2006 16:23:30 -0000 1.7 +++ smb4k.spec 24 Mar 2006 15:13:26 -0000 1.8 @@ -1,5 +1,5 @@ Name: smb4k -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Summary: The SMB/CIFS Share Browser for KDE @@ -107,6 +107,9 @@ %{_libdir}/*.so %changelog +* Fri Mar 24 2006 Marcin Garski 0.6.9-1 +- Updated to version 0.6.9 + * Fri Feb 24 2006 Marcin Garski 0.6.8-1 - Updated to version 0.6.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/smb4k/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Feb 2006 16:23:30 -0000 1.4 +++ sources 24 Mar 2006 15:13:26 -0000 1.5 @@ -1 +1 @@ -675add7e36699c392cf1c2067abebf68 smb4k-0.6.8.tar.gz +d11cb15febf8c55c04f5c96e14fced0b smb4k-0.6.9.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 15:32:58 2006 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Fri, 24 Mar 2006 10:32:58 -0500 Subject: rpms/smb4k/FC-4 .cvsignore, 1.4, 1.5 smb4k.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603241533.k2OFXVmR010520@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/extras/rpms/smb4k/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10497 Modified Files: .cvsignore smb4k.spec sources Log Message: - Updated to version 0.6.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Feb 2006 16:29:31 -0000 1.4 +++ .cvsignore 24 Mar 2006 15:32:58 -0000 1.5 @@ -1 +1 @@ -smb4k-0.6.8.tar.gz +smb4k-0.6.9.tar.gz Index: smb4k.spec =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-4/smb4k.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- smb4k.spec 24 Feb 2006 16:29:33 -0000 1.4 +++ smb4k.spec 24 Mar 2006 15:32:58 -0000 1.5 @@ -1,5 +1,5 @@ Name: smb4k -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Summary: The SMB/CIFS Share Browser for KDE @@ -107,6 +107,9 @@ %{_libdir}/*.so %changelog +* Fri Mar 24 2006 Marcin Garski 0.6.9-1 +- Updated to version 0.6.9 + * Fri Feb 24 2006 Marcin Garski 0.6.8-1 - Updated to version 0.6.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Feb 2006 16:29:33 -0000 1.4 +++ sources 24 Mar 2006 15:32:58 -0000 1.5 @@ -1 +1 @@ -675add7e36699c392cf1c2067abebf68 smb4k-0.6.8.tar.gz +d11cb15febf8c55c04f5c96e14fced0b smb4k-0.6.9.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 15:35:12 2006 From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski)) Date: Fri, 24 Mar 2006 10:35:12 -0500 Subject: rpms/smb4k/FC-5 .cvsignore, 1.4, 1.5 smb4k.spec, 1.7, 1.8 sources, 1.4, 1.5 Message-ID: <200603241535.k2OFZifO010596@cvs-int.fedora.redhat.com> Author: mgarski Update of /cvs/extras/rpms/smb4k/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10574 Modified Files: .cvsignore smb4k.spec sources Log Message: - Updated to version 0.6.9 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 24 Feb 2006 16:23:30 -0000 1.4 +++ .cvsignore 24 Mar 2006 15:35:11 -0000 1.5 @@ -1 +1 @@ -smb4k-0.6.8.tar.gz +smb4k-0.6.9.tar.gz Index: smb4k.spec =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-5/smb4k.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- smb4k.spec 24 Feb 2006 16:23:30 -0000 1.7 +++ smb4k.spec 24 Mar 2006 15:35:11 -0000 1.8 @@ -1,5 +1,5 @@ Name: smb4k -Version: 0.6.8 +Version: 0.6.9 Release: 1%{?dist} Summary: The SMB/CIFS Share Browser for KDE @@ -107,6 +107,9 @@ %{_libdir}/*.so %changelog +* Fri Mar 24 2006 Marcin Garski 0.6.9-1 +- Updated to version 0.6.9 + * Fri Feb 24 2006 Marcin Garski 0.6.8-1 - Updated to version 0.6.8 Index: sources =================================================================== RCS file: /cvs/extras/rpms/smb4k/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 24 Feb 2006 16:23:30 -0000 1.4 +++ sources 24 Mar 2006 15:35:11 -0000 1.5 @@ -1 +1 @@ -675add7e36699c392cf1c2067abebf68 smb4k-0.6.8.tar.gz +d11cb15febf8c55c04f5c96e14fced0b smb4k-0.6.9.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 16:36:14 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 11:36:14 -0500 Subject: rpms/cpanspec/devel .cvsignore, 1.5, 1.6 cpanspec.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603241636.k2OGakb7012901@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12878 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.63. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Mar 2006 02:20:00 -0000 1.5 +++ .cvsignore 24 Mar 2006 16:36:13 -0000 1.6 @@ -1 +1 @@ -cpanspec-1.62.tar.gz +cpanspec-1.63.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cpanspec.spec 23 Mar 2006 02:20:00 -0000 1.4 +++ cpanspec.spec 24 Mar 2006 16:36:13 -0000 1.5 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.62 +Version: 1.63 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.63-1 +- Update to 1.63. + * Wed Mar 22 2006 Steven Pritchard 1.62-1 - Update to 1.62. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Mar 2006 02:20:00 -0000 1.5 +++ sources 24 Mar 2006 16:36:13 -0000 1.6 @@ -1 +1 @@ -0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz +726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 16:37:56 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 11:37:56 -0500 Subject: rpms/cpanspec/FC-5 .cvsignore, 1.5, 1.6 cpanspec.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603241638.k2OGcSEg012998@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12965 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.63. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Mar 2006 02:24:24 -0000 1.5 +++ .cvsignore 24 Mar 2006 16:37:55 -0000 1.6 @@ -1 +1 @@ -cpanspec-1.62.tar.gz +cpanspec-1.63.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cpanspec.spec 23 Mar 2006 02:24:24 -0000 1.4 +++ cpanspec.spec 24 Mar 2006 16:37:55 -0000 1.5 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.62 +Version: 1.63 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.63-1 +- Update to 1.63. + * Wed Mar 22 2006 Steven Pritchard 1.62-1 - Update to 1.62. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Mar 2006 02:24:24 -0000 1.5 +++ sources 24 Mar 2006 16:37:55 -0000 1.6 @@ -1 +1 @@ -0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz +726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 16:39:20 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 11:39:20 -0500 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.5, 1.6 cpanspec.spec, 1.4, 1.5 sources, 1.5, 1.6 Message-ID: <200603241639.k2OGdq4R013075@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13045 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.63. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 23 Mar 2006 02:25:52 -0000 1.5 +++ .cvsignore 24 Mar 2006 16:39:20 -0000 1.6 @@ -1 +1 @@ -cpanspec-1.62.tar.gz +cpanspec-1.63.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cpanspec.spec 23 Mar 2006 02:25:52 -0000 1.4 +++ cpanspec.spec 24 Mar 2006 16:39:20 -0000 1.5 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.62 +Version: 1.63 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.63-1 +- Update to 1.63. + * Wed Mar 22 2006 Steven Pritchard 1.62-1 - Update to 1.62. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 23 Mar 2006 02:25:52 -0000 1.5 +++ sources 24 Mar 2006 16:39:20 -0000 1.6 @@ -1 +1 @@ -0a0b24fb5041085e1710f18a6f75608d cpanspec-1.62.tar.gz +726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz From fedora-extras-commits at redhat.com Fri Mar 24 16:46:26 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 11:46:26 -0500 Subject: rpms/environment-modules/devel .cvsignore, 1.2, 1.3 environment-modules.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603241646.k2OGkwRw013189@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13162 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Feb 2006 21:06:55 -0000 1.2 +++ .cvsignore 24 Mar 2006 16:46:26 -0000 1.3 @@ -1 +1 @@ -modules-3.2.0p1.tar.bz2 +modules-3.2.1.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/environment-modules.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- environment-modules.spec 14 Feb 2006 21:06:55 -0000 1.1 +++ environment-modules.spec 24 Mar 2006 16:46:26 -0000 1.2 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.0p1 +Version: 3.2.1 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 +- Update to 3.2.1 + * Thu Feb 9 2006 - Orion Poplawski - 3.2.0p1-1 - Update to 3.2.0p1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Feb 2006 21:06:55 -0000 1.2 +++ sources 24 Mar 2006 16:46:26 -0000 1.3 @@ -1 +1 @@ -e5167ea2b7c760920bebbedd7a0b25e5 modules-3.2.0p1.tar.bz2 +fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 24 17:04:57 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 24 Mar 2006 12:04:57 -0500 Subject: rpms/octave/devel octave-2.9.5-sparse.patch, 1.2, 1.3 octave.spec, 1.34, 1.35 Message-ID: <200603241705.k2OH5cav015294@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15272 Modified Files: octave-2.9.5-sparse.patch octave.spec Log Message: Fix patch (wrong whitespace characters). octave-2.9.5-sparse.patch: Index: octave-2.9.5-sparse.patch =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave-2.9.5-sparse.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- octave-2.9.5-sparse.patch 24 Mar 2006 14:25:50 -0000 1.2 +++ octave-2.9.5-sparse.patch 24 Mar 2006 17:04:57 -0000 1.3 @@ -1,147 +1,149 @@ +Index: liboctave/CSparse.cc +=================================================================== +RCS file: /cvs/octave/liboctave/CSparse.cc,v +retrieving revision 1.22 +diff -u -r1.22 CSparse.cc +--- liboctave/CSparse.cc 22 Mar 2006 22:58:12 -0000 1.22 ++++ liboctave/CSparse.cc 24 Mar 2006 17:01:34 -0000 +@@ -4273,7 +4273,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4548,7 +4548,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4899,7 +4899,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5176,7 +5176,7 @@ + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), Index: liboctave/SparseCmplxQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v retrieving revision 1.2 -diff -u -r1.2 SparseCmplxQR.h ---- liboctave/SparseCmplxQR.h 8 Mar 2006 20:17:38 -0000 1.2 -+++ liboctave/SparseCmplxQR.h 23 Mar 2006 17:56:07 -0000 +retrieving revision 1.3 +diff -u -r1.2 -r1.3 +--- liboctave/SparseCmplxQR.h 8 Mar 2006 20:17:38 -0000 1.2 ++++ liboctave/SparseCmplxQR.h 23 Mar 2006 18:22:51 -0000 1.3 @@ -137,6 +137,23 @@ #endif }; - + + +// Publish externally used friend functions. + +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, const Matrix &b, -+ octave_idx_type &info); ++ octave_idx_type &info); + -+extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, -+ const SparseMatrix &b, -+ octave_idx_type &info); -+ -+extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, -+ const ComplexMatrix &b, -+ octave_idx_type &info); -+ -+extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, -+ const SparseComplexMatrix &b, -+ octave_idx_type &info); ++extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, ++ const SparseMatrix &b, ++ octave_idx_type &info); ++ ++extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, ++ const ComplexMatrix &b, ++ octave_idx_type &info); ++ ++extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, ++ const SparseComplexMatrix &b, ++ octave_idx_type &info); #endif - + /* Index: liboctave/SparseQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseQR.h,v retrieving revision 1.2 -diff -u -r1.2 SparseQR.h ---- liboctave/SparseQR.h 8 Mar 2006 20:17:38 -0000 1.2 -+++ liboctave/SparseQR.h 23 Mar 2006 17:56:07 -0000 +retrieving revision 1.3 +diff -u -r1.2 -r1.3 +--- liboctave/SparseQR.h 8 Mar 2006 20:17:38 -0000 1.2 ++++ liboctave/SparseQR.h 23 Mar 2006 18:22:51 -0000 1.3 @@ -133,6 +133,22 @@ #endif }; - + + +// Publish externally used friend functions. + -+extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, -+ octave_idx_type &info); ++extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, ++ octave_idx_type &info); + +extern SparseMatrix qrsolve (const SparseMatrix &a, const SparseMatrix &b, -+ octave_idx_type &info); ++ octave_idx_type &info); + +extern ComplexMatrix qrsolve (const SparseMatrix &a, const ComplexMatrix &b, -+ octave_idx_type &info); ++ octave_idx_type &info); + -+extern SparseComplexMatrix qrsolve (const SparseMatrix &a, -+ const SparseComplexMatrix &b, -+ octave_idx_type &info); ++extern SparseComplexMatrix qrsolve (const SparseMatrix &a, ++ const SparseComplexMatrix &b, ++ octave_idx_type &info); + #endif - + /* -Index: liboctave/CSparse.cc -=================================================================== -RCS file: /cvs/octave/liboctave/CSparse.cc,v -retrieving revision 1.22 -diff -u -r1.22 CSparse.cc ---- liboctave/CSparse.cc 22 Mar 2006 22:58:12 -0000 1.22 -+++ liboctave/CSparse.cc 24 Mar 2006 14:23:38 -0000 -@@ -4273,7 +4273,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -4548,7 +4548,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -4899,7 +4899,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -5176,7 +5176,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), Index: liboctave/dSparse.cc =================================================================== RCS file: /cvs/octave/liboctave/dSparse.cc,v retrieving revision 1.21 diff -u -r1.21 dSparse.cc ---- liboctave/dSparse.cc 22 Mar 2006 22:58:12 -0000 1.21 -+++ liboctave/dSparse.cc 24 Mar 2006 14:23:39 -0000 +--- liboctave/dSparse.cc 22 Mar 2006 22:58:12 -0000 1.21 ++++ liboctave/dSparse.cc 24 Mar 2006 17:01:35 -0000 @@ -4376,7 +4376,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -4652,7 +4652,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5003,7 +5003,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), @@ -5350,7 +5350,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), + // Calculate the norm of the matrix, for later use. + double anorm; + if (calc_cond) +- anorm = m_band.abs().sum().row(0).max(); ++ anorm = m_band.abs().sum().row(static_cast(0)).max(); + + char job = 'L'; + F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- octave.spec 24 Mar 2006 14:25:50 -0000 1.34 +++ octave.spec 24 Mar 2006 17:04:57 -0000 1.35 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -133,6 +133,9 @@ %changelog +* Fri Mar 24 2006 Quentin Spencer 2.9.5-3 +- Fix broken patch. + * Fri Mar 24 2006 Quentin Spencer 2.9.5-2 - Add more changes to sparse patch. From fedora-extras-commits at redhat.com Fri Mar 24 18:51:28 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 13:51:28 -0500 Subject: rpms/environment-modules/FC-5 .cvsignore, 1.2, 1.3 environment-modules.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603241852.k2OIq1i6017841@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17820 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Feb 2006 21:06:55 -0000 1.2 +++ .cvsignore 24 Mar 2006 18:51:28 -0000 1.3 @@ -1 +1 @@ -modules-3.2.0p1.tar.bz2 +modules-3.2.1.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/environment-modules.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- environment-modules.spec 14 Feb 2006 21:06:55 -0000 1.1 +++ environment-modules.spec 24 Mar 2006 18:51:28 -0000 1.2 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.0p1 +Version: 3.2.1 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 +- Update to 3.2.1 + * Thu Feb 9 2006 - Orion Poplawski - 3.2.0p1-1 - Update to 3.2.0p1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Feb 2006 21:06:55 -0000 1.2 +++ sources 24 Mar 2006 18:51:28 -0000 1.3 @@ -1 +1 @@ -e5167ea2b7c760920bebbedd7a0b25e5 modules-3.2.0p1.tar.bz2 +fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 24 18:53:24 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 13:53:24 -0500 Subject: rpms/environment-modules/FC-4 .cvsignore, 1.2, 1.3 environment-modules.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603241853.k2OIrutf017912@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/environment-modules/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17891 Modified Files: .cvsignore environment-modules.spec sources Log Message: Update to 3.2.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 14 Feb 2006 21:06:55 -0000 1.2 +++ .cvsignore 24 Mar 2006 18:53:24 -0000 1.3 @@ -1 +1 @@ -modules-3.2.0p1.tar.bz2 +modules-3.2.1.tar.bz2 Index: environment-modules.spec =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/environment-modules.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- environment-modules.spec 14 Feb 2006 21:06:55 -0000 1.1 +++ environment-modules.spec 24 Mar 2006 18:53:24 -0000 1.2 @@ -1,5 +1,5 @@ Name: environment-modules -Version: 3.2.0p1 +Version: 3.2.1 Release: 1%{?dist} Summary: Provides dynamic modification of a user's environment @@ -65,6 +65,9 @@ %changelog +* Fri Mar 24 2006 - Orion Poplawski - 3.2.1-1 +- Update to 3.2.1 + * Thu Feb 9 2006 - Orion Poplawski - 3.2.0p1-1 - Update to 3.2.0p1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/environment-modules/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 14 Feb 2006 21:06:55 -0000 1.2 +++ sources 24 Mar 2006 18:53:24 -0000 1.3 @@ -1 +1 @@ -e5167ea2b7c760920bebbedd7a0b25e5 modules-3.2.0p1.tar.bz2 +fbe371d328b39f5e8cd946bd3b1063f1 modules-3.2.1.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 24 19:13:50 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 24 Mar 2006 14:13:50 -0500 Subject: extras-buildsys/server BuildMaster.py, 1.38, 1.39 DBManager.py, 1.6, 1.7 User.py, 1.9, 1.10 UserInterface.py, 1.61, 1.62 Message-ID: <200603241913.k2OJDowY020096@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20028/server Modified Files: BuildMaster.py DBManager.py User.py UserInterface.py Log Message: 2006-03-24 Dan Williams * server/DBManager.py - Close database connection on delete for PostgreSQL and MySQL. Fixes leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, as seen on RHEL4. #rh182441# * server/BuildMaster.py - Delete the database context when on stop * server/User.py * server/UserInterface.py - Clean up deletion of database contexts and cursors Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- BuildMaster.py 12 Mar 2006 13:43:40 -0000 1.38 +++ BuildMaster.py 24 Mar 2006 19:13:41 -0000 1.39 @@ -72,6 +72,9 @@ threading.Thread.__init__(self) self.setName("BuildMaster") + def _cleanup(self): + del self._cursor, self._dbcx + def _requeue_interrupted_jobs(self): """ Restart interrupted jobs from our db. """ self._cursor.execute("SELECT uid FROM jobs WHERE (status!='needsign' AND status!='failed' AND status!='finished') ORDER BY uid") @@ -416,3 +419,5 @@ while not self._have_work() and time.time() <= last_time + 5: time.sleep(0.25) + self._cleanup() + Index: DBManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/DBManager.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- DBManager.py 12 Mar 2006 13:43:40 -0000 1.6 +++ DBManager.py 24 Mar 2006 19:13:41 -0000 1.7 @@ -211,6 +211,10 @@ return dbcx + def __del__(self): + self._dbcx.close() + del self._dbcx + class mysqlEngineClass(BaseDBEngineClass): @@ -263,6 +267,10 @@ return dbcx + def __del__(self): + self._dbcx.close() + del self._dbcx + db_engines = { 'sqlite': sqliteEngineClass, Index: User.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/User.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- User.py 25 Nov 2005 22:45:56 -0000 1.9 +++ User.py 24 Mar 2006 19:13:41 -0000 1.10 @@ -46,8 +46,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: - del curs - del dbcx + del curs, dbcx print "Unable to access user database: '%s'" % str(e) return None user = None @@ -62,7 +61,6 @@ else: if self._cfg.get_bool("UI", "guest_allowed"): user = User('guest at guest', True) - del curs - del dbcx + del curs, dbcx return user Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.61 retrieving revision 1.62 diff -u -r1.61 -r1.62 --- UserInterface.py 12 Mar 2006 13:43:40 -0000 1.61 +++ UserInterface.py 24 Mar 2006 19:13:41 -0000 1.62 @@ -181,6 +181,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) job = dbcx.fetchone(curs) @@ -193,9 +194,8 @@ self._bm.requeue_job(uid) result = (0, "Success: Job %d has been requeued." % uid) - del curs - del dbcx - return result + del curs, dbcx + return result def _kill_job(self, email, job, jobid): if not job: @@ -315,6 +315,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e, []) curs.execute(sql) data = dbcx.fetchall(curs) @@ -363,8 +364,7 @@ if job['uid'] == ajrec['parent_uid']: job['archjobs'].append(copy.deepcopy(ajrec)) - del curs - del dbcx + del curs, dbcx return (0, "Success.", jobs) @@ -384,12 +384,12 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e, {}) curs.execute(sql) job = dbcx.fetchone(curs) if not job: - del curs - del dbcx + del curs, dbcx return (-1, "Error: Invalid job UID.", {}) jobrec = {} jobrec['uid'] = job['uid'] @@ -436,8 +436,7 @@ ret_job = copy.deepcopy(jobrec) - del curs - del dbcx + del curs, dbcx return (0, "Success.", ret_job) @@ -473,6 +472,13 @@ return self._bm.is_paused() def finish(self, uid_list): + try: + dbcx = self._db_manager.dbcx() + curs = dbcx.cursor() + except StandardError, e: + del curs, dbcx + return (-1, "Unable to access job database: '%s'" % e) + uids = '' for uid in uid_list: uid = validate_uid(uid) @@ -486,16 +492,10 @@ if len(uids): sql = "UPDATE jobs SET status='finished' WHERE %s" % uids - try: - dbcx = self._db_manager.dbcx() - curs = dbcx.cursor() - except StandardError, e: - return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) dbcx.commit() - del curs - del dbcx + del curs, dbcx return (0, "Success.") def srpm_upload_dir(self, target_alias): @@ -538,6 +538,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) @@ -551,8 +552,7 @@ else: result = UserInterface.requeue(self, uid) - del curs - del dbcx + del curs, dbcx return result def kill_job(self, email, jobid): @@ -627,6 +627,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) @@ -656,8 +657,7 @@ final_uid_list.append(uid) - del curs - del dbcx + del curs, dbcx if error: return error From fedora-extras-commits at redhat.com Fri Mar 24 19:13:43 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 24 Mar 2006 14:13:43 -0500 Subject: extras-buildsys ChangeLog,1.179,1.180 Message-ID: <200603241914.k2OJEEcl020102@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20028 Modified Files: ChangeLog Log Message: 2006-03-24 Dan Williams * server/DBManager.py - Close database connection on delete for PostgreSQL and MySQL. Fixes leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, as seen on RHEL4. #rh182441# * server/BuildMaster.py - Delete the database context when on stop * server/User.py * server/UserInterface.py - Clean up deletion of database contexts and cursors Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.179 retrieving revision 1.180 diff -u -r1.179 -r1.180 --- ChangeLog 24 Mar 2006 01:34:42 -0000 1.179 +++ ChangeLog 24 Mar 2006 19:13:40 -0000 1.180 @@ -1,3 +1,17 @@ +2006-03-24 Dan Williams + + * server/DBManager.py + - Close database connection on delete for PostgreSQL and MySQL. Fixes + leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, + as seen on RHEL4. #rh182441# + + * server/BuildMaster.py + - Delete the database context when on stop + + * server/User.py + * server/UserInterface.py + - Clean up deletion of database contexts and cursors + 2006-03-23 Dan Williams * server/Repo.py From fedora-extras-commits at redhat.com Fri Mar 24 19:17:22 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 24 Mar 2006 14:17:22 -0500 Subject: extras-buildsys/server BuildMaster.py, 1.35.2.1, 1.35.2.2 DBManager.py, 1.1.2.2, 1.1.2.3 User.py, 1.7, 1.7.2.1 UserInterface.py, 1.58.2.2, 1.58.2.3 Message-ID: <200603241917.k2OJHMfB020174@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/server In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20129/server Modified Files: Tag: STABLE_0_4 BuildMaster.py DBManager.py User.py UserInterface.py Log Message: 2006-03-24 Dan Williams * server/DBManager.py - Close database connection on delete for PostgreSQL and MySQL. Fixes leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, as seen on RHEL4. #rh182441# * server/BuildMaster.py - Delete the database context when on stop * server/User.py * server/UserInterface.py - Clean up deletion of database contexts and cursors Index: BuildMaster.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v retrieving revision 1.35.2.1 retrieving revision 1.35.2.2 diff -u -r1.35.2.1 -r1.35.2.2 --- BuildMaster.py 29 Nov 2005 06:36:43 -0000 1.35.2.1 +++ BuildMaster.py 24 Mar 2006 19:17:11 -0000 1.35.2.2 @@ -72,6 +72,9 @@ threading.Thread.__init__(self) self.setName("BuildMaster") + def _cleanup(self): + del self._cursor, self._dbcx + def _requeue_interrupted_jobs(self): """ Restart interrupted jobs from our db. """ self._cursor.execute("SELECT uid FROM jobs WHERE (status!='needsign' AND status!='failed' AND status!='finished') ORDER BY uid") @@ -416,3 +419,5 @@ while not self._have_work() and time.time() <= last_time + 5: time.sleep(0.25) + self._cleanup() + Index: DBManager.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/DBManager.py,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -u -r1.1.2.2 -r1.1.2.3 --- DBManager.py 24 Oct 2005 15:34:24 -0000 1.1.2.2 +++ DBManager.py 24 Mar 2006 19:17:11 -0000 1.1.2.3 @@ -198,6 +198,10 @@ return dbcx + def __del__(self): + self._dbcx.close() + del self._dbcx + class mysqlEngineClass(BaseDBEngineClass): @@ -247,6 +251,10 @@ return dbcx + def __del__(self): + self._dbcx.close() + del self._dbcx + db_engines = { 'sqlite': sqliteEngineClass, Index: User.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/User.py,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -u -r1.7 -r1.7.2.1 --- User.py 15 Aug 2005 03:18:20 -0000 1.7 +++ User.py 24 Mar 2006 19:17:11 -0000 1.7.2.1 @@ -68,6 +68,7 @@ 'user_admin BOOLEAN, ' \ 'server_admin BOOLEAN)') dbcx.commit() + del curs, dbcx def new_authed_user(self, email, client_address): @@ -88,5 +89,6 @@ else: if self._cfg.get_bool("UI", "guest_allowed"): user = User('guest at guest', True) + del curs, dbcx return user Index: UserInterface.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/server/UserInterface.py,v retrieving revision 1.58.2.2 retrieving revision 1.58.2.3 diff -u -r1.58.2.2 -r1.58.2.3 --- UserInterface.py 28 Nov 2005 17:50:15 -0000 1.58.2.2 +++ UserInterface.py 24 Mar 2006 19:17:12 -0000 1.58.2.3 @@ -181,6 +181,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) job = dbcx.fetchone(curs) @@ -193,9 +194,8 @@ self._bm.requeue_job(uid) result = (0, "Success: Job %d has been requeued." % uid) - del curs - del dbcx - return result + del curs, dbcx + return result def _kill_job(self, email, job, jobid): if not job: @@ -315,6 +315,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e, []) curs.execute(sql) data = dbcx.fetchall(curs) @@ -363,8 +364,7 @@ if job['uid'] == ajrec['parent_uid']: job['archjobs'].append(copy.deepcopy(ajrec)) - del curs - del dbcx + del curs, dbcx return (0, "Success.", jobs) @@ -384,12 +384,12 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e, {}) curs.execute(sql) job = dbcx.fetchone(curs) if not job: - del curs - del dbcx + del curs, dbcx return (-1, "Error: Invalid job UID.", {}) jobrec = {} jobrec['uid'] = job['uid'] @@ -436,8 +436,7 @@ ret_job = copy.deepcopy(jobrec) - del curs - del dbcx + del curs, dbcx return (0, "Success.", ret_job) @@ -473,6 +472,13 @@ return self._bm.is_paused() def finish(self, uid_list): + try: + dbcx = self._db_manager.dbcx() + curs = dbcx.cursor() + except StandardError, e: + del curs, dbcx + return (-1, "Unable to access job database: '%s'" % e) + uids = '' for uid in uid_list: uid = validate_uid(uid) @@ -486,16 +492,10 @@ if len(uids): sql = "UPDATE jobs SET status='finished' WHERE %s" % uids - try: - dbcx = self._db_manager.dbcx() - curs = dbcx.cursor() - except StandardError, e: - return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) dbcx.commit() - del curs - del dbcx + del curs, dbcx return (0, "Success.") def srpm_upload_dir(self, target_alias): @@ -538,6 +538,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) @@ -551,8 +552,7 @@ else: result = UserInterface.requeue(self, uid) - del curs - del dbcx + del curs, dbcx return result def kill_job(self, email, jobid): @@ -627,6 +627,7 @@ dbcx = self._db_manager.dbcx() curs = dbcx.cursor() except StandardError, e: + del curs, dbcx return (-1, "Unable to access job database: '%s'" % e) curs.execute(sql) @@ -656,8 +657,7 @@ final_uid_list.append(uid) - del curs - del dbcx + del curs, dbcx if error: return error From fedora-extras-commits at redhat.com Fri Mar 24 19:17:13 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Fri, 24 Mar 2006 14:17:13 -0500 Subject: extras-buildsys ChangeLog,1.126.2.46,1.126.2.47 Message-ID: <200603241917.k2OJHvkh020184@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20129 Modified Files: Tag: STABLE_0_4 ChangeLog Log Message: 2006-03-24 Dan Williams * server/DBManager.py - Close database connection on delete for PostgreSQL and MySQL. Fixes leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, as seen on RHEL4. #rh182441# * server/BuildMaster.py - Delete the database context when on stop * server/User.py * server/UserInterface.py - Clean up deletion of database contexts and cursors Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.126.2.46 retrieving revision 1.126.2.47 diff -u -r1.126.2.46 -r1.126.2.47 --- ChangeLog 20 Mar 2006 12:48:33 -0000 1.126.2.46 +++ ChangeLog 24 Mar 2006 19:16:51 -0000 1.126.2.47 @@ -1,3 +1,17 @@ +2006-03-24 Dan Williams + + * server/DBManager.py + - Close database connection on delete for PostgreSQL and MySQL. Fixes + leaking MySQL connection with Python 2.3 and MySQL-python 1.0.0, + as seen on RHEL4. #rh182441# + + * server/BuildMaster.py + - Delete the database context when on stop + + * server/User.py + * server/UserInterface.py + - Clean up deletion of database contexts and cursors + 2006-03-20 Dan Williams * common/FileDownloader.py From fedora-extras-commits at redhat.com Fri Mar 24 20:36:38 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 24 Mar 2006 15:36:38 -0500 Subject: rpms/libmodplug/FC-5 .cvsignore, 1.2, 1.3 libmodplug.spec, 1.8, 1.9 sources, 1.2, 1.3 libmodplug-64bit.patch, 1.1, NONE Message-ID: <200603242037.k2OKbBx7022685@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libmodplug/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/FC-5 Modified Files: .cvsignore libmodplug.spec sources Removed Files: libmodplug-64bit.patch Log Message: * Fri Mar 24 2006 Ville Skytt?? - 1:0.8-1 - 0.8, 64bit patch included upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmodplug/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:45:31 -0000 1.2 +++ .cvsignore 24 Mar 2006 20:36:37 -0000 1.3 @@ -1 +1 @@ -libmodplug-0.7.tar.gz +libmodplug-0.8.tar.gz Index: libmodplug.spec =================================================================== RCS file: /cvs/extras/rpms/libmodplug/FC-5/libmodplug.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libmodplug.spec 13 Feb 2006 20:15:00 -0000 1.8 +++ libmodplug.spec 24 Mar 2006 20:36:37 -0000 1.9 @@ -1,6 +1,6 @@ Name: libmodplug -Version: 0.7 -Release: 5%{?dist} +Version: 0.8 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -8,7 +8,6 @@ License: Public Domain URL: http://modplug-xmms.sourceforge.net/ Source0: http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz -Patch0: %{name}-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -26,7 +25,7 @@ %prep %setup -q -%patch0 -p1 +chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h sed -i -e 's/\r//g' ChangeLog @@ -50,6 +49,7 @@ %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig @@ -66,6 +66,9 @@ %changelog +* Fri Mar 24 2006 Ville Skytt?? - 1:0.8-1 +- 0.8, 64bit patch included upstream. + * Mon Feb 13 2006 Ville Skytt?? - 1:0.7-5 - Rebuild, cosmetics. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmodplug/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:45:31 -0000 1.2 +++ sources 24 Mar 2006 20:36:37 -0000 1.3 @@ -1 +1 @@ -b6e7412f90cdd4a27a2dd3de94909905 libmodplug-0.7.tar.gz +cea399626e2a074e2a77c8cd98387a48 libmodplug-0.8.tar.gz --- libmodplug-64bit.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 20:36:44 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 24 Mar 2006 15:36:44 -0500 Subject: rpms/libmodplug/devel .cvsignore, 1.2, 1.3 libmodplug.spec, 1.8, 1.9 sources, 1.2, 1.3 libmodplug-64bit.patch, 1.1, NONE Message-ID: <200603242037.k2OKbSd6022698@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/libmodplug/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22645/devel Modified Files: .cvsignore libmodplug.spec sources Removed Files: libmodplug-64bit.patch Log Message: * Fri Mar 24 2006 Ville Skytt?? - 1:0.8-1 - 0.8, 64bit patch included upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libmodplug/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:45:31 -0000 1.2 +++ .cvsignore 24 Mar 2006 20:36:44 -0000 1.3 @@ -1 +1 @@ -libmodplug-0.7.tar.gz +libmodplug-0.8.tar.gz Index: libmodplug.spec =================================================================== RCS file: /cvs/extras/rpms/libmodplug/devel/libmodplug.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- libmodplug.spec 13 Feb 2006 20:15:00 -0000 1.8 +++ libmodplug.spec 24 Mar 2006 20:36:44 -0000 1.9 @@ -1,6 +1,6 @@ Name: libmodplug -Version: 0.7 -Release: 5%{?dist} +Version: 0.8 +Release: 1%{?dist} Epoch: 1 Summary: Modplug mod music file format library @@ -8,7 +8,6 @@ License: Public Domain URL: http://modplug-xmms.sourceforge.net/ Source0: http://dl.sf.net/modplug-xmms/%{name}-%{version}.tar.gz -Patch0: %{name}-64bit.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -26,7 +25,7 @@ %prep %setup -q -%patch0 -p1 +chmod -c -x AUTHORS ChangeLog COPYING src/*.{cpp,h} src/libmodplug/*.h sed -i -e 's/\r//g' ChangeLog @@ -50,6 +49,7 @@ %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig @@ -66,6 +66,9 @@ %changelog +* Fri Mar 24 2006 Ville Skytt?? - 1:0.8-1 +- 0.8, 64bit patch included upstream. + * Mon Feb 13 2006 Ville Skytt?? - 1:0.7-5 - Rebuild, cosmetics. Index: sources =================================================================== RCS file: /cvs/extras/rpms/libmodplug/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:45:31 -0000 1.2 +++ sources 24 Mar 2006 20:36:44 -0000 1.3 @@ -1 +1 @@ -b6e7412f90cdd4a27a2dd3de94909905 libmodplug-0.7.tar.gz +cea399626e2a074e2a77c8cd98387a48 libmodplug-0.8.tar.gz --- libmodplug-64bit.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 24 21:17:33 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 24 Mar 2006 16:17:33 -0500 Subject: rpms/thinkpad-kmod/devel kmodtool,1.3,1.4 Message-ID: <200603242118.k2OLI58u025024@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/thinkpad-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24992/thinkpad-kmod/devel Modified Files: kmodtool Log Message: kmodtool 0.10.6: add epoch handling to package template. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/kmodtool,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kmodtool 15 Mar 2006 19:52:17 -0000 1.3 +++ kmodtool 24 Mar 2006 21:17:32 -0000 1.4 @@ -24,7 +24,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.5" +myver="0.10.6" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= @@ -68,9 +68,9 @@ Summary: ${kmod_name} kernel module(s) Group: System Environment/Kernel Provides: kernel-module = ${verrel}${variant} -Provides: kmod-${kmod_name} = %{version}-%{release} +Provides: kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: ${kdep} -Requires: ${kmod_name}-kmod-common = %{version} +Requires: ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version} Requires(post): /sbin/depmod Requires(postun): /sbin/depmod BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel} From fedora-extras-commits at redhat.com Fri Mar 24 21:17:39 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 24 Mar 2006 16:17:39 -0500 Subject: rpms/lirc-kmod/devel kmodtool,1.3,1.4 Message-ID: <200603242118.k2OLICRC025027@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/lirc-kmod/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24992/lirc-kmod/devel Modified Files: kmodtool Log Message: kmodtool 0.10.6: add epoch handling to package template. Index: kmodtool =================================================================== RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- kmodtool 13 Mar 2006 21:06:07 -0000 1.3 +++ kmodtool 24 Mar 2006 21:17:39 -0000 1.4 @@ -24,7 +24,7 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. myprog="kmodtool" -myver="0.10.5" +myver="0.10.6" knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)' kmod_name= kver= @@ -68,9 +68,9 @@ Summary: ${kmod_name} kernel module(s) Group: System Environment/Kernel Provides: kernel-module = ${verrel}${variant} -Provides: kmod-${kmod_name} = %{version}-%{release} +Provides: kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: ${kdep} -Requires: ${kmod_name}-kmod-common = %{version} +Requires: ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version} Requires(post): /sbin/depmod Requires(postun): /sbin/depmod BuildRequires: kernel${dashvariant}-devel-%{_target_cpu} = ${verrel} From fedora-extras-commits at redhat.com Fri Mar 24 21:19:20 2006 From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer)) Date: Fri, 24 Mar 2006 16:19:20 -0500 Subject: rpms/octave/devel octave-2.9.5-sparse.patch, 1.3, 1.4 octave.spec, 1.35, 1.36 Message-ID: <200603242119.k2OLJqtS025055@cvs-int.fedora.redhat.com> Author: qspencer Update of /cvs/extras/rpms/octave/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25033 Modified Files: octave-2.9.5-sparse.patch octave.spec Log Message: Change patch and try again. octave-2.9.5-sparse.patch: Index: octave-2.9.5-sparse.patch =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave-2.9.5-sparse.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- octave-2.9.5-sparse.patch 24 Mar 2006 17:04:57 -0000 1.3 +++ octave-2.9.5-sparse.patch 24 Mar 2006 21:19:19 -0000 1.4 @@ -1,46 +1,3 @@ -Index: liboctave/CSparse.cc -=================================================================== -RCS file: /cvs/octave/liboctave/CSparse.cc,v -retrieving revision 1.22 -diff -u -r1.22 CSparse.cc ---- liboctave/CSparse.cc 22 Mar 2006 22:58:12 -0000 1.22 -+++ liboctave/CSparse.cc 24 Mar 2006 17:01:34 -0000 -@@ -4273,7 +4273,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -4548,7 +4548,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -4899,7 +4899,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -5176,7 +5176,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (zpbtrf, ZPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), Index: liboctave/SparseCmplxQR.h =================================================================== RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v @@ -104,46 +61,342 @@ #endif /* +Index: liboctave/CMatrix.cc +=================================================================== +RCS file: /cvs/octave/liboctave/CMatrix.cc,v +retrieving revision 1.114 +diff -u -r1.114 CMatrix.cc +--- liboctave/CMatrix.cc 2 Mar 2006 03:40:00 -0000 1.114 ++++ liboctave/CMatrix.cc 24 Mar 2006 18:53:58 -0000 +@@ -889,27 +889,6 @@ + return retval; + } + +-ComplexRowVector +-ComplexMatrix::row (char *s) const +-{ +- if (! s) +- { +- (*current_liboctave_error_handler) ("invalid row selection"); +- return ComplexRowVector (); +- } +- +- char c = *s; +- if (c == 'f' || c == 'F') +- return row (static_cast(0)); +- else if (c == 'l' || c == 'L') +- return row (rows () - 1); +- else +- { +- (*current_liboctave_error_handler) ("invalid row selection"); +- return ComplexRowVector (); +- } +-} +- + ComplexColumnVector + ComplexMatrix::column (octave_idx_type i) const + { +@@ -927,27 +906,6 @@ + return retval; + } + +-ComplexColumnVector +-ComplexMatrix::column (char *s) const +-{ +- if (! s) +- { +- (*current_liboctave_error_handler) ("invalid column selection"); +- return ComplexColumnVector (); +- } +- +- char c = *s; +- if (c == 'f' || c == 'F') +- return column (static_cast(0)); +- else if (c == 'l' || c == 'L') +- return column (cols () - 1); +- else +- { +- (*current_liboctave_error_handler) ("invalid column selection"); +- return ComplexColumnVector (); +- } +-} +- + ComplexMatrix + ComplexMatrix::inverse (void) const + { +Index: liboctave/CMatrix.h +=================================================================== +RCS file: /cvs/octave/liboctave/CMatrix.h,v +retrieving revision 1.55 +diff -u -r1.55 CMatrix.h +--- liboctave/CMatrix.h 26 Oct 2005 15:24:08 -0000 1.55 ++++ liboctave/CMatrix.h 24 Mar 2006 18:53:58 -0000 +@@ -130,10 +130,8 @@ + // extract row or column i. + + ComplexRowVector row (octave_idx_type i) const; +- ComplexRowVector row (char *s) const; + + ComplexColumnVector column (octave_idx_type i) const; +- ComplexColumnVector column (char *s) const; + + ComplexMatrix inverse (void) const; + ComplexMatrix inverse (octave_idx_type& info) const; +Index: liboctave/dMatrix.cc +=================================================================== +RCS file: /cvs/octave/liboctave/dMatrix.cc,v +retrieving revision 1.120 +diff -u -r1.120 dMatrix.cc +--- liboctave/dMatrix.cc 2 Mar 2006 03:40:01 -0000 1.120 ++++ liboctave/dMatrix.cc 24 Mar 2006 18:53:59 -0000 +@@ -559,27 +559,6 @@ + return retval; + } + +-RowVector +-Matrix::row (char *s) const +-{ +- if (! s) +- { +- (*current_liboctave_error_handler) ("invalid row selection"); +- return RowVector (); +- } +- +- char c = *s; +- if (c == 'f' || c == 'F') +- return row ( static_cast(0) ); +- else if (c == 'l' || c == 'L') +- return row (rows () - 1); +- else +- { +- (*current_liboctave_error_handler) ("invalid row selection"); +- return RowVector (); +- } +-} +- + ColumnVector + Matrix::column (octave_idx_type i) const + { +@@ -597,27 +576,6 @@ + return retval; + } + +-ColumnVector +-Matrix::column (char *s) const +-{ +- if (! s) +- { +- (*current_liboctave_error_handler) ("invalid column selection"); +- return ColumnVector (); +- } +- +- char c = *s; +- if (c == 'f' || c == 'F') +- return column (static_cast (0)); +- else if (c == 'l' || c == 'L') +- return column (cols () - 1); +- else +- { +- (*current_liboctave_error_handler) ("invalid column selection"); +- return ColumnVector (); +- } +-} +- + Matrix + Matrix::inverse (void) const + { +Index: liboctave/dMatrix.h +=================================================================== +RCS file: /cvs/octave/liboctave/dMatrix.h,v +retrieving revision 1.61 +diff -u -r1.61 dMatrix.h +--- liboctave/dMatrix.h 26 Oct 2005 15:24:08 -0000 1.61 ++++ liboctave/dMatrix.h 24 Mar 2006 18:53:59 -0000 +@@ -102,10 +102,8 @@ + // extract row or column i. + + RowVector row (octave_idx_type i) const; +- RowVector row (char *s) const; + + ColumnVector column (octave_idx_type i) const; +- ColumnVector column (char *s) const; + + Matrix inverse (void) const; + Matrix inverse (octave_idx_type& info) const; Index: liboctave/dSparse.cc =================================================================== RCS file: /cvs/octave/liboctave/dSparse.cc,v retrieving revision 1.21 diff -u -r1.21 dSparse.cc --- liboctave/dSparse.cc 22 Mar 2006 22:58:12 -0000 1.21 -+++ liboctave/dSparse.cc 24 Mar 2006 17:01:35 -0000 -@@ -4376,7 +4376,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -4652,7 +4652,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -5003,7 +5003,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), -@@ -5350,7 +5350,7 @@ - // Calculate the norm of the matrix, for later use. - double anorm; - if (calc_cond) -- anorm = m_band.abs().sum().row(0).max(); -+ anorm = m_band.abs().sum().row(static_cast(0)).max(); - - char job = 'L'; - F77_XFCN (dpbtrf, DPBTRF, (F77_CONST_CHAR_ARG2 (&job, 1), ++++ liboctave/dSparse.cc 24 Mar 2006 18:54:00 -0000 +@@ -4404,7 +4404,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dpbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4540,7 +4540,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dgbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4678,7 +4678,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dpbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -4851,7 +4851,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dgbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5031,7 +5031,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dpbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5208,7 +5208,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dpbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5379,7 +5379,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dpbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +@@ -5586,7 +5586,7 @@ + Array z (3 * nr); + double *pz = z.fortran_vec (); + Array iz (nr); +- int *piz = iz.fortran_vec (); ++ octave_idx_type *piz = iz.fortran_vec (); + + F77_XFCN (dgbcon, DGBCON, + (F77_CONST_CHAR_ARG2 (&job, 1), +Index: src/ov-cell.cc +=================================================================== +RCS file: /cvs/octave/src/ov-cell.cc,v +retrieving revision 1.58 +diff -u -r1.58 ov-cell.cc +--- src/ov-cell.cc 24 Mar 2006 16:42:44 -0000 1.58 ++++ src/ov-cell.cc 24 Mar 2006 19:14:32 -0000 +@@ -783,10 +783,12 @@ + + for (octave_idx_type i = 0; i < dv.numel (); i++) + { +- char s[20]; +- sprintf (s, "_%d", i); ++ OSSTREAM buf; ++ buf << "_" << i << OSSTREAM_ENDS; ++ std::string s = OSSTREAM_STR (buf); ++ OSSTREAM_FREEZE (buf); + +- if (! add_hdf5_data(data_hid, tmp.elem (i), s, "", false, ++ if (! add_hdf5_data(data_hid, tmp.elem (i), s.c_str (), "", false, + save_as_floats)) + { + H5Gclose (data_hid); +Index: src/ov-list.cc +=================================================================== +RCS file: /cvs/octave/src/ov-list.cc,v +retrieving revision 1.44 +diff -u -r1.44 ov-list.cc +--- src/ov-list.cc 26 Apr 2005 19:24:33 -0000 1.44 ++++ src/ov-list.cc 24 Mar 2006 19:14:32 -0000 +@@ -536,9 +536,13 @@ + for (int i = 0; i < lst.length (); ++i) + { + // should we use lst.name_tags () to label the elements? +- char s[20]; +- sprintf (s, "_%d", i); +- bool b = save_ascii_data (os, lst (i), s, infnan_warned, ++ ++ OSSTREAM buf; ++ buf << "_" << i << OSSTREAM_ENDS; ++ std::string s = OSSTREAM_STR (buf); ++ OSSTREAM_FREEZE (buf); ++ ++ bool b = save_ascii_data (os, lst (i), s.c_str (), infnan_warned, + strip_nan_and_inf, 0, 0); + + if (! b) +@@ -607,11 +611,15 @@ + for (int i = 0; i < lst.length (); i++) + { + // should we use lst.name_tags () to label the elements? +- char s[20]; +- sprintf (s, "_%d", i); ++ ++ OSSTREAM buf; ++ buf << "_" << i << OSSTREAM_ENDS; ++ std::string s = OSSTREAM_STR (buf); ++ OSSTREAM_FREEZE (buf); + + // Recurse to print sub-value. +- bool b = save_binary_data (os, lst(i), s, "", 0, save_as_floats); ++ bool b = save_binary_data (os, lst(i), s.c_str (), "", 0, ++ save_as_floats); + + if (! b) + return false; +@@ -683,9 +691,13 @@ + for (octave_idx_type i = 0; i < lst.length (); ++i) + { + // should we use lst.name_tags () to label the elements? +- char s[20]; +- sprintf (s, "_%d", i); +- bool retval2 = add_hdf5_data (data_hid, lst (i), s, "", ++ ++ OSSTREAM buf; ++ buf << "_" << i << OSSTREAM_ENDS; ++ std::string s = OSSTREAM_STR (buf); ++ OSSTREAM_FREEZE (buf); ++ ++ bool retval2 = add_hdf5_data (data_hid, lst (i), s.c_str (), "", + false, save_as_floats); + if (! retval2) + break; +Index: src/DLD-FUNCTIONS/spchol.cc +=================================================================== +RCS file: /cvs/octave/src/DLD-FUNCTIONS/spchol.cc,v +retrieving revision 1.7 +diff -u -r1.7 spchol.cc +--- src/DLD-FUNCTIONS/spchol.cc 22 Mar 2006 22:58:12 -0000 1.7 ++++ src/DLD-FUNCTIONS/spchol.cc 24 Mar 2006 19:55:38 -0000 +@@ -607,7 +607,7 @@ + for (octave_idx_type k = 0 ; k < n ; k++) + { + // get the kth row of L and store in the columns of L +- cholmod_row_subtree (A1, A2, k, Parent, R, cm) ; ++ CHOLMOD_NAME (row_subtree) (A1, A2, k, Parent, R, cm) ; + for (octave_idx_type p = 0 ; p < Rp [1] ; p++) + L.xridx (W [Ri [p]]++) = k ; Index: octave.spec =================================================================== RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- octave.spec 24 Mar 2006 17:04:57 -0000 1.35 +++ octave.spec 24 Mar 2006 21:19:19 -0000 1.36 @@ -1,6 +1,6 @@ Name: octave Version: 2.9.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A high-level language for numerical computations Epoch: 6 @@ -133,6 +133,9 @@ %changelog +* Fri Mar 24 2006 Quentin Spencer 2.9.5-4 +- Change patch again (suggested by the author on Octave mailing list). + * Fri Mar 24 2006 Quentin Spencer 2.9.5-3 - Fix broken patch. From fedora-extras-commits at redhat.com Fri Mar 24 22:09:44 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 24 Mar 2006 17:09:44 -0500 Subject: rpms/lincity-ng/FC-4 lincity-ng.spec,1.5,1.6 Message-ID: <200603242210.k2OMAH3S027250@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27188/FC-4 Modified Files: lincity-ng.spec Log Message: Resolve 186513 by using proper OPT_FLAGS, not -O3. Index: lincity-ng.spec =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/FC-4/lincity-ng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lincity-ng.spec 28 Feb 2006 22:52:58 -0000 1.5 +++ lincity-ng.spec 24 Mar 2006 22:09:44 -0000 1.6 @@ -1,6 +1,6 @@ Name: lincity-ng Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games Summary: City Simulation Game @@ -31,6 +31,8 @@ %prep %setup -q %patch0 -p1 +sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules +sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules %build %configure @@ -62,6 +64,9 @@ %{_datadir}/lincity-ng/ %changelog +* Fri Mar 24 2006 Tom "spot" Callaway 1.0.2-4 +- -O3 optimization makes the code cry + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.2-3 - bump for FC-5 From fedora-extras-commits at redhat.com Fri Mar 24 22:09:51 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 24 Mar 2006 17:09:51 -0500 Subject: rpms/lincity-ng/FC-5 lincity-ng.spec,1.5,1.6 Message-ID: <200603242210.k2OMAOlr027253@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27188/FC-5 Modified Files: lincity-ng.spec Log Message: Resolve 186513 by using proper OPT_FLAGS, not -O3. Index: lincity-ng.spec =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/FC-5/lincity-ng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lincity-ng.spec 28 Feb 2006 22:53:04 -0000 1.5 +++ lincity-ng.spec 24 Mar 2006 22:09:51 -0000 1.6 @@ -1,6 +1,6 @@ Name: lincity-ng Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games Summary: City Simulation Game @@ -32,6 +32,8 @@ %prep %setup -q %patch0 -p1 +sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules +sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules %build %configure @@ -63,6 +65,9 @@ %{_datadir}/lincity-ng/ %changelog +* Fri Mar 24 2006 Tom "spot" Callaway 1.0.2-4 +- -O3 optimization makes the code cry + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.2-3 - bump for FC-5 From fedora-extras-commits at redhat.com Fri Mar 24 22:09:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 24 Mar 2006 17:09:57 -0500 Subject: rpms/lincity-ng/devel lincity-ng.spec,1.5,1.6 Message-ID: <200603242210.k2OMAUgZ027259@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27188/devel Modified Files: lincity-ng.spec Log Message: Resolve 186513 by using proper OPT_FLAGS, not -O3. Index: lincity-ng.spec =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lincity-ng.spec 28 Feb 2006 22:53:04 -0000 1.5 +++ lincity-ng.spec 24 Mar 2006 22:09:57 -0000 1.6 @@ -1,6 +1,6 @@ Name: lincity-ng Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games Summary: City Simulation Game @@ -32,6 +32,8 @@ %prep %setup -q %patch0 -p1 +sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules +sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules %build %configure @@ -63,6 +65,9 @@ %{_datadir}/lincity-ng/ %changelog +* Fri Mar 24 2006 Tom "spot" Callaway 1.0.2-4 +- -O3 optimization makes the code cry + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.2-3 - bump for FC-5 From fedora-extras-commits at redhat.com Fri Mar 24 22:09:23 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 24 Mar 2006 17:09:23 -0500 Subject: rpms/lincity-ng/FC-3 lincity-ng.spec,1.5,1.6 Message-ID: <200603242210.k2OMAQHS027255@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/lincity-ng/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27188/FC-3 Modified Files: lincity-ng.spec Log Message: Resolve 186513 by using proper OPT_FLAGS, not -O3. Index: lincity-ng.spec =================================================================== RCS file: /cvs/extras/rpms/lincity-ng/FC-3/lincity-ng.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- lincity-ng.spec 28 Feb 2006 22:52:52 -0000 1.5 +++ lincity-ng.spec 24 Mar 2006 22:09:23 -0000 1.6 @@ -1,6 +1,6 @@ Name: lincity-ng Version: 1.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Amusements/Games Summary: City Simulation Game @@ -31,6 +31,8 @@ %prep %setup -q %patch0 -p1 +sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules +sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules %build %configure @@ -62,6 +64,9 @@ %{_datadir}/lincity-ng/ %changelog +* Fri Mar 24 2006 Tom "spot" Callaway 1.0.2-4 +- -O3 optimization makes the code cry + * Tue Feb 28 2006 Tom "spot" Callaway 1.0.2-3 - bump for FC-5 From fedora-extras-commits at redhat.com Fri Mar 24 23:00:40 2006 From: fedora-extras-commits at redhat.com (Pawel Salek (pawsa)) Date: Fri, 24 Mar 2006 18:00:40 -0500 Subject: rpms/libesmtp/devel .cvsignore, 1.4, 1.5 libesmtp-build.patch, 1.1, 1.2 libesmtp.spec, 1.6, 1.7 sources, 1.4, 1.5 Message-ID: <200603242301.k2ON1C68028069@cvs-int.fedora.redhat.com> Author: pawsa Update of /cvs/extras/rpms/libesmtp/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27597 Modified Files: .cvsignore libesmtp-build.patch libesmtp.spec sources Log Message: - Update to 1.0.4 - redo build and ssl patches. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 4 Dec 2005 12:45:56 -0000 1.4 +++ .cvsignore 24 Mar 2006 23:00:39 -0000 1.5 @@ -1,3 +1,3 @@ -libesmtp-1.0.3r1.tar.bz2 -libesmtp-ssl.patch -COPYING.LGPL +libesmtp-1.0.4-ssl.patch +libesmtp-build.patch +libesmtp-1.0.4.tar.bz2 libesmtp-build.patch: Index: libesmtp-build.patch =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/libesmtp-build.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libesmtp-build.patch 12 Jun 2005 21:08:03 -0000 1.1 +++ libesmtp-build.patch 24 Mar 2006 23:00:39 -0000 1.2 @@ -1,103 +1,28 @@ -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/configure.in libesmtp-1.0.3r1/configure.in ---- libesmtp-1.0.3r1-orig/configure.in 2004-04-21 10:21:32.000000000 +0200 -+++ libesmtp-1.0.3r1/configure.in 2005-05-26 23:34:19.000000000 +0200 -@@ -56,7 +56,7 @@ - dnl Miscellaneous stuff - dnl ######################################################################### +--- libesmtp-1.0.4/missing.h.build 2004-04-19 13:15:45.000000000 +0200 ++++ libesmtp-1.0.4/missing.h 2006-03-24 23:50:38.000000000 +0100 +@@ -43,15 +43,4 @@ + void *memrchr (const void *a, int c, size_t len); + #endif + +-#ifndef HAVE_SNPRINTF +-#include +-int snprintf(char *s, size_t n, const char *format, ...); +-#endif +- +-#ifndef HAVE_VSNPRINTF +-#include +-#include +-int vsnprintf(char *s, size_t n, const char *format, va_list ap); +-#endif +- + #endif +--- libesmtp-1.0.4/headers.c~ 2005-12-15 21:52:01.000000000 +0100 ++++ libesmtp-1.0.4/headers.c 2006-03-24 23:53:58.000000000 +0100 +@@ -33,6 +33,7 @@ + #include + #include + #include ++#include --EXTRA_CFLAGS="" -+AM_CFLAGS="" - case $host_vendor-$host_os in - sun*) - AC_DEFINE(__EXTENSIONS__,1,[Sun's netdb.h needs this for getaddrinfo]) -@@ -79,13 +79,13 @@ - enable_more_warnings=yes) - - if test "$GCC" = "yes" -a "$enable_more_warnings" != "no"; then -- EXTRA_CFLAGS="$EXTRA_CFLAGS \ -+ AM_CFLAGS="$AM_CFLAGS \ - -Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \ - -Wstrict-prototypes -Wnested-externs -Wpointer-arith \ - -Wbad-function-cast -Wcast-align" - fi - if test "$GCC" = "yes" -a "$enable_more_warnings" = "picky"; then -- EXTRA_CFLAGS="$EXTRA_CFLAGS -fno-builtin -W -Werror -Wwrite-strings \ -+ $AM_CFLAGS="$AM_CFLAGS -fno-builtin -W -Werror -Wwrite-strings \ - -Wcast-qual" - fi - -@@ -538,7 +538,7 @@ - dnl ######################################################################### - - AC_REPLACE_FUNCS(strdup strcasecmp strncasecmp memrchr) --AC_CHECK_FUNCS(strtol uname gethostname) -+AC_CHECK_FUNCS(strtol uname gethostname snprintf vsnprintf) - AC_SEARCH_LIBS(socket, socket) - - dnl Conditional check for functions needed in threaded code -@@ -582,9 +582,7 @@ - AC_SUBST(DIST_PLUGINS) - AC_SUBST(LIBTOOL_DEPS) - AC_SUBST(LIBS) --AC_SUBST(CFLAGS) --AC_SUBST(EXTRA_CFLAGS) --AC_SUBST(CC) -+AC_SUBST(AM_CFLAGS) - AC_SUBST(RANLIB) - AC_SUBST(subdirs) - -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/crammd5/Makefile.am libesmtp-1.0.3r1/crammd5/Makefile.am ---- libesmtp-1.0.3r1-orig/crammd5/Makefile.am 2001-10-17 11:15:27.000000000 +0200 -+++ libesmtp-1.0.3r1/crammd5/Makefile.am 2005-05-26 23:28:15.000000000 +0200 -@@ -3,7 +3,6 @@ - libdir = @plugindir@ - - INCLUDES = -I at srcdir@ --CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-cram-md5.la - -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/login/Makefile.am libesmtp-1.0.3r1/login/Makefile.am ---- libesmtp-1.0.3r1-orig/login/Makefile.am 2001-10-17 09:18:00.000000000 +0200 -+++ libesmtp-1.0.3r1/login/Makefile.am 2005-05-26 23:28:12.000000000 +0200 -@@ -5,7 +5,6 @@ - INCLUDES = -I at srcdir@ - - lib_LTLIBRARIES = sasl-login.la --CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - sasl_login_la_SOURCES = client-login.c - sasl_login_la_LDFLAGS = -module -avoid-version -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/Makefile.am libesmtp-1.0.3r1/Makefile.am ---- libesmtp-1.0.3r1-orig/Makefile.am 2003-01-22 09:45:23.000000000 +0100 -+++ libesmtp-1.0.3r1/Makefile.am 2005-05-26 23:28:20.000000000 +0200 -@@ -4,7 +4,6 @@ - INCLUDES = -I$(srcdir) $(VERSION_FLAGS) - SUBDIRS = @subdirs@ @SASL_PLUGINS@ - DIST_SUBDIRS = @subdirs@ @DIST_PLUGINS@ --CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = libesmtp.la - -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/ntlm/Makefile.am libesmtp-1.0.3r1/ntlm/Makefile.am ---- libesmtp-1.0.3r1-orig/ntlm/Makefile.am 2002-05-31 15:35:47.000000000 +0200 -+++ libesmtp-1.0.3r1/ntlm/Makefile.am 2005-05-26 23:28:08.000000000 +0200 -@@ -3,7 +3,6 @@ - libdir = @plugindir@ - - INCLUDES = -I at srcdir@ --CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-ntlm.la - -diff -ru -x '*.lo' -x '*.o' libesmtp-1.0.3r1-orig/plain/Makefile.am libesmtp-1.0.3r1/plain/Makefile.am ---- libesmtp-1.0.3r1-orig/plain/Makefile.am 2001-10-17 09:18:08.000000000 +0200 -+++ libesmtp-1.0.3r1/plain/Makefile.am 2005-05-26 23:28:04.000000000 +0200 -@@ -3,7 +3,6 @@ - libdir = @plugindir@ - - INCLUDES = -I at srcdir@ --CFLAGS = @CFLAGS@ @EXTRA_CFLAGS@ - - lib_LTLIBRARIES = sasl-plain.la + #include Index: libesmtp.spec =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/libesmtp.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- libesmtp.spec 1 Mar 2006 20:14:16 -0000 1.6 +++ libesmtp.spec 24 Mar 2006 23:00:39 -0000 1.7 @@ -2,14 +2,13 @@ Summary: SMTP client library Name: libesmtp -Version: 1.0.3r1 -Release: 8%{?dist} +Version: 1.0.4 +Release: 1%{?dist} License: LGPL Group: System Environment/Libraries Source: http://www.stafford.uklinux.net/libesmtp/%{name}-%{version}.tar.bz2 -Source1: COPYING.LGPL Patch1: libesmtp-build.patch -Patch2: libesmtp-ssl.patch +Patch2: libesmtp-1.0.4-ssl.patch URL: http://www.stafford.uklinux.net/libesmtp/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel pkgconfig automake libtool @@ -39,15 +38,8 @@ %setup -q %patch1 -p1 -b .build %patch2 -p1 -b .ssl -cp %{SOURCE1} . %build -#we run auto* because the distributed configure script is inferior. -libtoolize --force -aclocal -autoconf -autoheader -automake --gnu --add-missing --copy if pkg-config openssl ; then export CFLAGS="$CFLAGS $RPM_OPT_FLAGS `pkg-config --cflags openssl`" @@ -74,19 +66,22 @@ %files %defattr(-,root,root,-) -%doc AUTHORS COPYING.LGPL NEWS Notes README +%doc AUTHORS COPYING.LIB NEWS Notes README %{_libdir}/libesmtp.so.* %{plugindir} %files devel %defattr(-,root,root,-) -%doc examples COPYING.GPL +%doc examples COPYING %{_bindir}/libesmtp-config %{_prefix}/include/* %{_libdir}/libesmtp.so %{_libdir}/libesmtp.a %changelog +* Fri Mar 24 2006 Pawel Salek - 1.0.4-1 +- Update to 1.0.4 - redo build and ssl patches. + * Wed Mar 1 2006 Pawel Salek - 1.0.3r1-8 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libesmtp/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 4 Dec 2005 12:45:56 -0000 1.4 +++ sources 24 Mar 2006 23:00:39 -0000 1.5 @@ -1,3 +1,3 @@ -c07aa79293aa36298626fe5e68d6bfba libesmtp-1.0.3r1.tar.bz2 -f018f16cbebc56490d2c3c18a23d3113 libesmtp-ssl.patch -a6f89e2100d9b6cdffcea4f398e37343 COPYING.LGPL +8ddc9f7691fa3561e4a73dafb6658369 libesmtp-1.0.4-ssl.patch +d0397bf2129d3a213cbc3d5cc74b9b63 libesmtp-build.patch +8b4e8a794adc46268f0c6a0b3fb79486 libesmtp-1.0.4.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 24 23:07:59 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 18:07:59 -0500 Subject: rpms/ftnchek/devel ftnchek.spec,1.2,1.3 Message-ID: <200603242308.k2ON8Vg6029642@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29625 Modified Files: ftnchek.spec Log Message: * Fri Mar 24 2006 Orion Poplawki 3.3.1-4 - Don't strip binaries so we get a good debuginfo Index: ftnchek.spec =================================================================== RCS file: /cvs/extras/rpms/ftnchek/devel/ftnchek.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ftnchek.spec 8 Mar 2006 22:59:47 -0000 1.2 +++ ftnchek.spec 24 Mar 2006 23:07:58 -0000 1.3 @@ -1,6 +1,6 @@ Name: ftnchek Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Static analyzer for Fortran 77 programs Group: Development/Tools @@ -54,7 +54,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -%makeinstall datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ +%makeinstall STRIP=/bin/true datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ lispdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -77,6 +77,9 @@ %changelog +* Fri Mar 24 2006 Orion Poplawki 3.3.1-4 +- Don't strip binaries so we get a good debuginfo + * Wed Mar 08 2006 Orion Poplawki 3.3.1-3 - Own %{_datadir}/ftnchek/ - Add period to end of emacs package description From fedora-extras-commits at redhat.com Fri Mar 24 23:09:49 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 18:09:49 -0500 Subject: rpms/ftnchek/FC-5 ftnchek.spec,1.2,1.3 Message-ID: <200603242310.k2ONAdrI029707@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29690 Modified Files: ftnchek.spec Log Message: * Fri Mar 24 2006 Orion Poplawki 3.3.1-4 - Don't strip binaries so we get a good debuginfo Index: ftnchek.spec =================================================================== RCS file: /cvs/extras/rpms/ftnchek/FC-5/ftnchek.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ftnchek.spec 8 Mar 2006 22:59:47 -0000 1.2 +++ ftnchek.spec 24 Mar 2006 23:09:49 -0000 1.3 @@ -1,6 +1,6 @@ Name: ftnchek Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Static analyzer for Fortran 77 programs Group: Development/Tools @@ -54,7 +54,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -%makeinstall datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ +%makeinstall STRIP=/bin/true datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ lispdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -77,6 +77,9 @@ %changelog +* Fri Mar 24 2006 Orion Poplawki 3.3.1-4 +- Don't strip binaries so we get a good debuginfo + * Wed Mar 08 2006 Orion Poplawki 3.3.1-3 - Own %{_datadir}/ftnchek/ - Add period to end of emacs package description From fedora-extras-commits at redhat.com Fri Mar 24 23:12:31 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Fri, 24 Mar 2006 18:12:31 -0500 Subject: rpms/ftnchek/FC-4 ftnchek.spec,1.2,1.3 Message-ID: <200603242313.k2ONDAIN029781@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/ftnchek/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29749 Modified Files: ftnchek.spec Log Message: * Fri Mar 24 2006 Orion Poplawki 3.3.1-4 - Don't strip binaries so we get a good debuginfo Index: ftnchek.spec =================================================================== RCS file: /cvs/extras/rpms/ftnchek/FC-4/ftnchek.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ftnchek.spec 8 Mar 2006 22:59:47 -0000 1.2 +++ ftnchek.spec 24 Mar 2006 23:12:28 -0000 1.3 @@ -1,6 +1,6 @@ Name: ftnchek Version: 3.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Static analyzer for Fortran 77 programs Group: Development/Tools @@ -54,7 +54,7 @@ %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp -%makeinstall datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ +%makeinstall STRIP=/bin/true datadir=$RPM_BUILD_ROOT%{_datadir}/ftnchek \ lispdir=$RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -77,6 +77,9 @@ %changelog +* Fri Mar 24 2006 Orion Poplawki 3.3.1-4 +- Don't strip binaries so we get a good debuginfo + * Wed Mar 08 2006 Orion Poplawki 3.3.1-3 - Own %{_datadir}/ftnchek/ - Add period to end of emacs package description From fedora-extras-commits at redhat.com Fri Mar 24 23:14:37 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Fri, 24 Mar 2006 18:14:37 -0500 Subject: extras-buildsys/utils extras-repobuild.py,1.11,1.12 Message-ID: <200603242314.k2ONEbDB029849@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/fedora/extras-buildsys/utils In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29831 Modified Files: extras-repobuild.py Log Message: Skip package payload digest/signature checks in repomanage. Index: extras-repobuild.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- extras-repobuild.py 17 Mar 2006 07:46:49 -0000 1.11 +++ extras-repobuild.py 24 Mar 2006 23:14:28 -0000 1.12 @@ -62,7 +62,7 @@ print 'processing: %s' % repodir print 'Cleaning up older packages (keeping %d latest)' % (keep) - cmd = '/usr/bin/repomanage -k%d -o %s | xargs rm -f' % (keep, repodir) + cmd = '/usr/bin/repomanage -c -k%d -o %s | xargs rm -f' % (keep, repodir) run_and_check(cmd) print 'Creating repository metadata' From fedora-extras-commits at redhat.com Fri Mar 24 23:50:41 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 24 Mar 2006 18:50:41 -0500 Subject: rpms/anjuta import.log,1.6,1.7 Message-ID: <200603242351.k2ONpDNf030062@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30025 Modified Files: import.log Log Message: auto-import anjuta-1.2.4-5 on branch devel from anjuta-1.2.4-5.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/anjuta/import.log,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- import.log 22 Feb 2006 21:32:40 -0000 1.6 +++ import.log 24 Mar 2006 23:50:40 -0000 1.7 @@ -3,3 +3,4 @@ anjuta-1_2_2-0_fdr_2_2:HEAD:anjuta-1.2.2-0.fdr.2.2.src.rpm:1099886584 anjuta-1_2_4-2:HEAD:anjuta-1.2.4-2.src.rpm:1140477846 anjuta-1_2_4-3:HEAD:anjuta-1.2.4-3.src.rpm:1140643945 +anjuta-1_2_4-5:HEAD:anjuta-1.2.4-5.src.rpm:1143244226 From fedora-extras-commits at redhat.com Fri Mar 24 23:50:47 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Fri, 24 Mar 2006 18:50:47 -0500 Subject: rpms/anjuta/devel anjuta-encodings.patch, 1.1, 1.2 anjuta.spec, 1.15, 1.16 Message-ID: <200603242351.k2ONpJ7l030066@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/rpms/anjuta/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30025/devel Modified Files: anjuta-encodings.patch anjuta.spec Log Message: auto-import anjuta-1.2.4-5 on branch devel from anjuta-1.2.4-5.src.rpm anjuta-encodings.patch: Index: anjuta-encodings.patch =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/anjuta-encodings.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- anjuta-encodings.patch 20 Feb 2006 23:24:25 -0000 1.1 +++ anjuta-encodings.patch 24 Mar 2006 23:50:46 -0000 1.2 @@ -1,4 +1,4 @@ ---- src/anjuta-encodings.c.orig 2005-12-15 18:50:55.000000000 +0100 +--- src/anjuta-encodings.c 2005-12-15 18:50:55.000000000 +0100 +++ src/anjuta-encodings.c 2005-12-15 18:51:38.000000000 +0100 @@ -707,15 +707,15 @@ gtk_tree_view_set_search_column (GTK_TREE_VIEW (stock_treeview), @@ -37,4 +37,16 @@ anjuta_preferences_register_property_custom (pref, supported_treeview, SUPPORTED_ENCODINGS, - "ISO-8859-15", + +--- src/Makefile.in 2005-08-12 16:37:02.000000000 +0200 ++++ src/Makefile.in 2006-03-24 19:16:54.000000000 +0100 +@@ -723,7 +723,7 @@ + done + anjuta$(EXEEXT): $(anjuta_OBJECTS) $(anjuta_DEPENDENCIES) + @rm -f anjuta$(EXEEXT) +- $(CXXLINK) $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS) ++ $(CXXLINK) -Wl,--export-dynamic $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) + "ISO-8859-15", Index: anjuta.spec =================================================================== RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- anjuta.spec 22 Feb 2006 21:32:45 -0000 1.15 +++ anjuta.spec 24 Mar 2006 23:50:46 -0000 1.16 @@ -1,6 +1,6 @@ Name: anjuta Version: 1.2.4 -Release: 3%{?dist} +Release: 5%{?dist} Summary: GNOME IDE for C and C++ Group: Development/Tools @@ -20,6 +20,8 @@ BuildRequires: libtool BuildRequires: gettext BuildRequires: desktop-file-utils +BuildRequires: libgnome-devel +BuildRequires: gtk2-devel Epoch: 1 Requires: pkgconfig libtool gettext-devel Requires(post): scrollkeeper @@ -46,12 +48,12 @@ %prep %setup -q -%patch -p0 -b patch0 +%patch -p0 -b .encodings %build # configure option --enable-final does not work corretly on x86_64; Use # -DNDEBUG in CFLAGS -export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" +export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" %configure %define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,') sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status @@ -78,6 +80,10 @@ s!(^GLOBAL_TAGS_FILE=).*!$1%{_datadir}/%{name}/system.tags!; s!tm_global_tags!%{name}_tm_global_tags!g; ' ${RPM_BUILD_ROOT}%{_bindir}/anjuta_create_global_tags.sh +pushd ${RPM_BUILD_ROOT}%{_docdir} +ln -s anjuta-1.2.4 anjuta +popd + %clean rm -rf ${RPM_BUILD_ROOT} @@ -95,6 +101,7 @@ %{_bindir}/%{name}* %{_libdir}/%{name} %{_datadir}/%{name} +%{_datadir}/doc/anjuta %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/pixmaps/%{name} %{_datadir}/mime-info/anjuta.mime @@ -107,6 +114,15 @@ %{_datadir}/omf/%{name} %changelog +* Fri Mar 24 2006 Michael Schwendt - 1.2.4-5 +- Added export dynamic +- trivial spec changes + +* Fri Mar 24 2006 Paul F. Johnson - 1.2.4-4 +- Added dependancies for gtk2-devel and libgnome-devel +- Re-instated debug +- Add symlink for documentation + * Wed Feb 22 2006 Paul F. Johnson - 1.2.4-3 - Added back in the epoch - oopsie! From fedora-extras-commits at redhat.com Sat Mar 25 01:02:25 2006 From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb)) Date: Fri, 24 Mar 2006 20:02:25 -0500 Subject: krbVmodule krb5err.c, 1.2, 1.3 krb5module.c, 1.19, 1.20 krbVmodule.spec.in, 1.8, 1.9 Message-ID: <200603250102.k2P12t4C001852@cvs-int.fedora.redhat.com> Author: mikeb Update of /cvs/devel/krbVmodule In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1821 Modified Files: krb5err.c krb5module.c krbVmodule.spec.in Log Message: - fixed typo - changed the return value of recvauth() to include remote principal - renamed RPM to be more Extras-friendly Index: krb5err.c =================================================================== RCS file: /cvs/devel/krbVmodule/krb5err.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- krb5err.c 7 Mar 2002 00:21:02 -0000 1.2 +++ krb5err.c 25 Mar 2006 01:02:22 -0000 1.3 @@ -42,6 +42,6 @@ PyObject *dict; dict = PyModule_GetDict(module); - pk_exception = PyErr_NewException("krb5.Krb5Error", NULL, NULL); + pk_exception = PyErr_NewException("krbV.Krb5Error", NULL, NULL); PyDict_SetItemString(dict, "Krb5Error", pk_exception); } Index: krb5module.c =================================================================== RCS file: /cvs/devel/krbVmodule/krb5module.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- krb5module.c 17 Oct 2003 18:58:35 -0000 1.19 +++ krb5module.c 25 Mar 2006 01:02:22 -0000 1.20 @@ -23,6 +23,7 @@ #include #include #include +#include #if !defined(_KRB5_INT_H) && defined(KRB5_PROTOTYPE) krb5_error_code krb5_get_krbhst KRB5_PROTOTYPE((krb5_context, const krb5_data *, char ***)); @@ -798,6 +799,7 @@ krb5_auth_context ac_out = NULL; krb5_keytab kt; krb5_principal pserver; + krb5_ticket *cticket; krb5_flags ap_req_options = 0; krb5_error_code rc = 0; int free_keytab = 0; @@ -851,20 +853,42 @@ ap_req_options = PyInt_AsLong(options); Py_BEGIN_ALLOW_THREADS - rc = krb5_recvauth(kctx, &ac_out, fd_ptr, appl_version, pserver, ap_req_options, kt, NULL); + rc = krb5_recvauth(kctx, &ac_out, fd_ptr, appl_version, pserver, ap_req_options, kt, &cticket); Py_END_ALLOW_THREADS if(rc) return pk_error(rc); + retval = PyTuple_New(2); + + if (cticket->enc_part2) + { + PyObject *cprinc; + + if (!(cprinc = make_principal(self, kctx, cticket->enc_part2->client))) + { + Py_DECREF(retval); + krb5_free_ticket(kctx, cticket); + return NULL; + } + PyTuple_SetItem(retval, 1, cprinc); + } + else + { + PyTuple_SetItem(retval, 1, Py_None); + Py_INCREF(Py_None); + } + krb5_free_ticket(kctx, cticket); + { - PyObject *subargs, *mykw = NULL, *otmp; + PyObject *subargs, *mykw = NULL, *otmp, *auth_context; subargs = Py_BuildValue("()"); mykw = PyDict_New(); PyDict_SetItemString(mykw, "context", self); otmp = PyCObject_FromVoidPtrAndDesc(ac_out, kctx, destroy_ac); PyDict_SetItemString(mykw, "ac", otmp); - retval = PyEval_CallObjectWithKeywords(auth_context_class, subargs, mykw); + auth_context = PyEval_CallObjectWithKeywords(auth_context_class, subargs, mykw); + PyTuple_SetItem(retval, 0, auth_context); Py_DECREF(otmp); Py_DECREF(subargs); Py_XDECREF(mykw); @@ -989,6 +1013,36 @@ return retval; } +/* Convert a krb5_address to a string representation. */ +static PyObject * +addr_to_str(krb5_address *kaddr) +{ + const char* ret = NULL; + char *addr = NULL; + + if (kaddr->addrtype == ADDRTYPE_INET) + { + addr = alloca(INET_ADDRSTRLEN); + ret = inet_ntop(AF_INET, kaddr->contents, + addr, INET_ADDRSTRLEN); + } + else if (kaddr->addrtype == ADDRTYPE_INET6) + { + addr = alloca(INET6_ADDRSTRLEN); + ret = inet_ntop(AF_INET6, kaddr->contents, + addr, INET6_ADDRSTRLEN); + } + + if (addr == NULL || ret == NULL) + { + return NULL; + } + else + { + return PyString_FromString(addr); + } +} + /*********************** AuthContext **********************/ static PyObject* AuthContext_getattr(PyObject *unself, PyObject *args) @@ -1028,16 +1082,23 @@ } else if(!strcmp(name, "addrs")) { - PyObject *ra1, *ra2; + PyObject *ra1, *ra2, *laddr, *raddr; krb5_address *a1=NULL, *a2=NULL; rc = krb5_auth_con_getaddrs(ctx, ac, &a1, &a2); if(rc) return pk_error(rc); if(a1) { + laddr = addr_to_str(a1); + if (laddr == NULL) + { + laddr = Py_None; + Py_INCREF(Py_None); + } + ra1 = PyTuple_New(2); PyTuple_SetItem(ra1, 0, PyInt_FromLong(a1->addrtype)); - PyTuple_SetItem(ra1, 1, PyString_FromStringAndSize(a1->contents, a1->length)); + PyTuple_SetItem(ra1, 1, laddr); krb5_free_address(ctx, a1); } else @@ -1047,9 +1108,16 @@ } if(a2) { + raddr = addr_to_str(a2); + if (raddr == NULL) + { + raddr = Py_None; + Py_INCREF(Py_None); + } + ra2 = PyTuple_New(2); PyTuple_SetItem(ra2, 0, PyInt_FromLong(a2->addrtype)); - PyTuple_SetItem(ra2, 1, PyString_FromStringAndSize(a2->contents, a2->length)); + PyTuple_SetItem(ra2, 1, raddr); krb5_free_address(ctx, a2); } else Index: krbVmodule.spec.in =================================================================== RCS file: /cvs/devel/krbVmodule/krbVmodule.spec.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- krbVmodule.spec.in 14 Jan 2004 17:51:50 -0000 1.8 +++ krbVmodule.spec.in 25 Mar 2006 01:02:23 -0000 1.9 @@ -1,18 +1,18 @@ -%define pyver 2.3 +%define pyver %(%{__python} -c "import sys ; print sys.version[:3]") Summary: Python extension module for Kerberos 5 -Name: krbV-python%{pyver} +Name: python-krbV Version: @VERSION@ Release: 1 -Copyright: LGPL +License: LGPL Group: Development/Languages Source: krbVmodule-%{version}.tar.gz Buildroot: /var/tmp/krb5module-root -Requires: python2 >= %{pyver} -BuildRequires: python2-devel >= %{pyver} +BuildRequires: python-devel >= %{pyver} BuildRequires: krb5-devel >= 1.2.2 -Requires: krb5-libs >= 1.2.2 BuildRequires: /bin/awk +Requires: python-abi = %{pyver} +Requires: krb5-libs >= 1.2.2 %description Allows python programs to use Kerberos 5 authentication/security. @@ -41,5 +41,10 @@ %{_libdir}/python%{pyver}/site-packages/krbVmodule.so %changelog +* Fri Mar 24 2006 Mike Bonnet +- fix typo in error definition +- change the return value of recvauth() from ac to (ac, princ), where princ is the principal sent by sendauth() +- rename the RPM and reorganize the BuildRequires, to be more Extras-friendly + * Tue Sep 25 2001 Elliot Lee - Initial version From fedora-extras-commits at redhat.com Sat Mar 25 02:00:48 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 21:00:48 -0500 Subject: rpms/cpanspec/devel .cvsignore, 1.6, 1.7 cpanspec.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200603250201.k2P21Km3003704@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2050 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.64. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Mar 2006 16:36:13 -0000 1.6 +++ .cvsignore 25 Mar 2006 02:00:47 -0000 1.7 @@ -1 +1 @@ -cpanspec-1.63.tar.gz +cpanspec-1.64.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cpanspec.spec 24 Mar 2006 16:36:13 -0000 1.5 +++ cpanspec.spec 25 Mar 2006 02:00:47 -0000 1.6 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.63 +Version: 1.64 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.64-1 +- Update to 1.64. + * Wed Mar 24 2006 Steven Pritchard 1.63-1 - Update to 1.63. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Mar 2006 16:36:13 -0000 1.6 +++ sources 25 Mar 2006 02:00:47 -0000 1.7 @@ -1 +1 @@ -726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz +a77d2b4ef27633fc551d557f459b3462 cpanspec-1.64.tar.gz From fedora-extras-commits at redhat.com Sat Mar 25 02:02:37 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 21:02:37 -0500 Subject: rpms/cpanspec/FC-5 .cvsignore, 1.6, 1.7 cpanspec.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200603250203.k2P23A5W004092@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4071 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.64. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Mar 2006 16:37:55 -0000 1.6 +++ .cvsignore 25 Mar 2006 02:02:36 -0000 1.7 @@ -1 +1 @@ -cpanspec-1.63.tar.gz +cpanspec-1.64.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cpanspec.spec 24 Mar 2006 16:37:55 -0000 1.5 +++ cpanspec.spec 25 Mar 2006 02:02:36 -0000 1.6 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.63 +Version: 1.64 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.64-1 +- Update to 1.64. + * Wed Mar 24 2006 Steven Pritchard 1.63-1 - Update to 1.63. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Mar 2006 16:37:55 -0000 1.6 +++ sources 25 Mar 2006 02:02:36 -0000 1.7 @@ -1 +1 @@ -726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz +a77d2b4ef27633fc551d557f459b3462 cpanspec-1.64.tar.gz From fedora-extras-commits at redhat.com Sat Mar 25 02:24:16 2006 From: fedora-extras-commits at redhat.com (Steven Pritchard (steve)) Date: Fri, 24 Mar 2006 21:24:16 -0500 Subject: rpms/cpanspec/FC-4 .cvsignore, 1.6, 1.7 cpanspec.spec, 1.5, 1.6 sources, 1.6, 1.7 Message-ID: <200603250224.k2P2OmFU004222@cvs-int.fedora.redhat.com> Author: steve Update of /cvs/extras/rpms/cpanspec/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4201 Modified Files: .cvsignore cpanspec.spec sources Log Message: Update to 1.64. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 24 Mar 2006 16:39:20 -0000 1.6 +++ .cvsignore 25 Mar 2006 02:24:16 -0000 1.7 @@ -1 +1 @@ -cpanspec-1.63.tar.gz +cpanspec-1.64.tar.gz Index: cpanspec.spec =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- cpanspec.spec 24 Mar 2006 16:39:20 -0000 1.5 +++ cpanspec.spec 25 Mar 2006 02:24:16 -0000 1.6 @@ -1,5 +1,5 @@ Name: cpanspec -Version: 1.63 +Version: 1.64 Release: 1%{?dist} Summary: RPM spec file generation utility License: GPL or Artistic @@ -50,6 +50,9 @@ %{_mandir}/man1/* %changelog +* Wed Mar 24 2006 Steven Pritchard 1.64-1 +- Update to 1.64. + * Wed Mar 24 2006 Steven Pritchard 1.63-1 - Update to 1.63. Index: sources =================================================================== RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 24 Mar 2006 16:39:20 -0000 1.6 +++ sources 25 Mar 2006 02:24:16 -0000 1.7 @@ -1 +1 @@ -726a773766335ef0e425f68a9dcab87c cpanspec-1.63.tar.gz +a77d2b4ef27633fc551d557f459b3462 cpanspec-1.64.tar.gz From fedora-extras-commits at redhat.com Sat Mar 25 11:23:53 2006 From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj)) Date: Sat, 25 Mar 2006 06:23:53 -0500 Subject: owners owners.list,1.770,1.771 Message-ID: <200603251124.k2PBODEM004609@cvs-int.fedora.redhat.com> Author: pfj Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4586/owners Modified Files: owners.list Log Message: owners/owners.list Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.770 retrieving revision 1.771 diff -u -r1.770 -r1.771 --- owners.list 24 Mar 2006 07:19:42 -0000 1.770 +++ owners.list 25 Mar 2006 11:23:50 -0000 1.771 @@ -603,6 +603,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|libopts|Options library for autogen|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org| Fedora Extras|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|libosip|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xtdnet.nl|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 25 18:10:10 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:10:10 -0500 Subject: rpms/php-extras - New directory Message-ID: <200603251810.k2PIACoV019196@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19188/php-extras Log Message: Directory /cvs/extras/rpms/php-extras added to the repository From fedora-extras-commits at redhat.com Sat Mar 25 18:10:16 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:10:16 -0500 Subject: rpms/php-extras/devel - New directory Message-ID: <200603251810.k2PIAIeZ019211@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19188/php-extras/devel Log Message: Directory /cvs/extras/rpms/php-extras/devel added to the repository From fedora-extras-commits at redhat.com Sat Mar 25 18:10:54 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:10:54 -0500 Subject: rpms/php-extras Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603251810.k2PIAuSd019247@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19235 Added Files: Makefile import.log Log Message: Setup of module php-extras --- NEW FILE Makefile --- # Top level Makefile for module php-extras all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 25 18:11:00 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:11:00 -0500 Subject: rpms/php-extras/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603251811.k2PIBHuo019270@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19235/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module php-extras --- NEW 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 Mar 25 18:13:26 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:13:26 -0500 Subject: rpms/php-extras import.log,1.1,1.2 Message-ID: <200603251813.k2PIDwI9019368@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19329 Modified Files: import.log Log Message: auto-import php-extras-5.1.2-2 on branch devel from php-extras-5.1.2-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/php-extras/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 25 Mar 2006 18:10:53 -0000 1.1 +++ import.log 25 Mar 2006 18:13:26 -0000 1.2 @@ -0,0 +1 @@ +php-extras-5_1_2-2:HEAD:php-extras-5.1.2-2.src.rpm:1143310397 From fedora-extras-commits at redhat.com Sat Mar 25 18:13:47 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:13:47 -0500 Subject: rpms/php-extras/devel php-extras-5.1.2-readline.patch, NONE, 1.1 php-extras.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603251814.k2PIENeC019374@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19329/devel Modified Files: .cvsignore sources Added Files: php-extras-5.1.2-readline.patch php-extras.spec Log Message: auto-import php-extras-5.1.2-2 on branch devel from php-extras-5.1.2-2.src.rpm php-extras-5.1.2-readline.patch: --- NEW FILE php-extras-5.1.2-readline.patch --- diff -Nrbu php-5.1.2/ext/readline/config.m4 php-5.1.2-OK/ext/readline/config.m4 --- php-5.1.2/ext/readline/config.m4 2005-11-29 02:04:01.000000000 +0300 +++ php-5.1.2-OK/ext/readline/config.m4 2006-02-28 18:53:48.000000000 +0300 @@ -5,10 +5,8 @@ PHP_ARG_WITH(libedit,for libedit readline replacement, [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) -if test "$PHP_LIBEDIT" = "no"; then PHP_ARG_WITH(readline,for readline support, [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) -fi if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then for i in $PHP_READLINE /usr/local /usr; do --- NEW FILE php-extras.spec --- # FC5: dbase, readline, recode, mcrypt, mhash, tidy, mssql %define def() %%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}} %{expand:%def dbase} %{expand:%def readline} # recode %{expand:%def mcrypt} %{expand:%def mhash} %{expand:%def tidy} # mssql %define list %{?_with_dbase:dbase} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql} %define extdir %(php-config --extension-dir) %define apiver %(echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) Name: php-extras Summary: Additional PHP modules from the standard PHP distribution #Version: %(php-config --version) Version: 5.1.2 Release: 2%{?dist} Group: Development/Languages License: The PHP License URL: http://www.php.net/ Source0: http://www.php.net/distributions/php-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel = %{version} Patch1: php-extras-5.1.2-readline.patch %description PHP is an HTML-embedded scripting language. This package contains various additional modules for PHP, which have not been included in the basic PHP package for Fedora Core. %package -n php-dbase Summary: Standard dBase module for PHP applications Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %description -n php-dbase Standard dBase module for PHP applications %package -n php-readline Summary: Standard PHP module provides readline library support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_readline:BuildRequires: readline-devel} %description -n php-readline Standard PHP module provides readline library support %package -n php-recode Summary: Standard PHP module provides GNU recode support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_recode:BuildRequires: recode-devel} %description -n php-recode Standard PHP module provides GNU recode support %package -n php-mcrypt Summary: Standard PHP module provides mcrypt library support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_mcrypt:BuildRequires: libmcrypt-devel} %description -n php-mcrypt Standard PHP module provides mcrypt library support %package -n php-mhash Summary: Standard PHP module provides mhash support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_mhash:BuildRequires: mhash-devel} %description -n php-mhash Standard PHP module provides mhash support %package -n php-tidy Summary: Standard PHP module provides tidy library support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_tidy:BuildRequires: libtidy-devel} %description -n php-tidy Standard PHP module provides tidy library support %package -n php-mssql Summary: Standard PHP module provides mssql support Group: Development/Languages Requires: php >= %{version}, php-api = %{apiver} %{?_with_mssql:BuildRequires: freetds-devel} %description -n php-mssql Standard PHP module provides mssql support %prep %setup -q -n php-%{version} %patch1 -p1 %build export CFLAGS="$RPM_OPT_FLAGS -Wall -fno-strict-aliasing" for mod in %{list} do pushd ext/$mod phpize %configure # cause libtool to avoid passing -rpath when linking # (this hack is well-known as "libtool rpath workaround") sed -i 's|^hardcode_libdir_flag_spec|hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "|' libtool make %{?_smp_mflags} popd done %check # # As we don't build whole php here, we must do all the tests # with the system php executable. Unfortunately, we cannot use # system's /usr/bin/php directly, therefore a wrapper is needed. # # Some reasons for such a wrapper are: # - /usr/bin/php cannot handle "-d extension=" etc. on the command line # (probably because of the CGI-oriented variant of php executable is # installed as /usr/bin/php). We should use own config file for this. # - During "run-tests.php" execution, php is invoked again (recursively). # (i.e. we cannot explicitly set another config for deeper php invokation). # - We cannot exclude /etc/php.d/* files on the host machine. It can lead to # some stderr reports, which spoil the tests' output. To omit extra warnings, # the stderr is redirected to /dev/null # - When invoked again, some CGI-related environment variables are set # by default, which confuse php a lot. Therefore the environment is cleared, # and only needed variables are provided. # # The test stuff is derived from the original tests in the php tarball, # with preserving some needed specifications etc. # mkdir modules || exit 1 cat >modules.ini <>modules.ini done cat >php </dev/null env -i TEST_PHP_EXECUTABLE=$PWD/php TEST_PHP_SRCDIR=\$TEST_PHP_SRCDIR \ NO_INTERACTION=1 REPORT_EXIT_STATUS=1 MALLOC_CHECK_=2 \ %{_bindir}/php -c $PWD/modules.ini "\$@" EOF chmod +x ./php for mod in %{list} do [ -d ext/$mod/tests ] || continue pushd ext/$mod TEST_PHP_SRCDIR=$PWD ../../php ../../run-tests.php tests set +x fail=0 for f in tests/*.diff do [ -f "$f" ] || continue echo "TEST FAILURE: $PWD/$f --" cat $f echo echo "-- $PWD/$f result ends." fail=1 done [ $fail -ne 0 ] && exit $fail popd done %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{extdir} install -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d for mod in %{list} do install -m755 ext/${mod}/modules/*.so $RPM_BUILD_ROOT%{extdir} cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/${mod}.ini < files.${mod} < - 5.1.2-2 - more accurate Requires for the main php (using php-api, provided now by the Core php package). * Tue Feb 28 2006 Dmitry Butskoy - 5.1.2-1 - update to 5.1.2 - replace readline patch (old issue go away and a new appears). - apply well-known "libtool-rpath-workaround" (see in Internet ;-)) to avoid use -rpath for linking * Sat Dec 17 2005 Dmitry Butskoy - 5.1.1-1 - upgrade to 5.1.1 for FC5 - drop now missed "fam" and obsolete "sqlite" (sqlite2) modules * Mon Nov 14 2005 Dmitry Butskoy - 5.0.4-1 - spec file cleanups * Mon Oct 10 2005 Dmitry Butskoy - 5.0.4-0 - adaptation for php5 - drop tests patch (no more needed). * Fri Oct 7 2005 Dmitry Butskoy - 4.3.11-0 - initial release - create test stuff for check section. A lot of work because we play with extra modules by our own way... - add patch to fix some pathes in tests - add patch for readline configure Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 25 Mar 2006 18:11:00 -0000 1.1 +++ .cvsignore 25 Mar 2006 18:13:47 -0000 1.2 @@ -0,0 +1 @@ +php-5.1.2.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 25 Mar 2006 18:11:00 -0000 1.1 +++ sources 25 Mar 2006 18:13:47 -0000 1.2 @@ -0,0 +1 @@ +b5b6564e8c6a0d5bc1d2b4787480d792 php-5.1.2.tar.gz From fedora-extras-commits at redhat.com Sat Mar 25 18:24:45 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Sat, 25 Mar 2006 13:24:45 -0500 Subject: owners owners.list,1.771,1.772 Message-ID: <200603251825.k2PIPHW6019478@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19448 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.771 retrieving revision 1.772 diff -u -r1.771 -r1.772 --- owners.list 25 Mar 2006 11:23:50 -0000 1.771 +++ owners.list 25 Mar 2006 18:24:44 -0000 1.772 @@ -1110,6 +1110,7 @@ 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| +Fedora Extras|php-extras|Additional PHP modules from the standard PHP distribution|dmitry at butskoy.name|extras-qa at fedoraproject.org| Fedora Extras|php-json|An extremely fast PHP extension for JSON|ivazquez at ivazquez.net|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|php-mmcache|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Sat Mar 25 19:21:46 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 25 Mar 2006 14:21:46 -0500 Subject: rpms/pcsc-tools/FC-5 .cvsignore, 1.4, 1.5 pcsc-tools.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603251922.k2PJMIbl021661@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21623/FC-5 Modified Files: .cvsignore pcsc-tools.spec sources Log Message: * Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 - 1.4.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Mar 2006 16:50:07 -0000 1.4 +++ .cvsignore 25 Mar 2006 19:21:44 -0000 1.5 @@ -1 +1 @@ -pcsc-tools-1.4.3.tar.gz +pcsc-tools-1.4.4.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/pcsc-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pcsc-tools.spec 9 Mar 2006 16:50:07 -0000 1.5 +++ pcsc-tools.spec 25 Mar 2006 19:21:44 -0000 1.6 @@ -1,5 +1,5 @@ Name: pcsc-tools -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC @@ -64,6 +64,9 @@ %changelog +* Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 +- 1.4.4. + * Thu Mar 9 2006 Ville Skytt?? - 1.4.3-1 - 1.4.3. - Improve description. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Mar 2006 16:50:07 -0000 1.4 +++ sources 25 Mar 2006 19:21:44 -0000 1.5 @@ -1 +1 @@ -c21a0865983d0f3eb9841eb4d03e67f1 pcsc-tools-1.4.3.tar.gz +f224de5a58f533f7b5bce1b9e9a340d7 pcsc-tools-1.4.4.tar.gz From fedora-extras-commits at redhat.com Sat Mar 25 19:21:52 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sat, 25 Mar 2006 14:21:52 -0500 Subject: rpms/pcsc-tools/devel .cvsignore, 1.4, 1.5 pcsc-tools.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603251922.k2PJMONR021666@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/rpms/pcsc-tools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21623/devel Modified Files: .cvsignore pcsc-tools.spec sources Log Message: * Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 - 1.4.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 9 Mar 2006 16:50:07 -0000 1.4 +++ .cvsignore 25 Mar 2006 19:21:52 -0000 1.5 @@ -1 +1 @@ -pcsc-tools-1.4.3.tar.gz +pcsc-tools-1.4.4.tar.gz Index: pcsc-tools.spec =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/pcsc-tools.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- pcsc-tools.spec 9 Mar 2006 16:50:07 -0000 1.5 +++ pcsc-tools.spec 25 Mar 2006 19:21:52 -0000 1.6 @@ -1,5 +1,5 @@ Name: pcsc-tools -Version: 1.4.3 +Version: 1.4.4 Release: 1%{?dist} Summary: Tools to be used with smart cards and PC/SC @@ -64,6 +64,9 @@ %changelog +* Sat Mar 25 2006 Ville Skytt?? - 1.4.4-1 +- 1.4.4. + * Thu Mar 9 2006 Ville Skytt?? - 1.4.3-1 - 1.4.3. - Improve description. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pcsc-tools/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 9 Mar 2006 16:50:07 -0000 1.4 +++ sources 25 Mar 2006 19:21:52 -0000 1.5 @@ -1 +1 @@ -c21a0865983d0f3eb9841eb4d03e67f1 pcsc-tools-1.4.3.tar.gz +f224de5a58f533f7b5bce1b9e9a340d7 pcsc-tools-1.4.4.tar.gz From fedora-extras-commits at redhat.com Sun Mar 26 06:41:31 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 26 Mar 2006 01:41:31 -0500 Subject: rpms/gconfmm26/devel .cvsignore, 1.5, 1.6 gconfmm.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200603260642.k2Q6g36A012462@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gconfmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12441 Modified Files: .cvsignore gconfmm.spec sources Log Message: Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 20 Sep 2005 07:20:16 -0000 1.5 +++ .cvsignore 26 Mar 2006 06:41:30 -0000 1.6 @@ -1 +1 @@ -gconfmm-2.12.0.tar.bz2 +gconfmm-2.14.0.tar.bz2 Index: gconfmm.spec =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/gconfmm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- gconfmm.spec 28 Feb 2006 22:05:56 -0000 1.10 +++ gconfmm.spec 26 Mar 2006 06:41:30 -0000 1.11 @@ -1,6 +1,6 @@ Name: gconfmm26 -Version: 2.12.0 -Release: 3 +Version: 2.14.0 +Release: 1 Summary: C++ wrapper for GConf2 @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Mon Mar 20 2006 Denis Leroy - 2.14.0-1 +- Update to 2.14.0 + * Tue Feb 28 2006 Denis Leroy - 2.12.0-3 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/gconfmm26/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Sep 2005 07:20:16 -0000 1.5 +++ sources 26 Mar 2006 06:41:30 -0000 1.6 @@ -1 +1 @@ -dfd62a95e7675943933b793183649402 gconfmm-2.12.0.tar.bz2 +27b4703412c582ae9e6383de7c7ead6b gconfmm-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 26 06:47:25 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 26 Mar 2006 01:47:25 -0500 Subject: rpms/gnome-vfsmm26/devel .cvsignore, 1.4, 1.5 gnome-vfsmm.spec, 1.9, 1.10 sources, 1.5, 1.6 Message-ID: <200603260647.k2Q6lwgX012554@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/gnome-vfsmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12533 Modified Files: .cvsignore gnome-vfsmm.spec sources Log Message: Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Sep 2005 07:24:20 -0000 1.4 +++ .cvsignore 26 Mar 2006 06:47:25 -0000 1.5 @@ -1 +1 @@ -gnome-vfsmm-2.12.0.tar.bz2 +gnome-vfsmm-2.14.0.tar.bz2 Index: gnome-vfsmm.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/gnome-vfsmm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- gnome-vfsmm.spec 28 Feb 2006 23:14:43 -0000 1.9 +++ gnome-vfsmm.spec 26 Mar 2006 06:47:25 -0000 1.10 @@ -1,6 +1,6 @@ Name: gnome-vfsmm26 -Version: 2.12.0 -Release: 3 +Version: 2.14.0 +Release: 1 Summary: C++ wrapper for gnome-vfs @@ -71,6 +71,9 @@ %changelog +* Thu Mar 23 2006 Denis Leroy - 2.14.0-1 +- Update to 2.14.0 + * Tue Feb 28 2006 Denis Leroy - 2.12.0-3 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-vfsmm26/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Sep 2005 07:24:20 -0000 1.5 +++ sources 26 Mar 2006 06:47:25 -0000 1.6 @@ -1 +1 @@ -4a73741ab5232bf85cb631108c5b6430 gnome-vfsmm-2.12.0.tar.bz2 +bd5c3796e417a9780201835060461be3 gnome-vfsmm-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 26 07:01:05 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 26 Mar 2006 02:01:05 -0500 Subject: rpms/libgnomecanvasmm26/devel .cvsignore, 1.4, 1.5 libgnomecanvasmm.spec, 1.9, 1.10 sources, 1.4, 1.5 Message-ID: <200603260701.k2Q71bN9014602@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomecanvasmm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12684 Modified Files: .cvsignore libgnomecanvasmm.spec sources Log Message: Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Sep 2005 07:27:17 -0000 1.4 +++ .cvsignore 26 Mar 2006 07:01:05 -0000 1.5 @@ -1 +1 @@ -libgnomecanvasmm-2.12.0.tar.bz2 +libgnomecanvasmm-2.14.0.tar.bz2 Index: libgnomecanvasmm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/libgnomecanvasmm.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- libgnomecanvasmm.spec 1 Mar 2006 01:11:59 -0000 1.9 +++ libgnomecanvasmm.spec 26 Mar 2006 07:01:05 -0000 1.10 @@ -1,6 +1,6 @@ Name: libgnomecanvasmm26 -Version: 2.12.0 -Release: 3 +Version: 2.14.0 +Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -74,6 +74,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Mar 23 2006 Denis Leroy - 2.14.0-1 +- Update to 2.14.0 + * Tue Feb 28 2006 Denis Leroy - 2.12.0-3 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomecanvasmm26/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 20 Sep 2005 07:27:17 -0000 1.4 +++ sources 26 Mar 2006 07:01:05 -0000 1.5 @@ -1 +1 @@ -b05bba03433745043ef0c781020d4738 libgnomecanvasmm-2.12.0.tar.bz2 +a4e5bf13a31e38b4f30b99153bc10aca libgnomecanvasmm-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 26 07:05:02 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 26 Mar 2006 02:05:02 -0500 Subject: rpms/libgnomemm26/devel .cvsignore, 1.6, 1.7 libgnomemm.spec, 1.10, 1.11 sources, 1.7, 1.8 Message-ID: <200603260705.k2Q75Ypm014711@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomemm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14690 Modified Files: .cvsignore libgnomemm.spec sources Log Message: Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 1 Mar 2006 01:16:43 -0000 1.6 +++ .cvsignore 26 Mar 2006 07:05:01 -0000 1.7 @@ -1 +1 @@ -libgnomemm-2.12.2.tar.bz2 +libgnomemm-2.14.0.tar.bz2 Index: libgnomemm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/libgnomemm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libgnomemm.spec 1 Mar 2006 01:16:43 -0000 1.10 +++ libgnomemm.spec 26 Mar 2006 07:05:01 -0000 1.11 @@ -1,5 +1,5 @@ Name: libgnomemm26 -Version: 2.12.2 +Version: 2.14.0 Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -75,6 +75,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Mar 23 2006 Denis Leroy - 2.14.0-1 +- Update to 2.14.0 + * Tue Feb 28 2006 Denis Leroy - 2.12.2-1 - Update to 2.12.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomemm26/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 1 Mar 2006 01:16:43 -0000 1.7 +++ sources 26 Mar 2006 07:05:01 -0000 1.8 @@ -1 +1 @@ -c43421c77999f1c225ec5a39c6c64dff libgnomemm-2.12.2.tar.bz2 +8e31905b9732fdb099381569736829fa libgnomemm-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 26 07:19:27 2006 From: fedora-extras-commits at redhat.com (Denis Leroy (denis)) Date: Sun, 26 Mar 2006 02:19:27 -0500 Subject: rpms/libgnomeuimm26/devel .cvsignore, 1.4, 1.5 libgnomeuimm.spec, 1.10, 1.11 sources, 1.5, 1.6 Message-ID: <200603260719.k2Q7JxBp014839@cvs-int.fedora.redhat.com> Author: denis Update of /cvs/extras/rpms/libgnomeuimm26/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14818 Modified Files: .cvsignore libgnomeuimm.spec sources Log Message: Update to 2.14.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 20 Sep 2005 07:31:06 -0000 1.4 +++ .cvsignore 26 Mar 2006 07:19:26 -0000 1.5 @@ -1 +1 @@ -libgnomeuimm-2.12.0.tar.bz2 +libgnomeuimm-2.14.0.tar.bz2 Index: libgnomeuimm.spec =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/libgnomeuimm.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libgnomeuimm.spec 1 Mar 2006 01:27:29 -0000 1.10 +++ libgnomeuimm.spec 26 Mar 2006 07:19:26 -0000 1.11 @@ -1,6 +1,6 @@ Name: libgnomeuimm26 -Version: 2.12.0 -Release: 3 +Version: 2.14.0 +Release: 1 Summary: C++ interface for Gnome libs (a GUI library for X) @@ -82,6 +82,9 @@ %{_libdir}/pkgconfig/*.pc %changelog +* Thu Mar 23 2006 Denis Leroy - 2.14.0-1 +- Update to 2.14.0 + * Tue Feb 28 2006 Denis Leroy - 2.12.0-3 - Rebuild Index: sources =================================================================== RCS file: /cvs/extras/rpms/libgnomeuimm26/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 20 Sep 2005 07:31:06 -0000 1.5 +++ sources 26 Mar 2006 07:19:26 -0000 1.6 @@ -1 +1 @@ -50ee34ec10c4527f1dc49bb12d0e0954 libgnomeuimm-2.12.0.tar.bz2 +066edc6d3dea4f0dce317dbf5ea7c24e libgnomeuimm-2.14.0.tar.bz2 From fedora-extras-commits at redhat.com Sun Mar 26 07:57:33 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 26 Mar 2006 02:57:33 -0500 Subject: rpms/gweled/devel gweled.spec,1.13,1.14 Message-ID: <200603260758.k2Q7w5XG015032@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gweled/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15015 Modified Files: gweled.spec Log Message: Add LDFLAGS=-Wl,--export-dynamic (thx to Kevin Kofler for the hint) Index: gweled.spec =================================================================== RCS file: /cvs/extras/rpms/gweled/devel/gweled.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gweled.spec 13 Feb 2006 17:31:45 -0000 1.13 +++ gweled.spec 26 Mar 2006 07:57:32 -0000 1.14 @@ -1,6 +1,6 @@ Name: gweled Version: 0.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Swapping gem game @@ -31,6 +31,7 @@ %patch1 -p0 -b .patch0 %build +export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic" %configure echo "Encoding=UTF-8" >> gweled.desktop mv gweled.desktop gweled.desktop.old @@ -66,7 +67,10 @@ %{_datadir}/sounds/%{name}/ %changelog -* Mon Feb 13 2006 Thorsten Leemhuis +* Sun Mar 26 2006 Thorsten Leemhuis - 0.7-5 +- Add LDFLAGS="-Wl,--export-dynamic" (thx to Kevin Kofler for the hint) + +* Mon Feb 13 2006 Thorsten Leemhuis - 0.7-4 - Rebuild for Fedora Extras 5 * Sun Jan 29 2006 Thorsten Leemhuis - 0.7-3 From fedora-extras-commits at redhat.com Sun Mar 26 07:58:43 2006 From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl)) Date: Sun, 26 Mar 2006 02:58:43 -0500 Subject: rpms/gweled/FC-5 gweled.spec,1.13,1.14 Message-ID: <200603260759.k2Q7xGbH015093@cvs-int.fedora.redhat.com> Author: thl Update of /cvs/extras/rpms/gweled/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15076 Modified Files: gweled.spec Log Message: Add LDFLAGS=-Wl,--export-dynamic (thx to Kevin Kofler for the hint) Index: gweled.spec =================================================================== RCS file: /cvs/extras/rpms/gweled/FC-5/gweled.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- gweled.spec 13 Feb 2006 17:31:45 -0000 1.13 +++ gweled.spec 26 Mar 2006 07:58:43 -0000 1.14 @@ -1,6 +1,6 @@ Name: gweled Version: 0.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Swapping gem game @@ -31,6 +31,7 @@ %patch1 -p0 -b .patch0 %build +export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic" %configure echo "Encoding=UTF-8" >> gweled.desktop mv gweled.desktop gweled.desktop.old @@ -66,7 +67,10 @@ %{_datadir}/sounds/%{name}/ %changelog -* Mon Feb 13 2006 Thorsten Leemhuis +* Sun Mar 26 2006 Thorsten Leemhuis - 0.7-5 +- Add LDFLAGS="-Wl,--export-dynamic" (thx to Kevin Kofler for the hint) + +* Mon Feb 13 2006 Thorsten Leemhuis - 0.7-4 - Rebuild for Fedora Extras 5 * Sun Jan 29 2006 Thorsten Leemhuis - 0.7-3 From fedora-extras-commits at redhat.com Sun Mar 26 10:40:08 2006 From: fedora-extras-commits at redhat.com (Ville Skytta (scop)) Date: Sun, 26 Mar 2006 05:40:08 -0500 Subject: owners owners.list,1.772,1.773 Message-ID: <200603261040.k2QAefsi025391@cvs-int.fedora.redhat.com> Author: scop Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25372 Modified Files: owners.list Log Message: Orphan perl-Chart, perl-Convert-BinHex, perl-IO-stringy, perl-MailTools, perl-MIME-tools, perl-Net-Netmask, perl-XML-DOM, perl-XML-RegExp, perl-XML-Simple, perl-XML-XPath, uqm, uqm-content Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.772 retrieving revision 1.773 diff -u -r1.772 -r1.773 --- owners.list 25 Mar 2006 18:24:44 -0000 1.772 +++ owners.list 26 Mar 2006 10:40:08 -0000 1.773 @@ -832,7 +832,7 @@ Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint-date|Validate a date|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-CGI-Untaint|Process CGI input parameters|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Chart|Perl modules for producing many types of charts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Chart|Perl modules for producing many types of charts|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Accessor|Automated accessor generation|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Accessor-Chained|Make chained accessors|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Class-Autouse|Run-time class loading on first method call|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -866,7 +866,7 @@ 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 Fedora Extras|perl-Convert-ASCII-Armour|Convert::ASCII::Armour Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-PEM|Convert::PEM Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -953,7 +953,7 @@ Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|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-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 @@ -987,10 +987,10 @@ Fedora Extras|perl-Mail-Sender|Module for sending mails with attachments through an SMTP server|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-MailTools|MailTools module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-MailTools|MailTools module for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Math-GMP|High speed arbitrary size integer math|paul at city-fan.org|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|ville.skytta at iki.fi|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|extras-orphan 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 @@ -1001,7 +1001,7 @@ 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-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-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-Netmask|Perl module for manipulation and lookup of IP network blocks|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Net-Netmask|Perl module for manipulation and lookup of IP network blocks|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Patricia|Patricia Trie perl module for fast IP address lookups|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-SCP|Perl extension for secure copy protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Net-Server|Extensible, general Perl server engine|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com @@ -1095,14 +1095,14 @@ 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-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-X11-Protocol|Perl interface to X11|duncan_j_ferguson at yahoo.co.uk|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-DOM|DOM extension to XML::Parser|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-LibXSLT|Perl module for interfacing to GNOME's libxslt|shishz at hotpop.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com -Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-XML-XQL|Perl module for querying XML tree structures with XQL|extras-orphan at fedoraproject.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|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org| @@ -1435,8 +1435,8 @@ 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|uqm-content|Base content files for The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org| -Fedora Extras|uqm|The Ur-Quan Masters|ville.skytta at iki.fi|extras-qa at fedoraproject.org| +Fedora Extras|uqm-content|Base content files for The Ur-Quan Masters|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi +Fedora Extras|uqm|The Ur-Quan Masters|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|ville.skytta at iki.fi 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 Sun Mar 26 10:45:57 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 26 Mar 2006 05:45:57 -0500 Subject: kadischi/doc kadischi.1,NONE,1.1 kadischi.conf.5,NONE,1.1 Message-ID: <200603261045.k2QAjvN4025449@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25415/kadischi/doc Added Files: kadischi.1 kadischi.conf.5 Log Message: Updates to bootsplash/ and addition of manual pages kadischi(1) and kadischi.conf(5) --- NEW FILE kadischi.1 --- .\" PROCESS THIS FILE WITH .\" groff -man -Tascii kadischi.1 .\" .TH KADISCHI 1 "MARCH 2006" "Fedora Core Linux" "User Manuals" .SH NAME kadischi - generate a live ISO9660 CDROM image from an RPM repository .SH SYNOPSIS kadischi [--text|--graphical] [--kickstart=] [-C|--cmdline] REPOSITORY [-f] IMAGE .SH DESCRIPTION .B kadischi(1) generates a live ISO9660 CDROM image from an RPM repository tree by invoking anaconda passing it the correct options and installing to the build directory specified. Kadischi will invoke .BR mkzftree(1) and .BR mkisofs(1) to produce an image that can be written to a CD or DVD ROM. .SH OPTIONS .IP --text Run in a textual mode that does not require X. .IP --graphical Run in graphical mode. .IP --kickstart Read from using the installation options provided in the file for the produced ISO9660 image. This option can be used with -C to automate builds. .IP -C Run strictly in command line mode requiring no user input. .IP --cmdline Same as -C .IP -f Overwrite an existing ISO9660 image, if it already exists. .SH FILES .I /etc/kadischi/build.conf .RS The system wide configuration file. See .BR kadischi(5) for more information. .RE .I /etc/kadischi/buildstamp .RS The build-stamp file. Used for stamping a CD. See .BR kadischi(5) for more information. .SH BUGS The module shvarFile is not always imported properly or is not imported sometimes at all, resulting in the build directory needing to be manually cleaned up. .SH AVAILABILITY Kadischi is available via anonymous CVS: .nf export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/devel cvs login cvs -z3 co kadischi .fi .SH AUTHOR .RS Darko Ilic .RS Jasper Hartline .RS Chitlesh Goorah .SH "SEE ALSO" .BR mkzftree(1), .BR mkisofs(1), .BR busybox(1), .BR anaconda(1) --- NEW FILE kadischi.conf.5 --- .\" PROCESS THIS FILE WITH .\" groff -man -Tascii kadischi.conf.5 .\" .TH KADISCHI.CONF 5 "MARCH 2006" "Fedora Core Linux" "File Formats" .SH NAME .B kadischi.conf(5) Configuration file for Kadischi live CD/DVD generator .SH SYNOPSIS .B kadischi.conf(5) is the configuration file for .B kadischi(1) live CD/DVD generation utility. It's syntax is much simpler than many configuration files and has few options currently but may be expanded at any time. .SH FILE FORMAT .B kadischi.conf(5) utilizes configuration options in the form of .IP OPTION=VALUE .SH PARAMETERS .IP BUILDDIR Specifies where .B kadischi(1) will place any of it's build directories. Pretty self explanatory and a common location is /tmp. .IP BUILDNUM This value is incremented after every build with .B kadischi(1). The BUILDNUM will reflect the current build instance in progress, or a previous build. .IP INSTALLDIR This option reflects where .B kadischi(1) is installed on the local system and is set at installation time. .SH AUTHOR .RS Jasper Hartline .RS .SH SEE ALSO .BR kadischi(1) From fedora-extras-commits at redhat.com Sun Mar 26 10:45:52 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Sun, 26 Mar 2006 05:45:52 -0500 Subject: kadischi/bootsplash boot.msg, 1.1, 1.2 general.msg, 1.1, 1.2 license.msg, 1.1, 1.2 options.msg, 1.1, 1.2 xen.msg, 1.1, 1.2 xenboot.msg, 1.1, 1.2 Message-ID: <200603261046.k2QAkMsR025462@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/bootsplash In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25415/kadischi/bootsplash Modified Files: boot.msg general.msg license.msg options.msg xen.msg xenboot.msg Log Message: Updates to bootsplash/ and addition of manual pages kadischi(1) and kadischi.conf(5) Index: boot.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/boot.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- boot.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ boot.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,8 +1,10 @@ splash.lss Welcome to the Fedora Core Live CD built with Kadischi. +This Live CD is NOT an official release from the Fedora Project. +It is meant for TESTING PURPOSES ONLY. - - To start the live cd press the 0107 key. + - To start the live cd press the 01[ENTER]07 key. - Use the function keys listed below for more information. 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 Index: general.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/general.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- general.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ general.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,15 +1,16 @@ 00 - 01What is Fedora07 + + 01What is Fedora07 Fedora is a set of projects sponsored by Red Hat and guided -by the Fedora Foundation. These projects are developed by a -large community of people who strive to provide and maintain -the very best in free, open source software and standards. -Fedora Core, the central Fedora project, is an operating -system and platform based on Linux, that is always free for +by the Fedora Foundation. These projects are developed by a large +community of people who strive to provide and maintain the very best +in free, open source software and standards. +Fedora Core, the central Fedora project, is an operating system +and platform based on Linux, that is always free for anyone to use, modify, and distribute, now and forever. 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 -For the default live system, press 0107. +For the default live system, press 01[ENTER]07. Index: license.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/license.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- license.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ license.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,17 +1,20 @@ 00 - 01Legal Notice07 + 01End User License Agreement07 +This agreement governs the download, installation or use of the Software +(as defined below) and any updates to the Software, regardless of the +delivery mechanism. The Software is a collective work under U.S. +Copyright Law. Subject to the following terms, Fedora Project grants to +the user ("User") a license to this collective work pursuant to the GNU +General Public License. By downloading, installing or using the Software, +User agrees to the terms of this agreement. -Copyright (c) 2006 by Fedora Foundation and others. This material -may be distributed only subject to the terms and conditions set -forth in the Open Publication License, v1.0, available at -http://www.opencontent.org/openpub/. +FEDORA, FEDORA PROJECT, and the Fedora Logo are trademarks of Red Hat, +Inc., are registered or pending registration in the U.S. and other +countries, and are used here under license to the Fedora Foundation. -FEDORA, FEDORA PROJECT, and the Fedora Logo are trademarks of -RedHat, Inc., are registered or pending registration in the U.S. -and other countries, and are used here under license to the -Fedora Foundation. +Copyright (c) 2006 by Fedora Foundation and others. +see http://fedoraproject.org/wiki/Kadischi/Legal 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 - -For the default live system, press 0107. +For the default live system, press 01[Enter]07. Index: options.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/options.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- options.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ options.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,9 +1,11 @@ 00 - 01Live CD built with Kadischi07 + + 01Live CD built with Kadischi07 + Kadischi is an application for Fedora-based Live CD generation. -It takes input from a Fedora RPM repository as an input and outputs a Live CD -ISO image. +It takes input from a Fedora RPM repository and outputs a live ISO9660 +CD ROM image. For advanced options, Type: @@ -12,4 +14,4 @@ 0f[F1-Main] [F2-Options] [F3-General] [F4-License]07 -For the default live system, press 0107. +For the default live system, press 01[ENTER]07. Index: xen.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/xen.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xen.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ xen.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,6 +1,7 @@ 00 - 01Xen Support in Kadischi07 + + 01Xen Support in Kadischi07 Xen is an open source virtualization for the Linux kernel. Virtualization allows multiple instances of an operating system to run @@ -13,4 +14,4 @@ 0f[F1-Main] [F2-Options] [F3-General] [F4-License] [F5-Xen]07 -For the default live system, press 0107. +For the default live system, press 01[ENTER]07. Index: xenboot.msg =================================================================== RCS file: /cvs/devel/kadischi/bootsplash/xenboot.msg,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xenboot.msg 17 Mar 2006 22:36:39 -0000 1.1 +++ xenboot.msg 26 Mar 2006 10:45:50 -0000 1.2 @@ -1,8 +1,10 @@ splash.lss 01Welcome to the Fedora Core Live CD built with Kadischi07. +This Live CD is NOT an official release from the Fedora Project. +It is meant for TESTING PURPOSES ONLY. - - To start the live cd press the 0107 key. + - To start the live cd press the 01[ENTER]07 key. - Use the function keys listed below for more information. 0f[F1-Main] [F2-Options] [F3-General] [F4-License] [F5-Xen]07 From fedora-extras-commits at redhat.com Sun Mar 26 10:58:23 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 05:58:23 -0500 Subject: rpms/tkcvs/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tkcvs.spec, 1.16, 1.17 Message-ID: <200603261058.k2QAwtKn025559@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25504/FC-4 Modified Files: .cvsignore sources tkcvs.spec Log Message: new version 8.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 31 Jan 2006 14:26:49 -0000 1.8 +++ .cvsignore 26 Mar 2006 10:58:23 -0000 1.9 @@ -1 +1 @@ -tkcvs_8_0_2.tar.gz +tkcvs_8_0_3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 31 Jan 2006 14:26:49 -0000 1.8 +++ sources 26 Mar 2006 10:58:23 -0000 1.9 @@ -1 +1 @@ -aaeaa34a9e1d309baee9fcf7cbba9799 tkcvs_8_0_2.tar.gz +f02a40b84ac7c8de7f24acbcac066207 tkcvs_8_0_3.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-4/tkcvs.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- tkcvs.spec 31 Jan 2006 14:34:13 -0000 1.16 +++ tkcvs.spec 26 Mar 2006 10:58:23 -0000 1.17 @@ -1,5 +1,5 @@ Name: tkcvs -Version: 8.0.2 +Version: 8.0.3 Release: 1%{?dist} Summary: TkCVS and TkDiff @@ -7,9 +7,11 @@ Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz +Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tk, tcl, cvs +Requires: tk +Requires: tcl +Requires: cvs BuildArch: noarch %description @@ -33,7 +35,7 @@ %prep -%setup -q -n tkcvs_8_0_2 +%setup -q -n tkcvs_8_0_3 %build @@ -68,6 +70,9 @@ %changelog +* Sun Mar 26 2006 Gerard Milmeister - 8.0.3-1 +- new version 8.0.3 + * Tue Jan 31 2006 Gerard Milmeister - 8.0.2-1 - new version 8.0.2 From fedora-extras-commits at redhat.com Sun Mar 26 10:58:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 05:58:29 -0500 Subject: rpms/tkcvs/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tkcvs.spec, 1.17, 1.18 Message-ID: <200603261059.k2QAx1Jj025564@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25504/FC-5 Modified Files: .cvsignore sources tkcvs.spec Log Message: new version 8.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 31 Jan 2006 14:27:00 -0000 1.8 +++ .cvsignore 26 Mar 2006 10:58:28 -0000 1.9 @@ -1 +1 @@ -tkcvs_8_0_2.tar.gz +tkcvs_8_0_3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 31 Jan 2006 14:27:00 -0000 1.8 +++ sources 26 Mar 2006 10:58:28 -0000 1.9 @@ -1 +1 @@ -aaeaa34a9e1d309baee9fcf7cbba9799 tkcvs_8_0_2.tar.gz +f02a40b84ac7c8de7f24acbcac066207 tkcvs_8_0_3.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/FC-5/tkcvs.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- tkcvs.spec 17 Feb 2006 21:42:05 -0000 1.17 +++ tkcvs.spec 26 Mar 2006 10:58:28 -0000 1.18 @@ -1,15 +1,17 @@ Name: tkcvs -Version: 8.0.2 -Release: 2%{?dist} +Version: 8.0.3 +Release: 1%{?dist} Summary: TkCVS and TkDiff Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz +Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tk, tcl, cvs +Requires: tk +Requires: tcl +Requires: cvs BuildArch: noarch %description @@ -33,7 +35,7 @@ %prep -%setup -q -n tkcvs_8_0_2 +%setup -q -n tkcvs_8_0_3 %build @@ -68,6 +70,9 @@ %changelog +* Sun Mar 26 2006 Gerard Milmeister - 8.0.3-1 +- new version 8.0.3 + * Fri Feb 17 2006 Gerard Milmeister - 8.0.2-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sun Mar 26 10:58:34 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 05:58:34 -0500 Subject: rpms/tkcvs/devel .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 tkcvs.spec, 1.17, 1.18 Message-ID: <200603261059.k2QAx749025569@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/tkcvs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25504/devel Modified Files: .cvsignore sources tkcvs.spec Log Message: new version 8.0.3 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 31 Jan 2006 14:27:00 -0000 1.8 +++ .cvsignore 26 Mar 2006 10:58:34 -0000 1.9 @@ -1 +1 @@ -tkcvs_8_0_2.tar.gz +tkcvs_8_0_3.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 31 Jan 2006 14:27:00 -0000 1.8 +++ sources 26 Mar 2006 10:58:34 -0000 1.9 @@ -1 +1 @@ -aaeaa34a9e1d309baee9fcf7cbba9799 tkcvs_8_0_2.tar.gz +f02a40b84ac7c8de7f24acbcac066207 tkcvs_8_0_3.tar.gz Index: tkcvs.spec =================================================================== RCS file: /cvs/extras/rpms/tkcvs/devel/tkcvs.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- tkcvs.spec 17 Feb 2006 21:42:05 -0000 1.17 +++ tkcvs.spec 26 Mar 2006 10:58:34 -0000 1.18 @@ -1,15 +1,17 @@ Name: tkcvs -Version: 8.0.2 -Release: 2%{?dist} +Version: 8.0.3 +Release: 1%{?dist} Summary: TkCVS and TkDiff Group: Development/Tools License: GPL URL: http://www.twobarleycorns.net/tkcvs.html -Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_2.tar.gz +Source: http://puzzle.dl.sourceforge.net/sourceforge/tkcvs/tkcvs_8_0_3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: tk, tcl, cvs +Requires: tk +Requires: tcl +Requires: cvs BuildArch: noarch %description @@ -33,7 +35,7 @@ %prep -%setup -q -n tkcvs_8_0_2 +%setup -q -n tkcvs_8_0_3 %build @@ -68,6 +70,9 @@ %changelog +* Sun Mar 26 2006 Gerard Milmeister - 8.0.3-1 +- new version 8.0.3 + * Fri Feb 17 2006 Gerard Milmeister - 8.0.2-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Sun Mar 26 11:30:49 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 06:30:49 -0500 Subject: rpms/bigloo/FC-4 .cvsignore, 1.5, 1.6 bigloo.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200603261131.k2QBVOTS027771@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27716/FC-4 Modified Files: .cvsignore bigloo.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Mar 2006 15:39:54 -0000 1.5 +++ .cvsignore 26 Mar 2006 11:30:49 -0000 1.6 @@ -1 +1 @@ -bigloo2.8a-alpha21Mar06.tar.gz +bigloo2.8a-alpha22Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/bigloo.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- bigloo.spec 21 Mar 2006 15:39:54 -0000 1.6 +++ bigloo.spec 26 Mar 2006 11:30:49 -0000 1.7 @@ -2,13 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060321%{?dist} +Release: 1.20060322%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha22Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -200,8 +200,8 @@ %changelog -* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 -- new version 2.8a-20060321 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060322 +- new version 2.8a-20060322 * Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 21 Mar 2006 15:39:54 -0000 1.5 +++ sources 26 Mar 2006 11:30:49 -0000 1.6 @@ -1 +1 @@ -de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz +fdf588a8bcfc97d9b9d29eec19c80af8 bigloo2.8a-alpha22Mar06.tar.gz From fedora-extras-commits at redhat.com Sun Mar 26 11:30:59 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 06:30:59 -0500 Subject: rpms/bigloo/FC-5 .cvsignore, 1.5, 1.6 bigloo.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603261131.k2QBVWIG027776@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27716/FC-5 Modified Files: .cvsignore bigloo.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Mar 2006 15:42:14 -0000 1.5 +++ .cvsignore 26 Mar 2006 11:30:59 -0000 1.6 @@ -1 +1 @@ -bigloo2.8a-alpha21Mar06.tar.gz +bigloo2.8a-alpha22Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/bigloo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bigloo.spec 21 Mar 2006 15:42:14 -0000 1.7 +++ bigloo.spec 26 Mar 2006 11:30:59 -0000 1.8 @@ -2,13 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060321%{?dist} +Release: 1.20060322%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha22Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -200,8 +200,8 @@ %changelog -* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 -- new version 2.8a-20060321 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060322 +- new version 2.8a-20060322 * Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 21 Mar 2006 15:42:14 -0000 1.5 +++ sources 26 Mar 2006 11:30:59 -0000 1.6 @@ -1 +1 @@ -de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz +fdf588a8bcfc97d9b9d29eec19c80af8 bigloo2.8a-alpha22Mar06.tar.gz From fedora-extras-commits at redhat.com Sun Mar 26 11:31:05 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 06:31:05 -0500 Subject: rpms/bigloo/devel .cvsignore, 1.5, 1.6 bigloo.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603261131.k2QBVclH027781@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/bigloo/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27716/devel Modified Files: .cvsignore bigloo.spec sources Log Message: new version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 21 Mar 2006 15:42:19 -0000 1.5 +++ .cvsignore 26 Mar 2006 11:31:05 -0000 1.6 @@ -1 +1 @@ -bigloo2.8a-alpha21Mar06.tar.gz +bigloo2.8a-alpha22Mar06.tar.gz Index: bigloo.spec =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/bigloo.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- bigloo.spec 21 Mar 2006 15:42:19 -0000 1.7 +++ bigloo.spec 26 Mar 2006 11:31:05 -0000 1.8 @@ -2,13 +2,13 @@ Name: bigloo Version: 2.8a -Release: 1.20060321%{?dist} +Release: 1.20060322%{?dist} Summary: Bigloo is compiler for the Scheme programming language Group: Development/Languages License: GPL URL: http://www-sop.inria.fr/mimosa/fp/Bigloo -Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha21Mar06.tar.gz +Source: ftp://ftp-sop.inria.fr/mimosa/fp/Bigloo/bigloo2.8a-alpha22Mar06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: emacs BuildRequires: emacs-el @@ -200,8 +200,8 @@ %changelog -* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060321 -- new version 2.8a-20060321 +* Tue Mar 21 2006 Gerard Milmeister - 2.8a-1.20060322 +- new version 2.8a-20060322 * Mon Mar 13 2006 Gerard Milmeister - 2.8a-1.20060313 - new version 2.8a-20060313 Index: sources =================================================================== RCS file: /cvs/extras/rpms/bigloo/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 21 Mar 2006 15:42:19 -0000 1.5 +++ sources 26 Mar 2006 11:31:05 -0000 1.6 @@ -1 +1 @@ -de7f25174a9d63f16a77dcb4438a5528 bigloo2.8a-alpha21Mar06.tar.gz +fdf588a8bcfc97d9b9d29eec19c80af8 bigloo2.8a-alpha22Mar06.tar.gz From fedora-extras-commits at redhat.com Sun Mar 26 14:21:53 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 26 Mar 2006 09:21:53 -0500 Subject: rpms/gnome-blog/devel gnome-blog.spec,1.12,1.13 Message-ID: <200603261422.k2QEMPvo001748@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnome-blog/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1722 Modified Files: gnome-blog.spec Log Message: * Sun Mar 26 2006 Brian Pepple - 0.8-13 - Rebuild. Index: gnome-blog.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnome-blog.spec 13 Feb 2006 17:45:26 -0000 1.12 +++ gnome-blog.spec 26 Mar 2006 14:21:51 -0000 1.13 @@ -4,7 +4,7 @@ Name: gnome-blog Version: 0.8 -Release: 12%{?dist} +Release: 13%{?dist} Summary: GNOME panel object for posting blog entries Group: Applications/Internet @@ -94,6 +94,9 @@ %ghost %{python_sitelib}/gnomeblog/*.pyo %changelog +* Sun Mar 26 2006 Brian Pepple - 0.8-13 +- Rebuild. + * Mon Feb 13 2006 Brian Pepple - 0.8-12 - rebuilt for new gcc4.1 snapshot and glibc changes From fedora-extras-commits at redhat.com Sun Mar 26 15:41:03 2006 From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple)) Date: Sun, 26 Mar 2006 10:41:03 -0500 Subject: rpms/gnome-blog/FC-5 gnome-blog.spec,1.12,1.13 Message-ID: <200603261541.k2QFfaX2003911@cvs-int.fedora.redhat.com> Author: bpepple Update of /cvs/extras/rpms/gnome-blog/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3894 Modified Files: gnome-blog.spec Log Message: * Sun Mar 26 2006 Brian Pepple - 0.8-13 - Rebuild. Index: gnome-blog.spec =================================================================== RCS file: /cvs/extras/rpms/gnome-blog/FC-5/gnome-blog.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- gnome-blog.spec 13 Feb 2006 17:45:26 -0000 1.12 +++ gnome-blog.spec 26 Mar 2006 15:41:03 -0000 1.13 @@ -4,7 +4,7 @@ Name: gnome-blog Version: 0.8 -Release: 12%{?dist} +Release: 13%{?dist} Summary: GNOME panel object for posting blog entries Group: Applications/Internet @@ -94,6 +94,9 @@ %ghost %{python_sitelib}/gnomeblog/*.pyo %changelog +* Sun Mar 26 2006 Brian Pepple - 0.8-13 +- Rebuild. + * Mon Feb 13 2006 Brian Pepple - 0.8-12 - rebuilt for new gcc4.1 snapshot and glibc changes From fedora-extras-commits at redhat.com Sun Mar 26 16:36:12 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:36:12 -0500 Subject: rpms/libtasn1/FC-4 sources,1.4,1.5 Message-ID: <200603261636.k2QGajjD006078@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6029/FC-4 Modified Files: sources Log Message: updated to 0.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Mar 2006 18:20:51 -0000 1.4 +++ sources 26 Mar 2006 16:36:12 -0000 1.5 @@ -1,2 +1,2 @@ -f56641ed0e1ee4d1903ba25ab046ed45 libtasn1-0.3.1.tar.gz -8097b205dd0fb3b351f8fd707dee903e libtasn1-0.3.1.tar.gz.sig +0de8869c2ac94ec3f04d237d50aeda9e libtasn1-0.3.2.tar.gz +96f8762f63bcc95174274270f01e3c0d libtasn1-0.3.2.tar.gz.sig From fedora-extras-commits at redhat.com Sun Mar 26 16:36:25 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:36:25 -0500 Subject: rpms/libtasn1/devel sources,1.4,1.5 Message-ID: <200603261636.k2QGavPH006084@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6029/devel Modified Files: sources Log Message: updated to 0.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Mar 2006 18:20:57 -0000 1.4 +++ sources 26 Mar 2006 16:36:24 -0000 1.5 @@ -1,2 +1,2 @@ -f56641ed0e1ee4d1903ba25ab046ed45 libtasn1-0.3.1.tar.gz -8097b205dd0fb3b351f8fd707dee903e libtasn1-0.3.1.tar.gz.sig +0de8869c2ac94ec3f04d237d50aeda9e libtasn1-0.3.2.tar.gz +96f8762f63bcc95174274270f01e3c0d libtasn1-0.3.2.tar.gz.sig From fedora-extras-commits at redhat.com Sun Mar 26 16:36:19 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:36:19 -0500 Subject: rpms/libtasn1/FC-5 sources,1.4,1.5 Message-ID: <200603261636.k2QGapeq006081@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6029/FC-5 Modified Files: sources Log Message: updated to 0.3.2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 8 Mar 2006 18:20:57 -0000 1.4 +++ sources 26 Mar 2006 16:36:18 -0000 1.5 @@ -1,2 +1,2 @@ -f56641ed0e1ee4d1903ba25ab046ed45 libtasn1-0.3.1.tar.gz -8097b205dd0fb3b351f8fd707dee903e libtasn1-0.3.1.tar.gz.sig +0de8869c2ac94ec3f04d237d50aeda9e libtasn1-0.3.2.tar.gz +96f8762f63bcc95174274270f01e3c0d libtasn1-0.3.2.tar.gz.sig From fedora-extras-commits at redhat.com Sun Mar 26 16:38:28 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:38:28 -0500 Subject: rpms/libtasn1/FC-5 libtasn1.spec,1.11,1.12 Message-ID: <200603261639.k2QGd0de006148@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6101/FC-5 Modified Files: libtasn1.spec Log Message: updated to 0.3.2 added -tool subpackage Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-5/libtasn1.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libtasn1.spec 8 Mar 2006 18:20:57 -0000 1.11 +++ libtasn1.spec 26 Mar 2006 16:38:28 -0000 1.12 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.1 +Version: 0.3.2 Release: %release_func 1 License: LGPL @@ -26,6 +26,12 @@ Requires(postun): /sbin/install-info +%package tools +Summary: Some ASN.1 tools +Group: Applications/Text +Requires: %name = %version-%release + + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org @@ -34,8 +40,15 @@ This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org -This packages contains files for development of applications which -will use libtasn1. +This package contains files for development of applications which will +use libtasn1. + + +%description tools +This is the ASN.1 library used in GNUTLS. More up to date information can +be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org + +This package contains tools using the libtasn library. %prep @@ -80,6 +93,10 @@ %doc AUTHORS COPYING* ChangeLog NEWS README THANKS %_libdir/*.so.* +%files tools +%defattr(-,root,root,-) +%_bindir/asn1* +%_mandir/man1/asn1* %files devel %defattr(-,root,root,-) @@ -93,6 +110,10 @@ %changelog +* Sun Mar 26 2006 Enrico Scholz - 0.3.2-1 +- updated to 0.3.2 +- added -tools subpackage + * Wed Mar 8 2006 Enrico Scholz - 0.3.1-1 - updated to 0.3.1 From fedora-extras-commits at redhat.com Sun Mar 26 16:38:34 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:38:34 -0500 Subject: rpms/libtasn1/devel libtasn1.spec,1.11,1.12 Message-ID: <200603261639.k2QGd6vq006151@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6101/devel Modified Files: libtasn1.spec Log Message: updated to 0.3.2 added -tool subpackage Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/devel/libtasn1.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libtasn1.spec 8 Mar 2006 18:20:57 -0000 1.11 +++ libtasn1.spec 26 Mar 2006 16:38:34 -0000 1.12 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.1 +Version: 0.3.2 Release: %release_func 1 License: LGPL @@ -26,6 +26,12 @@ Requires(postun): /sbin/install-info +%package tools +Summary: Some ASN.1 tools +Group: Applications/Text +Requires: %name = %version-%release + + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org @@ -34,8 +40,15 @@ This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org -This packages contains files for development of applications which -will use libtasn1. +This package contains files for development of applications which will +use libtasn1. + + +%description tools +This is the ASN.1 library used in GNUTLS. More up to date information can +be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org + +This package contains tools using the libtasn library. %prep @@ -80,6 +93,10 @@ %doc AUTHORS COPYING* ChangeLog NEWS README THANKS %_libdir/*.so.* +%files tools +%defattr(-,root,root,-) +%_bindir/asn1* +%_mandir/man1/asn1* %files devel %defattr(-,root,root,-) @@ -93,6 +110,10 @@ %changelog +* Sun Mar 26 2006 Enrico Scholz - 0.3.2-1 +- updated to 0.3.2 +- added -tools subpackage + * Wed Mar 8 2006 Enrico Scholz - 0.3.1-1 - updated to 0.3.1 From fedora-extras-commits at redhat.com Sun Mar 26 16:38:22 2006 From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc)) Date: Sun, 26 Mar 2006 11:38:22 -0500 Subject: rpms/libtasn1/FC-4 libtasn1.spec,1.12,1.13 Message-ID: <200603261639.k2QGdOES006154@cvs-int.fedora.redhat.com> Author: ensc Update of /cvs/extras/rpms/libtasn1/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6101/FC-4 Modified Files: libtasn1.spec Log Message: updated to 0.3.2 added -tool subpackage Index: libtasn1.spec =================================================================== RCS file: /cvs/extras/rpms/libtasn1/FC-4/libtasn1.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- libtasn1.spec 8 Mar 2006 18:20:51 -0000 1.12 +++ libtasn1.spec 26 Mar 2006 16:38:22 -0000 1.13 @@ -4,7 +4,7 @@ Summary: This is the ASN.1 library used in GNUTLS Name: libtasn1 -Version: 0.3.1 +Version: 0.3.2 Release: %release_func 1 License: LGPL @@ -26,6 +26,12 @@ Requires(postun): /sbin/install-info +%package tools +Summary: Some ASN.1 tools +Group: Applications/Text +Requires: %name = %version-%release + + %description This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org @@ -34,8 +40,15 @@ This is the ASN.1 library used in GNUTLS. More up to date information can be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org -This packages contains files for development of applications which -will use libtasn1. +This package contains files for development of applications which will +use libtasn1. + + +%description tools +This is the ASN.1 library used in GNUTLS. More up to date information can +be found at http://www.gnu.org/software/gnutls and http://www.gnutls.org + +This package contains tools using the libtasn library. %prep @@ -80,6 +93,10 @@ %doc AUTHORS COPYING* ChangeLog NEWS README THANKS %_libdir/*.so.* +%files tools +%defattr(-,root,root,-) +%_bindir/asn1* +%_mandir/man1/asn1* %files devel %defattr(-,root,root,-) @@ -93,6 +110,10 @@ %changelog +* Sun Mar 26 2006 Enrico Scholz - 0.3.2-1 +- updated to 0.3.2 +- added -tools subpackage + * Wed Mar 8 2006 Enrico Scholz - 0.3.1-1 - updated to 0.3.1 From fedora-extras-commits at redhat.com Sun Mar 26 18:53:04 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 26 Mar 2006 13:53:04 -0500 Subject: extras-buildsys/common HTTPServer.py,1.9,1.10 Message-ID: <200603261853.k2QIr4NX010777@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys/common In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10743/common Modified Files: HTTPServer.py Log Message: 2006-03-26 Dan Williams * common/HTTPServer.py - Add ability to process HTTP POST requests, mostly for file uploads Index: HTTPServer.py =================================================================== RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- HTTPServer.py 12 Mar 2006 05:44:24 -0000 1.9 +++ HTTPServer.py 26 Mar 2006 18:52:56 -0000 1.10 @@ -27,6 +27,7 @@ import socket from OpenSSL import SSL import DebugUtils +import cgi class PlgHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): @@ -43,6 +44,21 @@ except socket.timeout: pass + def do_POST(self): + handler = self._server.get_POST_handler(self.path) + if not handler: + self.send_error(404) + return + + environ = {} + environ['REQUEST_METHOD'] = "POST" + fs = cgi.FieldStorage(fp=self.rfile, headers=self.headers, environ=environ) + try: + handler(self, fs) + except Exception, e: + self.send_error(500, "Error processing POST request: %s" % e) + del fs, environ + def list_directory(self, path): self.send_error(404, "No permission to list directory") @@ -85,19 +101,36 @@ pass -class PlgHTTPSServer(SSLCommon.PlgBaseSSLServer): +class PlgHTTPPOSTHandler(object): + def __init__(self): + self._POST_handlers = {} + + def set_POST_handler(self, location, handler): + if handler: + self._POST_handlers[location] = handler + else: + del self._POST_handlers[location] + + def get_POST_handler(self, location): + if self._POST_handlers.has_key(location): + return self._POST_handlers[location] + return None + +class PlgHTTPSServer(SSLCommon.PlgBaseSSLServer, PlgHTTPPOSTHandler): def __init__(self, server_address, http_dir, certs): self.http_dir = http_dir + PlgHTTPPOSTHandler.__init__(self) SSLCommon.PlgBaseSSLServer.__init__(self, server_address, PlgHTTPRequestHandler, certs) -class PlgHTTPServer(SSLCommon.PlgBaseServer): +class PlgHTTPServer(SSLCommon.PlgBaseServer, PlgHTTPPOSTHandler): def __init__(self, server_address, http_dir): self.http_dir = http_dir + PlgHTTPPOSTHandler.__init__(self) SSLCommon.PlgBaseServer.__init__(self, server_address, PlgHTTPRequestHandler) class PlgHTTPServerManager(threading.Thread): - def __init__(self, addr, http_dir, certs): + def __init__(self, addr, http_dir, certs=None): if certs and len(certs) > 0: self._server = PlgHTTPSServer(addr, http_dir, certs) else: @@ -106,6 +139,12 @@ threading.Thread.__init__(self) self.setName("PlgHTTPServerManager: %s/%s" % (addr, http_dir)) + def set_POST_handler(self, location, handler): + self._server.set_POST_handler(location, handler) + + def get_POST_handler(self, location): + return self._server.get_POST_handler(location) + def run(self): DebugUtils.registerThreadName(self) self._server.serve_forever() @@ -123,6 +162,48 @@ # Testing stuff ########################################################### +""" Use this HTML: + +
+File to process: + + + +
+ +""" + +def upload_callback(request_handler, fs): + # Search for filename + fslist = [fs] + if not fs.name and not fs.filename and fs.value: + fslist = fs.value + jobid = arch = filename = tmpfile = None + for item in fslist: + if item.name == 'jobid': + try: + jobid = int(item.value) + except ValueError: + pass + elif item.name == 'arch': + arch = item.value + elif item.name == 'filedata': + filename = item.filename + tmpfile = item.file + + if jobid and arch and filename and tmpfile: + import shutil + dest = file("/tmp/%s" % filename, "w+b") + print dest, tmpfile + shutil.copyfileobj(tmpfile, dest) + dest.close() + request_handler.send_response(200, "Success") + request_handler.send_header("Content-type", "text/html") + request_handler.end_headers() + request_handler.wfile.write("Success!") + else: + request_handler.send_error(400, "Invalid request for %s" % request_handler.path) + if __name__ == '__main__': if len(sys.argv) < 4: print "Usage: python HTTPServer.py key_and_cert ca_cert peer_ca_cert" @@ -154,6 +235,7 @@ print "Starting the server." server = PlgHTTPServerManager(('localhost', 8886), srcdir, certs) + server.set_POST_handler('/upload', upload_callback) server.start() while True: From fedora-extras-commits at redhat.com Sun Mar 26 18:52:58 2006 From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw)) Date: Sun, 26 Mar 2006 13:52:58 -0500 Subject: extras-buildsys ChangeLog,1.180,1.181 Message-ID: <200603261853.k2QIrSnW010780@cvs-int.fedora.redhat.com> Author: dcbw Update of /cvs/fedora/extras-buildsys In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10743 Modified Files: ChangeLog Log Message: 2006-03-26 Dan Williams * common/HTTPServer.py - Add ability to process HTTP POST requests, mostly for file uploads Index: ChangeLog =================================================================== RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v retrieving revision 1.180 retrieving revision 1.181 diff -u -r1.180 -r1.181 --- ChangeLog 24 Mar 2006 19:13:40 -0000 1.180 +++ ChangeLog 26 Mar 2006 18:52:50 -0000 1.181 @@ -1,3 +1,9 @@ +2006-03-26 Dan Williams + + * common/HTTPServer.py + - Add ability to process HTTP POST requests, mostly for + file uploads + 2006-03-24 Dan Williams * server/DBManager.py From fedora-extras-commits at redhat.com Sun Mar 26 21:49:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Sun, 26 Mar 2006 16:49:33 -0500 Subject: rpms/audacity/FC-5 audacity-1.3.0b-gcc41.patch, NONE, 1.1 audacity-1.3.0b-install.patch, NONE, 1.1 audacity-1.3.0b-lsrver.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 audacity.spec, 1.13, 1.14 sources, 1.5, 1.6 Message-ID: <200603262150.k2QLo5LD017438@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/audacity/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17363 Modified Files: .cvsignore audacity.spec sources Added Files: audacity-1.3.0b-gcc41.patch audacity-1.3.0b-install.patch audacity-1.3.0b-lsrver.patch Log Message: new version 1.3.0beta audacity-1.3.0b-gcc41.patch: --- NEW FILE audacity-1.3.0b-gcc41.patch --- --- audacity-src-1.3.0b-beta/lib-src/soundtouch/include/SoundTouch.h.gcc41 2006-03-26 22:23:42.000000000 +0200 +++ audacity-src-1.3.0b-beta/lib-src/soundtouch/include/SoundTouch.h 2006-03-26 22:24:01.000000000 +0200 @@ -146,7 +146,7 @@ static const char *getVersionString(); /// Get SoundTouch library version Id - static uint SoundTouch::getVersionId(); + static uint getVersionId(); /// Sets new rate control value. Normal rate = 1.0, smaller values /// represent slower rate, larger faster rates. audacity-1.3.0b-install.patch: --- NEW FILE audacity-1.3.0b-install.patch --- --- audacity-src-1.3.0b-beta/locale/Makefile.in.install 2006-03-26 23:03:18.000000000 +0200 +++ audacity-src-1.3.0b-beta/locale/Makefile.in 2006-03-26 23:03:34.000000000 +0200 @@ -17,7 +17,7 @@ INSTALL=@INSTALL@ AUDACITY_NAME=@AUDACITY_NAME@ ifdef DESTDIR - INSTALL_PATH=$(top_srcdir)/$(DESTDIR) + INSTALL_PATH=$(DESTDIR) else INSTALL_PATH= endif audacity-1.3.0b-lsrver.patch: --- NEW FILE audacity-1.3.0b-lsrver.patch --- --- audacity-src-1.3.0b-beta/configure.lsrver 2006-03-26 23:00:25.000000000 +0200 +++ audacity-src-1.3.0b-beta/configure 2006-03-26 23:01:10.000000000 +0200 @@ -5103,23 +5103,23 @@ else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo "$as_me:$LINENO: checking for samplerate >= 0.15.0" >&5 -echo $ECHO_N "checking for samplerate >= 0.15.0... $ECHO_C" >&6 + echo "$as_me:$LINENO: checking for samplerate >= 0.1.2" >&5 +echo $ECHO_N "checking for samplerate >= 0.1.2... $ECHO_C" >&6 - if $PKG_CONFIG --exists "samplerate >= 0.15.0" ; then + if $PKG_CONFIG --exists "samplerate >= 0.1.2" ; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 succeeded=yes echo "$as_me:$LINENO: checking SAMPLERATE_CFLAGS" >&5 echo $ECHO_N "checking SAMPLERATE_CFLAGS... $ECHO_C" >&6 - SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.15.0"` + SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate >= 0.1.2"` echo "$as_me:$LINENO: result: $SAMPLERATE_CFLAGS" >&5 echo "${ECHO_T}$SAMPLERATE_CFLAGS" >&6 echo "$as_me:$LINENO: checking SAMPLERATE_LIBS" >&5 echo $ECHO_N "checking SAMPLERATE_LIBS... $ECHO_C" >&6 - SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.15.0"` + SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate >= 0.1.2"` echo "$as_me:$LINENO: result: $SAMPLERATE_LIBS" >&5 echo "${ECHO_T}$SAMPLERATE_LIBS" >&6 else @@ -5127,7 +5127,7 @@ SAMPLERATE_LIBS="" ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. - SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.15.0"` + SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "samplerate >= 0.1.2"` fi Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 17 Mar 2006 23:23:18 -0000 1.3 +++ .cvsignore 26 Mar 2006 21:49:32 -0000 1.4 @@ -1 +1 @@ -audacity-src-1.2.4b.tar.gz +audacity-src-1.3.0b.tar.gz Index: audacity.spec =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/audacity.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- audacity.spec 17 Mar 2006 23:23:18 -0000 1.13 +++ audacity.spec 26 Mar 2006 21:49:32 -0000 1.14 @@ -1,35 +1,44 @@ Name: audacity -Version: 1.2.4 -Release: 0.1.b%{?dist} +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.2.4b.tar.gz +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 +#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 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 +BuildRequires: wxGTK-devel >= 2.6.2 %{?_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 -Requires(postun): desktop-file-utils +#%{?_with_gtk2: BuildRequires: pango-devel} +Requires(post): desktop-file-utils, shared-mime-info +Requires(postun): desktop-file-utils, shared-mime-info # 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 @@ -38,29 +47,47 @@ 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 -%patch1 -p1 -b .aboutdialog -%patch2 -p1 -b .gcc4 -%{?_with_gtk2: %patch3 -p1 -b .missing-pango } +%setup -q -n %{name}-src-%{version}b-beta +#%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 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-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} +#%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 + %install rm -rf ${RPM_BUILD_ROOT} make DESTDIR=${RPM_BUILD_ROOT} install @@ -78,7 +105,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=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 StartupWMClass=Audacity EOF @@ -95,12 +122,17 @@ %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}/* @@ -108,9 +140,14 @@ %{_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 Mar 17 2006 Michael Schwendt - 1.2.4-0.1.b - Update to 1.2.4b (stable release). - Follow upstream recommendation and use the GTK+ 1.x wxGTK. @@ -163,4 +200,3 @@ * Sat Oct 25 2003 Gerard Milmeister - 0:1.2.0-pre2.fdr.1 - First Fedora release - Index: sources =================================================================== RCS file: /cvs/extras/rpms/audacity/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 17 Mar 2006 23:23:18 -0000 1.5 +++ sources 26 Mar 2006 21:49:32 -0000 1.6 @@ -1 +1 @@ -37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz +d1c5a3359ad95eab6ca8b375972c1a91 audacity-src-1.3.0b.tar.gz From fedora-extras-commits at redhat.com Mon Mar 27 00:13:53 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Sun, 26 Mar 2006 19:13:53 -0500 Subject: rpms/barcode/devel barcode.spec,1.6,1.7 Message-ID: <200603270014.k2R0ESOH023735@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/barcode/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23705 Modified Files: barcode.spec Log Message: * Mon Mar 27 2006 Andreas Thienemann 0.9.8-9 - Changed texinfo dependency to texinfo-tex to satisfy #186825 Index: barcode.spec =================================================================== RCS file: /cvs/extras/rpms/barcode/devel/barcode.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- barcode.spec 5 Feb 2006 15:31:21 -0000 1.6 +++ barcode.spec 27 Mar 2006 00:13:51 -0000 1.7 @@ -1,7 +1,7 @@ Summary: generates barcodes from text strings Name: barcode Version: 0.98 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Text Source0: ftp://ftp.gnu.org/gnu/barcode/barcode-0.98.tar.gz @@ -11,7 +11,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(preun): /sbin/install-info Requires(post): /sbin/install-info -BuildRequires: tetex, tetex-dvips, texinfo, ghostscript +BuildRequires: tetex, tetex-dvips, texinfo-tex, ghostscript %description Barcode is meant to solve most needs in barcode creation with a @@ -67,6 +67,9 @@ %{_mandir}/man3/barcode.3.gz %changelog +* Mon Mar 27 2006 Andreas Thienemann 0.9.8-9 +- Changed texinfo dependency to texinfo-tex to satisfy #186825 + * Sun Feb 05 2006 Andreas Thienemann 0.98-8 - Enabled --excludedocs install From fedora-extras-commits at redhat.com Wed Mar 29 19:25:23 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:25:23 -0700 Subject: rpms/dejavu-fonts import.log,1.41,1.42 Message-ID: <200603291925.k2TJPPnQ018500@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18465 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4.1-1.fc6 on branch devel from dejavu-fonts-2.4.1-1.fc6.src.rpm 2.4.1 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- import.log 22 Mar 2006 23:31:03 -0000 1.41 +++ import.log 29 Mar 2006 19:25:22 -0000 1.42 @@ -38,3 +38,4 @@ dejavu-fonts-2_4-1_fc6:HEAD:dejavu-fonts-2.4-1.fc6.src.rpm:1143068995 dejavu-fonts-2_4-1_fc4:FC-4:dejavu-fonts-2.4-1.fc4.src.rpm:1143069423 dejavu-fonts-2_4-1_fc5:FC-5:dejavu-fonts-2.4-1.fc5.src.rpm:1143070240 +dejavu-fonts-2_4_1-1_fc6:HEAD:dejavu-fonts-2.4.1-1.fc6.src.rpm:1143660306 From fedora-extras-commits at redhat.com Wed Mar 29 19:25:23 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:25:23 -0700 Subject: rpms/dejavu-fonts/devel .cvsignore, 1.11, 1.12 dejavu-fonts.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200603291925.k2TJPP6k018506@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18465/devel Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4.1-1.fc6 on branch devel from dejavu-fonts-2.4.1-1.fc6.src.rpm 2.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 22 Mar 2006 23:10:27 -0000 1.11 +++ .cvsignore 29 Mar 2006 19:25:23 -0000 1.12 @@ -1 +1 @@ -dejavu-sfd-2.4.tar.gz +dejavu-sfd-2.4.1.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dejavu-fonts.spec 22 Mar 2006 23:10:27 -0000 1.17 +++ dejavu-fonts.spec 29 Mar 2006 19:25:23 -0000 1.18 @@ -9,7 +9,7 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.4 +Version: 2.4.1 Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -161,6 +161,9 @@ %changelog +* Wed Mar 29 2006 Nicolas Mailhot - 2.4.1-1 +- 2.4.1 (workaround pango problems) + * Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 - 2.4 A big thanks to Stepan Roh for getting the project there - split out experimental typefaces Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 22 Mar 2006 23:10:27 -0000 1.11 +++ sources 29 Mar 2006 19:25:23 -0000 1.12 @@ -1 +1 @@ -9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz +ea7ee1cd16880a8ce5b3e70d97c41fc8 dejavu-sfd-2.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:30:47 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:30:47 -0700 Subject: rpms/dejavu-fonts import.log,1.42,1.43 Message-ID: <200603291930.k2TJUn09018664@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18631 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4.1-1.fc5 on branch FC-5 from dejavu-fonts-2.4.1-1.fc5.src.rpm 2.4.1 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- import.log 29 Mar 2006 19:25:22 -0000 1.42 +++ import.log 29 Mar 2006 19:30:47 -0000 1.43 @@ -39,3 +39,4 @@ dejavu-fonts-2_4-1_fc4:FC-4:dejavu-fonts-2.4-1.fc4.src.rpm:1143069423 dejavu-fonts-2_4-1_fc5:FC-5:dejavu-fonts-2.4-1.fc5.src.rpm:1143070240 dejavu-fonts-2_4_1-1_fc6:HEAD:dejavu-fonts-2.4.1-1.fc6.src.rpm:1143660306 +dejavu-fonts-2_4_1-1_fc5:FC-5:dejavu-fonts-2.4.1-1.fc5.src.rpm:1143660631 From fedora-extras-commits at redhat.com Wed Mar 29 19:30:48 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:30:48 -0700 Subject: rpms/dejavu-fonts/FC-5 .cvsignore, 1.11, 1.12 dejavu-fonts.spec, 1.17, 1.18 sources, 1.11, 1.12 Message-ID: <200603291930.k2TJUoQ5018670@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18631/FC-5 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4.1-1.fc5 on branch FC-5 from dejavu-fonts-2.4.1-1.fc5.src.rpm 2.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 22 Mar 2006 23:31:11 -0000 1.11 +++ .cvsignore 29 Mar 2006 19:30:48 -0000 1.12 @@ -1 +1 @@ -dejavu-sfd-2.4.tar.gz +dejavu-sfd-2.4.1.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dejavu-fonts.spec 22 Mar 2006 23:31:11 -0000 1.17 +++ dejavu-fonts.spec 29 Mar 2006 19:30:48 -0000 1.18 @@ -9,7 +9,7 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.4 +Version: 2.4.1 Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -161,6 +161,9 @@ %changelog +* Wed Mar 29 2006 Nicolas Mailhot - 2.4.1-1 +- 2.4.1 (workaround pango problems) + * Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 - 2.4 A big thanks to Stepan Roh for getting the project there - split out experimental typefaces Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 22 Mar 2006 23:31:11 -0000 1.11 +++ sources 29 Mar 2006 19:30:48 -0000 1.12 @@ -1 +1 @@ -9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz +ea7ee1cd16880a8ce5b3e70d97c41fc8 dejavu-sfd-2.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:34:05 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Wed, 29 Mar 2006 12:34:05 -0700 Subject: rpms/cogito/devel .cvsignore, 1.7, 1.8 cogito.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200603291934.k2TJY7kb018767@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18746 Modified Files: .cvsignore cogito.spec sources Log Message: Update cogito to 0.17.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Feb 2006 18:15:48 -0000 1.7 +++ .cvsignore 29 Mar 2006 19:34:04 -0000 1.8 @@ -1 +1 @@ -cogito-0.17.tar.gz +cogito-0.17.1.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cogito.spec 28 Feb 2006 18:15:48 -0000 1.9 +++ cogito.spec 29 Mar 2006 19:34:04 -0000 1.10 @@ -1,5 +1,5 @@ Name: cogito -Version: 0.17 +Version: 0.17.1 Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL @@ -44,6 +44,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Tue Mar 28 2006 Chris Wright 0.17.1-1 +- 0.17.1 + * Tue Feb 28 2006 Chris Wright 0.17-1 - 0.17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Feb 2006 18:15:48 -0000 1.7 +++ sources 29 Mar 2006 19:34:04 -0000 1.8 @@ -1 +1 @@ -549a1720f896bcf1da16b581f1e4cc33 cogito-0.17.tar.gz +2c79629440ab0b652ebfcc1d4bae0122 cogito-0.17.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:35:41 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:35:41 -0700 Subject: rpms/dejavu-fonts import.log,1.43,1.44 Message-ID: <200603291935.k2TJZhbF018906@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18868 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4.1-1.fc4 on branch FC-4 from dejavu-fonts-2.4.1-1.fc4.src.rpm 2.4.1 Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- import.log 29 Mar 2006 19:30:47 -0000 1.43 +++ import.log 29 Mar 2006 19:35:41 -0000 1.44 @@ -40,3 +40,4 @@ dejavu-fonts-2_4-1_fc5:FC-5:dejavu-fonts-2.4-1.fc5.src.rpm:1143070240 dejavu-fonts-2_4_1-1_fc6:HEAD:dejavu-fonts-2.4.1-1.fc6.src.rpm:1143660306 dejavu-fonts-2_4_1-1_fc5:FC-5:dejavu-fonts-2.4.1-1.fc5.src.rpm:1143660631 +dejavu-fonts-2_4_1-1_fc4:FC-4:dejavu-fonts-2.4.1-1.fc4.src.rpm:1143660926 From fedora-extras-commits at redhat.com Wed Mar 29 19:35:42 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Wed, 29 Mar 2006 12:35:42 -0700 Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.11, 1.12 dejavu-fonts.spec, 1.12, 1.13 sources, 1.11, 1.12 Message-ID: <200603291935.k2TJZirY018912@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18868/FC-4 Modified Files: .cvsignore dejavu-fonts.spec sources Log Message: auto-import dejavu-fonts-2.4.1-1.fc4 on branch FC-4 from dejavu-fonts-2.4.1-1.fc4.src.rpm 2.4.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 22 Mar 2006 23:17:37 -0000 1.11 +++ .cvsignore 29 Mar 2006 19:35:42 -0000 1.12 @@ -1 +1 @@ -dejavu-sfd-2.4.tar.gz +dejavu-sfd-2.4.1.tar.gz Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- dejavu-fonts.spec 22 Mar 2006 23:17:37 -0000 1.12 +++ dejavu-fonts.spec 29 Mar 2006 19:35:42 -0000 1.13 @@ -8,7 +8,7 @@ %define UnicodeData %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt Name: dejavu-fonts -Version: 2.4 +Version: 2.4.1 Release: 1%{?dist} Summary: DejaVu fonts Group: User Interface/X @@ -127,6 +127,9 @@ %changelog +* Wed Mar 29 2006 Nicolas Mailhot - 2.4.1-1 +- 2.4.1 (workaround pango problems) + * Wed Mar 22 2006 Nicolas Mailhot - 2.4-1 - 2.4 A big thanks to Stepan Roh for getting the project there - split out experimental typefaces Index: sources =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 22 Mar 2006 23:17:37 -0000 1.11 +++ sources 29 Mar 2006 19:35:42 -0000 1.12 @@ -1 +1 @@ -9cbf232d9b8697172aa3faa81807676b dejavu-sfd-2.4.tar.gz +ea7ee1cd16880a8ce5b3e70d97c41fc8 dejavu-sfd-2.4.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:35:49 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Wed, 29 Mar 2006 12:35:49 -0700 Subject: rpms/cogito/FC-5 .cvsignore, 1.7, 1.8 cogito.spec, 1.9, 1.10 sources, 1.7, 1.8 Message-ID: <200603291935.k2TJZpqP018937@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18914 Modified Files: .cvsignore cogito.spec sources Log Message: Update cogito to 0.17.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-5/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Feb 2006 18:15:48 -0000 1.7 +++ .cvsignore 29 Mar 2006 19:35:49 -0000 1.8 @@ -1 +1 @@ -cogito-0.17.tar.gz +cogito-0.17.1.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-5/cogito.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cogito.spec 28 Feb 2006 18:15:48 -0000 1.9 +++ cogito.spec 29 Mar 2006 19:35:49 -0000 1.10 @@ -1,5 +1,5 @@ Name: cogito -Version: 0.17 +Version: 0.17.1 Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL @@ -44,6 +44,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Tue Mar 28 2006 Chris Wright 0.17.1-1 +- 0.17.1 + * Tue Feb 28 2006 Chris Wright 0.17-1 - 0.17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-5/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Feb 2006 18:15:48 -0000 1.7 +++ sources 29 Mar 2006 19:35:49 -0000 1.8 @@ -1 +1 @@ -549a1720f896bcf1da16b581f1e4cc33 cogito-0.17.tar.gz +2c79629440ab0b652ebfcc1d4bae0122 cogito-0.17.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:36:46 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Wed, 29 Mar 2006 12:36:46 -0700 Subject: rpms/cogito/FC-4 .cvsignore, 1.7, 1.8 cogito.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <200603291936.k2TJamMV019046@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19025 Modified Files: .cvsignore cogito.spec sources Log Message: Update cogito to 0.17.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Feb 2006 18:20:22 -0000 1.7 +++ .cvsignore 29 Mar 2006 19:36:46 -0000 1.8 @@ -1 +1 @@ -cogito-0.17.tar.gz +cogito-0.17.1.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cogito.spec 28 Feb 2006 18:20:22 -0000 1.8 +++ cogito.spec 29 Mar 2006 19:36:46 -0000 1.9 @@ -1,5 +1,5 @@ Name: cogito -Version: 0.17 +Version: 0.17.1 Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL @@ -44,6 +44,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Tue Mar 28 2006 Chris Wright 0.17.1-1 +- 0.17.1 + * Tue Feb 28 2006 Chris Wright 0.17-1 - 0.17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Feb 2006 18:20:22 -0000 1.7 +++ sources 29 Mar 2006 19:36:46 -0000 1.8 @@ -1 +1 @@ -549a1720f896bcf1da16b581f1e4cc33 cogito-0.17.tar.gz +2c79629440ab0b652ebfcc1d4bae0122 cogito-0.17.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:37:52 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Wed, 29 Mar 2006 12:37:52 -0700 Subject: rpms/cogito/FC-3 .cvsignore, 1.7, 1.8 cogito.spec, 1.8, 1.9 sources, 1.7, 1.8 Message-ID: <200603291937.k2TJbsOY019158@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19136 Modified Files: .cvsignore cogito.spec sources Log Message: Update cogito to 0.17.1 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 28 Feb 2006 18:21:50 -0000 1.7 +++ .cvsignore 29 Mar 2006 19:37:52 -0000 1.8 @@ -1 +1 @@ -cogito-0.17.tar.gz +cogito-0.17.1.tar.gz Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cogito.spec 28 Feb 2006 18:21:50 -0000 1.8 +++ cogito.spec 29 Mar 2006 19:37:52 -0000 1.9 @@ -1,5 +1,5 @@ Name: cogito -Version: 0.17 +Version: 0.17.1 Release: 1%{?dist} Summary: The Cogito Version Control System License: GPL @@ -44,6 +44,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Tue Mar 28 2006 Chris Wright 0.17.1-1 +- 0.17.1 + * Tue Feb 28 2006 Chris Wright 0.17-1 - 0.17 Index: sources =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 28 Feb 2006 18:21:50 -0000 1.7 +++ sources 29 Mar 2006 19:37:52 -0000 1.8 @@ -1 +1 @@ -549a1720f896bcf1da16b581f1e4cc33 cogito-0.17.tar.gz +2c79629440ab0b652ebfcc1d4bae0122 cogito-0.17.1.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:45:02 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 29 Mar 2006 12:45:02 -0700 Subject: rpms/njam import.log,1.1,1.2 Message-ID: <200603291945.k2TJj4LK019382@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/njam In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19343 Modified Files: import.log Log Message: auto-import njam-1.25-2 on branch devel from njam-1.25-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/njam/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Mar 2006 18:20:22 -0000 1.1 +++ import.log 29 Mar 2006 19:45:01 -0000 1.2 @@ -0,0 +1 @@ +njam-1_25-2:HEAD:njam-1.25-2.src.rpm:1143661308 From fedora-extras-commits at redhat.com Wed Mar 29 19:45:02 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 29 Mar 2006 12:45:02 -0700 Subject: rpms/njam/devel njam-1.25-drop-setgid.patch, NONE, 1.1 njam-1.25-html.patch, NONE, 1.1 njam.6, NONE, 1.1 njam.desktop, NONE, 1.1 njam.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603291945.k2TJj4x8019392@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/njam/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19343/devel Modified Files: .cvsignore sources Added Files: njam-1.25-drop-setgid.patch njam-1.25-html.patch njam.6 njam.desktop njam.spec Log Message: auto-import njam-1.25-2 on branch devel from njam-1.25-2.src.rpm njam-1.25-drop-setgid.patch: --- NEW FILE njam-1.25-drop-setgid.patch --- diff -ur njam-1.25-src.orig/src/njam.cpp njam-1.25-src/src/njam.cpp --- njam-1.25-src.orig/src/njam.cpp 2005-12-13 12:56:43.000000000 +0100 +++ njam-1.25-src/src/njam.cpp 2006-03-26 20:29:22.000000000 +0200 @@ -32,6 +32,8 @@ -----------------------------------------------------------------------------*/ // needed for chdir #ifdef __linux__ +/* this must be done before the first include of unistd.h for setresgid */ +#define _GNU_SOURCE #include #include #endif @@ -47,12 +49,24 @@ #include "njamfont.h" #include "njammap.h" #include "njam.h" + +static FILE* highscore_fp; + //----------------------------------------------------------------------------- int main(int argc, char *argv[]) { bool Fullscreen = true; bool SWSurface = true; bool UseDGA = false; + gid_t realgid; + + highscore_fp = fopen("/var/lib/games/njam.hs", "r+"); + realgid = getgid(); + if (setresgid(-1, realgid, realgid) != 0) { + perror("Could not drop setgid privileges. Aborting."); + return 1; + } + if (argc > 1) { for (int i=1; i Njam is a full-featured cross-platform pacman-like game written in C++ using SDL library - HOME  >>
--- NEW FILE njam.6 --- .\" $Header: /aolnet/dev/src/CVS/sgml/docbook-to-man/cmd/docbook-to-man.sh,v 1.1.1.1 1998/11/13 21:31:59 db3l Exp $ .\" .\" transcript compatibility for postscript use. .\" .\" synopsis: .P! .\" .de P! .fl \!!1 setgray .fl \\&.\" .fl \!!0 setgray .fl \" force out current output buffer \!!save /psv exch def currentpoint translate 0 0 moveto \!!/showpage{}def .fl \" prolog .sy sed \-e 's/^/!/' \\$1\" bring in postscript file \!!psv restore . .de pF .ie \\*(f1 .ds f1 \\n(.f .el .ie \\*(f2 .ds f2 \\n(.f .el .ie \\*(f3 .ds f3 \\n(.f .el .ie \\*(f4 .ds f4 \\n(.f .el .tm ? font overflow .ft \\$1 .. .de fP .ie !\\*(f4 \{\ . ft \\*(f4 . ds f4\" ' br \} .el .ie !\\*(f3 \{\ . ft \\*(f3 . ds f3\" ' br \} .el .ie !\\*(f2 \{\ . ft \\*(f2 . ds f2\" ' br \} .el .ie !\\*(f1 \{\ . ft \\*(f1 . ds f1\" ' br \} .el .tm ? font underflow .. .ds f1\" .ds f2\" .ds f3\" .ds f4\" '\" t .ta 8n 16n 24n 32n 40n 48n 56n 64n 72n .TH "NJAM" "6" .SH "NAME" njam \(em maze-game, eat all the cookies while avoiding the badguys .SH "SYNOPSIS" .PP \fBnjam\fR [-w] [-h] [-d] .SH "DESCRIPTION" .PP \fBnjam\fR is a fast-paced maze-game where you must eat all the cookies while avoiding the badguys. Special cookies give you the power to freeze or eat the bad guys. The game features single and multiplayer modes, network play, duelling and cooperative games, great music and sound effects, customizable level skins, many different levels and an integrated level editor. .SH "OPTIONS" .PP The options are; .IP "\fB\-w\fP " 10 Start in windowed mode (as opposed to fullscreen) .IP "\fB\-h\fP " 10 use hardware surfaces (faster, doesn't work well with all graphic cards .IP "\fB\-d\fP " 10 use DGA driver on Linux, (must faster, but must run as root) .SH "AUTHOR" .IP "Application:" 10 M.Babuskov .PP This manual page was written by Anibal Avelar avelar at gmail.com for the Debian Project based on the manual wrote by Stephan Hermann sh at sourcecode.de for the \fBUbuntu\fP system. It has been modified for \fBFedora Extras\fP by Hans de Goede j.w.r.degoede at hhs.nl. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or (at your option) any later version published by the Free Software Foundation. .\" created by instant / docbook-to-man, Sun 20 Nov 2005, 20:58 --- NEW FILE njam.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Njam GenericName=Maze-game where you must eat all the dots Comment=Eat all the dots while avoiding the badguys Exec=njam Icon=njam.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; Version=1.25 --- NEW FILE njam.spec --- Name: njam Version: 1.25 Release: 2%{?dist} Summary: Maze-game, eat all the cookies while avoiding the badguys Group: Amusements/Games License: GPL URL: http://njam.sourceforge.net/ Source0: http://download.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz Source1: njam.6 Source2: njam.desktop Patch0: njam-1.25-drop-setgid.patch Patch1: njam-1.25-html.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel SDL_mixer-devel SDL_image-devel SDL_net-devel BuildRequires: ImageMagick desktop-file-utils %description Njam is a fast-paced maze-game where you must eat all the cookies while avoiding the badguys. Special cookies give you the power to freeze or eat the bad guys. The game features single and multiplayer modes, network play, duelling and cooperative games, great music and sound effects, customizable level skins, many different levels and an integrated level editor. %prep %setup -q -n %{name}-%{version}-src %patch0 -p1 -z .setgid %patch1 -p1 %build %configure make %{?_smp_mflags} convert -transparent black njamicon.ico %{name}.png %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # make install installs the docs under /usr/share/njam. We want them in %doc. rm $RPM_BUILD_ROOT%{_datadir}/%{name}/README rm $RPM_BUILD_ROOT%{_datadir}/%{name}/levels/readme.txt rm -fr $RPM_BUILD_ROOT%{_datadir}/%{name}/html # clean up cruft rm $RPM_BUILD_ROOT%{_datadir}/%{name}/%{name}.* rm $RPM_BUILD_ROOT%{_datadir}/%{name}/njamicon.ico # we want the hiscore in /var/lib/games mkdir -p $RPM_BUILD_ROOT%{_var}/lib/games mv $RPM_BUILD_ROOT%{_datadir}/%{name}/hiscore.dat \ $RPM_BUILD_ROOT%{_var}/lib/games/%{name}.hs # add the manpage (courtesy of Debian) mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6 install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6 # below is the desktop file and icon stuff. mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install --vendor fedora \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/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 NEWS README TODO levels/readme.txt html %attr(2755,root,games) %{_bindir}/%{name} %{_datadir}/%{name} %{_mandir}/man6/%{name}.6.gz %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %config(noreplace) %attr (0664,root,games) %{_var}/lib/games/%{name}.hs %changelog * Tue Mar 28 2006 Hans de Goede 1.25-2 - Cleaned up description in spec and man using the cleaner description provided in bz 186813 - Use cookies instead of dots in summary (bz 186813) - Put manpage in man6 (bz 186813) - fix broken home link in doc-editor.html (bz 186813) * Wed Mar 22 2006 Hans de Goede 1.25-1 - initial Fedora Extras package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/njam/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Mar 2006 18:20:22 -0000 1.1 +++ .cvsignore 29 Mar 2006 19:45:02 -0000 1.2 @@ -0,0 +1 @@ +njam-1.25-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/njam/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Mar 2006 18:20:22 -0000 1.1 +++ sources 29 Mar 2006 19:45:02 -0000 1.2 @@ -0,0 +1 @@ +231fda022d309e1ef4a0d993ca693462 njam-1.25-src.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 19:48:06 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 29 Mar 2006 12:48:06 -0700 Subject: rpms/openoffice.org-dict-cs_CZ import.log,1.1,1.2 Message-ID: <200603291948.k2TJm9IG019537@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/openoffice.org-dict-cs_CZ In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19504 Modified Files: import.log Log Message: auto-import openoffice.org-dict-cs_CZ-20060303-1 on branch devel from openoffice.org-dict-cs_CZ-20060303-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/openoffice.org-dict-cs_CZ/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Mar 2006 08:48:09 -0000 1.1 +++ import.log 29 Mar 2006 19:48:06 -0000 1.2 @@ -0,0 +1 @@ +openoffice_org-dict-cs_CZ-20060303-1:HEAD:openoffice.org-dict-cs_CZ-20060303-1.src.rpm:1143661678 From fedora-extras-commits at redhat.com Wed Mar 29 19:48:07 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 29 Mar 2006 12:48:07 -0700 Subject: rpms/openoffice.org-dict-cs_CZ/devel openoffice.org-dict-cs_CZ.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603291948.k2TJm9ID019542@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/openoffice.org-dict-cs_CZ/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19504/devel Modified Files: .cvsignore sources Added Files: openoffice.org-dict-cs_CZ.spec Log Message: auto-import openoffice.org-dict-cs_CZ-20060303-1 on branch devel from openoffice.org-dict-cs_CZ-20060303-1.src.rpm --- NEW FILE openoffice.org-dict-cs_CZ.spec --- Name: openoffice.org-dict-cs_CZ Version: 20060303 Release: 1%{?dist} Summary: Czech spellchecker and hyphenation dictionaries for OpenOffice.org # Based on older packages by Dag Wieers and Steve Ratcliffe License: GPL Group: Applications/Productivity URL: ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/Czech/spell_checking/ Source0: openoffice.org-dict-cs_CZ.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: openoffice.org-core %define instdir %{_libdir}/openoffice.org2.0 %description This package contains the czech spellchecker and hyphenation dictionaries for the Openoffice.org application suite. %prep %setup -q -n %{name} %build %install %{__rm} -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{instdir}/share/dict/ooo install -m 644 *.aff *.dic $RPM_BUILD_ROOT%{instdir}/share/dict/ooo %clean %{__rm} -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %doc README*.txt %{instdir}/share/dict/ooo/* %triggerin -- openoffice.org-core grep -q '^HYPH cs CZ hyph_cs_CZ' %{instdir}/share/dict/ooo/dictionary.lst || \ echo 'HYPH cs CZ hyph_cs_CZ' >> %{instdir}/share/dict/ooo/dictionary.lst grep -q '^DICT cs CZ cs_CZ' %{instdir}/share/dict/ooo/dictionary.lst || \ echo 'DICT cs CZ cs_CZ' >> %{instdir}/share/dict/ooo/dictionary.lst %changelog * Tue Mar 21 2005 Tomas Mraz - 20060303-1 - Initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/openoffice.org-dict-cs_CZ/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Mar 2006 08:48:10 -0000 1.1 +++ .cvsignore 29 Mar 2006 19:48:07 -0000 1.2 @@ -0,0 +1 @@ +openoffice.org-dict-cs_CZ.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/openoffice.org-dict-cs_CZ/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Mar 2006 08:48:10 -0000 1.1 +++ sources 29 Mar 2006 19:48:07 -0000 1.2 @@ -0,0 +1 @@ +b23377236132316b1c23c01ab8dc38a7 openoffice.org-dict-cs_CZ.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 20:18:46 2006 From: fedora-extras-commits at redhat.com (Patrick Barnes (nman64)) Date: Wed, 29 Mar 2006 13:18:46 -0700 Subject: CVSROOT avail,1.26,1.27 Message-ID: <200603292018.k2TKIk5q021883@cvs-int.fedora.redhat.com> Author: nman64 Update of /cvs/fedora/CVSROOT In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21865 Modified Files: avail Log Message: Expanding access for eitch for mirror management Index: avail =================================================================== RCS file: /cvs/fedora/CVSROOT/avail,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- avail 29 Mar 2006 18:53:24 -0000 1.26 +++ avail 29 Mar 2006 20:18:44 -0000 1.27 @@ -38,8 +38,8 @@ avail | riel | web/html/docs/virtualisation avail | riel | web/html/About/Projects/virtualisation avail | harald | web/html/docs/udev -avail | eitch | web/html/download/mirrors -avail | eitch | web/html/Download/mirrors +avail | eitch | web/html/download +avail | eitch | web/html/Download unavail | | fedora-security avail | mjc,bressers,jorton,notting,sopwith,katzj | fedora-security From fedora-extras-commits at redhat.com Wed Mar 29 20:24:15 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 29 Mar 2006 13:24:15 -0700 Subject: rpms/openoffice.org-dict-cs_CZ/devel openoffice.org-dict-cs_CZ.spec, 1.1, 1.2 Message-ID: <200603292024.k2TKOHP5021990@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/rpms/openoffice.org-dict-cs_CZ/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21969 Modified Files: openoffice.org-dict-cs_CZ.spec Log Message: - removed leftover comment Index: openoffice.org-dict-cs_CZ.spec =================================================================== RCS file: /cvs/extras/rpms/openoffice.org-dict-cs_CZ/devel/openoffice.org-dict-cs_CZ.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- openoffice.org-dict-cs_CZ.spec 29 Mar 2006 19:48:07 -0000 1.1 +++ openoffice.org-dict-cs_CZ.spec 29 Mar 2006 20:24:15 -0000 1.2 @@ -2,7 +2,6 @@ Version: 20060303 Release: 1%{?dist} Summary: Czech spellchecker and hyphenation dictionaries for OpenOffice.org -# Based on older packages by Dag Wieers and Steve Ratcliffe License: GPL Group: Applications/Productivity URL: ftp://ftp.linux.cz/pub/localization/OpenOffice.org/devel/Czech/spell_checking/ From fedora-extras-commits at redhat.com Wed Mar 29 20:33:40 2006 From: fedora-extras-commits at redhat.com (Tomas Mraz (tmraz)) Date: Wed, 29 Mar 2006 13:33:40 -0700 Subject: owners owners.list,1.775,1.776 Message-ID: <200603292033.k2TKXgSN022186@cvs-int.fedora.redhat.com> Author: tmraz Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22169 Modified Files: owners.list Log Message: - added openoffice.org-dict-cs_CZ Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.775 retrieving revision 1.776 diff -u -r1.775 -r1.776 --- owners.list 29 Mar 2006 04:32:10 -0000 1.775 +++ owners.list 29 Mar 2006 20:33:40 -0000 1.776 @@ -781,6 +781,7 @@ 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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias 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|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|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|opensc|SmartCard library and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 29 20:39:43 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 29 Mar 2006 13:39:43 -0700 Subject: owners owners.list,1.776,1.777 Message-ID: <200603292039.k2TKdjjk022487@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22469 Modified Files: owners.list Log Message: Add cmake Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.776 retrieving revision 1.777 diff -u -r1.776 -r1.777 --- owners.list 29 Mar 2006 20:33:40 -0000 1.776 +++ owners.list 29 Mar 2006 20:39:43 -0000 1.777 @@ -129,6 +129,7 @@ Fedora Extras|clearsilver|HTML template system|fedora at soeterbroek.com|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|cmake|Cross-platform make system|orion at cora.nwra.com|extras-qa at fedoraproject.org| Fedora Extras|cmucl|CMU Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|Coin2|A high-level 3D visualization library|rc040203 at freenet.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 29 20:42:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Wed, 29 Mar 2006 13:42:33 -0700 Subject: owners owners.list,1.777,1.778 Message-ID: <200603292042.k2TKgZHY022715@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22698/owners Modified Files: owners.list Log Message: Add njam Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.777 retrieving revision 1.778 diff -u -r1.777 -r1.778 --- owners.list 29 Mar 2006 20:39:43 -0000 1.777 +++ owners.list 29 Mar 2006 20:42:32 -0000 1.778 @@ -757,6 +757,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|oliver at linux-kernel.at|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|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|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 Mar 29 20:59:01 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Wed, 29 Mar 2006 13:59:01 -0700 Subject: rpms/wxGTK/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 wxGTK.spec, 1.17, 1.18 wxGTK-2.6.2-gcc41stringh.patch, 1.1, NONE wxGTK-2.6.2-intl_cpp.patch, 1.1, NONE wxGTK-2.6.2-socketclosefix.patch, 1.1, NONE Message-ID: <200603292059.k2TKx3tZ022802@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxGTK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22776 Modified Files: .cvsignore sources wxGTK.spec Removed Files: wxGTK-2.6.2-gcc41stringh.patch wxGTK-2.6.2-intl_cpp.patch wxGTK-2.6.2-socketclosefix.patch Log Message: Update to wxGTK 2.6.3; remove patches which are now upstream. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 28 Nov 2005 19:57:40 -0000 1.4 +++ .cvsignore 29 Mar 2006 20:59:01 -0000 1.5 @@ -1 +1 @@ -wxGTK-2.6.2.tar.bz2 +wxGTK-2.6.3.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 28 Nov 2005 19:57:40 -0000 1.4 +++ sources 29 Mar 2006 20:59:01 -0000 1.5 @@ -1 +1 @@ -ba2afe7bd028062c5fff6d5ef3249c67 wxGTK-2.6.2.tar.bz2 +3cd76c3c47913e52a3175dd47239c6ec wxGTK-2.6.3.tar.bz2 Index: wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- wxGTK.spec 13 Feb 2006 19:50:49 -0000 1.17 +++ wxGTK.spec 29 Mar 2006 20:59:01 -0000 1.18 @@ -1,8 +1,12 @@ %define x11libdir %{_prefix}/X11R6/%{_lib} +# Option - build an ODBC subpackage using unixODBC. (This is currently +# broken; see .) +%define withodbc 0 + Name: wxGTK -Version: 2.6.2 -Release: 5%{?dist} +Version: 2.6.3 +Release: 0%{?dist} Summary: GTK2 port of the wxWidgets GUI library # The wxWindows licence is the LGPL with a specific exemption allowing # distribution of derived binaries under any terms. (This will eventually @@ -11,15 +15,15 @@ Group: System Environment/Libraries URL: http://www.wxwidgets.org/ Source0: http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2 -Patch0: wxGTK-2.6.2-intl_cpp.patch -Patch1: wxGTK-2.6.2-socketclosefix.patch -Patch2: wxGTK-2.6.2-gcc41stringh.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel, zlib-devel >= 1.1.4 BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: expat-devel, SDL-devel, libgnomeprintui22-devel BuildRequires: mesa-libGL-devel, mesa-libGLU-devel +%if %{withodbc} +BuildRequires: unixODBC-devel +%endif # all of these are for previous Fedora Extras sub-packages Obsoletes: wxGTK2 < 2.6.2-1 @@ -68,14 +72,20 @@ Provides: wxGTK2-gl = %{version}-%{release} %description gl -OpenGL add-on for the wxWidgets library. +OpenGL (a 3D graphics API) add-on for the wxWidgets library. + +%if %{withodbc} +%package odbc +Summary: ODBC add-on for the wxWidgets library +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +%description odbc +ODBC (a SQL database connectivity API) add-on for the wxWidgets library. +%endif %prep %setup -q -%patch0 -p0 -b .intlcpp -%patch1 -p1 -b .socketclose -%patch2 -p1 -b .gcc41 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure @@ -89,6 +99,9 @@ --x-libraries=%{x11libdir} \ --with-gtk=2 \ --with-opengl \ +%if %{withodbc} + --with-odbc \ +%endif --with-sdl \ --with-gnomeprint \ --enable-shared \ @@ -170,8 +183,31 @@ %defattr(-,root,root,-) %{_libdir}/libwx_gtk2u_gl-*.so.* +%if %{withodbc} +%files odbc +%defattr(-,root,root,-) +%{_libdir}/libwx_gtk2u_odbc-*.so.* +%endif %changelog +* Sat Mar 25 2006 Matthew Miller - 2.6.3-1 +- 2.6.3 final +- remove the locale_install thing -- that was just an issue with using the + release candidate. + +* Tue Mar 21 2006 Matthew Miller - 2.6.3-0.rc2 +- update to 2.6.3-rc2 package +- all patches now upstream -- removing 'em. +- use complete 'wxWidgets' source tarball instead of the wxGTK-subset one, + since that's all there is for the release candidate. I'm operating under + the assumption that we'll have a wxGTK source tarball in the future -- + otherwise, I'm going to eventually have to change the name of this + package again. :) +- add ODBC support via unixODBC as subpackage (see bug #176950) +- wait, no; comment out ODBC support as it doesn't build... +- add explicit make locale_install; apparently not done as part of + the general 'make install' anymore. + * Mon Feb 13 2006 Matthew Miller - 2.6.2-5 - rebuild in preparation for FC5 --- wxGTK-2.6.2-gcc41stringh.patch DELETED --- --- wxGTK-2.6.2-intl_cpp.patch DELETED --- --- wxGTK-2.6.2-socketclosefix.patch DELETED --- From fedora-extras-commits at redhat.com Wed Mar 29 21:42:11 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 29 Mar 2006 14:42:11 -0700 Subject: rpms/ebtables/FC-4 ebtables.spec,1.5,1.6 Message-ID: <200603292142.k2TLgDcS025056@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/FC-4 Modified Files: ebtables.spec Log Message: ebtables gets hung up on -fstack-protector, needs -fPIC Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ebtables.spec 10 Jan 2006 16:03:54 -0000 1.5 +++ ebtables.spec 29 Mar 2006 21:42:11 -0000 1.6 @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.8 -Release: 0.1.%{prever}%{?dist} +Release: 0.3.%{prever}%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -28,7 +28,8 @@ %setup -q -n ebtables-v%{version}-%{prever} %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'` +make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -69,6 +70,12 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.3.rc1 +- use -fPIC + +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.2.rc1 +- broken tagging + * Tue Jan 10 2006 Tom "spot" Callaway 2.0.8-0.1.rc1 - bump to 2.0.8-rc1 From fedora-extras-commits at redhat.com Wed Mar 29 21:42:13 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 29 Mar 2006 14:42:13 -0700 Subject: rpms/ebtables/devel ebtables.spec,1.6,1.7 Message-ID: <200603292142.k2TLgFNQ025064@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/devel Modified Files: ebtables.spec Log Message: ebtables gets hung up on -fstack-protector, needs -fPIC Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ebtables.spec 29 Mar 2006 16:23:55 -0000 1.6 +++ ebtables.spec 29 Mar 2006 21:42:13 -0000 1.7 @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.8 -Release: 0.2.%{prever}%{?dist} +Release: 0.3.%{prever}%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -28,7 +28,8 @@ %setup -q -n ebtables-v%{version}-%{prever} %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'` +make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -69,6 +70,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.3.rc1 +- use -fPIC + * Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.2.rc1 - broken tagging From fedora-extras-commits at redhat.com Wed Mar 29 21:42:12 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 29 Mar 2006 14:42:12 -0700 Subject: rpms/ebtables/FC-5 ebtables.spec,1.6,1.7 Message-ID: <200603292142.k2TLgElo025060@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/FC-5 Modified Files: ebtables.spec Log Message: ebtables gets hung up on -fstack-protector, needs -fPIC Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-5/ebtables.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ebtables.spec 29 Mar 2006 16:23:55 -0000 1.6 +++ ebtables.spec 29 Mar 2006 21:42:12 -0000 1.7 @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.8 -Release: 0.2.%{prever}%{?dist} +Release: 0.3.%{prever}%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -28,7 +28,8 @@ %setup -q -n ebtables-v%{version}-%{prever} %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'` +make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -69,6 +70,9 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.3.rc1 +- use -fPIC + * Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.2.rc1 - broken tagging From fedora-extras-commits at redhat.com Wed Mar 29 21:42:11 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Wed, 29 Mar 2006 14:42:11 -0700 Subject: rpms/ebtables/FC-3 ebtables.spec,1.5,1.6 Message-ID: <200603292142.k2TLghq3025097@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/ebtables/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24991/FC-3 Modified Files: ebtables.spec Log Message: ebtables gets hung up on -fstack-protector, needs -fPIC Index: ebtables.spec =================================================================== RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ebtables.spec 10 Jan 2006 16:03:38 -0000 1.5 +++ ebtables.spec 29 Mar 2006 21:42:10 -0000 1.6 @@ -2,7 +2,7 @@ Name: ebtables Version: 2.0.8 -Release: 0.1.%{prever}%{?dist} +Release: 0.3.%{prever}%{?dist} Summary: Ethernet Bridge frame table administration tool License: GPL Group: System Environment/Base @@ -28,7 +28,8 @@ %setup -q -n ebtables-v%{version}-%{prever} %build -make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" +MY_CFLAGS=`echo $RPM_OPT_FLAGS -fPIC | sed -e 's/-fstack-protector//g'` +make %{?_smp_mflags} CFLAGS="$MY_CFLAGS" %install rm -rf $RPM_BUILD_ROOT @@ -69,6 +70,12 @@ %ghost %{_sysconfdir}/ebtables.broute %changelog +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.3.rc1 +- use -fPIC + +* Wed Mar 29 2006 Tom "spot" Callaway 2.0.8-0.2.rc1 +- broken tagging + * Tue Jan 10 2006 Tom "spot" Callaway 2.0.8-0.1.rc1 - bump to 2.0.8-rc1 From fedora-extras-commits at redhat.com Wed Mar 29 21:43:36 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 29 Mar 2006 14:43:36 -0700 Subject: rpms/otrs/FC-4 otrs.spec,1.1,1.2 Message-ID: <200603292144.k2TLi8ts025288@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25234/FC-4 Modified Files: otrs.spec Log Message: Added Dist tag - mmcgrath Index: otrs.spec =================================================================== RCS file: /cvs/extras/rpms/otrs/FC-4/otrs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otrs.spec 23 Mar 2006 20:12:08 -0000 1.1 +++ otrs.spec 29 Mar 2006 21:43:36 -0000 1.2 @@ -1,7 +1,7 @@ Summary: The Open Ticket Request System Name: otrs Version: 2.0.4 -Release: 3 +Release: 3%{?dist} License: GPL Group: Applications/Internet URL: http://www.otrs.org/ From fedora-extras-commits at redhat.com Wed Mar 29 21:43:37 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 29 Mar 2006 14:43:37 -0700 Subject: rpms/otrs/FC-5 otrs.spec,1.1,1.2 Message-ID: <200603292144.k2TLi9mD025291@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25234/FC-5 Modified Files: otrs.spec Log Message: Added Dist tag - mmcgrath Index: otrs.spec =================================================================== RCS file: /cvs/extras/rpms/otrs/FC-5/otrs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otrs.spec 23 Mar 2006 20:12:08 -0000 1.1 +++ otrs.spec 29 Mar 2006 21:43:37 -0000 1.2 @@ -1,7 +1,7 @@ Summary: The Open Ticket Request System Name: otrs Version: 2.0.4 -Release: 3 +Release: 3%{?dist} License: GPL Group: Applications/Internet URL: http://www.otrs.org/ From fedora-extras-commits at redhat.com Wed Mar 29 21:43:38 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Wed, 29 Mar 2006 14:43:38 -0700 Subject: rpms/otrs/devel otrs.spec,1.1,1.2 Message-ID: <200603292144.k2TLiAad025294@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/otrs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25234/devel Modified Files: otrs.spec Log Message: Added Dist tag - mmcgrath Index: otrs.spec =================================================================== RCS file: /cvs/extras/rpms/otrs/devel/otrs.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- otrs.spec 23 Mar 2006 20:12:08 -0000 1.1 +++ otrs.spec 29 Mar 2006 21:43:37 -0000 1.2 @@ -1,7 +1,7 @@ Summary: The Open Ticket Request System Name: otrs Version: 2.0.4 -Release: 3 +Release: 3%{?dist} License: GPL Group: Applications/Internet URL: http://www.otrs.org/ From fedora-extras-commits at redhat.com Wed Mar 29 21:48:57 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 29 Mar 2006 14:48:57 -0700 Subject: rpms/ser import.log,1.1,1.2 Message-ID: <200603292148.k2TLmx0p025424@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25393 Modified Files: import.log Log Message: auto-import ser-0.9.6-2 on branch devel from ser-0.9.6-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ser/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Mar 2006 11:04:58 -0000 1.1 +++ import.log 29 Mar 2006 21:48:57 -0000 1.2 @@ -0,0 +1 @@ +ser-0_9_6-2:HEAD:ser-0.9.6-2.src.rpm:1143668924 From fedora-extras-commits at redhat.com Wed Mar 29 21:48:58 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 29 Mar 2006 14:48:58 -0700 Subject: rpms/ser/devel .cvsignore,1.1,1.2 Message-ID: <200603292149.k2TLn0vf025428@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25393/devel Modified Files: .cvsignore Log Message: auto-import ser-0.9.6-2 on branch devel from ser-0.9.6-2.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ser/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Mar 2006 11:04:58 -0000 1.1 +++ .cvsignore 29 Mar 2006 21:48:58 -0000 1.2 @@ -0,0 +1,2 @@ +ser-0.9.6_src.tar.gz +serweb-0.9.4.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 21:57:47 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 29 Mar 2006 14:57:47 -0700 Subject: owners owners.list,1.778,1.779 Message-ID: <200603292157.k2TLvnme025564@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25547 Modified Files: owners.list Log Message: Added ser Changed ownership of libsndfile #180324 Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.778 retrieving revision 1.779 diff -u -r1.778 -r1.779 --- owners.list 29 Mar 2006 20:42:32 -0000 1.778 +++ owners.list 29 Mar 2006 21:57:47 -0000 1.779 @@ -623,7 +623,7 @@ Fedora Extras|libsigc++20|The Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|libsigc++|Typesafe Signal Framework for C++|denis at poolshark.org|extras-qa at fedoraproject.org| Fedora Extras|libsigsegv|Handling page faults in user mode|rdieter at math.unl.edu|extras-qa at fedoraproject.org| -Fedora Extras|libsndfile|A library for reading and writing sound files|anvil at livna.org|extras-qa at fedoraproject.org| +Fedora Extras|libsndfile|A library for reading and writing sound files|andreas at bawue.net|extras-qa at fedoraproject.org| 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|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|libsx|Simple X library|pertusus at free.fr|extras-qa at fedoraproject.org| @@ -1307,6 +1307,7 @@ Fedora Extras|SDL_net|SDL portable network library|bdpepple at ameritech.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|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| +Fedora Extras|ser|SIP Express Router|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|robert at marcanoonline.com|extras-qa at fedoraproject.org| Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Wed Mar 29 22:03:36 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Wed, 29 Mar 2006 15:03:36 -0700 Subject: rpms/libsndfile/devel .cvsignore, 1.4, 1.5 libsndfile.spec, 1.10, 1.11 sources, 1.4, 1.5 Message-ID: <200603292203.k2TM3cAP027907@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/libsndfile/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27884 Modified Files: .cvsignore libsndfile.spec sources Log Message: * Thu Mar 30 2006 Andreas Thienemann - 1.0.14-1 - Updated to 1.0.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 16 Mar 2006 18:26:08 -0000 1.4 +++ .cvsignore 29 Mar 2006 22:03:36 -0000 1.5 @@ -1 +1 @@ -libsndfile-1.0.14.tar.gz +libsndfile-1.0.15.tar.gz Index: libsndfile.spec =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/libsndfile.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libsndfile.spec 16 Mar 2006 18:26:08 -0000 1.10 +++ libsndfile.spec 29 Mar 2006 22:03:36 -0000 1.11 @@ -1,6 +1,6 @@ Summary: Library for reading and writing sound files Name: libsndfile -Version: 1.0.14 +Version: 1.0.15 Release: 1%{?dist} License: LGPL Group: System Environment/Libraries @@ -77,6 +77,9 @@ %changelog +* Thu Mar 30 2006 Andreas Thienemann - 1.0.15-1 +- Updated to 1.0.15 + * Thu Mar 16 2006 Dams - 1.0.14-1.fc5 - Updated to 1.0.14 - Dropped patch0 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libsndfile/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 16 Mar 2006 18:26:08 -0000 1.4 +++ sources 29 Mar 2006 22:03:36 -0000 1.5 @@ -1 +1 @@ -3513c2283f4063f57615c5b9b45bf30a libsndfile-1.0.14.tar.gz +4171faabfad0ce550cbe9bf1b065e976 libsndfile-1.0.15.tar.gz From fedora-extras-commits at redhat.com Wed Mar 29 22:15:38 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Wed, 29 Mar 2006 15:15:38 -0700 Subject: fedora-release fedora-core.repo, 1.3, 1.4 fedora-development.repo, 1.4, 1.5 fedora-extras.repo, 1.5, 1.6 fedora-updates-testing.repo, 1.5, 1.6 fedora-updates.repo, 1.8, 1.9 Message-ID: <200603292215.k2TMFcoB027994@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27969 Modified Files: fedora-core.repo fedora-development.repo fedora-extras.repo fedora-updates-testing.repo fedora-updates.repo Log Message: Adding mirror files for debug and source repos. Index: fedora-core.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-core.repo 20 Mar 2006 17:33:14 -0000 1.3 +++ fedora-core.repo 29 Mar 2006 22:15:35 -0000 1.4 @@ -8,14 +8,16 @@ [core-debuginfo] name=Fedora Core $releasever - $basearch - Debug -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/debug/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/debug/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-debug-$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY [core-source] name=Fedora Core $releasever - Source -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/source/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/source/SRPMS/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-source-$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-development.repo 20 Mar 2006 17:33:14 -0000 1.4 +++ fedora-development.repo 29 Mar 2006 22:15:35 -0000 1.5 @@ -32,13 +32,15 @@ [development-debuginfo] name=Fedora Core - Development - Debug -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/debug/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/debug/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide-debug enabled=0 gpgcheck=0 [development-source] name=Fedora Core - Development - Source -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/SRPMS/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide-source enabled=0 gpgcheck=0 Index: fedora-extras.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedora-extras.repo 20 Mar 2006 17:33:14 -0000 1.5 +++ fedora-extras.repo 29 Mar 2006 22:15:35 -0000 1.6 @@ -8,14 +8,16 @@ [extras-debuginfo] name=Fedora Extras $releasever - $basearch - Debug -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/debug/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/debug/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-debug-$releasever enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 [extras-source] name=Fedora Extras $releasever - Source -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/SRPMS/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-source-$releasever enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-updates-testing.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedora-updates-testing.repo 20 Mar 2006 17:33:14 -0000 1.5 +++ fedora-updates-testing.repo 29 Mar 2006 22:15:35 -0000 1.6 @@ -8,14 +8,16 @@ [updates-testing-debuginfo] name=Fedora Core $releasever - $basearch - Test Updates Debug -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/$basearch/debug/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/$basearch/debug/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-debug-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test [updates-testing-source] name=Fedora Core $releasever - Test Updates Source -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/testing/$releasever/SRPMS/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-testing-source-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test Index: fedora-updates.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fedora-updates.repo 20 Mar 2006 17:33:14 -0000 1.8 +++ fedora-updates.repo 29 Mar 2006 22:15:35 -0000 1.9 @@ -8,14 +8,16 @@ [updates-debuginfo] name=Fedora Core $releasever - $basearch - Updates - Debug -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/debug/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/debug/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-debug-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora [updates-source] name=Fedora Core $releasever - Updates Source -baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/SRPMS/ +#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/SRPMS/ +mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-source-fc$releasever enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora From fedora-extras-commits at redhat.com Wed Mar 29 23:08:41 2006 From: fedora-extras-commits at redhat.com (Orion Poplawski (orion)) Date: Wed, 29 Mar 2006 16:08:41 -0700 Subject: rpms/cmake/FC-4 cmake.spec,1.1,1.2 Message-ID: <200603292308.k2TN8hOG030433@cvs-int.fedora.redhat.com> Author: orion Update of /cvs/extras/rpms/cmake/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30412 Modified Files: cmake.spec Log Message: Alter BR for FC-4 xorg Index: cmake.spec =================================================================== RCS file: /cvs/extras/rpms/cmake/FC-4/cmake.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- cmake.spec 29 Mar 2006 19:03:00 -0000 1.1 +++ cmake.spec 29 Mar 2006 23:08:41 -0000 1.2 @@ -9,7 +9,7 @@ Source0: http://www.cmake.org/files/v2.2/cmake-%{version}.tar.gz Source1: cmake-init-fedora BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ncurses-devel, libX11-devel +BuildRequires: ncurses-devel, xorg-x11-devel %description CMake is used to control the software compilation process using simple From fedora-extras-commits at redhat.com Wed Mar 29 23:31:25 2006 From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating)) Date: Wed, 29 Mar 2006 16:31:25 -0700 Subject: fedora-release fedora-core.repo, 1.4, 1.5 fedora-development.repo, 1.5, 1.6 fedora-extras-development.repo, 1.3, 1.4 fedora-extras.repo, 1.6, 1.7 fedora-updates.repo, 1.9, 1.10 Message-ID: <200603292331.k2TNVPF3030579@cvs-int.fedora.redhat.com> Author: jkeating Update of /cvs/fedora/fedora-release In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30553 Modified Files: fedora-core.repo fedora-development.repo fedora-extras-development.repo fedora-extras.repo fedora-updates.repo Log Message: enabling developments and turning off others for rawhide package. Index: fedora-core.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-core.repo,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fedora-core.repo 29 Mar 2006 22:15:35 -0000 1.4 +++ fedora-core.repo 29 Mar 2006 23:31:22 -0000 1.5 @@ -2,7 +2,7 @@ name=Fedora Core $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/$releasever/$basearch/os/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-$releasever -enabled=1 +enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY Index: fedora-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-development.repo,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fedora-development.repo 29 Mar 2006 22:15:35 -0000 1.5 +++ fedora-development.repo 29 Mar 2006 23:31:22 -0000 1.6 @@ -27,7 +27,7 @@ name=Fedora Core - Development #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/$basearch/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-core-rawhide -enabled=0 +enabled=1 gpgcheck=0 [development-debuginfo] Index: fedora-extras-development.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- fedora-extras-development.repo 20 Mar 2006 17:33:14 -0000 1.3 +++ fedora-extras-development.repo 29 Mar 2006 23:31:22 -0000 1.4 @@ -2,7 +2,7 @@ name=Fedora Extras - Development Tree #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-devel -enabled=0 +enabled=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-extras.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fedora-extras.repo 29 Mar 2006 22:15:35 -0000 1.6 +++ fedora-extras.repo 29 Mar 2006 23:31:22 -0000 1.7 @@ -2,7 +2,7 @@ name=Fedora Extras $releasever - $basearch #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/ mirrorlist=http://fedora.redhat.com/Download/mirrors/fedora-extras-$releasever -enabled=1 +enabled=0 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras gpgcheck=1 Index: fedora-updates.repo =================================================================== RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fedora-updates.repo 29 Mar 2006 22:15:35 -0000 1.9 +++ fedora-updates.repo 29 Mar 2006 23:31:22 -0000 1.10 @@ -2,7 +2,7 @@ name=Fedora Core $releasever - $basearch - Updates #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/ mirrorlist=http://fedora.redhat.com/Download/mirrors/updates-released-fc$releasever -enabled=1 +enabled=0 gpgcheck=1 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora From fedora-extras-commits at redhat.com Thu Mar 30 01:15:03 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 29 Mar 2006 18:15:03 -0700 Subject: rpms/gnome-applet-music import.log,1.1,1.2 Message-ID: <200603300115.k2U1F5AH002965@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/gnome-applet-music In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2927 Modified Files: import.log Log Message: auto-import gnome-applet-music-0.9.0-1 on branch devel from gnome-applet-music-0.9.0-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-music/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Mar 2006 14:39:25 -0000 1.1 +++ import.log 30 Mar 2006 01:15:03 -0000 1.2 @@ -0,0 +1 @@ +gnome-applet-music-0_9_0-1:HEAD:gnome-applet-music-0.9.0-1.src.rpm:1143681729 From fedora-extras-commits at redhat.com Thu Mar 30 01:15:04 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Wed, 29 Mar 2006 18:15:04 -0700 Subject: rpms/gnome-applet-music/devel gnome-applet-music.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603300115.k2U1F6On002971@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/rpms/gnome-applet-music/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2927/devel Modified Files: .cvsignore sources Added Files: gnome-applet-music.spec Log Message: auto-import gnome-applet-music-0.9.0-1 on branch devel from gnome-applet-music-0.9.0-1.src.rpm --- NEW FILE gnome-applet-music.spec --- Name: gnome-applet-music Version: 0.9.0 Release: 1%{?dist} Summary: A GNOME panel applet to control various music players Group: Applications/Multimedia License: GPL URL: http://web.ics.purdue.edu/~kuliniew/music-applet/ Source0: http://web.ics.purdue.edu/~kuliniew/music-applet/downloads/music-applet-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-panel-devel eel2-devel dbus-devel #Requires: Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 Provides: music-applet gnome-applet-rhythmbox rhythmbox-applet Obsoletes: gnome-applet-rhythmbox %description Music Applet is a small, simple GNOME panel applet that lets you control a variety of different music players from the panel. Music Applet provides easy access to information about the current song and the most important playback controls. Music Applet currently supports the following music players: * Banshee * Rhythmbox Music Applet is the successor to Rhythmbox Applet. %prep %setup -q -n music-applet-%{version} %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make install DESTDIR=$RPM_BUILD_ROOT %find_lang music-applet %clean rm -rf $RPM_BUILD_ROOT %pre if [ "$1" -gt 1 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/music-applet.schemas >/dev/null || : killall -HUP gconfd-2 || : fi %post export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule \ %{_sysconfdir}/gconf/schemas/music-applet.schemas > /dev/null || : killall -HUP gconfd-2 || : %preun if [ "$1" -eq 0 ]; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule \ %{_sysconfdir}/gconf/schemas/music-applet.schemas > /dev/null || : killall -HUP gconfd-2 || : fi %files -f music-applet.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO %{_datadir}/gnome-2.0/ui/*.xml %{_datadir}/music-applet %{_libdir}/bonobo/servers/*.server %{_libexecdir}/* %{_sysconfdir}/gconf/schemas/*.schemas %changelog * Sun Mar 26 2006 Ignacio Vazquez-Abrams 0.9.0 - Renamed to gnome-applet-music from gnome-applet-rhythmbox Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-music/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Mar 2006 14:39:25 -0000 1.1 +++ .cvsignore 30 Mar 2006 01:15:04 -0000 1.2 @@ -0,0 +1 @@ +music-applet-0.9.0.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/gnome-applet-music/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Mar 2006 14:39:25 -0000 1.1 +++ sources 30 Mar 2006 01:15:04 -0000 1.2 @@ -0,0 +1 @@ +d22543fb3d7780fcbf5b688984e17d0a music-applet-0.9.0.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 04:29:23 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 21:29:23 -0700 Subject: kadischi/linuxrc livecd-linuxrc,1.1.1.1,1.2 Message-ID: <200603300429.k2U4TNH4009778@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/linuxrc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9717/kadischi/linuxrc Modified Files: livecd-linuxrc Log Message: Contributor: Toshio Kuratomi(SquashFS functionality as optional ), other minor fixes of unneccessary dependants on installed files. Index: livecd-linuxrc =================================================================== RCS file: /cvs/devel/kadischi/linuxrc/livecd-linuxrc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- livecd-linuxrc 21 Aug 2005 17:09:00 -0000 1.1.1.1 +++ livecd-linuxrc 30 Mar 2006 04:29:21 -0000 1.2 @@ -12,11 +12,21 @@ cd / -find-live-cd /sysroot +find-live-cd /cdrom # Make kernel don't mount root fs echo 0x100 > /proc/sys/kernel/real-root-dev +# Check for squashfs file +if [ -f /cdrom/kadischi.sqsh ]; then + echo "Mounting squashfs filesystem" + modprobe loop + modprobe squashfs + mount -t squashfs -o loop /cdrom/kadischi.sqsh /sysroot +else + mount --bind /cdrom /sysroot +fi + echo "Doing the pivot_root" cd /sysroot pivot_root /sysroot /sysroot/initrd @@ -45,4 +55,4 @@ echo "Setting up readonly-root" /etc/rc.readonly linuxrc -# rc.readonly will umount both /initrd/tmp and /initrd \ No newline at end of file +# rc.readonly will umount both /initrd/tmp and /initrd From fedora-extras-commits at redhat.com Thu Mar 30 04:29:24 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 21:29:24 -0700 Subject: kadischi/livecd_generator create-iso.sh, 1.1.1.1, 1.2 install-boot.sh, 1.2, 1.3 kadischi.py, 1.5, 1.6 livecd-mkinitrd.sh, 1.4, 1.5 Message-ID: <200603300429.k2U4TOCM009787@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9717/kadischi/livecd_generator Modified Files: create-iso.sh install-boot.sh kadischi.py livecd-mkinitrd.sh Log Message: Contributor: Toshio Kuratomi(SquashFS functionality as optional ), other minor fixes of unneccessary dependants on installed files. Index: create-iso.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/create-iso.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- create-iso.sh 21 Aug 2005 17:09:00 -0000 1.1.1.1 +++ create-iso.sh 30 Mar 2006 04:29:22 -0000 1.2 @@ -3,4 +3,4 @@ sysdir=$1 isoimage=$2 -mkisofs -quiet -z -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir \ No newline at end of file +mkisofs -quiet $MKISOFSOPTION -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir Index: install-boot.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- install-boot.sh 17 Mar 2006 22:30:00 -0000 1.2 +++ install-boot.sh 30 Mar 2006 04:29:22 -0000 1.3 @@ -5,7 +5,7 @@ kernel=$3 kernel_is_xen=$(echo $kernel | grep -G [[:alnum:]]xen0) kernel_version_proper=$(echo $kernel | sed -e 's|xen0||') -kernel_params='' +kernel_params='selinux=0' . /etc/kadischi/build.conf Index: kadischi.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- kadischi.py 17 Mar 2006 22:30:00 -0000 1.5 +++ kadischi.py 30 Mar 2006 04:29:22 -0000 1.6 @@ -48,6 +48,8 @@ parser.add_option ("", "--buildstamp", dest="buildstamp", help="buildstamp file (if not set, using the default buildstamp from the config directory)") +parser.add_option ("", "--filesystem", dest="filesystem", help="set the filesystem to use on the iso to either zisofs[default] or squashfs.") + flc_log ('Parsing command line arguments') (options, args) = parser.parse_args () @@ -156,7 +158,13 @@ flc_log ('Checking required packages') -required_rpms = ['anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs'] +# Set required filesystem_tools to something appropriate depending on what is chosen +if options.filesystem == 'squashfs': + filesystem_tools = 'squashfs-tools' +else + filesystem_tools = 'zisofs-tools' + +required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', filesystem_tools) missing_rpms = check_installed_rpms ('/', required_rpms, False) @@ -236,10 +244,10 @@ scripts = [] for root, dirs, files in os.walk (normalize_path([bindir, 'post_install_scripts'])): - for file in files: - file = normalize_path([bindir, 'post_install_scripts', file]) - if os.access(file, 1): - scripts.append (file) + for filename in files: + filename = normalize_path([bindir, 'post_install_scripts', filename]) + if os.access(filename, 1): + scripts.append (filename) scripts.sort() @@ -263,7 +271,19 @@ flc_log ('compressing the tree (order a pizza `cause this will take a while)') -run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir) +if options.filesystem == 'squashfs': + # zisofs has a tree which can be seen; squashfs is a file that we mount + # loopback. So we need to create supporting files and directories + # seperately. + os.makedirs (os.path.join(csysdir, 'boot/isolinux')) + os.makedirs(normalize_path([csysdir, '/livecd'])) + touch = file(normalize_path([csysdir, '.livecd']), 'w') + touch.close() + # compress a squashfs tree + run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh']))) +else: + # compress a zisofs tree + run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir) # install boot & conf files in compressed tree (they shoudn`t be compressed) @@ -283,7 +303,11 @@ flc_log ('creating iso image %s' % isoimage) -run ("%s %s %s" % (normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir) +if options.filesystem == 'squashfs': + mkisoflags='' +else: + mkisoflags='MKISOFSOPTION=-z ' +run ("%s%s %s %s" % (mkisoflags, normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir) # delete builddir Index: livecd-mkinitrd.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- livecd-mkinitrd.sh 17 Mar 2006 22:30:00 -0000 1.4 +++ livecd-mkinitrd.sh 30 Mar 2006 04:29:22 -0000 1.5 @@ -208,6 +208,7 @@ mkdir -p $MNTIMAGE/proc mkdir -p $MNTIMAGE/sys mkdir -p $MNTIMAGE/sysroot +mkdir -p $MNTIMAGE/cdrom mkdir -p $MNTIMAGE/tmp mkdir -p $MNTIMAGE/usr/lib mkdir -p $MNTIMAGE/var/lib/nfs/rpc_pipefs @@ -255,9 +256,8 @@ inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist" inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep" -PPMODULES=$(findmodules drivers/parport) - -for MODULE in $PPMODULES; do +MODULES=$(findmodules drivers/parport fs/squashfs drivers/block/loop.ko) +for MODULE in $MODULES; do instmodule $MODULE done @@ -270,6 +270,9 @@ for i in 1 2 3 4; do mknod $MNTIMAGE/dev/tty$i c 4 $i done +for i in 0 1 2 3 4 5 6 7 8 9; do + mknod $MNTIMAGE/dev/loop$i b 7 $i +done inst $INSTALLDIR/initrd/livecd-linuxrc "$MNTIMAGE/linuxrc" From fedora-extras-commits at redhat.com Thu Mar 30 04:29:24 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 21:29:24 -0700 Subject: kadischi/post_install_scripts 04auth.sh, 1.2, 1.3 05fsclean.py, 1.1.1.1, 1.2 Message-ID: <200603300429.k2U4TOHx009794@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9717/kadischi/post_install_scripts Modified Files: 04auth.sh 05fsclean.py Log Message: Contributor: Toshio Kuratomi(SquashFS functionality as optional ), other minor fixes of unneccessary dependants on installed files. Index: 04auth.sh =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/04auth.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 04auth.sh 20 Mar 2006 05:59:05 -0000 1.2 +++ 04auth.sh 30 Mar 2006 04:29:22 -0000 1.3 @@ -2,11 +2,15 @@ chroot $1 /usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth +# We could eventually make this more useful, and maybe in another way. +# With selinux=0 we shouldn't be having SELinux problems. +# Likewise a firewall will exist unless we've used kickstart to disable it. + # Don't disable a user's set firewall rules explicitly -fw_is_enabled=$(grep ^--enabled $1/etc/sysconfig/system-config-securitylevel) -if [ -n $fw_is_enabled ]; then - echo "Found an enabled firewall.." -else - chroot $1 /usr/sbin/lokkit --quiet --nostart -f --disabled -fi -chroot $1 /usr/sbin/lokkit --quiet --nostart --selinux=disabled +#fw_is_enabled=$(grep ^--enabled $1/etc/sysconfig/system-config-securitylevel) +#if [ -n $fw_is_enabled ]; then +# echo "Found an enabled firewall.." +#else +# chroot $1 /usr/sbin/lokkit --quiet --nostart -f --disabled +#fi +#chroot $1 /usr/sbin/lokkit --quiet --nostart --selinux=disabled Index: 05fsclean.py =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/05fsclean.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- 05fsclean.py 21 Aug 2005 17:09:01 -0000 1.1.1.1 +++ 05fsclean.py 30 Mar 2006 04:29:22 -0000 1.2 @@ -2,6 +2,7 @@ import os import sys +import shutil from functions import * # Directories that we want to empty but not delete @@ -60,4 +61,4 @@ directories_to_be_emptied, directories_to_be_cleaned, files_to_be_removed) -clean_up_root (rootdir) \ No newline at end of file +clean_up_root (rootdir) From fedora-extras-commits at redhat.com Thu Mar 30 04:29:23 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 21:29:23 -0700 Subject: kadischi/lib functions.py,1.4,1.5 Message-ID: <200603300429.k2U4TNGs009771@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9717/kadischi/lib Modified Files: functions.py Log Message: Contributor: Toshio Kuratomi(SquashFS functionality as optional ), other minor fixes of unneccessary dependants on installed files. Index: functions.py =================================================================== RCS file: /cvs/devel/kadischi/lib/functions.py,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- functions.py 12 Mar 2006 23:04:49 -0000 1.4 +++ functions.py 30 Mar 2006 04:29:21 -0000 1.5 @@ -2,6 +2,7 @@ import os import sys +import shutil import shvar import rpm import urlgrabber.grabber as grabber From fedora-extras-commits at redhat.com Thu Mar 30 04:52:01 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 29 Mar 2006 21:52:01 -0700 Subject: rpms/snort/devel README.fedora,NONE,1.1 snort.spec,1.6,1.7 Message-ID: <200603300452.k2U4q3wm009902@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9884 Modified Files: snort.spec Added Files: README.fedora Log Message: add readme file with rules and run a make clean so configure runs correctly --- NEW FILE README.fedora --- - Why is there no Rules in this package? * sourcefire licenses the rules under a different license than snort. Sourcefire VRT Certified Rules are the official rules of snort.org. Each rule has been rigorously tested against the same standards the VRT uses for Sourcefire customers. * Subscribers receive real-time rules updates as they are available ??? get more subscription highlights here * Registered users can access rule updates 5 days after release to subscription users. * Unregistered users receive a static ruleset at the time of each major Snort Release Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- snort.spec 9 Mar 2006 19:09:08 -0000 1.6 +++ snort.spec 30 Mar 2006 04:52:00 -0000 1.7 @@ -1,11 +1,12 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz Source1: snortd +Source2: README.fedora Patch: snort-2.4.3-configure64.patch Url: http://www.snort.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -88,9 +89,6 @@ Snort has a real-time alerting capabilty, with alerts being sent to syslog, a seperate "alert" file, or as a WinPopup message via Samba's smbclient -This version is compiled without database support. Edit the spec file -and rebuild the rpm to enable it. - Edit %{_sysconfdir}/snort.conf to configure snort and use snort.d to start snort This rpm is different from previous rpms and while it will not clobber @@ -152,6 +150,7 @@ %setup -q %patch0 -p1 -b .config +cp %{SOURCE2} doc/ %build @@ -170,7 +169,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-plain - +make clean } # plain+flexresp @@ -182,6 +181,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp +make clean } # mysql+flexresp @@ -193,6 +193,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp +make clean } # mysql @@ -203,6 +204,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql +make clean } @@ -216,6 +218,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp +make clean } # postgresql @@ -226,6 +229,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql +make clean } # snmp @@ -239,6 +243,7 @@ make %{?_smp_mflags} mv src/snort snort-snmp +make clean } @@ -253,7 +258,7 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-snmp+flexresp -# make distclean + make clean } # bloat @@ -267,9 +272,11 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-bloat -# make distclean +make clean } +#remove Makefile stuff from docs +rm doc/Makefile* %install if [ -d %{buildroot} ]; then @@ -295,7 +302,8 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir} +mkdir %{buildroot}%{_sysconfdir}/snort +install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf @@ -355,7 +363,7 @@ %files %defattr(-,root,root) -%doc doc/* +%doc doc/* %attr(755,root,root) %{_sbindir}/snort-plain # handle compressed man pages. @@ -390,6 +398,10 @@ %changelog +* Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 +- Add fedora README +- do make clean to make sure that each configure runs properly + * Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 - Update to 2.4.4 - Fixes CVE-2006-0839 From fedora-extras-commits at redhat.com Thu Mar 30 04:54:54 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 29 Mar 2006 21:54:54 -0700 Subject: rpms/snort/FC-3 README.fedora,NONE,1.1 snort.spec,1.5,1.6 Message-ID: <200603300454.k2U4suS7009971@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9953 Modified Files: snort.spec Added Files: README.fedora Log Message: add readme file with rules and run a make clean so configure runs correctly --- NEW FILE README.fedora --- - Why is there no Rules in this package? * sourcefire licenses the rules under a different license than snort. Sourcefire VRT Certified Rules are the official rules of snort.org. Each rule has been rigorously tested against the same standards the VRT uses for Sourcefire customers. * Subscribers receive real-time rules updates as they are available ??? get more subscription highlights here * Registered users can access rule updates 5 days after release to subscription users. * Unregistered users receive a static ruleset at the time of each major Snort Release Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-3/snort.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- snort.spec 9 Mar 2006 19:11:25 -0000 1.5 +++ snort.spec 30 Mar 2006 04:54:54 -0000 1.6 @@ -1,11 +1,12 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz Source1: snortd +Source2: README.fedora Patch: snort-2.4.3-configure64.patch Url: http://www.snort.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -88,9 +89,6 @@ Snort has a real-time alerting capabilty, with alerts being sent to syslog, a seperate "alert" file, or as a WinPopup message via Samba's smbclient -This version is compiled without database support. Edit the spec file -and rebuild the rpm to enable it. - Edit %{_sysconfdir}/snort.conf to configure snort and use snort.d to start snort This rpm is different from previous rpms and while it will not clobber @@ -152,6 +150,7 @@ %setup -q %patch0 -p1 -b .config +cp %{SOURCE2} doc/ %build @@ -170,7 +169,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-plain - +make clean } # plain+flexresp @@ -182,6 +181,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp +make clean } # mysql+flexresp @@ -193,6 +193,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp +make clean } # mysql @@ -203,6 +204,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql +make clean } @@ -216,6 +218,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp +make clean } # postgresql @@ -226,6 +229,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql +make clean } # snmp @@ -239,6 +243,7 @@ make %{?_smp_mflags} mv src/snort snort-snmp +make clean } @@ -253,7 +258,7 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-snmp+flexresp -# make distclean + make clean } # bloat @@ -267,9 +272,11 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-bloat -# make distclean +make clean } +#remove Makefile stuff from docs +rm doc/Makefile* %install if [ -d %{buildroot} ]; then @@ -295,7 +302,8 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir} +mkdir %{buildroot}%{_sysconfdir}/snort +install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf @@ -355,7 +363,7 @@ %files %defattr(-,root,root) -%doc doc/* +%doc doc/* %attr(755,root,root) %{_sbindir}/snort-plain # handle compressed man pages. @@ -390,6 +398,10 @@ %changelog +* Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 +- Add fedora README +- do make clean to make sure that each configure runs properly + * Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 - Update to 2.4.4 - Fixes CVE-2006-0839 From fedora-extras-commits at redhat.com Thu Mar 30 04:55:14 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 21:55:14 -0700 Subject: kadischi/man - New directory Message-ID: <200603300455.k2U4tED1009994@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/man In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9979/man Log Message: Directory /cvs/devel/kadischi/man added to the repository From fedora-extras-commits at redhat.com Thu Mar 30 04:56:43 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 29 Mar 2006 21:56:43 -0700 Subject: rpms/snort/FC-4 README.fedora,NONE,1.1 snort.spec,1.6,1.7 Message-ID: <200603300456.k2U4ujbV010058@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10040 Modified Files: snort.spec Added Files: README.fedora Log Message: add readme file with rules and run a make clean so configure runs correctly --- NEW FILE README.fedora --- - Why is there no Rules in this package? * sourcefire licenses the rules under a different license than snort. Sourcefire VRT Certified Rules are the official rules of snort.org. Each rule has been rigorously tested against the same standards the VRT uses for Sourcefire customers. * Subscribers receive real-time rules updates as they are available ??? get more subscription highlights here * Registered users can access rule updates 5 days after release to subscription users. * Unregistered users receive a static ruleset at the time of each major Snort Release Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-4/snort.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- snort.spec 9 Mar 2006 19:12:38 -0000 1.6 +++ snort.spec 30 Mar 2006 04:56:43 -0000 1.7 @@ -1,11 +1,12 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz Source1: snortd +Source2: README.fedora Patch: snort-2.4.3-configure64.patch Url: http://www.snort.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -88,9 +89,6 @@ Snort has a real-time alerting capabilty, with alerts being sent to syslog, a seperate "alert" file, or as a WinPopup message via Samba's smbclient -This version is compiled without database support. Edit the spec file -and rebuild the rpm to enable it. - Edit %{_sysconfdir}/snort.conf to configure snort and use snort.d to start snort This rpm is different from previous rpms and while it will not clobber @@ -152,6 +150,7 @@ %setup -q %patch0 -p1 -b .config +cp %{SOURCE2} doc/ %build @@ -170,7 +169,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-plain - +make clean } # plain+flexresp @@ -182,6 +181,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp +make clean } # mysql+flexresp @@ -193,6 +193,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp +make clean } # mysql @@ -203,6 +204,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql +make clean } @@ -216,6 +218,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp +make clean } # postgresql @@ -226,6 +229,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql +make clean } # snmp @@ -239,6 +243,7 @@ make %{?_smp_mflags} mv src/snort snort-snmp +make clean } @@ -253,7 +258,7 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-snmp+flexresp -# make distclean + make clean } # bloat @@ -267,9 +272,11 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-bloat -# make distclean +make clean } +#remove Makefile stuff from docs +rm doc/Makefile* %install if [ -d %{buildroot} ]; then @@ -295,7 +302,8 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir} +mkdir %{buildroot}%{_sysconfdir}/snort +install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf @@ -355,7 +363,7 @@ %files %defattr(-,root,root) -%doc doc/* +%doc doc/* %attr(755,root,root) %{_sbindir}/snort-plain # handle compressed man pages. @@ -390,6 +398,10 @@ %changelog +* Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 +- Add fedora README +- do make clean to make sure that each configure runs properly + * Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 - Update to 2.4.4 - Fixes CVE-2006-0839 From fedora-extras-commits at redhat.com Thu Mar 30 04:59:27 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Wed, 29 Mar 2006 21:59:27 -0700 Subject: rpms/snort/FC-5 README.fedora,NONE,1.1 snort.spec,1.6,1.7 Message-ID: <200603300459.k2U4xT5v010135@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10117 Modified Files: snort.spec Added Files: README.fedora Log Message: add readme file with rules and run a make clean so configure runs correctly --- NEW FILE README.fedora --- - Why is there no Rules in this package? * sourcefire licenses the rules under a different license than snort. Sourcefire VRT Certified Rules are the official rules of snort.org. Each rule has been rigorously tested against the same standards the VRT uses for Sourcefire customers. * Subscribers receive real-time rules updates as they are available ??? get more subscription highlights here * Registered users can access rule updates 5 days after release to subscription users. * Unregistered users receive a static ruleset at the time of each major Snort Release Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-5/snort.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- snort.spec 9 Mar 2006 19:09:08 -0000 1.6 +++ snort.spec 30 Mar 2006 04:59:26 -0000 1.7 @@ -1,11 +1,12 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz Source1: snortd +Source2: README.fedora Patch: snort-2.4.3-configure64.patch Url: http://www.snort.org BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -88,9 +89,6 @@ Snort has a real-time alerting capabilty, with alerts being sent to syslog, a seperate "alert" file, or as a WinPopup message via Samba's smbclient -This version is compiled without database support. Edit the spec file -and rebuild the rpm to enable it. - Edit %{_sysconfdir}/snort.conf to configure snort and use snort.d to start snort This rpm is different from previous rpms and while it will not clobber @@ -152,6 +150,7 @@ %setup -q %patch0 -p1 -b .config +cp %{SOURCE2} doc/ %build @@ -170,7 +169,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-plain - +make clean } # plain+flexresp @@ -182,6 +181,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-plain+flexresp +make clean } # mysql+flexresp @@ -193,6 +193,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-mysql+flexresp +make clean } # mysql @@ -203,6 +204,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-mysql +make clean } @@ -216,6 +218,7 @@ --enable-flexresp make %{?_smp_mflags} mv src/snort snort-postgresql+flexresp +make clean } # postgresql @@ -226,6 +229,7 @@ --with-odbc=no make %{?_smp_mflags} mv src/snort snort-postgresql +make clean } # snmp @@ -239,6 +243,7 @@ make %{?_smp_mflags} mv src/snort snort-snmp +make clean } @@ -253,7 +258,7 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-snmp+flexresp -# make distclean + make clean } # bloat @@ -267,9 +272,11 @@ --with-openssl make %{?_smp_mflags} mv src/snort snort-bloat -# make distclean +make clean } +#remove Makefile stuff from docs +rm doc/Makefile* %install if [ -d %{buildroot} ]; then @@ -295,7 +302,8 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir} +mkdir %{buildroot}%{_sysconfdir}/snort +install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf @@ -355,7 +363,7 @@ %files %defattr(-,root,root) -%doc doc/* +%doc doc/* %attr(755,root,root) %{_sbindir}/snort-plain # handle compressed man pages. @@ -390,6 +398,10 @@ %changelog +* Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 +- Add fedora README +- do make clean to make sure that each configure runs properly + * Thu Mar 09 2006 Dennis Gilmore - 2.4.4-1 - Update to 2.4.4 - Fixes CVE-2006-0839 From fedora-extras-commits at redhat.com Thu Mar 30 05:39:42 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Wed, 29 Mar 2006 22:39:42 -0700 Subject: rpms/scribus/devel .cvsignore, 1.7, 1.8 scribus.spec, 1.16, 1.17 sources, 1.7, 1.8 Message-ID: <200603300539.k2U5diGE012344@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/scribus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12321 Modified Files: .cvsignore scribus.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 18 Mar 2006 10:53:58 -0000 1.7 +++ .cvsignore 30 Mar 2006 05:39:42 -0000 1.8 @@ -1 +1 @@ -scribus-1.3.2.tar.bz2 +scribus-1.3.3.tar.bz2 Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- scribus.spec 18 Mar 2006 10:53:58 -0000 1.16 +++ scribus.spec 30 Mar 2006 05:39:42 -0000 1.17 @@ -1,5 +1,5 @@ Name: scribus -Version: 1.3.2 +Version: 1.3.3 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://www.scribus.org.uk/downloads/1.3.2/scribus-1.3.2.tar.bz2 +Source0: http://www.scribus.org.uk/downloads/1.3.3/scribus-1.3.3.tar.bz2 Source1: scribus.xml Source2: scribus.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -136,6 +136,10 @@ %changelog +* Tue Mar 28 2006 Andreas Bierfert +1.3.3-1 +- version upgrade + * Sat Mar 18 2006 Andreas Bierfert 1.3.2-1 - upgrade to beta version Index: sources =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 18 Mar 2006 10:53:58 -0000 1.7 +++ sources 30 Mar 2006 05:39:42 -0000 1.8 @@ -1 +1 @@ -700b8ce377084e317aa9d34a2157428d scribus-1.3.2.tar.bz2 +3d1dc7f13573243569b18239149b4e6c scribus-1.3.3.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 05:46:07 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:46:07 -0700 Subject: kadischi/doc kadischi.1,1.1,NONE kadischi.conf.5,1.1,NONE Message-ID: <200603300546.k2U5k785012477@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/doc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12407/kadischi/doc Removed Files: kadischi.1 kadischi.conf.5 Log Message: Organization of man pages, build.conf to kadischi.conf --- kadischi.1 DELETED --- --- kadischi.conf.5 DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 05:46:06 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:46:06 -0700 Subject: kadischi Makefile.am,1.2,1.3 configure.ac,1.3,1.4 Message-ID: <200603300546.k2U5kaLi012491@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12407/kadischi Modified Files: Makefile.am configure.ac Log Message: Organization of man pages, build.conf to kadischi.conf Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- Makefile.am 17 Mar 2006 22:29:49 -0000 1.2 +++ Makefile.am 30 Mar 2006 05:46:04 -0000 1.3 @@ -12,7 +12,8 @@ post_install_scripts \ rc \ scanswap \ - bootsplash + bootsplash \ + man EXTRA_DIST = \ pycheckrc \ Index: configure.ac =================================================================== RCS file: /cvs/devel/kadischi/configure.ac,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- configure.ac 17 Mar 2006 22:29:49 -0000 1.3 +++ configure.ac 30 Mar 2006 05:46:04 -0000 1.4 @@ -59,4 +59,5 @@ rc/Makefile scanswap/Makefile bootsplash/Makefile +man/Makefile ]) From fedora-extras-commits at redhat.com Thu Mar 30 05:46:07 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:46:07 -0700 Subject: kadischi/conf Makefile.am,1.4,1.5 build.conf,1.3,NONE Message-ID: <200603300546.k2U5kbFl012494@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/conf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12407/kadischi/conf Modified Files: Makefile.am Removed Files: build.conf Log Message: Organization of man pages, build.conf to kadischi.conf Index: Makefile.am =================================================================== RCS file: /cvs/devel/kadischi/conf/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- Makefile.am 17 Mar 2006 22:29:54 -0000 1.4 +++ Makefile.am 30 Mar 2006 05:46:05 -0000 1.5 @@ -1,8 +1,8 @@ confdir = /etc/kadischi -conf_DATA = build.conf buildstamp +conf_DATA = kadischi.conf buildstamp install-data-hook: - echo INSTALLDIR=$(pkgdatadir) >> $(DESTDIR)$(confdir)/build.conf + echo INSTALLDIR=$(pkgdatadir) >> $(DESTDIR)$(confdir)/kadischi.conf uninstall-hook: rm -rf $(confdir)/*~ --- build.conf DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 05:46:08 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:46:08 -0700 Subject: kadischi/livecd_generator install-boot.sh, 1.3, 1.4 kadischi, 1.1.1.1, 1.2 kadischi.py, 1.6, 1.7 livecd-mkinitrd.sh, 1.5, 1.6 Message-ID: <200603300546.k2U5kcCm012498@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12407/kadischi/livecd_generator Modified Files: install-boot.sh kadischi kadischi.py livecd-mkinitrd.sh Log Message: Organization of man pages, build.conf to kadischi.conf Index: install-boot.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/install-boot.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- install-boot.sh 30 Mar 2006 04:29:22 -0000 1.3 +++ install-boot.sh 30 Mar 2006 05:46:06 -0000 1.4 @@ -7,7 +7,7 @@ kernel_version_proper=$(echo $kernel | sed -e 's|xen0||') kernel_params='selinux=0' - . /etc/kadischi/build.conf + . /etc/kadischi/kadischi.conf if [ -x $sysdir/usr/bin/rhgb ]; then kernel_params="$kernel_params rhgb" Index: kadischi =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/kadischi,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- kadischi 21 Aug 2005 17:09:00 -0000 1.1.1.1 +++ kadischi 30 Mar 2006 05:46:06 -0000 1.2 @@ -1,6 +1,6 @@ #!/bin/sh - . /etc/kadischi/build.conf + . /etc/kadischi/kadischi.conf export PYTHONPATH=$INSTALLDIR/lib:$PYTHONPATH -exec python $INSTALLDIR/kadischi.py $@ \ No newline at end of file +exec python $INSTALLDIR/kadischi.py $@ Index: kadischi.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- kadischi.py 30 Mar 2006 04:29:22 -0000 1.6 +++ kadischi.py 30 Mar 2006 05:46:06 -0000 1.7 @@ -161,7 +161,7 @@ # Set required filesystem_tools to something appropriate depending on what is chosen if options.filesystem == 'squashfs': filesystem_tools = 'squashfs-tools' -else +else: filesystem_tools = 'zisofs-tools' required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', filesystem_tools) @@ -179,15 +179,15 @@ flc_log ('Looking for config file') -if not os.path.isfile (normalize_path([confdir, 'build.conf'])): - flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'build.conf'])) +if not os.path.isfile (normalize_path([confdir, 'kadischi.conf'])): + flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'kadischi.conf'])) sys.exit (1) # load config file options flc_log ('Loading config file options') -buildconf = shvarFile (normalize_path([confdir, 'build.conf']), True) +buildconf = shvarFile (normalize_path([confdir, 'kadischi.conf']), True) builddir = buildconf ["BUILDDIR"] buildnum = str (int (buildconf ["BUILDNUM"]) + 1) Index: livecd-mkinitrd.sh =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- livecd-mkinitrd.sh 30 Mar 2006 04:29:22 -0000 1.5 +++ livecd-mkinitrd.sh 30 Mar 2006 05:46:06 -0000 1.6 @@ -24,7 +24,7 @@ IMAGESIZE=10000 - . /etc/kadischi/build.conf + . /etc/kadischi/kadischi.conf usage () { echo "usage: `basename $0` [--version] [-v] [-f] [--nocompress]" >&2 From fedora-extras-commits at redhat.com Thu Mar 30 05:46:08 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:46:08 -0700 Subject: kadischi/post_install_scripts 01prelink.sh, 1.1, 1.2 02install.sh, 1.1.1.1, 1.2 Message-ID: <200603300546.k2U5kcDU012502@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12407/kadischi/post_install_scripts Modified Files: 01prelink.sh 02install.sh Log Message: Organization of man pages, build.conf to kadischi.conf Index: 01prelink.sh =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/01prelink.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 01prelink.sh 17 Mar 2006 22:30:05 -0000 1.1 +++ 01prelink.sh 30 Mar 2006 05:46:06 -0000 1.2 @@ -2,7 +2,7 @@ # # chroot to build directory and prelink - . /etc/kadischi/build.conf + . /etc/kadischi/kadischi.conf CHROOTDIR=$BUILDDIR/livecd-build_no$BUILDNUM/system Index: 02install.sh =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/02install.sh,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- 02install.sh 21 Aug 2005 17:09:01 -0000 1.1.1.1 +++ 02install.sh 30 Mar 2006 05:46:06 -0000 1.2 @@ -1,6 +1,6 @@ #!/bin/bash - . /etc/kadischi/build.conf + . /etc/kadischi/kadischi.conf SRCDIR=$INSTALLDIR/install DSTDIR=$1 @@ -16,4 +16,4 @@ inst rc.readonly-livecd etc/rc.d/ inst readonly-halt etc/init.d/ inst readonly-root etc/sysconfig/ -inst scanswap usr/sbin/ \ No newline at end of file +inst scanswap usr/sbin/ From fedora-extras-commits at redhat.com Thu Mar 30 05:51:48 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:51:48 -0700 Subject: kadischi/conf kadischi.conf,NONE,1.1 Message-ID: <200603300551.k2U5pm4D012585@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/conf In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12555/kadischi/conf Added Files: kadischi.conf Log Message: conf/kadischi.conf, man/kadischi.1, man/kadischi.conf.5, man/Makefile.am, commit --- NEW FILE kadischi.conf --- # This file contains vars related to livecd build process # BUILDDIR is the directory which will be used for temporary files. # If anaconda says that size of your installation is 1GB, you will # need ~1.5GB of free space on the device # example: BUILDDIR=/tmp BUILDDIR= # this var just counts builds. Every time you run fedora-livecd # it creates a directory (under BUILDDIR) named livecd-build_No($BUILDNUM) BUILDNUM=0 # directory which contains kadischi scripts. Automatically generated during # make install # INSTALLDIR= From fedora-extras-commits at redhat.com Thu Mar 30 05:51:48 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Wed, 29 Mar 2006 22:51:48 -0700 Subject: kadischi/man Makefile.am, NONE, 1.1 kadischi.1, NONE, 1.1 kadischi.conf.5, NONE, 1.1 Message-ID: <200603300551.k2U5pmLq012590@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/man In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12555/kadischi/man Added Files: Makefile.am kadischi.1 kadischi.conf.5 Log Message: conf/kadischi.conf, man/kadischi.1, man/kadischi.conf.5, man/Makefile.am, commit --- NEW FILE Makefile.am --- mandir = /usr/share/man man_DOC = kadischi.1 kadischi.conf.5 install-data-hook: install -m644 kadischi.1 $(DESTDIR)$(mandir)/man1/kadischi.1 install -m644 kadischi.conf.5 $(DESTDIR)$(mandir)/man5/kadischi.conf.5 uninstall-hook: rm -rf $(mandir)/man1/kadischi.1 rm -rf $(mandir)/man5/kadischi.conf.5 --- NEW FILE kadischi.1 --- .\" PROCESS THIS FILE WITH .\" groff -man -Tascii kadischi.1 .\" .TH KADISCHI 1 "MARCH 2006" "Fedora Core Linux" "User Manuals" .SH NAME kadischi - generate a live ISO9660 CDROM image from an RPM repository .SH SYNOPSIS kadischi [--text|--graphical] [--kickstart=] [-C|--cmdline] REPOSITORY [-f] IMAGE .SH DESCRIPTION .B kadischi(1) generates a live ISO9660 CDROM image from an RPM repository tree by invoking anaconda passing it the correct options and installing to the build directory specified. Kadischi will invoke .BR mkzftree(1) and .BR mkisofs(1) to produce an image that can be written to a CD or DVD ROM. .SH OPTIONS .IP --text Run in a textual mode that does not require X. .IP --graphical Run in graphical mode. .IP --kickstart Read from using the installation options provided in the file for the produced ISO9660 image. This option can be used with -C to automate builds. .IP -C Run strictly in command line mode requiring no user input. .IP --cmdline Same as -C .IP -f Overwrite an existing ISO9660 image, if it already exists. .SH FILES .I /etc/kadischi/kadischi.conf .RS The system wide configuration file. See .BR kadischi.conf(5) for more information. .RE .I /etc/kadischi/buildstamp .RS The build-stamp file. Used for stamping a CD. See .BR kadischi.conf(5) for more information. .SH BUGS The module shvarFile is not always imported properly or is not imported sometimes at all, resulting in the build directory needing to be manually cleaned up. .SH AVAILABILITY Kadischi is available via anonymous CVS: .nf export CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/devel cvs login cvs -z3 co kadischi .fi .SH AUTHOR .RS Darko Ilic .RS Jasper Hartline .RS Chitlesh Goorah .SH "SEE ALSO" .BR mkzftree(1), .BR mkisofs(1), .BR busybox(1), .BR anaconda(1) --- NEW FILE kadischi.conf.5 --- .\" PROCESS THIS FILE WITH .\" groff -man -Tascii kadischi.conf.5 .\" .TH KADISCHI.CONF 5 "MARCH 2006" "Fedora Core Linux" "File Formats" .SH NAME .B kadischi.conf(5) Configuration file for Kadischi live CD/DVD generator .SH SYNOPSIS .B kadischi.conf(5) is the configuration file for .B kadischi(1) live CD/DVD generation utility. It's syntax is much simpler than many configuration files and has few options currently but may be expanded at any time. .SH FILE FORMAT .B kadischi.conf(5) utilizes configuration options in the form of .IP OPTION=VALUE .SH PARAMETERS .IP BUILDDIR Specifies where .B kadischi(1) will place any of it's build directories. Pretty self explanatory and a common location is /tmp. .IP BUILDNUM This value is incremented after every build with .B kadischi(1). The BUILDNUM will reflect the current build instance in progress, or a previous build. .IP INSTALLDIR This option reflects where .B kadischi(1) is installed on the local system and is set at installation time. .SH AUTHOR .RS Jasper Hartline .RS .SH SEE ALSO .BR kadischi(1) From fedora-extras-commits at redhat.com Thu Mar 30 06:24:17 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:24:17 -0700 Subject: rpms/chmlib/FC-5 chmlib.spec,1.10,1.11 Message-ID: <200603300624.k2U6OJc8014799@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14782 Modified Files: chmlib.spec Log Message: rebuild Index: chmlib.spec =================================================================== RCS file: /cvs/extras/rpms/chmlib/FC-5/chmlib.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- chmlib.spec 29 Mar 2006 12:41:26 -0000 1.10 +++ chmlib.spec 30 Mar 2006 06:24:17 -0000 1.11 @@ -1,7 +1,7 @@ Name: chmlib Summary: Library for dealing with ITSS/CHM format files Version: 0.37.4 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: Development/Libraries Url: http://66.93.236.84/~jedwin/projects/chmlib/ @@ -56,6 +56,9 @@ %changelog +* Thu Mar 30 2006 Peter Lemenkov 0.37.4-6%{?dist} +- rebuild + * Mon Mar 27 2006 Peter Lemenkov 0.37.4-5%{?dist} - rebuild From fedora-extras-commits at redhat.com Thu Mar 30 06:25:56 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:25:56 -0700 Subject: rpms/chmlib/devel chmlib.spec,1.8,1.9 Message-ID: <200603300625.k2U6PwU3014861@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/chmlib/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14844 Modified Files: chmlib.spec Log Message: rebuild Index: chmlib.spec =================================================================== RCS file: /cvs/extras/rpms/chmlib/devel/chmlib.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- chmlib.spec 27 Mar 2006 07:31:56 -0000 1.8 +++ chmlib.spec 30 Mar 2006 06:25:56 -0000 1.9 @@ -1,7 +1,7 @@ Name: chmlib Summary: Library for dealing with ITSS/CHM format files Version: 0.37.4 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL Group: Development/Libraries Url: http://66.93.236.84/~jedwin/projects/chmlib/ @@ -56,6 +56,9 @@ %changelog +* Thu Mar 30 2006 Peter Lemenkov 0.37.4-6%{?dist} +- rebuild + * Mon Mar 27 2006 Peter Lemenkov 0.37.4-5%{?dist} - rebuild From fedora-extras-commits at redhat.com Thu Mar 30 06:28:59 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:28:59 -0700 Subject: rpms/wavpack/FC-5 wavpack.spec,1.1,1.2 Message-ID: <200603300629.k2U6T1ZB014936@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/wavpack/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14905/FC-5 Modified Files: wavpack.spec Log Message: rebuild Index: wavpack.spec =================================================================== RCS file: /cvs/extras/rpms/wavpack/FC-5/wavpack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wavpack.spec 15 Jan 2006 10:52:01 -0000 1.1 +++ wavpack.spec 30 Mar 2006 06:28:58 -0000 1.2 @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.31 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -59,6 +59,10 @@ %doc ChangeLog format.txt README %changelog + +* Thu Mar 30 2006 Peter Lemenkov 4.31-2%{?dist} +- rebuild + * Sat Jan 07 2006 Peter Lemenkov 4.31-1 - Fixed several issues with wavpack.pc.in - Cosmetic fixes. From fedora-extras-commits at redhat.com Thu Mar 30 06:28:59 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:28:59 -0700 Subject: rpms/wavpack/devel wavpack.spec,1.1,1.2 Message-ID: <200603300629.k2U6T1Q8014940@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/wavpack/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14905/devel Modified Files: wavpack.spec Log Message: rebuild Index: wavpack.spec =================================================================== RCS file: /cvs/extras/rpms/wavpack/devel/wavpack.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- wavpack.spec 15 Jan 2006 10:52:01 -0000 1.1 +++ wavpack.spec 30 Mar 2006 06:28:59 -0000 1.2 @@ -1,7 +1,7 @@ Name: wavpack Summary: A completely open audiocodec Version: 4.31 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Group: Applications/Multimedia Url: http://www.wavpack.com/ @@ -59,6 +59,10 @@ %doc ChangeLog format.txt README %changelog + +* Thu Mar 30 2006 Peter Lemenkov 4.31-2%{?dist} +- rebuild + * Sat Jan 07 2006 Peter Lemenkov 4.31-1 - Fixed several issues with wavpack.pc.in - Cosmetic fixes. From fedora-extras-commits at redhat.com Thu Mar 30 06:33:08 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:33:08 -0700 Subject: rpms/fuse/devel fuse.spec,1.7,1.8 Message-ID: <200603300633.k2U6XeVq015057@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15006/devel Modified Files: fuse.spec Log Message: rebuild Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/devel/fuse.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fuse.spec 13 Feb 2006 11:10:34 -0000 1.7 +++ fuse.spec 30 Mar 2006 06:33:08 -0000 1.8 @@ -1,6 +1,6 @@ Name: fuse Version: 2.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -116,6 +116,10 @@ %{_includedir}/fuse %changelog + +* Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} +- rebuild + * Mon Feb 13 2006 Peter Lemenkov - 2.5.2-3 - Proper udev rule From fedora-extras-commits at redhat.com Thu Mar 30 06:33:07 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:33:07 -0700 Subject: rpms/fuse/FC-4 fuse.spec,1.4,1.5 Message-ID: <200603300633.k2U6XdJ5015053@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15006/FC-4 Modified Files: fuse.spec Log Message: rebuild Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-4/fuse.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fuse.spec 13 Feb 2006 12:23:49 -0000 1.4 +++ fuse.spec 30 Mar 2006 06:33:07 -0000 1.5 @@ -1,6 +1,6 @@ Name: fuse Version: 2.5.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -116,6 +116,10 @@ %{_includedir}/fuse %changelog + +* Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} +- rebuild + * Mon Feb 13 2006 Peter Lemenkov - 2.5.2-3 - Proper udev rule From fedora-extras-commits at redhat.com Thu Mar 30 06:33:07 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:33:07 -0700 Subject: rpms/fuse/FC-5 fuse.spec,1.7,1.8 Message-ID: <200603300633.k2U6Xdi0015056@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15006/FC-5 Modified Files: fuse.spec Log Message: rebuild Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fuse.spec 13 Feb 2006 11:10:34 -0000 1.7 +++ fuse.spec 30 Mar 2006 06:33:07 -0000 1.8 @@ -1,6 +1,6 @@ Name: fuse Version: 2.5.2 -Release: 3%{?dist} +Release: 4444%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -116,6 +116,10 @@ %{_includedir}/fuse %changelog + +* Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} +- rebuild + * Mon Feb 13 2006 Peter Lemenkov - 2.5.2-3 - Proper udev rule From fedora-extras-commits at redhat.com Thu Mar 30 06:35:10 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:35:10 -0700 Subject: rpms/fuse/FC-5 fuse.spec,1.8,1.9 Message-ID: <200603300635.k2U6ZCie015123@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15106 Modified Files: fuse.spec Log Message: typo fix Index: fuse.spec =================================================================== RCS file: /cvs/extras/rpms/fuse/FC-5/fuse.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fuse.spec 30 Mar 2006 06:33:07 -0000 1.8 +++ fuse.spec 30 Mar 2006 06:35:09 -0000 1.9 @@ -1,6 +1,6 @@ Name: fuse Version: 2.5.2 -Release: 4444%{?dist} +Release: 4%{?dist} Summary: File System in Userspace (FUSE) utilities Group: System Environment/Base @@ -119,6 +119,7 @@ * Thu Mar 30 2006 Peter Lemenkov 2.5.2-4%{?dist} - rebuild +- typo fix * Mon Feb 13 2006 Peter Lemenkov - 2.5.2-3 - Proper udev rule From fedora-extras-commits at redhat.com Thu Mar 30 06:38:17 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:38:17 -0700 Subject: rpms/stratagus import.log,1.1,1.2 Message-ID: <200603300638.k2U6cnkQ015299@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262 Modified Files: import.log Log Message: auto-import stratagus-2.1-1 on branch devel from stratagus-2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/stratagus/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 27 Mar 2006 07:41:45 -0000 1.1 +++ import.log 30 Mar 2006 06:38:16 -0000 1.2 @@ -0,0 +1 @@ +stratagus-2_1-1:HEAD:stratagus-2.1-1.src.rpm:1143700677 From fedora-extras-commits at redhat.com Thu Mar 30 06:38:17 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:38:17 -0700 Subject: rpms/stratagus/devel stratagus--lp64.diff, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 stratagus.spec, 1.2, 1.3 Message-ID: <200603300638.k2U6cnnq015304@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15262/devel Modified Files: .cvsignore sources stratagus.spec Added Files: stratagus--lp64.diff Log Message: auto-import stratagus-2.1-1 on branch devel from stratagus-2.1-1.src.rpm stratagus--lp64.diff: --- NEW FILE stratagus--lp64.diff --- --- src/movie/vp31/FrameIni.c.ORG 2002-07-15 03:43:33.000000000 +0200 +++ src/movie/vp31/FrameIni.c 2005-03-09 11:14:43.484908045 +0100 @@ -275,7 +275,9 @@ * ERRORS : None. * ****************************************************************************/ -#define ROUNDUP32(X) ( ( ( (unsigned long) X ) + 31 )&( 0xFFFFFFE0 ) ) + +// This will also work on LP64 architectures +#define ROUNDUP32(X) ( ( ( (unsigned long) X ) + 31L )&( (unsigned long) -32 ) ) BOOL AllocateFragmentInfo(PB_INSTANCE * pbi) { Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 27 Mar 2006 07:41:45 -0000 1.1 +++ .cvsignore 30 Mar 2006 06:38:17 -0000 1.2 @@ -0,0 +1 @@ +stratagus-2.1-src.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 27 Mar 2006 07:41:45 -0000 1.1 +++ sources 30 Mar 2006 06:38:17 -0000 1.2 @@ -0,0 +1 @@ +ff6b2070b66e8847eeed6bedc24ad8bb stratagus-2.1-src.tar.gz Index: stratagus.spec =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- stratagus.spec 29 Mar 2006 12:56:16 -0000 1.2 +++ stratagus.spec 30 Mar 2006 06:38:17 -0000 1.3 @@ -6,7 +6,7 @@ Name: stratagus Summary: Real-time strategy gaming engine Version: 2.1 -Release: 2%{?dist} +Release: 1 License: GPL Group: Development/Libraries URL: http://stratagus.sourceforge.net/ @@ -68,9 +68,5 @@ %{_bindir}/stratagus %changelog - -* Wed Mar 29 2006 Peter Lemenkov 2.1-2 -- Added dist-tag - * Sat Nov 19 2005 Peter Lemenkov 2.1-1 - Initial build for FC-Extras From fedora-extras-commits at redhat.com Thu Mar 30 06:56:21 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Wed, 29 Mar 2006 23:56:21 -0700 Subject: rpms/stratagus/devel stratagus.spec,1.3,1.4 Message-ID: <200603300656.k2U6uNVi015658@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15641 Modified Files: stratagus.spec Log Message: added dist-tag Index: stratagus.spec =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- stratagus.spec 30 Mar 2006 06:38:17 -0000 1.3 +++ stratagus.spec 30 Mar 2006 06:56:21 -0000 1.4 @@ -6,7 +6,7 @@ Name: stratagus Summary: Real-time strategy gaming engine Version: 2.1 -Release: 1 +Release: 3%{?dist} License: GPL Group: Development/Libraries URL: http://stratagus.sourceforge.net/ @@ -68,5 +68,12 @@ %{_bindir}/stratagus %changelog + +* Thu Mar 30 2006 Peter Lemenkov 2.1-2%{?dist} +- added dist-tag + +* Thu Mar 30 2006 Peter Lemenkov 2.1-2 +- rebuild + * Sat Nov 19 2005 Peter Lemenkov 2.1-1 - Initial build for FC-Extras From fedora-extras-commits at redhat.com Thu Mar 30 07:00:47 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 00:00:47 -0700 Subject: rpms/scim-hangul/FC-4 .cvsignore, 1.3, 1.4 scim-hangul.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200603300700.k2U70nSl015753@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15732 Modified Files: .cvsignore scim-hangul.spec sources Log Message: * Thu Mar 30 2006 Akira TAGOH - 0.2.2-1 - New upstream release. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 Oct 2005 03:43:54 -0000 1.3 +++ .cvsignore 30 Mar 2006 07:00:47 -0000 1.4 @@ -1,2 +1,3 @@ scim-hangul-0.2.0.tar.gz scim-hangul-0.2.1.tar.gz +scim-hangul-0.2.2.tar.gz Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-4/scim-hangul.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- scim-hangul.spec 31 Oct 2005 03:43:54 -0000 1.8 +++ scim-hangul.spec 30 Mar 2006 07:00:47 -0000 1.9 @@ -1,5 +1,5 @@ Name: scim-hangul -Version: 0.2.1 +Version: 0.2.2 Release: 1%{?dist} License: GPL @@ -47,6 +47,9 @@ %changelog +* Thu Mar 30 2006 Akira TAGOH - 0.2.2-1 +- New upstream release. + * Mon Oct 31 2005 Akira TAGOH - 0.2.1-1 - New upstream release. - clean up the spec file - sync from devel. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Oct 2005 03:43:54 -0000 1.3 +++ sources 30 Mar 2006 07:00:47 -0000 1.4 @@ -1 +1 @@ -586dbd1c01d414125e1bb13821c57f93 scim-hangul-0.2.1.tar.gz +de50471ffb5689696215a6eeea24b817 scim-hangul-0.2.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 07:10:48 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 00:10:48 -0700 Subject: rpms/scribus/devel scribus.spec,1.17,1.18 Message-ID: <200603300710.k2U7AotP017834@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/scribus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17817 Modified Files: scribus.spec Log Message: - add BR gnutls-devel Index: scribus.spec =================================================================== RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- scribus.spec 30 Mar 2006 05:39:42 -0000 1.17 +++ scribus.spec 30 Mar 2006 07:10:48 -0000 1.18 @@ -26,6 +26,7 @@ BuildRequires: qt-devel >= 1:3.3 BuildRequires: zlib-devel BuildRequires: freetype-devel +BuildRequires: gnutls-devel Requires: ghostscript >= 7.07 Requires: python >= 2.3 Requires: python-imaging @@ -139,6 +140,7 @@ * Tue Mar 28 2006 Andreas Bierfert 1.3.3-1 - version upgrade +- add BR gnutls-devel * Sat Mar 18 2006 Andreas Bierfert 1.3.2-1 From fedora-extras-commits at redhat.com Thu Mar 30 07:31:35 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 00:31:35 -0700 Subject: rpms/scim-hangul/FC-4 scim-hangul.spec,1.9,1.10 Message-ID: <200603300731.k2U7VbGT018021@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-hangul/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18004 Modified Files: scim-hangul.spec Log Message: moved all plugins under the versioned directory. Index: scim-hangul.spec =================================================================== RCS file: /cvs/extras/rpms/scim-hangul/FC-4/scim-hangul.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- scim-hangul.spec 30 Mar 2006 07:00:47 -0000 1.9 +++ scim-hangul.spec 30 Mar 2006 07:31:35 -0000 1.10 @@ -1,6 +1,6 @@ Name: scim-hangul Version: 0.2.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL URL: http://www.scim-im.org/ @@ -29,7 +29,7 @@ rm -rf $RPM_BUILD_ROOT make DESTDIR=${RPM_BUILD_ROOT} install -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/hangul*.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/{IMEngine,SetupUI}/hangul*.la %find_lang %{name} @@ -41,14 +41,15 @@ %files -f %{name}.lang %defattr(-, root, root) %doc AUTHORS COPYING README ChangeLog -%{_libdir}/scim-1.0/IMEngine/hangul.* -%{_libdir}/scim-1.0/SetupUI/hangul-imengine-setup.* +%{_libdir}/scim-1.0/*/IMEngine/hangul.so +%{_libdir}/scim-1.0/*/SetupUI/hangul-imengine-setup.so %{_datadir}/scim/icons/scim-hangul.png %changelog -* Thu Mar 30 2006 Akira TAGOH - 0.2.2-1 +* Thu Mar 30 2006 Akira TAGOH - 0.2.2-2 - New upstream release. +- moved all plugins under the versioned directory. * Mon Oct 31 2005 Akira TAGOH - 0.2.1-1 - New upstream release. From fedora-extras-commits at redhat.com Thu Mar 30 07:35:42 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:35:42 -0700 Subject: rpms/fuse-sshfs/FC-4 .cvsignore, 1.3, 1.4 fuse-sshfs.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603300735.k2U7ZiGR018222@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18160/FC-4 Modified Files: .cvsignore fuse-sshfs.spec sources Log Message: Version 1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 12:14:49 -0000 1.3 +++ .cvsignore 30 Mar 2006 07:35:42 -0000 1.4 @@ -1 +1 @@ -sshfs-fuse-1.4.tar.gz +sshfs-fuse-1.6.tar.gz Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/fuse-sshfs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fuse-sshfs.spec 13 Feb 2006 12:14:49 -0000 1.4 +++ fuse-sshfs.spec 30 Mar 2006 07:35:42 -0000 1.5 @@ -1,6 +1,6 @@ Name: fuse-sshfs -Version: 1.4 -Release: 2%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH Group: System Environment/Base @@ -39,6 +39,10 @@ %{_bindir}/sshfs %changelog + +* Thu Mar 30 2006 Peter Lemenkov - 1.6-1 +- Version 1.6 + * Mon Feb 13 2006 Peter Lemenkov - 1.4-2 - small cosmetic fixes Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 12:14:49 -0000 1.3 +++ sources 30 Mar 2006 07:35:42 -0000 1.4 @@ -1 +1 @@ -3777dd6f232d33c9110abfa5ecd5518e sshfs-fuse-1.4.tar.gz +04fa75c1357bea362537efe15805e7da sshfs-fuse-1.6.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 07:35:43 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:35:43 -0700 Subject: rpms/fuse-sshfs/devel .cvsignore, 1.3, 1.4 fuse-sshfs.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603300735.k2U7Zj80018229@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18160/devel Modified Files: .cvsignore fuse-sshfs.spec sources Log Message: Version 1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 11:26:54 -0000 1.3 +++ .cvsignore 30 Mar 2006 07:35:43 -0000 1.4 @@ -1 +1 @@ -sshfs-fuse-1.4.tar.gz +sshfs-fuse-1.6.tar.gz Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/devel/fuse-sshfs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fuse-sshfs.spec 13 Feb 2006 12:16:17 -0000 1.4 +++ fuse-sshfs.spec 30 Mar 2006 07:35:43 -0000 1.5 @@ -1,6 +1,6 @@ Name: fuse-sshfs -Version: 1.4 -Release: 2%{?dist} +Version: 1.6 +Release: 1%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH Group: System Environment/Base @@ -39,6 +39,10 @@ %{_bindir}/sshfs %changelog + +* Thu Mar 30 2006 Peter Lemenkov - 1.6-1 +- Version 1.6 + * Mon Feb 13 2006 Peter Lemenkov - 1.4-2 - small cosmetic fixes Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 11:26:54 -0000 1.3 +++ sources 30 Mar 2006 07:35:43 -0000 1.4 @@ -1 +1 @@ -3777dd6f232d33c9110abfa5ecd5518e sshfs-fuse-1.4.tar.gz +04fa75c1357bea362537efe15805e7da sshfs-fuse-1.6.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 07:46:40 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:46:40 -0700 Subject: rpms/fuse-encfs/FC-5 .cvsignore, 1.2, 1.3 fuse-encfs.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603300746.k2U7kg9Q019801@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19727/FC-5 Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Dec 2005 08:23:58 -0000 1.2 +++ .cvsignore 30 Mar 2006 07:46:40 -0000 1.3 @@ -1 +1,2 @@ -encfs-1.2.5-1.tgz +encfs-1.3.0-1.tgz +encfs-1.3.0-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/fuse-encfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fuse-encfs.spec 17 Dec 2005 08:31:41 -0000 1.2 +++ fuse-encfs.spec 30 Mar 2006 07:46:40 -0000 1.3 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.2.5 +Version: 1.3.0 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -46,6 +46,10 @@ %{_mandir}/man1/* %changelog + +* Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} +- Version 1.3.0 + * Fri Dec 16 2005 Peter Lemenkov 1.2.5-1 - Initial build for FE Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Dec 2005 08:23:58 -0000 1.2 +++ sources 30 Mar 2006 07:46:40 -0000 1.3 @@ -1 +1,2 @@ -f2d92d1f8e82f72cd0dd4cf9eea736c6 encfs-1.2.5-1.tgz +6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz +62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc From fedora-extras-commits at redhat.com Thu Mar 30 07:46:41 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:46:41 -0700 Subject: rpms/fuse-encfs/devel .cvsignore, 1.2, 1.3 fuse-encfs.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603300746.k2U7khSJ019809@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19727/devel Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Dec 2005 08:23:58 -0000 1.2 +++ .cvsignore 30 Mar 2006 07:46:41 -0000 1.3 @@ -1 +1,2 @@ -encfs-1.2.5-1.tgz +encfs-1.3.0-1.tgz +encfs-1.3.0-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/fuse-encfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fuse-encfs.spec 17 Dec 2005 08:31:41 -0000 1.2 +++ fuse-encfs.spec 30 Mar 2006 07:46:41 -0000 1.3 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.2.5 +Version: 1.3.0 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -46,6 +46,10 @@ %{_mandir}/man1/* %changelog + +* Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} +- Version 1.3.0 + * Fri Dec 16 2005 Peter Lemenkov 1.2.5-1 - Initial build for FE Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Dec 2005 08:23:58 -0000 1.2 +++ sources 30 Mar 2006 07:46:41 -0000 1.3 @@ -1 +1,2 @@ -f2d92d1f8e82f72cd0dd4cf9eea736c6 encfs-1.2.5-1.tgz +6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz +62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc From fedora-extras-commits at redhat.com Thu Mar 30 07:46:39 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:46:39 -0700 Subject: rpms/fuse-encfs/FC-4 .cvsignore, 1.2, 1.3 fuse-encfs.spec, 1.2, 1.3 sources, 1.2, 1.3 Message-ID: <200603300747.k2U7lBfO019850@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-encfs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19727/FC-4 Modified Files: .cvsignore fuse-encfs.spec sources Log Message: Version 1.3.0 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 17 Dec 2005 08:23:58 -0000 1.2 +++ .cvsignore 30 Mar 2006 07:46:39 -0000 1.3 @@ -1 +1,2 @@ -encfs-1.2.5-1.tgz +encfs-1.3.0-1.tgz +encfs-1.3.0-1.tgz.asc Index: fuse-encfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/fuse-encfs.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- fuse-encfs.spec 17 Dec 2005 08:31:41 -0000 1.2 +++ fuse-encfs.spec 30 Mar 2006 07:46:39 -0000 1.3 @@ -1,5 +1,5 @@ Name: fuse-encfs -Version: 1.2.5 +Version: 1.3.0 Release: 1%{?dist} Summary: Encrypted pass-thru filesystem in userspace License: GPL @@ -46,6 +46,10 @@ %{_mandir}/man1/* %changelog + +* Thu Mar 30 2006 Peter Lemenkov 1.3.0-1%{?dist} +- Version 1.3.0 + * Fri Dec 16 2005 Peter Lemenkov 1.2.5-1 - Initial build for FE Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-encfs/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 17 Dec 2005 08:23:58 -0000 1.2 +++ sources 30 Mar 2006 07:46:39 -0000 1.3 @@ -1 +1,2 @@ -f2d92d1f8e82f72cd0dd4cf9eea736c6 encfs-1.2.5-1.tgz +6e2547a1d667cbbee12e8a8d75dc7917 encfs-1.3.0-1.tgz +62c2da13b9ecd1a6ea7464ee769725ac encfs-1.3.0-1.tgz.asc From fedora-extras-commits at redhat.com Thu Mar 30 07:53:54 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:53:54 -0700 Subject: rpms/fuse-sshfs/FC-4 fuse-sshfs.spec,1.5,1.6 Message-ID: <200603300753.k2U7ruDh020772@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20714 Modified Files: fuse-sshfs.spec Log Message: Added missing sshnodelay.so Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-4/fuse-sshfs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fuse-sshfs.spec 30 Mar 2006 07:35:42 -0000 1.5 +++ fuse-sshfs.spec 30 Mar 2006 07:53:54 -0000 1.6 @@ -1,6 +1,6 @@ Name: fuse-sshfs Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH Group: System Environment/Base @@ -37,9 +37,13 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/sshfs +%{_libdir}/sshnodelay.so %changelog +* Thu Mar 30 2006 Peter Lemenkov - 1.6-2 +- added missing sshnodelay.so + * Thu Mar 30 2006 Peter Lemenkov - 1.6-1 - Version 1.6 From fedora-extras-commits at redhat.com Thu Mar 30 07:54:18 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 00:54:18 -0700 Subject: rpms/fuse-sshfs/devel fuse-sshfs.spec,1.5,1.6 Message-ID: <200603300754.k2U7sKxM020850@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20800 Modified Files: fuse-sshfs.spec Log Message: Added missing sshnodelay.so Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/devel/fuse-sshfs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fuse-sshfs.spec 30 Mar 2006 07:35:43 -0000 1.5 +++ fuse-sshfs.spec 30 Mar 2006 07:54:18 -0000 1.6 @@ -1,6 +1,6 @@ Name: fuse-sshfs Version: 1.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH Group: System Environment/Base @@ -37,9 +37,13 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/sshfs +%{_libdir}/sshnodelay.so %changelog +* Thu Mar 30 2006 Peter Lemenkov - 1.6-2 +- added missing sshnodelay.so + * Thu Mar 30 2006 Peter Lemenkov - 1.6-1 - Version 1.6 From fedora-extras-commits at redhat.com Thu Mar 30 09:29:33 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 02:29:33 -0700 Subject: rpms/sweep/devel sweep.spec,1.1,1.2 Message-ID: <200603300929.k2U9TZZr025957@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/sweep/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25940 Modified Files: sweep.spec Log Message: Index: sweep.spec =================================================================== RCS file: /cvs/extras/rpms/sweep/devel/sweep.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sweep.spec 27 Mar 2006 11:24:06 -0000 1.1 +++ sweep.spec 30 Mar 2006 09:29:33 -0000 1.2 @@ -1,6 +1,6 @@ Name: sweep Version: 0.9.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: An audio editor and live playback tool Group: Applications/Multimedia From fedora-extras-commits at redhat.com Thu Mar 30 10:03:24 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Thu, 30 Mar 2006 03:03:24 -0700 Subject: rpms/yumex/FC-5 sources,1.22,1.23 yumex.spec,1.23,1.24 Message-ID: <200603301003.k2UA3QCe028093@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28058/FC-5 Modified Files: sources yumex.spec Log Message: Release 0.99.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 22 Mar 2006 09:30:17 -0000 1.22 +++ sources 30 Mar 2006 10:03:23 -0000 1.23 @@ -1 +1 @@ -75aade2fc07e8672d61b0f553f37ab0d yumex-0.99.14.tar.gz +e47a2d9b14bbe8b488f2890af2df7bc8 yumex-0.99.15.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- yumex.spec 22 Mar 2006 09:30:17 -0000 1.23 +++ yumex.spec 30 Mar 2006 10:03:23 -0000 1.24 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.14 +Version: 0.99.15 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Mar 22 2006 Tim Lauridsen - 0.99.15-1.0 +- Development Release 0.99.15-1.0 * Mon Mar 20 2006 Tim Lauridsen - 0.99.14-1.0 - Development Release 0.99.14-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 From fedora-extras-commits at redhat.com Thu Mar 30 10:03:24 2006 From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau)) Date: Thu, 30 Mar 2006 03:03:24 -0700 Subject: rpms/yumex/devel .cvsignore, 1.18, 1.19 sources, 1.22, 1.23 yumex.spec, 1.23, 1.24 Message-ID: <200603301003.k2UA3QDE028099@cvs-int.fedora.redhat.com> Author: timlau Update of /cvs/extras/rpms/yumex/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28058/devel Modified Files: .cvsignore sources yumex.spec Log Message: Release 0.99.15 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 20 Mar 2006 12:32:30 -0000 1.18 +++ .cvsignore 30 Mar 2006 10:03:24 -0000 1.19 @@ -1 +1 @@ -yumex-0.99.13.tar.gz +yumex-0.99.15.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/sources,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- sources 22 Mar 2006 09:30:25 -0000 1.22 +++ sources 30 Mar 2006 10:03:24 -0000 1.23 @@ -1 +1 @@ -75aade2fc07e8672d61b0f553f37ab0d yumex-0.99.14.tar.gz +e47a2d9b14bbe8b488f2890af2df7bc8 yumex-0.99.15.tar.gz Index: yumex.spec =================================================================== RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- yumex.spec 22 Mar 2006 09:30:25 -0000 1.23 +++ yumex.spec 30 Mar 2006 10:03:24 -0000 1.24 @@ -1,5 +1,5 @@ Name: yumex -Version: 0.99.14 +Version: 0.99.15 Release: 1.0%{?dist} Summary: Yum Extender graphical package management tool @@ -65,6 +65,8 @@ %{_datadir}/applications/fedora-%{name}.desktop %changelog +* Wed Mar 22 2006 Tim Lauridsen - 0.99.15-1.0 +- Development Release 0.99.15-1.0 * Mon Mar 20 2006 Tim Lauridsen - 0.99.14-1.0 - Development Release 0.99.14-1.0 * Mon Mar 13 2006 Tim Lauridsen - 0.99.13-1.0 From fedora-extras-commits at redhat.com Thu Mar 30 10:13:14 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Thu, 30 Mar 2006 03:13:14 -0700 Subject: kadischi/linuxrc livecd-linuxrc,1.2,1.3 Message-ID: <200603301013.k2UADEJw028232@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/linuxrc In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28215/kadischi/linuxrc Modified Files: livecd-linuxrc Log Message: Correction of invalid use of bind argument to busybox.anaconda (livecd-linuxrc) Index: livecd-linuxrc =================================================================== RCS file: /cvs/devel/kadischi/linuxrc/livecd-linuxrc,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- livecd-linuxrc 30 Mar 2006 04:29:21 -0000 1.2 +++ livecd-linuxrc 30 Mar 2006 10:13:12 -0000 1.3 @@ -24,7 +24,7 @@ modprobe squashfs mount -t squashfs -o loop /cdrom/kadischi.sqsh /sysroot else - mount --bind /cdrom /sysroot + mount -o bind /cdrom /sysroot fi echo "Doing the pivot_root" From fedora-extras-commits at redhat.com Thu Mar 30 10:13:24 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 03:13:24 -0700 Subject: rpms/php-extras/devel php-extras.spec,1.1,1.2 Message-ID: <200603301013.k2UADQaQ028255@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28238 Modified Files: php-extras.spec Log Message: Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/php-extras.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-extras.spec 25 Mar 2006 18:13:47 -0000 1.1 +++ php-extras.spec 30 Mar 2006 10:13:23 -0000 1.2 @@ -251,6 +251,10 @@ %changelog +* Sat Mar 25 2006 Dmitry Butskoy - 5.1.2-2 +- Accepted for Fedora Extras + (review by Tom "spot" Callaway ) + * Wed Mar 1 2006 Dmitry Butskoy - 5.1.2-2 - more accurate Requires for the main php (using php-api, provided now by the Core php package). From fedora-extras-commits at redhat.com Thu Mar 30 10:14:04 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 03:14:04 -0700 Subject: rpms/php-extras/FC-5 php-extras.spec,1.1,1.2 Message-ID: <200603301014.k2UAE6vp028279@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28261 Modified Files: php-extras.spec Log Message: Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/FC-5/php-extras.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-extras.spec 25 Mar 2006 18:13:47 -0000 1.1 +++ php-extras.spec 30 Mar 2006 10:14:04 -0000 1.2 @@ -251,6 +251,10 @@ %changelog +* Sat Mar 25 2006 Dmitry Butskoy - 5.1.2-2 +- Accepted for Fedora Extras + (review by Tom "spot" Callaway ) + * Wed Mar 1 2006 Dmitry Butskoy - 5.1.2-2 - more accurate Requires for the main php (using php-api, provided now by the Core php package). From fedora-extras-commits at redhat.com Thu Mar 30 10:19:21 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 03:19:21 -0700 Subject: rpms/php-extras/FC-4 php-extras-4.3.11-readline.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 php-extras.spec, 1.1, 1.2 sources, 1.2, 1.3 php-extras-5.1.2-readline.patch, 1.1, NONE Message-ID: <200603301019.k2UAJN06028401@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28377 Modified Files: .cvsignore php-extras.spec sources Added Files: php-extras-4.3.11-readline.patch Removed Files: php-extras-5.1.2-readline.patch Log Message: php-extras-4.3.11-readline.patch: --- NEW FILE php-extras-4.3.11-readline.patch --- diff -Nrbu php-4.3.11/ext/readline/config.m4 php-4.3.11-OK/ext/readline/config.m4 --- php-4.3.11/ext/readline/config.m4 2003-10-01 06:54:04.000000000 +0400 +++ php-4.3.11-OK/ext/readline/config.m4 2005-10-17 19:25:13.000000000 +0400 @@ -22,10 +22,12 @@ AC_CHECK_LIB(ncurses, tgetent, [ PHP_ADD_LIBRARY(ncurses,,READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY(ncurses,,LIBS) ],[ AC_CHECK_LIB(termcap, tgetent, [ PHP_ADD_LIBRARY(termcap,,READLINE_SHARED_LIBADD) + PHP_ADD_LIBRARY(termcap,,LIBS) ]) ]) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/php-extras/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 25 Mar 2006 18:13:47 -0000 1.2 +++ .cvsignore 30 Mar 2006 10:19:21 -0000 1.3 @@ -1 +1 @@ -php-5.1.2.tar.gz +php-5.0.4.tar.gz Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/FC-4/php-extras.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- php-extras.spec 25 Mar 2006 18:13:47 -0000 1.1 +++ php-extras.spec 30 Mar 2006 10:19:21 -0000 1.2 @@ -1,28 +1,29 @@ -# FC5: dbase, readline, recode, mcrypt, mhash, tidy, mssql +# FC4: dbase, fam, readline, recode, mcrypt, mhash, sqlite, tidy, mssql %define def() %%{!?_without_default:%%{!?_without_%1: %%global _with_%1 --with-%1}} %{expand:%def dbase} +# fam %{expand:%def readline} # recode %{expand:%def mcrypt} %{expand:%def mhash} +# sqlite %{expand:%def tidy} # mssql -%define list %{?_with_dbase:dbase} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_tidy:tidy} %{?_with_mssql:mssql} +%define list %{?_with_dbase:dbase} %{?_with_fam:fam} %{?_with_readline:readline} %{?_with_recode:recode} %{?_with_mcrypt:mcrypt} %{?_with_mhash:mhash} %{?_with_sqlite:sqlite} %{?_with_tidy:tidy} %{?_with_mssql:mssql} %define extdir %(php-config --extension-dir) -%define apiver %(echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) Name: php-extras Summary: Additional PHP modules from the standard PHP distribution #Version: %(php-config --version) -Version: 5.1.2 -Release: 2%{?dist} +Version: 5.0.4 +Release: 3%{?dist} Group: Development/Languages License: The PHP License URL: http://www.php.net/ @@ -30,7 +31,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: php-devel = %{version} -Patch1: php-extras-5.1.2-readline.patch +Requires: php = %{version} +Patch1: php-extras-4.3.11-readline.patch %description @@ -43,16 +45,26 @@ %package -n php-dbase Summary: Standard dBase module for PHP applications Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %description -n php-dbase Standard dBase module for PHP applications +%package -n php-fam +Summary: Standard PHP module provides FAM support +Group: Development/Languages +Requires: php = %{version} +%{?_with_fam:BuildRequires: gamin-devel} + +%description -n php-fam +Standard PHP module provides FAM support + + %package -n php-readline Summary: Standard PHP module provides readline library support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_readline:BuildRequires: readline-devel} %description -n php-readline @@ -62,7 +74,7 @@ %package -n php-recode Summary: Standard PHP module provides GNU recode support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_recode:BuildRequires: recode-devel} %description -n php-recode @@ -72,7 +84,7 @@ %package -n php-mcrypt Summary: Standard PHP module provides mcrypt library support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_mcrypt:BuildRequires: libmcrypt-devel} %description -n php-mcrypt @@ -82,17 +94,27 @@ %package -n php-mhash Summary: Standard PHP module provides mhash support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_mhash:BuildRequires: mhash-devel} %description -n php-mhash Standard PHP module provides mhash support +%package -n php-sqlite +Summary: Standard PHP module provides sqlite support +Group: Development/Languages +Requires: php = %{version} +#%%{?_with_sqlite:BuildRequires: sqlite-devel} + +%description -n php-sqlite +Standard PHP module provides sqlite support + + %package -n php-tidy Summary: Standard PHP module provides tidy library support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_tidy:BuildRequires: libtidy-devel} %description -n php-tidy @@ -102,7 +124,7 @@ %package -n php-mssql Summary: Standard PHP module provides mssql support Group: Development/Languages -Requires: php >= %{version}, php-api = %{apiver} +Requires: php = %{version} %{?_with_mssql:BuildRequires: freetds-devel} %description -n php-mssql @@ -130,7 +152,7 @@ # cause libtool to avoid passing -rpath when linking # (this hack is well-known as "libtool rpath workaround") sed -i 's|^hardcode_libdir_flag_spec|hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "|' libtool - + make %{?_smp_mflags} popd @@ -241,29 +263,26 @@ #%%files %define fil() %%{?_with_%1:%%files -n php-%1 -f files.%1} %{expand:%fil dbase} +%{expand:%fil fam} %{expand:%fil readline} %{expand:%fil recode} %{expand:%fil mcrypt} %{expand:%fil mhash} +%{expand:%fil sqlite} %{expand:%fil tidy} %{expand:%fil mssql} %changelog -* Wed Mar 1 2006 Dmitry Butskoy - 5.1.2-2 -- more accurate Requires for the main php - (using php-api, provided now by the Core php package). - -* Tue Feb 28 2006 Dmitry Butskoy - 5.1.2-1 -- update to 5.1.2 -- replace readline patch (old issue go away and a new appears). +* Tue Feb 28 2006 Dmitry Butskoy - 5.0.4-3 - apply well-known "libtool-rpath-workaround" (see in Internet ;-)) to avoid use -rpath for linking -* Sat Dec 17 2005 Dmitry Butskoy - 5.1.1-1 -- upgrade to 5.1.1 for FC5 -- drop now missed "fam" and obsolete "sqlite" (sqlite2) modules +* Sat Dec 17 2005 Dmitry Butskoy - 5.0.4-2 +- don't build "fam" and "sqlite" by default. + ("fam" will disappear in php >= 5.1, bundled "sqlite" is sqlite 2.x, + but php >= 5.1 use system's sqlite >= 3.0.0) * Mon Nov 14 2005 Dmitry Butskoy - 5.0.4-1 - spec file cleanups Index: sources =================================================================== RCS file: /cvs/extras/rpms/php-extras/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 25 Mar 2006 18:13:47 -0000 1.2 +++ sources 30 Mar 2006 10:19:21 -0000 1.3 @@ -1 +1 @@ -b5b6564e8c6a0d5bc1d2b4787480d792 php-5.1.2.tar.gz +8edf259bcfab4cfc890a4bb4e7c3649f php-5.0.4.tar.gz --- php-extras-5.1.2-readline.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 10:21:01 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 03:21:01 -0700 Subject: rpms/scim-anthy/FC-4 .cvsignore, 1.9, 1.10 scim-anthy.spec, 1.24, 1.25 sources, 1.11, 1.12 Message-ID: <200603301021.k2UAL3EH028500@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28479 Modified Files: .cvsignore scim-anthy.spec sources Log Message: * Thu Mar 30 2006 Akira TAGOH - 1.0.0-1 - New upstream release. - can input numerals when the candidate window doesn't appear. (#185934) - add an UI for the symbol style. (#178400) - scim-anthy-helper-moduledir.patch: backported from devel to tweak the helper module install dir since scim.pc now returns moduledir with api-version. - remove anthy-imengine-helper.la. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 30 Jan 2006 10:16:07 -0000 1.9 +++ .cvsignore 30 Mar 2006 10:21:01 -0000 1.10 @@ -2,3 +2,5 @@ scim-anthy-0.7.1.tar.gz scim-anthy-0.8.0.tar.gz scim-anthy-0.9.0.tar.gz +*.rpm +scim-anthy-1.0.0.tar.gz Index: scim-anthy.spec =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/scim-anthy.spec,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- scim-anthy.spec 30 Jan 2006 10:16:07 -0000 1.24 +++ scim-anthy.spec 30 Mar 2006 10:21:01 -0000 1.25 @@ -1,5 +1,5 @@ Name: scim-anthy -Version: 0.9.0 +Version: 1.0.0 Release: 1%{?dist} License: GPL @@ -7,7 +7,8 @@ Source0: http://sourceforge.jp/projects/scim-imengine/files/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: scim-devel -BuildRequires: anthy-devel >= 6700b-1 +BuildRequires: anthy-devel >= 6700b-1 gettext-devel +Patch1: scim-anthy-helper-moduledir.patch Summary: SCIM IMEngine for anthy for Japanese input Group: System Environment/Libraries @@ -18,6 +19,11 @@ %prep %setup -q +%patch1 -p1 -b .1-moduledir +# patch1 touches src/Makefile.am +aclocal +automake +autoconf %build @@ -29,7 +35,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT -rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/{IMEngine,SetupUI}/*.la +rm $RPM_BUILD_ROOT%{_libdir}/scim-1.0/*/*/*.la %find_lang %{name} @@ -41,11 +47,21 @@ %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING NEWS README TODO -%{_libdir}/scim-1.0 +%{_libdir}/scim-1.0/*/Helper/anthy-imengine-helper.so +%{_libdir}/scim-1.0/*/IMEngine/anthy.so +%{_libdir}/scim-1.0/*/SetupUI/anthy-imengine-setup.so %{_datadir}/scim %changelog +* Thu Mar 30 2006 Akira TAGOH - 1.0.0-1 +- New upstream release. + - can input numerals when the candidate window doesn't appear. (#185934) + - add an UI for the symbol style. (#178400) +- scim-anthy-helper-moduledir.patch: backported from devel to tweak the helper + module install dir since scim.pc now returns moduledir with api-version. +- remove anthy-imengine-helper.la. + * Mon Jan 30 2006 Akira TAGOH - 0.9.0-1 - New upstream release. - scim-anthy-wide-latin.diff: removed. Index: sources =================================================================== RCS file: /cvs/extras/rpms/scim-anthy/FC-4/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 30 Jan 2006 10:16:07 -0000 1.11 +++ sources 30 Mar 2006 10:21:01 -0000 1.12 @@ -1 +1 @@ -5e4742d011cdbf3554cc276f74a11ea9 scim-anthy-0.9.0.tar.gz +b0c452da1886ba36f47d9bd9f6ea7a10 scim-anthy-1.0.0.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 10:22:26 2006 From: fedora-extras-commits at redhat.com (Adrian Reber (adrian)) Date: Thu, 30 Mar 2006 03:22:26 -0700 Subject: rpms/grip/FC-5 grip-3.2.0-default.patch, 1.1, 1.2 grip.spec, 1.11, 1.12 Message-ID: <200603301022.k2UAMSxc028577@cvs-int.fedora.redhat.com> Author: adrian Update of /cvs/extras/rpms/grip/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28554 Modified Files: grip-3.2.0-default.patch grip.spec Log Message: * Mon Feb 13 2006 Adrian Reber - 1:3.2.0-11 - changed grip-3.2.0-default.patch to fix #187023 grip-3.2.0-default.patch: Index: grip-3.2.0-default.patch =================================================================== RCS file: /cvs/extras/rpms/grip/FC-5/grip-3.2.0-default.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- grip-3.2.0-default.patch 2 Mar 2005 08:48:40 -0000 1.1 +++ grip-3.2.0-default.patch 30 Mar 2006 10:22:26 -0000 1.2 @@ -23,6 +23,15 @@ {"",""} --- grip-3.2.0/src/grip.c.rh-default-encoder 2004-04-15 20:23:54.000000000 +0200 +++ grip-3.2.0/src/grip.c 2004-06-20 01:51:47.994840760 +0200 +@@ -515,7 +515,7 @@ + GtkWidget *logo; + GtkWidget *ebox; + GtkWidget *button; +- char versionbuf[20]; ++ char versionbuf[22]; + + aboutpage=MakeNewPage(uinfo->notebook,_("About")); + @@ -832,7 +832,7 @@ ginfo->using_builtin_cdp=FALSE; #endif Index: grip.spec =================================================================== RCS file: /cvs/extras/rpms/grip/FC-5/grip.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- grip.spec 13 Feb 2006 21:05:19 -0000 1.11 +++ grip.spec 30 Mar 2006 10:22:26 -0000 1.12 @@ -1,7 +1,7 @@ Summary: Front-end for CD rippers and Ogg Vorbis encoders Name: grip Version: 3.2.0 -Release: 10%{?dist} +Release: 11%{?dist} Epoch: 1 License: GPL Group: Applications/Multimedia @@ -72,6 +72,9 @@ %{_mandir}/man1/* %changelog +* Mon Feb 13 2006 Adrian Reber - 1:3.2.0-11 +- changed grip-3.2.0-default.patch to fix #187023 + * Mon Feb 13 2006 Adrian Reber - 1:3.2.0-10 - rebuilt From fedora-extras-commits at redhat.com Thu Mar 30 10:23:21 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 03:23:21 -0700 Subject: rpms/scim-anthy/FC-4 scim-anthy-helper-moduledir.patch,NONE,1.1 Message-ID: <200603301023.k2UANNNq028648@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/scim-anthy/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28630 Added Files: scim-anthy-helper-moduledir.patch Log Message: add scim-anthy-helper-moduledir.patch: --- NEW FILE scim-anthy-helper-moduledir.patch --- --- scim-anthy-0.9.0/src/Makefile.am~ 2006-01-28 11:05:42.000000000 +0900 +++ scim-anthy-0.9.0/src/Makefile.am 2006-02-09 16:19:59.000000000 +0900 @@ -125,7 +125,7 @@ if SCIM_BUILD_HELPER HELPER_MODULE = anthy-imengine-helper.la endif -helpermoduledir = @SCIM_MODULEDIR@/`pkg-config --variable=scim_binary_version scim`/Helper +helpermoduledir = @SCIM_MODULEDIR@/Helper helpermodule_LTLIBRARIES = $(HELPER_MODULE) anthy_imengine_helper_la_SOURCES = scim_anthy_helper.cpp From fedora-extras-commits at redhat.com Thu Mar 30 11:00:33 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 04:00:33 -0700 Subject: rpms/dosbox/FC-5 .cvsignore, 1.3, 1.4 dosbox.spec, 1.17, 1.18 sources, 1.3, 1.4 dosbox-64bit-gcc4.1.patch, 1.1, NONE dosbox-gcc4.1.patch, 1.1, NONE dosbox-x86-64-build.patch, 1.4, NONE Message-ID: <200603301100.k2UB0ZEN028844@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dosbox/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28765/FC-5 Modified Files: .cvsignore dosbox.spec sources Removed Files: dosbox-64bit-gcc4.1.patch dosbox-gcc4.1.patch dosbox-x86-64-build.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:56:55 -0000 1.3 +++ .cvsignore 30 Mar 2006 11:00:33 -0000 1.4 @@ -1 +1 @@ -dosbox-0.63.tar.gz +dosbox-0.65.tar.gz Index: dosbox.spec =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-5/dosbox.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dosbox.spec 14 Feb 2006 08:43:05 -0000 1.17 +++ dosbox.spec 30 Mar 2006 11:00:33 -0000 1.18 @@ -1,6 +1,6 @@ Name: dosbox -Version: 0.63 -Release: 9%{?dist} +Version: 0.65 +Release: 1%{?dist} Summary: x86/DOS emulator with sound and graphics @@ -10,14 +10,13 @@ Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: dosbox.desktop Source2: dosbox.png -# See upstream bug 1414547 -Patch0: dosbox-64bit-gcc4.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libpng-devel BuildRequires: SDL-devel BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel +BuildRequireS: libGLU-devel %description @@ -33,7 +32,6 @@ %prep %setup -q -%patch0 -p1 %build %configure --enable-shots @@ -72,6 +70,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +0.65-1 +- version upgrade + * Tue Feb 14 2006 Andreas Bierfert 0.63-9 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:56:55 -0000 1.3 +++ sources 30 Mar 2006 11:00:33 -0000 1.4 @@ -1 +1 @@ -629413e41224ae9cdd115fdafd55cbdc dosbox-0.63.tar.gz +fef84c292c3aeae747368b9875c1575a dosbox-0.65.tar.gz --- dosbox-64bit-gcc4.1.patch DELETED --- --- dosbox-gcc4.1.patch DELETED --- --- dosbox-x86-64-build.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 11:00:34 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 04:00:34 -0700 Subject: rpms/dosbox/devel .cvsignore, 1.3, 1.4 dosbox.spec, 1.17, 1.18 sources, 1.3, 1.4 dosbox-64bit-gcc4.1.patch, 1.1, NONE dosbox-gcc4.1.patch, 1.1, NONE dosbox-x86-64-build.patch, 1.4, NONE Message-ID: <200603301100.k2UB0aHi028850@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dosbox/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28765/devel Modified Files: .cvsignore dosbox.spec sources Removed Files: dosbox-64bit-gcc4.1.patch dosbox-gcc4.1.patch dosbox-x86-64-build.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dosbox/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:56:55 -0000 1.3 +++ .cvsignore 30 Mar 2006 11:00:34 -0000 1.4 @@ -1 +1 @@ -dosbox-0.63.tar.gz +dosbox-0.65.tar.gz Index: dosbox.spec =================================================================== RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- dosbox.spec 14 Feb 2006 08:43:05 -0000 1.17 +++ dosbox.spec 30 Mar 2006 11:00:34 -0000 1.18 @@ -1,6 +1,6 @@ Name: dosbox -Version: 0.63 -Release: 9%{?dist} +Version: 0.65 +Release: 1%{?dist} Summary: x86/DOS emulator with sound and graphics @@ -10,14 +10,13 @@ Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: dosbox.desktop Source2: dosbox.png -# See upstream bug 1414547 -Patch0: dosbox-64bit-gcc4.1.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libpng-devel BuildRequires: SDL-devel BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel +BuildRequireS: libGLU-devel %description @@ -33,7 +32,6 @@ %prep %setup -q -%patch0 -p1 %build %configure --enable-shots @@ -72,6 +70,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +0.65-1 +- version upgrade + * Tue Feb 14 2006 Andreas Bierfert 0.63-9 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dosbox/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:56:55 -0000 1.3 +++ sources 30 Mar 2006 11:00:34 -0000 1.4 @@ -1 +1 @@ -629413e41224ae9cdd115fdafd55cbdc dosbox-0.63.tar.gz +fef84c292c3aeae747368b9875c1575a dosbox-0.65.tar.gz --- dosbox-64bit-gcc4.1.patch DELETED --- --- dosbox-gcc4.1.patch DELETED --- --- dosbox-x86-64-build.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 11:00:27 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 04:00:27 -0700 Subject: rpms/dosbox/FC-3 .cvsignore, 1.3, 1.4 dosbox.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200603301100.k2UB0xh3028856@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dosbox/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28765/FC-3 Modified Files: .cvsignore dosbox.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:56:55 -0000 1.3 +++ .cvsignore 30 Mar 2006 11:00:27 -0000 1.4 @@ -1 +1 @@ -dosbox-0.63.tar.gz +dosbox-0.65.tar.gz Index: dosbox.spec =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-3/dosbox.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dosbox.spec 13 Feb 2005 11:56:55 -0000 1.6 +++ dosbox.spec 30 Mar 2006 11:00:27 -0000 1.7 @@ -1,5 +1,5 @@ Name: dosbox -Version: 0.63 +Version: 0.65 Release: 1 Epoch: 0 Summary: An x86/DOS emulator with sound/graphics @@ -16,6 +16,7 @@ BuildRequires: SDL-devel BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel +BuildRequires: xorg-x11-devel %description @@ -66,6 +67,10 @@ %{_datadir}/pixmaps/dosbox.png %changelog +* Thu Mar 30 2006 Andreas Bierfert +0:0.65-1 +- version upgrade + * Thu Nov 25 2004 Andreas Bierfert 0:0.63-1 - new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:56:55 -0000 1.3 +++ sources 30 Mar 2006 11:00:27 -0000 1.4 @@ -1 +1 @@ -629413e41224ae9cdd115fdafd55cbdc dosbox-0.63.tar.gz +fef84c292c3aeae747368b9875c1575a dosbox-0.65.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 11:00:28 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 04:00:28 -0700 Subject: rpms/dosbox/FC-4 .cvsignore, 1.3, 1.4 dosbox.spec, 1.13, 1.14 sources, 1.3, 1.4 dosbox-x86-64-build.patch, 1.4, NONE Message-ID: <200603301101.k2UB109G028861@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dosbox/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28765/FC-4 Modified Files: .cvsignore dosbox.spec sources Removed Files: dosbox-x86-64-build.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:56:55 -0000 1.3 +++ .cvsignore 30 Mar 2006 11:00:27 -0000 1.4 @@ -1 +1 @@ -dosbox-0.63.tar.gz +dosbox-0.65.tar.gz Index: dosbox.spec =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-4/dosbox.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- dosbox.spec 30 May 2005 19:44:28 -0000 1.13 +++ dosbox.spec 30 Mar 2006 11:00:27 -0000 1.14 @@ -1,6 +1,6 @@ Name: dosbox -Version: 0.63 -Release: 6 +Version: 0.65 +Release: 1 Summary: x86/DOS emulator with sound and graphics @@ -10,13 +10,13 @@ Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: dosbox.desktop Source2: dosbox.png -Patch0: dosbox-x86-64-build.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: libpng-devel BuildRequires: SDL-devel BuildRequires: desktop-file-utils BuildRequires: alsa-lib-devel +BuildRequires: xorg-x11-devel %description @@ -32,7 +32,6 @@ %prep %setup -q -%patch0 %build %configure --enable-shots @@ -71,12 +70,16 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +0.65-1 +- version upgrade + * Mon May 30 2005 Andreas Bierfert -0.64-6 +0.63-6 - add a x86_64 bugfix from upstream * Mon May 30 2005 Andreas Bierfert -0.64-5 +0.63-5 - more build fixes and cleanups... * Mon May 30 2005 Andreas Bierfert Index: sources =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:56:55 -0000 1.3 +++ sources 30 Mar 2006 11:00:27 -0000 1.4 @@ -1 +1 @@ -629413e41224ae9cdd115fdafd55cbdc dosbox-0.63.tar.gz +fef84c292c3aeae747368b9875c1575a dosbox-0.65.tar.gz --- dosbox-x86-64-build.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 11:05:58 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 04:05:58 -0700 Subject: rpms/dosbox/FC-4 dosbox.spec,1.14,1.15 Message-ID: <200603301106.k2UB60XE031171@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/dosbox/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31154 Modified Files: dosbox.spec Log Message: - add dist Index: dosbox.spec =================================================================== RCS file: /cvs/extras/rpms/dosbox/FC-4/dosbox.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- dosbox.spec 30 Mar 2006 11:00:27 -0000 1.14 +++ dosbox.spec 30 Mar 2006 11:05:58 -0000 1.15 @@ -1,6 +1,6 @@ Name: dosbox Version: 0.65 -Release: 1 +Release: 1%{?dist} Summary: x86/DOS emulator with sound and graphics From fedora-extras-commits at redhat.com Thu Mar 30 12:02:36 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 05:02:36 -0700 Subject: rpms/dvdisaster/devel .cvsignore, 1.3, 1.4 dvdisaster.spec, 1.7, 1.8 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE Message-ID: <200603301203.k2UC38YG001261@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1240 Modified Files: .cvsignore dvdisaster.spec sources Removed Files: dvdisaster.desktop Log Message: Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 31 Jan 2006 14:02:39 -0000 1.3 +++ .cvsignore 30 Mar 2006 12:02:36 -0000 1.4 @@ -1 +1 @@ -dvdisaster-0.65.tar.bz2 +dvdisaster-0.66.tar.bz2 Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dvdisaster.spec 14 Feb 2006 18:06:14 -0000 1.7 +++ dvdisaster.spec 30 Mar 2006 12:02:36 -0000 1.8 @@ -1,12 +1,11 @@ Name: dvdisaster -Summary: CD/DVD media data loss/scratch/aging protection -Version: 0.65 -Release: 2%{?dist} +Summary: Additional error protection for CD/DVD media +Version: 0.66 +Release: 1%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2 -Source1: dvdisaster.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,10 +33,10 @@ se il supporto dovesse danneggiarsi col tempo. %description -l cs -%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat -na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m. -Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch -sektor??, pokud se disk pozd??ji po??kod??. +%{name} poskytuje dodate??nou ochranu proti ztr??t?? dat na m??di??ch CD a DVD +zp??soben??ch po??kr??b??n??m nebo st??rnut??m. Vytv?????? data oprav chyb, kter?? +jsou pou??ita pro obnovu ne??iteln??ch sektor??, pokud se disk pozd??ji +po??kod??. %prep @@ -46,41 +45,35 @@ %build -%configure +%configure \ + --docdir=%{_docdir} \ + --docsubdir=%{name}-%{version} \ + --localedir=%{_datadir}/locale \ + --with-nls=yes + #make show -make %{?_smp_mflags} \ - PREFIX=%{_prefix} \ - BINDIR=%{_bindir} \ - MANDIR=%{_mandir} \ - LOCALEDIR=%{_prefix}/share/locale \ - DOCDIR=%{_docdir} \ - DOCSUBDIR=%{_docdir}/%{name}-%{version} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ +make install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ DOCSUBDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \ MANDIR=$RPM_BUILD_ROOT%{_mandir} \ LOCALEDIR=$RPM_BUILD_ROOT%{_prefix}/share/locale -for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print` -do - sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man -done +rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 icons/create.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png - -sed 's/@NAME@/%{name}/g' %{SOURCE1} >%{name}.desktop +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{name}.desktop + contrib/%{name}.desktop %find_lang %{name} @@ -113,8 +106,11 @@ %changelog -* Tue Feb 14 2006 Dmitry Butskoy - 0.65-2 -- rebuild for FC5 +* Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 +- upgrade to 0.66 +- spec file changes/cleanups, merged from a skeleton now included upstream +- still specify dirs explicitly on install due to typo in GNUmakefile +- remove unneeded uninstall.sh script after install * Tue Jan 31 2006 Dmitry Butskoy - 0.65-1 - upgrade to 0.65 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jan 2006 14:02:39 -0000 1.3 +++ sources 30 Mar 2006 12:02:36 -0000 1.4 @@ -1 +1 @@ -bcab797d77656ca6c672cb646b9c7971 dvdisaster-0.65.tar.bz2 +0bae5ab6bad8c4613d1250609ed1fbab dvdisaster-0.66.tar.bz2 --- dvdisaster.desktop DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:04:31 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 05:04:31 -0700 Subject: rpms/dvdisaster/FC-5 dvdisaster.spec, 1.7, 1.8 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE Message-ID: <200603301204.k2UC4X9o001376@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1357 Modified Files: dvdisaster.spec sources Removed Files: dvdisaster.desktop Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-5/dvdisaster.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dvdisaster.spec 14 Feb 2006 18:06:14 -0000 1.7 +++ dvdisaster.spec 30 Mar 2006 12:04:30 -0000 1.8 @@ -1,12 +1,11 @@ Name: dvdisaster -Summary: CD/DVD media data loss/scratch/aging protection -Version: 0.65 -Release: 2%{?dist} +Summary: Additional error protection for CD/DVD media +Version: 0.66 +Release: 1%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2 -Source1: dvdisaster.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,10 +33,10 @@ se il supporto dovesse danneggiarsi col tempo. %description -l cs -%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat -na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m. -Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch -sektor??, pokud se disk pozd??ji po??kod??. +%{name} poskytuje dodate??nou ochranu proti ztr??t?? dat na m??di??ch CD a DVD +zp??soben??ch po??kr??b??n??m nebo st??rnut??m. Vytv?????? data oprav chyb, kter?? +jsou pou??ita pro obnovu ne??iteln??ch sektor??, pokud se disk pozd??ji +po??kod??. %prep @@ -46,41 +45,35 @@ %build -%configure +%configure \ + --docdir=%{_docdir} \ + --docsubdir=%{name}-%{version} \ + --localedir=%{_datadir}/locale \ + --with-nls=yes + #make show -make %{?_smp_mflags} \ - PREFIX=%{_prefix} \ - BINDIR=%{_bindir} \ - MANDIR=%{_mandir} \ - LOCALEDIR=%{_prefix}/share/locale \ - DOCDIR=%{_docdir} \ - DOCSUBDIR=%{_docdir}/%{name}-%{version} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ +make install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ DOCSUBDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \ MANDIR=$RPM_BUILD_ROOT%{_mandir} \ LOCALEDIR=$RPM_BUILD_ROOT%{_prefix}/share/locale -for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print` -do - sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man -done +rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 icons/create.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png - -sed 's/@NAME@/%{name}/g' %{SOURCE1} >%{name}.desktop +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{name}.desktop + contrib/%{name}.desktop %find_lang %{name} @@ -113,8 +106,11 @@ %changelog -* Tue Feb 14 2006 Dmitry Butskoy - 0.65-2 -- rebuild for FC5 +* Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 +- upgrade to 0.66 +- spec file changes/cleanups, merged from a skeleton now included upstream +- still specify dirs explicitly on install due to typo in GNUmakefile +- remove unneeded uninstall.sh script after install * Tue Jan 31 2006 Dmitry Butskoy - 0.65-1 - upgrade to 0.65 Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jan 2006 14:02:39 -0000 1.3 +++ sources 30 Mar 2006 12:04:30 -0000 1.4 @@ -1 +1 @@ -bcab797d77656ca6c672cb646b9c7971 dvdisaster-0.65.tar.bz2 +0bae5ab6bad8c4613d1250609ed1fbab dvdisaster-0.66.tar.bz2 --- dvdisaster.desktop DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:05:10 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 05:05:10 -0700 Subject: rpms/dvdisaster/FC-4 dvdisaster.spec, 1.6, 1.7 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE Message-ID: <200603301205.k2UC5CCe001410@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1390 Modified Files: dvdisaster.spec sources Removed Files: dvdisaster.desktop Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-4/dvdisaster.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dvdisaster.spec 31 Jan 2006 14:18:05 -0000 1.6 +++ dvdisaster.spec 30 Mar 2006 12:05:09 -0000 1.7 @@ -1,12 +1,11 @@ Name: dvdisaster -Summary: CD/DVD media data loss/scratch/aging protection -Version: 0.65 +Summary: Additional error protection for CD/DVD media +Version: 0.66 Release: 1%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2 -Source1: dvdisaster.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,10 +33,10 @@ se il supporto dovesse danneggiarsi col tempo. %description -l cs -%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat -na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m. -Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch -sektor??, pokud se disk pozd??ji po??kod??. +%{name} poskytuje dodate??nou ochranu proti ztr??t?? dat na m??di??ch CD a DVD +zp??soben??ch po??kr??b??n??m nebo st??rnut??m. Vytv?????? data oprav chyb, kter?? +jsou pou??ita pro obnovu ne??iteln??ch sektor??, pokud se disk pozd??ji +po??kod??. %prep @@ -46,41 +45,35 @@ %build -%configure +%configure \ + --docdir=%{_docdir} \ + --docsubdir=%{name}-%{version} \ + --localedir=%{_datadir}/locale \ + --with-nls=yes + #make show -make %{?_smp_mflags} \ - PREFIX=%{_prefix} \ - BINDIR=%{_bindir} \ - MANDIR=%{_mandir} \ - LOCALEDIR=%{_prefix}/share/locale \ - DOCDIR=%{_docdir} \ - DOCSUBDIR=%{_docdir}/%{name}-%{version} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ +make install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ DOCSUBDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \ MANDIR=$RPM_BUILD_ROOT%{_mandir} \ LOCALEDIR=$RPM_BUILD_ROOT%{_prefix}/share/locale -for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print` -do - sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man -done +rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 icons/create.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png - -sed 's/@NAME@/%{name}/g' %{SOURCE1} >%{name}.desktop +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{name}.desktop + contrib/%{name}.desktop %find_lang %{name} @@ -113,6 +106,12 @@ %changelog +* Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 +- upgrade to 0.66 +- spec file changes/cleanups, merged from a skeleton now included upstream +- still specify dirs explicitly on install due to typo in GNUmakefile +- remove unneeded uninstall.sh script after install + * Tue Jan 31 2006 Dmitry Butskoy - 0.65-1 - upgrade to 0.65 - drop browser patch (no more needed) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jan 2006 14:05:15 -0000 1.3 +++ sources 30 Mar 2006 12:05:09 -0000 1.4 @@ -1 +1 @@ -bcab797d77656ca6c672cb646b9c7971 dvdisaster-0.65.tar.bz2 +0bae5ab6bad8c4613d1250609ed1fbab dvdisaster-0.66.tar.bz2 --- dvdisaster.desktop DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:05:37 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Thu, 30 Mar 2006 05:05:37 -0700 Subject: rpms/dvdisaster/FC-3 dvdisaster.spec, 1.6, 1.7 sources, 1.3, 1.4 dvdisaster.desktop, 1.1, NONE Message-ID: <200603301205.k2UC5dF6001447@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1426 Modified Files: dvdisaster.spec sources Removed Files: dvdisaster.desktop Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-3/dvdisaster.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dvdisaster.spec 31 Jan 2006 14:19:10 -0000 1.6 +++ dvdisaster.spec 30 Mar 2006 12:05:37 -0000 1.7 @@ -1,12 +1,11 @@ Name: dvdisaster -Summary: CD/DVD media data loss/scratch/aging protection -Version: 0.65 +Summary: Additional error protection for CD/DVD media +Version: 0.66 Release: 1%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2 -Source1: dvdisaster.desktop BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -34,10 +33,10 @@ se il supporto dovesse danneggiarsi col tempo. %description -l cs -%{name} poskytuje dodate??n?? zabezpe??en?? proti ztr??t?? dat -na CD a DVD m??di??ch zp??soben?? st??rnut??m nebo po??kr??b??n??m. -Vytv?????? data oprav chyb, kter?? jsou pou??ita k obnov?? ne??iteln??ch -sektor??, pokud se disk pozd??ji po??kod??. +%{name} poskytuje dodate??nou ochranu proti ztr??t?? dat na m??di??ch CD a DVD +zp??soben??ch po??kr??b??n??m nebo st??rnut??m. Vytv?????? data oprav chyb, kter?? +jsou pou??ita pro obnovu ne??iteln??ch sektor??, pokud se disk pozd??ji +po??kod??. %prep @@ -46,41 +45,35 @@ %build -%configure +%configure \ + --docdir=%{_docdir} \ + --docsubdir=%{name}-%{version} \ + --localedir=%{_datadir}/locale \ + --with-nls=yes + #make show -make %{?_smp_mflags} \ - PREFIX=%{_prefix} \ - BINDIR=%{_bindir} \ - MANDIR=%{_mandir} \ - LOCALEDIR=%{_prefix}/share/locale \ - DOCDIR=%{_docdir} \ - DOCSUBDIR=%{_docdir}/%{name}-%{version} +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install \ +make install \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ DOCSUBDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \ MANDIR=$RPM_BUILD_ROOT%{_mandir} \ LOCALEDIR=$RPM_BUILD_ROOT%{_prefix}/share/locale -for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print` -do - sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man -done +rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 icons/create.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png - -sed 's/@NAME@/%{name}/g' %{SOURCE1} >%{name}.desktop +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ - %{name}.desktop + contrib/%{name}.desktop %find_lang %{name} @@ -113,6 +106,12 @@ %changelog +* Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 +- upgrade to 0.66 +- spec file changes/cleanups, merged from a skeleton now included upstream +- still specify dirs explicitly on install due to typo in GNUmakefile +- remove unneeded uninstall.sh script after install + * Tue Jan 31 2006 Dmitry Butskoy - 0.65-1 - upgrade to 0.65 - drop browser patch (no more needed) Index: sources =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 31 Jan 2006 14:08:12 -0000 1.3 +++ sources 30 Mar 2006 12:05:37 -0000 1.4 @@ -1 +1 @@ -bcab797d77656ca6c672cb646b9c7971 dvdisaster-0.65.tar.bz2 +0bae5ab6bad8c4613d1250609ed1fbab dvdisaster-0.66.tar.bz2 --- dvdisaster.desktop DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:07:43 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:07:43 -0700 Subject: rpms/koffice/FC-5 koffice-filters-krita-tiff.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 koffice.spec, 1.32, 1.33 sources, 1.8, 1.9 koffice-kotext-lines.patch, 1.1, NONE koffice-kspread-cpp.patch, 1.1, NONE Message-ID: <200603301207.k2UC7jQi001546@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1499/FC-5 Modified Files: .cvsignore koffice.spec sources Added Files: koffice-filters-krita-tiff.patch Removed Files: koffice-kotext-lines.patch koffice-kspread-cpp.patch Log Message: - version upgrade koffice-filters-krita-tiff.patch: --- NEW FILE koffice-filters-krita-tiff.patch --- --- branches/koffice/1.5/koffice/filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp 2006/03/24 09:22:37 522034 +++ branches/koffice/1.5/koffice/filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp 2006/03/27 12:34:23 523115 @@ -26,8 +26,8 @@ #include namespace { - const Q_INT32 MAX_CHANNEL_YCbCr = 3; - const Q_INT32 MAX_CHANNEL_YCbCrA = 4; + const Q_INT32 MAX_CHANNEL_YCbCr_U8 = 3; + const Q_INT32 MAX_CHANNEL_YCbCrA_U8 = 4; } KisYCbCrU8ColorSpace::KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* p) @@ -169,15 +169,15 @@ } Q_UINT32 KisYCbCrU8ColorSpace::nChannels() const { - return MAX_CHANNEL_YCbCrA; + return MAX_CHANNEL_YCbCrA_U8; } Q_UINT32 KisYCbCrU8ColorSpace::nColorChannels() const { - return MAX_CHANNEL_YCbCr; + return MAX_CHANNEL_YCbCr_U8; } Q_UINT32 KisYCbCrU8ColorSpace::pixelSize() const { - return MAX_CHANNEL_YCbCrA*sizeof(Q_UINT8); + return MAX_CHANNEL_YCbCrA_U8*sizeof(Q_UINT8); } @@ -192,7 +192,7 @@ Q_INT32 i = 0; uchar *j = img.bits(); - while ( i < width * height * MAX_CHANNEL_YCbCrA) { + while ( i < width * height * MAX_CHANNEL_YCbCrA_U8) { Q_UINT8 Y = *( data + i + PIXEL_Y ); Q_UINT8 Cb = *( data + i + PIXEL_Cb ); Q_UINT8 Cr = *( data + i + PIXEL_Cr ); @@ -210,8 +210,8 @@ *( j + 1 ) = Cb; *( j + 0 ) = Cr;*/ #endif - i += MAX_CHANNEL_YCbCrA; - j += MAX_CHANNEL_YCbCrA; + i += MAX_CHANNEL_YCbCrA_U8; + j += MAX_CHANNEL_YCbCrA_U8; } return img; } @@ -265,7 +265,7 @@ } if (srcAlpha == OPACITY_OPAQUE) { - memcpy(dst, src, MAX_CHANNEL_YCbCrA * sizeof(Q_UINT8)); + memcpy(dst, src, MAX_CHANNEL_YCbCrA_U8 * sizeof(Q_UINT8)); } else { Q_UINT8 dstAlpha = dst[PIXEL_ALPHA]; @@ -285,7 +285,7 @@ } if (srcBlend == OPACITY_OPAQUE) { - memcpy(dst, src, MAX_CHANNEL_YCbCr * sizeof(Q_UINT8)); + memcpy(dst, src, MAX_CHANNEL_YCbCr_U8 * sizeof(Q_UINT8)); } else { dst[PIXEL_Y] = UINT8_BLEND(src[PIXEL_Y], dst[PIXEL_Y], srcBlend); dst[PIXEL_Cb] = UINT8_BLEND(src[PIXEL_Cb], dst[PIXEL_Cb], srcBlend); @@ -295,8 +295,8 @@ } columns--; - src += MAX_CHANNEL_YCbCrA; - dst += MAX_CHANNEL_YCbCrA; + src += MAX_CHANNEL_YCbCrA_U8; + dst += MAX_CHANNEL_YCbCrA_U8; } rows--; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 15 Mar 2006 21:16:35 -0000 1.8 +++ .cvsignore 30 Mar 2006 12:07:42 -0000 1.9 @@ -1 +1 @@ -koffice-1.4.95.tar.bz2 +koffice-1.5.0-rc1.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- koffice.spec 15 Mar 2006 21:16:35 -0000 1.32 +++ koffice.spec 30 Mar 2006 12:07:42 -0000 1.33 @@ -1,17 +1,17 @@ Name: koffice -Version: 1.4.95 -Release: 1%{?dist} +Version: 1.5.0 +Release: 0.1.rc1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-beta2/koffice-1.4.95.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-rc1/src/koffice-1.5.0-rc1.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -Patch1: koffice-kspread-cpp.patch +Patch1: koffice-filters-krita-tiff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -206,9 +206,9 @@ %{summary} %prep -%setup -q +%setup -q -n %{name}-%{version}-rc1 %patch0 -p1 -%patch1 +%patch1 -p4 # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -513,7 +513,6 @@ %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png %{_datadir}/apps/kross -%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -669,7 +668,6 @@ %{_libdir}/kde3/krita_rgb_u16_plugin.* %{_libdir}/kde3/kritabumpmap.* %{_libdir}/kde3/kritacmykplugin.* -%{_libdir}/kde3/kritacubismfilter.* %{_libdir}/kde3/kritadropshadow.* %{_libdir}/kde3/kritafiltersgallery.* %{_libdir}/kde3/kritahistogramdocker.* @@ -692,6 +690,7 @@ %{_libdir}/kde3/libkritapngimport.* %{_libdir}/kde3/libkritatiffexport.* %{_libdir}/kde3/libkritatiffimport.* +%{_libdir}/kde3/kritaperftest.* %{_datadir}/apps/krita %{_datadir}/services/krita*.desktop %{_datadir}/servicetypes/krita*.desktop @@ -895,6 +894,10 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.5.0-0.1.rc1 +- version upgrade + * Mon Mar 13 2006 Andreas Bierfert 1.4.95-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 15 Mar 2006 21:16:35 -0000 1.8 +++ sources 30 Mar 2006 12:07:42 -0000 1.9 @@ -1 +1 @@ -ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 +e9346977d18c67185d5b50f49ee8225b koffice-1.5.0-rc1.tar.bz2 --- koffice-kotext-lines.patch DELETED --- --- koffice-kspread-cpp.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:07:43 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:07:43 -0700 Subject: rpms/koffice/devel koffice-filters-krita-tiff.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 koffice.spec, 1.32, 1.33 sources, 1.8, 1.9 koffice-kotext-lines.patch, 1.1, NONE koffice-kspread-cpp.patch, 1.1, NONE Message-ID: <200603301207.k2UC7jQI001554@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1499/devel Modified Files: .cvsignore koffice.spec sources Added Files: koffice-filters-krita-tiff.patch Removed Files: koffice-kotext-lines.patch koffice-kspread-cpp.patch Log Message: - version upgrade koffice-filters-krita-tiff.patch: --- NEW FILE koffice-filters-krita-tiff.patch --- --- branches/koffice/1.5/koffice/filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp 2006/03/24 09:22:37 522034 +++ branches/koffice/1.5/koffice/filters/krita/tiff/kis_ycbcr_u8_colorspace.cpp 2006/03/27 12:34:23 523115 @@ -26,8 +26,8 @@ #include namespace { - const Q_INT32 MAX_CHANNEL_YCbCr = 3; - const Q_INT32 MAX_CHANNEL_YCbCrA = 4; + const Q_INT32 MAX_CHANNEL_YCbCr_U8 = 3; + const Q_INT32 MAX_CHANNEL_YCbCrA_U8 = 4; } KisYCbCrU8ColorSpace::KisYCbCrU8ColorSpace(KisColorSpaceFactoryRegistry* parent, KisProfile* p) @@ -169,15 +169,15 @@ } Q_UINT32 KisYCbCrU8ColorSpace::nChannels() const { - return MAX_CHANNEL_YCbCrA; + return MAX_CHANNEL_YCbCrA_U8; } Q_UINT32 KisYCbCrU8ColorSpace::nColorChannels() const { - return MAX_CHANNEL_YCbCr; + return MAX_CHANNEL_YCbCr_U8; } Q_UINT32 KisYCbCrU8ColorSpace::pixelSize() const { - return MAX_CHANNEL_YCbCrA*sizeof(Q_UINT8); + return MAX_CHANNEL_YCbCrA_U8*sizeof(Q_UINT8); } @@ -192,7 +192,7 @@ Q_INT32 i = 0; uchar *j = img.bits(); - while ( i < width * height * MAX_CHANNEL_YCbCrA) { + while ( i < width * height * MAX_CHANNEL_YCbCrA_U8) { Q_UINT8 Y = *( data + i + PIXEL_Y ); Q_UINT8 Cb = *( data + i + PIXEL_Cb ); Q_UINT8 Cr = *( data + i + PIXEL_Cr ); @@ -210,8 +210,8 @@ *( j + 1 ) = Cb; *( j + 0 ) = Cr;*/ #endif - i += MAX_CHANNEL_YCbCrA; - j += MAX_CHANNEL_YCbCrA; + i += MAX_CHANNEL_YCbCrA_U8; + j += MAX_CHANNEL_YCbCrA_U8; } return img; } @@ -265,7 +265,7 @@ } if (srcAlpha == OPACITY_OPAQUE) { - memcpy(dst, src, MAX_CHANNEL_YCbCrA * sizeof(Q_UINT8)); + memcpy(dst, src, MAX_CHANNEL_YCbCrA_U8 * sizeof(Q_UINT8)); } else { Q_UINT8 dstAlpha = dst[PIXEL_ALPHA]; @@ -285,7 +285,7 @@ } if (srcBlend == OPACITY_OPAQUE) { - memcpy(dst, src, MAX_CHANNEL_YCbCr * sizeof(Q_UINT8)); + memcpy(dst, src, MAX_CHANNEL_YCbCr_U8 * sizeof(Q_UINT8)); } else { dst[PIXEL_Y] = UINT8_BLEND(src[PIXEL_Y], dst[PIXEL_Y], srcBlend); dst[PIXEL_Cb] = UINT8_BLEND(src[PIXEL_Cb], dst[PIXEL_Cb], srcBlend); @@ -295,8 +295,8 @@ } columns--; - src += MAX_CHANNEL_YCbCrA; - dst += MAX_CHANNEL_YCbCrA; + src += MAX_CHANNEL_YCbCrA_U8; + dst += MAX_CHANNEL_YCbCrA_U8; } rows--; Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 15 Mar 2006 21:16:35 -0000 1.8 +++ .cvsignore 30 Mar 2006 12:07:43 -0000 1.9 @@ -1 +1 @@ -koffice-1.4.95.tar.bz2 +koffice-1.5.0-rc1.tar.bz2 Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v retrieving revision 1.32 retrieving revision 1.33 diff -u -r1.32 -r1.33 --- koffice.spec 15 Mar 2006 21:16:35 -0000 1.32 +++ koffice.spec 30 Mar 2006 12:07:43 -0000 1.33 @@ -1,17 +1,17 @@ Name: koffice -Version: 1.4.95 -Release: 1%{?dist} +Version: 1.5.0 +Release: 0.1.rc1%{?dist} Summary: A free, integrated office suite for KDE Group: Applications/Productivity License: GPL/LGPL URL: http://www.koffice.org/ -Source0: ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-beta2/koffice-1.4.95.tar.bz2 +Source0: ftp://ftp.kde.org/pub/kde/unstable/koffice-1.5-rc1/src/koffice-1.5.0-rc1.tar.bz2 Source100: koshell.png # stuff for the build configuration Patch0: koffice-admin-gcc4isok.patch -Patch1: koffice-kspread-cpp.patch +Patch1: koffice-filters-krita-tiff.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # BuildRequires: world-devel ;) @@ -206,9 +206,9 @@ %{summary} %prep -%setup -q +%setup -q -n %{name}-%{version}-rc1 %patch0 -p1 -%patch1 +%patch1 -p4 # this will make sure that patch0 is considered make -f admin/Makefile.common @@ -513,7 +513,6 @@ %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png %{_datadir}/apps/kross -%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* @@ -669,7 +668,6 @@ %{_libdir}/kde3/krita_rgb_u16_plugin.* %{_libdir}/kde3/kritabumpmap.* %{_libdir}/kde3/kritacmykplugin.* -%{_libdir}/kde3/kritacubismfilter.* %{_libdir}/kde3/kritadropshadow.* %{_libdir}/kde3/kritafiltersgallery.* %{_libdir}/kde3/kritahistogramdocker.* @@ -692,6 +690,7 @@ %{_libdir}/kde3/libkritapngimport.* %{_libdir}/kde3/libkritatiffexport.* %{_libdir}/kde3/libkritatiffimport.* +%{_libdir}/kde3/kritaperftest.* %{_datadir}/apps/krita %{_datadir}/services/krita*.desktop %{_datadir}/servicetypes/krita*.desktop @@ -895,6 +894,10 @@ %{_datadir}/applications/fedora-kplato.desktop %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.5.0-0.1.rc1 +- version upgrade + * Mon Mar 13 2006 Andreas Bierfert 1.4.95-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/koffice/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 15 Mar 2006 21:16:35 -0000 1.8 +++ sources 30 Mar 2006 12:07:43 -0000 1.9 @@ -1 +1 @@ -ddeca5c989e892baf4871a443fd2daea koffice-1.4.95.tar.bz2 +e9346977d18c67185d5b50f49ee8225b koffice-1.5.0-rc1.tar.bz2 --- koffice-kotext-lines.patch DELETED --- --- koffice-kspread-cpp.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:11:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:11:25 -0700 Subject: rpms/fbdesk/FC-4 .cvsignore, 1.3, 1.4 fbdesk.spec, 1.8, 1.9 sources, 1.3, 1.4 Message-ID: <200603301211.k2UCBRQE001740@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1660/FC-4 Modified Files: .cvsignore fbdesk.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:02:17 -0000 1.3 +++ .cvsignore 30 Mar 2006 12:11:25 -0000 1.4 @@ -1 +1 @@ -fbdesk-1.2.1.tar.gz +fbdesk-1.4.0.tar.gz Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-4/fbdesk.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- fbdesk.spec 6 Apr 2005 22:11:37 -0000 1.8 +++ fbdesk.spec 30 Mar 2006 12:11:25 -0000 1.9 @@ -1,13 +1,13 @@ Name: fbdesk -Version: 1.2.1 -Release: 2 +Version: 1.4.0 +Release: 1%{?dist} Summary: Icon Manager for Fluxbox Group: User Interface/Desktops License: MIT URL: http://fluxbox.sourceforge.net/fbdesk/ -Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz +Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.4.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel BuildRequires: freetype-devel @@ -47,6 +47,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.4.0-1 +- version upgrade + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:02:17 -0000 1.3 +++ sources 30 Mar 2006 12:11:25 -0000 1.4 @@ -1 +1 @@ -382a32a6e26b3f3d3a647fa4bdc81b7a fbdesk-1.2.1.tar.gz +c52a5c2524d90c0613394478dce39156 fbdesk-1.4.0.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 12:11:26 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:11:26 -0700 Subject: rpms/fbdesk/FC-5 .cvsignore, 1.3, 1.4 fbdesk.spec, 1.14, 1.15 sources, 1.3, 1.4 fbdesk-gcc41.patch, 1.1, NONE Message-ID: <200603301211.k2UCBSL9001746@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1660/FC-5 Modified Files: .cvsignore fbdesk.spec sources Removed Files: fbdesk-gcc41.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:02:17 -0000 1.3 +++ .cvsignore 30 Mar 2006 12:11:26 -0000 1.4 @@ -1 +1 @@ -fbdesk-1.2.1.tar.gz +fbdesk-1.4.0.tar.gz Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-5/fbdesk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fbdesk.spec 2 Mar 2006 00:35:09 -0000 1.14 +++ fbdesk.spec 30 Mar 2006 12:11:26 -0000 1.15 @@ -1,14 +1,13 @@ Name: fbdesk -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.4.0 +Release: 4%{?dist} Summary: Icon Manager for Fluxbox Group: User Interface/Desktops License: MIT URL: http://fluxbox.sourceforge.net/fbdesk/ -Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz -Patch0: fbdesk-gcc41.patch +Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.4.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: freetype-devel BuildRequires: libpng-devel @@ -25,7 +24,6 @@ %prep %setup -q -%patch0 %build %configure --x-includes=%{_includedir} --x-libraries=%{_libdir} @@ -50,6 +48,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.4.0 +- version upgrade + * Thu Mar 02 2006 Andreas Bierfert 1.2.1-3 - add gcc4.1 patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:02:17 -0000 1.3 +++ sources 30 Mar 2006 12:11:26 -0000 1.4 @@ -1 +1 @@ -382a32a6e26b3f3d3a647fa4bdc81b7a fbdesk-1.2.1.tar.gz +c52a5c2524d90c0613394478dce39156 fbdesk-1.4.0.tar.gz --- fbdesk-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:11:27 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:11:27 -0700 Subject: rpms/fbdesk/devel .cvsignore, 1.3, 1.4 fbdesk.spec, 1.14, 1.15 sources, 1.3, 1.4 fbdesk-gcc41.patch, 1.1, NONE Message-ID: <200603301211.k2UCBTv6001752@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1660/devel Modified Files: .cvsignore fbdesk.spec sources Removed Files: fbdesk-gcc41.patch Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:02:17 -0000 1.3 +++ .cvsignore 30 Mar 2006 12:11:27 -0000 1.4 @@ -1 +1 @@ -fbdesk-1.2.1.tar.gz +fbdesk-1.4.0.tar.gz Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- fbdesk.spec 2 Mar 2006 00:35:09 -0000 1.14 +++ fbdesk.spec 30 Mar 2006 12:11:27 -0000 1.15 @@ -1,14 +1,13 @@ Name: fbdesk -Version: 1.2.1 -Release: 3%{?dist} +Version: 1.4.0 +Release: 4%{?dist} Summary: Icon Manager for Fluxbox Group: User Interface/Desktops License: MIT URL: http://fluxbox.sourceforge.net/fbdesk/ -Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz -Patch0: fbdesk-gcc41.patch +Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.4.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: freetype-devel BuildRequires: libpng-devel @@ -25,7 +24,6 @@ %prep %setup -q -%patch0 %build %configure --x-includes=%{_includedir} --x-libraries=%{_libdir} @@ -50,6 +48,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.4.0 +- version upgrade + * Thu Mar 02 2006 Andreas Bierfert 1.2.1-3 - add gcc4.1 patch Index: sources =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:02:17 -0000 1.3 +++ sources 30 Mar 2006 12:11:27 -0000 1.4 @@ -1 +1 @@ -382a32a6e26b3f3d3a647fa4bdc81b7a fbdesk-1.2.1.tar.gz +c52a5c2524d90c0613394478dce39156 fbdesk-1.4.0.tar.gz --- fbdesk-gcc41.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 12:11:25 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 05:11:25 -0700 Subject: rpms/fbdesk/FC-3 .cvsignore, 1.3, 1.4 fbdesk.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200603301211.k2UCBveN001757@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1660/FC-3 Modified Files: .cvsignore fbdesk.spec sources Log Message: - version upgrade Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2005 11:02:17 -0000 1.3 +++ .cvsignore 30 Mar 2006 12:11:25 -0000 1.4 @@ -1 +1 @@ -fbdesk-1.2.1.tar.gz +fbdesk-1.4.0.tar.gz Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-3/fbdesk.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- fbdesk.spec 13 Feb 2005 11:02:17 -0000 1.6 +++ fbdesk.spec 30 Mar 2006 12:11:25 -0000 1.7 @@ -1,13 +1,13 @@ Name: fbdesk -Version: 1.2.1 -Release: 1 +Version: 1.4.0 +Release: 1%{?dist} Epoch: 0 Summary: Icon Manager for Fluxbox Group: User Interface/Desktops License: MIT URL: http://fluxbox.sourceforge.net/fbdesk/ -Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.2.1.tar.gz +Source0: http://fluxbox.sourceforge.net/download/fbdesk-1.4.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot BuildRequires: XFree86-devel BuildRequires: freetype-devel @@ -47,6 +47,10 @@ %changelog +* Thu Mar 30 2006 Andreas Bierfert +1.4.0-1 +- version ugprade + * Sun Feb 13 2005 Andreas Bierfert 1.2.1-1 - version upgrade Index: sources =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2005 11:02:17 -0000 1.3 +++ sources 30 Mar 2006 12:11:25 -0000 1.4 @@ -1 +1 @@ -382a32a6e26b3f3d3a647fa4bdc81b7a fbdesk-1.2.1.tar.gz +c52a5c2524d90c0613394478dce39156 fbdesk-1.4.0.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 12:56:22 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:56:22 -0700 Subject: rpms/perl-Data-HexDump - New directory Message-ID: <200603301256.k2UCuOO5002195@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2174/perl-Data-HexDump Log Message: Directory /cvs/extras/rpms/perl-Data-HexDump added to the repository From fedora-extras-commits at redhat.com Thu Mar 30 12:56:23 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:56:23 -0700 Subject: rpms/perl-Data-HexDump/devel - New directory Message-ID: <200603301256.k2UCuPKB002198@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2174/perl-Data-HexDump/devel Log Message: Directory /cvs/extras/rpms/perl-Data-HexDump/devel added to the repository From fedora-extras-commits at redhat.com Thu Mar 30 12:56:41 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:56:41 -0700 Subject: rpms/perl-Data-HexDump/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603301256.k2UCuhBH002255@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2219/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Data-HexDump --- NEW 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 Mar 30 12:56:40 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:56:40 -0700 Subject: rpms/perl-Data-HexDump Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603301256.k2UCugUa002252@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2219 Added Files: Makefile import.log Log Message: Setup of module perl-Data-HexDump --- NEW FILE Makefile --- # Top level Makefile for module perl-Data-HexDump all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 30 12:57:08 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:57:08 -0700 Subject: rpms/perl-Data-HexDump import.log,1.1,1.2 Message-ID: <200603301257.k2UCvAfP002316@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2283 Modified Files: import.log Log Message: auto-import perl-Data-HexDump-0.02-2 on branch devel from perl-Data-HexDump-0.02-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Data-HexDump/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 30 Mar 2006 12:56:40 -0000 1.1 +++ import.log 30 Mar 2006 12:57:08 -0000 1.2 @@ -0,0 +1 @@ +perl-Data-HexDump-0_02-2:HEAD:perl-Data-HexDump-0.02-2.src.rpm:1143723416 From fedora-extras-commits at redhat.com Thu Mar 30 12:57:09 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 05:57:09 -0700 Subject: rpms/perl-Data-HexDump/devel perl-Data-HexDump.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603301257.k2UCvBcD002321@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/perl-Data-HexDump/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2283/devel Modified Files: .cvsignore sources Added Files: perl-Data-HexDump.spec Log Message: auto-import perl-Data-HexDump-0.02-2 on branch devel from perl-Data-HexDump-0.02-2.src.rpm --- NEW FILE perl-Data-HexDump.spec --- Name: perl-Data-HexDump Version: 0.02 Release: 2%{?dist} Summary: Hexadecial Dumper License: GPL or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/Data-HexDump/ Source0: http://www.cpan.org/modules/by-module/Data/Data-HexDump-%{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 Dump in hexadecimal the content of a scalar. The result is returned in a string. Each line of the result consists of the offset in the source in the leftmost column of each line, followed by one or more columns of data from the source in hexadecimal. The rightmost column of each line shows the printable characters (all others are shown as single dots). %prep %setup -q -n Data-HexDump-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor make %{?_smp_mflags} %install rm -rf %{buildroot} make pure_install PERL_INSTALL_ROOT=%{buildroot} # rename binary not to conflict with util-linux mv %{buildroot}%{_bindir}/hexdump %{buildroot}%{_bindir}/hexdump.pl 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}/* %check make test %clean rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README %{_bindir}/hexdump.pl %{perl_vendorlib}/* %{_mandir}/man3/* %changelog * Thu Mar 30 2006 Andreas Thienemann 0.02-2 - Fixed review showstoppers * Thu Mar 30 2006 Andreas Thienemann 0.02-1 - Cleaned up for FE - Specfile autogenerated by cpanspec 1.64. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Data-HexDump/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 30 Mar 2006 12:56:41 -0000 1.1 +++ .cvsignore 30 Mar 2006 12:57:09 -0000 1.2 @@ -0,0 +1 @@ +Data-HexDump-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Data-HexDump/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 30 Mar 2006 12:56:41 -0000 1.1 +++ sources 30 Mar 2006 12:57:09 -0000 1.2 @@ -0,0 +1 @@ +467b7183d1062ab4a502b50c34e7d67f Data-HexDump-0.02.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 12:58:25 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 05:58:25 -0700 Subject: rpms/libfac/FC-5 libfac.spec,1.10,1.11 Message-ID: <200603301258.k2UCwRqn002391@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libfac/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2374 Modified Files: libfac.spec Log Message: * Thu Mar 30 2006 Rex Dieter 2.0.5-4 - BR: factory-devel >= 2.0.5-7 Index: libfac.spec =================================================================== RCS file: /cvs/extras/rpms/libfac/FC-5/libfac.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- libfac.spec 10 Feb 2006 14:27:55 -0000 1.10 +++ libfac.spec 30 Mar 2006 12:58:24 -0000 1.11 @@ -2,7 +2,7 @@ Summary: An extension to Singular-factory Name: libfac Version: 2.0.5 -Release: 3%{?dist}.1 +Release: 4%{?dist} License: GPL Url: http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/Libfac/ @@ -11,8 +11,7 @@ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: factory-devel >= 2.0.5 -#BuildRequires: autoconf +BuildRequires: factory-devel >= 2.0.5-7 %description Singular-libfac is an extension to Singular-factory which implements @@ -54,7 +53,7 @@ %makeinstall # fix perms -chmod a-x $RPM_BUILD_ROOT%{_libdir}/lib*.a +chmod 644 $RPM_BUILD_ROOT%{_libdir}/lib*.a %clean @@ -69,6 +68,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 2.0.5-4 +- BR: factory-devel >= 2.0.5-7 + * Fri Feb 10 2006 Rex Dieter - fc5: gcc/glibc respin From fedora-extras-commits at redhat.com Thu Mar 30 13:02:04 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 06:02:04 -0700 Subject: rpms/fbdesk/FC-4 fbdesk.spec,1.9,1.10 Message-ID: <200603301302.k2UD2ako004506@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442/FC-4 Modified Files: fbdesk.spec Log Message: - add missing BR Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-4/fbdesk.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- fbdesk.spec 30 Mar 2006 12:11:25 -0000 1.9 +++ fbdesk.spec 30 Mar 2006 13:02:04 -0000 1.10 @@ -13,6 +13,7 @@ BuildRequires: freetype-devel BuildRequires: libpng-devel BuildRequires: pkgconfig +BuildRequires: imlib2-devel Requires: fluxbox %description From fedora-extras-commits at redhat.com Thu Mar 30 13:02:11 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 06:02:11 -0700 Subject: rpms/fbdesk/FC-5 fbdesk.spec,1.15,1.16 Message-ID: <200603301302.k2UD2ina004516@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442/FC-5 Modified Files: fbdesk.spec Log Message: - add missing BR Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-5/fbdesk.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fbdesk.spec 30 Mar 2006 12:11:26 -0000 1.15 +++ fbdesk.spec 30 Mar 2006 13:02:10 -0000 1.16 @@ -15,6 +15,7 @@ BuildRequires: libICE-devel libSM-devel libX11-devel libXext-devel BuildRequires: libXft-devel libXpm-devel libXrender-devel BuildRequires: fontconfig-devel +BuildRequires: imlib2-devel Requires: fluxbox %description From fedora-extras-commits at redhat.com Thu Mar 30 13:02:00 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 06:02:00 -0700 Subject: rpms/fbdesk/FC-3 fbdesk.spec,1.7,1.8 Message-ID: <200603301303.k2UD34Jr004586@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442/FC-3 Modified Files: fbdesk.spec Log Message: - add missing BR Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-3/fbdesk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- fbdesk.spec 30 Mar 2006 12:11:25 -0000 1.7 +++ fbdesk.spec 30 Mar 2006 13:02:00 -0000 1.8 @@ -13,6 +13,7 @@ BuildRequires: freetype-devel BuildRequires: libpng-devel BuildRequires: pkgconfig +BuildRequires: imlib2-devel Requires: fluxbox %description From fedora-extras-commits at redhat.com Thu Mar 30 13:02:24 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 06:02:24 -0700 Subject: rpms/fbdesk/devel fbdesk.spec,1.15,1.16 Message-ID: <200603301302.k2UD2w95004573@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4442/devel Modified Files: fbdesk.spec Log Message: - add missing BR Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- fbdesk.spec 30 Mar 2006 12:11:27 -0000 1.15 +++ fbdesk.spec 30 Mar 2006 13:02:24 -0000 1.16 @@ -15,6 +15,7 @@ BuildRequires: libICE-devel libSM-devel libX11-devel libXext-devel BuildRequires: libXft-devel libXpm-devel libXrender-devel BuildRequires: fontconfig-devel +BuildRequires: imlib2-devel Requires: fluxbox %description From fedora-extras-commits at redhat.com Thu Mar 30 14:15:55 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 07:15:55 -0700 Subject: rpms/ser/devel ser-0.9.6-ppc.patch,NONE,1.1 ser.spec,1.1,1.2 Message-ID: <200603301415.k2UEFvhw007259@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7239 Modified Files: ser.spec Added Files: ser-0.9.6-ppc.patch Log Message: * Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 - PPC patch to build the postgresql module on ppc ser-0.9.6-ppc.patch: --- NEW FILE ser-0.9.6-ppc.patch --- --- ser-0.9.6/modules/postgres/aug_sysdep.h.orig 2006-03-30 16:07:32.113066656 +0200 +++ ser-0.9.6/modules/postgres/aug_sysdep.h 2006-03-30 16:05:31.611385696 +0200 @@ -225,6 +225,16 @@ typedef unsigned int augUInt32; #endif /* x86-64 */ + +#if defined(__powerpc) + +#if defined(__GNUC__) +#define AUG_CONFIGURATION "Linux PowerPC with GCC" +#endif + +typedef unsigned int augUInt32; + +#endif /* PowerPC */ #endif /* linux */ /* Index: ser.spec =================================================================== RCS file: /cvs/extras/rpms/ser/devel/ser.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ser.spec 29 Mar 2006 11:18:24 -0000 1.1 +++ ser.spec 30 Mar 2006 14:15:55 -0000 1.2 @@ -4,7 +4,7 @@ Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz @@ -12,6 +12,7 @@ Source2: serweb.conf Source3: ser.init Patch0: serweb-path.patch +Patch1: ser-0.9.6-ppc.patch URL: http://www.iptel.org/ser/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel @@ -66,6 +67,7 @@ %setup -q %setup -q -a 1 %patch0 -p1 -b .path +%patch1 -p1 -b .ppc # Enable SQL support for the acc module sed -i -e 's/#DEFS+=-DSQL_ACC/DEFS+=-DSQL_ACC/' modules/acc/Makefile @@ -199,6 +201,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf %changelog +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 +- PPC patch to build the postgresql module on ppc + * Tue Mar 28 2006 Andreas Thienemann 0.9.6-2 - Changes to the spec-file, to conform to FE policies. From fedora-extras-commits at redhat.com Thu Mar 30 14:24:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 07:24:30 -0700 Subject: rpms/fbdesk/FC-5 fbdesk.spec,1.16,1.17 Message-ID: <200603301424.k2UEOWsB007428@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7397/FC-5 Modified Files: fbdesk.spec Log Message: - fix typo in release Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/FC-5/fbdesk.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fbdesk.spec 30 Mar 2006 13:02:10 -0000 1.16 +++ fbdesk.spec 30 Mar 2006 14:24:30 -0000 1.17 @@ -1,6 +1,6 @@ Name: fbdesk Version: 1.4.0 -Release: 4%{?dist} +Release: 1%{?dist} Summary: Icon Manager for Fluxbox @@ -50,7 +50,7 @@ %changelog * Thu Mar 30 2006 Andreas Bierfert -1.4.0 +1.4.0-1 - version upgrade * Thu Mar 02 2006 Andreas Bierfert From fedora-extras-commits at redhat.com Thu Mar 30 14:24:30 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Thu, 30 Mar 2006 07:24:30 -0700 Subject: rpms/fbdesk/devel fbdesk.spec,1.16,1.17 Message-ID: <200603301424.k2UEOWXQ007432@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/fbdesk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7397/devel Modified Files: fbdesk.spec Log Message: - fix typo in release Index: fbdesk.spec =================================================================== RCS file: /cvs/extras/rpms/fbdesk/devel/fbdesk.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- fbdesk.spec 30 Mar 2006 13:02:24 -0000 1.16 +++ fbdesk.spec 30 Mar 2006 14:24:30 -0000 1.17 @@ -1,6 +1,6 @@ Name: fbdesk Version: 1.4.0 -Release: 4%{?dist} +Release: 1%{?dist} Summary: Icon Manager for Fluxbox @@ -50,7 +50,7 @@ %changelog * Thu Mar 30 2006 Andreas Bierfert -1.4.0 +1.4.0-1 - version upgrade * Thu Mar 02 2006 Andreas Bierfert From fedora-extras-commits at redhat.com Thu Mar 30 15:01:03 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 08:01:03 -0700 Subject: rpms/abcm2ps/devel .cvsignore, 1.14, 1.15 abcm2ps.spec, 1.16, 1.17 sources, 1.14, 1.15 Message-ID: <200603301501.k2UF15uO009477@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8634 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 15 Mar 2006 17:17:05 -0000 1.14 +++ .cvsignore 30 Mar 2006 15:01:02 -0000 1.15 @@ -1,2 +1,2 @@ -abcm2ps-4.12.11.tar.gz +abcm2ps-4.12.12.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- abcm2ps.spec 15 Mar 2006 17:20:08 -0000 1.16 +++ abcm2ps.spec 30 Mar 2006 15:01:02 -0000 1.17 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.11 -Release: 2%{?dist} +Version: 4.12.12 +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-4.12.11.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.12.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 Mar 30 2006 Gerard Milmeister - 4.12.12-1 +- new version 4.12.12 + * Wed Mar 15 2006 Gerard Milmeister - 4.12.11-1 - new version 4.12.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 15 Mar 2006 17:17:05 -0000 1.14 +++ sources 30 Mar 2006 15:01:02 -0000 1.15 @@ -1,2 +1,2 @@ -8052dc74e322ecf065a44cf1e6bd05e0 abcm2ps-4.12.11.tar.gz +e293f78046593cdf9073878690e80e9a abcm2ps-4.12.12.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu Mar 30 15:04:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 08:04:07 -0700 Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.14, 1.15 abcm2ps.spec, 1.15, 1.16 sources, 1.14, 1.15 Message-ID: <200603301504.k2UF49hB009781@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9744/FC-4 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 15 Mar 2006 17:16:59 -0000 1.14 +++ .cvsignore 30 Mar 2006 15:04:07 -0000 1.15 @@ -1,2 +1,2 @@ -abcm2ps-4.12.11.tar.gz +abcm2ps-4.12.12.tar.gz abcplus_en-1.0.4.zip Index: abcm2ps.spec =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- abcm2ps.spec 15 Mar 2006 17:20:02 -0000 1.15 +++ abcm2ps.spec 30 Mar 2006 15:04:07 -0000 1.16 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.11 -Release: 2%{?dist} +Version: 4.12.12 +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-4.12.11.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.12.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 Mar 30 2006 Gerard Milmeister - 4.12.12-1 +- new version 4.12.12 + * Wed Mar 15 2006 Gerard Milmeister - 4.12.11-1 - new version 4.12.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 15 Mar 2006 17:16:59 -0000 1.14 +++ sources 30 Mar 2006 15:04:07 -0000 1.15 @@ -1,2 +1,2 @@ -8052dc74e322ecf065a44cf1e6bd05e0 abcm2ps-4.12.11.tar.gz +e293f78046593cdf9073878690e80e9a abcm2ps-4.12.12.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu Mar 30 15:04:07 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 08:04:07 -0700 Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.14, 1.15 abcm2ps.spec, 1.16, 1.17 sources, 1.14, 1.15 Message-ID: <200603301504.k2UF495j009787@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/rpms/abcm2ps/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9744/FC-5 Modified Files: .cvsignore abcm2ps.spec sources Log Message: new version 4.12.12 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- .cvsignore 15 Mar 2006 17:17:05 -0000 1.14 +++ .cvsignore 30 Mar 2006 15:04:07 -0000 1.15 @@ -1,2 +1,2 @@ -abcm2ps-4.12.11.tar.gz +abcm2ps-4.12.12.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.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- abcm2ps.spec 15 Mar 2006 17:20:08 -0000 1.16 +++ abcm2ps.spec 30 Mar 2006 15:04:07 -0000 1.17 @@ -1,12 +1,12 @@ Name: abcm2ps -Version: 4.12.11 -Release: 2%{?dist} +Version: 4.12.12 +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-4.12.11.tar.gz +Source0: http://moinejf.free.fr/abcm2ps-4.12.12.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 Mar 30 2006 Gerard Milmeister - 4.12.12-1 +- new version 4.12.12 + * Wed Mar 15 2006 Gerard Milmeister - 4.12.11-1 - new version 4.12.11 Index: sources =================================================================== RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 15 Mar 2006 17:17:05 -0000 1.14 +++ sources 30 Mar 2006 15:04:07 -0000 1.15 @@ -1,2 +1,2 @@ -8052dc74e322ecf065a44cf1e6bd05e0 abcm2ps-4.12.11.tar.gz +e293f78046593cdf9073878690e80e9a abcm2ps-4.12.12.tar.gz 99c819d25c4a1db906ae1f09def98e96 abcplus_en-1.0.4.zip From fedora-extras-commits at redhat.com Thu Mar 30 15:19:29 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 08:19:29 -0700 Subject: owners owners.list,1.779,1.780 Message-ID: <200603301519.k2UFJV3G010045@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10028 Modified Files: owners.list Log Message: Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.779 retrieving revision 1.780 diff -u -r1.779 -r1.780 --- owners.list 29 Mar 2006 21:57:47 -0000 1.779 +++ owners.list 30 Mar 2006 15:19:28 -0000 1.780 @@ -1348,6 +1348,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|svgalib|Low-level fullscreen SVGA graphics library|j.w.r.degoede at hhs.nl|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| +Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org| Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org| Fedora Extras|syck|YAML for C, Python, and PHP|oliver at linux-kernel.at|extras-qa at fedoraproject.org| Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 30 15:57:26 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 30 Mar 2006 08:57:26 -0700 Subject: rpms/cfitsio/devel cfitsio.spec,1.13,1.14 Message-ID: <200603301557.k2UFvSof010225@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10163/devel Modified Files: cfitsio.spec Log Message: Forgot to include %defattr() for the devel pacakge. Surprized this was missed for so long. Bugzilla bug 187366 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/devel/cfitsio.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- cfitsio.spec 20 Mar 2006 02:44:49 -0000 1.13 +++ cfitsio.spec 30 Mar 2006 15:57:25 -0000 1.14 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -64,11 +64,15 @@ %{_libdir}/libcfitsio.so.* %files devel +%defattr(-,root,root,-) %{_includedir}/%{name} %{_libdir}/libcfitsio.a %{_libdir}/libcfitsio.so %changelog +* Thu Mar 30 2006 Matthew Truch - 3.006-5 +- Include defattr() for devel package as well - bug 187366 + * Sun Mar 19 2006 Matthew Truch - 3.006-4 - Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 From fedora-extras-commits at redhat.com Thu Mar 30 15:57:18 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 30 Mar 2006 08:57:18 -0700 Subject: rpms/cfitsio/FC-3 cfitsio.spec,1.8,1.9 Message-ID: <200603301557.k2UFvoe7010228@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10163/FC-3 Modified Files: cfitsio.spec Log Message: Forgot to include %defattr() for the devel pacakge. Surprized this was missed for so long. Bugzilla bug 187366 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-3/cfitsio.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- cfitsio.spec 28 Feb 2006 20:33:38 -0000 1.8 +++ cfitsio.spec 30 Mar 2006 15:57:18 -0000 1.9 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -61,11 +61,15 @@ %{_libdir}/libcfitsio.so.* %files devel +%defattr(-,root,root,-) %{_includedir}/%{name} %{_libdir}/libcfitsio.a %{_libdir}/libcfitsio.so %changelog +* Thu Mar 30 2006 Matthew Truch - 3.006-3 +- Use defattr() for devel package as well - bug 187366 + * Tue Feb 28 2006 Matthew Truch - 3.006-2 - Fix spelling typo in name of License.txt file. From fedora-extras-commits at redhat.com Thu Mar 30 15:57:19 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 30 Mar 2006 08:57:19 -0700 Subject: rpms/cfitsio/FC-4 cfitsio.spec,1.12,1.13 Message-ID: <200603301557.k2UFvpVX010231@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10163/FC-4 Modified Files: cfitsio.spec Log Message: Forgot to include %defattr() for the devel pacakge. Surprized this was missed for so long. Bugzilla bug 187366 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-4/cfitsio.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- cfitsio.spec 20 Mar 2006 02:44:37 -0000 1.12 +++ cfitsio.spec 30 Mar 2006 15:57:19 -0000 1.13 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -64,11 +64,15 @@ %{_libdir}/libcfitsio.so.* %files devel +%defattr(-,root,root,-) %{_includedir}/%{name} %{_libdir}/libcfitsio.a %{_libdir}/libcfitsio.so %changelog +* Thu Mar 30 2006 Matthew Truch - 3.006-5 +- Include defattr() for devel package as well - bug 187366 + * Sun Mar 19 2006 Matthew Truch - 3.006-4 - Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 From fedora-extras-commits at redhat.com Thu Mar 30 15:57:20 2006 From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch)) Date: Thu, 30 Mar 2006 08:57:20 -0700 Subject: rpms/cfitsio/FC-5 cfitsio.spec,1.13,1.14 Message-ID: <200603301557.k2UFvqUj010234@cvs-int.fedora.redhat.com> Author: mtruch Update of /cvs/extras/rpms/cfitsio/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10163/FC-5 Modified Files: cfitsio.spec Log Message: Forgot to include %defattr() for the devel pacakge. Surprized this was missed for so long. Bugzilla bug 187366 Index: cfitsio.spec =================================================================== RCS file: /cvs/extras/rpms/cfitsio/FC-5/cfitsio.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- cfitsio.spec 20 Mar 2006 02:44:43 -0000 1.13 +++ cfitsio.spec 30 Mar 2006 15:57:20 -0000 1.14 @@ -1,6 +1,6 @@ Name: cfitsio Version: 3.006 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Library for manipulating FITS data files Group: Development/Libraries @@ -64,11 +64,15 @@ %{_libdir}/libcfitsio.so.* %files devel +%defattr(-,root,root,-) %{_includedir}/%{name} %{_libdir}/libcfitsio.a %{_libdir}/libcfitsio.so %changelog +* Thu Mar 30 2006 Matthew Truch - 3.006-5 +- Include defattr() for devel package as well - bug 187366 + * Sun Mar 19 2006 Matthew Truch - 3.006-4 - Don't use macro {buildroot} in build, only in install as per appended comments to Bugzilla bug 172042 From fedora-extras-commits at redhat.com Thu Mar 30 16:03:53 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 09:03:53 -0700 Subject: rpms/ser/devel ser.spec,1.2,1.3 Message-ID: <200603301603.k2UG3teJ012419@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12402 Modified Files: ser.spec Log Message: * Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 - Fix buildissue with %{_libdir} Index: ser.spec =================================================================== RCS file: /cvs/extras/rpms/ser/devel/ser.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ser.spec 30 Mar 2006 14:15:55 -0000 1.2 +++ ser.spec 30 Mar 2006 16:03:53 -0000 1.3 @@ -4,7 +4,7 @@ Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz @@ -77,19 +77,19 @@ %build -%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ +%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ + %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules done %install rm -rf $RPM_BUILD_ROOT -%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} +%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} + %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules done # postgres extras @@ -201,6 +201,9 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf %changelog +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 +- Fix buildissue with %%{_libdir} + * Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 - PPC patch to build the postgresql module on ppc From fedora-extras-commits at redhat.com Thu Mar 30 16:05:17 2006 From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez)) Date: Thu, 30 Mar 2006 09:05:17 -0700 Subject: owners owners.list,1.780,1.781 Message-ID: <200603301605.k2UG5JKN012493@cvs-int.fedora.redhat.com> Author: ivazquez Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12476 Modified Files: owners.list Log Message: +gnome-applet-music Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.780 retrieving revision 1.781 diff -u -r1.780 -r1.781 --- owners.list 30 Mar 2006 15:19:28 -0000 1.780 +++ owners.list 30 Mar 2006 16:05:17 -0000 1.781 @@ -344,6 +344,7 @@ Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org| Fedora Extras|gnomebaker|Gnome CD burner|bdpepple at ameritech.net|extras-qa at fedoraproject.org| +Fedora Extras|gnome-applet-music|A GNOME panel applet to control various music players|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netmon|GNOME Network Load Applet|ghenry at suretecsystems.com|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org| Fedora Extras|gnome-applet-rhythmbox|A GNOME panel applet to control Rhythmbox's playback|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Thu Mar 30 16:12:00 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 09:12:00 -0700 Subject: owners owners.list,1.781,1.782 Message-ID: <200603301612.k2UGC2ln012547@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12530 Modified Files: owners.list Log Message: Added perl-Data-HexDump Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.781 retrieving revision 1.782 diff -u -r1.781 -r1.782 --- owners.list 30 Mar 2006 16:05:17 -0000 1.781 +++ owners.list 30 Mar 2006 16:12:00 -0000 1.782 @@ -884,6 +884,7 @@ Fedora Extras|perl-Crypt-DSA|Perl module for DSA signatures and key generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Date-Pcalc|Gregorian calendar date calculations|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Thu Mar 30 16:19:12 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:19:12 -0700 Subject: rpms/ircd-hybrid/devel sources,1.4,1.5 Message-ID: <200603301619.k2UGJEkV012600@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12583 Modified Files: sources Log Message: Index: sources =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 29 Mar 2006 18:57:56 -0000 1.4 +++ sources 30 Mar 2006 16:19:11 -0000 1.5 @@ -1 +1 @@ -00901c5e2e9bf44ab37a28596af6608e ircd-hybrid-7.2.1.tgz + From fedora-extras-commits at redhat.com Thu Mar 30 16:25:56 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:25:56 -0700 Subject: rpms/ircd-hybrid import.log,1.21,1.22 Message-ID: <200603301625.k2UGPxWJ012709@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12676 Modified Files: import.log Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-3 from ircd-hybrid-7.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- import.log 29 Mar 2006 18:57:55 -0000 1.21 +++ import.log 30 Mar 2006 16:25:56 -0000 1.22 @@ -18,3 +18,4 @@ ircd-hybrid-7_2_0-5:HEAD:ircd-hybrid-7.2.0-5.src.rpm:1139607686 ircd-hybrid-7_2_0-6:HEAD:ircd-hybrid-7.2.0-6.src.rpm:1139953882 ircd-hybrid-7_2_1-1:HEAD:ircd-hybrid-7.2.1-1.src.rpm:1143658678 +ircd-hybrid-7_2_1-1:FC-3:ircd-hybrid-7.2.1-1.src.rpm:1143735948 From fedora-extras-commits at redhat.com Thu Mar 30 16:25:57 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:25:57 -0700 Subject: rpms/ircd-hybrid/FC-3 .cvsignore, 1.3, 1.4 ircd-hybrid.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200603301625.k2UGPx3U012715@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12676/FC-3 Modified Files: .cvsignore ircd-hybrid.spec sources Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-3 from ircd-hybrid-7.2.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Dec 2005 22:08:50 -0000 1.3 +++ .cvsignore 30 Mar 2006 16:25:57 -0000 1.4 @@ -1 +1 @@ -ircd-hybrid-7.2.0.tgz +ircd-hybrid-7.2.1.tgz Index: ircd-hybrid.spec =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/ircd-hybrid.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ircd-hybrid.spec 12 Dec 2005 15:16:36 -0000 1.6 +++ ircd-hybrid.spec 30 Mar 2006 16:25:57 -0000 1.7 @@ -9,11 +9,11 @@ Summary: Internet Relay Chat Server Name: ircd-hybrid -Version: 7.2.0 -Release: 4%{?dist} +Version: 7.2.1 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons -Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz +Source0: http://ovh.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz Source1: ircd-hybrid.init Source2: ircd-hybrid.sysconfig Patch0: ircd-hybrid-7.2.0-help.diff @@ -126,6 +126,15 @@ %changelog +* Tue Feb 14 2006 Eric Tanguy - 7.2.1-1 +- Update de 7.2.1 + +* Tue Feb 14 2006 Eric Tanguy - 7.2.0-6 +- Rebuild for FC5 + +* Fri Feb 10 2006 Eric Tanguy - 7.2.0-5 +- Rebuild for FC5 + * Fri Dec 09 2005 Eric Tanguy 7.2.0-4 - Modify spec file to help files Index: sources =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Dec 2005 22:08:50 -0000 1.3 +++ sources 30 Mar 2006 16:25:57 -0000 1.4 @@ -1 +1 @@ -e3c716fef0c62eaba147df06f32ea87d ircd-hybrid-7.2.0.tgz +00901c5e2e9bf44ab37a28596af6608e ircd-hybrid-7.2.1.tgz From fedora-extras-commits at redhat.com Thu Mar 30 16:26:54 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:26:54 -0700 Subject: rpms/perl-Test-MockObject/FC-5 .cvsignore, 1.6, 1.7 perl-Test-MockObject.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200603301626.k2UGQuLp012813@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-MockObject/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12773/FC-5 Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Mar 2006 22:42:16 -0000 1.6 +++ .cvsignore 30 Mar 2006 16:26:54 -0000 1.7 @@ -1 +1 @@ -Test-MockObject-1.03.tar.gz +Test-MockObject-1.04.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/perl-Test-MockObject.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Test-MockObject.spec 13 Mar 2006 22:42:16 -0000 1.10 +++ perl-Test-MockObject.spec 30 Mar 2006 16:26:54 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-Test-MockObject -Version: 1.03 +Version: 1.04 Release: 1%{?dist} Summary: Perl extension for emulating troublesome interfaces @@ -11,6 +11,7 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) BuildRequires: perl(UNIVERSAL::can) >= 1.11 @@ -31,21 +32,19 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %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 ';' +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check -mv t/0-signature.t t/0-signature.t.disable -make test +mv t/developer/0-signature.t t/developer/0-signature.t.disable +PERL_RUN_ALL_TESTS=1 ./Build test %clean @@ -60,6 +59,10 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. +- Makefile.PL -> Build.PL. + * Mon Mar 13 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Mar 2006 22:42:16 -0000 1.6 +++ sources 30 Mar 2006 16:26:54 -0000 1.7 @@ -1 +1 @@ -b6a13614c61f68ff1cfc4c5609bff947 Test-MockObject-1.03.tar.gz +03224e5cecd7267c720994eeeb02c376 Test-MockObject-1.04.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 16:26:54 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:26:54 -0700 Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.6, 1.7 perl-Test-MockObject.spec, 1.10, 1.11 sources, 1.6, 1.7 Message-ID: <200603301626.k2UGQvqf012819@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Test-MockObject/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12773/devel Modified Files: .cvsignore perl-Test-MockObject.spec sources Log Message: Update to 1.04. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Mar 2006 22:42:16 -0000 1.6 +++ .cvsignore 30 Mar 2006 16:26:54 -0000 1.7 @@ -1 +1 @@ -Test-MockObject-1.03.tar.gz +Test-MockObject-1.04.tar.gz Index: perl-Test-MockObject.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- perl-Test-MockObject.spec 13 Mar 2006 22:42:16 -0000 1.10 +++ perl-Test-MockObject.spec 30 Mar 2006 16:26:54 -0000 1.11 @@ -1,5 +1,5 @@ Name: perl-Test-MockObject -Version: 1.03 +Version: 1.04 Release: 1%{?dist} Summary: Perl extension for emulating troublesome interfaces @@ -11,6 +11,7 @@ BuildArch: noarch BuildRequires: perl >= 1:5.6.1 +BuildRequires: perl(Module::Build) BuildRequires: perl(Test::Exception) BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) BuildRequires: perl(UNIVERSAL::can) >= 1.11 @@ -31,21 +32,19 @@ %build -%{__perl} Makefile.PL INSTALLDIRS=vendor -make %{?_smp_mflags} +%{__perl} Build.PL installdirs=vendor +./Build %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 ';' +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 chmod -R u+w $RPM_BUILD_ROOT/* %check -mv t/0-signature.t t/0-signature.t.disable -make test +mv t/developer/0-signature.t t/developer/0-signature.t.disable +PERL_RUN_ALL_TESTS=1 ./Build test %clean @@ -60,6 +59,10 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.04-1 +- Update to 1.04. +- Makefile.PL -> Build.PL. + * Mon Mar 13 2006 Jose Pedro Oliveira - 1.03-1 - Update to 1.03. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Mar 2006 22:42:16 -0000 1.6 +++ sources 30 Mar 2006 16:26:54 -0000 1.7 @@ -1 +1 @@ -b6a13614c61f68ff1cfc4c5609bff947 Test-MockObject-1.03.tar.gz +03224e5cecd7267c720994eeeb02c376 Test-MockObject-1.04.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 16:27:15 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:27:15 -0700 Subject: rpms/ircd-hybrid import.log,1.22,1.23 Message-ID: <200603301627.k2UGRH85012869@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12836 Modified Files: import.log Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-4 from ircd-hybrid-7.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- import.log 30 Mar 2006 16:25:56 -0000 1.22 +++ import.log 30 Mar 2006 16:27:15 -0000 1.23 @@ -19,3 +19,4 @@ ircd-hybrid-7_2_0-6:HEAD:ircd-hybrid-7.2.0-6.src.rpm:1139953882 ircd-hybrid-7_2_1-1:HEAD:ircd-hybrid-7.2.1-1.src.rpm:1143658678 ircd-hybrid-7_2_1-1:FC-3:ircd-hybrid-7.2.1-1.src.rpm:1143735948 +ircd-hybrid-7_2_1-1:FC-4:ircd-hybrid-7.2.1-1.src.rpm:1143736027 From fedora-extras-commits at redhat.com Thu Mar 30 16:27:16 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:27:16 -0700 Subject: rpms/ircd-hybrid/FC-4 .cvsignore, 1.3, 1.4 ircd-hybrid.spec, 1.6, 1.7 sources, 1.3, 1.4 Message-ID: <200603301627.k2UGRIFp012875@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12836/FC-4 Modified Files: .cvsignore ircd-hybrid.spec sources Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-4 from ircd-hybrid-7.2.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Dec 2005 22:04:11 -0000 1.3 +++ .cvsignore 30 Mar 2006 16:27:16 -0000 1.4 @@ -1 +1 @@ -ircd-hybrid-7.2.0.tgz +ircd-hybrid-7.2.1.tgz Index: ircd-hybrid.spec =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/ircd-hybrid.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ircd-hybrid.spec 12 Dec 2005 15:15:12 -0000 1.6 +++ ircd-hybrid.spec 30 Mar 2006 16:27:16 -0000 1.7 @@ -9,11 +9,11 @@ Summary: Internet Relay Chat Server Name: ircd-hybrid -Version: 7.2.0 -Release: 4%{?dist} +Version: 7.2.1 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons -Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz +Source0: http://ovh.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz Source1: ircd-hybrid.init Source2: ircd-hybrid.sysconfig Patch0: ircd-hybrid-7.2.0-help.diff @@ -126,6 +126,15 @@ %changelog +* Tue Feb 14 2006 Eric Tanguy - 7.2.1-1 +- Update de 7.2.1 + +* Tue Feb 14 2006 Eric Tanguy - 7.2.0-6 +- Rebuild for FC5 + +* Fri Feb 10 2006 Eric Tanguy - 7.2.0-5 +- Rebuild for FC5 + * Fri Dec 09 2005 Eric Tanguy 7.2.0-4 - Modify spec file to help files Index: sources =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Dec 2005 22:04:11 -0000 1.3 +++ sources 30 Mar 2006 16:27:16 -0000 1.4 @@ -1 +1 @@ -e3c716fef0c62eaba147df06f32ea87d ircd-hybrid-7.2.0.tgz +00901c5e2e9bf44ab37a28596af6608e ircd-hybrid-7.2.1.tgz From fedora-extras-commits at redhat.com Thu Mar 30 16:28:23 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:28:23 -0700 Subject: rpms/ircd-hybrid import.log,1.23,1.24 Message-ID: <200603301628.k2UGSPGh013008@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12975 Modified Files: import.log Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-5 from ircd-hybrid-7.2.1-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/import.log,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- import.log 30 Mar 2006 16:27:15 -0000 1.23 +++ import.log 30 Mar 2006 16:28:23 -0000 1.24 @@ -20,3 +20,4 @@ ircd-hybrid-7_2_1-1:HEAD:ircd-hybrid-7.2.1-1.src.rpm:1143658678 ircd-hybrid-7_2_1-1:FC-3:ircd-hybrid-7.2.1-1.src.rpm:1143735948 ircd-hybrid-7_2_1-1:FC-4:ircd-hybrid-7.2.1-1.src.rpm:1143736027 +ircd-hybrid-7_2_1-1:FC-5:ircd-hybrid-7.2.1-1.src.rpm:1143736095 From fedora-extras-commits at redhat.com Thu Mar 30 16:28:24 2006 From: fedora-extras-commits at redhat.com (Eric Tanguy (tanguy)) Date: Thu, 30 Mar 2006 09:28:24 -0700 Subject: rpms/ircd-hybrid/FC-5 .cvsignore, 1.3, 1.4 ircd-hybrid.spec, 1.9, 1.10 sources, 1.3, 1.4 Message-ID: <200603301628.k2UGSQFv013014@cvs-int.fedora.redhat.com> Author: tanguy Update of /cvs/extras/rpms/ircd-hybrid/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12975/FC-5 Modified Files: .cvsignore ircd-hybrid.spec sources Log Message: auto-import ircd-hybrid-7.2.1-1 on branch FC-5 from ircd-hybrid-7.2.1-1.src.rpm Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Dec 2005 19:14:31 -0000 1.3 +++ .cvsignore 30 Mar 2006 16:28:23 -0000 1.4 @@ -1 +1 @@ -ircd-hybrid-7.2.0.tgz +ircd-hybrid-7.2.1.tgz Index: ircd-hybrid.spec =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-5/ircd-hybrid.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ircd-hybrid.spec 14 Feb 2006 21:51:39 -0000 1.9 +++ ircd-hybrid.spec 30 Mar 2006 16:28:23 -0000 1.10 @@ -9,11 +9,11 @@ Summary: Internet Relay Chat Server Name: ircd-hybrid -Version: 7.2.0 -Release: 6%{?dist} +Version: 7.2.1 +Release: 1%{?dist} License: GPL Group: System Environment/Daemons -Source0: http://voxel.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz +Source0: http://ovh.dl.sourceforge.net/sourceforge/ircd-hybrid/ircd-hybrid-%{version}.tgz Source1: ircd-hybrid.init Source2: ircd-hybrid.sysconfig Patch0: ircd-hybrid-7.2.0-help.diff @@ -126,6 +126,9 @@ %changelog +* Tue Feb 14 2006 Eric Tanguy - 7.2.1-1 +- Update de 7.2.1 + * Tue Feb 14 2006 Eric Tanguy - 7.2.0-6 - Rebuild for FC5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/ircd-hybrid/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Dec 2005 19:14:31 -0000 1.3 +++ sources 30 Mar 2006 16:28:23 -0000 1.4 @@ -1 +1 @@ -e3c716fef0c62eaba147df06f32ea87d ircd-hybrid-7.2.0.tgz +00901c5e2e9bf44ab37a28596af6608e ircd-hybrid-7.2.1.tgz From fedora-extras-commits at redhat.com Thu Mar 30 16:34:29 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 09:34:29 -0700 Subject: rpms/ser/FC-3 ser-0.9.6-ppc.patch,NONE,1.1 ser.spec,1.1,1.2 Message-ID: <200603301635.k2UGZ14i013401@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13340/FC-3 Modified Files: ser.spec Added Files: ser-0.9.6-ppc.patch Log Message: * Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 - Fix buildissue with %{_libdir} ser-0.9.6-ppc.patch: --- NEW FILE ser-0.9.6-ppc.patch --- --- ser-0.9.6/modules/postgres/aug_sysdep.h.orig 2006-03-30 16:07:32.113066656 +0200 +++ ser-0.9.6/modules/postgres/aug_sysdep.h 2006-03-30 16:05:31.611385696 +0200 @@ -225,6 +225,16 @@ typedef unsigned int augUInt32; #endif /* x86-64 */ + +#if defined(__powerpc) + +#if defined(__GNUC__) +#define AUG_CONFIGURATION "Linux PowerPC with GCC" +#endif + +typedef unsigned int augUInt32; + +#endif /* PowerPC */ #endif /* linux */ /* Index: ser.spec =================================================================== RCS file: /cvs/extras/rpms/ser/FC-3/ser.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ser.spec 29 Mar 2006 11:18:24 -0000 1.1 +++ ser.spec 30 Mar 2006 16:34:29 -0000 1.2 @@ -4,7 +4,7 @@ Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 2%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz @@ -12,6 +12,7 @@ Source2: serweb.conf Source3: ser.init Patch0: serweb-path.patch +Patch1: ser-0.9.6-ppc.patch URL: http://www.iptel.org/ser/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel @@ -66,6 +67,7 @@ %setup -q %setup -q -a 1 %patch0 -p1 -b .path +%patch1 -p1 -b .ppc # Enable SQL support for the acc module sed -i -e 's/#DEFS+=-DSQL_ACC/DEFS+=-DSQL_ACC/' modules/acc/Makefile @@ -75,19 +77,19 @@ %build -%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ +%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ + %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules done %install rm -rf $RPM_BUILD_ROOT -%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} +%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} + %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules done # postgres extras @@ -199,6 +201,12 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf %changelog +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 +- Fix buildissue with %%{_libdir} + +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 +- PPC patch to build the postgresql module on ppc + * Tue Mar 28 2006 Andreas Thienemann 0.9.6-2 - Changes to the spec-file, to conform to FE policies. From fedora-extras-commits at redhat.com Thu Mar 30 16:34:30 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 09:34:30 -0700 Subject: rpms/ser/FC-4 ser-0.9.6-ppc.patch,NONE,1.1 ser.spec,1.1,1.2 Message-ID: <200603301635.k2UGZ29X013404@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13340/FC-4 Modified Files: ser.spec Added Files: ser-0.9.6-ppc.patch Log Message: * Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 - Fix buildissue with %{_libdir} ser-0.9.6-ppc.patch: --- NEW FILE ser-0.9.6-ppc.patch --- --- ser-0.9.6/modules/postgres/aug_sysdep.h.orig 2006-03-30 16:07:32.113066656 +0200 +++ ser-0.9.6/modules/postgres/aug_sysdep.h 2006-03-30 16:05:31.611385696 +0200 @@ -225,6 +225,16 @@ typedef unsigned int augUInt32; #endif /* x86-64 */ + +#if defined(__powerpc) + +#if defined(__GNUC__) +#define AUG_CONFIGURATION "Linux PowerPC with GCC" +#endif + +typedef unsigned int augUInt32; + +#endif /* PowerPC */ #endif /* linux */ /* Index: ser.spec =================================================================== RCS file: /cvs/extras/rpms/ser/FC-4/ser.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ser.spec 29 Mar 2006 11:18:24 -0000 1.1 +++ ser.spec 30 Mar 2006 16:34:30 -0000 1.2 @@ -4,7 +4,7 @@ Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 2%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz @@ -12,6 +12,7 @@ Source2: serweb.conf Source3: ser.init Patch0: serweb-path.patch +Patch1: ser-0.9.6-ppc.patch URL: http://www.iptel.org/ser/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel @@ -66,6 +67,7 @@ %setup -q %setup -q -a 1 %patch0 -p1 -b .path +%patch1 -p1 -b .ppc # Enable SQL support for the acc module sed -i -e 's/#DEFS+=-DSQL_ACC/DEFS+=-DSQL_ACC/' modules/acc/Makefile @@ -75,19 +77,19 @@ %build -%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ +%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ + %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules done %install rm -rf $RPM_BUILD_ROOT -%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} +%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} + %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules done # postgres extras @@ -199,6 +201,12 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf %changelog +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 +- Fix buildissue with %%{_libdir} + +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 +- PPC patch to build the postgresql module on ppc + * Tue Mar 28 2006 Andreas Thienemann 0.9.6-2 - Changes to the spec-file, to conform to FE policies. From fedora-extras-commits at redhat.com Thu Mar 30 16:34:31 2006 From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs)) Date: Thu, 30 Mar 2006 09:34:31 -0700 Subject: rpms/ser/FC-5 ser-0.9.6-ppc.patch,NONE,1.1 ser.spec,1.1,1.2 Message-ID: <200603301635.k2UGZ3wZ013407@cvs-int.fedora.redhat.com> Author: ixs Update of /cvs/extras/rpms/ser/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13340/FC-5 Modified Files: ser.spec Added Files: ser-0.9.6-ppc.patch Log Message: * Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 - Fix buildissue with %{_libdir} ser-0.9.6-ppc.patch: --- NEW FILE ser-0.9.6-ppc.patch --- --- ser-0.9.6/modules/postgres/aug_sysdep.h.orig 2006-03-30 16:07:32.113066656 +0200 +++ ser-0.9.6/modules/postgres/aug_sysdep.h 2006-03-30 16:05:31.611385696 +0200 @@ -225,6 +225,16 @@ typedef unsigned int augUInt32; #endif /* x86-64 */ + +#if defined(__powerpc) + +#if defined(__GNUC__) +#define AUG_CONFIGURATION "Linux PowerPC with GCC" +#endif + +typedef unsigned int augUInt32; + +#endif /* PowerPC */ #endif /* linux */ /* Index: ser.spec =================================================================== RCS file: /cvs/extras/rpms/ser/FC-5/ser.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ser.spec 29 Mar 2006 11:18:24 -0000 1.1 +++ ser.spec 30 Mar 2006 16:34:31 -0000 1.2 @@ -4,7 +4,7 @@ Summary: SIP Express Router Name: ser Version: 0.9.6 -Release: 2%{?dist} +Release: 4%{?dist} License: GPL Group: System Environment/Daemons Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz @@ -12,6 +12,7 @@ Source2: serweb.conf Source3: ser.init Patch0: serweb-path.patch +Patch1: ser-0.9.6-ppc.patch URL: http://www.iptel.org/ser/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: expat-devel, libxml2-devel, mysql-devel, postgresql-devel @@ -66,6 +67,7 @@ %setup -q %setup -q -a 1 %patch0 -p1 -b .path +%patch1 -p1 -b .ppc # Enable SQL support for the acc module sed -i -e 's/#DEFS+=-DSQL_ACC/DEFS+=-DSQL_ACC/' modules/acc/Makefile @@ -75,19 +77,19 @@ %build -%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ +%{__make} all skip_modules="%{special_modules}" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ + %{__make} modules modules="modules/$MOD" cfg-target=%{_sysconfdir}/ser/ modules-dir=%{_lib}/ser/modules done %install rm -rf $RPM_BUILD_ROOT -%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} +%{__make} install skip_modules="%{special_modules}" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules for MOD in %{special_modules}; do - %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} + %{__make} install-modules-all modules="modules/$MOD" basedir=%{buildroot} prefix=%{_prefix} cfg-prefix=%{buildroot} modules-dir=%{_lib}/ser/modules done # postgres extras @@ -199,6 +201,12 @@ %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf %changelog +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-4 +- Fix buildissue with %%{_libdir} + +* Thu Mar 30 2006 Andreas Thienemann 0.9.6-3 +- PPC patch to build the postgresql module on ppc + * Tue Mar 28 2006 Andreas Thienemann 0.9.6-2 - Changes to the spec-file, to conform to FE policies. From fedora-extras-commits at redhat.com Thu Mar 30 16:35:30 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:35:30 -0700 Subject: rpms/perl-pmtools/devel perl-pmtools.spec,1.6,1.7 Message-ID: <200603301635.k2UGZWUs013472@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-pmtools/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13453 Modified Files: perl-pmtools.spec Log Message: New doc files: Changes and TODO. Index: perl-pmtools.spec =================================================================== RCS file: /cvs/extras/rpms/perl-pmtools/devel/perl-pmtools.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- perl-pmtools.spec 22 Mar 2006 10:39:22 -0000 1.6 +++ perl-pmtools.spec 30 Mar 2006 16:35:30 -0000 1.7 @@ -1,6 +1,6 @@ Name: perl-pmtools Version: 1.01 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A suite of small programs to help manage Perl modules Group: Development/Libraries @@ -53,7 +53,7 @@ %files %defattr(-,root,root,-) -%doc README +%doc Changes README TODO %{_bindir}/* %{perl_vendorlib}/Devel/ %{_mandir}/man1/*.1* @@ -61,6 +61,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.01-2 +- New doc files: Changes and TODO. + * Wed Mar 22 2006 Jose Pedro Oliveira - 1.01-1 - Update to 1.01. - URL updated: pmtools is now available in CPAN. From fedora-extras-commits at redhat.com Thu Mar 30 16:36:17 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 30 Mar 2006 09:36:17 -0700 Subject: rpms/denyhosts/devel denyhosts-2.2-config.patch, NONE, 1.1 denyhosts.init, 1.5, 1.6 denyhosts.spec, 1.27, 1.28 denyhosts-1.1.4-config.patch, 1.1, NONE Message-ID: <200603301636.k2UGaJ5E013646@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13596 Modified Files: denyhosts.init denyhosts.spec Added Files: denyhosts-2.2-config.patch Removed Files: denyhosts-1.1.4-config.patch Log Message: * Wed Mar 29 2006 Jason L Tibbitts III - 2.2-2 - Specfile cleanups. - Add hostname to default report subject. denyhosts-2.2-config.patch: --- NEW FILE denyhosts-2.2-config.patch --- --- denyhosts.cfg-dist.orig 2006-03-13 15:15:24.000000000 -0600 +++ denyhosts.cfg-dist 2006-03-29 21:53:36.198459392 -0600 @@ -46,13 +46,18 @@ # 'y' = years # # never purge: -PURGE_DENY = +#PURGE_DENY = # # purge entries older than 1 week #PURGE_DENY = 1w # # purge entries older than 5 days #PURGE_DENY = 5d +# +# For the default Fedora Extras install, we want timestamping but no +# expiration (at least by default) so this is deliberately set high. +# Adjust to taste. +PURGE_DENY = 4w ####################################################################### @@ -126,7 +131,7 @@ # Note: it is recommended that you use an absolute pathname # for this value (eg. /home/foo/denyhosts/data) # -WORK_DIR = /usr/share/denyhosts/data +WORK_DIR = /var/lib/denyhosts # ####################################################################### @@ -189,7 +194,7 @@ # match your email address. If you do not want to receive these reports # leave this field blank (or run with the --noemail option) # -ADMIN_EMAIL = +ADMIN_EMAIL = root # ####################################################################### @@ -228,7 +233,7 @@ # # SMTP_SUBJECT: you can specify the "Subject:" of messages sent # by DenyHosts when it reports thwarted abuse attempts -SMTP_SUBJECT = DenyHosts Report +SMTP_SUBJECT = DenyHosts Report from $[HOSTNAME] # ###################################################################### Index: denyhosts.init =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.init,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- denyhosts.init 16 Aug 2005 22:41:43 -0000 1.5 +++ denyhosts.init 30 Mar 2006 16:36:17 -0000 1.6 @@ -15,6 +15,11 @@ # source function library . /etc/rc.d/init.d/functions +# Make sure HOSTNAME is in the environment so denyhosts can +# use it in report subjects +HOSTNAME=$(hostname) +export HOSTNAME + CONTROL=/usr/bin/denyhosts-control CRONLOCK=/var/lock/subsys/denyhosts.init LOCKFILE=/var/lock/subsys/denyhosts Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- denyhosts.spec 14 Mar 2006 17:37:48 -0000 1.27 +++ denyhosts.spec 30 Mar 2006 16:36:17 -0000 1.28 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.2 -release: 1%{?dist} +Release: 2%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -13,11 +13,11 @@ Source4: denyhosts.sysconfig Source5: denyhosts.logrotate Source6: README.fedora -Patch0: denyhosts-1.1.4-config.patch +Patch0: denyhosts-2.2-config.patch Patch1: denyhosts-2.1-setup.patch Patch2: denyhosts-2.0-daemon-control.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArchitectures: noarch +BuildArch: noarch BuildRequires: python-devel Requires: openssh-server @@ -142,6 +142,10 @@ %changelog +* Wed Mar 29 2006 Jason L Tibbitts III - 2.2-2 +- Specfile cleanups. +- Add hostname to default report subject. + * Tue Mar 14 2006 Jason L Tibbitts III - 2.2-1 - Update to 2.2. --- denyhosts-1.1.4-config.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 16:52:51 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:52:51 -0700 Subject: rpms/syslog-ng/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 syslog-ng.spec, 1.11, 1.12 Message-ID: <200603301652.k2UGqr7N014494@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14437/FC-5 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Nov 2005 12:14:48 -0000 1.4 +++ .cvsignore 30 Mar 2006 16:52:51 -0000 1.5 @@ -1 +1 @@ -syslog-ng-1.6.9.tar.gz +syslog-ng-1.6.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Nov 2005 12:14:48 -0000 1.4 +++ sources 30 Mar 2006 16:52:51 -0000 1.5 @@ -1 +1 @@ -5280a86b4f5c25b2ba157c8cea302cf0 syslog-ng-1.6.9.tar.gz +b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-5/syslog-ng.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- syslog-ng.spec 15 Feb 2006 01:14:10 -0000 1.11 +++ syslog-ng.spec 30 Mar 2006 16:52:51 -0000 1.12 @@ -2,8 +2,8 @@ %define sbindir /sbin Name: syslog-ng -Version: 1.6.9 -Release: 3%{?dist} +Version: 1.6.10 +Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons @@ -17,8 +17,7 @@ BuildConflicts: libol-devel < 0.3.17 BuildRequires: flex, tcp_wrappers, which -# Requires sed v3.95 (command line option -i) -Requires: logrotate, sed >= 3.95 +Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts Requires(postun): initscripts @@ -43,7 +42,7 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.17/ChangeLog ChangeLog.libol +mv libol-0.3.18/ChangeLog ChangeLog.libol %build %configure \ @@ -98,7 +97,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt doc/sgml/syslog-ng.ps +%doc doc/sgml/syslog-ng.txt %doc doc/*.demo doc/*.sample %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl @@ -114,6 +113,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 +- Update to 1.6.10. + * Wed Feb 15 2006 Jose Pedro Oliveira - 1.6.9-3 - Rebuild. From fedora-extras-commits at redhat.com Thu Mar 30 16:52:52 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:52:52 -0700 Subject: rpms/syslog-ng/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 syslog-ng.spec, 1.11, 1.12 Message-ID: <200603301652.k2UGqs1e014500@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14437/devel Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 23 Nov 2005 12:14:48 -0000 1.4 +++ .cvsignore 30 Mar 2006 16:52:52 -0000 1.5 @@ -1 +1 @@ -syslog-ng-1.6.9.tar.gz +syslog-ng-1.6.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 23 Nov 2005 12:14:48 -0000 1.4 +++ sources 30 Mar 2006 16:52:52 -0000 1.5 @@ -1 +1 @@ -5280a86b4f5c25b2ba157c8cea302cf0 syslog-ng-1.6.9.tar.gz +b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/devel/syslog-ng.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- syslog-ng.spec 15 Feb 2006 01:14:10 -0000 1.11 +++ syslog-ng.spec 30 Mar 2006 16:52:52 -0000 1.12 @@ -2,8 +2,8 @@ %define sbindir /sbin Name: syslog-ng -Version: 1.6.9 -Release: 3%{?dist} +Version: 1.6.10 +Release: 1%{?dist} Summary: Syslog replacement daemon Group: System Environment/Daemons @@ -17,8 +17,7 @@ BuildConflicts: libol-devel < 0.3.17 BuildRequires: flex, tcp_wrappers, which -# Requires sed v3.95 (command line option -i) -Requires: logrotate, sed >= 3.95 +Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts Requires(postun): initscripts @@ -43,7 +42,7 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.17/ChangeLog ChangeLog.libol +mv libol-0.3.18/ChangeLog ChangeLog.libol %build %configure \ @@ -98,7 +97,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt doc/sgml/syslog-ng.ps +%doc doc/sgml/syslog-ng.txt %doc doc/*.demo doc/*.sample %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl @@ -114,6 +113,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 +- Update to 1.6.10. + * Wed Feb 15 2006 Jose Pedro Oliveira - 1.6.9-3 - Rebuild. From fedora-extras-commits at redhat.com Thu Mar 30 16:52:50 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 09:52:50 -0700 Subject: rpms/syslog-ng/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 syslog-ng.spec, 1.7, 1.8 Message-ID: <200603301652.k2UGqq3B014490@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/syslog-ng/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14437/FC-4 Modified Files: .cvsignore sources syslog-ng.spec Log Message: Update to 1.6.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 2 Dec 2005 20:37:38 -0000 1.4 +++ .cvsignore 30 Mar 2006 16:52:50 -0000 1.5 @@ -1 +1 @@ -syslog-ng-1.6.9.tar.gz +syslog-ng-1.6.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 2 Dec 2005 20:37:38 -0000 1.4 +++ sources 30 Mar 2006 16:52:50 -0000 1.5 @@ -1 +1 @@ -5280a86b4f5c25b2ba157c8cea302cf0 syslog-ng-1.6.9.tar.gz +b723dc5e8454bc274fdab415ac7ea5ea syslog-ng-1.6.10.tar.gz Index: syslog-ng.spec =================================================================== RCS file: /cvs/extras/rpms/syslog-ng/FC-4/syslog-ng.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- syslog-ng.spec 2 Dec 2005 20:37:38 -0000 1.7 +++ syslog-ng.spec 30 Mar 2006 16:52:50 -0000 1.8 @@ -2,7 +2,7 @@ %define sbindir /sbin Name: syslog-ng -Version: 1.6.9 +Version: 1.6.10 Release: 1%{?dist} Summary: Syslog replacement daemon @@ -17,8 +17,7 @@ BuildConflicts: libol-devel < 0.3.17 BuildRequires: flex, tcp_wrappers, which -# Requires sed v3.95 (command line option -i) -Requires: logrotate, sed >= 3.95 +Requires: logrotate Requires(post): chkconfig, initscripts Requires(preun): chkconfig, initscripts Requires(postun): initscripts @@ -48,7 +47,7 @@ %patch1 -p1 %{__sed} -i 's|^#!/usr/local/bin/perl|#!%{__perl}|' contrib/relogger.pl chmod a-x contrib/syslog2ng -mv libol-0.3.17/ChangeLog ChangeLog.libol +mv libol-0.3.18/ChangeLog ChangeLog.libol %build %configure \ @@ -103,7 +102,7 @@ %files %defattr(-,root,root,-) %doc AUTHORS COPYING README README.spoof ChangeLog INSTALL NEWS PORTS -%doc doc/sgml/syslog-ng.txt doc/sgml/syslog-ng.ps +%doc doc/sgml/syslog-ng.txt %doc doc/*.demo doc/*.sample %doc contrib/syslog-ng.conf.doc %doc contrib/syslog2ng doc/stresstest.sh contrib/relogger.pl @@ -119,6 +118,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 1.6.10-1 +- Update to 1.6.10. + * Wed Nov 30 2005 Jose Pedro Oliveira - 1.6.9-1 - Build conflict statement (see: https://lists.balabit.hu/pipermail/syslog-ng/2005-June/007630.html) @@ -260,4 +262,4 @@ * Sun Dec 08 2002 Richard E. Perlotto II 1.5.23-1 - Updated file with notes and PGP signatures -# vim:set ai ts=4 sw=4: +# vim:set ai ts=4 sw=4 sts=4: From fedora-extras-commits at redhat.com Thu Mar 30 17:03:09 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 10:03:09 -0700 Subject: rpms/Macaulay2/FC-5 Macaulay2.spec,1.10,1.11 Message-ID: <200603301703.k2UH3Bv5016680@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16663 Modified Files: Macaulay2.spec Log Message: * Thu Mar 30 2006 Rex Dieter 0.9.2-19 - BR: factory-devel >= 2.0.5-7, libfac-devel >= 2.0.5-4 (bug #183265) Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Macaulay2.spec 14 Sep 2005 14:55:50 -0000 1.10 +++ Macaulay2.spec 30 Mar 2006 17:03:09 -0000 1.11 @@ -6,7 +6,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 0.9.2 -Release: 18%{?dist} +Release: 19%{?dist} License: GPL Group: Applications/Engineering URL: http://www.math.uiuc.edu/Macaulay2/ @@ -26,8 +26,8 @@ BuildRequires: desktop-file-utils BuildRequires: gc-devel >= 6.6 -BuildRequires: factory-devel >= 2.0.5 -BuildRequires: libfac-devel >= 2.0.5 +BuildRequires: factory-devel >= 2.0.5-7 +BuildRequires: libfac-devel >= 2.0.5-4 BuildRequires: gdbm-devel BuildRequires: time @@ -161,6 +161,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 0.9.2-19 +- BR: factory-devel >= 2.0.5-7, libfac-devel >= 2.0.5-4 (bug #183265) + * Wed Sep 14 2005 Rex Dieter - 0.9.2-18 - rebuild against gc-6.6 From fedora-extras-commits at redhat.com Thu Mar 30 17:32:57 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 10:32:57 -0700 Subject: rpms/perl-ExtUtils-CBuilder/FC-4 .cvsignore, 1.13, 1.14 perl-ExtUtils-CBuilder.spec, 1.17, 1.18 sources, 1.13, 1.14 Message-ID: <200603301732.k2UHWxZO016951@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16895/FC-4 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 18 Mar 2006 02:07:13 -0000 1.13 +++ .cvsignore 30 Mar 2006 17:32:56 -0000 1.14 @@ -1 +1 @@ -ExtUtils-CBuilder-0.17.tar.gz +ExtUtils-CBuilder-0.18.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:13 -0000 1.17 +++ perl-ExtUtils-CBuilder.spec 30 Mar 2006 17:32:57 -0000 1.18 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.17 +Version: 0.18 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 - Update to 0.17. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-4/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Mar 2006 02:07:13 -0000 1.13 +++ sources 30 Mar 2006 17:32:57 -0000 1.14 @@ -1 +1 @@ -b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz +d119f0c6c12787a8d5b255208c3c74c5 ExtUtils-CBuilder-0.18.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 17:32:57 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 10:32:57 -0700 Subject: rpms/perl-ExtUtils-CBuilder/FC-5 .cvsignore, 1.13, 1.14 perl-ExtUtils-CBuilder.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200603301732.k2UHWxjt016957@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16895/FC-5 Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 18 Mar 2006 02:07:21 -0000 1.13 +++ .cvsignore 30 Mar 2006 17:32:57 -0000 1.14 @@ -1 +1 @@ -ExtUtils-CBuilder-0.17.tar.gz +ExtUtils-CBuilder-0.18.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:21 -0000 1.18 +++ perl-ExtUtils-CBuilder.spec 30 Mar 2006 17:32:57 -0000 1.19 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.17 +Version: 0.18 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 - Update to 0.17. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/FC-5/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Mar 2006 02:07:21 -0000 1.13 +++ sources 30 Mar 2006 17:32:57 -0000 1.14 @@ -1 +1 @@ -b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz +d119f0c6c12787a8d5b255208c3c74c5 ExtUtils-CBuilder-0.18.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 17:32:58 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 10:32:58 -0700 Subject: rpms/perl-ExtUtils-CBuilder/devel .cvsignore, 1.13, 1.14 perl-ExtUtils-CBuilder.spec, 1.18, 1.19 sources, 1.13, 1.14 Message-ID: <200603301733.k2UHX0Nu016963@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16895/devel Modified Files: .cvsignore perl-ExtUtils-CBuilder.spec sources Log Message: Update to 0.18. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/.cvsignore,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- .cvsignore 18 Mar 2006 02:07:33 -0000 1.13 +++ .cvsignore 30 Mar 2006 17:32:58 -0000 1.14 @@ -1 +1 @@ -ExtUtils-CBuilder-0.17.tar.gz +ExtUtils-CBuilder-0.18.tar.gz Index: perl-ExtUtils-CBuilder.spec =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/perl-ExtUtils-CBuilder.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- perl-ExtUtils-CBuilder.spec 18 Mar 2006 02:07:33 -0000 1.18 +++ perl-ExtUtils-CBuilder.spec 30 Mar 2006 17:32:58 -0000 1.19 @@ -1,5 +1,5 @@ Name: perl-ExtUtils-CBuilder -Version: 0.17 +Version: 0.18 Release: 1%{?dist} Summary: Compile and link C code for Perl modules @@ -53,6 +53,9 @@ %changelog +* Thu Mar 30 2006 Jose Pedro Oliveira - 0.18-1 +- Update to 0.18. + * Sat Mar 18 2006 Jose Pedro Oliveira - 0.17-1 - Update to 0.17. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-ExtUtils-CBuilder/devel/sources,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- sources 18 Mar 2006 02:07:33 -0000 1.13 +++ sources 30 Mar 2006 17:32:58 -0000 1.14 @@ -1 +1 @@ -b5be6bcd5e3d502380cf3d543e283f94 ExtUtils-CBuilder-0.17.tar.gz +d119f0c6c12787a8d5b255208c3c74c5 ExtUtils-CBuilder-0.18.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 17:41:38 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 30 Mar 2006 10:41:38 -0700 Subject: rpms/heartbeat/FC-4 heartbeat-fedora-ccmuser.patch, NONE, 1.1 heartbeat-fedora-chkconfig.patch, NONE, 1.1 heartbeat-fedora-pam.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 heartbeat.spec, 1.1, 1.2 Message-ID: <200603301741.k2UHfeLg017210@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17180 Modified Files: .cvsignore sources heartbeat.spec Added Files: heartbeat-fedora-ccmuser.patch heartbeat-fedora-chkconfig.patch heartbeat-fedora-pam.patch Log Message: Update to 2.0.4 heartbeat-fedora-ccmuser.patch: --- NEW FILE heartbeat-fedora-ccmuser.patch --- diff -Nur heartbeat-2.0.4.orig/cts/CM_LinuxHAv2.py.in heartbeat-2.0.4/cts/CM_LinuxHAv2.py.in --- heartbeat-2.0.4.orig/cts/CM_LinuxHAv2.py.in 2006-02-27 10:19:42.000000000 +0100 +++ heartbeat-2.0.4/cts/CM_LinuxHAv2.py.in 2006-03-27 19:49:36.000000000 +0200 @@ -155,7 +155,7 @@ "root@" + (self["CIBfile"]%node)): raise ValueError("Can not scp file to %s "%node) - self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUID@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") + self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUSER@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") def prepare(self): '''Finish the Initialization process. Prepare to test...''' heartbeat-fedora-chkconfig.patch: --- NEW FILE heartbeat-fedora-chkconfig.patch --- diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.4/heartbeat/init.d/heartbeat.in --- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in 2005-09-10 23:46:23.000000000 +0200 +++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in 2006-03-27 19:55:19.000000000 +0200 @@ -13,7 +13,7 @@ # We don't hate anyone, and like for everyone to use # our software, no matter what OS or distribution you're using. # -# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ +# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ # description: Startup script high-availability services. # processname: heartbeat # pidfile: @localstatedir@/run/heartbeat.pid @@ -51,18 +51,6 @@ RUNDIR=@localstatedir@/run if - [ -r /etc/SuSE-release ] -then - # rc.status is new since SuSE 7.0 - [ -r /etc/rc.status ] && . /etc/rc.status - [ -r /etc/rc.config ] && . /etc/rc.config - - # Determine the base and follow a runlevel link name. - base=${0##*/} - link=${base#*[SK][0-9][0-9]} - -fi -if [ -z "$rc_done" ] then rc_done="Done." @@ -391,12 +379,7 @@ StartHA RC=$? Echo - if - [ $RC -eq 0 ] - then - [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR - touch $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && touch /var/lock/subsys/heartbeat RunStartStop post-start $RC ;; @@ -413,11 +396,7 @@ StopHA RC=$? Echo - if - [ $RC -eq 0 ] - then - rm -f $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && rm -f /var/lock/subsys/heartbeat RunStartStop post-stop $RC StopLogd ;; diff -Nur heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord heartbeat-2.0.4/ldirectord/init.d/ldirectord --- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord 2005-10-17 14:49:21.000000000 +0200 +++ heartbeat-2.0.4/ldirectord/init.d/ldirectord 2006-03-27 19:56:40.000000000 +0200 @@ -2,7 +2,7 @@ # # ldirectord Linux Director Daemon # -# chkconfig: 2345 92 40 +# chkconfig: - 92 40 # description: Start and stop ldirectord on non-heartbeat systems # Using the config file /etc/ha.d/ldirectord.cf # @@ -59,9 +59,11 @@ case "$1" in start) action "Starting ldirectord" $DAEMON start + touch /var/lock/subsys/ldirectord ;; stop) action "Stopping ldirectord" $DAEMON stop + rm -f /var/lock/subsys/ldirectord ;; restart) action "Restarting ldirectord" $DAEMON restart heartbeat-fedora-pam.patch: --- NEW FILE heartbeat-fedora-pam.patch --- diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.4/mgmt/daemon/mgmtd.pam --- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam 2005-12-30 09:35:27.000000000 +0100 +++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam 2006-03-27 19:59:12.000000000 +0200 @@ -1,3 +1,8 @@ -auth required pam_unix.so -account required pam_unix.so - +#%PAM-1.0 +auth sufficient pam_rootok.so +auth sufficient pam_timestamp.so +auth required pam_stack.so service=system-auth +session required pam_permit.so +session optional pam_xauth.so +session optional pam_timestamp.so +account required pam_permit.so Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Mar 2006 06:41:39 -0000 1.2 +++ .cvsignore 30 Mar 2006 17:41:38 -0000 1.3 @@ -1 +1 @@ -heartbeat-2.0.3.tar.gz +heartbeat-2.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Mar 2006 06:41:39 -0000 1.2 +++ sources 30 Mar 2006 17:41:38 -0000 1.3 @@ -1 +1 @@ -ef926928325e7f4c1aaa51b93dffdcf4 heartbeat-2.0.3.tar.gz +659aae2365daea3a17e5a4a4ae0b0a3e heartbeat-2.0.4.tar.gz Index: heartbeat.spec =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- heartbeat.spec 2 Mar 2006 06:41:39 -0000 1.1 +++ heartbeat.spec 30 Mar 2006 17:41:38 -0000 1.2 @@ -5,22 +5,21 @@ %define uname hacluster Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat -Version: 2.0.3 -Release: 9%{?dist} +Version: 2.0.4 +Release: 2%{?dist} License: GPL/LGPL URL: http://linux-ha.org/ Group: System Environment/Daemons Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz -Patch0: heartbeat-2.0.3-fedora-pam.patch -Patch1: heartbeat-2.0.3-fedora-chkconfig.patch -Patch2: heartbeat-2.0.3-fedora-ccmuser.patch +Patch0: heartbeat-fedora-pam.patch +Patch1: heartbeat-fedora-chkconfig.patch +Patch2: heartbeat-fedora-ccmuser.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel BuildRequires: iputils BuildRequires: openssl-devel BuildRequires: libnet-devel BuildRequires: libtool-ltdl-devel -#BuildRequires: fedora-usermgmt BuildRequires: net-snmp-devel BuildRequires: bzip2-devel %if %{ENABLE_MGMT} @@ -291,6 +290,9 @@ %{_libdir}/*.so %changelog +* Wed Mar 29 2006 Joost Soeterbroek - 2.0.4-2 +- Version 2.0.4 + * Wed Mar 1 2006 Joost Soeterbroek - 2.0.3-9 - changed user creation - added patch2 heartbeat-2.0.3-fedora-ccmuser.patch From fedora-extras-commits at redhat.com Thu Mar 30 17:42:04 2006 From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb)) Date: Thu, 30 Mar 2006 10:42:04 -0700 Subject: rpms/heartbeat/FC-5 heartbeat-fedora-ccmuser.patch, NONE, 1.1 heartbeat-fedora-chkconfig.patch, NONE, 1.1 heartbeat-fedora-pam.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 heartbeat.spec, 1.1, 1.2 Message-ID: <200603301742.k2UHg6kd017246@cvs-int.fedora.redhat.com> Author: jsoeterb Update of /cvs/extras/rpms/heartbeat/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17216 Modified Files: .cvsignore sources heartbeat.spec Added Files: heartbeat-fedora-ccmuser.patch heartbeat-fedora-chkconfig.patch heartbeat-fedora-pam.patch Log Message: Update to 2.0.4 heartbeat-fedora-ccmuser.patch: --- NEW FILE heartbeat-fedora-ccmuser.patch --- diff -Nur heartbeat-2.0.4.orig/cts/CM_LinuxHAv2.py.in heartbeat-2.0.4/cts/CM_LinuxHAv2.py.in --- heartbeat-2.0.4.orig/cts/CM_LinuxHAv2.py.in 2006-02-27 10:19:42.000000000 +0100 +++ heartbeat-2.0.4/cts/CM_LinuxHAv2.py.in 2006-03-27 19:49:36.000000000 +0200 @@ -155,7 +155,7 @@ "root@" + (self["CIBfile"]%node)): raise ValueError("Can not scp file to %s "%node) - self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUID@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") + self.rsh.remote_python_call(node, "os", "system", "chown @HA_CCMUSER@ @HA_VARLIBDIR@/heartbeat/crm/cib.xml") def prepare(self): '''Finish the Initialization process. Prepare to test...''' heartbeat-fedora-chkconfig.patch: --- NEW FILE heartbeat-fedora-chkconfig.patch --- diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.4/heartbeat/init.d/heartbeat.in --- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in 2005-09-10 23:46:23.000000000 +0200 +++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in 2006-03-27 19:55:19.000000000 +0200 @@ -13,7 +13,7 @@ # We don't hate anyone, and like for everyone to use # our software, no matter what OS or distribution you're using. # -# chkconfig: 2345 @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ +# chkconfig: - @HB_INITSTARTPRI@ @HB_INITSTOPPRI@ # description: Startup script high-availability services. # processname: heartbeat # pidfile: @localstatedir@/run/heartbeat.pid @@ -51,18 +51,6 @@ RUNDIR=@localstatedir@/run if - [ -r /etc/SuSE-release ] -then - # rc.status is new since SuSE 7.0 - [ -r /etc/rc.status ] && . /etc/rc.status - [ -r /etc/rc.config ] && . /etc/rc.config - - # Determine the base and follow a runlevel link name. - base=${0##*/} - link=${base#*[SK][0-9][0-9]} - -fi -if [ -z "$rc_done" ] then rc_done="Done." @@ -391,12 +379,7 @@ StartHA RC=$? Echo - if - [ $RC -eq 0 ] - then - [ ! -d $LOCKDIR ] && mkdir -p $LOCKDIR - touch $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && touch /var/lock/subsys/heartbeat RunStartStop post-start $RC ;; @@ -413,11 +396,7 @@ StopHA RC=$? Echo - if - [ $RC -eq 0 ] - then - rm -f $LOCKDIR/$SUBSYS - fi + [ $RC -eq 0 ] && rm -f /var/lock/subsys/heartbeat RunStartStop post-stop $RC StopLogd ;; diff -Nur heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord heartbeat-2.0.4/ldirectord/init.d/ldirectord --- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord 2005-10-17 14:49:21.000000000 +0200 +++ heartbeat-2.0.4/ldirectord/init.d/ldirectord 2006-03-27 19:56:40.000000000 +0200 @@ -2,7 +2,7 @@ # # ldirectord Linux Director Daemon # -# chkconfig: 2345 92 40 +# chkconfig: - 92 40 # description: Start and stop ldirectord on non-heartbeat systems # Using the config file /etc/ha.d/ldirectord.cf # @@ -59,9 +59,11 @@ case "$1" in start) action "Starting ldirectord" $DAEMON start + touch /var/lock/subsys/ldirectord ;; stop) action "Stopping ldirectord" $DAEMON stop + rm -f /var/lock/subsys/ldirectord ;; restart) action "Restarting ldirectord" $DAEMON restart heartbeat-fedora-pam.patch: --- NEW FILE heartbeat-fedora-pam.patch --- diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.4/mgmt/daemon/mgmtd.pam --- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam 2005-12-30 09:35:27.000000000 +0100 +++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam 2006-03-27 19:59:12.000000000 +0200 @@ -1,3 +1,8 @@ -auth required pam_unix.so -account required pam_unix.so - +#%PAM-1.0 +auth sufficient pam_rootok.so +auth sufficient pam_timestamp.so +auth required pam_stack.so service=system-auth +session required pam_permit.so +session optional pam_xauth.so +session optional pam_timestamp.so +account required pam_permit.so Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 2 Mar 2006 06:41:39 -0000 1.2 +++ .cvsignore 30 Mar 2006 17:42:04 -0000 1.3 @@ -1 +1 @@ -heartbeat-2.0.3.tar.gz +heartbeat-2.0.4.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 2 Mar 2006 06:41:39 -0000 1.2 +++ sources 30 Mar 2006 17:42:04 -0000 1.3 @@ -1 +1 @@ -ef926928325e7f4c1aaa51b93dffdcf4 heartbeat-2.0.3.tar.gz +659aae2365daea3a17e5a4a4ae0b0a3e heartbeat-2.0.4.tar.gz Index: heartbeat.spec =================================================================== RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- heartbeat.spec 2 Mar 2006 06:41:39 -0000 1.1 +++ heartbeat.spec 30 Mar 2006 17:42:04 -0000 1.2 @@ -5,22 +5,21 @@ %define uname hacluster Summary: Heartbeat subsystem for High-Availability Linux Name: heartbeat -Version: 2.0.3 -Release: 9%{?dist} +Version: 2.0.4 +Release: 2%{?dist} License: GPL/LGPL URL: http://linux-ha.org/ Group: System Environment/Daemons Source0: http://linux-ha.org/download/%{name}-%{version}.tar.gz -Patch0: heartbeat-2.0.3-fedora-pam.patch -Patch1: heartbeat-2.0.3-fedora-chkconfig.patch -Patch2: heartbeat-2.0.3-fedora-ccmuser.patch +Patch0: heartbeat-fedora-pam.patch +Patch1: heartbeat-fedora-chkconfig.patch +Patch2: heartbeat-fedora-ccmuser.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel BuildRequires: iputils BuildRequires: openssl-devel BuildRequires: libnet-devel BuildRequires: libtool-ltdl-devel -#BuildRequires: fedora-usermgmt BuildRequires: net-snmp-devel BuildRequires: bzip2-devel %if %{ENABLE_MGMT} @@ -291,6 +290,9 @@ %{_libdir}/*.so %changelog +* Wed Mar 29 2006 Joost Soeterbroek - 2.0.4-2 +- Version 2.0.4 + * Wed Mar 1 2006 Joost Soeterbroek - 2.0.3-9 - changed user creation - added patch2 heartbeat-2.0.3-fedora-ccmuser.patch From fedora-extras-commits at redhat.com Thu Mar 30 17:49:15 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Thu, 30 Mar 2006 10:49:15 -0700 Subject: rpms/dejavu-fonts import.log,1.44,1.45 Message-ID: <200603301749.k2UHnHLe017383@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17352 Modified Files: import.log Log Message: auto-import dejavu-fonts-2.4.1-2.fc6 on branch devel from dejavu-fonts-2.4.1-2.fc6.src.rpm I hate the buildsystem Index: import.log =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v retrieving revision 1.44 retrieving revision 1.45 diff -u -r1.44 -r1.45 --- import.log 29 Mar 2006 19:35:41 -0000 1.44 +++ import.log 30 Mar 2006 17:49:15 -0000 1.45 @@ -41,3 +41,4 @@ dejavu-fonts-2_4_1-1_fc6:HEAD:dejavu-fonts-2.4.1-1.fc6.src.rpm:1143660306 dejavu-fonts-2_4_1-1_fc5:FC-5:dejavu-fonts-2.4.1-1.fc5.src.rpm:1143660631 dejavu-fonts-2_4_1-1_fc4:FC-4:dejavu-fonts-2.4.1-1.fc4.src.rpm:1143660926 +dejavu-fonts-2_4_1-2_fc6:HEAD:dejavu-fonts-2.4.1-2.fc6.src.rpm:1143740939 From fedora-extras-commits at redhat.com Thu Mar 30 17:49:16 2006 From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim)) Date: Thu, 30 Mar 2006 10:49:16 -0700 Subject: rpms/dejavu-fonts/devel dejavu-fonts.spec,1.18,1.19 Message-ID: <200603301749.k2UHnI05017387@cvs-int.fedora.redhat.com> Author: nim Update of /cvs/extras/rpms/dejavu-fonts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17352/devel Modified Files: dejavu-fonts.spec Log Message: auto-import dejavu-fonts-2.4.1-2.fc6 on branch devel from dejavu-fonts-2.4.1-2.fc6.src.rpm I hate the buildsystem Index: dejavu-fonts.spec =================================================================== RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- dejavu-fonts.spec 29 Mar 2006 19:25:23 -0000 1.18 +++ dejavu-fonts.spec 30 Mar 2006 17:49:16 -0000 1.19 @@ -10,7 +10,7 @@ Name: dejavu-fonts Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: DejaVu fonts Group: User Interface/X License: Redistributable, with restrictions From fedora-extras-commits at redhat.com Thu Mar 30 18:04:10 2006 From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi)) Date: Thu, 30 Mar 2006 11:04:10 -0700 Subject: comps comps-fe5.xml.in,1.31,1.32 Message-ID: <200603301804.k2UI4C3N019505@cvs-int.fedora.redhat.com> Author: gemi Update of /cvs/extras/comps In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19488 Modified Files: comps-fe5.xml.in Log Message: Index: comps-fe5.xml.in =================================================================== RCS file: /cvs/extras/comps/comps-fe5.xml.in,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- comps-fe5.xml.in 23 Mar 2006 23:19:21 -0000 1.31 +++ comps-fe5.xml.in 30 Mar 2006 18:04:10 -0000 1.32 @@ -432,6 +432,7 @@ libvisual-plugins soundconverter soundtracker + sweep tagtool ushare xmms From fedora-extras-commits at redhat.com Thu Mar 30 18:15:24 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 11:15:24 -0700 Subject: rpms/sbcl/devel .cvsignore, 1.10, 1.11 sbcl.spec, 1.39, 1.40 sources, 1.10, 1.11 Message-ID: <200603301815.k2UIFQuc019605@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19584 Modified Files: .cvsignore sbcl.spec sources Log Message: * Mon Mar 27 2006 Rex Dieter 0.9.11-1 - 0.9.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Feb 2006 12:55:38 -0000 1.10 +++ .cvsignore 30 Mar 2006 18:15:23 -0000 1.11 @@ -1,4 +1,4 @@ -sbcl-0.9.10-source.tar.bz2 -sbcl-0.9.9-x86-linux-binary.tar.bz2 -sbcl-0.9.9-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-source.tar.bz2 +sbcl-0.9.11-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-x86-linux-binary.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sbcl.spec 27 Feb 2006 14:22:56 -0000 1.39 +++ sbcl.spec 30 Mar 2006 18:15:23 -0000 1.40 @@ -12,7 +12,7 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.10 +Version: 0.9.11 Release: 1%{?dist} License: BSD/MIT @@ -31,17 +31,17 @@ %define sbcl_arch x86 BuildRequires: sbcl # or -#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2 #define sbcl_bootstrap_src -a 10 %endif ## x86_64 section %ifarch x86_64 %define sbcl_arch x86-64 -#BuildRequires: sbcl +BuildRequires: sbcl # or -Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -%define sbcl_bootstrap_src -a 20 +#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 @@ -228,6 +228,9 @@ %changelog +* Mon Mar 27 2006 Rex Dieter 0.9.11-1 +- 0.9.11 + * Mon Feb 27 2006 Rex Dieter 0.9.10-1 - 0.9.10 - update/fix make-config-ppc patch (still broken, #177029) Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/devel/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Feb 2006 12:55:38 -0000 1.10 +++ sources 30 Mar 2006 18:15:23 -0000 1.11 @@ -1,4 +1 @@ -58678d7081f32bdcd174c5233efba4f3 sbcl-0.9.10-source.tar.bz2 -417f524958fd7a4115902f14eaed3ab1 sbcl-0.9.9-x86-linux-binary.tar.bz2 -d9e4a6d95e255b3a24431f336fae236d sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +b82c3b7cf5c351cbe97af5150c17ad27 sbcl-0.9.11-source.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 18:28:12 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 11:28:12 -0700 Subject: rpms/multitail/FC-4 .cvsignore, 1.3, 1.4 multitail.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603301828.k2UISihl019834@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777/FC-4 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 3.8.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Mar 2006 15:57:33 -0000 1.3 +++ .cvsignore 30 Mar 2006 18:28:12 -0000 1.4 @@ -1 +1 @@ -multitail-3.8.9.tgz +multitail-3.8.10.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/multitail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- multitail.spec 14 Mar 2006 15:57:33 -0000 1.2 +++ multitail.spec 30 Mar 2006 18:28:12 -0000 1.3 @@ -1,5 +1,5 @@ Name: multitail -Version: 3.8.9 +Version: 3.8.10 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -27,9 +27,9 @@ external software, MultiTail can mimic the functionality of tools like 'watch' and such. + %prep %setup -q -%{__sed} -i 's/\r//' *.html %build CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} @@ -44,6 +44,7 @@ %clean %{__rm} -rf %{buildroot} + %files %defattr(-, root, root, 0755) %doc *.conf *.html Changes license.txt readme.txt @@ -51,7 +52,11 @@ %config(noreplace) %{_sysconfdir}/multitail.conf %{_bindir}/multitail + %changelog +* Thu Mar 30 2006 Folkert van Heuesden - 3.8.10-1 +- Updated to release 3.8.10. + * Tue Mar 14 2006 Folkert van Heuesden - 3.8.9-1 - Updated to release 3.8.9. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Mar 2006 15:57:33 -0000 1.3 +++ sources 30 Mar 2006 18:28:12 -0000 1.4 @@ -1 +1 @@ -feac6869ddb5ee974abbe52a0130af7e multitail-3.8.9.tgz +1b4cb6288298fe61c4c5147b50bfd48d multitail-3.8.10.tgz From fedora-extras-commits at redhat.com Thu Mar 30 18:28:14 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 11:28:14 -0700 Subject: rpms/multitail/devel .cvsignore, 1.3, 1.4 multitail.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603301828.k2UISkQj019844@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777/devel Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 3.8.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Mar 2006 15:57:38 -0000 1.3 +++ .cvsignore 30 Mar 2006 18:28:13 -0000 1.4 @@ -1 +1 @@ -multitail-3.8.9.tgz +multitail-3.8.10.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- multitail.spec 14 Mar 2006 15:57:38 -0000 1.2 +++ multitail.spec 30 Mar 2006 18:28:13 -0000 1.3 @@ -1,5 +1,5 @@ Name: multitail -Version: 3.8.9 +Version: 3.8.10 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -27,9 +27,9 @@ external software, MultiTail can mimic the functionality of tools like 'watch' and such. + %prep %setup -q -%{__sed} -i 's/\r//' *.html %build CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} @@ -44,6 +44,7 @@ %clean %{__rm} -rf %{buildroot} + %files %defattr(-, root, root, 0755) %doc *.conf *.html Changes license.txt readme.txt @@ -51,7 +52,11 @@ %config(noreplace) %{_sysconfdir}/multitail.conf %{_bindir}/multitail + %changelog +* Thu Mar 30 2006 Folkert van Heuesden - 3.8.10-1 +- Updated to release 3.8.10. + * Tue Mar 14 2006 Folkert van Heuesden - 3.8.9-1 - Updated to release 3.8.9. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Mar 2006 15:57:38 -0000 1.3 +++ sources 30 Mar 2006 18:28:13 -0000 1.4 @@ -1 +1 @@ -feac6869ddb5ee974abbe52a0130af7e multitail-3.8.9.tgz +1b4cb6288298fe61c4c5147b50bfd48d multitail-3.8.10.tgz From fedora-extras-commits at redhat.com Thu Mar 30 18:28:13 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Thu, 30 Mar 2006 11:28:13 -0700 Subject: rpms/multitail/FC-5 .cvsignore, 1.3, 1.4 multitail.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603301828.k2UISjQo019839@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/multitail/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19777/FC-5 Modified Files: .cvsignore multitail.spec sources Log Message: Updated to release 3.8.10. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 14 Mar 2006 15:57:38 -0000 1.3 +++ .cvsignore 30 Mar 2006 18:28:13 -0000 1.4 @@ -1 +1 @@ -multitail-3.8.9.tgz +multitail-3.8.10.tgz Index: multitail.spec =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/multitail.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- multitail.spec 14 Mar 2006 15:57:38 -0000 1.2 +++ multitail.spec 30 Mar 2006 18:28:13 -0000 1.3 @@ -1,5 +1,5 @@ Name: multitail -Version: 3.8.9 +Version: 3.8.10 Release: 1%{?dist} Summary: View one or multiple files like tail but with multiple windows @@ -27,9 +27,9 @@ external software, MultiTail can mimic the functionality of tools like 'watch' and such. + %prep %setup -q -%{__sed} -i 's/\r//' *.html %build CFLAGS="%{optflags}" %{__make} %{?_smp_mflags} @@ -44,6 +44,7 @@ %clean %{__rm} -rf %{buildroot} + %files %defattr(-, root, root, 0755) %doc *.conf *.html Changes license.txt readme.txt @@ -51,7 +52,11 @@ %config(noreplace) %{_sysconfdir}/multitail.conf %{_bindir}/multitail + %changelog +* Thu Mar 30 2006 Folkert van Heuesden - 3.8.10-1 +- Updated to release 3.8.10. + * Tue Mar 14 2006 Folkert van Heuesden - 3.8.9-1 - Updated to release 3.8.9. Index: sources =================================================================== RCS file: /cvs/extras/rpms/multitail/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 14 Mar 2006 15:57:38 -0000 1.3 +++ sources 30 Mar 2006 18:28:13 -0000 1.4 @@ -1 +1 @@ -feac6869ddb5ee974abbe52a0130af7e multitail-3.8.9.tgz +1b4cb6288298fe61c4c5147b50bfd48d multitail-3.8.10.tgz From fedora-extras-commits at redhat.com Thu Mar 30 18:42:06 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 11:42:06 -0700 Subject: rpms/lyx/devel helpers.sh,1.1,1.2 lyx.spec,1.30,1.31 Message-ID: <200603301842.k2UIg8wW020083@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20061 Modified Files: helpers.sh lyx.spec Log Message: * Thu Mar 30 2006 Rex Dieter 1.4.0-5 - %trigger ImageMagick (#186319) Index: helpers.sh =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/helpers.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- helpers.sh 20 Jan 2006 15:37:52 -0000 1.1 +++ helpers.sh 30 Mar 2006 18:42:06 -0000 1.2 @@ -1,5 +1,4 @@ #!/bin/bash -# $Id$ if [ -f /etc/lyx.conf ]; then source /etc/helpers.conf Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- lyx.spec 9 Mar 2006 16:15:37 -0000 1.30 +++ lyx.spec 30 Mar 2006 18:42:06 -0000 1.31 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Publishing @@ -104,26 +104,18 @@ optflags="$(echo %optflags | sed -e 's|-fexceptions||' )" %global optflags $optflags -for frontend in qt xforms ; do - %configure \ --disable-rpath \ --enable-compression-support \ - --with-frontend=$frontend \ + --with-frontend="qt xforms" \ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ --without-warnings --disable-dependency-tracking \ - --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ - -# Intermediate cleanup -# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking -make -C src/frontends clean + --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks make %{?_smp_mflags} -done - %install rm -rf $RPM_BUILD_ROOT @@ -163,12 +155,12 @@ texhash > /dev/null 2>&1 ||: # Catch installed/uninstalled helpers -%triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi -%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi @@ -203,6 +195,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 1.4.0-5 +- %%trigger ImageMagick (#186319) + * Thu Mar 09 2006 Rex Dieter 1.4.0-4 - fix stripping of -fexceptions from %%optflags From fedora-extras-commits at redhat.com Thu Mar 30 18:47:03 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 11:47:03 -0700 Subject: rpms/lyx/FC-5 helpers.sh,1.1,1.2 lyx.spec,1.30,1.31 Message-ID: <200603301847.k2UIl5Qn020185@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20166 Modified Files: helpers.sh lyx.spec Log Message: * Thu Mar 30 2006 Rex Dieter 1.4.0-5 - %trigger ImageMagick (#186319) Index: helpers.sh =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/helpers.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- helpers.sh 20 Jan 2006 15:37:52 -0000 1.1 +++ helpers.sh 30 Mar 2006 18:47:02 -0000 1.2 @@ -1,5 +1,4 @@ #!/bin/bash -# $Id$ if [ -f /etc/lyx.conf ]; then source /etc/helpers.conf Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- lyx.spec 9 Mar 2006 16:15:37 -0000 1.30 +++ lyx.spec 30 Mar 2006 18:47:02 -0000 1.31 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Publishing @@ -104,26 +104,18 @@ optflags="$(echo %optflags | sed -e 's|-fexceptions||' )" %global optflags $optflags -for frontend in qt xforms ; do - %configure \ --disable-rpath \ --enable-compression-support \ - --with-frontend=$frontend \ + --with-frontend="qt xforms" \ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ --without-warnings --disable-dependency-tracking \ - --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ - -# Intermediate cleanup -# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking -make -C src/frontends clean + --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks make %{?_smp_mflags} -done - %install rm -rf $RPM_BUILD_ROOT @@ -163,12 +155,12 @@ texhash > /dev/null 2>&1 ||: # Catch installed/uninstalled helpers -%triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi -%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi @@ -203,6 +195,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 1.4.0-5 +- %%trigger ImageMagick (#186319) + * Thu Mar 09 2006 Rex Dieter 1.4.0-4 - fix stripping of -fexceptions from %%optflags From fedora-extras-commits at redhat.com Thu Mar 30 19:04:59 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:04:59 -0700 Subject: rpms/sbcl/FC-5 .cvsignore, 1.10, 1.11 sbcl.spec, 1.39, 1.40 sources, 1.10, 1.11 Message-ID: <200603301905.k2UJ514A022280@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22259 Modified Files: .cvsignore sbcl.spec sources Log Message: * Mon Mar 27 2006 Rex Dieter 0.9.11-1 - 0.9.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-5/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 27 Feb 2006 12:55:38 -0000 1.10 +++ .cvsignore 30 Mar 2006 19:04:59 -0000 1.11 @@ -1,4 +1,4 @@ -sbcl-0.9.10-source.tar.bz2 -sbcl-0.9.9-x86-linux-binary.tar.bz2 -sbcl-0.9.9-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-source.tar.bz2 +sbcl-0.9.11-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-x86-linux-binary.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- sbcl.spec 27 Feb 2006 14:22:56 -0000 1.39 +++ sbcl.spec 30 Mar 2006 19:04:59 -0000 1.40 @@ -12,7 +12,7 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.10 +Version: 0.9.11 Release: 1%{?dist} License: BSD/MIT @@ -31,17 +31,17 @@ %define sbcl_arch x86 BuildRequires: sbcl # or -#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2 #define sbcl_bootstrap_src -a 10 %endif ## x86_64 section %ifarch x86_64 %define sbcl_arch x86-64 -#BuildRequires: sbcl +BuildRequires: sbcl # or -Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -%define sbcl_bootstrap_src -a 20 +#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 @@ -228,6 +228,9 @@ %changelog +* Mon Mar 27 2006 Rex Dieter 0.9.11-1 +- 0.9.11 + * Mon Feb 27 2006 Rex Dieter 0.9.10-1 - 0.9.10 - update/fix make-config-ppc patch (still broken, #177029) Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-5/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 27 Feb 2006 12:55:38 -0000 1.10 +++ sources 30 Mar 2006 19:04:59 -0000 1.11 @@ -1,4 +1 @@ -58678d7081f32bdcd174c5233efba4f3 sbcl-0.9.10-source.tar.bz2 -417f524958fd7a4115902f14eaed3ab1 sbcl-0.9.9-x86-linux-binary.tar.bz2 -d9e4a6d95e255b3a24431f336fae236d sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +b82c3b7cf5c351cbe97af5150c17ad27 sbcl-0.9.11-source.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 19:12:27 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:12:27 -0700 Subject: rpms/maxima/devel maxima.spec,1.20,1.21 Message-ID: <200603301912.k2UJCTO2022374@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22357 Modified Files: maxima.spec Log Message: * Thu Mar 30 2006 Rex Dieter 5.9.2-13 - respin for sbcl-0.9.11 Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- maxima.spec 27 Mar 2006 18:07:59 -0000 1.20 +++ maxima.spec 30 Mar 2006 19:12:27 -0000 1.21 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 12%{?dist}.1 +Release: 13%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -147,7 +147,7 @@ %package runtime-sbcl Summary: Maxima compiled with SBCL Group: Applications/Engineering -BuildRequires: sbcl +BuildRequires: sbcl >= 0.9.11 # maxima requires the *same* version it was built against # this hack should work, even in mock (-: -- Rex %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) @@ -362,6 +362,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 5.9.2-13 +- respin for sbcl-0.9.11 + * Mon Mar 27 2006 Rex Dieter - fc5+: BR: texinfo -> texinfo-tex (#186827) From fedora-extras-commits at redhat.com Thu Mar 30 19:17:52 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:17:52 -0700 Subject: rpms/lyx/FC-4 lyx.spec,1.17,1.18 Message-ID: <200603301917.k2UJHsjh022461@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/lyx/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22444 Modified Files: lyx.spec Log Message: * Thu Mar 30 2006 Rex Dieter 1.4.0-5 - %trigger ImageMagick (#186319) Index: lyx.spec =================================================================== RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- lyx.spec 10 Mar 2006 18:51:26 -0000 1.17 +++ lyx.spec 30 Mar 2006 19:17:52 -0000 1.18 @@ -2,7 +2,7 @@ Summary: WYSIWYM (What You See Is What You Mean) document processor Name: lyx Version: 1.4.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Publishing @@ -104,26 +104,18 @@ optflags="$(echo %optflags | sed -e 's|-fexceptions||' )" %global optflags $optflags -for frontend in qt xforms ; do - %configure \ --disable-rpath \ --enable-compression-support \ - --with-frontend=$frontend \ + --with-frontend="qt xforms" \ --enable-optimization="%{optflags}" \ --with-aiksaurus \ --with-aspell \ --without-warnings --disable-dependency-tracking \ - --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks \ - -# Intermediate cleanup -# (for the paranoid, we could do a full 'make clean', and drop --disable-dependancy-tracking -make -C src/frontends clean + --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks make %{?_smp_mflags} -done - %install rm -rf $RPM_BUILD_ROOT @@ -163,12 +155,12 @@ texhash > /dev/null 2>&1 ||: # Catch installed/uninstalled helpers -%triggerin -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerin -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -gt 1 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi -%triggerun -- acroread,AdobeReader_enu,evince,gsview,kdegraphics,latex2html,tetex-xdvi,wv +%triggerun -- acroread,AdobeReader_enu,evince,gsview,ImageMagick,kdegraphics,latex2html,tetex-xdvi,wv if [ $2 -eq 0 ]; then cd %{_datadir}/lyx && ./configure --without-latex-config > /dev/null 2>&1 ||: fi @@ -203,6 +195,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 1.4.0-5 +- %%trigger ImageMagick (#186319) + * Thu Mar 09 2006 Rex Dieter 1.4.0-4 - fix stripping of -fexceptions from %%optflags From fedora-extras-commits at redhat.com Thu Mar 30 19:29:12 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 12:29:12 -0700 Subject: rpms/pdsh/devel .cvsignore, 1.2, 1.3 pdsh.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603301929.k2UJTEB0022590@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22569 Modified Files: .cvsignore pdsh.spec sources Log Message: track upstream version 2.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Mar 2006 21:23:03 -0000 1.2 +++ .cvsignore 30 Mar 2006 19:29:11 -0000 1.3 @@ -1 +1 @@ -pdsh-2.8.1-1.tar.gz +pdsh-2.10.tar.gz Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/pdsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pdsh.spec 21 Mar 2006 21:23:03 -0000 1.1 +++ pdsh.spec 30 Mar 2006 19:29:11 -0000 1.2 @@ -1,14 +1,13 @@ Name: pdsh -Version: 2.8.1 -Release: 7 +Version: 2.10 +Release: 2 Summary: Parallel remote shell program License: GPL Url: http://sourceforge.net/projects/pdsh/ Group: System Environment/Base -Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}-1.tar.gz -Patch1: pdsh-load-so.patch +Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pdsh-rcmd @@ -217,8 +216,7 @@ ############################################################################## %prep -%setup -n pdsh-2.8.1-1 -%patch1 -p0 +%setup ############################################################################## @@ -260,10 +258,6 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT" make install -# needed to allow rpm's find-debuginfo.sh to find binaries by default they -# are installed with perms that aren't selected by the find in -# find-debuginfo.sh -chmod 755 $RPM_BUILD_ROOT/%{_bindir}/pd{sh,cp} if [ -x $RPM_BUILD_ROOT/%{_sbindir}/in.qshd ]; then install -D -m644 etc/qshell.xinetd $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/qshell fi @@ -404,6 +398,13 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-2 +- new version 2.10-1 used by upstream +- remove release from source line to track upstream +- deleted patch which is no longer needed +- removed -n from setup line. No longer needed. +- hack to fix perms so no longer needed + * Mon Mar 13 2006 Ben Woodard 2.8.1-7 - An optimization in pdsh depended on the .la files being there. Removed optimization. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Mar 2006 21:23:03 -0000 1.2 +++ sources 30 Mar 2006 19:29:11 -0000 1.3 @@ -1 +1 @@ -d39b58da791f9437bdb4848da4efd6d1 pdsh-2.8.1-1.tar.gz +60f7fe11a98c72733a716ee392c0313a pdsh-2.10.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:38:34 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 30 Mar 2006 12:38:34 -0700 Subject: rpms/perl-MIME-Lite/FC-4 perl-MIME-Lite.spec,1.2,1.3 Message-ID: <200603301939.k2UJd6QX022772@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-MIME-Lite/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22723/FC-4 Modified Files: perl-MIME-Lite.spec Log Message: New Maintainer Index: perl-MIME-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/FC-4/perl-MIME-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-MIME-Lite.spec 23 Jun 2005 02:44:11 -0000 1.2 +++ perl-MIME-Lite.spec 30 Mar 2006 19:38:34 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-MIME-Lite Version: 3.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MIME::Lite - low-calorie MIME generator Group: Development/Libraries @@ -14,10 +14,10 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -MIME::Lite is intended as a simple, standalone module for generating -(not parsing!) MIME messages... specifically, it allows you to -output a simple, decent single- or multi-part message with text or binaryattachments. It does not require that you have the Mail:: or MIME:: -modules installed. +MIME::Lite is intended as a simple, standalone module for generating (not +parsing!) MIME messages... specifically, it allows you to output a simple, +decent single- or multi-part message with text or binaryattachments. It does +not require that you have the Mail:: or MIME:: modules installed. %prep %setup -q -n MIME-Lite-%{version} @@ -52,6 +52,9 @@ %changelog +* Thu Mar 30 2006 Mike McGrath 3.01-4 +- New maintainer + * Thu Jun 23 2005 Ralf Corsepius 3.01-3 - Add %%{dist}. From fedora-extras-commits at redhat.com Thu Mar 30 19:38:35 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 30 Mar 2006 12:38:35 -0700 Subject: rpms/perl-MIME-Lite/FC-5 perl-MIME-Lite.spec,1.2,1.3 Message-ID: <200603301939.k2UJd71K022775@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-MIME-Lite/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22723/FC-5 Modified Files: perl-MIME-Lite.spec Log Message: New Maintainer Index: perl-MIME-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/FC-5/perl-MIME-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-MIME-Lite.spec 23 Jun 2005 02:44:12 -0000 1.2 +++ perl-MIME-Lite.spec 30 Mar 2006 19:38:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-MIME-Lite Version: 3.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MIME::Lite - low-calorie MIME generator Group: Development/Libraries @@ -14,10 +14,10 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -MIME::Lite is intended as a simple, standalone module for generating -(not parsing!) MIME messages... specifically, it allows you to -output a simple, decent single- or multi-part message with text or binaryattachments. It does not require that you have the Mail:: or MIME:: -modules installed. +MIME::Lite is intended as a simple, standalone module for generating (not +parsing!) MIME messages... specifically, it allows you to output a simple, +decent single- or multi-part message with text or binaryattachments. It does +not require that you have the Mail:: or MIME:: modules installed. %prep %setup -q -n MIME-Lite-%{version} @@ -52,6 +52,9 @@ %changelog +* Thu Mar 30 2006 Mike McGrath 3.01-4 +- New maintainer + * Thu Jun 23 2005 Ralf Corsepius 3.01-3 - Add %%{dist}. From fedora-extras-commits at redhat.com Thu Mar 30 19:38:35 2006 From: fedora-extras-commits at redhat.com (Michael Patrick McGrath (mmcgrath)) Date: Thu, 30 Mar 2006 12:38:35 -0700 Subject: rpms/perl-MIME-Lite/devel perl-MIME-Lite.spec,1.2,1.3 Message-ID: <200603301939.k2UJd8p9022778@cvs-int.fedora.redhat.com> Author: mmcgrath Update of /cvs/extras/rpms/perl-MIME-Lite/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22723/devel Modified Files: perl-MIME-Lite.spec Log Message: New Maintainer Index: perl-MIME-Lite.spec =================================================================== RCS file: /cvs/extras/rpms/perl-MIME-Lite/devel/perl-MIME-Lite.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-MIME-Lite.spec 23 Jun 2005 02:44:12 -0000 1.2 +++ perl-MIME-Lite.spec 30 Mar 2006 19:38:35 -0000 1.3 @@ -1,6 +1,6 @@ Name: perl-MIME-Lite Version: 3.01 -Release: 3%{?dist} +Release: 4%{?dist} Summary: MIME::Lite - low-calorie MIME generator Group: Development/Libraries @@ -14,10 +14,10 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description -MIME::Lite is intended as a simple, standalone module for generating -(not parsing!) MIME messages... specifically, it allows you to -output a simple, decent single- or multi-part message with text or binaryattachments. It does not require that you have the Mail:: or MIME:: -modules installed. +MIME::Lite is intended as a simple, standalone module for generating (not +parsing!) MIME messages... specifically, it allows you to output a simple, +decent single- or multi-part message with text or binaryattachments. It does +not require that you have the Mail:: or MIME:: modules installed. %prep %setup -q -n MIME-Lite-%{version} @@ -52,6 +52,9 @@ %changelog +* Thu Mar 30 2006 Mike McGrath 3.01-4 +- New maintainer + * Thu Jun 23 2005 Ralf Corsepius 3.01-3 - Add %%{dist}. From fedora-extras-commits at redhat.com Thu Mar 30 19:42:58 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 12:42:58 -0700 Subject: rpms/pdsh/FC-4 .cvsignore, 1.2, 1.3 pdsh.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603301943.k2UJh03p022858@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22837 Modified Files: .cvsignore pdsh.spec sources Log Message: track upstream version 2.10 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Mar 2006 21:23:03 -0000 1.2 +++ .cvsignore 30 Mar 2006 19:42:58 -0000 1.3 @@ -1 +1 @@ -pdsh-2.8.1-1.tar.gz +pdsh-2.10.tar.gz Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-4/pdsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pdsh.spec 21 Mar 2006 21:23:03 -0000 1.1 +++ pdsh.spec 30 Mar 2006 19:42:58 -0000 1.2 @@ -1,14 +1,13 @@ Name: pdsh -Version: 2.8.1 -Release: 7 +Version: 2.10 +Release: 2 Summary: Parallel remote shell program License: GPL Url: http://sourceforge.net/projects/pdsh/ Group: System Environment/Base -Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}-1.tar.gz -Patch1: pdsh-load-so.patch +Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pdsh-rcmd @@ -217,8 +216,7 @@ ############################################################################## %prep -%setup -n pdsh-2.8.1-1 -%patch1 -p0 +%setup ############################################################################## @@ -260,10 +258,6 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT" make install -# needed to allow rpm's find-debuginfo.sh to find binaries by default they -# are installed with perms that aren't selected by the find in -# find-debuginfo.sh -chmod 755 $RPM_BUILD_ROOT/%{_bindir}/pd{sh,cp} if [ -x $RPM_BUILD_ROOT/%{_sbindir}/in.qshd ]; then install -D -m644 etc/qshell.xinetd $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/qshell fi @@ -404,6 +398,13 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-2 +- new version 2.10-1 used by upstream +- remove release from source line to track upstream +- deleted patch which is no longer needed +- removed -n from setup line. No longer needed. +- hack to fix perms so no longer needed + * Mon Mar 13 2006 Ben Woodard 2.8.1-7 - An optimization in pdsh depended on the .la files being there. Removed optimization. Index: sources =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Mar 2006 21:23:03 -0000 1.2 +++ sources 30 Mar 2006 19:42:58 -0000 1.3 @@ -1 +1 @@ -d39b58da791f9437bdb4848da4efd6d1 pdsh-2.8.1-1.tar.gz +60f7fe11a98c72733a716ee392c0313a pdsh-2.10.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:52:12 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:52:12 -0700 Subject: rpms/baobab/FC-4 .cvsignore, 1.8, 1.9 baobab.spec, 1.8, 1.9 sources, 1.8, 1.9 Message-ID: <200603301952.k2UJqEk3022973@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22952 Modified Files: .cvsignore baobab.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Jan 2006 17:39:44 -0000 1.8 +++ .cvsignore 30 Mar 2006 19:52:12 -0000 1.9 @@ -1 +1 @@ -baobab-2.3.1.tar.gz +baobab-2.3.2.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- baobab.spec 12 Jan 2006 17:39:44 -0000 1.8 +++ baobab.spec 30 Mar 2006 19:52:12 -0000 1.9 @@ -1,5 +1,5 @@ Name: baobab -Version: 2.3.1 +Version: 2.3.2 Release: 1%{?dist} Summary: Graphical tool to analyse directory trees @@ -57,6 +57,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 +- Update to newer version + * Thu Jan 12 2006 Deji Akingunola - 2.3.1-1 - Take over packaging from Thorsten Leemhuis - Update to 2.3.1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Jan 2006 17:39:44 -0000 1.8 +++ sources 30 Mar 2006 19:52:12 -0000 1.9 @@ -1 +1 @@ -474f95940d90474b2bc15fa989f17393 baobab-2.3.1.tar.gz +00cd8c87183e8ecadadfe225112efd46 baobab-2.3.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:52:46 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:52:46 -0700 Subject: rpms/maxima/devel maxima.spec,1.21,1.22 Message-ID: <200603301952.k2UJqmtI023048@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23023 Modified Files: maxima.spec Log Message: oops, texinfo-tex applies only to fc6+ Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- maxima.spec 30 Mar 2006 19:12:27 -0000 1.21 +++ maxima.spec 30 Mar 2006 19:52:45 -0000 1.22 @@ -62,7 +62,7 @@ BuildRequires: time # texi2dvi -%if "%{?fedora}" > "4" +%if "%{?fedora}" > "5" BuildRequires: texinfo-tex %else BuildRequires: texinfo @@ -366,7 +366,7 @@ - respin for sbcl-0.9.11 * Mon Mar 27 2006 Rex Dieter -- fc5+: BR: texinfo -> texinfo-tex (#186827) +- fc6+: BR: texinfo -> texinfo-tex (#186827) * Thu Mar 09 2006 Rex Dieter 5.9.2-12 - enable runtime-cmucl (%%ix86 only, atm) From fedora-extras-commits at redhat.com Thu Mar 30 19:53:13 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:53:13 -0700 Subject: rpms/baobab/FC-5 .cvsignore, 1.8, 1.9 baobab.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200603301953.k2UJrF8h023091@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23070 Modified Files: .cvsignore baobab.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-5/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Jan 2006 17:36:55 -0000 1.8 +++ .cvsignore 30 Mar 2006 19:53:13 -0000 1.9 @@ -1 +1 @@ -baobab-2.3.1.tar.gz +baobab-2.3.2.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-5/baobab.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- baobab.spec 13 Feb 2006 20:59:21 -0000 1.12 +++ baobab.spec 30 Mar 2006 19:53:13 -0000 1.13 @@ -1,6 +1,6 @@ Name: baobab -Version: 2.3.1 -Release: 2%{?dist} +Version: 2.3.2 +Release: 1%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System @@ -56,6 +56,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 2.3.1-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-5/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Jan 2006 17:36:55 -0000 1.8 +++ sources 30 Mar 2006 19:53:13 -0000 1.9 @@ -1 +1 @@ -474f95940d90474b2bc15fa989f17393 baobab-2.3.1.tar.gz +00cd8c87183e8ecadadfe225112efd46 baobab-2.3.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:53:18 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:53:18 -0700 Subject: rpms/maxima/FC-5 maxima.spec,1.19,1.20 Message-ID: <200603301953.k2UJrLox023116@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23097 Modified Files: maxima.spec Log Message: * Thu Mar 30 2006 Rex Dieter 5.9.2-13 - respin for sbcl-0.9.11 Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- maxima.spec 9 Mar 2006 21:37:42 -0000 1.19 +++ maxima.spec 30 Mar 2006 19:53:18 -0000 1.20 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -61,7 +61,12 @@ %define debug_package %{nil} BuildRequires: time +# texi2dvi +%if "%{?fedora}" > "5" +BuildRequires: texinfo-tex +%else BuildRequires: texinfo +%endif BuildRequires: tetex-latex BuildRequires: desktop-file-utils # /usr/bin/wish @@ -142,7 +147,7 @@ %package runtime-sbcl Summary: Maxima compiled with SBCL Group: Applications/Engineering -BuildRequires: sbcl +BuildRequires: sbcl >= 0.9.11 # maxima requires the *same* version it was built against # this hack should work, even in mock (-: -- Rex %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) @@ -205,7 +210,7 @@ install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf pushd info - texi2dvi -p maxima.texi + texi2dvi --pdf maxima.texi popd pushd intromax @@ -357,6 +362,12 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 5.9.2-13 +- respin for sbcl-0.9.11 + +* Mon Mar 27 2006 Rex Dieter +- fc6+: BR: texinfo -> texinfo-tex (#186827) + * Thu Mar 09 2006 Rex Dieter 5.9.2-12 - enable runtime-cmucl (%%ix86 only, atm) From fedora-extras-commits at redhat.com Thu Mar 30 19:54:09 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:54:09 -0700 Subject: rpms/baobab/devel .cvsignore, 1.8, 1.9 baobab.spec, 1.12, 1.13 sources, 1.8, 1.9 Message-ID: <200603301954.k2UJsBvZ023229@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23208 Modified Files: .cvsignore baobab.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 12 Jan 2006 17:36:55 -0000 1.8 +++ .cvsignore 30 Mar 2006 19:54:08 -0000 1.9 @@ -1 +1 @@ -baobab-2.3.1.tar.gz +baobab-2.3.2.tar.gz Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- baobab.spec 13 Feb 2006 20:59:21 -0000 1.12 +++ baobab.spec 30 Mar 2006 19:54:08 -0000 1.13 @@ -1,6 +1,6 @@ Name: baobab -Version: 2.3.1 -Release: 2%{?dist} +Version: 2.3.2 +Release: 1%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System @@ -56,6 +56,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 2.3.1-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 12 Jan 2006 17:36:55 -0000 1.8 +++ sources 30 Mar 2006 19:54:09 -0000 1.9 @@ -1 +1 @@ -474f95940d90474b2bc15fa989f17393 baobab-2.3.1.tar.gz +00cd8c87183e8ecadadfe225112efd46 baobab-2.3.2.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:55:52 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:55:52 -0700 Subject: rpms/gparted/FC-5 .cvsignore, 1.5, 1.6 gparted.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200603301955.k2UJtsf7023311@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gparted/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23290 Modified Files: .cvsignore gparted.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.2.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gparted/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Mar 2006 20:10:44 -0000 1.5 +++ .cvsignore 30 Mar 2006 19:55:52 -0000 1.6 @@ -1 +1 @@ -gparted-0.2.2.tar.bz2 +gparted-0.2.3.tar.bz2 Index: gparted.spec =================================================================== RCS file: /cvs/extras/rpms/gparted/FC-5/gparted.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gparted.spec 7 Mar 2006 20:10:44 -0000 1.6 +++ gparted.spec 30 Mar 2006 19:55:52 -0000 1.7 @@ -1,6 +1,6 @@ Summary: Gnome Partition Editor Name: gparted -Version: 0.2.2 +Version: 0.2.3 Release: 1%{?dist} Group: Applications/System License: GPL @@ -77,6 +77,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.2.3-1 +- Update to newer version + * Mon Mar 07 2006 Deji Akingunola - 0.2.2-1 - New release Index: sources =================================================================== RCS file: /cvs/extras/rpms/gparted/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Mar 2006 20:10:44 -0000 1.5 +++ sources 30 Mar 2006 19:55:52 -0000 1.6 @@ -1 +1 @@ -40419b1b10723055edfc6567a296fea0 gparted-0.2.2.tar.bz2 +329e7a254e82d29b67e521ec3f1906c7 gparted-0.2.3.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 19:56:23 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 12:56:23 -0700 Subject: rpms/sbcl/FC-4 .cvsignore, 1.9, 1.10 sbcl.spec, 1.33, 1.34 sources, 1.9, 1.10 Message-ID: <200603301956.k2UJuPKr023384@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/sbcl/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23363 Modified Files: .cvsignore sbcl.spec sources Log Message: * Mon Mar 27 2006 Rex Dieter 0.9.11-1 - 0.9.11 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 27 Feb 2006 14:59:42 -0000 1.9 +++ .cvsignore 30 Mar 2006 19:56:23 -0000 1.10 @@ -1,4 +1,4 @@ -sbcl-0.9.10-source.tar.bz2 -sbcl-0.9.9-x86-linux-binary.tar.bz2 -sbcl-0.9.9-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-source.tar.bz2 +sbcl-0.9.11-x86-64-linux-binary.tar.bz2 +sbcl-0.9.11-x86-linux-binary.tar.bz2 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 Index: sbcl.spec =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- sbcl.spec 27 Feb 2006 14:59:42 -0000 1.33 +++ sbcl.spec 30 Mar 2006 19:56:23 -0000 1.34 @@ -12,7 +12,7 @@ Name: sbcl Summary: Steel Bank Common Lisp -Version: 0.9.10 +Version: 0.9.11 Release: 1%{?dist} License: BSD/MIT @@ -31,17 +31,17 @@ %define sbcl_arch x86 BuildRequires: sbcl # or -#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-linux-binary.tar.bz2 +#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2 #define sbcl_bootstrap_src -a 10 %endif ## x86_64 section %ifarch x86_64 %define sbcl_arch x86-64 -#BuildRequires: sbcl +BuildRequires: sbcl # or -Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -%define sbcl_bootstrap_src -a 20 +#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 @@ -228,6 +228,9 @@ %changelog +* Mon Mar 27 2006 Rex Dieter 0.9.11-1 +- 0.9.11 + * Mon Feb 27 2006 Rex Dieter 0.9.10-1 - 0.9.10 - update/fix make-config-ppc patch (still broken, #177029) Index: sources =================================================================== RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 27 Feb 2006 14:59:42 -0000 1.9 +++ sources 30 Mar 2006 19:56:23 -0000 1.10 @@ -1,4 +1 @@ -58678d7081f32bdcd174c5233efba4f3 sbcl-0.9.10-source.tar.bz2 -417f524958fd7a4115902f14eaed3ab1 sbcl-0.9.9-x86-linux-binary.tar.bz2 -d9e4a6d95e255b3a24431f336fae236d sbcl-0.9.9-x86-64-linux-binary.tar.bz2 -3a72d0785ce0a8e02f9af632c2a4f217 sbcl-0.8.15-powerpc-linux-binary.tar.bz2 +b82c3b7cf5c351cbe97af5150c17ad27 sbcl-0.9.11-source.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 19:56:32 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:56:32 -0700 Subject: rpms/gparted/devel .cvsignore, 1.5, 1.6 gparted.spec, 1.6, 1.7 sources, 1.5, 1.6 Message-ID: <200603301956.k2UJuYMD023449@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/gparted/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23426 Modified Files: .cvsignore gparted.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.2.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 7 Mar 2006 20:10:44 -0000 1.5 +++ .cvsignore 30 Mar 2006 19:56:32 -0000 1.6 @@ -1 +1 @@ -gparted-0.2.2.tar.bz2 +gparted-0.2.3.tar.bz2 Index: gparted.spec =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- gparted.spec 7 Mar 2006 20:10:44 -0000 1.6 +++ gparted.spec 30 Mar 2006 19:56:32 -0000 1.7 @@ -1,6 +1,6 @@ Summary: Gnome Partition Editor Name: gparted -Version: 0.2.2 +Version: 0.2.3 Release: 1%{?dist} Group: Applications/System License: GPL @@ -77,6 +77,9 @@ %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.2.3-1 +- Update to newer version + * Mon Mar 07 2006 Deji Akingunola - 0.2.2-1 - New release Index: sources =================================================================== RCS file: /cvs/extras/rpms/gparted/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 7 Mar 2006 20:10:44 -0000 1.5 +++ sources 30 Mar 2006 19:56:32 -0000 1.6 @@ -1 +1 @@ -40419b1b10723055edfc6567a296fea0 gparted-0.2.2.tar.bz2 +329e7a254e82d29b67e521ec3f1906c7 gparted-0.2.3.tar.bz2 From fedora-extras-commits at redhat.com Thu Mar 30 19:58:20 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:58:20 -0700 Subject: rpms/libqalculate/FC-4 .cvsignore, 1.5, 1.6 libqalculate.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603301958.k2UJwNOl023545@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/libqalculate/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23524 Modified Files: .cvsignore libqalculate.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-4/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 22:57:06 -0000 1.5 +++ .cvsignore 30 Mar 2006 19:58:20 -0000 1.6 @@ -1 +1 @@ -libqalculate-0.9.2.tar.gz +libqalculate-0.9.3.tar.gz Index: libqalculate.spec =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-4/libqalculate.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libqalculate.spec 27 Dec 2005 22:57:06 -0000 1.7 +++ libqalculate.spec 30 Mar 2006 19:58:20 -0000 1.8 @@ -1,6 +1,6 @@ Summary: Multi-purpose calculator library Name: libqalculate -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -73,6 +73,9 @@ %{_bindir}/qalc %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Tue Dec 27 2005 Deji Akingunola - 0.9.2-1 - Upgrade to new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 22:57:06 -0000 1.5 +++ sources 30 Mar 2006 19:58:20 -0000 1.6 @@ -1 +1 @@ -f7a67bb97e943641868fd1ddf395742d libqalculate-0.9.2.tar.gz +de72bbdb75d39e4e274d4142a92c90d3 libqalculate-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:59:08 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:59:08 -0700 Subject: rpms/libqalculate/FC-5 .cvsignore, 1.5, 1.6 libqalculate.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603301959.k2UJxA6m023616@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/libqalculate/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23595 Modified Files: .cvsignore libqalculate.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 22:54:20 -0000 1.5 +++ .cvsignore 30 Mar 2006 19:59:08 -0000 1.6 @@ -1 +1 @@ -libqalculate-0.9.2.tar.gz +libqalculate-0.9.3.tar.gz Index: libqalculate.spec =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-5/libqalculate.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libqalculate.spec 13 Feb 2006 20:56:12 -0000 1.7 +++ libqalculate.spec 30 Mar 2006 19:59:08 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Multi-purpose calculator library Name: libqalculate -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://qalculate.sourceforge.net/ @@ -73,6 +73,9 @@ %{_bindir}/qalc %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libqalculate/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 22:54:20 -0000 1.5 +++ sources 30 Mar 2006 19:59:08 -0000 1.6 @@ -1 +1 @@ -f7a67bb97e943641868fd1ddf395742d libqalculate-0.9.2.tar.gz +de72bbdb75d39e4e274d4142a92c90d3 libqalculate-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 19:59:49 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 12:59:49 -0700 Subject: rpms/libqalculate/devel .cvsignore, 1.5, 1.6 libqalculate.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603301959.k2UJxp6l023687@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/libqalculate/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23666 Modified Files: .cvsignore libqalculate.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/libqalculate/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 22:54:20 -0000 1.5 +++ .cvsignore 30 Mar 2006 19:59:49 -0000 1.6 @@ -1 +1 @@ -libqalculate-0.9.2.tar.gz +libqalculate-0.9.3.tar.gz Index: libqalculate.spec =================================================================== RCS file: /cvs/extras/rpms/libqalculate/devel/libqalculate.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- libqalculate.spec 13 Feb 2006 20:56:12 -0000 1.7 +++ libqalculate.spec 30 Mar 2006 19:59:49 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Multi-purpose calculator library Name: libqalculate -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://qalculate.sourceforge.net/ @@ -73,6 +73,9 @@ %{_bindir}/qalc %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/libqalculate/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 22:54:20 -0000 1.5 +++ sources 30 Mar 2006 19:59:49 -0000 1.6 @@ -1 +1 @@ -f7a67bb97e943641868fd1ddf395742d libqalculate-0.9.2.tar.gz +de72bbdb75d39e4e274d4142a92c90d3 libqalculate-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:04:23 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 13:04:23 -0700 Subject: rpms/stratagus/devel stratagus.spec,1.4,1.5 Message-ID: <200603302004.k2UK4PBP025767@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25750 Modified Files: stratagus.spec Log Message: Disabled parallel builds Index: stratagus.spec =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- stratagus.spec 30 Mar 2006 06:56:21 -0000 1.4 +++ stratagus.spec 30 Mar 2006 20:04:22 -0000 1.5 @@ -6,12 +6,13 @@ Name: stratagus Summary: Real-time strategy gaming engine Version: 2.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Development/Libraries URL: http://stratagus.sourceforge.net/ Source0: http://dl.sf.net/%{name}/%{name}-%{version}-src.tar.gz Patch0: stratagus--lp64.diff +Patch1: stratagus--Rules_make_in.diff BuildRequires: flac-devel BuildRequires: mikmod-devel BuildRequires: lua @@ -38,6 +39,7 @@ %prep %setup -q -n %{name}-040702 %patch0 +%patch1 %build %configure --with-x \ @@ -52,7 +54,7 @@ --with-opengl \ --with-cdaudio=sdlcd -%{__make} %{?_smp_mflags} +%{__make} %install %{__rm} -rf %{buildroot} @@ -69,6 +71,10 @@ %changelog +* Thu Mar 30 2006 Peter Lemenkov 2.1-4%{?dist} +- patch for removal /usr/local/-directories from Rules.make.in +- temporarily disabled parallel make + * Thu Mar 30 2006 Peter Lemenkov 2.1-2%{?dist} - added dist-tag From fedora-extras-commits at redhat.com Thu Mar 30 20:07:06 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 13:07:06 -0700 Subject: rpms/pdsh/devel pdsh.spec,1.2,1.3 pdsh-load-so.patch,1.1,NONE Message-ID: <200603302007.k2UK7820025837@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25815 Modified Files: pdsh.spec Removed Files: pdsh-load-so.patch Log Message: Added the dist tag so that I can build for FC4 & FC5. Removed unneeded patch. Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/pdsh.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pdsh.spec 30 Mar 2006 19:29:11 -0000 1.2 +++ pdsh.spec 30 Mar 2006 20:07:06 -0000 1.3 @@ -1,6 +1,6 @@ Name: pdsh Version: 2.10 -Release: 2 +Release: 3%{?dist} Summary: Parallel remote shell program @@ -398,6 +398,9 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-3 +- added dist tag so that I can build on multiple versions + * Thu Mar 30 2006 Ben Woodard 2.10-2 - new version 2.10-1 used by upstream - remove release from source line to track upstream --- pdsh-load-so.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 20:07:27 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 13:07:27 -0700 Subject: rpms/stratagus/devel stratagus--Rules_make_in.diff,NONE,1.1 Message-ID: <200603302007.k2UK7TOS025903@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25845 Added Files: stratagus--Rules_make_in.diff Log Message: Added new patch stratagus--Rules_make_in.diff: --- NEW FILE stratagus--Rules_make_in.diff --- --- Rules.make.in 2004-07-02 05:38:08.000000000 +0400 +++ Rules.make.in 2006-03-30 23:51:00.000000000 +0400 @@ -29,13 +29,13 @@ COMP_CFLAGS = -DUSE_ZLIB @BZ2_CFLAGS@ COMP_LIBS = -lz @BZ2_LIBS@ -TOOLLIBS=$(XLDFLAGS) -lpng -lz -lm @EXTRA_LIBS@ @THREAD_LIBS@ -L/usr/local/lib \ +TOOLLIBS=$(XLDFLAGS) -lpng -lz -lm @EXTRA_LIBS@ @THREAD_LIBS@ \ @STATIC_LDFLAGS@ STRATAGUS_LIBS= -lpng -lz -lm \ @EXTRA_LIBS@ @VIDEO_LIBS@ @THREAD_LIBS@ $(CCLLIB) $(COMP_LIBS) \ @FLAC_LIBS@ @OGG_LIBS@ @MAD_LIBS@ @MIKMOD_LIBS@ @CDAUDIO_LIBS@ \ - @LUA_LIBS@ @STATIC_LDFLAGS@ -lz -lm -L/usr/local/lib + @LUA_LIBS@ @STATIC_LDFLAGS@ -lz -lm DISTLIST=$(TOPDIR)/distlist TAGS=$(TOPDIR)/src/tags @@ -54,8 +54,7 @@ @PROFILE_CFLAGS@ @DEBUG_CFLAGS@ @VIDEO_CFLAGS@ @BZ2_CFLAGS@ \ @OGG_CFLAGS@ @MAD_CFLAGS@ @FLAC_CFLAGS@ @CDAUDIO_CFLAGS@ \ @MIKMOD_CFLAGS@ @LUA_CFLAGS@ $(CCL) \ - $(COMP_CFLAGS) @PLATFORM@ \ - -I/usr/local/include + $(COMP_CFLAGS) @PLATFORM@ CTAGSFLAGS=-i defptvS -a -f From fedora-extras-commits at redhat.com Thu Mar 30 20:07:52 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:07:52 -0700 Subject: rpms/qalculate-gtk/FC-4 .cvsignore, 1.4, 1.5 qalculate-gtk.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603302007.k2UK7sMD025968@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-gtk/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25945 Modified Files: .cvsignore qalculate-gtk.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Dec 2005 23:22:03 -0000 1.4 +++ .cvsignore 30 Mar 2006 20:07:51 -0000 1.5 @@ -1 +1 @@ -qalculate-gtk-0.9.2.tar.gz +qalculate-gtk-0.9.3.tar.gz Index: qalculate-gtk.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/qalculate-gtk.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qalculate-gtk.spec 27 Dec 2005 23:22:03 -0000 1.5 +++ qalculate-gtk.spec 30 Mar 2006 20:07:51 -0000 1.6 @@ -1,6 +1,6 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-gtk -Version: 0.9.2 +Version: 0.9.3 Release: 1%{?dist} License: GPL Group: Applications/Engineering @@ -62,6 +62,9 @@ %{_datadir}/qalculate-gtk/ %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Tue Dec 27 2005 Deji Akingunola - 0.9.2-1 - Upgrade to new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2005 23:22:03 -0000 1.4 +++ sources 30 Mar 2006 20:07:51 -0000 1.5 @@ -1 +1 @@ -287cb244e13f7c12074f89ca8f008528 qalculate-gtk-0.9.2.tar.gz +debcba3c990ee391d3c11f9d5c44e910 qalculate-gtk-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:08:35 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 13:08:35 -0700 Subject: rpms/stratagus/devel stratagus.spec,1.5,1.6 Message-ID: <200603302008.k2UK8bpr026034@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/stratagus/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26017 Modified Files: stratagus.spec Log Message: rebuild Index: stratagus.spec =================================================================== RCS file: /cvs/extras/rpms/stratagus/devel/stratagus.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- stratagus.spec 30 Mar 2006 20:04:22 -0000 1.5 +++ stratagus.spec 30 Mar 2006 20:08:35 -0000 1.6 @@ -6,7 +6,7 @@ Name: stratagus Summary: Real-time strategy gaming engine Version: 2.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Development/Libraries URL: http://stratagus.sourceforge.net/ @@ -71,6 +71,9 @@ %changelog +* Thu Mar 30 2006 Peter Lemenkov 2.1-5%{?dist} +- addition of new patch + * Thu Mar 30 2006 Peter Lemenkov 2.1-4%{?dist} - patch for removal /usr/local/-directories from Rules.make.in - temporarily disabled parallel make From fedora-extras-commits at redhat.com Thu Mar 30 20:08:59 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:08:59 -0700 Subject: rpms/qalculate-gtk/FC-5 .cvsignore, 1.5, 1.6 qalculate-gtk.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603302009.k2UK91Xx026072@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-gtk/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26051 Modified Files: .cvsignore qalculate-gtk.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-5/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 23:12:13 -0000 1.5 +++ .cvsignore 30 Mar 2006 20:08:59 -0000 1.6 @@ -1 +1 @@ -qalculate-gtk-0.9.2.tar.gz +qalculate-gtk-0.9.3.tar.gz Index: qalculate-gtk.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-5/qalculate-gtk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qalculate-gtk.spec 13 Feb 2006 21:05:38 -0000 1.7 +++ qalculate-gtk.spec 30 Mar 2006 20:08:59 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-gtk -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3 +Release: 1%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -62,6 +62,9 @@ %{_datadir}/qalculate-gtk/ %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 23:12:13 -0000 1.5 +++ sources 30 Mar 2006 20:08:59 -0000 1.6 @@ -1 +1 @@ -287cb244e13f7c12074f89ca8f008528 qalculate-gtk-0.9.2.tar.gz +debcba3c990ee391d3c11f9d5c44e910 qalculate-gtk-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:09:31 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:09:31 -0700 Subject: rpms/qalculate-gtk/devel .cvsignore, 1.5, 1.6 qalculate-gtk.spec, 1.7, 1.8 sources, 1.5, 1.6 Message-ID: <200603302009.k2UK9XfO026105@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-gtk/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26084 Modified Files: .cvsignore qalculate-gtk.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 27 Dec 2005 23:12:13 -0000 1.5 +++ .cvsignore 30 Mar 2006 20:09:31 -0000 1.6 @@ -1 +1 @@ -qalculate-gtk-0.9.2.tar.gz +qalculate-gtk-0.9.3.tar.gz Index: qalculate-gtk.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/devel/qalculate-gtk.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- qalculate-gtk.spec 13 Feb 2006 21:05:38 -0000 1.7 +++ qalculate-gtk.spec 30 Mar 2006 20:09:31 -0000 1.8 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-gtk -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3 +Release: 1%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -62,6 +62,9 @@ %{_datadir}/qalculate-gtk/ %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-gtk/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 27 Dec 2005 23:12:13 -0000 1.5 +++ sources 30 Mar 2006 20:09:31 -0000 1.6 @@ -1 +1 @@ -287cb244e13f7c12074f89ca8f008528 qalculate-gtk-0.9.2.tar.gz +debcba3c990ee391d3c11f9d5c44e910 qalculate-gtk-0.9.3.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:10:26 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:10:26 -0700 Subject: rpms/qalculate-kde/FC-4 .cvsignore, 1.4, 1.5 qalculate-kde.spec, 1.4, 1.5 sources, 1.4, 1.5 Message-ID: <200603302010.k2UKASet026177@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26156 Modified Files: .cvsignore qalculate-kde.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Dec 2005 23:36:09 -0000 1.4 +++ .cvsignore 30 Mar 2006 20:10:26 -0000 1.5 @@ -1 +1 @@ -qalculate-kde-0.9.2.tar.gz +qalculate-kde-0.9.3.1.tar.gz Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/qalculate-kde.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- qalculate-kde.spec 27 Dec 2005 23:36:09 -0000 1.4 +++ qalculate-kde.spec 30 Mar 2006 20:10:26 -0000 1.5 @@ -1,6 +1,6 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde -Version: 0.9.2 +Version: 0.9.3.1 Release: 1%{?dist} License: GPL Group: Applications/Engineering @@ -61,6 +61,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 +- Update to newer version + * Tue Dec 27 2005 Deji Akingunola - 0.9.2-1 - Upgrade to new version Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2005 23:36:09 -0000 1.4 +++ sources 30 Mar 2006 20:10:26 -0000 1.5 @@ -1 +1 @@ -f77569e3396e3af769526ded6393c0e1 qalculate-kde-0.9.2.tar.gz +38a9ff6a0d832abf2618b06a61a1add3 qalculate-kde-0.9.3.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:10:52 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:10:52 -0700 Subject: rpms/qalculate-kde/FC-5 .cvsignore, 1.4, 1.5 qalculate-kde.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603302010.k2UKAs2k026212@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26191 Modified Files: .cvsignore qalculate-kde.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Dec 2005 23:27:45 -0000 1.4 +++ .cvsignore 30 Mar 2006 20:10:52 -0000 1.5 @@ -1 +1 @@ -qalculate-kde-0.9.2.tar.gz +qalculate-kde-0.9.3.1.tar.gz Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-5/qalculate-kde.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qalculate-kde.spec 13 Feb 2006 21:06:54 -0000 1.5 +++ qalculate-kde.spec 30 Mar 2006 20:10:52 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3.1 +Release: 1%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -61,6 +61,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2005 23:27:45 -0000 1.4 +++ sources 30 Mar 2006 20:10:52 -0000 1.5 @@ -1 +1 @@ -f77569e3396e3af769526ded6393c0e1 qalculate-kde-0.9.2.tar.gz +38a9ff6a0d832abf2618b06a61a1add3 qalculate-kde-0.9.3.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:11:24 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:11:24 -0700 Subject: rpms/qalculate-kde/devel .cvsignore, 1.4, 1.5 qalculate-kde.spec, 1.5, 1.6 sources, 1.4, 1.5 Message-ID: <200603302011.k2UKBQRu026254@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26233 Modified Files: .cvsignore qalculate-kde.spec sources Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 27 Dec 2005 23:27:45 -0000 1.4 +++ .cvsignore 30 Mar 2006 20:11:24 -0000 1.5 @@ -1 +1 @@ -qalculate-kde-0.9.2.tar.gz +qalculate-kde-0.9.3.1.tar.gz Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/devel/qalculate-kde.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qalculate-kde.spec 13 Feb 2006 21:06:54 -0000 1.5 +++ qalculate-kde.spec 30 Mar 2006 20:11:24 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde -Version: 0.9.2 -Release: 2%{?dist} +Version: 0.9.3.1 +Release: 1%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -61,6 +61,9 @@ %{_datadir}/icons/hicolor/*/apps/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 +- Update to newer version + * Mon Feb 13 2006 Deji Akingunola - 0.9.2-2 - Rebuild for Fedora Extras 5 Index: sources =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 27 Dec 2005 23:27:45 -0000 1.4 +++ sources 30 Mar 2006 20:11:24 -0000 1.5 @@ -1 +1 @@ -f77569e3396e3af769526ded6393c0e1 qalculate-kde-0.9.2.tar.gz +38a9ff6a0d832abf2618b06a61a1add3 qalculate-kde-0.9.3.1.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:11:58 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 13:11:58 -0700 Subject: rpms/pdsh/FC-4 pdsh.spec,1.2,1.3 pdsh-load-so.patch,1.1,NONE Message-ID: <200603302012.k2UKC0WH026283@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26231 Modified Files: pdsh.spec Removed Files: pdsh-load-so.patch Log Message: Added dist tag so that I can build on different versions of fedora removed load patch which is not needed in 2.10 Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-4/pdsh.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pdsh.spec 30 Mar 2006 19:42:58 -0000 1.2 +++ pdsh.spec 30 Mar 2006 20:11:57 -0000 1.3 @@ -1,6 +1,6 @@ Name: pdsh Version: 2.10 -Release: 2 +Release: 3%{?dist} Summary: Parallel remote shell program @@ -398,6 +398,9 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-3 +- added dist tag so that I can build on multiple versions + * Thu Mar 30 2006 Ben Woodard 2.10-2 - new version 2.10-1 used by upstream - remove release from source line to track upstream --- pdsh-load-so.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 20:14:19 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:14:19 -0700 Subject: rpms/baobab/FC-4 baobab.spec,1.9,1.10 Message-ID: <200603302014.k2UKELs1026367@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26350 Modified Files: baobab.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 - Put in right version in the source tag Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-4/baobab.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- baobab.spec 30 Mar 2006 19:52:12 -0000 1.9 +++ baobab.spec 30 Mar 2006 20:14:19 -0000 1.10 @@ -1,12 +1,12 @@ Name: baobab Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-2.3.1.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -57,6 +57,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 +- Put in right version in the source tag + * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:15:09 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:15:09 -0700 Subject: rpms/baobab/FC-5 baobab.spec,1.13,1.14 Message-ID: <200603302015.k2UKFCIp026434@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26417 Modified Files: baobab.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 - Put in right version in the source tag Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/FC-5/baobab.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- baobab.spec 30 Mar 2006 19:53:13 -0000 1.13 +++ baobab.spec 30 Mar 2006 20:15:09 -0000 1.14 @@ -1,12 +1,12 @@ Name: baobab Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-2.3.1.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -56,6 +56,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 +- Put in right version in the source tag + * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:15:45 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:15:45 -0700 Subject: rpms/baobab/devel baobab.spec,1.13,1.14 Message-ID: <200603302015.k2UKFlTU026498@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/baobab/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26480 Modified Files: baobab.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 - Put in right version in the source tag Index: baobab.spec =================================================================== RCS file: /cvs/extras/rpms/baobab/devel/baobab.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- baobab.spec 30 Mar 2006 19:54:08 -0000 1.13 +++ baobab.spec 30 Mar 2006 20:15:45 -0000 1.14 @@ -1,12 +1,12 @@ Name: baobab Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Graphical tool to analyse directory trees Group: Applications/System License: GPL URL: http://www.marzocca.net/linux/baobab.html -Source0: http://www.marzocca.net/linux/downloads/baobab-2.3.1.tar.gz +Source0: http://www.marzocca.net/linux/downloads/baobab-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtk2-devel >= 2.6 @@ -56,6 +56,9 @@ %{_mandir}/man1/%{name}.1.gz %changelog +* Thu Mar 30 2006 Deji Akingunola - 2.3.2-2 +- Put in right version in the source tag + * Thu Mar 30 2006 Deji Akingunola - 2.3.2-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:18:57 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 13:18:57 -0700 Subject: rpms/pdsh/FC-5 pdsh.spec,1.1,1.2 pdsh-load-so.patch,1.1,NONE Message-ID: <200603302018.k2UKIxJb026573@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26556 Modified Files: pdsh.spec Removed Files: pdsh-load-so.patch Log Message: added dist tag so that I could on multiple versions of fedora removed pdsh-load-so.patch which isn't needed in 2.10 track upstream 2.10 version of pdsh Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-5/pdsh.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- pdsh.spec 21 Mar 2006 21:23:03 -0000 1.1 +++ pdsh.spec 30 Mar 2006 20:18:57 -0000 1.2 @@ -1,14 +1,13 @@ Name: pdsh -Version: 2.8.1 -Release: 7 +Version: 2.10 +Release: 3%{?dist} Summary: Parallel remote shell program License: GPL Url: http://sourceforge.net/projects/pdsh/ Group: System Environment/Base -Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}-1.tar.gz -Patch1: pdsh-load-so.patch +Source: http://dl.sourceforge.net/sourceforge/pdsh/pdsh-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: pdsh-rcmd @@ -217,8 +216,7 @@ ############################################################################## %prep -%setup -n pdsh-2.8.1-1 -%patch1 -p0 +%setup ############################################################################## @@ -260,10 +258,6 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT DESTDIR="$RPM_BUILD_ROOT" make install -# needed to allow rpm's find-debuginfo.sh to find binaries by default they -# are installed with perms that aren't selected by the find in -# find-debuginfo.sh -chmod 755 $RPM_BUILD_ROOT/%{_bindir}/pd{sh,cp} if [ -x $RPM_BUILD_ROOT/%{_sbindir}/in.qshd ]; then install -D -m644 etc/qshell.xinetd $RPM_BUILD_ROOT/%{_sysconfdir}/xinetd.d/qshell fi @@ -404,6 +398,16 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-3 +- added dist tag so that I can build on multiple versions + +* Thu Mar 30 2006 Ben Woodard 2.10-2 +- new version 2.10-1 used by upstream +- remove release from source line to track upstream +- deleted patch which is no longer needed +- removed -n from setup line. No longer needed. +- hack to fix perms so no longer needed + * Mon Mar 13 2006 Ben Woodard 2.8.1-7 - An optimization in pdsh depended on the .la files being there. Removed optimization. --- pdsh-load-so.patch DELETED --- From fedora-extras-commits at redhat.com Thu Mar 30 20:20:15 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 13:20:15 -0700 Subject: rpms/pdsh/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3 Message-ID: <200603302020.k2UKKHTW026606@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26587 Modified Files: .cvsignore sources Log Message: updated the tarball on this branch Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 21 Mar 2006 21:23:03 -0000 1.2 +++ .cvsignore 30 Mar 2006 20:20:15 -0000 1.3 @@ -1 +1 @@ -pdsh-2.8.1-1.tar.gz +pdsh-2.10.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 21 Mar 2006 21:23:03 -0000 1.2 +++ sources 30 Mar 2006 20:20:15 -0000 1.3 @@ -1 +1 @@ -d39b58da791f9437bdb4848da4efd6d1 pdsh-2.8.1-1.tar.gz +60f7fe11a98c72733a716ee392c0313a pdsh-2.10.tar.gz From fedora-extras-commits at redhat.com Thu Mar 30 20:48:19 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 13:48:19 -0700 Subject: rpms/maxima/FC-4 maxima.spec,1.17,1.18 Message-ID: <200603302048.k2UKmL4X026871@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/maxima/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26854 Modified Files: maxima.spec Log Message: * Thu Mar 30 2006 Rex Dieter 5.9.2-13 - respin for sbcl-0.9.11 Index: maxima.spec =================================================================== RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- maxima.spec 10 Mar 2006 19:36:33 -0000 1.17 +++ maxima.spec 30 Mar 2006 20:48:19 -0000 1.18 @@ -3,7 +3,7 @@ Name: maxima Version: 5.9.2 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: Applications/Engineering URL: http://maxima.sourceforge.net/ @@ -61,7 +61,12 @@ %define debug_package %{nil} BuildRequires: time +# texi2dvi +%if "%{?fedora}" > "5" +BuildRequires: texinfo-tex +%else BuildRequires: texinfo +%endif BuildRequires: tetex-latex BuildRequires: desktop-file-utils # /usr/bin/wish @@ -142,7 +147,7 @@ %package runtime-sbcl Summary: Maxima compiled with SBCL Group: Applications/Engineering -BuildRequires: sbcl +BuildRequires: sbcl >= 0.9.11 # maxima requires the *same* version it was built against # this hack should work, even in mock (-: -- Rex %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2) @@ -205,7 +210,7 @@ install -D -p -m644 %{SOURCE11} maximabook/maxima.pdf pushd info - texi2dvi -p maxima.texi + texi2dvi --pdf maxima.texi popd pushd intromax @@ -357,6 +362,12 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 5.9.2-13 +- respin for sbcl-0.9.11 + +* Mon Mar 27 2006 Rex Dieter +- fc6+: BR: texinfo -> texinfo-tex (#186827) + * Thu Mar 09 2006 Rex Dieter 5.9.2-12 - enable runtime-cmucl (%%ix86 only, atm) From fedora-extras-commits at redhat.com Thu Mar 30 20:48:31 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:48:31 -0700 Subject: rpms/qalculate-kde/FC-5 qalculate-kde.spec,1.6,1.7 Message-ID: <200603302048.k2UKmXsN026937@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26916 Modified Files: qalculate-kde.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 - Update the icons location Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-5/qalculate-kde.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qalculate-kde.spec 30 Mar 2006 20:10:52 -0000 1.6 +++ qalculate-kde.spec 30 Mar 2006 20:48:31 -0000 1.7 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde Version: 0.9.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -59,8 +59,12 @@ %{_datadir}/applications/fedora-qalculate_kde.desktop %{_datadir}/apps/qalculate_kde/ %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/actions/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 +- Update the icons location + * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:49:10 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:49:10 -0700 Subject: rpms/qalculate-kde/devel qalculate-kde.spec,1.6,1.7 Message-ID: <200603302049.k2UKnCar027003@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26986 Modified Files: qalculate-kde.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 - Update the icons location Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/devel/qalculate-kde.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- qalculate-kde.spec 30 Mar 2006 20:11:24 -0000 1.6 +++ qalculate-kde.spec 30 Mar 2006 20:49:10 -0000 1.7 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde Version: 0.9.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -59,8 +59,12 @@ %{_datadir}/applications/fedora-qalculate_kde.desktop %{_datadir}/apps/qalculate_kde/ %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/actions/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 +- Update the icons location + * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:50:16 2006 From: fedora-extras-commits at redhat.com (Deji Akingunola (deji)) Date: Thu, 30 Mar 2006 13:50:16 -0700 Subject: rpms/qalculate-kde/FC-4 qalculate-kde.spec,1.5,1.6 Message-ID: <200603302050.k2UKoIhw027117@cvs-int.fedora.redhat.com> Author: deji Update of /cvs/extras/rpms/qalculate-kde/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27100 Modified Files: qalculate-kde.spec Log Message: * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 - Update the icons location Index: qalculate-kde.spec =================================================================== RCS file: /cvs/extras/rpms/qalculate-kde/FC-4/qalculate-kde.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- qalculate-kde.spec 30 Mar 2006 20:10:26 -0000 1.5 +++ qalculate-kde.spec 30 Mar 2006 20:50:15 -0000 1.6 @@ -1,7 +1,7 @@ Summary: A multi-purpose desktop calculator for GNU/Linux Name: qalculate-kde Version: 0.9.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Engineering URL: http://qalculate.sourceforge.net/ @@ -59,8 +59,12 @@ %{_datadir}/applications/fedora-qalculate_kde.desktop %{_datadir}/apps/qalculate_kde/ %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/icons/hicolor/*/actions/* %changelog +* Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-2 +- Update the icons location + * Thu Mar 30 2006 Deji Akingunola - 0.9.3.1-1 - Update to newer version From fedora-extras-commits at redhat.com Thu Mar 30 20:51:42 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 30 Mar 2006 13:51:42 -0700 Subject: rpms/gajim/FC-5 gajim-0.9.1.notify_crash.patch, NONE, 1.1 gajim.spec, 1.8, 1.9 Message-ID: <200603302051.k2UKpiGP027196@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27161/FC-5 Modified Files: gajim.spec Added Files: gajim-0.9.1.notify_crash.patch Log Message: - Remove Gnome dependencies - Fix crash with notify-daemon (#187274, Stefan Plewako) http://trac.gajim.org/ticket/1347 gajim-0.9.1.notify_crash.patch: --- NEW FILE gajim-0.9.1.notify_crash.patch --- diff -Nur gajim-0.9.1.orig/src/notify.py gajim-0.9.1/src/notify.py --- gajim-0.9.1.orig/src/notify.py 2005-12-27 01:07:44.000000000 +0100 +++ gajim-0.9.1/src/notify.py 2006-03-30 01:34:02.000000000 +0200 @@ -189,10 +189,29 @@ self.notif = dbus_support.get_notifications_interface() if self.notif is None: raise dbus.dbus_bindings.DBusException() - self.id = self.notif.Notify(dbus.String(_('Gajim')), - dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0), - dbus.String(event_type), dbus.String(txt), - [dbus.String(path)], {'default':0}, [''], True, dbus.UInt32(5)) + timeout = gajim.config.get('notification_timeout') # in seconds + # Determine the version of notifications + # FIXME: This code is blocking, as is the next set. That should be fixed + # now that we have a class to encapsulate this behavior + try: + (name, vendor, version) = self.notif.GetServerInfo() + except: + # No way to determine the version number, set it to the latest + # since it doesn't properly support the version number + version = '0.3.1' + if version.startswith('0.2'): + try: + self.id = self.notif.Notify(dbus.String(_('Gajim')), + dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0), + dbus.String(event_type), dbus.String(txt), + [dbus.String(path)], {'default': 0}, [''], True, dbus.UInt32( + timeout)) + except AttributeError: + version = '0.3.1' # we're actually dealing with the newer version + if version.startswith('0.3'): + self.id = self.notif.Notify(dbus.String(_('Gajim')), + dbus.String(path), dbus.UInt32(0), dbus.String(event_type), + dbus.String(txt), dbus.String(""), {}, dbus.UInt32(timeout*1000)) notification_response_manager.attach_to_interface() notification_response_manager.pending[self.id] = self Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/FC-5/gajim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gajim.spec 14 Feb 2006 10:06:51 -0000 1.8 +++ gajim.spec 30 Mar 2006 20:51:41 -0000 1.9 @@ -1,9 +1,6 @@ -# Set to '1' if you want to use internal trayicon and gtkspell modules. -%define use_internal_modules 0 - Name: gajim Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Jabber client written in PyGTK Group: Applications/Internet @@ -11,6 +8,7 @@ URL: http://gajim.org/ Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 Patch0: gajim-0.9.1.modularX.patch +Patch1: gajim-0.9.1.notify_crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -21,16 +19,10 @@ BuildRequires: pkgconfig BuildRequires: pygtk2-devel BuildRequires: python-devel - -%if %{use_internal_modules} BuildRequires: gtkspell-devel -%else -Requires: gnome-python2-gtkspell -Requires: gnome-python2-libegg -%endif Requires: dbus-python -Requires: gnome-python2-gconf +#Requires: gnome-python2-gconf Requires: pygtk2-libglade Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-sqlite2 @@ -44,18 +36,13 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -sed -i -e 's/install\: all/install\:/' Makefile # gajim wants to handle executables; why? sed -i -e '/MimeType/d' gajim.desktop.in %build make \ -%if ! %{use_internal_modules} - translation \ - idle \ - gajim.desktop \ -%endif CC="%{__cc}" \ LIBDIR="/%{_lib}" \ OPTFLAGS="%{optflags}" \ @@ -98,6 +85,11 @@ %{_mandir}/man1/gajim-remote.1* %changelog +* Thu Mar 30 2006 Dawid Gajownik - 0.9.1-3 +- Remove Gnome dependencies +- Fix crash with notify-daemon (#187274, Stefan Plewako) + http://trac.gajim.org/ticket/1347 + * Tue Feb 14 2006 Dawid Gajownik - 0.9.1-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Thu Mar 30 20:51:42 2006 From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik)) Date: Thu, 30 Mar 2006 13:51:42 -0700 Subject: rpms/gajim/devel gajim-0.9.1.notify_crash.patch, NONE, 1.1 gajim.spec, 1.8, 1.9 Message-ID: <200603302051.k2UKpiqK027202@cvs-int.fedora.redhat.com> Author: gajownik Update of /cvs/extras/rpms/gajim/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27161/devel Modified Files: gajim.spec Added Files: gajim-0.9.1.notify_crash.patch Log Message: - Remove Gnome dependencies - Fix crash with notify-daemon (#187274, Stefan Plewako) http://trac.gajim.org/ticket/1347 gajim-0.9.1.notify_crash.patch: --- NEW FILE gajim-0.9.1.notify_crash.patch --- diff -Nur gajim-0.9.1.orig/src/notify.py gajim-0.9.1/src/notify.py --- gajim-0.9.1.orig/src/notify.py 2005-12-27 01:07:44.000000000 +0100 +++ gajim-0.9.1/src/notify.py 2006-03-30 01:34:02.000000000 +0200 @@ -189,10 +189,29 @@ self.notif = dbus_support.get_notifications_interface() if self.notif is None: raise dbus.dbus_bindings.DBusException() - self.id = self.notif.Notify(dbus.String(_('Gajim')), - dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0), - dbus.String(event_type), dbus.String(txt), - [dbus.String(path)], {'default':0}, [''], True, dbus.UInt32(5)) + timeout = gajim.config.get('notification_timeout') # in seconds + # Determine the version of notifications + # FIXME: This code is blocking, as is the next set. That should be fixed + # now that we have a class to encapsulate this behavior + try: + (name, vendor, version) = self.notif.GetServerInfo() + except: + # No way to determine the version number, set it to the latest + # since it doesn't properly support the version number + version = '0.3.1' + if version.startswith('0.2'): + try: + self.id = self.notif.Notify(dbus.String(_('Gajim')), + dbus.String(path), dbus.UInt32(0), ntype, dbus.Byte(0), + dbus.String(event_type), dbus.String(txt), + [dbus.String(path)], {'default': 0}, [''], True, dbus.UInt32( + timeout)) + except AttributeError: + version = '0.3.1' # we're actually dealing with the newer version + if version.startswith('0.3'): + self.id = self.notif.Notify(dbus.String(_('Gajim')), + dbus.String(path), dbus.UInt32(0), dbus.String(event_type), + dbus.String(txt), dbus.String(""), {}, dbus.UInt32(timeout*1000)) notification_response_manager.attach_to_interface() notification_response_manager.pending[self.id] = self Index: gajim.spec =================================================================== RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- gajim.spec 14 Feb 2006 10:06:51 -0000 1.8 +++ gajim.spec 30 Mar 2006 20:51:42 -0000 1.9 @@ -1,9 +1,6 @@ -# Set to '1' if you want to use internal trayicon and gtkspell modules. -%define use_internal_modules 0 - Name: gajim Version: 0.9.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Jabber client written in PyGTK Group: Applications/Internet @@ -11,6 +8,7 @@ URL: http://gajim.org/ Source0: http://gajim.org/downloads/gajim-%{version}.tar.bz2 Patch0: gajim-0.9.1.modularX.patch +Patch1: gajim-0.9.1.notify_crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -21,16 +19,10 @@ BuildRequires: pkgconfig BuildRequires: pygtk2-devel BuildRequires: python-devel - -%if %{use_internal_modules} BuildRequires: gtkspell-devel -%else -Requires: gnome-python2-gtkspell -Requires: gnome-python2-libegg -%endif Requires: dbus-python -Requires: gnome-python2-gconf +#Requires: gnome-python2-gconf Requires: pygtk2-libglade Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]") Requires: python-sqlite2 @@ -44,18 +36,13 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 -sed -i -e 's/install\: all/install\:/' Makefile # gajim wants to handle executables; why? sed -i -e '/MimeType/d' gajim.desktop.in %build make \ -%if ! %{use_internal_modules} - translation \ - idle \ - gajim.desktop \ -%endif CC="%{__cc}" \ LIBDIR="/%{_lib}" \ OPTFLAGS="%{optflags}" \ @@ -98,6 +85,11 @@ %{_mandir}/man1/gajim-remote.1* %changelog +* Thu Mar 30 2006 Dawid Gajownik - 0.9.1-3 +- Remove Gnome dependencies +- Fix crash with notify-daemon (#187274, Stefan Plewako) + http://trac.gajim.org/ticket/1347 + * Tue Feb 14 2006 Dawid Gajownik - 0.9.1-2 - Rebuild for Fedora Extras 5 From fedora-extras-commits at redhat.com Thu Mar 30 21:15:18 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 14:15:18 -0700 Subject: rpms/Macaulay2/FC-5 Macaulay2.desktop, 1.1, 1.2 Macaulay2.spec, 1.11, 1.12 Message-ID: <200603302115.k2ULFKKj029570@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29547 Modified Files: Macaulay2.desktop Macaulay2.spec Log Message: * Fri Jan 20 2006 Rex Dieter 0.9.2-20 - .desktop: drop Category=Development - app icon: follow icon spec - drop -emacs subpkg (in main now) * Fri Sep 16 2005 Rex Dieter - 0.9.2-19 - disable 'make check' (fc5/buildsystem error), besides, we get a good consistency check when M2 builds all the doc examples. Index: Macaulay2.desktop =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Macaulay2.desktop 8 Dec 2004 16:15:35 -0000 1.1 +++ Macaulay2.desktop 30 Mar 2006 21:15:18 -0000 1.2 @@ -5,5 +5,5 @@ SwallowTitle=Macaulay2 Terminal=true Type=Application -Categories=Application;Education;Math;Scientific;Development; +Categories=Application;Education;Math;Scientific; Encoding=UTF-8 Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Macaulay2.spec 30 Mar 2006 17:03:09 -0000 1.11 +++ Macaulay2.spec 30 Mar 2006 21:15:18 -0000 1.12 @@ -6,7 +6,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 0.9.2 -Release: 19%{?dist} +Release: 20%{?dist} License: GPL Group: Applications/Engineering URL: http://www.math.uiuc.edu/Macaulay2/ @@ -20,16 +20,19 @@ Patch1: Macaulay2-0.9-htmlview.patch Patch2: Macaulay2-0.9.2-static.patch Patch3: Macaulay2-0.9.2-gcc3.patch -# See http://bugzilla.fedora.us/attachment.cgi?id=877&action=view Patch4: Macaulay2-0.9.2-gcc34.patch Patch5: Macaulay2-0.9.2-gcc4.patch BuildRequires: desktop-file-utils -BuildRequires: gc-devel >= 6.6 -BuildRequires: factory-devel >= 2.0.5-7 -BuildRequires: libfac-devel >= 2.0.5-4 +BuildRequires: gc-devel +BuildRequires: factory-devel >= 2.0.5 +BuildRequires: libfac-devel >= 2.0.5 BuildRequires: gdbm-devel BuildRequires: time +#BuildRequires: lapack-devel + +Obsoletes: %{name}-emacs < %{version}-%{release} +Provides: %{name}-emacs = %{version}-%{release} %description Macaulay 2 is a new software system devoted to supporting research in @@ -44,15 +47,6 @@ %description doc %{name} documentation. -%package emacs -Summary: %{name} emacs mode -Group: Applications/Editors -Requires: emacs -Requires: %{name} = %{version} -%description emacs -%{name} emacs mode. - - %prep %setup -q @@ -64,34 +58,33 @@ %patch3 -p1 -b .gcc3 # fc3/gcc34 fix %patch4 -p1 -b .gcc34 +# fc4/gcc4 fix %patch5 -p1 -b .gcc4 %build + %configure \ - --enable-gc-for-new \ --disable-dumpdata \ - --disable-optimize \ - --disable-static \ - %{?debug_package:--disable-strip} + --disable-optimize + +#TODO: --with-lapacklibs + +make -# not smp-safe -make -# Takes a *long* time, default off %check || : -%{!?_without_check:make check } +#disable, for now, util/screen dies on fc5/buildsystem (could not open pty) +make check %install %makeinstall # Fix locations -perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \ - $RPM_BUILD_ROOT%{_bindir}/M2 -perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \ - $RPM_BUILD_ROOT%{_bindir}/M2-help -perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/* +sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2 +sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2-help +sed -i -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/* ## emacs files install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -99,18 +92,18 @@ $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ # app img -install -p -D -m644 \ - %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps/Macaulay2.png +install -p -m644 -D %{SOURCE1} \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps/32x32/Macaulay2.png -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --add-category "X-Fedora" \ %{SOURCE2} ## Unpackaged files +rm -f $RPM_BUILD_ROOT%{m2home}/setup # %doc stuff, no need to dup in appdir rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING} # created by make check @@ -129,40 +122,46 @@ # Handle possibly existing dumpdata #rm -f %{m2home}/libexec/Macaulay2-*-data ||: +%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 ||: + %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc Macaulay2/README Macaulay2/CHANGES %{_bindir}/M2 %{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/*.png +%{_datadir}/icons/hicolor/*/*/* %dir %{m2home} -%{m2home}/cache -%{m2home}/libexec -%{m2home}/m2 -%{m2home}/packages -# Not needed/wanted -%exclude %{m2home}/setup - -%files emacs -%defattr(-,root,root) -%dir %{m2home}/emacs -%doc %{m2home}/emacs/*.m2 -%doc %{m2home}/emacs/*.txt -%doc %{m2home}/emacs/README -%{m2home}/emacs/*.el -%{_datadir}/emacs/site-lisp/*.el +%{m2home}/cache/ +%{m2home}/libexec/ +%{m2home}/m2/ +%{m2home}/packages/ +# emacs bits +%{m2home}/emacs/ +%{_datadir}/emacs/site-lisp/ %files doc -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/M2-help -%{m2home}/html -%{m2home}/tutorial +%{m2home}/html/ +%{m2home}/tutorial/ %changelog -* Thu Mar 30 2006 Rex Dieter 0.9.2-19 -- BR: factory-devel >= 2.0.5-7, libfac-devel >= 2.0.5-4 (bug #183265) +* Fri Jan 20 2006 Rex Dieter 0.9.2-20 +- .desktop: drop Category=Development +- app icon: follow icon spec +- drop -emacs subpkg (in main now) + +* Fri Sep 16 2005 Rex Dieter - 0.9.2-19 +- disable 'make check' (fc5/buildsystem error), besides, we get a + good consistency check when M2 builds all the doc examples. * Wed Sep 14 2005 Rex Dieter - 0.9.2-18 - rebuild against gc-6.6 From fedora-extras-commits at redhat.com Thu Mar 30 21:41:20 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Thu, 30 Mar 2006 14:41:20 -0700 Subject: rpms/Macaulay2/FC-5 Macaulay2.spec,1.12,1.13 Message-ID: <200603302141.k2ULfMnB029914@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29897 Modified Files: Macaulay2.spec Log Message: * Thu Mar 30 2006 Rex Dieter 0.9.2-21 - *really* disable %check (fails on fc5+ anyway) Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.spec,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- Macaulay2.spec 30 Mar 2006 21:15:18 -0000 1.12 +++ Macaulay2.spec 30 Mar 2006 21:41:20 -0000 1.13 @@ -6,7 +6,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 0.9.2 -Release: 20%{?dist} +Release: 21%{?dist} License: GPL Group: Applications/Engineering URL: http://www.math.uiuc.edu/Macaulay2/ @@ -74,8 +74,8 @@ %check || : -#disable, for now, util/screen dies on fc5/buildsystem (could not open pty) -make check +# NOTE: util/screen dies on fc5/buildsystem (could not open pty) +#make check ||: %install @@ -154,6 +154,9 @@ %changelog +* Thu Mar 30 2006 Rex Dieter 0.9.2-21 +- *really* disable %%check (fails on fc5+ anyway) + * Fri Jan 20 2006 Rex Dieter 0.9.2-20 - .desktop: drop Category=Development - app icon: follow icon spec From fedora-extras-commits at redhat.com Thu Mar 30 21:52:39 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 14:52:39 -0700 Subject: rpms/pdsh/devel pdsh.spec,1.3,1.4 Message-ID: <200603302152.k2ULqfGb029991@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29974 Modified Files: pdsh.spec Log Message: Upstream pointed out that I'd missed two new capabilities in pdsh that were added to the 2.10 spec file. I added these to keep in sync with upstream. Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/devel/pdsh.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pdsh.spec 30 Mar 2006 20:07:06 -0000 1.3 +++ pdsh.spec 30 Mar 2006 21:52:39 -0000 1.4 @@ -1,6 +1,6 @@ Name: pdsh Version: 2.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parallel remote shell program @@ -15,9 +15,9 @@ # Enabling and disabling pdsh options # defaults: # enabled: readline, rsh, ssh -# disabled: rms, mrsh, qshell, mqshell, genders, nodeattr, machines, -# nodeupdown - +# disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines, +# nodeupdown, dshgroup, netgroups +# # To build the various module subpackages, pass --with on # the rpmbuild command line (if your rpm is a recent enough version) # @@ -48,6 +48,8 @@ %{expand: %def qshell without with} %{expand: %pdsh_with mqshell} %{expand: %def mqshell without with} +%{expand: %pdsh_with xcpu} +%{expand: %def xcpu without with} %{expand: %pdsh_with genders} %{expand: %def genders without with} %{expand: %pdsh_with nodeattr} @@ -56,6 +58,8 @@ %{expand: %def nodeupdown without with} %{expand: %pdsh_with dshgroups} %{expand: %def dshgroups without with} +%{expand: %pdsh_with netgroup} +%{expand: %def netgroup without with} %{expand: %pdsh_with machines} %{expand: %def machines without with} %{expand: %pdsh_with slurm} @@ -153,6 +157,13 @@ %description rcmd-mqshell Pdsh module for mqshell rcmd functionality. +%package rcmd-xcpu +Summary: Provides xcpu rcmd capability to pdsh +Group: System Environment/Base +Provides: pdsh-xcpu +%description rcmd-xcpu +Pdsh module for xcpu rcmd functionality. + %package mod-genders Summary: Provides libgenders support for pdsh Group: System Environment/Base @@ -202,6 +213,13 @@ Pdsh module providing dsh (Dancer's shell) style "group" file support. Provides -g groupname and -X groupname options to pdsh. +%package mod-netgroup +Summary: Provides netgroup support for pdsh +Group: System Environment/Base +Requires: whatsup +%description mod-netgroup +Pdsh module providing support for targeting hosts based on netgroup. +Provides -g groupname and -X groupname options to pdsh. %package mod-slurm Summary: Provides support for running pdsh under SLURM allocations @@ -245,10 +263,15 @@ %{?_without_mrsh} \ %{?_with_mqshell} \ %{?_without_mqshell} \ + %{?_with_xcpu} \ + %{?_without_xcpu} \ %{?_with_slurm} \ %{?_without_slurm} \ %{?_with_dshgroups} \ - %{?_without_dshgroups} + %{?_without_dshgroups} \ + %{?_with_netgroup} \ + %{?_without_netgroup} + # FIXME: build fails when trying to build with _smp_mflags if qsnet is enabled # make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" make CFLAGS="$RPM_OPT_FLAGS" @@ -318,6 +341,13 @@ %endif ############################################################################## +%if %{?_with_xcpu:1}%{!?_with_xcpu:0} +%files rcmd-xcpu +%defattr(-,root,root) +%{_libdir}/pdsh/xcpucmd.* +%endif +############################################################################## + %if %{?_with_genders:1}%{!?_with_genders:0} %files mod-genders %defattr(-,root,root) @@ -359,6 +389,14 @@ %{_libdir}/pdsh/dshgroup.* %endif ############################################################################## + +%if %{?_with_netgroup:1}%{!?_with_netgroup:0} +%files mod-netgroup +%defattr(-,root,root) +%{_libdir}/pdsh/netgroup.* +%endif +############################################################################## + %if %{?_with_slurm:1}%{!?_with_slurm:0} %files mod-slurm %defattr(-,root,root) @@ -398,6 +436,10 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-4 +- upstream pointed out that they had added two new subpackages + that I'd failed to include. + * Thu Mar 30 2006 Ben Woodard 2.10-3 - added dist tag so that I can build on multiple versions From fedora-extras-commits at redhat.com Thu Mar 30 21:55:11 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 14:55:11 -0700 Subject: rpms/pdsh/FC-4 pdsh.spec,1.3,1.4 Message-ID: <200603302155.k2ULtDCo030078@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30061 Modified Files: pdsh.spec Log Message: Upsteam pointed out that they had added two new subpackages that I'd failed to include. Added these to keep in sync with upstream. Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-4/pdsh.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- pdsh.spec 30 Mar 2006 20:11:57 -0000 1.3 +++ pdsh.spec 30 Mar 2006 21:55:11 -0000 1.4 @@ -1,6 +1,6 @@ Name: pdsh Version: 2.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parallel remote shell program @@ -15,9 +15,9 @@ # Enabling and disabling pdsh options # defaults: # enabled: readline, rsh, ssh -# disabled: rms, mrsh, qshell, mqshell, genders, nodeattr, machines, -# nodeupdown - +# disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines, +# nodeupdown, dshgroup, netgroups +# # To build the various module subpackages, pass --with on # the rpmbuild command line (if your rpm is a recent enough version) # @@ -48,6 +48,8 @@ %{expand: %def qshell without with} %{expand: %pdsh_with mqshell} %{expand: %def mqshell without with} +%{expand: %pdsh_with xcpu} +%{expand: %def xcpu without with} %{expand: %pdsh_with genders} %{expand: %def genders without with} %{expand: %pdsh_with nodeattr} @@ -56,6 +58,8 @@ %{expand: %def nodeupdown without with} %{expand: %pdsh_with dshgroups} %{expand: %def dshgroups without with} +%{expand: %pdsh_with netgroup} +%{expand: %def netgroup without with} %{expand: %pdsh_with machines} %{expand: %def machines without with} %{expand: %pdsh_with slurm} @@ -153,6 +157,13 @@ %description rcmd-mqshell Pdsh module for mqshell rcmd functionality. +%package rcmd-xcpu +Summary: Provides xcpu rcmd capability to pdsh +Group: System Environment/Base +Provides: pdsh-xcpu +%description rcmd-xcpu +Pdsh module for xcpu rcmd functionality. + %package mod-genders Summary: Provides libgenders support for pdsh Group: System Environment/Base @@ -202,6 +213,13 @@ Pdsh module providing dsh (Dancer's shell) style "group" file support. Provides -g groupname and -X groupname options to pdsh. +%package mod-netgroup +Summary: Provides netgroup support for pdsh +Group: System Environment/Base +Requires: whatsup +%description mod-netgroup +Pdsh module providing support for targeting hosts based on netgroup. +Provides -g groupname and -X groupname options to pdsh. %package mod-slurm Summary: Provides support for running pdsh under SLURM allocations @@ -245,10 +263,15 @@ %{?_without_mrsh} \ %{?_with_mqshell} \ %{?_without_mqshell} \ + %{?_with_xcpu} \ + %{?_without_xcpu} \ %{?_with_slurm} \ %{?_without_slurm} \ %{?_with_dshgroups} \ - %{?_without_dshgroups} + %{?_without_dshgroups} \ + %{?_with_netgroup} \ + %{?_without_netgroup} + # FIXME: build fails when trying to build with _smp_mflags if qsnet is enabled # make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" make CFLAGS="$RPM_OPT_FLAGS" @@ -318,6 +341,13 @@ %endif ############################################################################## +%if %{?_with_xcpu:1}%{!?_with_xcpu:0} +%files rcmd-xcpu +%defattr(-,root,root) +%{_libdir}/pdsh/xcpucmd.* +%endif +############################################################################## + %if %{?_with_genders:1}%{!?_with_genders:0} %files mod-genders %defattr(-,root,root) @@ -359,6 +389,14 @@ %{_libdir}/pdsh/dshgroup.* %endif ############################################################################## + +%if %{?_with_netgroup:1}%{!?_with_netgroup:0} +%files mod-netgroup +%defattr(-,root,root) +%{_libdir}/pdsh/netgroup.* +%endif +############################################################################## + %if %{?_with_slurm:1}%{!?_with_slurm:0} %files mod-slurm %defattr(-,root,root) @@ -398,6 +436,10 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-4 +- upstream pointed out that they had added two new subpackages + that I'd failed to include. + * Thu Mar 30 2006 Ben Woodard 2.10-3 - added dist tag so that I can build on multiple versions From fedora-extras-commits at redhat.com Thu Mar 30 21:55:26 2006 From: fedora-extras-commits at redhat.com (Ben Woodard (kg6fnk)) Date: Thu, 30 Mar 2006 14:55:26 -0700 Subject: rpms/pdsh/FC-5 pdsh.spec,1.2,1.3 Message-ID: <200603302155.k2ULtSx5030101@cvs-int.fedora.redhat.com> Author: kg6fnk Update of /cvs/extras/rpms/pdsh/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30084 Modified Files: pdsh.spec Log Message: Upsteam pointed out that they had added two new subpackages that I'd failed to include. Added these to keep in sync with upstream. Index: pdsh.spec =================================================================== RCS file: /cvs/extras/rpms/pdsh/FC-5/pdsh.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- pdsh.spec 30 Mar 2006 20:18:57 -0000 1.2 +++ pdsh.spec 30 Mar 2006 21:55:26 -0000 1.3 @@ -1,6 +1,6 @@ Name: pdsh Version: 2.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Parallel remote shell program @@ -15,9 +15,9 @@ # Enabling and disabling pdsh options # defaults: # enabled: readline, rsh, ssh -# disabled: rms, mrsh, qshell, mqshell, genders, nodeattr, machines, -# nodeupdown - +# disabled: rms, mrsh, qshell, mqshell, xcpu, genders, nodeattr, machines, +# nodeupdown, dshgroup, netgroups +# # To build the various module subpackages, pass --with on # the rpmbuild command line (if your rpm is a recent enough version) # @@ -48,6 +48,8 @@ %{expand: %def qshell without with} %{expand: %pdsh_with mqshell} %{expand: %def mqshell without with} +%{expand: %pdsh_with xcpu} +%{expand: %def xcpu without with} %{expand: %pdsh_with genders} %{expand: %def genders without with} %{expand: %pdsh_with nodeattr} @@ -56,6 +58,8 @@ %{expand: %def nodeupdown without with} %{expand: %pdsh_with dshgroups} %{expand: %def dshgroups without with} +%{expand: %pdsh_with netgroup} +%{expand: %def netgroup without with} %{expand: %pdsh_with machines} %{expand: %def machines without with} %{expand: %pdsh_with slurm} @@ -153,6 +157,13 @@ %description rcmd-mqshell Pdsh module for mqshell rcmd functionality. +%package rcmd-xcpu +Summary: Provides xcpu rcmd capability to pdsh +Group: System Environment/Base +Provides: pdsh-xcpu +%description rcmd-xcpu +Pdsh module for xcpu rcmd functionality. + %package mod-genders Summary: Provides libgenders support for pdsh Group: System Environment/Base @@ -202,6 +213,13 @@ Pdsh module providing dsh (Dancer's shell) style "group" file support. Provides -g groupname and -X groupname options to pdsh. +%package mod-netgroup +Summary: Provides netgroup support for pdsh +Group: System Environment/Base +Requires: whatsup +%description mod-netgroup +Pdsh module providing support for targeting hosts based on netgroup. +Provides -g groupname and -X groupname options to pdsh. %package mod-slurm Summary: Provides support for running pdsh under SLURM allocations @@ -245,10 +263,15 @@ %{?_without_mrsh} \ %{?_with_mqshell} \ %{?_without_mqshell} \ + %{?_with_xcpu} \ + %{?_without_xcpu} \ %{?_with_slurm} \ %{?_without_slurm} \ %{?_with_dshgroups} \ - %{?_without_dshgroups} + %{?_without_dshgroups} \ + %{?_with_netgroup} \ + %{?_without_netgroup} + # FIXME: build fails when trying to build with _smp_mflags if qsnet is enabled # make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" make CFLAGS="$RPM_OPT_FLAGS" @@ -318,6 +341,13 @@ %endif ############################################################################## +%if %{?_with_xcpu:1}%{!?_with_xcpu:0} +%files rcmd-xcpu +%defattr(-,root,root) +%{_libdir}/pdsh/xcpucmd.* +%endif +############################################################################## + %if %{?_with_genders:1}%{!?_with_genders:0} %files mod-genders %defattr(-,root,root) @@ -359,6 +389,14 @@ %{_libdir}/pdsh/dshgroup.* %endif ############################################################################## + +%if %{?_with_netgroup:1}%{!?_with_netgroup:0} +%files mod-netgroup +%defattr(-,root,root) +%{_libdir}/pdsh/netgroup.* +%endif +############################################################################## + %if %{?_with_slurm:1}%{!?_with_slurm:0} %files mod-slurm %defattr(-,root,root) @@ -398,6 +436,10 @@ %changelog +* Thu Mar 30 2006 Ben Woodard 2.10-4 +- upstream pointed out that they had added two new subpackages + that I'd failed to include. + * Thu Mar 30 2006 Ben Woodard 2.10-3 - added dist tag so that I can build on multiple versions From fedora-extras-commits at redhat.com Thu Mar 30 23:48:02 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 30 Mar 2006 16:48:02 -0700 Subject: rpms/cogito/devel cg-admin-rewritehist-fix.patch, NONE, 1.1 cogito.spec, 1.10, 1.11 Message-ID: <200603302348.k2UNm4oa002350@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2330 Modified Files: cogito.spec Added Files: cg-admin-rewritehist-fix.patch Log Message: fix for bz 187434, 0.17.1-2 cg-admin-rewritehist-fix.patch: --- NEW FILE cg-admin-rewritehist-fix.patch --- 16c76deb91b167c921a02641a2002e052143e16a diff --git a/cg-admin-rewritehist b/cg-admin-rewritehist index 306f855..9c49d80 100755 --- a/cg-admin-rewritehist +++ b/cg-admin-rewritehist @@ -143,7 +143,7 @@ filter_tree= filter_index= filter_parent= filter_msg=cat -filter_commit=git-commit-tree +filter_commit='git-commit-tree "$@"' while optparse; do if optparse -d=; then tempdir="$OPTARG" Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cogito.spec 29 Mar 2006 19:34:04 -0000 1.10 +++ cogito.spec 30 Mar 2006 23:48:02 -0000 1.11 @@ -1,6 +1,6 @@ Name: cogito Version: 0.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools @@ -11,6 +11,8 @@ BuildRequires: asciidoc, xmlto BuildArch: noarch +Patch1: cg-admin-rewritehist-fix.patch + %description Cogito is a version control system layered on top of the git tree history storage system. It aims at seamless user interface and ease of use, providing @@ -19,6 +21,7 @@ %prep %setup -q +%patch1 -p1 %build @@ -44,6 +47,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Thu Mar 30 2006 Chris Wright 0.17.1-2 +- cg-admin-rewritehist fix + * Tue Mar 28 2006 Chris Wright 0.17.1-1 - 0.17.1 From fedora-extras-commits at redhat.com Thu Mar 30 23:49:10 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 30 Mar 2006 16:49:10 -0700 Subject: rpms/cogito/FC-5 cg-admin-rewritehist-fix.patch, NONE, 1.1 cogito.spec, 1.10, 1.11 Message-ID: <200603302349.k2UNnCIU002391@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2371 Modified Files: cogito.spec Added Files: cg-admin-rewritehist-fix.patch Log Message: fix for bz 187434, 0.17.1-2 cg-admin-rewritehist-fix.patch: --- NEW FILE cg-admin-rewritehist-fix.patch --- 16c76deb91b167c921a02641a2002e052143e16a diff --git a/cg-admin-rewritehist b/cg-admin-rewritehist index 306f855..9c49d80 100755 --- a/cg-admin-rewritehist +++ b/cg-admin-rewritehist @@ -143,7 +143,7 @@ filter_tree= filter_index= filter_parent= filter_msg=cat -filter_commit=git-commit-tree +filter_commit='git-commit-tree "$@"' while optparse; do if optparse -d=; then tempdir="$OPTARG" Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-5/cogito.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- cogito.spec 29 Mar 2006 19:35:49 -0000 1.10 +++ cogito.spec 30 Mar 2006 23:49:10 -0000 1.11 @@ -1,6 +1,6 @@ Name: cogito Version: 0.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools @@ -11,6 +11,8 @@ BuildRequires: asciidoc, xmlto BuildArch: noarch +Patch1: cg-admin-rewritehist-fix.patch + %description Cogito is a version control system layered on top of the git tree history storage system. It aims at seamless user interface and ease of use, providing @@ -19,6 +21,7 @@ %prep %setup -q +%patch1 -p1 %build @@ -44,6 +47,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Thu Mar 30 2006 Chris Wright 0.17.1-2 +- cg-admin-rewritehist fix + * Tue Mar 28 2006 Chris Wright 0.17.1-1 - 0.17.1 From fedora-extras-commits at redhat.com Thu Mar 30 23:51:26 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 30 Mar 2006 16:51:26 -0700 Subject: rpms/cogito/FC-4 cg-admin-rewritehist-fix.patch, NONE, 1.1 cogito.spec, 1.9, 1.10 Message-ID: <200603302351.k2UNpSt6002520@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2500 Modified Files: cogito.spec Added Files: cg-admin-rewritehist-fix.patch Log Message: fix for bz 187434, 0.17.1-2 cg-admin-rewritehist-fix.patch: --- NEW FILE cg-admin-rewritehist-fix.patch --- 16c76deb91b167c921a02641a2002e052143e16a diff --git a/cg-admin-rewritehist b/cg-admin-rewritehist index 306f855..9c49d80 100755 --- a/cg-admin-rewritehist +++ b/cg-admin-rewritehist @@ -143,7 +143,7 @@ filter_tree= filter_index= filter_parent= filter_msg=cat -filter_commit=git-commit-tree +filter_commit='git-commit-tree "$@"' while optparse; do if optparse -d=; then tempdir="$OPTARG" Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cogito.spec 29 Mar 2006 19:36:46 -0000 1.9 +++ cogito.spec 30 Mar 2006 23:51:26 -0000 1.10 @@ -1,6 +1,6 @@ Name: cogito Version: 0.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools @@ -11,6 +11,8 @@ BuildRequires: asciidoc, xmlto BuildArch: noarch +Patch1: cg-admin-rewritehist-fix.patch + %description Cogito is a version control system layered on top of the git tree history storage system. It aims at seamless user interface and ease of use, providing @@ -19,6 +21,7 @@ %prep %setup -q +%patch1 -p1 %build @@ -44,6 +47,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Thu Mar 30 2006 Chris Wright 0.17.1-2 +- cg-admin-rewritehist fix + * Tue Mar 28 2006 Chris Wright 0.17.1-1 - 0.17.1 From fedora-extras-commits at redhat.com Thu Mar 30 23:52:19 2006 From: fedora-extras-commits at redhat.com (Chris Wright (chrisw)) Date: Thu, 30 Mar 2006 16:52:19 -0700 Subject: rpms/cogito/FC-3 cg-admin-rewritehist-fix.patch, NONE, 1.1 cogito.spec, 1.9, 1.10 Message-ID: <200603302352.k2UNqLRV002602@cvs-int.fedora.redhat.com> Author: chrisw Update of /cvs/extras/rpms/cogito/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2582 Modified Files: cogito.spec Added Files: cg-admin-rewritehist-fix.patch Log Message: fix for bz 187434, 0.17.1-2 cg-admin-rewritehist-fix.patch: --- NEW FILE cg-admin-rewritehist-fix.patch --- 16c76deb91b167c921a02641a2002e052143e16a diff --git a/cg-admin-rewritehist b/cg-admin-rewritehist index 306f855..9c49d80 100755 --- a/cg-admin-rewritehist +++ b/cg-admin-rewritehist @@ -143,7 +143,7 @@ filter_tree= filter_index= filter_parent= filter_msg=cat -filter_commit=git-commit-tree +filter_commit='git-commit-tree "$@"' while optparse; do if optparse -d=; then tempdir="$OPTARG" Index: cogito.spec =================================================================== RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- cogito.spec 29 Mar 2006 19:37:52 -0000 1.9 +++ cogito.spec 30 Mar 2006 23:52:19 -0000 1.10 @@ -1,6 +1,6 @@ Name: cogito Version: 0.17.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Cogito Version Control System License: GPL Group: Development/Tools @@ -11,6 +11,8 @@ BuildRequires: asciidoc, xmlto BuildArch: noarch +Patch1: cg-admin-rewritehist-fix.patch + %description Cogito is a version control system layered on top of the git tree history storage system. It aims at seamless user interface and ease of use, providing @@ -19,6 +21,7 @@ %prep %setup -q +%patch1 -p1 %build @@ -44,6 +47,9 @@ %doc README COPYING Documentation/tutorial-script %changelog +* Thu Mar 30 2006 Chris Wright 0.17.1-2 +- cg-admin-rewritehist fix + * Tue Mar 28 2006 Chris Wright 0.17.1-1 - 0.17.1 From fedora-extras-commits at redhat.com Fri Mar 31 01:33:31 2006 From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt)) Date: Thu, 30 Mar 2006 18:33:31 -0700 Subject: rpms/sylpheed/devel .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 sylpheed.spec, 1.28, 1.29 Message-ID: <200603310133.k2V1XXv1007029@cvs-int.fedora.redhat.com> Author: mschwendt Update of /cvs/extras/rpms/sylpheed/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7008 Modified Files: .cvsignore sources sylpheed.spec Log Message: * Fri Mar 31 2006 Michael Schwendt - 2.2.4-1 - Update to 2.2.4. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/.cvsignore,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- .cvsignore 19 Mar 2006 22:01:32 -0000 1.16 +++ .cvsignore 31 Mar 2006 01:33:31 -0000 1.17 @@ -1,2 +1,2 @@ -sylpheed-2.2.3.tar.bz2.asc -sylpheed-2.2.3.tar.bz2 +sylpheed-2.2.4.tar.bz2.asc +sylpheed-2.2.4.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sources,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- sources 19 Mar 2006 22:01:32 -0000 1.16 +++ sources 31 Mar 2006 01:33:31 -0000 1.17 @@ -1,2 +1,2 @@ -e686a2fd8cf2ce3dd0ac766fd58fb15d sylpheed-2.2.3.tar.bz2.asc -4fe29639ac4f628f348120361310e0af sylpheed-2.2.3.tar.bz2 +6f60a04132f85161f8b3e44af2b63a98 sylpheed-2.2.4.tar.bz2.asc +4e5608e63d4ea413bf4a0fa3abb4223f sylpheed-2.2.4.tar.bz2 Index: sylpheed.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed/devel/sylpheed.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- sylpheed.spec 19 Mar 2006 22:01:32 -0000 1.28 +++ sylpheed.spec 31 Mar 2006 01:33:31 -0000 1.29 @@ -4,7 +4,7 @@ Summary: GTK+ based, lightweight, and fast email client Name: sylpheed -Version: 2.2.3 +Version: 2.2.4 Release: 1%{?dist} License: GPL URL: http://sylpheed.good-day.net/ @@ -82,6 +82,9 @@ %{_mandir}/man1/* %changelog +* Fri Mar 31 2006 Michael Schwendt - 2.2.4-1 +- Update to 2.2.4. + * Sun Mar 19 2006 Michael Schwendt - 2.2.3-1 - Update to 2.2.3. - Update external commands (defs.h) patch. From fedora-extras-commits at redhat.com Fri Mar 31 02:23:27 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Thu, 30 Mar 2006 19:23:27 -0700 Subject: rpms/wxPython/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 wxPython.spec, 1.5, 1.6 Message-ID: <200603310223.k2V2NTEt009384@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9363 Added Files: .cvsignore sources wxPython.spec Log Message: Update to 2.6.3.0 (finally, I know) Index: .cvsignore =================================================================== RCS file: .cvsignore diff -N .cvsignore --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ .cvsignore 31 Mar 2006 02:23:27 -0000 1.4 @@ -0,0 +1 @@ +wxPython-src-2.6.3.0.tar.gz Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 31 Mar 2006 02:23:27 -0000 1.4 @@ -0,0 +1 @@ +2891a496f4a415179e6a231619344b27 wxPython-src-2.6.3.0.tar.gz Index: wxPython.spec =================================================================== RCS file: wxPython.spec diff -N wxPython.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ wxPython.spec 31 Mar 2006 02:23:27 -0000 1.6 @@ -0,0 +1,128 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +%define buildflags WXPORT=gtk2 UNICODE=1 + +Name: wxPython +Version: 2.6.3.0 +Release: 1%{?dist} + +Summary: GUI toolkit for the Python programming language + +Group: Development/Languages +License: LGPL +URL: http://www.wxpython.org/ +Source0: http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: wxGTK-devel = 2.6.3, pkgconfig +BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel +BuildRequires: python-devel, wxGTK-gl + +# packages should depend on "wxPython", not "wxPythonGTK2", but in case +# one does, here's the provides for it. +Provides: wxPythonGTK2 = %{version}-%{release} + +%description +wxPython is a GUI toolkit for the Python programming language. It allows +Python programmers to create programs with a robust, highly functional +graphical user interface, simply and easily. It is implemented as a Python +extension module (native code) that wraps the popular wxWindows cross +platform GUI library, which is written in C++. + +%package devel +Group: Development/Libraries +Summary: Development files for wxPython add-on modules +Requires: %{name} = %{version}-%{release} +Requires: wxGTK-devel + +%description devel +This package includes C++ header files and SWIG files needed for developing +add-on modules for wxPython. It is NOT needed for development of most +programs which use the wxPython toolkit. + + +%prep +%setup -q -n wxPython-src-%{version} + +# There's binaries included in the source tarball, resulting in bogus +# dependencies for the package -- clean it up: +rm wxPython/samples/embedded/embedded wxPython/samples/embedded/embedded.o + +%build +# Just build the wxPython part, not all of wxWindows which we already have +# in Fedora +cd wxPython +# included distutils is not multilib aware; use normal +rm -rf distutils +python setup.py %{buildflags} build + + +%install +rm -rf $RPM_BUILD_ROOT +cd wxPython +python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples +%{_bindir}/* +%{python_sitearch}/wx.pth +%{python_sitearch}/wxversion.py* +%dir %{python_sitearch}/wx-2.6-gtk2-unicode/ +%{python_sitearch}/wx-2.6-gtk2-unicode/wx +%{python_sitearch}/wx-2.6-gtk2-unicode/wxPython + +%files devel +%defattr(-,root,root,-) +%dir %{_includedir}/wx-2.6/wx/wxPython +%{_includedir}/wx-2.6/wx/wxPython/*.h +%dir %{_includedir}/wx-2.6/wx/wxPython/i_files +%{_includedir}/wx-2.6/wx/wxPython/i_files/*.i +%{_includedir}/wx-2.6/wx/wxPython/i_files/*.py* +%{_includedir}/wx-2.6/wx/wxPython/i_files/*.swg + + +%changelog +* Thu Mar 30 2006 Matthew Miller - 2.6.3.0-1 +- update to 2.6.3.0 +- wxGTK and wxPython versions are inexorably linked; make BuildRequires + be exact, rather than >=. +- make devel subpackage as per comment #7 in bug #163440. + +* Thu Nov 24 2005 Matthew Miller - 2.6.1.0-1 +- update to 2.6.0.0 +- merge in changes from current extras 2.4.x package +- Happy Thanksgiving +- build animate extention again -- works now. + +* Thu Apr 28 2005 Matthew Miller - 2.6.0.0-bu45.1 +- get rid of accidental binaries in source tarball -- they generates + spurious dependencies and serve no purpose +- update to 2.6.0.0 and build for Velouria +- switch to Fedora Extras base spec file +- enable gtk2 and unicode and all the code stuff (as FE does) +- disable BUILD_ANIMATE extension from contrib -- doesn't build +- files are in a different location now -- adjust to that +- zap include files (needed only for building wxPython 3rd-party modules), + because I don't think this is likely to be very useful. Other option + would be to create a -devel package, but I think that'd be confusing. + +* Tue Feb 08 2005 Thorsten Leemhuis 0:2.4.2.4-4 +- remove included disutils - it is not multilib aware; this + fixes build on x86_64 + +* Tue Jan 06 2004 Panu Matilainen 0:2.4.2.4-0.fdr.3 +- rename package to wxPythonGTK2, provide wxPython (see bug 927) +- dont ship binaries in /usr/share + +* Thu Nov 20 2003 Panu Matilainen 0:2.4.2.4-0.fdr.2 +- add missing buildrequires: python-devel, wxGTK2-gl + +* Sun Nov 02 2003 Panu Matilainen 0:2.4.2.4-0.fdr.1 +- Initial RPM release. +~ From fedora-extras-commits at redhat.com Fri Mar 31 02:59:33 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Thu, 30 Mar 2006 19:59:33 -0700 Subject: rpms/denyhosts/devel denyhosts-2.2-daemon-control.patch, NONE, 1.1 README.fedora, 1.3, 1.4 denyhosts.cron, 1.5, 1.6 denyhosts.spec, 1.28, 1.29 denyhosts-2.0-daemon-control.patch, 1.1, NONE Message-ID: <200603310259.k2V2xZJ3009483@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9459 Modified Files: README.fedora denyhosts.cron denyhosts.spec Added Files: denyhosts-2.2-daemon-control.patch Removed Files: denyhosts-2.0-daemon-control.patch Log Message: * Thu Mar 30 2006 Jason L Tibbitts III - 2.2-3 - Switch from $RPM_BUILD_ROOT to %{buildroot} (looks cleaner). - Rename the main executable from denyhosts.py to denyhosts. denyhosts-2.2-daemon-control.patch: --- NEW FILE denyhosts-2.2-daemon-control.patch --- --- daemon-control-dist.daemon-control 2006-02-07 21:37:51.000000000 -0600 +++ daemon-control-dist 2006-03-30 19:49:23.200435174 -0600 @@ -11,9 +11,9 @@ #### Edit these to suit your configuration #### ############################################### -DENYHOSTS_BIN = "/usr/bin/denyhosts.py" +DENYHOSTS_BIN = "/usr/bin/denyhosts" DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts" -DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg" +DENYHOSTS_CFG = "/etc/denyhosts.conf" ############################################### @@ -35,7 +35,7 @@ print "Usage: %s {start [args...] | stop | restart [args...] | status | debug | condrestart [args...] }" % sys.argv[0] print print "For a list of valid 'args' refer to:" - print "$ denyhosts.py --help" + print "$ denyhosts --help" print sys.exit(0) Index: README.fedora =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/README.fedora,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- README.fedora 20 Nov 2005 17:21:49 -0000 1.3 +++ README.fedora 31 Mar 2006 02:59:32 -0000 1.4 @@ -29,7 +29,7 @@ If you want to incorporate an old logfile (in this example, /var/log/secure.1) , you can run - denyhosts.py -c /etc/denyhosts.conf /var/log/secure.1 + denyhosts -c /etc/denyhosts.conf /var/log/secure.1 DenyHosts can also handle logs compressed with gzip or bzip2. Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.cron,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- denyhosts.cron 16 Aug 2005 03:30:56 -0000 1.5 +++ denyhosts.cron 31 Mar 2006 02:59:32 -0000 1.6 @@ -4,9 +4,9 @@ # "service" and set it to run at boot if necessary.) # # Run denyhosts occasionally; adjust the time span to your liking -#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf +#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts -c /etc/denyhosts.conf # # Automatically purge old entries early in the morning. Note that you must # edit /etc/denyhosts.conf and set PURGE_DENY to something reasonable, as the # default value purge time is set very high. -#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf --purge +#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts -c /etc/denyhosts.conf --purge Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- denyhosts.spec 30 Mar 2006 16:36:17 -0000 1.28 +++ denyhosts.spec 31 Mar 2006 02:59:32 -0000 1.29 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -15,7 +15,7 @@ Source6: README.fedora Patch0: denyhosts-2.2-config.patch Patch1: denyhosts-2.1-setup.patch -Patch2: denyhosts-2.0-daemon-control.patch +Patch2: denyhosts-2.2-daemon-control.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,9 +37,9 @@ %prep %setup -q -n DenyHosts-%{version} -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 +%patch0 -p0 -b .config +%patch1 -p0 -b .setup +%patch2 -p0 -b .daemon-control cp %{SOURCE6} . @@ -53,40 +53,41 @@ %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT +%{__python} setup.py install -O1 --skip-build --root=%{buildroot} -install -d $RPM_BUILD_ROOT%{_bindir} -install -d $RPM_BUILD_ROOT%{_initrddir} -install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d -install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d -install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig - -install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts -install -d $RPM_BUILD_ROOT%{_localstatedir}/log - -install -p -m 600 denyhosts.cfg-dist $RPM_BUILD_ROOT%{_sysconfdir}/denyhosts.conf -install -p -m 755 daemon-control-dist $RPM_BUILD_ROOT%{_bindir}/denyhosts-control -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/cron.d/denyhosts -install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/denyhosts -install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/allowed-hosts -install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/denyhosts -install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/denyhosts +install -d %{buildroot}/%{_bindir} +install -d %{buildroot}/%{_initrddir} +install -d %{buildroot}/%{_sysconfdir}/cron.d +install -d %{buildroot}/%{_sysconfdir}/logrotate.d +install -d %{buildroot}/%{_sysconfdir}/sysconfig + +install -d -m 700 %{buildroot}/%{_localstatedir}/lib/denyhosts +install -d %{buildroot}/%{_localstatedir}/log + +install -p -m 600 denyhosts.cfg-dist %{buildroot}/%{_sysconfdir}/denyhosts.conf +install -p -m 755 daemon-control-dist %{buildroot}/%{_bindir}/denyhosts-control +install -p -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/cron.d/denyhosts +install -p -m 755 %{SOURCE2} %{buildroot}/%{_initrddir}/denyhosts +install -p -m 644 %{SOURCE3} %{buildroot}/%{_localstatedir}/lib/denyhosts/allowed-hosts +install -p -m 644 %{SOURCE4} %{buildroot}/%{_sysconfdir}/sysconfig/denyhosts +install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/denyhosts -touch $RPM_BUILD_ROOT%{_localstatedir}/log/denyhosts +touch %{buildroot}/%{_localstatedir}/log/denyhosts for i in allowed-warned-hosts hosts hosts-restricted hosts-root \ hosts-valid offset suspicious-logins sync-hosts \ users-hosts users-invalid users-valid; do - touch $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/$i + touch %{buildroot}/%{_localstatedir}/lib/denyhosts/$i done -rm -f $RPM_BUILD_ROOT%{_bindir}/denyhosts.pyc - +# RPM will byte-compile this for us if we leave the .py extension. It +# looks cleaner without it, so we'll rename it. +mv %{buildroot}/%{_bindir}/denyhosts.py %{buildroot}/%{_bindir}/denyhosts %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} # Note that we do not automaticaly run --migrate, because we can't be @@ -110,7 +111,8 @@ %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt %doc README.fedora README.txt setup.py README.contrib -%{_bindir}/denyhosts.py +%{_bindir}/denyhosts + %{_bindir}/denyhosts-control %{_datadir}/denyhosts %{python_sitelib}/DenyHosts/*.py @@ -142,6 +144,10 @@ %changelog +* Thu Mar 30 2006 Jason L Tibbitts III - 2.2-3 +- Switch from $RPM_BUILD_ROOT to %{buildroot} (looks cleaner). +- Rename the main executable from denyhosts.py to denyhosts. + * Wed Mar 29 2006 Jason L Tibbitts III - 2.2-2 - Specfile cleanups. - Add hostname to default report subject. --- denyhosts-2.0-daemon-control.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 31 04:34:48 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 21:34:48 -0700 Subject: rpms/fuse-sshfs/FC-5 .cvsignore, 1.3, 1.4 fuse-sshfs.spec, 1.4, 1.5 sources, 1.3, 1.4 Message-ID: <200603310434.k2V4Yoje013915@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13894 Modified Files: .cvsignore fuse-sshfs.spec sources Log Message: Version 1.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 13 Feb 2006 11:26:54 -0000 1.3 +++ .cvsignore 31 Mar 2006 04:34:48 -0000 1.4 @@ -1 +1 @@ -sshfs-fuse-1.4.tar.gz +sshfs-fuse-1.6.tar.gz Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-5/fuse-sshfs.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fuse-sshfs.spec 13 Feb 2006 12:16:17 -0000 1.4 +++ fuse-sshfs.spec 31 Mar 2006 04:34:48 -0000 1.5 @@ -1,5 +1,5 @@ Name: fuse-sshfs -Version: 1.4 +Version: 1.6 Release: 2%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH @@ -37,8 +37,16 @@ %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/sshfs +%{_libdir}/sshnodelay.so %changelog + +* Thu Mar 30 2006 Peter Lemenkov - 1.6-2 +- added missing sshnodelay.so + +* Thu Mar 30 2006 Peter Lemenkov - 1.6-1 +- Version 1.6 + * Mon Feb 13 2006 Peter Lemenkov - 1.4-2 - small cosmetic fixes Index: sources =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 13 Feb 2006 11:26:54 -0000 1.3 +++ sources 31 Mar 2006 04:34:48 -0000 1.4 @@ -1 +1 @@ -3777dd6f232d33c9110abfa5ecd5518e sshfs-fuse-1.4.tar.gz +04fa75c1357bea362537efe15805e7da sshfs-fuse-1.6.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 04:37:30 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 21:37:30 -0700 Subject: rpms/fuse-sshfs/FC-5 fuse-sshfs.spec,1.5,1.6 Message-ID: <200603310437.k2V4bWTB014011@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/rpms/fuse-sshfs/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13994 Modified Files: fuse-sshfs.spec Log Message: rebuild Index: fuse-sshfs.spec =================================================================== RCS file: /cvs/extras/rpms/fuse-sshfs/FC-5/fuse-sshfs.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- fuse-sshfs.spec 31 Mar 2006 04:34:48 -0000 1.5 +++ fuse-sshfs.spec 31 Mar 2006 04:37:30 -0000 1.6 @@ -1,6 +1,6 @@ Name: fuse-sshfs Version: 1.6 -Release: 2%{?dist} +Release: 3%{?dist} Summary: FUSE-Filesystem to access remote filesystems via SSH Group: System Environment/Base @@ -41,6 +41,9 @@ %changelog +* Fri Mar 31 2006 Peter Lemenkov - 1.6-3 +- rebuild + * Thu Mar 30 2006 Peter Lemenkov - 1.6-2 - added missing sshnodelay.so From fedora-extras-commits at redhat.com Fri Mar 31 04:48:51 2006 From: fedora-extras-commits at redhat.com (Peter Lemenkov (peter)) Date: Thu, 30 Mar 2006 21:48:51 -0700 Subject: owners owners.list,1.782,1.783 Message-ID: <200603310448.k2V4mr6T014093@cvs-int.fedora.redhat.com> Author: peter Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14076/owners Modified Files: owners.list Log Message: Added stratagus Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.782 retrieving revision 1.783 diff -u -r1.782 -r1.783 --- owners.list 30 Mar 2006 16:12:00 -0000 1.782 +++ owners.list 31 Mar 2006 04:48:51 -0000 1.783 @@ -1342,6 +1342,7 @@ Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|stellarium|A photo-realistic nightsky renderer|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org| Fedora Extras|stow|Manage the installation of software packages from source|gauret at free.fr|extras-qa at fedoraproject.org| +Fedora Extras|stratagus|Real-rime strategy game engine|lemenkov at newmail.ru|extras-qa at fedoraproject.org| Fedora Extras|straw|GNOME desktop news aggregator|byte at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org| Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 31 05:21:07 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 22:21:07 -0700 Subject: rpms/paps/devel paps-0.6.3-formfeed.patch, NONE, 1.1 paps-0.6.3-goption.patch, NONE, 1.1 paps-0.6.3-header.patch, NONE, 1.1 paps.spec, 1.7, 1.8 Message-ID: <200603310521.k2V5L9rG016160@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16134 Modified Files: paps.spec Added Files: paps-0.6.3-formfeed.patch paps-0.6.3-goption.patch paps-0.6.3-header.patch Log Message: * Fri Mar 31 2006 Akira TAGOH - 0.6.3-4 - paps-0.6.3-formfeed.patch: applied to deal with the formfeed mark properly. - paps-0.6.3-goption.patch: rewritten option parser using GOption. and segfault gone as well. (#187205) - paps-0.6.3-header.patch: applied to support the output of the page header. paps-0.6.3-formfeed.patch: --- NEW FILE paps-0.6.3-formfeed.patch --- diff -ruN paps-0.6.3.orig/src/paps.c paps-0.6.3/src/paps.c --- paps-0.6.3.orig/src/paps.c 2006-03-28 12:10:36.000000000 +0900 +++ paps-0.6.3/src/paps.c 2006-03-28 15:54:21.000000000 +0900 @@ -83,6 +83,7 @@ PangoLayoutLine *pango_line; PangoRectangle logical_rect; PangoRectangle ink_rect; + int formfeed; } LineLink; typedef struct _Paragraph Paragraph; @@ -93,6 +94,7 @@ char *text; int length; int height; /* Height, in pixels */ + int formfeed; PangoLayout *layout; }; @@ -431,7 +433,7 @@ fprintf (stderr, "%s: Invalid character in input\n", g_get_prgname ()); wc = 0; } - if (!*p || !wc || wc == '\n') + if (!*p || !wc || wc == '\n' || wc == '\f') { Paragraph *para = g_new (Paragraph, 1); para->text = last_para; @@ -445,6 +447,11 @@ pango_layout_set_width (para->layout, paint_width * PANGO_SCALE); para->height = 0; + if (wc == '\f') + para->formfeed = 1; + else + para->formfeed = 0; + last_para = next; result = g_list_prepend (result, para); @@ -472,6 +479,7 @@ while(par_list) { int para_num_lines, i; + LineLink *line_link; Paragraph *para = par_list->data; para_num_lines = pango_layout_get_line_count(para->layout); @@ -479,12 +487,15 @@ for (i=0; iformfeed = 0; line_link->pango_line = pango_layout_get_line(para->layout, i); pango_layout_line_get_extents(line_link->pango_line, &ink_rect, &logical_rect); line_link->logical_rect = logical_rect; + if (para->formfeed && i == (para_num_lines - 1)) + line_link->formfeed = 1; line_link->ink_rect = ink_rect; line_list = g_list_prepend(line_list, line_link); } @@ -513,8 +524,8 @@ PangoLayoutLine *line = line_link->pango_line; /* Check if we need to move to next column */ - if (column_y_pos + line_link->logical_rect.height - >= pango_column_height) + if ((column_y_pos + line_link->logical_rect.height + >= pango_column_height) || line_link->formfeed) { column_idx++; column_y_pos = 0; paps-0.6.3-goption.patch: --- NEW FILE paps-0.6.3-goption.patch --- diff -ruN paps-0.6.3.orig/src/paps.c paps-0.6.3/src/paps.c --- paps-0.6.3.orig/src/paps.c 2006-03-29 15:21:53.000000000 +0900 +++ paps-0.6.3/src/paps.c 2006-03-29 16:22:59.000000000 +0900 @@ -138,12 +138,58 @@ double last_pos_y = -1; double last_pos_x = -1; paps_t *paps; +paper_type_t paper_type = PAPER_TYPE_A4; #define CASE(s) if (strcmp(S_, s) == 0) +static gboolean +_paps_arg_paper_cb(const char *option_name, + const char *value, + gpointer data) +{ + gboolean retval = TRUE; + + if (value && *value) { + if (g_ascii_strcasecmp(value, "legal") == 0) + paper_type = PAPER_TYPE_US_LEGAL; + else if (g_ascii_strcasecmp(value, "letter") == 0) + paper_type = PAPER_TYPE_US_LETTER; + else if (g_ascii_strcasecmp(value, "a4") == 0) + paper_type = PAPER_TYPE_A4; + else { + retval = FALSE; + fprintf(stderr, "Unknown page size %s.\n", value); + } + } else { + fprintf(stderr, "You must specify page size.\n"); + retval = FALSE; + } + + return retval; +} + int main(int argc, char *argv[]) { - int argp=1; + gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE; + int num_columns = 1, font_scale = 12; + int top_margin = 36, bottom_margin = 36, right_margin = 36, left_margin = 36; + char *font_family = "Monospace"; + GOptionContext *ctxt = g_option_context_new("[text file]"); + GOptionEntry entries[] = { + {"landscape", 0, 0, G_OPTION_ARG_NONE, &do_landscape, "Landscape output. (Default: portrait)", NULL}, + {"columns", 0, 0, G_OPTION_ARG_INT, &num_columns, "Number of columns output. (Default: 1)", "NUM"}, + {"font_scale", 0, 0, G_OPTION_ARG_INT, &font_scale, "Font scaling. (Default: 12)", "NUM"}, + {"family", 0, 0, G_OPTION_ARG_STRING, &font_family, "Pango FT2 font family. (Default: Monospace)", "FAMILY"}, + {"rtl", 0, 0, G_OPTION_ARG_NONE, &do_rtl, "Do rtl layout.", NULL}, + {"justify", 0, 0, G_OPTION_ARG_NONE, &do_justify, "Do justify the lines.", NULL}, + {"paper", 0, 0, G_OPTION_ARG_CALLBACK, _paps_arg_paper_cb, "Choose paper size. Known paper sizes are legal, letter, a4. (Default: a4)", "PAPER"}, + {"bottom-margin", 0, 0, G_OPTION_ARG_INT, &bottom_margin, "Set bottom margin. (Default: 36)", "NUM"}, + {"top-margin", 0, 0, G_OPTION_ARG_INT, &top_margin, "Set top margin. (Default: 36)", "NUM"}, + {"right-margin", 0, 0, G_OPTION_ARG_INT, &right_margin, "Set right margin. (Default: 36)", "NUM"}, + {"left-margin", 0, 0, G_OPTION_ARG_INT, &left_margin, "Set left margin. (Default: 36)", "NUM"}, + {NULL} + }; + GError *error = NULL; char *filename_in; char *title; FILE *IN, *OUT = NULL; @@ -154,108 +200,32 @@ PangoContext *pango_context; PangoFontDescription *font_description; PangoDirection pango_dir = PANGO_DIRECTION_LTR; - char *font_family = "Monospace"; - int font_scale = 12; int num_pages = 1; - int num_columns = 1; int gutter_width = 40; int total_gutter_width; - paper_type_t paper_type = PAPER_TYPE_A4; int page_width = paper_sizes[0].width; int page_height = paper_sizes[0].height; - gboolean do_landscape = FALSE; int do_tumble = -1; /* -1 means not initialized */ int do_duplex = -1; gboolean do_draw_header = FALSE; - gboolean do_justify = FALSE; gchar *paps_header = NULL; - int top_margin = 36; - int bottom_margin = 36; - int left_margin = 36; - int right_margin = 36; /* Prerequisite when using glib. */ g_type_init(); + g_option_context_add_main_entries(ctxt, entries, NULL); /* Parse command line */ - while(argp < argc && argv[argp][0] == '-') + if (!g_option_context_parse(ctxt, &argc, &argv, &error)) { - char *S_ = argv[argp++]; - CASE("--help") - { - printf("paps - A postscript generating program using pango.\n" - "\n" - "Syntax:\n" - " paps [--landscape] [--columns cl] [--font_scale fs]\n" - " [--family f] [--rtl] [--paper type]\n" - " [--bottom-margin bm] [--top-margin tm] [--left-margin lm]\n" - " [--right-margin rm]\n" - "\n" - "Description:\n" - " paps reads a UTF-8 encoded file and generates a PostScript\n" - " rendering of the file. The rendering is done by creating\n" - " outline curves through the pango FT2 backend.\n" - "\n" - "Options:\n" - " --landscape Landscape output. Default is portrait.\n" - " --columns cl Number of columns output. Default is 1.\n" - " --font_scale fs Font scaling. Default is 12.\n" - " --family f Pango ft2 font family. Default is sans.\n" - " --rtl Do rtl layout.\n" - " --paper ps Choose paper size. Known paper sizes are legal, letter, a4.\n" - " Default is A4.\n" - " --bottom-margin bm Set bottom margin. Default is 36." - " --top-margin tm Set top margin. Default is 36." - " --left-margin lm Set left margin. Default is 36." - " --right-margin rm Set right margin. Default is 36." - - ); - - exit(0); - } - CASE("--landscape") { do_landscape = TRUE; continue; } - CASE("--columns") { num_columns = atoi(argv[argp++]); continue; } - CASE("--font_scale") { font_scale = atoi(argv[argp++]); continue; } - CASE("--family") { font_family = argv[argp++]; continue; } - CASE("--rtl") { pango_dir = PANGO_DIRECTION_RTL; continue; } - CASE("--justify") { do_justify = TRUE; continue; } - CASE("--paper") - { - char *S_ = argv[argp++]; - while(1) /* So that I can break */ - { - CASE("legal") { paper_type=PAPER_TYPE_US_LEGAL; break; } - CASE("letter") { paper_type=PAPER_TYPE_US_LETTER; break; } - CASE("a4") { paper_type=PAPER_TYPE_A4; break; } - - fprintf(stderr, "Unknown page size %s!\n", S_); - exit(1); - } - continue; - } - CASE("--bottom-margin") - { - bottom_margin = atoi(argv[argp++]); continue; - } - CASE("--top-margin") - { - top_margin = atoi(argv[argp++]); continue; - } - CASE("--right-margin") - { - right_margin = atoi(argv[argp++]); continue; - } - CASE("--left-margin") - { - left_margin = atoi(argv[argp++]); continue; - } - fprintf(stderr, "Unknown option %s!\n", S_); + fprintf(stderr, "Failed to parse the given options. maybe unknown options or missing extra argument.\n"); exit(1); } + if (do_rtl) + pango_dir = PANGO_DIRECTION_RTL; - if (argp < argc) + if (argc > 1) { - filename_in = argv[argp++]; + filename_in = argv[1]; IN = fopen(filename_in, "rb"); if (!IN) { @@ -368,6 +338,7 @@ // Cleanup g_string_free(ps_pages_string, TRUE); + g_option_context_free(ctxt); return 0; } paps-0.6.3-header.patch: --- NEW FILE paps-0.6.3-header.patch --- diff -ruN -x Makefile -x autom4te.cache -x 'config*' -x doc -x libtool -x '*o' -x '*~' -x 'stamp*' -x 'test*' -x paps -x '*a' paps-0.6.3.orig/src/paps.c paps-0.6.3/src/paps.c --- paps-0.6.3.orig/src/paps.c 2006-03-29 17:26:44.000000000 +0900 +++ paps-0.6.3/src/paps.c 2006-03-30 22:42:36.000000000 +0900 @@ -63,6 +63,8 @@ int page_height; int header_ypos; int header_sep; + int header_height; + int footer_height; gboolean do_draw_header; gboolean do_draw_footer; gboolean do_duplex; @@ -72,6 +74,7 @@ gboolean do_separation_line; gboolean do_draw_contour; PangoDirection pango_dir; + gchar *filename; } page_layout_t; typedef struct { @@ -99,32 +102,39 @@ }; /* Information passed in user data when drawing outlines */ -GList *split_paragraphs_into_lines(GList *paragraphs); -static char *read_file (FILE *file); -static GList * -split_text_into_paragraphs (PangoContext *pango_context, - page_layout_t *page_layout, - int paint_width, - char *text); +GList *split_paragraphs_into_lines (GList *paragraphs); +static char *read_file (FILE *file); +static GList *split_text_into_paragraphs (PangoContext *pango_context, + page_layout_t *page_layout, + int paint_width, + char *text); +static int output_pages (FILE *OUT, + GList *pango_lines, + page_layout_t *page_layout, + gboolean need_header, + PangoContext *pango_context); +static void print_postscript_header (FILE *OUT, + const char *title, + page_layout_t *page_layout); +static void print_postscript_trailer (FILE *OUT, + int num_pages); +static void eject_column (FILE *OUT, + page_layout_t *page_layout, + int column_idx); +static void eject_page (FILE *OUT); +static void start_page (FILE *OUT, + int page_idx); +static void draw_line_to_page (FILE *OUT, + int column_idx, + int column_pos, + page_layout_t *page_layout, + PangoLayoutLine *line); +static int draw_page_header_line_to_page(FILE *OUT, + gboolean is_footer, + page_layout_t *page_layout, + PangoContext *ctx, + int page); -int output_pages(FILE *OUT, - GList *pango_lines, - page_layout_t *page_layout); -void print_postscript_header(FILE *OUT, - const char *title, - page_layout_t *page_layout); -void print_postscript_trailer(FILE *OUT, int num_pages); -void print_svg_trailer(FILE *OUT, int num_pages); -void eject_column(FILE *OUT, - page_layout_t *page_layout, - int column_idx); -void eject_page(FILE *OUT); -void start_page(FILE *OUT, int page_idx); -void draw_line_to_page(FILE *OUT, - int column_idx, - int column_pos, - page_layout_t *page_layout, - PangoLayoutLine *line); // Fonts are three character symbols in an alphabet composing of // the following characters: // @@ -170,7 +180,7 @@ int main(int argc, char *argv[]) { - gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify; + gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE, do_draw_header = FALSE; int num_columns = 1, font_scale = 12; int top_margin = 36, bottom_margin = 36, right_margin = 36, left_margin = 36; char *font_family = "Monospace"; @@ -187,6 +197,7 @@ {"top-margin", 0, 0, G_OPTION_ARG_INT, &top_margin, "Set top margin. (Default: 36)", "NUM"}, {"right-margin", 0, 0, G_OPTION_ARG_INT, &right_margin, "Set right margin. (Default: 36)", "NUM"}, {"left-margin", 0, 0, G_OPTION_ARG_INT, &left_margin, "Set left margin. (Default: 36)", "NUM"}, + {"header", 0, 0, G_OPTION_ARG_NONE, &do_draw_header, "Draw page header for each page.", NULL}, {NULL} }; GError *error = NULL; @@ -207,7 +218,6 @@ int page_height = paper_sizes[0].height; int do_tumble = -1; /* -1 means not initialized */ int do_duplex = -1; - gboolean do_draw_header = FALSE; gchar *paps_header = NULL; /* Prerequisite when using glib. */ @@ -292,6 +302,8 @@ page_layout.top_margin = top_margin; page_layout.bottom_margin = bottom_margin; page_layout.header_ypos = page_layout.top_margin; + page_layout.header_height = 0; + page_layout.footer_height = 0; if (do_draw_header) page_layout.header_sep = font_scale * 2.5; else @@ -312,6 +324,7 @@ page_layout.do_tumble = do_tumble; page_layout.do_duplex = do_duplex; page_layout.pango_dir = pango_dir; + page_layout.filename = filename_in; text = read_file(IN); paragraphs = split_text_into_paragraphs(pango_context, @@ -326,7 +339,7 @@ print_postscript_header(OUT, title, &page_layout); ps_pages_string = g_string_new(""); - num_pages = output_pages(OUT, pango_lines, &page_layout); + num_pages = output_pages(OUT, pango_lines, &page_layout, do_draw_header, pango_context); paps_header = paps_get_postscript_header_strdup(paps); fprintf(OUT, "%s", paps_header); @@ -478,9 +491,12 @@ } -int output_pages(FILE *OUT, - GList *pango_lines, - page_layout_t *page_layout) +int +output_pages(FILE *OUT, + GList *pango_lines, + page_layout_t *page_layout, + gboolean need_header, + PangoContext *pango_context) { int column_idx = 0; int column_y_pos = 0; @@ -489,6 +505,9 @@ start_page(OUT, page_idx); + if (need_header) + column_y_pos += draw_page_header_line_to_page(OUT, FALSE, page_layout, pango_context, page_idx); + while(pango_lines) { LineLink *line_link = pango_lines->data; @@ -506,12 +525,17 @@ eject_page(OUT); page_idx++; start_page(OUT, page_idx); + + if (need_header) + column_y_pos += draw_page_header_line_to_page(OUT, FALSE, page_layout, pango_context, page_idx); } else - eject_column(OUT, - page_layout, - column_idx - ); + { + eject_column(OUT, + page_layout, + column_idx + ); + } } draw_line_to_page(OUT, column_idx, @@ -706,8 +730,8 @@ + page_layout->column_width * column_idx + total_gutter; - y_top = page_layout->page_height - page_layout->top_margin; - y_bot = page_layout->bottom_margin; + y_top = page_layout->page_height - page_layout->top_margin - page_layout->header_height - page_layout->header_sep / 2; + y_bot = page_layout->bottom_margin - page_layout->footer_height; g_string_append_printf(ps_pages_string, "%f %f moveto %f %f lineto 0 setlinewidth stroke\n", @@ -778,3 +802,89 @@ g_free(ps_layout); } +int +draw_page_header_line_to_page(FILE *OUT, + gboolean is_footer, + page_layout_t *page_layout, + PangoContext *ctx, + int page) +{ + PangoLayout *layout = pango_layout_new(ctx); + PangoLayoutLine *line; + PangoRectangle ink_rect, logical_rect; + /* Assume square aspect ratio for now */ + double x_pos, y_pos; + gchar *ps_layout, *header, date[256]; + time_t t; + struct tm tm; + int height; + gdouble line_pos; + + t = time(NULL); + tm = *localtime(&t); + strftime(date, 255, "%c", &tm); + header = g_strdup_printf("%s\n%s\nPage %d", date, page_layout->filename, page); + pango_layout_set_markup(layout, header, -1); + g_free(header); + + /* output a left edge of header/footer */ + line = pango_layout_get_line(layout, 0); + pango_layout_line_get_extents(line, + &ink_rect, + &logical_rect); + x_pos = page_layout->left_margin; + height = logical_rect.height / PANGO_SCALE * page_layout->pixel_to_pt; + if (is_footer) + { + y_pos = page_layout->top_margin + height; + page_layout->footer_height = height; + } + else + { + y_pos = page_layout->page_height - page_layout->bottom_margin - height; + page_layout->header_height = height; + } + ps_layout = paps_layout_line_to_postscript_strdup(paps, + x_pos, y_pos, + line); + g_string_append(ps_pages_string, + ps_layout); + g_free(ps_layout); + + /* output a center of header/footer */ + line = pango_layout_get_line(layout, 1); + pango_layout_line_get_extents(line, + &ink_rect, + &logical_rect); + x_pos = (page_layout->page_width - (logical_rect.width / PANGO_SCALE * page_layout->pixel_to_pt)) / 2; + ps_layout = paps_layout_line_to_postscript_strdup(paps, + x_pos, y_pos, + line); + g_string_append(ps_pages_string, + ps_layout); + g_free(ps_layout); + + /* output a right edge of header/footer */ + line = pango_layout_get_line(layout, 2); + pango_layout_line_get_extents(line, + &ink_rect, + &logical_rect); + x_pos = page_layout->page_width - page_layout->right_margin - (logical_rect.width / PANGO_SCALE * page_layout->pixel_to_pt); + ps_layout = paps_layout_line_to_postscript_strdup(paps, + x_pos, y_pos, + line); + g_string_append(ps_pages_string, + ps_layout); + g_free(ps_layout); + + g_object_unref(layout); + + /* header separator */ + line_pos = page_layout->page_height - page_layout->top_margin - page_layout->header_height - page_layout->header_sep / 2; + g_string_append_printf(ps_pages_string, + "%d %f moveto %d %f lineto 0 setlinewidth stroke\n", + page_layout->left_margin, line_pos, + page_layout->page_width - page_layout->right_margin, line_pos); + + return logical_rect.height; +} Index: paps.spec =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- paps.spec 24 Mar 2006 09:35:23 -0000 1.7 +++ paps.spec 31 Mar 2006 05:21:07 -0000 1.8 @@ -1,6 +1,6 @@ Name: paps Version: 0.6.3 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL URL: http://paps.sourceforge.net/ @@ -9,6 +9,9 @@ BuildRequires: pango-devel Patch0: paps-0.6.1-makefile.patch Patch1: paps-0.6.3-fix-pagesize.patch +Patch2: paps-0.6.3-formfeed.patch +Patch3: paps-0.6.3-goption.patch +Patch4: paps-0.6.3-header.patch Summary: Plain Text to PostScript converter Group: Applications/Publishing @@ -20,6 +23,9 @@ %setup -q %patch0 -p1 -b .makefile %patch1 -p1 -b .pagesize +%patch2 -p1 -b .formfeed +%patch3 -p1 -b .goption +%patch4 -p1 -b .header aclocal automake autoconf @@ -46,6 +52,12 @@ %changelog +* Fri Mar 31 2006 Akira TAGOH - 0.6.3-4 +- paps-0.6.3-formfeed.patch: applied to deal with the formfeed mark properly. +- paps-0.6.3-goption.patch: rewritten option parser using GOption. and segfault + gone as well. (#187205) +- paps-0.6.3-header.patch: applied to support the output of the page header. + * Fri Mar 24 2006 Akira TAGOH - 0.6.3-3 - paps-0.6.3-fix-pagesize.patch: fixed displaying the beginning of line at out of page. (#176207) From fedora-extras-commits at redhat.com Fri Mar 31 05:34:20 2006 From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh)) Date: Thu, 30 Mar 2006 22:34:20 -0700 Subject: rpms/paps/devel paps-0.6.3-header.patch,1.1,1.2 Message-ID: <200603310534.k2V5YMkJ016261@cvs-int.fedora.redhat.com> Author: tagoh Update of /cvs/extras/rpms/paps/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16241 Modified Files: paps-0.6.3-header.patch Log Message: paps-0.6.3-header.patch: Index: paps-0.6.3-header.patch =================================================================== RCS file: /cvs/extras/rpms/paps/devel/paps-0.6.3-header.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- paps-0.6.3-header.patch 31 Mar 2006 05:21:07 -0000 1.1 +++ paps-0.6.3-header.patch 31 Mar 2006 05:34:20 -0000 1.2 @@ -87,7 +87,7 @@ int main(int argc, char *argv[]) { -- gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify; +- gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE; + gboolean do_landscape = FALSE, do_rtl = FALSE, do_justify = FALSE, do_draw_header = FALSE; int num_columns = 1, font_scale = 12; int top_margin = 36, bottom_margin = 36, right_margin = 36, left_margin = 36; From fedora-extras-commits at redhat.com Fri Mar 31 06:42:40 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 30 Mar 2006 23:42:40 -0700 Subject: rpms/bcm43xx-fwcutter/devel .cvsignore, 1.2, 1.3 bcm43xx-fwcutter.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603310642.k2V6ggq6018506@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18485 Modified Files: .cvsignore bcm43xx-fwcutter.spec sources Log Message: 004 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Mar 2006 11:40:46 -0000 1.2 +++ .cvsignore 31 Mar 2006 06:42:40 -0000 1.3 @@ -1 +1 @@ -bcm43xx-fwcutter-003.tar.bz2 +bcm43xx-fwcutter-004.tar.bz2 Index: bcm43xx-fwcutter.spec =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/bcm43xx-fwcutter.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bcm43xx-fwcutter.spec 24 Mar 2006 11:40:46 -0000 1.1 +++ bcm43xx-fwcutter.spec 31 Mar 2006 06:42:40 -0000 1.2 @@ -1,6 +1,6 @@ Name: bcm43xx-fwcutter -Version: 003 -Release: 2%{?dist} +Version: 004 +Release: 1%{?dist} Summary: Firmware extraction tool for Broadcom wireless driver Group: System Environment/Base @@ -47,6 +47,9 @@ %doc README README.Fedora modprobe.bcm43xx %changelog +* Fri Mar 31 2006 David Woodhouse 004-1 +- Update to 004 + * Thu Mar 23 2006 David Woodhouse 003-2 - Package review. Use $RPM_OPT_FLAGS, ship man page, etc. - Complete documentation, add sample bcm43xx.modprobe file Index: sources =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Mar 2006 11:40:46 -0000 1.2 +++ sources 31 Mar 2006 06:42:40 -0000 1.3 @@ -1 +1 @@ -89b407d920811cfd15507da17f901bb0 bcm43xx-fwcutter-003.tar.bz2 +6a6ab01b56b1e191fa54d60a015fecd9 bcm43xx-fwcutter-004.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 06:42:58 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Thu, 30 Mar 2006 23:42:58 -0700 Subject: rpms/bcm43xx-fwcutter/FC-5 .cvsignore, 1.2, 1.3 bcm43xx-fwcutter.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603310643.k2V6h0LX018562@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/bcm43xx-fwcutter/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18541 Modified Files: .cvsignore bcm43xx-fwcutter.spec sources Log Message: 004 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 24 Mar 2006 11:40:46 -0000 1.2 +++ .cvsignore 31 Mar 2006 06:42:58 -0000 1.3 @@ -1 +1 @@ -bcm43xx-fwcutter-003.tar.bz2 +bcm43xx-fwcutter-004.tar.bz2 Index: bcm43xx-fwcutter.spec =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/FC-5/bcm43xx-fwcutter.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- bcm43xx-fwcutter.spec 24 Mar 2006 11:40:46 -0000 1.1 +++ bcm43xx-fwcutter.spec 31 Mar 2006 06:42:58 -0000 1.2 @@ -1,6 +1,6 @@ Name: bcm43xx-fwcutter -Version: 003 -Release: 2%{?dist} +Version: 004 +Release: 1%{?dist} Summary: Firmware extraction tool for Broadcom wireless driver Group: System Environment/Base @@ -47,6 +47,9 @@ %doc README README.Fedora modprobe.bcm43xx %changelog +* Fri Mar 31 2006 David Woodhouse 004-1 +- Update to 004 + * Thu Mar 23 2006 David Woodhouse 003-2 - Package review. Use $RPM_OPT_FLAGS, ship man page, etc. - Complete documentation, add sample bcm43xx.modprobe file Index: sources =================================================================== RCS file: /cvs/extras/rpms/bcm43xx-fwcutter/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 24 Mar 2006 11:40:46 -0000 1.2 +++ sources 31 Mar 2006 06:42:58 -0000 1.3 @@ -1 +1 @@ -89b407d920811cfd15507da17f901bb0 bcm43xx-fwcutter-003.tar.bz2 +6a6ab01b56b1e191fa54d60a015fecd9 bcm43xx-fwcutter-004.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 08:16:50 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:16:50 -0700 Subject: rpms/shippy - New directory Message-ID: <200603310816.k2V8GqQu022768@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22742/shippy Log Message: Directory /cvs/extras/rpms/shippy added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 08:16:50 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:16:50 -0700 Subject: rpms/shippy/devel - New directory Message-ID: <200603310816.k2V8GqFY022771@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22742/shippy/devel Log Message: Directory /cvs/extras/rpms/shippy/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 08:17:05 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:17:05 -0700 Subject: rpms/shippy Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603310817.k2V8H7rx022820@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22787 Added Files: Makefile import.log Log Message: Setup of module shippy --- NEW FILE Makefile --- # Top level Makefile for module shippy all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 31 08:17:05 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:17:05 -0700 Subject: rpms/shippy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603310817.k2V8H7xV022823@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22787/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module shippy --- NEW 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 Mar 31 08:18:18 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:18:18 -0700 Subject: rpms/shippy import.log,1.1,1.2 Message-ID: <200603310818.k2V8IKJw022932@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22891 Modified Files: import.log Log Message: auto-import shippy-1.3.3.7-2 on branch devel from shippy-1.3.3.7-2.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/shippy/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 Mar 2006 08:17:04 -0000 1.1 +++ import.log 31 Mar 2006 08:18:18 -0000 1.2 @@ -0,0 +1 @@ +shippy-1_3_3_7-2:HEAD:shippy-1.3.3.7-2.src.rpm:1143792911 From fedora-extras-commits at redhat.com Fri Mar 31 08:18:18 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:18:18 -0700 Subject: rpms/shippy/devel shippy-fixes.patch, NONE, 1.1 shippy-fullscreen.patch, NONE, 1.1 shippy-joy.patch, NONE, 1.1 shippy-lcdfix.patch, NONE, 1.1 shippy-warnings.patch, NONE, 1.1 shippy.desktop, NONE, 1.1 shippy.png, NONE, 1.1 shippy.sh, NONE, 1.1 shippy.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603310818.k2V8ILAF022947@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/shippy/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22891/devel Modified Files: .cvsignore sources Added Files: shippy-fixes.patch shippy-fullscreen.patch shippy-joy.patch shippy-lcdfix.patch shippy-warnings.patch shippy.desktop shippy.png shippy.sh shippy.spec Log Message: auto-import shippy-1.3.3.7-2 on branch devel from shippy-1.3.3.7-2.src.rpm shippy-fixes.patch: --- NEW FILE shippy-fixes.patch --- --- shippy-1.3.3.7/shippy.c.fix 2004-03-08 06:41:30.000000000 +0100 +++ shippy-1.3.3.7/shippy.c 2006-03-27 19:52:23.000000000 +0200 @@ -4,6 +4,9 @@ http://ship84.sourceforge.net */ +/* this must be done before the first include of unistd.h for setresgid */ +#define _GNU_SOURCE +#include #include #include "shippy.h" @@ -98,6 +101,8 @@ int missedshots = 0; int firedshots = 0; +FILE *highscore_fp; + int compare(const void *a, const void *b) { struct HISCORE *test = (struct HISCORE *)a; @@ -656,7 +661,7 @@ if(shots<10) { AddObject(BULLET, ShippyObjects[number].x, ShippyObjects[number].y,0,0,0,NULL,0,0); - audio_play("data/shot.wav"); + audio_play(DATADIR "shot.wav"); ++shots; ++firedshots; } @@ -670,7 +675,7 @@ { if(shots<6) { - audio_play("data/helix.wav"); + audio_play(DATADIR "helix.wav"); AddObject(BULLWAVE, ShippyObjects[number].x-6, ShippyObjects[number].y-8,0,-16,0,NULL,0,0); AddObject(BULLWAVE, ShippyObjects[number].x+6, ShippyObjects[number].y-8,0,16,0,NULL,0,0); shots+=2; @@ -693,7 +698,7 @@ if(shots<3) { AddObject(BULLET, ShippyObjects[number].x, ShippyObjects[number].y,0,0,0,NULL,0,0); - audio_play("data/shot.wav"); + audio_play(DATADIR "shot.wav"); ++shots; ++firedshots; } @@ -837,7 +842,7 @@ } diedlast = 1; - audio_play("data/die.wav"); + audio_play(DATADIR "die.wav"); ShippyObjects[number].type=EXPLOSION; ShippyObjects[number].special=4; } @@ -937,7 +942,7 @@ 0); } - audio_play("data/hit.wav"); + audio_play(DATADIR "hit.wav"); break; case ENEMYSHIPPY: @@ -955,7 +960,7 @@ 0, 0); } - audio_play("data/hit.wav"); + audio_play(DATADIR "hit.wav"); break; case FEZBOMB: @@ -976,7 +981,7 @@ 0, 0); } - audio_play("data/hit.wav"); + audio_play(DATADIR "hit.wav"); break; } @@ -1059,7 +1064,7 @@ } diedlast = 1; - audio_play("data/die.wav"); + audio_play(DATADIR "die.wav"); ShippyObjects[number].type=EXPLOSION; ShippyObjects[number].special=4; return; @@ -1097,43 +1102,26 @@ void StoreHS() { - FILE *savehs = NULL; - savehs = fopen("data/scores.lst","wb"); - - if(savehs==NULL) return; - - fwrite(winners,sizeof(struct HISCORE), 14, savehs); - fclose(savehs); - return; - + if(highscore_fp==NULL) return; + rewind(highscore_fp); + fwrite(winners,sizeof(struct HISCORE), 14, highscore_fp); } void RestoreHS() { int i; - FILE *loadhs = NULL; - - loadhs = fopen("data/scores.lst","rb"); - if(loadhs!=NULL) + if(highscore_fp!=NULL) { - if(fread(winners,sizeof(struct HISCORE), 14, loadhs)==14) + if(fread(winners,sizeof(struct HISCORE), 14, highscore_fp)==14) { - fclose(loadhs); highscore=winners[0].score; return; } - else - { - fclose(loadhs); - } - - } - strcpy(winners[0].name,"RAB"); winners[0].level = 14; winners[0].score = 250000; @@ -1225,17 +1213,17 @@ if(operational==600) { - SYSTEM_BG("data/splash.bmp"); + SYSTEM_BG(DATADIR "splash.bmp"); } if(operational>0) { --operational; - if(operational==0) audio_play("data/splash.wav"); + if(operational==0) audio_play(DATADIR "splash.wav"); } if(operational==120) { - SYSTEM_BG("data/splash2.bmp"); + SYSTEM_BG(DATADIR "splash2.bmp"); } if(waitforkey==0) { @@ -1339,7 +1327,7 @@ { ShippyObjects[0].lives++; extralife *= 2; - audio_play("data/fanfare.wav"); + audio_play(DATADIR "fanfare.wav"); } if(leftmonsters>0 && done == 0 && gameover==0) @@ -1388,7 +1376,7 @@ } for(increment=0;increment<14;++increment) winners[increment].last=0; gamestate = INITIALS; - audio_music("data/score.xm"); + audio_music(DATADIR "score.xm"); waitforkey=30; operational = 0; } @@ -1401,7 +1389,7 @@ { NewGame(-1); operational = 1; - if(gamestate==TITLE) audio_music("data/title.xm"); + if(gamestate==TITLE) audio_music(DATADIR "title.xm"); } if(done==0 && operational==1) @@ -1429,7 +1417,7 @@ else { - audio_music("data/shippy.xm"); + audio_music(DATADIR "shippy.xm"); gamestate = GAME; operational = 0; } @@ -1467,7 +1455,7 @@ { ShippyObjects[0].lives++; extralife *= 2; - audio_play("data/fanfare.wav"); + audio_play(DATADIR "fanfare.wav"); } @@ -1513,6 +1501,16 @@ void SHIPPY_MAIN() { int increment; + gid_t realgid; + + highscore_fp = fopen("/var/lib/games/shippy.hs", "r+"); + + realgid = getgid(); + if (setresgid(-1, realgid, realgid) != 0) { + perror("Could not drop setgid privileges. Aborting."); + exit(1); + } + srand(time(0)); if(SYSTEM_INIT()!=0) return; InitShippy(); --- shippy-1.3.3.7/shippy.h.fix 2004-02-03 21:10:00.000000000 +0100 +++ shippy-1.3.3.7/shippy.h 2006-03-27 19:51:06.000000000 +0200 @@ -3,6 +3,10 @@ #include "externs.h" +#ifndef DATADIR +#define DATADIR "data/" +#endif + void Start_Audio(); void audio_start(); void audio_play(char *wav); --- shippy-1.3.3.7/shipall.c.fix 2004-03-04 00:52:10.000000000 +0100 +++ shippy-1.3.3.7/shipall.c 2006-03-27 19:51:06.000000000 +0200 @@ -199,7 +199,7 @@ BackBuffer=create_system_bitmap(240,160); Graphics=create_system_bitmap(320,128); - mytest2 = load_bmp("data/graphics.bmp",mypal); + mytest2 = load_bmp(DATADIR "graphics.bmp",mypal); if(mytest2==NULL) return; blit(mytest2,Graphics,0,0,0,0,320,128); destroy_bitmap(mytest2); --- shippy-1.3.3.7/shipsdl.c.fix 2004-03-04 00:53:02.000000000 +0100 +++ shippy-1.3.3.7/shipsdl.c 2006-03-27 19:51:06.000000000 +0200 @@ -164,9 +164,9 @@ void End_Audio() { + audio_end(); Mix_HaltMusic(); Mix_CloseAudio(); - audio_end(); } @@ -194,8 +194,8 @@ SYSTEM_CLEANBMP(); - Graphics = CreateSurfaceFromBitmap("data/graphics.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY); - BackBuffer= CreateSurfaceFromBitmap("data/splash.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY); + Graphics = CreateSurfaceFromBitmap(DATADIR "graphics.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY); + BackBuffer= CreateSurfaceFromBitmap(DATADIR "splash.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY); SDL_SetColors(screen, Graphics->format->palette->colors, 0,Graphics->format->palette->ncolors); SDL_SetColorKey(Graphics,SDL_SRCCOLORKEY, SDL_MapRGB(Graphics->format, 255, 0, 255)); SDL_SetColorKey(BackBuffer,SDL_SRCCOLORKEY, SDL_MapRGB(Graphics->format, 255, 0, 255)); @@ -356,6 +356,10 @@ void SYSTEM_IDLE() { Uint32 test = SDL_GetTicks(); + + if (test < timing) + usleep(1000); + while(test>timing) { timing+=14; shippy-fullscreen.patch: --- NEW FILE shippy-fullscreen.patch --- diff -ur shippy-1.3.3.7.orig/shipall.c shippy-1.3.3.7/shipall.c --- shippy-1.3.3.7.orig/shipall.c 2006-03-27 23:12:03.000000000 +0200 +++ shippy-1.3.3.7/shipall.c 2006-03-27 22:55:33.000000000 +0200 @@ -10,6 +10,11 @@ volatile int objectsynch = 0; +#ifndef ALLEGRO_DOS +static int vidmode; +#endif +static RGB mypal[256]; + DUH *music=NULL; AL_DUH_PLAYER *dp=NULL; @@ -172,7 +177,6 @@ { int GraphicsFlag; BITMAP *mytest2; - RGB mypal[256]; set_color_depth(8); bitsperpixel = 8; set_color_conversion(COLORCONV_TOTAL); @@ -189,12 +193,15 @@ #else - GraphicsFlag=set_gfx_mode(GFX_AUTODETECT_WINDOWED, 480, 320, 0, 0); + GraphicsFlag=set_gfx_mode(GFX_AUTODETECT_FULLSCREEN, 480, 320, 0, 0); if(GraphicsFlag!=0) { GraphicsFlag=set_gfx_mode(GFX_SAFE, 480, 320, 0, 0); if(GraphicsFlag!=0) exit(-1); + else vidmode = GFX_SAFE; } + else + vidmode = GFX_AUTODETECT_FULLSCREEN; #endif BackBuffer=create_system_bitmap(240,160); @@ -306,6 +313,25 @@ if(SYSTEM_GETKEY(KEY_ESC)) done = 1; + +#ifndef ALLEGRO_DOS + if (key[KEY_ENTER] && key[KEY_ALT] && (vidmode != GFX_SAFE)) + { + vidmode = (vidmode == GFX_AUTODETECT_FULLSCREEN)? + GFX_AUTODETECT_WINDOWED:GFX_AUTODETECT_FULLSCREEN; + if(set_gfx_mode(vidmode, 480, 320, 0, 0)) + { + vidmode = GFX_SAFE; + if(set_gfx_mode(vidmode, 480, 320, 0, 0)) + { + fprintf(stderr, "FATAL error switching Fullscreen <-> Window\n"); + exit(1); + } + } + set_palette(mypal); + } +#endif + if(waitforkey>0) { --waitforkey; diff -ur shippy-1.3.3.7.orig/shipsdl.c shippy-1.3.3.7/shipsdl.c --- shippy-1.3.3.7.orig/shipsdl.c 2006-03-27 23:12:03.000000000 +0200 +++ shippy-1.3.3.7/shipsdl.c 2006-03-27 22:39:46.000000000 +0200 @@ -189,7 +189,8 @@ void SYSTEM_SETVID() { - screen = SDL_SetVideoMode(480, 320, 8, SDL_SWSURFACE | SDL_HWPALETTE); + SDL_ShowCursor(SDL_DISABLE); + screen = SDL_SetVideoMode(480, 320, 8, SDL_SWSURFACE | SDL_HWPALETTE | SDL_FULLSCREEN); if ( screen == NULL ) { return; @@ -328,6 +329,9 @@ if(key[SDLK_ESCAPE]) done = 1; + if(key[SDLK_RETURN] && key[SDLK_LALT]) + SDL_WM_ToggleFullScreen(screen); + if(waitforkey>0) { --waitforkey; shippy-joy.patch: --- NEW FILE shippy-joy.patch --- --- shippy-1.3.3.7/shippy.c.joy 2006-03-31 01:07:13.000000000 +0200 +++ shippy-1.3.3.7/shippy.c 2006-03-31 01:07:13.000000000 +0200 @@ -1281,13 +1281,13 @@ } - if(jdirx == -2) + if(jdirx <= -1) { --currchar; if(currchar<'A') currchar = 'Z'; waitforkey=15; } - if(jdirx == 2) + if(jdirx >= 1) { ++currchar; if(currchar>'Z') currchar = 'A'; --- shippy-1.3.3.7/shipsdl.c.joy 2006-03-31 01:07:13.000000000 +0200 +++ shippy-1.3.3.7/shipsdl.c 2006-03-31 01:15:09.000000000 +0200 @@ -8,6 +8,7 @@ SDL_Surface *screen = NULL; SDL_Surface *BackBuffer = NULL; SDL_Surface *Graphics = NULL; +SDL_Joystick *Joystick = NULL; Uint8 key[1337]; Uint32 CLEARCOLOR = 0; @@ -215,7 +216,7 @@ int SYSTEM_INIT() { - if((SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO)==-1)) + if((SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO|SDL_INIT_JOYSTICK)==-1)) { return 1; } @@ -226,6 +227,8 @@ SDL_WM_SetCaption("Shippy1984 by Ryan Broomfield SDL VERSION", NULL); audio_start(); + + Joystick = SDL_JoystickOpen(0); return 0; } @@ -234,6 +237,8 @@ { SYSTEM_CLEANBMP(); End_Audio(); + if (Joystick) + SDL_JoystickClose(Joystick); return 0; } @@ -327,21 +332,20 @@ return; } -/* if(num_joysticks>0) - { - poll_joystick(); - jaction = joy[0].button[0].b; - jsecond = joy[0].button[1].b; - jdirx = (joy[0].stick[0].axis[0].d1 - joy[0].stick[0].axis[0].d2)*2; - jdiry = (joy[0].stick[0].axis[1].d1 - joy[0].stick[0].axis[1].d2); - } -*/ - jdirx = 0; jdiry = 0; jaction = 0; jsecond = 0; + if(Joystick) + { + SDL_JoystickUpdate(); + jaction = SDL_JoystickGetButton(Joystick, 0); + jsecond = SDL_JoystickGetButton(Joystick, 1); + jdirx = SDL_JoystickGetAxis(Joystick, 0) / (50 * 256); + jdiry = SDL_JoystickGetAxis(Joystick, 1) / (65 * 256); + } + if(jdirx == 0) jdirx=(key[SDLK_RIGHT] - key[SDLK_LEFT]) * 2; if(jdiry == 0) jdiry=key[SDLK_DOWN] - key[SDLK_UP]; if(jaction == 0) jaction = key[SDLK_LCTRL]; --- shippy-1.3.3.7/shipall.c.joy 2006-03-31 01:07:13.000000000 +0200 +++ shippy-1.3.3.7/shipall.c 2006-03-31 01:15:40.000000000 +0200 @@ -344,8 +344,8 @@ poll_joystick(); jaction = joy[0].button[0].b; jsecond = joy[0].button[1].b; - jdirx = (joy[0].stick[0].axis[0].d1 - joy[0].stick[0].axis[0].d2)*2; - jdiry = (joy[0].stick[0].axis[1].d1 - joy[0].stick[0].axis[1].d2); + jdirx = joy[0].stick[0].axis[0].pos / 50; + jdiry = joy[0].stick[0].axis[1].pos / 65; } if(jdirx == 0) jdirx=(SYSTEM_GETKEY(KEY_LEFT) - SYSTEM_GETKEY(KEY_RIGHT)) * 2; if(jdiry == 0) jdiry=SYSTEM_GETKEY(KEY_UP) - SYSTEM_GETKEY(KEY_DOWN); shippy-lcdfix.patch: --- NEW FILE shippy-lcdfix.patch --- --- shippy-1.3.3.7/shipsdl.c.lcdfix 2006-03-28 21:57:07.000000000 +0200 +++ shippy-1.3.3.7/shipsdl.c 2006-03-28 21:57:07.000000000 +0200 @@ -189,8 +189,11 @@ void SYSTEM_SETVID() { + Uint32 flags = SDL_SWSURFACE | SDL_HWPALETTE | SDL_FULLSCREEN; + if (start_windowed) + flags &= ~SDL_FULLSCREEN; SDL_ShowCursor(SDL_DISABLE); - screen = SDL_SetVideoMode(480, 320, 8, SDL_SWSURFACE | SDL_HWPALETTE | SDL_FULLSCREEN); + screen = SDL_SetVideoMode(screen_width, screen_height, 8, flags); if ( screen == NULL ) { return; @@ -253,36 +256,22 @@ /* NEW SYSTEM_FINISHRENDER() BY JONATHAN GILBERT 1-28-2004 */ void SYSTEM_FINISHRENDER() { - int x, y, w; - Uint8 *in; - Uint16 *out; - + src.x = 0; + src.y = 0; + src.w = 240; + src.h = 160; + + dest.x = 0; + dest.y = 0; + dest.w = screen_width; + dest.h = screen_height; + if (SDL_MUSTLOCK(BackBuffer)) SDL_LockSurface(BackBuffer); if (SDL_MUSTLOCK(screen)) SDL_LockSurface(screen); - - in = BackBuffer->pixels; - out = (Uint16 *)screen->pixels; - - w = BackBuffer->pitch; - - for (y=0; y<160; y++) - { - for (x=0; x> 8 << 16); - sample *= 257; - - *(Uint32 *)(&out[x]) = sample; - *(Uint32 *)(&out[x + w]) = sample; - } - - in += w; - out += w + w; - } + + SDL_SoftStretch(BackBuffer, &src, screen, &dest); if (SDL_MUSTLOCK(BackBuffer)) SDL_UnlockSurface(BackBuffer); @@ -399,8 +388,5 @@ int main(int argc, char*argv[]) { - - SHIPPY_MAIN(); - return 0; - + return SHIPPY_MAIN(argc, argv); } --- shippy-1.3.3.7/shipall.c.lcdfix 2006-03-28 21:57:07.000000000 +0200 +++ shippy-1.3.3.7/shipall.c 2006-03-28 21:57:07.000000000 +0200 @@ -193,10 +193,11 @@ #else - GraphicsFlag=set_gfx_mode(GFX_AUTODETECT_FULLSCREEN, 480, 320, 0, 0); + GraphicsFlag=set_gfx_mode(start_windowed? GFX_AUTODETECT_WINDOWED: + GFX_AUTODETECT_FULLSCREEN, screen_width, screen_height, 0, 0); if(GraphicsFlag!=0) { - GraphicsFlag=set_gfx_mode(GFX_SAFE, 480, 320, 0, 0); + GraphicsFlag=set_gfx_mode(GFX_SAFE, screen_width, screen_height, 0, 0); if(GraphicsFlag!=0) exit(-1); else vidmode = GFX_SAFE; } @@ -289,7 +290,7 @@ blit(BackBuffer,screen,0,0,40,20,240,160); #else acquire_screen(); - stretch_blit(BackBuffer,screen,0,0,240,160,0,0,480,320); + stretch_blit(BackBuffer,screen,0,0,240,160,0,0,screen_width,screen_height); release_screen(); #endif } @@ -319,10 +320,10 @@ { vidmode = (vidmode == GFX_AUTODETECT_FULLSCREEN)? GFX_AUTODETECT_WINDOWED:GFX_AUTODETECT_FULLSCREEN; - if(set_gfx_mode(vidmode, 480, 320, 0, 0)) + if(set_gfx_mode(vidmode, screen_width, screen_height, 0, 0)) { vidmode = GFX_SAFE; - if(set_gfx_mode(vidmode, 480, 320, 0, 0)) + if(set_gfx_mode(vidmode, screen_width, screen_height, 0, 0)) { fprintf(stderr, "FATAL error switching Fullscreen <-> Window\n"); exit(1); @@ -354,13 +355,12 @@ void SYSTEM_IDLE() { - + if (objectsynch == 0) + rest(1); } int main(int argc, char*argv[]) { - SHIPPY_MAIN(); - return 0; - + return SHIPPY_MAIN(argc, argv); } END_OF_MAIN() --- shippy-1.3.3.7/shippy.c.lcdfix 2006-03-28 21:57:07.000000000 +0200 +++ shippy-1.3.3.7/shippy.c 2006-03-28 21:57:51.000000000 +0200 @@ -106,6 +106,11 @@ FILE *highscore_fp; +int start_windowed = 0; +int use_arcade_mode = 0; +int screen_width = 640; +int screen_height = 480; + int compare(const void *a, const void *b) { struct HISCORE *test = (struct HISCORE *)a; @@ -1499,9 +1504,19 @@ } } -void SHIPPY_MAIN() +static void show_usage(char *name, FILE *f) { - int increment; + fprintf(f, + "Usage: %s [-w] [-a] [-h]\n\n" + "Options:\n" + "-w\tWindowed, start in a window (default fullscreen)\n" + "-a\tArcade, use an arcade-ish video mode with scanlines (CRT only!)\n" + "-h\tHelp, display this help and exit\n", name); +} + +int SHIPPY_MAIN(int argc, char *argv[]) +{ + int i; gid_t realgid; highscore_fp = fopen("/var/games/shippy.hs", "r+"); @@ -1509,11 +1524,37 @@ realgid = getgid(); if (setresgid(-1, realgid, realgid) != 0) { perror("Could not drop setgid privileges. Aborting."); - exit(1); + return 1; + } + + for (i = 1; i < argc; i++) + { + if (!strcmp(argv[i], "-w")) + start_windowed = 1; + else if (!strcmp(argv[i], "-a")) + { + use_arcade_mode = 1; + screen_width = 480; + screen_height = 320; + } + else if (!strcmp(argv[i], "-h") || + !strcmp(argv[i], "-?") || + !strcmp(argv[i], "-help") || + !strcmp(argv[i], "--help")) + { + show_usage(argv[0], stdout); + return 0; + } + else + { + fprintf(stderr, "Error: unknown argument: %s\n", argv[i]); + show_usage(argv[0], stderr); + return 1; + } } srand(time(0)); - if(SYSTEM_INIT()!=0) return; + if(SYSTEM_INIT()!=0) return 1; InitShippy(); while(done==0) { @@ -1532,9 +1573,9 @@ countframes=0; } - for(increment=0;increment +#include #include +#include +#include #include "shippy.h" #define TEXT_WHITE 0 @@ -304,10 +307,7 @@ { int increment; int adder; - int accuracy; - int courage; int bonus; - float floatop; shots = 0; powerupframe = 0; @@ -595,7 +595,6 @@ if(ShippyObjects[number].used==0) return; int increment; int runsim; - int tx,ty; switch(ShippyObjects[number].type) { @@ -807,7 +806,7 @@ --ShippyObjects[number].special; } - if(ShippyObjects[number].x<-7 || ShippyObjects[number].x>247 && ShippyObjects[number].type==ENEMYSHIPPY) + if(ShippyObjects[number].x<-7 || (ShippyObjects[number].x>247 && ShippyObjects[number].type==ENEMYSHIPPY)) { ShippyObjects[number].y+=16; ShippyObjects[number].level=-ShippyObjects[number].level; @@ -1102,10 +1101,12 @@ void StoreHS() { + size_t silence_warnings; + if(highscore_fp==NULL) return; rewind(highscore_fp); - fwrite(winners,sizeof(struct HISCORE), 14, highscore_fp); + silence_warnings = fwrite(winners,sizeof(struct HISCORE), 14, highscore_fp); } --- shippy-1.3.3.7/shipsdl.c~ 2006-03-27 20:27:19.000000000 +0200 +++ shippy-1.3.3.7/shipsdl.c 2006-03-27 20:27:19.000000000 +0200 @@ -1,3 +1,6 @@ +#include +#include +#include #include #include #include "shippy.h" @@ -236,7 +239,7 @@ } -int SYSTEM_BG(char *bmp) +void SYSTEM_BG(char *bmp) { if(BackBuffer!=NULL) SDL_FreeSurface(BackBuffer); BackBuffer= CreateSurfaceFromBitmap(bmp,SDL_SWSURFACE|SDL_SRCCOLORKEY); @@ -247,7 +250,7 @@ /* NEW SYSTEM_FINISHRENDER() BY JONATHAN GILBERT 1-28-2004 */ -int SYSTEM_FINISHRENDER() +void SYSTEM_FINISHRENDER() { int x, y, w; Uint8 *in; @@ -294,10 +297,12 @@ if(SDL_FillRect(BackBuffer, NULL, CLEARCOLOR)==-1) { printf("CLS ERROR! \n"); + return 1; } + return 0; } -int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy) +void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy) { src.x = sx; src.y = sy; @@ -316,7 +321,6 @@ void SYSTEM_POLLINPUT() { - int tx,ty; jaction = 0; jsecond = 0; jdirx = 0; @@ -393,5 +397,6 @@ { SHIPPY_MAIN(); + return 0; } --- shippy-1.3.3.7/shippy.h~ 2006-03-27 20:25:10.000000000 +0200 +++ shippy-1.3.3.7/shippy.h 2006-03-27 20:25:10.000000000 +0200 @@ -18,13 +18,13 @@ void SCRAPPABLE_CLOSE(); void SYSTEM_CLEANBMP(); void SYSTEM_SETVID(); -int SYSTEM_BG(); +void SYSTEM_BG(); int SYSTEM_INIT(); int SYSTEM_CLEAN(); int SYSTEM_GETKEY(int scancode); -int SYSTEM_FINISHRENDER(); +void SYSTEM_FINISHRENDER(); int SYSTEM_CLEARSCREEN(); -int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy); +void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy); void SYSTEM_POLLINPUT(); void SYSTEM_IDLE(); int compare(const void *a, const void *b); --- shippy-1.3.3.7/shipall.c~ 2006-03-27 20:21:26.000000000 +0200 +++ shippy-1.3.3.7/shipall.c 2006-03-27 20:21:26.000000000 +0200 @@ -1,3 +1,4 @@ +#include #include #include #include "shippy.h" @@ -215,7 +216,7 @@ set_palette(mypal); } -int SYSTEM_BG(char *bmp) +void SYSTEM_BG(char *bmp) { BITMAP *mytest2; mytest2 = load_bmp(bmp,NULL); @@ -227,12 +228,8 @@ } int SYSTEM_INIT() { - int AllegroInitFlag; - int GraphicsFlag; - int width,height; - BITMAP *mytest2; - - AllegroInitFlag = allegro_init(); + if (allegro_init()) + return -1; atexit(&dumb_exit); dumb_register_stdfiles(); @@ -279,7 +276,7 @@ return key[scancode]; } -int SYSTEM_FINISHRENDER() +void SYSTEM_FINISHRENDER() { #ifdef ALLEGRO_DOS blit(BackBuffer,screen,0,0,40,20,240,160); @@ -295,14 +292,13 @@ return 0; } -int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy) +void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy) { masked_blit(Graphics,BackBuffer,sx,sy,x,y,szx,szy); } void SYSTEM_POLLINPUT() { - int tx,ty; jaction = 0; jsecond = 0; jdirx = 0; @@ -338,6 +334,7 @@ int main(int argc, char*argv[]) { SHIPPY_MAIN(); + return 0; } END_OF_MAIN() --- NEW FILE shippy.desktop --- [Desktop Entry] Encoding=UTF-8 Name=Shippy 1984 GenericName=Space invaders / Galaxians like game Comment=Galaxians with powerups! Exec=shippy Icon=shippy.png Terminal=false StartupNotify=false Type=Application Categories=Application;Game;ArcadeGame; Version=1.3.3.7 --- NEW FILE shippy.sh --- #!/bin/bash SHIPPY=`which shippy-sdl 2> /dev/null` if [ -z "$SHIPPY" ]; then SHIPPY=`which shippy-allegro 2> /dev/null` fi if [ -z "$SHIPPY" ]; then echo "error could find neither shippy-sdl nor shippy-allegro" exit 1 fi exec $SHIPPY "$@" --- NEW FILE shippy.spec --- Name: shippy Version: 1.3.3.7 Release: 2%{?dist} Summary: Space invaders / Galaxians like game with powerups Group: Amusements/Games License: GPL URL: http://www.shippysite.com/ Source0: http://download.sourceforge.net/ship84/shipv%{version}UNIX.zip Source1: shippy.png Source2: shippy.desktop Source3: shippy.sh Patch0: shippy-fixes.patch Patch1: shippy-warnings.patch Patch2: shippy-fullscreen.patch Patch3: shippy-lcdfix.patch Patch4: shippy-joy.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: dumb-devel SDL_mixer-devel desktop-file-utils Requires: %{name}-common = %{version} Provides: %{name}-engine = %{version} %description Shippy1984 is a small, portable game designed to bring back nostalgia for the ways games used to be made--addicting as hell! Mash buttons on your way to the high score! Shippy1984 is designed from the ground up for the avid casual gamer who feels left behind by the technological overload of today's games! No longer! Shippy1984 is the game you have been waiting for! %package allegro Summary: Shippy1984 Allegro version Group: Amusements/Games Requires: %{name}-common = %{version} Provides: %{name}-engine = %{version} %description allegro Alternative version of Shippy1984 compiled to use the allegro display library. %package common Summary: Shippy1984 common files Group: Amusements/Games Requires: %{name}-engine = %{version} %description common Data files, desktop entry and icon, docs and wrapper-script for the Shippy1984 game. %prep %setup -q -c %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 %{__sed} -i 's/\r//' NOTES.txt LICENSE.txt docs/manual.html mv docs html #see comment in %%install rm data/scores.lst %build make %{?_smp_mflags} SDL=1 \ CFLAGS="$RPM_OPT_FLAGS -fsigned-char -DDATADIR=\\\"%{_datadir}/%{name}/\\\"" \ LDFLAGS="-g `sdl-config --libs` -lSDL_mixer" mv %{name} %{name}-sdl make %{?_smp_mflags} ALLEGRO=1 \ CFLAGS="$RPM_OPT_FLAGS -fsigned-char -DDATADIR=\\\"%{_datadir}/%{name}/\\\"" \ LDFLAGS="-g -laldmb -ldumb `allegro-config --libs`" mv %{name} %{name}-allegro %install rm -rf $RPM_BUILD_ROOT # no make install target so DIY mkdir -p $RPM_BUILD_ROOT%{_bindir} install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name} install -m 755 %{name}-sdl %{name}-allegro $RPM_BUILD_ROOT%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name} install -p -m 644 data/* $RPM_BUILD_ROOT%{_datadir}/%{name} # scores.lst is a binary file which is different on MSB vs LSB, so we just # create an empty file, then the game will use its identical internal defaults # and fill it with data in platform format after the first run. mkdir -p $RPM_BUILD_ROOT%{_var}/lib/games touch $RPM_BUILD_ROOT%{_var}/lib/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 \ --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps install -p -m 644 %{SOURCE1} \ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/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,-) %attr(2755,root,games) %{_bindir}/%{name}-sdl %files allegro %defattr(-,root,root,-) %attr(2755,root,games) %{_bindir}/%{name}-allegro %files common %defattr(-,root,root,-) %doc NOTES.txt LICENSE.txt html %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/fedora-%{name}.desktop %{_datadir}/icons/hicolor/16x16/apps/%{name}.png %config(noreplace) %attr (0664,root,games) %{_var}/lib/games/%{name}.hs %changelog * Thu Mar 30 2006 Hans de Goede 1.3.3.7-2 - Fix reversed joy directions in allegro version - Improve support for analog joysticks in the allegro version - Add support for joysticks to the SDL version * Mon Mar 27 2006 Hans de Goede 1.3.3.7-1 - Initial Fedora Extras package - Todo: add joystick support to SDL version Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shippy/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Mar 2006 08:17:05 -0000 1.1 +++ .cvsignore 31 Mar 2006 08:18:18 -0000 1.2 @@ -0,0 +1 @@ +shipv1.3.3.7UNIX.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/shippy/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Mar 2006 08:17:05 -0000 1.1 +++ sources 31 Mar 2006 08:18:18 -0000 1.2 @@ -0,0 +1 @@ +06df2ae060fe4a076d7fa17a57205348 shipv1.3.3.7UNIX.zip From fedora-extras-commits at redhat.com Fri Mar 31 08:20:11 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 31 Mar 2006 01:20:11 -0700 Subject: rpms/libopensync-plugin-palm/devel libopensync-plugin-palm.spec, 1.3, 1.4 Message-ID: <200603310820.k2V8KDP1023039@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/libopensync-plugin-palm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23022 Modified Files: libopensync-plugin-palm.spec Log Message: - bump Index: libopensync-plugin-palm.spec =================================================================== RCS file: /cvs/extras/rpms/libopensync-plugin-palm/devel/libopensync-plugin-palm.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- libopensync-plugin-palm.spec 16 Feb 2006 23:18:36 -0000 1.3 +++ libopensync-plugin-palm.spec 31 Mar 2006 08:20:11 -0000 1.4 @@ -1,6 +1,6 @@ Name: libopensync-plugin-palm Version: 0.18 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Palm plugin for libopensync Group: System Environment/Libraries @@ -60,6 +60,9 @@ %{_includedir}/opensync-1.0/opensync/palm*.h %changelog +* Fri Mar 31 2006 Andreas Bierfert 0.18-4 +- bump + * Thu Feb 16 2006 Andreas Bierfert 0.18-3 - Rebuild for Fedora Extras From fedora-extras-commits at redhat.com Fri Mar 31 08:22:03 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 31 Mar 2006 01:22:03 -0700 Subject: rpms/koffice/FC-5 koffice.spec,1.33,1.34 Message-ID: <200603310822.k2V8M5Ah023105@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/koffice/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23085 Modified Files: koffice.spec Log Message: - exclude not needed file Index: koffice.spec =================================================================== RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- koffice.spec 30 Mar 2006 12:07:42 -0000 1.33 +++ koffice.spec 31 Mar 2006 08:22:02 -0000 1.34 @@ -513,6 +513,8 @@ %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png %{_datadir}/apps/kross +# why is this still here on fc5 and not on devel? +%exclude %{_datadir}/mimelnk/image/x-raw.desktop %files devel %{_includedir}/* From fedora-extras-commits at redhat.com Fri Mar 31 08:22:30 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:22:30 -0700 Subject: rpms/dumb/FC-5 dumb.spec,1.1,1.2 Message-ID: <200603310822.k2V8MW3X023183@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dumb/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23166 Modified Files: dumb.spec Log Message: * Wed Mar 29 2006 Hans de Goede 0.9.3-3 - Add Requires: allegro-devel to -devel package Index: dumb.spec =================================================================== RCS file: /cvs/extras/rpms/dumb/FC-5/dumb.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- dumb.spec 16 Mar 2006 19:38:11 -0000 1.1 +++ dumb.spec 31 Mar 2006 08:22:30 -0000 1.2 @@ -1,6 +1,6 @@ Name: dumb Version: 0.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: IT, XM, S3M and MOD player library Group: System Environment/Libraries License: GPL-Compatible @@ -20,6 +20,7 @@ Summary: Development libraries and headers for dumb Group: Development/Libraries Requires: %{name} = %{version} +Requires: allegro-devel %description devel The developmental files that must be installed in order to compile @@ -66,6 +67,9 @@ %changelog +* Wed Mar 29 2006 Hans de Goede 0.9.3-3 +- Add Requires: allegro-devel to -devel package + * Thu Mar 16 2006 Hans de Goede 0.9.3-2 - Drop modplug.txt from %doc and move release.txt and readme.txt from the -devel package to the main package (bz 185576). From fedora-extras-commits at redhat.com Fri Mar 31 08:27:50 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 31 Mar 2006 01:27:50 -0700 Subject: rpms/sylpheed-claws/FC-5 sylpheed-claws.spec,1.37,1.38 Message-ID: <200603310828.k2V8SMLe023283@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-serv23229/FC-5 Modified Files: sylpheed-claws.spec Log Message: - fix #187383 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sylpheed-claws.spec 2 Mar 2006 00:09:15 -0000 1.37 +++ sylpheed-claws.spec 31 Mar 2006 08:27:49 -0000 1.38 @@ -1,6 +1,6 @@ Name: sylpheed-claws Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL @@ -25,6 +25,7 @@ BuildRequires: pkgconfig BuildRequires: gettext-devel BuildRequires: libetpan-devel >= 0.41 +BuildRequires: libgnomeprintui22-devel Requires: spamassassin Requires: dillo @@ -106,6 +107,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Fri Mar 31 2006 Andreas Bierfert +2.0.0-4 +- #187383: add BR libgnomeprintui22-devel + * Thu Mar 02 2006 Andreas Bierfert 2.0.0-3 - Fix .desktop From fedora-extras-commits at redhat.com Fri Mar 31 08:27:50 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 31 Mar 2006 01:27:50 -0700 Subject: rpms/sylpheed-claws/devel sylpheed-claws.spec,1.37,1.38 Message-ID: <200603310828.k2V8SMYi023286@cvs-int.fedora.redhat.com> Author: awjb Update of /cvs/extras/rpms/sylpheed-claws/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23229/devel Modified Files: sylpheed-claws.spec Log Message: - fix #187383 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- sylpheed-claws.spec 2 Mar 2006 00:09:15 -0000 1.37 +++ sylpheed-claws.spec 31 Mar 2006 08:27:50 -0000 1.38 @@ -1,6 +1,6 @@ Name: sylpheed-claws Version: 2.0.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL @@ -25,6 +25,7 @@ BuildRequires: pkgconfig BuildRequires: gettext-devel BuildRequires: libetpan-devel >= 0.41 +BuildRequires: libgnomeprintui22-devel Requires: spamassassin Requires: dillo @@ -106,6 +107,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Fri Mar 31 2006 Andreas Bierfert +2.0.0-4 +- #187383: add BR libgnomeprintui22-devel + * Thu Mar 02 2006 Andreas Bierfert 2.0.0-3 - Fix .desktop From fedora-extras-commits at redhat.com Fri Mar 31 08:27:49 2006 From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb)) Date: Fri, 31 Mar 2006 01:27:49 -0700 Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.27,1.28 Message-ID: <200603310828.k2V8SLqC023280@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-serv23229/FC-4 Modified Files: sylpheed-claws.spec Log Message: - fix #187383 Index: sylpheed-claws.spec =================================================================== RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sylpheed-claws.spec 2 Mar 2006 00:09:07 -0000 1.27 +++ sylpheed-claws.spec 31 Mar 2006 08:27:49 -0000 1.28 @@ -2,7 +2,7 @@ Name: sylpheed-claws Version: 2.0.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The extended version of Sylpheed Group: Applications/Internet License: GPL @@ -27,6 +27,7 @@ BuildRequires: pkgconfig BuildRequires: gettext-devel BuildRequires: libetpan-devel >= 0.41 +BuildRequires: libgnomeprintui22-devel Requires: spamassassin Requires: dillo @@ -113,6 +114,10 @@ %{_libdir}/sylpheed-claws/plugins/*deps %changelog +* Fri Mar 31 2006 Andreas Bierfert +2.0.0-3 +- #187383: add BR libgnomeprintui22-devel + * Thu Mar 02 2006 Andreas Bierfert 2.0.0-2 - fix .desktop From fedora-extras-commits at redhat.com Fri Mar 31 08:31:46 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 01:31:46 -0700 Subject: owners owners.list,1.783,1.784 Message-ID: <200603310831.k2V8VmR1023322@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23305/owners Modified Files: owners.list Log Message: Add shippy, take ownership of dia Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.783 retrieving revision 1.784 diff -u -r1.783 -r1.784 --- owners.list 31 Mar 2006 04:48:51 -0000 1.783 +++ owners.list 31 Mar 2006 08:31:46 -0000 1.784 @@ -180,7 +180,7 @@ Fedora Extras|deskbar-applet|A Gnome applet to allow easy access to various search engines|ivazquez at ivazquez.net|extras-qa at fedoraproject.org| Fedora Extras|deutex|Doom wad manipulation tool|wart at kobold.org|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|extras-orphan at fedoraproject.org|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| Fedora Extras|diction|Identifies diction and style errors|icon at fedoraproject.org|extras-qa at fedoraproject.org| Fedora Extras|dietlibc|Small libc implementation|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org| @@ -1311,6 +1311,7 @@ Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org| Fedora Extras|ser|SIP Express Router|andreas at bawue.net|extras-qa at fedoraproject.org| Fedora Extras|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org| +Fedora Extras|shippy|Space invaders / Galaxians like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org| Fedora Extras|shorewall|Shoreline Firewall is an iptables-based firewall for Linux systems|robert at marcanoonline.com|extras-qa at fedoraproject.org| Fedora Extras|showimg|Feature-rich image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org| Fedora Extras|SIBsim4|Align expressed RNA sequences on a DNA template|Christian.Iseli at licr.org|extras-qa at fedoraproject.org| From fedora-extras-commits at redhat.com Fri Mar 31 10:14:21 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 31 Mar 2006 03:14:21 -0700 Subject: fedora-security/audit fc4,1.181,1.182 fc5,1.94,1.95 Message-ID: <200603311014.k2VAELL0027618@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27598 Modified Files: fc4 fc5 Log Message: Catchup (apart from kernel) Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.181 retrieving revision 1.182 diff -u -r1.181 -r1.182 --- fc4 24 Mar 2006 08:43:34 -0000 1.181 +++ fc4 31 Mar 2006 10:14:19 -0000 1.182 @@ -1,8 +1,12 @@ -Up to date CVE as of CVE email 20060323 -Up to date FC4 as of 20060323 +Up to date CVE as of CVE email 20060330 +Up to date FC4 as of 20060330 ** are items that need attention +CVE-2006-1550 VULNERABLE (dia) bz#187402 +CVE-2006-1548 ** struts +CVE-2006-1547 ** struts +CVE-2006-1546 ** struts CVE-2006-1368 ** kernel CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 ** kernel @@ -13,7 +17,9 @@ CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability +CVE-2006-1066 ** kernel CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only) +CVE-2006-1059 version (samba) CVE-2006-1052 ** kernel CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe @@ -96,6 +102,8 @@ CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0035 backport (kernel) [since FEDORA-2006-077] patch-2.6.15.5 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050 +CVE-2005-4746 version (freeradius) we don't build vulnerable bits +CVE-2005-4745 version (freeradius) we don't build vulnerable bits CVE-2005-4720 VULNERABLE (thunderbird) CVE-2005-4720 VULNERABLE (mozilla) CVE-2005-4720 VULNERABLE (firefox) Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.94 retrieving revision 1.95 diff -u -r1.94 -r1.95 --- fc5 24 Mar 2006 08:43:34 -0000 1.94 +++ fc5 31 Mar 2006 10:14:19 -0000 1.95 @@ -1,8 +1,11 @@ -Up to date CVE as of CVE email 20060323 -Up to date FC5 as of 20060323 +Up to date CVE as of CVE email 20060330 +Up to date FC5 as of 20060330 ** are items that need attention +CVE-2006-1548 ** struts +CVE-2006-1547 ** struts +CVE-2006-1546 ** struts CVE-2006-1368 ** kernel CVE-2006-1354 VULNERABLE (freeradius) bz#186084 CVE-2006-1343 ** kernel @@ -15,7 +18,9 @@ CVE-2006-1095 ignore (mod_python, 3.2.7 only) CVE-2006-1079 ignore (httpd) not a vulnerability CVE-2006-1078 ignore (httpd) not a vulnerability +CVE-2006-1066 ** kernel CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189] +CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259] CVE-2006-1052 backport (kernel) patch-2.6.16-rc6 CVE-2006-1045 VULNERABLE (thunderbird) CVE-2006-1015 ignore (php) safe mode isn't safe @@ -99,6 +104,8 @@ CVE-2006-0036 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 CVE-2006-0035 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 CVE-2006-0019 version (kdelibs, fixed 3.5.1) +CVE-2005-4746 version (freeradius) we don't build vulnerable bits +CVE-2005-4745 version (freeradius) we don't build vulnerable bits CVE-2005-4720 version (thunderbird, fixed 1.5) CVE-2005-4720 version (firefox, fixed 1.5) CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS @@ -574,6 +581,7 @@ CVE-2005-0705 version (ethereal, fixed after 0.10.9) CVE-2005-0704 version (ethereal, fixed after 0.10.9) CVE-2005-0698 version (ethereal, fixed after 0.10.9) +CVE-2005-0670 ** hcidump CVE-2005-0664 version (libexif, fixed 0.6.12) CVE-2005-0654 ignore (gimp, not fixed 2.2) upstream considers harmless CVE-2005-0627 version (qt, fixed 3.3.4) From fedora-extras-commits at redhat.com Fri Mar 31 12:15:08 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 05:15:08 -0700 Subject: rpms/dvdisaster/devel dvdisaster.spec,1.8,1.9 Message-ID: <200603311215.k2VCFAhM032305@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32288 Modified Files: dvdisaster.spec Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/devel/dvdisaster.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dvdisaster.spec 30 Mar 2006 12:02:36 -0000 1.8 +++ dvdisaster.spec 31 Mar 2006 12:15:07 -0000 1.9 @@ -1,7 +1,7 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media Version: 0.66 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com @@ -68,7 +68,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -106,6 +106,9 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 0.66-2 +- fix pixmap icon name + * Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 - upgrade to 0.66 - spec file changes/cleanups, merged from a skeleton now included upstream From fedora-extras-commits at redhat.com Fri Mar 31 12:15:36 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 05:15:36 -0700 Subject: rpms/dvdisaster/FC-5 dvdisaster.spec,1.8,1.9 Message-ID: <200603311215.k2VCFcEf032328@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32311 Modified Files: dvdisaster.spec Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-5/dvdisaster.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- dvdisaster.spec 30 Mar 2006 12:04:30 -0000 1.8 +++ dvdisaster.spec 31 Mar 2006 12:15:36 -0000 1.9 @@ -1,7 +1,7 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media Version: 0.66 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com @@ -68,7 +68,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -106,6 +106,9 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 0.66-2 +- fix pixmap icon name + * Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 - upgrade to 0.66 - spec file changes/cleanups, merged from a skeleton now included upstream From fedora-extras-commits at redhat.com Fri Mar 31 12:16:11 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 05:16:11 -0700 Subject: rpms/dvdisaster/FC-4 dvdisaster.spec,1.7,1.8 Message-ID: <200603311216.k2VCGDWK032389@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32372 Modified Files: dvdisaster.spec Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-4/dvdisaster.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dvdisaster.spec 30 Mar 2006 12:05:09 -0000 1.7 +++ dvdisaster.spec 31 Mar 2006 12:16:11 -0000 1.8 @@ -1,7 +1,7 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media Version: 0.66 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com @@ -68,7 +68,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -106,6 +106,9 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 0.66-2 +- fix pixmap icon name + * Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 - upgrade to 0.66 - spec file changes/cleanups, merged from a skeleton now included upstream From fedora-extras-commits at redhat.com Fri Mar 31 12:19:15 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 05:19:15 -0700 Subject: rpms/dvdisaster/FC-3 dvdisaster.spec,1.7,1.8 Message-ID: <200603311219.k2VCJHRv032454@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/dvdisaster/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32437 Modified Files: dvdisaster.spec Log Message: Index: dvdisaster.spec =================================================================== RCS file: /cvs/extras/rpms/dvdisaster/FC-3/dvdisaster.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dvdisaster.spec 30 Mar 2006 12:05:37 -0000 1.7 +++ dvdisaster.spec 31 Mar 2006 12:19:15 -0000 1.8 @@ -1,7 +1,7 @@ Name: dvdisaster Summary: Additional error protection for CD/DVD media Version: 0.66 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Archiving License: GPL URL: http://www.dvdisaster.com @@ -68,7 +68,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps -install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png +install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/ desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -106,6 +106,9 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 0.66-2 +- fix pixmap icon name + * Thu Mar 30 2006 Dmitry Butskoy - 0.66-1 - upgrade to 0.66 - spec file changes/cleanups, merged from a skeleton now included upstream From fedora-extras-commits at redhat.com Fri Mar 31 12:37:13 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:37:13 -0700 Subject: rpms/libmal/devel libmal.spec,1.2,1.3 Message-ID: <200603311237.k2VCbFUx032571@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/libmal/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32554 Modified Files: libmal.spec Log Message: respin for new pilot-link Index: libmal.spec =================================================================== RCS file: /cvs/extras/rpms/libmal/devel/libmal.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libmal.spec 22 Mar 2006 15:33:38 -0000 1.2 +++ libmal.spec 31 Mar 2006 12:37:13 -0000 1.3 @@ -4,7 +4,7 @@ # NOTE: this isn't the latest version, but is the last version known to # work with kdepim Version: 0.31 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: MPL Url: http://jasonday.home.att.net/code/libmal/ From fedora-extras-commits at redhat.com Fri Mar 31 12:39:14 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:14 -0700 Subject: rpms/kdemultimedia-extras - New directory Message-ID: <200603311239.k2VCdG3U032695@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32669/kdemultimedia-extras Log Message: Directory /cvs/extras/rpms/kdemultimedia-extras added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 12:39:15 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:15 -0700 Subject: rpms/kdemultimedia-extras/devel - New directory Message-ID: <200603311239.k2VCdH3d032698@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32669/kdemultimedia-extras/devel Log Message: Directory /cvs/extras/rpms/kdemultimedia-extras/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 12:39:27 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:27 -0700 Subject: rpms/kdemultimedia-extras Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603311239.k2VCdTbO032749@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32716 Added Files: Makefile import.log Log Message: Setup of module kdemultimedia-extras --- NEW FILE Makefile --- # Top level Makefile for module kdemultimedia-extras all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 31 12:39:28 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:28 -0700 Subject: rpms/kdemultimedia-extras/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603311239.k2VCdUcF032752@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32716/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module kdemultimedia-extras --- NEW 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 Mar 31 12:39:58 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:58 -0700 Subject: rpms/kdemultimedia-extras import.log,1.1,1.2 Message-ID: <200603311240.k2VCe0JP000389@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350 Modified Files: import.log Log Message: auto-import kdemultimedia-extras-3.5.1-7 on branch devel from kdemultimedia-extras-3.5.1-7.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 Mar 2006 12:39:27 -0000 1.1 +++ import.log 31 Mar 2006 12:39:58 -0000 1.2 @@ -0,0 +1 @@ +kdemultimedia-extras-3_5_1-7:HEAD:kdemultimedia-extras-3.5.1-7.src.rpm:1143808795 From fedora-extras-commits at redhat.com Fri Mar 31 12:39:59 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 05:39:59 -0700 Subject: rpms/kdemultimedia-extras/devel kde-libtool.patch, NONE, 1.1 kdemultimedia-3.2.2-mpeglib-buffer.patch, NONE, 1.1 kdemultimedia-3.4.0-arts_includes.patch, NONE, 1.1 kdemultimedia-3.4.0-xdg.patch, NONE, 1.1 kdemultimedia-3.5.0-116958.patch, NONE, 1.1 kdemultimedia-3.5.0-oggvorbis_artsplugin.patch, NONE, 1.1 kdemultimedia-extras.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603311240.k2VCe1d5000406@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/kdemultimedia-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv350/devel Modified Files: .cvsignore sources Added Files: kde-libtool.patch kdemultimedia-3.2.2-mpeglib-buffer.patch kdemultimedia-3.4.0-arts_includes.patch kdemultimedia-3.4.0-xdg.patch kdemultimedia-3.5.0-116958.patch kdemultimedia-3.5.0-oggvorbis_artsplugin.patch kdemultimedia-extras.spec Log Message: auto-import kdemultimedia-extras-3.5.1-7 on branch devel from kdemultimedia-extras-3.5.1-7.src.rpm kde-libtool.patch: --- NEW FILE kde-libtool.patch --- --- kdelibs-3.1/admin/ltmain.sh.orig 2003-02-20 17:52:07.000000000 -0500 +++ kdelibs-3.1/admin/ltmain.sh 2003-02-20 18:30:32.000000000 -0500 @@ -4459,6 +4459,14 @@ case $host,$output,$installed,$module,$dlname in *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; esac + newdeplib="" + for j in $dependency_libs ; do + if echo $j | grep "gcc-lib" >& /dev/null ; then + continue + fi + newdeplib="$newdeplib $j" + done + dependency_libs="$newdeplib" $echo > $output "\ # $outputname - a libtool library file # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP kdemultimedia-3.2.2-mpeglib-buffer.patch: --- NEW FILE kdemultimedia-3.2.2-mpeglib-buffer.patch --- --- kdemultimedia-3.2.2/mpeglib_artsplug/splayPlayObject_impl.cpp.buffer 2003-05-05 07:19:44.000000000 -0500 +++ kdemultimedia-3.2.2/mpeglib_artsplug/splayPlayObject_impl.cpp 2004-05-21 09:37:26.312000308 -0500 @@ -17,7 +17,7 @@ #include "debug.h" -#define INPUT_SIZE 8192 +#define INPUT_SIZE 32768 /** Problems with streaming, which must be solved: --- kdemultimedia-3.2.2/mpeglib/lib/decoder/splayPlugin.cpp.buffer 2003-06-27 08:44:43.000000000 -0500 +++ kdemultimedia-3.2.2/mpeglib/lib/decoder/splayPlugin.cpp 2004-05-21 09:38:12.550471578 -0500 @@ -25,7 +25,7 @@ using namespace std; -#define INPUTBUFFER_SIZE 8192 +#define INPUTBUFFER_SIZE 32768 SplayPlugin::SplayPlugin() { pow(6.0,3.0); // fixes bug in __math.h kdemultimedia-3.4.0-arts_includes.patch: --- NEW FILE kdemultimedia-3.4.0-arts_includes.patch --- --- kdemultimedia-3.4.0/juk/configure.in.in.arts_includes 2005-02-23 04:20:58.000000000 -0600 +++ kdemultimedia-3.4.0/juk/configure.in.in 2005-03-05 02:06:26.000000000 -0600 @@ -8,7 +8,7 @@ if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then LIB_ARTS="-lartskde" ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`] - ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts" + ARTS_CFLAGS="-I$arts_includes" AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk]) else build_arts="no" --- kdemultimedia-3.4.0/configure.in.arts_includes 2005-03-04 06:29:23.000000000 -0600 +++ kdemultimedia-3.4.0/configure.in 2005-03-05 02:06:26.000000000 -0600 @@ -1144,7 +1144,7 @@ if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then LIB_ARTS="-lartskde" ARTS_PREFIX=[`$ARTSCCONFIG --arts-prefix`] - ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts" + ARTS_CFLAGS="-I$arts_includes" AC_DEFINE(HAVE_ARTS, 1, [have arts support in juk]) else build_arts="no" --- kdemultimedia-3.4.0/configure.arts_includes 2005-03-04 06:31:57.000000000 -0600 +++ kdemultimedia-3.4.0/configure 2005-03-05 02:07:09.000000000 -0600 @@ -39041,7 +39041,7 @@ if test "x$build_arts" = "xyes" && test "x$ARTSCCONFIG" != "xno" ; then LIB_ARTS="-lartskde" ARTS_PREFIX=`$ARTSCCONFIG --arts-prefix` - ARTS_CFLAGS="-I$ARTS_PREFIX/include/arts" + ARTS_CFLAGS="-I$arts_includes" cat >>confdefs.h <<\_ACEOF #define HAVE_ARTS 1 kdemultimedia-3.4.0-xdg.patch: --- NEW FILE kdemultimedia-3.4.0-xdg.patch --- --- kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu.tn 2005-04-25 16:16:32.000000000 +0200 +++ kdemultimedia-3.4.0/kappfinder-data/kde-multimedia-music.menu 2005-04-25 16:17:51.000000000 +0200 @@ -2,6 +2,7 @@ "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd"> +Applications Multimedia kdemultimedia-3.5.0-116958.patch: --- NEW FILE kdemultimedia-3.5.0-116958.patch --- --- kdemultimedia-3.5.0/configure.in.in.116958 2005-11-26 00:56:42.000000000 -0600 +++ kdemultimedia-3.5.0/configure.in.in 2005-12-21 09:12:14.000000000 -0600 @@ -346,16 +346,6 @@ AC_SUBST(akode_includes) AC_SUBST(akode_libs) - KDE_CHECK_LIB(akode_mpeg_decoder, mpeg_decoder, have_akode_mpeg=yes, have_akode_mpeg=no, -lakode) - KDE_CHECK_LIB(akode_mpc_decoder, mpc_decoder, have_akode_mpc=yes, have_akode_mpc=no, -lakode) - KDE_CHECK_LIB(akode_xiph_decoder, xiph_decoder, have_akode_xiph=yes, have_akode_xiph=no, -lakode) - KDE_CHECK_LIB(akode_ffmpeg_decoder, ffmpeg_decoder, have_akode_ffmpeg=yes, have_akode_ffmpeg=no, -lakode) - - AM_CONDITIONAL(include_akode_mpeg, test x$have_akode_mpeg = xyes) - AM_CONDITIONAL(include_akode_mpc, test x$have_akode_mpc = xyes) - AM_CONDITIONAL(include_akode_xiph, test x$have_akode_xiph = xyes) - AM_CONDITIONAL(include_akode_ffmpeg, test x$have_akode_ffmpeg = xyes) - ]) --- kdemultimedia-3.5.0/akode_artsplugin/configure.in.in.116958 2005-09-10 03:20:04.000000000 -0500 +++ kdemultimedia-3.5.0/akode_artsplugin/configure.in.in 2005-12-21 09:13:50.000000000 -0600 @@ -1,4 +1,14 @@ if test x$build_arts != xyes || test x$have_akode != xyes then DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin" +else +KDE_CHECK_LIB(akode_mpeg_decoder, mpeg_decoder, have_akode_mpeg=yes, have_akode_mpeg=no, -lakode) +KDE_CHECK_LIB(akode_mpc_decoder, mpc_decoder, have_akode_mpc=yes, have_akode_mpc=no, -lakode) +KDE_CHECK_LIB(akode_xiph_decoder, xiph_decoder, have_akode_xiph=yes, have_akode_xiph=no, -lakode) +KDE_CHECK_LIB(akode_ffmpeg_decoder, ffmpeg_decoder, have_akode_ffmpeg=yes, have_akode_ffmpeg=no, -lakode) fi + +AM_CONDITIONAL(include_akode_mpeg, test x$have_akode_mpeg = xyes) +AM_CONDITIONAL(include_akode_mpc, test x$have_akode_mpc = xyes) +AM_CONDITIONAL(include_akode_xiph, test x$have_akode_xiph = xyes) +AM_CONDITIONAL(include_akode_ffmpeg, test x$have_akode_ffmpeg = xyes) kdemultimedia-3.5.0-oggvorbis_artsplugin.patch: --- NEW FILE kdemultimedia-3.5.0-oggvorbis_artsplugin.patch --- --- kdemultimedia-3.5.0/oggvorbis_artsplugin/configure.in.in.oggvorbis_artsplugin 2005-09-10 03:19:44.000000000 -0500 +++ kdemultimedia-3.5.0/oggvorbis_artsplugin/configure.in.in 2005-11-23 11:33:09.000000000 -0600 @@ -1,5 +1,5 @@ -if test "$kde_mpeglib_compiles" = "yes" -then -DO_NOT_COMPILE="$DO_NOT_COMPILE oggvorbis_artsplugin" -fi +#if test "$kde_mpeglib_compiles" = "yes" +#then +#DO_NOT_COMPILE="$DO_NOT_COMPILE oggvorbis_artsplugin" +#fi --- NEW FILE kdemultimedia-extras.spec --- # $Id: kdemultimedia.spec,v 1.48 2006/03/08 15:30:42 rexdieter Exp $ # NOTE: can only build *one* of the following at a time # core: kdemultidia/kdemultimedia-devel # extras: kdemultimedia-extras # nonfree: kdemultimedia-nonfree #define core 1 %define extras 1 #define nonfree 1 # enable pkg/filelist debugging -- Rex #define debug 1 %if "%{?core}" == "1" %define patched -patched %endif %if "%{?extras}" == "1" %define patched -patched %define _with_akode --with-akode #define to include/build juk, undef not %define juk juk # to make sure no nonfree bits get included BuildConflicts: akode-extras # debugging: to make sure no extras bits (accidentally) get excluded %{?debug:BuildConflicts: kdemultimedia-extras = %{epoch}:%{version}} %define _with_musicbrainz --with-musicbrainz %define _with_libsamplerate --with-libsamplerate %define _with_taglib --with-taglib %endif %if "%{?nonfree}" == "1" %define _with_akode --with-akode BuildRequires: akode-extras %define _with_lame --with-lame --disable-lametest %define _with_xine --with-xine %endif # distro/release bits %if "%{?fedora}" > "2" %define _with_gstreamer --with-gstreamer %endif %if "%{?fedora}" > "4" %define gst gstreamer08 %endif %if "%{?rhel}" > "3" %define _with_gstreamer --with-gstreamer %endif %define is_release 2 %if "%{?core}" == "1" Name: kdemultimedia Summary: Multimedia applications for the K Desktop Environment (KDE) %endif %if "%{?extras}" == "1" Name: kdemultimedia-extras Summary: Extras for KDE multimedia applications %endif %if "%{?nonfree}" == "1" Name: kdemultimedia-nonfree Summary: Nonfree Extras for KDE multimedia applications %endif Group: Applications/Multimedia Epoch: 6 Version: 3.5.1 Release: 7%{?dist}%{?kde} License: GPL %if "%{?nonfree}" == "1" Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdemultimedia-%{version}.tar.bz2 %else # From Core's kdemultimedia pkg Source0: kdemultimedia-3.5.1-patched.tar.bz2 %endif Url: http://multimedia.kde.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: kdelibs-devel >= 6:%{version} Requires: kdelibs >= 6:%{version} BuildRequires: libtool %if "%{is_release}" != "1" BuildRequires: automake %endif BuildRequires: desktop-file-utils BuildRequires: audiofile-devel BuildRequires: alsa-lib-devel BuildRequires: cdparanoia-devel cdparanoia BuildRequires: flac-devel BuildRequires: libtheora-devel BuildRequires: libvorbis-devel >= 1:1.1.0 %{?core:Requires: libvorbis >= 1:1.1.0} %{?_with_taglib:BuildRequires: taglib-devel} %{?_with_musicbrainz:BuildRequires: libmusicbrainz-devel >= 0:2.1, libtunepimp-devel} %{?_with_akode:BuildRequires: akode-devel} # gstreamer(08) pkg_name %{?_with_gstreamer:BuildRequires: %{?gst}%{!?gst:gstreamer}-plugins-devel} %{?_with_lame:BuildRequires: lame-devel} %{?_with_libsamplerate:BuildRequires: libsamplerate-devel} %{?_with_xine:BuildRequires: xine-lib-devel >= 0:1.0} ## TODO (?) #BuildRequires: gstreamer/gst, %{?_with_jack:BuildRequires: jack-audio-connection-kit} %{?_with_polypaudio:BuildRequires: polypaudio-devel} Patch0: kde-libtool.patch #Patch2: kdemultimedia-3.4.0-config.patch Patch2: kdemultimedia-3.4.0-arts_includes.patch Patch4: kdemultimedia-3.4.0-xdg.patch ## kde-redhat patches # unconditinally include oggvorbis_artsplugin Patch1000: kdemultimedia-3.5.0-oggvorbis_artsplugin.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 Multimedia applications for KDE, including: * noatun: a multimedia player for sound and movies, very extensible due to it's plugin interface * kaudiocreator: CD ripper and audio encoder frontend. * kaboodle: light media player * kmid: A standalone and embeddable midi player, includes a karaoke-mode * kmidi: midi player, can use sound patch files and create a WAV file * kmix: the audio mixer as a standalone program and Kicker applet * kscd: A CD player with an interface to the internet CDDB database * krec: A recording frontend using aRts The following are libraries and plugins that are building the core infrastructure of above applications: * arts: a versatily multimedia system the consists of various little building blocks that you (or an application) can combine in almost arbitrary ways to create sound and video processing pipes * kfile-plugins: provide meta information about sound files * libkcddb: a library for retrieving and sending cddb information %package devel Summary: Header files, libraries for %{name} Group: Development/Libraries Requires: kdelibs-devel Requires: %{name} = %{epoch}:%{version}-%{release} %description devel %{summary}. %endif %if "%{?extras}" == "1" # debugging %{?debug:BuildConflicts: kdemultimedia-extras } Requires: kdemultimedia = %{epoch}:%{version} %description %{summary}, including: * akode_artsplugin (akode) %{?juk:* juk (libtunepimp)} * kfile-plugins: flac, mpc (taglib) %endif %if "%{?nonfree}" == "1" # debugging %{?debug:BuildRequires: kdemultimedia-extras = %{epoch}:%{version}} %{?debug:BuildConflicts: kdemultimedia-nonfree} Requires: kdemultimedia = %{epoch}:%{version} # for main akode_artsplugins bits Requires: kdemultimedia-extras = %{epoch}:%{version} Requires: akode-extras %description %{summary}, including: * akode_artsplugin (akode-extras), * kfile-plugins: mp3 (taglib), * krec mp3 export (lame), * mpeglib_artsplugin, * xine_artsplugin (xine-lib) %endif %prep %if "%{?is_release}" != "0" %setup -q -n kdemultimedia-%{version}%{?patched} %else %setup -q -n kdemultimedia %endif #patch0 -p1 -b .libtool %patch2 -p1 -b .arts_include %patch4 -p1 -b .xdg #with mpeglib in -extras, not really needed -- Rex #patch1000 -p1 -b .oggvorbis_artsplugin %{?nonfree:%patch74744 -p1 -b .74744} %patch116958 -p1 -b .116958 %if "%{is_release}" != "1" make -f admin/Makefile.common cvs %endif %build unset QTDIR || : ; . /etc/profile.d/qt.sh export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include DO_NOT_COMPILE="" %{!?juk:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE juk"} #{!?extras:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} #{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE akode_artsplugin"} #{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE xine_artsplugin"} %{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE mpeglib mpeglib_artsplug"} %{!?nonfree:export DO_NOT_COMPILE="$DO_NOT_COMPILE mpg123_artsplugin"} %configure \ --includedir=%{_includedir}/kde \ --disable-rpath \ --disable-gcc-hidden-visibility \ --enable-new-ldflags \ --disable-debug --disable-warnings \ --disable-dependancy-tracking --enable-final \ --without-libltdl \ --with-alsa --with-arts-alsa \ --with-audiofile \ --with-cdparanoia --with-extra-includes="%{_includedir}/cdda" \ --with-flac \ --with-theora \ --with-vorbis \ %{?_with_akode} %{!?_with_akode:--without-akode} \ %{?_with_gstreamer} %{!?_with_gstreamer:--without-gstreamer} \ %{?_with_jack} %{!?_with_jack:--without-jack} \ %{?_with_lame} %{!?_with_lame:--without-lame} \ %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \ %{?_with_musicbrainz} %{!?_with_musicbrainz:--without-musicbrainz} \ %{?_with_polypaudio} %{!?_with_polypaudio:--without-polypaudio} \ %{?_with_taglib} %{!?_with_taglib:--without-taglib} \ %{?_with_xine} %{!?_with_xine:--without-xine} %if "%{?core}" == "1" make %{?_smp_mflags} %endif %if "%{?extras}" == "1" for module in arts akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do make -C $module %{?_smp_mflags} done %endif %if "%{?nonfree}" == "1" for module in arts akode_artsplugin kfile-plugins/mp3 krec krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do make -C $module %{?_smp_mflags} done %endif %install rm -rf $RPM_BUILD_ROOT %if "%{?core}" == "1" make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT %endif %if "%{?extras}" == "1" for module in akode_artsplugin %{?juk} kfile-plugins/flac kfile-plugins/mpc ; do make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT done %if "%{?juk:1}" == "1" desktop-file-install --vendor="fedora" \ --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \ --add-category="X-Fedora" \ $RPM_BUILD_ROOT%{_datadir}/applications/kde/juk.desktop %endif %if "%{?debug}" == "1" # Conflicts check (debuging only) find $RPM_BUILD_ROOT -type f -o -type l | sed -e "s|$RPM_BUILD_ROOT||" | while read FILE do if [ -f ${FILE} -o -L ${FILE} ]; then echo "WARNING: $FILE conflicts (already installed)" # && rm -f $RPM_BUILD_ROOT${FILE} fi done %endif # file list (naive) find $RPM_BUILD_ROOT -type f -o -type l | sed -e "s|$RPM_BUILD_ROOT||" | grep -v '.debug$' > extras.list %endif %if "%{?nonfree}" == "1" for module in akode_artsplugin kfile-plugins/mp3 krec/mp3_export mpeglib mpeglib_artsplug xine_artsplugin ; do make -C $module install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT done ## Remove/unstinstall (conflicting) bits we don't want # -extras bits rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akodearts.mcop{class,type} rm -f $RPM_BUILD_ROOT%{_libdir}/mcop/akode{,MPC,SpeexStream,VorbisStream,Xiph}PlayObject.mcopclass rm -f $RPM_BUILD_ROOT%{_libdir}/libarts_akode.{la,so} %if "%{?debug}" == "1" # Conflicts check (debuging only) find $RPM_BUILD_ROOT -type f -o -type l| sed -e "s|$RPM_BUILD_ROOT||" | while read FILE do if [ -f ${FILE} -o -L ${FILE} ]; then echo "WARNING: $FILE conflicts (already installed)" # && rm -f $RPM_BUILD_ROOT${FILE} fi done %endif ## (regen) file list (naive) find $RPM_BUILD_ROOT -type f -o -type l| sed -e "s|$RPM_BUILD_ROOT||" | grep -v '.debug$' | grep -v "%{_includedir}" > nonfree.list %endif ## File lists # locale's %find_lang %{name} || touch %{name}.lang # 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 ] && ln -nsf ../common $i/common done popd fi done fi mv %{name}.lang %{name}.list [ ! -f %{name}.list ] && echo "%defattr(-,root,root)" > %{name}.list [ ! -f devel.list ] && echo "%defattr(-,root,root)" > devel.list ## cleanup .la files (178734) # if built without --without-libltdl: /usr/lib/libltdl.la sed -i -e "s@%{_libdir}/libltdl.la@@g" $RPM_BUILD_ROOT%{_libdir}/lib*.la ||: # alsa-lib/asound sed -i -e "s at -lasound@@g" $RPM_BUILD_ROOT%{_libdir}/lib*.la ||: %if "%{?core}" == "1" %post /sbin/ldconfig for icon_theme in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %postun /sbin/ldconfig for icon_theme in crystalsvg hicolor locolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %endif %if "%{?extras}" == "1" # Since the icons come from juk %if "%{?juk:1}" == "1" %post for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done %postun for icon_theme in crystalsvg hicolor ; do touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||: gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||: done %endif %endif %if "%{?nonfree}" == "1" %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %endif %if "%{?core}" == "1" %files -f %{name}.list %defattr(-,root,root,-) %doc AUTHORS COPYING README %{_libdir}/lib*.so* %{_libdir}/lib*.la %{_bindir}/* # Own dir(s) until owned by kdelibs? -- Rex %{_sysconfdir}/xdg/menus/applications-merged/ %{_datadir}/desktop-directories/ %{_datadir}/apps/* %{_datadir}/autostart/*.desktop %config %{_datadir}/config*/* %{_datadir}/icons/crystalsvg/*/*/* %{_datadir}/icons/hicolor/*/*/* %{_datadir}/icons/locolor/*/*/* %{_datadir}/mimelnk/* %{_datadir}/service*/* %{_datadir}/appl*/*/* %{_libdir}/mcop/* %{_libdir}/kde3/* %files devel -f devel.list %defattr(-,root,root,-) %{_includedir}/* %endif %if "%{?extras}" == "1" %files -f extras.list %defattr(-,root,root,-) %doc AUTHORS COPYING README %{?juk:%dir %{_datadir}/apps/juk/} %endif %if "%{?nonfree}" == "1" %files -f nonfree.list %defattr(-,root,root,-) %doc AUTHORS COPYING README %dir %{_datadir}/apps/videothumbnail/ ## FIXME? -- Rex %{_includedir}/kde/mpeglib/ %{_includedir}/kde/mpeglib_artsplug/ %endif %clean rm -rf $RPM_BUILD_ROOT %changelog * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7 - kfile-plugins/mp3: -extras -> -nonfree * Thu Mar 16 2006 Rex Dieter 6:3.5.1-6 - -core/-extras: use (fc's) kdemultimedia-3.5.1-patched.tar.bz2 * Sun Feb 26 2006 Rex Dieter 6:3.5.1-5 - remove stray 'done' - set QTLIB/QTINC (at least until #169132 is backported to fc4) * Sat Feb 25 2006 Rex Dieter 6:3.5.1-4 - -extras: --vendor="fedora" * Fri Feb 24 2006 Rex Dieter 6:3.5.1-3 - -extras: --add-category="X-Fedora" * Sun Feb 05 2006 Rex Dieter 6:3.5.1-2 - fc5+: BR: gstreamer08-plugins-devel * Mon Jan 23 2006 Rex Dieter 6:3.5.1-1.1 - document "cleanup .la files" (#178734) - (re)enable juk * Sat Jan 21 2006 Rex Dieter 6:3.5.1-1.0 - kde-3.5.1 * Fri Dec 23 2005 Rex Dieter 6:3.5.0-5 - disable juk (for now) * Wed Dec 21 2005 Rex Dieter 6:3.5.0-4 - disable debugging/filelist-conflicts-check crud (for now) * Wed Dec 21 2005 Rex Dieter 6:3.5.0-3 - Source: redownload, fix URL - %%doc: AUTHORS COPYING README - -extras: drop Obsoletes: juk * Tue Dec 20 2005 Rex Dieter 6:3.5.0-2 - cleanup for Extras/Livna * Fri Dec 09 2005 Rex Dieter 6:3.5.0-1.7 - --enable-new-ldflags * Tue Nov 29 2005 Rex Dieter 6:3.5.0-1.6 - add/use %%post/%%postun for extras/nonfree - TODO/FIXME: -nonfree includes -devel bits (mpeglib) * Sun Nov 27 2005 Rex Dieter 6:3.5.0-1.5 - respin * Fri Nov 25 2005 Rex Dieter 6:3.5.0-1.4 - -extras,-nonfree: include symlinks too * Thu Nov 24 2005 Rex Dieter 6:3.5.0-1.3 - -extras,-nonfree bits (ugh) * Wed Nov 23 2005 Rex Dieter 6:3.5.0-1.2 - -akode patch - drop .la file stripper * Tue Nov 22 2005 Rex Dieter 6:3.5.0-1.1 - --with-akode * Mon Nov 21 2005 Rex Dieter 6:3.5.0-1.0 - kde-3.5.0 * Thu Nov 17 2005 Rex Dieter 6:3.5.0-0.2.rc1.kde - (re)build against libtunepimp-0.4 (kde bug #116575) * Sat Nov 12 2005 Rex Dieter 6:3.5.0-0.1.rc1.kde - kde-3.5.0-rc1 * Fri Aug 12 2005 Rex Dieter 6:3.4.2-1.2.kde - respin * Thu Jul 21 2005 Rex Dieter 6:3.4.2-1.0.kde - kde-3.4.2 * Mon Jun 20 2005 Rex Dieter 6:3.4.1-1.2.kde - disable -fvisibility, for now (kde bug #101542) * Tue May 24 2005 Rex Dieter 6:3.4.1-1.0.kde - 3.4.1 * Fri Apr 29 2005 Rex Dieter 6:3.4.0-2.2.kde - Ob/Pr: kdemultimedia-extras * Wed Apr 20 2005 Rex Dieter 6:3.4.0-2.1.kde - patch for slow kaudiocreator (kde bug #98477) * Tue Mar 29 2005 Rex Dieter 6:3.4.0-2.0.kde - remove libltdl.la reference(s) from .la files - make all(most?) configure options explicit * Wed Mar 23 2005 Rex Dieter 6:3.4.0-1.2.kde - %%post/%%postun workarounds for recent /sbin/ldconfig (fc3/el4) * Sat Mar 12 2005 Rex Dieter 6:3.4.0-1.1.kde - enumerate via --with/--without exactly what is(should!) and isn't supported * Fri Mar 05 2005 Rex Dieter 6:3.4.0-1.0.kde - 3.4.0(final) * Thu Mar 03 2005 Rex Dieter 6:3.4.0-0.1.rc1.kde - 3.4.0 * Tue Feb 21 2005 Rex Dieter 6:3.3.92-0.3.kde - (try to) fix artsd crasher * Tue Feb 15 2005 Rex Dieter 6:3.3.92-0.2.kde - 3.3.92 * Mon Nov 29 2004 Rex Dieter 3.3.2-1.0.kde - 3.2.2 * Thu Nov 11 2004 Rex Dieter 3.3.1-1.0.kde - fc3 * Tue Oct 05 2004 Rex Dieter 3.3.1-0.0.kde - 3.3.1 * Wed Sep 29 2004 Rex Dieter 3.3.0-1.2.kde - BR: libtunepimp-devel (musicbrainz support for juk) * Wed Sep 08 2004 Rex Dieter 3.3.0-1.1.kde - include better/cleaner vorbis patch * Mon Aug 16 2004 Rex Dieter 3.3.0-1.0.kde - 3.3.0 - fix build (libvorbisenc linking) on rh90/el3 (kde bug #88106) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Mar 2006 12:39:28 -0000 1.1 +++ .cvsignore 31 Mar 2006 12:39:58 -0000 1.2 @@ -0,0 +1 @@ +kdemultimedia-3.5.1-patched.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/kdemultimedia-extras/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Mar 2006 12:39:28 -0000 1.1 +++ sources 31 Mar 2006 12:39:58 -0000 1.2 @@ -0,0 +1 @@ +31630864143d052b8f4342da0fa098fd kdemultimedia-3.5.1-patched.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 12:57:04 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 31 Mar 2006 05:57:04 -0700 Subject: rpms/snort/devel snort.spec,1.7,1.8 Message-ID: <200603311257.k2VCv6IR000482@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv465 Modified Files: snort.spec Log Message: make initscript not a config file Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- snort.spec 30 Mar 2006 04:52:00 -0000 1.7 +++ snort.spec 31 Mar 2006 12:57:03 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz @@ -283,7 +283,7 @@ rm -rf %{buildroot} fi -mkdir -p %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sysconfdir}/snort mkdir -p %{buildroot}/var/log/snort mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/etc/rc.d/init.d @@ -302,11 +302,10 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -mkdir %{buildroot}%{_sysconfdir}/snort install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d -perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf +perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort/snort.conf %clean @@ -369,8 +368,8 @@ # handle compressed man pages. %attr(755,root,root) %{_mandir}/man8/snort.8* %attr(755,root,root) %dir /var/log/snort -%attr(644,root,root) %config %{_sysconfdir}/* -%attr(755,root,root) %config /etc/rc.d/init.d/snortd +%attr(644,root,root) %config %{_sysconfdir}/snort +%attr(755,root,root) /etc/rc.d/init.d/snortd %files plain+flexresp %attr(755,root,root) %{_sbindir}/snort-plain+flexresp @@ -398,6 +397,10 @@ %changelog +* Fri Mar 31 3006 Dennis Gilmore - 2.4.4-3 +- make initscript not a config file +- own /etc/snort + * Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 - Add fedora README - do make clean to make sure that each configure runs properly From fedora-extras-commits at redhat.com Fri Mar 31 12:57:48 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 31 Mar 2006 05:57:48 -0700 Subject: rpms/snort/devel snort.spec,1.8,1.9 Message-ID: <200603311257.k2VCvo8W000564@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv508 Modified Files: snort.spec Log Message: make initscript not a config file Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/devel/snort.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- snort.spec 31 Mar 2006 12:57:03 -0000 1.8 +++ snort.spec 31 Mar 2006 12:57:48 -0000 1.9 @@ -397,7 +397,7 @@ %changelog -* Fri Mar 31 3006 Dennis Gilmore - 2.4.4-3 +* Fri Mar 31 2006 Dennis Gilmore - 2.4.4-3 - make initscript not a config file - own /etc/snort From fedora-extras-commits at redhat.com Fri Mar 31 12:58:53 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 31 Mar 2006 05:58:53 -0700 Subject: rpms/snort/FC-3 snort.spec,1.6,1.7 Message-ID: <200603311258.k2VCwtm2000629@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv612 Modified Files: snort.spec Log Message: make initscript not a config file Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-3/snort.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- snort.spec 30 Mar 2006 04:54:54 -0000 1.6 +++ snort.spec 31 Mar 2006 12:58:53 -0000 1.7 @@ -1,7 +1,7 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz @@ -283,7 +283,7 @@ rm -rf %{buildroot} fi -mkdir -p %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sysconfdir}/snort mkdir -p %{buildroot}/var/log/snort mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/etc/rc.d/init.d @@ -302,11 +302,10 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -mkdir %{buildroot}%{_sysconfdir}/snort install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d -perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf +perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort/snort.conf %clean @@ -369,8 +368,8 @@ # handle compressed man pages. %attr(755,root,root) %{_mandir}/man8/snort.8* %attr(755,root,root) %dir /var/log/snort -%attr(644,root,root) %config %{_sysconfdir}/* -%attr(755,root,root) %config /etc/rc.d/init.d/snortd +%attr(644,root,root) %config %{_sysconfdir}/snort +%attr(755,root,root) /etc/rc.d/init.d/snortd %files plain+flexresp %attr(755,root,root) %{_sbindir}/snort-plain+flexresp @@ -398,6 +397,10 @@ %changelog +* Fri Mar 31 2006 Dennis Gilmore - 2.4.4-3 +- make initscript not a config file +- own /etc/snort + * Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 - Add fedora README - do make clean to make sure that each configure runs properly From fedora-extras-commits at redhat.com Fri Mar 31 12:59:27 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 31 Mar 2006 05:59:27 -0700 Subject: rpms/snort/FC-4 snort.spec,1.7,1.8 Message-ID: <200603311259.k2VCxTN9000705@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv673 Modified Files: snort.spec Log Message: make initscript not a config file Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-4/snort.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- snort.spec 30 Mar 2006 04:56:43 -0000 1.7 +++ snort.spec 31 Mar 2006 12:59:27 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz @@ -283,7 +283,7 @@ rm -rf %{buildroot} fi -mkdir -p %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sysconfdir}/snort mkdir -p %{buildroot}/var/log/snort mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/etc/rc.d/init.d @@ -302,11 +302,10 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -mkdir %{buildroot}%{_sysconfdir}/snort install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d -perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf +perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort/snort.conf %clean @@ -369,8 +368,8 @@ # handle compressed man pages. %attr(755,root,root) %{_mandir}/man8/snort.8* %attr(755,root,root) %dir /var/log/snort -%attr(644,root,root) %config %{_sysconfdir}/* -%attr(755,root,root) %config /etc/rc.d/init.d/snortd +%attr(644,root,root) %config %{_sysconfdir}/snort +%attr(755,root,root) /etc/rc.d/init.d/snortd %files plain+flexresp %attr(755,root,root) %{_sbindir}/snort-plain+flexresp @@ -398,6 +397,10 @@ %changelog +* Fri Mar 31 2006 Dennis Gilmore - 2.4.4-3 +- make initscript not a config file +- own /etc/snort + * Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 - Add fedora README - do make clean to make sure that each configure runs properly From fedora-extras-commits at redhat.com Fri Mar 31 12:59:58 2006 From: fedora-extras-commits at redhat.com (Dennis Gilmore (ausil)) Date: Fri, 31 Mar 2006 05:59:58 -0700 Subject: rpms/snort/FC-5 snort.spec,1.7,1.8 Message-ID: <200603311300.k2VD0163000766@cvs-int.fedora.redhat.com> Author: ausil Update of /cvs/extras/rpms/snort/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv749 Modified Files: snort.spec Log Message: make initscript not a config file Index: snort.spec =================================================================== RCS file: /cvs/extras/rpms/snort/FC-5/snort.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- snort.spec 30 Mar 2006 04:59:26 -0000 1.7 +++ snort.spec 31 Mar 2006 12:59:58 -0000 1.8 @@ -1,7 +1,7 @@ Summary: Intrusion detection system Name: snort Version: 2.4.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Internet Source0: http://www.snort.org/dl/current/snort-%{version}.tar.gz @@ -283,7 +283,7 @@ rm -rf %{buildroot} fi -mkdir -p %{buildroot}%{_sysconfdir} +mkdir -p %{buildroot}%{_sysconfdir}/snort mkdir -p %{buildroot}/var/log/snort mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}/etc/rc.d/init.d @@ -302,11 +302,10 @@ } install snort.8 %{buildroot}%{_mandir}/man8 -mkdir %{buildroot}%{_sysconfdir}/snort install etc/reference.config etc/classification.config etc/snort.conf %{buildroot}%{_sysconfdir}/snort install %{SOURCE1} %{buildroot}/etc/rc.d/init.d -perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort.conf +perl -pi -e 's!var RULE_PATH ../rules!var RULE_PATH %{_sysconfdir}!' %{buildroot}%{_sysconfdir}/snort/snort.conf %clean @@ -369,8 +368,8 @@ # handle compressed man pages. %attr(755,root,root) %{_mandir}/man8/snort.8* %attr(755,root,root) %dir /var/log/snort -%attr(644,root,root) %config %{_sysconfdir}/* -%attr(755,root,root) %config /etc/rc.d/init.d/snortd +%attr(644,root,root) %config %{_sysconfdir}/snort +%attr(755,root,root) /etc/rc.d/init.d/snortd %files plain+flexresp %attr(755,root,root) %{_sbindir}/snort-plain+flexresp @@ -398,6 +397,10 @@ %changelog +* Fri Mar 31 2006 Dennis Gilmore - 2.4.4-3 +- make initscript not a config file +- own /etc/snort + * Wed Mar 29 2006 Dennis Gilmore - 2.4.4-2 - Add fedora README - do make clean to make sure that each configure runs properly From fedora-extras-commits at redhat.com Fri Mar 31 13:00:38 2006 From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter)) Date: Fri, 31 Mar 2006 06:00:38 -0700 Subject: rpms/Macaulay2/devel Macaulay2.desktop, 1.1, 1.2 Macaulay2.spec, 1.10, 1.11 Message-ID: <200603311300.k2VD0etQ000847@cvs-int.fedora.redhat.com> Author: rdieter Update of /cvs/extras/rpms/Macaulay2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv828 Modified Files: Macaulay2.desktop Macaulay2.spec Log Message: * Thu Mar 30 2006 Rex Dieter 0.9.2-21 - *really* disable %%check (fails on fc5+ anyway) * Fri Jan 20 2006 Rex Dieter 0.9.2-20 - .desktop: drop Category=Development - app icon: follow icon spec - drop -emacs subpkg (in main now) * Fri Sep 16 2005 Rex Dieter - 0.9.2-19 - disable 'make check' (fc5/buildsystem error), besides, we get a good consistency check when M2 builds all the doc examples. Index: Macaulay2.desktop =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- Macaulay2.desktop 8 Dec 2004 16:15:35 -0000 1.1 +++ Macaulay2.desktop 31 Mar 2006 13:00:38 -0000 1.2 @@ -5,5 +5,5 @@ SwallowTitle=Macaulay2 Terminal=true Type=Application -Categories=Application;Education;Math;Scientific;Development; +Categories=Application;Education;Math;Scientific; Encoding=UTF-8 Index: Macaulay2.spec =================================================================== RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- Macaulay2.spec 14 Sep 2005 14:55:50 -0000 1.10 +++ Macaulay2.spec 31 Mar 2006 13:00:38 -0000 1.11 @@ -6,7 +6,7 @@ Summary: System for algebraic geometry and commutative algebra Name: Macaulay2 Version: 0.9.2 -Release: 18%{?dist} +Release: 21%{?dist} License: GPL Group: Applications/Engineering URL: http://www.math.uiuc.edu/Macaulay2/ @@ -20,16 +20,19 @@ Patch1: Macaulay2-0.9-htmlview.patch Patch2: Macaulay2-0.9.2-static.patch Patch3: Macaulay2-0.9.2-gcc3.patch -# See http://bugzilla.fedora.us/attachment.cgi?id=877&action=view Patch4: Macaulay2-0.9.2-gcc34.patch Patch5: Macaulay2-0.9.2-gcc4.patch BuildRequires: desktop-file-utils -BuildRequires: gc-devel >= 6.6 +BuildRequires: gc-devel BuildRequires: factory-devel >= 2.0.5 BuildRequires: libfac-devel >= 2.0.5 BuildRequires: gdbm-devel BuildRequires: time +#BuildRequires: lapack-devel + +Obsoletes: %{name}-emacs < %{version}-%{release} +Provides: %{name}-emacs = %{version}-%{release} %description Macaulay 2 is a new software system devoted to supporting research in @@ -44,15 +47,6 @@ %description doc %{name} documentation. -%package emacs -Summary: %{name} emacs mode -Group: Applications/Editors -Requires: emacs -Requires: %{name} = %{version} -%description emacs -%{name} emacs mode. - - %prep %setup -q @@ -64,34 +58,33 @@ %patch3 -p1 -b .gcc3 # fc3/gcc34 fix %patch4 -p1 -b .gcc34 +# fc4/gcc4 fix %patch5 -p1 -b .gcc4 %build + %configure \ - --enable-gc-for-new \ --disable-dumpdata \ - --disable-optimize \ - --disable-static \ - %{?debug_package:--disable-strip} + --disable-optimize + +#TODO: --with-lapacklibs + +make -# not smp-safe -make -# Takes a *long* time, default off %check || : -%{!?_without_check:make check } +# NOTE: util/screen dies on fc5/buildsystem (could not open pty) +#make check ||: %install %makeinstall # Fix locations -perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \ - $RPM_BUILD_ROOT%{_bindir}/M2 -perl -pi -e "s at M2HOME=.*@M2HOME=%{m2home}@" \ - $RPM_BUILD_ROOT%{_bindir}/M2-help -perl -pi -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/* +sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2 +sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2-help +sed -i -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/* ## emacs files install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp @@ -99,18 +92,18 @@ $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/ # app img -install -p -D -m644 \ - %{SOURCE1} \ - $RPM_BUILD_ROOT%{_datadir}/pixmaps/Macaulay2.png +install -p -m644 -D %{SOURCE1} \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps/32x32/Macaulay2.png -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications desktop-file-install \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --vendor fedora \ --add-category "X-Fedora" \ %{SOURCE2} ## Unpackaged files +rm -f $RPM_BUILD_ROOT%{m2home}/setup # %doc stuff, no need to dup in appdir rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING} # created by make check @@ -129,38 +122,50 @@ # Handle possibly existing dumpdata #rm -f %{m2home}/libexec/Macaulay2-*-data ||: +%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 ||: + %files -%defattr(-,root,root) +%defattr(-,root,root,-) %doc Macaulay2/README Macaulay2/CHANGES %{_bindir}/M2 %{_datadir}/applications/*.desktop -%{_datadir}/pixmaps/*.png +%{_datadir}/icons/hicolor/*/*/* %dir %{m2home} -%{m2home}/cache -%{m2home}/libexec -%{m2home}/m2 -%{m2home}/packages -# Not needed/wanted -%exclude %{m2home}/setup - -%files emacs -%defattr(-,root,root) -%dir %{m2home}/emacs -%doc %{m2home}/emacs/*.m2 -%doc %{m2home}/emacs/*.txt -%doc %{m2home}/emacs/README -%{m2home}/emacs/*.el -%{_datadir}/emacs/site-lisp/*.el +%{m2home}/cache/ +%{m2home}/libexec/ +%{m2home}/m2/ +%{m2home}/packages/ +# emacs bits +%{m2home}/emacs/ +%{_datadir}/emacs/site-lisp/ %files doc -%defattr(-,root,root) +%defattr(-,root,root,-) %{_bindir}/M2-help -%{m2home}/html -%{m2home}/tutorial +%{m2home}/html/ +%{m2home}/tutorial/ %changelog +* Thu Mar 30 2006 Rex Dieter 0.9.2-21 +- *really* disable %%check (fails on fc5+ anyway) + +* Fri Jan 20 2006 Rex Dieter 0.9.2-20 +- .desktop: drop Category=Development +- app icon: follow icon spec +- drop -emacs subpkg (in main now) + +* Fri Sep 16 2005 Rex Dieter - 0.9.2-19 +- disable 'make check' (fc5/buildsystem error), besides, we get a + good consistency check when M2 builds all the doc examples. + * Wed Sep 14 2005 Rex Dieter - 0.9.2-18 - rebuild against gc-6.6 From fedora-extras-commits at redhat.com Fri Mar 31 13:18:42 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 06:18:42 -0700 Subject: rpms/wxPython/devel wxPython.spec,1.6,1.7 Message-ID: <200603311318.k2VDIiPv002956@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2937 Modified Files: wxPython.spec Log Message: buildrequires mesa-libGLU-devel Index: wxPython.spec =================================================================== RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- wxPython.spec 31 Mar 2006 02:23:27 -0000 1.6 +++ wxPython.spec 31 Mar 2006 13:18:42 -0000 1.7 @@ -4,7 +4,7 @@ Name: wxPython Version: 2.6.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: GUI toolkit for the Python programming language @@ -16,6 +16,7 @@ BuildRequires: wxGTK-devel = 2.6.3, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel +BuildRequires: mesa-libGLU-devel BuildRequires: python-devel, wxGTK-gl # packages should depend on "wxPython", not "wxPythonGTK2", but in case @@ -88,6 +89,9 @@ %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-2 +- buildrequires mesa-libGLU-devel + * Thu Mar 30 2006 Matthew Miller - 2.6.3.0-1 - update to 2.6.3.0 - wxGTK and wxPython versions are inexorably linked; make BuildRequires From fedora-extras-commits at redhat.com Fri Mar 31 14:02:06 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 07:02:06 -0700 Subject: rpms/php-extras/devel php-extras.spec,1.2,1.3 Message-ID: <200603311402.k2VE2g3L005095@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5078 Modified Files: php-extras.spec Log Message: Some guessing of troubles Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/php-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-extras.spec 30 Mar 2006 10:13:23 -0000 1.2 +++ php-extras.spec 31 Mar 2006 14:02:06 -0000 1.3 @@ -15,7 +15,7 @@ %define extdir %(php-config --extension-dir) -%define apiver %(echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) +%define apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) Name: php-extras From fedora-extras-commits at redhat.com Fri Mar 31 14:12:24 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 07:12:24 -0700 Subject: rpms/wxPython/devel wxPython.spec,1.7,1.8 Message-ID: <200603311412.k2VECQEh005277@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5260 Modified Files: wxPython.spec Log Message: Apparently wx.pth and wxversion.py don't belong in lib64. Index: wxPython.spec =================================================================== RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- wxPython.spec 31 Mar 2006 13:18:42 -0000 1.7 +++ wxPython.spec 31 Mar 2006 14:12:24 -0000 1.8 @@ -1,10 +1,11 @@ +%{!?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)")} %define buildflags WXPORT=gtk2 UNICODE=1 Name: wxPython Version: 2.6.3.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: GUI toolkit for the Python programming language @@ -72,8 +73,8 @@ %defattr(-,root,root,-) %doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples %{_bindir}/* -%{python_sitearch}/wx.pth -%{python_sitearch}/wxversion.py* +%{python_sitelib}/wx.pth +%{python_sitelib}/wxversion.py* %dir %{python_sitearch}/wx-2.6-gtk2-unicode/ %{python_sitearch}/wx-2.6-gtk2-unicode/wx %{python_sitearch}/wx-2.6-gtk2-unicode/wxPython @@ -89,6 +90,9 @@ %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-3 +- oh yeah -- wxversion.py not lib64. + * Fri Mar 31 2006 Matthew Miller - 2.6.3.0-2 - buildrequires mesa-libGLU-devel From fedora-extras-commits at redhat.com Fri Mar 31 14:13:49 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 07:13:49 -0700 Subject: rpms/wxPython/devel wxPython.spec,1.8,1.9 Message-ID: <200603311413.k2VEDpK0005367@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5349 Modified Files: wxPython.spec Log Message: Rel number bump. Sorry for noise. Index: wxPython.spec =================================================================== RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- wxPython.spec 31 Mar 2006 14:12:24 -0000 1.8 +++ wxPython.spec 31 Mar 2006 14:13:49 -0000 1.9 @@ -5,7 +5,7 @@ Name: wxPython Version: 2.6.3.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GUI toolkit for the Python programming language @@ -90,6 +90,9 @@ %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-4 +- grr. bump relnumber. + * Fri Mar 31 2006 Matthew Miller - 2.6.3.0-3 - oh yeah -- wxversion.py not lib64. From fedora-extras-commits at redhat.com Fri Mar 31 14:29:14 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 07:29:14 -0700 Subject: rpms/php-extras/devel php-extras.spec,1.3,1.4 Message-ID: <200603311429.k2VETGMg005494@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5477 Modified Files: php-extras.spec Log Message: Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/devel/php-extras.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- php-extras.spec 31 Mar 2006 14:02:06 -0000 1.3 +++ php-extras.spec 31 Mar 2006 14:29:13 -0000 1.4 @@ -22,7 +22,7 @@ Summary: Additional PHP modules from the standard PHP distribution #Version: %(php-config --version) Version: 5.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: The PHP License URL: http://www.php.net/ @@ -251,6 +251,9 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 5.1.2-3 +- ppc arch hack: change dir before %%apiver auto-detecting + * Sat Mar 25 2006 Dmitry Butskoy - 5.1.2-2 - Accepted for Fedora Extras (review by Tom "spot" Callaway ) From fedora-extras-commits at redhat.com Fri Mar 31 14:30:21 2006 From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc)) Date: Fri, 31 Mar 2006 07:30:21 -0700 Subject: rpms/php-extras/FC-5 php-extras.spec,1.2,1.3 Message-ID: <200603311430.k2VEUNHb005569@cvs-int.fedora.redhat.com> Author: buc Update of /cvs/extras/rpms/php-extras/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5552 Modified Files: php-extras.spec Log Message: Index: php-extras.spec =================================================================== RCS file: /cvs/extras/rpms/php-extras/FC-5/php-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- php-extras.spec 30 Mar 2006 10:14:04 -0000 1.2 +++ php-extras.spec 31 Mar 2006 14:30:21 -0000 1.3 @@ -15,14 +15,14 @@ %define extdir %(php-config --extension-dir) -%define apiver %(echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) +%define apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1) Name: php-extras Summary: Additional PHP modules from the standard PHP distribution #Version: %(php-config --version) Version: 5.1.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: Development/Languages License: The PHP License URL: http://www.php.net/ @@ -251,10 +251,13 @@ %changelog +* Fri Mar 31 2006 Dmitry Butskoy - 5.1.2-3 +- ppc arch hack: change dir before %%apiver auto-detecting + * Sat Mar 25 2006 Dmitry Butskoy - 5.1.2-2 - Accepted for Fedora Extras (review by Tom "spot" Callaway ) - + * Wed Mar 1 2006 Dmitry Butskoy - 5.1.2-2 - more accurate Requires for the main php (using php-api, provided now by the Core php package). From fedora-extras-commits at redhat.com Fri Mar 31 14:50:31 2006 From: fedora-extras-commits at redhat.com (Mark Cox (mjc)) Date: Fri, 31 Mar 2006 07:50:31 -0700 Subject: fedora-security/audit fc4,1.182,1.183 fc5,1.95,1.96 Message-ID: <200603311450.k2VEoVd4005694@cvs-int.fedora.redhat.com> Author: mjc Update of /cvs/fedora/fedora-security/audit In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5672 Modified Files: fc4 fc5 Log Message: Mailman Index: fc4 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc4,v retrieving revision 1.182 retrieving revision 1.183 diff -u -r1.182 -r1.183 --- fc4 31 Mar 2006 10:14:19 -0000 1.182 +++ fc4 31 Mar 2006 14:50:28 -0000 1.183 @@ -96,6 +96,7 @@ CVE-2006-0095 backport (kernel) [since FEDORA-2006-102] patch-2.6.15.5 CVE-2006-0082 version (ImageMagick, not 6.2.2.0) CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-194] +CVE-2006-0052 VULNERABLE (mailman, fixed 2.1.6) bz#187421 CVE-2006-0049 version (gnupg, fixed 1.4.2.2) [since FEDORA-2006-147] CVE-2006-0040 VULNERABLE (gtkhtml) CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) [since FEDORA-2006-077] patch-2.6.15.5 Index: fc5 =================================================================== RCS file: /cvs/fedora/fedora-security/audit/fc5,v retrieving revision 1.95 retrieving revision 1.96 diff -u -r1.95 -r1.96 --- fc5 31 Mar 2006 10:14:19 -0000 1.95 +++ fc5 31 Mar 2006 14:50:28 -0000 1.96 @@ -98,6 +98,7 @@ CVE-2006-0095 backport (kernel) patch-2.6.16-rc6 CVE-2006-0082 version (ImageMagick, not 6.2.5.4) CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-193] +CVE-2006-0052 version (mailman, fixed 2.1.6) CVE-2006-0049 version (gnupg, fixed 1.4.2.2) CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix CVE-2006-0037 backport (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 From fedora-extras-commits at redhat.com Fri Mar 31 14:52:20 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Fri, 31 Mar 2006 07:52:20 -0700 Subject: rpms/shorewall/devel .cvsignore, 1.12, 1.13 shorewall.spec, 1.18, 1.19 sources, 1.12, 1.13 Message-ID: <200603311452.k2VEqMl2005725@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5702 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.0.6 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Feb 2006 17:50:34 -0000 1.12 +++ .cvsignore 31 Mar 2006 14:52:20 -0000 1.13 @@ -1 +1 @@ -shorewall-3.0.5.tar.bz2 +shorewall-3.0.6.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- shorewall.spec 13 Feb 2006 17:50:34 -0000 1.18 +++ shorewall.spec 31 Mar 2006 14:52:20 -0000 1.19 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.0.5 +Version: 3.0.6 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -80,7 +80,10 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog -* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 +* Fri Mar 31 2006 Robert Marcano - 3.0.6-1 +- Update to upstream 3.0.6 + +* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 - Rebuild for Fedora Extras 5, Update to upstream 3.0.5 * Thu Jan 12 2006 Robert Marcano - 3.0.4-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/devel/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2006 17:50:34 -0000 1.12 +++ sources 31 Mar 2006 14:52:20 -0000 1.13 @@ -1 +1 @@ -a732c8589c4bbf6a6e83a72ff6a8bf1e shorewall-3.0.5.tar.bz2 +6228a86219881f015e02cefe2a6310a8 shorewall-3.0.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 15:18:27 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:18:27 -0700 Subject: rpms/tetex-tex4ht/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tetex-tex4ht.spec, 1.3, 1.4 Message-ID: <200603311518.k2VFIT92007931@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/tetex-tex4ht/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7910 Modified Files: .cvsignore sources tetex-tex4ht.spec Log Message: * Fri Mar 31 2006 Patrice Dumas - 1.0.2006_03_27_1822-1 - update Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2006 17:04:57 -0000 1.4 +++ .cvsignore 31 Mar 2006 15:18:26 -0000 1.5 @@ -1,2 +1,2 @@ -tex4ht-1.0.2006_02_15_1234.tar.gz +tex4ht-1.0.2006_03_27_1822.tar.gz tex4ht-all-20050228.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2006 17:04:57 -0000 1.4 +++ sources 31 Mar 2006 15:18:26 -0000 1.5 @@ -1,2 +1,2 @@ -b5924cd4da4faf6435d48d578d4023bd tex4ht-1.0.2006_02_15_1234.tar.gz +b43a5611e41d8049b4277fa48eafa141 tex4ht-1.0.2006_03_27_1822.tar.gz 26eb8df2d6631794b3df0d6fb87a0219 tex4ht-all-20050228.zip Index: tetex-tex4ht.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/devel/tetex-tex4ht.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tetex-tex4ht.spec 17 Feb 2006 17:04:57 -0000 1.3 +++ tetex-tex4ht.spec 31 Mar 2006 15:18:26 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Translates TeX and LaTeX into HTML or XML+MathML Name: tetex-tex4ht -Version: 1.0.2006_02_15_1234 +Version: 1.0.2006_03_27_1822 Release: 1%{?dist} License: LaTeX Project Public License Group: Applications/Publishing @@ -103,6 +103,9 @@ texhash > /dev/null 2>&1 || : %changelog +* Fri Mar 31 2006 Patrice Dumas - 1.0.2006_03_27_1822-1 +- update + * Fri Feb 17 2006 Patrice Dumas - 1.0.2006_02_15_1234-1 - update From fedora-extras-commits at redhat.com Fri Mar 31 15:21:55 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:21:55 -0700 Subject: rpms/perl-Text-CHM import.log,1.1,1.2 Message-ID: <200603311522.k2VFMRrp008048@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/perl-Text-CHM In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8014 Modified Files: import.log Log Message: auto-import perl-Text-CHM-0.01-1 on branch devel from perl-Text-CHM-0.01-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CHM/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 29 Mar 2006 15:09:52 -0000 1.1 +++ import.log 31 Mar 2006 15:21:55 -0000 1.2 @@ -0,0 +1 @@ +perl-Text-CHM-0_01-1:HEAD:perl-Text-CHM-0.01-1.src.rpm:1143822095 From fedora-extras-commits at redhat.com Fri Mar 31 15:21:55 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:21:55 -0700 Subject: rpms/perl-Text-CHM/devel perl-Text-CHM.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603311522.k2VFMSkl008052@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/perl-Text-CHM/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8014/devel Modified Files: .cvsignore sources Added Files: perl-Text-CHM.spec Log Message: auto-import perl-Text-CHM-0.01-1 on branch devel from perl-Text-CHM-0.01-1.src.rpm --- NEW FILE perl-Text-CHM.spec --- Name: perl-Text-CHM Version: 0.01 Release: 1%{?dist} Summary: Perl extension for handling MS Compiled HtmlHelp Files Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Text-CHM Source0: http://www.cpan.org/modules/by-module/Text/Text-CHM-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: chmlib-devel Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description Text::CHM is a module that implements a (partial) support for handling MS Compiled HtmlHelp Files (chm files for short) via CHMLib. Text::CHM allows you to open chm files, get their filelist, get the content of each file and close them; at the moment, no write support is available. %prep %setup -q -n Text-CHM-%{version} %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" 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 f -name '*.bs' -a -size 0 -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 README Changes %{perl_vendorarch}/auto/* %{perl_vendorarch}/Text/ %{_mandir}/man3/Text::CHM.3* %changelog * Sun Mar 12 2006 Patrice Dumas 0.01-1 - Fedora Extras submission Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CHM/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 29 Mar 2006 15:09:52 -0000 1.1 +++ .cvsignore 31 Mar 2006 15:21:55 -0000 1.2 @@ -0,0 +1 @@ +Text-CHM-0.01.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-CHM/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 29 Mar 2006 15:09:52 -0000 1.1 +++ sources 31 Mar 2006 15:21:55 -0000 1.2 @@ -0,0 +1 @@ +33dd0a2d9a22025bf39727e7c589faaa Text-CHM-0.01.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 15:28:48 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Fri, 31 Mar 2006 08:28:48 -0700 Subject: rpms/shorewall/FC-4 .cvsignore, 1.6, 1.7 shorewall.spec, 1.13, 1.14 sources, 1.6, 1.7 Message-ID: <200603311528.k2VFSoGL008199@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8162/FC-4 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.0.6, backport to FC-4 and 5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/.cvsignore,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- .cvsignore 13 Feb 2006 17:52:54 -0000 1.6 +++ .cvsignore 31 Mar 2006 15:28:48 -0000 1.7 @@ -1 +1 @@ -shorewall-3.0.5.tar.bz2 +shorewall-3.0.6.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/shorewall.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- shorewall.spec 13 Feb 2006 17:52:54 -0000 1.13 +++ shorewall.spec 31 Mar 2006 15:28:48 -0000 1.14 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.0.5 +Version: 3.0.6 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -80,7 +80,10 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog -* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 +* Fri Mar 31 2006 Robert Marcano - 3.0.6-1 +- Update to upstream 3.0.6 + +* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 - Rebuild for Fedora Extras 5, Update to upstream 3.0.5 * Thu Jan 12 2006 Robert Marcano - 3.0.4-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-4/sources,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- sources 13 Feb 2006 17:52:54 -0000 1.6 +++ sources 31 Mar 2006 15:28:48 -0000 1.7 @@ -1 +1 @@ -a732c8589c4bbf6a6e83a72ff6a8bf1e shorewall-3.0.5.tar.bz2 +6228a86219881f015e02cefe2a6310a8 shorewall-3.0.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 15:28:48 2006 From: fedora-extras-commits at redhat.com (Robert Marcano (robmv)) Date: Fri, 31 Mar 2006 08:28:48 -0700 Subject: rpms/shorewall/FC-5 .cvsignore, 1.12, 1.13 shorewall.spec, 1.18, 1.19 sources, 1.12, 1.13 Message-ID: <200603311528.k2VFSoun008205@cvs-int.fedora.redhat.com> Author: robmv Update of /cvs/extras/rpms/shorewall/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8162/FC-5 Modified Files: .cvsignore shorewall.spec sources Log Message: Update to upstream 3.0.6, backport to FC-4 and 5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/.cvsignore,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- .cvsignore 13 Feb 2006 17:50:34 -0000 1.12 +++ .cvsignore 31 Mar 2006 15:28:48 -0000 1.13 @@ -1 +1 @@ -shorewall-3.0.5.tar.bz2 +shorewall-3.0.6.tar.bz2 Index: shorewall.spec =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/shorewall.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- shorewall.spec 13 Feb 2006 17:50:34 -0000 1.18 +++ shorewall.spec 31 Mar 2006 15:28:48 -0000 1.19 @@ -1,5 +1,5 @@ Name: shorewall -Version: 3.0.5 +Version: 3.0.6 Release: 1%{?dist} Summary: Iptables-based firewall for Linux systems @@ -80,7 +80,10 @@ %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples %changelog -* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 +* Fri Mar 31 2006 Robert Marcano - 3.0.6-1 +- Update to upstream 3.0.6 + +* Mon Feb 13 2006 Robert Marcano - 3.0.5-1 - Rebuild for Fedora Extras 5, Update to upstream 3.0.5 * Thu Jan 12 2006 Robert Marcano - 3.0.4-1 Index: sources =================================================================== RCS file: /cvs/extras/rpms/shorewall/FC-5/sources,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- sources 13 Feb 2006 17:50:34 -0000 1.12 +++ sources 31 Mar 2006 15:28:48 -0000 1.13 @@ -1 +1 @@ -a732c8589c4bbf6a6e83a72ff6a8bf1e shorewall-3.0.5.tar.bz2 +6228a86219881f015e02cefe2a6310a8 shorewall-3.0.6.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 15:31:53 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 08:31:53 -0700 Subject: rpms/wxPythonGTK2/devel sources,1.2,NONE wxPython.spec,1.10,NONE Message-ID: <200603311531.k2VFVtlF008322@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPythonGTK2/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8307 Removed Files: sources wxPython.spec Log Message: removed -- moving this back to 'wxPython'. --- sources DELETED --- --- wxPython.spec DELETED --- From fedora-extras-commits at redhat.com Fri Mar 31 15:33:50 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:33:50 -0700 Subject: rpms/tetex-tex4ht/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tetex-tex4ht.spec, 1.1, 1.2 Message-ID: <200603311533.k2VFXqS6008386@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/tetex-tex4ht/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8328/FC-3 Modified Files: .cvsignore sources tetex-tex4ht.spec Log Message: Sync to devel (update to latest version) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Nov 2005 23:21:46 -0000 1.2 +++ .cvsignore 31 Mar 2006 15:33:50 -0000 1.3 @@ -1,2 +1,2 @@ -tex4ht-1.0.2005_11_06_1516.tar.gz +tex4ht-1.0.2006_03_27_1822.tar.gz tex4ht-all-20050228.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Nov 2005 23:21:46 -0000 1.2 +++ sources 31 Mar 2006 15:33:50 -0000 1.3 @@ -1,2 +1,2 @@ -9e32056c20f02f39986aef5f7cdbff09 tex4ht-1.0.2005_11_06_1516.tar.gz +b43a5611e41d8049b4277fa48eafa141 tex4ht-1.0.2006_03_27_1822.tar.gz 26eb8df2d6631794b3df0d6fb87a0219 tex4ht-all-20050228.zip Index: tetex-tex4ht.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-3/tetex-tex4ht.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-tex4ht.spec 15 Nov 2005 23:21:46 -0000 1.1 +++ tetex-tex4ht.spec 31 Mar 2006 15:33:50 -0000 1.2 @@ -2,8 +2,8 @@ Summary: Translates TeX and LaTeX into HTML or XML+MathML Name: tetex-tex4ht -Version: 1.0.2005_11_06_1516 -Release: 3%{?dist} +Version: 1.0.2006_03_27_1822 +Release: 1%{?dist} License: LaTeX Project Public License Group: Applications/Publishing URL: http://www.cse.ohio-state.edu/~gurari/TeX4ht/ @@ -11,7 +11,7 @@ # Source1 is only used for documentation # renamed to tex4ht-all-YYYYMMDD.zip - based on last timestamp in directory Source1: tex4ht-all-20050228.zip -# unversioned upstream source +# 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 @@ -103,6 +103,15 @@ texhash > /dev/null 2>&1 || : %changelog +* Fri Mar 31 2006 Patrice Dumas - 1.0.2006_03_27_1822-1 +- update + +* Fri Feb 17 2006 Patrice Dumas - 1.0.2006_02_15_1234-1 +- update + +* Thu Dec 22 2005 Patrice Dumas - 1.0.2005_12_21_0412-1 +- update + * Mon Nov 14 2005 Patrice Dumas - 1.0.2005_11_06_1516-3 - add Requires for ImageMagick From fedora-extras-commits at redhat.com Fri Mar 31 15:33:51 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:33:51 -0700 Subject: rpms/tetex-tex4ht/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tetex-tex4ht.spec, 1.1, 1.2 Message-ID: <200603311533.k2VFXrIA008390@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/tetex-tex4ht/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8328/FC-4 Modified Files: .cvsignore sources tetex-tex4ht.spec Log Message: Sync to devel (update to latest version) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 15 Nov 2005 23:21:46 -0000 1.2 +++ .cvsignore 31 Mar 2006 15:33:51 -0000 1.3 @@ -1,2 +1,2 @@ -tex4ht-1.0.2005_11_06_1516.tar.gz +tex4ht-1.0.2006_03_27_1822.tar.gz tex4ht-all-20050228.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 15 Nov 2005 23:21:46 -0000 1.2 +++ sources 31 Mar 2006 15:33:51 -0000 1.3 @@ -1,2 +1,2 @@ -9e32056c20f02f39986aef5f7cdbff09 tex4ht-1.0.2005_11_06_1516.tar.gz +b43a5611e41d8049b4277fa48eafa141 tex4ht-1.0.2006_03_27_1822.tar.gz 26eb8df2d6631794b3df0d6fb87a0219 tex4ht-all-20050228.zip Index: tetex-tex4ht.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-4/tetex-tex4ht.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- tetex-tex4ht.spec 15 Nov 2005 23:21:46 -0000 1.1 +++ tetex-tex4ht.spec 31 Mar 2006 15:33:51 -0000 1.2 @@ -2,8 +2,8 @@ Summary: Translates TeX and LaTeX into HTML or XML+MathML Name: tetex-tex4ht -Version: 1.0.2005_11_06_1516 -Release: 3%{?dist} +Version: 1.0.2006_03_27_1822 +Release: 1%{?dist} License: LaTeX Project Public License Group: Applications/Publishing URL: http://www.cse.ohio-state.edu/~gurari/TeX4ht/ @@ -11,7 +11,7 @@ # Source1 is only used for documentation # renamed to tex4ht-all-YYYYMMDD.zip - based on last timestamp in directory Source1: tex4ht-all-20050228.zip -# unversioned upstream source +# 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 @@ -103,6 +103,15 @@ texhash > /dev/null 2>&1 || : %changelog +* Fri Mar 31 2006 Patrice Dumas - 1.0.2006_03_27_1822-1 +- update + +* Fri Feb 17 2006 Patrice Dumas - 1.0.2006_02_15_1234-1 +- update + +* Thu Dec 22 2005 Patrice Dumas - 1.0.2005_12_21_0412-1 +- update + * Mon Nov 14 2005 Patrice Dumas - 1.0.2005_11_06_1516-3 - add Requires for ImageMagick From fedora-extras-commits at redhat.com Fri Mar 31 15:33:52 2006 From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus)) Date: Fri, 31 Mar 2006 08:33:52 -0700 Subject: rpms/tetex-tex4ht/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tetex-tex4ht.spec, 1.3, 1.4 Message-ID: <200603311533.k2VFXswi008398@cvs-int.fedora.redhat.com> Author: pertusus Update of /cvs/extras/rpms/tetex-tex4ht/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8328/FC-5 Modified Files: .cvsignore sources tetex-tex4ht.spec Log Message: Sync to devel (update to latest version) Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Feb 2006 17:04:57 -0000 1.4 +++ .cvsignore 31 Mar 2006 15:33:51 -0000 1.5 @@ -1,2 +1,2 @@ -tex4ht-1.0.2006_02_15_1234.tar.gz +tex4ht-1.0.2006_03_27_1822.tar.gz tex4ht-all-20050228.zip Index: sources =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Feb 2006 17:04:57 -0000 1.4 +++ sources 31 Mar 2006 15:33:51 -0000 1.5 @@ -1,2 +1,2 @@ -b5924cd4da4faf6435d48d578d4023bd tex4ht-1.0.2006_02_15_1234.tar.gz +b43a5611e41d8049b4277fa48eafa141 tex4ht-1.0.2006_03_27_1822.tar.gz 26eb8df2d6631794b3df0d6fb87a0219 tex4ht-all-20050228.zip Index: tetex-tex4ht.spec =================================================================== RCS file: /cvs/extras/rpms/tetex-tex4ht/FC-5/tetex-tex4ht.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- tetex-tex4ht.spec 17 Feb 2006 17:04:57 -0000 1.3 +++ tetex-tex4ht.spec 31 Mar 2006 15:33:51 -0000 1.4 @@ -2,7 +2,7 @@ Summary: Translates TeX and LaTeX into HTML or XML+MathML Name: tetex-tex4ht -Version: 1.0.2006_02_15_1234 +Version: 1.0.2006_03_27_1822 Release: 1%{?dist} License: LaTeX Project Public License Group: Applications/Publishing @@ -103,6 +103,9 @@ texhash > /dev/null 2>&1 || : %changelog +* Fri Mar 31 2006 Patrice Dumas - 1.0.2006_03_27_1822-1 +- update + * Fri Feb 17 2006 Patrice Dumas - 1.0.2006_02_15_1234-1 - update From fedora-extras-commits at redhat.com Fri Mar 31 16:28:27 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Fri, 31 Mar 2006 09:28:27 -0700 Subject: rpms/denyhosts/devel denyhosts.spec,1.29,1.30 Message-ID: <200603311628.k2VGSTKg011589@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11572 Modified Files: denyhosts.spec Log Message: * Fri Mar 31 2006 Jason L Tibbitts III - 2.2-4 - Fix permissions on plugins. Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- denyhosts.spec 31 Mar 2006 02:59:32 -0000 1.29 +++ denyhosts.spec 31 Mar 2006 16:28:27 -0000 1.30 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -47,6 +47,9 @@ # can include it as documentation. mv plugins/README.contrib . +# And the permissions are off as well +chmod +x plugins/* + %build %{__python} setup.py build @@ -144,6 +147,9 @@ %changelog +* Fri Mar 31 2006 Jason L Tibbitts III - 2.2-4 +- Fix permissions on plugins. + * Thu Mar 30 2006 Jason L Tibbitts III - 2.2-3 - Switch from $RPM_BUILD_ROOT to %{buildroot} (looks cleaner). - Rename the main executable from denyhosts.py to denyhosts. From fedora-extras-commits at redhat.com Fri Mar 31 16:52:18 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 31 Mar 2006 09:52:18 -0700 Subject: rpms/perl-Text-WikiFormat/FC-4 .cvsignore, 1.3, 1.4 perl-Text-WikiFormat.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603311652.k2VGqKXR011829@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11776/FC-4 Modified Files: .cvsignore perl-Text-WikiFormat.spec sources Log Message: Update to 0.78. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Dec 2005 02:08:10 -0000 1.3 +++ .cvsignore 31 Mar 2006 16:52:18 -0000 1.4 @@ -1 +1 @@ -Text-WikiFormat-0.77.tar.gz +Text-WikiFormat-0.78.tar.gz Index: perl-Text-WikiFormat.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/perl-Text-WikiFormat.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Text-WikiFormat.spec 29 Dec 2005 02:08:10 -0000 1.2 +++ perl-Text-WikiFormat.spec 31 Mar 2006 16:52:18 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Text-WikiFormat -Version: 0.77 +Version: 0.78 Release: 1%{?dist} Summary: Translate Wiki formatted text into other formats @@ -13,8 +13,9 @@ BuildRequires: perl BuildRequires: perl(Module::Build) BuildRequires: perl(URI::Escape) +BuildRequires: perl(Scalar::Util) >= 1.14 BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description The original Wiki web site had a very simple interface to edit and to @@ -40,8 +41,8 @@ %check -mv t/0-signature.t t/0.signature.t.skip -./Build test +mv t/developer/0-signature.t t/developer/0-signature.t.disable +PERL_RUN_ALL_TESTS=1 ./Build test %clean @@ -56,6 +57,12 @@ %changelog +* Fri Mar 31 2006 Jose Pedro Oliveira - 0.78-1 +- Update to 0.78. + +* Mon Feb 20 2006 Jose Pedro Oliveira - 0.77-2 +- Rebuild for FC5 (perl 5.8.8). + * Thu Dec 29 2005 Jose Pedro Oliveira - 0.77-1 - Update to 0.77. Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Dec 2005 02:08:10 -0000 1.3 +++ sources 31 Mar 2006 16:52:18 -0000 1.4 @@ -1 +1 @@ -1264c90c76320a51ba61089b6a201e03 Text-WikiFormat-0.77.tar.gz +646c0ea411247a0293eb69a216451beb Text-WikiFormat-0.78.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 16:52:18 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 31 Mar 2006 09:52:18 -0700 Subject: rpms/perl-Text-WikiFormat/FC-5 .cvsignore, 1.3, 1.4 perl-Text-WikiFormat.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603311652.k2VGqLRo011835@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11776/FC-5 Modified Files: .cvsignore perl-Text-WikiFormat.spec sources Log Message: Update to 0.78. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-5/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Dec 2005 02:08:34 -0000 1.3 +++ .cvsignore 31 Mar 2006 16:52:18 -0000 1.4 @@ -1 +1 @@ -Text-WikiFormat-0.77.tar.gz +Text-WikiFormat-0.78.tar.gz Index: perl-Text-WikiFormat.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-5/perl-Text-WikiFormat.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Text-WikiFormat.spec 20 Feb 2006 19:32:32 -0000 1.3 +++ perl-Text-WikiFormat.spec 31 Mar 2006 16:52:18 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Text-WikiFormat -Version: 0.77 -Release: 2%{?dist} +Version: 0.78 +Release: 1%{?dist} Summary: Translate Wiki formatted text into other formats Group: Development/Libraries @@ -13,6 +13,7 @@ BuildRequires: perl BuildRequires: perl(Module::Build) BuildRequires: perl(URI::Escape) +BuildRequires: perl(Scalar::Util) >= 1.14 BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -40,8 +41,8 @@ %check -mv t/0-signature.t t/0.signature.t.skip -./Build test +mv t/developer/0-signature.t t/developer/0-signature.t.disable +PERL_RUN_ALL_TESTS=1 ./Build test %clean @@ -56,6 +57,9 @@ %changelog +* Fri Mar 31 2006 Jose Pedro Oliveira - 0.78-1 +- Update to 0.78. + * Mon Feb 20 2006 Jose Pedro Oliveira - 0.77-2 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Dec 2005 02:08:34 -0000 1.3 +++ sources 31 Mar 2006 16:52:18 -0000 1.4 @@ -1 +1 @@ -1264c90c76320a51ba61089b6a201e03 Text-WikiFormat-0.77.tar.gz +646c0ea411247a0293eb69a216451beb Text-WikiFormat-0.78.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 16:52:19 2006 From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo)) Date: Fri, 31 Mar 2006 09:52:19 -0700 Subject: rpms/perl-Text-WikiFormat/devel .cvsignore, 1.3, 1.4 perl-Text-WikiFormat.spec, 1.3, 1.4 sources, 1.3, 1.4 Message-ID: <200603311652.k2VGqLkM011841@cvs-int.fedora.redhat.com> Author: jpo Update of /cvs/extras/rpms/perl-Text-WikiFormat/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11776/devel Modified Files: .cvsignore perl-Text-WikiFormat.spec sources Log Message: Update to 0.78. Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 29 Dec 2005 02:08:34 -0000 1.3 +++ .cvsignore 31 Mar 2006 16:52:19 -0000 1.4 @@ -1 +1 @@ -Text-WikiFormat-0.77.tar.gz +Text-WikiFormat-0.78.tar.gz Index: perl-Text-WikiFormat.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/perl-Text-WikiFormat.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- perl-Text-WikiFormat.spec 20 Feb 2006 19:32:32 -0000 1.3 +++ perl-Text-WikiFormat.spec 31 Mar 2006 16:52:19 -0000 1.4 @@ -1,6 +1,6 @@ Name: perl-Text-WikiFormat -Version: 0.77 -Release: 2%{?dist} +Version: 0.78 +Release: 1%{?dist} Summary: Translate Wiki formatted text into other formats Group: Development/Libraries @@ -13,6 +13,7 @@ BuildRequires: perl BuildRequires: perl(Module::Build) BuildRequires: perl(URI::Escape) +BuildRequires: perl(Scalar::Util) >= 1.14 BuildRequires: perl(Test::Pod), perl(Test::Pod::Coverage) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -40,8 +41,8 @@ %check -mv t/0-signature.t t/0.signature.t.skip -./Build test +mv t/developer/0-signature.t t/developer/0-signature.t.disable +PERL_RUN_ALL_TESTS=1 ./Build test %clean @@ -56,6 +57,9 @@ %changelog +* Fri Mar 31 2006 Jose Pedro Oliveira - 0.78-1 +- Update to 0.78. + * Mon Feb 20 2006 Jose Pedro Oliveira - 0.77-2 - Rebuild for FC5 (perl 5.8.8). Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Text-WikiFormat/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 29 Dec 2005 02:08:34 -0000 1.3 +++ sources 31 Mar 2006 16:52:19 -0000 1.4 @@ -1 +1 @@ -1264c90c76320a51ba61089b6a201e03 Text-WikiFormat-0.77.tar.gz +646c0ea411247a0293eb69a216451beb Text-WikiFormat-0.78.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 18:01:08 2006 From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs)) Date: Fri, 31 Mar 2006 11:01:08 -0700 Subject: rpms/perl-X11-Protocol/FC-3 .cvsignore, 1.2, 1.3 perl-X11-Protocol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603311801.k2VI1eKr016134@cvs-int.fedora.redhat.com> Author: duncs Update of /cvs/extras/rpms/perl-X11-Protocol/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16079 Modified Files: .cvsignore perl-X11-Protocol.spec sources Log Message: Updated to 0.55 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-3/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Sep 2005 10:29:51 -0000 1.2 +++ .cvsignore 31 Mar 2006 18:01:07 -0000 1.3 @@ -1 +1 @@ -X11-Protocol-0.54.tar.gz +X11-Protocol-0.55.tar.gz Index: perl-X11-Protocol.spec =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-3/perl-X11-Protocol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-X11-Protocol.spec 10 Sep 2005 10:29:51 -0000 1.1 +++ perl-X11-Protocol.spec 31 Mar 2006 18:01:07 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-X11-Protocol -Version: 0.54 -Release: 2%{?dist} +Version: 0.55 +Release: 1%{?dist} Summary: X11-Protocol - Raw interface to X Window System servers Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/X11-Protocol/ -Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.54.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.55.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -69,6 +69,9 @@ %changelog +* Fri Mar 31 2006 Duncan Ferguson 0.55-1 +- Update to new version of X11::Protocol + * Fri Aug 26 2005 Paul Howarth 0.54-2 - remove redundant BR: perl - remove compiler optimization flags, redundant for noarch package Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2005 10:29:51 -0000 1.2 +++ sources 31 Mar 2006 18:01:07 -0000 1.3 @@ -1 +1 @@ -b2ad4dc41755f2b08f9cd2899636346c X11-Protocol-0.54.tar.gz +3d914cb8945105a8b96ec1497dee47e2 X11-Protocol-0.55.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 18:04:06 2006 From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs)) Date: Fri, 31 Mar 2006 11:04:06 -0700 Subject: rpms/perl-X11-Protocol/FC-4 .cvsignore, 1.2, 1.3 perl-X11-Protocol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603311804.k2VI48YC016255@cvs-int.fedora.redhat.com> Author: duncs Update of /cvs/extras/rpms/perl-X11-Protocol/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16234 Modified Files: .cvsignore perl-X11-Protocol.spec sources Log Message: Updated to 0.55 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-4/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Sep 2005 10:29:51 -0000 1.2 +++ .cvsignore 31 Mar 2006 18:04:06 -0000 1.3 @@ -1 +1 @@ -X11-Protocol-0.54.tar.gz +X11-Protocol-0.55.tar.gz Index: perl-X11-Protocol.spec =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-4/perl-X11-Protocol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-X11-Protocol.spec 10 Sep 2005 10:29:51 -0000 1.1 +++ perl-X11-Protocol.spec 31 Mar 2006 18:04:06 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-X11-Protocol -Version: 0.54 -Release: 2%{?dist} +Version: 0.55 +Release: 1%{?dist} Summary: X11-Protocol - Raw interface to X Window System servers Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/X11-Protocol/ -Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.54.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.55.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -69,6 +69,9 @@ %changelog +* Fri Mar 31 2006 Duncan Ferguson 0.55-1 +- Update to new version of X11::Protocol + * Fri Aug 26 2005 Paul Howarth 0.54-2 - remove redundant BR: perl - remove compiler optimization flags, redundant for noarch package Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2005 10:29:51 -0000 1.2 +++ sources 31 Mar 2006 18:04:06 -0000 1.3 @@ -1 +1 @@ -b2ad4dc41755f2b08f9cd2899636346c X11-Protocol-0.54.tar.gz +3d914cb8945105a8b96ec1497dee47e2 X11-Protocol-0.55.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 18:07:02 2006 From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs)) Date: Fri, 31 Mar 2006 11:07:02 -0700 Subject: rpms/perl-X11-Protocol/devel .cvsignore, 1.2, 1.3 perl-X11-Protocol.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603311807.k2VI74fM016370@cvs-int.fedora.redhat.com> Author: duncs Update of /cvs/extras/rpms/perl-X11-Protocol/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16349 Modified Files: .cvsignore perl-X11-Protocol.spec sources Log Message: Updated to 0.55 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 10 Sep 2005 10:29:51 -0000 1.2 +++ .cvsignore 31 Mar 2006 18:07:02 -0000 1.3 @@ -1 +1 @@ -X11-Protocol-0.54.tar.gz +X11-Protocol-0.55.tar.gz Index: perl-X11-Protocol.spec =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/perl-X11-Protocol.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-X11-Protocol.spec 10 Sep 2005 10:29:51 -0000 1.1 +++ perl-X11-Protocol.spec 31 Mar 2006 18:07:02 -0000 1.2 @@ -1,12 +1,12 @@ Name: perl-X11-Protocol -Version: 0.54 -Release: 2%{?dist} +Version: 0.55 +Release: 1%{?dist} Summary: X11-Protocol - Raw interface to X Window System servers Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/X11-Protocol/ -Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.54.tar.gz +Source0: http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.55.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -69,6 +69,9 @@ %changelog +* Fri Mar 31 2006 Duncan Ferguson 0.55-1 +- Update to new version of X11::Protocol + * Fri Aug 26 2005 Paul Howarth 0.54-2 - remove redundant BR: perl - remove compiler optimization flags, redundant for noarch package Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 10 Sep 2005 10:29:51 -0000 1.2 +++ sources 31 Mar 2006 18:07:02 -0000 1.3 @@ -1 +1 @@ -b2ad4dc41755f2b08f9cd2899636346c X11-Protocol-0.54.tar.gz +3d914cb8945105a8b96ec1497dee47e2 X11-Protocol-0.55.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 18:15:44 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 11:15:44 -0700 Subject: rpms/dia/devel dia-0.95-pre6-help.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 dia.spec, 1.6, 1.7 sources, 1.1, 1.2 dia-0.94-gcc4.patch, 1.1, NONE dia-0.94-gnomeflags.patch, 1.1, NONE dia-0.94-help.patch, 1.2, NONE dia-0.94-rh165337.patch, 1.1, NONE dia-0.94-svgimport-fix.patch, 1.1, NONE Message-ID: <200603311815.k2VIFkvR016470@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16446 Modified Files: .cvsignore dia.spec sources Added Files: dia-0.95-pre6-help.patch Removed Files: dia-0.94-gcc4.patch dia-0.94-gnomeflags.patch dia-0.94-help.patch dia-0.94-rh165337.patch dia-0.94-svgimport-fix.patch Log Message: * Fri Mar 31 2006 Hans de Goede 1:0.95-0.pre7.1 - Taking over as FE maintainer (bz 185886) - Cleanup spec to match FE packaging guidelines - Bump to upstream 0.95-pre7 (bz 184548) - Enable python plugin dia-0.95-pre6-help.patch: --- NEW FILE dia-0.95-pre6-help.patch --- --- dia-0.95-pre6/app/commands.c.help 2006-01-27 18:48:45.000000000 +0100 +++ dia-0.95-pre6/app/commands.c 2006-03-22 16:37:25.000000000 +0100 @@ -526,7 +526,7 @@ const char *dentry; GError *error = NULL; - helpdir = dia_get_data_directory("help"); + helpdir = g_strdup ("/usr/share/gnome/help/dia"); if (!helpdir) { message_warning(_("Could not find help directory")); return; @@ -554,11 +554,11 @@ G_DIR_SEPARATOR_S "dia-manual.chm", NULL); if (!g_file_test(helpindex, G_FILE_TEST_EXISTS)) { helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry, - G_DIR_SEPARATOR_S "index.html", NULL); + G_DIR_SEPARATOR_S "dia.xml", NULL); } #else helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry, - G_DIR_SEPARATOR_S "index.html", NULL); + G_DIR_SEPARATOR_S "dia.xml", NULL); #endif bestscore = score; } @@ -575,7 +575,7 @@ ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL); #else command = getenv("BROWSER"); - command = g_strdup_printf("%s 'file://%s' &", command ? command : "gnome-open", helpindex); + command = g_strdup_printf("%s '%s' &", command ? command : "yelp", helpindex); system(command); g_free(command); #endif --- dia-0.95-pre6/doc/en/dia.xml.help 2006-03-22 16:33:12.000000000 +0100 +++ dia-0.95-pre6/doc/en/dia.xml 2006-03-22 16:33:13.000000000 +0100 @@ -5,7 +5,7 @@ Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/dia/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 17 Oct 2005 10:54:39 -0000 1.1 +++ .cvsignore 31 Mar 2006 18:15:44 -0000 1.2 @@ -1 +1 @@ -dia-0.94.tar.bz2 +dia-0.95-pre7.tar.bz2 Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dia.spec 3 Jan 2006 14:17:55 -0000 1.6 +++ dia.spec 31 Mar 2006 18:15:44 -0000 1.7 @@ -1,40 +1,23 @@ -%define pango_version 1.1.5 -%define freetype_version 2.0.9 -%define libxml2_version 2.3.9 - Name: dia -Summary: A diagram drawing program. -Version: 0.94 -Release: 19 +Version: 0.95 +%define pre pre7 +Release: 0.%{pre}.1%{?dist} Epoch: 1 -Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2 +Summary: A diagram drawing program. Group: Applications/Multimedia License: GPL -URL: http://www.lysator.liu.se/~alla/dia/ +URL: http://www.gnome.org/projects/dia/ +Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}-%{pre}.tar.bz2 +Patch1: dia-0.92.2-dtd.patch +Patch2: dia-0.95-pre6-help.patch +Patch3: dia-0.94-fallbacktoxpmicons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: libxml2 >= %{libxml2_version}, pango >= %{pango_version} -Requires: glib2, gtk2, libgnome, libgnomeui, libart_lgpl, libxslt -Requires: scrollkeeper, freetype >= %{freetype_version} +BuildRequires: intltool libgnomeui-devel python-devel pygtk2-devel +BuildRequires: docbook-utils docbook-style-dsssl docbook-style-xsl Requires: /usr/share/desktop-menu-patches/redhat-diagrams.desktop Requires(post): /usr/bin/scrollkeeper-update Requires(postun): /usr/bin/scrollkeeper-update -BuildRequires: libxml2-devel >= %{libxml2_version}, intltool > 0.21 -BuildRequires: pango-devel >= %{pango_version} -BuildRequires: freetype-devel >= %{freetype_version} -BuildRequires: glib2-devel, gtk2-devel, libgnome-devel, libgnomeui-devel -BuildRequires: docbook-utils docbook-dtds docbook-style-dsssl docbook-style-xsl -BuildRequires: openjade, libpng-devel, automake17, libart_lgpl-devel, -BuildRequires: libxslt-devel, libgnome-devel - -Patch0: dia-0.94-svgimport-fix.patch -Patch1: dia-0.92.2-dtd.patch -Patch2: dia-0.94-help.patch -Patch3: dia-0.94-gcc4.patch -Patch4: dia-0.94-fallbacktoxpmicons.patch -Patch5: dia-0.94-rh165337.patch -Patch6: dia-0.94-gnomeflags.patch - %description The Dia drawing program is designed to be like the Windows(TM) Visio program. Dia can be used to draw different types of diagrams, and @@ -43,29 +26,20 @@ save diagrams to a custom file format, can load and save in .xml format, and can export to PostScript(TM). -%prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -b .svgimportfix +%prep +%setup -q -n %{name}-%{version}-%{pre} %patch1 -p1 -b .dtd %patch2 -p1 -b .help -%patch3 -p1 -b .gcc4 -%patch4 -p1 -b .fallbacktoxpmicons -%patch5 -p1 -b .rh165337 -%patch6 -p1 -b .gnomeflags +%patch3 -p1 -b .fallbacktoxpmicons +#rm doc/*/dia.1 + %build -rm doc/*/dia.1 -aclocal-1.7 -libtoolize --force -automake-1.7 -autoconf -%configure --enable-gnome --enable-db2html --with-cairo=no - -export GNOME_CFLAGS=`pkg-config --cflags libgnomeui-2.0 libgnome-2.0` -export GNOME_LIBS=`pkg-config --libs libgnomeui-2.0 libgnome-2.0` -CFLAGS=$RPM_OPT_FLAGS make +%configure --enable-gnome --enable-db2html --with-python +make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT %makeinstall @@ -94,15 +68,18 @@ # kill the plugin rm -f $RPM_BUILD_ROOT%{_libdir}/dia/libcairo* + %post scrollkeeper-update %postun scrollkeeper-update + %clean rm -fr $RPM_BUILD_ROOT + %files -f %{name}.lang %defattr(-,root,root) %doc AUTHORS COPYING ChangeLog KNOWN_BUGS INSTALL NEWS README TODO THANKS doc/custom-shapes doc/diagram.dtd doc/shape.dtd doc/sheet.dtd @@ -116,7 +93,14 @@ %{_datadir}/mime-info/* %{_datadir}/pixmaps/* + %changelog +* Fri Mar 31 2006 Hans de Goede 1:0.95-0.pre7.1 +- Taking over as FE maintainer (bz 185886) +- Cleanup spec to match FE packaging guidelines +- Bump to upstream 0.95-pre7 (bz 184548) +- Enable python plugin + * Tue Jan 03 2006 Caolan McNamara 1:0.94-19 - make buildable @@ -312,6 +296,3 @@ * Wed Apr 28 1999 Preston Brown - initial build for Powertools 6.0 - - - Index: sources =================================================================== RCS file: /cvs/extras/rpms/dia/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 17 Oct 2005 10:54:39 -0000 1.1 +++ sources 31 Mar 2006 18:15:44 -0000 1.2 @@ -1 +1 @@ -63584224912dab49fed8d2cf87ea2d85 dia-0.94.tar.bz2 +c0b982162764933da17fdbfa9695408b dia-0.95-pre7.tar.bz2 --- dia-0.94-gcc4.patch DELETED --- --- dia-0.94-gnomeflags.patch DELETED --- --- dia-0.94-help.patch DELETED --- --- dia-0.94-rh165337.patch DELETED --- --- dia-0.94-svgimport-fix.patch DELETED --- From fedora-extras-commits at redhat.com Fri Mar 31 18:44:56 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 11:44:56 -0700 Subject: rpms/wxGTK/devel wxGTK.spec,1.18,1.19 Message-ID: <200603311844.k2VIiwFj016573@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxGTK/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16556/devel Modified Files: wxGTK.spec Log Message: mesa-*-devel -> just *-devel Index: wxGTK.spec =================================================================== RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- wxGTK.spec 29 Mar 2006 20:59:01 -0000 1.18 +++ wxGTK.spec 31 Mar 2006 18:44:56 -0000 1.19 @@ -6,7 +6,7 @@ Name: wxGTK Version: 2.6.3 -Release: 0%{?dist} +Release: 1%{?dist} Summary: GTK2 port of the wxWidgets GUI library # The wxWindows licence is the LGPL with a specific exemption allowing # distribution of derived binaries under any terms. (This will eventually @@ -20,7 +20,7 @@ BuildRequires: gtk2-devel, zlib-devel >= 1.1.4 BuildRequires: libpng-devel, libjpeg-devel, libtiff-devel BuildRequires: expat-devel, SDL-devel, libgnomeprintui22-devel -BuildRequires: mesa-libGL-devel, mesa-libGLU-devel +BuildRequires: libGL-devel, libGLU-devel %if %{withodbc} BuildRequires: unixODBC-devel %endif @@ -190,7 +190,11 @@ %endif %changelog -* Sat Mar 25 2006 Matthew Miller - 2.6.3-1 +* Fri May 31 2006 Matthwe Miller - 2.6.3-1 +- mesa-*-devel buildrequires to just *-devel, for building on FC4 and + for The Future + +* Sat Mar 25 2006 Matthew Miller - 2.6.3-0 - 2.6.3 final - remove the locale_install thing -- that was just an issue with using the release candidate. From fedora-extras-commits at redhat.com Fri Mar 31 18:46:12 2006 From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm)) Date: Fri, 31 Mar 2006 11:46:12 -0700 Subject: rpms/wxPython/devel wxPython.spec,1.9,1.10 Message-ID: <200603311846.k2VIkEeB016606@cvs-int.fedora.redhat.com> Author: mattdm Update of /cvs/extras/rpms/wxPython/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16589 Modified Files: wxPython.spec Log Message: mesa-*-devel -> just *-devel Index: wxPython.spec =================================================================== RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- wxPython.spec 31 Mar 2006 14:13:49 -0000 1.9 +++ wxPython.spec 31 Mar 2006 18:46:12 -0000 1.10 @@ -5,7 +5,7 @@ Name: wxPython Version: 2.6.3.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: GUI toolkit for the Python programming language @@ -17,7 +17,7 @@ BuildRequires: wxGTK-devel = 2.6.3, pkgconfig BuildRequires: zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel -BuildRequires: mesa-libGLU-devel +BuildRequires: libGLU-devel BuildRequires: python-devel, wxGTK-gl # packages should depend on "wxPython", not "wxPythonGTK2", but in case @@ -90,6 +90,9 @@ %changelog +* Fri Mar 31 2006 Matthew Miller - 2.6.3.0-5 +- mesa-libGLU-devel -> libGLU-devel, for FC4 and for The Future + * Fri Mar 31 2006 Matthew Miller - 2.6.3.0-4 - grr. bump relnumber. From fedora-extras-commits at redhat.com Fri Mar 31 18:58:02 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 11:58:02 -0700 Subject: rpms/dia/FC-5 dia.spec,1.6,1.7 Message-ID: <200603311858.k2VIw5rj016677@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16660 Modified Files: dia.spec Log Message: * Fri Mar 31 2006 Hans de Goede 1:0.94-20 - Taking over as new FE maintainer - Rebuild for bz 185886 Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- dia.spec 3 Jan 2006 14:17:55 -0000 1.6 +++ dia.spec 31 Mar 2006 18:58:02 -0000 1.7 @@ -5,7 +5,7 @@ Name: dia Summary: A diagram drawing program. Version: 0.94 -Release: 19 +Release: 20 Epoch: 1 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2 Group: Applications/Multimedia @@ -117,6 +117,10 @@ %{_datadir}/pixmaps/* %changelog +* Fri Mar 31 2006 Hans de Goede 1:0.94-20 +- Taking over as new FE maintainer +- Rebuild for bz 185886 + * Tue Jan 03 2006 Caolan McNamara 1:0.94-19 - make buildable From fedora-extras-commits at redhat.com Fri Mar 31 19:47:01 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Fri, 31 Mar 2006 12:47:01 -0700 Subject: rpms/denyhosts/devel denyhosts-2.2-daemon-control.patch, 1.1, 1.2 denyhosts.spec, 1.30, 1.31 Message-ID: <200603311947.k2VJl3Tc018880@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18858 Modified Files: denyhosts-2.2-daemon-control.patch denyhosts.spec Log Message: * Fri Mar 31 2006 Jason L Tibbitts III - 2.2-5 - Revert renaming of the denyhosts.py script denyhosts-2.2-daemon-control.patch: Index: denyhosts-2.2-daemon-control.patch =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts-2.2-daemon-control.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- denyhosts-2.2-daemon-control.patch 31 Mar 2006 02:59:32 -0000 1.1 +++ denyhosts-2.2-daemon-control.patch 31 Mar 2006 19:47:01 -0000 1.2 @@ -1,23 +1,11 @@ --- daemon-control-dist.daemon-control 2006-02-07 21:37:51.000000000 -0600 -+++ daemon-control-dist 2006-03-30 19:49:23.200435174 -0600 -@@ -11,9 +11,9 @@ - #### Edit these to suit your configuration #### - ############################################### ++++ daemon-control-dist 2006-03-31 11:14:51.816095607 -0600 +@@ -13,7 +13,7 @@ --DENYHOSTS_BIN = "/usr/bin/denyhosts.py" -+DENYHOSTS_BIN = "/usr/bin/denyhosts" + DENYHOSTS_BIN = "/usr/bin/denyhosts.py" DENYHOSTS_LOCK = "/var/lock/subsys/denyhosts" -DENYHOSTS_CFG = "/usr/share/denyhosts/denyhosts.cfg" +DENYHOSTS_CFG = "/etc/denyhosts.conf" ############################################### -@@ -35,7 +35,7 @@ - print "Usage: %s {start [args...] | stop | restart [args...] | status | debug | condrestart [args...] }" % sys.argv[0] - print - print "For a list of valid 'args' refer to:" -- print "$ denyhosts.py --help" -+ print "$ denyhosts --help" - print - sys.exit(0) - Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- denyhosts.spec 31 Mar 2006 16:28:27 -0000 1.30 +++ denyhosts.spec 31 Mar 2006 19:47:01 -0000 1.31 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.2 -Release: 4%{?dist} +Release: 5%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -85,9 +85,11 @@ touch %{buildroot}/%{_localstatedir}/lib/denyhosts/$i done -# RPM will byte-compile this for us if we leave the .py extension. It -# looks cleaner without it, so we'll rename it. -mv %{buildroot}/%{_bindir}/denyhosts.py %{buildroot}/%{_bindir}/denyhosts +# FC-4 and earlier won't create these automatically; create them here +# so that the %exclude below doesn't fail +touch %{buildroot}/%{_bindir}/denyhosts.pyc +touch %{buildroot}/%{_bindir}/denyhosts.pyo + %clean rm -rf %{buildroot} @@ -114,7 +116,8 @@ %doc CHANGELOG.txt denyhosts.cfg-dist LICENSE.txt %doc README.fedora README.txt setup.py README.contrib -%{_bindir}/denyhosts +%{_bindir}/denyhosts.py +%exclude %{_bindir}/denyhosts.py[co] %{_bindir}/denyhosts-control %{_datadir}/denyhosts @@ -147,6 +150,9 @@ %changelog +* Fri Mar 31 2006 Jason L Tibbitts III - 2.2-5 +- Revert renaming of the denyhosts.py script + * Fri Mar 31 2006 Jason L Tibbitts III - 2.2-4 - Fix permissions on plugins. From fedora-extras-commits at redhat.com Fri Mar 31 19:53:29 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 12:53:29 -0700 Subject: rpms/perl-Class-Accessor/FC-3 perl-Class-Accessor.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603311954.k2VJs1Hm019005@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18936/FC-3 Modified Files: perl-Class-Accessor.spec sources Log Message: Bump to 0.25 Index: perl-Class-Accessor.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-3/perl-Class-Accessor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Accessor.spec 9 Jan 2006 18:17:56 -0000 1.2 +++ perl-Class-Accessor.spec 31 Mar 2006 19:53:29 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Class-Accessor -Version: 0.22 +Version: 0.25 Release: 1%{?dist} Summary: Automated accessor generation Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.25-1 +- bump to 0.25 + * Mon Jan 9 2006 Tom "spot" Callaway 0.22-1 - bump to 0.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2006 18:17:56 -0000 1.3 +++ sources 31 Mar 2006 19:53:29 -0000 1.4 @@ -1 +1 @@ -6259a41d8a0cb44742f0d9a772df3156 Class-Accessor-0.22.tar.gz +c2eac6eb3678f8dcd8c16fbfd622df88 Class-Accessor-0.25.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 19:53:30 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 12:53:30 -0700 Subject: rpms/perl-Class-Accessor/FC-4 perl-Class-Accessor.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603311954.k2VJs2e2019009@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18936/FC-4 Modified Files: perl-Class-Accessor.spec sources Log Message: Bump to 0.25 Index: perl-Class-Accessor.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-4/perl-Class-Accessor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Accessor.spec 9 Jan 2006 18:18:03 -0000 1.2 +++ perl-Class-Accessor.spec 31 Mar 2006 19:53:30 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Class-Accessor -Version: 0.22 +Version: 0.25 Release: 1%{?dist} Summary: Automated accessor generation Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.25-1 +- bump to 0.25 + * Mon Jan 9 2006 Tom "spot" Callaway 0.22-1 - bump to 0.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2006 18:18:03 -0000 1.3 +++ sources 31 Mar 2006 19:53:30 -0000 1.4 @@ -1 +1 @@ -6259a41d8a0cb44742f0d9a772df3156 Class-Accessor-0.22.tar.gz +c2eac6eb3678f8dcd8c16fbfd622df88 Class-Accessor-0.25.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 19:53:30 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 12:53:30 -0700 Subject: rpms/perl-Class-Accessor/FC-5 perl-Class-Accessor.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603311954.k2VJs2e5019011@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18936/FC-5 Modified Files: perl-Class-Accessor.spec sources Log Message: Bump to 0.25 Index: perl-Class-Accessor.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-5/perl-Class-Accessor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Accessor.spec 9 Jan 2006 18:18:09 -0000 1.2 +++ perl-Class-Accessor.spec 31 Mar 2006 19:53:30 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Class-Accessor -Version: 0.22 +Version: 0.25 Release: 1%{?dist} Summary: Automated accessor generation Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.25-1 +- bump to 0.25 + * Mon Jan 9 2006 Tom "spot" Callaway 0.22-1 - bump to 0.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2006 18:18:09 -0000 1.3 +++ sources 31 Mar 2006 19:53:30 -0000 1.4 @@ -1 +1 @@ -6259a41d8a0cb44742f0d9a772df3156 Class-Accessor-0.22.tar.gz +c2eac6eb3678f8dcd8c16fbfd622df88 Class-Accessor-0.25.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 19:53:31 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 12:53:31 -0700 Subject: rpms/perl-Class-Accessor/devel .cvsignore, 1.3, 1.4 perl-Class-Accessor.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603311954.k2VJs3DD019016@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-Accessor/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18936/devel Modified Files: .cvsignore perl-Class-Accessor.spec sources Log Message: Bump to 0.25 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 9 Jan 2006 18:18:09 -0000 1.3 +++ .cvsignore 31 Mar 2006 19:53:31 -0000 1.4 @@ -1,2 +1,3 @@ Class-Accessor-0.19.tar.gz Class-Accessor-0.22.tar.gz +Class-Accessor-0.25.tar.gz Index: perl-Class-Accessor.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/perl-Class-Accessor.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Class-Accessor.spec 9 Jan 2006 18:18:09 -0000 1.2 +++ perl-Class-Accessor.spec 31 Mar 2006 19:53:31 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Class-Accessor -Version: 0.22 +Version: 0.25 Release: 1%{?dist} Summary: Automated accessor generation Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.25-1 +- bump to 0.25 + * Mon Jan 9 2006 Tom "spot" Callaway 0.22-1 - bump to 0.22 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-Accessor/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 9 Jan 2006 18:18:09 -0000 1.3 +++ sources 31 Mar 2006 19:53:31 -0000 1.4 @@ -1 +1 @@ -6259a41d8a0cb44742f0d9a772df3156 Class-Accessor-0.22.tar.gz +c2eac6eb3678f8dcd8c16fbfd622df88 Class-Accessor-0.25.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:08:17 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:08:17 -0700 Subject: rpms/perl-Class-DBI-Pg/FC-3 perl-Class-DBI-Pg.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603312008.k2VK8nKM021291@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Pg/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21220/FC-3 Modified Files: perl-Class-DBI-Pg.spec sources Log Message: Bump to 0.08 Index: perl-Class-DBI-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-3/perl-Class-DBI-Pg.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-DBI-Pg.spec 8 Sep 2005 18:30:12 -0000 1.1 +++ perl-Class-DBI-Pg.spec 31 Mar 2006 20:08:17 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-Pg -Version: 0.06 -Release: 3%{?dist} +Version: 0.08 +Release: 1%{?dist} Summary: Class::DBI extension for PostgreSQL Group: Development/Libraries License: GPL or Artistic @@ -46,6 +46,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.08-1 +- bump to 0.08 + * Fri Sep 2 2005 Paul Howarth 0.06-3 - remove redundant BR: perl - honor %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-3/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Sep 2005 18:30:12 -0000 1.2 +++ sources 31 Mar 2006 20:08:17 -0000 1.3 @@ -1 +1 @@ -c68f3de33841ecb4c8a577fb63d4ff1e Class-DBI-Pg-0.06.tar.gz +e6247928d20ec094a1052a534295bc5a Class-DBI-Pg-0.08.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:08:18 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:08:18 -0700 Subject: rpms/perl-Class-DBI-Pg/FC-4 perl-Class-DBI-Pg.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603312008.k2VK8oQP021295@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Pg/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21220/FC-4 Modified Files: perl-Class-DBI-Pg.spec sources Log Message: Bump to 0.08 Index: perl-Class-DBI-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-4/perl-Class-DBI-Pg.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-DBI-Pg.spec 8 Sep 2005 18:30:12 -0000 1.1 +++ perl-Class-DBI-Pg.spec 31 Mar 2006 20:08:18 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-Pg -Version: 0.06 -Release: 3%{?dist} +Version: 0.08 +Release: 1%{?dist} Summary: Class::DBI extension for PostgreSQL Group: Development/Libraries License: GPL or Artistic @@ -46,6 +46,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.08-1 +- bump to 0.08 + * Fri Sep 2 2005 Paul Howarth 0.06-3 - remove redundant BR: perl - honor %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-4/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Sep 2005 18:30:12 -0000 1.2 +++ sources 31 Mar 2006 20:08:18 -0000 1.3 @@ -1 +1 @@ -c68f3de33841ecb4c8a577fb63d4ff1e Class-DBI-Pg-0.06.tar.gz +e6247928d20ec094a1052a534295bc5a Class-DBI-Pg-0.08.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:08:23 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:08:23 -0700 Subject: rpms/perl-Class-DBI-Pg/FC-5 perl-Class-DBI-Pg.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603312008.k2VK8tTp021299@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Pg/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21220/FC-5 Modified Files: perl-Class-DBI-Pg.spec sources Log Message: Bump to 0.08 Index: perl-Class-DBI-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-5/perl-Class-DBI-Pg.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-DBI-Pg.spec 8 Sep 2005 18:30:12 -0000 1.1 +++ perl-Class-DBI-Pg.spec 31 Mar 2006 20:08:23 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-Pg -Version: 0.06 -Release: 3%{?dist} +Version: 0.08 +Release: 1%{?dist} Summary: Class::DBI extension for PostgreSQL Group: Development/Libraries License: GPL or Artistic @@ -46,6 +46,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.08-1 +- bump to 0.08 + * Fri Sep 2 2005 Paul Howarth 0.06-3 - remove redundant BR: perl - honor %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Sep 2005 18:30:12 -0000 1.2 +++ sources 31 Mar 2006 20:08:23 -0000 1.3 @@ -1 +1 @@ -c68f3de33841ecb4c8a577fb63d4ff1e Class-DBI-Pg-0.06.tar.gz +e6247928d20ec094a1052a534295bc5a Class-DBI-Pg-0.08.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:08:24 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:08:24 -0700 Subject: rpms/perl-Class-DBI-Pg/devel .cvsignore, 1.2, 1.3 perl-Class-DBI-Pg.spec, 1.1, 1.2 sources, 1.2, 1.3 Message-ID: <200603312009.k2VK8uCp021304@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Class-DBI-Pg/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21220/devel Modified Files: .cvsignore perl-Class-DBI-Pg.spec sources Log Message: Bump to 0.08 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Sep 2005 18:30:12 -0000 1.2 +++ .cvsignore 31 Mar 2006 20:08:24 -0000 1.3 @@ -1 +1,2 @@ Class-DBI-Pg-0.06.tar.gz +Class-DBI-Pg-0.08.tar.gz Index: perl-Class-DBI-Pg.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/devel/perl-Class-DBI-Pg.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- perl-Class-DBI-Pg.spec 8 Sep 2005 18:30:12 -0000 1.1 +++ perl-Class-DBI-Pg.spec 31 Mar 2006 20:08:24 -0000 1.2 @@ -1,6 +1,6 @@ Name: perl-Class-DBI-Pg -Version: 0.06 -Release: 3%{?dist} +Version: 0.08 +Release: 1%{?dist} Summary: Class::DBI extension for PostgreSQL Group: Development/Libraries License: GPL or Artistic @@ -46,6 +46,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.08-1 +- bump to 0.08 + * Fri Sep 2 2005 Paul Howarth 0.06-3 - remove redundant BR: perl - honor %%{_smp_mflags} Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Class-DBI-Pg/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Sep 2005 18:30:12 -0000 1.2 +++ sources 31 Mar 2006 20:08:24 -0000 1.3 @@ -1 +1 @@ -c68f3de33841ecb4c8a577fb63d4ff1e Class-DBI-Pg-0.06.tar.gz +e6247928d20ec094a1052a534295bc5a Class-DBI-Pg-0.08.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:21:56 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:21:56 -0700 Subject: rpms/perl-Image-ExifTool/FC-5 perl-Image-ExifTool.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312021.k2VKLwPQ021607@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21533/FC-5 Modified Files: perl-Image-ExifTool.spec sources Log Message: Bump to 6.09 Index: perl-Image-ExifTool.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-5/perl-Image-ExifTool.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Image-ExifTool.spec 10 Jan 2006 15:53:08 -0000 1.2 +++ perl-Image-ExifTool.spec 31 Mar 2006 20:21:56 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Image-ExifTool -Version: 5.89 +Version: 6.09 Release: 1%{?dist} License: GPL or Artistic Group: Applications/Multimedia @@ -49,6 +49,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 6.09-1 +- bump to 6.09 + * Tue Jan 10 2006 Tom "spot" Callaway 5.89-1 - bump to 5.89 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Jan 2006 15:53:08 -0000 1.3 +++ sources 31 Mar 2006 20:21:56 -0000 1.4 @@ -1 +1 @@ -93c9a877256b0a2c2847346528bb18ca Image-ExifTool-5.89.tar.gz +66dc6aa550799a879c66f4ceba348d6d Image-ExifTool-6.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:21:55 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:21:55 -0700 Subject: rpms/perl-Image-ExifTool/FC-4 perl-Image-ExifTool.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312022.k2VKLvPX021604@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21533/FC-4 Modified Files: perl-Image-ExifTool.spec sources Log Message: Bump to 6.09 Index: perl-Image-ExifTool.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/perl-Image-ExifTool.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Image-ExifTool.spec 10 Jan 2006 15:53:02 -0000 1.2 +++ perl-Image-ExifTool.spec 31 Mar 2006 20:21:55 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Image-ExifTool -Version: 5.89 +Version: 6.09 Release: 1%{?dist} License: GPL or Artistic Group: Applications/Multimedia @@ -49,6 +49,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 6.09-1 +- bump to 6.09 + * Tue Jan 10 2006 Tom "spot" Callaway 5.89-1 - bump to 5.89 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Jan 2006 15:53:02 -0000 1.3 +++ sources 31 Mar 2006 20:21:55 -0000 1.4 @@ -1 +1 @@ -93c9a877256b0a2c2847346528bb18ca Image-ExifTool-5.89.tar.gz +66dc6aa550799a879c66f4ceba348d6d Image-ExifTool-6.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:21:57 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:21:57 -0700 Subject: rpms/perl-Image-ExifTool/devel .cvsignore, 1.3, 1.4 perl-Image-ExifTool.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312021.k2VKLxJ8021613@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21533/devel Modified Files: .cvsignore perl-Image-ExifTool.spec sources Log Message: Bump to 6.09 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 10 Jan 2006 15:53:08 -0000 1.3 +++ .cvsignore 31 Mar 2006 20:21:56 -0000 1.4 @@ -1,2 +1,3 @@ Image-ExifTool-5.53.tar.gz Image-ExifTool-5.89.tar.gz +Image-ExifTool-6.09.tar.gz Index: perl-Image-ExifTool.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/perl-Image-ExifTool.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Image-ExifTool.spec 10 Jan 2006 15:53:08 -0000 1.2 +++ perl-Image-ExifTool.spec 31 Mar 2006 20:21:56 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Image-ExifTool -Version: 5.89 +Version: 6.09 Release: 1%{?dist} License: GPL or Artistic Group: Applications/Multimedia @@ -49,6 +49,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 6.09-1 +- bump to 6.09 + * Tue Jan 10 2006 Tom "spot" Callaway 5.89-1 - bump to 5.89 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Jan 2006 15:53:08 -0000 1.3 +++ sources 31 Mar 2006 20:21:56 -0000 1.4 @@ -1 +1 @@ -93c9a877256b0a2c2847346528bb18ca Image-ExifTool-5.89.tar.gz +66dc6aa550799a879c66f4ceba348d6d Image-ExifTool-6.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:21:55 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:21:55 -0700 Subject: rpms/perl-Image-ExifTool/FC-3 perl-Image-ExifTool.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312022.k2VKMR09021619@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21533/FC-3 Modified Files: perl-Image-ExifTool.spec sources Log Message: Bump to 6.09 Index: perl-Image-ExifTool.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/perl-Image-ExifTool.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-Image-ExifTool.spec 10 Jan 2006 15:52:56 -0000 1.2 +++ perl-Image-ExifTool.spec 31 Mar 2006 20:21:54 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-Image-ExifTool -Version: 5.89 +Version: 6.09 Release: 1%{?dist} License: GPL or Artistic Group: Applications/Multimedia @@ -49,6 +49,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 6.09-1 +- bump to 6.09 + * Tue Jan 10 2006 Tom "spot" Callaway 5.89-1 - bump to 5.89 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 10 Jan 2006 15:52:56 -0000 1.3 +++ sources 31 Mar 2006 20:21:54 -0000 1.4 @@ -1 +1 @@ -93c9a877256b0a2c2847346528bb18ca Image-ExifTool-5.89.tar.gz +66dc6aa550799a879c66f4ceba348d6d Image-ExifTool-6.09.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:29:37 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:29:37 -0700 Subject: rpms/perl-SQL-Abstract/FC-3 perl-SQL-Abstract.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312030.k2VKU9xh021911@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21841/FC-3 Modified Files: perl-SQL-Abstract.spec sources Log Message: Bump to 1.21 Index: perl-SQL-Abstract.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-3/perl-SQL-Abstract.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SQL-Abstract.spec 5 Jan 2006 17:35:13 -0000 1.2 +++ perl-SQL-Abstract.spec 31 Mar 2006 20:29:37 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-SQL-Abstract -Version: 1.20 +Version: 1.21 Release: 1%{?dist} Summary: Generate SQL from Perl data structures Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 1.21-1 +- bump to 1.21 + * Thu Jan 5 2006 Tom "spot" Callaway 1.20-1 - bump to 1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 17:35:13 -0000 1.3 +++ sources 31 Mar 2006 20:29:37 -0000 1.4 @@ -1 +1 @@ -0a6fd0dab5d69f5ae800c4f39caa5cbf SQL-Abstract-1.20.tar.gz +a77ef9ee19ce095681189aa259db920a SQL-Abstract-1.21.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:29:38 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:29:38 -0700 Subject: rpms/perl-SQL-Abstract/FC-5 perl-SQL-Abstract.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312030.k2VKUAxs021917@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21841/FC-5 Modified Files: perl-SQL-Abstract.spec sources Log Message: Bump to 1.21 Index: perl-SQL-Abstract.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-5/perl-SQL-Abstract.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SQL-Abstract.spec 5 Jan 2006 17:35:25 -0000 1.2 +++ perl-SQL-Abstract.spec 31 Mar 2006 20:29:38 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-SQL-Abstract -Version: 1.20 +Version: 1.21 Release: 1%{?dist} Summary: Generate SQL from Perl data structures Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 1.21-1 +- bump to 1.21 + * Thu Jan 5 2006 Tom "spot" Callaway 1.20-1 - bump to 1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 17:35:25 -0000 1.3 +++ sources 31 Mar 2006 20:29:38 -0000 1.4 @@ -1 +1 @@ -0a6fd0dab5d69f5ae800c4f39caa5cbf SQL-Abstract-1.20.tar.gz +a77ef9ee19ce095681189aa259db920a SQL-Abstract-1.21.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:29:39 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:29:39 -0700 Subject: rpms/perl-SQL-Abstract/devel .cvsignore, 1.3, 1.4 perl-SQL-Abstract.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312030.k2VKUBlO021922@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21841/devel Modified Files: .cvsignore perl-SQL-Abstract.spec sources Log Message: Bump to 1.21 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 5 Jan 2006 17:35:25 -0000 1.3 +++ .cvsignore 31 Mar 2006 20:29:39 -0000 1.4 @@ -1,2 +1,3 @@ SQL-Abstract-1.19.tar.gz SQL-Abstract-1.20.tar.gz +SQL-Abstract-1.21.tar.gz Index: perl-SQL-Abstract.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/perl-SQL-Abstract.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SQL-Abstract.spec 5 Jan 2006 17:35:25 -0000 1.2 +++ perl-SQL-Abstract.spec 31 Mar 2006 20:29:39 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-SQL-Abstract -Version: 1.20 +Version: 1.21 Release: 1%{?dist} Summary: Generate SQL from Perl data structures Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 1.21-1 +- bump to 1.21 + * Thu Jan 5 2006 Tom "spot" Callaway 1.20-1 - bump to 1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 17:35:25 -0000 1.3 +++ sources 31 Mar 2006 20:29:39 -0000 1.4 @@ -1 +1 @@ -0a6fd0dab5d69f5ae800c4f39caa5cbf SQL-Abstract-1.20.tar.gz +a77ef9ee19ce095681189aa259db920a SQL-Abstract-1.21.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:29:38 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:29:38 -0700 Subject: rpms/perl-SQL-Abstract/FC-4 perl-SQL-Abstract.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312030.k2VKUAbj021915@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-SQL-Abstract/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21841/FC-4 Modified Files: perl-SQL-Abstract.spec sources Log Message: Bump to 1.21 Index: perl-SQL-Abstract.spec =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-4/perl-SQL-Abstract.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-SQL-Abstract.spec 5 Jan 2006 17:35:19 -0000 1.2 +++ perl-SQL-Abstract.spec 31 Mar 2006 20:29:38 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-SQL-Abstract -Version: 1.20 +Version: 1.21 Release: 1%{?dist} Summary: Generate SQL from Perl data structures Group: Development/Libraries @@ -43,6 +43,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 1.21-1 +- bump to 1.21 + * Thu Jan 5 2006 Tom "spot" Callaway 1.20-1 - bump to 1.20 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-SQL-Abstract/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 5 Jan 2006 17:35:19 -0000 1.3 +++ sources 31 Mar 2006 20:29:38 -0000 1.4 @@ -1 +1 @@ -0a6fd0dab5d69f5ae800c4f39caa5cbf SQL-Abstract-1.20.tar.gz +a77ef9ee19ce095681189aa259db920a SQL-Abstract-1.21.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:35:19 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:35:19 -0700 Subject: rpms/perl-Spreadsheet-WriteExcel/FC-5 perl-Spreadsheet-WriteExcel.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603312035.k2VKZLSJ022158@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22089/FC-5 Modified Files: perl-Spreadsheet-WriteExcel.spec sources Log Message: Bump to 2.16 Index: perl-Spreadsheet-WriteExcel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-5/perl-Spreadsheet-WriteExcel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Spreadsheet-WriteExcel.spec 10 Jan 2006 18:15:33 -0000 1.8 +++ perl-Spreadsheet-WriteExcel.spec 31 Mar 2006 20:35:19 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Spreadsheet-WriteExcel -Version: 2.15 +Version: 2.16 Release: 1%{?dist} Summary: Write formatted text and numbers to a cross-platform Excel binary file @@ -63,6 +63,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 2.16-1 +- bump to 2.16 + * Tue Jan 10 2006 Tom "spot" Callaway 2.15-1 - bump to 2.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-5/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Jan 2006 18:15:33 -0000 1.5 +++ sources 31 Mar 2006 20:35:19 -0000 1.6 @@ -1 +1 @@ -abcb3c39fc48febbbc2a3094bb2933c9 Spreadsheet-WriteExcel-2.15.tar.gz +c5609e4f001fee7164d6d20b4e28ac1d Spreadsheet-WriteExcel-2.16.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:35:19 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:35:19 -0700 Subject: rpms/perl-Spreadsheet-WriteExcel/devel .cvsignore, 1.5, 1.6 perl-Spreadsheet-WriteExcel.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603312035.k2VKZLhx022164@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22089/devel Modified Files: .cvsignore perl-Spreadsheet-WriteExcel.spec sources Log Message: Bump to 2.16 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 10 Jan 2006 18:15:33 -0000 1.5 +++ .cvsignore 31 Mar 2006 20:35:19 -0000 1.6 @@ -1,2 +1,3 @@ Spreadsheet-WriteExcel-2.14.tar.gz Spreadsheet-WriteExcel-2.15.tar.gz +Spreadsheet-WriteExcel-2.16.tar.gz Index: perl-Spreadsheet-WriteExcel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/perl-Spreadsheet-WriteExcel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Spreadsheet-WriteExcel.spec 10 Jan 2006 18:15:33 -0000 1.8 +++ perl-Spreadsheet-WriteExcel.spec 31 Mar 2006 20:35:19 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Spreadsheet-WriteExcel -Version: 2.15 +Version: 2.16 Release: 1%{?dist} Summary: Write formatted text and numbers to a cross-platform Excel binary file @@ -63,6 +63,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 2.16-1 +- bump to 2.16 + * Tue Jan 10 2006 Tom "spot" Callaway 2.15-1 - bump to 2.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Jan 2006 18:15:33 -0000 1.5 +++ sources 31 Mar 2006 20:35:19 -0000 1.6 @@ -1 +1 @@ -abcb3c39fc48febbbc2a3094bb2933c9 Spreadsheet-WriteExcel-2.15.tar.gz +c5609e4f001fee7164d6d20b4e28ac1d Spreadsheet-WriteExcel-2.16.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:35:18 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:35:18 -0700 Subject: rpms/perl-Spreadsheet-WriteExcel/FC-4 perl-Spreadsheet-WriteExcel.spec, 1.8, 1.9 sources, 1.5, 1.6 Message-ID: <200603312035.k2VKZK5H022155@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22089/FC-4 Modified Files: perl-Spreadsheet-WriteExcel.spec sources Log Message: Bump to 2.16 Index: perl-Spreadsheet-WriteExcel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4/perl-Spreadsheet-WriteExcel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Spreadsheet-WriteExcel.spec 10 Jan 2006 18:15:27 -0000 1.8 +++ perl-Spreadsheet-WriteExcel.spec 31 Mar 2006 20:35:18 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Spreadsheet-WriteExcel -Version: 2.15 +Version: 2.16 Release: 1%{?dist} Summary: Write formatted text and numbers to a cross-platform Excel binary file @@ -63,6 +63,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 2.16-1 +- bump to 2.16 + * Tue Jan 10 2006 Tom "spot" Callaway 2.15-1 - bump to 2.15 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-4/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 10 Jan 2006 18:15:27 -0000 1.5 +++ sources 31 Mar 2006 20:35:18 -0000 1.6 @@ -1 +1 @@ -abcb3c39fc48febbbc2a3094bb2933c9 Spreadsheet-WriteExcel-2.15.tar.gz +c5609e4f001fee7164d6d20b4e28ac1d Spreadsheet-WriteExcel-2.16.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:35:17 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:35:17 -0700 Subject: rpms/perl-Spreadsheet-WriteExcel/FC-3 perl-Spreadsheet-WriteExcel.spec, 1.8, 1.9 sources, 1.4, 1.5 Message-ID: <200603312035.k2VKZnw6022179@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22089/FC-3 Modified Files: perl-Spreadsheet-WriteExcel.spec sources Log Message: Bump to 2.16 Index: perl-Spreadsheet-WriteExcel.spec =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3/perl-Spreadsheet-WriteExcel.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- perl-Spreadsheet-WriteExcel.spec 10 Jan 2006 18:15:08 -0000 1.8 +++ perl-Spreadsheet-WriteExcel.spec 31 Mar 2006 20:35:17 -0000 1.9 @@ -1,5 +1,5 @@ Name: perl-Spreadsheet-WriteExcel -Version: 2.15 +Version: 2.16 Release: 1%{?dist} Summary: Write formatted text and numbers to a cross-platform Excel binary file @@ -63,6 +63,9 @@ %{_mandir}/man3/*.3* %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 2.16-1 +- bump to 2.16 + * Tue Jan 10 2006 Tom "spot" Callaway 2.15-1 - bump to 2.15 @@ -71,7 +74,6 @@ - Add a complete URL for Source0 - Beautifying (fix identations and make it look more like the spectemplate-perl.spec) -- Merge with devel branch * Tue May 10 2005 Tom "spot" Callaway 2.13-3 - more spec cleanups Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Spreadsheet-WriteExcel/FC-3/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 10 Jan 2006 18:15:08 -0000 1.4 +++ sources 31 Mar 2006 20:35:17 -0000 1.5 @@ -1 +1 @@ -abcb3c39fc48febbbc2a3094bb2933c9 Spreadsheet-WriteExcel-2.15.tar.gz +c5609e4f001fee7164d6d20b4e28ac1d Spreadsheet-WriteExcel-2.16.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:39:07 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:39:07 -0700 Subject: rpms/perl-version/FC-5 perl-version.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200603312039.k2VKd9Rj022420@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-version/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353/FC-5 Modified Files: perl-version.spec sources Log Message: Bump to 0.59 Index: perl-version.spec =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-5/perl-version.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-version.spec 28 Feb 2006 23:47:09 -0000 1.2 +++ perl-version.spec 31 Mar 2006 20:39:07 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-version -Version: 0.57 +Version: 0.59 Release: 1%{?dist} Summary: Perl extension for Version Objects Group: Development/Libraries @@ -48,6 +48,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.59-1 +- bump to 0.59 + * Tue Feb 28 2006 Tom "spot" Callaway 0.57-1 - bump to 0.57 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-5/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Feb 2006 23:47:09 -0000 1.3 +++ sources 31 Mar 2006 20:39:07 -0000 1.4 @@ -1 +1,2 @@ 93f3ced0c0036370d6aafd3273fb9091 version-0.57.tar.gz +4f5011ef5cae442dd972ce39e3c03a33 version-0.59.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:39:07 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:39:07 -0700 Subject: rpms/perl-version/devel .cvsignore, 1.3, 1.4 perl-version.spec, 1.2, 1.3 sources, 1.3, 1.4 Message-ID: <200603312039.k2VKd9fs022426@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-version/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353/devel Modified Files: .cvsignore perl-version.spec sources Log Message: Bump to 0.59 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-version/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 28 Feb 2006 23:47:09 -0000 1.3 +++ .cvsignore 31 Mar 2006 20:39:07 -0000 1.4 @@ -1,2 +1,3 @@ version-0.51.tar.gz version-0.57.tar.gz +version-0.59.tar.gz Index: perl-version.spec =================================================================== RCS file: /cvs/extras/rpms/perl-version/devel/perl-version.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-version.spec 28 Feb 2006 23:47:09 -0000 1.2 +++ perl-version.spec 31 Mar 2006 20:39:07 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-version -Version: 0.57 +Version: 0.59 Release: 1%{?dist} Summary: Perl extension for Version Objects Group: Development/Libraries @@ -48,6 +48,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.59-1 +- bump to 0.59 + * Tue Feb 28 2006 Tom "spot" Callaway 0.57-1 - bump to 0.57 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-version/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Feb 2006 23:47:09 -0000 1.3 +++ sources 31 Mar 2006 20:39:07 -0000 1.4 @@ -1 +1,2 @@ 93f3ced0c0036370d6aafd3273fb9091 version-0.57.tar.gz +4f5011ef5cae442dd972ce39e3c03a33 version-0.59.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:39:00 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:39:00 -0700 Subject: rpms/perl-version/FC-3 perl-version.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200603312039.k2VKdWKW022430@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-version/FC-3 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353/FC-3 Modified Files: perl-version.spec sources Log Message: Bump to 0.59 Index: perl-version.spec =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-3/perl-version.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-version.spec 28 Feb 2006 23:46:57 -0000 1.2 +++ perl-version.spec 31 Mar 2006 20:39:00 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-version -Version: 0.57 +Version: 0.59 Release: 1%{?dist} Summary: Perl extension for Version Objects Group: Development/Libraries @@ -48,6 +48,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.59-1 +- bump to 0.59 + * Tue Feb 28 2006 Tom "spot" Callaway 0.57-1 - bump to 0.57 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-3/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Feb 2006 23:46:57 -0000 1.3 +++ sources 31 Mar 2006 20:39:00 -0000 1.4 @@ -1 +1,2 @@ 93f3ced0c0036370d6aafd3273fb9091 version-0.57.tar.gz +4f5011ef5cae442dd972ce39e3c03a33 version-0.59.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:39:01 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 13:39:01 -0700 Subject: rpms/perl-version/FC-4 perl-version.spec,1.2,1.3 sources,1.3,1.4 Message-ID: <200603312039.k2VKdXVv022434@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-version/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353/FC-4 Modified Files: perl-version.spec sources Log Message: Bump to 0.59 Index: perl-version.spec =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-4/perl-version.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- perl-version.spec 28 Feb 2006 23:47:03 -0000 1.2 +++ perl-version.spec 31 Mar 2006 20:39:01 -0000 1.3 @@ -1,5 +1,5 @@ Name: perl-version -Version: 0.57 +Version: 0.59 Release: 1%{?dist} Summary: Perl extension for Version Objects Group: Development/Libraries @@ -48,6 +48,9 @@ %changelog +* Fri Mar 31 2006 Tom "spot" Callaway 0.59-1 +- bump to 0.59 + * Tue Feb 28 2006 Tom "spot" Callaway 0.57-1 - bump to 0.57 Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-version/FC-4/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 28 Feb 2006 23:47:03 -0000 1.3 +++ sources 31 Mar 2006 20:39:01 -0000 1.4 @@ -1 +1,2 @@ 93f3ced0c0036370d6aafd3273fb9091 version-0.57.tar.gz +4f5011ef5cae442dd972ce39e3c03a33 version-0.59.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 20:44:46 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 13:44:46 -0700 Subject: rpms/gtkterm/devel gtkterm-0.99.5-fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gtkterm.desktop, 1.1, 1.2 gtkterm.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200603312044.k2VKimoM022638@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gtkterm/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22611 Modified Files: .cvsignore gtkterm.desktop gtkterm.spec sources Added Files: gtkterm-0.99.5-fixes.patch Log Message: * Fri Mar 31 2006 Hans de Goede 0.99.5-1 - Taking over as new FE maintainer - Bump to new upstream 0.99.5 gtkterm-0.99.5-fixes.patch: --- NEW FILE gtkterm-0.99.5-fixes.patch --- --- gtkterm-0.99.5/src/macros.c~ 2006-03-31 22:04:21.000000000 +0200 +++ gtkterm-0.99.5/src/macros.c 2006-03-31 22:04:21.000000000 +0200 @@ -59,7 +59,7 @@ guchar a; guint val_read; - string = macros[(gint)number].action; + string = macros[(long)number].action; length = strlen(string); for(i = 0; i < length; i++) @@ -140,7 +140,7 @@ } } - str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(gint)number].shortcut); + str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(long)number].shortcut); Put_temp_message(str, 800); g_free(str); } @@ -160,7 +160,7 @@ void add_shortcuts(void) { - gint i = 0; + long i = 0; guint acc_key; GdkModifierType mod; --- gtkterm-0.99.5/src/fichier.c~ 2006-03-31 22:02:49.000000000 +0200 +++ gtkterm-0.99.5/src/fichier.c 2006-03-31 22:02:49.000000000 +0200 @@ -153,7 +153,7 @@ else { g_free(str); - str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror(errno)); show_message(str, MSG_ERR); } return FALSE; @@ -202,7 +202,7 @@ { /* Problem while writing, stop file transfer */ g_free(str); - str = g_strdup_printf(_("Cannot write file %s\n"), strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot write file %s\n"), strerror(errno)); show_message(str, MSG_ERR); close_all(); return; @@ -298,7 +298,7 @@ if(Fic == NULL) { g_free(str); - str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror(errno)); show_message(str, MSG_ERR); } else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:31:34 -0000 1.2 +++ .cvsignore 31 Mar 2006 20:44:46 -0000 1.3 @@ -1 +1,2 @@ -gtkterm-0.99.4.tar.gz +gtkterm-0.99.5.tar.gz +gtkterm.png Index: gtkterm.desktop =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/gtkterm.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtkterm.desktop 8 Nov 2004 04:31:34 -0000 1.1 +++ gtkterm.desktop 31 Mar 2006 20:44:46 -0000 1.2 @@ -1,7 +1,12 @@ [Desktop Entry] +Encoding=UTF-8 Name=GTKTerm -Comment=Serial port terminal +GenericName=Serial port terminalemulator +Comment=Targeted at developers, with hexview, etc. Exec=gtkterm +Icon=gtkterm.png Terminal=false +StartupNotify=false Type=Application -Categories=Utility;Application; +Categories=Application;Utility; +Version=0.99.5 Index: gtkterm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/gtkterm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtkterm.spec 2 Mar 2006 21:30:15 -0000 1.7 +++ gtkterm.spec 31 Mar 2006 20:44:46 -0000 1.8 @@ -1,59 +1,81 @@ Name: gtkterm -Version: 0.99.4 -Release: 4 - +Version: 0.99.5 +Release: 1%{?dist} Summary: Serial port terminal - Group: Applications/Communications License: GPL URL: http://www.jls-info.com/julien/linux -Source0: http://www.jls-info.com/julien/linux/gtkterm-0.99.4.tar.gz +Source0: http://www.jls-info.com/julien/linux/%{name}-%{version}.tar.gz Source1: gtkterm.desktop +Source2: gtkterm.png +Patch0: gtkterm-0.99.5-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: gtk2-devel gettext bison desktop-file-utils vte-devel zlib-devel ncurses-devel +BuildRequires: gtk2-devel gettext bison desktop-file-utils vte-devel +BuildRequires: zlib-devel ncurses-devel %description Simple GUI terminal used to communicate with the serial port. Similar to minicom or hyperterminal. -%prep -cat< 0.99.5-1 +- Taking over as new FE maintainer +- Bump to new upstream 0.99.5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkterm/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:31:34 -0000 1.2 +++ sources 31 Mar 2006 20:44:46 -0000 1.3 @@ -1 +1,2 @@ -5539c7e2aaf56bfd551a72552f1ff146 gtkterm-0.99.4.tar.gz +007ce7810466396b6452dea9c57c5f02 gtkterm-0.99.5.tar.gz +9e25fa8914f415a1d9f6d60801752b6a gtkterm.png From fedora-extras-commits at redhat.com Fri Mar 31 20:47:33 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 13:47:33 -0700 Subject: owners owners.list,1.784,1.785 Message-ID: <200603312047.k2VKlZoG022787@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22770/owners Modified Files: owners.list Log Message: Taking ownership of gtkterm Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.784 retrieving revision 1.785 diff -u -r1.784 -r1.785 --- owners.list 31 Mar 2006 08:31:46 -0000 1.784 +++ owners.list 31 Mar 2006 20:47:33 -0000 1.785 @@ -412,7 +412,7 @@ Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|extras-qa at fedoraproject.org| Fedora Extras|gtk-qt-engine|a project allowing GTK to use Qt widget styles|rdieter at math.unl.edu|extras-qa at fedoraproject.org| Fedora Extras|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org| -Fedora Extras|gtkterm|Serial port terminal|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org| +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|gtk-xfce-engine|Port of Xfce engine to GTK+-2.0|kevin-redhat-bugzilla at tummy.com|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| From fedora-extras-commits at redhat.com Fri Mar 31 20:49:41 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 13:49:41 -0700 Subject: rpms/gtkterm/FC-5 gtkterm-0.99.5-fixes.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gtkterm.desktop, 1.1, 1.2 gtkterm.spec, 1.7, 1.8 sources, 1.2, 1.3 Message-ID: <200603312049.k2VKnhEw022833@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/gtkterm/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22807 Modified Files: .cvsignore gtkterm.desktop gtkterm.spec sources Added Files: gtkterm-0.99.5-fixes.patch Log Message: * Fri Mar 31 2006 Hans de Goede 0.99.5-1 - Taking over as new FE maintainer - Bump to new upstream 0.99.5 gtkterm-0.99.5-fixes.patch: --- NEW FILE gtkterm-0.99.5-fixes.patch --- --- gtkterm-0.99.5/src/macros.c~ 2006-03-31 22:04:21.000000000 +0200 +++ gtkterm-0.99.5/src/macros.c 2006-03-31 22:04:21.000000000 +0200 @@ -59,7 +59,7 @@ guchar a; guint val_read; - string = macros[(gint)number].action; + string = macros[(long)number].action; length = strlen(string); for(i = 0; i < length; i++) @@ -140,7 +140,7 @@ } } - str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(gint)number].shortcut); + str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(long)number].shortcut); Put_temp_message(str, 800); g_free(str); } @@ -160,7 +160,7 @@ void add_shortcuts(void) { - gint i = 0; + long i = 0; guint acc_key; GdkModifierType mod; --- gtkterm-0.99.5/src/fichier.c~ 2006-03-31 22:02:49.000000000 +0200 +++ gtkterm-0.99.5/src/fichier.c 2006-03-31 22:02:49.000000000 +0200 @@ -153,7 +153,7 @@ else { g_free(str); - str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror(errno)); show_message(str, MSG_ERR); } return FALSE; @@ -202,7 +202,7 @@ { /* Problem while writing, stop file transfer */ g_free(str); - str = g_strdup_printf(_("Cannot write file %s\n"), strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot write file %s\n"), strerror(errno)); show_message(str, MSG_ERR); close_all(); return; @@ -298,7 +298,7 @@ if(Fic == NULL) { g_free(str); - str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror_utf8(errno)); + str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror(errno)); show_message(str, MSG_ERR); } else Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/gtkterm/FC-5/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 8 Nov 2004 04:31:34 -0000 1.2 +++ .cvsignore 31 Mar 2006 20:49:41 -0000 1.3 @@ -1 +1,2 @@ -gtkterm-0.99.4.tar.gz +gtkterm-0.99.5.tar.gz +gtkterm.png Index: gtkterm.desktop =================================================================== RCS file: /cvs/extras/rpms/gtkterm/FC-5/gtkterm.desktop,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- gtkterm.desktop 8 Nov 2004 04:31:34 -0000 1.1 +++ gtkterm.desktop 31 Mar 2006 20:49:41 -0000 1.2 @@ -1,7 +1,12 @@ [Desktop Entry] +Encoding=UTF-8 Name=GTKTerm -Comment=Serial port terminal +GenericName=Serial port terminalemulator +Comment=Targeted at developers, with hexview, etc. Exec=gtkterm +Icon=gtkterm.png Terminal=false +StartupNotify=false Type=Application -Categories=Utility;Application; +Categories=Application;Utility; +Version=0.99.5 Index: gtkterm.spec =================================================================== RCS file: /cvs/extras/rpms/gtkterm/FC-5/gtkterm.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gtkterm.spec 2 Mar 2006 21:30:15 -0000 1.7 +++ gtkterm.spec 31 Mar 2006 20:49:41 -0000 1.8 @@ -1,59 +1,81 @@ Name: gtkterm -Version: 0.99.4 -Release: 4 - +Version: 0.99.5 +Release: 1%{?dist} Summary: Serial port terminal - Group: Applications/Communications License: GPL URL: http://www.jls-info.com/julien/linux -Source0: http://www.jls-info.com/julien/linux/gtkterm-0.99.4.tar.gz +Source0: http://www.jls-info.com/julien/linux/%{name}-%{version}.tar.gz Source1: gtkterm.desktop +Source2: gtkterm.png +Patch0: gtkterm-0.99.5-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: gtk2-devel gettext bison desktop-file-utils vte-devel zlib-devel ncurses-devel +BuildRequires: gtk2-devel gettext bison desktop-file-utils vte-devel +BuildRequires: zlib-devel ncurses-devel %description Simple GUI terminal used to communicate with the serial port. Similar to minicom or hyperterminal. -%prep -cat< 0.99.5-1 +- Taking over as new FE maintainer +- Bump to new upstream 0.99.5 + * Fri Apr 7 2005 Michael Schwendt - rebuilt Index: sources =================================================================== RCS file: /cvs/extras/rpms/gtkterm/FC-5/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 8 Nov 2004 04:31:34 -0000 1.2 +++ sources 31 Mar 2006 20:49:41 -0000 1.3 @@ -1 +1,2 @@ -5539c7e2aaf56bfd551a72552f1ff146 gtkterm-0.99.4.tar.gz +007ce7810466396b6452dea9c57c5f02 gtkterm-0.99.5.tar.gz +9e25fa8914f415a1d9f6d60801752b6a gtkterm.png From fedora-extras-commits at redhat.com Fri Mar 31 21:00:08 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 31 Mar 2006 14:00:08 -0700 Subject: rpms/apmud/devel apmud.spec,1.4,1.5 Message-ID: <200603312100.k2VL0Apw022944@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/apmud/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22927 Modified Files: apmud.spec Log Message: fix buildrequires Index: apmud.spec =================================================================== RCS file: /cvs/extras/rpms/apmud/devel/apmud.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apmud.spec 1 May 2005 10:06:44 -0000 1.4 +++ apmud.spec 31 Mar 2006 21:00:08 -0000 1.5 @@ -15,7 +15,7 @@ License: GPL Group: Utilities/System BuildRoot: %{_tmppath}/pmud-%{version}-buildroot -BuildRequires: xorg-x11-devel +BuildRequires: libX11-devel Prereq: chkconfig Obsoletes: trackpad, pmud ExclusiveArch: ppc @@ -95,6 +95,9 @@ %{_prefix}/share/man/man8/* %changelog +* Fri Mar 31 2006 David Woodhouse 1.0.0-4 +- BR libX11-devel + * Sun May 1 2005 David Woodhouse 1.0.0-3 - BR xorg-x11-devel From fedora-extras-commits at redhat.com Fri Mar 31 21:02:37 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 31 Mar 2006 14:02:37 -0700 Subject: rpms/apmud/FC-5 apmud.spec,1.4,1.5 Message-ID: <200603312103.k2VL3BZY024981@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/apmud/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24930 Modified Files: apmud.spec Log Message: fix release Index: apmud.spec =================================================================== RCS file: /cvs/extras/rpms/apmud/FC-5/apmud.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- apmud.spec 1 May 2005 10:06:44 -0000 1.4 +++ apmud.spec 31 Mar 2006 21:02:37 -0000 1.5 @@ -2,7 +2,7 @@ Name: apmud Version: 1.0.0 -Release: 3 +Release: 4%{?dist} Summary: Power management daemon for Apple laptops Source0: http://linuxppc.jvc.nl/apmud-%{version}.tgz @@ -15,7 +15,7 @@ License: GPL Group: Utilities/System BuildRoot: %{_tmppath}/pmud-%{version}-buildroot -BuildRequires: xorg-x11-devel +BuildRequires: libX11-devel Prereq: chkconfig Obsoletes: trackpad, pmud ExclusiveArch: ppc @@ -95,6 +95,9 @@ %{_prefix}/share/man/man8/* %changelog +* Fri Mar 31 2006 David Woodhouse 1.0.0-4 +- BR libX11-devel + * Sun May 1 2005 David Woodhouse 1.0.0-3 - BR xorg-x11-devel From fedora-extras-commits at redhat.com Fri Mar 31 21:03:21 2006 From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2)) Date: Fri, 31 Mar 2006 14:03:21 -0700 Subject: rpms/apmud/devel apmud.spec,1.5,1.6 Message-ID: <200603312103.k2VL3N5P025001@cvs-int.fedora.redhat.com> Author: dwmw2 Update of /cvs/extras/rpms/apmud/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24984 Modified Files: apmud.spec Log Message: fix release Index: apmud.spec =================================================================== RCS file: /cvs/extras/rpms/apmud/devel/apmud.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- apmud.spec 31 Mar 2006 21:00:08 -0000 1.5 +++ apmud.spec 31 Mar 2006 21:03:21 -0000 1.6 @@ -2,7 +2,7 @@ Name: apmud Version: 1.0.0 -Release: 3 +Release: 4%{?dist} Summary: Power management daemon for Apple laptops Source0: http://linuxppc.jvc.nl/apmud-%{version}.tgz From fedora-extras-commits at redhat.com Fri Mar 31 21:03:44 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 31 Mar 2006 14:03:44 -0700 Subject: kadischi/post_install_scripts 03fstab.py, 1.2, 1.3 05fsclean.py, 1.2, 1.3 06sysconfig.py, 1.2, 1.3 Message-ID: <200603312103.k2VL3iYT025059@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/post_install_scripts In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25007/kadischi/post_install_scripts Modified Files: 03fstab.py 05fsclean.py 06sysconfig.py Log Message: Contributor: Toshio Kuratomi (Consistency between spaces vs. tabs), commit Index: 03fstab.py =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/03fstab.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 03fstab.py 13 Oct 2005 01:05:55 -0000 1.2 +++ 03fstab.py 31 Mar 2006 21:03:41 -0000 1.3 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys @@ -9,12 +9,12 @@ list = [] fstab = open (normalize_path ([sysdir,'/etc/fstab']) , 'r') for line in fstab: - if (line[0] != '#') and (line != '\n') and (line.find('swap') == -1) and (line.split() [1] != '/'): - list.append (line) + if (line[0] != '#') and (line != '\n') and (line.find('swap') == -1) and (line.split() [1] != '/'): + list.append (line) fstab.close() list[:0] = '/dev/loop1\t\t/\t\t\text2\tdefaults\t1 1\n' fstab = open (normalize_path ([sysdir,'/etc/fstab']) , 'w') fstab.writelines (list) -fstab.close() \ No newline at end of file +fstab.close() Index: 05fsclean.py =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/05fsclean.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 05fsclean.py 30 Mar 2006 04:29:22 -0000 1.2 +++ 05fsclean.py 31 Mar 2006 21:03:41 -0000 1.3 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys @@ -7,58 +7,58 @@ # Directories that we want to empty but not delete directories_to_be_emptied = [ - '/root', - '/proc', - '/lost+found', - '/var/gdm', - '/dev', - '/tmp', - '/var/tmp', - '/var/cache/yum', - '/mnt', - '/media', - '/boot/isolinux' - ] + '/root', + '/proc', + '/lost+found', + '/var/gdm', + '/dev', + '/tmp', + '/var/tmp', + '/var/cache/yum', + '/mnt', + '/media', + '/boot/isolinux' + ] # Directories that we want to empty of files directories_to_be_cleaned = [ - '/var/log', ## FIXME: Think this through - ] + '/var/log', ## FIXME: Think this through + ] # files that need removing files_to_be_removed = [ - '/.autofsck', - ] + '/.autofsck', + ] def clean_up_directories (rootdir, to_empty, to_clean, to_remove): - for d in to_empty: - path = os.path.normpath (rootdir + '/' + d) - if not os.path.isdir (path): - continue - clean_directory (path, False) - - for d in to_clean: - path = os.path.normpath (rootdir + '/' + d) - if not os.path.isdir (path): - continue - clean_directory (path, False, True) - - for f in to_remove: - path = os.path.join (rootdir, f) - if not os.path.isfile (path): - continue - os.remove (path) - + for d in to_empty: + path = os.path.normpath (rootdir + '/' + d) + if not os.path.isdir (path): + continue + clean_directory (path, False) + + for d in to_clean: + path = os.path.normpath (rootdir + '/' + d) + if not os.path.isdir (path): + continue + clean_directory (path, False, True) + + for f in to_remove: + path = os.path.join (rootdir, f) + if not os.path.isfile (path): + continue + os.remove (path) + def clean_up_root (rootdir): - # FIXME: Do this nicer at some point - os.system ("chroot %s /usr/bin/rsync -a /etc/skel/ /root/" % rootdir) - os.chmod (rootdir + '/root', 0750) + # FIXME: Do this nicer at some point + os.system ("chroot %s /usr/bin/rsync -a /etc/skel/ /root/" % rootdir) + os.chmod (rootdir + '/root', 0750) rootdir = sys.argv[1] clear_rpm_db_files (rootdir) clean_up_directories (rootdir, - directories_to_be_emptied, - directories_to_be_cleaned, - files_to_be_removed) + directories_to_be_emptied, + directories_to_be_cleaned, + files_to_be_removed) clean_up_root (rootdir) Index: 06sysconfig.py =================================================================== RCS file: /cvs/devel/kadischi/post_install_scripts/06sysconfig.py,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- 06sysconfig.py 30 Aug 2005 01:56:22 -0000 1.2 +++ 06sysconfig.py 31 Mar 2006 21:03:41 -0000 1.3 @@ -1,54 +1,54 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys from functions import * def tweak_readonly_root_config (rootdir): - # create symlink to rc.readonly-livecd - os.symlink ('rc.d/rc.readonly-livecd', normalize_path (['etc/rc.readonly'], rootdir)) - os.symlink ('../init.d/readonly-halt', normalize_path (['etc/rc0.d/S00readonly-halt'], rootdir)) - os.symlink ('../init.d/readonly-halt', normalize_path (['etc/rc6.d/S00readonly-halt'], rootdir)) - # create dirs for fedora-livecd files - os.mkdir (normalize_path (['/livecd'], rootdir)) - os.mkdir (normalize_path (['/livecd/tmpfs'], rootdir)) - os.mkdir (normalize_path (['/livecd/ramfs'], rootdir)) - os.mkdir (normalize_path (['/livecd/moved'], rootdir)) - # enable readonly-root - shf = sysconfig_file (rootdir, "readonly-root") - # run rc.readonly - shf["READONLY"] = "yes" - shf.write () - + # create symlink to rc.readonly-livecd + os.symlink ('rc.d/rc.readonly-livecd', normalize_path (['etc/rc.readonly'], rootdir)) + os.symlink ('../init.d/readonly-halt', normalize_path (['etc/rc0.d/S00readonly-halt'], rootdir)) + os.symlink ('../init.d/readonly-halt', normalize_path (['etc/rc6.d/S00readonly-halt'], rootdir)) + # create dirs for fedora-livecd files + os.mkdir (normalize_path (['/livecd'], rootdir)) + os.mkdir (normalize_path (['/livecd/tmpfs'], rootdir)) + os.mkdir (normalize_path (['/livecd/ramfs'], rootdir)) + os.mkdir (normalize_path (['/livecd/moved'], rootdir)) + # enable readonly-root + shf = sysconfig_file (rootdir, "readonly-root") + # run rc.readonly + shf["READONLY"] = "yes" + shf.write () + def tweak_udev_config (rootdir): - shf = sysconfig_file (rootdir, "udev") - # Mount a ramfs over /dev - shf["UDEV_RAMFS"] = "yes" - # We aren't using an initrd - shf["UDEV_INITRD"] = "no" - # Don't keep the ramfs from the initrd - shf["UDEV_KEEP_DEV"] = "no" - shf.write () - + shf = sysconfig_file (rootdir, "udev") + # Mount a ramfs over /dev + shf["UDEV_RAMFS"] = "yes" + # We aren't using an initrd + shf["UDEV_INITRD"] = "no" + # Don't keep the ramfs from the initrd + shf["UDEV_KEEP_DEV"] = "no" + shf.write () + def tweak_firstboot_config (rootdir): - shf = sysconfig_file (rootdir, "firstboot") - shf["RUN_FIRSTBOOT"] = "YES" - shf.write () + shf = sysconfig_file (rootdir, "firstboot") + shf["RUN_FIRSTBOOT"] = "YES" + shf.write () def tweak_kudzu_config (rootdir): - shf = sysconfig_file (rootdir, "kudzu") - # Take default actions without prompting - shf["KUDZU_ARGS"] = "-q" - shf.write () - + shf = sysconfig_file (rootdir, "kudzu") + # Take default actions without prompting + shf["KUDZU_ARGS"] = "-q" + shf.write () + def tweak_livecd (rootdir): - file = open (normalize_path (['.livecd'], rootdir) , 'w') - file.close() - + file = open (normalize_path (['.livecd'], rootdir) , 'w') + file.close() + rootdir = sys.argv[1] tweak_readonly_root_config (rootdir) tweak_udev_config (rootdir) tweak_firstboot_config (rootdir) #tweak_kudzu_config (rootdir) -tweak_livecd (rootdir) \ No newline at end of file +tweak_livecd (rootdir) From fedora-extras-commits at redhat.com Fri Mar 31 21:03:38 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 31 Mar 2006 14:03:38 -0700 Subject: kadischi/lib functions.py,1.5,1.6 Message-ID: <200603312104.k2VL484g025069@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/lib In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25007/kadischi/lib Modified Files: functions.py Log Message: Contributor: Toshio Kuratomi (Consistency between spaces vs. tabs), commit Index: functions.py =================================================================== RCS file: /cvs/devel/kadischi/lib/functions.py,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- functions.py 30 Mar 2006 04:29:21 -0000 1.5 +++ functions.py 31 Mar 2006 21:03:36 -0000 1.6 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys @@ -12,125 +12,125 @@ import isys def normalize_path (parts, rootpath = None): - if rootpath == None: - rootpath = '/' - path = rootpath - for part in parts: - path = '/'.join([path, part]) - return os.path.normpath (path) + if rootpath == None: + rootpath = '/' + path = rootpath + for part in parts: + path = '/'.join([path, part]) + return os.path.normpath (path) def path_exists (path, quiet = False): - if os.path.exists (path): - if not quiet: - flc_log ('Path %s exists. OK' % path) - return True - else: - if not quiet: - flc_log ('Error - path %s doesn`t exist.' % path) - return False + if os.path.exists (path): + if not quiet: + flc_log ('Path %s exists. OK' % path) + return True + else: + if not quiet: + flc_log ('Error - path %s doesn`t exist.' % path) + return False def url_exists (url, quiet = False): - try: - u = grabber.urlopen (url, retry = 5) - if not quiet: - flc_log ('URL %s contacted. OK' % url) - u.close () - return True - except grabber.URLGrabError, e: - if not quiet: - flc_log ("An error occurred contacting %s." % url) - flc_log ("URLGrabError:\n %s" % e.strerror) - return False + try: + u = grabber.urlopen (url, retry = 5) + if not quiet: + flc_log ('URL %s contacted. OK' % url) + u.close () + return True + except grabber.URLGrabError, e: + if not quiet: + flc_log ("An error occurred contacting %s." % url) + flc_log ("URLGrabError:\n %s" % e.strerror) + return False def clear_rpm_db_files (rootdir): - """Removes rpm database files in the destination if they exist""" - def rmpath (p): - try: os.remove (p) - except OSError: pass - rmpath (normalize_path ('var/lib/rpm/__db.001', rootdir)) - rmpath (normalize_path ('var/lib/rpm/__db.002', rootdir)) - rmpath (normalize_path ('var/lib/rpm/__db.003', rootdir)) - + """Removes rpm database files in the destination if they exist""" + def rmpath (p): + try: os.remove (p) + except OSError: pass + rmpath (normalize_path ('var/lib/rpm/__db.001', rootdir)) + rmpath (normalize_path ('var/lib/rpm/__db.002', rootdir)) + rmpath (normalize_path ('var/lib/rpm/__db.003', rootdir)) + def check_installed_rpms (rootdir, required_rpms, clear_db = True): - """Sanity check the target system for required RPMs""" - # By default, clears out the db files before and after doing any operations - missing_rpms = [] - if clear_db: - clear_rpm_db_files (rootdir) - ts = rpm.TransactionSet (rootdir) - for package in required_rpms: - mi = ts.dbMatch ('name', package) - if mi.count () == 0: - missing_rpms.append (package) - if clear_db: - clear_rpm_db_files (rootdir) - return missing_rpms + """Sanity check the target system for required RPMs""" + # By default, clears out the db files before and after doing any operations + missing_rpms = [] + if clear_db: + clear_rpm_db_files (rootdir) + ts = rpm.TransactionSet (rootdir) + for package in required_rpms: + mi = ts.dbMatch ('name', package) + if mi.count () == 0: + missing_rpms.append (package) + if clear_db: + clear_rpm_db_files (rootdir) + return missing_rpms def get_kernel_version (rootdir): - kernel_version = None - clear_rpm_db_files (rootdir) - ts = rpm.TransactionSet (rootdir) - while kernel_version == None: - if isys.smpAvailable() or isys.htavailable(): - for mi in ts.dbMatch ('name', 'kernel-xen0'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' - clear_rpm_db_files (rootdir) - for mi in ts.dbMatch ('name', 'kernel-smp'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp' - clear_rpm_db_files (rootdir) - else: - for mi in ts.dbMatch ('name', 'kernel-xen0'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' - clear_rpm_db_files (rootdir) - for mi in ts.dbMatch ('name', 'kernel'): - kernel_version = "%s-%s" % (mi['version'], mi['release']) - clear_rpm_db_files (rootdir) - return kernel_version + kernel_version = None + clear_rpm_db_files (rootdir) + ts = rpm.TransactionSet (rootdir) + while kernel_version == None: + if isys.smpAvailable() or isys.htavailable(): + for mi in ts.dbMatch ('name', 'kernel-xen0'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' + clear_rpm_db_files (rootdir) + for mi in ts.dbMatch ('name', 'kernel-smp'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp' + clear_rpm_db_files (rootdir) + else: + for mi in ts.dbMatch ('name', 'kernel-xen0'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0' + clear_rpm_db_files (rootdir) + for mi in ts.dbMatch ('name', 'kernel'): + kernel_version = "%s-%s" % (mi['version'], mi['release']) + clear_rpm_db_files (rootdir) + return kernel_version def clean_directory (dir, remove_when_done=True, keep_child_directories=False): - """Removes all files in a directory, optionally removing the directory afterwards""" - assert os.path.isdir and not os.path.islink (dir) - file_list = os.listdir (dir) - - for f in file_list: - path = os.path.join (dir, f) - if os.path.isdir (path) and not os.path.islink (path): - clean_directory (path, - not keep_child_directories, - keep_child_directories) - else: - os.remove (path) + """Removes all files in a directory, optionally removing the directory afterwards""" + assert os.path.isdir and not os.path.islink (dir) + file_list = os.listdir (dir) + + for f in file_list: + path = os.path.join (dir, f) + if os.path.isdir (path) and not os.path.islink (path): + clean_directory (path, + not keep_child_directories, + keep_child_directories) + else: + os.remove (path) - if remove_when_done: - os.rmdir (dir) + if remove_when_done: + os.rmdir (dir) def sysconfig_file (rootdir, name): - path = normalize_path(['/etc/sysconfig/', name], rootdir) - return shvar.shvarFile (path) + path = normalize_path(['/etc/sysconfig/', name], rootdir) + return shvar.shvarFile (path) def flc_log (msg): - sys.stdout.write (msg + '\n') + sys.stdout.write (msg + '\n') def cleanup (builddir): - os.system ("umount %s 2>/dev/null" % normalize_path(['/system/proc'],builddir)) - if os.path.exists (normalize_path([builddir,'product'])): - clean_directory ('/tmp/product') - shutil.move (normalize_path([builddir,'product']), '/tmp/product') - elif os.path.exists (normalize_path([builddir,'.buildstamp'])): - os.unlink ('/tmp/product/.buildstamp') - shutil.move (normalize_path([builddir,'.buildstamp']), '/tmp/product/.buildstamp') - else: - os.unlink ('/tmp/product/.buildstamp') - clean_directory (builddir) - + os.system ("umount %s 2>/dev/null" % normalize_path(['/system/proc'],builddir)) + if os.path.exists (normalize_path([builddir,'product'])): + clean_directory ('/tmp/product') + shutil.move (normalize_path([builddir,'product']), '/tmp/product') + elif os.path.exists (normalize_path([builddir,'.buildstamp'])): + os.unlink ('/tmp/product/.buildstamp') + shutil.move (normalize_path([builddir,'.buildstamp']), '/tmp/product/.buildstamp') + else: + os.unlink ('/tmp/product/.buildstamp') + clean_directory (builddir) + def run (command, builddir = None): - rc = os.system (command) - if rc != 0: - flc_log ('\n *** Fatal error: %s returned non zero (%s) exit code. Aborting execution.\n' % (command.rsplit() [0], rc)) - if builddir != None: - flc_log ('Cleaning up temporary files...') - cleanup (builddir) - flc_log ('Done.') - else: - flc_log ('You should clean temporary files.') - sys.exit (1) + rc = os.system (command) + if rc != 0: + flc_log ('\n *** Fatal error: %s returned non zero (%s) exit code. Aborting execution.\n' % (command.rsplit() [0], rc)) + if builddir != None: + flc_log ('Cleaning up temporary files...') + cleanup (builddir) + flc_log ('Done.') + else: + flc_log ('You should clean temporary files.') + sys.exit (1) From fedora-extras-commits at redhat.com Fri Mar 31 21:03:38 2006 From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy)) Date: Fri, 31 Mar 2006 14:03:38 -0700 Subject: kadischi/livecd_generator kadischi.py, 1.7, 1.8 movefiles.py, 1.1.1.1, 1.2 Message-ID: <200603312104.k2VL482D025072@cvs-int.fedora.redhat.com> Author: autopsy Update of /cvs/devel/kadischi/livecd_generator In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25007/kadischi/livecd_generator Modified Files: kadischi.py movefiles.py Log Message: Contributor: Toshio Kuratomi (Consistency between spaces vs. tabs), commit Index: kadischi.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- kadischi.py 30 Mar 2006 05:46:06 -0000 1.7 +++ kadischi.py 31 Mar 2006 21:03:36 -0000 1.8 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys @@ -56,23 +56,23 @@ force = options.force if options.ksfile != None: - anaconda_args = anaconda_args + ' --kickstart=' + options.ksfile + anaconda_args = anaconda_args + ' --kickstart=' + options.ksfile if options.buildstamp != None: - buildstamp = options.buildstamp + buildstamp = options.buildstamp else: - buildstamp = normalize_path ([confdir, 'buildstamp']) + buildstamp = normalize_path ([confdir, 'buildstamp']) # set display mode display_mode = '' if options.graphical: - display_mode = ' --graphical' + display_mode = ' --graphical' if options.text: - display_mode = ' -T' + display_mode = ' -T' if options.cmdline: - display_mode = ' -C' + display_mode = ' -C' anaconda_args = display_mode + anaconda_args @@ -81,12 +81,12 @@ # checking arguments if len (args) < 2: - flc_log ('Not enough arguments.\n') - parser.parse_args (['-h']) - + flc_log ('Not enough arguments.\n') + parser.parse_args (['-h']) + if len (args) > 2: - flc_log ('Too many arguments.\n') - parser.parse_args (['-h']) + flc_log ('Too many arguments.\n') + parser.parse_args (['-h']) method = args [0] isoimage = normalize_path ([args [1]]) @@ -96,14 +96,14 @@ flc_log ('Checking UID') if os.getuid () != 0: - flc_log ('You have to be root to run this application. Please restart with root permissions.\n') - sys.exit (1) + flc_log ('You have to be root to run this application. Please restart with root permissions.\n') + sys.exit (1) # check if we can open buildstamp file if not os.access(buildstamp, os.R_OK): - flc_log ('Can`t open buildstamp file %s. ' % buildstamp) - sys.exit (1) + flc_log ('Can`t open buildstamp file %s. ' % buildstamp) + sys.exit (1) # loading productPath from buildstamp @@ -112,11 +112,11 @@ f = open(buildstamp, "r") lines = f.readlines() if len(lines) >= 4: - product_path = lines[3][:-1] - flc_log ('Product path set to %s. ' % product_path) + product_path = lines[3][:-1] + flc_log ('Product path set to %s. ' % product_path) else: - flc_log ('Product path can`t be found in buildstamp file %s (Product path should be on the 4th line of the file)' % buildstamp) - sys.exit (1) + flc_log ('Product path can`t be found in buildstamp file %s (Product path should be on the 4th line of the file)' % buildstamp) + sys.exit (1) # validating the repository @@ -125,34 +125,34 @@ valid = True if method.find (':') == -1: - method = normalize_path ([method]) - valid = path_exists (method) and path_exists (method + '/' + product_path) and path_exists (method + '/' + product_path + '/' + 'base') and path_exists (method + '/' + product_path + '/' + 'RPMS') + method = normalize_path ([method]) + valid = path_exists (method) and path_exists (method + '/' + product_path) and path_exists (method + '/' + product_path + '/' + 'base') and path_exists (method + '/' + product_path + '/' + 'RPMS') elif method.find ('http') == 0 or method.find ('ftp') == 0: - method = method.rstrip('/') - valid = url_exists (method) and url_exists (method + '/' + product_path) and url_exists (method + '/' + product_path + '/' + 'base') and url_exists (method + '/' + product_path + '/' + 'RPMS') + method = method.rstrip('/') + valid = url_exists (method) and url_exists (method + '/' + product_path) and url_exists (method + '/' + product_path + '/' + 'base') and url_exists (method + '/' + product_path + '/' + 'RPMS') if valid: - flc_log ('Repository seems to be OK.') + flc_log ('Repository seems to be OK.') else: - flc_log ('Repository validation failed. Aborting execution.') - sys.exit (1) + flc_log ('Repository validation failed. Aborting execution.') + sys.exit (1) # format method string the way anaconda likes it if method.find (':') == -1: - method = 'nfs:/' + method - + method = 'nfs:/' + method + # checking if everything is OK with destination (iso image) file if os.path.isfile (isoimage): - flc_log ('File %s already exists. ' % isoimage) - if force: - flc_log ('It will be overwritten.') - else: - flc_log ('Please choose some other file name, or use -f option to overwrite the existing file.') - sys.exit (1) + flc_log ('File %s already exists. ' % isoimage) + if force: + flc_log ('It will be overwritten.') + else: + flc_log ('Please choose some other file name, or use -f option to overwrite the existing file.') + sys.exit (1) elif not os.path.isdir (os.path.dirname (isoimage)): - os.makedirs (os.path.dirname (isoimage)) + os.makedirs (os.path.dirname (isoimage)) # check for installed rpms @@ -169,19 +169,19 @@ missing_rpms = check_installed_rpms ('/', required_rpms, False) if len (missing_rpms) != 0: - flc_log ('Required packages:') - for rpm in missing_rpms: - flc_log (' %s' % rpm) - flc_log ('are missing. Aborting execution.') - sys.exit (1) + flc_log ('Required packages:') + for rpm in missing_rpms: + flc_log (' %s' % rpm) + flc_log ('are missing. Aborting execution.') + sys.exit (1) # check for the config file flc_log ('Looking for config file') if not os.path.isfile (normalize_path([confdir, 'kadischi.conf'])): - flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'kadischi.conf'])) - sys.exit (1) + flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'kadischi.conf'])) + sys.exit (1) # load config file options @@ -195,8 +195,8 @@ buildconf.write () if builddir == '' or builddir == None: - flc_log ('No build dir defined. Please, edit config file option BUILDDIR.') - sys.exit(1) + flc_log ('No build dir defined. Please, edit config file option BUILDDIR.') + sys.exit(1) # prepare dirs @@ -214,14 +214,14 @@ # Moving the buildstamp file to /tmp/product/.buildstamp so anaconda can find it if not os.path.exists ('/tmp/product'): - os.makedirs ('/tmp/product') + os.makedirs ('/tmp/product') elif not os.path.isdir ('/tmp/product'): - flc_log ('Path /tmp/product is not a directory, temporarly moving to %s' % normalize_path([builddir, 'product'])) - shutil.move ('/tmp/product', normalize_path([builddir, 'product'])) - os.makedirs ('/tmp/product') + flc_log ('Path /tmp/product is not a directory, temporarly moving to %s' % normalize_path([builddir, 'product'])) + shutil.move ('/tmp/product', normalize_path([builddir, 'product'])) + os.makedirs ('/tmp/product') elif os.path.exists ('/tmp/product/.buildstamp'): - flc_log ('Path /tmp/product/.buildstamp already exists, temporarly moving to %s' % normalize_path([builddir, '.buildstamp'])) - shutil.move ('/tmp/product/.buildstamp', normalize_path([builddir, '.buildstamp'])) + flc_log ('Path /tmp/product/.buildstamp already exists, temporarly moving to %s' % normalize_path([builddir, '.buildstamp'])) + shutil.move ('/tmp/product/.buildstamp', normalize_path([builddir, '.buildstamp'])) shutil.copy2 (buildstamp, '/tmp/product/.buildstamp') @@ -244,16 +244,16 @@ scripts = [] for root, dirs, files in os.walk (normalize_path([bindir, 'post_install_scripts'])): - for filename in files: - filename = normalize_path([bindir, 'post_install_scripts', filename]) - if os.access(filename, 1): - scripts.append (filename) + for filename in files: + filename = normalize_path([bindir, 'post_install_scripts', filename]) + if os.access(filename, 1): + scripts.append (filename) scripts.sort() for script in scripts: - flc_log ('%s' % script) - run ("%s %s" % (script, sysdir), builddir) + flc_log ('%s' % script) + run ("%s %s" % (script, sysdir), builddir) # make initrd image @@ -272,18 +272,18 @@ flc_log ('compressing the tree (order a pizza `cause this will take a while)') if options.filesystem == 'squashfs': - # zisofs has a tree which can be seen; squashfs is a file that we mount - # loopback. So we need to create supporting files and directories - # seperately. - os.makedirs (os.path.join(csysdir, 'boot/isolinux')) - os.makedirs(normalize_path([csysdir, '/livecd'])) - touch = file(normalize_path([csysdir, '.livecd']), 'w') - touch.close() - # compress a squashfs tree - run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh']))) + # zisofs has a tree which can be seen; squashfs is a file that we mount + # loopback. So we need to create supporting files and directories + # separately. + os.makedirs (os.path.join(csysdir, 'boot/isolinux')) + os.makedirs(normalize_path([csysdir, '/livecd'])) + touch = file(normalize_path([csysdir, '.livecd']), 'w') + touch.close() + # compress a squashfs tree + run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh']))) else: - # compress a zisofs tree - run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir) + # compress a zisofs tree + run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir) # install boot & conf files in compressed tree (they shoudn`t be compressed) @@ -304,9 +304,9 @@ flc_log ('creating iso image %s' % isoimage) if options.filesystem == 'squashfs': - mkisoflags='' + mkisoflags='' else: - mkisoflags='MKISOFSOPTION=-z ' + mkisoflags='MKISOFSOPTION=-z ' run ("%s%s %s %s" % (mkisoflags, normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir) # delete builddir Index: movefiles.py =================================================================== RCS file: /cvs/devel/kadischi/livecd_generator/movefiles.py,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -u -r1.1.1.1 -r1.2 --- movefiles.py 21 Aug 2005 17:09:00 -0000 1.1.1.1 +++ movefiles.py 31 Mar 2006 21:03:36 -0000 1.2 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python -tt import os import sys @@ -8,16 +8,16 @@ # Files that we want to be moved to tmpfs # and mounted back to original locations files_to_be_writable = [ - '/var', - '/tmp', - '/etc', - '/home', - '/root', - '/opt', - '/mnt', - '/media', - ] - + '/var', + '/tmp', + '/etc', + '/home', + '/root', + '/opt', + '/mnt', + '/media', + ] + # Files that we don`t want to be on tmpfs, # but they are in dirs that are on tmpfs. # These files will be moved to /moved, and @@ -25,56 +25,56 @@ # The reason we don`t want then on tmpfs is that # they are big and we don`t need them to be writable files_to_be_moved = [ - '/var/lib/rpm', - ] + '/var/lib/rpm', + ] # Files that we need to stay in their original # locations cause we need them before rc.readonly # or during init.d/halt files_to_stay = [ - '/etc/inittab', - '/etc/init.d', - '/etc/initlog.conf', - '/etc/rc', - '/etc/rc.d', - '/etc/rc.local', - '/etc/rc.readonly', - '/etc/passwd', - '/etc/shadow', - '/etc/group', - '/etc/fstab', - '/etc/mtab', - '/etc/makedev.d', - ] + '/etc/inittab', + '/etc/init.d', + '/etc/initlog.conf', + '/etc/rc', + '/etc/rc.d', + '/etc/rc.local', + '/etc/rc.readonly', + '/etc/passwd', + '/etc/shadow', + '/etc/group', + '/etc/fstab', + '/etc/mtab', + '/etc/makedev.d', + ] rootdir = sys.argv[1] for file in files_to_be_moved: - src = normalize_path ([file],rootdir) - dst = normalize_path (['/livecd/moved',file],rootdir) - os.renames (src, dst) - if os.path.isfile (dst): - os.system ("touch %s" % src) - else: - os.makedirs (src) - + src = normalize_path ([file],rootdir) + dst = normalize_path (['/livecd/moved',file],rootdir) + os.renames (src, dst) + if os.path.isfile (dst): + os.system ("touch %s" % src) + else: + os.makedirs (src) + for file in files_to_be_writable: - src = normalize_path ([file],rootdir) - dst = normalize_path (['/livecd/tmpfs',file],rootdir) - os.renames (src, dst) - if os.path.isfile (dst): - os.system ("touch %s" % src) - else: - os.makedirs (src) + src = normalize_path ([file],rootdir) + dst = normalize_path (['/livecd/tmpfs',file],rootdir) + os.renames (src, dst) + if os.path.isfile (dst): + os.system ("touch %s" % src) + else: + os.makedirs (src) for file in files_to_stay: - src = normalize_path (['/livecd/tmpfs',file],rootdir) - dst = normalize_path ([file],rootdir) - if os.path.isfile (src): - shutil.copy2 (src, dst) - else: - shutil.copytree (src, dst) - + src = normalize_path (['/livecd/tmpfs',file],rootdir) + dst = normalize_path ([file],rootdir) + if os.path.isfile (src): + shutil.copy2 (src, dst) + else: + shutil.copytree (src, dst) + run ("cd %s/livecd/tmpfs; tar -czf %s/livecd/kadischi.tar.gz *" % (rootdir, rootdir)) -clean_directory (normalize_path (['/livecd/tmpfs'],rootdir), False) \ No newline at end of file +clean_directory (normalize_path (['/livecd/tmpfs'],rootdir), False) From fedora-extras-commits at redhat.com Fri Mar 31 21:05:05 2006 From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs)) Date: Fri, 31 Mar 2006 14:05:05 -0700 Subject: rpms/denyhosts/devel README.fedora, 1.4, 1.5 denyhosts.cron, 1.6, 1.7 denyhosts.spec, 1.31, 1.32 Message-ID: <200603312105.k2VL578b025105@cvs-int.fedora.redhat.com> Author: tibbs Update of /cvs/extras/rpms/denyhosts/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25084 Modified Files: README.fedora denyhosts.cron denyhosts.spec Log Message: * Fri Mar 31 2006 Jason L Tibbitts III - 2.2-6 - More reversion of the name change. Index: README.fedora =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/README.fedora,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- README.fedora 31 Mar 2006 02:59:32 -0000 1.4 +++ README.fedora 31 Mar 2006 21:05:05 -0000 1.5 @@ -29,7 +29,7 @@ If you want to incorporate an old logfile (in this example, /var/log/secure.1) , you can run - denyhosts -c /etc/denyhosts.conf /var/log/secure.1 + denyhosts.py -c /etc/denyhosts.conf /var/log/secure.1 DenyHosts can also handle logs compressed with gzip or bzip2. Index: denyhosts.cron =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.cron,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- denyhosts.cron 31 Mar 2006 02:59:32 -0000 1.6 +++ denyhosts.cron 31 Mar 2006 21:05:05 -0000 1.7 @@ -4,9 +4,9 @@ # "service" and set it to run at boot if necessary.) # # Run denyhosts occasionally; adjust the time span to your liking -#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts -c /etc/denyhosts.conf +#*/10 * * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf # # Automatically purge old entries early in the morning. Note that you must # edit /etc/denyhosts.conf and set PURGE_DENY to something reasonable, as the # default value purge time is set very high. -#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts -c /etc/denyhosts.conf --purge +#0 5 * * * root [ -f /var/lock/subsys/denyhosts.init ] && /usr/bin/denyhosts.py -c /etc/denyhosts.conf --purge Index: denyhosts.spec =================================================================== RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- denyhosts.spec 31 Mar 2006 19:47:01 -0000 1.31 +++ denyhosts.spec 31 Mar 2006 21:05:05 -0000 1.32 @@ -1,6 +1,6 @@ Name: denyhosts Version: 2.2 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A script to help thwart ssh server attacks Group: Applications/System @@ -150,6 +150,9 @@ %changelog +* Fri Mar 31 2006 Jason L Tibbitts III - 2.2-6 +- More reversion of the name change. + * Fri Mar 31 2006 Jason L Tibbitts III - 2.2-5 - Revert renaming of the denyhosts.py script From fedora-extras-commits at redhat.com Fri Mar 31 21:52:11 2006 From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede)) Date: Fri, 31 Mar 2006 14:52:11 -0700 Subject: rpms/dia/FC-5 dia-0.94-CVE-2006-1550.patch, NONE, 1.1 dia.spec, 1.7, 1.8 Message-ID: <200603312152.k2VLqDmr025373@cvs-int.fedora.redhat.com> Author: jwrdegoede Update of /cvs/extras/rpms/dia/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25353 Modified Files: dia.spec Added Files: dia-0.94-CVE-2006-1550.patch Log Message: * Fri Mar 31 2006 Hans de Goede 1:0.94-21 - Fix CVE-2006-1550 (bz 187556) dia-0.94-CVE-2006-1550.patch: --- NEW FILE dia-0.94-CVE-2006-1550.patch --- --- dia-0.94/plug-ins/xfig/xfig-import.c.cve 2006-03-31 23:36:33.000000000 +0200 +++ dia-0.94/plug-ins/xfig/xfig-import.c 2006-03-31 23:36:40.000000000 +0200 @@ -441,11 +441,17 @@ static Color fig_color(int color_index) { - if (color_index == -1) + if (color_index <= -1) return color_black; /* Default color */ - if (color_index < FIG_MAX_DEFAULT_COLORS) + else if (color_index < FIG_MAX_DEFAULT_COLORS) return fig_default_colors[color_index]; - else return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; + else if (color_index < FIG_MAX_USER_COLORS) + return fig_colors[color_index-FIG_MAX_DEFAULT_COLORS]; + else { + message_error(_("Color index %d too high, only 512 colors allowed. Using black instead."), + color_index); + return color_black; + } } static Color @@ -563,23 +569,25 @@ static int fig_read_n_points(FILE *file, int n, Point **points) { int i; - Point *new_points; - - new_points = (Point*)g_malloc(sizeof(Point)*n); + GArray *points_list = g_array_sized_new(FALSE, FALSE, sizeof(Point), n); for (i = 0; i < n; i++) { int x,y; + Point p; if (fscanf(file, " %d %d ", &x, &y) != 2) { message_error(_("Error while reading %dth of %d points: %s\n"), i, n, strerror(errno)); - free(new_points); + g_array_free(points_list, TRUE); return FALSE; } - new_points[i].x = x/FIG_UNIT; - new_points[i].y = y/FIG_UNIT; + p.x = x/FIG_UNIT; + p.y = y/FIG_UNIT; + g_array_append_val(points_list, p); } fscanf(file, "\n"); - *points = new_points; + + *points = (Point *)points_list->data; + g_array_free(points_list, FALSE); return TRUE; } @@ -683,7 +691,7 @@ return text_buf; } -static GList *depths[1000]; +static GList *depths[FIG_MAX_DEPTHS]; /* If there's something in the compound stack, we ignore the depth field, as it will be determined by the group anyway */ @@ -693,6 +701,26 @@ level. Best we can do now. */ static int compound_depth; +/** Add an object at a given depth. This function checks for depth limits + * and updates the compound depth if needed. + * + * @param newobj An object to add. If we're inside a compound, this + * doesn't really add the object. + * @param depth A depth as in the Fig format, max 999 + */ +static void +add_at_depth(DiaObject *newobj, int depth) { + if (depth < 0 || depth >= FIG_MAX_DEPTHS) { + message_error(_("Depth %d of of range, only 0-%d allowed.\n"), + depth, FIG_MAX_DEPTHS-1); + depth = FIG_MAX_DEPTHS - 1; + } + if (compound_stack == NULL) + depths[depth] = g_list_append(depths[depth], newobj); + else + if (compound_depth > depth) compound_depth = depth; +} + static DiaObject * fig_read_ellipse(FILE *file, DiagramData *dia) { int sub_type; @@ -749,10 +777,7 @@ /* Angle -- can't rotate yet */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); return newobj; } @@ -885,10 +910,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: prop_list_free(props); g_free(forward_arrow_info); @@ -1111,10 +1133,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: prop_list_free(props); g_free(forward_arrow_info); @@ -1202,10 +1221,7 @@ /* Cap style */ /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: g_free(forward_arrow_info); @@ -1298,10 +1314,7 @@ newobj->ops->set_props(newobj, props); /* Depth field */ - if (compound_stack == NULL) - depths[depth] = g_list_append(depths[depth], newobj); - else - if (compound_depth > depth) compound_depth = depth; + add_at_depth(newobj, depth); exit: if (text_buf != NULL) free(text_buf); @@ -1347,6 +1360,12 @@ return FALSE; } + if (colornumber < 32 || colornumber > FIG_MAX_USER_COLORS) { + message_error(_("Color number %d out of range 0..%d. Discarding color.\n"), + colornumber, FIG_MAX_USER_COLORS); + return FALSE; + } + color.red = ((colorvalues & 0x00ff0000)>>16) / 255.0; color.green = ((colorvalues & 0x0000ff00)>>8) / 255.0; color.blue = (colorvalues & 0x000000ff) / 255.0; @@ -1393,7 +1412,7 @@ } /* Group extends don't really matter */ if (compound_stack == NULL) - compound_depth = 999; + compound_depth = FIG_MAX_DEPTHS - 1; compound_stack = g_slist_append(compound_stack, NULL); return TRUE; break; @@ -1551,7 +1570,7 @@ for (i = 0; i < FIG_MAX_USER_COLORS; i++) { fig_colors[i] = color_black; } - for (i = 0; i < 1000; i++) { + for (i = 0; i < FIG_MAX_DEPTHS; i++) { depths[i] = NULL; } @@ -1606,7 +1625,7 @@ } while (TRUE); /* Now we can reorder for the depth fields */ - for (i = 0; i < 1000; i++) { + for (i = 0; i < FIG_MAX_DEPTHS; i++) { if (depths[i] != NULL) layer_add_objects_first(dia->active_layer, depths[i]); } --- dia-0.94/plug-ins/xfig/xfig.h.cve 2006-03-31 23:36:33.000000000 +0200 +++ dia-0.94/plug-ins/xfig/xfig.h 2006-03-31 23:36:40.000000000 +0200 @@ -6,6 +6,7 @@ #define FIG_MAX_DEFAULT_COLORS 32 #define FIG_MAX_USER_COLORS 512 +#define FIG_MAX_DEPTHS 1000 /* 1200 PPI */ #define FIG_UNIT 472.440944881889763779527559055118 /* 1/80 inch */ Index: dia.spec =================================================================== RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- dia.spec 31 Mar 2006 18:58:02 -0000 1.7 +++ dia.spec 31 Mar 2006 21:52:11 -0000 1.8 @@ -5,7 +5,7 @@ Name: dia Summary: A diagram drawing program. Version: 0.94 -Release: 20 +Release: 21 Epoch: 1 Source: ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2 Group: Applications/Multimedia @@ -34,6 +34,7 @@ Patch4: dia-0.94-fallbacktoxpmicons.patch Patch5: dia-0.94-rh165337.patch Patch6: dia-0.94-gnomeflags.patch +Patch7: dia-0.94-CVE-2006-1550.patch %description The Dia drawing program is designed to be like the Windows(TM) Visio @@ -53,6 +54,7 @@ %patch4 -p1 -b .fallbacktoxpmicons %patch5 -p1 -b .rh165337 %patch6 -p1 -b .gnomeflags +%patch7 -p1 -b .cve %build rm doc/*/dia.1 @@ -117,6 +119,9 @@ %{_datadir}/pixmaps/* %changelog +* Fri Mar 31 2006 Hans de Goede 1:0.94-21 +- Fix CVE-2006-1550 (bz 187556) + * Fri Mar 31 2006 Hans de Goede 1:0.94-20 - Taking over as new FE maintainer - Rebuild for bz 185886 From fedora-extras-commits at redhat.com Fri Mar 31 21:57:54 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 31 Mar 2006 14:57:54 -0700 Subject: rpms/xfce4-xkb-plugin/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce4-xkb-plugin.spec, 1.5, 1.6 Message-ID: <200603312157.k2VLvuqk025477@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25456 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Mar 2006 13:51:45 -0000 1.4 +++ .cvsignore 31 Mar 2006 21:57:54 -0000 1.5 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.4.tar.gz +xfce4-xkb-plugin-0.3.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Mar 2006 13:51:45 -0000 1.4 +++ sources 31 Mar 2006 21:57:54 -0000 1.5 @@ -1 +1 @@ -06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz +0c92dd17579e102b40289c4bc83c5505 xfce4-xkb-plugin-0.3.5.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xfce4-xkb-plugin.spec 17 Mar 2006 13:51:45 -0000 1.5 +++ xfce4-xkb-plugin.spec 31 Mar 2006 21:57:54 -0000 1.6 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.4 +Version: 0.3.5 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -46,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 31 2006 Christoph Wickert - 0.3.5-1 +- Update to 0.3.5. + * Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 - Update to 0.3.4. From fedora-extras-commits at redhat.com Fri Mar 31 22:01:47 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 31 Mar 2006 15:01:47 -0700 Subject: rpms/xfce4-xkb-plugin/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce4-xkb-plugin.spec, 1.5, 1.6 Message-ID: <200603312202.k2VM2LGL027535@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-5 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27514 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Mar 2006 13:53:57 -0000 1.4 +++ .cvsignore 31 Mar 2006 22:01:47 -0000 1.5 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.4.tar.gz +xfce4-xkb-plugin-0.3.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Mar 2006 13:53:57 -0000 1.4 +++ sources 31 Mar 2006 22:01:47 -0000 1.5 @@ -1 +1 @@ -06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz +0c92dd17579e102b40289c4bc83c5505 xfce4-xkb-plugin-0.3.5.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/xfce4-xkb-plugin.spec,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- xfce4-xkb-plugin.spec 17 Mar 2006 13:53:57 -0000 1.5 +++ xfce4-xkb-plugin.spec 31 Mar 2006 22:01:47 -0000 1.6 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.4 +Version: 0.3.5 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -46,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 31 2006 Christoph Wickert - 0.3.5-1 +- Update to 0.3.5. + * Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 - Update to 0.3.4. From fedora-extras-commits at redhat.com Fri Mar 31 22:08:27 2006 From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert)) Date: Fri, 31 Mar 2006 15:08:27 -0700 Subject: rpms/xfce4-xkb-plugin/FC-4 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce4-xkb-plugin.spec, 1.3, 1.4 Message-ID: <200603312208.k2VM8T5o027656@cvs-int.fedora.redhat.com> Author: cwickert Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-4 In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27635 Modified Files: .cvsignore sources xfce4-xkb-plugin.spec Log Message: Update to 0.3.5 Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/.cvsignore,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- .cvsignore 17 Mar 2006 13:55:15 -0000 1.4 +++ .cvsignore 31 Mar 2006 22:08:27 -0000 1.5 @@ -1 +1 @@ -xfce4-xkb-plugin-0.3.4.tar.gz +xfce4-xkb-plugin-0.3.5.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/sources,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- sources 17 Mar 2006 13:55:15 -0000 1.4 +++ sources 31 Mar 2006 22:08:27 -0000 1.5 @@ -1 +1 @@ -06cbf73da01edc54f25969fa934e34f3 xfce4-xkb-plugin-0.3.4.tar.gz +0c92dd17579e102b40289c4bc83c5505 xfce4-xkb-plugin-0.3.5.tar.gz Index: xfce4-xkb-plugin.spec =================================================================== RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/xfce4-xkb-plugin.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- xfce4-xkb-plugin.spec 17 Mar 2006 13:55:15 -0000 1.3 +++ xfce4-xkb-plugin.spec 31 Mar 2006 22:08:27 -0000 1.4 @@ -1,5 +1,5 @@ Name: xfce4-xkb-plugin -Version: 0.3.4 +Version: 0.3.5 Release: 1%{?dist} Summary: XKB layout switcher for the Xfce panel @@ -46,6 +46,9 @@ %{_datadir}/xfce4/xkb/flags/*.png %changelog +* Fri Mar 31 2006 Christoph Wickert - 0.3.5-1 +- Update to 0.3.5. + * Fri Mar 17 2006 Christoph Wickert - 0.3.4-1 - Update to 0.3.4. From fedora-extras-commits at redhat.com Fri Mar 31 22:40:27 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:40:27 -0700 Subject: rpms/perl-Taint-Runtime - New directory Message-ID: <200603312240.k2VMeTdZ027850@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27829/perl-Taint-Runtime Log Message: Directory /cvs/extras/rpms/perl-Taint-Runtime added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 22:40:27 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:40:27 -0700 Subject: rpms/perl-Taint-Runtime/devel - New directory Message-ID: <200603312240.k2VMeTJx027853@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27829/perl-Taint-Runtime/devel Log Message: Directory /cvs/extras/rpms/perl-Taint-Runtime/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 22:40:42 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:40:42 -0700 Subject: rpms/perl-Taint-Runtime Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603312240.k2VMeix6027907@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27874 Added Files: Makefile import.log Log Message: Setup of module perl-Taint-Runtime --- NEW FILE Makefile --- # Top level Makefile for module perl-Taint-Runtime all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 31 22:40:42 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:40:42 -0700 Subject: rpms/perl-Taint-Runtime/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603312240.k2VMei7T027910@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27874/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module perl-Taint-Runtime --- NEW 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 Mar 31 22:41:04 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:41:04 -0700 Subject: rpms/perl-Taint-Runtime import.log,1.1,1.2 Message-ID: <200603312241.k2VMf67H027971@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938 Modified Files: import.log Log Message: auto-import perl-Taint-Runtime-0.02-1 on branch devel from perl-Taint-Runtime-0.02-1.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/perl-Taint-Runtime/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 Mar 2006 22:40:41 -0000 1.1 +++ import.log 31 Mar 2006 22:41:04 -0000 1.2 @@ -0,0 +1 @@ +perl-Taint-Runtime-0_02-1:HEAD:perl-Taint-Runtime-0.02-1.src.rpm:1143844858 From fedora-extras-commits at redhat.com Fri Mar 31 22:41:04 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:41:04 -0700 Subject: rpms/perl-Taint-Runtime/devel perl-Taint-Runtime.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603312241.k2VMf6QB027976@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/rpms/perl-Taint-Runtime/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27938/devel Modified Files: .cvsignore sources Added Files: perl-Taint-Runtime.spec Log Message: auto-import perl-Taint-Runtime-0.02-1 on branch devel from perl-Taint-Runtime-0.02-1.src.rpm --- NEW FILE perl-Taint-Runtime.spec --- Name: perl-Taint-Runtime Version: 0.02 Release: 1%{?dist} Summary: Runtime enable taint checking Group: Development/Libraries License: GPL or Artistic URL: http://search.cpan.org/dist/Taint-Runtime Source0: http://search.cpan.org/CPAN/authors/id/R/RH/RHANDOM/Taint-Runtime-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description This module enables runtime taint checking, for cases where the -T switch on the commandline is not appropriate or viable. There are a somewhat limited number of legitimate use cases where you should use this module instead of the -T switch. Unless you have a specific and good reason for not using the -T option, you should use the -T option. %prep %setup -q -n Taint-Runtime-%{version} chmod +x is_taint_bench.pl %build %{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" 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 f -name '*.bs' -a -size 0 -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 Changes %{perl_vendorarch}/auto/Taint/ %{perl_vendorarch}/Taint/ %{_mandir}/man3/*.3* %changelog * Fri Mar 31 2006 Tom "spot" Callaway 0.02-1 - Initial package for Fedora Extras Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/perl-Taint-Runtime/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Mar 2006 22:40:42 -0000 1.1 +++ .cvsignore 31 Mar 2006 22:41:04 -0000 1.2 @@ -0,0 +1 @@ +Taint-Runtime-0.02.tar.gz Index: sources =================================================================== RCS file: /cvs/extras/rpms/perl-Taint-Runtime/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Mar 2006 22:40:42 -0000 1.1 +++ sources 31 Mar 2006 22:41:04 -0000 1.2 @@ -0,0 +1 @@ +f956b5abaae6925beb0c6fc335f214de Taint-Runtime-0.02.tar.gz From fedora-extras-commits at redhat.com Fri Mar 31 22:43:03 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:03 -0700 Subject: rpms/pitivi - New directory Message-ID: <200603312243.k2VMh5Ho028345@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28319/pitivi Log Message: Directory /cvs/extras/rpms/pitivi added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 22:43:04 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:04 -0700 Subject: rpms/pitivi/devel - New directory Message-ID: <200603312243.k2VMh6E5028348@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28319/pitivi/devel Log Message: Directory /cvs/extras/rpms/pitivi/devel added to the repository From fedora-extras-commits at redhat.com Fri Mar 31 22:43:16 2006 From: fedora-extras-commits at redhat.com (Tom Callaway (spot)) Date: Fri, 31 Mar 2006 15:43:16 -0700 Subject: owners owners.list,1.785,1.786 Message-ID: <200603312243.k2VMhIre028378@cvs-int.fedora.redhat.com> Author: spot Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28312 Modified Files: owners.list Log Message: perl-Taint-Runtime Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.785 retrieving revision 1.786 diff -u -r1.785 -r1.786 --- owners.list 31 Mar 2006 20:47:33 -0000 1.785 +++ owners.list 31 Mar 2006 22:43:15 -0000 1.786 @@ -1046,6 +1046,7 @@ Fedora Extras|perl-String-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com +Fedora Extras|perl-Taint-Runtime|Runtime enable taint checking|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com From fedora-extras-commits at redhat.com Fri Mar 31 22:43:19 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:19 -0700 Subject: rpms/pitivi Makefile,NONE,1.1 import.log,NONE,1.1 Message-ID: <200603312243.k2VMhLcp028416@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28383 Added Files: Makefile import.log Log Message: Setup of module pitivi --- NEW FILE Makefile --- # Top level Makefile for module pitivi all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like 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 Mar 31 22:43:20 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:20 -0700 Subject: rpms/pitivi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1 Message-ID: <200603312243.k2VMhMHO028419@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28383/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module pitivi --- NEW 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 Mar 31 22:43:48 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:48 -0700 Subject: rpms/pitivi import.log,1.1,1.2 Message-ID: <200603312243.k2VMhosq028489@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28452 Modified Files: import.log Log Message: auto-import pitivi-0.9.9.2-3 on branch devel from pitivi-0.9.9.2-3.src.rpm Index: import.log =================================================================== RCS file: /cvs/extras/rpms/pitivi/import.log,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- import.log 31 Mar 2006 22:43:19 -0000 1.1 +++ import.log 31 Mar 2006 22:43:47 -0000 1.2 @@ -0,0 +1 @@ +pitivi-0_9_9_2-3:HEAD:pitivi-0.9.9.2-3.src.rpm:1143845025 From fedora-extras-commits at redhat.com Fri Mar 31 22:43:48 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:43:48 -0700 Subject: rpms/pitivi/devel pitivi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2 Message-ID: <200603312243.k2VMhovl028519@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/rpms/pitivi/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28452/devel Modified Files: .cvsignore sources Added Files: pitivi.spec Log Message: auto-import pitivi-0.9.9.2-3 on branch devel from pitivi-0.9.9.2-3.src.rpm --- NEW FILE pitivi.spec --- Name: pitivi Version: 0.9.9.2 Release: 3 Summary: Non-linear video editor Group: Applications/Multimedia License: GPL URL: http://www.pitivi.org/ Source: http://download.sf.net/pitivi/%{name}-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Requires: gnonlin BuildRequires: gstreamer-devel >= 0.10.2 BuildRequires: gstreamer-plugins-base-devel >= 0.10.2 BuildRequires: gstreamer-python BuildRequires: GConf2-devel BuildRequires: gtk2-devel >= 2.8 BuildRequires: pygtk2-devel BuildRequires: gtk-doc BuildRequires: pkgconfig BuildRequires: gnonlin-devel BuildRequires: desktop-file-utils BuildRequires: gnome-python2 %description Pitivi is an application using the GStreamer multimedia framework to manipulate a large set of multimedia sources. At this level of development it can be compared to a classic video editing program. %prep %setup %build %configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ --add-category X-Fedora \ pitivi.desktop # Clean out files that should not be part of the rpm. rm -f $RPM_BUILD_ROOT%{_libdir}/*.la #%find_lang pitivi %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-, root, root, -) %doc AUTHORS ChangeLog COPYING NEWS README %{_bindir}/pitivi %dir %{_libdir}/pitivi %dir %{_libdir}/pitivi/python %dir %{_libdir}/pitivi/python/pitivi %{_libdir}/pitivi/python/pitivi/*.py %{_libdir}/pitivi/python/pitivi/*.pyc %ghost %{_libdir}/pitivi/python/pitivi/*.pyo %dir %{_libdir}/pitivi/python/pitivi/ui %{_libdir}/pitivi/python/pitivi/ui/*.py %{_libdir}/pitivi/python/pitivi/ui/*.pyc %{_libdir}/pitivi/python/pitivi/ui/actions.xml %{_libdir}/pitivi/python/pitivi/ui/*.glade %ghost %{_libdir}/pitivi/python/pitivi/ui/*.pyo %{_datadir}/pitivi %{_datadir}/applications/fedora-pitivi.desktop %changelog * Wed Feb 08 2006 W. Michael Petullo 0.9.9.2-3 - add BuildRequires - add %%{_libdir}/pitivi/python/pitivi/ui/*.glade * Tue Feb 07 2006 W. Michael Petullo 0.9.9.2-2 - remove several %%defines. - avoid %%makeinstall. - BuildRequire: gnonlin-devel and Require: gnonlin. - use desktop-file-install. - BuildArch: noarch. - %%ghost *.pyo. * Mon Jan 23 2006 W. Michael Petullo - 0.9.9.2: updated to new version and gstreamer-0.10. * Mon Dec 20 2004 Thomas Vander Stichele - 0.1.1-0.fdr.1: initial package Index: .cvsignore =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 31 Mar 2006 22:43:20 -0000 1.1 +++ .cvsignore 31 Mar 2006 22:43:48 -0000 1.2 @@ -0,0 +1 @@ +pitivi-0.9.9.2.tar.bz2 Index: sources =================================================================== RCS file: /cvs/extras/rpms/pitivi/devel/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 31 Mar 2006 22:43:20 -0000 1.1 +++ sources 31 Mar 2006 22:43:48 -0000 1.2 @@ -0,0 +1 @@ +de6076064893eda1d7bbd70b2b64b8f0 pitivi-0.9.9.2.tar.bz2 From fedora-extras-commits at redhat.com Fri Mar 31 22:45:51 2006 From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep)) Date: Fri, 31 Mar 2006 15:45:51 -0700 Subject: owners owners.list,1.786,1.787 Message-ID: <200603312245.k2VMjrlF028702@cvs-int.fedora.redhat.com> Author: mikep Update of /cvs/extras/owners In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28681 Modified Files: owners.list Log Message: Add entry for pitivi. Index: owners.list =================================================================== RCS file: /cvs/extras/owners/owners.list,v retrieving revision 1.786 retrieving revision 1.787 diff -u -r1.786 -r1.787 --- owners.list 31 Mar 2006 22:43:15 -0000 1.786 +++ owners.list 31 Mar 2006 22:45:51 -0000 1.787 @@ -1130,6 +1130,7 @@ Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.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| Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|rdieter at math.unl.edu|extras-qa at fedoraproject.org| +Fedora Extras|pitivi|Non-linear video editor|redhat at flyn.org|extras-qa at fedoraproject.org| Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org| Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org| Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|